cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Maintenance update to libnatpmp-20130911

Browse Source
This commit is contained in:
dcoppa 2013-10-31 08:12:06 +00:00
parent 060ec75bc7
commit 383bf3b354
3 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/miniupnp/libnatpmp/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.2 2012/10/18 14:56:55 dcoppa Exp $
# $OpenBSD: Makefile,v 1.3 2013/10/31 08:12:06 dcoppa Exp $
SHARED_ONLY = Yes
COMMENT = NAT Port Mapping Protocol client library
DISTNAME = libnatpmp-20120821
DISTNAME = libnatpmp-20130911
SHARED_LIBS = natpmp 0.0

4
net/miniupnp/libnatpmp/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (libnatpmp-20120821.tar.gz) = WyZbPOXW0FozvkOquPZLDzSizAsBUA5j/hZ8f59E0rg=
SIZE (libnatpmp-20120821.tar.gz) = 17832
SHA256 (libnatpmp-20130911.tar.gz) = ow2DuRdVhcwPW/91POfrXYOq7LYiLMrGcO11n+pZXX0=
SIZE (libnatpmp-20130911.tar.gz) = 18744

34
net/miniupnp/libnatpmp/patches/patch-Makefile
View File

@ -1,14 +1,16 @@
$OpenBSD: patch-Makefile,v 1.2 2012/10/18 14:56:55 dcoppa Exp $
--- Makefile.orig Thu Oct 18 10:07:48 2012
+++ Makefile Thu Oct 18 10:11:59 2012
@@ -5,13 +5,13 @@
$OpenBSD: patch-Makefile,v 1.3 2013/10/31 08:12:06 dcoppa Exp $
--- Makefile.orig Tue Sep 10 22:15:06 2013
+++ Makefile Thu Oct 31 08:15:57 2013
@@ -5,7 +5,7 @@
# http://miniupnp.free.fr/libnatpmp.html
OS = $(shell uname -s)
-CC = gcc
+CC ?= gcc
INSTALL = install
VERSION = $(shell cat VERSION)
@@ -22,7 +22,7 @@ endif
# APIVERSION is used in soname
APIVERSION = 1
#LDFLAGS = -Wl,--no-undefined
@ -17,18 +19,20 @@ $OpenBSD: patch-Makefile,v 1.2 2012/10/18 14:56:55 dcoppa Exp $
#CFLAGS = -g -O0
CFLAGS += -fPIC
CFLAGS += -Wall
@@ -28,8 +28,8 @@ ifeq ($(OS), Darwin)
SONAME = $(basename $(SHAREDLIB)).$(APIVERSION).dylib
CFLAGS := -DMACOSX -D_DARWIN_C_SOURCE $(CFLAGS)
@@ -46,9 +46,9 @@ ifneq (,$(findstring WIN,$(OS)))
CC = i686-w64-mingw32-gcc
EXTRA_LD = -lws2_32 -lIphlpapi -Wl,--no-undefined -Wl,--enable-runtime-pseudo-reloc --Wl,kill-at
else
- SHAREDLIB = libnatpmp.so
- JNISHAREDLIB = libjninatpmp.so
- SONAME = $(SHAREDLIB).$(APIVERSION)
+ SHAREDLIB ?= libnatpmp.so
+ JNISHAREDLIB ?= libjninatpmp.so
+ SONAME ?= $(SHAREDLIB).$(APIVERSION)
endif
endif
HEADERS = natpmp.h
@@ -62,13 +62,12 @@ depend:
@@ -87,13 +87,12 @@ depend:
install: $(HEADERS) $(STATICLIB) $(SHAREDLIB) natpmpc-shared
$(INSTALL) -d $(INSTALLDIRINC)
@ -44,14 +48,14 @@ $OpenBSD: patch-Makefile,v 1.2 2012/10/18 14:56:55 dcoppa Exp $
- ln -s -f $(SONAME) $(INSTALLDIRLIB)/$(SHAREDLIB)
+ $(INSTALL_PROGRAM) natpmpc-shared $(INSTALLDIRBIN)/natpmpc
cleaninstall:
$(RM) $(addprefix $(INSTALLDIRINC), $(HEADERS))
@@ -91,7 +90,7 @@ $(SHAREDLIB): $(LIBOBJS)
$(JNIHEADERS): fr/free/miniupnp/libnatpmp/NatPmp.class
javah -jni fr.free.miniupnp.libnatpmp.NatPmp
@@ -156,7 +155,7 @@ $(SHAREDLIB): $(LIBOBJS)
ifeq ($(OS), Darwin)
$(CC) -dynamiclib -Wl,-install_name,$(SONAME) -o $@ $^
else
- $(CC) -shared -Wl,-soname,$(SONAME) -o $@ $^
+ $(CC) -shared -o $@ $^
- $(CC) -shared -Wl,-soname,$(SONAME) -o $@ $^ $(EXTRA_LD)
+ $(CC) -shared -o $@ $^ $(EXTRA_LD)
endif
# DO NOT DELETE