diff --git a/chinese/p5-Encode-HanExtra/Makefile b/chinese/p5-Encode-HanExtra/Makefile
index 271cecc3163..e2716b8f089 100644
--- a/chinese/p5-Encode-HanExtra/Makefile
+++ b/chinese/p5-Encode-HanExtra/Makefile
@@ -8,7 +8,7 @@ CATEGORIES= chinese perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
-MAINTAINER= leeym@FreeBSD.org
+MAINTAINER= perl@FreeBSD.org
COMMENT= Extra sets of Chinese encodings
LICENSE= MIT
diff --git a/chinese/telnet/Makefile b/chinese/telnet/Makefile
index 69d4da0d2a2..d2aaa58b164 100644
--- a/chinese/telnet/Makefile
+++ b/chinese/telnet/Makefile
@@ -8,7 +8,7 @@ CATEGORIES= chinese
MASTER_SITES= # none
DISTFILES= # none
-MAINTAINER= leeym@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= 8bit compatible telnet client for Chinese input
PLIST_FILES= bin/zh-telnet man/man1/zh-telnet.1.gz
diff --git a/comms/gqrx/Makefile b/comms/gqrx/Makefile
index 2202e96103b..8e31de86c12 100644
--- a/comms/gqrx/Makefile
+++ b/comms/gqrx/Makefile
@@ -3,9 +3,8 @@
PORTNAME= gqrx
PORTVERSION= 2.6
-PORTREVISION= 1
DISTVERSIONPREFIX= v
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= comms hamradio
diff --git a/comms/gr-osmosdr/Makefile b/comms/gr-osmosdr/Makefile
index 90ceaf40ec9..ac46e5e8385 100644
--- a/comms/gr-osmosdr/Makefile
+++ b/comms/gr-osmosdr/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= gr-osmosdr
-PORTVERSION= 20150716
-PORTREVISION= 4
+PORTVERSION= 20160622
CATEGORIES= comms hamradio
MASTER_SITES= http://contribs.martymac.org/FreeBSD-ports/distfiles/ \
LOCAL/martymac
diff --git a/comms/gr-osmosdr/distinfo b/comms/gr-osmosdr/distinfo
index fd750b7d00b..8832e53c4d8 100644
--- a/comms/gr-osmosdr/distinfo
+++ b/comms/gr-osmosdr/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gr-osmosdr-20150716.tgz) = 217e3f96022fa6bf7fe9645ae12c6c8e0eb11836afca0cad5281b7c9bbb23288
-SIZE (gr-osmosdr-20150716.tgz) = 250857
+TIMESTAMP = 1482422442
+SHA256 (gr-osmosdr-20160622.tgz) = 8219cfbb613040c7878f72ba33d60a1fd5d9af0baba318485d6ed8461f3d1baa
+SIZE (gr-osmosdr-20160622.tgz) = 249098
diff --git a/comms/rubygem-ruby-termios/Makefile b/comms/rubygem-ruby-termios/Makefile
index 2fff44b5ccb..14b8c6ff810 100644
--- a/comms/rubygem-ruby-termios/Makefile
+++ b/comms/rubygem-ruby-termios/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= ruby-termios
-PORTVERSION= 0.9.6
+PORTVERSION= 1.0.2
CATEGORIES= comms rubygems
MASTER_SITES= RG
diff --git a/comms/rubygem-ruby-termios/distinfo b/comms/rubygem-ruby-termios/distinfo
index 0602bc2bbbc..d7a13c990f0 100644
--- a/comms/rubygem-ruby-termios/distinfo
+++ b/comms/rubygem-ruby-termios/distinfo
@@ -1,2 +1,3 @@
-SHA256 (rubygem/ruby-termios-0.9.6.gem) = 1ca5f258535db66613de6bbf04a1c34894972a0dd1e6e475a9adba5a74e1a2c3
-SIZE (rubygem/ruby-termios-0.9.6.gem) = 15360
+TIMESTAMP = 1483349492
+SHA256 (rubygem/ruby-termios-1.0.2.gem) = 88c64c79657cf91bd4239030f5ac452ed0db55b15b492037129df2fe8529ae19
+SIZE (rubygem/ruby-termios-1.0.2.gem) = 17408
diff --git a/databases/gqlplus/Makefile b/databases/gqlplus/Makefile
index 7e40920aa30..95c2502160f 100644
--- a/databases/gqlplus/Makefile
+++ b/databases/gqlplus/Makefile
@@ -6,7 +6,7 @@ PORTVERSION= 1.16
CATEGORIES= databases
MASTER_SITES= SF
-MAINTAINER= leeym@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= SQL*PLUS with commandline editing, history, and name completion
LICENSE= GPLv2
diff --git a/databases/ldb/Makefile b/databases/ldb/Makefile
index ce79e1bb899..c51186a683a 100644
--- a/databases/ldb/Makefile
+++ b/databases/ldb/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= ldb
-PORTVERSION= 1.1.26
+PORTVERSION= 1.1.29
PORTREVISION= 0
PORTEPOCH= 0
CATEGORIES= databases
@@ -20,6 +20,7 @@ WAF_CMD= buildtools/bin/waf
CONFIGURE_LOG= bin/config.log
USE_OPENLDAP= yes
+WANT_OPENLDAP_SASL= yes
PKGCONFIGDIR?= ${PREFIX}/libdata/pkgconfig
PLIST_SUB+= PKGCONFIGDIR=${PKGCONFIGDIR:S;${PREFIX}/;;}
@@ -32,9 +33,9 @@ CONFIGURE_ARGS+= --mandir=${MANPREFIX}/man \
OPTIONS_DEFINE= MANPAGES
MANPAGES_DESC= Build and install manpages (requires textproc/docbook-xsl)
-BUILD_DEPENDS+= talloc>=2.1.5:devel/talloc \
- tevent>=0.9.27:devel/tevent \
- tdb>=1.3.8,1:databases/tdb \
+BUILD_DEPENDS+= talloc>=2.1.8:devel/talloc \
+ tevent>=0.9.31:devel/tevent \
+ tdb>=1.3.12,1:databases/tdb \
popt>=0:devel/popt
RUN_DEPENDS:= ${BUILD_DEPENDS}
diff --git a/databases/ldb/distinfo b/databases/ldb/distinfo
index 4ba8bb0b11b..6dd5bc450d1 100644
--- a/databases/ldb/distinfo
+++ b/databases/ldb/distinfo
@@ -1,2 +1,3 @@
-SHA256 (ldb-1.1.26.tar.gz) = 8843c7a72b980d9413ba6c494c039bccd10c524b37fda2917afb147745d8b2e6
-SIZE (ldb-1.1.26.tar.gz) = 1262660
+TIMESTAMP = 1483326847
+SHA256 (ldb-1.1.29.tar.gz) = 59d84f9a5b799f519ba7b2685bb46f5a26f1bbf05b7a144b2f5e017d01d80f97
+SIZE (ldb-1.1.29.tar.gz) = 1277551
diff --git a/databases/ldb/files/ldb.3 b/databases/ldb/files/ldb.3
index 4c594a9c866..4dcdb734f67 100644
--- a/databases/ldb/files/ldb.3
+++ b/databases/ldb/files/ldb.3
@@ -2,12 +2,12 @@
.\" Title: ldb
.\" Author: [see the "Author" section]
.\" Generator: DocBook XSL Stylesheets v1.76.1
-.\" Date: 01/29/2013
+.\" Date: 01/02/2017
.\" Manual: System Administration tools
.\" Source: LDB 1.1
.\" Language: English
.\"
-.TH "LDB" "3" "01/29/2013" "LDB 1\&.1" "System Administration tools"
+.TH "LDB" "3" "01/02/2017" "LDB 1\&.1" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/databases/ldb/files/ldbadd.1 b/databases/ldb/files/ldbadd.1
index c92ecd0719c..4e8a2914878 100644
--- a/databases/ldb/files/ldbadd.1
+++ b/databases/ldb/files/ldbadd.1
@@ -2,12 +2,12 @@
.\" Title: ldbadd
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.76.1
-.\" Date: 01/29/2013
+.\" Date: 01/02/2017
.\" Manual: System Administration tools
.\" Source: LDB 1.1
.\" Language: English
.\"
-.TH "LDBADD" "1" "01/29/2013" "LDB 1\&.1" "System Administration tools"
+.TH "LDBADD" "1" "01/02/2017" "LDB 1\&.1" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/databases/ldb/files/ldbdel.1 b/databases/ldb/files/ldbdel.1
index 57f15376218..082b49d7261 100644
--- a/databases/ldb/files/ldbdel.1
+++ b/databases/ldb/files/ldbdel.1
@@ -2,12 +2,12 @@
.\" Title: ldbdel
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.76.1
-.\" Date: 01/29/2013
+.\" Date: 01/02/2017
.\" Manual: System Administration tools
.\" Source: LDB 1.1
.\" Language: English
.\"
-.TH "LDBDEL" "1" "01/29/2013" "LDB 1\&.1" "System Administration tools"
+.TH "LDBDEL" "1" "01/02/2017" "LDB 1\&.1" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/databases/ldb/files/ldbedit.1 b/databases/ldb/files/ldbedit.1
index e21b3e89535..af36f14dce5 100644
--- a/databases/ldb/files/ldbedit.1
+++ b/databases/ldb/files/ldbedit.1
@@ -2,12 +2,12 @@
.\" Title: ldbedit
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.76.1
-.\" Date: 01/29/2013
+.\" Date: 01/02/2017
.\" Manual: System Administration tools
.\" Source: LDB 1.1
.\" Language: English
.\"
-.TH "LDBEDIT" "1" "01/29/2013" "LDB 1\&.1" "System Administration tools"
+.TH "LDBEDIT" "1" "01/02/2017" "LDB 1\&.1" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/databases/ldb/files/ldbmodify.1 b/databases/ldb/files/ldbmodify.1
index d75e217ce25..7da4ca9c2c9 100644
--- a/databases/ldb/files/ldbmodify.1
+++ b/databases/ldb/files/ldbmodify.1
@@ -2,12 +2,12 @@
.\" Title: ldbmodify
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.76.1
-.\" Date: 01/29/2013
+.\" Date: 01/02/2017
.\" Manual: System Administration tools
.\" Source: LDB 1.1
.\" Language: English
.\"
-.TH "LDBMODIFY" "1" "01/29/2013" "LDB 1\&.1" "System Administration tools"
+.TH "LDBMODIFY" "1" "01/02/2017" "LDB 1\&.1" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/databases/ldb/files/ldbrename.1 b/databases/ldb/files/ldbrename.1
index fc0506aae3c..7aa03095277 100644
--- a/databases/ldb/files/ldbrename.1
+++ b/databases/ldb/files/ldbrename.1
@@ -2,12 +2,12 @@
.\" Title: ldbrename
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.76.1
-.\" Date: 01/29/2013
+.\" Date: 01/02/2017
.\" Manual: System Administration tools
.\" Source: LDB 1.1
.\" Language: English
.\"
-.TH "LDBRENAME" "1" "01/29/2013" "LDB 1\&.1" "System Administration tools"
+.TH "LDBRENAME" "1" "01/02/2017" "LDB 1\&.1" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -31,7 +31,7 @@
ldbrename \- Edit LDB databases using your favorite editor
.SH "SYNOPSIS"
.HP \w'\fBldbrename\fR\ 'u
-\fBldbrename\fR [\-h] [\-o\ options] {olddn} {newdb}
+\fBldbrename\fR [\-h] [\-o\ options] {olddn} {newdn}
.SH "DESCRIPTION"
.PP
ldbrename is a utility that allows you to rename trees in an LDB database based by DN\&. This utility takes two arguments: the original DN name of the top element and the DN to change it to\&.
diff --git a/databases/ldb/files/ldbsearch.1 b/databases/ldb/files/ldbsearch.1
index 772fad30c7e..a13f6a44918 100644
--- a/databases/ldb/files/ldbsearch.1
+++ b/databases/ldb/files/ldbsearch.1
@@ -2,12 +2,12 @@
.\" Title: ldbsearch
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.76.1
-.\" Date: 01/29/2013
+.\" Date: 01/02/2017
.\" Manual: System Administration tools
.\" Source: LDB 1.1
.\" Language: English
.\"
-.TH "LDBSEARCH" "1" "01/29/2013" "LDB 1\&.1" "System Administration tools"
+.TH "LDBSEARCH" "1" "01/02/2017" "LDB 1\&.1" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/databases/ldb/files/patch-buildtools__wafsamba__samba_install.py b/databases/ldb/files/patch-buildtools__wafsamba__samba_install.py
index 994ee3637e9..95f250a8621 100644
--- a/databases/ldb/files/patch-buildtools__wafsamba__samba_install.py
+++ b/databases/ldb/files/patch-buildtools__wafsamba__samba_install.py
@@ -1,6 +1,6 @@
---- ./buildtools/wafsamba/samba_install.py.orig 2015-08-09 19:55:47.819170736 +0000
-+++ ./buildtools/wafsamba/samba_install.py 2015-08-09 19:56:18.727356203 +0000
-@@ -116,7 +116,7 @@
+--- buildtools/wafsamba/samba_install.py.orig 2015-12-10 11:01:40 UTC
++++ buildtools/wafsamba/samba_install.py
+@@ -118,7 +118,7 @@ def install_library(self):
inst_name = bld.make_libname(t.target)
elif self.vnum:
vnum_base = self.vnum.split('.')[0]
diff --git a/databases/ldb/files/patch-third_party__waf__wafadmin__Tools__cc.py b/databases/ldb/files/patch-third_party__waf__wafadmin__Tools__cc.py
new file mode 100644
index 00000000000..5695f3e0384
--- /dev/null
+++ b/databases/ldb/files/patch-third_party__waf__wafadmin__Tools__cc.py
@@ -0,0 +1,11 @@
+--- third_party/waf/wafadmin/Tools/cc.py.orig 2015-11-06 13:25:52 UTC
++++ third_party/waf/wafadmin/Tools/cc.py
+@@ -88,7 +88,7 @@ def c_hook(self, node):
+ raise Utils.WafError('Have you forgotten to set the feature "cc" on %s?' % str(self))
+ return task
+
+-cc_str = '${CC} ${CCFLAGS} ${CPPFLAGS} ${_CCINCFLAGS} ${_CCDEFFLAGS} ${CC_SRC_F}${SRC} ${CC_TGT_F}${TGT}'
++cc_str = '${CC} ${CCFLAGS} ${_CCINCFLAGS} ${CPPFLAGS} ${_CCDEFFLAGS} ${CC_SRC_F}${SRC} ${CC_TGT_F}${TGT}'
+ cls = Task.simple_task_type('cc', cc_str, 'GREEN', ext_out='.o', ext_in='.c', shell=False)
+ cls.scan = ccroot.scan
+ cls.vars.append('CCDEPS')
diff --git a/databases/p5-Mojo-Pg/Makefile b/databases/p5-Mojo-Pg/Makefile
index 94c66f1324d..9ac136e226a 100644
--- a/databases/p5-Mojo-Pg/Makefile
+++ b/databases/p5-Mojo-Pg/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= Mojo-Pg
-PORTVERSION= 2.31
+PORTVERSION= 2.34
CATEGORIES= databases www perl5
MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:SRI
diff --git a/databases/p5-Mojo-Pg/distinfo b/databases/p5-Mojo-Pg/distinfo
index a4e476648fd..e65c249ef54 100644
--- a/databases/p5-Mojo-Pg/distinfo
+++ b/databases/p5-Mojo-Pg/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1482747909
-SHA256 (Mojo-Pg-2.31.tar.gz) = 79b1ba46fbea0dcf8bff80f9110232b0f0f3d3751481f434c30f3297ddf9023f
-SIZE (Mojo-Pg-2.31.tar.gz) = 27362
+TIMESTAMP = 1483343752
+SHA256 (Mojo-Pg-2.34.tar.gz) = 2d768334b8a5a87d0370538138b835d79238aadc657c08a45c338c5ac77b0bc4
+SIZE (Mojo-Pg-2.34.tar.gz) = 27458
diff --git a/databases/py-leveldb/Makefile b/databases/py-leveldb/Makefile
index ce58aef1f66..433de11e6d8 100644
--- a/databases/py-leveldb/Makefile
+++ b/databases/py-leveldb/Makefile
@@ -2,23 +2,18 @@
# $FreeBSD$
PORTNAME= leveldb
-PORTVERSION= 0.1.20130428
-PORTREVISION= 3
+PORTVERSION= 0.20
CATEGORIES= databases python
-MASTER_SITES= LOCAL/sunpoet
+MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
-DISTNAME= py-${PORTNAME}-${PORTVERSION}
MAINTAINER= sunpoet@FreeBSD.org
COMMENT= Thread-safe Python binding for LevelDB
LICENSE= BSD3CLAUSE
-LICENSE_FILE= ${WRKSRC}/LICENSE
-
-LIB_DEPENDS= libleveldb.so:databases/leveldb
USE_PYTHON= autoplist concurrent distutils
-USES= localbase python tar:xz
+USES= python
post-install:
${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/leveldb.so
diff --git a/databases/py-leveldb/distinfo b/databases/py-leveldb/distinfo
index 631e3feb91d..7fe0fd6b4dc 100644
--- a/databases/py-leveldb/distinfo
+++ b/databases/py-leveldb/distinfo
@@ -1,2 +1,3 @@
-SHA256 (py-leveldb-0.1.20130428.tar.xz) = bf7509b59497e54aa367e3b63d54516be881c86382da1866781499a7a5b75a3b
-SIZE (py-leveldb-0.1.20130428.tar.xz) = 13744
+TIMESTAMP = 1483295328
+SHA256 (leveldb-0.20.tar.gz) = 9ffc9b68c8c0e0a996e2409e4a95ef1fbb4dcf0f6040b21b9153cbd57c90e079
+SIZE (leveldb-0.20.tar.gz) = 235491
diff --git a/databases/py-leveldb/files/patch-setup.py b/databases/py-leveldb/files/patch-setup.py
new file mode 100644
index 00000000000..621de1f1085
--- /dev/null
+++ b/databases/py-leveldb/files/patch-setup.py
@@ -0,0 +1,16 @@
+--- setup.py.orig 2016-12-27 23:05:34 UTC
++++ setup.py
+@@ -31,11 +31,11 @@ if system == 'Darwin':
+ '-DLEVELDB_PLATFORM_POSIX',
+ '-Wno-error=unused-command-line-argument-hard-error-in-future',
+ ]
+-elif system == 'Linux':
++elif system == 'FreeBSD':
+ extra_compile_args = common_flags + [
+ '-pthread',
+ '-Wall',
+- '-DOS_LINUX',
++ '-DOS_FREEBSD',
+ '-DLEVELDB_PLATFORM_POSIX',
+ ]
+ else:
diff --git a/databases/py-leveldb/pkg-descr b/databases/py-leveldb/pkg-descr
index 4df144dd63b..967d97bfe22 100644
--- a/databases/py-leveldb/pkg-descr
+++ b/databases/py-leveldb/pkg-descr
@@ -4,4 +4,4 @@ from the LevelDB API, except for:
- Snapshots
- All iteration except for single-step forward
-WWW: http://code.google.com/p/py-leveldb/
+WWW: https://pypi.python.org/pypi/leveldb
diff --git a/databases/rubygem-dm-serializer/Makefile b/databases/rubygem-dm-serializer/Makefile
index e56d9a96f06..3a81afd3e2c 100644
--- a/databases/rubygem-dm-serializer/Makefile
+++ b/databases/rubygem-dm-serializer/Makefile
@@ -2,6 +2,7 @@
PORTNAME= dm-serializer
PORTVERSION= 1.2.2
+PORTREVISION= 1
CATEGORIES= databases rubygems
MASTER_SITES= RG
@@ -13,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
RUN_DEPENDS= rubygem-dm-core>=1.2.0:databases/rubygem-dm-core \
rubygem-fastercsv>=1.5:devel/rubygem-fastercsv \
- rubygem-json>=1.6:devel/rubygem-json \
+ rubygem-json1>=1.6:devel/rubygem-json1 \
rubygem-json_pure>=1.6:devel/rubygem-json_pure \
rubygem-multi_json>=1.0:devel/rubygem-multi_json
diff --git a/databases/rubygem-dm-types/Makefile b/databases/rubygem-dm-types/Makefile
index 91defa2f6fc..23d1ff52b8a 100644
--- a/databases/rubygem-dm-types/Makefile
+++ b/databases/rubygem-dm-types/Makefile
@@ -3,7 +3,7 @@
PORTNAME= dm-types
PORTVERSION= 1.2.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= databases rubygems
MASTER_SITES= RG
@@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
RUN_DEPENDS= rubygem-bcrypt-ruby>=3.0:security/rubygem-bcrypt-ruby \
rubygem-dm-core>=1.2.0:databases/rubygem-dm-core \
rubygem-fastercsv>=1.5:devel/rubygem-fastercsv \
- rubygem-json>=1.6:devel/rubygem-json \
+ rubygem-json1>=1.6:devel/rubygem-json1 \
rubygem-multi_json>=1.0:devel/rubygem-multi_json \
rubygem-stringex>=1.4:devel/rubygem-stringex \
rubygem-uuidtools>=2.1:devel/rubygem-uuidtools
diff --git a/databases/tdb/Makefile b/databases/tdb/Makefile
index e7f00485495..68c3e5c52d4 100644
--- a/databases/tdb/Makefile
+++ b/databases/tdb/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= tdb
-PORTVERSION= 1.3.9
+PORTVERSION= 1.3.12
PORTREVISION= 0
PORTEPOCH= 1
CATEGORIES= databases
diff --git a/databases/tdb/distinfo b/databases/tdb/distinfo
index c9e48d3208c..3c934cc6839 100644
--- a/databases/tdb/distinfo
+++ b/databases/tdb/distinfo
@@ -1,2 +1,3 @@
-SHA256 (tdb-1.3.9.tar.gz) = 7101f726e6d5c70f14e577b01c133e2e6059c4455239115e56a12ba64fc084d2
-SIZE (tdb-1.3.9.tar.gz) = 493585
+TIMESTAMP = 1483301977
+SHA256 (tdb-1.3.12.tar.gz) = 60134e32253cac8e2efe5e0185d20123c208bcf6ad15edf2f50d80daadf8c348
+SIZE (tdb-1.3.12.tar.gz) = 495520
diff --git a/databases/tdb/files/patch-buildtools__wafsamba__samba_install.py b/databases/tdb/files/patch-buildtools__wafsamba__samba_install.py
index 994ee3637e9..95f250a8621 100644
--- a/databases/tdb/files/patch-buildtools__wafsamba__samba_install.py
+++ b/databases/tdb/files/patch-buildtools__wafsamba__samba_install.py
@@ -1,6 +1,6 @@
---- ./buildtools/wafsamba/samba_install.py.orig 2015-08-09 19:55:47.819170736 +0000
-+++ ./buildtools/wafsamba/samba_install.py 2015-08-09 19:56:18.727356203 +0000
-@@ -116,7 +116,7 @@
+--- buildtools/wafsamba/samba_install.py.orig 2015-12-10 11:01:40 UTC
++++ buildtools/wafsamba/samba_install.py
+@@ -118,7 +118,7 @@ def install_library(self):
inst_name = bld.make_libname(t.target)
elif self.vnum:
vnum_base = self.vnum.split('.')[0]
diff --git a/databases/tdb/files/patch-third_party__waf__wafadmin__Tools__cc.py b/databases/tdb/files/patch-third_party__waf__wafadmin__Tools__cc.py
new file mode 100644
index 00000000000..5695f3e0384
--- /dev/null
+++ b/databases/tdb/files/patch-third_party__waf__wafadmin__Tools__cc.py
@@ -0,0 +1,11 @@
+--- third_party/waf/wafadmin/Tools/cc.py.orig 2015-11-06 13:25:52 UTC
++++ third_party/waf/wafadmin/Tools/cc.py
+@@ -88,7 +88,7 @@ def c_hook(self, node):
+ raise Utils.WafError('Have you forgotten to set the feature "cc" on %s?' % str(self))
+ return task
+
+-cc_str = '${CC} ${CCFLAGS} ${CPPFLAGS} ${_CCINCFLAGS} ${_CCDEFFLAGS} ${CC_SRC_F}${SRC} ${CC_TGT_F}${TGT}'
++cc_str = '${CC} ${CCFLAGS} ${_CCINCFLAGS} ${CPPFLAGS} ${_CCDEFFLAGS} ${CC_SRC_F}${SRC} ${CC_TGT_F}${TGT}'
+ cls = Task.simple_task_type('cc', cc_str, 'GREEN', ext_out='.o', ext_in='.c', shell=False)
+ cls.scan = ccroot.scan
+ cls.vars.append('CCDEPS')
diff --git a/databases/tdb/files/tdbbackup.8 b/databases/tdb/files/tdbbackup.8
index c378bb1288d..92f510aeccc 100644
--- a/databases/tdb/files/tdbbackup.8
+++ b/databases/tdb/files/tdbbackup.8
@@ -1,13 +1,22 @@
'\" t
.\" Title: tdbbackup
.\" Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.75.2
-.\" Date: 03/29/2011
+.\" Generator: DocBook XSL Stylesheets v1.76.1
+.\" Date: 2015-04-25
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "TDBBACKUP" "8" "03/29/2011" "Samba 3\&.6" "System Administration tools"
+.TH "TDBBACKUP" "8" "2015\-04\-25" "Samba 3\&.6" "System Administration tools"
+.\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
@@ -22,7 +31,7 @@
tdbbackup \- tool for backing up and for validating the integrity of samba \&.tdb files
.SH "SYNOPSIS"
.HP \w'\fBtdbbackup\fR\ 'u
-\fBtdbbackup\fR [\-s\ suffix] [\-v] [\-h]
+\fBtdbbackup\fR [\-s\ suffix] [\-v] [\-h] [\-l]
.SH "DESCRIPTION"
.PP
This tool is part of the
@@ -42,14 +51,19 @@ Get help information\&.
.RS 4
The
\fB\-s\fR
-option allows the adminisistrator to specify a file backup extension\&. This way it is possible to keep a history of tdb backup files by using a new suffix for each backup\&.
+option allows the administrator to specify a file backup extension\&. This way it is possible to keep a history of tdb backup files by using a new suffix for each backup\&.
.RE
.PP
\-v
.RS 4
The
\fB\-v\fR
-will check the database for damages (currupt data) which if detected causes the backup to be restored\&.
+will check the database for damages (corrupt data) which if detected causes the backup to be restored\&.
+.RE
+.PP
+\-l
+.RS 4
+This options disables any locking, by passing TDB_NOLOCK to tdb_open_ex()\&. Only use this for database files which are not used by any other process! And also only if it is otherwise not possible to open the database, e\&.g\&. databases which were created with mutex locking\&.
.RE
.SH "COMMANDS"
.PP
diff --git a/databases/tdb/files/tdbdump.8 b/databases/tdb/files/tdbdump.8
index e62e261b88c..86d9e2c6755 100644
--- a/databases/tdb/files/tdbdump.8
+++ b/databases/tdb/files/tdbdump.8
@@ -1,13 +1,22 @@
'\" t
.\" Title: tdbdump
.\" Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.75.2
-.\" Date: 03/29/2011
+.\" Generator: DocBook XSL Stylesheets v1.76.1
+.\" Date: 2015-04-25
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "TDBDUMP" "8" "03/29/2011" "Samba 3\&.6" "System Administration tools"
+.TH "TDBDUMP" "8" "2015\-04\-25" "Samba 3\&.6" "System Administration tools"
+.\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
@@ -22,7 +31,7 @@
tdbdump \- tool for printing the contents of a TDB file
.SH "SYNOPSIS"
.HP \w'\fBtdbdump\fR\ 'u
-\fBtdbdump\fR {filename}
+\fBtdbdump\fR [\-k\ \fIkeyname\fR] [\-e] [\-h] {filename}
.SH "DESCRIPTION"
.PP
This tool is part of the
@@ -30,9 +39,29 @@ This tool is part of the
suite\&.
.PP
\fBtdbdump\fR
-is a very simple utility that \'dumps\' the contents of a TDB (Trivial DataBase) file to standard output in a human\-readable format\&.
+is a very simple utility that \*(Aqdumps\*(Aq the contents of a TDB (Trivial DataBase) file to standard output in a human\-readable format\&.
.PP
This tool can be used when debugging problems with TDB files\&. It is intended for those who are somewhat familiar with Samba internals\&.
+.SH "OPTIONS"
+.PP
+\-h
+.RS 4
+Get help information\&.
+.RE
+.PP
+\-k \fIkeyname\fR
+.RS 4
+The
+\fB\-k\fR
+option restricts dumping to a single key, if found\&.
+.RE
+.PP
+\-e
+.RS 4
+The
+\fB\-e\fR
+tries to dump out from a corrupt database\&. Naturally, such a dump is unreliable, at best\&.
+.RE
.SH "VERSION"
.PP
This man page is correct for version 3 of the Samba suite\&.
diff --git a/databases/tdb/files/tdbrestore.8 b/databases/tdb/files/tdbrestore.8
index 15217248250..28632ac094c 100644
--- a/databases/tdb/files/tdbrestore.8
+++ b/databases/tdb/files/tdbrestore.8
@@ -1,13 +1,22 @@
'\" t
.\" Title: tdbrestore
.\" Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.75.2
-.\" Date: 03/29/2011
+.\" Generator: DocBook XSL Stylesheets v1.76.1
+.\" Date: 2015-04-25
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "TDBRESTORE" "8" "03/29/2011" "Samba 3\&.6" "System Administration tools"
+.TH "TDBRESTORE" "8" "2015\-04\-25" "Samba 3\&.6" "System Administration tools"
+.\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
@@ -30,7 +39,7 @@ This tool is part of the
suite\&.
.PP
\fBtdbrestore\fR
-is a very simple utility that \'restores\' the contents of dump file into TDB (Trivial DataBase) file\&. The dump file is obtained from the tdbdump command\&.
+is a very simple utility that \*(Aqrestores\*(Aq the contents of dump file into TDB (Trivial DataBase) file\&. The dump file is obtained from the tdbdump command\&.
.PP
This tool wait on the standard input for the content of the dump and will write the tdb in the tdbfilename parameter\&.
.PP
diff --git a/databases/tdb/files/tdbtool.8 b/databases/tdb/files/tdbtool.8
index dcb40fcf52c..04ed76594c1 100644
--- a/databases/tdb/files/tdbtool.8
+++ b/databases/tdb/files/tdbtool.8
@@ -1,13 +1,22 @@
'\" t
.\" Title: tdbtool
.\" Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.75.2
-.\" Date: 03/29/2011
+.\" Generator: DocBook XSL Stylesheets v1.76.1
+.\" Date: 2015-04-25
.\" Manual: System Administration tools
-.\" Source: Samba 3.6
+.\" Source: Samba 4.0
.\" Language: English
.\"
-.TH "TDBTOOL" "8" "03/29/2011" "Samba 3\&.6" "System Administration tools"
+.TH "TDBTOOL" "8" "2015\-04\-25" "Samba 4\&.0" "System Administration tools"
+.\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
@@ -24,7 +33,7 @@ tdbtool \- manipulate the contents TDB files
.HP \w'\fBtdbtool\fR\ 'u
\fBtdbtool\fR
.HP \w'\fBtdbtool\fR\ 'u
-\fBtdbtool\fR \fITDBFILE\fR [\fICOMMANDS\fR...]
+\fBtdbtool\fR [\-l] \fITDBFILE\fR [\fICOMMANDS\fR...]
.SH "DESCRIPTION"
.PP
This tool is part of the
@@ -33,6 +42,12 @@ suite\&.
.PP
\fBtdbtool\fR
a tool for displaying and altering the contents of Samba TDB (Trivial DataBase) files\&. Each of the commands listed below can be entered interactively or provided on the command line\&.
+.SH "OPTIONS"
+.PP
+\-l
+.RS 4
+This options disables any locking, by passing TDB_NOLOCK to tdb_open_ex()\&. Only use this for database files which are not used by any other process! And also only if it is otherwise not possible to open the database, e\&.g\&. databases which were created with mutex locking\&.
+.RE
.SH "COMMANDS"
.PP
\fBcreate\fR \fITDBFILE\fR
@@ -133,6 +148,11 @@ Print the next record in the current database\&.
Check the integrity of the current database\&.
.RE
.PP
+\fBrepack\fR
+.RS 4
+Repack a database using a temporary file to remove fragmentation\&.
+.RE
+.PP
\fBquit\fR
.RS 4
Exit
@@ -144,7 +164,7 @@ The contents of the Samba TDB files are private to the implementation and should
\fBtdbtool\fR\&.
.SH "VERSION"
.PP
-This man page is correct for version 3\&.0\&.25 of the Samba suite\&.
+This man page is correct for version 3\&.6 of the Samba suite\&.
.SH "AUTHOR"
.PP
The original Samba software and related utilities were created by Andrew Tridgell\&. Samba is now developed by the Samba Team as an Open Source project similar to the way the Linux kernel is developed\&.
diff --git a/devel/Makefile b/devel/Makefile
index 7897509e188..6f74b3a6578 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -5164,6 +5164,7 @@
SUBDIR += rubygem-get_process_mem
SUBDIR += rubygem-getopt
SUBDIR += rubygem-gettext
+ SUBDIR += rubygem-gettext-setup
SUBDIR += rubygem-gh
SUBDIR += rubygem-gibbler
SUBDIR += rubygem-gio2
@@ -5211,6 +5212,7 @@
SUBDIR += rubygem-jquery-ui-themes
SUBDIR += rubygem-jruby-jars
SUBDIR += rubygem-json
+ SUBDIR += rubygem-json1
SUBDIR += rubygem-json_pure
SUBDIR += rubygem-kafo
SUBDIR += rubygem-kafo_parsers
@@ -5645,6 +5647,7 @@
SUBDIR += umem
SUBDIR += umlgraph
SUBDIR += unibilium
+ SUBDIR += unittest-cpp
SUBDIR += universalindentgui
SUBDIR += upnp
SUBDIR += upp
diff --git a/devel/beautifyphp/Makefile b/devel/beautifyphp/Makefile
index 2d45f1f2ae3..0699f50c3ae 100644
--- a/devel/beautifyphp/Makefile
+++ b/devel/beautifyphp/Makefile
@@ -7,7 +7,7 @@ CATEGORIES= devel www pear
MASTER_SITES= SF
DISTNAME= beautify_php_${PORTVERSION}
-MAINTAINER= leeym@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= PEAR beautifier for PHP4
RUN_DEPENDS= ${LOCALBASE}/share/pear/System.php:devel/pear
diff --git a/devel/catch/Makefile b/devel/catch/Makefile
index 40435792280..8971d878392 100644
--- a/devel/catch/Makefile
+++ b/devel/catch/Makefile
@@ -3,7 +3,7 @@
PORTNAME= catch
DISTVERSIONPREFIX= v
-DISTVERSION= 1.5.4
+DISTVERSION= 1.5.9
CATEGORIES= devel
MAINTAINER= gahr@FreeBSD.org
diff --git a/devel/catch/distinfo b/devel/catch/distinfo
index 5d6d3f1237f..0ac87ef5ca4 100644
--- a/devel/catch/distinfo
+++ b/devel/catch/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1463758022
-SHA256 (philsquared-Catch-v1.5.4_GH0.tar.gz) = 1fa62f061ea5dfde0e58fbcabec51c256b1f9e31b8d3a73204c5d38d6e89e8d7
-SIZE (philsquared-Catch-v1.5.4_GH0.tar.gz) = 312031
+TIMESTAMP = 1483374315
+SHA256 (philsquared-Catch-v1.5.9_GH0.tar.gz) = f562c2d955cedbb73006274ea79af76a626b325124a4adc33816acd0512ee592
+SIZE (philsquared-Catch-v1.5.9_GH0.tar.gz) = 313420
diff --git a/devel/deforaos-libsystem/Makefile b/devel/deforaos-libsystem/Makefile
index 491e315c6e6..87e0a2433bc 100644
--- a/devel/deforaos-libsystem/Makefile
+++ b/devel/deforaos-libsystem/Makefile
@@ -2,9 +2,9 @@
# $FreeBSD$
PORTNAME= libsystem
-PORTVERSION= 0.3.0
+PORTVERSION= 0.3.1
CATEGORIES= devel
-MASTER_SITES= http://www.defora.org/os/download/download/4392/
+MASTER_SITES= http://www.defora.org/os/download/download/4446/
PKGNAMEPREFIX= deforaos-
DISTNAME= libSystem-${PORTVERSION}
@@ -14,14 +14,15 @@ COMMENT= DeforaOS core system library
LICENSE= LGPL3
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= pkgconfig
+USES= pkgconfig ssl
USE_LDCONFIG= yes
-USE_OPENSSL= yes
CPPFLAGS+= -I${OPENSSLINC}
LDFLAGS+= -L${OPENSSLLIB}
MAKE_ARGS+= PREFIX=${PREFIX}
MAKE_ENV+= MANDIR=${STAGEDIR}${MANPREFIX}/man
+BROKEN_FreeBSD_9= fails to build
+
MAKE_JOBS_UNSAFE= yes
OPTIONS_DEFINE= DOCS
diff --git a/devel/deforaos-libsystem/distinfo b/devel/deforaos-libsystem/distinfo
index 239bcf4572c..6934250727d 100644
--- a/devel/deforaos-libsystem/distinfo
+++ b/devel/deforaos-libsystem/distinfo
@@ -1,2 +1,3 @@
-SHA256 (libSystem-0.3.0.tar.gz) = 83b1419ab7299f4ceca9089ed95add3a28443719aafdee264143dc5ad501c892
-SIZE (libSystem-0.3.0.tar.gz) = 67696
+TIMESTAMP = 1475616237
+SHA256 (libSystem-0.3.1.tar.gz) = 6f82f6fbee516d33e14311bcdc86dae0509c86c8f1e594d4573398b12a2a5b89
+SIZE (libSystem-0.3.1.tar.gz) = 70735
diff --git a/devel/google-styleguide/Makefile b/devel/google-styleguide/Makefile
index 0561075f962..86f112e733b 100644
--- a/devel/google-styleguide/Makefile
+++ b/devel/google-styleguide/Makefile
@@ -8,7 +8,7 @@ MASTER_SITES= http://google-styleguide.googlecode.com/svn/trunk/cpplint/
DISTFILES= cpplint.py cpplint_unittest.py README
DIST_SUBDIR= ${PORTNAME}-${PORTVERSION}
-MAINTAINER= leeym@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Tool to assist with Google style guide compliance
BROKEN= Unfetchable (google code has gone away)
diff --git a/devel/jenkins/Makefile b/devel/jenkins/Makefile
index 98686f0895e..9fedca6c830 100644
--- a/devel/jenkins/Makefile
+++ b/devel/jenkins/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= jenkins
-PORTVERSION= 2.38
+PORTVERSION= 2.39
CATEGORIES= devel java
MASTER_SITES= http://mirrors.jenkins-ci.org/war/${PORTVERSION}/
DISTNAME= jenkins
diff --git a/devel/jenkins/distinfo b/devel/jenkins/distinfo
index 9cb15884ee3..b763f346139 100644
--- a/devel/jenkins/distinfo
+++ b/devel/jenkins/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1482815950
-SHA256 (jenkins/2.38/jenkins.war) = 59f587198b306a23753d7329dbff5e07eb8de31d31734f001ccef1c1aa0af1ae
-SIZE (jenkins/2.38/jenkins.war) = 68586722
+TIMESTAMP = 1483416315
+SHA256 (jenkins/2.39/jenkins.war) = 8a0b234803e097ef62beb35b871d0de21a465ead1cc65e507556ceafb46e5958
+SIZE (jenkins/2.39/jenkins.war) = 68598796
diff --git a/devel/lxqt-build-tools/Makefile b/devel/lxqt-build-tools/Makefile
index 26127df558a..c6e011d5a27 100644
--- a/devel/lxqt-build-tools/Makefile
+++ b/devel/lxqt-build-tools/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= lxqt-build-tools
-PORTVERSION= 0.3.0
+PORTVERSION= 0.3.1
CATEGORIES= devel
MASTER_SITES= LXQT/${PORTNAME}
diff --git a/devel/lxqt-build-tools/distinfo b/devel/lxqt-build-tools/distinfo
index de7e1cf736f..9ee6896c797 100644
--- a/devel/lxqt-build-tools/distinfo
+++ b/devel/lxqt-build-tools/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1481464588
-SHA256 (lxqt/lxqt-build-tools-0.3.0.tar.xz) = 850124c0b76be38859745542fa45cb65191034d32b4fbc9f3399c867db69c008
-SIZE (lxqt/lxqt-build-tools-0.3.0.tar.xz) = 19024
+TIMESTAMP = 1483342466
+SHA256 (lxqt/lxqt-build-tools-0.3.1.tar.xz) = 6c16bed977d78eea85f43ac1c82aa00065c739268a12c721d1bf3089933ff840
+SIZE (lxqt/lxqt-build-tools-0.3.1.tar.xz) = 19320
diff --git a/devel/lxqt-build-tools/files/extra-patch-cmake_modules_LXQtCompilerSettings.cmake b/devel/lxqt-build-tools/files/extra-patch-cmake_modules_LXQtCompilerSettings.cmake
index 747b0140bd9..324f31c4fdc 100644
--- a/devel/lxqt-build-tools/files/extra-patch-cmake_modules_LXQtCompilerSettings.cmake
+++ b/devel/lxqt-build-tools/files/extra-patch-cmake_modules_LXQtCompilerSettings.cmake
@@ -1,4 +1,4 @@
---- cmake/modules/LXQtCompilerSettings.cmake.orig 2016-12-06 20:31:16 UTC
+--- cmake/modules/LXQtCompilerSettings.cmake.orig 2017-01-01 21:46:43 UTC
+++ cmake/modules/LXQtCompilerSettings.cmake
@@ -144,7 +144,9 @@ endif()
if (CMAKE_COMPILER_IS_GNUCXX OR LXQT_COMPILER_IS_CLANGCXX)
@@ -7,7 +7,7 @@
- set(LTO_FLAGS "-flto -fuse-linker-plugin")
+ if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
+ set(LTO_FLAGS "-flto -fuse-linker-plugin")
-+ endif ()
- elseif (LXQT_COMPILER_IS_CLANGCXX)
- # The link-time optimization of clang++/llvm seems to be too aggrassive.
- # After testing, it breaks the signal/slots of QObject sometimes.
++ endif()
+ # When building static libraries with LTO in gcc >= 4.9,
+ # "gcc-ar" and "gcc-ranlib" should be used instead of "ar" and "ranlib".
+ # references:
diff --git a/devel/p5-File-Temp/Makefile b/devel/p5-File-Temp/Makefile
index e77af695891..c3fdae85a45 100644
--- a/devel/p5-File-Temp/Makefile
+++ b/devel/p5-File-Temp/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= ${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
-MAINTAINER= leeym@FreeBSD.org
+MAINTAINER= perl@FreeBSD.org
COMMENT= Perl5 module to generate temporary files or directories safely
USES= perl5
diff --git a/devel/p5-IPC-Shareable/Makefile b/devel/p5-IPC-Shareable/Makefile
index 3d6838c2c43..785d8353dd7 100644
--- a/devel/p5-IPC-Shareable/Makefile
+++ b/devel/p5-IPC-Shareable/Makefile
@@ -8,7 +8,7 @@ CATEGORIES= devel perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
-MAINTAINER= leeym@FreeBSD.org
+MAINTAINER= perl@FreeBSD.org
COMMENT= Share Perl variables between processes
USES= perl5
diff --git a/devel/p5-Module-Depends/Makefile b/devel/p5-Module-Depends/Makefile
index f0fd4e1a5a4..44d922059de 100644
--- a/devel/p5-Module-Depends/Makefile
+++ b/devel/p5-Module-Depends/Makefile
@@ -8,7 +8,7 @@ CATEGORIES= devel perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
-MAINTAINER= leeym@FreeBSD.org
+MAINTAINER= perl@FreeBSD.org
COMMENT= Identify the dependencies of a distribution
RUN_DEPENDS= p5-Class-Accessor-Chained>=0:devel/p5-Class-Accessor-Chained \
diff --git a/devel/p5-Params-ValidationCompiler/Makefile b/devel/p5-Params-ValidationCompiler/Makefile
index d4457c5be84..52a336e26c0 100644
--- a/devel/p5-Params-ValidationCompiler/Makefile
+++ b/devel/p5-Params-ValidationCompiler/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= Params-ValidationCompiler
-PORTVERSION= 0.21
+PORTVERSION= 0.22
CATEGORIES= devel perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-Params-ValidationCompiler/distinfo b/devel/p5-Params-ValidationCompiler/distinfo
index cc020356059..ffc4d6d2374 100644
--- a/devel/p5-Params-ValidationCompiler/distinfo
+++ b/devel/p5-Params-ValidationCompiler/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1481612854
-SHA256 (Params-ValidationCompiler-0.21.tar.gz) = f2760746b0af43d38dd95bc2fa2ef4ad6e8db9ce0bdf232d0f414b7a911f113c
-SIZE (Params-ValidationCompiler-0.21.tar.gz) = 39789
+TIMESTAMP = 1483405734
+SHA256 (Params-ValidationCompiler-0.22.tar.gz) = bbec2b029e8f07801916b8ead4df5016a24daacac7a680f78dfcf70bd8d5f847
+SIZE (Params-ValidationCompiler-0.22.tar.gz) = 39995
diff --git a/devel/p5-Test-Debugger/Makefile b/devel/p5-Test-Debugger/Makefile
index 717c1d2a891..6ed5f5d6446 100644
--- a/devel/p5-Test-Debugger/Makefile
+++ b/devel/p5-Test-Debugger/Makefile
@@ -8,7 +8,7 @@ CATEGORIES= devel perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
-MAINTAINER= leeym@FreeBSD.org
+MAINTAINER= perl@FreeBSD.org
COMMENT= Create Test Scripts which Generate Log Files
USES= perl5
diff --git a/devel/p5-Tie-Restore/Makefile b/devel/p5-Tie-Restore/Makefile
index 8b33b477943..ac42532597e 100644
--- a/devel/p5-Tie-Restore/Makefile
+++ b/devel/p5-Tie-Restore/Makefile
@@ -8,7 +8,7 @@ CATEGORIES= devel perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
-MAINTAINER= leeym@FreeBSD.org
+MAINTAINER= perl@FreeBSD.org
COMMENT= Restores ties to an existing object
USES= perl5
diff --git a/devel/p5-accessors/Makefile b/devel/p5-accessors/Makefile
index 7cf5b5b49a5..f41dc184549 100644
--- a/devel/p5-accessors/Makefile
+++ b/devel/p5-accessors/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:SPURKIS
PKGNAMEPREFIX= p5-
-MAINTAINER= leeym@FreeBSD.org
+MAINTAINER= perl@FreeBSD.org
COMMENT= Create accessor methods in caller's package #'
USES= perl5
diff --git a/devel/pcsc-lite/Makefile b/devel/pcsc-lite/Makefile
index 2fdc4dd4218..2ab70f05b16 100644
--- a/devel/pcsc-lite/Makefile
+++ b/devel/pcsc-lite/Makefile
@@ -7,7 +7,7 @@ PORTEPOCH= 2
CATEGORIES= devel security
MASTER_SITES= https://alioth.debian.org/frs/download.php/file/4198/
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= mokhi64@gmail.com
COMMENT= Smartcard development library
LICENSE= BSD3CLAUSE
diff --git a/devel/py-click-log/Makefile b/devel/py-click-log/Makefile
index bca7ad122a2..eb7404ac2cd 100644
--- a/devel/py-click-log/Makefile
+++ b/devel/py-click-log/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= click-log
-PORTVERSION= 0.1.4
+PORTVERSION= 0.1.8
CATEGORIES= devel python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -12,7 +12,16 @@ COMMENT= Logging integration for Click
LICENSE= MIT
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest \
+ ${PYTHON_PKGNAMEPREFIX}click>0:devel/py-click
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>0:devel/py-click
+
USES= python
USE_PYTHON= autoplist distutils
+NO_ARCH= yes
+
+do-test:
+ @cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -rs -v
+
.include
diff --git a/devel/py-click-log/distinfo b/devel/py-click-log/distinfo
index 0342150b2cb..76353664d5f 100644
--- a/devel/py-click-log/distinfo
+++ b/devel/py-click-log/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1481075572
-SHA256 (click-log-0.1.4.tar.gz) = dc6275b7d8f87512a22d9806ccc845f474825edd82ad37925a36ba156c887570
-SIZE (click-log-0.1.4.tar.gz) = 9004
+TIMESTAMP = 1483407604
+SHA256 (click-log-0.1.8.tar.gz) = 57271008c12e2dc16d413373bedd7fd3ff17c57434e168650dc27dfb9c743392
+SIZE (click-log-0.1.8.tar.gz) = 9277
diff --git a/devel/rubygem-actionview/Makefile b/devel/rubygem-actionview/Makefile
index e69ee073b50..d3889759c50 100644
--- a/devel/rubygem-actionview/Makefile
+++ b/devel/rubygem-actionview/Makefile
@@ -3,6 +3,7 @@
PORTNAME= actionview
PORTVERSION= 4.2.7.1
+PORTREVISION= 1
CATEGORIES= devel rubygems
MASTER_SITES= RG
@@ -15,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/MIT-LICENSE
RUN_DEPENDS= rubygem-activesupport4>=${PORTVERSION}:devel/rubygem-activesupport4 \
rubygem-builder32>=3.2:devel/rubygem-builder32 \
rubygem-erubis>=2.7.0:www/rubygem-erubis \
- rubygem-rails-dom-testing>=1.0.5:textproc/rubygem-rails-dom-testing \
+ rubygem-rails-dom-testing1>=1.0.5:textproc/rubygem-rails-dom-testing1 \
rubygem-rails-html-sanitizer>=1.0.2:textproc/rubygem-rails-html-sanitizer
NO_ARCH= yes
diff --git a/devel/rubygem-activesupport4/Makefile b/devel/rubygem-activesupport4/Makefile
index 3a6b80e4421..c025eb651a4 100644
--- a/devel/rubygem-activesupport4/Makefile
+++ b/devel/rubygem-activesupport4/Makefile
@@ -3,6 +3,7 @@
PORTNAME= activesupport
PORTVERSION= 4.2.7.1
+PORTREVISION= 1
CATEGORIES= devel rubygems
MASTER_SITES= RG
PKGNAMESUFFIX= 4
@@ -14,7 +15,7 @@ LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/MIT-LICENSE
RUN_DEPENDS= rubygem-i18n>=0.7:devel/rubygem-i18n \
- rubygem-json>=1.7.7:devel/rubygem-json \
+ rubygem-json1>=1.7.7:devel/rubygem-json1 \
rubygem-minitest>=5.1:devel/rubygem-minitest \
rubygem-thread_safe>=0.3.4:devel/rubygem-thread_safe \
rubygem-tzinfo>=1.1:devel/rubygem-tzinfo
diff --git a/devel/rubygem-aws-sdk-v1/Makefile b/devel/rubygem-aws-sdk-v1/Makefile
index aca29e4bac1..8bc83748196 100644
--- a/devel/rubygem-aws-sdk-v1/Makefile
+++ b/devel/rubygem-aws-sdk-v1/Makefile
@@ -2,6 +2,7 @@
PORTNAME= aws-sdk-v1
PORTVERSION= 1.66.0
+PORTREVISION= 1
CATEGORIES= devel rubygems
MASTER_SITES= RG
@@ -10,7 +11,7 @@ COMMENT= AWS SDK for Ruby V1
LICENSE= APACHE20
-RUN_DEPENDS= rubygem-json>=1.4:devel/rubygem-json \
+RUN_DEPENDS= rubygem-json1>=1.4:devel/rubygem-json1 \
rubygem-nokogiri>=1.4.4:textproc/rubygem-nokogiri
NO_ARCH= yes
diff --git a/devel/rubygem-classifier-reborn/Makefile b/devel/rubygem-classifier-reborn/Makefile
index 616c9828828..88a8f068fea 100644
--- a/devel/rubygem-classifier-reborn/Makefile
+++ b/devel/rubygem-classifier-reborn/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= classifier-reborn
-PORTVERSION= 2.0.4
+PORTVERSION= 2.1.0
CATEGORIES= devel rubygems
MASTER_SITES= RG
@@ -10,14 +10,14 @@ MAINTAINER= ruby@FreeBSD.org
COMMENT= Classifier module for Bayesian and other types of classifications
LICENSE= LGPL21
+LICENSE_FILE= ${WRKSRC}/LICENSE
RUN_DEPENDS= rubygem-fast-stemmer>=1.0.0:devel/rubygem-fast-stemmer
-PLIST_FILES= bin/bayes.rb bin/summarize.rb
-
NO_ARCH= yes
-
USE_RUBY= yes
USES= gem
+PLIST_FILES= bin/bayes.rb bin/summarize.rb
+
.include
diff --git a/devel/rubygem-classifier-reborn/distinfo b/devel/rubygem-classifier-reborn/distinfo
index 344b4e98984..850cc70a6ef 100644
--- a/devel/rubygem-classifier-reborn/distinfo
+++ b/devel/rubygem-classifier-reborn/distinfo
@@ -1,2 +1,3 @@
-SHA256 (rubygem/classifier-reborn-2.0.4.gem) = 8bb4d9f742dd628cf7b5771ce0a5e100583c564060fea3b515018ade436e9b1a
-SIZE (rubygem/classifier-reborn-2.0.4.gem) = 38400
+TIMESTAMP = 1483349988
+SHA256 (rubygem/classifier-reborn-2.1.0.gem) = 228118a51d972dcd60bc5f3ee214b6a5de293b0558604dddcac2866321270d74
+SIZE (rubygem/classifier-reborn-2.1.0.gem) = 38912
diff --git a/devel/rubygem-coffee-script-source/Makefile b/devel/rubygem-coffee-script-source/Makefile
index a3705f73994..f90bbc7fd31 100644
--- a/devel/rubygem-coffee-script-source/Makefile
+++ b/devel/rubygem-coffee-script-source/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= coffee-script-source
-PORTVERSION= 1.11.1
+PORTVERSION= 1.12.2
CATEGORIES= devel rubygems
MASTER_SITES= RG
diff --git a/devel/rubygem-coffee-script-source/distinfo b/devel/rubygem-coffee-script-source/distinfo
index d078055a57b..96555b1e4a3 100644
--- a/devel/rubygem-coffee-script-source/distinfo
+++ b/devel/rubygem-coffee-script-source/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1481506728
-SHA256 (rubygem/coffee-script-source-1.11.1.gem) = 096ee2a4c29e286077292da31675199cd7a0e9e308319e86410e01f42984da75
-SIZE (rubygem/coffee-script-source-1.11.1.gem) = 64000
+TIMESTAMP = 1483377833
+SHA256 (rubygem/coffee-script-source-1.12.2.gem) = e12b16fd8927fbbf8b87cb2e9a85a6cf457c6881cc7ff8b1af15b31f70da07a4
+SIZE (rubygem/coffee-script-source-1.12.2.gem) = 65024
diff --git a/devel/rubygem-concurrent-ruby-edge/Makefile b/devel/rubygem-concurrent-ruby-edge/Makefile
index 8fb907202aa..e4bb9caef55 100644
--- a/devel/rubygem-concurrent-ruby-edge/Makefile
+++ b/devel/rubygem-concurrent-ruby-edge/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= concurrent-ruby-edge
-PORTVERSION= 0.2.3
+PORTVERSION= 0.3.0
CATEGORIES= devel rubygems
MASTER_SITES= RG
diff --git a/devel/rubygem-concurrent-ruby-edge/distinfo b/devel/rubygem-concurrent-ruby-edge/distinfo
index eaedca843d0..bd4f119d701 100644
--- a/devel/rubygem-concurrent-ruby-edge/distinfo
+++ b/devel/rubygem-concurrent-ruby-edge/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1483101700
-SHA256 (rubygem/concurrent-ruby-edge-0.2.3.gem) = 845481ffb8e4c0ab5c244d304c7ab42875fb6a79affbe5fce98d15dbfeadfdd2
-SIZE (rubygem/concurrent-ruby-edge-0.2.3.gem) = 41984
+TIMESTAMP = 1483350128
+SHA256 (rubygem/concurrent-ruby-edge-0.3.0.gem) = 640f750a2ff7bf12cb364182c021fbcf203a4205cc5fa2a5e12b4f186bc82de7
+SIZE (rubygem/concurrent-ruby-edge-0.3.0.gem) = 49664
diff --git a/devel/rubygem-concurrent-ruby-edge/files/patch-gemspec b/devel/rubygem-concurrent-ruby-edge/files/patch-gemspec
index a8d1561dbc4..ced609bcf0f 100644
--- a/devel/rubygem-concurrent-ruby-edge/files/patch-gemspec
+++ b/devel/rubygem-concurrent-ruby-edge/files/patch-gemspec
@@ -1,11 +1,11 @@
---- concurrent-ruby-edge.gemspec.orig 2016-12-30 18:46:48 UTC
-+++ concurrent-ruby-edge.gemspec
-@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
+--- concurrent-ruby-edge.gemspec.orig 2017-01-02 04:42:34.239949000 -0500
++++ concurrent-ruby-edge.gemspec 2017-01-02 04:43:51.396752000 -0500
+@@ -23,7 +23,7 @@
s.specification_version = 4
if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-- s.add_runtime_dependency(%q.freeze, ["= 1.0.3"])
-+ s.add_runtime_dependency(%q.freeze, [">= 1.0.3"])
+- s.add_runtime_dependency(%q.freeze, ["= 1.0.4"])
++ s.add_runtime_dependency(%q.freeze, [">= 1.0.4"])
else
- s.add_dependency(%q.freeze, ["= 1.0.3"])
+ s.add_dependency(%q.freeze, ["= 1.0.4"])
end
diff --git a/devel/rubygem-gettext-setup/Makefile b/devel/rubygem-gettext-setup/Makefile
new file mode 100644
index 00000000000..8dc06bbda72
--- /dev/null
+++ b/devel/rubygem-gettext-setup/Makefile
@@ -0,0 +1,21 @@
+# Created by: Sunpoet Po-Chuan Hsieh
+# $FreeBSD$
+
+PORTNAME= gettext-setup
+PORTVERSION= 0.10
+CATEGORIES= devel rubygems
+MASTER_SITES= RG
+
+MAINTAINER= sunpoet@FreeBSD.org
+COMMENT= Set up i18n for Ruby projects
+
+LICENSE= APACHE20
+
+RUN_DEPENDS= rubygem-fast_gettext>=1.1.0:devel/rubygem-fast_gettext \
+ rubygem-gettext>=3.0.2:devel/rubygem-gettext
+
+NO_ARCH= yes
+USE_RUBY= yes
+USES= gem
+
+.include
diff --git a/devel/rubygem-gettext-setup/distinfo b/devel/rubygem-gettext-setup/distinfo
new file mode 100644
index 00000000000..55e5e824bb0
--- /dev/null
+++ b/devel/rubygem-gettext-setup/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1483345071
+SHA256 (rubygem/gettext-setup-0.10.gem) = ec5be33297c6891268f25a2ec4f1d8fedb315de5dc3260a7bfacc260f6ef7d95
+SIZE (rubygem/gettext-setup-0.10.gem) = 10240
diff --git a/devel/rubygem-gettext-setup/files/patch-gemspec b/devel/rubygem-gettext-setup/files/patch-gemspec
new file mode 100644
index 00000000000..8f6add9e313
--- /dev/null
+++ b/devel/rubygem-gettext-setup/files/patch-gemspec
@@ -0,0 +1,11 @@
+--- gettext-setup.gemspec.orig 2017-01-02 08:20:25 UTC
++++ gettext-setup.gemspec
+@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
+
+ if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+ s.add_runtime_dependency(%q.freeze, [">= 3.0.2"])
+- s.add_runtime_dependency(%q.freeze, ["~> 1.1.0"])
++ s.add_runtime_dependency(%q.freeze, [">= 1.1.0"])
+ s.add_development_dependency(%q.freeze, ["~> 1.3"])
+ s.add_development_dependency(%q.freeze, [">= 0"])
+ s.add_development_dependency(%q.freeze, [">= 0"])
diff --git a/devel/rubygem-gettext-setup/pkg-descr b/devel/rubygem-gettext-setup/pkg-descr
new file mode 100644
index 00000000000..26fe6293c29
--- /dev/null
+++ b/devel/rubygem-gettext-setup/pkg-descr
@@ -0,0 +1,8 @@
+gettext-setup is a simple gem to set up i18n for Ruby projects (including
+Sinatra web apps) using gettext and fast gettext.
+
+This project sets the default locale to English. If the user has set a different
+locale in their browser preferences, and we support the user's preferred locale,
+strings and data formatting will be customized for that locale.
+
+WWW: https://github.com/puppetlabs/gettext-setup-gem
diff --git a/devel/rubygem-gitlab_git/Makefile b/devel/rubygem-gitlab_git/Makefile
index ad4615c2ac7..7197df441a3 100644
--- a/devel/rubygem-gitlab_git/Makefile
+++ b/devel/rubygem-gitlab_git/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= gitlab_git
-PORTVERSION= 10.5.0
+PORTVERSION= 10.7.0
PORTEPOCH= 1
CATEGORIES= devel rubygems
MASTER_SITES= RG
diff --git a/devel/rubygem-gitlab_git/distinfo b/devel/rubygem-gitlab_git/distinfo
index 70d9084bc47..48d4f401802 100644
--- a/devel/rubygem-gitlab_git/distinfo
+++ b/devel/rubygem-gitlab_git/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1480070256
-SHA256 (rubygem/gitlab_git-10.5.0.gem) = 703d6eef388bb9dcdecb13f000d365a75f54731bfb5a677ae20a6c5ac75d501d
-SIZE (rubygem/gitlab_git-10.5.0.gem) = 26624
+TIMESTAMP = 1483343774
+SHA256 (rubygem/gitlab_git-10.7.0.gem) = 5566c99586a84784dac8db1d9c2c6245daf89f73db9f2796f21a0c8c6933d95a
+SIZE (rubygem/gitlab_git-10.7.0.gem) = 28160
diff --git a/devel/rubygem-json1/Makefile b/devel/rubygem-json1/Makefile
new file mode 100644
index 00000000000..77687243054
--- /dev/null
+++ b/devel/rubygem-json1/Makefile
@@ -0,0 +1,23 @@
+# Created by: Cheng-Lung Sung
+# $FreeBSD$
+
+PORTNAME= json
+PORTVERSION= 1.8.3
+CATEGORIES= devel rubygems
+MASTER_SITES= RG
+PKGNAMESUFFIX= 1
+
+MAINTAINER= ruby@FreeBSD.org
+COMMENT= Parse JSON texts and generate them from ruby data structures
+
+LICENSE= GPLv2 RUBY
+LICENSE_COMB= dual
+LICENSE_FILE_GPLv2= ${WRKSRC}/GPL
+LICENSE_FILE_RUBY= ${WRKSRC}/COPYING
+
+USE_RUBY= yes
+USES= gem
+
+PORTSCOUT= limit:^1\.
+
+.include
diff --git a/devel/rubygem-json1/distinfo b/devel/rubygem-json1/distinfo
new file mode 100644
index 00000000000..4d09b59bee2
--- /dev/null
+++ b/devel/rubygem-json1/distinfo
@@ -0,0 +1,2 @@
+SHA256 (rubygem/json-1.8.3.gem) = 8ca2091e26678fb989d66cdb9f0104f1307bc584b429c2fd783d51e4b3f14bdb
+SIZE (rubygem/json-1.8.3.gem) = 152064
diff --git a/devel/rubygem-json1/pkg-descr b/devel/rubygem-json1/pkg-descr
new file mode 100644
index 00000000000..0b1373d0d66
--- /dev/null
+++ b/devel/rubygem-json1/pkg-descr
@@ -0,0 +1,5 @@
+This library can parse JSON texts and generate them from ruby data structures.
+This port implemented in C and comes with its own unicode conversion functions
+and a parser generated by the Ragel State Machine Compiler.
+
+WWW: http://flori.github.io/json/
diff --git a/devel/rubygem-rdoc/Makefile b/devel/rubygem-rdoc/Makefile
index 38266f77d88..bb1428ad42d 100644
--- a/devel/rubygem-rdoc/Makefile
+++ b/devel/rubygem-rdoc/Makefile
@@ -1,7 +1,8 @@
# $FreeBSD$
PORTNAME= rdoc
-PORTVERSION= 4.2.2
+PORTVERSION= 4.3.0
+PORTREVISION= 1
CATEGORIES= devel rubygems
MASTER_SITES= RG
@@ -12,8 +13,6 @@ LICENSE= GPLv2 RUBY
LICENSE_COMB= dual
LICENSE_FILE_RUBY= ${WRKSRC}/LICENSE.rdoc
-RUN_DEPENDS= rubygem-json>=1.4:devel/rubygem-json
-
NO_ARCH= yes
USE_RUBY= yes
USES= gem
diff --git a/devel/rubygem-rdoc/distinfo b/devel/rubygem-rdoc/distinfo
index 2aceeead4c4..ec007c9ed19 100644
--- a/devel/rubygem-rdoc/distinfo
+++ b/devel/rubygem-rdoc/distinfo
@@ -1,2 +1,3 @@
-SHA256 (rubygem/rdoc-4.2.2.gem) = f3341c252b1547be6ba042f5ca1ce1fc5c52e3c27d8e0d485d0486173edfed08
-SIZE (rubygem/rdoc-4.2.2.gem) = 738816
+TIMESTAMP = 1481638086
+SHA256 (rubygem/rdoc-4.3.0.gem) = 8cd820f70ec4b315ffff8e0653c8ce46cc9e444f3f8e7ed21c57338c61156a8d
+SIZE (rubygem/rdoc-4.3.0.gem) = 738816
diff --git a/devel/rubygem-rdoc3/Makefile b/devel/rubygem-rdoc3/Makefile
index 8a1042d1599..988ce6c060a 100644
--- a/devel/rubygem-rdoc3/Makefile
+++ b/devel/rubygem-rdoc3/Makefile
@@ -2,6 +2,7 @@
PORTNAME= rdoc
PORTVERSION= 3.12.2
+PORTREVISION= 1
CATEGORIES= devel rubygems
MASTER_SITES= RG
PKGNAMESUFFIX= 3
@@ -13,7 +14,7 @@ LICENSE= GPLv2 RUBY
LICENSE_COMB= dual
LICENSE_FILE_RUBY= ${WRKSRC}/LICENSE.rdoc
-RUN_DEPENDS= rubygem-json>=1.4:devel/rubygem-json
+RUN_DEPENDS= rubygem-json1>=1.4:devel/rubygem-json1
NO_ARCH= yes
USE_RUBY= yes
diff --git a/devel/rubygem-recaptcha/Makefile b/devel/rubygem-recaptcha/Makefile
index f4a69aeb1a9..4b6cd572732 100644
--- a/devel/rubygem-recaptcha/Makefile
+++ b/devel/rubygem-recaptcha/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= recaptcha
-PORTVERSION= 3.3.0
+PORTVERSION= 4.0.1
CATEGORIES= devel rubygems
MASTER_SITES= RG
diff --git a/devel/rubygem-recaptcha/distinfo b/devel/rubygem-recaptcha/distinfo
index 3e0c6f98ba2..32d8cd55d8b 100644
--- a/devel/rubygem-recaptcha/distinfo
+++ b/devel/rubygem-recaptcha/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1469115299
-SHA256 (rubygem/recaptcha-3.3.0.gem) = f695a18fe5e535bc222043d07223732d8bbc1835b61b9190c7245233c611f5a6
-SIZE (rubygem/recaptcha-3.3.0.gem) = 11776
+TIMESTAMP = 1483371454
+SHA256 (rubygem/recaptcha-4.0.1.gem) = ecfeb41bdbe933aeb3076645f6ff4e0124c3c32894d335263fc8eaca557d71af
+SIZE (rubygem/recaptcha-4.0.1.gem) = 11776
diff --git a/devel/rubygem-ruby-ole/Makefile b/devel/rubygem-ruby-ole/Makefile
index c76367c4026..484160837aa 100644
--- a/devel/rubygem-ruby-ole/Makefile
+++ b/devel/rubygem-ruby-ole/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= ruby-ole
-PORTVERSION= 1.2.11.8
-PORTREVISION= 1
+PORTVERSION= 1.2.12
CATEGORIES= devel rubygems
MASTER_SITES= RG
diff --git a/devel/rubygem-ruby-ole/distinfo b/devel/rubygem-ruby-ole/distinfo
index b18195d1419..412d21e770f 100644
--- a/devel/rubygem-ruby-ole/distinfo
+++ b/devel/rubygem-ruby-ole/distinfo
@@ -1,2 +1,3 @@
-SHA256 (rubygem/ruby-ole-1.2.11.8.gem) = e999b1d6be00a55181fb29162c685ad3e950025a4b8ef0e99eda173087f8cd31
-SIZE (rubygem/ruby-ole-1.2.11.8.gem) = 56832
+TIMESTAMP = 1483351463
+SHA256 (rubygem/ruby-ole-1.2.12.gem) = 134b717dd16beacaad2ab1399f14b773fce37865391ab7c6f19891ff3f5d8181
+SIZE (rubygem/ruby-ole-1.2.12.gem) = 56320
diff --git a/devel/rubygem-ruby-prof/Makefile b/devel/rubygem-ruby-prof/Makefile
index 48022271d7a..e04fe3c1d31 100644
--- a/devel/rubygem-ruby-prof/Makefile
+++ b/devel/rubygem-ruby-prof/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= ruby-prof
-PORTVERSION= 0.15.9
+PORTVERSION= 0.16.2
CATEGORIES= devel rubygems
MASTER_SITES= RG
diff --git a/devel/rubygem-ruby-prof/distinfo b/devel/rubygem-ruby-prof/distinfo
index d18a4ee7006..8adba60adec 100644
--- a/devel/rubygem-ruby-prof/distinfo
+++ b/devel/rubygem-ruby-prof/distinfo
@@ -1,2 +1,3 @@
-SHA256 (rubygem/ruby-prof-0.15.9.gem) = e200a6856677aa2c25498ee12ad1aa4b4b04cbb2951fc8eb1a90f54d99477f63
-SIZE (rubygem/ruby-prof-0.15.9.gem) = 470528
+TIMESTAMP = 1483350368
+SHA256 (rubygem/ruby-prof-0.16.2.gem) = 4fcd93dba70ed6f90ac030fb42798ddd4fbeceda37b15cfacccf49d5587b2378
+SIZE (rubygem/ruby-prof-0.16.2.gem) = 476672
diff --git a/devel/rubygem-ruby-prof/files/patch-ext_ruby__prof_extconf.rb b/devel/rubygem-ruby-prof/files/patch-ext_ruby__prof_extconf.rb
new file mode 100644
index 00000000000..72f613e61be
--- /dev/null
+++ b/devel/rubygem-ruby-prof/files/patch-ext_ruby__prof_extconf.rb
@@ -0,0 +1,7 @@
+--- ext/ruby_prof/extconf.rb.orig 2015-04-13 15:15:09 UTC
++++ ext/ruby_prof/extconf.rb
+@@ -1,3 +1,4 @@
++require 'rubygems'
+ require "mkmf"
+
+ if RUBY_VERSION < "1.9.3"
diff --git a/devel/rubygem-ruby_dep/Makefile b/devel/rubygem-ruby_dep/Makefile
index b34ae95dfed..b092651d51f 100644
--- a/devel/rubygem-ruby_dep/Makefile
+++ b/devel/rubygem-ruby_dep/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= ruby_dep
-PORTVERSION= 1.3.1
+PORTVERSION= 1.5.0
CATEGORIES= devel rubygems
MASTER_SITES= RG
diff --git a/devel/rubygem-ruby_dep/distinfo b/devel/rubygem-ruby_dep/distinfo
index 66785812b6b..30f84a94e0c 100644
--- a/devel/rubygem-ruby_dep/distinfo
+++ b/devel/rubygem-ruby_dep/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1480950378
-SHA256 (rubygem/ruby_dep-1.3.1.gem) = 14814183f004eba3e3db9c9b534b65208294412ab99aa337e934a5f4bbfd186c
-SIZE (rubygem/ruby_dep-1.3.1.gem) = 9728
+TIMESTAMP = 1483349268
+SHA256 (rubygem/ruby_dep-1.5.0.gem) = c5bfbc7c53f9b40d287f426846d0b5765b3d0d197aca60e766b3a678129d2bb0
+SIZE (rubygem/ruby_dep-1.5.0.gem) = 11776
diff --git a/devel/rubygem-rubytree/Makefile b/devel/rubygem-rubytree/Makefile
index 210011b89ed..a8c30bf3128 100644
--- a/devel/rubygem-rubytree/Makefile
+++ b/devel/rubygem-rubytree/Makefile
@@ -3,6 +3,7 @@
PORTNAME= rubytree
PORTVERSION= 0.9.7
+PORTREVISION= 1
CATEGORIES= devel rubygems
MASTER_SITES= RG
@@ -12,7 +13,7 @@ COMMENT= Implementation of the Tree data structure for the Ruby
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE.md
-RUN_DEPENDS= rubygem-json>=1.8:devel/rubygem-json \
+RUN_DEPENDS= rubygem-json1>=1.8:devel/rubygem-json1 \
rubygem-structured_warnings>=0.2:devel/rubygem-structured_warnings
NO_ARCH= yes
diff --git a/devel/rubygem-sdoc/Makefile b/devel/rubygem-sdoc/Makefile
index 1a58647f5ed..1b0c8fc86c6 100644
--- a/devel/rubygem-sdoc/Makefile
+++ b/devel/rubygem-sdoc/Makefile
@@ -3,6 +3,7 @@
PORTNAME= sdoc
PORTVERSION= 0.4.2
+PORTREVISION= 1
CATEGORIES= devel rubygems
MASTER_SITES= RG
@@ -11,7 +12,7 @@ COMMENT= Create rdoc html with javascript search index
LICENSE= MIT
-RUN_DEPENDS= rubygem-json>=1.7.7:devel/rubygem-json
+RUN_DEPENDS= rubygem-json1>=1.7.7:devel/rubygem-json1
NO_ARCH= yes
diff --git a/devel/rubygem-semantic_puppet/Makefile b/devel/rubygem-semantic_puppet/Makefile
index de1036cd9e9..01e799a0da7 100644
--- a/devel/rubygem-semantic_puppet/Makefile
+++ b/devel/rubygem-semantic_puppet/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= semantic_puppet
-PORTVERSION= 0.1.2
+PORTVERSION= 0.1.4
CATEGORIES= devel rubygems
MASTER_SITES= RG
@@ -11,6 +11,8 @@ COMMENT= Library for working with Semantic Versions and module dependencies
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
+RUN_DEPENDS= rubygem-gettext-setup>=0.3:devel/rubygem-gettext-setup
+
NO_ARCH= yes
USE_RUBY= yes
USES= gem
diff --git a/devel/rubygem-semantic_puppet/distinfo b/devel/rubygem-semantic_puppet/distinfo
index f3214653ca7..fd407896ada 100644
--- a/devel/rubygem-semantic_puppet/distinfo
+++ b/devel/rubygem-semantic_puppet/distinfo
@@ -1,2 +1,3 @@
-SHA256 (rubygem/semantic_puppet-0.1.2.gem) = de0f0112fc4b9412ce3295e2f9653a796ec9f88953a2cfd03617755a5a35a559
-SIZE (rubygem/semantic_puppet-0.1.2.gem) = 25600
+TIMESTAMP = 1483343783
+SHA256 (rubygem/semantic_puppet-0.1.4.gem) = 6c9236fba9e547b43ac35f700506f5df1975905e98a18821ffc28ded754e41ff
+SIZE (rubygem/semantic_puppet-0.1.4.gem) = 26624
diff --git a/devel/rubygem-sentry-raven/Makefile b/devel/rubygem-sentry-raven/Makefile
index 5a5269ebce4..5f85aa5a952 100644
--- a/devel/rubygem-sentry-raven/Makefile
+++ b/devel/rubygem-sentry-raven/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= sentry-raven
-PORTVERSION= 2.0.0
+PORTVERSION= 2.2.0
CATEGORIES= devel rubygems
MASTER_SITES= RG
diff --git a/devel/rubygem-sentry-raven/distinfo b/devel/rubygem-sentry-raven/distinfo
index 8fa1aa5ddcd..ba18b951e67 100644
--- a/devel/rubygem-sentry-raven/distinfo
+++ b/devel/rubygem-sentry-raven/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1476364402
-SHA256 (rubygem/sentry-raven-2.0.0.gem) = 5ab7d028268895e420570f06a3111a7871756a46599764b3e06ac763e16a7536
-SIZE (rubygem/sentry-raven-2.0.0.gem) = 31744
+TIMESTAMP = 1483348964
+SHA256 (rubygem/sentry-raven-2.2.0.gem) = 64981be31d76aaf7a76a439e194cb3760d492af02f19d01a2e75c35d6b861fc4
+SIZE (rubygem/sentry-raven-2.2.0.gem) = 33792
diff --git a/devel/rubygem-sequel/Makefile b/devel/rubygem-sequel/Makefile
index ef1e0ca2d11..053b1392c04 100644
--- a/devel/rubygem-sequel/Makefile
+++ b/devel/rubygem-sequel/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= sequel
-PORTVERSION= 4.41.0
+PORTVERSION= 4.42.0
CATEGORIES= devel rubygems
MASTER_SITES= RG
diff --git a/devel/rubygem-sequel/distinfo b/devel/rubygem-sequel/distinfo
index afd1a763192..147fabdcc07 100644
--- a/devel/rubygem-sequel/distinfo
+++ b/devel/rubygem-sequel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1483215734
-SHA256 (rubygem/sequel-4.41.0.gem) = f7d4da47f7c6c6b70e591d8d447a8bf970bf31b6fe990225ebcda61a48608430
-SIZE (rubygem/sequel-4.41.0.gem) = 1388032
+TIMESTAMP = 1483348499
+SHA256 (rubygem/sequel-4.42.0.gem) = 985c63b082ee5290c55bda647b949be53b04338a2b48d707c6a2b09322c5d469
+SIZE (rubygem/sequel-4.42.0.gem) = 1401856
diff --git a/devel/rubygem-web-console/Makefile b/devel/rubygem-web-console/Makefile
index 1ff05b5d964..a2340e302d0 100644
--- a/devel/rubygem-web-console/Makefile
+++ b/devel/rubygem-web-console/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= web-console
-PORTVERSION= 3.3.0
+PORTVERSION= 3.4.0
CATEGORIES= devel rubygems
MASTER_SITES= RG
diff --git a/devel/rubygem-web-console/distinfo b/devel/rubygem-web-console/distinfo
index 9e253590589..cb18b457fce 100644
--- a/devel/rubygem-web-console/distinfo
+++ b/devel/rubygem-web-console/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1483223271
-SHA256 (rubygem/web-console-3.3.0.gem) = a49dd65abeaf76965791ea550ee7c1f187b99e548c32e6c84bf4ca5c86d54c4c
-SIZE (rubygem/web-console-3.3.0.gem) = 24576
+TIMESTAMP = 1483346789
+SHA256 (rubygem/web-console-3.4.0.gem) = 16527bd9116aecf2c3ac7fcf40e220b06c8ae6122ab45edb4397e2a60437dbf1
+SIZE (rubygem/web-console-3.4.0.gem) = 28160
diff --git a/devel/sdl_console/Makefile b/devel/sdl_console/Makefile
index a5ac645b558..f030a1ea206 100644
--- a/devel/sdl_console/Makefile
+++ b/devel/sdl_console/Makefile
@@ -8,7 +8,7 @@ CATEGORIES= devel
MASTER_SITES= SF/sdlconsole/sdlconsole-source/sdlconsole-${PORTVERSION}
DISTNAME= sdlconsole-${PORTVERSION}
-MAINTAINER= leeym@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Drop down console that can be easily added to any SDL application
USES= libtool
diff --git a/devel/tevent/Makefile b/devel/tevent/Makefile
index 58446df57a5..00214e0f55d 100644
--- a/devel/tevent/Makefile
+++ b/devel/tevent/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= tevent
-PORTVERSION= 0.9.28
+PORTVERSION= 0.9.31
PORTREVISION= 0
PORTEPOCH= 0
CATEGORIES= devel
@@ -30,7 +30,7 @@ CONFIGURE_ARGS+= --mandir=${MANPREFIX}/man \
OPTIONS_DEFINE= MANPAGES
MANPAGES_DESC= Build and install manpages (requires textproc/docbook-xsl)
-BUILD_DEPENDS+= talloc>=2.1.5:devel/talloc
+BUILD_DEPENDS+= talloc>=2.1.8:devel/talloc
RUN_DEPENDS:= ${BUILD_DEPENDS}
.include
diff --git a/devel/tevent/distinfo b/devel/tevent/distinfo
index c53cc11cbcc..9af200481e9 100644
--- a/devel/tevent/distinfo
+++ b/devel/tevent/distinfo
@@ -1,2 +1,3 @@
-SHA256 (tevent-0.9.28.tar.gz) = 04d953379025b1560af5c4ffcce58a3ee84db7aaa09c9f1e3eff5b2945a13529
-SIZE (tevent-0.9.28.tar.gz) = 581522
+TIMESTAMP = 1483301477
+SHA256 (tevent-0.9.31.tar.gz) = 4a13f2256ad804c860e84068258bd0f8be31cf0c79aa8f3019fa32f6928c2bfc
+SIZE (tevent-0.9.31.tar.gz) = 587784
diff --git a/devel/tevent/files/patch-buildtools__wafsamba__samba_install.py b/devel/tevent/files/patch-buildtools__wafsamba__samba_install.py
index 994ee3637e9..95f250a8621 100644
--- a/devel/tevent/files/patch-buildtools__wafsamba__samba_install.py
+++ b/devel/tevent/files/patch-buildtools__wafsamba__samba_install.py
@@ -1,6 +1,6 @@
---- ./buildtools/wafsamba/samba_install.py.orig 2015-08-09 19:55:47.819170736 +0000
-+++ ./buildtools/wafsamba/samba_install.py 2015-08-09 19:56:18.727356203 +0000
-@@ -116,7 +116,7 @@
+--- buildtools/wafsamba/samba_install.py.orig 2015-12-10 11:01:40 UTC
++++ buildtools/wafsamba/samba_install.py
+@@ -118,7 +118,7 @@ def install_library(self):
inst_name = bld.make_libname(t.target)
elif self.vnum:
vnum_base = self.vnum.split('.')[0]
diff --git a/devel/tevent/files/patch-third_party__waf__wafadmin__Tools__cc.py b/devel/tevent/files/patch-third_party__waf__wafadmin__Tools__cc.py
new file mode 100644
index 00000000000..5695f3e0384
--- /dev/null
+++ b/devel/tevent/files/patch-third_party__waf__wafadmin__Tools__cc.py
@@ -0,0 +1,11 @@
+--- third_party/waf/wafadmin/Tools/cc.py.orig 2015-11-06 13:25:52 UTC
++++ third_party/waf/wafadmin/Tools/cc.py
+@@ -88,7 +88,7 @@ def c_hook(self, node):
+ raise Utils.WafError('Have you forgotten to set the feature "cc" on %s?' % str(self))
+ return task
+
+-cc_str = '${CC} ${CCFLAGS} ${CPPFLAGS} ${_CCINCFLAGS} ${_CCDEFFLAGS} ${CC_SRC_F}${SRC} ${CC_TGT_F}${TGT}'
++cc_str = '${CC} ${CCFLAGS} ${_CCINCFLAGS} ${CPPFLAGS} ${_CCDEFFLAGS} ${CC_SRC_F}${SRC} ${CC_TGT_F}${TGT}'
+ cls = Task.simple_task_type('cc', cc_str, 'GREEN', ext_out='.o', ext_in='.c', shell=False)
+ cls.scan = ccroot.scan
+ cls.vars.append('CCDEPS')
diff --git a/devel/unittest-cpp/Makefile b/devel/unittest-cpp/Makefile
new file mode 100644
index 00000000000..4463504238a
--- /dev/null
+++ b/devel/unittest-cpp/Makefile
@@ -0,0 +1,19 @@
+# Created by: iblis
+# $FreeBSD$
+
+PORTNAME= unittest-cpp
+PORTVERSION= 1.6.1
+DISTVERSIONPREFIX= v
+CATEGORIES= devel
+
+MAINTAINER= iblis@hs.ntnu.edu.tw
+COMMENT= Lightweight unit testing framework for C++
+
+LICENSE= MIT
+LICENSE_FILE= ${WRKSRC}/LICENSE
+
+USE_GITHUB= yes
+
+USES= cmake
+
+.include
diff --git a/devel/unittest-cpp/distinfo b/devel/unittest-cpp/distinfo
new file mode 100644
index 00000000000..e2ffa64d261
--- /dev/null
+++ b/devel/unittest-cpp/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1483277010
+SHA256 (unittest-cpp-unittest-cpp-v1.6.1_GH0.tar.gz) = 1cc9071be01db190f26868fefb6a7af49ee56a339fc3b08d1a1e9eeca5376c45
+SIZE (unittest-cpp-unittest-cpp-v1.6.1_GH0.tar.gz) = 52536
diff --git a/devel/unittest-cpp/pkg-descr b/devel/unittest-cpp/pkg-descr
new file mode 100644
index 00000000000..9d4fd11b990
--- /dev/null
+++ b/devel/unittest-cpp/pkg-descr
@@ -0,0 +1,8 @@
+UnitTest++ is a lightweight unit testing framework for C++.
+It was designed to do test-driven development on a wide variety of platforms.
+Simplicity, portability, speed, and small footprint are all very important
+aspects of UnitTest++. UnitTest++ is mostly standard C++ and makes minimal
+use of advanced library and language features, which means it should be easily
+portable to just about any platform.
+
+WWW: https://github.com/unittest-cpp/unittest-cpp
diff --git a/devel/unittest-cpp/pkg-plist b/devel/unittest-cpp/pkg-plist
new file mode 100644
index 00000000000..1c296ffbd6d
--- /dev/null
+++ b/devel/unittest-cpp/pkg-plist
@@ -0,0 +1,39 @@
+@comment $FreeBSD$
+include/UnitTest++/AssertException.h
+include/UnitTest++/CheckMacros.h
+include/UnitTest++/Checks.h
+include/UnitTest++/CompositeTestReporter.h
+include/UnitTest++/Config.h
+include/UnitTest++/CurrentTest.h
+include/UnitTest++/DeferredTestReporter.h
+include/UnitTest++/DeferredTestResult.h
+include/UnitTest++/ExceptionMacros.h
+include/UnitTest++/ExecuteTest.h
+include/UnitTest++/HelperMacros.h
+include/UnitTest++/MemoryOutStream.h
+include/UnitTest++/Posix/SignalTranslator.h
+include/UnitTest++/Posix/TimeHelpers.h
+include/UnitTest++/ReportAssert.h
+include/UnitTest++/ReportAssertImpl.h
+include/UnitTest++/RequireMacros.h
+include/UnitTest++/RequiredCheckException.h
+include/UnitTest++/RequiredCheckTestReporter.h
+include/UnitTest++/Test.h
+include/UnitTest++/TestDetails.h
+include/UnitTest++/TestList.h
+include/UnitTest++/TestMacros.h
+include/UnitTest++/TestReporter.h
+include/UnitTest++/TestReporterStdout.h
+include/UnitTest++/TestResults.h
+include/UnitTest++/TestRunner.h
+include/UnitTest++/TestSuite.h
+include/UnitTest++/ThrowingTestReporter.h
+include/UnitTest++/TimeConstraint.h
+include/UnitTest++/TimeHelpers.h
+include/UnitTest++/UnitTest++.h
+include/UnitTest++/UnitTestPP.h
+include/UnitTest++/XmlTestReporter.h
+lib/cmake/UnitTest++/UnitTest++Config.cmake
+lib/cmake/UnitTest++/UnitTest++Targets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/UnitTest++/UnitTest++Targets.cmake
+lib/libUnitTest++.a
diff --git a/dns/bind9-devel/Makefile b/dns/bind9-devel/Makefile
index a6ffba5d104..d79044d7d74 100644
--- a/dns/bind9-devel/Makefile
+++ b/dns/bind9-devel/Makefile
@@ -30,8 +30,8 @@ COMMENT= BIND DNS suite with updated DNSSEC and DNS64
LICENSE= MPL
# ISC releases things like 9.8.0-P1, which our versioning doesn't like
-ISCVERSION= 9.12.0a.2016.12.23
-HASH= e17d2f9
+ISCVERSION= 9.12.0a.2016.12.28
+HASH= eff07b5
USES= cpe libedit
@@ -71,7 +71,7 @@ OPTIONS_RADIO_GOSTDEF= GOST GOST_ASN1
.if !defined(BIND_TOOLS_SLAVE)
OPTIONS_DEFAULT+= DLZ_FILESYSTEM LMDB RPZ_NSDNAME RPZ_NSIP
-OPTIONS_DEFINE+= LINKS RPZ_NSIP RPZ_NSDNAME DOCS GEOIP \
+OPTIONS_DEFINE+= RPZ_NSIP RPZ_NSDNAME DOCS GEOIP \
MINCACHE PORTREVISION QUERYTRACE LMDB DNSTAP \
START_LATE
OPTIONS_GROUP= DLZ
@@ -102,7 +102,6 @@ QUERYTRACE_DESC= Enable the very verbose query tracelogging
LMDB_DESC= Use LMDB for zone management
DNSTAP_DESC= Provides fast passive logging of DNS messages
-LINKS_DESC= Create conf file symlinks in ${PREFIX}
RPZ_NSIP_DESC= Enable RPZ NSIP trigger rules
RPZ_NSDNAME_DESC= Enable RPZ NSDNAME policy records
DLZ_DESC= Dynamically Loadable Zones
@@ -211,30 +210,16 @@ DNSTAP_LIB_DEPENDS= libfstrm.so:devel/fstrm \
CONFIGURE_ARGS+= --without-gost
.endif
-.if !${PORT_OPTIONS:MLINKS}
-PKGINSTALL=${NONEXISTENT}
-.endif
-
.if ${PORT_OPTIONS:MTHREADS} && !${PORT_OPTIONS:MDLZ_MYSQL}
CONFIGURE_ARGS+= --enable-threads
.else
CONFIGURE_ARGS+= --disable-threads
.endif
-.if ${OPSYS} == DragonFly || (${OPSYS} == FreeBSD && ${OSVERSION} >= 1000100)
-PKGINSTALL= ${NONEXISTENT}
-PLIST_SUB+= NOBASE="" BASE="@comment "
-SUB_LIST+= NOBASE="" BASE="@comment "
.if !defined(BIND_TOOLS_SLAVE)
USE_RC_SUBR+= named
SUB_FILES+= named.conf
.endif # !defined(BIND_TOOLS_SLAVE)
-.else
-PLIST_SUB+= NOBASE="@comment " BASE=""
-SUB_LIST+= NOBASE="@comment " BASE=""
-.endif
-
-PKGDEINSTALL= ${PKGINSTALL}
MAKE_JOBS_UNSAFE= yes
@@ -289,7 +274,6 @@ post-install:
${WRKSRC}/HISTORY ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
.endif
-.if ${OPSYS} == DragonFly || (${OPSYS} == FreeBSD && ${OSVERSION} >= 1000100)
${MKDIR} ${STAGEDIR}${PREFIX}/etc/mtree
${MKDIR} ${STAGEDIR}${ETCDIR}
.for i in dynamic master slave working
@@ -302,7 +286,6 @@ post-install:
${INSTALL_DATA} ${FILESDIR}/localhost-reverse.db ${STAGEDIR}${ETCDIR}/master
${INSTALL_DATA} ${FILESDIR}/BIND.chroot.dist ${STAGEDIR}${PREFIX}/etc/mtree
${INSTALL_DATA} ${FILESDIR}/BIND.chroot.local.dist ${STAGEDIR}${PREFIX}/etc/mtree
-.endif
${INSTALL_DATA} ${WRKSRC}/bin/rndc/rndc.conf \
${STAGEDIR}${ETCDIR}/rndc.conf.sample
diff --git a/dns/bind9-devel/distinfo b/dns/bind9-devel/distinfo
index d92e91b2be6..cd67427bd9d 100644
--- a/dns/bind9-devel/distinfo
+++ b/dns/bind9-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1482760397
-SHA256 (bind9-e17d2f9.tar.gz) = ce601a7b50497098b0c2540e6f7b06d63d4a12b0b86ea0683ef5c6acd192d946
-SIZE (bind9-e17d2f9.tar.gz) = 11809743
+TIMESTAMP = 1483349274
+SHA256 (bind9-eff07b5.tar.gz) = 50dc288d3d4e576bdae6cd2e14d5146712230983e2e856354a39dd5fc8941298
+SIZE (bind9-eff07b5.tar.gz) = 11811939
diff --git a/dns/bind9-devel/files/pkg-message.in b/dns/bind9-devel/files/pkg-message.in
index 0b30bd96050..13383a1d0d1 100644
--- a/dns/bind9-devel/files/pkg-message.in
+++ b/dns/bind9-devel/files/pkg-message.in
@@ -10,14 +10,7 @@
* 'rndc-confgen -a' to generate the proper conf file, with a new *
* random key, and appropriate file permissions. *
* *
-%%NOBASE%%* The %%PREFIX%%/etc/rc.d/named script will do that for you. *
-%%BASE%%* The /etc/rc.d/named script in the base will do that for you. *
-%%BASE%%* *
-%%BASE%%* You will need to make sure that you have the following line *
-%%BASE%%* in your /etc/rc.conf in order to have the startup script *
-%%BASE%%* run the named version from the port: *
-%%BASE%%* *
-%%BASE%%* named_program="%%PREFIX%%/sbin/named" *
+* The %%PREFIX%%/etc/rc.d/named script will do that for you. *
* *
* *
* *
diff --git a/dns/bind9-devel/pkg-install b/dns/bind9-devel/pkg-install
deleted file mode 100644
index 12b2f98aaf2..00000000000
--- a/dns/bind9-devel/pkg-install
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-# ex:sw=8 sts=8
-
-if [ "$2" = 'POST-INSTALL' ]
-then
- /bin/mkdir -p /var/named${PKG_PREFIX}/etc/namedb
-fi
-
-for DIR in ${PKG_PREFIX}/etc/namedb /var/named${PKG_PREFIX}/etc/namedb; do
- for FILE in named.conf rndc.conf rndc.key; do
- if [ "$2" = 'POST-INSTALL' ]
- then
- if [ -e ${PKG_PREFIX}/etc/${FILE} ]
- then
- /bin/cp -a ${PKG_PREFIX}/etc/${FILE} ${DIR}/${FILE}
- else
- /bin/ln -sf /etc/namedb/${FILE} ${DIR}/${FILE}
- fi
- fi
- if [ "$2" = 'POST-DEINSTALL' ]
- then
- [ -L ${DIR}/${FILE} ] && rm -f ${DIR}/${FILE}
- fi
- done
-done
-
-if [ "$2" = 'POST-DEINSTALL' ]
-then
- cd /var/named && /bin/rmdir -p ./${PKG_PREFIX}/etc/namedb > /dev/null 2>&1 || :
-fi
-
-exit 0
diff --git a/dns/bind9-devel/pkg-plist b/dns/bind9-devel/pkg-plist
index e6cd699ef10..314d9ffa185 100644
--- a/dns/bind9-devel/pkg-plist
+++ b/dns/bind9-devel/pkg-plist
@@ -430,14 +430,14 @@ sbin/rndc-confgen
sbin/tsig-keygen
%%ETCDIR%%/rndc.conf.sample
%%ETCDIR%%/bind.keys
-%%NOBASE%%etc/mtree/BIND.chroot.dist
-%%NOBASE%%etc/mtree/BIND.chroot.local.dist
-%%NOBASE%%@sample %%ETCDIR%%/named.conf.sample
-%%NOBASE%%%%ETCDIR%%/named.root
-%%NOBASE%%%%ETCDIR%%/master/empty.db
-%%NOBASE%%%%ETCDIR%%/master/localhost-forward.db
-%%NOBASE%%%%ETCDIR%%/master/localhost-reverse.db
-%%NOBASE%%@dir(bind,bind,) %%ETCDIR%%/dynamic
-%%NOBASE%%@dir %%ETCDIR%%/master
-%%NOBASE%%@dir(bind,bind,) %%ETCDIR%%/slave
-%%NOBASE%%@dir(bind,bind,) %%ETCDIR%%/working
+etc/mtree/BIND.chroot.dist
+etc/mtree/BIND.chroot.local.dist
+@sample %%ETCDIR%%/named.conf.sample
+%%ETCDIR%%/named.root
+%%ETCDIR%%/master/empty.db
+%%ETCDIR%%/master/localhost-forward.db
+%%ETCDIR%%/master/localhost-reverse.db
+@dir(bind,bind,) %%ETCDIR%%/dynamic
+@dir %%ETCDIR%%/master
+@dir(bind,bind,) %%ETCDIR%%/slave
+@dir(bind,bind,) %%ETCDIR%%/working
diff --git a/finance/p5-Finance-YahooQuote/Makefile b/finance/p5-Finance-YahooQuote/Makefile
index a0cee581ff8..2871e42d95e 100644
--- a/finance/p5-Finance-YahooQuote/Makefile
+++ b/finance/p5-Finance-YahooQuote/Makefile
@@ -7,7 +7,7 @@ CATEGORIES= finance perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
-MAINTAINER= leeym@FreeBSD.org
+MAINTAINER= perl@FreeBSD.org
COMMENT= Get stock quotes from Yahoo! Finance
RUN_DEPENDS= p5-HTML-Parser>=2.2:www/p5-HTML-Parser \
diff --git a/games/legend-of-edgar/Makefile b/games/legend-of-edgar/Makefile
index daf761574ba..174e661e961 100644
--- a/games/legend-of-edgar/Makefile
+++ b/games/legend-of-edgar/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= edgar
-DISTVERSION= 1.25
+DISTVERSION= 1.26
CATEGORIES= games
PKGNAMEPREFIX= legend-of-
diff --git a/games/legend-of-edgar/distinfo b/games/legend-of-edgar/distinfo
index 087319a4f77..67a998e7a60 100644
--- a/games/legend-of-edgar/distinfo
+++ b/games/legend-of-edgar/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1478006809
-SHA256 (riksweeney-edgar-1.25_GH0.tar.gz) = 18d56c9083fc649ea8761c52af8817f1cbae4d3459fce1d88348dfa657b72879
-SIZE (riksweeney-edgar-1.25_GH0.tar.gz) = 135999058
+TIMESTAMP = 1483381806
+SHA256 (riksweeney-edgar-1.26_GH0.tar.gz) = 70dd52043ef1db04719d6e1dc8f982e5b3a21c3281db72374704acce79f4ba06
+SIZE (riksweeney-edgar-1.26_GH0.tar.gz) = 133639556
diff --git a/games/openbor/pkg-descr b/games/openbor/pkg-descr
index 89a4fc69816..7dbc9b2aef9 100644
--- a/games/openbor/pkg-descr
+++ b/games/openbor/pkg-descr
@@ -1,4 +1,11 @@
-OpenBOR is a continuation of the Beats Of Rage 2D game engine, which
-was originally created by Senile Team.
+OpenBOR is the open source continuation of Beats of Rage, a Streets of
+Rage tribute game originally developed by Senile Team. In the years
+since it has grown into arguably the single most powerful two
+dimensional sprite based engine in the world and certainly the most
+versatile. While intended to allow creation of side scrolling beat em'
+ups like Double Dragon or Final Fight, the engine is also capable of
+replicating Shumps, RPGs, platformers and the like. A built in
+scripting engine allows authors to take it even further, making
+imagination the only real limit.
WWW: http://www.chronocrash.com/
diff --git a/games/wtf/Makefile b/games/wtf/Makefile
index 8ed3d1413e7..b2dee9e5ba1 100644
--- a/games/wtf/Makefile
+++ b/games/wtf/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= wtf
-PORTVERSION= 20161212
+PORTVERSION= 20170101
CATEGORIES= games
MASTER_SITES= SF/bsdwtf
diff --git a/games/wtf/distinfo b/games/wtf/distinfo
index e63bcc12756..b325c03b609 100644
--- a/games/wtf/distinfo
+++ b/games/wtf/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1481687273
-SHA256 (wtf-20161212.tar.gz) = 6ea519e2c6233321102d3b34c60ae116bb4d997ab4a72b307bd73fb4adb4397a
-SIZE (wtf-20161212.tar.gz) = 24754
+TIMESTAMP = 1483369625
+SHA256 (wtf-20170101.tar.gz) = 7309cceb4932100239cd73d3054cb0d93311f0f1d24522d5ddce5360e86bf484
+SIZE (wtf-20170101.tar.gz) = 24763
diff --git a/graphics/amide/Makefile b/graphics/amide/Makefile
index c7c349ef8c0..665f966bcfc 100644
--- a/graphics/amide/Makefile
+++ b/graphics/amide/Makefile
@@ -2,7 +2,7 @@
PORTNAME= amide
PORTVERSION= 1.0.5
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= graphics
MASTER_SITES= SF
@@ -34,12 +34,13 @@ VOLPACK_DESC= Use volpack
XMEDCON_DESC= Use xmedcon
OPTIONS_SUB= yes
-DCMTK_CONFIGURE_ENABLE= libdcmdata
+DCMTK_CONFIGURE_ON= --enable-libdcmdata
+DCMTK_CONFIGURE_OFF= --enable-libdcmdata=no
DCMTK_LIB_DEPENDS= libdcmdata.so:devel/dcmtk
FAME_CONFIGURE_ENABLE= libfame
FAME_LIB_DEPENDS= libfame.so:multimedia/libfame
FFMPEG_CONFIGURE_ENABLE= ffmpeg
-FFMPEG_LIB_DEPENDS= libavcodec0.so:multimedia/ffmpeg0
+FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg
GSL_CONFIGURE_ENABLE= libgsl
GSL_LIB_DEPENDS= libgsl.so:math/gsl
VOLPACK_CONFIGURE_ENABLE= libvolpack
@@ -53,8 +54,6 @@ post-patch:
${WRKSRC}/amide_config.h.in
@${REINPLACE_CMD} \
-e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
- -e 's|libavcodec|libavcodec0|g' \
- -e 's|libavutil|libavutil0|g' \
${WRKSRC}/configure
.include
diff --git a/graphics/amide/files/patch-Makefile.in b/graphics/amide/files/patch-Makefile.in
index b951f87fab0..08da412a601 100644
--- a/graphics/amide/files/patch-Makefile.in
+++ b/graphics/amide/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig 2014-01-25 23:25:32.000000000 +0100
-+++ Makefile.in 2014-01-27 13:14:16.876831395 +0100
-@@ -89,8 +89,7 @@
+--- Makefile.in.orig 2014-01-27 03:04:32 UTC
++++ Makefile.in
+@@ -89,8 +89,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/g
$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
$(top_srcdir)/configure.ac
diff --git a/graphics/amide/files/patch-configure b/graphics/amide/files/patch-configure
index 8d0479577b7..d161708f9b4 100644
--- a/graphics/amide/files/patch-configure
+++ b/graphics/amide/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig 2014-01-27 04:04:34.000000000 +0100
-+++ configure 2014-01-29 13:12:46.268622841 +0100
-@@ -16216,7 +16216,7 @@
+--- configure.orig 2014-01-27 03:04:34 UTC
++++ configure
+@@ -16216,7 +16216,7 @@ if test "x$ac_cv_func_bind_textdomain_co
DATADIRNAME=share
else
CATOBJEXT=.mo
@@ -9,7 +9,7 @@
fi
;;
-@@ -16226,7 +16226,7 @@
+@@ -16226,7 +16226,7 @@ fi
;;
*)
CATOBJEXT=.mo
@@ -18,7 +18,7 @@
;;
esac
fi
-@@ -16914,12 +16914,12 @@
+@@ -16914,12 +16914,12 @@ else
if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then :
DATADIRNAME=share
else
@@ -33,7 +33,7 @@
;;
esac
fi
-@@ -17612,8 +17612,8 @@
+@@ -17612,8 +17612,8 @@ else
THREAD_LIBS=""
fi
@@ -44,7 +44,16 @@
saved_libs="${LIBS}"
LIBS="${LIBS} ${AMIDE_LIBDCMDATA_LIBS}"
saved_cxxflags="${CXXFLAGS}"
-@@ -18154,6 +18154,7 @@
+@@ -17643,6 +17643,8 @@ if ac_fn_cxx_try_link "$LINENO"; then :
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libdcmdata was not found." >&5
+ $as_echo "$as_me: WARNING: libdcmdata was not found." >&2;}
++ AMIDE_LIBDCMDATA_LIBS=""
++ AMIDE_LIBDCMDATA_CFLAGS=""
+ fi
+ rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+@@ -18154,6 +18156,7 @@ $as_echo_n "checking for libfame - versi
ac_save_CFLAGS="$CFLAGS"
ac_save_LIBS="$LIBS"
CFLAGS="$CFLAGS $LIBFAME_CFLAGS"
@@ -52,7 +61,7 @@
LIBS="$LIBFAME_LIBS $LIBS"
rm -f conf.libfametest
if test "$cross_compiling" = yes; then :
-@@ -18165,6 +18166,7 @@
+@@ -18165,6 +18168,7 @@ else
#include
#include
#include
diff --git a/graphics/amide/files/patch-src-alignment_mutual_information.c b/graphics/amide/files/patch-src-alignment_mutual_information.c
index d183a757025..4f299e7bf31 100644
--- a/graphics/amide/files/patch-src-alignment_mutual_information.c
+++ b/graphics/amide/files/patch-src-alignment_mutual_information.c
@@ -1,5 +1,5 @@
---- src/alignment_mutual_information.c.orig 2012-01-22 17:25:06.000000000 +0100
-+++ src/alignment_mutual_information.c 2013-08-28 10:30:30.265534615 +0200
+--- src/alignment_mutual_information.c.orig 2012-01-22 16:25:06 UTC
++++ src/alignment_mutual_information.c
@@ -28,6 +28,13 @@
#include "amitk_data_set_DOUBLE_0D_SCALING.h"
#include "alignment_mutual_information.h"
@@ -14,7 +14,7 @@
/* this algorithm will calculate the amount of mutual information between two data sets in their current orientations */
/* it is a re-write of the original algorithm for purposes of improved speed. the hope is that it won't affect accuracy. */
/* rather than computing mutual information for the whole volume of data, the algorithm computes it for three orthogonal */
-@@ -209,7 +216,7 @@
+@@ -209,7 +216,7 @@ gdouble calculate_mutual_information(Ami
//g_print("\t\%i", mutual_information_array[i][j] ); // for point-wise counts
// g_print("\t\%4.3f", incremental_mi ); // for point-wise probability
diff --git a/graphics/amide/files/patch-src_mpeg__encode.c b/graphics/amide/files/patch-src_mpeg__encode.c
new file mode 100644
index 00000000000..7c1b178c2df
--- /dev/null
+++ b/graphics/amide/files/patch-src_mpeg__encode.c
@@ -0,0 +1,77 @@
+--- src/mpeg_encode.c.orig 2014-01-23 20:13:52 UTC
++++ src/mpeg_encode.c
+@@ -143,6 +143,7 @@ static void convert_rgb_pixbuf_to_yuv(yu
+
+ #include
+
++#include
+
+ typedef struct {
+ AVCodec *codec;
+@@ -234,11 +235,11 @@ gpointer mpeg_encode_setup(gchar * outpu
+
+ switch(type) {
+ case ENCODE_MPEG4:
+- codec_type = CODEC_ID_MPEG4;
++ codec_type = AV_CODEC_ID_MPEG4;
+ break;
+ case ENCODE_MPEG1:
+ default:
+- codec_type=CODEC_ID_MPEG1VIDEO;
++ codec_type=AV_CODEC_ID_MPEG1VIDEO;
+ break;
+ }
+
+@@ -268,7 +269,7 @@ gpointer mpeg_encode_setup(gchar * outpu
+ return NULL;
+ }
+
+- encode->picture= avcodec_alloc_frame();
++ encode->picture= av_frame_alloc();
+ if (!encode->picture) {
+ g_warning("couldn't allocate memory for encode->picture");
+ encode_free(encode);
+@@ -293,7 +294,7 @@ gpointer mpeg_encode_setup(gchar * outpu
+ encode->context->time_base= (AVRational){1,FRAMES_PER_SECOND};
+ encode->context->gop_size = 10; /* emit one intra frame every ten frames */
+ encode->context->max_b_frames=10;
+- encode->context->pix_fmt = PIX_FMT_YUV420P;
++ encode->context->pix_fmt = AV_PIX_FMT_YUV420P;
+
+ /* encoding parameters */
+ encode->context->sample_aspect_ratio= (AVRational){1,1}; /* our pixels are square */
+@@ -355,6 +356,10 @@ gpointer mpeg_encode_setup(gchar * outpu
+ encode->picture->linesize[1] = encode->context->width/2;
+ encode->picture->linesize[2] = encode->context->width/2;
+
++ encode->picture->width = xsize;
++ encode->picture->height = ysize;
++ encode->picture->format = AV_PIX_FMT_YUV420P;
++
+ return (gpointer) encode;
+ }
+
+@@ -362,12 +367,21 @@ gpointer mpeg_encode_setup(gchar * outpu
+ gboolean mpeg_encode_frame(gpointer data, GdkPixbuf * pixbuf) {
+ encode_t * encode = data;
+ gint out_size;
++ AVPacket packet = { 0 };
++ int ret, got_output = 0;
+
+ convert_rgb_pixbuf_to_yuv(encode->yuv, pixbuf);
+
+ /* encode the image */
+- out_size = avcodec_encode_video(encode->context, encode->output_buffer, encode->output_buffer_size, encode->picture);
+- fwrite(encode->output_buffer, 1, out_size, encode->output_file);
++ av_init_packet(&packet);
++ packet.data = encode->output_buffer;
++ packet.size = encode->output_buffer_size;
++ ret = avcodec_encode_video2(encode->context, &packet,
++ encode->picture, &got_output);
++ if (ret < 0)
++ return FALSE;
++
++ fwrite(packet.data, 1, packet.size, encode->output_file);
+
+ return TRUE;
+ };
diff --git a/graphics/pecl-imlib2/Makefile b/graphics/pecl-imlib2/Makefile
index cab4f99374c..0e21eaef156 100644
--- a/graphics/pecl-imlib2/Makefile
+++ b/graphics/pecl-imlib2/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= http://pecl.php.net/get/
PKGNAMEPREFIX= pecl-
DIST_SUBDIR= PECL
-MAINTAINER= leeym@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= PECL extension if imlib2
LICENSE= PHP202
diff --git a/irc/rubygem-cogbot/Makefile b/irc/rubygem-cogbot/Makefile
index e9c8e4c3932..15013e4243b 100644
--- a/irc/rubygem-cogbot/Makefile
+++ b/irc/rubygem-cogbot/Makefile
@@ -2,7 +2,7 @@
PORTNAME= cogbot
PORTVERSION= 0.1.7
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= irc rubygems
MASTER_SITES= RG
@@ -19,7 +19,7 @@ RUN_DEPENDS= rubygem-cinch>=2.3.1:irc/rubygem-cinch \
rubygem-nokogiri>=1.6.6.4:textproc/rubygem-nokogiri \
rubygem-daemons>=1.2.3:devel/rubygem-daemons \
rubygem-twitter>=5.15.0:net/rubygem-twitter \
- rubygem-json>=1.8.3:devel/rubygem-json \
+ rubygem-json1>=1.8.3:devel/rubygem-json1 \
rubygem-yajl-ruby>=1.2.1:devel/rubygem-yajl-ruby \
rubygem-fortune_gem>=0.0.8:games/rubygem-fortune_gem
diff --git a/japanese/gedy/Makefile b/japanese/gedy/Makefile
index de55a8a67a3..4b227deb068 100644
--- a/japanese/gedy/Makefile
+++ b/japanese/gedy/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gedy
PORTVERSION= 0.9.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= japanese ruby
MASTER_SITES= http://homepage3.nifty.com/slokar/pasori/
DISTNAME= ${PORTNAME}
@@ -16,6 +16,7 @@ COMMENT= GNOME Edy Viewer
LICENSE= GPLv2
RUN_DEPENDS= rubygem-gtk2>0:x11-toolkits/rubygem-gtk2 \
+ rubygem-gio2>=3.1.0:devel/rubygem-gio2 \
${RUBY_SITEARCHLIBDIR}/pasori.so:devel/libpafe-ruby
USE_RUBY= yes
diff --git a/japanese/gsuica/Makefile b/japanese/gsuica/Makefile
index 1e607aa75c3..486c945a471 100644
--- a/japanese/gsuica/Makefile
+++ b/japanese/gsuica/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gsuica
PORTVERSION= 0.9.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= japanese ruby
MASTER_SITES= http://homepage3.nifty.com/slokar/pasori/
DISTNAME= ${PORTNAME}
@@ -16,6 +16,7 @@ COMMENT= GNOME SUICA Viewer
LICENSE= GPLv2
RUN_DEPENDS= rubygem-gtk2>0:x11-toolkits/rubygem-gtk2 \
+ rubygem-gio2>=3.1.0:devel/rubygem-gio2 \
${RUBY_SITEARCHLIBDIR}/pasori.so:devel/libpafe-ruby
USE_RUBY= yes
diff --git a/japanese/mozc-server/Makefile b/japanese/mozc-server/Makefile
index 704b8ac6727..48f6a72e50b 100644
--- a/japanese/mozc-server/Makefile
+++ b/japanese/mozc-server/Makefile
@@ -44,7 +44,7 @@ LICENSE_FILE_NAISTL= ${WRKSRC}/src/data/dictionary_oss/README.txt
LICENSE_DISTFILES_NAISTL=${DISTNAME}${EXTRACT_SUFX}
.elif ${BUILD_MOZC_LIST:Mmozc_tool} == "mozc_tool"
USE_GNOME= glib20 gtk20
-USE_QT5= core gui widgets
+USE_QT5= buildtools core gui widgets
.elif ${BUILD_MOZC_LIST:Mibus_mozc} == "ibus_mozc"
USES+= gettext-runtime
USE_XORG= xcb
diff --git a/java/bootstrap-openjdk/Makefile b/java/bootstrap-openjdk/Makefile
index 6b692943057..e1b2602b05b 100644
--- a/java/bootstrap-openjdk/Makefile
+++ b/java/bootstrap-openjdk/Makefile
@@ -4,24 +4,25 @@ PORTNAME= ${JDK_NAME}
PORTVERSION= ${DISTVERSION_${JDK_ARCH}}
PORTREVISION= 1
CATEGORIES= java devel
-MASTER_SITES= LOCAL/jkim
+MASTER_SITES= ${JDK_MASTER_SITES}
PKGNAMEPREFIX= bootstrap-
DISTNAME= ${JDK_PORT}-${JDK_ARCH}-${PORTVERSION}
MAINTAINER= jkim@FreeBSD.org
-COMMENT= Oracle's Java 6 virtual machine release under the GPL v2
+COMMENT= Oracle\'s Java 6 virtual machine release under the GPL v2
LICENSE= GPLv2
RUN_DEPENDS= java-zoneinfo>0:java/java-zoneinfo
BUNDLE_LIBS= yes
-ONLY_FOR_ARCHS= amd64 armv6 armv6hf i386
+ONLY_FOR_ARCHS= amd64 armv6 armv6hf i386 powerpc64
DISTINFO_FILE= ${.CURDIR}/distinfo.${JDK_ARCH}
DISTVERSION_amd64= r351880
DISTVERSION_arm= r378760
DISTVERSION_i386= r351880
+DISTVERSION_powerpc64= r407937
JDK_ARCH= ${ARCH:C/armv6.*/arm/}
JDK_NAME= openjdk
@@ -43,6 +44,8 @@ PLIST_SUB+= LIBSTDCXX="@comment "
.include
+JDK_MASTER_SITES= LOCAL/jkim
+
.if ${ARCH:Marmv6*}
JDK_PORT= openjdk7
.else
@@ -55,6 +58,12 @@ PLIST_SUB+= CLIENTVM=""
PLIST_SUB+= CLIENTVM="@comment "
.endif
+.if ${ARCH} == "powerpc64"
+JDK_PORT= openjdk7
+JDK_NAME= openjdk
+JDK_MASTER_SITES= LOCAL/glewis/bootstrap-openjdk
+.endif
+
do-install:
@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${INSTALLDIR} "${EXCLUDE_EXP}"
@cd ${WRKSRC} && ${COPYTREE_BIN} "bin jre/bin" ${INSTALLDIR}
diff --git a/java/bootstrap-openjdk/distinfo.powerpc64 b/java/bootstrap-openjdk/distinfo.powerpc64
new file mode 100644
index 00000000000..b36354faa14
--- /dev/null
+++ b/java/bootstrap-openjdk/distinfo.powerpc64
@@ -0,0 +1,3 @@
+TIMESTAMP = 1483398184
+SHA256 (openjdk7-powerpc64-r407937.tar.xz) = e0d547f1ed83738fd30bd8382603dbd076b329cd232588e159c4e7c6f728c4fd
+SIZE (openjdk7-powerpc64-r407937.tar.xz) = 32765212
diff --git a/java/openjdk8/Makefile b/java/openjdk8/Makefile
index 09df28d03bd..e46e5d75842 100644
--- a/java/openjdk8/Makefile
+++ b/java/openjdk8/Makefile
@@ -2,7 +2,7 @@
PORTNAME= openjdk
PORTVERSION= ${JDK_MAJOR_VERSION}.${JDK_UPDATE_VERSION}.${JDK_BUILD_NUMBER:S/^0//}
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= java devel
MASTER_SITES= http://download.java.net/openjdk/jdk${JDK_MAJOR_VERSION}/promoted/b${DIST_BUILD_NUMBER}/:jdk \
https://adopt-openjdk.ci.cloudbees.com/job/jtreg/${JTREG_JENKINS_BUILD}/artifact/:jtreg \
@@ -65,7 +65,7 @@ X11_LIB_DEPENDS+= libXtst.so.6:x11/libXtst
BUILD_DEPENDS+= ${UNZIP_CMD}:archivers/unzip
.endif
-ONLY_FOR_ARCHS= amd64 armv6 i386
+ONLY_FOR_ARCHS= amd64 armv6 armv6hf i386 powerpc powerpc64
WRKSRC= ${WRKDIR}/${PORTNAME}
DOS2UNIX_FILES= jdk/src/bsd/doc/man/appletviewer.1 \
@@ -214,8 +214,8 @@ JRE_IMAGEDIR= ${JDK_BUILDDIR}/images/j2sdk-image/jre
.else
JRE_IMAGEDIR= ${JDK_BUILDDIR}/images/j2re-image
.endif
-JDK_JVMDIR= lib/${ARCH:S/armv6/arm/}
-JDK_OSARCH= bsd-${ARCH:S/amd64/x86_64/:S/armv6/arm/:S/i386/x86/}
+JDK_JVMDIR= lib/${ARCH:C/armv6.*/arm/:S/powerpc64/ppc64/}
+JDK_OSARCH= bsd-${ARCH:S/amd64/x86_64/:C/armv6.*/arm/:S/i386/x86/:S/powerpc64/ppc64/}
INSTALLDIR= ${PREFIX}/${PKGBASE}
NO_CCACHE= yes
@@ -319,7 +319,7 @@ CONFIGURE_ARGS+= --with-boot-jdk-jvmargs="-Xmx768m"
MAKE_ENV+= JAVADOC_CMD_MEM="-Xmx768m"
.endif
-.if ${ARCH} == "amd64" || ${ARCH} == "i386"
+.if ${ARCH} == "amd64" || ${ARCH} == "i386" || ${ARCH} == "powerpc64"
JDK_BUILD_JVM= server
.else
JDK_BUILD_JVM= zero
@@ -368,6 +368,10 @@ CONFIGURE_ENV+= LIBCXX="-lc++"
# GCC is broken with PCH: https://lists.freebsd.org/pipermail/svn-src-all/2015-March/101722.html
.if ${COMPILER_TYPE} == gcc
+.if ${ARCH} == "powerpc64"
+MAKE_ARGS+= USE_PRECOMPILED_HEADER=1
+.endif
+.else
MAKE_ARGS+= USE_PRECOMPILED_HEADER=0
.endif
diff --git a/lang/erlang-runtime19/Makefile b/lang/erlang-runtime19/Makefile
index 81679bb7181..aaaecdbbb45 100644
--- a/lang/erlang-runtime19/Makefile
+++ b/lang/erlang-runtime19/Makefile
@@ -3,7 +3,7 @@
PORTNAME= erlang
PORTVERSION= 19.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= lang parallel java
MASTER_SITES= http://www.erlang.org/download/:erlangorg \
http://erlang.stacken.kth.se/download/:erlangorg \
@@ -49,9 +49,17 @@ WX_DESC= Enable WX application
NATIVE_IMPLIES= HIPE
-OPTIONS_DEFAULT=HIPE KQUEUE OPENSSL SCTP SMP THREADS
+OPTIONS_DEFAULT=HIPE KQUEUE OPENSSL SCTP SMP THREADS DTRACE
OPTIONS_EXCLUDE_DragonFly= HIPE NATIVE SCTP
+.if !exists(/usr/sbin/dtrace)
+OPTIONS_EXCLUDE+= DTRACE
+.endif
+
+OPTIONS_EXCLUDE_FreeBSD_9= DTRACE
+OPTIONS_EXCLUDE_FreeBSD_10= DTRACE
+OPTIONS_EXCLUDE_i386= DTRACE
+
ERL_RELEASE= 19.2
USES= gmake ncurses perl5
@@ -185,14 +193,6 @@ MAKE_ARGS+= ARCH=arm
# links in the documentation.
pre-configure:
-.if ${PORT_OPTIONS:MDTRACE}
- @if ! /sbin/kldstat | ${GREP} dtraceall >/dev/null 2>&1; then \
- ${ECHO_CMD}; \
- ${ECHO_CMD} "DTRACE option requires kernel module \"dtraceall\" to be loaded."; \
- ${ECHO_CMD}; \
- exit 1; \
- fi
-.endif
.if ! ${PORT_OPTIONS:MWX}
echo "disabled by port options" > ${WRKSRC}/lib/wx/SKIP
.endif
diff --git a/lang/erlang/Makefile b/lang/erlang/Makefile
index d4633f77c47..a5da0efa21c 100644
--- a/lang/erlang/Makefile
+++ b/lang/erlang/Makefile
@@ -3,7 +3,7 @@
PORTNAME= erlang
PORTVERSION= 19.2
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 3
CATEGORIES= lang parallel java
MASTER_SITES= http://www.erlang.org/download/:erlangorg \
@@ -54,9 +54,17 @@ WX_DESC= Enable WX application
NATIVE_IMPLIES= HIPE
-OPTIONS_DEFAULT=HIPE KQUEUE OPENSSL SCTP SMP THREADS
+OPTIONS_DEFAULT=HIPE KQUEUE OPENSSL SCTP SMP THREADS DTRACE
OPTIONS_EXCLUDE_DragonFly= HIPE NATIVE SCTP
+.if !exists(/usr/sbin/dtrace)
+OPTIONS_EXCLUDE+= DTRACE
+.endif
+
+OPTIONS_EXCLUDE_FreeBSD_9= DTRACE
+OPTIONS_EXCLUDE_FreeBSD_10= DTRACE
+OPTIONS_EXCLUDE_i386= DTRACE
+
ERL_RELEASE= 19.2
USES= gmake ncurses perl5
@@ -205,14 +213,6 @@ post-patch:
@${ECHO_CMD} "MANPATH ${PREFIX}/lib/erlang/man" > ${WRKDIR}/erlang.conf
pre-configure:
-.if ${PORT_OPTIONS:MDTRACE}
- @if ! /sbin/kldstat | ${GREP} dtraceall >/dev/null 2>&1; then \
- ${ECHO_CMD}; \
- ${ECHO_CMD} "DTRACE option requires kernel module \"dtraceall\" to be loaded."; \
- ${ECHO_CMD}; \
- exit 1; \
- fi
-.endif
.if ! ${PORT_OPTIONS:MWX}
echo "disabled by port options" > ${WRKSRC}/lib/wx/SKIP
.endif
diff --git a/lang/perl5-devel/Makefile b/lang/perl5-devel/Makefile
index 277ac525e1e..f1976ab6436 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.25.8-78-gd720149
+GH_TAGNAME= v5.25.8-128-g74ef8fd
MAKE_JOBS_UNSAFE= yes
@@ -41,7 +41,6 @@ OPTIONS_DEFAULT= PERL_64BITINT THREADS MULTIPLICITY DTRACE
.if !exists(/usr/sbin/dtrace)
OPTIONS_EXCLUDE+= DTRACE
.endif
-OPTIONS_EXCLUDE_FreeBSD_9= DTRACE
.for a in aarch64 arm armeb armv6 mips mips64 mips64el mipsel mipsn32 powerpc \
powerpc64 sparc64
OPTIONS_EXCLUDE_${a}= DTRACE
@@ -284,18 +283,21 @@ post-patch:
${WRKSRC}/installperl
.endif
-post-build:
+post-install:
@${REINPLACE_CMD} -e '/^lddlflags/s|-L${WRKSRC} ||' \
- ${WRKSRC}/lib/Config_heavy.pl
+ ${STAGEDIR}${PREFIX}/${_ARCH_LIB}/Config_heavy.pl
+ @${TOUCH} -r ${STAGEDIR}${PREFIX}/${_ARCH_LIB}/Config_heavy.pl.bak ${STAGEDIR}${PREFIX}/${_ARCH_LIB}/Config_heavy.pl
+ @${RM} ${STAGEDIR}${PREFIX}/${_ARCH_LIB}/Config_heavy.pl.bak
.if ${CC} == /nxb-bin/usr/bin/cc
@${REINPLACE_CMD} -e 's=/nxb-bin==' \
- ${WRKSRC}/lib/Config.pm ${WRKSRC}/lib/Config_heavy.pl
+ ${STAGEDIR}${PREFIX}/${_ARCH_LIB}/Config.pm ${STAGEDIR}${PREFIX}/${_ARCH_LIB}/Config_heavy.pl
# Restore Config.pm's timestamp so that Perl's build system does not think it
# needs to rebuild everything.
- @${TOUCH} -r ${WRKSRC}/lib/Config.pm.bak ${WRKSRC}/lib/Config.pm
+ @${TOUCH} -r ${STAGEDIR}${PREFIX}/${_ARCH_LIB}/Config.pm.bak ${STAGEDIR}${PREFIX}/${_ARCH_LIB}/Config.pm
+ @${TOUCH} -r ${STAGEDIR}${PREFIX}/${_ARCH_LIB}/Config_heavy.pl.bak ${STAGEDIR}${PREFIX}/${_ARCH_LIB}/Config_heavy.pl
+ @${RM} ${STAGEDIR}${PREFIX}/${_ARCH_LIB}/Config.pm.bak ${STAGEDIR}${PREFIX}/${_ARCH_LIB}/Config_heavy.pl.bak
.endif
-post-install:
${MKDIR} ${STAGEDIR}${SITE_MAN1} ${STAGEDIR}${SITE_MAN3}
${MKDIR} ${STAGEDIR}${SITE_ARCH}/auto
${MKDIR} ${STAGEDIR}${SITE_PERL}/auto
diff --git a/lang/perl5-devel/distinfo b/lang/perl5-devel/distinfo
index b3ec16840c3..a316d1555c1 100644
--- a/lang/perl5-devel/distinfo
+++ b/lang/perl5-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1482758953
-SHA256 (perl/perl-5.25.8-78_GH0.tar.gz) = 7e6279bb53b5ba410fbf85ceb981894ab86ecec9246dd0e674ad6edbe3008a8d
-SIZE (perl/perl-5.25.8-78_GH0.tar.gz) = 18424919
+TIMESTAMP = 1483348828
+SHA256 (perl/perl-5.25.8-128_GH0.tar.gz) = d98c6bf39c880f8ccc2de19a96b3f443d39de15140a908f05acc463718f884ce
+SIZE (perl/perl-5.25.8-128_GH0.tar.gz) = 18428381
diff --git a/lang/perl5-devel/pkg-plist b/lang/perl5-devel/pkg-plist
index 0b0d5b97a72..ccee655a959 100644
--- a/lang/perl5-devel/pkg-plist
+++ b/lang/perl5-devel/pkg-plist
@@ -109,7 +109,6 @@ etc/man.d/perl%%PKGNAMESUFFIX%%.conf
%%PRIV_LIB%%/Compress/Zlib.pm
%%PRIV_LIB%%/Config/Extensions.pm
%%PRIV_LIB%%/Config/Perl/V.pm
-%%PRIV_LIB%%/Config_heavy.pl.bak
%%PRIV_LIB%%/DB.pm
%%PRIV_LIB%%/DBM_Filter.pm
%%PRIV_LIB%%/DBM_Filter/compress.pm
diff --git a/lang/seed7/Makefile b/lang/seed7/Makefile
index 3d49bfe2297..e81c2e5913b 100644
--- a/lang/seed7/Makefile
+++ b/lang/seed7/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= seed7
-DISTVERSION= 05_20161031
+DISTVERSION= 05_20161231
CATEGORIES= lang
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${DISTNAME}/
DISTNAME= ${PORTNAME}_${DISTVERSION}
diff --git a/lang/seed7/distinfo b/lang/seed7/distinfo
index 18c5efc5694..d73f28101a8 100644
--- a/lang/seed7/distinfo
+++ b/lang/seed7/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1479903307
-SHA256 (seed7_05_20161031.tgz) = 6b338b26c689275a242cd97bf960152528dd6cf636cbd7f7a25df5b3f3b821b8
-SIZE (seed7_05_20161031.tgz) = 2672738
+TIMESTAMP = 1483374945
+SHA256 (seed7_05_20161231.tgz) = 7e2eef0ee40a68e8d94d812e1c65d33f11f180873611cb2fe53ca4ac65cb9346
+SIZE (seed7_05_20161231.tgz) = 2687625
diff --git a/mail/autosig/Makefile b/mail/autosig/Makefile
index 7f90300b5d5..6b90f875950 100644
--- a/mail/autosig/Makefile
+++ b/mail/autosig/Makefile
@@ -6,7 +6,7 @@ PORTVERSION= 2.3
CATEGORIES= mail
MASTER_SITES= http://www.irendi.com/~msharpe/
-MAINTAINER= leeym@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Random .signature generator with header file included
MAKEFILE= makefile
diff --git a/mail/exim-doc-html/Makefile b/mail/exim-doc-html/Makefile
index 58b451ddf87..614a78825bd 100644
--- a/mail/exim-doc-html/Makefile
+++ b/mail/exim-doc-html/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= exim
-PORTVERSION= 4.87
+PORTVERSION= 4.88
CATEGORIES= mail
MASTER_SITES= EXIM
MASTER_SITE_SUBDIR= /exim4/ \
@@ -31,7 +31,7 @@ NO_BUILD= yes
.if defined(FETCH_ALL)
. for _df in ${AVAILABLE_FORMATS}
. if ${_df} != ${DOCFORMAT}
-DISTFILES+= exim-${_df}-${PORTVERSION}${EXTRACT_SUFX}:exim
+DISTFILES+= exim-${_df}-${PORTVERSION}${EXTRACT_SUFX}
. endif
. endfor
.endif
diff --git a/mail/exim-doc-html/distinfo b/mail/exim-doc-html/distinfo
index 084034d5ac3..829cfffb293 100644
--- a/mail/exim-doc-html/distinfo
+++ b/mail/exim-doc-html/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1482674149
-SHA256 (exim/exim-html-4.87.tar.bz2) = 8f87876d4a392f59d1009ba64ac461862951a3f4eed9c0b14a49be7bcbdc1f12
-SIZE (exim/exim-html-4.87.tar.bz2) = 478953
-SHA256 (exim/exim-pdf-4.87.tar.bz2) = 52c6205ec31fe8162a7068ba86dfd1ac6e370c76a5377bdc7bd29555f8d6ca0c
-SIZE (exim/exim-pdf-4.87.tar.bz2) = 1917123
-SHA256 (exim/exim-postscript-4.87.tar.bz2) = 7241b80d724d473cb9e47823eaa219d89bf2a56d6e80e710b850bbd90f271b49
-SIZE (exim/exim-postscript-4.87.tar.bz2) = 1052132
+TIMESTAMP = 1483358167
+SHA256 (exim/exim-html-4.88.tar.bz2) = afae7d298e7571026635d6377b26eb0849b27c28b1490cc2f1ac424937e90521
+SIZE (exim/exim-html-4.88.tar.bz2) = 478405
+SHA256 (exim/exim-pdf-4.88.tar.bz2) = 33736fafb45c5922fcbc0def7626f46cb74927987b78943aa26949ef30789574
+SIZE (exim/exim-pdf-4.88.tar.bz2) = 1922494
+SHA256 (exim/exim-postscript-4.88.tar.bz2) = a932809a80657195f3163f889512eb1f705c7e41e061150ae41561ac6d86cb4c
+SIZE (exim/exim-postscript-4.88.tar.bz2) = 1062025
diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index e8446b9ed9e..346bcd096e4 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -50,6 +50,7 @@ EXIMON_USE= xorg=x11,xaw,xt
GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls
ICONV_USES= iconv:lib,build
INTERNATIONAL_LIB_DEPENDS= libidn.so:dns/libidn
+LMDB_LIB_DEPENDS= liblmdb.so:databases/lmdb
MYSQL_USE= mysql=yes
OPENLDAP_USE= openldap=yes
PGSQL_USES= pgsql
@@ -96,7 +97,7 @@ MASTER_SITES+= http://marc.merlins.org/linux/exim/files/:sa_exim \
DISTFILES+= sa-exim-${SA_EXIM_VERSION}.tar.gz:sa_exim
.endif
-EXIM_VERSION= 4.87.1
+EXIM_VERSION= 4.88
SA_EXIM_VERSION=4.2
EXIM_INSTALL_ARG+= "-no_chown" "-no_symlink"
@@ -317,6 +318,17 @@ SEDLIST+= -e 's,^(DBMLIB=),\# \1,'
SEDLIST+= -e 's,XX_DB_LIBS_XX,${DB_LIBS:S/,/\\,/g},' \
-e 's,XX_DB_INCLUDES_XX,${DB_INCLUDES:S/,/\\,/g},'
+.if ${PORT_OPTIONS:MLMDB}
+LMDB_LIBS= -L${LOCALBASE}/lib -llmdb
+LMDB_INCLUDES= -I${LOCALBASE}/include
+SEDLIST+= -e 's,^\# (EXPERIMENTAL_LMDB=),\1,'
+.else
+LMDB_LIBS=
+LMDB_INCLUDES=
+.endif
+SEDLIST+= -e 's,XX_LMDB_LIBS_XX,${LMDB_LIBS:S/,/\\,/g},' \
+ -e 's,XX_LMDB_INCLUDES_XX,${LMDB_INCLUDES:S/,/\\,/g},'
+
.if ${PORT_OPTIONS:MMYSQL}
SEDLIST+= -e 's,XX_MYSQL_LIBS_XX,-L${LOCALBASE:S/,/\\,/g}/lib/mysql -lmysqlclient,' \
-e 's,XX_MYSQL_INCLUDE_XX,-I${LOCALBASE:S/,/\\,/g}/include/mysql,' \
@@ -505,6 +517,10 @@ SEDLIST+= -e 's,^\# (WHITELIST_D_MACROS=).*$$,\1${WHITELIST_D_MACROS:S/,/\\,/g},
SEDLIST+= -e 's,^\# (TRUSTED_CONFIG_LIST=).*$$,\1${TRUSTED_CONFIG_LIST:S/,/\\,/g},'
.endif
+.if ${PORT_OPTIONS:MQUEUEFILE}
+SEDLIST+= -e 's,^\# (EXPERIMENTAL_QUEUEFILE=),\1,'
+.endif
+
MAKE_ENV+= INSTALL_ARG="${EXIM_INSTALL_ARG}"
DUMMY_LDFLAGS!= ${ECHO_CMD} ${LDFLAGS} | ${SED} -e 's|-Wl,-rpath|-Wl,-DUMMYrpath|g; s|-rpath|-Wl,-rpath|g; s|-DUMMYrpath|-rpath|g'
diff --git a/mail/exim/distinfo b/mail/exim/distinfo
index 0cc4cb1cb49..3c83a0d8819 100644
--- a/mail/exim/distinfo
+++ b/mail/exim/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1482673582
-SHA256 (exim/exim-4.87.1.tar.bz2) = d4b7994c89240d2f9a9fcd7a2dffa4b72f14379001a24266f4dbb0fbe5131514
-SIZE (exim/exim-4.87.1.tar.bz2) = 1789634
+TIMESTAMP = 1483356878
+SHA256 (exim/exim-4.88.tar.bz2) = 119d5fd7e31fc224e84dfa458fe182f200856bae7adf852a8287c242161f8a2d
+SIZE (exim/exim-4.88.tar.bz2) = 1824610
SHA256 (exim/sa-exim-4.2.tar.gz) = 72e0a735547f18b05785e6c58a71d24623858f0f5234a5dc0e24cb453999e99a
SIZE (exim/sa-exim-4.2.tar.gz) = 66575
diff --git a/mail/exim/files/patch-rspamd-shutdown b/mail/exim/files/patch-rspamd-shutdown
deleted file mode 100644
index 51a0d5827e1..00000000000
--- a/mail/exim/files/patch-rspamd-shutdown
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/spam.c.orig 2016-04-02 20:24:15.000000000 +0100
-+++ src/spam.c 2016-04-21 16:42:49.297221000 +0100
-@@ -494,7 +494,9 @@
- (void)fclose(mbox_file);
-
- /* we're done sending, close socket for writing */
--shutdown(spamd_sock,SHUT_WR);
-+if (!sd->is_rspamd) {
-+ shutdown(spamd_sock,SHUT_WR);
-+}
-
- /* read spamd response using what's left of the timeout. */
- memset(spamd_buffer, 0, sizeof(spamd_buffer));
diff --git a/mail/exim/files/patch-scripts__exim_install b/mail/exim/files/patch-scripts__exim_install
index 7a2fec05545..7279655270b 100644
--- a/mail/exim/files/patch-scripts__exim_install
+++ b/mail/exim/files/patch-scripts__exim_install
@@ -1,5 +1,5 @@
---- scripts/exim_install.orig 2014-05-26 20:14:16.000000000 +0100
-+++ scripts/exim_install 2014-07-04 12:40:45.002262243 +0100
+--- scripts/exim_install.orig 2016-12-18 14:02:28.000000000 +0000
++++ scripts/exim_install 2017-01-02 11:48:46.939703000 +0000
@@ -29,6 +29,7 @@
do_chown=yes
@@ -30,17 +30,17 @@
# Overrides of other things
case "$inst_uid" in ?*) INST_UID="$inst_uid";; esac
-@@ -217,8 +220,7 @@
- # The exim binary is handled specially
+@@ -218,8 +221,7 @@
if [ $name = exim${EXE} ]; then
-- version=exim-`./exim -bV -C /dev/null | \
+ exim="./exim -bV -C /dev/null"
+- version=exim-`$exim 2>/dev/null | \
- awk '/Exim version/ { OFS=""; print $3,"-",substr($4,2,length($4)-1) }'`${EXE}
+ version=exim
if [ "${version}" = "exim-${EXE}" ]; then
echo $com ""
-@@ -382,9 +384,8 @@
+@@ -384,9 +386,8 @@
echo $com ' ' ${CONFIGURE_FILE}
echo $com Therefore, skipping automatic installation.
@@ -52,7 +52,7 @@
if [ "${SYSTEM_ALIASES_FILE}" = "" ] ; then
SYSTEM_ALIASES_FILE=/etc/aliases
echo $com This configuration has system aliases in ${SYSTEM_ALIASES_FILE}.
-@@ -394,8 +395,8 @@
+@@ -396,8 +397,8 @@
${real} ${MKDIR} -p `${DIRNAME} ${CONFIGURE_FILE}`
echo sed -e '\\'
@@ -63,7 +63,7 @@
# I can't find a way of writing this using the ${real} feature because
# it seems that the output redirection always happens, even when -n was
-@@ -403,8 +404,8 @@
+@@ -405,8 +406,8 @@
if [ "$real" = "" ] ; then
sed -e \
@@ -74,7 +74,7 @@
else
true
fi
-@@ -414,24 +415,22 @@
+@@ -416,24 +417,22 @@
echo $com "*** Exim installation ${ver}failed ***"
exit 1
fi
diff --git a/mail/exim/files/patch-src__EDITME b/mail/exim/files/patch-src__EDITME
index 1a0d07016d9..9a60f89b47b 100644
--- a/mail/exim/files/patch-src__EDITME
+++ b/mail/exim/files/patch-src__EDITME
@@ -50,9 +50,9 @@
-# LOOKUP_INCLUDE=-I /usr/local/ldap/include -I /usr/local/mysql/include -I /usr/local/pgsql/include
-# LOOKUP_LIBS=-L/usr/local/lib -lldap -llber -lmysqlclient -lpq -lgds -lsqlite3
-+INCLUDE=-IXX_LOCALBASE_XX/include XX_DB_INCLUDES_XX
++INCLUDE=-IXX_LOCALBASE_XX/include XX_DB_INCLUDES_XX XX_LMDB_INCLUDES_XX
+LOOKUP_INCLUDE=XX_MYSQL_INCLUDE_XX XX_PGSQL_INCLUDE_XX XX_LDAP_INCLUDE_XX
-+LOOKUP_LIBS=XX_MYSQL_LIBS_XX XX_PGSQL_LIBS_XX XX_LDAP_LIBS_XX
++LOOKUP_LIBS=XX_MYSQL_LIBS_XX XX_PGSQL_LIBS_XX XX_LDAP_LIBS_XX XX_LMDB_LIBS_XX
+DBMLIB=XX_DB_LIBS_XX
diff --git a/mail/exim/options b/mail/exim/options
index 9456705ea5a..eb18788fdee 100644
--- a/mail/exim/options
+++ b/mail/exim/options
@@ -66,7 +66,7 @@ OPTIONS_GROUP_LOOKUP= CDB BDB DNSDB DSEARCH LSEARCH MYSQL NIS OPENLDAP PGSQL RED
LOOKUP_DESC= Lookup support
OPTIONS_GROUP_STORAGE= MAILDIR MAILSTORE MBX
STORAGE_DESC= Supported storage formats
-OPTIONS_GROUP_EXPERIMENTAL= CERTNAMES DANE DCC DMARC DSN SPF
+OPTIONS_GROUP_EXPERIMENTAL= CERTNAMES DANE DCC DMARC DSN SPF LMDB QUEUEFILE
EXPERIMENTAL_DESC= Experimental options
OPTIONS_GROUP= AUTH LOOKUP STORAGE EXPERIMENTAL
@@ -97,6 +97,7 @@ EXIMON_DESC= Build eximon monitor (requires X libraries)
ICONV_DESC= Enable header charset conversion
INTERNATIONAL_DESC= Enable support for the transmission of UTF-8 envelope addresses
LISTMATCH_RHS_DESC= Enable pre-4.77 behaviour for match_*
+LMDB_DESC= Enable LMDB lookups
LMTP_DESC= RFC2033 SMTP over command pipe transport
LSEARCH_DESC= Enable wildcarded-file lookups
MAILDIR_DESC= Enable Maildir mailbox format
@@ -107,6 +108,7 @@ NIS_DESC= Enable NIS-style lookups
OLD_DEMIME_DESC= Enable old, deprecated "demime" ACL
OPENLDAP_DESC= Enable LDAP lookups
OCSP_DESC= Enable OCSP stapling
+QUEUEFILE_DESC= Enable queuefile transport
PAM_DESC= Enable PAM authentication mechanisms
PASSWD_DESC= Enable /etc/passwd lookups
PGSQL_DESC= Enable postgresql lookups
diff --git a/mail/pop3vscan/Makefile b/mail/pop3vscan/Makefile
index f0a16820801..ee62e1fd3bd 100644
--- a/mail/pop3vscan/Makefile
+++ b/mail/pop3vscan/Makefile
@@ -7,7 +7,7 @@ PORTREVISION= 6
CATEGORIES= mail
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
-MAINTAINER= leeym@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Transparent POP3-Proxy with virus-scanning capabilities
LIB_DEPENDS= libpcre.so:devel/pcre
diff --git a/mail/rubygem-actionmailer4/Makefile b/mail/rubygem-actionmailer4/Makefile
index bc492a87459..ca24e0c6230 100644
--- a/mail/rubygem-actionmailer4/Makefile
+++ b/mail/rubygem-actionmailer4/Makefile
@@ -3,6 +3,7 @@
PORTNAME= actionmailer
PORTVERSION= 4.2.7.1
+PORTREVISION= 1
CATEGORIES= mail rubygems
MASTER_SITES= RG
PKGNAMESUFFIX= 4
@@ -17,7 +18,7 @@ RUN_DEPENDS= rubygem-actionpack4>=${PORTVERSION}:www/rubygem-actionpack4 \
rubygem-actionview>=${PORTVERSION}:devel/rubygem-actionview \
rubygem-activejob>=${PORTVERSION}:devel/rubygem-activejob \
rubygem-mail>=2.6.1:mail/rubygem-mail \
- rubygem-rails-dom-testing>=1.0.5:textproc/rubygem-rails-dom-testing
+ rubygem-rails-dom-testing1>=1.0.5:textproc/rubygem-rails-dom-testing1
NO_ARCH= yes
USE_RUBY= yes
diff --git a/mail/rubygem-roadie/Makefile b/mail/rubygem-roadie/Makefile
index c68a0835a69..7e51671fb0e 100644
--- a/mail/rubygem-roadie/Makefile
+++ b/mail/rubygem-roadie/Makefile
@@ -2,6 +2,7 @@
PORTNAME= roadie
PORTVERSION= 3.2.0
+PORTREVISION= 1
CATEGORIES= mail rubygems
MASTER_SITES= RG
diff --git a/mail/rubygem-roadie/files/patch-gemspec b/mail/rubygem-roadie/files/patch-gemspec
new file mode 100644
index 00000000000..4cb90d88cb0
--- /dev/null
+++ b/mail/rubygem-roadie/files/patch-gemspec
@@ -0,0 +1,11 @@
+--- roadie.gemspec.orig 2017-01-02 22:36:03.020933000 -0500
++++ roadie.gemspec 2017-01-02 22:36:14.436284000 -0500
+@@ -24,7 +24,7 @@
+ s.specification_version = 4
+
+ if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+- s.add_runtime_dependency(%q.freeze, ["< 1.7.0", ">= 1.5.0"])
++ s.add_runtime_dependency(%q.freeze, [">= 1.5.0"])
+ s.add_runtime_dependency(%q.freeze, ["~> 1.4.5"])
+ s.add_development_dependency(%q.freeze, ["~> 3.0"])
+ s.add_development_dependency(%q.freeze, ["~> 1.0"])
diff --git a/mail/spamstats/Makefile b/mail/spamstats/Makefile
index 1a34556f21e..e6e9ec443a5 100644
--- a/mail/spamstats/Makefile
+++ b/mail/spamstats/Makefile
@@ -8,7 +8,7 @@ CATEGORIES= mail
#MASTER_SITES= http://www.inl.fr/download/
MASTER_SITES= LOCAL/leeym
-MAINTAINER= leeym@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Tool to generate statistics for spamd of Mail::SpamAssassin
RUN_DEPENDS= p5-Date-Manip>=0:devel/p5-Date-Manip \
diff --git a/math/gnuplot/Makefile b/math/gnuplot/Makefile
index d18d56f6e7e..9625bfc8e84 100644
--- a/math/gnuplot/Makefile
+++ b/math/gnuplot/Makefile
@@ -2,6 +2,7 @@
PORTNAME= gnuplot
PORTVERSION= 5.0.5
+PORTREVISION= 1
CATEGORIES= math graphics
MASTER_SITES= SF
@@ -87,6 +88,11 @@ post-build:
@cd ${WRKSRC}/docs && ${MAKE} groff
.endif
+pre-install:
+ ${MKDIR} ${STAGEDIR}${DATADIR}/5.0 ; \
+ ${INSTALL_DATA} ${WRKSRC}/share/gnuplotrc \
+ ${STAGEDIR}${DATADIR}/5.0/gnuplotrc.sample
+
post-install:
@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
cd ${WRKSRC}/demo && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
diff --git a/math/gnuplot/distinfo b/math/gnuplot/distinfo
index 4d6cbdad7ce..b67b96ddc4b 100644
--- a/math/gnuplot/distinfo
+++ b/math/gnuplot/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1477068693
+TIMESTAMP = 1482589482
SHA256 (gnuplot-5.0.5.tar.gz) = 25f3e0bf192e01115c580f278c3725d7a569eb848786e12b455a3fda70312053
SIZE (gnuplot-5.0.5.tar.gz) = 5078771
diff --git a/math/gnuplot/files/patch-docs-Makefile.in b/math/gnuplot/files/patch-docs-Makefile.in
index 2e2a7c286a9..e509815ac6b 100644
--- a/math/gnuplot/files/patch-docs-Makefile.in
+++ b/math/gnuplot/files/patch-docs-Makefile.in
@@ -1,6 +1,6 @@
---- docs/Makefile.in.orig 2015-12-31 21:24:50.000000000 -0800
-+++ docs/Makefile.in 2016-02-21 16:00:10.574203000 -0800
-@@ -927,15 +927,15 @@
+--- docs/Makefile.in.orig 2016-10-09 17:24:51 UTC
++++ docs/Makefile.in
+@@ -927,15 +927,15 @@ groff: grotxt grodvi grops
grotxt: gnuplot.txt
gnuplot.txt: gnuplot.ms $(srcdir)/titlepag.ms
@@ -19,7 +19,7 @@
### doc2xxx dependencies
gnuplot.ms: doc2ms$(EXEEXT) $(srcdir)/gnuplot.doc
-@@ -1077,11 +1077,11 @@
+@@ -1077,11 +1077,11 @@ wxhelp/wgnuplot.html: doc2wxhtml$(EXEEXT
$(AM_V_GEN) ./doc2wxhtml$(EXEEXT) $(srcdir)/gnuplot.doc wxhelp/
doc2wxhtml$(EXEEXT): wxhelp/doc2html.o termdoc.o xref.o $(SRC_VERSION_O)
diff --git a/math/gnuplot/pkg-plist b/math/gnuplot/pkg-plist
index 3f6b8a849f8..39a8cdd9a8c 100644
--- a/math/gnuplot/pkg-plist
+++ b/math/gnuplot/pkg-plist
@@ -22,7 +22,6 @@ man/man1/gnuplot.1.gz
%%DATADIR%%/5.0/colors_mono.gp
%%DATADIR%%/5.0/colors_podo.gp
%%DATADIR%%/5.0/gnuplot.gih
-%%DATADIR%%/5.0/gnuplotrc
%%DATADIR%%/5.0/js/README
%%DATADIR%%/5.0/js/canvasmath.js
%%DATADIR%%/5.0/js/canvastext.js
@@ -38,3 +37,4 @@ man/man1/gnuplot.1.gz
%%DATADIR%%/5.0/js/return.png
%%DATADIR%%/5.0/js/textzoom.png
%%DATADIR%%/5.0/lua/gnuplot-tikz.lua
+@sample %%DATADIR%%/5.0/gnuplotrc.sample
diff --git a/math/openblas/Makefile b/math/openblas/Makefile
index 09669cf7494..7aba2e92c24 100644
--- a/math/openblas/Makefile
+++ b/math/openblas/Makefile
@@ -6,9 +6,8 @@ PORTVERSION= 0.2.19
DISTVERSIONPREFIX= v
PORTEPOCH= 1
CATEGORIES= math
-MASTER_SITES= GH NL/lapack/timing/:lapack_tmg
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
- large.tgz:lapack_tmg timing.tgz:lapack_tmg
+MASTER_SITES= NL/lapack/timing/:lapack_tmg
+DISTFILES= large.tgz:lapack_tmg timing.tgz:lapack_tmg
DIST_SUBDIR= openblas
MAINTAINER= phd_kimberlite@yahoo.co.jp
diff --git a/math/openblas/distinfo b/math/openblas/distinfo
index c771f550b6a..ca001bf58e3 100644
--- a/math/openblas/distinfo
+++ b/math/openblas/distinfo
@@ -1,6 +1,4 @@
TIMESTAMP = 1483295026
-SHA256 (openblas/xianyi-OpenBLAS-v0.2.19_GH0.tar.gz) = 9c40b5e4970f27c5f6911cb0a28aa26b6c83f17418b69f8e5a116bb983ca8557
-SIZE (openblas/xianyi-OpenBLAS-v0.2.19_GH0.tar.gz) = 10834034
SHA256 (openblas/large.tgz) = f328d88b7fa97722f271d7d0cfea1c220e0f8e5ed5ff01d8ef1eb51d6f4243a1
SIZE (openblas/large.tgz) = 2595
SHA256 (openblas/timing.tgz) = 999c65f8ea8bd4eac7f1c7f3463d4946917afd20a997807300fe35d70122f3af
diff --git a/misc/p5-Business-ISBN-Data/Makefile b/misc/p5-Business-ISBN-Data/Makefile
index 7520f419b05..0e791586468 100644
--- a/misc/p5-Business-ISBN-Data/Makefile
+++ b/misc/p5-Business-ISBN-Data/Makefile
@@ -7,7 +7,7 @@ CATEGORIES= misc perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
-MAINTAINER= leeym@FreeBSD.org
+MAINTAINER= perl@FreeBSD.org
COMMENT= Data pack for Business::ISBN
BUILD_DEPENDS= p5-ExtUtils-MakeMaker>=6.65:devel/p5-ExtUtils-MakeMaker
diff --git a/multimedia/mencoder/Makefile b/multimedia/mencoder/Makefile
index 3773e48db0d..0f2a1af2821 100644
--- a/multimedia/mencoder/Makefile
+++ b/multimedia/mencoder/Makefile
@@ -10,13 +10,13 @@ COMMENT= Convenient video file and movie encoder
.include "${.CURDIR}/../mplayer/Makefile.common"
-OPTIONS_DEFINE= AMR_NB AMR_WB BLURAY CDIO DEBUG DV DVDNAV FAAC FONTCONFIG \
+OPTIONS_DEFINE= AMR_NB AMR_WB ASS BLURAY CDIO DEBUG DV DVDNAV FAAC FONTCONFIG \
FRIBIDI GIF GNUTLS GSM IPV6 JACK LADSPA LIBMNG LZO \
MAD NAS OPENAL OPENJPEG OPUS PULSEAUDIO \
RTMP SCHROEDINGER SMB SPEEX THEORA TWOLAME V4L VPX \
X264 XVID
-OPTIONS_DEFAULT=DVDNAV FONTCONFIG GIF GNUTLS X264 XVID
+OPTIONS_DEFAULT=ASS DVDNAV FONTCONFIG GIF GNUTLS X264 XVID
OPTIONS_DEFINE_i386= RTCPU
OPTIONS_DEFINE_amd64= RTCPU
@@ -26,6 +26,7 @@ OPTIONS_DEFAULT_i386= RTCPU
OPTIONS_DEFAULT_amd64= RTCPU
OPTIONS_DEFAULT_powerpc=RTCPU
+ASS_DESC?= Subtitles rendering via libass
BLURAY_DESC?= BluRay support
DVDNAV_DESC?= DVD navigation features support
LZO_DESC?= Enable external liblzo library
diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile
index 287a51582f0..fddbd9a8523 100644
--- a/multimedia/mplayer/Makefile
+++ b/multimedia/mplayer/Makefile
@@ -10,14 +10,14 @@ COMMENT= High performance media player supporting many formats
.include "${.CURDIR}/../../multimedia/mplayer/Makefile.common"
-OPTIONS_DEFINE= AALIB AMR_NB AMR_WB BLURAY CACA CDIO DEBUG DV DVDNAV \
+OPTIONS_DEFINE= AALIB AMR_NB AMR_WB ASS BLURAY CACA CDIO DEBUG DV DVDNAV \
ENCA FONTCONFIG FRIBIDI GIF GNUTLS GSM GUI IPV6 JACK \
LADSPA LIBMNG LIRC LZO NAS OPENAL OPENGL \
OPENJPEG OPUS PULSEAUDIO RTC RTMP \
SCHROEDINGER SDL SKINS SNDIO SMB SPEEX SVGALIB V4L VDPAU VPX \
X11 X11DGA X11VM XINERAMA XVIDEO XVMC
-OPTIONS_DEFAULT=DVDNAV FONTCONFIG FRIBIDI GNUTLS OPENGL \
+OPTIONS_DEFAULT=ASS DVDNAV FONTCONFIG FRIBIDI GNUTLS OPENGL \
SKINS X11 X11DGA X11VM XINERAMA XVIDEO
OPTIONS_DEFINE_i386= RTCPU
@@ -28,8 +28,9 @@ OPTIONS_DEFAULT_i386= RTCPU VDPAU
OPTIONS_DEFAULT_amd64= RTCPU VDPAU
OPTIONS_DEFAULT_powerpc=RTCPU
-DVDNAV_DESC?= DVD navigation features support
+ASS_DESC?= Subtitles rendering via libass
BLURAY_DESC?= BluRay support
+DVDNAV_DESC?= DVD navigation features support
ENCA_DESC?= Charset conversion via enca
LZO_DESC?= External liblzo support
RTC_DESC?= Add support for kernel real time clock
diff --git a/multimedia/mplayer/Makefile.common b/multimedia/mplayer/Makefile.common
index 7e577a8a370..e45182b92a9 100644
--- a/multimedia/mplayer/Makefile.common
+++ b/multimedia/mplayer/Makefile.common
@@ -6,7 +6,7 @@
MPLAYER_PORT_VERSION= 1.3.0
MPLAYER_SNAPSHOT_DATE= 2016-12-28
-PORTREVISION?= 1
+PORTREVISION?= 2
MASTER_SITES= LOCAL/riggs/mplayer
DISTNAME= mplayer-${MPLAYER_PORT_VERSION}.${MPLAYER_SNAPSHOT_DATE:S/-//g}
WRKSRC= ${WRKDIR}/mplayer-export-${MPLAYER_SNAPSHOT_DATE}
@@ -29,6 +29,7 @@ CONFIGURE_ARGS= --cc="${CC}" \
--extra-cflags="-I${PREFIX}/include -I${LOCALBASE}/include" \
--extra-libs="-L${PREFIX}/lib" \
--disable-alsa \
+ --disable-ass-internal \
--disable-bitmap-font \
--disable-crystalhd \
--disable-esd \
@@ -48,7 +49,6 @@ CONFIGURE_ARGS= --cc="${CC}" \
--disable-libmpeg2 \
--disable-nemesi \
--disable-real \
- --enable-ass-internal \
--yasm=''
WANT_GNOME= yes
diff --git a/multimedia/mplayer/Makefile.optvars b/multimedia/mplayer/Makefile.optvars
index 887126a3615..14ab14ec186 100644
--- a/multimedia/mplayer/Makefile.optvars
+++ b/multimedia/mplayer/Makefile.optvars
@@ -13,6 +13,9 @@ AMR_NB_CONFIGURE_OFF= --disable-libopencore_amrnb
AMR_WB_LIB_DEPENDS= libopencore-amrwb.so:audio/opencore-amr
AMR_WB_CONFIGURE_OFF= --disable-libopencore_amrwb
+ASS_LIB_DEPENDS= libass.so:multimedia/libass
+ASS_CONFIGURE_OFF= --disable-ass
+
BLURAY_LIB_DEPENDS= libbluray.so:multimedia/libbluray
BLURAY_CONFIGURE_OFF= --disable-bluray
diff --git a/net-im/openfire/Makefile b/net-im/openfire/Makefile
index c668996b4c5..39f943bc5ef 100644
--- a/net-im/openfire/Makefile
+++ b/net-im/openfire/Makefile
@@ -2,26 +2,28 @@
# $FreeBSD$
PORTNAME= openfire
-PORTVERSION= 4.0.4
+PORTVERSION= 4.1.1
+DISTVERSIONPREFIX= v
PORTEPOCH= 1
CATEGORIES= net-im java
-MASTER_SITES= http://download.igniterealtime.org/openfire/
-DISTNAME= ${PORTNAME}_src_${PORTVERSION:S/./_/g}
MAINTAINER= gahr@FreeBSD.org
COMMENT= Enterprise instant messaging server
LICENSE= APACHE20
-LICENSE_FILE= ${WRKSRC}/LICENSE.html
+LICENSE_FILE= ${WRKSRC}/LICENSE.txt
RUN_DEPENDS= slf4j>=1.7.7:devel/slf4j
+USE_GITHUB= yes
+GH_ACCOUNT= igniterealtime
+
OPTIONS_DEFINE= DOCS PLUGINS
OPTIONS_DEFAULT=PLUGINS
OPTIONS_SUB= yes
PLUGINS_DESC= Install bundled plugins
-USES= cpe dos2unix zip
+USES= cpe dos2unix
DOS2UNIX_FILES= src/java/org/jivesoftware/openfire/server/ServerDialback.java
USE_LDCONFIG= yes
USE_ANT= yes
@@ -35,7 +37,7 @@ ALL_TARGET= openfire
USE_RC_SUBR= openfire
SUB_FILES+= pkg-message
-WRKSRC= ${WRKDIR}/${PORTNAME}_src
+WRKSRC= ${WRKDIR}/Openfire-${PORTVERSION}
BUILD_WRKSRC= ${WRKSRC}/build
INSTALL_WRKSRC= ${WRKSRC}/target/openfire
DATADIR= ${JAVASHAREDIR}/${PORTNAME}
@@ -86,8 +88,6 @@ do-install-PLUGINS-on:
do-install-DOCS-on:
${MKDIR} ${STAGEDIR}${DOCSDIR}
- (cd ${WRKSRC} && ${INSTALL_DATA} LICENSE.html README.html changelog.html \
- ${STAGEDIR}${DOCSDIR})
(cd ${WRKSRC}/documentation/docs && ${FIND} . \! -path ./javadoc\* \
| ${CPIO} -pdmu -R ${SHAREOWN}:${SHAREGRP} ${STAGEDIR}${DOCSDIR} > /dev/null 2>&1 )
diff --git a/net-im/openfire/distinfo b/net-im/openfire/distinfo
index ec83e59b049..811c8c4fbf5 100644
--- a/net-im/openfire/distinfo
+++ b/net-im/openfire/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1481108226
-SHA256 (openfire_src_4_0_4.zip) = b97e492de79d8733f484f7575343df6eb108a26b3117dbca2666aba31319d39a
-SIZE (openfire_src_4_0_4.zip) = 103408213
+TIMESTAMP = 1483374593
+SHA256 (igniterealtime-openfire-v4.1.1_GH0.tar.gz) = b597756f7edf41384e6875d638af30dce7fcb726b04812abc4f93703b6ddf6c9
+SIZE (igniterealtime-openfire-v4.1.1_GH0.tar.gz) = 100915344
diff --git a/net-im/openfire/pkg-plist b/net-im/openfire/pkg-plist
index ce336d9aba7..8d62e0730ab 100644
--- a/net-im/openfire/pkg-plist
+++ b/net-im/openfire/pkg-plist
@@ -192,6 +192,9 @@
%%DATADIR%%/plugins/admin/webapp/style/lightbox.css
%%DATADIR%%/plugins/admin/webapp/style/login.css
%%DATADIR%%/plugins/admin/webapp/style/setup.css
+%%DATADIR%%/plugins/avatarResizer.jar
+%%DATADIR%%/plugins/bookmarks.jar
+%%DATADIR%%/plugins/nonSaslAuthentication.jar
%%DATADIR%%/resources/database/openfire_db2.sql
%%DATADIR%%/resources/database/openfire_hsqldb.sql
%%DATADIR%%/resources/database/openfire_mysql.sql
@@ -302,6 +305,27 @@
%%DATADIR%%/resources/database/upgrade/22/openfire_postgresql.sql
%%DATADIR%%/resources/database/upgrade/22/openfire_sqlserver.sql
%%DATADIR%%/resources/database/upgrade/22/openfire_sybase.sql
+%%DATADIR%%/resources/database/upgrade/23/openfire_db2.sql
+%%DATADIR%%/resources/database/upgrade/23/openfire_hsqldb.sql
+%%DATADIR%%/resources/database/upgrade/23/openfire_mysql.sql
+%%DATADIR%%/resources/database/upgrade/23/openfire_oracle.sql
+%%DATADIR%%/resources/database/upgrade/23/openfire_postgresql.sql
+%%DATADIR%%/resources/database/upgrade/23/openfire_sqlserver.sql
+%%DATADIR%%/resources/database/upgrade/23/openfire_sybase.sql
+%%DATADIR%%/resources/database/upgrade/24/openfire_db2.sql
+%%DATADIR%%/resources/database/upgrade/24/openfire_hsqldb.sql
+%%DATADIR%%/resources/database/upgrade/24/openfire_mysql.sql
+%%DATADIR%%/resources/database/upgrade/24/openfire_oracle.sql
+%%DATADIR%%/resources/database/upgrade/24/openfire_postgresql.sql
+%%DATADIR%%/resources/database/upgrade/24/openfire_sqlserver.sql
+%%DATADIR%%/resources/database/upgrade/24/openfire_sybase.sql
+%%DATADIR%%/resources/database/upgrade/25/openfire_db2.sql
+%%DATADIR%%/resources/database/upgrade/25/openfire_hsqldb.sql
+%%DATADIR%%/resources/database/upgrade/25/openfire_mysql.sql
+%%DATADIR%%/resources/database/upgrade/25/openfire_oracle.sql
+%%DATADIR%%/resources/database/upgrade/25/openfire_postgresql.sql
+%%DATADIR%%/resources/database/upgrade/25/openfire_sqlserver.sql
+%%DATADIR%%/resources/database/upgrade/25/openfire_sybase.sql
%%DATADIR%%/resources/database/upgrade/4/openfire_db2.sql
%%DATADIR%%/resources/database/upgrade/4/openfire_hsqldb.sql
%%DATADIR%%/resources/database/upgrade/4/openfire_mysql.sql
diff --git a/net-im/rubygem-termtter/Makefile b/net-im/rubygem-termtter/Makefile
index 9cc4dadeb54..84aedaaf144 100644
--- a/net-im/rubygem-termtter/Makefile
+++ b/net-im/rubygem-termtter/Makefile
@@ -3,6 +3,7 @@
PORTNAME= termtter
PORTVERSION= 2.2.6
+PORTREVISION= 1
CATEGORIES= net-im rubygems
MASTER_SITES= RG
@@ -15,7 +16,7 @@ RUN_DEPENDS= rubygem-activerecord4>=4.1.0:databases/rubygem-activerecord4 \
rubygem-builder32>=3.1.4:devel/rubygem-builder32 \
rubygem-fluent-logger>=0.4.6:devel/rubygem-fluent-logger \
rubygem-highline>=1.6.0:devel/rubygem-highline \
- rubygem-json>=1.8.0:devel/rubygem-json \
+ rubygem-json1>=1.8.0:devel/rubygem-json1 \
rubygem-notify>=0.5.1:devel/rubygem-notify \
rubygem-rubytter>=1.5.1:net/rubygem-rubytter \
rubygem-termcolor>=1.0:textproc/rubygem-termcolor
diff --git a/net-im/rubygem-tinder/Makefile b/net-im/rubygem-tinder/Makefile
index 2666e733a96..2d1dadfaa21 100644
--- a/net-im/rubygem-tinder/Makefile
+++ b/net-im/rubygem-tinder/Makefile
@@ -2,6 +2,7 @@
PORTNAME= tinder
PORTVERSION= 1.10.1
+PORTREVISION= 1
CATEGORIES= net-im rubygems
MASTER_SITES= RG
@@ -15,7 +16,7 @@ RUN_DEPENDS= rubygem-eventmachine>=1.0:devel/rubygem-eventmachine \
rubygem-faraday>=0.9.0:www/rubygem-faraday\
rubygem-faraday_middleware>=0.9:www/rubygem-faraday_middleware \
rubygem-hashie>=1.0:devel/rubygem-hashie \
- rubygem-json>=1.8.0:devel/rubygem-json \
+ rubygem-json1>=1.8.0:devel/rubygem-json1 \
rubygem-mime-types>=0:misc/rubygem-mime-types \
rubygem-multi_json>=1.7:devel/rubygem-multi_json \
rubygem-twitter-stream>=0.1:net/rubygem-twitter-stream
diff --git a/net-mgmt/arpalert/Makefile b/net-mgmt/arpalert/Makefile
index 202024fed3b..61095307dbe 100644
--- a/net-mgmt/arpalert/Makefile
+++ b/net-mgmt/arpalert/Makefile
@@ -3,12 +3,15 @@
PORTNAME= arpalert
PORTVERSION= 2.0.12
+PORTREVISION= 1
CATEGORIES= net-mgmt
MASTER_SITES= http://www.arpalert.org/src/
-MAINTAINER= leeym@FreeBSD.org
+MAINTAINER= hrs@FreeBSD.org
COMMENT= ARP traffic monitoring
+LICENSE= GPLv2
+
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --localstatedir=/var
ALL_TARGET= ${PORTNAME}
diff --git a/net-mgmt/arpalert/files/patch-arpalert.c b/net-mgmt/arpalert/files/patch-arpalert.c
index 352cee82b49..e85562af464 100644
--- a/net-mgmt/arpalert/files/patch-arpalert.c
+++ b/net-mgmt/arpalert/files/patch-arpalert.c
@@ -1,6 +1,6 @@
---- arpalert.c.orig 2008-04-01 03:36:42.000000000 +0900
-+++ arpalert.c 2009-10-21 19:45:53.000000000 +0900
-@@ -179,6 +179,12 @@
+--- arpalert.c.orig 2011-11-08 19:36:51 UTC
++++ arpalert.c
+@@ -179,6 +179,12 @@ int main(int argc, char **argv){
if(cur_timeout.tv_sec != -1){
time_sous(&cur_timeout, ¤t_t, &timeout);
@@ -13,7 +13,7 @@
// prevent negative timeout
if(timeout.tv_sec < 0){
timeout.tv_usec = 0;
-@@ -188,6 +194,12 @@
+@@ -188,6 +194,12 @@ int main(int argc, char **argv){
timeout.tv_usec += 10000;
tmout = &timeout;
@@ -26,5 +26,3 @@
// if no timeout
} else {
tmout = NULL;
-
-
diff --git a/net-mgmt/arpalert/files/patch-install.sh.in b/net-mgmt/arpalert/files/patch-install.sh.in
new file mode 100644
index 00000000000..b99a5e07683
--- /dev/null
+++ b/net-mgmt/arpalert/files/patch-install.sh.in
@@ -0,0 +1,23 @@
+--- install.sh.in.orig 2011-11-08 19:36:51 UTC
++++ install.sh.in
+@@ -33,16 +33,16 @@ mkdir -p ${DESTDIR}${includedir}
+ mkdir -p ${DESTDIR}${mandir}/man8
+
+ # install man
+-cp -f doc/arpalert.8 ${DESTDIR}${mandir}/man8
++install -m 0444 doc/arpalert.8 ${DESTDIR}${mandir}/man8
+
+ # copy oui list
+-cp -f etc/oui.txt ${DESTDIR}${config_dir}
++install -m 0444 etc/oui.txt ${DESTDIR}${config_dir}
+
+ # copy API
+-cp -f api/arpalert.h ${DESTDIR}${includedir}
++install -m 0444 api/arpalert.h ${DESTDIR}${includedir}
+
+ # insall binary
+-cp -f arpalert ${DESTDIR}${sbindir}
++install -s -m 0555 arpalert ${DESTDIR}${sbindir}
+
+ # if doesn't exist conf
+ if [ ! -f ${DESTDIR}${config_dir}/arpalert.conf ]; then
diff --git a/net-mgmt/arpalert/files/patch-macname.h b/net-mgmt/arpalert/files/patch-macname.h
index 0f6f768a108..e173775be45 100644
--- a/net-mgmt/arpalert/files/patch-macname.h
+++ b/net-mgmt/arpalert/files/patch-macname.h
@@ -1,5 +1,5 @@
---- macname.h.orig Sun Dec 10 22:52:45 2006
-+++ macname.h Sun Dec 10 22:53:04 2006
+--- macname.h.orig 2011-11-08 19:36:51 UTC
++++ macname.h
@@ -7,6 +7,7 @@
#ifndef __MACNAME_H__
#define __MACNAME_H__
diff --git a/net-mgmt/arpalert/files/patch-module_example__Makefile b/net-mgmt/arpalert/files/patch-module_example__Makefile
index d3d648ebccd..86a741968e1 100644
--- a/net-mgmt/arpalert/files/patch-module_example__Makefile
+++ b/net-mgmt/arpalert/files/patch-module_example__Makefile
@@ -1,5 +1,5 @@
---- module_example/Makefile.orig 2008-04-01 02:36:42.000000000 +0800
-+++ module_example/Makefile 2011-09-05 16:49:33.000000000 +0800
+--- module_example/Makefile.orig 2011-11-08 19:36:51 UTC
++++ module_example/Makefile
@@ -1,8 +1,8 @@
# Copyright (c) 2005-2010 Thierry FOURNIER
# $Id: Makefile 690 2008-03-31 18:36:43Z $
diff --git a/net/Makefile b/net/Makefile
index aed777322e1..e8dbfd492b3 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -173,6 +173,7 @@
SUBDIR += gnu-dico
SUBDIR += gnu-radius
SUBDIR += go-amqp
+ SUBDIR += go-bapu
SUBDIR += go-cs
SUBDIR += go-geoip
SUBDIR += go-httppath
diff --git a/net/go-bapu/Makefile b/net/go-bapu/Makefile
new file mode 100644
index 00000000000..3a95c15b839
--- /dev/null
+++ b/net/go-bapu/Makefile
@@ -0,0 +1,25 @@
+# Created by: Carlo Strub
+# $FreeBSD$
+
+PORTNAME= bapu
+PORTVERSION= 0.1.0
+PORTREVISION= 1
+CATEGORIES= net
+MASTER_SITES= https://bitbucket.org/carlostrub/bapu/get/
+PKGNAMEPREFIX= go-
+DISTNAME= v${PORTVERSION}
+DIST_SUBDIR= go-bapu
+
+MAINTAINER= cs@FreeBSD.org
+COMMENT= Virtual Machine Controller for Gandi.net
+
+LICENSE= BSD3CLAUSE
+
+USES= go tar:bzip2
+GO_PKGNAME= bitbucket.org/carlostrub/bapu
+WRKSRC= ${WRKDIR}/carlostrub-bapu-4258e51442b6
+
+post-install:
+ ${CP} -R ${WRKSRC}/bapu.toml.sample ${STAGEDIR}${PREFIX}/etc/
+
+.include
diff --git a/net/go-bapu/distinfo b/net/go-bapu/distinfo
new file mode 100644
index 00000000000..36da407b67f
--- /dev/null
+++ b/net/go-bapu/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1483391253
+SHA256 (go-bapu/v0.1.0.tar.bz2) = 6e0ab806a2ee8a0e8bcec62eddafb111e2489a7dd74ecff342574ad6f60f0d65
+SIZE (go-bapu/v0.1.0.tar.bz2) = 6191339
diff --git a/net/go-bapu/pkg-descr b/net/go-bapu/pkg-descr
new file mode 100644
index 00000000000..e62e87269c5
--- /dev/null
+++ b/net/go-bapu/pkg-descr
@@ -0,0 +1,3 @@
+Bapu allows you to manage your Gandi virtual machines.
+
+WWW: https://bitbucket.org/carlostrub/bapu
diff --git a/net/go-bapu/pkg-plist b/net/go-bapu/pkg-plist
new file mode 100644
index 00000000000..35c7bad3fd3
--- /dev/null
+++ b/net/go-bapu/pkg-plist
@@ -0,0 +1,2 @@
+bin/bapu
+@sample etc/bapu.toml.sample
diff --git a/net/jumpgate/Makefile b/net/jumpgate/Makefile
index f550ac3177b..e1bbba015ee 100644
--- a/net/jumpgate/Makefile
+++ b/net/jumpgate/Makefile
@@ -3,14 +3,17 @@
PORTNAME= jumpgate
PORTVERSION= 0.7
+PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= http://jumpgate.sourceforge.net/
-MAINTAINER= leeym@FreeBSD.org
+MAINTAINER= hrs@FreeBSD.org
COMMENT= TCP connection forwarder
-GNU_CONFIGURE= yes
+LICENSE= BSD2CLAUSE
+LICENSE_FILE= ${WRKSRC}/LICENSE
+GNU_CONFIGURE= yes
PLIST_FILES= man/man8/jumpgate.8.gz sbin/jumpgate
.include
diff --git a/net/jumpgate/files/patch-Makefile.in b/net/jumpgate/files/patch-Makefile.in
index f883c714eb7..7eed427359d 100644
--- a/net/jumpgate/files/patch-Makefile.in
+++ b/net/jumpgate/files/patch-Makefile.in
@@ -1,5 +1,5 @@
---- Makefile.in.orig 2014-06-06 09:30:37.782875595 +0800
-+++ Makefile.in 2014-06-06 09:31:03.369876627 +0800
+--- Makefile.in.orig 2002-11-29 21:00:12 UTC
++++ Makefile.in
@@ -36,10 +36,10 @@ distclean:
rm -f Makefile config.cache config.log config.status config.h confdefs.h
diff --git a/net/l4ip/Makefile b/net/l4ip/Makefile
index a85290ec3aa..26dd186b146 100644
--- a/net/l4ip/Makefile
+++ b/net/l4ip/Makefile
@@ -8,7 +8,7 @@ CATEGORIES= net
MASTER_SITES= http://www.lundman.net/ftp/l4ip/
DISTNAME= ${PORTNAME}-${PORTVERSION:C/([0-9]*)\.([0-9]*)\.([0-9]*)/v\1.\2.b\3/}
-MAINTAINER= leeym@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= L4 health check daemon for IPFILTER
USES= gmake ssl tar:tgz
diff --git a/net/mrouted/Makefile b/net/mrouted/Makefile
index 5c14b917eed..b9bd0e637d7 100644
--- a/net/mrouted/Makefile
+++ b/net/mrouted/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= mrouted
-PORTVERSION= 3.9.7
-PORTREVISION= 1
+PORTVERSION= 3.9.8
CATEGORIES= net
MAINTAINER= hrs@FreeBSD.org
@@ -13,8 +12,8 @@ LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
USE_GITHUB= yes
-USE_RC_SUBR= mrouted
GH_ACCOUNT= troglobit
+USE_RC_SUBR= mrouted
HAS_CONFIGURE= yes
MAKE_ARGS= sysconfdir="${PREFIX}/etc" \
mandir="${MAN8PREFIX}/man/man8"
@@ -23,6 +22,7 @@ PLIST_FILES= sbin/map-mbone sbin/mrouted sbin/mrinfo sbin/mtrace \
etc/mrouted.conf man/man8/map-mbone.8.gz \
man/man8/mrinfo.8.gz man/man8/mrouted.8.gz \
man/man8/mtrace.8.gz
+
OPTIONS_DEFINE= DOCS
DOCS_MAKE_ARGS= datadir="${DOCSDIR}" doc=yes
diff --git a/net/mrouted/distinfo b/net/mrouted/distinfo
index 427a44e8689..c8923e933e1 100644
--- a/net/mrouted/distinfo
+++ b/net/mrouted/distinfo
@@ -1,2 +1,3 @@
-SHA256 (troglobit-mrouted-3.9.7_GH0.tar.gz) = 181908f7025c5a2dee2e50d86888780469eaa9e1bd42d3eca9dfed8274aecd3d
-SIZE (troglobit-mrouted-3.9.7_GH0.tar.gz) = 142560
+TIMESTAMP = 1483368179
+SHA256 (troglobit-mrouted-3.9.8_GH0.tar.gz) = 179636d211a82d0140a3488c6b65e634b4838da23e50d8cdee15ef03fe9b46af
+SIZE (troglobit-mrouted-3.9.8_GH0.tar.gz) = 143529
diff --git a/net/mrouted/files/patch-Makefile b/net/mrouted/files/patch-Makefile
index 944fe567a3c..3a1e221e158 100644
--- a/net/mrouted/files/patch-Makefile
+++ b/net/mrouted/files/patch-Makefile
@@ -1,4 +1,4 @@
---- Makefile.orig 2014-12-28 14:23:52 UTC
+--- Makefile.orig 2017-01-01 19:28:19 UTC
+++ Makefile
@@ -16,8 +16,8 @@ CC ?= $(CROSS)gcc
@@ -15,8 +15,8 @@
## Common
CFLAGS += $(MCAST_INCLUDE) $(INCLUDES) $(DEFS) $(USERCOMPILE)
--CFLAGS += -O2 -W -Wall -Werror
-+#CFLAGS += -O2 -W -Wall -Werror
+-CFLAGS += -O2 -W -Wall -Wextra
++#CFLAGS += -O2 -W -Wall -Wextra
#CFLAGS += -O -g
LDLIBS = $(EXTRA_LIBS)
LDFLAGS += -Wl,-Map,$@.map
@@ -25,7 +25,7 @@
SRCS = $(OBJS:.o=.c)
-MANS = $(addsuffix .8,$(EXECS))
-DISTFILES = README AUTHORS LICENSE ChangeLog
-+MANS = ${EXECS:S/$/.8/}
++MANS = $(EXECS:S/$/.8/)
+DISTFILES = README AUTHORS ChangeLog
LINT = splint
diff --git a/net/mrouted/files/patch-mtrace.c b/net/mrouted/files/patch-mtrace.c
deleted file mode 100644
index 0dd7e2d78b1..00000000000
--- a/net/mrouted/files/patch-mtrace.c
+++ /dev/null
@@ -1,24 +0,0 @@
---- mtrace.c.orig 2014-12-28 14:23:52 UTC
-+++ mtrace.c
-@@ -903,6 +903,12 @@ void stat_line(struct tr_resp *r, struct
- }
- }
-
-+static uint32_t
-+udiff(uint32_t u, uint32_t v)
-+{
-+ return (u >= v ? u - v : v - u);
-+}
-+
- /*
- * A fixup to check if any pktcnt has been reset, and to fix the
- * byteorder bugs in mrouted 3.6 on little-endian machines.
-@@ -920,7 +926,7 @@ void fixup_stats(struct resp_buf *base,
- /* Check for byte-swappers */
- while (--rno >= 0) {
- --n; --p; --b; --s;
-- if (*s || abs(ntohl(n->tr_vifout) - ntohl(p->tr_vifout)) > 100000) {
-+ if (*s || udiff(ntohl(n->tr_vifout), ntohl(p->tr_vifout)) > 100000) {
- /* This host sends byteswapped reports; swap 'em */
- if (!*s) {
- *s = 1;
diff --git a/net/pecl-yaz/Makefile b/net/pecl-yaz/Makefile
index 9ff21b0644d..ce0bb2d02fc 100644
--- a/net/pecl-yaz/Makefile
+++ b/net/pecl-yaz/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= yaz
-PORTVERSION= 1.1.6
-PORTREVISION= 1
+PORTVERSION= 1.2.1
CATEGORIES= net pear
MASTER_SITES= http://pecl.php.net/get/
PKGNAMEPREFIX= pecl-
@@ -18,6 +17,7 @@ LICENSE= PHP301
LIB_DEPENDS= libyaz.so:net/yaz
USES= php:ext
+USE_GNOME+= libxslt
IGNORE_WITH_PHP= 70
CONFIGURE_ARGS= --with-yaz=${LOCALBASE}
diff --git a/net/pecl-yaz/distinfo b/net/pecl-yaz/distinfo
index 23388bec91c..518b1f933d0 100644
--- a/net/pecl-yaz/distinfo
+++ b/net/pecl-yaz/distinfo
@@ -1,2 +1,3 @@
-SHA256 (PECL/yaz-1.1.6.tgz) = dd9b919ba3b2a09a9c77c847407f106512fe75979cc0689ebccef08c80719eee
-SIZE (PECL/yaz-1.1.6.tgz) = 16464
+TIMESTAMP = 1483410272
+SHA256 (PECL/yaz-1.2.1.tgz) = 5d402e1029aa62a801206e9783c7d3b25db7dd144d39eacb65bd72ab4c9d34c1
+SIZE (PECL/yaz-1.2.1.tgz) = 20147
diff --git a/net/ptunnel/Makefile b/net/ptunnel/Makefile
index e91450f2cdf..b57246afdb8 100644
--- a/net/ptunnel/Makefile
+++ b/net/ptunnel/Makefile
@@ -3,18 +3,19 @@
PORTNAME= ptunnel
PORTVERSION= 0.72
+PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= http://www.cs.uit.no/~daniels/PingTunnel/
DISTNAME= PingTunnel-${PORTVERSION}
-MAINTAINER= leeym@FreeBSD.org
+MAINTAINER= hrs@FreeBSD.org
COMMENT= Tunneling TCP connections over ICMP echo request and reply
LICENSE= BSD3CLAUSE
+LICENSE_FILE= ${WRKSRC}/LICENSE
-WRKSRC= ${WRKDIR}/PingTunnel
USES= gmake
-
+WRKSRC= ${WRKDIR}/PingTunnel
PLIST_FILES= bin/ptunnel man/man8/ptunnel.8.gz
post-patch:
diff --git a/net/rubygem-amqp-utils/Makefile b/net/rubygem-amqp-utils/Makefile
index dca745800bb..54258f2b749 100644
--- a/net/rubygem-amqp-utils/Makefile
+++ b/net/rubygem-amqp-utils/Makefile
@@ -3,7 +3,7 @@
PORTNAME= amqp-utils
PORTVERSION= 0.5.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= net rubygems
MASTER_SITES= RG
@@ -16,7 +16,7 @@ RUN_DEPENDS= rubygem-amqp>=0.7.1:net/rubygem-amqp \
rubygem-clio>=0.3.0:devel/rubygem-clio \
rubygem-facets>=2.9:devel/rubygem-facets \
rubygem-heredoc_unindent>=1.1.2:textproc/rubygem-heredoc_unindent \
- rubygem-json>=1.5:devel/rubygem-json \
+ rubygem-json1>=1.5:devel/rubygem-json1 \
rubygem-msgpack>=0.4.5:devel/rubygem-msgpack \
rubygem-trollop1>=1.16.2:devel/rubygem-trollop1
diff --git a/net/rubygem-azure/Makefile b/net/rubygem-azure/Makefile
index d14d1650a3c..830bed48afc 100644
--- a/net/rubygem-azure/Makefile
+++ b/net/rubygem-azure/Makefile
@@ -2,7 +2,8 @@
# $FreeBSD$
PORTNAME= azure
-PORTVERSION= 0.7.5
+PORTVERSION= 0.7.7
+PORTREVISION= 1
CATEGORIES= net rubygems
MASTER_SITES= RG
@@ -15,12 +16,10 @@ RUN_DEPENDS= rubygem-addressable>=2.3:www/rubygem-addressable \
rubygem-azure-core>=0.1:net/rubygem-azure-core \
rubygem-faraday>=0.9:www/rubygem-faraday \
rubygem-faraday_middleware>=0.10:www/rubygem-faraday_middleware \
- rubygem-json>=1.8:devel/rubygem-json \
rubygem-mime-types>=1:misc/rubygem-mime-types \
rubygem-nokogiri>=1.6:textproc/rubygem-nokogiri \
rubygem-systemu>=2.6:devel/rubygem-systemu \
- rubygem-thor>=0.19:devel/rubygem-thor \
- rubygem-uuid>=2.0:devel/rubygem-uuid
+ rubygem-thor>=0.19:devel/rubygem-thor
PLIST_FILES= bin/pfxer
diff --git a/net/rubygem-azure/distinfo b/net/rubygem-azure/distinfo
index 71c5d01b238..a412db43b6c 100644
--- a/net/rubygem-azure/distinfo
+++ b/net/rubygem-azure/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1469628472
-SHA256 (rubygem/azure-0.7.5.gem) = 1b55b60189853eb0cc4f239369cc7412bee63a22ceb7af4d0bef47180fe9d6ed
-SIZE (rubygem/azure-0.7.5.gem) = 87552
+TIMESTAMP = 1482948185
+SHA256 (rubygem/azure-0.7.7.gem) = aceec37b2e4f282f27c7bf5e7f65569b05ee6ff2e80d7aa835ada0c2d36d82d6
+SIZE (rubygem/azure-0.7.7.gem) = 96768
diff --git a/net/rubygem-azure/files/patch-gemspec b/net/rubygem-azure/files/patch-gemspec
deleted file mode 100644
index 75c743e22a0..00000000000
--- a/net/rubygem-azure/files/patch-gemspec
+++ /dev/null
@@ -1,11 +0,0 @@
---- azure.gemspec.orig 2016-07-27 14:15:02 UTC
-+++ azure.gemspec
-@@ -28,7 +28,7 @@ Gem::Specification.new do |s|
- s.add_runtime_dependency(%q.freeze, ["~> 0.9"])
- s.add_runtime_dependency(%q.freeze, ["~> 0.10"])
- s.add_runtime_dependency(%q.freeze, ["~> 1.8"])
-- s.add_runtime_dependency(%q.freeze, ["< 3.0", ">= 1"])
-+ s.add_runtime_dependency(%q.freeze, [">= 1"])
- s.add_runtime_dependency(%q.freeze, ["~> 1.6"])
- s.add_runtime_dependency(%q.freeze, ["~> 2.6"])
- s.add_runtime_dependency(%q.freeze, ["~> 0.19"])
diff --git a/net/rubygem-fog-azure/Makefile b/net/rubygem-fog-azure/Makefile
index b1cc3dff4bd..56925bdf9ce 100644
--- a/net/rubygem-fog-azure/Makefile
+++ b/net/rubygem-fog-azure/Makefile
@@ -13,7 +13,7 @@ LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE.md
RUN_DEPENDS= rubygem-azure>=0.6:net/rubygem-azure \
- rubygem-fog-core>=1.38:devel/rubygem-fog-core \
+ rubygem-fog-core>=1.27:devel/rubygem-fog-core \
rubygem-fog-json>=1.0:devel/rubygem-fog-json \
rubygem-fog-xml>=0.1:textproc/rubygem-fog-xml
diff --git a/net/rubygem-omniauth-twitter/Makefile b/net/rubygem-omniauth-twitter/Makefile
index a077dc2ff68..d3b8b764199 100644
--- a/net/rubygem-omniauth-twitter/Makefile
+++ b/net/rubygem-omniauth-twitter/Makefile
@@ -2,6 +2,7 @@
PORTNAME= omniauth-twitter
PORTVERSION= 1.2.1
+PORTREVISION= 1
CATEGORIES= net rubygems
MASTER_SITES= RG
@@ -10,7 +11,7 @@ COMMENT= OmniAuth strategy for Twitter
LICENSE= MIT
-RUN_DEPENDS= rubygem-json>=1.3:devel/rubygem-json \
+RUN_DEPENDS= rubygem-json1>=1.3:devel/rubygem-json1 \
rubygem-omniauth-oauth>=1.1:net/rubygem-omniauth-oauth
NO_ARCH= yes
diff --git a/net/rubygem-qiniu/Makefile b/net/rubygem-qiniu/Makefile
index 442c3c00efc..af2ba8de1c6 100644
--- a/net/rubygem-qiniu/Makefile
+++ b/net/rubygem-qiniu/Makefile
@@ -3,6 +3,7 @@
PORTNAME= qiniu
PORTVERSION= 6.8.0
+PORTREVISION= 1
CATEGORIES= net rubygems
MASTER_SITES= RG
@@ -12,7 +13,7 @@ COMMENT= Qiniu Resource (Cloud) Storage SDK for Ruby
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= rubygem-json>=1.8:devel/rubygem-json \
+RUN_DEPENDS= rubygem-json1>=1.8:devel/rubygem-json1 \
rubygem-mime-types>=2.4.0:misc/rubygem-mime-types \
rubygem-rest-client>=1.8.0:www/rubygem-rest-client \
rubygem-ruby-hmac>=0.4:security/rubygem-ruby-hmac
diff --git a/net/rubygem-twitter/Makefile b/net/rubygem-twitter/Makefile
index 496f00ac7d4..5e7fd660d23 100644
--- a/net/rubygem-twitter/Makefile
+++ b/net/rubygem-twitter/Makefile
@@ -3,6 +3,7 @@
PORTNAME= twitter
PORTVERSION= 5.17.0
+PORTREVISION= 1
CATEGORIES= net rubygems
MASTER_SITES= RG
@@ -18,7 +19,7 @@ RUN_DEPENDS= rubygem-addressable>=2.3:www/rubygem-addressable \
rubygem-faraday>=0.9.0:www/rubygem-faraday \
rubygem-http>=1.0:www/rubygem-http \
rubygem-http_parser.rb>=0.6.0:net/rubygem-http_parser.rb \
- rubygem-json>=1.8:devel/rubygem-json \
+ rubygem-json1>=1.8:devel/rubygem-json1 \
rubygem-memoizable>=0.4.0:devel/rubygem-memoizable \
rubygem-naught>=1.0:devel/rubygem-naught \
rubygem-simple_oauth>=0.3.0:net/rubygem-simple_oauth
diff --git a/net/syncthing/Makefile b/net/syncthing/Makefile
index 3afa9b8e3ec..ecab7822071 100644
--- a/net/syncthing/Makefile
+++ b/net/syncthing/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= syncthing
-PORTVERSION= 0.14.17
+PORTVERSION= 0.14.18
DISTVERSIONPREFIX= v
CATEGORIES= net
diff --git a/net/syncthing/distinfo b/net/syncthing/distinfo
index 8264326c4ca..465338c2f04 100644
--- a/net/syncthing/distinfo
+++ b/net/syncthing/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1482871153
-SHA256 (syncthing-syncthing-v0.14.17_GH0.tar.gz) = c4f7eda0cb213e0cb92aa2e075283474fa255af54696fb3b905ea22f27665682
-SIZE (syncthing-syncthing-v0.14.17_GH0.tar.gz) = 6005221
+TIMESTAMP = 1483369282
+SHA256 (syncthing-syncthing-v0.14.18_GH0.tar.gz) = 1cd44bd4530655e450e282a4a1240dbc963fc5518878700d68a42158e460f5a2
+SIZE (syncthing-syncthing-v0.14.18_GH0.tar.gz) = 6007483
diff --git a/net/udptunnel/Makefile b/net/udptunnel/Makefile
index b6450a18a6c..b8d43d4c250 100644
--- a/net/udptunnel/Makefile
+++ b/net/udptunnel/Makefile
@@ -3,12 +3,16 @@
PORTNAME= udptunnel
PORTVERSION= 1.1
+PORTREVISION= 1
CATEGORIES= net
-MASTER_SITES= ftp://ftp.cs.columbia.edu/pub/lennox/udptunnel/
+MASTER_SITES= http://www.cs.columbia.edu/~lennox/udptunnel/
-MAINTAINER= leeym@FreeBSD.org
+MAINTAINER= hrs@FreeBSD.org
COMMENT= Tunnel UDP packets over a TCP connection
+LICENSE= BSD3CLAUSE
+LICENSE_FILE= ${WRKSRC}/COPYRIGHT
+
GNU_CONFIGURE= yes
PLIST_FILES= bin/udptunnel
diff --git a/net/udptunnel/pkg-descr b/net/udptunnel/pkg-descr
index 131388d1952..ef6445efc01 100644
--- a/net/udptunnel/pkg-descr
+++ b/net/udptunnel/pkg-descr
@@ -1,17 +1,6 @@
-UDPTunnel by Jonathan Lennox; copyright 1999,2001 by Columbia University.
-
UDPTunnel is a small program which can tunnel UDP packets bi-directionally
over a TCP connection. Its primary purpose (and original motivation) is to
allow multi-media conferences to traverse a firewall which allows only
outgoing TCP connections.
-Source code for Unix is available from
-WWW: ftp://ftp.cs.columbia.edu/pub/lennox/udptunnel/
-
-See udptunnel.html for installation and usage instructions. See COPYRIGHT
-for conditions and terms of redistribution. A current version of
-udptunnel.html is located at
WWW: http://www.cs.columbia.edu/~lennox/udptunnel/
-
-Jonathan Lennox
-September 6, 2001
diff --git a/news/nntpcache/Makefile b/news/nntpcache/Makefile
index ecbc3aa4d53..5c93ff71212 100644
--- a/news/nntpcache/Makefile
+++ b/news/nntpcache/Makefile
@@ -7,7 +7,7 @@ PORTREVISION= 10
CATEGORIES= news
MASTER_SITES= http://www.xs4all.nl/~suelette/
-MAINTAINER= leeym@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= News caching/anti-spam/server-merging system
# This may be set interactively at install-time. NNTPCache will
diff --git a/news/p5-News-Article-NoCeM/Makefile b/news/p5-News-Article-NoCeM/Makefile
index 793ca23dc2b..08ef0f5c679 100644
--- a/news/p5-News-Article-NoCeM/Makefile
+++ b/news/p5-News-Article-NoCeM/Makefile
@@ -8,7 +8,7 @@ CATEGORIES= news perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
-MAINTAINER= leeym@FreeBSD.org
+MAINTAINER= perl@FreeBSD.org
COMMENT= Module to generate accurate NoCeM notices
RUN_DEPENDS= p5-News-Article>=0:news/p5-News-Article \
diff --git a/ports-mgmt/pkg-devel/Makefile b/ports-mgmt/pkg-devel/Makefile
index 1799c0a3ebc..aa591a546bb 100644
--- a/ports-mgmt/pkg-devel/Makefile
+++ b/ports-mgmt/pkg-devel/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= pkg
-DISTVERSION= 1.9.99.8
+DISTVERSION= 1.9.99.10
_PKG_VERSION= ${DISTVERSION}
CATEGORIES= ports-mgmt
MASTER_SITES= \
diff --git a/ports-mgmt/pkg-devel/distinfo b/ports-mgmt/pkg-devel/distinfo
index d5bb3f4ec4b..b6f95f8c560 100644
--- a/ports-mgmt/pkg-devel/distinfo
+++ b/ports-mgmt/pkg-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1480889869
-SHA256 (pkg-1.9.99.8.tar.xz) = 676711300f413ba2776c3d75585af7c670ccc3f5ea0927c112da2e136d42f29f
-SIZE (pkg-1.9.99.8.tar.xz) = 2227220
+TIMESTAMP = 1483399497
+SHA256 (pkg-1.9.99.10.tar.xz) = e2fc918b6deb9e683001672b0dd44d9316574f39a6714e6da539cb7ee1a97bc6
+SIZE (pkg-1.9.99.10.tar.xz) = 2192688
diff --git a/print/rubygem-color/Makefile b/print/rubygem-color/Makefile
index fd9a1133796..3b20824a25f 100644
--- a/print/rubygem-color/Makefile
+++ b/print/rubygem-color/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= color
-PORTVERSION= 1.7.1
+PORTVERSION= 1.8
CATEGORIES= print rubygems
MASTER_SITES= RG
diff --git a/print/rubygem-color/distinfo b/print/rubygem-color/distinfo
index 848749b187f..bd290c36f57 100644
--- a/print/rubygem-color/distinfo
+++ b/print/rubygem-color/distinfo
@@ -1,2 +1,3 @@
-SHA256 (rubygem/color-1.7.1.gem) = e497e6f1f8ddc4b985b6487addaaea4965277f96d594b954e011abb0dd184e45
-SIZE (rubygem/color-1.7.1.gem) = 48640
+TIMESTAMP = 1483340581
+SHA256 (rubygem/color-1.8.gem) = 0a8512ecf6a8fe14928707f7d2766680c955b3a2224de198c1e25c837cd36f82
+SIZE (rubygem/color-1.8.gem) = 46080
diff --git a/print/rubygem-pdf-reader/Makefile b/print/rubygem-pdf-reader/Makefile
index 17e2bbeea88..abea7177fd1 100644
--- a/print/rubygem-pdf-reader/Makefile
+++ b/print/rubygem-pdf-reader/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= pdf-reader
-PORTVERSION= 1.4.0
+PORTVERSION= 1.4.1
CATEGORIES= print rubygems
MASTER_SITES= RG
@@ -22,6 +22,6 @@ NO_ARCH= yes
USE_RUBY= yes
USES= gem
-PLIST_FILES+= bin/pdf_callbacks bin/pdf_list_callbacks bin/pdf_object bin/pdf_text
+PLIST_FILES= bin/pdf_callbacks bin/pdf_list_callbacks bin/pdf_object bin/pdf_text
.include
diff --git a/print/rubygem-pdf-reader/distinfo b/print/rubygem-pdf-reader/distinfo
index 0188ab23432..6ce6788b18f 100644
--- a/print/rubygem-pdf-reader/distinfo
+++ b/print/rubygem-pdf-reader/distinfo
@@ -1,2 +1,3 @@
-SHA256 (rubygem/pdf-reader-1.4.0.gem) = 0147b0254f9bcbf87172bbade153eb63f0a39bad18810000625171c17f8d2c49
-SIZE (rubygem/pdf-reader-1.4.0.gem) = 215040
+TIMESTAMP = 1483349416
+SHA256 (rubygem/pdf-reader-1.4.1.gem) = 58929dfc30289adb7136e6703d77eb50a2384ba3af9a84ce86634a394e7d7547
+SIZE (rubygem/pdf-reader-1.4.1.gem) = 215552
diff --git a/science/grib_api/Makefile b/science/grib_api/Makefile
index 3ddedfa47c8..3bb280d31bc 100644
--- a/science/grib_api/Makefile
+++ b/science/grib_api/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= grib_api
-PORTVERSION= 1.18.0
+PORTVERSION= 1.19.0
DISTVERSIONSUFFIX= -Source
CATEGORIES= science
MASTER_SITES= https://software.ecmwf.int/wiki/download/attachments/3473437/ \
diff --git a/science/grib_api/distinfo b/science/grib_api/distinfo
index 81864727969..a29cadb3582 100644
--- a/science/grib_api/distinfo
+++ b/science/grib_api/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1479443264
-SHA256 (grib_api-1.18.0-Source.tar.gz) = dfffeeb4df715b234907cb12d6729617bed0df0ff023337c2dd3cd20ab58199e
-SIZE (grib_api-1.18.0-Source.tar.gz) = 4705040
+TIMESTAMP = 1483308575
+SHA256 (grib_api-1.19.0-Source.tar.gz) = caec66c2d54331de9830dde853195262a1859bab36d5d03b4d44ac55784d921d
+SIZE (grib_api-1.19.0-Source.tar.gz) = 4746185
diff --git a/science/rubygem-ruby-netcdf/Makefile b/science/rubygem-ruby-netcdf/Makefile
index 0d2dfbd9ac7..5096373486f 100644
--- a/science/rubygem-ruby-netcdf/Makefile
+++ b/science/rubygem-ruby-netcdf/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= ruby-netcdf
-PORTVERSION= 0.7.1.1
+PORTVERSION= 0.7.2
CATEGORIES= science rubygems
MASTER_SITES= RG
diff --git a/science/rubygem-ruby-netcdf/distinfo b/science/rubygem-ruby-netcdf/distinfo
index 5f20c77947b..8fd8ca9e2e4 100644
--- a/science/rubygem-ruby-netcdf/distinfo
+++ b/science/rubygem-ruby-netcdf/distinfo
@@ -1,2 +1,3 @@
-SHA256 (rubygem/ruby-netcdf-0.7.1.1.gem) = af2fdef668b4297fb41b5aa7ead6933764ee1b59e80fdd6eaf57c8e798021a4c
-SIZE (rubygem/ruby-netcdf-0.7.1.1.gem) = 90112
+TIMESTAMP = 1483368002
+SHA256 (rubygem/ruby-netcdf-0.7.2.gem) = 0c9f2bc8014e8604907ebfcb5055bf1eba84d7958b200170bfa9785783a1673e
+SIZE (rubygem/ruby-netcdf-0.7.2.gem) = 90112
diff --git a/security/p5-Digest-Nilsimsa/Makefile b/security/p5-Digest-Nilsimsa/Makefile
index 48f35f8b0e4..05d6e95e928 100644
--- a/security/p5-Digest-Nilsimsa/Makefile
+++ b/security/p5-Digest-Nilsimsa/Makefile
@@ -8,7 +8,7 @@ CATEGORIES= security perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
-MAINTAINER= leeym@FreeBSD.org
+MAINTAINER= perl@FreeBSD.org
COMMENT= Perl version of Nilsimsa code
USES= perl5
diff --git a/security/pam_krb5-rh/Makefile b/security/pam_krb5-rh/Makefile
index 00bfdb8c840..75985ff94fd 100644
--- a/security/pam_krb5-rh/Makefile
+++ b/security/pam_krb5-rh/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= pam_krb5
-DISTVERSION= 2.4.9
-PORTREVISION= 2
+DISTVERSION= 2.4.13
CATEGORIES= security
MASTER_SITES= https://fedorahosted.org/released/${PORTNAME}/ \
http://mirrors.rit.edu/zi/
@@ -17,7 +16,7 @@ LICENSE_COMB= dual
CONFLICTS= pam_krb5-4.*
-USES= iconv libtool
+USES= iconv libtool ssl
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --without-afs --without-keyutils --without-krb4
CPPFLAGS+= -I${LOCALBASE}/include
@@ -40,4 +39,7 @@ post-patch:
@${REINPLACE_CMD} -e 's|PAM_AUTHTOK_RECOVER_ERR|PAM_AUTHTOK_RECOVERY_ERR|g' \
${WRKSRC}/src/password.c
+post-install:
+ ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/pam_krb5.so
+
.include
diff --git a/security/pam_krb5-rh/distinfo b/security/pam_krb5-rh/distinfo
index aa6d42babc4..90bbce2a93e 100644
--- a/security/pam_krb5-rh/distinfo
+++ b/security/pam_krb5-rh/distinfo
@@ -1,2 +1,3 @@
-SHA256 (pam_krb5-2.4.9.tar.gz) = cb652132c533670e6ab680ceca1ffc38608c2a7ef382bfb73480dc0f75198b6d
-SIZE (pam_krb5-2.4.9.tar.gz) = 561137
+TIMESTAMP = 1483376293
+SHA256 (pam_krb5-2.4.13.tar.gz) = 1d99dd1e8a57f7af3ae182e5477cbd11bfe53b334ba059b1c672d2de858513eb
+SIZE (pam_krb5-2.4.13.tar.gz) = 588900
diff --git a/security/pam_krb5-rh/pkg-plist b/security/pam_krb5-rh/pkg-plist
index 76600c757b0..2b6f0bc3a62 100644
--- a/security/pam_krb5-rh/pkg-plist
+++ b/security/pam_krb5-rh/pkg-plist
@@ -4,6 +4,8 @@ man/man5/pam_krb5.5.gz
man/man8/pam_krb5.8.gz
man/man8/pam_krb5_cchelper.8.gz
%%NLS%%share/locale/as/LC_MESSAGES/pam_krb5.mo
+%%NLS%%share/locale/bg/LC_MESSAGES/pam_krb5.mo
+%%NLS%%share/locale/bn/LC_MESSAGES/pam_krb5.mo
%%NLS%%share/locale/bn_IN/LC_MESSAGES/pam_krb5.mo
%%NLS%%share/locale/ca/LC_MESSAGES/pam_krb5.mo
%%NLS%%share/locale/cs/LC_MESSAGES/pam_krb5.mo
@@ -11,15 +13,19 @@ man/man8/pam_krb5_cchelper.8.gz
%%NLS%%share/locale/de/LC_MESSAGES/pam_krb5.mo
%%NLS%%share/locale/el/LC_MESSAGES/pam_krb5.mo
%%NLS%%share/locale/es/LC_MESSAGES/pam_krb5.mo
+%%NLS%%share/locale/et/LC_MESSAGES/pam_krb5.mo
+%%NLS%%share/locale/eu/LC_MESSAGES/pam_krb5.mo
%%NLS%%share/locale/fa/LC_MESSAGES/pam_krb5.mo
%%NLS%%share/locale/fr/LC_MESSAGES/pam_krb5.mo
%%NLS%%share/locale/gu/LC_MESSAGES/pam_krb5.mo
%%NLS%%share/locale/hi/LC_MESSAGES/pam_krb5.mo
%%NLS%%share/locale/hu/LC_MESSAGES/pam_krb5.mo
+%%NLS%%share/locale/ia/LC_MESSAGES/pam_krb5.mo
%%NLS%%share/locale/it/LC_MESSAGES/pam_krb5.mo
%%NLS%%share/locale/ja/LC_MESSAGES/pam_krb5.mo
%%NLS%%share/locale/kn/LC_MESSAGES/pam_krb5.mo
%%NLS%%share/locale/ko/LC_MESSAGES/pam_krb5.mo
+%%NLS%%share/locale/lv/LC_MESSAGES/pam_krb5.mo
%%NLS%%share/locale/ml/LC_MESSAGES/pam_krb5.mo
%%NLS%%share/locale/mr/LC_MESSAGES/pam_krb5.mo
%%NLS%%share/locale/ms/LC_MESSAGES/pam_krb5.mo
@@ -27,14 +33,17 @@ man/man8/pam_krb5_cchelper.8.gz
%%NLS%%share/locale/or/LC_MESSAGES/pam_krb5.mo
%%NLS%%share/locale/pa/LC_MESSAGES/pam_krb5.mo
%%NLS%%share/locale/pl/LC_MESSAGES/pam_krb5.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/pam_krb5.mo
%%NLS%%share/locale/pt_BR/LC_MESSAGES/pam_krb5.mo
%%NLS%%share/locale/ro/LC_MESSAGES/pam_krb5.mo
%%NLS%%share/locale/ru/LC_MESSAGES/pam_krb5.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/pam_krb5.mo
%%NLS%%share/locale/sr/LC_MESSAGES/pam_krb5.mo
%%NLS%%share/locale/sr@latin/LC_MESSAGES/pam_krb5.mo
%%NLS%%share/locale/sv/LC_MESSAGES/pam_krb5.mo
%%NLS%%share/locale/ta/LC_MESSAGES/pam_krb5.mo
%%NLS%%share/locale/te/LC_MESSAGES/pam_krb5.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/pam_krb5.mo
%%NLS%%share/locale/uk/LC_MESSAGES/pam_krb5.mo
%%NLS%%share/locale/zh_CN/LC_MESSAGES/pam_krb5.mo
%%NLS%%share/locale/zh_TW/LC_MESSAGES/pam_krb5.mo
diff --git a/security/stunnel/Makefile b/security/stunnel/Makefile
index 49f4b02fe0d..f82f53f706b 100644
--- a/security/stunnel/Makefile
+++ b/security/stunnel/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= stunnel
-PORTVERSION= 5.38
+PORTVERSION= 5.39
PORTEPOCH= 1
CATEGORIES= security
MASTER_SITES= https://www.stunnel.org/downloads/%SUBDIR%/ \
diff --git a/security/stunnel/distinfo b/security/stunnel/distinfo
index 44cf1415bc7..cd47a66d64a 100644
--- a/security/stunnel/distinfo
+++ b/security/stunnel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1483035685
-SHA256 (stunnel-5.38.tar.gz) = 09ada29ba1683ab1fd1f31d7bed8305127a0876537e836a40cb83851da034fd5
-SIZE (stunnel-5.38.tar.gz) = 647774
+TIMESTAMP = 1483375978
+SHA256 (stunnel-5.39.tar.gz) = 288c087a50465390d05508068ac76c8418a21fae7275febcc63f041ec5b04dee
+SIZE (stunnel-5.39.tar.gz) = 647101
diff --git a/sysutils/fusefs-chironfs/Makefile b/sysutils/fusefs-chironfs/Makefile
index a2586776ec7..74be551cdc1 100644
--- a/sysutils/fusefs-chironfs/Makefile
+++ b/sysutils/fusefs-chironfs/Makefile
@@ -8,7 +8,7 @@ CATEGORIES= sysutils
MASTER_SITES= GOOGLE_CODE
PKGNAMEPREFIX= fusefs-
-MAINTAINER= leeym@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= FUSE based filesystem with replication at the filesystem level
BROKEN= Unfetchable (google code has gone away)
diff --git a/sysutils/rsyslog8/Makefile b/sysutils/rsyslog8/Makefile
index 6b20a7f3d5a..03a90ab61f7 100644
--- a/sysutils/rsyslog8/Makefile
+++ b/sysutils/rsyslog8/Makefile
@@ -2,6 +2,7 @@
PORTNAME= rsyslog
PORTVERSION= 8.23.0
+PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= http://www.rsyslog.com/files/download/rsyslog/
diff --git a/sysutils/rsyslog8/files/patch-grammar_rainerscript.c b/sysutils/rsyslog8/files/patch-grammar_rainerscript.c
index 419d73d99ca..f2e1f1656dc 100644
--- a/sysutils/rsyslog8/files/patch-grammar_rainerscript.c
+++ b/sysutils/rsyslog8/files/patch-grammar_rainerscript.c
@@ -1,4 +1,4 @@
---- grammar/rainerscript.c.orig 2016-05-30 10:40:35 UTC
+--- grammar/rainerscript.c.orig 2016-11-13 15:46:26 UTC
+++ grammar/rainerscript.c
@@ -35,6 +35,7 @@
#include
diff --git a/sysutils/rsyslog8/files/patch-plugins_impstats_impstats.c b/sysutils/rsyslog8/files/patch-plugins_impstats_impstats.c
index 886971a5aa5..93822e020bc 100644
--- a/sysutils/rsyslog8/files/patch-plugins_impstats_impstats.c
+++ b/sysutils/rsyslog8/files/patch-plugins_impstats_impstats.c
@@ -1,4 +1,4 @@
---- plugins/impstats/impstats.c.orig 2016-05-30 10:40:35 UTC
+--- plugins/impstats/impstats.c.orig 2016-11-13 15:46:26 UTC
+++ plugins/impstats/impstats.c
@@ -36,6 +36,7 @@
#include
diff --git a/sysutils/rsyslog8/files/patch-runtime_nsd__ptcp.c b/sysutils/rsyslog8/files/patch-runtime_nsd__ptcp.c
index e1fdcc44297..7eb0a31fe11 100644
--- a/sysutils/rsyslog8/files/patch-runtime_nsd__ptcp.c
+++ b/sysutils/rsyslog8/files/patch-runtime_nsd__ptcp.c
@@ -1,4 +1,4 @@
---- runtime/nsd_ptcp.c.orig 2016-05-02 13:37:05 UTC
+--- runtime/nsd_ptcp.c.orig 2016-11-06 16:32:01 UTC
+++ runtime/nsd_ptcp.c
@@ -656,7 +656,11 @@ EnableKeepAlive(nsd_t *pNsd)
if(pThis->iKeepAliveProbes > 0) {
diff --git a/sysutils/rsyslog8/files/patch-runtime_stream.c b/sysutils/rsyslog8/files/patch-runtime_stream.c
new file mode 100644
index 00000000000..e500720f2a7
--- /dev/null
+++ b/sysutils/rsyslog8/files/patch-runtime_stream.c
@@ -0,0 +1,14 @@
+--- runtime/stream.c.orig 2016-11-13 15:46:26 UTC
++++ runtime/stream.c
+@@ -1153,7 +1153,10 @@ tryTTYRecover(strm_t *pThis, int err)
+ #ifndef __FreeBSD__
+ if(err == ERR_TTYHUP) {
+ #else
+- if(err == ERR_TTYHUP || err == ENXIO) {
++ /* Try to reopen our file descriptor even on errno 6, FreeBSD bug 200429
++ * Also try on errno 5, FreeBSD bug 211033
++ */
++ if(err == ERR_TTYHUP || err == ENXIO || err == EIO) {
+ #endif /* __FreeBSD__ */
+ close(pThis->fd);
+ CHKiRet(doPhysOpen(pThis));
diff --git a/sysutils/rubygem-puppet_forge/Makefile b/sysutils/rubygem-puppet_forge/Makefile
index abb57982cb3..e3d5337ffac 100644
--- a/sysutils/rubygem-puppet_forge/Makefile
+++ b/sysutils/rubygem-puppet_forge/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= puppet_forge
-PORTVERSION= 2.1.5
+PORTVERSION= 2.2.2
CATEGORIES= sysutils rubygems
MASTER_SITES= RG
@@ -13,6 +13,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt
RUN_DEPENDS= rubygem-faraday>=0.9.0:www/rubygem-faraday \
rubygem-faraday_middleware>=0.9.0:www/rubygem-faraday_middleware \
+ rubygem-gettext-setup>=0.3:devel/rubygem-gettext-setup \
rubygem-minitar>=0:archivers/rubygem-minitar \
rubygem-semantic_puppet>=0.1.0:devel/rubygem-semantic_puppet
diff --git a/sysutils/rubygem-puppet_forge/distinfo b/sysutils/rubygem-puppet_forge/distinfo
index 0302a5581a3..57dce254108 100644
--- a/sysutils/rubygem-puppet_forge/distinfo
+++ b/sysutils/rubygem-puppet_forge/distinfo
@@ -1,2 +1,3 @@
-SHA256 (rubygem/puppet_forge-2.1.5.gem) = fa1a531cb652cd01c5671aa1a088fb900b0453bad1f5c13c530d977e10b044ac
-SIZE (rubygem/puppet_forge-2.1.5.gem) = 769536
+TIMESTAMP = 1483345636
+SHA256 (rubygem/puppet_forge-2.2.2.gem) = 9ba3c47bccdf97ce511f916b627b3902e02a1913951598b2887437025abc56d4
+SIZE (rubygem/puppet_forge-2.2.2.gem) = 771072
diff --git a/sysutils/rubygem-puppet_forge1/Makefile b/sysutils/rubygem-puppet_forge1/Makefile
index 4867e6fc7e6..d8dcb54c484 100644
--- a/sysutils/rubygem-puppet_forge1/Makefile
+++ b/sysutils/rubygem-puppet_forge1/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= puppet_forge
-PORTVERSION= 1.0.5
+PORTVERSION= 1.0.6
CATEGORIES= sysutils rubygems
MASTER_SITES= RG
PKGNAMESUFFIX= 1
@@ -12,7 +12,10 @@ COMMENT= Ruby client for the Puppet Forge API
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-RUN_DEPENDS= rubygem-her>=0.6.8:databases/rubygem-her
+RUN_DEPENDS= rubygem-activesupport4>=4.2:devel/rubygem-activesupport4 \
+ rubygem-her>=0.6.8:databases/rubygem-her
+
+PORTSCOUT= limit:^1\.
NO_ARCH= yes
USE_RUBY= yes
diff --git a/sysutils/rubygem-puppet_forge1/distinfo b/sysutils/rubygem-puppet_forge1/distinfo
index c35ceb7824c..0998585207e 100644
--- a/sysutils/rubygem-puppet_forge1/distinfo
+++ b/sysutils/rubygem-puppet_forge1/distinfo
@@ -1,2 +1,3 @@
-SHA256 (rubygem/puppet_forge-1.0.5.gem) = 9f778a5d9f4ce88f82189e29030d0e65427dfe1cfd5e3f329e3bcc1e35ac0855
-SIZE (rubygem/puppet_forge-1.0.5.gem) = 760832
+TIMESTAMP = 1483343810
+SHA256 (rubygem/puppet_forge-1.0.6.gem) = 2aef67067b1e3260405cd23fff2945ee1ae8db09e0135e545c1d4b9bd18397b8
+SIZE (rubygem/puppet_forge-1.0.6.gem) = 755712
diff --git a/sysutils/rubygem-puppet_forge1/files/patch-gemspec b/sysutils/rubygem-puppet_forge1/files/patch-gemspec
index 696597bd477..e7f88b6f3ae 100644
--- a/sysutils/rubygem-puppet_forge1/files/patch-gemspec
+++ b/sysutils/rubygem-puppet_forge1/files/patch-gemspec
@@ -1,9 +1,9 @@
---- puppet_forge.gemspec.orig 2016-03-31 16:12:36 UTC
+--- puppet_forge.gemspec.orig 2017-01-02 08:49:01 UTC
+++ puppet_forge.gemspec
-@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
- s.specification_version = 3
+@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+ s.add_runtime_dependency(%q.freeze, ["~> 4.2"])
- s.add_runtime_dependency(%q.freeze, ["~> 0.6.8"])
+ s.add_runtime_dependency(%q.freeze, [">= 0.6.8"])
s.add_development_dependency(%q.freeze, ["~> 1.6"])
diff --git a/sysutils/rubygem-r10k/Makefile b/sysutils/rubygem-r10k/Makefile
index a9250c5a15c..fecff03f998 100644
--- a/sysutils/rubygem-r10k/Makefile
+++ b/sysutils/rubygem-r10k/Makefile
@@ -2,6 +2,7 @@
PORTNAME= r10k
PORTVERSION= 2.5.1
+PORTREVISION= 1
CATEGORIES= sysutils rubygems
MASTER_SITES= RG
@@ -13,6 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
RUN_DEPENDS= rubygem-colored>=1.2:textproc/rubygem-colored \
rubygem-cri>=2.6.1:devel/rubygem-cri \
+ rubygem-gettext-setup>=0.5:devel/rubygem-gettext-setup \
rubygem-log4r>=1.1.10:sysutils/rubygem-log4r \
rubygem-minitar>=0:archivers/rubygem-minitar \
rubygem-multi_json>=1.10:devel/rubygem-multi_json \
diff --git a/sysutils/rubygem-r10k/files/patch-gemspec b/sysutils/rubygem-r10k/files/patch-gemspec
index e6aa7858905..f43153fe2c9 100644
--- a/sysutils/rubygem-r10k/files/patch-gemspec
+++ b/sysutils/rubygem-r10k/files/patch-gemspec
@@ -1,7 +1,7 @@
---- r10k.gemspec.orig 2016-03-31 19:13:04 UTC
+--- r10k.gemspec.orig 2017-01-02 08:32:03 UTC
+++ r10k.gemspec
@@ -23,9 +23,9 @@ Gem::Specification.new do |s|
- s.specification_version = 3
+ s.specification_version = 4
if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
- s.add_runtime_dependency(%q.freeze, ["= 1.2"])
@@ -11,5 +11,5 @@
+ s.add_runtime_dependency(%q.freeze, [">= 2.6.1"])
+ s.add_runtime_dependency(%q.freeze, [">= 1.1.10"])
s.add_runtime_dependency(%q.freeze, ["~> 1.10"])
- s.add_runtime_dependency(%q.freeze, ["~> 2.1.1"])
+ s.add_runtime_dependency(%q.freeze, ["~> 2.2"])
s.add_runtime_dependency(%q.freeze, ["~> 0.1.0"])
diff --git a/sysutils/swapd/Makefile b/sysutils/swapd/Makefile
index 7e3b5668dec..1755d2aae20 100644
--- a/sysutils/swapd/Makefile
+++ b/sysutils/swapd/Makefile
@@ -7,7 +7,7 @@ PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= http://www.rkeene.org/files/oss/swapd/
-MAINTAINER= leeym@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Daemon that watches free memory and manages swap files
LIB_DEPENDS= libstatgrab.so:devel/libstatgrab
diff --git a/textproc/Makefile b/textproc/Makefile
index f34253b7e44..444a2c87cb1 100644
--- a/textproc/Makefile
+++ b/textproc/Makefile
@@ -133,7 +133,6 @@
SUBDIR += docbook2X
SUBDIR += docbook2mdoc
SUBDIR += docbook2odf
- SUBDIR += docdiff
SUBDIR += doclifter
SUBDIR += docproj
SUBDIR += dom4j
@@ -1427,6 +1426,7 @@
SUBDIR += rubygem-cssmin
SUBDIR += rubygem-diff-lcs
SUBDIR += rubygem-diffy
+ SUBDIR += rubygem-docdiff
SUBDIR += rubygem-elasticsearch
SUBDIR += rubygem-elasticsearch-api
SUBDIR += rubygem-elasticsearch-transport
@@ -1487,6 +1487,7 @@
SUBDIR += rubygem-phone
SUBDIR += rubygem-pretty-xml
SUBDIR += rubygem-rails-dom-testing
+ SUBDIR += rubygem-rails-dom-testing1
SUBDIR += rubygem-rails-html-sanitizer
SUBDIR += rubygem-rak
SUBDIR += rubygem-rchardet
diff --git a/textproc/antiword/Makefile b/textproc/antiword/Makefile
index f390fefc673..6daf0eb638b 100644
--- a/textproc/antiword/Makefile
+++ b/textproc/antiword/Makefile
@@ -7,7 +7,7 @@ PORTREVISION= 4
CATEGORIES= textproc
MASTER_SITES= http://www.winfield.demon.nl/linux/
-MAINTAINER= leeym@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Application for displaying Microsoft(R) Word documents
LICENSE= GPLv2
diff --git a/textproc/docdiff/Makefile b/textproc/docdiff/Makefile
deleted file mode 100644
index cafa706d0d1..00000000000
--- a/textproc/docdiff/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-# Created by: Andrew Pantyukhin
-# $FreeBSD$
-
-PORTNAME= docdiff
-PORTVERSION= 0.4.0
-CATEGORIES= textproc
-MASTER_SITES= SF
-
-MAINTAINER= sunpoet@FreeBSD.org
-COMMENT= Compares two text files by word, by character, or by line
-
-LICENSE= BSD3CLAUSE
-
-OPTIONS_DEFINE= DOCS
-
-NO_BUILD= yes
-USE_RUBY= yes
-USES= shebangfix
-
-PORTDOCS= readme.html readme.en.html readme.ja.html
-
-SHEBANG_FILES= ${PORTNAME}.rb
-
-post-patch:
- @${REINPLACE_CMD} -e '/ :format/ s|html|tty|' \
- -e '/SystemConfigFileName =/ s|etc.*conf|${PREFIX}/etc/${PORTNAME}.conf|' \
- -e 's|/etc/${PORTNAME}/${PORTNAME}.conf|${PREFIX}/etc/${PORTNAME}.conf|' \
- ${WRKSRC}/${PORTNAME}.rb
-
-do-install:
- cd ${WRKSRC}/${PORTNAME}/ && ${COPYTREE_SHARE} . ${STAGEDIR}${RUBY_SITELIBDIR}/${PORTNAME}/
- ${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME}.rb ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
- ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.conf.example ${STAGEDIR}${PREFIX}/etc/
- ${MKDIR} ${STAGEDIR}${DOCSDIR}/
- cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/
-
-.include
diff --git a/textproc/docdiff/distinfo b/textproc/docdiff/distinfo
deleted file mode 100644
index 252e0d1b669..00000000000
--- a/textproc/docdiff/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (docdiff-0.4.0.tar.gz) = 38f1e7d7e02c1bab801aab32c8e366a73a228b40516c71e1c1d3888d3ae2a935
-SIZE (docdiff-0.4.0.tar.gz) = 212317
diff --git a/textproc/docdiff/pkg-plist b/textproc/docdiff/pkg-plist
deleted file mode 100644
index b80073bd2d8..00000000000
--- a/textproc/docdiff/pkg-plist
+++ /dev/null
@@ -1,18 +0,0 @@
-bin/docdiff
-etc/docdiff.conf.example
-%%RUBY_SITELIBDIR%%/docdiff/charstring.rb
-%%RUBY_SITELIBDIR%%/docdiff/diff.rb
-%%RUBY_SITELIBDIR%%/docdiff/diff/contours.rb
-%%RUBY_SITELIBDIR%%/docdiff/diff/editscript.rb
-%%RUBY_SITELIBDIR%%/docdiff/diff/rcsdiff.rb
-%%RUBY_SITELIBDIR%%/docdiff/diff/shortestpath.rb
-%%RUBY_SITELIBDIR%%/docdiff/diff/speculative.rb
-%%RUBY_SITELIBDIR%%/docdiff/diff/subsequence.rb
-%%RUBY_SITELIBDIR%%/docdiff/diff/unidiff.rb
-%%RUBY_SITELIBDIR%%/docdiff/difference.rb
-%%RUBY_SITELIBDIR%%/docdiff/document.rb
-%%RUBY_SITELIBDIR%%/docdiff/encoding/en_ascii.rb
-%%RUBY_SITELIBDIR%%/docdiff/encoding/ja_eucjp.rb
-%%RUBY_SITELIBDIR%%/docdiff/encoding/ja_sjis.rb
-%%RUBY_SITELIBDIR%%/docdiff/encoding/ja_utf8.rb
-%%RUBY_SITELIBDIR%%/docdiff/view.rb
diff --git a/textproc/p5-Unicode-Unihan/Makefile b/textproc/p5-Unicode-Unihan/Makefile
index ce1f4c6178a..1ab3d989bcc 100644
--- a/textproc/p5-Unicode-Unihan/Makefile
+++ b/textproc/p5-Unicode-Unihan/Makefile
@@ -8,7 +8,7 @@ CATEGORIES= textproc perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
-MAINTAINER= leeym@FreeBSD.org
+MAINTAINER= perl@FreeBSD.org
COMMENT= The Unihan Data Base 5.1.0
USES= perl5
diff --git a/textproc/p5-XML-RSS-Parser/Makefile b/textproc/p5-XML-RSS-Parser/Makefile
index 42872fb1688..c55a272335c 100644
--- a/textproc/p5-XML-RSS-Parser/Makefile
+++ b/textproc/p5-XML-RSS-Parser/Makefile
@@ -8,7 +8,7 @@ CATEGORIES= textproc perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
-MAINTAINER= leeym@FreeBSD.org
+MAINTAINER= perl@FreeBSD.org
COMMENT= Liberal object-oriented parser for RSS feeds
RUN_DEPENDS= p5-XML-Elemental>=0:textproc/p5-XML-Elemental \
diff --git a/textproc/rubygem-docdiff/Makefile b/textproc/rubygem-docdiff/Makefile
new file mode 100644
index 00000000000..e43187e8292
--- /dev/null
+++ b/textproc/rubygem-docdiff/Makefile
@@ -0,0 +1,20 @@
+# Created by: Andrew Pantyukhin
+# $FreeBSD$
+
+PORTNAME= docdiff
+PORTVERSION= 0.5.0
+CATEGORIES= textproc rubygems
+MASTER_SITES= RG
+
+MAINTAINER= sunpoet@FreeBSD.org
+COMMENT= Compares two text files by word, by character, or by line
+
+LICENSE= BSD3CLAUSE
+
+NO_ARCH= yes
+USE_RUBY= yes
+USES= gem
+
+PLIST_FILES= bin/docdiff
+
+.include
diff --git a/textproc/rubygem-docdiff/distinfo b/textproc/rubygem-docdiff/distinfo
new file mode 100644
index 00000000000..b05fdf032fa
--- /dev/null
+++ b/textproc/rubygem-docdiff/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1483308291
+SHA256 (rubygem/docdiff-0.5.0.gem) = 44510176e2bd635789975cde94cf822f2ddfad64cc76348ceaab9e8386633bb9
+SIZE (rubygem/docdiff-0.5.0.gem) = 203264
diff --git a/textproc/docdiff/pkg-descr b/textproc/rubygem-docdiff/pkg-descr
similarity index 90%
rename from textproc/docdiff/pkg-descr
rename to textproc/rubygem-docdiff/pkg-descr
index 8f4d64054b0..69d4d4ae6a2 100644
--- a/textproc/docdiff/pkg-descr
+++ b/textproc/rubygem-docdiff/pkg-descr
@@ -6,4 +6,4 @@ It supports several encodings and end-of-line characters, including ASCII (and
other single byte encodings such as ISO-8859-*), UTF-8, EUC-JP, Shift_JIS, CR,
LF, and CRLF.
-WWW: http://docdiff.sourceforge.net/
+WWW: https://github.com/hisashim/docdiff
diff --git a/textproc/rubygem-loggability/Makefile b/textproc/rubygem-loggability/Makefile
index 2825de11ad4..de4fbcab70a 100644
--- a/textproc/rubygem-loggability/Makefile
+++ b/textproc/rubygem-loggability/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= loggability
-PORTVERSION= 0.11.0
+PORTVERSION= 0.12.0
CATEGORIES= textproc rubygems
MASTER_SITES= RG
diff --git a/textproc/rubygem-loggability/distinfo b/textproc/rubygem-loggability/distinfo
index a34f1920e7c..72e27b12291 100644
--- a/textproc/rubygem-loggability/distinfo
+++ b/textproc/rubygem-loggability/distinfo
@@ -1,2 +1,3 @@
-SHA256 (rubygem/loggability-0.11.0.gem) = 9abecffcef1568bd1c4026c157f5bed79db2fb5157ace19f4e1d908fca82c746
-SIZE (rubygem/loggability-0.11.0.gem) = 33280
+TIMESTAMP = 1483349889
+SHA256 (rubygem/loggability-0.12.0.gem) = 3d9302e49da3203b6466666e99dcb7f1724472c07ce53673717bbded9db05ee4
+SIZE (rubygem/loggability-0.12.0.gem) = 34816
diff --git a/textproc/rubygem-rails-dom-testing/Makefile b/textproc/rubygem-rails-dom-testing/Makefile
index 2182b4487d9..038ea95aba6 100644
--- a/textproc/rubygem-rails-dom-testing/Makefile
+++ b/textproc/rubygem-rails-dom-testing/Makefile
@@ -9,6 +9,9 @@ MASTER_SITES= RG
MAINTAINER= ruby@FreeBSD.org
COMMENT= Analyse and compare DOMs using Nokogiri
+LICENSE= MIT
+LICENSE_FILE= ${WRKSRC}/MIT-LICENSE
+
RUN_DEPENDS= rubygem-activesupport4>=4.2.0:devel/rubygem-activesupport4 \
rubygem-nokogiri>=1.6:textproc/rubygem-nokogiri \
rubygem-rails-deprecated_sanitizer>=1.0.1:devel/rubygem-rails-deprecated_sanitizer
diff --git a/textproc/rubygem-rails-dom-testing1/Makefile b/textproc/rubygem-rails-dom-testing1/Makefile
new file mode 100644
index 00000000000..e9c913fafcf
--- /dev/null
+++ b/textproc/rubygem-rails-dom-testing1/Makefile
@@ -0,0 +1,26 @@
+# Created by: Johannes Jost Meixner
+# $FreeBSD$
+
+PORTNAME= rails-dom-testing
+PORTVERSION= 1.0.8
+CATEGORIES= textproc rubygems
+MASTER_SITES= RG
+PKGNAMESUFFIX= 1
+
+MAINTAINER= ruby@FreeBSD.org
+COMMENT= Analyse and compare DOMs using Nokogiri
+
+LICENSE= MIT
+LICENSE_FILE= ${WRKSRC}/LICENSE.txt
+
+RUN_DEPENDS= rubygem-activesupport4>=4.2.0:devel/rubygem-activesupport4 \
+ rubygem-nokogiri>=1.6:textproc/rubygem-nokogiri \
+ rubygem-rails-deprecated_sanitizer>=1.0.1:devel/rubygem-rails-deprecated_sanitizer
+
+NO_ARCH= yes
+USE_RUBY= yes
+USES= gem
+
+PORTSCOUT= limit:^1\.
+
+.include
diff --git a/textproc/rubygem-rails-dom-testing1/distinfo b/textproc/rubygem-rails-dom-testing1/distinfo
new file mode 100644
index 00000000000..e2edab58d70
--- /dev/null
+++ b/textproc/rubygem-rails-dom-testing1/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1483397706
+SHA256 (rubygem/rails-dom-testing-1.0.8.gem) = 19dd4498c8e203b6c7747d0261d961354712e6f67bc74bdecf4060d8e5aac7db
+SIZE (rubygem/rails-dom-testing-1.0.8.gem) = 17408
diff --git a/textproc/rubygem-rails-dom-testing1/pkg-descr b/textproc/rubygem-rails-dom-testing1/pkg-descr
new file mode 100644
index 00000000000..c87a1ba3706
--- /dev/null
+++ b/textproc/rubygem-rails-dom-testing1/pkg-descr
@@ -0,0 +1,8 @@
+This gem is responsible for comparing HTML doms and asserting that DOM elements
+are present in Rails applications. Doms are compared via assert_dom_equal and
+assert_dom_not_equal. Elements are asserted via assert_select,
+assert_select_encoded, assert_select_email and a subset of the dom can be
+selected with css_select. The gem is developed for Rails 4.2 and above, and
+will not work on previous versions.
+
+WWW: https://github.com/rails/rails-dom-testing
diff --git a/textproc/rubygem-rubypants/Makefile b/textproc/rubygem-rubypants/Makefile
index 2e4d8dcec9b..59749f448f1 100644
--- a/textproc/rubygem-rubypants/Makefile
+++ b/textproc/rubygem-rubypants/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= rubypants
-PORTVERSION= 0.2.0
+PORTVERSION= 0.6.0
CATEGORIES= textproc rubygems
MASTER_SITES= RG
diff --git a/textproc/rubygem-rubypants/distinfo b/textproc/rubygem-rubypants/distinfo
index 7ef3aaba425..8cc69bb95a3 100644
--- a/textproc/rubygem-rubypants/distinfo
+++ b/textproc/rubygem-rubypants/distinfo
@@ -1,2 +1,3 @@
-SHA256 (rubygem/rubypants-0.2.0.gem) = f07e38eac793655a0323fe91946081052341b9e69807026fcf102346589eedee
-SIZE (rubygem/rubypants-0.2.0.gem) = 11264
+TIMESTAMP = 1483351094
+SHA256 (rubygem/rubypants-0.6.0.gem) = 503b4c24ba574a6a617e5133838f6d9ab49227bd102728a8f2930baba89ef876
+SIZE (rubygem/rubypants-0.6.0.gem) = 13824
diff --git a/textproc/supercat/Makefile b/textproc/supercat/Makefile
index 39f6f318cf3..86721db0f06 100644
--- a/textproc/supercat/Makefile
+++ b/textproc/supercat/Makefile
@@ -2,19 +2,14 @@
# $FreeBSD$
PORTNAME= supercat
-PORTVERSION= 0.5.5
-PORTREVISION= 1
+PORTVERSION= 0.5.6
CATEGORIES= textproc
MASTER_SITES= http://supercat.nosredna.net/
MAINTAINER= ports@FreeBSD.org
COMMENT= Regexp-based text colorizer with ASCII/HTML output
+CONFIGURE_ARGS= --with-system-directory=${ETCDIR}
GNU_CONFIGURE= yes
-PORT_VERBS= ${PORTNAME} spc
-
-post-patch:
- @${REINPLACE_CMD} -e 's|/etc/supercat|${ETCDIR}|' ${WRKSRC}/configure
- @${REINPLACE_CMD} -e 's|c:C:dDhmnrt:vS|&Rw|' ${WRKSRC}/src/spc.c
.include
diff --git a/textproc/supercat/distinfo b/textproc/supercat/distinfo
index c0afb42c405..49533f160db 100644
--- a/textproc/supercat/distinfo
+++ b/textproc/supercat/distinfo
@@ -1,2 +1,3 @@
-SHA256 (supercat-0.5.5.tar.gz) = c49bd0b72509a166fb8686c999169b2c970595bc565d0b0379a01323657c01bf
-SIZE (supercat-0.5.5.tar.gz) = 103545
+TIMESTAMP = 1483361449
+SHA256 (supercat-0.5.6.tar.gz) = 0b2052237acc7754094caca4ed85f7e9fa55139f801de2f210c328ead7a33211
+SIZE (supercat-0.5.6.tar.gz) = 150193
diff --git a/www/august/Makefile b/www/august/Makefile
index 47d3cfe41b4..da5596690be 100644
--- a/www/august/Makefile
+++ b/www/august/Makefile
@@ -13,30 +13,29 @@ DISTNAME= ${PORTNAME}${PORTVERSION}.src
MAINTAINER= ports@FreeBSD.org
COMMENT= HTML editor for the experienced Web author
-LICENSE= GPLv2
+LICENSE= GPLv2+
+LICENSE_FILE= ${WRKSRC}/license.txt
-OPTIONS_DEFINE= DOCS
-
-USES+= tk
RUN_DEPENDS= identify:graphics/ImageMagick \
weblint:www/weblint
+USES= tk
NO_BUILD= yes
+NO_ARCH= yes
PORTDOCS= specchars.txt
PLIST_FILES= bin/august
-.include
+OPTIONS_DEFINE= DOCS
post-patch:
- @${REINPLACE_CMD} -e \
- 's|/usr/bin/wish|${WISH}|g' ${WRKSRC}/august
+ @${REINPLACE_CMD} -e 's|/usr/bin/wish|${WISH}|g' ${WRKSRC}/august
do-install:
${INSTALL_SCRIPT} ${WRKSRC}/august ${STAGEDIR}${PREFIX}/bin
-.if ${PORT_OPTIONS:MDOCS}
+
+do-install-DOCS-on:
@${MKDIR} ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/specchars.txt ${STAGEDIR}${DOCSDIR}
-.endif
.include
diff --git a/www/mod_uid/Makefile b/www/mod_uid/Makefile
index 67af50d78da..ba62335b305 100644
--- a/www/mod_uid/Makefile
+++ b/www/mod_uid/Makefile
@@ -6,7 +6,7 @@ PORTVERSION= 1.1.0
CATEGORIES= www
MASTER_SITES= ftp://ftp.lexa.ru/pub/apache-rus/contrib/
-MAINTAINER= leeym@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Apache module issuing the "correct" cookies for counting the site visitors
USE_APACHE= 22
diff --git a/www/otter-browser/Makefile b/www/otter-browser/Makefile
index af263cf9955..e1fe6fdda26 100644
--- a/www/otter-browser/Makefile
+++ b/www/otter-browser/Makefile
@@ -1,17 +1,22 @@
# $FreeBSD$
PORTNAME= otter-browser
-PORTVERSION= 0.9.11
+PORTVERSION= 0.9.12
DISTVERSIONPREFIX= v
CATEGORIES= www
MAINTAINER= kde@FreeBSD.org
COMMENT= Browser based on Qt 5
+LICENSE= GPLv3
+LICENSE_FILE= ${WRKSRC}/COPYING
+
+LIB_DEPENDS= libhunspell-1.5.so:textproc/hunspell
+
+USES= cmake:outsource compiler:c++11-lib desktop-file-utils
USE_QT5= concurrent core dbus gui multimedia network printsupport \
qml script sql sql-sqlite3 webkit widgets xmlpatterns \
buildtools_build qmake_build
-USES= cmake:outsource compiler:c++11-lib desktop-file-utils
USE_GITHUB= yes
GH_ACCOUNT= OtterBrowser
diff --git a/www/otter-browser/distinfo b/www/otter-browser/distinfo
index 4a693189d82..2663ac96ea3 100644
--- a/www/otter-browser/distinfo
+++ b/www/otter-browser/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1475405216
-SHA256 (OtterBrowser-otter-browser-v0.9.11_GH0.tar.gz) = 1497b7d51f7e9259df1a05b3e7101699534759c7c73718147ca760ddbc0f0788
-SIZE (OtterBrowser-otter-browser-v0.9.11_GH0.tar.gz) = 4017475
+TIMESTAMP = 1483369301
+SHA256 (OtterBrowser-otter-browser-v0.9.12_GH0.tar.gz) = 1a184561b9dbf3443cf1f83ad8604976b1b06cc00a93306331b364f237363e20
+SIZE (OtterBrowser-otter-browser-v0.9.12_GH0.tar.gz) = 4211473
diff --git a/www/otter-browser/files/patch-src_ui_CertificateDialog.h b/www/otter-browser/files/patch-src_ui_CertificateDialog.h
deleted file mode 100644
index 4774ff195e2..00000000000
--- a/www/otter-browser/files/patch-src_ui_CertificateDialog.h
+++ /dev/null
@@ -1,20 +0,0 @@
-Workaround for base GCC, which is too stupid to understand the declaration
-below:
-
-/wrkdirs/usr/ports/www/otter-browser/work/otter-browser-0.9.09/src/ui/CertificateDialog.h:66: error: expected ',' or '...' before '>' token
-/wrkdirs/usr/ports/www/otter-browser/work/otter-browser-0.9.09/src/ui/CertificateDialog.h:66: error: wrong number of template arguments (1, should be 2)
-/usr/local/include/qt5/QtCore/qcontainerfwd.h:46: error: provided for 'template class QMap'
-/wrkdirs/usr/ports/www/otter-browser/work/otter-browser-0.9.09/src/ui/CertificateDialog.h:66: error: default argument missing for parameter 4 of 'QStandardItem* Otter::CertificateDialog::createField(Otter::CertificateDialog::CertificateField, QStandardItem*, const QMap&, QVariant)'
-/wrkdirs/usr/ports/www/otter-browser/work/otter-browser-0.9.09/src/ui/CertificateDialog.cpp:388: error: prototype for 'QStandardItem* Otter::CertificateDialog::createField(Otter::CertificateDialog::CertificateField, QStandardItem*, const QMap&)' does not match any in class 'Otter::CertificateDialog'
-/wrkdirs/usr/ports/www/otter-browser/work/otter-browser-0.9.09/src/ui/CertificateDialog.h:66: error: candidate is: QStandardItem* Otter::CertificateDialog::createField(Otter::CertificateDialog::CertificateField, QStandardItem*, const QMap&, QVariant)
---- src/ui/CertificateDialog.h.orig 2016-01-11 10:50:08 UTC
-+++ src/ui/CertificateDialog.h
-@@ -63,7 +63,7 @@ public:
-
- protected:
- void changeEvent(QEvent *event);
-- QStandardItem* createField(CertificateField field, QStandardItem *parent = NULL, const QMap &data = QMap());
-+ QStandardItem* createField(CertificateField field, QStandardItem *parent = NULL, const QMap &data = (QMap()));
- QString formatHex(const QString &source, const QChar &separator = QLatin1Char(' '));
-
- protected slots:
diff --git a/www/otter-browser/pkg-plist b/www/otter-browser/pkg-plist
index cce7666daee..f9f6e891994 100644
--- a/www/otter-browser/pkg-plist
+++ b/www/otter-browser/pkg-plist
@@ -46,5 +46,6 @@ share/otter-browser/locale/otter-browser_sr@latin.qm
share/otter-browser/locale/otter-browser_sv.qm
share/otter-browser/locale/otter-browser_tr.qm
share/otter-browser/locale/otter-browser_uk.qm
+share/otter-browser/locale/otter-browser_yue.qm
share/otter-browser/locale/otter-browser_zh_CN.qm
share/otter-browser/locale/otter-browser_zh_TW.qm
diff --git a/www/p5-HTML-GoogleMaps/Makefile b/www/p5-HTML-GoogleMaps/Makefile
index 62f7c4df72c..331926a21af 100644
--- a/www/p5-HTML-GoogleMaps/Makefile
+++ b/www/p5-HTML-GoogleMaps/Makefile
@@ -8,7 +8,7 @@ CATEGORIES= www perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
-MAINTAINER= leeym@FreeBSD.org
+MAINTAINER= perl@FreeBSD.org
COMMENT= Simple wrapper around the Google Maps API
RUN_DEPENDS= p5-Geo-Coder-Google>=0.02:misc/p5-Geo-Coder-Google
diff --git a/www/p5-LWP-UserAgent-Determined/Makefile b/www/p5-LWP-UserAgent-Determined/Makefile
index 54d590bdf61..e790c435289 100644
--- a/www/p5-LWP-UserAgent-Determined/Makefile
+++ b/www/p5-LWP-UserAgent-Determined/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:ALEXMV
PKGNAMEPREFIX= p5-
-MAINTAINER= leeym@FreeBSD.org
+MAINTAINER= perl@FreeBSD.org
COMMENT= Virtual browser that retries errors
RUN_DEPENDS= p5-libwww>=0:www/p5-libwww
diff --git a/www/py-routes/Makefile b/www/py-routes/Makefile
index 964470f0a00..dfca5b700cf 100644
--- a/www/py-routes/Makefile
+++ b/www/py-routes/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= routes
-PORTVERSION= 2.3.1
-PORTREVISION= 1
+PORTVERSION= 2.4.1
CATEGORIES= www python
MASTER_SITES= CHEESESHOP/source/R/Routes
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/www/py-routes/distinfo b/www/py-routes/distinfo
index 6ac26c3f3b8..703caedc156 100644
--- a/www/py-routes/distinfo
+++ b/www/py-routes/distinfo
@@ -1,2 +1,3 @@
-SHA256 (Routes-2.3.1.tar.gz) = 98c380b5dc1190b873463be07383728ada18f66d2615531963004b9d6fb90351
-SIZE (Routes-2.3.1.tar.gz) = 181694
+TIMESTAMP = 1483406220
+SHA256 (Routes-2.4.1.tar.gz) = 26ee43340fca5a32769ffe0c58edcb396ccce6bc1dfa689ddf844d50877355fd
+SIZE (Routes-2.4.1.tar.gz) = 182403
diff --git a/www/redmine/Makefile b/www/redmine/Makefile
index 0d0e047028d..f7bb96e95c2 100644
--- a/www/redmine/Makefile
+++ b/www/redmine/Makefile
@@ -3,7 +3,7 @@
PORTNAME= redmine
PORTVERSION= 3.2.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= www
MASTER_SITES= http://www.redmine.org/releases/
@@ -28,7 +28,8 @@ RUN_DEPENDS= rubygem-bundler>=1.5.0:sysutils/rubygem-bundler \
rubygem-rbpdf>=1.19.0:print/rubygem-rbpdf \
rubygem-rake>=0:devel/rubygem-rake \
rubygem-ruby-openid>=2.3.0:net/rubygem-ruby-openid \
- rubygem-rack-openid>=0:www/rubygem-rack-openid
+ rubygem-rack-openid>=0:www/rubygem-rack-openid \
+ rubygem-net-ldap>=0.12.0:net/rubygem-net-ldap
NO_ARCH= yes
NO_BUILD= yes
@@ -54,12 +55,11 @@ PASSENGER_DESC= Use Apache/Nginx WEB server
MYSQL_DESC= MySQL database support (via mysql2 rubygem)
NO_OPTIONS_SORT= yes
-MYSQL_RUN_DEPENDS= rubygem-mysql2>=0.3.11:databases/rubygem-mysql2
+MYSQL_RUN_DEPENDS= rubygem-mysql2>=0.4.5:databases/rubygem-mysql2
PASSENGER_RUN_DEPENDS= passenger-config:www/rubygem-passenger
POSTGRESQL_RUN_DEPENDS= rubygem-pg>=0.18.1:databases/rubygem-pg
MARKDOWN_RUN_DEPENDS= rubygem-redcarpet>=3.3.2:textproc/rubygem-redcarpet
RMAGIC_RUN_DEPENDS= rubygem-rmagick>=2.14.0:graphics/rubygem-rmagick
-LDAP_RUN_DEPENDS= rubygem-net-ldap>=0.12.0:net/rubygem-net-ldap
THIN_RUN_DEPENDS= rubygem-thin>=1.6.2:www/rubygem-thin
THIN_SUB_LIST= WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
THIN_VARS= USE_RC_SUBR=redmine
diff --git a/www/redmine/files/mysql.rb b/www/redmine/files/mysql.rb
index 818abca39e5..ee5b60c2704 100644
--- a/www/redmine/files/mysql.rb
+++ b/www/redmine/files/mysql.rb
@@ -1 +1 @@
-gem "mysql2", "~> 0.3.11"
+gem "mysql2", "~> 0.4.5"
diff --git a/www/redmine/files/patch-Gemfile b/www/redmine/files/patch-Gemfile
index e104b617c4e..c31a21d675d 100644
--- a/www/redmine/files/patch-Gemfile
+++ b/www/redmine/files/patch-Gemfile
@@ -24,15 +24,14 @@
# Request at least rails-html-sanitizer 1.0.3 because of security advisories
gem "rails-html-sanitizer", ">= 1.0.3"
-@@ -26,29 +26,12 @@ gem "rails-html-sanitizer", ">= 1.0.3"
- gem 'tzinfo-data', platforms: [:mingw, :x64_mingw, :mswin, :jruby]
- gem "rbpdf", "~> 1.19.0"
+@@ -28,27 +28,15 @@ gem "rbpdf", "~> 1.19.0"
--# Optional gem for LDAP authentication
--group :ldap do
+ # Optional gem for LDAP authentication
+ group :ldap do
- gem "net-ldap", "~> 0.12.0"
--end
--
++ gem "net-ldap", "~> 0.15.0"
+ end
+
# Optional gem for OpenID authentication
group :openid do
- gem "ruby-openid", "~> 2.3.0", :require => "openid"
@@ -55,7 +54,13 @@
platforms :jruby do
# jruby-openssl is bundled with JRuby 1.7.0
gem "jruby-openssl" if Object.const_defined?(:JRUBY_VERSION) && JRUBY_VERSION < '1.7.0'
-@@ -72,7 +55,7 @@ if File.exist?(database_file)
+@@ -67,12 +55,12 @@ if File.exist?(database_file)
+ adapters.each do |adapter|
+ case adapter
+ when 'mysql2'
+- gem "mysql2", "~> 0.3.11", :platforms => [:mri, :mingw, :x64_mingw]
++ gem "mysql2", "~> 0.4.5", :platforms => [:mri, :mingw, :x64_mingw]
+ gem "activerecord-jdbcmysql-adapter", :platforms => :jruby
when 'mysql'
gem "activerecord-jdbcmysql-adapter", :platforms => :jruby
when /postgresql/
@@ -64,7 +69,7 @@
gem "activerecord-jdbcpostgresql-adapter", :platforms => :jruby
when /sqlite3/
gem "sqlite3", :platforms => [:mri, :mingw, :x64_mingw]
-@@ -92,21 +75,6 @@ else
+@@ -92,21 +80,6 @@ else
warn("Please configure your config/database.yml first")
end
@@ -86,7 +91,7 @@
local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local")
if File.exists?(local_gemfile)
eval_gemfile local_gemfile
-@@ -116,3 +84,7 @@ end
+@@ -116,3 +89,7 @@ end
Dir.glob File.expand_path("../plugins/*/{Gemfile,PluginGemfile}", __FILE__) do |file|
eval_gemfile file
end
diff --git a/www/rubygem-actionpack4/Makefile b/www/rubygem-actionpack4/Makefile
index 3df4aa43dcd..76d49936603 100644
--- a/www/rubygem-actionpack4/Makefile
+++ b/www/rubygem-actionpack4/Makefile
@@ -3,6 +3,7 @@
PORTNAME= actionpack
PORTVERSION= 4.2.7.1
+PORTREVISION= 1
CATEGORIES= www rubygems
MASTER_SITES= RG
PKGNAMESUFFIX= 4
@@ -17,7 +18,7 @@ RUN_DEPENDS= rubygem-actionview>=${PORTVERSION}:devel/rubygem-actionview \
rubygem-activesupport4>=${PORTVERSION}:devel/rubygem-activesupport4 \
rubygem-rack16>=1.6:www/rubygem-rack16 \
rubygem-rack-test>=0.6.2:www/rubygem-rack-test \
- rubygem-rails-dom-testing>=1.0.5:textproc/rubygem-rails-dom-testing \
+ rubygem-rails-dom-testing1>=1.0.5:textproc/rubygem-rails-dom-testing1 \
rubygem-rails-html-sanitizer>=1.0.2:textproc/rubygem-rails-html-sanitizer
NO_ARCH= yes
diff --git a/www/rubygem-d3_rails-rails4/Makefile b/www/rubygem-d3_rails-rails4/Makefile
index 8caa1791752..1dbc07277e0 100644
--- a/www/rubygem-d3_rails-rails4/Makefile
+++ b/www/rubygem-d3_rails-rails4/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= d3_rails
-PORTVERSION= 3.5.16
+PORTVERSION= 3.5.17
CATEGORIES= www rubygems
MASTER_SITES= RG
PKGNAMESUFFIX= -rails4
diff --git a/www/rubygem-d3_rails-rails4/distinfo b/www/rubygem-d3_rails-rails4/distinfo
index ce01066cf45..66f54983863 100644
--- a/www/rubygem-d3_rails-rails4/distinfo
+++ b/www/rubygem-d3_rails-rails4/distinfo
@@ -1,2 +1,3 @@
-SHA256 (rubygem/d3_rails-3.5.16.gem) = 617d2aca6138b9d99374cd87ee9b0658a782376f237e2805723dc68143fd0e0f
-SIZE (rubygem/d3_rails-3.5.16.gem) = 134656
+TIMESTAMP = 1483347507
+SHA256 (rubygem/d3_rails-3.5.17.gem) = c2e3ae9577cf890042c4d017ebce3ad7d913ad30b477af92de81564c6010f41e
+SIZE (rubygem/d3_rails-3.5.17.gem) = 134656
diff --git a/www/rubygem-d3_rails/Makefile b/www/rubygem-d3_rails/Makefile
index 34a4aabfe90..66f7aaf3be2 100644
--- a/www/rubygem-d3_rails/Makefile
+++ b/www/rubygem-d3_rails/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= d3_rails
-PORTVERSION= 3.5.16
+PORTVERSION= 4.1.1
CATEGORIES= www rubygems
MASTER_SITES= RG
@@ -11,7 +11,7 @@ COMMENT= JavaScript framework for data visualization
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/MIT_LICENSE
-RUN_DEPENDS= rubygem-railties4>=4.0:www/rubygem-railties4
+RUN_DEPENDS= rubygem-railties4>=3.1.0:www/rubygem-railties4
NO_ARCH= yes
USE_RUBY= yes
diff --git a/www/rubygem-d3_rails/distinfo b/www/rubygem-d3_rails/distinfo
index ce01066cf45..9e0fe0cf841 100644
--- a/www/rubygem-d3_rails/distinfo
+++ b/www/rubygem-d3_rails/distinfo
@@ -1,2 +1,3 @@
-SHA256 (rubygem/d3_rails-3.5.16.gem) = 617d2aca6138b9d99374cd87ee9b0658a782376f237e2805723dc68143fd0e0f
-SIZE (rubygem/d3_rails-3.5.16.gem) = 134656
+TIMESTAMP = 1483347150
+SHA256 (rubygem/d3_rails-4.1.1.gem) = 339d9357f8b34031fb793809778d0f109a334bd577fddf661436176635bb3aa2
+SIZE (rubygem/d3_rails-4.1.1.gem) = 134656
diff --git a/www/rubygem-kaminari/Makefile b/www/rubygem-kaminari/Makefile
index aa02a7301ce..0a25bfbca9d 100644
--- a/www/rubygem-kaminari/Makefile
+++ b/www/rubygem-kaminari/Makefile
@@ -2,24 +2,21 @@
# $FreeBSD$
PORTNAME= kaminari
-PORTVERSION= 0.16.3
+PORTVERSION= 0.17.0
CATEGORIES= www rubygems
MASTER_SITES= RG
MAINTAINER= ruby@FreeBSD.org
-COMMENT= Sophisticated paginator for Rails 3
+COMMENT= Sophisticated paginator for Rails 3+
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/MIT-LICENSE
-RUN_DEPENDS= rubygem-actionpack>=3.0.0:www/rubygem-actionpack \
- rubygem-activesupport>=3.0.0:devel/rubygem-activesupport
+RUN_DEPENDS= rubygem-actionpack4>=3.0.0:www/rubygem-actionpack4 \
+ rubygem-activesupport4>=3.0.0:devel/rubygem-activesupport4
NO_ARCH= yes
USE_RUBY= yes
USES= gem
-DEPRECATED= Depends on deprecated www/rubygem-actionpack
-EXPIRATION_DATE= 2017-01-07
-
.include
diff --git a/www/rubygem-kaminari/distinfo b/www/rubygem-kaminari/distinfo
index 5b9ff9545a3..3df83521e6f 100644
--- a/www/rubygem-kaminari/distinfo
+++ b/www/rubygem-kaminari/distinfo
@@ -1,2 +1,3 @@
-SHA256 (rubygem/kaminari-0.16.3.gem) = c75072e46983598423564906ba72e9d66bc8c52e393f63a7d89450addf1c7d93
-SIZE (rubygem/kaminari-0.16.3.gem) = 44544
+TIMESTAMP = 1483343829
+SHA256 (rubygem/kaminari-0.17.0.gem) = a454751345be68207bfc415fa2499f4ae9a33171055f3a1de17590a0a01c06d8
+SIZE (rubygem/kaminari-0.17.0.gem) = 44544
diff --git a/www/rubygem-kensa/Makefile b/www/rubygem-kensa/Makefile
index c3f3e613413..8e0393320c8 100644
--- a/www/rubygem-kensa/Makefile
+++ b/www/rubygem-kensa/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= kensa
-PORTVERSION= 2.0.2
+PORTVERSION= 3.0.2
PORTREVISION= 1
CATEGORIES= www rubygems
MASTER_SITES= RG
@@ -10,6 +10,13 @@ MAINTAINER= ruby@FreeBSD.org
COMMENT= Heroku Add-On provider tool
LICENSE= MIT
+LICENSE_FILE= ${WRKSRC}/LICENSE
+
+RUN_DEPENDS= rubygem-colored>=1.2:textproc/rubygem-colored \
+ rubygem-launchy22>=2.2.0:devel/rubygem-launchy22 \
+ rubygem-mechanize>=2.7.5:www/rubygem-mechanize \
+ rubygem-netrc>=0.10.3:net/rubygem-netrc \
+ rubygem-rest-client>=1.8:www/rubygem-rest-client
NO_ARCH= yes
USE_RUBY= yes
@@ -17,18 +24,4 @@ USES= gem
PLIST_FILES= bin/kensa
-RUN_DEPENDS+= rubygem-launchy22>=0:devel/rubygem-launchy22 \
- rubygem-mechanize26>=0:www/rubygem-mechanize26 \
- rubygem-rest-client>=0:www/rubygem-rest-client \
- rubygem-term-ansicolor>=0:devel/rubygem-term-ansicolor \
- rubygem-sinatra>=1.4.2:www/rubygem-sinatra \
- rubygem-foreman>=0.63:devel/rubygem-foreman \
- rubygem-bundler>=0:sysutils/rubygem-bundler \
- rubygem-thin>=0:www/rubygem-thin \
- rubygem-tilt1>=1.4.1:devel/rubygem-tilt1 \
- rubygem-haml>=4.0.5:www/rubygem-haml \
- rubygem-heroku-nav>=0.2.2:www/rubygem-heroku-nav \
- rubygem-json>=1.8.1:devel/rubygem-json
-
-
.include
diff --git a/www/rubygem-kensa/distinfo b/www/rubygem-kensa/distinfo
index a9cc1e525bd..06be4744695 100644
--- a/www/rubygem-kensa/distinfo
+++ b/www/rubygem-kensa/distinfo
@@ -1,2 +1,3 @@
-SHA256 (rubygem/kensa-2.0.2.gem) = 6ede2de00eeb36f3a16b689c4373d96bd114b34426946b780e4b1f28c5a6932c
-SIZE (rubygem/kensa-2.0.2.gem) = 29184
+TIMESTAMP = 1483349561
+SHA256 (rubygem/kensa-3.0.2.gem) = c3f422c5c1e434816c63679f92d228921883053fd8d8ccc4093a1f0719bdef44
+SIZE (rubygem/kensa-3.0.2.gem) = 29696
diff --git a/www/rubygem-kensa/files/patch-gemspec b/www/rubygem-kensa/files/patch-gemspec
index 7a33874cbf1..5240fbea8db 100644
--- a/www/rubygem-kensa/files/patch-gemspec
+++ b/www/rubygem-kensa/files/patch-gemspec
@@ -1,11 +1,11 @@
---- kensa.gemspec.orig 2016-03-31 20:32:50 UTC
+--- kensa.gemspec.orig 2017-01-02 09:03:16 UTC
+++ kensa.gemspec
@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
s.add_runtime_dependency(%q.freeze, ["~> 2.2.0"])
- s.add_runtime_dependency(%q.freeze, ["~> 2.6.0"])
-- s.add_runtime_dependency(%q.freeze, ["< 1.7.0", "~> 1.4"])
-+ s.add_runtime_dependency(%q.freeze, [">= 1.4"])
- s.add_runtime_dependency(%q.freeze, ["~> 1.3"])
+ s.add_runtime_dependency(%q.freeze, ["~> 2.7.5"])
+- s.add_runtime_dependency(%q.freeze, ["~> 0.10.3"])
++ s.add_runtime_dependency(%q.freeze, [">= 0.10.3"])
+ s.add_runtime_dependency(%q.freeze, ["~> 1.8"])
+ s.add_runtime_dependency(%q.freeze, ["~> 1.2"])
s.add_development_dependency(%q.freeze, ["~> 0.6"])
- s.add_development_dependency(%q.freeze, ["~> 0.1.3"])
diff --git a/www/rubygem-webmock/Makefile b/www/rubygem-webmock/Makefile
index ab0dabb901f..ed3a50e1ef7 100644
--- a/www/rubygem-webmock/Makefile
+++ b/www/rubygem-webmock/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= webmock
-PORTVERSION= 2.3.1
+PORTVERSION= 2.3.2
CATEGORIES= www rubygems
MASTER_SITES= RG
diff --git a/www/rubygem-webmock/distinfo b/www/rubygem-webmock/distinfo
index 3c70989e3c1..d5601af10a4 100644
--- a/www/rubygem-webmock/distinfo
+++ b/www/rubygem-webmock/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1482936241
-SHA256 (rubygem/webmock-2.3.1.gem) = de4c7b571a858110a47fb471dc3964af08ceb73c4303df83a1a51df3a72041a0
-SIZE (rubygem/webmock-2.3.1.gem) = 111616
+TIMESTAMP = 1483347681
+SHA256 (rubygem/webmock-2.3.2.gem) = c5339ec35be0e119fd928b453a1b8def6e3210b33ade33c443d7ba5535661312
+SIZE (rubygem/webmock-2.3.2.gem) = 112128
diff --git a/x11-fm/deforaos-browser/Makefile b/x11-fm/deforaos-browser/Makefile
index 37d78346575..c35a888e4f9 100644
--- a/x11-fm/deforaos-browser/Makefile
+++ b/x11-fm/deforaos-browser/Makefile
@@ -2,10 +2,9 @@
# $FreeBSD$
PORTNAME= deforaos-browser
-PORTVERSION= 0.5.0
-PORTREVISION= 1
+PORTVERSION= 0.5.1
CATEGORIES= x11-fm
-MASTER_SITES= http://www.defora.org/os/download/download/4418/
+MASTER_SITES= http://www.defora.org/os/download/download/4442/
DISTNAME= Browser-${PORTVERSION}
MAINTAINER= olivier@FreeBSD.org
@@ -16,6 +15,8 @@ LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libSystem.so:devel/deforaos-libsystem \
libDesktop.so:x11/deforaos-libdesktop \
+ libfontconfig.so:x11-fonts/fontconfig \
+ libfreetype.so:print/freetype2 \
libXrandr.so:x11/libXrandr
OPTIONS_DEFINE= DOCS NLS
@@ -24,7 +25,8 @@ NLS_USES= gettext
DOCS_BUILD_DEPENDS= xsltproc:textproc/libxslt \
${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl
-USE_GNOME= gtk20
+USE_GNOME= gtk20 cairo
+USE_XORG= x11
USES= desktop-file-utils pkgconfig
USE_LDCONFIG= yes
INSTALLS_ICONS= yes
diff --git a/x11-fm/deforaos-browser/distinfo b/x11-fm/deforaos-browser/distinfo
index 954a16b90c1..febb7babcd4 100644
--- a/x11-fm/deforaos-browser/distinfo
+++ b/x11-fm/deforaos-browser/distinfo
@@ -1,2 +1,3 @@
-SHA256 (Browser-0.5.0.tar.gz) = 188181174c25a417f2678de245a4a38489ee0cc43505375005e6f650cd2949e1
-SIZE (Browser-0.5.0.tar.gz) = 160871
+TIMESTAMP = 1475616938
+SHA256 (Browser-0.5.1.tar.gz) = d2560e0ac7f97f12055e758cb82f861d9661dd8757e4790c40c1a904c0cbf41a
+SIZE (Browser-0.5.1.tar.gz) = 155403
diff --git a/x11-fm/deforaos-browser/files/patch-doc__Makefile b/x11-fm/deforaos-browser/files/patch-doc_Makefile
similarity index 53%
rename from x11-fm/deforaos-browser/files/patch-doc__Makefile
rename to x11-fm/deforaos-browser/files/patch-doc_Makefile
index fe72a3f46cc..9d8d0fe63c4 100644
--- a/x11-fm/deforaos-browser/files/patch-doc__Makefile
+++ b/x11-fm/deforaos-browser/files/patch-doc_Makefile
@@ -1,35 +1,12 @@
---- doc/Makefile.orig 2016-03-01 12:30:35.743108000 +0100
-+++ doc/Makefile 2016-03-01 12:32:36.527634000 +0100
+--- doc/Makefile.orig 2016-10-05 08:10:40 UTC
++++ doc/Makefile
@@ -1,4 +1,4 @@
--TARGETS = $(OBJDIR)browser.1 $(OBJDIR)browser.html $(OBJDIR)copy.1 $(OBJDIR)copy.html $(OBJDIR)delete.1 $(OBJDIR)delete.html $(OBJDIR)desktop.1 $(OBJDIR)desktop.html $(OBJDIR)desktopctl.1 $(OBJDIR)desktopctl.html $(OBJDIR)move.1 $(OBJDIR)move.html $(OBJDIR)open.1 $(OBJDIR)open.html $(OBJDIR)properties.1 $(OBJDIR)properties.html $(OBJDIR)view.1 $(OBJDIR)view.html
-+TARGETS = $(OBJDIR)browser.1 $(OBJDIR)copy.1 $(OBJDIR)delete.1 $(OBJDIR)desktop.1 $(OBJDIR)desktopctl.1 $(OBJDIR)move.1 $(OBJDIR)open.1 $(OBJDIR)properties.1 $(OBJDIR)view.1
+-TARGETS = $(OBJDIR)browser.1 $(OBJDIR)browser.html $(OBJDIR)browser.xml $(OBJDIR)copy.1 $(OBJDIR)copy.html $(OBJDIR)copy.xml $(OBJDIR)delete.1 $(OBJDIR)delete.html $(OBJDIR)delete.xml $(OBJDIR)desktop.1 $(OBJDIR)desktop.html $(OBJDIR)desktop.xml $(OBJDIR)desktopctl.1 $(OBJDIR)desktopctl.html $(OBJDIR)desktopctl.xml $(OBJDIR)move.1 $(OBJDIR)move.html $(OBJDIR)move.xml $(OBJDIR)open.1 $(OBJDIR)open.html $(OBJDIR)open.xml $(OBJDIR)properties.1 $(OBJDIR)properties.html $(OBJDIR)properties.xml $(OBJDIR)view.1 $(OBJDIR)view.html $(OBJDIR)view.xml
++TARGETS = $(OBJDIR)browser.1 $(OBJDIR)browser.xml $(OBJDIR)copy.1 $(OBJDIR)copy.xml $(OBJDIR)delete.1 $(OBJDIR)delete.xml $(OBJDIR)desktop.1 $(OBJDIR)desktop.xml $(OBJDIR)desktopctl.1 $(OBJDIR)desktopctl.xml $(OBJDIR)move.1 $(OBJDIR)move.xml $(OBJDIR)open.1 $(OBJDIR)open.xml $(OBJDIR)properties.1 $(OBJDIR)properties.xml $(OBJDIR)view.1 $(OBJDIR)view.xml
OBJDIR =
PREFIX = /usr/local
DESTDIR =
-@@ -67,65 +67,38 @@
- clean:
- $(RM) -- $(browser.1_OBJS) $(browser.html_OBJS) $(copy.1_OBJS) $(copy.html_OBJS) $(delete.1_OBJS) $(delete.html_OBJS) $(desktop.1_OBJS) $(desktop.html_OBJS) $(desktopctl.1_OBJS) $(desktopctl.html_OBJS) $(move.1_OBJS) $(move.html_OBJS) $(open.1_OBJS) $(open.html_OBJS) $(properties.1_OBJS) $(properties.html_OBJS) $(view.1_OBJS) $(view.html_OBJS)
- ./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)browser.1"
-- ./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)browser.html"
- ./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)copy.1"
-- ./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)copy.html"
- ./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)delete.1"
-- ./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)delete.html"
- ./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)desktop.1"
-- ./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)desktop.html"
- ./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)desktopctl.1"
-- ./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)desktopctl.html"
- ./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)move.1"
-- ./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)move.html"
- ./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)open.1"
-- ./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)open.html"
- ./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)properties.1"
-- ./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)properties.html"
- ./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)view.1"
-- ./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)view.html"
-
- distclean: clean
- $(RM) -- $(TARGETS)
+@@ -126,42 +126,24 @@ distclean: clean
install: $(TARGETS)
./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)browser.1"
diff --git a/x11-toolkits/p5-Tk-ToolBar/Makefile b/x11-toolkits/p5-Tk-ToolBar/Makefile
index d8468c62e59..aab9d2641e9 100644
--- a/x11-toolkits/p5-Tk-ToolBar/Makefile
+++ b/x11-toolkits/p5-Tk-ToolBar/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= Tk-ToolBar
-PORTVERSION= 0.10
-PORTREVISION= 3
+PORTVERSION= 0.12
CATEGORIES= x11-toolkits tk perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
@@ -14,12 +13,12 @@ COMMENT= Toolbar widget for Perl/Tk
LICENSE= ART10 GPLv1
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Tk-CursorControl>=0:x11-toolkits/p5-Tk-CursorControl
+BUILD_DEPENDS= p5-Tk>=0:x11-toolkits/p5-Tk
RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Pod>=1.14:devel/p5-Test-Pod
NO_ARCH= yes
USE_PERL5= configure
-USES= perl5 zip
+USES= perl5
.include
diff --git a/x11-toolkits/p5-Tk-ToolBar/distinfo b/x11-toolkits/p5-Tk-ToolBar/distinfo
index 867c0b36bf5..67dabdf7c60 100644
--- a/x11-toolkits/p5-Tk-ToolBar/distinfo
+++ b/x11-toolkits/p5-Tk-ToolBar/distinfo
@@ -1,2 +1,3 @@
-SHA256 (Tk-ToolBar-0.10.zip) = 333fe56b163632360d08d13db9b726378b011b79f7fde79b5f93ba3aaffc8ac1
-SIZE (Tk-ToolBar-0.10.zip) = 64121
+TIMESTAMP = 1483253163
+SHA256 (Tk-ToolBar-0.12.tar.gz) = 463e284ec47137e7c425c9691b02a8dec5ce272b58ea1f6359ae8041a239dd0f
+SIZE (Tk-ToolBar-0.12.tar.gz) = 60682
diff --git a/x11/deforaos-keyboard/Makefile b/x11/deforaos-keyboard/Makefile
index 59a2b951d37..dabec6be320 100644
--- a/x11/deforaos-keyboard/Makefile
+++ b/x11/deforaos-keyboard/Makefile
@@ -2,23 +2,46 @@
# $FreeBSD$
PORTNAME= keyboard
-PORTVERSION= 0.2.1
-PORTREVISION= 3
+PORTVERSION= 0.3.1
CATEGORIES= x11
-MASTER_SITES= http://www.defora.org/os/download/download/3696/
+MASTER_SITES= http://www.defora.org/os/download/download/4453/
PKGNAMEPREFIX= deforaos-
DISTNAME= Keyboard-${PORTVERSION}
MAINTAINER= olivier@FreeBSD.org
-COMMENT= DeforaOS desktop virtual keyboardr
+COMMENT= DeforaOS desktop virtual keyboard
LICENSE= GPLv3
+LICENSE_FILE= ${WRKSRC}/COPYING
-LIB_DEPENDS= libDesktop.so:x11/deforaos-libdesktop
+LIB_DEPENDS= libDesktop.so:x11/deforaos-libdesktop \
+ libSystem.so:devel/deforaos-libsystem \
+ libfontconfig.so:x11-fonts/fontconfig \
+ libfreetype.so:print/freetype2
-USE_GNOME= gtk20
-USES= desktop-file-utils gettext pkgconfig
-USE_XORG= xtst
+USE_GNOME= gtk20 cairo gdkpixbuf2
+USES= desktop-file-utils pkgconfig
+USE_XORG= x11 xtst
MAKE_ARGS+= PREFIX=${PREFIX}
+OPTIONS_DEFINE= DOCS NLS
+OPTIONS_SUB= yes
+NLS_USES= gettext
+
+DOCS_BUILD_DEPENDS= xsltproc:textproc/libxslt \
+ ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl
+
+post-patch-DOCS-off:
+ ${REINPLACE_CMD} 's|data doc include|data include|' \
+ ${WRKSRC}/Makefile
+
+post-patch-NLS-off:
+ ${REINPLACE_CMD} 's|include po src|include src|' \
+ ${WRKSRC}/Makefile
+
+post-install:
+ ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/keyboardctl \
+ ${STAGEDIR}${PREFIX}/bin/keyboard \
+ ${STAGEDIR}${PREFIX}/lib/Desktop/widget/keyboard.so
+
.include
diff --git a/x11/deforaos-keyboard/distinfo b/x11/deforaos-keyboard/distinfo
index e532ff6101b..b2383e75b16 100644
--- a/x11/deforaos-keyboard/distinfo
+++ b/x11/deforaos-keyboard/distinfo
@@ -1,2 +1,3 @@
-SHA256 (Keyboard-0.2.1.tar.gz) = 96a2b6d1180c2d82d31a839cd616173a03529a6d795512af50cebbe3ac16bda2
-SIZE (Keyboard-0.2.1.tar.gz) = 29127
+TIMESTAMP = 1475616754
+SHA256 (Keyboard-0.3.1.tar.gz) = 259dfdaf09d5450b9f5406eaea68c1f42f762edccb8c5bfbbfc2f6dd905fa045
+SIZE (Keyboard-0.3.1.tar.gz) = 20251
diff --git a/x11/deforaos-keyboard/files/patch-keyboard.c.diff b/x11/deforaos-keyboard/files/patch-keyboard.c.diff
deleted file mode 100644
index 81cc847fad2..00000000000
--- a/x11/deforaos-keyboard/files/patch-keyboard.c.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/keyboard.c.orig 2013-10-30 12:04:38.512854430 +0100
-+++ src/keyboard.c 2013-10-30 12:04:53.198851447 +0100
-@@ -437,7 +437,7 @@
- keyboard_set_layout(keyboard, KLS_LETTERS);
- pango_font_description_free(bold);
- /* messages */
-- desktop_message_register(KEYBOARD_CLIENT_MESSAGE, on_keyboard_message,
-+ desktop_message_register(keyboard->window,KEYBOARD_CLIENT_MESSAGE, on_keyboard_message,
- keyboard);
- return keyboard;
- }
diff --git a/x11/deforaos-keyboard/pkg-plist b/x11/deforaos-keyboard/pkg-plist
index 1d466e2bc65..dad4bb6baa5 100644
--- a/x11/deforaos-keyboard/pkg-plist
+++ b/x11/deforaos-keyboard/pkg-plist
@@ -1,5 +1,9 @@
bin/keyboardctl
+lib/Desktop/widget/keyboard.so
bin/keyboard
include/Desktop/Keyboard.h
-share/applications/keyboard.desktop
-share/locale/fr/LC_MESSAGES/Keyboard.mo
+share/applications/deforaos-keyboard.desktop
+%%NLS%%share/locale/fr/LC_MESSAGES/Keyboard.mo
+%%NLS%%share/locale/es/LC_MESSAGES/Keyboard.mo
+%%PORTDOCS%%share/doc/Keyboard/README.md
+
diff --git a/x11/deforaos-libdesktop/Makefile b/x11/deforaos-libdesktop/Makefile
index a70591fd232..7a23ef44b21 100644
--- a/x11/deforaos-libdesktop/Makefile
+++ b/x11/deforaos-libdesktop/Makefile
@@ -2,10 +2,9 @@
# $FreeBSD$
PORTNAME= libdesktop
-PORTVERSION= 0.2.1
-PORTREVISION= 1
+PORTVERSION= 0.2.2
CATEGORIES= x11
-MASTER_SITES= http://www.defora.org/os/download/download/4394/
+MASTER_SITES= http://www.defora.org/os/download/download/4447/
PKGNAMEPREFIX= deforaos-
DISTNAME= libDesktop-${PORTVERSION}
@@ -24,9 +23,9 @@ MAKE_ARGS+= PREFIX=${PREFIX}
MAKE_ENV+= MANDIR=${STAGEDIR}${MANPREFIX}/man
MAKE_JOBS_UNSAFE= yes
-OPTIONS_DEFINE= DOCS
+OPTIONS_DEFINE= DOCS
-DOCS_BUILD_DEPENDS= xsltproc:textproc/libxslt \
+DOCS_BUILD_DEPENDS= xsltproc:textproc/libxslt \
${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl \
gtkdoc-check:textproc/gtk-doc
@@ -34,6 +33,7 @@ post-patch:
${REINPLACE_CMD} -e 's|/lib/|/libdata/|g' \
${WRKSRC}/data/pkgconfig.sh
${REINPLACE_CMD} 's|-Wl,-pie||g' ${WRKSRC}/tools/Makefile
+ ${REINPLACE_CMD} -e '/^SUBDIRS/ s|tests||' ${WRKSRC}/Makefile
${REINPLACE_CMD} -e 's|./docbook.sh -P "$$(DESTDIR)$$(PREFIX)" -i -- "$$(OBJDIR)widget.html"| \
#./docbook.sh -P "$$(DESTDIR)$$(PREFIX)" -i -- "$$(OBJDIR)widget.html"|' \
${WRKSRC}/doc/Makefile
diff --git a/x11/deforaos-libdesktop/distinfo b/x11/deforaos-libdesktop/distinfo
index 3ca58771066..aab1b8d4892 100644
--- a/x11/deforaos-libdesktop/distinfo
+++ b/x11/deforaos-libdesktop/distinfo
@@ -1,2 +1,3 @@
-SHA256 (libDesktop-0.2.1.tar.gz) = 466e8e92f4371ea90b653f6018ea57ad5622d1d9021a327228b3a6a2d8e79466
-SIZE (libDesktop-0.2.1.tar.gz) = 22801
+TIMESTAMP = 1475616514
+SHA256 (libDesktop-0.2.2.tar.gz) = c49edf03ffdd0d4f39de5c4c22acbece7ad25440a027480bba82a3f6318459e2
+SIZE (libDesktop-0.2.2.tar.gz) = 23947
diff --git a/x11/deforaos-libdesktop/files/patch-include_Desktop_compat.h b/x11/deforaos-libdesktop/files/patch-include_Desktop_compat.h
deleted file mode 100644
index 3e0cd4e55ff..00000000000
--- a/x11/deforaos-libdesktop/files/patch-include_Desktop_compat.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/Desktop/compat.h.orig 2016-03-06 06:55:36 UTC
-+++ include/Desktop/compat.h
-@@ -103,7 +103,7 @@
- # endif
-
- /* Gtk+ 3.0 */
--# if GTK_CHECK_VERSION(3, 0, 0)
-+# if !GTK_CHECK_VERSION(3, 0, 0)
- void gdk_window_clear(GdkWindow * window);
-
- GtkWidget * gtk_box_new(GtkOrientation orientation, gint spacing);
diff --git a/x11/deforaos-locker/Makefile b/x11/deforaos-locker/Makefile
index 176b1495cc0..469a59c31fc 100644
--- a/x11/deforaos-locker/Makefile
+++ b/x11/deforaos-locker/Makefile
@@ -2,10 +2,9 @@
# $FreeBSD$
PORTNAME= locker
-PORTVERSION= 0.2.1
-PORTREVISION= 2
+PORTVERSION= 0.4.0
CATEGORIES= x11
-MASTER_SITES= http://www.defora.org/os/download/download/3703/
+MASTER_SITES= http://www.defora.org/os/download/download/4424/
PKGNAMEPREFIX= deforaos-
DISTNAME= Locker-${PORTVERSION}
@@ -13,20 +12,47 @@ MAINTAINER= olivier@FreeBSD.org
COMMENT= DeforaOS desktop screensaver
LICENSE= GPLv3
+LICENSE_FILE= ${WRKSRC}/COPYING
-DEPRECATED= Depends on broken and expiring x11/deforaos-panel
-EXPIRATION_DATE= 2016-11-01
+LIB_DEPENDS= libDesktop.so:x11/deforaos-libdesktop \
+ libSystem.so:devel/deforaos-libsystem \
+ libfontconfig.so:x11-fonts/fontconfig \
+ libfreetype.so:print/freetype2 \
+ libXss.so:x11/libXScrnSaver
-LIB_DEPENDS= libSystem.so:devel/deforaos-libsystem \
- libDesktop.so:x11/deforaos-libdesktop \
- libXss.so:x11/libXScrnSaver
-BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/Panel.pc:x11/deforaos-panel \
- xsltproc:textproc/libxslt \
- ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl
+BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/Panel.pc:x11/deforaos-panel
-USE_GNOME= gtk20
-USES= desktop-file-utils gettext pkgconfig
+USE_GNOME= gtk20 cairo gdkpixbuf2
+USE_XORG= x11 xext
+USES= desktop-file-utils pkgconfig
MAKE_ARGS+= PREFIX=${PREFIX}
MAKE_ENV+= MANDIR=${STAGEDIR}${MANPREFIX}/man
+LDFLAGS+= -lXext
+
+OPTIONS_DEFINE= DOCS NLS
+OPTIONS_SUB= yes
+NLS_USES= gettext
+DOCS_BUILD_DEPENDS= xsltproc:textproc/libxslt \
+ ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl
+
+post-patch:
+ ${REINPLACE_CMD} 's|-Wl,-pie||g' \
+ ${WRKSRC}/tests/Makefile \
+ ${WRKSRC}/tools/Makefile \
+ ${WRKSRC}/src/Makefile
+
+post-patch-DOCS-off:
+ ${REINPLACE_CMD} 's|data doc include|data include|' \
+ ${WRKSRC}/Makefile
+
+post-patch-NLS-off:
+ ${REINPLACE_CMD} 's|include po src|include src|' \
+ ${WRKSRC}/Makefile
+
+post-install:
+ ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/* \
+ ${STAGEDIR}${PREFIX}/lib/Locker/auth/* \
+ ${STAGEDIR}${PREFIX}/lib/Locker/plugins/* \
+ ${STAGEDIR}${PREFIX}/lib/Locker/demos/*
.include
diff --git a/x11/deforaos-locker/distinfo b/x11/deforaos-locker/distinfo
index fc00e2a1ca4..ceb9764b03c 100644
--- a/x11/deforaos-locker/distinfo
+++ b/x11/deforaos-locker/distinfo
@@ -1,2 +1,3 @@
-SHA256 (Locker-0.2.1.tar.gz) = 6df132143b9efea2af85ce64dde3f8a8fb40bc041eedf441257c6f66a5e5e4a3
-SIZE (Locker-0.2.1.tar.gz) = 49812
+TIMESTAMP = 1483369725
+SHA256 (Locker-0.4.0.tar.gz) = 286aec05034add8b364a33ddc5fed72de7e7aca00d64d1ec686bb628e9e6f3b3
+SIZE (Locker-0.4.0.tar.gz) = 62105
diff --git a/x11/deforaos-locker/files/patch-doc_Makefile b/x11/deforaos-locker/files/patch-doc_Makefile
new file mode 100644
index 00000000000..f3a339929ec
--- /dev/null
+++ b/x11/deforaos-locker/files/patch-doc_Makefile
@@ -0,0 +1,34 @@
+--- doc/Makefile.orig 2016-02-20 13:12:47 UTC
++++ doc/Makefile
+@@ -1,4 +1,4 @@
+-TARGETS = $(OBJDIR)index.html $(OBJDIR)locker.1 $(OBJDIR)locker.html $(OBJDIR)lockerctl.1 $(OBJDIR)lockerctl.html
++TARGETS = $(OBJDIR)locker.1 $(OBJDIR)lockerctl.1
+ OBJDIR =
+ PREFIX = /usr/local
+ DESTDIR =
+@@ -27,25 +27,18 @@ $(OBJDIR)lockerctl.html: lockerctl.css.x
+
+ clean:
+ $(RM) -- $(index.html_OBJS) $(locker.1_OBJS) $(locker.html_OBJS) $(lockerctl.1_OBJS) $(lockerctl.html_OBJS)
+- ./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)index.html"
+ ./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)locker.1"
+- ./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)locker.html"
+ ./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)lockerctl.1"
+- ./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)lockerctl.html"
+
+ distclean: clean
+ $(RM) -- $(TARGETS)
+
+ install: $(TARGETS)
+ ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)locker.1"
+- ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)locker.html"
+ ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)lockerctl.1"
+- ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)lockerctl.html"
+
+ uninstall:
+ ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "locker.1"
+- ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "locker.html"
+ ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "lockerctl.1"
+- ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "lockerctl.html"
+
+ .PHONY: all clean distclean install uninstall
diff --git a/x11/deforaos-locker/files/patch-doc__Makefile b/x11/deforaos-locker/files/patch-doc__Makefile
deleted file mode 100644
index dfa4941cc27..00000000000
--- a/x11/deforaos-locker/files/patch-doc__Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
---- ./doc/Makefile.orig 2012-10-14 18:56:53.000000000 +0200
-+++ ./doc/Makefile 2012-12-19 13:06:45.711358747 +0100
-@@ -1,4 +1,4 @@
--TARGETS = locker.1 locker.html lockerctl.1 lockerctl.html
-+TARGETS = locker.1 lockerctl.1
- PREFIX = /usr/local
- DESTDIR =
- RM ?= rm -f
-@@ -29,9 +29,7 @@
-
- install: $(TARGETS)
- ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "locker.1"
-- ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "locker.html"
- ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "lockerctl.1"
-- ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "lockerctl.html"
-
- uninstall:
- ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "locker.1"
diff --git a/x11/deforaos-locker/files/patch-locker.c.diff b/x11/deforaos-locker/files/patch-locker.c.diff
deleted file mode 100644
index c4119610f9e..00000000000
--- a/x11/deforaos-locker/files/patch-locker.c.diff
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/locker.c.orig 2013-11-03 22:28:05.640455922 +0100
-+++ src/locker.c 2013-11-03 22:30:35.005447608 +0100
-@@ -268,8 +268,10 @@
- GDK_WINDOW_XID(root), ScreenSaverNotifyMask);
- gdk_x11_register_standard_event_type(locker->display, locker->event, 1);
- gdk_window_add_filter(root, _locker_on_filter, locker);
-- desktop_message_register(LOCKER_CLIENT_MESSAGE, _locker_on_message,
-- locker);
-+ /* listen to desktop messages */
-+ gtk_widget_realize(locker->windows[0]);
-+ desktop_message_register(locker->windows[0], LOCKER_CLIENT_MESSAGE,
-+ _locker_on_message, locker);
- return locker;
- }
-
diff --git a/x11/deforaos-locker/files/patch-src_Makefile b/x11/deforaos-locker/files/patch-src_Makefile
new file mode 100644
index 00000000000..8b2212b335f
--- /dev/null
+++ b/x11/deforaos-locker/files/patch-src_Makefile
@@ -0,0 +1,11 @@
+--- src/Makefile.orig 2016-02-20 13:12:47 UTC
++++ src/Makefile
+@@ -30,7 +30,7 @@ subdirs:
+
+ locker_OBJS = $(OBJDIR)locker.o $(OBJDIR)main.o
+ locker_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS) `pkg-config --cflags x11 xscrnsaver`
+-locker_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) `pkg-config --libs x11 xscrnsaver`
++locker_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) -lXext `pkg-config --libs x11 xscrnsaver`
+
+ $(OBJDIR)locker$(EXEEXT): $(locker_OBJS)
+ $(CC) -o $(OBJDIR)locker$(EXEEXT) $(locker_OBJS) $(locker_LDFLAGS)
diff --git a/x11/deforaos-locker/pkg-plist b/x11/deforaos-locker/pkg-plist
index da1aefe3e32..3c2e562a082 100644
--- a/x11/deforaos-locker/pkg-plist
+++ b/x11/deforaos-locker/pkg-plist
@@ -7,15 +7,16 @@ include/Desktop/Locker/locker.h
include/Desktop/Locker/plugin.h
lib/Locker/auth/password.so
lib/Locker/auth/slider.so
+lib/Locker/demos/colors.so
lib/Locker/demos/gtk-demo.so
lib/Locker/demos/logo.so
lib/Locker/demos/xscreensaver.so
lib/Locker/demos/xterm.so
lib/Locker/plugins/openmoko.so
-lib/Locker/plugins/panel.so
lib/Locker/plugins/suspend.so
lib/Locker/plugins/systray.so
-man/man1/locker.1.gz
-man/man1/lockerctl.1.gz
-share/applications/locker-settings.desktop
-share/locale/fr/LC_MESSAGES/Locker.mo
+%%PORTDOCS%%man/man1/locker.1.gz
+%%PORTDOCS%%man/man1/lockerctl.1.gz
+share/applications/deforaos-locker-settings.desktop
+%%NLS%%share/locale/fr/LC_MESSAGES/Locker.mo
+%%NLS%%share/locale/es/LC_MESSAGES/Locker.mo
diff --git a/x11/deforaos-panel/Makefile b/x11/deforaos-panel/Makefile
index 8b2fbf74923..469bc53b788 100644
--- a/x11/deforaos-panel/Makefile
+++ b/x11/deforaos-panel/Makefile
@@ -2,45 +2,58 @@
# $FreeBSD$
PORTNAME= deforaos-panel
-PORTVERSION= 0.3.1
+PORTVERSION= 0.3.6
PORTREVISION= 1
CATEGORIES= x11
-MASTER_SITES= http://www.defora.org/os/download/download/4338/
+MASTER_SITES= http://www.defora.org/os/download/download/4417/
DISTNAME= Panel-${PORTVERSION}
MAINTAINER= olivier@FreeBSD.org
COMMENT= DeforaOS desktop panel
LICENSE= GPLv3
+LICENSE_FILE= ${WRKSRC}/COPYING
-BROKEN= fails to build
-DEPRECATED= Broken for more than 6 months
-EXPIRATION_DATE= 2016-11-01
-
-LIB_DEPENDS= libSystem.so:devel/deforaos-libsystem \
- libDesktop.so:x11/deforaos-libdesktop
-BUILD_DEPENDS= browser:x11-fm/deforaos-browser \
- ${LOCALBASE}/include/Desktop/Keyboard.h:x11/deforaos-keyboard \
- ${LOCALBASE}/include/Desktop/Player.h:multimedia/deforaos-player \
- xsltproc:textproc/libxslt \
- docbook-xsl>=0:textproc/docbook-xsl
-RUN_DEPENDS= keyboard:x11/deforaos-keyboard \
- ${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:misc/gnome-icon-theme \
+LIB_DEPENDS= libDesktop.so:x11/deforaos-libdesktop \
+ libSystem.so:devel/deforaos-libsystem \
+ libfontconfig.so:x11-fonts/fontconfig \
+ libfreetype.so:print/freetype2
+BUILD_DEPENDS= browser:x11-fm/deforaos-browser
+RUN_DEPENDS= ${LOCALBASE}/share/icons/hicolor/index.theme:misc/hicolor-icon-theme \
sudo:security/sudo
-USE_GNOME= gtk20
-USES= gettext pkgconfig
+USE_GNOME= gtk20 cairo
+USES= pkgconfig
+USE_XORG= x11
INSTALLS_ICONS= yes
MAKE_ARGS+= PREFIX=${PREFIX}
USE_LDCONFIG= yes
-MAKE_ENV+= MANDIR=${STAGEDIR}${MANPREFIX}/man
+MAKE_ENV= MANDIR=${STAGEDIR}${MANPREFIX}/man
+
+OPTIONS_DEFINE= DOCS NLS
+OPTIONS_SUB= yes
+NLS_USES= gettext
+DOCS_BUILD_DEPENDS= xsltproc:textproc/libxslt \
+ ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl
+
+post-patch-DOCS-off:
+ ${REINPLACE_CMD} 's|data doc include|data include|' \
+ ${WRKSRC}/Makefile
+
+post-patch-NLS-off:
+ ${REINPLACE_CMD} 's|include po src|include src|' \
+ ${WRKSRC}/Makefile
post-patch:
${REINPLACE_CMD} -e 's|/lib/|/libdata/|g' \
${WRKSRC}/data/pkgconfig.sh
${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${PREFIX}|g' \
${WRKSRC}/src/panel.c
+ ${REINPLACE_CMD} 's|-Wl,-pie||g' \
+ ${WRKSRC}/tools/Makefile \
+ ${WRKSRC}/src/Makefile \
+ ${WRKSRC}/tests/Makefile
post-install:
${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/* \
diff --git a/x11/deforaos-panel/distinfo b/x11/deforaos-panel/distinfo
index 23b6320323f..93defbf9f49 100644
--- a/x11/deforaos-panel/distinfo
+++ b/x11/deforaos-panel/distinfo
@@ -1,2 +1,3 @@
-SHA256 (Panel-0.3.1.tar.gz) = 374cfbb67d2c0282603df12a071a3dcee05e130e79e07782e9f176d888e5636a
-SIZE (Panel-0.3.1.tar.gz) = 133677
+TIMESTAMP = 1483369528
+SHA256 (Panel-0.3.6.tar.gz) = 00739939fbb14e0df478f026624649eff8cab64a81e067721fa4f75713896241
+SIZE (Panel-0.3.6.tar.gz) = 146129
diff --git a/x11/deforaos-panel/files/patch-doc-Makefile b/x11/deforaos-panel/files/patch-doc-Makefile
new file mode 100644
index 00000000000..fd9c9679111
--- /dev/null
+++ b/x11/deforaos-panel/files/patch-doc-Makefile
@@ -0,0 +1,56 @@
+--- doc/Makefile.orig 2016-03-01 23:07:41.429960000 +0100
++++ doc/Makefile 2016-03-01 23:08:45.782008000 +0100
+@@ -1,4 +1,4 @@
+-TARGETS = $(OBJDIR)panel.1 $(OBJDIR)panel.html $(OBJDIR)panelctl.1 $(OBJDIR)panelctl.html $(OBJDIR)panel-embed.1 $(OBJDIR)panel-embed.html $(OBJDIR)panel-message.1 $(OBJDIR)panel-message.html $(OBJDIR)panel-notify.1 $(OBJDIR)panel-notify.html $(OBJDIR)wifibrowser.1 $(OBJDIR)wifibrowser.html
++TARGETS = $(OBJDIR)panel.1 $(OBJDIR)panelctl.1 $(OBJDIR)panel-embed.1 $(OBJDIR)panel-message.1 $(OBJDIR)panel-notify.1 $(OBJDIR)wifibrowser.1
+ OBJDIR =
+ PREFIX = /usr/local
+ DESTDIR =
+@@ -49,47 +49,29 @@
+ clean:
+ $(RM) -- $(panel.1_OBJS) $(panel.html_OBJS) $(panelctl.1_OBJS) $(panelctl.html_OBJS) $(panel-embed.1_OBJS) $(panel-embed.html_OBJS) $(panel-message.1_OBJS) $(panel-message.html_OBJS) $(panel-notify.1_OBJS) $(panel-notify.html_OBJS) $(wifibrowser.1_OBJS) $(wifibrowser.html_OBJS)
+ ./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)panel.1"
+- ./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)panel.html"
+ ./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)panelctl.1"
+- ./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)panelctl.html"
+ ./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)panel-embed.1"
+- ./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)panel-embed.html"
+ ./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)panel-message.1"
+- ./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)panel-message.html"
+ ./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)panel-notify.1"
+- ./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)panel-notify.html"
+ ./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)wifibrowser.1"
+- ./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)wifibrowser.html"
+
+ distclean: clean
+ $(RM) -- $(TARGETS)
+
+ install: $(TARGETS)
+ ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)panel.1"
+- ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)panel.html"
+ ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)panelctl.1"
+- ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)panelctl.html"
+ ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)panel-embed.1"
+- ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)panel-embed.html"
+ ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)panel-message.1"
+- ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)panel-message.html"
+ ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)panel-notify.1"
+- ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)panel-notify.html"
+ ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)wifibrowser.1"
+- ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)wifibrowser.html"
+
+ uninstall:
+ ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "panel.1"
+- ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "panel.html"
+ ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "panelctl.1"
+- ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "panelctl.html"
+ ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "panel-embed.1"
+- ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "panel-embed.html"
+ ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "panel-message.1"
+- ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "panel-message.html"
+ ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "panel-notify.1"
+- ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "panel-notify.html"
+ ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "wifibrowser.1"
+- ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "wifibrowser.html"
+
+ .PHONY: all clean distclean install uninstall
diff --git a/x11/deforaos-panel/files/patch-src-applets-bluetooth b/x11/deforaos-panel/files/patch-src-applets-bluetooth
new file mode 100644
index 00000000000..2763f0d1dbc
--- /dev/null
+++ b/x11/deforaos-panel/files/patch-src-applets-bluetooth
@@ -0,0 +1,18 @@
+--- src/applets/bluetooth.c.orig 2016-03-02 00:18:48.529828000 +0100
++++ src/applets/bluetooth.c 2016-03-02 00:19:04.332171000 +0100
+@@ -21,14 +21,12 @@
+ # include
+ # include
+ # include
+-# include
+-# include
+ #elif defined(__linux__)
+ # include
+ # include
++#endif
+ # include
+ # include
+-#endif
+ #include
+ #include
+ #include
diff --git a/x11/deforaos-panel/files/patch-src-applets-swap b/x11/deforaos-panel/files/patch-src-applets-swap
new file mode 100644
index 00000000000..7ca2f756909
--- /dev/null
+++ b/x11/deforaos-panel/files/patch-src-applets-swap
@@ -0,0 +1,50 @@
+--- src/applets/swap.c.orig 2015-10-24 01:33:21.000000000 +0200
++++ src/applets/swap.c 2016-03-02 09:10:06.697330000 +0100
+@@ -19,9 +19,15 @@
+ #include
+ #include
+ #include
+-#if defined(__linux__)
++#if defined(__FreeBSD__)
++# include
++# include
++# include
++# include
++#elif defined(__linux__)
+ # include
+ #elif defined(__NetBSD__)
++# include
+ # include
+ # include
+ #endif
+@@ -128,7 +134,20 @@
+ /* swap_on_timeout */
+ static gboolean _swap_on_timeout(gpointer data)
+ {
+-#if defined(__linux__)
++#if defined(__FreeBSD__)
++ Swap * swap = data;
++ int mib[] = { CTL_VM, VM_TOTAL };
++ struct vmtotal t;
++ size_t size = sizeof(t);
++ gdouble value;
++
++ if(sysctl(mib, 2, &t, &size, NULL, 0) < 0)
++ return TRUE;
++ value = t.t_rm;
++ value /= t.t_vm;
++ _swap_set(swap, value);
++ return TRUE;
++#elif defined(__linux__)
+ Swap * swap = data;
+ struct sysinfo sy;
+ gdouble value;
+@@ -157,7 +176,7 @@
+ Swap * swap = data;
+
+ /* FIXME not supported */
+- swap->source = 0;
++ swap->timeout = 0;
+ return FALSE;
+ #endif
+ }
diff --git a/x11/deforaos-panel/pkg-plist b/x11/deforaos-panel/pkg-plist
index 5892085d957..782e44e2705 100644
--- a/x11/deforaos-panel/pkg-plist
+++ b/x11/deforaos-panel/pkg-plist
@@ -4,13 +4,18 @@ bin/panel-message
bin/panel-notify
bin/panelctl
bin/run
+bin/settings
bin/wifibrowser
include/Desktop/Panel.h
+include/Desktop/Panel/applet.h
+include/Desktop/Panel/panel.h
+include/Desktop/Panel/window.h
lib/libPanel.a
lib/libPanel.so
lib/libPanel.so.0
lib/libPanel.so.0.0
lib/Panel/applets/battery.so
+lib/Panel/applets/brightness.so
lib/Panel/applets/bluetooth.so
lib/Panel/applets/clock.so
lib/Panel/applets/close.so
@@ -22,13 +27,12 @@ lib/Panel/applets/gps.so
lib/Panel/applets/gsm.so
lib/Panel/applets/lock.so
lib/Panel/applets/logout.so
-lib/Panel/applets/main.so
lib/Panel/applets/memory.so
+lib/Panel/applets/menu.so
lib/Panel/applets/mixer.so
lib/Panel/applets/network.so
lib/Panel/applets/pager.so
lib/Panel/applets/phone.so
-lib/Panel/applets/player.so
lib/Panel/applets/rotate.so
lib/Panel/applets/separator.so
lib/Panel/applets/spacer.so
@@ -41,13 +45,14 @@ lib/Panel/applets/user.so
lib/Panel/applets/volume.so
lib/Panel/applets/wpa_supplicant.so
libdata/pkgconfig/Panel.pc
-man/man1/panel-embed.1.gz
-man/man1/panel-message.1.gz
-man/man1/panel-notify.1.gz
-man/man1/panel.1.gz
-man/man1/panelctl.1.gz
-man/man1/wifibrowser.1.gz
+%%PORTDOCS%%man/man1/panel-embed.1.gz
+%%PORTDOCS%%man/man1/panel-message.1.gz
+%%PORTDOCS%%man/man1/panel-notify.1.gz
+%%PORTDOCS%%man/man1/panel.1.gz
+%%PORTDOCS%%man/man1/panelctl.1.gz
+%%PORTDOCS%%man/man1/wifibrowser.1.gz
share/applications/deforaos-panel-settings.desktop
+share/applications/deforaos-settings.desktop
share/applications/deforaos-wifibrowser.desktop
share/icons/hicolor/16x16/apps/panel-applet-bluetooth.png
share/icons/hicolor/16x16/apps/panel-applet-desktop.png
@@ -67,10 +72,5 @@ share/icons/hicolor/48x48/apps/panel-applet-bluetooth.png
share/icons/hicolor/48x48/apps/panel-applet-desktop.png
share/icons/hicolor/48x48/apps/panel-settings.png
share/icons/hicolor/scalable/apps/panel-applet-bluetooth.svg
-share/locale/fr/LC_MESSAGES/Panel.mo
-share/man/html1/panel-embed.html
-share/man/html1/panel-message.html
-share/man/html1/panel-notify.html
-share/man/html1/panel.html
-share/man/html1/panelctl.html
-share/man/html1/wifibrowser.html
+%%NLS%%share/locale/fr/LC_MESSAGES/Panel.mo
+%%NLS%%share/locale/es/LC_MESSAGES/Panel.mo