Import of pkgsrc-2014Q1

net/miniupnpd/patches/patch-Makefile

@@ -1,33 +1,42 @@
-$NetBSD: patch-Makefile,v 1.3 2012/12/20 21:39:28 joerg Exp $
+$NetBSD: patch-Makefile,v 1.4 2013/10/21 10:06:57 fhajny Exp $
 
-* Honor user setting CFLAGS.
-* Do not override FWNAME if passed in
-
---- Makefile.orig	2012-03-05 20:37:13.000000000 +0000
+add missing linker flags
+--- Makefile.orig	2013-02-06 13:14:42.000000000 +0000
 +++ Makefile
-@@ -11,7 +11,7 @@
- # Linux users, please use Makefile.linux :
- #  make -f Makefile.linux
+@@ -17,7 +17,7 @@
  
--CFLAGS = -pipe -Wall -Os -ansi
-+CFLAGS += -Wall
- #CFLAGS = -pipe -Wall -O -g -DDEBUG -ansi
- CC ?= gcc
- RM = rm -f
-@@ -28,7 +28,6 @@ FWNAME = pf
- .else
- FWNAME = ipf
- .endif
--.endif
+ CFLAGS ?= -pipe -Os
+ #CFLAGS = -pipe -O -g -DDEBUG
+-CFLAGS += -ansi
++#CFLAGS += -ansi
+ CFLAGS += -Wall
+ CFLAGS += -W
+ CFLAGS += -Wstrict-prototypes
+@@ -182,22 +182,22 @@ miniupnpd: config.h $(ALLOBJS)
+ #	$(CC) $(CFLAGS) -o $@ $> $(LIBS)
  
- # 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
+ miniupnpdctl:	config.h $(MINIUPNPDCTLOBJS)
+-	$(CC) $(CFLAGS) -o $@ $(MINIUPNPDCTLOBJS)
++	$(CC) $(CFLAGS) -o $@ $(MINIUPNPDCTLOBJS) $(LIBS)
  
-+.endif
-+
- # Solaris specific CFLAGS
- .if $(OSNAME) == "SunOS"
- CFLAGS += -DSOLARIS2=`uname -r | cut -d. -f2`
+ testupnpdescgen:	config.h $(TESTUPNPDESCGENOBJS)
+-	$(CC) $(CFLAGS) -o $@ $(TESTUPNPDESCGENOBJS)
++	$(CC) $(CFLAGS) -o $@ $(TESTUPNPDESCGENOBJS) $(LIBS)
+ 
+ testgetifstats:	config.h $(TESTGETIFSTATSOBJS)
+ 	$(CC) $(CFLAGS) -o $@ $(TESTGETIFSTATSOBJS) $(LIBS)
+ 
+ testgetifaddr:	config.h $(TESTGETIFADDROBJS)
+-	$(CC) $(CFLAGS) -o $@ $(TESTGETIFADDROBJS)
++	$(CC) $(CFLAGS) -o $@ $(TESTGETIFADDROBJS) $(LIBS)
+ 
+ testupnppermissions:	config.h $(TESTUPNPPERMISSIONSOBJS)
+-	$(CC) $(CFLAGS) -o $@ $(TESTUPNPPERMISSIONSOBJS)
++	$(CC) $(CFLAGS) -o $@ $(TESTUPNPPERMISSIONSOBJS) $(LIBS)
+ 
+ testgetroute:	config.h $(TESTGETROUTEOBJS)
+-	$(CC) $(CFLAGS) -o $@ $(TESTGETROUTEOBJS)
++	$(CC) $(CFLAGS) -o $@ $(TESTGETROUTEOBJS) $(LIBS)
+ 
+ # gmake :
+ #	$(CC) $(CFLAGS) -o $@ $^