diff --git a/audio/gogglesmm/Makefile b/audio/gogglesmm/Makefile index acd4b16c5ee0..adf4cdd2faec 100644 --- a/audio/gogglesmm/Makefile +++ b/audio/gogglesmm/Makefile @@ -3,6 +3,7 @@ PORTNAME= gogglesmm PORTVERSION= 1.1.7 +PORTREVISION= 1 CATEGORIES= audio MAINTAINER= jhale@FreeBSD.org diff --git a/comms/hamlib/Makefile b/comms/hamlib/Makefile index 1d719e582399..e8b42dc7d9d3 100644 --- a/comms/hamlib/Makefile +++ b/comms/hamlib/Makefile @@ -3,6 +3,7 @@ PORTNAME= hamlib PORTVERSION= 3.1 +PORTREVISION= 1 CATEGORIES= comms hamradio MASTER_SITES= SF diff --git a/comms/hamlib/files/patch-dummy_netrigctl.c b/comms/hamlib/files/patch-dummy_netrigctl.c new file mode 100644 index 000000000000..a75f3b4ee373 --- /dev/null +++ b/comms/hamlib/files/patch-dummy_netrigctl.c @@ -0,0 +1,177 @@ +--- dummy/netrigctl.c.orig 2017-04-16 02:56:42 UTC ++++ dummy/netrigctl.c +@@ -54,7 +54,7 @@ static int netrigctl_transaction(RIG *ri + if (ret != RIG_OK) + return ret; + +- ret = read_string(&rig->state.rigport, buf, BUF_MAX, "\n", sizeof("\n")); ++ ret = read_string(&rig->state.rigport, buf, BUF_MAX, "\n", 1); + if (ret < 0) + return ret; + +@@ -87,18 +87,18 @@ static int netrigctl_open(RIG *rig) + if (prot_ver < RIGCTLD_PROT_VER) + return -RIG_EPROTO; + +- ret = read_string(&rig->state.rigport, buf, BUF_MAX, "\n", sizeof("\n")); ++ ret = read_string(&rig->state.rigport, buf, BUF_MAX, "\n", 1); + if (ret <= 0) + return (ret < 0) ? ret : -RIG_EPROTO; + +- ret = read_string(&rig->state.rigport, buf, BUF_MAX, "\n", sizeof("\n")); ++ ret = read_string(&rig->state.rigport, buf, BUF_MAX, "\n", 1); + if (ret <= 0) + return (ret < 0) ? ret : -RIG_EPROTO; + + rs->itu_region = atoi(buf); + + for (i=0; istate.rigport, buf, BUF_MAX, "\n", sizeof("\n")); ++ ret = read_string(&rig->state.rigport, buf, BUF_MAX, "\n", 1); + if (ret <= 0) + return (ret < 0) ? ret : -RIG_EPROTO; + +@@ -117,7 +117,7 @@ static int netrigctl_open(RIG *rig) + break; + } + for (i=0; istate.rigport, buf, BUF_MAX, "\n", sizeof("\n")); ++ ret = read_string(&rig->state.rigport, buf, BUF_MAX, "\n", 1); + if (ret <= 0) + return (ret < 0) ? ret : -RIG_EPROTO; + +@@ -136,7 +136,7 @@ static int netrigctl_open(RIG *rig) + break; + } + for (i=0; istate.rigport, buf, BUF_MAX, "\n", sizeof("\n")); ++ ret = read_string(&rig->state.rigport, buf, BUF_MAX, "\n", 1); + if (ret <= 0) + return (ret < 0) ? ret : -RIG_EPROTO; + +@@ -150,7 +150,7 @@ static int netrigctl_open(RIG *rig) + } + + for (i=0; istate.rigport, buf, BUF_MAX, "\n", sizeof("\n")); ++ ret = read_string(&rig->state.rigport, buf, BUF_MAX, "\n", 1); + if (ret <= 0) + return (ret < 0) ? ret : -RIG_EPROTO; + +@@ -168,31 +168,31 @@ static int netrigctl_open(RIG *rig) + chan_t chan_list[CHANLSTSIZ]; /*!< Channel list, zero ended */ + #endif + +- ret = read_string(&rig->state.rigport, buf, BUF_MAX, "\n", sizeof("\n")); ++ ret = read_string(&rig->state.rigport, buf, BUF_MAX, "\n", 1); + if (ret <= 0) + return (ret < 0) ? ret : -RIG_EPROTO; + + rs->max_rit = atol(buf); + +- ret = read_string(&rig->state.rigport, buf, BUF_MAX, "\n", sizeof("\n")); ++ ret = read_string(&rig->state.rigport, buf, BUF_MAX, "\n", 1); + if (ret <= 0) + return (ret < 0) ? ret : -RIG_EPROTO; + + rs->max_xit = atol(buf); + +- ret = read_string(&rig->state.rigport, buf, BUF_MAX, "\n", sizeof("\n")); ++ ret = read_string(&rig->state.rigport, buf, BUF_MAX, "\n", 1); + if (ret <= 0) + return (ret < 0) ? ret : -RIG_EPROTO; + + rs->max_ifshift = atol(buf); + +- ret = read_string(&rig->state.rigport, buf, BUF_MAX, "\n", sizeof("\n")); ++ ret = read_string(&rig->state.rigport, buf, BUF_MAX, "\n", 1); + if (ret <= 0) + return (ret < 0) ? ret : -RIG_EPROTO; + + rs->announces = atoi(buf); + +- ret = read_string(&rig->state.rigport, buf, BUF_MAX, "\n", sizeof("\n")); ++ ret = read_string(&rig->state.rigport, buf, BUF_MAX, "\n", 1); + if (ret <= 0) + return (ret < 0) ? ret : -RIG_EPROTO; + +@@ -205,7 +205,7 @@ chan_t chan_list[CHANLSTSIZ]; /*!< Chann + ret = 0; + rs->preamp[ret] = RIG_DBLST_END; + +- ret = read_string(&rig->state.rigport, buf, BUF_MAX, "\n", sizeof("\n")); ++ ret = read_string(&rig->state.rigport, buf, BUF_MAX, "\n", 1); + if (ret <= 0) + return (ret < 0) ? ret : -RIG_EPROTO; + +@@ -218,37 +218,37 @@ chan_t chan_list[CHANLSTSIZ]; /*!< Chann + ret = 0; + rs->attenuator[ret] = RIG_DBLST_END; + +- ret = read_string(&rig->state.rigport, buf, BUF_MAX, "\n", sizeof("\n")); ++ ret = read_string(&rig->state.rigport, buf, BUF_MAX, "\n", 1); + if (ret <= 0) + return (ret < 0) ? ret : -RIG_EPROTO; + + rs->has_get_func = strtol(buf, NULL, 0); + +- ret = read_string(&rig->state.rigport, buf, BUF_MAX, "\n", sizeof("\n")); ++ ret = read_string(&rig->state.rigport, buf, BUF_MAX, "\n", 1); + if (ret <= 0) + return (ret < 0) ? ret : -RIG_EPROTO; + + rs->has_set_func = strtol(buf, NULL, 0); + +- ret = read_string(&rig->state.rigport, buf, BUF_MAX, "\n", sizeof("\n")); ++ ret = read_string(&rig->state.rigport, buf, BUF_MAX, "\n", 1); + if (ret <= 0) + return (ret < 0) ? ret : -RIG_EPROTO; + + rs->has_get_level = strtol(buf, NULL, 0); + +- ret = read_string(&rig->state.rigport, buf, BUF_MAX, "\n", sizeof("\n")); ++ ret = read_string(&rig->state.rigport, buf, BUF_MAX, "\n", 1); + if (ret <= 0) + return (ret < 0) ? ret : -RIG_EPROTO; + + rs->has_set_level = strtol(buf, NULL, 0); + +- ret = read_string(&rig->state.rigport, buf, BUF_MAX, "\n", sizeof("\n")); ++ ret = read_string(&rig->state.rigport, buf, BUF_MAX, "\n", 1); + if (ret <= 0) + return (ret < 0) ? ret : -RIG_EPROTO; + + rs->has_get_parm = strtol(buf, NULL, 0); + +- ret = read_string(&rig->state.rigport, buf, BUF_MAX, "\n", sizeof("\n")); ++ ret = read_string(&rig->state.rigport, buf, BUF_MAX, "\n", 1); + if (ret <= 0) + return (ret < 0) ? ret : -RIG_EPROTO; + +@@ -354,7 +354,7 @@ static int netrigctl_get_mode(RIG *rig, + if (ret > 0 && buf[ret-1]=='\n') buf[ret-1] = '\0'; /* chomp */ + *mode = rig_parse_mode(buf); + +- ret = read_string(&rig->state.rigport, buf, BUF_MAX, "\n", sizeof("\n")); ++ ret = read_string(&rig->state.rigport, buf, BUF_MAX, "\n", 1); + if (ret <= 0) + return (ret < 0) ? ret : -RIG_EPROTO; + +@@ -761,7 +761,7 @@ static int netrigctl_get_split_mode(RIG + if (ret > 0 && buf[ret-1]=='\n') buf[ret-1] = '\0'; /* chomp */ + *tx_mode = rig_parse_mode(buf); + +- ret = read_string(&rig->state.rigport, buf, BUF_MAX, "\n", sizeof("\n")); ++ ret = read_string(&rig->state.rigport, buf, BUF_MAX, "\n", 1); + if (ret <= 0) + return (ret < 0) ? ret : -RIG_EPROTO; + +@@ -804,7 +804,7 @@ static int netrigctl_get_split_vfo(RIG * + + *split = atoi(buf); + +- ret = read_string(&rig->state.rigport, buf, BUF_MAX, "\n", sizeof("\n")); ++ ret = read_string(&rig->state.rigport, buf, BUF_MAX, "\n", 1); + if (ret <= 0) + return (ret < 0) ? ret : -RIG_EPROTO; + diff --git a/comms/hamlib/files/patch-src_network.c b/comms/hamlib/files/patch-src_network.c new file mode 100644 index 000000000000..dc6b46a502b7 --- /dev/null +++ b/comms/hamlib/files/patch-src_network.c @@ -0,0 +1,29 @@ +--- src/network.c.orig 2016-12-31 20:01:25 UTC ++++ src/network.c +@@ -48,6 +48,7 @@ + + #ifdef HAVE_NETINET_IN_H + #include ++#include + #endif + #if HAVE_NETDB_H + #include +@@ -117,6 +118,7 @@ int network_open(hamlib_port_t *rp, int + { + int fd; /* File descriptor for the port */ + int status; ++ int flag; + struct addrinfo hints, *res, *saved_res; + char *hoststr = NULL, *portstr = NULL, *bracketstr1, *bracketstr2; + char hostname[FILPATHLEN]; +@@ -202,6 +204,10 @@ int network_open(hamlib_port_t *rp, int + return -RIG_EIO; + } + ++ /* Disable Nagle */ ++ flag = 1; ++ setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, &flag, sizeof(flag)); ++ + if ((status = connect(fd, res->ai_addr, res->ai_addrlen)) == 0) + { + break; diff --git a/deskutils/calibre/Makefile b/deskutils/calibre/Makefile index 51fea90d9c1f..b210645c73a2 100644 --- a/deskutils/calibre/Makefile +++ b/deskutils/calibre/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= calibre -PORTVERSION= 2.82.0 -PORTREVISION= 1 +PORTVERSION= 2.83.0 CATEGORIES= deskutils python MASTER_SITES= http://download.calibre-ebook.com/${PORTVERSION}/ diff --git a/deskutils/calibre/distinfo b/deskutils/calibre/distinfo index a2315b8517c2..1d4f4c856e33 100644 --- a/deskutils/calibre/distinfo +++ b/deskutils/calibre/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1489825304 -SHA256 (calibre-2.82.0.tar.xz) = 137995abe467fcb951c1d42583305ebec7b8ca403c44895e70f82a2d6156711c -SIZE (calibre-2.82.0.tar.xz) = 38823912 +TIMESTAMP = 1492289630 +SHA256 (calibre-2.83.0.tar.xz) = 96166e8c74047cfbae9289c38ab5e2f661168048e568cd187f908242d98426ab +SIZE (calibre-2.83.0.tar.xz) = 38875672 diff --git a/deskutils/calibre/pkg-plist b/deskutils/calibre/pkg-plist index ca578b002778..4a509c0ab5cd 100644 --- a/deskutils/calibre/pkg-plist +++ b/deskutils/calibre/pkg-plist @@ -543,7 +543,6 @@ lib/calibre/calibre/ebooks/pdf/render/links.py lib/calibre/calibre/ebooks/pdf/render/serialize.py lib/calibre/calibre/ebooks/pdf/render/test.py lib/calibre/calibre/ebooks/pdf/render/toc.py -lib/calibre/calibre/ebooks/pdf/writer.py lib/calibre/calibre/ebooks/pml/__init__.py lib/calibre/calibre/ebooks/pml/pmlconverter.py lib/calibre/calibre/ebooks/pml/pmlml.py @@ -1595,7 +1594,7 @@ lib/calibre/tinycss/version.py %%DATADIR%%/catalog/template.xhtml %%DATADIR%%/coffee-script.js %%DATADIR%%/compiled_coffeescript.zip -%%DATADIR%%/content-server/autoreload.js +%%DATADIR%%/content-server/calibre.appcache %%DATADIR%%/content-server/calibre.png %%DATADIR%%/content-server/empty.html %%DATADIR%%/content-server/index-generated.html diff --git a/devel/arm-none-eabi-gcc492/files/patch-gcc_system.h b/devel/arm-none-eabi-gcc492/files/patch-gcc_system.h new file mode 100644 index 000000000000..05f61aaab868 --- /dev/null +++ b/devel/arm-none-eabi-gcc492/files/patch-gcc_system.h @@ -0,0 +1,10 @@ +--- gcc/system.h.orig 2014-01-02 22:23:26 UTC ++++ gcc/system.h +@@ -203,6 +203,7 @@ extern int errno; + + #ifdef __cplusplus + # include ++# include + #endif + + /* Some of glibc's string inlines cause warnings. Plus we'd rather diff --git a/devel/meson/Makefile b/devel/meson/Makefile index d7476629d902..4c935c144f04 100644 --- a/devel/meson/Makefile +++ b/devel/meson/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= meson -PORTVERSION= 0.39.0 +PORTVERSION= 0.39.1 CATEGORIES= devel python MASTER_SITES= https://github.com/mesonbuild/${PORTNAME}/releases/download/${PORTVERSION}/ diff --git a/devel/meson/distinfo b/devel/meson/distinfo index 4fbb9f4d06f7..70f4c0d64d08 100644 --- a/devel/meson/distinfo +++ b/devel/meson/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1488992499 -SHA256 (meson-0.39.0.tar.gz) = e582b040038d6ae7c44e64eda05bc24e0a9328629a82c3e4c2bfb983eade7592 -SIZE (meson-0.39.0.tar.gz) = 557134 +TIMESTAMP = 1492266393 +SHA256 (meson-0.39.1.tar.gz) = 44885ccfef94d3d4afb1053fa6673ed130d3093fc9e9f6624d08161d8a385220 +SIZE (meson-0.39.1.tar.gz) = 558914 diff --git a/devel/p5-Params-ValidationCompiler/Makefile b/devel/p5-Params-ValidationCompiler/Makefile index 5f6739bdab69..a39a46900c35 100644 --- a/devel/p5-Params-ValidationCompiler/Makefile +++ b/devel/p5-Params-ValidationCompiler/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= Params-ValidationCompiler -PORTVERSION= 0.23 +PORTVERSION= 0.24 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/devel/p5-Params-ValidationCompiler/distinfo b/devel/p5-Params-ValidationCompiler/distinfo index 348220e0c29a..bdd0b3ad8d36 100644 --- a/devel/p5-Params-ValidationCompiler/distinfo +++ b/devel/p5-Params-ValidationCompiler/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1486361589 -SHA256 (Params-ValidationCompiler-0.23.tar.gz) = e357b63e28950519f227a5b45e4ac1c487cbc6c1bb67c09a8d3698ee9f289230 -SIZE (Params-ValidationCompiler-0.23.tar.gz) = 43078 +TIMESTAMP = 1492335035 +SHA256 (Params-ValidationCompiler-0.24.tar.gz) = a8963747bae618c2b96ec1918ef2b6ea7dd7ff3dbcebc9de6124b2771a4f4287 +SIZE (Params-ValidationCompiler-0.24.tar.gz) = 43439 diff --git a/devel/pear-PHP_Timer/Makefile b/devel/pear-PHP_Timer/Makefile index 8da1c1617512..b3221190bf98 100644 --- a/devel/pear-PHP_Timer/Makefile +++ b/devel/pear-PHP_Timer/Makefile @@ -2,18 +2,29 @@ # $FreeBSD$ PORTNAME= PHP_Timer -PORTVERSION= 1.0.4 +PORTVERSION= 1.0.9 CATEGORIES= devel pear -MASTER_SITES= http://pear.phpunit.de/get/ PKGNAMEPREFIX= pear- MAINTAINER= joneum@bsdproject.de COMMENT= Utility class for timing -BUILD_DEPENDS= ${PEARDIR}/.channels/pear.phpunit.de.reg:devel/pear-channel-phpunit -RUN_DEPENDS= ${PEARDIR}/.channels/pear.phpunit.de.reg:devel/pear-channel-phpunit +LICENSE= BSD3CLAUSE +LICENSE_FILE= ${WRKSRC}/LICENSE -USES= pear -PEAR_CHANNEL= phpunit +USE_GITHUB= yes +GH_ACCOUNT= sebastianbergmann +GH_PROJECT= php-timer + +NO_BUILD= yes + +PHP_DIR= share/PHP + +PLIST_FILES= ${PHP_DIR}/${PORTNAME}/Timer.php + +do-install: + ${MKDIR} ${STAGEDIR}${PREFIX}/${PHP_DIR}/${PORTNAME} + ${INSTALL_SCRIPT} ${WRKSRC}/src/Timer.php \ + ${STAGEDIR}${PREFIX}/${PHP_DIR}/${PORTNAME} .include diff --git a/devel/pear-PHP_Timer/distinfo b/devel/pear-PHP_Timer/distinfo index b40134e78328..8ff635a76a91 100644 --- a/devel/pear-PHP_Timer/distinfo +++ b/devel/pear-PHP_Timer/distinfo @@ -1,2 +1,3 @@ -SHA256 (PEAR/PHP_Timer-1.0.4.tgz) = f51965eea8ec722843f0a10cd4b9c35aaecf0a816ac80929dbab87c8a6d8692b -SIZE (PEAR/PHP_Timer-1.0.4.tgz) = 3694 +TIMESTAMP = 1492020404 +SHA256 (sebastianbergmann-php-timer-1.0.9_GH0.tar.gz) = db90226fe9c5e3d72f49780d6df430b4f305b55639544fdfb9b22927d581670c +SIZE (sebastianbergmann-php-timer-1.0.9_GH0.tar.gz) = 3740 diff --git a/devel/py-astroid/Makefile b/devel/py-astroid/Makefile index b3714b0a0ebb..97f99c8e5c01 100644 --- a/devel/py-astroid/Makefile +++ b/devel/py-astroid/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= astroid -PORTVERSION= 1.4.9 +PORTVERSION= 1.5.1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-astroid/distinfo b/devel/py-astroid/distinfo index 83f8962d490f..6770b3f093e7 100644 --- a/devel/py-astroid/distinfo +++ b/devel/py-astroid/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1485141324 -SHA256 (astroid-1.4.9.tar.gz) = a483e7891ce3a06dadfc6cb9095b0938aca58940d43576d72e4502b480c085d7 -SIZE (astroid-1.4.9.tar.gz) = 189315 +TIMESTAMP = 1492309285 +SHA256 (astroid-1.5.1.tar.gz) = b1d87cbb3dbcca64f8fb8252d2a6650c3bf7b1fc6516831c1b63462d965f2af7 +SIZE (astroid-1.5.1.tar.gz) = 239345 diff --git a/devel/py-tables/Makefile b/devel/py-tables/Makefile index 2f1145b3f5da..8bf8f874d1bb 100644 --- a/devel/py-tables/Makefile +++ b/devel/py-tables/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= tables -PORTVERSION= 3.2.2 -PORTREVISION= 4 +PORTVERSION= 3.4.1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-tables/distinfo b/devel/py-tables/distinfo index 8a7e51d76abf..303b926142cb 100644 --- a/devel/py-tables/distinfo +++ b/devel/py-tables/distinfo @@ -1,2 +1,3 @@ -SHA256 (tables-3.2.2.tar.gz) = 3564b351a71ec1737b503b001eb7ceae1f65d5d6e3ffe1ea75aafba10f37fa84 -SIZE (tables-3.2.2.tar.gz) = 7008045 +TIMESTAMP = 1492270029 +SHA256 (tables-3.4.1.tar.gz) = 1587337593133b169d73bc68729b2cb736a3494f93a54188b8cc26f52cd51c67 +SIZE (tables-3.4.1.tar.gz) = 7592051 diff --git a/devel/py-tables/files/patch-setup.py b/devel/py-tables/files/patch-setup.py index cec31a918a03..3fc13eb2a27b 100644 --- a/devel/py-tables/files/patch-setup.py +++ b/devel/py-tables/files/patch-setup.py @@ -1,13 +1,13 @@ ---- setup.py.orig 2015-09-22 03:02:05 UTC +--- setup.py.orig 2017-04-12 12:02:34 UTC +++ setup.py -@@ -127,8 +127,8 @@ VERSION = open('VERSION').read().strip() +@@ -115,8 +115,8 @@ with open('VERSION') as fd: debug = '--debug' in sys.argv # Global variables -lib_dirs = [] --inc_dirs = ['c-blosc/hdf5'] -+lib_dirs = ['/usr/local/lib'] -+inc_dirs = ['c-blosc/hdf5','/usr/local/include'] +-inc_dirs = [os.path.join('hdf5-blosc', 'src')] ++lib_dirs = ['%%LOCALBASE%%/lib'] ++inc_dirs = [os.path.join('hdf5-blosc', 'src'),'%%LOCALBASE%%/include'] optional_libs = [] data_files = [] # list of data files to add to packages (mainly for DLL's) diff --git a/emulators/i386-wine-devel/Makefile.i386 b/emulators/i386-wine-devel/Makefile.i386 index 4288de503267..3e8845db58f8 100644 --- a/emulators/i386-wine-devel/Makefile.i386 +++ b/emulators/i386-wine-devel/Makefile.i386 @@ -37,44 +37,44 @@ post-install-script: ${REINPLACE_CMD} -e 's!lib/!lib32/!g' ${TMPPLIST} # Install bounce script to access the 32-bit executables ${INSTALL_SCRIPT} ${SLAVEDIR}/files/binbounce ${STAGEDIR}${PREFIX}/bin/wine - for i in `grep ^bin ${TMPPLIST} | ${XARGS} -n1 basename` ; do \ + for i in `${GREP} ^bin ${TMPPLIST} | ${XARGS} -n1 basename` ; do \ [ "$${i}" = "wine" ] || ${LN} -f ${STAGEDIR}${PREFIX}/bin/wine ${STAGEDIR}${PREFIX}/bin/$${i} ; \ - echo bin32/$${i} >> ${TMPPLIST} ; \ + ${ECHO_CMD} bin32/$${i} >> ${TMPPLIST} ; \ done # Install libGL ${MKDIR} ${STAGEDIR}${PREFIX}/lib32/.libGL/dri ${INSTALL_DATA} ${LOCALBASE}/lib/libGL.so.1 ${STAGEDIR}${PREFIX}/lib32/.libGL/ - echo lib32/.libGL/libGL.so.1 >> ${TMPPLIST} + ${ECHO_CMD} lib32/.libGL/libGL.so.1 >> ${TMPPLIST} # Install dri libraries (internal libGL requirements) for i in ${LOCALBASE}/lib/dri/*.so; do \ ${INSTALL_DATA} $${i} ${STAGEDIR}${PREFIX}/lib32/.libGL/dri/ ; \ - echo lib32/.libGL/dri/$${i##*/} >> ${TMPPLIST} ; \ + ${ECHO_CMD} lib32/.libGL/dri/$${i##*/} >> ${TMPPLIST} ; \ done # Find all soft dependencies (via strings(1)) - grep -v '[@%]' ${TMPPLIST} | sed "s!^!${STAGEDIR}${PREFIX}/!g" | \ - ${XARGS} -n1 file -F' ' | grep ELF | cut -f1 -d' ' | ${XARGS} strings | \ - grep '^lib.*\.so' | sort -u > ${WRKDIR}/winesoftlibs - for i in `cat ${WRKDIR}/winesoftlibs` ; do \ - if [ -e ${LOCALBASE}/lib/$${i} ] && [ -z "`grep $${i} ${TMPPLIST}`" ]; then \ + ${GREP} -v '[@%]' ${TMPPLIST} | ${SED} "s!^!${STAGEDIR}${PREFIX}/!g" | \ + ${XARGS} -n1 file -F' ' | ${GREP} ELF | ${CUT} -f1 -d' ' | ${XARGS} strings | \ + ${GREP} '^lib.*\.so' | ${SORT} -u > ${WRKDIR}/winesoftlibs + for i in `${CAT} ${WRKDIR}/winesoftlibs` ; do \ + if [ -e ${LOCALBASE}/lib/$${i} ] && [ -z "`${GREP} $${i} ${TMPPLIST}`" ]; then \ ${INSTALL_DATA} ${LOCALBASE}/lib/$${i} ${STAGEDIR}${PREFIX}/lib32/ ; \ - echo lib32/$${i} >> ${TMPPLIST} ; \ + ${ECHO_CMD} lib32/$${i} >> ${TMPPLIST} ; \ fi ; \ done # Find all libraries that are linked too (via ldd(1)) - grep -v '[@%]' ${TMPPLIST} | sed "s!^!${STAGEDIR}${PREFIX}/!g" | \ - ${XARGS} -n1 file -F' ' | grep ELF | cut -f1 -d' ' | \ + ${GREP} -v '[@%]' ${TMPPLIST} | ${SED} "s!^!${STAGEDIR}${PREFIX}/!g" | \ + ${XARGS} -n1 file -F' ' | ${GREP} ELF | ${CUT} -f1 -d' ' | \ env LD_LIBRARY_PATH=${STAGEDIR}${PREFIX}/lib32:${LD_LIBRARY_PATH} ${XARGS} ldd -f '%p\n' \ - | sort -u | grep -v '^\(/usr\)\?/lib' | grep -v "^${STAGEDIR}${PREFIX}/lib32/libwine.so" \ - | grep -v "^${STAGEDIR}${PREFIX}/lib32/wine" > ${WRKDIR}/winelibs - for i in `cat ${WRKDIR}/winelibs` ; do \ - if [ -z "`grep $${i##*/} ${TMPPLIST}`" ]; then \ + | ${SORT} -u | ${GREP} -v '^\(/usr\)\?/lib' | ${GREP} -v "^${STAGEDIR}${PREFIX}/lib32/libwine.so" \ + | ${GREP} -v "^${STAGEDIR}${PREFIX}/lib32/wine" > ${WRKDIR}/winelibs + for i in `${CAT} ${WRKDIR}/winelibs` ; do \ + if [ -z "`${GREP} $${i##*/} ${TMPPLIST}`" ]; then \ ${INSTALL_DATA} $${i} ${STAGEDIR}${PREFIX}/lib32/ ; \ - echo lib32/$${i##*/} >> ${TMPPLIST} ; \ + ${ECHO_CMD} lib32/$${i##*/} >> ${TMPPLIST} ; \ fi ; \ done # Install nvidia patching script ${INSTALL_SCRIPT} ${SLAVEDIR}/files/nvidia.sh ${STAGEDIR}${DATADIR}/patch-nvidia.sh - echo ${DATADIR:S|$(PREFIX)/||}/patch-nvidia.sh >> ${TMPPLIST} + ${ECHO_CMD} ${DATADIR:S|$(PREFIX)/||}/patch-nvidia.sh >> ${TMPPLIST} @${CAT} ${PKGMESSAGE} .include "${MASTERDIR}/Makefile" diff --git a/emulators/i386-wine-devel/Makefile.inc b/emulators/i386-wine-devel/Makefile.inc index 618a51d34806..e08c3580523d 100644 --- a/emulators/i386-wine-devel/Makefile.inc +++ b/emulators/i386-wine-devel/Makefile.inc @@ -2,7 +2,8 @@ # $FreeBSD$ PORTNAME= wine -PORTVERSION= 2.4 +PORTVERSION= 2.5 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= emulators MASTER_SITES= LOCAL/dbn/repos/wine/${DIST_SUBDIR}/ diff --git a/emulators/i386-wine-devel/distinfo b/emulators/i386-wine-devel/distinfo index 65b9c06192bb..a96f48f11999 100644 --- a/emulators/i386-wine-devel/distinfo +++ b/emulators/i386-wine-devel/distinfo @@ -1,13 +1,13 @@ -TIMESTAMP = 1491023856 -SHA256 (freebsd:10:x86:64/i386-wine-devel-2.4,1.txz) = 8c27bbbd5c8b55af87f40d0afd79dbbfaac2af0d3d797b2daebf6348a053f570 -SIZE (freebsd:10:x86:64/i386-wine-devel-2.4,1.txz) = 53654000 -SHA256 (freebsd:10:x86:64/i386-wine-staging-2.4,1.txz) = 7a447d03d29949f167826ee06dad5a68c8de371f20433f455ae4ca519b23ada7 -SIZE (freebsd:10:x86:64/i386-wine-staging-2.4,1.txz) = 55875184 -SHA256 (freebsd:11:x86:64/i386-wine-devel-2.4,1.txz) = 611ef4030a811a7dc85f16d5545136d95c8262ceba02a698c2037c4855f92f53 -SIZE (freebsd:11:x86:64/i386-wine-devel-2.4,1.txz) = 53355504 -SHA256 (freebsd:11:x86:64/i386-wine-staging-2.4,1.txz) = a0a8baf3a4b182efafd89d99f9362b3e86683f1eb3ff3553d7c7103d309fb00d -SIZE (freebsd:11:x86:64/i386-wine-staging-2.4,1.txz) = 55554216 -SHA256 (freebsd:12:x86:64/i386-wine-devel-2.4,1.txz) = e482234c1dac23abb26bd60cb5a0644c703f853dfde818e49e39390f66ac211d -SIZE (freebsd:12:x86:64/i386-wine-devel-2.4,1.txz) = 52570320 -SHA256 (freebsd:12:x86:64/i386-wine-staging-2.4,1.txz) = 2c474cf482f69f2c1fc84efbbc338109c534491e2fba84dd764fbbad4fbcef7b -SIZE (freebsd:12:x86:64/i386-wine-staging-2.4,1.txz) = 54813420 +TIMESTAMP = 1492269512 +SHA256 (freebsd:10:x86:64/i386-wine-devel-2.5_1,1.txz) = 9b22cdf5f1d675a92bccaf08a8cbaff331a34af99a5c6bfa0c53c07af73e2e8e +SIZE (freebsd:10:x86:64/i386-wine-devel-2.5_1,1.txz) = 44646140 +SHA256 (freebsd:10:x86:64/i386-wine-staging-2.5_1,1.txz) = 0f99e5db67d4a94e2bc5c3d4fb27404b47a4208ca60528619ef36eb421938624 +SIZE (freebsd:10:x86:64/i386-wine-staging-2.5_1,1.txz) = 46863264 +SHA256 (freebsd:11:x86:64/i386-wine-devel-2.5_1,1.txz) = 03067c9a72163494621ad0194fe459766e0abdd55950ad9d3901b09691598241 +SIZE (freebsd:11:x86:64/i386-wine-devel-2.5_1,1.txz) = 44445284 +SHA256 (freebsd:11:x86:64/i386-wine-staging-2.5_1,1.txz) = e2544966b16ec16fe9f4711c94476ecf2a03d6509eb54e490a381f9a231fbd4d +SIZE (freebsd:11:x86:64/i386-wine-staging-2.5_1,1.txz) = 46647680 +SHA256 (freebsd:12:x86:64/i386-wine-devel-2.5_1,1.txz) = b31cb6de7323615e258c935c58195ce5831c25823ff84a72dffe17be3a32bbfa +SIZE (freebsd:12:x86:64/i386-wine-devel-2.5_1,1.txz) = 43972756 +SHA256 (freebsd:12:x86:64/i386-wine-staging-2.5_1,1.txz) = d6e430e5f773db707c9995faabf4d732d44a3a3dc175a7e629939ab48740555b +SIZE (freebsd:12:x86:64/i386-wine-staging-2.5_1,1.txz) = 46179508 diff --git a/emulators/i386-wine-devel/pkg-plist b/emulators/i386-wine-devel/pkg-plist index 316680190ee0..028a78745412 100644 --- a/emulators/i386-wine-devel/pkg-plist +++ b/emulators/i386-wine-devel/pkg-plist @@ -114,6 +114,7 @@ include/wine/windows/amstream.h include/wine/windows/amstream.idl include/wine/windows/amvideo.h include/wine/windows/amvideo.idl +%%STAGING%%include/wine/windows/apiset.h include/wine/windows/appcompatapi.h include/wine/windows/appmgmt.h include/wine/windows/asptlb.h @@ -924,8 +925,7 @@ lib32/.libGL/dri/swrast_dri.so lib32/.libGL/dri/vmwgfx_dri.so lib32/.libGL/libGL.so.1 lib32/libGLU.so.1 -lib32/libLLVM-3.9.so -lib32/libLTO.so +lib32/libLLVM-4.0.so lib32/libX11-xcb.so.1 lib32/libX11.so.6 lib32/libXau.so.6 @@ -940,7 +940,6 @@ lib32/libXinerama.so.1 lib32/libXrandr.so.2 lib32/libXrender.so.1 lib32/libXxf86vm.so.1 -lib32/libdevq.so.0 lib32/libdrm.so.2 lib32/libdrm_amdgpu.so.1 lib32/libdrm_intel.so.1 @@ -1057,6 +1056,7 @@ lib32/wine/api-ms-win-core-psapi-obsolete-l1-1-0.dll.so %%STAGING%%lib32/wine/api-ms-win-core-quirks-l1-1-0.dll.so lib32/wine/api-ms-win-core-realtime-l1-1-0.dll.so lib32/wine/api-ms-win-core-registry-l1-1-0.dll.so +%%STAGING%%lib32/wine/api-ms-win-core-registry-l2-1-0.dll.so lib32/wine/api-ms-win-core-registryuserspecific-l1-1-0.dll.so lib32/wine/api-ms-win-core-rtlsupport-l1-1-0.dll.so lib32/wine/api-ms-win-core-rtlsupport-l1-2-0.dll.so @@ -1076,6 +1076,7 @@ lib32/wine/api-ms-win-core-sysinfo-l1-2-1.dll.so lib32/wine/api-ms-win-core-threadpool-l1-1-0.dll.so lib32/wine/api-ms-win-core-threadpool-l1-2-0.dll.so lib32/wine/api-ms-win-core-threadpool-legacy-l1-1-0.dll.so +%%STAGING%%lib32/wine/api-ms-win-core-threadpool-private-l1-1-0.dll.so lib32/wine/api-ms-win-core-timezone-l1-1-0.dll.so lib32/wine/api-ms-win-core-toolhelp-l1-1-0.dll.so lib32/wine/api-ms-win-core-url-l1-1-0.dll.so @@ -1089,6 +1090,7 @@ lib32/wine/api-ms-win-core-winrt-error-l1-1-1.dll.so lib32/wine/api-ms-win-core-winrt-errorprivate-l1-1-1.dll.so lib32/wine/api-ms-win-core-winrt-l1-1-0.dll.so lib32/wine/api-ms-win-core-winrt-registration-l1-1-0.dll.so +%%STAGING%%lib32/wine/api-ms-win-core-winrt-roparameterizediid-l1-1-0.dll.so lib32/wine/api-ms-win-core-winrt-string-l1-1-0.dll.so lib32/wine/api-ms-win-core-wow64-l1-1-0.dll.so lib32/wine/api-ms-win-core-xstate-l1-1-0.dll.so @@ -1125,6 +1127,8 @@ lib32/wine/api-ms-win-eventing-consumer-l1-1-0.dll.so lib32/wine/api-ms-win-eventing-controller-l1-1-0.dll.so lib32/wine/api-ms-win-eventing-provider-l1-1-0.dll.so lib32/wine/api-ms-win-eventlog-legacy-l1-1-0.dll.so +%%STAGING%%lib32/wine/api-ms-win-mm-misc-l1-1-1.dll.so +%%STAGING%%lib32/wine/api-ms-win-mm-mme-l1-1-0.dll.so lib32/wine/api-ms-win-ntuser-dc-access-l1-1-0.dll.so lib32/wine/api-ms-win-power-base-l1-1-0.dll.so lib32/wine/api-ms-win-power-setting-l1-1-0.dll.so @@ -1135,11 +1139,13 @@ lib32/wine/api-ms-win-security-audit-l1-1-1.dll.so lib32/wine/api-ms-win-security-base-l1-1-0.dll.so lib32/wine/api-ms-win-security-base-l1-2-0.dll.so lib32/wine/api-ms-win-security-base-private-l1-1-1.dll.so +%%STAGING%%lib32/wine/api-ms-win-security-grouppolicy-l1-1-0.dll.so lib32/wine/api-ms-win-security-lsalookup-l1-1-0.dll.so lib32/wine/api-ms-win-security-lsalookup-l1-1-1.dll.so lib32/wine/api-ms-win-security-lsalookup-l2-1-1.dll.so lib32/wine/api-ms-win-security-lsapolicy-l1-1-0.dll.so lib32/wine/api-ms-win-security-sddl-l1-1-0.dll.so +%%STAGING%%lib32/wine/api-ms-win-security-systemfunctions-l1-1-0.dll.so lib32/wine/api-ms-win-service-core-l1-1-0.dll.so lib32/wine/api-ms-win-service-core-l1-1-1.dll.so lib32/wine/api-ms-win-service-management-l1-1-0.dll.so @@ -1417,6 +1423,7 @@ lib32/wine/fakedlls/api-ms-win-core-psapi-obsolete-l1-1-0.dll %%STAGING%%lib32/wine/fakedlls/api-ms-win-core-quirks-l1-1-0.dll lib32/wine/fakedlls/api-ms-win-core-realtime-l1-1-0.dll lib32/wine/fakedlls/api-ms-win-core-registry-l1-1-0.dll +%%STAGING%%lib32/wine/fakedlls/api-ms-win-core-registry-l2-1-0.dll lib32/wine/fakedlls/api-ms-win-core-registryuserspecific-l1-1-0.dll lib32/wine/fakedlls/api-ms-win-core-rtlsupport-l1-1-0.dll lib32/wine/fakedlls/api-ms-win-core-rtlsupport-l1-2-0.dll @@ -1436,6 +1443,7 @@ lib32/wine/fakedlls/api-ms-win-core-sysinfo-l1-2-1.dll lib32/wine/fakedlls/api-ms-win-core-threadpool-l1-1-0.dll lib32/wine/fakedlls/api-ms-win-core-threadpool-l1-2-0.dll lib32/wine/fakedlls/api-ms-win-core-threadpool-legacy-l1-1-0.dll +%%STAGING%%lib32/wine/fakedlls/api-ms-win-core-threadpool-private-l1-1-0.dll lib32/wine/fakedlls/api-ms-win-core-timezone-l1-1-0.dll lib32/wine/fakedlls/api-ms-win-core-toolhelp-l1-1-0.dll lib32/wine/fakedlls/api-ms-win-core-url-l1-1-0.dll @@ -1449,6 +1457,7 @@ lib32/wine/fakedlls/api-ms-win-core-winrt-error-l1-1-1.dll lib32/wine/fakedlls/api-ms-win-core-winrt-errorprivate-l1-1-1.dll lib32/wine/fakedlls/api-ms-win-core-winrt-l1-1-0.dll lib32/wine/fakedlls/api-ms-win-core-winrt-registration-l1-1-0.dll +%%STAGING%%lib32/wine/fakedlls/api-ms-win-core-winrt-roparameterizediid-l1-1-0.dll lib32/wine/fakedlls/api-ms-win-core-winrt-string-l1-1-0.dll lib32/wine/fakedlls/api-ms-win-core-wow64-l1-1-0.dll lib32/wine/fakedlls/api-ms-win-core-xstate-l1-1-0.dll @@ -1485,6 +1494,8 @@ lib32/wine/fakedlls/api-ms-win-eventing-consumer-l1-1-0.dll lib32/wine/fakedlls/api-ms-win-eventing-controller-l1-1-0.dll lib32/wine/fakedlls/api-ms-win-eventing-provider-l1-1-0.dll lib32/wine/fakedlls/api-ms-win-eventlog-legacy-l1-1-0.dll +%%STAGING%%lib32/wine/fakedlls/api-ms-win-mm-misc-l1-1-1.dll +%%STAGING%%lib32/wine/fakedlls/api-ms-win-mm-mme-l1-1-0.dll lib32/wine/fakedlls/api-ms-win-ntuser-dc-access-l1-1-0.dll lib32/wine/fakedlls/api-ms-win-power-base-l1-1-0.dll lib32/wine/fakedlls/api-ms-win-power-setting-l1-1-0.dll @@ -1495,11 +1506,13 @@ lib32/wine/fakedlls/api-ms-win-security-audit-l1-1-1.dll lib32/wine/fakedlls/api-ms-win-security-base-l1-1-0.dll lib32/wine/fakedlls/api-ms-win-security-base-l1-2-0.dll lib32/wine/fakedlls/api-ms-win-security-base-private-l1-1-1.dll +%%STAGING%%lib32/wine/fakedlls/api-ms-win-security-grouppolicy-l1-1-0.dll lib32/wine/fakedlls/api-ms-win-security-lsalookup-l1-1-0.dll lib32/wine/fakedlls/api-ms-win-security-lsalookup-l1-1-1.dll lib32/wine/fakedlls/api-ms-win-security-lsalookup-l2-1-1.dll lib32/wine/fakedlls/api-ms-win-security-lsapolicy-l1-1-0.dll lib32/wine/fakedlls/api-ms-win-security-sddl-l1-1-0.dll +%%STAGING%%lib32/wine/fakedlls/api-ms-win-security-systemfunctions-l1-1-0.dll lib32/wine/fakedlls/api-ms-win-service-core-l1-1-0.dll lib32/wine/fakedlls/api-ms-win-service-core-l1-1-1.dll lib32/wine/fakedlls/api-ms-win-service-management-l1-1-0.dll diff --git a/emulators/i386-wine/Makefile.i386 b/emulators/i386-wine/Makefile.i386 index 913424817773..7b11e8cb5080 100644 --- a/emulators/i386-wine/Makefile.i386 +++ b/emulators/i386-wine/Makefile.i386 @@ -37,44 +37,44 @@ post-install-script: ${REINPLACE_CMD} -e 's!lib/!lib32/!g' ${TMPPLIST} # Install bounce script to access the 32-bit executables ${INSTALL_SCRIPT} ${SLAVEDIR}/files/binbounce ${STAGEDIR}${PREFIX}/bin/wine - for i in `grep ^bin ${TMPPLIST} | ${XARGS} -n1 basename` ; do \ + for i in `${GREP} ^bin ${TMPPLIST} | ${XARGS} -n1 basename` ; do \ [ "$${i}" = "wine" ] || ${LN} -f ${STAGEDIR}${PREFIX}/bin/wine ${STAGEDIR}${PREFIX}/bin/$${i} ; \ - echo bin32/$${i} >> ${TMPPLIST} ; \ + ${ECHO_CMD} bin32/$${i} >> ${TMPPLIST} ; \ done # Install libGL ${MKDIR} ${STAGEDIR}${PREFIX}/lib32/.libGL/dri ${INSTALL_DATA} ${LOCALBASE}/lib/libGL.so.1 ${STAGEDIR}${PREFIX}/lib32/.libGL/ - echo lib32/.libGL/libGL.so.1 >> ${TMPPLIST} + ${ECHO_CMD} lib32/.libGL/libGL.so.1 >> ${TMPPLIST} # Install dri libraries (internal libGL requirements) for i in ${LOCALBASE}/lib/dri/*.so; do \ ${INSTALL_DATA} $${i} ${STAGEDIR}${PREFIX}/lib32/.libGL/dri/ ; \ - echo lib32/.libGL/dri/$${i##*/} >> ${TMPPLIST} ; \ + ${ECHO_CMD} lib32/.libGL/dri/$${i##*/} >> ${TMPPLIST} ; \ done # Find all soft dependencies (via strings(1)) - grep -v '[@%]' ${TMPPLIST} | sed "s!^!${STAGEDIR}${PREFIX}/!g" | \ - ${XARGS} -n1 file -F' ' | grep ELF | cut -f1 -d' ' | ${XARGS} strings | \ - grep '^lib.*\.so' | sort -u > ${WRKDIR}/winesoftlibs - for i in `cat ${WRKDIR}/winesoftlibs` ; do \ - if [ -e ${LOCALBASE}/lib/$${i} ] && [ -z "`grep $${i} ${TMPPLIST}`" ]; then \ + ${GREP} -v '[@%]' ${TMPPLIST} | ${SED} "s!^!${STAGEDIR}${PREFIX}/!g" | \ + ${XARGS} -n1 file -F' ' | ${GREP} ELF | ${CUT} -f1 -d' ' | ${XARGS} strings | \ + ${GREP} '^lib.*\.so' | ${SORT} -u > ${WRKDIR}/winesoftlibs + for i in `${CAT} ${WRKDIR}/winesoftlibs` ; do \ + if [ -e ${LOCALBASE}/lib/$${i} ] && [ -z "`${GREP} $${i} ${TMPPLIST}`" ]; then \ ${INSTALL_DATA} ${LOCALBASE}/lib/$${i} ${STAGEDIR}${PREFIX}/lib32/ ; \ - echo lib32/$${i} >> ${TMPPLIST} ; \ + ${ECHO_CMD} lib32/$${i} >> ${TMPPLIST} ; \ fi ; \ done # Find all libraries that are linked too (via ldd(1)) - grep -v '[@%]' ${TMPPLIST} | sed "s!^!${STAGEDIR}${PREFIX}/!g" | \ - ${XARGS} -n1 file -F' ' | grep ELF | cut -f1 -d' ' | \ + ${GREP} -v '[@%]' ${TMPPLIST} | ${SED} "s!^!${STAGEDIR}${PREFIX}/!g" | \ + ${XARGS} -n1 file -F' ' | ${GREP} ELF | ${CUT} -f1 -d' ' | \ env LD_LIBRARY_PATH=${STAGEDIR}${PREFIX}/lib32:${LD_LIBRARY_PATH} ${XARGS} ldd -f '%p\n' \ - | sort -u | grep -v '^\(/usr\)\?/lib' | grep -v "^${STAGEDIR}${PREFIX}/lib32/libwine.so" \ - | grep -v "^${STAGEDIR}${PREFIX}/lib32/wine" > ${WRKDIR}/winelibs - for i in `cat ${WRKDIR}/winelibs` ; do \ - if [ -z "`grep $${i##*/} ${TMPPLIST}`" ]; then \ + | ${SORT} -u | ${GREP} -v '^\(/usr\)\?/lib' | ${GREP} -v "^${STAGEDIR}${PREFIX}/lib32/libwine.so" \ + | ${GREP} -v "^${STAGEDIR}${PREFIX}/lib32/wine" > ${WRKDIR}/winelibs + for i in `${CAT} ${WRKDIR}/winelibs` ; do \ + if [ -z "`${GREP} $${i##*/} ${TMPPLIST}`" ]; then \ ${INSTALL_DATA} $${i} ${STAGEDIR}${PREFIX}/lib32/ ; \ - echo lib32/$${i##*/} >> ${TMPPLIST} ; \ + ${ECHO_CMD} lib32/$${i##*/} >> ${TMPPLIST} ; \ fi ; \ done # Install nvidia patching script ${INSTALL_SCRIPT} ${SLAVEDIR}/files/nvidia.sh ${STAGEDIR}${DATADIR}/patch-nvidia.sh - echo ${DATADIR:S|$(PREFIX)/||}/patch-nvidia.sh >> ${TMPPLIST} + ${ECHO_CMD} ${DATADIR:S|$(PREFIX)/||}/patch-nvidia.sh >> ${TMPPLIST} @${CAT} ${PKGMESSAGE} .include "${MASTERDIR}/Makefile" diff --git a/finance/prestashop/Makefile b/finance/prestashop/Makefile index 362f84db4cdb..2cb1e32b2eeb 100644 --- a/finance/prestashop/Makefile +++ b/finance/prestashop/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= prestashop -PORTVERSION= 1.7.0.6 +PORTVERSION= 1.7.1.0 CATEGORIES= finance www MASTER_SITES= http://www.prestashop.com/download/old/ DISTNAME= ${PORTNAME}_${PORTVERSION} diff --git a/finance/prestashop/distinfo b/finance/prestashop/distinfo index 6262d3001465..abd2a51e55ff 100644 --- a/finance/prestashop/distinfo +++ b/finance/prestashop/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1488941124 -SHA256 (prestashop_1.7.0.6.zip) = 6915820a9345b3e08776731e936416326e78f6a1a797e1425ddbf1d8e37490cd -SIZE (prestashop_1.7.0.6.zip) = 56083540 +TIMESTAMP = 1492337082 +SHA256 (prestashop_1.7.1.0.zip) = 349404e3239ed59b1554a3e5ff3a42042b5db3b4b67e4b03fe9ce389cff56b93 +SIZE (prestashop_1.7.1.0.zip) = 58237259 diff --git a/games/blockout/Makefile b/games/blockout/Makefile index 5f6ad209e75a..c5f9ba947c32 100644 --- a/games/blockout/Makefile +++ b/games/blockout/Makefile @@ -3,7 +3,7 @@ PORTNAME= blockout PORTVERSION= 2.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/BlockOut%20${PORTVERSION}/ \ http://www.stasyan.com/devel/distfiles/ @@ -29,6 +29,13 @@ BUILD_WRKSRC= ${WRKSRC}/BlockOut OPTIONS_DEFINE= DOCS +DESKTOP_ENTRIES="BlockOut" \ + "" \ + "${PREFIX}/share/pixmaps/block_icon.ico" \ + "${PORTNAME}" \ + "" \ + "" + post-patch: @${REINPLACE_CMD} -e 's|%%DATADIR%%|${DATADIR}|' ${WRKSRC}/BlockOut/Utils.cpp @@ -38,6 +45,7 @@ pre-build: do-install: ${INSTALL_PROGRAM} ${WRKSRC}/BlockOut/blockout ${STAGEDIR}${PREFIX}/bin cd ${WRKDIR}/blockout && ${COPYTREE_SHARE} "images sounds" ${STAGEDIR}${DATADIR} + ${INSTALL_DATA} ${WRKSRC}/BlockOut/block_icon.ico ${STAGEDIR}${PREFIX}/share/pixmaps do-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} diff --git a/games/blockout/pkg-plist b/games/blockout/pkg-plist index 432d3360b1ba..859b98023fc3 100644 --- a/games/blockout/pkg-plist +++ b/games/blockout/pkg-plist @@ -1,4 +1,5 @@ bin/blockout +share/pixmaps/block_icon.ico %%DATADIR%%/images/background.png %%DATADIR%%/images/background2.png %%DATADIR%%/images/background3.png diff --git a/games/solarus-quest-editor/Makefile b/games/solarus-quest-editor/Makefile index b2d24e895c41..146e33a65a01 100644 --- a/games/solarus-quest-editor/Makefile +++ b/games/solarus-quest-editor/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= solarus-quest-editor -PORTVERSION= 1.5.2 -PORTREVISION= 1 +PORTVERSION= 1.5.3 DISTVERSIONPREFIX= v CATEGORIES= games diff --git a/games/solarus-quest-editor/distinfo b/games/solarus-quest-editor/distinfo index b237c570a1c6..33961b1b697e 100644 --- a/games/solarus-quest-editor/distinfo +++ b/games/solarus-quest-editor/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1481279186 -SHA256 (christopho-solarus-quest-editor-v1.5.2_GH0.tar.gz) = 0122aa8bd99e0583d2889c47dc2dea31e9a2b59a37725c28110b388998e54f58 -SIZE (christopho-solarus-quest-editor-v1.5.2_GH0.tar.gz) = 63395577 +TIMESTAMP = 1492117065 +SHA256 (christopho-solarus-quest-editor-v1.5.3_GH0.tar.gz) = 2274388d2f91641c46fd141e7fdfb461b1ae84a83b497f2cea54180102e8c60a +SIZE (christopho-solarus-quest-editor-v1.5.3_GH0.tar.gz) = 67711657 diff --git a/games/solarus/Makefile b/games/solarus/Makefile index 21da95af6956..ce4c6b1f7f3a 100644 --- a/games/solarus/Makefile +++ b/games/solarus/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= solarus -PORTVERSION= 1.5.1 -PORTREVISION= 1 +PORTVERSION= 1.5.3 CATEGORIES= games MASTER_SITES= http://www.solarus-games.org/downloads/solarus/ DISTNAME= solarus-${PORTVERSION}-src diff --git a/games/solarus/distinfo b/games/solarus/distinfo index 1d06500df84c..0831f8de87c4 100644 --- a/games/solarus/distinfo +++ b/games/solarus/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1480615028 -SHA256 (solarus-1.5.1-src.tar.gz) = 6cd3928a024f7c18a163a1679a92dfff3c37139c5c49fa5348704df5357e8da3 -SIZE (solarus-1.5.1-src.tar.gz) = 2273607 +TIMESTAMP = 1492116806 +SHA256 (solarus-1.5.3-src.tar.gz) = 7608f3bdc7baef36e95db5e4fa4c8c5be0a3f436c50c53ab72d70a92aa44cc1c +SIZE (solarus-1.5.3-src.tar.gz) = 2727433 diff --git a/games/solarus/pkg-plist b/games/solarus/pkg-plist index a6ba356b312b..eb51996da655 100644 --- a/games/solarus/pkg-plist +++ b/games/solarus/pkg-plist @@ -25,6 +25,7 @@ include/solarus/Map.h include/solarus/MapData.h include/solarus/QuestProperties.h include/solarus/QuestResources.h +include/solarus/ResourceProvider.h include/solarus/ResourceType.h include/solarus/Savegame.h include/solarus/SavegameConverterV1.h @@ -229,4 +230,15 @@ include/solarus/third_party/snes_spc/spc.h lib/libsolarus-gui.so lib/libsolarus.so lib/libsolarus.so.1 -lib/libsolarus.so.1.5.1 +lib/libsolarus.so.1.5.3 +share/applications/solarus.desktop +share/icons/hicolor/128x128/apps/solarus.png +share/icons/hicolor/16x16/apps/solarus.png +share/icons/hicolor/24x24/apps/solarus.png +share/icons/hicolor/256x256/apps/solarus.png +share/icons/hicolor/32x32/apps/solarus.png +share/icons/hicolor/48x48/apps/solarus.png +share/icons/hicolor/512x512/apps/solarus.png +share/icons/hicolor/64x64/apps/solarus.png +share/man/man6/solarus-run.6 +share/man/man6/solarus.6 diff --git a/graphics/Makefile b/graphics/Makefile index e98c3e51b935..ac7973c4b5dd 100644 --- a/graphics/Makefile +++ b/graphics/Makefile @@ -146,6 +146,7 @@ SUBDIR += dmtx-utils SUBDIR += dri SUBDIR += driconf + SUBDIR += dspdfviewer SUBDIR += duhdraw SUBDIR += dynamechs SUBDIR += easypaint diff --git a/graphics/dspdfviewer/Makefile b/graphics/dspdfviewer/Makefile new file mode 100644 index 000000000000..03540d91fe1a --- /dev/null +++ b/graphics/dspdfviewer/Makefile @@ -0,0 +1,33 @@ +# $FreeBSD$ + +PORTNAME= dspdfviewer +PORTVERSION= 1.15.1 +DISTVERSIONPREFIX=v +CATEGORIES= graphics + +MAINTAINER= santhosh.raju@gmail.com +COMMENT= Dual-screen PDF viewer for LaTeX-beamer + +LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING + +LIB_DEPENDS= libpoppler-qt5.so:graphics/poppler-qt5 \ + libboost_program_options.so:devel/boost-libs + +BUILD_WRKSRC= ${WRKSRC}/build +CONFIGURE_WRKSRC= ${WRKSRC}/build +INSTALL_WRKSRC= ${WRKSRC}/build + +USES= cmake pkgconfig +USE_QT5= buildtools_build core gui qmake_build linguisttools widgets xml +CMAKE_ARGS= -DPOPPLER_LIBRARIES=${LOCALBASE}/lib/libpoppler-qt5.so -DBuildTests=OFF +USE_LDCONFIG= yes + +USE_GITHUB= yes +GH_ACCOUNT= dannyedel + +PLIST_FILES= bin/dspdfviewer \ + share/applications/dspdfviewer.desktop \ + share/man/man1/dspdfviewer.1 + +.include diff --git a/graphics/dspdfviewer/distinfo b/graphics/dspdfviewer/distinfo new file mode 100644 index 000000000000..ba8920dbc540 --- /dev/null +++ b/graphics/dspdfviewer/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1492288808 +SHA256 (dannyedel-dspdfviewer-v1.15.1_GH0.tar.gz) = c5b6f8c93d732e65a27810286d49a4b1c6f777d725e26a207b14f6b792307b03 +SIZE (dannyedel-dspdfviewer-v1.15.1_GH0.tar.gz) = 165202 diff --git a/graphics/dspdfviewer/pkg-descr b/graphics/dspdfviewer/pkg-descr new file mode 100644 index 000000000000..cce05da38efd --- /dev/null +++ b/graphics/dspdfviewer/pkg-descr @@ -0,0 +1,9 @@ +dspdfviewer a simple viewer for latex-beamer presentations that are built with +the show notes on second screen option of latex-beamer. It will take your PDF +file, split it in a left and right half and render the two halves individually +to the screens. + +In addition, your laptop screen will contain some counters and a wall-clock, +which may help you time your presentation right. + +WWW: https://github.com/dannyedel/dspdfviewer diff --git a/irc/Makefile b/irc/Makefile index 73e28270c023..9ec2fada9ab9 100644 --- a/irc/Makefile +++ b/irc/Makefile @@ -51,6 +51,7 @@ SUBDIR += irssi SUBDIR += irssi-dcc_send_limiter SUBDIR += irssi-fish + SUBDIR += irssi-icb SUBDIR += irssi-otr SUBDIR += irssi-scripts SUBDIR += irssi-xmpp diff --git a/irc/irssi-icb/Makefile b/irc/irssi-icb/Makefile new file mode 100644 index 000000000000..06efdee4c81c --- /dev/null +++ b/irc/irssi-icb/Makefile @@ -0,0 +1,31 @@ +# $FreeBSD$ + +PORTNAME= irssi-icb +PORTVERSION= 0.17 +CATEGORIES= irc + +MAINTAINER= santhosh.raju@gmail.com +COMMENT= Irssi plugin for connecting to ICB network + +LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING + +BUILD_DEPENDS= ${LOCALBASE}/include/irssi/src/common.h:irc/irssi:irc/irssi +RUN_DEPENDS= irssi:irc/irssi + +USES= autoreconf libtool pkgconfig +USE_LDCONFIG= yes +USE_GNOME= glib20 + +USE_GITHUB= yes +GH_ACCOUNT= mglocker +GH_TAGNAME= c4e2ea8 + +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --disable-static --with-irssi=${LOCALBASE}/include/irssi +INSTALL_TARGET= install-strip + +PLIST_FILES= lib/irssi/modules/libicb_core.so \ + lib/irssi/modules/libfe_icb.so + +.include diff --git a/irc/irssi-icb/distinfo b/irc/irssi-icb/distinfo new file mode 100644 index 000000000000..fb3b62b6aca2 --- /dev/null +++ b/irc/irssi-icb/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1492293020 +SHA256 (mglocker-irssi-icb-0.17-c4e2ea8_GH0.tar.gz) = 444e28d44fcb5ed54d904e74a0f6c19da8adce97a6eb83656748f66315bebd8c +SIZE (mglocker-irssi-icb-0.17-c4e2ea8_GH0.tar.gz) = 23090 diff --git a/irc/irssi-icb/files/patch-configure.ac b/irc/irssi-icb/files/patch-configure.ac new file mode 100644 index 000000000000..175553693e2a --- /dev/null +++ b/irc/irssi-icb/files/patch-configure.ac @@ -0,0 +1,26 @@ +--- configure.ac.orig 2017-01-22 13:24:58 UTC ++++ configure.ac +@@ -19,23 +19,12 @@ AC_ARG_WITH([irssi], + [], + [with_irssi=no]) + +-AS_IF([test "x$with_irssi" = "xno"], [ +- AS_IF([test -f ../irssi-config], +- [with_irssi=".."], +- AS_IF([test -f ../irssi/irssi-config], +- [with_irssi="../.."], +- AS_IF([test -f ../../irssi/irssi-config], +- [with_irssi="../../irssi"], +- AS_ERROR([Could not determine irssi directory])))) ]) + + # fix relative paths + IRSSI_INCLUDE=`cd $with_irssi; pwd` + + AC_SUBST(IRSSI_INCLUDE) + +-AS_IF([test ! -f "$IRSSI_INCLUDE/irssi-config"], +- [AC_ERROR(Not irssi directory: $IRSSI_INCLUDE)] +-) + + PKG_CHECK_MODULES(GLIB, glib-2.0) + diff --git a/irc/irssi-icb/pkg-descr b/irc/irssi-icb/pkg-descr new file mode 100644 index 000000000000..579a011a1dbf --- /dev/null +++ b/irc/irssi-icb/pkg-descr @@ -0,0 +1,4 @@ +irssi-icb provides connectivity to Internet Citizen's Band (icb) +networks for the irssi Internet Relay Chat (IRC) client. + +WWW: https://github.com/mglocker/irssi-icb diff --git a/lang/go/Makefile b/lang/go/Makefile index 6718aab9a1e1..d0fe91cf4eca 100644 --- a/lang/go/Makefile +++ b/lang/go/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= go -PORTVERSION= 1.8 -PORTREVISION= 1 +PORTVERSION= 1.8.1 PORTEPOCH= 1 CATEGORIES= lang MASTER_SITES= http://golang.org/dl/ diff --git a/lang/go/distinfo b/lang/go/distinfo index 9c66d4c39a1f..6419c9907954 100644 --- a/lang/go/distinfo +++ b/lang/go/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1487448855 -SHA256 (go1.8.src.tar.gz) = 406865f587b44be7092f206d73fc1de252600b79b3cacc587b74b5ef5c623596 -SIZE (go1.8.src.tar.gz) = 15320083 +TIMESTAMP = 1492288947 +SHA256 (go1.8.1.src.tar.gz) = 33daf4c03f86120fdfdc66bddf6bfff4661c7ca11c5da473e537f4d69b470e57 +SIZE (go1.8.1.src.tar.gz) = 15331455 diff --git a/lang/go/pkg-plist b/lang/go/pkg-plist index 1a4d6e933720..d1d33f2aeec7 100644 --- a/lang/go/pkg-plist +++ b/lang/go/pkg-plist @@ -891,6 +891,7 @@ go/pkg/bootstrap/src/bootstrap/cmd/compile/internal/ssa/lca.go go/pkg/bootstrap/src/bootstrap/cmd/compile/internal/ssa/lca_test.go go/pkg/bootstrap/src/bootstrap/cmd/compile/internal/ssa/likelyadjust.go go/pkg/bootstrap/src/bootstrap/cmd/compile/internal/ssa/location.go +go/pkg/bootstrap/src/bootstrap/cmd/compile/internal/ssa/loop_test.go go/pkg/bootstrap/src/bootstrap/cmd/compile/internal/ssa/loopbce.go go/pkg/bootstrap/src/bootstrap/cmd/compile/internal/ssa/loopreschedchecks.go go/pkg/bootstrap/src/bootstrap/cmd/compile/internal/ssa/lower.go @@ -1028,6 +1029,7 @@ go/pkg/bootstrap/src/bootstrap/cmd/internal/obj/x86/obj6_test.go go/pkg/bootstrap/src/bootstrap/cmd/internal/obj/zbootstrap.go go/pkg/bootstrap/src/bootstrap/cmd/internal/sys/arch.go go/pkg/bootstrap/src/bootstrap/cmd/link/doc.go +go/pkg/bootstrap/src/bootstrap/cmd/link/dwarf_test.go go/pkg/bootstrap/src/bootstrap/cmd/link/internal/amd64/asm.go go/pkg/bootstrap/src/bootstrap/cmd/link/internal/amd64/l.go go/pkg/bootstrap/src/bootstrap/cmd/link/internal/amd64/obj.go @@ -1488,6 +1490,7 @@ go/src/cmd/compile/internal/ssa/lca.go go/src/cmd/compile/internal/ssa/lca_test.go go/src/cmd/compile/internal/ssa/likelyadjust.go go/src/cmd/compile/internal/ssa/location.go +go/src/cmd/compile/internal/ssa/loop_test.go go/src/cmd/compile/internal/ssa/loopbce.go go/src/cmd/compile/internal/ssa/loopreschedchecks.go go/src/cmd/compile/internal/ssa/lower.go @@ -1931,6 +1934,7 @@ go/src/cmd/internal/objfile/pe.go go/src/cmd/internal/objfile/plan9obj.go go/src/cmd/internal/sys/arch.go go/src/cmd/link/doc.go +go/src/cmd/link/dwarf_test.go go/src/cmd/link/internal/amd64/asm.go go/src/cmd/link/internal/amd64/l.go go/src/cmd/link/internal/amd64/obj.go @@ -3257,6 +3261,7 @@ go/src/internal/syscall/windows/syscall_windows.go go/src/internal/syscall/windows/sysdll/sysdll.go go/src/internal/syscall/windows/zsyscall_windows.go go/src/internal/testenv/testenv.go +go/src/internal/testenv/testenv_cgo.go go/src/internal/testenv/testenv_notwin.go go/src/internal/testenv/testenv_windows.go go/src/internal/trace/goroutines.go @@ -5626,6 +5631,7 @@ go/test/fixedbugs/bug191.go go/test/fixedbugs/bug192.go go/test/fixedbugs/bug193.go go/test/fixedbugs/bug194.go +go/test/fixedbugs/bug19403.go go/test/fixedbugs/bug195.go go/test/fixedbugs/bug196.go go/test/fixedbugs/bug197.go @@ -6255,6 +6261,13 @@ go/test/fixedbugs/issue18725.go go/test/fixedbugs/issue18808.go go/test/fixedbugs/issue18906.go go/test/fixedbugs/issue18915.go +go/test/fixedbugs/issue19137.go +go/test/fixedbugs/issue19168.go +go/test/fixedbugs/issue19182.go +go/test/fixedbugs/issue19201.go +go/test/fixedbugs/issue19217.go +go/test/fixedbugs/issue19323.go +go/test/fixedbugs/issue19743.go go/test/fixedbugs/issue2615.go go/test/fixedbugs/issue3552.dir/one.go go/test/fixedbugs/issue3552.dir/two.go diff --git a/math/py-PyWavelets/Makefile b/math/py-PyWavelets/Makefile index e86aab06b8ce..bd36eae7c9d1 100644 --- a/math/py-PyWavelets/Makefile +++ b/math/py-PyWavelets/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= PyWavelets -PORTVERSION= 0.5.1 +PORTVERSION= 0.5.2 DISTVERSIONPREFIX= v CATEGORIES= math python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/math/py-PyWavelets/distinfo b/math/py-PyWavelets/distinfo index 4d5f224081e9..dc6b1d42d1c7 100644 --- a/math/py-PyWavelets/distinfo +++ b/math/py-PyWavelets/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1489108516 -SHA256 (PyWavelets-pywt-v0.5.1_GH0.tar.gz) = dc912325b4752b83303af31925450efb795ec81d6aed1317613f7d5a634c0b50 -SIZE (PyWavelets-pywt-v0.5.1_GH0.tar.gz) = 3865431 +TIMESTAMP = 1492327366 +SHA256 (PyWavelets-pywt-v0.5.2_GH0.tar.gz) = e36d629f40f7781da2dcaa2139bc476e9deaf91d79f675b5ce0bde6e775d1b53 +SIZE (PyWavelets-pywt-v0.5.2_GH0.tar.gz) = 3867428 diff --git a/multimedia/kaffeine/Makefile b/multimedia/kaffeine/Makefile index 41f81b02cd13..11571a3d6e37 100644 --- a/multimedia/kaffeine/Makefile +++ b/multimedia/kaffeine/Makefile @@ -3,11 +3,11 @@ PORTNAME= kaffeine PORTVERSION= 1.3.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= multimedia kde MASTER_SITES= SF/kaffeine/current -MAINTAINER= arved@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Multimedia player based on KDE and VLC LICENSE= GPLv2+ @@ -19,7 +19,7 @@ LIB_DEPENDS= libvlc.so:multimedia/vlc-qt4 USES= cmake kde:4 cpe gettext pkgconfig USE_KDE= automoc4 kdelibs USE_QT4= corelib dbus gui network phonon sql svg xml \ - moc_build qmake_build rcc_build uic_build + moc_build qmake_build rcc_build uic_build sql-sqlite2 USE_XORG= xscrnsaver CPE_VENDOR= kaffeine diff --git a/net-im/profanity/Makefile b/net-im/profanity/Makefile index f8375e31a0ed..ca59f0a14ece 100644 --- a/net-im/profanity/Makefile +++ b/net-im/profanity/Makefile @@ -2,6 +2,7 @@ PORTNAME= profanity PORTVERSION= 0.5.1 +PORTREVISION= 1 CATEGORIES= net-im MASTER_SITES= http://www.profanity.im/ @@ -11,15 +12,17 @@ COMMENT= Console based XMPP client LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/LICENSE.txt -LIB_DEPENDS= libstrophe.so:net-im/libstrophe \ +BUILD_DEPENDS= autoconf-archive>=0:devel/autoconf-archive +LIB_DEPENDS= libmesode.so:net-im/libmesode \ libcurl.so:ftp/curl \ libotr.so.5:security/libotr \ libuuid.so:misc/e2fsprogs-libuuid \ libgpgme.so:security/gpgme -USES= ncurses pkgconfig ssl python readline +USES= ncurses pkgconfig ssl python readline autoreconf libtool GNU_CONFIGURE= yes -CONFIGURE_ARGS= --enable-otr +CONFIGURE_ARGS= --enable-otr --enable-python-plugins --enable-c-plugins \ + --enable-pgp --enable-icons=no --with-xscreensaver=no CONFIGURE_ENV= LIBS="${CFLAGS} -lcrypto" USE_GNOME= glib20 diff --git a/net-im/profanity/files/patch-configure.ac b/net-im/profanity/files/patch-configure.ac new file mode 100644 index 000000000000..dab731a99512 --- /dev/null +++ b/net-im/profanity/files/patch-configure.ac @@ -0,0 +1,14 @@ +--- configure.ac.orig 2017-04-15 18:51:39.947886000 +0000 ++++ configure.ac 2017-04-15 18:52:27.321723000 +0000 +@@ -105,10 +105,7 @@ + elif test "x$enable_c_plugins" != xno; then + AC_CHECK_LIB([dl], [main], + [AM_CONDITIONAL([BUILD_C_API], [true]) LIBS="$LIBS -ldl" AC_DEFINE([HAVE_C], [1], [C support])], +- [AS_IF( +- [test "x$enable_c_plugins" = xyes], +- [AC_MSG_ERROR([dl library needed to run C plugins])], +- [AM_CONDITIONAL([BUILD_C_API], [false])]) ++ [AM_CONDITIONAL([BUILD_C_API], [true]) + ]) + else + AM_CONDITIONAL([BUILD_C_API], [false]) diff --git a/net-im/profanity/pkg-plist b/net-im/profanity/pkg-plist index 363fc4eaa6c5..fcca0ac6d0d4 100644 --- a/net-im/profanity/pkg-plist +++ b/net-im/profanity/pkg-plist @@ -1,4 +1,6 @@ bin/profanity +include/profapi.h +lib/libprofanity.so man/man1/profanity.1.gz %%DATADIR%%/themes/aqua %%DATADIR%%/themes/batman diff --git a/sysutils/burp/Makefile b/sysutils/burp/Makefile index 7451ab4b7913..94d1da65a21c 100644 --- a/sysutils/burp/Makefile +++ b/sysutils/burp/Makefile @@ -6,7 +6,7 @@ PORTVERSION= 1.4.40 PORTREVISION= 1 CATEGORIES= sysutils -MAINTAINER= loic-freebsd@loicp.eu +MAINTAINER= ports@freebsd.org COMMENT= Network backup and restore program LICENSE= AGPLv3 diff --git a/sysutils/libcdio-paranoia/Makefile b/sysutils/libcdio-paranoia/Makefile index 5fa59ba5069b..9accccf02ef9 100644 --- a/sysutils/libcdio-paranoia/Makefile +++ b/sysutils/libcdio-paranoia/Makefile @@ -1,11 +1,11 @@ # $FreeBSD$ PORTNAME= libcdio-paranoia -PORTVERSION= 10.2+0.93+1 +PORTVERSION= 10.2+0.94+1 CATEGORIES= sysutils MASTER_SITES= GNU/libcdio -MAINTAINER= arved@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Read audio from the CDROM directly as data LICENSE= GPLv3 @@ -15,6 +15,7 @@ LIB_DEPENDS= libcdio.so:sysutils/libcdio USES= pathfix tar:bzip2 gmake pkgconfig libtool perl5 GNU_CONFIGURE= yes +CONFIGURE_ARGS= --without-versioned-libs USE_LDCONFIG= yes CPPFLAGS+= -I${LOCALBASE}/include INSTALL_TARGET=install-strip diff --git a/sysutils/libcdio-paranoia/distinfo b/sysutils/libcdio-paranoia/distinfo index d39d3f838f6c..4864694b48e0 100644 --- a/sysutils/libcdio-paranoia/distinfo +++ b/sysutils/libcdio-paranoia/distinfo @@ -1,2 +1,3 @@ -SHA256 (libcdio-paranoia-10.2+0.93+1.tar.bz2) = ec1d9b1d5a28cc042f2cb33a7cc0a2b5ce5525f102bc4c15db1fac322559a493 -SIZE (libcdio-paranoia-10.2+0.93+1.tar.bz2) = 557271 +TIMESTAMP = 1492287409 +SHA256 (libcdio-paranoia-10.2+0.94+1.tar.bz2) = 10304e64e5a125d5b4b336ba75eccb39ebfd977512fb04c40a7035f6ff4c6cd2 +SIZE (libcdio-paranoia-10.2+0.94+1.tar.bz2) = 585937 diff --git a/textproc/align/Makefile b/textproc/align/Makefile index b4ae999260fd..fd31309dc9ad 100644 --- a/textproc/align/Makefile +++ b/textproc/align/Makefile @@ -2,15 +2,16 @@ # $FreeBSD$ PORTNAME= align -PORTVERSION= 1.7.3 +PORTVERSION= 1.7.5 CATEGORIES= textproc -MASTER_SITES= http://www.cs.indiana.edu/~kinzler/align/ \ +MASTER_SITES= https://kinzler.com/me/align/ \ http://bitrote.org/distfiles/ MAINTAINER= jharris@widomaker.com COMMENT= Text column alignment filter LICENSE= GPLv2+ +LICENSE_FILE= ${WRKSRC}/COPYING NO_BUILD= yes diff --git a/textproc/align/distinfo b/textproc/align/distinfo index 8586c684644a..6d49e36ba94c 100644 --- a/textproc/align/distinfo +++ b/textproc/align/distinfo @@ -1,2 +1,3 @@ -SHA256 (align-1.7.3.tgz) = 5a3ee4bcaab1ae74cf33388911a3e3d48147039384b4756fd4c9dc02a0009827 -SIZE (align-1.7.3.tgz) = 12184 +TIMESTAMP = 1491970165 +SHA256 (align-1.7.5.tgz) = cc692fb9dee0cc288757e708fc1a3b6b56ca1210ca181053a371cb11746969dd +SIZE (align-1.7.5.tgz) = 12216 diff --git a/textproc/align/pkg-descr b/textproc/align/pkg-descr index 4093aa35f98e..e38d8044d5fc 100644 --- a/textproc/align/pkg-descr +++ b/textproc/align/pkg-descr @@ -4,4 +4,4 @@ columns, you can often use it without arguments and it'll guess the right thing to do. Otherwise, you can specify arguments to direct how the columns are separated on input and rejoined in the aligned output. -WWW: http://www.cs.indiana.edu/~kinzler/align/ +WWW: https://kinzler.com/me/align/ diff --git a/textproc/p5-PDF-Tiny/Makefile b/textproc/p5-PDF-Tiny/Makefile index 0b5ca8084580..8018210493aa 100644 --- a/textproc/p5-PDF-Tiny/Makefile +++ b/textproc/p5-PDF-Tiny/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= PDF-Tiny -DISTVERSION= 0.07 +DISTVERSION= 0.08 CATEGORIES= textproc perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/textproc/p5-PDF-Tiny/distinfo b/textproc/p5-PDF-Tiny/distinfo index 6d3ef0c289a5..b4f011374fc2 100644 --- a/textproc/p5-PDF-Tiny/distinfo +++ b/textproc/p5-PDF-Tiny/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1489043415 -SHA256 (PDF-Tiny-0.07.tar.gz) = 2ef77951c8684b21b9dba234ed357038236abef5fafc17226b067622cadb6483 -SIZE (PDF-Tiny-0.07.tar.gz) = 61522 +TIMESTAMP = 1492336130 +SHA256 (PDF-Tiny-0.08.tar.gz) = fac6a46a3310eee1d28a0065612ec0da5dcd222f975415ffb360e6a4a7619f24 +SIZE (PDF-Tiny-0.08.tar.gz) = 73414 diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile index cafdf99ed14e..4c4cc888fa5c 100644 --- a/www/nginx-devel/Makefile +++ b/www/nginx-devel/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= nginx -PORTVERSION= 1.11.10 +PORTVERSION= 1.12.0 CATEGORIES= www MASTER_SITES= http://nginx.org/download/ MASTER_SITES+= LOCAL/osa @@ -26,7 +26,6 @@ OPTIONS_DEFINE= \ DEBUG \ DEBUGLOG \ FILE_AIO \ - IPV6 \ GOOGLE_PERFTOOLS \ HTTP \ HTTP_ADDITION \ @@ -122,8 +121,6 @@ OPTIONS_DEFINE= \ SLOWFS_CACHE \ SMALL_LIGHT \ SRCACHE \ - STATSD \ - UDPLOG \ X11 \ XRID_HEADER \ XSS @@ -234,8 +231,6 @@ SHIBBOLETH_DESC= 3rd party shibboleth module SLOWFS_CACHE_DESC= 3rd party slowfs_cache module SMALL_LIGHT_DESC= 3rd party small_light module SRCACHE_DESC= 3rd party srcache module -STATSD_DESC= 3rd party statsd module -UDPLOG_DESC= 3rd party udplog (syslog) module X11_DESC= graphics/ImageMagick[-nox11] dependency XRID_HEADER_DESC= 3rd party x-rid header module XSS_DESC= 3rd party xss module @@ -312,11 +307,6 @@ CONFIGURE_ARGS+=--with-debug CONFIGURE_ARGS+=--with-file-aio .endif -.if ${PORT_OPTIONS:MIPV6} -CONFIGURE_ARGS+=--with-ipv6 -CATEGORIES+= ipv6 -.endif - .if ${PORT_OPTIONS:MGOOGLE_PERFTOOLS} LIB_DEPENDS+= libprofiler.so:devel/google-perftools CONFIGURE_ARGS+=--with-google_perftools_module @@ -359,14 +349,16 @@ CONFIGURE_ARGS+=--add-module=${WRKSRC_auth_digest} .endif .if ${PORT_OPTIONS:MHTTP_AUTH_KRB5} -GIT_HTTP_AUTH_KRB5_VERSION= c85a38c +GIT_HTTP_AUTH_KRB5_VERSION= 0c6ff3f GH_ACCOUNT+= stnoonan:auth_krb5 GH_PROJECT+= spnego-http-auth-nginx-module:auth_krb5 GH_TAGNAME+= ${GIT_HTTP_AUTH_KRB5_VERSION}:auth_krb5 CONFIGURE_ARGS+=--add-module=${WRKSRC_auth_krb5} -EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-spnego-http-auth-nginx-module-config -# TODO: Provide optional dependence on Kerberos implementations from ports -USES+= gssapi:base,flags +#EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-spnego-http-auth-nginx-module-config +#OPTIONS_RADIO+= GSSAPI +#OPTIONS_RADIO_GSSAPI+= GSSAPI_HEIMDAL GSSAPI_MIT +#GSSAPI_HEIMDAL_USES= gssapi:heimdal,flags +#GSSAPI_MIT_USES= gssapi:mit .endif .if ${PORT_OPTIONS:MHTTP_AUTH_LDAP} @@ -465,6 +457,7 @@ CONFIGURE_ARGS+=--add-dynamic-module=${WRKSRC_echo} .else CONFIGURE_ARGS+=--add-module=${WRKSRC_echo} .endif +EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ngx_http_echo_request_info.c .endif .if ${PORT_OPTIONS:MFASTDFS} @@ -713,12 +706,11 @@ CONFIGURE_ARGS+=--with-http_sub_module .endif .if ${PORT_OPTIONS:MHTTP_UPLOAD} -GIT_UPLOAD_VERSION= aba1e3f34c -GH_ACCOUNT+= vkholodkov:upload +GIT_UPLOAD_VERSION= 72ec037 +GH_ACCOUNT+= Austinb:upload GH_PROJECT+= nginx-upload-module:upload GH_TAGNAME+= ${GIT_UPLOAD_VERSION}:upload CONFIGURE_ARGS+=--add-module=${WRKSRC_upload} -IGNORE= HTTP_UPLOAD: a patch requires .endif .if ${PORT_OPTIONS:MHTTP_UPLOAD_PROGRESS} @@ -744,14 +736,14 @@ EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-src-http-modules-ngx_http_upstream_hash_ .endif .if !empty(PORT_OPTIONS:MHTTP_UPSTREAM_FAIR) -NGINX_UPSTREAM_FAIR_VERSION= 20090923 -MASTER_SITES+= LOCAL/osa:upstreamfair -DISTFILES+= nginx_upstream_fair-${NGINX_UPSTREAM_FAIR_VERSION}.tar.gz:upstreamfair -CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx_upstream_fair-${NGINX_UPSTREAM_FAIR_VERSION} -.if !empty(PORT_OPTIONS:MHTTP_UPSTREAM_CHECK) -EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ngx_http_upstream_fair_module.c -IGNORE= HTTP_UPSTREAM_FAIR: a patch requires -.endif +NGINX_UPSTREAM_FAIR_VERSION= b5be36f +GH_ACCOUNT+= cryptofuture:upstreamfair +GH_PROJECT+= nginx-upstream-fair:upstreamfair +GH_TAGNAME+= ${NGINX_UPSTREAM_FAIR_VERSION}:upstreamfair +CONFIGURE_ARGS+=--add-module=${WRKSRC_upstreamfair} +#.if !empty(PORT_OPTIONS:MHTTP_UPSTREAM_CHECK) +#EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ngx_http_upstream_fair_module.c +#.endif .endif .if ${PORT_OPTIONS:MHTTP_UPSTREAM_STICKY} @@ -786,12 +778,11 @@ CONFIGURE_ARGS+=--with-http_xslt_module .endif .if ${PORT_OPTIONS:MHTTP_ZIP} -NGINX_ZIP_VERSION= ca0b345 -GH_ACCOUNT+= evanmiller:mod_zip +NGINX_ZIP_VERSION= 74ef235 +GH_ACCOUNT+= anthonyryan1:mod_zip GH_PROJECT+= mod_zip:mod_zip GH_TAGNAME+= ${NGINX_ZIP_VERSION}:mod_zip CONFIGURE_ARGS+=--add-module=${WRKDIR}/mod_zip-${NGINX_ZIP_VERSION} -IGNORE= HTTP_ZIP: a patch requires .endif .if ${PORT_OPTIONS:MDRIZZLE} @@ -826,6 +817,10 @@ GH_ACCOUNT+= simpl:devel_kit GH_PROJECT+= ngx_devel_kit:devel_kit GH_TAGNAME+= v${NGINX_DEVEL_KIT_VERSION}:devel_kit CONFIGURE_ARGS+=--add-module=${WRKSRC_devel_kit} +EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ngx_http_lua_common.h \ + ${PATCHDIR}/extra-patch-ngx_http_lua_headers.c \ + ${PATCHDIR}/extra-patch-ngx_http_lua_headers.h \ + ${PATCHDIR}/extra-patch-ngx_http_lua_module.c .endif .if ${PORT_OPTIONS:MENCRYPTSESSION} @@ -857,7 +852,7 @@ CONFIGURE_ARGS+=--add-module=${WRKSRC_let} LIB_DEPENDS+= libluajit-5.1.so:lang/luajit CONFIGURE_ENV+= "LUAJIT_INC=${LOCALBASE}/include/luajit-2.0" CONFIGURE_ENV+= "LUAJIT_LIB=${LOCALBASE}/lib" -NGINX_LUA_VERSION= 0.10.7 +NGINX_LUA_VERSION= 0.10.8 GH_ACCOUNT+= openresty:lua GH_PROJECT+= lua-nginx-module:lua GH_TAGNAME+= v${NGINX_LUA_VERSION}:lua @@ -890,7 +885,8 @@ USES+= pkgconfig shebangfix MASTER_SITES+= http://www.modsecurity.org/tarball/${NGINX_MODSECURITY_VERSION:S/RC/rc/}/:modsecurity DISTFILES+= modsecurity-${NGINX_MODSECURITY_VERSION}.tar.gz:modsecurity CONFIGURE_ARGS+=--add-module=${WRKDIR}/modsecurity-${NGINX_MODSECURITY_VERSION}/nginx/modsecurity -EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-nginx-modsecurity-configure +EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-nginx-modsecurity-configure \ + ${PATCHDIR}/extra-patch-ngx_http_modsecurity.c .endif .if ${PORT_OPTIONS:MNAXSI} @@ -1029,22 +1025,6 @@ GH_TAGNAME+= v${NGINX_SRCACHE_VERSION}:srcache CONFIGURE_ARGS+=--add-module=${WRKSRC_srcache} .endif -.if ${PORT_OPTIONS:MSTATSD} -NGINX_STATSD_VERSION= b756a12 -GH_ACCOUNT+= zebrafishlabs:statsd -GH_PROJECT+= nginx-statsd:statsd -GH_TAGNAME+= ${NGINX_STATSD_VERSION}:statsd -CONFIGURE_ARGS+=--add-module=${WRKSRC_statsd} -.endif - -.if ${PORT_OPTIONS:MUDPLOG} -NGINX_UDPLOG_VERSION= 1.0.0 -MASTER_SITES+= http://www.grid.net.ru/nginx/download/:udplog -DISTFILES+= nginx_udplog_module-${NGINX_UDPLOG_VERSION}.tar.gz:udplog -CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx_udplog_module-${NGINX_UDPLOG_VERSION} -EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ngx_http_udplog_module.c -.endif - .if ${PORT_OPTIONS:MXRID_HEADER} GIT_XRID_VERSION= 0daa3cc GH_ACCOUNT+= gabor:xrid @@ -1070,7 +1050,7 @@ CONFIGURE_ARGS+=--with-http_v2_module .if ${PORT_OPTIONS:MNJS} GH_ACCOUNT+= nginx:njs GH_PROJECT+= njs:njs -GH_TAGNAME+= f106743:njs +GH_TAGNAME+= 753ebe6:njs .if !empty(PORT_OPTIONS:MDSO) CONFIGURE_ARGS+=--add-dynamic-module=${WRKSRC_njs}/nginx .else @@ -1266,20 +1246,6 @@ post-patch: 's!%%PREFIX%%!${LOCALBASE}!g' \ ${WRKDIR}/nginx-sflow-module-${NGINX_SFLOW_VERSION}/ngx_http_sflow_config.h .endif -.if ${PORT_OPTIONS:MSTATSD} - @${REINPLACE_CMD} \ - 's!ngx_udp_connection_t!ngx_resolver_connection_t!g; \ - s!uc->connection!uc->udp!g; \ - s!e->udp_connection->connection!e->udp_connection->udp!g' \ - ${WRKSRC_statsd}/ngx_http_statsd.c -.endif -.if ${PORT_OPTIONS:MUDPLOG} - @${REINPLACE_CMD} \ - 's!ngx_udp_connection_t!ngx_resolver_connection_t!g; \ - s!uc->connection!uc->udp!g; \ - s!e->udp_connection->connection!e->udp_connection->udp!g' \ - ${WRKDIR}/nginx_udplog_module-${NGINX_UDPLOG_VERSION}/ngx_http_udplog_module.c -.endif .if ${PORT_OPTIONS:MICONV} @${REINPLACE_CMD} \ 's!%%PREFIX%%!${LOCALBASE}!g' \ diff --git a/www/nginx-devel/distinfo b/www/nginx-devel/distinfo index 58db783fc84d..3ba9011317a5 100644 --- a/www/nginx-devel/distinfo +++ b/www/nginx-devel/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1487637530 -SHA256 (nginx-1.11.10.tar.gz) = 778b3cabb07633f754cd9dee32fc8e22582bce22bfa407be76a806abd935533d -SIZE (nginx-1.11.10.tar.gz) = 967773 +TIMESTAMP = 1492276562 +SHA256 (nginx-1.12.0.tar.gz) = b4222e26fdb620a8d3c3a3a8b955e08b713672e1bc5198d1e4f462308a795b30 +SIZE (nginx-1.12.0.tar.gz) = 980831 SHA256 (ngx_http_auth_pam_module-1.2.tar.gz) = 5a85970ba61a99f55a26d2536a11d512b39bbd622f5737d25a9a8c10db81efa9 SIZE (ngx_http_auth_pam_module-1.2.tar.gz) = 5424 SHA256 (ngx_cache_purge-2.3.tar.gz) = 279e0d8a46d3b1521fd43b3f78bc1c08b263899142a7cc5058c1c0361a92c89c @@ -13,8 +13,6 @@ SHA256 (ngx_http_redis-0.3.8.tar.gz) = 95d0ed7be40da2efc88883d72e52e5e272d2c3446 SIZE (ngx_http_redis-0.3.8.tar.gz) = 12342 SHA256 (ngx_http_response-0.3.tar.gz) = 0835584029f053051c624adbe33a826ab0205c9d85a02af6019e6b57607e9045 SIZE (ngx_http_response-0.3.tar.gz) = 2244 -SHA256 (nginx_upstream_fair-20090923.tar.gz) = ec9ed7f856263e17faadee3dc7209932364ded4e546b829841c2454aa432450b -SIZE (nginx_upstream_fair-20090923.tar.gz) = 10024 SHA256 (08a395c66e42.tar.gz) = 53e440737ed1aff1f09fae150219a45f16add0c8d6e84546cb7d80f73ebffd90 SIZE (08a395c66e42.tar.gz) = 120603 SHA256 (modsecurity-2.9.1.tar.gz) = 958cc5a7a7430f93fac0fd6f8b9aa92fc1801efce0cda797d6029d44080a9b24 @@ -23,14 +21,12 @@ SHA256 (passenger-5.1.2.tar.gz) = 7fb03a54650ef5e508895c9e45bc2d8151f6c4811ea679 SIZE (passenger-5.1.2.tar.gz) = 5646103 SHA256 (ngx_slowfs_cache-1.10.tar.gz) = 1e81453942e5b0877de1f1f06c56ae82918ea9818255cb935bcb673c95a758a1 SIZE (ngx_slowfs_cache-1.10.tar.gz) = 11809 -SHA256 (nginx_udplog_module-1.0.0.tar.gz) = e0c0bfa524c3a675ad6c08b916d08e57ef45f9818cb8a0d848c2c83785c6e659 -SIZE (nginx_udplog_module-1.0.0.tar.gz) = 6284 SHA256 (giom-nginx_accept_language_module-2f69842_GH0.tar.gz) = 5534ca63cdfc2a7dc4e1cbf9c2d54d3ed3f0e6c86b4a95be48ec0a3f41cc1eb0 SIZE (giom-nginx_accept_language_module-2f69842_GH0.tar.gz) = 3393 SHA256 (atomx-nginx-http-auth-digest-cc61b4a_GH0.tar.gz) = e68b34e03516a4ab43006eb4c481d6bc5e813e0d40876359c606a26c5c68ccf6 SIZE (atomx-nginx-http-auth-digest-cc61b4a_GH0.tar.gz) = 16060 -SHA256 (stnoonan-spnego-http-auth-nginx-module-c85a38c_GH0.tar.gz) = b47b23a362aa338c377d6163d15abee6f33ff16bac5f86ee4d9543293fe8c4d1 -SIZE (stnoonan-spnego-http-auth-nginx-module-c85a38c_GH0.tar.gz) = 18120 +SHA256 (stnoonan-spnego-http-auth-nginx-module-0c6ff3f_GH0.tar.gz) = 3d3fed1e19a532cdd2a37726953f2b2d4e20891a44119ff6075a6b5891324d2d +SIZE (stnoonan-spnego-http-auth-nginx-module-0c6ff3f_GH0.tar.gz) = 18212 SHA256 (kvspb-nginx-auth-ldap-dbcef31_GH0.tar.gz) = 0ec4f099e50cc12a6319e37700e71540498d354831d1f09e113ee046ee0bb7b2 SIZE (kvspb-nginx-auth-ldap-dbcef31_GH0.tar.gz) = 17001 SHA256 (yaoweibin-nginx_ajp_module-bf6cd93_GH0.tar.gz) = 9e3f78ea73e2d606a95ee64fd3affa4c249f9b342e66b6b11b63061791f28316 @@ -69,16 +65,18 @@ SHA256 (yaoweibin-ngx_http_substitutions_filter_module-v0.6.4_GH0.tar.gz) = ed4d SIZE (yaoweibin-ngx_http_substitutions_filter_module-v0.6.4_GH0.tar.gz) = 92230 SHA256 (tarantool-nginx_upstream_module-1278ee5_GH0.tar.gz) = 34d51afcd464582e6011a5d3abe6829c5690ddb9b50c993dfdafb4c725a4803a SIZE (tarantool-nginx_upstream_module-1278ee5_GH0.tar.gz) = 48378 -SHA256 (vkholodkov-nginx-upload-module-aba1e3f34c_GH0.tar.gz) = 62a2c4388585aec463a1cee30bc84953593a93f341dc1df61b42b452594d2a05 -SIZE (vkholodkov-nginx-upload-module-aba1e3f34c_GH0.tar.gz) = 28296 +SHA256 (Austinb-nginx-upload-module-72ec037_GH0.tar.gz) = c6d4e38ad0712c898cc53721f492f8f73acf2753cc0a0769fa34d4d6ba4e8efd +SIZE (Austinb-nginx-upload-module-72ec037_GH0.tar.gz) = 28303 SHA256 (masterzen-nginx-upload-progress-module-v0.9.0_GH0.tar.gz) = 93e29b9b437a2e34713de54c2861ea51151624aca09f73f9f44d1caaff01a6b1 SIZE (masterzen-nginx-upload-progress-module-v0.9.0_GH0.tar.gz) = 16990 SHA256 (yaoweibin-nginx_upstream_check_module-10782ea_GH0.tar.gz) = 52e6acd8c0264a59c5c948271015a59acd3cbcf91377456b7c8dc6f9feecef4a SIZE (yaoweibin-nginx_upstream_check_module-10782ea_GH0.tar.gz) = 128281 +SHA256 (cryptofuture-nginx-upstream-fair-b5be36f_GH0.tar.gz) = e765afcaab6cd1601e914039a8d00ab18eb6fe01180c58e0e4e098bc5b4d8233 +SIZE (cryptofuture-nginx-upstream-fair-b5be36f_GH0.tar.gz) = 10174 SHA256 (wandenberg-nginx-video-thumbextractor-module-0.7.0_GH0.tar.gz) = 382bb41fa739f471fdab9fbabc5384d8ec7f25b5bb0c45c153f5cc01d428abe2 SIZE (wandenberg-nginx-video-thumbextractor-module-0.7.0_GH0.tar.gz) = 2709351 -SHA256 (evanmiller-mod_zip-ca0b345_GH0.tar.gz) = babab586ebde83d3cf128eabdc3a66f922db740a43c943ffd9cd8b055acf3a5b -SIZE (evanmiller-mod_zip-ca0b345_GH0.tar.gz) = 26035 +SHA256 (anthonyryan1-mod_zip-74ef235_GH0.tar.gz) = 0d780e6fef91814fbaa577c9f7cfb7b78f6898e50c34d63f3c5d101eb45afd44 +SIZE (anthonyryan1-mod_zip-74ef235_GH0.tar.gz) = 26125 SHA256 (openresty-drizzle-nginx-module-v0.1.9_GH0.tar.gz) = aafb79d87273eec023025333c34d6d0108026a1ce2e09b20a53e8e2d9bf65080 SIZE (openresty-drizzle-nginx-module-v0.1.9_GH0.tar.gz) = 59024 SHA256 (cubicdaiya-ngx_dynamic_upstream-v0.1.3_GH0.tar.gz) = bf60cf196c86193376d11f8c7a3826994b24a48bb36943bab8a25af6e776af3b @@ -93,8 +91,8 @@ SHA256 (mongodb-mongo-c-driver-v0.3.1_GH0.tar.gz) = 552c54aff81c4701ace4eb1ce20c SIZE (mongodb-mongo-c-driver-v0.3.1_GH0.tar.gz) = 53024 SHA256 (arut-nginx-let-module-v0.0.4_GH0.tar.gz) = cbf6fcddc00a7e30289134bdeace12565e000cc7d4efee2d2ebb8799d0b88270 SIZE (arut-nginx-let-module-v0.0.4_GH0.tar.gz) = 20534 -SHA256 (openresty-lua-nginx-module-v0.10.7_GH0.tar.gz) = c21c8937dcdd6fc2b6a955f929e3f4d1388610f47180e60126e6dcab06786f77 -SIZE (openresty-lua-nginx-module-v0.10.7_GH0.tar.gz) = 605171 +SHA256 (openresty-lua-nginx-module-v0.10.8_GH0.tar.gz) = d67449c71051b3cc2d6dd60df0ae0d21fca08aa19c9b30c5b95ee21ff38ef8dd +SIZE (openresty-lua-nginx-module-v0.10.8_GH0.tar.gz) = 606643 SHA256 (openresty-memc-nginx-module-v0.17_GH0.tar.gz) = 25cbe3ff4931283a681260607bc91ae4a922075345d5770b293c6cd7f1e3bdcc SIZE (openresty-memc-nginx-module-v0.17_GH0.tar.gz) = 36369 SHA256 (nbs-system-naxsi-0.54_GH0.tar.gz) = 9cc2c09405bc71f78ef26a8b6d70afcea3fccbe8125df70cb0cfc480133daba5 @@ -119,14 +117,12 @@ SHA256 (cubicdaiya-ngx_small_light-v0.8.0_GH0.tar.gz) = 8f513d6d3df32c3b05327d40 SIZE (cubicdaiya-ngx_small_light-v0.8.0_GH0.tar.gz) = 55918 SHA256 (openresty-srcache-nginx-module-v0.30_GH0.tar.gz) = e34b1ab5f5007661f73819f9c20fd6c2a46ed3e53364e9449b02ef2bd3628633 SIZE (openresty-srcache-nginx-module-v0.30_GH0.tar.gz) = 58777 -SHA256 (zebrafishlabs-nginx-statsd-b756a12_GH0.tar.gz) = 4c5886edb1fbeb0b9a83c879b4be4b15a620627a18978aef636da3feafb284fe -SIZE (zebrafishlabs-nginx-statsd-b756a12_GH0.tar.gz) = 6636 SHA256 (gabor-nginx-x-rid-header-0daa3cc_GH0.tar.gz) = de784142d867a35ecc5443fa347c2903af0935669cdf2eaa9274f5253aac2267 SIZE (gabor-nginx-x-rid-header-0daa3cc_GH0.tar.gz) = 2711 SHA256 (openresty-xss-nginx-module-v0.05_GH0.tar.gz) = 958bd8de773601d8d3138501cc4be0420f1c818a3987a70cc9c0023371e432cf SIZE (openresty-xss-nginx-module-v0.05_GH0.tar.gz) = 11477 -SHA256 (nginx-njs-f106743_GH0.tar.gz) = 8be028634cc88c2cc09a2f9fafa521bed955c09b0ac033317071a9e96eb79ad8 -SIZE (nginx-njs-f106743_GH0.tar.gz) = 186625 +SHA256 (nginx-njs-753ebe6_GH0.tar.gz) = 43fc7a307ee98b9c55283374b36f1f4576cbf529a4101176cb94ab73f3110f67 +SIZE (nginx-njs-753ebe6_GH0.tar.gz) = 191124 SHA256 (openresty-array-var-nginx-module-v0.05_GH0.tar.gz) = c949d4be6f3442c8e2937046448dc8d8def25c0e0fa6f4e805144cea45eabe80 SIZE (openresty-array-var-nginx-module-v0.05_GH0.tar.gz) = 11280 SHA256 (google-ngx_brotli-ada972b_GH0.tar.gz) = d3d0e22a2629cd017280e05bd3bf05aa7b5c820ebe8c79932ce161243911e776 diff --git a/www/nginx-devel/files/extra-patch-ngx_http_echo_request_info.c b/www/nginx-devel/files/extra-patch-ngx_http_echo_request_info.c new file mode 100644 index 000000000000..87b39d08a5db --- /dev/null +++ b/www/nginx-devel/files/extra-patch-ngx_http_echo_request_info.c @@ -0,0 +1,43 @@ +--- ../echo-nginx-module-46334b3/src/ngx_http_echo_request_info.c.orig 2017-04-15 10:03:29.616243000 -0400 ++++ ../echo-nginx-module-46334b3/src/ngx_http_echo_request_info.c 2017-04-15 10:07:41.329695000 -0400 +@@ -179,6 +179,9 @@ + ngx_int_t i, j; + ngx_buf_t *b, *first = NULL; + unsigned found; ++#if defined(nginx_version) && nginx_version >= 1011011 ++ ngx_chain_t *cl; ++#endif + ngx_connection_t *c; + ngx_http_request_t *mr; + ngx_http_connection_t *hc; +@@ -215,8 +218,15 @@ + + if (hc->nbusy) { + b = NULL; ++ ++#if defined(nginx_version) && nginx_version >= 1011011 ++ for (cl = hc->busy; cl; /* void */) { ++ b = cl->buf; ++ cl = cl->next; ++#else + for (i = 0; i < hc->nbusy; i++) { + b = hc->busy[i]; ++#endif + + if (first == NULL) { + if (mr->request_line.data >= b->pos +@@ -280,8 +290,14 @@ + } + + if (hc->nbusy) { ++#if defined(nginx_version) && nginx_version >= 1011011 ++ for (cl = hc->busy; cl; /* void */) { ++ b = cl->buf; ++ cl = cl->next; ++#else + for (i = 0; i < hc->nbusy; i++) { + b = hc->busy[i]; ++#endif + + if (!found) { + if (b != first) { diff --git a/www/nginx-devel/files/extra-patch-ngx_http_lua_common.h b/www/nginx-devel/files/extra-patch-ngx_http_lua_common.h new file mode 100644 index 000000000000..24d7960c2bb2 --- /dev/null +++ b/www/nginx-devel/files/extra-patch-ngx_http_lua_common.h @@ -0,0 +1,15 @@ +--- ../lua-nginx-module-0.10.8/src/ngx_http_lua_common.h.orig 2017-04-15 10:55:20.591680000 -0400 ++++ ../lua-nginx-module-0.10.8/src/ngx_http_lua_common.h 2017-04-15 10:55:50.449108000 -0400 +@@ -199,6 +199,12 @@ + of reqeusts */ + ngx_uint_t malloc_trim_req_count; + ++#if nginx_version >= 1011011 ++ /* the following 2 fields are only used by ngx.req.raw_headers() for now */ ++ ngx_buf_t **busy_buf_ptrs; ++ ngx_int_t busy_buf_ptr_count; ++#endif ++ + unsigned requires_header_filter:1; + unsigned requires_body_filter:1; + unsigned requires_capture_filter:1; diff --git a/www/nginx-devel/files/extra-patch-ngx_http_lua_headers.c b/www/nginx-devel/files/extra-patch-ngx_http_lua_headers.c new file mode 100644 index 000000000000..d21a6c159db5 --- /dev/null +++ b/www/nginx-devel/files/extra-patch-ngx_http_lua_headers.c @@ -0,0 +1,124 @@ +--- ../lua-nginx-module-0.10.8/src/ngx_http_lua_headers.c.orig 2017-04-15 10:57:48.875770000 -0400 ++++ ../lua-nginx-module-0.10.8/src/ngx_http_lua_headers.c 2017-04-15 11:02:00.492564000 -0400 +@@ -26,6 +26,9 @@ + static int ngx_http_lua_ngx_req_header_clear(lua_State *L); + static int ngx_http_lua_ngx_req_header_set(lua_State *L); + static int ngx_http_lua_ngx_resp_get_headers(lua_State *L); ++#if nginx_version >= 1011011 ++void ngx_http_lua_ngx_raw_header_cleanup(void *data); ++#endif + + + static int +@@ -77,6 +80,11 @@ + size_t size; + ngx_buf_t *b, *first = NULL; + ngx_int_t i, j; ++#if nginx_version >= 1011011 ++ ngx_buf_t **bb; ++ ngx_chain_t *cl; ++ ngx_http_lua_main_conf_t *lmcf; ++#endif + ngx_connection_t *c; + ngx_http_request_t *r, *mr; + ngx_http_connection_t *hc; +@@ -93,6 +101,10 @@ + return luaL_error(L, "no request object found"); + } + ++#if nginx_version >= 1011011 ++ lmcf = ngx_http_get_module_main_conf(r, ngx_http_lua_module); ++#endif ++ + ngx_http_lua_check_fake_request(L, r); + + mr = r->main; +@@ -109,8 +121,13 @@ + dd("hc->nbusy: %d", (int) hc->nbusy); + + if (hc->nbusy) { ++#if nginx_version >= 1011011 ++ dd("hc->busy: %p %p %p %p", hc->busy->buf->start, hc->busy->buf->pos, ++ hc->busy->buf->last, hc->busy->buf->end); ++#else + dd("hc->busy: %p %p %p %p", hc->busy[0]->start, hc->busy[0]->pos, + hc->busy[0]->last, hc->busy[0]->end); ++#endif + } + + dd("request line: %p %p", mr->request_line.data, +@@ -146,9 +163,37 @@ + dd("size: %d", (int) size); + + if (hc->nbusy) { ++#if nginx_version >= 1011011 ++ if (hc->nbusy > lmcf->busy_buf_ptr_count) { ++ if (lmcf->busy_buf_ptrs) { ++ ngx_free(lmcf->busy_buf_ptrs); ++ } ++ ++ lmcf->busy_buf_ptrs = ngx_alloc(hc->nbusy * sizeof(ngx_buf_t *), ++ r->connection->log); ++ ++ if (lmcf->busy_buf_ptrs == NULL) { ++ return luaL_error(L, "no memory"); ++ } ++ ++ lmcf->busy_buf_ptr_count = hc->nbusy; ++ } ++ ++ bb = lmcf->busy_buf_ptrs; ++ for (cl = hc->busy; cl; cl = cl->next) { ++ *bb++ = cl->buf; ++ } ++#endif + b = NULL; ++ ++#if nginx_version >= 1011011 ++ bb = lmcf->busy_buf_ptrs; ++ for (i = hc->nbusy; i > 0; i--) { ++ b = bb[i - 1]; ++#else + for (i = 0; i < hc->nbusy; i++) { + b = hc->busy[i]; ++#endif + + dd("busy buf: %d: [%.*s]", (int) i, (int) (b->pos - b->start), + b->start); +@@ -223,8 +268,15 @@ + } + + if (hc->nbusy) { ++ ++#if nginx_version >= 1011011 ++ bb = lmcf->busy_buf_ptrs; ++ for (i = hc->nbusy - 1; i >= 0; i--) { ++ b = bb[i]; ++#else + for (i = 0; i < hc->nbusy; i++) { + b = hc->busy[i]; ++#endif + + if (!found) { + if (b != first) { +@@ -1431,4 +1483,20 @@ + #endif /* NGX_LUA_NO_FFI_API */ + + ++#if nginx_version >= 1011011 ++void ++ngx_http_lua_ngx_raw_header_cleanup(void *data) ++{ ++ ngx_http_lua_main_conf_t *lmcf; ++ ++ lmcf = (ngx_http_lua_main_conf_t *) data; ++ ++ if (lmcf->busy_buf_ptrs) { ++ ngx_free(lmcf->busy_buf_ptrs); ++ lmcf->busy_buf_ptrs = NULL; ++ } ++} ++#endif ++ ++ + /* vi:set ft=c ts=4 sw=4 et fdm=marker: */ diff --git a/www/nginx-devel/files/extra-patch-ngx_http_lua_headers.h b/www/nginx-devel/files/extra-patch-ngx_http_lua_headers.h new file mode 100644 index 000000000000..6b71b075ec55 --- /dev/null +++ b/www/nginx-devel/files/extra-patch-ngx_http_lua_headers.h @@ -0,0 +1,12 @@ +--- ../lua-nginx-module-0.10.8/src/ngx_http_lua_headers.h.orig 2017-04-15 11:05:40.649209000 -0400 ++++ ../lua-nginx-module-0.10.8/src/ngx_http_lua_headers.h 2017-04-15 11:06:01.658936000 -0400 +@@ -15,6 +15,9 @@ + void ngx_http_lua_inject_resp_header_api(lua_State *L); + void ngx_http_lua_inject_req_header_api(lua_State *L); + void ngx_http_lua_create_headers_metatable(ngx_log_t *log, lua_State *L); ++#if nginx_version >= 1011011 ++void ngx_http_lua_ngx_raw_header_cleanup(void *data); ++#endif + + + #endif /* _NGX_HTTP_LUA_HEADERS_H_INCLUDED_ */ diff --git a/www/nginx-devel/files/extra-patch-ngx_http_lua_module.c b/www/nginx-devel/files/extra-patch-ngx_http_lua_module.c new file mode 100644 index 000000000000..ca35511d24e3 --- /dev/null +++ b/www/nginx-devel/files/extra-patch-ngx_http_lua_module.c @@ -0,0 +1,36 @@ +--- ../lua-nginx-module-0.10.8/src/ngx_http_lua_module.c.orig 2017-04-15 11:07:10.366543000 -0400 ++++ ../lua-nginx-module-0.10.8/src/ngx_http_lua_module.c 2017-04-15 11:08:25.640520000 -0400 +@@ -28,6 +28,7 @@ + #include "ngx_http_lua_ssl_certby.h" + #include "ngx_http_lua_ssl_session_storeby.h" + #include "ngx_http_lua_ssl_session_fetchby.h" ++#include "ngx_http_lua_headers.h" + + + static void *ngx_http_lua_create_main_conf(ngx_conf_t *cf); +@@ -624,7 +625,7 @@ + volatile ngx_cycle_t *saved_cycle; + ngx_http_core_main_conf_t *cmcf; + ngx_http_lua_main_conf_t *lmcf; +-#ifndef NGX_LUA_NO_FFI_API ++#if !defined(NGX_LUA_NO_FFI_API) || nginx_version >= 1011011 + ngx_pool_cleanup_t *cln; + #endif + +@@ -716,6 +717,16 @@ + cln->handler = ngx_http_lua_sema_mm_cleanup; + #endif + ++#if nginx_version >= 1011011 ++ cln = ngx_pool_cleanup_add(cf->pool, 0); ++ if (cln == NULL) { ++ return NGX_ERROR; ++ } ++ ++ cln->data = lmcf; ++ cln->handler = ngx_http_lua_ngx_raw_header_cleanup; ++#endif ++ + if (lmcf->lua == NULL) { + dd("initializing lua vm"); + diff --git a/www/nginx-devel/files/extra-patch-ngx_http_modsecurity.c b/www/nginx-devel/files/extra-patch-ngx_http_modsecurity.c new file mode 100644 index 000000000000..cc7849710eb8 --- /dev/null +++ b/www/nginx-devel/files/extra-patch-ngx_http_modsecurity.c @@ -0,0 +1,18 @@ +--- ../modsecurity-2.9.1/nginx/modsecurity/ngx_http_modsecurity.c.orig 2017-04-15 10:45:12.886736000 -0400 ++++ ../modsecurity-2.9.1/nginx/modsecurity/ngx_http_modsecurity.c 2017-04-15 10:45:59.921529000 -0400 +@@ -528,9 +528,15 @@ + + hc = r->http_connection; + ++#if defined(nginx_version) && nginx_version >= 1011011 ++ if (hc->free && size == cscf->large_client_header_buffers.size) { ++ ++ buf = hc->free->buf; ++#else + if (hc->nfree && size == cscf->large_client_header_buffers.size) { + + buf = hc->free[--hc->nfree]; ++#endif + + ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, + "ModSecurity: use http free large header buffer: %p %uz", diff --git a/www/nginx-devel/files/extra-patch-ngx_http_udplog_module.c b/www/nginx-devel/files/extra-patch-ngx_http_udplog_module.c deleted file mode 100644 index a97325abfa31..000000000000 --- a/www/nginx-devel/files/extra-patch-ngx_http_udplog_module.c +++ /dev/null @@ -1,431 +0,0 @@ ---- ../nginx_udplog_module-1.0.0/ngx_http_udplog_module.c.orig 2010-01-05 20:20:35.000000000 +0100 -+++ ../nginx_udplog_module-1.0.0/ngx_http_udplog_module.c 2011-12-02 18:31:18.000000000 +0100 -@@ -1,4 +1,3 @@ -- - /* - * Copyright (C) 2010 Valery Kholodkov - * -@@ -45,6 +44,12 @@ - } ngx_http_log_fmt_t; - - typedef struct { -+ ngx_str_t value; -+ ngx_array_t *lengths; -+ ngx_array_t *values; -+} ngx_http_log_tag_template_t; -+ -+typedef struct { - ngx_array_t formats; /* array of ngx_http_log_fmt_t */ - ngx_uint_t combined_used; /* unsigned combined_used:1 */ - } ngx_http_log_main_conf_t; -@@ -64,8 +69,7 @@ - typedef struct { - ngx_udp_endpoint_t *endpoint; - ngx_http_log_fmt_t *format; -- ngx_uint_t facility; -- ngx_uint_t severity; -+ ngx_uint_t bare:1; - } ngx_http_udplog_t; - - typedef struct { -@@ -73,8 +77,11 @@ - } ngx_http_udplog_main_conf_t; - - typedef struct { -- ngx_array_t *logs; /* array of ngx_http_udplog_t */ -- unsigned off; -+ ngx_array_t *logs; /* array of ngx_http_udplog_t */ -+ unsigned off; -+ ngx_http_log_tag_template_t *tag; -+ ngx_uint_t facility; -+ ngx_uint_t severity; - } ngx_http_udplog_conf_t; - - ngx_int_t ngx_udp_connect(ngx_udp_connection_t *uc); -@@ -88,6 +95,8 @@ - void *child); - - static char *ngx_http_udplog_set_log(ngx_conf_t *cf, ngx_command_t *cmd, void *conf); -+static char *ngx_http_udplog_set_priority(ngx_conf_t *cf, ngx_command_t *cmd, void *conf); -+static char *ngx_http_udplog_set_tag(ngx_conf_t *cf, ngx_command_t *cmd, void *conf); - - static ngx_int_t ngx_http_udplog_init(ngx_conf_t *cf); - -@@ -96,12 +105,26 @@ - - { ngx_string("access_udplog"), - NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF -- |NGX_HTTP_LMT_CONF|NGX_CONF_TAKE123, -+ |NGX_HTTP_LMT_CONF|NGX_CONF_TAKE1234, - ngx_http_udplog_set_log, - NGX_HTTP_LOC_CONF_OFFSET, - 0, - NULL }, - -+ { ngx_string("udplog_priority"), -+ NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE12, -+ ngx_http_udplog_set_priority, -+ NGX_HTTP_LOC_CONF_OFFSET, -+ 0, -+ NULL }, -+ -+ { ngx_string("udplog_tag"), -+ NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, -+ ngx_http_udplog_set_tag, -+ NGX_HTTP_LOC_CONF_OFFSET, -+ offsetof(ngx_http_udplog_conf_t, tag), -+ NULL }, -+ - ngx_null_command - }; - -@@ -166,7 +189,7 @@ - { ngx_null_string, 0 } - }; - --static ngx_udplog_severity_t ngx_udplog_severity[] = { -+static ngx_udplog_severity_t ngx_udplog_severities[] = { - { ngx_string("emerg"), 0 }, - { ngx_string("alert"), 1 }, - { ngx_string("crit"), 2 }, -@@ -190,6 +213,7 @@ - u_char *line, *p; - size_t len; - ngx_uint_t i, l, pri; -+ ngx_str_t tag; - ngx_http_udplog_t *log; - ngx_http_log_op_t *op; - ngx_http_udplog_conf_t *ulcf; -@@ -205,12 +229,31 @@ - return NGX_OK; - } - -+ if(ulcf->tag != NULL) -+ { -+ if(ulcf->tag->lengths == NULL) { -+ tag = ulcf->tag->value; -+ } -+ else{ -+ if (ngx_http_script_run(r, &tag, ulcf->tag->lengths->elts, 0, ulcf->tag->values->elts) -+ == NULL) -+ { -+ return NGX_ERROR; -+ } -+ } -+ } -+ else { -+ tag.data = (u_char*)"nginx"; -+ tag.len = sizeof("nginx") - 1; -+ } -+ - time = ngx_time(); - ngx_gmtime(time, &tm); - - log = ulcf->logs->elts; -+ pri = ulcf->facility * 8 + ulcf->severity; -+ - for (l = 0; l < ulcf->logs->nelts; l++) { -- pri = log[l].facility * 8 + log[l].severity; - - if(pri > 255) { - pri = NGX_UDPLOG_FACILITY_LOCAL7 * 8 + NGX_UDPLOG_SEVERITY_INFO; -@@ -231,7 +274,8 @@ - } - } - -- len += sizeof("<255>") - 1 + sizeof("Jan 31 00:00:00") - 1 + 1 + ngx_cycle->hostname.len + 1; -+ len += sizeof("<255>") - 1 + sizeof("Jan 31 00:00:00") - 1 + 1 + ngx_cycle->hostname.len + 1 -+ + tag.len + 2; - - #if defined nginx_version && nginx_version >= 7003 - line = ngx_pnalloc(r->pool, len); -@@ -245,9 +289,12 @@ - /* - * BSD syslog message header (see RFC 3164) - */ -- p = ngx_sprintf(line, "<%ui>%s %2d %02d:%02d:%02d %V ", pri, months[tm.ngx_tm_mon - 1], tm.ngx_tm_mday, -- tm.ngx_tm_hour, tm.ngx_tm_min, tm.ngx_tm_sec, &ngx_cycle->hostname); -- -+ if(!log[l].bare){ -+ p = ngx_sprintf(line, "<%ui>%s %2d %02d:%02d:%02d %V %V: ", pri, months[tm.ngx_tm_mon - 1], tm.ngx_tm_mday, -+ tm.ngx_tm_hour, tm.ngx_tm_min, tm.ngx_tm_sec, &ngx_cycle->hostname, &tag); -+ }else{ -+ p = line; -+ } - for (i = 0; i < log[l].format->ops->nelts; i++) { - p = op[i].run(r, p, &op[i]); - } -@@ -280,10 +327,15 @@ - uc->sockaddr = endpoint->peer_addr.sockaddr; - uc->socklen = endpoint->peer_addr.socklen; - uc->server = endpoint->peer_addr.name; --#if defined nginx_version && nginx_version >= 7054 -+#if defined nginx_version && ( nginx_version >= 7054 && nginx_version < 8032 ) - uc->log = &cf->cycle->new_log; - #else - uc->log = cf->cycle->new_log; -+#if defined nginx_version && nginx_version >= 8032 -+ uc->log.handler = NULL; -+ uc->log.data = NULL; -+ uc->log.action = "logging"; -+#endif - #endif - - return NGX_OK; -@@ -320,6 +372,11 @@ - - if (uc->connection == NULL) { - if(ngx_udp_connect(uc) != NGX_OK) { -+ if(uc->connection != NULL) { -+ ngx_free_connection(uc->connection); -+ uc->connection = NULL; -+ } -+ - return NGX_ERROR; - } - -@@ -335,7 +392,11 @@ - } - - if ((size_t) n != (size_t) len) { -+#if defined nginx_version && nginx_version >= 8032 -+ ngx_log_error(NGX_LOG_CRIT, &uc->log, 0, "send() incomplete"); -+#else - ngx_log_error(NGX_LOG_CRIT, uc->log, 0, "send() incomplete"); -+#endif - return NGX_ERROR; - } - -@@ -364,6 +425,9 @@ - if (conf == NULL) { - return NGX_CONF_ERROR; - } -+ conf->off = 1; -+ conf->facility = NGX_CONF_UNSET_UINT; -+ conf->severity = NGX_CONF_UNSET_UINT; - - return conf; - } -@@ -374,37 +438,21 @@ - ngx_http_udplog_conf_t *prev = parent; - ngx_http_udplog_conf_t *conf = child; - -- ngx_http_udplog_t *log; -- ngx_http_log_fmt_t *fmt; -- ngx_http_log_main_conf_t *lmcf; -- -- if(conf->logs || conf->off) { -- return NGX_CONF_OK; -+ if(conf->tag == NULL) { -+ conf->tag = prev->tag; - } - -- conf->logs = prev->logs; -- conf->off = prev->off; -+ ngx_conf_merge_uint_value(conf->facility, -+ prev->facility, NGX_UDPLOG_FACILITY_LOCAL7); -+ ngx_conf_merge_uint_value(conf->severity, -+ prev->severity, NGX_UDPLOG_SEVERITY_INFO); - - if(conf->logs || conf->off) { - return NGX_CONF_OK; - } - -- conf->logs = ngx_array_create(cf->pool, 2, sizeof(ngx_http_udplog_t)); -- if(conf->logs == NULL) { -- return NGX_CONF_ERROR; -- } -- -- log = ngx_array_push(conf->logs); -- if(log == NULL) { -- return NGX_CONF_ERROR; -- } -- -- lmcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_log_module); -- fmt = lmcf->formats.elts; -- -- /* the default "combined" format */ -- log->format = &fmt[0]; -- lmcf->combined_used = 1; -+ conf->logs = prev->logs; -+ conf->off = prev->off; - - return NGX_CONF_OK; - } -@@ -434,12 +482,6 @@ - return endpoint; - } - --static ngx_int_t --ngx_http_udplog_set_facility_and_severity(ngx_http_udplog_t *log, ngx_str_t *value) --{ -- return NGX_OK; --} -- - static char * - ngx_http_udplog_set_log(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) - { -@@ -458,6 +500,7 @@ - ulcf->off = 1; - return NGX_CONF_OK; - } -+ ulcf->off = 0; - - if (ulcf->logs == NULL) { - ulcf->logs = ngx_array_create(cf->pool, 2, sizeof(ngx_http_udplog_t)); -@@ -483,10 +526,11 @@ - - ngx_memzero(&u, sizeof(ngx_url_t)); - -- u.host = value[1]; -- u.port = 514; -+ u.url = value[1]; -+ u.default_port = 514; -+ u.no_resolve = 0; - -- if(ngx_inet_resolve_host(cf->pool, &u) != NGX_OK) { -+ if(ngx_parse_url(cf->pool, &u) != NGX_OK) { - ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "%V: %s", &u.host, u.err); - return NGX_CONF_ERROR; - } -@@ -496,7 +540,7 @@ - if(log->endpoint == NULL) { - return NGX_CONF_ERROR; - } -- -+ log->bare = 0; - if (cf->args->nelts >= 3) { - name = value[2]; - -@@ -508,14 +552,18 @@ - name.data = (u_char *) "combined"; - lmcf->combined_used = 1; - } -- -+ if (cf->args->nelts >= 4) { -+ if (ngx_strcmp(value[3].data, "bare") == 0) { -+ log->bare = 1; -+ } -+ } - fmt = lmcf->formats.elts; - for (i = 0; i < lmcf->formats.nelts; i++) { - if (fmt[i].name.len == name.len - && ngx_strcasecmp(fmt[i].name.data, name.data) == 0) - { - log->format = &fmt[i]; -- goto facility; -+ goto done; - } - } - -@@ -523,12 +571,105 @@ - "unknown log format \"%V\"", &name); - return NGX_CONF_ERROR; - --facility: -- log->facility = NGX_UDPLOG_FACILITY_LOCAL7; -- log->severity = NGX_UDPLOG_SEVERITY_INFO; -+done: -+ -+ return NGX_CONF_OK; -+} -+ -+ -+static char * -+ngx_http_udplog_set_priority(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) -+{ -+ ngx_http_udplog_conf_t *ulcf = conf; -+ ngx_str_t *value; -+ ngx_udplog_facility_t *f; -+ ngx_udplog_severity_t *s; -+ -+ value = cf->args->elts; -+ -+ f = ngx_udplog_facilities; -+ -+ while(f->name.data != NULL) { -+ if(ngx_strncmp(f->name.data, value[1].data, f->name.len) == 0) -+ break; -+ -+ f++; -+ } -+ -+ if(f->name.data != NULL) { -+ ulcf->facility = f->number; -+ } -+ else { -+ ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, -+ "unknown facility \"%V\"", &value[1]); -+ return NGX_CONF_ERROR; -+ } -+ -+ if (cf->args->nelts == 3) { -+ s = ngx_udplog_severities; -+ -+ while(s->name.data != NULL) { -+ if(ngx_strncmp(s->name.data, value[2].data, s->name.len) == 0) -+ break; -+ -+ s++; -+ } -+ -+ if(s->name.data != NULL) { -+ ulcf->severity = s->number; -+ } -+ else { -+ ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, -+ "unknown severity \"%V\"", &value[2]); -+ return NGX_CONF_ERROR; -+ } -+ } -+ -+ return NGX_CONF_OK; -+} -+ -+static char * -+ngx_http_udplog_set_tag(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) -+{ -+ ngx_int_t n; -+ ngx_str_t *value; -+ ngx_http_script_compile_t sc; -+ ngx_http_log_tag_template_t **field, *h; -+ -+ field = (ngx_http_log_tag_template_t**) (((u_char*)conf) + cmd->offset); -+ -+ value = cf->args->elts; -+ -+ if (*field == NULL) { -+ *field = ngx_palloc(cf->pool, sizeof(ngx_http_log_tag_template_t)); -+ if (*field == NULL) { -+ return NGX_CONF_ERROR; -+ } -+ } -+ -+ h = *field; -+ -+ h->value = value[1]; -+ h->lengths = NULL; -+ h->values = NULL; -+ -+ /* -+ * Compile field name -+ */ -+ n = ngx_http_script_variables_count(&value[1]); -+ -+ if (n > 0) { -+ ngx_memzero(&sc, sizeof(ngx_http_script_compile_t)); -+ -+ sc.cf = cf; -+ sc.source = &value[1]; -+ sc.lengths = &h->lengths; -+ sc.values = &h->values; -+ sc.variables = n; -+ sc.complete_lengths = 1; -+ sc.complete_values = 1; - -- if(cf->args->nelts == 4) { -- if(ngx_http_udplog_set_facility_and_severity(log, &value[3]) != NGX_OK) { -+ if (ngx_http_script_compile(&sc) != NGX_OK) { - return NGX_CONF_ERROR; - } - } diff --git a/www/nginx-devel/files/extra-patch-spnego-http-auth-nginx-module-config b/www/nginx-devel/files/extra-patch-spnego-http-auth-nginx-module-config index 9ac1b629b398..5f8d7523c16e 100644 --- a/www/nginx-devel/files/extra-patch-spnego-http-auth-nginx-module-config +++ b/www/nginx-devel/files/extra-patch-spnego-http-auth-nginx-module-config @@ -1,8 +1,9 @@ ---- ../spnego-http-auth-nginx-module-c85a38c/config.orig 2015-06-13 20:49:15.590751000 +0300 -+++ ../spnego-http-auth-nginx-module-c85a38c/config 2015-06-13 20:49:31.024936000 +0300 -@@ -1,4 +1,4 @@ +--- ../spnego-http-auth-nginx-module-0c6ff3f/config.orig 2017-04-15 13:07:01.159506000 -0400 ++++ ../spnego-http-auth-nginx-module-0c6ff3f/config 2017-04-15 13:07:36.283398000 -0400 +@@ -1,5 +1,5 @@ ngx_addon_name=ngx_http_auth_spnego_module - HTTP_MODULES="$HTTP_MODULES ngx_http_auth_spnego_module" - NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_auth_spnego_module.c" --CORE_LIBS="$CORE_LIBS -lgssapi_krb5 -lkrb5 -lcom_err" -+CORE_LIBS="$CORE_LIBS %%GSSAPILIBS%% -lcom_err" +-ngx_feature_libs="-lgssapi_krb5 -lkrb5 -lcom_err" ++ngx_feature_libs="%%GSSAPILIBS%% -lcom_err" + + if uname -o | grep -q FreeBSD; then + ngx_feature_libs="$ngx_feature_libs -lgssapi" diff --git a/www/p5-Template-Toolkit/Makefile b/www/p5-Template-Toolkit/Makefile index bac4abeab6a4..14aa3ecc52ee 100644 --- a/www/p5-Template-Toolkit/Makefile +++ b/www/p5-Template-Toolkit/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= Template-Toolkit -PORTVERSION= 2.26 -PORTREVISION= 1 +PORTVERSION= 2.27 CATEGORIES= www textproc perl5 MASTER_SITES= CPAN \ http://www.template-toolkit.org/download/ @@ -21,10 +20,10 @@ TEST_DEPENDS= p5-Image-Size>=0:graphics/p5-Image-Size \ p5-Pod-POM>=0:textproc/p5-Pod-POM OPTIONS_DEFINE= DATE_CALC IMAGE_INFO IMAGE_SIZE POD_POM -DATE_CALC_DESC= With Date::Calc Plugin -IMAGE_INFO_DESC= With Image::Info Plugin -IMAGE_SIZE_DESC= With Image::Size Plugin -POD_POM_DESC= With Pod::POM Plugin +DATE_CALC_DESC= Include Date::Calc Plugin +IMAGE_INFO_DESC=Include Image::Info Plugin +IMAGE_SIZE_DESC=Include Image::Size Plugin +POD_POM_DESC= Include Pod::POM Plugin USES= perl5 USE_PERL5= configure diff --git a/www/p5-Template-Toolkit/distinfo b/www/p5-Template-Toolkit/distinfo index 71c246106119..2a251ba8636e 100644 --- a/www/p5-Template-Toolkit/distinfo +++ b/www/p5-Template-Toolkit/distinfo @@ -1,2 +1,3 @@ -SHA256 (Template-Toolkit-2.26.tar.gz) = e7e1cf36026f1ef96d8233e18a3fb39e1eafe9109edc639ecf25b20651cd76be -SIZE (Template-Toolkit-2.26.tar.gz) = 503055 +TIMESTAMP = 1492292523 +SHA256 (Template-Toolkit-2.27.tar.gz) = 1311a403264d0134c585af0309ff2a9d5074b8ece23ece5660d31ec96bf2c6dc +SIZE (Template-Toolkit-2.27.tar.gz) = 511172 diff --git a/www/p5-Template-Toolkit/pkg-descr b/www/p5-Template-Toolkit/pkg-descr index a52fce622ef9..f26b84eab939 100644 --- a/www/p5-Template-Toolkit/pkg-descr +++ b/www/p5-Template-Toolkit/pkg-descr @@ -1,4 +1,12 @@ -Extensive Toolkit for template processing. +The Template Toolkit is a fast, flexible and highly extensible template +processing system. It is free (in both senses: beer and speech) open source +software and runs on virtually every modern operating system known to man. It +is written in the Perl programming language with certain key elements coded in +C for maximum speed. However you don't need to know any Perl (or C) to be able +to use it. + +It is ideally suited, but not limited to, the creation of static and dynamic +web content and incorporates various modules and tools to simplify this +process. It is mature, robust, reliable and well documented. -WWW: http://search.cpan.org/dist/Template-Toolkit/ WWW: http://www.template-toolkit.org/ diff --git a/www/p5-Template-Toolkit/pkg-plist b/www/p5-Template-Toolkit/pkg-plist index 1b126b4a120b..f48c0f0f7d23 100644 --- a/www/p5-Template-Toolkit/pkg-plist +++ b/www/p5-Template-Toolkit/pkg-plist @@ -56,7 +56,7 @@ bin/ttree %%SITE_ARCH%%/Template/Stash/Context.pm %%SITE_ARCH%%/Template/Stash/XS.pm %%SITE_ARCH%%/Template/Test.pm -%%SITE_ARCH%%/Template/Toolkit.pod +%%SITE_ARCH%%/Template/Toolkit.pm %%SITE_ARCH%%/Template/Tools.pod %%SITE_ARCH%%/Template/Tools/tpage.pod %%SITE_ARCH%%/Template/Tools/ttree.pod diff --git a/www/rtv/Makefile b/www/rtv/Makefile index 29bad30b8ea9..227af68f8abd 100644 --- a/www/rtv/Makefile +++ b/www/rtv/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= rtv -PORTVERSION= 1.15.0 +PORTVERSION= 1.15.1 DISTVERSIONPREFIX= v CATEGORIES= www @@ -15,8 +15,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six \ ${PYTHON_PKGNAMEPREFIX}kitchen>=1.2.4:devel/py-kitchen \ ${PYTHON_PKGNAMEPREFIX}requests>=2.11.1:www/py-requests \ ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.5.1:www/py-beautifulsoup \ - ${PYTHON_PKGNAMEPREFIX}decorator>=4.0.10:devel/py-decorator \ - ${PYTHON_PKGNAMEPREFIX}mailcap_fix>=0.1.3:devel/py-mailcap-fix + ${PYTHON_PKGNAMEPREFIX}decorator>=4.0.10:devel/py-decorator USE_GITHUB= yes GH_ACCOUNT= michael-lazar @@ -25,4 +24,10 @@ NO_ARCH= yes USES= python USE_PYTHON= distutils autoplist -.include +.include + +.if ${PYTHON_REL} < 3600 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mailcap_fix>=0.1.3:devel/py-mailcap-fix +.endif + +.include diff --git a/www/rtv/distinfo b/www/rtv/distinfo index c081dbd3e8cd..2c1e10745f75 100644 --- a/www/rtv/distinfo +++ b/www/rtv/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1491007947 -SHA256 (michael-lazar-rtv-v1.15.0_GH0.tar.gz) = 795ac6b253445a1a76b246432393e6e5f12babba0360ed7caac33fca57ced891 -SIZE (michael-lazar-rtv-v1.15.0_GH0.tar.gz) = 7388732 +TIMESTAMP = 1491835907 +SHA256 (michael-lazar-rtv-v1.15.1_GH0.tar.gz) = 22d824c546692833c58f95cfbf131615733af43c1e0ac2bfd7021cdbe4817818 +SIZE (michael-lazar-rtv-v1.15.1_GH0.tar.gz) = 7388912 diff --git a/www/rtv/files/patch-setup.py b/www/rtv/files/patch-setup.py index c36f5612ff5f..675031f336d7 100644 --- a/www/rtv/files/patch-setup.py +++ b/www/rtv/files/patch-setup.py @@ -1,11 +1,11 @@ ---- setup.py.orig 2017-03-31 04:04:10 UTC +--- setup.py.orig 2017-04-10 03:35:24 UTC +++ setup.py -@@ -22,7 +22,7 @@ setuptools.setup( +@@ -62,7 +62,7 @@ setuptools.setup( 'rtv': ['templates/*'], - 'rtv.packages.praw': ['praw.ini'], - }, + 'rtv.packages.praw': ['praw.ini'] + }, - data_files=[("share/man/man1", ["rtv.1"])], + data_files=[("man/man1", ["rtv.1"])], - install_requires=[ - 'beautifulsoup4', - 'decorator', + install_requires=install_requires, + tests_require=tests_require, + extras_require=extras_require, diff --git a/x11-toolkits/fox17/Makefile b/x11-toolkits/fox17/Makefile index f0d042370eea..e3ac6ab06a6b 100644 --- a/x11-toolkits/fox17/Makefile +++ b/x11-toolkits/fox17/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= fox -PORTVERSION= 1.7.58 +PORTVERSION= 1.7.59 CATEGORIES= x11-toolkits MASTER_SITES= http://ftp.fox-toolkit.org/pub/ \ ftp://ftp.fox-toolkit.org/pub/ diff --git a/x11-toolkits/fox17/distinfo b/x11-toolkits/fox17/distinfo index faeb6795a331..ce477f90b83b 100644 --- a/x11-toolkits/fox17/distinfo +++ b/x11-toolkits/fox17/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1491504345 -SHA256 (fox-1.7.58.tar.gz) = 11415e7d829715d03c33eabdbcd01d6c28c93e45e58065af25077b32ff550ac5 -SIZE (fox-1.7.58.tar.gz) = 5422580 +TIMESTAMP = 1492259274 +SHA256 (fox-1.7.59.tar.gz) = edc0c96c92f6e1108a03cfd3f6533bfa889e427dbad46a65938a230f63e2f874 +SIZE (fox-1.7.59.tar.gz) = 5438384 diff --git a/x11-toolkits/fox17/pkg-plist b/x11-toolkits/fox17/pkg-plist index aae2ca5ac479..5d2674eac8c9 100644 --- a/x11-toolkits/fox17/pkg-plist +++ b/x11-toolkits/fox17/pkg-plist @@ -357,11 +357,11 @@ include/fox-%%MAJORVER%%/xincs.h lib/libCHART-%%MAJORVER%%.a lib/libCHART-%%MAJORVER%%.so lib/libCHART-%%MAJORVER%%.so.0 -lib/libCHART-%%MAJORVER%%.so.0.0.58 +lib/libCHART-%%MAJORVER%%.so.0.0.59 lib/libFOX-%%MAJORVER%%.a lib/libFOX-%%MAJORVER%%.so lib/libFOX-%%MAJORVER%%.so.0 -lib/libFOX-%%MAJORVER%%.so.0.0.58 +lib/libFOX-%%MAJORVER%%.so.0.0.59 libdata/pkgconfig/fox17.pc man/man1/ControlPanel-17.1.gz %%PORTEXAMPLES%%man/man1/PathFinder-17.1.gz