svn commit: r399210 - in head/irc/iroffer-dinoex: . files
Dirk Meyer
dinoex at FreeBSD.org
Tue Oct 13 18:41:05 UTC 2015
Author: dinoex
Date: Tue Oct 13 18:41:03 2015
New Revision: 399210
URL: https://svnweb.freebsd.org/changeset/ports/399210
Log:
- fix API for miniupnpc-1.9.20151008
Added:
head/irc/iroffer-dinoex/files/patch-Configure (contents, props changed)
head/irc/iroffer-dinoex/files/patch-upnp.c (contents, props changed)
Modified:
head/irc/iroffer-dinoex/Makefile
Modified: head/irc/iroffer-dinoex/Makefile
==============================================================================
--- head/irc/iroffer-dinoex/Makefile Tue Oct 13 18:39:45 2015 (r399209)
+++ head/irc/iroffer-dinoex/Makefile Tue Oct 13 18:41:03 2015 (r399210)
@@ -2,6 +2,7 @@
PORTNAME= iroffer
PORTVERSION= 3.30
+PORTREVISION= 1
CATEGORIES= irc
MASTER_SITES= http://iroffer.dinoex.net/
PKGNAMESUFFIX= -dinoex${PKGNAMESUFFIX2}
Added: head/irc/iroffer-dinoex/files/patch-Configure
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/irc/iroffer-dinoex/files/patch-Configure Tue Oct 13 18:41:03 2015 (r399210)
@@ -0,0 +1,32 @@
+Index: Configure
+===================================================================
+RCS file: /usr/home/public/iroffer/Configure,v
+retrieving revision 1.255
+retrieving revision 1.256
+diff -u -r1.255 -r1.256
+--- Configure 3 Mar 2015 21:06:37 -0000 1.255
++++ Configure 13 Oct 2015 18:28:17 -0000 1.256
+@@ -860,7 +860,7 @@
+ fi
+ else
+ ${msg} "${irt_notfound}. ${irt_error} ${irt_nocc}"
+- maketype="gcc"
++ cctype="gcc"
+ waserror
+ fi
+ fi
+@@ -1654,10 +1654,14 @@
+ #include <miniupnpc/miniupnpc.h>
+ #include <miniupnpc/upnpcommands.h>
+ ${main1}
++#if MINIUPNPC_API_VERSION >= 14
++ upnpDiscover(2000, NULL, NULL, 0, 0, 2U, NULL);
++#else
+ #ifdef UPNPDISCOVER_SUCCESS
+ upnpDiscover(2000, NULL, NULL, 0, 0, NULL);
+ #else
+ upnpDiscover(2000, NULL, NULL, 0);
++#endif /* UPNPDISCOVER_SUCCESS */
+ #endif
+ ${main2}" > config.temp.c
+ if $cctype -o config.temp -DUSE_UPNP $WARNS $WERROR $CFLAGS "-I${LOCALBASE}/include" config.temp.c "-L${LOCALBASE}/lib" -lminiupnpc $LDFLAGS $libs $LIBS; then
Added: head/irc/iroffer-dinoex/files/patch-upnp.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/irc/iroffer-dinoex/files/patch-upnp.c Tue Oct 13 18:41:03 2015 (r399210)
@@ -0,0 +1,24 @@
+Index: src/upnp.c
+===================================================================
+RCS file: /usr/home/public/iroffer/src/upnp.c,v
+retrieving revision 1.15
+retrieving revision 1.17
+diff -u -r1.15 -r1.17
+--- src/upnp.c 13 Feb 2013 20:06:15 -0000 1.15
++++ src/upnp.c 13 Oct 2015 18:30:24 -0000 1.17
+@@ -60,11 +60,15 @@
+ tostdout_write();
+ memset(&urls, 0, sizeof(struct UPNPUrls));
+ memset(&data, 0, sizeof(struct IGDdatas));
++#if MINIUPNPC_API_VERSION >= 14
++ devlist = upnpDiscover(2000, NULL, NULL, 0, 0, 2U, NULL);
++#else
+ #ifdef UPNPDISCOVER_SUCCESS
+ devlist = upnpDiscover(2000, NULL, NULL, 0, 0, NULL);
+ #else
+ devlist = upnpDiscover(2000, NULL, NULL, 0);
+ #endif /* UPNPDISCOVER_SUCCESS */
++#endif
+ if (devlist)
+ {
+ dev = devlist;
More information about the svn-ports-head
mailing list