Update to libnatpmp-20140401

net/miniupnp/libnatpmp/Makefile

@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.5 2013/12/11 10:45:49 dcoppa Exp $
+# $OpenBSD: Makefile,v 1.6 2014/04/30 05:09:29 dcoppa Exp $
 
 SHARED_ONLY =	Yes
 
 COMMENT =	NAT Port Mapping Protocol client library
 
-DISTNAME =	libnatpmp-20131126
+DISTNAME =	libnatpmp-20140401
 
 SHARED_LIBS =	natpmp 0.0
 
@@ -17,7 +17,8 @@ MAKE_FLAGS =	CC="${CC}"
 MAKE_ENV =	SHAREDLIB=libnatpmp.so.${LIBnatpmp_VERSION} \
 		SONAME=libnatpmp.so.${LIBnatpmp_VERSION}
 
-FAKE_FLAGS =	INSTALL_DATA="${INSTALL_DATA}" \
+FAKE_FLAGS =	INSTALL="${INSTALL_DATA_DIR}" \
+		INSTALL_DATA="${INSTALL_DATA}" \
 		INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
 		INSTALLPREFIX=${WRKINST}${PREFIX}
 

net/miniupnp/libnatpmp/distinfo

@@ -1,2 +1,2 @@
-SHA256 (libnatpmp-20131126.tar.gz) = SPH/o8vTcxwId5ClMk84bIWRADEimMBuf9iddkpuwsQ=
-SIZE (libnatpmp-20131126.tar.gz) = 22972
+SHA256 (libnatpmp-20140401.tar.gz) = ss5eYmohx5XLotEY8m5Uqqid4p1GEcRA+vxJoqW+2rs=
+SIZE (libnatpmp-20140401.tar.gz) = 23302

net/miniupnp/libnatpmp/patches/patch-Makefile

@@ -1,38 +1,30 @@
-$OpenBSD: patch-Makefile,v 1.4 2013/12/11 10:45:49 dcoppa Exp $
---- Makefile.orig	Tue Nov 26 09:48:03 2013
-+++ Makefile	Wed Dec 11 11:38:37 2013
-@@ -5,7 +5,7 @@
+$OpenBSD: patch-Makefile,v 1.5 2014/04/30 05:09:29 dcoppa Exp $
+--- Makefile.orig	Mon Dec  9 21:52:28 2013
++++ Makefile	Wed Apr 30 07:05:05 2014
+@@ -5,8 +5,8 @@
  # http://miniupnp.free.fr/libnatpmp.html
  
  OS = $(shell uname -s)
 -CC = gcc
+-INSTALL = install -p
 +CC ?= gcc
- INSTALL = install
++INSTALL ?= install -p
+ ARCH = $(shell uname -m | sed -e s/i.86/i686/)
  VERSION = $(shell cat VERSION)
  
-@@ -22,7 +22,7 @@ endif
- # APIVERSION is used in soname
- APIVERSION = 1
- #LDFLAGS = -Wl,--no-undefined
--CFLAGS = -Os
-+CFLAGS ?= -Os
- #CFLAGS = -g -O0
- CFLAGS += -fPIC
- CFLAGS += -Wall
-@@ -47,9 +47,9 @@ ifneq (,$(findstring WIN,$(OS)))
+@@ -49,9 +49,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
+   JNISHAREDLIB = libjninatpmp.so
+-  SONAME = $(SHAREDLIB).$(APIVERSION)
 +  SONAME ?= $(SHAREDLIB).$(APIVERSION)
+   SONAMEFLAGS=-Wl,-soname,$(JNISHAREDLIB)
  endif
  endif
- 
-@@ -88,13 +88,12 @@ depend:
+@@ -93,13 +93,12 @@ depend:
  
  install:	$(HEADERS) $(STATICLIB) $(SHAREDLIB) natpmpc-shared
  	$(INSTALL) -d $(INSTALLDIRINC)
@@ -49,8 +41,8 @@ $OpenBSD: patch-Makefile,v 1.4 2013/12/11 10:45:49 dcoppa Exp $
 +	$(INSTALL_PROGRAM) natpmpc-shared $(INSTALLDIRBIN)/natpmpc
  
  $(JNIHEADERS): fr/free/miniupnp/libnatpmp/NatPmp.class
- 	javah -jni fr.free.miniupnp.libnatpmp.NatPmp
-@@ -157,7 +156,7 @@ $(SHAREDLIB):	$(LIBOBJS)
+ 	$(JAVAH) -jni fr.free.miniupnp.libnatpmp.NatPmp
+@@ -165,7 +164,7 @@ $(SHAREDLIB):	$(LIBOBJS)
  ifeq ($(OS), Darwin)
  	$(CC) -dynamiclib -Wl,-install_name,$(SONAME) -o $@ $^
  else

net/miniupnp/libnatpmp/patches/patch-natpmp_h

@@ -0,0 +1,15 @@
+$OpenBSD: patch-natpmp_h,v 1.1 2014/04/30 05:09:29 dcoppa Exp $
+--- natpmp.h.orig	Tue Apr 29 22:01:36 2014
++++ natpmp.h	Tue Apr 29 22:03:40 2014
+@@ -48,10 +48,9 @@ typedef unsigned short uint16_t;
+ #define in_addr_t uint32_t
+ #include "declspec.h"
+ #else	/* WIN32 */
++#define LIBSPEC
+ #include <netinet/in.h>
+ #endif	/* WIN32 */
+-
+-#include "declspec.h"
+ 
+ typedef struct {
+ 	int s;	/* socket */