Tue Nov 20 11:22:00 2012 UTC ()
Fix package Makefile to not override FWNAME if passed in from the build
environment - addresses issue noted by Jan Danielsson on pkgsrc-users
Bump PKGREVISION


(abs)
diff -r1.7 -r1.8 pkgsrc/net/miniupnpd/Makefile
diff -r1.5 -r1.6 pkgsrc/net/miniupnpd/distinfo
diff -r1.1 -r1.2 pkgsrc/net/miniupnpd/patches/patch-Makefile
cvs diff -r1.7 -r1.8 pkgsrc/net/miniupnpd/Makefile (expand / switch to unified diff)

--- pkgsrc/net/miniupnpd/Makefile 2012/10/23 17:18:37 1.7
+++ pkgsrc/net/miniupnpd/Makefile 2012/11/20 11:21:59 1.8
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.7 2012/10/23 17:18:37 asau Exp $ 1# $NetBSD: Makefile,v 1.8 2012/11/20 11:21:59 abs Exp $
2# 
3 2
4DISTNAME= miniupnpd-1.6.20120320 3DISTNAME= miniupnpd-1.6.20120320
 4PKGREVISION= 1
5CATEGORIES= net 5CATEGORIES= net
6MASTER_SITES= http://miniupnp.free.fr/files/download.php?file= 6MASTER_SITES= http://miniupnp.free.fr/files/download.php?file=
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://miniupnp.free.fr/ 9HOMEPAGE= http://miniupnp.free.fr/
10COMMENT= UPnP IGD service with NAT-PMP support 10COMMENT= UPnP IGD service with NAT-PMP support
11LICENSE= modified-bsd 11LICENSE= modified-bsd
12 12
13MAKE_JOBS_SAFE= no 13MAKE_JOBS_SAFE= no
14 14
15EGDIR= ${PREFIX}/share/examples/miniupnpd 15EGDIR= ${PREFIX}/share/examples/miniupnpd
16CONF_FILES= ${EGDIR}/miniupnpd.conf ${PKG_SYSCONFDIR}/miniupnpd.conf 16CONF_FILES= ${EGDIR}/miniupnpd.conf ${PKG_SYSCONFDIR}/miniupnpd.conf
17 17
cvs diff -r1.5 -r1.6 pkgsrc/net/miniupnpd/distinfo (expand / switch to unified diff)

--- pkgsrc/net/miniupnpd/distinfo 2012/03/22 12:56:51 1.5
+++ pkgsrc/net/miniupnpd/distinfo 2012/11/20 11:21:59 1.6
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.5 2012/03/22 12:56:51 obache Exp $ 1$NetBSD: distinfo,v 1.6 2012/11/20 11:21:59 abs Exp $
2 2
3SHA1 (miniupnpd-1.6.20120320.tar.gz) = f99a6f102e02a37e6d048814ea3e5aed9214998d 3SHA1 (miniupnpd-1.6.20120320.tar.gz) = f99a6f102e02a37e6d048814ea3e5aed9214998d
4RMD160 (miniupnpd-1.6.20120320.tar.gz) = cb7da6525d8d1a5ddc9deab07dc2289cca63fd71 4RMD160 (miniupnpd-1.6.20120320.tar.gz) = cb7da6525d8d1a5ddc9deab07dc2289cca63fd71
5Size (miniupnpd-1.6.20120320.tar.gz) = 127968 bytes 5Size (miniupnpd-1.6.20120320.tar.gz) = 127968 bytes
6SHA1 (patch-Makefile) = dd25b91d30b5a505999795842d4d6902db950fc7 6SHA1 (patch-Makefile) = 39412683a34a14120fee6bfafaf66bec48fcb759
cvs diff -r1.1 -r1.2 pkgsrc/net/miniupnpd/patches/Attic/patch-Makefile (expand / switch to unified diff)

--- pkgsrc/net/miniupnpd/patches/Attic/patch-Makefile 2012/03/22 12:56:51 1.1
+++ pkgsrc/net/miniupnpd/patches/Attic/patch-Makefile 2012/11/20 11:22:00 1.2
@@ -1,15 +1,24 @@ @@ -1,15 +1,24 @@
1$NetBSD: patch-Makefile,v 1.1 2012/03/22 12:56:51 obache Exp $ 1$NetBSD: patch-Makefile,v 1.2 2012/11/20 11:22:00 abs Exp $
2 2
3* Honor user setting CFLAGS. 3* Honor user setting CFLAGS.
 4* Do not override FWNAME if passed in
4 5
5--- Makefile.orig 2012-03-05 20:37:13.000000000 +0000 6--- Makefile.orig 2012-03-05 20:37:13.000000000 +0000
6+++ Makefile 7+++ Makefile
7@@ -11,7 +11,7 @@ 8@@ -28,7 +28,6 @@ FWNAME = pf
8 # Linux users, please use Makefile.linux : 9 .else
9 # make -f Makefile.linux 10 FWNAME = ipf
 11 .endif
 12-.endif
10  13
11-CFLAGS = -pipe -Wall -Os -ansi 14 # better way to find if we are using ipf or pf
12+CFLAGS ?= -pipe -Wall -Os -ansi 15 .if $(OSNAME) == "FreeBSD"
13 #CFLAGS = -pipe -Wall -O -g -DDEBUG -ansi 16@@ -53,6 +52,8 @@ FWNAME != . /etc/rc.subr; . /etc/rc.conf
14 CC ?= gcc 17 FWNAME = ipfw
15 RM = rm -f 18 .endif
 19
 20+.endif
 21+
 22 # Solaris specific CFLAGS
 23 .if $(OSNAME) == "SunOS"
 24 CFLAGS += -DSOLARIS2=`uname -r | cut -d. -f2`