From 231976bc25fbc72ac89cdfb6601ef3bb4c745607 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Tue, 3 May 2016 08:22:46 +0200 Subject: [PATCH] */*: sync with upstream Taken from: FreeBSD --- comms/dcf77pi/Makefile | 2 +- comms/dcf77pi/distinfo | 4 +- databases/Makefile | 1 - databases/jrrd/Makefile | 1 + databases/mariadb55-server/Makefile | 19 +- databases/mariadb55-server/distinfo | 4 +- databases/mongodb/Makefile | 2 +- databases/mongodb/distinfo | 4 +- databases/mongodb/files/patch-SConstruct | 21 +- .../mongodb/files/patch-src_mongo_SConscript | 10 +- .../patch-src_mongo_db_kill_current_op.cpp | 6 +- .../patch-src_mongo_db_ops_modifier_push.cpp | 6 +- ...arty_boost_libs_filesystem_v3_src_path.cpp | 8 +- databases/p5-POE-Component-RRDTool/Makefile | 2 +- databases/p5-RRD-Simple/Makefile | 2 +- databases/pecl-rrd/Makefile | 2 +- databases/py-python-rrdtool/Makefile | 1 + databases/py-rrdtool_lgpl/Makefile | 2 +- databases/rrdman/Makefile | 2 +- databases/rrdmerge/Makefile | 2 +- databases/rrdtool/Makefile | 5 +- databases/rrdtool/distinfo | 4 +- databases/rrdtool/pkg-plist | 8 +- databases/rrdtool10/Makefile | 49 -- databases/rrdtool10/distinfo | 2 - databases/rrdtool10/files/patch-Makefile.am | 36 - databases/rrdtool10/files/patch-configure.ac | 25 - .../files/patch-contrib__Makefile.am | 10 - .../files/patch-contrib__trytime__Makefile.am | 11 - .../rrdtool10/files/patch-doc__Makefile.am | 14 - .../files/patch-examples__Makefile.am | 9 - .../rrdtool10/files/patch-src-Makefile.am | 10 - databases/rrdtool10/pkg-descr | 10 - databases/rrdtool10/pkg-plist | 106 --- databases/tcl-lmdb/Makefile | 4 + devel/Makefile | 2 +- devel/cgilib/Makefile | 1 + devel/elixir-coverex/Makefile | 2 +- devel/elixir-coverex/distinfo | 4 +- devel/jenkins2/Makefile | 2 +- devel/jenkins2/distinfo | 4 +- devel/libbson/Makefile | 2 +- devel/libbson/distinfo | 4 +- devel/llvm38/Makefile | 5 +- devel/llvm38/files/compiler-rt-patch-no-m32 | 14 + devel/p5-Devel-TraceUse/Makefile | 5 +- devel/p5-Devel-TraceUse/distinfo | 4 +- devel/p5-RRDTool-OO/Makefile | 1 + devel/p5-Test2-Suite/Makefile | 2 +- devel/p5-Test2-Suite/distinfo | 4 +- devel/p5-Test2/Makefile | 2 +- devel/p5-Test2/distinfo | 4 +- devel/p5-Test2/pkg-plist | 2 + devel/py-magic/Makefile | 2 +- devel/py-magic/distinfo | 4 +- devel/py-parsedatetime/Makefile | 2 +- devel/py-parsedatetime/distinfo | 4 +- devel/py-pp/Makefile | 3 +- devel/py-pp/distinfo | 4 +- devel/rubygem-errand/Makefile | 1 + devel/rubygem-hashie/Makefile | 2 +- devel/rubygem-hashie/distinfo | 4 +- devel/rubygem-rrd-ffi/Makefile | 1 + devel/rubygem-unicode-display_width/Makefile | 2 +- devel/rubygem-unicode-display_width/distinfo | 4 +- devel/sope/distinfo | 2 - devel/{sope => sope2}/Makefile | 4 +- devel/sope2/distinfo | 2 + devel/{sope => sope2}/files/patch-configure | 2 +- devel/{sope => sope2}/pkg-descr | 0 devel/{sope => sope2}/pkg-plist | 0 dns/bind9-devel/Makefile | 8 +- dns/bind9-devel/distinfo | 4 +- .../files/patch-bin_python_Makefile.in | 10 - .../files/patch-bin_python_isc_Makefile.in | 20 - dns/bind9-devel/pkg-plist | 17 +- dns/bindgraph/Makefile | 1 + editors/emacs-devel/Makefile | 302 +++---- editors/emacs-devel/distinfo | 4 +- editors/emacs-devel/pkg-plist | 10 +- french/verbiste/Makefile | 4 +- french/verbiste/distinfo | 4 +- french/verbiste/pkg-plist | 2 - games/phalanx/Makefile | 6 +- games/phalanx/distinfo | 4 +- german/mythes/Makefile | 2 +- german/mythes/distinfo | 4 +- graphics/netpbm/Makefile | 2 +- java/rubygem-rjb/Makefile | 6 +- lang/afnix/Makefile | 2 +- lang/afnix/distinfo | 4 +- lang/perl5-devel/Makefile | 16 +- lang/perl5-devel/distinfo | 4 +- lang/perl5-devel/pkg-plist | 4 +- lang/php55/Makefile | 2 +- lang/php55/distinfo | 4 +- lang/php70/Makefile | 4 +- lang/php70/distinfo | 4 +- mail/couriergraph/Makefile | 2 +- mail/mailgraph/Makefile | 2 +- mail/ovs/Makefile | 2 +- math/openblas/Makefile | 9 +- math/saga/Makefile | 4 +- math/saga/distinfo | 4 +- multimedia/avidemux/Makefile | 1 + multimedia/avidemux/Makefile.common | 2 +- multimedia/ffmpeg/Makefile | 6 +- multimedia/libav/Makefile | 4 +- multimedia/libxine/Makefile | 3 +- multimedia/mlt/Makefile | 4 +- multimedia/mplayer2/Makefile | 4 +- multimedia/plexmediaserver-plexpass/Makefile | 4 +- multimedia/plexmediaserver-plexpass/distinfo | 4 +- multimedia/plexmediaserver/Makefile | 4 +- multimedia/plexmediaserver/distinfo | 4 +- multimedia/plexmediaserver/pkg-plist | 16 +- multimedia/plexpy/Makefile | 2 +- multimedia/plexpy/distinfo | 4 +- multimedia/vlc/Makefile | 4 +- net-mgmt/cacti/Makefile | 2 +- net-mgmt/collectd5/Makefile | 2 +- net-mgmt/cricket/Makefile | 2 +- net-mgmt/flowviewer/Makefile | 2 +- net-mgmt/guifi-snpservices/Makefile | 1 + net-mgmt/librenms/Makefile | 1 + net-mgmt/nagiosgraph/Makefile | 1 + net-mgmt/netdot/Makefile | 2 +- net-mgmt/nfdump/Makefile | 2 +- net-mgmt/nfsen/Makefile | 2 +- net-mgmt/observium/Makefile | 2 +- net-mgmt/phpweathermap/Makefile | 2 +- net-mgmt/pnp/Makefile | 2 +- net-mgmt/rrdbot/Makefile | 2 +- net-mgmt/smokeping/Makefile | 2 +- net-mgmt/snmp4nagios/Makefile | 2 +- net-mgmt/torrus/Makefile | 2 +- net-mgmt/xymon-server/Makefile | 2 +- net-p2p/bitcoin/Makefile | 3 +- net/exabgp/distinfo | 4 +- net/motsognir/Makefile | 3 +- net/motsognir/distinfo | 4 +- net/ntop/Makefile | 2 +- net/socat/Makefile | 4 +- net/socat/files/patch-sslcls.c | 34 +- net/socat/files/patch-sslcls.h | 11 + net/socat/files/patch-xio-openssl.c | 79 ++ net/socat/files/patch-xioopts.c | 38 +- security/amavis-stats/Makefile | 2 +- security/fwknop/Makefile | 6 +- security/fwknop/distinfo | 4 +- security/fwknop/pkg-plist | 6 +- security/p5-CryptX/Makefile | 2 +- security/p5-CryptX/distinfo | 4 +- security/py-kerberos/Makefile | 5 +- security/py-kerberos/distinfo | 4 +- .../files/extra-patch-src_kerberosgss.c | 21 +- security/sqlninja/Makefile | 29 +- security/sshguard/Makefile | 2 +- security/sshguard/distinfo | 4 +- security/sshguard/files/patch-man_sshguard.8 | 27 + .../files/patch-src_sshguard__logsuck.c | 36 - security/sshguard/files/pkg-message.in | 7 + security/sshguard/files/sshguard.in | 31 +- sysutils/backuppc-devel/Makefile | 2 +- sysutils/backuppc/Makefile | 1 + sysutils/ganglia-monitor-core/Makefile | 1 + sysutils/monitorix/Makefile | 2 +- sysutils/munin-master/Makefile | 2 +- sysutils/slurm-wlm/Makefile | 2 +- sysutils/symon/Makefile | 2 +- sysutils/vm-bhyve/Makefile | 2 +- sysutils/vm-bhyve/distinfo | 4 +- sysutils/xdu/Makefile | 2 +- textproc/luceneplusplus/Makefile | 7 +- .../files/extra-patch-CMakeLists.txt | 11 - .../luceneplusplus/files/patch-CMakeLists.txt | 14 +- textproc/ml1/Makefile | 6 +- textproc/ml1/distinfo | 4 +- textproc/sk-mythes/Makefile | 2 +- textproc/sk-mythes/distinfo | 4 +- textproc/sl-mythes/Makefile | 2 +- textproc/sl-mythes/distinfo | 4 +- www/Makefile | 4 +- www/cherokee/Makefile | 1 + www/drraw/Makefile | 2 +- www/mod_http2-devel/Makefile | 17 +- www/mod_http2-devel/distinfo | 4 +- www/mod_http2-devel/pkg-plist | 3 - www/p5-Catalyst-View-RRDGraph/Makefile | 2 +- www/rubygem-responders/Makefile | 2 +- www/rubygem-responders/distinfo | 4 +- www/sogo/distinfo | 2 - .../files/patch-SoObjects_SOGo_GNUmakefile | 12 - ...tch-SoObjects_SOGo_instance-framework.make | 824 ------------------ ...patch-SoObjects_SOGo_master-framework.make | 33 - .../Makefile | 4 +- .../pkg-descr | 0 www/{sogo => sogo2}/Makefile | 11 +- www/sogo2/distinfo | 2 + .../files/cron-ealarms-notify.sample | 0 .../files/cron-expire-autoreply.sample | 0 .../files/ealarms-notify.creds.sample | 0 .../files/expire-autoreply.creds.sample | 0 .../files/patch-ActiveSync_GNUmakefile | 2 +- .../files/patch-Main_GNUmakefile.preamble | 0 .../files/patch-Tests_Unit_GNUmakefile | 0 .../files/patch-Tools_GNUmakefile.preamble | 0 www/{sogo => sogo2}/files/sogod.in | 0 www/{sogo => sogo2}/pkg-descr | 0 www/{sogo => sogo2}/pkg-message | 5 + www/{sogo => sogo2}/pkg-plist | 33 +- www/webkit-gtk2/Makefile | 3 +- www/webkit-gtk2/distinfo | 4 +- www/webkit-gtk2/files/patch-CVE-2014-1748 | 10 - www/webkit-gtk2/pkg-plist | 8 +- www/webkit-gtk3/Makefile | 3 +- www/webkit-gtk3/distinfo | 4 +- www/webkit-gtk3/files/patch-CVE-2014-1748 | 10 - www/webkit-gtk3/pkg-plist | 11 +- www/xombrero/Makefile | 4 +- www/xpi-uBlock_origin/Makefile | 4 +- www/xpi-uBlock_origin/distinfo | 4 +- x11-themes/adwaita-common/Makefile | 2 +- x11-themes/adwaita-common/distinfo | 4 +- x11-themes/adwaita-qt4/Makefile | 8 +- x11-themes/adwaita-qt5/Makefile | 8 +- .../files/patch-src_style_adwaita.cpp | 25 - 227 files changed, 798 insertions(+), 1814 deletions(-) delete mode 100644 databases/rrdtool10/Makefile delete mode 100644 databases/rrdtool10/distinfo delete mode 100644 databases/rrdtool10/files/patch-Makefile.am delete mode 100644 databases/rrdtool10/files/patch-configure.ac delete mode 100644 databases/rrdtool10/files/patch-contrib__Makefile.am delete mode 100644 databases/rrdtool10/files/patch-contrib__trytime__Makefile.am delete mode 100644 databases/rrdtool10/files/patch-doc__Makefile.am delete mode 100644 databases/rrdtool10/files/patch-examples__Makefile.am delete mode 100644 databases/rrdtool10/files/patch-src-Makefile.am delete mode 100644 databases/rrdtool10/pkg-descr delete mode 100644 databases/rrdtool10/pkg-plist create mode 100644 devel/llvm38/files/compiler-rt-patch-no-m32 delete mode 100644 devel/sope/distinfo rename devel/{sope => sope2}/Makefile (97%) create mode 100644 devel/sope2/distinfo rename devel/{sope => sope2}/files/patch-configure (84%) rename devel/{sope => sope2}/pkg-descr (100%) rename devel/{sope => sope2}/pkg-plist (100%) delete mode 100644 dns/bind9-devel/files/patch-bin_python_Makefile.in delete mode 100644 dns/bind9-devel/files/patch-bin_python_isc_Makefile.in create mode 100644 net/socat/files/patch-sslcls.h create mode 100644 net/socat/files/patch-xio-openssl.c create mode 100644 security/sshguard/files/patch-man_sshguard.8 delete mode 100644 security/sshguard/files/patch-src_sshguard__logsuck.c delete mode 100644 textproc/luceneplusplus/files/extra-patch-CMakeLists.txt delete mode 100644 www/mod_http2-devel/pkg-plist delete mode 100644 www/sogo/distinfo delete mode 100644 www/sogo/files/patch-SoObjects_SOGo_GNUmakefile delete mode 100644 www/sogo/files/patch-SoObjects_SOGo_instance-framework.make delete mode 100644 www/sogo/files/patch-SoObjects_SOGo_master-framework.make rename www/{sogo-activesync => sogo2-activesync}/Makefile (66%) rename www/{sogo-activesync => sogo2-activesync}/pkg-descr (100%) rename www/{sogo => sogo2}/Makefile (92%) create mode 100644 www/sogo2/distinfo rename www/{sogo => sogo2}/files/cron-ealarms-notify.sample (100%) rename www/{sogo => sogo2}/files/cron-expire-autoreply.sample (100%) rename www/{sogo => sogo2}/files/ealarms-notify.creds.sample (100%) rename www/{sogo => sogo2}/files/expire-autoreply.creds.sample (100%) rename www/{sogo => sogo2}/files/patch-ActiveSync_GNUmakefile (87%) rename www/{sogo => sogo2}/files/patch-Main_GNUmakefile.preamble (100%) rename www/{sogo => sogo2}/files/patch-Tests_Unit_GNUmakefile (100%) rename www/{sogo => sogo2}/files/patch-Tools_GNUmakefile.preamble (100%) rename www/{sogo => sogo2}/files/sogod.in (100%) rename www/{sogo => sogo2}/pkg-descr (100%) rename www/{sogo => sogo2}/pkg-message (91%) rename www/{sogo => sogo2}/pkg-plist (98%) delete mode 100644 www/webkit-gtk2/files/patch-CVE-2014-1748 delete mode 100644 www/webkit-gtk3/files/patch-CVE-2014-1748 delete mode 100644 x11-themes/adwaita-qt5/files/patch-src_style_adwaita.cpp diff --git a/comms/dcf77pi/Makefile b/comms/dcf77pi/Makefile index ac9148a29db..308b3500b95 100644 --- a/comms/dcf77pi/Makefile +++ b/comms/dcf77pi/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= dcf77pi -PORTVERSION= 3.4.2 +PORTVERSION= 3.5.0 CATEGORIES= comms MAINTAINER= rene@FreeBSD.org diff --git a/comms/dcf77pi/distinfo b/comms/dcf77pi/distinfo index f51155b7b11..5824e56399e 100644 --- a/comms/dcf77pi/distinfo +++ b/comms/dcf77pi/distinfo @@ -1,2 +1,2 @@ -SHA256 (rene0-dcf77pi-3.4.2_GH0.tar.gz) = d7695ada7006c5384af4e2dc67b0ac92e207aad239734a50d75787b96ddcbbe3 -SIZE (rene0-dcf77pi-3.4.2_GH0.tar.gz) = 52301 +SHA256 (rene0-dcf77pi-3.5.0_GH0.tar.gz) = 7ec84865cfada1569c665978f2569015b8fcf7b732b2e22760df94de6ab11312 +SIZE (rene0-dcf77pi-3.5.0_GH0.tar.gz) = 53239 diff --git a/databases/Makefile b/databases/Makefile index 72486f1b041..99f76b31fbd 100644 --- a/databases/Makefile +++ b/databases/Makefile @@ -836,7 +836,6 @@ SUBDIR += rrdman SUBDIR += rrdmerge SUBDIR += rrdtool - SUBDIR += rrdtool10 SUBDIR += rrdtool12 SUBDIR += ruby-bdb SUBDIR += ruby-cdb diff --git a/databases/jrrd/Makefile b/databases/jrrd/Makefile index 9fe67dc3644..c000dc0da87 100644 --- a/databases/jrrd/Makefile +++ b/databases/jrrd/Makefile @@ -3,6 +3,7 @@ PORTNAME= jrrd PORTVERSION= 1.0.8 +PORTREVISION= 1 CATEGORIES= databases java MASTER_SITES= SF/opennms/JRRD/stable-1.0 diff --git a/databases/mariadb55-server/Makefile b/databases/mariadb55-server/Makefile index 9bb446ca703..25d93a40ec6 100644 --- a/databases/mariadb55-server/Makefile +++ b/databases/mariadb55-server/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME?= mariadb -PORTVERSION= 5.5.47 +PORTVERSION= 5.5.49 CATEGORIES= databases ipv6 MASTER_SITES= http://ftp.osuosl.org/pub/mariadb/${PORTNAME}-${PORTVERSION}/source/ \ http://mirrors.supportex.net/mariadb/${PORTNAME}-${PORTVERSION}/source/ \ @@ -26,6 +26,7 @@ PKGMESSAGE= ${WRKDIR}/pkg-message SLAVEDIRS= databases/mariadb55-client USES= cmake execinfo gmake shebangfix +USE_OPENSSL= yes SHEBANG_FILES= scripts/*.sh CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc/mysql" \ @@ -46,6 +47,7 @@ CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc/mysql" \ -DWITH_UNIT_TESTS=0 \ -DWITH_LIBEDIT=0 \ -DWITH_LIBWRAP=1 \ + -DWITH_SSL=yes \ -DEXECINFO_ROOT=${LOCALBASE} \ -DCOMPILATION_COMMENT="FreeBSD Ports" @@ -59,8 +61,7 @@ BROKEN_armv6= Does not compile on arm .if !defined(CLIENT_ONLY) # MySQL-Server part -USE_MYSQL= yes -WANT_MYSQL_VER= 55m +USES+= mysql:55m CONFLICTS_INSTALL= mariadb5[0-46-9]-server-* \ mariadb1*-server-* \ @@ -72,7 +73,8 @@ USE_RC_SUBR= mysql-server USERS= mysql GROUPS= mysql -CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER="ON" \ +CMAKE_ARGS+= -DREADLINE_INCLUDE_DIR=/usr/include \ + -DWITH_EMBEDDED_SERVER="ON" \ -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 .else @@ -81,19 +83,10 @@ USES+= readline .endif OPTIONS_DEFINE+= FASTMTX -OPTIONS_RADIO= SSL -OPTIONS_RADIO_SSL= BUNDLED_SSL OPENSSL WITHOUT_SSL -OPTIONS_DEFAULT+= OPENSSL OPTIONS_SUB= yes NO_OPTIONS_SORT=yes -BUNDLED_SSL_DESC= SSL/TLS support via (bundled) CyaSSL FASTMTX_DESC= Replace mutexes with spinlocks -WITHOUT_SSL_DESC= No SSL/TLS support -OPENSSL_CMAKE_ON= -DWITH_SSL=yes -OPENSSL_USE= USE_OPENSSL=yes -BUNDLED_SSL_CMAKE_ON= -DWITH_SSL=bundled -WITHOUT_SSL_CMAKE_ON= -DWITH_SSL=no FASTMTX_CMAKE_ON= -DWITH_FAST_MUTEXES=1 diff --git a/databases/mariadb55-server/distinfo b/databases/mariadb55-server/distinfo index f1ffbf59d87..04e6147152e 100644 --- a/databases/mariadb55-server/distinfo +++ b/databases/mariadb55-server/distinfo @@ -1,2 +1,2 @@ -SHA256 (mariadb-5.5.47.tar.gz) = 62b9378677433461d2a79b1ebe3182ba249994eb0cff2054ae8de8f646364209 -SIZE (mariadb-5.5.47.tar.gz) = 45705343 +SHA256 (mariadb-5.5.49.tar.gz) = 2c82f2af71b88a7940d5ff647498ed78922c92e88004942caa213131e20f4706 +SIZE (mariadb-5.5.49.tar.gz) = 45738390 diff --git a/databases/mongodb/Makefile b/databases/mongodb/Makefile index 642b1901977..c72ca66e9ee 100644 --- a/databases/mongodb/Makefile +++ b/databases/mongodb/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= mongodb -PORTVERSION= 2.6.7 +PORTVERSION= 2.6.12 CATEGORIES= databases net MASTER_SITES= http://downloads.mongodb.org/src/ DISTNAME= ${PORTNAME}-src-r${PORTVERSION} diff --git a/databases/mongodb/distinfo b/databases/mongodb/distinfo index d1dc1b6ed80..bc6218e7724 100644 --- a/databases/mongodb/distinfo +++ b/databases/mongodb/distinfo @@ -1,2 +1,2 @@ -SHA256 (mongodb-src-r2.6.7.tar.gz) = 512254d1adeaf19cc8188032ac75ce01ac114811b5a27ef3a95dc79eeedd6bc9 -SIZE (mongodb-src-r2.6.7.tar.gz) = 14540119 +SHA256 (mongodb-src-r2.6.12.tar.gz) = 2dd51eabcfcd133573be74c0131c85b67764042833e7d94077e86adc0b9406dc +SIZE (mongodb-src-r2.6.12.tar.gz) = 16462842 diff --git a/databases/mongodb/files/patch-SConstruct b/databases/mongodb/files/patch-SConstruct index a12c2bb5460..f29fde9fe5b 100644 --- a/databases/mongodb/files/patch-SConstruct +++ b/databases/mongodb/files/patch-SConstruct @@ -1,6 +1,21 @@ ---- SConstruct.orig 2014-05-05 02:29:43.000000000 +0000 -+++ SConstruct 2014-05-12 09:50:56.999470711 +0000 -@@ -843,7 +843,7 @@ +--- SConstruct.orig 2016-03-21 17:09:46.000000000 +0100 ++++ SConstruct 2016-05-02 12:45:18.685329078 +0200 +@@ -483,10 +483,10 @@ env = Environment( variables=env_vars, + ) + + # Report any unknown variables as an error. +-unknown_vars = env_vars.UnknownVariables() +-if unknown_vars: +- print "Unknown variables specified: {0}".format(", ".join(unknown_vars.keys())) +- Exit(1) ++#unknown_vars = env_vars.UnknownVariables() ++#if unknown_vars: ++# print "Unknown variables specified: {0}".format(", ".join(unknown_vars.keys())) ++# Exit(1) + + if has_option("cache"): + EnsureSConsVersion( 2, 3, 0 ) +@@ -867,7 +867,7 @@ if nix: env.Append( LIBS=[] ) #make scons colorgcc friendly diff --git a/databases/mongodb/files/patch-src_mongo_SConscript b/databases/mongodb/files/patch-src_mongo_SConscript index 2422e4665c0..a36550c63bc 100644 --- a/databases/mongodb/files/patch-src_mongo_SConscript +++ b/databases/mongodb/files/patch-src_mongo_SConscript @@ -1,15 +1,15 @@ ---- src/mongo/SConscript.orig 2013-03-22 20:55:25.000000000 +0100 -+++ src/mongo/SConscript 2013-03-25 17:46:04.000000000 +0100 +--- src/mongo/SConscript.orig 2016-03-21 17:09:46.000000000 +0100 ++++ src/mongo/SConscript 2016-05-02 12:44:35.405331527 +0200 @@ -13,7 +13,7 @@ Import("has_option") - Import("usesm usev8") - Import("installSetup") + Import("get_option") + Import("usev8") Import("enforce_glibc") -Import("darwin windows solaris linux nix") +Import("darwin windows solaris linux freebsd nix") env.SConscript(['base/SConscript', 'db/auth/SConscript', -@@ -765,7 +765,7 @@ def installBinary( e, name ): +@@ -1183,7 +1183,7 @@ def installBinary( e, name ): if enforce_glibc: e.AddPostAction( name, checkGlibc ) diff --git a/databases/mongodb/files/patch-src_mongo_db_kill_current_op.cpp b/databases/mongodb/files/patch-src_mongo_db_kill_current_op.cpp index 23061135c48..a3d6825fe62 100644 --- a/databases/mongodb/files/patch-src_mongo_db_kill_current_op.cpp +++ b/databases/mongodb/files/patch-src_mongo_db_kill_current_op.cpp @@ -1,6 +1,6 @@ ---- src/mongo/db/kill_current_op.cpp.orig 2014-05-15 15:30:33.100157820 +0000 -+++ src/mongo/db/kill_current_op.cpp 2014-05-15 15:35:12.714138934 +0000 -@@ -152,7 +152,7 @@ +--- src/mongo/db/kill_current_op.cpp.orig 2016-03-21 17:09:46.000000000 +0100 ++++ src/mongo/db/kill_current_op.cpp 2016-05-02 12:44:35.406331476 +0200 +@@ -152,7 +152,7 @@ namespace { } // Return true with (approx) probability p = "chance". Recall: 0 <= chance <= 1. diff --git a/databases/mongodb/files/patch-src_mongo_db_ops_modifier_push.cpp b/databases/mongodb/files/patch-src_mongo_db_ops_modifier_push.cpp index e73b1c15015..d04f94bfb42 100644 --- a/databases/mongodb/files/patch-src_mongo_db_ops_modifier_push.cpp +++ b/databases/mongodb/files/patch-src_mongo_db_ops_modifier_push.cpp @@ -1,6 +1,6 @@ ---- src/mongo/db/ops/modifier_push.cpp.orig 2014-05-15 15:24:21.650184430 +0000 -+++ src/mongo/db/ops/modifier_push.cpp 2014-05-15 15:25:51.014179801 +0000 -@@ -646,7 +646,7 @@ +--- src/mongo/db/ops/modifier_push.cpp.orig 2016-03-21 17:09:46.000000000 +0100 ++++ src/mongo/db/ops/modifier_push.cpp 2016-05-02 12:44:35.408331153 +0200 +@@ -646,7 +646,7 @@ namespace mongo { } const int64_t numChildren = mutablebson::countChildren(_preparedState->elemFound); diff --git a/databases/mongodb/files/patch-src_third_party_boost_libs_filesystem_v3_src_path.cpp b/databases/mongodb/files/patch-src_third_party_boost_libs_filesystem_v3_src_path.cpp index 1e078410034..87abf8dfd93 100644 --- a/databases/mongodb/files/patch-src_third_party_boost_libs_filesystem_v3_src_path.cpp +++ b/databases/mongodb/files/patch-src_third_party_boost_libs_filesystem_v3_src_path.cpp @@ -1,5 +1,5 @@ ---- src/third_party/boost/libs/filesystem/v3/src/path.cpp.orig 2013-04-22 16:48:39.000000000 +0200 -+++ src/third_party/boost/libs/filesystem/v3/src/path.cpp 2013-05-03 14:46:44.000000000 +0200 +--- src/third_party/boost/libs/filesystem/v3/src/path.cpp.orig 2016-03-21 17:09:46.000000000 +0100 ++++ src/third_party/boost/libs/filesystem/v3/src/path.cpp 2016-05-02 12:44:35.410331831 +0200 @@ -35,7 +35,7 @@ #ifdef BOOST_WINDOWS_API # include "windows_file_codecvt.hpp" @@ -9,7 +9,7 @@ # include #endif -@@ -766,7 +766,7 @@ +@@ -766,7 +766,7 @@ namespace codecvt_facet(&std::use_facet > (path_locale)); @@ -18,7 +18,7 @@ // "All BSD system functions expect their string parameters to be in UTF-8 encoding // and nothing else." See -@@ -822,7 +822,7 @@ +@@ -822,7 +822,7 @@ namespace filesystem3 const path::codecvt_type*& path::wchar_t_codecvt_facet() { # if defined(BOOST_POSIX_API) && \ diff --git a/databases/p5-POE-Component-RRDTool/Makefile b/databases/p5-POE-Component-RRDTool/Makefile index 2eddf3404a8..4f29fbcef5f 100644 --- a/databases/p5-POE-Component-RRDTool/Makefile +++ b/databases/p5-POE-Component-RRDTool/Makefile @@ -3,7 +3,7 @@ PORTNAME= POE-Component-RRDTool PORTVERSION= 0.18 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= databases perl5 devel MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/databases/p5-RRD-Simple/Makefile b/databases/p5-RRD-Simple/Makefile index f1d4735ba31..159ccf5bcc9 100644 --- a/databases/p5-RRD-Simple/Makefile +++ b/databases/p5-RRD-Simple/Makefile @@ -3,7 +3,7 @@ PORTNAME= RRD-Simple PORTVERSION= 1.44 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= databases perl5 MASTER_SITES= CPAN/Proc/NICOLAW PKGNAMEPREFIX= p5- diff --git a/databases/pecl-rrd/Makefile b/databases/pecl-rrd/Makefile index 61023c6b380..250b7b14012 100644 --- a/databases/pecl-rrd/Makefile +++ b/databases/pecl-rrd/Makefile @@ -2,7 +2,7 @@ PORTNAME= rrd DISTVERSION= 1.1.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= databases pear MASTER_SITES= http://pecl.php.net/get/ PKGNAMEPREFIX= pecl- diff --git a/databases/py-python-rrdtool/Makefile b/databases/py-python-rrdtool/Makefile index 3d22a48bf7c..a924f5115f5 100644 --- a/databases/py-python-rrdtool/Makefile +++ b/databases/py-python-rrdtool/Makefile @@ -2,6 +2,7 @@ PORTNAME= python-rrdtool PORTVERSION= 1.4.7 +PORTREVISION= 1 CATEGORIES= databases python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/databases/py-rrdtool_lgpl/Makefile b/databases/py-rrdtool_lgpl/Makefile index a6de18fc6a0..57b74c648b9 100644 --- a/databases/py-rrdtool_lgpl/Makefile +++ b/databases/py-rrdtool_lgpl/Makefile @@ -3,7 +3,7 @@ PORTNAME= rrdtool_lgpl PORTVERSION= 1.0b1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= databases python MASTER_SITES= SF/py-rrdtool/py-rrdtool/${PORTVERSION} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/databases/rrdman/Makefile b/databases/rrdman/Makefile index 3de105b5a66..023bb3bd7c5 100644 --- a/databases/rrdman/Makefile +++ b/databases/rrdman/Makefile @@ -3,7 +3,7 @@ PORTNAME= rrdman PORTVERSION= 1.0.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= databases MASTER_SITES= SF/rrfw/${PORTNAME}/${PORTVERSION} diff --git a/databases/rrdmerge/Makefile b/databases/rrdmerge/Makefile index 1309da1d49b..e1b3a1c95ec 100644 --- a/databases/rrdmerge/Makefile +++ b/databases/rrdmerge/Makefile @@ -3,7 +3,7 @@ PORTNAME= rrdmerge PORTVERSION= 0.0.1 -#PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= databases MASTER_SITES= http://download.sippysoft.com/thirdparty/ DISTNAME= ${PORTNAME}-${GITREVISION} diff --git a/databases/rrdtool/Makefile b/databases/rrdtool/Makefile index 5ca3d8f9d18..53909082ce7 100644 --- a/databases/rrdtool/Makefile +++ b/databases/rrdtool/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= rrdtool -PORTVERSION= 1.5.5 -PORTREVISION= 1 +PORTVERSION= 1.6.0 CATEGORIES= databases graphics MASTER_SITES= http://oss.oetiker.ch/rrdtool/pub/ @@ -13,7 +12,7 @@ COMMENT= Round Robin Database Tools LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE -CONFLICTS= rrdtool10-* rrdtool12-* +CONFLICTS= rrdtool12-* CONFIGURE_ARGS= --disable-tcl --disable-silent-rules CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2 diff --git a/databases/rrdtool/distinfo b/databases/rrdtool/distinfo index 84fac4a8cd9..17cccb2d831 100644 --- a/databases/rrdtool/distinfo +++ b/databases/rrdtool/distinfo @@ -1,2 +1,2 @@ -SHA256 (rrdtool-1.5.5.tar.gz) = 3a286d449c05d657e3fc3adcaa5cb4f0cfac8f465324b14f364a45d4ff8ca6f6 -SIZE (rrdtool-1.5.5.tar.gz) = 2187685 +SHA256 (rrdtool-1.6.0.tar.gz) = cd948e89cd2d8825fab4a6fb0323f810948d934af7d92c9ee8b5e9e1350e52d7 +SIZE (rrdtool-1.6.0.tar.gz) = 2186538 diff --git a/databases/rrdtool/pkg-plist b/databases/rrdtool/pkg-plist index c15f380ae2a..3e0d50ea432 100644 --- a/databases/rrdtool/pkg-plist +++ b/databases/rrdtool/pkg-plist @@ -9,12 +9,8 @@ include/rrd_client.h include/rrd_format.h lib/librrd.a lib/librrd.so -lib/librrd.so.4 -lib/librrd.so.4.3.5 -lib/librrd_th.a -lib/librrd_th.so -lib/librrd_th.so.4 -lib/librrd_th.so.4.3.5 +lib/librrd.so.8 +lib/librrd.so.8.0.0 libdata/pkgconfig/librrd.pc %%PORTDOCS%%man/man1/bin_dec_hex.1.gz %%PORTDOCS%%man/man1/cdeftutorial.1.gz diff --git a/databases/rrdtool10/Makefile b/databases/rrdtool10/Makefile deleted file mode 100644 index 57a9b9023d9..00000000000 --- a/databases/rrdtool10/Makefile +++ /dev/null @@ -1,49 +0,0 @@ -# Created by: Dmitry Sivachenko -# $FreeBSD$ - -PORTNAME= rrdtool -PORTVERSION= 1.0.50 -PORTREVISION= 6 -CATEGORIES= databases -MASTER_SITES= http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.0.x/ -PKGNAMESUFFIX= 10 - -MAINTAINER= ports@FreeBSD.org -COMMENT= Round Robin Database Tools - -LICENSE= GPLv2+ -LICENSE_FILE= ${WRKSRC}/COPYING - -MAKE_ENV= PERL=${PERL} - -CONFLICTS= rrdtool12-1.* rrdtool-1.* - -USES= autoreconf pkgconfig perl5 libtool -USE_PERL5= build run -USE_LDCONFIG= yes -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --enable-shared --enable-local-zlib -CONFIGURE_ENV= PERL=${PERL} PERL_MAKE_OPTIONS="PREFIX=${PREFIX}" -CFLAGS:= ${CFLAGS:N-ffast-math} -CPPFLAGS+= -I${LOCALBASE}/include -LIBS+= -L${LOCALBASE}/lib - -INSTALL_TARGET= install-strip - -OPTIONS_DEFINE= LATIN2 DOCS EXAMPLES -LATIN2_DESC= ISO-8859-2 fonts support - -LATIN2_CONFIGURE_ENABLE= latin2 - -post-patch: -# fix perl5.18+ pod2x tool - @${REINPLACE_CMD} -e 's|IMG<|IMG ... E<|' \ - ${WRKSRC}/doc/rrdcgi.pod - @${REINPLACE_CMD} -e 's|rrdtutorial.es.pod||' \ - ${WRKSRC}/doc/Makefile.am \ - ${WRKSRC}/doc/Makefile.in - -post-install: - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/RRDs/RRDs.so - -.include diff --git a/databases/rrdtool10/distinfo b/databases/rrdtool10/distinfo deleted file mode 100644 index e25ad74d5d1..00000000000 --- a/databases/rrdtool10/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (rrdtool-1.0.50.tar.gz) = 42aa7c213dedbd95d33ca84d92f4187880f7e96062c6a3fb05bfb16f77ba2a91 -SIZE (rrdtool-1.0.50.tar.gz) = 1474200 diff --git a/databases/rrdtool10/files/patch-Makefile.am b/databases/rrdtool10/files/patch-Makefile.am deleted file mode 100644 index 8285ab60036..00000000000 --- a/databases/rrdtool10/files/patch-Makefile.am +++ /dev/null @@ -1,36 +0,0 @@ ---- Makefile.am.orig 2004-08-04 15:20:32 UTC -+++ Makefile.am -@@ -33,21 +33,7 @@ - # lets schedule the perl stuff for installation - # the special call to install-sh is because the -d switch is not portable - # mac os X has its perl module in bundles so it seems --install-data-local: -- @if test "x$(PERL)" != "xno"; then \ -- echo "$(top_srcdir)/config/mkinstalldirs $(DESTDIR)$(prefix)/lib/perl/auto/RRDs"; \ -- $(top_srcdir)/config/mkinstalldirs $(DESTDIR)$(prefix)/lib/perl/auto/RRDs; \ -- echo "$(INSTALL) -m 644 $(top_srcdir)/perl-piped/RRDp.pm $(DESTDIR)$(prefix)/lib/perl"; \ -- $(INSTALL) -m 644 $(top_srcdir)/perl-piped/RRDp.pm $(DESTDIR)$(prefix)/lib/perl; \ -- echo "$(INSTALL) -m 644 $(top_srcdir)/perl-shared/RRDs.pm $(DESTDIR)$(prefix)/lib/perl"; \ -- $(INSTALL) -m 644 $(top_srcdir)/perl-shared/RRDs.pm $(DESTDIR)$(prefix)/lib/perl; \ -- echo "$(INSTALL) -m 644 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bs $(DESTDIR)$(prefix)/lib/perl/auto/RRDs"; \ -- $(INSTALL) -m 644 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bs $(DESTDIR)$(prefix)/lib/perl/auto/RRDs; \ -- echo "test -f $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.@SO_EXT@ && $(INSTALL) -m 755 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.@SO_EXT@ $(DESTDIR)$(prefix)/lib/perl/auto/RRDs || true"; \ -- test -f $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.@SO_EXT@ && $(INSTALL) -m 755 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.@SO_EXT@ $(DESTDIR)$(prefix)/lib/perl/auto/RRDs || true; \ -- echo "test -f $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bundle && $(INSTALL) -m 755 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bundle $(DESTDIR)$(prefix)/lib/perl/auto/RRDs|| true"; \ -- test -f $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bundle && $(INSTALL) -m 755 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bundle $(DESTDIR)$(prefix)/lib/perl/auto/RRDs|| true; \ -- fi -+install-data-local: site-perl-inst - - - # use relaxed rules when building dists -@@ -137,8 +123,8 @@ - site-perl-inst: site-perl-install - - site-perl-install: all perl-piped/Makefile perl-shared/Makefile -- cd perl-piped && $(MAKE) install -- cd perl-shared && $(MAKE) install -+ cd perl-piped && $(MAKE) pure_install -+ cd perl-shared && $(MAKE) pure_install - - site-tcl-install: all - cd tcl && $(MAKE) tcl-install diff --git a/databases/rrdtool10/files/patch-configure.ac b/databases/rrdtool10/files/patch-configure.ac deleted file mode 100644 index 07ff41bddea..00000000000 --- a/databases/rrdtool10/files/patch-configure.ac +++ /dev/null @@ -1,25 +0,0 @@ ---- configure.ac.orig 2005-04-25 20:46:33 UTC -+++ configure.ac -@@ -393,22 +393,6 @@ - chmod +x examples/*.cgi examples/*.pl contrib/*/*.pl]],[[]]) - AC_OUTPUT - --AC_MSG_CHECKING(in) --AC_MSG_RESULT(and out again) -- --echo $ECHO_N "ordering CD from http://people.ee.ethz.ch/~oetiker/wish $ac_c" 1>&6 --sleep 1 --echo $ECHO_N ".$ac_c" 1>&6 --sleep 2 --echo $ECHO_N ".$ac_c" 1>&6 --sleep 1 --echo $ECHO_N ".$ac_c" 1>&6 --sleep 3 --echo $ECHO_N ".$ac_c" 1>&6 --echo $ECHO_N ".$ac_c" 1>&6 --echo $ECHO_N ".$ac_c" 1>&6 --sleep 2 --AC_MSG_RESULT([ just kidding ;-)]) - echo - echo "----------------------------------------------------------------" - echo "Config is DONE!" diff --git a/databases/rrdtool10/files/patch-contrib__Makefile.am b/databases/rrdtool10/files/patch-contrib__Makefile.am deleted file mode 100644 index 7fd871260ed..00000000000 --- a/databases/rrdtool10/files/patch-contrib__Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ ---- contrib/Makefile.am.orig 2002-02-26 10:21:19 UTC -+++ contrib/Makefile.am -@@ -1,6 +1,6 @@ - ## Process this file with automake to produce Makefile.in - - SUBDIRS = trytime --contribdir = $(prefix)/contrib -+contribdir = $(prefix)/share/examples/rrdtool - contrib_DATA = README - EXTRA_DIST = rrdview log2rrd rrd-file-icon rrdproc rrdlastds add_ds killspike rrdfetchnames snmpstats rrdexplorer php3 php4 diff --git a/databases/rrdtool10/files/patch-contrib__trytime__Makefile.am b/databases/rrdtool10/files/patch-contrib__trytime__Makefile.am deleted file mode 100644 index 12999c5465c..00000000000 --- a/databases/rrdtool10/files/patch-contrib__trytime__Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ ---- contrib/trytime/Makefile.am.orig 2003-11-30 22:00:24 UTC -+++ contrib/trytime/Makefile.am -@@ -1,7 +1,7 @@ - ## Process this file with automake to produce Makefile.in - AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/gd1.3 - EXTRA_DIST = trytime.c --contribdir = $(prefix)/contrib/trytime -+contribdir = $(prefix)/share/examples/rrdtool/trytime - contrib_DATA = README trytime.c - bin_PROGRAMS = trytime - trytime_SOURCES = trytime.c diff --git a/databases/rrdtool10/files/patch-doc__Makefile.am b/databases/rrdtool10/files/patch-doc__Makefile.am deleted file mode 100644 index 424aa01afb0..00000000000 --- a/databases/rrdtool10/files/patch-doc__Makefile.am +++ /dev/null @@ -1,14 +0,0 @@ ---- doc/Makefile.am.orig 2005-04-25 21:02:27 UTC -+++ doc/Makefile.am -@@ -25,9 +25,9 @@ - EXTRA_DIST= $(POD) $(HTML) $(TXT) rrdtool-dump.dtd rrdtool-xport.dtd - - # some install rules --idocdir = $(prefix)/doc -+idocdir = $(prefix)/share/doc/rrdtool - idoc_DATA = $(POD) $(TXT) --ihtmldir = $(prefix)/html -+ihtmldir = $(prefix)/share/doc/rrdtool/html - ihtml_DATA = $(HTML) - imandir = $(mandir)/man1 - iman_DATA = $(MAN) diff --git a/databases/rrdtool10/files/patch-examples__Makefile.am b/databases/rrdtool10/files/patch-examples__Makefile.am deleted file mode 100644 index 2b26c03b90b..00000000000 --- a/databases/rrdtool10/files/patch-examples__Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ ---- examples/Makefile.am.orig 2002-02-26 10:21:25 UTC -+++ examples/Makefile.am -@@ -6,5 +6,5 @@ - - EXTRA_DIST = cgi-demo.cgi.in piped-demo.pl.in shared-demo.pl.in stripes.pl.in bigtops.pl.in minmax.pl.in - --examplesdir = $(prefix)/examples -+examplesdir = $(prefix)/share/examples/rrdtool - examples_SCRIPTS = cgi-demo.cgi piped-demo.pl shared-demo.pl stripes.pl bigtops.pl minmax.pl diff --git a/databases/rrdtool10/files/patch-src-Makefile.am b/databases/rrdtool10/files/patch-src-Makefile.am deleted file mode 100644 index 41ea39cf967..00000000000 --- a/databases/rrdtool10/files/patch-src-Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ ---- src/Makefile.am.orig 2005-03-12 16:59:41 UTC -+++ src/Makefile.am -@@ -91,7 +91,6 @@ librrd_la_LDFLAGS = -version-inf - include_HEADERS = rrd.h - - librrd_private_la_LIBADD = $(RRD_LIBS) --librrd_private_la_LDFLAGS = -static - - bin_PROGRAMS = rrdcgi rrdtool rrdupdate - diff --git a/databases/rrdtool10/pkg-descr b/databases/rrdtool10/pkg-descr deleted file mode 100644 index 2d47a2220ff..00000000000 --- a/databases/rrdtool10/pkg-descr +++ /dev/null @@ -1,10 +0,0 @@ -It is pretty easy to gather status information from all sorts of things, -ranging from the temperature in your office to the number of octets which -have passed through the FDDI interface of your router. But it is not so -trivial to store this data in a efficient and systematic manner. This is -where RRDtool kicks in. It lets you log and analyze the data you gather from -all kinds of data-sources. The data analysis part of RRDtool is based -on the ability to quickly generate graphical representations of the data -values collected over a definable time period. - -WWW: http://www.rrdtool.org/ diff --git a/databases/rrdtool10/pkg-plist b/databases/rrdtool10/pkg-plist deleted file mode 100644 index 477b92f589c..00000000000 --- a/databases/rrdtool10/pkg-plist +++ /dev/null @@ -1,106 +0,0 @@ -bin/rrdcgi -bin/rrdtool -bin/rrdupdate -bin/trytime -include/rrd.h -lib/librrd.a -lib/librrd.so -lib/librrd.so.0 -lib/librrd.so.0.0.0 -%%PERL5_MAN3%%/RRDp.3.gz -%%PERL5_MAN3%%/RRDs.3.gz -%%SITE_PERL%%/RRDp.pm -%%SITE_ARCH%%/RRDs.pm -%%SITE_ARCH%%/auto/RRDs/RRDs.so -%%SITE_ARCH%%/ntmake.pl -man/man1/RRDp.1.gz -man/man1/RRDs.1.gz -man/man1/bin_dec_hex.1.gz -man/man1/cdeftutorial.1.gz -man/man1/rpntutorial.1.gz -man/man1/rrd-beginners.1.gz -man/man1/rrdcgi.1.gz -man/man1/rrdcreate.1.gz -man/man1/rrddump.1.gz -man/man1/rrdfetch.1.gz -man/man1/rrdfirst.1.gz -man/man1/rrdgraph.1.gz -man/man1/rrdinfo.1.gz -man/man1/rrdlast.1.gz -man/man1/rrdresize.1.gz -man/man1/rrdrestore.1.gz -man/man1/rrdtool.1.gz -man/man1/rrdtune.1.gz -man/man1/rrdtutorial.1.gz -man/man1/rrdupdate.1.gz -man/man1/rrdxport.1.gz -%%PORTDOCS%%%%DOCSDIR%%/RRDp.txt -%%PORTDOCS%%%%DOCSDIR%%/RRDs.txt -%%PORTDOCS%%%%DOCSDIR%%/bin_dec_hex.pod -%%PORTDOCS%%%%DOCSDIR%%/bin_dec_hex.txt -%%PORTDOCS%%%%DOCSDIR%%/cdeftutorial.pod -%%PORTDOCS%%%%DOCSDIR%%/cdeftutorial.txt -%%PORTDOCS%%%%DOCSDIR%%/html/RRDp.html -%%PORTDOCS%%%%DOCSDIR%%/html/RRDs.html -%%PORTDOCS%%%%DOCSDIR%%/html/bin_dec_hex.html -%%PORTDOCS%%%%DOCSDIR%%/html/cdeftutorial.html -%%PORTDOCS%%%%DOCSDIR%%/html/rpntutorial.html -%%PORTDOCS%%%%DOCSDIR%%/html/rrd-beginners.html -%%PORTDOCS%%%%DOCSDIR%%/html/rrdcgi.html -%%PORTDOCS%%%%DOCSDIR%%/html/rrdcreate.html -%%PORTDOCS%%%%DOCSDIR%%/html/rrddump.html -%%PORTDOCS%%%%DOCSDIR%%/html/rrdfetch.html -%%PORTDOCS%%%%DOCSDIR%%/html/rrdfirst.html -%%PORTDOCS%%%%DOCSDIR%%/html/rrdgraph.html -%%PORTDOCS%%%%DOCSDIR%%/html/rrdinfo.html -%%PORTDOCS%%%%DOCSDIR%%/html/rrdlast.html -%%PORTDOCS%%%%DOCSDIR%%/html/rrdresize.html -%%PORTDOCS%%%%DOCSDIR%%/html/rrdrestore.html -%%PORTDOCS%%%%DOCSDIR%%/html/rrdtool.html -%%PORTDOCS%%%%DOCSDIR%%/html/rrdtune.html -%%PORTDOCS%%%%DOCSDIR%%/html/rrdtutorial.html -%%PORTDOCS%%%%DOCSDIR%%/html/rrdupdate.html -%%PORTDOCS%%%%DOCSDIR%%/html/rrdxport.html -%%PORTDOCS%%%%DOCSDIR%%/rpntutorial.pod -%%PORTDOCS%%%%DOCSDIR%%/rpntutorial.txt -%%PORTDOCS%%%%DOCSDIR%%/rrd-beginners.pod -%%PORTDOCS%%%%DOCSDIR%%/rrd-beginners.txt -%%PORTDOCS%%%%DOCSDIR%%/rrdcgi.pod -%%PORTDOCS%%%%DOCSDIR%%/rrdcgi.txt -%%PORTDOCS%%%%DOCSDIR%%/rrdcreate.pod -%%PORTDOCS%%%%DOCSDIR%%/rrdcreate.txt -%%PORTDOCS%%%%DOCSDIR%%/rrddump.pod -%%PORTDOCS%%%%DOCSDIR%%/rrddump.txt -%%PORTDOCS%%%%DOCSDIR%%/rrdfetch.pod -%%PORTDOCS%%%%DOCSDIR%%/rrdfetch.txt -%%PORTDOCS%%%%DOCSDIR%%/rrdfirst.pod -%%PORTDOCS%%%%DOCSDIR%%/rrdfirst.txt -%%PORTDOCS%%%%DOCSDIR%%/rrdgraph.pod -%%PORTDOCS%%%%DOCSDIR%%/rrdgraph.txt -%%PORTDOCS%%%%DOCSDIR%%/rrdinfo.pod -%%PORTDOCS%%%%DOCSDIR%%/rrdinfo.txt -%%PORTDOCS%%%%DOCSDIR%%/rrdlast.pod -%%PORTDOCS%%%%DOCSDIR%%/rrdlast.txt -%%PORTDOCS%%%%DOCSDIR%%/rrdresize.pod -%%PORTDOCS%%%%DOCSDIR%%/rrdresize.txt -%%PORTDOCS%%%%DOCSDIR%%/rrdrestore.pod -%%PORTDOCS%%%%DOCSDIR%%/rrdrestore.txt -%%PORTDOCS%%%%DOCSDIR%%/rrdtool.pod -%%PORTDOCS%%%%DOCSDIR%%/rrdtool.txt -%%PORTDOCS%%%%DOCSDIR%%/rrdtune.pod -%%PORTDOCS%%%%DOCSDIR%%/rrdtune.txt -%%PORTDOCS%%%%DOCSDIR%%/rrdtutorial.pod -%%PORTDOCS%%%%DOCSDIR%%/rrdtutorial.txt -%%PORTDOCS%%%%DOCSDIR%%/rrdupdate.pod -%%PORTDOCS%%%%DOCSDIR%%/rrdupdate.txt -%%PORTDOCS%%%%DOCSDIR%%/rrdxport.pod -%%PORTDOCS%%%%DOCSDIR%%/rrdxport.txt -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bigtops.pl -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cgi-demo.cgi -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/minmax.pl -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/piped-demo.pl -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/shared-demo.pl -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/stripes.pl -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/trytime/README -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/trytime/trytime.c diff --git a/databases/tcl-lmdb/Makefile b/databases/tcl-lmdb/Makefile index 6770ae044a4..1916a3ddb44 100644 --- a/databases/tcl-lmdb/Makefile +++ b/databases/tcl-lmdb/Makefile @@ -3,6 +3,7 @@ PORTNAME= tcl-lmdb PORTVERSION= 0.3.3 +PORTREVISION= 1 CATEGORIES= databases MAINTAINER= gahr@FreeBSD.org @@ -17,6 +18,9 @@ GH_ACCOUNT= ray2501 USES= gmake tcl:tea CONFIGURE_ARGS= --with-system-lmdb +CFLAGS+= -I${LOCALBASE}/include +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib TEST_TARGET= test diff --git a/devel/Makefile b/devel/Makefile index 1a5c54f919e..98bc35269b8 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -5269,7 +5269,7 @@ SUBDIR += smokeqt SUBDIR += smv SUBDIR += soapui - SUBDIR += sope + SUBDIR += sope2 SUBDIR += sope3 SUBDIR += sourcenav SUBDIR += sparc64-binutils diff --git a/devel/cgilib/Makefile b/devel/cgilib/Makefile index ff3825c4cb2..730b5584caf 100644 --- a/devel/cgilib/Makefile +++ b/devel/cgilib/Makefile @@ -3,6 +3,7 @@ PORTNAME= cgilib PORTVERSION= 0.7 +PORTREVISION= 1 CATEGORIES= devel www MASTER_SITES= http://www.infodrom.org/projects/cgilib/download/ \ http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/pub/libs/ diff --git a/devel/elixir-coverex/Makefile b/devel/elixir-coverex/Makefile index 914fd71fe4f..c201b0e4c2b 100644 --- a/devel/elixir-coverex/Makefile +++ b/devel/elixir-coverex/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= coverex -PORTVERSION= 1.4.8 +PORTVERSION= 1.4.9 DISTVERSIONPREFIX= v CATEGORIES= devel PKGNAMEPREFIX= elixir- diff --git a/devel/elixir-coverex/distinfo b/devel/elixir-coverex/distinfo index c54e2f9590c..3d4e8489884 100644 --- a/devel/elixir-coverex/distinfo +++ b/devel/elixir-coverex/distinfo @@ -1,2 +1,2 @@ -SHA256 (alfert-coverex-v1.4.8_GH0.tar.gz) = dd7302aa647b0497a5bcc5b270198ab159e5bc635872de18ebb9bf2aa04ca6d1 -SIZE (alfert-coverex-v1.4.8_GH0.tar.gz) = 55004 +SHA256 (alfert-coverex-v1.4.9_GH0.tar.gz) = f116d8adeebc9d4752171eb00f43ada1bcd8461bc30d89fb88329af6de91d716 +SIZE (alfert-coverex-v1.4.9_GH0.tar.gz) = 54968 diff --git a/devel/jenkins2/Makefile b/devel/jenkins2/Makefile index 20c6db1fc70..f223a5a4d27 100644 --- a/devel/jenkins2/Makefile +++ b/devel/jenkins2/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= jenkins2 -DISTVERSION= 2.0 +DISTVERSION= 2.1 CATEGORIES= devel java MASTER_SITES= http://mirrors.jenkins-ci.org/war/${PORTVERSION}/ DISTNAME= jenkins diff --git a/devel/jenkins2/distinfo b/devel/jenkins2/distinfo index 3ca6bbd7913..e30bf1ef5b7 100644 --- a/devel/jenkins2/distinfo +++ b/devel/jenkins2/distinfo @@ -1,2 +1,2 @@ -SHA256 (jenkins2/2.0/jenkins.war) = c883c58ba57a70371f60c44c74341e0d511f330e84c13a2499368a02ae11dd97 -SIZE (jenkins2/2.0/jenkins.war) = 66519999 +SHA256 (jenkins2/2.1/jenkins.war) = 064d91c5a813c3b2b65174a3ad46d76c46a30f7cb5e50f16ef22157f9d7a1045 +SIZE (jenkins2/2.1/jenkins.war) = 66546336 diff --git a/devel/libbson/Makefile b/devel/libbson/Makefile index 9d92f2db2a5..033f542d88a 100644 --- a/devel/libbson/Makefile +++ b/devel/libbson/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= libbson -PORTVERSION= 1.3.4 +PORTVERSION= 1.3.5 CATEGORIES= devel MAINTAINER= ports@bsdserwis.com diff --git a/devel/libbson/distinfo b/devel/libbson/distinfo index 3e73ad9d656..e2f45d0aec2 100644 --- a/devel/libbson/distinfo +++ b/devel/libbson/distinfo @@ -1,2 +1,2 @@ -SHA256 (mongodb-libbson-1.3.4_GH0.tar.gz) = 65e505b1cbc42b58171d6613accef5181f39ddff2a7ceba8720ef91d79a22713 -SIZE (mongodb-libbson-1.3.4_GH0.tar.gz) = 4040715 +SHA256 (mongodb-libbson-1.3.5_GH0.tar.gz) = 351ac37540a2b406563bfc59ecaec4059c61b0f9d7cde7236c0a0e241bde3564 +SIZE (mongodb-libbson-1.3.5_GH0.tar.gz) = 4040751 diff --git a/devel/llvm38/Makefile b/devel/llvm38/Makefile index 96060129aa7..82774a79b6c 100644 --- a/devel/llvm38/Makefile +++ b/devel/llvm38/Makefile @@ -2,7 +2,7 @@ PORTNAME= llvm DISTVERSION= 3.8.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel lang MASTER_SITES= http://llvm.org/${PRE_}releases/${LLVM_RELEASE}/${RCDIR} DISTNAME= ${PORTNAME}-${DISTVERSION}.src @@ -217,7 +217,7 @@ _COMPILER_RT_LIBS= \ libclang_rt.ubsan_standalone_cxx-x86_64.a \ libclang_rt.ubsan_standalone_cxx-x86_64.a.syms .endif -.if ${ARCH} == "i386" || ${ARCH} == "amd64" +.if ${ARCH} == "i386" _COMPILER_RT_LIBS+= \ libclang_rt.asan-i386.a \ libclang_rt.asan-i386.so \ @@ -288,6 +288,7 @@ post-patch: post-patch-COMPILER_RT-on: cd ${WRKSRC_compiler_rt} && patch < ${PATCHDIR}/compiler-rt-patch-svn-261229 + cd ${WRKSRC_compiler_rt} && patch < ${PATCHDIR}/compiler-rt-patch-no-m32 post-build-COMPILER_RT-on: ${MKDIR} ${WRKDIR}/compiler-rt-build diff --git a/devel/llvm38/files/compiler-rt-patch-no-m32 b/devel/llvm38/files/compiler-rt-patch-no-m32 new file mode 100644 index 00000000000..de42cbe1222 --- /dev/null +++ b/devel/llvm38/files/compiler-rt-patch-no-m32 @@ -0,0 +1,14 @@ +--- cmake/config-ix.cmake.orig 2016-05-02 20:51:53.598525522 +0000 ++++ cmake/config-ix.cmake 2016-05-02 20:53:24.573519349 +0000 +@@ -189,11 +189,6 @@ + if("${COMPILER_RT_DEFAULT_TARGET_ARCH}" MATCHES "i[2-6]86|x86|amd64") + if(NOT MSVC) + test_target_arch(x86_64 "" "-m64") +- # FIXME: We build runtimes for both i686 and i386, as "clang -m32" may +- # target different variant than "$CMAKE_C_COMPILER -m32". This part should +- # be gone after we resolve PR14109. +- test_target_arch(i686 __i686__ "-m32") +- test_target_arch(i386 __i386__ "-m32") + else() + if (CMAKE_SIZEOF_VOID_P EQUAL 4) + test_target_arch(i386 "" "") diff --git a/devel/p5-Devel-TraceUse/Makefile b/devel/p5-Devel-TraceUse/Makefile index 4f2ed0be14c..af9ce1deec6 100644 --- a/devel/p5-Devel-TraceUse/Makefile +++ b/devel/p5-Devel-TraceUse/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= Devel-TraceUse -PORTVERSION= 2.08 -PORTREVISION= 1 +PORTVERSION= 2.094 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -15,6 +14,6 @@ LICENSE= ART10 GPLv1 LICENSE_COMB= dual USES= perl5 -USE_PERL5= modbuild +USE_PERL5= configure .include diff --git a/devel/p5-Devel-TraceUse/distinfo b/devel/p5-Devel-TraceUse/distinfo index fb06a25dabe..a1c6567f523 100644 --- a/devel/p5-Devel-TraceUse/distinfo +++ b/devel/p5-Devel-TraceUse/distinfo @@ -1,2 +1,2 @@ -SHA256 (Devel-TraceUse-2.08.tar.gz) = f46e17bebaf53d4582d8c383b6187590fe43b5e016d76601120ff7e12f27ee8a -SIZE (Devel-TraceUse-2.08.tar.gz) = 13431 +SHA256 (Devel-TraceUse-2.094.tar.gz) = 54e93afff5dfdafc34140dbc904b893291803e75592b2e4b5d2b4a82f84b8737 +SIZE (Devel-TraceUse-2.094.tar.gz) = 23762 diff --git a/devel/p5-RRDTool-OO/Makefile b/devel/p5-RRDTool-OO/Makefile index 3bcaa59d79f..bfbe143a4ad 100644 --- a/devel/p5-RRDTool-OO/Makefile +++ b/devel/p5-RRDTool-OO/Makefile @@ -3,6 +3,7 @@ PORTNAME= RRDTool-OO PORTVERSION= 0.36 +PORTREVISION= 1 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/devel/p5-Test2-Suite/Makefile b/devel/p5-Test2-Suite/Makefile index 8214ba97448..1b59c1056ae 100644 --- a/devel/p5-Test2-Suite/Makefile +++ b/devel/p5-Test2-Suite/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= Test2-Suite -PORTVERSION= 0.000028 +PORTVERSION= 0.000029 CATEGORIES= devel perl5 MASTER_SITES= CPAN MASTER_SITE_SUBDIR= CPAN:EXODIST diff --git a/devel/p5-Test2-Suite/distinfo b/devel/p5-Test2-Suite/distinfo index e4c8b7f1318..7b4179668e8 100644 --- a/devel/p5-Test2-Suite/distinfo +++ b/devel/p5-Test2-Suite/distinfo @@ -1,2 +1,2 @@ -SHA256 (Test2-Suite-0.000028.tar.gz) = 9c8f1ae5ad52b106ceee2c427e0f7775fdc7fc242f36bad4a2092dd105c873cb -SIZE (Test2-Suite-0.000028.tar.gz) = 123016 +SHA256 (Test2-Suite-0.000029.tar.gz) = 94606f83979db49331b8ccbb0c8dcbc2f032ac552379ed9539cfacb474940485 +SIZE (Test2-Suite-0.000029.tar.gz) = 123045 diff --git a/devel/p5-Test2/Makefile b/devel/p5-Test2/Makefile index e50e4d7754a..cd3c9a0c7dd 100644 --- a/devel/p5-Test2/Makefile +++ b/devel/p5-Test2/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= Test2 -PORTVERSION= 0.000042 +PORTVERSION= 0.000044 CATEGORIES= devel perl5 MASTER_SITES= CPAN MASTER_SITE_SUBDIR= CPAN:EXODIST diff --git a/devel/p5-Test2/distinfo b/devel/p5-Test2/distinfo index d5db27fdb9b..6a605467eaa 100644 --- a/devel/p5-Test2/distinfo +++ b/devel/p5-Test2/distinfo @@ -1,2 +1,2 @@ -SHA256 (Test2-0.000042.tar.gz) = 9f37c2be5901b0c96fcdd445181fc2245fe18593144b5ea25235276cf9475aa0 -SIZE (Test2-0.000042.tar.gz) = 93703 +SHA256 (Test2-0.000044.tar.gz) = 4e5468907a8a79685d94345d09735abda4ef50f4f3938fc43f5997fe46adfc21 +SIZE (Test2-0.000044.tar.gz) = 98640 diff --git a/devel/p5-Test2/pkg-plist b/devel/p5-Test2/pkg-plist index 2cb8b6fb11d..9a4a659ae7e 100644 --- a/devel/p5-Test2/pkg-plist +++ b/devel/p5-Test2/pkg-plist @@ -1,5 +1,6 @@ %%SITE_PERL%%/Test2.pm %%SITE_PERL%%/Test2/API.pm +%%SITE_PERL%%/Test2/API/Breakage.pm %%SITE_PERL%%/Test2/API/Context.pm %%SITE_PERL%%/Test2/API/Instance.pm %%SITE_PERL%%/Test2/API/Stack.pm @@ -29,6 +30,7 @@ %%SITE_PERL%%/Test2/Util/Trace.pm %%PERL5_MAN3%%/Test2.3.gz %%PERL5_MAN3%%/Test2::API.3.gz +%%PERL5_MAN3%%/Test2::API::Breakage.3.gz %%PERL5_MAN3%%/Test2::API::Context.3.gz %%PERL5_MAN3%%/Test2::API::Instance.3.gz %%PERL5_MAN3%%/Test2::API::Stack.3.gz diff --git a/devel/py-magic/Makefile b/devel/py-magic/Makefile index 184986dbcc0..52da4f76b72 100644 --- a/devel/py-magic/Makefile +++ b/devel/py-magic/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= magic -PORTVERSION= 5.25 +PORTVERSION= 5.26 CATEGORIES= devel python MASTER_SITES= ftp://ftp.astron.com/pub/file/ \ ftp://ftp.gw.com/mirrors/pub/unix/file/ \ diff --git a/devel/py-magic/distinfo b/devel/py-magic/distinfo index 61813307649..5eacadb7ebd 100644 --- a/devel/py-magic/distinfo +++ b/devel/py-magic/distinfo @@ -1,2 +1,2 @@ -SHA256 (file-5.25.tar.gz) = 3735381563f69fb4239470b8c51b876a80425348b8285a7cded8b61d6b890eca -SIZE (file-5.25.tar.gz) = 739485 +SHA256 (file-5.26.tar.gz) = 2ef32b4ec936b0ff7b59a021dce56086a716663b6df1138c7ea597d396bf50cf +SIZE (file-5.26.tar.gz) = 773061 diff --git a/devel/py-parsedatetime/Makefile b/devel/py-parsedatetime/Makefile index e0bf9b4e317..e1ab922bdb9 100644 --- a/devel/py-parsedatetime/Makefile +++ b/devel/py-parsedatetime/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= parsedatetime -PORTVERSION= 1.4 +PORTVERSION= 2.1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-parsedatetime/distinfo b/devel/py-parsedatetime/distinfo index 08935cfe2ba..d3773166693 100644 --- a/devel/py-parsedatetime/distinfo +++ b/devel/py-parsedatetime/distinfo @@ -1,2 +1,2 @@ -SHA256 (parsedatetime-1.4.tar.gz) = 09bfcd8f3c239c75e77b3ff05d782ab2c1aed0892f250ce2adf948d4308fe9dc -SIZE (parsedatetime-1.4.tar.gz) = 52766 +SHA256 (parsedatetime-2.1.tar.gz) = 17c578775520c99131634e09cfca5a05ea9e1bd2a05cd06967ebece10df7af2d +SIZE (parsedatetime-2.1.tar.gz) = 56288 diff --git a/devel/py-pp/Makefile b/devel/py-pp/Makefile index 616faf79e93..642f772dd45 100644 --- a/devel/py-pp/Makefile +++ b/devel/py-pp/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= pp -PORTVERSION= 1.6.4 -PORTREVISION= 1 +PORTVERSION= 1.6.5 CATEGORIES= devel python MASTER_SITES= http://www.parallelpython.com/downloads/pp/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-pp/distinfo b/devel/py-pp/distinfo index 8da5682f90a..6f7fcbf187d 100644 --- a/devel/py-pp/distinfo +++ b/devel/py-pp/distinfo @@ -1,2 +1,2 @@ -SHA256 (pp-1.6.4.tar.gz) = fa271f17641e069f19e25d352885e3a475797c657b30e433d8227c3d882163fa -SIZE (pp-1.6.4.tar.gz) = 29521 +SHA256 (pp-1.6.5.tar.gz) = 8d50b5739d4033dc66d73bfab93aa9e651a001981b67cbc1785f03eeac8aed5e +SIZE (pp-1.6.5.tar.gz) = 30751 diff --git a/devel/rubygem-errand/Makefile b/devel/rubygem-errand/Makefile index 70d274445ba..6044e015fc6 100644 --- a/devel/rubygem-errand/Makefile +++ b/devel/rubygem-errand/Makefile @@ -3,6 +3,7 @@ PORTNAME= errand PORTVERSION= 0.8.1 +PORTREVISION= 1 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-hashie/Makefile b/devel/rubygem-hashie/Makefile index a6c851cf8f8..9dd3d105f62 100644 --- a/devel/rubygem-hashie/Makefile +++ b/devel/rubygem-hashie/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= hashie -PORTVERSION= 3.4.3 +PORTVERSION= 3.4.4 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-hashie/distinfo b/devel/rubygem-hashie/distinfo index e51fdf67a18..3d06983814b 100644 --- a/devel/rubygem-hashie/distinfo +++ b/devel/rubygem-hashie/distinfo @@ -1,2 +1,2 @@ -SHA256 (rubygem/hashie-3.4.3.gem) = 29213491e9f74158b9a7ec0806b3698039357209a6b24553cfd767f6418365c7 -SIZE (rubygem/hashie-3.4.3.gem) = 58880 +SHA256 (rubygem/hashie-3.4.4.gem) = 9dd69627730107041421f453eebef585251a50f6ec2720de0bce2443736598e2 +SIZE (rubygem/hashie-3.4.4.gem) = 60928 diff --git a/devel/rubygem-rrd-ffi/Makefile b/devel/rubygem-rrd-ffi/Makefile index 3215ef2e30c..07a247f1d34 100644 --- a/devel/rubygem-rrd-ffi/Makefile +++ b/devel/rubygem-rrd-ffi/Makefile @@ -2,6 +2,7 @@ PORTNAME= rrd-ffi PORTVERSION= 0.2.14 +PORTREVISION= 1 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-unicode-display_width/Makefile b/devel/rubygem-unicode-display_width/Makefile index 9e24fd32349..a5baad77766 100644 --- a/devel/rubygem-unicode-display_width/Makefile +++ b/devel/rubygem-unicode-display_width/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= unicode-display_width -PORTVERSION= 1.0.3 +PORTVERSION= 1.0.4 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-unicode-display_width/distinfo b/devel/rubygem-unicode-display_width/distinfo index 99f113b44ce..aa3b3e7e532 100644 --- a/devel/rubygem-unicode-display_width/distinfo +++ b/devel/rubygem-unicode-display_width/distinfo @@ -1,2 +1,2 @@ -SHA256 (rubygem/unicode-display_width-1.0.3.gem) = 457e24efe457a5cd6e861ca1d67ff586d0fe8802ba273d39ae21e7593590e01d -SIZE (rubygem/unicode-display_width-1.0.3.gem) = 196096 +SHA256 (rubygem/unicode-display_width-1.0.4.gem) = 6655b42ff0f7d041bb2b8cccbaa2294af81ea1514153e25e277a77f9abe9a986 +SIZE (rubygem/unicode-display_width-1.0.4.gem) = 9728 diff --git a/devel/sope/distinfo b/devel/sope/distinfo deleted file mode 100644 index 3d365c199fd..00000000000 --- a/devel/sope/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (SOPE-2.3.8.tar.gz) = 6fded26f80748bd9628d3c0e54ed44e7689b4df13a596c33a192a008502cd0c3 -SIZE (SOPE-2.3.8.tar.gz) = 2275132 diff --git a/devel/sope/Makefile b/devel/sope2/Makefile similarity index 97% rename from devel/sope/Makefile rename to devel/sope2/Makefile index d1d271ae013..1a44c88ee3d 100644 --- a/devel/sope/Makefile +++ b/devel/sope2/Makefile @@ -1,8 +1,8 @@ # Created by: Euan Thoms # $FreeBSD$ -PORTNAME= sope -PORTVERSION= 2.3.8 +PORTNAME= sope2 +PORTVERSION= 2.3.10 CATEGORIES= devel gnustep MASTER_SITES= http://www.sogo.nu/files/downloads/SOGo/Sources/ DISTNAME= SOPE-${PORTVERSION} diff --git a/devel/sope2/distinfo b/devel/sope2/distinfo new file mode 100644 index 00000000000..f021146284c --- /dev/null +++ b/devel/sope2/distinfo @@ -0,0 +1,2 @@ +SHA256 (SOPE-2.3.10.tar.gz) = b51e5c212f938b6b39000d5149b7da6922f978df291c61e1015d8abcbfcdc245 +SIZE (SOPE-2.3.10.tar.gz) = 2276085 diff --git a/devel/sope/files/patch-configure b/devel/sope2/files/patch-configure similarity index 84% rename from devel/sope/files/patch-configure rename to devel/sope2/files/patch-configure index b041cf7a74e..15d81a8bee7 100644 --- a/devel/sope/files/patch-configure +++ b/devel/sope2/files/patch-configure @@ -11,7 +11,7 @@ # TODO: add pg_config, mysql_config etc! -LINK_SYSLIBDIRS="-L/usr/local/pgsql/lib -L/usr/local/lib -L/usr/lib" -+LINK_SYSLIBDIRS="-L/usr/local/lib/postgresql -L/usr/local/lib/mysql -L/usr/local/lib -L/usr/lib" ++LINK_SYSLIBDIRS="-L${LOCALBASE}/lib/postgresql -L${LOCALBASE}/lib/mysql -L${LOCALBASE}/lib -L/usr/lib" # ******************** usage ******************** diff --git a/devel/sope/pkg-descr b/devel/sope2/pkg-descr similarity index 100% rename from devel/sope/pkg-descr rename to devel/sope2/pkg-descr diff --git a/devel/sope/pkg-plist b/devel/sope2/pkg-plist similarity index 100% rename from devel/sope/pkg-plist rename to devel/sope2/pkg-plist diff --git a/dns/bind9-devel/Makefile b/dns/bind9-devel/Makefile index f459df44ad0..b3439d507c9 100644 --- a/dns/bind9-devel/Makefile +++ b/dns/bind9-devel/Makefile @@ -19,8 +19,8 @@ COMMENT= BIND DNS suite with updated DNSSEC and DNS64 LICENSE= ISCL # ISC releases things like 9.8.0-P1, which our versioning doesn't like -ISCVERSION= 9.11.0.a20160428 -HASH= a27dc50 +ISCVERSION= 9.11.0.a20160430 +HASH= 9e6e088 MAKE_JOBS_UNSAFE= yes @@ -264,4 +264,8 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/bin/rndc/rndc.conf \ ${STAGEDIR}${ETCDIR}/rndc.conf.sample +# Can't use USE_PYTHON=autoplist +post-install-PYTHON-on: + @${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -type f | ${SED} -e 's|${STAGEDIR}||' >> ${TMPPLIST} + .include diff --git a/dns/bind9-devel/distinfo b/dns/bind9-devel/distinfo index 0363dcd801d..922cedbb87b 100644 --- a/dns/bind9-devel/distinfo +++ b/dns/bind9-devel/distinfo @@ -1,2 +1,2 @@ -SHA256 (bind9-a27dc50.tar.gz) = f5c2ee82b3a3c6de086df3cfc4c1a2ca2729e60c2563d65247dc36a82f783c01 -SIZE (bind9-a27dc50.tar.gz) = 11721171 +SHA256 (bind9-9e6e088.tar.gz) = 39dfc17633e01bc7d28c6f3975c464c5702192267991c27ca8f8be8f92a78a46 +SIZE (bind9-9e6e088.tar.gz) = 11725304 diff --git a/dns/bind9-devel/files/patch-bin_python_Makefile.in b/dns/bind9-devel/files/patch-bin_python_Makefile.in deleted file mode 100644 index a1fd9e8ad46..00000000000 --- a/dns/bind9-devel/files/patch-bin_python_Makefile.in +++ /dev/null @@ -1,10 +0,0 @@ ---- bin/python/Makefile.in.orig 2016-04-29 05:30:53 UTC -+++ bin/python/Makefile.in -@@ -58,7 +58,6 @@ install:: ${TARGETS} installdirs - ${INSTALL_SCRIPT} dnssec-keymgr ${DESTDIR}${sbindir} - ${INSTALL_DATA} ${srcdir}/dnssec-checkds.8 ${DESTDIR}${mandir}/man8 - ${INSTALL_DATA} ${srcdir}/dnssec-coverage.8 ${DESTDIR}${mandir}/man8 -- ${INSTALL_DATA} ${srcdir}/dnssec-keymgr.8 ${DESTDIR}${mandir}/man8 - - clean distclean:: - rm -f ${TARGETS} diff --git a/dns/bind9-devel/files/patch-bin_python_isc_Makefile.in b/dns/bind9-devel/files/patch-bin_python_isc_Makefile.in deleted file mode 100644 index 5e204c2b970..00000000000 --- a/dns/bind9-devel/files/patch-bin_python_isc_Makefile.in +++ /dev/null @@ -1,20 +0,0 @@ ---- bin/python/isc/Makefile.in.orig 2016-04-29 05:30:53 UTC -+++ bin/python/isc/Makefile.in -@@ -30,7 +30,9 @@ TARGETS = parsetab.py parsetab.pyc \ - - @BIND9_MAKE_RULES@ - --%.pyc: %.py -+.SUFFIXES: .py .pyc -+ -+.py.pyc: - $(PYTHON) -m compileall . - - parsetab.py parsetab.pyc: policy.py -@@ -64,4 +66,4 @@ clean distclean:: - rm -f *.pyc parser.out parsetab.py - - distclean:: -- rm -Rf utils.py -\ No newline at end of file -+ rm -Rf utils.py diff --git a/dns/bind9-devel/pkg-plist b/dns/bind9-devel/pkg-plist index b33cfdd53b8..04e5414813a 100644 --- a/dns/bind9-devel/pkg-plist +++ b/dns/bind9-devel/pkg-plist @@ -257,18 +257,6 @@ include/pkcs11/cryptoki.h include/pkcs11/pkcs11.h include/pkcs11/pkcs11f.h include/pkcs11/pkcs11t.h -%%PYTHON%%lib/__init__.py -%%PYTHON%%lib/__init__.pyc -%%PYTHON%%lib/dnskey.py -%%PYTHON%%lib/dnskey.pyc -%%PYTHON%%lib/eventlist.py -%%PYTHON%%lib/eventlist.pyc -%%PYTHON%%lib/keydict.py -%%PYTHON%%lib/keydict.pyc -%%PYTHON%%lib/keyevent.py -%%PYTHON%%lib/keyevent.pyc -%%PYTHON%%lib/keyzone.py -%%PYTHON%%lib/keyzone.pyc lib/libbind9.a lib/libdns.a lib/libirs.a @@ -276,10 +264,6 @@ lib/libisc.a lib/libisccc.a lib/libisccfg.a lib/liblwres.a -%%PYTHON%%lib/parsetab.py -%%PYTHON%%lib/parsetab.pyc -%%PYTHON%%lib/policy.py -%%PYTHON%%lib/policy.pyc man/man1/arpaname.1.gz man/man1/bind9-config.1.gz man/man1/delv.1.gz @@ -385,6 +369,7 @@ man/man8/dnssec-dsfromkey.8.gz man/man8/dnssec-importkey.8.gz man/man8/dnssec-keyfromlabel.8.gz man/man8/dnssec-keygen.8.gz +%%PYTHON%%man/man8/dnssec-keymgr.8.gz man/man8/dnssec-revoke.8.gz man/man8/dnssec-settime.8.gz man/man8/dnssec-signzone.8.gz diff --git a/dns/bindgraph/Makefile b/dns/bindgraph/Makefile index 6e2323e0aa1..fc0b2ad177f 100644 --- a/dns/bindgraph/Makefile +++ b/dns/bindgraph/Makefile @@ -3,6 +3,7 @@ PORTNAME= bindgraph PORTVERSION= 0.3 +PORTREVISION= 1 CATEGORIES= dns MASTER_SITES= http://www.linux.it/~md/software/ diff --git a/editors/emacs-devel/Makefile b/editors/emacs-devel/Makefile index e5ca75b3ba7..634a2b5715c 100644 --- a/editors/emacs-devel/Makefile +++ b/editors/emacs-devel/Makefile @@ -3,7 +3,6 @@ PORTNAME= emacs PORTVERSION= ${EMACS_VER} -PORTREVISION= 1 PORTEPOCH= 2 CATEGORIES= editors ipv6 MASTER_SITES= GNU_ALPHA/emacs/pretest @@ -15,15 +14,12 @@ COMMENT= GNU editing macros LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING -BROKEN_sparc64= fails to compile at bootstrap phase -BROKEN_ia64= Emacs 24.X does not currently build on ia64 +BROKEN_sparc64= Emacs does not currently build on sparc64 +BROKEN_ia64= Emacs does not currently build on ia64 -CONFLICTS= emacs-19.* emacs21-[0-9]* emacs22-[0-9]* \ - emacs23-[0-9]* emacs24-[0-9]* xemacs-[0-9]* \ - xemacs-devel-[0-9]* xemacs-mule-[0-9]* \ - xemacs-devel-mule-[0-9]* emacs-nox11-[0-9]* +CONFLICTS= emacs24-[0-9]* emacs-nox11-[0-9]* -EMACS_VER= 25.0.92 +EMACS_VER= 25.0.93 GNU_CONFIGURE= yes USES= cpe gmake makeinfo ncurses pkgconfig tar:xz INFO_PATH= ${DATADIR_REL}/info @@ -32,147 +28,178 @@ CPE_VENDOR= gnu SUB_LIST+= ARCHLIBDIR=${PREFIX}/libexec/emacs/${EMACS_VER}/\ ${CONFIGURE_TARGET} -CONFIGURE_ARGS= --localstatedir=/var --with-gameuser=games:games +CONFIGURE_ARGS= --localstatedir=/var \ + --with-gameuser=games:games PLIST_SUB= EMACS_VER=${EMACS_VER} GNU_HOST=${CONFIGURE_TARGET} MAKE_ENV= LC_ALL=C -INFO= ada-mode auth autotype bovine calc ccmode cl dbus \ - dired-x ebrowse ede ediff edt efaq eieio eintr elisp \ - emacs emacs-gnutls emacs-mime epa erc ert eshell eudc \ - eww flymake forms gnus htmlfontify idlwave ido info \ - mairix-el message mh-e newsticker nxml-mode \ - octave-mode org pcl-cvs pgg rcirc reftex remember \ - sasl sc semantic ses sieve smtpmail speedbar srecode \ - todo-mode tramp url vhdl-mode vip viper widget wisent \ - woman +INFO= ada-mode auth autotype bovine calc ccmode cl dbus dired-x ebrowse ede \ + ediff edt efaq eieio eintr elisp emacs emacs-gnutls emacs-mime epa erc \ + ert eshell eudc eww flymake forms gnus htmlfontify idlwave ido info \ + mairix-el message mh-e newsticker nxml-mode octave-mode org pcl-cvs pgg \ + rcirc reftex remember sasl sc semantic ses sieve smtpmail speedbar \ + srecode todo-mode tramp url vhdl-mode vip viper widget wisent woman -OPTIONS_DEFINE= X11 ACL DBUS GCONF GIF JPEG M17N OTF PNG SOUND \ - SOURCES SVG TIFF SCROLLBARS XFT XIM XML XPM MAGICK \ - GNUTLS GSETTINGS LTO FILENOTIFY LLDB CAIRO MODULES XWIDGETS +OPTIONS_DEFINE= ACL DBUS GNUTLS LLDB LTO MODULES SOURCES X11 XML -OPTIONS_SINGLE= X11 SOUND +OPTIONS_RADIO= FILENOTIFY SOUND X11TOOLKIT +OPTIONS_RADIO_FILENOTIFY= GFILE KQUEUE +OPTIONS_RADIO_SOUND= ALSA OSS +OPTIONS_RADIO_X11TOOLKIT= GTK2 GTK3 MOTIF XAW XAW3D -ACL_DESC= ACL support -GSETTINGS_DESC= GSettings support -SCROLLBARS_DESC=Toolkit scroll-bars -SOUND_DESC= Sound support -SOURCES_DESC= Install sources -XAW_DESC= Athena widgets -XAW3D_DESC= Athena3D widgets -XIM_DESC= X Input Method Support -M17N_DESC= M17N support for text-shaping -OTF_DESC= Opentype fonts suport +OPTIONS_GROUP= GRAPHICS NEEDX11 +OPTIONS_GROUP_GRAPHICS= CAIRO GIF JPEG MAGICK PNG SVG TIFF XPM +OPTIONS_GROUP_NEEDX11= GCONF GSETTINGS M17N OTF SCROLLBARS XFT XIM \ + XWIDGETS + +ACL_DESC= Access control list support +CAIRO_DESC= Cairo library support (experimental) FILENOTIFY_DESC=File notification support +GCONF_DESC= GConf configuration support +GFILE_DESC= File notification via gfile +GRAPHICS_DESC= Graphics support (each implies X11) +GSETTINGS_DESC= GSettings support (implies DBUS) +KQUEUE_DESC= File notification via kqueue +LLDB_DESC= Enable LLDB support for GUD LTO_DESC= Enable link-time optimization (requires GCC 4.6+) -LLDB_DESC= Enable lldb support for GUD (from llvm.org) +MAGICK_DESC= ImageMagick support +M17N_DESC= M17N support for text-shaping MODULES_DESC= Dynamic modules support -XWIDGETS_DESC= Enable use of some GTK widgets in Emacs buffers +NEEDX11_DESC= Other X11-dependent (each implies X11) +OTF_DESC= Opentype fonts support +SCROLLBARS_DESC=Toolkit scroll-bars +SOURCES_DESC= Install sources +X11_DESC= X11 support (choose toolkit below) +X11TOOLKIT_DESC=X11 toolkit (each implies X11) +XAW3D_DESC= Athena3D widgets +XAW_DESC= Athena widgets +XIM_DESC= X Input Method Support +XWIDGETS_DESC= GTK widgets in Emacs buffers (requires GTK3) -OPTIONS_SINGLE_X11= GTK2 GTK3 XAW XAW3D MOTIF -OPTIONS_SINGLE_SOUND= ALSA OSS +OPTIONS_DEFAULT=ACL DBUS FREEDESKTOP GCONF GIF GNUTLS GSETTINGS GTK2 JPEG \ + KQUEUE M17N MAGICK MODULES OSS OTF PNG SCROLLBARS SOURCES SVG \ + TIFF X11 XFT XIM XML XPM -OPTIONS_DEFAULT=ACL DBUS FILENOTIFY GCONF GIF GNUTLS GSETTINGS GTK2 \ - JPEG M17N MAGICK MODULES OSS OTF PNG SCROLLBARS SOUND \ - SOURCES SVG TIFF X11 XFT XIM XML XPM +OPTIONS_SUB= YES -OPTIONS_SUB= YES +ACL_CONFIGURE_ENABLE= acl -LLDB_EXTRA_PATCHES= ${PATCHDIR}/extrapatch-lldb-gud.el - -SOUND_CONFIGURE_OFF= --with-sound=no ALSA_CONFIGURE_ON= --with-sound=alsa ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib -OSS_CONFIGURE_ON= --with-sound=oss + +CAIRO_USE= GNOME=cairo +CAIRO_CONFIGURE_WITH= cairo +CAIRO_IMPLIES= X11 DBUS_LIB_DEPENDS= libdbus-1.so:devel/dbus DBUS_CONFIGURE_WITH= dbus -GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls -GNUTLS_CONFIGURE_WITH= gnutls +GCONF_USE= gnome=gconf2 +GCONF_CONFIGURE_WITH= gconf +GCONF_IMPLIES= X11 -XML_USE= GNOME=libxml2 -XML_CONFIGURE_WITH= xml2 - -SVG_USE= GNOME=librsvg2 -SVG_CONFIGURE_WITH= rsvg - -X11_CONFIGURE_WITH= x -X11_USE= XORG=x11 -X11_USES= desktop-file-utils - -GTK2_USE= GNOME=gtk20 -GTK2_CONFIGURE_ON= -with-x-toolkit=gtk2 - -GTK3_USE= GNOME=gtk30 -GTK3_CONFIGURE_ON= --with-x-toolkit=gtk3 - -XAW3D_LIB_DEPENDS= libXaw3d.so:x11-toolkits/Xaw3d -XAW3D_CONFIGURE_ON= --with-x-toolkit=athena - -XAW_USE= XORG=xaw -XAW_CONFIGURE_ON+= --with-x-toolkit=athena --without-xaw3d - -MOTIF_USES= motif -MOTIF_CONFIGURE_ON+= --with-x-toolkit=motif - -SCROLLBARS_CONFIGURE_WITH=toolkit-scroll-bars - -SYNC_INPUT_CONFIGURE_WITH=sync-input - -JPEG_USES= jpeg -JPEG_CONFIGURE_WITH= jpeg - -TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff -TIFF_CONFIGURE_WITH= tiff +GFILE_CONFIGURE_ON= --with-file-notification=gfile GIF_LIB_DEPENDS= libgif.so:graphics/giflib GIF_CONFIGURE_WITH= gif +GIF_IMPLIES= X11 -PNG_LIB_DEPENDS+= libpng.so:graphics/png -PNG_CONFIGURE_WITH= png - -XPM_USE= XORG=xpm -XPM_CONFIGURE_WITH= xpm - -XFT_USE= XORG=xft -XFT_LIB_DEPENDS= libfreetype.so:print/freetype2 -XFT_CONFIGURE_WITH= xft - -M17N_LIB_DEPENDS= libm17n.so:devel/m17n-lib -M17N_CONFIGURE_WITH= m17n-flt - -OTF_LIB_DEPENDS= libotf.so:print/libotf -OTF_CONFIGURE_WITH= libotf - -MAGICK_LIB_DEPENDS=libMagickCore-6.so:graphics/ImageMagick -MAGICK_CONFIGURE_WITH= imagemagick +GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls +GNUTLS_CONFIGURE_WITH= gnutls GSETTINGS_USE= gnome=glib20 GSETTINGS_CONFIGURE_WITH=gsettings +GSETTINGS_IMPLIES= DBUS X11 -GCONF_USE= gnome=gconf2 -GCONF_CONFIGURE_WITH= gconf +GTK2_USE= GNOME=gtk20 +GTK2_CONFIGURE_ON= --with-x-toolkit=gtk2 +GTK2_IMPLIES= X11 -XIM_CONFIGURE_WITH= xim +GTK3_USE= GNOME=gtk30 +GTK3_CONFIGURE_ON= --with-x-toolkit=gtk3 +GTK3_IMPLIES= X11 + +JPEG_USES= jpeg +JPEG_CONFIGURE_WITH= jpeg +JPEG_IMPLIES= X11 + +KQUEUE_CONFIGURE_ON= --with-file-notification=kqueue + +LLDB_EXTRA_PATCHES= ${PATCHDIR}/extrapatch-lldb-gud.el LTO_CONFIGURE_ON= --enable-link-time-optimization LTO_USE= GCC=4.6+ -ACL_CONFIGURE_OFF= --disable-acl +M17N_LIB_DEPENDS= libm17n.so:devel/m17n-lib +M17N_CONFIGURE_WITH= m17n-flt +M17N_IMPLIES= XFT X11 -FILENOTIFY_CONFIGURE_ON=--with-file-notification=gfile -FILENOTIFY_CONFIGURE_OFF=--without-file-notification -FILENOTIFY_USE= GNOME=glib20 +MAGICK_LIB_DEPENDS= libMagickCore-6.so:graphics/ImageMagick +MAGICK_CONFIGURE_WITH= imagemagick +MAGICK_IMPLIES= X11 -CAIRO_USE= GNOME=cairo -CAIRO_CONFIGURE_ON= --with-cairo +MODULES_CONFIGURE_WITH= modules -MODULES_CONFIGURE_ON= --with-modules +MOTIF_USES= motif +MOTIF_CONFIGURE_ON= --with-x-toolkit=motif +MOTIF_IMPLIES= X11 -XWIDGETS_CONFIGURE_ON= --with-xwidgets +OSS_CONFIGURE_ON= --with-sound=oss + +OTF_LIB_DEPENDS= libotf.so:print/libotf +OTF_CONFIGURE_WITH= libotf +OTF_IMPLIES= XFT + +PNG_LIB_DEPENDS= libpng.so:graphics/png +PNG_CONFIGURE_WITH= png +PNG_IMPLIES= X11 + +SCROLLBARS_CONFIGURE_WITH=toolkit-scroll-bars +SCROLLBARS_IMPLIES= X11 + +SVG_USE= GNOME=librsvg2 +SVG_CONFIGURE_WITH= rsvg +SVG_IMPLIES= X11 + +TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff +TIFF_CONFIGURE_WITH= tiff +TIFF_IMPLIES= X11 + +X11_CONFIGURE_OFF= --without-x --with-x-toolkit=no +X11_CONFIGURE_ON= --with-x +X11_USE= XORG=x11 +X11_USES= desktop-file-utils +X11_VARS= installs_icons=yes +X11_VARS_OFF= without_x11=yes + +XAW_USE= XORG=xaw +XAW_CONFIGURE_ON= --with-x-toolkit=athena --without-xaw3d +XAW_IMPLIES= X11 + +XAW3D_LIB_DEPENDS= libXaw3d.so:x11-toolkits/Xaw3d +XAW3D_CONFIGURE_ON= --with-x-toolkit=athena +XAW3D_IMPLIES= X11 + +XFT_USE= XORG=xft +XFT_LIB_DEPENDS= libfreetype.so:print/freetype2 +XFT_CONFIGURE_WITH= xft +XFT_IMPLIES= X11 + +XIM_CONFIGURE_WITH= xim +XIM_IMPLIES= X11 + +XML_USE= GNOME=libxml2 +XML_CONFIGURE_WITH= xml2 + +XPM_USE= XORG=xpm +XPM_CONFIGURE_WITH= xpm +XPM_IMPLIES= X11 + +XWIDGETS_CONFIGURE_WITH=xwidgets XWIDGETS_LIB_DEPENDS= libwebkitgtk-3.0.so:www/webkit-gtk3 +XWIDGETS_IMPLIES= X11 .include @@ -181,39 +208,16 @@ XWIDGETS_LIB_DEPENDS= libwebkitgtk-3.0.so:www/webkit-gtk3 # http://llvm.org/bugs/show_bug.cgi?id=18171 fixed in r263312 # (11-CURRENT), and fixed in r263765 (10-STABLE) .if ${ARCH} == "i386" -.if (${OSVERSION} < 1000706) || (${OSVERSION} >= 1100000 && \ +.if (${OSVERSION} < 1000706) || (${OSVERSION} >= 1100000 && \ ${OSVERSION} < 1100015) -USE_GCC= any +USE_GCC=any .endif .endif .if ${PORT_OPTIONS:MX11} -INSTALLS_ICONS= yes -.if !${PORT_OPTIONS:MXFT} -.if ${PORT_OPTIONS:MM17N} -IGNORE= m17n requires Xft. Please run 'make config' -.elif ${PORT_OPTIONS:MOTF} -IGNORE= support for Opentype fonts require Xft. Please run 'make config' -.endif -.endif -.else -.for OPT in GCONF GIF GSETTINGS GTK2 GTK3 JPEG M17N MAGICK MOTIF \ - PNG SCROLLBARS SVG TIFF XAW XAW3D XFT XIM XPM -.if ${PORT_OPTIONS:M${OPT}} -IGNORE= option ${OPT} requires X11 option -.endif -.endfor -.endif - -.if !${PORT_OPTIONS:MDBUS} -.if ${PORT_OPTIONS:MGSETTINGS} -IGNORE= support for GSettings requires DBUS. Please run 'make config' -.endif -.endif - -.if !${PORT_OPTIONS:MGTK3} -.if ${PORT_OPTIONS:MXWIDGETS} -IGNORE= support for XWidgets requires GTK3. Please run 'make config' +.if ! ${PORT_OPTIONS:MGTK2} && ! ${PORT_OPTIONS:MGTK3} && \ +! ${PORT_OPTIONS:MMOTIF} && ! ${PORT_OPTIONS:MXAW} && ! ${PORT_OPTIONS:MXAW3D} +IGNORE=option X11 requires an X11 toolkit .endif .endif @@ -221,34 +225,30 @@ IGNORE= support for XWidgets requires GTK3. Please run 'make config' # Building with GCC 4.6+ requires it .if ${ncurses_ARGS} == "port" -LDFLAGS+= -ltinfo +LDFLAGS+=-ltinfo .endif post-patch: @${RM} -f ${WRKSRC}/info/* - @${REINPLACE_CMD} -e "s/%%EMACS_VER%%/${EMACS_VER}/g" -e \ + @${REINPLACE_CMD} -e "s/%%EMACS_VER%%/${EMACS_VER}/g" -e \ "s/%%DATADIR%%/${DATADIR:C/\//\\\//g}/g" ${WRKSRC}/sources.el -.if empty(PORT_OPTIONS:MX11) - @${REINPLACE_CMD} -e 's/^Terminal=.*$$/Terminal=true/' \ +## stage-qa will give a warning, but don't pull in desktop-file-utils +## portlint -AC will give a warning about INSTALL_ICONS, but don't pull in those +## dependencies +.if ! ${PORT_OPTIONS:MX11} + @${REINPLACE_CMD} -e 's/^Terminal=.*$$/Terminal=true/' \ ${WRKSRC}/etc/emacs.desktop .endif post-install: .if ${PORT_OPTIONS:MSOURCES} @${MKDIR} ${STAGEDIR}${DATADIR}/${EMACS_VER}/src - ${INSTALL_DATA} ${WRKSRC}/src/*.[ch] \ + ${INSTALL_DATA} ${WRKSRC}/src/*.[ch] \ ${STAGEDIR}${DATADIR}/${EMACS_VER}/src - ${INSTALL_DATA} ${WRKSRC}/sources.el \ + ${INSTALL_DATA} ${WRKSRC}/sources.el \ ${STAGEDIR}${DATADIR}/${EMACS_VER}/site-lisp/site-start.el .endif - @${FIND} ${STAGEDIR}${PREFIX}/${INFO_PATH} -type f -name \ + @${FIND} ${STAGEDIR}${PREFIX}/${INFO_PATH} -type f -name \ '*.gz' -exec ${GUNZIP_CMD} '{}' \; -.if !defined(WITHOUT_X11) -pre-everything:: - @${ECHO_MSG} - @${ECHO_MSG} "====> Define WITHOUT_X11 to disable X11 support." - @${ECHO_MSG} -.endif - .include diff --git a/editors/emacs-devel/distinfo b/editors/emacs-devel/distinfo index a3293fb1510..3c6155f053c 100644 --- a/editors/emacs-devel/distinfo +++ b/editors/emacs-devel/distinfo @@ -1,2 +1,2 @@ -SHA256 (emacs-25.0.92.tar.xz) = c29733959ae2c6a7c1d5f9465b4d06c93977cc1f3905313d992051a16590568e -SIZE (emacs-25.0.92.tar.xz) = 42264752 +SHA256 (emacs-25.0.93.tar.xz) = b39199a491ce53f8b8a5b74fe6f1f191257e424f3ba047b3098ff9218e1579f1 +SIZE (emacs-25.0.93.tar.xz) = 42515636 diff --git a/editors/emacs-devel/pkg-plist b/editors/emacs-devel/pkg-plist index 7863c5a0014..babd6b33599 100644 --- a/editors/emacs-devel/pkg-plist +++ b/editors/emacs-devel/pkg-plist @@ -1548,7 +1548,6 @@ share/applications/emacs.desktop %%DATADIR%%/%%EMACS_VER%%/lisp/dframe.elc %%DATADIR%%/%%EMACS_VER%%/lisp/dired-aux.el.gz %%DATADIR%%/%%EMACS_VER%%/lisp/dired-aux.elc -%%DATADIR%%/%%EMACS_VER%%/lisp/dired-loaddefs.el %%DATADIR%%/%%EMACS_VER%%/lisp/dired-x.el.gz %%DATADIR%%/%%EMACS_VER%%/lisp/dired-x.elc %%DATADIR%%/%%EMACS_VER%%/lisp/dired.el.gz @@ -1658,7 +1657,6 @@ share/applications/emacs.desktop %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/eieio-custom.elc %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/eieio-datadebug.el.gz %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/eieio-datadebug.elc -%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/eieio-loaddefs.el %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/eieio-opt.el.gz %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/eieio-opt.elc %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/eieio-speedbar.el.gz @@ -2278,14 +2276,12 @@ share/applications/emacs.desktop %%DATADIR%%/%%EMACS_VER%%/lisp/hl-line.elc %%DATADIR%%/%%EMACS_VER%%/lisp/htmlfontify.el.gz %%DATADIR%%/%%EMACS_VER%%/lisp/htmlfontify.elc -%%DATADIR%%/%%EMACS_VER%%/lisp/htmlfontify-loaddefs.el %%DATADIR%%/%%EMACS_VER%%/lisp/ibuf-ext.el.gz %%DATADIR%%/%%EMACS_VER%%/lisp/ibuf-ext.elc %%DATADIR%%/%%EMACS_VER%%/lisp/ibuf-macs.el.gz %%DATADIR%%/%%EMACS_VER%%/lisp/ibuf-macs.elc %%DATADIR%%/%%EMACS_VER%%/lisp/ibuffer.el.gz %%DATADIR%%/%%EMACS_VER%%/lisp/ibuffer.elc -%%DATADIR%%/%%EMACS_VER%%/lisp/ibuffer-loaddefs.el %%DATADIR%%/%%EMACS_VER%%/lisp/icomplete.el.gz %%DATADIR%%/%%EMACS_VER%%/lisp/icomplete.elc %%DATADIR%%/%%EMACS_VER%%/lisp/ido.el.gz @@ -2294,6 +2290,7 @@ share/applications/emacs.desktop %%DATADIR%%/%%EMACS_VER%%/lisp/ielm.elc %%DATADIR%%/%%EMACS_VER%%/lisp/iimage.el.gz %%DATADIR%%/%%EMACS_VER%%/lisp/iimage.elc +@dir %%DATADIR%%/%%EMACS_VER%%/lisp/image %%DATADIR%%/%%EMACS_VER%%/lisp/image-dired.el.gz %%DATADIR%%/%%EMACS_VER%%/lisp/image-dired.elc %%DATADIR%%/%%EMACS_VER%%/lisp/image-file.el.gz @@ -2652,7 +2649,6 @@ share/applications/emacs.desktop %%DATADIR%%/%%EMACS_VER%%/lisp/mail/rfc2368.elc %%DATADIR%%/%%EMACS_VER%%/lisp/mail/rfc822.el.gz %%DATADIR%%/%%EMACS_VER%%/lisp/mail/rfc822.elc -%%DATADIR%%/%%EMACS_VER%%/lisp/mail/rmail-loaddefs.el %%DATADIR%%/%%EMACS_VER%%/lisp/mail/rmail-spam-filter.el.gz %%DATADIR%%/%%EMACS_VER%%/lisp/mail/rmail-spam-filter.elc %%DATADIR%%/%%EMACS_VER%%/lisp/mail/rmail.el.gz @@ -3064,8 +3060,6 @@ share/applications/emacs.desktop %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/tpu-mapper.elc %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/vc-arch.el.gz %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/vc-arch.elc -%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/vc-mcvs.el.gz -%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/vc-mcvs.elc %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/vi.el.gz %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/vi.elc %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/vip.el.gz @@ -3543,7 +3537,6 @@ share/applications/emacs.desktop %%DATADIR%%/%%EMACS_VER%%/lisp/ps-mule.elc %%DATADIR%%/%%EMACS_VER%%/lisp/ps-print.el.gz %%DATADIR%%/%%EMACS_VER%%/lisp/ps-print.elc -%%DATADIR%%/%%EMACS_VER%%/lisp/ps-print-loaddefs.el %%DATADIR%%/%%EMACS_VER%%/lisp/ps-samp.el.gz %%DATADIR%%/%%EMACS_VER%%/lisp/ps-samp.elc %%DATADIR%%/%%EMACS_VER%%/lisp/recentf.el.gz @@ -3716,7 +3709,6 @@ share/applications/emacs.desktop %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/reftex-global.elc %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/reftex-index.el.gz %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/reftex-index.elc -%%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/reftex-loaddefs.el %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/reftex-parse.el.gz %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/reftex-parse.elc %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/reftex-ref.el.gz diff --git a/french/verbiste/Makefile b/french/verbiste/Makefile index f4da8f0b3ab..0b724bf8180 100644 --- a/french/verbiste/Makefile +++ b/french/verbiste/Makefile @@ -2,9 +2,9 @@ # $FreeBSD$ PORTNAME= verbiste -PORTVERSION= 0.1.42 +PORTVERSION= 0.1.43 CATEGORIES= french textproc -MASTER_SITES= http://perso.b2b2c.ca/sarrazip/dev/ +MASTER_SITES= http://sarrazip.com/dev/ MAINTAINER= dereckson@gmail.com COMMENT= French verb conjugator/deconjugator diff --git a/french/verbiste/distinfo b/french/verbiste/distinfo index b33f64dd050..71457856395 100644 --- a/french/verbiste/distinfo +++ b/french/verbiste/distinfo @@ -1,2 +1,2 @@ -SHA256 (verbiste-0.1.42.tar.gz) = e40eee50725f5d9ad795610226c2dbacafc065ac382b7a1113d6c7dfd1e25897 -SIZE (verbiste-0.1.42.tar.gz) = 754691 +SHA256 (verbiste-0.1.43.tar.gz) = 7745c8d998bba5eaf542aa5d589d187bfdf2edda403cc1edb17ca3d3c33e7251 +SIZE (verbiste-0.1.43.tar.gz) = 778773 diff --git a/french/verbiste/pkg-plist b/french/verbiste/pkg-plist index 59fc7ed9a49..f455a06b97b 100644 --- a/french/verbiste/pkg-plist +++ b/french/verbiste/pkg-plist @@ -44,10 +44,8 @@ man/man3/verbiste.3.gz %%PORTEXAMPLES%%%%EXAMPLESDIR%%/test-french-deconjugator.pl %%PORTEXAMPLES%%%%EXAMPLESDIR%%/trans-tenses.pl %%DATADIR%%-0.1/COPYING -%%DATADIR%%-0.1/conjugation-el.xml %%DATADIR%%-0.1/conjugation-fr.xml %%DATADIR%%-0.1/conjugation-it.xml -%%DATADIR%%-0.1/verbs-el.xml %%DATADIR%%-0.1/verbs-fr.xml %%DATADIR%%-0.1/verbs-it.xml %%HASGTK%%share/texmf/tex/latex/verbiste/verbiste.cls diff --git a/games/phalanx/Makefile b/games/phalanx/Makefile index 16a935453a3..fab027b9502 100644 --- a/games/phalanx/Makefile +++ b/games/phalanx/Makefile @@ -2,10 +2,10 @@ # $FreeBSD$ PORTNAME= phalanx -PORTVERSION= 24 +PORTVERSION= 25 CATEGORIES= games -MASTER_SITES= SF/${PORTNAME}/Version%20XXIV -DISTNAME= ${PORTNAME}-XXIV-source +MASTER_SITES= SF/${PORTNAME}/Version%20XXV +DISTNAME= ${PORTNAME}-XXV-source MAINTAINER= johans@FreeBSD.org COMMENT= Xboard-compatible chess playing program diff --git a/games/phalanx/distinfo b/games/phalanx/distinfo index 5f0be4c672d..3a57698ac1d 100644 --- a/games/phalanx/distinfo +++ b/games/phalanx/distinfo @@ -1,2 +1,2 @@ -SHA256 (phalanx-XXIV-source.tgz) = 7e7ab6c6f497b7b039552ba98fee1032cd0e3976c05d983d28c3c7fdbeb7fc4f -SIZE (phalanx-XXIV-source.tgz) = 352486 +SHA256 (phalanx-XXV-source.tgz) = b3874d5dcd22c64626b2c955b18b27bcba3aa727855361a91eab57a6324b22dd +SIZE (phalanx-XXV-source.tgz) = 360147 diff --git a/german/mythes/Makefile b/german/mythes/Makefile index 6a91e420a78..66a5f62dd5f 100644 --- a/german/mythes/Makefile +++ b/german/mythes/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= mythes -PORTVERSION= 2016.04.24 +PORTVERSION= 2016.05.01 CATEGORIES= german textproc MASTER_SITES= LOCAL/sunpoet/${PORTNAME}/ DISTNAME= Deutscher-Thesaurus-${PORTVERSION:C/\.//g} diff --git a/german/mythes/distinfo b/german/mythes/distinfo index dd7017d2ba0..30eb8da96e3 100644 --- a/german/mythes/distinfo +++ b/german/mythes/distinfo @@ -1,2 +1,2 @@ -SHA256 (mythes/Deutscher-Thesaurus-20160424.oxt) = abe4df607cb618b3cc6b0df87714d8f07a4f3e0f920e08568a304c2e80370db9 -SIZE (mythes/Deutscher-Thesaurus-20160424.oxt) = 7598946 +SHA256 (mythes/Deutscher-Thesaurus-20160501.oxt) = dc35daab81ecfd91bfc5b7641d0fd3e5cdad34fb834ecaa4d3c6ce7a38a587f9 +SIZE (mythes/Deutscher-Thesaurus-20160501.oxt) = 7611207 diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile index 2e7fe481ab6..8e9776bafae 100644 --- a/graphics/netpbm/Makefile +++ b/graphics/netpbm/Makefile @@ -8,7 +8,7 @@ CATEGORIES= graphics MASTER_SITES= SF/netpbm/super_stable/${PORTVERSION} \ LOCAL/dinoex/:man -MAINTAINER= dinoex@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Toolkit for conversion of images between different formats LIB_DEPENDS= libtiff.so:graphics/tiff \ diff --git a/java/rubygem-rjb/Makefile b/java/rubygem-rjb/Makefile index 6518aec31c6..8d495642e72 100644 --- a/java/rubygem-rjb/Makefile +++ b/java/rubygem-rjb/Makefile @@ -6,12 +6,16 @@ PORTVERSION= 1.5.3 CATEGORIES= java ruby MASTER_SITES= RG -MAINTAINER= arved@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Call Java Code from Ruby LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING +IGNORE= fails to create JVM +DEPRECATED= fails to create JVM +EXPIRATION_DATE=2016-06-02 + USE_RUBY= yes USES= gem USE_JAVA= yes diff --git a/lang/afnix/Makefile b/lang/afnix/Makefile index 059a97d6000..88e0745ab25 100644 --- a/lang/afnix/Makefile +++ b/lang/afnix/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= afnix -PORTVERSION= 2.6.0 +PORTVERSION= 2.6.2 CATEGORIES= lang MASTER_SITES= http://www.afnix.org/ftp/ \ ftp://ftp.stack.nl/pub/users/johans/afnix/ diff --git a/lang/afnix/distinfo b/lang/afnix/distinfo index 17b2b670208..6a7cb04d815 100644 --- a/lang/afnix/distinfo +++ b/lang/afnix/distinfo @@ -1,2 +1,2 @@ -SHA256 (afnix-src-2.6.0.tgz) = efad4643129e876f2d3353ca8d02e37acb581b63586a344a403a9887240c7b00 -SIZE (afnix-src-2.6.0.tgz) = 2255075 +SHA256 (afnix-src-2.6.2.tgz) = dbc48689a113d349a6a1c348fb3ff97710c072f2698d522677dfab0d9805f5b8 +SIZE (afnix-src-2.6.2.tgz) = 2257295 diff --git a/lang/perl5-devel/Makefile b/lang/perl5-devel/Makefile index 3dad386fd57..f0d5c848c8a 100644 --- a/lang/perl5-devel/Makefile +++ b/lang/perl5-devel/Makefile @@ -30,7 +30,7 @@ TEST_ENV= ${MAKE_ENV} TEST_JOBS=${MAKE_JOBS_NUMBER} \ USE_GITHUB= yes GH_ACCOUNT= Perl GH_PROJECT= perl5 -GH_TAGNAME= v5.24.0-RC3 +GH_TAGNAME= v5.24.0-RC4 OPTIONS_DEFINE= DEBUG GDBM PERL_64BITINT PTHREAD \ MULTIPLICITY SITECUSTOMIZE @@ -86,10 +86,12 @@ _ARCH_LIB= ${_PRIV_LIB}/${PERL_ARCH} # XXX releases are .tar.xz, add: tar:xz USES= cpe +LIBPERL_VER= ${PORTVERSION:C/[^0-9.]//} + HAS_CONFIGURE= yes CONFIGURE_SCRIPT=Configure CONFIGURE_ARGS= -sde -Dprefix=${PREFIX} \ - -Dlibperl=libperl.so.${PORTVERSION} \ + -Dlibperl=libperl.so.${LIBPERL_VER} \ -Darchlib=${PREFIX}/${_ARCH_LIB} \ -Dprivlib=${PREFIX}/${_PRIV_LIB} \ -Dman3dir=${PREFIX}/${PERLMANPREFIX_REL}/man/man3 \ @@ -164,7 +166,7 @@ PLIST_SUB+= PERL_VERSION=${PERL_VERSION} \ PRIV_LIB=${_PRIV_LIB} \ PKGNAMESUFFIX=${PKGNAMESUFFIX} \ ARCH_LIB=${_ARCH_LIB} -PLIST_SUB+= PORTVERSION=${PORTVERSION} # XXX Remove +PLIST_SUB+= LIBPERL_VER=${LIBPERL_VER} # XXX Remove _PERL5_DEFAULT_FILE= /tmp/PERL5_DEFAULT @@ -247,8 +249,8 @@ pre-everything:: # portmaster/portupgrade will remove the installed Perl version, and it will # remove any way to guess what the default Perl version is needed. post-extract: - ${LN} -s libperl.so.${PORTVERSION} ${WRKSRC}/libperl.so - ${LN} -s libperl.so.${PORTVERSION} ${WRKSRC}/libperl.so.${PERL_VER} + ${LN} -s libperl.so.${LIBPERL_VER} ${WRKSRC}/libperl.so + ${LN} -s libperl.so.${LIBPERL_VER} ${WRKSRC}/libperl.so.${PERL_VER} .if !defined(PACKAGE_BUILDING) @${ECHO_CMD} "PERL5_DEFAULT=${PERL5_DEFAULT}" > ${_PERL5_DEFAULT_FILE} .endif @@ -289,8 +291,8 @@ post-install: ${MKDIR} ${STAGEDIR}${SITE_ARCH}/auto ${MKDIR} ${STAGEDIR}${SITE_PERL}/auto ${LN} ${STAGEDIR}${PREFIX}/bin/perl${PERL_VERSION} ${STAGEDIR}${PREFIX}/bin/perl5 - ${LN} -sf libperl.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/${_ARCH_LIB}/CORE/libperl.so - ${LN} -sf libperl.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/${_ARCH_LIB}/CORE/libperl.so.${PERL_VER} + ${LN} -sf libperl.so.${LIBPERL_VER} ${STAGEDIR}${PREFIX}/${_ARCH_LIB}/CORE/libperl.so + ${LN} -sf libperl.so.${LIBPERL_VER} ${STAGEDIR}${PREFIX}/${_ARCH_LIB}/CORE/libperl.so.${PERL_VER} ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/perl${PERL_VERSION} # XXX Remove the ECHO_CMD # Force PERL_PORT in case the devel has the same version as the latest release diff --git a/lang/perl5-devel/distinfo b/lang/perl5-devel/distinfo index 117ed850654..2ebbcd2b63d 100644 --- a/lang/perl5-devel/distinfo +++ b/lang/perl5-devel/distinfo @@ -1,2 +1,2 @@ -SHA256 (perl/perl-5.24.0-RC3_GH0.tar.gz) = 52987e88eb2a98d34b759211aca40bb12601984811253bd508a9df1ee0673fa7 -SIZE (perl/perl-5.24.0-RC3_GH0.tar.gz) = 17852929 +SHA256 (perl/perl-5.24.0-RC4_GH0.tar.gz) = c1c99417f3060896d8f73350f65ef47cc49b74d28449d5ad1e72914a87edf7b7 +SIZE (perl/perl-5.24.0-RC4_GH0.tar.gz) = 17855211 diff --git a/lang/perl5-devel/pkg-plist b/lang/perl5-devel/pkg-plist index 289bffbe045..0acd5c158fe 100644 --- a/lang/perl5-devel/pkg-plist +++ b/lang/perl5-devel/pkg-plist @@ -670,7 +670,7 @@ etc/man.d/perl%%PKGNAMESUFFIX%%.conf %%ARCH_LIB%%/CORE/l1_char_class_tab.h %%ARCH_LIB%%/CORE/libperl.so %%ARCH_LIB%%/CORE/libperl.so.%%PERL_VER%% -%%ARCH_LIB%%/CORE/libperl.so.%%PORTVERSION%% +%%ARCH_LIB%%/CORE/libperl.so.%%LIBPERL_VER%% %%ARCH_LIB%%/CORE/malloc_ctl.h %%ARCH_LIB%%/CORE/metaconfig.h %%ARCH_LIB%%/CORE/mg.h @@ -1447,6 +1447,7 @@ etc/man.d/perl%%PKGNAMESUFFIX%%.conf %%PRIV_LIB%%/pod/perl5203delta.pod %%PRIV_LIB%%/pod/perl5220delta.pod %%PRIV_LIB%%/pod/perl5221delta.pod +%%PRIV_LIB%%/pod/perl5222delta.pod %%PRIV_LIB%%/pod/perl5240delta.pod %%PRIV_LIB%%/pod/perl561delta.pod %%PRIV_LIB%%/pod/perl56delta.pod @@ -2115,6 +2116,7 @@ etc/man.d/perl%%PKGNAMESUFFIX%%.conf %%MAN1%%/perl5203delta.1.gz %%MAN1%%/perl5220delta.1.gz %%MAN1%%/perl5221delta.1.gz +%%MAN1%%/perl5222delta.1.gz %%MAN1%%/perl5240delta.1.gz %%MAN1%%/perl561delta.1.gz %%MAN1%%/perl56delta.1.gz diff --git a/lang/php55/Makefile b/lang/php55/Makefile index 7492197f92d..ba90b3cb6e8 100644 --- a/lang/php55/Makefile +++ b/lang/php55/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= php55 -PORTVERSION= 5.5.34 +PORTVERSION= 5.5.35 PORTREVISION?= 0 CATEGORIES?= lang devel www MASTER_SITES= PHP/distributions diff --git a/lang/php55/distinfo b/lang/php55/distinfo index 21501f95ad2..6c0253ed424 100644 --- a/lang/php55/distinfo +++ b/lang/php55/distinfo @@ -1,4 +1,4 @@ -SHA256 (php-5.5.34.tar.bz2) = af88884416a92619de842ad0fd23f7f7e8140efb0b9194f98a38a78781e5851c -SIZE (php-5.5.34.tar.bz2) = 13686681 +SHA256 (php-5.5.35.tar.bz2) = 2d648dd648e820fd64693ce72f9bf07064d147220e594e39fb9f6310238258d7 +SIZE (php-5.5.35.tar.bz2) = 13690152 SHA256 (php-5.5.x-mail-header.patch) = b0b5a7c961b2052eb14d9528e76155cbeaa881fb9b4a49f452f9dab07b6fb1c4 SIZE (php-5.5.x-mail-header.patch) = 3379 diff --git a/lang/php70/Makefile b/lang/php70/Makefile index 6f3b0858b55..ca69267603f 100644 --- a/lang/php70/Makefile +++ b/lang/php70/Makefile @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME= php70 -PORTVERSION= 7.0.5 -PORTREVISION?= 1 +PORTVERSION= 7.0.6 +PORTREVISION?= 0 CATEGORIES?= lang devel www MASTER_SITES= PHP/distributions DISTNAME= php-${PORTVERSION} diff --git a/lang/php70/distinfo b/lang/php70/distinfo index 6eeb1bb187a..a6b81dea9f7 100644 --- a/lang/php70/distinfo +++ b/lang/php70/distinfo @@ -1,2 +1,2 @@ -SHA256 (php-7.0.5.tar.bz2) = 2c09af7fe64537ea795f098b9b542ead407ef83f7cdc65b3787115ccbbb51de9 -SIZE (php-7.0.5.tar.bz2) = 14086522 +SHA256 (php-7.0.6.tar.bz2) = 14ddf192a9965c858c1e742a61456be2f34a4db87556172c0d76f08de96329b7 +SIZE (php-7.0.6.tar.bz2) = 14102594 diff --git a/mail/couriergraph/Makefile b/mail/couriergraph/Makefile index 6e2934d115b..fb07776b3fb 100644 --- a/mail/couriergraph/Makefile +++ b/mail/couriergraph/Makefile @@ -3,7 +3,7 @@ PORTNAME= couriergraph PORTVERSION= 20060202 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= mail MASTER_SITES= http://www.arschkrebs.de/postfix/${PORTNAME}/ DISTNAME= ${PORTNAME} diff --git a/mail/mailgraph/Makefile b/mail/mailgraph/Makefile index 92a10d31328..3fea4d04112 100644 --- a/mail/mailgraph/Makefile +++ b/mail/mailgraph/Makefile @@ -3,7 +3,7 @@ PORTNAME= mailgraph PORTVERSION= 1.14 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= mail MASTER_SITES= http://mailgraph.schweikert.ch/pub/ \ http://mailgraph.schweikert.ch/pub/old/ diff --git a/mail/ovs/Makefile b/mail/ovs/Makefile index 250db9a0b9a..fcf0f6921fd 100644 --- a/mail/ovs/Makefile +++ b/mail/ovs/Makefile @@ -3,7 +3,7 @@ PORTNAME= ovs PORTVERSION= 1.05 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= mail MASTER_SITES= ftp://ftp.oav.net/openvisp/stats/ \ http://mirror.amdmi3.ru/distfiles/ diff --git a/math/openblas/Makefile b/math/openblas/Makefile index 53510d55f11..15f38cb7d9e 100644 --- a/math/openblas/Makefile +++ b/math/openblas/Makefile @@ -40,7 +40,7 @@ OPENMP_DESC= Use OpenMP for threading AVX_DESC= Support Advanced Vector Extensions (AVX) AVX2_DESC= Support Advanced Vector Extensions 2 (AVX2) -.if defined(PACKAGE_BUILDING) +.if defined(BATCH) || defined(PACKAGE_BUILDING) OPTIONS_DEFAULT= DYNAMIC_ARCH .endif @@ -76,11 +76,6 @@ USES+= compiler:openmp BUILDFLAGS_THREAD+= USE_OPENMP=1 .endif -.if ${PORT_OPTIONS:MQUAD_PRECISION} -BROKEN= QUAD_PRECISION is broken; please disable this option -BUILDFLAGS+= QUAD_PRECISION=1 -.endif - .if ! ${PORT_OPTIONS:MAVX} BUILDFLAGS+= NO_AVX=1 .endif @@ -123,7 +118,7 @@ post-patch: -e 's+%%FIND%%+${FIND}+' \ -e 's+%%XARGS%%+${XARGS}+' \ -e 's+%%REINPLACE_CMD%%+${REINPLACE_CMD}+' \ - -e 's+$$(CROSS_SUFFIX)+${LOCALBASE}/bin/+' \ + -e 's+$${CROSS_SUFFIX}+${LOCALBASE}/bin/+' \ ${WRKSRC}/Makefile.system .if ${PORT_OPTIONS:MOPENMP} ${REINPLACE_CMD} -e "s+OPENBLAS_NUM_THREADS+OMP_NUM_THREADS+g" \ diff --git a/math/saga/Makefile b/math/saga/Makefile index bbf6763da81..d16deee4dc8 100644 --- a/math/saga/Makefile +++ b/math/saga/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= saga -PORTVERSION= 2.2.6 +PORTVERSION= 2.2.7 CATEGORIES= math MASTER_SITES= SF/saga-gis/SAGA%20-%20${PORTVERSION:C/\.[[:digit:]]*$//}/SAGA%20${PORTVERSION} DISTNAME= ${PORTNAME}_${PORTVERSION} @@ -78,7 +78,7 @@ post-extract: ${WRKSRC}/src/modules/imagery/imagery_opencv/Makefile.am post-patch: - @${REINPLACE_CMD} -e 's|wxString(SAGA_VERSION) + "\\n"|wxString(SAGA_VERSION) + " (SVN r2877)" + "\\n"|' \ + @${REINPLACE_CMD} -e 's|wxString(SAGA_VERSION) + "\\n"|wxString(SAGA_VERSION) + " (SVN r2893)" + "\\n"|' \ ${WRKSRC}/src/saga_core/saga_gui/dlg_about.cpp .if ${ARCH} == "powerpc" @${REINPLACE_CMD} -e 's|typedef unsigned long DWORD;|typedef unsigned int DWORD;|' \ diff --git a/math/saga/distinfo b/math/saga/distinfo index 19c18fdb5a3..1f523ed0960 100644 --- a/math/saga/distinfo +++ b/math/saga/distinfo @@ -1,2 +1,2 @@ -SHA256 (saga_2.2.6.tar.gz) = 159fc611b06d13fa446868fa0bf6e8e9c42a83d947428ba2616ff9e4462b4399 -SIZE (saga_2.2.6.tar.gz) = 4238581 +SHA256 (saga_2.2.7.tar.gz) = 6be4b844226bc48da4f2deb39bc732767b939e72b76506abf03f8170c54cb671 +SIZE (saga_2.2.7.tar.gz) = 4239415 diff --git a/multimedia/avidemux/Makefile b/multimedia/avidemux/Makefile index c6294173099..b136f8d02bd 100644 --- a/multimedia/avidemux/Makefile +++ b/multimedia/avidemux/Makefile @@ -6,6 +6,7 @@ PORTNAME= avidemux PORTVERSION= ${AVIDEMUX_VERSION} +PORTREVISION= 2 CATEGORIES= multimedia MAINTAINER= multimedia@FreeBSD.org diff --git a/multimedia/avidemux/Makefile.common b/multimedia/avidemux/Makefile.common index 3232c9c5f45..6cfb31925f8 100644 --- a/multimedia/avidemux/Makefile.common +++ b/multimedia/avidemux/Makefile.common @@ -36,7 +36,7 @@ OPTIONS_DEFINE= QT4 CLI FREETYPE FONTCONFIG OSS ESOUND JACK \ PULSEAUDIO XVIDEO FAAC FRIBIDI OPUS TWOLAME \ FAAD X264 X265 VPX XVID SDL AMR VORBIS NLS LAME VAAPI VDPAU OPTIONS_DEFAULT= QT4 FREETYPE FONTCONFIG OSS XVIDEO VPX XVID \ - SDL FAAD VORBIS + SDL FAAD VDPAU VORBIS OPTIONS_SUB= yes CLI_DESC= Build CLI tool diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile index 9c4a09871dd..81cc7f815e9 100644 --- a/multimedia/ffmpeg/Makefile +++ b/multimedia/ffmpeg/Makefile @@ -3,7 +3,7 @@ PORTNAME= ffmpeg PORTVERSION= 2.8.6 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= multimedia audio ipv6 net MASTER_SITES= http://ffmpeg.org/releases/ @@ -36,8 +36,8 @@ OPTIONS_DEFINE= AACPLUS ALSA AMR_NB AMR_WB ASS BS2B CACA CDIO CELT DC1394 \ XVIDEO ZMQ ZVBI OPTIONS_DEFAULT= FFSERVER FONTCONFIG FREETYPE FREI0R GNUTLS ICONV \ - OPENCV RTCPU SCHROEDINGER THEORA V4L VORBIS VPX \ - X264 XVID + OPENCV RTCPU SCHROEDINGER THEORA V4L VAAPI VDPAU \ + VORBIS VPX X264 XVID OPTIONS_RADIO= SSL OPTIONS_RADIO_SSL= GNUTLS OPENSSL diff --git a/multimedia/libav/Makefile b/multimedia/libav/Makefile index 16cacd35b89..00000bb1515 100644 --- a/multimedia/libav/Makefile +++ b/multimedia/libav/Makefile @@ -2,7 +2,7 @@ PORTNAME= libav PORTVERSION= 11.6 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= multimedia audio ipv6 net MASTER_SITES= http://libav.org/releases/ @@ -36,7 +36,7 @@ OPTIONS_DEFINE= ALSA AMR_NB AMR_WB BZIP2 CDIO FAAC FDK_AAC DC1394 DOCS FREETYPE VDPAU VO_AACENC VO_AMRWBENC VORBIS VPX WAVPACK WEBP X11GRAB \ X264 XVID ZLIB OPTIONS_DEFAULT=BZIP2 FREETYPE FREI0R GNUTLS OPENCV SCHROEDINGER \ - THEORA VO_AACENC VORBIS VPX X264 XVID ZLIB + THEORA VAAPI VDPAU VO_AACENC VORBIS VPX X264 XVID ZLIB FDK_AAC_DESC= AAC audio encoding via Fraunhofer FDK ILBC_DESC= iLBC en/decoding via libilbc diff --git a/multimedia/libxine/Makefile b/multimedia/libxine/Makefile index 2fc09747b4f..9a1109591ef 100644 --- a/multimedia/libxine/Makefile +++ b/multimedia/libxine/Makefile @@ -3,7 +3,7 @@ PORTNAME= xine PORTVERSION= 1.2.6 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= multimedia ipv6 MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-lib/${PORTVERSION} PKGNAMEPREFIX= lib @@ -71,6 +71,7 @@ PLIST_SUB= PLUGINSDIR="${PLUGINSDIR}" OPTIONS_DEFINE= NLS CACA ESOUND JACK GNOMEVFS2 PULSEAUDIO XVMC SMB AALIB \ IMAGEMAGICK PIXBUF WAVPACK VAAPI LIBBLURAY +OPTIONS_DEFAULT=VAAPI OPTIONS_SUB= yes NLS_USES= gettext diff --git a/multimedia/mlt/Makefile b/multimedia/mlt/Makefile index a97bbd89a83..11ace30a3d3 100644 --- a/multimedia/mlt/Makefile +++ b/multimedia/mlt/Makefile @@ -2,7 +2,7 @@ PORTNAME= mlt PORTVERSION= 0.9.6 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES?= multimedia MASTER_SITES= SF/${PORTNAME}/${PORTNAME} @@ -39,7 +39,7 @@ PORTEXAMPLES= demo OPTIONS_DEFINE= DOCS EXAMPLES FFMPEG FREI0R GTK2 JACK KDE4 QT4 \ SAMPLERATE SOX SWFDEC VDPAU VIDSTAB -OPTIONS_DEFAULT=FFMPEG FREI0R GTK2 QT4 SAMPLERATE SOX SWFDEC VIDSTAB +OPTIONS_DEFAULT=FFMPEG FREI0R GTK2 QT4 SAMPLERATE SOX SWFDEC VDPAU VIDSTAB OPTIONS_SUB= yes GTK2_DESC= Images and text rendering via GTK+ 2 diff --git a/multimedia/mplayer2/Makefile b/multimedia/mplayer2/Makefile index 992e01a5d71..26a32eb10c7 100644 --- a/multimedia/mplayer2/Makefile +++ b/multimedia/mplayer2/Makefile @@ -2,7 +2,7 @@ PORTNAME= mplayer2 PORTVERSION= ${MPLAYER2_PORT_VERSION} -PORTREVISION= 18 +PORTREVISION= 19 CATEGORIES= multimedia audio MASTER_SITES= LOCAL/gblach/ @@ -39,7 +39,7 @@ MPLAYER2_PORT_VERSION= 2.0.${MPLAYER2_SNAPSHOT_DATE:S/-//g} OPTIONS_DEFINE= A52 ASS CACA CDIO DEBUG DV DVDREAD DVDNAV GIF IPV6 JACK LADSPA \ LIBBLURAY LIRC MAD OPENGL PORTAUDIO PULSEAUDIO REALPLAYER \ RTC SDL SMB SPEEX THEORA V4L VDPAU X11 XINERAMA -OPTIONS_DEFAULT=A52 ASS ENCA DVDREAD DVDNAV X11 +OPTIONS_DEFAULT=A52 ASS ENCA DVDREAD DVDNAV VDPAU X11 OPTIONS_SUB= yes OPTIONS_DEFINE_i386+= WIN32 diff --git a/multimedia/plexmediaserver-plexpass/Makefile b/multimedia/plexmediaserver-plexpass/Makefile index c08ed9b69bd..c1617865625 100644 --- a/multimedia/plexmediaserver-plexpass/Makefile +++ b/multimedia/plexmediaserver-plexpass/Makefile @@ -1,13 +1,13 @@ # Created by: KalleDK # $FreeBSD$ -PORTVERSION= 0.9.16.5.1966 +PORTVERSION= 0.9.16.6.1993 PORTREVISION= 0 PKGNAMESUFFIX= -plexpass MAINTAINER= feld@FreeBSD.org -PLEX_BUILD= 81a3bf0 +PLEX_BUILD= 5089475 USE_RC_SUBR= ${PORTNAME}_plexpass diff --git a/multimedia/plexmediaserver-plexpass/distinfo b/multimedia/plexmediaserver-plexpass/distinfo index 845df7d4a64..79616eff9b1 100644 --- a/multimedia/plexmediaserver-plexpass/distinfo +++ b/multimedia/plexmediaserver-plexpass/distinfo @@ -1,2 +1,2 @@ -SHA256 (PlexMediaServer-0.9.16.5.1966-81a3bf0-freebsd-amd64.tar.bz2) = 73fda27b38c8224afbf18dcfff71ef99323c0c4b535680143dfa7d04e71b425c -SIZE (PlexMediaServer-0.9.16.5.1966-81a3bf0-freebsd-amd64.tar.bz2) = 97836586 +SHA256 (PlexMediaServer-0.9.16.6.1993-5089475-freebsd-amd64.tar.bz2) = 1000b799775e61537aeec649f111853589022a0f733a4073ea219e99b2b0a5ea +SIZE (PlexMediaServer-0.9.16.6.1993-5089475-freebsd-amd64.tar.bz2) = 97837423 diff --git a/multimedia/plexmediaserver/Makefile b/multimedia/plexmediaserver/Makefile index 26163ab71c7..3f13bb12bb9 100644 --- a/multimedia/plexmediaserver/Makefile +++ b/multimedia/plexmediaserver/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= plexmediaserver -PORTVERSION?= 0.9.16.4.1911 +PORTVERSION?= 0.9.16.6.1993 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?= ee6e505 +PLEX_BUILD?= 5089475 NO_BUILD= yes WRKSRC= ${WRKDIR}/PlexMediaServer-${PORTVERSION}-${PLEX_BUILD} diff --git a/multimedia/plexmediaserver/distinfo b/multimedia/plexmediaserver/distinfo index 188645cce05..79616eff9b1 100644 --- a/multimedia/plexmediaserver/distinfo +++ b/multimedia/plexmediaserver/distinfo @@ -1,2 +1,2 @@ -SHA256 (PlexMediaServer-0.9.16.4.1911-ee6e505-freebsd-amd64.tar.bz2) = 68b1a2f6c8f210d042ea3e9329d8277c494a68975444663cdaac8a7e5bc5b6bd -SIZE (PlexMediaServer-0.9.16.4.1911-ee6e505-freebsd-amd64.tar.bz2) = 97684360 +SHA256 (PlexMediaServer-0.9.16.6.1993-5089475-freebsd-amd64.tar.bz2) = 1000b799775e61537aeec649f111853589022a0f733a4073ea219e99b2b0a5ea +SIZE (PlexMediaServer-0.9.16.6.1993-5089475-freebsd-amd64.tar.bz2) = 97837423 diff --git a/multimedia/plexmediaserver/pkg-plist b/multimedia/plexmediaserver/pkg-plist index 7fa956db953..453ed33f4f2 100644 --- a/multimedia/plexmediaserver/pkg-plist +++ b/multimedia/plexmediaserver/pkg-plist @@ -620,6 +620,7 @@ %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/Media-Flags.bundle/Contents/Resources/Studio/american_zoetrope.png %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/Media-Flags.bundle/Contents/Resources/Studio/anchor_bay_entertainment.png %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/Media-Flags.bundle/Contents/Resources/Studio/animal_planet.png +%%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/Media-Flags.bundle/Contents/Resources/Studio/animax.png %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/Media-Flags.bundle/Contents/Resources/Studio/anonymous_content.png %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/Media-Flags.bundle/Contents/Resources/Studio/antena_3.png %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/Media-Flags.bundle/Contents/Resources/Studio/apatow_productions.png @@ -664,6 +665,7 @@ %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/Media-Flags.bundle/Contents/Resources/Studio/blue_underground.png %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/Media-Flags.bundle/Contents/Resources/Studio/blumhouse_productions.png %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/Media-Flags.bundle/Contents/Resources/Studio/bnn.png +%%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/Media-Flags.bundle/Contents/Resources/Studio/bold_films.png %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/Media-Flags.bundle/Contents/Resources/Studio/boomerang.png %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/Media-Flags.bundle/Contents/Resources/Studio/bravo.png %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/Media-Flags.bundle/Contents/Resources/Studio/brightlight.png @@ -791,6 +793,7 @@ %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/Media-Flags.bundle/Contents/Resources/Studio/france_3.png %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/Media-Flags.bundle/Contents/Resources/Studio/france_4.png %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/Media-Flags.bundle/Contents/Resources/Studio/franchise_pictures.png +%%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/Media-Flags.bundle/Contents/Resources/Studio/freeform.png %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/Media-Flags.bundle/Contents/Resources/Studio/fuji_tv.png %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/Media-Flags.bundle/Contents/Resources/Studio/future_flix.png %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/Media-Flags.bundle/Contents/Resources/Studio/fx.png @@ -993,6 +996,8 @@ %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/Media-Flags.bundle/Contents/Resources/Studio/radical_media.png %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/Media-Flags.bundle/Contents/Resources/Studio/rai_cinema.png %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/Media-Flags.bundle/Contents/Resources/Studio/rankin.png +%%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/Media-Flags.bundle/Contents/Resources/Studio/ratpac_dune_entertainment.png +%%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/Media-Flags.bundle/Contents/Resources/Studio/ratpac_entertainment.png %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/Media-Flags.bundle/Contents/Resources/Studio/red_hour.png %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/Media-Flags.bundle/Contents/Resources/Studio/red_wagon_entertainment.png %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/Media-Flags.bundle/Contents/Resources/Studio/redrum.png @@ -1009,6 +1014,7 @@ %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/Media-Flags.bundle/Contents/Resources/Studio/rick_mill.png %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/Media-Flags.bundle/Contents/Resources/Studio/rickety_shack_films.png %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/Media-Flags.bundle/Contents/Resources/Studio/river_road_entertainment.png +%%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/Media-Flags.bundle/Contents/Resources/Studio/rko_radio_pictures.png %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/Media-Flags.bundle/Contents/Resources/Studio/roadside_attractions.png %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/Media-Flags.bundle/Contents/Resources/Studio/rogue_pictures.png %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/Media-Flags.bundle/Contents/Resources/Studio/romar.png @@ -1026,6 +1032,7 @@ %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/Media-Flags.bundle/Contents/Resources/Studio/saturn_films.png %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/Media-Flags.bundle/Contents/Resources/Studio/saul_zaentz.png %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/Media-Flags.bundle/Contents/Resources/Studio/sbs.png +%%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/Media-Flags.bundle/Contents/Resources/Studio/scholastic.png %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/Media-Flags.bundle/Contents/Resources/Studio/scifi.png %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/Media-Flags.bundle/Contents/Resources/Studio/scott_free.png %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/Media-Flags.bundle/Contents/Resources/Studio/screen_australia.png @@ -1138,6 +1145,7 @@ %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/Media-Flags.bundle/Contents/Resources/Studio/warner_independent_pictures.png %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/Media-Flags.bundle/Contents/Resources/Studio/water_walk_productions.png %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/Media-Flags.bundle/Contents/Resources/Studio/wdr.png +%%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/Media-Flags.bundle/Contents/Resources/Studio/we_tv.png %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/Media-Flags.bundle/Contents/Resources/Studio/weinstein_company.png %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/Media-Flags.bundle/Contents/Resources/Studio/wfdif.png %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/Media-Flags.bundle/Contents/Resources/Studio/wgn.png @@ -1700,7 +1708,7 @@ %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/TheTVDB.bundle/README.md %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/WebClient.bundle/Contents/Info.plist %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/WebClient.bundle/Contents/Resources/css/main.17dc895a940c1a1ff2112611a5d346e6.css -%%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/WebClient.bundle/Contents/Resources/css/main.v3.cd2cc651fa4a48f2d4c0e7a22dfae4c6.css +%%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/WebClient.bundle/Contents/Resources/css/main.v3.8a15495ac101fa04d0fdd60953ffe6e0.css %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/WebClient.bundle/Contents/Resources/favicon-mask.svg %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/WebClient.bundle/Contents/Resources/favicon.ico %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/WebClient.bundle/Contents/Resources/img/base/plex-logo.96faf245690b14fdd33eccd3294ac57f.svg @@ -1787,9 +1795,9 @@ %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/WebClient.bundle/Contents/Resources/img/desktop/vendor-logos/gracenote.18089cb7063ad397523859fa93f2d54c.svg %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/WebClient.bundle/Contents/Resources/img/desktop/vendor-logos/vevo.0aa36b37d6a9aedfe67df4c5ff2ae8e0.svg %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/WebClient.bundle/Contents/Resources/index.html -%%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/WebClient.bundle/Contents/Resources/js/main.69108ed027f1568792bb.js -%%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/WebClient.bundle/Contents/Resources/js/manifest.eb0310e28acba2f9b1a0.js -%%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/WebClient.bundle/Contents/Resources/js/vendors.55530c19c0a35ff892b1.js +%%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/WebClient.bundle/Contents/Resources/js/main.64626698ddf4e9a7e118.js +%%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/WebClient.bundle/Contents/Resources/js/manifest.41a0b9187a1b9e94d122.js +%%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/WebClient.bundle/Contents/Resources/js/vendors.9e967496c0f98e36a534.js %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/WebClient.bundle/Contents/Resources/mp3/null.2036f08ba858d37814b7f6982d26414a.mp3 %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/WebClient.bundle/Contents/Resources/setup.html %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/WebClient.bundle/Contents/Resources/swf/jwplayer/jwplayer.swf diff --git a/multimedia/plexpy/Makefile b/multimedia/plexpy/Makefile index cfbf5be60b9..23f022fdca8 100644 --- a/multimedia/plexpy/Makefile +++ b/multimedia/plexpy/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= plexpy -PORTVERSION= 1.3.13 +PORTVERSION= 1.3.16 CATEGORIES= multimedia python DISTVERSIONPREFIX=v diff --git a/multimedia/plexpy/distinfo b/multimedia/plexpy/distinfo index 683afb15c7f..6fc3c290d8f 100644 --- a/multimedia/plexpy/distinfo +++ b/multimedia/plexpy/distinfo @@ -1,2 +1,2 @@ -SHA256 (drzoidberg33-plexpy-v1.3.13_GH0.tar.gz) = e706a973aeb1a24f1e682112084659efa9e81481f0076645f08b4218568dbfce -SIZE (drzoidberg33-plexpy-v1.3.13_GH0.tar.gz) = 42716990 +SHA256 (drzoidberg33-plexpy-v1.3.16_GH0.tar.gz) = bf585245e893477927279e71dfe1c2afe0644b8ea6d0f8332ff3b3c043b7a74e +SIZE (drzoidberg33-plexpy-v1.3.16_GH0.tar.gz) = 35540876 diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile index 8d5c6105c3d..666d8e969dd 100644 --- a/multimedia/vlc/Makefile +++ b/multimedia/vlc/Makefile @@ -3,7 +3,7 @@ PORTNAME= vlc DISTVERSION= 2.2.1 -PORTREVISION= 8 +PORTREVISION= 9 PORTEPOCH= 4 CATEGORIES= multimedia audio ipv6 net www MASTER_SITES= http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION:S/a$//}/ \ @@ -66,7 +66,7 @@ OPTIONS_DEFINE= A52 AALIB ASS AVAHI CACA DBUS DCA DIRAC DOCS DVDREAD \ OPTIONS_DEFAULT=A52 AVAHI DBUS DCA DVDREAD DVDNAV FAAD FLAC GNUTLS \ HTTPD LIVEMEDIA LUA MAD MATROSKA MPEG2 OGG OPTIMIZED_CFLAGS \ OPUS PNG QT5 SAMPLERATE STREAM SPEEX TAGLIB THEORA TWOLAME V4L \ - VCD VORBIS X11 + VAAPI VCD VDPAU VORBIS X11 OPTIONS_SUB= yes ASS_DESC= ASS/SSA subtitle rendering diff --git a/net-mgmt/cacti/Makefile b/net-mgmt/cacti/Makefile index ff4d1a3c7dd..0711cd3e6a1 100644 --- a/net-mgmt/cacti/Makefile +++ b/net-mgmt/cacti/Makefile @@ -2,7 +2,7 @@ PORTNAME= cacti PORTVERSION= 0.8.8g${PATCHLEVEL} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-mgmt www MASTER_SITES= http://www.cacti.net/downloads/ \ ftp://ftpmirror.uk/freebsd-ports/cacti/ diff --git a/net-mgmt/collectd5/Makefile b/net-mgmt/collectd5/Makefile index 517e317ea74..993404f5641 100644 --- a/net-mgmt/collectd5/Makefile +++ b/net-mgmt/collectd5/Makefile @@ -3,7 +3,7 @@ PORTNAME= collectd PORTVERSION= 5.5.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net-mgmt MASTER_SITES= https://collectd.org/files/ \ http://collectd.org/files/ diff --git a/net-mgmt/cricket/Makefile b/net-mgmt/cricket/Makefile index 2b2b879e412..59a3baecc22 100644 --- a/net-mgmt/cricket/Makefile +++ b/net-mgmt/cricket/Makefile @@ -3,7 +3,7 @@ PORTNAME= cricket PORTVERSION= 1.0.5 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= net-mgmt MASTER_SITES= SF diff --git a/net-mgmt/flowviewer/Makefile b/net-mgmt/flowviewer/Makefile index c634ad83dc2..3b8fc4039eb 100644 --- a/net-mgmt/flowviewer/Makefile +++ b/net-mgmt/flowviewer/Makefile @@ -3,7 +3,7 @@ PORTNAME= flowviewer PORTVERSION= 4.5 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net-mgmt MASTER_SITES= SF/${PORTNAME} DISTNAME= FlowViewer_${DISTVERSION} diff --git a/net-mgmt/guifi-snpservices/Makefile b/net-mgmt/guifi-snpservices/Makefile index 45e7826cf99..8c34c93ebcf 100644 --- a/net-mgmt/guifi-snpservices/Makefile +++ b/net-mgmt/guifi-snpservices/Makefile @@ -3,6 +3,7 @@ PORTNAME= snpservices DISTVERSION= 0.2.2-8 +PORTREVISION= 1 CATEGORIES= net-mgmt www MASTER_SITES= http://serveis.guifi.net/debian/guifi/ \ http://www.potion-studios.com/ diff --git a/net-mgmt/librenms/Makefile b/net-mgmt/librenms/Makefile index e8214aea2c6..41fc331f277 100644 --- a/net-mgmt/librenms/Makefile +++ b/net-mgmt/librenms/Makefile @@ -3,6 +3,7 @@ PORTNAME= librenms PORTVERSION= 201604 +PORTREVISION= 1 CATEGORIES= net-mgmt MASTER_SITES= http://www.librenms.org/ diff --git a/net-mgmt/nagiosgraph/Makefile b/net-mgmt/nagiosgraph/Makefile index 897da0f29d0..d9722201109 100644 --- a/net-mgmt/nagiosgraph/Makefile +++ b/net-mgmt/nagiosgraph/Makefile @@ -3,6 +3,7 @@ PORTNAME= nagiosgraph PORTVERSION= 1.5.2 +PORTREVISION= 1 CATEGORIES= net-mgmt MASTER_SITES= SF diff --git a/net-mgmt/netdot/Makefile b/net-mgmt/netdot/Makefile index 18ec8c9c5a3..be523ea9dd0 100644 --- a/net-mgmt/netdot/Makefile +++ b/net-mgmt/netdot/Makefile @@ -3,7 +3,7 @@ PORTNAME= netdot PORTVERSION= 1.0.7 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net-mgmt MASTER_SITES= http://netdot.uoregon.edu/pub/dists/ diff --git a/net-mgmt/nfdump/Makefile b/net-mgmt/nfdump/Makefile index 8db27e4e271..34cf3c3247e 100644 --- a/net-mgmt/nfdump/Makefile +++ b/net-mgmt/nfdump/Makefile @@ -3,7 +3,7 @@ PORTNAME= nfdump PORTVERSION= 1.6.13 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-mgmt MASTER_SITES= SF/${PORTNAME}/stable/${PORTNAME}-${PORTVERSION} diff --git a/net-mgmt/nfsen/Makefile b/net-mgmt/nfsen/Makefile index 939080a13e8..1db60233582 100644 --- a/net-mgmt/nfsen/Makefile +++ b/net-mgmt/nfsen/Makefile @@ -3,7 +3,7 @@ PORTNAME= nfsen PORTVERSION= 1.3.7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-mgmt MASTER_SITES= SF/${PORTNAME}/stable/${PORTNAME}-${PORTVERSION} \ http://nfsen.sourceforge.net/ diff --git a/net-mgmt/observium/Makefile b/net-mgmt/observium/Makefile index dc4acc2ffad..61ca36ac58e 100644 --- a/net-mgmt/observium/Makefile +++ b/net-mgmt/observium/Makefile @@ -3,7 +3,7 @@ PORTNAME= observium PORTVERSION= 0.16.1.7533 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-mgmt MASTER_SITES= http://www.observium.org/ DISTNAME= ${PORTNAME}-community-latest diff --git a/net-mgmt/phpweathermap/Makefile b/net-mgmt/phpweathermap/Makefile index 751d1cd0db7..92ba2b837e0 100644 --- a/net-mgmt/phpweathermap/Makefile +++ b/net-mgmt/phpweathermap/Makefile @@ -3,7 +3,7 @@ PORTNAME= phpweathermap PORTVERSION= 0.97a -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net-mgmt www MASTER_SITES= http://www.network-weathermap.com/files/ DISTNAME= php-weathermap-${PORTVERSION} diff --git a/net-mgmt/pnp/Makefile b/net-mgmt/pnp/Makefile index 0849d32905a..8c80b3c962e 100644 --- a/net-mgmt/pnp/Makefile +++ b/net-mgmt/pnp/Makefile @@ -3,7 +3,7 @@ PORTNAME= pnp PORTVERSION= 0.6.25 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net-mgmt MASTER_SITES= SF/pnp4nagios/PNP-0.6 DISTNAME= pnp4nagios-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX} diff --git a/net-mgmt/rrdbot/Makefile b/net-mgmt/rrdbot/Makefile index 0cd06375d85..9dcc166b8c1 100644 --- a/net-mgmt/rrdbot/Makefile +++ b/net-mgmt/rrdbot/Makefile @@ -3,7 +3,7 @@ PORTNAME= rrdbot PORTVERSION= 0.9.7 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net-mgmt MASTER_SITES= http://thewalter.net/stef/software/rrdbot/ diff --git a/net-mgmt/smokeping/Makefile b/net-mgmt/smokeping/Makefile index 8de63b5d1af..93eaa21b8df 100644 --- a/net-mgmt/smokeping/Makefile +++ b/net-mgmt/smokeping/Makefile @@ -3,7 +3,7 @@ PORTNAME= smokeping PORTVERSION= 2.6.11 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= net-mgmt www MASTER_SITES= http://oss.oetiker.ch/smokeping/pub/ \ http://smokeping.cs.pu.edu.tw/pub/ diff --git a/net-mgmt/snmp4nagios/Makefile b/net-mgmt/snmp4nagios/Makefile index 98cb63e15fd..e497e483036 100644 --- a/net-mgmt/snmp4nagios/Makefile +++ b/net-mgmt/snmp4nagios/Makefile @@ -3,7 +3,7 @@ PORTNAME= SNMP4Nagios PORTVERSION= 0.4 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net-mgmt MASTER_SITES= SF/${PORTNAME:tl}/${PORTNAME}/${PORTVERSION} diff --git a/net-mgmt/torrus/Makefile b/net-mgmt/torrus/Makefile index c7dd5d562b4..70304403729 100644 --- a/net-mgmt/torrus/Makefile +++ b/net-mgmt/torrus/Makefile @@ -3,7 +3,7 @@ PORTNAME= torrus PORTVERSION= 2.07 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-mgmt MASTER_SITES= SF/torrus/torrus/ diff --git a/net-mgmt/xymon-server/Makefile b/net-mgmt/xymon-server/Makefile index a31c23e8d27..70f4bc5ccbd 100644 --- a/net-mgmt/xymon-server/Makefile +++ b/net-mgmt/xymon-server/Makefile @@ -2,7 +2,7 @@ PORTNAME= xymon PORTVERSION= 4.3.27 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= net-mgmt www MASTER_SITES= SF/xymon/Xymon/${PORTVERSION} PKGNAMESUFFIX= -server${PKGNAMESUFFIX2} diff --git a/net-p2p/bitcoin/Makefile b/net-p2p/bitcoin/Makefile index 6d1b820a05c..1c0f3d98947 100644 --- a/net-p2p/bitcoin/Makefile +++ b/net-p2p/bitcoin/Makefile @@ -84,7 +84,8 @@ CONFIGURE_ARGS?= --without-libs \ --without-utils CONFIGURE_ENV= CRYPTO_CFLAGS="-I${OPENSSLINC}" CRYPTO_LIBS="-L${OPENSSLLIB} -lcrypto" \ - SSL_CFLAGS="-I${OPENSSLINC}" SSL_LIBS="-L${OPENSSLLIB} -lssl" + SSL_CFLAGS="-I${OPENSSLINC}" SSL_LIBS="-L${OPENSSLLIB} -lssl" \ + OBJCXX="${CXX}" OBJCXXFLAGS="${CXXFLAGS}" MAKE_ENV+= V=1 PLIST_FILES?= bin/bitcoin-qt share/applications/bitcoin-qt.desktop \ diff --git a/net/exabgp/distinfo b/net/exabgp/distinfo index 9667b495d21..74c1f4e5d73 100644 --- a/net/exabgp/distinfo +++ b/net/exabgp/distinfo @@ -1,2 +1,2 @@ -SHA256 (Exa-Networks-exabgp-3.4.16_GH0.tgz) = 4ccec18e99c2298b20acf9710b4b6a817d5da203839140142341934e9a7ddf75 -SIZE (Exa-Networks-exabgp-3.4.16_GH0.tgz) = 539186 +SHA256 (Exa-Networks-exabgp-3.4.16_GH0.tar.gz) = 4ccec18e99c2298b20acf9710b4b6a817d5da203839140142341934e9a7ddf75 +SIZE (Exa-Networks-exabgp-3.4.16_GH0.tar.gz) = 539186 diff --git a/net/motsognir/Makefile b/net/motsognir/Makefile index c87b723d7b3..e7edc95b72b 100644 --- a/net/motsognir/Makefile +++ b/net/motsognir/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= motsognir -PORTVERSION= 1.0.8 -PORTREVISION= 1 +PORTVERSION= 1.0.8.1 CATEGORIES= net MASTER_SITES= SF/${PORTNAME}/v${PORTVERSION} diff --git a/net/motsognir/distinfo b/net/motsognir/distinfo index 515f4277a30..9c345408266 100644 --- a/net/motsognir/distinfo +++ b/net/motsognir/distinfo @@ -1,2 +1,2 @@ -SHA256 (motsognir-1.0.8.tar.gz) = 97b8cbcc7baf8fe756308a64081da11f6eb363d0b1cbd868e11d4d952a6bc3cf -SIZE (motsognir-1.0.8.tar.gz) = 978060 +SHA256 (motsognir-1.0.8.1.tar.gz) = 2d49e825517a071ce2077c549c8c610af2adc5b6e4b7b2cf7191bd49f7c89b03 +SIZE (motsognir-1.0.8.1.tar.gz) = 978714 diff --git a/net/ntop/Makefile b/net/ntop/Makefile index 4c62d7a6bca..4a1a3da32e8 100644 --- a/net/ntop/Makefile +++ b/net/ntop/Makefile @@ -3,7 +3,7 @@ PORTNAME= ntop PORTVERSION= 5.0.1 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= net MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/Stable diff --git a/net/socat/Makefile b/net/socat/Makefile index 3d83c706d89..700cd88aaf1 100644 --- a/net/socat/Makefile +++ b/net/socat/Makefile @@ -13,11 +13,13 @@ COMMENT= Multipurpose relay and more LICENSE= GPLv2 -USES= compiler tar:bzip2 cpe +USES= compiler cpe tar:bzip2 GNU_CONFIGURE= yes USE_RC_SUBR= socat USE_OPENSSL= yes +CPE_VENDOR= dest-unreach + PORTSCOUT= skipv:2.0.0-b2 PLIST_FILES= bin/filan bin/procan bin/socat man/man1/socat.1.gz diff --git a/net/socat/files/patch-sslcls.c b/net/socat/files/patch-sslcls.c index 5896c591b91..06a42a8d08b 100644 --- a/net/socat/files/patch-sslcls.c +++ b/net/socat/files/patch-sslcls.c @@ -1,6 +1,6 @@ ---- sslcls.c.orig 2015-01-24 11:15:22.000000000 +0100 +--- sslcls.c.orig 2015-01-24 10:15:22 UTC +++ sslcls.c -@@ -55,6 +55,7 @@ +@@ -55,6 +55,7 @@ const SSL_METHOD *sycSSLv2_server_method } #endif @@ -8,7 +8,7 @@ const SSL_METHOD *sycSSLv3_client_method(void) { const SSL_METHOD *result; Debug("SSLv3_client_method()"); -@@ -62,7 +63,9 @@ +@@ -62,7 +63,9 @@ const SSL_METHOD *sycSSLv3_client_method Debug1("SSLv3_client_method() -> %p", result); return result; } @@ -18,7 +18,7 @@ const SSL_METHOD *sycSSLv3_server_method(void) { const SSL_METHOD *result; Debug("SSLv3_server_method()"); -@@ -70,6 +73,7 @@ +@@ -70,6 +73,7 @@ const SSL_METHOD *sycSSLv3_server_method Debug1("SSLv3_server_method() -> %p", result); return result; } @@ -26,4 +26,28 @@ const SSL_METHOD *sycSSLv23_client_method(void) { const SSL_METHOD *result; - +@@ -331,6 +335,7 @@ void sycSSL_free(SSL *ssl) { + return; + } + ++#ifndef OPENSSL_NO_EGD + int sycRAND_egd(const char *path) { + int result; + Debug1("RAND_egd(\"%s\")", path); +@@ -338,6 +343,7 @@ int sycRAND_egd(const char *path) { + Debug1("RAND_egd() -> %d", result); + return result; + } ++#endif + + DH *sycPEM_read_bio_DHparams(BIO *bp, DH **x, pem_password_cb *cb, void *u) { + DH *result; +@@ -375,7 +381,7 @@ int sycFIPS_mode_set(int onoff) { + } + #endif /* WITH_FIPS */ + +-#if OPENSSL_VERSION_NUMBER >= 0x00908000L ++#if OPENSSL_VERSION_NUMBER >= 0x00908000L && !defined OPENSSL_NO_COMP + const COMP_METHOD *sycSSL_get_current_compression(SSL *ssl) { + const COMP_METHOD *result; + Debug1("SSL_get_current_compression(%p)", ssl); diff --git a/net/socat/files/patch-sslcls.h b/net/socat/files/patch-sslcls.h new file mode 100644 index 00000000000..e7bc33a6980 --- /dev/null +++ b/net/socat/files/patch-sslcls.h @@ -0,0 +1,11 @@ +--- sslcls.h.orig 2015-01-24 10:15:22 UTC ++++ sslcls.h +@@ -55,7 +55,7 @@ BIO *sycBIO_new_file(const char *filenam + + int sycFIPS_mode_set(int onoff); + +-#if OPENSSL_VERSION_NUMBER >= 0x00908000L ++#if OPENSSL_VERSION_NUMBER >= 0x00908000L && !defined(OPENSSL_NO_COMP) + const COMP_METHOD *sycSSL_get_current_compression(SSL *ssl); + const COMP_METHOD *sycSSL_get_current_expansion(SSL *ssl); + const char *sycSSL_COMP_get_name(const COMP_METHOD *comp); diff --git a/net/socat/files/patch-xio-openssl.c b/net/socat/files/patch-xio-openssl.c new file mode 100644 index 00000000000..e88ea41d13d --- /dev/null +++ b/net/socat/files/patch-xio-openssl.c @@ -0,0 +1,79 @@ +--- xio-openssl.c.orig 2016-01-29 10:28:38 UTC ++++ xio-openssl.c +@@ -108,9 +108,11 @@ const struct optdesc opt_openssl_key + const struct optdesc opt_openssl_dhparam = { "openssl-dhparam", "dh", OPT_OPENSSL_DHPARAM, GROUP_OPENSSL, PH_SPEC, TYPE_FILENAME, OFUNC_SPEC }; + const struct optdesc opt_openssl_cafile = { "openssl-cafile", "cafile", OPT_OPENSSL_CAFILE, GROUP_OPENSSL, PH_SPEC, TYPE_FILENAME, OFUNC_SPEC }; + const struct optdesc opt_openssl_capath = { "openssl-capath", "capath", OPT_OPENSSL_CAPATH, GROUP_OPENSSL, PH_SPEC, TYPE_FILENAME, OFUNC_SPEC }; ++#ifndef OPENSSL_NO_EGD + const struct optdesc opt_openssl_egd = { "openssl-egd", "egd", OPT_OPENSSL_EGD, GROUP_OPENSSL, PH_SPEC, TYPE_FILENAME, OFUNC_SPEC }; ++#endif + const struct optdesc opt_openssl_pseudo = { "openssl-pseudo", "pseudo", OPT_OPENSSL_PSEUDO, GROUP_OPENSSL, PH_SPEC, TYPE_BOOL, OFUNC_SPEC }; +-#if OPENSSL_VERSION_NUMBER >= 0x00908000L ++#if OPENSSL_VERSION_NUMBER >= 0x00908000L && !defined OPENSSL_NO_COMP + const struct optdesc opt_openssl_compress = { "openssl-compress", "compress", OPT_OPENSSL_COMPRESS, GROUP_OPENSSL, PH_SPEC, TYPE_STRING, OFUNC_SPEC }; + #endif + #if WITH_FIPS +@@ -147,7 +149,7 @@ int xio_reset_fips_mode(void) { + static void openssl_conn_loginfo(SSL *ssl) { + Notice1("SSL connection using %s", SSL_get_cipher(ssl)); + +-#if OPENSSL_VERSION_NUMBER >= 0x00908000L ++#if OPENSSL_VERSION_NUMBER >= 0x00908000L && !defined OPENSSL_NO_COMP + { + const COMP_METHOD *comp, *expansion; + +@@ -651,7 +653,7 @@ int _xioopen_openssl_listen(struct singl + #endif /* WITH_LISTEN */ + + +-#if OPENSSL_VERSION_NUMBER >= 0x00908000L ++#if OPENSSL_VERSION_NUMBER >= 0x00908000L && !defined OPENSSL_NO_COMP + /* In OpenSSL 0.9.7 compression methods could be added using + * SSL_COMP_add_compression_method(3), but the implemntation is not compatible + * with the standard (RFC3749). +@@ -722,8 +724,10 @@ int + char *opt_dhparam = NULL; /* file name of DH params */ + char *opt_cafile = NULL; /* certificate authority file */ + char *opt_capath = NULL; /* certificate authority directory */ ++#ifndef OPENSSL_NO_EGD + char *opt_egd = NULL; /* entropy gathering daemon socket path */ +-#if OPENSSL_VERSION_NUMBER >= 0x00908000L ++#endif ++#if OPENSSL_VERSION_NUMBER >= 0x00908000L && !defined OPENSSL_NO_COMP + char *opt_compress = NULL; /* compression method */ + #endif + bool opt_pseudo = false; /* use pseudo entropy if nothing else */ +@@ -741,9 +745,11 @@ int + retropt_string(opts, OPT_OPENSSL_CAPATH, &opt_capath); + retropt_string(opts, OPT_OPENSSL_KEY, &opt_key); + retropt_string(opts, OPT_OPENSSL_DHPARAM, &opt_dhparam); ++#ifndef OPENSSL_NO_EGD + retropt_string(opts, OPT_OPENSSL_EGD, &opt_egd); ++#endif + retropt_bool(opts,OPT_OPENSSL_PSEUDO, &opt_pseudo); +-#if OPENSSL_VERSION_NUMBER >= 0x00908000L ++#if OPENSSL_VERSION_NUMBER >= 0x00908000L && !defined OPENSSL_NO_COMP + retropt_string(opts, OPT_OPENSSL_COMPRESS, &opt_compress); + #endif + #if WITH_FIPS +@@ -877,9 +883,11 @@ int + } + } + ++#ifndef OPENSSL_NO_EGD + if (opt_egd) { + sycRAND_egd(opt_egd); + } ++#endif + + if (opt_pseudo) { + long int randdata; +@@ -991,7 +999,7 @@ int + } + #endif /* !defined(EC_KEY) */ + +-#if OPENSSL_VERSION_NUMBER >= 0x00908000L ++#if OPENSSL_VERSION_NUMBER >= 0x00908000L && !defined OPENSSL_NO_COMP + if (opt_compress) { + int result; + result = openssl_setup_compression(*ctx, opt_compress); diff --git a/net/socat/files/patch-xioopts.c b/net/socat/files/patch-xioopts.c index 1a257fc36a3..d92bf093e5c 100644 --- a/net/socat/files/patch-xioopts.c +++ b/net/socat/files/patch-xioopts.c @@ -1,6 +1,40 @@ --- xioopts.c.orig 2015-01-24 10:15:22 UTC +++ xioopts.c -@@ -2971,6 +2971,25 @@ int retropt_bind(struct opt *opts, +@@ -296,7 +296,7 @@ const struct optname optionnames[] = { + #if WITH_EXT2 && defined(EXT2_COMPR_FL) + IF_ANY ("compr", &opt_ext2_compr) + #endif +-#if OPENSSL_VERSION_NUMBER >= 0x00908000L ++#if OPENSSL_VERSION_NUMBER >= 0x00908000L && !defined OPENSSL_NO_COMP + IF_OPENSSL("compress", &opt_openssl_compress) + #endif + #ifdef TCP_CONN_ABORT_THRESHOLD /* HP_UX */ +@@ -412,7 +412,9 @@ const struct optname optionnames[] = { + #ifdef ECHOPRT + IF_TERMIOS("echoprt", &opt_echoprt) + #endif ++#ifndef OPENSSL_NO_EGD + IF_OPENSSL("egd", &opt_openssl_egd) ++#endif + IF_ANY ("end-close", &opt_end_close) + IF_TERMIOS("eof", &opt_veof) + IF_TERMIOS("eol", &opt_veol) +@@ -1098,11 +1100,13 @@ const struct optname optionnames[] = { + IF_OPENSSL("openssl-certificate", &opt_openssl_certificate) + IF_OPENSSL("openssl-cipherlist", &opt_openssl_cipherlist) + IF_OPENSSL("openssl-commonname", &opt_openssl_commonname) +-#if OPENSSL_VERSION_NUMBER >= 0x00908000L ++#if OPENSSL_VERSION_NUMBER >= 0x00908000L && !defined OPENSSL_NO_COMP + IF_OPENSSL("openssl-compress", &opt_openssl_compress) + #endif + IF_OPENSSL("openssl-dhparam", &opt_openssl_dhparam) ++#ifndef OPENSSL_NO_EGD + IF_OPENSSL("openssl-egd", &opt_openssl_egd) ++#endif + #if WITH_FIPS + IF_OPENSSL("openssl-fips", &opt_openssl_fips) + #endif +@@ -2971,6 +2975,25 @@ int retropt_bind(struct opt *opts, OFUNC_TERMIOS_FLAG, OFUNC_TERMIOS_PATTERN, and some OFUNC_SPEC */ int applyopts(int fd, struct opt *opts, enum e_phase phase) { struct opt *opt; @@ -26,7 +60,7 @@ opt = opts; while (opt && opt->desc != ODESC_END) { if (opt->desc == ODESC_DONE || -@@ -3605,21 +3624,29 @@ int applyopts(int fd, struct opt *opts, +@@ -3605,21 +3628,29 @@ int applyopts(int fd, struct opt *opts, #ifdef HAVE_TERMIOS_ISPEED } else if (opt->desc->func == OFUNC_TERMIOS_SPEED) { diff --git a/security/amavis-stats/Makefile b/security/amavis-stats/Makefile index 5e905563b60..97ba1491b68 100644 --- a/security/amavis-stats/Makefile +++ b/security/amavis-stats/Makefile @@ -3,7 +3,7 @@ PORTNAME= amavis-stats PORTVERSION= 0.1.12 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= security MASTER_SITES= LOCAL/feld diff --git a/security/fwknop/Makefile b/security/fwknop/Makefile index 2ad44a1ceef..148a0787965 100644 --- a/security/fwknop/Makefile +++ b/security/fwknop/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= fwknop -PORTVERSION= 2.6.7 +PORTVERSION= 2.6.8 CATEGORIES= security MASTER_SITES= http://www.cipherdyne.org/fwknop/download/ @@ -41,4 +41,8 @@ PF_CONFIGURE_WITH= pf=/sbin/pfctl GPGME_LIB_DEPENDS= libgpgme.so:security/gpgme GPGME_CONFIGURE_WITH= gpgme +post-stage: + (cd ${STAGEDIR}${PREFIX}/etc/fwknop && ${MV} access.conf access.conf.sample) + (cd ${STAGEDIR}${PREFIX}/etc/fwknop && ${MV} fwknopd.conf fwknopd.conf.sample) + .include diff --git a/security/fwknop/distinfo b/security/fwknop/distinfo index fa5c76b64cd..9ca96e017cb 100644 --- a/security/fwknop/distinfo +++ b/security/fwknop/distinfo @@ -1,2 +1,2 @@ -SHA256 (fwknop-2.6.7.tar.gz) = ed6f8cfbda6dc76a56a994465188b49419267492ebc6d5328e0947479bd2714b -SIZE (fwknop-2.6.7.tar.gz) = 1919401 +SHA256 (fwknop-2.6.8.tar.gz) = 5999c2cffd231caf3082a5169fbac2f4a3f5db8309355c5615c98998718198ff +SIZE (fwknop-2.6.8.tar.gz) = 1925130 diff --git a/security/fwknop/pkg-plist b/security/fwknop/pkg-plist index c72d294fc5d..5c355bfcc07 100644 --- a/security/fwknop/pkg-plist +++ b/security/fwknop/pkg-plist @@ -1,11 +1,11 @@ bin/fwknop -%%ETCDIR%%/access.conf -%%ETCDIR%%/fwknopd.conf +@sample %%ETCDIR%%/access.conf.sample +@sample %%ETCDIR%%/fwknopd.conf.sample include/fko.h lib/libfko.a lib/libfko.so lib/libfko.so.2 -lib/libfko.so.2.0.3 +lib/libfko.so.2.0.4 man/man8/fwknop.8.gz man/man8/fwknopd.8.gz sbin/fwknopd diff --git a/security/p5-CryptX/Makefile b/security/p5-CryptX/Makefile index 3f5286966f9..0f137f3bb83 100644 --- a/security/p5-CryptX/Makefile +++ b/security/p5-CryptX/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= CryptX -PORTVERSION= 0.030 +PORTVERSION= 0.031 CATEGORIES= security perl5 MASTER_SITES= CPAN/Crypt PKGNAMEPREFIX= p5- diff --git a/security/p5-CryptX/distinfo b/security/p5-CryptX/distinfo index 23dff790c70..6f7f0249da2 100644 --- a/security/p5-CryptX/distinfo +++ b/security/p5-CryptX/distinfo @@ -1,2 +1,2 @@ -SHA256 (CryptX-0.030.tar.gz) = b0e26b4c4de66134f1f1ae4227fdd18cf10f95cecc64a651a8af2710ef7519e5 -SIZE (CryptX-0.030.tar.gz) = 1175887 +SHA256 (CryptX-0.031.tar.gz) = 7221a7a824ae07377f7e97c6daafff47524c46204c9b8ff58420a13fc2c104f1 +SIZE (CryptX-0.031.tar.gz) = 1180903 diff --git a/security/py-kerberos/Makefile b/security/py-kerberos/Makefile index b3923e16243..06eecc40e96 100644 --- a/security/py-kerberos/Makefile +++ b/security/py-kerberos/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= kerberos -PORTVERSION= 1.1.1 -PORTREVISION= 2 +PORTVERSION= 1.2.4 CATEGORIES= security python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -32,7 +31,7 @@ GSSAPI_BASE_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src_kerberosbasic.h \ GSSAPI_HEIMDAL_EXTRA_PATCHES= ${GSSAPI_BASE_EXTRA_PATCHES} post-patch: - @${REINPLACE_CMD} -e 's|commands.getoutput("krb5-config|commands.getoutput("${GSSAPIBASEDIR}/bin/krb5-config|g' ${WRKSRC}/setup.py + @${REINPLACE_CMD} -e 's|getoutput("krb5-config|getoutput("${GSSAPIBASEDIR}/bin/krb5-config|g' ${WRKSRC}/setup.py post-install: ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/kerberos.so diff --git a/security/py-kerberos/distinfo b/security/py-kerberos/distinfo index 50cbebcc751..59e4a1260f4 100644 --- a/security/py-kerberos/distinfo +++ b/security/py-kerberos/distinfo @@ -1,2 +1,2 @@ -SHA256 (kerberos-1.1.1.tar.gz) = 09132e3b2027854e8714894546aff11f31e6051eb75513e774948e10a5dde6f5 -SIZE (kerberos-1.1.1.tar.gz) = 15343 +SHA256 (kerberos-1.2.4.tar.gz) = d6f49923bbcf4ebc47ae47b7ceac7866543200669e1dfb24821221da3e940987 +SIZE (kerberos-1.2.4.tar.gz) = 19615 diff --git a/security/py-kerberos/files/extra-patch-src_kerberosgss.c b/security/py-kerberos/files/extra-patch-src_kerberosgss.c index ba7d091643e..0b9e4f7d78a 100644 --- a/security/py-kerberos/files/extra-patch-src_kerberosgss.c +++ b/security/py-kerberos/files/extra-patch-src_kerberosgss.c @@ -1,6 +1,6 @@ ---- src/kerberosgss.c.orig 2015-03-29 03:40:20 UTC +--- src/kerberosgss.c.orig 2016-01-25 17:51:33 UTC +++ src/kerberosgss.c -@@ -38,7 +38,7 @@ char* server_principal_details(const cha +@@ -43,7 +43,7 @@ char* server_principal_details(const cha int code; krb5_context kcontext; krb5_keytab kt = NULL; @@ -9,9 +9,9 @@ krb5_keytab_entry entry; char* pname = NULL; -@@ -81,13 +81,13 @@ char* server_principal_details(const cha - { - result = malloc(strlen(pname) + 1); +@@ -98,13 +98,13 @@ char* server_principal_details(const cha + goto end; + } strcpy(result, pname); - krb5_free_unparsed_name(kcontext, pname); - krb5_free_keytab_entry_contents(kcontext, &entry); @@ -26,14 +26,15 @@ + krb5_kt_free_entry(kcontext, &entry); } - if (result == NULL) -@@ -97,8 +97,7 @@ char* server_principal_details(const cha + if (result == NULL) { +@@ -115,9 +115,7 @@ char* server_principal_details(const cha } end: -- if (cursor) +- if (cursor) { - krb5_kt_end_seq_get(kcontext, kt, &cursor); +- } + krb5_kt_end_seq_get(kcontext, kt, &cursor); - if (kt) + if (kt) { krb5_kt_close(kcontext, kt); - krb5_free_context(kcontext); + } diff --git a/security/sqlninja/Makefile b/security/sqlninja/Makefile index 0ed5c225fe0..21b226b8165 100644 --- a/security/sqlninja/Makefile +++ b/security/sqlninja/Makefile @@ -20,6 +20,7 @@ RUN_DEPENDS= p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL \ USES= perl5 tar:tgz NO_BUILD= yes +NO_ARCH= yes OPTIONS_DEFINE= DOCS @@ -27,18 +28,20 @@ do-install: ${MKDIR} ${STAGEDIR}${ETCDIR} ${MKDIR} ${STAGEDIR}${ETCDIR}/scripts ${MKDIR} ${STAGEDIR}${ETCDIR}/apps -. for i in sqlninja - ${INSTALL_SCRIPT} ${WRKSRC}/${i} ${STAGEDIR}${PREFIX}/bin -. endfor -. for i in churrasco.scr dnstun.scr nc.scr - ${INSTALL_SCRIPT} ${WRKSRC}/scripts/${i} ${STAGEDIR}${ETCDIR}/scripts -. endfor -. for i in churrasco.exe dnstun.exe nc.exe - ${INSTALL_SCRIPT} ${WRKSRC}/apps/${i} ${STAGEDIR}${ETCDIR}/apps -. endfor - ${MKDIR} ${STAGEDIR}${DOCSDIR} -. for i in sqlninja-howto.html sqlninja.conf.example - ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR} -. endfor +.for i in sqlninja + ${INSTALL_SCRIPT} ${WRKSRC}/${i} ${STAGEDIR}${PREFIX}/bin +.endfor +.for i in churrasco.scr dnstun.scr nc.scr + ${INSTALL_SCRIPT} ${WRKSRC}/scripts/${i} ${STAGEDIR}${ETCDIR}/scripts +.endfor +.for i in churrasco.exe dnstun.exe nc.exe + ${INSTALL_SCRIPT} ${WRKSRC}/apps/${i} ${STAGEDIR}${ETCDIR}/apps +.endfor + +do-install-DOCS-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR} +.for i in sqlninja-howto.html sqlninja.conf.example + ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR} +.endfor .include diff --git a/security/sshguard/Makefile b/security/sshguard/Makefile index 7d8e6471cb6..e9b689d7135 100644 --- a/security/sshguard/Makefile +++ b/security/sshguard/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= sshguard -PORTVERSION= 1.6.3 +PORTVERSION= 1.6.4 PORTREVISION= 1 CATEGORIES= security MASTER_SITES= SF/sshguard/sshguard/${PORTVERSION} diff --git a/security/sshguard/distinfo b/security/sshguard/distinfo index ef6527cb3ec..d951fbd04bc 100644 --- a/security/sshguard/distinfo +++ b/security/sshguard/distinfo @@ -1,2 +1,2 @@ -SHA256 (sshguard-1.6.3.tar.gz) = 6c4d3be2acf6349b4ac5d6fff4bbcd8fa988c82876d848cbbd0c7c99bc0438c7 -SIZE (sshguard-1.6.3.tar.gz) = 540130 +SHA256 (sshguard-1.6.4.tar.gz) = 654d5412ed010e500e2715ddeebfda57ab23c47a2bd30dfdc1e68c4f04c912a9 +SIZE (sshguard-1.6.4.tar.gz) = 546934 diff --git a/security/sshguard/files/patch-man_sshguard.8 b/security/sshguard/files/patch-man_sshguard.8 new file mode 100644 index 00000000000..d4dd54b4543 --- /dev/null +++ b/security/sshguard/files/patch-man_sshguard.8 @@ -0,0 +1,27 @@ +--- man/sshguard.8.orig 2016-03-17 08:01:48 UTC ++++ man/sshguard.8 +@@ -84,7 +84,7 @@ at \fI\%http://www.sshguard.net/\fP\&. + .SH OPTIONS + .INDENT 0.0 + .TP +-.B \fB\-a\fP \fIthresh\fP (default 40) ++.B \fB\-a\fP \fIthresh\fP (default 30) + Block an attacker when its dangerousness exceeds \fIthresh\fP\&. Each attack + pattern that is matched contributes a fixed dangerousness of 10. + .TP +@@ -112,13 +112,13 @@ monitor instead. \fBsshguard\fP transpar + using this option, standard input is ignored, but can be re\-added by + giving \(aq\fB\-l\fP \-\(aq. + .TP +-.B \fB\-p\fP \fIinterval\fP (default 420 secs, or 7 minutes) ++.B \fB\-p\fP \fIinterval\fP (default 120 secs, or 2 minutes) + Wait at least \fIinterval\fP seconds before releasing a blocked address. + Repeat attackers are blocked for 1.5 times longer after each attack. + Because \fBsshguard\fP unblocks attackers only at infrequent intervals, + this parameter is inexact (actual blocks will be longer). + .TP +-.B \fB\-s\fP \fIinterval\fP (default 1200 secs, or 20 minutes) ++.B \fB\-s\fP \fIinterval\fP (default 1800 secs, or 30 minutes) + Forget about an attacker \fIinterval\fP seconds after its last attempt. Its + dangerousness will be reset to zero. + .TP diff --git a/security/sshguard/files/patch-src_sshguard__logsuck.c b/security/sshguard/files/patch-src_sshguard__logsuck.c deleted file mode 100644 index 58d086caf82..00000000000 --- a/security/sshguard/files/patch-src_sshguard__logsuck.c +++ /dev/null @@ -1,36 +0,0 @@ ---- src/sshguard_logsuck.c.orig 2015-08-19 16:11:25 UTC -+++ src/sshguard_logsuck.c -@@ -92,8 +92,6 @@ int logsuck_add_logsource(const char *re - return -1; - } - -- sshguard_log(LOG_DEBUG, "Adding '%s' to polled files.", filename); -- - /* store filename */ - strcpy(cursource.filename, filename); - -@@ -185,7 +183,6 @@ int logsuck_getline(char *restrict buf, - } - } - /* no data. Wait for something with exponential backoff, up to LOGSUCK_MAX_WAIT */ -- sshguard_log(LOG_DEBUG, "Sleeping %d ms before next poll.", sleep_interval); - usleep(sleep_interval * 1000); - /* update sleep interval for next call */ - if (sleep_interval < MAX_LOGPOLL_INTERVAL) { -@@ -274,7 +271,6 @@ static int refresh_files() { - ++numchanged; - if (! myentry->active) { - /* entry was inactive, now available. Resume it */ -- sshguard_log(LOG_NOTICE, "Source '%s' reappeared. Reloading.", myentry->filename); - } else { - /* rotated (ie myentry->current_serial_number != fileinfo.st_ino) */ - sshguard_log(LOG_NOTICE, "Reloading rotated file %s.", myentry->filename); -@@ -285,8 +281,6 @@ static int refresh_files() { - /* descriptor and source ready! */ - } - list_iterator_stop(& sources_list); -- -- sshguard_log(LOG_INFO, "Refreshing sources showed %u changes.", numchanged); - return 0; - } - diff --git a/security/sshguard/files/pkg-message.in b/security/sshguard/files/pkg-message.in index 07566e27748..2443827eb64 100644 --- a/security/sshguard/files/pkg-message.in +++ b/security/sshguard/files/pkg-message.in @@ -7,4 +7,11 @@ rc.d script installed at %%PREFIX%%/etc/rc.d/sshguard . See sshguard(8) and http://www.sshguard.net/docs/setup for additional info. + + Please note that a few rc script parameters have been renamed to + better reflect the documentation: + + sshguard_safety_thresh -> sshguard_danger_thresh + sshguard_pardon_min_interval -> sshguard_release_interval + sshguard_prescribe_interval -> sshguard_reset_interval ########################################################################## diff --git a/security/sshguard/files/sshguard.in b/security/sshguard/files/sshguard.in index a9cb8613926..6f54496c39a 100644 --- a/security/sshguard/files/sshguard.in +++ b/security/sshguard/files/sshguard.in @@ -37,21 +37,24 @@ # Add the following lines to /etc/rc.conf to enable sshguard: # sshguard_enable (bool): Set to "NO" by default. # Set it to "YES" to enable sshguard +# sshguard_pidfile (str): Path to PID file. +# Set to "/var/run/sshguard.pid" by default # sshguard_watch_logs (str): Colon splitted list of logs to watch. # Set to "/var/log/auth.log:/var/log/maillog" # by default. # The following options directly maps to their command line options, # please read manual page sshguard(8) for detailed information: # sshguard_blacklist (str): [thr:]/path/to/blacklist. -# Set to "40:/var/db/sshguard/blacklist.db" +# Set to "30:/var/db/sshguard/blacklist.db" # by default. -# sshguard_safety_thresh (int): Safety threshold. Set to "40" by default. -# sshguard_pardon_min_interval (int): -# Minimum pardon interval. Set to "420" -# by default. -# sshguard_prescribe_interval (int): -# Prescribe interval. Set to "1200" by -# default. +# sshguard_danger_thresh (int): Danger threshold. Set to "30" by default. +# sshguard_release_interval (int): +# Minimum interval an address remains +# blocked. Set to "120" by default. +# sshguard_reset_interval (int): +# Interval before a suspected attack is +# forgotten and danger is reset to 0. +# Set to "1800" by default. # sshguard_whitelistfile (str): Path to the whitelist. # Set to "%%PREFIX%%/etc/sshguard.whitelist" # by default. @@ -67,18 +70,20 @@ rcvar=sshguard_enable load_rc_config sshguard : ${sshguard_enable:=NO} -: ${sshguard_blacklist=40:/var/db/sshguard/blacklist.db} -: ${sshguard_safety_thresh=40} -: ${sshguard_pardon_min_interval=420} -: ${sshguard_prescribe_interval=1200} +: ${sshguard_blacklist=30:/var/db/sshguard/blacklist.db} +: ${sshguard_danger_thresh=30} +: ${sshguard_release_interval=120} +: ${sshguard_reset_interval=1800} : ${sshguard_whitelistfile="%%PREFIX%%/etc/sshguard.whitelist"} : ${sshguard_watch_logs=/var/log/auth.log:/var/log/maillog} +pidfile=${sshguard_pidfile:="/var/run/sshguard.pid"} + command=/usr/sbin/daemon actual_command="%%PREFIX%%/sbin/sshguard" procname="${actual_command}" start_precmd=sshguard_prestart -command_args="-c ${actual_command} \${sshguard_flags} \${sshguard_blacklist_params} \${sshguard_watch_params} -a ${sshguard_safety_thresh} -p ${sshguard_pardon_min_interval} -s ${sshguard_prescribe_interval} -w ${sshguard_whitelistfile}" +command_args="-c ${actual_command} \${sshguard_flags} \${sshguard_blacklist_params} \${sshguard_watch_params} -a ${sshguard_danger_thresh} -p ${sshguard_release_interval} -s ${sshguard_reset_interval} -w ${sshguard_whitelistfile} -i ${pidfile}" sshguard_prestart() { diff --git a/sysutils/backuppc-devel/Makefile b/sysutils/backuppc-devel/Makefile index 41cb4cdb3ee..fb4fd4c694d 100644 --- a/sysutils/backuppc-devel/Makefile +++ b/sysutils/backuppc-devel/Makefile @@ -3,7 +3,7 @@ PORTNAME= backuppc DISTVERSION= 4.0.0alpha3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= sysutils MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-beta/${DISTVERSION} PKGNAMESUFFIX= -devel diff --git a/sysutils/backuppc/Makefile b/sysutils/backuppc/Makefile index 1dbeb86c5ab..7aa70906bb2 100644 --- a/sysutils/backuppc/Makefile +++ b/sysutils/backuppc/Makefile @@ -3,6 +3,7 @@ PORTNAME= backuppc PORTVERSION= 3.3.1 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= SF DISTNAME= BackupPC-${PORTVERSION} diff --git a/sysutils/ganglia-monitor-core/Makefile b/sysutils/ganglia-monitor-core/Makefile index afd2b51c8e4..043aa8b7496 100644 --- a/sysutils/ganglia-monitor-core/Makefile +++ b/sysutils/ganglia-monitor-core/Makefile @@ -2,6 +2,7 @@ PORTNAME= monitor-core PORTVERSION= 3.6.0 +PORTREVISION= 1 CATEGORIES= sysutils net MASTER_SITES= SF/ganglia/ganglia%20monitoring%20core/${PORTVERSION} PKGNAMEPREFIX= ganglia- diff --git a/sysutils/monitorix/Makefile b/sysutils/monitorix/Makefile index 9047f809b14..e9b5610d96f 100644 --- a/sysutils/monitorix/Makefile +++ b/sysutils/monitorix/Makefile @@ -2,7 +2,7 @@ PORTNAME= monitorix PORTVERSION= 3.5.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= sysutils MASTER_SITES= http://www.monitorix.org/ \ http://www.monitorix.org/old_versions/ \ diff --git a/sysutils/munin-master/Makefile b/sysutils/munin-master/Makefile index 54e33894b39..462aa8a96a7 100644 --- a/sysutils/munin-master/Makefile +++ b/sysutils/munin-master/Makefile @@ -3,7 +3,7 @@ PORTNAME= munin PORTVERSION= ${MUNIN_VERSION} -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= sysutils perl5 MASTER_SITES= ${MUNIN_SITES} PKGNAMESUFFIX= -master diff --git a/sysutils/slurm-wlm/Makefile b/sysutils/slurm-wlm/Makefile index c55ae2271b2..f83d1a4048f 100644 --- a/sysutils/slurm-wlm/Makefile +++ b/sysutils/slurm-wlm/Makefile @@ -3,7 +3,7 @@ PORTNAME= slurm PORTVERSION= 15.08.10 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils MASTER_SITES= http://www.schedmd.com/download/latest/ \ http://www.schedmd.com/download/archive/ \ diff --git a/sysutils/symon/Makefile b/sysutils/symon/Makefile index 94021f38d98..9490e0602db 100644 --- a/sysutils/symon/Makefile +++ b/sysutils/symon/Makefile @@ -3,7 +3,7 @@ PORTNAME= symon PORTVERSION= 2.86 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= sysutils MASTER_SITES= http://wpd.home.xs4all.nl/symon/philes/ \ LOCAL/uqs diff --git a/sysutils/vm-bhyve/Makefile b/sysutils/vm-bhyve/Makefile index 50cf3a96877..78153d4e117 100644 --- a/sysutils/vm-bhyve/Makefile +++ b/sysutils/vm-bhyve/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= vm-bhyve -PORTVERSION= 1.0 +PORTVERSION= 1.0.1 DISTVERSIONPREFIX=v CATEGORIES= sysutils diff --git a/sysutils/vm-bhyve/distinfo b/sysutils/vm-bhyve/distinfo index ba9289094c2..e0353b9296e 100644 --- a/sysutils/vm-bhyve/distinfo +++ b/sysutils/vm-bhyve/distinfo @@ -1,2 +1,2 @@ -SHA256 (churchers-vm-bhyve-v1.0_GH0.tar.gz) = b66ecb134559206bb20c4a2598a8193568263962329165c774c36ffef71ecd60 -SIZE (churchers-vm-bhyve-v1.0_GH0.tar.gz) = 48896 +SHA256 (churchers-vm-bhyve-v1.0.1_GH0.tar.gz) = dd8df8c1c58f48a3fede53cb29aae6ebe76da59822c3462f912e3440c984c567 +SIZE (churchers-vm-bhyve-v1.0.1_GH0.tar.gz) = 48873 diff --git a/sysutils/xdu/Makefile b/sysutils/xdu/Makefile index 6b1cc982657..8d5b326d2a5 100644 --- a/sysutils/xdu/Makefile +++ b/sysutils/xdu/Makefile @@ -13,7 +13,7 @@ USE_GITHUB= yes GH_ACCOUNT= vlasovskikh GH_PROJECT= xdu -USES= imake tar +USES= imake USE_XORG= ice sm x11 xaw xext xmu xpm xt PLIST_FILES= bin/xdu lib/X11/app-defaults/XDu man/man1/xdu.1.gz diff --git a/textproc/luceneplusplus/Makefile b/textproc/luceneplusplus/Makefile index 60ed4e27ac8..b8019083a12 100644 --- a/textproc/luceneplusplus/Makefile +++ b/textproc/luceneplusplus/Makefile @@ -23,9 +23,10 @@ USE_LDCONFIG= yes .include -.if ${COMPILER_TYPE} == gcc -EXTRA_PATCHES= ${FILESDIR}/extra-patch-CMakeLists.txt -.endif +post-patch: + ${REINPLACE_CMD} "/cotire/d" ${WRKSRC}/src/contrib/CMakeLists.txt \ + ${WRKSRC}/src/core/CMakeLists.txt \ + ${WRKSRC}/src/test/CMakeLists.txt post-install: cd ${WRKSRC}/include &&${INSTALL_DATA} *.h \ diff --git a/textproc/luceneplusplus/files/extra-patch-CMakeLists.txt b/textproc/luceneplusplus/files/extra-patch-CMakeLists.txt deleted file mode 100644 index c9d24dd4406..00000000000 --- a/textproc/luceneplusplus/files/extra-patch-CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- CMakeLists.txt.orig 2015-01-30 17:14:22.000000000 +0100 -+++ CMakeLists.txt 2015-05-26 18:05:53.000000000 +0200 -@@ -20,6 +20,8 @@ - #################################### - include(cotire) - -+set_property(GLOBAL PROPERTY COTIRE_ENABLE_PRECOMPILED_HEADER FALSE) -+ - # if setup using the Toolchain-llvm.cmake file, then use llvm... - if(ENABLE_LLVM) - include(Toolchain-llvm) diff --git a/textproc/luceneplusplus/files/patch-CMakeLists.txt b/textproc/luceneplusplus/files/patch-CMakeLists.txt index ff82cbb84f6..fa051b25a0c 100644 --- a/textproc/luceneplusplus/files/patch-CMakeLists.txt +++ b/textproc/luceneplusplus/files/patch-CMakeLists.txt @@ -1,6 +1,14 @@ ---- CMakeLists.txt.orig 2015-02-25 13:04:40.000000000 +0100 -+++ CMakeLists.txt 2015-02-25 13:05:18.000000000 +0100 -@@ -168,7 +168,7 @@ +--- CMakeLists.txt.orig 2015-01-30 17:14:22.000000000 +0100 ++++ CMakeLists.txt 2016-04-29 17:50:01.000000000 +0200 +@@ -18,7 +18,6 @@ + #################################### + # pre-compiled headers support + #################################### +-include(cotire) + + # if setup using the Toolchain-llvm.cmake file, then use llvm... + if(ENABLE_LLVM) +@@ -168,7 +167,7 @@ FILES "${CMAKE_CURRENT_BINARY_DIR}/liblucene++.pc" "${CMAKE_CURRENT_BINARY_DIR}/liblucene++-contrib.pc" diff --git a/textproc/ml1/Makefile b/textproc/ml1/Makefile index 71809573481..6fd9537065f 100644 --- a/textproc/ml1/Makefile +++ b/textproc/ml1/Makefile @@ -2,13 +2,13 @@ # $FreeBSD$ PORTNAME= ml1 -PORTVERSION= 4.10 +PORTVERSION= 4.11 CATEGORIES= textproc MASTER_SITES= http://www.ml1.org.uk/tgz/ \ - http://www.tavi.co.uk/tgz/ + http://www.ancientgeek.org.uk/tgz/ MAINTAINER= bob@eager.cx -COMMENT= The original general purpose macro processor +COMMENT= Original general purpose macro processor PLIST_FILES= bin/ml1 man/man1/ml1.1.gz diff --git a/textproc/ml1/distinfo b/textproc/ml1/distinfo index fa4a504c074..50c3123272e 100644 --- a/textproc/ml1/distinfo +++ b/textproc/ml1/distinfo @@ -1,2 +1,2 @@ -SHA256 (ml1-4.10.tar.gz) = 479be18b41baa0f4bf6fca504a821365caf6e0e122433bd0679aad91dee86807 -SIZE (ml1-4.10.tar.gz) = 74904 +SHA256 (ml1-4.11.tar.gz) = d52cf77df8340f944f9cfa7d3ed37d37f19ac648db86feceda2175c915d1615d +SIZE (ml1-4.11.tar.gz) = 37706 diff --git a/textproc/sk-mythes/Makefile b/textproc/sk-mythes/Makefile index c90adc7be68..dda6deb511a 100644 --- a/textproc/sk-mythes/Makefile +++ b/textproc/sk-mythes/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= mythes -PORTVERSION= 2016.04.24 +PORTVERSION= 2016.05.01 CATEGORIES= textproc MASTER_SITES= LOCAL/sunpoet/${PORTNAME}/ PKGNAMEPREFIX= sk- diff --git a/textproc/sk-mythes/distinfo b/textproc/sk-mythes/distinfo index 96abdb81a69..4e518f4ea25 100644 --- a/textproc/sk-mythes/distinfo +++ b/textproc/sk-mythes/distinfo @@ -1,2 +1,2 @@ -SHA256 (mythes/OOo-Thesaurus2-sk_SK-20160424.zip) = 82fbd41914084e9619ccb96ee2f3650b3d9e7e15fd3e18ce1ecd0cec274d2d6c -SIZE (mythes/OOo-Thesaurus2-sk_SK-20160424.zip) = 239537 +SHA256 (mythes/OOo-Thesaurus2-sk_SK-20160501.zip) = c9cc032f1a709f22ebd6841527bd4d2bfac8834d329cd5879a918a38a45eb0a5 +SIZE (mythes/OOo-Thesaurus2-sk_SK-20160501.zip) = 239537 diff --git a/textproc/sl-mythes/Makefile b/textproc/sl-mythes/Makefile index b7f297973fe..de411e70383 100644 --- a/textproc/sl-mythes/Makefile +++ b/textproc/sl-mythes/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= mythes -PORTVERSION= 2016.04.24 +PORTVERSION= 2016.05.01 CATEGORIES= textproc MASTER_SITES= LOCAL/sunpoet/${PORTNAME}/ PKGNAMEPREFIX= sl- diff --git a/textproc/sl-mythes/distinfo b/textproc/sl-mythes/distinfo index d7a03a3c9cc..94e97001b41 100644 --- a/textproc/sl-mythes/distinfo +++ b/textproc/sl-mythes/distinfo @@ -1,2 +1,2 @@ -SHA256 (mythes/thes_sl_SI_v2-20160424.zip) = 4842ede1366177b93f7714cc6b55afb2e5572eed0c5ff55252fd21eb74d5a23d -SIZE (mythes/thes_sl_SI_v2-20160424.zip) = 386932 +SHA256 (mythes/thes_sl_SI_v2-20160501.zip) = 6ea1f4fdfdb6cb387f15f178d6d4fc9e0bbff44057fdf7264e381056e48f9e90 +SIZE (mythes/thes_sl_SI_v2-20160501.zip) = 386932 diff --git a/www/Makefile b/www/Makefile index 31774c7690a..ad392d8e939 100644 --- a/www/Makefile +++ b/www/Makefile @@ -2073,9 +2073,9 @@ SUBDIR += smarty3 SUBDIR += smb_auth SUBDIR += snarf - SUBDIR += sogo + SUBDIR += sogo2 SUBDIR += sogo3 - SUBDIR += sogo-activesync + SUBDIR += sogo2-activesync SUBDIR += sogo3-activesync SUBDIR += spawn-fcgi SUBDIR += spdylay diff --git a/www/cherokee/Makefile b/www/cherokee/Makefile index 5565c05302f..da9b3d7ba8a 100644 --- a/www/cherokee/Makefile +++ b/www/cherokee/Makefile @@ -3,6 +3,7 @@ PORTNAME= cherokee PORTVERSION= 1.2.104 +PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= www diff --git a/www/drraw/Makefile b/www/drraw/Makefile index 9de46d6d8e2..e969a4e3aa3 100644 --- a/www/drraw/Makefile +++ b/www/drraw/Makefile @@ -3,7 +3,7 @@ PORTNAME= drraw DISTVERSION= 2.2b2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www MASTER_SITES= http://web.taranis.org/drraw/dist/ \ http://christianserving.org/ports/mail/imapsync/ diff --git a/www/mod_http2-devel/Makefile b/www/mod_http2-devel/Makefile index 7f5da7c1701..bf8bb6769d8 100644 --- a/www/mod_http2-devel/Makefile +++ b/www/mod_http2-devel/Makefile @@ -2,12 +2,12 @@ # $FreeBSD$ PORTNAME= mod_http2-devel -PORTVERSION= 1.2.8 +PORTVERSION= 1.5.2 DISTVERSIONPREFIX= v CATEGORIES= www MAINTAINER= brnrd@FreeBSD.org -COMMENT= Early experience HTTP/2 module for Apache httpd +COMMENT= Early experience HTTP/2 modules for Apache httpd LICENSE= APACHE20 @@ -19,6 +19,7 @@ GH_ACCOUNT= icing GH_PROJECT= mod_h2 USES= autoreconf libtool +USE_OPENSSL= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --program-prefix=ext- CONFIGURE_ENV= CONFIG_SHELL=/bin/sh @@ -29,13 +30,21 @@ MODULENAME= ${GH_PROJECT} CFLAGS+= -I${LOCALBASE}/include CPPFLAGS+= -I${LOCALBASE}/include +PORTDOCS= README README.md +PLIST_FILES= ${APACHEMODDIR}/mod_h2.so \ + ${APACHEMODDIR}/mod_proxy_h2.so + post-install: # Rename mod_http2 to mod_h2 to avoid conflict with Apache24 ${MV} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}/mod_http2.so.0.0.0 \ ${STAGEDIR}${PREFIX}/${APACHEMODDIR}/${MODULENAME}.so + ${MV} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}/mod_proxy_http2.so.0.0.0 \ + ${STAGEDIR}${PREFIX}/${APACHEMODDIR}/mod_proxy_h2.so ${RM} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}/mod_http2.so - ${MV} ${STAGEDIR}${PORTDOCS}${PREFIX}/share/doc/mod_http2 \ - ${STAGEDIR}${PORTDOCS}${DOCSDIR} + ${RM} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}/mod_proxy_http2.so + ${MV} ${STAGEDIR}${PREFIX}/share/doc/mod_http2 \ + ${STAGEDIR}${DOCSDIR} ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}/${MODULENAME}.so + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}/mod_proxy_h2.so .include diff --git a/www/mod_http2-devel/distinfo b/www/mod_http2-devel/distinfo index 288b81c9a60..8bfbe760ad1 100644 --- a/www/mod_http2-devel/distinfo +++ b/www/mod_http2-devel/distinfo @@ -1,2 +1,2 @@ -SHA256 (icing-mod_h2-v1.2.8_GH0.tar.gz) = d71f5ec197bb739bc551441325b9a52b35e437e5b93e7f3423cacf49105bc3fa -SIZE (icing-mod_h2-v1.2.8_GH0.tar.gz) = 139448 +SHA256 (icing-mod_h2-v1.5.2_GH0.tar.gz) = f2c801c6fbe080083f6fcf42792efad77f6fbb71de6d7d2fdfd332965978891a +SIZE (icing-mod_h2-v1.5.2_GH0.tar.gz) = 175483 diff --git a/www/mod_http2-devel/pkg-plist b/www/mod_http2-devel/pkg-plist deleted file mode 100644 index 8ee43f12ff1..00000000000 --- a/www/mod_http2-devel/pkg-plist +++ /dev/null @@ -1,3 +0,0 @@ -%%APACHEMODDIR%%/%%AP_MODULE%% -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/README.md diff --git a/www/p5-Catalyst-View-RRDGraph/Makefile b/www/p5-Catalyst-View-RRDGraph/Makefile index 6c79b923a93..f631f6ad0bc 100644 --- a/www/p5-Catalyst-View-RRDGraph/Makefile +++ b/www/p5-Catalyst-View-RRDGraph/Makefile @@ -2,7 +2,7 @@ PORTNAME= Catalyst-View-RRDGraph PORTVERSION= 0.10 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/www/rubygem-responders/Makefile b/www/rubygem-responders/Makefile index 9384bc3dfe6..ea7e33feea4 100644 --- a/www/rubygem-responders/Makefile +++ b/www/rubygem-responders/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= responders -PORTVERSION= 2.1.2 +PORTVERSION= 2.2.0 CATEGORIES= www rubygems MASTER_SITES= RG diff --git a/www/rubygem-responders/distinfo b/www/rubygem-responders/distinfo index 8c9b33f2947..d416d217c12 100644 --- a/www/rubygem-responders/distinfo +++ b/www/rubygem-responders/distinfo @@ -1,2 +1,2 @@ -SHA256 (rubygem/responders-2.1.2.gem) = d0a14283c1967b8144f1f4b89412f4a98061760ad7aa84c0004048dedc9db47c -SIZE (rubygem/responders-2.1.2.gem) = 18432 +SHA256 (rubygem/responders-2.2.0.gem) = 2046c8cf2b1fc03522c8d9138c66f35b6014d729cfc6e878221e8933c126c627 +SIZE (rubygem/responders-2.2.0.gem) = 18944 diff --git a/www/sogo/distinfo b/www/sogo/distinfo deleted file mode 100644 index 18857e7da5f..00000000000 --- a/www/sogo/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (SOGo-2.3.8.tar.gz) = ae57518d29f256cee73ef29491f92c8d12289146924b07a827be5bb99f8f1bf6 -SIZE (SOGo-2.3.8.tar.gz) = 12200043 diff --git a/www/sogo/files/patch-SoObjects_SOGo_GNUmakefile b/www/sogo/files/patch-SoObjects_SOGo_GNUmakefile deleted file mode 100644 index 100787fc86d..00000000000 --- a/www/sogo/files/patch-SoObjects_SOGo_GNUmakefile +++ /dev/null @@ -1,12 +0,0 @@ ---- SoObjects/SOGo/GNUmakefile.orig 2015-09-16 18:41:36 UTC -+++ SoObjects/SOGo/GNUmakefile -@@ -203,7 +203,8 @@ ifneq ($(FHS_INSTALL_ROOT),) - GNUSTEP_HEADERS=$(DESTDIR)$(FHS_INSTALL_ROOT)/include - endif - GNUSTEP_TARGET_LDIR=sogo --include $(GNUSTEP_MAKEFILES)/framework.make -+ -+include master-framework.make - include $(GNUSTEP_MAKEFILES)/library.make - include $(GNUSTEP_MAKEFILES)/tool.make - -include GNUmakefile.postamble diff --git a/www/sogo/files/patch-SoObjects_SOGo_instance-framework.make b/www/sogo/files/patch-SoObjects_SOGo_instance-framework.make deleted file mode 100644 index de5f8079994..00000000000 --- a/www/sogo/files/patch-SoObjects_SOGo_instance-framework.make +++ /dev/null @@ -1,824 +0,0 @@ ---- SoObjects/SOGo/instance-framework.make.orig 2015-09-23 03:39:02 UTC -+++ SoObjects/SOGo/instance-framework.make -@@ -0,0 +1,821 @@ -+# -*-makefile-*- -+# Instance/framework.make -+# -+# Instance Makefile rules to build GNUstep-based frameworks. -+# -+# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2010 Free Software Foundation, Inc. -+# -+# Author: Mirko Viviani -+# Author: Nicola Pero -+# -+# This file is part of the GNUstep Makefile Package. -+# -+# This library is free software; you can redistribute it and/or -+# modify it under the terms of the GNU General Public License -+# as published by the Free Software Foundation; either version 3 -+# of the License, or (at your option) any later version. -+# -+# You should have received a copy of the GNU General Public -+# License along with this library; see the file COPYING. -+# If not, write to the Free Software Foundation, -+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ -+# Frameworks usually link against a gui library (if available). If -+# you don't need a gui library, use xxx_NEEDS_GUI = no. -+ifeq ($(NEEDS_GUI),) -+ NEEDS_GUI = yes -+endif -+ -+ifeq ($(RULES_MAKE_LOADED),) -+include $(GNUSTEP_MAKEFILES)/rules.make -+endif -+ -+.PHONY: internal-framework-all_ \ -+ build-framework \ -+ internal-framework-build-headers \ -+ build-framework-dirs \ -+ internal-framework-install_ \ -+ internal-framework-distclean \ -+ internal-framework-clean \ -+ internal-framework-uninstall_ \ -+ internal-framework-run-compile-submake \ -+ internal-framework-compile -+ -+# The name of the framework is in the FRAMEWORK_NAME variable. -+# The list of framework resource files are in xxx_RESOURCE_FILES -+# The list of framework web server resource files are in -+# xxx_WEBSERVER_RESOURCE_FILES -+# The list of localized framework resource files is in -+# xxx_LOCALIZED_RESOURCE_FILES -+# The list of localized framework web server resource files is in -+# xxx_WEBSERVER_LOCALIZED_RESOURCE_FILES -+# The list of framework GSWeb components are in xxx_COMPONENTS -+# The list of languages the framework supports is in xxx_LANGUAGES -+# The list of framework resource directories are in xxx_RESOURCE_DIRS -+# The list of framework subprojects directories are in xxx_SUBPROJECTS -+# The name of the principal class is xxx_PRINCIPAL_CLASS -+# The header files are in xxx_HEADER_FILES -+# The directory where the header files are located is xxx_HEADER_FILES_DIR -+# (defaults to ./) -+# The directory where to install the header files inside the library -+# installation directory is xxx_HEADER_FILES_INSTALL_DIR -+# (defaults to the framework name [without .framework]). Can't be `.' -+# The list of framework web server resource directories are in -+# xxx_WEBSERVER_RESOURCE_DIRS -+# The list of localized framework web server GSWeb components are in -+# xxx_WEBSERVER_LOCALIZED_RESOURCE_DIRS -+# xxx_CURRENT_VERSION_NAME is the compiled version name (default "0") -+# xxx_MAKE_CURRENT_VERSION is used to decide if the framework version -+# we compiling should be made the current/default version or not -+# (default is "yes") -+# -+# where xxx is the framework name -+# -+# -+# The HEADER_FILES_INSTALL_DIR might look somewhat weird - because in -+# most if not all cases, you want it to be the framework name. At the -+# moment, it allows you to put headers for framework XXX in directory -+# YYY, so that you can refer to them by using #include -+# rather than #include . It seems to -+# be mostly used to have a framework with name XXX work as a drop-in -+# replacement for another framework, which has name YYY -- and which -+# might be installed at the same time :-). -+# -+# If you want to insert your own entries into Info.plist (or -+# Info-gnustep.plist) you should create a xxxInfo.plist file (where -+# xxx is the framework name) and gnustep-make will automatically -+# read it and merge it into Info-gnustep.plist. -+# -+ -+# Set VERSION from xxx_VERSION -+ifneq ($($(GNUSTEP_INSTANCE)_VERSION),) -+ VERSION = $($(GNUSTEP_INSTANCE)_VERSION) -+endif -+ -+ifeq ($(VERSION),) -+ VERSION = 0.0.1 -+endif -+ -+# By setting xxx_INTERFACE_VERSION you can change the soversion used -+# when linking the library. See comments in library.make for the -+# variables with the same name for libraries. -+ifeq ($($(GNUSTEP_INSTANCE)_INTERFACE_VERSION),) -+ # By default, if VERSION is 1.0.0, INTERFACE_VERSION is 1 -+ INTERFACE_VERSION = $(word 1,$(subst ., ,$(VERSION))) -+else -+ INTERFACE_VERSION = $($(GNUSTEP_INSTANCE)_INTERFACE_VERSION) -+endif -+ -+# CURRENT_VERSION_NAME is the name of the version as used when -+# building the library structure. We recommend just using -+# INTERFACE_VERSION for that, so your resources and your shared -+# library have the same versioning. -+ -+# Warning - the following variable is also used in Master/rules.make -+# to build the OWNING_PROJECT_HEADER_DIR for the framework's -+# subprojects. Make sure you keep them in sync if you change them. -+CURRENT_VERSION_NAME = $($(GNUSTEP_INSTANCE)_CURRENT_VERSION_NAME) -+ifeq ($(CURRENT_VERSION_NAME),) -+ CURRENT_VERSION_NAME = $(INTERFACE_VERSION) -+endif -+ -+# xxx_MAKE_CURRENT_VERSION can be set to 'no' if you do not want the -+# framework version that we are building from becoming the Current -+# one. -+ifneq ($($(GNUSTEP_INSTANCE)_MAKE_CURRENT_VERSION),) -+ MAKE_CURRENT_VERSION = $($(GNUSTEP_INSTANCE)_MAKE_CURRENT_VERSION) -+endif -+ -+ifeq ($(MAKE_CURRENT_VERSION),) -+ MAKE_CURRENT_VERSION = yes -+endif -+ -+# If there are no working symlinks, common.make sets -+# FRAMEWORK_VERSION_SUPPORT to no, which unconditionally turn -+# versioning off. This means that we create no symlinks inside the -+# xxx.framework directory for the various versions; that everything is -+# put top-level as in the case of bundles. So with -+# FRAMEWORK_VERSION_SUPPORT = no, the Directory structure is: -+# -+# xxx.framework/libframework.dll.a -+# xxx.framework/framework.dll -+# xxx.framework/Resources -+# xxx.framework/Headers -+# -+# The Headers, libframework.dll.a and framework.dll are then copied into -+# the standard header/library locations so that they can be found by -+# compiler/linker. Given that there are no symlinks, there is no other -+# way of doing this. -+ifeq ($(FRAMEWORK_VERSION_SUPPORT),no) -+ MAKE_CURRENT_VERSION = no -+endif -+ -+# This is used on Apple to build frameworks which can be embedded into -+# applications. You usually set it to something like -+# @executable_path/../Frameworks and then you can embed the framework -+# in an application. -+DYLIB_INSTALL_NAME_BASE = $($(GNUSTEP_INSTANCE)_DYLIB_INSTALL_NAME_BASE) -+ -+FRAMEWORK_DIR_NAME = $(GNUSTEP_INSTANCE).framework -+FRAMEWORK_DIR = $(GNUSTEP_BUILD_DIR)/$(FRAMEWORK_DIR_NAME) -+ -+ifeq ($(FRAMEWORK_VERSION_SUPPORT), yes) -+ FRAMEWORK_VERSION_DIR_NAME = $(FRAMEWORK_DIR_NAME)/Versions/$(CURRENT_VERSION_NAME) -+else -+ FRAMEWORK_VERSION_DIR_NAME = $(FRAMEWORK_DIR_NAME) -+endif -+ -+FRAMEWORK_VERSION_DIR = $(GNUSTEP_BUILD_DIR)/$(FRAMEWORK_VERSION_DIR_NAME) -+ -+# This is not doing much at the moment, it is only defining -+# HEADER_FILES, HEADER_SUBDIRS, HEADER_FILES_DIR and -+# HEADER_FILES_INSTALL_DIR in the standard way. Please note that -+# HEADER_FILES might be empty even if we have headers in subprojects -+# that we need to manage and install. So we assume by default that we -+# have some headers even if HEADER_FILES is empty. -+include $(GNUSTEP_MAKEFILES)/Instance/Shared/headers.make -+ -+# On windows, this is unfortunately required. -+ifeq ($(BUILD_DLL), yes) -+ LINK_AGAINST_ALL_LIBS = yes -+endif -+ -+ifeq ($(LINK_AGAINST_ALL_LIBS), yes) -+ # Link against all libs ... but not the one we're compiling! (not sure -+ # when this could happen with frameworks, anyway it makes sense) -+ LIBRARIES_DEPEND_UPON += $(filter-out -l$(GNUSTEP_INSTANCE), $(ALL_LIBS)) -+endif -+ -+INTERNAL_LIBRARIES_DEPEND_UPON = \ -+ $(ALL_LIB_DIRS) \ -+ $(LIBRARIES_DEPEND_UPON) -+ -+ifeq ($(FOUNDATION_LIB),gnu) -+ -+ # On GNUstep, build our dummy class to store information which -+ # gnustep-base can find at run time. -+ -+ # An ObjC class name can not contain '-', but some people '-' this -+ # in framework names. So we need to encode the '-' in some way -+ # into an ObjC class name. (since we're there, we also encode '+' -+ # even if that's not really common). -+ -+ # What we do is, we use '_' as an escape character, and encode (in the -+ # order) as follows: -+ # -+ # '_' is converted to '__' -+ # '-' is converted to '_0' -+ # '+' is converted to '_1' -+ # -+ -+ # For example, 'Renaissance-Experimental' becomes -+ # 'Renaissance_0Experimental'. -+ -+ # GNUstep-base will convert the name back by applying the reverse rules -+ # in the reverse order. -+ -+ DUMMY_FRAMEWORK = NSFramework_$(subst +,_1,$(subst -,_0,$(subst _,__,$(GNUSTEP_INSTANCE)))) -+ DUMMY_FRAMEWORK_FILE = $(DERIVED_SOURCES_DIR)/$(DUMMY_FRAMEWORK).m -+ DUMMY_FRAMEWORK_OBJ_FILE = $(addprefix $(GNUSTEP_OBJ_INSTANCE_DIR)/,$(DUMMY_FRAMEWORK).o) -+ -+ # The following file will hold the list of classes compiled into the -+ # framework, ready to be included in the .plist file. We include the -+ # list of classes twice, in the object file itself (for when the -+ # framework is loaded) and in the .plist (for tools which let you -+ # browse in frameworks on disk and see lists of classes). Please note -+ # that reading the class list from the .plist requires gnustep-base to -+ # have properly located the framework bundle on disk, while reading -+ # the list from the object file itself does not (and so it's more -+ # likely to work in a portable way), which is why we still save the -+ # list in the object file rather than only putting it in the .plist. -+ # Maybe this point should be discarded, and we should only store the class -+ # list in the .plist file. -+ DUMMY_FRAMEWORK_CLASS_LIST = $(DERIVED_SOURCES_DIR)/$(GNUSTEP_INSTANCE)-class-list -+endif -+ -+FRAMEWORK_HEADER_FILES = $(addprefix $(FRAMEWORK_VERSION_DIR)/Headers/,$(HEADER_FILES)) -+FRAMEWORK_HEADER_SUBDIRS = $(addprefix $(FRAMEWORK_VERSION_DIR)/Headers/,$(HEADER_SUBDIRS)) -+ -+# FIXME - do we really those variables too ? -+ifeq ($(FRAMEWORK_VERSION_SUPPORT), yes) -+ FRAMEWORK_CURRENT_DIR_NAME = $(FRAMEWORK_DIR_NAME)/Versions/Current -+else -+ FRAMEWORK_CURRENT_DIR_NAME = $(FRAMEWORK_DIR_NAME) -+endif -+ -+FRAMEWORK_CURRENT_DIR = $(GNUSTEP_BUILD_DIR)/$(FRAMEWORK_CURRENT_DIR_NAME) -+FRAMEWORK_LIBRARY_DIR_NAME = $(FRAMEWORK_VERSION_DIR_NAME)/$(GNUSTEP_TARGET_LDIR) -+FRAMEWORK_LIBRARY_DIR = $(GNUSTEP_BUILD_DIR)/$(FRAMEWORK_LIBRARY_DIR_NAME) -+FRAMEWORK_CURRENT_LIBRARY_DIR_NAME = $(FRAMEWORK_CURRENT_DIR_NAME)/$(GNUSTEP_TARGET_LDIR) -+FRAMEWORK_CURRENT_LIBRARY_DIR = $(GNUSTEP_BUILD_DIR)/$(FRAMEWORK_CURRENT_LIBRARY_DIR_NAME) -+ -+ifneq ($(BUILD_DLL), yes) -+ -+FRAMEWORK_LIBRARY_FILE = lib$(GNUSTEP_INSTANCE)$(SHARED_LIBEXT) -+ifeq ($(findstring darwin, $(GNUSTEP_TARGET_OS)), darwin) -+# On Mac OS X the version number conventionally precedes the shared -+# library suffix, e.g., libgnustep-base.1.16.1.dylib. -+VERSION_FRAMEWORK_LIBRARY_FILE = lib$(GNUSTEP_INSTANCE).$(VERSION)$(SHARED_LIBEXT) -+SONAME_FRAMEWORK_FILE = lib$(GNUSTEP_INSTANCE).$(INTERFACE_VERSION)$(SHARED_LIBEXT) -+else -+VERSION_FRAMEWORK_LIBRARY_FILE = $(FRAMEWORK_LIBRARY_FILE).$(VERSION) -+SONAME_FRAMEWORK_FILE = $(FRAMEWORK_LIBRARY_FILE).$(INTERFACE_VERSION) -+endif -+ -+else # BUILD_DLL -+ -+# When you build a DLL, you have to install it in a directory which is -+# in your PATH. -+ifeq ($(DLL_INSTALLATION_DIR),) -+ DLL_INSTALLATION_DIR = $(GNUSTEP_TOOLS)/$(GNUSTEP_TARGET_LDIR) -+endif -+ -+# When we build a DLL, we also pass -DBUILD_lib{library_name}_DLL=1 to -+# the preprocessor. With the new DLL support, this is usually not -+# needed; but in some cases some symbols are difficult and have to be -+# exported/imported manually. For these cases, the library header -+# files can use this preprocessor define to know that they are -+# included during compilation of the library itself, or are being -+# imported by external code. Typically with the new DLL support if a -+# symbol can't be imported you have to mark it with -+# __declspec(dllimport) when the library is not being compiled. -+# __declspec(dllexport) is not particularly useful instead. -+ -+CLEAN_framework_NAME = $(subst -,_,$(GNUSTEP_INSTANCE)) -+SHARED_CFLAGS += -DBUILD_$(CLEAN_framework_NAME)_DLL=1 -+ -+# FRAMEWORK_LIBRARY_FILE is the import library, libRenaissance.dll.a -+FRAMEWORK_LIBRARY_FILE = lib$(GNUSTEP_INSTANCE)$(DLL_LIBEXT)$(LIBEXT) -+VERSION_FRAMEWORK_LIBRARY_FILE = $(FRAMEWORK_LIBRARY_FILE) -+SONAME_FRAMEWORK_FILE = $(FRAMEWORK_LIBRARY_FILE) -+ -+# LIB_LINK_DLL_FILE is the DLL library, Renaissance-0.dll -+# (cygRenaissance-0.dll on Cygwin). Include the INTERFACE_VERSION in -+# the DLL library name. Applications are linked explicitly to this -+# INTERFACE_VERSION of the library; this works exactly in the same way -+# as under Unix. -+LIB_LINK_DLL_FILE = $(DLL_PREFIX)$(GNUSTEP_INSTANCE)-$(subst .,_,$(INTERFACE_VERSION))$(DLL_LIBEXT) -+ -+FRAMEWORK_OBJ_EXT = $(DLL_LIBEXT) -+endif # BUILD_DLL -+ -+FRAMEWORK_FILE_NAME = $(FRAMEWORK_LIBRARY_DIR_NAME)/$(VERSION_FRAMEWORK_LIBRARY_FILE) -+FRAMEWORK_FILE = $(GNUSTEP_BUILD_DIR)/$(FRAMEWORK_FILE_NAME) -+ -+ifneq ($($(GNUSTEP_INSTANCE)_INSTALL_DIR),) -+ FRAMEWORK_INSTALL_DIR = $($(GNUSTEP_INSTANCE)_INSTALL_DIR) -+endif -+ -+ifeq ($(FRAMEWORK_INSTALL_DIR),) -+ FRAMEWORK_INSTALL_DIR = $(GNUSTEP_FRAMEWORKS) -+endif -+ -+# -+# Now prepare the variables which are used by target-dependent commands -+# defined in target.make -+# -+LIB_LINK_OBJ_DIR = $(FRAMEWORK_LIBRARY_DIR) -+LIB_LINK_VERSION_FILE = $(VERSION_FRAMEWORK_LIBRARY_FILE) -+LIB_LINK_SONAME_FILE = $(SONAME_FRAMEWORK_FILE) -+LIB_LINK_FILE = $(FRAMEWORK_LIBRARY_FILE) -+LIB_LINK_INSTALL_DIR = $(FRAMEWORK_INSTALL_DIR)/$(FRAMEWORK_LIBRARY_DIR_NAME) -+ -+ifneq ($(DYLIB_INSTALL_NAME_BASE),) -+ LIB_LINK_INSTALL_NAME = $(DYLIB_INSTALL_NAME_BASE)/$(FRAMEWORK_FILE_NAME) -+else -+ # Use a relative path for easy relocation. -+ LIB_LINK_INSTALL_NAME = $(GNUSTEP_INSTANCE).framework/$(GNUSTEP_INSTANCE) -+ -+ # On Mac OS X, set absolute install_name if requested -+ ifeq ($(findstring darwin, $(GNUSTEP_TARGET_OS)), darwin) -+ ifeq ($(GNUSTEP_ABSOLUTE_INSTALL_PATHS), yes) -+ LIB_LINK_INSTALL_NAME = $(LIB_LINK_INSTALL_DIR)/$(GNUSTEP_INSTANCE) -+ endif -+ endif -+endif -+ -+ -+GNUSTEP_SHARED_BUNDLE_RESOURCE_PATH = $(FRAMEWORK_VERSION_DIR)/Resources -+include $(GNUSTEP_MAKEFILES)/Instance/Shared/bundle.make -+ -+internal-framework-all_:: $(GNUSTEP_OBJ_INSTANCE_DIR) $(OBJ_DIRS_TO_CREATE) \ -+ build-framework -+# If they specified Info-gnustep.plist in the xxx_RESOURCE_FILES, -+# print a warning. They are supposed to provide a xxxInfo.plist which -+# gets merged with the automatically generated entries to generate -+# Info-gnustep.plist. -+ifneq ($(FOUNDATION_LIB), apple) -+ ifneq ($(filter Info-gnustep.plist,$($(GNUSTEP_INSTANCE)_RESOURCE_FILES)),) -+ $(WARNING_INFO_GNUSTEP_PLIST) -+ endif -+else -+ ifneq ($(filter Info.plist,$($(GNUSTEP_INSTANCE)_RESOURCE_FILES)),) -+ $(WARNING_INFO_PLIST) -+ endif -+endif -+ -+internal-framework-build-headers:: $(FRAMEWORK_VERSION_DIR)/Headers \ -+ $(FRAMEWORK_HEADER_SUBDIRS) \ -+ $(FRAMEWORK_HEADER_FILES) \ -+ build-framework-dirs -+ -+ifeq ($(MAKE_CURRENT_VERSION),yes) -+ -+# A target to build/reset the Current symlink to point to the newly -+# compiled framework. Only executed if MAKE_CURRENT_VERSION is yes, -+# and only executed if the symlink doesn't exist yet, or if -+# FRAMEWORK_VERSION_DIR is newer than the symlink. This is to avoid -+# rebuilding the symlink every single time, which is a waste of time. -+UPDATE_CURRENT_SYMLINK_RULE = $(FRAMEWORK_DIR)/Versions/Current -+$(FRAMEWORK_DIR)/Versions/Current: $(FRAMEWORK_VERSION_DIR) -+ $(ECHO_UPDATING_VERSION_SYMLINK)cd $(FRAMEWORK_DIR)/Versions; \ -+ $(RM_LN_S) Current; \ -+ $(LN_S) $(CURRENT_VERSION_NAME) Current$(END_ECHO) -+ -+else -+UPDATE_CURRENT_SYMLINK_RULE = -+endif -+ -+# FIXME/TODO - the following rule is always executed. This is stupid. -+# We should have some decent dependencies so that it's not executed if -+# there is nothing to build. :-) -+ -+# Please note that test -h must be used instead of test -L because on -+# old Sun Solaris, test -h works but test -L does not. -+build-framework-dirs: $(DERIVED_SOURCES_DIR) \ -+ $(FRAMEWORK_LIBRARY_DIR) \ -+ $(FRAMEWORK_VERSION_DIR)/Resources \ -+ $(FRAMEWORK_RESOURCE_DIRS) \ -+ $(UPDATE_CURRENT_SYMLINK_RULE) -+ifeq ($(FRAMEWORK_VERSION_SUPPORT), yes) -+ $(ECHO_NOTHING)cd $(FRAMEWORK_DIR); \ -+ if [ ! -h "Resources" ]; then \ -+ $(RM_LN_S) Resources; \ -+ $(LN_S_RECURSIVE) Versions/Current/Resources Resources; \ -+ fi; \ -+ if [ ! -h "Headers" ]; then \ -+ $(RM_LN_S) Headers; \ -+ $(LN_S_RECURSIVE) Versions/Current/Headers Headers; \ -+ fi$(END_ECHO) -+endif -+ $(ECHO_NOTHING)cd $(DERIVED_SOURCES_DIR); \ -+ if [ ! -h "$(HEADER_FILES_INSTALL_DIR)" ]; then \ -+ $(RM_LN_S) ./$(HEADER_FILES_INSTALL_DIR); \ -+ $(LN_S_RECURSIVE) ../$(FRAMEWORK_DIR_NAME)/Headers \ -+ ./$(HEADER_FILES_INSTALL_DIR); \ -+ fi$(END_ECHO) -+ -+$(FRAMEWORK_LIBRARY_DIR): -+ $(ECHO_CREATING)$(MKDIRS) $@$(END_ECHO) -+ -+$(FRAMEWORK_VERSION_DIR)/Headers: -+ $(ECHO_CREATING)$(MKDIRS) $@$(END_ECHO) -+ -+$(FRAMEWORK_HEADER_SUBDIRS): -+ $(ECHO_CREATING)$(MKDIRS) $@$(END_ECHO) -+ -+$(DERIVED_SOURCES_DIR): $(DERIVED_SOURCES_DIR)/.stamp -+$(DERIVED_SOURCES_DIR)/.stamp: -+ $(ECHO_CREATING)$(MKDIRS) $(DERIVED_SOURCES_DIR); \ -+ touch $@$(END_ECHO) -+ -+# Need to share this code with the headers code ... but how. -+ -+# IMPORTANT: It is tempting to have a file (a header, in this case) -+# depend on the directory in which we want to create it (the -+# .../Headers/ directory in this case). The idea being that make -+# would automatically create the directory before the file. That -+# might work for a single file, but could trigger spurious rebuilds if -+# you have more than one file in the directory. The first file will -+# create the directory, then create the file. The second file will be -+# created inside the directory; but on some filesystems, creating the -+# file inside the directory then updates the 'last modified' timestamp -+# of the directory. So next time you run make, the directory is -+# 'newer' than the first file, and because the first file depends on -+# the directory, make will determine that it needs to be updated, -+# triggering a spurious recreation of the file. If you also have -+# auto-dependencies turned on, this might in turn cause recompilation -+# and further spurious rebuilding to happen. -+$(FRAMEWORK_VERSION_DIR)/Headers/%.h: $(HEADER_FILES_DIR)/%.h -+ $(ECHO_CREATING)$(INSTALL_DATA) $< $@$(END_ECHO) -+ -+OBJC_OBJ_FILES_TO_INSPECT = $(OBJC_OBJ_FILES) $(SUBPROJECT_OBJ_FILES) -+ -+# FIXME - We should not depend on GNUmakefile - rather we should use -+# Instance/Shared/stamp-string.make if we need to depend on the value -+# of some make variables. That would also detect a change in -+# FRAMEWORK_INSTALL_DIR from the command line, not currently covered -+# at the moment! -+# -+# To get the list of all classes, we use -+# $(EXTRACT_CLASS_NAMES_COMMAND), which is defined in target.make -+# -+# -+# The following rule will also build the DUMMY_FRAMEWORK_CLASS_LIST -+# file. This file is always created/deleted at the same time as the -+# DUMMY_FRAMEWORK_FILE. -+$(DUMMY_FRAMEWORK_FILE): $(DERIVED_SOURCES_DIR)/.stamp $(OBJ_FILES_TO_LINK) GNUmakefile -+ $(ECHO_CREATING) classes=""; \ -+ for object_file in $(OBJC_OBJ_FILES_TO_INSPECT) __dummy__; do \ -+ if [ "$$object_file" != "__dummy__" ]; then \ -+ sym=`$(EXTRACT_CLASS_NAMES_COMMAND)`; \ -+ classes="$$classes $$sym"; \ -+ fi; \ -+ done; \ -+ classlist=""; \ -+ classarray=""; \ -+ for f in $$classes __dummy__ ; do \ -+ if [ "$$f" != "__dummy__" ]; then \ -+ if [ "$$classlist" = "" ]; then \ -+ classlist="@\"$$f\""; \ -+ classarray="(\"$$f\""; \ -+ else \ -+ classlist="$$classlist, @\"$$f\""; \ -+ classarray="$$classarray, \"$$f\""; \ -+ fi; \ -+ fi; \ -+ done; \ -+ if [ "$$classlist" = "" ]; then \ -+ classlist="NULL"; \ -+ classarray="()"; \ -+ else \ -+ classlist="$$classlist, NULL"; \ -+ classarray="$$classarray)"; \ -+ fi; \ -+ echo "$$classarray" > $(DUMMY_FRAMEWORK_CLASS_LIST); \ -+ echo "#include " > $@; \ -+ echo "#include " > $@; \ -+ echo "@interface $(DUMMY_FRAMEWORK) : NSObject" >> $@; \ -+ echo "+ (NSString *)frameworkEnv;" >> $@; \ -+ echo "+ (NSString *)frameworkPath;" >> $@; \ -+ echo "+ (NSString *)frameworkVersion;" >> $@; \ -+ echo "+ (NSString *const*)frameworkClasses;" >> $@; \ -+ echo "@end" >> $@; \ -+ echo "@implementation $(DUMMY_FRAMEWORK)" >> $@; \ -+ echo "+ (NSString *)frameworkEnv { return nil; }" >> $@; \ -+ echo "+ (NSString *)frameworkPath { return @\"/usr/local/GNUstep/Local/Library/Frameworks\"; }" >> $@; \ -+ echo "+ (NSString *)frameworkVersion { return @\"$(CURRENT_VERSION_NAME)\"; }" >> $@; \ -+ echo "static NSString *allClasses[] = {$$classlist};" >> $@; \ -+ echo "+ (NSString *const*)frameworkClasses { return allClasses; }" >> $@;\ -+ echo "@end" >> $@$(END_ECHO) -+ -+ifeq ($(FOUNDATION_LIB),gnu) -+$(DUMMY_FRAMEWORK_OBJ_FILE): $(DUMMY_FRAMEWORK_FILE) -+ $(ECHO_COMPILING)$(CC) $< -c $(ALL_CPPFLAGS) $(ALL_OBJCFLAGS) -o $@$(END_ECHO) -+endif -+ -+ifeq ($(FOUNDATION_LIB),gnu) -+ FRAMEWORK_INFO_PLIST_FILE = Info-gnustep.plist -+else -+ FRAMEWORK_INFO_PLIST_FILE = Info.plist -+endif -+ -+ifeq ($(FRAMEWORK_VERSION_SUPPORT), yes) -+build-framework: internal-framework-run-compile-submake \ -+ shared-instance-bundle-all \ -+ $(FRAMEWORK_VERSION_DIR)/Resources/$(FRAMEWORK_INFO_PLIST_FILE) \ -+ $(GNUSTEP_BUILD_DIR)/$(GNUSTEP_INSTANCE).framework/$(GNUSTEP_TARGET_LDIR)/$(GNUSTEP_INSTANCE) -+else -+build-framework: internal-framework-run-compile-submake \ -+ shared-instance-bundle-all \ -+ $(FRAMEWORK_VERSION_DIR)/Resources/$(FRAMEWORK_INFO_PLIST_FILE) -+endif -+ -+ifeq ($(findstring darwin, $(GNUSTEP_TARGET_OS)), darwin) -+# When building native frameworks on Apple, we need to create a -+# top-level symlink xxx.framework/xxx ---> the framework shared -+# library. On Darwin (non-Apple) we do this as well since we can partially -+# emulate frameworks (see the ld_lib_path.sh comments on this). -+ -+# Please note that the following keeps the top-level symlink pointing -+# to the framework in Current. This is always correct, even if what -+# we are compiling is not made the Current framework version, but if -+# what we are compiling is not made the Current framework version, I -+# think it's not our business to touch the Current stuff, so let's -+# ignore it. It's faster to ignore it anyway. ;-) -+$(GNUSTEP_BUILD_DIR)/$(GNUSTEP_INSTANCE).framework/$(GNUSTEP_TARGET_LDIR): -+ $(ECHO_CREATING)$(MKDIRS) $@$(END_ECHO) -+ -+$(GNUSTEP_BUILD_DIR)/$(GNUSTEP_INSTANCE).framework/$(GNUSTEP_TARGET_LDIR)/$(GNUSTEP_INSTANCE): $(GNUSTEP_BUILD_DIR)/$(GNUSTEP_INSTANCE).framework/$(GNUSTEP_TARGET_LDIR) -+ifeq ($(MAKE_CURRENT_VERSION),yes) -+ $(ECHO_NOTHING)cd $(GNUSTEP_BUILD_DIR)/$(GNUSTEP_INSTANCE).framework; \ -+ $(RM_LN_S) $(GNUSTEP_INSTANCE); \ -+ $(LN_S) Versions/Current/$(GNUSTEP_TARGET_LDIR)/$(GNUSTEP_INSTANCE) $(GNUSTEP_INSTANCE)$(END_ECHO) -+endif -+ -+else -+ -+# We create a top-level symlink (/copy) -+# -+# xxx.framework/{TARGET_LDIR}/xxx --> -+# -+# And also -+# -+# xxx.framework/{TARGET_LDIR}/libxxx.so --> -+# -+# On Windows, we don't do any of this since there are no versions anyway. -+# -+# The reason for doing this is that you can link against the uninstalled framework -+# by just using -Lpath_to_the_framework/xxx.framework/$TARGET_LDIR -+# -+ifeq ($(FRAMEWORK_VERSION_SUPPORT), yes) -+$(GNUSTEP_BUILD_DIR)/$(GNUSTEP_INSTANCE).framework/$(GNUSTEP_TARGET_LDIR): -+ $(ECHO_CREATING)$(MKDIRS) $@$(END_ECHO) -+ -+$(GNUSTEP_BUILD_DIR)/$(GNUSTEP_INSTANCE).framework/$(GNUSTEP_TARGET_LDIR)/$(GNUSTEP_INSTANCE): $(GNUSTEP_BUILD_DIR)/$(GNUSTEP_INSTANCE).framework/$(GNUSTEP_TARGET_LDIR) -+ifeq ($(MAKE_CURRENT_VERSION),yes) -+ $(ECHO_NOTHING)cd $(GNUSTEP_BUILD_DIR)/$(GNUSTEP_INSTANCE).framework/$(GNUSTEP_TARGET_LDIR); \ -+ $(RM_LN_S) $(GNUSTEP_INSTANCE) $(FRAMEWORK_LIBRARY_FILE); \ -+ $(LN_S) `$(REL_PATH_SCRIPT) $(GNUSTEP_TARGET_LDIR) \ -+ Versions/Current/$(GNUSTEP_TARGET_LDIR)/$(GNUSTEP_INSTANCE) short` \ -+ $(GNUSTEP_INSTANCE); \ -+ $(LN_S) `$(REL_PATH_SCRIPT) $(GNUSTEP_TARGET_LDIR) \ -+ Versions/Current/$(GNUSTEP_TARGET_LDIR)/$(FRAMEWORK_LIBRARY_FILE) short` \ -+ $(FRAMEWORK_LIBRARY_FILE)$(END_ECHO) -+endif -+endif -+endif -+ -+ifneq ($(BUILD_DLL), yes) -+ LIB_LINK_FRAMEWORK_FILE = $(LIB_LINK_FILE) -+else -+ LIB_LINK_FRAMEWORK_FILE = $(LIB_LINK_DLL_FILE) -+endif -+ -+LIB_LINK_FILES_TO_LINK = $(OBJ_FILES_TO_LINK) -+ -+# Important: FRAMEWORK_FILE (which is created in the parallel -+# 'compile' invocation) depends on DUMMY_FRAMEWORK_OBJ_FILES as well, -+# which depends on a lot of other rules. These rules *must* be safe -+# for parallel building, because they will be used during a parallel -+# build. In particular, note that DUMMY_FRAMEWORK_OBJ_FILE must -+# itself depend on OBJ_FILES_TO_LINK else it might be built before all -+# files are compiled. -+$(FRAMEWORK_FILE): $(DUMMY_FRAMEWORK_OBJ_FILE) $(OBJ_FILES_TO_LINK) -+ifeq ($(OBJ_FILES_TO_LINK),) -+ $(WARNING_EMPTY_LINKING) -+endif -+ $(ECHO_LINKING) \ -+ $(LIB_LINK_CMD) || $(RM) $(FRAMEWORK_FILE) ; \ -+ (cd $(LIB_LINK_OBJ_DIR); \ -+ $(RM_LN_S) $(GNUSTEP_INSTANCE); \ -+ $(LN_S) $(LIB_LINK_FRAMEWORK_FILE) $(GNUSTEP_INSTANCE)) \ -+ $(END_ECHO) -+ -+ifeq ($(GNUSTEP_MAKE_PARALLEL_BUILDING), no) -+# Standard building -+internal-framework-run-compile-submake: $(FRAMEWORK_FILE) -+else -+# Parallel building. The actual compilation is delegated to a -+# sub-make invocation where _GNUSTEP_MAKE_PARALLEL is set to yet. -+# That sub-make invocation will compile files in parallel. -+internal-framework-run-compile-submake: -+ $(ECHO_NOTHING_RECURSIVE_MAKE)$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory --no-keep-going \ -+ internal-framework-compile \ -+ GNUSTEP_TYPE=$(GNUSTEP_TYPE) \ -+ GNUSTEP_INSTANCE=$(GNUSTEP_INSTANCE) \ -+ GNUSTEP_OPERATION=compile \ -+ GNUSTEP_BUILD_DIR="$(GNUSTEP_BUILD_DIR)" \ -+ _GNUSTEP_MAKE_PARALLEL=yes$(END_ECHO_RECURSIVE_MAKE) -+ -+internal-framework-compile: $(FRAMEWORK_FILE) -+endif -+ -+PRINCIPAL_CLASS = $(strip $($(GNUSTEP_INSTANCE)_PRINCIPAL_CLASS)) -+ -+ifeq ($(PRINCIPAL_CLASS),) -+ PRINCIPAL_CLASS = $(GNUSTEP_INSTANCE) -+endif -+ -+MAIN_MODEL_FILE = $(strip $(subst .gmodel,,$(subst .gorm,,$(subst .nib,,$($(GNUSTEP_INSTANCE)_MAIN_MODEL_FILE))))) -+ -+# FIXME: Use stamp.make to depend on the value of MAIN_MODEL_FILE and PRINCIPAL_CLASS -+ -+# FIXME: MacOSX frameworks should also merge xxxInfo.plist into them -+# MacOSX-S frameworks -+$(FRAMEWORK_VERSION_DIR)/Resources/Info.plist: -+ $(ECHO_CREATING)(echo "{"; echo ' NOTE = "Automatically generated, do not edit!";'; \ -+ echo " NSExecutable = \"$(GNUSTEP_INSTANCE)\";"; \ -+ echo " NSMainNibFile = \"$(MAIN_MODEL_FILE)\";"; \ -+ echo " NSPrincipalClass = \"$(PRINCIPAL_CLASS)\";"; \ -+ echo "}") >$@$(END_ECHO) -+ -+# GNUstep frameworks -+$(FRAMEWORK_VERSION_DIR)/Resources/Info-gnustep.plist: \ -+ $(DUMMY_FRAMEWORK_FILE) \ -+ $(GNUSTEP_PLIST_DEPEND) -+ $(ECHO_CREATING)(echo "{"; echo ' NOTE = "Automatically generated, do not edit!";'; \ -+ echo " NSExecutable = \"$(GNUSTEP_INSTANCE)$(FRAMEWORK_OBJ_EXT)\";"; \ -+ echo " NSMainNibFile = \"$(MAIN_MODEL_FILE)\";"; \ -+ echo " NSPrincipalClass = \"$(PRINCIPAL_CLASS)\";"; \ -+ echo " Classes = "; \ -+ cat $(DUMMY_FRAMEWORK_CLASS_LIST); \ -+ echo " ;"; \ -+ echo "}") >$@$(END_ECHO) -+ $(ECHO_NOTHING)if [ -r "$(GNUSTEP_PLIST_DEPEND)" ]; then \ -+ plmerge $@ $(GNUSTEP_PLIST_DEPEND); \ -+ fi$(END_ECHO) -+ -+ifneq ($(BUILD_DLL),yes) -+ -+ifeq ($(FOUNDATION_LIB),gnu) -+ -+internal-framework-install_:: $(FRAMEWORK_INSTALL_DIR) \ -+ $(GNUSTEP_LIBRARIES)/$(GNUSTEP_TARGET_LDIR) \ -+ $(GNUSTEP_HEADERS) -+ $(ECHO_INSTALLING)rm -rf $(FRAMEWORK_INSTALL_DIR)/$(FRAMEWORK_DIR_NAME); \ -+ (cd $(GNUSTEP_BUILD_DIR); $(TAR) cfX - $(GNUSTEP_MAKEFILES)/tar-exclude-list $(FRAMEWORK_DIR_NAME)) | (cd $(FRAMEWORK_INSTALL_DIR); $(TAR) xf -)$(END_ECHO) -+ifneq ($(CHOWN_TO),) -+ $(ECHO_CHOWNING)$(CHOWN) -R $(CHOWN_TO) $(FRAMEWORK_INSTALL_DIR)/$(FRAMEWORK_DIR_NAME)$(END_ECHO) -+endif -+ifeq ($(strip),yes) -+ $(ECHO_STRIPPING)$(STRIP) $(FRAMEWORK_INSTALL_DIR)/$(FRAMEWORK_FILE_NAME)$(END_ECHO) -+endif -+ $(ECHO_INSTALLING_HEADERS)cd $(GNUSTEP_HEADERS); \ -+ $(RM_LN_S) $(HEADER_FILES_INSTALL_DIR); \ -+ $(LN_S_RECURSIVE) `$(REL_PATH_SCRIPT) $(GNUSTEP_HEADERS) $(FRAMEWORK_INSTALL_DIR)/$(FRAMEWORK_DIR_NAME)/Headers short` $(HEADER_FILES_INSTALL_DIR); \ -+ $(END_ECHO) -+ifneq ($(CHOWN_TO),) -+ $(ECHO_CHOWNING)cd $(GNUSTEP_HEADERS); \ -+ $(CHOWN) $(CHOWN_TO) $(HEADER_FILES_INSTALL_DIR); \ -+ $(END_ECHO) -+endif -+ $(ECHO_NOTHING)cd $(GNUSTEP_LIBRARIES)/$(GNUSTEP_TARGET_LDIR); \ -+ $(RM_LN_S) $(FRAMEWORK_LIBRARY_FILE); \ -+ $(RM_LN_S) $(SONAME_FRAMEWORK_FILE); \ -+ $(RM_LN_S) $(VERSION_FRAMEWORK_LIBRARY_FILE); \ -+ $(LN_S) `$(REL_PATH_SCRIPT) $(GNUSTEP_LIBRARIES)/$(GNUSTEP_TARGET_LDIR) $(FRAMEWORK_INSTALL_DIR)/$(FRAMEWORK_CURRENT_LIBRARY_DIR_NAME)/$(FRAMEWORK_LIBRARY_FILE) short` $(FRAMEWORK_LIBRARY_FILE); \ -+ if test -r "$(FRAMEWORK_INSTALL_DIR)/$(FRAMEWORK_CURRENT_LIBRARY_DIR_NAME)/$(SONAME_FRAMEWORK_FILE)"; then \ -+ $(LN_S) `$(REL_PATH_SCRIPT) $(GNUSTEP_LIBRARIES)/$(GNUSTEP_TARGET_LDIR) $(FRAMEWORK_INSTALL_DIR)/$(FRAMEWORK_CURRENT_LIBRARY_DIR_NAME)/$(SONAME_FRAMEWORK_FILE) short` $(SONAME_FRAMEWORK_FILE); \ -+ fi; \ -+ $(LN_S) `$(REL_PATH_SCRIPT) $(GNUSTEP_LIBRARIES)/$(GNUSTEP_TARGET_LDIR) $(FRAMEWORK_INSTALL_DIR)/$(FRAMEWORK_CURRENT_LIBRARY_DIR_NAME)/$(VERSION_FRAMEWORK_LIBRARY_FILE) short` $(VERSION_FRAMEWORK_LIBRARY_FILE)$(END_ECHO) -+ifneq ($(CHOWN_TO),) -+ $(ECHO_CHOWNING)cd $(GNUSTEP_LIBRARIES)/$(GNUSTEP_TARGET_LDIR); \ -+ $(CHOWN) $(CHOWN_TO) $(FRAMEWORK_LIBRARY_FILE); \ -+ if test -r "$(SONAME_FRAMEWORK_FILE)"; then \ -+ $(CHOWN) $(CHOWN_TO) $(SONAME_FRAMEWORK_FILE); \ -+ fi; \ -+ $(CHOWN) $(CHOWN_TO) $(VERSION_FRAMEWORK_LIBRARY_FILE)$(END_ECHO) -+endif -+ -+else -+ -+# This code for Apple OSX -+ -+internal-framework-install_:: $(FRAMEWORK_INSTALL_DIR) -+ $(ECHO_INSTALLING)rm -rf $(FRAMEWORK_INSTALL_DIR)/$(FRAMEWORK_DIR_NAME); \ -+ (cd $(GNUSTEP_BUILD_DIR); $(TAR) cfX - $(GNUSTEP_MAKEFILES)/tar-exclude-list $(FRAMEWORK_DIR_NAME)) | (cd $(FRAMEWORK_INSTALL_DIR); $(TAR) xf -)$(END_ECHO) -+ifneq ($(CHOWN_TO),) -+ $(ECHO_CHOWNING)$(CHOWN) -R $(CHOWN_TO) $(FRAMEWORK_INSTALL_DIR)/$(FRAMEWORK_DIR_NAME)$(END_ECHO) -+endif -+ifeq ($(strip),yes) -+ $(ECHO_STRIPPING)$(STRIP) $(FRAMEWORK_INSTALL_DIR)/$(FRAMEWORK_FILE_NAME)$(END_ECHO) -+endif -+ -+endif -+ -+else # install DLL -+ -+internal-framework-install_:: $(FRAMEWORK_INSTALL_DIR) \ -+ $(GNUSTEP_LIBRARIES)/$(GNUSTEP_TARGET_LDIR) \ -+ $(GNUSTEP_HEADERS) \ -+ $(DLL_INSTALLATION_DIR) -+ $(ECHO_INSTALLING)\ -+ rm -rf $(FRAMEWORK_INSTALL_DIR)/$(FRAMEWORK_DIR_NAME); \ -+ (cd $(GNUSTEP_BUILD_DIR);\ -+ $(TAR) cfX - $(GNUSTEP_MAKEFILES)/tar-exclude-list \ -+ $(FRAMEWORK_DIR_NAME)) | (cd $(FRAMEWORK_INSTALL_DIR); \ -+ $(TAR) xf -)$(END_ECHO) -+ifneq ($(CHOWN_TO),) -+ $(ECHO_CHOWNING)$(CHOWN) -R $(CHOWN_TO) $(FRAMEWORK_INSTALL_DIR)/$(FRAMEWORK_DIR_NAME)$(END_ECHO) -+endif -+ifeq ($(strip),yes) -+ $(ECHO_STRIPPING)$(STRIP) $(FRAMEWORK_INSTALL_DIR)/$(FRAMEWORK_FILE_NAME)$(END_ECHO) -+endif -+ $(ECHO_INSTALLING_HEADERS)cd $(GNUSTEP_HEADERS); \ -+ if test -d "$(HEADER_FILES_INSTALL_DIR)"; then \ -+ rm -Rf $(HEADER_FILES_INSTALL_DIR); \ -+ fi; \ -+ $(MKINSTALLDIRS) $(HEADER_FILES_INSTALL_DIR); \ -+ cd $(FRAMEWORK_INSTALL_DIR)/$(FRAMEWORK_VERSION_DIR_NAME)/Headers ; \ -+ $(TAR) cfX - $(GNUSTEP_MAKEFILES)/tar-exclude-list . | (cd $(GNUSTEP_HEADERS)/$(HEADER_FILES_INSTALL_DIR); \ -+ $(TAR) xf - ); \ -+ $(END_ECHO) -+ifneq ($(CHOWN_TO),) -+ $(ECHO_CHOWNING)cd $(GNUSTEP_HEADERS); \ -+ $(CHOWN) -R $(CHOWN_TO) $(HEADER_FILES_INSTALL_DIR); \ -+ $(END_ECHO) -+endif -+ $(ECHO_NOTHING)$(INSTALL_PROGRAM) $(FRAMEWORK_LIBRARY_DIR)/$(LIB_LINK_DLL_FILE) \ -+ $(DLL_INSTALLATION_DIR)$(END_ECHO) -+ $(ECHO_NOTHING)$(INSTALL_PROGRAM) $(FRAMEWORK_FILE_NAME) \ -+ $(GNUSTEP_LIBRARIES)/$(GNUSTEP_TARGET_LDIR)$(END_ECHO) -+ -+endif -+ -+$(DLL_INSTALLATION_DIR): -+ $(ECHO_CREATING)$(MKINSTALLDIRS) $@$(END_ECHO) -+ -+# If Version support is disabled, then this directory is the same as -+# the Resources directory in Shared/bundle.make for which we already -+# have a rule. -+ifeq ($(FRAMEWORK_VERSION_SUPPORT), yes) -+$(FRAMEWORK_DIR)/Resources: -+ $(ECHO_CREATING)$(MKDIRS) $@$(END_ECHO) -+endif -+ -+$(FRAMEWORK_INSTALL_DIR): -+ $(ECHO_CREATING)$(MKINSTALLDIRS) $@$(END_ECHO) -+ -+$(GNUSTEP_LIBRARIES)/$(GNUSTEP_TARGET_LDIR): -+ $(ECHO_CREATING)$(MKINSTALLDIRS) $@$(END_ECHO) -+ -+$(GNUSTEP_HEADERS): -+ $(ECHO_CREATING)$(MKINSTALLDIRS) $@$(END_ECHO) -+ -+ifneq ($(BUILD_DLL), yes) -+# NB: We use '$(RM_LN_S)' to remove the symlinks to insure -+# that we do not remove customized real directories. -+internal-framework-uninstall_:: -+ $(ECHO_UNINSTALLING)if [ "$(HEADER_FILES)" != "" ]; then \ -+ for file in $(HEADER_FILES) __done; do \ -+ if [ $$file != __done ]; then \ -+ rm -rf $(GNUSTEP_HEADERS)/$(HEADER_FILES_INSTALL_DIR)/$$file ; \ -+ fi; \ -+ done; \ -+ fi; \ -+ $(RM_LN_S) $(GNUSTEP_HEADERS)/$(HEADER_FILES_INSTALL_DIR) ; \ -+ rm -rf $(FRAMEWORK_INSTALL_DIR)/$(FRAMEWORK_DIR_NAME) ; \ -+ cd $(GNUSTEP_LIBRARIES)/$(GNUSTEP_TARGET_LDIR); \ -+ $(RM_LN_S) $(FRAMEWORK_LIBRARY_FILE); \ -+ $(RM_LN_S) $(SONAME_FRAMEWORK_FILE); \ -+ $(RM_LN_S) $(VERSION_FRAMEWORK_LIBRARY_FILE); \ -+ $(END_ECHO) -+else -+internal-framework-uninstall_:: -+ $(ECHO_UNINSTALLING)if [ "$(HEADER_FILES)" != "" ]; then \ -+ for file in $(HEADER_FILES) __done; do \ -+ if [ $$file != __done ]; then \ -+ rm -rf $(GNUSTEP_HEADERS)/$(HEADER_FILES_INSTALL_DIR)/$$file ; \ -+ fi; \ -+ done; \ -+ fi; \ -+ $(RM_LN_S) $(GNUSTEP_HEADERS)/$(HEADER_FILES_INSTALL_DIR) ; \ -+ rm -rf $(FRAMEWORK_INSTALL_DIR)/$(FRAMEWORK_DIR_NAME) ; \ -+ cd $(GNUSTEP_LIBRARIES)/$(GNUSTEP_TARGET_LDIR); \ -+ $(RM_LN_S) $(FRAMEWORK_LIBRARY_FILE); \ -+ cd $(DLL_INSTALLATION_DIR); \ -+ $(RM_LN_S) $(LIB_LINK_DLL_FILE); \ -+ $(END_ECHO) -+endif -+# -+# Cleaning targets -+# -+internal-framework-clean:: -+ $(ECHO_NOTHING)rm -rf \ -+ $(PSWRAP_C_FILES) $(PSWRAP_H_FILES) \ -+ $(FRAMEWORK_DIR) $(DERIVED_SOURCES_DIR)$(END_ECHO) -+ -+internal-framework-distclean:: -+ -+include $(GNUSTEP_MAKEFILES)/Instance/Shared/strings.make diff --git a/www/sogo/files/patch-SoObjects_SOGo_master-framework.make b/www/sogo/files/patch-SoObjects_SOGo_master-framework.make deleted file mode 100644 index 404910ee0c9..00000000000 --- a/www/sogo/files/patch-SoObjects_SOGo_master-framework.make +++ /dev/null @@ -1,33 +0,0 @@ ---- SoObjects/SOGo/master-framework.make.orig 2015-09-23 03:38:31 UTC -+++ SoObjects/SOGo/master-framework.make -@@ -0,0 +1,30 @@ -+# -+# framework.make -+# -+# Makefile rules to build GNUstep-based frameworks. -+# -+# Copyright (C) 2002 Free Software Foundation, Inc. -+# -+# Author: Nicola Pero -+# -+# This file is part of the GNUstep Makefile Package. -+# -+# This library is free software; you can redistribute it and/or -+# modify it under the terms of the GNU General Public License -+# as published by the Free Software Foundation; either version 3 -+# of the License, or (at your option) any later version. -+# -+# You should have received a copy of the GNU General Public -+# License along with this library; see the file COPYING. -+# If not, write to the Free Software Foundation, -+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ -+ifeq ($(GNUSTEP_INSTANCE),) -+include $(GNUSTEP_MAKEFILES)/Master/framework.make -+else -+ -+ifeq ($(GNUSTEP_TYPE),framework) -+include instance-framework.make -+endif -+ -+endif diff --git a/www/sogo-activesync/Makefile b/www/sogo2-activesync/Makefile similarity index 66% rename from www/sogo-activesync/Makefile rename to www/sogo2-activesync/Makefile index 8e11c3645a2..48ceb019656 100644 --- a/www/sogo-activesync/Makefile +++ b/www/sogo2-activesync/Makefile @@ -4,10 +4,10 @@ PKGNAMESUFFIX= -activesync MAINTAINER= euan@potensol.com -CONFLICTS= sogo-[0-9]* +CONFLICTS= sogo2-[0-9]* sogo3-[0-9]* OPTIONS_SLAVE= ACTIVESYNC -MASTERDIR= ${.CURDIR}/../sogo +MASTERDIR= ${.CURDIR}/../sogo2 .include "${MASTERDIR}/Makefile" diff --git a/www/sogo-activesync/pkg-descr b/www/sogo2-activesync/pkg-descr similarity index 100% rename from www/sogo-activesync/pkg-descr rename to www/sogo2-activesync/pkg-descr diff --git a/www/sogo/Makefile b/www/sogo2/Makefile similarity index 92% rename from www/sogo/Makefile rename to www/sogo2/Makefile index 582f7685f1e..0f76fcd456d 100644 --- a/www/sogo/Makefile +++ b/www/sogo2/Makefile @@ -1,9 +1,8 @@ # Created by: Euan Thoms # $FreeBSD$ -PORTNAME= sogo -PORTVERSION= 2.3.8 -PORTREVISION= 1 +PORTNAME= sogo2 +PORTVERSION= 2.3.10 CATEGORIES= www gnustep MASTER_SITES= http://www.sogo.nu/files/downloads/SOGo/Sources/ DISTNAME= SOGo-${PORTVERSION} @@ -15,7 +14,7 @@ LICENSE= GPLv2 LIB_DEPENDS= libmemcached.so:databases/libmemcached \ libcurl.so:ftp/curl \ - libDOM.so:devel/sope + libDOM.so:devel/sope2 OPTIONS_DEFINE= ACTIVESYNC OPTIONS_SUB= yes @@ -31,13 +30,13 @@ USES= gnustep objc USE_GNUSTEP= base build USE_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES}/sogo -CONFLICTS?= sogo-activesync-[0-9]* +CONFLICTS?= sogo2-activesync-[0-9]* sogo3-activesync-[0-9]* USE_RC_SUBR= sogod SUB_LIST+= GNUSTEP_LOCAL_TOOLS=${GNUSTEP_LOCAL_TOOLS} \ GNUSTEP_MAKEFILES=${GNUSTEP_MAKEFILES} - +ETCDIR= ${PREFIX}/etc/${PORTNAME:S/2//} CONFIGURE_ARGS= --disable-debug --enable-strip post-patch: diff --git a/www/sogo2/distinfo b/www/sogo2/distinfo new file mode 100644 index 00000000000..cab90f2d435 --- /dev/null +++ b/www/sogo2/distinfo @@ -0,0 +1,2 @@ +SHA256 (SOGo-2.3.10.tar.gz) = c51c5d2c43b686868a906839eea721e15bfdadcbff537b1aa377ca268818a1af +SIZE (SOGo-2.3.10.tar.gz) = 12247151 diff --git a/www/sogo/files/cron-ealarms-notify.sample b/www/sogo2/files/cron-ealarms-notify.sample similarity index 100% rename from www/sogo/files/cron-ealarms-notify.sample rename to www/sogo2/files/cron-ealarms-notify.sample diff --git a/www/sogo/files/cron-expire-autoreply.sample b/www/sogo2/files/cron-expire-autoreply.sample similarity index 100% rename from www/sogo/files/cron-expire-autoreply.sample rename to www/sogo2/files/cron-expire-autoreply.sample diff --git a/www/sogo/files/ealarms-notify.creds.sample b/www/sogo2/files/ealarms-notify.creds.sample similarity index 100% rename from www/sogo/files/ealarms-notify.creds.sample rename to www/sogo2/files/ealarms-notify.creds.sample diff --git a/www/sogo/files/expire-autoreply.creds.sample b/www/sogo2/files/expire-autoreply.creds.sample similarity index 100% rename from www/sogo/files/expire-autoreply.creds.sample rename to www/sogo2/files/expire-autoreply.creds.sample diff --git a/www/sogo/files/patch-ActiveSync_GNUmakefile b/www/sogo2/files/patch-ActiveSync_GNUmakefile similarity index 87% rename from www/sogo/files/patch-ActiveSync_GNUmakefile rename to www/sogo2/files/patch-ActiveSync_GNUmakefile index 0ee3c0793f4..f635fd046e8 100644 --- a/www/sogo/files/patch-ActiveSync_GNUmakefile +++ b/www/sogo2/files/patch-ActiveSync_GNUmakefile @@ -5,7 +5,7 @@ ADDITIONAL_INCLUDE_DIRS += -I../SOPE/ -I../SoObjects/ ADDITIONAL_LIB_DIRS += -L../SOPE/GDLContentStore/obj/ -L../SOPE/NGCards/obj/ -ADDITIONAL_INCLUDE_DIRS += -I/usr/include/libwbxml-1.0/ -+ADDITIONAL_INCLUDE_DIRS += -I/usr/local/include/libwbxml-1.0/ ++ADDITIONAL_INCLUDE_DIRS += -I${LOCALBASE}/include/libwbxml-1.0/ ADDITIONAL_LDFLAGS += -Wl,--no-as-needed -lwbxml2 -include GNUmakefile.preamble diff --git a/www/sogo/files/patch-Main_GNUmakefile.preamble b/www/sogo2/files/patch-Main_GNUmakefile.preamble similarity index 100% rename from www/sogo/files/patch-Main_GNUmakefile.preamble rename to www/sogo2/files/patch-Main_GNUmakefile.preamble diff --git a/www/sogo/files/patch-Tests_Unit_GNUmakefile b/www/sogo2/files/patch-Tests_Unit_GNUmakefile similarity index 100% rename from www/sogo/files/patch-Tests_Unit_GNUmakefile rename to www/sogo2/files/patch-Tests_Unit_GNUmakefile diff --git a/www/sogo/files/patch-Tools_GNUmakefile.preamble b/www/sogo2/files/patch-Tools_GNUmakefile.preamble similarity index 100% rename from www/sogo/files/patch-Tools_GNUmakefile.preamble rename to www/sogo2/files/patch-Tools_GNUmakefile.preamble diff --git a/www/sogo/files/sogod.in b/www/sogo2/files/sogod.in similarity index 100% rename from www/sogo/files/sogod.in rename to www/sogo2/files/sogod.in diff --git a/www/sogo/pkg-descr b/www/sogo2/pkg-descr similarity index 100% rename from www/sogo/pkg-descr rename to www/sogo2/pkg-descr diff --git a/www/sogo/pkg-message b/www/sogo2/pkg-message similarity index 91% rename from www/sogo/pkg-message rename to www/sogo2/pkg-message index fee3df8c207..94500b6c84d 100644 --- a/www/sogo/pkg-message +++ b/www/sogo2/pkg-message @@ -1,3 +1,6 @@ +############################################################################### + +SOGo 2 was installed In order to run the sogo daemon (sogod), you will need to create and configure the main configuration file, e.g.: @@ -56,3 +59,5 @@ Then add the following lines to the root users' crontab (crontab -e): For more information about using SOGo, visit: http://www.sogo.nu/downloads/documentation.html + +################################################################################ diff --git a/www/sogo/pkg-plist b/www/sogo2/pkg-plist similarity index 98% rename from www/sogo/pkg-plist rename to www/sogo2/pkg-plist index 1de1327e4dd..0e294e7833b 100644 --- a/www/sogo/pkg-plist +++ b/www/sogo2/pkg-plist @@ -591,6 +591,7 @@ GNUstep/Local/Library/SOGo/AdministrationUI.SOGo/Resources/German.lproj/Localiza GNUstep/Local/Library/SOGo/AdministrationUI.SOGo/Resources/Hungarian.lproj/Localizable.strings GNUstep/Local/Library/SOGo/AdministrationUI.SOGo/Resources/Info-gnustep.plist GNUstep/Local/Library/SOGo/AdministrationUI.SOGo/Resources/Italian.lproj/Localizable.strings +GNUstep/Local/Library/SOGo/AdministrationUI.SOGo/Resources/Lithuanian.lproj/Localizable.strings GNUstep/Local/Library/SOGo/AdministrationUI.SOGo/Resources/Macedonian.lproj/Localizable.strings GNUstep/Local/Library/SOGo/AdministrationUI.SOGo/Resources/NorwegianBokmal.lproj/Localizable.strings GNUstep/Local/Library/SOGo/AdministrationUI.SOGo/Resources/NorwegianNynorsk.lproj/Localizable.strings @@ -625,10 +626,11 @@ GNUstep/Local/Library/SOGo/Appointments.SOGo/Resources/Hungarian.lproj/Localizab GNUstep/Local/Library/SOGo/Appointments.SOGo/Resources/Icelandic.lproj/Localizable.strings GNUstep/Local/Library/SOGo/Appointments.SOGo/Resources/Info-gnustep.plist GNUstep/Local/Library/SOGo/Appointments.SOGo/Resources/Italian.lproj/Localizable.strings -GNUstep/Local/Library/SOGo/Appointments.SOGo/Resources/Macedonian.lproj/Localizable.strings +GNUstep/Local/Library/SOGo/Appointments.SOGo/Resources/Lithuanian.lproj/Localizable.strings GNUstep/Local/Library/SOGo/Appointments.SOGo/Resources/MSExchangeFreeBusySOAPRequest.wo/MSExchangeFreeBusySOAPRequest.html GNUstep/Local/Library/SOGo/Appointments.SOGo/Resources/MSExchangeFreeBusySOAPRequest.wo/MSExchangeFreeBusySOAPRequest.wod GNUstep/Local/Library/SOGo/Appointments.SOGo/Resources/MSExchangeFreeBusySOAPResponseMap.plist +GNUstep/Local/Library/SOGo/Appointments.SOGo/Resources/Macedonian.lproj/Localizable.strings GNUstep/Local/Library/SOGo/Appointments.SOGo/Resources/NorwegianBokmal.lproj/Localizable.strings GNUstep/Local/Library/SOGo/Appointments.SOGo/Resources/NorwegianNynorsk.lproj/Localizable.strings GNUstep/Local/Library/SOGo/Appointments.SOGo/Resources/Polish.lproj/Localizable.strings @@ -661,6 +663,7 @@ GNUstep/Local/Library/SOGo/CommonUI.SOGo/Resources/Hungarian.lproj/Localizable.s GNUstep/Local/Library/SOGo/CommonUI.SOGo/Resources/Icelandic.lproj/Localizable.strings GNUstep/Local/Library/SOGo/CommonUI.SOGo/Resources/Info-gnustep.plist GNUstep/Local/Library/SOGo/CommonUI.SOGo/Resources/Italian.lproj/Localizable.strings +GNUstep/Local/Library/SOGo/CommonUI.SOGo/Resources/Lithuanian.lproj/Localizable.strings GNUstep/Local/Library/SOGo/CommonUI.SOGo/Resources/Macedonian.lproj/Localizable.strings GNUstep/Local/Library/SOGo/CommonUI.SOGo/Resources/NorwegianBokmal.lproj/Localizable.strings GNUstep/Local/Library/SOGo/CommonUI.SOGo/Resources/NorwegianNynorsk.lproj/Localizable.strings @@ -695,6 +698,7 @@ GNUstep/Local/Library/SOGo/Contacts.SOGo/Resources/Hungarian.lproj/Localizable.s GNUstep/Local/Library/SOGo/Contacts.SOGo/Resources/Icelandic.lproj/Localizable.strings GNUstep/Local/Library/SOGo/Contacts.SOGo/Resources/Info-gnustep.plist GNUstep/Local/Library/SOGo/Contacts.SOGo/Resources/Italian.lproj/Localizable.strings +GNUstep/Local/Library/SOGo/Contacts.SOGo/Resources/Lithuanian.lproj/Localizable.strings GNUstep/Local/Library/SOGo/Contacts.SOGo/Resources/Macedonian.lproj/Localizable.strings GNUstep/Local/Library/SOGo/Contacts.SOGo/Resources/NorwegianBokmal.lproj/Localizable.strings GNUstep/Local/Library/SOGo/Contacts.SOGo/Resources/NorwegianNynorsk.lproj/Localizable.strings @@ -728,6 +732,7 @@ GNUstep/Local/Library/SOGo/ContactsUI.SOGo/Resources/Hungarian.lproj/Localizable GNUstep/Local/Library/SOGo/ContactsUI.SOGo/Resources/Icelandic.lproj/Localizable.strings GNUstep/Local/Library/SOGo/ContactsUI.SOGo/Resources/Info-gnustep.plist GNUstep/Local/Library/SOGo/ContactsUI.SOGo/Resources/Italian.lproj/Localizable.strings +GNUstep/Local/Library/SOGo/ContactsUI.SOGo/Resources/Lithuanian.lproj/Localizable.strings GNUstep/Local/Library/SOGo/ContactsUI.SOGo/Resources/Macedonian.lproj/Localizable.strings GNUstep/Local/Library/SOGo/ContactsUI.SOGo/Resources/NorwegianBokmal.lproj/Localizable.strings GNUstep/Local/Library/SOGo/ContactsUI.SOGo/Resources/NorwegianNynorsk.lproj/Localizable.strings @@ -763,6 +768,7 @@ GNUstep/Local/Library/SOGo/MailPartViewers.SOGo/Resources/Hungarian.lproj/Locali GNUstep/Local/Library/SOGo/MailPartViewers.SOGo/Resources/Icelandic.lproj/Localizable.strings GNUstep/Local/Library/SOGo/MailPartViewers.SOGo/Resources/Info-gnustep.plist GNUstep/Local/Library/SOGo/MailPartViewers.SOGo/Resources/Italian.lproj/Localizable.strings +GNUstep/Local/Library/SOGo/MailPartViewers.SOGo/Resources/Lithuanian.lproj/Localizable.strings GNUstep/Local/Library/SOGo/MailPartViewers.SOGo/Resources/Macedonian.lproj/Localizable.strings GNUstep/Local/Library/SOGo/MailPartViewers.SOGo/Resources/NorwegianBokmal.lproj/Localizable.strings GNUstep/Local/Library/SOGo/MailPartViewers.SOGo/Resources/NorwegianNynorsk.lproj/Localizable.strings @@ -795,13 +801,13 @@ GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/Hungarian.lproj/Localizable.str GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/Icelandic.lproj/Localizable.strings GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/Info-gnustep.plist GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/Italian.lproj/Localizable.strings +GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/Lithuanian.lproj/Localizable.strings GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/Macedonian.lproj/Localizable.strings GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/NorwegianBokmal.lproj/Localizable.strings GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/NorwegianNynorsk.lproj/Localizable.strings GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/Polish.lproj/Localizable.strings GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/Portuguese.lproj/Localizable.strings GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/Russian.lproj/Localizable.strings -GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/Slovenian.lproj/Localizable.strings GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/SOGoMailArabicForward.wo/SOGoMailArabicForward.html GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/SOGoMailArabicForward.wo/SOGoMailArabicForward.wod GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/SOGoMailArabicReply.wo/SOGoMailArabicReply.html @@ -862,6 +868,10 @@ GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/SOGoMailItalianForward.wo/SOGoM GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/SOGoMailItalianForward.wo/SOGoMailItalianForward.wod GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/SOGoMailItalianReply.wo/SOGoMailItalianReply.html GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/SOGoMailItalianReply.wo/SOGoMailItalianReply.wod +GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/SOGoMailLithuanianForward.wo/SOGoMailLithuanianForward.html +GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/SOGoMailLithuanianForward.wo/SOGoMailLithuanianForward.wod +GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/SOGoMailLithuanianReply.wo/SOGoMailLithuanianReply.html +GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/SOGoMailLithuanianReply.wo/SOGoMailLithuanianReply.wod GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/SOGoMailMacedonianForward.wo/SOGoMailMacedonianForward.html GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/SOGoMailMacedonianForward.wo/SOGoMailMacedonianForward.wod GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/SOGoMailMacedonianReply.wo/SOGoMailMacedonianReply.html @@ -914,6 +924,7 @@ GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/SOGoMailWelshForward.wo/SOGoMai GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/SOGoMailWelshForward.wo/SOGoMailWelshForward.wod GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/SOGoMailWelshReply.wo/SOGoMailWelshReply.html GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/SOGoMailWelshReply.wo/SOGoMailWelshReply.wod +GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/Slovenian.lproj/Localizable.strings GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/SpanishArgentina.lproj/Localizable.strings GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/SpanishSpain.lproj/Localizable.strings GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/Swedish.lproj/Localizable.strings @@ -939,6 +950,7 @@ GNUstep/Local/Library/SOGo/MailerUI.SOGo/Resources/Hungarian.lproj/Localizable.s GNUstep/Local/Library/SOGo/MailerUI.SOGo/Resources/Icelandic.lproj/Localizable.strings GNUstep/Local/Library/SOGo/MailerUI.SOGo/Resources/Info-gnustep.plist GNUstep/Local/Library/SOGo/MailerUI.SOGo/Resources/Italian.lproj/Localizable.strings +GNUstep/Local/Library/SOGo/MailerUI.SOGo/Resources/Lithuanian.lproj/Localizable.strings GNUstep/Local/Library/SOGo/MailerUI.SOGo/Resources/Macedonian.lproj/Localizable.strings GNUstep/Local/Library/SOGo/MailerUI.SOGo/Resources/NorwegianBokmal.lproj/Localizable.strings GNUstep/Local/Library/SOGo/MailerUI.SOGo/Resources/NorwegianNynorsk.lproj/Localizable.strings @@ -992,6 +1004,8 @@ GNUstep/Local/Library/SOGo/MainUI.SOGo/Resources/Icelandic.lproj/Localizable.str GNUstep/Local/Library/SOGo/MainUI.SOGo/Resources/Info-gnustep.plist GNUstep/Local/Library/SOGo/MainUI.SOGo/Resources/Italian.lproj/Locale GNUstep/Local/Library/SOGo/MainUI.SOGo/Resources/Italian.lproj/Localizable.strings +GNUstep/Local/Library/SOGo/MainUI.SOGo/Resources/Lithuanian.lproj/Locale +GNUstep/Local/Library/SOGo/MainUI.SOGo/Resources/Lithuanian.lproj/Localizable.strings GNUstep/Local/Library/SOGo/MainUI.SOGo/Resources/Macedonian.lproj/Locale GNUstep/Local/Library/SOGo/MainUI.SOGo/Resources/Macedonian.lproj/Localizable.strings GNUstep/Local/Library/SOGo/MainUI.SOGo/Resources/NorwegianBokmal.lproj/Locale @@ -1042,6 +1056,7 @@ GNUstep/Local/Library/SOGo/PreferencesUI.SOGo/Resources/Hungarian.lproj/Localiza GNUstep/Local/Library/SOGo/PreferencesUI.SOGo/Resources/Icelandic.lproj/Localizable.strings GNUstep/Local/Library/SOGo/PreferencesUI.SOGo/Resources/Info-gnustep.plist GNUstep/Local/Library/SOGo/PreferencesUI.SOGo/Resources/Italian.lproj/Localizable.strings +GNUstep/Local/Library/SOGo/PreferencesUI.SOGo/Resources/Lithuanian.lproj/Localizable.strings GNUstep/Local/Library/SOGo/PreferencesUI.SOGo/Resources/Macedonian.lproj/Localizable.strings GNUstep/Local/Library/SOGo/PreferencesUI.SOGo/Resources/NorwegianBokmal.lproj/Localizable.strings GNUstep/Local/Library/SOGo/PreferencesUI.SOGo/Resources/NorwegianNynorsk.lproj/Localizable.strings @@ -1075,6 +1090,7 @@ GNUstep/Local/Library/SOGo/SchedulerUI.SOGo/Resources/Hungarian.lproj/Localizabl GNUstep/Local/Library/SOGo/SchedulerUI.SOGo/Resources/Icelandic.lproj/Localizable.strings GNUstep/Local/Library/SOGo/SchedulerUI.SOGo/Resources/Info-gnustep.plist GNUstep/Local/Library/SOGo/SchedulerUI.SOGo/Resources/Italian.lproj/Localizable.strings +GNUstep/Local/Library/SOGo/SchedulerUI.SOGo/Resources/Lithuanian.lproj/Localizable.strings GNUstep/Local/Library/SOGo/SchedulerUI.SOGo/Resources/Macedonian.lproj/Localizable.strings GNUstep/Local/Library/SOGo/SchedulerUI.SOGo/Resources/NorwegianBokmal.lproj/Localizable.strings GNUstep/Local/Library/SOGo/SchedulerUI.SOGo/Resources/NorwegianNynorsk.lproj/Localizable.strings @@ -1193,6 +1209,9 @@ GNUstep/Local/Library/SOGo/Templates/SOGoACLIcelandicRemovalAdvisory.wox GNUstep/Local/Library/SOGo/Templates/SOGoACLItalianAdditionAdvisory.wox GNUstep/Local/Library/SOGo/Templates/SOGoACLItalianModificationAdvisory.wox GNUstep/Local/Library/SOGo/Templates/SOGoACLItalianRemovalAdvisory.wox +GNUstep/Local/Library/SOGo/Templates/SOGoACLLithuanianAdditionAdvisory.wox +GNUstep/Local/Library/SOGo/Templates/SOGoACLLithuanianModificationAdvisory.wox +GNUstep/Local/Library/SOGo/Templates/SOGoACLLithuanianRemovalAdvisory.wox GNUstep/Local/Library/SOGo/Templates/SOGoACLMacedonianAdditionAdvisory.wox GNUstep/Local/Library/SOGo/Templates/SOGoACLMacedonianModificationAdvisory.wox GNUstep/Local/Library/SOGo/Templates/SOGoACLMacedonianRemovalAdvisory.wox @@ -1215,8 +1234,8 @@ GNUstep/Local/Library/SOGo/Templates/SOGoACLSlovakAdditionAdvisory.wox GNUstep/Local/Library/SOGo/Templates/SOGoACLSlovakModificationAdvisory.wox GNUstep/Local/Library/SOGo/Templates/SOGoACLSlovakRemovalAdvisory.wox GNUstep/Local/Library/SOGo/Templates/SOGoACLSlovenianAdditionAdvisory.wox -GNUstep/Local/Library/SOGo/Templates/SOGoACLSlovenianRemovalAdvisory.wox GNUstep/Local/Library/SOGo/Templates/SOGoACLSlovenianModificationAdvisory.wox +GNUstep/Local/Library/SOGo/Templates/SOGoACLSlovenianRemovalAdvisory.wox GNUstep/Local/Library/SOGo/Templates/SOGoACLSpanishArgentinaAdditionAdvisory.wox GNUstep/Local/Library/SOGo/Templates/SOGoACLSpanishArgentinaModificationAdvisory.wox GNUstep/Local/Library/SOGo/Templates/SOGoACLSpanishArgentinaRemovalAdvisory.wox @@ -1261,6 +1280,8 @@ GNUstep/Local/Library/SOGo/Templates/SOGoFolderIcelandicAdditionAdvisory.wox GNUstep/Local/Library/SOGo/Templates/SOGoFolderIcelandicRemovalAdvisory.wox GNUstep/Local/Library/SOGo/Templates/SOGoFolderItalianAdditionAdvisory.wox GNUstep/Local/Library/SOGo/Templates/SOGoFolderItalianRemovalAdvisory.wox +GNUstep/Local/Library/SOGo/Templates/SOGoFolderLithuanianAdditionAdvisory.wox +GNUstep/Local/Library/SOGo/Templates/SOGoFolderLithuanianRemovalAdvisory.wox GNUstep/Local/Library/SOGo/Templates/SOGoFolderMacedonianAdditionAdvisory.wox GNUstep/Local/Library/SOGo/Templates/SOGoFolderMacedonianRemovalAdvisory.wox GNUstep/Local/Library/SOGo/Templates/SOGoFolderNorwegianBokmalAdditionAdvisory.wox @@ -1431,6 +1452,7 @@ GNUstep/Local/Library/SOGo/WebServerResources/busy.gif GNUstep/Local/Library/SOGo/WebServerResources/calendar-folder-16x16.png GNUstep/Local/Library/SOGo/WebServerResources/calendar-reload.png GNUstep/Local/Library/SOGo/WebServerResources/choose-date.png +GNUstep/Local/Library/SOGo/WebServerResources/ckeditor/LICENSE.md GNUstep/Local/Library/SOGo/WebServerResources/ckeditor/build-config.js GNUstep/Local/Library/SOGo/WebServerResources/ckeditor/ckeditor.js GNUstep/Local/Library/SOGo/WebServerResources/ckeditor/config.js @@ -1455,16 +1477,15 @@ GNUstep/Local/Library/SOGo/WebServerResources/ckeditor/lang/nb.js GNUstep/Local/Library/SOGo/WebServerResources/ckeditor/lang/nl.js GNUstep/Local/Library/SOGo/WebServerResources/ckeditor/lang/no.js GNUstep/Local/Library/SOGo/WebServerResources/ckeditor/lang/pl.js -GNUstep/Local/Library/SOGo/WebServerResources/ckeditor/lang/pt.js GNUstep/Local/Library/SOGo/WebServerResources/ckeditor/lang/pt-br.js +GNUstep/Local/Library/SOGo/WebServerResources/ckeditor/lang/pt.js GNUstep/Local/Library/SOGo/WebServerResources/ckeditor/lang/ru.js GNUstep/Local/Library/SOGo/WebServerResources/ckeditor/lang/sk.js GNUstep/Local/Library/SOGo/WebServerResources/ckeditor/lang/sl.js GNUstep/Local/Library/SOGo/WebServerResources/ckeditor/lang/sv.js GNUstep/Local/Library/SOGo/WebServerResources/ckeditor/lang/uk.js -GNUstep/Local/Library/SOGo/WebServerResources/ckeditor/lang/zh.js GNUstep/Local/Library/SOGo/WebServerResources/ckeditor/lang/zh-cn.js -GNUstep/Local/Library/SOGo/WebServerResources/ckeditor/LICENSE.md +GNUstep/Local/Library/SOGo/WebServerResources/ckeditor/lang/zh.js GNUstep/Local/Library/SOGo/WebServerResources/ckeditor/plugins/about/dialogs/about.js GNUstep/Local/Library/SOGo/WebServerResources/ckeditor/plugins/about/dialogs/hidpi/logo_ckeditor.png GNUstep/Local/Library/SOGo/WebServerResources/ckeditor/plugins/about/dialogs/logo_ckeditor.png diff --git a/www/webkit-gtk2/Makefile b/www/webkit-gtk2/Makefile index 28094617b48..97a5169bbe5 100644 --- a/www/webkit-gtk2/Makefile +++ b/www/webkit-gtk2/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= webkit -PORTVERSION= 2.4.9 -PORTREVISION= 2 +PORTVERSION= 2.4.10 CATEGORIES= www MASTER_SITES= http://webkitgtk.org/releases/ PKGNAMESUFFIX= -gtk2 diff --git a/www/webkit-gtk2/distinfo b/www/webkit-gtk2/distinfo index ab2c96e51ef..3293ca3ad33 100644 --- a/www/webkit-gtk2/distinfo +++ b/www/webkit-gtk2/distinfo @@ -1,2 +1,2 @@ -SHA256 (webkitgtk-2.4.9.tar.xz) = afdf29e7828816cad0be2604cf19421e96d96bf493987328ffc8813bb20ac564 -SIZE (webkitgtk-2.4.9.tar.xz) = 9840740 +SHA256 (webkitgtk-2.4.10.tar.xz) = 33fda4b20d7fec2d6e9399ba03ef3f6d2a733c628bd77d397880c44e4bf7c614 +SIZE (webkitgtk-2.4.10.tar.xz) = 9867504 diff --git a/www/webkit-gtk2/files/patch-CVE-2014-1748 b/www/webkit-gtk2/files/patch-CVE-2014-1748 deleted file mode 100644 index b5cfda9f678..00000000000 --- a/www/webkit-gtk2/files/patch-CVE-2014-1748 +++ /dev/null @@ -1,10 +0,0 @@ ---- ./Source/WebCore/platform/ScrollView.cpp.orig 2016-01-05 21:53:38.202759000 +0100 -+++ ./Source/WebCore/platform/ScrollView.cpp 2016-01-05 21:55:50.429266000 +0100 -@@ -1177,6 +1177,7 @@ void ScrollView::paint(GraphicsContext* - scrollViewDirtyRect.intersect(visibleAreaWithScrollbars); - context->translate(x(), y()); - scrollViewDirtyRect.moveBy(-location()); -+ context->clip(IntRect(IntPoint(), visibleAreaWithScrollbars.size())); - - paintScrollbars(context, scrollViewDirtyRect); - } diff --git a/www/webkit-gtk2/pkg-plist b/www/webkit-gtk2/pkg-plist index 4a0d8534715..0abb9487db4 100644 --- a/www/webkit-gtk2/pkg-plist +++ b/www/webkit-gtk2/pkg-plist @@ -255,10 +255,10 @@ lib/girepository-1.0/JavaScriptCore-1.0.typelib lib/girepository-1.0/WebKit-1.0.typelib lib/libjavascriptcoregtk-1.0.so lib/libjavascriptcoregtk-1.0.so.0 -lib/libjavascriptcoregtk-1.0.so.0.16.17 +lib/libjavascriptcoregtk-1.0.so.0.16.18 lib/libwebkitgtk-1.0.so lib/libwebkitgtk-1.0.so.0 -lib/libwebkitgtk-1.0.so.0.22.15 +lib/libwebkitgtk-1.0.so.0.22.16 libdata/pkgconfig/javascriptcoregtk-1.0.pc libdata/pkgconfig/webkit-1.0.pc share/gir-1.0/JavaScriptCore-1.0.gir @@ -426,7 +426,6 @@ share/gtk-doc/html/webkit1/webkitdomgtk/ch01.html share/gtk-doc/html/webkit1/webkitdomgtk/home.png share/gtk-doc/html/webkit1/webkitdomgtk/index-all.html share/gtk-doc/html/webkit1/webkitdomgtk/index.html -share/gtk-doc/html/webkit1/webkitdomgtk/index.sgml share/gtk-doc/html/webkit1/webkitdomgtk/left-insensitive.png share/gtk-doc/html/webkit1/webkitdomgtk/left.png share/gtk-doc/html/webkit1/webkitdomgtk/right-insensitive.png @@ -499,7 +498,6 @@ share/gtk-doc/html/webkit1/webkitgtk/index-1.3.8.html share/gtk-doc/html/webkit1/webkitgtk/index-all.html share/gtk-doc/html/webkit1/webkitgtk/index-deprecated.html share/gtk-doc/html/webkit1/webkitgtk/index.html -share/gtk-doc/html/webkit1/webkitgtk/index.sgml share/gtk-doc/html/webkit1/webkitgtk/left-insensitive.png share/gtk-doc/html/webkit1/webkitgtk/left.png share/gtk-doc/html/webkit1/webkitgtk/right-insensitive.png @@ -532,6 +530,7 @@ share/locale/hi/LC_MESSAGES/WebKitGTK-2.0.mo share/locale/hu/LC_MESSAGES/WebKitGTK-2.0.mo share/locale/id/LC_MESSAGES/WebKitGTK-2.0.mo share/locale/it/LC_MESSAGES/WebKitGTK-2.0.mo +share/locale/ja/LC_MESSAGES/WebKitGTK-2.0.mo share/locale/kn/LC_MESSAGES/WebKitGTK-2.0.mo share/locale/ko/LC_MESSAGES/WebKitGTK-2.0.mo share/locale/lt/LC_MESSAGES/WebKitGTK-2.0.mo @@ -556,6 +555,7 @@ share/locale/te/LC_MESSAGES/WebKitGTK-2.0.mo share/locale/uk/LC_MESSAGES/WebKitGTK-2.0.mo share/locale/vi/LC_MESSAGES/WebKitGTK-2.0.mo share/locale/zh_CN/LC_MESSAGES/WebKitGTK-2.0.mo +share/locale/zh_TW/LC_MESSAGES/WebKitGTK-2.0.mo share/webkitgtk-1.0/images/deleteButton.png share/webkitgtk-1.0/images/inputSpeech.png share/webkitgtk-1.0/images/missingImage.png diff --git a/www/webkit-gtk3/Makefile b/www/webkit-gtk3/Makefile index a398cf33ae2..b3a4c119d9a 100644 --- a/www/webkit-gtk3/Makefile +++ b/www/webkit-gtk3/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= webkit -PORTVERSION= 2.4.9 -PORTREVISION= 2 +PORTVERSION= 2.4.10 CATEGORIES= www MASTER_SITES= http://webkitgtk.org/releases/ PKGNAMESUFFIX= -gtk3 diff --git a/www/webkit-gtk3/distinfo b/www/webkit-gtk3/distinfo index ab2c96e51ef..3293ca3ad33 100644 --- a/www/webkit-gtk3/distinfo +++ b/www/webkit-gtk3/distinfo @@ -1,2 +1,2 @@ -SHA256 (webkitgtk-2.4.9.tar.xz) = afdf29e7828816cad0be2604cf19421e96d96bf493987328ffc8813bb20ac564 -SIZE (webkitgtk-2.4.9.tar.xz) = 9840740 +SHA256 (webkitgtk-2.4.10.tar.xz) = 33fda4b20d7fec2d6e9399ba03ef3f6d2a733c628bd77d397880c44e4bf7c614 +SIZE (webkitgtk-2.4.10.tar.xz) = 9867504 diff --git a/www/webkit-gtk3/files/patch-CVE-2014-1748 b/www/webkit-gtk3/files/patch-CVE-2014-1748 deleted file mode 100644 index b5cfda9f678..00000000000 --- a/www/webkit-gtk3/files/patch-CVE-2014-1748 +++ /dev/null @@ -1,10 +0,0 @@ ---- ./Source/WebCore/platform/ScrollView.cpp.orig 2016-01-05 21:53:38.202759000 +0100 -+++ ./Source/WebCore/platform/ScrollView.cpp 2016-01-05 21:55:50.429266000 +0100 -@@ -1177,6 +1177,7 @@ void ScrollView::paint(GraphicsContext* - scrollViewDirtyRect.intersect(visibleAreaWithScrollbars); - context->translate(x(), y()); - scrollViewDirtyRect.moveBy(-location()); -+ context->clip(IntRect(IntPoint(), visibleAreaWithScrollbars.size())); - - paintScrollbars(context, scrollViewDirtyRect); - } diff --git a/www/webkit-gtk3/pkg-plist b/www/webkit-gtk3/pkg-plist index ea3d8e454da..48dd91dc526 100644 --- a/www/webkit-gtk3/pkg-plist +++ b/www/webkit-gtk3/pkg-plist @@ -258,13 +258,13 @@ lib/girepository-1.0/WebKit2-3.0.typelib lib/girepository-1.0/WebKit2WebExtension-3.0.typelib lib/libjavascriptcoregtk-3.0.so lib/libjavascriptcoregtk-3.0.so.0 -lib/libjavascriptcoregtk-3.0.so.0.16.17 +lib/libjavascriptcoregtk-3.0.so.0.16.18 lib/libwebkit2gtk-3.0.so lib/libwebkit2gtk-3.0.so.25 -lib/libwebkit2gtk-3.0.so.25.10.12 +lib/libwebkit2gtk-3.0.so.25.10.13 lib/libwebkitgtk-3.0.so lib/libwebkitgtk-3.0.so.0 -lib/libwebkitgtk-3.0.so.0.22.15 +lib/libwebkitgtk-3.0.so.0.22.16 lib/webkit2gtk-3.0/injected-bundle/libwebkit2gtkinjectedbundle.so libdata/pkgconfig/javascriptcoregtk-3.0.pc libdata/pkgconfig/webkit2gtk-3.0.pc @@ -320,7 +320,6 @@ share/gtk-doc/html/webkit2gtk/ch02.html share/gtk-doc/html/webkit2gtk/home.png share/gtk-doc/html/webkit2gtk/index-all.html share/gtk-doc/html/webkit2gtk/index.html -share/gtk-doc/html/webkit2gtk/index.sgml share/gtk-doc/html/webkit2gtk/left-insensitive.png share/gtk-doc/html/webkit2gtk/left.png share/gtk-doc/html/webkit2gtk/right-insensitive.png @@ -494,7 +493,6 @@ share/gtk-doc/html/webkitdomgtk/ch01.html share/gtk-doc/html/webkitdomgtk/home.png share/gtk-doc/html/webkitdomgtk/index-all.html share/gtk-doc/html/webkitdomgtk/index.html -share/gtk-doc/html/webkitdomgtk/index.sgml share/gtk-doc/html/webkitdomgtk/left-insensitive.png share/gtk-doc/html/webkitdomgtk/left.png share/gtk-doc/html/webkitdomgtk/right-insensitive.png @@ -567,7 +565,6 @@ share/gtk-doc/html/webkitgtk/index-1.3.8.html share/gtk-doc/html/webkitgtk/index-all.html share/gtk-doc/html/webkitgtk/index-deprecated.html share/gtk-doc/html/webkitgtk/index.html -share/gtk-doc/html/webkitgtk/index.sgml share/gtk-doc/html/webkitgtk/left-insensitive.png share/gtk-doc/html/webkitgtk/left.png share/gtk-doc/html/webkitgtk/right-insensitive.png @@ -600,6 +597,7 @@ share/locale/hi/LC_MESSAGES/WebKitGTK-3.0.mo share/locale/hu/LC_MESSAGES/WebKitGTK-3.0.mo share/locale/id/LC_MESSAGES/WebKitGTK-3.0.mo share/locale/it/LC_MESSAGES/WebKitGTK-3.0.mo +share/locale/ja/LC_MESSAGES/WebKitGTK-3.0.mo share/locale/kn/LC_MESSAGES/WebKitGTK-3.0.mo share/locale/ko/LC_MESSAGES/WebKitGTK-3.0.mo share/locale/lt/LC_MESSAGES/WebKitGTK-3.0.mo @@ -624,6 +622,7 @@ share/locale/te/LC_MESSAGES/WebKitGTK-3.0.mo share/locale/uk/LC_MESSAGES/WebKitGTK-3.0.mo share/locale/vi/LC_MESSAGES/WebKitGTK-3.0.mo share/locale/zh_CN/LC_MESSAGES/WebKitGTK-3.0.mo +share/locale/zh_TW/LC_MESSAGES/WebKitGTK-3.0.mo share/webkitgtk-3.0/images/deleteButton.png share/webkitgtk-3.0/images/inputSpeech.png share/webkitgtk-3.0/images/missingImage.png diff --git a/www/xombrero/Makefile b/www/xombrero/Makefile index d4271117a22..b40952f9461 100644 --- a/www/xombrero/Makefile +++ b/www/xombrero/Makefile @@ -7,11 +7,13 @@ PORTREVISION= 3 CATEGORIES= www MASTER_SITES= https://opensource.conformal.com/snapshots/xombrero/ -MAINTAINER= zeising@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Minimalists vi-like web browser based on webkit and GTK+ LICENSE= ISCL +BROKEN= Does not build + LIB_DEPENDS= libgnutls.so:security/gnutls \ libsoup-2.4.so:devel/libsoup diff --git a/www/xpi-uBlock_origin/Makefile b/www/xpi-uBlock_origin/Makefile index 18cdc595452..348ac2b1057 100644 --- a/www/xpi-uBlock_origin/Makefile +++ b/www/xpi-uBlock_origin/Makefile @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME= ublock_origin -PORTVERSION= 1.6.8 -DISTVERSIONSUFFIX= -fx+sm+tb+an +PORTVERSION= 1.7.0 +DISTVERSIONSUFFIX= -sm+tb+fx+an CATEGORIES= www MAINTAINER= thierry@FreeBSD.org diff --git a/www/xpi-uBlock_origin/distinfo b/www/xpi-uBlock_origin/distinfo index 6a7cc37b096..81d01bfd322 100644 --- a/www/xpi-uBlock_origin/distinfo +++ b/www/xpi-uBlock_origin/distinfo @@ -1,2 +1,2 @@ -SHA256 (xpi/ublock_origin-1.6.8-fx+sm+tb+an.xpi) = 39dc68cbc9f46a9954650941634842624845e0561fd8c150db66662767c6c207 -SIZE (xpi/ublock_origin-1.6.8-fx+sm+tb+an.xpi) = 1456068 +SHA256 (xpi/ublock_origin-1.7.0-sm+tb+fx+an.xpi) = 6df84d4886bc2e0b70b97c08be8e50943526f3ab8353c7e14960e5a2c27cb33a +SIZE (xpi/ublock_origin-1.7.0-sm+tb+fx+an.xpi) = 1460528 diff --git a/x11-themes/adwaita-common/Makefile b/x11-themes/adwaita-common/Makefile index 2d1f7f438f6..c931065b49b 100644 --- a/x11-themes/adwaita-common/Makefile +++ b/x11-themes/adwaita-common/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= adwaita -PORTVERSION= 0.3 +PORTVERSION= 0.4 CATEGORIES= x11-themes PKGNAMESUFFIX= -common diff --git a/x11-themes/adwaita-common/distinfo b/x11-themes/adwaita-common/distinfo index 4948fe55021..433099e728b 100644 --- a/x11-themes/adwaita-common/distinfo +++ b/x11-themes/adwaita-common/distinfo @@ -1,2 +1,2 @@ -SHA256 (MartinBriza-adwaita-qt-0.3_GH0.tar.gz) = 92f1a2c7afe5badb98bf63a907516ae9c48ddb0d1bfa6904116d1b6b999cf384 -SIZE (MartinBriza-adwaita-qt-0.3_GH0.tar.gz) = 869322 +SHA256 (MartinBriza-adwaita-qt-0.4_GH0.tar.gz) = 48ccf17088afb77e98fe409f4dc6fdccd035bbdbcb51f0c2f0da00ef204daba0 +SIZE (MartinBriza-adwaita-qt-0.4_GH0.tar.gz) = 871126 diff --git a/x11-themes/adwaita-qt4/Makefile b/x11-themes/adwaita-qt4/Makefile index bdfa17225ca..9f6fff762c4 100644 --- a/x11-themes/adwaita-qt4/Makefile +++ b/x11-themes/adwaita-qt4/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= adwaita -PORTVERSION= 0.3 +PORTVERSION= 0.4 CATEGORIES= x11-themes PKGNAMESUFFIX= -qt4 @@ -12,7 +12,7 @@ COMMENT= Adwaita theme for Qt5 applications LICENSE= GPLv2 LGPL20 LICENSE_COMB= multi -RUN_DEPENDS= adwaita-common>=0.3:x11-themes/adwaita-common +RUN_DEPENDS= adwaita-common>=0.4:x11-themes/adwaita-common USE_GITHUB= yes GH_ACCOUNT= MartinBriza @@ -22,11 +22,9 @@ DISTINFO_FILE= ${.CURDIR}/../adwaita-common/distinfo EXTRA_PATCHES= ${.CURDIR}/../adwaita-qt5/files/patch-CMakeLists.txt PLIST_FILES= %%QT_PLUGINDIR%%/styles/adwaita.so -USES= cmake:outsource compiler:c++11-lib pkgconfig +USES= cmake:outsource compiler:c++11-lib localbase pkgconfig USE_QT4= moc_build rcc_build uic_build qmake_build corelib gui -CXXFLAGS+= -I${LOCALBASE}/include - CMAKE_ARGS+= -DBUILD_EXAMPLE:BOOL=OFF \ -DUSE_QT4:BOOL=ON diff --git a/x11-themes/adwaita-qt5/Makefile b/x11-themes/adwaita-qt5/Makefile index 41d4b9ec2b7..3d084440596 100644 --- a/x11-themes/adwaita-qt5/Makefile +++ b/x11-themes/adwaita-qt5/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= adwaita -PORTVERSION= 0.3 +PORTVERSION= 0.4 CATEGORIES= x11-themes PKGNAMESUFFIX= -qt5 @@ -12,7 +12,7 @@ COMMENT= Adwaita theme for Qt5 applications LICENSE= GPLv2 LGPL20 LICENSE_COMB= multi -RUN_DEPENDS= adwaita-common>=0.3:x11-themes/adwaita-common +RUN_DEPENDS= adwaita-common>=0.4:x11-themes/adwaita-common USE_GITHUB= yes GH_ACCOUNT= MartinBriza @@ -21,11 +21,9 @@ GH_PROJECT= adwaita-qt DISTINFO_FILE= ${.CURDIR}/../adwaita-common/distinfo PLIST_FILES= %%QT_PLUGINDIR%%/styles/adwaita.so -USES= cmake:outsource compiler:c++11-lib pkgconfig +USES= cmake:outsource compiler:c++11-lib localbase pkgconfig USE_QT5= buildtools_build qmake_build core gui widgets -CXXFLAGS+= -I${LOCALBASE}/include - CMAKE_ARGS+= -DBUILD_EXAMPLE:BOOL=OFF .include diff --git a/x11-themes/adwaita-qt5/files/patch-src_style_adwaita.cpp b/x11-themes/adwaita-qt5/files/patch-src_style_adwaita.cpp deleted file mode 100644 index 4d8a483badc..00000000000 --- a/x11-themes/adwaita-qt5/files/patch-src_style_adwaita.cpp +++ /dev/null @@ -1,25 +0,0 @@ ---- src/style/adwaita.cpp.orig 2015-07-20 11:19:10 UTC -+++ src/style/adwaita.cpp -@@ -1,6 +1,6 @@ - /* - * Adwaita Qt Theme -- * Copyright (C) 2014 Martin Bříza -+ * Copyright (C) 2014 Martin Bríza - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public -@@ -19,10 +19,10 @@ - */ - - #include --#include --#include --#include --#include -+#include -+#include -+#include -+#include - - #include "adwaita.h" - #include "config.h"