diff --git a/archivers/grzip/Makefile b/archivers/grzip/Makefile index f68fcf47fb3..4e114d0fd12 100644 --- a/archivers/grzip/Makefile +++ b/archivers/grzip/Makefile @@ -5,9 +5,10 @@ PORTNAME= grzip PORTVERSION= 0.3.0 PORTREVISION= 2 CATEGORIES= archivers -MASTER_SITES= ftp://ftp.ac-grenoble.fr/ge/compression/ +MASTER_SITES= ftp://ftp.ac-grenoble.fr/ge/compression/ \ + http://BSDforge.com/projects/source/archivers/grzip/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= portmaster@BSDforge.com COMMENT= Efficient file compressor LICENSE= LGPL21 diff --git a/archivers/grzip/pkg-descr b/archivers/grzip/pkg-descr index b9480811dd2..fb5cfe92ae4 100644 --- a/archivers/grzip/pkg-descr +++ b/archivers/grzip/pkg-descr @@ -6,4 +6,4 @@ simplicity and effectiveness. This implementation has a compression rate of 2.234 bps on the Calgary Corpus (14 files) without preprocessing filters. -WWW: http://magicssoft.ru/?folder=projects&page=GRZipII +WWW: http://BSDforge.com/projects/archivers/grzip diff --git a/audio/rosegarden/Makefile b/audio/rosegarden/Makefile index 89dea84fd15..3264cb42437 100644 --- a/audio/rosegarden/Makefile +++ b/audio/rosegarden/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= rosegarden -PORTVERSION= 15.10.2 +PORTVERSION= 15.12.1 CATEGORIES= audio MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:R} @@ -22,24 +22,29 @@ LIB_DEPENDS= libasound.so:${PORTSDIR}/audio/alsa-lib \ RUN_DEPENDS= dssi_osc_update:${PORTSDIR}/audio/dssi \ lilypond:${PORTSDIR}/print/lilypond -USES= compiler:c++0x desktop-file-utils gmake pkgconfig \ - shared-mime-info tar:bzip2 -USE_QT4= gui network xml \ - linguisttools_build moc_build rcc_build uic_build -QT_NONSTANDARD= yes -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-qtdir=${QT_PREFIX} \ - --with-qtlibdir=${QT_LIBDIR} +WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R} -CPPFLAGS+= -I${LOCALBASE}/include +USES= cmake:outsource desktop-file-utils gmake pkgconfig \ + shared-mime-info tar:bzip2 + +CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -post-patch: - @${REINPLACE_CMD} -e \ - 's|15\.10\.1|${PORTVERSION}| ; \ - /LIBS/s|-ldl||' ${WRKSRC}/configure +INSTALLS_ICONS= yes -post-install: - @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/rosegarden +OPTIONS_SINGLE= TOOLKIT +OPTIONS_SINGLE_TOOLKIT= QT4 QT5 +OPTIONS_DEFAULT= QT4 + +QR4_USES= compiler:c++0x +QT4_USE= qt4=gui,network,testlib,xml \ + qt4=linguisttools_build,moc_build,qmake_build \ + qt4=rcc_build,uic_build +QT4_CMAKE_ON= -DUSE_QT4:BOOL=ON +QT5_USES= compiler:c++11-lib +QT5_USE= qt5=network,printsupport,testlib,widgets,xml \ + qt5=buildtools_build,linguisttools_build,qmake_build +QT5_CMAKE_ON= -DUSE_QT5:BOOL=ON +TOOLKIT_DESC= Qt toolkit .include diff --git a/audio/rosegarden/distinfo b/audio/rosegarden/distinfo index 8027cac6200..9a5a85daaaf 100644 --- a/audio/rosegarden/distinfo +++ b/audio/rosegarden/distinfo @@ -1,2 +1,2 @@ -SHA256 (rosegarden-15.10.2.tar.bz2) = d4e8488c3447763a7d4b57925dc9d462e9e21efe647962431ea21aad8930a0a3 -SIZE (rosegarden-15.10.2.tar.bz2) = 6380389 +SHA256 (rosegarden-15.12.1.tar.bz2) = b3aff1057a5ebba216982b17ed7f74d7283f6fb6c8714a7e12b91434a2077450 +SIZE (rosegarden-15.12.1.tar.bz2) = 6406834 diff --git a/audio/rosegarden/files/patch-src__gui__application__main.cpp b/audio/rosegarden/files/patch-src__gui__application__main.cpp new file mode 100644 index 00000000000..93f6d00fb81 --- /dev/null +++ b/audio/rosegarden/files/patch-src__gui__application__main.cpp @@ -0,0 +1,30 @@ +--- src/gui/application/main.cpp.orig 2015-12-31 13:49:35 UTC ++++ src/gui/application/main.cpp +@@ -354,6 +354,11 @@ void usage() + exit(2); + } + ++#ifdef __GNUG__ ++#pragma GCC push ++#pragma GCC diagnostic ignored "-Wunused-variable" ++#endif ++ + int main(int argc, char *argv[]) + { + for (int i = 1; i < argc; ++i) { +@@ -377,7 +382,6 @@ int main(int argc, char *argv[]) + // (this has to be outside the ifdef block below) + QSettings preAppSettings("rosegardenmusic", "Rosegarden"); + preAppSettings.beginGroup(GeneralOptionsConfigGroup); +-#pragma GCC diagnostic ignored "-Wunused-variable" + unsigned int graphicsSystem = preAppSettings.value("graphics_system", Native).toUInt(); + preAppSettings.endGroup(); + +@@ -840,4 +844,7 @@ int main(int argc, char *argv[]) + + return returnCode; + } ++#ifdef __GNUG__ ++#pragma GCC pop ++#endif + diff --git a/benchmarks/ubench/Makefile b/benchmarks/ubench/Makefile index 97c34cac141..b2a18b02280 100644 --- a/benchmarks/ubench/Makefile +++ b/benchmarks/ubench/Makefile @@ -9,11 +9,16 @@ MASTER_SITES= SUNSITE/system/benchmark MAINTAINER= ports@FreeBSD.org COMMENT= Unix Benchmark Utility for CPU(s) and memory +LICENSE= GPLv2+ + HAS_CONFIGURE= yes -MAKE_ARGS= INSTALLDIR=${STAGEDIR}${PREFIX}/bin \ - MANDIR=${STAGEDIR}${PREFIX}/man/man8 +ALL_TARGET= ubench PLIST_FILES= bin/ubench \ man/man8/ubench.8.gz +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/ubench ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/ubench.8 ${STAGEDIR}${MANPREFIX}/man/man8 + .include diff --git a/benchmarks/ubench/files/patch-Makefile b/benchmarks/ubench/files/patch-Makefile deleted file mode 100644 index 9052e072ed9..00000000000 --- a/benchmarks/ubench/files/patch-Makefile +++ /dev/null @@ -1,99 +0,0 @@ ---- configure.orig Mon May 29 09:46:09 2000 -+++ configure Mon Apr 2 11:49:28 2007 -@@ -12,7 +12,8 @@ - ############################################################################### - - #DEFINES=-DDEBUG --INSTALLDIR= /usr/local/bin -+INSTALLDIR= \$(PREFIX)/bin -+MANDIR = \$(PREFIX)/man/man8 - - ! - -@@ -23,7 +24,6 @@ - case $ARCH in - i486) - cat <> Makefile --CC = gcc - CFLAGS = -O2 -m486 -Wall -malign-loops=2 -malign-jumps=2 -malign-functions=2 -fomit-frame-pointer - LDFLAGS = -s -lm - INCLUDES = -I. -@@ -32,7 +32,6 @@ - ;; - i586) - cat <> Makefile --CC = gcc - CFLAGS = -O2 -Wall -malign-loops=2 -malign-jumps=2 -malign-functions=2 -fomit-frame-pointer - LDFLAGS = -s -lm - INCLUDES = -I. -@@ -41,7 +40,6 @@ - ;; - i686) - cat <> Makefile --CC = gcc - CFLAGS = -O2 -Wall -malign-loops=2 -malign-jumps=2 -malign-functions=2 -fomit-frame-pointer - LDFLAGS = -s -lm - INCLUDES = -I. -@@ -50,7 +48,6 @@ - ;; - *) - cat <> Makefile --CC = gcc - CFLAGS = -O2 -Wall -malign-loops=2 -malign-jumps=2 -malign-functions=2 - LDFLAGS = -s -lm - INCLUDES = -I. -@@ -66,7 +63,6 @@ - case ${BITS} in - 64) - cat <> Makefile --CC = cc - CFLAGS = +O2 -Ae -z -DHPUX +DA2.0W +DS2.0 -DSS_64BIT_SERVER -DHPPA64 \\ - -DSLS8NATIVE -DSLU8NATIVE -D_REENTRANT -DHPUX_KTHREAD -DSLXMX_ENABLE \\ - -DSLMXMX_ENABLE -DSLTS_ENABLE +Omultiprocessor +Olibcalls +Ofastaccess \\ -@@ -78,7 +74,6 @@ - ;; - *) - cat <> Makefile --CC = cc - CFLAGS = +O2 -Ae -z -DHPUX +DA2.0W +DS2.0 -DSS_32BIT_SERVER -DHPPA32 \\ - -DSLS8NATIVE -DSLU8NATIVE -D_REENTRANT -DHPUX_KTHREAD -DSLXMX_ENABLE \\ - -DSLMXMX_ENABLE -DSLTS_ENABLE +Omultiprocessor +Olibcalls +Ofastaccess \\ -@@ -94,7 +89,6 @@ - ARCH="`oslevel`" - echo "==== Creating Makefile for ${SYSTEM} ${ARCH}" - cat <> Makefile --CC = xlc - CFLAGS = -O2 -DOSLEVEL=\\\"${ARCH}\\\" -D_XOPEN_SOURCE -D_POSIX_SOURCE -D_ANSI_C_SOURCE -D_ALL_SOURCE - LDFLAGS = -lm - INCLUDE = -I. -@@ -104,7 +98,6 @@ - SunOS) - echo "==== Creating Makefile for ${SYSTEM} ${ARCH}" - cat <> Makefile --CC = cc - CFLAGS = -xO5 -DSunOS - LDFLAGS = -s -lm - INCLUDE = -I. -@@ -113,7 +106,6 @@ - ;; - *) - cat <> Makefile --CC = cc - CFLAGS = - LDFLAGS = -lm - INCLUDES = -I. -@@ -134,11 +126,11 @@ - %.o: %.c - \$(CC) \$(CFLAGS) \$(INCLUDES) -c \$< - --default: ubench -+all: ubench - - install: ubench -- mv -f \$(INSTALLDIR)/ubench \$(INSTALLDIR)/ubench.old -- install -c -m 0555 ubench \$(INSTALLDIR) -+ \$(BSD_INSTALL_MAN) ubench.8 \$(MANDIR) -+ \$(BSD_INSTALL_PROGRAM) ubench \$(INSTALLDIR) - - utime: \$(utimeobjects) - \$(CC) \$(CFLAGS) \$(LDFLAGS) -o \$@ \$^ diff --git a/benchmarks/ubench/files/patch-configure b/benchmarks/ubench/files/patch-configure new file mode 100644 index 00000000000..944b8c22d15 --- /dev/null +++ b/benchmarks/ubench/files/patch-configure @@ -0,0 +1,15 @@ +--- configure.orig 2000-05-29 01:46:09 UTC ++++ configure +@@ -113,9 +113,9 @@ INCLUDE = -I. + ;; + *) + cat <> Makefile +-CC = cc +-CFLAGS = +-LDFLAGS = -lm ++CC ?= cc ++CFLAGS += ++LDFLAGS += -lm + INCLUDES = -I. + + ! diff --git a/chinese/pcmanx/Makefile b/chinese/pcmanx/Makefile index 1f2ba338f4f..df9e0bf065d 100644 --- a/chinese/pcmanx/Makefile +++ b/chinese/pcmanx/Makefile @@ -2,9 +2,9 @@ # $FreeBSD$ PORTNAME= pcmanx -PORTVERSION= 1.2 +PORTVERSION= 1.3 CATEGORIES= chinese net gnome -MASTER_SITES= http://pcmanx-gtk2.googlecode.com/files/ +MASTER_SITES= https://github.com/pcman-bbs/${PORTNAME}/releases/download/${PORTVERSION}/ DISTNAME= ${PORTNAME}-gtk2-${PORTVERSION} MAINTAINER= ports@FreeBSD.org diff --git a/chinese/pcmanx/distinfo b/chinese/pcmanx/distinfo index 1c4c0e70d9e..a05aa919402 100644 --- a/chinese/pcmanx/distinfo +++ b/chinese/pcmanx/distinfo @@ -1,2 +1,2 @@ -SHA256 (pcmanx-gtk2-1.2.tar.xz) = 2463652d9b75ba1bea7420069e28d66f6e8064cfcfea2a697f06c1d491ec774a -SIZE (pcmanx-gtk2-1.2.tar.xz) = 534684 +SHA256 (pcmanx-gtk2-1.3.tar.xz) = 3f5d7eaf5daa7dcf3843a01e239cea312045ded03dd77b364fa1082b9356968a +SIZE (pcmanx-gtk2-1.3.tar.xz) = 551580 diff --git a/chinese/pcmanx/files/patch-src-core-proxy.c b/chinese/pcmanx/files/patch-src-core-proxy.c deleted file mode 100644 index 55aaa130f7b..00000000000 --- a/chinese/pcmanx/files/patch-src-core-proxy.c +++ /dev/null @@ -1,12 +0,0 @@ ---- src/core/proxy.c.orig 2011-12-28 19:59:03.000000000 +0800 -+++ src/core/proxy.c 2012-05-01 10:42:46.000000000 +0800 -@@ -22,6 +22,9 @@ - #include - #include - #include -+#if defined(__FreeBSD__) -+#include -+#endif - - #include "proxy.h" - diff --git a/chinese/pcmanx/pkg-descr b/chinese/pcmanx/pkg-descr index 5d964de425e..7a42d65adee 100644 --- a/chinese/pcmanx/pkg-descr +++ b/chinese/pcmanx/pkg-descr @@ -1,3 +1,3 @@ PCManX is a BBS client for X Window System using GTK+ 2.x. -WWW: http://code.google.com/p/pcmanx-gtk2/ +WWW: https://github.com/pcman-bbs/pcmanx diff --git a/comms/Makefile b/comms/Makefile index 20e939993c3..9cdbfd3fd75 100644 --- a/comms/Makefile +++ b/comms/Makefile @@ -79,6 +79,7 @@ SUBDIR += klog SUBDIR += kremotecontrol SUBDIR += kvasd + SUBDIR += libcodec2 SUBDIR += libconcord SUBDIR += libfap SUBDIR += libfec diff --git a/comms/libcodec2/Makefile b/comms/libcodec2/Makefile new file mode 100644 index 00000000000..8fc569cdccf --- /dev/null +++ b/comms/libcodec2/Makefile @@ -0,0 +1,20 @@ +# Created by: Takefu +# $FreeBSD$ + +PORTNAME= libcodec2 +PORTVERSION= 0.4.1 +CATEGORIES= comms hamradio +MASTER_SITES= http://files.freedv.org/codec2/ +DISTNAME= codec2-${PORTVERSION} + +MAINTAINER= takefu@airport.fm +COMMENT= Codec 2 speech codec + +LICENSE= LGPL21 + +LIB_DEPENDS= libspeexdsp.so:${PORTSDIR}/audio/speexdsp + +USE_LDCONFIG= yes +USES= cmake:outsource + +.include diff --git a/comms/libcodec2/distinfo b/comms/libcodec2/distinfo new file mode 100644 index 00000000000..6cc3c6f8afa --- /dev/null +++ b/comms/libcodec2/distinfo @@ -0,0 +1,2 @@ +SHA256 (codec2-0.4.1.tar.gz) = 2fe3b9410a98c72b1420eeda8bb3656c176a6e6a2813e55476a7779a216990bb +SIZE (codec2-0.4.1.tar.gz) = 11100891 diff --git a/comms/libcodec2/pkg-descr b/comms/libcodec2/pkg-descr new file mode 100644 index 00000000000..ef6eeece1ea --- /dev/null +++ b/comms/libcodec2/pkg-descr @@ -0,0 +1,4 @@ +Codec 2 is an open source (LGPL licensed) speech codec for 3200 bit/s +and below. + +WWW: http://www.rowetel.com/codec2.html diff --git a/comms/libcodec2/pkg-plist b/comms/libcodec2/pkg-plist new file mode 100644 index 00000000000..8b2bc77c286 --- /dev/null +++ b/comms/libcodec2/pkg-plist @@ -0,0 +1,28 @@ +bin/c2dec +bin/c2demo +bin/c2enc +bin/c2sim +bin/fdmdv_demod +bin/fdmdv_get_test_bits +bin/fdmdv_interleave +bin/fdmdv_mod +bin/fdmdv_put_test_bits +bin/fec_dec +bin/fec_enc +bin/fm_demod +bin/insert_errors +include/codec2/codec2.h +include/codec2/codec2_cohpsk.h +include/codec2/codec2_fdmdv.h +include/codec2/codec2_fifo.h +include/codec2/codec2_fm.h +include/codec2/comp.h +include/codec2/comp_prim.h +include/codec2/freedv_api.h +include/codec2/freedv_api_internal.h +include/codec2/golay23.h +include/codec2/kiss_fft.h +include/codec2/modem_stats.h +include/codec2/varicode.h +lib/libcodec2.so +lib/libcodec2.so.0.4 diff --git a/databases/libsdb/Makefile b/databases/libsdb/Makefile index 87856b134f1..1f1748c336d 100644 --- a/databases/libsdb/Makefile +++ b/databases/libsdb/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= libsdb -PORTVERSION= 0.10.0 +PORTVERSION= 0.10.1 CATEGORIES= databases MASTER_SITES= http://siag.nu/pub/libsdb/ DISTNAME= sdb-${PORTVERSION} diff --git a/databases/libsdb/distinfo b/databases/libsdb/distinfo index 0d8e646db37..4b6b5cd127f 100644 --- a/databases/libsdb/distinfo +++ b/databases/libsdb/distinfo @@ -1,2 +1,2 @@ -SHA256 (sdb-0.10.0.tar.gz) = 918b6d1bc0b34a8e8bbac70d6297b32cfd9e644d18a48fe1b32c9577398be3b7 -SIZE (sdb-0.10.0.tar.gz) = 48245 +SHA256 (sdb-0.10.1.tar.gz) = 2b95c0853b38805bada95f08de5240c00b189c7196f66b3aa8bc68dfd9fd878e +SIZE (sdb-0.10.1.tar.gz) = 58929 diff --git a/databases/libsdb/pkg-plist b/databases/libsdb/pkg-plist index 8d870a1ccd4..492bb6e160f 100644 --- a/databases/libsdb/pkg-plist +++ b/databases/libsdb/pkg-plist @@ -6,7 +6,7 @@ include/sdb.h lib/libsdb.a lib/libsdb.so lib/libsdb.so.0 -lib/libsdb.so.%%VERSION%% +lib/libsdb.so.0.10.0 man/man3/sdb.3.gz man/man3/sdb_close.3.gz man/man3/sdb_init.3.gz diff --git a/databases/libzdb/Makefile b/databases/libzdb/Makefile index d5d5426e71d..6f90e698ebf 100644 --- a/databases/libzdb/Makefile +++ b/databases/libzdb/Makefile @@ -3,6 +3,7 @@ PORTNAME= libzdb PORTVERSION= 3.1 +PORTREVISION= 1 CATEGORIES= databases MASTER_SITES= http://www.tildeslash.com/libzdb/dist/ @@ -28,7 +29,7 @@ MYSQL_CONFIGURE_OFF= --without-mysql PGSQL_USES= pgsql PGSQL_CONFIGURE_ON= --with-postgresql=${LOCALBASE}/bin/pg_config PGSQL_CONFIGURE_OFF= --without-postgresql -SQLITE_USE= sqlite=3 +SQLITE_USES= sqlite SQLITE_CONFIGURE_ON= --with-sqlite=${LOCALBASE} SQLITE_CONFIGURE_OFF= --without-sqlite SSL_USE= openssl=yes diff --git a/databases/libzdb/files/patch-configure b/databases/libzdb/files/patch-configure new file mode 100644 index 00000000000..6e03482f567 --- /dev/null +++ b/databases/libzdb/files/patch-configure @@ -0,0 +1,51 @@ +Stop passing -dl when trying to detect SQLite3's presence. + +If we don't, the configuration tests will fail and SQLite3 support will always +be disabled. +--- configure.orig 2015-08-31 12:55:11 UTC ++++ configure +@@ -16834,7 +16834,7 @@ for ac_lib in '' sqlite3; do + ac_res="none required" + else + ac_res=-l$ac_lib +- LIBS="-l$ac_lib -ldl $ac_func_search_save_LIBS" ++ LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_sqlite3_open=$ac_res +@@ -16900,7 +16900,7 @@ for ac_lib in '' sqlite3; do + ac_res="none required" + else + ac_res=-l$ac_lib +- LIBS="-l$ac_lib -ldl $ac_func_search_save_LIBS" ++ LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_sqlite3_open=$ac_res +@@ -17031,7 +17031,7 @@ for ac_lib in '' sqlite3; do + ac_res="none required" + else + ac_res=-l$ac_lib +- LIBS="-l$ac_lib -ldl $ac_func_search_save_LIBS" ++ LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_sqlite3_soft_heap_limit=$ac_res +@@ -17089,7 +17089,7 @@ for ac_lib in '' sqlite3; do + ac_res="none required" + else + ac_res=-l$ac_lib +- LIBS="-l$ac_lib -ldl $ac_func_search_save_LIBS" ++ LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_sqlite3_soft_heap_limit64=$ac_res +@@ -17147,7 +17147,7 @@ for ac_lib in '' sqlite3; do + ac_res="none required" + else + ac_res=-l$ac_lib +- LIBS="-l$ac_lib -ldl $ac_func_search_save_LIBS" ++ LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_sqlite3_errstr=$ac_res diff --git a/databases/mysql-workbench52/Makefile b/databases/mysql-workbench52/Makefile index e8f3730766f..535019f2eef 100644 --- a/databases/mysql-workbench52/Makefile +++ b/databases/mysql-workbench52/Makefile @@ -39,7 +39,7 @@ PYTHON_UTILS_DESC= Python scripts useful for administering MySQL USES= autoreconf compiler:gcc-c++11-lib desktop-file-utils gettext \ gmake iconv libtool lua:51 pathfix pkgconfig python:2 \ - shared-mime-info shebangfix + shared-mime-info shebangfix sqlite SHEBANG_FILES= ext/ctemplate/ctemplate-src/src/htmlparser/*.py \ ext/mysql-utilities/*.py \ ext/mysql-utilities/scripts/*.py \ @@ -54,7 +54,6 @@ SHEBANG_FILES= ext/ctemplate/ctemplate-src/src/htmlparser/*.py \ USE_GL= gl USE_GNOME= gtk20 libxml2 USE_MYSQL= client -USE_SQLITE= 3 GNU_CONFIGURE= yes CONFIGURE_ENV= LUA_CFLAGS="$$(pkg-config --cflags lua-${LUA_VER})" \ LUA_LIBS="$$(pkg-config --libs lua-${LUA_VER})" \ diff --git a/deskutils/calibre/Makefile b/deskutils/calibre/Makefile index d85feefc567..0a8a9833e13 100644 --- a/deskutils/calibre/Makefile +++ b/deskutils/calibre/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= calibre -PORTVERSION= 2.50.1 -PORTREVISION= 1 +PORTVERSION= 2.52.0 CATEGORIES= deskutils python MASTER_SITES= http://download.calibre-ebook.com/${PORTVERSION}/ diff --git a/deskutils/calibre/distinfo b/deskutils/calibre/distinfo index 1d7b307b5fd..349e67a0b4e 100644 --- a/deskutils/calibre/distinfo +++ b/deskutils/calibre/distinfo @@ -1,2 +1,2 @@ -SHA256 (calibre-2.50.1.tar.xz) = a932a07385cd587b80b48a36227c9ed586da83f1a28940285b88c2512477c53b -SIZE (calibre-2.50.1.tar.xz) = 39439972 +SHA256 (calibre-2.52.0.tar.xz) = 9a2b01af095017eb94322df98251a15fc7e691d09cff9cc18ee3d409370941d1 +SIZE (calibre-2.52.0.tar.xz) = 39904084 diff --git a/deskutils/calibre/pkg-plist b/deskutils/calibre/pkg-plist index b6332817ddf..a6dd6db3818 100644 --- a/deskutils/calibre/pkg-plist +++ b/deskutils/calibre/pkg-plist @@ -664,6 +664,7 @@ lib/calibre/calibre/gui2/actions/tweak_epub.py lib/calibre/calibre/gui2/actions/unpack_book.py lib/calibre/calibre/gui2/actions/view.py lib/calibre/calibre/gui2/add.py +lib/calibre/calibre/gui2/add_filters.py lib/calibre/calibre/gui2/auto_add.py lib/calibre/calibre/gui2/bars.py lib/calibre/calibre/gui2/book_details.py @@ -1202,8 +1203,10 @@ lib/calibre/calibre/srv/errors.py lib/calibre/calibre/srv/handler.py lib/calibre/calibre/srv/http_request.py lib/calibre/calibre/srv/http_response.py +lib/calibre/calibre/srv/legacy.py lib/calibre/calibre/srv/loop.py lib/calibre/calibre/srv/metadata.py +lib/calibre/calibre/srv/opds.py lib/calibre/calibre/srv/opts.py lib/calibre/calibre/srv/pool.py lib/calibre/calibre/srv/pre_activated.py @@ -1581,6 +1584,7 @@ lib/calibre/tinycss/version.py %%DATADIR%%/coffee-script.js %%DATADIR%%/compiled_coffeescript.zip %%DATADIR%%/content-server/autoreload.js +%%DATADIR%%/content-server/calibre.png %%DATADIR%%/content-server/empty.html %%DATADIR%%/content-server/font-awesome/FontAwesome.otf %%DATADIR%%/content-server/font-awesome/fa.css @@ -1591,6 +1595,7 @@ lib/calibre/tinycss/version.py %%DATADIR%%/content-server/font-awesome/fontawesome-webfont.woff2 %%DATADIR%%/content-server/index.html %%DATADIR%%/content-server/main.js +%%DATADIR%%/content-server/mobile.css %%DATADIR%%/content-server/reset.css %%DATADIR%%/content_server/av.jpg %%DATADIR%%/content_server/bg_search_box.png @@ -1902,6 +1907,7 @@ lib/calibre/tinycss/version.py %%DATADIR%%/localization/stats.pickle %%DATADIR%%/metadata_sqlite.sql %%DATADIR%%/mime.types +%%DATADIR%%/mozilla-ca-certs.pem %%DATADIR%%/quick_start/deu.epub %%DATADIR%%/quick_start/eng.epub %%DATADIR%%/quick_start/fra.epub diff --git a/deskutils/gxmessage/Makefile b/deskutils/gxmessage/Makefile index 26b2f947e58..88a258db7da 100644 --- a/deskutils/gxmessage/Makefile +++ b/deskutils/gxmessage/Makefile @@ -2,16 +2,15 @@ # $FreeBSD$ PORTNAME= gxmessage -PORTVERSION= 2.12.4 -PORTREVISION= 1 +PORTVERSION= 3.4.3 CATEGORIES= deskutils MASTER_SITES= GNU \ LOCAL/martymac MAINTAINER= avg@icyb.net.ua -COMMENT= GTK2 substitute for xmessage +COMMENT= GTK3 substitute for xmessage -USE_GNOME= gtk20 gnomeprefix intltool +USE_GNOME= gtk30 gnomeprefix intltool USES= gmake pkgconfig GNU_CONFIGURE= yes INSTALLS_ICONS= yes diff --git a/deskutils/gxmessage/distinfo b/deskutils/gxmessage/distinfo index d473b51673d..a3118caeff7 100644 --- a/deskutils/gxmessage/distinfo +++ b/deskutils/gxmessage/distinfo @@ -1,2 +1,2 @@ -SHA256 (gxmessage-2.12.4.tar.gz) = ebfaefd01483c43eadda004b75d493bc8dcc016076f6a48f97774364bbe30c87 -SIZE (gxmessage-2.12.4.tar.gz) = 248034 +SHA256 (gxmessage-3.4.3.tar.gz) = db4e1655fc58f31e5770a17dfca4e6c89028ad8b2c8e043febc87a0beedeef05 +SIZE (gxmessage-3.4.3.tar.gz) = 275354 diff --git a/deskutils/gxmessage/pkg-descr b/deskutils/gxmessage/pkg-descr index 4235995fd2f..0c1fe657f18 100644 --- a/deskutils/gxmessage/pkg-descr +++ b/deskutils/gxmessage/pkg-descr @@ -1,4 +1,4 @@ -A GTK2 based xmessage clone, gxmessage tries to be as compatible as possible. +A GTK3 based xmessage clone, gxmessage tries to be as compatible as possible. You might like it if you're running a mostly GTK desktop. WWW: http://homepages.ihug.co.nz/~trmusson/programs.html#gxmessage diff --git a/devel/Makefile b/devel/Makefile index 24195bf810a..2612ab25218 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -1538,6 +1538,7 @@ SUBDIR += nxt-python SUBDIR += obby SUBDIR += obfuscatejs + SUBDIR += objecthash SUBDIR += ocaml-annexlib SUBDIR += ocaml-calendar SUBDIR += ocaml-camljava diff --git a/devel/chrpath/Makefile b/devel/chrpath/Makefile index 13dfcac513b..8880692f87b 100644 --- a/devel/chrpath/Makefile +++ b/devel/chrpath/Makefile @@ -2,14 +2,16 @@ # $FreeBSD$ PORTNAME= chrpath -PORTVERSION= 0.13 -PORTREVISION= 2 +PORTVERSION= 0.16 CATEGORIES= devel sysutils -MASTER_SITES= http://ftp.tux.org/pub/X-Windows/ftp.hungry.com/chrpath/ +MASTER_SITES= DEBIAN_POOL +DISTNAME= ${PORTNAME}_${PORTVERSION}.orig MAINTAINER= ports@FreeBSD.org COMMENT= Tool to modify DT_RPATH in existing ELF binaries +WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} + LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING diff --git a/devel/chrpath/distinfo b/devel/chrpath/distinfo index 326fb91e988..87503d69e8e 100644 --- a/devel/chrpath/distinfo +++ b/devel/chrpath/distinfo @@ -1,2 +1,2 @@ -SHA256 (chrpath-0.13.tar.gz) = c1aa5342eac0daad81b8da05aa282ae1ccd6f68bc75ca94064304f541eed071b -SIZE (chrpath-0.13.tar.gz) = 125129 +SHA256 (chrpath_0.16.orig.tar.gz) = bb0d4c54bac2990e1bdf8132f2c9477ae752859d523e141e72b3b11a12c26e7b +SIZE (chrpath_0.16.orig.tar.gz) = 134506 diff --git a/devel/chrpath/files/patch-Makefile.in b/devel/chrpath/files/patch-Makefile.in index f7d89f50c37..30f3dd2fc3b 100644 --- a/devel/chrpath/files/patch-Makefile.in +++ b/devel/chrpath/files/patch-Makefile.in @@ -1,27 +1,30 @@ ---- Makefile.in.orig 2004-09-19 12:42:53.000000000 +0400 -+++ Makefile.in 2010-06-20 12:55:59.000000000 +0400 -@@ -66,7 +66,7 @@ - - SUBDIRS = testsuite deb - +--- Makefile.in.orig 2014-01-12 09:03:45.000000000 +0100 ++++ Makefile.in 2016-02-03 19:32:36.764942000 +0100 +@@ -243,7 +243,7 @@ + builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ -docdir = $(prefix)/doc/$(PACKAGE)-$(VERSION) +docdir = $(prefix)/share/doc/$(PACKAGE) - - doc_DATA = AUTHORS COPYING ChangeLog INSTALL NEWS README - -@@ -263,16 +263,6 @@ - + dvidir = @dvidir@ + exec_prefix = @exec_prefix@ + host = @host@ +@@ -457,19 +457,6 @@ + dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir) install-docDATA: $(doc_DATA) @$(NORMAL_INSTALL) -- $(mkinstalldirs) $(DESTDIR)$(docdir) -- @list='$(doc_DATA)'; for p in $$list; do \ -- if test -f $(srcdir)/$$p; then \ -- echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(docdir)/$$p"; \ -- $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(docdir)/$$p; \ -- else if test -f $$p; then \ -- echo " $(INSTALL_DATA) $$p $(DESTDIR)$(docdir)/$$p"; \ -- $(INSTALL_DATA) $$p $(DESTDIR)$(docdir)/$$p; \ -- fi; fi; \ +- @list='$(doc_DATA)'; test -n "$(docdir)" || list=; \ +- if test -n "$$list"; then \ +- echo " $(MKDIR_P) '$(DESTDIR)$(docdir)'"; \ +- $(MKDIR_P) "$(DESTDIR)$(docdir)" || exit 1; \ +- fi; \ +- for p in $$list; do \ +- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- echo "$$d$$p"; \ +- done | $(am__base_list) | \ +- while read files; do \ +- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(docdir)'"; \ +- $(INSTALL_DATA) $$files "$(DESTDIR)$(docdir)" || exit $$?; \ - done uninstall-docDATA: diff --git a/devel/chrpath/files/patch-elf.c b/devel/chrpath/files/patch-elf.c deleted file mode 100644 index 340cae861a9..00000000000 --- a/devel/chrpath/files/patch-elf.c +++ /dev/null @@ -1,11 +0,0 @@ ---- elf.c.orig 2003-12-19 21:07:00.000000000 +0000 -+++ elf.c 2009-12-01 20:39:21.000000000 +0000 -@@ -55,7 +55,7 @@ - if (ehdr->e_phentsize != sizeof(Elf_Phdr)) - { - fprintf(stderr, "section size was read as %d, not %d!\n", -- ehdr->e_phentsize, sizeof(Elf_Phdr)); -+ ehdr->e_phentsize, (int)sizeof(Elf_Phdr)); - close(fd); - return -1; - } diff --git a/devel/chrpath/files/patch-protos.h b/devel/chrpath/files/patch-protos.h new file mode 100644 index 00000000000..a5c0810e0ed --- /dev/null +++ b/devel/chrpath/files/patch-protos.h @@ -0,0 +1,30 @@ +--- protos.h.orig 2013-11-24 08:30:01.000000000 +0100 ++++ protos.h 2016-02-03 19:47:21.946096000 +0100 +@@ -1,7 +1,14 @@ + #ifndef PROTOS_H + #define PROTOS_H + ++#ifdef __FreeBSD__ ++#include ++#define bswap_16 bswap16 ++#define bswap_32 bswap32 ++#define bswap_64 bswap64 ++#else + #include ++#endif + #include + #include "config.h" + +@@ -14,6 +21,12 @@ + #error "Unknown word size (SIZEOF_VOID_P)!" + #endif + ++#ifdef __FreeBSD__ ++#define Elf_Ehdr Elf__Ehdr ++#define Elf_Shdr Elf__Shdr ++#define Elf_Phdr Elf__Phdr ++#endif ++ + typedef union { + unsigned char e_ident[EI_NIDENT]; + Elf32_Ehdr e32; diff --git a/devel/chrpath/files/patch-testsuite__Makefile.in b/devel/chrpath/files/patch-testsuite__Makefile.in index ed84c486828..302f5bf4feb 100644 --- a/devel/chrpath/files/patch-testsuite__Makefile.in +++ b/devel/chrpath/files/patch-testsuite__Makefile.in @@ -1,6 +1,6 @@ ---- ./testsuite/Makefile.in.orig 2004-09-19 10:42:53.000000000 +0200 -+++ ./testsuite/Makefile.in 2014-04-04 15:32:16.000000000 +0200 -@@ -259,7 +259,7 @@ +--- testsuite/Makefile.in.orig 2014-01-12 09:03:45.000000000 +0100 ++++ testsuite/Makefile.in 2016-02-03 19:34:07.381487000 +0100 +@@ -457,7 +457,7 @@ prog: prog.c diff --git a/devel/clig/Makefile b/devel/clig/Makefile index ef2be8530e7..83008aae307 100644 --- a/devel/clig/Makefile +++ b/devel/clig/Makefile @@ -5,15 +5,14 @@ PORTNAME= clig PORTVERSION= 1.9.11.1 PORTREVISION= 3 CATEGORIES= devel tcl -MASTER_SITES= http://wsd.iitb.fhg.de/~geg/clighome/ +MASTER_SITES= http://BSDforge.com/projects/source/devel/clig/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= portmaster@BSDforge.com COMMENT= Auto-generate an (argc, argv) processor, usage message, and manpage LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING-2.0 -BROKEN= Does not fetch USES= shebangfix tcl tk SHEBANG_FILES= tcl/*.tcl tk_OLD_CMD= /usr/bin/wish8.0 diff --git a/devel/clig/pkg-descr b/devel/clig/pkg-descr index 1bd298c0aa6..e192bb7521a 100644 --- a/devel/clig/pkg-descr +++ b/devel/clig/pkg-descr @@ -1,10 +1,10 @@ Clig generates C code to take apart the typical command-line arguments -given to a C program. Input to clig is a simple description file that +given to a C program. Input to clig is a simple description file that specifies the name and number of options, their type (Flag, String, -Float, Int) and permissible range, and which options are mandatory. From +Float, Int) and permissible range, and which options are mandatory. From this, clig will generate self-contained C code to include in your program, a usage message, and a manual page skeleton. Clig does a lot more than getopt! -WWW: http://wsd.iitb.fhg.de/~geg/clighome/ +WWW: http://BSDforge.com/projects/devel/clig diff --git a/devel/elixir-exrm/Makefile b/devel/elixir-exrm/Makefile index db51f255634..3afdf95ae8e 100644 --- a/devel/elixir-exrm/Makefile +++ b/devel/elixir-exrm/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= exrm -DISTVERSION= 1.0.0 +DISTVERSION= 1.0.1 CATEGORIES= devel PKGNAMEPREFIX= elixir- diff --git a/devel/elixir-exrm/distinfo b/devel/elixir-exrm/distinfo index 0149a4a7048..a1de6813291 100644 --- a/devel/elixir-exrm/distinfo +++ b/devel/elixir-exrm/distinfo @@ -1,2 +1,2 @@ -SHA256 (bitwalker-exrm-1.0.0_GH0.tar.gz) = 313e015bc5b5e4bc16ecd98fcb84e038fefec0767621941a334da24463c48f64 -SIZE (bitwalker-exrm-1.0.0_GH0.tar.gz) = 56169 +SHA256 (bitwalker-exrm-1.0.1_GH0.tar.gz) = 2bcc9331e58073f12e986a03b7a8fba04f9acdb16cb2d8972464c1fa018742d3 +SIZE (bitwalker-exrm-1.0.1_GH0.tar.gz) = 56187 diff --git a/devel/lua-MessagePack/Makefile b/devel/lua-MessagePack/Makefile index e2b0f0a26ed..f1d8e6765c5 100644 --- a/devel/lua-MessagePack/Makefile +++ b/devel/lua-MessagePack/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= MessagePack -PORTVERSION= 0.3.3 +PORTVERSION= 0.3.4 CATEGORIES= devel PKGNAMEPREFIX= ${LUA_PKGNAMEPREFIX} diff --git a/devel/lua-MessagePack/distinfo b/devel/lua-MessagePack/distinfo index 597d6485cd2..45d8eec19b6 100644 --- a/devel/lua-MessagePack/distinfo +++ b/devel/lua-MessagePack/distinfo @@ -1,2 +1,2 @@ -SHA256 (fperrad-lua-MessagePack-0.3.3_GH0.tar.gz) = 40e86eacac87f4deaa566cdefaaa1ec6ca90ad14a9419805ea90d069736cfda6 -SIZE (fperrad-lua-MessagePack-0.3.3_GH0.tar.gz) = 16335 +SHA256 (fperrad-lua-MessagePack-0.3.4_GH0.tar.gz) = 4ab743587af7b3c53384ca92a68df6ec78289d9a65b226e4aeb98984b76202ab +SIZE (fperrad-lua-MessagePack-0.3.4_GH0.tar.gz) = 17234 diff --git a/devel/objecthash/Makefile b/devel/objecthash/Makefile new file mode 100644 index 00000000000..af329be692d --- /dev/null +++ b/devel/objecthash/Makefile @@ -0,0 +1,31 @@ +# Created by: Edward Tomasz Napierala +# $FreeBSD$ + +PORTNAME= objecthash +PORTVERSION= 20160121 +CATEGORIES= devel + +MAINTAINER= trasz@FreeBSD.org +COMMENT= Cross-language way to cryptographically hash JSON objects + +LICENSE= APACHE20 + +LIB_DEPENDS= libicudata.so:${PORTSDIR}/devel/icu \ + libjson-c.so:${PORTSDIR}/devel/json-c + +USES= pkgconfig +USE_GITHUB= yes +USE_LDCONFIG= yes +GH_ACCOUNT= benlaurie +GH_PROJECT= objecthash +GH_TAGNAME= 2024cf8 + +ALL_TARGET= libobjecthash.so + +PLIST_FILES= include/objecthash.h lib/libobjecthash.so + +do-install: + ${INSTALL_LIB} ${WRKSRC}/libobjecthash.so ${STAGEDIR}${PREFIX}/lib + ${INSTALL_DATA} ${WRKSRC}/objecthash.h ${STAGEDIR}${PREFIX}/include + +.include diff --git a/devel/objecthash/distinfo b/devel/objecthash/distinfo new file mode 100644 index 00000000000..37c75f82ef7 --- /dev/null +++ b/devel/objecthash/distinfo @@ -0,0 +1,2 @@ +SHA256 (benlaurie-objecthash-20160121-2024cf8_GH0.tar.gz) = 036c5bb3e3d053d0297607618b7bf0c115efe43de09eb42adc207c399d203045 +SIZE (benlaurie-objecthash-20160121-2024cf8_GH0.tar.gz) = 19034 diff --git a/devel/objecthash/pkg-descr b/devel/objecthash/pkg-descr new file mode 100644 index 00000000000..8473043f67e --- /dev/null +++ b/devel/objecthash/pkg-descr @@ -0,0 +1,4 @@ +Objecthash provides a way to cryptographically hash objects (in the +JSON-ish sense) that works cross-language and therefore cross-encoding. + +WWW: https://github.com/benlaurie/objecthash diff --git a/editors/p5-Padre/Makefile b/editors/p5-Padre/Makefile index 69827f116ce..cd0311de706 100644 --- a/editors/p5-Padre/Makefile +++ b/editors/p5-Padre/Makefile @@ -73,6 +73,8 @@ WX_COMPS= wx WX_UNICODE= yes MAKE_JOBS_UNSAFE= yes +BROKEN_FreeBSD_9= Does not build. + DESKTOP_ENTRIES="Padre" \ "The Perl IDE" \ "${PREFIX}/${SITE_PERL_REL}/auto/share/dist/Padre/icons/padre/64x64/logo.png" \ diff --git a/emulators/i386-wine-devel/Makefile.inc b/emulators/i386-wine-devel/Makefile.inc index 2d0128aa115..e23ab15fe4c 100644 --- a/emulators/i386-wine-devel/Makefile.inc +++ b/emulators/i386-wine-devel/Makefile.inc @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= wine -PORTVERSION= 1.9.3 +PORTVERSION= 1.9.4 PORTEPOCH= 1 CATEGORIES= emulators MASTER_SITES= LOCAL/dbn/repos/wine/${DIST_SUBDIR}/${PORTVERSION} diff --git a/emulators/i386-wine-devel/distinfo b/emulators/i386-wine-devel/distinfo index 6a5389d7570..12762558dbf 100644 --- a/emulators/i386-wine-devel/distinfo +++ b/emulators/i386-wine-devel/distinfo @@ -1,12 +1,12 @@ -SHA256 (freebsd:9:x86:64/i386-wine-devel-1.9.3,1.txz) = cf9ce4c36afa0c6fc9d2431707a08edce4f825ab9b86ca7b35a0314099827aee -SIZE (freebsd:9:x86:64/i386-wine-devel-1.9.3,1.txz) = 38827748 -SHA256 (freebsd:9:x86:64/i386-wine-staging-1.9.3,1.txz) = 303c025810340d19496fe0191a6a762b1e85da8c30e87a2cf2b2dcf2923dbfe8 -SIZE (freebsd:9:x86:64/i386-wine-staging-1.9.3,1.txz) = 41332992 -SHA256 (freebsd:10:x86:64/i386-wine-devel-1.9.3,1.txz) = 2cbc0d10e385785f78245939cb4e9fae56c56c9393722e84ddcc832840d151d0 -SIZE (freebsd:10:x86:64/i386-wine-devel-1.9.3,1.txz) = 35702552 -SHA256 (freebsd:10:x86:64/i386-wine-staging-1.9.3,1.txz) = f30dbb6bdbec6eaa490697f4344e157b6ebf4e695f74c88a5dde436b1e4746f3 -SIZE (freebsd:10:x86:64/i386-wine-staging-1.9.3,1.txz) = 38199212 -SHA256 (freebsd:11:x86:64/i386-wine-devel-1.9.3,1.txz) = 8529e0c5267cf5a783b4946244160bb813386ef3962206cbcbc6d172e052ad4b -SIZE (freebsd:11:x86:64/i386-wine-devel-1.9.3,1.txz) = 35134256 -SHA256 (freebsd:11:x86:64/i386-wine-staging-1.9.3,1.txz) = 5e01310c26159de41585d3d16a11bbd1202bbb48042420146de93d075d80cd15 -SIZE (freebsd:11:x86:64/i386-wine-staging-1.9.3,1.txz) = 37601904 +SHA256 (freebsd:9:x86:64/i386-wine-devel-1.9.4,1.txz) = 831b00a3710db6836e8b63f219e36f95d32beaf21551c87177c005056cedddf6 +SIZE (freebsd:9:x86:64/i386-wine-devel-1.9.4,1.txz) = 38868156 +SHA256 (freebsd:9:x86:64/i386-wine-staging-1.9.4,1.txz) = 896cf78dbaf1625c8c110892c5ab9fd1651c07d8b649087a72c3f455baeb6a39 +SIZE (freebsd:9:x86:64/i386-wine-staging-1.9.4,1.txz) = 41361488 +SHA256 (freebsd:10:x86:64/i386-wine-devel-1.9.4,1.txz) = ea90c4748bbe6a85c78d79a246538897fea39fec35a7990c4833fb31c7634dc9 +SIZE (freebsd:10:x86:64/i386-wine-devel-1.9.4,1.txz) = 35730052 +SHA256 (freebsd:10:x86:64/i386-wine-staging-1.9.4,1.txz) = cbd77375af118cb841713f547a5d067c89c2ad35e8b360c0bc0b7e20ef224cdf +SIZE (freebsd:10:x86:64/i386-wine-staging-1.9.4,1.txz) = 38213248 +SHA256 (freebsd:11:x86:64/i386-wine-devel-1.9.4,1.txz) = 37aa3bf9feed67cbcc524f60fc32299541b79c1093dc919ca622d5490eae6fbd +SIZE (freebsd:11:x86:64/i386-wine-devel-1.9.4,1.txz) = 35149924 +SHA256 (freebsd:11:x86:64/i386-wine-staging-1.9.4,1.txz) = dea04502299e00359f9b095e1e99fd8fb4bac133ac7f15e7f429030a468240bf +SIZE (freebsd:11:x86:64/i386-wine-staging-1.9.4,1.txz) = 37615832 diff --git a/emulators/i386-wine-devel/pkg-plist b/emulators/i386-wine-devel/pkg-plist index 4f31357849f..e09f511df65 100644 --- a/emulators/i386-wine-devel/pkg-plist +++ b/emulators/i386-wine-devel/pkg-plist @@ -163,6 +163,7 @@ include/wine/windows/cierror.h include/wine/windows/clusapi.h include/wine/windows/cmdbas.idl include/wine/windows/cmdtxt.idl +include/wine/windows/colinf.idl include/wine/windows/comcat.h include/wine/windows/comcat.idl include/wine/windows/commctrl.h @@ -344,6 +345,8 @@ include/wine/windows/dwrite_1.h include/wine/windows/dwrite_1.idl include/wine/windows/dwrite_2.h include/wine/windows/dwrite_2.idl +include/wine/windows/dwrite_3.h +include/wine/windows/dwrite_3.idl include/wine/windows/dxdiag.h include/wine/windows/dxerr8.h include/wine/windows/dxerr9.h @@ -834,6 +837,7 @@ include/wine/windows/wintrust.h include/wine/windows/winuser.h include/wine/windows/winuser.rh include/wine/windows/winver.h +include/wine/windows/wlanapi.h include/wine/windows/wmistr.h include/wine/windows/wmiutils.h include/wine/windows/wmiutils.idl @@ -967,6 +971,7 @@ lib32/wine/api-ms-win-core-kernel32-legacy-l1-1-0.dll.so lib32/wine/api-ms-win-core-libraryloader-l1-1-0.dll.so lib32/wine/api-ms-win-core-libraryloader-l1-1-1.dll.so %%STAGING%%lib32/wine/api-ms-win-core-libraryloader-l1-2-0.dll.so +lib32/wine/api-ms-win-core-localization-l1-1-0.dll.so lib32/wine/api-ms-win-core-localization-l1-2-0.dll.so lib32/wine/api-ms-win-core-localization-l1-2-1.dll.so lib32/wine/api-ms-win-core-localization-obsolete-l1-1-0.dll.so @@ -1256,6 +1261,7 @@ lib32/wine/fakedlls/api-ms-win-core-kernel32-legacy-l1-1-0.dll lib32/wine/fakedlls/api-ms-win-core-libraryloader-l1-1-0.dll lib32/wine/fakedlls/api-ms-win-core-libraryloader-l1-1-1.dll %%STAGING%%lib32/wine/fakedlls/api-ms-win-core-libraryloader-l1-2-0.dll +lib32/wine/fakedlls/api-ms-win-core-localization-l1-1-0.dll lib32/wine/fakedlls/api-ms-win-core-localization-l1-2-0.dll lib32/wine/fakedlls/api-ms-win-core-localization-l1-2-1.dll lib32/wine/fakedlls/api-ms-win-core-localization-obsolete-l1-1-0.dll @@ -1530,6 +1536,7 @@ lib32/wine/fakedlls/hlink.dll lib32/wine/fakedlls/hnetcfg.dll lib32/wine/fakedlls/hostname.exe lib32/wine/fakedlls/httpapi.dll +lib32/wine/fakedlls/icacls.exe lib32/wine/fakedlls/iccvid.dll lib32/wine/fakedlls/icinfo.exe lib32/wine/fakedlls/icmp.dll @@ -1775,6 +1782,7 @@ lib32/wine/fakedlls/shell.dll16 lib32/wine/fakedlls/shell32.dll lib32/wine/fakedlls/shfolder.dll lib32/wine/fakedlls/shlwapi.dll +%%STAGING%%lib32/wine/fakedlls/shutdown.exe lib32/wine/fakedlls/slbcsp.dll lib32/wine/fakedlls/slc.dll lib32/wine/fakedlls/snmpapi.dll @@ -1946,6 +1954,7 @@ lib32/wine/hlink.dll.so lib32/wine/hnetcfg.dll.so lib32/wine/hostname.exe.so lib32/wine/httpapi.dll.so +lib32/wine/icacls.exe.so lib32/wine/iccvid.dll.so lib32/wine/icinfo.exe.so lib32/wine/icmp.dll.so @@ -2376,6 +2385,7 @@ lib32/wine/shell.dll16.so lib32/wine/shell32.dll.so lib32/wine/shfolder.dll.so lib32/wine/shlwapi.dll.so +%%STAGING%%lib32/wine/shutdown.exe.so lib32/wine/slbcsp.dll.so lib32/wine/slc.dll.so lib32/wine/snmpapi.dll.so diff --git a/finance/frontaccounting/Makefile b/finance/frontaccounting/Makefile index 9d524e618e2..5b55b9ae819 100644 --- a/finance/frontaccounting/Makefile +++ b/finance/frontaccounting/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= frontaccounting -DISTVERSION= 2.3.24 -PORTREVISION= 1 +DISTVERSION= 2.3.25 CATEGORIES= finance www MASTER_SITES= SF/${PORTNAME}/FrontAccounting-2.3/${PORTVERSION} @@ -22,11 +21,13 @@ NO_BUILD= yes SUB_FILES= pkg-deinstall pkg-message PORTDOCSARGS= -OPTIONS_DEFINE= APACHE LIGHTTPD MYSQL_SERVER NLS DOCS +OPTIONS_DEFINE= APACHE LIGHTTPD NGINX MYSQL_SERVER NLS DOCS OPTIONS_DEFAULT= APACHE MYSQL_SERVER MYSQL_SERVER_DESC= MySQL server support +NGINX_DESC= NGINX web server LIGHTTPD_RUN_DEPENDS= lighttpd:${PORTSDIR}/www/lighttpd +NGINX_RUN_DEPENDS= nginx:${PORTSDIR}/www/nginx MYSQL_SERVER_USE= MYSQL=server APACHE_USE= APACHE_RUN=22+ NLS_USES= gettext @@ -37,12 +38,16 @@ NLS_USES= gettext WANT_PHP_WEB=yes .endif -.if !${PORT_OPTIONS:MDOCS} -PORTDOCSARGS= '-not -path "./doc*"' +.if ${PORT_OPTIONS:MLIGHTTPD} +WANT_PHP_WEB=yes .endif -.if !${PORT_OPTIONS:MMYSQL_SERVER} -USE_MYSQL= client +.if ${PORT_OPTIONS:MNGINX} +WANT_PHP_WEB=yes +.endif + +.if !${PORT_OPTIONS:MDOCS} +PORTDOCSARGS= '-not -path "./doc*"' .endif do-install: diff --git a/finance/frontaccounting/distinfo b/finance/frontaccounting/distinfo index d50f1ed538d..80c3369d163 100644 --- a/finance/frontaccounting/distinfo +++ b/finance/frontaccounting/distinfo @@ -1,2 +1,2 @@ -SHA256 (frontaccounting-2.3.24.tar.gz) = a88a460deee9216c23705cfe95c4e5a37adfd9ecfb31f0c5341b18d66959094a -SIZE (frontaccounting-2.3.24.tar.gz) = 1277783 +SHA256 (frontaccounting-2.3.25.tar.gz) = 160bd230a0b3ec08869bed4ccaaad7e0f60abfe07e2d21be61ae6b17e2a47644 +SIZE (frontaccounting-2.3.25.tar.gz) = 1274390 diff --git a/games/pioneer/Makefile b/games/pioneer/Makefile index b92ac98f319..c8173f95530 100644 --- a/games/pioneer/Makefile +++ b/games/pioneer/Makefile @@ -38,7 +38,7 @@ LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl \ USE_GITHUB= yes GH_ACCOUNT= pioneerspacesim -GH_TAGNAME= 20151130 +GH_TAGNAME= 20160225 USES= autoreconf gmake pkgconfig USE_GL= gl diff --git a/games/pioneer/distinfo b/games/pioneer/distinfo index f5eef4e0023..587f395d7eb 100644 --- a/games/pioneer/distinfo +++ b/games/pioneer/distinfo @@ -1,2 +1,2 @@ -SHA256 (pioneerspacesim-pioneer-0.0.20151130-20151130_GH0.tar.gz) = 4dd090a2dea4655bc0726d817fc9079ed1ed18d1845be458db494d55f1949c9a -SIZE (pioneerspacesim-pioneer-0.0.20151130-20151130_GH0.tar.gz) = 187036861 +SHA256 (pioneerspacesim-pioneer-0.0.20160225-20160225_GH0.tar.gz) = bcecb8c1c1a448ac76c8890be24d8758d22604be64c8f9b771bf8d3aefcbd8b2 +SIZE (pioneerspacesim-pioneer-0.0.20160225-20160225_GH0.tar.gz) = 187185912 diff --git a/games/pioneer/files/patch-src_posix_OSPosix.cpp b/games/pioneer/files/patch-src_posix_OSPosix.cpp deleted file mode 100644 index e772165e346..00000000000 --- a/games/pioneer/files/patch-src_posix_OSPosix.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/posix/OSPosix.cpp.orig 2015-06-07 21:44:10 UTC -+++ src/posix/OSPosix.cpp -@@ -107,7 +107,7 @@ - } - - char infoString[2048]; --#if defined(__APPLE__) -+#if !defined(__linux__) - snprintf(infoString, 2048, "System Name: %s\nHost Name: %s\nRelease(Kernel) Version: %s\nKernel Build Timestamp: %s\nMachine Arch: %s\n", - uts.sysname, uts.nodename, uts.release, uts.version, uts.machine); - #else diff --git a/german/webalizer2/Makefile b/german/webalizer2/Makefile index 7952c688401..7b1d3e0ccda 100644 --- a/german/webalizer2/Makefile +++ b/german/webalizer2/Makefile @@ -7,8 +7,4 @@ MAINTAINER= dinoex@FreeBSD.org MASTERDIR?= ${.CURDIR}/../../www/webalizer WEBALIZER_LANG= german -.if exists(${.CURDIR}/Makefile.local) -.include "${.CURDIR}/Makefile.local" -.endif - .include "${MASTERDIR}/Makefile" diff --git a/graphics/Makefile b/graphics/Makefile index 6694e1a0b2f..695933f7cbb 100644 --- a/graphics/Makefile +++ b/graphics/Makefile @@ -172,6 +172,7 @@ SUBDIR += exiftran SUBDIR += exiv2 SUBDIR += exrtools + SUBDIR += farbfeld SUBDIR += feh SUBDIR += ffff SUBDIR += fig2sxd diff --git a/graphics/farbfeld/Makefile b/graphics/farbfeld/Makefile new file mode 100644 index 00000000000..aaeb75aaad6 --- /dev/null +++ b/graphics/farbfeld/Makefile @@ -0,0 +1,18 @@ +# $FreeBSD$ + +PORTNAME= farbfeld +PORTVERSION= 1 +CATEGORIES= graphics +MASTER_SITES= http://dl.suckless.org/farbfeld/ + +MAINTAINER= aaron@baugher.biz +COMMENT= Lossless, uncompressed graphics format + +LICENSE= ISCL +LICENSE_FILE= ${WRKSRC}/LICENSE + +LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png + +USES= jpeg + +.include diff --git a/graphics/farbfeld/distinfo b/graphics/farbfeld/distinfo new file mode 100644 index 00000000000..f339ea8e327 --- /dev/null +++ b/graphics/farbfeld/distinfo @@ -0,0 +1,2 @@ +SHA256 (farbfeld-1.tar.gz) = 34faf878ee9bf20a690604b2e09f97ce517b20bb7b5e37433997941825c0b46e +SIZE (farbfeld-1.tar.gz) = 6770 diff --git a/graphics/farbfeld/files/patch-config.mk b/graphics/farbfeld/files/patch-config.mk new file mode 100644 index 00000000000..f07e9b4f4f6 --- /dev/null +++ b/graphics/farbfeld/files/patch-config.mk @@ -0,0 +1,13 @@ +--- config.mk.orig 2016-02-19 12:59:50.769556000 -0600 ++++ config.mk 2016-02-19 12:56:15.846580000 -0600 +@@ -18,8 +18,8 @@ + + # flags + CPPFLAGS = -D_DEFAULT_SOURCE +-CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS} ++CFLAGS += -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS} + LDFLAGS = -s ${LIBS} + + # compiler and linker +-CC = cc ++CC ?= cc diff --git a/graphics/farbfeld/pkg-descr b/graphics/farbfeld/pkg-descr new file mode 100644 index 00000000000..f8c594e2f05 --- /dev/null +++ b/graphics/farbfeld/pkg-descr @@ -0,0 +1,4 @@ +Farbfeld is a lossless image format which is easy to parse, pipe and +compress. + +WWW: http://tools.suckless.org/farbfeld/ diff --git a/graphics/farbfeld/pkg-plist b/graphics/farbfeld/pkg-plist new file mode 100644 index 00000000000..9c5b13d8ef8 --- /dev/null +++ b/graphics/farbfeld/pkg-plist @@ -0,0 +1,9 @@ +bin/2ff +bin/ff2png +bin/jpg2ff +bin/png2ff +man/man1/2ff.1.gz +man/man1/ff2png.1.gz +man/man1/jpg2ff.1.gz +man/man1/png2ff.1.gz +man/man5/farbfeld.5.gz diff --git a/japanese/today/Makefile b/japanese/today/Makefile index c31588e09ba..a4e458aa8c4 100644 --- a/japanese/today/Makefile +++ b/japanese/today/Makefile @@ -3,7 +3,7 @@ PORTNAME= today PORTVERSION= 2.12 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= japanese games MASTER_SITES= http://ftp.vector.co.jp/29/42/476/ DISTNAME= ja-${PORTNAME}-${PORTVERSION} @@ -32,7 +32,7 @@ post-extract: gengo.tbl hist??.tbl history.tbl holiday.tbl magazine.tbl \ monthly.tbl schedule.tbl suffix.tbl week.tbl; \ do \ - ${SED} 's/.$$//' $$i | nkf -Se > $$i.tmp ;\ + nkf -Se $$i | ${TR} -d '\015' > $$i.tmp ;\ ${MV} -f $$i.tmp $$i ; \ done) diff --git a/japanese/webalizer/Makefile b/japanese/webalizer/Makefile index 19d7a1bcc43..175936d4f1f 100644 --- a/japanese/webalizer/Makefile +++ b/japanese/webalizer/Makefile @@ -7,8 +7,4 @@ MAINTAINER= dinoex@FreeBSD.org WEBALIZER_LANG= japanese MASTERDIR?= ${.CURDIR}/../../www/webalizer -.if exists(${.CURDIR}/Makefile.local) -.include "${.CURDIR}/Makefile.local" -.endif - .include "${MASTERDIR}/Makefile" diff --git a/lang/dmd2/Makefile b/lang/dmd2/Makefile index 592bb9e7978..227cfff0547 100644 --- a/lang/dmd2/Makefile +++ b/lang/dmd2/Makefile @@ -3,8 +3,7 @@ PORTNAME= dmd PKGNAMESUFFIX= 2 -PORTVERSION= 2.070.0 -PORTREVISION= 2 +PORTVERSION= 2.070.1 CATEGORIES= lang MASTER_SITES= http://ftp.digitalmars.com/ DISTNAME= dmd.${PORTVERSION} diff --git a/lang/dmd2/distinfo b/lang/dmd2/distinfo index 45c71e89734..82326f1b12b 100644 --- a/lang/dmd2/distinfo +++ b/lang/dmd2/distinfo @@ -1,4 +1,4 @@ -SHA256 (dmd.2.070.0.zip) = 190e1f3ad3ac431011e4fa33e6fd8e6f75de000d0268c0e9ca673e947057a341 -SIZE (dmd.2.070.0.zip) = 82346338 +SHA256 (dmd.2.070.1.zip) = 66d5c32324aa2972287be0bacd9f2bc6f9b9550e2199208baf3d0654c5163bd2 +SIZE (dmd.2.070.1.zip) = 82343491 SHA256 (dmd.2.067.1.zip) = 24fd32d3b1401309187a3fcd235014e38c651beb3af29b0e656f6f4add4ec95b SIZE (dmd.2.067.1.zip) = 56083735 diff --git a/mail/Makefile b/mail/Makefile index 23c35e44505..6a9554a4fef 100644 --- a/mail/Makefile +++ b/mail/Makefile @@ -497,6 +497,8 @@ SUBDIR += postfix-policyd-weight SUBDIR += postfix-postfwd SUBDIR += postfix-sasl + SUBDIR += postfix211 + SUBDIR += postfix211-sasl SUBDIR += postfixadmin SUBDIR += postgrey SUBDIR += postsrsd diff --git a/mail/popa3d-before-sendmail/Makefile b/mail/popa3d-before-sendmail/Makefile index 6e5efc55447..ae715be1bca 100644 --- a/mail/popa3d-before-sendmail/Makefile +++ b/mail/popa3d-before-sendmail/Makefile @@ -9,8 +9,4 @@ MASTERDIR?= ${.CURDIR}/../popa3d OPTIONS_DEFAULT= SMTP_AFTER_POP3 -.if exists(${.CURDIR}/Makefile.local) -.include "${.CURDIR}/Makefile.local" -.endif - .include "${MASTERDIR}/Makefile" diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile index e217a41029f..bb839efb685 100644 --- a/mail/postfix-current/Makefile +++ b/mail/postfix-current/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= postfix -DISTVERSION= 3.0-20160204 +DISTVERSION= 3.2-20160224 PORTEPOCH= 4 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/ \ @@ -11,10 +11,8 @@ MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/ \ http://www.artfiles.org/postfix.org/postfix-release/ \ http://mirror.lhsolutions.nl/postfix-release/ \ ftp://postfix.mirrors.pair.com/ -#MASTER_SITES:= ${MASTER_SITES:S|$|experimental/|} -MASTER_SITES:= ${MASTER_SITES:S|$|official/|} +MASTER_SITES:= ${MASTER_SITES:S|$|experimental/|} PKGNAMESUFFIX?= -current -DISTNAME= ${PORTNAME}-3.0.4 DIST_SUBDIR= ${PORTNAME} MAINTAINER= ohauer@FreeBSD.org @@ -33,17 +31,16 @@ CONFLICTS_INSTALL?= courier-0.* opensmtpd-[0-9]* \ USERS= postfix GROUPS= mail maildrop postfix -USES= perl5 shebangfix cpe +USES= shebangfix cpe SHEBANG_FILES= auxiliary/qshape/qshape.pl USE_RC_SUBR= postfix USE_SUBMAKE= yes -USE_PERL5= build SCRIPTS_ENV+= POSTFIX_DEFAULT_MTA="${POSTFIX_DEFAULT_MTA}" OPTIONS_SUB= yes OPTIONS_DEFINE= BDB CDB DOCS INST_BASE LDAP LDAP_SASL LMDB MYSQL \ - NIS PCRE PGSQL SASL SQLITE TEST TLS VDA + NIS PCRE PGSQL SASL SQLITE TEST TLS OPTIONS_RADIO= RG1 OPTIONS_RADIO_RG1= SASLKRB5 SASLKMIT @@ -67,7 +64,6 @@ LDAP_DESC= LDAP maps (uses WITH_OPENLDAP_VER) LDAP_SASL_DESC= LDAP client-to-server SASL auth LMDB_DESC= LMDB maps TEST_DESC= SMTP/LMTP test server and generator -VDA_DESC= VDA (Virtual Delivery Agent) SASL_DESC= Cyrus SASL support (Dovecot SASL is always built in) RG1_DESC= Kerberos network authentication protocol type @@ -83,13 +79,6 @@ STRIP_LIBEXEC= anvil bounce cleanup discard dnsblog error flush lmtp local maste nqmgr oqmgr pickup pipe postscreen proxymap qmgr qmqpd scache showq \ smtp smtpd spawn tlsmgr tlsproxy trivial-rewrite verify virtual -.if !defined(BATCH) && !defined(PACKAGE_BUILDING) && exists(/etc/mail/mailer.conf) -OLD_MAILER!= ${GREP} -m 1 '^purgestat' /etc/mail/mailer.conf || ${ECHO_CMD} -.if !empty(OLD_MAILER) -IS_INTERACTIVE= yes -.endif -.endif - .if !defined(DEBUG) MAKEFILEFLAGS+= DEBUG= .endif @@ -248,10 +237,6 @@ POSTFIX_CCARGS+= -DHAS_NIS _REQUIRE+= ypserv .endif -.if ${PORT_OPTIONS:MVDA} -BROKEN= At the moment, VDA support is unavailable for ${PORTNAME}-${DISTVERSION} -.endif - .if ${PORT_OPTIONS:MTEST} BINTEST= qmqp-sink qmqp-source smtp-sink smtp-source MANTEST= qmqp-sink.1 qmqp-source.1 smtp-sink.1 smtp-source.1 @@ -295,8 +280,6 @@ pre-patch: @${ECHO} 'See header_checks.5.html' \ > ${WRKSRC}/html/body_checks.5.html - @${REINPLACE_CMD} -E -e 's![[:<:]]perl[[:>:]]!${PERL}!' \ - ${WRKSRC}/src/bounce/Makefile.in @${REINPLACE_CMD} -E -e 's!^(#define DEF_SGID_GROUP[^"]+)"postdrop"$$!\1"maildrop"!' \ ${WRKSRC}/src/global/mail_params.h @${FIND} -X ${WRKSRC}/README_FILES ${WRKSRC}/conf ${WRKSRC}/man \ diff --git a/mail/postfix-current/distinfo b/mail/postfix-current/distinfo index 0eef7462177..a8d212dacc8 100644 --- a/mail/postfix-current/distinfo +++ b/mail/postfix-current/distinfo @@ -1,2 +1,2 @@ -SHA256 (postfix/postfix-3.0.4.tar.gz) = b81ce81176b9df7183ad99b9c98000135f5e88e659493ab50db5d9fe5b8dba0e -SIZE (postfix/postfix-3.0.4.tar.gz) = 4240805 +SHA256 (postfix/postfix-3.2-20160224.tar.gz) = e64094c6adceff25ce069e464b67bffcc1cafe60b65d58202030fe7335ae83b9 +SIZE (postfix/postfix-3.2-20160224.tar.gz) = 4329124 diff --git a/mail/postfix-current/pkg-plist b/mail/postfix-current/pkg-plist index cb14c96687b..319a29d3b66 100644 --- a/mail/postfix-current/pkg-plist +++ b/mail/postfix-current/pkg-plist @@ -59,6 +59,7 @@ libexec/postfix/postfix-files %%PGSQL%%libexec/postfix/postfix-files.d/pgsql-files %%SQLITE%%libexec/postfix/postfix-files.d/sqlite-files libexec/postfix/postfix-script +libexec/postfix/postfix-tls-script libexec/postfix/postfix-wrapper libexec/postfix/postmulti-script libexec/postfix/postscreen @@ -81,6 +82,7 @@ libexec/postfix/virtual %%BMAN%%man/man1/postcat.1.gz %%BMAN%%man/man1/postconf.1.gz %%BMAN%%man/man1/postdrop.1.gz +%%BMAN%%man/man1/postfix-tls.1.gz %%BMAN%%man/man1/postfix.1.gz %%BMAN%%man/man1/postkick.1.gz %%BMAN%%man/man1/postlock.1.gz diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile index bdc5c275e92..8e514f56894 100644 --- a/mail/postfix/Makefile +++ b/mail/postfix/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= postfix -PORTVERSION= 2.11.7 -PORTREVISION= 2 +PORTVERSION= 3.1.0 PORTEPOCH= 1 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/ \ @@ -23,26 +22,26 @@ LICENSE_NAME= IBM PUBLIC LICENSE VERSION 1.0 LICENSE_FILE= ${WRKSRC}/LICENSE LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -PORTSCOUT= limit:^2\.11\. +LIB_DEPENDS= libicuuc.so:${PORTSDIR}/devel/icu + +PORTSCOUT= limit:^3\.1\. -VDAVERSION= 2.10.0 CONFLICTS_INSTALL?= courier-0.* opensmtpd-[0-9]* \ sendmail-8.* sendmail+*-8.* smail-3.* zmailer-2.* \ - postfix2?-* postfix-3.* postfix-current-* + postfix-2.* postfix-base-2.* postfix21?-* postfix-current-* USERS= postfix GROUPS= mail maildrop postfix -USES= perl5 shebangfix cpe +USES= shebangfix cpe SHEBANG_FILES= auxiliary/qshape/qshape.pl USE_RC_SUBR= postfix USE_SUBMAKE= yes -USE_PERL5= build SCRIPTS_ENV+= POSTFIX_DEFAULT_MTA="${POSTFIX_DEFAULT_MTA}" OPTIONS_SUB= yes OPTIONS_DEFINE= BDB CDB DOCS INST_BASE LDAP LDAP_SASL LMDB MYSQL \ - NIS PCRE PGSQL SASL SPF SQLITE TEST TLS VDA + NIS PCRE PGSQL SASL SQLITE TEST TLS OPTIONS_RADIO= RG1 OPTIONS_RADIO_RG1= SASLKRB5 SASLKMIT @@ -57,7 +56,6 @@ PCRE_LIB_DEPENDS= libpcre.so:${PORTSDIR}/devel/pcre PGSQL_USES= pgsql SASLKMIT_LIB_DEPENDS= libkrb5.so:${PORTSDIR}/security/krb5 SASL_LIB_DEPENDS= libsasl2.so:${PORTSDIR}/security/cyrus-sasl2 -SPF_LIB_DEPENDS= libspf2.so:${PORTSDIR}/mail/libspf2 SQLITE_USES= sqlite TLS_USE= OPENSSL=yes @@ -66,9 +64,7 @@ INST_BASE_DESC= Install into /usr and /etc/postfix LDAP_DESC= LDAP maps (uses WITH_OPENLDAP_VER) LDAP_SASL_DESC= LDAP client-to-server SASL auth LMDB_DESC= LMDB maps -SPF_DESC= SPF support (via libspf2 1.2.x) TEST_DESC= SMTP/LMTP test server and generator -VDA_DESC= VDA (Virtual Delivery Agent) SASL_DESC= Cyrus SASL support (Dovecot SASL is always built in) RG1_DESC= Kerberos network authentication protocol type @@ -84,18 +80,11 @@ STRIP_LIBEXEC= anvil bounce cleanup discard dnsblog error flush lmtp local maste nqmgr oqmgr pickup pipe postscreen proxymap qmgr qmqpd scache showq \ smtp smtpd spawn tlsmgr tlsproxy trivial-rewrite verify virtual -.if !defined(BATCH) && !defined(PACKAGE_BUILDING) && exists(/etc/mail/mailer.conf) -OLD_MAILER!= ${GREP} -m 1 '^purgestat' /etc/mail/mailer.conf || ${ECHO_CMD} -.if !empty(OLD_MAILER) -IS_INTERACTIVE= yes -.endif -.endif - .if !defined(DEBUG) MAKEFILEFLAGS+= DEBUG= .endif -MAKEFILEFLAGS+= CC="${CC}" OPT="${CFLAGS}" +MAKEFILEFLAGS+= pie=yes CC="${CC}" OPT="${CFLAGS}" .if ${PORT_OPTIONS:MINST_BASE} .if defined(SASL_SLAVE) @@ -114,7 +103,7 @@ PLIST_SUB+= PFETC=${ETCDIR} # check if mailwrapper supports $LOCALBASE .if ${OPSYS} == FreeBSD && (${OSVERSION} >= 1002506 || ${OSVERSION} >= 1100094) -SUB_LIST+= USE_LOCALBASE_MAILER_CONF="yes" MC_PREFIX=${LOCALBASE} +SUB_LIST+= USE_LOCALBASE_MAILER_CONF="yes" MC_PREFIX="${LOCALBASE}" .else SUB_LIST+= USE_LOCALBASE_MAILER_CONF="no" MC_PREFIX="" .endif @@ -126,14 +115,20 @@ READMEDIR= ${DOCSDIR} READMEDIR= no .endif +# dynamic direcory location DAEMONDIR= ${PREFIX}/libexec/postfix +SHLIB_DIRECTORY=${PREFIX}/lib/postfix +# new proposed location is ETCDIR (see README_FILES/INSTALL) +# keep compatiblity with Postfix 2.6 .. 2.11 and use DAEMOMDIR +META_DIRECTORY= ${DAEMONDIR} SUB_LIST+= REQUIRE="${_REQUIRE}" READMEDIR="${READMEDIR}" \ - DAEMONDIR="${DAEMONDIR}" + DAEMONDIR="${DAEMONDIR}" META_DIRECTORY="${META_DIRECTORY}" SUB_FILES+= pkg-install pkg-message mailer.conf.postfix POSTFIX_CCARGS+= -DDEF_CONFIG_DIR=\\\"${ETCDIR}\\\" \ -DDEF_DAEMON_DIR=\\\"${DAEMONDIR}\\\" \ + -DDEF_META_DIR=\\\"${META_DIRECTORY}\\\" \ -DDEF_COMMAND_DIR=\\\"${PREFIX}/sbin\\\" \ -DDEF_SENDMAIL_PATH=\\\"${PREFIX}/sbin/sendmail\\\" \ -DDEF_NEWALIAS_PATH=\\\"${PREFIX}/bin/newaliases\\\" \ @@ -150,13 +145,19 @@ POSTFIX_CCARGS+= -DDEF_CONFIG_DIR=\\\"${ETCDIR}\\\" \ # Default requirement for postfix rc script _REQUIRE= LOGIN cleanvar dovecot -# Always build with Dovecot SASL support, Cyrus is optional +# always build with Dovecot SASL support, Cyrus is optional # see Postfix HISTORY 20051222 POSTFIX_CCARGS+= -DUSE_SASL_AUTH +# Email Address Internationalization (EAI, RFC 6531..6533) +# This is now mandantory! +POSTFIX_CCARGS+= -DHAS_EAI -I${LOCALBASE}/include +POSTFIX_AUXLIBS+= -L${LOCALBASE}/lib -licuuc + .if ${PORT_OPTIONS:MPCRE} +DYN_EXT+= pcre POSTFIX_CCARGS+= -DHAS_PCRE -I${LOCALBASE}/include -POSTFIX_AUXLIBS+= -L${LOCALBASE}/lib -lpcre +POSTFIX_DYN_AUXLIBS+= "AUXLIBS_PCRE=`${LOCALBASE}/bin/pcre-config --libs`" .else POSTFIX_CCARGS+= -DNO_PCRE .endif @@ -178,47 +179,44 @@ POSTFIX_AUXLIBS+= -Wl,--rpath,$${KRB5_HOME:-${LOCALBASE}}/lib -lkrb5 -lcrypto -l .if ${PORT_OPTIONS:MTLS} POSTFIX_CCARGS+= -DUSE_TLS -I${OPENSSLINC} +# XXX LDFLAGS possible breaks dynamic building POSTFIX_AUXLIBS+= -L${OPENSSLLIB} ${LDFLAGS} -lssl -lcrypto .else POSTFIX_CCARGS+= -DNO_TLS .endif -.if ${PORT_OPTIONS:MSPF} -PATCH_SITES+= LOCAL/mm -PATCHFILES+= postfix-2.8.0-libspf2-1.2.x-0.patch.gz:-p1 -POSTFIX_CCARGS+= -DHAVE_NS_TYPE -DHAS_SPF -I${LOCALBASE}/include -POSTFIX_AUXLIBS+= -L${LOCALBASE}/lib -lspf2 -.endif - .if ${PORT_OPTIONS:MBDB} -INVALID_BDB_VER= 6 POSTFIX_CCARGS+= -I${BDB_INCLUDE_DIR} POSTFIX_AUXLIBS+= -L${BDB_LIB_DIR} -l${BDB_LIB_NAME} .endif .if ${PORT_OPTIONS:MMYSQL} +DYN_EXT+= mysql POSTFIX_CCARGS+= -DHAS_MYSQL -I${LOCALBASE}/include/mysql -POSTFIX_AUXLIBS+= -L${LOCALBASE}/lib/mysql -lmysqlclient -lz -lcrypt -lm +POSTFIX_DYN_AUXLIBS+= "AUXLIBS_MYSQL=-L${LOCALBASE}/lib/mysql -lmysqlclient -lz -lm" _REQUIRE+= mysql .endif .if ${PORT_OPTIONS:MPGSQL} -POSTFIX_CCARGS+= -DHAS_PGSQL -I${LOCALBASE}/include -I${LOCALBASE}/pgsql/include -POSTFIX_AUXLIBS+= -L${LOCALBASE}/lib -L${LOCALBASE}/pgsql/lib -lpq -lcrypt +DYN_EXT+= pgsql +POSTFIX_CCARGS+= -DHAS_PGSQL -I${LOCALBASE}/include +POSTFIX_DYN_AUXLIBS+= "AUXLIBS_PGSQL=-L${LOCALBASE}/lib -lpq" _REQUIRE+= postgresql .endif .if ${PORT_OPTIONS:MSQLITE} +DYN_EXT+= sqlite POSTFIX_CCARGS+= -DHAS_SQLITE -I${LOCALBASE}/include -POSTFIX_AUXLIBS+= -L${LOCALBASE}/lib -lsqlite3 +POSTFIX_DYN_AUXLIBS+= "AUXLIBS_SQLITE=-L${LOCALBASE}/lib -lsqlite3 -lpthread" .endif .if ${PORT_OPTIONS:MLDAP} +DYN_EXT+= ldap . if defined(WITH_OPENLDAP_VER) WANT_OPENLDAP_VER= ${WITH_OPENLDAP_VER} . endif POSTFIX_CCARGS+= -DHAS_LDAP -I${LOCALBASE}/include -POSTFIX_AUXLIBS+= -L${LOCALBASE}/lib -lldap -llber +POSTFIX_DYN_AUXLIBS+= "AUXLIBS_LDAP=-L${LOCALBASE}/lib -lldap -L${LOCALBASE}/lib -llber" _REQUIRE+= slapd . if ${PORT_OPTIONS:MLDAP_SASL} . if ! ${PORT_OPTIONS:MSASL} @@ -230,8 +228,9 @@ POSTFIX_CCARGS+= -I${LOCALBASE}/include/sasl -DUSE_LDAP_SASL .endif .if ${PORT_OPTIONS:MCDB} +DYN_EXT+= cdb POSTFIX_CCARGS+= -DHAS_CDB -I${LOCALBASE}/include -POSTFIX_AUXLIBS+= -L${LOCALBASE}/lib -lcdb +POSTFIX_DYN_AUXLIBS+= "AUXLIBS_CDB=-L${LOCALBASE}/lib -lcdb" .endif .if ${PORT_OPTIONS:MNIS} @@ -239,19 +238,15 @@ POSTFIX_CCARGS+= -DHAS_NIS _REQUIRE+= ypserv .endif -.if ${PORT_OPTIONS:MVDA} -PATCH_SITES+= http://vda.sourceforge.net/VDA/:vda -PATCHFILES+= postfix-vda-v13-${VDAVERSION}.patch:-p1:vda -.endif - .if ${PORT_OPTIONS:MTEST} BINTEST= qmqp-sink qmqp-source smtp-sink smtp-source MANTEST= qmqp-sink.1 qmqp-source.1 smtp-sink.1 smtp-source.1 .endif .if ${PORT_OPTIONS:MLMDB} +DYN_EXT+= lmdb POSTFIX_CCARGS+= -DHAS_LMDB -I${LOCALBASE}/include -POSTFIX_AUXLIBS+= -L${LOCALBASE}/lib -llmdb +POSTFIX_DYN_AUXLIBS+= "AUXLIBS_LMDB=-L${LOCALBASE}/lib -llmdb" .endif # sed script for files in ${WRKSRC}/README_FILES ${WRKSRC}/conf ${WRKSRC}/man @@ -286,8 +281,6 @@ pre-patch: @${ECHO} 'See header_checks.5.html' \ > ${WRKSRC}/html/body_checks.5.html - @${REINPLACE_CMD} -E -e 's![[:<:]]perl[[:>:]]!${PERL}!' \ - ${WRKSRC}/src/bounce/Makefile.in @${REINPLACE_CMD} -E -e 's!^(#define DEF_SGID_GROUP[^"]+)"postdrop"$$!\1"maildrop"!' \ ${WRKSRC}/src/global/mail_params.h @${FIND} -X ${WRKSRC}/README_FILES ${WRKSRC}/conf ${WRKSRC}/man \ @@ -304,21 +297,12 @@ post-patch: @${ECHO} '$$command_directory/posttls-finger:f:root:-:755' \ >> ${WRKSRC}/conf/postfix-files -post-patch-SPF-on: - @${ECHO} '$$readme_directory/SPF_README:f:root:-:644' \ - >> ${WRKSRC}/conf/postfix-files - @${REINPLACE_CMD} -E -e '${REINPLACE}' \ - ${WRKSRC}/README_FILES/SPF_README - -post-patch-VDA-on: - @${ECHO} '$$readme_directory/VDA_README:f:root:-:644' \ - >> ${WRKSRC}/conf/postfix-files - @${REINPLACE_CMD} -E -e '${REINPLACE}' \ - ${WRKSRC}/README_FILES/VDA_README - do-configure: (cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles \ ${MAKEFILEFLAGS} CCARGS="${POSTFIX_CCARGS}" \ + shared=yes shlib_directory=${SHLIB_DIRECTORY} \ + dynamicmaps=yes \ + ${POSTFIX_DYN_AUXLIBS} \ AUXLIBS="${POSTFIX_AUXLIBS}" && \ ${ECHO} "all: default" >> Makefile) @@ -328,9 +312,11 @@ pre-install-INST_BASE-on: do-install: @(cd ${WRKSRC} && ${MAKE} non-interactive-package \ install_root=${STAGEDIR} tempdir=${WRKDIR} \ + shlib_directory=${SHLIB_DIRECTORY} \ config_directory=${ETCDIR} \ command_directory=${PREFIX}/sbin \ daemon_directory=${DAEMONDIR} \ + meta_directory=${META_DIRECTORY} \ html_directory=${READMEDIR} \ mailq_path=${PREFIX}/bin/mailq \ manpage_directory=${MANPREFIX}/man \ @@ -353,9 +339,27 @@ post-stage: ${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKDIR}/mailer.conf.postfix ${STAGEDIR}${DATADIR} +# == chop dynamicmaps.cf entries into dedicated .cf files +# for future sub-packages support +.for f in ${DYN_EXT} +# adjust dynamicmaps.cf + ${GREP} -e "^#" -e "^${f}" ${STAGEDIR}${META_DIRECTORY}/dynamicmaps.cf \ + > ${STAGEDIR}${META_DIRECTORY}/dynamicmaps.cf.d/${f}.cf && \ + ${SED} -i '' -e '/${f}/d' ${STAGEDIR}${META_DIRECTORY}/dynamicmaps.cf + +# adjust / generate postfix-files for dynamic modules + ${SED} -i '' -e '/postfix-${f}.so/d' ${STAGEDIR}${META_DIRECTORY}/postfix-files && \ + ${PRINTF} '# Do not edit this file.\ + \n$$shlib_directory/postfix-${f}.so:f:root:-:755\ + \n$$meta_directory/postfix-files.d/${f}-files:f:root:-:644\ + \n$$meta_directory/dynamicmaps.cf.d/${f}.cf:f:root:-:644\n' \ + > ${STAGEDIR}${META_DIRECTORY}/postfix-files.d/${f}-files +.endfor + # Fix compressed man pages and strip executables - ${SED} -i '' -E -e "s|(man[158]/.*.[158]):|\1.gz:|g" ${STAGEDIR}${DAEMONDIR}/postfix-files + ${SED} -i '' -E -e "s|(man[158]/.*.[158]):|\1.gz:|g" ${STAGEDIR}${META_DIRECTORY}/postfix-files -@${STRIP_CMD} ${STRIP_LIBEXEC:S|^|${STAGEDIR}${DAEMONDIR}/|} -@${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/* + -@${STRIP_CMD} ${STAGEDIR}${SHLIB_DIRECTORY}/*.so .include diff --git a/mail/postfix/distinfo b/mail/postfix/distinfo index 3b8795de141..6281cbb5484 100644 --- a/mail/postfix/distinfo +++ b/mail/postfix/distinfo @@ -1,6 +1,2 @@ -SHA256 (postfix/postfix-2.11.7.tar.gz) = 05828b5b846e48fdc80db67d85409066010614af521070df4733459fbf447e20 -SIZE (postfix/postfix-2.11.7.tar.gz) = 4031689 -SHA256 (postfix/postfix-2.8.0-libspf2-1.2.x-0.patch.gz) = e5c38e5bc226cab109c02a4e530ab1aefd3bb06f2169f3e052bdf83d2727aacc -SIZE (postfix/postfix-2.8.0-libspf2-1.2.x-0.patch.gz) = 8191 -SHA256 (postfix/postfix-vda-v13-2.10.0.patch) = 6208021eb0b37ac6482e334e538ed5700cc22c4d4dd66ed9e975ae5f20bf935f -SIZE (postfix/postfix-vda-v13-2.10.0.patch) = 55701 +SHA256 (postfix/postfix-3.1.0.tar.gz) = 88ac3e92755629077d9363319b1fa0db406efb10c2f22cdbb941bd8ab36fd733 +SIZE (postfix/postfix-3.1.0.tar.gz) = 4336709 diff --git a/mail/postfix/files/patch-makedefs b/mail/postfix/files/patch-makedefs index 56b0c3830fb..1f508a00ba7 100644 --- a/mail/postfix/files/patch-makedefs +++ b/mail/postfix/files/patch-makedefs @@ -1,11 +1,17 @@ ---- makedefs.orig 2015-04-19 10:19:57 UTC +--- makedefs.orig 2015-01-18 00:10:28 UTC +++ makedefs -@@ -161,6 +161,9 @@ case "$SYSTEM.$RELEASE" in - FreeBSD.10*) SYSTYPE=FREEBSD10 - : ${CC=cc} +@@ -235,6 +235,15 @@ case "$SYSTEM.$RELEASE" in + : ${SHLIB_ENV="LD_LIBRARY_PATH=`pwd`/lib"} + : ${PLUGIN_LD="${CC} -shared"} ;; + FreeBSD.11*) SYSTYPE=FREEBSD11 + : ${CC=cc} ++ : ${SHLIB_SUFFIX=.so} ++ : ${SHLIB_CFLAGS=-fPIC} ++ : ${SHLIB_LD="${CC} -shared"' -Wl,-soname,${LIB}'} ++ : ${SHLIB_RPATH='-Wl,-rpath,${SHLIB_DIR}'} ++ : ${SHLIB_ENV="LD_LIBRARY_PATH=`pwd`/lib"} ++ : ${PLUGIN_LD="${CC} -shared"} + ;; DragonFly.*) SYSTYPE=DRAGONFLY ;; diff --git a/mail/postfix/files/pkg-install.in b/mail/postfix/files/pkg-install.in index 73f621e3c93..18710946a34 100644 --- a/mail/postfix/files/pkg-install.in +++ b/mail/postfix/files/pkg-install.in @@ -15,6 +15,7 @@ POSTFIX_DEFAULT_MTA=${POSTFIX_DEFAULT_MTA:=no} PREFIX="%%PREFIX%%" ETCDIR="%%ETCDIR%%" DAEMONDIR="%%DAEMONDIR%%" +META_DIRECTORY="%%META_DIRECTORY%%" READMEDIR="%%READMEDIR%%" MC_TEMPLATE="%%DATADIR%%/mailer.conf.postfix" @@ -149,6 +150,7 @@ fi if [ "$2" = "POST-INSTALL" ]; then /bin/sh ${DAEMONDIR}/post-install tempdir=/tmp \ daemon_directory=${DAEMONDIR} \ + meta_directory=${META_DIRECTORY} \ html_directory=${READMEDIR} \ readme_directory=${READMEDIR} \ upgrade-package diff --git a/mail/postfix/files/pkg-message.in b/mail/postfix/files/pkg-message.in index 6ba40277440..70c7569d08c 100644 --- a/mail/postfix/files/pkg-message.in +++ b/mail/postfix/files/pkg-message.in @@ -21,5 +21,6 @@ the sasldb file. This is accomplished by adding postfix to group mail and making the %%PREFIX%%/etc/sasldb* file(s) readable by group mail (this should be the default for new installs). -If you are upgrading from prior postfix version, review the RELEASE_NOTES to -familiarize yourself with new features and incompatabilities. +If you are upgrading from prior postfix version, please see the README +files for recommended changes to your configuration and additional +http://www.postfix.org/COMPATIBILITY_README.html diff --git a/mail/postfix/pkg-plist b/mail/postfix/pkg-plist index 38c2fcff459..319a29d3b66 100644 --- a/mail/postfix/pkg-plist +++ b/mail/postfix/pkg-plist @@ -11,27 +11,55 @@ bin/rmail %%PFETC%%/bounce.cf.default %%PFETC%%/main.cf.default @sample %%PFETC%%/main.cf.sample -%%PFETC%%/makedefs.out @sample %%PFETC%%/master.cf.sample +lib/postfix/libpostfix-dns.so +lib/postfix/libpostfix-global.so +lib/postfix/libpostfix-master.so +lib/postfix/libpostfix-tls.so +lib/postfix/libpostfix-util.so +%%CDB%%lib/postfix/postfix-cdb.so +%%LDAP%%lib/postfix/postfix-ldap.so +%%LMDB%%lib/postfix/postfix-lmdb.so +%%MYSQL%%lib/postfix/postfix-mysql.so +%%PCRE%%lib/postfix/postfix-pcre.so +%%PGSQL%%lib/postfix/postfix-pgsql.so +%%SQLITE%%lib/postfix/postfix-sqlite.so libexec/postfix/anvil libexec/postfix/bounce libexec/postfix/cleanup libexec/postfix/discard libexec/postfix/dnsblog +libexec/postfix/dynamicmaps.cf +%%CDB%%libexec/postfix/dynamicmaps.cf.d/cdb.cf +%%LDAP%%libexec/postfix/dynamicmaps.cf.d/ldap.cf +%%LMDB%%libexec/postfix/dynamicmaps.cf.d/lmdb.cf +%%MYSQL%%libexec/postfix/dynamicmaps.cf.d/mysql.cf +%%PCRE%%libexec/postfix/dynamicmaps.cf.d/pcre.cf +%%PGSQL%%libexec/postfix/dynamicmaps.cf.d/pgsql.cf +%%SQLITE%%libexec/postfix/dynamicmaps.cf.d/sqlite.cf libexec/postfix/error libexec/postfix/flush libexec/postfix/lmtp libexec/postfix/local -libexec/postfix/main.cf +libexec/postfix/main.cf.proto +libexec/postfix/makedefs.out libexec/postfix/master -libexec/postfix/master.cf +libexec/postfix/master.cf.proto libexec/postfix/nqmgr libexec/postfix/oqmgr libexec/postfix/pickup libexec/postfix/pipe libexec/postfix/post-install libexec/postfix/postfix-files +%%CDB%%libexec/postfix/postfix-files.d/cdb-files +%%LDAP%%libexec/postfix/postfix-files.d/ldap-files +%%LMDB%%libexec/postfix/postfix-files.d/lmdb-files +%%MYSQL%%libexec/postfix/postfix-files.d/mysql-files +%%PCRE%%libexec/postfix/postfix-files.d/pcre-files +%%PGSQL%%libexec/postfix/postfix-files.d/pgsql-files +%%SQLITE%%libexec/postfix/postfix-files.d/sqlite-files libexec/postfix/postfix-script +libexec/postfix/postfix-tls-script libexec/postfix/postfix-wrapper libexec/postfix/postmulti-script libexec/postfix/postscreen @@ -54,6 +82,7 @@ libexec/postfix/virtual %%BMAN%%man/man1/postcat.1.gz %%BMAN%%man/man1/postconf.1.gz %%BMAN%%man/man1/postdrop.1.gz +%%BMAN%%man/man1/postfix-tls.1.gz %%BMAN%%man/man1/postfix.1.gz %%BMAN%%man/man1/postkick.1.gz %%BMAN%%man/man1/postlock.1.gz @@ -138,6 +167,8 @@ sbin/postsuper sbin/posttls-finger sbin/sendmail %%DATADIR%%/mailer.conf.postfix +@dir libexec/postfix/dynamicmaps.cf.d +@dir libexec/postfix/postfix-files.d @dir %%PFETC%% @dir(postfix,,700) /var/db/postfix @dir(postfix,,700) /var/spool/postfix/active diff --git a/mail/postfix211-sasl/Makefile b/mail/postfix211-sasl/Makefile new file mode 100644 index 00000000000..1d868b1b354 --- /dev/null +++ b/mail/postfix211-sasl/Makefile @@ -0,0 +1,14 @@ +# $FreeBSD$ + +PKGNAMESUFFIX?= 211-sasl + +MAINTAINER= ohauer@FreeBSD.org +COMMENT= Postfix with Cyrus SASL support + +MASTERDIR= ${.CURDIR}/../postfix211 + +OPTIONS_SLAVE= SASL + +SASL_SLAVE= yes + +.include "${MASTERDIR}/Makefile" diff --git a/mail/postfix211/Makefile b/mail/postfix211/Makefile new file mode 100644 index 00000000000..756ecea6b13 --- /dev/null +++ b/mail/postfix211/Makefile @@ -0,0 +1,359 @@ +# Created by: Torsten Blum +# $FreeBSD$ + +PORTNAME= postfix +PORTVERSION= 2.11.7 +PORTREVISION= 2 +PORTEPOCH= 1 +CATEGORIES= mail ipv6 +MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/ \ + http://de.postfix.org/ftpmirror/ \ + http://cdn.postfix.johnriley.me/mirrors/postfix-release/ \ + http://www.artfiles.org/postfix.org/postfix-release/ \ + http://mirror.lhsolutions.nl/postfix-release/ \ + ftp://postfix.mirrors.pair.com/ +MASTER_SITES:= ${MASTER_SITES:S|$|official/|} +PKGNAMESUFFIX?= 211 +DIST_SUBDIR= ${PORTNAME} + +MAINTAINER= ohauer@FreeBSD.org +COMMENT= Secure alternative to widely-used Sendmail + +LICENSE= IPL10 +LICENSE_NAME= IBM PUBLIC LICENSE VERSION 1.0 +LICENSE_FILE= ${WRKSRC}/LICENSE +LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept + +PORTSCOUT= limit:^2\.11\. + +VDAVERSION= 2.10.0 +CONFLICTS_INSTALL?= courier-0.* opensmtpd-[0-9]* \ + sendmail-8.* sendmail+*-8.* smail-3.* zmailer-2.* \ + postfix2?-* postfix-3.* postfix-current-* + +USERS= postfix +GROUPS= mail maildrop postfix +USES= shebangfix cpe +SHEBANG_FILES= auxiliary/qshape/qshape.pl + +USE_RC_SUBR= postfix +USE_SUBMAKE= yes +SCRIPTS_ENV+= POSTFIX_DEFAULT_MTA="${POSTFIX_DEFAULT_MTA}" + +OPTIONS_SUB= yes +OPTIONS_DEFINE= BDB CDB DOCS INST_BASE LDAP LDAP_SASL LMDB MYSQL \ + NIS PCRE PGSQL SASL SPF SQLITE TEST TLS VDA + +OPTIONS_RADIO= RG1 +OPTIONS_RADIO_RG1= SASLKRB5 SASLKMIT +OPTIONS_DEFAULT= PCRE TLS + +BDB_USE= BDB=yes +CDB_LIB_DEPENDS= libcdb.so:${PORTSDIR}/databases/tinycdb +LDAP_USE= OPENLDAP=yes +LMDB_LIB_DEPENDS= liblmdb.so:${PORTSDIR}/databases/lmdb +MYSQL_USE= MYSQL=yes +PCRE_LIB_DEPENDS= libpcre.so:${PORTSDIR}/devel/pcre +PGSQL_USES= pgsql +SASLKMIT_LIB_DEPENDS= libkrb5.so:${PORTSDIR}/security/krb5 +SASL_LIB_DEPENDS= libsasl2.so:${PORTSDIR}/security/cyrus-sasl2 +SPF_LIB_DEPENDS= libspf2.so:${PORTSDIR}/mail/libspf2 +SQLITE_USES= sqlite +TLS_USE= OPENSSL=yes + +CDB_DESC= CDB maps lookups +INST_BASE_DESC= Install into /usr and /etc/postfix +LDAP_DESC= LDAP maps (uses WITH_OPENLDAP_VER) +LDAP_SASL_DESC= LDAP client-to-server SASL auth +LMDB_DESC= LMDB maps +SPF_DESC= SPF support (via libspf2 1.2.x) +TEST_DESC= SMTP/LMTP test server and generator +VDA_DESC= VDA (Virtual Delivery Agent) + +SASL_DESC= Cyrus SASL support (Dovecot SASL is always built in) +RG1_DESC= Kerberos network authentication protocol type +SASLKRB5_DESC= If your SASL req. Kerberos5, select this +SASLKMIT_DESC= If your SASL req. MIT Kerberos5, select this + +.include + +HTML1= body_checks.5.html bounce.5.html postfix-power.png \ + scache.8.html tlsmgr.8.html + +STRIP_LIBEXEC= anvil bounce cleanup discard dnsblog error flush lmtp local master \ + nqmgr oqmgr pickup pipe postscreen proxymap qmgr qmqpd scache showq \ + smtp smtpd spawn tlsmgr tlsproxy trivial-rewrite verify virtual + +.if !defined(BATCH) && !defined(PACKAGE_BUILDING) && exists(/etc/mail/mailer.conf) +OLD_MAILER!= ${GREP} -m 1 '^purgestat' /etc/mail/mailer.conf || ${ECHO_CMD} +.if !empty(OLD_MAILER) +IS_INTERACTIVE= yes +.endif +.endif + +.if !defined(DEBUG) +MAKEFILEFLAGS+= DEBUG= +.endif + +MAKEFILEFLAGS+= CC="${CC}" OPT="${CFLAGS}" + +.if ${PORT_OPTIONS:MINST_BASE} +.if defined(SASL_SLAVE) +PKGNAMESUFFIX= 211-base-sasl +.else +PKGNAMESUFFIX= 211-base +.endif +PREFIX= /usr +ETCDIR= /etc/postfix +PLIST_SUB+= BMAN="share/" +.else +PLIST_SUB+= BMAN="" +.endif + +PLIST_SUB+= PFETC=${ETCDIR} + +# check if mailwrapper supports $LOCALBASE +.if ${OPSYS} == FreeBSD && (${OSVERSION} >= 1002506 || ${OSVERSION} >= 1100094) +SUB_LIST+= USE_LOCALBASE_MAILER_CONF="yes" MC_PREFIX=${LOCALBASE} +.else +SUB_LIST+= USE_LOCALBASE_MAILER_CONF="no" MC_PREFIX="" +.endif + +.if ${PORT_OPTIONS:MDOCS} +PORTDOCS= * +READMEDIR= ${DOCSDIR} +.else +READMEDIR= no +.endif + +DAEMONDIR= ${PREFIX}/libexec/postfix + +SUB_LIST+= REQUIRE="${_REQUIRE}" READMEDIR="${READMEDIR}" \ + DAEMONDIR="${DAEMONDIR}" +SUB_FILES+= pkg-install pkg-message mailer.conf.postfix + +POSTFIX_CCARGS+= -DDEF_CONFIG_DIR=\\\"${ETCDIR}\\\" \ + -DDEF_DAEMON_DIR=\\\"${DAEMONDIR}\\\" \ + -DDEF_COMMAND_DIR=\\\"${PREFIX}/sbin\\\" \ + -DDEF_SENDMAIL_PATH=\\\"${PREFIX}/sbin/sendmail\\\" \ + -DDEF_NEWALIAS_PATH=\\\"${PREFIX}/bin/newaliases\\\" \ + -DDEF_MAILQ_PATH=\\\"${PREFIX}/bin/mailq\\\" \ + -DDEF_MANPAGE_DIR=\\\"${MANPREFIX}/man\\\" \ + -DDEF_README_DIR=\\\"${READMEDIR}\\\" \ + -DDEF_HTML_DIR=\\\"${READMEDIR}\\\" \ + -DDEF_QUEUE_DIR=\\\"/var/spool/postfix\\\" \ + -DDEF_DATA_DIR=\\\"/var/db/postfix\\\" \ + -DDEF_MAIL_OWNER=\\\"postfix\\\" \ + -DDEF_SGID_GROUP=\\\"maildrop\\\" \ + -Wmissing-prototypes -Wformat -Wno-comment + +# Default requirement for postfix rc script +_REQUIRE= LOGIN cleanvar dovecot + +# Always build with Dovecot SASL support, Cyrus is optional +# see Postfix HISTORY 20051222 +POSTFIX_CCARGS+= -DUSE_SASL_AUTH + +.if ${PORT_OPTIONS:MPCRE} +POSTFIX_CCARGS+= -DHAS_PCRE -I${LOCALBASE}/include +POSTFIX_AUXLIBS+= -L${LOCALBASE}/lib -lpcre +.else +POSTFIX_CCARGS+= -DNO_PCRE +.endif + +.if ${PORT_OPTIONS:MSASL} +POSTFIX_CCARGS+= -DUSE_CYRUS_SASL -I${LOCALBASE}/include -I${LOCALBASE}/include/sasl +POSTFIX_AUXLIBS+= -L${LOCALBASE}/lib -lsasl2 -lpam -lcrypt +.else +POSTFIX_CCARGS+= -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\" +.endif + +.if ${PORT_OPTIONS:MSASLKRB5} +POSTFIX_AUXLIBS+= -lkrb5 -lhx509 -lcrypto -lcrypt -lcom_err -lasn1 -lroken +.endif + +.if ${PORT_OPTIONS:MSASLKMIT} +POSTFIX_AUXLIBS+= -Wl,--rpath,$${KRB5_HOME:-${LOCALBASE}}/lib -lkrb5 -lcrypto -lcrypt -lcom_err +.endif + +.if ${PORT_OPTIONS:MTLS} +POSTFIX_CCARGS+= -DUSE_TLS -I${OPENSSLINC} +POSTFIX_AUXLIBS+= -L${OPENSSLLIB} ${LDFLAGS} -lssl -lcrypto +.else +POSTFIX_CCARGS+= -DNO_TLS +.endif + +.if ${PORT_OPTIONS:MSPF} +PATCH_SITES+= LOCAL/mm +PATCHFILES+= postfix-2.8.0-libspf2-1.2.x-0.patch.gz:-p1 +POSTFIX_CCARGS+= -DHAVE_NS_TYPE -DHAS_SPF -I${LOCALBASE}/include +POSTFIX_AUXLIBS+= -L${LOCALBASE}/lib -lspf2 +.endif + +.if ${PORT_OPTIONS:MBDB} +INVALID_BDB_VER= 6 +POSTFIX_CCARGS+= -I${BDB_INCLUDE_DIR} +POSTFIX_AUXLIBS+= -L${BDB_LIB_DIR} -l${BDB_LIB_NAME} +.endif + +.if ${PORT_OPTIONS:MMYSQL} +POSTFIX_CCARGS+= -DHAS_MYSQL -I${LOCALBASE}/include/mysql +POSTFIX_AUXLIBS+= -L${LOCALBASE}/lib/mysql -lmysqlclient -lz -lcrypt -lm +_REQUIRE+= mysql +.endif + +.if ${PORT_OPTIONS:MPGSQL} +POSTFIX_CCARGS+= -DHAS_PGSQL -I${LOCALBASE}/include -I${LOCALBASE}/pgsql/include +POSTFIX_AUXLIBS+= -L${LOCALBASE}/lib -L${LOCALBASE}/pgsql/lib -lpq -lcrypt +_REQUIRE+= postgresql +.endif + +.if ${PORT_OPTIONS:MSQLITE} +POSTFIX_CCARGS+= -DHAS_SQLITE -I${LOCALBASE}/include +POSTFIX_AUXLIBS+= -L${LOCALBASE}/lib -lsqlite3 +.endif + +.if ${PORT_OPTIONS:MLDAP} +. if defined(WITH_OPENLDAP_VER) +WANT_OPENLDAP_VER= ${WITH_OPENLDAP_VER} +. endif +POSTFIX_CCARGS+= -DHAS_LDAP -I${LOCALBASE}/include +POSTFIX_AUXLIBS+= -L${LOCALBASE}/lib -lldap -llber +_REQUIRE+= slapd +. if ${PORT_OPTIONS:MLDAP_SASL} +. if ! ${PORT_OPTIONS:MSASL} +LIB_DEPENDS+= libsasl2.so:${PORTSDIR}/security/cyrus-sasl2 +. endif +WANT_OPENLDAP_SASL= yes +POSTFIX_CCARGS+= -I${LOCALBASE}/include/sasl -DUSE_LDAP_SASL +. endif +.endif + +.if ${PORT_OPTIONS:MCDB} +POSTFIX_CCARGS+= -DHAS_CDB -I${LOCALBASE}/include +POSTFIX_AUXLIBS+= -L${LOCALBASE}/lib -lcdb +.endif + +.if ${PORT_OPTIONS:MNIS} +POSTFIX_CCARGS+= -DHAS_NIS +_REQUIRE+= ypserv +.endif + +.if ${PORT_OPTIONS:MVDA} +PATCH_SITES+= http://vda.sourceforge.net/VDA/:vda +PATCHFILES+= postfix-vda-v13-${VDAVERSION}.patch:-p1:vda +.endif + +.if ${PORT_OPTIONS:MTEST} +BINTEST= qmqp-sink qmqp-source smtp-sink smtp-source +MANTEST= qmqp-sink.1 qmqp-source.1 smtp-sink.1 smtp-source.1 +.endif + +.if ${PORT_OPTIONS:MLMDB} +POSTFIX_CCARGS+= -DHAS_LMDB -I${LOCALBASE}/include +POSTFIX_AUXLIBS+= -L${LOCALBASE}/lib -llmdb +.endif + +# sed script for files in ${WRKSRC}/README_FILES ${WRKSRC}/conf ${WRKSRC}/man +REINPLACE= s!^PATH=.*!PATH=/bin:/sbin:/usr/bin:/usr/sbin:${PREFIX}/bin:${PREFIX}/sbin!;\ + s!(_directory = )/usr/!\1${PREFIX}/!g;\ + s!^(data_directory = /var/)lib/!\1db/!g;\ + s!^\#(mynetworks_style = host)!\1!g;\ + s!^(sendmail_path =)!\1 ${PREFIX}/sbin/sendmail!g;\ + s!^(newaliases_path =)!\1 ${PREFIX}/bin/newaliases!g;\ + s!^(mailq_path =)!\1 ${PREFIX}/bin/mailq!g;\ + s!^(setgid_group =)!\1 maildrop!g;\ + s!^(manpage_directory =)!\1 ${MANPREFIX}/man!g;\ + s!^((html|readme)_directory =)!\1 ${READMEDIR}!g;\ + \!^\#alias_database = dbm:/etc/mail/aliases$$!d;\ + s!(:|= )/etc/postfix!\1$$config_directory!g;\ + s!/etc/postfix!${ETCDIR}!g;\ + s!^(sample_directory =)!\1 ${ETCDIR}!g;\ + s!($config_directory/(access|aliases|canonical|generic|header_checks|relocated|transport|virtual):f:root:-:644:)p1!\1o!; + +pre-patch: +.if ${PORT_OPTIONS:MSASL} && ! ${PORT_OPTIONS:MMYSQL} && exists(${LOCALBASE}/lib/libsasl2.a) + @if /usr/bin/nm ${LOCALBASE}/lib/libsasl2.a | ${GREP} -wq "mysql_init"; then \ + ${ECHO_MSG}; \ + ${ECHO_MSG} "Your SASL library it's compiled with MYSQL"; \ + ${ECHO_MSG} "If you use MYSQL in ${PORTNAME} consider CTRL+C and"; \ + ${ECHO_MSG} "select MYSQL OPTION in config menu."; \ + ${ECHO_MSG} "# make clean config"; \ + ${ECHO_MSG}; \ + sleep 5; \ + fi +.endif + + @${ECHO} 'See header_checks.5.html' \ + > ${WRKSRC}/html/body_checks.5.html + @${REINPLACE_CMD} -E -e 's!^(#define DEF_SGID_GROUP[^"]+)"postdrop"$$!\1"maildrop"!' \ + ${WRKSRC}/src/global/mail_params.h + @${FIND} -X ${WRKSRC}/README_FILES ${WRKSRC}/conf ${WRKSRC}/man \ + -type f -a ! \( -name INSTALL -o -name aliases \) | ${XARGS} \ + ${REINPLACE_CMD} -E -e '${REINPLACE}' + +post-patch: +.for f in ${HTML1} + @${ECHO} '$$html_directory/$f:f:root:-:644' \ + >> ${WRKSRC}/conf/postfix-files +.endfor + @${ECHO} '$$manpage_directory/man1/posttls-finger.1:f:root:-:644' \ + >> ${WRKSRC}/conf/postfix-files + @${ECHO} '$$command_directory/posttls-finger:f:root:-:755' \ + >> ${WRKSRC}/conf/postfix-files + +post-patch-SPF-on: + @${ECHO} '$$readme_directory/SPF_README:f:root:-:644' \ + >> ${WRKSRC}/conf/postfix-files + @${REINPLACE_CMD} -E -e '${REINPLACE}' \ + ${WRKSRC}/README_FILES/SPF_README + +post-patch-VDA-on: + @${ECHO} '$$readme_directory/VDA_README:f:root:-:644' \ + >> ${WRKSRC}/conf/postfix-files + @${REINPLACE_CMD} -E -e '${REINPLACE}' \ + ${WRKSRC}/README_FILES/VDA_README + +do-configure: + (cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles \ + ${MAKEFILEFLAGS} CCARGS="${POSTFIX_CCARGS}" \ + AUXLIBS="${POSTFIX_AUXLIBS}" && \ + ${ECHO} "all: default" >> Makefile) + +pre-install-INST_BASE-on: + ${MKDIR} ${STAGEDIR}/etc/rc.d + +do-install: + @(cd ${WRKSRC} && ${MAKE} non-interactive-package \ + install_root=${STAGEDIR} tempdir=${WRKDIR} \ + config_directory=${ETCDIR} \ + command_directory=${PREFIX}/sbin \ + daemon_directory=${DAEMONDIR} \ + html_directory=${READMEDIR} \ + mailq_path=${PREFIX}/bin/mailq \ + manpage_directory=${MANPREFIX}/man \ + newaliases_path=${PREFIX}/bin/newaliases \ + readme_directory=${READMEDIR} \ + sendmail_path=${PREFIX}/sbin/sendmail ) + + ${INSTALL_SCRIPT} ${WRKSRC}/auxiliary/rmail/rmail ${STAGEDIR}${PREFIX}/bin/rmail + ${INSTALL_SCRIPT} ${WRKSRC}/auxiliary/qshape/qshape.pl ${STAGEDIR}${PREFIX}/bin/qshape + ${INSTALL_MAN} ${WRKSRC}/man/man1/qshape.1 ${STAGEDIR}${MANPREFIX}/man/man1 + +do-install-TEST-on: + ${INSTALL_PROGRAM} ${BINTEST:S|^|${WRKSRC}/bin/|} ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${MANTEST:S|^|${WRKSRC}/man/man1/|} ${STAGEDIR}${MANPREFIX}/man/man1 + +post-stage: +# == do not overwrite existing config + ${MV} ${STAGEDIR}${ETCDIR}/main.cf ${STAGEDIR}${ETCDIR}/main.cf.sample + ${MV} ${STAGEDIR}${ETCDIR}/master.cf ${STAGEDIR}${ETCDIR}/master.cf.sample + ${MKDIR} ${STAGEDIR}${DATADIR} + ${INSTALL_DATA} ${WRKDIR}/mailer.conf.postfix ${STAGEDIR}${DATADIR} + +# Fix compressed man pages and strip executables + ${SED} -i '' -E -e "s|(man[158]/.*.[158]):|\1.gz:|g" ${STAGEDIR}${DAEMONDIR}/postfix-files + -@${STRIP_CMD} ${STRIP_LIBEXEC:S|^|${STAGEDIR}${DAEMONDIR}/|} + -@${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/* + +.include diff --git a/mail/postfix211/distinfo b/mail/postfix211/distinfo new file mode 100644 index 00000000000..3b8795de141 --- /dev/null +++ b/mail/postfix211/distinfo @@ -0,0 +1,6 @@ +SHA256 (postfix/postfix-2.11.7.tar.gz) = 05828b5b846e48fdc80db67d85409066010614af521070df4733459fbf447e20 +SIZE (postfix/postfix-2.11.7.tar.gz) = 4031689 +SHA256 (postfix/postfix-2.8.0-libspf2-1.2.x-0.patch.gz) = e5c38e5bc226cab109c02a4e530ab1aefd3bb06f2169f3e052bdf83d2727aacc +SIZE (postfix/postfix-2.8.0-libspf2-1.2.x-0.patch.gz) = 8191 +SHA256 (postfix/postfix-vda-v13-2.10.0.patch) = 6208021eb0b37ac6482e334e538ed5700cc22c4d4dd66ed9e975ae5f20bf935f +SIZE (postfix/postfix-vda-v13-2.10.0.patch) = 55701 diff --git a/mail/postfix211/files/mailer.conf.postfix.in b/mail/postfix211/files/mailer.conf.postfix.in new file mode 100644 index 00000000000..08f2b2c00f3 --- /dev/null +++ b/mail/postfix211/files/mailer.conf.postfix.in @@ -0,0 +1,7 @@ +# +# Execute the Postfix sendmail program, named %%PREFIX%%/sbin/sendmail +# +sendmail %%PREFIX%%/sbin/sendmail +send-mail %%PREFIX%%/sbin/sendmail +mailq %%PREFIX%%/sbin/sendmail +newaliases %%PREFIX%%/sbin/sendmail diff --git a/mail/postfix211/files/patch-makedefs b/mail/postfix211/files/patch-makedefs new file mode 100644 index 00000000000..56b0c3830fb --- /dev/null +++ b/mail/postfix211/files/patch-makedefs @@ -0,0 +1,12 @@ +--- makedefs.orig 2015-04-19 10:19:57 UTC ++++ makedefs +@@ -161,6 +161,9 @@ case "$SYSTEM.$RELEASE" in + FreeBSD.10*) SYSTYPE=FREEBSD10 + : ${CC=cc} + ;; ++ FreeBSD.11*) SYSTYPE=FREEBSD11 ++ : ${CC=cc} ++ ;; + DragonFly.*) SYSTYPE=DRAGONFLY + ;; + OpenBSD.2*) SYSTYPE=OPENBSD2 diff --git a/mail/postfix211/files/patch-src__util__sys_defs.h b/mail/postfix211/files/patch-src__util__sys_defs.h new file mode 100644 index 00000000000..d977481d19a --- /dev/null +++ b/mail/postfix211/files/patch-src__util__sys_defs.h @@ -0,0 +1,10 @@ +--- src/util/sys_defs.h.orig 2015-04-19 10:22:40 UTC ++++ src/util/sys_defs.h +@@ -26,6 +26,7 @@ + #if defined(FREEBSD2) || defined(FREEBSD3) || defined(FREEBSD4) \ + || defined(FREEBSD5) || defined(FREEBSD6) || defined(FREEBSD7) \ + || defined(FREEBSD8) || defined(FREEBSD9) || defined(FREEBSD10) \ ++ || defined(FREEBSD11) \ + || defined(BSDI2) || defined(BSDI3) || defined(BSDI4) \ + || defined(OPENBSD2) || defined(OPENBSD3) || defined(OPENBSD4) \ + || defined(OPENBSD5) \ diff --git a/mail/postfix211/files/pkg-install.in b/mail/postfix211/files/pkg-install.in new file mode 100644 index 00000000000..73f621e3c93 --- /dev/null +++ b/mail/postfix211/files/pkg-install.in @@ -0,0 +1,190 @@ +#!/bin/sh +# +# $FreeBSD: /tmp/pcvs/ports/mail/postfix/files/pkg-install.in,v 1.6 2012-02-11 05:14:34 sahil Exp $ +# + +# If the POSTFIX_DEFAULT_MTA environment variable is set to YES, it +# will make the port/package use defaults which make postfix replace +# sendmail as much as possible. + +# allowed vars during package installation +BATCH=${BATCH:=no} +POSTFIX_DEFAULT_MTA=${POSTFIX_DEFAULT_MTA:=no} + +# fixed vars +PREFIX="%%PREFIX%%" +ETCDIR="%%ETCDIR%%" +DAEMONDIR="%%DAEMONDIR%%" +READMEDIR="%%READMEDIR%%" +MC_TEMPLATE="%%DATADIR%%/mailer.conf.postfix" + +# FreeBSD <= 10.3 +MC_BASE="/etc/mail/mailer.conf" +# FreeBSD >= 10.3 (and current) +MC_LOCALBASE="%%LOCALBASE%%/etc/mail/mailer.conf" +USE_LOCALBASE_MAILER_CONF="%%USE_LOCALBASE_MAILER_CONF%%" + +if [ "${POSTFIX_DEFAULT_MTA}" = "no" ]; then + DEFAULT_REPLACE_MAILERCONF=n +else + DEFAULT_REPLACE_MAILERCONF=y +fi + +ask() { + local question default answer + + question=$1 + default=$2 + if [ -z "${PACKAGE_BUILDING}" -a "${BATCH}" = "no" ]; then + read -p "${question} [${default}]? " answer + fi + if [ -z "${answer}" ]; then + answer=${default} + fi + echo ${answer} +} + +yesno() { + local question default answer + + question=$1 + default=$2 + while :; do + answer=$(ask "${question}" "${default}") + case "${answer}" in + [Yy]*) return 0;; + [Nn]*) return 1;; + esac + echo "Please answer yes or no." + done +} + +# ============================================================================== +# Respect POSTFIX_DEFAULT_MTA, do not ask for confirmation! +# (This helps tools like salt, ansible or puppet on new installations) +# ============================================================================== +install_choise(){ + local mailerconf + mailerconf=$1 + + if [ "${DEFAULT_REPLACE_MAILERCONF}" = "y" ]; then + install_mailer_conf ${mailerconf} + elif [ "${DEFAULT_REPLACE_MAILERCONF}" = "n" -a -t 0 ]; then + if yesno "Would you like to activate Postfix in ${mailerconf}" ${DEFAULT_REPLACE_MAILERCONF:="n"}; then + install_mailer_conf ${mailerconf} + else + show_not_activated_msg ${mailerconf} + fi + else + show_not_activated_msg ${mailerconf} + fi +} + +show_not_activated_msg() { + local mailerconf + + mailerconf=$1 + echo + echo "===============================================================" + echo "Postfix was *not* activated in ${mailerconf}! " + echo + echo "To finish installation run the following commands:" + echo + if [ "${USE_LOCALBASE_MAILER_CONF}" = "yes" ]; then + echo " mkdir -p %%LOCALBASE%%/etc/mail" + else + echo " mv -f ${mailerconf} ${mailerconf}.old" + fi + echo " install -m 0644 ${MC_TEMPLATE} ${mailerconf}" + echo "===============================================================" + echo +} + +show_activated_msg() { + local mailerconf + + mailerconf=$1 + echo "===============================================================" + echo "Postfix already activated in ${mailerconf}" + echo "===============================================================" +} + +cmp_mailer() { + local mailerconf + + mailerconf=$1 + cmp -s ${mailerconf} ${MC_TEMPLATE} + return $? +} + +install_mailer_conf() { + local mailerconf + + mailerconf=$1 + echo "Activate Postfix in ${mailerconf}" + if [ "${USE_LOCALBASE_MAILER_CONF}" = "yes" ]; then + [ -d %%LOCALBASE%%/etc/mail ] || mkdir -p %%LOCALBASE%%/etc/mail + fi + [ -f ${mailerconf} ] && mv -f ${mailerconf} ${mailerconf}.old + install -m 644 ${MC_TEMPLATE} ${mailerconf} +} + +# ============================================================================== +# Run postfix reload +# This is a candidate for a dedicated pkg-post-upgrade script, but it seems +# this not fully implemented in pkg :(see upstream PR 941) +# ============================================================================== +try_reload(){ + ${PREFIX}/sbin/postfix status 2>/dev/null +if [ $? -eq 0 ]; then + ${PREFIX}/sbin/postfix reload +else + echo "postfix not running" +fi +} + +# ============================================================================== +# Run postfix post-install to fix permissions and new config values +# ============================================================================== +if [ "$2" = "POST-INSTALL" ]; then + /bin/sh ${DAEMONDIR}/post-install tempdir=/tmp \ + daemon_directory=${DAEMONDIR} \ + html_directory=${READMEDIR} \ + readme_directory=${READMEDIR} \ + upgrade-package +fi + +# ============================================================================== +# If FreeBSD <= 10.2 is deprecated check only LOCALBASE and remove BASE checks, +# regardless if installed in BASE or LOCALBASE +# Iff postfix is activated in BASE, also activate postfix in LOCALBASE! +# ============================================================================== +if [ "$2" = "POST-INSTALL" -a -z "${PACKAGE_BUILDING}" ]; then +if [ -f "${MC_BASE}" ]; then + if [ "${USE_LOCALBASE_MAILER_CONF}" = "yes" ]; then + cmp_mailer ${MC_BASE} + if [ $? -eq 0 ]; then + show_activated_msg ${MC_BASE} + cmp_mailer ${MC_LOCALBASE} || install_mailer_conf ${MC_LOCALBASE} + try_reload + else + cmp_mailer ${MC_LOCALBASE} || install_choise ${MC_LOCALBASE} + fi + else + cmp_mailer ${MC_BASE} + if [ $? -ne 0 ]; then + install_choise ${MC_BASE} + else + show_activated_msg ${MC_BASE} + try_reload + fi + fi + +else + if [ "${USE_LOCALBASE_MAILER_CONF}" = "yes" ]; then + show_not_activated_msg ${MC_LOCALBASE} + else + show_not_activated_msg ${MC_BASE} + fi +fi # -f "${MC_BASE}" +fi # "$2" = "POST-INSTALL" -a -z "${PACKAGE_BUILDING}" diff --git a/mail/postfix211/files/pkg-message.in b/mail/postfix211/files/pkg-message.in new file mode 100644 index 00000000000..6ba40277440 --- /dev/null +++ b/mail/postfix211/files/pkg-message.in @@ -0,0 +1,25 @@ +To use postfix instead of sendmail: + - clear sendmail queue and stop the sendmail daemons + +Run the following commands to enable postfix during startup: + - sysrc postfix_enable="YES" + - sysrc sendmail_enable="NONE" + +If postfix is *not* already activated in %%MC_PREFIX%%/etc/mail/mailer.conf + - mv %%MC_PREFIX%%/etc/mail/mailer.conf %%MC_PREFIX%%/etc/mail/mailer.conf.old + - install -m 0644 %%DATADIR%%/mailer.conf.postfix %%MC_PREFIX%%/etc/mail/mailer.conf + +Disable sendmail(8) specific tasks, +add the following lines to /etc/periodic.conf(.local): + daily_clean_hoststat_enable="NO" + daily_status_mail_rejects_enable="NO" + daily_status_include_submit_mailq="NO" + daily_submit_queuerun="NO" + +If you are using SASL, you need to make sure that postfix has access to read +the sasldb file. This is accomplished by adding postfix to group mail and +making the %%PREFIX%%/etc/sasldb* file(s) readable by group mail (this should +be the default for new installs). + +If you are upgrading from prior postfix version, review the RELEASE_NOTES to +familiarize yourself with new features and incompatabilities. diff --git a/mail/postfix211/files/postfix.in b/mail/postfix211/files/postfix.in new file mode 100644 index 00000000000..74c1550bf98 --- /dev/null +++ b/mail/postfix211/files/postfix.in @@ -0,0 +1,52 @@ +#!/bin/sh +# +# $FreeBSD$ +# +# PROVIDE: postfix mail +# REQUIRE: %%REQUIRE%% +# KEYWORD: shutdown +# +# Add the following lines to /etc/rc.conf to enable postfix: +# postfix_enable (bool): Set it to "YES" to enable postfix. +# Default is "NO". +# postfix_pidfile (path): Set full path to master.pid. +# Default is "/var/spool/postfix/pid/master.pid". +# postfix_procname (command): Set command that start master. Used to verify if +# postfix is running. +# Default is "%%PREFIX%%/libexec/postfix/master". +# postfix_flags (str): Flags passed to postfix-script on startup. +# Default is "". +# + +. /etc/rc.subr + +name="postfix" +rcvar=postfix_enable + +load_rc_config $name + +: ${postfix_enable:="NO"} +: ${postfix_pidfile:="/var/spool/postfix/pid/master.pid"} +: ${postfix_procname:="%%PREFIX%%/libexec/postfix/master"} + +start_cmd=${name}_start +stop_cmd=${name}_stop +extra_commands="reload" +reload_cmd="${name}_reload" + +pidfile=${postfix_pidfile} +procname=${postfix_procname} + +postfix_start() { + %%PREFIX%%/sbin/postfix ${postfix_flags} start +} + +postfix_stop() { + %%PREFIX%%/sbin/postfix ${postfix_flags} stop +} + +postfix_reload() { + %%PREFIX%%/sbin/postfix ${postfix_flags} reload +} + +run_rc_command "$1" diff --git a/mail/postfix211/pkg-descr b/mail/postfix211/pkg-descr new file mode 100644 index 00000000000..bcbf2703fea --- /dev/null +++ b/mail/postfix211/pkg-descr @@ -0,0 +1,15 @@ +Postfix attempts to be fast, easy to administer, and secure, while at the same +time being sendmail compatible enough to not upset existing users. Thus, the +outside has a sendmail-ish flavor, but the inside is completely different. + +Some feautures: + +Connection cache for SMTP, DSN status notifications, IP version 6, Plug-in +support for multiple SASL implementations (Cyrus, Dovecot), TLS encryption and +authentication, Configurable status notification message text, Access control +per client/sender/recipient/etc, Content filter (built-in, external before +queue, external after queue), Berkeley DB database, LDAP database, MySQL +database, PostgreSQL database, Maildir and mailbox format, Virtual domains, +VERP envelope return addresses and others. + +WWW: http://www.postfix.org/ diff --git a/mail/postfix211/pkg-help b/mail/postfix211/pkg-help new file mode 100644 index 00000000000..f28015a0b49 --- /dev/null +++ b/mail/postfix211/pkg-help @@ -0,0 +1,15 @@ +Readme SASL: + +Dovecot uses its own daemon process for authentication. Because there is no +need to link extra libraries into Postfix, Dovecot SASL will be build into +Postfix by default. + +Cyrus SASL is optional and will be the default if build with SASL=on + +To find out what SASL implementations are compiled into Postfix, use the +following commands: + + % postconf -a (SASL support in the SMTP server) + % postconf -A (SASL support in the SMTP+LMTP client) + % postconf smtpd_sasl_type (show default SASL) + diff --git a/mail/postfix211/pkg-plist b/mail/postfix211/pkg-plist new file mode 100644 index 00000000000..38c2fcff459 --- /dev/null +++ b/mail/postfix211/pkg-plist @@ -0,0 +1,157 @@ +bin/mailq +bin/newaliases +%%TEST%%bin/qmqp-sink +%%TEST%%bin/qmqp-source +bin/qshape +bin/rmail +%%TEST%%bin/smtp-sink +%%TEST%%bin/smtp-source +%%PFETC%%/LICENSE +%%PFETC%%/TLS_LICENSE +%%PFETC%%/bounce.cf.default +%%PFETC%%/main.cf.default +@sample %%PFETC%%/main.cf.sample +%%PFETC%%/makedefs.out +@sample %%PFETC%%/master.cf.sample +libexec/postfix/anvil +libexec/postfix/bounce +libexec/postfix/cleanup +libexec/postfix/discard +libexec/postfix/dnsblog +libexec/postfix/error +libexec/postfix/flush +libexec/postfix/lmtp +libexec/postfix/local +libexec/postfix/main.cf +libexec/postfix/master +libexec/postfix/master.cf +libexec/postfix/nqmgr +libexec/postfix/oqmgr +libexec/postfix/pickup +libexec/postfix/pipe +libexec/postfix/post-install +libexec/postfix/postfix-files +libexec/postfix/postfix-script +libexec/postfix/postfix-wrapper +libexec/postfix/postmulti-script +libexec/postfix/postscreen +libexec/postfix/proxymap +libexec/postfix/qmgr +libexec/postfix/qmqpd +libexec/postfix/scache +libexec/postfix/showq +libexec/postfix/smtp +libexec/postfix/smtpd +libexec/postfix/spawn +libexec/postfix/tlsmgr +libexec/postfix/tlsproxy +libexec/postfix/trivial-rewrite +libexec/postfix/verify +libexec/postfix/virtual +%%BMAN%%man/man1/mailq.1.gz +%%BMAN%%man/man1/newaliases.1.gz +%%BMAN%%man/man1/postalias.1.gz +%%BMAN%%man/man1/postcat.1.gz +%%BMAN%%man/man1/postconf.1.gz +%%BMAN%%man/man1/postdrop.1.gz +%%BMAN%%man/man1/postfix.1.gz +%%BMAN%%man/man1/postkick.1.gz +%%BMAN%%man/man1/postlock.1.gz +%%BMAN%%man/man1/postlog.1.gz +%%BMAN%%man/man1/postmap.1.gz +%%BMAN%%man/man1/postmulti.1.gz +%%BMAN%%man/man1/postqueue.1.gz +%%BMAN%%man/man1/postsuper.1.gz +%%BMAN%%man/man1/posttls-finger.1.gz +%%TEST%%%%BMAN%%man/man1/qmqp-sink.1.gz +%%TEST%%%%BMAN%%man/man1/qmqp-source.1.gz +%%BMAN%%man/man1/qshape.1.gz +%%BMAN%%man/man1/sendmail.1.gz +%%TEST%%%%BMAN%%man/man1/smtp-sink.1.gz +%%TEST%%%%BMAN%%man/man1/smtp-source.1.gz +%%BMAN%%man/man5/access.5.gz +%%BMAN%%man/man5/aliases.5.gz +%%BMAN%%man/man5/body_checks.5.gz +%%BMAN%%man/man5/bounce.5.gz +%%BMAN%%man/man5/canonical.5.gz +%%BMAN%%man/man5/cidr_table.5.gz +%%BMAN%%man/man5/generic.5.gz +%%BMAN%%man/man5/header_checks.5.gz +%%BMAN%%man/man5/ldap_table.5.gz +%%BMAN%%man/man5/lmdb_table.5.gz +%%BMAN%%man/man5/master.5.gz +%%BMAN%%man/man5/memcache_table.5.gz +%%BMAN%%man/man5/mysql_table.5.gz +%%BMAN%%man/man5/nisplus_table.5.gz +%%BMAN%%man/man5/pcre_table.5.gz +%%BMAN%%man/man5/pgsql_table.5.gz +%%BMAN%%man/man5/postconf.5.gz +%%BMAN%%man/man5/postfix-wrapper.5.gz +%%BMAN%%man/man5/regexp_table.5.gz +%%BMAN%%man/man5/relocated.5.gz +%%BMAN%%man/man5/socketmap_table.5.gz +%%BMAN%%man/man5/sqlite_table.5.gz +%%BMAN%%man/man5/tcp_table.5.gz +%%BMAN%%man/man5/transport.5.gz +%%BMAN%%man/man5/virtual.5.gz +%%BMAN%%man/man8/anvil.8.gz +%%BMAN%%man/man8/bounce.8.gz +%%BMAN%%man/man8/cleanup.8.gz +%%BMAN%%man/man8/defer.8.gz +%%BMAN%%man/man8/discard.8.gz +%%BMAN%%man/man8/dnsblog.8.gz +%%BMAN%%man/man8/error.8.gz +%%BMAN%%man/man8/flush.8.gz +%%BMAN%%man/man8/lmtp.8.gz +%%BMAN%%man/man8/local.8.gz +%%BMAN%%man/man8/master.8.gz +%%BMAN%%man/man8/oqmgr.8.gz +%%BMAN%%man/man8/pickup.8.gz +%%BMAN%%man/man8/pipe.8.gz +%%BMAN%%man/man8/postscreen.8.gz +%%BMAN%%man/man8/proxymap.8.gz +%%BMAN%%man/man8/qmgr.8.gz +%%BMAN%%man/man8/qmqpd.8.gz +%%BMAN%%man/man8/scache.8.gz +%%BMAN%%man/man8/showq.8.gz +%%BMAN%%man/man8/smtp.8.gz +%%BMAN%%man/man8/smtpd.8.gz +%%BMAN%%man/man8/spawn.8.gz +%%BMAN%%man/man8/tlsmgr.8.gz +%%BMAN%%man/man8/tlsproxy.8.gz +%%BMAN%%man/man8/trace.8.gz +%%BMAN%%man/man8/trivial-rewrite.8.gz +%%BMAN%%man/man8/verify.8.gz +%%BMAN%%man/man8/virtual.8.gz +sbin/postalias +sbin/postcat +sbin/postconf +@(,maildrop,2755) sbin/postdrop +sbin/postfix +sbin/postkick +sbin/postlock +sbin/postlog +sbin/postmap +sbin/postmulti +@(,maildrop,2755) sbin/postqueue +sbin/postsuper +sbin/posttls-finger +sbin/sendmail +%%DATADIR%%/mailer.conf.postfix +@dir %%PFETC%% +@dir(postfix,,700) /var/db/postfix +@dir(postfix,,700) /var/spool/postfix/active +@dir(postfix,,700) /var/spool/postfix/bounce +@dir(postfix,,700) /var/spool/postfix/corrupt +@dir(postfix,,700) /var/spool/postfix/defer +@dir(postfix,,700) /var/spool/postfix/deferred +@dir(postfix,,700) /var/spool/postfix/flush +@dir(postfix,,700) /var/spool/postfix/hold +@dir(postfix,,700) /var/spool/postfix/incoming +@dir(postfix,maildrop,730) /var/spool/postfix/maildrop +@dir(,postfix,755) /var/spool/postfix/pid +@dir(postfix,,700) /var/spool/postfix/private +@dir(postfix,maildrop,710) /var/spool/postfix/public +@dir(postfix,,700) /var/spool/postfix/saved +@dir(postfix,,700) /var/spool/postfix/trace +@dir(,,755) /var/spool/postfix diff --git a/math/octave-forge-tsa/Makefile b/math/octave-forge-tsa/Makefile index b550fe46589..daeaa597f43 100644 --- a/math/octave-forge-tsa/Makefile +++ b/math/octave-forge-tsa/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= octave-forge-tsa -PORTVERSION= 4.3.3 +PORTVERSION= 4.4.1 CATEGORIES= math MAINTAINER= stephen@FreeBSD.org diff --git a/math/octave-forge-tsa/distinfo b/math/octave-forge-tsa/distinfo index f144a1045a5..9726b91889f 100644 --- a/math/octave-forge-tsa/distinfo +++ b/math/octave-forge-tsa/distinfo @@ -1,2 +1,2 @@ -SHA256 (octave-forge/tsa-4.3.3.tar.gz) = 76f100d53706aa2185357ecfbf84fe8b1d367f3304775ca524fb4cda6b02ebc0 -SIZE (octave-forge/tsa-4.3.3.tar.gz) = 93779 +SHA256 (octave-forge/tsa-4.4.1.tar.gz) = d4d0053cd73b2633e24e80a61bb0b413c99b39a24b8f0daf8364843d1a47780d +SIZE (octave-forge/tsa-4.4.1.tar.gz) = 94030 diff --git a/misc/mdp/Makefile b/misc/mdp/Makefile index 539587475d8..6aa83580bd2 100644 --- a/misc/mdp/Makefile +++ b/misc/mdp/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= mdp -PORTVERSION= 1.0.4 +PORTVERSION= 1.0.5 CATEGORIES= misc MAINTAINER= neel@neelc.org diff --git a/misc/mdp/distinfo b/misc/mdp/distinfo index a11a6867505..427fd2dada6 100644 --- a/misc/mdp/distinfo +++ b/misc/mdp/distinfo @@ -1,2 +1,2 @@ -SHA256 (visit1985-mdp-1.0.4_GH0.tar.gz) = 955a55bd903acc92aedac8e94e11824736697aa28b78b0caff274eb0f4d07ef3 -SIZE (visit1985-mdp-1.0.4_GH0.tar.gz) = 34711 +SHA256 (visit1985-mdp-1.0.5_GH0.tar.gz) = a8126caff0aea4a1ce2151b8442e2e6d8030d17e04f5d6ff3dec8753ca4c6d32 +SIZE (visit1985-mdp-1.0.5_GH0.tar.gz) = 34824 diff --git a/multimedia/emby-server/Makefile b/multimedia/emby-server/Makefile index 56f56234c2b..72e8dc94ebd 100644 --- a/multimedia/emby-server/Makefile +++ b/multimedia/emby-server/Makefile @@ -3,6 +3,7 @@ PORTNAME= emby-server PORTVERSION= 3.0.5821 +PORTREVISION= 1 CATEGORIES= multimedia MAINTAINER= woodsb02@gmail.com diff --git a/multimedia/emby-server/files/emby-server.in b/multimedia/emby-server/files/emby-server.in index 3bb510367ce..0a571f0b78f 100644 --- a/multimedia/emby-server/files/emby-server.in +++ b/multimedia/emby-server/files/emby-server.in @@ -50,13 +50,6 @@ command_args="-f -p ${pidfile} ${procname} %%PREFIX%%/lib/emby-server/MediaBrows start_precmd=%%RC_NAME%%_precmd %%RC_NAME%%_precmd() { - : ${LC_ALL:="C"} - : ${LANG:="C"} - : ${TZ:="UTC"} - export LC_ALL - export LANG - export TZ - if [ ! -e "${pidfile}" ]; then install -g ${%%RC_NAME%%_group} -o ${%%RC_NAME%%_user} -- /dev/null "${pidfile}"; fi diff --git a/multimedia/emby-server/pkg-install b/multimedia/emby-server/pkg-install deleted file mode 100644 index dd55c74de18..00000000000 --- a/multimedia/emby-server/pkg-install +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh - -if [ $# -ne 2 ]; then - echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2 - exit 1 -fi - -case $2 in - POST-INSTALL) - echo "Downloading Mozilla's root certificates and importing into the Mono Trust store..." - ${PKG_PREFIX}/bin/mozroots --import --sync - ;; -esac - -exit 0 diff --git a/multimedia/kaffeine/Makefile b/multimedia/kaffeine/Makefile index 7c2ea33a5a3..ee7632d11a7 100644 --- a/multimedia/kaffeine/Makefile +++ b/multimedia/kaffeine/Makefile @@ -3,6 +3,7 @@ PORTNAME= kaffeine PORTVERSION= 1.3.1 +PORTREVISION= 1 CATEGORIES= multimedia kde MASTER_SITES= SF/kaffeine/current @@ -13,7 +14,7 @@ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat -LIB_DEPENDS= libvlc.so:${PORTSDIR}/multimedia/vlc +LIB_DEPENDS= libvlc.so:${PORTSDIR}/multimedia/vlc-qt4 USES= cmake cpe gettext pkgconfig USE_KDE4= automoc4 kdelibs kdeprefix diff --git a/multimedia/librtmp/Makefile b/multimedia/librtmp/Makefile index 22ccc79b9cb..10b80652147 100644 --- a/multimedia/librtmp/Makefile +++ b/multimedia/librtmp/Makefile @@ -1,17 +1,17 @@ # $FreeBSD$ PORTNAME= librtmp -PORTVERSION= 2.4.20130923 +PORTVERSION= 2.4.20151223 CATEGORIES= multimedia net MASTER_SITES= LOCAL/hrs -DISTNAME= rtmpdump-${PORTVERSION} +DISTNAME= rtmpdump-2.4.fa8646da MAINTAINER= hrs@FreeBSD.org COMMENT= RTMP stream library LICENSE= GPLv2 -USES= pkgconfig +USES= pkgconfig tar:bz2 USE_LDCONFIG= yes USE_OPENSSL= yes CFLAGS+= -I${OPENSSLINC} diff --git a/multimedia/librtmp/distinfo b/multimedia/librtmp/distinfo index 543024b5446..c51022dfef3 100644 --- a/multimedia/librtmp/distinfo +++ b/multimedia/librtmp/distinfo @@ -1,2 +1,2 @@ -SHA256 (rtmpdump-2.4.20130923.tar.gz) = 220259e3ac6b9f17d4f8643ec019fbf88780b5033bf7781fe69f1f86eff759f6 -SIZE (rtmpdump-2.4.20130923.tar.gz) = 143065 +SHA256 (rtmpdump-2.4.fa8646da.tar.bz2) = 2d37a0db88477c580d3d7226bf8606444fdb130008ee5256bf0ddaf00c76d771 +SIZE (rtmpdump-2.4.fa8646da.tar.bz2) = 110969 diff --git a/multimedia/librtmp/files/patch-librtmp-Makefile b/multimedia/librtmp/files/patch-librtmp-Makefile index 874063fc327..3aad9a44af7 100644 --- a/multimedia/librtmp/files/patch-librtmp-Makefile +++ b/multimedia/librtmp/files/patch-librtmp-Makefile @@ -1,5 +1,5 @@ ---- Makefile.orig 2013-10-07 03:52:05.000000000 +0900 -+++ Makefile 2013-10-30 05:16:36.000000000 +0900 +--- Makefile.orig 2016-02-29 01:15:13 UTC ++++ Makefile @@ -1,19 +1,21 @@ VERSION=v2.4 @@ -26,7 +26,7 @@ SYS=posix CRYPTO=OPENSSL -@@ -23,14 +25,14 @@ +@@ -23,14 +25,14 @@ DEF_OPENSSL=-DUSE_OPENSSL DEF_GNUTLS=-DUSE_GNUTLS DEF_=-DNO_CRYPTO REQ_GNUTLS=gnutls,hogweed,nettle @@ -43,7 +43,7 @@ LIB_POLARSSL=-lpolarssl $(LIBZ) PRIVATE_LIBS=$(LIBS_$(SYS)) CRYPTO_LIB=$(LIB_$(CRYPTO)) $(PRIVATE_LIBS) -@@ -74,8 +76,9 @@ +@@ -74,8 +76,9 @@ SO_INST=$(SOINST_$(SHARED)) DEF=-DRTMPDUMP_VERSION=\"$(VERSION)\" $(CRYPTO_DEF) $(XDEF) OPT=-O2 @@ -55,7 +55,7 @@ OBJS=rtmp.o log.o amf.o hashswf.o parseurl.o -@@ -102,16 +105,18 @@ +@@ -102,20 +105,22 @@ librtmp.pc: librtmp.pc.in Makefile sed -e "s;@prefix@;$(prefix);" -e "s;@libdir@;$(libdir);" \ -e "s;@VERSION@;$(VERSION);" \ -e "s;@CRYPTO_REQ@;$(CRYPTO_REQ);" \ @@ -76,3 +76,8 @@ cp librtmp.3 $(MANDIR)/man3 install_so: librtmp$(SO_EXT) +- cp librtmp$(SO_EXT) $(SODIR) ++ ${BSD_INSTALL_LIB} librtmp$(SO_EXT) $(SODIR) + $(INSTALL_IMPLIB) + cd $(SODIR); ln -sf librtmp$(SO_EXT) librtmp.$(SOX) + diff --git a/multimedia/librtmp/files/patch-librtmp-librtmp.pc.in b/multimedia/librtmp/files/patch-librtmp-librtmp.pc.in index 9e304fc6c32..898d89162a9 100644 --- a/multimedia/librtmp/files/patch-librtmp-librtmp.pc.in +++ b/multimedia/librtmp/files/patch-librtmp-librtmp.pc.in @@ -1,6 +1,6 @@ ---- librtmp.pc.in.orig 2013-10-07 03:52:05.000000000 +0900 -+++ librtmp.pc.in 2013-10-07 04:00:16.000000000 +0900 -@@ -8,6 +8,6 @@ +--- librtmp.pc.in.orig 2016-02-29 01:15:13 UTC ++++ librtmp.pc.in +@@ -8,6 +8,6 @@ Description: RTMP implementation Version: @VERSION@ Requires: @CRYPTO_REQ@ URL: http://rtmpdump.mplayerhq.hu diff --git a/multimedia/librtmp/pkg-plist b/multimedia/librtmp/pkg-plist index 6e7ccdf8761..8c6e7dd7c06 100644 --- a/multimedia/librtmp/pkg-plist +++ b/multimedia/librtmp/pkg-plist @@ -4,6 +4,6 @@ include/librtmp/log.h include/librtmp/rtmp.h lib/librtmp.a lib/librtmp.so -lib/librtmp.so.0 +lib/librtmp.so.1 libdata/pkgconfig/librtmp.pc man/man3/librtmp.3.gz diff --git a/multimedia/plexmediaserver-plexpass/Makefile b/multimedia/plexmediaserver-plexpass/Makefile index a92ea111b05..5849abe8529 100644 --- a/multimedia/plexmediaserver-plexpass/Makefile +++ b/multimedia/plexmediaserver-plexpass/Makefile @@ -1,13 +1,13 @@ # Created by: KalleDK # $FreeBSD$ -PORTVERSION= 0.9.15.5.1712 +PORTVERSION= 0.9.15.6.1714 PORTREVISION= 0 PKGNAMESUFFIX= -plexpass MAINTAINER= feld@FreeBSD.org -PLEX_BUILD= ba5070a +PLEX_BUILD= 7be11e1 USE_RC_SUBR= ${PORTNAME}_plexpass diff --git a/multimedia/plexmediaserver-plexpass/distinfo b/multimedia/plexmediaserver-plexpass/distinfo index 0d6fa43c2b6..a07946deb64 100644 --- a/multimedia/plexmediaserver-plexpass/distinfo +++ b/multimedia/plexmediaserver-plexpass/distinfo @@ -1,2 +1,2 @@ -SHA256 (PlexMediaServer-0.9.15.5.1712-ba5070a-freebsd-amd64.tar.bz2) = a8028d9bb792ad6820ce6da5bdd28a09fd48b8bf12e4f9e5917046b29f73809f -SIZE (PlexMediaServer-0.9.15.5.1712-ba5070a-freebsd-amd64.tar.bz2) = 97527222 +SHA256 (PlexMediaServer-0.9.15.6.1714-7be11e1-freebsd-amd64.tar.bz2) = 192152596ba204f77e604a4bc9b3bbc14af0a9e73d13521294da7a770d947880 +SIZE (PlexMediaServer-0.9.15.6.1714-7be11e1-freebsd-amd64.tar.bz2) = 97526996 diff --git a/multimedia/plexmediaserver/Makefile b/multimedia/plexmediaserver/Makefile index 751ea6a59ab..89cbd9ce4d1 100644 --- a/multimedia/plexmediaserver/Makefile +++ b/multimedia/plexmediaserver/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= plexmediaserver -PORTVERSION?= 0.9.15.5.1712 +PORTVERSION?= 0.9.15.6.1714 PORTREVISION?= 0 CATEGORIES= multimedia MASTER_SITES= https://downloads.plexapp.com/plex-media-server/${PORTVERSION}-${PLEX_BUILD}/ \ @@ -13,7 +13,7 @@ MAINTAINER?= feld@FreeBSD.org COMMENT= Plex Media Server component USES= cpe tar:bzip2 -PLEX_BUILD?= ba5070a +PLEX_BUILD?= 7be11e1 NO_BUILD= yes WRKSRC= ${WRKDIR}/PlexMediaServer-${PORTVERSION}-${PLEX_BUILD} diff --git a/multimedia/plexmediaserver/distinfo b/multimedia/plexmediaserver/distinfo index 0d6fa43c2b6..a07946deb64 100644 --- a/multimedia/plexmediaserver/distinfo +++ b/multimedia/plexmediaserver/distinfo @@ -1,2 +1,2 @@ -SHA256 (PlexMediaServer-0.9.15.5.1712-ba5070a-freebsd-amd64.tar.bz2) = a8028d9bb792ad6820ce6da5bdd28a09fd48b8bf12e4f9e5917046b29f73809f -SIZE (PlexMediaServer-0.9.15.5.1712-ba5070a-freebsd-amd64.tar.bz2) = 97527222 +SHA256 (PlexMediaServer-0.9.15.6.1714-7be11e1-freebsd-amd64.tar.bz2) = 192152596ba204f77e604a4bc9b3bbc14af0a9e73d13521294da7a770d947880 +SIZE (PlexMediaServer-0.9.15.6.1714-7be11e1-freebsd-amd64.tar.bz2) = 97526996 diff --git a/multimedia/rtmpdump/Makefile b/multimedia/rtmpdump/Makefile index e7012460f29..d888eeac40e 100644 --- a/multimedia/rtmpdump/Makefile +++ b/multimedia/rtmpdump/Makefile @@ -1,10 +1,10 @@ # $FreeBSD$ PORTNAME= rtmpdump -PORTVERSION= 2.4.20130923 -PORTREVISION= 2 +PORTVERSION= 2.4.20151223 CATEGORIES= multimedia net MASTER_SITES= LOCAL/hrs +DISTNAME= ${PORTNAME}-2.4.fa8646da MAINTAINER= hrs@FreeBSD.org COMMENT= RTMP streams download utility @@ -13,7 +13,7 @@ LICENSE= GPLv2 LIB_DEPENDS= librtmp.so:${PORTSDIR}/multimedia/librtmp -USES= pkgconfig +USES= pkgconfig tar:bz2 USE_OPENSSL= yes MAKE_ENV= THREADLIB="-lpthread" CFLAGS+= -I${OPENSSLINC} diff --git a/multimedia/rtmpdump/distinfo b/multimedia/rtmpdump/distinfo index 543024b5446..c51022dfef3 100644 --- a/multimedia/rtmpdump/distinfo +++ b/multimedia/rtmpdump/distinfo @@ -1,2 +1,2 @@ -SHA256 (rtmpdump-2.4.20130923.tar.gz) = 220259e3ac6b9f17d4f8643ec019fbf88780b5033bf7781fe69f1f86eff759f6 -SIZE (rtmpdump-2.4.20130923.tar.gz) = 143065 +SHA256 (rtmpdump-2.4.fa8646da.tar.bz2) = 2d37a0db88477c580d3d7226bf8606444fdb130008ee5256bf0ddaf00c76d771 +SIZE (rtmpdump-2.4.fa8646da.tar.bz2) = 110969 diff --git a/multimedia/rtmpdump/files/patch-Makefile b/multimedia/rtmpdump/files/patch-Makefile index ea86a39d0fb..1cb54875318 100644 --- a/multimedia/rtmpdump/files/patch-Makefile +++ b/multimedia/rtmpdump/files/patch-Makefile @@ -1,5 +1,5 @@ ---- Makefile.orig 2013-10-07 03:52:05.000000000 +0900 -+++ Makefile 2013-10-30 15:30:57.000000000 +0900 +--- Makefile.orig 2016-02-29 01:15:13 UTC ++++ Makefile @@ -1,9 +1,9 @@ VERSION=v2.4 @@ -13,7 +13,7 @@ SYS=posix #SYS=mingw -@@ -21,8 +21,9 @@ +@@ -21,8 +21,9 @@ CRYPTO_DEF=$(DEF_$(CRYPTO)) DEF=-DRTMPDUMP_VERSION=\"$(VERSION)\" $(CRYPTO_DEF) $(XDEF) OPT=-O2 @@ -25,7 +25,7 @@ bindir=$(prefix)/bin sbindir=$(prefix)/sbin -@@ -35,13 +36,13 @@ +@@ -35,13 +36,13 @@ MANDIR=$(DESTDIR)$(mandir) LIBS_posix= LIBS_darwin= LIBS_mingw=-lws2_32 -lwinmm -lgdi32 @@ -41,7 +41,7 @@ SLIBS=$(THREADLIB) $(LIBS) LIBRTMP=librtmp/librtmp.a -@@ -54,9 +55,7 @@ +@@ -54,21 +55,17 @@ EXT=$(EXT_$(SYS)) PROGS=rtmpdump rtmpgw rtmpsrv rtmpsuck @@ -52,11 +52,15 @@ install: $(PROGS) -mkdir -p $(BINDIR) $(SBINDIR) $(MANDIR)/man1 $(MANDIR)/man8 -@@ -64,11 +63,9 @@ - cp rtmpgw$(EXT) rtmpsrv$(EXT) rtmpsuck$(EXT) $(SBINDIR) - cp rtmpdump.1 $(MANDIR)/man1 - cp rtmpgw.8 $(MANDIR)/man8 +- cp rtmpdump$(EXT) $(BINDIR) +- cp rtmpgw$(EXT) rtmpsrv$(EXT) rtmpsuck$(EXT) $(SBINDIR) +- cp rtmpdump.1 $(MANDIR)/man1 +- cp rtmpgw.8 $(MANDIR)/man8 - @cd librtmp; $(MAKE) install ++ ${BSD_INSTALL_PROGRAM} rtmpdump$(EXT) $(BINDIR) ++ ${BSD_INSTALL_PROGRAM} rtmpgw$(EXT) rtmpsrv$(EXT) rtmpsuck$(EXT) $(SBINDIR) ++ ${BSD_INSTALL_DATA} rtmpdump.1 $(MANDIR)/man1 ++ ${BSD_INSTALL_DATA} rtmpgw.8 $(MANDIR)/man8 clean: rm -f *.o rtmpdump$(EXT) rtmpgw$(EXT) rtmpsrv$(EXT) rtmpsuck$(EXT) diff --git a/net-mgmt/Makefile b/net-mgmt/Makefile index a78c41b1bf7..2526bda515d 100644 --- a/net-mgmt/Makefile +++ b/net-mgmt/Makefile @@ -311,6 +311,7 @@ SUBDIR += statsd SUBDIR += statsite SUBDIR += subcalc + SUBDIR += super_mediator SUBDIR += sx SUBDIR += sysmon SUBDIR += tcpreplay diff --git a/net-mgmt/super_mediator/Makefile b/net-mgmt/super_mediator/Makefile new file mode 100644 index 00000000000..9ac8ffd0bfe --- /dev/null +++ b/net-mgmt/super_mediator/Makefile @@ -0,0 +1,48 @@ +# Created by: Inacio +# $FreeBSD$ + +PORTNAME= super_mediator +PORTVERSION= 1.2.2 +CATEGORIES= net-mgmt +MASTER_SITES= http://tools.netsa.cert.org/releases/ + +MAINTAINER= nacho319+freebsdZilla@gmail.com +COMMENT= SuperMediator is an IPFIX mediator by CMU CERT generally used with YAF + +LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING + +LIB_DEPENDS= libfixbuf.so:${PORTSDIR}/net/libfixbuf \ + libltdl.so:${PORTSDIR}/devel/libltdl + +GNU_CONFIGURE= yes +INSTALL_TARGET= install-strip +USES= libtool pathfix perl5 pkgconfig +USE_GNOME= glib20 +USE_LDCONFIG= yes + +PLIST_SUB+= PORTVERSION="${PORTVERSION}" + +OPTIONS_DEFINE= SPREAD MYSQL SKIPSET +OPTIONS_DEFAULT= MYSQL SKIPSET + +SPREAD_DESC= Enable Spread libary as a pub/sub distribution capability +MYSQL_DESC= Enable SuperMediator to directly write into MySQL +SKIPSET_DESC= Enable SiLK IPSET files for filtering + +SKIPSET_LIB_DEPENDS= libsilk.so:${PORTSDIR}/security/silktools +SPREAD_LIB_DEPENDS= libspread.so:${PORTSDIR}/net/spread4 +MYSQL_LIB_DEPENDS= libmysqlclient.so:${PORTSDIR}/${_MYSQL_CLIENT} + +MYSQL_USE= mysql=yes + +MYSQL_CONFIGURE_WITH= mysql +SKIPSET_CONFIGURE_WITH= skipset +SPREAD_CONFIGURE_WITH= spread + +post-install: +.for f in super_mediator.conf + ${MV} ${STAGEDIR}${PREFIX}/etc/$f ${STAGEDIR}${PREFIX}/etc/$f.sample +.endfor + +.include diff --git a/net-mgmt/super_mediator/distinfo b/net-mgmt/super_mediator/distinfo new file mode 100644 index 00000000000..a5af3bd3e5c --- /dev/null +++ b/net-mgmt/super_mediator/distinfo @@ -0,0 +1,6 @@ +SHA256 (super_mediator-1.2.2.tar.gz) = 13c8680d322a2aeb2c4142ffad260ffe24033767c5a7423aff77a0111bbf780c +SIZE (super_mediator-1.2.2.tar.gz) = 677300 +SHA256 (super_mediator-1.2.0.tar.gz) = b38f9d7bca53ac03a49ea82750cc7788bb44605472b192afbcfad000976fa64f +SIZE (super_mediator-1.2.0.tar.gz) = 675848 +SHA256 (super_mediator-1.1.1.tar.gz) = a23afd76b1517b21b6226b6aee0736d7d0ae60c2c0e8aa4a27241392794ab9b2 +SIZE (super_mediator-1.1.1.tar.gz) = 637677 diff --git a/net-mgmt/super_mediator/pkg-descr b/net-mgmt/super_mediator/pkg-descr new file mode 100644 index 00000000000..b547a765105 --- /dev/null +++ b/net-mgmt/super_mediator/pkg-descr @@ -0,0 +1,8 @@ +super_mediator is an IPFIX mediator designed to split IPFIX sensing flows +and distribute the network telemetry information to multiple sources. It +can export the network telemetry data gathered into formats designed for +bulk loading into databases (e.g. MySQL) or as JSON outputs, as well as +directly loading MySQL tables. super_mediator is primarily designed to get +network telemetry data from YAF. + +WWW: http://tools.netsa.cert.org/super_mediator/ diff --git a/net-mgmt/super_mediator/pkg-plist b/net-mgmt/super_mediator/pkg-plist new file mode 100644 index 00000000000..60b3836e02d --- /dev/null +++ b/net-mgmt/super_mediator/pkg-plist @@ -0,0 +1,6 @@ +man/man1/super_mediator.conf.1.gz +man/man1/super_table_creator.1.gz +man/man1/super_mediator.1.gz +bin/super_table_creator +bin/super_mediator +@sample etc/super_mediator.conf.sample diff --git a/net/dpinger/Makefile b/net/dpinger/Makefile index 6a0cfa9a981..82917edd56c 100644 --- a/net/dpinger/Makefile +++ b/net/dpinger/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= dpinger -PORTVERSION= 1.8 +PORTVERSION= 1.10 DISTVERSIONPREFIX= v CATEGORIES= net diff --git a/net/dpinger/distinfo b/net/dpinger/distinfo index b79b54181e2..b9cbf04b519 100644 --- a/net/dpinger/distinfo +++ b/net/dpinger/distinfo @@ -1,2 +1,2 @@ -SHA256 (dennypage-dpinger-v1.8_GH0.tar.gz) = c25265f4099f3d52cb905ba4249091e390badbf19a65ea115616b0f593b7cfa3 -SIZE (dennypage-dpinger-v1.8_GH0.tar.gz) = 13464 +SHA256 (dennypage-dpinger-v1.10_GH0.tar.gz) = 60637e2edbb12b87ed2d9776f8a2a239aada470807fb4b8f6db0ddaed3ef6b92 +SIZE (dennypage-dpinger-v1.10_GH0.tar.gz) = 13465 diff --git a/net/dpinger/files/patch-dpinger.c b/net/dpinger/files/patch-dpinger.c new file mode 100644 index 00000000000..e6761ae4a8e --- /dev/null +++ b/net/dpinger/files/patch-dpinger.c @@ -0,0 +1,20 @@ +--- dpinger.c.orig 2016-02-28 05:29:33 UTC ++++ dpinger.c +@@ -1018,7 +1018,7 @@ parse_args( + + default: + usage(); +- fatal(NULL); ++ exit(EXIT_FAILURE); + } + } + +@@ -1026,7 +1026,7 @@ parse_args( + if (argc != optind + 1) + { + usage(); +- fatal(NULL); ++ exit(EXIT_FAILURE); + } + dest_arg = argv[optind]; + diff --git a/net/elixir-kafka_ex/Makefile b/net/elixir-kafka_ex/Makefile index 75cde237f7d..41807ec4bca 100644 --- a/net/elixir-kafka_ex/Makefile +++ b/net/elixir-kafka_ex/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= kafka_ex -PORTVERSION= 0.4.0 +PORTVERSION= 0.5.0 CATEGORIES= net PKGNAMEPREFIX= elixir- diff --git a/net/elixir-kafka_ex/distinfo b/net/elixir-kafka_ex/distinfo index e172ed6d079..47d8dfdf747 100644 --- a/net/elixir-kafka_ex/distinfo +++ b/net/elixir-kafka_ex/distinfo @@ -1,2 +1,2 @@ -SHA256 (jacklund-kafka_ex-0.4.0_GH0.tar.gz) = 481f512feb749d6e3b3262e77bb87749efceba4a6bbeddb65bb9fcaa945b557e -SIZE (jacklund-kafka_ex-0.4.0_GH0.tar.gz) = 594848 +SHA256 (jacklund-kafka_ex-0.5.0_GH0.tar.gz) = 70c3a2ff5a704e773059bdada89b5d60a9d2083e4885d6cbf3e05965d035b86f +SIZE (jacklund-kafka_ex-0.5.0_GH0.tar.gz) = 597697 diff --git a/net/elixir-kafka_ex/pkg-plist b/net/elixir-kafka_ex/pkg-plist index 8aa1dad0536..5cc38caadac 100644 --- a/net/elixir-kafka_ex/pkg-plist +++ b/net/elixir-kafka_ex/pkg-plist @@ -4,7 +4,6 @@ lib/elixir/lib/kafka_ex/ebin/Elixir.KafkaEx.NetworkClient.beam lib/elixir/lib/kafka_ex/ebin/Elixir.KafkaEx.Protocol.ConsumerMetadata.Response.beam lib/elixir/lib/kafka_ex/ebin/Elixir.KafkaEx.Protocol.ConsumerMetadata.beam lib/elixir/lib/kafka_ex/ebin/Elixir.KafkaEx.Protocol.Fetch.Message.beam -lib/elixir/lib/kafka_ex/ebin/Elixir.KafkaEx.Protocol.Fetch.Request.beam lib/elixir/lib/kafka_ex/ebin/Elixir.KafkaEx.Protocol.Fetch.Response.beam lib/elixir/lib/kafka_ex/ebin/Elixir.KafkaEx.Protocol.Fetch.beam lib/elixir/lib/kafka_ex/ebin/Elixir.KafkaEx.Protocol.Metadata.Broker.beam @@ -28,6 +27,7 @@ lib/elixir/lib/kafka_ex/ebin/Elixir.KafkaEx.Protocol.Produce.Response.beam lib/elixir/lib/kafka_ex/ebin/Elixir.KafkaEx.Protocol.Produce.beam lib/elixir/lib/kafka_ex/ebin/Elixir.KafkaEx.Protocol.beam lib/elixir/lib/kafka_ex/ebin/Elixir.KafkaEx.Server.beam +lib/elixir/lib/kafka_ex/ebin/Elixir.KafkaEx.Server.State.beam lib/elixir/lib/kafka_ex/ebin/Elixir.KafkaEx.Supervisor.beam lib/elixir/lib/kafka_ex/ebin/Elixir.KafkaEx.beam lib/elixir/lib/kafka_ex/ebin/Elixir.KafkaExHandler.beam diff --git a/net/py-miniupnpc/Makefile b/net/py-miniupnpc/Makefile index ed01b7b6801..490384db815 100644 --- a/net/py-miniupnpc/Makefile +++ b/net/py-miniupnpc/Makefile @@ -15,10 +15,6 @@ USE_PYTHON= autoplist distutils WRKDIR= ${WRKDIRPREFIX}${MASTERDIR}/work PLIST= ${.CURDIR}/pkg-plist -.if exists(${.CURDIR}/Makefile.local) -.include "${.CURDIR}/Makefile.local" -.endif - post-patch: ${REINPLACE_CMD} 's/\(version\)="[^"]*"/\1="${PORTVERSION}"/' \ ${WRKSRC}/setup.py diff --git a/net/tcpkali/Makefile b/net/tcpkali/Makefile index 58a1d23b312..891f9652015 100644 --- a/net/tcpkali/Makefile +++ b/net/tcpkali/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= tcpkali -PORTVERSION= 0.7 +PORTVERSION= 0.8 DISTVERSIONPREFIX= v CATEGORIES= net diff --git a/net/tcpkali/distinfo b/net/tcpkali/distinfo index f333b1f328f..8b88e96c4ac 100644 --- a/net/tcpkali/distinfo +++ b/net/tcpkali/distinfo @@ -1,2 +1,2 @@ -SHA256 (machinezone-tcpkali-v0.7_GH0.tar.gz) = 3cf07cb7b8b209dc5cb36b0e1a6186ac9b10ced4c2de406fd2944da2330d4795 -SIZE (machinezone-tcpkali-v0.7_GH0.tar.gz) = 396180 +SHA256 (machinezone-tcpkali-v0.8_GH0.tar.gz) = 1f59d91c0eda843e3ea6890910f299f9bcd6a72cae507d4e797a0a0353f5c81e +SIZE (machinezone-tcpkali-v0.8_GH0.tar.gz) = 408180 diff --git a/news/suck-cnews/Makefile b/news/suck-cnews/Makefile index dcbf964f724..f74594b7226 100644 --- a/news/suck-cnews/Makefile +++ b/news/suck-cnews/Makefile @@ -8,8 +8,4 @@ MASTERDIR= ${.CURDIR}/../suck OPTIONS_DEFAULT= SSL CNEWS -.if exists(${.CURDIR}/Makefile.local) -.include "${.CURDIR}/Makefile.local" -.endif - .include "${MASTERDIR}/Makefile" diff --git a/polish/webalizer2/Makefile b/polish/webalizer2/Makefile index 288412539b2..6d02b7af620 100644 --- a/polish/webalizer2/Makefile +++ b/polish/webalizer2/Makefile @@ -8,8 +8,4 @@ MAINTAINER= wtp@bsdguru.org MASTERDIR?= ${.CURDIR}/../../www/webalizer WEBALIZER_LANG= polish -.if exists(${.CURDIR}/Makefile.local) -.include "${.CURDIR}/Makefile.local" -.endif - .include "${MASTERDIR}/Makefile" diff --git a/portuguese/webalizer-pt_BR/Makefile b/portuguese/webalizer-pt_BR/Makefile index 953289300a2..ee17ab97515 100644 --- a/portuguese/webalizer-pt_BR/Makefile +++ b/portuguese/webalizer-pt_BR/Makefile @@ -8,8 +8,4 @@ MAINTAINER= ports@FreeBSD.org MASTERDIR?= ${.CURDIR}/../../www/webalizer WEBALIZER_LANG= portuguese_brazil -.if exists(${.CURDIR}/Makefile.local) -.include "${.CURDIR}/Makefile.local" -.endif - .include "${MASTERDIR}/Makefile" diff --git a/portuguese/webalizer-pt_PT/Makefile b/portuguese/webalizer-pt_PT/Makefile index fba2f622769..0fed71400f9 100644 --- a/portuguese/webalizer-pt_PT/Makefile +++ b/portuguese/webalizer-pt_PT/Makefile @@ -8,8 +8,4 @@ MAINTAINER= ports@FreeBSD.org MASTERDIR?= ${.CURDIR}/../../www/webalizer WEBALIZER_LANG= portuguese -.if exists(${.CURDIR}/Makefile.local) -.include "${.CURDIR}/Makefile.local" -.endif - .include "${MASTERDIR}/Makefile" diff --git a/print/cups-client/Makefile b/print/cups-client/Makefile index 4045bdc8ef2..b0f24a04640 100644 --- a/print/cups-client/Makefile +++ b/print/cups-client/Makefile @@ -8,5 +8,4 @@ MASTERDIR?= ${.CURDIR}/../cups-base CUPS_CLIENT= yes -.sinclude "${.CURDIR}/Makefile.local" .include "${MASTERDIR}/Makefile" diff --git a/print/cups-image/Makefile b/print/cups-image/Makefile index ec3e010e23b..283b9a14839 100644 --- a/print/cups-image/Makefile +++ b/print/cups-image/Makefile @@ -8,5 +8,4 @@ MASTERDIR?= ${.CURDIR}/../cups-base CUPS_IMAGE= yes -.sinclude "${.CURDIR}/Makefile.local" .include "${MASTERDIR}/Makefile" diff --git a/russian/gd/Makefile b/russian/gd/Makefile index 6e7b4b5de40..2f19e7bd943 100644 --- a/russian/gd/Makefile +++ b/russian/gd/Makefile @@ -11,8 +11,4 @@ BUILD_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/x11-fonts/geminifonts:fetch GD_FONTS= ${DISTDIR}/x-koi8u.tgz koi6x10.bdf koi6x13.bdf \ koi10x16b.bdf koi9x15.bdf koi10x20.bdf -.if exists(${.CURDIR}/Makefile.local) -.include "${.CURDIR}/Makefile.local" -.endif - .include "${MASTERDIR}/Makefile" diff --git a/security/certificate-transparency/Makefile b/security/certificate-transparency/Makefile index 0286ade9c80..cbfd2ca1377 100644 --- a/security/certificate-transparency/Makefile +++ b/security/certificate-transparency/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= certificate-transparency -PORTVERSION= 20151025 +PORTVERSION= 20160102 CATEGORIES= security MAINTAINER= trasz@FreeBSD.org @@ -18,6 +18,7 @@ LIB_DEPENDS?= libevent.so:${PORTSDIR}/devel/libevent2 \ libgmock.so:${PORTSDIR}/devel/googlemock \ libjson-c.so:${PORTSDIR}/devel/json-c \ libleveldb.so:${PORTSDIR}/databases/leveldb \ + libobjecthash.so:${PORTSDIR}/devel/objecthash \ libprotobuf.so:${PORTSDIR}/devel/protobuf \ libsqlite3.so:${PORTSDIR}/databases/sqlite3 \ libtcmalloc.so:${PORTSDIR}/devel/google-perftools @@ -31,7 +32,7 @@ MAKE_FLAGS+= "V=1" USE_GITHUB= yes GH_ACCOUNT= google GH_PROJECT= certificate-transparency -GH_TAGNAME= 7e1cf3b +GH_TAGNAME= 1cdd6b5 CPPFLAGS+= "-I${LOCALBASE}/include" CPPFLAGS+= "-I${LOCALBASE}/include/evhtp" diff --git a/security/certificate-transparency/distinfo b/security/certificate-transparency/distinfo index 30f87e51874..e419627dbee 100644 --- a/security/certificate-transparency/distinfo +++ b/security/certificate-transparency/distinfo @@ -1,2 +1,2 @@ -SHA256 (google-certificate-transparency-20151025-7e1cf3b_GH0.tar.gz) = d8f4beac5a9d0b8248c9d3c4c318160937b6a26e84401fb262c326c5bc57fd9c -SIZE (google-certificate-transparency-20151025-7e1cf3b_GH0.tar.gz) = 10404561 +SHA256 (google-certificate-transparency-20160102-1cdd6b5_GH0.tar.gz) = 7d84ffb97bf35729715aef8de5d471f4e83d3a48dbf5cec27a75bc03f0db5bce +SIZE (google-certificate-transparency-20160102-1cdd6b5_GH0.tar.gz) = 10441387 diff --git a/security/certificate-transparency/files/patch-Makefile.am b/security/certificate-transparency/files/patch-Makefile.am index 2ed94722fb7..01a95272bdf 100644 --- a/security/certificate-transparency/files/patch-Makefile.am +++ b/security/certificate-transparency/files/patch-Makefile.am @@ -1,6 +1,14 @@ ---- Makefile.am.orig 2015-10-24 17:22:55.332874000 +0200 -+++ Makefile.am 2015-10-24 17:22:58.002519000 +0200 -@@ -9,8 +9,6 @@ AM_CXXFLAGS = \ +--- Makefile.am.orig 2016-02-02 11:35:23 UTC ++++ Makefile.am +@@ -3,7 +3,6 @@ ACLOCAL_AMFLAGS = -Im4 + AM_CPPFLAGS = \ + -I$(GMOCK_DIR)/include \ + -I$(GTEST_DIR)/include \ +- -Ithird_party/objecthash \ + $(evhtp_CFLAGS) \ + $(icu_CFLAGS) \ + $(json_c_CFLAGS) +@@ -12,8 +11,6 @@ AM_CXXFLAGS = \ -fno-exceptions BUILT_SOURCES = \ @@ -9,7 +17,7 @@ cpp/monitoring/prometheus/metrics.pb.cc \ cpp/monitoring/prometheus/metrics.pb.h \ proto/ct.pb.cc \ -@@ -115,9 +113,6 @@ endif +@@ -124,9 +121,6 @@ endif cpp/gtest-all.cc: $(GTEST_DIR)/src/gtest-all.cc $(AM_V_at)cp $^ $@ @@ -19,7 +27,7 @@ test/testdata/urlfetcher_test_certs/localhost-key.pem: test/create_url_fetcher_test_certs.sh $(AM_V_GEN)test/create_url_fetcher_test_certs.sh -@@ -186,8 +181,6 @@ cpp_libtest_a_CPPFLAGS = \ +@@ -215,8 +209,6 @@ cpp_libtest_a_CPPFLAGS = \ -I$(GTEST_DIR) \ $(AM_CPPFLAGS) cpp_libtest_a_SOURCES = \ @@ -28,3 +36,13 @@ cpp/util/testing.cc cpp_server_ct_mirror_LDADD = \ +@@ -297,8 +289,7 @@ cpp_server_xjson_server_SOURCES = \ + cpp/server/server_helper.cc \ + cpp/server/xjson-server.cc \ + cpp/server/x_json_handler.cc \ +- cpp/util/json_wrapper.cc \ +- third_party/objecthash/objecthash.cc ++ cpp/util/json_wrapper.cc + + cpp_tools_ct_clustertool_LDADD = \ + cpp/libcore.a \ diff --git a/security/certificate-transparency/files/patch-configure.ac b/security/certificate-transparency/files/patch-configure.ac index 45c7155df5d..3e37c44b11b 100644 --- a/security/certificate-transparency/files/patch-configure.ac +++ b/security/certificate-transparency/files/patch-configure.ac @@ -1,5 +1,5 @@ ---- configure.ac.orig 2015-10-23 16:31:08.000000000 +0200 -+++ configure.ac 2015-11-23 19:43:54.895959000 +0100 +--- configure.ac.orig 2016-02-02 11:35:23 UTC ++++ configure.ac @@ -83,9 +83,7 @@ AC_CHECK_HEADER([gtest/gtest.h],, [missi AS_VAR_APPEND([CPPFLAGS], [" -I$GMOCK_DIR/include"]) AC_CHECK_HEADER([gmock/gmock.h],, [missing_gmock=1]) diff --git a/security/certificate-transparency/files/patch-cpp-client-ct.cc b/security/certificate-transparency/files/patch-cpp-client-ct.cc index 6621e0ecb9a..8bf5e234405 100644 --- a/security/certificate-transparency/files/patch-cpp-client-ct.cc +++ b/security/certificate-transparency/files/patch-cpp-client-ct.cc @@ -1,6 +1,6 @@ ---- cpp/client/ct.cc.orig 2015-10-24 17:45:59.877372000 +0200 -+++ cpp/client/ct.cc 2015-10-24 17:47:35.728512000 +0200 -@@ -458,8 +458,8 @@ static void MakeCert() { +--- cpp/client/ct.cc.orig 2016-02-02 11:35:23 UTC ++++ cpp/client/ct.cc +@@ -461,8 +461,8 @@ static void MakeCert() { // (This means the relevant section should be last in the configuration.) // 1.2.3.1=DER:[raw encoding of proof] static void WriteProofToConfig() { @@ -11,7 +11,7 @@ string sct; -@@ -486,8 +486,8 @@ static const char kPEMLabel[] = "SERVERI +@@ -489,8 +489,8 @@ static const char kPEMLabel[] = "SERVERI // Wrap the proof in the format expected by the TLS extension, // so that we can feed it to OpenSSL. static void ProofToExtensionData() { @@ -22,7 +22,7 @@ string serialized_sct; PCHECK(util::ReadBinaryFile(FLAGS_sct_token, &serialized_sct)) -@@ -986,12 +986,12 @@ int Monitor() { +@@ -990,12 +990,12 @@ int Monitor() { // Exit code upon abnormal exit (CHECK failures): != 0 // (on UNIX, 134 is expected) int main(int argc, char** argv) { @@ -37,7 +37,7 @@ return 1; } -@@ -1031,7 +1031,7 @@ int main(int argc, char** argv) { +@@ -1035,7 +1035,7 @@ int main(int argc, char** argv) { } else if (cmd == "sth") { ret = GetSTH(); } else { diff --git a/security/certificate-transparency/files/patch-cpp-fetcher-remote_peer_test.cc b/security/certificate-transparency/files/patch-cpp-fetcher-remote_peer_test.cc index 9280c3fc581..d20d0b3631a 100644 --- a/security/certificate-transparency/files/patch-cpp-fetcher-remote_peer_test.cc +++ b/security/certificate-transparency/files/patch-cpp-fetcher-remote_peer_test.cc @@ -1,5 +1,5 @@ ---- cpp/fetcher/remote_peer_test.cc.orig 2015-11-20 15:20:24.460754000 +0100 -+++ cpp/fetcher/remote_peer_test.cc 2015-11-20 15:22:18.618590000 +0100 +--- cpp/fetcher/remote_peer_test.cc.orig 2016-02-02 11:35:23 UTC ++++ cpp/fetcher/remote_peer_test.cc @@ -1,5 +1,8 @@ #include #include @@ -8,4 +8,4 @@ +#define GTEST_HAS_POSIX_RE 0 #include #include - #include "log/etcd_consistent_store.h" + #include diff --git a/security/certificate-transparency/files/patch-cpp-log-cluster_state_controller_test.cc b/security/certificate-transparency/files/patch-cpp-log-cluster_state_controller_test.cc index ad17dadd00d..c49980c8a63 100644 --- a/security/certificate-transparency/files/patch-cpp-log-cluster_state_controller_test.cc +++ b/security/certificate-transparency/files/patch-cpp-log-cluster_state_controller_test.cc @@ -1,5 +1,5 @@ ---- cpp/log/cluster_state_controller_test.cc.orig 2015-11-20 15:24:59.021489000 +0100 -+++ cpp/log/cluster_state_controller_test.cc 2015-11-20 15:25:23.094886000 +0100 +--- cpp/log/cluster_state_controller_test.cc.orig 2016-02-02 11:35:23 UTC ++++ cpp/log/cluster_state_controller_test.cc @@ -1,3 +1,6 @@ +// Without this, build will fail due to clash between onigposix.h +// and regex.h; note it's only compiled with "make check". diff --git a/security/certificate-transparency/files/patch-cpp-log-etcd_consistent_store_test.cc b/security/certificate-transparency/files/patch-cpp-log-etcd_consistent_store_test.cc index 66a42331b4e..ffbbe6b076a 100644 --- a/security/certificate-transparency/files/patch-cpp-log-etcd_consistent_store_test.cc +++ b/security/certificate-transparency/files/patch-cpp-log-etcd_consistent_store_test.cc @@ -1,12 +1,12 @@ ---- cpp/log/etcd_consistent_store_test.cc.orig 2015-11-20 15:30:32.679028000 +0100 -+++ cpp/log/etcd_consistent_store_test.cc 2015-11-20 15:30:49.997410000 +0100 -@@ -3,6 +3,9 @@ - #include - #include +--- cpp/log/etcd_consistent_store_test.cc.orig 2016-02-02 11:35:23 UTC ++++ cpp/log/etcd_consistent_store_test.cc +@@ -1,6 +1,9 @@ + #include "log/etcd_consistent_store.h" + #include +// Without this, build will fail due to clash between onigposix.h +// and regex.h; note it's only compiled with "make check". +#define GTEST_HAS_POSIX_RE 0 #include #include - #include + #include diff --git a/security/certificate-transparency/files/patch-cpp-log-frontend_signer_test.cc b/security/certificate-transparency/files/patch-cpp-log-frontend_signer_test.cc index 8ab658c9688..e28b5b9acee 100644 --- a/security/certificate-transparency/files/patch-cpp-log-frontend_signer_test.cc +++ b/security/certificate-transparency/files/patch-cpp-log-frontend_signer_test.cc @@ -1,5 +1,5 @@ ---- cpp/log/frontend_signer_test.cc.orig 2015-11-20 15:32:59.815039000 +0100 -+++ cpp/log/frontend_signer_test.cc 2015-11-20 15:33:30.684240000 +0100 +--- cpp/log/frontend_signer_test.cc.orig 2016-02-02 11:35:23 UTC ++++ cpp/log/frontend_signer_test.cc @@ -1,5 +1,8 @@ /* -*- indent-tabs-mode: nil -*- */ #include diff --git a/security/certificate-transparency/files/patch-cpp-log-frontend_test.cc b/security/certificate-transparency/files/patch-cpp-log-frontend_test.cc index e0d6c4b8a9a..8d791085155 100644 --- a/security/certificate-transparency/files/patch-cpp-log-frontend_test.cc +++ b/security/certificate-transparency/files/patch-cpp-log-frontend_test.cc @@ -1,5 +1,5 @@ ---- cpp/log/frontend_test.cc.orig 2015-11-20 15:34:34.528539000 +0100 -+++ cpp/log/frontend_test.cc 2015-11-20 15:34:47.368662000 +0100 +--- cpp/log/frontend_test.cc.orig 2016-02-02 11:35:23 UTC ++++ cpp/log/frontend_test.cc @@ -1,5 +1,8 @@ /* -*- indent-tabs-mode: nil -*- */ #include @@ -8,4 +8,4 @@ +#define GTEST_HAS_POSIX_RE 0 #include #include - #include + #include diff --git a/security/certificate-transparency/files/patch-cpp-log-log_lookup_test.cc b/security/certificate-transparency/files/patch-cpp-log-log_lookup_test.cc index 39ccca929b2..de1ec8d75c6 100644 --- a/security/certificate-transparency/files/patch-cpp-log-log_lookup_test.cc +++ b/security/certificate-transparency/files/patch-cpp-log-log_lookup_test.cc @@ -1,5 +1,5 @@ ---- cpp/log/log_lookup_test.cc.orig 2015-11-20 15:36:32.679863000 +0100 -+++ cpp/log/log_lookup_test.cc 2015-11-20 15:36:50.639269000 +0100 +--- cpp/log/log_lookup_test.cc.orig 2016-02-02 11:35:23 UTC ++++ cpp/log/log_lookup_test.cc @@ -1,4 +1,7 @@ /* -*- indent-tabs-mode: nil -*- */ +// Without this, build will fail due to clash between onigposix.h diff --git a/security/certificate-transparency/files/patch-cpp-log-tree_signer_test.cc b/security/certificate-transparency/files/patch-cpp-log-tree_signer_test.cc index 60f426d62e3..54e81ea4788 100644 --- a/security/certificate-transparency/files/patch-cpp-log-tree_signer_test.cc +++ b/security/certificate-transparency/files/patch-cpp-log-tree_signer_test.cc @@ -1,10 +1,10 @@ ---- cpp/log/tree_signer_test.cc.orig 2015-11-20 15:50:58.101424000 +0100 -+++ cpp/log/tree_signer_test.cc 2015-11-20 15:51:15.216405000 +0100 +--- cpp/log/tree_signer_test.cc.orig 2016-02-02 11:35:23 UTC ++++ cpp/log/tree_signer_test.cc @@ -1,4 +1,7 @@ /* -*- indent-tabs-mode: nil -*- */ +// Without this, build will fail due to clash between onigposix.h +// and regex.h; note it's only compiled with "make check". +#define GTEST_HAS_POSIX_RE 0 #include - #include #include + #include diff --git a/security/certificate-transparency/files/patch-cpp-net-url_fetcher_test.cc b/security/certificate-transparency/files/patch-cpp-net-url_fetcher_test.cc index 46bb352bd83..3863e2c6e0b 100644 --- a/security/certificate-transparency/files/patch-cpp-net-url_fetcher_test.cc +++ b/security/certificate-transparency/files/patch-cpp-net-url_fetcher_test.cc @@ -1,6 +1,6 @@ ---- cpp/net/url_fetcher_test.cc.orig 2015-11-20 15:17:37.750964000 +0100 -+++ cpp/net/url_fetcher_test.cc 2015-11-20 15:18:12.043994000 +0100 -@@ -8,6 +8,9 @@ +--- cpp/net/url_fetcher_test.cc.orig 2016-02-02 11:35:23 UTC ++++ cpp/net/url_fetcher_test.cc +@@ -7,6 +7,9 @@ #include #include #include @@ -8,5 +8,5 @@ +// and regex.h; note it's only compiled with "make check". +#define GTEST_HAS_POSIX_RE 0 #include + #include #ifdef HAVE_NETDB_H - # include diff --git a/security/certificate-transparency/files/patch-cpp-server-ct-mirror.cc b/security/certificate-transparency/files/patch-cpp-server-ct-mirror.cc index c42e1394e9f..80d8e91b98d 100644 --- a/security/certificate-transparency/files/patch-cpp-server-ct-mirror.cc +++ b/security/certificate-transparency/files/patch-cpp-server-ct-mirror.cc @@ -1,6 +1,6 @@ ---- cpp/server/ct-mirror.cc.orig 2015-10-24 17:49:55.279261000 +0200 -+++ cpp/server/ct-mirror.cc 2015-10-24 17:50:05.284510000 +0200 -@@ -124,7 +124,7 @@ using cert_trans::Update; +--- cpp/server/ct-mirror.cc.orig 2016-02-02 11:35:23 UTC ++++ cpp/server/ct-mirror.cc +@@ -98,7 +98,7 @@ using cert_trans::Update; using cert_trans::UrlFetcher; using ct::ClusterNodeState; using ct::SignedTreeHead; diff --git a/security/certificate-transparency/files/patch-cpp-server-ct-mirror_v2.cc b/security/certificate-transparency/files/patch-cpp-server-ct-mirror_v2.cc new file mode 100644 index 00000000000..a8fac4657be --- /dev/null +++ b/security/certificate-transparency/files/patch-cpp-server-ct-mirror_v2.cc @@ -0,0 +1,11 @@ +--- cpp/server/ct-mirror_v2.cc.orig 2016-02-02 11:35:23 UTC ++++ cpp/server/ct-mirror_v2.cc +@@ -91,7 +91,7 @@ using cert_trans::Update; + using cert_trans::UrlFetcher; + using ct::ClusterNodeState; + using ct::SignedTreeHead; +-using google::RegisterFlagValidator; ++using gflags::RegisterFlagValidator; + using std::bind; + using std::chrono::duration; + using std::chrono::duration_cast; diff --git a/security/certificate-transparency/files/patch-cpp-server-ct-server.cc b/security/certificate-transparency/files/patch-cpp-server-ct-server.cc index b93862c1844..e420a0e705b 100644 --- a/security/certificate-transparency/files/patch-cpp-server-ct-server.cc +++ b/security/certificate-transparency/files/patch-cpp-server-ct-server.cc @@ -1,11 +1,11 @@ ---- cpp/server/ct-server.cc.orig 2015-10-24 17:48:38.840376000 +0200 -+++ cpp/server/ct-server.cc 2015-10-24 17:49:03.684762000 +0200 -@@ -116,7 +116,7 @@ using cert_trans::Update; +--- cpp/server/ct-server.cc.orig 2016-02-02 11:35:23 UTC ++++ cpp/server/ct-server.cc +@@ -64,7 +64,7 @@ using cert_trans::TreeSigner; using cert_trans::UrlFetcher; using ct::ClusterNodeState; using ct::SignedTreeHead; -using google::RegisterFlagValidator; +using gflags::RegisterFlagValidator; using std::bind; - using std::chrono::duration; - using std::chrono::duration_cast; + using std::function; + using std::make_shared; diff --git a/security/certificate-transparency/files/patch-cpp-server-ct-server_v2.cc b/security/certificate-transparency/files/patch-cpp-server-ct-server_v2.cc new file mode 100644 index 00000000000..aa2681228cc --- /dev/null +++ b/security/certificate-transparency/files/patch-cpp-server-ct-server_v2.cc @@ -0,0 +1,11 @@ +--- cpp/server/ct-server_v2.cc.orig 2016-02-02 11:35:23 UTC ++++ cpp/server/ct-server_v2.cc +@@ -66,7 +66,7 @@ using cert_trans::TreeSigner; + using cert_trans::UrlFetcher; + using ct::ClusterNodeState; + using ct::SignedTreeHead; +-using google::RegisterFlagValidator; ++using gflags::RegisterFlagValidator; + using std::bind; + using std::function; + using std::make_shared; diff --git a/security/certificate-transparency/files/patch-cpp-server-log_processes.cc b/security/certificate-transparency/files/patch-cpp-server-log_processes.cc new file mode 100644 index 00000000000..396bde6fa46 --- /dev/null +++ b/security/certificate-transparency/files/patch-cpp-server-log_processes.cc @@ -0,0 +1,11 @@ +--- cpp/server/log_processes.cc.orig 2016-02-02 11:35:23 UTC ++++ cpp/server/log_processes.cc +@@ -23,7 +23,7 @@ DEFINE_int32(cleanup_frequency_seconds, + using cert_trans::Counter; + using cert_trans::Gauge; + using cert_trans::Latency; +-using google::RegisterFlagValidator; ++using gflags::RegisterFlagValidator; + using ct::SignedTreeHead; + using std::function; + using std::chrono::milliseconds; diff --git a/security/certificate-transparency/files/patch-cpp-server-server_helper.cc b/security/certificate-transparency/files/patch-cpp-server-server_helper.cc new file mode 100644 index 00000000000..be39a37ecb1 --- /dev/null +++ b/security/certificate-transparency/files/patch-cpp-server-server_helper.cc @@ -0,0 +1,11 @@ +--- cpp/server/server_helper.cc.orig 2016-02-02 11:35:23 UTC ++++ cpp/server/server_helper.cc +@@ -4,7 +4,7 @@ + #include "util/fake_etcd.h" + + using cert_trans::Server; +-using google::RegisterFlagValidator; ++using gflags::RegisterFlagValidator; + using std::string; + using std::unique_ptr; + diff --git a/security/certificate-transparency/files/patch-cpp-server-xjson-server.cc b/security/certificate-transparency/files/patch-cpp-server-xjson-server.cc new file mode 100644 index 00000000000..08468cc2e84 --- /dev/null +++ b/security/certificate-transparency/files/patch-cpp-server-xjson-server.cc @@ -0,0 +1,11 @@ +--- cpp/server/xjson-server.cc.orig 2016-02-02 11:35:23 UTC ++++ cpp/server/xjson-server.cc +@@ -63,7 +63,7 @@ using cert_trans::UrlFetcher; + using cert_trans::XJsonHttpHandler; + using ct::ClusterNodeState; + using ct::SignedTreeHead; +-using google::RegisterFlagValidator; ++using gflags::RegisterFlagValidator; + using std::bind; + using std::function; + using std::make_shared; diff --git a/security/certificate-transparency/files/patch-cpp-tools-dump_sth.cc b/security/certificate-transparency/files/patch-cpp-tools-dump_sth.cc index d4cc82fc5c8..9b4565d7e10 100644 --- a/security/certificate-transparency/files/patch-cpp-tools-dump_sth.cc +++ b/security/certificate-transparency/files/patch-cpp-tools-dump_sth.cc @@ -1,9 +1,9 @@ ---- cpp/tools/dump_sth.cc.orig 2015-10-27 10:35:13.973569000 +0100 -+++ cpp/tools/dump_sth.cc 2015-10-27 10:35:44.745588000 +0100 -@@ -26,11 +26,11 @@ void DumpSth(const char *filename) { +--- cpp/tools/dump_sth.cc.orig 2016-02-02 11:35:23 UTC ++++ cpp/tools/dump_sth.cc +@@ -26,11 +26,11 @@ void DumpSth(const char* filename) { - int main(int argc, char *argv[]) { + int main(int argc, char* argv[]) { - google::SetVersionString(cert_trans::kBuildVersion); - google::ParseCommandLineFlags(&argc, &argv, true); + gflags::SetVersionString(cert_trans::kBuildVersion); diff --git a/security/certificate-transparency/files/patch-cpp-util-bignum.h b/security/certificate-transparency/files/patch-cpp-util-bignum.h new file mode 100644 index 00000000000..5ff4950859a --- /dev/null +++ b/security/certificate-transparency/files/patch-cpp-util-bignum.h @@ -0,0 +1,10 @@ +--- cpp/util/bignum.h.orig 2016-02-02 11:35:23 UTC ++++ cpp/util/bignum.h +@@ -3,6 +3,7 @@ + + #include + #include ++#include + + namespace cert_trans { + diff --git a/security/certificate-transparency/files/patch-cpp-util-etcd_masterelection.cc b/security/certificate-transparency/files/patch-cpp-util-etcd_masterelection.cc index 19dfd913cc4..567370b5e3b 100644 --- a/security/certificate-transparency/files/patch-cpp-util-etcd_masterelection.cc +++ b/security/certificate-transparency/files/patch-cpp-util-etcd_masterelection.cc @@ -1,5 +1,5 @@ ---- cpp/util/etcd_masterelection.cc.orig 2015-10-27 10:32:35.670615000 +0100 -+++ cpp/util/etcd_masterelection.cc 2015-10-27 10:33:16.624128000 +0100 +--- cpp/util/etcd_masterelection.cc.orig 2016-02-02 11:35:23 UTC ++++ cpp/util/etcd_masterelection.cc @@ -24,7 +24,7 @@ DEFINE_string(node_id, "", "unique node diff --git a/security/certificate-transparency/files/patch-cpp-util-etcd_test.cc b/security/certificate-transparency/files/patch-cpp-util-etcd_test.cc index 6d33d8ec3a0..92f4a642715 100644 --- a/security/certificate-transparency/files/patch-cpp-util-etcd_test.cc +++ b/security/certificate-transparency/files/patch-cpp-util-etcd_test.cc @@ -1,5 +1,5 @@ ---- cpp/util/etcd_test.cc.orig 2015-11-20 15:52:11.557932000 +0100 -+++ cpp/util/etcd_test.cc 2015-11-20 15:52:28.585505000 +0100 +--- cpp/util/etcd_test.cc.orig 2016-02-02 11:35:23 UTC ++++ cpp/util/etcd_test.cc @@ -1,3 +1,6 @@ +// Without this, build will fail due to clash between onigposix.h +// and regex.h; note it's only compiled with "make check". diff --git a/security/certificate-transparency/files/patch-cpp-util-fake_etcd_test.cc b/security/certificate-transparency/files/patch-cpp-util-fake_etcd_test.cc index f451deee867..dc30b260d8e 100644 --- a/security/certificate-transparency/files/patch-cpp-util-fake_etcd_test.cc +++ b/security/certificate-transparency/files/patch-cpp-util-fake_etcd_test.cc @@ -1,7 +1,7 @@ ---- cpp/util/fake_etcd_test.cc.orig 2015-11-20 15:53:01.290954000 +0100 -+++ cpp/util/fake_etcd_test.cc 2015-11-20 15:53:17.991665000 +0100 -@@ -4,6 +4,9 @@ - #include +--- cpp/util/fake_etcd_test.cc.orig 2016-02-02 11:35:23 UTC ++++ cpp/util/fake_etcd_test.cc +@@ -2,6 +2,9 @@ + #include #include +// Without this, build will fail due to clash between onigposix.h @@ -9,4 +9,4 @@ +#define GTEST_HAS_POSIX_RE 0 #include #include - #include + #include diff --git a/security/certificate-transparency/files/patch-cpp-util-init.cc b/security/certificate-transparency/files/patch-cpp-util-init.cc index 8a9a3237cec..c2a217e2468 100644 --- a/security/certificate-transparency/files/patch-cpp-util-init.cc +++ b/security/certificate-transparency/files/patch-cpp-util-init.cc @@ -1,6 +1,6 @@ ---- cpp/util/init.cc.orig 2015-10-24 17:36:31.678280000 +0200 -+++ cpp/util/init.cc 2015-10-24 17:37:42.378343000 +0200 -@@ -48,8 +48,8 @@ void LibEventLog(int severity, const cha +--- cpp/util/init.cc.orig 2016-02-02 11:35:23 UTC ++++ cpp/util/init.cc +@@ -49,8 +49,8 @@ void LibEventLog(int severity, const cha void InitCT(int* argc, char** argv[]) { @@ -11,7 +11,7 @@ google::InitGoogleLogging(*argv[0]); google::InstallFailureSignalHandler(); -@@ -67,7 +67,7 @@ void InitCT(int* argc, char** argv[]) { +@@ -68,7 +68,7 @@ void InitCT(int* argc, char** argv[]) { cert_trans::LoadCtExtensions(); diff --git a/security/certificate-transparency/files/patch-cpp-util-libevent_wrapper_test.cc b/security/certificate-transparency/files/patch-cpp-util-libevent_wrapper_test.cc index 2ec750e1d0d..9cfdfabd89d 100644 --- a/security/certificate-transparency/files/patch-cpp-util-libevent_wrapper_test.cc +++ b/security/certificate-transparency/files/patch-cpp-util-libevent_wrapper_test.cc @@ -1,5 +1,5 @@ ---- cpp/util/libevent_wrapper_test.cc.orig 2015-11-20 15:53:58.271952000 +0100 -+++ cpp/util/libevent_wrapper_test.cc 2015-11-20 15:54:14.240116000 +0100 +--- cpp/util/libevent_wrapper_test.cc.orig 2016-02-02 11:35:23 UTC ++++ cpp/util/libevent_wrapper_test.cc @@ -1,5 +1,8 @@ #include "util/libevent_wrapper.h" diff --git a/security/certificate-transparency/files/patch-cpp-util-masterelection_test.cc b/security/certificate-transparency/files/patch-cpp-util-masterelection_test.cc index ce1e48899ac..d9b3359eccf 100644 --- a/security/certificate-transparency/files/patch-cpp-util-masterelection_test.cc +++ b/security/certificate-transparency/files/patch-cpp-util-masterelection_test.cc @@ -1,7 +1,7 @@ ---- cpp/util/masterelection_test.cc.orig 2015-11-20 15:54:47.351564000 +0100 -+++ cpp/util/masterelection_test.cc 2015-11-20 15:55:09.284855000 +0100 -@@ -6,6 +6,9 @@ - #include +--- cpp/util/masterelection_test.cc.orig 2016-02-02 11:35:23 UTC ++++ cpp/util/masterelection_test.cc +@@ -3,6 +3,9 @@ + #include #include #include +// Without this, build will fail due to clash between onigposix.h @@ -9,4 +9,4 @@ +#define GTEST_HAS_POSIX_RE 0 #include #include - + #include diff --git a/security/certificate-transparency/files/patch-cpp-util-testing.cc b/security/certificate-transparency/files/patch-cpp-util-testing.cc index 1dfb9a9bdf3..00f0df86545 100644 --- a/security/certificate-transparency/files/patch-cpp-util-testing.cc +++ b/security/certificate-transparency/files/patch-cpp-util-testing.cc @@ -1,5 +1,5 @@ ---- cpp/util/testing.cc.orig 2015-10-23 16:31:08.000000000 +0200 -+++ cpp/util/testing.cc 2015-10-30 10:54:40.169083000 +0100 +--- cpp/util/testing.cc.orig 2016-02-02 11:35:23 UTC ++++ cpp/util/testing.cc @@ -3,6 +3,9 @@ #include #include diff --git a/security/certificate-transparency/files/patch-cpp-util-bench_etcd.cc b/security/certificate-transparency/files/patch-cpp_util_bench__etcd.cc similarity index 67% rename from security/certificate-transparency/files/patch-cpp-util-bench_etcd.cc rename to security/certificate-transparency/files/patch-cpp_util_bench__etcd.cc index 959fda5331d..1d886e18506 100644 --- a/security/certificate-transparency/files/patch-cpp-util-bench_etcd.cc +++ b/security/certificate-transparency/files/patch-cpp_util_bench__etcd.cc @@ -1,5 +1,5 @@ ---- cpp/util/bench_etcd.cc 2015-10-27 10:34:16.495831000 +0100 -+++ cpp/util/bench_etcd.cc.orig 2015-10-27 10:33:58.482267000 +0100 +--- cpp/util/bench_etcd.cc.orig 2016-02-02 11:35:23 UTC ++++ cpp/util/bench_etcd.cc @@ -105,7 +105,7 @@ void test_etcd(int thread_num) { diff --git a/security/certificate-transparency/pkg-plist b/security/certificate-transparency/pkg-plist index dea9f43f9ce..2bb793f0c3e 100644 --- a/security/certificate-transparency/pkg-plist +++ b/security/certificate-transparency/pkg-plist @@ -2,3 +2,6 @@ bin/ct bin/ct-clustertool bin/ct-mirror bin/ct-server +bin/ct-mirror-v2 +bin/ct-server-v2 +bin/xjson-server diff --git a/security/p5-Crypt-Random-Source/Makefile b/security/p5-Crypt-Random-Source/Makefile index 6491d36e7bb..a5b5ca613d5 100644 --- a/security/p5-Crypt-Random-Source/Makefile +++ b/security/p5-Crypt-Random-Source/Makefile @@ -3,6 +3,7 @@ PORTNAME= Crypt-Random-Source PORTVERSION= 0.11 +PORTREVISION= 1 CATEGORIES= security perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -12,10 +13,11 @@ COMMENT= Get weak or strong random data from pluggable sources LICENSE= ART20 -BUILD_DEPENDS= p5-Any-Moose>=0.11:${PORTSDIR}/devel/p5-Any-Moose \ +BUILD_DEPENDS= p5-Moo>=0:${PORTSDIR}/devel/p5-Moo \ p5-Capture-Tiny>=0.08:${PORTSDIR}/devel/p5-Capture-Tiny \ p5-Module-Find>=0:${PORTSDIR}/devel/p5-Module-Find \ p5-Sub-Exporter>=0:${PORTSDIR}/devel/p5-Sub-Exporter \ + p5-Type-Tiny>=1.000005:${PORTSDIR}/devel/p5-Type-Tiny \ p5-namespace-clean>=0.08:${PORTSDIR}/devel/p5-namespace-clean RUN_DEPENDS:= ${BUILD_DEPENDS} TEST_DEPENDS= p5-Test-Exception>0:${PORTSDIR}/devel/p5-Test-Exception diff --git a/security/shibboleth2-sp/Makefile b/security/shibboleth2-sp/Makefile index 922134bf4a9..42cbf6f76dd 100644 --- a/security/shibboleth2-sp/Makefile +++ b/security/shibboleth2-sp/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= shibboleth-sp -PORTVERSION= 2.5.5 -PORTREVISION= 1 +PORTVERSION= 2.5.6 CATEGORIES= security www MASTER_SITES= http://shibboleth.net/downloads/service-provider/${PORTVERSION}/ diff --git a/security/shibboleth2-sp/distinfo b/security/shibboleth2-sp/distinfo index 142a465f15e..6ab0fa43c0b 100644 --- a/security/shibboleth2-sp/distinfo +++ b/security/shibboleth2-sp/distinfo @@ -1,2 +1,2 @@ -SHA256 (shibboleth-sp-2.5.5.tar.gz) = 30da36e0bba2ce4606a9effc37c05cd110dafdd6d3141468c4aa0f57ce4d96ce -SIZE (shibboleth-sp-2.5.5.tar.gz) = 1003433 +SHA256 (shibboleth-sp-2.5.6.tar.gz) = 024739a7b5190aebecac913d9445719912c6e4e401bfe256a25ca75ab4e67ad5 +SIZE (shibboleth-sp-2.5.6.tar.gz) = 987020 diff --git a/security/shibboleth2-sp/pkg-plist b/security/shibboleth2-sp/pkg-plist index 2d203805b6e..309642c5a32 100644 --- a/security/shibboleth2-sp/pkg-plist +++ b/security/shibboleth2-sp/pkg-plist @@ -93,7 +93,6 @@ include/shibsp/util/PropertySet.h include/shibsp/util/SPConstants.h include/shibsp/util/TemplateParameters.h include/shibsp/version.h -lib/libshibsp.so.6.0.5 lib/libshibsp.so.6 lib/libshibsp.so lib/shibboleth/adfs.so @@ -103,7 +102,6 @@ lib/shibboleth/plugins-lite.so lib/shibboleth/plugins.so %%WITH_APACHE_22%%lib/shibboleth/mod_shib_22.so %%WITH_APACHE_24%%lib/shibboleth/mod_shib_24.so -lib/libshibsp-lite.so.6.0.5 lib/libshibsp-lite.so.6 lib/libshibsp-lite.so sbin/shibd diff --git a/sysutils/Makefile b/sysutils/Makefile index ca674f34872..9568caa1515 100644 --- a/sysutils/Makefile +++ b/sysutils/Makefile @@ -221,6 +221,7 @@ SUBDIR += dolly SUBDIR += downtime SUBDIR += downtimed + SUBDIR += dsbwrtsysctl SUBDIR += dt SUBDIR += dtpstree SUBDIR += du2ps diff --git a/sysutils/burp/Makefile b/sysutils/burp/Makefile index 81030b3c713..37225d1a8f3 100644 --- a/sysutils/burp/Makefile +++ b/sysutils/burp/Makefile @@ -21,6 +21,8 @@ USE_RC_SUBR= burp GNU_CONFIGURE= yes USES= gmake localbase ncurses +PORTSCOUT= limit:^1\.4\. + CONFIGURE_ARGS= --sbindir="${PREFIX}/sbin" \ --sysconfdir=${ETCDIR} \ diff --git a/sysutils/dsbwrtsysctl/Makefile b/sysutils/dsbwrtsysctl/Makefile new file mode 100644 index 00000000000..fb851a52d5a --- /dev/null +++ b/sysutils/dsbwrtsysctl/Makefile @@ -0,0 +1,20 @@ +# $FreeBSD$ + +PORTNAME= dsbwrtsysctl +PORTVERSION= 0.1.3 +CATEGORIES= sysutils +MASTER_SITES= http://freeshell.de/~mk/download/ + +MAINTAINER= mk@nic-nac-project.org +COMMENT= Changes variable=value pairs in sysctl.conf, or adds them + +LICENSE= BSD2CLAUSE + +USES= tar:tgz + +PLIST_FILES= bin/dsbwrtsysctl + +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/dsbwrtsysctl ${STAGEDIR}${PREFIX}/bin + +.include diff --git a/sysutils/dsbwrtsysctl/distinfo b/sysutils/dsbwrtsysctl/distinfo new file mode 100644 index 00000000000..7cc782e5e6e --- /dev/null +++ b/sysutils/dsbwrtsysctl/distinfo @@ -0,0 +1,2 @@ +SHA256 (dsbwrtsysctl-0.1.3.tgz) = dd8801249ba942d3daaebac539ecff94650d0b698e2fcb105d75522e0b5754d7 +SIZE (dsbwrtsysctl-0.1.3.tgz) = 2608 diff --git a/sysutils/dsbwrtsysctl/pkg-descr b/sysutils/dsbwrtsysctl/pkg-descr new file mode 100644 index 00000000000..545887d963a --- /dev/null +++ b/sysutils/dsbwrtsysctl/pkg-descr @@ -0,0 +1,4 @@ +DSBWrtSysctl is a FreeBSD command-line tool to add variable=value pairs to +/etc/sysctl.conf, or to change the values of existing variables. + +WWW: http://freeshell.de/~mk/projects/dsbwrtsysctl.html diff --git a/sysutils/fusefs-cryptofs/Makefile b/sysutils/fusefs-cryptofs/Makefile index ece2c52b718..75e9d45b8eb 100644 --- a/sysutils/fusefs-cryptofs/Makefile +++ b/sysutils/fusefs-cryptofs/Makefile @@ -5,19 +5,19 @@ PORTNAME= cryptofs PORTVERSION= 0.6.0 PORTREVISION= 7 CATEGORIES= sysutils -MASTER_SITES= http://reboot78.re.funpic.de/cryptofs/ +MASTER_SITES= http://BSDforge.com/projects/source/sysutils/fusefs-cryptofs/ PKGNAMEPREFIX= fusefs- -MAINTAINER= ports@FreeBSD.org +MAINTAINER= portmaster@BSDforge.com COMMENT= Encrypted filesystem for FUSE -BROKEN= unfetchable +LICENSE= GPLv2 LIB_DEPENDS= libgcrypt.so:${PORTSDIR}/security/libgcrypt \ libglib-2.0.so:${PORTSDIR}/devel/glib20 GNU_CONFIGURE= yes -USES= fuse pkgconfig tar:bzip2 +USES= fuse pkgconfig DOCS= README cryptofs.conf OPTIONS_DEFINE= DOCS diff --git a/sysutils/fusefs-cryptofs/distinfo b/sysutils/fusefs-cryptofs/distinfo index dde64be5989..b453c608f56 100644 --- a/sysutils/fusefs-cryptofs/distinfo +++ b/sysutils/fusefs-cryptofs/distinfo @@ -1,2 +1,2 @@ -SHA256 (cryptofs-0.6.0.tar.bz2) = 163174257c32ac9b92195bcd050df9845c35c9eb0bc8860f32608fe541073b03 -SIZE (cryptofs-0.6.0.tar.bz2) = 242440 +SHA256 (cryptofs-0.6.0.tar.gz) = d884199e38ee09848841dda247db1db0361236b1ce8cc7dd3acb5031f80f6b57 +SIZE (cryptofs-0.6.0.tar.gz) = 352805 diff --git a/sysutils/fusefs-cryptofs/pkg-descr b/sysutils/fusefs-cryptofs/pkg-descr index 5a655e96edf..3ae42cabd11 100644 --- a/sysutils/fusefs-cryptofs/pkg-descr +++ b/sysutils/fusefs-cryptofs/pkg-descr @@ -1,7 +1,7 @@ CryptoFS is a encrypted filesystem for Filesystem in Userspace (FUSE) and the Linux Userland FileSystem (LUFS). Visit http://fuse.sourceforge.net/ -for more information on FUSE or http://lufs.sourceforge.net/lufs/ for more -information on LUFS. +for more information on FUSE, or http://lufs.sourceforge.net/lufs/ for +more information on LUFS. CryptoFS will use a normal directory to store files encrypted. The mountpoint will contain the decrypted files. Every file stored in this @@ -11,9 +11,9 @@ be access by mounting the directory with the correct key again. Like other FUSE/LUFS filesystems it does not need root access or any complicated setup like creating a filesystem on a encrypted disk using the loop device. -CryptoFS can be build for FUSE and LUFS. When you build for FUSE you get a -program to mount the filesystem. For LUFS a shared library will be built +CryptoFS can be build for FUSE, and LUFS. When you build for FUSE you get +a program to mount the filesystem. For LUFS a shared library will be built that can be used by LUFS's lufsd. Both methods can use the same encrypted directory. -WWW: http://reboot78.re.funpic.de/cryptofs/ +WWW: http://BSDforge.com/projects/sysutils/fusefs-cryptofs/ diff --git a/sysutils/rsnapshot/Makefile b/sysutils/rsnapshot/Makefile index 446954678af..40a999862a1 100644 --- a/sysutils/rsnapshot/Makefile +++ b/sysutils/rsnapshot/Makefile @@ -2,14 +2,14 @@ # $FreeBSD$ PORTNAME= rsnapshot -PORTVERSION= 1.4.1 +PORTVERSION= 1.4.2 CATEGORIES= sysutils MASTER_SITES= http://www.rsnapshot.org/downloads/ MAINTAINER= ralfvd@gmail.com COMMENT= Filesystem snapshot utility based on rsync(1) -LICENSE= GPLv2 +LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= rsync:${PORTSDIR}/net/rsync @@ -24,9 +24,6 @@ NO_ARCH= yes PORTDOCS= AUTHORS ChangeLog README.md -post-patch: - ${REINPLACE_CMD} -e 's,/usr/bin/pod2man,${LOCALBASE}/bin/pod2man,' ${WRKSRC}/Makefile.in - post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} diff --git a/sysutils/rsnapshot/distinfo b/sysutils/rsnapshot/distinfo index 1e54607b459..9744ec7bf64 100644 --- a/sysutils/rsnapshot/distinfo +++ b/sysutils/rsnapshot/distinfo @@ -1,2 +1,2 @@ -SHA256 (rsnapshot-1.4.1.tar.gz) = fb4a1129a7d3805c41749fd0494debfe2ca2341eba0f8b50e4f54985efe448e8 -SIZE (rsnapshot-1.4.1.tar.gz) = 489481 +SHA256 (rsnapshot-1.4.2.tar.gz) = 042a81c45b325296b21c363f417985d857f083f87c5c27f5a64677a052f24e16 +SIZE (rsnapshot-1.4.2.tar.gz) = 487959 diff --git a/sysutils/u-boot-utilite/Makefile b/sysutils/u-boot-utilite/Makefile index ed48a96c182..3eba8f99d66 100644 --- a/sysutils/u-boot-utilite/Makefile +++ b/sysutils/u-boot-utilite/Makefile @@ -2,6 +2,7 @@ PORTNAME= u-boot PORTVERSION= 2015.07 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= ftp://ftp.denx.de/pub/u-boot/:source1 \ http://www.compulab.co.il/wp-content/uploads/2015/10/:source2 @@ -23,7 +24,8 @@ EXTRA_PATCHES= ${WRKDIR}/cm-fx6-u-boot/u-boot/u-boot-2015.07-cm-fx6-3.patch:-p1 NO_ARCH= yes USES= gmake -SSP_UNSAFE= yes # cross-build static linking dies with -fstack-protector + +PORTSCOUT= ignore U_BOOT_DIR= share/u-boot/${PORTNAME}${PKGNAMESUFFIX} diff --git a/sysutils/u-boot-utilite/files/patch-include_configs_cm__fx6.h b/sysutils/u-boot-utilite/files/patch-include_configs_cm__fx6.h index 553253d8e3f..a911587c63f 100644 --- a/sysutils/u-boot-utilite/files/patch-include_configs_cm__fx6.h +++ b/sysutils/u-boot-utilite/files/patch-include_configs_cm__fx6.h @@ -1,11 +1,18 @@ ---- include/configs/cm_fx6.h.orig 2016-02-27 13:29:39 UTC +--- include/configs/cm_fx6.h.orig 2016-02-28 08:48:02 UTC +++ include/configs/cm_fx6.h -@@ -174,6 +174,9 @@ +@@ -21,6 +21,7 @@ + #define CONFIG_CMD_GREPENV + + /* MMC */ ++#define CONFIG_SYS_MMC_MAX_DEVICE 3 + #define CONFIG_SYS_FSL_USDHC_NUM 3 + #define CONFIG_SYS_FSL_ESDHC_ADDR USDHC2_BASE_ADDR + +@@ -174,6 +175,8 @@ /* NAND */ #ifndef CONFIG_SPL_BUILD +#define CONFIG_CMD_ELF -+#define CONFIG_SYS_MMC_MAX_DEVICE 4 +#define CONFIG_API #define CONFIG_CMD_NAND #define CONFIG_SYS_NAND_BASE 0x40000000 diff --git a/textproc/html-xml-utils/Makefile b/textproc/html-xml-utils/Makefile index 2c6f0c75a63..e32031de782 100644 --- a/textproc/html-xml-utils/Makefile +++ b/textproc/html-xml-utils/Makefile @@ -15,7 +15,6 @@ LICENSE_FILE= ${WRKSRC}/COPYING LICENSE_PERMS= auto-accept USES= gmake iconv shebangfix -USE_GCC= any GNU_CONFIGURE= yes SHEBANG_FILES= ${WRKSRC}/hxcite-mkbib ${WRKSRC}/hxprintlinks diff --git a/textproc/xerces-c3/Makefile b/textproc/xerces-c3/Makefile index 5230b093985..66d97bad32f 100644 --- a/textproc/xerces-c3/Makefile +++ b/textproc/xerces-c3/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= xerces-c -PORTVERSION= 3.1.2 +PORTVERSION= 3.1.3 CATEGORIES= textproc MASTER_SITES= APACHE/xerces/c/3/sources PKGNAMESUFFIX= 3 diff --git a/textproc/xerces-c3/distinfo b/textproc/xerces-c3/distinfo index 4b1df3ec23d..84fdda7f877 100644 --- a/textproc/xerces-c3/distinfo +++ b/textproc/xerces-c3/distinfo @@ -1,2 +1,2 @@ -SHA256 (xerces-c-3.1.2.tar.gz) = 743bd0a029bf8de56a587c270d97031e0099fe2b7142cef03e0da16e282655a0 -SIZE (xerces-c-3.1.2.tar.gz) = 6959894 +SHA256 (xerces-c-3.1.3.tar.gz) = f3d4f73db7c981e16db2b16d9424b0c75d9fbd30ad81747cac047bc6170b5b49 +SIZE (xerces-c-3.1.3.tar.gz) = 9009575 diff --git a/www/elixir-httpotion/Makefile b/www/elixir-httpotion/Makefile index 969a8deb229..0d9dad1579e 100644 --- a/www/elixir-httpotion/Makefile +++ b/www/elixir-httpotion/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= httpotion -PORTVERSION= 2.2.1 +PORTVERSION= 2.2.2 DISTVERSIONPREFIX= v CATEGORIES= www PKGNAMEPREFIX= elixir- diff --git a/www/elixir-httpotion/distinfo b/www/elixir-httpotion/distinfo index 7abc5d4c56b..f2d9755c7e2 100644 --- a/www/elixir-httpotion/distinfo +++ b/www/elixir-httpotion/distinfo @@ -1,2 +1,2 @@ -SHA256 (myfreeweb-httpotion-v2.2.1_GH0.tar.gz) = a0e3a1db4098a19b3510ade94028516d55c5fe78e88beae6c177fffec45b7741 -SIZE (myfreeweb-httpotion-v2.2.1_GH0.tar.gz) = 14485 +SHA256 (myfreeweb-httpotion-v2.2.2_GH0.tar.gz) = 1ac6a3bc30aaedac8e9011412d793e09413c84bf52a304117a4d60df12b75cc7 +SIZE (myfreeweb-httpotion-v2.2.2_GH0.tar.gz) = 14499 diff --git a/www/geolizer/Makefile b/www/geolizer/Makefile index b3508935831..0bf81e8ec86 100644 --- a/www/geolizer/Makefile +++ b/www/geolizer/Makefile @@ -11,8 +11,4 @@ OPTIONS_DEFAULT=GEOIP WEBALIZER_SUFFIX= -geoip -.if exists(${.CURDIR}/Makefile.local) -.include "${.CURDIR}/Makefile.local" -.endif - .include "${MASTERDIR}/Makefile" diff --git a/www/kanboard/Makefile b/www/kanboard/Makefile index 96a95d6552d..90cbc9ed925 100644 --- a/www/kanboard/Makefile +++ b/www/kanboard/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= kanboard -PORTVERSION= 1.0.23 +PORTVERSION= 1.0.24 CATEGORIES= www MASTER_SITES= http://kanboard.net/ \ https://bitbucket.org/if0/kanboard-archives/downloads/ \ diff --git a/www/kanboard/distinfo b/www/kanboard/distinfo index 361e70ace1b..7e2a5bf5791 100644 --- a/www/kanboard/distinfo +++ b/www/kanboard/distinfo @@ -1,2 +1,2 @@ -SHA256 (kanboard-1.0.23.zip) = 15d749454d65e908532e234669b215156aa20d7dbfcd6fdc9c48c442b0552734 -SIZE (kanboard-1.0.23.zip) = 3825681 +SHA256 (kanboard-1.0.24.zip) = 576cfc7c15b594d0ba8feed75108b0538aad38fc1a64f4da7b63dcd9d041f37c +SIZE (kanboard-1.0.24.zip) = 3891592 diff --git a/www/kanboard/pkg-plist b/www/kanboard/pkg-plist index c161fe5936c..33d491ad084 100644 --- a/www/kanboard/pkg-plist +++ b/www/kanboard/pkg-plist @@ -29,6 +29,11 @@ %%WWWDIR%%/app/Action/TaskMoveColumnUnAssigned.php %%WWWDIR%%/app/Action/TaskOpen.php %%WWWDIR%%/app/Action/TaskUpdateStartDate.php +%%WWWDIR%%/app/Analytic/AverageLeadCycleTimeAnalytic.php +%%WWWDIR%%/app/Analytic/AverageTimeSpentColumnAnalytic.php +%%WWWDIR%%/app/Analytic/EstimatedTimeComparisonAnalytic.php +%%WWWDIR%%/app/Analytic/TaskDistributionAnalytic.php +%%WWWDIR%%/app/Analytic/UserDistributionAnalytic.php %%WWWDIR%%/app/Api/Action.php %%WWWDIR%%/app/Api/App.php %%WWWDIR%%/app/Api/Auth.php @@ -37,6 +42,8 @@ %%WWWDIR%%/app/Api/Category.php %%WWWDIR%%/app/Api/Comment.php %%WWWDIR%%/app/Api/File.php +%%WWWDIR%%/app/Api/Group.php +%%WWWDIR%%/app/Api/GroupMember.php %%WWWDIR%%/app/Api/Link.php %%WWWDIR%%/app/Api/Me.php %%WWWDIR%%/app/Api/Project.php @@ -73,6 +80,7 @@ %%WWWDIR%%/app/Controller/BoardPopover.php %%WWWDIR%%/app/Controller/BoardTooltip.php %%WWWDIR%%/app/Controller/Calendar.php +%%WWWDIR%%/app/Controller/Captcha.php %%WWWDIR%%/app/Controller/Category.php %%WWWDIR%%/app/Controller/Column.php %%WWWDIR%%/app/Controller/Comment.php @@ -90,6 +98,7 @@ %%WWWDIR%%/app/Controller/Link.php %%WWWDIR%%/app/Controller/Listing.php %%WWWDIR%%/app/Controller/Oauth.php +%%WWWDIR%%/app/Controller/PasswordReset.php %%WWWDIR%%/app/Controller/Project.php %%WWWDIR%%/app/Controller/ProjectPermission.php %%WWWDIR%%/app/Controller/Projectuser.php @@ -219,6 +228,7 @@ %%WWWDIR%%/app/Locale/id_ID/translations.php %%WWWDIR%%/app/Locale/it_IT/translations.php %%WWWDIR%%/app/Locale/ja_JP/translations.php +%%WWWDIR%%/app/Locale/my_MY/translations.php %%WWWDIR%%/app/Locale/nb_NO/translations.php %%WWWDIR%%/app/Locale/nl_NL/translations.php %%WWWDIR%%/app/Locale/pl_PL/translations.php @@ -232,7 +242,6 @@ %%WWWDIR%%/app/Locale/zh_CN/translations.php %%WWWDIR%%/app/Model/Action.php %%WWWDIR%%/app/Model/ActionParameter.php -%%WWWDIR%%/app/Model/Authentication.php %%WWWDIR%%/app/Model/Base.php %%WWWDIR%%/app/Model/Board.php %%WWWDIR%%/app/Model/Category.php @@ -250,9 +259,9 @@ %%WWWDIR%%/app/Model/Notification.php %%WWWDIR%%/app/Model/NotificationType.php %%WWWDIR%%/app/Model/OverdueNotification.php +%%WWWDIR%%/app/Model/PasswordReset.php %%WWWDIR%%/app/Model/Project.php %%WWWDIR%%/app/Model/ProjectActivity.php -%%WWWDIR%%/app/Model/ProjectAnalytic.php %%WWWDIR%%/app/Model/ProjectDailyColumnStats.php %%WWWDIR%%/app/Model/ProjectDailyStats.php %%WWWDIR%%/app/Model/ProjectDuplication.php @@ -284,7 +293,6 @@ %%WWWDIR%%/app/Model/TaskPermission.php %%WWWDIR%%/app/Model/TaskPosition.php %%WWWDIR%%/app/Model/TaskStatus.php -%%WWWDIR%%/app/Model/TaskValidator.php %%WWWDIR%%/app/Model/Transition.php %%WWWDIR%%/app/Model/User.php %%WWWDIR%%/app/Model/UserFilter.php @@ -318,13 +326,13 @@ %%WWWDIR%%/app/ServiceProvider/RouteProvider.php %%WWWDIR%%/app/ServiceProvider/SessionProvider.php %%WWWDIR%%/app/Subscriber/AuthSubscriber.php +%%WWWDIR%%/app/Subscriber/BaseSubscriber.php %%WWWDIR%%/app/Subscriber/BootstrapSubscriber.php %%WWWDIR%%/app/Subscriber/NotificationSubscriber.php %%WWWDIR%%/app/Subscriber/ProjectDailySummarySubscriber.php %%WWWDIR%%/app/Subscriber/ProjectModificationDateSubscriber.php %%WWWDIR%%/app/Subscriber/RecurringTaskSubscriber.php %%WWWDIR%%/app/Subscriber/SubtaskTimeTrackingSubscriber.php -%%WWWDIR%%/app/Subscriber/TaskMovedDateSubscriber.php %%WWWDIR%%/app/Subscriber/TransitionSubscriber.php %%WWWDIR%%/app/Template/action/event.php %%WWWDIR%%/app/Template/action/index.php @@ -356,6 +364,7 @@ %%WWWDIR%%/app/Template/auth/index.php %%WWWDIR%%/app/Template/board/popover_assignee.php %%WWWDIR%%/app/Template/board/popover_category.php +%%WWWDIR%%/app/Template/board/popover_close_all_tasks_column.php %%WWWDIR%%/app/Template/board/table_column.php %%WWWDIR%%/app/Template/board/table_container.php %%WWWDIR%%/app/Template/board/table_swimlane.php @@ -459,6 +468,9 @@ %%WWWDIR%%/app/Template/notification/task_overdue.php %%WWWDIR%%/app/Template/notification/task_update.php %%WWWDIR%%/app/Template/notification/task_user_mention.php +%%WWWDIR%%/app/Template/password_reset/change.php +%%WWWDIR%%/app/Template/password_reset/create.php +%%WWWDIR%%/app/Template/password_reset/email.php %%WWWDIR%%/app/Template/project/disable.php %%WWWDIR%%/app/Template/project/dropdown.php %%WWWDIR%%/app/Template/project/duplicate.php @@ -537,6 +549,7 @@ %%WWWDIR%%/app/Template/user/layout.php %%WWWDIR%%/app/Template/user/notifications.php %%WWWDIR%%/app/Template/user/password.php +%%WWWDIR%%/app/Template/user/password_reset.php %%WWWDIR%%/app/Template/user/profile.php %%WWWDIR%%/app/Template/user/remove.php %%WWWDIR%%/app/Template/user/sessions.php @@ -552,6 +565,23 @@ %%WWWDIR%%/app/User/LdapUserProvider.php %%WWWDIR%%/app/User/OAuthUserProvider.php %%WWWDIR%%/app/User/ReverseProxyUserProvider.php +%%WWWDIR%%/app/Validator/ActionValidator.php +%%WWWDIR%%/app/Validator/AuthValidator.php +%%WWWDIR%%/app/Validator/Base.php +%%WWWDIR%%/app/Validator/CategoryValidator.php +%%WWWDIR%%/app/Validator/ColumnValidator.php +%%WWWDIR%%/app/Validator/CommentValidator.php +%%WWWDIR%%/app/Validator/CurrencyValidator.php +%%WWWDIR%%/app/Validator/CustomFilterValidator.php +%%WWWDIR%%/app/Validator/GroupValidator.php +%%WWWDIR%%/app/Validator/LinkValidator.php +%%WWWDIR%%/app/Validator/PasswordResetValidator.php +%%WWWDIR%%/app/Validator/ProjectValidator.php +%%WWWDIR%%/app/Validator/SubtaskValidator.php +%%WWWDIR%%/app/Validator/SwimlaneValidator.php +%%WWWDIR%%/app/Validator/TaskLinkValidator.php +%%WWWDIR%%/app/Validator/TaskValidator.php +%%WWWDIR%%/app/Validator/UserValidator.php %%WWWDIR%%/app/check_setup.php %%WWWDIR%%/app/common.php %%WWWDIR%%/app/constants.php @@ -719,9 +749,12 @@ %%WWWDIR%%/doc/api-comment-procedures.markdown %%WWWDIR%%/doc/api-examples.markdown %%WWWDIR%%/doc/api-file-procedures.markdown +%%WWWDIR%%/doc/api-group-member-procedures.markdown +%%WWWDIR%%/doc/api-group-procedures.markdown %%WWWDIR%%/doc/api-json-rpc.markdown %%WWWDIR%%/doc/api-link-procedures.markdown %%WWWDIR%%/doc/api-me-procedures.markdown +%%WWWDIR%%/doc/api-project-permission-procedures.markdown %%WWWDIR%%/doc/api-project-procedures.markdown %%WWWDIR%%/doc/api-subtask-procedures.markdown %%WWWDIR%%/doc/api-swimlane-procedures.markdown diff --git a/www/phpsysinfo/Makefile b/www/phpsysinfo/Makefile index eb1e6d4c1af..38563b5ba68 100644 --- a/www/phpsysinfo/Makefile +++ b/www/phpsysinfo/Makefile @@ -2,11 +2,11 @@ # $FreeBSD$ PORTNAME= phpsysinfo -PORTVERSION= 3.2.4 +PORTVERSION= 3.2.5 DISTVERSIONPREFIX= v CATEGORIES= www -MAINTAINER= walt@relnor.com +MAINTAINER= tremere@cainites.net COMMENT= PHP script for displaying system information LICENSE= GPLv2 diff --git a/www/phpsysinfo/distinfo b/www/phpsysinfo/distinfo index 2f086079fe6..f2f305fedca 100644 --- a/www/phpsysinfo/distinfo +++ b/www/phpsysinfo/distinfo @@ -1,2 +1,2 @@ -SHA256 (phpsysinfo-phpsysinfo-v3.2.4_GH0.tar.gz) = b12fbed035d65587d173e9401b068b5832a8e926f0d70b92467051c864e0bd00 -SIZE (phpsysinfo-phpsysinfo-v3.2.4_GH0.tar.gz) = 915647 +SHA256 (phpsysinfo-phpsysinfo-v3.2.5_GH0.tar.gz) = 580af40ab1909ee913fd507839512c1e11ab14cd296dce0fa0f34c17d8db57ba +SIZE (phpsysinfo-phpsysinfo-v3.2.5_GH0.tar.gz) = 947527 diff --git a/www/phpsysinfo/pkg-plist b/www/phpsysinfo/pkg-plist index bae0f70fcd3..9eec9bc7eb2 100644 --- a/www/phpsysinfo/pkg-plist +++ b/www/phpsysinfo/pkg-plist @@ -20,6 +20,8 @@ %%WWWDIR%%/gfx/bullet_toggle_minus.gif %%WWWDIR%%/gfx/bullet_toggle_plus.gif %%WWWDIR%%/gfx/close.gif +%%WWWDIR%%/gfx/down_black.gif +%%WWWDIR%%/gfx/down_gray.gif %%WWWDIR%%/gfx/favicon.gif %%WWWDIR%%/gfx/favicon.ico %%WWWDIR%%/gfx/html.gif @@ -58,6 +60,7 @@ %%WWWDIR%%/gfx/images/HPUX.png %%WWWDIR%%/gfx/images/Haiku.png %%WWWDIR%%/gfx/images/Handy.png +%%WWWDIR%%/gfx/images/HipServ.png %%WWWDIR%%/gfx/images/IPFire.png %%WWWDIR%%/gfx/images/KaOS.png %%WWWDIR%%/gfx/images/Korora.png @@ -74,6 +77,7 @@ %%WWWDIR%%/gfx/images/Netrunner.png %%WWWDIR%%/gfx/images/NixOS.png %%WWWDIR%%/gfx/images/OpenBSD.png +%%WWWDIR%%/gfx/images/OpenMamba.png %%WWWDIR%%/gfx/images/OpenMandriva.png %%WWWDIR%%/gfx/images/Oracle.png %%WWWDIR%%/gfx/images/PCLinuxOS.png @@ -85,6 +89,7 @@ %%WWWDIR%%/gfx/images/Porteus.png %%WWWDIR%%/gfx/images/Puppy.png %%WWWDIR%%/gfx/images/QNX.png +%%WWWDIR%%/gfx/images/QTS.png %%WWWDIR%%/gfx/images/Qubes.png %%WWWDIR%%/gfx/images/ROSA.png %%WWWDIR%%/gfx/images/Raspbian.png @@ -134,13 +139,15 @@ %%WWWDIR%%/gfx/images/openSUSE.png %%WWWDIR%%/gfx/images/pfSense.png %%WWWDIR%%/gfx/images/unknown.png -%%WWWDIR%%/gfx/logo_48.png +%%WWWDIR%%/gfx/logo_32.gif %%WWWDIR%%/gfx/next.gif %%WWWDIR%%/gfx/prev.gif %%WWWDIR%%/gfx/reload.gif -%%WWWDIR%%/gfx/sort_asc.png -%%WWWDIR%%/gfx/sort_both.png -%%WWWDIR%%/gfx/sort_desc.png +%%WWWDIR%%/gfx/right_black.gif +%%WWWDIR%%/gfx/right_gray.gif +%%WWWDIR%%/gfx/sort_asc.gif +%%WWWDIR%%/gfx/sort_both.gif +%%WWWDIR%%/gfx/sort_desc.gif %%WWWDIR%%/gfx/treeTable/blank.gif %%WWWDIR%%/gfx/treeTable/tv-collapsable-last.gif %%WWWDIR%%/gfx/treeTable/tv-collapsable.gif @@ -164,6 +171,7 @@ %%WWWDIR%%/includes/mb/class.freeipmi.inc.php %%WWWDIR%%/includes/mb/class.hddtemp.inc.php %%WWWDIR%%/includes/mb/class.healthd.inc.php +%%WWWDIR%%/includes/mb/class.hwmon.inc.php %%WWWDIR%%/includes/mb/class.hwsensors.inc.php %%WWWDIR%%/includes/mb/class.ipmi.inc.php %%WWWDIR%%/includes/mb/class.ipmiutil.inc.php @@ -173,7 +181,9 @@ %%WWWDIR%%/includes/mb/class.mbmon.inc.php %%WWWDIR%%/includes/mb/class.ohm.inc.php %%WWWDIR%%/includes/mb/class.pitemp.inc.php +%%WWWDIR%%/includes/mb/class.qtssnmp.inc.php %%WWWDIR%%/includes/mb/class.sensors.inc.php +%%WWWDIR%%/includes/mb/class.speedfan.inc.php %%WWWDIR%%/includes/mb/class.thermalzone.inc.php %%WWWDIR%%/includes/os/class.AIX.inc.php %%WWWDIR%%/includes/os/class.Android.inc.php @@ -210,6 +220,7 @@ %%WWWDIR%%/includes/ups/class.nut.inc.php %%WWWDIR%%/includes/ups/class.pmset.inc.php %%WWWDIR%%/includes/ups/class.powersoftplus.inc.php +%%WWWDIR%%/includes/ups/class.snmpups.inc.php %%WWWDIR%%/includes/ups/class.ups.inc.php %%WWWDIR%%/includes/xml/class.SimpleXMLExtended.inc.php %%WWWDIR%%/includes/xml/class.XML.inc.php @@ -232,6 +243,7 @@ %%WWWDIR%%/js/vendor/bootstrap.min.js %%WWWDIR%%/js/vendor/console-shim.js %%WWWDIR%%/js/vendor/html5shiv-printshiv.js +%%WWWDIR%%/js/vendor/respond.js %%WWWDIR%%/js/vendor/sorttable.js %%WWWDIR%%/js/vendor/transparency.js %%WWWDIR%%/language/ast.xml @@ -440,6 +452,7 @@ %%WWWDIR%%/sample/distrotest/Debian/8-20140106-netinstall.txt %%WWWDIR%%/sample/distrotest/Debian/8-20140106.txt %%WWWDIR%%/sample/distrotest/Deepin/2013.txt +%%WWWDIR%%/sample/distrotest/Eisfair/1-2.6.5.txt %%WWWDIR%%/sample/distrotest/Eisfair/2-1.8.1.txt %%WWWDIR%%/sample/distrotest/Fedora/20-lsb.txt %%WWWDIR%%/sample/distrotest/Fedora/20.txt @@ -452,6 +465,7 @@ %%WWWDIR%%/sample/distrotest/Gentoo/2.2.txt %%WWWDIR%%/sample/distrotest/Gobo/015.beta2.txt %%WWWDIR%%/sample/distrotest/Handy/2.0.txt +%%WWWDIR%%/sample/distrotest/HipServ/2.6.txt %%WWWDIR%%/sample/distrotest/IPFire/2.13.txt %%WWWDIR%%/sample/distrotest/KaOS/2014.0301.txt %%WWWDIR%%/sample/distrotest/Korora/20.txt @@ -469,6 +483,7 @@ %%WWWDIR%%/sample/distrotest/Netrunner/13.06.txt %%WWWDIR%%/sample/distrotest/Netrunner/2014.04.txt %%WWWDIR%%/sample/distrotest/NixOS/13.10.txt +%%WWWDIR%%/sample/distrotest/OpenMamba/3.0.1.txt %%WWWDIR%%/sample/distrotest/OpenMandriva/2013.0-RC1.txt %%WWWDIR%%/sample/distrotest/Oracle/5.10-el.txt %%WWWDIR%%/sample/distrotest/Oracle/6.3.txt @@ -489,6 +504,7 @@ %%WWWDIR%%/sample/distrotest/Puppy/5.3-wary.txt %%WWWDIR%%/sample/distrotest/Puppy/5.3.3-slacko.txt %%WWWDIR%%/sample/distrotest/Puppy/528-lucid.txt +%%WWWDIR%%/sample/distrotest/QTS/3.1.2.txt %%WWWDIR%%/sample/distrotest/Qubes/3.0.txt %%WWWDIR%%/sample/distrotest/ROSA/2012.0.0-11-LTS.txt %%WWWDIR%%/sample/distrotest/ROSA/2012.0.0-6-LTS.txt @@ -685,6 +701,8 @@ %%WWWDIR%%/tools/distrotest.php %%WWWDIR%%/tools/lint.bat %%WWWDIR%%/tools/phpsysinfo.ini +%%WWWDIR%%/tools/speedfan/SpeedFanGet_bin.zip +%%WWWDIR%%/tools/speedfan/SpeedFanGet_src.zip %%WWWDIR%%/xml.php @owner @group diff --git a/www/tomcat6/Makefile b/www/tomcat6/Makefile index ad7eb024583..c759785dee6 100644 --- a/www/tomcat6/Makefile +++ b/www/tomcat6/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= tomcat -PORTVERSION= 6.0.44 +PORTVERSION= 6.0.45 CATEGORIES= www java MASTER_SITES= APACHE/tomcat/tomcat-6/v${PORTVERSION}/bin DISTNAME= apache-${PORTNAME}-${PORTVERSION} diff --git a/www/tomcat6/distinfo b/www/tomcat6/distinfo index 634d05cad52..544a1193b0f 100644 --- a/www/tomcat6/distinfo +++ b/www/tomcat6/distinfo @@ -1,2 +1,2 @@ -SHA256 (apache-tomcat-6.0.44.tar.gz) = aab792322e75c6502675120933cbc519cfb59ac8d192f4fa103371a335708224 -SIZE (apache-tomcat-6.0.44.tar.gz) = 7065218 +SHA256 (apache-tomcat-6.0.45.tar.gz) = 8f9bd3e02f1e7798ca8f99f3254594688307ced3e7325dfb10f336750d82482d +SIZE (apache-tomcat-6.0.45.tar.gz) = 7073612 diff --git a/www/tomcat6/pkg-plist b/www/tomcat6/pkg-plist index e2819de724a..0beb23a137a 100644 --- a/www/tomcat6/pkg-plist +++ b/www/tomcat6/pkg-plist @@ -478,6 +478,7 @@ %%T%%/webapps/host-manager/images/tomcat.gif %%T%%/webapps/host-manager/images/update.gif %%T%%/webapps/host-manager/images/void.gif +%%T%%/webapps/host-manager/index.jsp %%T%%/webapps/host-manager/manager.xml %%T%%/webapps/manager/META-INF/context.xml %%T%%/webapps/manager/WEB-INF/jsp/401.jsp @@ -494,6 +495,7 @@ %%T%%/webapps/manager/images/tomcat.gif %%T%%/webapps/manager/images/update.gif %%T%%/webapps/manager/images/void.gif +%%T%%/webapps/manager/index.jsp %%T%%/webapps/manager/status.xsd %%T%%/webapps/manager/xform.xsl @dir %%T%%/endorsed diff --git a/www/tomcat7/Makefile b/www/tomcat7/Makefile index 42b877a26f2..6598b27e2f0 100644 --- a/www/tomcat7/Makefile +++ b/www/tomcat7/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= tomcat -PORTVERSION= 7.0.65 +PORTVERSION= 7.0.68 CATEGORIES= www java MASTER_SITES= APACHE/tomcat/tomcat-7/v${PORTVERSION}/bin PKGNAMESUFFIX= 7 diff --git a/www/tomcat7/distinfo b/www/tomcat7/distinfo index 75f5f978d04..ab40c31d501 100644 --- a/www/tomcat7/distinfo +++ b/www/tomcat7/distinfo @@ -1,2 +1,2 @@ -SHA256 (apache-tomcat-7.0.65.tar.gz) = ef0edb1f560702adc4096097ddfba038086d62da77d0b247d927fd326bc637e9 -SIZE (apache-tomcat-7.0.65.tar.gz) = 8866946 +SHA256 (apache-tomcat-7.0.68.tar.gz) = 2c1a02422f265607de733521e54f18613e9dd5efc2861914fe45a858227bb8e0 +SIZE (apache-tomcat-7.0.68.tar.gz) = 8900822 diff --git a/www/tomcat8/Makefile b/www/tomcat8/Makefile index f859e27db4c..eb7112f5c1c 100644 --- a/www/tomcat8/Makefile +++ b/www/tomcat8/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= tomcat -PORTVERSION= 8.0.28 +PORTVERSION= 8.0.30 CATEGORIES= www java MASTER_SITES= APACHE/tomcat/tomcat-8/v${PORTVERSION}/bin PKGNAMESUFFIX= 8 diff --git a/www/tomcat8/distinfo b/www/tomcat8/distinfo index 2e9b126fa84..f3804c7bb3e 100644 --- a/www/tomcat8/distinfo +++ b/www/tomcat8/distinfo @@ -1,2 +1,2 @@ -SHA256 (apache-tomcat-8.0.28.tar.gz) = a7a6c092b79fc5a8cffe5916d0e5554254eddcb3c1911ed90696c153b4f13d10 -SIZE (apache-tomcat-8.0.28.tar.gz) = 9130958 +SHA256 (apache-tomcat-8.0.30.tar.gz) = 2fc3dde305e08388a12bd2868063ab6829a1d70acd9affe3a8707bd9679e0059 +SIZE (apache-tomcat-8.0.30.tar.gz) = 9150593 diff --git a/www/xpi-vimperator/Makefile b/www/xpi-vimperator/Makefile index 4df997ba7aa..70923759606 100644 --- a/www/xpi-vimperator/Makefile +++ b/www/xpi-vimperator/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= vimperator -PORTVERSION= 3.5 +PORTVERSION= 3.8.3 DISTVERSIONSUFFIX= -fx CATEGORIES= www diff --git a/www/xpi-vimperator/distinfo b/www/xpi-vimperator/distinfo index 70edef16d1a..9aab5ebb2dc 100644 --- a/www/xpi-vimperator/distinfo +++ b/www/xpi-vimperator/distinfo @@ -1,2 +1,2 @@ -SHA256 (xpi/vimperator-3.5-fx.xpi) = 16f623ceb71e8a490ead83501e42d55a079568a24ddff00e5c90abef698317f6 -SIZE (xpi/vimperator-3.5-fx.xpi) = 583838 +SHA256 (xpi/vimperator-3.8.3-fx.xpi) = e3b995face4e76faf8e425269d3b4b5ba343672ffc4368dc04e95b56a0538022 +SIZE (xpi/vimperator-3.8.3-fx.xpi) = 604094 diff --git a/www/xpi-vimperator/pkg-plist b/www/xpi-vimperator/pkg-plist index ca22bc0426d..d93d257802c 100644 --- a/www/xpi-vimperator/pkg-plist +++ b/www/xpi-vimperator/pkg-plist @@ -26,7 +26,6 @@ %%XPI_XPIDIR%%/common/content/hints.js %%XPI_XPIDIR%%/common/content/history.js %%XPI_XPIDIR%%/common/content/io.js -%%XPI_XPIDIR%%/common/content/io.js.rej %%XPI_XPIDIR%%/common/content/javascript.js %%XPI_XPIDIR%%/common/content/liberator-overlay.js %%XPI_XPIDIR%%/common/content/liberator.js @@ -68,10 +67,10 @@ %%XPI_XPIDIR%%/common/locale/en-US/tabs.xml %%XPI_XPIDIR%%/common/locale/en-US/various.xml %%XPI_XPIDIR%%/common/modules/storage.jsm +%%XPI_XPIDIR%%/common/modules/template-tag.js +%%XPI_XPIDIR%%/common/modules/template.js %%XPI_XPIDIR%%/common/skin/liberator.css -%%XPI_XPIDIR%%/common/skin/prompt (purple).png %%XPI_XPIDIR%%/common/skin/prompt.png -%%XPI_XPIDIR%%/common/skin/prompt2.png %%XPI_XPIDIR%%/components/about-handler.js %%XPI_XPIDIR%%/components/commandline-handler.js %%XPI_XPIDIR%%/components/protocols.js diff --git a/x11-drivers/xf86-input-wacom/Makefile b/x11-drivers/xf86-input-wacom/Makefile index a8d62d8159a..e9aad7859ed 100644 --- a/x11-drivers/xf86-input-wacom/Makefile +++ b/x11-drivers/xf86-input-wacom/Makefile @@ -2,7 +2,7 @@ PORTNAME= xf86-input-wacom PORTVERSION= 0.32.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-drivers MASTER_SITES= SF/linuxwacom/${PORTNAME} diff --git a/x11-drivers/xf86-input-wacom/files/wacom.in b/x11-drivers/xf86-input-wacom/files/wacom.in index f98d542e06d..2d3b75e778e 100644 --- a/x11-drivers/xf86-input-wacom/files/wacom.in +++ b/x11-drivers/xf86-input-wacom/files/wacom.in @@ -4,6 +4,7 @@ # # PROVIDE: wacom # REQUIRE: mountcritlocal +# BEFORE: devd # KEYWORD: nojail # # Add the following lines to /etc/rc.conf to enable this service: