From 98d948428b5df602dd47a2ca1a3c7b09a6bd4d97 Mon Sep 17 00:00:00 2001 From: nico Date: Mon, 8 Jan 2007 11:19:08 +0000 Subject: [PATCH] misc cosmetic fixes: * reorder PKG_* variables, Build/(Un)InstallDev macros * remove unneeded configure options and PKG_INSTALL_DIR stuff * remove dupe descriptions git-svn-id: svn://svn.openwrt.org/openwrt/packages@6035 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- libs/bzip2/Makefile | 4 ++-- libs/flac/Makefile | 16 ++++++---------- libs/gd/Makefile | 4 ++-- libs/libamsel/Makefile | 20 ++++++++++---------- libs/libnet-1.0.x/Makefile | 3 ++- libs/libnet-1.1.x/Makefile | 3 ++- libs/libnids/Makefile | 17 +++++++++-------- libs/lzo/Makefile | 2 +- libs/matrixssl/Makefile | 4 ++-- libs/uclibc++/Makefile | 36 ++++++++++++++++++------------------ net/aircrack-ng/Makefile | 6 +++--- net/amwall/Makefile | 10 +++++----- net/atftp/Makefile | 3 +-- net/bwm/Makefile | 4 ++-- net/cutter/Makefile | 5 +---- net/ethtool/Makefile | 2 +- net/fprobe-ulog/Makefile | 4 ++-- net/fprobe/Makefile | 2 +- net/frickin/Makefile | 3 +-- net/gpsd/Makefile | 1 + net/iperf/Makefile | 2 +- net/ipkungfu/Makefile | 2 +- net/netperf/Makefile | 4 ++-- net/oidentd/Makefile | 2 +- net/privoxy/Makefile | 17 +++++++++-------- net/reaim/Makefile | 2 +- net/ttcp/Makefile | 3 ++- net/vncrepeater/Makefile | 1 - net/vsftpd/Makefile | 2 +- sound/mt-daapd/Makefile | 2 +- utils/mutt/Makefile | 2 +- 31 files changed, 92 insertions(+), 96 deletions(-) diff --git a/libs/bzip2/Makefile b/libs/bzip2/Makefile index fa753a4dd..af19e87bf 100644 --- a/libs/bzip2/Makefile +++ b/libs/bzip2/Makefile @@ -25,7 +25,7 @@ define Package/libbzip2 SECTION:=libs CATEGORY:=Libraries TITLE:=bzip2 is a freely available, patent free, high-quality data compressor. - URL:=http://www.bzip.org + URL:=http://www.bzip.org/ endef define Build/Compile @@ -47,4 +47,4 @@ define Build/UninstallDev $(STAGING_DIR)/usr/lib/libbz2.a endef -$(eval $(call BuildPackage,libbzip2)) +$(eval $(call Build/DefaultTargets)) diff --git a/libs/flac/Makefile b/libs/flac/Makefile index 806e9030f..2e73f849c 100644 --- a/libs/flac/Makefile +++ b/libs/flac/Makefile @@ -12,13 +12,12 @@ PKG_NAME:=flac PKG_VERSION:=1.1.2 PKG_RELEASE:=1 -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/flac PKG_MD5SUM:=2bfc127cdda02834d0491ab531a20960 PKG_CAT:=zcat -PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) include $(INCLUDE_DIR)/package.mk @@ -26,7 +25,6 @@ define Package/libflac SECTION:=libs CATEGORY:=Libraries TITLE:=Free Lossless Audio Codec library - DESCRIPTION:=Free Lossless Audio Codec (FLAC) library. URL:=ttp://flac.sourceforge.net/ endef @@ -34,19 +32,12 @@ define Build/Configure endef define Build/Compile - rm -rf $(PKG_INSTALL_DIR) - mkdir -p $(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) -f Makefile.lite \ $(TARGET_CONFIGURE_OPTS) \ RELEASE_CFLAGS="$(TARGET_CFLAGS)" \ libFLAC endef -define Package/libflac/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_BUILD_DIR)/obj/release/lib/libFLAC.so $(1)/usr/lib/ -endef - define Build/InstallDev mkdir -p $(STAGING_DIR)/usr/include $(CP) $(PKG_BUILD_DIR)/include/FLAC $(STAGING_DIR)/usr/include/ @@ -60,4 +51,9 @@ define Build/UninstallDev $(STAGING_DIR)/usr/lib/libFLAC.{a,so} endef +define Package/libflac/install + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_BUILD_DIR)/obj/release/lib/libFLAC.so $(1)/usr/lib/ +endef + $(eval $(call BuildPackage,libflac)) diff --git a/libs/gd/Makefile b/libs/gd/Makefile index 12115fa44..781031159 100644 --- a/libs/gd/Makefile +++ b/libs/gd/Makefile @@ -35,7 +35,6 @@ define Build/Configure --enable-shared \ --enable-static \ --disable-rpath \ - --with-gnu-ld \ --without-x \ --without-freetype \ --with-jpeg=$(STAGING_DIR)/usr \ @@ -65,7 +64,8 @@ define Build/InstallDev endef define Build/UninstallDev - rm -rf $(STAGING_DIR)/usr/bin/gdlib-config \ + rm -rf \ + $(STAGING_DIR)/usr/bin/gdlib-config \ $(STAGING_DIR)/usr/include/entities.h \ $(STAGING_DIR)/usr/include/gd{,_io,cache,fontg,fontl,fontmb,fonts,fontt,fx}.h \ $(STAGING_DIR)/usr/lib/libgd.{a,so*} diff --git a/libs/libamsel/Makefile b/libs/libamsel/Makefile index a9933354d..a0da70ca5 100644 --- a/libs/libamsel/Makefile +++ b/libs/libamsel/Makefile @@ -12,12 +12,12 @@ PKG_NAME:=libamsel PKG_VERSION:=20040621-cvs PKG_RELEASE:=1 -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=ftp://ftp.amselinux.net/source/ PKG_MD5SUM:=2077e620047404881a65d39c53c9917e 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 @@ -26,8 +26,8 @@ define Package/libamsel SECTION:=libs CATEGORY:=Libraries TITLE:=The amwall library - DESCRIPTION:=The amwall library.\\\ - A library for amwall configuration files. + DESCRIPTION:=\ + A library for amwall configuration files. URL:=http://amselinux.de/ endef @@ -44,17 +44,12 @@ define Build/Compile all install endef -define Package/libamsel/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib -endef - define Build/InstallDev mkdir -p $(STAGING_DIR)/usr/include $(CP) $(PKG_INSTALL_DIR)/usr/include/amsel/compat.h $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/include/compat - $(CP) $(PKG_INSTALL_DIR)/usr/include/amsel/compat/queue.h $(STAGING_DIR)/usr/include/compat - mkdir -p $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/amsel/compat/queue.h $(STAGING_DIR)/usr/include/compat/ + mkdir -p $(STAGING_DIR)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libamsel.so $(STAGING_DIR)/usr/lib/ endef @@ -65,4 +60,9 @@ define Build/UninstallDev $(STAGING_DIR)/usr/lib/libamsel.so endef +define Package/libamsel/install + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib +endef + $(eval $(call BuildPackage,libamsel)) diff --git a/libs/libnet-1.0.x/Makefile b/libs/libnet-1.0.x/Makefile index 8539df3fa..fbf45a000 100644 --- a/libs/libnet-1.0.x/Makefile +++ b/libs/libnet-1.0.x/Makefile @@ -46,7 +46,8 @@ define Build/Configure $(call Build/Configure/Default, \ --enable-shared \ --enable-static \ - --with-pf_packet=yes, \ + --with-pf_packet=yes \ + , \ ac_cv_libnet_endianess=$(ENDIANESS) \ ac_libnet_have_pf_packet=yes \ ) diff --git a/libs/libnet-1.1.x/Makefile b/libs/libnet-1.1.x/Makefile index 057cc6060..a8c204095 100644 --- a/libs/libnet-1.1.x/Makefile +++ b/libs/libnet-1.1.x/Makefile @@ -46,7 +46,8 @@ define Build/Configure $(call Build/Configure/Default, \ --enable-shared \ --enable-static \ - --with-pf_packet=yes, \ + --with-pf_packet=yes \ + , \ ac_cv_libnet_endianess=$(ENDIANESS) \ ac_libnet_have_pf_packet=yes \ ac_libnet_have_packet_socket=yes \ diff --git a/libs/libnids/Makefile b/libs/libnids/Makefile index faf5c95ec..13650dbdd 100644 --- a/libs/libnids/Makefile +++ b/libs/libnids/Makefile @@ -12,12 +12,12 @@ PKG_NAME:=libnids PKG_VERSION:=1.18 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.packetfactory.net/projects/libnids/dist/ PKG_MD5SUM:=9ee6dcdfac97bae6fe611aa27d2594a5 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 @@ -35,12 +35,12 @@ endef define Build/Configure $(call Build/Configure/Default, \ - --enable-shared \ - --enable-static \ - --with-libnet="$(STAGING_DIR)/usr/lib/libnet-1.0.x" \ - --with-libpcap="$(STAGING_DIR)/usr" \ - , \ - CFLAGS="$$$$CFLAGS $$$$CPPFLAGS" \ + --enable-shared \ + --enable-static \ + --with-libnet="$(STAGING_DIR)/usr/lib/libnet-1.0.x" \ + --with-libpcap="$(STAGING_DIR)/usr" \ + , \ + CFLAGS="$$$$CFLAGS $$$$CPPFLAGS" \ ) endef @@ -60,7 +60,8 @@ define Build/InstallDev endef define Build/UninstallDev - rm -rf $(STAGING_DIR)/usr/include/nids.h \ + rm -rf \ + $(STAGING_DIR)/usr/include/nids.h \ $(STAGING_DIR)/usr/lib/libnids.{a,so*} endef diff --git a/libs/lzo/Makefile b/libs/lzo/Makefile index 18b04c6f0..5b6409281 100644 --- a/libs/lzo/Makefile +++ b/libs/lzo/Makefile @@ -58,7 +58,7 @@ endef define Package/liblzo/install $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/liblzo2.so.* $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/liblzo2.so.* $(1)/usr/lib/ endef $(eval $(call BuildPackage,liblzo)) diff --git a/libs/matrixssl/Makefile b/libs/matrixssl/Makefile index 47d5cb4a8..90c9d1807 100644 --- a/libs/matrixssl/Makefile +++ b/libs/matrixssl/Makefile @@ -40,10 +40,10 @@ endef define Build/InstallDev mkdir -p $(STAGING_DIR)/usr/include/matrixSsl - $(CP) $(PKG_BUILD_DIR)/matrixSsl.h $(STAGING_DIR)/usr/include/matrixSsl + $(CP) $(PKG_BUILD_DIR)/matrixSsl.h $(STAGING_DIR)/usr/include/matrixSsl/ ln -sf matrixSsl/matrixSsl.h $(STAGING_DIR)/usr/include/matrixSsl.h mkdir -p $(STAGING_DIR)/usr/lib - $(CP) $(PKG_BUILD_DIR)/src/libmatrixssl.so* $(STAGING_DIR)/usr/lib + $(CP) $(PKG_BUILD_DIR)/src/libmatrixssl.so* $(STAGING_DIR)/usr/lib/ endef define Build/UninstallDev diff --git a/libs/uclibc++/Makefile b/libs/uclibc++/Makefile index 1ce921439..7fb1ccb68 100644 --- a/libs/uclibc++/Makefile +++ b/libs/uclibc++/Makefile @@ -12,12 +12,13 @@ PKG_NAME:=uclibc++ PKG_VERSION:=0.2.1 PKG_RELEASE:=1 -PKG_BUILD_DIR:=$(BUILD_DIR)/uClibc++-$(PKG_VERSION) PKG_SOURCE:=uClibc++-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://cxx.uclibc.org/src/ PKG_MD5SUM:=6e6032c49916b199ffe6a585552fd46b PKG_CAT:=bzcat +PKG_BUILD_DIR:=$(BUILD_DIR)/uClibc++-$(PKG_VERSION) + include $(INCLUDE_DIR)/package.mk define Package/uclibcxx @@ -25,21 +26,20 @@ define Package/uclibcxx SECTION:=libs CATEGORY:=Libraries TITLE:=C++ library for embedded systems - DESCRIPTION:=A standard C++ library for embedded systems URL:=http://cxx.uclibc.org/src/ endef UCLIBC_TARGET_ARCH:=$(shell echo $(ARCH) | sed -e s'/-.*//' \ - -e 's/i.86/i386/' \ - -e 's/sparc.*/sparc/' \ - -e 's/m68k.*/m68k/' \ - -e 's/ppc/powerpc/g' \ - -e 's/v850.*/v850/g' \ - -e 's/sh64/sh/' \ - -e 's/sh[234].*/sh/' \ - -e 's/mips.*/mips/' \ - -e 's/mipsel.*/mips/' \ - -e 's/cris.*/cris/' \ + -e 's/i.86/i386/' \ + -e 's/sparc.*/sparc/' \ + -e 's/m68k.*/m68k/' \ + -e 's/ppc/powerpc/g' \ + -e 's/v850.*/v850/g' \ + -e 's/sh64/sh/' \ + -e 's/sh[234].*/sh/' \ + -e 's/mips.*/mips/' \ + -e 's/mipsel.*/mips/' \ + -e 's/cris.*/cris/' \ ) define Build/Configure @@ -56,12 +56,6 @@ define Build/Compile all endef -define Package/uclibcxx/install - $(INSTALL_DIR) $(1)/lib - $(CP) $(PKG_BUILD_DIR)/src/libuClibc++*.so.* $(1)/lib/ - $(CP) $(PKG_BUILD_DIR)/src/libuClibc++-*.so $(1)/lib/ -endef - define Build/InstallDev mkdir -p $(STAGING_DIR)/usr/include $(MAKE) -C $(PKG_BUILD_DIR) \ @@ -77,4 +71,10 @@ define Build/UninstallDev rm -rf $(STAGING_DIR)/lib/libuClibc++*.{a,so*} endef +define Package/uclibcxx/install + $(INSTALL_DIR) $(1)/lib + $(CP) $(PKG_BUILD_DIR)/src/libuClibc++*.so.* $(1)/lib/ + $(CP) $(PKG_BUILD_DIR)/src/libuClibc++-*.so $(1)/lib/ +endef + $(eval $(call BuildPackage,uclibcxx)) diff --git a/net/aircrack-ng/Makefile b/net/aircrack-ng/Makefile index e1777449d..a1215b0a2 100644 --- a/net/aircrack-ng/Makefile +++ b/net/aircrack-ng/Makefile @@ -26,8 +26,8 @@ define Package/aircrack-ng SECTION:=net CATEGORY:=Network DEPENDS:=+libpthread - TITLE:=Aircrack-ng the next generation of aircrack with new features - URL:=http://www.aircrack-ng.org + TITLE:=Aircrack-ng is the next generation of aircrack with new features + URL:=http://www.aircrack-ng.org/ endef define Build/Configure @@ -41,7 +41,7 @@ define Build/Compile CFLAGS="$(TARGET_CFLAGS) -Wall" \ prefix="/usr" \ destdir="$(PKG_INSTALL_DIR)" \ - all install + all install endef define Package/aircrack-ng/install diff --git a/net/amwall/Makefile b/net/amwall/Makefile index 4a1d983ce..f2c696fe5 100644 --- a/net/amwall/Makefile +++ b/net/amwall/Makefile @@ -27,7 +27,7 @@ define Package/amwall CATEGORY:=Network DEPENDS:=+libamsel TITLE:=PF to iptables - URL:=http://www.amselinux.net + URL:=http://www.amselinux.net/ endef define Build/Compile @@ -36,7 +36,7 @@ define Build/Compile $(MAKE) -C $(PKG_BUILD_DIR) \ $(TARGET_CONFIGURE_OPTS) \ V= \ - LDIR=$(PKG_BUILD_DIR) \ + LDIR="$(PKG_BUILD_DIR)" \ AMSEL_INCLUDE="$(STAGING_DIR)/usr/include" \ OPT_LDFLAGS="-L$(STAGING_DIR)/usr/lib" \ PREFIX="/usr" \ @@ -47,11 +47,11 @@ endef define Package/amwall/install $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin + $(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/ $(INSTALL_DIR) $(1)/usr/sbin - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/* $(1)/usr/sbin + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/* $(1)/usr/sbin/ $(INSTALL_DIR) $(1)/etc/amsel - $(CP) $(PKG_INSTALL_DIR)/etc/amsel* $(1)/etc + $(CP) $(PKG_INSTALL_DIR)/etc/amsel* $(1)/etc/ endef $(eval $(call BuildPackage,amwall)) diff --git a/net/atftp/Makefile b/net/atftp/Makefile index 4c5e1d9f5..03c2a811d 100644 --- a/net/atftp/Makefile +++ b/net/atftp/Makefile @@ -19,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 @@ -64,7 +63,7 @@ endef define Package/atftp/install $(INSTALL_DIR) $(1)/usr/sbin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/atftp $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/atftp $(1)/usr/sbin/ endef define Package/atftpd/install diff --git a/net/bwm/Makefile b/net/bwm/Makefile index a58c5cbf4..8012d7bf9 100644 --- a/net/bwm/Makefile +++ b/net/bwm/Makefile @@ -33,8 +33,8 @@ define Build/Compile endef define Package/bwm/install - mkdir -p $(1)/usr/bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/$(PKG_NAME) $(1)/usr/bin/ + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/bwm $(1)/usr/bin/ endef $(eval $(call BuildPackage,bwm)) diff --git a/net/cutter/Makefile b/net/cutter/Makefile index 2b99a551a..1e2f44c01 100644 --- a/net/cutter/Makefile +++ b/net/cutter/Makefile @@ -18,7 +18,6 @@ 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 @@ -35,13 +34,11 @@ endef define Build/Compile $(TARGET_CC) $(PKG_BUILD_DIR)/cutter.c -o $(PKG_BUILD_DIR)/cutter - $(INSTALL_DIR) $(PKG_INSTALL_DIR)/usr/sbin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/cutter $(PKG_INSTALL_DIR)/usr/sbin/ endef define Package/cutter/install $(INSTALL_DIR) $(1)/usr/sbin - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/cutter $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/cutter $(1)/usr/sbin/ endef $(eval $(call BuildPackage,cutter)) diff --git a/net/ethtool/Makefile b/net/ethtool/Makefile index f7b5799c2..0dfd624f1 100644 --- a/net/ethtool/Makefile +++ b/net/ethtool/Makefile @@ -41,7 +41,7 @@ endef define Package/ethtool/install $(INSTALL_DIR) $(1)/usr/sbin - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/* $(1)/usr/sbin + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/ethtool $(1)/usr/sbin/ endef $(eval $(call BuildPackage,ethtool)) diff --git a/net/fprobe-ulog/Makefile b/net/fprobe-ulog/Makefile index cdec7c65f..9710e153e 100644 --- a/net/fprobe-ulog/Makefile +++ b/net/fprobe-ulog/Makefile @@ -45,8 +45,8 @@ define Build/Compile endef define Package/fprobe-ulog/install - mkdir -p $(1)/usr/bin - $(CP) $(PKG_BUILD_DIR)/src/fprobe-ulog $(1)/usr/bin/ + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/fprobe-ulog $(1)/usr/bin/ endef $(eval $(call BuildPackage,fprobe-ulog)) diff --git a/net/fprobe/Makefile b/net/fprobe/Makefile index 726445f24..2b9306837 100644 --- a/net/fprobe/Makefile +++ b/net/fprobe/Makefile @@ -45,7 +45,7 @@ endef define Package/fprobe/install $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_BUILD_DIR)/src/fprobe $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/fprobe $(1)/usr/bin/ endef $(eval $(call BuildPackage,fprobe)) diff --git a/net/frickin/Makefile b/net/frickin/Makefile index 0a266833c..2f311fc29 100644 --- a/net/frickin/Makefile +++ b/net/frickin/Makefile @@ -18,7 +18,6 @@ PKG_MD5SUM:= 5b2e98da2310c71c703d4617b88a173f 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 @@ -30,7 +29,7 @@ define Package/frickin 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 + URL:=http://frickin.sourceforge.net/ endef define Package/frickin/conffiles diff --git a/net/gpsd/Makefile b/net/gpsd/Makefile index 883a274de..bd6189cea 100644 --- a/net/gpsd/Makefile +++ b/net/gpsd/Makefile @@ -29,6 +29,7 @@ define Package/gpsd CATEGORY:=Network DEPENDS:=+libpthread +uclibcxx TITLE:=An interface daemon for GPS receivers + URL:=http://gpsd.berlios.de/ endef define Build/Configure diff --git a/net/iperf/Makefile b/net/iperf/Makefile index 47b012651..714b32d85 100644 --- a/net/iperf/Makefile +++ b/net/iperf/Makefile @@ -52,7 +52,7 @@ endef define Package/iperf/install $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/iperf $(1)/usr/bin + $(CP) $(PKG_INSTALL_DIR)/usr/bin/iperf $(1)/usr/bin/ endef $(eval $(call BuildPackage,iperf)) diff --git a/net/ipkungfu/Makefile b/net/ipkungfu/Makefile index 19723bb03..c6df3d78b 100644 --- a/net/ipkungfu/Makefile +++ b/net/ipkungfu/Makefile @@ -30,7 +30,7 @@ define Package/ipkungfu IPKungFu is an iptables-based Linux firewall.\\\ It aims to simplify the configuration of Internet \\\ connection sharing, port forwarding, and packet filtering. - URL:=http://www.linuxkungfu.org + URL:=http://www.linuxkungfu.org/ endef define Package/ipkungfu/conffiles diff --git a/net/netperf/Makefile b/net/netperf/Makefile index 82f176df5..75766818c 100644 --- a/net/netperf/Makefile +++ b/net/netperf/Makefile @@ -25,8 +25,8 @@ include $(INCLUDE_DIR)/package.mk define Package/netperf SECTION:=net CATEGORY:=Network - TITLE:=network performance measurement tool - URL:=http://www.netperf.org + TITLE:=Network performance measurement tool + URL:=http://www.netperf.org/ endef define Build/Compile diff --git a/net/oidentd/Makefile b/net/oidentd/Makefile index 5aa4ae88a..edbe0f459 100644 --- a/net/oidentd/Makefile +++ b/net/oidentd/Makefile @@ -38,7 +38,7 @@ endef define Package/oidentd/install $(INSTALL_DIR) $(1)/usr/sbin - $(CP) $(PKG_BUILD_DIR)/src/$(PKG_NAME) $(1)/usr/sbin/ + $(CP) $(PKG_BUILD_DIR)/src/oidentd $(1)/usr/sbin/ $(INSTALL_DIR) $(1)/etc/init.d $(CP) ./files/oidentd.init $(1)/etc/init.d/oidentd endef diff --git a/net/privoxy/Makefile b/net/privoxy/Makefile index 659ae9ec7..04813699b 100644 --- a/net/privoxy/Makefile +++ b/net/privoxy/Makefile @@ -11,10 +11,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:=privoxy PKG_VERSION:=3.0.3 PKG_RELEASE:=1 -PKG_MD5SUM:=b0710be8af09409bfb03f52523a17010 -PKG_SOURCE_URL:=@SF/ijbswa PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-stable-src.tar.gz +PKG_SOURCE_URL:=@SF/ijbswa +PKG_MD5SUM:=b0710be8af09409bfb03f52523a17010 PKG_CAT:=zcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)-stable @@ -27,12 +27,13 @@ define Package/privoxy CATEGORY:=Network DEPENDS:=+libpcre +libpthread TITLE:=web proxy with advanced filtering capabilities - DESCRIPTION:=Privoxy is a web proxy with advanced filtering capabilities for\\\ - protecting privacy, modifying web page content, managing cookies,\\\ - controlling access, and removing ads, banners, pop-ups and other\\\ - obnoxious Internet junk. Privoxy has a very flexible configuration\\\ - and can be customized to suit individual needs and tastes. Privoxy\\\ - has application for both stand-alone systems and multi-user networks.\\\ + DESCRIPTION:=\ + Privoxy is a web proxy with advanced filtering capabilities for \\\ + protecting privacy, modifying web page content, managing cookies, \\\ + controlling access, and removing ads, banners, pop-ups and other \\\ + obnoxious Internet junk. Privoxy has a very flexible configuration \\\ + and can be customized to suit individual needs and tastes. Privoxy \\\ + has application for both stand-alone systems and multi-user networks. URL:=http://www.privoxy.org/ endef diff --git a/net/reaim/Makefile b/net/reaim/Makefile index e4c63ed61..8f90aa452 100644 --- a/net/reaim/Makefile +++ b/net/reaim/Makefile @@ -28,7 +28,7 @@ define Package/reaim DEPENDS:=+iptables TITLE:=A transparent AIM / MSN proxy DESCRIPTION:=ReAIM is a proxy for file transfers with MSN/AIM. - URL:=http://reaim.sourceforge.net + URL:=http://reaim.sourceforge.net/ endef define Build/Compile diff --git a/net/ttcp/Makefile b/net/ttcp/Makefile index 002874225..7f3f53d97 100644 --- a/net/ttcp/Makefile +++ b/net/ttcp/Makefile @@ -20,7 +20,8 @@ define Package/ttcp SECTION:=net CATEGORY:=Network TITLE:=A TCP connection performance tester - DESCRIPTION:=A small utility to test TCP connection performance + DESCRIPTION:=\ + A small utility to test TCP connection performance. URL:=https://dev.openwrt.org/browser/packages/net/ttcp/ endef diff --git a/net/vncrepeater/Makefile b/net/vncrepeater/Makefile index 9c9748627..b1d36772b 100644 --- a/net/vncrepeater/Makefile +++ b/net/vncrepeater/Makefile @@ -18,7 +18,6 @@ PKG_MD5SUM:=5951740a8a103d7d9668558b3639c6c4 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 diff --git a/net/vsftpd/Makefile b/net/vsftpd/Makefile index 90a2b429b..5c4aaa77c 100644 --- a/net/vsftpd/Makefile +++ b/net/vsftpd/Makefile @@ -12,12 +12,12 @@ PKG_NAME:=vsftpd PKG_VERSION:=2.0.4 PKG_RELEASE:=1 -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=ftp://vsftpd.beasts.org/users/cevans/ PKG_MD5SUM:=c0bf8c7b8e15ab15827172786fc56115 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 diff --git a/sound/mt-daapd/Makefile b/sound/mt-daapd/Makefile index 798ef5989..23144e90d 100644 --- a/sound/mt-daapd/Makefile +++ b/sound/mt-daapd/Makefile @@ -29,7 +29,7 @@ define Package/mt-daapd 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. - URL:=http://www.mt-daapd.org + URL:=http://www.mt-daapd.org/ endef define Package/mt-daapd/conffiles diff --git a/utils/mutt/Makefile b/utils/mutt/Makefile index 1a83d6e6f..8528b3639 100644 --- a/utils/mutt/Makefile +++ b/utils/mutt/Makefile @@ -26,7 +26,7 @@ define Package/mutt CATEGORY:=Utilities DEPENDS:=+libopenssl +libncurses TITLE:=Console mail client - URL:=http://www.mutt.org + URL:=http://www.mutt.org/ endef define Build/Configure