- update to 1.7

PR:           ports/168462
Submitted by: Tor Halvard Furulund <squat _at_ squat.no> (maintainer)
Approved by:  decke (mentor)

5 files changed, 27 insertions, 43 deletions

diff --git a/net/miniupnpd/Makefile b/net/miniupnpd/Makefile
index 7298c8d5011a..df1d56d398b7 100644
--- a/net/miniupnpd/Makefile
+++ b/net/miniupnpd/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	miniupnpd
-PORTVERSION=	1.6
+PORTVERSION=	1.7
 PORTEPOCH=	1
 CATEGORIES=	net
 MASTER_SITES=	http://miniupnp.tuxfamily.org/files/ \
diff --git a/net/miniupnpd/distinfo b/net/miniupnpd/distinfo
index 6cf599be1363..d936b65ff1cf 100644
--- a/net/miniupnpd/distinfo
+++ b/net/miniupnpd/distinfo
@@ -1,2 +1,2 @@
-SHA256 (miniupnpd-1.6.tar.gz) = a26744025038a207d96a2dce96aa76db095886eb68dee87321b9da55cb1c8585
-SIZE (miniupnpd-1.6.tar.gz) = 124917
+SHA256 (miniupnpd-1.7.tar.gz) = 27cfacea0a2aefc109b44497b756bf3e4ab9f92beb55fc492b09df5c46c6bb74
+SIZE (miniupnpd-1.7.tar.gz) = 138047
diff --git a/net/miniupnpd/files/patch-Makefile b/net/miniupnpd/files/patch-Makefile
index 453e3f547ac6..d3b820fac183 100644
--- a/net/miniupnpd/files/patch-Makefile
+++ b/net/miniupnpd/files/patch-Makefile
@@ -1,15 +1,15 @@
---- Makefile.orig	2011-05-27 00:49:17.000000000 +0200
-+++ Makefile	2012-05-11 19:42:37.000000000 +0200
-@@ -11,7 +11,7 @@
- # Linux users, please use Makefile.linux :
- #  make -f Makefile.linux
+--- Makefile.orig	2012-05-30 10:27:24.587226775 +0200
++++ Makefile	2012-05-30 10:28:12.497226510 +0200
+@@ -15,7 +15,7 @@
+ # $ CONFIG_OPTIONS="--ipv6 --igd2" make
+ #
  
--CFLAGS = -pipe -Wall -Os
-+CFLAGS += -pipe -Wall
- #CFLAGS = -pipe -Wall -O -g -DDEBUG
- CC ?= gcc
- RM = rm -f
-@@ -32,10 +32,12 @@
+-CFLAGS ?= -pipe -Os
++CFLAGS ?= -pipe
+ #CFLAGS = -pipe -O -g -DDEBUG
+ CFLAGS += -ansi
+ CFLAGS += -Wall
+@@ -43,10 +43,12 @@
  
  # better way to find if we are using ipf or pf
  .if $(OSNAME) == "FreeBSD"
diff --git a/net/miniupnpd/files/patch-genconfig.sh b/net/miniupnpd/files/patch-genconfig.sh
index b81040fa382c..ecbc3a4f1690 100644
--- a/net/miniupnpd/files/patch-genconfig.sh
+++ b/net/miniupnpd/files/patch-genconfig.sh
@@ -1,40 +1,35 @@
---- genconfig.sh.orig	2009-09-04 18:21:24.000000000 +0200
-+++ genconfig.sh	2009-11-25 12:31:04.344410750 +0100
-@@ -66,18 +66,25 @@
- 		fi
+--- genconfig.sh.orig	2012-05-24 20:05:47.000000000 +0200
++++ genconfig.sh	2012-05-30 20:12:57.685877655 +0200
+@@ -112,18 +112,20 @@
  		# new way to see which one to use PF or IPF.
  		# see http://miniupnp.tuxfamily.org/forum/viewtopic.php?p=957
--		# source file with handy subroutines like checkyesno
+ 		# source file with handy subroutines like checkyesno
 -		. /etc/rc.subr
 -		# source config file so we can probe vars
 -		. /etc/rc.conf
 -		if checkyesno ipfilter_enable; then
 -			echo "Using ipf"
 -			FW=ipf
--			echo "#define USE_IPF 1" >> ${CONFIGFILE}
 -		elif checkyesno pf_enable; then
 -			echo "Using pf"
 -			FW=pf
--			echo "#define USE_PF 1" >> ${CONFIGFILE}
-+		# source file wource config file so we can probe vars
+-		elif checkyesno firewall_enable; then
+-			echo "Using ifpw"
+-			FW=ipfw
 +		if [ -f /etc/rc.subr ] && [ -f /etc/rc.conf ]; then
-+			# source file with handy subroutines like checkyesno
 +			. /etc/rc.subr
 +			# source config file so we can probe vars
 +			. /etc/rc.conf
 +			if checkyesno ipfilter_enable; then
 +				echo "Using ipf"
 +				FW=ipf
-+				echo "#define USE_IPF 1" >> ${CONFIGFILE}
 +			elif checkyesno pf_enable; then
 +				echo "Using pf"
 +				FW=pf
-+				echo "#define USE_PF 1" >> ${CONFIGFILE}
-+			else
-+				echo "Could not detect usage of ipf or pf. Compiling for pf by default"
-+				FW=pf
-+				echo "#define USE_PF 1" >> ${CONFIGFILE}
++			elif checkyesno firewall_enable; then
++				echo "Using ifpw"
++				FW=ipfw
 +			fi
- 		# TODO : Add support for IPFW
- 		# echo "#define USE_IPFW 1" >> ${CONFIGFILE}
- 		# FW=ipfw
+ 		else
+ 			echo "Could not detect usage of ipf, pf, ipfw. Compiling for pf by default"
+ 			FW=pf
diff --git a/net/miniupnpd/files/pf_enable_filter_rules.patch b/net/miniupnpd/files/pf_enable_filter_rules.patch
deleted file mode 100644
index 377bdc296b7b..000000000000
--- a/net/miniupnpd/files/pf_enable_filter_rules.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- work/miniupnpd-1.4.20100921/genconfig.sh	2010-09-21 10:36:12.000000000 -0500
-+++ genconfig.sh	2010-10-11 10:23:44.000000000 -0500
-@@ -209,7 +209,7 @@
- 
- echo "/* Uncomment the following line to enable generation of" >> ${CONFIGFILE}
- echo " * filter rules with pf */" >> ${CONFIGFILE}
--echo "/*#define PF_ENABLE_FILTER_RULES*/">> ${CONFIGFILE}
-+echo "#define PF_ENABLE_FILTER_RULES">> ${CONFIGFILE}
- echo "" >> ${CONFIGFILE}
- 
- echo "/* Uncomment the following line to enable caching of results of" >> ${CONFIGFILE}