summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
Diffstat (limited to 'package')
-rw-r--r--package/aufs-util/Makefile26
-rw-r--r--package/capi4k-utils/Makefile37
-rw-r--r--package/crda/Makefile33
-rw-r--r--package/elfutils/Makefile32
-rw-r--r--package/hwids/Makefile26
-rw-r--r--package/i2400m-fw/Makefile11
-rw-r--r--package/inotify-tools/Makefile28
-rw-r--r--package/ipmitool/Makefile18
-rw-r--r--package/ipmitool/patches/patch-configure71
-rw-r--r--package/libpcap/Makefile4
-rw-r--r--package/libqmi/Makefile14
-rw-r--r--package/libqmi/patches/patch-configure_ac12
-rw-r--r--package/mISDN/Makefile27
-rw-r--r--package/mISDNuser/Makefile19
-rw-r--r--package/newt/Makefile21
-rw-r--r--package/oprofile/Makefile3
-rw-r--r--package/perf/Makefile30
-rw-r--r--package/slang/Makefile36
-rw-r--r--package/stats/Makefile11
-rw-r--r--package/stats/patches/patch-Makefile21
-rw-r--r--package/supl/Makefile21
-rw-r--r--package/supl/patches/patch-configure11
-rw-r--r--package/tcptrace/Makefile13
-rw-r--r--package/tcptrace/patches/patch-Makefile_in13
-rw-r--r--package/wireless-regdb/Makefile18
25 files changed, 274 insertions, 282 deletions
diff --git a/package/aufs-util/Makefile b/package/aufs-util/Makefile
index e00b5bdde..fc57c7bb6 100644
--- a/package/aufs-util/Makefile
+++ b/package/aufs-util/Makefile
@@ -7,38 +7,38 @@ PKG_NAME:= aufs-util
# branch aufs3.x-rcN (of around June 6th, 2014)
PKG_VERSION:= a0eb20c75c07299bfc50c3d80023e1d22c86b4cc
PKG_RELEASE:= 1
-PKG_HASH:= asdf
PKG_DESCR:= aufs utilities (version 3 and above)
PKG_SECTION:= sys/fs
PKG_URL:= http://aufs.sf.net/
PKG_SITES:= git://aufs.git.sourceforge.net/gitroot/aufs/aufs-util
-PKG_HOST_DEPENDS:= !cygwin !freebsd !openbsd !netbsd
-
PKG_SUBPKGS:= AUFS_UTIL LIBAU
PKGSD_LIBAU:= aufs userspace library
+PKGSC_LIBAU:= libs/misc
include $(ADK_TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,AUFS_UTIL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBAU,libau,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBAU},${PKG_SECTION}))
+$(eval $(call PKG_template,AUFS_UTIL,$(PKG_NAME),$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
+$(eval $(call PKG_template,LIBAU,libau,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKGSD_LIBAU),$(PKGSC_LIBAU)))
CONFIG_STYLE:= manual
XAKE_FLAGS+= Install=install \
- HOSTCC="${HOST_CC}" \
- CPPFLAGS_FOR_BUILD="-I${STAGING_TARGET_DIR}/usr/include -I./libau"
+ HOSTCC="$(HOST_CC)" \
+ CPPFLAGS_FOR_BUILD="-I$(STAGING_TARGET_DIR)/usr/include -I./libau"
-post-install:
+aufs-util-install:
$(INSTALL_DIR) $(IDIR_AUFS_UTIL)/sbin
- $(INSTALL_BIN) ${WRKINST}/sbin/{{u,}mount.aufs,auplink} \
+ $(INSTALL_BIN) $(WRKINST)/sbin/{{u,}mount.aufs,auplink} \
$(IDIR_AUFS_UTIL)/sbin
$(INSTALL_DIR) $(IDIR_AUFS_UTIL)/usr/bin
- $(INSTALL_BIN) ${WRKINST}/usr/bin/au{brsync,chk} \
+ $(INSTALL_BIN) $(WRKINST)/usr/bin/au{brsync,chk} \
$(IDIR_AUFS_UTIL)/usr/bin
$(INSTALL_DIR) $(IDIR_AUFS_UTIL)/etc/default
- $(INSTALL_DATA) ${WRKINST}/etc/default/aufs \
+ $(INSTALL_DATA) $(WRKINST)/etc/default/aufs \
$(IDIR_AUFS_UTIL)/etc/default
+
+libau-install:
$(INSTALL_DIR) $(IDIR_LIBAU)/usr/lib
- ${CP} ${WRKINST}/usr/lib/libau* ${IDIR_LIBAU}/usr/lib
+ $(CP) $(WRKINST)/usr/lib/libau* $(IDIR_LIBAU)/usr/lib
-include ${ADK_TOPDIR}/mk/pkg-bottom.mk
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk
diff --git a/package/capi4k-utils/Makefile b/package/capi4k-utils/Makefile
index 8363c4b33..0ac58e978 100644
--- a/package/capi4k-utils/Makefile
+++ b/package/capi4k-utils/Makefile
@@ -6,42 +6,43 @@ include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= capi4k-utils
PKG_VERSION:= 2005-07-18
PKG_RELEASE:= 1
-PKG_MD5SUM:= c745759b6b3d64e19763727176648cdf
-PKG_DESCR:= CAPI4Linux Utils
+PKG_HASH:= b162d726a31310fc29e7c0a25a4f82a590457f6a95c1b1168bcd72b6497b5746
+PKG_DESCR:= capi4linux utils
PKG_SECTION:= net/voip
-PKG_URL:= ftp://ftp.in-berlin.de/pub/capi4linux/
PKG_SITES:= ftp://ftp.in-berlin.de/pub/capi4linux/
-WRKDIST= ${WRKDIR}/${PKG_NAME}
+
+PKG_CFLINE_CAPI4K_UTILS:=depends on ADK_BROKEN
+
+DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz
+WRKDIST= $(WRKDIR)/$(PKG_NAME)
include $(ADK_TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,CAPI4K_UTILS,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,CAPI4K_UTILS,capi4k-utils,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
CONFIG_STYLE:= manual
XAKE_FLAGS+= PPPVERSIONS=2.4.5
do-configure:
- echo "CONFIG_KERNELDIR='${LINUX_DIR}'" >${WRKDIST}/.config
- echo "CONFIG_BINDIR='/usr/bin'" >>${WRKDIST}/.config
- echo "CONFIG_SBINDIR='/usr/sbin'" >>${WRKDIST}/.config
- echo "CONFIG_MANDIR='/usr/man'" >>${WRKDIST}/.config
- #echo "CONFIG_AVMCAPICTRL=y" >>${WRKDIST}/.config
- #echo "CONFIG_CAPIFAX=y" >>${WRKDIST}/.config
- echo "CONFIG_RCAPID=y" >>${WRKDIST}/.config
- echo "CONFIG_PPPDCAPIPLUGIN=y" >>${WRKDIST}/.config
- (cd ${WRKDIST}; \
+ echo "CONFIG_KERNELDIR='$(LINUX_DIR)'" >$(WRKDIST)/.config
+ echo "CONFIG_BINDIR='/usr/bin'" >>$(WRKDIST)/.config
+ echo "CONFIG_SBINDIR='/usr/sbin'" >>$(WRKDIST)/.config
+ echo "CONFIG_MANDIR='/usr/man'" >>$(WRKDIST)/.config
+ echo "CONFIG_RCAPID=y" >>$(WRKDIST)/.config
+ echo "CONFIG_PPPDCAPIPLUGIN=y" >>$(WRKDIST)/.config
+ (cd $(WRKDIST); \
cp Makefile Makefile.tmp; \
- ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} -f Makefile.tmp subconfig; \
+ $(MAKE_ENV) $(MAKE) $(MAKE_FLAGS) -f Makefile.tmp subconfig; \
rm -f Makefile.tmp; \
)
-post-install:
+capi4k-utils-install:
$(INSTALL_DIR) $(IDIR_CAPI4K_UTILS)/usr/{bin,lib/pppd/2.4.5}
$(INSTALL_BIN) $(WRKINST)/usr/bin/capiinfo \
$(IDIR_CAPI4K_UTILS)/usr/bin
- ${CP} $(WRKINST)/usr/lib/libcapi20.so* \
+ $(CP) $(WRKINST)/usr/lib/libcapi20.so* \
$(IDIR_CAPI4K_UTILS)/usr/lib
$(INSTALL_DATA) $(WRKINST)/usr/lib/pppd/2.4.5/*.so \
$(IDIR_CAPI4K_UTILS)/usr/lib/pppd/2.4.5
-include ${ADK_TOPDIR}/mk/pkg-bottom.mk
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk
diff --git a/package/crda/Makefile b/package/crda/Makefile
index e7486dffb..2b1d3a09f 100644
--- a/package/crda/Makefile
+++ b/package/crda/Makefile
@@ -4,25 +4,26 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= crda
-PKG_VERSION:= 1.1.2
+PKG_VERSION:= 1.1.3
PKG_RELEASE:= 1
-PKG_MD5SUM:= 5226f65aebacf94baaf820f8b4e06df4
-PKG_DESCR:= Central Regulatory Domain Agent for wireless networks
+PKG_HASH:= aa8a7fe92f0765986c421a5b6768a185375ac210393df0605ee132f6754825f0
+PKG_DESCR:= central regulatory domain agent for wireless networks
PKG_SECTION:= net/wifi
PKG_DEPENDS:= libnl
PKG_BUILDDEP:= libnl
PKG_URL:= http://wireless.kernel.org/en/developers/Regulatory
PKG_SITES:= http://linuxwireless.org/download/crda/
-DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
-PKG_FLAVOURS_CRDA:= WITH_UDEV
-PKGFD_WITH_UDEV:= install shipped UDEV rules
+DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.bz2
+
+PKG_FLAVOURS_CRDA:= WITH_UDEV
+PKGFD_WITH_UDEV:= install shipped udev rules
PKGFS_WITH_UDEV:= udev
-PKGFB_WITH_UDEV:= udev
+PKGFB_WITH_UDEV:= eudev
PKG_CHOICES_CRDA:= WITH_OPENSSL WITH_GCRYPT
-PKGCD_WITH_OPENSSL:= SSL support via OpenSSL library
-PKGCD_WITH_GCRYPT:= SSL support via GCRYPT library
+PKGCD_WITH_OPENSSL:= ssl support via openssl library
+PKGCD_WITH_GCRYPT:= ssl support via gcrypt library
PKGCB_WITH_OPENSSL:= openssl
PKGCB_WITH_GCRYPT:= libgcrypt
PKGCS_WITH_OPENSSL:= libopenssl
@@ -30,23 +31,23 @@ PKGCS_WITH_GCRYPT:= libgcrypt
include $(ADK_TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,CRDA,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,CRDA,crda,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
CONFIG_STYLE:= manual
ALL_TARGET:= all_noverify
-ifneq (${ADK_PACKAGE_CRDA_WITH_OPENSSL},)
+ifneq ($(ADK_PACKAGE_CRDA_WITH_OPENSSL),)
XAKE_FLAGS+= USE_OPENSSL=1
endif
-post-install:
+crda-install:
$(INSTALL_DIR) $(IDIR_CRDA)/usr/sbin
$(INSTALL_BIN) $(WRKINST)/sbin/{crda,regdbdump} \
$(IDIR_CRDA)/usr/sbin
-ifneq (${ADK_PACKAGE_CRDA_WITH_UDEV},)
+ifneq ($(ADK_PACKAGE_CRDA_WITH_UDEV),)
$(INSTALL_DIR) $(IDIR_CRDA)/lib/udev/rules.d
- ${INSTALL_DATA} ${WRKINST}/lib/udev/rules.d/85-regulatory.rules \
- ${IDIR_CRDA}/lib/udev/rules.d
+ $(INSTALL_DATA) $(WRKINST)/lib/udev/rules.d/85-regulatory.rules \
+ $(IDIR_CRDA)/lib/udev/rules.d
endif
-include ${ADK_TOPDIR}/mk/pkg-bottom.mk
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk
diff --git a/package/elfutils/Makefile b/package/elfutils/Makefile
index 9e864b808..825ab10eb 100644
--- a/package/elfutils/Makefile
+++ b/package/elfutils/Makefile
@@ -7,27 +7,31 @@ PKG_NAME:= elfutils
PKG_VERSION:= 0.161
PKG_RELEASE:= 1
PKG_HASH:= 570c91a1783fa5386aaa2dfdd08dda1de777c2b63bf3b9c1437d635ffdd7a070
-PKG_DESCR:= Libraries/utilities to handle ELF objects (drop in replacement for libelf)
+PKG_DESCR:= libraries/utilities to handle elf objects (drop in replacement for libelf)
PKG_SECTION:= base/libs
PKG_URL:= https://fedorahosted.org/elfutils/
-PKG_SITES:= https://fedorahosted.org/releases/e/l/elfutils/${PKG_VERSION}/
-DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
+PKG_SITES:= https://fedorahosted.org/releases/e/l/elfutils/$(PKG_VERSION)/
+
+# require argp()
+PKG_LIBC_DEPENDS:= glibc
+
+DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.bz2
include $(ADK_TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,ELFUTILS,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,ELFUTILS,elfutils,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
# not only because we pass -DNDEBUG, this package won't build with -Werror
TARGET_CFLAGS+= -Wno-error
-post-install:
+elfutils-install:
$(INSTALL_DIR) $(IDIR_ELFUTILS)/usr/lib/elfutils
- ${CP} ${WRKINST}/usr/lib/lib{asm,dw,elf}*.so* \
- ${IDIR_ELFUTILS}/usr/lib
- ${CP} ${WRKINST}/usr/lib/elfutils/libebl*.so \
- ${IDIR_ELFUTILS}/usr/lib/elfutils
- ${INSTALL_DIR} ${IDIR_ELFUTILS}/usr/bin
- ${INSTALL_BIN} ${WRKINST}/usr/bin/* \
- ${IDIR_ELFUTILS}/usr/bin
-
-include ${ADK_TOPDIR}/mk/pkg-bottom.mk
+ $(CP) $(WRKINST)/usr/lib/lib{asm,dw,elf}*.so* \
+ $(IDIR_ELFUTILS)/usr/lib
+ $(CP) $(WRKINST)/usr/lib/elfutils/libebl*.so \
+ $(IDIR_ELFUTILS)/usr/lib/elfutils
+ $(INSTALL_DIR) $(IDIR_ELFUTILS)/usr/bin
+ $(INSTALL_BIN) $(WRKINST)/usr/bin/* \
+ $(IDIR_ELFUTILS)/usr/bin
+
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk
diff --git a/package/hwids/Makefile b/package/hwids/Makefile
index e17c08b31..ceeca3a72 100644
--- a/package/hwids/Makefile
+++ b/package/hwids/Makefile
@@ -7,28 +7,28 @@ PKG_NAME:= hwids
PKG_VERSION:= 20150129
PKG_RELEASE:= 1
PKG_HASH:= 33a7f4dbf14704076b0fe1d0052e86bb618e386a1ff18107097311df44f979d7
-PKG_DESCR:= Combined repository of pci.ids and usb.ids
+PKG_DESCR:= combined repository of pci.ids and usb.ids
PKG_SECTION:= sys/hw
PKG_URL:= https://github.com/gentoo/hwids
PKG_SITES:= https://github.com/gentoo/hwids/archive/
-DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
+DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz
# typical problem of having tags like '<name>-<version>' in github
-WRKDIST= ${WRKDIR}/${PKG_NAME}-${PKG_NAME}-${PKG_VERSION}
+WRKDIST= $(WRKDIR)/$(PKG_NAME)-$(PKG_NAME)-$(PKG_VERSION)
PKG_SUBPKGS:= HWIDS_NET HWIDS_PCI HWIDS_USB
PKGSD_HWIDS_NET:= HWIDS files oui.txt and iab.txt
PKGSD_HWIDS_PCI:= HWIDS file pci.ids
PKGSD_HWIDS_USB:= HWIDS file usb.ids
-PKG_FLAVOURS_PKGNAME:= WITH_GZIP
+PKG_FLAVOURS_HWIDS:= WITH_GZIP
PKGFD_WITH_GZIP:= gzip pci.ids and usb.ids before installation
include $(ADK_TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,HWIDS_NET,hwids-net,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_HWIDS_NET},${PKG_SECTION}))
-$(eval $(call PKG_template,HWIDS_PCI,hwids-pci,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_HWIDS_PCI},${PKG_SECTION}))
-$(eval $(call PKG_template,HWIDS_USB,hwids-usb,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_HWIDS_USB},${PKG_SECTION}))
+$(eval $(call PKG_template,HWIDS_NET,hwids-net,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKGSD_HWIDS_NET),$(PKG_SECTION)))
+$(eval $(call PKG_template,HWIDS_PCI,hwids-pci,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKGSD_HWIDS_PCI),$(PKG_SECTION)))
+$(eval $(call PKG_template,HWIDS_USB,hwids-usb,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKGSD_HWIDS_USB),$(PKG_SECTION)))
CONFIG_STYLE:= manual
XAKE_FLAGS+= NET=yes \
@@ -38,19 +38,19 @@ XAKE_FLAGS+= NET=yes \
# note: Can't pass GZIP=yes to make, as this will turn it
# into an env var automatically which makes gzip trip.
# Therefore assume here that GZIP=yes is the default.
-ifneq (${ADK_PACKAGE_HWIDS_WITH_GZIP},y)
+ifneq ($(ADK_PACKAGE_HWIDS_WITH_GZIP),y)
XAKE_FLAGS+= GZIP=no
endif
define HWIDS_INSTALL_template
$(2)-install:
- $${INSTALL_DIR} $${IDIR_$(1)}/usr/share/misc
- $${INSTALL_DATA} $$(patsubst %,$${WRKINST}/usr/share/misc/%,$(3)) \
- $${IDIR_$(1)}/usr/share/misc/
+ $$(INSTALL_DIR) $$(IDIR_$(1))/usr/share/misc
+ $$(INSTALL_DATA) $$(patsubst %,$$(WRKINST)/usr/share/misc/%,$(3)) \
+ $$(IDIR_$(1))/usr/share/misc/
endef
$(eval $(call HWIDS_INSTALL_template,HWIDS_NET,hwids-net,oui.txt iab.txt))
-ifeq (${ADK_PACKAGE_HWIDS_WITH_GZIP},y)
+ifeq ($(ADK_PACKAGE_HWIDS_WITH_GZIP),y)
$(eval $(call HWIDS_INSTALL_template,HWIDS_PCI,hwids-pci,pci.ids.gz))
$(eval $(call HWIDS_INSTALL_template,HWIDS_USB,hwids-usb,usb.ids.gz))
else
@@ -58,4 +58,4 @@ $(eval $(call HWIDS_INSTALL_template,HWIDS_PCI,hwids-pci,pci.ids))
$(eval $(call HWIDS_INSTALL_template,HWIDS_USB,hwids-usb,usb.ids))
endif
-include ${ADK_TOPDIR}/mk/pkg-bottom.mk
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk
diff --git a/package/i2400m-fw/Makefile b/package/i2400m-fw/Makefile
index ff2ab45af..85aef1ecd 100644
--- a/package/i2400m-fw/Makefile
+++ b/package/i2400m-fw/Makefile
@@ -7,15 +7,16 @@ PKG_NAME:= i2400m-fw
PKG_VERSION:= 1.5.0
PKG_RELEASE:= 1
PKG_HASH:= edcb7c5322c0185173a2dc79b3df4bc74964edfa741ebf9a09cd70a32d758c3d
-PKG_DESCR:= Intel (R) WiMAX 5150/5350/6250 Firmware
-PKG_SECTION:= net/misc
+PKG_DESCR:= intel (R) wimax 5150/5350/6250 firmware
+PKG_SECTION:= sys/firmware
PKG_URL:= http://www.linuxwimax.org
PKG_SITES:= "http://www.linuxwimax.org/Download?action=AttachFile&do=get&target="
-DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
+
+DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.bz2
include $(ADK_TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,I2400M_FW,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,I2400M_FW,i2400m-fw,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
CONFIG_STYLE:= manual
BUILD_STYLE:= manual
@@ -26,4 +27,4 @@ do-install:
$(INSTALL_DATA) $(WRKDIST)/*-fw-usb-*.sbcf \
$(IDIR_I2400M_FW)/lib/firmware/
-include ${ADK_TOPDIR}/mk/pkg-bottom.mk
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk
diff --git a/package/inotify-tools/Makefile b/package/inotify-tools/Makefile
index a5c0773c8..82ea714d4 100644
--- a/package/inotify-tools/Makefile
+++ b/package/inotify-tools/Makefile
@@ -6,30 +6,36 @@ include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= inotify-tools
PKG_VERSION:= 3.14
PKG_RELEASE:= 1
-PKG_MD5SUM:= b43d95a0fa8c45f8bab3aec9672cf30c
-PKG_DESCR:= Command line programs providing a simple interface to inotify
+PKG_HASH:= 222bcca8893d7bf8a1ce207fb39ceead5233b5015623d099392e95197676c92f
+PKG_DESCR:= command line programs providing a simple interface to inotify
PKG_SECTION:= sys/fs
PKG_URL:= https://github.com/rvoicilas/inotify-tools/wiki
PKG_SITES:= http://github.com/downloads/rvoicilas/inotify-tools/
+DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz
+
PKG_SUBPKGS:= INOTIFYWAIT INOTIFYWATCH LIBINOTIFYTOOLS
-PKGSC_LIBINOTIFYTOOLS:= libs/fs
-PKGSD_INOTIFYWAIT:= Wait for changes to files using inotify
-PKGSD_INOTIFYWATCH:= Gather filesystem access statistics using inotify
-PKGSD_LIBINOTIFYTOOLS:= Inotify tools library
+PKGSC_LIBINOTIFYTOOLS:= libs/misc
+PKGSD_INOTIFYWAIT:= wait for changes to files using inotify
+PKGSD_INOTIFYWATCH:= gather filesystem access statistics using inotify
+PKGSD_LIBINOTIFYTOOLS:= inotify tools library
include $(ADK_TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,INOTIFYWAIT,inotifywait,$(PKG_VERSION)-${PKG_RELEASE},libinotifytools,${PKGSD_INOTIFYWAIT},${PKG_SECTION}))
-$(eval $(call PKG_template,INOTIFYWATCH,inotifywatch,$(PKG_VERSION)-${PKG_RELEASE},libinotifytools,${PKGSD_INOTIFYWATCH},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBINOTIFYTOOLS,libinotifytools,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBINOTIFYTOOLS},${PKGSC_LIBINOTIFYTOOLS}))
+$(eval $(call PKG_template,INOTIFYWAIT,inotifywait,$(PKG_VERSION)-$(PKG_RELEASE),libinotifytools,$(PKGSD_INOTIFYWAIT),$(PKG_SECTION)))
+$(eval $(call PKG_template,INOTIFYWATCH,inotifywatch,$(PKG_VERSION)-$(PKG_RELEASE),libinotifytools,$(PKGSD_INOTIFYWATCH),$(PKG_SECTION)))
+$(eval $(call PKG_template,LIBINOTIFYTOOLS,libinotifytools,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKGSD_LIBINOTIFYTOOLS),$(PKGSC_LIBINOTIFYTOOLS)))
-post-install:
+inotifywait-install:
$(INSTALL_DIR) $(IDIR_INOTIFYWAIT)/usr/bin
$(INSTALL_BIN) $(WRKINST)/usr/bin/inotifywait $(IDIR_INOTIFYWAIT)/usr/bin
+
+inotifywatch-install:
$(INSTALL_DIR) $(IDIR_INOTIFYWATCH)/usr/bin
$(INSTALL_BIN) $(WRKINST)/usr/bin/inotifywatch $(IDIR_INOTIFYWATCH)/usr/bin
+
+libinotifytools-install:
$(INSTALL_DIR) $(IDIR_LIBINOTIFYTOOLS)/usr/lib
$(CP) $(WRKINST)/usr/lib/libinotifytools.so* $(IDIR_LIBINOTIFYTOOLS)/usr/lib
-include ${ADK_TOPDIR}/mk/pkg-bottom.mk
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk
diff --git a/package/ipmitool/Makefile b/package/ipmitool/Makefile
index 8018b4d93..2fec3dd77 100644
--- a/package/ipmitool/Makefile
+++ b/package/ipmitool/Makefile
@@ -4,21 +4,25 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= ipmitool
-PKG_VERSION:= 1.8.11
+PKG_VERSION:= 1.8.15
PKG_RELEASE:= 1
-PKG_MD5SUM:= 0f9b4758c2b7e8a7bafc2ead113b4bc6
-PKG_DESCR:= Utility for controlling IPMI enabled devices.
+PKG_HASH:= f0964e644a8e693932a3e8da6929d5598ed24645bacd51fbb1a4a09b5e47cf78
+PKG_DESCR:= utility for controlling ipmi enabled devices
PKG_SECTION:= net/misc
PKG_URL:= http://ipmitool.sf.net/
-PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=ipmitool/}
+PKG_SITES:= $(MASTER_SITE_SOURCEFORGE:=ipmitool/)
+
+DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz
include $(ADK_TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,IPMITOOL,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,IPMITOOL,ipmitool,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
+
+CONFIGURE_ENV+= ac_cv_func_malloc_0_nonnull=yes
-post-install:
+ipmitool-install:
$(INSTALL_DIR) $(IDIR_IPMITOOL)/usr/bin
$(INSTALL_BIN) $(WRKINST)/usr/bin/ipmitool \
$(IDIR_IPMITOOL)/usr/bin
-include ${ADK_TOPDIR}/mk/pkg-bottom.mk
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk
diff --git a/package/ipmitool/patches/patch-configure b/package/ipmitool/patches/patch-configure
deleted file mode 100644
index 1abeed4ad..000000000
--- a/package/ipmitool/patches/patch-configure
+++ /dev/null
@@ -1,71 +0,0 @@
- enable configure to run despite $cross_compiling
---- ipmitool-1.8.11.orig/configure 2009-02-25 22:21:56.000000000 +0100
-+++ ipmitool-1.8.11/configure 2013-03-12 15:58:58.896054409 +0100
-@@ -24311,67 +24311,6 @@ _ACEOF
- fi;
-
-
--if test "$cross_compiling" = yes; then
-- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&5
--echo "$as_me: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }
--else
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--
-- #include <stdio.h>
--
-- struct packstruct {
-- unsigned char t0 :5;
-- unsigned char t1 :5;
-- unsigned char t2 :5;
-- unsigned char t3 :5;
-- unsigned char t4 :4;
-- } __attribute__ ((packed));
--
-- int
-- main(int argc, char ** argv)
-- {
-- if(sizeof(struct packstruct) != 3)
-- return(1);
-- else
-- return(0);
-- }
--
--_ACEOF
--rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- :
--else
-- echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--( exit $ac_status )
--
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_PRAGMA_PACK 1
--_ACEOF
--
--
--fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
--fi
-
-
- ac_config_files="$ac_config_files Makefile doc/Makefile contrib/Makefile control/Makefile control/pkginfo control/prototype control/rpmmacros control/ipmitool.spec lib/Makefile include/Makefile include/ipmitool/Makefile src/Makefile src/plugins/Makefile src/plugins/lan/Makefile src/plugins/lanplus/Makefile src/plugins/open/Makefile src/plugins/free/Makefile src/plugins/imb/Makefile src/plugins/bmc/Makefile src/plugins/lipmi/Makefile"
diff --git a/package/libpcap/Makefile b/package/libpcap/Makefile
index 806c3e2d7..618b04d21 100644
--- a/package/libpcap/Makefile
+++ b/package/libpcap/Makefile
@@ -6,7 +6,7 @@ include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= libpcap
PKG_VERSION:= 1.6.2
PKG_RELEASE:= 1
-PKG_HASH:= 116cbb3ac9e96d5dd7b39638a2f894a67fa3dcf06d794e6dae2b9a942ad13476
+PKG_HASH:= 5db3e2998f1eeba2c76da55da5d474248fe19c44f49e15cac8a796a2c7e19690
PKG_DESCR:= low-level packet capture library
PKG_SECTION:= libs/net
PKG_URL:= http://www.tcpdump.org/
@@ -22,9 +22,9 @@ include $(ADK_TOPDIR)/mk/package.mk
$(eval $(call PKG_template,LIBPCAP,libpcap,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+XAKE_FLAGS+= GCC_HONOUR_COPTS=s
CONFIGURE_ENV+= ac_cv_linux_vers=26
CONFIGURE_ARGS+= --disable-yydebug \
- --with-build-cc=$(CC_FOR_BUILD) \
--disable-dbus \
--without-libnl \
--with-pcap=linux
diff --git a/package/libqmi/Makefile b/package/libqmi/Makefile
index 236f4a102..8f041d2ae 100644
--- a/package/libqmi/Makefile
+++ b/package/libqmi/Makefile
@@ -7,24 +7,24 @@ PKG_NAME:= libqmi
PKG_VERSION:= 1.12.4
PKG_RELEASE:= 1
PKG_HASH:= 5527342bc869400d2a9c3038d66ec8ef87980aefb6c7aae593a13ebfee686a15
-PKG_DESCR:= QMI modem protocol helper library
+PKG_DESCR:= qmi modem protocol helper library
PKG_SECTION:= libs/net
PKG_DEPENDS:= glib
PKG_BUILDDEP:= glib
PKG_URL:= http://cgit.freedesktop.org/libqmi/
PKG_SITES:= http://cgit.freedesktop.org/libqmi/snapshot/
+PKG_OPTS:= dev
include $(ADK_TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,LIBQMI,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBQMI,libqmi,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS)))
-pre-configure:
- (cd ${WRKDIST}; ./autogen.sh)
+AUTOTOOL_STYLE:= autogen
-post-install:
+libqmi-install:
$(INSTALL_DIR) $(IDIR_LIBQMI)/usr/{bin,lib}
$(INSTALL_BIN) $(WRKINST)/usr/bin/qmi{-network,cli} \
$(IDIR_LIBQMI)/usr/bin
- ${CP} ${WRKINST}/usr/lib/libqmi-glib.so* ${IDIR_LIBQMI}/usr/lib/
+ $(CP) $(WRKINST)/usr/lib/libqmi-glib.so* $(IDIR_LIBQMI)/usr/lib/
-include ${ADK_TOPDIR}/mk/pkg-bottom.mk
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk
diff --git a/package/libqmi/patches/patch-configure_ac b/package/libqmi/patches/patch-configure_ac
new file mode 100644
index 000000000..37f519c4e
--- /dev/null
+++ b/package/libqmi/patches/patch-configure_ac
@@ -0,0 +1,12 @@
+--- libqmi-1.12.4.orig/configure.ac 2015-02-10 17:31:06.000000000 +0100
++++ libqmi-1.12.4/configure.ac 2015-02-27 22:15:42.000000000 +0100
+@@ -76,9 +76,6 @@ AC_SUBST(GLIB_LIBS)
+ GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
+ AC_SUBST(GLIB_MKENUMS)
+
+-dnl Documentation
+-GTK_DOC_CHECK(1.0)
+-
+ # QMI username
+ QMI_USERNAME="root"
+ AC_ARG_ENABLE(qmi-username,
diff --git a/package/mISDN/Makefile b/package/mISDN/Makefile
index 1741cbb8f..348f1da0d 100644
--- a/package/mISDN/Makefile
+++ b/package/mISDN/Makefile
@@ -6,31 +6,30 @@ include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= mISDN
PKG_VERSION:= 1_1_9_2
PKG_RELEASE:= 1
-PKG_MD5SUM:= f9ec111fcc40c9ef48fc1822317998be
-PKG_DESCR:= mISDN is the new ISDN stack of the linux kernel 2.6, this is the out-of-tree 1.X version
+PKG_HASH:= 9ff96d8361891b9a15cf6dbdb57214c36ca13702d5bf7c18ebe259ec5d876c09
+PKG_DESCR:= new isdn stack of the linux kernel
PKG_SECTION:= net/voip
PKG_URL:= http://www.misdn.org
PKG_SITES:= http://www.misdn.org/downloads/releases/
-DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
+
+PKG_CFLINE_MISDN:= depends on ADK_BROKEN
+
+DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz
include $(ADK_TOPDIR)/mk/kernel-ver.mk
include $(ADK_TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,MISDN,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,MISDN,misdn,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
CONFIG_STYLE:= manual
-XAKE_FLAGS+= LINUX=${LINUX_DIR} KVERS=${KERNEL_VERSION}
-FAKE_FLAGS+= INSTALL_PREFIX=${WRKINST}
-
-#do-configure:
-# $(SED) 's/CONFIG_MISDN_AVM_FRITZ=y/CONFIG_MISDN_AVM_FRITZ=n/' ${WRKDIR}/add.config
-# $(SED) 's/CONFIG_MISDN_AVM_FRITZ=y/CONFIG_MISDN_AVM_FRITZ=n/' ${WRKDIR}/add.config
+XAKE_FLAGS+= LINUX=$(LINUX_DIR) KVERS=$(KERNEL_VERSION)
+FAKE_FLAGS+= INSTALL_PREFIX=$(WRKINST)
-post-install:
+misdn-install:
$(INSTALL_DIR) $(IDIR_MISDN)/usr/sbin
$(INSTALL_BIN) $(WRKINST)/usr/sbin/{mISDN,misdn-init} \
$(IDIR_MISDN)/usr/sbin
- ${INSTALL_DIR} ${IDIR_MISDN}/lib
- mv ${WRKINST}/lib/modules ${IDIR_MISDN}/lib
+ $(INSTALL_DIR) $(IDIR_MISDN)/lib/modules
+ $(CP) $(WRKINST)/lib/modules/* $(IDIR_MISDN)/lib/modules/
-include ${ADK_TOPDIR}/mk/pkg-bottom.mk
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk
diff --git a/package/mISDNuser/Makefile b/package/mISDNuser/Makefile
index e4f2748ff..d840e2f24 100644
--- a/package/mISDNuser/Makefile
+++ b/package/mISDNuser/Makefile
@@ -7,26 +7,29 @@ PKG_NAME:= mISDNuser
PKG_VERSION:= 1_1_9
PKG_RELEASE:= 1
PKG_MD5SUM:= e174a60e7040c88d1184364714e55c1b
-PKG_DESCR:= mISDN (modular ISDN) kernel link library and includes, this is the out-of-tree 1.X version
+PKG_DESCR:= misdn kernel link library and includes, this is the out-of-tree version
PKG_SECTION:= net/voip
-PKG_DEPENDS:= mISDN
+PKG_DEPENDS:= misdn
PKG_BUILDDEP:= mISDN
PKG_URL:= http://www.misdn.org
PKG_SITES:= http://www.misdn.org/downloads/releases/
PKG_NOPARALLEL:= 1
+PKG_CFLINE_MISDNUSER:= depends on ADK_BROKEN
+
include $(ADK_TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,MISDNUSER,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,MISDNUSER,misdnuser,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
CONFIG_STYLE:= manual
-XAKE_FLAGS+= MISDNDIR=${STAGING_TARGET_DIR}/usr INSTALL_PREFIX=${WRKINST}
+XAKE_FLAGS+= MISDNDIR=$(STAGING_TARGET_DIR)/usr INSTALL_PREFIX=$(WRKINST)
-post-install:
+misdnuser-install:
$(INSTALL_DIR) $(IDIR_MISDNUSER)/usr/{bin,lib}
$(INSTALL_BIN) $(WRKINST)/usr/bin/{loadfirm,mISDNdebugtool,misdnportinfo} \
- ${WRKINST}/usr/bin/{sendhwctrl,testcon*,testlayer*} \
$(IDIR_MISDNUSER)/usr/bin/
- ${INSTALL_DATA} ${WRKINST}/usr/lib/*.so ${IDIR_MISDNUSER}/usr/lib/
+ $(INSTALL_BIN) $(WRKINST)/usr/bin/{sendhwctrl,testcon*,testlayer*} \
+ $(IDIR_MISDNUSER)/usr/bin/
+ $(CP) $(WRKINST)/usr/lib/*.so* $(IDIR_MISDNUSER)/usr/lib/
-include ${ADK_TOPDIR}/mk/pkg-bottom.mk
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk
diff --git a/package/newt/Makefile b/package/newt/Makefile
index e663ae0fa..57521d1a2 100644
--- a/package/newt/Makefile
+++ b/package/newt/Makefile
@@ -7,27 +7,28 @@ PKG_NAME:= newt
PKG_VERSION:= 0.52.18
PKG_RELEASE:= 1
PKG_HASH:= 771b0e634ede56ae6a6acd910728bb5832ac13ddb0d1d27919d2498dab70c91e
-PKG_DESCR:= Redhat\'s Newt windowing toolkit development files
+PKG_DESCR:= windowing toolkit
PKG_SECTION:= libs/misc
-PKG_DEPENDS:= slang
-PKG_BUILDDEP:= slang
+PKG_DEPENDS:= slang libpopt
+PKG_BUILDDEP:= slang popt
PKG_URL:= https://fedorahosted.org/newt/
-PKG_SITES:= https://fedorahosted.org/releases/n/e/${PKG_NAME}/
-DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
+PKG_SITES:= https://fedorahosted.org/releases/n/e/$(PKG_NAME)/
+
+DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz
include $(ADK_TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,NEWT,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,NEWT,newt,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
CONFIGURE_ARGS+= --without-python \
--without-tcl \
--without-gpm-support
-post-install:
+newt-install:
$(INSTALL_DIR) $(IDIR_NEWT)/usr/{bin,lib}
$(INSTALL_BIN) $(WRKINST)/usr/bin/whiptail \
$(IDIR_NEWT)/usr/bin
- ${CP} ${WRKINST}/usr/lib/libnewt.so* \
- ${IDIR_NEWT}/usr/lib
+ $(CP) $(WRKINST)/usr/lib/libnewt.so* \
+ $(IDIR_NEWT)/usr/lib
-include ${ADK_TOPDIR}/mk/pkg-bottom.mk
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk
diff --git a/package/oprofile/Makefile b/package/oprofile/Makefile
index c4da8d426..ee6286ea1 100644
--- a/package/oprofile/Makefile
+++ b/package/oprofile/Makefile
@@ -16,9 +16,6 @@ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=oprofile/}
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
-PKG_ARCH_DEPENDS:= !m68k
-PKG_LIBC_DEPENDS:= uclibc glibc
-
PKG_CFLINE_OPROFILE:= select BUSYBOX_EXPR
include $(ADK_TOPDIR)/mk/package.mk
diff --git a/package/perf/Makefile b/package/perf/Makefile
index a237dd49b..75bd8efe4 100644
--- a/package/perf/Makefile
+++ b/package/perf/Makefile
@@ -5,33 +5,39 @@ include $(ADK_TOPDIR)/rules.mk
include $(ADK_TOPDIR)/mk/kernel-ver.mk
PKG_NAME:= perf
-PKG_VERSION:= ${KERNEL_VERSION}
+PKG_VERSION:= $(KERNEL_VERSION)
PKG_RELEASE:= 1
-PKG_DESCR:= Userland tools for Linux Performance Counters
+PKG_DESCR:= userland tools for linux performance counters
PKG_SECTION:= app/debug
PKG_DEPENDS:= elfutils newt
+PKG_BUILDDEP:= elfutils newt
PKG_URL:= https://perf.wiki.kernel.org/index.php/Main_Page
+# elfutils require argp()
+PKG_LIBC_DEPENDS:= glibc
+
NO_DISTFILES:= 1
include $(ADK_TOPDIR)/mk/package.mk
-include ${ADK_TOPDIR}/mk/kernel-vars.mk
+include $(ADK_TOPDIR)/mk/kernel-vars.mk
-$(eval $(call PKG_template,PERF,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,PERF,perf,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
CONFIG_STYLE:= manual
BUILD_STYLE:= manual
INSTALL_STYLE:= manual
do-build:
- ${KERNEL_MAKE_ENV} GCC_HONOUR_COPTS=0 ${MAKE} \
- ${KERNEL_MAKE_OPTS} WERROR=0 -C "${LINUX_DIR}/tools/perf" all
+ $(KERNEL_MAKE_ENV) GCC_HONOUR_COPTS=0 $(MAKE) \
+ $(KERNEL_MAKE_OPTS) WERROR=0 -C "$(LINUX_DIR)/tools/perf" all
do-install:
- ${KERNEL_MAKE_ENV} GCC_HONOUR_COPTS=0 ${MAKE} \
- ${KERNEL_MAKE_OPTS} WERROR=0 -C "${LINUX_DIR}/tools/perf" \
- prefix="${WRKINST}" install
- ${INSTALL_DIR} ${IDIR_PERF}/usr/bin
- ${INSTALL_BIN} ${WRKINST}/bin/perf ${IDIR_PERF}/usr/bin
+ $(KERNEL_MAKE_ENV) GCC_HONOUR_COPTS=0 $(MAKE) \
+ $(KERNEL_MAKE_OPTS) WERROR=0 -C "$(LINUX_DIR)/tools/perf" \
+ prefix="$(WRKINST)" install
+
+perf-install:
+ $(INSTALL_DIR) $(IDIR_PERF)/usr/bin
+ $(INSTALL_BIN) $(WRKINST)/bin/perf $(IDIR_PERF)/usr/bin
-include ${ADK_TOPDIR}/mk/pkg-bottom.mk
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk
diff --git a/package/slang/Makefile b/package/slang/Makefile
index 0d7ced96d..1f0e4ee4f 100644
--- a/package/slang/Makefile
+++ b/package/slang/Makefile
@@ -7,37 +7,37 @@ PKG_NAME:= slang
PKG_VERSION:= 2.3.0
PKG_RELEASE:= 1
PKG_HASH:= f95224060f45e0d8212a5039b339afa5f1a94a1bb0298e796104e5b12e926129
-PKG_DESCR:= A multi-platform programmer\'s library designed to allow a developer to create robust software
+PKG_DESCR:= multi-platform programmer\'s library designed to allow a developer to create robust software
PKG_SECTION:= libs/misc
PKG_URL:= http://www.jedsoft.org/slang/
PKG_SITES:= http://www.jedsoft.org/releases/slang/
PKG_NOPARALLEL:= 1
-DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
+
+DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.bz2
include $(ADK_TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,SLANG,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,SLANG,slang,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
CONFIGURE_ARGS+= --without-pcre \
--without-onig \
--without-png \
--without-z
-post-install:
+slang-install:
$(INSTALL_DIR) $(IDIR_SLANG)/usr/{bin,lib/slang/v2/modules}
$(INSTALL_BIN) $(WRKINST)/usr/bin/slsh \
$(IDIR_SLANG)/usr/bin
- ${CP} ${WRKINST}/usr/lib/libslang.so* \
- ${IDIR_SLANG}/usr/lib
- ${INSTALL_DATA} ${WRKINST}/usr/lib/slang/v2/modules/*.so \
- ${IDIR_SLANG}/usr/lib/slang/v2/modules
- ${INSTALL_DIR} ${IDIR_SLANG}/usr/share/slsh/{cmaps,rline}
- ${INSTALL_DATA} ${WRKINST}/usr/share/slsh/*.sl \
- ${IDIR_SLANG}/usr/share/slsh
- ${INSTALL_DATA} ${WRKINST}/usr/share/slsh/cmaps/*.map \
- ${IDIR_SLANG}/usr/share/slsh/cmaps
- ${INSTALL_DATA} ${WRKINST}/usr/share/slsh/rline/*.sl \
- ${IDIR_SLANG}/usr/share/slsh/rline
-
-# please remove ALL above comments, before commiting
-include ${ADK_TOPDIR}/mk/pkg-bottom.mk
+ $(CP) $(WRKINST)/usr/lib/libslang.so* \
+ $(IDIR_SLANG)/usr/lib
+ $(INSTALL_DATA) $(WRKINST)/usr/lib/slang/v2/modules/*.so \
+ $(IDIR_SLANG)/usr/lib/slang/v2/modules
+ $(INSTALL_DIR) $(IDIR_SLANG)/usr/share/slsh/{cmaps,rline}
+ $(INSTALL_DATA) $(WRKINST)/usr/share/slsh/*.sl \
+ $(IDIR_SLANG)/usr/share/slsh
+ $(INSTALL_DATA) $(WRKINST)/usr/share/slsh/cmaps/*.map \
+ $(IDIR_SLANG)/usr/share/slsh/cmaps
+ $(INSTALL_DATA) $(WRKINST)/usr/share/slsh/rline/*.sl \
+ $(IDIR_SLANG)/usr/share/slsh/rline
+
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk
diff --git a/package/stats/Makefile b/package/stats/Makefile
index 0ff6c26de..7d52788e6 100644
--- a/package/stats/Makefile
+++ b/package/stats/Makefile
@@ -3,22 +3,21 @@
include $(ADK_TOPDIR)/rules.mk
-
PKG_NAME:= stats
PKG_VERSION:= 82bd4977b607b8714f361467e37a9d801ff911b6
PKG_RELEASE:= 1
-PKG_DESCR:= Rusty Russell\'s stats utility
+PKG_DESCR:= stats utility
PKG_SECTION:= sys/utils
PKG_URL:= https://github.com/rustyrussell/stats
PKG_SITES:= git://github.com/rustyrussell/stats.git
include $(ADK_TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,STATS,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,STATS,$(PKG_NAME),$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
-post-install:
+stats-install:
$(INSTALL_DIR) $(IDIR_STATS)/usr/bin
- $(INSTALL_BIN) $(WRKINST)/usr/local/bin/stats \
+ $(INSTALL_BIN) $(WRKINST)/usr/bin/stats \
$(IDIR_STATS)/usr/bin
-include ${ADK_TOPDIR}/mk/pkg-bottom.mk
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk
diff --git a/package/stats/patches/patch-Makefile b/package/stats/patches/patch-Makefile
index 8ab247023..0650a3adf 100644
--- a/package/stats/patches/patch-Makefile
+++ b/package/stats/patches/patch-Makefile
@@ -1,8 +1,14 @@
- allow for passing custom compiler FLAGS
- use host CC and CFLAGS for tools/configurator build
---- stats-82bd4977b607b8714f361467e37a9d801ff911b6.orig/Makefile 2015-02-23 22:34:48.000000000 +0100
-+++ stats-82bd4977b607b8714f361467e37a9d801ff911b6/Makefile 2015-02-23 22:38:45.478017862 +0100
-@@ -5,10 +5,10 @@ PREFIX = /usr/local
+--- stats-82bd4977b607b8714f361467e37a9d801ff911b6.orig/Makefile 2015-02-27 18:30:06.000000000 +0100
++++ stats-82bd4977b607b8714f361467e37a9d801ff911b6/Makefile 2015-02-27 18:37:14.000000000 +0100
+@@ -1,14 +1,15 @@
+ # Destination directory for installation (intended for packagers)
+ DESTDIR =
+-PREFIX = /usr/local
++PREFIX = /usr
+
++CC ?=
OPTFLAGS=-O3 -flto
#OPTFLAGS=-g
WARNFLAGS=-Wall -Wstrict-prototypes -Wundef
@@ -11,18 +17,19 @@
-LDFLAGS=$(OPTFLAGS)
-LDLIBS=-lm
+CPPFLAGS+=-I.
-+CFLAGS+=$(OPTFLAGS) $(WARNFLAGS)
-+LDFLAGS+=$(OPTFLAGS)
++CFLAGS+=$(WARNFLAGS)
++LDFLAGS+=
+LDLIBS+=-lm
# Comment this out (or use "VALGRIND=" on cmdline) if you don't have valgrind.
VALGRIND=valgrind --quiet --leak-check=full --error-exitcode=5
-@@ -41,6 +41,8 @@ $(OFILES): config.h
+@@ -41,6 +42,9 @@ $(OFILES): config.h
config.h: tools/configurator
if $< > $@.tmp; then mv $@.tmp $@; else rm -f $@.tmp; fi
+tools/configurator: CC=${CC_FOR_BUILD}
-+tools/configurator: CFLAGS=${OPTFLAGS} ${WARNFLAGS}
++tools/configurator: CFLAGS=${CFLAGS_FOR_BUILD}
++tools/configurator: LDFLAGS=${LDFLAGS_FOR_BUILD}
stats: $(OFILES)
distclean: clean
diff --git a/package/supl/Makefile b/package/supl/Makefile
index 948ebb339..13e58560f 100644
--- a/package/supl/Makefile
+++ b/package/supl/Makefile
@@ -7,27 +7,28 @@ PKG_NAME:= supl
PKG_VERSION:= 1.0.6
PKG_RELEASE:= 1
PKG_HASH:= 068dc47ce818ce5634f09a88159df85a6ce3456e2467b11b8c5f8543a99bb347
-PKG_DESCR:= tools for accessing SUP/RRLP server
+PKG_DESCR:= tools for accessing sup/rrlp server
PKG_SECTION:= net/misc
PKG_BUILDDEP:= openssl
PKG_DEPENDS:= libopenssl
PKG_URL:= http://www.tajuma.com/supl/
-PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=supl/}
-DISTFILES:= ${PKG_NAME}_${PKG_VERSION}.tar.gz
-WRKDIST= ${WRKDIR}/trunk
+PKG_SITES:= $(MASTER_SITE_SOURCEFORGE:=supl/)
+
+DISTFILES:= $(PKG_NAME)_$(PKG_VERSION).tar.gz
+WRKDIST= $(WRKDIR)/trunk
include $(ADK_TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,SUPL,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,SUPL,supl,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
CONFIG_STYLE:= minimal
-CONFIGURE_ARGS+= --precompiled-asn1=yes --prefix="${WRKINST}/usr"
+CONFIGURE_ARGS+= --precompiled-asn1=yes --prefix="$(WRKINST)/usr"
-post-install:
+supl-install:
$(INSTALL_DIR) $(IDIR_SUPL)/usr/{bin,lib}
$(INSTALL_BIN) $(WRKINST)/usr/bin/supl-{cert,client,proxy} \
$(IDIR_SUPL)/usr/bin
- ${CP} ${WRKINST}/usr/lib/lib{asnrrlp,asnsupl,supl}.so* \
- ${IDIR_SUPL}/usr/lib
+ $(CP) $(WRKINST)/usr/lib/lib{asnrrlp,asnsupl,supl}.so* \
+ $(IDIR_SUPL)/usr/lib
-include ${ADK_TOPDIR}/mk/pkg-bottom.mk
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk
diff --git a/package/supl/patches/patch-configure b/package/supl/patches/patch-configure
new file mode 100644
index 000000000..1c8f24d49
--- /dev/null
+++ b/package/supl/patches/patch-configure
@@ -0,0 +1,11 @@
+--- trunk.orig/configure 2011-10-25 21:41:03.000000000 +0200
++++ trunk/configure 2015-02-27 19:33:11.000000000 +0100
+@@ -91,7 +91,7 @@ cat <<EOF > config.mk
+ # Modifications to this file are lost if ./configure is ran again.
+
+ CONF_VERSION = 1.0.5
+-CONF_CFLAGS = -Wall -O2 $var_debug
++CONF_CFLAGS = -Wall $var_debug
+ CONF_ASN_CFLAGS = $var_asn1_debug
+ CONF_PREFIX = $var_prefix
+ CONF_PRECOMPILED_ASN = $var_precompiled_asn
diff --git a/package/tcptrace/Makefile b/package/tcptrace/Makefile
index ac5fb5dc4..b780a8f84 100644
--- a/package/tcptrace/Makefile
+++ b/package/tcptrace/Makefile
@@ -7,22 +7,25 @@ PKG_NAME:= tcptrace
PKG_VERSION:= 6.6.7
PKG_RELEASE:= 1
PKG_HASH:= 63380a4051933ca08979476a9dfc6f959308bc9f60d45255202e388eb56910bd
-PKG_DESCR:= A Tool for analyzing network packet dumps
+PKG_DESCR:= tool for analyzing network packet dumps
PKG_SECTION:= net/debug
PKG_DEPENDS:= libpcap
+PKG_BUILDDEP:= libpcap
PKG_URL:= http://www.tcptrace.org
PKG_SITES:= http://www.tcptrace.org/download/
+
DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz
include $(ADK_TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,TCPTRACE,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,TCPTRACE,tcptrace,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
-FAKE_FLAGS:= BINDIR="${WRKINST}/usr/bin" MANDIR="${WRKINST}/usr/man" INSTALL="install -D"
+FAKE_FLAGS:= BINDIR="$(WRKINST)/usr/bin" MANDIR="$(WRKINST)/usr/man" INSTALL="install -D"
+TARGET_CPPFLAGS+= -D_BSD_SOURCE
-post-install:
+tcptrace-install:
$(INSTALL_DIR) $(IDIR_TCPTRACE)/usr/bin
$(INSTALL_BIN) $(WRKINST)/usr/bin/tcptrace \
$(IDIR_TCPTRACE)/usr/bin
-include ${ADK_TOPDIR}/mk/pkg-bottom.mk
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk
diff --git a/package/tcptrace/patches/patch-Makefile_in b/package/tcptrace/patches/patch-Makefile_in
new file mode 100644
index 000000000..abd55f44d
--- /dev/null
+++ b/package/tcptrace/patches/patch-Makefile_in
@@ -0,0 +1,13 @@
+--- tcptrace-6.6.7.orig/Makefile.in 2004-03-04 21:33:56.000000000 +0100
++++ tcptrace-6.6.7/Makefile.in 2015-02-27 19:17:39.000000000 +0100
+@@ -34,8 +34,8 @@ DEFINES += -DBUNZIP2="\"bunzip2\""
+ #
+ ##################################################################
+ PCAP_LDLIBS = @V_PCAP_LDLIBS@
+-PCAP_INCS = -I/usr/local/include -I. -I../pcap -I/usr/include/pcap
+-PCAP_LDFLAGS = -L/usr/local/lib -Llib -Lpcap -L../pcap -L./cygwin-libs
++PCAP_INCS = -I. -I../pcap
++PCAP_LDFLAGS = -Llib -Lpcap -L../pcap -L./cygwin-libs
+
+
+
diff --git a/package/wireless-regdb/Makefile b/package/wireless-regdb/Makefile
index d984b60e7..4bded919f 100644
--- a/package/wireless-regdb/Makefile
+++ b/package/wireless-regdb/Makefile
@@ -4,19 +4,17 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= wireless-regdb
-PKG_VERSION:= 2011.04.28
+PKG_VERSION:= 2015.01.30
PKG_RELEASE:= 1
-PKG_MD5SUM:= 16b7fabd4d7761ccf206702a3f18cce9
-PKG_DESCR:= Binary regulatory database for CRDA
+PKG_HASH:= 438d7f3d62686bc997098d17fe1aff95c6f6ec061aaab90ab7c2c17e8451ce85
+PKG_DESCR:= binary regulatory database for crda
PKG_SECTION:= libs/net
PKG_URL:= http://wireless.kernel.org/en/developers/Regulatory
-PKG_SITES:= http://wireless.kernel.org/download/wireless-regdb/
-DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
-
+PKG_SITES:= https://www.kernel.org/pub/software/network/wireless-regdb/
include $(ADK_TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,WIRELESS_REGDB,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,WIRELESS_REGDB,$(PKG_NAME),$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
CONFIG_STYLE:= manual
BUILD_STYLE:= manual
@@ -26,9 +24,5 @@ do-install:
$(INSTALL_DIR) $(IDIR_WIRELESS_REGDB)/usr/lib/crda
$(INSTALL_DATA) $(WRKDIST)/regulatory.bin \
$(IDIR_WIRELESS_REGDB)/usr/lib/crda
- $(INSTALL_DIR) $(IDIR_WIRELESS_REGDB)/etc/wireless-regdb/pubkeys
- $(INSTALL_DATA) $(WRKDIST)/linville.key.pub.pem \
- $(IDIR_WIRELESS_REGDB)/etc/wireless-regdb/pubkeys
-
-include ${ADK_TOPDIR}/mk/pkg-bottom.mk
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk