*/*: sync with upstream

Taken from: FreeBSD
2015-09-25 13:16:05 +02:00 · 2015-09-25 13:16:05 +02:00 · 2da42fe764
commit 2da42fe764
parent 1c66182d81
224 changed files with 7604 additions and 2385 deletions
--- a/archivers/p5-Archive-Zip/Makefile
+++ b/archivers/p5-Archive-Zip/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	Archive-Zip
-PORTVERSION=	1.51
+PORTVERSION=	1.53
 CATEGORIES=	archivers perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
--- a/archivers/p5-Archive-Zip/distinfo
+++ b/archivers/p5-Archive-Zip/distinfo
@ -1,2 +1,2 @@
-SHA256 (Archive-Zip-1.51.tar.gz) = 744fadb6cfb7a010a004644d2b90bd3720e1778a4e2615ae137d2d363b8dd287
-SIZE (Archive-Zip-1.51.tar.gz) = 193126
+SHA256 (Archive-Zip-1.53.tar.gz) = c66f3cdfd1965d47d84af1e37b997e17d3f8c5f2cceffc1e90d04d64001424b9
+SIZE (Archive-Zip-1.53.tar.gz) = 189493
--- a/audio/xhippo/Makefile
+++ b/audio/xhippo/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	xhippo
 PORTVERSION=	3.5
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	GNU

@ -25,11 +26,11 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 INFO=		xhippo

 post-extract:
-	@${LN} -sf xhippo.config ${WRKSRC}/xhippo.config.default
+	@${LN} -sf xhippo.config ${WRKSRC}/xhippo.config.sample

 post-patch:
 	@${REINPLACE_CMD} -e \
-		'/^sysconf_DATA/s|=.*|= xhippo.config.default|' \
+		'/^sysconf_DATA/s|=.*|= xhippo.config.sample|' \
 			${WRKSRC}/Makefile.in

 .include <bsd.port.mk>
--- a/audio/xhippo/pkg-plist
+++ b/audio/xhippo/pkg-plist
@ -1,6 +1,4 @@
 bin/xhippo
-@unexec if cmp -s %D/etc/xhippo.config %D/etc/xhippo.config.default; then rm -f %D/etc/xhippo.config; fi
-etc/xhippo.config.default
-@exec test -f %B/xhippo.config || cp %B/%f %B/xhippo.config
+@sample etc/xhippo.config.sample
 man/man1/xhippo.1.gz
 share/locale/de/LC_MESSAGES/xhippo.mo
--- a/databases/Makefile
+++ b/databases/Makefile
@ -809,6 +809,7 @@
    SUBDIR += redis
    SUBDIR += redis-devel
    SUBDIR += riak
+    SUBDIR += riak2
    SUBDIR += rocksdb
    SUBDIR += rrdman
    SUBDIR += rrdmerge
--- a/databases/elixir-calecto/Makefile
+++ b/databases/elixir-calecto/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	calecto
-PORTVERSION=	0.3.10
+PORTVERSION=	0.4.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	databases
 PKGNAMEPREFIX=	elixir-
--- a/databases/elixir-calecto/distinfo
+++ b/databases/elixir-calecto/distinfo
@ -1,2 +1,2 @@
-SHA256 (lau-calecto-v0.3.10_GH0.tar.gz) = f28fe284d605170d08e9c45ae59c09541df3fc6cc1e8c807a3f60c4c228f0762
-SIZE (lau-calecto-v0.3.10_GH0.tar.gz) = 9699
+SHA256 (lau-calecto-v0.4.0_GH0.tar.gz) = c33189dc03b336526ebebb2577444af50dc94520de42d5243e814dd2f783da69
+SIZE (lau-calecto-v0.4.0_GH0.tar.gz) = 10951
--- a/databases/elixir-calecto/pkg-plist
+++ b/databases/elixir-calecto/pkg-plist
@ -6,6 +6,15 @@ lib/elixir/lib/calecto/ebin/Elixir.Calecto.NaiveDateTime.beam
 lib/elixir/lib/calecto/ebin/Elixir.Calecto.Time.beam
 lib/elixir/lib/calecto/ebin/Elixir.Calecto.Utils.beam
 lib/elixir/lib/calecto/ebin/Elixir.Calecto.beam
+lib/elixir/lib/calecto/ebin/Elixir.Calendar.ContainsDate.Calecto.Date.beam
+lib/elixir/lib/calecto/ebin/Elixir.Calendar.ContainsDate.Calecto.DateTimeUTC.beam
+lib/elixir/lib/calecto/ebin/Elixir.Calendar.ContainsDate.Calecto.NaiveDateTime.beam
+lib/elixir/lib/calecto/ebin/Elixir.Calendar.ContainsDateTime.Calecto.DateTimeUTC.beam
+lib/elixir/lib/calecto/ebin/Elixir.Calendar.ContainsNaiveDateTime.Calecto.DateTimeUTC.beam
+lib/elixir/lib/calecto/ebin/Elixir.Calendar.ContainsNaiveDateTime.Calecto.NaiveDateTime.beam
+lib/elixir/lib/calecto/ebin/Elixir.Calendar.ContainsTime.Calecto.DateTimeUTC.beam
+lib/elixir/lib/calecto/ebin/Elixir.Calendar.ContainsTime.Calecto.NaiveDateTime.beam
+lib/elixir/lib/calecto/ebin/Elixir.Calendar.ContainsTime.Calecto.Time.beam
 lib/elixir/lib/calecto/ebin/Elixir.Mix.Tasks.Calecto.AddTypeMigration.beam
 lib/elixir/lib/calecto/ebin/calecto.app
 lib/elixir/lib/calecto/lib/calecto.ex
--- a/databases/riak2/Makefile
+++ b/databases/riak2/Makefile
@ -0,0 +1,97 @@
+# $FreeBSD$
+
+PORTNAME=	riak2
+PORTVERSION=	2.1.1
+CATEGORIES=	databases
+MASTER_SITES=	http://s3.amazonaws.com/downloads.basho.com/riak/${PORTVERSION:R}/${PORTVERSION}/ \
+	http://downloads.basho.com.s3.amazonaws.com/riak/${PORTVERSION:R}/${PORTVERSION}/ \
+	http://s3.amazonaws.com/files.basho.com/solr/:solr \
+	http://s3.amazonaws.com/files.basho.com/yokozuna/:yokozuna
+DISTNAME=	riak-${PORTVERSION}
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
+	solr-4.7.0-yz-1.tgz:solr \
+	yokozuna-1.jar:yokozuna \
+	yz_monitor-1.jar:yokozuna
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX} solr-4.7.0-yz-1.tgz
+
+MAINTAINER=	wg@FreeBSD.org
+COMMENT=	Riak is an open source, distributed, noSQL database
+
+LICENSE=	APACHE20
+
+BUILD_DEPENDS=	${LOCALBASE}/lib/riak-erlang/bin/erlc:${PORTSDIR}/lang/erlang-riak
+
+USES=		gmake readline
+USE_RC_SUBR=	riak
+USE_GCC=	yes
+
+USERS=		riak
+GROUPS=		riak
+
+RIAK_CONFDIR?=	${PREFIX}/etc/riak
+RIAK_DBDIR?=	/var/db/riak
+RIAK_HOMEDIR?=	${PREFIX}/lib/riak
+RIAK_LIBDIR?=	${PREFIX}/lib/riak/lib
+RIAK_LOGDIR?=	/var/log/riak
+
+PLIST_SUB+=	RIAK_CONFDIR=${RIAK_CONFDIR} \
+	RIAK_DBDIR=${RIAK_DBDIR} \
+	RIAK_HOMEDIR=${RIAK_HOMEDIR} \
+	RIAK_LIBDIR=${RIAK_LIBDIR} \
+	RIAK_LOGDIR=${RIAK_LOGDIR} \
+	USERS=${USERS} \
+	GROUPS=${GROUPS}
+
+ALL_TARGET=	rel
+MAKE_JOBS_UNSAFE=yes
+MAKE_ENV=	PATH=${LOCALBASE}/lib/riak-erlang/bin:${PATH}
+
+post-patch:
+	@${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/rel/vars.config
+	@${REINPLACE_CMD} -e 's|%%BUILD_DIR%%|${WRKDIR}|g' \
+		-e 's|%%DISTDIR%%|${DISTDIR}|g' \
+		-e 's|%%YOKOZUNA%%|${WRKSRC}/deps/yokozuna|g' \
+		${WRKSRC}/deps/yokozuna/tools/grab-solr.sh
+
+do-install:
+	${MKDIR} ${STAGEDIR}${RIAK_CONFDIR}
+	${MKDIR} ${STAGEDIR}${RIAK_DBDIR}
+	${MKDIR} ${STAGEDIR}${RIAK_LOGDIR}
+	${INSTALL_DATA} ${WRKSRC}/rel/riak/etc/riak.conf ${STAGEDIR}${RIAK_CONFDIR}/riak.conf.sample
+	${INSTALL_DATA} ${WRKSRC}/rel/riak/etc/solr-log4j.properties ${STAGEDIR}${RIAK_CONFDIR}/solr-log4j.properties.sample
+	(cd ${WRKSRC}/rel/riak/lib/ && ${COPYTREE_BIN} . ${STAGEDIR}${RIAK_LIBDIR})
+	(cd ${WRKSRC}/rel/riak/bin/ && ${COPYTREE_BIN} . ${STAGEDIR}${PREFIX}/sbin/)
+	(cd ${WRKSRC}/rel/riak/lib/basho-patches && ${COPYTREE_SHARE} . ${STAGEDIR}${RIAK_LIBDIR}/basho-patches)
+	(cd ${WRKSRC}/rel/riak/releases && ${COPYTREE_SHARE} . ${STAGEDIR}${RIAK_HOMEDIR}/releases)
+	${CP} -R ${WRKSRC}/rel/riak/erts-* ${STAGEDIR}${RIAK_HOMEDIR}
+	${INSTALL_MAN} ${WRKSRC}/doc/man/man1/riak.1.gz ${STAGEDIR}${MANPREFIX}/man/man1/
+	${INSTALL_MAN} ${WRKSRC}/doc/man/man1/riak-admin.1.gz ${STAGEDIR}${MANPREFIX}/man/man1/
+	${INSTALL_MAN} ${WRKSRC}/doc/man/man1/riak-debug.1.gz ${STAGEDIR}${MANPREFIX}/man/man1/
+	${INSTALL_MAN} ${WRKSRC}/doc/man/man1/search-cmd.1.gz ${STAGEDIR}${MANPREFIX}/man/man1/
+	#@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/riak/lib/bitcask-1.7.0/priv/bitcask.so
+	#@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/riak/lib/erlang_js-1.3.0-0-g07467d8/priv/erlang_js_drv.so
+	#@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/riak/lib/syslog-1.0.2/priv/syslog_drv.so
+	#@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/riak/lib/canola-2.0.0-0-g9bdfee8/priv/canola-port
+	#@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/riak/lib/sext-1.1p3-0-g846b9cc/priv/sext.so
+
+post-install:
+	(cd ${STAGEDIR}${RIAK_HOMEDIR}; ${FIND} releases -type f \
+		| ${SED} -e 's,^\./,,g' \
+		| ${AWK} '{print length, $$0}' | ${SORT} -rn | ${SED} -e 's/^/lib\//' \
+		| ${AWK} '{print "lib/riak/"$$2 }' >> ${TMPPLIST})
+	(cd ${STAGEDIR}${RIAK_HOMEDIR}; ${FIND} erts-* -type f \
+		| ${SED} -e 's,^\./,,g' \
+		| ${AWK} '{print length, $$0}' | ${SORT} -rn  \
+		| ${AWK} '{print "lib/riak/"$$2 }' >> ${TMPPLIST})
+	(cd ${STAGEDIR}${RIAK_LIBDIR}; ${FIND} . -type f \
+		| ${SED} -e 's,^\./,,g' \
+		| ${AWK} '{print length, $$0}' | ${SORT} -rn | ${SED} -e 's/^/lib\//' \
+		| ${AWK} '{print "lib/riak/lib/"$$2 }' >> ${TMPPLIST})
+	(cd ${STAGEDIR}${RIAK_LIBDIR}; ${FIND} . -type d -empty \
+		| ${SED} -e 's,^\./,,g' \
+		| ${AWK} '{print length, $$0}' | ${SORT} -rn | ${SED} -e 's/^/lib\//' \
+		| ${AWK} '{print "@dir lib/riak/lib/"$$2 }' >> ${TMPPLIST})
+	${ECHO} "@owner" >> ${TMPPLIST}
+	${ECHO} "@group" >> ${TMPPLIST}
+
+.include <bsd.port.mk>
--- a/databases/riak2/distinfo
+++ b/databases/riak2/distinfo
@ -0,0 +1,8 @@
+SHA256 (riak-2.1.1.tar.gz) = b5414e7bab650862c26fbbad382b81d47135ce55eafd02fdac027d3bff90a5ae
+SIZE (riak-2.1.1.tar.gz) = 18771429
+SHA256 (solr-4.7.0-yz-1.tgz) = 172380c6c334797b4639f7c497a2a34a249efbfd3917106b3662f6b1e8a0352f
+SIZE (solr-4.7.0-yz-1.tgz) = 166999678
+SHA256 (yokozuna-1.jar) = 91a208e1fde1ef2a931f8d14ba150f730c92bc3a7a8e8bce30c6a6b027e18f82
+SIZE (yokozuna-1.jar) = 10645
+SHA256 (yz_monitor-1.jar) = 35c41c103c83452c6377fac42b6c8bb714d2e1e2b8c02053397c0fa2423b694d
+SIZE (yz_monitor-1.jar) = 2661
--- a/databases/riak2/files/patch-deps_erlang__js_c__src_patches_js-src-config-FreeBSD.mk.patch
+++ b/databases/riak2/files/patch-deps_erlang__js_c__src_patches_js-src-config-FreeBSD.mk.patch
@ -0,0 +1,27 @@
+--- deps/erlang_js/c_src/patches/js-src-config-FreeBSD.mk.patch.orig    2015-02-26 16:11:58 UTC
+++ deps/erlang_js/c_src/patches/js-src-config-FreeBSD.mk.patch
+@@ -1,6 +1,6 @@
+ --- c_src.orig/js/src/config/FreeBSD.mk        1969-12-31 19:00:00.000000000 -0500
+ +++ c_src/js/src/config/FreeBSD.mk     2011-03-30 20:12:51.000000000 -0400
+-@@ -0,0 +1,99 @@
+@@ -0,0 +1,100 @@
+ +# -*- Mode: makefile -*-
+ +#
+ +# ***** BEGIN LICENSE BLOCK *****
+@@ -46,6 +46,7 @@
+ +
+ +CC ?= gcc
+ +CCC ?= g++
++LD = $(CC)
+ +CFLAGS +=  -Wall -Wno-format
+ +OS_CFLAGS = -DXP_UNIX -DSVR4 -DSYSV -D_BSD_SOURCE -DPOSIX_SOURCE -DHAVE_LOCALTIME_R
+ +
+@@ -63,7 +64,7 @@
+ +OS_CFLAGS+= -DX86_LINUX
+ +
+ +ifeq (gcc, $(CC))
+-+# if using gcc on x86, check version for opt bug 
++# if using gcc on x86, check version for opt bug
+ +# (http://bugzilla.mozilla.org/show_bug.cgi?id=24892)
+ +GCC_VERSION := $(shell gcc -v 2>&1 | grep version | awk '{ print $$3 }')
+ +GCC_LIST:=$(sort 2.91.66 $(GCC_VERSION) )
--- a/databases/riak2/files/patch-deps_yokozuna_tools_grab-solr.sh
+++ b/databases/riak2/files/patch-deps_yokozuna_tools_grab-solr.sh
@ -0,0 +1,109 @@
+--- deps/yokozuna/tools/grab-solr.sh.orig	2015-04-15 02:24:04.000000000 +1000
+++ deps/yokozuna/tools/grab-solr.sh	2015-09-24 10:46:04.504531298 +1000
+@@ -14,10 +14,10 @@
+     cd tools
+ fi
+ 
+-PRIV_DIR=../priv
+PRIV_DIR=%%YOKOZUNA%%/priv
+ CONF_DIR=$PRIV_DIR/conf
+ SOLR_DIR=$PRIV_DIR/solr
+-BUILD_DIR=../build
+BUILD_DIR=%%BUILD_DIR%%
+ VSN=solr-4.7.0-yz-1
+ FILENAME=$VSN.tgz
+ TMP_DIR=/var/tmp/yokozuna
+@@ -32,58 +32,11 @@
+     test -e $SOLR_DIR/start.jar
+ }
+ 
+-download()
+-{
+-    if which wget > /dev/null; then
+-        wget --no-check-certificate --progress=dot:mega $1
+-    elif which curl > /dev/null; then
+-        curl --insecure --progress-bar -O $1
+-    elif which fetch > /dev/null; then
+-        fetch --no-verify-peer $1
+-    fi
+-}
+-
+-get_solr()
+-{
+-        if [ -z ${SOLR_PKG_DIR+x} ]
+-        then
+-            if [ -e $TMP_FILE ]; then
+-                echo "Using cached copy of Solr $TMP_FILE"
+-                ln -s $TMP_FILE $FILENAME
+-            else
+-                echo "Pulling Solr from S3"
+-                download "http://s3.amazonaws.com/files.basho.com/solr/$FILENAME"
+-                if [ -d $TMP_DIR ]; then
+-                    cp $FILENAME $TMP_DIR
+-                else
+-                    mkdir $TMP_DIR
+-                    cp $FILENAME $TMP_DIR
+-                fi
+-            fi
+-        else
+-            # This is now obsolete thanks to implicit caching above
+-            # but will leave in for now as to not break anyone.
+-            echo "Using local copy of Solr $SOLR_PKG_DIR/$FILENAME"
+-            cp $SOLR_PKG_DIR/$FILENAME ./
+-        fi
+-        tar zxf $FILENAME
+-}
+-
+ if ! check_for_solr
+ then
+ 
+-    echo "Create dir $BUILD_DIR"
+-    if [ ! -e $BUILD_DIR ]; then
+-        mkdir $BUILD_DIR
+-    fi
+-
+     cd $BUILD_DIR
+ 
+-    if [ ! -e $SRC_DIR ]
+-    then
+-        get_solr
+-    fi
+-
+     echo "Creating Solr dir $SOLR_DIR"
+ 
+     # Explicitly copy files needed rather than copying everything and
+@@ -108,7 +61,7 @@
+     echo "Solr dir created successfully"
+ fi
+ 
+-JAVA_LIB=../priv/java_lib
+JAVA_LIB=%%YOKOZUNA%%/priv/java_lib
+-YZ_JAR_VSN=2
+YZ_JAR_VSN=1
+ YZ_JAR_NAME=yokozuna-$YZ_JAR_VSN.jar
+ 
+@@ -118,19 +71,17 @@
+     then
+         mkdir $JAVA_LIB
+     fi
+-
+-    echo "Downloading $YZ_JAR_NAME"
+-    download "http://s3.amazonaws.com/files.basho.com/yokozuna/$YZ_JAR_NAME"
+-    mv $YZ_JAR_NAME $JAVA_LIB/$YZ_JAR_NAME
+    echo "Copying $YZ_JAR_NAME"
+    cp %%DISTDIR%%/$YZ_JAR_NAME $JAVA_LIB/$YZ_JAR_NAME
+ fi
+ 
+-EXT_LIB=../priv/solr/lib/ext
+EXT_LIB=%%YOKOZUNA%%/priv/solr/lib/ext
+ MON_JAR_VSN=1
+ MON_JAR_NAME=yz_monitor-$MON_JAR_VSN.jar
+ 
+ if [ ! -e $EXT_LIB/$MON_JAR_NAME ]
+ then
+     echo "Downloading $MON_JAR_NAME"
+-    download "http://s3.amazonaws.com/files.basho.com/yokozuna/$MON_JAR_NAME"
+-    mv $MON_JAR_NAME $EXT_LIB/$MON_JAR_NAME
+    echo "Copying $MON_JAR_NAME"
+    cp %%DISTDIR%%/$MON_JAR_NAME $EXT_LIB/$MON_JAR_NAME
+ fi
--- a/databases/riak2/files/patch-rel_vars.config
+++ b/databases/riak2/files/patch-rel_vars.config
@ -0,0 +1,42 @@
+--- rel/vars.config.orig        2015-02-27 13:37:42 UTC
+++ rel/vars.config
+@@ -2,11 +2,12 @@
+ %% ex: ft=erlang ts=4 sw=4 et
+ 
+ %% Platform-specific installation paths
+-{platform_bin_dir,  "./bin"}.
+-{platform_data_dir, "./data"}.
+-{platform_etc_dir,  "./etc"}.
+-{platform_lib_dir,  "./lib"}.
+-{platform_log_dir,  "./log"}.
+{platform_base_dir, "%%PREFIX%%/lib/riak"}.
+{platform_bin_dir,  "%%PREFIX%%/sbin"}.
+{platform_etc_dir,  "%%PREFIX%%/etc/riak"}.
+{platform_lib_dir,  "%%PREFIX%%/lib/riak/lib"}.
+{platform_data_dir, "/var/db/riak"}.
+{platform_log_dir,  "/var/log/riak"}.
+ 
+ %%
+ %% etc/app.config
+@@ -40,14 +41,14 @@
+ %%
+ %% bin/riak
+ %%
+-{runner_script_dir,  "\`cd \\`dirname $0\\` && /bin/pwd\`"}.
+-{runner_base_dir,    "{{runner_script_dir}}/.."}.
+-{runner_etc_dir,     "$RUNNER_BASE_DIR/etc"}.
+-{runner_log_dir,     "$RUNNER_BASE_DIR/log"}.
+-{runner_lib_dir,     "$RUNNER_BASE_DIR/lib"}.
+-{runner_patch_dir,   "$RUNNER_BASE_DIR/lib/basho-patches"}.
+-{pipe_dir,           "/tmp/$RUNNER_BASE_DIR/"}.
+-{runner_user,        ""}.
+{runner_script_dir,  "{{platform_bin_dir}}"}.
+{runner_base_dir,    "{{platform_base_dir}}"}.
+{runner_etc_dir,     "{{platform_etc_dir}}"}.
+{runner_log_dir,     "{{platform_log_dir}}"}.
+{runner_lib_dir,     "{{platform_lib_dir}}"}.
+{runner_patch_dir,   "{{platform_lib_dir}}/basho-patches"}.
+{pipe_dir,           "/tmp/riak"}.
+{runner_user,        "riak"}.
+ {runner_wait_process, "riak_core_node_watcher"}.
+ {runner_ulimit_warn, 65536}.
--- a/databases/riak2/files/riak.in
+++ b/databases/riak2/files/riak.in
@ -0,0 +1,27 @@
+#!/bin/sh                                                                                                               
+
+# $FreeBSD$
+#
+# PROVIDE: riak
+# REQUIRE: LOGIN
+# KEYWORD: shutdown
+#
+# Add these lines to /etc/rc.conf.local or /etc/rc.conf
+# to enable this service:
+#
+# riak_enable (bool):   Set to NO by default.
+#                       Set it to YES to enable riak
+
+. /etc/rc.subr
+
+name=riak
+rcvar=riak_enable
+
+load_rc_config $name
+
+command=%%PREFIX%%/lib/riak/erts-5.10.4/bin/beam.smp
+pidfile="/var/run/${name}/${name}.pid"
+start_cmd="%%PREFIX%%/sbin/${name} start"
+stop_cmd="%%PREFIX%%/sbin/${name} stop"
+
+run_rc_command "$1"
--- a/databases/riak2/pkg-descr
+++ b/databases/riak2/pkg-descr
@ -0,0 +1,19 @@
+Riak is an open source, distributed database. Riak is architected for:
+
+* Low-Latency
+Riak is designed to store data and serve requests predictably and quickly, even
+during peak times.
+
+* Availability
+Riak replicates and retrieves data intelligently, making it available for read
+and write operations even in failure conditions.
+
+* Fault-Tolerance
+Riak is fault-tolerant so you can lose access to nodes due to network partition
+or hardware failure and never lose data.
+
+* Operational Simplicity
+Riak allows you to add machines to the cluster easily, without a large
+operational burden.
+
+WWW: http://basho.com/riak
--- a/databases/riak2/pkg-plist
+++ b/databases/riak2/pkg-plist
@ -0,0 +1,16 @@
+sbin/riak
+sbin/riak-admin
+sbin/riak-debug
+sbin/search-cmd
+man/man1/riak-admin.1.gz
+man/man1/riak-debug.1.gz
+man/man1/riak.1.gz
+man/man1/search-cmd.1.gz
+@sample %%RIAK_CONFDIR%%/riak.conf.sample
+@sample %%RIAK_CONFDIR%%/solr-log4j.properties.sample
+@owner %%USERS%%
+@group %%GROUPS%%
+@dir %%RIAK_DBDIR%%
+@dir %%RIAK_HOMEDIR%%
+@dir %%RIAK_LIBDIR%%
+@dir %%RIAK_LOGDIR%%
--- a/devel/Makefile
+++ b/devel/Makefile
@ -2324,6 +2324,7 @@
    SUBDIR += p5-Getopt-GUI-Long
    SUBDIR += p5-Getopt-Long
    SUBDIR += p5-Getopt-Long-Descriptive
+    SUBDIR += p5-Getopt-Tabular
    SUBDIR += p5-Git-PurePerl
    SUBDIR += p5-Git-Repository
    SUBDIR += p5-Git-Repository-Plugin-Log
--- a/devel/avr-libc/pkg-plist.doc
+++ b/devel/avr-libc/pkg-plist.doc
@ -19,12 +19,3 @@ share/doc/avr-libc/examples/stdiodemo/uart.c
 share/doc/avr-libc/examples/stdiodemo/uart.h
 share/doc/avr-libc/examples/twitest/Makefile
 share/doc/avr-libc/examples/twitest/twitest.c
-@dirrm share/doc/avr-libc/examples/twitest
-@dirrm share/doc/avr-libc/examples/stdiodemo
-@dirrm share/doc/avr-libc/examples/largedemo
-@dirrm share/doc/avr-libc/examples/demo
-@dirrm share/doc/avr-libc/examples/asmdemo
-@dirrm share/doc/avr-libc/examples
-@dirrm share/doc/avr-libc/man/man3
-@dirrm share/doc/avr-libc/man
-@dirrm share/doc/avr-libc/avr-libc-user-manual
--- a/devel/elixir-exrm/Makefile
+++ b/devel/elixir-exrm/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	exrm
-PORTVERSION=	0.19.5
+PORTVERSION=	0.19.6
 CATEGORIES=	devel
 PKGNAMEPREFIX=	elixir-

--- a/devel/elixir-exrm/distinfo
+++ b/devel/elixir-exrm/distinfo
@ -1,2 +1,2 @@
-SHA256 (bitwalker-exrm-0.19.5_GH0.tar.gz) = 6245db3c31e5c6140959f7162ec64f0f54dae5eda9461ad9dc2571d09980e8fb
-SIZE (bitwalker-exrm-0.19.5_GH0.tar.gz) = 46626
+SHA256 (bitwalker-exrm-0.19.6_GH0.tar.gz) = 5828d19556ddc6b0beac1d2b6655ae7cb090882a63220e82b074466a5b280774
+SIZE (bitwalker-exrm-0.19.6_GH0.tar.gz) = 46628
--- a/devel/elixir-quantum/Makefile
+++ b/devel/elixir-quantum/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	quantum
-PORTVERSION=	1.4.0
+PORTVERSION=	1.5.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 PKGNAMEPREFIX=	elixir-
--- a/devel/elixir-quantum/distinfo
+++ b/devel/elixir-quantum/distinfo
@ -1,2 +1,2 @@
-SHA256 (c-rack-quantum-elixir-v1.4.0_GH0.tar.gz) = 1b70fc07116efcad9076bc43971cef24c4d2ed993f0ffee4189af0be3523c6f7
-SIZE (c-rack-quantum-elixir-v1.4.0_GH0.tar.gz) = 14023
+SHA256 (c-rack-quantum-elixir-v1.5.0_GH0.tar.gz) = 184f1b4058cf8ec9951f5bf12369129a5fe5463dc0b945ae0a246e7c393439d3
+SIZE (c-rack-quantum-elixir-v1.5.0_GH0.tar.gz) = 15019
--- a/devel/elixir-timex/Makefile
+++ b/devel/elixir-timex/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	timex
-PORTVERSION=	0.19.4
+PORTVERSION=	0.19.5
 CATEGORIES=	devel
 PKGNAMEPREFIX=	elixir-

--- a/devel/elixir-timex/distinfo
+++ b/devel/elixir-timex/distinfo
@ -1,2 +1,2 @@
-SHA256 (bitwalker-timex-0.19.4_GH0.tar.gz) = c04823225afc0e9226dd109fc0d4efeab36b879a5da738836f3dac9e699b21f5
-SIZE (bitwalker-timex-0.19.4_GH0.tar.gz) = 74286
+SHA256 (bitwalker-timex-0.19.5_GH0.tar.gz) = 834ee6239d1003b2bdb0a2d7c45b8060a6af24cc72351e527561942b3e1d2652
+SIZE (bitwalker-timex-0.19.5_GH0.tar.gz) = 74490
--- a/devel/elixir-tzdata/Makefile
+++ b/devel/elixir-tzdata/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	tzdata
-PORTVERSION=	0.5.2
+PORTVERSION=	0.5.3
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 PKGNAMEPREFIX=	elixir-
@ -15,7 +15,7 @@ USES=		elixir
 USE_GITHUB=	yes
 GH_ACCOUNT=	lau

-MIX_BUILD_DEPS=	www/elixir-httpoison
-MIX_REWRITE=	yes
+MIX_BUILD_DEPS=	www/elixir-httpoison \
+		www/erlang-hackney

 .include <bsd.port.mk>
--- a/devel/elixir-tzdata/distinfo
+++ b/devel/elixir-tzdata/distinfo
@ -1,2 +1,2 @@
-SHA256 (lau-tzdata-v0.5.2_GH0.tar.gz) = a496ca1507eb1e50ac54bdb9c6b47d4bb017cc6ab547c9b23492d5393b97e770
-SIZE (lau-tzdata-v0.5.2_GH0.tar.gz) = 808284
+SHA256 (lau-tzdata-v0.5.3_GH0.tar.gz) = f78ac22c2a5225584229b819bb922d64912e13a3cb0a3a3c6ba6b7dae86b0368
+SIZE (lau-tzdata-v0.5.3_GH0.tar.gz) = 808744
--- a/devel/elixir-tzdata/files/patch-mix.exs
+++ b/devel/elixir-tzdata/files/patch-mix.exs
@ -0,0 +1,11 @@
+--- mix.exs.orig	2015-09-24 19:41:49 UTC
+++ mix.exs
+@@ -8,7 +8,7 @@ defmodule Tzdata.Mixfile do
+      elixir: "~> 1.0 or ~> 1.1",
+      package: package,
+      description: description,
+-     deps: deps]
+     deps: []]
+   end
+ 
+   def application do
--- a/devel/erlang-clique/Makefile
+++ b/devel/erlang-clique/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	clique
-PORTVERSION=	0.3.3
+PORTVERSION=	0.3.4
 CATEGORIES=	devel
 PKGNAMEPREFIX=	erlang-

--- a/devel/erlang-clique/distinfo
+++ b/devel/erlang-clique/distinfo
@ -1,2 +1,2 @@
-SHA256 (basho-clique-0.3.3_GH0.tar.gz) = ddb3143c9af81a1db2d9b25db296ebdfa6407787dd36a5b3b590b5f3829cd123
-SIZE (basho-clique-0.3.3_GH0.tar.gz) = 179260
+SHA256 (basho-clique-0.3.4_GH0.tar.gz) = 8c85bcf443a8b0770b0ff9e5041c54e08e1e51e5e277fcf349e5bf201e863e40
+SIZE (basho-clique-0.3.4_GH0.tar.gz) = 179474
--- a/devel/erlang-clique/files/patch-rebar.config
+++ b/devel/erlang-clique/files/patch-rebar.config
@ -1,9 +1,8 @@
--- rebar.config.orig	2015-08-25 22:18:46 UTC
+--- rebar.config.orig	2015-09-24 19:06:45 UTC
 +++ rebar.config
-@@ -12,6 +12,4 @@
+@@ -12,5 +12,4 @@
 ]}.
 
 {deps, [
-  {cuttlefish, "2.0.4", {git, "git://github.com/basho/cuttlefish.git", {tag, "2.0.4"}}},
-  {webmachine, "1.10.8", {git, "git://github.com/basho/webmachine.git", {tag, "1.10.8"}}}
+-  {cuttlefish, ".*", {git, "git://github.com/basho/cuttlefish.git", {branch, "develop"}}}
 ]}.
--- a/devel/erlang-clique/files/patch-src_clique.app.src
+++ b/devel/erlang-clique/files/patch-src_clique.app.src
@ -1,12 +0,0 @@
--- src/clique.app.src.orig	2015-08-25 22:19:10 UTC
-+++ src/clique.app.src
-@@ -7,8 +7,7 @@
-   {applications, [
-                   kernel,
-                   stdlib,
-                  cuttlefish,
-                  webmachine
-+                  cuttlefish
-                  ]},
-   {mod, {clique_app, []}},
-   {env, []}
--- a/devel/erlang-rebar3_hex/Makefile
+++ b/devel/erlang-rebar3_hex/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	rebar3_hex
-PORTVERSION=	1.6.3
+PORTVERSION=	1.7.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 PKGNAMEPREFIX=	erlang-
--- a/devel/erlang-rebar3_hex/distinfo
+++ b/devel/erlang-rebar3_hex/distinfo
@ -1,2 +1,2 @@
-SHA256 (hexpm-rebar3_hex-v1.6.3_GH0.tar.gz) = 1512e59f51a89a164f4664efd1fe16809f111ea947a7b8fe9205c1690261dc78
-SIZE (hexpm-rebar3_hex-v1.6.3_GH0.tar.gz) = 11127
+SHA256 (hexpm-rebar3_hex-v1.7.0_GH0.tar.gz) = 3276ebe39bce39f8dcd4a828ce0f8dba4440aac0b0d17d2b801aac473c02ad7f
+SIZE (hexpm-rebar3_hex-v1.7.0_GH0.tar.gz) = 11331
--- a/devel/libdisorder/Makefile
+++ b/devel/libdisorder/Makefile
@ -9,22 +9,14 @@ MASTER_SITES=	http://libdisorder.freshdefense.net/releases/
 MAINTAINER=	kevlo@FreeBSD.org
 COMMENT=	Simple C library for entropy measurement

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

 USE_LDCONFIG=	yes

-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 900027
-EXTRA_PATCHES=	${FILESDIR}/extra-patch-disorder.c
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|gcc|${CC}|' ${WRKSRC}/src/Makefile

-do-build:
-	cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${MAKE}
-
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/include/disorder.h ${STAGEDIR}${PREFIX}/include
 	${INSTALL_DATA} ${WRKSRC}/lib/libdisorder.a ${STAGEDIR}${PREFIX}/lib
@ -33,4 +25,4 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/tool/ropy ${STAGEDIR}${PREFIX}/bin
 	${LN} -sf ${PREFIX}/lib/libdisorder.so.1 ${STAGEDIR}${PREFIX}/lib/libdisorder.so

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/devel/libdisorder/files/extra-patch-disorder.c
+++ b/devel/libdisorder/files/extra-patch-disorder.c
@ -1,13 +0,0 @@
--- src/disorder.c.orig	2010-08-17 16:15:30.000000000 +0800
-+++ src/disorder.c	2010-08-17 16:22:27.000000000 +0800
-@@ -25,6 +25,10 @@
- #include <stdio.h> //for NULL
- #include "../include/disorder.h"
- 
-+#if defined(__FreeBSD__)
-+#define	log2(x)	(log((x)) * (1./M_LN2))
-+#endif
-+
- /** Frequecies for each byte */
- static int m_token_freqs[LIBDO_MAX_BYTES]; //frequency of each token in sample
- static float m_token_probs[LIBDO_MAX_BYTES]; //P(each token appearing)
--- a/devel/p5-Any-Moose-Convert/Makefile
+++ b/devel/p5-Any-Moose-Convert/Makefile
@ -11,11 +11,15 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Convert Moose libraries to Mouse ones, or vice versa

+LICENSE=	ART10 GPLv1
+LICENSE_COMB=	dual
+
 BUILD_DEPENDS=	p5-PerlIO-Util>=0:${PORTSDIR}/devel/p5-PerlIO-Util
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 TEST_DEPENDS=	p5-Moose>=0.90:${PORTSDIR}/devel/p5-Moose \
 		p5-Mouse>=0.40:${PORTSDIR}/devel/p5-Mouse

+NO_ARCH=	yes
 USE_PERL5=	configure
 USES=		perl5

--- a/devel/p5-AnyEvent-Gearman/Makefile
+++ b/devel/p5-AnyEvent-Gearman/Makefile
@ -22,6 +22,7 @@ BUILD_DEPENDS=	p5-Any-Moose>=0:${PORTSDIR}/devel/p5-Any-Moose \
 		p5-Object-Event>=0:${PORTSDIR}/devel/p5-Object-Event
 RUN_DEPENDS:=	${BUILD_DEPENDS}

+NO_ARCH=	yes
 USE_PERL5=	configure
 USES=		perl5

--- a/devel/p5-AnyMQ/Makefile
+++ b/devel/p5-AnyMQ/Makefile
@ -12,6 +12,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Non-blocking message queue system based on AnyEvent

+LICENSE=	ART10 GPLv1
+LICENSE_COMB=	dual
+
 BUILD_DEPENDS=	p5-Any-Moose>=0:${PORTSDIR}/devel/p5-Any-Moose \
 		p5-AnyEvent>=0:${PORTSDIR}/devel/p5-AnyEvent \
 		p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny \
@ -21,6 +24,7 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 TEST_DEPENDS=	p5-Test-Memory-Cycle>=0:${PORTSDIR}/devel/p5-Test-Memory-Cycle \
 		p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires

+NO_ARCH=	yes
 USE_PERL5=	configure
 USES=		perl5

--- a/devel/p5-App-Rad/Makefile
+++ b/devel/p5-App-Rad/Makefile
@ -14,6 +14,7 @@ COMMENT=	Rapid creation of command line applications
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual

+NO_ARCH=	yes
 USE_PERL5=	configure
 USES=		perl5

--- a/devel/p5-App-Trace/Makefile
+++ b/devel/p5-App-Trace/Makefile
@ -17,6 +17,7 @@ LICENSE_COMB=	dual
 BUILD_DEPENDS=	p5-App-Options>=0:${PORTSDIR}/devel/p5-App-Options
 RUN_DEPENDS:=	${BUILD_DEPENDS}

+NO_ARCH=	yes
 USE_PERL5=	configure
 USES=		perl5

--- a/devel/p5-Array-Iterator/Makefile
+++ b/devel/p5-Array-Iterator/Makefile
@ -11,9 +11,13 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Set of array iterators

+LICENSE=	ART10 GPLv1
+LICENSE_COMB=	dual
+
 TEST_DEPENDS=	p5-Capture-Tiny>=0:${PORTSDIR}/devel/p5-Capture-Tiny \
 		p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception

+NO_ARCH=	yes
 USE_PERL5=	configure
 USES=		perl5

--- a/devel/p5-Array-Unique/Makefile
+++ b/devel/p5-Array-Unique/Makefile
@ -14,6 +14,7 @@ COMMENT=	Tie-able array that allows only unique values
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual

+NO_ARCH=	yes
 USE_PERL5=	configure
 USES=		perl5

--- a/devel/p5-AutoLoader/Makefile
+++ b/devel/p5-AutoLoader/Makefile
@ -13,6 +13,7 @@ COMMENT=	Load subroutines only on demand
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual

+NO_ARCH=	yes
 USE_PERL5=	configure
 USES=		perl5

--- a/devel/p5-Bread-Board-Declare/Makefile
+++ b/devel/p5-Bread-Board-Declare/Makefile
@ -22,6 +22,7 @@ BUILD_DEPENDS=	p5-Bread-Board>=0.22:${PORTSDIR}/devel/p5-Bread-Board \
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 TEST_DEPENDS=	p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal

+NO_ARCH=	yes
 USE_PERL5=	configure
 USES=		perl5

--- a/devel/p5-Bread-Board/Makefile
+++ b/devel/p5-Bread-Board/Makefile
@ -26,6 +26,7 @@ TEST_DEPENDS=	p5-Form-Sensible>=0:${PORTSDIR}/devel/p5-Form-Sensible \
 		p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal \
 		p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires

+NO_ARCH=	yes
 USE_PERL5=	configure
 USES=		perl5

--- a/devel/p5-CLASS/Makefile
+++ b/devel/p5-CLASS/Makefile
@ -15,6 +15,7 @@ COMMENT=	Alias for __PACKAGE__
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual

+NO_ARCH=	yes
 USE_PERL5=	configure
 USES=		perl5

--- a/devel/p5-CPAN-Meta-Requirements/Makefile
+++ b/devel/p5-CPAN-Meta-Requirements/Makefile
@ -13,6 +13,7 @@ COMMENT=	Set of version requirements for a CPAN distribution
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual

+NO_ARCH=	yes
 USE_PERL5=	configure
 USES=		perl5

--- a/devel/p5-Carp-Always-Color/Makefile
+++ b/devel/p5-Carp-Always-Color/Makefile
@ -18,6 +18,7 @@ BUILD_DEPENDS=	p5-Carp-Always>=0.10:${PORTSDIR}/devel/p5-Carp-Always
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 TEST_DEPENDS=	p5-IO-Pty-Easy>=0:${PORTSDIR}/devel/p5-IO-Pty-Easy

+NO_ARCH=	yes
 USE_PERL5=	configure
 USES=		perl5

--- a/devel/p5-Carp/Makefile
+++ b/devel/p5-Carp/Makefile
@ -13,6 +13,7 @@ COMMENT=	Alternative warn and die for modules
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual

+NO_ARCH=	yes
 USE_PERL5=	configure
 USES=		perl5

--- a/devel/p5-Class-Accessor-Children/Makefile
+++ b/devel/p5-Class-Accessor-Children/Makefile
@ -17,6 +17,7 @@ LICENSE_COMB=	dual
 BUILD_DEPENDS=	p5-Class-Accessor>0:${PORTSDIR}/devel/p5-Class-Accessor
 RUN_DEPENDS:=	${BUILD_DEPENDS}

+NO_ARCH=	yes
 USE_PERL5=	configure
 USES=		perl5

--- a/devel/p5-Class-Accessor-Complex/Makefile
+++ b/devel/p5-Class-Accessor-Complex/Makefile
@ -20,6 +20,7 @@ BUILD_DEPENDS=	p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
 		p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils
 RUN_DEPENDS:=	${BUILD_DEPENDS}

+NO_ARCH=	yes
 USE_PERL5=	configure
 USES=		perl5

--- a/devel/p5-Class-Accessor-Lite/Makefile
+++ b/devel/p5-Class-Accessor-Lite/Makefile
@ -13,6 +13,7 @@ COMMENT=	Minimalistic variant of p5-Class-Accessor
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual

+NO_ARCH=	yes
 USE_PERL5=	configure
 USES=		perl5

--- a/devel/p5-Class-AutoClass/Makefile
+++ b/devel/p5-Class-AutoClass/Makefile
@ -21,6 +21,7 @@ TEST_DEPENDS=	p5-IO-stringy>=2.1:${PORTSDIR}/devel/p5-IO-stringy \
 		p5-Test-Deep>=0.110:${PORTSDIR}/devel/p5-Test-Deep \
 		p5-Test-Pod>=1.48:${PORTSDIR}/devel/p5-Test-Pod

+NO_ARCH=	yes
 USE_PERL5=	modbuild
 USES=		perl5

--- a/devel/p5-Class-Std-Utils/Makefile
+++ b/devel/p5-Class-Std-Utils/Makefile
@ -15,6 +15,7 @@ COMMENT=	Utility subroutines for building "inside-out" objects
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual

+NO_ARCH=	yes
 USE_PERL5=	configure
 USES=		perl5

--- a/devel/p5-Config-INI-Simple/Makefile
+++ b/devel/p5-Config-INI-Simple/Makefile
@ -14,6 +14,7 @@ COMMENT=	Simple reading and writing from an INI file
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual

+NO_ARCH=	yes
 USE_PERL5=	configure
 USES=		perl5

--- a/devel/p5-Getopt-Tabular/Makefile
+++ b/devel/p5-Getopt-Tabular/Makefile
@ -0,0 +1,18 @@
+# Created by: Dimitry Andric <dim@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	Getopt-Tabular
+PORTVERSION=	0.3
+CATEGORIES=	devel perl5
+MASTER_SITES=	CPAN
+PKGNAMEPREFIX=	p5-
+
+MAINTAINER=	dim@FreeBSD.org
+COMMENT=	Table-driven argument parsing for Perl 5
+
+USES=		perl5
+USE_PERL5=	configure
+
+MAN3=		Getopt::Tabular.3
+
+.include <bsd.port.mk>
--- a/devel/p5-Getopt-Tabular/distinfo
+++ b/devel/p5-Getopt-Tabular/distinfo
@ -0,0 +1,2 @@
+SHA256 (Getopt-Tabular-0.3.tar.gz) = 9bdf067633b5913127820f4e8035edc53d08372faace56ba6bfa00c968a25377
+SIZE (Getopt-Tabular-0.3.tar.gz) = 26453
--- a/devel/p5-Getopt-Tabular/pkg-descr
+++ b/devel/p5-Getopt-Tabular/pkg-descr
@ -0,0 +1,4 @@
+Getopt::Tabular is a Perl 5 module for table-driven argument parsing,
+vaguely inspired by John Ousterhout's Tk_ParseArgv.
+
+WWW: http://search.cpan.org/~gward/Getopt-Tabular-0.3/
--- a/devel/p5-Getopt-Tabular/pkg-plist
+++ b/devel/p5-Getopt-Tabular/pkg-plist
@ -0,0 +1,2 @@
+%%PERL5_MAN3%%/Getopt::Tabular.3.gz
+%%SITE_PERL%%/Getopt/Tabular.pm
--- a/devel/rubygem-activesupport4/Makefile
+++ b/devel/rubygem-activesupport4/Makefile
@ -11,6 +11,7 @@ MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Utility classes and extension that are required by Rails MVC Framework

 LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/MIT-LICENSE

 RUN_DEPENDS=	rubygem-i18n>=0.6.9:${PORTSDIR}/devel/rubygem-i18n \
 		rubygem-json>=1.7.7:${PORTSDIR}/devel/rubygem-json \
--- a/devel/rubygem-activesupport41/Makefile
+++ b/devel/rubygem-activesupport41/Makefile
@ -11,6 +11,7 @@ MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Utility classes and extension that are required by Rails MVC Framework

 LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/MIT-LICENSE

 RUN_DEPENDS=	rubygem-i18n>=0.6.9:${PORTSDIR}/devel/rubygem-i18n \
 		rubygem-json>=1.7.7:${PORTSDIR}/devel/rubygem-json \
--- a/devel/rubygem-minitest/Makefile
+++ b/devel/rubygem-minitest/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	minitest
-PORTVERSION=	5.8.0
+PORTVERSION=	5.8.1
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG

@ -12,7 +12,6 @@ COMMENT=	Minitest provides a complete suite of testing facilities
 LICENSE=	MIT

 NO_ARCH=	yes
-
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
 RUBYGEM_AUTOPLIST=	yes
--- a/devel/rubygem-minitest/distinfo
+++ b/devel/rubygem-minitest/distinfo
@ -1,2 +1,2 @@
-SHA256 (rubygem/minitest-5.8.0.gem) = 875de2784b97b710da76c682e725095ca6c5142093a07474114e52cd6dea0953
-SIZE (rubygem/minitest-5.8.0.gem) = 71680
+SHA256 (rubygem/minitest-5.8.1.gem) = c8d2763ef0f3c86464b83ed60876772a1e7ff669c562bb63064679cf51109103
+SIZE (rubygem/minitest-5.8.1.gem) = 71680
--- a/devel/rubygem-ruby-bugzilla/Makefile
+++ b/devel/rubygem-ruby-bugzilla/Makefile
@ -2,9 +2,9 @@
 # $FreeBSD$

 PORTNAME=	ruby-bugzilla
-PORTVERSION=	0.6.3
+PORTVERSION=	0.6.3.1
 CATEGORIES=	devel rubygems
-MASTER_SITES=	RG
+MASTER_SITES=	http://bitbucket.org/linuxgeek247/${PORTNAME}/downloads/

 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Access to Bugzilla through WebService APIs in Ruby
--- a/devel/rubygem-ruby-bugzilla/distinfo
+++ b/devel/rubygem-ruby-bugzilla/distinfo
@ -1,2 +1,2 @@
-SHA256 (rubygem/ruby-bugzilla-0.6.3.gem) = 66d655165b623fa457a7f944094b4bd91d0572d2500be629b2cc275941fd5eb0
-SIZE (rubygem/ruby-bugzilla-0.6.3.gem) = 22528
+SHA256 (rubygem/ruby-bugzilla-0.6.3.1.gem) = 26797718a82b48697e164cd4a5c72e4cafdcb34fc2297d1159ff18c734ffbd24
+SIZE (rubygem/ruby-bugzilla-0.6.3.1.gem) = 22528
--- a/devel/rubygem-turn/Makefile
+++ b/devel/rubygem-turn/Makefile
@ -10,12 +10,12 @@ MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	New output format for Test::Unit

 LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE.txt

 RUN_DEPENDS=	rubygem-ansi>=0:${PORTSDIR}/devel/rubygem-ansi \
 		rubygem-minitest>=4:${PORTSDIR}/devel/rubygem-minitest

 NO_ARCH=	yes
-
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
 RUBYGEM_AUTOPLIST=	yes
--- a/dns/bind-tools/Makefile
+++ b/dns/bind-tools/Makefile
@ -1,14 +1,6 @@
 # $FreeBSD$

 # Define PORTREVISION in ${MASTERDIR}
-PKGNAMESUFFIX=	-tools
-
-COMMENT=	Command line tools from BIND: delv, dig, host, nslookup...
-
-CONFIGURE_ARGS+=	--disable-shared
-
-CONFLICTS+=	bind910-9.10.*
-
 MASTERDIR=	${.CURDIR}/../../dns/bind910

 DESCR=		${.CURDIR}/pkg-descr
@ -19,14 +11,4 @@ BIND_TOOLS_SLAVE=	YES

 INSTALL_WRKSRC=	${WRKSRC}/bin

-post-patch:
-	@${REINPLACE_CMD} -e 's#^SUBDIRS.*#SUBDIRS = lib bin#' \
-		-e 's#isc-config.sh installdirs#installdirs#' \
-		-e 's#.*INSTALL.*isc-config.*##' \
-		-e 's#.*INSTALL.*bind.keys.*##' \
-		${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e 's#^SUBDIRS.*#SUBDIRS = delv dig dnssec nsupdate \\#' \
-		-e 's#^	.*check confgen ##' \
-		${WRKSRC}/bin/Makefile.in
-
 .include "${MASTERDIR}/Makefile"
--- a/dns/bind99/Makefile
+++ b/dns/bind99/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	bind
 PORTVERSION=	${ISCVERSION:S/-P/P/}
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	dns net ipv6
 MASTER_SITES=	ISC/bind9/${ISCVERSION}
 PKGNAMESUFFIX=	99
@ -34,6 +34,7 @@ CONFIGURE_ARGS=	--localstatedir=/var --disable-linux-caps \
 		--disable-symtable \
 		--with-randomdev=/dev/random \
 		--with-libxml2=${LOCALBASE} \
+		--with-readline=-ledit \
 		--sysconfdir=${ETCDIR}
 ETCDIR=		${PREFIX}/etc/namedb

@ -194,6 +195,9 @@ PKGDEINSTALL=	${PKGINSTALL}
 PORTDOCS=	*

 post-patch:
+	@${REINPLACE_CMD} -e 's|readline/readline.h|editline/readline.h|; \
+		s|readline/history.h|histedit.h|' \
+		${WRKSRC}/bin/dig/nslookup.c ${WRKSRC}/bin/nsupdate/nsupdate.c
 .for FILE in check/named-checkconf.8 named/named.8 nsupdate/nsupdate.1 \
 	rndc/rndc.8
 	@${REINPLACE_CMD} -e 's#/etc/named.conf#${ETCDIR}/named.conf#g' \
--- a/editors/diakonos/Makefile
+++ b/editors/diakonos/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	diakonos
 PORTVERSION=	0.9.4
+PORTREVISION=	1
 CATEGORIES=	editors ruby
 MASTER_SITES=	http://diakonos.pist0s.ca/archives/

@ -29,10 +30,12 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/installation.rb \
 		${STAGEDIR}${RUBY_SITELIBDIR}/${PORTNAME}
 	${INSTALL_DATA} ${WRKSRC}/diakonos.conf \
-		${STAGEDIR}${PREFIX}/etc/diakonos.conf.dist
+		${STAGEDIR}${PREFIX}/etc/diakonos.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/diakonos-256-colour.conf \
-		${STAGEDIR}${PREFIX}/etc/diakonos-256-colour.conf.dist
+		${STAGEDIR}${PREFIX}/etc/diakonos-256-colour.conf.sample
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/help
+
+post-install-DOCS-on:
 	(cd ${WRKSRC} && ${INSTALL_DATA} CHANGELOG LICENCE README.rdoc \
 		${STAGEDIR}${DOCSDIR})
 	${INSTALL_DATA} ${WRKSRC}/help/*.dhf ${STAGEDIR}${DOCSDIR}/help
--- a/editors/diakonos/pkg-plist
+++ b/editors/diakonos/pkg-plist
@ -1,10 +1,6 @@
 bin/diakonos
-@unexec if cmp -s %D/etc/diakonos.conf.dist %D/etc/diakonos.conf; then rm -f %D/etc/diakonos.conf; fi
-etc/diakonos.conf.dist
-@exec if [ ! -f %B/diakonos.conf ]; then cp -p %D/%F %B/diakonos.conf; fi
-@unexec if cmp -s %D/etc/diakonos-256-colour.conf.dist %D/etc/diakonos-256-colour.conf; then rm -f %D/etc/diakonos-256-colour.conf; fi
-etc/diakonos-256-colour.conf.dist
-@exec if [ ! -f %B/diakonos-256-colour.conf ]; then cp -p %D/%F %B/diakonos-256-colour.conf; fi
+@sample etc/diakonos.conf.sample
+@sample etc/diakonos-256-colour.conf.sample
 %%RUBY_SITELIBDIR%%/diakonos.rb
 %%RUBY_SITELIBDIR%%/diakonos/about.rb
 %%RUBY_SITELIBDIR%%/diakonos/bookmark.rb
--- a/editors/openoffice-4/Makefile
+++ b/editors/openoffice-4/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	apache-openoffice
 PORTVERSION=	${AOOVERSION}
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	editors java
 MASTER_SITES=	APACHE/openoffice/${PORTVERSION}/source \
 		http://tools.openoffice.org/unowinreg_prebuild/680/:unoreg \
@ -192,7 +192,8 @@ GNU_CONFIGURE=	yes
 WRKSUBDIR=	${WRKDIR}/aoo-${AOOVERSION}
 WRKSRC?=	${WRKSUBDIR}/main
 SUB_FILES=	pkg-message
-SUB_LIST=	EXECBASE=${EXECBASE} AOOTAG=${AOOTAG} AOOUDIR=${AOOUDIR}
+SUB_LIST=	EXECBASE=${EXECBASE} AOOTAG=${AOOTAG} AOOUDIR=${AOOUDIR} \
+		PRINSTALLATION_BASEDIR=${PRINSTALLATION_BASEDIR}

 CONFIGURE_ARGS+=							\
 			--with-unix-wrapper=${EXECBASE}			\
@ -385,7 +386,8 @@ do-build:
 	LANG=C LC_ALL=C build.pl --all -P$${numproc} -- -P$${dmproc}

 do-install:
-	@${MKDIR} ${STAGEDIR}${PRINSTALLATION_BASEDIR}/extensions/ \
+	@${MKDIR} ${STAGEDIR}${PRINSTALLATION_BASEDIR}/extensions \
+		${STAGEDIR}${OOPATH}/uno_packages/cache/uno_packages \
 		${STAGEDIR}${DESKTOPDIR}
 	@cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/Apache_OpenOffice/archive/install/${LOCALIZED_LANG}/ ; \
 		for i in *.tar.?z ; do \
@ -401,8 +403,7 @@ do-install:
 		${ECHO_CMD} "stripping executables and shared libraries" ; \
 		${STRIP_CMD} crashrep pagein uri-encode javaldx regmerge \
 			regview *.so* *.bin ; \
-		${ECHO_CMD} "fixing permissions" ; \
-		${FIND} . -type d -exec ${CHMOD} 755 {} \;
+	${FIND} ${STAGEDIR}${PRINSTALLATION_BASEDIR} -type d -exec ${CHMOD} 755 {} \;
 	${REINPLACE_CMD} \
 		-e '/^UserInstallation/s/=.*/=$$SYSUSERCONFIG\/${AOOUDIR}/' \
 		${STAGEDIR}${OOPATH}/program/bootstraprc
--- a/editors/openoffice-4/files/pkg-message.in
+++ b/editors/openoffice-4/files/pkg-message.in
@ -33,8 +33,13 @@ to your PATH and you will be able to use them.

 OpenOffice does need $LANG to be set to a suitable value.

-4. If you run into problems
--------------------------------------------------
+4. Wiki Publisher Extension
+---------------------------
+The Wiki Publisher extension can be installed from
+%%PRINSTALLATION_BASEDIR%%/extensions/
+
+5. If you run into problems
+---------------------------
 If you somehow run into problems, please remove the already installed
 "%%AOOUDIR%%" directory in your home directory, then redo the
 user installation and the problems should go away.
--- a/editors/openoffice-devel/Makefile
+++ b/editors/openoffice-devel/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	apache-openoffice
 PORTVERSION=	${AOOVERSION1}.${AOOVERSION2}.${SVNREVISION}
-PORTREVISION=	2
+#PORTREVISION=	1
 PORTEPOCH=	3
 CATEGORIES=	editors java
 MASTER_SITES=	http://ci.apache.org/projects/openoffice/milestones/${AOOVERSION}-${AOORC}-r${SVNREVISION}/source/ \
@ -100,7 +100,7 @@ AOOVERSION2=	2
 AOOVERSION3=	0
 # From solenv/inc/minor.mk SOURCEREVISION LAST_MINOR BUILD
 AOOTAG=		AOO420m1\(Build:9800\)
-SVNREVISION=	1697984
+SVNREVISION=	1704217
 #AOORC=rc3
 EXTSRC=		ApacheOpenOffice.ext_sources.${AOOVERSION1}.x.x.20150707.tar.gz

@ -204,7 +204,8 @@ GNU_CONFIGURE=	yes
 WRKSUBDIR=	${WRKDIR}/aoo-${AOOVERSION}
 WRKSRC?=	${WRKSUBDIR}/main
 SUB_FILES=	pkg-message
-SUB_LIST=	EXECBASE=${EXECBASE} AOOTAG=${AOOTAG} AOOUDIR=${AOOUDIR}
+SUB_LIST=	EXECBASE=${EXECBASE} AOOTAG=${AOOTAG} AOOUDIR=${AOOUDIR} \
+		PRINSTALLATION_BASEDIR=${PRINSTALLATION_BASEDIR}

 CONFIGURE_ARGS+=							\
 			--with-unix-wrapper=${EXECBASE}			\
@ -397,7 +398,8 @@ do-build:
 	LANG=C LC_ALL=C build.pl --all -P$${numproc} -- -P$${dmproc}

 do-install:
-	@${MKDIR} ${STAGEDIR}${PRINSTALLATION_BASEDIR}/extensions/ \
+	@${MKDIR} ${STAGEDIR}${PRINSTALLATION_BASEDIR}/extensions \
+		${STAGEDIR}${OOPATH}/uno_packages/cache/uno_packages \
 		${STAGEDIR}${DESKTOPDIR}
 	@cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/Apache_OpenOffice/archive/install/${LOCALIZED_LANG}/ ; \
 		for i in *.tar.?z ; do \
@ -413,8 +415,7 @@ do-install:
 		${ECHO_CMD} "stripping executables and shared libraries" ; \
 		${STRIP_CMD} crashrep pagein uri-encode javaldx regmerge \
 			regview *.so* *.bin ; \
-		${ECHO_CMD} "fixing permissions" ; \
-		${FIND} . -type d -exec ${CHMOD} 755 {} \;
+	${FIND} ${STAGEDIR}${PRINSTALLATION_BASEDIR} -type d -exec ${CHMOD} 755 {} \;
 	${REINPLACE_CMD} \
 		-e '/^UserInstallation/s/=.*/=$$SYSUSERCONFIG\/${AOOUDIR}/' \
 		${STAGEDIR}${OOPATH}/program/bootstraprc
--- a/editors/openoffice-devel/distinfo
+++ b/editors/openoffice-devel/distinfo
@ -1,5 +1,5 @@
-SHA256 (openoffice/apache-openoffice-r1697984-src.tar.xz) = 50eb71b4af05d55071a03c85449108efb9351ee8c0f158d44413bd4726c557f8
-SIZE (openoffice/apache-openoffice-r1697984-src.tar.xz) = 215196304
+SHA256 (openoffice/apache-openoffice-r1704217-src.tar.xz) = 52b0c1c54cfd0aa9ec1bd27a99c2c6240fd4279171bcf6025383fe7e0d55f24b
+SIZE (openoffice/apache-openoffice-r1704217-src.tar.xz) = 215145548
 SHA256 (openoffice/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 SIZE (openoffice/unowinreg.dll) = 6144
 SHA256 (openoffice/ApacheOpenOffice.ext_sources.4.x.x.20150707.tar.gz) = 966a8333c83a18ddd84401389006d6e0b52b8175924b808b54b88211669985fa
--- a/editors/openoffice-devel/files/pkg-message.in
+++ b/editors/openoffice-devel/files/pkg-message.in
@ -33,8 +33,13 @@ to your PATH and you will be able to use them.

 OpenOffice does need $LANG to be set to a suitable value.

-4. If you run into problems
--------------------------------------------------
+4. Wiki Publisher Extension
+---------------------------
+The Wiki Publisher extension can be installed from
+%%PRINSTALLATION_BASEDIR%%/extensions/
+
+5. If you run into problems
+---------------------------
 If you somehow run into problems, please remove the already installed
 "%%AOOUDIR%%" directory in your home directory, then redo the
 user installation and the problems should go away.
--- a/editors/scite/Makefile
+++ b/editors/scite/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	scite
-PORTVERSION=	3.6.0
+PORTVERSION=	3.6.1
 CATEGORIES=	editors gnome
 MASTER_SITES=	SF/scintilla/SciTE/${PORTVERSION}
 DISTNAME=	${PORTNAME}${PORTVERSION:S/.//g}
--- a/editors/scite/distinfo
+++ b/editors/scite/distinfo
@ -1,2 +1,2 @@
-SHA256 (scite360.tgz) = cb2ccde384504cb5f4f2ec98f0c4982fb9f04f341786f2129b54af997aad4170
-SIZE (scite360.tgz) = 2323368
+SHA256 (scite361.tgz) = bdffdc28c501dbb5e3dc6cbfe3808da2d574df983790c6ddfc2643040023a010
+SIZE (scite361.tgz) = 2347061
--- a/emulators/ppsspp-devel/Makefile
+++ b/emulators/ppsspp-devel/Makefile
@ -1,16 +1,37 @@
 # $FreeBSD$

-DISTVERSION=	1.0.1-2668
-DISTVERSIONSUFFIX=	-g253ed9f
-PORTREVISION=	1
+DISTVERSION=	1.0.1-2768
+DISTVERSIONSUFFIX=	-gd8b43dd
+PORTREVISION=	0
 PKGNAMESUFFIX=	-devel
+# XXX Get from Debian once #697821 lands
+MASTER_SITES=	https://bazaar.launchpad.net/~sergio-br2/${PORTNAME}/debian-sdl/download/1/${PORTNAME}.1-20140802045408-dd26dik367ztj5xg-8/:manpage
+DISTFILES=	${PORTNAME}.1:manpage
+EXTRACT_ONLY=	${DISTFILES:N*\:manpage:C/:.*//}

 GH_TAGNAME=	e22d7a5:lang a0b878f:ext_armips

 CONFLICTS_INSTALL?=	${PORTNAME}-[0-9]*

+LIB_DEPENDS=	libzip.so:${PORTSDIR}/archivers/libzip \
+		libsnappy.so:${PORTSDIR}/archivers/snappy
+USE_GL=		glew
+
+EXCLUDE=	glew snappy libzip zlib
+EXTRACT_AFTER_ARGS=${EXCLUDE:S,^,--exclude ,}
+
 MASTERDIR=	${.CURDIR}/../ppsspp
 PATCHDIR=	${.CURDIR}/files
 DISTINFO_FILE=	${.CURDIR}/distinfo

+post-patch:	slave-post-patch
+slave-post-patch:
+	@${REINPLACE_CMD} -e 's,/usr,${LOCALBASE},' \
+		${WRKSRC}/Qt/*.pr*
+
+post-install:	slave-post-install
+slave-post-install:
+	${INSTALL_MAN} ${_DISTDIR}/${PORTNAME}.1 \
+		${STAGEDIR}${MAN1PREFIX}/man/man1
+
 .include "${MASTERDIR}/Makefile"
--- a/emulators/ppsspp-devel/distinfo
+++ b/emulators/ppsspp-devel/distinfo
@ -1,5 +1,7 @@
-SHA256 (hrydgard-ppsspp-v1.0.1-2668-g253ed9f_GH0.tar.gz) = 53126bbbc64e0e9fb61f4ffe65d3d87f79f68803bbf3dcc67bcb387b1a00d270
-SIZE (hrydgard-ppsspp-v1.0.1-2668-g253ed9f_GH0.tar.gz) = 14919158
+SHA256 (ppsspp.1) = 8e335555393a6400c97d5f6d23798af801f88b909181bb5af676dfdcb4f8f8be
+SIZE (ppsspp.1) = 1507
+SHA256 (hrydgard-ppsspp-v1.0.1-2768-gd8b43dd_GH0.tar.gz) = 0f5c25a67cf8466b56a7947fa0ceb65b92eca3f51b164830d6f6d84648432299
+SIZE (hrydgard-ppsspp-v1.0.1-2768-gd8b43dd_GH0.tar.gz) = 14756762
 SHA256 (hrydgard-ppsspp-lang-e22d7a5_GH0.tar.gz) = b481a44c75b646d99909e3acd1f59614e7c05463e73c3827a662d9cf298e84cb
 SIZE (hrydgard-ppsspp-lang-e22d7a5_GH0.tar.gz) = 210229
 SHA256 (Kingcom-armips-a0b878f_GH0.tar.gz) = 64623bbddda609f9692904e6b6823b1d2d4dd0149349f2be9edcc600bf12bafa
--- a/emulators/ppsspp-devel/files/patch-CVE-2015-2331
+++ b/emulators/ppsspp-devel/files/patch-CVE-2015-2331
@ -1,18 +0,0 @@
-From ef8fc4b53d92fbfcd8ef1abbd6f2f5fe2c4a11e5 Mon Sep 17 00:00:00 2001
-From: Stanislav Malyshev <stas@php.net>
-Date: Tue, 17 Mar 2015 21:59:56 -0700
-Subject: Fix bug #69253 - ZIP Integer Overflow leads to writing past heap boundary
-
-diff --git a/ext/zip/lib/zip_dirent.c b/ext/zip/lib/zip_dirent.c
-index b9dac5c..0090801 100644
--- ext/native/ext/libzip/zip_dirent.c
-+++ ext/native/ext/libzip/zip_dirent.c
-@@ -101,7 +101,7 @@ _zip_cdir_new(int nentry, struct zip_error *error)
- 	return NULL;
-     }
- 
-    if ((cd->entry=(struct zip_dirent *)malloc(sizeof(*(cd->entry))*nentry))
-+    if ( nentry > ((size_t)-1)/sizeof(*(cd->entry)) || (cd->entry=(struct zip_dirent *)malloc(sizeof(*(cd->entry))*(size_t)nentry))
- 	== NULL) {
- 	_zip_error_set(error, ZIP_ER_MEMORY, 0);
- 	free(cd);
--- a/emulators/ppsspp/Makefile
+++ b/emulators/ppsspp/Makefile
@ -16,7 +16,7 @@ COMMENT=	PSP emulator in C++ with dynarec JIT for x86, ARM, MIPS

 LICENSE=	GPLv2 # or any later version

-LIB_DEPENDS=	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg
+LIB_DEPENDS+=	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg
 RUN_DEPENDS=	xdg-open:${PORTSDIR}/devel/xdg-utils

 USE_GITHUB=	yes
@ -32,7 +32,7 @@ GH_PROJECT+=	native:native
 CONFLICTS_INSTALL?=	${PORTNAME}-devel-[0-9]*

 USES=		compiler:c++11-lib pkgconfig
-USE_GL=		glu
+USE_GL+=	glu
 USE_SDL=	sdl2 # joystick
 CMAKE_ARGS=	-DUSE_SYSTEM_FFMPEG=on
 QMAKE_SOURCE_PATH=	${WRKSRC}/Qt/PPSSPPQt.pro
@ -40,6 +40,13 @@ QMAKE_ARGS=	CONFIG+="system_ffmpeg" LREL_TOOL="${LRELEASE}"
 NINJA_VERBOSE=	yes
 NO_INSTALL=	yes # ports/202949

+DESKTOP_ENTRIES="PPSSPP" \
+		"" \
+		"${PORTNAME}" \
+		"${PORTNAME} %f" \
+		"Game;Emulator;" \
+		""
+
 OPTIONS_DEFAULT=QT5
 OPTIONS_SINGLE=	GUI
 OPTIONS_SINGLE_GUI=	QT4 QT5 SDL
@ -64,7 +71,7 @@ post-extract:
 post-patch:
 	@${REINPLACE_CMD} -e 's,/usr/share,${PREFIX}/share,' \
 		${WRKSRC}/UI/NativeApp.cpp
-	@${REINPLACE_CMD} -e '/find_package(Git)/d' \
+	@${REINPLACE_CMD} \
 		-e 's/"unknown"/"${GH_TAGNAME}"/' \
 		-e 's/^\(VERSION =\).*/\1 ${GH_TAGNAME}/' \
 		${WRKSRC}/git-version.cmake \
@ -85,10 +92,10 @@ do-install-SDL-off:
 		${STAGEDIR}${PREFIX}/bin

 post-install:
-	${INSTALL_DATA} ${WRKSRC}/debian/${PORTNAME}.desktop \
-		${STAGEDIR}${DESKTOPDIR}
+.ifndef PKGNAMESUFFIX
 	${INSTALL_MAN} ${WRKSRC}/debian/${PORTNAME}.1 \
 		${STAGEDIR}${MAN1PREFIX}/man/man1
+.endif
 	(cd ${WRKSRC}/assets/unix-icons && ${COPYTREE_SHARE} \
 		"hicolor" ${STAGEDIR}${PREFIX}/share/icons)
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps
--- a/emulators/ppsspp/files/patch-git-version.cmake
+++ b/emulators/ppsspp/files/patch-git-version.cmake
@ -0,0 +1,19 @@
+commit e81fa01
+Author: sergiobenrocha2 <sergiobenrocha2@gmail.com>
+Date:   Wed Sep 16 19:07:25 2015 -0300
+
+    fix build when git is installed but there is no .git folder.
+
+diff --git git-version.cmake git-version.cmake
+index a507a93..ff276d7 100644
+--- git-version.cmake
+++ git-version.cmake
+@@ -3,7 +3,7 @@ set(GIT_VERSION "unknown")
+ set(GIT_VERSION_UPDATE "1")
+ 
+ find_package(Git)
+-if(GIT_FOUND)
+if(GIT_FOUND AND EXISTS ".git")
+ 	execute_process(COMMAND ${GIT_EXECUTABLE} describe --always
+ 		WORKING_DIRECTORY ${SOURCE_DIR}
+ 		RESULT_VARIABLE exit_code
--- a/emulators/ppsspp/pkg-plist
+++ b/emulators/ppsspp/pkg-plist
@ -1,6 +1,5 @@
 bin/ppsspp
 man/man1/ppsspp.1.gz
-share/applications/ppsspp.desktop
 share/icons/hicolor/128x128/apps/ppsspp.png
 share/icons/hicolor/16x16/apps/ppsspp.png
 share/icons/hicolor/24x24/apps/ppsspp.png
--- a/games/alephone/Makefile
+++ b/games/alephone/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	alephone
 PORTVERSION=	20120514
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	games
 MASTER_SITES=	SF/marathon/Aleph%20One/2012-05-14
 DISTNAME=	AlephOne-${PORTVERSION}
@ -28,49 +28,27 @@ ZZIP_DESC=	Enable zziplib support

 OPTIONS_DEFAULT=	MAD OGG SPEEX SMPEG TTF ZZIP

-.include <bsd.port.options.mk>
+MAD_LIB_DEPENDS=	libmad.so:${PORTSDIR}/audio/libmad
+MAD_CONFIGURE_ENABLE=	mad

-.if ${PORT_OPTIONS:MMAD}
-LIB_DEPEND+=	libmad.so:${PORTSDIR}/audio/libmad
-.else
-CONFIGURE_ARGS+=--disable-mad
-.endif
+OGG_LIB_DEPENDS=	libvorbisfile.so:${PORTSDIR}/audio/libvorbis
+OGG_CONFIGURE_ENABLE=	vorbis

-.if ${PORT_OPTIONS:MOGG}
-LIB_DEPEND+=	libvorbisfile.so:${PORTSDIR}/audio/libvorbis
-.else
-CONFIGURE_ARGS+=--disable-vorbis
-.endif
+SPEEX_LIB_DEPENDS=	libspeex.so:${PORTSDIR}/audio/speex
+SPEEX_CONFIGURE_ENABLE=	speex

-.if ${PORT_OPTIONS:MSPEEX}
-LIB_DEPENDS+=	libspeex.so:${PORTSDIR}/audio/speex
-.else
-CONFIGURE_ARGS+=--disable-speex
-.endif
+SMPEG_LIB_DEPENDS=	libsmpeg.so:${PORTSDIR}/multimedia/smpeg
+SMPEG_CONFIGURE_ENABLE=	smpeg

-.if ${PORT_OPTIONS:MSMPEG}
-LIB_DEPENDS+=	libsmpeg.so:${PORTSDIR}/multimedia/smpeg
-.else
-CONFIGURE_ARGS+=--disable-smpeg
-.endif
+TTF_USE=	SDL=ttf
+TTF_CONFIGURE_ENABLE=	ttf

-.if ${PORT_OPTIONS:MTTF}
-USE_SDL+=	ttf
-.else
-CONFIGURE_ARGS+=--disable-ttf
-.endif
+ZZIP_LIB_DEPENDS=	libzzip.so:${PORTSDIR}/devel/zziplib
+ZZIP_CONFIGURE_ENABLE=	zzip

-.if ${PORT_OPTIONS:MZZIP}
-LIB_DEPENDS+=	libzzip.so:${PORTSDIR}/devel/zziplib
-.else
-CONFIGURE_ARGS+=--disable-zzip
-.endif
-
-post-install:
-.if ${PORT_OPTIONS:MDOCS}
+post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} README ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/docs && ${INSTALL_DATA} *.html ${STAGEDIR}${DOCSDIR}
-.endif

 .include <bsd.port.mk>
--- a/games/alephone/pkg-plist
+++ b/games/alephone/pkg-plist
@ -50,8 +50,3 @@ man/man6/alephone.6.gz
 %%PORTDOCS%%%%DOCSDIR%%/Lua_HUD.html
 %%PORTDOCS%%%%DOCSDIR%%/MML.html
 %%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%DATADIR%%/Themes/Default
-@dirrm %%DATADIR%%/Themes
-@dirrm %%DATADIR%%/MML
-@dirrmtry %%DATADIR%%
--- a/games/ldmud/pkg-plist
+++ b/games/ldmud/pkg-plist
@ -1365,43 +1365,5 @@ man/man1/ldmud.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/other/mcp2.html
 %%PORTDOCS%%%%DOCSDIR%%/other/msp.htm
 %%PORTDOCS%%%%DOCSDIR%%/other/mxp.htm
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/master
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/efun
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/efun.de
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/driver
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/concepts
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/applied
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/obsolete
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/other
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/LPC
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/man
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/hook
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%DEMOLIB%%@dirrm %%DATADIR%%/uni-crasher
-%%DEMOLIB%%@dirrm %%DATADIR%%/sys
-%%LPMUD%%@dirrm %%DATADIR%%/sys
-%%LPMUD%%@dirrm %%DATADIR%%/secure
-%%LPMUD%%@dirrm %%DATADIR%%/room/sub
-%%LPMUD%%@dirrm %%DATADIR%%/room/south
-%%LPMUD%%@dirrm %%DATADIR%%/room/mine
-%%LPMUD%%@dirrm %%DATADIR%%/room/maze1
-%%LPMUD%%@dirrm %%DATADIR%%/room/death
-%%LPMUD%%@dirrm %%DATADIR%%/room
-%%LPMUD%%@dirrm %%DATADIR%%/players/lars
-%%LPMUD%%@dirrm %%DATADIR%%/players
-%%LPMUD%%@dirrm %%DATADIR%%/obj/Go
-%%LPMUD%%@dirrm %%DATADIR%%/obj
-%%LPMUD%%@dirrm %%DATADIR%%/log
-%%LPMUD%%@dirrm %%DATADIR%%/doc/w
-%%LPMUD%%@dirrm %%DATADIR%%/doc/sefun
-%%LPMUD%%@dirrm %%DATADIR%%/doc/lfun
-%%LPMUD%%@dirrm %%DATADIR%%/doc/helpdir
-%%LPMUD%%@dirrm %%DATADIR%%/doc/examples
-%%LPMUD%%@dirrm %%DATADIR%%/doc/build
-%%LPMUD%%@dirrm %%DATADIR%%/doc
-%%LPMUD%%@dirrm %%DATADIR%%/banish
-@dirrm %%DATADIR%%
-@owner mud
-@group mud
-@dirrmtry /var/run/ldmud
-@dirrmtry /var/log/ldmud
+@dir(mud,mud) /var/run/ldmud
+@dir(mud,mud) /var/log/ldmud
--- a/games/noegnud-data/pkg-plist
+++ b/games/noegnud-data/pkg-plist
--- a/games/pouetchess/pkg-plist
+++ b/games/pouetchess/pkg-plist
@ -1,4 +1,2 @@
 bin/pouetChess
-@unexec if cmp -s %D/etc/pouetChess.conf %D/etc/pouetChess.conf.sample; then rm -f %D/etc/pouetChess.conf; fi
-etc/pouetChess.conf.sample
-@exec if [ ! -f %D/etc/pouetChess.conf ]; then cp -p %D/etc/pouetChess.conf.sample %D/etc/pouetChess.conf; fi
+@sample etc/pouetChess.conf.sample
--- a/games/wxlauncher/Makefile
+++ b/games/wxlauncher/Makefile
@ -2,9 +2,8 @@
 # $FreeBSD$

 PORTNAME=	wxlauncher
-PORTVERSION=	0.9.6
+PORTVERSION=	0.10.0
 DISTVERSIONPREFIX=	release-
-PORTREVISION=	2
 CATEGORIES=	games

 MAINTAINER=	lightside@gmx.com
@ -17,11 +16,11 @@ BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}markdown>0:${PORTSDIR}/textproc/py-markdow
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3

 USE_GITHUB=	yes
-GH_ACCOUNT=	wxLauncher
+GH_ACCOUNT=	scp-fs2open
+GH_PROJECT=	wxLauncher

-USES=		cmake:outsource openal python:2,build
-USE_SDL=	sdl
-WX_UNICODE=	yes
+USES=		cmake:outsource openal pkgconfig python:2,build
+USE_SDL=	sdl2
 CMAKE_ARGS+=	-DRESOURCES_PATH:STRING="${DATADIR}"

 PORTDATA=	*
@ -45,20 +44,13 @@ WX3_CXXFLAGS=	-std=c++11
 WX3_USES=	compiler:c++11-lib
 WX3_USE=	WX=3.0+
 WX3_USE_OFF=	WX=2.8
-
-.include <bsd.port.options.mk>
-
-# Allow to build with using concrete wxWidgets version
-.if ${PORT_OPTIONS:MWX3}
-SED_RE_WX3=	wxWidgets 2\./,+1d
-.else
-SED_RE_WX3=	NOT wxWidgets_FOUND/,+3d
-.endif
+WX3_CMAKE_ON=	-DWXVER:STRING="3.0"
+WX3_CMAKE_OFF=	-DWXVER:STRING="2.8"

 post-patch: .SILENT
 # Change version_strings.cpp.in file, based on GH_TAGNAME, without using git
 	${REINPLACE_CMD} -e '/find_program(GIT_EXECUTABLE/d ; \
-		/version_strings.cpp will be generated/d ; /${SED_RE_WX3}' \
+		/version_strings.cpp will be generated/d' \
 		${WRKSRC}/CMakeLists.txt
 	${REINPLACE_CMD} -e 's|123456789abc+ unknown custom tip|${GH_TAGNAME}|' \
 		${WRKSRC}/code/global/version_strings.cpp.in
--- a/games/wxlauncher/distinfo
+++ b/games/wxlauncher/distinfo
@ -1,2 +1,2 @@
-SHA256 (wxLauncher-wxlauncher-release-0.9.6_GH0.tar.gz) = 24a90722a63ee8a711e268bd78535bbb1ec99a2b27fd7c3750517d07424b6979
-SIZE (wxLauncher-wxlauncher-release-0.9.6_GH0.tar.gz) = 893799
+SHA256 (scp-fs2open-wxLauncher-release-0.10.0_GH0.tar.gz) = b47c88be4d7cc6582a7b7816cf8dc9fe1502947f3bdd509bc0b4b6fcf06a8bc0
+SIZE (scp-fs2open-wxLauncher-release-0.10.0_GH0.tar.gz) = 2434207
--- a/games/wxlauncher/files/patch-code_apis_JoystickManager.cpp
+++ b/games/wxlauncher/files/patch-code_apis_JoystickManager.cpp
@ -1,13 +1,13 @@
--- code/apis/JoystickManager.cpp.orig	2015-04-11 22:15:55 UTC
+--- code/apis/JoystickManager.cpp.orig	2015-08-26 04:54:06 UTC
 +++ code/apis/JoystickManager.cpp
-@@ -65,8 +65,10 @@ bool JoyMan::IsInitialized() {
+@@ -84,9 +84,9 @@ bool JoyMan::IsInitialized() {
+ \sa JoyMan::WasCompiledIn()
 */
- bool JoyMan::Initialize() {
- 	if ( JoyMan::IsInitialized() ) {
+ bool JoyMan::Initialize(ApiType apiType) {
 +#if USE_JOYSTICK
- 		wxLogDebug(_T("JoyMan already initialized with %d joysticks"),
- 			joysticks.Count());
-+#endif
- 		return true;
- 	}
+ 	currentApi = apiType;
 
+-#if USE_JOYSTICK
+ 	if ( JoyMan::IsInitialized() ) {
+ 		wxLogDebug(_T("JoyMan already initialized"));
+ 		return true;
--- a/games/wxlauncher/pkg-descr
+++ b/games/wxlauncher/pkg-descr
@ -5,4 +5,4 @@ community looking for an easy way to control fs2_open on various platforms and
 to those looking for an easy way to find and get updates to their Freespace 2
 MODs and TCs.

-WWW: http://github.com/wxLauncher/wxlauncher
+WWW: http://github.com/scp-fs2open/wxLauncher
--- a/games/xboing/Makefile
+++ b/games/xboing/Makefile
@ -21,11 +21,7 @@ OPTIONS_DEFINE=SOUND
 OPTIONS_DEFAULT=SOUND
 OPTIONS_SUB=yes

-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MSOUND}
-MAKE_ENV+=	WITHOUT_AUDIO=True
-.endif
+SOUND_MAKE_ENV=	WITHOUT_AUDIO=True

 post-install:
 	${RM} ${STAGEDIR}${PREFIX}/lib/X11/xboing/.xboing.scr
--- a/games/xboing/pkg-plist
+++ b/games/xboing/pkg-plist
@ -1,4 +1,4 @@
-bin/xboing
+@(root,games,2755) bin/xboing
 lib/X11/xboing/levels/demo.data
 lib/X11/xboing/levels/editor.data
 lib/X11/xboing/levels/level01.data
@ -130,14 +130,8 @@ man/man1/xboing.1.gz
 %%SOUND%%lib/X11/xboing/sounds/wzzz2.au
 %%SOUND%%lib/X11/xboing/sounds/youagod.au
 lib/X11/xboing/problems.doc
-@exec chown root:games %D/bin/xboing
-@exec chmod 2755 %D/bin/xboing
@exec touch %D/lib/X11/xboing/.xboing.scr
-@exec chown root:games %D/lib/X11/xboing
-@exec chmod 775 %D/lib/X11/xboing
@exec chown root:games %D/lib/X11/xboing/.xboing.scr
@exec chmod 664 %D/lib/X11/xboing/.xboing.scr
@unexec if test ! -s %D/lib/X11/xboing/.xboing.scr ; then rm -f %D/lib/X11/xboing/.xboing.scr ; fi
-%%SOUND%%@dirrm lib/X11/xboing/sounds
-@dirrm lib/X11/xboing/levels
-@dirrm lib/X11/xboing
+@dir(root,games,775) lib/X11/xboing
--- a/games/xfireworks/pkg-plist
+++ b/games/xfireworks/pkg-plist
@ -1,5 +1,3 @@
 bin/xfireworks
 man/man1/xfireworks.1.gz
-@unexec if cmp -s %D/etc/xfireworks.conf %D/etc/xfireworks.conf.sample; then rm -f %D/etc/xfireworks.conf; fi
-etc/xfireworks.conf.sample
-@exec test -f %B/xfireworks.conf || cp %B/%f %B/xfireworks.conf
+@sample etc/xfireworks.conf.sample
--- a/graphics/gdal/Makefile
+++ b/graphics/gdal/Makefile
@ -2,8 +2,7 @@
 # $FreeBSD$

 PORTNAME=	gdal
-PORTVERSION=	2.0.0
-PORTREVISION=	2
+PORTVERSION=	2.0.1
 CATEGORIES=	graphics geography
 MASTER_SITES=	http://download.osgeo.org/gdal/${PORTVERSION}/ \
 		ftp://ftp.remotesensing.org/pub/gdal/${PORTVERSION}/ \
@ -13,6 +12,7 @@ MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Translator library for raster geospatial data formats

 LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE.TXT

 LIB_DEPENDS=	libgeotiff.so:${PORTSDIR}/graphics/libgeotiff \
 		libgif.so:${PORTSDIR}/graphics/giflib \
--- a/graphics/gdal/distinfo
+++ b/graphics/gdal/distinfo
@ -1,2 +1,2 @@
-SHA256 (gdal-2.0.0.tar.xz) = 91704fafeea2349c5e268dc1e2d03921b3aae64b05ee01d59fdfc1a6b0ffc061
-SIZE (gdal-2.0.0.tar.xz) = 6967656
+SHA256 (gdal-2.0.1.tar.xz) = 2564c91ed8ed36274ee31002a25798f5babc4221e879cb5013867733d80f9920
+SIZE (gdal-2.0.1.tar.xz) = 6975872
--- a/graphics/p5-Geo-GDAL/Makefile
+++ b/graphics/p5-Geo-GDAL/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	Geo-GDAL
-PORTVERSION=	2.0.0
+PORTVERSION=	2.0.1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	http://download.osgeo.org/gdal/${PORTVERSION}/ \
 		ftp://ftp.remotesensing.org/pub/gdal/${PORTVERSION}/ \
@ -14,6 +14,7 @@ MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Perl binding for GDAL

 LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/../../LICENSE.TXT

 LIB_DEPENDS=	libgdal.so:${PORTSDIR}/graphics/gdal

--- a/graphics/p5-Geo-GDAL/distinfo
+++ b/graphics/p5-Geo-GDAL/distinfo
@ -1,2 +1,2 @@
-SHA256 (gdal-2.0.0.tar.xz) = 91704fafeea2349c5e268dc1e2d03921b3aae64b05ee01d59fdfc1a6b0ffc061
-SIZE (gdal-2.0.0.tar.xz) = 6967656
+SHA256 (gdal-2.0.1.tar.xz) = 2564c91ed8ed36274ee31002a25798f5babc4221e879cb5013867733d80f9920
+SIZE (gdal-2.0.1.tar.xz) = 6975872
--- a/graphics/p5-Geo-GDAL/pkg-plist
+++ b/graphics/p5-Geo-GDAL/pkg-plist
@ -6,3 +6,4 @@
 %%SITE_ARCH%%/auto/Geo/GDAL/GDAL.so
 %%SITE_ARCH%%/auto/Geo/OGR/OGR.so
 %%SITE_ARCH%%/auto/Geo/OSR/OSR.so
+%%PERL5_MAN3%%/Geo::GDAL.3.gz
--- a/Show more
+++ b/Show more