mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-25 04:43:33 +00:00
Code Issues Releases Activity

- update

Browse Source 
- 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)
This commit is contained in:
Chris Rees 2014-12-19 17:21:37 +00:00
parent 978c38d9df
commit 7ca68b8aaa
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=374955
3 changed files with 10 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
net/libnatpmp/Makefile
View File

@ -2,7 +2,7 @@
# $FreeBSD$ # $FreeBSD$
PORTNAME= libnatpmp PORTNAME= libnatpmp
PORTVERSION= 20120821 PORTVERSION= 20140401
CATEGORIES= net CATEGORIES= net
MASTER_SITES= http://miniupnp.free.fr/files/ MASTER_SITES= http://miniupnp.free.fr/files/
@ -14,7 +14,8 @@ LICENSE= BSD3CLAUSE
USES= gmake USES= gmake
USE_LDCONFIG= yes USE_LDCONFIG= yes
MAKE_ENV+= INSTALLPREFIX=${PREFIX} MAKE_ARGS+= CC="${CC}"
MAKE_ENV+= INSTALLPREFIX=${STAGEDIR}${PREFIX}
CFLAGS+= -fPIC CFLAGS+= -fPIC
@ -24,6 +25,11 @@ PLIST_FILES= bin/natpmpc \
lib/libnatpmp.so \ lib/libnatpmp.so \
lib/libnatpmp.so.1 lib/libnatpmp.so.1
post-patch:
@${REINPLACE_CMD} -e 's/^LIBSPEC //' \
-e '/declspec\.h/d' \
${WRKSRC}/natpmp.h
post-install: post-install:
@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/natpmpc \ @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/natpmpc \
${STAGEDIR}${PREFIX}/lib/libnatpmp.so.1 ${STAGEDIR}${PREFIX}/lib/libnatpmp.so.1

4
net/libnatpmp/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (libnatpmp-20120821.tar.gz) = 5b265b3ce5d6d05a33be43aab8f64b0f34a2cc0b01500e63fe167c7f9f44d2b8 SHA256 (libnatpmp-20140401.tar.gz) = b2ce5e626a21c795cba2d118f26e54aaa89de29d4611c440fafc49a2a5bedabb
SIZE (libnatpmp-20120821.tar.gz) = 17832 SIZE (libnatpmp-20140401.tar.gz) = 23302

34
net/libnatpmp/files/patch-Makefile
View File

@ -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))