From: Oliver Ertl <oliver@ertl-net.net>
Date: Thu, 20 Sep 2007 15:39:43 +0000 (+0000)
Subject: portsentry: * Fix linking (#2414), Thanks for reporting! * Refresh patches
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=62bdfd5010a9e9b15c3a178d1d7ef555c5a2334b;p=openwrt%2Fsvn-archive%2Fpackages.git

portsentry: * Fix linking (#2414), Thanks for reporting! * Refresh patches

SVN-Revision: 8877
---

diff --git a/net/portsentry/Makefile b/net/portsentry/Makefile
index e1f77d6f4..d02a9ff48 100644
--- a/net/portsentry/Makefile
+++ b/net/portsentry/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2007 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -15,7 +15,6 @@ PKG_RELEASE:=1
 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
 
@@ -32,12 +31,8 @@ define Package/portsentry/conffiles
 /etc/portsentry.conf
 endef
 
-define Build/Configure
-endef
-
-define Build/Compile	
-	$(MAKE) -C $(PKG_BUILD_DIR) linux
-endef
+MAKE_FLAGS += \
+	linux \
 
 define Package/portsentry/install	
 	$(INSTALL_DIR) $(1)/etc
diff --git a/net/portsentry/patches/100-conf_location.patch b/net/portsentry/patches/100-conf_location.patch
index 457c9c827..d6448259b 100644
--- a/net/portsentry/patches/100-conf_location.patch
+++ b/net/portsentry/patches/100-conf_location.patch
@@ -1,5 +1,7 @@
---- portsentry/portsentry_config.h	2003-05-23 20:10:13.000000000 +0200
-+++ portsentry.old/portsentry_config.h	2005-07-09 21:21:15.000000000 +0200
+Index: portsentry_beta/portsentry_config.h
+===================================================================
+--- portsentry_beta.orig/portsentry_config.h	2007-09-20 17:30:32.000000000 +0200
++++ portsentry_beta/portsentry_config.h	2007-09-20 17:30:32.000000000 +0200
 @@ -22,7 +22,7 @@
  
  /* These are probably ok. Be sure you change the Makefile if you */
diff --git a/net/portsentry/patches/101-postsentry_c.patch b/net/portsentry/patches/101-postsentry_c.patch
index e36bb2a12..51374bd08 100644
--- a/net/portsentry/patches/101-postsentry_c.patch
+++ b/net/portsentry/patches/101-postsentry_c.patch
@@ -1,5 +1,7 @@
---- portsentry/portsentry.c	2003-05-23 20:10:13.000000000 +0200
-+++ portsentry.old/portsentry.c	2005-07-09 21:57:24.000000000 +0200
+Index: portsentry_beta/portsentry.c
+===================================================================
+--- portsentry_beta.orig/portsentry.c	2007-09-20 17:30:32.000000000 +0200
++++ portsentry_beta/portsentry.c	2007-09-20 17:30:32.000000000 +0200
 @@ -1581,8 +1581,7 @@
  Usage (void)
  {