From: Nicolas Thill Date: Mon, 30 Oct 2006 13:51:50 +0000 (+0000) Subject: massive Makefile cleanup, add missing 'svn:keywords' property X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=75ea41a2c060b638aed79b8ce50de8f86505c1b3;p=openwrt%2Fsvn-archive%2Farchive.git massive Makefile cleanup, add missing 'svn:keywords' property SVN-Revision: 5348 --- diff --git a/admin/osiris/Makefile b/admin/osiris/Makefile index 81a180758c..6e8a212ad3 100644 --- a/admin/osiris/Makefile +++ b/admin/osiris/Makefile @@ -12,13 +12,12 @@ PKG_NAME:=osiris PKG_VERSION:=4.2.1 PKG_RELEASE:=1 - -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://osiris.shmoo.com/data/ PKG_MD5SUM:=11445f7d8dec737f0be89357f5c5bcae PKG_CAT:=zcat +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install include $(INCLUDE_DIR)/package.mk @@ -28,7 +27,6 @@ define Package/osirisd CATEGORY:=Administration DEPENDS:=+libopenssl TITLE:=Host integrity monitoring system (scanning agent) - DESCRIPTION:=an Host Integrity Monitoring System (scanning agent) URL:=http://www.hostintegrity.com/osiris endef @@ -42,8 +40,6 @@ define Build/Configure endef define Build/Compile - rm -rf $(PKG_INSTALL_DIR) - mkdir -p $(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) \ $(TARGET_CONFIGURE_OPTS) \ DESTDIR="$(PKG_INSTALL_DIR)" \ @@ -52,10 +48,10 @@ define Build/Compile endef define Package/osirisd/install - install -d -m0755 $(1)/etc/init.d - install -m0755 ./files/osirisd.init $(1)/etc/init.d/osirisd install -d -m0755 $(1)/usr/sbin $(CP) $(PKG_INSTALL_DIR)/usr/sbin/osirisd $(1)/usr/sbin/ + install -d -m0755 $(1)/etc/init.d + install -m0755 ./files/osirisd.init $(1)/etc/init.d/osirisd endef $(eval $(call BuildPackage,osirisd)) diff --git a/ipv6/6tunnel/Makefile b/ipv6/6tunnel/Makefile index 0ead0c7b71..59e63594b9 100644 --- a/ipv6/6tunnel/Makefile +++ b/ipv6/6tunnel/Makefile @@ -4,7 +4,7 @@ # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # -# $Id: Makefile 4112 2006-07-02 20:33:21Z nico $ +# $Id$ include $(TOPDIR)/rules.mk diff --git a/ipv6/aiccu/Makefile b/ipv6/aiccu/Makefile index 933bf738cc..a70a4a61e7 100644 --- a/ipv6/aiccu/Makefile +++ b/ipv6/aiccu/Makefile @@ -1,3 +1,4 @@ +# # Copyright (C) 2006 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. diff --git a/ipv6/mrd6/Makefile b/ipv6/mrd6/Makefile index 3d8435e2e3..48e40a40fb 100644 --- a/ipv6/mrd6/Makefile +++ b/ipv6/mrd6/Makefile @@ -49,8 +49,8 @@ define Build/Compile CFLAGS="$(TARGET_CFLAGS) -DNO_INET6_OPTION" \ CXX="$(TARGET_CROSS)g++" \ CC="$(TARGET_CC)" \ - STAGING_DIR=$(STAGING_DIR) \ - DESTDIR=$(PKG_INSTALL_DIR) \ + STAGING_DIR="$(STAGING_DIR)" \ + DESTDIR="$(PKG_INSTALL_DIR)" \ PREFIX=/usr/ \ install endef diff --git a/lang/jamvm/Makefile b/lang/jamvm/Makefile index 96adf8d63c..0859da2f29 100644 --- a/lang/jamvm/Makefile +++ b/lang/jamvm/Makefile @@ -1,3 +1,4 @@ +# # Copyright (C) 2006 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. diff --git a/libs/bzip2/Makefile b/libs/bzip2/Makefile index 3e4bf537f4..fa753a4dd4 100644 --- a/libs/bzip2/Makefile +++ b/libs/bzip2/Makefile @@ -4,38 +4,33 @@ # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # -# $Id: $ +# $Id$ include $(TOPDIR)/rules.mk PKG_NAME:=bzip2 PKG_VERSION:=1.0.3 PKG_RELEASE:=1 -PKG_MD5SUM:=8a716bebecb6e647d2e8a29ea5d8447f -PKG_SOURCE_URL:=http://www.bzip.org/$(PKG_VERSION)/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=http://www.bzip.org/$(PKG_VERSION)/ +PKG_MD5SUM:=8a716bebecb6e647d2e8a29ea5d8447f PKG_CAT:=zcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) -PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install include $(INCLUDE_DIR)/package.mk define Package/libbzip2 -SECTION:=libs -CATEGORY:=Libraries -TITLE:=bzip2 is a freely available, patent free, high-quality data compressor. -DESCRIPTION:=bzip2 is a freely available, patent free, high-quality data compressor. -URL:=http://www.bzip.org + SECTION:=libs + CATEGORY:=Libraries + TITLE:=bzip2 is a freely available, patent free, high-quality data compressor. + URL:=http://www.bzip.org endef define Build/Compile - rm -rf $(PKG_INSTALL_DIR) - mkdir -p $(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) \ $(TARGET_CONFIGURE_OPTS) \ - DESTDIR="$(PKG_INSTALL_DIR)" \ libbz2.a endef @@ -48,8 +43,8 @@ endef define Build/UninstallDev rm -rf \ - $(STAGING_DIR)/usr/include/bzlib.h \ - $(STAGING_DIR)/usr/lib/libbz2.a + $(STAGING_DIR)/usr/include/bzlib.h \ + $(STAGING_DIR)/usr/lib/libbz2.a endef $(eval $(call BuildPackage,libbzip2)) diff --git a/libs/cgilib/Makefile b/libs/cgilib/Makefile index cc6498b4dc..25175c55c8 100644 --- a/libs/cgilib/Makefile +++ b/libs/cgilib/Makefile @@ -1,46 +1,43 @@ -# $Id: Makefile 3843 2006-05-30 18:55:52Z nbd $ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +# $Id$ include $(TOPDIR)/rules.mk PKG_NAME:=cgilib PKG_VERSION:=0.5 PKG_RELEASE:=1 -PKG_MD5SUM:=5187ba11b2ec165b6c5b6629087733b0 -PKG_SOURCE_URL:=http://www.infodrom.org/projects/cgilib/download PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=http://www.infodrom.org/projects/cgilib/download +PKG_MD5SUM:=5187ba11b2ec165b6c5b6629087733b0 PKG_CAT:=zcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) -PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install include $(INCLUDE_DIR)/package.mk define Package/cgilib -SECTION:=libs -CATEGORY:=Libraries -TITLE:=Simple CGI Library -DESCRIPTION:=Simple CGI Library. -URL:=http://www.infodrom.org/projects/cgilib/ + SECTION:=libs + CATEGORY:=Libraries + TITLE:=Simple CGI Library + URL:=http://www.infodrom.org/projects/cgilib/ endef define Build/Configure endef define Build/Compile - rm -rf $(PKG_INSTALL_DIR) - mkdir -p $(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) \ $(TARGET_CONFIGURE_OPTS) \ OFLAGS="$(TARGET_CFLAGS)" \ all endef -define Package/cgilib/install - install -m0755 -d $(1)/usr/lib - $(CP) $(PKG_BUILD_DIR)/libcgi.so.* $(1)/usr/lib/ -endef - define Build/InstallDev mkdir -p $(STAGING_DIR)/usr/include $(CP) $(PKG_BUILD_DIR)/cgi.h $(STAGING_DIR)/usr/include/ @@ -51,8 +48,13 @@ endef define Build/UninstallDev rm -rf \ - $(STAGING_DIR)/usr/include/cgi.h \ - $(STAGING_DIR)/usr/lib/libcgi.{a,so*} + $(STAGING_DIR)/usr/include/cgi.h \ + $(STAGING_DIR)/usr/lib/libcgi.{a,so*} +endef + +define Package/cgilib/install + install -d -m0755 $(1)/usr/lib + $(CP) $(PKG_BUILD_DIR)/libcgi.so.* $(1)/usr/lib/ endef $(eval $(call BuildPackage,cgilib)) diff --git a/libs/libexif/Makefile b/libs/libexif/Makefile index 6d0c18199d..2ebfa14c45 100644 --- a/libs/libexif/Makefile +++ b/libs/libexif/Makefile @@ -4,8 +4,7 @@ # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # -# Makefile for libexif -# $Id: $ +# $Id$ include $(TOPDIR)/rules.mk @@ -13,12 +12,12 @@ PKG_NAME:=libexif PKG_VERSION:=0.6.13 PKG_RELEASE:=1 -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=@SF/libexif PKG_MD5SUM:=1b1e2b495c5aa20c08725f30545a110b PKG_CAT:=bzcat +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install include $(INCLUDE_DIR)/package.mk @@ -27,35 +26,26 @@ define Package/libexif SECTION:=libs CATEGORY:=Libraries TITLE:=library for jpeg files with exif tags - DESCRIPTION:=library for jpeg files with exif tags\\\ URL:=http://libexif.sourceforge.net/ endef -BIG_ENDIAN:=no -ifeq ($(CONFIG_BIG_ENDIAN),y) -BIG_ENDIAN:=yes -endif - define Build/Configure -$(call Build/Configure/Default,--enable-shared \ - --enable-static \ - --without-libiconv-prefix,ac_cv_c_bigendian=$(BIG_ENDIAN)) + $(call Build/Configure/Default, \ + --enable-shared \ + --enable-static \ + --disable-rpath \ + --without-libiconv-prefix \ + --without-libintl-prefix \ + ) endef define Build/Compile -$(call Build/Compile/Default, \ - DESTDIR="$(PKG_INSTALL_DIR)" \ - all install \ -) -endef - -define Package/libexif/install - install -m0755 -d $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libexif*.so.* $(1)/usr/lib/ + $(MAKE) -C $(PKG_BUILD_DIR) \ + DESTDIR="$(PKG_INSTALL_DIR)" \ + all install endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/bin mkdir -p $(STAGING_DIR)/usr/include $(CP) $(PKG_INSTALL_DIR)/usr/include/libexif $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib @@ -68,4 +58,9 @@ define Build/UninstallDev $(STAGING_DIR)/usr/lib/libexif*.{a,so*} endef +define Package/libexif/install + install -d -m0755 $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libexif*.so.* $(1)/usr/lib/ +endef + $(eval $(call BuildPackage,libexif)) diff --git a/libs/libffi-sable/Makefile b/libs/libffi-sable/Makefile index eeb3935ac7..850faf47bf 100644 --- a/libs/libffi-sable/Makefile +++ b/libs/libffi-sable/Makefile @@ -1,3 +1,4 @@ +# # Copyright (C) 2006 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. @@ -10,10 +11,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libffi-sable PKG_VERSION:=3325 PKG_RELEASE:=3 -PKG_MD5SUM:=0c32eaaea0269c5fbe156fcd0be3e5bd -PKG_SOURCE_URL:=http://sablevm.org/download/snapshot/2005-01-21/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=http://sablevm.org/download/snapshot/2005-01-21/ +PKG_MD5SUM:=0c32eaaea0269c5fbe156fcd0be3e5bd PKG_CAT:=zcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) @@ -25,32 +26,28 @@ define Package/libffi-sable SECTION:=libs CATEGORY:=Libraries TITLE:=Foreign Function Interface library (for sablevm) - DESCRIPTION:=The libffi library provides a portable, high level programming\\\ -interface to various calling conventions. This allows a programmer to\\\ -call any function specified by a call interface description at run\\\ -time.\\\ + DESCRIPTION:=\ + The libffi library provides a portable, high level programming \\\ + interface to various calling conventions. This allows a programmer to \\\ + call any function specified by a call interface description at run \\\ + time. URL:=http://sources.redhat.com/libffi/ endef define Build/Configure -$(call Build/Configure/Default,--enable-shared \ ---enable-static \ ---disable-debug) + $(call Build/Configure/Default, \ + --enable-shared \ + --enable-static \ + --disable-debug \ + ) endef define Build/Compile - rm -rf $(PKG_INSTALL_DIR) - mkdir -p $(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) \ DESTDIR="$(PKG_INSTALL_DIR)" \ all install endef -define Package/libffi-sable/install - install -m0755 -d $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libffi.so.* $(1)/usr/lib/ -endef - define Build/InstallDev mkdir -p $(STAGING_DIR)/usr/include $(CP) $(PKG_INSTALL_DIR)/usr/include/ffi{,target}.h $(STAGING_DIR)/usr/include/ @@ -64,4 +61,9 @@ define Build/UninstallDev $(STAGING_DIR)/usr/lib/libffi.{a,so*} endef +define Package/libffi-sable/install + install -d -m0755 $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libffi.so.* $(1)/usr/lib/ +endef + $(eval $(call BuildPackage,libffi-sable)) diff --git a/libs/libgphoto2/Makefile b/libs/libgphoto2/Makefile index d7738d7a3c..e89eda46f3 100644 --- a/libs/libgphoto2/Makefile +++ b/libs/libgphoto2/Makefile @@ -4,7 +4,7 @@ # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # -# $Id: $ +# $Id$ include $(TOPDIR)/rules.mk diff --git a/libs/libiconv/Makefile b/libs/libiconv/Makefile index ef4a10ab55..6f3524bde3 100644 --- a/libs/libiconv/Makefile +++ b/libs/libiconv/Makefile @@ -1,3 +1,4 @@ +# # Copyright (C) 2006 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. diff --git a/libs/libjpeg/Makefile b/libs/libjpeg/Makefile index aa978f6ea4..dc25b9fcf3 100644 --- a/libs/libjpeg/Makefile +++ b/libs/libjpeg/Makefile @@ -4,7 +4,7 @@ # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # -# $Id: Makefile 4153 2006-07-18 16:58:52Z florian $ +# $Id$ include $(TOPDIR)/rules.mk diff --git a/libs/libupnp/Makefile b/libs/libupnp/Makefile index 7480fab687..1904a60344 100644 --- a/libs/libupnp/Makefile +++ b/libs/libupnp/Makefile @@ -12,12 +12,12 @@ PKG_NAME:=libupnp PKG_VERSION:=1.2.1a PKG_RELEASE:=1 -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/upnp PKG_MD5SUM:=e72b3550bf064eedf080f16f09688891 PKG_CAT:=zcat +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install include $(INCLUDE_DIR)/package.mk @@ -27,10 +27,10 @@ define Package/libupnp CATEGORY:=Libraries DEPENDS:=+libpthread TITLE:=UPnP SDK library - DESCRIPTION:=UPnP (Universal Plug and Play) SDK library.\\\ - The Universal Plug and Play (UPnP) SDK for Linux provides support \\\ - for building UPnP-compliant control points, devices, and bridges \\\ - on Linux. + DESCRIPTION:=\ + The Universal Plug and Play (UPnP) SDK for Linux provides support \\\ + for building UPnP-compliant control points, devices, and bridges \\\ + on Linux. URL:=http://upnp.sourceforge.net/ endef @@ -44,11 +44,6 @@ define Build/Compile STRIP=/bin/true endef -define Package/libupnp/install - install -m0755 -d $(1)/usr/lib - $(CP) $(PKG_BUILD_DIR)/upnp/bin/lib{ixml,threadutil,upnp}.so $(1)/usr/lib/ -endef - define Build/InstallDev mkdir -p $(STAGING_DIR)/usr/include/upnp $(CP) $(PKG_BUILD_DIR)/upnp/inc/*.h $(STAGING_DIR)/usr/include/upnp/ @@ -62,4 +57,9 @@ define Build/UninstallDev $(STAGING_DIR)/usr/lib/lib{ixml,threadutil,upnp}.so endef +define Package/libupnp/install + install -d -m0755 $(1)/usr/lib + $(CP) $(PKG_BUILD_DIR)/upnp/bin/lib{ixml,threadutil,upnp}.so $(1)/usr/lib/ +endef + $(eval $(call BuildPackage,libupnp)) diff --git a/libs/matrixssl/Makefile b/libs/matrixssl/Makefile index b5bb71dc5f..22fb87557a 100644 --- a/libs/matrixssl/Makefile +++ b/libs/matrixssl/Makefile @@ -12,13 +12,12 @@ PKG_NAME:=matrixssl PKG_VERSION:=1.2.4 PKG_RELEASE:=1 -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://nbd.vd-s.ath.cx/openwrt PKG_MD5SUM:=771c1489488e62668d673478311d63ca PKG_CAT:=zcat -PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) include $(INCLUDE_DIR)/package.mk @@ -27,7 +26,6 @@ define Package/libmatrixssl CATEGORY:=Libraries DEPENDS:=+libpthread TITLE:=Embedded SSL implementation - DESCRIPTION:=An embedded SSL implementation. URL:=http://www.matrixssl.org/ endef @@ -40,11 +38,6 @@ define Build/Compile DFLAGS="$(TARGET_CFLAGS) -Wall" endef -define Package/libmatrixssl/install - install -d -m0755 $(1)/usr/lib - $(CP) $(PKG_BUILD_DIR)/src/libmatrixssl.so.* $(1)/usr/lib/ -endef - define Build/InstallDev mkdir -p $(STAGING_DIR)/usr/include/matrixSsl $(CP) $(PKG_BUILD_DIR)/matrixSsl.h $(STAGING_DIR)/usr/include/matrixSsl @@ -59,4 +52,9 @@ define Build/UninstallDev $(STAGING_DIR)/usr/lib/libmatrixssl.so* endef +define Package/libmatrixssl/install + install -d -m0755 $(1)/usr/lib + $(CP) $(PKG_BUILD_DIR)/src/libmatrixssl.so.* $(1)/usr/lib/ +endef + $(eval $(call BuildPackage,libmatrixssl)) diff --git a/libs/popt/Makefile b/libs/popt/Makefile index b5ee00d1d9..0ccf9d31c5 100644 --- a/libs/popt/Makefile +++ b/libs/popt/Makefile @@ -1,14 +1,20 @@ -# $Id: Makefile 3843 2006-05-30 18:55:52Z nbd $ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +# $Id$ include $(TOPDIR)/rules.mk PKG_NAME:=popt PKG_VERSION:=1.7 PKG_RELEASE:=4 -PKG_MD5SUM:=5988e7aeb0ae4dac8d83561265984cc9 -PKG_SOURCE_URL:=ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.1.x/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.1.x/ +PKG_MD5SUM:=5988e7aeb0ae4dac8d83561265984cc9 PKG_CAT:=zcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) @@ -17,30 +23,25 @@ PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install include $(INCLUDE_DIR)/package.mk define Package/libpopt -SECTION:=libs -CATEGORY:=Libraries -TITLE:=A command line option parsing library -DESCRIPTION:=A command line option parsing library -URL:=ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.1.x/ + SECTION:=libs + CATEGORY:=Libraries + TITLE:=A command line option parsing library + URL:=ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.1.x/ endef define Build/Configure -$(call Build/Configure/Default,--enable-shared --enable-static) + $(call Build/Configure/Default, \ + --enable-shared \ + --enable-static \ + ) endef define Build/Compile - rm -rf $(PKG_INSTALL_DIR) - mkdir -p $(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) \ DESTDIR="$(PKG_INSTALL_DIR)" \ all install endef -define Package/libpopt/install - install -m0755 -d $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpopt.so.* $(1)/usr/lib/ -endef - define Build/InstallDev mkdir -p $(STAGING_DIR)/usr/include $(CP) $(PKG_INSTALL_DIR)/usr/include/popt.h $(STAGING_DIR)/usr/include/ @@ -51,8 +52,13 @@ endef define Build/UninstallDev rm -rf \ - $(STAGING_DIR)/usr/include/popt.h \ - $(STAGING_DIR)/usr/lib/libpopt.{a,so*} + $(STAGING_DIR)/usr/include/popt.h \ + $(STAGING_DIR)/usr/lib/libpopt.{a,so*} +endef + +define Package/libpopt/install + install -d -m0755 $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpopt.so.* $(1)/usr/lib/ endef $(eval $(call BuildPackage,libpopt)) diff --git a/libs/uclibc++/Makefile b/libs/uclibc++/Makefile index 372341120f..552b188f53 100644 --- a/libs/uclibc++/Makefile +++ b/libs/uclibc++/Makefile @@ -4,7 +4,7 @@ # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # -# $Id: Makefile 3843 2006-05-30 18:55:52Z florian $ +# $Id$ include $(TOPDIR)/rules.mk diff --git a/multimedia/gphoto2/Makefile b/multimedia/gphoto2/Makefile index 38b4487933..67cdc4eb8f 100644 --- a/multimedia/gphoto2/Makefile +++ b/multimedia/gphoto2/Makefile @@ -4,7 +4,7 @@ # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # -# $Id: $ +# $Id$ include $(TOPDIR)/rules.mk diff --git a/multimedia/motion/Makefile b/multimedia/motion/Makefile index a29d90a3cc..512617c9d0 100644 --- a/multimedia/motion/Makefile +++ b/multimedia/motion/Makefile @@ -11,10 +11,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:=motion PKG_VERSION:=3.2.6 PKG_RELEASE:=1 -PKG_MD5SUM:=71e6bd13fcca70372e9b7c7806d62b30 -PKG_SOURCE_URL:=@SF/motion PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=@SF/motion +PKG_MD5SUM:=71e6bd13fcca70372e9b7c7806d62b30 PKG_CAT:=zcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) @@ -27,29 +27,34 @@ define Package/motion CATEGORY:=Multimedia DEPENDS:=+libjpeg TITLE:=webcam motion sensing and logging - DESCRIPTION:=Motion is a software motion detector URL:=http://www.lavrsen.dk/twiki/bin/view/Motion/WebHome endef +define Package/motion/conffiles +/etc/motion.conf +endef + define Build/Configure -$(call Build/Configure/Default,--without-ffmpeg \ - --without-jpeg-mmx \ - --without-mysql \ - --without-pgsql \ -) + $(call Build/Configure/Default, \ + --without-ffmpeg \ + --without-jpeg-mmx \ + --without-mysql \ + --without-pgsql \ + ) endef define Build/Compile - rm -rf $(PKG_INSTALL_DIR) - mkdir -p $(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) \ DESTDIR="$(PKG_INSTALL_DIR)" \ all install endef define Package/motion/install + install -d -m0755 $(1)/etc + $(CP) $(PKG_INSTALL_DIR)/etc/motion-dist.conf $(1)/etc/motion.conf install -d -m0755 $(1)/usr/bin $(CP) $(PKG_INSTALL_DIR)/usr/bin/motion $(1)/usr/bin/ + endef $(eval $(call BuildPackage,motion)) diff --git a/multimedia/peercast/Makefile b/multimedia/peercast/Makefile index 676fd86645..6988ae464b 100644 --- a/multimedia/peercast/Makefile +++ b/multimedia/peercast/Makefile @@ -11,10 +11,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:=peercast PKG_VERSION:=0.1214 PKG_RELEASE:=1 -PKG_MD5SUM:=4e8449cde7135ad97f788e67e1bd64ee -PKG_SOURCE_URL:=http://www.cti.ecp.fr/~beauxir5/peercast PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=http://www.cti.ecp.fr/~beauxir5/peercast +PKG_MD5SUM:=4e8449cde7135ad97f788e67e1bd64ee PKG_CAT:=zcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) @@ -27,10 +27,11 @@ define Package/peercast CATEGORY:=Multimedia DEPENDS:=+libpthread +uclibcxx TITLE:=P2P audio and video streaming server - DESCRIPTION:=PeerCast is a fresh new P2P streaming server. It can stream music\\\ - and video from a broad variety of formats. Many audio players can\\\ - listen to peercast streams, as it's been built to remain compatible\\\ - with Nullsoft Shoutcast.\\\ + DESCRIPTION:=\ + PeerCast is a fresh new P2P streaming server. It can stream music \\\ + and video from a broad variety of formats. Many audio players can \\\ + listen to peercast streams, as it's been built to remain compatible \\\ + with Nullsoft Shoutcast. URL:=http://www.peercast.org/ endef @@ -39,31 +40,28 @@ define Package/peercast/conffiles endef define Build/Configure -$(call Build/Configure/Default,--enable-shared \ - --disable-static \ - --with-gnu-ld \ - --enable-staticbin, \ - $(TARGET_CONFIGURE_OPTS) \ - BUILD_CC="$(TARGET_CC)" HOSTCC="$(HOSTCC)" \ - CFLAGS="$(TARGET_CFLAGS)" \ - CXXFLAGS="$(TARGET_CFLAGS) -fno-builtin -nostdinc++ -nodefaultlibs" \ - CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \ - LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \ - LIBS="-nodefaultlibs -luClibc++ -lpthread") + $(call Build/Configure/Default, \ + --enable-staticbin \ + , \ + CXXFLAGS="$$$$CXXFLAGS -fno-builtin -fno-rtti -nostdinc++" \ + LIBS="-nodefaultlibs -luClibc++ -lpthread -lc -lm" \ + ) endef define Build/Compile - $(call Build/Compile/Default,DESTDIR="$(PKG_INSTALL_DIR)" all install) + $(MAKE) -C $(PKG_BUILD_DIR) \ + DESTDIR="$(PKG_INSTALL_DIR)" \ + all install endef define Package/peercast/install - install -m0755 -d $(1)/usr/sbin + install -d -m0755 $(1)/usr/sbin $(CP) $(PKG_INSTALL_DIR)/usr/sbin/peercast $(1)/usr/sbin/ - install -m0755 -d $(1)/usr/share/peercast/html + install -d -m0755 $(1)/usr/share/peercast/html $(CP) $(PKG_INSTALL_DIR)/usr/share/peercast/html/en $(1)/usr/share/peercast/html/ - install -m0755 -d $(1)/etc + install -d -m0755 $(1)/etc install -m0644 ./files/peercast.ini $(1)/etc/ - install -m0755 -d $(1)/etc/init.d + install -d -m0755 $(1)/etc/init.d install -m0755 ./files/peercast.init $(1)/etc/init.d/peercast endef diff --git a/net/aircrack-ng/Makefile b/net/aircrack-ng/Makefile index eba789c16d..5f0a40c13f 100644 --- a/net/aircrack-ng/Makefile +++ b/net/aircrack-ng/Makefile @@ -1,3 +1,4 @@ +# # Copyright (C) 2006 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. @@ -10,10 +11,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:=aircrack-ng PKG_VERSION:=0.6.2 PKG_RELEASE:=1 -PKG_MD5SUM:=0b1a9fb6818822f933336efc9fff316b -PKG_SOURCE_URL:=http://download.aircrack-ng.org/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=http://download.aircrack-ng.org/ +PKG_MD5SUM:=0b1a9fb6818822f933336efc9fff316b PKG_CAT:=zcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) @@ -24,9 +25,8 @@ include $(INCLUDE_DIR)/package.mk define Package/aircrack-ng SECTION:=net CATEGORY:=Network - TITLE:=Aircrack-ng the next generation of aircrack with new features DEPENDS:=+libpthread - DESCRIPTION:=Aircrack-ng the next generation of aircrack with new features + TITLE:=Aircrack-ng the next generation of aircrack with new features URL:=http://www.aircrack-ng.org endef diff --git a/net/amwall/Makefile b/net/amwall/Makefile index 40bd912504..f9a4350220 100644 --- a/net/amwall/Makefile +++ b/net/amwall/Makefile @@ -1,3 +1,4 @@ +# # Copyright (C) 2006 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. @@ -10,10 +11,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:=amwall PKG_VERSION:=0.1.0 PKG_RELEASE:=1 -PKG_MD5SUM:=a8b6438e7fd9ccadc9f68824ae62349c -PKG_SOURCE_URL:=ftp://ftp.amselinux.net/source/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE_URL:=ftp://ftp.amselinux.net/source/ +PKG_MD5SUM:=a8b6438e7fd9ccadc9f68824ae62349c PKG_CAT:=bzcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) @@ -26,7 +27,6 @@ define Package/amwall CATEGORY:=Network DEPENDS:=+libamsel TITLE:=PF to iptables - DESCRIPTION:=PF to iptables URL:=http://www.amselinux.net endef @@ -41,7 +41,7 @@ define Build/Compile OPT_LDFLAGS="-L$(STAGING_DIR)/usr/lib" \ PREFIX="/usr" \ CONFIG="$(PKG_BUILD_DIR)/etc/amsel" \ - DESTDIR=$(PKG_INSTALL_DIR) \ + DESTDIR="$(PKG_INSTALL_DIR)" \ all install endef diff --git a/net/aodv-uu/Makefile b/net/aodv-uu/Makefile index 284cd4318e..79be57dd27 100644 --- a/net/aodv-uu/Makefile +++ b/net/aodv-uu/Makefile @@ -4,7 +4,7 @@ # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # -# $Id: Makefile 4091 2006-06-27 00:35:46Z mbm $ +# $Id$ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk diff --git a/net/arpd/Makefile b/net/arpd/Makefile index 08498fd3a3..f073edd729 100644 --- a/net/arpd/Makefile +++ b/net/arpd/Makefile @@ -11,14 +11,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=arpd PKG_VERSION:=0.2 PKG_RELEASE:=1 -PKG_MD5SUM:=e2911fa9de1b92ef50deda1489ae944d -PKG_SOURCE_URL:=http://niels.xtdnet.nl/honeyd +PKG_MD5SUM:=e2911fa9de1b92ef50deda1489ae944d PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=http://niels.xtdnet.nl/honeyd PKG_CAT:=zcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) -PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install include $(INCLUDE_DIR)/package.mk @@ -27,30 +26,27 @@ define Package/arpd CATEGORY:=Network DEPENDS:=+libpcap +libdnet +libevent TITLE:=A daemon to fake ARP replies - DESCRIPTION:=A daemon to fake ARP replies - URL:=http://niels.xtdnet.nl/honeyd + URL:=http://niels.xtdnet.nl/honeyd/ endef define Build/Configure -$(call Build/Configure/Default,--enable-shared --disable-static \ ---with-libdnet=$(STAGING_DIR)/usr \ ---with-libevent=$(STAGING_DIR)/usr \ ---with-libpcap=$(STAGING_DIR)/usr \ -) + $(call Build/Configure/Default, \ + --with-libdnet="$(STAGING_DIR)/usr" \ + --with-libevent="$(STAGING_DIR)/usr" \ + --with-libpcap="$(STAGING_DIR)/usr" \ + ) endef define Build/Compile - rm -rf $(PKG_INSTALL_DIR) - mkdir -p $(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) \ CCOPT="$(TARGET_CFLAGS)" \ - INCLS="-I. -I$(STAGING_DIR)/usr/include" \ - LIBS="-L$(STAGING_DIR)/usr/lib -lpcap -ldnet -levent" + INCLS="-I. -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \ + LIBS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib -lpcap -ldnet -levent" endef define Package/arpd/install install -d -m0755 $(1)/usr/sbin - $(CP) $(PKG_BUILD_DIR)/$(PKG_NAME) $(1)/usr/sbin/ + install -m0755 $(PKG_BUILD_DIR)/arpd $(1)/usr/sbin/ endef $(eval $(call BuildPackage,arpd)) diff --git a/net/arpwatch/Makefile b/net/arpwatch/Makefile index 7c17393d1d..a709abbf56 100644 --- a/net/arpwatch/Makefile +++ b/net/arpwatch/Makefile @@ -1,3 +1,4 @@ +# # Copyright (C) 2006 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. @@ -10,14 +11,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=arpwatch PKG_VERSION:=2.1a11 PKG_RELEASE:=1 -PKG_MD5SUM:=9ecd00db892737431b0e524f3e52e19e -PKG_SOURCE_URL:=http://nbd.vd-s.ath.cx/openwrt PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=http://nbd.vd-s.ath.cx/openwrt +PKG_MD5SUM:=9ecd00db892737431b0e524f3e52e19e PKG_CAT:=zcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) -PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install include $(INCLUDE_DIR)/package.mk @@ -26,7 +26,8 @@ define Package/arpwatch CATEGORY:=Network DEPENDS:=+libpcap TITLE:=Ethernet station activity monitor - DESCRIPTION:=Ethernet monitor program for keeping track of ethernet/ip address pairings + DESCRIPTION:=\ + Ethernet monitor program for keeping track of ethernet/ip address pairings URL:=http://nbd.vd-s.ath.cx/openwrt endef @@ -35,8 +36,6 @@ define Package/arpwatch/conffiles endef define Build/Compile - rm -rf $(PKG_INSTALL_DIR) - mkdir -p $(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) \ ARPDIR=/etc/arpwatch \ CCOPT="$(TARGET_CFLAGS)" \ @@ -45,9 +44,10 @@ define Build/Compile endef define Package/arpwatch/install - install -m0755 -d $(1)/usr/sbin $(1)/etc/arpwatch - $(CP) $(PKG_BUILD_DIR)/arp{watch,snmp} $(1)/usr/sbin/ + install -d -m0755 $(1)/etc/arpwatch $(CP) $(PKG_BUILD_DIR)/arp.dat $(1)/etc/arpwatch/ + install -d -m0755 $(1)/usr/sbin + $(CP) $(PKG_BUILD_DIR)/arp{watch,snmp} $(1)/usr/sbin/ endef $(eval $(call BuildPackage,arpwatch)) diff --git a/net/atftp/Makefile b/net/atftp/Makefile index e09e452fa5..bb3d8d4928 100644 --- a/net/atftp/Makefile +++ b/net/atftp/Makefile @@ -1,3 +1,4 @@ +# # Copyright (C) 2006 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. @@ -10,10 +11,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:=atftp PKG_VERSION:=0.7 PKG_RELEASE:=1 -PKG_MD5SUM:=3b27365772d918050b2251d98a9c7c82 -PKG_SOURCE_URL:=ftp://ftp.mamalinux.com/pub/atftp/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=ftp://ftp.mamalinux.com/pub/atftp/ +PKG_MD5SUM:=3b27365772d918050b2251d98a9c7c82 PKG_CAT:=zcat TAR_OPTIONS += || true @@ -22,23 +23,23 @@ PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install include $(INCLUDE_DIR)/package.mk -define Package/atftp +define Package/atftp/Default SECTION:=net CATEGORY:=Network - DEPENDS:=+libreadline +libpcre - MENU:=1 - TITLE:=TFTP client - DESCRIPTION:=TFTP client + TITLE:=TFTP URL:=ftp://ftp.mamalinux.com/pub/atftp/ endef +define Package/atftp + $(call Package/atftp/Default) + DEPENDS:=+libreadline +libpcre + TITLE+= client +endef + define Package/atftpd - SECTION:=net - CATEGORY:=Network - DEPENDS:=atftp +libreadline +libpcre - TITLE:=TFTP server - DESCRIPTION:=TFTP server - URL:=ftp://ftp.mamalinux.com/pub/atftp/ + $(call Package/atftp/Default) + DEPENDS:=+libreadline +libpcre + TITLE+= server endef define Package/atftpd/postinst @@ -52,24 +53,23 @@ if [ $$? -ne 0 ]; then fi endef +# uses GNU configure + define Build/Compile - rm -rf $(PKG_INSTALL_DIR) - mkdir -p $(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) \ $(TARGET_CONFIGURE_OPTS) \ CFLAGS="$(TARGET_CFLAGS) -Wall -D_REENTRANT" \ - DESTDIR=$(PKG_INSTALL_DIR) \ - all install + all endef define Package/atftp/install - install -m0755 -d $(1)/usr/sbin - $(CP) $(PKG_BUILD_DIR)/$(PKG_NAME) $(1)/usr/sbin + install -d -m0755 $(1)/usr/sbin + install -m0755 $(PKG_BUILD_DIR)/atftp $(1)/usr/sbin endef define Package/atftpd/install - install -m0755 -d $(1)/usr/sbin - $(CP) $(PKG_BUILD_DIR)/$(PKG_NAME) $(1)/usr/sbin/ + install -d -m0755 $(1)/usr/sbin + install -m0755 $(PKG_BUILD_DIR)/atftpd $(1)/usr/sbin/ endef $(eval $(call BuildPackage,atftp)) diff --git a/net/autossh/Makefile b/net/autossh/Makefile index 0ed8919585..f7a1e81eb8 100644 --- a/net/autossh/Makefile +++ b/net/autossh/Makefile @@ -1,3 +1,4 @@ +# # Copyright (C) 2006 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. @@ -11,12 +12,12 @@ PKG_NAME:=autossh PKG_VERSION:=1.3 PKG_RELEASE:=1 -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz -PKG_SOURCE_URL:=http://www.harding.motd.ca/autossh +PKG_SOURCE_URL:=http://www.harding.motd.ca/autossh/ PKG_MD5SUM:=0e7ec62eeca5d1b197f3ef2d0f0d417f PKG_CAT:=zcat +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install include $(INCLUDE_DIR)/package.mk @@ -26,8 +27,7 @@ define Package/autossh CATEGORY:=Network DEPENDS:=+openssh-client TITLE:=Autossh client - DESCRIPTION:=Autossh client - URL:=http://www.harding.motd.ca/autossh + URL:=http://www.harding.motd.ca/autossh/ endef define Build/Compile @@ -39,7 +39,7 @@ endef define Package/autossh/install install -d -m0755 $(1)/usr/sbin - install -m0755 $(PKG_BUILD_DIR)/$(PKG_NAME) $(1)/usr/sbin/ + install -m0755 $(PKG_BUILD_DIR)/autossh $(1)/usr/sbin/ endef $(eval $(call BuildPackage,autossh)) diff --git a/net/bind/Makefile b/net/bind/Makefile index d006b7b313..1844b050ed 100644 --- a/net/bind/Makefile +++ b/net/bind/Makefile @@ -11,94 +11,76 @@ include $(TOPDIR)/rules.mk PKG_NAME:=bind PKG_VERSION:=9.3.2-P1 PKG_RELEASE:=8 -PKG_MD5SUM:=a0b86647ef6a2d5f1e759112d08e2229 -PKG_SOURCE_URL:=ftp://ftp.isc.org/isc/bind9/$(PKG_VERSION)/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=ftp://ftp.isc.org/isc/bind9/$(PKG_VERSION)/ +PKG_MD5SUM:=a0b86647ef6a2d5f1e759112d08e2229 PKG_CAT:=zcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install +PKG_BUILDDEP:=libopenssl + include $(INCLUDE_DIR)/package.mk -define Package/bind +define Package/bind/Default SECTION:=net CATEGORY:=Network - SUBMENU:=ISC's DNS suite implementation - DEPENDS:=+libopenssl - TITLE:=ISC's DNS suite implementation - DESCRIPTION:=ISC's DNS suite implementation + TITLE:=bind URL:=http://www.isc.org/sw/bind/ endef define Package/bind-server - $(call Package/bind) - DEFAULT:=m if ALL - TITLE:=ISC's DNS server implementation - DESCRIPTION:=ISC's DNS server implementation + $(call Package/bind/Default) + TITLE+= DNS server endef define Package/bind-client - $(call Package/bind) - DEFAULT:=m if ALL - TITLE:=A dynamic DNS client - DESCRIPTION:=A dynamic DNS client + $(call Package/bind/Default) + TITLE+= dynamic DNS client endef define Package/bind-tools - $(call Package/bind) - DEFAULT:=m if ALL - TITLE:=Bind administration tools - DESCRIPTION:=A DNS client + $(call Package/bind/Default) + TITLE+= administration tools (all) endef define Package/bind-rndc - $(call Package/bind) - DEFAULT:=m if ALL - TITLE:=bind administration tools (rndc and rndc-confgen only) - DESCRIPTION:=bind administration tools (rndc and rndc-confgen only) + $(call Package/bind/Default) + TITLE+= administration tools (rndc and rndc-confgen only) endef define Package/bind-check - $(call Package/bind) - DEFAULT:=m if ALL - TITLE:=bind administration tools (named-checkconf and named-checkzone only) - DESCRIPTION:=bind administration tools (named-checkconf and named-checkzone only) + $(call Package/bind/Default) + TITLE+= administration tools (named-checkconf and named-checkzone only) endef define Package/bind-dnssec - $(call Package/bind) - DEFAULT:=m if ALL - TITLE:=Bind administration tools (dnssec-keygen and dnssec-signzone only) - DESCRIPTION:=Bind administration tools (dnssec-keygen and dnssec-signzone only) + $(call Package/bind/Default) + TITLE+= administration tools (dnssec-keygen and dnssec-signzone only) endef define Package/bind-host - $(call Package/bind) - DEFAULT:=m if ALL - TITLE:=A simple DNS client - DESCRIPTION:=A simple DNS client + $(call Package/bind/Default) + TITLE+= simple DNS client endef define Package/bind-dig - $(call Package/bind) - DEFAULT:=m if ALL - TITLE:=A DNS client - DESCRIPTION:=A DNS client + $(call Package/bind/Default) + TITLE+= DNS excavation tool endef define Package/Build/Configure -$(call Build/Configure/Default,\ + $(call Build/Configure/Default,\ --enable-shared \ --enable-static \ --enable-ipv6 \ - --with-randomdev=/dev/urandom \ + --with-randomdev="/dev/urandom" \ --disable-threads \ - --with-openssl=$(STAGING_DIR)/usr/ \ + --with-openssl="$(STAGING_DIR)/usr" \ --with-libtool \ - --with-gnu-ld \ -) + ) endef define Build/Compile @@ -115,11 +97,12 @@ endef define Package/bind-server/install install -d -m0755 $(1)/usr/sbin - install -d -m0755 $(1)/etc/init.d $(CP) $(PKG_INSTALL_DIR)/usr/sbin/named $(1)/usr/sbin/ - $(CP) files/bind $(1)/etc - $(CP) files/named.init $(1)/etc/init.d/named - find $(1)/etc/bind -name ".svn" | xargs rm -rf + install -d -m0755 $(1)/etc + $(CP) ./files/bind $(1)/etc/ + install -d -m0755 $(1)/etc/init.d + $(CP) ./files/named.init $(1)/etc/init.d/named + find $(1)/etc/bind/ -name ".svn" | xargs rm -rf endef define Package/bind-client/install @@ -129,9 +112,9 @@ endef define Package/bind-tools/install install -d -m0755 $(1)/usr/bin - install -d -m0755 $(1)/usr/sbin $(CP) $(PKG_INSTALL_DIR)/usr/bin/dig $(1)/usr/bin/ $(CP) $(PKG_INSTALL_DIR)/usr/bin/host $(1)/usr/bin/ + install -d -m0755 $(1)/usr/sbin $(CP) $(PKG_INSTALL_DIR)/usr/sbin/dnssec-keygen $(1)/usr/sbin/ $(CP) $(PKG_INSTALL_DIR)/usr/sbin/dnssec-signzone $(1)/usr/sbin/ $(CP) $(PKG_INSTALL_DIR)/usr/sbin/named-checkconf $(1)/usr/sbin/ diff --git a/net/bing/Makefile b/net/bing/Makefile index 2ff8d41d2d..648dac0029 100644 --- a/net/bing/Makefile +++ b/net/bing/Makefile @@ -1,9 +1,10 @@ +# # Copyright (C) 2006 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # -# $Id: Makefile 4603 2006-08-18 21:21:06Z mbm $ +# $Id$ include $(TOPDIR)/rules.mk @@ -18,7 +19,6 @@ PKG_CAT:=zcat TAR_OPTIONS += || true PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) -PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install include $(INCLUDE_DIR)/package.mk @@ -32,7 +32,7 @@ define Package/bing endef define Build/Compile -$(call Build/Compile/Default) + $(call Build/Compile/Default) endef define Package/bing/install diff --git a/net/bitchx/Makefile b/net/bitchx/Makefile index bfd6370d81..f7d9eaf38e 100644 --- a/net/bitchx/Makefile +++ b/net/bitchx/Makefile @@ -11,10 +11,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:=bitchx PKG_VERSION:=1.1 PKG_RELEASE:=1 -PKG_MD5SUM:=611d2dda222f00c10140236f4c331572 -PKG_SOURCE_URL:=http://bitchx.org/files/source/ PKG_SOURCE:=ircii-pana-$(PKG_VERSION)-final.tar.gz +PKG_SOURCE_URL:=http://bitchx.org/files/source/ +PKG_MD5SUM:=611d2dda222f00c10140236f4c331572 PKG_CAT:=zcat PKG_BUILD_DIR:=$(BUILD_DIR)/BitchX @@ -29,7 +29,6 @@ define Package/bitchx CATEGORY:=Network DEPENDS:=+libncurses TITLE:=popular IRC client - DESCRIPTION:=popular IRC client URL:=http://www.bitchx.org endef diff --git a/net/bitlbee/Makefile b/net/bitlbee/Makefile index ad7ee36f82..5d2ff8a61c 100644 --- a/net/bitlbee/Makefile +++ b/net/bitlbee/Makefile @@ -1,3 +1,4 @@ +# # Copyright (C) 2006 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. @@ -10,19 +11,18 @@ include $(TOPDIR)/rules.mk PKG_NAME:=bitlbee PKG_VERSION:=1.0.1 PKG_RELEASE:=1 -PKG_MD5SUM:=a4d7daa9b64898dd41a3a6d104692d9a +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://get.bitlbee.org/src \ http://get.bitlbee.be/src \ http://get.us.bitlbee.org/src \ http://ftp.snt.utwente.nl/pub/software/bitlbee/src -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_MD5SUM:=a4d7daa9b64898dd41a3a6d104692d9a PKG_CAT:=zcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) -PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install -PKG_BUILDDEP:=openssl glib libiconv +PKG_BUILDDEP:=libopenssl glib1 libiconv include $(INCLUDE_DIR)/package.mk @@ -31,7 +31,6 @@ define Package/bitlbee CATEGORY:=Network DEPENDS:=+libopenssl +glib1 +libiconv TITLE:=IRC gateway to IM chat networks - DESCRIPTION:=IRC gateway to IM chat networks URL:=http://www.bitlbee.org/ endef @@ -41,29 +40,30 @@ define Package/bitlbee/conffiles endef define Build/Configure -(cd $(PKG_BUILD_DIR); \ - $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - CPPFLAGS="-I$(STAGING_DIR)/usr/include" \ - LDFLAGS="-L$(STAGING_DIR)/usr/lib" \ - STAGING_DIR="$(STAGING_DIR)" \ - STRIP="$(STRIP)" \ - ./configure \ - --prefix=/usr/ \ - --bindir=/usr/sbin/ \ - --etcdir=/etc/bitlbee/ \ - --datadir=/usr/share/bitlbee/ \ - --config=/var/lib/bitlbee/ \ - --arch=OpenWrt \ - --cpu="$(ARCH)" \ - --debug=0 \ - --strip=1 \ - --sizeopt=1 \ - --ipv6=1 \ - --ssl=openssl \ - --glib1=1 \ - --glib1prefix="$(STAGING_DIR)/usr" \ -); + # it's not GNU autoconf stuff + (cd $(PKG_BUILD_DIR); \ + $(TARGET_CONFIGURE_OPTS) \ + CFLAGS="$(TARGET_CFLAGS)" \ + CPPFLAGS="-I$(STAGING_DIR)/usr/include" \ + LDFLAGS="-L$(STAGING_DIR)/usr/lib" \ + STAGING_DIR="$(STAGING_DIR)" \ + STRIP="$(STRIP)" \ + ./configure \ + --prefix=/usr/ \ + --bindir=/usr/sbin/ \ + --etcdir=/etc/bitlbee/ \ + --datadir=/usr/share/bitlbee/ \ + --config=/var/lib/bitlbee/ \ + --arch=OpenWrt \ + --cpu="$(ARCH)" \ + --debug=0 \ + --strip=1 \ + --sizeopt=1 \ + --ipv6=1 \ + --ssl=openssl \ + --glib1=1 \ + --glib1prefix="$(STAGING_DIR)/usr" \ + ); endef define Build/Compile diff --git a/net/bmon/Makefile b/net/bmon/Makefile index 06e8509cd9..d7fef3d424 100644 --- a/net/bmon/Makefile +++ b/net/bmon/Makefile @@ -1,3 +1,4 @@ +# # Copyright (C) 2006 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. diff --git a/net/bwm/Makefile b/net/bwm/Makefile index ec3d896c1f..860dd3017a 100644 --- a/net/bwm/Makefile +++ b/net/bwm/Makefile @@ -1,3 +1,4 @@ +# # Copyright (C) 2006 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. @@ -10,20 +11,20 @@ include $(TOPDIR)/rules.mk PKG_NAME:=bwm PKG_VERSION:=1.1.0 PKG_RELEASE:=1 -PKG_MD5SUM:=51021a036acb92d2bda0c0c0483f9552 -PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/main/b/bwm PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION).orig +PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/main/b/bwm +PKG_MD5SUM:=51021a036acb92d2bda0c0c0483f9552 PKG_CAT:=zcat +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION).orig + include $(INCLUDE_DIR)/package.mk define Package/bwm SECTION:=net CATEGORY:=Network TITLE:=A very tiny bandwidth monitor - DESCRIPTION:=A very tiny bandwidth monitor URL:=http://ftp.debian.org/debian/pool/main/b/bwm endef diff --git a/net/crowdcontrol/Makefile b/net/crowdcontrol/Makefile index 740648dc35..546b8722e5 100644 --- a/net/crowdcontrol/Makefile +++ b/net/crowdcontrol/Makefile @@ -11,10 +11,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:=crowdcontrol PKG_VERSION:=0.4b PKG_RELEASE:=1 -PKG_MD5SUM:=a0991ae3d1f1a361558bed1a4aa66a9c -PKG_SOURCE_URL:=@openwrt/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=@openwrt +PKG_MD5SUM:=a0991ae3d1f1a361558bed1a4aa66a9c PKG_CAT:=zcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) @@ -26,12 +26,16 @@ define Package/crowdcontrol SECTION:=net CATEGORY:=Network TITLE:=The extra-light http proxy server - DESCRIPTION:=Crowd Control is an small, cross-platform HTTP proxy (a fork of the elhttp project)\\\ - designed for systems with little RAM, such as a home router. It can filter URLs using\\\ + DESCRIPTION:=\ + Crowd Control is an small, cross-platform HTTP proxy (a fork of the elhttp project) \\\ + designed for systems with little RAM, such as a home router. It can filter URLs using \\\ SquidGuard blocklists, and has the unique ability to filter HTTPS domains as well. URL:=http://sourceforge.net/projects/crowdcontrol/ endef +define Build/Configure +endef + define Build/Compile $(TARGET_CC) $(TARGET_CFLAGS) -o $(PKG_BUILD_DIR)/crowdcontrol $(PKG_BUILD_DIR)/crowdcontrol.c endef diff --git a/net/ctorrent/Makefile b/net/ctorrent/Makefile index 111d985f1b..5f1028fb47 100644 --- a/net/ctorrent/Makefile +++ b/net/ctorrent/Makefile @@ -1,3 +1,4 @@ +# # Copyright (C) 2006 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. @@ -10,12 +11,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ctorrent PKG_VERSION:=1.3.4-dnh2 PKG_RELEASE:=1 -PKG_MD5SUM:=6635e2d0d0ee21faeb85d95cd93c137b -PKG_SOURCE_URL:=http://www.rahul.net/dholmes/ctorrent/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-dnh2 +PKG_SOURCE_URL:=http://www.rahul.net/dholmes/ctorrent/ +PKG_MD5SUM:=6635e2d0d0ee21faeb85d95cd93c137b PKG_CAT:=zcat + +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-dnh2 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install include $(INCLUDE_DIR)/package.mk @@ -23,46 +25,33 @@ include $(INCLUDE_DIR)/package.mk define Package/ctorrent SECTION:=net CATEGORY:=Network - DEPENDS:=+libopenssl + DEPENDS:=+libopenssl +uclibcxx TITLE:=console-based BitTorrent client - DESCRIPTION:=CTorrent is a BitTorrent client written in the C programming language, known to\\\ - be a very robust and mature programming language, which produces fast and\\\ - optimized application.\\\ + DESCRIPTION:=\ + CTorrent is a BitTorrent client written in the C programming language, known to \\\ + be a very robust and mature programming language, which produces fast and \\\ + optimized application. URL:=http://www.rahul.net/dholmes/ctorrent/ endef define Build/Configure - (cd $(PKG_BUILD_DIR); rm -rf config.cache; \ - $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include -I$(STAGING_DIR)/usr/include/openssl" \ - LDFLAGS="-static -L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \ - ./configure \ - --target=$(GNU_TARGET_NAME) \ - --host=$(GNU_TARGET_NAME) \ - --build=$(GNU_HOST_NAME) \ - --prefix=/usr \ - --exec-prefix=/usr \ - --bindir=/usr/bin \ - --sbindir=/usr/sbin \ - --libexecdir=/usr/lib \ - --sysconfdir=/etc \ - --datadir=/usr/share \ - --localstatedir=/var \ - --mandir=/usr/man \ - --infodir=/usr/info \ - --program-prefix="" \ - --with-gnu-ld \ - ); + $(call Build/Configure/Default, \ + , \ + CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/include/openssl" \ + CXXFLAGS="$$$$CXXFLAGS -fno-builtin -fno-rtti -nostdinc++" \ + LIBS="-nodefaultlibs -lcrypto -luClibc++ -lm -lc -lgcc" \ + ) endef define Build/Compile - $(call Build/Compile/Default, DESTDIR=$(PKG_INSTALL_DIR) install) + $(MAKE) -C $(PKG_BUILD_DIR) \ + DESTDIR="$(PKG_INSTALL_DIR)" \ + all install endef define Package/ctorrent/install - mkdir -p $(1) - $(CP) $(PKG_INSTALL_DIR)/* $(1)/ + install -d -m0755 $(1)/usr/bin + $(CP) $(PKG_INSTALL_DIR)/usr/bin/ctorrent $(1)/usr/bin/ endef $(eval $(call BuildPackage,ctorrent)) diff --git a/net/cups/Makefile b/net/cups/Makefile index 2b6e525d63..e0ec160eaf 100644 --- a/net/cups/Makefile +++ b/net/cups/Makefile @@ -1,3 +1,4 @@ +# # Copyright (C) 2006 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. @@ -10,14 +11,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=cups PKG_VERSION:=1.1.23 PKG_RELEASE:=1 -PKG_MD5SUM:=4ce09b1dce09b6b9398af0daae9adf63 +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-source.tar.bz2 PKG_SOURCE_URL:= \ http://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/cups/$(PKG_VERSION) \ ftp://ftp.easysw.com/pub/cups/$(PKG_VERSION) \ ftp://ftp3.easysw.com/pub/cups/$(PKG_VERSION) - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-source.tar.bz2 +PKG_MD5SUM:=4ce09b1dce09b6b9398af0daae9adf63 PKG_CAT:=bzcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) @@ -32,7 +32,8 @@ define Package/cups CATEGORY:=Network DEPENDS:=+zlib TITLE:=Common UNIX Printing System - DESCRIPTION:=A printer spooling system for devices with USB or LP support + DESCRIPTION:=\ + A printer spooling system for devices with USB or LP support. URL:=http://www.cups.org/ endef @@ -44,7 +45,8 @@ define Package/cups/conffiles endef define Build/Configure - $(call Build/Configure/Default, --with-gnu-ld \ + $(call Build/Configure/Default, \ + --libexecdir=/usr/lib \ --with-cups-user=root \ --with-cups-group=root \ --without-perl \ @@ -68,10 +70,6 @@ define Build/Compile DSTROOT="$(PKG_INSTALL_DIR)" \ STRIP="/bin/true" \ all install - if [ -d $(PKG_INSTALL_DIR)/usr/libexec ]; then \ - rm -rf $(PKG_INSTALL_DIR)/usr/lib; \ - mv $(PKG_INSTALL_DIR)/usr/libexec $(PKG_INSTALL_DIR)/usr/lib; \ - fi endef define Package/cups/install @@ -111,9 +109,9 @@ endef define Build/UninstallDev rm -rf \ - $(STAGING_DIR)/usr/bin/cups-config \ - $(STAGING_DIR)/usr/include/cups \ - $(STAGING_DIR)/usr/lib/libcups.{a,so*} + $(STAGING_DIR)/usr/bin/cups-config \ + $(STAGING_DIR)/usr/include/cups \ + $(STAGING_DIR)/usr/lib/libcups.{a,so*} endef $(eval $(call BuildPackage,cups)) diff --git a/net/cutter/Makefile b/net/cutter/Makefile index f1917f3ab0..7c8d5cf613 100644 --- a/net/cutter/Makefile +++ b/net/cutter/Makefile @@ -1,3 +1,4 @@ +# # Copyright (C) 2006 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. @@ -10,12 +11,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=cutter PKG_VERSION:=1.03 PKG_RELEASE:=1 -PKG_MD5SUM:=50093db9b64277643969ee75b83ebbd1 -PKG_SOURCE_URL:=http://www.lowth.com/cutter/software/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) +PKG_SOURCE_URL:=http://www.lowth.com/cutter/software/ +PKG_MD5SUM:=50093db9b64277643969ee75b83ebbd1 PKG_CAT:=zcat + +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install include $(INCLUDE_DIR)/package.mk @@ -24,9 +26,10 @@ define Package/cutter SECTION:=net CATEGORY:=Network TITLE:=allows an user to abort TCP/IP connections - DESCRIPTION:="Cutter" is an open source program that allows Linux firewall\\\ - administrators to abort TCP/IP connections routed over the\\\ - firewall or router on which it is run.\\\ + DESCRIPTION:=\ + Cutter is an open source program that allows Linux firewall \\\ + administrators to abort TCP/IP connections routed over the \\\ + firewall or router on which it is run. URL:=http://www.lowth.com/cutter/ endef @@ -37,8 +40,8 @@ define Build/Compile endef define Package/cutter/install - mkdir -p $(1) - $(CP) $(PKG_INSTALL_DIR)/* $(1)/ + install -d -m0755 $(1)/usr/sbin + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/cutter $(1)/usr/sbin/ endef $(eval $(call BuildPackage,cutter)) diff --git a/net/dhcp-forwarder/Makefile b/net/dhcp-forwarder/Makefile index c4002507c8..2479b6c3bf 100644 --- a/net/dhcp-forwarder/Makefile +++ b/net/dhcp-forwarder/Makefile @@ -11,10 +11,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dhcp-forwarder PKG_VERSION:=0.7 PKG_RELEASE:=4 -PKG_MD5SUM:=e7f876e615ebc3f96418f6477b4451e2 -PKG_SOURCE_URL:=http://savannah.nongnu.org/download/dhcp-fwd PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE_URL:=http://savannah.nongnu.org/download/dhcp-fwd +PKG_MD5SUM:=e7f876e615ebc3f96418f6477b4451e2 PKG_CAT:=bzcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) @@ -26,7 +26,6 @@ define Package/dhcp-forwarder SECTION:=net CATEGORY:=Network TITLE:=DHCP relay agent - DESCRIPTION:=DHCP relay agent URL:=http://www.nongnu.org/dhcp-fwd/ endef @@ -34,9 +33,7 @@ define Package/dhcp-forwarder/conffiles /etc/dhcp-fwd.conf endef -define Build/Configure - $(call Build/Configure/Default) -endef +# uses GNU configure define Build/Compile rm -rf $(PKG_INSTALL_DIR) @@ -48,12 +45,12 @@ define Build/Compile endef define Package/dhcp-forwarder/install - install -m0755 -d $(1)/etc + install -d -m0755 $(1)/usr/bin + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/dhcp-fwd $(1)/usr/bin/ + install -d -m0755 $(1)/etc install -m0644 $(PKG_BUILD_DIR)/contrib/dhcp-fwd.conf $(1)/etc/ - install -m0755 -d $(1)/etc/init.d + install -d -m0755 $(1)/etc/init.d install -m0755 ./files/dhcp-fwd.init $(1)/etc/init.d/dhcp-fwd - install -m0755 -d $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/dhcp-fwd $(1)/usr/bin/ endef $(eval $(call BuildPackage,dhcp-forwarder)) diff --git a/net/dhcp/Makefile b/net/dhcp/Makefile index d15eb9c67b..da75804c62 100644 --- a/net/dhcp/Makefile +++ b/net/dhcp/Makefile @@ -11,10 +11,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dhcp PKG_VERSION:=3.0.3 PKG_RELEASE:=1 -PKG_MD5SUM:=f91416a0b8ed3fd0601688cf0b7df58f -PKG_SOURCE_URL:=ftp://ftp.isc.org/isc/dhcp/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=ftp://ftp.isc.org/isc/dhcp/ +PKG_MD5SUM:=f91416a0b8ed3fd0601688cf0b7df58f PKG_CAT:=zcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) @@ -22,39 +22,34 @@ PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install include $(INCLUDE_DIR)/package.mk -define Package/dhcp +define Package/dhcp/Default SECTION:=net CATEGORY:=Network - SUBMENU:=ISC's DHCP implementation - TITLE:=ISC's DHCP implementation - DESCRIPTION:=ISC's DHCP implementation - URL:=http://www.isc.org + TITLE:=ISC's DHCP + URL:=http://www.isc.org/ endef define Package/dhcp-relay - $(call Package/dhcp) - TITLE:=DHCP relay - DESCRIPTION:=DHCP relay + $(call Package/dhcp/Default) + TITLE+= relay endef define Package/dhcp-server - $(call Package/dhcp) - TITLE:=DHCP server - DESCRIPTION:=DHCP server + $(call Package/dhcp/Default) + TITLE+= server endef define Build/Configure + # it's not GNU autoconf stuff (cd $(PKG_BUILD_DIR) ; \ ./configure \ - --copts "$(TARGET_CFLAGS)" \ - linux-2.2 \ + --copts "$(TARGET_CFLAGS)" \ + linux-2.2 \ ); endef define Build/Compile - rm -rf $(PKG_INSTALL_DIR) - mkdir -p $(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) \ $(TARGET_CONFIGURE_OPTS) \ DESTDIR="$(PKG_INSTALL_DIR)" \ diff --git a/net/dsl-qos-queue/Makefile b/net/dsl-qos-queue/Makefile index 35885b28e5..f1cb4a0758 100644 --- a/net/dsl-qos-queue/Makefile +++ b/net/dsl-qos-queue/Makefile @@ -4,17 +4,17 @@ # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # -# $Id: $ +# $Id$ include $(TOPDIR)/rules.mk PKG_NAME:=dsl_qos_queue PKG_VERSION:=0.9.3 PKG_RELEASE:=1 -PKG_MD5SUM:=ccbe8d28c3508c67f669fe98532533be -PKG_SOURCE_URL:=http://www.sonicspike.net/software/download/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=http://www.sonicspike.net/software/download/ +PKG_MD5SUM:=ccbe8d28c3508c67f669fe98532533be PKG_CAT:=zcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) @@ -26,15 +26,17 @@ define Package/dsl-qos-queue CATEGORY:=Network DEPENDS:=+iptables +kmod-ipt-queue TITLE:=ADSL/ATM Bandwith management - DESCRIPTION:=ADSL/ATM Bandwith management +endef + +define Build/Configure endef define Build/Compile -$(call Build/Compile/Default, \ + $(call Build/Compile/Default, \ CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \ LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \ - install_prefix="$(PKG_INSTALL_DIR)" \ - all) + all \ + ) endef define Package/dsl-qos-queue/install diff --git a/net/ethtool/Makefile b/net/ethtool/Makefile index 3ee4debf15..ff7e6c7a77 100644 --- a/net/ethtool/Makefile +++ b/net/ethtool/Makefile @@ -11,10 +11,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ethtool PKG_VERSION:=3 PKG_RELEASE:=0 -PKG_MD5SUM:=b4e71f7fa2629250677eefcb338442c5 -PKG_SOURCE_URL:=@SF/gkernel PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=@SF/gkernel +PKG_MD5SUM:=b4e71f7fa2629250677eefcb338442c5 PKG_CAT:=zcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) @@ -26,15 +26,15 @@ define Package/ethtool SECTION:=net CATEGORY:=Network TITLE:=Display or change ethernet card settings - DESCRIPTION:=ethtool is used for querying settings of an ethernet device and changing them + DESCRIPTION:=\ + ethtool is used for querying settings of an ethernet device and changing them. URL:=http://sourceforge.net/projects/gkernel/ endef +# uses GNU configure + define Build/Compile - rm -rf $(PKG_INSTALL_DIR) - mkdir -p $(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) \ - $(TARGET_CONFIGURE_OPTS) \ DESTDIR="$(PKG_INSTALL_DIR)" \ all install endef diff --git a/net/ettercap/Makefile b/net/ettercap/Makefile index dbf33101c9..96c1c3781a 100644 --- a/net/ettercap/Makefile +++ b/net/ettercap/Makefile @@ -1,9 +1,10 @@ +# # Copyright (C) 2006 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # -# $Id: Makefile 4603 2006-08-18 21:21:06Z mbm $ +# $Id$ include $(TOPDIR)/rules.mk diff --git a/net/fping/Makefile b/net/fping/Makefile index 9448b9dd73..500e4f1bb6 100644 --- a/net/fping/Makefile +++ b/net/fping/Makefile @@ -11,30 +11,34 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fping PKG_VERSION:=2.4b2_to-ipv6 PKG_RELEASE:=1 -PKG_MD5SUM:=3ad516765514249a40d3c5b6caab812a -PKG_SOURCE_URL:=http://www.fping.com/download/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) +PKG_SOURCE_URL:=http://www.fping.com/download/ +PKG_MD5SUM:=3ad516765514249a40d3c5b6caab812a PKG_CAT:=zcat +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) + include $(INCLUDE_DIR)/package.mk define Package/fping SECTION:=net CATEGORY:=Network TITLE:=A program to ping multiple hosts in parallel - DESCRIPTION:=fping is a ping(1) like program which uses the Internet Control Message Protocol\\\ -(ICMP) echo request to determine if a host is up. fping is different from ping in\\\ -that you can specify any number of hosts on the command line, or specify a file\\\ -containing the lists of hosts to ping. Instead of trying one host until it timeouts\\\ -or replies, fping will send out a ping packet and move on to the next host in a\\\ -round-robin fashion. If a host replies, it is noted and removed from the list of\\\ -hosts to check. If a host does not respond within a certain time limit and/or retry\\\ -limit it will be considered unreachable.\\\ + DESCRIPTION:=\ + fping is a ping(1) like program which uses the Internet Control Message Protocol \\\ + (ICMP) echo request to determine if a host is up. fping is different from ping in \\\ + that you can specify any number of hosts on the command line, or specify a file \\\ + containing the lists of hosts to ping. Instead of trying one host until it timeouts \\\ + or replies, fping will send out a ping packet and move on to the next host in a \\\ + round-robin fashion. If a host replies, it is noted and removed from the list of \\\ + hosts to check. If a host does not respond within a certain time limit and/or retry \\\ + limit it will be considered unreachable. URL:=http://www.fping.com endef +# uses Build/Configure/Default + define Build/Compile $(MAKE) CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" -C $(PKG_BUILD_DIR) clean $(PKG_NAME) mv $(PKG_BUILD_DIR)/$(PKG_NAME) $(PKG_BUILD_DIR)/$(PKG_NAME)4 @@ -43,9 +47,10 @@ define Build/Compile endef define Package/fping/install - mkdir -p $(1)/usr/bin - $(CP) $(PKG_BUILD_DIR)/$(PKG_NAME)4 $(1)/usr/bin/$(PKG_NAME) - $(CP) $(PKG_BUILD_DIR)/$(PKG_NAME)6 $(1)/usr/bin/ + install -d -m0755 $(1)/usr/bin + $(CP) $(PKG_BUILD_DIR)/fping4 $(1)/usr/bin/ + $(CP) $(PKG_BUILD_DIR)/fping6 $(1)/usr/bin/ + ln -sf fping4 $(1)/usr/bin/fping endef $(eval $(call BuildPackage,fping)) diff --git a/net/fprobe-ulog/Makefile b/net/fprobe-ulog/Makefile index eed36beb37..cdec7c65ff 100644 --- a/net/fprobe-ulog/Makefile +++ b/net/fprobe-ulog/Makefile @@ -11,13 +11,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fprobe-ulog PKG_VERSION:=1.1 PKG_RELEASE:=1 -PKG_MD5SUM:=cdb2e4edc47e8a3d5479eeabfb979ebc PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=@SF/fprobe -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) +PKG_MD5SUM:=cdb2e4edc47e8a3d5479eeabfb979ebc PKG_CAT:=bzcat +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) + include $(INCLUDE_DIR)/package.mk define Package/fprobe-ulog @@ -25,16 +26,18 @@ define Package/fprobe-ulog CATEGORY:=Network DEPENDS:=+libpthread TITLE:=NetFlow probe (ulog-based) - DESCRIPTION:=A NetFlow probe obtaining packets through linux netfilter code\\\ -(iptables ULOG target). + DESCRIPTION:=\ + A NetFlow probe obtaining packets through linux netfilter code \\\ + (iptables ULOG target). URL:=http://fprobe.sourceforge.net endef define Build/Configure -$(call Build/Configure/Default,--with-piddir=/var \ ---with-membulk=index8 \ ---with-hash=xor8 \ -) + $(call Build/Configure/Default, \ + --with-piddir=/var \ + --with-membulk=index8 \ + --with-hash=xor8 \ + ) endef define Build/Compile diff --git a/net/fprobe/Makefile b/net/fprobe/Makefile index f539e96bd9..a8acaa51bf 100644 --- a/net/fprobe/Makefile +++ b/net/fprobe/Makefile @@ -8,15 +8,16 @@ include $(TOPDIR)/rules.mk -PKG_NAME := fprobe -PKG_VERSION := 1.1 -PKG_RELEASE := 1 -PKG_MD5SUM := 65850d0470078269b33eee58cba77ac2 +PKG_NAME:=fprobe +PKG_VERSION:=1.1 +PKG_RELEASE:=1 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE_URL:=@SF/fprobe +PKG_MD5SUM:=65850d0470078269b33eee58cba77ac2 +PKG_CAT:=bzcat -PKG_SOURCE := $(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_URL := @SF/fprobe PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) -PKG_CAT := bzcat include $(INCLUDE_DIR)/package.mk @@ -25,17 +26,17 @@ define Package/fprobe CATEGORY:=Network DEPENDS:=+libpcap +libpthread TITLE:=NetFlow probe (libpcap-based) - DESCRIPTION:=A NetFlow probe using libpcap URL:=http://fprobe.sourceforge.net/ endef define Build/Configure -$(call Build/Configure/Default,--with-piddir=/var \ ---with-pcap=$(STAGING_DIR)/usr/include \ ---with-libpcap=$(STAGING_DIR)/usr/lib \ ---with-membulk=index8 \ ---with-hash=xor8 \ -) + $(call Build/Configure/Default, \ + --with-piddir=/var \ + --with-pcap="$(STAGING_DIR)/usr/include" \ + --with-libpcap="$(STAGING_DIR)/usr/lib" \ + --with-membulk=index8 \ + --with-hash=xor8 \ + ) endef define Build/Compile @@ -43,7 +44,7 @@ define Build/Compile endef define Package/fprobe/install - mkdir -p $(1)/usr/bin + install -d -m0755 $(1)/usr/bin $(CP) $(PKG_BUILD_DIR)/src/fprobe $(1)/usr/bin/ endef diff --git a/net/frickin/Makefile b/net/frickin/Makefile index 056adb2637..9eb07ee270 100644 --- a/net/frickin/Makefile +++ b/net/frickin/Makefile @@ -11,10 +11,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:=frickin PKG_VERSION:=1.3 PKG_RELEASE:=1 -PKG_MD5SUM:= 5b2e98da2310c71c703d4617b88a173f -PKG_SOURCE_URL:=@SF/frickin PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=@SF/frickin +PKG_MD5SUM:= 5b2e98da2310c71c703d4617b88a173f PKG_CAT:=zcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) @@ -26,9 +26,10 @@ define Package/frickin SECTION:=net CATEGORY:=Network TITLE:=PPTP (Point-to-Point Tunneling Protocol) proxy - DESCRIPTION:=Frickin PPTP Proxy allows a Point-to-Point Tunneling Protocol (PPTP)\\\ -client to connect to a PPTP server through Network Address\\\ -Translation (NAT).\\\ + DESCRIPTION:=\ + Frickin PPTP Proxy allows a Point-to-Point Tunneling Protocol (PPTP) \\\ + client to connect to a PPTP server through Network Address \\\ + Translation (NAT). URL:=http://frickin.sourceforge.net endef diff --git a/net/htpdate/Makefile b/net/htpdate/Makefile index 8a53cf9bb0..1d76c6a7ec 100644 --- a/net/htpdate/Makefile +++ b/net/htpdate/Makefile @@ -1,3 +1,4 @@ +# # Copyright (C) 2006 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. @@ -10,10 +11,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:=htpdate PKG_VERSION:=0.9.0 PKG_RELEASE:=1 -PKG_MD5SUM:=12cf883c5619cf4c13a62f77f1a55b54 -PKG_SOURCE_URL:=http://www.clevervest.com/htp/archive/c/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=http://www.clevervest.com/htp/archive/c/ +PKG_MD5SUM:=12cf883c5619cf4c13a62f77f1a55b54 PKG_CAT:=zcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) @@ -25,7 +26,6 @@ define Package/htpdate SECTION:=net CATEGORY:=Network TITLE:=an HTP (Hypertext Time Protocol) implementation - DESCRIPTION:=an HTP (Hypertext Time Protocol) implementation URL:=http://www.clevervest.com/htp/ endef @@ -41,12 +41,12 @@ endef define Package/htpdate/install + install -d -m0755 $(1)/usr/sbin + install -m0755 $(PKG_BUILD_DIR)/htpdate $(1)/usr/sbin/ install -d -m0755 $(1)/etc/default/ install -m0644 ./files/htpdate.default $(1)/etc/default/htpdate install -d -m0755 $(1)/etc/init.d/ install -m0755 ./files/htpdate.init $(1)/etc/init.d/htpdate - install -d -m0755 $(1)/usr/sbin - install -m0755 $(PKG_BUILD_DIR)/htpdate $(1)/usr/sbin/ endef $(eval $(call BuildPackage,htpdate)) diff --git a/net/httping/Makefile b/net/httping/Makefile index f536ab2d0c..7331d4f9bd 100644 --- a/net/httping/Makefile +++ b/net/httping/Makefile @@ -1,3 +1,4 @@ +# # Copyright (C) 2006 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. diff --git a/net/iftop/Makefile b/net/iftop/Makefile index 15c982cdae..ba8880da55 100644 --- a/net/iftop/Makefile +++ b/net/iftop/Makefile @@ -1,3 +1,4 @@ +# # Copyright (C) 2006 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. @@ -10,10 +11,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:=iftop PKG_VERSION:=0.17 PKG_RELEASE:=1 -PKG_MD5SUM:=062bc8fb3856580319857326e0b8752d -PKG_SOURCE_URL:=http://www.ex-parrot.com/~pdw/iftop/download PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=http://www.ex-parrot.com/~pdw/iftop/download +PKG_MD5SUM:=062bc8fb3856580319857326e0b8752d PKG_CAT:=zcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) @@ -26,20 +27,23 @@ define Package/iftop CATEGORY:=Network DEPENDS:=+libpcap +libncurses +libpthread TITLE:=display bandwith usage on an interface - DESCRIPTION:=iftop does for network usage what top(1) does for CPU usage. It\\\ -listens to network traffic on a named interface and displays a\\\ -table of current bandwidth usage by pairs of hosts. Handy for\\\ -answering the question 'why is our ADSL link so slow?'. + DESCRIPTION:=\ + iftop does for network usage what top(1) does for CPU usage. It \\\ + listens to network traffic on a named interface and displays a \\\ + table of current bandwidth usage by pairs of hosts. Handy for \\\ + answering the question 'why is our ADSL link so slow?'. URL:=http://www.ex-parrot.com/~pdw/iftop/ endef define Build/Compile - $(call Build/Compile/Default,DESTDIR="$(PKG_INSTALL_DIR)" install) + $(MAKE) -C $(PKG_BUILD_DIR) \ + DESTDIR="$(PKG_INSTALL_DIR)" \ + all install endef define Package/iftop/install install -d -m0755 $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/$(PKG_NAME) $(1)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/iftop $(1)/usr/bin/ endef $(eval $(call BuildPackage,iftop)) diff --git a/net/igmpproxy/Makefile b/net/igmpproxy/Makefile index 06620e7c52..8bf9d20e7c 100644 --- a/net/igmpproxy/Makefile +++ b/net/igmpproxy/Makefile @@ -1,3 +1,4 @@ +# # Copyright (C) 2006 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. @@ -10,33 +11,41 @@ include $(TOPDIR)/rules.mk PKG_NAME:=igmpproxy PKG_VERSION:=0.1-beta2 PKG_RELEASE:=1 -PKG_MD5SUM:=2a5a59480f44d4b14077a6b5319e9940 -PKG_SOURCE_URL:=@SF/igmpproxy PKG_SOURCE:=$(PKG_NAME)-src-$(PKG_VERSION).tar.gz -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) +PKG_SOURCE_URL:=@SF/igmpproxy +PKG_MD5SUM:=2a5a59480f44d4b14077a6b5319e9940 PKG_CAT:=zcat +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) + include $(INCLUDE_DIR)/package.mk define Package/igmpproxy SECTION:=net CATEGORY:=Network TITLE:=Multicast Routing Daemon - DESCRIPTION:=IGMPproxy is a simple dynamic Multicast Routing Daemon using\\\ -only IGMP signalling (Internet Group Management Protocol).\\\ + DESCRIPTION:=\ + IGMPproxy is a simple dynamic Multicast Routing Daemon using \\\ + only IGMP signalling (Internet Group Management Protocol). URL:=http://sourceforge.net/projects/igmpproxy endef -define Build/Compile - $(MAKE) CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" -C $(PKG_BUILD_DIR)/src +define Package/igmpproxy/conffiles +/etc/igmpproxy.conf endef +define Build/Compile + $(MAKE) -C $(PKG_BUILD_DIR)/src \ + CC="$(TARGET_CC)" \ + CFLAGS="$(TARGET_CFLAGS)" +endef define Package/igmpproxy/install - mkdir -p $(1)/usr/sbin $(1)/etc - $(CP) $(PKG_BUILD_DIR)/src/$(PKG_NAME) $(1)/usr/sbin/ - $(CP) $(PKG_BUILD_DIR)/src/$(PKG_NAME).conf $(1)/etc + install -d -m0755 $(1)/etc + install -m0755 $(PKG_BUILD_DIR)/src/igmpproxy.conf $(1)/etc + install -d -m0755 $(1)/usr/sbin $(1)/etc + install -m0644 $(PKG_BUILD_DIR)/src/igmpproxy $(1)/usr/sbin/ endef $(eval $(call BuildPackage,igmpproxy)) diff --git a/net/ipcad/Makefile b/net/ipcad/Makefile index 28ba31c3e3..159b0f5a70 100644 --- a/net/ipcad/Makefile +++ b/net/ipcad/Makefile @@ -1,3 +1,4 @@ +# # Copyright (C) 2006 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. @@ -10,10 +11,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ipcad PKG_VERSION:=3.7 PKG_RELEASE:=1 -PKG_MD5SUM:=34c542c99593dfe9d5b408deffcfe70e -PKG_SOURCE_URL:=@SF/ipcad PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=@SF/ipcad +PKG_MD5SUM:=34c542c99593dfe9d5b408deffcfe70e PKG_CAT:=zcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) @@ -26,9 +27,10 @@ define Package/ipcad CATEGORY:=Network DEPENDS:=+libpcap TITLE:=listens for traffic on the specified interfaces - DESCRIPTION:=This daemon listens for traffic on the specified interfaces.\\\ - It has the built-in RSH and NetFlow engines to allow exporting\\\ - the accounting data the same way as Cisco routers do.\\\ + DESCRIPTION:=\ + This daemon listens for traffic on the specified interfaces.\\\ + It has the built-in RSH and NetFlow engines to allow exporting \\\ + the accounting data the same way as Cisco routers do. URL:=http://lionet.info/ipcad/ endef @@ -36,28 +38,26 @@ define Package/ipcad/conffiles/ /etc/ipcad.conf endef - define Build/Configure - $(call Build/Configure/Default,--enable-shared \ + (cd $(PKG_BUILD_DIR); touch \ + cfglex.c \ + cslex.c \ + ); + $(call Build/Configure/Default, \ + --enable-shared \ --disable-static \ - --disable-rpath \ - --with-gnu-ld \ --with-psrc=pcap \ --with-pcap-include="$(STAGING_DIR)/usr/include" \ - --with-pcap-libraries="$(STAGING_DIR)/usr/lib", \ - touch cfglex.c cslex.c; \ + --with-pcap-libraries="$(STAGING_DIR)/usr/lib" \ + , \ ac_cv_func_getifaddrs=no \ ac_cv_header_ifaddrs_h=no \ -) + ) endef define Build/Compile $(MAKE) -C $(PKG_BUILD_DIR) \ - $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS) -DHAVE_PCAP_H=1 -I$(STAGING_DIR)/usr/include" \ - LIBS="-lnsl -pthread -lpcap" \ - LDFLAGS="-L$(STAGING_DIR)/usr/lib" \ - DESTDIR=$(PKG_INSTALL_DIR) \ + DESTDIR="$(PKG_INSTALL_DIR)" \ all install endef diff --git a/net/iperf/Makefile b/net/iperf/Makefile index 67a7d8401f..73358c4dcb 100644 --- a/net/iperf/Makefile +++ b/net/iperf/Makefile @@ -1,3 +1,4 @@ +# # Copyright (C) 2006 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. @@ -10,11 +11,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=iperf PKG_VERSION:=2.0.2 PKG_RELEASE:=1 -PKG_MD5SUM:=bb658aba58a5af0356f5b1342dfe8f53 -PKG_SOURCE_URL:=http://dast.nlanr.net/Projects/Iperf2.0 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=http://dast.nlanr.net/Projects/Iperf2.0 +PKG_MD5SUM:=bb658aba58a5af0356f5b1342dfe8f53 PKG_CAT:=zcat + PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install @@ -25,30 +27,27 @@ define Package/iperf CATEGORY:=Network DEPENDS:=+uclibcxx TITLE:=Internet Protocol bandwidth measuring tool - DESCRIPTION:=Iperf is a modern alternative for measuring TCP and UDP bandwidth\\\ -performance, allowing the tuning of various parameters and\\\ -characteristics.\\\ + DESCRIPTION:=\ + Iperf is a modern alternative for measuring TCP and UDP bandwidth \\\ + performance, allowing the tuning of various parameters and \\\ + characteristics. URL:=http://dast.nlanr.net/Projects/Iperf/ endef define Build/Configure $(call Build/Configure/Default, \ - --enable-shared \ - --disable-static \ - --disable-rpath \ --disable-multicast \ - --disable-threads, \ - CXXFLAGS="$(TARGET_CFLAGS) -fno-builtin -fno-rtti -nostdinc++" \ - LDFLAGS="-nodefaultlibs -L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \ - LIBS="-luClibc++ -lc -lm -lgcc_s" \ + --disable-threads \ + , \ + CXXFLAGS="$$$$CXX_CFLAGS -fno-builtin -fno-rtti -nostdinc++" \ + LIBS="-nodefaultlibs -luClibc++ -lc -lm -lgcc_s" \ ) endef define Build/Compile - rm -rf $(PKG_INSTALL_DIR) - mkdir -p $(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) \ - DESTDIR="$(PKG_INSTALL_DIR)" install + DESTDIR="$(PKG_INSTALL_DIR)" \ + all install endef define Package/iperf/install diff --git a/net/ipkungfu/Makefile b/net/ipkungfu/Makefile index 3120a3b950..2135036e0f 100644 --- a/net/ipkungfu/Makefile +++ b/net/ipkungfu/Makefile @@ -1,9 +1,10 @@ +# # Copyright (C) 2006 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # -# $Id: $ +# $Id$ include $(TOPDIR)/rules.mk @@ -11,12 +12,13 @@ PKG_NAME:=ipkungfu PKG_VERSION:=0.6.0 PKG_RELEASE:=1 -PKG_SOURCE_URL:=http://www.linuxkungfu.org/ipkungfu PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=http://www.linuxkungfu.org/ipkungfu PKG_MD5SUM:=a65b5e629a7e9ef00aaf20587d918e5f PKG_CAT:=zcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) +PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install include $(INCLUDE_DIR)/package.mk @@ -26,7 +28,7 @@ define Package/ipkungfu TITLE:=IPKungFu is an iptables-based Linux firewall DESCRIPTION:=\ IPKungFu is an iptables-based Linux firewall.\\\ - It aims to simplify the configuration of Internet\\\ + It aims to simplify the configuration of Internet \\\ connection sharing, port forwarding, and packet filtering. URL:=http://www.linuxkungfu.org endef @@ -46,18 +48,19 @@ define Package/ipkungfu/conffiles /etc/ipkungfu/vhosts.conf endef -define Build/Configure -$(call Build/Configure/Default) -endef +# uses GNU configure define Build/Compile -$(call Build/Compile/Default,all) + $(MAKE) -C $(PKG_BUILD_DIR) \ + DESTDIR="$(PKG_INSTALL_DIR)" \ + all install endef define Package/ipkungfu/install - mkdir -p $(1)/usr/sbin $(1)/etc/ipkungfu/ - $(CP) $(PKG_BUILD_DIR)/dummy_server $(1)/usr/sbin - install -m0755 $(PKG_BUILD_DIR)/ipkungfu $(1)/usr/sbin/ + install -d -m0755 $(1)/usr/sbin + $(CP) $(PKG_BUILD_DIR)/dummy_server $(1)/usr/sbin/ + $(CP) $(PKG_BUILD_DIR)/ipkungfu $(1)/usr/sbin/ + install -d -m0755 $(1)/etc/ipkungfu/ $(CP) $(PKG_BUILD_DIR)/files/conf/* $(1)/etc/ipkungfu/ endef diff --git a/net/iptables-snmp/Makefile b/net/iptables-snmp/Makefile index eaa6b2f405..519b365baa 100644 --- a/net/iptables-snmp/Makefile +++ b/net/iptables-snmp/Makefile @@ -1,3 +1,4 @@ +# # Copyright (C) 2006 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. @@ -10,10 +11,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:=iptables-snmp PKG_VERSION:=0.1 PKG_RELEASE:=1 -PKG_MD5SUM:=8370d2f0c899461a053da491400119d1 -PKG_SOURCE_URL:=http://www.nobiscuit.com/iptables-snmp PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=http://www.nobiscuit.com/iptables-snmp +PKG_MD5SUM:=8370d2f0c899461a053da491400119d1 PKG_CAT:=zcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) @@ -26,15 +27,16 @@ define Package/iptables-snmp CATEGORY:=Network DEPENDS:=+snmpd TITLE:=An snmpd plugin to access iptables rules - DESCRIPTION:=This is a plugin that makes iptables rules accessable from snmpd. + DESCRIPTION:=\ + This is a plugin that makes iptables rules accessable from snmpd. URL:=http://www.nobiscuit.com/iptables-snmp/ endef define Build/Compile - $(call Build/Compile/Default, \ + $(call Build/Compile/Default, \ INSTALL_PREFIX="$(PKG_INSTALL_DIR)" \ all install \ - ) + ) endef define Package/iptables-snmp/install diff --git a/net/irssi/Makefile b/net/irssi/Makefile index 5900d20b5f..024bcfa637 100644 --- a/net/irssi/Makefile +++ b/net/irssi/Makefile @@ -1,3 +1,4 @@ +# # Copyright (C) 2006 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. @@ -11,8 +12,8 @@ PKG_NAME:=irssi PKG_VERSION:=0.8.10 PKG_RELEASE:=1 -PKG_SOURCE_URL:=http://irssi.org/files/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)a.tar.bz2 +PKG_SOURCE_URL:=http://irssi.org/files/ PKG_MD5SUM:=38e616bccb6a34ff6d91690317c2fa19 PKG_CAT:=bzcat @@ -25,29 +26,28 @@ define Package/irssi CATEGORY:=Network DEPENDS:=+glib1 +libncurses TITLE:=console irc client - DESCRIPTION:=IRC client for the text console - URL:=http://irssi.org + URL:=http://irssi.org/ endef define Build/Configure -$(call Build/Configure/Default,--with-perl=no \ ---with-glib1 \ ---with-gnu-ld \ ---with-textui \ ---without-terminfo \ ---without-bot \ ---without-file-offset-size \ ---without-ssl \ ---disable-ssl \ ---disable-ipv6 \ ---disable-proxy \ ---with-glib-prefix=$(STAGING_DIR)/usr,ac_cv_c_bigendian=no \ -ac_cv_sizeof_off_t=8) + $(call Build/Configure/Default, \ + --with-perl=no \ + --with-glib1 \ + --with-glib-prefix="$(STAGING_DIR)/usr" \ + --with-textui \ + --without-terminfo \ + --without-bot \ + --without-file-offset-size \ + --without-ssl \ + --disable-ssl \ + --disable-ipv6 \ + --disable-proxy \ + ) endef define Package/irssi/install - mkdir -p $(1)/usr/bin - $(CP) $(PKG_BUILD_DIR)/src/fe-text/$(PKG_NAME) $(1)/usr/bin/ + install -d -m0755 $(1)/usr/bin + install -m0755 $(PKG_BUILD_DIR)/src/fe-text/irssi $(1)/usr/bin/ endef $(eval $(call BuildPackage,irssi)) diff --git a/net/l2tpd/Makefile b/net/l2tpd/Makefile index 1f4838056c..0ed5a898d7 100644 --- a/net/l2tpd/Makefile +++ b/net/l2tpd/Makefile @@ -1,3 +1,4 @@ +# # Copyright (C) 2006 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. @@ -11,10 +12,10 @@ PKG_NAME:=l2tpd PKG_VERSION:=0.70pre PKG_UPSTREAM_VERSION:=0.70-pre20031121 PKG_RELEASE:=4.1 -PKG_MD5SUM:=3f2707b6e16a8cb72e7bf64f574202fa -PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/main/l/l2tpd PKG_SOURCE:=$(PKG_NAME)_$(PKG_UPSTREAM_VERSION).orig.tar.gz +PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/main/l/l2tpd +PKG_MD5SUM:=3f2707b6e16a8cb72e7bf64f574202fa PKG_CAT:=zcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_UPSTREAM_VERSION).orig @@ -26,11 +27,11 @@ define Package/l2tpd SECTION:=net CATEGORY:=Network TITLE:=An L2TP (Layer 2 Tunneling Protocol) daemon - DESCRIPTION:=A layer 2 tunneling protocol implementation.\\\ -l2tpd is the open source implementation of the L2TP tunneling\\\ -protocol (RFC2661). It does implement both LAC and LNS role\\\ -in a L2TP networking architecture. The main goal of this protocol is\\\ -to tunnel PPP frame trough an ip network.\\\ + DESCRIPTION:=\ + l2tpd is the open source implementation of the L2TP tunneling \\\ + protocol (RFC2661). It does implement both LAC and LNS role \\\ + in a L2TP networking architecture. The main goal of this protocol is \\\ + to tunnel PPP frame trough an ip network. URL:=http://l2tpd.sourceforge.net/ endef @@ -40,18 +41,20 @@ define Package/l2tpd/conffiles endef define Build/Compile - $(call Build/Compile/Default,CFLAGS="$(TARGET_CFLAGS) -I. -DLINUX -DSANITY -DIP_ALLOCATION") + $(call Build/Compile/Default, \ + CFLAGS="$(TARGET_CFLAGS) -I. -DLINUX -DSANITY -DIP_ALLOCATION" \ + ) endef define Package/l2tpd/install + install -d -m0755 $(1)/usr/sbin + install -m0755 $(PKG_BUILD_DIR)/$(PKG_NAME) $(1)/usr/sbin/ install -d -m0755 $(1)/etc/l2tpd install -m0644 ./files/l2tpd.conf $(1)/etc/l2tpd/ install -d -m0755 $(1)/etc/ppp install -m0644 ./files/options.l2tpd $(1)/etc/ppp/ install -d -m0755 $(1)/etc/init.d install -m0755 ./files/l2tpd.init $(1)/etc/init.d/l2tpd - install -d -m0755 $(1)/usr/sbin - install -m0755 $(PKG_BUILD_DIR)/$(PKG_NAME) $(1)/usr/sbin/ endef $(eval $(call BuildPackage,l2tpd)) diff --git a/net/l2tpns/Makefile b/net/l2tpns/Makefile index 323a6dce10..fd44dab90b 100644 --- a/net/l2tpns/Makefile +++ b/net/l2tpns/Makefile @@ -1,3 +1,4 @@ +# # Copyright (C) 2006 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. @@ -10,10 +11,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:=l2tpns PKG_VERSION:=2.1.14 PKG_RELEASE:=1 -PKG_MD5SUM:=2a0ee2a3678160c335f1d68c17c4f871 -PKG_SOURCE_URL:=@SF/l2tpns PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=@SF/l2tpns +PKG_MD5SUM:=2a0ee2a3678160c335f1d68c17c4f871 PKG_CAT:=zcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) @@ -26,10 +27,11 @@ define Package/l2tpns CATEGORY:=Network DEPENDS:=+libcli TITLE:=An L2TP enhanced server - DESCRIPTION:=l2tpns is a layer 2 tunneling protocol network server (LNS).\\\ - it supports up to 65535 concurrent sessions per server/cluster\\\ - plus ISP features such as rate limiting, walled garden, usage\\\ - accounting, and more.\\\ + DESCRIPTION:=\ + l2tpns is a layer 2 tunneling protocol network server (LNS).\\\ + it supports up to 65535 concurrent sessions per server/cluster \\\ + plus ISP features such as rate limiting, walled garden, usage \\\ + accounting, and more. URL:=http://sourceforge.net/projects/l2tpns endef @@ -40,7 +42,13 @@ define Package/l2tpns/conffiles endef define Build/Compile - $(call Build/Compile/Default, LD="$(TARGET_CC)" OPTIM="$(TARGET_CFLAGS)" STAGING_DIR=$(STAGING_DIR) DESTDIR=$(PKG_INSTALL_DIR) all install) + $(call Build/Compile/Default, \ + LD="$(TARGET_CC)" \ + OPTIM="$(TARGET_CFLAGS)" \ + STAGING_DIR="$(STAGING_DIR)" \ + DESTDIR="$(PKG_INSTALL_DIR)" \ + all install \ + ) endef define Package/l2tpns/install diff --git a/net/maradns/Makefile b/net/maradns/Makefile index 79ea02c8be..989bbd90df 100644 --- a/net/maradns/Makefile +++ b/net/maradns/Makefile @@ -1,3 +1,4 @@ +# # Copyright (C) 2006 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. @@ -10,10 +11,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:=maradns PKG_VERSION:=1.2.07.2 PKG_RELEASE:=1 -PKG_MD5SUM:=dc67f6a496e668127871382a40367733 -PKG_SOURCE_URL:=http://www.maradns.org/download/1.2/1.2.07.2/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE_URL:=http://www.maradns.org/download/1.2/1.2.07.2/ +PKG_MD5SUM:=dc67f6a496e668127871382a40367733 PKG_CAT:=bzcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) @@ -26,7 +27,6 @@ define Package/maradns CATEGORY:=Network DEPENDS:=+libpthread TITLE:=Small and secure DNS Server - DESCRIPTION:=A small and secure DNS server URL:=http://www.maradns.org/ endef @@ -35,7 +35,8 @@ define Package/maradns/conffiles endef define Build/Configure - (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \ + # it's not GNU autoconf stuff + (cd $(PKG_BUILD_DIR); \ $(TARGET_CONFIGURE_OPTS) \ ./configure \ ); diff --git a/net/miau/Makefile b/net/miau/Makefile index 4ecd2efcaa..97437b8b23 100644 --- a/net/miau/Makefile +++ b/net/miau/Makefile @@ -11,10 +11,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:=miau PKG_VERSION:=0.6.0.2 PKG_RELEASE:=1 -PKG_MD5SUM:=1b78d219a03655399c165eeb021cddd8 -PKG_SOURCE_URL:= @SF/miau PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=@SF/miau +PKG_MD5SUM:=1b78d219a03655399c165eeb021cddd8 PKG_CAT:=zcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) @@ -26,10 +26,11 @@ define Package/miau SECTION:=net CATEGORY:=Network TITLE:=Another IRC-bouncer/proxy - DESCRIPTION:=In short, miau is an IRC-bouncer/proxy.\\\ -Being more verbose, miau is small but quite featured\\\ -IRC-bouncer - a service bit like HTTP-proxy, but\\\ -for IRC-networks.\\\ + DESCRIPTION:=\ + In short, miau is an IRC-bouncer/proxy.\\\ + Being more verbose, miau is small but quite featured \\\ + IRC-bouncer - a service bit like HTTP-proxy, but \\\ + for IRC-networks. URL:=http://sourceforge.net/projects/miau/ endef @@ -43,9 +44,10 @@ define Build/Configure ) endef - define Build/Compile - $(call Build/Compile/Default,DESTDIR="$(PKG_INSTALL_DIR)" install) + $(MAKE) -C $(PKG_BUILD_DIR) \ + DESTDIR="$(PKG_INSTALL_DIR)" \ + all install endef define Package/miau/install diff --git a/net/miax/Makefile b/net/miax/Makefile index 200dd04a97..cbaa9b9b79 100644 --- a/net/miax/Makefile +++ b/net/miax/Makefile @@ -11,10 +11,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:=miax PKG_VERSION:=1.4 PKG_RELEASE:=1 -PKG_MD5SUM:=44f0d2ef46ee2697d890b7b96846adc7 -PKG_SOURCE_URL:=http://mesh.dl.sourceforge.net/sourceforge/miax/ PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=http://mesh.dl.sourceforge.net/sourceforge/miax/ +PKG_MD5SUM:=44f0d2ef46ee2697d890b7b96846adc7 PKG_CAT:=zcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) @@ -22,14 +22,15 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) include $(INCLUDE_DIR)/package.mk define Package/miax - SECTION:=net - CATEGORY:=Network - DEPENDS:=+libpthread +bluez-libs - TITLE:=A console iax (asterisk) client - DESCRIPTION:=miax is a console iax (asterisk) client, it can work with\\\ -a soundcard as a normal voip phone, taking input/output from\\\ -keyboard, analog/gsm/isdn modem or bluetooth phones.\\\ - URL:=http://www.eja.it/?l=gpl&testo=miax + SECTION:=net + CATEGORY:=Network + DEPENDS:=+libpthread +bluez-libs + TITLE:=A console iax (asterisk) client + DESCRIPTION:=\ + miax is a console iax (asterisk) client, it can work with \\\ + a soundcard as a normal voip phone, taking input/output from \\\ + keyboard, analog/gsm/isdn modem or bluetooth phones. + URL:=http://www.eja.it/?l=gpl&testo=miax endef define Build/Compile diff --git a/net/mini_sendmail/Makefile b/net/mini_sendmail/Makefile index ac31596fa3..402d957cec 100644 --- a/net/mini_sendmail/Makefile +++ b/net/mini_sendmail/Makefile @@ -11,10 +11,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mini-sendmail PKG_VERSION:=1.3.5 PKG_RELEASE:=1 -PKG_MD5SUM:=fff344184e98cff0ea4d817da9d29383 -PKG_SOURCE_URL:=http://www.acme.com/software/mini_sendmail/ PKG_SOURCE:=mini_sendmail-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=http://www.acme.com/software/mini_sendmail/ +PKG_MD5SUM:=fff344184e98cff0ea4d817da9d29383 PKG_CAT:=zcat PKG_BUILD_DIR:=$(BUILD_DIR)/mini_sendmail-$(PKG_VERSION) @@ -25,10 +25,11 @@ define Package/mini-sendmail SECTION:=net CATEGORY:=Network TITLE:=A small sendmail-compatible mail forwarder - DESCRIPTION:=mini_sendmail reads its standard input up to an end-of-file and sends a\\\ -copy of the message found there to all of the addresses listed.\\\ -The message is sent by connecting to a local SMTP server. This means\\\ -mini_sendmail can be used to send email from inside a chroot(2) area.\\\ + DESCRIPTION:=\ + mini_sendmail reads its standard input up to an end-of-file and sends a \\\ + copy of the message found there to all of the addresses listed.\\\ + The message is sent by connecting to a local SMTP server. This means \\\ + mini_sendmail can be used to send email from inside a chroot(2) area. URL:=http://www.acme.com/software/mini_sendmail/ endef diff --git a/net/netperf/Makefile b/net/netperf/Makefile index add3136d66..9ca3a1ecc4 100644 --- a/net/netperf/Makefile +++ b/net/netperf/Makefile @@ -11,11 +11,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=netperf PKG_VERSION:=2.3pl1 PKG_RELEASE:=1 -PKG_MD5SUM:=b74314d78af31cb13516fb9a372d2e86 +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=ftp://ftp.netperf.org/netperf/archive/ \ ftp://ftp.cup.hp.com/dist/networking/benchmarks/netperf/ -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_MD5SUM:=b74314d78af31cb13516fb9a372d2e86 PKG_CAT:=zcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) @@ -26,15 +26,14 @@ define Package/netperf SECTION:=net CATEGORY:=Network TITLE:=network performance measurement tool - DESCRIPTION:=Program and service to do network performance measurement. URL:=http://www.netperf.org endef define Build/Compile $(MAKE) -C $(PKG_BUILD_DIR) \ - TARGET_NETPERF_HOME="/etc/netperf.conf" \ - TARGET_CC="$(TARGET_CROSS)gcc" \ - TARGET_CFLAGS="$(TARGET_CFLAGS)" \ + TARGET_NETPERF_HOME="/etc/netperf.conf" \ + TARGET_CC="$(TARGET_CROSS)gcc" \ + TARGET_CFLAGS="$(TARGET_CFLAGS)" \ TARGET_LIBS="" \ all endef diff --git a/net/netstat-nat/Makefile b/net/netstat-nat/Makefile index 0164084991..716796f49d 100644 --- a/net/netstat-nat/Makefile +++ b/net/netstat-nat/Makefile @@ -11,10 +11,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:=netstat-nat PKG_VERSION:=1.4.6 PKG_RELEASE:=1 -PKG_MD5SUM:=ccf71a6cbd9a513ea3adec54b54ee770 -PKG_SOURCE_URL:=http://tweegy.demon.nl/download/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=http://tweegy.demon.nl/download/ +PKG_MD5SUM:=ccf71a6cbd9a513ea3adec54b54ee770 PKG_CAT:=zcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) @@ -26,21 +26,21 @@ define Package/netstat-nat SECTION:=net CATEGORY:=Network TITLE:=A netstat variant for NAT connections - DESCRIPTION:=Netstat-nat is a small program written in C.\\\ - It displays NAT connections, managed by netfilter/iptables which comes\\\ + DESCRIPTION:=\ + Netstat-nat is a small program written in C.\\\ + It displays NAT connections, managed by netfilter/iptables which comes \\\ with the > 2.4.x linux kernels.\\\ - The program reads its information from '/proc/net/ip_conntrack', which\\\ - is the temporary conntrack-storage of netfilter.\\\ + The program reads its information from '/proc/net/ip_conntrack', which \\\ + is the temporary conntrack-storage of netfilter. URL:=http://tweegy.demon.nl/projects/netstat-nat/ endef +# uses GNU configure + define Build/Compile - rm -rf $(PKG_INSTALL_DIR) - mkdir -p $(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) \ - $(TARGET_CONFIGURE_OPTS) \ - DESTDIR="$(PKG_INSTALL_DIR)" \ - all install + DESTDIR="$(PKG_INSTALL_DIR)" \ + all install endef define Package/netstat-nat/install diff --git a/net/nfs-kernel-server/Makefile b/net/nfs-kernel-server/Makefile index 29f4899869..29cf6e6edc 100644 --- a/net/nfs-kernel-server/Makefile +++ b/net/nfs-kernel-server/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile 4033 2006-06-21 02:32:39Z nbd $ +# $Id$ include $(TOPDIR)/rules.mk diff --git a/net/nocatsplash/Makefile b/net/nocatsplash/Makefile index 5cd7d05b31..051132dd90 100644 --- a/net/nocatsplash/Makefile +++ b/net/nocatsplash/Makefile @@ -11,10 +11,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:=nocatsplash PKG_VERSION:=0.92 PKG_RELEASE:=1 -PKG_MD5SUM:=e0fcc0effe52e63bc31070d16d0b4a81 -PKG_SOURCE_URL:=http://wifi.rulez.org/~josephus/ PKG_SOURCE:=NoCatSplash-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=http://wifi.rulez.org/~josephus/ +PKG_MD5SUM:=e0fcc0effe52e63bc31070d16d0b4a81 PKG_CAT:=zcat PKG_BUILD_DIR:=$(BUILD_DIR)/NoCatSplash-$(PKG_VERSION) @@ -27,12 +27,13 @@ define Package/nocatsplash CATEGORY:=Network DEPENDS:=+glib1 TITLE:=Open public network gateway daemon - DESCRIPTION:=NoCatSplash is an Open Public Network Gateway Daemon.\\\ - It performs as a [captive/open/active] portal. When run on a gateway/router\\\ - on a network, all web requests are redirected until the client either logs\\\ - in or clicks "I Accept" to an AUP. The gateway daemon then changes the\\\ - firewall rules on the gateway to pass traffic for that client (based on IP\\\ - address and MAC address).\\\ + DESCRIPTION:=\ + NoCatSplash is an Open Public Network Gateway Daemon.\\\ + It performs as a [captive/open/active] portal. When run on a gateway/router \\\ + on a network, all web requests are redirected until the client either logs \\\ + in or clicks "I Accept" to an AUP. The gateway daemon then changes the \\\ + firewall rules on the gateway to pass traffic for that client (based on IP \\\ + address and MAC address). URL:=http://nocat.net endef @@ -41,8 +42,10 @@ define Package/nocatsplash/conffiles endef define Build/Configure -$(call Build/Configure/Default, --with-firewall=iptables \ - --with-glib-prefix="$(STAGING_DIR)/usr") + $(call Build/Configure/Default, \ + --with-firewall=iptables \ + --with-glib-prefix="$(STAGING_DIR)/usr" \ + ) endef define Build/Compile @@ -53,7 +56,7 @@ define Build/Compile endef define Package/nocatsplash/install - mkdir -p $(1) + install -d -m0755 $(1) $(CP) $(PKG_INSTALL_DIR)/* $(1)/ endef diff --git a/net/ntpclient/Makefile b/net/ntpclient/Makefile index b9ad6dbcee..7bbec8aaab 100644 --- a/net/ntpclient/Makefile +++ b/net/ntpclient/Makefile @@ -11,10 +11,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ntpclient PKG_VERSION:=2003_194 PKG_RELEASE:=2 -PKG_MD5SUM:=94e84d5c6023c5e1f3890b28d0a08c92 -PKG_SOURCE_URL:=http://doolittle.faludi.com/ntpclient PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=http://doolittle.faludi.com/ntpclient +PKG_MD5SUM:=94e84d5c6023c5e1f3890b28d0a08c92 PKG_CAT:=zcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) @@ -25,12 +25,13 @@ define Package/ntpclient SECTION:=net CATEGORY:=Network TITLE:=NTP (Network Time Protocol) client - DESCRIPTION:=NTP client for setting system time from NTP servers. + DESCRIPTION:=\ + NTP client for setting system time from NTP servers. URL:=http://doolittle.faludi.com/ntpclient endef define Build/Compile - $(call Build/Compile/Default,all adjtimex) + $(call Build/Compile/Default,all adjtimex) endef define Package/ntpclient/install diff --git a/net/oidentd/Makefile b/net/oidentd/Makefile index b951305ce1..45bf9b4e6e 100644 --- a/net/oidentd/Makefile +++ b/net/oidentd/Makefile @@ -4,50 +4,43 @@ # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # -# $Id:$ +# $Id$ include $(TOPDIR)/rules.mk PKG_NAME:=oidentd PKG_VERSION:=2.0.8 PKG_RELEASE:=1 -PKG_MD5SUM:=c3d9a56255819ef8904b867284386911 -PKG_SOURCE_URL:=@SF/ojnk PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=@SF/ojnk +PKG_MD5SUM:=c3d9a56255819ef8904b867284386911 PKG_CAT:=zcat - PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) -PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install include $(INCLUDE_DIR)/package.mk define Package/oidentd SECTION:=net CATEGORY:=Network - DEPENDS:= TITLE:=Identd server - DESCRIPTION:=A nat aware identd server that will correctly forwared requests to clients + DESCRIPTION:=\ + A nat aware identd server that will correctly forwared requests to clients. + URL:=http://dev.ojnk.net/ endef - -define Build/Configure - $(call Build/Configure/Default,--includedir=$(PKG_BUILD_DIR)/) -endef +# uses GNU configure define Build/Compile - $(call Build/Compile/Default,all) + $(call Build/Compile/Default,all) endef define Package/oidentd/install - install -m0755 -d $(1)/usr/sbin - install -m0755 -d $(1)/etc/init.d + install -d -m0755 $(1)/usr/sbin $(CP) $(PKG_BUILD_DIR)/src/$(PKG_NAME) $(1)/usr/sbin/ + install -d -m0755 $(1)/etc/init.d $(CP) ./files/oidentd.init $(1)/etc/init.d/oidentd endef $(eval $(call BuildPackage,oidentd)) - - - diff --git a/net/openntpd/Makefile b/net/openntpd/Makefile index 0f859b3914..3fe16f45f1 100644 --- a/net/openntpd/Makefile +++ b/net/openntpd/Makefile @@ -11,14 +11,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=openntpd PKG_VERSION:=3.7p1 PKG_RELEASE:=1 -PKG_MD5SUM:=10ed8eefd760e5819efcf3277b118f47 -# space separated list or special @SF for sourceforge projects +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=ftp://ftp.openbsd.org/pub/OpenBSD/OpenNTPD/ \ ftp://ftp.de.openbsd.org/pub/unix/OpenBSD/OpenNTPD/ \ ftp://ftp.fr.openbsd.org/pub/OpenBSD/OpenNTPD/ \ ftp://ftp.sunet.se/pub/OpenBSD/OpenNTPD/ -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_MD5SUM:=10ed8eefd760e5819efcf3277b118f47 PKG_CAT:=zcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) @@ -28,8 +27,9 @@ include $(INCLUDE_DIR)/package.mk define Package/openntpd SECTION:=net CATEGORY:=Network - TITLE:=A free and easy to use NTP (Network Time Protocol) implementation - DESCRIPTION:=NTP server + TITLE:=NTP server + DESCRIPTION:=\ + A free and easy to use NTP (Network Time Protocol) implementation. URL:=http://www.openntpd.org/ endef @@ -75,24 +75,25 @@ grep -q '^ntp[[:space:]]*123/udp' $${IPKG_INSTROOT}/etc/services 2>/dev/null endef define Build/Configure -$(call Build/Configure/Default, --with-builtin-arc4random \ + $(call Build/Configure/Default, \ + --with-builtin-arc4random \ --with-privsep-user=ntp \ - --with-adjtimex) + --with-adjtimex \ + ) endef define Build/Compile $(MAKE) -C $(PKG_BUILD_DIR) \ - $(TARGET_CONFIGURE_OPTS) \ CFLAGS="$(TARGET_CFLAGS) -DUSE_ADJTIMEX" endef define Package/openntpd/install + install -d -m0755 $(1)/usr/sbin/ + install -m0755 $(PKG_BUILD_DIR)/ntpd $(1)/usr/sbin/ install -d -m0755 $(1)/etc install -m0644 ./files/ntpd.conf $(1)/etc/ install -d -m0755 $(1)/etc/init.d install -m0755 ./files/ntpd.init $(1)/etc/init.d/ntpd - install -d -m0755 $(1)/usr/sbin/ - install -m0755 $(PKG_BUILD_DIR)/ntpd $(1)/usr/sbin/ endef $(eval $(call BuildPackage,openntpd)) diff --git a/net/openvpn/Makefile b/net/openvpn/Makefile index 5d354ac1a8..05cedaf9c7 100644 --- a/net/openvpn/Makefile +++ b/net/openvpn/Makefile @@ -4,17 +4,17 @@ # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # -# $Id: $ +# $Id$ include $(TOPDIR)/rules.mk PKG_NAME:=openvpn PKG_VERSION:=2.0.9 PKG_RELEASE:=1 -PKG_MD5SUM:=60745008b90b7dbe25fe8337c550fec6 -PKG_SOURCE_URL:=http://openvpn.net/release @SF/openvpn PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=http://openvpn.net/release @SF/openvpn +PKG_MD5SUM:=60745008b90b7dbe25fe8337c550fec6 PKG_CAT:=zcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) @@ -22,15 +22,6 @@ PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install include $(INCLUDE_DIR)/package.mk -PKG_CONFIGURE_OPTIONS := --enable-shared \ - --disable-static \ - --disable-pthread \ - --disable-debug \ - --disable-plugins \ - --enable-management \ - --disable-socks \ - --enable-password-save \ - define Package/openvpn SECTION:=net CATEGORY:=Network @@ -39,23 +30,29 @@ define Package/openvpn DESCRIPTION:=\ Open source VPN solution using SSL URL:=http://openvpn.net - MENU:=1 endef define Package/openvpn-easy-rsa $(call Package/openvpn) DEPENDS:=openvpn +openssl-util TITLE:=Simple shell scripts to manage a Certificate Authority - MENU:=0 endef define Build/Configure -$(call Build/Configure/Default,$(PKG_CONFIGURE_OPTIONS)) + $(call Build/Configure/Default, \ + --disable-pthread \ + --disable-debug \ + --disable-plugins \ + --enable-management \ + --disable-socks \ + --enable-password-save \ + ) endef define Build/Compile -$(call Build/Compile/Default,DESTDIR="$(PKG_INSTALL_DIR)" \ - install) + $(MAKE) -C $(PKG_BUILD_DIR) \ + DESTDIR="$(PKG_INSTALL_DIR)" \ + all install endef define Package/openvpn/install @@ -64,8 +61,9 @@ define Package/openvpn/install endef define Package/openvpn-easy-rsa/install - install -d -m0755 $(1)/usr/sbin $(1)/etc/easy-rsa - $(CP) $(PKG_BUILD_DIR)/easy-rsa/2.0/{build-*,clean-all,inherit-inter,list-crl,pkitool,revoke-full,sign-req} $(1)/usr/sbin + install -d -m0755 $(1)/usr/sbin + $(CP) $(PKG_BUILD_DIR)/easy-rsa/2.0/{build-*,clean-all,inherit-inter,list-crl,pkitool,revoke-full,sign-req} $(1)/usr/sbin/ + install -d -m0755 $(1)/etc/easy-rsa install -m 0644 $(PKG_BUILD_DIR)/easy-rsa/2.0/openssl.cnf $(1)/etc/easy-rsa/openssl.cnf install -m 0644 $(PKG_BUILD_DIR)/easy-rsa/2.0/vars $(1)/etc/easy-rsa/vars endef diff --git a/net/p910nd/Makefile b/net/p910nd/Makefile index a023d6d0ce..c1bce001c4 100644 --- a/net/p910nd/Makefile +++ b/net/p910nd/Makefile @@ -12,13 +12,12 @@ PKG_NAME:=p910nd PKG_VERSION:=0.7 PKG_RELEASE:=2 -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://www.etherboot.org/p910nd PKG_MD5SUM:=7bf752532d26c9106f8039db95df3a6b PKG_CAT:=bzcat -PKG_INIT_PRIO=70 +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) include $(INCLUDE_DIR)/package.mk @@ -26,14 +25,14 @@ define Package/p910nd SECTION:=net CATEGORY:=Network TITLE:=A small non-spooling printer server - DESCRIPTION:=A small non-spooling printer server.\\\ - p910nd is a small daemon that copies any data received on \\\ - the port it is listening on to the corresponding printer \\\ - port. It is primarily intended for diskless Linux hosts \\\ - running as printer drivers but there is no reason why it \\\ - could not be used on diskful hosts. Port 9100 is copied \\\ - to /dev/lp0, 9101 to /dev/lp1 and 9102 to /dev/lp2. The \\\ - default is port 9100 to /dev/lp0. + DESCRIPTION:=\ + p910nd is a small daemon that copies any data received on \\\ + the port it is listening on to the corresponding printer \\\ + port. It is primarily intended for diskless Linux hosts \\\ + running as printer drivers but there is no reason why it \\\ + could not be used on diskful hosts. Port 9100 is copied \\\ + to /dev/lp0, 9101 to /dev/lp1 and 9102 to /dev/lp2. The \\\ + default is port 9100 to /dev/lp0. URL:=http://www.etherboot.org/p910nd/ endef @@ -51,12 +50,12 @@ define Build/Compile endef define Package/p910nd/install + install -d -m0755 $(1)/usr/sbin + install -m0755 $(PKG_BUILD_DIR)/p910nd $(1)/usr/sbin/ install -d -m0755 $(1)/etc/default install -m0644 ./files/p910nd.default $(1)/etc/default/p910nd install -d -m0755 $(1)/etc/init.d install -m0755 ./files/p910nd.init $(1)/etc/init.d/p910nd - install -d -m0755 $(1)/usr/sbin - install -m0755 $(PKG_BUILD_DIR)/p910nd $(1)/usr/sbin/ endef $(eval $(call BuildPackage,p910nd)) diff --git a/net/parprouted/Makefile b/net/parprouted/Makefile index d9456de56c..7c39707f9b 100644 --- a/net/parprouted/Makefile +++ b/net/parprouted/Makefile @@ -11,10 +11,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:=parprouted PKG_VERSION:=0.63 PKG_RELEASE:=1 -PKG_MD5SUM:=12753098a22e82997d1941d6d2284750 -PKG_SOURCE_URL:=http://www.hazard.maks.net/parprouted/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=http://www.hazard.maks.net/parprouted/ +PKG_MD5SUM:=12753098a22e82997d1941d6d2284750 PKG_CAT:=zcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) @@ -25,7 +25,8 @@ define Package/parprouted SECTION:=net CATEGORY:=Network TITLE:=Proxy ARP daemon - DESCRIPTION:=parprouted is a daemon for transparent IP (Layer 3) proxy ARP bridging.\\\ + DESCRIPTION:=\ + parprouted is a daemon for transparent IP (Layer 3) proxy ARP bridging.\\\ This is useful for creation of transparent firewalls and bridging networks\\\ with different MAC protocols. Also, unlike standard bridging, proxy ARP\\\ bridging allows to bridge Ethernet networks behind wireless nodes without\\\ @@ -34,16 +35,20 @@ define Package/parprouted endef define Build/Compile - $(call Build/Compile/Default,CFLAGS="$(TARGET_CFLAGS)" LDFLAGS="" all) + $(call Build/Compile/Default, \ + CFLAGS="$(TARGET_CFLAGS)" \ + LDFLAGS="" \ + all \ + ) endef define Package/parprouted/install + install -d -m0755 $(1)/usr/sbin + install -m0755 $(PKG_BUILD_DIR)/parprouted $(1)/usr/sbin/ install -d -m0755 $(1)/etc/default install -m0755 ./files/parprouted.default $(1)/etc/default/parprouted install -d -m0755 $(1)/etc/init.d install -m0755 ./files/parprouted.init $(1)/etc/init.d/parprouted - install -d -m0755 $(1)/usr/sbin - install -m0755 $(PKG_BUILD_DIR)/parprouted $(1)/usr/sbin/ endef $(eval $(call BuildPackage,parprouted)) diff --git a/net/portmap/Makefile b/net/portmap/Makefile index 562ff291a8..cd6671d2e2 100644 --- a/net/portmap/Makefile +++ b/net/portmap/Makefile @@ -11,14 +11,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=portmap PKG_VERSION:=5beta PKG_RELEASE:=2 -PKG_MD5SUM:=781e16ed4487c4caa082c6fef09ead4f -PKG_SOURCE_URL:=ftp://ftp.porcupine.org/pub/security PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=ftp://ftp.porcupine.org/pub/security +PKG_MD5SUM:=781e16ed4487c4caa082c6fef09ead4f PKG_CAT:=zcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)_$(PKG_VERSION) -PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install include $(INCLUDE_DIR)/package.mk @@ -27,7 +26,6 @@ define Package/portmap CATEGORY:=Network DEPENDS:=+libwrap TITLE:=RPC Portmapper - DESCRIPTION:=The RPC Portmapper (used by the NFS Server) URL:=ftp://ftp.porcupine.org/pub/security endef @@ -40,10 +38,10 @@ define Build/Compile endef define Package/portmap/install - install -d -m0755 $(1)/etc/init.d - install -m0755 ./files/portmap.init $(1)/etc/init.d/portmap install -d -m0755 $(1)/usr/sbin install -m0755 $(PKG_BUILD_DIR)/portmap $(1)/usr/sbin/ + install -d -m0755 $(1)/etc/init.d + install -m0755 ./files/portmap.init $(1)/etc/init.d/portmap endef $(eval $(call BuildPackage,portmap)) diff --git a/net/portsentry/Makefile b/net/portsentry/Makefile index 7bcd7faab0..66ac1ff8be 100644 --- a/net/portsentry/Makefile +++ b/net/portsentry/Makefile @@ -11,10 +11,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:=portsentry PKG_VERSION:=1.2 PKG_RELEASE:=1 -PKG_MD5SUM:=3ebd3618ba9abfea2525e236bd44cebd -PKG_SOURCE_URL:=@SF/sentrytools PKG_SOURCE:=$(PKG_NAME)-1.2.tar.gz +PKG_SOURCE_URL:=@SF/sentrytools +PKG_MD5SUM:=3ebd3618ba9abfea2525e236bd44cebd PKG_CAT:=zcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)_beta @@ -25,7 +25,6 @@ define Package/portsentry SECTION:=net CATEGORY:=Network TITLE:=Portscan protection utility - DESCRIPTION:=Software for protection against port scans URL:=http://sourceforge.net/projects/sentrytools endef @@ -33,15 +32,18 @@ define Package/portsentry/conffiles /etc/portsentry.conf endef +define Build/Configure +endef + define Build/Compile $(MAKE) -C $(PKG_BUILD_DIR) linux endef define Package/portsentry/install - mkdir -p $(1)/usr/bin - mkdir -p $(1)/etc - $(CP) $(PKG_BUILD_DIR)/$(PKG_NAME).conf $(1)/etc/ - $(CP) $(PKG_BUILD_DIR)/$(PKG_NAME) $(1)/usr/bin/ + install -d -m0755 $(1)/etc + install -m0644 $(PKG_BUILD_DIR)/$(PKG_NAME).conf $(1)/etc/ + install -d -m0755 $(1)/usr/bin + install -m0755 $(PKG_BUILD_DIR)/$(PKG_NAME) $(1)/usr/bin/ endef $(eval $(call BuildPackage,portsentry)) diff --git a/net/pptpd/Makefile b/net/pptpd/Makefile index cf1a175200..dc57921755 100644 --- a/net/pptpd/Makefile +++ b/net/pptpd/Makefile @@ -11,10 +11,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:=pptpd PKG_VERSION:=1.3.0 PKG_RELEASE:=1 -PKG_MD5SUM:=75d494e881f7027f4e60b114163f6b67 -PKG_SOURCE_URL:=@SF/poptop PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=@SF/poptop +PKG_MD5SUM:=75d494e881f7027f4e60b114163f6b67 PKG_CAT:=zcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) @@ -31,7 +31,9 @@ define Package/pptpd endef define Build/Configure - $(call Build/Configure/Default, --with-bcrelay) + $(call Build/Configure/Default, \ + --with-bcrelay \ + ) endef define Build/Compile diff --git a/net/psybnc/Makefile b/net/psybnc/Makefile index 4a617a4ecb..761387f6eb 100644 --- a/net/psybnc/Makefile +++ b/net/psybnc/Makefile @@ -11,10 +11,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:=psybnc PKG_VERSION:=2.3.2-7 PKG_RELEASE:=1 -PKG_MD5SUM:=4b893a92f914813450e0921b2894ad6c -PKG_SOURCE_URL:=http://www.psybnc.info/download/beta/ PKG_SOURCE:=psyBNC-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=http://www.psybnc.info/download/beta/ +PKG_MD5SUM:=4b893a92f914813450e0921b2894ad6c PKG_CAT:=zcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) @@ -26,30 +26,32 @@ define Package/psybnc CATEGORY:=Network DEPENDS:= TITLE:=An IRC-Bouncer with many features - DESCRIPTION:=psyBNC is an easy-to-use, multi-user, permanent\\\ - IRC-Bouncer with many features. Some of its features\\\ - vhost- and relay support to connected bouncers and an\\\ - extensive online help system. Many other helpful\\\ - functions are included.\\\ + DESCRIPTION:=\ + psyBNC is an easy-to-use, multi-user, permanent \\\ + IRC-Bouncer with many features. Some of its features \\\ + vhost- and relay support to connected bouncers and an \\\ + extensive online help system. Many other helpful \\\ + functions are included. URL:=http://www.psybnc.info/ endef define Build/Compile - $(call Build/Compile/Default, \ - CFLAGS="$(TARGET_CFLAGS)" \ - HOSTCC="$(HOSTCC)" \ - all \ - ) + $(call Build/Compile/Default, \ + CFLAGS="$(TARGET_CFLAGS)" \ + HOSTCC="$(HOSTCC)" \ + all \ + ) endef define Package/psybnc/install - install -d -m0755 $(1)/usr/share/psybnc/lang/ - install -d -m0755 $(1)/usr/share/psybnc/log/ - install -d -m0755 $(1)/usr/sbin/ + install -d -m0755 $(1)/usr/sbin + install -m0755 $(PKG_BUILD_DIR)/psybnc.sh $(1)/usr/sbin/psybnc + install -d -m0755 $(1)/usr/share/psybnc install -m0755 $(PKG_BUILD_DIR)/psybnc $(1)/usr/share/psybnc/ install -m0600 $(PKG_BUILD_DIR)/psybnc.conf $(1)/usr/share/psybnc/ + install -d -m0755 $(1)/usr/share/psybnc/lang install -m0644 $(PKG_BUILD_DIR)/lang/english.lng $(1)/usr/share/psybnc/lang/ - install -m0755 $(PKG_BUILD_DIR)/psybnc.sh $(1)/usr/sbin/psybnc + ln -sf /tmp $(1)/usr/share/psybnc/log endef $(eval $(call BuildPackage,psybnc)) diff --git a/net/ptunnel/Makefile b/net/ptunnel/Makefile index 2ce40709c9..3c5e9cce49 100644 --- a/net/ptunnel/Makefile +++ b/net/ptunnel/Makefile @@ -11,10 +11,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ptunnel PKG_VERSION:=0.61 PKG_RELEASE:=1 -PKG_MD5SUM:=b45f73875f2af48f101816672f83a5fe -PKG_SOURCE_URL:=http://www.cti.ecp.fr/~beauxir5/ptunnel/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=http://www.cti.ecp.fr/~beauxir5/ptunnel/ +PKG_MD5SUM:=b45f73875f2af48f101816672f83a5fe PKG_CAT:=zcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) @@ -27,32 +27,20 @@ define Package/ptunnel CATEGORY:=Network DEPENDS:=+libpthread +libpcap TITLE:=Tunnel TCP connections over ICMP packets - DESCRIPTION:=ptunnel is an application that allows you to reliably tunnel TCP connections to\\\ - a remote host using ICMP echo request and reply packets, commonly known as ping\\\ - requests and replies. It acts as a proxy and can handle sockets and secured\\\ - identification.\\\ + DESCRIPTION:=\ + ptunnel is an application that allows you to reliably tunnel TCP connections to \\\ + a remote host using ICMP echo request and reply packets, commonly known as ping \\\ + requests and replies. It acts as a proxy and can handle sockets and secured \\\ + identification. URL:=http://www.cs.uit.no/~daniels/PingTunnel/ endef -define Build/Configure - $(call Build/Configure/Default,--enable-shared \ - --disable-static \ - --with-gnu-ld, \ - $(TARGET_CONFIGURE_OPTS) \ - BUILD_CC="$(TARGET_CC)" \ - HOSTCC="$(HOSTCC)" \ - CFLAGS="$(TARGET_CFLAGS)" \ - CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \ - LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \ - td_cv_buggygetaddrinfo="no" \ - ) -endef +# uses GNU configure define Build/Compile - $(call Build/Compile/Default, \ + $(MAKE) -C $(PKG_BUILD_DIR) \ DESTDIR="$(PKG_INSTALL_DIR)" \ - all install \ - ) + all install endef define Package/ptunnel/install diff --git a/net/raddump/Makefile b/net/raddump/Makefile index 7ccb43c125..2a9973fdb3 100644 --- a/net/raddump/Makefile +++ b/net/raddump/Makefile @@ -11,12 +11,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=raddump PKG_VERSION:=0.3.1 PKG_RELEASE:=1 -PKG_MD5SUM:=f8c29c67141ea78bb6ae8b97d5149480 -PKG_SOURCE_URL:=@SF/raddump + PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) +PKG_SOURCE_URL:=@SF/raddump +PKG_MD5SUM:=f8c29c67141ea78bb6ae8b97d5149480 PKG_CAT:=zcat +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install include $(INCLUDE_DIR)/package.mk @@ -26,24 +27,25 @@ define Package/raddump CATEGORY:=Network DEPENDS:=+libpcap +libopenssl TITLE:=raddump interprets captured RADIUS packets. - DESCRIPTION:=raddump interprets captured RADIUS packets to print a\\\ - timestamp, packet length, RADIUS packet type, source and\\\ - destination hosts and ports, and included attribute names and\\\ - values for each packet.\\\ + DESCRIPTION:=\ + raddump interprets captured RADIUS packets to print a \\\ + timestamp, packet length, RADIUS packet type, source and \\\ + destination hosts and ports, and included attribute names and \\\ + values for each packet. URL:=http://sourceforge.net/projects/raddump endef -define Build/Configure - $(call Build/Configure/Default) -endef +# uses GNU configure define Build/Compile - $(MAKE) DESTDIR=$(PKG_INSTALL_DIR) -C $(PKG_BUILD_DIR) install + $(MAKE) -C $(PKG_BUILD_DIR) \ + DESTDIR="$(PKG_INSTALL_DIR)" \ + all install endef define Package/raddump/install - mkdir -p $(1) - $(CP) $(PKG_INSTALL_DIR)/* $(1)/ + install -d -m0755 $(1)/usr/bin + $(CP) $(PKG_INSTALL_DIR)/usr/bin/raddump $(1)/usr/bin/ endef $(eval $(call BuildPackage,raddump)) diff --git a/net/reaim/Makefile b/net/reaim/Makefile index 3846871633..5bab88f676 100644 --- a/net/reaim/Makefile +++ b/net/reaim/Makefile @@ -11,10 +11,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:=reaim PKG_VERSION:=0.8 PKG_RELEASE:=1 -PKG_MD5SUM:=647d2ab72ec454f89294accfb3182c09 -PKG_SOURCE_URL:=@SF/reaim PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=@SF/reaim +PKG_MD5SUM:=647d2ab72ec454f89294accfb3182c09 PKG_CAT:=zcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) @@ -32,18 +32,18 @@ define Package/reaim endef define Build/Compile - $(call Build/Compile/Default, \ + $(call Build/Compile/Default, \ CFLAGS="$(TARGET_CFLAGS)" \ DESTDIR="$(PKG_INSTALL_DIR)" \ all install \ - ) + ) endef define Package/reaim/install - install -d -m0755 $(1)/etc/init.d - install -m0755 ./files/reaim.init $(1)/etc/init.d/reaim install -d -m0755 $(1)/usr/sbin $(CP) $(PKG_INSTALL_DIR)/usr/sbin/reaim $(1)/usr/sbin/ + install -d -m0755 $(1)/etc/init.d + install -m0755 ./files/reaim.init $(1)/etc/init.d/reaim endef $(eval $(call BuildPackage,reaim)) diff --git a/net/rp-l2tp/Makefile b/net/rp-l2tp/Makefile index 37ea89eb6c..d6ee87f2af 100644 --- a/net/rp-l2tp/Makefile +++ b/net/rp-l2tp/Makefile @@ -11,10 +11,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:=rp-l2tp PKG_VERSION:=0.4 PKG_RELEASE:=1 -PKG_MD5SUM:=0e45d11cb4fa6c56cce6b1d119733ed9 -PKG_SOURCE_URL:=@SF/rp-l2tp PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=@SF/rp-l2tp +PKG_MD5SUM:=0e45d11cb4fa6c56cce6b1d119733ed9 PKG_CAT:=zcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) @@ -22,41 +22,50 @@ PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install include $(INCLUDE_DIR)/package.mk -define Package/rp-l2tpd +define Package/rp-l2tpd/Default SECTION:=net CATEGORY:=Network - TITLE:=an L2TP (Layer 2 Tunneling Protocol) daemon - DESCRIPTION:=An L2TP (Layer 2 Tunneling Protocol) daemon. + TITLE:=Roaring Penguin L2TP + DESCRIPTION:=\ + Roaring Penguin L2TP (Layer 2 Tunneling Protocol) implementation. URL:=http://sourceforge.net/projects/rp-l2tp/ +endef + +define Package/rp-l2tpd + $(call Package/rp-l2tpd/Default) + TITLE+= daemon MENU:=1 endef define Package/rp-l2tpd-mod-cmd - SECTION:=net - CATEGORY:=Network + $(call Package/rp-l2tpd/Default) DEPENDS:=rp-l2tpd - TITLE:=a simple command handler for the L2TP daemon + TITLE:=Simple command handler for the RR L2TP daemon endef define Package/rp-l2tpd-mod-ppp - SECTION:=net - CATEGORY:=Network + $(call Package/rp-l2tpd/Default) DEPENDS:=rp-l2tpd - TITLE:=a PPP handler for the L2TP daeomon + TITLE:=PPP handler for the RR L2TP daeomon endef +# uses GNU configure + define Build/Compile - $(call Build/Compile/Default,DESTDIR="$(PKG_INSTALL_DIR)" all install) + $(MAKE) -C $(PKG_BUILD_DIR) \ + $(TARGET_CONFIGURE_OPTS) \ + DESTDIR="$(PKG_INSTALL_DIR)" \ + all install endef define Package/rp-l2tpd/install install -d -m0755 $(1)/etc $(CP) $(PKG_INSTALL_DIR)/etc/l2tp.conf.example $(1)/etc/l2tp.conf - install -d -m0755 $(1)/etc/init.d - install -m0755 ./files/rp-l2tpd.init $(1)/etc/init.d/rp-l2tpd install -d -m0755 $(1)/usr/lib/l2tp install -d -m0755 $(1)/usr/sbin $(CP) $(PKG_INSTALL_DIR)/usr/sbin/l2tpd $(1)/usr/sbin/ + install -d -m0755 $(1)/etc/init.d + install -m0755 ./files/rp-l2tpd.init $(1)/etc/init.d/rp-l2tpd endef define Package/rp-l2tpd-mod-cmd/install @@ -74,5 +83,3 @@ endef $(eval $(call BuildPackage,rp-l2tpd)) $(eval $(call BuildPackage,rp-l2tpd-mod-cmd)) $(eval $(call BuildPackage,rp-l2tpd-mod-ppp)) - - diff --git a/net/rp-pppoe/Makefile b/net/rp-pppoe/Makefile index 1a45af82f2..a2bebb8c02 100644 --- a/net/rp-pppoe/Makefile +++ b/net/rp-pppoe/Makefile @@ -11,10 +11,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:=rp-pppoe PKG_VERSION:=3.5 PKG_RELEASE:=1 -PKG_MD5SUM:=97972f8f8f6a3ab9b7070333a6a29c4b -PKG_SOURCE_URL:=http://roaringpenguin.com/penguin/pppoe/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=http://roaringpenguin.com/penguin/pppoe/ +PKG_MD5SUM:=97972f8f8f6a3ab9b7070333a6a29c4b PKG_CAT:=zcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) @@ -22,59 +22,36 @@ PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install include $(INCLUDE_DIR)/package.mk -define Package/rp-pppoe +define Package/rp-pppoe/Default SECTION:=net CATEGORY:=Network DEPENDS:=+ppp - SUBMENU:=Roaring Penguin PPPoE (PPP over Ethernet) implementation - TITLE:=Roaring Penguin PPPoE (PPP over Ethernet) implementation + TITLE:=PPPoE (PPP over Ethernet) + URL:=http://roaringpenguin.com/penguin/pppoe/ endef define Package/rp-pppoe-client - $(call Package/rp-pppoe) - TITLE:=PPPoE (PPP over Ethernet) client + $(call Package/rp-pppoe/Default) + TITLE+= client endef define Package/rp-pppoe-relay - $(call Package/rp-pppoe) - TITLE:=PPPoE (PPP over Ethernet) relay + $(call Package/rp-pppoe/Default) + TITLE+= relay endef define Package/rp-pppoe-server - $(call Package/rp-pppoe) - TITLE:=PPPoE (PPP over Ethernet) server + $(call Package/rp-pppoe/Default) + TITLE+= server endef define Package/rp-pppoe-sniff - $(call Package/rp-pppoe) - TITLE:=PPPoE (PPP over Ethernet) sniffer + $(call Package/rp-pppoe/Default) + TITLE+= sniffer endef define Build/Configure - (cd $(PKG_BUILD_DIR)/src ; rm -rf config.{cache,status}; \ - $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - ./configure \ - --target=$(GNU_TARGET_NAME) \ - --host=$(GNU_TARGET_NAME) \ - --build=$(GNU_HOST_NAME) \ - --program-prefix="" \ - --program-suffix="" \ - --prefix=/usr \ - --exec-prefix=/usr \ - --bindir=/usr/bin \ - --datadir=/usr/share \ - --includedir=/usr/include \ - --infodir=/usr/share/info \ - --libdir=/usr/lib \ - --libexecdir=/usr/lib \ - --localstatedir=/var \ - --mandir=/usr/share/man \ - --sbindir=/usr/sbin \ - --sysconfdir=/etc \ - $(DISABLE_LARGEFILE) \ - $(DISABLE_NLS) \ - ) + $(call Build/Configure/Default,,, src) endef define Build/Compile @@ -122,4 +99,3 @@ $(eval $(call BuildPackage,rp-pppoe-client)) $(eval $(call BuildPackage,rp-pppoe-relay)) $(eval $(call BuildPackage,rp-pppoe-server)) $(eval $(call BuildPackage,rp-pppoe-sniff)) - diff --git a/net/scanlogd/Makefile b/net/scanlogd/Makefile index 573ff668d3..1491857bd2 100644 --- a/net/scanlogd/Makefile +++ b/net/scanlogd/Makefile @@ -14,8 +14,8 @@ PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.openwall.com/scanlogd/ \ - ftp://ftp.wiretapped.net/pub/openwall/ \ - http://distro.ibiblio.org/pub/linux/distributions/openwall/ + ftp://ftp.wiretapped.net/pub/openwall/ \ + http://distro.ibiblio.org/pub/linux/distributions/openwall/ PKG_MD5SUM:=7b8187ea718ebe47f22805b921b909ab PKG_CAT:=zcat diff --git a/net/scdp/Makefile b/net/scdp/Makefile index 4e3cbff18c..edfce0cbc2 100644 --- a/net/scdp/Makefile +++ b/net/scdp/Makefile @@ -45,7 +45,7 @@ endef define Build/Compile $(MAKE) -C $(PKG_BUILD_DIR) \ - DESTDIR=$(PKG_INSTALL_DIR) \ + DESTDIR="$(PKG_INSTALL_DIR)" \ all install endef diff --git a/net/ser2net/Makefile b/net/ser2net/Makefile index 691272603a..c7e0013ff2 100644 --- a/net/ser2net/Makefile +++ b/net/ser2net/Makefile @@ -11,10 +11,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ser2net PKG_VERSION:=2.3 PKG_RELEASE:=1 -PKG_MD5SUM:=5f83a3e8aec18331cb61069dccdfba47 -PKG_SOURCE_URL:=@SF/ser2net/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=@SF/ser2net +PKG_MD5SUM:=5f83a3e8aec18331cb61069dccdfba47 PKG_CAT:=zcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) @@ -26,44 +26,31 @@ define Package/ser2net SECTION:=net CATEGORY:=Network TITLE:=Serial port TCP/IP redirector - DESCRIPTION:=This is ser2net, a program for allowing network connections to serial\\\ - ports. See the man page for information about using the program. Note\\\ - that ser2net supports RFC 2217 (remote control of serial port parameters),\\\ - but you must have a complient client.\\\ - URL:=http://sourceforge.net/projects/ser2net + DESCRIPTION:=\ + This is ser2net, a program for allowing network connections to serial \\\ + ports. See the man page for information about using the program. Note \\\ + that ser2net supports RFC 2217 (remote control of serial port parameters), \\\ + but you must have a complient client. + URL:=http://sourceforge.net/projects/ser2net/ endef define Package/ser2net/conffiles /etc/ser2net.conf endef -define Build/Configure - (cd $(PKG_BUILD_DIR); \ - $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - ./configure \ - --target=$(GNU_TARGET_NAME) \ - --host=$(GNU_TARGET_NAME) \ - --build=$(GNU_HOST_NAME) \ - --prefix=/usr \ - --sysconfdir=/etc \ - ); -endef +# uses GNU configure define Build/Compile - rm -rf $(PKG_INSTALL_DIR) - mkdir -p $(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) \ - $(TARGET_CONFIGURE_OPTS) \ - DESTDIR="$(PKG_INSTALL_DIR)" \ - all install + DESTDIR="$(PKG_INSTALL_DIR)" \ + all install endef define Package/ser2net/install install -d -m0755 $(1)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/ser2net $(1)/usr/sbin + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/ser2net $(1)/usr/sbin/ install -d -m0755 $(1)/etc - cp -fpR $(PKG_BUILD_DIR)/ser2net.conf $(1)/etc + $(CP) $(PKG_BUILD_DIR)/ser2net.conf $(1)/etc/ endef $(eval $(call BuildPackage,ser2net)) diff --git a/net/shat/Makefile b/net/shat/Makefile index ec7bdf4df8..2d1deb6ed3 100644 --- a/net/shat/Makefile +++ b/net/shat/Makefile @@ -11,10 +11,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:=shat PKG_VERSION:=0.9.7 PKG_RELEASE:=1 -PKG_MD5SUM:= da06846f35838b14d1513523dad84d24 -PKG_SOURCE_URL:=http://world.maxina.de/src/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=http://world.maxina.de/src/ +PKG_MD5SUM:=da06846f35838b14d1513523dad84d24 PKG_CAT:=zcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) @@ -26,7 +26,8 @@ define Package/shat SECTION:=net CATEGORY:=Network TITLE:=Source Hardware Address Translation - DESCRIPTION:=A tool which allows hosts with arbitrary IP configuration\\\ + DESCRIPTION:=\ + A tool which allows hosts with arbitrary IP configuration\\\ to connect to the internet over a SHAT gateway.\\\ URL:=http://www.teddy-net.com/cvs/Maxina/128gw/service/arpcatch/shat/ endef diff --git a/net/sipp/Makefile b/net/sipp/Makefile index ad0447009e..4a99c2265c 100644 --- a/net/sipp/Makefile +++ b/net/sipp/Makefile @@ -11,10 +11,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:=sipp PKG_VERSION:=1.0 PKG_RELEASE:=1 -PKG_MD5SUM:=8866e9af0d3bc29e91ebb6eab89a7f1f -PKG_SOURCE_URL:=@SF/sipp PKG_SOURCE:=$(PKG_NAME).$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=@SF/sipp +PKG_MD5SUM:=8866e9af0d3bc29e91ebb6eab89a7f1f PKG_CAT:=zcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) @@ -26,7 +26,8 @@ define Package/sipp CATEGORY:=Network DEPENDS:=+uclibcxx +libpthread +libncurses TITLE:=test tool / traffic generator for the SIP protocol - DESCRIPTION:=SIPp is a free Open Source test tool / traffic generator for the SIP protocol.\\\ + DESCRIPTION:=\ + SIPp is a free Open Source test tool / traffic generator for the SIP protocol.\\\ It includes a few basic SipStone user agent scenarios (UAC and UAS) and\\\ establishes and releases multiple calls with the INVITE and BYE methods.\\\ URL:=http://sipp.sourceforge.net @@ -46,8 +47,8 @@ define Build/Compile endef define Package/sipp/install - mkdir -p $(1)/usr/sbin - $(CP) $(PKG_BUILD_DIR)/$(PKG_NAME) $(1)/usr/sbin/ + install -d -m0755 $(1)/usr/sbin + install -m0755 $(PKG_BUILD_DIR)/$(PKG_NAME) $(1)/usr/sbin/ endef $(eval $(call BuildPackage,sipp)) diff --git a/net/siproxd/Makefile b/net/siproxd/Makefile index d717ff71a8..d016071b01 100644 --- a/net/siproxd/Makefile +++ b/net/siproxd/Makefile @@ -11,10 +11,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:=siproxd PKG_VERSION:=0.5.13 PKG_RELEASE:=1 -PKG_MD5SUM:=91a572f80dd5a9af5a0f7f207fd34478 -PKG_SOURCE_URL:=@SF/siproxd PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=@SF/siproxd +PKG_MD5SUM:=91a572f80dd5a9af5a0f7f207fd34478 PKG_CAT:=zcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) @@ -27,7 +27,6 @@ define Package/siproxd CATEGORY:=Network DEPENDS:=+libosip2 TITLE:=SIP (Session Initiation Protocol) proxy - DESCRIPTION:=A SIP (Session Initiation Protocol) proxy URL:=http://siproxd.sourceforge.net/ endef @@ -35,13 +34,9 @@ define Package/siproxd/conffiles /etc/siproxd.conf endef -define Build/Configure -$(call Build/Configure/Default,--enable-static --enable-shared) -endef +# uses GNU configure define Build/Compile - rm -rf $(PKG_INSTALL_DIR) - mkdir -p $(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) \ DESTDIR="$(PKG_INSTALL_DIR)" \ SUBDIRS="src scripts contrib" \ @@ -49,13 +44,13 @@ define Build/Compile endef define Package/siproxd/install - install -d -m0755 $(1)/etc - $(CP) $(PKG_BUILD_DIR)/doc/siproxd.conf.example $(1)/etc/siproxd.conf - $(CP) $(PKG_BUILD_DIR)/doc/siproxd_passwd.cfg $(1)/etc/ - install -d -m0755 $(1)/etc/init.d - install -m0755 files/siproxd.init $(1)/etc/init.d/siproxd install -d -m0755 $(1)/usr/sbin $(CP) $(PKG_INSTALL_DIR)/usr/sbin/siproxd $(1)/usr/sbin/ + install -d -m0755 $(1)/etc + install -m0644 $(PKG_BUILD_DIR)/doc/siproxd.conf.example $(1)/etc/siproxd.conf + install -m0600 $(PKG_BUILD_DIR)/doc/siproxd_passwd.cfg $(1)/etc/ + install -d -m0755 $(1)/etc/init.d + install -m0755 ./files/siproxd.init $(1)/etc/init.d/siproxd endef $(eval $(call BuildPackage,siproxd)) diff --git a/net/sipsak/Makefile b/net/sipsak/Makefile index e0704a36bd..d0563d639a 100644 --- a/net/sipsak/Makefile +++ b/net/sipsak/Makefile @@ -11,11 +11,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=sipsak PKG_VERSION:=0.9.6 PKG_RELEASE:=1 -PKG_MD5SUM:=c4eb8e282902e75f4f040f09ea9d99d5 +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://download.berlios.de/sipsak/ \ http://ftp.iptel.org/pub/sipsak/ -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_MD5SUM:=c4eb8e282902e75f4f040f09ea9d99d5 PKG_CAT:=zcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) @@ -28,19 +28,16 @@ define Package/sipsak CATEGORY:=Network DEPEDNDS:=+libopenssl TITLE:=SIP (Session Initiation Protocol) stress and diagnostics utility - DESCRIPTION:=A SIP (Session Initiation Protocol) stress and diagnostics utility URL:=http://www.sipsak.org/ endef define Build/Configure -$(call Build/Configure/Default,--enable-shared \ - --disable-static \ - --disable-gnutls,ac_cv_func_malloc_0_nonnull=yes) + $(call Build/Configure/Default, \ + --disable-gnutls \ + ) endef define Build/Compile - rm -rf $(PKG_INSTALL_DIR) - mkdir -p $(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) \ DESTDIR="$(PKG_INSTALL_DIR)" \ all install diff --git a/net/socat/Makefile b/net/socat/Makefile index 1cf8f93ccb..e55b12f2be 100644 --- a/net/socat/Makefile +++ b/net/socat/Makefile @@ -11,10 +11,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:=socat PKG_VERSION:=1.4.3.0 PKG_RELEASE:=1 -PKG_MD5SUM:=ce574e75c2fda4456e8efd4efb86ec5e -PKG_SOURCE_URL:=http://www.dest-unreach.org/socat/download/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE_URL:=http://www.dest-unreach.org/socat/download/ +PKG_MD5SUM:=ce574e75c2fda4456e8efd4efb86ec5e PKG_CAT:=bzcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-1.4 @@ -27,22 +27,29 @@ define Package/socat CATEGORY:=Network DEPENDS:=+libopenssl +libpthread TITLE:=A multipurpose relay (SOcket CAT) - DESCRIPTION:=SoCat (for SOcket CAT) establishes two bidirectional byte streams and\\\ + DESCRIPTION:=\ + SoCat (for SOcket CAT) establishes two bidirectional byte streams and \\\ transfers data between them.\\\ - Data channels may be files, pipes, devices (terminal or modem, etc.), or\\\ - sockets (Unix, IPv4, IPv6, raw, UDP, TCP, SSL). It provides forking,\\\ - logging and tracing, different modes for interprocess communication and\\\ - many more options.\\\ + Data channels may be files, pipes, devices (terminal or modem, etc.), or \\\ + sockets (Unix, IPv4, IPv6, raw, UDP, TCP, SSL). It provides forking, \\\ + logging and tracing, different modes for interprocess communication and \\\ + many more options. URL:=http://www.dest-unreach.org/socat/ endef define Build/Configure -$(call Build/Configure/Default,--disable-libwrap \ - --disable-readline, sc_cv_termios_ispeed="no") + $(call Build/Configure/Default, \ + --disable-libwrap \ + --disable-readline \ + , \ + sc_cv_termios_ispeed="no" \ + ) endef define Build/Compile -$(call Build/Compile/Default, DESTDIR="$(PKG_INSTALL_DIR)" all install) + $(MAKE) -C $(PKG_BUILD_DIR) \ + DESTDIR="$(PKG_INSTALL_DIR)" \ + all install endef define Package/socat/install diff --git a/net/squid/Makefile b/net/squid/Makefile index f762b71c6c..4939e1fb2c 100644 --- a/net/squid/Makefile +++ b/net/squid/Makefile @@ -5,7 +5,7 @@ # See /LICENSE for more information. # # $Id$ -# + include $(TOPDIR)/rules.mk PKG_NAME:=squid diff --git a/net/srelay/Makefile b/net/srelay/Makefile index 22c9c97b57..c680f7edc4 100644 --- a/net/srelay/Makefile +++ b/net/srelay/Makefile @@ -11,14 +11,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=srelay PKG_VERSION:=0.4.6 PKG_RELEASE:=1 -PKG_MD5SUM:=4a9f3298b38d8588f0ffde31b946a47f -PKG_SOURCE_URL:=@SF/socks-relay PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=@SF/socks-relay +PKG_MD5SUM:=4a9f3298b38d8588f0ffde31b946a47f PKG_CAT:=zcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) -PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install include $(INCLUDE_DIR)/package.mk @@ -26,7 +25,6 @@ define Package/srelay SECTION:=net CATEGORY:=Network TITLE:=A socks 4/5 proxy server - DESCRIPTION:=A socks 4/5 protocol proxy server URL:=http://www.c-wind.com/srelay/ endef @@ -35,15 +33,22 @@ define Package/srelay/conffiles endef define Build/Configure -$(call Build/Configure/Default,--disable-thread) + $(call Build/Configure/Default, \ + --disable-thread \ + ) +endef + +define Build/Compile + $(MAKE) -C $(PKG_BUILD_DIR) endef define Package/srelay/install - install -m0755 -d $(1)/usr/bin - install -m0755 -d $(1)/etc/init.d + install -d -m0755 $(1)/usr/bin install -m0755 $(PKG_BUILD_DIR)/srelay $(1)/usr/bin/ + install -d -m0755 $(1)/etc + install -m0644 files/srelay.conf $(1)/etc/ + install -d -m0755 $(1)/etc/init.d install -m0755 files/srelay.init $(1)/etc/init.d/srelay - install -m0644 files/srelay.conf $(1)/etc endef $(eval $(call BuildPackage,srelay)) diff --git a/net/ssltunnel/Makefile b/net/ssltunnel/Makefile index 6fb5017e62..952844e167 100644 --- a/net/ssltunnel/Makefile +++ b/net/ssltunnel/Makefile @@ -11,10 +11,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ssltunnel PKG_VERSION:=1.15 PKG_RELEASE:=1 -PKG_MD5SUM:=bfe529edb9b6c97bc03d213676b1f35d -PKG_SOURCE_URL:=http://www.hsc.fr/ressources/outils/ssltunnel/download PKG_SOURCE:=${PKG_NAME}-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=http://www.hsc.fr/ressources/outils/ssltunnel/download +PKG_MD5SUM:=bfe529edb9b6c97bc03d213676b1f35d PKG_CAT:=zcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) @@ -27,26 +27,29 @@ define Package/ssltunnel CATEGORY:=Network DEPENDS:=+ppp +libopenssl TITLE:=A PPP over SSL vpn tool - DESCRIPTION:=A PPP over SSL vpn tool URL:=http://www.hsc.fr/ressources/outils/ssltunnel/index.html endef define Build/Configure - $(call Build/Configure/Default,,BUILD_CC="$(TARGET_CC)" HOSTCC="$(HOSTCC)") + $(call Build/Configure/Default, \ + , \ + BUILD_CC="$(TARGET_CC)" \ + HOSTCC="$(HOSTCC)" \ + ) endef define Build/Compile -$(call Build/Compile/Default,CCOPT="$(TARGET_CFLAGS)" INCLS="-I. -I$(STAGING_DIR)/usr/include" \ + $(MAKE) -C $(PKG_BUILD_DIR) \ DESTDIR="$(PKG_INSTALL_DIR)" \ - all install) + all install endef define Package/ssltunnel/install - install -m0755 -d $(1)/usr/bin - install -m0755 -d $(1)/usr/sbin - install -m0755 -d $(1)/usr/lib + install -d -m0755 $(1)/usr/bin install -m0755 $(PKG_INSTALL_DIR)/usr/bin/pppclient $(1)/usr/bin/ + install -d -m0755 $(1)/usr/sbin install -m0755 $(PKG_INSTALL_DIR)/usr/sbin/pppwho $(1)/usr/sbin/ + install -d -m0755 $(1)/usr/lib install -m0755 $(PKG_INSTALL_DIR)/usr/lib/pppserver $(1)/usr/lib/ endef diff --git a/net/ssmtp/Makefile b/net/ssmtp/Makefile index 8215a548d7..c8e88cb39a 100644 --- a/net/ssmtp/Makefile +++ b/net/ssmtp/Makefile @@ -11,14 +11,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ssmtp PKG_VERSION:=2.61 PKG_RELEASE:=1 -PKG_MD5SUM:=957e6fff08625fe34f4fc33d0925bbc9 -PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/main/s/ssmtp/ PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz +PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/main/s/ssmtp/ +PKG_MD5SUM:=957e6fff08625fe34f4fc33d0925bbc9 PKG_CAT:=zcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) -PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install include $(INCLUDE_DIR)/package.mk @@ -26,25 +25,28 @@ define Package/ssmtp SECTION:=net CATEGORY:=Network TITLE:=A minimal and secure mail sender - DESCRIPTION:=A secure, effective and simple way of getting mail off a system to your\\\ - mail hub. It contains no suid-binaries or other dangerous things - no\\\ + DESCRIPTION:=\ + A secure, effective and simple way of getting mail off a system to your \\\ + mail hub. It contains no suid-binaries or other dangerous things - no \\\ mail spool to poke around in, and no daemons running in the background.\\\ - mail is simply forwarded to the configured mailhost. Extremely easy\\\ + mail is simply forwarded to the configured mailhost. Extremely easy \\\ configuration. URL:=http://packages.debian.org/stable/mail/ssmtp endef +# uses GNU configure define Build/Compile -$(call Build/Compile/Default,all) + $(MAKE) -C $(PKG_BUILD_DIR) \ + all endef define Package/ssmtp/install - install -m0755 -d $(1)/etc/ssmtp + install -d -m0755 $(1)/etc/ssmtp install -m0644 $(PKG_BUILD_DIR)/ssmtp.conf $(1)/etc/ssmtp/ install -m0644 $(PKG_BUILD_DIR)/revaliases $(1)/etc/ssmtp/ - install -m0755 -d $(1)/usr/sbin - $(CP) $(PKG_BUILD_DIR)/ssmtp $(1)/usr/sbin/ + install -d -m0755 $(1)/usr/sbin + install -m0755 $(PKG_BUILD_DIR)/ssmtp $(1)/usr/sbin/ ln -sf ssmtp $(1)/usr/sbin/sendmail endef diff --git a/net/tcp_wrappers/Makefile b/net/tcp_wrappers/Makefile index 5ee7de7583..e5b0d5a8da 100644 --- a/net/tcp_wrappers/Makefile +++ b/net/tcp_wrappers/Makefile @@ -11,10 +11,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:=tcp_wrappers PKG_VERSION:=7.6 PKG_RELEASE:=1 -PKG_MD5SUM:=e6fa25f71226d090f34de3f6b122fb5a -PKG_SOURCE_URL:=ftp://ftp.porcupine.org/pub/security PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=ftp://ftp.porcupine.org/pub/security +PKG_MD5SUM:=e6fa25f71226d090f34de3f6b122fb5a PKG_CAT:=zcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)_$(PKG_VERSION) @@ -25,7 +25,6 @@ define Package/libwrap SECTION:=net CATEGORY:=Network TITLE:=Security wrapper library for TCP services - DESCRIPTION:=Security wrapper library for TCP services. URL:=ftp://ftp.porcupine.org/pub/security/index.html endef @@ -46,11 +45,6 @@ define Build/Compile tidy all endef -define Package/libwrap/install - install -d -m0755 $(1)/usr/lib - $(CP) $(PKG_BUILD_DIR)/shared/libwrap.so.* $(1)/usr/lib/ -endef - define Build/InstallDev mkdir -p $(STAGING_DIR)/usr/include $(CP) $(PKG_BUILD_DIR)/tcpd.h $(STAGING_DIR)/usr/include/ @@ -61,8 +55,13 @@ endef define Build/UninstallDev rm -rf \ - $(STAGING_DIR)/usr/include/tcpd.h \ - $(STAGING_DIR)/usr/lib/libwrap.{a,so*} + $(STAGING_DIR)/usr/include/tcpd.h \ + $(STAGING_DIR)/usr/lib/libwrap.{a,so*} endef +define Package/libwrap/install + install -d -m0755 $(1)/usr/lib + $(CP) $(PKG_BUILD_DIR)/shared/libwrap.so.* $(1)/usr/lib/ +endef + $(eval $(call BuildPackage,libwrap)) diff --git a/net/tinc/Makefile b/net/tinc/Makefile index bb256cb15d..0d29ca420a 100644 --- a/net/tinc/Makefile +++ b/net/tinc/Makefile @@ -11,12 +11,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=tinc PKG_VERSION:=1.0.4 PKG_RELEASE:=1 -PKG_MD5SUM:=63887373dd763f8d90cecc5a3616c363 +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.tinc-vpn.org/packages \ http://ftp.yi.se/pub/tinc/ \ http://www.mirrors.wiretapped.net/security/network-security/tinc/ -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_MD5SUM:=63887373dd763f8d90cecc5a3616c363 PKG_CAT:=zcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) @@ -29,22 +29,21 @@ define Package/tinc CATEGORY:=Network DEPENDS:=+liblzo +libopenssl +zlib TITLE:=VPN tunneling daemon - DESCRIPTION:=A VPN tunneling daemon URL:=http://www.tinc-vpn.org/ endef define Build/Configure -$(call Build/Configure/Default,--with-kernel=$(LINUX_DIR) \ - --with-zlib=$(STAGING_DIR)/usr/ \ - --with-lzo-include=$(STAGING_DIR)/usr/include/lzo \ -) + $(call Build/Configure/Default, \ + --with-kernel="$(LINUX_DIR)" \ + --with-zlib="$(STAGING_DIR)/usr" \ + --with-lzo-include="$(STAGING_DIR)/usr/include/lzo" \ + ) endef define Build/Compile -$(call Build/Compile/Default,CC="$(TARGET_CC)" \ - CFLAGS="$(TARGET_CFLAGS)" \ + $(MAKE) -C $(PKG_BUILD_DIR) \ DESTDIR="$(PKG_INSTALL_DIR)" \ - all install) + all install endef define Package/tinc/install diff --git a/net/tinyproxy/Makefile b/net/tinyproxy/Makefile index 11938b7388..ec798dfd12 100644 --- a/net/tinyproxy/Makefile +++ b/net/tinyproxy/Makefile @@ -4,7 +4,7 @@ # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # -# $Id: $ +# $Id$ include $(TOPDIR)/rules.mk @@ -26,32 +26,35 @@ define Package/tinyproxy SECTION:=net CATEGORY:=Network TITLE:=Tinyproxy is a lightweight HTTP and HTTPS proxy. - DESCRIPTION:=\ - Tinyproxy is a lightweight HTTP and HTTPS proxy.\ - URL:=http://tinyproxy.sourceforge.net + URL:=http://tinyproxy.sourceforge.net/ +endef + +define Package/tinyproxy/conffiles +/etc/tinyproxy/tinyproxy.conf endef define Build/Configure -$(call Build/Configure/Default,\ - --disable-static \ - --enable-transparent-proxy \ -) + $(call Build/Configure/Default,\ + --enable-filter \ + --enable-transparent-proxy \ + ) endef define Build/Compile -$(call Build/Compile/Default,DESTDIR="$(PKG_INSTALL_DIR)" install) + $(MAKE) -C $(PKG_BUILD_DIR) \ + DESTDIR="$(PKG_INSTALL_DIR)" \ + all install endef define Package/tinyproxy/install - install -d -m0755 $(1)/usr/sbin \ - $(1)/etc/tinyproxy \ - $(1)/etc/init.d \ - $(1)/var/log \ - $(1)/usr/share + install -d -m0755 $(1)/usr/sbin $(CP) $(PKG_INSTALL_DIR)/usr/sbin/tinyproxy $(1)/usr/sbin/ - $(CP) $(PKG_INSTALL_DIR)/usr/share/tinyproxy $(1)/usr/share/ - $(CP) $(PKG_INSTALL_DIR)/etc/tinyproxy $(1)/etc/ - $(CP) files/tinyproxy.init $(1)/etc/init.d/tinyproxy + install -d -m0755 $(1)/usr/share/tinyproxy + $(CP) $(PKG_INSTALL_DIR)/usr/share/tinyproxy/*.html $(1)/usr/share/tinyproxy/ + install -d -m0755 $(1)/etc/tinyproxy + $(CP) $(PKG_INSTALL_DIR)/etc/tinyproxy/tinyproxy.conf $(1)/etc/tinyproxy/ + install -d -m0755 $(1)/etc/init.d + $(CP) ./files/tinyproxy.init $(1)/etc/init.d/tinyproxy endef $(eval $(call BuildPackage,tinyproxy)) diff --git a/net/tor/Makefile b/net/tor/Makefile index 6cdac91f94..ff2b6344b7 100644 --- a/net/tor/Makefile +++ b/net/tor/Makefile @@ -11,12 +11,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=tor PKG_VERSION:=0.1.0.17 PKG_RELEASE:=1 -PKG_MD5SUM:=83c4afe29fa82473afcb2ec7e17771b9 +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://tor.eff.org/dist/ \ http://ftp.se.linux.org/crypto/tor/ \ http://tor.meulie.net/ -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_MD5SUM:=83c4afe29fa82473afcb2ec7e17771b9 PKG_CAT:=zcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) @@ -29,12 +29,13 @@ define Package/tor CATEGORY:=Network DEPENDS:=+libevent +libopenssl +libpthread +zlib TITLE:=An anonymous Internet communication system - DESCRIPTION:=Tor is a toolset for a wide range of organizations and people that want\\\ - to improve their safety and security on the Internet. Using Tor can\\\ - help you anonymize web browsing and publishing, instant messaging,\\\ - IRC, SSH, and more. Tor also provides a platform on which software\\\ - developers can build new applications with built-in anonymity, safety,\\\ - and privacy features.\\\ + DESCRIPTION:=\ + Tor is a toolset for a wide range of organizations and people that want \\\ + to improve their safety and security on the Internet. Using Tor can \\\ + help you anonymize web browsing and publishing, instant messaging, \\\ + IRC, SSH, and more. Tor also provides a platform on which software \\\ + developers can build new applications with built-in anonymity, safety, \\\ + and privacy features. URL:=http://tor.eff.org/ endef @@ -78,26 +79,29 @@ fi endef define Build/Configure -$(call Build/Configure/Default,--enable-shared \ - --disable-static,ac_cv_libevent_normal=yes \ + $(call Build/Configure/Default,\ + --with-gnu-ld \ + , \ + ac_cv_libevent_normal=yes \ ac_cv_openssldir="$(STAGING_DIR)/usr" \ tor_cv_null_is_zero=yes \ - tor_cv_unaligned_ok=yes) + tor_cv_unaligned_ok=yes \ + ) endef define Build/Compile -$(call Build/Compile/Default,DESTDIR="$(PKG_INSTALL_DIR)" \ - all install) + $(MAKE) -C $(PKG_BUILD_DIR) \ + DESTDIR="$(PKG_INSTALL_DIR)" \ + all install endef define Package/tor/install + install -d -m0755 $(1)/usr/sbin + $(CP) $(PKG_INSTALL_DIR)/usr/bin/tor $(1)/usr/sbin/ install -d -m0755 $(1)/etc/init.d install -m0755 ./files/tor.init $(1)/etc/init.d/tor install -d -m0755 $(1)/etc/tor install -m0644 ./files/torrc $(1)/etc/tor/torrc - install -d -m0755 $(1)/usr/sbin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/tor $(1)/usr/sbin/ endef $(eval $(call BuildPackage,tor)) - diff --git a/net/udp-broadcast-relay/Makefile b/net/udp-broadcast-relay/Makefile index fb917e0009..2a45d49232 100644 --- a/net/udp-broadcast-relay/Makefile +++ b/net/udp-broadcast-relay/Makefile @@ -11,10 +11,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:=udp-broadcast-relay PKG_VERSION:=0.3 PKG_RELEASE:=1 -PKG_MD5SUM:=a32f983b7063d6ac670e6b22be9b9d24 -PKG_SOURCE_URL:=http://www.joachim-breitner.de/udp-broadcast-relay/files/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=http://www.joachim-breitner.de/udp-broadcast-relay/files/ +PKG_MD5SUM:=a32f983b7063d6ac670e6b22be9b9d24 PKG_CAT:=zcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) @@ -25,14 +25,15 @@ define Package/udp-broadcast-relay SECTION:=net CATEGORY:=Network TITLE:=listens for packets on a specified UDP broadcast port - DESCRIPTION:=This program listens for packets on a specified UDP broadcast port.\\\ - When a packet is received, it sends that packet to all specified interfaces but\\\ - the one it came from as though it originated from the original sender.\\\ - The primary purpose of this is to allow games on machines on separated\\\ - local networks (Ethernet, WLAN) that use udp broadcasts to find each other to do so.\\\ - It also works on ppp links, so you can log in from windows boxes (e.g. using pptp)\\\ - and play LAN-based games together. Currently, you have to care about upcoming or\\\ - downgoing interfaces yourself.\\\ + DESCRIPTION:=\ + This program listens for packets on a specified UDP broadcast port.\\\ + When a packet is received, it sends that packet to all specified interfaces but \\\ + the one it came from as though it originated from the original sender.\\\ + The primary purpose of this is to allow games on machines on separated \\\ + local networks (Ethernet, WLAN) that use udp broadcasts to find each other to do so.\\\ + It also works on ppp links, so you can log in from windows boxes (e.g. using pptp) \\\ + and play LAN-based games together. Currently, you have to care about upcoming or \\\ + downgoing interfaces yourself. URL:=http://www.joachim-breitner.de/udp-broadcast-relay/ endef @@ -41,7 +42,7 @@ define Build/Compile endef define Package/udp-broadcast-relay/install - mkdir -p $(1)/usr/sbin + install -d -m0755 $(1)/usr/sbin $(CP) $(PKG_BUILD_DIR)/$(PKG_NAME) $(1)/usr/sbin/ endef diff --git a/net/uob-nomad/Makefile b/net/uob-nomad/Makefile index fc2db4a34e..8c58516395 100644 --- a/net/uob-nomad/Makefile +++ b/net/uob-nomad/Makefile @@ -3,7 +3,7 @@ # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # -# $Id: $ +# $Id$ include $(TOPDIR)/rules.mk diff --git a/net/vgp/Makefile b/net/vgp/Makefile index 43cdfa70dc..e75a169d85 100644 --- a/net/vgp/Makefile +++ b/net/vgp/Makefile @@ -11,12 +11,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=vgp PKG_VERSION:=0.2.1 PKG_RELEASE:=1 -PKG_MD5SUM:=b8c25b5dfcb944f78bbc584be9c230c7 -PKG_SOURCE_URL:=http://vgpd.freaknet.org/files/ + PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) +PKG_SOURCE_URL:=http://vgpd.freaknet.org/files/ +PKG_MD5SUM:=b8c25b5dfcb944f78bbc584be9c230c7 PKG_CAT:=zcat +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install include $(INCLUDE_DIR)/package.mk @@ -24,22 +25,27 @@ include $(INCLUDE_DIR)/package.mk define Package/vgp SECTION:=net CATEGORY:=Network - TITLE:=a daemon working like Cisco(c) HSRP - DESCRIPTION:=VGP (Virtual Gateway Protocol)is a very simple protocol able to\\\ - work in a way similar to Cisco(c) HSRP. It implements the idea\\\ - of Virtual Gateway to provide fault tollerance (and load\\\ - balancing) on your net. Each client on your net has as its\\\ - default gateway the virtual gateway and not the real router.\\\ + TITLE:=A daemon working like Cisco(c) HSRP + DESCRIPTION:=\ + VGP (Virtual Gateway Protocol)is a very simple protocol able to \\\ + work in a way similar to Cisco(c) HSRP. It implements the idea \\\ + of Virtual Gateway to provide fault tollerance (and load \\\ + balancing) on your net. Each client on your net has as its \\\ + default gateway set to the virtual gateway and not the real router. URL:=http://vgpd.freaknet.org/ endef +# uses GNU configure + define Build/Compile -$(call Build/Compile/Default,DESTDIR=$(PKG_INSTALL_DIR) install) + $(MAKE) -C $(PKG_BUILD_DIR) \ + DESTDIR="$(PKG_INSTALL_DIR)" \ + all install endef define Package/vgp/install - mkdir -p $(1) - $(CP) $(PKG_INSTALL_DIR)/* $(1)/ + install -d -m0755 $(1)/usr/bin + $(CP) $(PKG_INSTALL_DIR)/usr/bin/vgpd $(1)/usr/bin/ endef $(eval $(call BuildPackage,vgp)) diff --git a/net/vnc-reflector/Makefile b/net/vnc-reflector/Makefile index 2efc6d84b7..296e9b87d3 100644 --- a/net/vnc-reflector/Makefile +++ b/net/vnc-reflector/Makefile @@ -11,10 +11,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:=vnc-reflector PKG_VERSION:=1.2.4 PKG_RELEASE:=1 -PKG_MD5SUM:=c3f88bc62f228b335c25c07f9744ab0c -PKG_SOURCE_URL:=@SF/vnc-reflector PKG_SOURCE:=vnc_reflector-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=@SF/vnc-reflector +PKG_MD5SUM:=c3f88bc62f228b335c25c07f9744ab0c PKG_CAT:=zcat PKG_BUILD_DIR:=$(BUILD_DIR)/vnc_reflector @@ -26,18 +26,21 @@ define Package/vnc-reflector CATEGORY:=Network DEPENDS:=+libjpeg +zlib TITLE:=VNC proxy for multiple clients - DESCRIPTION:=VNC Reflector is a specialized VNC server which acts as\\\ - a proxy sitting between real VNC server (a host) and a\\\ - number of VNC clients. It was designed to work efficiently\\\ - with large number of clients.\\\ + DESCRIPTION:=\ + VNC Reflector is a specialized VNC server which acts as \\\ + a proxy sitting between real VNC server (a host) and a \\\ + number of VNC clients. It was designed to work efficiently \\\ + with large number of clients. URL:=http://sourceforge.net/projects/vnc-reflector endef define Build/Compile -$(call Build/Compile/Default,CC="$(TARGET_CC)" \ + $(call Build/Compile/Default, \ + CC="$(TARGET_CC)" \ OFLAGS="$(TARGET_CFLAGS)" \ - STAGING_DIR=$(STAGING_DIR) \ - default) + STAGING_DIR="$(STAGING_DIR)" \ + default \ + ) endef define Package/vnc-reflector/install diff --git a/net/vncrepeater/Makefile b/net/vncrepeater/Makefile index e221c1ad07..48bfbbf140 100644 --- a/net/vncrepeater/Makefile +++ b/net/vncrepeater/Makefile @@ -4,17 +4,17 @@ # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # -# $Id: $ +# $Id$ include $(TOPDIR)/rules.mk PKG_NAME:=vncrepeater PKG_VERSION:=0.12 PKG_RELEASE:=1 -PKG_MD5SUM:=5951740a8a103d7d9668558b3639c6c4 -PKG_SOURCE_URL:=http://www.rit.edu/~reh5586/openwrt/packages/vncrepeater/src PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=http://www.rit.edu/~reh5586/openwrt/packages/vncrepeater/src +PKG_MD5SUM:=5951740a8a103d7d9668558b3639c6c4 PKG_CAT:=zcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) @@ -27,12 +27,13 @@ define Package/vncrepeater CATEGORY:=Network DEPENDS:=+uclibcxx TITLE:=UltraVNC repeater for Linux - DESCRIPTION:=Viewer can be behind Nat router or directly connected to the internet\\\ - Instead of forwarding serveral ports, you only need to forward 1 port\\\ - If the PC that runs the Repeater has access to the local DNS server,\\\ - you can use your local DNS names instead of 10.10.10.12.\\\ - This could be handy when you have a dynamic DHCP server allocating\\\ - ip adresses for your PC.\\\ + DESCRIPTION:=\ + Viewer can be behind Nat router or directly connected to the internet \\\ + Instead of forwarding serveral ports, you only need to forward 1 port \\\ + If the PC that runs the Repeater has access to the local DNS server, \\\ + you can use your local DNS names instead of 10.10.10.12.\\\ + This could be handy when you have a dynamic DHCP server allocating \\\ + ip adresses for your PC. URL:=http://ultravnc.sourceforge.net/addons/repeater.html endef @@ -41,11 +42,11 @@ define Package/vncrepeater/ endef define Build/Compile -$(call Build/Compile/Default, \ + $(call Build/Compile/Default, \ CFLAGS="$(TARGET_CFLAGS) -fno-builtin -fno-rtti -nostdinc++" \ STAGING_DIR="$(STAGING_DIR)" \ - DESTDIR="$(PKG_INSTALL_DIR)" \ - repeater) + repeater \ + ) endef define Package/vncrepeater/install diff --git a/net/vpnc/Makefile b/net/vpnc/Makefile index 7976d9165f..b0bc21f76c 100644 --- a/net/vpnc/Makefile +++ b/net/vpnc/Makefile @@ -12,13 +12,12 @@ PKG_NAME:=vpnc PKG_VERSION:=0.3.3 PKG_RELEASE:=1 -PKG_MD5SUM:=e7518cff21326fe7eb9795b60c25ae6a -PKG_SOURCE_URL:=http://www.unix-ag.uni-kl.de/~massar/vpnc/ - PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) +PKG_SOURCE_URL:=http://www.unix-ag.uni-kl.de/~massar/vpnc/ +PKG_MD5SUM:=e7518cff21326fe7eb9795b60c25ae6a PKG_CAT:=zcat +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install include $(INCLUDE_DIR)/package.mk @@ -28,7 +27,6 @@ define Package/vpnc CATEGORY:=Network DEPENDS:=+libgpg-error +libgcrypt +kmod-tun TITLE:=VPN client for Cisco 3000 - DESCRIPTION:=Client for cisco3000 VPN Concentrator URL:=http://www.unix-ag.uni-kl.de/~massar/vpnc/ endef @@ -38,18 +36,24 @@ define Package/vpnc/conffiles endef define Build/Compile -$(call Build/Compile/Default,CC="$(TARGET_CC)" \ + $(call Build/Compile/Default, \ OFLAGS="$(TARGET_CFLAGS)" \ OS="Linux" \ STAGING_DIR="$(STAGING_DIR)" \ DESTDIR="$(PKG_INSTALL_DIR)" \ PREFIX=/usr \ - all install) + all install \ + ) endef define Package/vpnc/install - install -d -m0755 $(1) - $(CP) $(PKG_INSTALL_DIR)/* $(1)/ + install -d -m0755 $(1)/usr/sbin + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/vpnc \ + $(PKG_INSTALL_DIR)/usr/sbin/vpnc-disconnect \ + $(1)/usr/sbin/ + install -d -m0700 $(1)/etc/vpnc + install -m0600 $(PKG_INSTALL_DIR)/etc/vpnc/vpnc.conf $(1)/etc/vpnc/ + install -m0755 $(PKG_INSTALL_DIR)/etc/vpnc/vpnc-script $(1)/etc/vpnc/ endef $(eval $(call BuildPackage,vpnc)) diff --git a/net/vrrpd/Makefile b/net/vrrpd/Makefile index 854776bfb9..efada914bf 100644 --- a/net/vrrpd/Makefile +++ b/net/vrrpd/Makefile @@ -11,10 +11,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:=vrrpd PKG_VERSION:=1.0 PKG_RELEASE:=1 -PKG_MD5SUM:=6d5066ea1a6ced817376ca0f54765447 -PKG_SOURCE_URL:=@SF/vrrpd PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=@SF/vrrpd +PKG_MD5SUM:=6d5066ea1a6ced817376ca0f54765447 PKG_CAT:=zcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) @@ -25,11 +25,12 @@ define Package/vrrpd SECTION:=net CATEGORY:=Network TITLE:=Virtual Router Redundancy Protocol daemon - DESCRIPTION:=VRRPd is an implementation of Virtual Router Redundancy\\\ - Protocol as specified in rfc2338. VRRPd is interoperable with\\\ - other RFC-based VRRP implementations, including Cisco and\\\ - Juniper, and is included as a standard feature on ImageStream\\\ - routers.\\\ + DESCRIPTION:=\ + VRRPd is an implementation of Virtual Router Redundancy \\\ + Protocol as specified in rfc2338. VRRPd is interoperable with \\\ + other RFC-based VRRP implementations, including Cisco and \\\ + Juniper, and is included as a standard feature on ImageStream \\\ + routers. URL:=http://www.sourceforge.net/projects/vrrpd endef @@ -38,19 +39,20 @@ define Package/vrrpd/conffiles endef define Build/Compile -$(call Build/Compile/Default, \ + $(call Build/Compile/Default, \ DBG_OPT="" \ MAIN_OPT="$(TARGET_CFLAGS)" \ - vrrpd) + vrrpd \ + ) endef define Package/vrrpd/install + install -d -m0755 $(1)/usr/sbin + install -m0755 $(PKG_BUILD_DIR)/vrrpd $(1)/usr/sbin/ install -d -m0755 $(1)/etc/default install -m0644 ./files/vrrpd.default $(1)/etc/default/vrrpd install -d -m0755 $(1)/etc/init.d install -m0755 ./files/vrrpd.init $(1)/etc/init.d/vrrpd - install -d -m0755 $(1)/usr/sbin - install -m0755 $(PKG_BUILD_DIR)/vrrpd $(1)/usr/sbin/ endef $(eval $(call BuildPackage,vrrpd)) diff --git a/net/vsftpd/Makefile b/net/vsftpd/Makefile index 174f1eea95..1a39a65dd5 100644 --- a/net/vsftpd/Makefile +++ b/net/vsftpd/Makefile @@ -26,7 +26,6 @@ define Package/vsftpd SECTION:=net CATEGORY:=Network TITLE:=A fast and secure FTP server - DESCRIPTION:=A fast and secure FTP server. URL:=http://vsftpd.beasts.org/ endef @@ -48,12 +47,12 @@ define Build/Compile endef define Package/vsftpd/install + install -d -m0755 $(1)/usr/sbin + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/vsftpd $(1)/usr/sbin/ install -d -m0755 $(1)/etc install -m0644 ./files/vsftpd.conf $(1)/etc/vsftpd.conf install -d -m0755 $(1)/etc/init.d install -m0755 ./files/vsftpd.init $(1)/etc/init.d/vsftpd - install -d -m0755 $(1)/usr/sbin - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/vsftpd $(1)/usr/sbin/ endef $(eval $(call BuildPackage,vsftpd)) diff --git a/net/vtun/Makefile b/net/vtun/Makefile index 0f5c90a81a..8ba01531d1 100644 --- a/net/vtun/Makefile +++ b/net/vtun/Makefile @@ -11,10 +11,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:=vtun PKG_VERSION:=2.6 PKG_RELEASE:=1 -PKG_MD5SUM:=309534fd03c5d13a19c43916f61f4bbf -PKG_SOURCE_URL:=@SF/vtun PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=@SF/vtun +PKG_MD5SUM:=309534fd03c5d13a19c43916f61f4bbf PKG_CAT:=zcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) @@ -26,7 +26,6 @@ define Package/vtun CATEGORY:=Network DEPENDS:=+kmod-tun +liblzo +libopenssl +zlib TITLE:=VPN tunneling daemon - DESCRIPTION:=VPN tunneling daemon URL:=http://vtun.sourceforge.net endef @@ -35,20 +34,23 @@ define Package/vtun/conffiles endef define Build/Configure -$(call Build/Configure/Default,,LIBS="-L$(STAGING_DIR)/usr/lib" \ + $(call Build/Configure/Default, \ + , \ + LIBS="-L$(STAGING_DIR)/usr/lib" \ BLOWFISH_HDR_DIR="$(STAGING_DIR)/usr/include/openssl" \ LZO_HDR_DIR="$(STAGING_DIR)/usr/include/lzo" \ - SSL_HDR_DIR="$(STAGING_DIR)/usr/include/openssl") + SSL_HDR_DIR="$(STAGING_DIR)/usr/include/openssl" \ + ) endef define Build/Compile -$(call Build/Compile/Default,vtund) + $(call Build/Compile/Default,vtund) endef define Package/vtun/install - install -m0755 -d $(1)/etc + install -d -m0755 $(1)/etc install -m0600 $(PKG_BUILD_DIR)/vtund.conf $(1)/etc/ - install -m0755 -d $(1)/usr/sbin + install -d -m0755 $(1)/usr/sbin install -m0755 $(PKG_BUILD_DIR)/vtund $(1)/usr/sbin/ endef diff --git a/net/wdiag/Makefile b/net/wdiag/Makefile index ac90a15c72..3c8c984af8 100644 --- a/net/wdiag/Makefile +++ b/net/wdiag/Makefile @@ -4,7 +4,7 @@ # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # -# $Id: $ +# $Id$ include $(TOPDIR)/rules.mk diff --git a/net/wifidog/Makefile b/net/wifidog/Makefile index a538e8fa38..5105b142a0 100644 --- a/net/wifidog/Makefile +++ b/net/wifidog/Makefile @@ -11,10 +11,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:=wifidog PKG_VERSION:=1.1.3_beta2 PKG_RELEASE:=1 -PKG_MD5SUM:=ba1611c7eb959f9c6f93e12b97d70b82 -PKG_SOURCE_URL:= @SF/$(PKG_NAME) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:= @SF/$(PKG_NAME) +PKG_MD5SUM:=ba1611c7eb959f9c6f93e12b97d70b82 PKG_CAT:=zcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) @@ -27,10 +27,11 @@ define Package/wifidog CATEGORY:=Network DEPENDS:=+iptables-mod-extra TITLE:=A wireless captive portal solution - DESCRIPTION:=The Wifidog project is a complete and embeddable captive - portal solution for wireless community groups or individuals\\\ - who wish to open a free Hotspot while still preventing abuse\\\ - of their Internet connection.\\\ + DESCRIPTION:=\ + The Wifidog project is a complete and embeddable captive \\\ + portal solution for wireless community groups or individuals \\\ + who wish to open a free Hotspot while still preventing abuse \\\ + of their Internet connection. URL:=http://www.wifidog.org endef @@ -38,29 +39,25 @@ define Package/wifidog/conffiles /etc/wifidog.conf endef -define Build/Configure - $(call Build/Configure/Default) -endef +# uses GNU configure define Build/Compile - $(MAKE) -C $(PKG_BUILD_DIR) \ - $(TARGET_CONFIGURE_OPTS) - mkdir -p $(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) \ DESTDIR="$(PKG_INSTALL_DIR)" \ - install + all install endef define Package/wifidog/install - install -m0755 -d $(1)/etc/init.d - install -m0755 ./files/$(PKG_NAME).init $(1)/etc/init.d/wifidog - install -m0644 ./files/wifidog.conf $(1)/etc/ - install -m0755 -d $(1)/usr/bin - install -m0755 -d $(1)/usr/lib + install -d -m0755 $(1)/usr/bin install -m0755 $(PKG_BUILD_DIR)/scripts/init.d/wifidog $(1)/usr/bin/wifidog-init $(CP) $(PKG_INSTALL_DIR)/usr/bin/wifidog $(1)/usr/bin/ $(CP) $(PKG_INSTALL_DIR)/usr/bin/wdctl $(1)/usr/bin/ + install -d -m0755 $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libhttpd.so* $(1)/usr/lib/ + install -d -m0755 $(1)/etc + install -m0644 ./files/wifidog.conf $(1)/etc/ + install -d -m0755 $(1)/etc/init.d + install -m0755 ./files/$(PKG_NAME).init $(1)/etc/init.d/wifidog endef $(eval $(call BuildPackage,wifidog)) diff --git a/net/wknock/Makefile b/net/wknock/Makefile index 8fb54f8710..5614e49440 100644 --- a/net/wknock/Makefile +++ b/net/wknock/Makefile @@ -11,10 +11,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:=wknock PKG_VERSION:=1 PKG_RELEASE:=1 -PKG_MD5SUM:=6b7a1f3cbb0af88da02e5d30cefd8e7f -PKG_SOURCE_URL:=http://blackhat.com/presentations/bh-europe-05/BH_EU_05-Oudot/ PKG_SOURCE:=$(PKG_NAME).tar.gz +PKG_SOURCE_URL:=http://blackhat.com/presentations/bh-europe-05/BH_EU_05-Oudot/ +PKG_MD5SUM:=6b7a1f3cbb0af88da02e5d30cefd8e7f PKG_CAT:=zcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) diff --git a/net/wpa_supplicant/Makefile b/net/wpa_supplicant/Makefile index 785f1abdf0..b3fec0c120 100644 --- a/net/wpa_supplicant/Makefile +++ b/net/wpa_supplicant/Makefile @@ -4,7 +4,7 @@ # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # -# $Id: Makefile 4112 2006-07-02 20:33:21Z nico $ +# $Id$ include $(TOPDIR)/rules.mk diff --git a/net/wrt-radauth/Makefile b/net/wrt-radauth/Makefile index 89b5864358..fa45a11bc7 100644 --- a/net/wrt-radauth/Makefile +++ b/net/wrt-radauth/Makefile @@ -11,10 +11,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:=wrt-radauth PKG_VERSION:=1.0 PKG_RELEASE:=1 -PKG_MD5SUM:=f941e3139175dc6b87f6c89ba8848a07 -PKG_SOURCE_URL:=http://www.zerfleddert.de/wrt54g/ PKG_SOURCE:=$(PKG_NAME).tar.gz +PKG_SOURCE_URL:=http://www.zerfleddert.de/wrt54g/ +PKG_MD5SUM:=f941e3139175dc6b87f6c89ba8848a07 PKG_CAT:=zcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) @@ -26,16 +26,18 @@ define Package/wrt-radauth CATEGORY:=Network DEPENDS:=kmod-brcm-wl +nvram TITLE:=A Radius MAC authenticator for Broadcom based access points - DESCRIPTION:=This software watches the stations associating to a broadcom based\\\ - AccessPoint (e.g. Linksys WRT54G) and sends an authentication request\\\ - to the radius-server specified in nvram.\\\ + DESCRIPTION:=\ + This software watches the stations associating to a broadcom based \\\ + AccessPoint (e.g. Linksys WRT54G) and sends an authentication request \\\ + to the radius-server specified in nvram. URL:=http://www.zerfleddert.de/wrt54g/ endef define Build/Compile -$(call Build/Compile/Default,CC="$(TARGET_CC)" \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib") + $(call Build/Compile/Default, \ + CFLAGS="\$$$$(EXTRA_CFLAGS)" \ + LDFLAGS="\$$$$(EXTRA_LDFLAGS)" \ + ) endef define Package/wrt-radauth/install diff --git a/net/xsupplicant/Makefile b/net/xsupplicant/Makefile index c0b980ec6a..0aa28bcb44 100644 --- a/net/xsupplicant/Makefile +++ b/net/xsupplicant/Makefile @@ -20,6 +20,8 @@ PKG_CAT:=zcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install +PKG_BUILDDEP:=madwifi + include $(INCLUDE_DIR)/package.mk define Package/xsupplicant @@ -54,7 +56,7 @@ endef define Build/Compile $(MAKE) -C $(PKG_BUILD_DIR) \ - DESTDIR=$(PKG_INSTALL_DIR) \ + DESTDIR="$(PKG_INSTALL_DIR)" \ all install endef diff --git a/net/yafc/Makefile b/net/yafc/Makefile index 92cc5aed8a..5a151bb292 100644 --- a/net/yafc/Makefile +++ b/net/yafc/Makefile @@ -4,40 +4,40 @@ # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # -# $Id: Makefile 4112 2006-07-02 20:33:21Z nico $ +# $Id$ include $(TOPDIR)/rules.mk PKG_NAME:=yafc PKG_VERSION:=1.1.1 PKG_RELEASE:=1 -PKG_MD5SUM:=832d074183a36ee15b47553ed5962fce -PKG_SOURCE_URL:=@SF/$(PKG_NAME) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE_URL:=@SF/$(PKG_NAME) +PKG_MD5SUM:=832d074183a36ee15b47553ed5962fce PKG_CAT:=bzcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) -PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install include $(INCLUDE_DIR)/package.mk define Package/yafc SECTION:=net CATEGORY:=Network - DEPENDS:=+libpcap + DEPENDS:=+libncurses +libreadline TITLE:=Yafc is yet another ftp client. - DESCRIPTION:=console-based FTP client - URL:=http://yacf.sourceforge.net + URL:=http://yacf.sourceforge.net/ endef -define Build/Configure -$(call Build/Configure/Default,--includedir=$(PKG_BUILD_DIR)/) +# uses GNU configure + +define Build/Compile + $(MAKE) -C $(PKG_BUILD_DIR) endef define Package/yafc/install - install -m0755 -d $(1)/usr/sbin - $(CP) $(PKG_BUILD_DIR)/src/$(PKG_NAME) $(1)/usr/sbin/ + install -d -m0755 $(1)/usr/sbin + $(CP) $(PKG_BUILD_DIR)/src/yafc $(1)/usr/sbin/ endef $(eval $(call BuildPackage,yafc)) diff --git a/sound/madplay/Makefile b/sound/madplay/Makefile index 401aad0383..379e22c18d 100644 --- a/sound/madplay/Makefile +++ b/sound/madplay/Makefile @@ -1,3 +1,4 @@ +# # Copyright (C) 2006 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. @@ -10,11 +11,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=madplay PKG_VERSION:=0.15.2b PKG_RELEASE:=1 -PKG_MD5SUM:=6814b47ceaa99880c754c5195aa1aac1 +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/mad \ ftp://ftp.mars.org/pub/mpeg/ -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_MD5SUM:=6814b47ceaa99880c754c5195aa1aac1 PKG_CAT:=zcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) @@ -27,10 +28,11 @@ define Package/madplay CATEGORY:=Sound DEPENDS:=+libid3tag +libmad TITLE:=MPEG audio player in fixed point - DESCRIPTION:=MAD is an MPEG audio decoder. It currently only supports the MPEG 1\\\ -standard, but fully implements all three audio layers (Layer I, Layer II,\\\ -and Layer III, the latter often colloquially known as MP3.). There is also\\\ -full support for ID3 tags.\\\ + DESCRIPTION:=\ + MAD is an MPEG audio decoder. It currently only supports the MPEG 1 \\\ + standard, but fully implements all three audio layers (Layer I, Layer II, \\\ + and Layer III, the latter often colloquially known as MP3.). There is also \\\ + full support for ID3 tags. URL:=http://sourceforge.net/projects/mad endef @@ -38,29 +40,27 @@ define Build/Configure $(call Build/Configure/Default, \ --enable-shared \ --disable-static \ - --with-gnu-ld \ - --disable-rpath \ --disable-debugging \ --disable-profiling \ --disable-experimental \ --without-libiconv-prefix \ --without-libintl-prefix \ --without-alsa \ - --without-esd,LIBS="-lz" \ + --without-esd \ + , \ + LIBS="-lz" \ ) endef define Build/Compile - rm -rf $(PKG_INSTALL_DIR) - mkdir -p $(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) \ DESTDIR="$(PKG_INSTALL_DIR)" \ all install endef define Package/madplay/install - install -m0755 -d $(1)/usr/bin - install -m0755 $(PKG_INSTALL_DIR)/usr/bin/madplay $(1)/usr/bin/ + install -d -m0755 $(1)/usr/bin + $(CP) $(PKG_INSTALL_DIR)/usr/bin/madplay $(1)/usr/bin/ endef $(eval $(call BuildPackage,madplay)) diff --git a/sound/mt-daapd/Makefile b/sound/mt-daapd/Makefile index 23ad6f313b..0fdbfffdf2 100644 --- a/sound/mt-daapd/Makefile +++ b/sound/mt-daapd/Makefile @@ -11,10 +11,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mt-daapd PKG_VERSION:=0.2.4 PKG_RELEASE:=1 -PKG_MD5SUM:=2e1cdbe6b94ef153e915806f80a28dca -PKG_SOURCE_URL:=@SF/mt-daapd PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=@SF/mt-daapd +PKG_MD5SUM:=2e1cdbe6b94ef153e915806f80a28dca PKG_CAT:=zcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) @@ -27,7 +27,8 @@ define Package/mt-daapd CATEGORY:=Sound DEPENDS:=+libgdbm +libhowl +libid3tag TITLE:=A multi-threaded DAAP (Digital Audio Access Protocol) daemon - DESCRIPTION:=mt-daapd is a program which acts as an iTunes (DAAP) server for Linux. + DESCRIPTION:=\ + mt-daapd is a program which acts as an iTunes (DAAP) server for Linux. URL:=http://www.mt-daapd.org endef @@ -38,8 +39,6 @@ endef define Build/Configure $(call Build/Configure/Default, \ - --enable-shared \ - --disable-static \ --enable-mdns \ --enable-howl \ --with-id3tag="$(STAGING_DIR)/usr" \ @@ -52,23 +51,21 @@ define Build/Configure endef define Build/Compile - rm -rf $(PKG_INSTALL_DIR) - mkdir -p $(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) \ DESTDIR="$(PKG_INSTALL_DIR)" \ all install endef define Package/mt-daapd/install - install -m0755 -d $(1)/etc + install -d -m0755 $(1)/etc install -m0644 $(PKG_BUILD_DIR)/contrib/mt-daapd.conf $(1)/etc/ install -m0644 $(PKG_BUILD_DIR)/contrib/mt-daapd.playlist $(1)/etc/ - install -m0755 -d $(1)/etc/init.d - install -m0755 ./files/mt-daapd.init $(1)/etc/init.d/mt-daapd - install -m0755 -d $(1)/usr/share + install -d -m0755 $(1)/usr/share $(CP) $(PKG_INSTALL_DIR)/usr/share/mt-daapd $(1)/usr/share/ - install -m0755 -d $(1)/usr/sbin + install -d -m0755 $(1)/usr/sbin $(CP) $(PKG_INSTALL_DIR)/usr/sbin/mt-daapd $(1)/usr/sbin/ + install -d -m0755 $(1)/etc/init.d + install -m0755 ./files/mt-daapd.init $(1)/etc/init.d/mt-daapd endef $(eval $(call BuildPackage,mt-daapd)) diff --git a/utils/alsa-utils/Makefile b/utils/alsa-utils/Makefile index 7a8add663d..65736d0e58 100644 --- a/utils/alsa-utils/Makefile +++ b/utils/alsa-utils/Makefile @@ -33,7 +33,6 @@ endef define Build/Configure $(call Build/Configure/Default, \ --disable-rpath \ - --with-gnu-ld \ ) endef diff --git a/utils/bc/Makefile b/utils/bc/Makefile index 0d7bbf62df..9cd1edf21c 100644 --- a/utils/bc/Makefile +++ b/utils/bc/Makefile @@ -1,3 +1,4 @@ +# # Copyright (C) 2006 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. @@ -10,43 +11,47 @@ include $(TOPDIR)/rules.mk PKG_NAME:=bc PKG_VERSION:=1.06 PKG_RELEASE:=1 -PKG_MD5SUM:=d44b5dddebd8a7a7309aea6c36fda117 -PKG_SOURCE_URL:=@GNU/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=@GNU/ +PKG_MD5SUM:=d44b5dddebd8a7a7309aea6c36fda117 PKG_CAT:=zcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) -PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install include $(INCLUDE_DIR)/package.mk -define Package/bc +define Package/bc/Default SECTION:=utils CATEGORY:=Utilities - MENU:=1 - TITLE:=Arbitrary precision calculator language - DESCRIPTION:=bc is a language that supports arbitrary precision numbers with interactive execution of statements. URL:=http://www.gnu.org/software/bc/ endef +define Package/bc + $(call Package/bc/Default) + TITLE:=Arbitrary precision calculator language + DESCRIPTION:=\ + bc is a language that supports arbitrary precision numbers with interactive \\\ + execution of statements. +endef + define Package/dc - SECTION:=utils - CATEGORY:=Utilities + $(call Package/bc/Default) DEPENDS:=bc - TITLE:=Arbitrary precision calculator - DESCRIPTION:=dc is a reverse-polish desk calculator which supports unlimited precision arithmetic. - URL:=http://www.gnu.org/software/bc/ + TITLE:=Arbitrary precision reverse-polish calculator + DESCRIPTION:=\ + dc is a reverse-polish desk calculator which supports unlimited precision \\\ + arithmetic. endef define Package/bc/install - install -m0755 -d $(1)/usr/bin - $(CP) $(PKG_BUILD_DIR)/$(PKG_NAME)/$(PKG_NAME) $(1)/usr/bin/$(PKG_NAME) + install -d -m0755 $(1)/usr/bin + install -m0755 $(PKG_BUILD_DIR)/bc/bc $(1)/usr/bin/ endef define Package/dc/install - install -m0755 -d $(1)/usr/bin - $(CP) $(PKG_BUILD_DIR)/$(PKG_NAME)/$(PKG_NAME) $(1)/usr/bin/$(PKG_NAME) + install -d -m0755 $(1)/usr/bin + install -m0755 $(PKG_BUILD_DIR)/dc/dc $(1)/usr/bin/ endef $(eval $(call BuildPackage,bc)) diff --git a/utils/cifsmount/Makefile b/utils/cifsmount/Makefile index 9cc4c3a95e..713c1451ed 100644 --- a/utils/cifsmount/Makefile +++ b/utils/cifsmount/Makefile @@ -20,8 +20,8 @@ define Package/cifsmount SECTION:=utils CATEGORY:=Utilities TITLE:=CIFS mounting helper utility - DESCRIPTION:=Helper utility for mounting remote CIFS shares.\\\ - An user space helper for mounting remote CIFS shares + DESCRIPTION:=\ + An user space helper utility for mounting remote CIFS shares. endef define Build/Prepare diff --git a/utils/collectd/Makefile b/utils/collectd/Makefile index 71d0ce6a53..5a91077fe0 100644 --- a/utils/collectd/Makefile +++ b/utils/collectd/Makefile @@ -1,3 +1,4 @@ +# # Copyright (C) 2006 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. @@ -10,10 +11,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:=collectd PKG_VERSION:=3.5.1 PKG_RELEASE:=1 -PKG_MD5SUM:=46a4b81e46d3bb58faab1d603649d737 -PKG_SOURCE_URL:=http://verplant.org/collectd/files PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=http://verplant.org/collectd/files +PKG_MD5SUM:=46a4b81e46d3bb58faab1d603649d737 PKG_CAT:=zcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) @@ -25,13 +26,11 @@ define Package/collectd SECTION:=utils CATEGORY:=Utilities TITLE:=Lightweight system statistics collection daemon - DESCRIPTION:=Lightweight system statistics collection daemon URL:=http://verplant.org/collectd/ endef define Build/Compile - $(call Build/Configure/Default,--enable-shared \ - --disable-static \ + $(call Build/Configure/Default, \ --disable-debug \ --enable-cpu \ --enable-load \ @@ -52,22 +51,18 @@ define Build/Compile endef define Build/Compile - $(MAKE) -C $(PKG_BUILD_DIR) - mkdir -p $(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) \ DESTDIR="$(PKG_INSTALL_DIR)" \ - install + all install endef define Package/collectd/install - install -d -m0755 $(1)/etc/init.d install -d -m0755 $(1)/usr/sbin - install -d -m0755 $(1)/usr/lib/collectd - install -d -m0755 $(1)/var/lib/collectd - install -d -m0755 $(1)/var/run - install -m0755 ./files/collectd.init $(1)/etc/init.d/collectd $(CP) $(PKG_INSTALL_DIR)/usr/sbin/collectd $(1)/usr/sbin/ + install -d -m0755 $(1)/usr/lib/collectd $(CP) $(PKG_INSTALL_DIR)/usr/lib/collectd/*.so $(1)/usr/lib/collectd/ + install -d -m0755 $(1)/etc/init.d + install -m0755 ./files/collectd.init $(1)/etc/init.d/collectd endef $(eval $(call BuildPackage,collectd)) diff --git a/utils/deco/Makefile b/utils/deco/Makefile index abd9a31e5f..b5401a6372 100644 --- a/utils/deco/Makefile +++ b/utils/deco/Makefile @@ -1,3 +1,4 @@ +# # Copyright (C) 2006 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. @@ -10,12 +11,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=deco PKG_VERSION:=39 PKG_RELEASE:=1 -PKG_MD5SUM:=f77f60e8be0cae1f814cba1ef61bf4d0 -PKG_SOURCE_URL:=@SF/deco PKG_SOURCE:=$(PKG_NAME)$(PKG_VERSION).tgz - +PKG_SOURCE_URL:=@SF/deco +PKG_MD5SUM:=f77f60e8be0cae1f814cba1ef61bf4d0 PKG_CAT:=zcat + PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)$(PKG_VERSION) include $(INCLUDE_DIR)/package.mk @@ -25,8 +26,9 @@ define Package/deco CATEGORY:=Utilities DEPENDS:=+libncurses TITLE:=Text-based, full featured file manager - DESCRIPTION:=A clone of Norton Commander for Unix. Text-based, full featured\\\ - file manager.\\\ + DESCRIPTION:=\ + A clone of Norton Commander for Unix. Text-based, full featured \\\ + file manager. URL:=http://deco.sourceforge.net/ endef @@ -35,11 +37,11 @@ define Build/Compile endef define Package/deco/install - install -m0755 -d $(1)/usr/bin - install -m0755 $(PKG_BUILD_DIR)/deco $(1)/usr/bin/deco - install -m0755 -d $(1)/usr/lib/deco - install -m0644 $(PKG_BUILD_DIR)/profile $(1)/usr/lib/deco/profile + install -d -m0755 $(1)/usr/bin + install -m0755 $(PKG_BUILD_DIR)/deco $(1)/usr/bin/ + install -d -m0755 $(1)/usr/lib/deco install -m0644 $(PKG_BUILD_DIR)/menu $(1)/usr/lib/deco/menu + install -m0644 $(PKG_BUILD_DIR)/profile $(1)/usr/lib/deco/profile endef $(eval $(call BuildPackage,deco)) diff --git a/utils/dosfstools/Makefile b/utils/dosfstools/Makefile index 46dd99067a..0f2adaf50b 100644 --- a/utils/dosfstools/Makefile +++ b/utils/dosfstools/Makefile @@ -12,12 +12,12 @@ PKG_NAME:=dosfstools PKG_VERSION:=2.11 PKG_RELEASE:=1 -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) -PKG_MD5SUM:=407d405ade410f7597d364ab5dc8c9f6 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).src.tar.gz PKG_SOURCE_URL:=ftp://ftp.uni-erlangen.de/pub/Linux/LOCAL/dosfstools/ +PKG_MD5SUM:=407d405ade410f7597d364ab5dc8c9f6 PKG_CAT:=zcat +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install include $(INCLUDE_DIR)/package.mk @@ -26,8 +26,8 @@ define Package/dosfstools SECTION:=utils CATEGORY:=Utilities TITLE:=MS-DOS FAT filesystems utilities - DESCRIPTION:=MS-DOS FAT filesystems utilities.\\\ - Utilities to create and check MS-DOS FAT filesystems. + DESCRIPTION:=\ + Utilities to create and check MS-DOS FAT filesystems. URL:=ftp://ftp.uni-erlangen.de:/pub/Linux/LOCAL/dosfstools/ endef @@ -35,21 +35,26 @@ define Build/Configure endef define Build/Compile - rm -rf $(PKG_INSTALL_DIR) - mkdir -p $(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) \ $(TARGET_CONFIGURE_OPTS) \ OPTFLAGS="$(TARGET_CFLAGS) -D_FILE_OFFSET_BITS=64" \ - PREFIX="$(PKG_INSTALL_DIR)" \ - all install + PREFIX="/usr" \ + SBINDIR="/usr/sbin" \ + all + $(MAKE) -C $(PKG_BUILD_DIR) \ + $(TARGET_CONFIGURE_OPTS) \ + OPTFLAGS="$(TARGET_CFLAGS) -D_FILE_OFFSET_BITS=64" \ + PREFIX="$(PKG_INSTALL_DIR)/usr" \ + SBINDIR="$(PKG_INSTALL_DIR)/usr/sbin" \ + install endef define Package/dosfstools/install - install -d -m0755 $(1)/sbin - $(CP) $(PKG_INSTALL_DIR)/sbin/dosfsck $(1)/sbin/ - $(CP) $(PKG_INSTALL_DIR)/sbin/fsck.{msdos,vfat} $(1)/sbin/ - $(CP) $(PKG_INSTALL_DIR)/sbin/mkdosfs $(1)/sbin/ - $(CP) $(PKG_INSTALL_DIR)/sbin/mkfs.{msdos,vfat} $(1)/sbin/ + install -d -m0755 $(1)/usr/sbin + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/dosfsck $(1)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/fsck.{msdos,vfat} $(1)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/mkdosfs $(1)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/mkfs.{msdos,vfat} $(1)/usr/sbin/ endef $(eval $(call BuildPackage,dosfstools)) diff --git a/utils/dtach/Makefile b/utils/dtach/Makefile index e9894bda6f..8422a24f15 100644 --- a/utils/dtach/Makefile +++ b/utils/dtach/Makefile @@ -1,3 +1,4 @@ +# # Copyright (C) 2006 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. diff --git a/utils/fetchmail/Makefile b/utils/fetchmail/Makefile index 048fc3e5c3..e740090e72 100644 --- a/utils/fetchmail/Makefile +++ b/utils/fetchmail/Makefile @@ -11,10 +11,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fetchmail PKG_VERSION:=6.2.5 PKG_RELEASE:=1 -PKG_MD5SUM:=9956b30139edaa4f5f77c4d0dbd80225 -PKG_SOURCE_URL:=http://www.catb.org/~esr/fetchmail/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=http://www.catb.org/~esr/fetchmail/ +PKG_MD5SUM:=9956b30139edaa4f5f77c4d0dbd80225 PKG_CAT:=zcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) @@ -26,7 +26,8 @@ define Package/fetchmail SECTION:=utils CATEGORY:=Utilities TITLE:=Remote mail retriever - DESCRIPTION:=Retrieves remote mail via POP/IMAP\\\ + DESCRIPTION:=\ + Retrieves remote mail via POP/IMAP.\\\ Very useful in conjunction with mutt. URL:=http://www.catb.org/~esr/fetchmail/ endef @@ -34,22 +35,21 @@ endef define Build/Configure $(call Build/Configure/Default, \ --enable-fallback=procmail \ - --without-hesiod, \ + --without-hesiod \ + , \ ac_cv_path_procmail=/usr/sbin/procmail \ ) endef define Build/Compile - rm -rf $(PKG_INSTALL_DIR) - mkdir -p $(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) \ DESTDIR="$(PKG_INSTALL_DIR)" \ all install endef define Package/fetchmail/install - mkdir -p $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/$(PKG_NAME) $(1)/usr/bin/ + install -d -m0755 $(1)/usr/bin + $(CP) $(PKG_INSTALL_DIR)/usr/bin/fetchmail $(1)/usr/bin/ endef $(eval $(call BuildPackage,fetchmail)) diff --git a/utils/heyu/Makefile b/utils/heyu/Makefile index b451d7950e..8003d52392 100644 --- a/utils/heyu/Makefile +++ b/utils/heyu/Makefile @@ -1,3 +1,4 @@ +# # Copyright (C) 2006 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. @@ -10,12 +11,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=heyu PKG_VERSION:=2.0beta.5 PKG_RELEASE:=1 -PKG_MD5SUM:=8289d5ca5b972333a72bc0fc3e640c13 -PKG_SOURCE_URL:=http://heyu.tanj.com/download/ + PKG_SOURCE:=heyu-$(PKG_VERSION).tgz -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) +PKG_SOURCE_URL:=http://heyu.tanj.com/download/ +PKG_MD5SUM:=8289d5ca5b972333a72bc0fc3e640c13 PKG_CAT:=zcat +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) + include $(INCLUDE_DIR)/package.mk define Package/heyu @@ -23,7 +26,6 @@ define Package/heyu CATEGORY:=Utilities DEPENDS:=+setserial TITLE:=X10 home automation control using a CM11A - DESCRIPTION:=10 home automation control using the CM11A serial device. URL:=http://heyu.tanj.com/heyu2/ endef @@ -32,14 +34,16 @@ define Package/heyu/conffiles endef define Build/Compile - $(call Build/Compile/Default, CFLAGS="$(TARGET_CFLAGS) -I$(PKG_BUILD_DIR) -DSYSV -DPOSIX -DHAS_ITIMER -DLINUX -DHASSELECT -DHASTZ") + $(call Build/Compile/Default, \ + CFLAGS="$(TARGET_CFLAGS) \$$$$(DFLAGS)" \ + ) endef define Package/heyu/install + install -d -m0755 $(1)/usr/bin + install -m0755 $(PKG_BUILD_DIR)/heyu $(1)/usr/bin/ install -d -m0755 $(1)/etc/$(PKG_NAME) install -m0644 ./files/x10.conf $(1)/etc/$(PKG_NAME)/x10.conf - install -d -m0755 $(1)/usr/bin - install -m0644 $(PKG_BUILD_DIR)/heyu $(1)/usr/bin/ endef $(eval $(call BuildPackage,heyu)) diff --git a/utils/lilo/Makefile b/utils/lilo/Makefile index 77a45b7c29..3e7ce415c6 100644 --- a/utils/lilo/Makefile +++ b/utils/lilo/Makefile @@ -4,20 +4,21 @@ # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # -# $Id: Makefile 4091 2006-06-27 00:35:46Z mbm $ -# +# $Id$ + include $(TOPDIR)/rules.mk PKG_NAME:=lilo PKG_VERSION:=22.7.3 PKG_RELEASE:=1 -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).src.tar.gz PKG_SOURCE_URL:=ftp://metalab.unc.edu/pub/Linux/system/boot/lilo/ PKG_MD5SUM:= PKG_CAT:=zcat +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) + include $(INCLUDE_DIR)/package.mk define Package/lilo diff --git a/utils/logrotate/Makefile b/utils/logrotate/Makefile index 4548f2961b..091e18302f 100644 --- a/utils/logrotate/Makefile +++ b/utils/logrotate/Makefile @@ -1,3 +1,4 @@ +# # Copyright (C) 2006 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. @@ -10,15 +11,16 @@ include $(TOPDIR)/rules.mk PKG_NAME:=logrotate PKG_VERSION:=3.7.1 PKG_RELEASE:=1 -PKG_MD5SUM:=552639142e163745f6bcd4f1f3816d8a +PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz PKG_SOURCE_URL:= \ http://ftp.de.debian.org/debian/pool/main/l/logrotate \ http://ftp.debian.org/debian/pool/main/l/logrotate \ http://ftp.fr.debian.org/debian/pool/main/l/logrotate \ http://ftp.us.debian.org/debian/pool/main/l/logrotate -PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz +PKG_MD5SUM:=552639142e163745f6bcd4f1f3816d8a PKG_CAT:=zcat + PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install @@ -29,10 +31,11 @@ define Package/logrotate CATEGORY:=Utilities DEPENDS:=+libpopt TITLE:=rotates, compresses, and mails system logs - DESCRIPTION:=logrotate is designed to ease administration of systems that generate\\\ -large numbers of log files. It allows auto-matic rotation, compression,\\\ -removal, and mailing of log files. Each log file may be handled\\\ -daily, weekly,monthly, or when it grows too large.\\\ + DESCRIPTION:=\ + logrotate is designed to ease administration of systems that generate \\\ + large numbers of log files. It allows auto-matic rotation, compression, \\\ + removal and mailing of log files. Each log file may be handled daily, \\\ + weekly, monthly or when it grows too large. URL:=http://packages.debian.org/unstable/admin/logrotate endef @@ -41,18 +44,19 @@ define Package/logrotate/conffiles endef define Build/Compile - $(call Build/Compile/Default, \ - CPPFLAGS="-I$(STAGING_DIR)/usr/include" \ - LDFLAGS="-L$(STAGING_DIR)/usr/lib" \ - logrotate \ - ) + $(call Build/Compile/Default, \ + RPM_OPT_FLAGS="\$$$$(EXTRA_CFLAGS)" \ + LDFLAGS="\$$$$(EXTRA_LDFLAGS)" \ + logrotate \ + ) endef define Package/logrotate/install - mkdir -p $(1)/usr/sbin - $(CP) ${PKG_BUILD_DIR}/logrotate $(1)/usr/sbin - mkdir -p $(1)/etc/logrotate.d - $(CP) ./files/logrotate.conf $(1)/etc + install -d -m0755 $(1)/usr/sbin + $(CP) ${PKG_BUILD_DIR}/logrotate $(1)/usr/sbin/ + install -d -m0755 $(1)/etc + $(CP) ./files/logrotate.conf $(1)/etc/ + install -d -m0755 $(1)/etc/logrotate.d endef $(eval $(call BuildPackage,logrotate)) diff --git a/utils/lrzsz/Makefile b/utils/lrzsz/Makefile index 1892bc173a..8fff61888f 100644 --- a/utils/lrzsz/Makefile +++ b/utils/lrzsz/Makefile @@ -1,3 +1,4 @@ +# # Copyright (C) 2006 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. @@ -10,11 +11,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=lrzsz PKG_VERSION:=0.12.20 PKG_RELEASE:=1 -PKG_MD5SUM:=b5ce6a74abc9b9eb2af94dffdfd372a4 -PKG_SOURCE_URL:=http://www.ohse.de/uwe/releases/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=http://www.ohse.de/uwe/releases/ +PKG_MD5SUM:=b5ce6a74abc9b9eb2af94dffdfd372a4 PKG_CAT:=zcat + PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install @@ -24,23 +26,18 @@ define Package/lrzsz SECTION:=utils CATEGORY:=Utilities TITLE:=X,Y and Z-modem protocols - DESCRIPTION:=Transfer files in your login sessions.\\\ -Very leightweight and straight forward.\\\ -You just need a terminal client that can do\\\ -either X, Y or Z-modem file transfers.\\\ + DESCRIPTION:=\ + Transfer files in your login sessions.\\\ + Very leightweight and straight forward.\\\ + You just need a terminal client that can do \\\ + either X, Y or Z-modem file transfers. URL:=http://www.ohse.de/uwe/software/lrzsz.html endef -define Build/Configure -$(call Build/Configure/Default,--without-libiconv-prefix \ ---without-libintl-prefix) -endef +# uses GNU configure define Build/Compile - rm -rf $(PKG_INSTALL_DIR) - mkdir -p $(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) \ - $(TARGET_CONFIGURE_OPTS) \ DESTDIR="$(PKG_INSTALL_DIR)" \ all install endef diff --git a/utils/macchanger/Makefile b/utils/macchanger/Makefile index 8522248018..7929034311 100644 --- a/utils/macchanger/Makefile +++ b/utils/macchanger/Makefile @@ -1,3 +1,4 @@ +# # Copyright (C) 2006 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. @@ -10,12 +11,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=macchanger PKG_VERSION:=1.5.0 PKG_RELEASE:=1 -PKG_MD5SUM:=79b7cdaeca3d8ebafa764c4b0dd03ab7 -PKG_SOURCE_URL:=@GNU/macchanger + PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) +PKG_SOURCE_URL:=@GNU/macchanger +PKG_MD5SUM:=79b7cdaeca3d8ebafa764c4b0dd03ab7 PKG_CAT:=zcat +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install include $(INCLUDE_DIR)/package.mk @@ -24,18 +26,23 @@ define Package/macchanger SECTION:=utils CATEGORY:=Utilities TITLE:=utility for viewing/manipulating the MAC address - DESCRIPTION:=This is a GNU/Linux utility for viewing/manipulating the MAC address\\\ -of network interfaces. + DESCRIPTION:=\ + This is a GNU/Linux utility for viewing/manipulating the MAC address \\\ + of network interfaces. URL:=http://www.alobbs.com/macchanger endef define Build/Compile - $(MAKE) DESTDIR=$(PKG_INSTALL_DIR) -C $(PKG_BUILD_DIR) install + $(MAKE) -C $(PKG_BUILD_DIR) \ + DESTDIR="$(PKG_INSTALL_DIR)" \ + all install endef define Package/macchanger/install - mkdir -p $(1) - $(CP) $(PKG_INSTALL_DIR)/* $(1)/ + install -d -m0755 $(1)/usr/bin + $(CP) $(PKG_INSTALL_DIR)/usr/bin/macchanger $(1)/usr/bin/ + install -d -m0755 $(1)/usr/share + $(CP) $(PKG_INSTALL_DIR)/usr/share/macchanger $(1)/usr/share/ endef $(eval $(call BuildPackage,macchanger)) diff --git a/utils/minicom/Makefile b/utils/minicom/Makefile index f618428e07..6227828d1d 100644 --- a/utils/minicom/Makefile +++ b/utils/minicom/Makefile @@ -4,17 +4,17 @@ # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # -# $Id: Makefile 4644 2006-08-23 22:05:05Z nbd $ +# $Id$ include $(TOPDIR)/rules.mk PKG_NAME:=minicom PKG_VERSION:=2.2-rc2 PKG_RELEASE:=1 -PKG_MD5SUM:=c64c9ef958e91c00ca1cf2a7bc0db1f3 -PKG_SOURCE_URL:=http://alioth.debian.org/download.php/1721/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=http://alioth.debian.org/download.php/1721/ +PKG_MD5SUM:=c64c9ef958e91c00ca1cf2a7bc0db1f3 PKG_CAT:=zcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) @@ -25,18 +25,14 @@ define Package/minicom SECTION:=utils CATEGORY:=Utilities DEPENDS:=+libncurses - TITLE:=Terminal emulation - DESCRIPTION:=Terminal emulation program for the serial port + TITLE:=Terminal emulation program URL:=http://alioth.debian.org/projects/minicom/ endef -define Build/Configure - $(call Build/Configure/Default) -endef +# uses GNU configure define Build/Compile - $(MAKE) -C $(PKG_BUILD_DIR) \ - CC="$(TARGET_CC)" + $(MAKE) -C $(PKG_BUILD_DIR) endef define Package/minicom/install diff --git a/utils/mutt/Makefile b/utils/mutt/Makefile index 87c0b87de8..19f6c6626e 100644 --- a/utils/mutt/Makefile +++ b/utils/mutt/Makefile @@ -25,8 +25,7 @@ define Package/mutt SECTION:=utils CATEGORY:=Utilities DEPENDS:=+libopenssl +libncurses - TITLE:=console mail client - DESCRIPTION:=Mail client for the text console + TITLE:=Console mail client URL:=http://www.mutt.org endef @@ -40,9 +39,13 @@ define Build/Configure ) endef +define Build/Compile + $(MAKE) -C $(PKG_BUILD_DIR) +endef + define Package/mutt/install - mkdir -p $(1)/usr/bin - $(CP) $(PKG_BUILD_DIR)/$(PKG_NAME) $(1)/usr/bin/ + install -d -m0755 $(1)/usr/bin + $(CP) $(PKG_BUILD_DIR)/mutt $(1)/usr/bin/ endef $(eval $(call BuildPackage,mutt)) diff --git a/utils/nano/Makefile b/utils/nano/Makefile index fd678c504a..9c18600c0f 100644 --- a/utils/nano/Makefile +++ b/utils/nano/Makefile @@ -11,12 +11,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=nano PKG_VERSION:=1.3.8 PKG_RELEASE:=1 -PKG_MD5SUM:=20633397bf5d462255f37dfcc7cad4e7 +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.ewtoo.org/~astyanax/nano/dist/v1.3 \ http://www.nano-editor.org/dist/v1.3 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_MD5SUM:=20633397bf5d462255f37dfcc7cad4e7 PKG_CAT:=zcat + PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install @@ -27,24 +28,24 @@ define Package/nano CATEGORY:=Utilities DEPENDS:=+libncurses TITLE:=An enhanced clone of the Pico text editor - DESCRIPTION:=GNU nano (Nano's ANOther editor, or Not ANOther editor) is an enhanced clone of the Pico text editor.. + DESCRIPTION:=\ + GNU nano (Nano's ANOther editor, or Not ANOther editor) is an enhanced clone \\\ + of the Pico text editor.. URL:=http://www.nano-editor.org/ endef define Build/Configure -$(call Build/Configure/Default,--enable-shared \ - --disable-static \ - --with-gnu-ld \ - --disable-rpath \ - --enable-tiny \ - --disable-glibtest \ - --disable-utf8 \ - --without-slang,ac_cv_header_regex_h=no) + $(call Build/Configure/Default, \ + --enable-tiny \ + --disable-glibtest \ + --disable-utf8 \ + --without-slang \ + , \ + ac_cv_header_regex_h=no \ + ) endef define Build/Compile - rm -rf $(PKG_INSTALL_DIR) - mkdir -p $(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) \ DESTDIR="$(PKG_INSTALL_DIR)" \ all install diff --git a/utils/pciutils/Makefile b/utils/pciutils/Makefile index 724f2b0a2e..8e561be0c3 100644 --- a/utils/pciutils/Makefile +++ b/utils/pciutils/Makefile @@ -12,13 +12,13 @@ PKG_NAME:=pciutils PKG_VERSION:=2.2.1 PKG_RELEASE:=1 -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.kernel.org/pub/software/utils/pciutils/ \ ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci PKG_MD5SUM:=c18e2a5f04e9abae5a42439de294f086 PKG_CAT:=zcat +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install include $(INCLUDE_DIR)/package.mk @@ -27,9 +27,9 @@ define Package/pciutils SECTION:=utils CATEGORY:=Utilities TITLE:=Linux PCI Utilities - DESCRIPTION:=Linux PCI Utilities.\\\ - This package contains various utilities for inspecting and setting of \\\ - devices connected to the PCI bus. + DESCRIPTION:=\ + This package contains various utilities for inspecting and setting of \\\ + devices connected to the PCI bus. URL:=http://www.kernel.org/pub/software/utils/pciutils/ endef @@ -37,7 +37,11 @@ define Build/Configure endef define Build/Compile - $(call Build/Compile/Default, CFLAGS="$(TARGET_CFLAGS)" IDSDIR="/usr/share" HOST=$(GNU_TARGET_NAME)) + $(call Build/Compile/Default, \ + CFLAGS="$(TARGET_CFLAGS)" \ + IDSDIR="/usr/share" \ + HOST="$(GNU_TARGET_NAME)" \ + ) endef define Package/pciutils/install diff --git a/utils/pipacs/Makefile b/utils/pipacs/Makefile index 35019340da..0d84aa6f06 100644 --- a/utils/pipacs/Makefile +++ b/utils/pipacs/Makefile @@ -19,8 +19,6 @@ define Package/pipacs SECTION:=utils CATEGORY:=Utilities TITLE:=UNIX socket accounting/wiewer program - DESCRIPTION:=An UNIX socket accounting/wiewer program.\\\ - This is version 2. endef define Build/Prepare @@ -30,14 +28,14 @@ endef define Build/Compile $(MAKE) -C $(PKG_BUILD_DIR) \ - $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS) -I $(STAGING_DIR)/usr/include" \ - all + $(TARGET_CONFIGURE_OPTS) \ + CFLAGS="$(TARGET_CFLAGS) -I $(STAGING_DIR)/usr/include" \ + all endef define Package/pipacs/install - mkdir -p $(1)/usr/bin - install -m0755 $(PKG_BUILD_DIR)/pipacs $(1)/usr/bin + install -d -m0755 $(1)/usr/bin + install -m0755 $(PKG_BUILD_DIR)/pipacs $(1)/usr/bin/ endef $(eval $(call BuildPackage,pipacs)) diff --git a/utils/procmail/Makefile b/utils/procmail/Makefile index ac232a99ee..10ba100115 100644 --- a/utils/procmail/Makefile +++ b/utils/procmail/Makefile @@ -24,10 +24,11 @@ include $(INCLUDE_DIR)/package.mk define Package/procmail SECTION:=utils CATEGORY:=Utilities - TITLE:=mail processing tool - DESCRIPTION:=Procmail is able to process and classify incoming mail into\\\ + TITLE:=Mail processing tool + DESCRIPTION:=\ + Procmail is able to process and classify incoming mail into \\\ different mail boxes.\\\ - Very useful in conjunction with mutt.\\\ + Very useful in conjunction with mutt. URL:=http://www.procmail.org endef @@ -37,7 +38,7 @@ define Build/Compile endef define Package/procmail/install - mkdir -p $(1)/usr/bin + install -d -m0755 $(1)/usr/bin $(CP) $(PKG_BUILD_DIR)/src/procmail $(1)/usr/bin/ $(CP) $(PKG_BUILD_DIR)/src/formail $(1)/usr/bin/ endef diff --git a/utils/rrdcollect/Makefile b/utils/rrdcollect/Makefile index 519d84d2c5..ca581ea95b 100644 --- a/utils/rrdcollect/Makefile +++ b/utils/rrdcollect/Makefile @@ -11,46 +11,46 @@ include $(TOPDIR)/rules.mk PKG_NAME:=rrdcollect PKG_VERSION:=0.2.3 PKG_RELEASE:=1 -PKG_MD5SUM:=5e4305c612bc3cccbaf802c275c81a11 -PKG_SOURCE_URL:=@SF/rrdcollect PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=@SF/rrdcollect +PKG_MD5SUM:=5e4305c612bc3cccbaf802c275c81a11 PKG_CAT:=zcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install -ifneq ($(BR2_PACKAGE_LIBRRD),) -RRDTOOL_LIBS:=-lart_lgpl_2 -lfreetype -lpng -endif - include $(INCLUDE_DIR)/package.mk define Package/rrdcollect SECTION:=utils CATEGORY:=Utilities + DESCRIPTION:=\ + RRDcollect is a daemon which polls ceratin files in /proc/ \\\ + directory, gathering data and storing it inside RRDtool's \\\ + database files. Being written in C should be both fast \\\ + and resources-friendly. Supports both scanf(3)-style \\\ + pattern matches and perl compatible regular expressions. + URL:=http://rrdcollect.sourceforge.net/ +endef + +define Package/rrdcollect + $(call Package/rrdcollect/Default) DEPENDS:=+librrd1 TITLE:=Round-Robin Database (RRD) collecting daemon - DESCRIPTION:=RRDcollect is a daemon which polls ceratin files in /proc/\\\ - directory, gathering data and storing it inside RRDtool's\\\ - database files. Being written in C should be both fast\\\ - and resources-friendly. Supports both scanf(3)-style\\\ - pattern matches and perl compatible regular expressions.\\\ - URL:=http://rrdcollect.sourceforge.net/ + DESCRIPTION+=\\\ + \\\ + This package contains the RRD collecting daemon. MENU:=1 endef define Package/rrdcollect-example - SECTION:=utils - CATEGORY:=Utilities + $(call Package/rrdcollect/Default) DEPENDS:=rrdcollect TITLE:=Example setup for RRD collecting daemon above - DESCRIPTION:=RRDcollect is a daemon which polls ceratin files in /proc/\\\ - directory, gathering data and storing it inside RRDtool's\\\ - database files. Being written in C should be both fast\\\ - and resources-friendly. Supports both scanf(3)-style\\\ - pattern matches and perl compatible regular expressions.\\\ - URL:=http://rrdcollect.sourceforge.net/ + DESCRIPTION+=\\\ + \\\ + This package contains examples for the RRD collecting daemon. endef define Package/rrdcollect-example/conffiles @@ -68,18 +68,14 @@ define Build/Configure --without-rrdtool \ --with-librrd \ --without-libpcre \ - --without-libpcap, \ + --without-libpcap \ + , \ CFLAGS="$(TARGET_CFLAGS) -DSOCKET_COMM" \ - CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \ - LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \ - LIBS="$(RRDTOOL_LIBS) -lz" \ - PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \ + LIBS="-lz" \ ) endef define Build/Compile - rm -rf $(PKG_INSTALL_DIR) - mkdir -p $(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) \ DESTDIR="$(PKG_INSTALL_DIR)" \ all install diff --git a/utils/sane-backends/Makefile b/utils/sane-backends/Makefile index da2099e72d..e1597f88eb 100644 --- a/utils/sane-backends/Makefile +++ b/utils/sane-backends/Makefile @@ -11,10 +11,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:=sane-backends PKG_VERSION:=1.0.17 PKG_RELEASE:=1 -PKG_MD5SUM:=b51c10da8a81a04e1bae88c9e6556df2 -PKG_SOURCE_URL:=ftp://ftp.sane-project.org/pub/sane/$(PKG_NAME)-$(PKG_VERSION)/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=ftp://ftp.sane-project.org/pub/sane/$(PKG_NAME)-$(PKG_VERSION)/ +PKG_MD5SUM:=b51c10da8a81a04e1bae88c9e6556df2 PKG_CAT:=zcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) @@ -26,7 +26,8 @@ define Package/sane-backends SECTION:=utils CATEGORY:=Utilities TITLE:=Scanner Access Now Easy (backends) - DESCRIPTION:=SANE (Scanner Access Now Easy) is a universal scanner interface. + DESCRIPTION:=\ + SANE (Scanner Access Now Easy) is a universal scanner interface. URL:=http://www.sane-project.org endef @@ -35,20 +36,18 @@ define Package/sane-backends/conffiles endef define Build/Configure -$(call Build/Configure/Default,--enable-shared \ - --disable-static \ - --disable-ipv6 \ - --disable-translations \ - --without-gphoto2 \ - --disable-debug) + $(call Build/Configure/Default, \ + --disable-ipv6 \ + --disable-translations \ + --without-gphoto2 \ + --disable-debug \ + ) endef define Build/Compile - $(MAKE) -C $(PKG_BUILD_DIR) - mkdir -p $(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) \ DESTDIR="$(PKG_INSTALL_DIR)" \ - install + all install endef define Package/sane-backends/install diff --git a/utils/setpwc/Makefile b/utils/setpwc/Makefile index 7b2fd72d8c..12d90293a3 100644 --- a/utils/setpwc/Makefile +++ b/utils/setpwc/Makefile @@ -11,10 +11,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:=setpwc PKG_VERSION:=1.0 PKG_RELEASE:=1 -PKG_MD5SUM:=a125d76f630c4aab940df5912f161965 -PKG_SOURCE_URL:=http://www.vanheusden.com/setpwc/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz +PKG_SOURCE_URL:=http://www.vanheusden.com/setpwc/ +PKG_MD5SUM:=a125d76f630c4aab940df5912f161965 PKG_CAT:=zcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) @@ -26,7 +26,6 @@ define Package/setpwc SECTION:=utils CATEGORY:=Utilities TITLE:=Philips (and compatibles) WebCams (PWC) control utility - DESCRIPTION:=Philips (and compatibles) WebCams (PWC) control utility. URL:=http://www.vanheusden.com/setpwc/ endef diff --git a/utils/strace/Makefile b/utils/strace/Makefile index c85fa1134d..62cc4ca152 100644 --- a/utils/strace/Makefile +++ b/utils/strace/Makefile @@ -11,10 +11,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:=strace PKG_VERSION:=4.5.11 PKG_RELEASE:=1 -PKG_MD5SUM:=28335e15c83456a3db055a0a0efcb4fe -PKG_SOURCE_URL:=@SF/strace PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE_URL:=@SF/strace +PKG_MD5SUM:=28335e15c83456a3db055a0a0efcb4fe PKG_CAT:=bzcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) @@ -25,15 +25,14 @@ define Package/strace SECTION:=utils CATEGORY:=Utilities TITLE:=System call tracer - DESCRIPTION:=A useful diagnostic, instructional, and debugging tool. \\\ - Allows you to track what system calls a program makes while it is \\\ - running. + DESCRIPTION:=\ + A useful diagnostic, instructional, and debugging tool. \\\ + Allows you to track what system calls a program makes while it is \\\ + running. URL:=http://strace.sourceforge.net/ endef -define Build/Configure - $(call Build/Configure/Default) -endef +# uses GNU configure define Build/Compile $(MAKE) -C $(PKG_BUILD_DIR) \ @@ -41,7 +40,7 @@ define Build/Compile endef define Package/strace/install - install -m0755 -d $(1)/usr/sbin + install -d -m0755 $(1)/usr/sbin install -m0755 $(PKG_BUILD_DIR)/strace $(1)/usr/sbin/ endef diff --git a/utils/usbutils/Makefile b/utils/usbutils/Makefile index 0b3f2d95a5..81c60532de 100644 --- a/utils/usbutils/Makefile +++ b/utils/usbutils/Makefile @@ -30,12 +30,7 @@ define Package/usbutils URL:=http://linux-usb.sourceforge.net/ endef -define Build/Configure - $(call Build/Configure/Default, \ - --enable-shared \ - --enable-static \ - ) -endef +# uses GNU configure define Build/Compile $(MAKE) -C $(PKG_BUILD_DIR) \ diff --git a/utils/vim/Makefile b/utils/vim/Makefile index df3a8778f1..aee09ffc04 100644 --- a/utils/vim/Makefile +++ b/utils/vim/Makefile @@ -14,7 +14,7 @@ PKG_RELEASE:=1 PKG_SOURCE_URL:=ftp://ftp.vim.org/pub/vim/unix/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-src.tar.gz -PKG_MD5SUM:= +PKG_MD5SUM:=89ab05bb5cd39eeb9e259503436c11ed PKG_CAT:=zcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) @@ -26,27 +26,26 @@ define Package/vim CATEGORY:=Utilities DEPENDS:=+libncurses TITLE:=VI Improved - DESCRIPTION:=An improved version of VI. - URL:=http://www.vim.org + URL:=http://www.vim.org/ endef define Build/Configure $(call Build/Configure/Default, \ - --enable-min-features \ - --disable-gui \ - --without-x \ - --disable-multibyte \ - --disable-cscope \ - --disable-gpm \ - --with-tlib=ncurses \ + --enable-min-features \ + --disable-gui \ + --without-x \ + --disable-multibyte \ + --disable-cscope \ + --disable-gpm \ + --with-tlib=ncurses \ ) endef define Package/vim/install - mkdir -p $(1)/usr/bin - mkdir -p $(1)/usr/share/vim - $(CP) ./files/vimrc $(1)/usr/share/vim + install -d -m0755 $(1)/usr/bin $(CP) $(PKG_BUILD_DIR)/src/$(PKG_NAME) $(1)/usr/bin/ + install -d -m0755 $(1)/usr/share/vim + $(CP) ./files/vimrc $(1)/usr/share/vim/ endef $(eval $(call BuildPackage,vim)) diff --git a/utils/wx200d/Makefile b/utils/wx200d/Makefile index 25ced23d35..967219bfd1 100644 --- a/utils/wx200d/Makefile +++ b/utils/wx200d/Makefile @@ -11,10 +11,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:=wx200d PKG_VERSION:=1.3 PKG_RELEASE:=1 -PKG_MD5SUM:=0f90c099dddcdd46ac568d707822ec4c -PKG_SOURCE_URL:=@SF/wx200d PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=@SF/wx200d +PKG_MD5SUM:=0f90c099dddcdd46ac568d707822ec4c PKG_CAT:=zcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) @@ -27,31 +27,32 @@ define Package/wx200d CATEGORY:=Utilities DEPENDS:=+libpq TITLE:=weather station data collector - DESCRIPTION:=wx200d is a weather station data collector and server daemon\\\ - for the WX200, WM918, WMR918 and WMR968 weather station\\\ - hardware.\\\ + DESCRIPTION:=\ + wx200d is a weather station data collector and server daemon \\\ + for the WX200, WM918, WMR918 and WMR968 weather station \\\ + hardware. URL:=http://wx200d.sourceforge.net/ endef -define Build/Configure -$(call Build/Configure/Default,--without-libiconv-prefix \ - --without-libintl-prefix) -endef +# uses GNU configure define Build/Compile -$(call Build/Compile/Default,DESTDIR="$(PKG_INSTALL_DIR)" \ - all install) + $(MAKE) -C $(PKG_BUILD_DIR) \ + DESTDIR="$(PKG_INSTALL_DIR)" \ + all install endef define Package/wx200d/install install -d -m0755 $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/wx200 \ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/wx200 \ $(PKG_INSTALL_DIR)/usr/bin/wxstdout \ $(PKG_INSTALL_DIR)/usr/bin/wxfilter \ - $(PKG_INSTALL_DIR)/usr/bin/wxdebug $(1)/usr/bin/ + $(PKG_INSTALL_DIR)/usr/bin/wxdebug \ + $(1)/usr/bin/ install -d -m0755 $(1)/usr/sbin/ - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/wx200d \ - $(PKG_INSTALL_DIR)/usr/sbin/wxread $(1)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/wx200d \ + $(PKG_INSTALL_DIR)/usr/sbin/wxread \ + $(1)/usr/sbin/ endef $(eval $(call BuildPackage,wx200d))