diff options
| author | abs <abs@pkgsrc.org> | 2012-11-20 11:21:59 +0000 |
|---|---|---|
| committer | abs <abs@pkgsrc.org> | 2012-11-20 11:21:59 +0000 |
| commit | b395c06f22ca95e4bda4768038edbfc9917dcab0 (patch) | |
| tree | f4e71fd2e27cd7ae7dfb1f31bb37397c68b25ac5 /net | |
| parent | 3cb24b0e21f2be89a1603047f438c6a33f6c5008 (diff) | |
| download | pkgsrc-b395c06f22ca95e4bda4768038edbfc9917dcab0.tar.gz | |
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
Diffstat (limited to 'net')
| -rw-r--r-- | net/miniupnpd/Makefile | 4 | ||||
| -rw-r--r-- | net/miniupnpd/distinfo | 4 | ||||
| -rw-r--r-- | net/miniupnpd/patches/patch-Makefile | 27 |
3 files changed, 22 insertions, 13 deletions
diff --git a/net/miniupnpd/Makefile b/net/miniupnpd/Makefile index fbbddf1ce8b..8260f0c1142 100644 --- a/net/miniupnpd/Makefile +++ b/net/miniupnpd/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.7 2012/10/23 17:18:37 asau Exp $ -# +# $NetBSD: Makefile,v 1.8 2012/11/20 11:21:59 abs Exp $ DISTNAME= miniupnpd-1.6.20120320 +PKGREVISION= 1 CATEGORIES= net MASTER_SITES= http://miniupnp.free.fr/files/download.php?file= diff --git a/net/miniupnpd/distinfo b/net/miniupnpd/distinfo index 6d52d5f6fff..befb23e451d 100644 --- a/net/miniupnpd/distinfo +++ b/net/miniupnpd/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.5 2012/03/22 12:56:51 obache Exp $ +$NetBSD: distinfo,v 1.6 2012/11/20 11:21:59 abs Exp $ SHA1 (miniupnpd-1.6.20120320.tar.gz) = f99a6f102e02a37e6d048814ea3e5aed9214998d RMD160 (miniupnpd-1.6.20120320.tar.gz) = cb7da6525d8d1a5ddc9deab07dc2289cca63fd71 Size (miniupnpd-1.6.20120320.tar.gz) = 127968 bytes -SHA1 (patch-Makefile) = dd25b91d30b5a505999795842d4d6902db950fc7 +SHA1 (patch-Makefile) = 39412683a34a14120fee6bfafaf66bec48fcb759 diff --git a/net/miniupnpd/patches/patch-Makefile b/net/miniupnpd/patches/patch-Makefile index 36666db9f49..f86a173fce3 100644 --- a/net/miniupnpd/patches/patch-Makefile +++ b/net/miniupnpd/patches/patch-Makefile @@ -1,15 +1,24 @@ -$NetBSD: patch-Makefile,v 1.1 2012/03/22 12:56:51 obache Exp $ +$NetBSD: patch-Makefile,v 1.2 2012/11/20 11:22:00 abs Exp $ * Honor user setting CFLAGS. +* Do not override FWNAME if passed in --- Makefile.orig 2012-03-05 20:37:13.000000000 +0000 +++ Makefile -@@ -11,7 +11,7 @@ - # Linux users, please use Makefile.linux : - # make -f Makefile.linux +@@ -28,7 +28,6 @@ FWNAME = pf + .else + FWNAME = ipf + .endif +-.endif --CFLAGS = -pipe -Wall -Os -ansi -+CFLAGS ?= -pipe -Wall -Os -ansi - #CFLAGS = -pipe -Wall -O -g -DDEBUG -ansi - CC ?= gcc - RM = rm -f + # better way to find if we are using ipf or pf + .if $(OSNAME) == "FreeBSD" +@@ -53,6 +52,8 @@ FWNAME != . /etc/rc.subr; . /etc/rc.conf + FWNAME = ipfw + .endif + ++.endif ++ + # Solaris specific CFLAGS + .if $(OSNAME) == "SunOS" + CFLAGS += -DSOLARIS2=`uname -r | cut -d. -f2` |