From 6d967c862d7c1289cbecab527014b86e9ac6d1a0 Mon Sep 17 00:00:00 2001
From: Lucio Andrés Illanes Albornoz (arab, vxp) <l.illanes@gmx.de>
Date: Mar 08 2016 12:01:19 +0000
Subject: Followup to last commit: adds $PKG_AUTOGEN and copies config.sub.


---

diff --git a/366.pacman.vars b/366.pacman.vars
deleted file mode 100644
index 99bb4f3..0000000
--- a/366.pacman.vars
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# . ./build.vars and set -o errexit are assumed.
-#
-
-pkg_pacman_patch_pre() {
-	install -m 0700 ${_PWD}/config.sub ${PKG_SUBDIR}/build-aux;
-	cd ${PKG_SUBDIR} && ./autogen.sh && cd ${OLDPWD};
-};
-
-# vim:filetype=sh
diff --git a/build.vars b/build.vars
index 0d6495f..1a6a9c2 100644
--- a/build.vars
+++ b/build.vars
@@ -14,7 +14,7 @@
 : ${BUILD_STATUS_FINISHED_AT_CURRENT_FNAME:=${PREFIX}/BUILD_FINISHED_AT};
 : ${BUILD_STATUS_IN_PROGRESS_FNAME:=${PREFIX}/BUILD_IN_PROGRESS};
 : ${CFLAGS_DEFAULT:=-g3 -O0};
-: ${CHECK_PREREQ_CMDS:="aclocal autopoint bunzip2 flex git gunzip libtool make mktemp openssl patch pkg-config sed sort tar tee tr wget xz"};
+: ${CHECK_PREREQ_CMDS:="aclocal autopoint bunzip2 flex git gunzip install libtool make mktemp openssl patch pkg-config sed sort tar tee tr wget xz"};
 : ${CHECK_PATH_VARS:="PREFIX PREFIX_NATIVE WORKDIR"};
 : ${CLEAR_ENV_VARS_EXCEPT:="HOME PATH SHELL TERM USER"};
 : ${GITROOT:=git://midipix.org};
@@ -43,7 +43,7 @@ export PATH="${PREFIX}/bin${PATH:+:${PATH}}";
 : ${WORKDIR:=${PREFIX}/tmp};
 
 : ${PKG_BUILD_NAMES:="apk_tools bash binutils binutils_host bzip2 coreutils curl dalist dash diffutils findutils gawk git glib gmp grep gzip hexcurse irssi less libarchive libelf libffi libressl libz make mpc mpfr nano ncurses ncursestw ncursesw ntapi ntcon ntctty openssh pacman patch pemagine popt psxscl psxstub psxtypes rsync sed tar util_linux which xz zsh"};
-: ${PKG_BUILD_VARS:="AR_BUILD AR_CONFIGURE BUILD_DIR BUILD_TYPE CC_BUILD CC_CONFIGURE CC_INSTALL CFLAGS_BUILD_EXTRA CFLAGS_CONFIGURE CFLAGS_CONFIGURE_EXTRA CFLAGS_INSTALL_EXTRA CONFIGURE_ARGS CONFIGURE_ARGS_EXTRA ENV_VARS_EXTRA FNAME GIT_ARGS_EXTRA INSTALL_TARGET LDFLAGS_BUILD_EXTRA LDFLAGS_CONFIGURE LDFLAGS_CONFIGURE_EXTRA LDFLAGS_INSTALL_EXTRA LIBFILES_FIX LIBTOOL_MIDIPIX LIBTOOL_MIDIPIX_FIX MAKEFLAGS_BUILD MAKEFLAGS_BUILD_EXTRA MAKEFLAGS_INSTALL MAKEFLAGS_INSTALL_EXTRA NO_CLEAN PATCHES_EXTRA_URL PREFIX_EXTRA RANLIB_INSTALL SHA256SUM SUBDIR URL URL_FNAME URL_TYPE VERSION"};
+: ${PKG_BUILD_VARS:="AR_BUILD AR_CONFIGURE AUTOGEN BUILD_DIR BUILD_TYPE CC_BUILD CC_CONFIGURE CC_INSTALL CFLAGS_BUILD_EXTRA CFLAGS_CONFIGURE CFLAGS_CONFIGURE_EXTRA CFLAGS_INSTALL_EXTRA CONFIGURE_ARGS CONFIGURE_ARGS_EXTRA ENV_VARS_EXTRA FNAME GIT_ARGS_EXTRA INSTALL_TARGET LDFLAGS_BUILD_EXTRA LDFLAGS_CONFIGURE LDFLAGS_CONFIGURE_EXTRA LDFLAGS_INSTALL_EXTRA LIBFILES_FIX LIBTOOL_MIDIPIX LIBTOOL_MIDIPIX_FIX MAKEFLAGS_BUILD MAKEFLAGS_BUILD_EXTRA MAKEFLAGS_INSTALL MAKEFLAGS_INSTALL_EXTRA NO_CLEAN PATCHES_EXTRA_URL PREFIX_EXTRA RANLIB_INSTALL SHA256SUM SUBDIR URL URL_FNAME URL_TYPE VERSION"};
 : ${PKG_LVL0_CFLAGS_CONFIGURE:=-O0};
 : ${PKG_LVL0_CONFIGURE_ARGS:="-C --host=${HOST_NATIVE} --prefix= --target=${TARGET}"};
 : ${PKG_LVL0_MAKEFLAGS_BUILD:=${MAKEFLAGS_DEFAULT}};
@@ -250,6 +250,7 @@ export PATH="${PREFIX}/bin${PATH:+:${PATH}}";
 : ${PKG_PACMAN_VERSION:=5.0.1};
 : ${PKG_PACMAN_SHA256SUM:=84599e2ee2158134fd704f1cd681ea46e021165bed4df5f002aa1748caef9e7b};
 : ${PKG_PACMAN_URL:=https://projects.archlinux.org/pacman.git/snapshot/pacman-${PKG_PACMAN_VERSION}.tar.gz};
+: ${PKG_PACMAN_AUTOGEN:=1};
 : ${PKG_PACMAN_CONFIGURE_ARGS_EXTRA:=--disable-doc};
 : ${PKG_PACMAN_ENV_VARS_EXTRA:="LIBARCHIVE_CFLAGS=,LIBARCHIVE_LIBS=,LIBSSL_CFLAGS=,LIBSSL_LIBS=,LIBCURL_CFLAGS=,LIBCURL_LIBS=,PKG_CONFIG_PATH=${PREFIX_LVL3}/lib/pkgconfig"};
 : ${PKG_PACMAN_MAKEFLAGS_BUILD_EXTRA:=V=99};
diff --git a/pkg.build b/pkg.build
index 9f14464..db23210 100644
--- a/pkg.build
+++ b/pkg.build
@@ -32,8 +32,10 @@ if ! is_build_script_done build_dir; then
 	set_build_script_done build_dir -patch;
 fi;
 if ! is_build_script_done patch; then
-	if test_cmd pkg_${PKG_NAME}_patch_pre; then
-		pkg_${PKG_NAME}_patch_pre;
+	if [ ${PKG_AUTOGEN:-0} -eq 1 ]; then
+		cd ${PKG_SUBDIR} &&				\
+		install -m 0700 ${_PWD}/config.sub build-aux/ &&\
+				./autogen.sh && cd ${OLDPWD};
 	fi;
 	for PATCH_FNAME in portage/${PKG_SUBDIR}.midipix.patch	\
 			${_PWD}/${PKG_SUBDIR}.local.patch	\