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

Conflicts:
	package/nspr/Makefile

.gitignore

@@ -12,16 +12,17 @@ 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.*/
+.cfg_*/
 cross_*/
 root_*/
-bin_*/
+bin/
 build_*/
 config/*.o
 config/lxdialog/*.o
@@ -30,7 +31,7 @@ dl/
 package/*/info.mk
 package/*/Config.in
 package/*/Config.in.lib
+package/*/Config.in.kmod
 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,3 +1,2 @@
 - 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?

Config.in

@@ -7,7 +7,6 @@ config ADKVERSION
 
 mainmenu "OpenADK Configuration"
 
-
 config MODULES
 	bool
 	default y
@@ -21,6 +20,11 @@ menu "ADK settings"
 config ADK_DEVELSYSTEM
 	bool "Compile a ADK development system"
 	default n
+	select BUSYBOX_CMP
+	select BUSYBOX_EXPR
+	select BUSYBOX_MKTEMP
+	select BUSYBOX_UNZIP
+	select BUSYBOX_TEE
 	select ADK_PACKAGE_AUTOCONF
 	select ADK_PACKAGE_AUTOMAKE
 	select ADK_PACKAGE_BASH

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},)

Makefile

@@ -144,6 +144,12 @@ package_index: .prereq_done
 bulk: .prereq_done
 	@${GMAKE_INV} bulk
 
+bulkall: .prereq_done
+	@${GMAKE_INV} bulkall
+
+bulkallmod: .prereq_done
+	@${GMAKE_INV} bulkallmod
+
 menu: .prereq_done
 	@${GMAKE_INV} menu
 

TODO

@@ -1,9 +1,11 @@
-- fix watchdog for alix1c (mfgpt timers)
-- update uclibc
+- implement update for MTD devices (ag241)
+- fix watchdog for alix1c (mfgpt timers problem)
 - netbsd build
 - macos x build
+- update to 2.6.33 
+- use LZMA kernels for MIPS targets
+- package drbd
+- new packages for openais and pacemaker
+- continuos build via hudson or sth. like that
 - implement rpm package backend 
 - implement dpkg package backend 
-- implement update for MTD devices (foxboard,rb532,ag241)
-- network scripts for wireless client and acess point
-- customise mconf help texts to better fit for OpenADK

config/Makefile

@@ -31,6 +31,7 @@ ifeq (/usr/include/ncurses.h, $(wildcard /usr/include/ncurses.h))
 HOSTNCURSES+=	-DCURSES_LOC="<ncurses.h>"
 else
 HOSTNCURSES+=	-DCURSES_LOC="<curses.h>"
+LIBS=		-lcurses
 endif
 endif
 endif
@@ -47,16 +48,16 @@ MCONF_OBJS=$(patsubst %.c,%.o, $(MCONF_SRC))
 SHARED_OBJS=$(patsubst %.c,%.o, $(SHARED_SRC))
 
 conf: $(CONF_OBJS) $(SHARED_OBJS)
-	$(HOSTCC) -DKBUILD_NO_NLS $(NATIVE_LDFLAGS) $^ -o $@
+	$(HOSTCC) $(HOSTCFLAGS) $(NATIVE_LDFLAGS) $^ -o $@
 
 mconf: $(MCONF_OBJS) $(SHARED_OBJS)
-	$(HOSTCC) -DKBUILD_NO_NLS $(NATIVE_LDFLAGS) $^ -o $@ $(LIBS)
+	$(HOSTCC) $(HOSTCFLAGS) $(NATIVE_LDFLAGS) $^ -o $@ $(LIBS)
 
 $(CONF_OBJS): %.o : %.c $(SHARED_DEPS)
-	$(HOSTCC) -DKBUILD_NO_NLS $(HOSTCFLAGS) -I. -c $< -o $@
+	$(HOSTCC) $(HOSTCFLAGS) -I. -c $< -o $@
 
 $(MCONF_OBJS): %.o : %.c $(SHARED_DEPS)
-	$(HOSTCC) -DKBUILD_NO_NLS $(HOSTCFLAGS) $(HOSTNCURSES) -I. -c $< -o $@
+	$(HOSTCC) $(HOSTCFLAGS) $(HOSTNCURSES) -I. -c $< -o $@
 
 glob.o: glob.c $(SHARED_DEPS)
 	$(HOSTCC) $(HOSTCFLAGS) -I. -c glob.c -o $@

makefile

@@ -0,0 +1,35 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+ADKVERSION=	0.1.0
+TOPDIR=		${.CURDIR}
+PWD=		${.CURDIR}
+
+.include "${.CURDIR}/Makefile.inc"
+
+GMAKE_ENV+=	ADKVERSION=${ADKVERSION:Q}
+
+.if defined(package) && !empty(package)
+subdir:=	package/${package}
+.  if !make(clean)
+_subdir_dep:=	${TOPDIR}/.ADK_HAVE_DOT_CONFIG
+.  endif
+.endif
+
+.if defined(subdir) && !empty(subdir)
+_subdir:=	${.TARGETS}
+${.TARGETS}: _subdir
+
+_subdir: ${_subdir_dep}
+	@if test x"$$(umask 2>/dev/null | sed 's/00*22/OK/')" != x"OK"; then \
+		echo >&2 Error: you must build with “umask 022”, sorry.; \
+		exit 1; \
+	fi
+	cd ${.CURDIR}/${subdir} && TOPDIR=${.CURDIR} DEVELOPER=1 \
+	    ${GMAKE} VERBOSE=1 ${.MFLAGS} ${_subdir}
+
+.  include "${.CURDIR}/prereq.mk"
+.  include "${.CURDIR}/mk/split-cfg.mk"
+.else
+.  include "${.CURDIR}/Makefile"
+.endif

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_HEIMDAL_CLIENT_LIBS=n \
+			ADK_PACKAGE_LIBHEIMDAL=n \
+			ADK_PACKAGE_LIBHEIMDAL_CLIENT=n \
 			BUSYBOX_SELINUX=n \
 			BUSYBOX_MODPROBE_SMALL=n \
 			BUSYBOX_EJECT=n \
@@ -48,52 +48,21 @@ DEFCONFIG=		ADK_DEVELSYSTEM=n \
 			BUSYBOX_FEATURE_OSF_LABEL=n \
 			BUSYBOX_FEATURE_SGI_LABEL=n \
 			ADK_KERNEL_RT2X00_DEBUG=n \
-			ADK_KERNEL_ATH5K_DEBUG=n
+			ADK_KERNEL_ATH5K_DEBUG=n \
+			ADK_KERNEL_DEBUG_WITH_KGDB=n
 
 noconfig_targets:=	menuconfig \
 			_config \
 			_mconfig \
 			distclean \
+			defconfig \
 			tags
 
-MAKECLEANDIR_SYMBOLS=	ADK_TARGET_LIB_UCLIBC \
-			ADK_TARGET_LIB_GLIBC \
-			ADK_TARGET_LIB_ECLIBC \
-			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 \
-	what=cleantarget; \
-	for symbol in ${MAKECLEANDIR_SYMBOLS}; do \
-		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; \
-	fi; \
-	if [ "$$(grep ^BUSYBOX .config|md5sum)" != "$$(grep ^BUSYBOX .config.old|md5sum)" ];then \
-		if [ -f build_*/w-busybox*/busybox*/.configure_done ];then \
-			rm build_*/w-busybox*/busybox*/.configure_done; \
+		if [ -f .busyboxcfg ];then \
+			rm .busyboxcfg; \
 		fi; \
-	fi; \
 	fi
 
 # Pull in the user's configuration file
@@ -107,16 +76,13 @@ include ${TOPDIR}/mk/split-cfg.mk
 
 all: world
 
-allcopy: all
-	$(CP) $(BIN_DIR) $(TOPDIR)/bulkdir/${targetdir}/
-
 ${TOPDIR}/package/Depends.mk: ${TOPDIR}/.config $(wildcard ${TOPDIR}/package/*/Makefile)
 	mksh ${TOPDIR}/package/depmaker
 
 .NOTPARALLEL:
 .PHONY: all world clean cleantarget cleandir distclean image_clean
 
-world: $(DISTDIR) $(BUILD_DIR) $(TARGET_DIR) $(PACKAGE_DIR) ${TOPDIR}/.cfg/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
@@ -156,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_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_HAVE_DOT_CONFIG
+target/%: ${TOPDIR}/.ADK_HAVE_DOT_CONFIG
 	$(MAKE) -C target $(patsubst target/%,%,$@)
 
 toolchain/%: ${STAGING_DIR}
@@ -172,10 +138,10 @@ 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.split ];then cp -p .config.split .config.split.${ADK_TARGET};fi
 	if [ -f .config.${TARGET} ];then cp -p .config.${TARGET} .config; \
 	cp -p .config.old.${TARGET} .config.old; \
-	mv .cfg.${TARGET} .cfg; \
+	cp -p .config.split.${TARGET} .config.split; \
 	echo "Setting configuration to target: ${TARGET}"; \
 	else echo "No old target config found";mv .config .config.bak; make TARGET=${TARGET};fi
 
@@ -221,8 +187,9 @@ clean:
 			rm $$f ; \
 		done \
 	done
-	rm -rf $(BUILD_DIR) $(BIN_DIR) $(TARGET_DIR) ${TOPDIR}/.cfg \
-	    ${TOPDIR}/package/pkglist.d
+	rm -rf $(BUILD_DIR) $(BIN_DIR) $(TARGET_DIR) \
+		${TOPDIR}/.cfg_${ADK_TARGET}_${ADK_LIBC} \
+	    	${TOPDIR}/package/pkglist.d
 	rm -f ${TOPDIR}/package/*/info.mk ${TOPDIR}/package/Depends.mk
 
 cleankernel:
@@ -237,23 +204,28 @@ cleandir:
 	rm -rf $(TOOLCHAIN_BUILD_DIR_PFX) $(STAGING_PARENT_PFX) \
 	    $(TOOLS_BUILD_DIR)
 	rm -f .menu .tmpconfig.h ${TOPDIR}/package/*/info.mk \
-	    ${TOPDIR}/package/Depends.mk ${TOPDIR}/prereq.mk
+	    ${TOPDIR}/package/Depends.mk ${TOPDIR}/prereq.mk \
+	    .busyboxcfg
 
 cleantarget:
 	@$(TRACE) cleantarget
 	@$(MAKE) -C $(CONFIG) clean $(MAKE_TRACE)
-	rm -rf $(BUILD_DIR) $(BIN_DIR) $(TARGET_DIR) ${TOPDIR}/.cfg
-	rm -rf $(TOOLCHAIN_BUILD_DIR) $(STAGING_PARENT) all.config .defconfig
-	rm -f .tmpconfig.h ${TOPDIR}/package/*/info.mk
+	rm -rf $(BUILD_DIR) $(BIN_DIR) $(TARGET_DIR) \
+		${TOPDIR}/.cfg_${ADK_TARGET}_${ADK_LIBC}
+	rm -rf $(TOOLCHAIN_BUILD_DIR) $(STAGING_PARENT)
+	rm -f .tmpconfig.h ${TOPDIR}/package/*/info.mk \
+		.busyboxcfg all.config .defconfig
 
 distclean:
 	@$(TRACE) distclean
 	@$(MAKE) -C $(CONFIG) clean $(MAKE_TRACE)
 	@rm -rf $(BUILD_DIR_PFX) $(BIN_DIR_PFX) $(TARGET_DIR_PFX) $(DISTDIR) \
-	    ${TOPDIR}/.cfg* ${TOPDIR}/package/pkglist.d $(TOPDIR)/bulkdir
-	@rm -rf $(TOOLCHAIN_BUILD_DIR_PFX) $(STAGING_PARENT_PFX) $(TOOLS_BUILD_DIR)
+	    ${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 \
+	    .busyboxcfg .ADK_HAVE_DOT_CONFIG
 
 else # ! ifeq ($(strip $(ADK_HAVE_DOT_CONFIG)),y)
 
@@ -300,21 +272,48 @@ ifneq (,$(filter CYGWIN%,${OStype}))
 endif
 	@if [ ! -z "$(TARGET)" ];then \
 		grep "^config" target/Config.in \
-			|grep -i "$(TARGET)" \
+			|grep -i "$(TARGET)"\$$ \
 			|sed -e "s#^config \(.*\)#\1=y#" \
 			 >> $(TOPDIR)/.defconfig; \
 		for symbol in ${DEFCONFIG}; do \
 			echo $$symbol >> $(TOPDIR)/.defconfig; \
 		done; \
 	fi
-ifneq (,$(filter qemu%,${TARGET}))
+	@if [ ! -z "$(FS)" ];then \
+		grep "^config" target/Config.in \
+			|grep -i "$(FS)" \
+			|sed -e "s#^config \(.*\)#\1=y#" \
+			>> $(TOPDIR)/.defconfig; \
+	fi
+	@if [ ! -z "$(PKG)" ];then \
+		grep "^config" target/Config.in \
+			|grep -i "$(PKG)" \
+			|sed -e "s#^config \(.*\)#\1=y#" \
+			>> $(TOPDIR)/.defconfig; \
+	fi
+	@if [ ! -z "$(LIBC)" ];then \
+		grep "^config" target/Config.in \
+			|grep -i "$(LIBC)" \
+			|sed -e "s#^config \(.*\)#\1=y#" \
+			>> $(TOPDIR)/.defconfig; \
+	fi
+ifneq (,$(filter %_qemu,${TARGET}))
 	@echo ADK_LINUX_QEMU=y >> $(TOPDIR)/.defconfig
 endif
+ifneq (,$(filter %_toolchain,${TARGET}))
+	@echo ADK_LINUX_TOOLCHAIN=y >> $(TOPDIR)/.defconfig
+endif
 ifneq (,$(filter rescue%,${TARGET}))
 	@echo ADK_LINUX_RESCUE=y >> $(TOPDIR)/.defconfig
 endif
 ifneq (,$(filter rb%,${TARGET}))
 	@echo ADK_LINUX_MIKROTIK=y >> $(TOPDIR)/.defconfig
+endif
+ifneq (,$(filter alix%,${TARGET}))
+	@echo ADK_LINUX_ALIX=y >> $(TOPDIR)/.defconfig
+endif
+ifneq (,$(filter wrap%,${TARGET}))
+	@echo ADK_LINUX_ALIX=y >> $(TOPDIR)/.defconfig
 endif
 	@if [ ! -z "$(TARGET)" ];then \
 		$(CONFIG)/conf -D .defconfig $(CONFIG_CONFIG_IN); \
@@ -341,7 +340,7 @@ ifneq (,$(filter CYGWIN%,${OStype}))
 endif
 	@if [ ! -z "$(TARGET)" ];then \
 		grep "^config" target/Config.in \
-			|grep -i "$(TARGET)" \
+			|grep -i "$(TARGET)"\$$ \
 			|sed -e "s#^config \(.*\)#\1=y#" \
 			>> $(TOPDIR)/all.config; \
 		for symbol in ${DEFCONFIG}; do \
@@ -369,12 +368,21 @@ endif
 ifneq (,$(filter %_qemu,${TARGET}))
 	@echo ADK_LINUX_QEMU=y >> $(TOPDIR)/all.config
 endif
+ifneq (,$(filter %_toolchain,${TARGET}))
+	@echo ADK_LINUX_TOOLCHAIN=y >> $(TOPDIR)/all.config
+endif
 ifneq (,$(filter %_rescue,${TARGET}))
 	@echo ADK_LINUX_RESCUE=y >> $(TOPDIR)/all.config
 endif
 ifneq (,$(filter rb%,${TARGET}))
 	@echo ADK_LINUX_MIKROTIK=y >> $(TOPDIR)/all.config
 endif
+ifneq (,$(filter alix%,${TARGET}))
+	@echo ADK_LINUX_ALIX=y >> $(TOPDIR)/all.config
+endif
+ifneq (,$(filter wrap%,${TARGET}))
+	@echo ADK_LINUX_ALIX=y >> $(TOPDIR)/all.config
+endif
 
 menuconfig: $(CONFIG)/mconf defconfig .menu
 	@if [ ! -f .config ];then \
@@ -396,32 +404,48 @@ _mconfig2: ${CONFIG}/conf modconfig .menu
 distclean:
 	@$(MAKE) -C $(CONFIG) clean
 	@rm -rf $(BUILD_DIR_PFX) $(BIN_DIR_PFX) $(TARGET_DIR_PFX) $(DISTDIR) \
-	    ${TOPDIR}/.cfg* ${TOPDIR}/package/pkglist.d $(TOPDIR)/bulkdir
+	    ${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)
 
 # build all targets and combinations
 bulk:
-	while read target libc fs p; do \
-		mkdir -p $(TOPDIR)/bulkdir/$$target-$$libc-$$fs; \
+	while read target libc fs; do \
+		mkdir -p $(TOPDIR)/bin/$$target_$$libc; \
+	    ( \
+		echo === building $$target $$libc $$fs on $$(date); \
+		$(GMAKE) prereq && \
+			$(GMAKE) TARGET=$$target LIBC=$$libc FS=$$fs defconfig; \
+			$(GMAKE) VERBOSE=1 all; \
+		rm .config; \
+	    ) 2>&1 | tee $(TOPDIR)/bin/$$target_$$libc/$$target-$$libc-$$fs.log; \
+	done <${TOPDIR}/target/bulk.lst
+
+bulkall:
+	while read target libc fs; do \
+		mkdir -p $(TOPDIR)/bin/$$target_$$libc; \
+	    ( \
+		echo === building $$target $$libc $$fs on $$(date); \
+		$(GMAKE) prereq && \
+			$(GMAKE) TARGET=$$target LIBC=$$libc FS=$$fs allconfig; \
+			$(GMAKE) VERBOSE=1 all; \
+		rm .config; \
+	    ) 2>&1 | tee $(TOPDIR)/bin/$$target_$$libc/$$target-$$libc-$$fs.log; \
+	done <${TOPDIR}/target/bulk.lst
+
+bulkallmod:
+	while read target libc fs; do \
+		mkdir -p $(TOPDIR)/bin/$$target_$$libc; \
 	    ( \
 		echo === building $$target $$libc $$fs on $$(date); \
 		$(GMAKE) prereq && \
-		if [ "x$$p" = xy ];then \
-			$(GMAKE) TARGET=$$target LIBC=$$libc FS=$$fs \
-				allmodconfig; \
-		else \
-			$(GMAKE) TARGET=$$target LIBC=$$libc FS=$$fs \
-				defconfig; \
-		fi && \
-		$(GMAKE) VERBOSE=1 -f mk/build.mk allcopy \
-		    targetdir=$$target-$$libc-$$fs; \
-		$(GMAKE) cleantarget; \
+			$(GMAKE) TARGET=$$target LIBC=$$libc FS=$$fs allmodconfig; \
+			$(GMAKE) VERBOSE=1 all; \
 		rm .config; \
-	    ) 2>&1 | tee $(TOPDIR)/bulkdir/$$target-$$libc-$$fs/log; \
+	    ) 2>&1 | tee $(TOPDIR)/bin/$$target_$$libc/$$target-$$libc-$$fs.log; \
 	done <${TOPDIR}/target/bulk.lst
 
 menu .menu: $(wildcard ${TOPDIR}/package/*/Makefile)

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/image.mk

@@ -54,12 +54,17 @@ image-prepare-post:
 
 INITRAMFS=		${ADK_TARGET}-${ADK_LIBC}-${FS}
 ROOTFSSQUASHFS=		${ADK_TARGET}-${ADK_LIBC}-${FS}.img
-ROOTFSTARBALL=		${ADK_TARGET}-${ADK_LIBC}-${FS}.tar.gz
+ROOTFSTARBALL=		${ADK_TARGET}-${ADK_LIBC}-${FS}+kernel.tar.gz
+ROOTFSUSERTARBALL=	${ADK_TARGET}-${ADK_LIBC}-${FS}.tar.gz
 INITRAMFS_PIGGYBACK=	${ADK_TARGET}-${ADK_LIBC}-${FS}.cpio
 
 ${BIN_DIR}/${ROOTFSTARBALL}: ${TARGET_DIR}
 	cd ${TARGET_DIR}; tar -cf - --owner=0 --group=0 . | gzip -n9 >$@
 
+${BIN_DIR}/${ROOTFSUSERTARBALL}: ${TARGET_DIR}
+	cd ${TARGET_DIR}; tar --exclude ./boot -cf - --owner=0 --group=0 . \
+		| gzip -n9 >$@
+
 ${BIN_DIR}/${INITRAMFS}: ${TARGET_DIR}
 	cd ${TARGET_DIR}; find . | sed -n '/^\.\//s///p' | sort | \
 	    cpio -R 0:0 -oC512 -Mdist -Hnewc | ${ADK_COMPRESSION_TOOL} >$@

mk/modules.mk

@@ -66,6 +66,14 @@ $(eval $(call KMOD_template,ATH5K,ath5k,\
 	$(MODULES_DIR)/kernel/drivers/net/wireless/ath/ath5k/ath5k \
 ,20, kmod-led-class))
 
+$(eval $(call KMOD_template,P54_COMMON,p54-common,\
+	$(MODULES_DIR)/kernel/drivers/net/wireless/p54/p54common \
+,68))
+
+$(eval $(call KMOD_template,P54_USB,p54-usb,\
+	$(MODULES_DIR)/kernel/drivers/net/wireless/p54/p54usb \
+,70))
+
 $(eval $(call KMOD_template,RT2X00,rt2x00,\
 	$(MODULES_DIR)/kernel/drivers/net/wireless/rt2x00/rt2x00lib \
 	$(MODULES_DIR)/kernel/drivers/net/wireless/rt2x00/rt2x00pci \
@@ -858,9 +866,12 @@ $(eval $(call KMOD_template,RPCSEC_GSS_KRB5,rpcsec-gss-krb5,\
 	$(MODULES_DIR)/kernel/net/sunrpc/auth_gss/rpcsec_gss_krb5 \
 ,26))
 
+$(eval $(call KMOD_template,LOCKD,lockd,\
+	$(MODULES_DIR)/kernel/fs/lockd/lockd \
+,27))
+
 ifneq ($(ADK_KERNEL_NFS_FS),y)
 $(eval $(call KMOD_template,NFS_FS,nfs-fs,\
-	$(MODULES_DIR)/kernel/fs/lockd/lockd \
 	$(MODULES_DIR)/kernel/fs/nfs/nfs \
 ,30))
 endif
@@ -916,6 +927,11 @@ $(eval $(call KMOD_template,SND,snd,\
 	$(MODULES_DIR)/kernel/sound/core/snd-pcm \
 ,40))
 
+$(eval $(call KMOD_template,SND_RAWMIDI,snd-rawmidi,\
+	$(MODULES_DIR)/kernel/sound/core/snd-hwdep \
+	$(MODULES_DIR)/kernel/sound/core/snd-rawmidi \
+,41))
+
 $(eval $(call KMOD_template,SND_OSSEMUL,snd-ossemul,\
 	$(MODULES_DIR)/kernel/sound/core/oss/snd-mixer-oss \
 	$(MODULES_DIR)/kernel/sound/core/oss/snd-pcm-oss \
@@ -1049,6 +1065,11 @@ $(eval $(call KMOD_template,USB_PEGASUS,usb-pegasus,\
 	$(MODULES_DIR)/kernel/drivers/net/usb/pegasus \
 ,75))
 
+$(eval $(call KMOD_template,SND_USB_AUDIO,snd-usb-audio,\
+	$(MODULES_DIR)/kernel/sound/usb/snd-usb-lib \
+	$(MODULES_DIR)/kernel/sound/usb/snd-usb-audio \
+,75))
+
 #
 # Bluetooth
 #

mk/package.mk

@@ -45,6 +45,7 @@ endif
 
 ifeq ($(ADK_NATIVE),y)
 CONFIGURE_ENV+=		CONFIG_SHELL='$(strip ${SHELL})' \
+			SHELL='$(strip ${SHELL})' \
 			CFLAGS='$(strip ${TCFLAGS})' \
 			CXXFLAGS='$(strip ${TCXXFLAGS})' \
 			CPPFLAGS='$(strip ${TCPPFLAGS})' \
@@ -54,7 +55,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 +65,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 +92,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}' \
-			AR='${TARGET_CROSS}ar' RANLIB='${TARGET_CROSS}ranlib' \
+			CC='${TARGET_CC}' \
+			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}),)
@@ -216,7 +221,7 @@ ifeq (,$(filter noremove,$(7)))
 	fi
 endif
 	@rm -f '$${STAGING_PARENT}/pkg/$(1)'
-	@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; \
@@ -229,7 +234,7 @@ endif
 	    find usr ! -type d 2>/dev/null | \
 	    grep -v -e '^usr/share' -e '^usr/man' -e '^usr/info' | \
 	    tee '$${STAGING_PARENT}/pkg/$(1)' | \
-	    cpio -apdlmu '$${STAGING_DIR}'
+	    cpio -padlmu '$${STAGING_DIR}'
 	@cd '$${STAGING_DIR}'; grep 'usr/lib/.*\.la$$$$' \
 	    '$${STAGING_PARENT}/pkg/$(1)' | while read fn; do \
 		chmod u+w $$$$fn; \

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)
+		autoreconf -vf;libtoolize $(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} \
@@ -58,7 +79,7 @@ ifneq ($(filter gnu,${CONFIGURE_STYLE}),)
 	    --prefix=/usr \
 	    --datadir=/usr/share \
 	    --mandir=/usr/share/man \
-	    --libexecdir=/usr/sbin \
+	    --libexecdir=/usr/libexec \
 	    --localstatedir=/var \
 	    --sysconfdir=/etc \
 	    --disable-nls \
@@ -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} \
-	    ${MAKE_FLAGS} ${ALL_TARGET} $(MAKE_TRACE)
-else ifneq ($(filter manual,${BUILD_STYLE}),)
+
+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,18 @@ 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}),)
-	cd ${WRKBUILD} && env ${MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \
-	    DESTDIR='${WRKINST}' ${FAKE_FLAGS} ${INSTALL_TARGET} $(MAKE_TRACE)
-else ifneq ($(filter manual,${INSTALL_STYLE}),)
+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)
+ifeq (,$(filter libonly,${PKG_OPTS}))
+	env ${MAKE_ENV} ${MAKE} post-install $(MAKE_TRACE)
+endif
 else
 	@echo "Invalid INSTALL_STYLE '${INSTALL_STYLE}'" >&2
 	@exit 1
@@ -126,9 +147,6 @@ endif
 		[[ -e $$a ]] || continue; \
 		$(SED) "s,^prefix=.*,prefix=${STAGING_DIR}/usr," $$a; \
 	done
-ifeq (,$(filter libonly,${PKG_OPTS}))
-	@env ${MAKE_ENV} ${MAKE} post-install $(MAKE_TRACE)
-endif
 ifeq (,$(filter noremove,${PKG_OPTS}))
 	@if test -s '${STAGING_PARENT}/pkg/${PKG_NAME}'; then \
 		cd '${STAGING_DIR}'; \
@@ -138,7 +156,7 @@ ifeq (,$(filter noremove,${PKG_OPTS}))
 	fi
 endif
 	@rm -f '${STAGING_PARENT}/pkg/${PKG_NAME}'
-	@cd ${WRKINST}; \
+	@-cd ${WRKINST}; \
 	    if [ "${PKG_NAME}" != "uClibc" -a "${PKG_NAME}" != "eglibc" -a "${PKG_NAME}" != "glibc" -a "${PKG_NAME}" != "libpthread" -a "${PKG_NAME}" != "libstdcxx" -a "${PKG_NAME}" != "libthread-db" ];then \
 	    find lib \( -name lib\*.so\* -o -name lib\*.a \) \
 	    	-exec echo 'WARNING: ${PKG_NAME} installs files in /lib -' \
@@ -146,7 +164,7 @@ endif
 	    find usr ! -type d 2>/dev/null | \
 	    grep -v -e '^usr/share' -e '^usr/man' -e '^usr/info' | \
 	    tee '${STAGING_PARENT}/pkg/${PKG_NAME}' | \
-	    cpio -apdlmu '${STAGING_DIR}'
+	    cpio -padlmuv '${STAGING_DIR}'
 	@cd '${STAGING_DIR}'; grep 'usr/lib/.*\.la$$' \
 	    '${STAGING_PARENT}/pkg/${PKG_NAME}' | while read fn; do \
 		chmod u+w $$fn; \

mk/rootfs.mk

@@ -18,7 +18,7 @@ $(eval $(call rootfs_template,archive,ARCHIVE))
 $(eval $(call rootfs_template,initramfs,INITRAMFS))
 $(eval $(call rootfs_template,initramfs-piggyback,INITRAMFS_PIGGYBACK))
 $(eval $(call rootfs_template,squashfs,SQUASHFS))
-$(eval $(call rootfs_template,yaffs,YAFFS))
+$(eval $(call rootfs_template,yaffs,YAFFS,root=/dev/mtdblock1))
 $(eval $(call rootfs_template,nfsroot,NFSROOT,root=/dev/nfs ip=dhcp init=/init))
 $(eval $(call rootfs_template,encrypted,ENCRYPTED))
 

mk/split-cfg.mk

@@ -2,6 +2,8 @@
 # material, please see the LICENCE file in the top-level directory.
 # must work with both BSD and GNU make
 
-${TOPDIR}/.cfg/ADK_HAVE_DOT_CONFIG: ${TOPDIR}/.config \
-    ${TOPDIR}/mk/split-cfg.mk ${TOPDIR}/scripts/split-cfg.sh
-	mksh ${TOPDIR}/scripts/split-cfg.sh '${TOPDIR}'
+${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

@@ -15,23 +15,26 @@ else
 TARGET_DEBUGGING:=	-fomit-frame-pointer
 endif
 TARGET_CFLAGS:=		$(TARGET_OPTIMIZATION) $(TARGET_CFLAGS_ARCH) $(TARGET_DEBUGGING)
+ifneq ($(ADK_TARGET_ARCH_OPTIMIZATION),)
+TARGET_CFLAGS+=		-march=$(ADK_TARGET_ARCH_OPTIMIZATION)
+endif
 
 BASE_DIR:=		$(TOPDIR)
 DISTDIR?=		${BASE_DIR}/dl
-BUILD_DIR:=		${BASE_DIR}/build_${CPU_ARCH}
+BUILD_DIR:=		${BASE_DIR}/build_${ADK_TARGET}_${ADK_LIBC}
 BUILD_DIR_PFX:=		$(BASE_DIR)/build_*
-STAGING_PARENT:=	${BASE_DIR}/cross_${CPU_ARCH}
+STAGING_PARENT:=	${BASE_DIR}/cross_${ADK_TARGET}_${ADK_LIBC}
 STAGING_PARENT_PFX:=	${BASE_DIR}/cross_*
 STAGING_TOOLS:=		${STAGING_PARENT}/host
 STAGING_DIR:=		${STAGING_PARENT}/target
-TOOLCHAIN_BUILD_DIR=	$(BASE_DIR)/toolchain_build_${CPU_ARCH}
+TOOLCHAIN_BUILD_DIR=	$(BASE_DIR)/toolchain_build_${ADK_TARGET}_${ADK_LIBC}
 TOOLCHAIN_BUILD_DIR_PFX=$(BASE_DIR)/toolchain_build_*
 TOOLS_BUILD_DIR=	$(BASE_DIR)/tools_build
 SCRIPT_DIR:=		$(BASE_DIR)/scripts
-BIN_DIR:=		$(BASE_DIR)/bin_${ADK_TARGET}
-BIN_DIR_PFX:=		$(BASE_DIR)/bin_*
+BIN_DIR:=		$(BASE_DIR)/bin/${ADK_TARGET}_${ADK_LIBC}
+BIN_DIR_PFX:=		$(BASE_DIR)/bin
 PACKAGE_DIR:=		$(BIN_DIR)/packages
-TARGET_DIR:=		$(BASE_DIR)/root_${ADK_TARGET}
+TARGET_DIR:=		$(BASE_DIR)/root_${ADK_TARGET}_${ADK_LIBC}
 TARGET_DIR_PFX:=	$(BASE_DIR)/root_*
 TARGET_PATH=		${SCRIPT_DIR}:${STAGING_TOOLS}/bin:${STAGING_DIR}/scripts:${_PATH}
 REAL_GNU_TARGET_NAME=	$(CPU_ARCH)-linux-$(ADK_TARGET_SUFFIX)
@@ -46,6 +49,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 +62,13 @@ TARGET_CONFIGURE_OPTS=	PATH='${TARGET_PATH}' \
 			AS=$(TARGET_CROSS)as \
 			LD=$(TARGET_CROSS)ld \
 			NM=$(TARGET_CROSS)nm \
-			CC="$(TARGET_CC)" \
-			GCC="$(TARGET_CC)" \
-			CXX="$(TARGET_CXX)" \
-			RANLIB=$(TARGET_CROSS)ranlib
+			RANLIB=$(TARGET_CROSS)ranlib \
+			CC='$(TARGET_CC)' \
+			GCC='$(TARGET_CC)' \
+			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}'
@@ -96,19 +102,21 @@ EXTRACT_CMD=		mkdir -p ${WRKDIR}; \
 			cd ${WRKDIR} && \
 			for file in ${FULLDISTFILES}; do case $$file in \
 			*.cpio) \
-				cat $$file | cpio -i -d --quiet ;; \
+				cat $$file | cpio -i -d ;; \
 			*.tar) \
 				tar -xf $$file ;; \
 			*.cpio.Z | *.cpio.gz | *.cgz | *.mcz) \
-				gzip -dc $$file | cpio -i -d --quiet ;; \
+				gzip -dc $$file | cpio -i -d ;; \
 			*.tar.Z | *.tar.gz | *.taz | *.tgz) \
 				gzip -dc $$file | tar -xf - ;; \
 			*.cpio.bz2 | *.cbz) \
-				bzip2 -dc $$file | cpio -i -d --quiet ;; \
+				bzip2 -dc $$file | cpio -i -d ;; \
 			*.tar.bz2 | *.tbz | *.tbz2) \
 				bzip2 -dc $$file | tar -xf - ;; \
 			*.zip) \
 				unzip -qd ${WRKDIR} $$file ;; \
+			*.arm) \
+				cp $$file ${WRKDIR} ;; \
 			*) \
 				echo "Cannot extract '$$file'" >&2; \
 				false ;; \

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_DESCR:=		@add short description@
-PKG_SECTION:=		@add section@
-PKG_DEPENDS:=		@add dependendant package names@
-PKG_URL:=		@add project url@
-PKG_SITES:=		@add download url without package name@
+PKG_MD5SUM:=		add md5sum of package here
+PKG_DESCR:=		add short description
+PKG_SECTION:=		add section
+PKG_DEPENDS:=		add dependendant package names
+PKG_BUILDDEP+=		add packages which need to be compiled
+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
-INSTALL_STYLE:=		auto
+#BUILD_STYLE:=		manual
+#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
-CONFIGURE_ENV+=		ac_cv_path_STRIP=$(STRIP) \
-			ac_cv_func_vsnprintf=yes
-ALL_TARGET=		default
-BUILD_STYLE=		auto
+AUTOTOOL_STYLE:=	autoconf
 
 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

@@ -4,18 +4,18 @@
 menu "Package selection"
 
 menu "Basesystem"
+source "package/adkinstall/Config.in"
 source "package/base-files/Config.in"
 source "package/busybox/Config.in.manual"
 source "package/cfgfs/Config.in"
-source "package/cfinstall/Config.in"
 source "package/cryptinit/Config.in"
 source "package/uclibc/Config.in.manual"
 source "package/glibc/Config.in.manual"
 source "package/eglibc/Config.in.manual"
 source "package/libc/Config.in.manual"
-source "package/rpm/Config.in"
 source "package/grub/Config.in"
 source "package/grub-bin/Config.in"
+source "package/rpm/Config.in"
 endmenu
 
 menu "Bluetooth"
@@ -27,21 +27,34 @@ source "package/ussp-push/Config.in"
 endmenu
 
 menu "Browser / Editor / Pager"
+source "package/elinks/Config.in"
 source "package/less/Config.in"
-source "package/nano/Config.in"
-source "package/vim/Config.in"
 source "package/links/Config.in"
-source "package/elinks/Config.in"
 source "package/lynx/Config.in"
+source "package/nano/Config.in"
+source "package/vim/Config.in"
 endmenu
 
-menu "Archivers / Compression"
+menu "Compression and Archivers"
 source "package/bzip2/Config.in"
 source "package/cpio/Config.in"
 source "package/tar/Config.in"
 source "package/xz/Config.in"
 endmenu
 
+menu "Cryptography"
+source "package/cryptsetup/Config.in"
+source "package/gnupg/Config.in"
+source "package/gnutls/Config.in"
+source "package/heimdal/Config.in"
+source "package/krb5/Config.in"
+source "package/openct/Config.in"
+source "package/opensc/Config.in"
+source "package/openssl/Config.in"
+source "package/openssl-pkcs11/Config.in"
+source "package/rng-tools/Config.in"
+endmenu
+
 menu "Debugging / Analyzing"
 source "package/exmap/Config.in"
 source "package/gdb/Config.in"
@@ -58,6 +71,7 @@ source "package/e2fsprogs/Config.in"
 source "package/fuse/Config.in"
 source "package/mdadm/Config.in"
 source "package/mtd/Config.in"
+source "package/nand/Config.in"
 source "package/lvm/Config.in"
 source "package/parted/Config.in"
 source "package/util-linux-ng/Config.in"
@@ -107,6 +121,7 @@ source "package/gmediaserver/Config.in"
 source "package/icecast/Config.in"
 source "package/lame/Config.in"
 source "package/madplay/Config.in"
+source "package/mpg123/Config.in"
 source "package/moc/Config.in"
 source "package/mpd/Config.in"
 source "package/mplayer/Config.in"
@@ -118,20 +133,10 @@ endmenu
 menu "Shells"
 source "package/bash/Config.in"
 source "package/mksh/Config.in"
+source "package/tcsh/Config.in"
 source "package/zsh/Config.in"
 endmenu
 
-menu "Security"
-source "package/cryptsetup/Config.in"
-source "package/gpg/Config.in"
-source "package/heimdal/Config.in"
-source "package/krb5/Config.in"
-source "package/openct/Config.in"
-source "package/opensc/Config.in"
-source "package/openssl/Config.in"
-source "package/openssl-pkcs11/Config.in"
-source "package/rng-tools/Config.in"
-endmenu
 
 menu "Serial communications & terminal emulation"
 source "package/heyu/Config.in"
@@ -162,7 +167,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
 
@@ -186,7 +191,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
 
@@ -272,6 +277,7 @@ source "package/fontconfig/Config.in"
 source "package/gettext/Config.in"
 source "package/glib/Config.in"
 source "package/gtk+/Config.in"
+source "package/heimdal/Config.in.lib"
 source "package/id3lib/Config.in"
 source "package/libao/Config.in"
 source "package/libao/Config.in.lib"
@@ -313,7 +319,6 @@ source "package/libgssglue/Config.in"
 source "package/libgssglue/Config.in.lib"
 source "package/gmp/Config.in" 
 source "package/gmp/Config.in.lib" 
-source "package/gnutls/Config.in"
 source "package/gnutls/Config.in.lib"
 source "package/libgpg-error/Config.in"
 source "package/libgpg-error/Config.in.lib"
@@ -325,13 +330,14 @@ source "package/libid3tag/Config.in"
 source "package/libid3tag/Config.in.lib"
 source "package/jpeg/Config.in"
 source "package/jpeg/Config.in.lib"
+source "package/krb5/Config.in.lib"
 source "package/lame/Config.in.lib"
 source "package/mpfr/Config.in"
 source "package/mysql/Config.in"
 source "package/mysql/Config.in.lib"
 source "package/nspr/Config.in"
 source "package/nss/Config.in"
-source "package/libtool/Config.in" 
+source "package/libtool/Config.in.lib" 
 source "package/openldap/Config.in.lib"
 source "package/liblzo/Config.in"
 source "package/liblzo/Config.in.lib"
@@ -350,6 +356,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"
@@ -357,6 +364,7 @@ source "package/libogg/Config.in.lib"
 source "package/libol/Config.in"
 source "package/libol/Config.in.lib"
 source "package/opencdk/Config.in"  
+source "package/opencdk/Config.in.lib"  
 source "package/obexftp/Config.in.lib"
 source "package/openobex/Config.in"
 source "package/libosip2/Config.in"
@@ -379,13 +387,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"
@@ -405,6 +418,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"
@@ -432,7 +446,6 @@ menu "Networking Misc"
 source "package/cups/Config.in"
 source "package/fakeidentd/Config.in"
 source "package/gkrellmd/Config.in"
-source "package/git/Config.in"
 source "package/net-snmp/Config.in"
 # intentionally inserted here, as it depends on the above
 source "package/iptables-snmp/Config.in"
@@ -443,11 +456,11 @@ source "package/pipacs/Config.in"
 #source "package/pmacct/Config.in"
 source "package/portmap/Config.in"
 source "package/rarpd/Config.in"
+source "package/rpcbind/Config.in"
 source "package/rrs/Config.in"
 source "package/rsync/Config.in"
 source "package/shat/Config.in"
 source "package/socat/Config.in"
-source "package/subversion/Config.in"
 source "package/udp-broadcast-relay/Config.in"
 source "package/vgp/Config.in"
 source "package/vnstat/Config.in"
@@ -512,6 +525,7 @@ source "package/gcc/Config.in"
 source "package/gperf/Config.in"
 source "package/haserl/Config.in"
 source "package/jamvm/Config.in"
+source "package/libtool/Config.in"
 source "package/lua/Config.in"
 source "package/m4/Config.in"
 source "package/make/Config.in"
@@ -519,6 +533,7 @@ source "package/microperl/Config.in"
 source "package/perl/Config.in"
 source "package/php/Config.in"
 source "package/python/Config.in"
+source "package/python2/Config.in"
 source "package/ruby/Config.in"
 source "package/tcl/Config.in"
 endmenu
@@ -545,15 +560,23 @@ source "package/tinc/Config.in"
 source "package/vpnc/Config.in"
 endmenu
 
+menu "SCM"
+#source "package/bzr/Config.in"
+source "package/cvs/Config.in"
+source "package/git/Config.in"
+source "package/subversion/Config.in"
+endmenu
+
 menu "Wireless"
 source "package/aircrack-ng/Config.in"
 source "package/chillispot/Config.in"
 source "package/hostapd/Config.in"
 source "package/iw/Config.in"
-#source "package/kismet/Config.in"
+source "package/kismet/Config.in"
 source "package/olsrd/Config.in"
+source "package/p54-firmware/Config.in"
+source "package/rt61-firmware/Config.in"
 source "package/wifidog/Config.in"
-source "package/wireless-firmware/Config.in"
 source "package/wpa_supplicant/Config.in"
 endmenu
 
@@ -624,6 +647,8 @@ source "package/libXrender/Config.in"
 source "package/libXrender/Config.in.lib"
 source "package/libXt/Config.in"
 source "package/libXt/Config.in.lib"
+source "package/libXft/Config.in"
+source "package/libXft/Config.in.lib"
 source "package/libXxf86dga/Config.in"
 source "package/libXxf86dga/Config.in.lib"
 source "package/pixman/Config.in"

package/Makefile

@@ -41,9 +41,6 @@ compile: base-files-compile $(COMPILE_PACKAGES)
 install: base-files-install $(INSTALL_PACKAGES)
 endif
 
-#$(COMPILE_PACKAGES): base-files-compile
-#$(INSTALL_PACKAGES): base-files-install
-
 $(TARGET_DIR):
 	mkdir -p $(TARGET_DIR)
 
@@ -59,7 +56,7 @@ $(TARGET_DIR):
 	$(CMD_TRACE) " done"
 	$(END_TRACE)
 
-%-install: %-compile
+%-install:
 	@$(START_TRACE) "package/$(patsubst %-install,%,$@)-install: "
 	@$(MAKE) -C $(patsubst %-install,%,$@) install
 	@$(CMD_TRACE) " done"

package/adkinstall/Makefile

@@ -0,0 +1,38 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include ${TOPDIR}/rules.mk
+
+PKG_NAME:=		adkinstall
+PKG_VERSION:=		1.0
+PKG_RELEASE:=		3
+PKG_DESCR:=		installer for compact flash or nand/mtd devices
+PKG_SECTION:=		base
+PKG_DEPENDS:=		parted sfdisk
+
+PKG_TARGET_DEPENDS:=	alix wrap rb532
+
+WRKDIST=		${WRKDIR}/${PKG_NAME}-${PKG_VERSION}
+NO_DISTFILES:=		1
+
+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
+
+pre-configure:
+	mkdir -p ${WRKBUILD}
+
+do-install:
+	${INSTALL_DIR} $(IDIR_ADKINSTALL)/sbin
+ifeq ($(ADK_LINUX_MIPS_RB532),y)
+	${INSTALL_BIN} ./src/adkinstall.rb532 \
+		$(IDIR_ADKINSTALL)/sbin/adkinstall
+else
+	${INSTALL_BIN} ./src/adkinstall $(IDIR_ADKINSTALL)/sbin
+endif
+
+include ${TOPDIR}/mk/pkg-bottom.mk

package/adkinstall/src/adkinstall.rb532

@@ -0,0 +1,87 @@
+#!/bin/sh
+# installs a rootfs tar archive from OpenADK onto 
+# a Compact Flash disk or NAND device
+# special script for routerboard rb532
+
+nandinstall=0
+cfinstall=0
+
+if [ -z $1 ];then
+        printf "Please give your target device as first parameter [cf|nand]\n"
+        exit 1
+fi
+if [ -z $2 ];then
+        printf "Please give your root tar archive as second parameter\n"
+        exit 1
+fi
+if [ $cfinstall -eq 1 ];then
+	if [ -z $3 ];then
+       	 printf "Please give your kernel as third parameter\n"
+       	 exit 1
+	fi
+fi
+case $1 in
+	nand)
+		nandinstall=1
+		;;
+	cf)
+		cfinstall=1
+		;;
+	*)
+		printf "Target device not known.\n"
+		exit 1
+		;;
+esac
+
+if [ $cfinstall -eq 1 ];then
+	# create empty partition table
+	printf "Creating partition scheme\n"
+	parted -s /dev/sda mklabel msdos
+	sleep 2
+	maxsize=$(env LC_ALL=C parted /dev/sda -s unit cyl print |awk '/^Disk/ { print $3 }'|sed -e 's/cyl//')
+	rootsize=$(($maxsize-2))
+	parted -s /dev/sda unit cyl mkpart primary ext2 0 1
+	parted -s /dev/sda unit cyl mkpartfs primary ext2 1 $rootsize
+	parted -s /dev/sda unit cyl mkpart primary fat32 $rootsize $maxsize
+	parted -s /dev/sda set 1 boot on
+	sfdisk --change-id /dev/sda 1 27 >/dev/null 2>&1
+	sfdisk --change-id /dev/sda 3 88 >/dev/null 2>&1
+	sleep 2
+	sync
+	printf "Installing kernel\n"
+	dd if=$3 of=/dev/sda1 bs=2048 >/dev/null 2>&1
+	sync
+	mount -t ext2 /dev/sda2 /mnt
+fi
+
+if [ $nandinstall -eq 1 ];then
+	printf "Preparing mountpoints\n"
+	mount -t yaffs2 /dev/mtdblock1 /mnt
+	rm -rf /mnt/* >/dev/null 2>&1
+	mkdir /mnt/boot
+	mount -t yaffs2 /dev/mtdblock0 /mnt/boot
+fi
+
+printf "Extracting install archive\n"
+tar -C /mnt -xzpf $2
+if [ $? -ne 0 ];then
+	printf "Extracting of install archive failed"
+	exit 1
+fi
+
+chmod 1777 /mnt/tmp
+chmod 4755 /mnt/bin/busybox
+
+sync
+
+if [ $nandinstall -eq 1 ];then
+	umount /mnt/boot
+fi
+umount /mnt
+if [ $? -ne 0 ];then
+	printf "Unmounting filesystem failed"
+	exit 1
+else
+	printf "Successfully installed.\n"
+	exit 0
+fi

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
-INSTALL_STYLE:=	auto
-XAKE_FLAGS+=	CC="$(TARGET_CC)" \
-		CFLAGS="$(TARGET_CFLAGS) -Wall" \
-		CROSS="$(TARGET_CROSS)" OSNAME="Linux" \
-		prefix="/usr"
+CONFIG_STYLE:=		manual
+
+XAKE_FLAGS+=		CC="$(TARGET_CC)" \
+			CFLAGS="$(TARGET_CFLAGS) -Wall" \
+			OSNAME="Linux" 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/airdecap-ng $(IDIR_AIRCRACK_NG)/usr/bin/
-	$(INSTALL_BIN) $(WRKINST)/usr/bin/packetforge-ng $(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/
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/aircrack-ng \
+		$(IDIR_AIRCRACK_NG)/usr/bin/
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/airdecap-ng \
+		$(IDIR_AIRCRACK_NG)/usr/bin/
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/packetforge-ng \
+		$(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_SITES:=		ftp://ftp.task.gda.pl/pub/linux/misc/alsa/lib/ \
-			ftp://ftp.alsa-project.org/pub/lib/
+PKG_URL:=		http://www.alsa-project.org/
+PKG_SITES:=		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,\(^datadir=\"\)\(.*\),\1${STAGING_DIR}\2," ${WRKINST}/usr/bin/apr-config
+	$(SED) "s,\(^installbuilddir=\"\)\(.*\),\1${STAGING_DIR}\2," \
+		${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
-BUILD_STYLE=		auto
+INSTALL_STYLE:=		manual
+
 MAKE_FLAGS+=		ARPDIR=/etc/arpwatch \
 			CCOPT="$(TARGET_CFLAGS)" \
 			INCLS="-I. -I$(STAGING_DIR)/usr/include" \

package/asterisk/Makefile

@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		asterisk
-PKG_VERSION:=		1.4.28
+PKG_VERSION:=		1.6.2.1
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		e8006ce319e18ce07ce1335ad583330a
+PKG_MD5SUM:=		8fbc60f9d80e686c749ae95292e225d8
 PKG_DESCR:=		Open Source PBX
 PKG_SECTION:=		net
 PKG_MULTI:=		1
@@ -22,13 +22,10 @@ endif
 PKG_URL:=		http://www.asterisk.org
 PKG_SITES:=		http://downloads.asterisk.org/pub/telephony/asterisk/releases/
 
-PKG_TARGET_DEPENDS:=	!foxboard
-
-#PKG_DEPENDS_MAIN:=		asterisk
-PKG_DESCR_CHAN_MGCP:=		Media Gateway Control Protocol implementation
-PKG_DESCR_CHAN_SKINNY:=		Skinny Client Control Protocol implementation
-PKG_DESCR_CHAN_IAX2:=		Support for the Inter Asterisk Protocol
-PKG_DESCR_CODEC_SPEEX:=		Speex/PCM16 Codec Translator
+PKG_DESCR_CHAN_MGCP:=	Media Gateway Control Protocol implementation
+PKG_DESCR_CHAN_SKINNY:=	Skinny Client Control Protocol implementation
+PKG_DESCR_CHAN_IAX2:=	Support for the Inter Asterisk Protocol
+PKG_DESCR_CODEC_SPEEX:=	Speex/PCM16 Codec Translator
 
 include $(TOPDIR)/mk/package.mk
 
@@ -57,35 +54,34 @@ SUB_INSTALLS-${ADK_PACKAGE_ASTERISK_CODEC_GSM}+=	asterisk-codec-gsm-install
 SUB_INSTALLS-${ADK_PACKAGE_ASTERISK_PBX_DUNDI}+=	asterisk-pbx-dundi-install
 SUB_INSTALLS-${ADK_PACKAGE_ASTERISK_RES_AGI}+=		asterisk-res-agi-install
 
-#workaround for cris and gcc 4.4, where -Os generates ICE
-ifeq ($(ARCH),cris)
-TARGET_OPTIMIZATION:=$(subst Os,O2,$(TARGET_OPTIMIZATION))
-endif
-
 CONFIGURE_ARGS=		--with-z=${STAGING_DIR}/usr \
 			--with-ncurses=${STAGING_DIR}/usr \
 			--with-ssl=${STAGING_DIR}/usr \
-			--without-zaptel \
+			--disable-xmldoc \
 			--without-tonezone \
 			--without-asound \
 			--without-curses \
-			--without-gnutls \
+			--without-gtk \
+			--without-gtk2 \
 			--without-h323 \
 			--without-iksemel \
 			--without-imap \
-			--without-kde \
 			--without-nbs \
 			--without-netsnmp \
 			--without-newt \
-			--without-odbc \
 			--without-osptk \
 			--without-oss \
+			--without-popt \
 			--without-pri \
 			--without-pwlib \
 			--without-tds \
 			--without-termcap \
 			--without-tinfo \
-			--without-vpb
+			--without-vpb \
+			--without-misdn \
+			--without-isdnnet \
+			--without-suppserv
+
 ifneq (${ADK_PACKAGE_ASTERISK_CODEC_GSM},)
 CONFIGURE_ARGS+=	--with-gsm=internal
 else
@@ -110,35 +106,28 @@ CONFIGURE_ARGS+=	--with-postgres=${STAGING_DIR}/usr
 else
 CONFIGURE_ARGS+=	--without-postgres
 endif
-ifneq (${ADK_PACKAGE_LIBPOPT},)
-CONFIGURE_ARGS+=	--with-popt=${STAGING_DIR}/usr
-else
-CONFIGURE_ARGS+=	--without-popt
-endif
-CONFIGURE_ARGS+=	--without-misdn \
-			--without-isdnnet \
-			--without-suppserv
 
-CONFIGURE_STYLE:=	gnu
-CONFIGURE_ENV+=		STRIP=${STRIP}
-BUILD_STYLE:=		auto
+INSTALL_STYLE:=		manual
+
+TLDFLAGS+=		-lm
 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
 
 pre-configure:
-	rm ${WRKBUILD}/apps/app_followme.c
 	cd "$(WRKBUILD)/menuselect"; ./configure 
 
+pre-build:
+	$(MAKE) -C $(WRKBUILD)/menuselect
+
 post-build:
 	cd ${WRKBUILD}/sounds ; \
-	tar xzf asterisk-core-sounds-en-gsm-1.4.16.tar.gz ; \
-	rm asterisk-core-sounds-en-gsm-1.4.16.tar.gz
+	tar xzf asterisk-core-sounds-en-gsm-1.4.17.tar.gz ; \
+	rm asterisk-core-sounds-en-gsm-1.4.17.tar.gz
 	@echo
 	@echo "---> have to install ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} <---"
 	@echo
@@ -157,8 +146,9 @@ do-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
 		rm -rf mohmp3/*.mp3; \
 		rm -rf sounds/*; \
 		cd modules; \
-		rm -rf	*adsi* *festival* *modem* *meetme* *oss* *phone* *intercom* \
-			*mp3* *nbscat* *mysql* *postgres* *pgsql* *voicemail* *speex* \
+		rm -rf	*adsi* *festival* *modem* *meetme* *oss* \
+			*phone* *intercom* *mp3* *nbscat* *mysql* \
+			*postgres* *pgsql* *voicemail* *speex* \
 			*zapateller* *jpeg*; \
 		rm -f chan_bluetooth.so ; \
 		rm -f chan_h323.so ; \
@@ -172,80 +162,105 @@ do-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
 		rm -f res_agi.so ; \
 	)
 	(cd $(IDIR_ASTERISK)/etc/asterisk; \
-		rm -f 	*iax* *odbc* *mysql* *postgres* *pgsql* *voicemail* *adsi* *oss* *alsa* \
-			*festival* *modem* *meetme* *phone* *tds* *vofr* *rpt* *vpb* \
+		rm -f 	*iax* *odbc* *mysql* *postgres* *pgsql* \
+			*voicemail* *adsi* *oss* *alsa* \
+			*festival* *modem* *meetme* *phone* *tds* \
+			*vofr* *rpt* *vpb* \
 			*zapata*; \
 		rm -f bluetooth.conf ; \
 		rm -f mgcp.conf ; \
+		rm -f gtalk.conf ; \
 		rm -f skinny.conf ; \
 		rm -f dundi.conf ; \
 	)
 	${INSTALL_DATA} ./files/modules.conf $(IDIR_ASTERISK)/etc/asterisk/
-	$(SED) 's|/var/lib/asterisk|/usr/lib/asterisk|g' $(WRKINST)/etc/asterisk/musiconhold.conf
+	$(SED) 's|/var/lib/asterisk|/usr/lib/asterisk|g' \
+		$(WRKINST)/etc/asterisk/musiconhold.conf
 
 asterisk-pgsql-install:
 	${INSTALL_DIR} $(IDIR_ASTERISK_PGSQL)/etc/asterisk
-	${INSTALL_DATA} $(WRKBUILD)/configs/cdr_pgsql.conf.sample $(IDIR_ASTERISK_PGSQL)/etc/asterisk/cdr_pgsql.conf
+	${INSTALL_DATA} $(WRKBUILD)/configs/cdr_pgsql.conf.sample \
+		$(IDIR_ASTERISK_PGSQL)/etc/asterisk/cdr_pgsql.conf
 	${INSTALL_DIR} $(IDIR_ASTERISK_PGSQL)/usr/lib/asterisk/modules
-	${INSTALL_BIN} $(WRKBUILD)/cdr/cdr_pgsql.so $(IDIR_ASTERISK_PGSQL)/usr/lib/asterisk/modules/
+	${INSTALL_BIN} $(WRKBUILD)/cdr/cdr_pgsql.so \
+		$(IDIR_ASTERISK_PGSQL)/usr/lib/asterisk/modules/
 
 asterisk-sounds-install:
 	${INSTALL_DIR} $(IDIR_ASTERISK_SOUNDS)/usr/lib/asterisk/sounds
-	$(CP) $(WRKBUILD)/sounds/* $(IDIR_ASTERISK_SOUNDS)/usr/lib/asterisk/sounds/
+	$(CP) $(WRKBUILD)/sounds/* \
+		$(IDIR_ASTERISK_SOUNDS)/usr/lib/asterisk/sounds/
 	rm -f $(IDIR_ASTERISK_SOUNDS)/usr/lib/asterisk/sounds/*.mp3
 	rm -f $(IDIR_ASTERISK_SOUNDS)/usr/lib/asterisk/sounds/vm-*
 
 asterisk-voicemail-install:
 	${INSTALL_DIR} $(IDIR_ASTERISK_VOICEMAIL)/etc/asterisk
 	${INSTALL_DIR} $(IDIR_ASTERISK_VOICEMAIL)/usr/lib/asterisk/modules
-	${INSTALL_DATA} $(WRKBUILD)/configs/voicemail.conf.sample $(IDIR_ASTERISK_VOICEMAIL)/etc/asterisk/voicemail.conf
-	${CP} $(WRKBUILD)/apps/*voicemail.so $(IDIR_ASTERISK_VOICEMAIL)/usr/lib/asterisk/modules/
-	${INSTALL_BIN} $(WRKBUILD)/res/res_adsi.so $(IDIR_ASTERISK_VOICEMAIL)/usr/lib/asterisk/modules/
+	${INSTALL_DATA} $(WRKBUILD)/configs/voicemail.conf.sample \
+		$(IDIR_ASTERISK_VOICEMAIL)/etc/asterisk/voicemail.conf
+	${CP} $(WRKBUILD)/apps/*voicemail.so \
+		$(IDIR_ASTERISK_VOICEMAIL)/usr/lib/asterisk/modules/
+	${INSTALL_BIN} $(WRKBUILD)/res/res_adsi.so \
+		$(IDIR_ASTERISK_VOICEMAIL)/usr/lib/asterisk/modules/
 	${INSTALL_DIR} $(IDIR_ASTERISK_VOICEMAIL)/usr/lib/asterisk/sounds
-	$(CP) $(WRKBUILD)/sounds/vm-*.gsm $(IDIR_ASTERISK_VOICEMAIL)/usr/lib/asterisk/sounds/
+	$(CP) $(WRKBUILD)/sounds/vm-*.gsm \
+		$(IDIR_ASTERISK_VOICEMAIL)/usr/lib/asterisk/sounds/
 
 asterisk-chan-mgcp-install:
 	${INSTALL_DIR} $(IDIR_ASTERISK_CHAN_MGCP)/etc/asterisk
-	${INSTALL_DATA} $(WRKBUILD)/configs/mgcp.conf.sample $(IDIR_ASTERISK_CHAN_MGCP)/etc/asterisk/mgcp.conf
+	${INSTALL_DATA} $(WRKBUILD)/configs/mgcp.conf.sample \
+		$(IDIR_ASTERISK_CHAN_MGCP)/etc/asterisk/mgcp.conf
 	${INSTALL_DIR} $(IDIR_ASTERISK_CHAN_MGCP)/usr/lib/asterisk/modules
-	${INSTALL_BIN} $(WRKBUILD)/channels/chan_mgcp.so $(IDIR_ASTERISK_CHAN_MGCP)/usr/lib/asterisk/modules/
+	${INSTALL_BIN} $(WRKBUILD)/channels/chan_mgcp.so \
+		$(IDIR_ASTERISK_CHAN_MGCP)/usr/lib/asterisk/modules/
 
 asterisk-chan-skinny-install:
 	${INSTALL_DIR} $(IDIR_ASTERISK_CHAN_SKINNY)/etc/asterisk
-	${INSTALL_DATA} $(WRKBUILD)/configs/skinny.conf.sample $(IDIR_ASTERISK_CHAN_SKINNY)/etc/asterisk/skinny.conf
+	${INSTALL_DATA} $(WRKBUILD)/configs/skinny.conf.sample \
+		$(IDIR_ASTERISK_CHAN_SKINNY)/etc/asterisk/skinny.conf
 	${INSTALL_DIR} $(IDIR_ASTERISK_CHAN_SKINNY)/usr/lib/asterisk/modules
-	${INSTALL_BIN} $(WRKBUILD)/channels/chan_skinny.so $(IDIR_ASTERISK_CHAN_SKINNY)/usr/lib/asterisk/modules/
+	${INSTALL_BIN} $(WRKBUILD)/channels/chan_skinny.so \
+		$(IDIR_ASTERISK_CHAN_SKINNY)/usr/lib/asterisk/modules/
 
 asterisk-chan-iax2-install:
 	${INSTALL_DIR} $(IDIR_ASTERISK_CHAN_IAX2)/etc/asterisk
 	${INSTALL_DIR} $(IDIR_ASTERISK_CHAN_IAX2)/usr/lib/asterisk/modules
-	${INSTALL_DATA} $(WRKBUILD)/configs/iax.conf.sample $(IDIR_ASTERISK_CHAN_IAX2)/etc/asterisk/iax.conf
-	${INSTALL_DATA} $(WRKBUILD)/configs/iaxprov.conf.sample $(IDIR_ASTERISK_CHAN_IAX2)/etc/asterisk/iaxprov.conf
-	${INSTALL_BIN} $(WRKBUILD)/channels/chan_iax2.so $(IDIR_ASTERISK_CHAN_IAX2)/usr/lib/asterisk/modules/
+	${INSTALL_DATA} $(WRKBUILD)/configs/iax.conf.sample \
+		$(IDIR_ASTERISK_CHAN_IAX2)/etc/asterisk/iax.conf
+	${INSTALL_DATA} $(WRKBUILD)/configs/iaxprov.conf.sample \
+		$(IDIR_ASTERISK_CHAN_IAX2)/etc/asterisk/iaxprov.conf
+	${INSTALL_BIN} $(WRKBUILD)/channels/chan_iax2.so \
+		$(IDIR_ASTERISK_CHAN_IAX2)/usr/lib/asterisk/modules/
 
 asterisk-codec-speex-install:
 	${INSTALL_DIR} $(IDIR_ASTERISK_CODEC_SPEEX)/usr/lib/asterisk/modules
-	${INSTALL_BIN} $(WRKBUILD)/codecs/codec_speex.so $(IDIR_ASTERISK_CODEC_SPEEX)/usr/lib/asterisk/modules/
+	${INSTALL_BIN} $(WRKBUILD)/codecs/codec_speex.so \
+		$(IDIR_ASTERISK_CODEC_SPEEX)/usr/lib/asterisk/modules/
 
 asterisk-codec-gsm-install:
 	${INSTALL_DIR} $(IDIR_ASTERISK_CODEC_GSM)/usr/lib/asterisk/modules/
-	${INSTALL_BIN} $(WRKBUILD)/codecs/codec_gsm.so $(IDIR_ASTERISK_CODEC_GSM)/usr/lib/asterisk/modules/
+	${INSTALL_BIN} $(WRKBUILD)/codecs/codec_gsm.so \
+		$(IDIR_ASTERISK_CODEC_GSM)/usr/lib/asterisk/modules/
 
 asterisk-pbx-dundi-install:
 	${INSTALL_DIR} $(IDIR_ASTERISK_PBX_DUNDI)/etc/asterisk
-	${INSTALL_DATA} $(WRKBUILD)/configs/dundi.conf.sample $(IDIR_ASTERISK_PBX_DUNDI)/etc/asterisk/dundi.conf
+	${INSTALL_DATA} $(WRKBUILD)/configs/dundi.conf.sample \
+		$(IDIR_ASTERISK_PBX_DUNDI)/etc/asterisk/dundi.conf
 	${INSTALL_DIR} $(IDIR_ASTERISK_PBX_DUNDI)/usr/lib/asterisk/modules
-	${INSTALL_BIN} $(WRKBUILD)/pbx/pbx_dundi.so $(IDIR_ASTERISK_PBX_DUNDI)/usr/lib/asterisk/modules/
+	${INSTALL_BIN} $(WRKBUILD)/pbx/pbx_dundi.so \
+		$(IDIR_ASTERISK_PBX_DUNDI)/usr/lib/asterisk/modules/
 
 asterisk-res-agi-install:
 	${INSTALL_DIR} $(IDIR_ASTERISK_RES_AGI)/usr/lib/asterisk/agi-bin
 	${INSTALL_DIR} $(IDIR_ASTERISK_RES_AGI)/usr/lib/asterisk/modules
-	${INSTALL_BIN} $(WRKBUILD)/res/res_agi.so $(IDIR_ASTERISK_RES_AGI)/usr/lib/asterisk/modules/
+	${INSTALL_BIN} $(WRKBUILD)/res/res_agi.so \
+		$(IDIR_ASTERISK_RES_AGI)/usr/lib/asterisk/modules/
 
 asterisk-meetme-install:
 	${INSTALL_DIR} ${IDIR_ASTERISK_MEETME}/etc/asterisk/
 	${INSTALL_DIR} ${IDIR_ASTERISK_MEETME}/usr/lib/asterisk/modules
-	${INSTALL_DATA} ${WRKBUILD}/configs/meetme.conf.sample ${IDIR_ASTERISK_MEETME}/etc/asterisk/meetme.conf
-	${INSTALL_BIN} ${WRKBUILD}/apps/app_meetme.so ${IDIR_ASTERISK_MEETME}/usr/lib/asterisk/modules
+	${INSTALL_DATA} ${WRKBUILD}/configs/meetme.conf.sample \
+		${IDIR_ASTERISK_MEETME}/etc/asterisk/meetme.conf
+	${INSTALL_BIN} ${WRKBUILD}/apps/app_meetme.so \
+		${IDIR_ASTERISK_MEETME}/usr/lib/asterisk/modules
 
 include ${TOPDIR}/mk/pkg-bottom.mk

package/asterisk/files/asterisk.init

@@ -10,13 +10,14 @@ autostart)
 	exec sh $0 start
 	;;
 start)
-	[ -d /var/run ] || mkdir -p /var/run
+	[ -d /var/run/asterisk ] || mkdir -p /var/run/asterisk
 	[ -d /var/log/asterisk ] || mkdir -p /var/log/asterisk
 	[ -d /var/spool/asterisk ] || mkdir -p /var/spool/asterisk
 	/usr/sbin/asterisk 
 	;;
 stop)
-	[ -f /var/run/asterisk.pid ] && kill $(cat /var/run/asterisk.pid) >/dev/null 2>&1
+	[ -f /var/run/asterisk/asterisk.pid ] && \
+		kill $(cat /var/run/asterisk/asterisk.pid) >/dev/null 2>&1
 	;;
 restart)
 	sh $0 stop

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/asterisk/patches/patch-apps__moduleinfo

@@ -1,13 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- asterisk-1.4.24.1.orig/apps/.moduleinfo	2009-04-02 19:44:22.000000000 +0200
-+++ asterisk-1.4.24.1/apps/.moduleinfo	2009-05-12 16:07:52.000000000 +0200
-@@ -56,9 +56,6 @@
- <member name="app_flash" displayname="Flash channel application" remove_on_change="apps/app_flash.o apps/app_flash.so">
- 	<depend>dahdi</depend>
- </member>
--<member name="app_followme" displayname="Find-Me/Follow-Me Application" remove_on_change="apps/app_followme.o apps/app_followme.so">
--        <depend>chan_local</depend>
--</member>
- <member name="app_forkcdr" displayname="Fork The CDR into 2 separate entities" remove_on_change="apps/app_forkcdr.o apps/app_forkcdr.so">
- </member>
- <member name="app_getcpeid" displayname="Get ADSI CPE ID" remove_on_change="apps/app_getcpeid.o apps/app_getcpeid.so">

package/asterisk/patches/patch-apps_app_followme_c

@@ -0,0 +1,26 @@
+--- asterisk-1.6.2.1.orig/apps/app_followme.c	2009-09-15 18:06:24.000000000 +0200
++++ asterisk-1.6.2.1/apps/app_followme.c	2010-02-14 10:33:51.540422962 +0100
+@@ -172,7 +172,9 @@ static int ynlongest = 0;
+ 
+ static const char *featuredigittostr;
+ static int featuredigittimeout = 5000;		/*!< Feature Digit Timeout */
+-static const char *defaultmoh = "default";    	/*!< Default Music-On-Hold Class */
++static const char *defaultmoh;		    	/*!< Default Music-On-Hold Class */
++
++
+ 
+ static char takecall[20] = "1", nextindp[20] = "2";
+ static char callfromprompt[PATH_MAX] = "followme/call-from";
+@@ -236,6 +238,7 @@ static struct call_followme *alloc_profi
+ 
+ static void init_profile(struct call_followme *f)
+ {
++	defaultmoh = "default";
+ 	f->active = 1;
+ 	ast_copy_string(f->moh, defaultmoh, sizeof(f->moh));
+ }
+@@ -1195,3 +1198,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MO
+ 		.unload = unload_module,
+ 		.reload = reload,
+ 	       );
++

package/asterisk/patches/patch-channels_chan_iax2_c

@@ -1,20 +0,0 @@
---- asterisk-1.4.27.1.orig/channels/chan_iax2.c	2009-11-10 18:15:57.000000000 +0100
-+++ asterisk-1.4.27.1/channels/chan_iax2.c	2009-12-03 20:57:05.000000000 +0100
-@@ -7076,7 +7076,7 @@ static int try_transfer(struct chan_iax2
- 	
- 	memset(&ied, 0, sizeof(ied));
- 	if (ies->apparent_addr)
--		bcopy(ies->apparent_addr, &new, sizeof(new));
-+		memcpy(&new, ies->apparent_addr, sizeof(new));
- 	if (ies->callno)
- 		newcall = ies->callno;
- 	if (!newcall || !new.sin_addr.s_addr || !new.sin_port) {
-@@ -7235,7 +7235,7 @@ static int iax2_ack_registry(struct iax_
- 
- 	memset(&us, 0, sizeof(us));
- 	if (ies->apparent_addr)
--		bcopy(ies->apparent_addr, &us, sizeof(us));
-+		memcpy(&us, ies->apparent_addr, sizeof(us));
- 	if (ies->username)
- 		ast_copy_string(peer, ies->username, sizeof(peer));
- 	if (ies->refresh)

package/asterisk/patches/patch-channels_chan_oss_c

@@ -1,37 +0,0 @@
---- asterisk-1.4.27.1.orig/channels/chan_oss.c	2009-08-10 21:15:57.000000000 +0200
-+++ asterisk-1.4.27.1/channels/chan_oss.c	2009-12-03 20:58:13.000000000 +0100
-@@ -562,7 +562,7 @@ static void send_sound(struct chan_oss_p
- 				l = FRAME_SIZE - ofs;
- 			if (l > s->datalen - start)	/* don't overflow the source */
- 				l = s->datalen - start;
--			bcopy(s->data + start, myframe + ofs, l * 2);
-+			memcpy(myframe + ofs, s->data + start, l * 2);
- 			if (0)
- 				ast_log(LOG_WARNING, "send_sound sound %d/%d of %d into %d\n", l_sampsent, l, s->samplen, ofs);
- 			l_sampsent += l;
-@@ -573,14 +573,14 @@ static void send_sound(struct chan_oss_p
- 			if (l > 0) {
- 				if (l > FRAME_SIZE - ofs)
- 					l = FRAME_SIZE - ofs;
--				bcopy(silence, myframe + ofs, l * 2);
-+				memcpy(myframe + ofs, silence, l * 2);
- 				l_sampsent += l;
- 			} else {			/* silence is over, restart sound if loop */
- 				if (s->repeat == 0) {	/* last block */
- 					o->cursound = -1;
- 					o->nosound = 0;	/* allow audio data */
- 					if (ofs < FRAME_SIZE)	/* pad with silence */
--						bcopy(silence, myframe + ofs, (FRAME_SIZE - ofs) * 2);
-+						memcpy(myframe + ofs, silence, (FRAME_SIZE - ofs) * 2);
- 				}
- 				l_sampsent = 0;
- 			}
-@@ -905,7 +905,7 @@ static struct ast_frame *oss_read(struct
- 
- 	/* XXX can be simplified returning &ast_null_frame */
- 	/* prepare a NULL frame in case we don't have enough data to return */
--	bzero(f, sizeof(struct ast_frame));
-+	memset(f, 0, sizeof(struct ast_frame));
- 	f->frametype = AST_FRAME_NULL;
- 	f->src = oss_tech.type;
- 

package/asterisk/patches/patch-codecs_gsm_Makefile

@@ -1,66 +0,0 @@
-disable uname -m checks 
---- asterisk-1.4.26.orig/codecs/gsm/Makefile	2008-11-19 22:34:47.000000000 +0100
-+++ asterisk-1.4.26/codecs/gsm/Makefile	2009-08-21 12:29:21.450418652 +0200
-@@ -37,13 +37,13 @@ WAV49	= -DWAV49
- ######### ppro's, etc, as well as the AMD K6 and K7.  The compile will
- ######### probably require gcc. 
- 
--ifeq (, $(findstring $(OSARCH) , Darwin SunOS ))
--ifeq (, $(findstring $(PROC) , x86_64 amd64 ultrasparc sparc64 arm armv5b armeb hppa2.0 ppc powerpc ppc64 ia64 s390 bfin mipsel mips))
--ifeq (, $(findstring $(shell uname -m) , ppc ppc64 alpha armv4l s390 ))
--OPTIMIZE+=-march=$(PROC)
--endif
--endif
--endif
-+#ifeq (, $(findstring $(OSARCH) , Darwin SunOS ))
-+#ifeq (, $(findstring $(PROC) , x86_64 amd64 ultrasparc sparc64 arm armv5b armeb hppa2.0 ppc powerpc ppc64 ia64 s390 bfin mipsel mips))
-+#ifeq (, $(findstring $(shell uname -m) , ppc ppc64 alpha armv4l s390 ))
-+#OPTIMIZE+=-march=$(PROC)
-+#endif
-+#endif
-+#endif
- 
- #The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only.
- #This works for even old (2.96) versions of gcc and provides a small boost either way.
-@@ -207,13 +207,13 @@ GSM_SOURCES =	$(SRC)/add.c		\
- # add k6-specific code only if not on a non-k6 hardware or proc.
- # XXX Keep a space after each findstring argument
- # XXX should merge with GSM_OBJECTS
--ifeq ($(OSARCH),linux-gnu)
--ifeq (,$(findstring $(shell uname -m) , x86_64 amd64 ppc ppc64 alpha armv4l sparc64 parisc s390 ))
--ifeq (,$(findstring $(PROC) , arm armv5b armeb powerpc ia64 s390 bfin mipsel mips ))
--GSM_SOURCES+= $(SRC)/k6opt.s
--endif
--endif
--endif
-+#ifeq ($(OSARCH),linux-gnu)
-+#ifeq (,$(findstring $(shell uname -m) , x86_64 amd64 ppc ppc64 alpha armv4l sparc64 parisc s390 ))
-+#ifeq (,$(findstring $(PROC) , arm armv5b armeb powerpc ia64 s390 bfin mipsel mips ))
-+#GSM_SOURCES+= $(SRC)/k6opt.s
-+#endif
-+#endif
-+#endif
- 
- TOAST_SOURCES = $(SRC)/toast.c 		\
- 		$(SRC)/toast_lin.c	\
-@@ -259,13 +259,13 @@ GSM_OBJECTS =	$(SRC)/add.o		\
- 		$(SRC)/short_term.o	\
- 		$(SRC)/table.o
- 
--ifeq ($(OSARCH),linux-gnu)
--ifeq (,$(findstring $(shell uname -m) , x86_64 amd64 ppc ppc64 alpha armv4l sparc64 parisc ))
--ifeq (,$(findstring $(PROC) , arm armv5b armeb powerpc ia64 bfin mipsel mips ))
--GSM_OBJECTS+= $(SRC)/k6opt.o
--endif
--endif
--endif
-+#ifeq ($(OSARCH),linux-gnu)
-+#ifeq (,$(findstring $(shell uname -m) , x86_64 amd64 ppc ppc64 alpha armv4l sparc64 parisc ))
-+#ifeq (,$(findstring $(PROC) , arm armv5b armeb powerpc ia64 bfin mipsel mips ))
-+#GSM_OBJECTS+= $(SRC)/k6opt.o
-+#endif
-+#endif
-+#endif
- 
- TOAST_OBJECTS =	$(SRC)/toast.o 		\
- 		$(SRC)/toast_lin.o	\

package/asterisk/patches/patch-main_astobj2_c

@@ -1,11 +0,0 @@
---- asterisk-1.4.27.1.orig/main/astobj2.c	2009-10-06 03:16:36.000000000 +0200
-+++ asterisk-1.4.27.1/main/astobj2.c	2009-12-03 20:54:12.000000000 +0100
-@@ -236,7 +236,7 @@ int ao2_ref(void *user_data, const int d
- 		/* for safety, zero-out the astobj2 header and also the
- 		 * first word of the user-data, which we make sure is always
- 		 * allocated. */
--		bzero(obj, sizeof(struct astobj2 *) + sizeof(void *) );
-+		memset(obj, 0, sizeof(struct astobj2 *) + sizeof(void *) );
- 		free(obj);
- 	}
- 

package/asterisk/patches/patch-main_translate_c

@@ -1,11 +0,0 @@
---- asterisk-1.4.27.1.orig/main/translate.c	2009-10-21 18:44:49.000000000 +0200
-+++ asterisk-1.4.27.1/main/translate.c	2009-12-03 20:53:36.000000000 +0100
-@@ -442,7 +442,7 @@ static void rebuild_matrix(int samples)
- 	if (option_debug)
- 		ast_log(LOG_DEBUG, "Resetting translation matrix\n");
- 
--	bzero(tr_matrix, sizeof(tr_matrix));
-+	memset(tr_matrix, 0, sizeof(tr_matrix));
- 
- 	/* first, compute all direct costs */
- 	AST_LIST_TRAVERSE(&translators, t, list) {

package/asterisk/patches/patch-menuselect-tree

@@ -1,12 +0,0 @@
---- asterisk-1.4.27.1.orig/menuselect-tree	2009-11-30 19:30:41.000000000 +0100
-+++ asterisk-1.4.27.1/menuselect-tree	2009-12-03 20:55:04.000000000 +0100
-@@ -59,9 +59,6 @@
- <member name="app_flash" displayname="Flash channel application" remove_on_change="apps/app_flash.o apps/app_flash.so">
- 	<depend>dahdi</depend>
- </member>
--<member name="app_followme" displayname="Find-Me/Follow-Me Application" remove_on_change="apps/app_followme.o apps/app_followme.so">
--        <depend>chan_local</depend>
--</member>
- <member name="app_forkcdr" displayname="Fork The CDR into 2 separate entities" remove_on_change="apps/app_forkcdr.o apps/app_forkcdr.so">
- </member>
- <member name="app_getcpeid" displayname="Get ADSI CPE ID" remove_on_change="apps/app_getcpeid.o apps/app_getcpeid.so">

package/asterisk/patches/patch-res_res_features_c

@@ -1,11 +0,0 @@
---- asterisk-1.4.27.1.orig/res/res_features.c	2009-10-20 19:46:37.000000000 +0200
-+++ asterisk-1.4.27.1/res/res_features.c	2009-12-03 20:53:57.000000000 +0100
-@@ -279,7 +279,7 @@ static void *ast_bridge_call_thread(void
- 	ast_bridge_call(tobj->peer, tobj->chan, &tobj->bconfig);
- 	ast_hangup(tobj->chan);
- 	ast_hangup(tobj->peer);
--	bzero(tobj, sizeof(*tobj)); /*! \todo XXX for safety */
-+	memset(tobj, 0, sizeof(*tobj)); /*! \todo XXX for safety */
- 	free(tobj);
- 	return NULL;
- }

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

@@ -9,7 +9,7 @@ PKG_RELEASE:=		1
 PKG_DESCR:=		aufs2 utilities
 PKG_SECTION:=		admin
 PKG_URL:=		http://aufs.sf.net/
-PKG_HOST_DEPENDS:=	!cygwin !freebsd !openbsd
+PKG_HOST_DEPENDS:=	!cygwin !freebsd !openbsd !netbsd
 
 NO_DISTFILES:=		1
 
@@ -17,13 +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}
-	${CP} ./src/* ${WRKBUILD}/
 
 post-install:
 	$(INSTALL_DIR) $(IDIR_AUFS_UTIL)/sbin

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
-CONFIGURE_ARGS+=	ac_cv_lib_nsl_gethostbyname=no
-BUILD_STYLE:=		auto
-
-do-install:
+post-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

@@ -6,27 +6,25 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		avahi
 PKG_VERSION:=		0.6.25
 PKG_RELEASE:=		1
-PKG_BUILDDEP+=		libdaemon expat gdbm glib
 PKG_MD5SUM:=		a83155a6e29e3988f07e5eea3287b21e
 PKG_DESCR:=		mDNS/DNS-SD (aka RendezVous/Bonjour/ZeroConf) daemon
 PKG_SECTION:=		net
-PKG_DEPENDS:=		libavahi libdaemon libexpat
+PKG_DEPENDS:=		libavahi libdaemon libexpat gettext
+PKG_BUILDDEP+=		libdaemon expat gdbm glib gettext
 PKG_URL:=		http://avahi.org
 PKG_SITES:=		http://avahi.org/download/
 
-PKG_DEPENDS_1:=		libavahi libdaemon avahi-daemon
-PKG_DESCR_1:=		Unicast DNS server from mDNS/DNS-SD configuration daemon
-PKG_DESCR_2:=		DNS-SD over mDNS (aka RendezVous/Bonjour/ZeroConf) library
-PKG_SECTION_2:=		libs
+PKG_DEPENDS_DNSCONFD:=	libavahi libdaemon avahi-daemon
+PKG_DESCR_DNSCONFD:=	Unicast DNS server from mDNS/DNS-SD configuration daemon
+PKG_DESCR_LIB:=		DNS-SD over mDNS library
 
 include ${TOPDIR}/mk/package.mk
 
-TLDFLAGS+=		-lintl
 $(eval $(call PKG_template,AVAHI_DAEMON,avahi-daemon,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,AVAHI_DNSCONFD,avahi-dnsconfd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_1},${PKG_DESCR_1},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBAVAHI,libavahi,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR_2},${PKG_SECTION_2}))
+$(eval $(call PKG_template,AVAHI_DNSCONFD,avahi-dnsconfd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_DNSCONFD},${PKG_DESCR_DNSCONFD},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBAVAHI,libavahi,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR_LIB},libs))
 
-CONFIGURE_STYLE=	gnu
+TLDFLAGS+=		-lintl
 CONFIGURE_ARGS+=	--enable-glib \
 			--disable-qt3 \
 			--disable-qt4 \
@@ -52,29 +50,32 @@ 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
 	${INSTALL_DIR} ${IDIR_AVAHI_DAEMON}/etc/avahi
-	${INSTALL_DATA} ./files/avahi-daemon.conf ${IDIR_AVAHI_DAEMON}/etc/avahi/
+	${INSTALL_DATA} ./files/avahi-daemon.conf \
+		${IDIR_AVAHI_DAEMON}/etc/avahi/
 	${INSTALL_DIR} ${IDIR_AVAHI_DAEMON}/etc/avahi/services
 	${INSTALL_DATA} ./files/service-http \
 		${IDIR_AVAHI_DAEMON}/etc/avahi/services/http.service
 	${INSTALL_DATA} ./files/service-ssh \
 		${IDIR_AVAHI_DAEMON}/etc/avahi/services/ssh.service
 	${INSTALL_DIR} ${IDIR_AVAHI_DAEMON}/usr/sbin
-	${CP} ${WRKINST}/usr/sbin/avahi-daemon ${IDIR_AVAHI_DAEMON}/usr/sbin/
+	${CP} ${WRKINST}/usr/sbin/avahi-daemon \
+		${IDIR_AVAHI_DAEMON}/usr/sbin/
 	# avahi dnsconfd
 	${INSTALL_DIR} ${IDIR_AVAHI_DNSCONFD}/etc/avahi
 	${CP} ${WRKINST}/etc/avahi/avahi-dnsconfd.action \
 		${IDIR_AVAHI_DNSCONFD}/etc/avahi/
 	${INSTALL_DIR} ${IDIR_AVAHI_DNSCONFD}/usr/sbin
-	${CP} ${WRKINST}/usr/sbin/avahi-dnsconfd ${IDIR_AVAHI_DNSCONFD}/usr/sbin/
+	${CP} ${WRKINST}/usr/sbin/avahi-dnsconfd \
+		${IDIR_AVAHI_DNSCONFD}/usr/sbin/
 	# libavahi
 	${INSTALL_DIR} ${IDIR_LIBAVAHI}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libavahi-common.so.* ${IDIR_LIBAVAHI}/usr/lib/
-	${CP} ${WRKINST}/usr/lib/libavahi-core.so.* ${IDIR_LIBAVAHI}/usr/lib/
+	${CP} ${WRKINST}/usr/lib/libavahi-common.so* \
+		${IDIR_LIBAVAHI}/usr/lib/
+	${CP} ${WRKINST}/usr/lib/libavahi-core.so* \
+		${IDIR_LIBAVAHI}/usr/lib/
 
 include ${TOPDIR}/mk/pkg-bottom.mk

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_SECTION_1:=		libs
+PKG_DESCR_LIB:=		small tls library
+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

@@ -6,7 +6,7 @@ include $(TOPDIR)/mk/rootfs.mk
 
 PKG_NAME:=		base-files
 PKG_VERSION:=		1.0
-PKG_RELEASE:=		9
+PKG_RELEASE:=		10
 PKG_DESCR:=		basic filesystem structure and scripts
 PKG_SECTION:=		base
 
@@ -18,14 +18,24 @@ 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
+CFLINE_BASE_FILES:=	depends on !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
+endif
+ifeq (${ADK_TARGET_PACKAGE_IPKG},y)
 	$(SED) 's,@TARGET@,$(ADK_TARGET),g' $(IDIR_BASE_FILES)/etc/ipkg.conf
 	$(SED) 's,@VERSION@,$(ADK_VERSION),g' $(IDIR_BASE_FILES)/etc/ipkg.conf
+else
+	@-rm $(IDIR_BASE_FILES)/etc/ipkg.conf
+endif
 	echo /bin/sh >${IDIR_BASE_FILES}/etc/shells
 	echo /bin/ash >>${IDIR_BASE_FILES}/etc/shells
 ifneq (${ADK_PACKAGE_BASH},)

package/base-files/extra/etc/init.d/boot → package/base-files/src/etc/init.d/boot

@@ -24,4 +24,6 @@ for f in /etc/modules.d/*; do
 	[[ -e $f ]] && load_modules /etc/modules.d/*
 	break
 done
+# settle down, after module load
+sleep 2
 exit 0

package/base-files/src/etc/network/if-post-down.d/03-wireless

@@ -0,0 +1,21 @@
+#!/bin/sh 
+set -e 
+
+[ "${IFACE%%[0-9]*}" = "wlan" ] || exit 0
+
+case "$IF_WIRELESS_MODE" in
+	ap)
+		logger -t hostap "Killing hostapd"
+		pkill hostapd
+		;;
+	sta)
+		[ "$IF_WIRELESS_SECURITY" != "none" ] && {
+			logger -t wireless "Killing wpa_supplicant"
+			pkill wpa_supplicant
+		}
+		;;
+	*)
+		exit 0
+		;;
+esac
+exit 0

package/base-files/src/etc/network/if-pre-up.d/04-wireless

@@ -0,0 +1,107 @@
+#!/bin/sh 
+#set -x
+set -e 
+
+[ "${IFACE%%[0-9]*}" = "wlan" ] || exit 0
+
+[ "$IF_WIRELESS_SSID" ] || exit 1
+[ "$IF_WIRELESS_CHANNEL" ] || exit 1
+[ "$IF_WIRELESS_HWMODE" ] || IF_WIRELESS_HWMODE=g
+
+wpa=0
+wpa1=0
+wpa2=0
+
+case "$IF_WIRELESS_SECURITY" in
+	none)
+		sec=1
+		;;
+	wep)
+		sec=2
+		;;
+	wpa)
+		sec=1
+		wpa1=1
+		;;
+	wpa2)
+		sec=1
+		wpa2=1
+		;;
+	wpa+wpa2)
+		sec=1
+		wpa=1
+		;;
+	*)
+		sec=1
+		;;
+esac
+
+case "$IF_WIRELESS_MODE" in
+	ap)
+		[ -x /usr/sbin/hostapd ] || {
+			logger -t hostap "No hostapd program found"
+			exit 1
+		}
+		logger -t hostap "Creating hostapd configuration"
+		cat /etc/hostapd.conf > /tmp/hostapd.conf
+		chmod 600 /tmp/hostapd.conf
+		echo "interface=${IFACE}" >> /tmp/hostapd.conf
+		echo "ssid=$IF_WIRELESS_SSID" >> /tmp/hostapd.conf
+		echo "channel=$IF_WIRELESS_CHANNEL" >> /tmp/hostapd.conf
+		echo "hw_mode=$IF_WIRELESS_HWMODE" >> /tmp/hostapd.conf
+		echo "auth_algs=$sec" >> /tmp/hostapd.conf
+		[ $wpa1 -eq 1 ] && {
+			logger -t hostap "using WPA for security"
+			echo "wpa=1" >> /tmp/hostapd.conf
+			echo "wpa_key_mgmt=WPA-PSK" >> /tmp/hostapd.conf
+			echo "wpa_pairwise=TKIP" >> /tmp/hostapd.conf
+			echo "wpa_passphrase=$IF_WIRELESS_PASSPHRASE" >> /tmp/hostapd.conf
+		}
+		[ $wpa2 -eq 1 ] && {
+			logger -t hostap "using WPA2 for security"
+			echo "wpa=2" >> /tmp/hostapd.conf
+			echo "wpa_key_mgmt=WPA-PSK" >> /tmp/hostapd.conf
+			echo "rsn_pairwise=CCMP" >> /tmp/hostapd.conf
+			echo "wpa_passphrase=$IF_WIRELESS_PASSPHRASE" >> /tmp/hostapd.conf
+		}
+		[ $wpa -eq 1 ] && {
+			logger -t hostap "using WPA and WPA2 for security"
+			echo "wpa=3" >> /tmp/hostapd.conf
+			echo "wpa_key_mgmt=WPA-PSK" >> /tmp/hostapd.conf
+			echo "wpa_pairwise=TKIP" >> /tmp/hostapd.conf
+			echo "rsn_pairwise=CCMP" >> /tmp/hostapd.conf
+			echo "wpa_passphrase=$IF_WIRELESS_PASSPHRASE" >> /tmp/hostapd.conf
+		}
+		logger -t hostap "Starting hostapd"
+		hostapd -B /tmp/hostapd.conf
+		;;
+	sta)
+		[ -x /usr/sbin/iw ] || {
+			logger -t wireless "No iw utility found"
+			exit 1
+		}
+		ip link set up dev ${IFACE}
+		iw dev ${IFACE} set channel $IF_WIRELESS_CHANNEL
+		iw dev ${IFACE} connect $IF_WIRELESS_SSID
+		[ $wpa2 -eq 1 ] && {
+			[ -x /usr/sbin/wpa_supplicant ] || {
+				logger -t wireless "No wpa_supplicant found"
+				exit 1
+			}
+			touch /tmp/wpa_supplicant.conf
+			chmod 600 /tmp/wpa_supplicant.conf
+			echo "network={" > /tmp/wpa_supplicant.conf
+			echo " ssid=\"$IF_WIRELESS_SSID\"" >> /tmp/wpa_supplicant.conf
+		 	echo " psk=\"$IF_WIRELESS_PASSPHRASE\"" >> /tmp/wpa_supplicant.conf
+			echo " priority=5" >> /tmp/wpa_supplicant.conf
+			echo "}"  >> /tmp/wpa_supplicant.conf
+			wpa_supplicant -B -Dnl80211 -i${IFACE} -c/tmp/wpa_supplicant.conf
+		}
+		;;
+	*)
+		echo "Unknown operation mode $IF_WIRELESS_MODE given!"
+		exit 1
+		;;
+esac
+
+exit 0

package/base-files/extra/init → package/base-files/src/init

@@ -1,5 +1,5 @@
 #!/bin/sh
-echo "Starting system ..."
+echo "System initialization ..."
 export PATH=/bin:/sbin:/usr/bin:/usr/sbin
 mount -nt proc proc /proc
 mount -o nosuid,nodev,noexec -t sysfs sysfs /sys

package/base-files/extra/sbin/update → package/base-files/src/sbin/adkupdate

@@ -12,6 +12,8 @@ else
 	updatecmd="gunzip -c | tar -xf -"
 fi
 
+system=$(awk '/system type/ { print $5 }' /proc/cpuinfo 2>/dev/null)
+
 check_exit() {
 	if [ $? -ne 0 ];then
 		echo "Update failed."
@@ -23,6 +25,9 @@ prepare() {
 	cd /
 	umount -f /etc
 	mount -o remount,rw /
+	if [ "$system" == "RB532" ];then
+		mount -t yaffs2 /dev/mtdblock0 /boot
+	fi
 }
 
 extract_from_file() {
@@ -71,5 +76,8 @@ esac
 
 sync
 mount -o bind /etc /tmp/.cfgfs/root
+if [ "$system" == "RB532" ];then
+	umount -f /boot
+fi
 
 echo "Update sucessful. You should reboot now."

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

@@ -4,13 +4,13 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		bind
-PKG_VERSION:=		9.4.1
-PKG_RELEASE:=		4
-PKG_BUILDDEP+=		openssl
-PKG_MD5SUM:=		09b54d35036cb0423b2e618f21766285
+PKG_VERSION:=		9.6.1-P3
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		a0952d589b3051538033387be4c983f9
 PKG_DESCR:=		popular DNS server
 PKG_SECTION:=		net
-PKG_DEPENDS:=		libopenssl libbind
+PKG_DEPENDS:=		libopenssl libbind libxml2
+PKG_BUILDDEP+=		openssl libxml2
 PKG_URL:=		https://www.isc.org/software/bind
 PKG_SITES:=		ftp://ftp.isc.org/isc/bind9/${PKG_VERSION}/
 
@@ -22,28 +22,23 @@ PKG_DESCR_5:=		dnssec-keygen & dnssec-signzone utilities
 PKG_DESCR_6:=		host utility
 PKG_DESCR_7:=		dig utility
 
-PKG_SECTION_2:=		libs
-
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,BIND_SERVER,bind-server,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,BIND_CLIENT,bind-client,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_1},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBBIND,libbind,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR_2},${PKG_SECTION_2}))
+$(eval $(call PKG_template,LIBBIND,libbind,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR_2},libs))
 $(eval $(call PKG_template,BIND_RNDC,bind-rndc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_3},${PKG_SECTION}))
 $(eval $(call PKG_template,BIND_CHECK,bind-check,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_4},${PKG_SECTION}))
 $(eval $(call PKG_template,BIND_DNSSEC,bind-dnssec,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_5},${PKG_SECTION}))
 $(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/ \
+			--with-libxml2=${STAGING_DIR}/usr/ \
+			--enable-epoll \
 			--with-libtool
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto
 
 pre-build:
 	${MAKE} -C ${WRKBUILD}/lib/dns \
@@ -63,15 +58,20 @@ post-install:
 	# rndc
 	${INSTALL_DIR} ${IDIR_BIND_RNDC}/usr/sbin
 	${INSTALL_BIN} ${WRKINST}/usr/sbin/rndc ${IDIR_BIND_RNDC}/usr/sbin/
-	${INSTALL_BIN} ${WRKINST}/usr/sbin/rndc-confgen ${IDIR_BIND_RNDC}/usr/sbin/
+	${INSTALL_BIN} ${WRKINST}/usr/sbin/rndc-confgen \
+		${IDIR_BIND_RNDC}/usr/sbin/
 	# bind check
 	${INSTALL_DIR} ${IDIR_BIND_CHECK}/usr/sbin
-	${INSTALL_BIN} ${WRKINST}/usr/sbin/named-checkconf ${IDIR_BIND_CHECK}/usr/sbin/
-	${INSTALL_BIN} ${WRKINST}/usr/sbin/named-checkzone ${IDIR_BIND_CHECK}/usr/sbin/
+	${INSTALL_BIN} ${WRKINST}/usr/sbin/named-checkconf \
+		${IDIR_BIND_CHECK}/usr/sbin/
+	${INSTALL_BIN} ${WRKINST}/usr/sbin/named-checkzone \
+		${IDIR_BIND_CHECK}/usr/sbin/
 	# dnsec tools
 	${INSTALL_DIR} ${IDIR_BIND_DNSSEC}/usr/sbin
-	${INSTALL_BIN} ${WRKINST}/usr/sbin/dnssec-keygen ${IDIR_BIND_DNSSEC}/usr/sbin/
-	${INSTALL_BIN} ${WRKINST}/usr/sbin/dnssec-signzone ${IDIR_BIND_DNSSEC}/usr/sbin/
+	${INSTALL_BIN} ${WRKINST}/usr/sbin/dnssec-keygen \
+		${IDIR_BIND_DNSSEC}/usr/sbin/
+	${INSTALL_BIN} ${WRKINST}/usr/sbin/dnssec-signzone \
+		${IDIR_BIND_DNSSEC}/usr/sbin/
 	# host
 	${INSTALL_DIR} ${IDIR_BIND_HOST}/usr/bin
 	${INSTALL_BIN} ${WRKINST}/usr/bin/host ${IDIR_BIND_HOST}/usr/bin/

package/bind/patches/patch-lib_isc_unix_ifiter_ioctl_c

@@ -1,14 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- bind-9.4.1.orig/lib/isc/unix/ifiter_ioctl.c	2006-02-04 00:51:38.000000000 +0100
-+++ bind-9.4.1/lib/isc/unix/ifiter_ioctl.c	2008-10-08 14:56:12.000000000 +0200
-@@ -479,8 +479,8 @@ linux_if_inet6_current(isc_interfaceiter
- 	for (i = 0; i < 16; i++) {
- 		unsigned char byte;
- 		static const char hex[] = "0123456789abcdef";
--		byte = ((index(hex, address[i * 2]) - hex) << 4) |
--		       (index(hex, address[i * 2 + 1]) - hex);
-+		byte = ((strchr(hex, address[i * 2]) - hex) << 4) |
-+		       (strchr(hex, address[i * 2 + 1]) - hex);
- 		addr6.s6_addr[i] = byte;
- 	}
- 	iter->current.af = AF_INET6;

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:=		2b1674d98804970809de3da3edf0bed2
+PKG_MD5SUM:=		26b9bfc5446bdf0e932e8074d117be67
 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/ \
-			http://get.bitlbee.be/src/ \
-			http://get.us.bitlbee.org/src/ \
-			http://ftp.snt.utwente.nl/pub/software/bitlbee/src/
+PKG_SITES:=		http://get.bitlbee.org/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:
-		(cd $(WRKBUILD); \
-			$(TARGET_CONFIGURE_OPTS) \
-			CFLAGS="$(TARGET_CFLAGS) -fPIC" \
-			CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
-			LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
-			STAGING_DIR="$(STAGING_DIR)" \
-			STRIP="$(STRIP)" \
-			./configure \
-			--target=${REAL_GNU_TARGET_NAME} \
+CONFIG_STYLE:=		minimal
+
+TCFLAGS+=		-fPIC
+CONFIGURE_ARGS:=	--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 $@