Attachment #147823 for bug #194030




# $FreeBSD$

PORTNAME=	libnatpmp
PORTVERSION=	20140401
CATEGORIES=	net
MASTER_SITES=	http://miniupnp.free.fr/files/


MAINTAINER=	gaod@hychen.org
COMMENT=	NAT-PMP lightweight library

LICENSE=	BSD3CLAUSE

USES=		gmake
USE_LDCONFIG=	yes

MAKE_ARGS+=	CC="${CC}"
MAKE_ENV+=	INSTALLPREFIX="${STAGEDIR}${PREFIX}" 

CFLAGS+=	-fPIC

PLIST_FILES=	bin/natpmpc \
		include/natpmp.h \
		lib/libnatpmp.a \

Lines 1-2 Link Here

(-)net/libnatpmp/distinfo (-2 / +2 lines)
1	SHA256 (libnatpmp-20120821.tar.gz) = 5b265b3ce5d6d05a33be43aab8f64b0f34a2cc0b01500e63fe167c7f9f44d2b8	1	SHA256 (libnatpmp-20140401.tar.gz) = b2ce5e626a21c795cba2d118f26e54aaa89de29d4611c440fafc49a2a5bedabb
2	SIZE (libnatpmp-20120821.tar.gz) = 17832	2	SIZE (libnatpmp-20140401.tar.gz) = 23302




--- ./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))

Return to bug 194030

Lines 2-8 Link Here

(-)net/libnatpmp/Makefile (-5 / +4 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= libnatpmp	4	PORTNAME= libnatpmp
5	PORTVERSION= 20120821	5	PORTVERSION= 20140401
6	CATEGORIES= net	6	CATEGORIES= net
7	MASTER_SITES= http://miniupnp.free.fr/files/	7	MASTER_SITES= http://miniupnp.free.fr/files/
8		8
Lines 9-23 MASTER_SITES= http://miniupnp.free.fr/files/ Link Here
9	MAINTAINER= gaod@hychen.org	9	MAINTAINER= gaod@hychen.org
10	COMMENT= NAT-PMP lightweight library	10	COMMENT= NAT-PMP lightweight library
11		11
12	LICENSE= BSD	12	LICENSE= BSD3CLAUSE
13		13
14	USES= gmake	14	USES= gmake
15	USE_LDCONFIG= yes	15	USE_LDCONFIG= yes
16		16
17	MAKE_ENV+= INSTALLPREFIX=${PREFIX}	17	MAKE_ARGS+= CC="${CC}"
		18	MAKE_ENV+= INSTALLPREFIX="${STAGEDIR}${PREFIX}"
18		19
19	CFLAGS+= -fPIC
20
21	PLIST_FILES= bin/natpmpc \	20	PLIST_FILES= bin/natpmpc \
22	include/natpmp.h \	21	include/natpmp.h \
23	lib/libnatpmp.a \	22	lib/libnatpmp.a \

Lines 1-34 Link Here

(-)net/libnatpmp/files/patch-Makefile (-34 lines)
1	--- ./Makefile.orig 2012-08-21 19:24:15.000000000 +0200
2	+++ ./Makefile 2014-04-17 15:33:06.454854016 +0200
3	@@ -5,7 +5,7 @@
4	# http://miniupnp.free.fr/libnatpmp.html
5
6	OS = $(shell uname -s)
7	-CC = gcc
8	+CC ?= gcc
9	INSTALL = install
10
11	# APIVERSION is used in soname
12	@@ -61,14 +61,14 @@
13	makedepend -f$(MAKEFILE_LIST) -Y $(OBJS:.o=.c) 2>/dev/null
14
15	install: $(HEADERS) $(STATICLIB) $(SHAREDLIB) natpmpc-shared
16	- $(INSTALL) -d $(INSTALLDIRINC)
17	- $(INSTALL) -m 644 $(HEADERS) $(INSTALLDIRINC)
18	- $(INSTALL) -d $(INSTALLDIRLIB)
19	- $(INSTALL) -m 644 $(STATICLIB) $(INSTALLDIRLIB)
20	- $(INSTALL) -m 644 $(SHAREDLIB) $(INSTALLDIRLIB)/$(SONAME)
21	- $(INSTALL) -d $(INSTALLDIRBIN)
22	- $(INSTALL) -m 755 natpmpc-shared $(INSTALLDIRBIN)/natpmpc
23	- ln -s -f $(SONAME) $(INSTALLDIRLIB)/$(SHAREDLIB)
24	+ $(INSTALL) -d $(DESTDIR)$(INSTALLDIRINC)
25	+ $(INSTALL) -m 644 $(HEADERS) $(DESTDIR)$(INSTALLDIRINC)
26	+ $(INSTALL) -d $(DESTDIR)$(INSTALLDIRLIB)
27	+ $(INSTALL) -m 644 $(STATICLIB) $(DESTDIR)$(INSTALLDIRLIB)
28	+ $(INSTALL) -m 644 $(SHAREDLIB) $(DESTDIR)$(INSTALLDIRLIB)/$(SONAME)
29	+ $(INSTALL) -d $(DESTDIR)$(INSTALLDIRBIN)
30	+ $(INSTALL) -m 755 natpmpc-shared $(DESTDIR)$(INSTALLDIRBIN)/natpmpc
31	+ ln -s -f $(SONAME) $(DESTDIR)$(INSTALLDIRLIB)/$(SHAREDLIB)
32
33	cleaninstall:
34	$(RM) $(addprefix $(INSTALLDIRINC), $(HEADERS))