diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-24 20:15:39 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-24 20:15:39 +0200 |
| commit | 57f1ccba214ee4d658fe2bcd61ef51651ade3225 (patch) | |
| tree | b18a2c5f6d6fc42a9228daa4cf671f517e5a4a43 | |
| parent | f3e84309257b915cb8820917a8dd5578f02fe974 (diff) | |
| parent | 6f63961c83bdb1791779975a36ebd28a0de247d6 (diff) | |
Merge branch 'master' of ssh://openadk.org/git/openadk
fic conflicts
Conflicts:
package/gnutls/Makefile
package/mrd6/Makefile
377 files changed, 700 insertions, 677 deletions
diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..244184f0b --- /dev/null +++ b/.gitignore @@ -0,0 +1,10 @@ +prereq.mk +toolchain_build_*/ +.prereq_done +.config* +.cfg/ +cross_*/ +root_*/ +bin_*/ +make.log +dl/ diff --git a/Config.default b/Config.default index 24bac36fa..b0751213f 100644 --- a/Config.default +++ b/Config.default @@ -38,6 +38,7 @@ ADK_TARGET_ROOTFS_EXT2_CF=y # ADK_TARGET_ROOTFS_EXT2 is not set # ADK_SSP is not set # ADK_CXX is not set +# ADK_DEBUG is not set # ADK_IPV6 is not set # ADK_XORG is not set @@ -46,10 +47,6 @@ ADK_TARGET_ROOTFS_EXT2_CF=y # # -# Package categories -# - -# # Applications # @@ -896,10 +893,7 @@ ADK_PACKAGE_CFGFS=y # ADK_COMPILE_KRB5 is not set # ADK_PACKAGE_OPENCT is not set # ADK_PACKAGE_OPENSC is not set -ADK_COMPILE_OPENSSL=y -ADK_PACKAGE_LIBOPENSSL=y -# ADK_PACKAGE_OPENSSL_UTIL is not set -# ADK_PACKAGE_CA_CERTS is not set +# ADK_PACKAGE_LIBOPENSSL is not set # ADK_PACKAGE_OPENSSL_PKCS11 is not set # @@ -1236,7 +1230,7 @@ ADK_PACKAGE_DROPBEAR=y # ADK_PACKAGE_LIBWRAP is not set # ADK_PACKAGE_LIBXML2 is not set # ADK_PACKAGE_LIBXSLT is not set -ADK_PACKAGE_ZLIB=y +# ADK_PACKAGE_ZLIB is not set # # Kernel configuration diff --git a/mk/build.mk b/mk/build.mk index b08b97273..79406bf9f 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -18,7 +18,8 @@ noconfig_targets:= menuconfig \ _mconfig \ tags -MAKECLEAN_SYMBOLS= ADK_TARGET_LIB_UCLIBC ADK_TARGET_LIB_GLIBC ADK_SSP ADK_IPV6 ADK_CXX +MAKECLEAN_SYMBOLS= ADK_TARGET_LIB_UCLIBC ADK_TARGET_LIB_GLIBC ADK_SSP ADK_IPV6 ADK_CXX \ + ADK_DEBUG POSTCONFIG= -@\ if [ -f .config.old ];then \ if [ -d .cfg ];then \ diff --git a/mk/buildhlp.mk b/mk/buildhlp.mk index b6b70d67d..128f3a54c 100644 --- a/mk/buildhlp.mk +++ b/mk/buildhlp.mk @@ -18,7 +18,7 @@ WRKSRC?= ${WRKDIST} # This is where configure, make and make install (fake) run from WRKBUILD?= ${WRKSRC} # This is where make install (fake) writes to -WRKINST?= ${WRKDIR}/fake-${ARCH}/root +WRKINST?= ${WRKDIR}/fake-${CPU_ARCH}/root ifeq ($(strip ${NO_CHECKSUM}),) _CHECKSUM_COOKIE= ${WRKDIR}/.checksum_done diff --git a/mk/kernel-build.mk b/mk/kernel-build.mk index c07e34c23..02990c250 100644 --- a/mk/kernel-build.mk +++ b/mk/kernel-build.mk @@ -45,7 +45,7 @@ $(KERNEL_IPKG): rm -rf $(KERNEL_IDIR) @mkdir -p $(KERNEL_IDIR)/etc ${BASH} ${SCRIPT_DIR}/make-ipkg-dir.sh ${KERNEL_IDIR} \ - ../linux/kernel.control ${DEVICE}-${KERNEL_VERSION} ${ARCH} + ../linux/kernel.control ${DEVICE}-${KERNEL_VERSION} ${CPU_ARCH} $(IPKG_BUILD) $(KERNEL_IDIR) $(PACKAGE_DIR) $(MAKE_TRACE) prepare: diff --git a/mk/kernel.mk b/mk/kernel.mk index 06f3ebde2..5dc271863 100644 --- a/mk/kernel.mk +++ b/mk/kernel.mk @@ -11,7 +11,7 @@ KMOD_BUILD_DIR := $(LINUX_BUILD_DIR)/linux-modules MODULES_DIR := $(LINUX_BUILD_DIR)/modules/$(MODULES_SUBDIR) TARGET_MODULES_DIR := $(LINUX_TARGET_DIR)/$(MODULES_SUBDIR) -KERNEL_IPKG:=$(PACKAGE_DIR)/kernel_$(DEVICE)-$(KERNEL_VERSION)_$(ARCH).ipk +KERNEL_IPKG:=$(PACKAGE_DIR)/kernel_$(DEVICE)-$(KERNEL_VERSION)_$(CPU_ARCH).ipk INSTALL_TARGETS:= $(KERNEL_IPKG) NOINSTALL_TARGETS:= TARGETS:= @@ -34,7 +34,7 @@ define KMOD_template IDEPENDK_$(1):=kernel ($(DEVICE)-$(KERNEL_VERSION)) $(foreach pkg,$(5),", $(pkg)") -PKG_$(1) := $(PACKAGE_DIR)/kmod-$(2)_$(DEVICE)-$(KERNEL_VERSION)-$(KERNEL_RELEASE)_$(ARCH).ipk +PKG_$(1) := $(PACKAGE_DIR)/kmod-$(2)_$(DEVICE)-$(KERNEL_VERSION)-$(KERNEL_RELEASE)_$(CPU_ARCH).ipk I_$(1) := $(KMOD_BUILD_DIR)/ipkg/$(2) ifeq ($$(ADK_KPACKAGE_KMOD_$(1)),m) @@ -53,7 +53,7 @@ $$(PKG_$(1)): echo "Description: kernel module $(2)" >> $(LINUX_BUILD_DIR)/kmod-control/kmod-$(2).control ${BASH} ${SCRIPT_DIR}/make-ipkg-dir.sh $$(I_$(1)) \ $(LINUX_BUILD_DIR)/kmod-control/kmod-$(2).control \ - $(DEVICE)-$(KERNEL_VERSION)-$(KERNEL_RELEASE) $(ARCH) + $(DEVICE)-$(KERNEL_VERSION)-$(KERNEL_RELEASE) $(CPU_ARCH) echo "Depends: $$(IDEPENDK_$(1))" >> $$(I_$(1))/CONTROL/control ifneq ($(strip $(3)),) mkdir -p $$(I_$(1))/lib/modules/$(KERNEL_VERSION) diff --git a/mk/package.mk b/mk/package.mk index 8b5d547b8..e359a6f7c 100644 --- a/mk/package.mk +++ b/mk/package.mk @@ -8,13 +8,13 @@ all: build-all-ipkgs TCFLAGS:= ${TARGET_CFLAGS} TCXXFLAGS:= ${TARGET_CFLAGS} TCPPFLAGS:= ${TARGET_CPPFLAGS} -ifneq ($(DEBUG),1) +ifeq ($(ADK_DEBUG),) TCPPFLAGS+= -DNDEBUG endif TLDFLAGS:= ${TARGET_LDFLAGS} -Wl,-rpath -Wl,/usr/lib \ -Wl,-rpath-link -Wl,${STAGING_DIR}/usr/lib \ -L${STAGING_DIR}/lib -L${STAGING_DIR}/usr/lib -ifeq ($(DEBUG),1) +ifneq ($(ADK_DEBUG),) CONFIGURE_ARGS+= --enable-debug else CONFIGURE_ARGS+= --disable-debug @@ -92,9 +92,17 @@ fake: ${_FAKE_COOKIE} # our recursive build entry point build-all-ipkgs: ${_IPKGS_COOKIE} +# there are some parameters to the PKG_template function +# 1.) Config.in identifier ADK_PACKAGE_$(1) +# 2.) name of the package, for single package mostly $(PKG_NAME) +# 3.) package version (upstream version) and package revision (adk revision), +# always $(PKG_VERSION)-$(PKG_REVISION) +# 4.) dependencies to other packages, $(PKG_DEPENDS) +# +# should be package format independent and modular in the future define PKG_template -IPKG_$(1)= $(PACKAGE_DIR)/$(2)_$(3)_$(4).ipk -IDIR_$(1)= $(WRKDIR)/fake-${ARCH}/ipkg-$(2) +IPKG_$(1)= $(PACKAGE_DIR)/$(2)_$(3)_${CPU_ARCH}.ipk +IDIR_$(1)= $(WRKDIR)/fake-${CPU_ARCH}/ipkg-$(2) ifneq (${ADK_PACKAGE_$(1)}${DEVELOPER},) ALL_IPKGS+= $$(IPKG_$(1)) ALL_IDIRS+= $${IDIR_$(1)} @@ -105,12 +113,12 @@ ifeq ($(ADK_PACKAGE_$(1)),y) install-targets: $$(INFO_$(1)) endif -IDEPEND_$(1):= $$(strip $(5)) +IDEPEND_$(1):= $$(strip $(4)) _ALL_CONTROLS+= $$(IDIR_$(1))/CONTROL/control ICONTROL_$(1)?= ipkg/$(2).control $$(IDIR_$(1))/CONTROL/control: ${_PATCH_COOKIE} - ${BASH} ${SCRIPT_DIR}/make-ipkg-dir.sh $${IDIR_$(1)} $${ICONTROL_$(1)} $(3) $(4) + ${BASH} ${SCRIPT_DIR}/make-ipkg-dir.sh $${IDIR_$(1)} $${ICONTROL_$(1)} $(3) ${CPU_ARCH} @adeps='$$(strip $${IDEPEND_$(1)})'; if [[ -n $$$$adeps ]]; then \ comma=; \ deps=; \ @@ -126,18 +134,19 @@ $$(IDIR_$(1))/CONTROL/control: ${_PATCH_COOKIE} done; \ echo "Depends: $$$$deps" >>$${IDIR_$(1)}/CONTROL/control; \ fi - for file in conffiles preinst postinst prerm postrm; do \ + @for file in conffiles preinst postinst prerm postrm; do \ [ ! -f ./ipkg/$(2).$$$$file ] || cp ./ipkg/$(2).$$$$file $$(IDIR_$(1))/CONTROL/$$$$file; \ done +# FIXME: special case for device dependent base-files package ifneq ($(strip $${ICONTROL_ADDON_$(1)}),) echo $${ICONTROL_ADDON_$(1)} >> $${IDIR_$(1)}/CONTROL/control endif $$(IPKG_$(1)): $$(IDIR_$(1))/CONTROL/control $${_FAKE_COOKIE} -ifneq ($(DEBUG),1) +ifeq ($(ADK_DEBUG),) $${RSTRIP} $${IDIR_$(1)} $(MAKE_TRACE) endif - cd $${IDIR_$(1)}; for script in etc/init.d/*; do \ + @cd $${IDIR_$(1)}; for script in etc/init.d/*; do \ [[ -e $$$$script ]] || continue; \ chmod 0755 "$$$$script"; \ done @@ -167,8 +176,7 @@ endif @cd '$${STAGING_DIR}'; grep 'usr/lib/.*\.la$$$$' \ '$${STAGING_PARENT}/pkg/$(1)' | while read fn; do \ chmod u+w $$$$fn; \ - printf '%s\nwq\n' '/^libdir='\''*/s##&${STAGING_DIR}#' | \ - ed -s $$$$fn; \ + $(SED) "s,\(^libdir='\| \|-L\|^dependency_libs='\)/usr/lib,\1$(STAGING_DIR)/usr/lib,g" $$fn; \ done; grep 'usr/s*bin/' '$${STAGING_PARENT}/pkg/$(1)' | \ while read fn; do \ b="$$$$(dd if="$$$$fn" bs=2 count=1 2>/dev/null)"; \ diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk index c5ac91df3..1f366ab53 100644 --- a/mk/pkg-bottom.mk +++ b/mk/pkg-bottom.mk @@ -162,9 +162,9 @@ ${_IPKGS_COOKIE}: exec ${MAKE} package package: ${ALL_IPKGS} - @cd ${WRKDIR}/fake-${ARCH} || exit 1; \ + @cd ${WRKDIR}/fake-${CPU_ARCH} || exit 1; \ y=; sp=; for x in ${ALL_IDIRS}; do \ - y="$$y$$sp$${x#$(WRKDIR)/fake-${ARCH}/}"; \ + y="$$y$$sp$${x#$(WRKDIR)/fake-${CPU_ARCH}/}"; \ sp=' '; \ done; ls=; ln=; x=1; [[ -z $$y ]] || \ md5sum $$(find $$y -type f) | sed -e "s/*//" | \ diff --git a/mk/vars.mk b/mk/vars.mk index 4fc11b22b..f9e8798d6 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -11,7 +11,7 @@ INSTALL_SCRIPT= install -m0755 MAKEFLAGS= $(EXTRA_MAKEFLAGS) BUILD_USER= $(shell id -un) BUILD_GROUP= $(shell id -gn) -ifeq ($(DEBUG),1) +ifneq ($(ADK_DEBUG),) TARGET_DEBUGGING:= -g -O0 -fno-omit-frame-pointer else TARGET_DEBUGGING:= -fomit-frame-pointer diff --git a/package/6tunnel/Makefile b/package/6tunnel/Makefile index d66c2bd95..039c790ee 100644 --- a/package/6tunnel/Makefile +++ b/package/6tunnel/Makefile @@ -14,7 +14,7 @@ WRKDIST= ${WRKDIR}/$(PKG_NAME)-0.11 include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,6TUNNEL,6tunnel,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) +$(eval $(call PKG_template,6TUNNEL,6tunnel,$(PKG_VERSION)-$(PKG_RELEASE))) CONFIGURE_STYLE= gnu CONFIGURE_ENV+= ac_cv_path_STRIP=$(STRIP) \ diff --git a/package/Config.in b/package/Config.in index 450ecaf00..343386dd8 100644 --- a/package/Config.in +++ b/package/Config.in @@ -5,9 +5,6 @@ menu "Package selection" -comment "Package categories" - - menu "Applications" menu "Basesystem" diff --git a/package/aiccu/Makefile b/package/aiccu/Makefile index 948f8eab2..1f5d6b510 100644 --- a/package/aiccu/Makefile +++ b/package/aiccu/Makefile @@ -17,7 +17,7 @@ WRKDIST= ${WRKDIR}/$(PKG_NAME) include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,AICCU,aiccu,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) +$(eval $(call PKG_template,AICCU,aiccu,$(PKG_VERSION)-$(PKG_RELEASE))) TCFLAGS+= -D_REENTRANT -D_GNU_SOURCE -DAICCU_CONSOLE \ -D_LINUX -DHAS_IFHEAD -DAICCU_TYPE=\"linux\" diff --git a/package/aircrack-ng/Makefile b/package/aircrack-ng/Makefile index 8245d5a52..1e6a3c3b7 100644 --- a/package/aircrack-ng/Makefile +++ b/package/aircrack-ng/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= http://download.aircrack-ng.org/ include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,AIRCRACK_NG,aircrack-ng,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) +$(eval $(call PKG_template,AIRCRACK_NG,aircrack-ng,$(PKG_VERSION)-$(PKG_RELEASE))) BUILD_STYLE= auto INSTALL_STYLE= auto diff --git a/package/alsa-lib/Makefile b/package/alsa-lib/Makefile index 74c857a10..e57470e40 100644 --- a/package/alsa-lib/Makefile +++ b/package/alsa-lib/Makefile @@ -15,7 +15,7 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,ALSA_LIB,alsa-lib,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,ALSA_LIB,alsa-lib,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --disable-python diff --git a/package/alsa-utils/Makefile b/package/alsa-utils/Makefile index 6359b9ea0..94719705f 100644 --- a/package/alsa-utils/Makefile +++ b/package/alsa-utils/Makefile @@ -15,7 +15,7 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,ALSA_UTILS,alsa-utils,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,ALSA_UTILS,alsa-utils,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --disable-alsamixer diff --git a/package/apr-util/Makefile b/package/apr-util/Makefile index 64c7c33a3..8a3de3b82 100644 --- a/package/apr-util/Makefile +++ b/package/apr-util/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= http://apache.mirror.clusters.cc/apr/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,APR_UTIL,$(PKG_NAME),${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,APR_UTIL,$(PKG_NAME),${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE:= gnu CONFIGURE_ARGS+= --without-berkeley-db diff --git a/package/apr/Makefile b/package/apr/Makefile index 7903f4cf8..8dbddd98b 100644 --- a/package/apr/Makefile +++ b/package/apr/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= http://gd.tuwien.ac.at/infosys/servers/http/apache/dist/${PKG_NA include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,APR,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,APR,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE:= gnu CONFIGURE_ENV+= ac_cv_func_setpgrp_void=no diff --git a/package/arpd/Makefile b/package/arpd/Makefile index 7ac0c03f7..ecf7118af 100644 --- a/package/arpd/Makefile +++ b/package/arpd/Makefile @@ -14,7 +14,7 @@ WRKDIST= ${WRKDIR}/${PKG_NAME} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,ARPD,arpd,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,ARPD,arpd,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --with-libdnet=${STAGING_DIR}/usr \ diff --git a/package/arpwatch/Makefile b/package/arpwatch/Makefile index a32974cbc..95197101b 100644 --- a/package/arpwatch/Makefile +++ b/package/arpwatch/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= ftp://ftp.ee.lbl.gov/ include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,ARPWATCH,arpwatch,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) +$(eval $(call PKG_template,ARPWATCH,arpwatch,$(PKG_VERSION)-$(PKG_RELEASE))) CONFIGURE_STYLE= gnu BUILD_STYLE= auto diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile index 87e187380..dcda8b77a 100644 --- a/package/asterisk/Makefile +++ b/package/asterisk/Makefile @@ -13,17 +13,17 @@ MASTER_SITES:= http://downloads.digium.com/pub/telephony/asterisk/releases/ include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,ASTERISK,asterisk,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(eval $(call PKG_template,ASTERISK_PGSQL,asterisk-pgsql,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(eval $(call PKG_template,ASTERISK_VOICEMAIL,asterisk-voicemail,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(eval $(call PKG_template,ASTERISK_SOUNDS,asterisk-sounds,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(eval $(call PKG_template,ASTERISK_CHAN_MGCP,asterisk-chan-mgcp,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(eval $(call PKG_template,ASTERISK_CHAN_SKINNY,asterisk-chan-skinny,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(eval $(call PKG_template,ASTERISK_CHAN_IAX2,asterisk-chan-iax2,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(eval $(call PKG_template,ASTERISK_CODEC_SPEEX,asterisk-codec-speex,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(eval $(call PKG_template,ASTERISK_CODEC_GSM,asterisk-codec-gsm,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(eval $(call PKG_template,ASTERISK_PBX_DUNDI,asterisk-pbx-dundi,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(eval $(call PKG_template,ASTERISK_RES_AGI,asterisk-res-agi,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) +$(eval $(call PKG_template,ASTERISK,asterisk,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,ASTERISK_PGSQL,asterisk-pgsql,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,ASTERISK_VOICEMAIL,asterisk-voicemail,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,ASTERISK_SOUNDS,asterisk-sounds,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,ASTERISK_CHAN_MGCP,asterisk-chan-mgcp,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,ASTERISK_CHAN_SKINNY,asterisk-chan-skinny,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,ASTERISK_CHAN_IAX2,asterisk-chan-iax2,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,ASTERISK_CODEC_SPEEX,asterisk-codec-speex,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,ASTERISK_CODEC_GSM,asterisk-codec-gsm,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,ASTERISK_PBX_DUNDI,asterisk-pbx-dundi,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,ASTERISK_RES_AGI,asterisk-res-agi,$(PKG_VERSION)-$(PKG_RELEASE))) SUB_INSTALLS-y:= SUB_INSTALLS-m:= diff --git a/package/atftp/Makefile b/package/atftp/Makefile index ac49f0794..5c71f7376 100644 --- a/package/atftp/Makefile +++ b/package/atftp/Makefile @@ -13,8 +13,8 @@ MASTER_SITES:= ftp://ftp.mamalinux.com/pub/atftp/ include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,ATFTP,atftp,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(eval $(call PKG_template,ATFTPD,atftpd,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) +$(eval $(call PKG_template,ATFTP,atftp,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,ATFTPD,atftpd,$(PKG_VERSION)-$(PKG_RELEASE))) MAKE_FLAGS+= CFLAGS="${TCFLAGS} -Wall -D_REENTRANT -fno-inline" CONFIGURE_STYLE= gnu diff --git a/package/autossh/Makefile b/package/autossh/Makefile index 0363f8855..97e18dd39 100644 --- a/package/autossh/Makefile +++ b/package/autossh/Makefile @@ -14,7 +14,7 @@ DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tgz include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,AUTOSSH,$(PKG_NAME),$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) +$(eval $(call PKG_template,AUTOSSH,$(PKG_NAME),$(PKG_VERSION)-$(PKG_RELEASE))) TCFLAGS+= -Wall -DSSH_PATH=\\\"/usr/bin/ssh\\\"\ \ -DVER=\\\"$(PKG_VERSION)\\\"\" diff --git a/package/avahi/Makefile b/package/avahi/Makefile index f950db29b..3397dc146 100644 --- a/package/avahi/Makefile +++ b/package/avahi/Makefile @@ -13,9 +13,9 @@ MASTER_SITES:= http://avahi.org/download/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,AVAHI_DAEMON,avahi-daemon,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,AVAHI_DNSCONFD,avahi-dnsconfd,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,LIBAVAHI,libavahi,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,AVAHI_DAEMON,avahi-daemon,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,AVAHI_DNSCONFD,avahi-dnsconfd,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,LIBAVAHI,libavahi,${PKG_VERSION}-${PKG_RELEASE})) TCFLAGS+= -DNDEBUG CONFIGURE_STYLE= gnu diff --git a/package/axtls/Makefile b/package/axtls/Makefile index 2ac2611a3..530ef0b6a 100644 --- a/package/axtls/Makefile +++ b/package/axtls/Makefile @@ -15,8 +15,8 @@ WRKDIST= ${WRKDIR}/axTLS include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBAXTLS,libaxtls,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,AXHTTPD,axhttpd,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) +$(eval $(call PKG_template,LIBAXTLS,libaxtls,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,AXHTTPD,axhttpd,$(PKG_VERSION)-$(PKG_RELEASE))) BUILD_STYLE= auto XAKE_FLAGS+= STRIP='' \ diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 8d07473d7..6f503b2c7 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -22,7 +22,7 @@ ICONTROL_ADDON_BASE_FILES= "Package: base-files-${PKG_ID}" include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,BASE_FILES,base-files-${PKG_ID},${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,BASE_FILES,base-files-${PKG_ID},${PKG_VERSION}-${PKG_RELEASE})) do-install: $(CP) ./files/* $(IDIR_BASE_FILES) diff --git a/package/bash/Makefile b/package/bash/Makefile index 3b348d753..46a5ebacb 100644 --- a/package/bash/Makefile +++ b/package/bash/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= http://ftp.gnu.org/gnu/bash/ include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,BASH,bash,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) +$(eval $(call PKG_template,BASH,bash,$(PKG_VERSION)-$(PKG_RELEASE))) XAKE_FLAGS+= LIBS_FOR_BUILD='' CONFIGURE_STYLE= gnu diff --git a/package/bc/Makefile b/package/bc/Makefile index f48912f7f..63f91c284 100644 --- a/package/bc/Makefile +++ b/package/bc/Makefile @@ -13,8 +13,8 @@ MASTER_SITES:= http://ftp.gnu.org/pub/gnu/bc/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,BC,bc,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,DC,dc,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,BC,bc,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,DC,dc,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE= gnu BUILD_STYLE= auto diff --git a/package/bind/Makefile b/package/bind/Makefile index e186966d3..6e668008c 100644 --- a/package/bind/Makefile +++ b/package/bind/Makefile @@ -13,15 +13,15 @@ MASTER_SITES:= ftp://ftp.isc.org/isc/bind9/${PKG_VERSION}/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,BIND_SERVER,bind-server,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,BIND_CLIENT,bind-client,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,LIBBIND,libbind,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,BIND_TOOLS,bind-tools,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,BIND_RNDC,bind-rndc,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,BIND_CHECK,bind-check,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,BIND_DNSSEC,bind-dnssec,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,BIND_HOST,bind-host,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,BIND_DIG,bind-dig,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,BIND_SERVER,bind-server,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,BIND_CLIENT,bind-client,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,LIBBIND,libbind,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,BIND_TOOLS,bind-tools,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,BIND_RNDC,bind-rndc,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,BIND_CHECK,bind-check,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,BIND_DNSSEC,bind-dnssec,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,BIND_HOST,bind-host,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,BIND_DIG,bind-dig,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE= gnu CONFIGURE_ENV+= BUILD_CC="${TARGET_CC}" diff --git a/package/binutils/Makefile b/package/binutils/Makefile index 10f71c805..9409ab002 100644 --- a/package/binutils/Makefile +++ b/package/binutils/Makefile @@ -7,7 +7,7 @@ include ${TOPDIR}/rules.mk include ${TOPDIR}/toolchain/binutils/Makefile.inc include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,BINUTILS,binutils,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,BINUTILS,binutils,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --disable-werror diff --git a/package/bitlbee/Makefile b/package/bitlbee/Makefile index 7e08a34a0..364c084f2 100644 --- a/package/bitlbee/Makefile +++ b/package/bitlbee/Makefile @@ -16,7 +16,7 @@ MASTER_SITES:= http://get.bitlbee.org/src/ \ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,BITLBEE,bitlbee,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,BITLBEE,bitlbee,${PKG_VERSION}-${PKG_RELEASE})) ifeq ($(ADK_IPV6),y) IPV6+= --ipv6=1 else diff --git a/package/bluez-firmware/Makefile b/package/bluez-firmware/Makefile index 1d0b5b5aa..fd8c9d35c 100644 --- a/package/bluez-firmware/Makefile +++ b/package/bluez-firmware/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= http://bluez.sourceforge.net/download/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,BLUEZ_FIRMWARE,bluez-firmware,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,BLUEZ_FIRMWARE,bluez-firmware,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --libdir=/lib diff --git a/package/bluez/Makefile b/package/bluez/Makefile index 7e9c4b89e..ff067cf0f 100644 --- a/package/bluez/Makefile +++ b/package/bluez/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_KERNEL:=bluetooth/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,BLUEZ,bluez,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,BLUEZ,bluez,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE:= gnu CONFIGURE_ARGS+= --enable-tools \ diff --git a/package/bogofilter/Makefile b/package/bogofilter/Makefile index d9f015ccc..5962fb3d8 100644 --- a/package/bogofilter/Makefile +++ b/package/bogofilter/Makefile @@ -14,7 +14,7 @@ DISTFILES:= ${PKG_NAME}_${PKG_VERSION}.orig.tar.gz include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,BOGOFILTER,bogofilter,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,BOGOFILTER,bogofilter,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE= gnu CONFIGURE_ENV+= ac_cv_c_bigendian=no \ diff --git a/package/bridge-utils/Makefile b/package/bridge-utils/Makefile index 724d016aa..f6363634c 100644 --- a/package/bridge-utils/Makefile +++ b/package/bridge-utils/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=bridge/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,BRIDGE_UTILS,bridge-utils,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,BRIDGE_UTILS,bridge-utils,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --with-linux-headers=${LINUX_DIR} diff --git a/package/busybox/Makefile b/package/busybox/Makefile index 107009c1a..cf0a9ba0e 100644 --- a/package/busybox/Makefile +++ b/package/busybox/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= http://www.busybox.net/downloads/ include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,BUSYBOX,$(PKG_NAME),$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) +$(eval $(call PKG_template,BUSYBOX,$(PKG_NAME),$(PKG_VERSION)-$(PKG_RELEASE))) #rebuild: # @rm $(WRKBUILD)/.configure_done diff --git a/package/bwm/Makefile b/package/bwm/Makefile index 9d5fa7df0..ebd8de30d 100644 --- a/package/bwm/Makefile +++ b/package/bwm/Makefile @@ -15,7 +15,7 @@ WRKDIST= ${WRKDIR}/${PKG_NAME}-${PKG_VERSION}.orig include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,BWM,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,BWM,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE})) do-build: ${TARGET_CC} ${TARGET_CFLAGS} ${WRKBUILD}/bwm.c -o ${WRKBUILD}/bwm diff --git a/package/cbtt/Makefile b/package/cbtt/Makefile index a7119ff4b..ec6ee34bd 100644 --- a/package/cbtt/Makefile +++ b/package/cbtt/Makefile @@ -15,8 +15,8 @@ WRKDIST= ${WRKDIR}/${PKG_NAME}80-${PKG_VERSION}-src include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,CBTT,cbtt,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,CBTT_MYSQL,cbtt-mysql,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,CBTT,cbtt,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,CBTT_MYSQL,cbtt-mysql,${PKG_VERSION}-${PKG_RELEASE})) BUILD_STYLE= auto TLDFLAGS+= -shared -L. -L${STAGING_DIR}/usr/lib/mysql \ diff --git a/package/cfgfs/Makefile b/package/cfgfs/Makefile index 4a521a1b4..d99079195 100644 --- a/package/cfgfs/Makefile +++ b/package/cfgfs/Makefile @@ -13,7 +13,7 @@ NO_DISTFILES:= 1 include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,CFGFS,cfgfs,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,CFGFS,cfgfs,${PKG_VERSION}-${PKG_RELEASE})) BUILD_STYLE:= auto diff --git a/package/cgilib/Makefile b/package/cgilib/Makefile index dc0dc9337..163aad53d 100644 --- a/package/cgilib/Makefile +++ b/package/cgilib/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= http://www.infodrom.org/projects/cgilib/download/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,CGILIB,cgilib,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,CGILIB,cgilib,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE:= gnu BUILD_STYLE= auto diff --git a/package/chillispot/Makefile b/package/chillispot/Makefile index 9ad16b887..367249294 100644 --- a/package/chillispot/Makefile +++ b/package/chillispot/Makefile @@ -13,7 +13,7 @@ MASTER_SITES= http://www.chillispot.info/download/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,CHILLISPOT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,CHILLISPOT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE= gnu BUILD_STYLE= auto diff --git a/package/collectd/Makefile b/package/collectd/Makefile index 75518ff04..529e8cf68 100644 --- a/package/collectd/Makefile +++ b/package/collectd/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= http://verplant.org/collectd/files/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,COLLECTD,collectd,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,COLLECTD,collectd,${PKG_VERSION}-${PKG_RELEASE})) ifneq (${ADK_PACKAGE_COLLECTD_CPU},y) DISABLE_CPU:=--disable-cpu diff --git a/package/comgt/Makefile b/package/comgt/Makefile index c9304dda8..d9cd54f7d 100644 --- a/package/comgt/Makefile +++ b/package/comgt/Makefile @@ -15,7 +15,7 @@ WRKDIST= ${WRKDIR}/${PKG_NAME}.${PKG_VERSION} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,COMGT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,COMGT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE})) BUILD_STYLE= auto ALL_TARGET= comgt diff --git a/package/cryptsetup/Makefile b/package/cryptsetup/Makefile index f82509774..18bf00756 100644 --- a/package/cryptsetup/Makefile +++ b/package/cryptsetup/Makefile @@ -14,7 +14,7 @@ MASTER_SITES:= http://cryptsetup.googlecode.com/files/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,CRYPTSETUP,cryptsetup,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,CRYPTSETUP,cryptsetup,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE:= gnu CONFIGURE_ARGS+= --disable-static diff --git a/package/ctorrent/Makefile b/package/ctorrent/Makefile index 964ae555a..c9cf60739 100755 --- a/package/ctorrent/Makefile +++ b/package/ctorrent/Makefile @@ -19,7 +19,7 @@ endif include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,CTORRENT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${ARCH},${PKG_DEPEND})) +$(eval $(call PKG_template,CTORRENT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPEND})) ifeq ($(ADK_COMPILE_CTORRENT_WITH_UCLIBCXX),y) TCXXFLAGS+= -fno-builtin -fno-rtti -nostdinc++ diff --git a/package/cups/Makefile b/package/cups/Makefile index 4d045c77b..9bb75ffa1 100644 --- a/package/cups/Makefile +++ b/package/cups/Makefile @@ -15,7 +15,7 @@ MASTER_SITES:= http://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/cups/${ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,CUPS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,CUPS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE= gnu CONFIGURE_ENV+= ac_cv_func_sigset=no \ diff --git a/package/curl/Makefile b/package/curl/Makefile index 1d6f4855c..192a3f27b 100644 --- a/package/curl/Makefile +++ b/package/curl/Makefile @@ -19,8 +19,8 @@ MASTER_SITES:= http://curl.haxx.se/download/ \ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,CURL,curl,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,LIBCURL,libcurl,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,CURL,curl,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,LIBCURL,libcurl,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --disable-thread \ diff --git a/package/cutter/Makefile b/package/cutter/Makefile index 68af7df76..e83cc41c8 100755 --- a/package/cutter/Makefile +++ b/package/cutter/Makefile @@ -14,7 +14,7 @@ MASTER_SITES:= http://www.lowth.com/cutter/software/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,CUTTER,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,CUTTER,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE})) do-build: ${TARGET_CC} ${WRKBUILD}/cutter.c -o ${WRKBUILD}/cutter diff --git a/package/cxxtools/Makefile b/package/cxxtools/Makefile index 42c2042c6..8458b7729 100644 --- a/package/cxxtools/Makefile +++ b/package/cxxtools/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= http://www.tntnet.org/download/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,CXXTOOLS,cxxtools,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,CXXTOOLS,cxxtools,${PKG_VERSION}-${PKG_RELEASE})) ifeq (${ADK_COMPILE_CXXTOOLS_WITH_UCLIBCXX},y) TCXXFLAGS+= -fno-builtin -nostdinc++ -I${STAGING_DIR}/usr/include/uClibc++ diff --git a/package/cyrus-sasl/Makefile b/package/cyrus-sasl/Makefile index 56a1d3838..64322c771 100644 --- a/package/cyrus-sasl/Makefile +++ b/package/cyrus-sasl/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= http://ftp.andrew.cmu.edu/pub/cyrus-mail/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBSASL2,libsasl2,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,LIBSASL2,libsasl2,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --disable-sample \ diff --git a/package/davfs2/Makefile b/package/davfs2/Makefile index bb09a8b1e..4e90b1a05 100644 --- a/package/davfs2/Makefile +++ b/package/davfs2/Makefile @@ -13,7 +13,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=dav/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,DAVFS2,davfs2,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,DAVFS2,davfs2,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --with-neon diff --git a/package/dbus/Makefile b/package/dbus/Makefile index 09219b38a..ec8b29777 100644 --- a/package/dbus/Makefile +++ b/package/dbus/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= http://dbus.freedesktop.org/releases/dbus/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,DBUS,dbus,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,DBUS,dbus,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE:= gnu CONFIGURE_ARGS+= --disable-tests \ diff --git a/package/deco/Makefile b/package/deco/Makefile index 0a7bb2619..b6717db64 100644 --- a/package/deco/Makefile +++ b/package/deco/Makefile @@ -15,7 +15,7 @@ WRKDIST= ${WRKDIR}/${PKG_NAME}${PKG_VERSION} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,DECO,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,DECO,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE= gnu BUILD_STYLE= auto diff --git a/package/device-mapper/Makefile b/package/device-mapper/Makefile index 1d97db9a3..38b738ca3 100644 --- a/package/device-mapper/Makefile +++ b/package/device-mapper/Makefile @@ -16,7 +16,7 @@ WRKDIST= ${WRKDIR}/${PKG_NAME}.${PKG_VERSION} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,DEVICE_MAPPER,device-mapper,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,DEVICE_MAPPER,device-mapper,${PKG_VERSION}-${PKG_RELEASE})) ifeq ($(DEBUG),1) CONFIGURE_ARGS+= --enable-debug diff --git a/package/dhcp-forwarder/Makefile b/package/dhcp-forwarder/Makefile index 880e1a3cb..e0aa1dc6a 100644 --- a/package/dhcp-forwarder/Makefile +++ b/package/dhcp-forwarder/Makefile @@ -14,7 +14,7 @@ MASTER_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},${ARCH})) +$(eval $(call PKG_template,DHCP_FORWARDER,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE= gnu CONFIGURE_ENV+= ac_cv_func_malloc_0_nonnull="yes" diff --git a/package/dhcp/Makefile b/package/dhcp/Makefile index c2e49a0b6..de038d81b 100644 --- a/package/dhcp/Makefile +++ b/package/dhcp/Makefile @@ -13,8 +13,8 @@ MASTER_SITES:= ftp://ftp.isc.org/isc/dhcp/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,DHCP_RELAY,dhcp-relay,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,DHCP_SERVER,dhcp-server,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,DHCP_RELAY,dhcp-relay,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,DHCP_SERVER,dhcp-server,${PKG_VERSION}-${PKG_RELEASE})) do-configure: (cd ${WRKBUILD} ; \ diff --git a/package/dhcp6/Makefile b/package/dhcp6/Makefile index 3aa5ddcc7..58f305bc4 100644 --- a/package/dhcp6/Makefile +++ b/package/dhcp6/Makefile @@ -15,7 +15,7 @@ WRKDIST= ${WRKDIR} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,DHCP6,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,DHCP6,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE})) do-build: ${MAKE} CC="${TARGET_CC}" STAGING_DIR=${STAGING_DIR} -C ${WRKBUILD}/server diff --git a/package/digitemp/Makefile b/package/digitemp/Makefile index 841fa06e9..7cd269170 100644 --- a/package/digitemp/Makefile +++ b/package/digitemp/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= http://www.digitemp.com/software/linux/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,DIGITEMP,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,DIGITEMP,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE})) ALL_TARGET= ds2490 BUILD_STYLE= auto diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile index 11c9669a8..ba09c4e95 100644 --- a/package/dnsmasq/Makefile +++ b/package/dnsmasq/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= http://thekelleys.org.uk/dnsmasq/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,DNSMASQ,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,DNSMASQ,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE})) BUILD_STYLE:= auto INSTALL_STYLE= manual diff --git a/package/dosfstools/Makefile b/package/dosfstools/Makefile index 36ce4187f..efda0705b 100644 --- a/package/dosfstools/Makefile +++ b/package/dosfstools/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= http://www.daniel-baumann.ch/software/dosfstools/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,DOSFSTOOLS,dosfstools,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,DOSFSTOOLS,dosfstools,${PKG_VERSION}-${PKG_RELEASE})) BUILD_STYLE= auto INSTALL_STYLE= auto diff --git a/package/dovecot/Makefile b/package/dovecot/Makefile index 3e31c2f62..794af7040 100644 --- a/package/dovecot/Makefile +++ b/package/dovecot/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= http://www.dovecot.org/releases/1.1/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,DOVECOT,dovecot,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,DOVECOT,dovecot,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE:= gnu CONFIGURE_ENV+= ignore_signed_size=1 \ diff --git a/package/dropbear/Makefile b/package/dropbear/Makefile index 63b3e54e7..a7177388c 100644 --- a/package/dropbear/Makefile +++ b/package/dropbear/Makefile @@ -14,8 +14,8 @@ MASTER_SITES:= http://matt.ucc.asn.au/dropbear/releases/ \ include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,DROPBEAR,$(PKG_NAME),$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(eval $(call PKG_template,DBCONVERT,dropbearconvert,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) +$(eval $(call PKG_template,DROPBEAR,$(PKG_NAME),$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,DBCONVERT,dropbearconvert,$(PKG_VERSION)-$(PKG_RELEASE))) CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --disable-pam \ @@ -42,14 +42,6 @@ do-build: cd ${WRKBUILD} && env ${MAKE_ENV} ${MAKE} \ PROGRAMS=dropbearconvert -# evaluate startup options according to menuconfig selection -DROPBEAR-OPTS-y = -g -DROPBEAR-OPTS-$(ADK_RUNTIME_SSH_DISABLE_NOTHING) = -DROPBEAR-OPTS-$(ADK_RUNTIME_SSH_DISABLE_PASSWORD_FOR_ROOT) = -g -DROPBEAR-OPTS-$(ADK_RUNTIME_SSH_DISABLE_PASSWORD) = -s -DROPBEAR-OPTS-$(ADK_RUNTIME_SSH_DISABLE_ROOT) = -w -DROPBEAR-OPTS-$(ADK_RUNTIME_SSH_DISABLE_ROOT_AND_PASSWORD) = -w -s - do-install: # main package $(INSTALL_DIR) $(IDIR_DROPBEAR)/etc/init.d @@ -63,7 +55,6 @@ do-install: ln -sf ../sbin/dropbear $(IDIR_DROPBEAR)/usr/bin/dropbearkey $(INSTALL_DATA) ./files/dropbear.init \ $(IDIR_DROPBEAR)/etc/init.d/dropbear - $(SED) "s/@OPTIONS@/$(DROPBEAR-OPTS-y)/g" $(IDIR_DROPBEAR)/CONTROL/postinst # subpackage dropbearconvert $(INSTALL_DIR) $(IDIR_DBCONVERT)/usr/bin $(INSTALL_BIN) $(WRKBUILD)/dropbearconvert \ diff --git a/package/dropbear/patches/patch-svr-main_c b/package/dropbear/patches/patch-svr-main_c new file mode 100644 index 000000000..eaf066158 --- /dev/null +++ b/package/dropbear/patches/patch-svr-main_c @@ -0,0 +1,15 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ + + * bzero is obsolete, use memset + +--- dropbear-0.52.orig/svr-main.c 2008-11-11 15:09:03.000000000 +0100 ++++ dropbear-0.52/svr-main.c 2009-05-23 16:13:30.569366604 +0200 +@@ -133,7 +133,7 @@ void main_noinetd() { + for (i = 0; i < MAX_UNAUTH_CLIENTS; i++) { + childpipes[i] = -1; + } +- bzero(preauth_addrs, sizeof(preauth_addrs)); ++ memset(preauth_addrs, 0, sizeof(preauth_addrs)); + + /* Set up the listening sockets */ + listensockcount = listensockets(listensocks, MAX_LISTEN_ADDR, &maxsock); diff --git a/package/dsniff/Makefile b/package/dsniff/Makefile index 0b28d8e15..352160d16 100644 --- a/package/dsniff/Makefile +++ b/package/dsniff/Makefile @@ -14,7 +14,7 @@ WRKDIST= ${WRKDIR}/${PKG_NAME}-2.4 include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,DSNIFF,dsniff,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,DSNIFF,dsniff,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --without-db \ diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile index e62858527..2677e327b 100644 --- a/package/e2fsprogs/Makefile +++ b/package/e2fsprogs/Makefile @@ -13,9 +13,9 @@ MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=e2fsprogs/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,E2FSPROGS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,LIBUUID,libuuid,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,LIBCOM_ERR,libcom-err,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,E2FSPROGS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,LIBUUID,libuuid,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,LIBCOM_ERR,libcom-err,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --enable-elf-shlibs \ diff --git a/package/elinks/Makefile b/package/elinks/Makefile index c2a8e485a..122115882 100644 --- a/package/elinks/Makefile +++ b/package/elinks/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= http://elinks.or.cz/download/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,ELINKS,elinks,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,ELINKS,elinks,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE:= gnu CONFIGURE_ENV+= $(shell echo ac_cv_file_./features.conf | tr [:blank:]-/. _)=yes diff --git a/package/em28xx/Makefile b/package/em28xx/Makefile index 887bcda70..6a1048b0e 100644 --- a/package/em28xx/Makefile +++ b/package/em28xx/Makefile @@ -16,7 +16,7 @@ WRKDIST= ${WRKDIR}/${PKG_NAME} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,KMOD_EM28XX,kmod-em28xx,${KERNEL_VERSION}+${PKG_VERSION}-${DEVICE}-${PKG_RELEASE},${ARCH},kernel (${KERNEL_VERSION}-${DEVICE}-${KERNEL_RELEASE}))) +$(eval $(call PKG_template,KMOD_EM28XX,kmod-em28xx,${KERNEL_VERSION}+${PKG_VERSION}-${DEVICE}-${PKG_RELEASE},kernel (${KERNEL_VERSION}-${DEVICE}-${KERNEL_RELEASE}))) CONFIGURE_STYLE:= manual BUILD_STYLE:= manual diff --git a/package/esound/Makefile b/package/esound/Makefile index f97d58be0..119532e97 100644 --- a/package/esound/Makefile +++ b/package/esound/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= ftp://ftp.gnome.org/pub/gnome/sources/esound/0.2/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,ESOUND,esound,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,ESOUND,esound,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE:= gnu BUILD_STYLE:= auto diff --git a/package/ether-wake/Makefile b/package/ether-wake/Makefile index 2eb244dc6..5a4aeacc2 100644 --- a/package/ether-wake/Makefile +++ b/package/ether-wake/Makefile @@ -12,7 +12,7 @@ NO_DISTFILES:= 1 include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,ETHER_WAKE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,ETHER_WAKE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE})) do-build: ${TARGET_CC} ${TARGET_CFLAGS} -o ${WRKBUILD}/${PKG_NAME} ${WRKBUILD}/${PKG_NAME}.c diff --git a/package/ethtool/Makefile b/package/ethtool/Makefile index 6e809f20a..b68ec1786 100644 --- a/package/ethtool/Makefile +++ b/package/ethtool/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=gkernel/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,ETHTOOL,ethtool,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,ETHTOOL,ethtool,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE= gnu BUILD_STYLE= auto diff --git a/package/exmap/Makefile b/package/exmap/Makefile index 78f0cf13e..c515e4573 100644 --- a/package/exmap/Makefile +++ b/package/exmap/Makefile @@ -16,10 +16,10 @@ WRKDIST= ${WRKDIR}/${PKG_NAME}-console-${PKG_VERSION} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,EXMAP,exmap,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,EXMAPD,exmapd,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,EXMAPSERVER,exmapserver,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,KMOD_EXMAP,kmod-exmap,${KERNEL_VERSION}+${PKG_VERSION}-${DEVICE}-${PKG_RELEASE},${ARCH},kernel (${KERNEL_VERSION}-${DEVICE}-${KERNEL_RELEASE}))) +$(eval $(call PKG_template,EXMAP,exmap,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,EXMAPD,exmapd,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,EXMAPSERVER,exmapserver,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,KMOD_EXMAP,kmod-exmap,${KERNEL_VERSION}+${PKG_VERSION}-${DEVICE}-${PKG_RELEASE},kernel (${KERNEL_VERSION}-${DEVICE}-${KERNEL_RELEASE}))) CONFIGURE_STYLE:= gnu CONFIGURE_ARGS+= --disable-doc diff --git a/package/expat/Makefile b/package/expat/Makefile index bebaaa6f2..fbc04413c 100644 --- a/package/expat/Makefile +++ b/package/expat/Makefile @@ -14,7 +14,7 @@ MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=expat/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBEXPAT,libexpat,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,LIBEXPAT,libexpat,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE= gnu BUILD_STYLE= auto diff --git a/package/ez-ipupdate/Makefile b/package/ez-ipupdate/Makefile index c7afd482a..02cf17632 100644 --- a/package/ez-ipupdate/Makefile +++ b/package/ez-ipupdate/Makefile @@ -15,7 +15,7 @@ MASTER_SITES:= http://ftp.debian.org/debian/pool/main/e/ez-ipupdate/ \ include ${TOPDIR}/mk/package.mk -${eval ${call PKG_template,EZIPUPDATE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${ARCH}}} +${eval ${call PKG_template,EZIPUPDATE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE}}} CONFIGURE_STYLE= gnu BUILD_STYLE= auto diff --git a/package/faad2/Makefile b/package/faad2/Makefile index bedaaf8e9..c4052b209 100644 --- a/package/faad2/Makefile +++ b/package/faad2/Makefile @@ -14,7 +14,7 @@ WRKDIST= ${WRKDIR}/faad2 include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBFAAD2,libfaad2,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,LIBFAAD2,libfaad2,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE= autotool gnu CONFIGURE_ARGS+= --without-mpeg4ip \ diff --git a/package/fakeidentd/Makefile b/package/fakeidentd/Makefile index 75760a250..f3341ed92 100644 --- a/package/fakeidentd/Makefile +++ b/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},${ARCH})) +$(eval $(call PKG_template,FAKEIDENTD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE})) do-build: ${TARGET_CC} -o ${WRKBUILD}/${PKG_NAME} ${WRKBUILD}/identd.c diff --git a/package/fbset/Makefile b/package/fbset/Makefile index a53d60614..0fd9bf9cf 100644 --- a/package/fbset/Makefile +++ b/package/fbset/Makefile @@ -14,7 +14,7 @@ MASTER_SITES:= http://users.telenet.be/geertu/Linux/fbdev/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,FBSET,fbset,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,FBSET,fbset,${PKG_VERSION}-${PKG_RELEASE})) BUILD_STYLE:= manual INSTALL_STYLE:= manual diff --git a/package/fetchmail/Makefile b/package/fetchmail/Makefile index 388afec92..7e90d1a07 100644 --- a/package/fetchmail/Makefile +++ b/package/fetchmail/Makefile @@ -14,7 +14,7 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,FETCHMAIL,fetchmail,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,FETCHMAIL,fetchmail,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE= gnu CONFIGURE_ENV+= ac_cv_c_bigendian=no \ diff --git a/package/ffmpeg/Makefile b/package/ffmpeg/Makefile index 58b029276..e79d1cdda 100644 --- a/package/ffmpeg/Makefile +++ b/package/ffmpeg/Makefile @@ -14,7 +14,7 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,FFMPEG,ffmpeg,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,FFMPEG,ffmpeg,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE:= manual BUILD_STYLE:= auto diff --git a/package/file/Makefile b/package/file/Makefile index c4704c7a7..a3a6c17f2 100644 --- a/package/file/Makefile +++ b/package/file/Makefile @@ -14,7 +14,7 @@ MASTER_SITES:= ftp://ftp.fu-berlin.de/unix/tools/file/ \ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,FILE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,FILE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE:= gnu BUILD_STYLE:= auto diff --git a/package/flac/Makefile b/package/flac/Makefile index 3f3d001cc..223fd62fe 100644 --- a/package/flac/Makefile +++ b/package/flac/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=flac/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBFLAC,libflac,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,LIBFLAC,libflac,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --disable-asm-optimizations \ diff --git a/package/fping/Makefile b/package/fping/Makefile index ce14b9555..7b794d5aa 100644 --- a/package/fping/Makefile +++ b/package/fping/Makefile @@ -14,7 +14,7 @@ MASTER_SITES:= http://fping.sourceforge.net/download/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,FPING,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,FPING,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE= gnu diff --git a/package/fprobe-ulog/Makefile b/package/fprobe-ulog/Makefile index f553204ef..574f873f7 100644 --- a/package/fprobe-ulog/Makefile +++ b/package/fprobe-ulog/Makefile @@ -14,7 +14,7 @@ MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=fprobe/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,FPROBE_ULOG,fprobe-ulog,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,FPROBE_ULOG,fprobe-ulog,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --with-piddir=/var \ diff --git a/package/fprobe/Makefile b/package/fprobe/Makefile index a2cb19b28..959c9a119 100644 --- a/package/fprobe/Makefile +++ b/package/fprobe/Makefile @@ -14,7 +14,7 @@ MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=fprobe/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,FPROBE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,FPROBE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --with-piddir=/var \ diff --git a/package/freeradius/Makefile b/package/freeradius/Makefile index fa9d232cf..f6fece17d 100644 --- a/package/freeradius/Makefile +++ b/package/freeradius/Makefile @@ -66,28 +66,28 @@ ${2}-install: done endef -$(eval $(call PKG_template,FREERADIUS,freeradius,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,FREERADIUS_DEMOCERTS,freeradius-democerts,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,FREERADIUS_MOD_CHAP,freeradius-mod-chap,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,FREERADIUS_MOD_DETAIL,freeradius-mod-detail,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,FREERADIUS_MOD_DIGEST,freeradius-mod-digest,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,FREERADIUS_MOD_EAP,freeradius-mod-eap,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,FREERADIUS_MOD_EAP_GTC,freeradius-mod-eap-gtc,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,FREERADIUS_MOD_EAP_MD5,freeradius-mod-eap-md5,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,FREERADIUS_MOD_EAP_MSCHAPV2,freeradius-mod-eap-mschapv2,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,FREERADIUS_MOD_EAP_PEAP,freeradius-mod-eap-peap,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,FREERADIUS_MOD_EAP_TLS,freeradius-mod-eap-tls,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,FREERADIUS_MOD_EAP_TTLS,freeradius-mod-eap-ttls,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,FREERADIUS_MOD_FILES,freeradius-mod-files,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,FREERADIUS_MOD_LDAP,freeradius-mod-ldap,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,FREERADIUS_MOD_MSCHAP,freeradius-mod-mschap,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,FREERADIUS_MOD_PAP,freeradius-mod-pap,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,FREERADIUS_MOD_PREPROCESS,freeradius-mod-preprocess,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,FREERADIUS_MOD_REALM,freeradius-mod-realm,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,FREERADIUS_MOD_SQL,freeradius-mod-sql,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,FREERADIUS_MOD_SQL_MYSQL,freeradius-mod-sql-mysql,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,FREERADIUS_MOD_SQL_PGSQL,freeradius-mod-sql-pgsql,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,FREERADIUS_UTILS,freeradius-utils,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,FREERADIUS,freeradius,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,FREERADIUS_DEMOCERTS,freeradius-democerts,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,FREERADIUS_MOD_CHAP,freeradius-mod-chap,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,FREERADIUS_MOD_DETAIL,freeradius-mod-detail,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,FREERADIUS_MOD_DIGEST,freeradius-mod-digest,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,FREERADIUS_MOD_EAP,freeradius-mod-eap,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,FREERADIUS_MOD_EAP_GTC,freeradius-mod-eap-gtc,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,FREERADIUS_MOD_EAP_MD5,freeradius-mod-eap-md5,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,FREERADIUS_MOD_EAP_MSCHAPV2,freeradius-mod-eap-mschapv2,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,FREERADIUS_MOD_EAP_PEAP,freeradius-mod-eap-peap,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,FREERADIUS_MOD_EAP_TLS,freeradius-mod-eap-tls,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,FREERADIUS_MOD_EAP_TTLS,freeradius-mod-eap-ttls,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,FREERADIUS_MOD_FILES,freeradius-mod-files,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,FREERADIUS_MOD_LDAP,freeradius-mod-ldap,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,FREERADIUS_MOD_MSCHAP,freeradius-mod-mschap,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,FREERADIUS_MOD_PAP,freeradius-mod-pap,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,FREERADIUS_MOD_PREPROCESS,freeradius-mod-preprocess,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,FREERADIUS_MOD_REALM,freeradius-mod-realm,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,FREERADIUS_MOD_SQL,freeradius-mod-sql,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,FREERADIUS_MOD_SQL_MYSQL,freeradius-mod-sql-mysql,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,FREERADIUS_MOD_SQL_PGSQL,freeradius-mod-sql-pgsql,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,FREERADIUS_UTILS,freeradius-utils,${PKG_VERSION}-${PKG_RELEASE})) $(eval $(call PKG_mod_template,FREERADIUS_MOD_CHAP,rlm_chap,)) $(eval $(call PKG_mod_template,FREERADIUS_MOD_DETAIL,rlm_detail,)) diff --git a/package/freetype/Makefile b/package/freetype/Makefile index 0b8664e00..6d146978d 100644 --- a/package/freetype/Makefile +++ b/package/freetype/Makefile @@ -15,7 +15,7 @@ WRKDIST= ${WRKDIR}/freetype-${PKG_VERSION} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBFREETYPE,libfreetype,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,LIBFREETYPE,libfreetype,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE= gnu BUILD_STYLE= auto diff --git a/package/frickin/Makefile b/package/frickin/Makefile index f8a97743d..1b4fe10cd 100644 --- a/package/frickin/Makefile +++ b/package/frickin/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=frickin/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,FRICKIN,frickin,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,FRICKIN,frickin,${PKG_VERSION}-${PKG_RELEASE})) BUILD_STYLE= auto diff --git a/package/fuse/Makefile b/package/fuse/Makefile index 2a8c89e2f..e3cf2d1ae 100644 --- a/package/fuse/Makefile +++ b/package/fuse/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=${PKG_NAME}/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,FUSE_UTILS,fuse-utils,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,FUSE_UTILS,fuse-utils,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --enable-lib \ diff --git a/package/gatling/Makefile b/package/gatling/Makefile index cac5c6ee0..003013138 100644 --- a/package/gatling/Makefile +++ b/package/gatling/Makefile @@ -15,7 +15,7 @@ DISTFILES= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,GATLING,gatling,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,GATLING,gatling,${PKG_VERSION}-${PKG_RELEASE})) BUILD_STYLE= auto MAKE_FILE= GNUmakefile diff --git a/package/gcc/Makefile b/package/gcc/Makefile index 01eec05b4..0f0407001 100644 --- a/package/gcc/Makefile +++ b/package/gcc/Makefile @@ -7,7 +7,7 @@ include ${TOPDIR}/rules.mk include ${TOPDIR}/toolchain/gcc/Makefile.inc include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,GCC,gcc,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,GCC,gcc,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --enable-languages=c \ diff --git a/package/gdb/Makefile b/package/gdb/Makefile index dc4b736ff..2167ce7e3 100644 --- a/package/gdb/Makefile +++ b/package/gdb/Makefile @@ -7,7 +7,7 @@ include ${TOPDIR}/rules.mk include ${TOPDIR}/toolchain/gdb/Makefile.inc include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,GDB,gdb,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,GDB,gdb,${PKG_VERSION}-${PKG_RELEASE})) TCPPFLAGS+= -L${STAGING_DIR}/usr/lib -L${STAGING_DIR}/lib TLDFLAGS+= -L${STAGING_DIR}/usr/lib -L${STAGING_DIR}/lib diff --git a/package/gdbserver/Makefile b/package/gdbserver/Makefile index e4879a4cc..3d40060f1 100644 --- a/package/gdbserver/Makefile +++ b/package/gdbserver/Makefile @@ -9,7 +9,7 @@ include ${TOPDIR}/mk/package.mk WRKSRC= ${WRKDIST}/gdb/gdbserver -$(eval $(call PKG_template,GDBSERVER,gdbserver,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,GDBSERVER,gdbserver,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE= gnu BUILD_STYLE= auto diff --git a/package/gettext/Makefile b/package/gettext/Makefile index dd50230af..7a85f5af8 100644 --- a/package/gettext/Makefile +++ b/package/gettext/Makefile @@ -14,7 +14,7 @@ WRKDIST= ${WRKDIR}/${PKG_NAME}-${PKG_VERSION}/gettext-runtime include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,GETTEXT,gettext,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,GETTEXT,gettext,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --disable-java \ diff --git a/package/gkrellmd/Makefile b/package/gkrellmd/Makefile index badc29b43..6273f63b5 100644 --- a/package/gkrellmd/Makefile +++ b/package/gkrellmd/Makefile @@ -16,7 +16,7 @@ WRKDIST=${WRKDIR}/gkrellm-${PKG_VERSION}/server include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,GKRELLMD,gkrellmd,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,GKRELLMD,gkrellmd,${PKG_VERSION}-${PKG_RELEASE})) BUILD_STYLE= auto MAKE_FLAGS+= GLIB12_INCLUDE="-I${STAGING_DIR}/usr/include/glib-1.2 -I${STAGING_DIR}/usr/lib/glib/include" \ diff --git a/package/glib/Makefile b/package/glib/Makefile index 2cf78d0f7..659998f42 100644 --- a/package/glib/Makefile +++ b/package/glib/Makefile @@ -16,7 +16,7 @@ MASTER_SITES:= ftp://ftp.gtk.org/pub/gtk/v1.2/ \ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,GLIB1,glib1,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,GLIB1,glib1,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE= gnu CONFIGURE_ENV+= glib_cv_sizeof_gmutex=24 \ diff --git a/package/glib2/Makefile b/package/glib2/Makefile index ed13a26c2..424d40344 100644 --- a/package/glib2/Makefile +++ b/package/glib2/Makefile @@ -15,7 +15,7 @@ MASTER_SITES= ftp://ftp.gtk.org/pub/glib/2.18/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,GLIB2,glib2,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,GLIB2,glib2,${PKG_VERSION}-${PKG_RELEASE})) TCPPFLAGS+= -I'${STAGING_DIR}/usr/include' CONFIGURE_STYLE= gnu diff --git a/package/glibc/Makefile b/package/glibc/Makefile index b1ba2f93b..88bdd27ef 100644 --- a/package/glibc/Makefile +++ b/package/glibc/Makefile @@ -10,7 +10,7 @@ NO_DISTFILES:= 1 include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,GLIBC,glibc,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) +$(eval $(call PKG_template,GLIBC,glibc,$(PKG_VERSION)-$(PKG_RELEASE))) do-extract: diff --git a/package/gmediaserver/Makefile b/package/gmediaserver/Makefile index 8fda74940..5ca8b48ce 100644 --- a/package/gmediaserver/Makefile +++ b/package/gmediaserver/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= http://savannah.nongnu.org/download/gmediaserver/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,GMEDIASERVER,gmediaserver,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,GMEDIASERVER,gmediaserver,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE= gnu CONFIGURE_ENV+= LIBS=" -lixml -lthreadutil -lupnp -lz" \ diff --git a/package/gmp/Makefile b/package/gmp/Makefile index a467fa713..d2cb4fe34 100644 --- a/package/gmp/Makefile +++ b/package/gmp/Makefile @@ -14,7 +14,7 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBGMP,libgmp,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,LIBGMP,libgmp,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE:= gnu BUILD_STYLE:= auto diff --git a/package/gnutls/Makefile b/package/gnutls/Makefile index 6e04ee823..059f13c67 100644 --- a/package/gnutls/Makefile +++ b/package/gnutls/Makefile @@ -14,12 +14,6 @@ MASTER_SITES:= ${MASTER_SITE_GNU:=gnutls/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBGNUTLS,libgnutls,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,GNUTLS_UTILS,gnutls-utils,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,LIBGNUTLS_EXTRA,libgnutls-extra,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,LIBGNUTLS_OPENSSL,libgnutls-openssl,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,LIBGNUTLSXX,libgnutlsxx,${PKG_VERSION}-${PKG_RELEASE},${ARCH},${PKG_DEPENDS})) - ifeq (${ADK_COMPILE_GNUTLS_WITH_UCLIBCXX},y) TCXXFLAGS+= -fno-builtin -nostdinc++ -nodefaultlibs -I${STAGING_DIR}/usr/include/uClibc++ TLDFLAGS+= -nodefaultlibs -luClibc++ @@ -28,6 +22,12 @@ else PKG_DEPENDS:= libstdcxx endif +$(eval $(call PKG_template,LIBGNUTLS,libgnutls,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS})) +$(eval $(call PKG_template,GNUTLS_UTILS,gnutls-utils,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS})) +$(eval $(call PKG_template,LIBGNUTLS_EXTRA,libgnutls-extra,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS})) +$(eval $(call PKG_template,LIBGNUTLS_OPENSSL,libgnutls-openssl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS})) +$(eval $(call PKG_template,LIBGNUTLSXX,libgnutlsxx,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS})) + CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --without-libopencdk-prefix \ --without-libz-prefix diff --git a/package/gpg/Makefile b/package/gpg/Makefile index 2fa4ea584..2f32d09b5 100644 --- a/package/gpg/Makefile +++ b/package/gpg/Makefile @@ -14,7 +14,7 @@ MASTER_SITES:= ftp://ftp.franken.de/pub/crypt/mirror/ftp.gnupg.org/gcrypt/gnupg include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,GPG,gpg,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,GPG,gpg,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE:= gnu CONFIGURE_ENV+= ac_cv_c_bigendian=no \ diff --git a/package/gpm/Makefile b/package/gpm/Makefile index 0c0fd2a55..05750957f 100644 --- a/package/gpm/Makefile +++ b/package/gpm/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= http://unix.schottelius.org/gpm/archives/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,GPM,gpm,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,GPM,gpm,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE:= gnu TCFLAGS+= -I${WRKSRC}/src/headers diff --git a/package/gpsd/Makefile b/package/gpsd/Makefile index 15e4d1305..655a0b6c3 100644 --- a/package/gpsd/Makefile +++ b/package/gpsd/Makefile @@ -13,8 +13,8 @@ MASTER_SITES:= http://download.berlios.de/gpsd/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,GPSD,gpsd,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,GPSD_CLIENTS,gpsd-clients,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,GPSD,gpsd,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,GPSD_CLIENTS,gpsd-clients,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --without-x \ diff --git a/package/gsm/Makefile b/package/gsm/Makefile index 27dad9eb1..c0ceafeb0 100644 --- a/package/gsm/Makefile +++ b/package/gsm/Makefile @@ -14,8 +14,8 @@ WRKDIST= ${WRKDIR}/${PKG_NAME}-1.0-pl10 include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBGSM,libgsm,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,GSM_UTILS,gsm-utils,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,LIBGSM,libgsm,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,GSM_UTILS,gsm-utils,${PKG_VERSION}-${PKG_RELEASE})) XAKE_FLAGS+= COPTS="${TARGET_CFLAGS}" \ INSTALL_ROOT="${WRKINST}" diff --git a/package/haserl/Makefile b/package/haserl/Makefile index f1ed01580..f4f796e56 100644 --- a/package/haserl/Makefile +++ b/package/haserl/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=haserl/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,HASERL,haserl,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,HASERL,haserl,${PKG_VERSION}-${PKG_RELEASE})) TCFLAGS+= -DMAX_UPLOAD_KB=8192 CONFIGURE_STYLE= gnu diff --git a/package/hdparm/Makefile b/package/hdparm/Makefile index b77f02e33..c9b476d12 100644 --- a/package/hdparm/Makefile +++ b/package/hdparm/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=hdparm/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,HDPARM,hdparm,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,HDPARM,hdparm,${PKG_VERSION}-${PKG_RELEASE})) BUILD_STYLE= auto diff --git a/package/heimdal/Makefile b/package/heimdal/Makefile index 40a750fc9..1f1c10c3a 100644 --- a/package/heimdal/Makefile +++ b/package/heimdal/Makefile @@ -13,9 +13,9 @@ MASTER_SITES:= http://www.h5l.org/dist/src/ include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,HEIMDAL_SERVER,heimdal-server,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(eval $(call PKG_template,HEIMDAL_LIBS,heimdal-libs,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(eval $(call PKG_template,HEIMDAL_CLIENT_LIBS,heimdal-client-libs,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) +$(eval $(call PKG_template,HEIMDAL_SERVER,heimdal-server,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,HEIMDAL_LIBS,heimdal-libs,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,HEIMDAL_CLIENT_LIBS,heimdal-client-libs,$(PKG_VERSION)-$(PKG_RELEASE))) PKG_DEPENDS:= heimdal-libs, heimdal-client-libs, libncurses, diff --git a/package/heyu/Makefile b/package/heyu/Makefile index 8202d29f9..a87affdfc 100644 --- a/package/heyu/Makefile +++ b/package/heyu/Makefile @@ -14,7 +14,7 @@ MASTER_SITES:= http://heyu.tanj.com/download/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,HEYU,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,HEYU,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE})) do-build: (cd ${WRKBUILD} && ${BASH} ./Configure); diff --git a/package/hostapd/Makefile b/package/hostapd/Makefile index b5e957719..f33a61f4d 100644 --- a/package/hostapd/Makefile +++ b/package/hostapd/Makefile @@ -15,8 +15,8 @@ WRKSRC= ${WRKDIST}/${PKG_NAME} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,HOSTAPD,hostapd,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,HOSTAPD_UTILS,hostapd-utils,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,HOSTAPD,hostapd,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,HOSTAPD_UTILS,hostapd-utils,${PKG_VERSION}-${PKG_RELEASE})) BUILD_STYLE= auto #MAKE_FLAGS+= OPTFLAGS="${TARGET_CFLAGS}" diff --git a/package/htpdate/Makefile b/package/htpdate/Makefile index f0e9f77ce..2f2e32c02 100644 --- a/package/htpdate/Makefile +++ b/package/htpdate/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= http://www.clevervest.com/htp/archive/c/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,HTPDATE,htpdate,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,HTPDATE,htpdate,${PKG_VERSION}-${PKG_RELEASE})) BUILD_STYLE= auto diff --git a/package/httping/Makefile b/package/httping/Makefile index 4a1f76c1b..eadc97d79 100644 --- a/package/httping/Makefile +++ b/package/httping/Makefile @@ -20,7 +20,7 @@ endif include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,HTTPING,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,HTTPING,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE})) do-build: ${MAKE} -C ${WRKBUILD} -f ${WRKBUILD}/Makefile${SSL_ENABLE} \ diff --git a/package/httptunnel/Makefile b/package/httptunnel/Makefile index a848f93a3..145018c56 100644 --- a/package/httptunnel/Makefile +++ b/package/httptunnel/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= http://www.nocrew.org/software/httptunnel/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,HTTPTUNNEL,httptunnel,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,HTTPTUNNEL,httptunnel,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE= gnu BUILD_STYLE= auto diff --git a/package/icecast/Makefile b/package/icecast/Makefile index 77ff8f48f..76ece30f6 100644 --- a/package/icecast/Makefile +++ b/package/icecast/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= http://downloads.us.xiph.org/releases/icecast/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,ICECAST,icecast,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,ICECAST,icecast,${PKG_VERSION}-${PKG_RELEASE})) TCPPFLAGS+= -I${STAGING_DIR}/usr/include/libxml2 CONFIGURE_STYLE= autotool gnu diff --git a/package/id3lib/Makefile b/package/id3lib/Makefile index bb821c4ca..edd6d222b 100644 --- a/package/id3lib/Makefile +++ b/package/id3lib/Makefile @@ -20,7 +20,7 @@ endif include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,ID3LIB,id3lib,${PKG_VERSION}-${PKG_RELEASE},${ARCH},${PKG_DEPEND})) +$(eval $(call PKG_template,ID3LIB,id3lib,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPEND})) CONFIGURE_STYLE:= gnu CONFIGURE_ARGS+= --enable-cxx-warnings=no diff --git a/package/iftop/Makefile b/package/iftop/Makefile index 9981b1a87..87d732a51 100644 --- a/package/iftop/Makefile +++ b/package/iftop/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= http://www.ex-parrot.com/~pdw/iftop/download/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,IFTOP,iftop,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,IFTOP,iftop,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE= gnu BUILD_STYLE= auto diff --git a/package/igmpproxy/Makefile b/package/igmpproxy/Makefile index a52cc8133..90ff81152 100644 --- a/package/igmpproxy/Makefile +++ b/package/igmpproxy/Makefile @@ -15,7 +15,7 @@ WRKDIST= ${WRKDIR}/${PKG_NAME} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,IGMPPROXY,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,IGMPPROXY,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE})) do-build: ${MAKE} CC="${TARGET_CC}" CFLAGS="${TARGET_CFLAGS}" -C ${WRKBUILD}/src diff --git a/package/ipcad/Makefile b/package/ipcad/Makefile index 11cef0586..ca240ddd0 100644 --- a/package/ipcad/Makefile +++ b/package/ipcad/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=ipcad/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,IPCAD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,IPCAD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --with-ifst=linux \ diff --git a/package/iperf/Makefile b/package/iperf/Makefile index 411614d41..5434be2b9 100644 --- a/package/iperf/Makefile +++ b/package/iperf/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=iperf/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,IPERF,iperf,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,IPERF,iperf,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE= gnu BUILD_STYLE= auto diff --git a/package/iproute2/Makefile b/package/iproute2/Makefile index f688ccbee..58650bfd1 100644 --- a/package/iproute2/Makefile +++ b/package/iproute2/Makefile @@ -14,8 +14,8 @@ MASTER_SITES:= http://developer.osdl.org/dev/iproute2/download/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,IP,ip,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,TC,tc,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,IP,ip,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,TC,tc,${PKG_VERSION}-${PKG_RELEASE})) do-configure: ${SED} "s:-O2:${TARGET_CFLAGS}:g" ${WRKBUILD}/Makefile diff --git a/package/ipsec-tools/Makefile b/package/ipsec-tools/Makefile index 657bb83ef..5fe7101aa 100644 --- a/package/ipsec-tools/Makefile +++ b/package/ipsec-tools/Makefile @@ -14,7 +14,7 @@ MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=ipsec-tools/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,IPSEC_TOOLS,ipsec-tools,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,IPSEC_TOOLS,ipsec-tools,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --with-kernel-headers="${LINUX_DIR}/include" \ diff --git a/package/ipset/Makefile b/package/ipset/Makefile index c299bd88a..9828f7774 100644 --- a/package/ipset/Makefile +++ b/package/ipset/Makefile @@ -14,7 +14,7 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,IPSET,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,IPSET,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE})) XAKE_FLAGS+= KERNEL_DIR=${LINUX_DIR} PREFIX=/usr LD=$(TARGET_CROSS)ld BUILD_STYLE= auto diff --git a/package/iptables-snmp/Makefile b/package/iptables-snmp/Makefile index 3f8deecfc..319a2b8e5 100644 --- a/package/iptables-snmp/Makefile +++ b/package/iptables-snmp/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= http://www.nobiscuit.com/iptables-snmp/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,IPTABLES_SNMP,iptables-snmp,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,IPTABLES_SNMP,iptables-snmp,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE= gnu BUILD_STYLE= auto diff --git a/package/iptables/Makefile b/package/iptables/Makefile index ba7de8fad..150d5d68e 100644 --- a/package/iptables/Makefile +++ b/package/iptables/Makefile @@ -18,10 +18,10 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include ${TOPDIR}/mk/package.mk include ${LINUX_DIR}/.config -$(eval $(call PKG_template,IPTABLES,iptables,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,IPTABLES_UTILS,iptables-utils,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,IPTABLES,iptables,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,IPTABLES_UTILS,iptables-utils,${PKG_VERSION}-${PKG_RELEASE})) ifeq ($(ADK_IPV6),y) -$(eval $(call PKG_template,IP6TABLES,ip6tables,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,IP6TABLES,ip6tables,${PKG_VERSION}-${PKG_RELEASE})) endif CONFIGURE_STYLE:= gnu diff --git a/package/iptraf/Makefile b/package/iptraf/Makefile index 10d90f097..f56a89d4c 100644 --- a/package/iptraf/Makefile +++ b/package/iptraf/Makefile @@ -14,7 +14,7 @@ MASTER_SITES:= ftp://iptraf.seul.org/pub/iptraf/ \ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,IPTRAF,iptraf,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,IPTRAF,iptraf,${PKG_VERSION}-${PKG_RELEASE})) do-build: ${MAKE} -C ${WRKBUILD}/src \ diff --git a/package/irssi/Makefile b/package/irssi/Makefile index e7d8eb5e7..3c77111a1 100644 --- a/package/irssi/Makefile +++ b/package/irssi/Makefile @@ -15,7 +15,7 @@ PKG_DEPENDS:= glib2, libncurses include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,IRSSI,irssi,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,IRSSI,irssi,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --with-perl=no \ diff --git a/package/iw/Makefile b/package/iw/Makefile index 1aaa7d156..f651112fc 100644 --- a/package/iw/Makefile +++ b/package/iw/Makefile @@ -15,7 +15,7 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,IW,iw,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,IW,iw,${PKG_VERSION}-${PKG_RELEASE})) XAKE_FLAGS:= V=1 BUILD_STYLE:= auto diff --git a/package/jamvm/Makefile b/package/jamvm/Makefile index eb066fe46..945f30385 100644 --- a/package/jamvm/Makefile +++ b/package/jamvm/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=jamvm/} include ${TOPDIR}/mk/package.mk -${eval ${call PKG_template,JAMVM,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${ARCH}}} +${eval ${call PKG_template,JAMVM,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE}}} CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --enable-ffi diff --git a/package/jpeg/Makefile b/package/jpeg/Makefile index 731222e86..a5a94ea8a 100644 --- a/package/jpeg/Makefile +++ b/package/jpeg/Makefile @@ -15,7 +15,7 @@ DISTFILES:= ${PKG_NAME}src.v${PKG_VERSION}.tar.gz include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBJPEG,libjpeg,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,LIBJPEG,libjpeg,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE:= gnu BUILD_STYLE:= auto diff --git a/package/kismet/Makefile b/package/kismet/Makefile index 76d0b824f..5638908ac 100644 --- a/package/kismet/Makefile +++ b/package/kismet/Makefile @@ -13,10 +13,10 @@ MASTER_SITES:= http://www.kismetwireless.net/code/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,KISMET,kismet,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,KISMET_CLIENT,kismet-client,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,KISMET_DRONE,kismet-drone,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,KISMET_SERVER,kismet-server,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,KISMET,kismet,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,KISMET_CLIENT,kismet-client,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,KISMET_DRONE,kismet-drone,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,KISMET_SERVER,kismet-server,${PKG_VERSION}-${PKG_RELEASE})) ifeq ($(ADK_COMPILE_KISMET_WITH_UCLIBCXX),y) TCFLAGS+= -fno-builtin -fno-rtti -nostdinc++ -I${STAGING_DIR}/usr/include/uClibc++ diff --git a/package/knock/Makefile b/package/knock/Makefile index 13e57d43b..349e78794 100644 --- a/package/knock/Makefile +++ b/package/knock/Makefile @@ -13,8 +13,8 @@ MASTER_SITES:= http://www.zeroflux.org/proj/knock/files/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,KNOCK,knock,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,KNOCKD,knockd,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,KNOCK,knock,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,KNOCKD,knockd,${PKG_VERSION}-${PKG_RELEASE})) TCXXFLAGS+= ${TCPPFLAGS} ${TCFLAGS} CONFIGURE_STYLE= gnu diff --git a/package/krb5/Makefile b/package/krb5/Makefile index 062568d97..049bf44af 100644 --- a/package/krb5/Makefile +++ b/package/krb5/Makefile @@ -16,8 +16,8 @@ WRKSRC= ${WRKDIST}/src include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,KRB5_SERVER,krb5-server,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(eval $(call PKG_template,KRB5_LIBS,krb5-libs,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) +$(eval $(call PKG_template,KRB5_SERVER,krb5-server,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,KRB5_LIBS,krb5-libs,$(PKG_VERSION)-$(PKG_RELEASE))) CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --without-krb4 --disable-static --without-tcl diff --git a/package/l2tpns/Makefile b/package/l2tpns/Makefile index f78b3c421..5a18d3bf4 100644 --- a/package/l2tpns/Makefile +++ b/package/l2tpns/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=l2tpns/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,L2TPNS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,L2TPNS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE})) BUILD_FLAGS= auto INSTALL_STYLE= auto diff --git a/package/lame/Makefile b/package/lame/Makefile index f60c0eaa8..1509f62d7 100644 --- a/package/lame/Makefile +++ b/package/lame/Makefile @@ -13,8 +13,8 @@ MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=lame/} include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,LAME,lame,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(eval $(call PKG_template,LIBLAME,liblame,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) +$(eval $(call PKG_template,LAME,lame,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,LIBLAME,liblame,$(PKG_VERSION)-$(PKG_RELEASE))) CONFIGURE_STYLE= gnu BUILD_STYLE= auto diff --git a/package/less/Makefile b/package/less/Makefile index 59f643965..b98db64ab 100644 --- a/package/less/Makefile +++ b/package/less/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= http://www.greenwoodsoftware.com/less/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LESS,less,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,LESS,less,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --without-regex diff --git a/package/libICE/Makefile b/package/libICE/Makefile index 8a0b79c37..2a48ee410 100644 --- a/package/libICE/Makefile +++ b/package/libICE/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_XORG} include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,LIBICE,libice,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) +$(eval $(call PKG_template,LIBICE,libice,$(PKG_VERSION)-$(PKG_RELEASE))) CONFIGURE_STYLE= gnu BUILD_STYLE= auto diff --git a/package/libSM/Makefile b/package/libSM/Makefile index 25b4364dd..6dc534509 100644 --- a/package/libSM/Makefile +++ b/package/libSM/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_XORG} include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,LIBSM,libsm,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) +$(eval $(call PKG_template,LIBSM,libsm,$(PKG_VERSION)-$(PKG_RELEASE))) CONFIGURE_STYLE= gnu BUILD_STYLE= auto diff --git a/package/libX11/Makefile b/package/libX11/Makefile index 2709dd1f7..14b47709f 100644 --- a/package/libX11/Makefile +++ b/package/libX11/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_XORG} include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,LIBX11,libx11,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) +$(eval $(call PKG_template,LIBX11,libx11,$(PKG_VERSION)-$(PKG_RELEASE))) CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --enable-xlocale \ diff --git a/package/libXau/Makefile b/package/libXau/Makefile index af0d66956..e3ed45a23 100644 --- a/package/libXau/Makefile +++ b/package/libXau/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_XORG} include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,LIBXAU,libxau,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) +$(eval $(call PKG_template,LIBXAU,libxau,$(PKG_VERSION)-$(PKG_RELEASE))) CONFIGURE_STYLE= gnu BUILD_STYLE= auto diff --git a/package/libXaw/Makefile b/package/libXaw/Makefile index cb757b3c2..c55444105 100644 --- a/package/libXaw/Makefile +++ b/package/libXaw/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_XORG} include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,LIBXAW,libxaw,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) +$(eval $(call PKG_template,LIBXAW,libxaw,$(PKG_VERSION)-$(PKG_RELEASE))) CONFIGURE_STYLE= gnu BUILD_STYLE= auto diff --git a/package/libXdmcp/Makefile b/package/libXdmcp/Makefile index 1cb6245b2..06872b313 100644 --- a/package/libXdmcp/Makefile +++ b/package/libXdmcp/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_XORG} include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,LIBXDMCP,libxdmcp,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) +$(eval $(call PKG_template,LIBXDMCP,libxdmcp,$(PKG_VERSION)-$(PKG_RELEASE))) CONFIGURE_STYLE= gnu BUILD_STYLE= auto diff --git a/package/libXext/Makefile b/package/libXext/Makefile index 27ba0cae0..18aeedd17 100644 --- a/package/libXext/Makefile +++ b/package/libXext/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_XORG} include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,LIBXEXT,libxext,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) +$(eval $(call PKG_template,LIBXEXT,libxext,$(PKG_VERSION)-$(PKG_RELEASE))) CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --disable-malloc0returnsnull diff --git a/package/libXfont/Makefile b/package/libXfont/Makefile index 8f0d925a7..ec1c61dff 100644 --- a/package/libXfont/Makefile +++ b/package/libXfont/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_XORG} include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,LIBXFONT,libxfont,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) +$(eval $(call PKG_template,LIBXFONT,libxfont,$(PKG_VERSION)-$(PKG_RELEASE))) CONFIGURE_STYLE= gnu BUILD_STYLE= auto diff --git a/package/libXmu/Makefile b/package/libXmu/Makefile index c75f945fb..135c5da78 100644 --- a/package/libXmu/Makefile +++ b/package/libXmu/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_XORG} include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,LIBXMU,libxmu,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) +$(eval $(call PKG_template,LIBXMU,libxmu,$(PKG_VERSION)-$(PKG_RELEASE))) CONFIGURE_STYLE= gnu #CONFIGURE_ARGS+= --disable-malloc0returnsnull diff --git a/package/libXpm/Makefile b/package/libXpm/Makefile index 27dd66e32..33ce075c1 100644 --- a/package/libXpm/Makefile +++ b/package/libXpm/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_XORG} include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,LIBXPM,libxpm,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) +$(eval $(call PKG_template,LIBXPM,libxpm,$(PKG_VERSION)-$(PKG_RELEASE))) CONFIGURE_STYLE= gnu BUILD_STYLE= auto diff --git a/package/libXt/Makefile b/package/libXt/Makefile index 0253f29f8..fab8059ac 100644 --- a/package/libXt/Makefile +++ b/package/libXt/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_XORG} include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,LIBXT,libxt,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) +$(eval $(call PKG_template,LIBXT,libxt,$(PKG_VERSION)-$(PKG_RELEASE))) CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --disable-malloc0returnsnull \ diff --git a/package/libXxf86dga/Makefile b/package/libXxf86dga/Makefile index a8e4e526d..afc5103ce 100644 --- a/package/libXxf86dga/Makefile +++ b/package/libXxf86dga/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_XORG} include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,LIBXXF86DGA,libxxf86dga,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) +$(eval $(call PKG_template,LIBXXF86DGA,libxxf86dga,$(PKG_VERSION)-$(PKG_RELEASE))) CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --disable-malloc0returnsnull diff --git a/package/libao/Makefile b/package/libao/Makefile index 1cb4494e5..17e834427 100644 --- a/package/libao/Makefile +++ b/package/libao/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= http://downloads.xiph.org/releases/ao/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBAO,libao,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,LIBAO,libao,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --disable-esd \ diff --git a/package/libart/Makefile b/package/libart/Makefile index a579a7338..70f281a97 100644 --- a/package/libart/Makefile +++ b/package/libart/Makefile @@ -15,7 +15,7 @@ WRKDIST= ${WRKDIR}/${PKG_NAME}_lgpl-${PKG_VERSION} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBART,libart,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,LIBART,libart,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE= gnu BUILD_STYLE= auto diff --git a/package/libaudiofile/Makefile b/package/libaudiofile/Makefile index 2290776e4..11b3d6b45 100644 --- a/package/libaudiofile/Makefile +++ b/package/libaudiofile/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= http://www.freewrt.org/distfiles/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBAUDIOFILE,libaudiofile,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,LIBAUDIOFILE,libaudiofile,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE= gnu CONFIGURE_ENV+= ac_cv_linux_vers=2 diff --git a/package/libcli/Makefile b/package/libcli/Makefile index e4d42346c..025ed48b1 100755 --- a/package/libcli/Makefile +++ b/package/libcli/Makefile @@ -14,7 +14,7 @@ MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=libcli/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBCLI,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,LIBCLI,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE})) BUILD_STYLE= auto INSTALL_STYLE= auto diff --git a/package/libdaemon/Makefile b/package/libdaemon/Makefile index cf61b8328..92d26cf10 100644 --- a/package/libdaemon/Makefile +++ b/package/libdaemon/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= http://0pointer.de/lennart/projects/libdaemon/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBDAEMON,libdaemon,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,LIBDAEMON,libdaemon,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE= gnu CONFIGURE_ENV+= ac_cv_func_setpgrp_void=yes diff --git a/package/libdb/Makefile b/package/libdb/Makefile index 01bb31039..5b812c1f8 100644 --- a/package/libdb/Makefile +++ b/package/libdb/Makefile @@ -15,7 +15,7 @@ WRKDIST= ${WRKDIR}/db-${PKG_VERSION} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBDB,libdb,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,LIBDB,libdb,${PKG_VERSION}-${PKG_RELEASE})) ifeq ($(DEBUG),1) PKG_CONFIGURE:= --enable-debug diff --git a/package/libdnet/Makefile b/package/libdnet/Makefile index 8b25414bb..f7e53890c 100644 --- a/package/libdnet/Makefile +++ b/package/libdnet/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=$(PKG_NAME)/} include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,LIBDNET,libdnet,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) +$(eval $(call PKG_template,LIBDNET,libdnet,$(PKG_VERSION)-$(PKG_RELEASE))) CONFIGURE_STYLE= gnu CONFIGURE_ENV+= ac_cv_dnet_bsd_bpf=no diff --git a/package/libelf/Makefile b/package/libelf/Makefile index 920747eea..8bf71926e 100644 --- a/package/libelf/Makefile +++ b/package/libelf/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= http://www.mr511.de/software/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBELF,libelf,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,LIBELF,libelf,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE= gnu CONFIGURE_ENV+= mr_cv_target_elf=yes \ diff --git a/package/libevent/Makefile b/package/libevent/Makefile index 37cc0cc04..0093aa72f 100644 --- a/package/libevent/Makefile +++ b/package/libevent/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= http://www.monkey.org/~provos/ include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,LIBEVENT,libevent,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) +$(eval $(call PKG_template,LIBEVENT,libevent,$(PKG_VERSION)-$(PKG_RELEASE))) CONFIGURE_STYLE= gnu BUILD_STYLE= auto diff --git a/package/libffi/Makefile b/package/libffi/Makefile index 83c03b2d9..8cc13b597 100644 --- a/package/libffi/Makefile +++ b/package/libffi/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= ftp://sourceware.org/pub/libffi/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBFFI,libffi,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,LIBFFI,libffi,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE= autotool gnu BUILD_STYLE= auto diff --git a/package/libfontenc/Makefile b/package/libfontenc/Makefile index 0a750a3ad..cf4008a2d 100644 --- a/package/libfontenc/Makefile +++ b/package/libfontenc/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_XORG} include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,LIBFONTENC,libfontenc,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) +$(eval $(call PKG_template,LIBFONTENC,libfontenc,$(PKG_VERSION)-$(PKG_RELEASE))) CONFIGURE_STYLE= gnu BUILD_STYLE= auto diff --git a/package/libgcrypt/Makefile b/package/libgcrypt/Makefile index 789466831..fd7c283d6 100644 --- a/package/libgcrypt/Makefile +++ b/package/libgcrypt/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= ftp://ftp.gnupg.org/gcrypt/libgcrypt/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBGCRYPT,libgcrypt,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,LIBGCRYPT,libgcrypt,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --disable-asm \ diff --git a/package/libgd/Makefile b/package/libgd/Makefile index adc3b780f..43ae0a972 100644 --- a/package/libgd/Makefile +++ b/package/libgd/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= http://www.libgd.org/releases/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBGD,libgd,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,LIBGD,libgd,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE= gnu CONFIGURE_ENV+= LIBPNG12_CONFIG="${STAGING_DIR}/usr/bin/libpng12-config" diff --git a/package/libgdbm/Makefile b/package/libgdbm/Makefile index 2677c9a3b..91c3d60f2 100644 --- a/package/libgdbm/Makefile +++ b/package/libgdbm/Makefile @@ -17,7 +17,7 @@ WRKDIST= ${WRKDIR}/gdbm-${PKG_VERSION} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBGDBM,libgdbm,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,LIBGDBM,libgdbm,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE= gnu BUILD_STYLE= auto diff --git a/package/libgpg-error/Makefile b/package/libgpg-error/Makefile index d6cd2ee09..9881e2279 100644 --- a/package/libgpg-error/Makefile +++ b/package/libgpg-error/Makefile @@ -17,7 +17,7 @@ MASTER_SITES:= ftp://ftp.gnupg.org/gcrypt/libgpg-error/ \ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBGPG_ERROR,libgpg-error,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,LIBGPG_ERROR,libgpg-error,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE= gnu BUILD_STYLE= auto diff --git a/package/libgssglue/Makefile b/package/libgssglue/Makefile index de69e7d2f..55533f65d 100644 --- a/package/libgssglue/Makefile +++ b/package/libgssglue/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= http://www.citi.umich.edu/projects/nfsv4/linux/libgssglue/ include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,LIBGSSGLUE,libgssglue,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) +$(eval $(call PKG_template,LIBGSSGLUE,libgssglue,$(PKG_VERSION)-$(PKG_RELEASE))) CONFIGURE_STYLE= gnu BUILD_STYLE= auto diff --git a/package/libiconv/Makefile b/package/libiconv/Makefile index 501782875..a84566949 100644 --- a/package/libiconv/Makefile +++ b/package/libiconv/Makefile @@ -14,7 +14,7 @@ MASTER_SITES:= ${MASTER_SITE_GNU:=libiconv/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBICONV,libiconv,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,LIBICONV,libiconv,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE= gnu BUILD_STYLE= auto diff --git a/package/libid3tag/Makefile b/package/libid3tag/Makefile index 0d1032c2b..8712868d3 100644 --- a/package/libid3tag/Makefile +++ b/package/libid3tag/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=mad/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBID3TAG,libid3tag,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,LIBID3TAG,libid3tag,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --disable-debugging \ diff --git a/package/liblzo/Makefile b/package/liblzo/Makefile index 6b8325d84..e78dd5ff6 100644 --- a/package/liblzo/Makefile +++ b/package/liblzo/Makefile @@ -14,7 +14,7 @@ MASTER_SITES:= http://www.oberhumer.com/opensource/lzo/download/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBLZO,liblzo,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,LIBLZO,liblzo,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE:= gnu CONFIGURE_ARGS+= --enable-static diff --git a/package/libmad/Makefile b/package/libmad/Makefile index 55242169d..3828fa066 100644 --- a/package/libmad/Makefile +++ b/package/libmad/Makefile @@ -15,7 +15,7 @@ MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=mad/} \ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBMAD,libmad,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,LIBMAD,libmad,${PKG_VERSION}-${PKG_RELEASE})) FPM:=default ifeq (${ARCH},i386) diff --git a/package/libnet/Makefile b/package/libnet/Makefile index bc3a13b97..9eb7a3eeb 100644 --- a/package/libnet/Makefile +++ b/package/libnet/Makefile @@ -19,7 +19,7 @@ ifeq (${ARCH},mips) ENDIAN:=big endif -$(eval $(call PKG_template,LIBNET,libnet,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,LIBNET,libnet,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE= gnu CONFIGURE_ENV+= ac_libnet_have_pf_packet=yes \ diff --git a/package/libnfsidmap/Makefile b/package/libnfsidmap/Makefile index 2a104e9ab..e9cb63fc9 100644 --- a/package/libnfsidmap/Makefile +++ b/package/libnfsidmap/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap/ include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,LIBNFSIDMAP,libnfsidmap,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) +$(eval $(call PKG_template,LIBNFSIDMAP,libnfsidmap,$(PKG_VERSION)-$(PKG_RELEASE))) CONFIGURE_STYLE= gnu BUILD_STYLE= auto diff --git a/package/libnids/Makefile b/package/libnids/Makefile index eb0f92e79..99aa71231 100644 --- a/package/libnids/Makefile +++ b/package/libnids/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= http://www.packetfactory.net/projects/libnids/dist/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBNIDS,libnids,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,LIBNIDS,libnids,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --with-libnet="${STAGING_DIR}/usr" \ diff --git a/package/libnl/Makefile b/package/libnl/Makefile index 8e66802ea..6c4b7cb18 100644 --- a/package/libnl/Makefile +++ b/package/libnl/Makefile @@ -14,7 +14,7 @@ MASTER_SITES:= http://downloads.openwrt.org/sources/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBNL,libnl,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,LIBNL,libnl,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE:= gnu BUILD_STYLE:= auto diff --git a/package/libogg/Makefile b/package/libogg/Makefile index 575cdeb2f..2d8f56715 100644 --- a/package/libogg/Makefile +++ b/package/libogg/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= http://downloads.xiph.org/releases/ogg/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBOGG,libogg,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,LIBOGG,libogg,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE= gnu BUILD_STYLE= auto diff --git a/package/libol/Makefile b/package/libol/Makefile index 0c17eb8f5..118827373 100644 --- a/package/libol/Makefile +++ b/package/libol/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= http://www.balabit.com/downloads/files/libol/0.3/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBOL,libol,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,LIBOL,libol,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE= gnu BUILD_STYLE= auto diff --git a/package/libosip2/Makefile b/package/libosip2/Makefile index 201102c6a..1377f6421 100644 --- a/package/libosip2/Makefile +++ b/package/libosip2/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_GNU:=osip/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBOSIP2,libosip2,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,LIBOSIP2,libosip2,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --disable-trace \ diff --git a/package/libowfat/Makefile b/package/libowfat/Makefile index cb288b823..0d05d7012 100644 --- a/package/libowfat/Makefile +++ b/package/libowfat/Makefile @@ -15,7 +15,7 @@ DISTFILES= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBOWFAT,libowfat,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,LIBOWFAT,libowfat,${PKG_VERSION}-${PKG_RELEASE})) BUILD_STYLE= auto INSTALL_STYLE= auto diff --git a/package/libp11/Makefile b/package/libp11/Makefile index 5d6b8530b..6a3deed9e 100644 --- a/package/libp11/Makefile +++ b/package/libp11/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= http://www.opensc-project.org/files/libp11/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBP11,libp11,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,LIBP11,libp11,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE:= gnu BUILD_STYLE:= auto diff --git a/package/libpcap/Makefile b/package/libpcap/Makefile index 528d1c65c..d89bf36a5 100644 --- a/package/libpcap/Makefile +++ b/package/libpcap/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= http://www.tcpdump.org/release/ include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,LIBPCAP,libpcap,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) +$(eval $(call PKG_template,LIBPCAP,libpcap,$(PKG_VERSION)-$(PKG_RELEASE))) CONFIGURE_STYLE= gnu CONFIGURE_ENV+= ac_cv_linux_vers=26 diff --git a/package/libpciaccess/Makefile b/package/libpciaccess/Makefile index e0abce898..9668bd1e8 100644 --- a/package/libpciaccess/Makefile +++ b/package/libpciaccess/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_XORG} include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,LIBPCIACCESS,libpciaccess,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) +$(eval $(call PKG_template,LIBPCIACCESS,libpciaccess,$(PKG_VERSION)-$(PKG_RELEASE))) CONFIGURE_STYLE= autotool gnu BUILD_STYLE= auto diff --git a/package/libpng/Makefile b/package/libpng/Makefile index 0e3b3a733..6b0a332e6 100644 --- a/package/libpng/Makefile +++ b/package/libpng/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=libpng/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBPNG,libpng,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,LIBPNG,libpng,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE= gnu BUILD_STYLE= auto diff --git a/package/libpri/Makefile b/package/libpri/Makefile index ab2619805..f3b7cc8da 100644 --- a/package/libpri/Makefile +++ b/package/libpri/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= http://www.asterisk-support.de/mirror/libpri/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBPRI,libpri,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,LIBPRI,libpri,${PKG_VERSION}-${PKG_RELEASE})) BUILD_STYLE:= auto MAKE_FLAGS+= CC='${TARGET_CC}' diff --git a/package/libpthread/Makefile b/package/libpthread/Makefile index 483fcc136..d337a441d 100644 --- a/package/libpthread/Makefile +++ b/package/libpthread/Makefile @@ -16,7 +16,7 @@ NO_DISTFILES:= 1 include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBPTHREAD,libpthread,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,LIBPTHREAD,libpthread,${PKG_VERSION}-${PKG_RELEASE})) do-install: ${INSTALL_DIR} ${IDIR_LIBPTHREAD}/lib diff --git a/package/librpcsecgss/Makefile b/package/librpcsecgss/Makefile index 17a6404b2..dcda31970 100644 --- a/package/librpcsecgss/Makefile +++ b/package/librpcsecgss/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= http://www.citi.umich.edu/projects/nfsv4/linux/librpcsecgss/ include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,LIBRPCSECGSS,librpcsecgss,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) +$(eval $(call PKG_template,LIBRPCSECGSS,librpcsecgss,$(PKG_VERSION)-$(PKG_RELEASE))) CONFIGURE_STYLE= autotool gnu BUILD_STYLE= auto diff --git a/package/libshout/Makefile b/package/libshout/Makefile index 97ff7ad6c..b0c9e75e5 100644 --- a/package/libshout/Makefile +++ b/package/libshout/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= http://downloads.us.xiph.org/releases/libshout/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBSHOUT,libshout,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,LIBSHOUT,libshout,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --with-speex=no \ diff --git a/package/libsigc++/Makefile b/package/libsigc++/Makefile index 95cec59db..7a10a627f 100644 --- a/package/libsigc++/Makefile +++ b/package/libsigc++/Makefile @@ -14,7 +14,7 @@ MASTER_SITES:= ${MASTER_SITE_GNOME:=libsigc++/2.2/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBSIGCXX,libsigc++,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,LIBSIGCXX,libsigc++,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE:= gnu BUILD_STYLE:= auto diff --git a/package/libstdcxx/Makefile b/package/libstdcxx/Makefile index e49735472..4e9a1c54a 100644 --- a/package/libstdcxx/Makefile +++ b/package/libstdcxx/Makefile @@ -11,7 +11,7 @@ NO_DISTFILES:= 1 include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBSTDCXX,libstdcxx,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,LIBSTDCXX,libstdcxx,${PKG_VERSION}-${PKG_RELEASE})) do-install: ${INSTALL_DIR} ${IDIR_LIBSTDCXX}/lib diff --git a/package/libtasn1/Makefile b/package/libtasn1/Makefile index dbb3b7e61..159b59dad 100644 --- a/package/libtasn1/Makefile +++ b/package/libtasn1/Makefile @@ -17,7 +17,7 @@ MASTER_SITES:= ftp://ftp.gnutls.org/pub/gnutls/libtasn1/ \ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBTASN1,libtasn1,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,LIBTASN1,libtasn1,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE= gnu BUILD_STYLE= auto diff --git a/package/libthread_db/Makefile b/package/libthread_db/Makefile index 4741ce3a5..f7a1e7a3e 100644 --- a/package/libthread_db/Makefile +++ b/package/libthread_db/Makefile @@ -16,7 +16,7 @@ NO_DISTFILES:= 1 include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBTHREAD_DB,libthread-db,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,LIBTHREAD_DB,libthread-db,${PKG_VERSION}-${PKG_RELEASE})) do-install: ${INSTALL_DIR} ${IDIR_LIBTHREAD_DB}/lib diff --git a/package/libtiff/Makefile b/package/libtiff/Makefile index 7f50c2e68..db6190d2b 100644 --- a/package/libtiff/Makefile +++ b/package/libtiff/Makefile @@ -15,7 +15,7 @@ WRKDIST= ${WRKDIR}/tiff-${PKG_VERSION} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBTIFF,libtiff,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,LIBTIFF,libtiff,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --disable-cxx diff --git a/package/libtirpc/Makefile b/package/libtirpc/Makefile index c9ec41721..1b81fdb16 100644 --- a/package/libtirpc/Makefile +++ b/package/libtirpc/Makefile @@ -14,7 +14,7 @@ DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.bz2 include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBTIRPC,libtirpc,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,LIBTIRPC,libtirpc,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE:= autotool gnu ifneq (${ADK_COMPILE_NFS_UTILS_WITH_KERBEROS},y) diff --git a/package/libtool/Makefile b/package/libtool/Makefile index 4a23de141..fb1e5d29d 100644 --- a/package/libtool/Makefile +++ b/package/libtool/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_GNU:=libtool/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBLTDL,libltdl,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,LIBLTDL,libltdl,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE= gnu BUILD_STYLE= auto diff --git a/package/libtorrent/Makefile b/package/libtorrent/Makefile index 8dc335cd8..d5bfd3ee6 100644 --- a/package/libtorrent/Makefile +++ b/package/libtorrent/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= http://libtorrent.rakshasa.no/downloads/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBTORRENT,libtorrent,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,LIBTORRENT,libtorrent,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --enable-aligned diff --git a/package/libupnp/Makefile b/package/libupnp/Makefile index 09e458f05..5ce55ee72 100644 --- a/package/libupnp/Makefile +++ b/package/libupnp/Makefile @@ -14,7 +14,7 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBUPNP,libupnp,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,LIBUPNP,libupnp,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE:= autotool gnu CONFIGURE_ARGS+= --disable-samples diff --git a/package/libusb/Makefile b/package/libusb/Makefile index ba6fe0a65..c46ff7926 100644 --- a/package/libusb/Makefile +++ b/package/libusb/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=libusb/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBUSB,libusb,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,LIBUSB,libusb,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE:= gnu CONFIGURE_ENV+= ac_cv_c_bigendian=no diff --git a/package/libvorbis/Makefile b/package/libvorbis/Makefile index ea4f4f56a..a86c24d7e 100644 --- a/package/libvorbis/Makefile +++ b/package/libvorbis/Makefile @@ -13,8 +13,8 @@ MASTER_SITES:= http://downloads.xiph.org/releases/vorbis/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBVORBIS,libvorbis,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,LIBVORBISENC,libvorbisenc,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,LIBVORBIS,libvorbis,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,LIBVORBISENC,libvorbisenc,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE= gnu CONFIGURE_ENV+= LIBS="-lm -logg" diff --git a/package/libvorbisidec/Makefile b/package/libvorbisidec/Makefile index 89158db04..abf7b63aa 100644 --- a/package/libvorbisidec/Makefile +++ b/package/libvorbisidec/Makefile @@ -16,7 +16,7 @@ WRKDIST= ${WRKDIR}/$(PKG_NAME)-$(PKG_VERSION)+$(PKG_VARIANT) include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBVORBISIDEC,libvorbisidec,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,LIBVORBISIDEC,libvorbisidec,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE= gnu BUILD_STYLE= auto diff --git a/package/libxkbfile/Makefile b/package/libxkbfile/Makefile index ddc8cd296..8888db290 100644 --- a/package/libxkbfile/Makefile +++ b/package/libxkbfile/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_XORG} include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,LIBXKBFILE,libxkbfile,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) +$(eval $(call PKG_template,LIBXKBFILE,libxkbfile,$(PKG_VERSION)-$(PKG_RELEASE))) CONFIGURE_STYLE= gnu BUILD_STYLE= auto diff --git a/package/libxml2/Makefile b/package/libxml2/Makefile index 3a8afc371..6d12d115c 100644 --- a/package/libxml2/Makefile +++ b/package/libxml2/Makefile @@ -14,7 +14,7 @@ MASTER_SITES:= http://xmlsoft.org/sources/ \ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBXML2,libxml2,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,LIBXML2,libxml2,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --without-c14n \ diff --git a/package/libxslt/Makefile b/package/libxslt/Makefile index 39fa934cc..ded1a2de8 100644 --- a/package/libxslt/Makefile +++ b/package/libxslt/Makefile @@ -14,7 +14,7 @@ MASTER_SITES:= http://xmlsoft.org/sources/ \ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBXSLT,libxslt,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,LIBXSLT,libxslt,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --with-libxml-prefix="${STAGING_DIR}/usr" \ diff --git a/package/lighttpd/Makefile b/package/lighttpd/Makefile index 7cd2f6c29..3971cea45 100644 --- a/package/lighttpd/Makefile +++ b/package/lighttpd/Makefile @@ -23,23 +23,23 @@ ${2}-install: endef -$(eval $(call PKG_template,LIGHTTPD,lighttpd,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(eval $(call PKG_template,LIGHTTPD_MOD_ACCESSLOG,lighttpd-mod-accesslog,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(eval $(call PKG_template,LIGHTTPD_MOD_ALIAS,lighttpd-mod-alias,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(eval $(call PKG_template,LIGHTTPD_MOD_AUTH,lighttpd-mod-auth,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(eval $(call PKG_template,LIGHTTPD_MOD_CGI,lighttpd-mod-cgi,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(eval $(call PKG_template,LIGHTTPD_MOD_EVASIVE,lighttpd-mod-evasive,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(eval $(call PKG_template,LIGHTTPD_MOD_EXPIRE,lighttpd-mod-expire,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(eval $(call PKG_template,LIGHTTPD_MOD_FASTCGI,lighttpd-mod-fastcgi,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(eval $(call PKG_template,LIGHTTPD_MOD_PROXY,lighttpd-mod-proxy,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(eval $(call PKG_template,LIGHTTPD_MOD_REDIRECT,lighttpd-mod-redirect,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(eval $(call PKG_template,LIGHTTPD_MOD_REWRITE,lighttpd-mod-rewrite,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(eval $(call PKG_template,LIGHTTPD_MOD_SETENV,lighttpd-mod-setenv,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(eval $(call PKG_template,LIGHTTPD_MOD_SIMPLE_VHOST,lighttpd-mod-simple-vhost,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(eval $(call PKG_template,LIGHTTPD_MOD_SSI,lighttpd-mod-ssi,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(eval $(call PKG_template,LIGHTTPD_MOD_STATUS,lighttpd-mod-status,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(eval $(call PKG_template,LIGHTTPD_MOD_USERTRACK,lighttpd-mod-usertrack,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(eval $(call PKG_template,LIGHTTPD_MOD_WEBDAV,lighttpd-mod-webdav,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) +$(eval $(call PKG_template,LIGHTTPD,lighttpd,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,LIGHTTPD_MOD_ACCESSLOG,lighttpd-mod-accesslog,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,LIGHTTPD_MOD_ALIAS,lighttpd-mod-alias,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,LIGHTTPD_MOD_AUTH,lighttpd-mod-auth,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,LIGHTTPD_MOD_CGI,lighttpd-mod-cgi,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,LIGHTTPD_MOD_EVASIVE,lighttpd-mod-evasive,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,LIGHTTPD_MOD_EXPIRE,lighttpd-mod-expire,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,LIGHTTPD_MOD_FASTCGI,lighttpd-mod-fastcgi,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,LIGHTTPD_MOD_PROXY,lighttpd-mod-proxy,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,LIGHTTPD_MOD_REDIRECT,lighttpd-mod-redirect,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,LIGHTTPD_MOD_REWRITE,lighttpd-mod-rewrite,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,LIGHTTPD_MOD_SETENV,lighttpd-mod-setenv,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,LIGHTTPD_MOD_SIMPLE_VHOST,lighttpd-mod-simple-vhost,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,LIGHTTPD_MOD_SSI,lighttpd-mod-ssi,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,LIGHTTPD_MOD_STATUS,lighttpd-mod-status,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,LIGHTTPD_MOD_USERTRACK,lighttpd-mod-usertrack,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,LIGHTTPD_MOD_WEBDAV,lighttpd-mod-webdav,$(PKG_VERSION)-$(PKG_RELEASE))) $(eval $(call PKG_mod_template,LIGHTTPD_MOD_ACCESSLOG,accesslog)) $(eval $(call PKG_mod_template,LIGHTTPD_MOD_ALIAS,alias)) diff --git a/package/links/Makefile b/package/links/Makefile index fb6070b52..d2e8b5e5c 100644 --- a/package/links/Makefile +++ b/package/links/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= http://links.twibright.com/download/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LINKS,links,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,LINKS,links,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE:= gnu CONFIGURE_ARGS+= --enable-graphics \ diff --git a/package/linux-atm/Makefile b/package/linux-atm/Makefile index 32b6665e0..0d9eac1a7 100644 --- a/package/linux-atm/Makefile +++ b/package/linux-atm/Makefile @@ -14,8 +14,8 @@ MASTER_SITES:= http://ftp.debian.org/debian/pool/main/l/linux-atm/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LINUX_ATM,linux-atm,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,BR2684CTL,br2684ctl,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,LINUX_ATM,linux-atm,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,BR2684CTL,br2684ctl,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE= gnu BUILD_STYLE= auto diff --git a/package/logrotate/Makefile b/package/logrotate/Makefile index 52eed5347..4d0ab1abb 100644 --- a/package/logrotate/Makefile +++ b/package/logrotate/Makefile @@ -14,7 +14,7 @@ MASTER_SITES:= http://ftp.debian.org/debian/pool/main/l/logrotate/ include ${TOPDIR}/mk/package.mk -${eval ${call PKG_template,LOGROTATE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${ARCH}}} +${eval ${call PKG_template,LOGROTATE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE}}} TCFLAGS+= -D_GNU_SOURCE -DLinux -DVERSION=\"$(VERSION)\" ALL_TARGET= logrotate diff --git a/package/lrzsz/Makefile b/package/lrzsz/Makefile index 60cac545f..6866002f7 100644 --- a/package/lrzsz/Makefile +++ b/package/lrzsz/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= http://www.ohse.de/uwe/releases/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LRZSZ,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,LRZSZ,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE:= gnu CONFIGURE_ARGS+= --without-libiconv-prefix \ diff --git a/package/ltp/Makefile b/package/ltp/Makefile index f803bfeee..5a0da8eb1 100644 --- a/package/ltp/Makefile +++ b/package/ltp/Makefile @@ -14,7 +14,7 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tgz include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LTP,ltp,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,LTP,ltp,${PKG_VERSION}-${PKG_RELEASE})) BUILD_STYLE:= auto INSTALL_STYLE:= auto diff --git a/package/lua/Makefile b/package/lua/Makefile index 45973bcab..62c48501b 100644 --- a/package/lua/Makefile +++ b/package/lua/Makefile @@ -16,10 +16,10 @@ MASTER_SITES:= http://www.lua.org/ftp/ \ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBLUA,liblua,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,LUA,lua,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,LUAC,luac,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,LUA_EXAMPLES,lua-examples,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,LIBLUA,liblua,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,LUA,lua,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,LUAC,luac,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,LUA_EXAMPLES,lua-examples,${PKG_VERSION}-${PKG_RELEASE})) do-build: ${MAKE} -C ${WRKBUILD} \ diff --git a/package/lvm/Makefile b/package/lvm/Makefile index 334ca3516..134c34b2d 100644 --- a/package/lvm/Makefile +++ b/package/lvm/Makefile @@ -16,7 +16,7 @@ WRKDIST= ${WRKDIR}/LVM2.${PKG_VERSION} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LVM,lvm,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,LVM,lvm,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE:= gnu CONFIGURE_ARGS+= --with-user="" --with-group="" \ diff --git a/package/lynx/Makefile b/package/lynx/Makefile index 7ac1ab7f6..aee2812e7 100644 --- a/package/lynx/Makefile +++ b/package/lynx/Makefile @@ -16,7 +16,7 @@ WRKDIST= ${WRKDIR}/lynx2-8-7 include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LYNX,lynx,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,LYNX,lynx,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE= gnu TCPPFLAGS+= -DLYNX_VERSION=\"${PKG_VERSION}-OpenADK-${PKG_RELEASE}\" diff --git a/package/mac80211/Makefile b/package/mac80211/Makefile index e69f0fd12..df5ea86dc 100644 --- a/package/mac80211/Makefile +++ b/package/mac80211/Makefile @@ -16,9 +16,9 @@ WRKDIST= ${WRKDIR}/compat-wireless-${PKG_VERSION} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,KMOD_MAC80211,kmod-mac80211,${KERNEL_VERSION}+${PKG_VERSION}-${DEVICE}-${PKG_RELEASE},${ARCH},kernel (${KERNEL_VERSION}-${DEVICE}-${KERNEL_RELEASE}))) -$(eval $(call PKG_template,KMOD_MAC80211_ATH5K,kmod-mac80211-ath5k,${KERNEL_VERSION}+${PKG_VERSION}-${DEVICE}-${PKG_RELEASE},${ARCH},kernel (${KERNEL_VERSION}-${DEVICE}-${KERNEL_RELEASE}))) -$(eval $(call PKG_template,KMOD_MAC80211_RT61,kmod-mac80211-rt61,${KERNEL_VERSION}+${PKG_VERSION}-${DEVICE}-${PKG_RELEASE},${ARCH},kernel (${KERNEL_VERSION}-${DEVICE}-${KERNEL_RELEASE}))) +$(eval $(call PKG_template,KMOD_MAC80211,kmod-mac80211,${KERNEL_VERSION}+${PKG_VERSION}-${DEVICE}-${PKG_RELEASE},kernel (${KERNEL_VERSION}-${DEVICE}-${KERNEL_RELEASE}))) +$(eval $(call PKG_template,KMOD_MAC80211_ATH5K,kmod-mac80211-ath5k,${KERNEL_VERSION}+${PKG_VERSION}-${DEVICE}-${PKG_RELEASE},kernel (${KERNEL_VERSION}-${DEVICE}-${KERNEL_RELEASE}))) +$(eval $(call PKG_template,KMOD_MAC80211_RT61,kmod-mac80211-rt61,${KERNEL_VERSION}+${PKG_VERSION}-${DEVICE}-${PKG_RELEASE},kernel (${KERNEL_VERSION}-${DEVICE}-${KERNEL_RELEASE}))) BUILD_STYLE:= auto INSTALL_STYLE:= manual diff --git a/package/macchanger/Makefile b/package/macchanger/Makefile index 42c4e7599..5518fb6fd 100755 --- a/package/macchanger/Makefile +++ b/package/macchanger/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_GNU:=macchanger/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,MACCHANGER,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,MACCHANGER,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE:= gnu INSTALL_STYLE:= auto diff --git a/package/madplay/Makefile b/package/madplay/Makefile index 1ab4b8c32..fa56645c0 100644 --- a/package/madplay/Makefile +++ b/package/madplay/Makefile @@ -14,7 +14,7 @@ MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=mad/} \ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,MADPLAY,madplay,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,MADPLAY,madplay,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE:= gnu CONFIGURE_ENV+= BUILD_CC="${TARGET_CC}" HOSTCC=${HOST_CC} \ diff --git a/package/maradns/Makefile b/package/maradns/Makefile index af70f4f69..631d8482a 100644 --- a/package/maradns/Makefile +++ b/package/maradns/Makefile @@ -14,7 +14,7 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,MARADNS,maradns,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,MARADNS,maradns,${PKG_VERSION}-${PKG_RELEASE})) #CONFIGURE_STYLE:= gnu BUILD_STYLE:= auto diff --git a/package/mc/Makefile b/package/mc/Makefile index 63b8d7c60..28f715581 100644 --- a/package/mc/Makefile +++ b/package/mc/Makefile @@ -13,7 +13,7 @@ MASTER_SITES= http://www.ibiblio.org/pub/Linux/utils/file/managers/mc/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,MC,mc,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,MC,mc,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --disable-charset \ diff --git a/package/mgetty/Makefile b/package/mgetty/Makefile index 298f1e9c8..9513e9583 100644 --- a/package/mgetty/Makefile +++ b/package/mgetty/Makefile @@ -15,7 +15,7 @@ DISTFILES:= ${PKG_NAME}${PKG_VERSION}-${PKG_XVERSION}.tar.gz include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,MGETTY,mgetty,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,MGETTY,mgetty,${PKG_VERSION}-${PKG_RELEASE})) pre-configure: cp ${WRKBUILD}/policy.h-dist ${WRKBUILD}/policy.h diff --git a/package/miau/Makefile b/package/miau/Makefile index 55543a03b..c384b749f 100644 --- a/package/miau/Makefile +++ b/package/miau/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=miau/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,MIAU,miau,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,MIAU,miau,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE:= gnu CONFIGURE_ENV+= ac_cv_func_malloc_0_nonnull=yes \ diff --git a/package/miax/Makefile b/package/miax/Makefile index 11e0089a7..37d13ab0e 100644 --- a/package/miax/Makefile +++ b/package/miax/Makefile @@ -15,7 +15,7 @@ WRKDIST= ${WRKDIR}/${PKG_NAME} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,MIAX,miax,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,MIAX,miax,${PKG_VERSION}-${PKG_RELEASE})) BUILD_STYLE:= auto MAKE_FLAGS+= CC="${TARGET_CC}" \ diff --git a/package/microperl/Makefile b/package/microperl/Makefile index 6896db6f3..32d6a924d 100644 --- a/package/microperl/Makefile +++ b/package/microperl/Makefile @@ -18,7 +18,7 @@ WRKDIST= ${WRKDIR}/perl-${PKG_VERSION} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,MICROPERL,microperl,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,MICROPERL,microperl,${PKG_VERSION}-${PKG_RELEASE})) BUILD_STYLE:= auto MAKE_FLAGS+= CC="${TARGET_CC}" OPTIMIZE="${TCFLAGS}" diff --git a/package/mini_httpd/Makefile b/package/mini_httpd/Makefile index 5799b39f4..b85a15589 100644 --- a/package/mini_httpd/Makefile +++ b/package/mini_httpd/Makefile @@ -15,9 +15,9 @@ WRKDIST= ${WRKDIR}/mini_httpd-${PKG_VERSION} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,MINI_HTTPD,mini-httpd,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,MINI_HTTPD_HTPASSWD,mini-httpd-htpasswd,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,MINI_HTTPD_OPENSSL,mini-httpd-openssl,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,MINI_HTTPD,mini-httpd,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,MINI_HTTPD_HTPASSWD,mini-httpd-htpasswd,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,MINI_HTTPD_OPENSSL,mini-httpd-openssl,${PKG_VERSION}-${PKG_RELEASE})) do-build: # with OpenSSL diff --git a/package/mini_sendmail/Makefile b/package/mini_sendmail/Makefile index 0187ab4f8..25c93d08e 100644 --- a/package/mini_sendmail/Makefile +++ b/package/mini_sendmail/Makefile @@ -15,7 +15,7 @@ WRKDIST= ${WRKDIR}/mini_sendmail-${PKG_VERSION} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,MINI_SENDMAIL,mini-sendmail,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,MINI_SENDMAIL,mini-sendmail,${PKG_VERSION}-${PKG_RELEASE})) BUILD_STYLE:= auto MAKE_FLAGS+= OFLAGS="${TARGET_CFLAGS}" diff --git a/package/miredo/Makefile b/package/miredo/Makefile index 3bdcb3113..144c0528d 100644 --- a/package/miredo/Makefile +++ b/package/miredo/Makefile @@ -14,8 +14,8 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,MIREDO,miredo,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,MIREDO_SERVER,miredo-server,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,MIREDO,miredo,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,MIREDO_SERVER,miredo-server,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE:= gnu CONFIGURE_ARGS+= --disable-chroot \ diff --git a/package/mksh/Makefile b/package/mksh/Makefile index 03a47b8c4..b141d0693 100644 --- a/package/mksh/Makefile +++ b/package/mksh/Makefile @@ -15,7 +15,7 @@ WRKDIST= ${WRKDIR}/${PKG_NAME} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,MKSH,mksh,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,MKSH,mksh,${PKG_VERSION}-${PKG_RELEASE})) ifeq ($(strip ${ADK_PACKAGE_MKSH_FULL}),) TCPPFLAGS+= -DMKSH_SMALL=1 diff --git a/package/moc/Makefile b/package/moc/Makefile index 9cdfa2416..4ee7c2f9b 100644 --- a/package/moc/Makefile +++ b/package/moc/Makefile @@ -14,7 +14,7 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,MOC,moc,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,MOC,moc,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE:= gnu CONFIGURE_ARGS+= --without-jack \ diff --git a/package/monit/Makefile b/package/monit/Makefile index 7b41c5367..7a6f2dfd9 100644 --- a/package/monit/Makefile +++ b/package/monit/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= http://www.tildeslash.com/monit/dist/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,MONIT,monit,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,MONIT,monit,${PKG_VERSION}-${PKG_RELEASE})) PKG_DEPENDS:= libpthread, diff --git a/package/motion/Makefile b/package/motion/Makefile index 302cb8a84..3b0671f99 100644 --- a/package/motion/Makefile +++ b/package/motion/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=motion/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,MOTION,motion,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,MOTION,motion,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE:= gnu CONFIGURE_ARGS+= --without-ffmpeg \ diff --git a/package/mpd/Makefile b/package/mpd/Makefile index cc4a6d02e..65baca748 100644 --- a/package/mpd/Makefile +++ b/package/mpd/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=musicpd/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,MPD,mpd,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,MPD,mpd,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE:= gnu BUILD_STYLE:= auto diff --git a/package/mpfr/Makefile b/package/mpfr/Makefile index eb457b4f6..cc229020f 100644 --- a/package/mpfr/Makefile +++ b/package/mpfr/Makefile @@ -7,7 +7,7 @@ include ${TOPDIR}/rules.mk include ${TOPDIR}/toolchain/mpfr/Makefile.inc include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,MPFR,mpfr,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,MPFR,mpfr,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE= gnu BUILD_STYLE= auto diff --git a/package/mplayer/Makefile b/package/mplayer/Makefile index 73167c97b..5dee24517 100644 --- a/package/mplayer/Makefile +++ b/package/mplayer/Makefile @@ -16,7 +16,7 @@ WRKDIST= ${WRKDIR}/MPlayer-${PKG_VERSION} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,MPLAYER,mplayer,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,MPLAYER,mplayer,${PKG_VERSION}-${PKG_RELEASE})) BUILD_STYLE:= auto INSTALL_STYLE:= auto diff --git a/package/mrd6/Makefile b/package/mrd6/Makefile index 53ee70a73..185157491 100644 --- a/package/mrd6/Makefile +++ b/package/mrd6/Makefile @@ -10,7 +10,6 @@ PKG_VERSION:= 0.9.6 PKG_RELEASE:= 1 PKG_MD5SUM:= 93ada53bb414b9d622f80a717bc2694b MASTER_SITES:= http://www.openadk.org/distfiles/ - WRKBUILD= ${WRKSRC}/src include ${TOPDIR}/mk/package.mk @@ -23,7 +22,7 @@ else PKG_DEPENDS:= libstdcxx endif -$(eval $(call PKG_template,MRD6,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${ARCH},${PKG_DEPENDS})) +$(eval $(call PKG_template,MRD6,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS})) BUILD_STYLE:= auto INSTALL_STYLE:= auto diff --git a/package/mt-daapd/Makefile b/package/mt-daapd/Makefile index a9160bb0e..ce48d7356 100644 --- a/package/mt-daapd/Makefile +++ b/package/mt-daapd/Makefile @@ -14,7 +14,7 @@ MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=mt-daapd/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,MT_DAAPD,mt-daapd,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,MT_DAAPD,mt-daapd,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE:= gnu CONFIGURE_ENV+= ac_cv_func_setpgrp_void=yes diff --git a/package/mtr/Makefile b/package/mtr/Makefile index eac1e3d72..0d90da866 100644 --- a/package/mtr/Makefile +++ b/package/mtr/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= ftp://ftp.bitwizard.nl/mtr/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,MTR,mtr,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,MTR,mtr,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE+= gnu CONFIGURE_ENV+= ac_cv_lib_resolv_res_mkquery=yes diff --git a/package/mutt/Makefile b/package/mutt/Makefile index 5d3a4b0ac..7be0d567e 100644 --- a/package/mutt/Makefile +++ b/package/mutt/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=mutt/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,MUTT,mutt,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,MUTT,mutt,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE:= gnu CONFIGURE_ENV+= ac_cv_c_bigendian=no \ diff --git a/package/mysql/Makefile b/package/mysql/Makefile index 0f80c9e02..60ea57ccb 100644 --- a/package/mysql/Makefile +++ b/package/mysql/Makefile @@ -13,7 +13,7 @@ MASTER_SITES= ${MASTER_SITE_MYSQL:=Downloads/MySQL-5.0/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBMYSQLCLIENT,libmysqlclient,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,LIBMYSQLCLIENT,libmysqlclient,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE:= gnu CONFIGURE_ENV+= OPTIMIZE_CFLAGS="${TARGET_CFLAGS}" \ diff --git a/package/nano/Makefile b/package/nano/Makefile index 7c9d9a9dc..1da397446 100644 --- a/package/nano/Makefile +++ b/package/nano/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= http://www.nano-editor.org/dist/v2.0/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,NANO,nano,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,NANO,nano,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE:= gnu CONFIGURE_ENV+= ac_cv_header_regex_h=no diff --git a/package/ncurses/Makefile b/package/ncurses/Makefile index 63030766d..89b391849 100644 --- a/package/ncurses/Makefile +++ b/package/ncurses/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_GNU:=ncurses/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBNCURSES,libncurses,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,LIBNCURSES,libncurses,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE= gnu CONFIGURE_ENV+= ac_cv_linux_vers=2 diff --git a/package/ndisc/Makefile b/package/ndisc/Makefile index 23ca866f6..d56bf80e3 100644 --- a/package/ndisc/Makefile +++ b/package/ndisc/Makefile @@ -14,9 +14,9 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,NDISC6,ndisc6,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,RDISC6,rdisc6,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,TCPTRACEROUTE6,tcptraceroute6,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,NDISC6,ndisc6,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,RDISC6,rdisc6,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,TCPTRACEROUTE6,tcptraceroute6,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE:= gnu BUILD_STYLE:= auto diff --git a/package/neon/Makefile b/package/neon/Makefile index ffd9da574..a61964445 100644 --- a/package/neon/Makefile +++ b/package/neon/Makefile @@ -13,7 +13,7 @@ MASTER_SITES= http://webdav.org/neon/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,NEON,neon,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,NEON,neon,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --with-ssl=openssl \ diff --git a/package/net-snmp/Makefile b/package/net-snmp/Makefile index 03ba15519..391dde5a2 100644 --- a/package/net-snmp/Makefile +++ b/package/net-snmp/Makefile @@ -68,9 +68,9 @@ SNMP_TRANSPORTS_EXCLUDED= TCP TCPv6 UDPv6 Unix include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBNETSNMP,libnetsnmp,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,SNMPD,snmpd,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,SNMP_UTILS,snmp-utils,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,LIBNETSNMP,libnetsnmp,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,SNMPD,snmpd,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,SNMP_UTILS,snmp-utils,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE:= gnu CONFIGURE_ENV+= ac_cv_header_pcap_h=no diff --git a/package/netperf/Makefile b/package/netperf/Makefile index 6563c60e1..9a741ea64 100644 --- a/package/netperf/Makefile +++ b/package/netperf/Makefile @@ -14,7 +14,7 @@ MASTER_SITES:= ftp://ftp.netperf.org/netperf/archive/ \ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,NETPERF,netperf,${PKG_VERSION}${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,NETPERF,netperf,${PKG_VERSION}${PKG_RELEASE})) BUILD_STYLE:= auto MAKE_FLAGS+= TARGET_NETPERF_HOME="/etc/netperf.conf" \ diff --git a/package/netstat-nat/Makefile b/package/netstat-nat/Makefile index a35784769..16f960f01 100644 --- a/package/netstat-nat/Makefile +++ b/package/netstat-nat/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= http://www.tweegy.nl/download/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,NETSTAT_NAT,netstat-nat,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,NETSTAT_NAT,netstat-nat,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE:= gnu BUILD_STYLE:= auto diff --git a/package/nfs-utils/Makefile b/package/nfs-utils/Makefile index cfbd4393c..6d4c901b4 100644 --- a/package/nfs-utils/Makefile +++ b/package/nfs-utils/Makefile @@ -14,7 +14,7 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,NFS_UTILS,nfs-utils,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,NFS_UTILS,nfs-utils,${PKG_VERSION}-${PKG_RELEASE})) PKG_DEPENDS:= portmap, CONFIGURE_STYLE= autotool gnu diff --git a/package/nmap/Makefile b/package/nmap/Makefile index 93793716d..053347a76 100644 --- a/package/nmap/Makefile +++ b/package/nmap/Makefile @@ -21,7 +21,7 @@ endif include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,NMAP,nmap,${PKG_VERSION}-${PKG_RELEASE},${ARCH},${PKG_DEPEND})) +$(eval $(call PKG_template,NMAP,nmap,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPEND})) TCPPFLAGS+= -DNOLUA ifeq ($(ADK_COMPILE_NMAP_WITH_UCLIBCXX),y) diff --git a/package/nocatsplash/Makefile b/package/nocatsplash/Makefile index 600e421f0..fea6af4b4 100644 --- a/package/nocatsplash/Makefile +++ b/package/nocatsplash/Makefile @@ -15,7 +15,7 @@ WRKDIST= ${WRKDIR}/NoCatSplash-${PKG_VERSION} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,NOCATSPLASH,nocatsplash,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,NOCATSPLASH,nocatsplash,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE:= gnu CONFIGURE_ARGS+= --with-firewall=iptables \ diff --git a/package/ntfs-3g/Makefile b/package/ntfs-3g/Makefile index d180eef0a..70e4900b9 100644 --- a/package/ntfs-3g/Makefile +++ b/package/ntfs-3g/Makefile @@ -16,7 +16,7 @@ WRKDIST= ${WRKDIR}/ntfs-3g-${PKG_VERSION} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,KMOD_FS_NTFS_3G,kmod-fs-ntfs-3g,${KERNEL_VERSION}-${DEVICE}-${PKG_RELEASE},${ARCH},kernel (${KERNEL_VERSION}-${DEVICE}-${KERNEL_RELEASE}))) +$(eval $(call PKG_template,KMOD_FS_NTFS_3G,kmod-fs-ntfs-3g,${KERNEL_VERSION}-${DEVICE}-${PKG_RELEASE},kernel (${KERNEL_VERSION}-${DEVICE}-${KERNEL_RELEASE}))) CONFIGURE_ARGS+= --disable-ldconfig \ --disable-library diff --git a/package/ntpclient/Makefile b/package/ntpclient/Makefile index 2cde14053..4de911b0c 100644 --- a/package/ntpclient/Makefile +++ b/package/ntpclient/Makefile @@ -15,7 +15,7 @@ WRKDIST= ${WRKDIR}/${PKG_NAME}-2007 include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,NTPCLIENT,ntpclient,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,NTPCLIENT,ntpclient,${PKG_VERSION}-${PKG_RELEASE})) BUILD_STYLE:= auto MAKE_FLAGS+= CC='${TARGET_CC}' CFLAGS='${TCFLAGS}' diff --git a/package/nut/Makefile b/package/nut/Makefile index 0d1837991..158ee47b9 100644 --- a/package/nut/Makefile +++ b/package/nut/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= http://www.networkupstools.org/source/2.0/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,NUT,nut,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,NUT,nut,${PKG_VERSION}-${PKG_RELEASE})) define DRIVER_template diff --git a/package/obexftp/Makefile b/package/obexftp/Makefile index b8fa2f38c..e8034f7db 100644 --- a/package/obexftp/Makefile +++ b/package/obexftp/Makefile @@ -14,7 +14,7 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,OBEXFTP,obexftp,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,OBEXFTP,obexftp,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE:= gnu CONFIGURE_ENV+= OPENOBEX_CFLAGS="-I${STAGING_DIR}/usr/include" \ diff --git a/package/olsrd/Makefile b/package/olsrd/Makefile index 51e512463..2fc229e90 100644 --- a/package/olsrd/Makefile +++ b/package/olsrd/Makefile @@ -23,11 +23,11 @@ ${2}-install: endef -$(eval $(call PKG_template,OLSRD,olsrd,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,OLSRD_MOD_DYN_GW,olsrd-mod-dyn-gw,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,OLSRD_MOD_HTTPINFO,olsrd-mod-httpinfo,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,OLSRD_MOD_NAMESERVICE,olsrd-mod-nameservice,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,OLSRD_MOD_TAS,olsrd-mod-tas,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,OLSRD,olsrd,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,OLSRD_MOD_DYN_GW,olsrd-mod-dyn-gw,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,OLSRD_MOD_HTTPINFO,olsrd-mod-httpinfo,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,OLSRD_MOD_NAMESERVICE,olsrd-mod-nameservice,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,OLSRD_MOD_TAS,olsrd-mod-tas,${PKG_VERSION}-${PKG_RELEASE})) $(eval $(call PKG_mod_template,OLSRD_MOD_DYN_GW,dyn_gw)) $(eval $(call PKG_mod_template,OLSRD_MOD_HTTPINFO,httpinfo)) diff --git a/package/opencdk/Makefile b/package/opencdk/Makefile index 833b0bbeb..c0455068b 100644 --- a/package/opencdk/Makefile +++ b/package/opencdk/Makefile @@ -19,7 +19,7 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBOPENCDK,libopencdk,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,LIBOPENCDK,libopencdk,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE:= gnu CONFIGURE_ARGS+= --with-libgcrypt-prefix='${STAGING_DIR}/usr' diff --git a/package/openct/Makefile b/package/openct/Makefile index ebb085782..3e371af57 100644 --- a/package/openct/Makefile +++ b/package/openct/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= http://www.opensc-project.org/files/openct/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,OPENCT,openct,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,OPENCT,openct,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE:= gnu BUILD_STYLE:= auto diff --git a/package/openldap/Makefile b/package/openldap/Makefile index 358794f0f..267b61d2b 100644 --- a/package/openldap/Makefile +++ b/package/openldap/Makefile @@ -34,9 +34,9 @@ PKG_CONFIGURE_OPTIONS+= \ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBOPENLDAP,libopenldap,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,OPENLDAP_UTILS,openldap-utils,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,OPENLDAP_SLAPD,openldap-slapd,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,LIBOPENLDAP,libopenldap,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,OPENLDAP_UTILS,openldap-utils,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,OPENLDAP_SLAPD,openldap-slapd,${PKG_VERSION}-${PKG_RELEASE})) pre-configure: (cd ${WRKBUILD}; rm -rf config.{cache,status} ; \ diff --git a/package/openntpd/Makefile b/package/openntpd/Makefile index a068f83d5..75ad3c2c0 100644 --- a/package/openntpd/Makefile +++ b/package/openntpd/Makefile @@ -17,7 +17,7 @@ MASTER_SITES:= ftp://ftp.openbsd.org/pub/OpenBSD/OpenNTPD/ \ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,OPENNTPD,openntpd,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,OPENNTPD,openntpd,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE:= gnu CONFIGURE_ARGS+= --with-privsep-user=ntp \ diff --git a/package/openobex/Makefile b/package/openobex/Makefile index 0aa367504..b1c94ee27 100644 --- a/package/openobex/Makefile +++ b/package/openobex/Makefile @@ -14,7 +14,7 @@ MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=openobex/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,OPENOBEX,openobex,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,OPENOBEX,openobex,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE:= gnu CONFIGURE_ARGS+= PKG_CONFIG="" diff --git a/package/opensc/Makefile b/package/opensc/Makefile index a1d9e24f4..66e1b66bd 100644 --- a/package/opensc/Makefile +++ b/package/opensc/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= http://www.opensc-project.org/files/opensc/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,OPENSC,opensc,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,OPENSC,opensc,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE:= gnu BUILD_STYLE:= auto diff --git a/package/opensips/Makefile b/package/opensips/Makefile index 76d68f420..e9504f443 100644 --- a/package/opensips/Makefile +++ b/package/opensips/Makefile @@ -27,29 +27,29 @@ ${2}-install: endef -$(eval $(call PKG_template,OPENSIPS,opensips,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(eval $(call PKG_template,OPENSIPS_MOD_ACCOUNTING,opensips-mod-acc,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(eval $(call PKG_template,OPENSIPS_MOD_AUTH,opensips-mod-auth,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(eval $(call PKG_template,OPENSIPS_MOD_AUTH_DB,opensips-mod-auth-db,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(eval $(call PKG_template,OPENSIPS_MOD_AVPOPS,opensips-mod-avpops,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(eval $(call PKG_template,OPENSIPS_MOD_DISPATCHER,opensips-mod-dispatcher,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(eval $(call PKG_template,OPENSIPS_MOD_DIVERSION,opensips-mod-diversion,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(eval $(call PKG_template,OPENSIPS_MOD_FLATSTORE,opensips-mod-flatstore,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(eval $(call PKG_template,OPENSIPS_MOD_GFLAGS,opensips-mod-gflags,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(eval $(call PKG_template,OPENSIPS_MOD_GROUP,opensips-mod-group,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(eval $(call PKG_template,OPENSIPS_MOD_MEDIAPROXY,opensips-mod-mediaproxy,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(eval $(call PKG_template,OPENSIPS_MOD_MSILO,opensips-mod-msilo,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(eval $(call PKG_template,OPENSIPS_MOD_NATHELPER,opensips-mod-nathelper,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(eval $(call PKG_template,OPENSIPS_MOD_OPTIONS,opensips-mod-options,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(eval $(call PKG_template,OPENSIPS_MOD_PDT,opensips-mod-pdt,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(eval $(call PKG_template,OPENSIPS_MOD_PERMISSIONS,opensips-mod-permissions,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(eval $(call PKG_template,OPENSIPS_MOD_PIKE,opensips-mod-pike,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(eval $(call PKG_template,OPENSIPS_MOD_SMS,opensips-mod-sms,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(eval $(call PKG_template,OPENSIPS_MOD_UAC,opensips-mod-uac,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(eval $(call PKG_template,OPENSIPS_MOD_UAC_REDIRECT,opensips-mod-uac-redirect,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(eval $(call PKG_template,OPENSIPS_MOD_URI,opensips-mod-uri,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(eval $(call PKG_template,OPENSIPS_MOD_URI_DB,opensips-mod-uri-db,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(eval $(call PKG_template,OPENSIPS_MOD_XLOG,opensips-mod-xlog,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) +$(eval $(call PKG_template,OPENSIPS,opensips,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,OPENSIPS_MOD_ACCOUNTING,opensips-mod-acc,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,OPENSIPS_MOD_AUTH,opensips-mod-auth,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,OPENSIPS_MOD_AUTH_DB,opensips-mod-auth-db,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,OPENSIPS_MOD_AVPOPS,opensips-mod-avpops,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,OPENSIPS_MOD_DISPATCHER,opensips-mod-dispatcher,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,OPENSIPS_MOD_DIVERSION,opensips-mod-diversion,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,OPENSIPS_MOD_FLATSTORE,opensips-mod-flatstore,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,OPENSIPS_MOD_GFLAGS,opensips-mod-gflags,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,OPENSIPS_MOD_GROUP,opensips-mod-group,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,OPENSIPS_MOD_MEDIAPROXY,opensips-mod-mediaproxy,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,OPENSIPS_MOD_MSILO,opensips-mod-msilo,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,OPENSIPS_MOD_NATHELPER,opensips-mod-nathelper,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,OPENSIPS_MOD_OPTIONS,opensips-mod-options,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,OPENSIPS_MOD_PDT,opensips-mod-pdt,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,OPENSIPS_MOD_PERMISSIONS,opensips-mod-permissions,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,OPENSIPS_MOD_PIKE,opensips-mod-pike,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,OPENSIPS_MOD_SMS,opensips-mod-sms,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,OPENSIPS_MOD_UAC,opensips-mod-uac,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,OPENSIPS_MOD_UAC_REDIRECT,opensips-mod-uac-redirect,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,OPENSIPS_MOD_URI,opensips-mod-uri,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,OPENSIPS_MOD_URI_DB,opensips-mod-uri-db,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,OPENSIPS_MOD_XLOG,opensips-mod-xlog,$(PKG_VERSION)-$(PKG_RELEASE))) $(eval $(call PKG_mod_template,OPENSIPS_MOD_ACCOUNTING,acc)) $(eval $(call PKG_mod_template,OPENSIPS_MOD_AUTH,auth)) diff --git a/package/openssh/Makefile b/package/openssh/Makefile index a46d3bbca..c0099db85 100644 --- a/package/openssh/Makefile +++ b/package/openssh/Makefile @@ -16,11 +16,11 @@ MASTER_SITES:= ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/ \ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,OPENSSH_CLIENT,openssh-client,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,OPENSSH_CLIENT_UTILS,openssh-client-utils,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,OPENSSH_SERVER,openssh-server,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,OPENSSH_SFTP_CLIENT,openssh-sftp-client,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,OPENSSH_SFTP_SERVER,openssh-sftp-server,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,OPENSSH_CLIENT,openssh-client,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,OPENSSH_CLIENT_UTILS,openssh-client-utils,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,OPENSSH_SERVER,openssh-server,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,OPENSSH_SFTP_CLIENT,openssh-sftp-client,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,OPENSSH_SFTP_SERVER,openssh-sftp-server,${PKG_VERSION}-${PKG_RELEASE})) PKG_DEPENDS:= zlib, libopenssl, diff --git a/package/openssl-pkcs11/Makefile b/package/openssl-pkcs11/Makefile index 37d4ffe51..6f7036f72 100644 --- a/package/openssl-pkcs11/Makefile +++ b/package/openssl-pkcs11/Makefile @@ -15,7 +15,7 @@ WRKDIST= ${WRKDIR}/engine_pkcs11-${PKG_VERSION} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,OPENSSL_PKCS11,openssl-pkcs11,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,OPENSSL_PKCS11,openssl-pkcs11,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE:= gnu CONFIGURE_ENV+= cross_compiling=yes diff --git a/package/openssl/Makefile b/package/openssl/Makefile index 09cde2a20..868daa61a 100644 --- a/package/openssl/Makefile +++ b/package/openssl/Makefile @@ -18,9 +18,9 @@ MASTER_SITES:= http://www.openssl.org/source/ \ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBOPENSSL,libopenssl,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,OPENSSL_UTIL,openssl-util,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,CA_CERTS,ca-certificates,${PKG_VERSION}-${CACERT_VER},${ARCH})) +$(eval $(call PKG_template,LIBOPENSSL,libopenssl,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,OPENSSL_UTIL,openssl-util,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,CA_CERTS,ca-certificates,${PKG_VERSION}-${CACERT_VER})) BUILD_STYLE:= manual INSTALL_STYLE:= auto confprog diff --git a/package/openswan/Makefile b/package/openswan/Makefile index 372b52a4e..4758e85a1 100644 --- a/package/openswan/Makefile +++ b/package/openswan/Makefile @@ -14,7 +14,7 @@ MASTER_SITES:= http://www.openswan.org/download/ \ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,OPENSWAN,openswan,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,OPENSWAN,openswan,${PKG_VERSION}-${PKG_RELEASE})) FLAGS:= ${TCFLAGS} ${TCPPFLAGS} ${TLDFLAGS} diff --git a/package/openvpn/Makefile b/package/openvpn/Makefile index 0624b76ba..879882a0b 100644 --- a/package/openvpn/Makefile +++ b/package/openvpn/Makefile @@ -15,8 +15,8 @@ MASTER_SITES:= http://openvpn.net/release/ \ include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,OPENVPN,openvpn,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(eval $(call PKG_template,OPENVPN_EASY_RSA,openvpn-easy-rsa,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) +$(eval $(call PKG_template,OPENVPN,openvpn,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,OPENVPN_EASY_RSA,openvpn-easy-rsa,$(PKG_VERSION)-$(PKG_RELEASE))) PKG_DEPEND:="kmod-tun" diff --git a/package/oprofile/Makefile b/package/oprofile/Makefile index 04fb15fda..9c3db7c24 100644 --- a/package/oprofile/Makefile +++ b/package/oprofile/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=oprofile/} include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,OPROFILE,oprofile,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) +$(eval $(call PKG_template,OPROFILE,oprofile,$(PKG_VERSION)-$(PKG_RELEASE))) TLDFLAGS+= -shared CONFIGURE_STYLE= gnu diff --git a/package/osiris/Makefile b/package/osiris/Makefile index 0cae63ab0..62a372ad3 100644 --- a/package/osiris/Makefile +++ b/package/osiris/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= http://osiris.shmoo.com/data/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,OSIRISD,osirisd,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,OSIRISD,osirisd,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE:= gnu CONFIGURE_ENV+= ac_cv_openssldir="${STAGING_DIR}/usr" \ diff --git a/package/owfs/Makefile b/package/owfs/Makefile index 6281d0f8b..fbb317e11 100644 --- a/package/owfs/Makefile +++ b/package/owfs/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=owfs/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,OWFS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,OWFS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE:= gnu CONFIGURE_ENV+= BUILD_CC=${TARGET_CC} \ diff --git a/package/p910nd/Makefile b/package/p910nd/Makefile index c6a480098..dbcbe367c 100644 --- a/package/p910nd/Makefile +++ b/package/p910nd/Makefile @@ -14,7 +14,7 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,P910ND,p910nd,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,P910ND,p910nd,${PKG_VERSION}-${PKG_RELEASE})) BUILD_STYLE:= auto MAKE_FLAGS+= ${TARGET_CONFIGURE_OPTS} \ diff --git a/package/palantir/Makefile b/package/palantir/Makefile index a7e3e84ff..23bcb9e81 100644 --- a/package/palantir/Makefile +++ b/package/palantir/Makefile @@ -14,7 +14,7 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tgz include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,PALANTIR,palantir,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,PALANTIR,palantir,${PKG_VERSION}-${PKG_RELEASE})) do-build: mkdir -p ${WRKINST}/usr diff --git a/package/parprouted/Makefile b/package/parprouted/Makefile index dcd33c8cc..86d52f336 100644 --- a/package/parprouted/Makefile +++ b/package/parprouted/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= http://www.hazard.maks.net/parprouted/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,PARPROUTED,parprouted,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,PARPROUTED,parprouted,${PKG_VERSION}-${PKG_RELEASE})) BUILD_STYLE:= auto MAKE_FLAGS+= CC="${TARGET_CC}" \ diff --git a/package/pciutils/Makefile b/package/pciutils/Makefile index b4ccef18d..5746722ca 100644 --- a/package/pciutils/Makefile +++ b/package/pciutils/Makefile @@ -14,7 +14,7 @@ MASTER_SITES:= http://www.kernel.org/pub/software/utils/pciutils/ \ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,PCIUTILS,pciutils,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,PCIUTILS,pciutils,${PKG_VERSION}-${PKG_RELEASE})) BUILD_STYLE:= auto MAKE_FLAGS+= CC="${TARGET_CC}" \ diff --git a/package/pcre/Makefile b/package/pcre/Makefile index 2a24199ff..eac615ba6 100644 --- a/package/pcre/Makefile +++ b/package/pcre/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=pcre/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBPCRE,libpcre,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,LIBPCRE,libpcre,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE:= gnu CONFIGURE_ARGS+= --enable-utf8 diff --git a/package/php/Config.in b/package/php/Config.in index c62e58a52..422ede8c2 100644 --- a/package/php/Config.in +++ b/package/php/Config.in @@ -9,6 +9,7 @@ choice prompt "PHP Mode" default ADK_PACKAGE_PHP_FASTCGI depends on ADK_COMPILE_PHP + config ADK_PACKAGE_PHP_FASTCGI prompt "PHP built for FastCGI" bool diff --git a/package/php/Makefile b/package/php/Makefile index 4cee9d2c4..21bc36c86 100644 --- a/package/php/Makefile +++ b/package/php/Makefile @@ -13,8 +13,8 @@ MASTER_SITES:= http://de.php.net/distributions/ include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,PHP_CLI,php-cli,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,PHP_FASTCGI,php-fastcgi,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,PHP_CLI,php-cli,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,PHP_FASTCGI,php-fastcgi,${PKG_VERSION}-${PKG_RELEASE})) define PKG_mod_template @@ -118,19 +118,19 @@ else PKG_CONFIGURE_OPTS+= --disable-xml endif -$(eval $(call PKG_template,PHP_MOD_CURL,php-mod-curl,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(eval $(call PKG_template,PHP_MOD_FTP,php-mod-ftp,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(eval $(call PKG_template,PHP_MOD_GD,php-mod-gd,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(eval $(call PKG_template,PHP_MOD_GMP,php-mod-gmp,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(eval $(call PKG_template,PHP_MOD_LDAP,php-mod-ldap,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(eval $(call PKG_template,PHP_MOD_MYSQL,php-mod-mysql,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(eval $(call PKG_template,PHP_MOD_OPENSSL,php-mod-openssl,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(eval $(call PKG_template,PHP_MOD_PCRE,php-mod-pcre,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(eval $(call PKG_template,PHP_MOD_PGSQL,php-mod-pgsql,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(eval $(call PKG_template,PHP_MOD_SESSION,php-mod-session,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(eval $(call PKG_template,PHP_MOD_SOCKETS,php-mod-sockets,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(eval $(call PKG_template,PHP_MOD_SQLITE,php-mod-sqlite,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(eval $(call PKG_template,PHP_MOD_XML,php-mod-xml,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) +$(eval $(call PKG_template,PHP_MOD_CURL,php-mod-curl,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,PHP_MOD_FTP,php-mod-ftp,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,PHP_MOD_GD,php-mod-gd,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,PHP_MOD_GMP,php-mod-gmp,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,PHP_MOD_LDAP,php-mod-ldap,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,PHP_MOD_MYSQL,php-mod-mysql,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,PHP_MOD_OPENSSL,php-mod-openssl,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,PHP_MOD_PCRE,php-mod-pcre,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,PHP_MOD_PGSQL,php-mod-pgsql,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,PHP_MOD_SESSION,php-mod-session,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,PHP_MOD_SOCKETS,php-mod-sockets,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,PHP_MOD_SQLITE,php-mod-sqlite,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,PHP_MOD_XML,php-mod-xml,$(PKG_VERSION)-$(PKG_RELEASE))) $(eval $(call PKG_mod_template,PHP_MOD_CURL,curl)) $(eval $(call PKG_mod_template,PHP_MOD_FTP,ftp)) diff --git a/package/picocom/Makefile b/package/picocom/Makefile index 0d2aae07d..912b23b47 100644 --- a/package/picocom/Makefile +++ b/package/picocom/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= http://efault.net/npat/hacks/picocom/dist/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,PICOCOM,picocom,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,PICOCOM,picocom,${PKG_VERSION}-${PKG_RELEASE})) BUILD_STYLE:= auto ALL_TARGET:= picocom diff --git a/package/pipacs/Makefile b/package/pipacs/Makefile index 0abb877df..827e3a693 100644 --- a/package/pipacs/Makefile +++ b/package/pipacs/Makefile @@ -12,7 +12,7 @@ NO_DISTFILES:= 1 include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,PIPACS,pipacs,${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,PIPACS,pipacs,${PKG_RELEASE})) BUILD_STYLE:= auto MAKE_FLAGS+= CFLAGS="${TCFLAGS} ${TCPPFLAGS}" \ diff --git a/package/pixman/Makefile b/package/pixman/Makefile index a7d2baec6..2980f65a1 100644 --- a/package/pixman/Makefile +++ b/package/pixman/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= http://www.cairographics.org/releases/ include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,PIXMAN,pixman,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) +$(eval $(call PKG_template,PIXMAN,pixman,$(PKG_VERSION)-$(PKG_RELEASE))) CONFIGURE_STYLE= gnu BUILD_STYLE= auto diff --git a/package/pmacct/Makefile b/package/pmacct/Makefile index 98e1bfbb9..8fc8e86f2 100644 --- a/package/pmacct/Makefile +++ b/package/pmacct/Makefile @@ -125,17 +125,17 @@ $$(IPKG_$(1)): $(WRKBUILD)/$(2) endef -$(eval $(call PKG_template,NFACCTD_BASIC,nfacctd,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(eval $(call PKG_template,NFACCTD_MYSQL,nfacctd-mysql,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(eval $(call PKG_template,NFACCTD_PGSQL,nfacctd-pgsql,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(eval $(call PKG_template,NFACCTD_SQLITE,nfacctd-sqlite,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(eval $(call PKG_template,NFACCTD_CUSTOM,nfacctd-custom,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(eval $(call PKG_template,PMACCTD_BASIC,pmacctd,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(eval $(call PKG_template,PMACCTD_MYSQL,pmacctd-mysql,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(eval $(call PKG_template,PMACCTD_PGSQL,pmacctd-pgsql,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(eval $(call PKG_template,PMACCTD_SQLITE,pmacctd-sqlite,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(eval $(call PKG_template,PMACCTD_CUSTOM,pmacctd-custom,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(eval $(call PKG_template,PMACCT_CLIENT,pmacct-client,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) +$(eval $(call PKG_template,NFACCTD_BASIC,nfacctd,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,NFACCTD_MYSQL,nfacctd-mysql,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,NFACCTD_PGSQL,nfacctd-pgsql,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,NFACCTD_SQLITE,nfacctd-sqlite,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,NFACCTD_CUSTOM,nfacctd-custom,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,PMACCTD_BASIC,pmacctd,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,PMACCTD_MYSQL,pmacctd-mysql,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,PMACCTD_PGSQL,pmacctd-pgsql,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,PMACCTD_SQLITE,pmacctd-sqlite,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,PMACCTD_CUSTOM,pmacctd-custom,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,PMACCT_CLIENT,pmacct-client,$(PKG_VERSION)-$(PKG_RELEASE))) $(eval $(call PKG_build,PMACCT_CLIENT,nfacctd-basic,pmacctd-basic,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) $(eval $(call PKG_build,PMACCT_BASIC,nfacctd-basic,pmacctd-basic,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) diff --git a/package/popt/Makefile b/package/popt/Makefile index 872a00fc2..059b73f02 100644 --- a/package/popt/Makefile +++ b/package/popt/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= http://rpm5.org/files/popt/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBPOPT,libpopt,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,LIBPOPT,libpopt,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE:= gnu BUILD_STYLE:= auto diff --git a/package/portmap/Makefile b/package/portmap/Makefile index 68732581c..f5f019607 100644 --- a/package/portmap/Makefile +++ b/package/portmap/Makefile @@ -15,7 +15,7 @@ WRKDIST= ${WRKDIR}/${PKG_NAME}_${PKG_VERSION} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,PORTMAP,portmap,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,PORTMAP,portmap,${PKG_VERSION}-${PKG_RELEASE})) ifneq ($(strip ${ADK_PACKAGE_PORTMAP_LIBWRAP}),) MAKE_FLAGS+= WRAP_LIB='-L${STAGING_DIR}/usr/lib -lwrap' diff --git a/package/portsentry/Makefile b/package/portsentry/Makefile index 6fd433540..71707ba3c 100644 --- a/package/portsentry/Makefile +++ b/package/portsentry/Makefile @@ -15,7 +15,7 @@ WRKDIST= ${WRKDIR}/${PKG_NAME}_beta include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,PORTSENTRY,portsentry,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,PORTSENTRY,portsentry,${PKG_VERSION}-${PKG_RELEASE})) BUILD_STYLE:= auto ALL_TARGET:= linux diff --git a/package/postgresql/Makefile b/package/postgresql/Makefile index 4b44b6f35..2ec836bf6 100644 --- a/package/postgresql/Makefile +++ b/package/postgresql/Makefile @@ -17,7 +17,7 @@ MASTER_SITES:= ftp://ftp7.de.postgresql.org/pub/ftp.postgresql.org/source/v${PK include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBPQ,libpq,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,LIBPQ,libpq,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE= gnu PKG_CONFIGURE_ARGS:=\ diff --git a/package/ppp/Makefile b/package/ppp/Makefile index 44864dcd8..adf408a45 100644 --- a/package/ppp/Makefile +++ b/package/ppp/Makefile @@ -13,14 +13,14 @@ MASTER_SITES:= ftp://ftp.samba.org/pub/ppp/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,PPP,ppp,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,PPP_MOD_PPPOA,ppp-mod-pppoa,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,PPP_MOD_PPPOE,ppp-mod-pppoe,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,PPP_MOD_RADIUS,ppp-mod-radius,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,PPP_MOD_CHAT,ppp-mod-chat,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,PPP_MOD_PPPDUMP,ppp-mod-pppdump,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,PPP_MOD_PPPSTATS,ppp-mod-pppstats,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,PPP_MOD_PPPUMTS,ppp-mod-pppumts,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,PPP,ppp,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,PPP_MOD_PPPOA,ppp-mod-pppoa,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,PPP_MOD_PPPOE,ppp-mod-pppoe,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,PPP_MOD_RADIUS,ppp-mod-radius,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,PPP_MOD_CHAT,ppp-mod-chat,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,PPP_MOD_PPPDUMP,ppp-mod-pppdump,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,PPP_MOD_PPPSTATS,ppp-mod-pppstats,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,PPP_MOD_PPPUMTS,ppp-mod-pppumts,${PKG_VERSION}-${PKG_RELEASE})) ifeq ($(ADK_IPV6),y) IPV6+=HAVE_INET6="1" diff --git a/package/pptp/Makefile b/package/pptp/Makefile index 5c76fbba7..41ac8243d 100644 --- a/package/pptp/Makefile +++ b/package/pptp/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=pptpclient/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,PPTP,pptp,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,PPTP,pptp,${PKG_VERSION}-${PKG_RELEASE})) BUILD_STYLE:= auto MAKE_FLAGS+= CC="${TARGET_CC}" \ diff --git a/package/pptpd/Makefile b/package/pptpd/Makefile index bc6a6e628..095f37048 100644 --- a/package/pptpd/Makefile +++ b/package/pptpd/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=poptop/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,PPTPD,pptpd,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,PPTPD,pptpd,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE:= gnu BUILD_STYLE:= auto diff --git a/package/privoxy/Makefile b/package/privoxy/Makefile index 980e83c97..ccebd96bf 100644 --- a/package/privoxy/Makefile +++ b/package/privoxy/Makefile @@ -15,7 +15,7 @@ WRKDIST= ${WRKDIR}/${PKG_NAME}-${PKG_VERSION}-stable include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,PRIVOXY,privoxy,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,PRIVOXY,privoxy,${PKG_VERSION}-${PKG_RELEASE})) TLDFLAGS+= -pthread CONFIGURE_STYLE:= gnu diff --git a/package/procmail/Makefile b/package/procmail/Makefile index 96a2062fe..60dc5cec7 100644 --- a/package/procmail/Makefile +++ b/package/procmail/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= http://www.procmail.org/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,PROCMAIL,procmail,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,PROCMAIL,procmail,${PKG_VERSION}-${PKG_RELEASE})) do-build: ${MAKE} -C ${WRKBUILD}/src -f ../Makefile.new \ diff --git a/package/procps/Makefile b/package/procps/Makefile index 071a141a1..8b44d3eca 100644 --- a/package/procps/Makefile +++ b/package/procps/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= http://procps.sourceforge.net/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,PROCPS,procps,${PKG_VERSION}-${PKG_RELEASE},${ARCH},libncurses)) +$(eval $(call PKG_template,PROCPS,procps,${PKG_VERSION}-${PKG_RELEASE},libncurses)) BUILD_STYLE:= auto INSTALL_STYLE:= auto diff --git a/package/ptunnel/Makefile b/package/ptunnel/Makefile index db1a83347..162d11d4d 100644 --- a/package/ptunnel/Makefile +++ b/package/ptunnel/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= http://www.cti.ecp.fr/~beauxir5/ptunnel/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,PTUNNEL,ptunnel,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,PTUNNEL,ptunnel,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE:= gnu CONFIGURE_ENV+= BUILD_CC="${TARGET_CC}" \ diff --git a/package/quagga/Makefile b/package/quagga/Makefile index 7a037b50f..2ac084c06 100644 --- a/package/quagga/Makefile +++ b/package/quagga/Makefile @@ -15,15 +15,15 @@ MASTER_SITES:= http://www.quagga.net/download/ \ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,QUAGGA,quagga,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,QUAGGA_BGPD,quagga-bgpd,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,QUAGGA_OSPFD,quagga-ospfd,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,QUAGGA,quagga,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,QUAGGA_BGPD,quagga-bgpd,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,QUAGGA_OSPFD,quagga-ospfd,${PKG_VERSION}-${PKG_RELEASE})) ifeq ($(ADK_IPV6),y) -$(eval $(call PKG_template,QUAGGA_OSPF6D,quagga-ospf6d,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,QUAGGA_RIPNGD,quagga-ripngd,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,QUAGGA_OSPF6D,quagga-ospf6d,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,QUAGGA_RIPNGD,quagga-ripngd,${PKG_VERSION}-${PKG_RELEASE})) endif -$(eval $(call PKG_template,QUAGGA_RIPD,quagga-ripd,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,QUAGGA_VTYSH,quagga-vtysh,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,QUAGGA_RIPD,quagga-ripd,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,QUAGGA_VTYSH,quagga-vtysh,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE:= gnu CONFIGURE_ARGS+= --localstatedir=/var/run/quagga \ diff --git a/package/raddump/Makefile b/package/raddump/Makefile index 3eee5473b..8585ef928 100755 --- a/package/raddump/Makefile +++ b/package/raddump/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=raddump/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,RADDUMP,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,RADDUMP,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE:= gnu CONFIGURE_ARGS+= ac_cv_c_bigendian=no \ diff --git a/package/radiusclient-ng/Makefile b/package/radiusclient-ng/Makefile index 695c41bbc..3a6ee6c01 100644 --- a/package/radiusclient-ng/Makefile +++ b/package/radiusclient-ng/Makefile @@ -14,8 +14,8 @@ MASTER_SITES:= http://download.berlios.de/radiusclient-ng/ \ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,RADIUSCLIENT_NG,radiusclient-ng,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,LIBRADIUSCLIENT_NG,libradiusclient-ng,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,RADIUSCLIENT_NG,radiusclient-ng,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,LIBRADIUSCLIENT_NG,libradiusclient-ng,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE:= gnu CONFIGURE_ARGS+= ac_cv_func_getdomainname=yes diff --git a/package/radvd/Makefile b/package/radvd/Makefile index 2d031e0a3..318e52ad4 100644 --- a/package/radvd/Makefile +++ b/package/radvd/Makefile @@ -16,7 +16,7 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,RADVD,radvd,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,RADVD,radvd,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE:= gnu CONFIGURE_ARGS+= --with-configfile=/etc/radvd.conf \ diff --git a/package/rarpd/Makefile b/package/rarpd/Makefile index c32eb13fa..2bf981a2b 100644 --- a/package/rarpd/Makefile +++ b/package/rarpd/Makefile @@ -18,7 +18,7 @@ EXTRA_CFLAGS= -DNEW_LIBNET_INTERFACE include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,RARPD,rarpd,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,RARPD,rarpd,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE:= gnu CONFIGURE_ARGS+= --with-libnet="${STAGING_DIR}/usr" \ diff --git a/package/rdate/Makefile b/package/rdate/Makefile index 4c409c88b..8d16e942a 100644 --- a/package/rdate/Makefile +++ b/package/rdate/Makefile @@ -14,7 +14,7 @@ WRKDIST= ${WRKDIR}/${PKG_NAME} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,RDATE,rdate,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,RDATE,rdate,${PKG_VERSION}-${PKG_RELEASE})) MAKE_FILE= GNUmakefile BUILD_STYLE= auto diff --git a/package/readline/Makefile b/package/readline/Makefile index 43f6f124c..87795c87d 100644 --- a/package/readline/Makefile +++ b/package/readline/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_GNU:=readline/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBREADLINE,libreadline,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,LIBREADLINE,libreadline,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE:= gnu CONFIGURE_ARGS+= --with-curses diff --git a/package/reaim/Makefile b/package/reaim/Makefile index 991ea177c..37cdda654 100644 --- a/package/reaim/Makefile +++ b/package/reaim/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=reaim/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,REAIM,reaim,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,REAIM,reaim,${PKG_VERSION}-${PKG_RELEASE})) BUILD_STYLE:= auto INSTALL_STYLE:= auto diff --git a/package/rp-pppoe/Makefile b/package/rp-pppoe/Makefile index 322d1b7e4..ec8d5ce80 100644 --- a/package/rp-pppoe/Makefile +++ b/package/rp-pppoe/Makefile @@ -13,10 +13,10 @@ MASTER_SITES:= http://www.roaringpenguin.com/files/download/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,PPPOE_CLIENT,pppoe-client,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,PPPOE_RELAY,pppoe-relay,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,PPPOE_SERVER,pppoe-server,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,PPPOE_SNIFF,pppoe-sniff,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,PPPOE_CLIENT,pppoe-client,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,PPPOE_RELAY,pppoe-relay,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,PPPOE_SERVER,pppoe-server,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,PPPOE_SNIFF,pppoe-sniff,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE:= gnu CONFIGURE_ENV+= ac_cv_func_setvbuf_reversed=no \ diff --git a/package/rrdcollect/Makefile b/package/rrdcollect/Makefile index 68372b927..49ca85db6 100644 --- a/package/rrdcollect/Makefile +++ b/package/rrdcollect/Makefile @@ -17,8 +17,8 @@ endif include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,RRDCOLLECT,rrdcollect,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,RRDCOLLECT_EXAMPLE,rrdcollect-example,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,RRDCOLLECT,rrdcollect,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,RRDCOLLECT_EXAMPLE,rrdcollect-example,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE:= gnu CONFIGURE_ENV+= LIBS="${RRDTOOL_LIBS} -lz" ac_cv_func_malloc_0_nonnull=yes diff --git a/package/rrdtool/Makefile b/package/rrdtool/Makefile index ba9edbe72..7fbf1d2b1 100644 --- a/package/rrdtool/Makefile +++ b/package/rrdtool/Makefile @@ -13,9 +13,9 @@ MASTER_SITES:= http://oss.oetiker.ch/rrdtool/pub/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBRRD,librrd,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,RRDCGI,rrdcgi,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,RRDTOOL,rrdtool,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,LIBRRD,librrd,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,RRDCGI,rrdcgi,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,RRDTOOL,rrdtool,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE:= gnu CONFIGURE_ENV+= rd_cv_ieee_works=yes diff --git a/package/rrs/Makefile b/package/rrs/Makefile index 283ca4ccd..54b461961 100644 --- a/package/rrs/Makefile +++ b/package/rrs/Makefile @@ -22,8 +22,8 @@ endif include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,RRS,rrs,${PKG_VERSION}-${PKG_RELEASE},${ARCH},${PKG_DEPEND})) -$(eval $(call PKG_template,RRS_NOSSL,rrs-nossl,${PKG_VERSION}-${PKG_RELEASE},${ARCH},${PKG_DEPEND_NOSSL})) +$(eval $(call PKG_template,RRS,rrs,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPEND})) +$(eval $(call PKG_template,RRS_NOSSL,rrs-nossl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPEND_NOSSL})) ifeq ($(ADK_COMPILE_RRS_WITH_UCLIBCXX),y) PKG_CFLAGS=-fno-builtin -fno-rtti -nostdinc++ diff --git a/package/rsync/Makefile b/package/rsync/Makefile index 075c8bb67..94520660a 100644 --- a/package/rsync/Makefile +++ b/package/rsync/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= http://rsync.samba.org/ftp/rsync/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,RSYNC,rsync,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,RSYNC,rsync,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE:= gnu BUILD_STYLE:= auto diff --git a/package/rtorrent/Makefile b/package/rtorrent/Makefile index 215c99408..a3798ce97 100644 --- a/package/rtorrent/Makefile +++ b/package/rtorrent/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= http://libtorrent.rakshasa.no/downloads/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,RTORRENT,rtorrent,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,RTORRENT,rtorrent,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE:= autotool gnu CONFIGURE_ARGS+= --enable-aligned diff --git a/package/ruby/Makefile b/package/ruby/Makefile index 69756e8e5..b9ccceb8f 100644 --- a/package/ruby/Makefile +++ b/package/ruby/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= ftp://ftp.ruby-lang.org/pub/ruby/1.9/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,RUBY,ruby,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,RUBY,ruby,${PKG_VERSION}-${PKG_RELEASE})) MAKE_FILE:= GNUmakefile XAKE_FLAGS+= optflags='' debugflags='' diff --git a/package/samba/Makefile b/package/samba/Makefile index 11be3043a..7e9fcb47c 100644 --- a/package/samba/Makefile +++ b/package/samba/Makefile @@ -15,9 +15,9 @@ WRKSRC= ${WRKDIST}/source include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,SAMBA,samba,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,SAMBA_CLIENT,samba-client,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,SAMBA_PASSWD,samba-passwd,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,SAMBA,samba,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,SAMBA_CLIENT,samba-client,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,SAMBA_PASSWD,samba-passwd,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE:= gnu TLDFLAGS+= -Wl,-rpath -Wl,/usr/lib/samba diff --git a/package/sane-backends/Makefile b/package/sane-backends/Makefile index cef662ee8..99dd34ebb 100644 --- a/package/sane-backends/Makefile +++ b/package/sane-backends/Makefile @@ -30,66 +30,66 @@ endif endef -$(eval $(call PKG_template,SANE_BACKENDS,sane-backends,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,SANE_BACKEND_NET,sane-backend-net,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,SANE_BACKEND_ABATON,sane-backend-abaton,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,SANE_BACKEND_AGFAFOCUS,sane-backend-agfafocus,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,SANE_BACKEND_APPLE,sane-backend-apple,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,SANE_BACKEND_ARTEC_EPLUS48U,sane-backend-artec-eplus48u,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,SANE_BACKEND_ARTEC,sane-backend-artec,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,SANE_BACKEND_AS6E,sane-backend-as6e,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,SANE_BACKEND_AVISION,sane-backend-avision,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,SANE_BACKEND_BH,sane-backend-bh,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,SANE_BACKEND_CANON630U,sane-backend-canon630u,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,SANE_BACKEND_CANON,sane-backend-canon,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,SANE_BACKEND_COOLSCAN2,sane-backend-coolscan2,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,SANE_BACKEND_COOLSCAN,sane-backend-coolscan,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,SANE_BACKEND_DC25,sane-backend-dc25,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,SANE_BACKEND_DMC,sane-backend-dmc,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,SANE_BACKEND_EPSON,sane-backend-epson,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,SANE_BACKEND_FUJITSU,sane-backend-fujitsu,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,SANE_BACKEND_GENESYS,sane-backend-genesys,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,SANE_BACKEND_GT68XX,sane-backend-gt68xx,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,SANE_BACKEND_HP3500,sane-backend-hp3500,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,SANE_BACKEND_HP4200,sane-backend-hp4200,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,SANE_BACKEND_HP5400,sane-backend-hp5400,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,SANE_BACKEND_HP,sane-backend-hp,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,SANE_BACKEND_IBM,sane-backend-ibm,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,SANE_BACKEND_LEO,sane-backend-leo,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,SANE_BACKEND_LEXMARK,sane-backend-lexmark,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,SANE_BACKEND_MA1509,sane-backend-ma1509,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,SANE_BACKEND_MATSUSHITA,sane-backend-matsushita,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,SANE_BACKEND_MICROTEK2,sane-backend-microtek2,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,SANE_BACKEND_MICROTEK,sane-backend-microtek,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,SANE_BACKEND_MUSTEK,sane-backend-mustek,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,SANE_BACKEND_MUSTEK_USB2,sane-backend-mustek-usb2,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,SANE_BACKEND_MUSTEK_USB,sane-backend-mustek-usb,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,SANE_BACKEND_NEC,sane-backend-nec,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,SANE_BACKEND_NIASH,sane-backend-niash,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,SANE_BACKEND_PIE,sane-backend-pie,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,SANE_BACKEND_PIXMA,sane-backend-pixma,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,SANE_BACKEND_PLUSTEK_PP,sane-backend-plustek-pp,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,SANE_BACKEND_PLUSTEK,sane-backend-plustek,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,SANE_BACKEND_QCAM,sane-backend-qcam,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,SANE_BACKEND_RICOH,sane-backend-ricoh,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,SANE_BACKEND_S9036,sane-backend-s9036,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,SANE_BACKEND_SCEPTRE,sane-backend-sceptre,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,SANE_BACKEND_SHARP,sane-backend-sharp,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,SANE_BACKEND_SM3600,sane-backend-sm3600,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,SANE_BACKEND_SM3840,sane-backend-sm3840,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,SANE_BACKEND_SNAPSCAN,sane-backend-snapscan,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,SANE_BACKEND_SP15C,sane-backend-sp15c,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,SANE_BACKEND_ST400,sane-backend-st400,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,SANE_BACKEND_STV680,sane-backend-stv680,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,SANE_BACKEND_TAMARACK,sane-backend-tamarack,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,SANE_BACKEND_TECO1,sane-backend-teco1,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,SANE_BACKEND_TECO2,sane-backend-teco2,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,SANE_BACKEND_TECO3,sane-backend-teco3,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,SANE_BACKEND_TEST,sane-backend-test,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,SANE_BACKEND_U12,sane-backend-u12,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,SANE_BACKEND_UMAX1220U,sane-backend-umax1220u,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,SANE_BACKEND_UMAX_PP,sane-backend-umax-pp,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,SANE_BACKEND_UMAX,sane-backend-umax,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,SANE_BACKENDS,sane-backends,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,SANE_BACKEND_NET,sane-backend-net,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,SANE_BACKEND_ABATON,sane-backend-abaton,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,SANE_BACKEND_AGFAFOCUS,sane-backend-agfafocus,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,SANE_BACKEND_APPLE,sane-backend-apple,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,SANE_BACKEND_ARTEC_EPLUS48U,sane-backend-artec-eplus48u,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,SANE_BACKEND_ARTEC,sane-backend-artec,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,SANE_BACKEND_AS6E,sane-backend-as6e,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,SANE_BACKEND_AVISION,sane-backend-avision,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,SANE_BACKEND_BH,sane-backend-bh,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,SANE_BACKEND_CANON630U,sane-backend-canon630u,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,SANE_BACKEND_CANON,sane-backend-canon,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,SANE_BACKEND_COOLSCAN2,sane-backend-coolscan2,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,SANE_BACKEND_COOLSCAN,sane-backend-coolscan,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,SANE_BACKEND_DC25,sane-backend-dc25,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,SANE_BACKEND_DMC,sane-backend-dmc,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,SANE_BACKEND_EPSON,sane-backend-epson,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,SANE_BACKEND_FUJITSU,sane-backend-fujitsu,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,SANE_BACKEND_GENESYS,sane-backend-genesys,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,SANE_BACKEND_GT68XX,sane-backend-gt68xx,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,SANE_BACKEND_HP3500,sane-backend-hp3500,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,SANE_BACKEND_HP4200,sane-backend-hp4200,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,SANE_BACKEND_HP5400,sane-backend-hp5400,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,SANE_BACKEND_HP,sane-backend-hp,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,SANE_BACKEND_IBM,sane-backend-ibm,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,SANE_BACKEND_LEO,sane-backend-leo,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,SANE_BACKEND_LEXMARK,sane-backend-lexmark,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,SANE_BACKEND_MA1509,sane-backend-ma1509,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,SANE_BACKEND_MATSUSHITA,sane-backend-matsushita,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,SANE_BACKEND_MICROTEK2,sane-backend-microtek2,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,SANE_BACKEND_MICROTEK,sane-backend-microtek,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,SANE_BACKEND_MUSTEK,sane-backend-mustek,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,SANE_BACKEND_MUSTEK_USB2,sane-backend-mustek-usb2,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,SANE_BACKEND_MUSTEK_USB,sane-backend-mustek-usb,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,SANE_BACKEND_NEC,sane-backend-nec,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,SANE_BACKEND_NIASH,sane-backend-niash,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,SANE_BACKEND_PIE,sane-backend-pie,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,SANE_BACKEND_PIXMA,sane-backend-pixma,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,SANE_BACKEND_PLUSTEK_PP,sane-backend-plustek-pp,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,SANE_BACKEND_PLUSTEK,sane-backend-plustek,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,SANE_BACKEND_QCAM,sane-backend-qcam,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,SANE_BACKEND_RICOH,sane-backend-ricoh,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,SANE_BACKEND_S9036,sane-backend-s9036,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,SANE_BACKEND_SCEPTRE,sane-backend-sceptre,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,SANE_BACKEND_SHARP,sane-backend-sharp,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,SANE_BACKEND_SM3600,sane-backend-sm3600,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,SANE_BACKEND_SM3840,sane-backend-sm3840,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,SANE_BACKEND_SNAPSCAN,sane-backend-snapscan,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,SANE_BACKEND_SP15C,sane-backend-sp15c,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,SANE_BACKEND_ST400,sane-backend-st400,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,SANE_BACKEND_STV680,sane-backend-stv680,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,SANE_BACKEND_TAMARACK,sane-backend-tamarack,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,SANE_BACKEND_TECO1,sane-backend-teco1,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,SANE_BACKEND_TECO2,sane-backend-teco2,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,SANE_BACKEND_TECO3,sane-backend-teco3,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,SANE_BACKEND_TEST,sane-backend-test,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,SANE_BACKEND_U12,sane-backend-u12,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,SANE_BACKEND_UMAX1220U,sane-backend-umax1220u,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,SANE_BACKEND_UMAX_PP,sane-backend-umax-pp,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,SANE_BACKEND_UMAX,sane-backend-umax,${PKG_VERSION}-${PKG_RELEASE})) $(eval $(call PKG_mod_template,SANE_BACKEND_NET,net)) $(eval $(call PKG_mod_template,SANE_BACKEND_ABATON,abaton)) diff --git a/package/scanlogd/Makefile b/package/scanlogd/Makefile index 6747a82f9..4963d4590 100644 --- a/package/scanlogd/Makefile +++ b/package/scanlogd/Makefile @@ -15,7 +15,7 @@ MASTER_SITES:= http://www.openwall.com/scanlogd/ \ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,SCANLOGD,scanlogd,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,SCANLOGD,scanlogd,${PKG_VERSION}-${PKG_RELEASE})) BUILD_STYLE:= auto MAKE_FLAGS+= CC="${TARGET_CC}" LD="${TARGET_CC}" CFLAGS="-c ${TARGET_CFLAGS}" \ diff --git a/package/scdp/Makefile b/package/scdp/Makefile index 7fcd2fc94..36241cb2d 100644 --- a/package/scdp/Makefile +++ b/package/scdp/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=scdp/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,SCDP,scdp,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,SCDP,scdp,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE:= gnu CONFIGURE_ENV+= ac_cv_path_libnet_config=${STAGING_DIR}/usr/bin diff --git a/package/screen/Makefile b/package/screen/Makefile index e553a6d38..d43971e04 100644 --- a/package/screen/Makefile +++ b/package/screen/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_GNU:=screen/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,SCREEN,screen,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,SCREEN,screen,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE:= gnu CONFIGURE_ENV+= $(foreach flag,rename fchmod fchown strerror lstat _exit utimes vsnprintf getcwd setlocale strftime,ac_cv_func_${flag}=yes) diff --git a/package/scsi-spin/Makefile b/package/scsi-spin/Makefile index 1cba620ad..7644e3bfd 100644 --- a/package/scsi-spin/Makefile +++ b/package/scsi-spin/Makefile @@ -15,7 +15,7 @@ WRKDIST= ${WRKDIR}/scsi-spin include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,SCSI_SPIN,scsi-spin,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,SCSI_SPIN,scsi-spin,${PKG_VERSION}-${PKG_RELEASE})) do-build: ${TARGET_CC} ${TCFLAGS} -o ${WRKBUILD}/scsi-spin files/scsi-spin.c diff --git a/package/ser2net/Makefile b/package/ser2net/Makefile index 7b0ca8a4e..b65991077 100644 --- a/package/ser2net/Makefile +++ b/package/ser2net/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=ser2net/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,SER2NET,ser2net,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,SER2NET,ser2net,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE:= gnu BUILD_STYLE:= auto diff --git a/package/serdisplib/Makefile b/package/serdisplib/Makefile index 785be76e1..b502d7bb5 100644 --- a/package/serdisplib/Makefile +++ b/package/serdisplib/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=serdisplib/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,SERDISPLIB,serdisplib,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,SERDISPLIB,serdisplib,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE:= gnu CONFIGURE_ARGS+= --enable-libusb diff --git a/package/setpwc/Makefile b/package/setpwc/Makefile index ab7983de9..1548631cb 100644 --- a/package/setpwc/Makefile +++ b/package/setpwc/Makefile @@ -14,7 +14,7 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tgz include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,SETPWC,setpwc,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,SETPWC,setpwc,${PKG_VERSION}-${PKG_RELEASE})) do-build: ${TARGET_CC} ${TCFLAGS} -DVERSION=\"${PKG_VERSION}\" -o ${WRKBUILD}/setpwc ${WRKBUILD}/setpwc.c diff --git a/package/setserial/Makefile b/package/setserial/Makefile index 6f9c495e2..8049eedf8 100644 --- a/package/setserial/Makefile +++ b/package/setserial/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=setserial/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,SETSERIAL,setserial,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,SETSERIAL,setserial,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE:= gnu BUILD_STYLE:= auto diff --git a/package/shat/Makefile b/package/shat/Makefile index c0b4c2058..ff1f418df 100644 --- a/package/shat/Makefile +++ b/package/shat/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=shat/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,SHAT,shat,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,SHAT,shat,${PKG_VERSION}-${PKG_RELEASE})) do-build: ${MAKE} -C ${WRKBUILD}/src \ diff --git a/package/shorewall-common/Makefile b/package/shorewall-common/Makefile index 6b02af312..d2e234d92 100644 --- a/package/shorewall-common/Makefile +++ b/package/shorewall-common/Makefile @@ -14,7 +14,7 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,SHOREWALL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,SHOREWALL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE})) do-install: PREFIX="${WRKINST}" ${WRKBUILD}/install.sh -n diff --git a/package/shorewall-shell/Makefile b/package/shorewall-shell/Makefile index 233d259a1..c81a768dc 100644 --- a/package/shorewall-shell/Makefile +++ b/package/shorewall-shell/Makefile @@ -14,7 +14,7 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,SHOREWALL_SHELL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,SHOREWALL_SHELL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE})) do-install: PREFIX="${WRKINST}" ${WRKBUILD}/install.sh -n diff --git a/package/siproxd/Makefile b/package/siproxd/Makefile index d05316b70..425bfd493 100644 --- a/package/siproxd/Makefile +++ b/package/siproxd/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=siproxd/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,SIPROXD,siproxd,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,SIPROXD,siproxd,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE:= gnu BUILD_STYLE:= auto diff --git a/package/sipsak/Makefile b/package/sipsak/Makefile index 84a7af142..8db0a1ec6 100644 --- a/package/sipsak/Makefile +++ b/package/sipsak/Makefile @@ -14,7 +14,7 @@ MASTER_SITES:= http://download.berlios.de/sipsak/ \ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,SIPSAK,sipsak,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,SIPSAK,sipsak,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE:= gnu CONFIGURE_ENV+= ac_cv_func_malloc_0_nonnull=yes diff --git a/package/sispmctl/Makefile b/package/sispmctl/Makefile index c20f15614..868940ddd 100644 --- a/package/sispmctl/Makefile +++ b/package/sispmctl/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=sispmctl/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,SISPMCTL,sispmctl,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,SISPMCTL,sispmctl,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE:= gnu BUILD_STYLE:= auto diff --git a/package/slurm/Makefile b/package/slurm/Makefile index e2560610c..f9e4db175 100644 --- a/package/slurm/Makefile +++ b/package/slurm/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= http://www.wormulon.net/files/slurm/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,SLURM,slurm,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,SLURM,slurm,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE:= gnu CONFIGURE_ARGS+= LIBS="-lncurses" \ diff --git a/package/snort-wireless/Makefile b/package/snort-wireless/Makefile index 965ece735..84f2c016b 100644 --- a/package/snort-wireless/Makefile +++ b/package/snort-wireless/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= http://www.snort-wireless.org/files/ include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,SNORT_WIRELESS,snort-wireless,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,SNORT_WIRELESS,snort-wireless,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --enable-flexresp \ diff --git a/package/snort/Makefile b/package/snort/Makefile index a81c7ac70..bf1aee963 100644 --- a/package/snort/Makefile +++ b/package/snort/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= http://www.snort.org/dl/current/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,SNORT,snort,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,SNORT,snort,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --enable-flexresp \ diff --git a/package/socat/Makefile b/package/socat/Makefile index 47a40755a..3e41d869c 100644 --- a/package/socat/Makefile +++ b/package/socat/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= http://www.dest-unreach.org/socat/download/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,SOCAT,socat,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,SOCAT,socat,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE:= gnu CONFIGURE_ENV+= sc_cv_termios_ispeed="no" \ diff --git a/package/speex/Makefile b/package/speex/Makefile index 76eb03744..bcba36028 100644 --- a/package/speex/Makefile +++ b/package/speex/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= http://downloads.us.xiph.org/releases/speex/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBSPEEX,libspeex,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,LIBSPEEX,libspeex,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE:= gnu CONFIGURE_ARGS+= --without-ogg --disable-oggtest --enable-fixed-point diff --git a/package/sqlite/Makefile b/package/sqlite/Makefile index 5c1a8ce80..bf73504de 100644 --- a/package/sqlite/Makefile +++ b/package/sqlite/Makefile @@ -13,8 +13,8 @@ MASTER_SITES:= http://www.sqlite.org/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBSQLITE,libsqlite,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,SQLITE_CLI,sqlite-cli,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,LIBSQLITE,libsqlite,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,SQLITE_CLI,sqlite-cli,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE:= gnu CONFIGURE_ENV+= config_BUILD_CC="${HOSTCC}" \ diff --git a/package/squid/Makefile b/package/squid/Makefile index fb1ac63af..3c1342221 100644 --- a/package/squid/Makefile +++ b/package/squid/Makefile @@ -70,18 +70,18 @@ endef #endef -$(eval $(call PKG_template,SQUID,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,SQUID_MOD_BASIC_AUTH_GETPWNAM,${PKG_NAME}-mod-basic-auth-getpwnam,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,SQUID_MOD_BASIC_AUTH_NCSA,${PKG_NAME}-mod-basic-auth-ncsa,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,SQUID_MOD_BASIC_AUTH_SMB,${PKG_NAME}-mod-basic-auth-smb,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,SQUID_MOD_BASIC_AUTH_WINBIND,${PKG_NAME}-mod-basic-auth-winbind,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,SQUID_MOD_DIGEST_AUTH_PASSWORD,${PKG_NAME}-mod-digest-auth-password,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,SQUID_MOD_EXTERNAL_ACL_IP_USER,${PKG_NAME}-mod-external-acl-ip-user,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,SQUID_MOD_EXTERNAL_ACL_UNIX_GROUP,${PKG_NAME}-mod-external-acl-unix-group,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,SQUID_MOD_EXTERNAL_ACL_WINBIND_GROUP,${PKG_NAME}-mod-external-acl-winbind-group,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,SQUID_MOD_NTLM_AUTH_FAKEAUTH,${PKG_NAME}-mod-ntlm-auth-fakeauth,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,SQUID_MOD_NTLM_AUTH_SMB_AUTH,${PKG_NAME}-mod-ntlm-auth-smb-auth,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,SQUID_MOD_NTLM_AUTH_WINBIND_AUTH,${PKG_NAME}-mod-ntlm-auth-winbind-auth,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,SQUID,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,SQUID_MOD_BASIC_AUTH_GETPWNAM,${PKG_NAME}-mod-basic-auth-getpwnam,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,SQUID_MOD_BASIC_AUTH_NCSA,${PKG_NAME}-mod-basic-auth-ncsa,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,SQUID_MOD_BASIC_AUTH_SMB,${PKG_NAME}-mod-basic-auth-smb,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,SQUID_MOD_BASIC_AUTH_WINBIND,${PKG_NAME}-mod-basic-auth-winbind,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,SQUID_MOD_DIGEST_AUTH_PASSWORD,${PKG_NAME}-mod-digest-auth-password,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,SQUID_MOD_EXTERNAL_ACL_IP_USER,${PKG_NAME}-mod-external-acl-ip-user,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,SQUID_MOD_EXTERNAL_ACL_UNIX_GROUP,${PKG_NAME}-mod-external-acl-unix-group,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,SQUID_MOD_EXTERNAL_ACL_WINBIND_GROUP,${PKG_NAME}-mod-external-acl-winbind-group,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,SQUID_MOD_NTLM_AUTH_FAKEAUTH,${PKG_NAME}-mod-ntlm-auth-fakeauth,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,SQUID_MOD_NTLM_AUTH_SMB_AUTH,${PKG_NAME}-mod-ntlm-auth-smb-auth,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,SQUID_MOD_NTLM_AUTH_WINBIND_AUTH,${PKG_NAME}-mod-ntlm-auth-winbind-auth,${PKG_VERSION}-${PKG_RELEASE})) #${eval ${call PKG_mod_template,SQUID_MOD_BASIC_AUTH_GETPWNAM,getpwname_auth}} #${eval ${call PKG_mod_template,SQUID_MOD_BASIC_AUTH_LDAP,ldap}} diff --git a/package/srelay/Makefile b/package/srelay/Makefile index edf96cb27..db3d0134c 100644 --- a/package/srelay/Makefile +++ b/package/srelay/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=socks-relay/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,SRELAY,srelay,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,SRELAY,srelay,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE:= gnu CONFIGURE_ARGS+= --disable-thread diff --git a/package/ssltunnel/Makefile b/package/ssltunnel/Makefile index b475ec8b6..18cdee10c 100644 --- a/package/ssltunnel/Makefile +++ b/package/ssltunnel/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= http://www.hsc.fr/ressources/outils/ssltunnel/download/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,SSLTUNNEL,ssltunnel,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,SSLTUNNEL,ssltunnel,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE:= gnu CONFIGURE_ENV+= BUILD_CC="${TARGET_CC}" diff --git a/package/ssmtp/Makefile b/package/ssmtp/Makefile index 54db35b66..219d1d2fa 100644 --- a/package/ssmtp/Makefile +++ b/package/ssmtp/Makefile @@ -14,7 +14,7 @@ DISTFILES:= ${PKG_NAME}_${PKG_VERSION}.orig.tar.gz include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,SSMTP,ssmtp,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,SSMTP,ssmtp,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE:= gnu BUILD_STYLE:= auto diff --git a/package/strace/Makefile b/package/strace/Makefile index 6bd719cfe..f92795c6d 100644 --- a/package/strace/Makefile +++ b/package/strace/Makefile @@ -14,7 +14,7 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,STRACE,strace,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,STRACE,strace,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE:= gnu BUILD_STYLE:= auto diff --git a/package/stress/Makefile b/package/stress/Makefile index 2844ab26d..5f13c48fa 100644 --- a/package/stress/Makefile +++ b/package/stress/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= http://weather.ou.edu/~apw/projects/stress/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,STRESS,stress,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,STRESS,stress,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE:= gnu BUILD_STYLE:= auto diff --git a/package/strongswan/Makefile b/package/strongswan/Makefile index fd224b013..85b0c51e2 100644 --- a/package/strongswan/Makefile +++ b/package/strongswan/Makefile @@ -14,7 +14,7 @@ MASTER_SITES:= http://download.strongswan.org/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,STRONGSWAN,strongswan,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,STRONGSWAN,strongswan,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE:= gnu BUILD_STYLE:= auto diff --git a/package/subversion/Makefile b/package/subversion/Makefile index 4cdd8ca0c..85807565f 100644 --- a/package/subversion/Makefile +++ b/package/subversion/Makefile @@ -14,7 +14,7 @@ MASTER_SITES:= http://subversion.tigris.org/downloads/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,SUBVERSION,$(PKG_NAME),${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,SUBVERSION,$(PKG_NAME),${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE:= gnu CONFIGURE_ARGS+= --with-apr=${STAGING_DIR}/usr/bin/apr-config diff --git a/package/swconfig/Makefile b/package/swconfig/Makefile index 0657c54fe..105c612b7 100644 --- a/package/swconfig/Makefile +++ b/package/swconfig/Makefile @@ -13,7 +13,7 @@ NO_DISTFILES:= 1 include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,SWCONFIG,swconfig,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,SWCONFIG,swconfig,${PKG_VERSION}-${PKG_RELEASE})) #XAKE_FLAGS:= LIBS="$(STAGING_DIR)/usr/lib/libnl.a -lm" XAKE_FLAGS:= LIBS="-lnl -lm" CFLAGS="$(TARGET_CFLAGS) -I$(LINUX_DIR)/include" diff --git a/package/syslog-ng/Makefile b/package/syslog-ng/Makefile index 4a8141750..f7dee9f29 100644 --- a/package/syslog-ng/Makefile +++ b/package/syslog-ng/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= http://www.balabit.com/downloads/files/syslog-ng/sources/1.6/src include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,SYSLOG_NG,syslog-ng,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,SYSLOG_NG,syslog-ng,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE:= gnu CONFIGURE_ARGS+= --enable-full-dynamic \ diff --git a/package/sysstat/Makefile b/package/sysstat/Makefile index 99f57eb9e..33d842b8f 100644 --- a/package/sysstat/Makefile +++ b/package/sysstat/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= http://perso.orange.fr/sebastien.godard/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,SYSSTAT,sysstat,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,SYSSTAT,sysstat,${PKG_VERSION}-${PKG_RELEASE})) BUILD_STYLE:= auto INSTALL_STYLE:= auto diff --git a/package/tar/Makefile b/package/tar/Makefile index 75f8eb47c..333e8a0ca 100644 --- a/package/tar/Makefile +++ b/package/tar/Makefile @@ -15,7 +15,7 @@ MASTER_SITES:= ftp://ftp.informatik.rwth-aachen.de/pub/gnu/tar/ \ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,TAR,tar,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,TAR,tar,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE:= gnu BUILD_STYLE:= auto diff --git a/package/tcl/Makefile b/package/tcl/Makefile index 03bbb5975..41748d86e 100644 --- a/package/tcl/Makefile +++ b/package/tcl/Makefile @@ -17,7 +17,7 @@ WRKSRC= ${WRKDIST}/unix include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,TCL,tcl,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,TCL,tcl,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE= gnu CONFIGURE_ENV+= tcl_cv_strstr_unbroken=ok \ diff --git a/package/tcp_wrappers/Makefile b/package/tcp_wrappers/Makefile index af215d5d8..ce3c80c1e 100644 --- a/package/tcp_wrappers/Makefile +++ b/package/tcp_wrappers/Makefile @@ -15,7 +15,7 @@ WRKDIST= ${WRKDIR}/${PKG_NAME}_${PKG_VERSION} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBWRAP,libwrap,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,LIBWRAP,libwrap,${PKG_VERSION}-${PKG_RELEASE})) BUILD_STYLE:= auto ALL_TARGET:= tidy all diff --git a/package/tcpdump/Makefile b/package/tcpdump/Makefile index 2295f73f8..332c9c823 100644 --- a/package/tcpdump/Makefile +++ b/package/tcpdump/Makefile @@ -16,7 +16,7 @@ MASTER_SITES:= http://www.tcpdump.org/release/ \ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,TCPDUMP,tcpdump,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,TCPDUMP,tcpdump,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE:= gnu CONFIGURE_ENV+= BUILD_CC="${TARGET_CC}" HOSTCC=${HOSTCC} \ diff --git a/package/tinc/Makefile b/package/tinc/Makefile index aa454bfec..eaec7890e 100644 --- a/package/tinc/Makefile +++ b/package/tinc/Makefile @@ -15,7 +15,7 @@ MASTER_SITES:= http://www.tinc-vpn.org/packages/ \ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,TINC,tinc,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,TINC,tinc,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE:= gnu CONFIGURE_ARGS+= --with-kernel=${LINUX_DIR} \ diff --git a/package/tinyproxy/Makefile b/package/tinyproxy/Makefile index cab1655a5..6b2a65db7 100644 --- a/package/tinyproxy/Makefile +++ b/package/tinyproxy/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= https://www.banu.com/pub/tinyproxy/1.6/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,TINYPROXY,tinyproxy,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,TINYPROXY,tinyproxy,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE:= gnu BUILD_STYLE:= auto diff --git a/package/tmsnc/Makefile b/package/tmsnc/Makefile index 212ca6223..6758e3523 100644 --- a/package/tmsnc/Makefile +++ b/package/tmsnc/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=tmsnc/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,TMSNC,tmsnc,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,TMSNC,tmsnc,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE= gnu CONFIGURE_ENV+= ac_cv_func_malloc_0_nonnull=yes \ diff --git a/package/tntnet/Makefile b/package/tntnet/Makefile index d53b99500..58f987b85 100644 --- a/package/tntnet/Makefile +++ b/package/tntnet/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= http://www.tntnet.org/download/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,TNTNET,tntnet,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,TNTNET,tntnet,${PKG_VERSION}-${PKG_RELEASE})) ifeq (${ADK_COMPILE_CXXTOOLS_WITH_UCLIBCXX},y) TCXXFLAGS+= -fno-builtin -nostdinc++ -nodefaultlibs -I${STAGING_DIR}/usr/include/uClibc++ diff --git a/package/tor/Makefile b/package/tor/Makefile index ad47ccfd1..1918577ff 100644 --- a/package/tor/Makefile +++ b/package/tor/Makefile @@ -16,7 +16,7 @@ MASTER_SITES:= http://tor.eff.org/dist/ \ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,TOR,tor,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,TOR,tor,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE:= gnu CONFIGURE_ENV+= ac_cv_libevent_normal=yes \ diff --git a/package/trafshow/Makefile b/package/trafshow/Makefile index 0921883f4..f90dace4e 100644 --- a/package/trafshow/Makefile +++ b/package/trafshow/Makefile @@ -15,7 +15,7 @@ WRKDIST= ${WRKDIR}/trafshow-5.2.3 include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,TRAFSHOW,trafshow,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,TRAFSHOW,trafshow,${PKG_VERSION}-${PKG_RELEASE})) TCFLAGS+= -DHAVE_SOCKADDR_STORAGE -DHAVE_HAS_COLORS -I$(STAGING_DIR)/usr/include TLDFLAGS+= -pthread diff --git a/package/ttcp/Makefile b/package/ttcp/Makefile index 75b355cd6..beba73e71 100644 --- a/package/ttcp/Makefile +++ b/package/ttcp/Makefile @@ -14,7 +14,7 @@ WRKDIST= ${WRKDIR}/ttcp include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,TTCP,ttcp,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,TTCP,ttcp,${PKG_VERSION}-${PKG_RELEASE})) do-build: ${TARGET_CC} ${TCFLAGS} -o ${WRKBUILD}/ttcp ttcp.c diff --git a/package/uclibc++/Makefile b/package/uclibc++/Makefile index 95e616cc4..6747a0dcd 100644 --- a/package/uclibc++/Makefile +++ b/package/uclibc++/Makefile @@ -15,7 +15,7 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,UCLIBCXX,uclibc++,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,UCLIBCXX,uclibc++,${PKG_VERSION}-${PKG_RELEASE})) BUILD_STYLE:= auto MAKE_FLAGS+= TOPDIR="${WRKBUILD}/" \ diff --git a/package/uclibc/Makefile b/package/uclibc/Makefile index 73b3fe87e..87714561c 100644 --- a/package/uclibc/Makefile +++ b/package/uclibc/Makefile @@ -10,7 +10,7 @@ NO_DISTFILES:=1 include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,UCLIBC,uclibc,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) +$(eval $(call PKG_template,UCLIBC,uclibc,$(PKG_VERSION)-$(PKG_RELEASE))) # do nothing, uClibc is already build in toolchain directory do-install: diff --git a/package/udev/Makefile b/package/udev/Makefile index 47eae9962..f9757a0f0 100644 --- a/package/udev/Makefile +++ b/package/udev/Makefile @@ -20,7 +20,7 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,UDEV,udev,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,UDEV,udev,${PKG_VERSION}-${PKG_RELEASE})) BUILD_STYLE:= auto INSTALL_STYLE:= auto diff --git a/package/udp-broadcast-relay/Makefile b/package/udp-broadcast-relay/Makefile index 75befbd9f..ff2399cc8 100644 --- a/package/udp-broadcast-relay/Makefile +++ b/package/udp-broadcast-relay/Makefile @@ -14,7 +14,7 @@ MASTER_SITES:= http://www.joachim-breitner.de/udp-broadcast-relay/files/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,UDP_BROADCAST_RELAY,udp-broadcast-relay,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,UDP_BROADCAST_RELAY,udp-broadcast-relay,${PKG_VERSION}-${PKG_RELEASE})) do-build: ${TARGET_CC} ${WRKBUILD}/main.c -o ${WRKBUILD}/${PKG_NAME} diff --git a/package/ulogd/Makefile b/package/ulogd/Makefile index 2135669c1..b0d4dfbdc 100644 --- a/package/ulogd/Makefile +++ b/package/ulogd/Makefile @@ -17,12 +17,12 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,ULOGD,ulogd,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,ULOGD_MOD_MYSQL,ulogd-mod-mysql,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,ULOGD_MOD_PCAP,ulogd-mod-pcap,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,ULOGD_MOD_PGSQL,ulogd-mod-pgsql,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,ULOGD_MOD_SQLITE,ulogd-mod-sqlite,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,ULOGD_MOD_EXTRA,ulogd-mod-extra,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,ULOGD,ulogd,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,ULOGD_MOD_MYSQL,ulogd-mod-mysql,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,ULOGD_MOD_PCAP,ulogd-mod-pcap,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,ULOGD_MOD_PGSQL,ulogd-mod-pgsql,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,ULOGD_MOD_SQLITE,ulogd-mod-sqlite,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,ULOGD_MOD_EXTRA,ulogd-mod-extra,${PKG_VERSION}-${PKG_RELEASE})) SUB_INSTALLS-y:= SUB_INSTALLS-m:= diff --git a/package/updatedd/Makefile b/package/updatedd/Makefile index c6c1b555d..e51d78e84 100644 --- a/package/updatedd/Makefile +++ b/package/updatedd/Makefile @@ -19,16 +19,16 @@ ${INSTALL_DIR} ${IDIR_${1}}/usr/lib/updatedd ${INSTALL_BIN} ${WRKINST}/usr/lib/updatedd/lib${2}.so ${IDIR_${1}}/usr/lib/updatedd/ endef -$(eval $(call PKG_template,UPDATEDD,updatedd,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,UPDATEDD_MOD_CHANGEIP,updatedd-mod-changeip,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,UPDATEDD_MOD_DYNDNS,updatedd-mod-dyndns,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,UPDATEDD_MOD_EURODYNDNS,updatedd-mod-eurodyndns,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,UPDATEDD_MOD_HN,updatedd-mod-hn,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,UPDATEDD_MOD_NOIP,updatedd-mod-noip,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,UPDATEDD_MOD_ODS,updatedd-mod-ods,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,UPDATEDD_MOD_OVH,updatedd-mod-ovh,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,UPDATEDD_MOD_REGFISH,updatedd-mod-regfish,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,UPDATEDD_MOD_TZO,updatedd-mod-tzo,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,UPDATEDD,updatedd,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,UPDATEDD_MOD_CHANGEIP,updatedd-mod-changeip,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,UPDATEDD_MOD_DYNDNS,updatedd-mod-dyndns,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,UPDATEDD_MOD_EURODYNDNS,updatedd-mod-eurodyndns,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,UPDATEDD_MOD_HN,updatedd-mod-hn,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,UPDATEDD_MOD_NOIP,updatedd-mod-noip,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,UPDATEDD_MOD_ODS,updatedd-mod-ods,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,UPDATEDD_MOD_OVH,updatedd-mod-ovh,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,UPDATEDD_MOD_REGFISH,updatedd-mod-regfish,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,UPDATEDD_MOD_TZO,updatedd-mod-tzo,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE:= gnu BUILD_STYLE:= auto diff --git a/package/usbutils/Makefile b/package/usbutils/Makefile index 3f839fdd6..052b491af 100644 --- a/package/usbutils/Makefile +++ b/package/usbutils/Makefile @@ -14,7 +14,7 @@ MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=linux-usb/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LSUSB,lsusb,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,LSUSB,lsusb,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE:= gnu BUILD_STYLE:= auto diff --git a/package/ussp-push/Makefile b/package/ussp-push/Makefile index 092e137a9..32ffb9714 100644 --- a/package/ussp-push/Makefile +++ b/package/ussp-push/Makefile @@ -14,7 +14,7 @@ MASTER_SITES:= http://xmailserver.org/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,USSP_PUSH,ussp-push,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,USSP_PUSH,ussp-push,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE:= gnu BUILD_STYLE:= auto diff --git a/package/ustl/Makefile b/package/ustl/Makefile index 0a6cae1e9..f1c302778 100644 --- a/package/ustl/Makefile +++ b/package/ustl/Makefile @@ -15,7 +15,7 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}-0.tar.bz2 include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,USTL,ustl,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,USTL,ustl,${PKG_VERSION}-${PKG_RELEASE})) BUILD_STYLE:= auto INSTALL_STYLE:= auto diff --git a/package/util-linux/Makefile b/package/util-linux/Makefile index 8ea246a06..fd0600e61 100644 --- a/package/util-linux/Makefile +++ b/package/util-linux/Makefile @@ -17,9 +17,9 @@ MASTER_SITES:= ftp://ftp.kernel.org/pub/linux/utils/util-linux/ \ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,FDISK,fdisk,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,LOSETUP,losetup,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,SWAP_UTILS,swap-utils,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,FDISK,fdisk,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,LOSETUP,losetup,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,SWAP_UTILS,swap-utils,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE:= gnu BUILD_STYLE:= auto diff --git a/package/valgrind/Makefile b/package/valgrind/Makefile index 23977c0b4..83be5f74a 100644 --- a/package/valgrind/Makefile +++ b/package/valgrind/Makefile @@ -14,7 +14,7 @@ MASTER_SITES:= http://valgrind.org/downloads/ include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,VALGRIND,valgrind,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) +$(eval $(call PKG_template,VALGRIND,valgrind,$(PKG_VERSION)-$(PKG_RELEASE))) CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --disable-tls diff --git a/package/vgp/Makefile b/package/vgp/Makefile index 4e7d3bb43..27cd719ca 100755 --- a/package/vgp/Makefile +++ b/package/vgp/Makefile @@ -14,7 +14,7 @@ MASTER_SITES:= http://vgpd.freaknet.org/files/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,VGP,vgp,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,VGP,vgp,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE:= gnu INSTALL_STYLE:= auto diff --git a/package/vilistextum/Makefile b/package/vilistextum/Makefile index 160d03af5..955db3bf8 100644 --- a/package/vilistextum/Makefile +++ b/package/vilistextum/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= http://bhaak.dyndns.org/${PKG_NAME}/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,VILISTEXTUM,vilistextum,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,VILISTEXTUM,vilistextum,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE= gnu BUILD_STYLE= auto diff --git a/package/vim/Makefile b/package/vim/Makefile index 2f5405971..de5074b7f 100644 --- a/package/vim/Makefile +++ b/package/vim/Makefile @@ -17,7 +17,7 @@ WRKSRC= ${WRKDIST}/src include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,VIM,vim,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,VIM,vim,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE= gnu CONFIGURE_ENV+= vim_cv_toupper_broken=no \ diff --git a/package/vnc-reflector/Makefile b/package/vnc-reflector/Makefile index 434fe0367..bfce815ea 100644 --- a/package/vnc-reflector/Makefile +++ b/package/vnc-reflector/Makefile @@ -15,7 +15,7 @@ WRKDIST= ${WRKDIR}/vnc_reflector include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,VNC_REFLECTOR,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,VNC_REFLECTOR,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE})) BUILD_STYLE:= auto TCPPFLAGS+= -I. diff --git a/package/vnstat/Makefile b/package/vnstat/Makefile index 7c78f2fb4..e55156208 100644 --- a/package/vnstat/Makefile +++ b/package/vnstat/Makefile @@ -14,7 +14,7 @@ MASTER_SITES:= http://humdi.net/vnstat/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,VNSTAT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,VNSTAT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE})) BUILD_STYLE:= auto MAKE_FLAGS+= ${TARGET_CONFIGURE_OPTS} diff --git a/package/vpnc/Makefile b/package/vpnc/Makefile index 8936a9fe2..e4eab95b5 100644 --- a/package/vpnc/Makefile +++ b/package/vpnc/Makefile @@ -16,7 +16,7 @@ PKG_DEPENDS:= libgcrypt libgpg-error kmod-tun include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,VPNC,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,VPNC,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE})) BUILD_STYLE:= auto XAKE_FLAGS+= CC="${TARGET_CC}" \ diff --git a/package/vrrpd/Makefile b/package/vrrpd/Makefile index 2cdab2132..695333b68 100644 --- a/package/vrrpd/Makefile +++ b/package/vrrpd/Makefile @@ -14,7 +14,7 @@ MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=vrrpd/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,VRRPD,vrrpd,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,VRRPD,vrrpd,${PKG_VERSION}-${PKG_RELEASE})) BUILD_STYLE:= auto MAKE_FLAGS:= CC="${TARGET_CC}" \ diff --git a/package/vsftpd/Makefile b/package/vsftpd/Makefile index 02918cfa6..8f3e691ee 100644 --- a/package/vsftpd/Makefile +++ b/package/vsftpd/Makefile @@ -14,7 +14,7 @@ MASTER_SITES:= ftp://vsftpd.beasts.org/users/cevans/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,VSFTPD,vsftpd,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,VSFTPD,vsftpd,${PKG_VERSION}-${PKG_RELEASE})) BUILD_STYLE:= auto XAKE_FLAGS+= ${TARGET_CONFIGURE_OPTS} diff --git a/package/vtun/Makefile b/package/vtun/Makefile index f1482a027..a61fe61c6 100644 --- a/package/vtun/Makefile +++ b/package/vtun/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=vtun/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,VTUN,vtun,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,VTUN,vtun,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE:= gnu CONFIGURE_ARGS+= --with-ssl-headers=$(STAGING_DIR)/usr/include/openssl \ diff --git a/package/watchdog/Makefile b/package/watchdog/Makefile index bce8e4141..a29bc79fc 100644 --- a/package/watchdog/Makefile +++ b/package/watchdog/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=watchdog/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,WATCHDOG,watchdog,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,WATCHDOG,watchdog,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE:= gnu XAKE_FLAGS+= CCOPT="${TARGET_CFLAGS}" \ diff --git a/package/wccpd/Makefile b/package/wccpd/Makefile index fef79b49f..47ac046d8 100644 --- a/package/wccpd/Makefile +++ b/package/wccpd/Makefile @@ -14,7 +14,7 @@ MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=wccpd/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,WCCPD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,WCCPD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE:= gnu CONFIGURE_ENV+= ac_cv_func_setpgrp_void=yes diff --git a/package/wdfs/Makefile b/package/wdfs/Makefile index a6858dd19..82be38c13 100644 --- a/package/wdfs/Makefile +++ b/package/wdfs/Makefile @@ -13,7 +13,7 @@ MASTER_SITES= http://noedler.de/projekte/wdfs/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,WDFS,wdfs,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,WDFS,wdfs,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE= gnu BUILD_STYLE= auto diff --git a/package/weechat/Makefile b/package/weechat/Makefile index 1e1a5023a..96a820fcf 100644 --- a/package/weechat/Makefile +++ b/package/weechat/Makefile @@ -29,7 +29,7 @@ else PKG_DEPEND+= liblua endif -$(eval $(call PKG_template,WEECHAT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${ARCH},${PKG_DEPEND})) +$(eval $(call PKG_template,WEECHAT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPEND})) CONFIGURE_STYLE:= gnu CONFIGURE_ARGS+= ${ENABLE_TLS} \ diff --git a/package/wifidog/Makefile b/package/wifidog/Makefile index b46e273f3..591f71403 100644 --- a/package/wifidog/Makefile +++ b/package/wifidog/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=${PKG_NAME}/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,WIFIDOG,wifidog,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,WIFIDOG,wifidog,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE:= gnu CONFIGURE_ENV+= ac_cv_func_malloc_0_nonnull=yes \ diff --git a/package/wireless-firmware/Makefile b/package/wireless-firmware/Makefile index e865468ff..a941bdc1a 100644 --- a/package/wireless-firmware/Makefile +++ b/package/wireless-firmware/Makefile @@ -15,7 +15,7 @@ WRKDIST= ${WRKDIR}/RT61_Firmware_V1.2 include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,WIRELESS_FIRMWARE_RT61,wireless-firmware-rt61,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,WIRELESS_FIRMWARE_RT61,wireless-firmware-rt61,${PKG_VERSION}-${PKG_RELEASE})) INSTALL_STYLE= manual diff --git a/package/wireless-tools/Makefile b/package/wireless-tools/Makefile index ed02573bd..e16ef2559 100644 --- a/package/wireless-tools/Makefile +++ b/package/wireless-tools/Makefile @@ -17,7 +17,7 @@ WRKDIST= ${WRKDIR}/wireless_tools.29 include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,WIRELESS_TOOLS,wireless-tools,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,WIRELESS_TOOLS,wireless-tools,${PKG_VERSION}-${PKG_RELEASE})) BUILD_STYLE:= auto MAKE_FLAGS+= CC="${TARGET_CC}" CFLAGS="${TARGET_CFLAGS} -I." diff --git a/package/wol/Makefile b/package/wol/Makefile index 1a4434148..0bb138c54 100644 --- a/package/wol/Makefile +++ b/package/wol/Makefile @@ -14,7 +14,7 @@ MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=ahh/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,WOL,wol,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,WOL,wol,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE:= gnu CONFIGURE_ARGS+= ac_cv_func_malloc_0_nonnull=yes \ diff --git a/package/wondershaper/Makefile b/package/wondershaper/Makefile index 13617cfec..12fd46ea5 100644 --- a/package/wondershaper/Makefile +++ b/package/wondershaper/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= http://lartc.org/wondershaper/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,WONDERSHAPER,wondershaper,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,WONDERSHAPER,wondershaper,${PKG_VERSION}-${PKG_RELEASE})) do-install: ${INSTALL_DIR} ${IDIR_WONDERSHAPER}/usr/sbin/ diff --git a/package/wpa_supplicant/Makefile b/package/wpa_supplicant/Makefile index 9d12820b7..ddc2901ad 100644 --- a/package/wpa_supplicant/Makefile +++ b/package/wpa_supplicant/Makefile @@ -15,7 +15,7 @@ WRKSRC= ${WRKDIST}/${PKG_NAME} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,WPA_SUPPLICANT,wpa-supplicant,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,WPA_SUPPLICANT,wpa-supplicant,${PKG_VERSION}-${PKG_RELEASE})) BUILD_STYLE:= auto MAKE_FLAGS+= CPPFLAGS='${TCPPFLAGS}' \ diff --git a/package/wput/Makefile b/package/wput/Makefile index aa65e209d..04477ed09 100644 --- a/package/wput/Makefile +++ b/package/wput/Makefile @@ -17,7 +17,7 @@ WRKDIST= ${WRKDIR}/${PKG_NAME} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,WPUT,wput,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,WPUT,wput,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE:= gnu CONFIGURE_ARGS+= --disable-g-switch diff --git a/package/xfsprogs/Makefile b/package/xfsprogs/Makefile index d4e38aa81..3b25cbba7 100644 --- a/package/xfsprogs/Makefile +++ b/package/xfsprogs/Makefile @@ -14,7 +14,7 @@ MASTER_SITES:= ftp://oss.sgi.com/projects/xfs/cmd_tars/ \ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,XFSPROGS,xfsprogs,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,XFSPROGS,xfsprogs,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE= autoconf gnu CONFIGURE_ARGS+= --enable-gettext=no \ diff --git a/package/xinetd/Makefile b/package/xinetd/Makefile index 434d0bdcc..349d194fd 100644 --- a/package/xinetd/Makefile +++ b/package/xinetd/Makefile @@ -14,7 +14,7 @@ MASTER_SITES:= http://www.xinetd.org/ include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,XINETD,xinetd,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,XINETD,xinetd,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE:= gnu CONFIGURE_ARGS+= --without-libwrap \ diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile index 6a56e652e..fb35bb8d9 100644 --- a/package/xorg-server/Makefile +++ b/package/xorg-server/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_XORG} include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,XORG_SERVER,xorg-server,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) +$(eval $(call PKG_template,XORG_SERVER,xorg-server,$(PKG_VERSION)-$(PKG_RELEASE))) CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --disable-xinerama \ diff --git a/package/zlib/Makefile b/package/zlib/Makefile index 642888f9d..c63f92b63 100644 --- a/package/zlib/Makefile +++ b/package/zlib/Makefile @@ -15,7 +15,7 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,ZLIB,zlib,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,ZLIB,zlib,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE= manual BUILD_STYLE= auto diff --git a/package/zsh/Makefile b/package/zsh/Makefile index 5daebbf9d..7e5a66581 100644 --- a/package/zsh/Makefile +++ b/package/zsh/Makefile @@ -13,7 +13,7 @@ MASTER_SITES:= ftp://ftp.fu-berlin.de/pub/unix/shells/zsh/ include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,ZSH,zsh,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) +$(eval $(call PKG_template,ZSH,zsh,$(PKG_VERSION)-$(PKG_RELEASE))) CONFIGURE_STYLE= gnu BUILD_STYLE= auto diff --git a/target/Config.in b/target/Config.in index 94c7d96e2..19bf7a49e 100644 --- a/target/Config.in +++ b/target/Config.in @@ -305,6 +305,13 @@ config ADK_CXX help Enable C++ Compiler and Libraries +config ADK_DEBUG + bool "Enable debug support" + default n + help + All packages and libc will be compiled and packaged with debug information. + Mostly useful for NFS root or big USB/CF disk setups. + config ADK_IPV6 bool "Enable IPv6 support" default n diff --git a/toolchain/uClibc/Makefile b/toolchain/uClibc/Makefile index 8bf81f309..a96f3533a 100644 --- a/toolchain/uClibc/Makefile +++ b/toolchain/uClibc/Makefile @@ -27,7 +27,7 @@ ifeq ($(ADK_SSP),y) echo 'PROPOLICE_BLOCK_ABRT=y' >> ${WRKBUILD}/.config echo '# PROPOLICE_BLOCK_SEGV is not set' >> ${WRKBUILD}/.config endif -ifeq ($(DEBUG),1) +ifneq ($(ADK_DEBUG),) $(SED) 's,DOSTRIP,DODEBUG,' ${WRKBUILD}/.config endif $(MAKE) -C $(WRKBUILD) \ |