1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-23 04:23:08 +00:00

- fix API for miniupnpc-1.9.20151008

This commit is contained in:
Dirk Meyer 2015-10-13 18:41:03 +00:00
parent a02d0704b0
commit 0c017173f7
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=399210
3 changed files with 57 additions and 0 deletions

View File

@ -2,6 +2,7 @@
PORTNAME= iroffer
PORTVERSION= 3.30
PORTREVISION= 1
CATEGORIES= irc
MASTER_SITES= http://iroffer.dinoex.net/
PKGNAMESUFFIX= -dinoex${PKGNAMESUFFIX2}

View File

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

View File

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