package haproxy: fix gcc 4.7 warning

[openwrt/svn-archive/archive.git] / net / peerguardian / Makefile

diff --git a/net/peerguardian/Makefile b/net/peerguardian/Makefile
index c7b4c62b14eaf3ef57e6b2f16d38100a6d2bcc2f..395f7bba0c12342ce9ff928a08e2ef5ed2cb6ffc 100644 (file)
--- a/net/peerguardian/Makefile
+++ b/net/peerguardian/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2010 OpenWrt.org
+# Copyright (C) 2006-2012 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,29 +8,30 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=peerguardian
-PKG_VERSION:=1.5beta
-PKG_RELEASE:=2
+PKG_VERSION:=2.2.2
+PKG_RELEASE:=1
 
-PKG_SOURCE:=pglinux-$(PKG_VERSION).tar.gz
+PKG_SOURCE:=pgl-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/peerguardian
-PKG_MD5SUM:=0fb2bc5501b031604fc56eec3bd35fa4
+PKG_MD5SUM:=
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/pglinux-$(PKG_VERSION)
-
-PKG_BUILD_DEPENDS:=iptables
+PKG_BUILD_DIR:=$(BUILD_DIR)/pgl-$(PKG_VERSION)
+PKG_BUILD_PARALLEL:=1
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/peerguardian
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:= +libncurses +libpthread +uclibcxx +libnetfilter-queue
+  SUBMENU:=P2P
+  DEPENDS:=+libnetfilter-queue +zlib
   TITLE:=PeerGuardian for Linux
   URL:=http://phoenixlabs.org/
 endef
 
 define Package/peerguardian/description
- PeerGuardian helps protect your privacy by blocking many ranges  of aggressive 
+ PeerGuardian helps protect your privacy by blocking many ranges  of aggressive
  IPs while you use P2P.
 endef
 
@@ -39,22 +40,22 @@ define Package/peerguardian/conffiles
 /etc/p2p.p2b.p2p
 endef
 
-CONFIGURE_VARS+= \
-       CXXFLAGS="$$$$CXXFLAGS $$$$CPPFLAGS -fno-builtin -fno-rtti -I$(STAGING_DIR)/usr/include/libnetfilter_queue/" \
-       LIBS="-nodefaultlibs -luClibc++ -Wl,-Bstatic,-lstdc++,-Bdynamic -lm $(LIBGCC_S)" \
-
-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               CXXLD="$(TARGET_CC)"
-endef
+CONFIGURE_ARGS += \
+       --enable-lowmem \
+       --without-qt4 \
+       --disable-dbus \
+       --disable-networkmanager \
+       --disable-cron
 
 define Package/peerguardian/install
-       $(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)/etc/
+       $(CP) $(PKG_INSTALL_DIR)/etc/pgl $(1)/etc/
+       $(INSTALL_DIR) $(1)/usr/bin
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/pglcmd $(1)/usr/bin/
        $(INSTALL_DIR) $(1)/usr/sbin
-       $(INSTALL_BIN) $(PKG_BUILD_DIR)/peerguardnf $(1)/usr/sbin/
-       $(INSTALL_BIN) $(PKG_BUILD_DIR)/pgtext $(1)/usr/sbin/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/pgld $(1)/usr/sbin/
+       $(INSTALL_DIR) $(1)/usr/lib
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/pgl $(1)/usr/lib/
        $(INSTALL_DIR) $(1)/etc/init.d
        $(INSTALL_BIN) ./files/peerguardian.init $(1)/etc/init.d/peerguardian
 endef