cleanup HOST_STYLE, use SYSROOT feature for pkgconf

there are three HOST_STYLE's, not set mean fully automatic installation.
auto means prefix is set to /usr and DESTDIR is set to STAGING_HOST_DIR.
When using manual, you need to provide your own targets.

Instead of using sed to modify *.pc files, use PKG_SYSROOT feature, which does
work better and avoids pathcing some pc files. Idea from sh4rm via #musl.

TODO

@@ -2,7 +2,6 @@ global:
 - projects dir idea
 - lowercase package conversion
 - AUTOTOOL_STYLE automatic adds autotool
-- HOST_STYLE auto default
 
 toolchain stuff:
 - config.site/config.cache usage for speedup?

mk/host-bottom.mk

@@ -16,54 +16,53 @@ endif
 	@cd ${WRKBUILD}; \
 	    for i in $$(find . -name config.sub);do \
 		if [ -f $$i ]; then \
-			${CP} $$i $$i.bak; \
 			${CP} ${SCRIPT_DIR}/config.sub $$i; \
 		fi; \
 	    done; \
 	    for i in $$(find . -name config.guess);do \
 		if [ -f $$i ]; then \
-			${CP} $$i $$i.bak; \
 			${CP} ${SCRIPT_DIR}/config.guess $$i; \
 	        fi; \
 	    done;
 	@${MAKE} hostpre-configure $(MAKE_TRACE)
-ifneq (${HOST_STYLE},manual)
-ifeq ($(strip ${HOST_STYLE}),)
-	cd ${WRKBUILD}; rm -f config.{cache,status}; \
+ifeq (${HOST_STYLE},)
+	cd ${WRKBUILD}; \
 	    env ${HOST_CONFIGURE_ENV} \
 	    ${BASH} ${WRKSRC}/${CONFIGURE_PROG} \
 	    --program-prefix= \
 	    --program-suffix= \
-	    --prefix=/usr \
-	    --bindir=/usr/bin \
-	    --datadir=/usr/share \
-	    --mandir=/usr/share/man \
-	    --libexecdir=/usr/libexec \
-	    --localstatedir=/var \
-	    --sysconfdir=/etc \
+	    --prefix=${STAGING_HOST_DIR}/usr \
+	    --bindir=${STAGING_HOST_DIR}/usr/bin \
+	    --datadir=${STAGING_HOST_DIR}/usr/share \
+	    --mandir=${STAGING_HOST_DIR}/usr/share/man \
+	    --libexecdir=${STAGING_HOST_DIR}/usr/libexec \
+	    --sysconfdir=${STAGING_HOST_DIR}/etc \
 	    --disable-dependency-tracking \
 	    --disable-libtool-lock \
 	    --disable-nls \
 	    ${HOST_CONFIGURE_ARGS} $(MAKE_TRACE)
-else
-	cd ${WRKBUILD}; rm -f config.{cache,status}; \
+endif
+ifeq (${HOST_STYLE},auto)
+	cd ${WRKBUILD}; \
 	    env ${HOST_CONFIGURE_ENV} \
 	    ${BASH} ${WRKSRC}/${CONFIGURE_PROG} \
 	    --program-prefix= \
 	    --program-suffix= \
-	    --prefix=${STAGING_HOST_DIR}/usr \
-	    --bindir=${STAGING_HOST_DIR}/usr/bin \
-	    --datadir=${STAGING_HOST_DIR}/usr/share \
-	    --mandir=${STAGING_HOST_DIR}/usr/share/man \
-	    --libexecdir=${STAGING_HOST_DIR}/usr/libexec \
-	    --sysconfdir=${STAGING_HOST_DIR}/etc \
+	    --prefix=/usr \
+	    --bindir=/usr/bin \
+	    --datadir=/usr/share \
+	    --mandir=/usr/share/man \
+	    --libexecdir=/usr/libexec \
+	    --localstatedir=/var \
+	    --sysconfdir=/etc \
 	    --disable-dependency-tracking \
 	    --disable-libtool-lock \
 	    --disable-nls \
 	    ${HOST_CONFIGURE_ARGS} $(MAKE_TRACE)
 endif
-endif
+ifeq (${HOST_STYLE},manual)
 	${MAKE} host-configure $(MAKE_TRACE)
+endif
 	touch $@
 
 host-build:
@@ -81,16 +80,15 @@ host-install: ${ALL_HOSTINST}
 ${_HOST_FAKE_COOKIE}: ${_HOST_BUILD_COOKIE}
 	@$(CMD_TRACE) "host installing... "
 	@mkdir -p ${HOST_WRKINST}
-ifneq (${HOST_STYLE},manual)
-ifeq ($(strip ${HOST_STYLE}),)
-	cd ${WRKBUILD} && env ${HOST_MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \
-	    DESTDIR='${HOST_WRKINST}' ${HOST_FAKE_FLAGS} ${HOST_INSTALL_TARGET} $(MAKE_TRACE)
-	env ${HOST_MAKE_ENV} ${MAKE} host-install $(MAKE_TRACE)
-else
+ifeq (${HOST_STYLE},)
 	cd ${WRKBUILD} && env ${HOST_MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \
 	    DESTDIR='' ${HOST_FAKE_FLAGS} ${HOST_INSTALL_TARGET} $(MAKE_TRACE)
 endif
-else
+ifeq (${HOST_STYLE},auto)
+	cd ${WRKBUILD} && env ${HOST_MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \
+	    DESTDIR='${STAGING_HOST_DIR}' ${HOST_FAKE_FLAGS} ${HOST_INSTALL_TARGET} $(MAKE_TRACE)
+endif
+ifeq (${HOST_STYLE},manual)
 	env ${HOST_MAKE_ENV} ${MAKE} host-install $(MAKE_TRACE)
 endif
 	env ${HOST_MAKE_ENV} ${MAKE} hostpost-install $(MAKE_TRACE)

mk/host.mk

@@ -6,11 +6,12 @@ ifneq (,$(findstring host,$(MAKECMDGOALS)))
 WRKDIR?=		${HOST_BUILD_DIR}/w-${PKG_NAME}-${PKG_VERSION}-${PKG_RELEASE}-host
 endif
 
-HOST_CONFIGURE_ENV+=	AUTOM4TE=${STAGING_HOST_DIR}/usr/bin/autom4te \
+HOST_CONFIGURE_ENV+=	PATH='${HOST_PATH}' \
+			AUTOM4TE=${STAGING_HOST_DIR}/usr/bin/autom4te \
 			CONFIG_SHELL='$(strip ${SHELL})' \
-			PKG_CONFIG_LIBDIR='${STAGING_HOST_DIR}/usr/lib/pkgconfig' \
+			PKG_CONFIG_LIBDIR='${STAGING_HOST_DIR}/usr/lib/pkgconfig:${STAGING_HOST_DIR}/usr/share/pkgconfig' \
+			PKG_CONFIG_SYSROOT_DIR='${STAGING_HOST_DIR}' \
 			PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \
-			PATH='${HOST_PATH}' \
 			CC='$(strip ${CC_FOR_BUILD})' \
 			CFLAGS='$(strip ${CFLAGS_FOR_BUILD})' \
 			CXXFLAGS='$(strip ${CXXFLAGS_FOR_BUILD})' \
@@ -29,7 +30,8 @@ HOST_ALL_TARGET?=	all
 HOST_INSTALL_TARGET?=	install
 
 HOST_MAKE_ENV+=		PATH='${HOST_PATH}' \
-			PKG_CONFIG_LIBDIR='${STAGING_HOST_DIR}/usr/lib/pkgconfig' \
+			PKG_CONFIG_LIBDIR='${STAGING_HOST_DIR}/usr/lib/pkgconfig:${STAGING_HOST_DIR}/usr/share/pkgconfig' \
+			PKG_CONFIG_SYSROOT_DIR='${STAGING_HOST_DIR}' \
 			PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \
 			CC='$(strip ${CC_FOR_BUILD})' \
 			CFLAGS='$(strip ${CFLAGS_FOR_BUILD})' \

mk/package.mk

@@ -10,22 +10,23 @@ CONFIGURE_ARGS+=	--enable-debug
 endif
 endif
 
-AUTOTOOL_ENV+=		AUTOM4TE='${STAGING_HOST_DIR}/usr/bin/autom4te' \
+AUTOTOOL_ENV+=		PATH='${AUTOTOOL_PATH}' \
+			AUTOM4TE='${STAGING_HOST_DIR}/usr/bin/autom4te' \
 			M4='${STAGING_HOST_DIR}/usr/bin/m4' \
-			LIBTOOLIZE='${STAGING_HOST_DIR}/usr/bin/libtoolize -q' \
-			PATH='${AUTOTOOL_PATH}'
+			LIBTOOLIZE='${STAGING_HOST_DIR}/usr/bin/libtoolize -q'
 
-CONFIGURE_ENV+=		GCC_HONOUR_COPTS=s \
+CONFIGURE_ENV+=		PATH='${TARGET_PATH}' \
+			GCC_HONOUR_COPTS=s \
 			AUTOM4TE=${STAGING_HOST_DIR}/usr/bin/autom4te \
 			M4='${STAGING_HOST_DIR}/usr/bin/m4' \
 			LIBTOOLIZE='${STAGING_HOST_DIR}/usr/bin/libtoolize -q' \
-			PATH='${TARGET_PATH}' \
 			CONFIG_SHELL='$(strip ${SHELL})' \
 			CFLAGS='$(strip ${TARGET_CFLAGS})' \
 			CXXFLAGS='$(strip ${TARGET_CXXFLAGS})' \
 			CPPFLAGS='$(strip ${TARGET_CPPFLAGS})' \
 			LDFLAGS='$(strip ${TARGET_LDFLAGS})' \
-			PKG_CONFIG_LIBDIR='${STAGING_TARGET_DIR}/usr/lib/pkgconfig' \
+			PKG_CONFIG_LIBDIR='${STAGING_TARGET_DIR}/usr/lib/pkgconfig:${STAGING_TARGET_DIR}/usr/share/pkgconfig' \
+			PKG_CONFIG_SYSROOT_DIR='${STAGING_TARGET_DIR}' \
 			ac_cv_func_realloc_0_nonnull=yes \
 			ac_cv_func_malloc_0_nonnull=yes \
 			cross_compiling=yes \
@@ -55,8 +56,9 @@ MAKE_ENV+=		$(GCC_CHECK) \
 			CXXFLAGS='$(strip ${TARGET_CXXFLAGS})' \
 			CPPFLAGS='$(strip ${TARGET_CPPFLAGS})' \
 			LDFLAGS='$(strip ${TARGET_LDFLAGS})' \
+			PKG_CONFIG_LIBDIR='${STAGING_TARGET_DIR}/usr/lib/pkgconfig:${STAGING_TARGET_DIR}/usr/share/pkgconfig' \
+			PKG_CONFIG_SYSROOT_DIR='${STAGING_TARGET_DIR}' \
 			${HOST_CONFIGURE_OPTS} \
-			PKG_CONFIG_LIBDIR='${STAGING_TARGET_DIR}/usr/lib/pkgconfig' \
 			${TARGET_CONFIGURE_OPTS}
 
 MAKE_FLAGS+=		${XAKE_FLAGS} V=1
@@ -247,7 +249,7 @@ ifeq (,$(filter noremove,$(7)))
 endif
 	@rm -f '$${STAGING_PKG_DIR}/$(1)'
 ifeq (,$(filter nostaging,$(7)))
-	-@cd $${IDIR_$(1)}; \
+	@-cd $${IDIR_$(1)}; \
 	    x=$$$$(find tmp var -mindepth 1 2>/dev/null); if [[ -n $$$$x ]]; then \
 		echo 'WARNING: $${IPKG_$(1)} installs files into a' \
 		    'ramdisk location:' >&2; \

mk/pkg-bottom.mk

@@ -135,12 +135,6 @@ endif
 		echo "scripts/$$(basename $$a)" \
 		    >>'${STAGING_PKG_DIR}/${PKG_NAME}.scripts'; \
 	done
-	@for a in ${WRKINST}/usr/lib/pkgconfig/*.pc; do \
-		[[ -e $$a ]] || continue; \
-		sed -e "s,^prefix=.*,prefix=${STAGING_TARGET_DIR}/usr," \
-		    -e "s,^prefix = .*,prefix = ${STAGING_TARGET_DIR}/usr," $$a > \
-		${STAGING_TARGET_DIR}/usr/lib/pkgconfig/$$(basename $$a); \
-	done
 ifeq (,$(filter noremove,${PKG_OPTS}))
 	@if test -s '${STAGING_PKG_DIR}/${PKG_NAME}'; then \
 		cd '${STAGING_TARGET_DIR}'; \
@@ -169,7 +163,7 @@ endif
 ifeq (,$(filter nostaging,${PKG_OPTS}))
 	@-cd ${WRKINST}; \
 	    find usr ! -type d 2>/dev/null | \
-	    grep -E -v -e '^usr/lib/pkgconfig' -e '^usr/share' -e '^usr/src' -e '^usr/doc' -e '^usr/local' -e '^usr/man' -e '^usr/info' -e '^usr/lib/libc.so' -e '^usr/bin/[a-z0-9-]+-config*' -e '^/usr/lib/libpthread_nonshared.a' | \
+	    grep -E -v -e '^usr/share' -e '^usr/src' -e '^usr/doc' -e '^usr/local' -e '^usr/man' -e '^usr/info' -e '^usr/lib/libc.so' -e '^usr/bin/[a-z0-9-]+-config*' -e '^/usr/lib/libpthread_nonshared.a' | \
 	    tee '${STAGING_PKG_DIR}/${PKG_NAME}' | \
 	    $(STAGING_HOST_DIR)/usr/bin/cpio -padlmu '${STAGING_TARGET_DIR}'
 	@cd '${STAGING_TARGET_DIR}'; grep 'usr/lib/.*\.la$$' \

package/alsa-lib/Makefile

@@ -26,7 +26,6 @@ ifneq ($(ADK_HOST_LINUX),y)
 HOST_LINUX_ONLY:=	1
 endif
 
-HOST_STYLE:=		auto
 TARGET_CPPFLAGS+=	-D_POSIX_C_SOURCE=1
 CONFIGURE_ARGS+=	--disable-python
 

package/autoconf/Makefile

@@ -20,7 +20,6 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call HOST_template,AUTOCONF,autoconf,${PKG_VERSION}-${PKG_RELEASE}))
 $(eval $(call PKG_template,AUTOCONF,autoconf,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-HOST_STYLE:=		auto
 XAKE_FLAGS+=		PERL="/usr/bin/perl"
 
 autoconf-install:

package/automake/Makefile

@@ -23,7 +23,6 @@ $(eval $(call HOST_template,AUTOMAKE,automake,${PKG_VERSION}-${PKG_RELEASE}))
 $(eval $(call PKG_template,AUTOMAKE,automake,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 XAKE_FLAGS+=		PERL="/usr/bin/perl"
-HOST_STYLE:=		auto
 
 automake-install:
 	${INSTALL_DIR} ${IDIR_AUTOMAKE}/usr/bin

package/bc/Makefile

@@ -25,8 +25,6 @@ $(eval $(call HOST_template,BC,bc,${PKG_VERSION}-${PKG_RELEASE}))
 $(eval $(call PKG_template,BC,bc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,DC,dc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-HOST_STYLE:=		auto
-
 bc-install:
 	${INSTALL_DIR} ${IDIR_BC}/usr/bin
 	${INSTALL_BIN} ${WRKBUILD}/bc/bc ${IDIR_BC}/usr/bin/bc

package/bison/Makefile

@@ -20,7 +20,6 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call HOST_template,BISON,bison,${PKG_VERSION}-${PKG_RELEASE}))
 $(eval $(call PKG_template,BISON,bison,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-HOST_STYLE:=		auto
 TARGET_LDFLAGS+=	-lrt
 XAKE_FLAGS+=		M4=m4
 

package/cairo/Makefile

@@ -24,7 +24,6 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call HOST_template,CAIRO,cairo,${PKG_VERSION}-${PKG_RELEASE}))
 $(eval $(call PKG_template,CAIRO,cairo,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-HOST_STYLE:=		auto
 HOST_CONFIGURE_ARGS+=	--enable-ft=yes \
 			--enable-png=yes \
 			--enable-fc=yes \

package/ccache/Makefile

@@ -18,7 +18,5 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call HOST_template,CCACHE,ccache,$(PKG_VERSION)-${PKG_RELEASE}))
 
-HOST_STYLE:=		auto
-
 include ${TOPDIR}/mk/host-bottom.mk
 include ${TOPDIR}/mk/pkg-bottom.mk

package/classpath/Makefile

@@ -25,7 +25,6 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call HOST_template,CLASSPATH,classpath,$(PKG_VERSION)-${PKG_RELEASE}))
 $(eval $(call PKG_template,CLASSPATH,classpath,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-HOST_STYLE:=		auto
 HOST_CONFIGURE_ARGS+=	--disable-plugin \
 			--disable-tools \
 			--disable-examples \

package/cups/Makefile

@@ -28,7 +28,6 @@ ifneq ($(ADK_HOST_LINUX),y)
 HOST_LINUX_ONLY:=	1
 endif
 
-HOST_STYLE:=		auto
 HOST_CONFIGURE_ARGS+=	--disable-tcp-wrappers \
 			--disable-webif \
 			--disable-gssapi \

package/e2fsprogs/Makefile

@@ -14,6 +14,7 @@ PKG_BUILDDEP:=		util-linux
 PKG_URL:=		http://e2fsprogs.sourceforge.net/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=e2fsprogs/}
 PKG_OPTS:=		dev
+PKG_NOPARALLEL:=	1
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
@@ -53,9 +54,7 @@ CONFIGURE_ARGS+=	--enable-elf-shlibs \
 			--disable-libuuid \
 			--disable-libblkid \
 			--disable-defrag
-#INSTALL_TARGET+=	install-libs
-#TARGET_LDFLAGS+=	-lpthread
-#TARGET_CFLAGS+=		$(TARGET_CPPFLAGS) -I$(STAGING_TARGET_DIR)/usr/include
+TARGET_CFLAGS+=		$(TARGET_CPPFLAGS) -I$(STAGING_TARGET_DIR)/usr/include
 MAKE_FLAGS+=		BUILD_CC="${CC_FOR_BUILD}" \
 			BUILD_CFLAGS="${CFLAGS_FOR_BUILD} ${CPPFLAGS_FOR_BUILD} -I${WRKSRC}/lib -I." \
 			BUILD_LDFLAGS="${LDFLAGS_FOR_BUILD}"

package/eudev/Makefile

@@ -29,7 +29,7 @@ $(eval $(call PKG_template,UDEV,udev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS
 $(eval $(call PKG_template,LIBUDEV,libudev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 CONFIGURE_ARGS+=	--disable-manpages \
-			--datadir=${STAGING_TARGET_PREFIX}/usr/lib \
+			--disable-gudev \
 			--disable-gtk-doc
 
 udev-install:

package/expat/Makefile

@@ -22,8 +22,6 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call HOST_template,LIBEXPAT,libexpat,${PKG_VERSION}-${PKG_RELEASE}))
 $(eval $(call PKG_template,LIBEXPAT,libexpat,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-HOST_STYLE:=		auto
-
 libexpat-install:
 	${INSTALL_DIR} ${IDIR_LIBEXPAT}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libexpat.so* ${IDIR_LIBEXPAT}/usr/lib/

package/fastjar/Makefile

@@ -20,7 +20,5 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call HOST_template,FASTJAR,fastjar,$(PKG_VERSION)-${PKG_RELEASE}))
 
-HOST_STYLE:=		auto
-
 include ${TOPDIR}/mk/host-bottom.mk
 include ${TOPDIR}/mk/pkg-bottom.mk

package/fetchmail/Makefile

@@ -6,13 +6,11 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		fetchmail
 PKG_VERSION:=		6.3.26
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		d9ae3d939205a3c06a21ea79b8f14793
+PKG_MD5SUM:=		61b66faad044afa26e142bb1791aa2b3
 PKG_DESCR:=		fetch mail from a pop3 or imap server
 PKG_SECTION:=		net/mail
-PKG_URL:=		http://fetchmail.berlios.de/
-PKG_SITES:=		http://download.berlios.de/fetchmail/
-
-DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
+PKG_URL:=		http://www.fetchmail.info
+PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=fetchmail/}
 
 PKG_FLAVOURS_FETCHMAIL:=WITH_SSL
 PKGFD_WITH_SSL:=	enable SSL support

package/file/Makefile

@@ -37,7 +37,6 @@ ifeq ($(ADK_TARGET_USE_STATIC_LIBS),y)
 MAKE_FLAGS+=		LDFLAGS="$(TARGET_LDFLAGS) -all-static"
 endif
 
-HOST_STYLE:=		auto
 HOST_CONFIGURE_ARGS+=	--enable-static \
 			--disable-shared \
 			--disable-warnings

package/findutils/Makefile

@@ -34,7 +34,6 @@ $(eval $(call PKG_template,FIND,find,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS
 $(eval $(call PKG_template,LOCATE,locate,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LOCATE},${PKG_SECTION}))
 $(eval $(call PKG_template,XARGS,xargs,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_XARGS},${PKG_SECTION}))
 
-HOST_STYLE:=		auto
 AUTOTOOL_STYLE:=	autoreconf
 CONFIGURE_ENV+=		gl_cv_func_wcwidth_works=yes \
 			ac_cv_func_working_mktime=yes

package/flex/Makefile

@@ -22,8 +22,6 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call HOST_template,FLEX,flex,${PKG_VERSION}-${PKG_RELEASE}))
 $(eval $(call PKG_template,FLEX,flex,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-HOST_STYLE:=		auto
-
 flex-install:
 	${INSTALL_DIR} ${IDIR_FLEX}/usr/bin
 	${INSTALL_BIN} ${WRKINST}/usr/bin/flex ${IDIR_FLEX}/usr/bin

package/fontconfig/Makefile

@@ -24,7 +24,6 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call HOST_template,FONTCONFIG,fontconfig,${PKG_VERSION}-${PKG_RELEASE}))
 $(eval $(call PKG_template,FONTCONFIG,fontconfig,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-HOST_STYLE:=		auto
 TARGET_LDFLAGS+=	-liconv
 CONFIGURE_ARGS+=	--with-arch=${ADK_TARGET_ARCH} \
 			--enable-libxml2 \

package/freetype/Makefile

@@ -24,7 +24,6 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call HOST_template,LIBFREETYPE,libfreetype,${PKG_VERSION}-${PKG_RELEASE}))
 $(eval $(call PKG_template,LIBFREETYPE,libfreetype,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-HOST_STYLE:=		auto
 HOST_CONFIGURE_ARGS+=	--with-zlib \
 			--without-png \
 			--without-bzip2

package/gawk/Makefile

@@ -19,7 +19,6 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call HOST_template,GAWK,gawk,${PKG_VERSION}-${PKG_RELEASE}))
 $(eval $(call PKG_template,GAWK,gawk,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-HOST_STYLE:=		auto
 CONFIGURE_ARGS+=	--disable-libsigsegv
 
 gawk-install:

package/gcj/Makefile

@@ -20,7 +20,6 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call HOST_template,GCJ,gcj,$(PKG_VERSION)-${PKG_RELEASE}))
 
-HOST_STYLE:=		auto
 HOST_MAKE_ENV+=		"JAR=no LDFLAGS=-liconv"
 # http://gcc.gnu.org/bugzilla/attachment.cgi?id=30880&action=diff
 HOST_CONFIGURE_ARGS:=	--enable-dependency-tracking \

package/gdk-pixbuf/Makefile

@@ -21,7 +21,6 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call HOST_template,GDK_PIXBUF,gdk-pixbuf,$(PKG_VERSION)-${PKG_RELEASE}))
 $(eval $(call PKG_template,GDK_PIXBUF,gdk-pixbuf,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-HOST_STYLE:=		auto
 HOST_CONFIGURE_ARGS+=	--disable-glibtest \
 			--without-libtiff
 CONFIGURE_ENV+=		gio_can_sniff=no

package/genext2fs/Makefile

@@ -20,7 +20,5 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call HOST_template,GENEXT2FS,genext2fs,$(PKG_VERSION)-${PKG_RELEASE}))
 
-HOST_STYLE:=		auto
-
 include ${TOPDIR}/mk/host-bottom.mk
 include ${TOPDIR}/mk/pkg-bottom.mk

package/glib/Makefile

@@ -39,7 +39,8 @@ CONFIGURE_ENV+=		glib_cv_long_long_format=ll \
 HOST_STYLE:=		auto
 HOST_CONFIGURE_ARGS+=	--disable-fam \
 			--enable-static \
-			--disable-compile-warnings
+			--disable-compile-warnings \
+			--datadir=${STAGING_HOST_DIR}/usr/share
 
 glib-install:
 	${INSTALL_DIR} ${IDIR_GLIB}/usr/lib

package/gperf/Makefile

@@ -22,8 +22,6 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call HOST_template,GPERF,gperf,${PKG_VERSION}-${PKG_RELEASE}))
 $(eval $(call PKG_template,GPERF,gperf,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-HOST_STYLE:=		auto
-
 gperf-install:
 	${INSTALL_DIR} ${IDIR_GPERF}/usr/bin
 	${INSTALL_BIN} ${WRKINST}/usr/bin/gperf ${IDIR_GPERF}/usr/bin

package/gpsd/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		gpsd
 PKG_VERSION:=		3.10
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_MD5SUM:=		fc5b03aae38b9b5b6880b31924d0ace3
 PKG_DESCR:=		interface daemon for gps receivers
 PKG_SECTION:=		sys/misc
@@ -29,8 +29,8 @@ BUILD_STYLE:=		manual
 INSTALL_STYLE:=		manual
 
 do-install:
-	(cd $(WRKBUILD); env PATH='$(TARGET_PATH)' CCFLAGS='' \
-		scons install prefix=$(WRKINST)/usr platform=linux python=no chrpath=no bluez=no usb=no libgpsmm=no)
+	(cd $(WRKBUILD); env PATH='$(TARGET_PATH)' CCFLAGS='' DESTDIR='$(WRKINST)' \
+		scons install prefix=/usr platform=linux python=no chrpath=no bluez=no usb=no libgpsmm=no)
 
 gpsd-install:
 	${INSTALL_DIR} ${IDIR_GPSD}/usr/lib ${IDIR_GPSD}/usr/sbin

package/harfbuzz/Makefile

@@ -25,8 +25,6 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call HOST_template,HARFBUZZ,harfbuzz,$(PKG_VERSION)-${PKG_RELEASE}))
 $(eval $(call PKG_template,HARFBUZZ,harfbuzz,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-HOST_STYLE:=		auto
-
 pre-install:
 	$(INSTALL_DIR) $(WRKINST)/usr/include/harfbuzz
 	$(CP) $(WRKBUILD)/src/hb-icu.h $(WRKINST)/usr/include/harfbuzz

package/heimdal/Makefile

@@ -84,7 +84,6 @@ TARGET_CFLAGS+=		-I${STAGING_TARGET_DIR}/usr/include/et -pthread
 CONFIGURE_ARGS+=	${CONFIGURE_OPTS} --with-cross-tools=${STAGING_HOST_DIR}/usr/libexec/heimdal
 CONFIGURE_ENV+=		ac_cv_func_getaddrinfo_numserv=yes
 
-HOST_STYLE:=		auto
 HOST_CONFIGURE_ARGS+=	--disable-pk-init \
 			--without-openldap \
 			--disable-kcm \

package/icu4c/Makefile

@@ -26,7 +26,6 @@ $(eval $(call PKG_template,ICU4C,icu4c,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPEN
 
 CFLAGS_FOR_BUILD+=	-fPIC
 CXXFLAGS_FOR_BUILD+=	-fPIC
-HOST_STYLE:=		auto
 HOST_CONFIGURE_ARGS+=	--enable-extras=no \
 			--enable-samples=no \
 			--enable-tests=no \

package/intltool/Makefile

@@ -21,7 +21,5 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call HOST_template,INTLTOOL,intltool,$(PKG_VERSION)-${PKG_RELEASE}))
 
-HOST_STYLE:=		auto
-
 include ${TOPDIR}/mk/host-bottom.mk
 include ${TOPDIR}/mk/pkg-bottom.mk

package/jamvm/Makefile

@@ -24,7 +24,6 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call HOST_template,JAMVM,jamvm,${PKG_VERSION}-${PKG_RELEASE}))
 $(eval $(call PKG_template,JAMVM,jamvm,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-HOST_STYLE:=		auto
 HOST_CONFIGURE_ARGS+=	--libdir=$(STAGING_HOST_DIR)/usr/lib/jamvm \
 			--includedir=$(STAGING_HOST_DIR)/usr/include/jamvm \
 			--with-classpath-install-dir=$(STAGING_HOST_DIR)/usr

package/jikes/Makefile

@@ -20,8 +20,6 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call HOST_template,JIKES,jikes,$(PKG_VERSION)-${PKG_RELEASE}))
 $(eval $(call PKG_template,JIKES,jikes,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-HOST_STYLE:=		auto
-
 hostpost-install:
 	$(INSTALL_DIR) ${STAGING_HOST_DIR}/usr/lib/jvm/bin/
 	$(INSTALL_DIR) ${STAGING_HOST_DIR}/usr/lib/jvm/jre/bin/

package/libICE/Makefile

@@ -23,8 +23,6 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call HOST_template,LIBICE,libice,$(PKG_VERSION)-${PKG_RELEASE}))
 $(eval $(call PKG_template,LIBICE,libice,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-HOST_STYLE:=		auto
-
 libice-install:
 	${INSTALL_DIR} ${IDIR_LIBICE}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libICE.so* ${IDIR_LIBICE}/usr/lib

package/libIDL/Makefile

@@ -10,7 +10,8 @@ PKG_MD5SUM:=		531fbc1b40b80dd1d6f3b5e76b99067c
 PKG_DESCR:=		libraries for interface definition language files
 PKG_SECTION:=		libs/misc
 PKG_DEPENDS:=		glib
-PKG_BUILDDEP:=		glib-host glib m4-host flex-host bison-host libIDL-host
+PKG_BUILDDEP:=		glib
+HOST_BUILDDEP:=		glib-host
 PKG_URL:=		http://www.gnome.org/
 PKG_SITES:=		http://ftp.gnome.org/pub/GNOME/sources/libIDL/0.8/
 PKG_LIBNAME:=		libidl
@@ -21,12 +22,11 @@ DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 include $(TOPDIR)/mk/host.mk
 include $(TOPDIR)/mk/package.mk
 
-CONFIGURE_ENV+=		libIDL_cv_long_long_format=ll
-
 $(eval $(call HOST_template,LIBIDL,libidl,$(PKG_VERSION)-${PKG_RELEASE}))
 $(eval $(call PKG_template,LIBIDL,libidl,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-HOST_STYLE:=		auto
+CONFIGURE_ENV+=		libIDL_cv_long_long_format=ll
+#HOST_STYLE:=		auto
 
 libidl-install:
 	$(INSTALL_DIR) $(IDIR_LIBIDL)/usr/lib

package/libSM/Makefile

@@ -23,8 +23,6 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call HOST_template,LIBSM,libsm,$(PKG_VERSION)-${PKG_RELEASE}))
 $(eval $(call PKG_template,LIBSM,libsm,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-HOST_STYLE:=		auto
-
 libsm-install:
 	${INSTALL_DIR} ${IDIR_LIBSM}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libSM.so* ${IDIR_LIBSM}/usr/lib

package/libX11/Makefile

@@ -27,7 +27,6 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call HOST_template,LIBX11,libx11,$(PKG_VERSION)-${PKG_RELEASE}))
 $(eval $(call PKG_template,LIBX11,libx11,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-HOST_STYLE:=		auto
 CONFIGURE_ARGS+=	--enable-xlocale \
 			--disable-specs \
 			--disable-xf86bigfont \

package/libXau/Makefile

@@ -9,7 +9,8 @@ PKG_RELEASE:=		2
 PKG_MD5SUM:=		3ab7a4d1aac1b7f8ccc6b9755a19f252
 PKG_DESCR:=		x11 authorisation library
 PKG_SECTION:=		x11/libs
-PKG_BUILDDEP:=		xproto libXau-host
+PKG_BUILDDEP:=		xproto
+HOST_BUILDDEP:=		xproto-host
 PKG_SITES:=		${MASTER_SITE_XORG}
 PKG_LIBNAME:=		libxau
 PKG_OPTS:=		dev
@@ -22,8 +23,6 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call HOST_template,LIBXAU,libxau,$(PKG_VERSION)-${PKG_RELEASE}))
 $(eval $(call PKG_template,LIBXAU,libxau,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-HOST_STYLE:=		auto
-
 libxau-install:
 	${INSTALL_DIR} ${IDIR_LIBXAU}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libXau.so* ${IDIR_LIBXAU}/usr/lib/

package/libXext/Makefile

@@ -22,7 +22,6 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call HOST_template,LIBXEXT,libxext,$(PKG_VERSION)-${PKG_RELEASE}))
 $(eval $(call PKG_template,LIBXEXT,libxext,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-HOST_STYLE:=		auto
 CONFIGURE_ARGS+=	--disable-malloc0returnsnull
 
 libxext-install:

package/libXi/Makefile

@@ -23,7 +23,6 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call HOST_template,LIBXI,libxi,$(PKG_VERSION)-${PKG_RELEASE}))
 $(eval $(call PKG_template,LIBXI,libxi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},$(PKG_OPTS)))
 
-HOST_STYLE:=		auto
 CONFIGURE_ARGS+=	--disable-malloc0returnsnull
 
 libxi-install:

package/libXinerama/Makefile

@@ -23,7 +23,6 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call HOST_template,LIBXINERAMA,libxinerama,$(PKG_VERSION)-${PKG_RELEASE}))
 $(eval $(call PKG_template,LIBXINERAMA,libxinerama,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-HOST_STYLE:=		auto
 CONFIGURE_ARGS+= 	--disable-malloc0returnsnull
 
 libxinerama-install:

package/libXrender/Makefile

@@ -24,7 +24,6 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call HOST_template,LIBXRENDER,libxrender,$(PKG_VERSION)-${PKG_RELEASE}))
 $(eval $(call PKG_template,LIBXRENDER,libxrender,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-HOST_STYLE:=		auto
 CONFIGURE_ARGS+=	--disable-malloc0returnsnull
 
 libxrender-install:

package/libXt/Makefile

@@ -25,7 +25,6 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call HOST_template,LIBXT,libxt,$(PKG_VERSION)-${PKG_RELEASE}))
 $(eval $(call PKG_template,LIBXT,libxt,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-HOST_STYLE:=		auto
 AUTOTOOL_STYLE:=	autoreconf
 CONFIGURE_ENV+=		CFLAGS_FOR_BUILD="$(CPPFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD)"
 CONFIGURE_ARGS+=	--disable-malloc0returnsnull

package/libXtst/Makefile

@@ -26,7 +26,6 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call HOST_template,LIBXTST,libxtst,$(PKG_VERSION)-${PKG_RELEASE}))
 $(eval $(call PKG_template,LIBXTST,libxtst,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-HOST_STYLE:=		auto
 CONFIGURE_ARGS+= 	--disable-malloc0returnsnull
 
 libxtst-install:

package/libatomic_ops/Makefile

@@ -22,8 +22,6 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call HOST_template,LIBATOMIC_OPS,libatomic-ops,$(PKG_VERSION)-${PKG_RELEASE}))
 $(eval $(call PKG_template,LIBATOMIC_OPS,libatomic-ops,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-HOST_STYLE:=		auto
-
 libatomic-ops-install:
 	$(INSTALL_DIR) $(IDIR_LIBATOMIC_OPS)/usr/lib
 	$(CP) $(WRKINST)/usr/lib/libatomic_ops*.so* \

package/libcroco/Makefile

@@ -21,8 +21,6 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call HOST_template,LIBCROCO,libcroco,$(PKG_VERSION)-${PKG_RELEASE}))
 $(eval $(call PKG_template,LIBCROCO,libcroco,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-HOST_STYLE:=		auto
-
 libcroco-install:
 	$(INSTALL_DIR) $(IDIR_LIBCROCO)/usr/lib
 	$(CP) $(WRKINST)/usr/lib/libcroco*.so* \

package/libffi/Makefile

@@ -4,12 +4,12 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		libffi
-PKG_VERSION:=		3.0.13
+PKG_VERSION:=		3.1
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		45f3b6dbc9ee7c7dfbbbc5feba571529
+PKG_MD5SUM:=		f5898b29bbfd70502831a212d9249d10
 PKG_DESCR:=		foreign function interface library
 PKG_SECTION:=		libs/misc
-PKG_BUILDDEP:=		autotool libffi-host
+PKG_BUILDDEP:=		autotool
 HOST_BUILDDEP:=		autotool
 PKG_URL:=		http://sourceware.org/libffi/
 PKG_SITES:=		ftp://sourceware.org/pub/libffi/

package/libffi/patches/patch-configure_ac

@@ -1,14 +0,0 @@
---- libffi-3.0.13.orig/configure.ac	2013-03-17 23:36:15.000000000 +0100
-+++ libffi-3.0.13/configure.ac	2013-12-05 15:58:33.000000000 +0100
-@@ -546,11 +546,6 @@ if test "x$GCC" = "xyes"; then
-     toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
-     toolexeclibdir='$(libdir)'
-   fi
--  multi_os_directory=`$CC -print-multi-os-directory`
--  case $multi_os_directory in
--    .) ;; # Avoid trailing /.
--    ../*) toolexeclibdir=$toolexeclibdir/$multi_os_directory ;;
--  esac
-   AC_SUBST(toolexecdir)
- else
-   toolexeclibdir='$(libdir)'

package/libffi/patches/patch-include_Makefile_am

@@ -1,5 +1,5 @@
---- libffi-3.0.13.orig/include/Makefile.am	2013-03-16 12:19:39.000000000 +0100
-+++ libffi-3.0.13/include/Makefile.am	2013-12-05 16:33:48.000000000 +0100
+--- libffi-3.1.orig/include/Makefile.am	2014-04-25 19:45:13.000000000 +0200
++++ libffi-3.1/include/Makefile.am	2014-06-12 15:22:08.000000000 +0200
 @@ -5,5 +5,5 @@ AUTOMAKE_OPTIONS=foreign
  DISTCLEANFILES=ffitarget.h
  EXTRA_DIST=ffi.h.in ffi_common.h

package/libffi/patches/patch-libffi_pc_in

@@ -1,11 +1,16 @@
---- libffi-3.0.9.orig/libffi.pc.in	2009-12-31 13:38:48.000000000 +0100
-+++ libffi-3.0.9/libffi.pc.in	2010-12-11 01:46:04.000000000 +0100
-@@ -1,7 +1,7 @@
+--- libffi-3.1.orig/libffi.pc.in	2014-04-25 19:45:13.000000000 +0200
++++ libffi-3.1/libffi.pc.in	2014-06-12 17:35:39.000000000 +0200
+@@ -1,11 +1,10 @@
  prefix=@prefix@
  exec_prefix=@exec_prefix@
  libdir=@libdir@
+-toolexeclibdir=@toolexeclibdir@
 -includedir=${libdir}/@PACKAGE_NAME@-@PACKAGE_VERSION@/include
-+includedir=@includedir@
++includedir=${prefix}/include
  
  Name: @PACKAGE_NAME@
  Description: Library supporting Foreign Function Interfaces
+ Version: @PACKAGE_VERSION@
+-Libs: -L${toolexeclibdir} -lffi
++Libs: -lffi
+ Cflags: -I${includedir}

package/libgc/Makefile

@@ -24,8 +24,6 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call HOST_template,LIBGC,libgc,$(PKG_VERSION)-${PKG_RELEASE}))
 $(eval $(call PKG_template,LIBGC,libgc,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-HOST_STYLE:=		auto
-
 libgc-install:
 	$(INSTALL_DIR) $(IDIR_LIBGC)/usr/lib
 	$(CP) $(WRKINST)/usr/lib/libgc*.so* \

package/liblzo/Makefile

@@ -22,7 +22,6 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call HOST_template,LIBLZO,liblzo,${PKG_VERSION}-${PKG_RELEASE}))
 $(eval $(call PKG_template,LIBLZO,liblzo,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},$(PKG_OPTS)))
 
-HOST_STYLE:=		auto
 CONFIGURE_ARGS+=	--enable-static
 MAKE_FLAGS+=		CFLAGS_O="${TARGET_CFLAGS}"
 

package/libpng/Makefile

@@ -21,8 +21,6 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call HOST_template,LIBPNG,libpng,${PKG_VERSION}-${PKG_RELEASE}))
 $(eval $(call PKG_template,LIBPNG,libpng,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-HOST_STYLE:=		auto
-
 libpng-install:
 	${INSTALL_DIR} ${IDIR_LIBPNG}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libpng*.so* ${IDIR_LIBPNG}/usr/lib

package/librsvg/Makefile

@@ -22,7 +22,6 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call HOST_template,LIBRSVG,librsvg,$(PKG_VERSION)-${PKG_RELEASE}))
 $(eval $(call PKG_template,LIBRSVG,librsvg,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-HOST_STYLE:=		auto
 HOST_CONFIGURE_ARGS+=	--enable-introspection=no
 CONFIGURE_ARGS+=	--enable-introspection=no
 

package/libtirpc/patches/patch-Makefile_in

@@ -1,11 +0,0 @@
---- libtirpc-0.2.4.orig/Makefile.in	2014-05-18 08:04:24.702953856 +0200
-+++ libtirpc-0.2.4/Makefile.in	2014-05-17 22:53:56.735636862 +0200
-@@ -344,7 +344,7 @@ target_alias = @target_alias@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--SUBDIRS = src man doc
-+SUBDIRS = src
- ACLOCAL_AMFLAGS = -I m4
- noinst_HEADERS = tirpc/reentrant.h \
- 			 tirpc/getpeereid.h \

package/libtirpc/patches/patch-src_Makefile_in

@@ -1,69 +0,0 @@
---- libtirpc-0.2.4.orig/src/Makefile.in	2014-05-18 08:04:24.954954664 +0200
-+++ libtirpc-0.2.4/src/Makefile.in	2014-05-17 22:53:56.967637091 +0200
-@@ -134,9 +134,9 @@ am__libtirpc_la_SOURCES_DIST = auth_none
- 	rpcb_clnt.c rpcb_prot.c rpcb_st_xdr.c svc.c svc_auth.c \
- 	svc_dg.c svc_auth_unix.c svc_auth_none.c svc_generic.c \
- 	svc_raw.c svc_run.c svc_simple.c svc_vc.c getpeereid.c \
--	auth_time.c auth_des.c authdes_prot.c xdr.c xdr_rec.c \
--	xdr_array.c xdr_float.c xdr_mem.c xdr_reference.c xdr_stdio.c \
--	auth_gss.c authgss_prot.c svc_auth_gss.c
-+	authdes_prot.c xdr.c xdr_rec.c xdr_array.c xdr_float.c \
-+	xdr_mem.c xdr_reference.c xdr_stdio.c auth_gss.c \
-+	authgss_prot.c svc_auth_gss.c
- @GSS_TRUE@am__objects_1 = libtirpc_la-auth_gss.lo \
- @GSS_TRUE@	libtirpc_la-authgss_prot.lo \
- @GSS_TRUE@	libtirpc_la-svc_auth_gss.lo
-@@ -161,8 +161,7 @@ am_libtirpc_la_OBJECTS = libtirpc_la-aut
- 	libtirpc_la-svc_auth_none.lo libtirpc_la-svc_generic.lo \
- 	libtirpc_la-svc_raw.lo libtirpc_la-svc_run.lo \
- 	libtirpc_la-svc_simple.lo libtirpc_la-svc_vc.lo \
--	libtirpc_la-getpeereid.lo libtirpc_la-auth_time.lo \
--	libtirpc_la-auth_des.lo libtirpc_la-authdes_prot.lo \
-+	libtirpc_la-getpeereid.lo libtirpc_la-authdes_prot.lo \
- 	libtirpc_la-xdr.lo libtirpc_la-xdr_rec.lo \
- 	libtirpc_la-xdr_array.lo libtirpc_la-xdr_float.lo \
- 	libtirpc_la-xdr_mem.lo libtirpc_la-xdr_reference.lo \
-@@ -400,9 +399,8 @@ libtirpc_la_SOURCES = auth_none.c auth_u
- 	rpcb_clnt.c rpcb_prot.c rpcb_st_xdr.c svc.c svc_auth.c \
- 	svc_dg.c svc_auth_unix.c svc_auth_none.c svc_generic.c \
- 	svc_raw.c svc_run.c svc_simple.c svc_vc.c getpeereid.c \
--	auth_time.c auth_des.c authdes_prot.c xdr.c xdr_rec.c \
--	xdr_array.c xdr_float.c xdr_mem.c xdr_reference.c xdr_stdio.c \
--	$(am__append_1)
-+	authdes_prot.c xdr.c xdr_rec.c xdr_array.c xdr_float.c \
-+	xdr_mem.c xdr_reference.c xdr_stdio.c $(am__append_1)
- @GSS_TRUE@libtirpc_la_CFLAGS = -DHAVE_RPCSEC_GSS $(GSSAPI_CFLAGS)
- CLEANFILES = cscope.* *~
- DISTCLEANFILES = Makefile.in
-@@ -485,10 +483,8 @@ mostlyclean-compile:
- distclean-compile:
- 	-rm -f *.tab.c
- 
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtirpc_la-auth_des.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtirpc_la-auth_gss.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtirpc_la-auth_none.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtirpc_la-auth_time.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtirpc_la-auth_unix.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtirpc_la-authdes_prot.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtirpc_la-authgss_prot.Plo@am__quote@
-@@ -856,20 +852,6 @@ libtirpc_la-getpeereid.lo: getpeereid.c
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtirpc_la_CFLAGS) $(CFLAGS) -c -o libtirpc_la-getpeereid.lo `test -f 'getpeereid.c' || echo '$(srcdir)/'`getpeereid.c
- 
--libtirpc_la-auth_time.lo: auth_time.c
--@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtirpc_la_CFLAGS) $(CFLAGS) -MT libtirpc_la-auth_time.lo -MD -MP -MF $(DEPDIR)/libtirpc_la-auth_time.Tpo -c -o libtirpc_la-auth_time.lo `test -f 'auth_time.c' || echo '$(srcdir)/'`auth_time.c
--@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libtirpc_la-auth_time.Tpo $(DEPDIR)/libtirpc_la-auth_time.Plo
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='auth_time.c' object='libtirpc_la-auth_time.lo' libtool=yes @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtirpc_la_CFLAGS) $(CFLAGS) -c -o libtirpc_la-auth_time.lo `test -f 'auth_time.c' || echo '$(srcdir)/'`auth_time.c
--
--libtirpc_la-auth_des.lo: auth_des.c
--@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtirpc_la_CFLAGS) $(CFLAGS) -MT libtirpc_la-auth_des.lo -MD -MP -MF $(DEPDIR)/libtirpc_la-auth_des.Tpo -c -o libtirpc_la-auth_des.lo `test -f 'auth_des.c' || echo '$(srcdir)/'`auth_des.c
--@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libtirpc_la-auth_des.Tpo $(DEPDIR)/libtirpc_la-auth_des.Plo
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='auth_des.c' object='libtirpc_la-auth_des.lo' libtool=yes @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtirpc_la_CFLAGS) $(CFLAGS) -c -o libtirpc_la-auth_des.lo `test -f 'auth_des.c' || echo '$(srcdir)/'`auth_des.c
--
- libtirpc_la-authdes_prot.lo: authdes_prot.c
- @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtirpc_la_CFLAGS) $(CFLAGS) -MT libtirpc_la-authdes_prot.lo -MD -MP -MF $(DEPDIR)/libtirpc_la-authdes_prot.Tpo -c -o libtirpc_la-authdes_prot.lo `test -f 'authdes_prot.c' || echo '$(srcdir)/'`authdes_prot.c
- @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libtirpc_la-authdes_prot.Tpo $(DEPDIR)/libtirpc_la-authdes_prot.Plo

package/libtool/Makefile

@@ -29,7 +29,6 @@ ifeq (${ADK_HOST_OPENBSD},y)
 XAKE_FLAGS+=		AUTOCONF_VERSION=2.62
 endif
 
-HOST_STYLE:=		auto
 CONFIGURE_ARGS+=	--enable-ltdl-install
 XAKE_FLAGS+=		HELP2MAN=/bin/echo
 HOST_XAKE_FLAGS+=	HELP2MAN=/bin/echo

package/libxcb/Makefile

@@ -25,7 +25,6 @@ $(eval $(call PKG_template,LIBXCB,libxcb,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEP
 
 include $(TOPDIR)/mk/python.mk
 
-HOST_STYLE:=		auto
 CONFIGURE_ENV+=		PYTHON=$(PYTHON)
 
 libxcb-install:

package/libxml2/Makefile

@@ -33,7 +33,6 @@ $(eval $(call PKG_template,LIBXML2_PYTHON,libxml2-python,${PKG_VERSION}-${PKG_RE
 
 include $(TOPDIR)/mk/python.mk
 
-HOST_STYLE:=		auto
 HOST_CONFIGURE_ARGS+=	--with-python \
 			--without-iconv \
 			--without-lzma \

package/libxslt/Makefile

@@ -29,7 +29,6 @@ $(eval $(call HOST_template,LIBXSLT,libxslt,${PKG_VERSION}-${PKG_RELEASE}))
 $(eval $(call PKG_template,LIBXSLT,libxslt,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 $(eval $(call PKG_template,XSLTPROC,xsltproc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_XSLTPROC},${PKGSC_XSLTPROC}))
 
-HOST_STYLE:=		auto
 HOST_CONFIGURE_ARGS+=	--without-python \
 			--without-crypto \
 			--with-libxml-prefix="${STAGING_HOST_DIR}/usr" \

package/lzma/Makefile

@@ -18,8 +18,6 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call HOST_template,LZMA,lzma,$(PKG_VERSION)-${PKG_RELEASE}))
 $(eval $(call PKG_template,LZMA,lzma,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-HOST_STYLE:=		auto
-
 lzma-install:
 	$(INSTALL_DIR) $(IDIR_LZMA)/usr/bin
 	$(INSTALL_BIN) $(WRKINST)/usr/bin/lzma $(IDIR_LZMA)/usr/bin

package/lzop/Makefile

@@ -23,8 +23,6 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call HOST_template,LZOP,lzop,$(PKG_VERSION)-${PKG_RELEASE}))
 $(eval $(call PKG_template,LZOP,lzop,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-HOST_STYLE:=		auto
-
 lzop-install:
 	$(INSTALL_DIR) $(IDIR_LZOP)/usr/bin
 	$(INSTALL_BIN) $(WRKINST)/usr/bin/lzop $(IDIR_LZOP)/usr/bin

package/m4/Makefile

@@ -22,7 +22,6 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call HOST_template,M4,m4,${PKG_VERSION}-${PKG_RELEASE}))
 $(eval $(call PKG_template,M4,m4,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-HOST_STYLE:=		auto
 CONFIGURE_ENV+=		ac_cv_func_posix_spawn=yes \
 			ac_cv_func_posix_spawn_works=yes
 TARGET_LDFLAGS+=	-lrt

package/nasm/Makefile

@@ -20,7 +20,6 @@ $(eval $(call HOST_template,NASM,nasm,$(PKG_VERSION)-${PKG_RELEASE}))
 $(eval $(call PKG_template,NASM,nasm,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 FAKE_FLAGS+=		INSTALLROOT=${WRKINST}
-HOST_STYLE:=		auto
 
 nasm-install:
 	$(INSTALL_DIR) $(IDIR_NASM)/usr/bin

package/ncurses/Makefile

@@ -54,7 +54,6 @@ CONFIGURE_ARGS+=	--without-cxx \
 ALL_TARGET:=		libs
 INSTALL_TARGET:=	install.libs install.data
 
-HOST_STYLE:=		auto
 # use sth which does not exist
 HOST_ALL_TARGET:=	progs
 HOST_INSTALL_TARGET:=	install.includes install.progs

package/openjdk7/Makefile

@@ -106,7 +106,6 @@ OPENJDK_NATIVE_ENV:=	JAVACFLAGS="-cp ${STAGING_HOST_DIR}/usr/share/java/libgcj-$
 			ALT_FREETYPE_HEADERS_PATH="$(STAGING_HOST_DIR)/usr/include" \
 			ALT_FREETYPE_LIB_PATH="$(STAGING_HOST_DIR)/usr/lib"
 			
-HOST_STYLE:=		auto
 HOST_CONFIGURE_ENV+=	$(OPENJDK_NATIVE_ENV)
 HOST_MAKE_ENV+=		$(OPENJDK_NATIVE_ENV)
 HOST_ALL_TARGET:=	icedtea-boot

package/orbit2/Makefile

@@ -18,13 +18,14 @@ PKG_OPTS:=		dev
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
+include $(TOPDIR)/mk/host.mk
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,ORBIT2,orbit2,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-CFLAGS_FOR_BUILD+=	$(shell PATH=$(HOST_PATH) libIDL-config-2 --cflags)
+CFLAGS_FOR_BUILD+=	$(shell env $(HOST_CONFIGURE_ENV) libIDL-config-2 --cflags)
 LDFLAGS_FOR_BUILD+=	-static
-LIBS_FOR_BUILD:=	$(shell PATH=$(HOST_PATH) libIDL-config-2 --libs)
+LIBS_FOR_BUILD:=	$(shell env $(HOST_CONFIGURE_ENV) libIDL-config-2 --libs)
 LIBS_FOR_BUILD+=	-lgmodule-2.0 -ldl -lpthread -lrt -lglib-2.0
 XAKE_FLAGS+=		LIBS_FOR_BUILD="${LIBS_FOR_BUILD}"
 CONFIGURE_ENV+=		ac_cv_alignof_CORBA_octet=1 \
@@ -49,4 +50,5 @@ orbit2-install:
 	$(CP) $(WRKINST)/usr/bin/orbit-idl-2 \
 		$(STAGING_TARGET_DIR)/usr/bin
 
+include ${TOPDIR}/mk/host-bottom.mk
 include ${TOPDIR}/mk/pkg-bottom.mk

package/pango/Makefile

@@ -22,7 +22,6 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call HOST_template,PANGO,pango,${PKG_VERSION}-${PKG_RELEASE}))
 $(eval $(call PKG_template,PANGO,pango,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-HOST_STYLE:=		auto
 CONFIGURE_ENV+=		ac_cv_path_EGREP="grep -E"
 
 pango-install:

package/patch/Makefile

@@ -19,8 +19,6 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call HOST_template,PATCH,patch,$(PKG_VERSION)-${PKG_RELEASE}))
 $(eval $(call PKG_template,PATCH,patch,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-HOST_STYLE:=		auto
-
 patch-install:
 	$(INSTALL_DIR) $(IDIR_PATCH)/usr/bin
 	$(INSTALL_BIN) $(WRKINST)/usr/bin/patch $(IDIR_PATCH)/usr/bin

package/pcre/Makefile

@@ -27,7 +27,6 @@ $(eval $(call HOST_template,PCRE,pcre,${PKG_VERSION}-${PKG_RELEASE}))
 $(eval $(call PKG_template,LIBPCRE,libpcre,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 $(eval $(call PKG_template,LIBPCRECPP,libpcrecpp,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBPCRECPP},${PKG_SECTION}))
 
-HOST_STYLE:=		auto
 CONFIGURE_ARGS+=	--enable-utf \
 			--enable-unicode-properties
 XAKE_FLAGS+=		${TARGET_CONFIGURE_OPTS}

package/pixman/Makefile

@@ -22,7 +22,6 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call HOST_template,PIXMAN,pixman,$(PKG_VERSION)-${PKG_RELEASE}))
 $(eval $(call PKG_template,PIXMAN,pixman,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-HOST_STYLE:=		auto
 CONFIGURE_ARGS+=	--disable-gtk \
 			--disable-arm-iwmmxt
 

package/pkgconf/Makefile

@@ -20,8 +20,6 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call HOST_template,PKGCONF,pkgconf,$(PKG_VERSION)-${PKG_RELEASE}))
 $(eval $(call PKG_template,PKGCONF,pkgconf,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-HOST_STYLE:=		auto
-
 hostpost-install:
 	(cd $(STAGING_HOST_DIR)/usr/bin && ln -sf pkgconf pkg-config)
 	(cd $(STAGING_HOST_DIR)/usr/bin && ln -sf pkgconf $(GNU_TARGET_NAME)-pkg-config)

package/python2/Makefile

@@ -96,7 +96,6 @@ CONFIGURE_ARGS:=	--with-threads \
 			--with-system-ffi \
 			--without-cxx-main
 
-HOST_STYLE:=		auto
 HOST_CONFIGURE_ARGS+=	--with-threads \
 			--disable-ipv6 \
 			--disable-shared \

package/python3/Makefile

@@ -95,7 +95,6 @@ CONFIGURE_ENV+=		ac_cv_have_long_long_format=yes \
 			ac_cv_file__dev_ptmx=yes \
 			ac_cv_file__dev_ptc=no
 
-HOST_STYLE:=		auto
 HOST_CONFIGURE_ARGS+=	--without-cxx-main \
 			--with-threads
 

package/readline/Makefile

@@ -23,7 +23,6 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call HOST_template,READLINE,readline,${PKG_VERSION}-${PKG_RELEASE}))
 $(eval $(call PKG_template,LIBREADLINE,libreadline,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-HOST_STYLE:=		auto
 CONFIGURE_ARGS+= 	--with-curses
 
 libreadline-install:

package/sdl-image/Makefile

@@ -29,7 +29,6 @@ ifeq ($(ADK_HOST_DARWIN),y)
 LDFLAGS_FOR_BUILD+=	-framework Cocoa
 endif
 
-HOST_STYLE:=		auto
 HOST_CONFIGURE_ARGS+=	--disable-png-shared
 CONFIGURE_ARGS+=	--enable-png \
 			--enable-jpg \

package/sdl/Makefile

@@ -30,7 +30,6 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call HOST_template,LIBSDL,libsdl,$(PKG_VERSION)-${PKG_RELEASE}))
 $(eval $(call PKG_template,LIBSDL,libsdl,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-HOST_STYLE:=		auto
 HOST_CONFIGURE_ARGS+=	--without-x \
 			--enable-shared \
 			--disable-cdrom \

package/sed/Makefile

@@ -21,8 +21,6 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call HOST_template,SED,sed,$(PKG_VERSION)-${PKG_RELEASE}))
 $(eval $(call PKG_template,SED,sed,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-HOST_STYLE:=		auto
-
 sed-install:
 	$(INSTALL_DIR) $(IDIR_SED)/usr/bin
 	$(INSTALL_BIN) $(WRKINST)/usr/bin/sed \

package/sipsak/Makefile

@@ -11,8 +11,8 @@ PKG_DESCR:=		sip stress and diagnostics utility
 PKG_SECTION:=		net/voip
 PKG_DEPENDS:=		libopenssl
 PKG_BUILDDEP:=		openssl
-PKG_URL:=		http://sipsak.org/
-PKG_SITES:=		http://download.berlios.de/sipsak/
+PKG_URL:=		http://sourceforge.net/projects/sipsak.berlios/
+PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=sipsak/}
 
 DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION)-1.tar.gz
 

package/swig/Makefile

@@ -21,7 +21,6 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call HOST_template,SWIG,swig,$(PKG_VERSION)-${PKG_RELEASE}))
 
-HOST_STYLE:=		auto
 HOST_ALL_TARGET:=	swig
 HOST_CONFIGURE_ARGS+=	--without-pcre
 

package/tinyxml/Makefile

@@ -20,6 +20,7 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,TINYXML,tinyxml,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
+TARGET_CXXFLAGS+=	-fPIC
 CONFIG_STYLE:=		manual
 INSTALL_STYLE:=		manual
 

package/util-linux/patches/patch-libblkid_blkid_pc_in

@@ -1,16 +0,0 @@
---- util-linux-2.24.2.orig/libblkid/blkid.pc.in	2013-02-27 17:46:29.858020511 +0100
-+++ util-linux-2.24.2/libblkid/blkid.pc.in	2014-05-24 12:49:28.928809032 +0200
-@@ -1,11 +1,8 @@
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@usrlib_execdir@
--includedir=@includedir@
- 
- Name: blkid
- Description: Block device id library
- Version: @LIBBLKID_VERSION@
- Requires.private: uuid
--Cflags: -I${includedir}/blkid
--Libs: -L${libdir} -lblkid
-+Cflags: -I${prefix}/include/blkid
-+Libs: -L${prefix}/lib -lblkid

package/util-linux/patches/patch-libuuid_uuid_pc_in

@@ -1,16 +0,0 @@
---- util-linux-2.24.2.orig/libuuid/uuid.pc.in	2013-02-27 17:46:29.883020734 +0100
-+++ util-linux-2.24.2/libuuid/uuid.pc.in	2014-05-24 12:50:07.644975668 +0200
-@@ -1,11 +1,8 @@
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@usrlib_execdir@
--includedir=@includedir@
- 
- Name: uuid
- Description: Universally unique id library
- Version: @LIBUUID_VERSION@
- Requires:
--Cflags: -I${includedir}/uuid
--Libs: -L${libdir} -luuid
-+Cflags: -I${prefix}/include/uuid
-+Libs: -L${prefix}/lib -luuid

package/util-linux/patches/patch-misc-utils_uuidd_8

@@ -1,20 +0,0 @@
---- util-linux-2.24.2.orig/misc-utils/uuidd.8	2014-04-24 11:25:49.089462731 +0200
-+++ util-linux-2.24.2/misc-utils/uuidd.8	2014-05-19 15:36:26.182277055 +0200
-@@ -34,7 +34,7 @@ UUIDs.
- .TP
- .BR \-p , " \-\-pid " \fIpath\fR
- Specify the pathname where the pid file should be written.  By default,
--the pid file is written to /run/uuidd/uuidd.pid.
-+the pid file is written to /var/uuidd/uuidd.pid.
- .TP
- .BR \-P , " \-\-no-pid "
- Do not create pid file.
-@@ -57,7 +57,7 @@ request it to return a random-based UUID
- .TP
- .BR \-s , " \-\-socket " \fIpath\fR
- Specify the pathname used for the unix-domain socket used by uuidd.  By
--default, the pathname used is /run/uuidd/request.  This is primarily
-+default, the pathname used is /var/uuidd/request.  This is primarily
- for debugging purposes, since the pathname is hard-coded in the libuuid
- library.
- .TP

package/util-macros/Makefile

@@ -22,7 +22,6 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call HOST_template,UTIL_MACROS,util-macros,$(PKG_VERSION)-${PKG_RELEASE}))
 $(eval $(call PKG_template,UTIL_MACROS,util-macros,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-HOST_STYLE:=		auto
 AUTOTOOL_STYLE:=	autoreconf
 
 include ${TOPDIR}/mk/host-bottom.mk

package/vala/Makefile

@@ -20,8 +20,6 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call HOST_template,VALA,vala,$(PKG_VERSION)-${PKG_RELEASE}))
 $(eval $(call PKG_template,VALA,vala,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-HOST_STYLE:=		auto
-
 vala-install:
 	$(INSTALL_DIR) $(IDIR_VALA)/usr/bin
 	$(INSTALL_BIN) $(WRKINST)/usr/bin/valac \

package/xcb-proto/Makefile

@@ -27,7 +27,6 @@ $(eval $(call PKG_template,XCB_PYTHON,xcb-python,$(PKG_VERSION)-${PKG_RELEASE},$
 
 include $(TOPDIR)/mk/python.mk
 
-HOST_STYLE:=		auto
 CONFIGURE_ENV+=		PYTHON=$(PYTHON)
 CONFIGURE_ARGS+=	--datadir=${STAGING_TARGET_DIR}/usr/share
 

package/xtrans/Makefile

@@ -21,7 +21,6 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call HOST_template,XTRANS,xtrans,$(PKG_VERSION)-${PKG_RELEASE}))
 $(eval $(call PKG_template,XTRANS,xtrans,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-HOST_STYLE:=		auto
 HOST_CONFIGURE_ARGS+=	--datadir=$(STAGING_HOST_DIR)/usr/lib
 CONFIGURE_ARGS+=	--datadir=/usr/lib
 

package/xz/Makefile

@@ -22,8 +22,6 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call HOST_template,XZ,xz,${PKG_VERSION}-${PKG_RELEASE}))
 $(eval $(call PKG_template,XZ,xz,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-HOST_STYLE:=		auto
-
 xz-install:
 	${INSTALL_DIR} ${IDIR_XZ}/usr/bin ${IDIR_XZ}/usr/lib
 	${CP} ${WRKINST}/usr/bin/* ${IDIR_XZ}/usr/bin

package/yasm/Makefile

@@ -21,8 +21,6 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call HOST_template,YASM,yasm,$(PKG_VERSION)-${PKG_RELEASE}))
 $(eval $(call PKG_template,YASM,yasm,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-HOST_STYLE:=		auto
-
 yasm-install:
 	$(INSTALL_DIR) $(IDIR_YASM)/usr/bin
 	$(INSTALL_BIN) $(WRKINST)/usr/bin/yasm $(IDIR_YASM)/usr/bin