- update

- clarify LICENSE to be BSD3CLAUSE like net/miniupnpc
- replace patch-Makefile with a simple MAKE_(ARGS|ENV) override
- drop redundant -fPIC

PR:		ports/194030
Submitted by:	Jan Beich
Approved by:	Hung-Yi Chen (maintainer)

3 files changed, 10 insertions, 38 deletions

diff --git a/net/libnatpmp/Makefile b/net/libnatpmp/Makefile
index 8646b74689bf..44e3a8eb0a32 100644
--- a/net/libnatpmp/Makefile
+++ b/net/libnatpmp/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	libnatpmp
-PORTVERSION=	20120821
+PORTVERSION=	20140401
 CATEGORIES=	net
 MASTER_SITES=	http://miniupnp.free.fr/files/
 
@@ -14,7 +14,8 @@ LICENSE=	BSD3CLAUSE
 USES=		gmake
 USE_LDCONFIG=	yes
 
-MAKE_ENV+=	INSTALLPREFIX=${PREFIX}
+MAKE_ARGS+=	CC="${CC}"
+MAKE_ENV+=	INSTALLPREFIX=${STAGEDIR}${PREFIX}
 
 CFLAGS+=	-fPIC
 
@@ -24,6 +25,11 @@ PLIST_FILES=	bin/natpmpc \
 		lib/libnatpmp.so \
 		lib/libnatpmp.so.1
 
+post-patch:
+	@${REINPLACE_CMD} -e 's/^LIBSPEC //' \
+		-e '/declspec\.h/d' \
+		${WRKSRC}/natpmp.h
+
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/natpmpc \
 		${STAGEDIR}${PREFIX}/lib/libnatpmp.so.1
diff --git a/net/libnatpmp/distinfo b/net/libnatpmp/distinfo
index 2c79b5b42459..7b7553879d7c 100644
--- a/net/libnatpmp/distinfo
+++ b/net/libnatpmp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libnatpmp-20120821.tar.gz) = 5b265b3ce5d6d05a33be43aab8f64b0f34a2cc0b01500e63fe167c7f9f44d2b8
-SIZE (libnatpmp-20120821.tar.gz) = 17832
+SHA256 (libnatpmp-20140401.tar.gz) = b2ce5e626a21c795cba2d118f26e54aaa89de29d4611c440fafc49a2a5bedabb
+SIZE (libnatpmp-20140401.tar.gz) = 23302
diff --git a/net/libnatpmp/files/patch-Makefile b/net/libnatpmp/files/patch-Makefile
deleted file mode 100644
index bee078f38b33..000000000000
--- a/net/libnatpmp/files/patch-Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
---- ./Makefile.orig	2012-08-21 19:24:15.000000000 +0200
-+++ ./Makefile	2014-04-17 15:33:06.454854016 +0200
-@@ -5,7 +5,7 @@
- # http://miniupnp.free.fr/libnatpmp.html
- 
- OS = $(shell uname -s)
--CC = gcc
-+CC ?= gcc
- INSTALL = install
- 
- # APIVERSION is used in soname
-@@ -61,14 +61,14 @@
- 	makedepend -f$(MAKEFILE_LIST) -Y $(OBJS:.o=.c) 2>/dev/null
- 
- install:	$(HEADERS) $(STATICLIB) $(SHAREDLIB) natpmpc-shared
--	$(INSTALL) -d $(INSTALLDIRINC)
--	$(INSTALL) -m 644 $(HEADERS) $(INSTALLDIRINC)
--	$(INSTALL) -d $(INSTALLDIRLIB)
--	$(INSTALL) -m 644 $(STATICLIB) $(INSTALLDIRLIB)
--	$(INSTALL) -m 644 $(SHAREDLIB) $(INSTALLDIRLIB)/$(SONAME)
--	$(INSTALL) -d $(INSTALLDIRBIN)
--	$(INSTALL) -m 755 natpmpc-shared $(INSTALLDIRBIN)/natpmpc
--	ln -s -f $(SONAME) $(INSTALLDIRLIB)/$(SHAREDLIB)
-+	$(INSTALL) -d $(DESTDIR)$(INSTALLDIRINC)
-+	$(INSTALL) -m 644 $(HEADERS) $(DESTDIR)$(INSTALLDIRINC)
-+	$(INSTALL) -d $(DESTDIR)$(INSTALLDIRLIB)
-+	$(INSTALL) -m 644 $(STATICLIB) $(DESTDIR)$(INSTALLDIRLIB)
-+	$(INSTALL) -m 644 $(SHAREDLIB) $(DESTDIR)$(INSTALLDIRLIB)/$(SONAME)
-+	$(INSTALL) -d $(DESTDIR)$(INSTALLDIRBIN)
-+	$(INSTALL) -m 755 natpmpc-shared $(DESTDIR)$(INSTALLDIRBIN)/natpmpc
-+	ln -s -f $(SONAME) $(DESTDIR)$(INSTALLDIRLIB)/$(SHAREDLIB)
- 
- cleaninstall:
- 	$(RM) $(addprefix $(INSTALLDIRINC), $(HEADERS))