*/*: sync with upstream

Taken from: FreeBSD
2016-05-24 07:06:12 +02:00 · 2016-05-24 07:06:12 +02:00 · 19f5749a3f
parent e87d9f1c5e
commit 19f5749a3f
872 changed files with 1579 additions and 2220 deletions
--- a/archivers/p5-Archive-Tar/Makefile
+++ b/archivers/p5-Archive-Tar/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	Archive-Tar
-PORTVERSION=	2.04
+PORTVERSION=	2.08
 CATEGORIES=	archivers perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:BINGOS
--- a/archivers/p5-Archive-Tar/distinfo
+++ b/archivers/p5-Archive-Tar/distinfo
@ -1,2 +1,3 @@
-SHA256 (Archive-Tar-2.04.tar.gz) = c3741bba06a468a5a4db6a79d772c55cf2f6673cf33241a6e6a758707a71d293
-SIZE (Archive-Tar-2.04.tar.gz) = 59873
+TIMESTAMP = 1463993122
+SHA256 (Archive-Tar-2.08.tar.gz) = 62e34feffd51e21b24f2ba5b15adf3ca3bd084163bfec40fe30f8f8e8963066b
+SIZE (Archive-Tar-2.08.tar.gz) = 60950
--- a/archivers/rpm4/Makefile
+++ b/archivers/rpm4/Makefile
@ -17,7 +17,7 @@ LIB_DEPENDS=	libpopt.so:devel/popt \
 BUILD_DEPENDS=	${LOCALBASE}/bin/gsed:textproc/gsed

 OPTIONS_DEFINE=	PYTHON NLS DOCS
-OPTIONS_DEFAULT=PYTHON NLS
+OPTIONS_DEFAULT=PYTHON
 OPTIONS_SUB=	yes
 PYTHON_CONFIGURE_ENABLE=python
 PYTHON_USES=	python:2.7
--- a/audio/abraca/Makefile
+++ b/audio/abraca/Makefile
@ -23,7 +23,6 @@ CONFIGURE_ARGS+=	--prefix=${PREFIX} \
 			--mandir=${PREFIX}/man

 OPTIONS_DEFINE=	NLS
-OPTIONS_DEFAULT=	NLS

 OPTIONS_SUB=	yes
 NLS_USES=	gettext
--- a/audio/deadbeef-vu-meter-plugin/Makefile
+++ b/audio/deadbeef-vu-meter-plugin/Makefile
@ -18,6 +18,8 @@ GH_TAGNAME=	940d8d7

 USES=		gmake pkgconfig

+MAKE_JOBS_UNSAFE=	yes
+
 PLIST_FILES=	share/deadbeef/pixmaps/vumeter.png

 OPTIONS_DEFINE=	GTK2 GTK3
--- a/audio/deadbeef-waveform-seekbar-plugin/Makefile
+++ b/audio/deadbeef-waveform-seekbar-plugin/Makefile
@ -18,6 +18,8 @@ GH_TAGNAME=	0402f6d

 USES=		gmake pkgconfig sqlite

+MAKE_JOBS_UNSAFE=	yes
+
 OPTIONS_DEFINE=	GTK2 GTK3
 OPTIONS_DEFAULT=	GTK2

--- a/audio/dsbmixer/Makefile
+++ b/audio/dsbmixer/Makefile
@ -16,7 +16,7 @@ USES=		tar:tgz pkgconfig
 USE_GNOME=	gtk20

 OPTIONS_DEFINE=	DEVD NLS
-OPTIONS_DEFAULT=DEVD NLS
+OPTIONS_DEFAULT=DEVD
 OPTIONS_SUB=	yes

 NLS_USES=	gettext
--- a/audio/easytag/Makefile
+++ b/audio/easytag/Makefile
@ -36,7 +36,6 @@ CONFIGURE_ARGS=	--disable-appdata-validate \
 PORTDOCS=	HACKING THANKS TODO

 OPTIONS_DEFINE=	WAVPACK NLS OPUS SPEEX DOCS
-OPTIONS_DEFAULT=	NLS
 OPTIONS_SUB=	yes

 WAVPACK_LIB_DEPENDS=	libwavpack.so:audio/wavpack
--- a/audio/exaile/Makefile
+++ b/audio/exaile/Makefile
@ -21,7 +21,7 @@ USE_GSTREAMER=	good faad python
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}

 OPTIONS_DEFINE=		BAD CDDB DBUS HAL NOTIFY NLS SEXY
-OPTIONS_DEFAULT=	BAD CDDB DBUS HAL NOTIFY NLS SEXY
+OPTIONS_DEFAULT=	BAD CDDB DBUS HAL NOTIFY SEXY
 OPTIONS_SUB=		yes
 BAD_DESC=		Install bad GStreamer plugins
 BAD_USE=		GSTREAMER=bad
--- a/audio/idjc/Makefile
+++ b/audio/idjc/Makefile
@ -26,9 +26,8 @@ RUN_DEPENDS=	oggenc:audio/vorbis-tools \
 		${PYTHON_PKGNAMEPREFIX}mutagen>=0:audio/py-mutagen \
 		${PYTHON_PKGNAMEPREFIX}dbus>=0.8:devel/py-dbus

-OPTIONS_SUB=	YES
 OPTIONS_DEFINE=	DOCS NLS
-OPTIONS_DEFAULT=	DOCS NLS
+OPTIONS_SUB=	YES

 USES=		compiler:nestedfct desktop-file-utils gettext gmake \
 		libtool pathfix pkgconfig python:2.7
--- a/audio/libbs2b/Makefile
+++ b/audio/libbs2b/Makefile
@ -1,4 +1,3 @@
-# Created by: SimaMoto,RyoTa <liangtai.s4@gmail.com>
 # $FreeBSD$

 PORTNAME=	libbs2b
@ -10,21 +9,18 @@ MASTER_SITES=	SF/bs2b/${PORTNAME}/${PORTVERSION}
 MAINTAINER=	liangtai.s16@gmail.com
 COMMENT=	Bauer Stereophonic-to-Binaural DSP

+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 LIB_DEPENDS+=	libsndfile.so:audio/libsndfile \
 		libogg.so:audio/libogg \
 		libFLAC.so:audio/flac \
 		libvorbis.so:audio/libvorbis

-USES=		tar:bzip2 gmake pkgconfig libtool
+USES=		gmake libtool localbase pathfix pkgconfig tar:bzip2
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=	CFLAGS=`pkg-config --cflags sndfile` \
-			LDFLAGS=`pkg-config --libs-only-L sndfile`

 INSTALL_TARGET=	install-strip

-pre-configure:
-	${REINPLACE_CMD} -e 's@^\(pkgconfigdir = \).*@\1$${prefix}/libdata/pkgconfig@' \
-	${WRKSRC}/Makefile.am ${WRKSRC}/Makefile.in
-
 .include <bsd.port.mk>
--- a/audio/libmp3splt/Makefile
+++ b/audio/libmp3splt/Makefile
@ -28,7 +28,7 @@ OPTIONS_SUB=	yes

 PCRE_DESC=	PCRE support to set tags from input filename

-OPTIONS_DEFAULT=	MAD FLAC VORBIS ID3 PCRE NLS
+OPTIONS_DEFAULT=	MAD FLAC VORBIS ID3 PCRE

 MAD_CONFIGURE_ENABLE=	mp3
 MAD_LIB_DEPENDS=	libmad.so:audio/libmad
--- a/audio/libsidplayfp/Makefile
+++ b/audio/libsidplayfp/Makefile
@ -1,14 +1,15 @@
 # $FreeBSD$

 PORTNAME=	libsidplayfp
-PORTVERSION=	1.8.4
+PORTVERSION=	1.8.6
 CATEGORIES=	audio
 MASTER_SITES=	SF/sidplay-residfp/libsidplayfp/${PORTVERSION:R}

 MAINTAINER=	liangtai.s16@gmail.com
 COMMENT=	Library to play Commodore 64 music derived from libsidplay2

-LICENSE=	GPLv2
+LICENSE=	GPLv2+
+LICENSE_FILE=	${WRKSRC}/COPYING

 USES=		gmake libtool pathfix pkgconfig
 GNU_CONFIGURE=	yes
@ -35,7 +36,7 @@ MMX_CONFIGURE_ENABLE=	mmx

 BUILD_DEPENDS+=	xa65:devel/xa65

-SIDPLAYFP_SHLIB_VERSION=	4.2.5
+SIDPLAYFP_SHLIB_VERSION=	4.2.7
 STILVIEW_SHLIB_VERSION=	0.0.3
 PLIST_SUB+=	\
 	SIDPLAYFP_SHLIB_VER=${SIDPLAYFP_SHLIB_VERSION:C/\.[[:digit:].]+//} \
--- a/audio/libsidplayfp/distinfo
+++ b/audio/libsidplayfp/distinfo
@ -1,2 +1,3 @@
-SHA256 (libsidplayfp-1.8.4.tar.gz) = 43a4159cbd8d2d27accfb071d05740c7f7f35610e859cb60fe86379dada40ab3
-SIZE (libsidplayfp-1.8.4.tar.gz) = 670890
+TIMESTAMP = 1464016730
+SHA256 (libsidplayfp-1.8.6.tar.gz) = dcf2da21d4bbb6acc79c1da5809fdafc643f1082c5191640763533809bdbf153
+SIZE (libsidplayfp-1.8.6.tar.gz) = 671485
--- a/audio/libsidplayfp/files/patch-Makefile.in
+++ b/audio/libsidplayfp/files/patch-Makefile.in
@ -1,6 +1,6 @@
--- Makefile.in.orig	2015-01-25 00:59:52.000000000 +0900
-+++ Makefile.in	2015-01-26 21:02:06.000000000 +0900
-@@ -2000,8 +2000,8 @@
+--- Makefile.in.orig	2015-01-24 15:59:52 UTC
+++ Makefile.in
+@@ -2000,8 +2000,8 @@ uninstall-am: uninstall-builders_hardsid
 
 .a65.bin:
 	o65file=`echo $@ | sed 's/bin/o65/'`;\
--- a/audio/mp3splt/Makefile
+++ b/audio/mp3splt/Makefile
@ -23,7 +23,6 @@ CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib

 OPTIONS_DEFINE=		NLS
-OPTIONS_DEFAULT=	NLS
 OPTIONS_SUB=		yes

 NLS_USES=		gettext
--- a/audio/musicpd/Makefile
+++ b/audio/musicpd/Makefile
@ -55,7 +55,7 @@ TWOLAME_DESC=	TwoLAME support (mp2)
 VORBISENC_DESC=	Ogg Vorbis encoder
 WILDMIDI_DESC=	WildMIDI support (MIDI files)

-OPTIONS_DEFAULT=ID3TAG IPV6 MAD OSS FLAC VORBIS WAV FFMPEG SNDFILE CURL
+OPTIONS_DEFAULT=ID3TAG MAD OSS FLAC VORBIS WAV FFMPEG SNDFILE CURL

 AAC_CONFIGURE_ENABLE=aac
 AAC_LIB_DEPENDS=libfaad.so:audio/faad
--- a/audio/shoutcast/Makefile
+++ b/audio/shoutcast/Makefile
@ -27,8 +27,8 @@ CONFLICTS=	linux-shoutcast-[0-9]*
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes

-OPTIONS_DEFAULT=	SERVERSETUP EXAMPLES
 OPTIONS_DEFINE=	SERVERSETUP DOCS EXAMPLES
+OPTIONS_DEFAULT=	SERVERSETUP
 OPTIONS_SUB=	yes
 SETUPSERVER_DESC=	SHOUTcast Server Setup Tools
 EXAMPLE_DESC=	SHOUTcast Server Example Configuration Files
--- a/cad/gmsh/Makefile
+++ b/cad/gmsh/Makefile
@ -34,7 +34,7 @@ MAKE_JOBS_UNSAFE=	yes
 CMAKE_ARGS+=	-DCMAKE_SKIP_RPATH:BOOL=YES

 OPTIONS_DEFINE=	STATIC_LIB SHARED_LIB TETGEN METIS TAUCS MED CGNS GMM OCC
-OPTIONS_DEFAULT=	DOCS STATIC_LIB SHARED_LIB TETGEN METIS MED CGNS GMM
+OPTIONS_DEFAULT=	STATIC_LIB SHARED_LIB TETGEN METIS MED CGNS GMM

 STATIC_LIB_DESC=	Build static library
 SHARED_LIB_DESC=	Build shared library
--- a/cad/pcb/Makefile
+++ b/cad/pcb/Makefile
@ -37,7 +37,7 @@ PORTDOCS=	\
 OPTIONS_DEFINE=	DOCS NLS
 OPTIONS_SINGLE=	GUI
 OPTIONS_SINGLE_GUI=MOTIF GTK NONE
-OPTIONS_DEFAULT=DOCS GTK
+OPTIONS_DEFAULT=GTK
 DOCS_CONFIGURE_ENABLE=	doc
 DOCS_CONFIGURE_ON=	--docdir=${DOCSDIR}
 NLS_CONFIGURE_ENABLE=	nls
--- a/cad/spice/Makefile
+++ b/cad/spice/Makefile
@ -40,7 +40,7 @@ PORTEXAMPLES=	bjtnoise.cir bsim1tst.cir bsim2tst.cir diffpair.cir \
 		rtlinv.cir schmitt.cir simplepz.cir

 OPTIONS_DEFINE=	DOCS EXAMPLES X11 DEV_BSIM3 DEV_BSIM4 DEV_HISIM2
-OPTIONS_DEFAULT=DOCS EXAMPLES X11
+OPTIONS_DEFAULT=X11

 X11_USE=		XORG=x11,xaw,xext,xmu,xt
 X11_CONFIGURE_ENV=	WITH_X11=yes
--- a/chinese/ibus-libpinyin/Makefile
+++ b/chinese/ibus-libpinyin/Makefile
@ -25,7 +25,7 @@ CONFIGURE_ARGS=	--disable-dependency-tracking --disable-boost \
 				--disable-lua-extension

 OPTIONS_DEFINE=		ENGLISH STROKE OPENCC NLS
-OPTIONS_DEFAULT=	ENGLISH STROKE NLS
+OPTIONS_DEFAULT=	ENGLISH STROKE
 OPTIONS_SUB=		yes
 ENGLISH_DESC=		Enable English input mode
 STROKE_DESC=		Enable stroke input mode
--- a/chinese/ibus-pinyin/Makefile
+++ b/chinese/ibus-pinyin/Makefile
@ -25,7 +25,6 @@ CONFIGURE_ARGS=	--disable-dependency-tracking --disable-lua-extension
 PROJECTHOST=	ibus

 OPTIONS_DEFINE=	NLS
-OPTIONS_DEFAULT=	NLS
 OPTIONS_SUB=	yes

 NLS_USES=	gettext
--- a/comms/hylafax/Makefile
+++ b/comms/hylafax/Makefile
@ -39,7 +39,7 @@ SUB_FILES=	pkg-message
 USE_RC_SUBR=	hylafax

 OPTIONS_DEFINE=	PAM NLS GAWK DOCS
-OPTIONS_DEFAULT=PAM NLS
+OPTIONS_DEFAULT=PAM
 NO_OPTIONS_SORT=yes
 OPTIONS_SUB=	yes
 GAWK_DESC=	Use gawk for scripts
--- a/databases/db5/Makefile
+++ b/databases/db5/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	db5
 PORTVERSION=	5.3.28
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	databases java
 MASTER_SITES=	http://download.oracle.com/berkeley-db/
 PKGNAMEPREFIX?=
@ -13,7 +13,7 @@ DISTNAME=	db-${PORTVERSION}
 DIST_SUBDIR=	bdb

 MAINTAINER=	mandree@FreeBSD.org
-COMMENT=	The Oracle Berkeley DB, revision ${BDBVER}
+COMMENT=	Oracle Berkeley DB, revision ${BDBVER}

 BDBVER=		${PORTVERSION:R}
 BDBMAJ=		${BDBVER:R}
@ -28,87 +28,68 @@ GNU_CONFIGURE=	yes
 USES=		gmake libtool
 INSTALL_TARGET=	install_include install_lib install_utilities
 WRKSRC=		${WRKDIR}/${DISTNAME}/build_unix
+PATCH_WRKSRC=	${WRKDIR}/${DISTNAME}
 USE_LDCONFIG=	yes
 PLIST_SUB=	BDBMAJ=${BDBMAJ} BDBVER=${BDBVER}
+MAKE_ARGS+=	docdir=${DOCSDIR}

 OPTIONS_DEFINE=	CRYPTO L10N SQL JAVA DOCS
+# WARNING: DO NOT ADD TCL TO OPTIONS:
+# On FreeBSD 10.3 this causes a heap of warnings of the following kind
+# and is deemed unsafe.
+# ./lang/tcl/tcl_*.c:*:*: warning: the value of the size argument in 'strncat' is too large, might lead to a buffer overflow [-Wstrncat-size]
 OPTIONS_DEFAULT=CRYPTO
+OPTIONS_SUB=	yes
 CRYPTO_DESC=	Cryptography support
 L10N_DESC=	Localization support (EXPERIMENTAL)
 SQL_DESC=	Enable SQL API (EXPERIMENTAL)

+PORTDOCS=	*
+
+DBLIBS=	libdb libdb_cxx libdb_stl
+
+DEBUG_CONFIGURE_ENABLE=	debug umrw
+CRYPTO_CONFIGURE_WITH=	cryptography=yes
+L10N_CONFIGURE_ENABLE=	localization
+SQL_CONFIGURE_ENABLE=	sql sql_codegen
+SQL_VARS=		DBLIBS+=libdb_sql
+JAVA_USE=		java
+# db5 is incompatible with openjdk8 and causes IllegalArgument
+# exceptions during build
+JAVA_VARS=		DBLIBS+=libdb_java JAVA_VERSION="1.6 1.7"
+JAVA_CONFIGURE_ENABLE=	java
+JAVA_CPPFLAGS=		-I"${JAVA_HOME}/include"
+JAVA_CONFIGURE_ENV=	JAVAC="${JAVAC}" JAR="${JAR}" JAVA="${JAVA}" JAVACFLAGS="-Xlint:unchecked"
+#TCL_CONFIGURE_ENABLE=	tcl
+#TCL_USES=		tcl:85+
+#TCL_CONFIGURE_WITH=	tcl=${TCL_LIBDIR}
+#TCL_VARS=		DBLIBS+=libdb_tcl
+DOCS_INSTALL_TARGET=	install_docs
+
 .include <bsd.port.options.mk>

 .if ${ARCH} == "aarch64" || ${ARCH:Marmv6*}
 # db5 uses a deprecated instruction for mutexes on ARM, fbsd bug#197227
-# also bug#205001
+# and also bug#205001
 CONFIGURE_ARGS+=	--enable-posixmutexes
 .endif

-.if ${PORT_OPTIONS:MDOCS}
-INSTALL_TARGET+=install_docs docdir=${DOCSDIR}
-PORTDOCS=	*
-.endif
-
-.if ${PORT_OPTIONS:MSQL}
-CONFIGURE_ARGS+=	--enable-sql_codegen --enable-sql
-PLIST_SUB+=	SQL=""
-libdb_sql=	libdb_sql
-.else
-PLIST_SUB+=	SQL="@comment "
-libdb_sql=
-.endif
-
-.if ${PORT_OPTIONS:MJAVA}
-USE_JAVA=	yes
-JAVA_VERSION=	1.6+
-CONFIGURE_ARGS+=	--enable-java
-CPPFLAGS+=	"-I${JAVA_HOME}/include"
-CONFIGURE_ENV=	JAVAC="${JAVAC}" JAR="${JAR}" JAVA="${JAVA}"
-PLIST_SUB+=	JAVA=""
-libdb_java=	libdb_java
-.else
-PLIST_SUB+=	JAVA="@comment "
-libdb_java=
-.endif
-
-.if ${PORT_OPTIONS:MCRYPTO}
-CONFIGURE_ARGS+=	--with-cryptography=yes
-.else
-CONFIGURE_ARGS+=	--with-cryptography=no
-.endif
-
-.if ${PORT_OPTIONS:ML10N}
-CONFIGURE_ARGS+=	--enable-localization
-.endif
-
-.if ${PORT_OPTIONS:MDEBUG}
-CONFIGURE_ARGS+=	--enable-debug --enable-umrw
-.endif
-
 post-patch:
 	${REINPLACE_CMD} -e '/^DOCLIST/{s/csharp//;}' ${WRKSRC}/../dist/Makefile.in
 	${REINPLACE_CMD} -Ee 's/[[:<:]]atomic_init[[:>:]]/db_atomic_init/g' ${WRKSRC}/../src/mp/mp* ${WRKSRC}/../src/mutex/mut_*

 post-install:
-.for i in libdb libdb_cxx libdb_stl ${libdb_sql} ${libdb_java}
+.for i in ${DBLIBS}
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/${i}-${BDBVER}.so.0
 	${LN} -s -f ${PORTNAME}/${i}-${BDBVER}.so.0 ${STAGEDIR}${PREFIX}/lib
 	${LN} -s -f ${PORTNAME}/${i}-${BDBMAJ}.so ${STAGEDIR}${PREFIX}/lib
 	${LN} -s -f ${i}-${BDBVER}.so.0 ${STAGEDIR}${PREFIX}/lib/${i}-${BDBVER}.so
 	${LN} -s -f ${i}-${BDBVER}.so.0 ${STAGEDIR}${PREFIX}/lib/${i}-${BDBMAJ}.so.0
 	${LN} -s -f ${i}-${BDBVER}.a ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/${i}.a
-	${CHMOD} a-w ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/${i}-${BDBVER}.so.0 \
-		${STAGEDIR}${PREFIX}/lib/${PORTNAME}/${i}-${BDBVER}.a \
-		${STAGEDIR}${PREFIX}/lib/${PORTNAME}/${i}-${BDBVER}.la
 .endfor
 	cd ${STAGEDIR}${PREFIX}/bin/${PORTNAME}; \
 	for i in *; do ${LN} -s -f ${PORTNAME}/$$i ../$$i-${BDBVER} ; \
 		       ${LN} -s -f ${PORTNAME}/$$i ../$$i-${BDBMAJ} ; done
-.if ${PORT_OPTIONS:MDOCS}
-.for i in api_reference/TCL
-	${RM} -r -f ${STAGEDIR}${DOCSDIR}/${i}
-.endfor
 .if empty(PORT_OPTIONS:MJAVA)
 	${RM} -r -f ${STAGEDIR}${DOCSDIR}/java
 .for i in gsg gsg_db_rep gsg_txn
@ -118,6 +99,14 @@ post-install:
 .if empty(PORT_OPTIONS:MSQL)
 	${RM} -r -f ${STAGEDIR}${DOCSDIR}/bdb-sql
 .endif
+.if !empty(PORT_OPTIONS:MTCL)
+	echo "package ifneeded Db_tcl ${BDBVER} \
+	      [list load [file join $$dir libdb_tcl-${BDBVER}.so]] \
+	     " > ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/pkgIndex.tcl
+.else
+.for i in api_reference/TCL
+	${RM} -r -f ${STAGEDIR}${DOCSDIR}/${i}
+.endfor
 .endif

 .include <bsd.port.mk>
--- a/databases/db5/files/patch-dbinc_mutex_int.h
+++ b/databases/db5/files/patch-dbinc_mutex_int.h
@ -1,11 +0,0 @@
--- ../src/dbinc/mutex_int.h.orig	2010-04-12 13:25:22.000000000 -0700
-+++ ../src/dbinc/mutex_int.h	2014-06-28 01:16:48.321255725 -0700
-@@ -596,7 +596,7 @@
- 	 : "=&r" (__r), "+r" (tsl)
- 	 :
- 	 : "cr0", "memory");
-	 return (int)tsl;
-+	 return (tsl != 0);
- }
- 
- static inline int
--- a/databases/db5/files/patch-dist_configure
+++ b/databases/db5/files/patch-dist_configure
@ -1,6 +1,7 @@
--- ../dist/configure.orig	Wed Dec  5 13:14:02 2001
-+++ ../dist/configure	Wed Dec  5 13:24:01 2001
-@@ -20867,8 +20867,8 @@
+--- dist/configure.orig	2013-09-09 15:35:02 UTC
+++ dist/configure
+@@ -17712,10 +17712,10 @@ LIBTOOL="./libtool"
+ INSTALLER="\$(LIBTOOL) --mode=install cp -p"
 
 MAKEFILE_CC="\$(LIBTOOL) --mode=compile ${MAKEFILE_CC}"
 -MAKEFILE_SOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK} -avoid-version"
@ -11,3 +12,4 @@
 +MAKEFILE_XSOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK} -version-info 0:0:0"
 MAKEFILE_CXXLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK}"
 
+ 
--- a/databases/db5/files/patch-src_dbinc_atomic.h
+++ b/databases/db5/files/patch-src_dbinc_atomic.h
@ -1,5 +1,5 @@
--- ../src/dbinc/atomic.h.orig	2012-02-29 19:48:38.000000000 +0100
-+++ ../src/dbinc/atomic.h	2012-05-04 22:39:32.000000000 +0200
+--- src/dbinc/atomic.h.orig	2013-09-09 15:35:08 UTC
+++ src/dbinc/atomic.h
@@ -70,7 +70,7 @@ typedef struct {
  * These have no memory barriers; the caller must include them when necessary.
  */
--- a/databases/db5/files/patch-src_dbinc_mutex__int.h
+++ b/databases/db5/files/patch-src_dbinc_mutex__int.h
@ -0,0 +1,11 @@
+--- src/dbinc/mutex_int.h.orig	2013-09-09 15:35:08 UTC
+++ src/dbinc/mutex_int.h
+@@ -596,7 +596,7 @@ MUTEX_SET(int *tsl)  {
+ 	 : "=&r" (__r), "+r" (tsl)
+ 	 :
+ 	 : "cr0", "memory");
+-	 return (int)tsl;
+	 return (tsl != 0);
+ }
+ 
+ static inline int
--- a/databases/db5/pkg-plist
+++ b/databases/db5/pkg-plist
@ -123,3 +123,15 @@ lib/libdb_stl-%%BDBMAJ%%.so
 lib/libdb_stl-%%BDBMAJ%%.so.0
 lib/libdb_stl-%%BDBVER%%.so
 lib/libdb_stl-%%BDBVER%%.so.0
+@comment %%TCL%%lib/db5/libdb_tcl-%%BDBVER%%.a
+@comment %%TCL%%lib/db5/libdb_tcl-%%BDBVER%%.so
+@comment %%TCL%%lib/db5/libdb_tcl-%%BDBVER%%.so.0
+@comment %%TCL%%lib/db5/libdb_tcl-%%BDBVER%%.so.0.0.0
+@comment %%TCL%%lib/db5/libdb_tcl-5.so
+@comment %%TCL%%lib/db5/libdb_tcl.a
+@comment %%TCL%%lib/db5/libdb_tcl.so
+@comment %%TCL%%lib/db5/pkgIndex.tcl
+@comment %%TCL%%lib/libdb_tcl-%%BDBVER%%.so
+@comment %%TCL%%lib/libdb_tcl-%%BDBVER%%.so.0
+@comment %%TCL%%lib/libdb_tcl-5.so
+@comment %%TCL%%lib/libdb_tcl-5.so.0
--- a/databases/db6/Makefile
+++ b/databases/db6/Makefile
@ -2,16 +2,17 @@
 # $FreeBSD$

 PORTNAME=	db6
-PORTVERSION=	6.1.26
+PORTVERSION=	6.2.23
 CATEGORIES=	databases java
 MASTER_SITES=	http://download.oracle.com/berkeley-db/
 PKGNAMEPREFIX?=
+#
 # the distfiles aren't named db6-* but db-*:
 DISTNAME=	db-${PORTVERSION}
 DIST_SUBDIR=	bdb

 MAINTAINER=	mandree@FreeBSD.org
-COMMENT=	The Oracle Berkeley DB, revision ${BDBVER}
+COMMENT=	Oracle Berkeley DB, revision ${BDBVER}

 LICENSE=	AGPLv3

@ -19,7 +20,6 @@ BDBVER=		${PORTVERSION:R}
 BDBMAJ=		${BDBVER:R}
 CONFIGURE_ARGS=	--enable-cxx --enable-stl \
 		--enable-compat185 --enable-dump185 \
-		--disable-tcl \
 		--includedir=${PREFIX}/include/${PORTNAME} \
 		--libdir=${PREFIX}/lib/${PORTNAME} \
 		--bindir=${PREFIX}/bin/${PORTNAME}
@ -28,16 +28,38 @@ GNU_CONFIGURE=	yes
 USES=		gmake libtool
 INSTALL_TARGET=	install_include install_lib install_utilities
 WRKSRC=		${WRKDIR}/${DISTNAME}/build_unix
+PATCH_WRKSRC=	${WRKDIR}/${DISTNAME}
 USE_LDCONFIG=	yes
 PLIST_SUB=	BDBMAJ=${BDBMAJ} BDBVER=${BDBVER}
 MAKE_ARGS+=	docdir=${DOCSDIR}

-OPTIONS_DEFINE=	CRYPTO L10N SQL JAVA DOCS
+OPTIONS_DEFINE=	CRYPTO L10N SQL JAVA TCL DOCS
 OPTIONS_DEFAULT=CRYPTO
+OPTIONS_SUB=	yes
 CRYPTO_DESC=	Cryptography support
 L10N_DESC=	Localization support (EXPERIMENTAL)
 SQL_DESC=	Enable SQL API (EXPERIMENTAL)

+PORTDOCS=	*
+
+DBLIBS=	libdb libdb_cxx libdb_stl
+
+DEBUG_CONFIGURE_ENABLE=	debug umrw
+CRYPTO_CONFIGURE_WITH=	cryptography=yes
+L10N_CONFIGURE_ENABLE=	localization
+SQL_CONFIGURE_ENABLE=	sql sql_codegen
+SQL_VARS=		DBLIBS+=libdb_sql
+JAVA_USE=		java
+JAVA_VARS=		DBLIBS+=libdb_java JAVA_VERSION=1.6+
+JAVA_CONFIGURE_ENABLE=	java
+JAVA_CPPFLAGS=		-I"${JAVA_HOME}/include"
+JAVA_CONFIGURE_ENV=	JAVAC="${JAVAC}" JAR="${JAR}" JAVA="${JAVA}"
+TCL_CONFIGURE_ENABLE=	tcl
+TCL_USES=		tcl:85+
+TCL_CONFIGURE_WITH=	tcl=${TCL_LIBDIR}
+TCL_VARS=		DBLIBS+=libdb_tcl
+DOCS_INSTALL_TARGET=	install_docs
+
 .include <bsd.port.options.mk>

 .if ${ARCH} == "aarch64" || ${ARCH:Marmv6*}
@ -46,65 +68,21 @@ SQL_DESC=	Enable SQL API (EXPERIMENTAL)
 CONFIGURE_ARGS+=	--enable-posixmutexes
 .endif

-.if ${PORT_OPTIONS:MDOCS}
-INSTALL_TARGET+=install_docs
-PORTDOCS=	*
-.endif
-
-.if ${PORT_OPTIONS:MSQL}
-CONFIGURE_ARGS+=	--enable-sql_codegen --enable-sql
-PLIST_SUB+=	SQL=""
-libdb_sql=	libdb_sql
-.else
-PLIST_SUB+=	SQL="@comment "
-libdb_sql=
-.endif
-
-.if ${PORT_OPTIONS:MJAVA}
-USE_JAVA=	yes
-JAVA_VERSION=	1.6+
-CONFIGURE_ARGS+=	--enable-java
-CPPFLAGS+=	"-I${JAVA_HOME}/include"
-CONFIGURE_ENV=	JAVAC="${JAVAC}" JAR="${JAR}" JAVA="${JAVA}"
-PLIST_SUB+=	JAVA=""
-libdb_java=	libdb_java
-.else
-PLIST_SUB+=	JAVA="@comment "
-libdb_java=
-.endif
-
-.if ${PORT_OPTIONS:MCRYPTO}
-CONFIGURE_ARGS+=	--with-cryptography=yes
-.else
-CONFIGURE_ARGS+=	--with-cryptography=no
-.endif
-
-.if ${PORT_OPTIONS:ML10N}
-CONFIGURE_ARGS+=	--enable-localization
-.endif
-
-.if ${PORT_OPTIONS:MDEBUG}
-CONFIGURE_ARGS+=	--enable-debug --enable-umrw
-.endif
-
 post-patch:
 	${REINPLACE_CMD} -e '/^DOCLIST/{s/csharp//;}' ${WRKSRC}/../dist/Makefile.in
 	${REINPLACE_CMD} -Ee 's/[[:<:]]atomic_init[[:>:]]/db_atomic_init/g' \
 	    ${WRKSRC}/../src/mp/mp* ${WRKSRC}/../src/mutex/mut_* \
 	    ${WRKSRC}/../src/dbinc/atomic.h
+	${REINPLACE_CMD} -e 's/%%BDBVER%%/${BDBVER}/' ${WRKSRC}/../lang/sql/upgrade61.sh

 post-install:
-.for i in libdb libdb_cxx libdb_stl ${libdb_sql} ${libdb_java}
+.for i in ${DBLIBS}
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/${i}-${BDBVER}.so
 	${LN} -s -f ${PORTNAME}/${i}-${BDBVER}.so ${STAGEDIR}${PREFIX}/lib
 	${LN} -s -f ${i}-${BDBVER}.a ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/${i}.a
 .endfor
 	cd ${STAGEDIR}${PREFIX}/bin/${PORTNAME}; \
 	for i in *; do ${LN} -s -f ${PORTNAME}/$$i ../$$i-${BDBVER} ; done
-.if ${PORT_OPTIONS:MDOCS}
-.for i in api_reference/TCL
-	${RM} -r -f ${STAGEDIR}${DOCSDIR}/${i}
-.endfor
 .if empty(PORT_OPTIONS:MJAVA)
 	${RM} -r -f ${STAGEDIR}${DOCSDIR}/java
 .for i in gsg gsg_db_rep gsg_txn
@ -114,6 +92,18 @@ post-install:
 .if empty(PORT_OPTIONS:MSQL)
 	${RM} -r -f ${STAGEDIR}${DOCSDIR}/bdb-sql
 .endif
+.if !empty(PORT_OPTIONS:MTCL)
+	echo "package ifneeded Db_tcl ${BDBVER} \
+	      [list load [file join $$dir libdb_tcl-${BDBVER}.so]] \
+	     " > ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/pkgIndex.tcl
+.else
+.for i in api_reference/TCL
+	${RM} -r -f ${STAGEDIR}${DOCSDIR}/${i}
+.endfor
 .endif

+post-install-SQL-on:
+	${INSTALL_SCRIPT} ${WRKSRC}/../lang/sql/upgrade61.sh \
+	    ${STAGEDIR}${PREFIX}/bin/${PORTNAME}-upgrade61.sh
+
 .include <bsd.port.mk>
--- a/databases/db6/distinfo
+++ b/databases/db6/distinfo
@ -1,2 +1,3 @@
-SHA256 (bdb/db-6.1.26.tar.gz) = dd1417af5443f326ee3998e40986c3c60e2a7cfb5bfa25177ef7cadb2afb13a6
-SIZE (bdb/db-6.1.26.tar.gz) = 37495772
+TIMESTAMP = 1464030344
+SHA256 (bdb/db-6.2.23.tar.gz) = 47612c8991aa9ac2f6be721267c8d3cdccf5ac83105df8e50809daea24e95dc7
+SIZE (bdb/db-6.2.23.tar.gz) = 44305964
--- a/databases/db6/files/patch-dbinc_mutex_int.h
+++ b/databases/db6/files/patch-dbinc_mutex_int.h
@ -1,11 +0,0 @@
--- ../src/dbinc/mutex_int.h.orig	2010-04-12 13:25:22.000000000 -0700
-+++ ../src/dbinc/mutex_int.h	2014-06-28 01:16:48.321255725 -0700
-@@ -596,7 +596,7 @@
- 	 : "=&r" (__r), "+r" (tsl)
- 	 :
- 	 : "cr0", "memory");
-	 return (int)tsl;
-+	 return (tsl != 0);
- }
- 
- static inline int
--- a/databases/db6/files/patch-lang_sql_upgrade61.sh
+++ b/databases/db6/files/patch-lang_sql_upgrade61.sh
@ -0,0 +1,27 @@
+--- lang/sql/upgrade61.sh.orig	2016-03-28 19:45:53 UTC
+++ lang/sql/upgrade61.sh
+@@ -1,12 +1,19 @@
+ #!/bin/sh
+ # This script upgrades SQL databases from BDB 5.0 to early 6.1
+ # to late 6.1 and up by reindexing them.
+# 
+# Originally provided by Oracle as part of the Oracle BerkeleyDB
+# 12.1.6.* tarballs.
+ #
+# Bugfixed for proper quoting and error checking
+# by Matthias Andree <mandree@FreeBSD.org>
+ 
+-for var in $@
+rc=0
+for var in "$@"
+ do
+-    echo Recovering database $var
+-    db_recover -f -h ${var}-journal
+-    echo Reindexing database $var
+-    echo .quit | dbsql -cmd REINDEX  $var
+    echo "Recovering database $var"
+    db_recover-%%BDBVER%% -f -h "${var}-journal" || { rc=1 ; continue ; }
+    echo "Reindexing database $var"
+    echo .quit | dbsql-%%BDBVER%% -cmd REINDEX "$var" || rc=1
+ done
+exit $rc
--- a/databases/db6/files/patch-src_dbinc_mutex__int.h
+++ b/databases/db6/files/patch-src_dbinc_mutex__int.h
@ -0,0 +1,11 @@
+--- src/dbinc/mutex_int.h.orig	2016-03-28 19:45:54 UTC
+++ src/dbinc/mutex_int.h
+@@ -652,7 +652,7 @@ MUTEX_SET(int *tsl)  {
+ 	 : "=&r" (__r), "+r" (tsl)
+ 	 :
+ 	 : "cr0", "memory");
+-	 return (int)tsl;
+	 return (tsl != 0);
+ }
+ 
+ static inline int
--- a/databases/db6/pkg-plist
+++ b/databases/db6/pkg-plist
@ -14,6 +14,7 @@ bin/db%%BDBMAJ%%/db_stat
 bin/db%%BDBMAJ%%/db_tuner
 bin/db%%BDBMAJ%%/db_upgrade
 bin/db%%BDBMAJ%%/db_verify
+%%SQL%%bin/db%%BDBMAJ%%-upgrade61.sh
 %%SQL%%bin/db%%BDBMAJ%%/dbsql
 bin/db_archive-%%BDBVER%%
 bin/db_checkpoint-%%BDBVER%%
@ -81,3 +82,10 @@ lib/libdb_cxx-%%BDBVER%%.so
 %%JAVA%%lib/libdb_java-%%BDBVER%%.so
 %%SQL%%lib/libdb_sql-%%BDBVER%%.so
 lib/libdb_stl-%%BDBVER%%.so
+%%TCL%%lib/db6/libdb_tcl-%%BDBVER%%.a
+%%TCL%%lib/db6/libdb_tcl-%%BDBVER%%.so
+%%TCL%%lib/db6/libdb_tcl-6.so
+%%TCL%%lib/db6/libdb_tcl.a
+%%TCL%%lib/db6/libdb_tcl.so
+%%TCL%%lib/db6/pkgIndex.tcl
+%%TCL%%lib/libdb_tcl-%%BDBVER%%.so
--- a/databases/memcached/Makefile
+++ b/databases/memcached/Makefile
@ -20,7 +20,7 @@ CONFLICTS=	memcached-1.2*

 # Dtrace option disabled until it is fixed upstream
 OPTIONS_DEFINE=		SASL DOCS DTRACE
-OPTIONS_DEFAULT=	SASL DOCS
+OPTIONS_DEFAULT=	SASL

 DTRACE_DESC=	Enable dtrace probes
 SASL_DESC=	Enable SASL Authentication
--- a/databases/mysql-connector-java/Makefile
+++ b/databases/mysql-connector-java/Makefile
@ -1,9 +1,8 @@
 # Created by: Matthew Seaman
 # $FreeBSD$

-
 PORTNAME=	mysql-connector-java
-PORTVERSION=	5.1.38
+PORTVERSION=	5.1.39
 CATEGORIES=	databases java
 MASTER_SITES=	MYSQL/Connector-J

@ -14,12 +13,16 @@ LICENSE=	GPLv2

 RUN_DEPENDS=	${JAVALIBDIR}/log4j.jar:devel/log4j

+# 6.0 is currently in beta.
+PORTSCOUT=	limit:^5\.1\..*
+
 USES=		cpe
 CPE_VENDOR=	oracle
 CPE_PRODUCT=	mysql_connector_j

+NO_ARCH=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.6 1.7
+JAVA_VERSION=	1.6 1.7 1.8
 BUILDDIR=	${WRKDIR}/${DISTNAME}
 APIDOCSDIR=	${STAGEDIR}${DOCSDIR}/javadoc
 SRCDIR=		${WRKDIR}/${DISTNAME}/src
@ -33,43 +36,39 @@ PLIST_FILES=	${JAVAJARDIR}/${DESTJARFILE}

 OPTIONS_DEFINE=	DOCS

-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MDOCS}
 PORTDOCS=	*
-.endif
+
+.include <bsd.port.pre.mk>

 do-build:
-.if ${PORT_OPTIONS:MDOCS}
+	@${DO_NADA}
+
+do-build-DOCS-on:
+.if ${JAVA_PORT_VERSION:M1.8.*}
+	@${ECHO_MSG} "NOTE>>> Generating javadoc is broken with JDK 1.8+"
+.else
 	@${MKDIR} ${JAVADOCDIR} && (cd ${SRCDIR};               \
 	    ${JAVADOC} -quiet -breakiterator -encoding utf8     \
 	    -d ${JAVADOCDIR} -package -classpath ${JDCLASSPATH}	\
 	    com.mysql.jdbc org.gjt.mm.mysql)
 .endif

-do-install: do-install-jar do-install-apidocs
-
-do-install-jar:
+# Don't build the javadoc using JDK 1.8+ as it generates many errors
+do-install:
 	@${ECHO_MSG} -n ">> Installing .jar files..."
-	@${INSTALL_DATA} ${BUILDDIR}/${JARFILE} ${STAGEDIR}${JAVAJARDIR}/${DESTJARFILE}
+	${INSTALL_DATA} ${BUILDDIR}/${JARFILE} ${STAGEDIR}${JAVAJARDIR}/${DESTJARFILE}
 	@${ECHO_MSG} " [ DONE ]"

-do-install-apidocs:
-.if ${PORT_OPTIONS:MDOCS}
+do-install-DOCS-on:
 	@${ECHO_MSG} -n ">> Installing documentation in ${DOCSDIR}..."
-	@${MKDIR} ${APIDOCSDIR}
-	@cd ${JAVADOCDIR} && for src in $$( ${FIND} . ) ; do \
-	    dst=${APIDOCSDIR}$${src#.} ; \
-	    if ${TEST} -d $$src ; then \
-	        ${MKDIR} $$dst ; \
-	    else \
-	        ${INSTALL_DATA} $$src $$dst ; \
-	    fi \
-	done
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@for extradoc in ${EXTRADOCS} ; do                          \
 	  ${INSTALL_DATA} ${INSTALL_WRKSRC}/$$extradoc ${STAGEDIR}${DOCSDIR} ; \
 	done
-	@${ECHO_MSG} " [ DONE ]"
+.if ${JAVA_PORT_VERSION:N1.8.*}
+	@${MKDIR} ${STAGEDIR}${APIDOCSDIR}
+	@cd ${JAVADOCDIR} && ${COPYTREE_SHARE} . ${APIDOCSDIR}
 .endif
+	@${ECHO_MSG} " [ DONE ]"

-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
--- a/databases/mysql-connector-java/distinfo
+++ b/databases/mysql-connector-java/distinfo
@ -1,2 +1,3 @@
-SHA256 (mysql-connector-java-5.1.38.tar.gz) = fa6232a0bcf67dc7d9acac9dc58910644e50790cbd8cc2f854e2c17f91b2c224
-SIZE (mysql-connector-java-5.1.38.tar.gz) = 3938241
+TIMESTAMP = 1463998110
+SHA256 (mysql-connector-java-5.1.39.tar.gz) = fa1bdc9ee5323642c5a533fa73fbcf537b26a979e5981c486c24256c433c7718
+SIZE (mysql-connector-java-5.1.39.tar.gz) = 3899019
--- a/databases/pgbarman/Makefile
+++ b/databases/pgbarman/Makefile
@ -2,8 +2,7 @@
 # $FreeBSD$

 PORTNAME=	barman
-DISTVERSION=	1.6.0
-PORTREVISION=	1
+DISTVERSION=	1.6.1
 CATEGORIES=	databases
 MASTER_SITES=	SF/${PKGNAMEPREFIX}${PORTNAME}/${DISTVERSION}
 PKGNAMEPREFIX=	pg
--- a/databases/pgbarman/distinfo
+++ b/databases/pgbarman/distinfo
@ -1,4 +1,5 @@
-SHA256 (barman-1.6.0.tar.gz) = 771957451fafef93f64d7ce08f43530b86f52fb31451ecc180a40856c707bc76
-SIZE (barman-1.6.0.tar.gz) = 157048
+TIMESTAMP = 1464011005
+SHA256 (barman-1.6.1.tar.gz) = 2fb8bbf0a386114dda4f1ade3e02a79aede5e3dd77c6b8d4f872b75fd1427e65
+SIZE (barman-1.6.1.tar.gz) = 189826
 SHA256 (tutorial.pdf) = 21acf6152b959c55b996fb6479c722d3f416eac3384479498a25911a3912a158
 SIZE (tutorial.pdf) = 349394
--- a/databases/pgespresso/Makefile
+++ b/databases/pgespresso/Makefile
@ -2,8 +2,7 @@
 # $FreeBSD$

 PORTNAME=	pgespresso
-PORTVERSION=	1.0
-PORTREVISION=	1
+PORTVERSION=	1.1
 CATEGORIES=	databases

 MAINTAINER=	matthew@FreeBSD.org
--- a/databases/pgespresso/distinfo
+++ b/databases/pgespresso/distinfo
@ -1,2 +1,3 @@
-SHA256 (2ndquadrant-it-pgespresso-1.0_GH0.tar.gz) = c6a0fbbe421d762b3e17934fe61649420744639f2b032844a81699121d0dfb31
-SIZE (2ndquadrant-it-pgespresso-1.0_GH0.tar.gz) = 9469
+TIMESTAMP = 1463999096
+SHA256 (2ndquadrant-it-pgespresso-1.1_GH0.tar.gz) = a43895dc282fd0060e079877ba0f0a7c8e8ca33b60bb47f323a0ff8adc774ebf
+SIZE (2ndquadrant-it-pgespresso-1.1_GH0.tar.gz) = 9980
--- a/databases/pgespresso/files/patch-pgespresso.c
+++ b/databases/pgespresso/files/patch-pgespresso.c
@ -1,42 +0,0 @@
--- pgespresso.c.orig	2014-04-11 10:46:36 UTC
-+++ pgespresso.c
-@@ -78,10 +78,38 @@ pgespresso_start_backup(PG_FUNCTION_ARGS
- 	}
- 
- 	/*
-+	 * Starting from 9.5 the do_pg_start_backup caller needs to allocate the
-+	 * 'pg_tblspc' directory and pass it as argument.
-+	 *
-+	 * Ref: http://git.postgresql.org/gitweb/?p=postgresql.git;h=72d422a
-+	 */
-+	#if PG_VERSION_NUM >= 90500
-+	{
-+		DIR	*dir;
-+
-+		/* Make sure we can open the directory with
-+		   tablespaces in it */
-+		dir = AllocateDir("pg_tblspc");
-+
-+		if (!dir)
-+			ereport(ERROR,
-+					(errmsg("could not open directory \"%s\": %m", "pg_tblspc")));
-+
-+		/*
-+		 * We are not filling the tablespace map here.
-+		 * This means that on 9.5 the 'tablespace_map' file has to be
-+		 * generated by the invoker.
-+		 */
-+		do_pg_start_backup(backupidstr, fast, NULL, &labelfile,
-+						   dir, NULL, NULL, false, false);
-+
-+		FreeDir(dir);
-+	}
-+	/*
- 	 * Starting from 9.3 the do_pg_start_backup returns the timeline ID
- 	 * in *starttli_p additional argument
- 	 */
-	#if PG_VERSION_NUM >= 90300
-+	#elif PG_VERSION_NUM >= 90300
- 		do_pg_start_backup(backupidstr, fast, NULL, &labelfile);
- 	#else
- 		do_pg_start_backup(backupidstr, fast, &labelfile);
--- a/databases/pgpool-II-33/Makefile
+++ b/databases/pgpool-II-33/Makefile
@ -28,7 +28,7 @@ DOCS=		AUTHORS COPYING ChangeLog INSTALL NEWS README README.euc_jp \
 		doc/tutorial-en.html doc/tutorial-ja.html

 OPTIONS_DEFINE+=	DOCS SSL LIBMEMCACHED PAM
-OPTIONS_DEFAULT=	DOCS SSL PAM
+OPTIONS_DEFAULT=	SSL PAM

 # Buggy configure: adding eg. --without-pam to CONFIGURE_ARGS causes
 # USE_PAM to be *defined* in config.h Omit the --with-pam or
--- a/deskutils/genius/Makefile
+++ b/deskutils/genius/Makefile
@ -29,7 +29,6 @@ INSTALLS_ICONS=	yes
 INSTALLS_OMF=	yes

 OPTIONS_DEFINE=		NLS
-OPTIONS_DEFAULT=	NLS
 OPTIONS_SUB=		yes

 NLS_USES=		gettext
--- a/deskutils/howm/Makefile
+++ b/deskutils/howm/Makefile
@ -16,7 +16,7 @@ ELISP=		action-lock.el bcomp.el cheat-font-lock.el \
 		howm-version.el howm-view.el howm.el riffle.el

 OPTIONS_DEFINE=	COMPILED_ELISP DOCS EXAMPLES
-OPTIONS_DEFAULT=COMPILED_ELISP DOCS EXAMPLES
+OPTIONS_DEFAULT=COMPILED_ELISP
 COMPILED_ELISP_DESC=	Install pre-compiled ELISP files
 OPTIONS_SUB=	yes

--- a/deskutils/moregroupware/Makefile
+++ b/deskutils/moregroupware/Makefile
@ -25,7 +25,7 @@ WANT_PHP_MOD=	yes
 OPTIONS_DEFINE=	ADDONS NLS
 OPTIONS_SINGLE=	DB
 OPTIONS_SINGLE_DB=	PGSQL MYSQL
-OPTIONS_DEFAULT=	NLS MYSQL
+OPTIONS_DEFAULT=	MYSQL
 ADDONS_DESC=	install additional workgroup features (addons)
 OPTIONS_SUB=	yes

--- a/deskutils/xfce4-notification-daemon/Makefile
+++ b/deskutils/xfce4-notification-daemon/Makefile
@ -38,7 +38,7 @@ OPTIONS_DEFINE=	GRADIENT CLOSE NLS
 GRADIENT_DESC=	Show a gradient look in the default theme
 CLOSE_DESC=	Show the close button in the default theme

-OPTIONS_DEFAULT=CLOSE NLS
+OPTIONS_DEFAULT=CLOSE

 .include <bsd.port.options.mk>

--- a/devel/apr1/Makefile
+++ b/devel/apr1/Makefile
@ -32,7 +32,7 @@ OPTIONS_GROUP_APR=	IPV6 DEVRANDOM
 OPTIONS_GROUP_APU=	BDB GDBM LDAP MYSQL NDBM PGSQL SQLITE FREETDS
 OPTIONS_RADIO=		CRYPTO
 OPTIONS_RADIO_CRYPTO=	SSL NSS
-OPTIONS_DEFAULT=	IPV6 DEVRANDOM BDB GDBM SSL
+OPTIONS_DEFAULT=	DEVRANDOM BDB GDBM SSL

 DEVRANDOM_DESC=		Use /dev/random or compatible
 NDBM_DESC=		NDBM support
--- a/devel/apr2/Makefile
+++ b/devel/apr2/Makefile
@ -15,7 +15,7 @@ LICENSE=	APACHE20

 LIB_DEPENDS=	libexpat.so:textproc/expat2

-NO_PACKAGE=	yes
+NO_PACKAGE=	Developper only package

 # r1676013
 SNAPDATE=	20150425134304
@ -36,7 +36,7 @@ OPTIONS_GROUP_APR=	IPV6 DEVRANDOM
 OPTIONS_GROUP_APU=	BDB GDBM MYSQL NDBM PGSQL SQLITE
 OPTIONS_RADIO=		CRYPTO
 OPTIONS_RADIO_CRYPTO=	SSL NSS
-OPTIONS_DEFAULT=	THREADS IPV6 DEVRANDOM BDB GDBM SSL
+OPTIONS_DEFAULT=	THREADS DEVRANDOM BDB GDBM SSL

 DEVELOPER_ONLY_DESC=	I want to test apr2 not the maintainer
 DEVRANDOM_DESC=		Use /dev/random or compatible
--- a/devel/creduce/Makefile
+++ b/devel/creduce/Makefile
@ -1,15 +1,15 @@
 # $FreeBSD$

 PORTNAME=	creduce
-DISTVERSION=	2.4.0
+DISTVERSION=	2.5.0
 CATEGORIES=	devel
 MASTER_SITES=	http://embed.cs.utah.edu/creduce/

 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Produces small test cases

-BUILD_DEPENDS=	llvm-config37:devel/llvm37
-RUN_DEPENDS=	llvm-config37:devel/llvm37 \
+BUILD_DEPENDS=	llvm-config38:devel/llvm38
+RUN_DEPENDS=	llvm-config38:devel/llvm38 \
 		topformflat:devel/delta \
 		astyle:devel/astyle \
 		p5-Benchmark-Timer>=0:devel/p5-Benchmark-Timer \
@ -21,10 +21,10 @@ RUN_DEPENDS=	llvm-config37:devel/llvm37 \

 GNU_CONFIGURE=	yes
 CONFIGURE_FLAGS=	--with-llvm=${LOCALBASE}
-CONFIGURE_ENV=	LLVM_CONFIG=${LOCALBASE}/bin/llvm-config37 \
-		CC=${LOCALBASE}/bin/clang37 \
-		CXX=${LOCALBASE}/bin/clang++37 \
-		CPP=${LOCALBASE}/bin/clang-cpp37
+CONFIGURE_ENV=	LLVM_CONFIG=${LOCALBASE}/bin/llvm-config38 \
+		CC=${LOCALBASE}/bin/clang38 \
+		CXX=${LOCALBASE}/bin/clang++38 \
+		CPP=${LOCALBASE}/bin/clang-cpp38

 USES=	autoreconf gmake libtool perl5

--- a/devel/creduce/distinfo
+++ b/devel/creduce/distinfo
@ -1,2 +1,3 @@
-SHA256 (creduce-2.4.0.tar.gz) = 0b4c5184b7bdc369a476c0eb4d41f1618f66e82d7ebeafa9492c0355ce63ed35
-SIZE (creduce-2.4.0.tar.gz) = 677706
+TIMESTAMP = 1463921303
+SHA256 (creduce-2.5.0.tar.gz) = 2dcd784e1d27df60f4ea1d92c4c556c02da4152db353d544dce8b7813fa443e4
+SIZE (creduce-2.5.0.tar.gz) = 742516
--- a/devel/creduce/pkg-plist
+++ b/devel/creduce/pkg-plist
@ -2,17 +2,23 @@ bin/creduce
 libexec/clang_delta
 libexec/clex
 libexec/strlex
+libexec/topformflat
+libexec/unifdef
 %%DATADIR%%/perl/creduce_config.pm
 %%DATADIR%%/perl/creduce_regexes.pm
 %%DATADIR%%/perl/creduce_utils.pm
 %%DATADIR%%/perl/pass_balanced.pm
 %%DATADIR%%/perl/pass_blank.pm
-%%DATADIR%%/perl/pass_clang_binsrch.pm
 %%DATADIR%%/perl/pass_clang.pm
+%%DATADIR%%/perl/pass_clang_binsrch.pm
 %%DATADIR%%/perl/pass_clex.pm
+%%DATADIR%%/perl/pass_comments.pm
+%%DATADIR%%/perl/pass_include_includes.pm
+%%DATADIR%%/perl/pass_includes.pm
 %%DATADIR%%/perl/pass_indent.pm
 %%DATADIR%%/perl/pass_ints.pm
 %%DATADIR%%/perl/pass_lines.pm
 %%DATADIR%%/perl/pass_peep.pm
 %%DATADIR%%/perl/pass_special.pm
 %%DATADIR%%/perl/pass_ternary.pm
+%%DATADIR%%/perl/pass_unifdef.pm
--- a/devel/eblob/Makefile
+++ b/devel/eblob/Makefile
@ -23,7 +23,7 @@ USES=		cmake
 USE_LDCONFIG=	yes

 OPTIONS_DEFINE=	ASSERT PYTHON SNAPPY EXAMPLES TESTS
-OPTIONS_DEFAULT=PYTHON SNAPPY EXAMPLES TESTS
+OPTIONS_DEFAULT=PYTHON SNAPPY TESTS
 TESTS_DESC=	Build tests

 .include <bsd.port.options.mk>
--- a/devel/extra-cmake-modules/Makefile
+++ b/devel/extra-cmake-modules/Makefile
@ -21,7 +21,7 @@ NO_ARCH=	yes
 ## options

 OPTIONS_DEFINE=	DOCS MANPAGES
-OPTIONS_DEFAULT=DOCS MANPAGES
+OPTIONS_DEFAULT=MANPAGES

 SPHINX_DEP=		sphinx-build:textproc/py-sphinx
 DOCS_BUILD_DEPENDS=	${SPHINX_DEP}
--- a/devel/gcc-arm-embedded/Makefile
+++ b/devel/gcc-arm-embedded/Makefile
@ -16,7 +16,7 @@ LICENSE_COMB=	multi
 BROKEN_powerpc64=	Does not build

 OPTIONS_DEFINE=	PURE PYGDB EXAMPLES HTML PDF DOCS
-OPTIONS_DEFAULT=EXAMPLES PYGDB
+OPTIONS_DEFAULT=PYGDB
 PURE_DESC=	Use all libraries from bundle, do not depend on anything
 HTML_DESC=	Install HTML documentation
 PDF_DESC=	Install PDF documentation (requires TeX, it is huge)
--- a/devel/giggle/Makefile
+++ b/devel/giggle/Makefile
@ -19,7 +19,6 @@ BUILD_DEPENDS=	git:devel/git \
 RUN_DEPENDS=	git:devel/git

 OPTIONS_DEFINE=	NLS
-OPTIONS_DEFAULT=	NLS
 #VTE_DESC=	Terminal Widget

 GNU_CONFIGURE=	yes
--- a/devel/godot/Makefile
+++ b/devel/godot/Makefile
@ -26,7 +26,7 @@ MAKE_ARGS+=	platform=x11
 CXXFLAGS+=	-DRTAUDIO_ENABLED

 OPTIONS_DEFINE=	EXAMPLES TOOLS
-OPTIONS_DEFAULT=	EXAMPLES TOOLS
+OPTIONS_DEFAULT=	TOOLS
 OPTIONS_SUB=	yes

 TOOLS_DESC=	Include development tools (IDE)
--- a/devel/hadoop2/Makefile
+++ b/devel/hadoop2/Makefile
@ -44,7 +44,6 @@ SHEBANG_FILES=	hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/sbin/httpfs.sh ha
 MAKE_ENV+=	JAVA_HOME=${JAVA_HOME} HADOOP_PROTOC_PATH=${LOCALBASE}/protobuf25/bin/protoc

 OPTIONS_DEFINE=		EXAMPLES
-OPTIONS_DEFAULT=	EXAMPLES

 TOMCAT_VERSION=	6.0.44
 HADOOP_DIST=	${WRKSRC}/hadoop-dist/target/hadoop-${PORTVERSION}
--- a/devel/kdbg/Makefile
+++ b/devel/kdbg/Makefile
@ -17,7 +17,6 @@ USE_QT4=	moc_build qmake_build rcc_build uic_build
 INSTALLS_ICONS=	yes

 OPTIONS_DEFINE=	NLS
-OPTIONS_DEFAULT=NLS

 .include <bsd.port.options.mk>

--- a/devel/libconcurrent/Makefile
+++ b/devel/libconcurrent/Makefile
@ -22,7 +22,6 @@ GH_TAGNAME=	f55d33a789a4b2c6267268ec2d44a245f766f500
 ONLY_FOR_ARCHS=	i386 amd64

 OPTIONS_DEFINE=	EXAMPLES
-OPTIONS_DEFAULT=	EXAMPLES

 MAKEFILE=	makefile
 MAKE_ARGS=	LIBCONCURRENT_DESTDIR=${STAGEDIR}${PREFIX}
--- a/devel/libftdi1/Makefile
+++ b/devel/libftdi1/Makefile
@ -15,7 +15,7 @@ BROKEN_powerpc64=	Does not build
 LIB_DEPENDS=	libconfuse.so:devel/libconfuse

 OPTIONS_DEFINE=		PYTHON BOOST DOCS EXAMPLES
-OPTIONS_DEFAULT=	PYTHON BOOST DOCS EXAMPLES
+OPTIONS_DEFAULT=	PYTHON BOOST
 OPTIONS_SUB=		yes

 BOOST_DESC=	Build with boost
--- a/devel/libublio/Makefile
+++ b/devel/libublio/Makefile
@ -3,12 +3,15 @@

 PORTNAME=	libublio
 PORTVERSION=	20070103
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	LOCAL/mandree

 MAINTAINER=	mandree@FreeBSD.org
 COMMENT=	User space caching library

+LICENSE=	BSD2CLAUSE
+
 USE_LDCONFIG=	yes

 .if defined(NO_PROFILE) || defined(NOPROFILE) || defined(WITHOUT_PROFILE)
@ -22,6 +25,9 @@ USES=		uidfix
 SRCCONF=	/dev/null
 MAKE_ENV+=	SRCCONF=${SRCCONF}

+SUB_FILES=	libublio.pc
+SUB_LIST=	PREFIX=${PREFIX} PORTVERSION=${PORTVERSION}
+
 OPTIONS_DEFINE=	DOCS

 post-extract:
@ -37,5 +43,6 @@ pre-install:
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKDIR}/libublio.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig/

 .include <bsd.port.mk>
--- a/devel/libublio/pkg-plist
+++ b/devel/libublio/pkg-plist
@ -3,4 +3,5 @@ lib/libublio.a
 %%PROFLIB%%lib/libublio_p.a
 lib/libublio.so
 lib/libublio.so.1
+libdata/pkgconfig/libublio.pc
 %%PORTDOCS%%%%DOCSDIR%%/README
--- a/devel/lockfree-malloc/Makefile
+++ b/devel/lockfree-malloc/Makefile
@ -19,7 +19,6 @@ USES=		tar:bzip2
 USE_GCC=	yes

 OPTIONS_DEFINE=	DOCS
-OPTIONS_DEFAULT=DOCS
 DOCS_DESC=	Install README

 PLIST_FILES=	lib/liblite-malloc-shared.so \
--- a/devel/omniORB-4.1/Makefile
+++ b/devel/omniORB-4.1/Makefile
@ -28,7 +28,7 @@ CONFIGURE_ARGS=	--datadir=${DATADIR} --with-openssl=${OPENSSLBASE} \
 		--with-omniNames-logdir=/var/log

 OPTIONS_DEFINE=	DOCS EXAMPLES STATIC
-OPTIONS_DEFAULT=	DOCS EXAMPLES STATIC
+OPTIONS_DEFAULT=	STATIC
 OPTIONS_SUB=	yes
 STATIC_CONFIGURE_OFF=	--disable-static

--- a/devel/omniORB/Makefile
+++ b/devel/omniORB/Makefile
@ -23,7 +23,7 @@ CONFIGURE_ARGS=	--datadir=${DATADIR} --with-openssl=${OPENSSLBASE} \
 		--with-omniORB-config=${PREFIX}/etc/omniORB.cfg \
 		--with-omniNames-logdir=/var/log
 OPTIONS_DEFINE=	DOCS STATIC
-OPTIONS_DEFAULT=	DOCS STATIC
+OPTIONS_DEFAULT=	STATIC
 OPTIONS_SUB=	yes
 STATIC_CONFIGURE_OFF=	--disable-static
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION:S/-2//}
--- a/devel/p5-Config-General/Makefile
+++ b/devel/p5-Config-General/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	Config-General
-PORTVERSION=	2.60
+PORTVERSION=	2.61
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
--- a/devel/p5-Config-General/distinfo
+++ b/devel/p5-Config-General/distinfo
@ -1,2 +1,3 @@
-SHA256 (Config-General-2.60.tar.gz) = 5154146c0632ea1ccf7a3f9a7d893f001322ebc7b651254b458ca5dc77fe38ae
-SIZE (Config-General-2.60.tar.gz) = 61992
+TIMESTAMP = 1463993557
+SHA256 (Config-General-2.61.tar.gz) = 379a160ddac33c02045d2b7e20b37ca9b155722ce20374f9f245e519f7d7a6ca
+SIZE (Config-General-2.61.tar.gz) = 62878
--- a/devel/p5-DateTime-TimeZone/Makefile
+++ b/devel/p5-DateTime-TimeZone/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	DateTime-TimeZone
-PORTVERSION=	1.97
+PORTVERSION=	1.98
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
--- a/devel/p5-DateTime-TimeZone/distinfo
+++ b/devel/p5-DateTime-TimeZone/distinfo
@ -1,2 +1,3 @@
-SHA256 (DateTime-TimeZone-1.97.tar.gz) = 68a5f4b0a77074f9cc96b2c1d2282e2110db74f55e43fbad72926cee0fd434c8
-SIZE (DateTime-TimeZone-1.97.tar.gz) = 922750
+TIMESTAMP = 1463993606
+SHA256 (DateTime-TimeZone-1.98.tar.gz) = 8d6a8289b2535d0dbe1579cc426bab95788eb482dd039b164aed01ad2e5b65c2
+SIZE (DateTime-TimeZone-1.98.tar.gz) = 927078
--- a/devel/p5-DateTime-TimeZone/pkg-plist
+++ b/devel/p5-DateTime-TimeZone/pkg-plist
@ -222,6 +222,7 @@
 %%SITE_PERL%%/DateTime/TimeZone/Asia/Tehran.pm
 %%SITE_PERL%%/DateTime/TimeZone/Asia/Thimphu.pm
 %%SITE_PERL%%/DateTime/TimeZone/Asia/Tokyo.pm
+%%SITE_PERL%%/DateTime/TimeZone/Asia/Tomsk.pm
 %%SITE_PERL%%/DateTime/TimeZone/Asia/Ulaanbaatar.pm
 %%SITE_PERL%%/DateTime/TimeZone/Asia/Urumqi.pm
 %%SITE_PERL%%/DateTime/TimeZone/Asia/Ust_Nera.pm
@ -273,6 +274,7 @@
 %%SITE_PERL%%/DateTime/TimeZone/Europe/Istanbul.pm
 %%SITE_PERL%%/DateTime/TimeZone/Europe/Kaliningrad.pm
 %%SITE_PERL%%/DateTime/TimeZone/Europe/Kiev.pm
+%%SITE_PERL%%/DateTime/TimeZone/Europe/Kirov.pm
 %%SITE_PERL%%/DateTime/TimeZone/Europe/Lisbon.pm
 %%SITE_PERL%%/DateTime/TimeZone/Europe/London.pm
 %%SITE_PERL%%/DateTime/TimeZone/Europe/Luxembourg.pm
--- a/devel/staf/Makefile
+++ b/devel/staf/Makefile
@ -30,7 +30,7 @@ MAKE_ARGS=	OS_NAME="freebsd" \
 		PROJECTS="${STAF_PROJECTS}"

 OPTIONS_DEFINE=	DEBUG IPV6 OPENSSL PYTHON
-OPTIONS_DEFAULT=IPV6 OPENSSL
+OPTIONS_DEFAULT=OPENSSL
 OPTIONS_SUB=	yes

 DEBUG_VARS=	staf_build_type=debug
--- a/devel/swig13/Makefile
+++ b/devel/swig13/Makefile
@ -32,7 +32,6 @@ PORTEXAMPLES=	*
 PORTDATA=	*

 OPTIONS_DEFINE=	LUA DOCS EXAMPLES
-OPTIONS_DEFAULT=DOCS EXAMPLES

 LUA_DESC=	Lua support
 LUA_USES=	lua:51
--- a/devel/zpu-binutils/pkg-descr
+++ b/devel/zpu-binutils/pkg-descr
@ -8,5 +8,4 @@ Academic circles have found the ZPU appealing since the actual core is
 trivial and allows them to focus on some other aspect of research or
 student exercises.

-
 WWW: http://opensource.zylin.com/zpu.htm
--- a/dns/bind9-devel/Makefile
+++ b/dns/bind9-devel/Makefile
@ -6,21 +6,18 @@ PORTVERSION=	${ISCVERSION:S/-P/P/:S/b/.b/}
 PORTREVISION=	0
 CATEGORIES=	dns net ipv6
 MASTER_SITES=	LOCAL/mat/bind
-#MASTER_SITES=	https://source.isc.org/cgi-bin/gitweb.cgi?p=bind9.git;a=snapshot;h=${HASH};sf=tgz;f=
+#MASTER_SITES=	https://source.isc.org/cgi-bin/gitweb.cgi?p=bind9.git;a=snapshot;h=${HASH};sf=tgz;/
 PKGNAMESUFFIX=	9-devel
 DISTNAME=	${PORTNAME}9-${HASH}

-# Force the filename when fetched from the ISC gitweb.
-FETCH_BEFORE_ARGS=	-o ${DISTFILES}
-
 MAINTAINER=	mat@FreeBSD.org
 COMMENT=	BIND DNS suite with updated DNSSEC and DNS64

 LICENSE=	ISCL

 # ISC releases things like 9.8.0-P1, which our versioning doesn't like
-ISCVERSION=	9.11.0.a20160517
-HASH=		75167fb
+ISCVERSION=	9.11.0.a20160522
+HASH=		da06956

 MAKE_JOBS_UNSAFE=	yes

@ -47,7 +44,7 @@ CONFLICTS+=	bind9*-9.[456789].* bind9*-sdb-9.[456789].*

 SUB_FILES=	pkg-message

-OPTIONS_DEFAULT=	IPV6 SSL THREADS SIGCHASE IDN GSSAPI_NONE
+OPTIONS_DEFAULT=	SSL THREADS SIGCHASE IDN GSSAPI_NONE
 OPTIONS_DEFINE=		IDN LARGE_FILE PYTHON START_LATE \
 			FIXED_RRSET SIGCHASE IPV6 THREADS FILTER_AAAA
 OPTIONS_RADIO=	CRYPTO GOSTDEF
--- a/dns/bind9-devel/distinfo
+++ b/dns/bind9-devel/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1463486175
-SHA256 (bind9-75167fb.tar.gz) = 82d8dc3ce81dfc1903edfbfc4d77b6e984ca571ac62f0584479c1bd3b89ce822
-SIZE (bind9-75167fb.tar.gz) = 11743906
+TIMESTAMP = 1464007451
+SHA256 (bind9-da06956.tar.gz) = f5ca53eb319a2aecfa107f95389db67297bc3924014201432cc7ba75810d24f3
+SIZE (bind9-da06956.tar.gz) = 11743827
--- a/dns/bind99/Makefile
+++ b/dns/bind99/Makefile
@ -42,7 +42,7 @@ CONFLICTS=	bind9*-9.[45678].* bind9*-sdb-9.[45678].* bind-tools-9.*

 SUB_FILES=	pkg-message

-OPTIONS_DEFAULT=	IPV6 SSL THREADS SIGCHASE IDN GSSAPI_NONE RRL
+OPTIONS_DEFAULT=	SSL THREADS SIGCHASE IDN GSSAPI_NONE RRL
 OPTIONS_DEFINE=		SSL IDN REPLACE_BASE LARGE_FILE FIXED_RRSET SIGCHASE \
 			IPV6 THREADS FILTER_AAAA GOST PYTHON START_LATE MINCACHE \
 			LINKS RPZ_NSIP RPZ_NSDNAME RRL DOCS RPZ_PATCH NEWSTATS \
--- a/dns/dnsmasq-devel/Makefile
+++ b/dns/dnsmasq-devel/Makefile
@ -26,7 +26,7 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}" PREFIX="${PREFIX}" COPTS="${CFLAGS}" LIBS="${LDFLAGS}" RPM_OPT_FLAGS="${CPPFLAGS}"

 OPTIONS_DEFINE=		IPV6 DBUS LUA DNSSEC DOCS
-OPTIONS_DEFAULT=	IPV6 NLS DNSSEC
+OPTIONS_DEFAULT=	DNSSEC
 OPTIONS_EXCLUDE+=	EXAMPLES
 OPTIONS_RADIO=		INTL
 OPTIONS_RADIO_INTL=	IDN NLS
--- a/dns/libbind/Makefile
+++ b/dns/libbind/Makefile
@ -20,7 +20,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir=/var --with-randomdev=/dev/random

 OPTIONS_DEFINE=	IPV6 THREADS
-OPTIONS_DEFAULT=	IPV6 THREADS
+OPTIONS_DEFAULT=	THREADS

 IPV6_CONFIGURE_ENABLE=		ipv6
 THREADS_CONFIGURE_ENABLE=	threads
--- a/dns/nsd/Makefile
+++ b/dns/nsd/Makefile
@ -53,7 +53,7 @@ PORTDOCS=	CREDITS ChangeLog LICENSE NSD-DATABASE NSD-DIFFFILE \

 OPTIONS_DEFINE=		ROOT_SERVER LARGEFILE IPV6 BIND8_STATS CHECKING \
 		MINRESPSIZE NSEC3 MMAP DOCS RRL ZONE_STATS MUNIN_PLUGIN
-OPTIONS_DEFAULT=	LARGEFILE IPV6 NSEC3 MINRESPSIZE RRL
+OPTIONS_DEFAULT=	LARGEFILE NSEC3 MINRESPSIZE RRL
 OPTIONS_SUB=	yes

 MUNIN_PLUGIN_IMPLIES=	BIND8_STATS
--- a/editors/apel/Makefile
+++ b/editors/apel/Makefile
@ -32,7 +32,6 @@ MAKE_ARGS+=	PREFIX="${STAGEDIR}${LOCALBASE}" \
 		VERSION_SPECIFIC_LISPDIR="${STAGEDIR}${APEL_VERSION_SPECIFIC_LISPDIR}"

 OPTIONS_DEFINE=	DOCS
-OPTIONS_DEFAULT=DOCS

 .include <bsd.port.pre.mk>

--- a/editors/flim/Makefile
+++ b/editors/flim/Makefile
@ -38,7 +38,6 @@ EMACS_MASTERDIR_PKGFILES=YES
 DESCR=		${PKGDIR}/pkg-descr

 OPTIONS_DEFINE=	DOCS
-OPTIONS_DEFAULT=	DOCS

 # target name for make build
 ALL_TARGET?=	elc
--- a/editors/jed/Makefile
+++ b/editors/jed/Makefile
@ -19,7 +19,7 @@ LIB_DEPENDS=	libslang.so:devel/libslang2
 CONFLICTS=	jed-devel-[0-9]*

 OPTIONS_DEFINE=	X11 PERMS HOSTLOOKUP DOCS
-OPTIONS_DEFAULT=X11 HOSTLOOKUP DOCS
+OPTIONS_DEFAULT=X11 HOSTLOOKUP

 PERMS_DESC=	Respect permissions by Root
 HOSTLOOKUP_DESC=Look-up for hostname
--- a/editors/semi/Makefile
+++ b/editors/semi/Makefile
@ -43,7 +43,6 @@ MAKE_ARGS+=	PREFIX="${STAGEDIR}${LOCALBASE}" \
 		VERSION_SPECIFIC_LISPDIR="${STAGEDIR}${SEMI_VERSION_SPECIFIC_LISPDIR}"

 OPTIONS_DEFINE=	DOCS
-OPTIONS_DEFAULT=	DOCS

 .include <bsd.port.pre.mk>
 .include <bsd.port.options.mk>
--- a/editors/texworks/Makefile
+++ b/editors/texworks/Makefile
@ -45,7 +45,6 @@ PLIST_DIRS=	lib/texworks
 PORTDOCS=	*

 OPTIONS_DEFINE=	DOCS LUA PYTHON
-OPTIONS_DEFAULT=DOCS
 LUA_USES=	lua:51
 LUA_PLIST_FILES=lib/texworks/libTWLuaPlugin.so
 PYTHON_USES=	python:3
--- a/emulators/dolphin-emu/Makefile
+++ b/emulators/dolphin-emu/Makefile
@ -52,7 +52,7 @@ CMAKE_ARGS+=	-DDOLPHIN_WC_BRANCH:STRING="stable" \
 		-DDOLPHIN_WC_REVISION:STRING="1"

 OPTIONS_DEFINE=	PULSEAUDIO PORTAUDIO DEBUG FRAMEDUMPS UPNP NLS
-OPTIONS_DEFAULT=	PORTAUDIO FRAMEDUMPS UPNP NLS
+OPTIONS_DEFAULT=	PORTAUDIO FRAMEDUMPS UPNP
 OPTIONS_SUB=	yes
 PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PULSEAUDIO_CMAKE_ON=	-DDISABLE_PULSEAUDIO:BOOL=OFF
--- a/emulators/i386-wine-devel/Makefile.inc
+++ b/emulators/i386-wine-devel/Makefile.inc
@ -2,8 +2,7 @@
 # $FreeBSD$

 PORTNAME=	wine
-PORTVERSION=	1.9.9
-PORTREVISION=	1
+PORTVERSION=	1.9.10
 PORTEPOCH=	1
 CATEGORIES=	emulators
 MASTER_SITES=	LOCAL/dbn/repos/wine/${DIST_SUBDIR}/
--- a/emulators/i386-wine-devel/distinfo
+++ b/emulators/i386-wine-devel/distinfo
@ -1,12 +1,13 @@
-SHA256 (freebsd:9:x86:64/i386-wine-devel-1.9.9_1,1.txz) = 8a2d1c338aac045bea2819a96cbd9affeac34f9922c395e22fc5e769a439fcbe
-SIZE (freebsd:9:x86:64/i386-wine-devel-1.9.9_1,1.txz) = 40030432
-SHA256 (freebsd:9:x86:64/i386-wine-staging-1.9.9_1,1.txz) = 41aca432f23aa57df56cae8ffaa735444cc2ab967a603357986ce8db39dd5afd
-SIZE (freebsd:9:x86:64/i386-wine-staging-1.9.9_1,1.txz) = 42723752
-SHA256 (freebsd:10:x86:64/i386-wine-devel-1.9.9_1,1.txz) = b9d1da6782646f4804f9c036c74fedba541c4b55b160276be9e5b1293ae9271e
-SIZE (freebsd:10:x86:64/i386-wine-devel-1.9.9_1,1.txz) = 40113560
-SHA256 (freebsd:10:x86:64/i386-wine-staging-1.9.9_1,1.txz) = 6b53cc2bed54f75be84cc56cd9e47c8f822a11fd971772de87ead15759c06ab2
-SIZE (freebsd:10:x86:64/i386-wine-staging-1.9.9_1,1.txz) = 42814912
-SHA256 (freebsd:11:x86:64/i386-wine-devel-1.9.9_1,1.txz) = 4724f46d6f7ba34645757ff3091aa44cb82d8ae9c2139ed32dfba6384236aec6
-SIZE (freebsd:11:x86:64/i386-wine-devel-1.9.9_1,1.txz) = 39709092
-SHA256 (freebsd:11:x86:64/i386-wine-staging-1.9.9_1,1.txz) = dad06b375e5ba4b2b8bd26cbcd6522225f3f11851534423fd44825c9c54422e4
-SIZE (freebsd:11:x86:64/i386-wine-staging-1.9.9_1,1.txz) = 42363880
+TIMESTAMP = 1463959868
+SHA256 (freebsd:9:x86:64/i386-wine-devel-1.9.10,1.txz) = 3c1e6c5ab7ffb9fc39ae5531600612b3da7e92e69c4cc78a1a2b82270decf88e
+SIZE (freebsd:9:x86:64/i386-wine-devel-1.9.10,1.txz) = 40025444
+SHA256 (freebsd:9:x86:64/i386-wine-staging-1.9.10,1.txz) = 86bdf7364ca6dd16424d625cd31ac7b367e7fb85b81c4db5bca3088f86bf69fe
+SIZE (freebsd:9:x86:64/i386-wine-staging-1.9.10,1.txz) = 42826308
+SHA256 (freebsd:10:x86:64/i386-wine-devel-1.9.10,1.txz) = ee186e5a3092dd6da387bf11b943bbcc550cd85f796192b1beec6aa0ae5823fd
+SIZE (freebsd:10:x86:64/i386-wine-devel-1.9.10,1.txz) = 40119000
+SHA256 (freebsd:10:x86:64/i386-wine-staging-1.9.10,1.txz) = 7f131301c29d27410c6f699fc2c7c19acf7df6c60c6edd23d737db2eb265da09
+SIZE (freebsd:10:x86:64/i386-wine-staging-1.9.10,1.txz) = 42920148
+SHA256 (freebsd:11:x86:64/i386-wine-devel-1.9.10,1.txz) = 84621863177da8bdd3eefb1bd34d2d674f3609fb85cced27a36ee9cc42a3e952
+SIZE (freebsd:11:x86:64/i386-wine-devel-1.9.10,1.txz) = 39708428
+SHA256 (freebsd:11:x86:64/i386-wine-staging-1.9.10,1.txz) = 9f6d88504a2793c658150d413a2ba4de9eb9c0e76c055b4287ac2f6a97b2360d
+SIZE (freebsd:11:x86:64/i386-wine-staging-1.9.10,1.txz) = 42466404
--- a/ftp/lftp/Makefile
+++ b/ftp/lftp/Makefile
@ -35,7 +35,7 @@ SHEBANG_FILES=	src/verify-file \
 OPTIONS_DEFINE=	NLS
 OPTIONS_RADIO=	SSL
 OPTIONS_RADIO_SSL=	OPENSSL GNUTLS
-OPTIONS_DEFAULT=	SSL OPENSSL NLS
+OPTIONS_DEFAULT=	SSL OPENSSL
 OPTIONS_SUB=	yes
 NLS_USES=	gettext
 NLS_CONFIGURE_ENABLE=	nls
--- a/ftp/proftpd/Makefile
+++ b/ftp/proftpd/Makefile
@ -87,7 +87,7 @@ PLIST_FILES+=	libexec/proftpd/${m}.a \
 .endfor
 .else
 OPTIONS_DEFINE=	DOCS HTMLDOCS IPV6 NLS MEMCACHE PCRE
-OPTIONS_DEFAULT=	IPV6 NLS PCRE
+OPTIONS_DEFAULT=	PCRE

 HTMLDOCS_DESC=		Include HTML documentation
 MEMCACHE_DESC=		Memcache support using libmemcached
--- a/ftp/vsftpd-ext/Makefile
+++ b/ftp/vsftpd-ext/Makefile
@ -29,7 +29,7 @@ DOCFILES=	AUDIT BENCHMARKS BUGS Changelog FAQ INSTALL LICENSE \
 		SIZE SPEED TODO TUNING

 OPTIONS_DEFINE=	RC_SCRIPT VSFTPD_SSL DOCS
-OPTIONS_DEFAULT=RC_SCRIPT DOCS
+OPTIONS_DEFAULT=RC_SCRIPT
 RC_SCRIPT_DESC=	install RC_SCRIPT

 VSFTPD_SSL_DESC=Include support for SSL
--- a/ftp/yafc/Makefile
+++ b/ftp/yafc/Makefile
@ -13,7 +13,7 @@ COMMENT=	Yet another ftp client. Similar to ftp(1)
 LICENSE=	GPLv2+

 OPTIONS_DEFINE=	BASH EXAMPLES NLS SSH READLINE
-OPTIONS_DEFAULT=BASH NLS SSH
+OPTIONS_DEFAULT=BASH SSH

 USES=		gmake tar:xz
 USE_OPENSSL=	yes
--- a/games/0ad/Makefile
+++ b/games/0ad/Makefile
@ -38,8 +38,6 @@ USE_WX=		2.8+
 WX_COMPS=	wx:lib
 MAKE_ENV+=	JOBS=${_MAKE_JOBS}

-MANUAL_PACKAGE_BUILD=	huge
-
 PORTDATA=	*

 .include <bsd.port.pre.mk>
--- a/games/0verkill/Makefile
+++ b/games/0verkill/Makefile
@ -17,7 +17,7 @@ LICENSE_FILE=	${WRKSRC}/doc/COPYING
 GNU_CONFIGURE=	yes

 OPTIONS_DEFINE=	X11 DOCS
-OPTIONS_DEFAULT=X11 DOCS
+OPTIONS_DEFAULT=X11

 OPTIONS_SUB=	yes
 X11_USE=	XORG=xpm
--- a/games/crafty-open-enormous/Makefile
+++ b/games/crafty-open-enormous/Makefile
@ -17,8 +17,6 @@ RUN_DEPENDS=	crafty:games/crafty

 USES=		zip
 NO_WRKSUBDIR=	yes
-NO_PACKAGE=	Package is way too big
-LEGAL_PACKAGE=
 CONFLICTS=	crafty-open-large-* crafty-open-medium-* crafty-open-default-*

 do-build:
--- a/games/crafty-tablebase-no-pawn/Makefile
+++ b/games/crafty-tablebase-no-pawn/Makefile
@ -50,7 +50,6 @@ BROKEN_powerpc64=	Does not build
 RUN_DEPENDS=	crafty:games/crafty

 NO_BUILD=	yes
-NO_PACKAGE=	Way too big

 .if !defined(WITH_TBDIR)
 WITH_TBDIR=	${PREFIX}/lib/crafty/TB
--- a/games/crafty-tablebase-pawn/Makefile
+++ b/games/crafty-tablebase-pawn/Makefile
@ -40,7 +40,6 @@ RUN_DEPENDS=	crafty:games/crafty

 NO_BUILD=	yes
 NO_ARCH=	yes
-MANUAL_PACKAGE_BUILD=	too big

 .if !defined(WITH_TBDIR)
 WITH_TBDIR=	${PREFIX}/lib/crafty/TB
--- a/games/crafty/Makefile
+++ b/games/crafty/Makefile
@ -38,7 +38,6 @@ OPT=		-DHASHSTATS -DTRACE -DBOOKDIR=\\\"${WITH_BOOKDIR}\\\" \
 		-DPERSDIR=\\\"${WITH_PERSDIR}\\\" -DSKILL

 OPTIONS_DEFINE=	DOCS BOOK
-OPTIONS_DEFAULT=DOCS
 OPTIONS_SUB=	yes
 BOOK_DESC=	Include (default) opening book

--- a/Show More
+++ b/Show More