fix libmix packages, while checking all packages make some style cleanup

package/ImageMagick/Makefile

@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=		ImageMagick
 PKG_VERSION:=		6.7.6
 PKG_EXTRAVER:=		1
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_MD5SUM:=		8134257e3fbb43cc06fb32a6d725d3d0
 PKG_DESCR:=		image processing and converting utility
 PKG_SECTION:=		multimedia
@@ -15,6 +15,8 @@ PKG_BUILDDEP+=		pango
 PKG_URL:=		http://www.imagemagick.org/
 PKG_SITES:=		http://image_magick.veidrodis.com/image_magick/
 PKG_NEED_CXX:=		1
+PKG_LIBNAME:=		libimagemagic
+PKG_OPTS:=		dev
 
 PKG_SUBPKGS:=		CONVERT DISPLAY LIBIMAGEMAGICK
 PKGSD_LIBIMAGEMAGICK:=	imagemagick library
@@ -33,7 +35,7 @@ WRKDIST=		${WRKDIR}/${PKG_NAME}-${PKG_VERSION}-${PKG_EXTRAVER}
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,LIBIMAGEMAGICK,libimagemagick,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBIMAGEMAGICK},${PKGSC_LIBIMAGEMAGICK}))
+$(eval $(call PKG_template,LIBIMAGEMAGICK,libimagemagick,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBIMAGEMAGICK},${PKGSC_LIBIMAGEMAGICK},${PKG_OPTS}))
 $(eval $(call PKG_template,CONVERT,convert,$(PKG_VERSION)-${PKG_RELEASE},${PKGSS_CONVERT},${PKGSD_CONVERT},${PKGSC_CONVERT}))
 $(eval $(call PKG_template,DISPLAY,display,$(PKG_VERSION)-${PKG_RELEASE},${PKGSS_DISPLAY},${PKGSD_DISPLAY},${PKGSC_DISPLAY}))
 

package/MesaLib/Makefile

@@ -15,6 +15,7 @@ PKG_BUILDDEP+=		dri2proto glproto expat libXext
 PKG_URL:=		http://www.mesa3d.org/
 PKG_SITES:=		ftp://ftp.freedesktop.org/pub/mesa/${PKG_VERSION}/
 PKG_NEED_CXX:=		1
+PKG_LIBNAME:=		mesalib
 PKG_OPTS:=		dev
 
 PKG_ARCH_DEPENDS:=	x86 x86_64 mips mipsel mips64 mips64el arm

package/alix-switch/Makefile

@@ -10,7 +10,8 @@ PKG_DESCR:=		daemon listening on button events
 PKG_SECTION:=		base
 PKG_URL:=		http://openadk.org/
 
-PKG_CFLINE_ALIX_SWITCH:=depends on (ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2 || ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13)
+PKG_SYSTEM_DEPENDS:=	pcengines-alix2d2 pcengines-alix2d13
+
 NO_DISTFILES:=		1
 
 include ${TOPDIR}/mk/package.mk

package/alix-temperature/Makefile

@@ -10,7 +10,8 @@ PKG_DESCR:=		read alix boards i2c thermal sensor
 PKG_SECTION:=		utils
 PKG_DEPENDS:=		i2c-tools
 
-PKG_CFLINE_ALIX_TEMPERATURE:=depends on (ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2 || ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13)
+PKG_SYSTEM_DEPENDS:=	pcengines-alix2d2 pcengines-alix2d13
+
 NO_DISTFILES:=		1
 
 include $(TOPDIR)/mk/package.mk

package/alsa-utils/Makefile

@@ -25,7 +25,7 @@ DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,ALSA_UTILS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,ALSA_UTILS,alsa-utils,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 TARGET_CPPFLAGS+=	-D_GNU_SOURCE -D_POSIX_SOURCE
 CONFIGURE_ARGS+=	--disable-xmlto
@@ -35,7 +35,7 @@ else
 CONFIGURE_ARGS+=	--disable-alsamixer
 endif
 
-post-install:
+alsa-utils-install:
 	${INSTALL_DIR} ${IDIR_ALSA_UTILS}/usr/bin
 	${CP} ${WRKINST}/usr/bin/amixer ${IDIR_ALSA_UTILS}/usr/bin
 ifeq (${ADK_PACKAGE_ALSA_UTILS_WITH_ALSAMIXER},y)

package/apr-util/Makefile

@@ -13,10 +13,11 @@ PKG_DEPENDS:=		libexpat apr
 PKG_BUILDDEP:=		expat apr
 PKG_URL:=		http://apr.apache.org/
 PKG_SITES:=		http://apache.mirror.clusters.cc/apr/
+PKG_OPTS:=		dev
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,APR_UTIL,apr-util,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,APR_UTIL,apr-util,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 CONFIGURE_ARGS+=	--without-berkeley-db \
 			--with-apr=${STAGING_DIR}/usr \

package/avahi/Makefile

@@ -23,6 +23,10 @@ PKGSD_AVAHI_DNSCONFD:=	DNS server from mDNS configuration daemon
 PKGSD_LIBAVAHI:=	DNS-SD over mDNS library
 PKGSC_LIBAVAHI:=	libs
 
+ifeq ($(ADK_STATIC),y)
+PKG_OPTS+=		libmix
+endif
+
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,AVAHI_DAEMON,avahi-daemon,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_AVAHI_DAEMON},${PKG_DESCR},${PKG_SECTION}))

package/axtls/Makefile

@@ -5,13 +5,15 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		axtls
 PKG_VERSION:=		1.4.9
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		6d519bc3b5f20faa6ef8d423f5062241
 PKG_DESCR:=		small embedded webserver with TLS
 PKG_SECTION:=		www
 PKG_DEPENDS:=		libaxtls
 PKG_URL:=		http://axtls.sourceforge.net/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=axtls/}
+PKG_LIBNAME:=		libaxtls
+PKG_OPTS:=		dev
 
 PKG_SUBPKGS:=		AXHTTPD LIBAXTLS
 PKGSD_LIBAXTLS:=	small tls library
@@ -20,10 +22,14 @@ PKGSC_LIBAXTLS:=	libs
 DISTFILES:=		axTLS-${PKG_VERSION}.tar.gz
 WRKDIST=		${WRKDIR}/axTLS
 
+ifeq ($(ADK_STATIC),y)
+PKG_OPTS+=              libmix
+endif
+
 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},,${PKGSD_LIBAXTLS},${PKGSC_LIBAXTLS}))
+$(eval $(call PKG_template,LIBAXTLS,libaxtls,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBAXTLS},${PKGSC_LIBAXTLS},${PKG_OPTS}))
 
 CONFIG_STYLE:=		manual
 INSTALL_STYLE:=		manual

package/beecrypt/Makefile

@@ -7,15 +7,16 @@ PKG_NAME:=		beecrypt
 PKG_VERSION:=		4.2.1
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		8441c014170823f2dff97e33df55af1e
-PKG_DESCR:=		cryptography toolkit
-PKG_SECTION:=		crypto
+PKG_DESCR:=		cryptography toolkit library
+PKG_SECTION:=		libs
 PKG_URL:=		http://beecrypt.sourceforge.net/
 PKG_SITES:=		http://sourceforge.net/projects/beecrypt/files/beecrypt/$(PKG_VERSION)/
 PKG_NEED_CXX:=		1
+PKG_OPTS:=		dev
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,BEECRYPT,beecrypt,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,BEECRYPT,beecrypt,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 TARGET_CFLAGS:=         $(filter-out -flto,$(TARGET_CFLAGS))
 TARGET_LDFLAGS+=        -L$(STAGING_DIR)/usr/lib64

package/bind/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		bind
 PKG_VERSION:=		9.7.3
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		207477c4cf95f2db5be0ded8a22669e0
 PKG_DESCR:=		popular DNS server
 PKG_SECTION:=		dns
@@ -14,6 +14,8 @@ PKG_BUILDDEP:=		openssl libxml2
 PKG_URL:=		https://www.isc.org/software/bind/
 PKG_SITES:=		ftp://ftp.isc.org/isc/bind9/${PKG_VERSION}/
 PKG_NEED_CXX:=		1
+PKG_LIBNAME:=		libbind
+PKG_OPTS:=		dev
 
 PKG_SUBPKGS:=		BIND_SERVER BIND_NSUPDATE BIND_RNDC BIND_CHECK BIND_DNSSEC BIND_HOST BIND_DIG LIBBIND
 PKGSD_BIND_NSUPDATE:=	nsupdate utility
@@ -40,6 +42,10 @@ PKGSC_LIBBIND:=		libs
 PKG_FLAVOURS_BIND_SERVER:=	WITH_IPV6
 PKGFD_WITH_IPV6:=		enable IPv6 support
 
+ifeq ($(ADK_STATIC),y)
+PKG_OPTS+=		libmix
+endif
+
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,BIND_SERVER,bind-server,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
@@ -49,7 +55,7 @@ $(eval $(call PKG_template,BIND_CHECK,bind-check,${PKG_VERSION}-${PKG_RELEASE},$
 $(eval $(call PKG_template,BIND_DNSSEC,bind-dnssec,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_BIND_DNSSEC},${PKGSD_BIND_DNSSEC},${PKGSC_BIND_DNSSEC}))
 $(eval $(call PKG_template,BIND_HOST,bind-host,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_BIND_HOST},${PKGSD_BIND_HOST},${PKGSC_BIND_HOST}))
 $(eval $(call PKG_template,BIND_DIG,bind-dig,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_BIND_DIG},${PKGSD_BIND_DIG},${PKGSC_BIND_DIG}))
-$(eval $(call PKG_template,LIBBIND,libbind,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBBIND},${PKGSC_LIBBIND}))
+$(eval $(call PKG_template,LIBBIND,libbind,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBBIND},${PKGSC_LIBBIND},${PKG_OPTS}))
 
 TARGET_CFLAGS:=         $(filter-out -flto,$(TARGET_CFLAGS))
 CONFIGURE_ARGS+=	--with-randomdev=/dev/urandom \

package/binutils/Makefile

@@ -4,9 +4,11 @@
 include ${TOPDIR}/rules.mk
 include ${TOPDIR}/toolchain/binutils/Makefile.inc
 
+PKG_NAME:=		binutils
 PKG_DESCR:=		binary utilities (nm, objdump, as, ..)
 PKG_SECTION:=		lang
 PKG_DEPENDS:=		libbfd
+PKG_OPTS:=		dev
 
 PKG_SUBPKGS:=		BINUTILS LIBBFD
 PKGSD_LIBBFD:=		Binary File Descriptor library
@@ -15,10 +17,14 @@ PKGSC_LIBBFD:=		libs
 PKG_HOST_DEPENDS:=      !cygwin
 PKG_ARCH_DEPENDS:=	!avr32
 
+ifeq ($(ADK_STATIC),y)
+PKG_OPTS+=		libmix
+endif
+
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,BINUTILS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBBFD,libbfd,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBBFD},${PKGSC_LIBBFD}))
+$(eval $(call PKG_template,LIBBFD,libbfd,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBBFD},${PKGSC_LIBBFD},${PKG_OPTS}))
 
 ifeq ($(ADK_TARGET_WITH_MULTILIB),y)
 CONFIGURE_ARGS+=	--enable-multilib
@@ -41,7 +47,7 @@ pre-build:
 
 libbfd-install:
 	${INSTALL_DIR} ${IDIR_LIBBFD}/usr/lib
-	$(CP) ${WRKINST}/usr/lib/*.so ${IDIR_LIBBFD}/usr/lib
+	$(CP) ${WRKINST}/usr/lib/*.so* ${IDIR_LIBBFD}/usr/lib
 
 binutils-install:
 	${INSTALL_DIR} ${IDIR_BINUTILS}/usr/bin

package/bison/Makefile

@@ -14,11 +14,11 @@ PKG_SITES:=		${MASTER_SITE_GNU:=${PKG_NAME}/}
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,BISON,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,BISON,bison,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 XAKE_FLAGS+=		M4=m4
 
-post-install:
+bison-install:
 	${INSTALL_DIR} ${IDIR_BISON}/usr/bin ${IDIR_BISON}/usr/share/bison
 	${INSTALL_BIN} ${WRKINST}/usr/bin/bison ${IDIR_BISON}/usr/bin
 	${CP} ${WRKINST}/usr/share/bison/* ${IDIR_BISON}/usr/share/bison

package/bitlbee/Makefile

@@ -16,7 +16,7 @@ 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}))
+$(eval $(call PKG_template,BITLBEE,bitlbee,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIG_STYLE:=		minimal
 TARGET_CFLAGS+=		-fPIC
@@ -40,7 +40,7 @@ post-configure:
 	@echo 'LFLAGS+=${TARGET_LDFLAGS}' >> \
 		${WRKBUILD}/Makefile.settings
 
-post-install:
+bitlbee-install:
 	${INSTALL_DIR} ${IDIR_BITLBEE}/etc/bitlbee ${IDIR_BITLBEE}/usr/sbin
 	${INSTALL_DATA} ${WRKINST}/etc/bitlbee/* ${IDIR_BITLBEE}/etc/bitlbee
 	${INSTALL_BIN} ${WRKINST}/usr/sbin/bitlbee ${IDIR_BITLBEE}/usr/sbin

package/bkeymaps/Makefile

@@ -16,7 +16,7 @@ PKG_DFLT_BKEYMAPS:=	y if ADK_TARGET_WITH_INPUT
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,BKEYMAPS,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,BKEYMAPS,bkeymaps,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIG_STYLE:=		manual
 BUILD_STYLE:=		manual

package/bluez-firmware/Makefile

@@ -15,7 +15,7 @@ PKG_SITES:=		http://bluez.sourceforge.net/download/
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,BLUEZ_FIRMWARE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,BLUEZ_FIRMWARE,bluez-firmware,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_ARGS+=	--libdir=/lib
 

package/bluez/Makefile

@@ -5,20 +5,32 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		bluez
 PKG_VERSION:=		4.101
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		fb42cb7038c380eb0e2fa208987c96ad
-PKG_DESCR:=		bluetooth libraries and applications
+PKG_DESCR:=		bluetooth applications
 PKG_SECTION:=		bluetooth
-PKG_DEPENDS:=		kmod-bt libusb glib dbus
-PKG_BUILDDEP:=		libusb dbus glib libusb-compat
+PKG_DEPENDS:=		kmod-bt libbluetooth
 PKG_URL:=		http://www.bluez.org/
 PKG_SITES:=		http://mirror.anl.gov/pub/linux/bluetooth/
+PKG_LIBNAME:=		libbluetooth
+PKG_OPTS:=		dev
+
+PKG_SUBPKGS:=		BLUEZ LIBBLUETOOTH
+PKGSC_LIBBLUETOOTH:=	libs
+PKGSD_LIBBLUETOOTH:=	bluetooth libraries
+PKGSS_LIBBLUETOOTH:=	glib libusb dbus libusb-compat
+PKGSB_LIBBLUETOOTH:=	glib libusb dbus libusb-compat
 
 PKG_ARCH_DEPENDS:=	!avr32
 
+ifeq ($(ADK_STATIC),y)
+PKG_OPTS+=              libmix
+endif
+
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,BLUEZ,bluez,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBBLUETOOTH,libbluetooth,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_LIBBLUETOOTH},${PKGSD_LIBBLUETOOTH},${PKGSC_LIBBLUETOOTH},${PKG_OPTS}))
 
 ifeq ($(ADK_STATIC),y)
 XAKE_FLAGS+=		CCLD="$(TARGET_CC) -all-static -pthread"
@@ -37,10 +49,6 @@ CONFIGURE_ARGS+=	--enable-tools \
 			--disable-cups
 
 bluez-install:
-ifneq ($(ADK_STATIC),y)
-	${INSTALL_DIR} ${IDIR_BLUEZ}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libbluetooth.so* ${IDIR_BLUEZ}/usr/lib
-endif
 	${INSTALL_DIR} $(IDIR_BLUEZ)/etc/dbus-1/system.d
 	${INSTALL_DIR} ${IDIR_BLUEZ}/usr/bin
 	${CP} ${WRKINST}/usr/bin/* ${IDIR_BLUEZ}/usr/bin
@@ -52,4 +60,8 @@ endif
 	$(INSTALL_DATA) ./files/bluetooth.conf \
 		$(IDIR_BLUEZ)/etc/dbus-1/system.d
 
+libbluetooth-install:
+	${INSTALL_DIR} ${IDIR_LIBBLUETOOTH}/usr/lib
+	${CP} ${WRKINST}/usr/lib/libbluetooth.so* ${IDIR_LIBBLUETOOTH}/usr/lib
+
 include ${TOPDIR}/mk/pkg-bottom.mk

package/bogofilter/Makefile

@@ -17,7 +17,7 @@ PKG_NEED_CXX:=		1
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,BOGOFILTER,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,BOGOFILTER,bogofilter,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_ENV+=		LIBS="-liconv" \
 			ac_cv_func_memcmp_working=yes

package/boost/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		boost
 PKG_VERSION:=		1.54.0
-PKG_RELEASE:=		3
+PKG_RELEASE:=		4
 PKG_MD5SUM:=		efbfbff5a85a9330951f243d0a46e4b9
 PKG_DESCR:=		boost C++ library
 PKG_SECTION:=		libs
@@ -139,8 +139,4 @@ boost-install:
 	${INSTALL_DIR} ${IDIR_BOOST}/usr/lib
 	${CP} ${WRKINST}/usr/lib/*.so* ${IDIR_BOOST}/usr/lib
 
-boost-dev-install:
-	${INSTALL_DIR} ${IDIR_BOOST_DEV}/usr/include
-	${CP} ${WRKINST}/usr/include/* ${IDIR_BOOST_DEV}/usr/include
-
 include ${TOPDIR}/mk/pkg-bottom.mk

package/busybox/Makefile

@@ -20,7 +20,7 @@ PKGSC_UDHCPD:=		net
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,BUSYBOX,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,BUSYBOX,busybox,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,UDHCPD,udhcpd,${PKG_VERSION}-${PKG_RELEASE},busybox,${PKGSD_UDHCPD},${PKGSC_UDHCPD}))
 
 # This is how to extract the Config.in files from a _built_ busybox source tree:

package/bwm/Makefile

@@ -16,7 +16,7 @@ WRKDIST=		${WRKDIR}/${PKG_NAME}-${PKG_VERSION}.orig
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,BWM,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,BWM,bwm,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIG_STYLE:=		manual
 BUILD_STYLE:=		manual

package/bzip2/Makefile

@@ -12,15 +12,21 @@ PKG_SECTION:=		archive
 PKG_DEPENDS:=		libbz2
 PKG_URL:=		http://www.bzip.org/
 PKG_SITES:=		http://www.bzip.org/${PKG_VERSION}/
-PKG_SUBPKGS:=		BZIP2 LIBBZ2
+PKG_LIBNAME:=		libbz2
+PKG_OPTS:=		dev
 
+PKG_SUBPKGS:=		BZIP2 LIBBZ2
 PKGSD_LIBBZ2:=		bzip2 compression library
 PKGSC_LIBBZ2:=		libs
 
+ifeq ($(ADK_STATIC),y)
+PKG_OPTS+=		libmix
+endif
+
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,BZIP2,bzip2,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBBZ2,libbz2,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBBZ2},${PKGSC_LIBBZ2}))
+$(eval $(call PKG_template,LIBBZ2,libbz2,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBBZ2},${PKGSC_LIBBZ2},${PKG_OPTS}))
 
 MAKE_FILE:=		Makefile-libbz2_so
 CONFIG_STYLE:=		manual
@@ -36,6 +42,8 @@ libbz2-install:
 		${STAGING_DIR}/usr/lib
 	(cd ${STAGING_DIR}/usr/lib; ln -sf libbz2.so.1.0.6 libbz2.so)
 	$(CP) $(WRKBUILD)/bzlib.h $(STAGING_DIR)/usr/include
+	${INSTALL_DIR} $(LIBBZ2_DEV)/usr/include
+	$(CP) $(WRKBUILD)/bzlib.h $(LIBBZ2_DEV)/usr/include
 
 bzip2-install:
 	${INSTALL_DIR} ${IDIR_BZIP2}/usr/bin

package/bzr/Makefile

@@ -16,7 +16,7 @@ PKG_SITES:=		https://launchpad.net/bzr/2.5/2.5.1/+download/
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,BZR,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,BZR,bzr,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIG_STYLE:=		manual
 BUILD_STYLE:=		manual

package/ca-certificates/Makefile

@@ -20,7 +20,7 @@ PKGFD_SMALL:=		Minimal set of CA certificates
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,CA_CERTIFICATES,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},force_etc))
+$(eval $(call PKG_template,CA_CERTIFICATES,ca-certificates,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},force_etc))
 
 CONFIG_STYLE:=		manual
 

package/cairo/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		cairo
 PKG_VERSION:=		1.10.2
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_MD5SUM:=		f101a9e88b783337b20b2e26dfd26d5f
 PKG_DESCR:=		cairo graphics library
 PKG_SECTION:=		libs
@@ -27,7 +27,7 @@ endif
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,CAIRO,cairo,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS},${PKG_OPTS}))
+$(eval $(call PKG_template,CAIRO,cairo,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 ifeq (,$(filter arm,$(TARGET_ARCH)))
 TARGET_CFLAGS:=         $(filter-out -Os,$(TARGET_CFLAGS))
@@ -43,10 +43,4 @@ cairo-install:
 	${INSTALL_DIR} ${IDIR_CAIRO}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libcairo.so* ${IDIR_CAIRO}/usr/lib
 
-cairo-dev-install:
-	${INSTALL_DIR} ${IDIR_CAIRO_DEV}/usr/include
-	${CP} ${WRKINST}/usr/include/* ${IDIR_CAIRO_DEV}/usr/include
-	${INSTALL_DIR} ${IDIR_CAIRO_DEV}/usr/lib/pkgconfig
-	${CP} ${WRKINST}/usr/lib/pkgconfig/*.pc ${IDIR_CAIRO_DEV}/usr/lib/pkgconfig
-
 include ${TOPDIR}/mk/pkg-bottom.mk

package/ccid/Makefile

@@ -19,12 +19,12 @@ DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,CCID,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,CCID,ccid,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 TARGET_CFLAGS:=         $(filter-out -flto,$(TARGET_CFLAGS))
 CONFIGURE_ARGS+=	--enable-twinserial
 
-post-install:
+ccid-install:
 	$(INSTALL_DIR) $(IDIR_CCID)/etc/reader.conf.d
 	$(INSTALL_DIR) $(IDIR_CCID)/usr/lib/pcsc/drivers
 	$(INSTALL_DATA) ./files/gemalto.conf \

package/cfgfs/Makefile

@@ -23,7 +23,7 @@ NO_DISTFILES:=		1
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,CFGFS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,CFGFS,cfgfs,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIG_STYLE:=		manual
 INSTALL_STYLE:=		manual

package/cgilib/Makefile

@@ -5,18 +5,19 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		cgilib
 PKG_VERSION:=		0.7
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		2c7053f58dfb06f7a80a112797ed7e86
 PKG_DESCR:=		Simple CGI Library
 PKG_SECTION:=		libs
 PKG_URL:=		http://www.infodrom.org/projects/cgilib/
 PKG_SITES:=		http://www.infodrom.org/projects/cgilib/download/
+PKG_OPTS:=		dev
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,CGILIB,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,CGILIB,cgilib,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-post-install:
+cgilib-install:
 	${INSTALL_DIR} ${IDIR_CGILIB}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libcgi.so* ${IDIR_CGILIB}/usr/lib/
 

package/cherokee/Makefile

@@ -10,7 +10,7 @@ PKG_MD5SUM:=		ef47003355a2e368e4d9596cd070ef23
 PKG_DESCR:=		small and fast webserver
 PKG_SECTION:=		www
 PKG_URL:=		http://www.cherokee-project.com
-PKG_SITES:=		http://www.cherokee-project.de/mirrors/cherokee/1.2/1.2.101/
+PKG_SITES:=		http://www.cherokee-project.de/mirrors/cherokee/1.2/${PKG_VERSION}/
 
 include $(TOPDIR)/mk/package.mk
 
@@ -26,8 +26,6 @@ cherokee-install:
 	$(INSTALL_DIR) $(IDIR_CHEROKEE)/usr/lib/cherokee
 	$(CP) $(WRKINST)/usr/lib/libcherokee*so* \
 		$(IDIR_CHEROKEE)/usr/lib
-	#$(CP) $(WRKINST)/usr/lib/cherokee/*.so \
-	#	$(IDIR_CHEROKEE)/usr/lib/cherokee
 	$(INSTALL_DIR) $(IDIR_CHEROKEE)/usr/sbin
 	$(INSTALL_BIN) $(WRKINST)/usr/sbin/cherokee{,-worker} \
 		$(IDIR_CHEROKEE)/usr/sbin

package/chillispot/Makefile

@@ -15,7 +15,7 @@ PKG_SITES=		http://www.chillispot.info/download/
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,CHILLISPOT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,CHILLISPOT,chillispot,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 post-install:
 	${INSTALL_DIR} ${IDIR_CHILLISPOT}/usr/sbin ${IDIR_CHILLISPOT}/etc

package/cluster-glue/Makefile

@@ -15,7 +15,7 @@ PKG_URL:=		http://www.linux-ha.org/wiki/Cluster_Glue
 PKG_SITES:=		http://openadk.org/distfiles/
 PKG_NOPARALLEL:=	1
 
-PKG_CFLINE_CLUSTER_GLUE:=	depends on ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC
+PKG_LIBC_DEPENDS:=	eglibc glibc musl
 PKG_ARCH_DEPENDS:=	x86 x86_64
 
 include $(TOPDIR)/mk/package.mk

package/cmake/Makefile

@@ -12,7 +12,7 @@ PKG_SECTION:=		lang
 PKG_URL:=		http://www.cmake.org/
 PKG_SITES:=		http://www.cmake.org/files/v2.8/
 
-PKG_CFLINE_CMAKE:=	depends on ADK_NATIVE
+PKG_SYSTEM_DEPENDS:=	native
 
 include $(TOPDIR)/mk/package.mk
 

package/collectd/Makefile

@@ -26,7 +26,7 @@ PKGFD_WITH_PING:=	enable ping statistic plugin
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,COLLECTD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,COLLECTD,collectd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 ifneq (${ADK_PACKAGE_COLLECTD_WITH_CPU},y)
 DISABLE_CPU:=--disable-cpu
@@ -121,7 +121,7 @@ CONFIGURE_ARGS+=	--disable-aggregation \
 TARGET_CFLAGS:=         $(filter-out -flto,$(TARGET_CFLAGS))
 XAKE_FLAGS+=		LIBS='-lm -lltdl'
 
-post-install:
+collectd-install:
 	${INSTALL_DIR} ${IDIR_COLLECTD}/usr/lib/collectd \
 		${IDIR_COLLECTD}/usr/sbin ${IDIR_COLLECTD}/etc
 	${INSTALL_DIR} ${IDIR_COLLECTD}/usr/share/collectd

package/comgt/Makefile

@@ -17,7 +17,7 @@ WRKDIST=		${WRKDIR}/${PKG_NAME}.${PKG_VERSION}
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,COMGT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,COMGT,comgt,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIG_STYLE:=		manual
 INSTALL_STYLE:=		manual

package/confuse/Makefile

@@ -5,18 +5,18 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		confuse
 PKG_VERSION:=		2.7
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		45932fdeeccbb9ef4228f1c1a25e9c8f
 PKG_DESCR:=		a configuration file parser library
 PKG_SECTION:=		libs
 PKG_URL:=		http://www.nongnu.org/confuse/
 PKG_SITES:=		http://savannah.nongnu.org/download/confuse/
-
-PKG_SUBPKGS:=		LIBCONFUSE
+PKG_LIBNAME:=		libconfuse
+PKG_OPTS:=		dev
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,LIBCONFUSE,libconfuse,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBCONFUSE,libconfuse,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 libconfuse-install:
 	${INSTALL_DIR} ${IDIR_LIBCONFUSE}/usr/lib

package/conntrack-tools/Makefile

@@ -22,9 +22,9 @@ include $(TOPDIR)/mk/package.mk
 
 TARGET_CPPFLAGS+=	-I$(STAGING_DIR)/usr/include/tirpc
 
-$(eval $(call PKG_template,CONNTRACK_TOOLS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,CONNTRACK_TOOLS,conntrack-tools,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-post-install:
+conntrack-tools-install:
 	$(INSTALL_DIR) $(IDIR_CONNTRACK_TOOLS)/usr/sbin
 	$(INSTALL_BIN) $(WRKINST)/usr/sbin/conntrack{,d} $(IDIR_CONNTRACK_TOOLS)/usr/sbin
 

package/cpio/Makefile

@@ -14,7 +14,7 @@ PKG_SITES:=		${MASTER_SITE_GNU:=cpio/}
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,CPIO,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,CPIO,cpio,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 post-install:
 	${INSTALL_DIR} ${IDIR_CPIO}/usr/bin

package/cpufrequtils/Makefile

@@ -14,12 +14,12 @@ PKG_SITES:=		http://www.kernel.org/pub/linux/utils/kernel/cpufreq/
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,CPUFREQUTILS,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,CPUFREQUTILS,cpufrequtils,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 XAKE_FLAGS+=		NLS=no
 CONFIG_STYLE:=		manual
 
-post-install:
+cpufrequtils-install:
 	$(INSTALL_DIR) $(IDIR_CPUFREQUTILS)/usr/lib
 	$(CP) $(WRKINST)/usr/lib/libcpufreq.so* \
 		$(IDIR_CPUFREQUTILS)/usr/lib

package/cryptinit/Makefile

@@ -32,7 +32,7 @@ NO_DISTFILES:=		1
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,CRYPTINIT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,CRYPTINIT,cryptinit,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIG_STYLE:=		manual
 BUILD_STYLE:=		manual

package/cryptodev-linux/Makefile

@@ -17,7 +17,7 @@ PKG_SITES:=		http://download.gna.org/cryptodev-linux/
 include $(TOPDIR)/mk/package.mk
 include ${TOPDIR}/mk/kernel-vars.mk
 
-$(eval $(call PKG_template,CRYPTODEV_LINUX,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,CRYPTODEV_LINUX,cryptodev-linux,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIG_STYLE:=		manual
 BUILD_STYLE:=		manual

package/ctorrent/Makefile

@@ -16,9 +16,9 @@ PKG_NEED_CXX:=		1
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,CTORRENT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,CTORRENT,ctorrent,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-post-install:
+ctorrent-install:
 	${INSTALL_DIR} ${IDIR_CTORRENT}/usr/bin
 	${CP} ${WRKINST}/usr/bin/ctorrent ${IDIR_CTORRENT}/usr/bin
 

package/curl/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		curl
 PKG_VERSION:=		7.28.0
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		cbdc0a79bdf6e657dd387c3d88d802e3
 PKG_DESCR:=		a client-side URL transfer tool
 PKG_SECTION:=		www
@@ -33,6 +33,10 @@ PKGCD_WITH_GNUTLS:=	use GnuTLS for crypto
 PKGCS_WITH_GNUTLS:=	libgnutls ca-certificates libgmp
 PKGCB_WITH_GNUTLS:=	gnutls
 
+ifeq ($(ADK_STATIC),y)
+PKG_OPTS+=		libmix
+endif
+
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,CURL,curl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))

package/cutter/Makefile

@@ -16,7 +16,7 @@ DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tgz
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,CUTTER,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,CUTTER,cutter,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIG_STYLE:=		manual
 BUILD_STYLE:=		manual

package/cvs/Makefile

@@ -14,7 +14,7 @@ PKG_SITES:=		http://ftp.gnu.org/non-gnu/cvs/source/stable/${PKG_VERSION}/
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,CVS,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,CVS,cvs,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_ENV+=		ac_cv_lib_nsl_main=no
 

package/dansguardian/Makefile

@@ -18,7 +18,7 @@ PKG_CXX:=		DANSGUARDIAN
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,DANSGUARDIAN,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,DANSGUARDIAN,dansguardian,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 ifeq ($(ADK_LINUX_AVR32),y)
 LIBRARIES:=-nodefaultlibs -luClibc++ -lgcc -lm -lc

package/daq/Makefile

@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		daq
 PKG_VERSION:=		2.0.0
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		a00855a153647df76d47f1ea454f74ae
 PKG_DESCR:=		daq
 PKG_SECTION:=		libs
@@ -13,10 +13,11 @@ PKG_DEPENDS:=		libpcap
 PKG_BUILDDEP:=		libpcap
 PKG_URL:=		http://www.snort.org
 PKG_SITES:=		http://openadk.org/distfiles/
+PKG_OPTS:=		dev
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,DAQ,daq,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,DAQ,daq,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 daq-install:
 	$(INSTALL_DIR) $(IDIR_DAQ)/usr/lib/daq

package/davfs2/Makefile

@@ -16,7 +16,7 @@ PKG_SITES:=		http://www.very-clever.com/download/nongnu/davfs2/
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,DAVFS2,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,DAVFS2,davfs2,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_ARGS+=	--with-neon
 CONFIGURE_ENV+=		LIBS=-liconv

package/deco/Makefile

@@ -18,7 +18,7 @@ WRKDIST=		${WRKDIR}/${PKG_NAME}${PKG_VERSION}
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,DECO,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,DECO,deco,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 INSTALL_STYLE:=		manual
 

package/dhcp-forwarder/Makefile

@@ -14,7 +14,7 @@ PKG_SITES:=		http://savannah.nongnu.org/download/dhcp-fwd/
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,DHCP_FORWARDER,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,DHCP_FORWARDER,dhcp-forwarder,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_ARGS+=	--disable-dietlibc
 XAKE_FLAGS+=		cfg_filename="/etc/dhcp-fwd.conf"

package/dialog/Makefile

@@ -17,11 +17,11 @@ DISTFILES:=             ${PKG_NAME}_${PKG_VERSION}.orig.tar.gz
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,DIALOG,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,DIALOG,dialog,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 MAKE_FILE:=		makefile
 
-post-install:
+dialog-install:
 	$(INSTALL_DIR) $(IDIR_DIALOG)/usr/bin
 	$(INSTALL_BIN) $(WRKINST)/usr/bin/dialog $(IDIR_DIALOG)/usr/bin
 

package/diffutils/Makefile

@@ -14,11 +14,11 @@ PKG_SITES:=		${MASTER_SITE_GNU:=${PKG_NAME}/}
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,DIFFUTILS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,DIFFUTILS,diffutils,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_ENV+=		ac_use_included_regex=no
 
-post-install:
+diffutils-install:
 	${INSTALL_DIR} ${IDIR_DIFFUTILS}/usr/bin
 	${INSTALL_BIN} ${WRKINST}/usr/bin/diff ${IDIR_DIFFUTILS}/usr/bin
 

package/digitemp/Makefile

@@ -18,7 +18,7 @@ PKG_ARCH_DEPENDS:=	!avr32
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,DIGITEMP,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,DIGITEMP,digitemp,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIG_STYLE:=		manual
 INSTALL_STYLE:=		manual

package/dillo/Makefile

@@ -23,7 +23,7 @@ DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,DILLO,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,DILLO,dillo,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_ENV+=		PNG_CONFIG=$(STAGING_DIR)/usr/bin/png-config
 TARGET_LDFLAGS+=	-liconv -lpng15

package/dnsmasq/Makefile

@@ -14,7 +14,7 @@ PKG_SITES:=		http://thekelleys.org.uk/dnsmasq/
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,DNSMASQ,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,DNSMASQ,dnsmasq,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIG_STYLE:=		manual
 

package/dosfstools/Makefile

@@ -14,7 +14,7 @@ PKG_SITES:=		http://www.daniel-baumann.ch/software/dosfstools/
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,DOSFSTOOLS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,DOSFSTOOLS,dosfstools,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIG_STYLE:=		manual
 XAKE_FLAGS+=		PREFIX="" OPTFLAGS="-D_FILE_OFFSET_BITS=64"

package/dovecot/Makefile

@@ -22,7 +22,7 @@ PKGCB_WITH_GNUTLS:=	gnutls
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,DOVECOT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,DOVECOT,dovecot,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_ENV+=		RPCGEN='' \
 			ignore_signed_size=1 \

package/drbd/Makefile

@@ -14,7 +14,7 @@ PKG_SITES:=		http://oss.linbit.com/drbd/8.4/
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,DRBD,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,DRBD,drbd,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 XAKE_FLAGS+=		GENETLINK_H=$(STAGING_DIR)/usr/include/linux/genetlink.h
 CONFIGURE_ARGS+=	--with-distro=generic \

package/dropbear/Makefile

@@ -23,7 +23,7 @@ PKGFD_WITH_UTMP:=	support writing /var/run/utmp
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,DROPBEAR,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,DROPBEAR,dropbear,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,DBCONVERT,dropbearconvert,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_DBCONVERT},${PKG_SECTION}))
 
 TARGET_LDFLAGS+=	$(ADK_TARGET_ABI_CFLAGS)

package/dsniff/Makefile

@@ -20,7 +20,7 @@ WRKDIST=		${WRKDIR}/${PKG_NAME}-2.4
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,DSNIFF,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,DSNIFF,dsniff,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_ARGS+=	--without-db \
 			--without-x \
@@ -31,7 +31,7 @@ CONFIGURE_ARGS+=	--without-db \
 			--with-openssl="${STAGING_TARGET_DIR}/usr"
 FAKE_FLAGS+=		install_prefix="${WRKINST}"
 
-post-install:
+dsniff-install:
 	${INSTALL_DIR} ${IDIR_DSNIFF}/usr/lib ${IDIR_DSNIFF}/usr/sbin
 	${CP} ${WRKINST}/usr/sbin/* ${IDIR_DSNIFF}/usr/sbin
 	${CP} ${WRKINST}/usr/lib/* ${IDIR_DSNIFF}/usr/lib

package/e2fsprogs/Makefile

@@ -5,11 +5,12 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		e2fsprogs
 PKG_VERSION:=		1.42.8
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_MD5SUM:=		8ef664b6eb698aa6b733df59b17b9ed4
-PKG_DESCR:=		Ext2/3/4 filesystem utilities
+PKG_DESCR:=		Ext2/3/4 filesystem utilities (meta-package)
 PKG_SECTION:=		fs
 PKG_DEPENDS:=		libcom-err libuuid libblkid libpthread
+PKG_DEPENDS:=		e2fsck tune2fs mke2fs resize2fs
 PKG_BUILDDEP:=		util-linux
 PKG_URL:=		http://e2fsprogs.sourceforge.net/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=e2fsprogs/}
@@ -17,7 +18,7 @@ PKG_OPTS:=		dev
 
 PKG_CFLINE_E2FSPROGS:=	default y if ADK_TARGET_ROOTFS_CF
 
-PKG_SUBPKGS:=		LIBE2FS LIBCOM_ERR LIBSS E2FSCK_STATIC
+PKG_SUBPKGS:=		E2FSPROGS LIBE2FS LIBCOM_ERR LIBSS E2FSCK_STATIC
 PKG_SUBPKGS+=		RESIZE2FS TUNE2FS E2FSCK MKE2FS
 PKGSD_LIBE2FS:=		e2fsprogs library
 PKGSC_LIBE2FS:=		libs
@@ -42,10 +43,9 @@ PKGSS_MKE2FS:=		libe2fs
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,E2FSPROGS,e2fsprogs,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+$(eval $(call PKG_template,E2FSPROGS,e2fsprogs,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 $(eval $(call PKG_template,LIBE2FS,libe2fs,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBE2FS},${PKGSC_LIBE2FS}))
 $(eval $(call PKG_template,LIBCOM_ERR,libcom-err,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBCOM_ERR},${PKGSC_LIBCOM_ERR}))
-$(eval $(call PKG_template,LIBCOM_ERR_DEV,libcom-err-dev,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBCOM_ERR_DEV},${PKGSC_LIBCOM_ERR_DEV}))
 $(eval $(call PKG_template,LIBSS,libss,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBSS},${PKGSC_LIBSS}))
 $(eval $(call PKG_template,E2FSCK_STATIC,e2fsck-static,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_E2FSCK_STATIC},${PKGSC_E2FSCK_STATIC}))
 $(eval $(call PKG_template,TUNE2FS,tune2fs,${PKG_VERSION}-${PKG_RELEASE},$(PKGSS_TUNE2FS),${PKGSD_TUNE2FS},${PKGSC_TUNE2FS}))

package/ebtables/Makefile

@@ -19,7 +19,7 @@ WRKDIST=		${WRKDIR}/${PKG_NAME}-v${PKG_VERSION}-4
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,EBTABLES,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,EBTABLES,ebtables,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIG_STYLE:=		manual
 

package/elinks/Makefile

@@ -20,7 +20,7 @@ PKGFD_WITH_IPV6:=	enable IPv6 support
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,ELINKS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,ELINKS,elinks,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 INSTALL_STYLE:=		manual
 TARGET_CFLAGS:=         $(filter-out -flto,$(TARGET_CFLAGS))

package/esound/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		esound
 PKG_VERSION:=		0.2.41
-PKG_RELEASE:=		4
+PKG_RELEASE:=		5
 PKG_MD5SUM:=		3d8973ed87053d7acc1f4d44af2c4688
 PKG_DESCR:=		Enlightened Sound Daemon
 PKG_SECTION:=		multimedia
@@ -13,16 +13,17 @@ PKG_DEPENDS:=		libaudiofile
 PKG_BUILDDEP:=		libaudiofile
 PKG_URL:=		http://www.tux.org/~ricdude/EsounD.html
 PKG_SITES:=		ftp://ftp.gnome.org/pub/gnome/sources/esound/0.2/
+PKG_OPTS:=		dev
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,ESOUND,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,ESOUND,esound,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 CONFIGURE_ARGS+=	--disable-alsa \
 			--disable-arts \
 			--enable-oss
 
-post-install:
+esound-install:
 	${INSTALL_DIR} ${IDIR_ESOUND}/usr/bin ${IDIR_ESOUND}/usr/lib
 	${INSTALL_BIN} ${WRKINST}/usr/bin/esd ${IDIR_ESOUND}/usr/bin/
 	$(CP) $(WRKINST)/usr/lib/libesd.so* $(IDIR_ESOUND)/usr/lib/

package/ether-wake/Makefile

@@ -13,7 +13,7 @@ NO_DISTFILES:=		1
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,ETHER_WAKE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,ETHER_WAKE,ether-wake,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIG_STYLE:=		manual
 BUILD_STYLE:=		manual

package/ethtool/Makefile

@@ -13,9 +13,9 @@ PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=gkernel/}
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,ETHTOOL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,ETHTOOL,ethtool,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-post-install:
+ethtool-install:
 	${INSTALL_DIR} ${IDIR_ETHTOOL}/usr/sbin
 	${CP} ${WRKINST}/usr/sbin/ethtool ${IDIR_ETHTOOL}/usr/sbin
 

package/evieext/Makefile

@@ -5,10 +5,15 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		evieext
 PKG_VERSION:=		1.1.0
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		68e61ce53caa495a3ad4085f66010eb8
+PKG_DESCR:=		collection of XEVIE extension headers
+PKG_SECTION:=		devel
 PKG_SITES:=		ftp://ftp.x.org/pub/individual/proto/
-PKG_SUBPKGS:=
+PKG_OPTS:=              dev devonly
 
 include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,EVIEEXT,evieext,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
 include ${TOPDIR}/mk/pkg-bottom.mk

package/evilwm/Makefile

@@ -16,13 +16,13 @@ PKG_SITES:=		http://www.6809.org.uk/evilwm/
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,EVILWM,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,EVILWM,evilwm,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIG_STYLE:=		manual
 
 MAKE_FLAGS+=		XROOT="$(STAGING_TARGET_DIR)/usr"
 
-post-install:
+evilwm-install:
 	$(INSTALL_DIR) $(IDIR_EVILWM)/usr/bin
 	$(INSTALL_BIN) $(WRKINST)/usr/bin/evilwm $(IDIR_EVILWM)/usr/bin
 

package/ez-ipupdate/Makefile

@@ -5,26 +5,24 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		ez-ipupdate
 PKG_VERSION:=		3.0.11b8
-PKG_RELEASE:=		10
+PKG_RELEASE:=		11
 PKG_MD5SUM:=		000211add4c4845ffa4211841bff4fb0
 PKG_DESCR:=		a client for dynamic DNS services
 PKG_SECTION:=		dns
 PKG_URL:=		http://ez-ipupdate.com/
 PKG_SITES:=		http://ftp.debian.org/debian/pool/main/e/ez-ipupdate/
 
-PKG_SUBPKGS:=		EZIPUPDATE
-
 DISTFILES:=		${PKG_NAME}_${PKG_VERSION}.orig.tar.gz
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,EZIPUPDATE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,EZ_IPUPDATE,ez-ipupdate,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 INSTALL_STYLE:=		manual
 
 do-install:
-	${INSTALL_DIR} ${IDIR_EZIPUPDATE}/etc ${IDIR_EZIPUPDATE}/usr/sbin
-	install -m0600 ./files/${PKG_NAME}.conf ${IDIR_EZIPUPDATE}/etc/
-	${INSTALL_BIN} ${WRKBUILD}/${PKG_NAME} ${IDIR_EZIPUPDATE}/usr/sbin/
+	${INSTALL_DIR} ${IDIR_EZ_IPUPDATE}/etc ${IDIR_EZ_IPUPDATE}/usr/sbin
+	install -m0600 ./files/ez-ipupdate.conf ${IDIR_EZ_IPUPDATE}/etc/
+	${INSTALL_BIN} ${WRKBUILD}/ez-ipupdate ${IDIR_EZ_IPUPDATE}/usr/sbin/
 
 include ${TOPDIR}/mk/pkg-bottom.mk

package/fakeidentd/Makefile

@@ -16,7 +16,7 @@ WRKDIST=		${WRKDIR}
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,FAKEIDENTD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,FAKEIDENTD,fakeidentd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIG_STYLE:=		manual
 BUILD_STYLE:=		manual

package/fbset/Makefile

@@ -13,7 +13,7 @@ PKG_SITES:=		http://users.telenet.be/geertu/Linux/fbdev/
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,FBSET,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,FBSET,fbset,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIG_STYLE:=		manual
 BUILD_STYLE:=		manual

package/fetchmail/Makefile

@@ -21,7 +21,7 @@ PKGFB_WITH_SSL:=	openssl
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,FETCHMAIL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,FETCHMAIL,fetchmail,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_ARGS+=	--without-hesiod
 
@@ -31,7 +31,7 @@ else
 CONFIGURE_ARGS+=	--without-ssl
 endif
 
-post-install:
+fetchmail-install:
 	${INSTALL_DIR} ${IDIR_FETCHMAIL}/usr/bin
 	${INSTALL_BIN} ${WRKINST}/usr/bin/fetchmail \
 		 ${IDIR_FETCHMAIL}/usr/bin/

package/ffmpeg/Makefile

@@ -5,13 +5,15 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		ffmpeg
 PKG_VERSION:=		2.0.2
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_MD5SUM:=		6c5cfed204d8a108325d1fc439ab734a
 PKG_DESCR:=		record, convert and stream audio & video
 PKG_SECTION:=		libs
 PKG_FDEPENDS:=		libpthread
 PKG_URL:=		http://www.ffmpeg.org/
 PKG_SITES:=		http://www.ffmpeg.org/releases/
+PKH_LIBNAME:=		libffmpeg
+PKG_OPTS:=		dev
 
 PKG_ARCH_DEPENDS:=	!avr32 !cris
 
@@ -29,6 +31,8 @@ PKGSS_FFSERVER:=	libffmpeg
 PKGSD_FFPROBE:=		simple multimedia stream analyzer
 PKGSC_FFPROBE:=		multimedia
 PKGSS_FFPROBE:=		libffmpeg
+PKGSD_LIBFFMPEG:=	ffmpeg library
+PKGSC_LIBFFMPEG:=	libs
 
 PKG_FLAVOURS_LIBFFMPEG:=	WITH_AAC WITH_MP3 WITH_VP8 WITH_THEORA
 PKG_FLAVOURS_LIBFFMPEG+=	WITH_XVID WITH_VORBIS WITH_X264
@@ -84,9 +88,13 @@ endif
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
+ifeq ($(ADK_STATIC),y)
+PKG_OPTS+=		libmix
+endif
+
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,LIBFFMPEG,libffmpeg,${PKG_VERSION}-${PKG_RELEASE},${PKG_FDEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBFFMPEG,libffmpeg,${PKG_VERSION}-${PKG_RELEASE},${PKG_FDEPENDS},${PKGSD_LIBFFMPEG},${PKGSC_LIBFFMPEG},${PKG_OPTS}))
 $(eval $(call PKG_template,FFMPEG,ffmpeg,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_FFMPEG},${PKGSC_FFMPEG}))
 $(eval $(call PKG_template,FFSERVER,ffserver,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_FFSERVER},${PKGSC_FFSERVER}))
 $(eval $(call PKG_template,FFPROBE,ffprobe,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_FFPROBE},${PKGSC_FFPROBE}))

package/file/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		file
 PKG_VERSION:=		5.11
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		16a407bd66d6c7a832f3a5c0d609c27b
 PKG_DESCR:=		a file type guesser
 PKG_SECTION:=		utils
@@ -20,9 +20,13 @@ PKG_SUBPKGS:=		FILE LIBMAGIC
 PKGSD_LIBMAGIC:=	file type guesser library
 PKGSC_LIBMAGIC:=	libs
 
+ifeq ($(ADK_STATIC),y)
+PKG_OPTS+=		libmix
+endif
+
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,FILE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,FILE,file,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,LIBMAGIC,libmagic,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_LIBMAGIC},${PKGSD_LIBMAGIC},${PKGSC_LIBMAGIC},${PKG_OPTS}))
 
 pre-configure:

package/findutils/Makefile

@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		findutils
 PKG_VERSION:=		4.4.2
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		351cc4adb07d54877fa15f75fb77d39f
 PKG_DESCR:=		GNU utilities for finding files
 PKG_SECTION:=		utils
@@ -18,16 +18,18 @@ PKGSD_LOCATE:=		Locate utility
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,FINDUTILS,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,FINDUTILS,findutils,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,LOCATE,locate,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LOCATE},${PKG_SECTION}))
 
 CONFIGURE_ENV+=		gl_cv_func_wcwidth_works=yes \
 			ac_cv_func_working_mktime=yes
 
-post-install:
+findutils-install:
 	$(INSTALL_DIR) $(IDIR_FINDUTILS)/usr/bin
 	$(INSTALL_BIN) $(WRKINST)/usr/bin/{find,oldfind,xargs} \
 		 $(IDIR_FINDUTILS)/usr/bin
+
+locate-install:
 	${INSTALL_DIR} ${IDIR_LOCATE}/usr/{bin,libexec}
 	${INSTALL_BIN} ${WRKINST}/usr/bin/{locate,updatedb} ${IDIR_LOCATE}/usr/bin/
 	$(INSTALL_BIN) $(WRKINST)/usr/libexec/{bigram,code,frcode} \

package/flac/Makefile

@@ -5,25 +5,25 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		flac
 PKG_VERSION:=		1.2.1
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		153c8b15a54da428d1f0fadc756c22c7
 PKG_DESCR:=		Free Lossless Audio Codec library
 PKG_SECTION:=		libs
 PKG_URL:=		http://flac.sourceforge.net
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=flac/}
-
-PKG_SUBPKGS:=		LIBFLAC
+PKG_LIBNAME:=		libflac
+PKG_OPTS:=		dev
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,LIBFLAC,libflac,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBFLAC,libflac,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 CONFIGURE_ARGS+=	--disable-asm-optimizations \
 			--disable-xmms-plugin \
 			--disable-cpplibs \
 			--disable-ogg
 
-post-install:
+libflac-install:
 	${INSTALL_DIR} ${IDIR_LIBFLAC}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libFLAC.so* ${IDIR_LIBFLAC}/usr/lib/
 

package/fltk/Makefile

@@ -14,8 +14,9 @@ PKG_URL:=		http://www.fltk.org/
 PKG_SITES:=		http://openadk.org/distfiles/
 PKG_NEED_CXX:=		1
 PKG_CXX:=		LIBFLTK
+PKG_LIBNAME:=		libfltk
+PKG_OPTS:=		dev
 
-PKG_SUBPKGS:=		LIBFLTK
 PKG_ARCH_DEPENDS:=	x86 x86_64 mips arm
 PKG_HOST_DEPENDS:=	!darwin
 
@@ -23,9 +24,12 @@ DISTFILES:=		${PKG_NAME}-$(PKG_VERSION)-source.tar.gz
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,LIBFLTK,libfltk,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBFLTK,libfltk,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
+ifeq ($(ADK_COMPILE_LIBFLTK_WITH_UCLIBCXX),y)
 LIBRARIES:=-nodefaultlibs -luClibc++ -lgcc -lgcc_s -lm -lc
+endif
+
 ifeq ($(ADK_TOOLCHAIN_GCC_USE_SSP),y)
 LIBRARIES+=-lssp -lssp_nonshared
 endif

package/fluxbox/Makefile

@@ -23,7 +23,7 @@ PKGFB_WITH_IMLIB2:=	imlib2
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,FLUXBOX,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,FLUXBOX,fluxbox,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 ifeq (${ADK_PACKAGE_FLUXBOX_WITH_IMLIB2},y)
 CONFIGURE_ARGS+=	--enable-imlib2
@@ -31,7 +31,7 @@ else
 CONFIGURE_ARGS+=	--disable-imlib2
 endif
 
-post-install:
+fluxbox-install:
 	$(INSTALL_DIR) $(IDIR_FLUXBOX)/usr/{bin,share}
 	$(INSTALL_BIN) $(WRKINST)/usr/bin/* \
 		$(IDIR_FLUXBOX)/usr/bin

package/font-adobe-100dpi/Makefile

@@ -18,9 +18,9 @@ PKG_HOST_DEPENDS:=      !netbsd !openbsd !cygwin !freebsd !mirbsd
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,FONT_ADOBE_100DPI,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,FONT_ADOBE_100DPI,font-adobe-100dpi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-post-install:
+font-adobe-100dpi-install:
 	$(INSTALL_DIR) $(IDIR_FONT_ADOBE_100DPI)/usr/share/fonts/X11/100dpi
 	$(CP) ${WRKINST}/usr/share/fonts/X11/100dpi/* \
 		$(IDIR_FONT_ADOBE_100DPI)/usr/share/fonts/X11/100dpi

package/font-adobe-75dpi/Makefile

@@ -18,9 +18,9 @@ PKG_HOST_DEPENDS:=      !netbsd !openbsd !cygwin !freebsd !mirbsd
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,FONT_ADOBE_75DPI,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,FONT_ADOBE_75DPI,font-adobe-75dpi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-post-install:
+font-adobe-75dpi-install:
 	$(INSTALL_DIR) $(IDIR_FONT_ADOBE_75DPI)/usr/share/fonts/X11/75dpi
 	$(CP) ${WRKINST}/usr/share/fonts/X11/75dpi/* \
 		$(IDIR_FONT_ADOBE_75DPI)/usr/share/fonts/X11/75dpi

package/font-bh-100dpi/Makefile

@@ -17,9 +17,9 @@ PKG_HOST_DEPENDS:=      !netbsd !openbsd !cygwin !freebsd !mirbsd
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,FONT_BH_100DPI,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,FONT_BH_100DPI,font-bh-100dpi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-post-install:
+font-bh-100dpi-install:
 	$(INSTALL_DIR) $(IDIR_FONT_BH_100DPI)/usr/share/fonts/X11/100dpi
 	$(CP) ${WRKINST}/usr/share/fonts/X11/100dpi/* \
 		$(IDIR_FONT_BH_100DPI)/usr/share/fonts/X11/100dpi

package/font-bh-75dpi/Makefile

@@ -17,9 +17,9 @@ PKG_HOST_DEPENDS:=      !netbsd !openbsd !cygwin !freebsd !mirbsd
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,FONT_BH_75DPI,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,FONT_BH_75DPI,font-bh-75dpi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-post-install:
+font-bh-75dpi-install:
 	$(INSTALL_DIR) $(IDIR_FONT_BH_75DPI)/usr/share/fonts/X11/75dpi
 	$(CP) ${WRKINST}/usr/share/fonts/X11/75dpi/* \
 		$(IDIR_FONT_BH_75DPI)/usr/share/fonts/X11/75dpi

package/font-bh-lucidatypewriter-100dpi/Makefile

@@ -17,9 +17,9 @@ PKG_HOST_DEPENDS:=      !netbsd !openbsd !cygwin !freebsd !mirbsd
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,FONT_BH_LUCIDATYPEWRITER_100DPI,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,FONT_BH_LUCIDATYPEWRITER_100DPI,font-bh-lucidatypewriter-100dpi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-post-install:
+font-bh-lucidatypewriter-100dpi-install:
 	$(INSTALL_DIR) $(IDIR_FONT_BH_LUCIDATYPEWRITER_100DPI)/usr/share/fonts/X11/100dpi
 	$(CP) ${WRKINST}/usr/share/fonts/X11/100dpi/* \
 		$(IDIR_FONT_BH_LUCIDATYPEWRITER_100DPI)/usr/share/fonts/X11/100dpi

package/font-bh-lucidatypewriter-75dpi/Makefile

@@ -17,9 +17,9 @@ PKG_HOST_DEPENDS:=      !netbsd !openbsd !cygwin !freebsd !mirbsd
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,FONT_BH_LUCIDATYPEWRITER_75DPI,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,FONT_BH_LUCIDATYPEWRITER_75DPI,font-bh-lucidatypewriter-75dpi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-post-install:
+font-bh-lucidatypewriter-75dpi-install:
 	$(INSTALL_DIR) $(IDIR_FONT_BH_LUCIDATYPEWRITER_75DPI)/usr/share/fonts/X11/75dpi
 	$(CP) ${WRKINST}/usr/share/fonts/X11/75dpi/* \
 		$(IDIR_FONT_BH_LUCIDATYPEWRITER_75DPI)/usr/share/fonts/X11/75dpi

package/font-bh-ttf/Makefile

@@ -17,9 +17,9 @@ PKG_HOST_DEPENDS:=      !netbsd !openbsd !cygwin !freebsd !mirbsd
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,FONT_BH_TTF,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,FONT_BH_TTF,font-bh-ttf,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-post-install:
+font-bh-ttf-install:
 	$(INSTALL_DIR) $(IDIR_FONT_BH_TTF)/usr/share/fonts/X11/TTF
 	$(CP) ${WRKINST}/usr/share/fonts/X11/TTF/* \
 		$(IDIR_FONT_BH_TTF)/usr/share/fonts/X11/TTF

package/font-bh-type1/Makefile

@@ -17,9 +17,9 @@ PKG_HOST_DEPENDS:=      !netbsd !openbsd !cygwin !freebsd !mirbsd
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,FONT_BH_TYPE1,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,FONT_BH_TYPE1,font-bh-type1,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-post-install:
+font-bh-type1-install:
 	$(INSTALL_DIR) $(IDIR_FONT_BH_TYPE1)/usr/share/fonts/X11/Type1
 	$(CP) ${WRKINST}/usr/share/fonts/X11/Type1/* \
 		$(IDIR_FONT_BH_TYPE1)/usr/share/fonts/X11/Type1

package/font-bitstream-100dpi/Makefile

@@ -17,9 +17,9 @@ PKG_HOST_DEPENDS:=      !netbsd !openbsd !cygwin !freebsd !mirbsd
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,FONT_BITSTREAM_100DPI,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,FONT_BITSTREAM_100DPI,font-bitstream-100dpi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-post-install:
+font-bitstream-100dpi-install:
 	$(INSTALL_DIR) $(IDIR_FONT_BITSTREAM_100DPI)/usr/share/fonts/X11/100dpi
 	$(CP) ${WRKINST}/usr/share/fonts/X11/100dpi/* \
 		$(IDIR_FONT_BITSTREAM_100DPI)/usr/share/fonts/X11/100dpi

package/font-bitstream-75dpi/Makefile

@@ -17,9 +17,9 @@ PKG_HOST_DEPENDS:=      !netbsd !openbsd !cygwin !freebsd !mirbsd
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,FONT_BITSTREAM_75DPI,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,FONT_BITSTREAM_75DPI,font-bitstream-75dpi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-post-install:
+font-bitstream-75dpi-install:
 	$(INSTALL_DIR) $(IDIR_FONT_BITSTREAM_75DPI)/usr/share/fonts/X11/75dpi
 	$(CP) ${WRKINST}/usr/share/fonts/X11/75dpi/* \
 		$(IDIR_FONT_BITSTREAM_75DPI)/usr/share/fonts/X11/75dpi

package/font-bitstream-type1/Makefile

@@ -17,9 +17,9 @@ PKG_HOST_DEPENDS:=      !netbsd !openbsd !cygwin !freebsd !mirbsd
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,FONT_BITSTREAM_TYPE1,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,FONT_BITSTREAM_TYPE1,font-bitstream-type1,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-post-install:
+font-bitstream-type1-install:
 	$(INSTALL_DIR) $(IDIR_FONT_BITSTREAM_TYPE1)/usr/share/fonts/X11/Type1
 	$(CP) ${WRKINST}/usr/share/fonts/X11/Type1/* \
 		$(IDIR_FONT_BITSTREAM_TYPE1)/usr/share/fonts/X11/Type1

package/font-misc-misc/Makefile

@@ -17,11 +17,11 @@ PKG_HOST_DEPENDS:=      !netbsd !openbsd !cygwin !freebsd !mirbsd
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,FONT_MISC_MISC,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,FONT_MISC_MISC,font-misc-misc,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_ENV+=		MAPFILES_PATH=${STAGING_TARGET_DIR}/usr/share/fonts/X11/util
 
-post-install:
+font-misc-misc-install:
 	$(INSTALL_DIR) $(IDIR_FONT_MISC_MISC)/usr/share/fonts/X11/misc
 	$(CP) ${WRKINST}/usr/share/fonts/X11/misc/* \
 		$(IDIR_FONT_MISC_MISC)/usr/share/fonts/X11/misc

package/font-util/Makefile

@@ -11,11 +11,10 @@ PKG_DESCR:=		font util
 PKG_SECTION:=		x11/apps
 PKG_URL:=		http://www.x.org/
 PKG_SITES:=		${MASTER_SITE_XORG}
-PKG_OPTS:=		dev
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,FONT_UTIL,font-util,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+$(eval $(call PKG_template,FONT_UTIL,font-util,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 # XXX: Push the mapping files to a place where we can find them
 # again when compiling the actual fonts. This is ugly as hell,

package/font-xfree86-type1/Makefile

@@ -17,9 +17,9 @@ PKG_HOST_DEPENDS:=      !netbsd !openbsd !cygwin !freebsd !mirbsd
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,FONT_XFREE86_TYPE1,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,FONT_XFREE86_TYPE1,font-xfree86-type1,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-post-install:
+font-xfree86-type1-install:
 	$(INSTALL_DIR) $(IDIR_FONT_XFREE86_TYPE1)/usr/share/fonts/X11/Type1
 	$(CP) ${WRKINST}/usr/share/fonts/X11/Type1/* \
 		$(IDIR_FONT_XFREE86_TYPE1)/usr/share/fonts/X11/Type1

package/fping/Makefile

@@ -16,9 +16,9 @@ DISTFILES:=		${PKG_NAME}.tar.gz
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,FPING,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,FPING,fping,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-post-install:
+fping-install:
 	${INSTALL_DIR} ${IDIR_FPING}/usr/sbin
 	${INSTALL_BIN} ${WRKINST}/usr/sbin/fping ${IDIR_FPING}/usr/sbin/
 

package/fprobe-ulog/Makefile

@@ -22,7 +22,7 @@ CONFIGURE_ARGS+=	--with-piddir=/var \
 			--with-membulk=index8 \
 			--with-hash=xor8
 
-post-install:
+fprobe-ulog-install:
 	${INSTALL_DIR} ${IDIR_FPROBE_ULOG}/usr/sbin
 	${INSTALL_BIN} ${WRKINST}/usr/sbin/fprobe-ulog \
 		${IDIR_FPROBE_ULOG}/usr/sbin/

package/fprobe/Makefile

@@ -17,7 +17,7 @@ DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,FPROBE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,FPROBE,fprobe,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_ARGS+=	--with-piddir=/var \
 			--with-pcap=${STAGING_TARGET_DIR}/usr/include \
@@ -25,7 +25,7 @@ CONFIGURE_ARGS+=	--with-piddir=/var \
 			--with-membulk=index8 \
 			--with-hash=xor8 \
 
-post-install:
+fprobe-install:
 	${INSTALL_DIR} ${IDIR_FPROBE}/usr/sbin
 	${INSTALL_BIN} ${WRKINST}/usr/sbin/fprobe ${IDIR_FPROBE}/usr/sbin/
 

package/freeglut/Makefile

@@ -7,21 +7,22 @@ PKG_NAME:=		freeglut
 PKG_VERSION:=		2.6.0
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		39f0f2de89f399529d2b981188082218
-PKG_DESCR:=		OpenGL Utility Toolkit
+PKG_DESCR:=		OpenGL Utility Toolkit libraries
 PKG_SECTION:=		libs
 PKG_BUILDDEP:=		MesaLib
 PKG_URL:=		http://freeglut.sourceforge.net/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=freeglut/}
 PKG_NEED_CXX:=		1
+PKG_OPTS:=		dev
 
 PKG_HOST_DEPENDS:=	!cygwin
 PKG_ARCH_DEPENDS:=	x86 x86_64 mips mipsel mips64 mips64el
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,FREEGLUT,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,FREEGLUT,freeglut,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}${PKG_OPTS}))
 
-post-install:
+freeglut-install:
 	$(INSTALL_DIR) $(IDIR_FREEGLUT)/usr/lib
 	$(CP) ${WRKINST}/usr/lib/libglut.so* $(IDIR_FREEGLUT)/usr/lib
 

package/freeradius-client/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		freeradius-client
 PKG_VERSION:=		1.1.6
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		edd4d904e802ff66d35532be1475cfa7
 PKG_DESCR:=		RADIUS client
 PKG_SECTION:=		ppp
@@ -15,23 +15,25 @@ PKG_URL:=		http://www.freeradius.org/
 PKG_SITES:=		ftp://ftp.freeradius.org/pub/radius/
 
 PKG_SUBPKGS:=		FREERADIUS_CLIENT LIBFREERADIUS_CLIENT
-PKG_SECTION_LIB:=	libs
+PKGSS_LIBFREERADIUS_CLIENT:=	libs
 
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,FREERADIUS_CLIENT,freeradius-client,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBFREERADIUS_CLIENT,libfreeradius-client,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION_LIB}))
+$(eval $(call PKG_template,LIBFREERADIUS_CLIENT,libfreeradius-client,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKGSS_LIBFREERADIUS_CLIENT}))
 
 TARGET_CFLAGS:=         $(filter-out -flto,$(TARGET_CFLAGS))
 CONFIGURE_ENV+=		ac_cv_func_uname=no
 
-post-install:
+freeradius-client-install:
 	${INSTALL_DIR} ${IDIR_FREERADIUS_CLIENT}/usr/sbin
 	${INSTALL_BIN} ${WRKINST}/usr/sbin/radiusclient \
 		${IDIR_FREERADIUS_CLIENT}/usr/sbin
 	${INSTALL_BIN} ${WRKINST}/usr/sbin/rad{login,status} \
 		${IDIR_FREERADIUS_CLIENT}/usr/sbin
 	${CP} ${WRKINST}/etc ${IDIR_FREERADIUS_CLIENT}/
+
+libfreeradius-client-install:
 	${INSTALL_DIR} ${IDIR_LIBFREERADIUS_CLIENT}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libfreeradius-client.so* \
 		${IDIR_LIBFREERADIUS_CLIENT}/usr/lib

package/freeradius-server/Makefile

@@ -91,7 +91,7 @@ ${2}-install:
 	done
 endef
 
-$(eval $(call PKG_template,FREERADIUS_SERVER,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,FREERADIUS_SERVER,freeradius-server,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,FREERADIUS_DEMOCERTS,freeradius-democerts,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_FREERADIUS_DEMOCERTS},${PKG_SECTION}))
 $(eval $(call PKG_template,FREERADIUS_MOD_CHAP,freeradius-mod-chap,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_FREERADIUS_MOD_CHAP},${PKG_SECTION}))
 $(eval $(call PKG_template,FREERADIUS_MOD_DETAIL,freeradius-mod-detail,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_FREERADIUS_MOD_DETAIL},${PKG_SECTION}))

package/fribidi/Makefile

@@ -5,18 +5,19 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		fribidi
 PKG_VERSION:=		0.19.5
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		925bafb97afee8a2fc2d0470c072a155
 PKG_DESCR:=		Unicode Bidirectional Algorithm
 PKG_SECTION:=		libs
 PKG_URL:=		http://www.fribidi.org/
 PKG_SITES:=		http://fribidi.org/download/
+PKG_OPTS:=		dev
 
 DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,FRIBIDI,fribidi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,FRIBIDI,fribidi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 fribidi-install:
 	$(INSTALL_DIR) $(IDIR_FRIBIDI)/usr/lib

package/frickin/Makefile

@@ -14,7 +14,7 @@ PKG_NOPARALLEL:=	1
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,FRICKIN,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,FRICKIN,frickin,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIG_STYLE:=		manual
 INSTALL_STYLE:=		manual

package/fuse/Makefile

@@ -19,6 +19,10 @@ PKG_SUBPKGS:=		FUSE_UTILS LIBFUSE
 PKGSD_LIBFUSE:=		FUSE library
 PKGSC_LIBFUSE:=		libs
 
+ifeq ($(ADK_STATIC),y)
+PKG_OPTS+=		libmix
+endif
+
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,FUSE_UTILS,fuse-utils,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))

package/gatling/Makefile

@@ -18,7 +18,7 @@ DISTFILES=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,GATLING,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,GATLING,gatling,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIG_STYLE:=		manual
 INSTALL_STYLE:=		manual