X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=net%2Fpeerguardian%2FMakefile;h=9f0335ddb63d6bbb5a2ef615dcfc533757e53332;hb=53077230170bf11548959b8c8eeb70107cc7c32a;hp=243e07eaa994967d9d0448fc4ef4d5d3e597c441;hpb=4ad2d9ae97a202ed90759bf4f13a05a24b31a2a0;p=packages.git

diff --git a/net/peerguardian/Makefile b/net/peerguardian/Makefile
index 243e07eaa..9f0335ddb 100644
--- a/net/peerguardian/Makefile
+++ b/net/peerguardian/Makefile
@@ -1,69 +1,65 @@
 #
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2010 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:=peerguardian
 PKG_VERSION:=1.5beta
-PKG_RELEASE:=1
+PKG_RELEASE:=3
 
 PKG_SOURCE:=pglinux-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/peerguardian
 PKG_MD5SUM:=0fb2bc5501b031604fc56eec3bd35fa4
-PKG_CAT:=zcat
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/pglinux-$(PKG_VERSION)
+PKG_BUILD_PARALLEL:=1
 
-PKG_BUILDDEP:=iptables
+PKG_BUILD_DEPENDS:=iptables
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/peerguardian
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:= +libpthread +libncurses
+  SUBMENU:=P2P
+  DEPENDS:= +libncurses +libpthread +libnetfilter-queue
   TITLE:=PeerGuardian for Linux
-  DESCRIPTION:=\
-	PeerGuardian helps protect your privacy by blocking many ranges \\\
-	of aggressive IPs while you use P2P.
   URL:=http://phoenixlabs.org/
 endef
 
+define Package/peerguardian/description
+ PeerGuardian helps protect your privacy by blocking many ranges  of aggressive 
+ IPs while you use P2P.
+endef
+
 define Package/peerguardian/conffiles
 /etc/PG.conf
 /etc/p2p.p2b.p2p
 endef
 
-# commas are interpreted by the $(call ...) macro, so define an intermediate variable holding our settings
-PKG_CONFIGURE_LIBS:=-Wl,-Bdynamic,-luClibc++,-Bstatic,-lstdc++,-Bdynamic,-lm,-lc
+EXTRA_CFLAGS:=-fno-rtti -I$(STAGING_DIR)/usr/include/libnetfilter_queue/
 
-define Build/Configure
-	$(call Build/Configure/Default, \
-		, \
-		CXXFLAGS="$$$$CXXFLAGS $$$$CPPFLAGS -fno-builtin -fno-rtti" \
-		LIBS="$(PKG_CONFIGURE_LIBS)" \
-	)
-endef
+CONFIGURE_VARS+= \
+	LIBS="-lm"
 
 define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		CXXLD="$(TARGET_CC)"
+	$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
+		CXXLD="$(TARGET_CXX)"
 endef
 
 define Package/peerguardian/install
-	install -d -m0755 $(1)/etc
-	install -m0644 $(PKG_BUILD_DIR)/PG.conf $(1)/etc/
-	install -m0644 $(PKG_BUILD_DIR)/p2p.p2b.p2p $(1)/etc/
-	install -d -m0755 $(1)/usr/sbin
-	install -m0755 $(PKG_BUILD_DIR)/peerguardnf $(1)/usr/sbin/
-	install -m0755 $(PKG_BUILD_DIR)/pgtext $(1)/usr/sbin/
-	install -d -m0755 $(1)/etc/init.d
-	install -m0644 ./files/peerguardian.init $(1)/etc/init.d/peerguardian
+	$(INSTALL_DIR) $(1)/etc
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/PG.conf $(1)/etc/
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/p2p.p2b.p2p $(1)/etc/
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/peerguardnf $(1)/usr/sbin/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/pgtext $(1)/usr/sbin/
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) ./files/peerguardian.init $(1)/etc/init.d/peerguardian
 endef
 
 $(eval $(call BuildPackage,peerguardian))