Merge branch 'master' of git+ssh://openadk.org/git/openadk

.gitignore

@@ -12,13 +12,13 @@ config/zconf.tab.c
 config/zconf.tab.h
 prereq.mk
 toolchain_build_*/
+.ADK_HAVE_DOT_CONFIG
 .tmpconfig.h
 .prereq_done
 .config*
 .busyboxcfg
 .defconfig
 all.config
-.cfg/
 .cfg_*/
 cross_*/
 root_*/
@@ -33,5 +33,4 @@ package/*/Config.in
 package/*/Config.in.lib
 tools_build/
 extra/
-bulkdir/
 .menu

BSDmakefile

@@ -12,7 +12,7 @@ GMAKE_ENV+=	ADKVERSION=${ADKVERSION:Q}
 .if defined(package) && !empty(package)
 subdir:=	package/${package}
 .  if !make(clean)
-_subdir_dep:=	${TOPDIR}/.cfg/ADK_HAVE_DOT_CONFIG
+_subdir_dep:=	${TOPDIR}/.ADK_HAVE_DOT_CONFIG
 .  endif
 .endif
 

BUGS

@@ -1,4 +1,4 @@
+- ruby package need a equal ruby host interpreter
 - packages with subpackages get recompiled
 - openssh on amd64 does not work, ssh-keygen endless loop
 - uclibc on lemote mips64 target does not work (only uclibc-trunk with patches)
-- qemu-mips64* targets does not boot, kernel problem?

GNUmakefile

@@ -11,7 +11,7 @@ export ADKVERSION
 
 ifneq (${package},)
 subdir:=	package/${package}
-_subdir_dep:=	${TOPDIR}/.cfg/ADK_HAVE_DOT_CONFIG
+_subdir_dep:=	${TOPDIR}/.ADK_HAVE_DOT_CONFIG
 endif
 
 ifneq (${subdir},)

mk/build.mk

@@ -21,8 +21,8 @@ DEFCONFIG=		ADK_DEVELSYSTEM=n \
 			ADK_COMPILE_HEIMDAL=n \
 			ADK_PACKAGE_HEIMDAL_PKINIT=n \
 			ADK_PACKAGE_HEIMDAL_SERVER=n \
-			ADK_PACKAGE_HEIMDAL_LIBS=n \
+			ADK_PACKAGE_LIBHEIMDAL=n \
-			ADK_PACKAGE_HEIMDAL_CLIENT_LIBS=n \
+			ADK_PACKAGE_LIBHEIMDAL_CLIENT=n \
 			BUSYBOX_SELINUX=n \
 			BUSYBOX_MODPROBE_SMALL=n \
 			BUSYBOX_EJECT=n \
@@ -58,37 +58,11 @@ noconfig_targets:=	menuconfig \
 			defconfig \
 			tags
 
-MAKECLEANDIR_SYMBOLS=	ADK_DEBUG
-
-MAKECLEAN_SYMBOLS=	ADK_TARGET_PACKAGE_IPKG \
-			ADK_TARGET_PACKAGE_RPM \
-			ADK_TARGET_PACKAGE_TGZ
-
 POSTCONFIG=		-@ \
 	if [ -f .config.old ];then \
-	if [ -d .cfg ];then \
+		if [ -f .busyboxcfg ];then \
-	what=cleantarget; \
+			rm .busyboxcfg; \
-	for symbol in ${MAKECLEANDIR_SYMBOLS}; do \
+		fi; \
-		newval=$$(grep -e "^$$symbol=" -e "^\# $$symbol " .config); \
-		oldval=$$(cat .cfg/"$$symbol" 2>&-); \
-		[[ $$newval = $$oldval ]] && continue; \
-		echo; \
-		echo >&2 "WARNING: Toolchain related options have changed, 'make" \
-		    "$$what' might be required!"; \
-		break; \
-	done; \
-	what=clean; \
-	for symbol in ${MAKECLEAN_SYMBOLS}; do \
-		newval=$$(grep -e "^$$symbol=" -e "^\# $$symbol " .config); \
-		oldval=$$(cat .cfg/"$$symbol" 2>&-); \
-		[[ $$newval = $$oldval ]] && continue; \
-		echo; \
-		echo >&2 "WARNING: Package backend related options have changed, 'make" \
-		    "$$what' might be required!"; \
-		break; \
-	done; \
-	if [ -f .busyboxcfg ];then rm .busyboxcfg;fi; \
-	fi; \
 	fi
 
 # Pull in the user's configuration file
@@ -108,7 +82,7 @@ ${TOPDIR}/package/Depends.mk: ${TOPDIR}/.config $(wildcard ${TOPDIR}/package/*/M
 .NOTPARALLEL:
 .PHONY: all world clean cleantarget cleandir distclean image_clean
 
-world: $(DISTDIR) $(BUILD_DIR) $(TARGET_DIR) $(PACKAGE_DIR) ${TOPDIR}/.cfg_${ADK_TARGET}_${ADK_LIBC}/ADK_HAVE_DOT_CONFIG
+world: $(DISTDIR) $(BUILD_DIR) $(TARGET_DIR) $(PACKAGE_DIR) ${TOPDIR}/.ADK_HAVE_DOT_CONFIG
 	${BASH} ${TOPDIR}/scripts/scan-pkgs.sh
 ifeq ($(ADK_NATIVE),y)
 	$(MAKE) -f mk/build.mk toolchain/kernel-headers-prepare target/config-prepare target/compile package/compile root_clean package/install package_index target/install
@@ -148,10 +122,10 @@ ifeq ($(ADK_TARGET_PACKAGE_IPKG),y)
 	echo "option offline_root ${TARGET_DIR}" >>$(STAGING_DIR)/etc/ipkg.conf
 endif
 
-package/%: ${TOPDIR}/.cfg_${ADK_TARGET}_${ADK_LIBC}/ADK_HAVE_DOT_CONFIG ${STAGING_DIR}/etc/ipkg.conf ${TOPDIR}/package/Depends.mk
+package/%: ${TOPDIR}/.ADK_HAVE_DOT_CONFIG ${STAGING_DIR}/etc/ipkg.conf ${TOPDIR}/package/Depends.mk
 	$(MAKE) -C package $(patsubst package/%,%,$@)
 
-target/%: ${TOPDIR}/.cfg_${ADK_TARGET}_${ADK_LIBC}/ADK_HAVE_DOT_CONFIG
+target/%: ${TOPDIR}/.ADK_HAVE_DOT_CONFIG
 	$(MAKE) -C target $(patsubst target/%,%,$@)
 
 toolchain/%: ${STAGING_DIR}
@@ -164,10 +138,8 @@ switch:
 	echo "Saving configuration for target: ${ADK_TARGET}"
 	cp -p .config .config.${ADK_TARGET}
 	if [ -f .config.old ];then cp -p .config.old .config.old.${ADK_TARGET};fi
-	mv .cfg .cfg.${ADK_TARGET}
 	if [ -f .config.${TARGET} ];then cp -p .config.${TARGET} .config; \
 	cp -p .config.old.${TARGET} .config.old; \
-	mv .cfg.${TARGET} .cfg; \
 	echo "Setting configuration to target: ${TARGET}"; \
 	else echo "No old target config found";mv .config .config.bak; make TARGET=${TARGET};fi
 
@@ -251,7 +223,7 @@ distclean:
 		$(TOOLS_BUILD_DIR)
 	@rm -f .config* .defconfig .tmpconfig.h all.config ${TOPDIR}/prereq.mk \
 	    .menu ${TOPDIR}/package/*/info.mk ${TOPDIR}/package/Depends.mk \
-	    .busyboxcfg
+	    .busyboxcfg .ADK_HAVE_DOT_CONFIG
 
 else # ! ifeq ($(strip $(ADK_HAVE_DOT_CONFIG)),y)
 
@@ -427,7 +399,7 @@ distclean:
 	    ${TOPDIR}/.cfg* ${TOPDIR}/package/pkglist.d 
 	@rm -rf $(TOOLCHAIN_BUILD_DIR_PFX) $(STAGING_PARENT_PFX) $(TOOLS_BUILD_DIR)
 	@rm -f .config* .defconfig .tmpconfig.h all.config ${TOPDIR}/prereq.mk \
-	    .menu ${TOPDIR}/package/*/info.mk ${TOPDIR}/package/Depends.mk
+	    .menu ${TOPDIR}/package/*/info.mk ${TOPDIR}/package/Depends.mk .ADK_HAVE_DOT_CONFIG
 
 endif # ! ifeq ($(strip $(ADK_HAVE_DOT_CONFIG)),y)
 

mk/buildhlp.mk

@@ -58,7 +58,7 @@ post-patch:
 ${WRKDIST}/.prepared: ${WRKDIST}/.extract_done
 	[ ! -d ./patches ] || ${PREVENT_PATCH} ${PATCH} ${WRKDIST} ./patches \
 	    '{patch-!(*.orig),*.patch}' $(MAKE_TRACE)
-	[ ! -d ./extra ] || (cd extra; $(PREVENT_PATCH) cp -Rp . ${WRKDIST}/) \
+	[ ! -d ./src ] || (cd src; $(PREVENT_PATCH) cp -Rp . ${WRKDIST}/) \
 		$(MAKE_TRACE)
 	@${MAKE} post-patch $(MAKE_TRACE)
 	touch $@

mk/package.mk

@@ -54,7 +54,6 @@ CONFIGURE_ENV+=		CONFIG_SHELL='$(strip ${SHELL})' \
 else
 CONFIGURE_ENV+=		${TARGET_CONFIGURE_OPTS} \
 			${HOST_CONFIGURE_OPTS} \
-			CC='${TARGET_CC}' CXX='${TARGET_CXX}' \
 			CFLAGS='$(strip ${TCFLAGS})' \
 			CXXFLAGS='$(strip ${TCXXFLAGS})' \
 			CPPFLAGS='$(strip ${TCPPFLAGS})' \
@@ -65,6 +64,7 @@ CONFIGURE_ENV+=		${TARGET_CONFIGURE_OPTS} \
 			ac_cv_func_realloc_0_nonnull=yes \
 			ac_cv_func_malloc_0_nonnull=yes
 endif
+CONFIGURE_PROG?=	configure
 MAKE_FILE?=		Makefile
 # this is environment for 'make all' and 'make install'
 MAKE_ENV?=
@@ -91,15 +91,19 @@ MAKE_ENV+=		PATH='${TARGET_PATH}' \
 			WRKSRC='${WRKSRC}' WRKBUILD='${WRKBUILD}' \
 			PKG_CONFIG_PATH='${STAGING_DIR}/usr/lib/pkgconfig' \
 			PKG_CONFIG_LIBDIR=/dev/null \
-			CC='${TARGET_CC}' CXX='${TARGET_CXX}' \
+			CC='${TARGET_CC}' \
-			AR='${TARGET_CROSS}ar' RANLIB='${TARGET_CROSS}ranlib' \
+			CXX='${TARGET_CXX}' \
+			AR='${TARGET_CROSS}ar' \
+			RANLIB='${TARGET_CROSS}ranlib' \
 			NM='${TARGET_CROSS}nm' \
+			STRIP='${TARGET_CROSS}strip' \
+			CROSS="$(TARGET_CROSS)" \
 			CFLAGS='$(strip ${TCFLAGS})' \
 			CXXFLAGS='$(strip ${TCXXFLAGS})' \
 			CPPFLAGS='$(strip ${TCPPFLAGS})' \
 			LDFLAGS='$(strip ${TLDFLAGS})'
 endif
-MAKE_FLAGS+=		${XAKE_FLAGS}
+MAKE_FLAGS+=		${XAKE_FLAGS} V=1
 FAKE_FLAGS+=		${XAKE_FLAGS}
 
 ifeq ($(strip ${WRKDIR_BSD}),)

mk/pkg-bottom.mk

@@ -5,11 +5,11 @@
 #   that we can call it (BSD make has .if target(foo) but GNU not)
 #   and it won't error out.
 # * ${_foo_COOKIE} are the actual targets
-# * default is "manual" -> define a do-foo: target in the Makefile
+# * default is "auto" 
+# * define "manual" if you need your own method
+#   -> define a do-foo: target in the Makefile
 # * if you have a style -> define a pre-foo: and post-foo: if they
 #   are required, but the do-foo: magic is done here
-# * we want to use styles (configure:gnu, build/install:auto), for
-#   making the Makefiles of the packages more clear
 
 pre-configure:
 do-configure:
@@ -18,21 +18,42 @@ ${_CONFIGURE_COOKIE}: ${_PATCH_COOKIE}
 	mkdir -p ${WRKBUILD}
 	@${MAKE} pre-configure $(MAKE_TRACE)
 
-ifneq ($(filter autogen,${CONFIGURE_STYLE}),)
+ifneq ($(filter autogen,${AUTOTOOL_STYLE}),)
 	cd ${WRKBUILD}; \
 		./autogen.sh $(MAKE_TRACE)
 endif
-ifneq ($(filter autotool,${CONFIGURE_STYLE}),)
+ifneq ($(filter autotool,${AUTOTOOL_STYLE}),)
 	cd ${WRKBUILD}; \
 	    env AUTOCONF_VERSION=2.62 \
 		AUTOMAKE_VERSION=1.9 \
 		autoreconf -vif $(MAKE_TRACE)
 endif
-ifneq ($(filter autoconf,${CONFIGURE_STYLE}),)
+ifneq ($(filter autoconf,${AUTOTOOL_STYLE}),)
 	cd ${WRKBUILD}; \
 	    env AUTOCONF_VERSION=2.62 autoconf $(MAKE_TRACE)
 endif
-ifneq ($(filter gnu,${CONFIGURE_STYLE}),)
+ifneq ($(filter manual,${CONFIG_STYLE}),)
+	env ${CONFIGURE_ENV} ${MAKE} do-configure $(MAKE_TRACE)
+else ifneq ($(filter minimal,${CONFIG_STYLE}),)
+	@$(CMD_TRACE) "configuring... "
+	@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;
+	cd ${WRKBUILD}; rm -f config.{cache,status}; \
+	    env ${CONFIGURE_ENV} \
+	    ${BASH} ${WRKSRC}/${CONFIGURE_PROG} \
+	    ${CONFIGURE_ARGS} $(MAKE_TRACE)
+else ifeq ($(strip ${CONFIG_STYLE}),)
 	@$(CMD_TRACE) "configuring... "
 	@cd ${WRKBUILD}; \
 	    for i in $$(find . -name config.sub);do \
@@ -49,7 +70,7 @@ ifneq ($(filter gnu,${CONFIGURE_STYLE}),)
 	    done;
 	cd ${WRKBUILD}; rm -f config.{cache,status}; \
 	    env ${CONFIGURE_ENV} \
-	    ${BASH} ${WRKSRC}/configure \
+	    ${BASH} ${WRKSRC}/${CONFIGURE_PROG} \
 	    --build=${GNU_HOST_NAME} \
 	    --host=${GNU_TARGET_NAME} \
 	    --target=${GNU_TARGET_NAME} \
@@ -67,10 +88,8 @@ ifneq ($(filter gnu,${CONFIGURE_STYLE}),)
 	    --disable-dependency-tracking \
 	    --disable-libtool-lock \
 	    ${CONFIGURE_ARGS} $(MAKE_TRACE)
-else ifeq ($(filter-out manual,${CONFIGURE_STYLE}),)
-	env ${CONFIGURE_ENV} ${MAKE} do-configure $(MAKE_TRACE)
 else
-	@echo "Invalid CONFIGURE_STYLE '${CONFIGURE_STYLE}'" >&2
+	@echo "Invalid CONFIG_STYLE '${CONFIG_STYLE}'" >&2
 	@exit 1
 endif
 	@${MAKE} post-configure $(MAKE_TRACE)
@@ -89,13 +108,12 @@ post-build:
 ${_BUILD_COOKIE}: ${_CONFIGURE_COOKIE}
 	@env ${MAKE_ENV} ${MAKE} pre-build $(MAKE_TRACE)
 	@$(CMD_TRACE) "compiling... "
-ifneq ($(filter auto,${BUILD_STYLE}),)
+
-	cd ${WRKBUILD} && env ${MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \
+ifneq ($(filter manual,${BUILD_STYLE}),)
-	    ${MAKE_FLAGS} ${ALL_TARGET} $(MAKE_TRACE)
-else ifneq ($(filter manual,${BUILD_STYLE}),)
 	env ${MAKE_ENV} ${MAKE} do-build $(MAKE_TRACE)
 else ifeq ($(strip ${BUILD_STYLE}),)
-	env ${MAKE_ENV} ${MAKE} do-build $(MAKE_TRACE)
+	cd ${WRKBUILD} && env ${MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \
+	    ${MAKE_FLAGS} ${ALL_TARGET} $(MAKE_TRACE)
 else
 	@echo "Invalid BUILD_STYLE '${BUILD_STYLE}'" >&2
 	@exit 1
@@ -109,15 +127,15 @@ post-install:
 ${_FAKE_COOKIE}: ${_BUILD_COOKIE}
 	-rm -f ${_ALL_CONTROLS}
 	@mkdir -p '${STAGING_PARENT}/pkg' ${WRKINST} '${STAGING_DIR}/scripts'
+	@mkdir -p ${WRKINST}/{sbin,bin,etc,lib}
+	@mkdir -p ${WRKINST}/usr/{sbin,bin,etc,lib}
 	@${MAKE} ${_ALL_CONTROLS} $(MAKE_TRACE)
 	@env ${MAKE_ENV} ${MAKE} pre-install $(MAKE_TRACE)
-ifneq ($(filter auto,${INSTALL_STYLE}),)
+ifneq ($(filter manual,${INSTALL_STYLE}),)
-	cd ${WRKBUILD} && env ${MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \
-	    DESTDIR='${WRKINST}' ${FAKE_FLAGS} ${INSTALL_TARGET} $(MAKE_TRACE)
-else ifneq ($(filter manual,${INSTALL_STYLE}),)
 	env ${MAKE_ENV} ${MAKE} do-install $(MAKE_TRACE)
 else ifeq ($(strip ${INSTALL_STYLE}),)
-	env ${MAKE_ENV} ${MAKE} do-install $(MAKE_TRACE)
+	cd ${WRKBUILD} && env ${MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \
+	    DESTDIR='${WRKINST}' ${FAKE_FLAGS} ${INSTALL_TARGET} $(MAKE_TRACE)
 else
 	@echo "Invalid INSTALL_STYLE '${INSTALL_STYLE}'" >&2
 	@exit 1

mk/split-cfg.mk

@@ -2,7 +2,8 @@
 # material, please see the LICENCE file in the top-level directory.
 # must work with both BSD and GNU make
 
-${TOPDIR}/.cfg_${ADK_TARGET}_${ADK_LIBC}/ADK_HAVE_DOT_CONFIG: \
+${TOPDIR}/.ADK_HAVE_DOT_CONFIG: \
 	${TOPDIR}/.config ${TOPDIR}/mk/split-cfg.mk \
 	${TOPDIR}/scripts/split-cfg.sh
 	mksh ${TOPDIR}/scripts/split-cfg.sh '${TOPDIR}' '${ADK_TARGET}' '${ADK_LIBC}'
+	touch ${TOPDIR}/.ADK_HAVE_DOT_CONFIG

mk/vars.mk

@@ -46,6 +46,7 @@ TARGET_CROSS:=		$(STAGING_TOOLS)/bin/$(CPU_ARCH)-linux-$(ADK_TARGET_SUFFIX)-
 endif
 TARGET_CC:=		${TARGET_COMPILER_PREFIX}gcc
 TARGET_CXX:=		${TARGET_COMPILER_PREFIX}g++
+TARGET_LD:=		${TARGET_COMPILER_PREFIX}ld
 TARGET_CPPFLAGS+=	-I${STAGING_DIR}/usr/include
 TARGET_LDFLAGS+=	-Wl,-O2
 PATCH=			${BASH} $(SCRIPT_DIR)/patch.sh
@@ -58,11 +59,13 @@ TARGET_CONFIGURE_OPTS=	PATH='${TARGET_PATH}' \
 			AS=$(TARGET_CROSS)as \
 			LD=$(TARGET_CROSS)ld \
 			NM=$(TARGET_CROSS)nm \
-			CC="$(TARGET_CC)" \
+			RANLIB=$(TARGET_CROSS)ranlib \
-			GCC="$(TARGET_CC)" \
+			CC='$(TARGET_CC)' \
-			CXX="$(TARGET_CXX)" \
+			GCC='$(TARGET_CC)' \
-			RANLIB=$(TARGET_CROSS)ranlib
+			CXX='$(TARGET_CXX)' \
+			CROSS='$(TARGET_CROSS)'
 HOST_CONFIGURE_OPTS=	CC_FOR_BUILD='${HOSTCC}' \
+			BUILD_CC='${HOSTCC}' \
 			CFLAGS_FOR_BUILD='${HOSTCFLAGS}' \
 			CPPFLAGS_FOR_BUILD='${HOSTCPPFLAGS}' \
 			LDFLAGS_FOR_BUILD='${HOSTLDFLAGS}'

package/.template/Makefile

@@ -6,12 +6,13 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=		@PKG@
 PKG_VERSION:=		@VER@
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		@add md5sum of package here@
+PKG_MD5SUM:=		add md5sum of package here
-PKG_DESCR:=		@add short description@
+PKG_DESCR:=		add short description
-PKG_SECTION:=		@add section@
+PKG_SECTION:=		add section
-PKG_DEPENDS:=		@add dependendant package names@
+PKG_DEPENDS:=		add dependendant package names
-PKG_URL:=		@add project url@
+PKG_BUILDDEP+=		add packages which need to be compiled
-PKG_SITES:=		@add download url without package name@
+PKG_URL:=		add project url
+PKG_SITES:=		add download url without package name
 
 # if downloaded package is not ending with .tar.gz use following
 #DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
@@ -20,13 +21,13 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,@UPKG@,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
+#CONFIG_STYLE:=		manual
 # use following to add ./configure options
 #CONFIGURE_ARGS+=	--disable-foo
 # overwrite any configure variables
 #CONFIGURE_ENV+=	ac_cv_func_setpgrp_void=yes
-BUILD_STYLE:=		auto
+#BUILD_STYLE:=		manual
-INSTALL_STYLE:=		auto
+#INSTALL_STYLE:=	manual
 
 # please install all files and directories to the package dir
 post-install:
@@ -34,4 +35,5 @@ post-install:
 	$(INSTALL_BIN) $(WRKINST)/usr/bin/@PKG@ \
 		$(IDIR_@UPKG@)/usr/bin
 
+# please remove ALL above comments, before commiting
 include ${TOPDIR}/mk/pkg-bottom.mk

package/6tunnel/Makefile

@@ -4,25 +4,20 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		6tunnel
-PKG_VERSION:=		0.11rc1
+PKG_VERSION:=		0.11rc2
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		b325fa9d238e32195fbb3fc3646b0d28
+PKG_MD5SUM:=		74e02d4f0704b3083a01feda66033449
 PKG_DESCR:=		IPv4/IPv6 tunnel proxy
 PKG_SECTION:=		net
 PKG_DEPENDS:=		kmod-ipv6
+PKG_URL:=		http://toxygen.net/6tunnel/
 PKG_SITES:=		http://toxygen.net/6tunnel/
 
-WRKDIST=		${WRKDIR}/$(PKG_NAME)-0.11
-
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,6TUNNEL,6tunnel,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,6TUNNEL,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE=	gnu
+AUTOTOOL_STYLE:=	autoconf
-CONFIGURE_ENV+=		ac_cv_path_STRIP=$(STRIP) \
-			ac_cv_func_vsnprintf=yes
-ALL_TARGET=		default
-BUILD_STYLE=		auto
 
 post-install:
 	$(INSTALL_DIR) $(IDIR_6TUNNEL)/usr/sbin

package/6tunnel/patches/patch-Makefile_in

@@ -0,0 +1,27 @@
+--- 6tunnel-0.11rc2.orig/Makefile.in	2002-11-24 02:18:47.000000000 +0100
++++ 6tunnel-0.11rc2/Makefile.in	2010-02-05 14:22:35.462572327 +0100
+@@ -10,19 +10,18 @@ INSTALL = @INSTALL@
+ STRIP = @STRIP@
+ VERSION = @VERSION@
+ 
+-default:	6tunnel
++all:	6tunnel
+ 
+ 6tunnel:	6tunnel.c
+ 
+ .PHONY:	install
+ 
+ install:
+-	$(STRIP) 6tunnel
+-	$(INSTALL) -d $(bindir)
+-	$(INSTALL) 6tunnel $(bindir)
++	$(INSTALL) -d $(DESTDIR)$(bindir)
++	$(INSTALL) 6tunnel $(DESTDIR)$(bindir)
+ 
+-	$(INSTALL) -d $(mandir)/man1
+-	$(INSTALL) 6tunnel.1 $(mandir)/man1
++	$(INSTALL) -d $(DESTDIR)$(mandir)/man1
++	$(INSTALL) 6tunnel.1 $(DESTDIR)$(mandir)/man1
+ 
+ .PHONY:	clean
+ 

package/6tunnel/patches/patch-Makefile_in.orig

@@ -0,0 +1,18 @@
+--- 6tunnel-0.11rc2.orig/Makefile.in	2002-11-24 02:18:47.000000000 +0100
++++ 6tunnel-0.11rc2/Makefile.in	2010-02-05 14:21:39.992115665 +0100
+@@ -10,14 +10,13 @@ INSTALL = @INSTALL@
+ STRIP = @STRIP@
+ VERSION = @VERSION@
+ 
+-default:	6tunnel
++all:	6tunnel
+ 
+ 6tunnel:	6tunnel.c
+ 
+ .PHONY:	install
+ 
+ install:
+-	$(STRIP) 6tunnel
+ 	$(INSTALL) -d $(bindir)
+ 	$(INSTALL) 6tunnel $(bindir)
+ 

package/Config.in

@@ -165,7 +165,7 @@ source "package/sispmctl/Config.in"
 source "package/stress/Config.in"
 source "package/sysstat/Config.in"
 source "package/swconfig/Config.in"
-#source "package/udev/Config.in"
+source "package/udev/Config.in"
 source "package/watchdog/Config.in"
 endmenu
 
@@ -189,7 +189,7 @@ source "package/sipsak/Config.in"
 source "package/tcpdump/Config.in"
 source "package/tptest/Config.in"
 source "package/traceroute/Config.in"
-#source "package/trafshow/Config.in"
+source "package/trafshow/Config.in"
 source "package/ttcp/Config.in"
 endmenu
 
@@ -354,6 +354,7 @@ source "package/libnfsidmap/Config.in"
 source "package/libnfnetlink/Config.in"
 source "package/libnfnetlink/Config.in.lib"
 source "package/libnids/Config.in"
+source "package/libnids/Config.in.lib"
 source "package/libnl/Config.in"
 source "package/libnl/Config.in.lib"
 source "package/libogg/Config.in"
@@ -384,14 +385,18 @@ source "package/postgresql/Config.in.lib"
 source "package/libpthread/Config.in"
 source "package/libpthread/Config.in.lib"
 source "package/libthread_db/Config.in"
+source "package/libthread_db/Config.in.lib"
 source "package/readline/Config.in"
 source "package/readline/Config.in.lib"
+source "package/cyrus-sasl/Config.in"
 source "package/cyrus-sasl/Config.in.lib"
 source "package/sdl/Config.in"
 source "package/sdl/Config.in.lib"
 source "package/sdl-image/Config.in"
 source "package/sdl-image/Config.in.lib"
+source "package/net-snmp/Config.in.lib"
 source "package/speex/Config.in"
+source "package/speex/Config.in.lib"
 source "package/openssl/Config.in.lib"
 source "package/sqlite/Config.in.lib"
 source "package/librpcsecgss/Config.in"
@@ -411,6 +416,7 @@ source "package/libtirpc/Config.in.lib"
 source "package/libtorrent/Config.in"
 source "package/libtorrent/Config.in.lib"
 source "package/libupnp/Config.in"
+source "package/libupnp/Config.in.lib"
 source "package/libusb/Config.in"
 source "package/libusb/Config.in.lib"
 source "package/libusb-compat/Config.in"

package/adkinstall/Makefile

@@ -19,6 +19,7 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,ADKINSTALL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+CONFIG_STYLE:=		manual
 BUILD_STYLE:=		manual
 INSTALL_STYLE:=		manual
 

package/aiccu/Makefile

@@ -20,10 +20,12 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,AICCU,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+CONFIG_STYLE:=	manual
+INSTALL_STYLE:=	manual
+
 TCFLAGS+=	-D_REENTRANT -D_GNU_SOURCE -DAICCU_CONSOLE \
 		-D_LINUX -DHAS_IFHEAD -DAICCU_TYPE=\"linux\"
 TLDFLAGS+=	-lpthread -lresolv
-BUILD_STYLE:=	auto
 MAKE_FLAGS+=	CC='${TARGET_CC}' CFLAGS='${TCFLAGS}' LDFLAGS='${TLDFLAGS}'
 
 do-install:

package/aircrack-ng/Makefile

@@ -6,11 +6,11 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=		aircrack-ng
 PKG_VERSION:=		1.0
 PKG_RELEASE:=		1
-PKG_BUILDDEP+=		openssl libpcap
 PKG_MD5SUM:=		dafbfaf944ca9d523fde4bae86f0c067
 PKG_DESCR:=		set of tools for auditing wireless networks
 PKG_SECTION:=		net
 PKG_DEPENDS:=		libpthread libopenssl libpcap
+PKG_BUILDDEP+=		openssl libpcap
 PKG_URL:=		http://www.aircrack-ng.org
 PKG_SITES:=		http://download.aircrack-ng.org/
 
@@ -18,21 +18,26 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,AIRCRACK_NG,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-BUILD_STYLE:=	auto
+CONFIG_STYLE:=		manual
-INSTALL_STYLE:=	auto
+
-XAKE_FLAGS+=	CC="$(TARGET_CC)" \
+XAKE_FLAGS+=		CC="$(TARGET_CC)" \
-		CFLAGS="$(TARGET_CFLAGS) -Wall" \
+			CFLAGS="$(TARGET_CFLAGS) -Wall" \
-		CROSS="$(TARGET_CROSS)" OSNAME="Linux" \
+			OSNAME="Linux" prefix="/usr"
-		prefix="/usr"
 
 post-install:
 	$(INSTALL_DIR) $(IDIR_AIRCRACK_NG)/usr/bin
 	$(INSTALL_DIR) $(IDIR_AIRCRACK_NG)/usr/sbin
-	$(INSTALL_BIN) $(WRKINST)/usr/bin/aircrack-ng $(IDIR_AIRCRACK_NG)/usr/bin/
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/aircrack-ng \
-	$(INSTALL_BIN) $(WRKINST)/usr/bin/airdecap-ng $(IDIR_AIRCRACK_NG)/usr/bin/
+		$(IDIR_AIRCRACK_NG)/usr/bin/
-	$(INSTALL_BIN) $(WRKINST)/usr/bin/packetforge-ng $(IDIR_AIRCRACK_NG)/usr/bin/
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/airdecap-ng \
-	$(INSTALL_BIN) $(WRKINST)/usr/sbin/aireplay-ng $(IDIR_AIRCRACK_NG)/usr/sbin/
+		$(IDIR_AIRCRACK_NG)/usr/bin/
-	$(INSTALL_BIN) $(WRKINST)/usr/sbin/airodump-ng $(IDIR_AIRCRACK_NG)/usr/sbin/
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/packetforge-ng \
-	$(INSTALL_BIN) $(WRKINST)/usr/sbin/airtun-ng $(IDIR_AIRCRACK_NG)/usr/sbin/
+		$(IDIR_AIRCRACK_NG)/usr/bin/
+	$(INSTALL_BIN) $(WRKINST)/usr/sbin/aireplay-ng \
+		$(IDIR_AIRCRACK_NG)/usr/sbin/
+	$(INSTALL_BIN) $(WRKINST)/usr/sbin/airodump-ng \
+		$(IDIR_AIRCRACK_NG)/usr/sbin/
+	$(INSTALL_BIN) $(WRKINST)/usr/sbin/airtun-ng \
+		$(IDIR_AIRCRACK_NG)/usr/sbin/
 
 include ${TOPDIR}/mk/pkg-bottom.mk

package/alsa-lib/Makefile

@@ -9,9 +9,8 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		b28a12348905fb6915bc41f0edb2ecce
 PKG_DESCR:=		ALSA sound library
 PKG_SECTION:=		libs
-PKG_URL:=		http://www.alsa-project.org
+PKG_URL:=		http://www.alsa-project.org/
-PKG_SITES:=		ftp://ftp.task.gda.pl/pub/linux/misc/alsa/lib/ \
+PKG_SITES:=		ftp://ftp.alsa-project.org/pub/lib/
-			ftp://ftp.alsa-project.org/pub/lib/
 
 DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
@@ -19,14 +18,11 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,ALSA_LIB,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	--disable-python
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_ALSA_LIB}/usr/lib ${IDIR_ALSA_LIB}/usr/share/alsa
-	${CP} ${WRKINST}/usr/lib/libasound.so.* ${IDIR_ALSA_LIB}/usr/lib/
+	${CP} ${WRKINST}/usr/lib/libasound.so* ${IDIR_ALSA_LIB}/usr/lib/
 	${CP} ${WRKINST}/usr/share/alsa/* ${IDIR_ALSA_LIB}/usr/share/alsa/
 
 include ${TOPDIR}/mk/pkg-bottom.mk

package/alsa-utils/Makefile

@@ -21,10 +21,7 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,ALSA_UTILS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	--disable-alsamixer
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_ALSA_UTILS}/usr/bin 

package/apr-util/Makefile

@@ -6,11 +6,11 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=              apr-util
 PKG_VERSION:=           0.9.15
 PKG_RELEASE:=           1
-PKG_BUILDDEP+=		expat apr
 PKG_MD5SUM:=            dc772ae295f49ddb8ee8e69a9716c53b
 PKG_DESCR:=		Apache Portable Runtime utility library
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		libexpat apr
+PKG_BUILDDEP+=		expat apr
 PKG_URL:=		http://apr.apache.org
 PKG_SITES:=		http://apache.mirror.clusters.cc/apr/
 
@@ -18,12 +18,9 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,APR_UTIL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=       gnu
 CONFIGURE_ARGS+=	--without-berkeley-db
 CONFIGURE_ARGS+=	--with-apr=${STAGING_DIR}/usr
 CONFIGURE_ARGS+=	--with-expat=${STAGING_DIR}/usr
-BUILD_STYLE:=           auto
-INSTALL_STYLE:=         auto
 XAKE_FLAGS+=		apr_builddir=${STAGING_DIR}/usr/share/build \
 			apr_builders=${STAGING_DIR}/usr/share/build
 

package/apr/Makefile

@@ -6,12 +6,13 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		apr
 PKG_VERSION:=		0.9.17
 PKG_RELEASE:=		1
-ifeq ($(ADK_PACKAGE_APR_THREADING),y)
-PKG_BUILDDEP+=		libpthread
-endif
 PKG_MD5SUM:=		ca1e22d98081a03a33c2a0b8684eb192
 PKG_DESCR:=		Apache Portable Runtime library
 PKG_SECTION:=		libs
+ifeq ($(ADK_PACKAGE_APR_THREADING),y)
+PKG_DEPENDS:=		libpthread
+PKG_BUILDDEP+=		libpthread
+endif
 PKG_URL:=		http://apr.apache.org
 PKG_SITES:=		http://gd.tuwien.ac.at/infosys/servers/http/apache/dist/${PKG_NAME}/
 
@@ -21,13 +22,8 @@ PKGFD_FULL=		Enable threading support
 
 include ${TOPDIR}/mk/package.mk
 
-ifeq (${ADK_PACKAGE_APR_THREADING},y)
-PKG_DEPENDS:=		libpthread
-endif
-
 $(eval $(call PKG_template,APR,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
 # uClibc setpgrp does not take arguments
 CONFIGURE_ENV+=		ac_cv_func_setpgrp_void=yes
 CONFIGURE_ENV+=		ac_cv_sizeof_size_t=4
@@ -43,16 +39,15 @@ else
 CONFIGURE_ARGS+=	--disable-threads
 endif
 
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 post-install:
 	${INSTALL_DIR} ${IDIR_APR}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libapr-0.so* ${IDIR_APR}/usr/lib/
 	${INSTALL_DIR} ${STAGING_DIR}/usr/share/build
 	${CP} ${WRKINST}/usr/share/build/* ${STAGING_DIR}/usr/share/build/
 	# we need to patch paths to get apr-util compiling
-	$(SED) "s,\(^installbuilddir=\"\)\(.*\),\1${STAGING_DIR}\2," ${WRKINST}/usr/bin/apr-config
+	$(SED) "s,\(^installbuilddir=\"\)\(.*\),\1${STAGING_DIR}\2," \
-	$(SED) "s,\(^datadir=\"\)\(.*\),\1${STAGING_DIR}\2," ${WRKINST}/usr/bin/apr-config
+		${WRKINST}/usr/bin/apr-config
+	$(SED) "s,\(^datadir=\"\)\(.*\),\1${STAGING_DIR}\2," \
+		${WRKINST}/usr/bin/apr-config
 
 include ${TOPDIR}/mk/pkg-bottom.mk

package/arpd/Makefile

@@ -6,11 +6,11 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		arpd
 PKG_VERSION:=		0.2
 PKG_RELEASE:=		1
-PKG_BUILDDEP+=		libpcap libdnet libevent
 PKG_MD5SUM:=		e2911fa9de1b92ef50deda1489ae944d
 PKG_DESCR:=		Generates ARP responses for IP address ranges
 PKG_SECTION:=		net
 PKG_DEPENDS:=		libpcap libdnet libevent
+PKG_BUILDDEP+=		libpcap libdnet libevent
 PKG_URL:=		http://niels.xtdnet.nl/honeyd/
 PKG_SITES:=		http://niels.xtdnet.nl/honeyd/
 
@@ -20,11 +20,9 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,ARPD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS+=	--with-libdnet=${STAGING_DIR}/usr \
 			--with-libevent=${STAGING_DIR}/usr \
 			--with-libpcap=${STAGING_DIR}/usr
-BUILD_STYLE=		auto
 MAKE_FLAGS+=		CCOPT="${TARGET_CFLAGS}" \
 			INCLS="-I. -I${STAGING_DIR}/usr/include" \
 			LIBS="-L${STAGING_DIR}/usr/lib -lpcap -ldnet -levent"

package/arpwatch/Makefile

@@ -6,11 +6,11 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=		arpwatch
 PKG_VERSION:=		2.1a15
 PKG_RELEASE:=		1
-PKG_BUILDDEP+=		libpcap
 PKG_MD5SUM:=		cebfeb99c4a7c2a6cee2564770415fe7
-PKG_DESCR:=		Ethernet monitor program for keeping track of ethernet/ip address pairings
+PKG_DESCR:=		Ethernet monitor program
 PKG_SECTION:=		net
 PKG_DEPENDS:=		libpcap
+PKG_BUILDDEP+=		libpcap
 PKG_URL:=		http://www-nrg.ee.lbl.gov
 PKG_SITES:=		ftp://ftp.ee.lbl.gov/
 
@@ -18,8 +18,8 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,ARPWATCH,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE=	gnu
+INSTALL_STYLE:=		manual
-BUILD_STYLE=		auto
+
 MAKE_FLAGS+=		ARPDIR=/etc/arpwatch \
 			CCOPT="$(TARGET_CFLAGS)" \
 			INCLS="-I. -I$(STAGING_DIR)/usr/include" \

package/asterisk/Makefile

@@ -114,14 +114,13 @@ else
 CONFIGURE_ARGS+=	--without-postgres
 endif
 
+INSTALL_STYLE:=		manual
+
 TLDFLAGS+=		-lm
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
 MAKE_ENV=		ASTCFLAGS="${TCPPFLAGS} -DHAVE_STRTOQ" \
 			ASTLDFLAGS="${TLDFLAGS}"
 MAKE_FLAGS+=		DESTDIR="$(WRKINST)" \
 			OPTIMIZE="${TARGET_OPTIMIZATION}" \
-			CXX="${TARGET_CC}" \
 			STRIP="${TARGET_CROSS}strip" \
 			NOISY_BUILD=1
 ALL_TARGET:=		all install samples
@@ -129,6 +128,9 @@ ALL_TARGET:=		all install samples
 pre-configure:
 	cd "$(WRKBUILD)/menuselect"; ./configure 
 
+pre-build:
+	$(MAKE) -C $(WRKBUILD)/menuselect
+
 post-build:
 	cd ${WRKBUILD}/sounds ; \
 	tar xzf asterisk-core-sounds-en-gsm-1.4.17.tar.gz ; \

package/asterisk/patches/patch-Makefile

@@ -0,0 +1,13 @@
+--- asterisk-1.6.2.1.orig/Makefile	2009-12-10 22:04:20.000000000 +0100
++++ asterisk-1.6.2.1/Makefile	2010-02-05 21:05:41.313084404 +0100
+@@ -366,8 +366,8 @@ makeopts: configure
+ 	@exit 1
+ 
+ menuselect.makeopts: menuselect/menuselect menuselect-tree makeopts build_tools/menuselect-deps $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS)
+-	menuselect/menuselect --check-deps $@
+-	menuselect/menuselect --check-deps $@ $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS)
++	./menuselect/menuselect --check-deps $@
++	./menuselect/menuselect --check-deps $@ $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS)
+ 
+ $(MOD_SUBDIRS_EMBED_LDSCRIPT):
+ 	+@echo "EMBED_LDSCRIPTS+="`$(SILENTMAKE) -C $(@:-embed-ldscript=) SUBDIR=$(@:-embed-ldscript=) __embed_ldscript` >> makeopts.embed_rules

package/atftp/Makefile

@@ -6,24 +6,22 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=		atftp
 PKG_VERSION:=		0.7
 PKG_RELEASE:=		2
-PKG_BUILDDEP+=		readline ncurses
 PKG_MD5SUM:=		3b27365772d918050b2251d98a9c7c82
 PKG_DESCR:=		TFTP client
 PKG_SECTION:=		net
 PKG_DEPENDS:=		libreadline libncurses
+PKG_BUILDDEP+=		readline ncurses
 PKG_URL:=		http://freshmeat.net/projects/atftp
 PKG_SITES:=		ftp://ftp.mamalinux.com/pub/atftp/
-PKG_DESCR_1:=		TFTP server
+
+PKG_DESCR_TFTP_SERVER:=	TFTP server
 
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,ATFTP,atftp,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,ATFTPD,atftpd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_1},${PKG_SECTION}))
+$(eval $(call PKG_template,ATFTPD,atftpd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_TFTP_SERVER},${PKG_SECTION}))
 
 MAKE_FLAGS+=		CFLAGS="${TCFLAGS} -Wall -D_REENTRANT -fno-inline"
-CONFIGURE_STYLE=	gnu
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto
 
 post-install:
 	# atftp client

package/atk/Makefile

@@ -21,10 +21,6 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,ATK,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 post-install:
 	${INSTALL_DIR} ${IDIR_ATK}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libatk-*.so* ${IDIR_ATK}/usr/lib

package/aufs2-util/Makefile

@@ -17,9 +17,8 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,AUFS_UTIL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+CONFIG_STYLE:=		manual
 MAKE_FLAGS+=		KDIR=${LINUX_DIR}
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 do-extract:
 	mkdir -p ${WRKBUILD}

package/autoconf/Makefile

@@ -17,10 +17,6 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,AUTOCONF,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 post-install:
 	${INSTALL_DIR} ${IDIR_AUTOCONF}/usr/bin
 	${CP} ${WRKINST}/usr/bin/auto* ${IDIR_AUTOCONF}/usr/bin

package/automake/Makefile

@@ -5,10 +5,11 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		automake
 PKG_VERSION:=		1.10
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		452163c32d061c53a7acc0e8c1b689ba
 PKG_DESCR:=		GNU automake
 PKG_SECTION:=		utils
+PKG_DEPENDS:=		microperl
 PKG_URL:=		http://www.gnu.org/software/automake/
 PKG_SITES:=		${MASTER_SITE_GNU:=${PKG_NAME}/}
 PKG_OPTS:=		noscripts
@@ -17,13 +18,12 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,AUTOMAKE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 post-install:
 	${INSTALL_DIR} ${IDIR_AUTOMAKE}/usr/bin
 	${INSTALL_BIN} ${WRKINST}/usr/bin/automake ${IDIR_AUTOMAKE}/usr/bin
 	${INSTALL_BIN} ${WRKINST}/usr/bin/aclocal ${IDIR_AUTOMAKE}/usr/bin
+	${INSTALL_DIR} ${IDIR_AUTOMAKE}/usr/share/automake-${PKG_VERSION}/
+	${CP} ${WRKINST}/usr/share/automake-${PKG_VERSION}/Automake \
+		${IDIR_AUTOMAKE}/usr/share/automake-${PKG_VERSION}/
 
 include ${TOPDIR}/mk/pkg-bottom.mk

package/autossh/Makefile

@@ -19,11 +19,7 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,AUTOSSH,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
+post-install:
-CONFIGURE_ARGS+=	ac_cv_lib_nsl_gethostbyname=no
-BUILD_STYLE:=		auto
-
-do-install:
 	$(INSTALL_DIR) $(IDIR_AUTOSSH)/usr/bin
 	$(INSTALL_BIN) $(WRKBUILD)/autossh $(IDIR_AUTOSSH)/usr/bin/
 

package/autossh/patches/patch-Makefile_in

@@ -0,0 +1,36 @@
+--- autossh-1.4b.orig/Makefile.in	2008-04-11 22:47:46.000000000 +0200
++++ autossh-1.4b/Makefile.in	2010-02-05 17:49:30.511836749 +0100
+@@ -45,18 +45,18 @@ distclean:	allclean
+ 		- /bin/rm -f Makefile
+ 
+ install:	$(TARGET)
+-		mkdir -p -m 755 $(bindir)
+-		mkdir -p -m 755 $(prefix)/share/doc/autossh
+-		mkdir -p -m 755 $(datadir)/examples/autossh
+-		mkdir -p -m 755 $(mandir)/man1
+-		cp $(TARGET) $(bindir)
+-		cp CHANGES README $(datadir)/doc/autossh
+-		cp autossh.host	$(datadir)/examples/autossh
+-		cp rscreen $(datadir)/examples/autossh
+-		cp autossh.1 $(mandir)/man1
+-		chmod 755 $(bindir)/$(TARGET)
+-		chmod 644 $(datadir)/doc/autossh/CHANGES
+-		chmod 644 $(datadir)/doc/autossh/README
+-		chmod 644 $(datadir)/examples/autossh/autossh.host 
+-		chmod 644 $(datadir)/examples/autossh/rscreen
+-		chmod 644 $(mandir)/man1/autossh.1 
++		mkdir -p -m 755 $(DESTDIR)$(bindir)
++		mkdir -p -m 755 $(DESTDIR)$(prefix)/share/doc/autossh
++		mkdir -p -m 755 $(DESTDIR)$(datadir)/examples/autossh
++		mkdir -p -m 755 $(DESTDIR)$(mandir)/man1
++		cp $(TARGET) $(DESTDIR)$(bindir)
++		cp CHANGES README $(DESTDIR)$(datadir)/doc/autossh
++		cp autossh.host	$(DESTDIR)$(datadir)/examples/autossh
++		cp rscreen $(DESTDIR)$(datadir)/examples/autossh
++		cp autossh.1 $(DESTDIR)$(mandir)/man1
++		chmod 755 $(DESTDIR)$(bindir)/$(TARGET)
++		chmod 644 $(DESTDIR)$(datadir)/doc/autossh/CHANGES
++		chmod 644 $(DESTDIR)$(datadir)/doc/autossh/README
++		chmod 644 $(DESTDIR)$(datadir)/examples/autossh/autossh.host 
++		chmod 644 $(DESTDIR)$(datadir)/examples/autossh/rscreen
++		chmod 644 $(DESTDIR)$(mandir)/man1/autossh.1 

package/avahi/Makefile

@@ -25,7 +25,6 @@ $(eval $(call PKG_template,AVAHI_DNSCONFD,avahi-dnsconfd,${PKG_VERSION}-${PKG_RE
 $(eval $(call PKG_template,LIBAVAHI,libavahi,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR_LIB},libs))
 
 TLDFLAGS+=		-lintl
-CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS+=	--enable-glib \
 			--disable-qt3 \
 			--disable-qt4 \
@@ -51,8 +50,6 @@ CONFIGURE_ARGS+=	--enable-glib \
 			--with-distro=none \
 			--with-avahi-user=avahi \
 			--with-avahi-group=avahi
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto
 
 post-install:
 	# avahi daemon

package/axtls/Makefile

@@ -13,8 +13,8 @@ PKG_DEPENDS:=		libaxtls
 PKG_URL:=		http://axtls.sourceforge.net
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=axtls/}
 
-PKG_DESCR_1:=		small tls library
+PKG_DESCR_LIB:=		small tls library
-PKG_SECTION_1:=		libs
+PKG_SECTION_LIB:=		libs
 
 DISTFILES:=		axTLS-${PKG_VERSION}.tar.gz
 WRKDIST=		${WRKDIR}/axTLS
@@ -22,9 +22,11 @@ WRKDIST=		${WRKDIR}/axTLS
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,AXHTTPD,axhttpd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBAXTLS,libaxtls,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR_1},${PKG_SECTION_1}))
+$(eval $(call PKG_template,LIBAXTLS,libaxtls,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR_LIB},${PKG_SECTION_LIB}))
+
+CONFIG_STYLE:=		manual
+INSTALL_STYLE:=		manual
 
-BUILD_STYLE=		auto
 XAKE_FLAGS+=		STRIP='' \
 			CC='${TARGET_CC}' \
 			OPT_CFLAGS='${TARGET_CFLAGS} -fPIC' \
@@ -37,7 +39,7 @@ do-configure:
 do-install:
 	# axtls library
 	${INSTALL_DIR} ${IDIR_LIBAXTLS}/usr/lib
-	$(CP) $(WRKBUILD)/_stage/libaxtls.so.* $(IDIR_LIBAXTLS)/usr/lib/
+	$(CP) $(WRKBUILD)/_stage/libaxtls.so* $(IDIR_LIBAXTLS)/usr/lib/
 	# awhttpd server
 	${INSTALL_DIR} ${IDIR_AXHTTPD}/www
 	${INSTALL_DIR} ${IDIR_AXHTTPD}/usr/sbin

package/base-files/Makefile

@@ -18,11 +18,13 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call PKG_template,BASE_FILES,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 PKGDFLT_BASE_FILES=	y if !ADK_TOOLCHAIN_ONLY
+
+CONFIG_STYLE:=		manual
 BUILD_STYLE:=		manual
 INSTALL_STYLE:=		manual
 
 do-install:
-	$(CP) ./extra/* $(IDIR_BASE_FILES)
+	$(CP) ./src/* $(IDIR_BASE_FILES)
 	$(CP) $(TOPDIR)/target/$(ADK_TARGET)/files/* $(IDIR_BASE_FILES)
 ifeq (${ADK_TARGET_ROOTFS_NFSROOT},y)
 	@-rm $(IDIR_BASE_FILES)/etc/network/interfaces

package/bash/Makefile

@@ -17,9 +17,6 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call PKG_template,BASH,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 XAKE_FLAGS+=		LIBS_FOR_BUILD=''
-CONFIGURE_STYLE=	gnu
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto
 
 post-install:
 	$(INSTALL_DIR) $(IDIR_BASH)/bin

package/bc/Makefile

@@ -17,10 +17,6 @@ include ${TOPDIR}/mk/package.mk
 $(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}))
 
-CONFIGURE_STYLE=	gnu
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto
-
 post-install:
 	# bc
 	${INSTALL_DIR} ${IDIR_BC}/usr/bin

package/bigreqsproto/Makefile

@@ -10,9 +10,4 @@ PKG_MD5SUM:=		882d49cc3bb591dbdccdf9e680bd2e4b
 PKG_SITES:=		${MASTER_SITE_XORG}
 
 include $(TOPDIR)/mk/package.mk
-
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 include ${TOPDIR}/mk/pkg-bottom.mk

package/bind/Makefile

@@ -33,16 +33,11 @@ $(eval $(call PKG_template,BIND_DNSSEC,bind-dnssec,${PKG_VERSION}-${PKG_RELEASE}
 $(eval $(call PKG_template,BIND_HOST,bind-host,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_6},${PKG_SECTION}))
 $(eval $(call PKG_template,BIND_DIG,bind-dig,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_7},${PKG_SECTION}))
 
-CONFIGURE_STYLE=	gnu
-CONFIGURE_ENV+=         BUILD_CC="${TARGET_CC}" \
-			ac_cv_lib_nsl_inet_ntoa=no
 CONFIGURE_ARGS+=	--with-randomdev=/dev/urandom \
 			--disable-threads \
 			--with-openssl=${STAGING_DIR}/usr/ \
 			--enable-epoll \
 			--with-libtool
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto
 
 pre-build:
 	${MAKE} -C ${WRKBUILD}/lib/dns \

package/binutils/Makefile

@@ -12,12 +12,9 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,BINUTILS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 TCFLAGS+=		-fPIC
-CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS+=	--disable-werror \
 			--host=$(REAL_GNU_TARGET_NAME) \
 			--target=$(REAL_GNU_TARGET_NAME)
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto
 
 post-patch:
 	${PREVENT_PATCH} ${PATCH} ${WRKDIST} \

package/bison/Makefile

@@ -16,10 +16,6 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,BISON,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 post-install:
 	${INSTALL_DIR} ${IDIR_BISON}/usr/bin ${IDIR_BISON}/usr/share/bison
 	${INSTALL_BIN} ${WRKINST}/usr/bin/bison ${IDIR_BISON}/usr/bin

package/bitlbee/Makefile

@@ -4,33 +4,24 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		bitlbee
-PKG_VERSION:=		1.2.3
+PKG_VERSION:=		1.2.4
 PKG_RELEASE:=		1
-PKG_BUILDDEP+=		libiconv openssl glib
+PKG_MD5SUM:=		26b9bfc5446bdf0e932e8074d117be67
-PKG_MD5SUM:=		2b1674d98804970809de3da3edf0bed2
 PKG_DESCR:=		IRC gateway to IM chat networks
 PKG_SECTION:=		net
-PKG_DEPENDS:=		glib libopenssl libiconv
+PKG_DEPENDS:=		glib libiconv libopenssl
+PKG_BUILDDEP+=		glib libiconv openssl
 PKG_URL:=		http://www.bitlbee.org
-PKG_SITES:=		http://get.bitlbee.org/src/ \
+PKG_SITES:=		http://get.bitlbee.org/src/
-			http://get.bitlbee.be/src/ \
-			http://get.us.bitlbee.org/src/ \
-			http://ftp.snt.utwente.nl/pub/software/bitlbee/src/
 
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,BITLBEE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-do-configure:
+CONFIG_STYLE:=		minimal
-		(cd $(WRKBUILD); \
+
-			$(TARGET_CONFIGURE_OPTS) \
+TCFLAGS+=		-fPIC
-			CFLAGS="$(TARGET_CFLAGS) -fPIC" \
+CONFIGURE_ARGS:=	--target=${REAL_GNU_TARGET_NAME} \
-			CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
-			LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
-			STAGING_DIR="$(STAGING_DIR)" \
-			STRIP="$(STRIP)" \
-			./configure \
-			--target=${REAL_GNU_TARGET_NAME} \
 			--prefix=/usr/ \
 			--bindir=/usr/sbin/ \
 			--etcdir=/etc/bitlbee/ \
@@ -39,19 +30,16 @@ do-configure:
 			--arch=Linux \
 			--cpu="${ARCH}" \
 			--debug=0 \
-			--strip=1 \
+			--strip=0 \
 			--ipv6=1 \
-			--ssl=openssl \
+			--ssl=openssl
-		);
 
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 INSTALL_TARGET=		install-etc install-bin
 
 post-configure:
 	@echo 'CFLAGS+="-I${STAGING_DIR}/usr/include/iconv"' >> \
 		${WRKBUILD}/Makefile.settings
-	@echo 'LFLAGS+="-L${STAGING_DIR}/usr/lib/iconv"' >> \
+	@echo 'LFLAGS+="-L${STAGING_DIR}/usr/lib"' >> \
 		${WRKBUILD}/Makefile.settings
 
 post-install:

package/bitlbee/patches/patch-Makefile

@@ -1,22 +0,0 @@
---- bitlbee-1.2.3.orig/Makefile	2008-09-06 14:33:14.000000000 +0200
-+++ bitlbee-1.2.3/Makefile	2009-08-28 11:18:09.268088045 +0200
-@@ -111,16 +111,16 @@ $(subdirs):
- 
- $(objects): %.o: %.c
- 	@echo '*' Compiling $<
--	@$(CC) -c $(CFLAGS) $< -o $@
-+	$(CC) -c $(CFLAGS) $< -o $@
- 
- $(objects): Makefile Makefile.settings config.h
- 
- $(OUTFILE): $(objects) $(subdirs)
- 	@echo '*' Linking $(OUTFILE)
--	@$(CC) $(objects) $(subdirobjs) -o $(OUTFILE) $(LFLAGS) $(EFLAGS)
-+	$(CC) -shared $(objects) $(subdirobjs) -o $(OUTFILE) $(LDFLAGS) $(EFLAGS)
- ifndef DEBUG
- 	@echo '*' Stripping $(OUTFILE)
--	@-$(STRIP) $(OUTFILE)
-+	-$(STRIP) $(OUTFILE)
- endif
- 
- encode: crypting.c

package/bitlbee/patches/patch-configure

@@ -1,4 +1,3 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
 --- bitlbee-1.2.3.orig/configure	2008-09-06 14:33:13.000000000 +0200
 +++ bitlbee-1.2.3/configure	2008-10-08 16:07:32.000000000 +0200
 @@ -19,7 +19,6 @@ libevent='/usr/'

package/bitlbee/patches/patch-lib_Makefile

@@ -1,24 +0,0 @@
---- bitlbee-1.2.3.orig/lib/Makefile	2008-09-06 14:33:13.000000000 +0200
-+++ bitlbee-1.2.3/lib/Makefile	2009-08-28 11:12:29.546939473 +0200
-@@ -12,7 +12,7 @@
- objects = arc.o base64.o $(EVENT_HANDLER) http_client.o ini.o md5.o misc.o proxy.o sha1.o $(SSL_CLIENT) url.o xmltree.o
- 
- CFLAGS += -Wall
--LFLAGS += -r
-+#LFLAGS += -r
- 
- # [SH] Phony targets
- all: lib.o
-@@ -32,10 +32,10 @@ distclean: clean $(subdirs)
- 
- lib.o: $(objects) $(subdirs)
- 	@echo '*' Linking lib.o
--	@$(LD) $(LFLAGS) $(objects) -o lib.o
-+	$(CC) -shared $(LDFLAGS) $(objects) -o lib.o
- 
- $(objects): ../Makefile.settings Makefile
- 
- $(objects): %.o: %.c
- 	@echo '*' Compiling $<
--	@$(CC) -c $(CFLAGS) $< -o $@
-+	$(CC) -c $(CFLAGS) $< -o $@

package/bitlbee/patches/patch-protocols_Makefile

@@ -1,24 +0,0 @@
---- bitlbee-1.2.3.orig/protocols/Makefile	2008-09-06 14:33:13.000000000 +0200
-+++ bitlbee-1.2.3/protocols/Makefile	2009-08-28 11:13:32.079800935 +0200
-@@ -21,7 +21,7 @@ subdirobjs = $(PROTOOBJS)
- # Expansion of variables
- subdirobjs := $(join $(subdirs),$(addprefix /,$(subdirobjs)))
- CFLAGS += -Wall
--LFLAGS += -r
-+#LFLAGS += -r
- 
- # [SH] Phony targets
- all: protocols.o
-@@ -44,10 +44,10 @@ $(subdirs):
- 
- protocols.o: $(objects) $(subdirs)
- 	@echo '*' Linking protocols.o
--	@$(LD) $(LFLAGS) $(objects) $(subdirobjs) -o protocols.o
-+	$(CC) -shared $(LDFLAGS) $(objects) $(subdirobjs) -o protocols.o
- 
- $(objects): ../Makefile.settings Makefile
- 
- $(objects): %.o: %.c
- 	@echo '*' Compiling $<
--	@$(CC) -c $(CFLAGS) $< -o $@
-+	$(CC) -c $(CFLAGS) $< -o $@

package/bitlbee/patches/patch-protocols_jabber_Makefile

@@ -1,22 +0,0 @@
---- bitlbee-1.2.3.orig/protocols/jabber/Makefile	2008-09-06 14:33:13.000000000 +0200
-+++ bitlbee-1.2.3/protocols/jabber/Makefile	2009-08-28 11:15:01.100110500 +0200
-@@ -12,7 +12,7 @@
- objects = conference.o io.o iq.o jabber.o jabber_util.o message.o presence.o sasl.o
- 
- CFLAGS += -Wall
--LFLAGS += -r
-+#LFLAGS += -r
- 
- # [SH] Phony targets
- all: jabber_mod.o
-@@ -34,8 +34,8 @@ $(objects): ../../Makefile.settings Make
- 
- $(objects): %.o: %.c
- 	@echo '*' Compiling $<
--	@$(CC) -c $(CFLAGS) $< -o $@
-+	$(CC) -c $(CFLAGS) $< -o $@
- 
- jabber_mod.o: $(objects)
- 	@echo '*' Linking jabber_mod.o
--	@$(LD) $(LFLAGS) $(objects) -o jabber_mod.o
-+	$(CC) -shared $(LDFLAGS) $(objects) -o jabber_mod.o

package/bitlbee/patches/patch-protocols_msn_Makefile

@@ -1,24 +0,0 @@
---- bitlbee-1.2.3.orig/protocols/msn/Makefile	2008-09-06 14:33:13.000000000 +0200
-+++ bitlbee-1.2.3/protocols/msn/Makefile	2009-08-28 11:13:50.455844911 +0200
-@@ -12,7 +12,7 @@
- objects = msn.o msn_util.o ns.o passport.o sb.o tables.o
- 
- CFLAGS += -Wall
--LFLAGS += -r
-+#LFLAGS += -r
- 
- # [SH] Phony targets
- all: msn_mod.o
-@@ -34,10 +34,10 @@ $(objects): ../../Makefile.settings Make
- 
- $(objects): %.o: %.c
- 	@echo '*' Compiling $<
--	@$(CC) -c $(CFLAGS) $< -o $@
-+	$(CC) -c $(CFLAGS) $< -o $@
- 
- msn_mod.o: $(objects)
- 	@echo '*' Linking msn_mod.o
--	@$(LD) $(LFLAGS) $(objects) -o msn_mod.o
-+	$(CC) -shared $(LDFLAGS) $(objects) -o msn_mod.o
- 	
- 

package/bitlbee/patches/patch-protocols_oscar_Makefile

@@ -1,22 +0,0 @@
---- bitlbee-1.2.3.orig/protocols/oscar/Makefile	2008-09-06 14:33:13.000000000 +0200
-+++ bitlbee-1.2.3/protocols/oscar/Makefile	2009-08-28 11:16:04.032452435 +0200
-@@ -12,7 +12,7 @@
- objects = admin.o auth.o bos.o buddylist.o chat.o chatnav.o conn.o icq.o im.o info.o misc.o msgcookie.o rxhandlers.o rxqueue.o search.o service.o snac.o ssi.o stats.o tlv.o txqueue.o oscar_util.o oscar.o
- 
- CFLAGS += -Wall
--LFLAGS += -r
-+#LFLAGS += -r
- 
- # [SH] Phony targets
- all: oscar_mod.o
-@@ -34,8 +34,8 @@ $(objects): ../../Makefile.settings Make
- 
- $(objects): %.o: %.c
- 	@echo '*' Compiling $<
--	@$(CC) -c $(CFLAGS) $< -o $@
-+	$(CC) -c $(CFLAGS) $< -o $@
- 
- oscar_mod.o: $(objects)
- 	@echo '*' Linking oscar_mod.o
--	@$(LD) $(LFLAGS) $(objects) -o oscar_mod.o
-+	$(CC) -shared $(LDFLAGS) $(objects) -o oscar_mod.o

package/bitlbee/patches/patch-protocols_yahoo_Makefile

@@ -1,22 +0,0 @@
---- bitlbee-1.2.3.orig/protocols/yahoo/Makefile	2008-09-06 14:33:13.000000000 +0200
-+++ bitlbee-1.2.3/protocols/yahoo/Makefile	2009-08-28 11:14:08.877306693 +0200
-@@ -12,7 +12,7 @@
- objects = yahoo.o crypt.o libyahoo2.o yahoo_fn.o yahoo_httplib.o yahoo_util.o
- 
- CFLAGS += -Wall -DSTDC_HEADERS -DHAVE_STRING_H -DHAVE_STRCHR -DHAVE_MEMCPY -DHAVE_GLIB
--LFLAGS += -r
-+#LFLAGS += -r
- 
- # [SH] Phony targets
- all: yahoo_mod.o
-@@ -34,8 +34,8 @@ $(objects): ../../Makefile.settings Make
- 
- $(objects): %.o: %.c
- 	@echo '*' Compiling $<
--	@$(CC) -c $(CFLAGS) $< -o $@
-+	$(CC) -c $(CFLAGS) $< -o $@
- 
- yahoo_mod.o: $(objects)
- 	@echo '*' Linking yahoo_mod.o
--	@$(LD) $(LFLAGS) $(objects) -o yahoo_mod.o
-+	$(CC) -shared $(LDFLAGS) $(objects) -o yahoo_mod.o

package/bluez-firmware/Makefile

@@ -15,12 +15,9 @@ PKG_SITES:=		http://bluez.sourceforge.net/download/
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,BLUEZ_FIRMWARE,bluez-firmware,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,BLUEZ_FIRMWARE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS+=	--libdir=/lib
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_BLUEZ_FIRMWARE}/lib/firmware

package/bluez/Makefile

@@ -23,7 +23,6 @@ XAKE_FLAGS+=		V=1 CCLD="$(TARGET_CC) -all-static -pthread"
 else
 XAKE_FLAGS+=            V=1
 endif
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ENV+=		ac_cv_prog_cc_pie=no
 CONFIGURE_ARGS+=	--enable-tools \
 			--enable-alsa \
@@ -35,8 +34,6 @@ CONFIGURE_ARGS+=	--enable-tools \
 			--enable-netlink \
 			--disable-pie \
 			--disable-cups
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install:
 ifneq ($(ADK_STATIC),y)

package/bogofilter/Makefile

@@ -18,18 +18,17 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,BOGOFILTER,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	autotool gnu
+AUTOTOOL_STYLE:=	autotool
 CONFIGURE_ENV+=		LIBS="-liconv"
 CONFIGURE_ARGS+=	--without-libsqlite3-prefix \
 			--without-libqdbm-prefix \
 			--with-included-gsl \
 			--with-libdb-prefix=${STAGING_DIR}/usr \
 			--disable-transactions
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_BOGOFILTER}/usr/bin
-	${INSTALL_BIN} ${WRKINST}/usr/bin/${PKG_NAME} ${IDIR_BOGOFILTER}/usr/bin/
+	${INSTALL_BIN} ${WRKINST}/usr/bin/bogofilter \
+		 ${IDIR_BOGOFILTER}/usr/bin/
 
 include ${TOPDIR}/mk/pkg-bottom.mk

package/bridge-utils/Makefile

@@ -17,13 +17,12 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,BRIDGE_UTILS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	autoconf gnu
+AUTOTOOL_STYLE:=	autoconf
 CONFIGURE_ARGS+=	--with-linux-headers=${LINUX_DIR}
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_BRIDGE_UTILS}/usr/sbin
-	${INSTALL_BIN} ${WRKINST}/usr/sbin/brctl ${IDIR_BRIDGE_UTILS}/usr/sbin/
+	${INSTALL_BIN} ${WRKINST}/usr/sbin/brctl \
+		${IDIR_BRIDGE_UTILS}/usr/sbin/
 
 include ${TOPDIR}/mk/pkg-bottom.mk

package/busybox/Makefile

@@ -18,6 +18,10 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,BUSYBOX,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+CONFIG_STYLE:=	manual
+BUILD_STYLE:=	manual
+INSTALL_STYLE:=	manual
+
 ${TOPDIR}/.busyboxcfg: ${TOPDIR}/.config
 	grep BUSYBOX_ $(TOPDIR)/.config|sed -e 's/BUSYBOX_/CONFIG_/' > \
 		${TOPDIR}/.busyboxcfg

package/busybox/config/findutils/Config.in

@@ -8,6 +8,7 @@ menu "Finding Utilities"
 config BUSYBOX_FIND
 	bool "find"
 	default y
+	depends on !ADK_PACKAGE_FINDUTILS
 	help
 	  find is used to search your system to find specified files.
 

package/busybox/config/networking/Config.in

@@ -94,6 +94,7 @@ config BUSYBOX_DNSD
 config BUSYBOX_ETHER_WAKE
 	bool "ether-wake"
 	default n
+	depends on !ADK_PACKAGE_ETHER_WAKE
 	help
 	  Send a magic packet to wake up sleeping machines.
 

package/busybox/files/busybox.postinst

@@ -2,7 +2,7 @@
 . $IPKG_INSTROOT/etc/functions.sh
 add_rcconf network network YES
 add_rcconf crond crond NO
-add_rcconf watchdog watchdog YES
+add_rcconf watchdog watchdog NO
 add_rcconf watchdog_flags watchdog_flags '-t 10 -T 20'
 add_rcconf 'use "-C32" normally, "NO" to disable' syslogd_flags '-C32'
 add_rcconf inetd inetd NO

package/bwm/Makefile

@@ -18,6 +18,10 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,BWM,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+CONFIG_STYLE:=	manual
+BUILD_STYLE:=	manual
+INSTALL_STYLE:=	manual
+
 do-build:
 	${TARGET_CC} ${TARGET_CFLAGS} ${WRKBUILD}/bwm.c -o ${WRKBUILD}/bwm
 

package/bzip2/Makefile

@@ -16,10 +16,10 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,BZIP2,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+CONFIG_STYLE:=		manual
+
 TCFLAGS+=		-fPIC
 XAKE_FLAGS+=		PREFIX=${WRKINST}/usr
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_BZIP2}/usr/bin

package/ca-certificates/Makefile

@@ -22,8 +22,7 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,CA_CERTS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-BUILD_STYLE:=		auto
+CONFIG_STYLE:=		manual
-INSTALL_STYLE:=		auto
 
 post-install:
 ifeq (${ADK_PACKAGE_CA_CERTS_SMALL},n)
@@ -39,5 +38,4 @@ else
 	${INSTALL_DATA} ./cert.pem ${IDIR_CA_CERTS}/etc/ssl/
 endif
 
-
 include ${TOPDIR}/mk/pkg-bottom.mk

package/cairo/Makefile

@@ -22,11 +22,8 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,CAIRO,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	--enable-ft=yes \
 			--enable-xlib=yes
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_CAIRO}/usr/lib

package/cbtt/Makefile

@@ -10,7 +10,7 @@ PKG_MD5SUM:=		19abea2817c49ccc9438e9671c402984
 PKG_DESCR:=		Bittorrent tracker
 PKG_SECTION:=		net
 PKG_DEPENDS:=		zlib
-PKG_BUILDDEP+=		mysql zlib
+PKG_BUILDDEP+=		zlib
 ifeq (${ADK_COMPILE_CBTT_WITH_UCLIBCXX},y)
 PKG_BUILDDEP+=		uclibc++
 endif
@@ -19,9 +19,6 @@ PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=bnbtusermods/}
 
 PKG_HOST_DEPENDS:=	!cygwin
 
-PKG_DESCR_1:=		Bittorrent tracker with mysql support
-PKG_DEPENDS_1:=		${PKG_DEPENDS} libmysqlclient
-
 DISTFILES:=		${PKG_NAME}80-${PKG_VERSION}-src.tar.gz
 WRKDIST=		${WRKDIR}/${PKG_NAME}80-${PKG_VERSION}-src
 
@@ -36,11 +33,11 @@ PKG_DEPENDS_1+=		libstdcxx
 endif
 
 $(eval $(call PKG_template,CBTT,cbtt,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,CBTT_MYSQL,cbtt-mysql,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_1},${PKG_DESCR_1},${PKG_SECTION}))
 
-BUILD_STYLE=		auto
+CONFIG_STYLE:=		manual
-TLDFLAGS+=		-shared -L. -L${STAGING_DIR}/usr/lib/mysql \
+INSTALL_STYLE:=		manual
-			-lmysqlclient -lz -lpthread -lm -lgcc
+
+TLDFLAGS+=		-shared -L. -lz -lpthread -lm -lgcc
 ifeq ($(ADK_TARGET_LIB_UCLIBCXX),y)
 TLDFLAGS+=		-nodefaultlibs -lz -lpthread \
 			-luClibc++ -lc -lm -lgcc
@@ -51,7 +48,5 @@ TCFLAGS+=		-fPIC
 do-install:
 	${INSTALL_DIR} ${IDIR_CBTT}/usr/bin
 	${INSTALL_BIN} ${WRKBUILD}/bnbt ${IDIR_CBTT}/usr/bin/
-	${INSTALL_DIR} ${IDIR_CBTT_MYSQL}/usr/bin
-	${INSTALL_BIN} ${WRKBUILD}/bnbtmysql ${IDIR_CBTT_MYSQL}/usr/bin/
 
 include ${TOPDIR}/mk/pkg-bottom.mk

package/cfgfs/Makefile

@@ -22,11 +22,8 @@ $(eval $(call PKG_template,CFGFS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG
 
 PKGDFLT_CFGFS=		y
 
-BUILD_STYLE:=		auto
+CONFIG_STYLE:=		manual
-
+INSTALL_STYLE:=		manual
-do-configure:
-	mkdir -p ${WRKBUILD}
-	${CP} ./src/* ${WRKBUILD}
 
 do-install:
 	${INSTALL_DIR} ${IDIR_CFGFS}/sbin

package/cgilib/Makefile

@@ -16,10 +16,6 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,CGILIB,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto
-
 post-install:
 	${INSTALL_DIR} ${IDIR_CGILIB}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libcgi.so* ${IDIR_CGILIB}/usr/lib/