diff options
| author | dinoex <dinoex@FreeBSD.org> | 2015-10-14 02:41:03 +0800 |
|---|---|---|
| committer | dinoex <dinoex@FreeBSD.org> | 2015-10-14 02:41:03 +0800 |
| commit | 7be917264e92e16f40d1b4dcff4daa34d5c39ea3 (patch) | |
| tree | e75e54ec0a37aec7ea30aab07ba6ca6ba5baf795 | |
| parent | 2c3d731f0d3766e85ae283906ffbd12786f2e060 (diff) | |
| download | freebsd-ports-gnome-7be917264e92e16f40d1b4dcff4daa34d5c39ea3.tar.gz freebsd-ports-gnome-7be917264e92e16f40d1b4dcff4daa34d5c39ea3.tar.zst freebsd-ports-gnome-7be917264e92e16f40d1b4dcff4daa34d5c39ea3.zip | |
- fix API for miniupnpc-1.9.20151008
| -rw-r--r-- | irc/iroffer-dinoex/Makefile | 1 | ||||
| -rw-r--r-- | irc/iroffer-dinoex/files/patch-Configure | 32 | ||||
| -rw-r--r-- | irc/iroffer-dinoex/files/patch-upnp.c | 24 |
3 files changed, 57 insertions, 0 deletions
diff --git a/irc/iroffer-dinoex/Makefile b/irc/iroffer-dinoex/Makefile index 2c10843ba775..9940b26ef6f3 100644 --- a/irc/iroffer-dinoex/Makefile +++ b/irc/iroffer-dinoex/Makefile @@ -2,6 +2,7 @@ PORTNAME= iroffer PORTVERSION= 3.30 +PORTREVISION= 1 CATEGORIES= irc MASTER_SITES= http://iroffer.dinoex.net/ PKGNAMESUFFIX= -dinoex${PKGNAMESUFFIX2} diff --git a/irc/iroffer-dinoex/files/patch-Configure b/irc/iroffer-dinoex/files/patch-Configure new file mode 100644 index 000000000000..27f4e90ce23e --- /dev/null +++ b/irc/iroffer-dinoex/files/patch-Configure @@ -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 diff --git a/irc/iroffer-dinoex/files/patch-upnp.c b/irc/iroffer-dinoex/files/patch-upnp.c new file mode 100644 index 000000000000..55e6ddef2957 --- /dev/null +++ b/irc/iroffer-dinoex/files/patch-upnp.c @@ -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; |