The diff below updates both miniupnpc and miniupnpd to the latest
version.
okey?
Index: miniupnpc/Makefile
===================================================================
RCS file: /cvs/ports/net/miniupnp/miniupnpc/Makefile,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 Makefile
--- miniupnpc/Makefile 14 Mar 2013 20:01:13 -0000 1.4
+++ miniupnpc/Makefile 16 May 2013 13:15:47 -0000
@@ -3,17 +3,14 @@
COMMENT-main= UPnP IGD client lightweight library
COMMENT-python= python module for miniupnpc
-MODPY_EGG_VERSION= 1.7
+MODPY_EGG_VERSION= 1.8
DISTNAME= miniupnpc-${MODPY_EGG_VERSION}
PKGNAME-main= ${DISTNAME}
PKGNAME-python= py-${DISTNAME}
-REVISION-main= 0
-REVISION-python=0
-
-SHARED_LIBS += miniupnpc 0.0
+SHARED_LIBS += miniupnpc 1.0
WANTLIB-main += c
Index: miniupnpc/distinfo
===================================================================
RCS file: /cvs/ports/net/miniupnp/miniupnpc/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- miniupnpc/distinfo 18 Oct 2012 14:56:55 -0000 1.2
+++ miniupnpc/distinfo 16 May 2013 13:15:47 -0000
@@ -1,2 +1,2 @@
-SHA256 (miniupnpc-1.7.tar.gz) = Ft0kVr6bS/KQZnwA7rOMd61H6yEHVpstrc/O6MmvYzc=
-SIZE (miniupnpc-1.7.tar.gz) = 68327
+SHA256 (miniupnpc-1.8.tar.gz) = vF9zx7AFYlLBiIqA5gdXh6Hh6RErgI+GOiRUg/95hZw=
+SIZE (miniupnpc-1.8.tar.gz) = 70624
Index: miniupnpc/patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/net/miniupnp/miniupnpc/patches/patch-Makefile,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-Makefile
--- miniupnpc/patches/patch-Makefile 18 Oct 2012 14:56:55 -0000 1.2
+++ miniupnpc/patches/patch-Makefile 16 May 2013 13:15:47 -0000
@@ -1,25 +1,40 @@
$OpenBSD: patch-Makefile,v 1.2 2012/10/18 14:56:55 dcoppa Exp $
---- Makefile.orig Tue May 1 22:11:49 2012
-+++ Makefile Thu Oct 18 10:32:38 2012
-@@ -39,7 +39,7 @@ JNAERATORBASEURL = http://jnaerator.googlecode.com/fil
+--- Makefile.orig Mon Jan 28 11:10:25 2013
++++ Makefile Thu May 16 13:39:11 2013
+@@ -48,7 +48,7 @@ JNAERATORBASEURL = http://jnaerator.googlecode.com/fil
#LDLIBS=-lsocket -lnsl -lresolv
# APIVERSION is used to build SONAME
--APIVERSION = 8
-+APIVERSION ?= 8
+-APIVERSION = 9
++APIVERSION ?= 9
SRCS = igd_desc_parse.c miniupnpc.c minixml.c minisoap.c miniwget.c \
upnpc.c upnpcommands.c upnpreplyparse.c testminixml.c \
-@@ -101,7 +101,7 @@ INSTALLPREFIX ?= $(PREFIX)/usr
+@@ -80,14 +80,12 @@ ifeq ($(OS), Darwin)
+ SONAME = $(basename $(SHAREDLIBRARY)).$(APIVERSION).dylib
+ CFLAGS := -DMACOSX -D_DARWIN_C_SOURCE $(CFLAGS)
+ else
+-ifeq ($(OS), Linux)
+ SHAREDLIBRARY = libminiupnpc.so
+ SONAME = $(SHAREDLIBRARY).$(APIVERSION)
+ endif
+ ifeq ($(JARSUFFIX), win32)
+ SHAREDLIBRARY = miniupnpc.dll
+ endif
+-endif
+
+ EXECUTABLES = upnpc-static
+ EXECUTABLES_ADDTESTS = testminixml minixmlvalid testupnpreplyparse \
+@@ -116,7 +114,7 @@ INSTALLPREFIX ?= $(PREFIX)/usr
INSTALLDIRINC = $(INSTALLPREFIX)/include/miniupnpc
- INSTALLDIRLIB = $(INSTALLPREFIX)/lib
+ INSTALLDIRLIB = $(INSTALLPREFIX)/$(LIBDIR)
INSTALLDIRBIN = $(INSTALLPREFIX)/bin
-INSTALLDIRMAN = $(INSTALLPREFIX)/share/man
+INSTALLDIRMAN = $(INSTALLPREFIX)/man
FILESTOINSTALL = $(LIBRARY) $(EXECUTABLES)
ifneq ($(OS), AmigaOS)
-@@ -122,11 +122,11 @@ check: validateminixml validateminiwget
+@@ -137,11 +135,11 @@ check: validateminixml validateminiwget
everything: all $(EXECUTABLES_ADDTESTS)
pythonmodule: $(LIBRARY) miniupnpcmodule.c setup.py
@@ -31,9 +46,9 @@ $OpenBSD: patch-Makefile,v 1.2 2012/10/1
- python setup.py install
+ ${MODPY_BIN} setup.py install --prefix=$(PREFIX)
- validateminixml: minixmlvalid
- @echo "minixml validation test"
-@@ -158,7 +158,6 @@ install: updateversion $(FILESTOINSTALL)
+ pythonmodule3: $(LIBRARY) miniupnpcmodule.c setup.py
+ python3 setup.py build
+@@ -183,7 +181,6 @@ install: updateversion $(FILESTOINSTALL)
$(INSTALL) -m 644 $(LIBRARY) $(INSTALLDIRLIB)
ifneq ($(OS), AmigaOS)
$(INSTALL) -m 644 $(SHAREDLIBRARY) $(INSTALLDIRLIB)/$(SONAME)
@@ -41,7 +56,7 @@ $OpenBSD: patch-Makefile,v 1.2 2012/10/1
endif
$(INSTALL) -d $(INSTALLDIRBIN)
ifeq ($(OS), AmigaOS)
-@@ -189,7 +188,7 @@ ifeq ($(OS), Darwin)
+@@ -214,7 +211,7 @@ ifeq ($(OS), Darwin)
# $(CC) -dynamiclib $(LDFLAGS) -Wl,-install_name,$(SONAME) -o $@ $^
$(CC) -dynamiclib $(LDFLAGS)
-Wl,-install_name,$(INSTALLDIRLIB)/$(SONAME) -o $@ $^
else
Index: miniupnpc/patches/patch-miniupnpcmodule_c
===================================================================
RCS file: /cvs/ports/net/miniupnp/miniupnpc/patches/patch-miniupnpcmodule_c,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-miniupnpcmodule_c
--- miniupnpc/patches/patch-miniupnpcmodule_c 18 Oct 2012 14:56:55 -0000
1.1
+++ miniupnpc/patches/patch-miniupnpcmodule_c 16 May 2013 13:15:47 -0000
@@ -2,9 +2,9 @@ $OpenBSD: patch-miniupnpcmodule_c,v 1.1
Fix error: expected expression before '/' token
---- miniupnpcmodule.c.orig Thu Oct 18 10:29:03 2012
-+++ miniupnpcmodule.c Thu Oct 18 10:29:46 2012
-@@ -246,9 +246,9 @@ Py_END_ALLOW_THREADS
+--- miniupnpcmodule.c.orig Thu Aug 30 10:15:18 2012
++++ miniupnpcmodule.c Thu May 16 13:09:01 2013
+@@ -256,9 +256,9 @@ Py_END_ALLOW_THREADS
}
else
{
Index: miniupnpc/patches/patch-setup_py
===================================================================
RCS file: miniupnpc/patches/patch-setup_py
diff -N miniupnpc/patches/patch-setup_py
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ miniupnpc/patches/patch-setup_py 16 May 2013 13:15:47 -0000
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+Fix version
+
+--- setup.py.orig Thu May 16 13:55:03 2013
++++ setup.py Thu May 16 13:55:15 2013
+@@ -10,7 +10,7 @@ from distutils.core import setup, Extension
+ from distutils import sysconfig
+ sysconfig.get_config_vars()["OPT"] = ''
+ sysconfig.get_config_vars()["CFLAGS"] = ''
+-setup(name="miniupnpc", version="1.7",
++setup(name="miniupnpc", version="1.8",
+ ext_modules=[
+ Extension(name="miniupnpc", sources=["miniupnpcmodule.c"],
+ extra_objects=["libminiupnpc.a"])
Index: miniupnpd/Makefile
===================================================================
RCS file: /cvs/ports/net/miniupnp/miniupnpd/Makefile,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 Makefile
--- miniupnpd/Makefile 14 Mar 2013 20:01:13 -0000 1.6
+++ miniupnpd/Makefile 16 May 2013 13:15:47 -0000
@@ -2,22 +2,19 @@
COMMENT= UPnP IGD client lightweight library
-DISTNAME= miniupnpd-1.7
-REVISION= 1
+DISTNAME= miniupnpd-1.8
WANTLIB += c kvm
MAKE_FLAGS= INSTALLETCDIR=${PREFIX}/share/examples/miniupnpd \
- INSTALLMANDIR=${PREFIX}/share/man/man1
+ INSTALLMANDIR=${PREFIX}/man/man8
FAKE_FLAGS= PREFIX=${TRUEPREFIX}
-pre-configure:
- ${SUBST_CMD} ${WRKSRC}/miniupnpd.1
-
post-install:
- ${INSTALL_MAN_DIR} ${PREFIX}/man/man1
- ${INSTALL_MAN} ${WRKSRC}/miniupnpd.1 \
- ${PREFIX}/man/man1/miniupnpd.1
+ ${INSTALL_MAN_DIR} ${PREFIX}/man/man8
+ ${SUBST_CMD} -o ${SHAREOWN} -g ${SHAREGRP} -m ${MANMODE} \
+ -c ${WRKBUILD}/miniupnpd.8 \
+ ${PREFIX}/man/man8/miniupnpd.8
.include <bsd.port.mk>
Index: miniupnpd/distinfo
===================================================================
RCS file: /cvs/ports/net/miniupnp/miniupnpd/distinfo,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 distinfo
--- miniupnpd/distinfo 18 Oct 2012 14:56:55 -0000 1.3
+++ miniupnpd/distinfo 16 May 2013 13:15:47 -0000
@@ -1,2 +1,2 @@
-SHA256 (miniupnpd-1.7.tar.gz) = J8+s6goq78EJtESXt1a/Pkq5+SvrVfxJKwnfXEbGu3Q=
-SIZE (miniupnpd-1.7.tar.gz) = 138047
+SHA256 (miniupnpd-1.8.tar.gz) = 5FOpIloog+dZ0J4VxRuwJluKAZ0RMkNBMeaSn+8Adrs=
+SIZE (miniupnpd-1.8.tar.gz) = 146679
Index: miniupnpd/patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/net/miniupnp/miniupnpd/patches/patch-Makefile,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-Makefile
--- miniupnpd/patches/patch-Makefile 18 Oct 2012 14:56:55 -0000 1.3
+++ miniupnpd/patches/patch-Makefile 16 May 2013 13:15:47 -0000
@@ -1,8 +1,8 @@
$OpenBSD: patch-Makefile,v 1.3 2012/10/18 14:56:55 dcoppa Exp $
---- Makefile.orig Thu Oct 18 10:47:55 2012
-+++ Makefile Thu Oct 18 10:49:26 2012
-@@ -140,7 +140,7 @@ clean:
- miniupnpdctl.o testgetifaddr.o \
+--- Makefile.orig Wed Feb 6 14:14:42 2013
++++ Makefile Thu May 16 14:24:25 2013
+@@ -145,7 +145,7 @@ clean:
+ miniupnpdctl.o testgetifaddr.o testgetroute.o \
$(PFOBJS) $(IPFOBJS) $(IPFWOBJS)
-install: miniupnpd genuuid
Index: miniupnpd/patches/patch-miniupnpd_1
===================================================================
RCS file: miniupnpd/patches/patch-miniupnpd_1
diff -N miniupnpd/patches/patch-miniupnpd_1
--- miniupnpd/patches/patch-miniupnpd_1 13 Jan 2012 09:22:50 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-miniupnpd_1,v 1.1.1.1 2012/01/13 09:22:50 ajacoutot Exp $
---- miniupnpd.1.orig Thu May 13 11:18:12 2010
-+++ miniupnpd.1 Thu May 13 11:18:31 2010
-@@ -17,7 +17,7 @@ clients on the LAN to ask for port redirections.
- .SH OPTIONS
- .TP
- .B \-f file
--load the config from file. default is /etc/miniupnpd.conf.
-+load the config from file. default is ${SYSCONFDIR}/miniupnpd.conf.
- .TP
- .B \-i interface
- interface used to connect to the internet.
Index: miniupnpd/patches/patch-miniupnpd_8
===================================================================
RCS file: miniupnpd/patches/patch-miniupnpd_8
diff -N miniupnpd/patches/patch-miniupnpd_8
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ miniupnpd/patches/patch-miniupnpd_8 16 May 2013 13:15:47 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- miniupnpd.8.orig Thu May 13 11:18:12 2010
++++ miniupnpd.8 Thu May 13 11:18:31 2010
+@@ -17,7 +17,7 @@ clients on the LAN to ask for port redirections.
+ .SH OPTIONS
+ .TP
+ .B \-f file
+-load the config from file. default is /etc/miniupnpd.conf.
++load the config from file. default is ${SYSCONFDIR}/miniupnpd.conf.
+ .TP
+ .B \-i interface
+ interface used to connect to the internet.
Index: miniupnpd/pkg/PLIST
===================================================================
RCS file: /cvs/ports/net/miniupnp/miniupnpd/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 PLIST
--- miniupnpd/pkg/PLIST 13 Jan 2012 09:22:50 -0000 1.1.1.1
+++ miniupnpd/pkg/PLIST 16 May 2013 13:15:47 -0000
@@ -1,5 +1,5 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2012/01/13 09:22:50 ajacoutot Exp $
-@man man/man1/miniupnpd.1
+@man man/man8/miniupnpd.8
@bin sbin/miniupnpd
share/doc/pkg-readmes/${FULLPKGNAME}
share/examples/miniupnpd/
