*/*: sync with upstream

Taken from: FreeBSD

astro/weather/Makefile

@@ -12,13 +12,14 @@ MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Utility to provide current weather conditions and forecasts
 
 LICENSE=	ISCL
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		python shebangfix tar:xz
 
 PLIST_FILES=	bin/${PORTNAME} \
 		%%PYTHON_SITELIBDIR%%/${PORTNAME}.py \
 		%%PYTHON_SITELIBDIR%%/${PYCACHE_DIR}${PYCACHE_FILE}.pyc \
-		%%PYTHON_SITELIBDIR%%/${PYCACHE_DIR}${PYCACHE_FILE}.pyo \
+		%%PYTHON_SITELIBDIR%%/${PYCACHE_DIR}${PYCACHE_FILE}.${PYOEXTENSION} \
 		man/man1/${PORTNAME}.1.gz \
 		man/man5/${PORTNAME}rc.5.gz
 PORTDATA=	airports places stations zctas zones
@@ -36,6 +37,12 @@ PYCACHE_DIR=	__pycache__/
 PYCACHE_FILE=	${PORTNAME}.cpython-${PYTHON_SUFFIX}
 .endif
 
+.if ${PYTHON_REL} < 3500
+PYOEXTENSION=	pyo
+.else
+PYOEXTENSION=	opt-1.pyc
+.endif
+
 do-build:
 	@${PYTHON_CMD} -m compileall ${WRKSRC}/${PORTNAME}.py
 	@${PYTHON_CMD} -O -m compileall ${WRKSRC}/${PORTNAME}.py
@@ -45,7 +52,7 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.py ${STAGEDIR}${PYTHON_SITELIBDIR}/
 	${INSTALL_DATA} ${WRKSRC}/${PYCACHE_DIR}${PYCACHE_FILE}.pyc ${STAGEDIR}${PYTHON_SITELIBDIR}/${PYCACHE_DIR}
-	${INSTALL_DATA} ${WRKSRC}/${PYCACHE_DIR}${PYCACHE_FILE}.pyo ${STAGEDIR}${PYTHON_SITELIBDIR}/${PYCACHE_DIR}
+	${INSTALL_DATA} ${WRKSRC}/${PYCACHE_DIR}${PYCACHE_FILE}.${PYOEXTENSION} ${STAGEDIR}${PYTHON_SITELIBDIR}/${PYCACHE_DIR}
 	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1/${PORTNAME}.1
 	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}rc.5 ${STAGEDIR}${MANPREFIX}/man/man5/${PORTNAME}rc.5
 	${MKDIR} ${STAGEDIR}${DATADIR}/

audio/musicpc/Makefile

@@ -4,7 +4,7 @@
 PORTNAME=	musicpc
 PORTVERSION=	0.27
 CATEGORIES=	audio ipv6
-MASTER_SITES=	http://musicpd.org/download/mpc/0/
+MASTER_SITES=	http://www.musicpd.org/download/mpc/0/
 DISTNAME=	mpc-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
@@ -17,7 +17,7 @@ LIB_DEPENDS=	libmpdclient.so:${PORTSDIR}/audio/libmpdclient
 OPTIONS_DEFINE=	EXAMPLES DOCS ICONV
 OPTIONS_DEFAULT=	ICONV
 
-USES=		tar:xz pkgconfig
+USES=		pkgconfig tar:xz
 GNU_CONFIGURE=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib
 CFLAGS+=	-I${LOCALBASE}/include

audio/musicpc/pkg-descr

@@ -1,5 +1,4 @@
 A client for MPD, the Music Player Daemon.
 mpc connects to a MPD running on a machine via a network.
-Read more about MPD on http://www.musicpd.org
 
 WWW: http://www.musicpd.org

audio/soundconverter/Makefile

@@ -2,31 +2,29 @@
 # $FreeBSD$
 
 PORTNAME=	soundconverter
-PORTVERSION=	1.5.4
-PORTREVISION=	1
+PORTVERSION=	2.1.5
 CATEGORIES=	audio python
-MASTER_SITES=	BERLIOS \
+MASTER_SITES=	https://launchpad.net/soundconverter/trunk/2.1.5/+download/ \
 		http://BSDforge.com/projects/source/audio/soundconverter/
 
 MAINTAINER=	portmaster@BSDforge.com
 COMMENT=	Sound conversion application for the GNOME environment
 
 LICENSE=	GPLv3
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gstreamer>=0.10:${PORTSDIR}/multimedia/py-gstreamer
 
 NO_ARCH=	yes
-USES=		desktop-file-utils gmake python:2 shebangfix
+USES=		desktop-file-utils gmake python:2 shebangfix tar:xz
 
-SHEBANG_FILES=	src/soundconverter.py
-python_OLD_CMD=	/usr/bin/python -tt
+SHEBANG_FILES=	bin/soundconverter.py
 
 GNU_CONFIGURE=	yes
 USE_GNOME=	intltool pygtk2 pygnome2
 MAKE_ENV=	MAKE=${MAKE_CMD}
 INSTALLS_ICONS=	yes
 
-OPTIONS_DEFAULT=	NLS
 OPTIONS_DEFINE=		NLS
 OPTIONS_SUB=		yes
 NLS_CONFIGURE_ENABLE=	nls

audio/soundconverter/distinfo

@@ -1,2 +1,2 @@
-SHA256 (soundconverter-1.5.4.tar.gz) = 980ba4d65c76747aa223b2913e1193a183c312c7e3b13733b636c6131938aac4
-SIZE (soundconverter-1.5.4.tar.gz) = 241383
+SHA256 (soundconverter-2.1.5.tar.xz) = cace2109b967744325e4ce8938d286b78b86f0615d4f145966f42decc7a74e06
+SIZE (soundconverter-2.1.5.tar.xz) = 195380

audio/soundconverter/pkg-plist

@@ -1,8 +1,56 @@
 bin/soundconverter
+lib/soundconverter/python/soundconverter/__init__.py
+lib/soundconverter/python/soundconverter/__init__.pyc
+lib/soundconverter/python/soundconverter/__init__.pyo
+lib/soundconverter/python/soundconverter/batch.py
+lib/soundconverter/python/soundconverter/batch.pyc
+lib/soundconverter/python/soundconverter/batch.pyo
+lib/soundconverter/python/soundconverter/error.py
+lib/soundconverter/python/soundconverter/error.pyc
+lib/soundconverter/python/soundconverter/error.pyo
+lib/soundconverter/python/soundconverter/fileoperations.py
+lib/soundconverter/python/soundconverter/fileoperations.pyc
+lib/soundconverter/python/soundconverter/fileoperations.pyo
+lib/soundconverter/python/soundconverter/gconfstore.py
+lib/soundconverter/python/soundconverter/gconfstore.pyc
+lib/soundconverter/python/soundconverter/gconfstore.pyo
+lib/soundconverter/python/soundconverter/gstreamer.py
+lib/soundconverter/python/soundconverter/gstreamer.pyc
+lib/soundconverter/python/soundconverter/gstreamer.pyo
+lib/soundconverter/python/soundconverter/messagearea.py
+lib/soundconverter/python/soundconverter/messagearea.pyc
+lib/soundconverter/python/soundconverter/messagearea.pyo
+lib/soundconverter/python/soundconverter/namegenerator.py
+lib/soundconverter/python/soundconverter/namegenerator.pyc
+lib/soundconverter/python/soundconverter/namegenerator.pyo
+lib/soundconverter/python/soundconverter/notify.py
+lib/soundconverter/python/soundconverter/notify.pyc
+lib/soundconverter/python/soundconverter/notify.pyo
+lib/soundconverter/python/soundconverter/queue.py
+lib/soundconverter/python/soundconverter/queue.pyc
+lib/soundconverter/python/soundconverter/queue.pyo
+lib/soundconverter/python/soundconverter/settings.py
+lib/soundconverter/python/soundconverter/settings.pyc
+lib/soundconverter/python/soundconverter/settings.pyo
+lib/soundconverter/python/soundconverter/soundfile.py
+lib/soundconverter/python/soundconverter/soundfile.pyc
+lib/soundconverter/python/soundconverter/soundfile.pyo
+lib/soundconverter/python/soundconverter/task.py
+lib/soundconverter/python/soundconverter/task.pyc
+lib/soundconverter/python/soundconverter/task.pyo
+lib/soundconverter/python/soundconverter/ui.py
+lib/soundconverter/python/soundconverter/ui.pyc
+lib/soundconverter/python/soundconverter/ui.pyo
+lib/soundconverter/python/soundconverter/utils.py
+lib/soundconverter/python/soundconverter/utils.pyc
+lib/soundconverter/python/soundconverter/utils.pyo
 man/man1/soundconverter.1.gz
-%%DATADIR%%/soundconverter-logo.svg
-%%DATADIR%%/soundconverter.glade
+share/appdata/soundconverter.appdata.xml
+share/applications/soundconverter.desktop
+share/icons/hicolor/48x48/apps/soundconverter.png
+share/icons/hicolor/scalable/apps/soundconverter.svg
 %%NLS%%share/locale/ar/LC_MESSAGES/soundconverter.mo
+%%NLS%%share/locale/ast/LC_MESSAGES/soundconverter.mo
 %%NLS%%share/locale/bg/LC_MESSAGES/soundconverter.mo
 %%NLS%%share/locale/br/LC_MESSAGES/soundconverter.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/soundconverter.mo
@@ -11,6 +59,7 @@ man/man1/soundconverter.1.gz
 %%NLS%%share/locale/de/LC_MESSAGES/soundconverter.mo
 %%NLS%%share/locale/el/LC_MESSAGES/soundconverter.mo
 %%NLS%%share/locale/en_AU/LC_MESSAGES/soundconverter.mo
+%%NLS%%share/locale/en_CA/LC_MESSAGES/soundconverter.mo
 %%NLS%%share/locale/en_GB/LC_MESSAGES/soundconverter.mo
 %%NLS%%share/locale/eo/LC_MESSAGES/soundconverter.mo
 %%NLS%%share/locale/es/LC_MESSAGES/soundconverter.mo
@@ -19,12 +68,16 @@ man/man1/soundconverter.1.gz
 %%NLS%%share/locale/fa/LC_MESSAGES/soundconverter.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/soundconverter.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/soundconverter.mo
+%%NLS%%share/locale/fr_CA/LC_MESSAGES/soundconverter.mo
+%%NLS%%share/locale/fr_FR/LC_MESSAGES/soundconverter.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/soundconverter.mo
 %%NLS%%share/locale/he/LC_MESSAGES/soundconverter.mo
 %%NLS%%share/locale/hi/LC_MESSAGES/soundconverter.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/soundconverter.mo
 %%NLS%%share/locale/it/LC_MESSAGES/soundconverter.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/soundconverter.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/soundconverter.mo
+%%NLS%%share/locale/lv/LC_MESSAGES/soundconverter.mo
 %%NLS%%share/locale/ml/LC_MESSAGES/soundconverter.mo
 %%NLS%%share/locale/ms/LC_MESSAGES/soundconverter.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/soundconverter.mo
@@ -43,6 +96,6 @@ man/man1/soundconverter.1.gz
 %%NLS%%share/locale/uk/LC_MESSAGES/soundconverter.mo
 %%NLS%%share/locale/vi/LC_MESSAGES/soundconverter.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/soundconverter.mo
-share/applications/soundconverter.desktop
-share/icons/hicolor/48x48/apps/soundconverter.png
-share/icons/hicolor/scalable/apps/soundconverter.svg
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/soundconverter.mo
+%%DATADIR%%/soundconverter-logo.svg
+%%DATADIR%%/soundconverter.glade

biology/fasta3/Makefile

@@ -2,13 +2,13 @@
 # $FreeBSD$
 
 PORTNAME=	fasta3
-PORTVERSION=	36.3.7a
+PORTVERSION=	36.3.8
 CATEGORIES=	biology
 MASTER_SITES=	http://faculty.virginia.edu/wrpearson/fasta/fasta36/
 DISTNAME=	fasta-${PORTVERSION}
 DIST_SUBDIR=	fasta3/2014-01-29
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	wendell@bsd.com.br
 COMMENT=	Collection of programs for searching DNA and protein databases
 
 LICENSE=	Fasta

biology/fasta3/distinfo

@@ -1,2 +1,2 @@
-SHA256 (fasta3/2014-01-29/fasta-36.3.7a.tar.gz) = 69d1b8017bb3e4225552686709016405e8f78a3fdf836522c4e57c726f2af87b
-SIZE (fasta3/2014-01-29/fasta-36.3.7a.tar.gz) = 1161409
+SHA256 (fasta3/2014-01-29/fasta-36.3.8.tar.gz) = e235458afd16591bbcd5b89b639497e20346841091440a2445593318510a2262
+SIZE (fasta3/2014-01-29/fasta-36.3.8.tar.gz) = 1211304

comms/nmealib/Makefile

@@ -11,13 +11,15 @@ COMMENT=	Library for working with the NMEA protocol
 
 LICENSE=	LGPL21
 
-WRKSRC=	${WRKDIR}/${PORTNAME}
+WRKSRC=		${WRKDIR}/${PORTNAME}
 
-USES=	gmake zip
+USES=		gmake zip
 
 INCLUDES=	config.h context.h generate.h generator.h gmath.h info.h nmea.h \
 		parse.h parser.h sentence.h time.h tok.h units.h
 
+MAKE_JOBS_UNSAFE=	yes
+
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/lib/libnmea.a ${STAGEDIR}${PREFIX}/lib
 	@${MKDIR} ${STAGEDIR}${PREFIX}/include/nmea

comms/remserial/files/patch-stty.c

@@ -1,6 +1,6 @@
---- ./stty.c.orig	2011-01-05 10:31:12.000000000 +0100
-+++ ./stty.c	2011-01-05 10:33:33.000000000 +0100
-@@ -29,6 +29,37 @@
+--- stty.c.orig	2015-10-16 20:44:42 UTC
++++ stty.c
+@@ -29,6 +29,31 @@
  #define RFLG	4
  #define BFLG	5
  
@@ -32,7 +32,7 @@
  extern int errno;
  
  static struct sttyset {
-@@ -91,7 +122,7 @@
+@@ -91,7 +116,7 @@ static struct sttyset {
  	{ "inlcr",	IFLG,	INLCR,		INLCR	},
  	{ "igncr",	IFLG,	IGNCR,		IGNCR	},
  	{ "icrnl",	IFLG,	ICRNL,		ICRNL	},

databases/dbtool/Makefile

@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	dbtool
-PORTVERSION=	1.8
+PORTVERSION=	1.9.1
 CATEGORIES=	databases
 MASTER_SITES=	http://www.daemon.de/idisk/Apps/dbtool/
 
@@ -10,46 +10,43 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Store and retrieve data in a key/value format in a hash database
 
 LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
 
-OPTIONS_DEFINE=	BDB EXAMPLES
-
-EXAMPLES_RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
-
+USES=		gmake shebangfix
+SHEBANG_FILES=	samples/account-db/accdb
+bash_OLD_CMD=	/bin/sh
 GNU_CONFIGURE=	yes
-CPPFLAGS+=	${CXXFLAGS} -I${LOCALBASE}/include
-LIBS+=		-L${LOCALBASE}/lib
 
-USES=		gmake
-REINPLACE_ARGS=	-i ""
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
-SH2BASH=	samples/account-db/accdb
-UB2PFX=		samples/locate/locate samples/locate/updatedb
-EXTRACT_AFTER_ARGS+=	--no-same-permissions --no-same-owner --exclude '*~'
+PORTEXAMPLES=	*
+PLIST_FILES=	bin/dbtool man/man1/dbtool.1.gz
 
-.include <bsd.port.options.mk>
+OPTIONS_DEFINE=		EXAMPLES
+OPTIONS_SINGLE=		BACKEND
+OPTIONS_SINGLE_BACKEND=	BDB GDBM
+OPTIONS_DEFAULT=	GDBM
 
-.if ${PORT_OPTIONS:MBDB}
-USE_BDB=	48+
-CPPFLAGS+=	-I${BDB_INCLUDE_DIR}
-LIBS+=		-L${BDB_LIB_DIR} -l${BDB_LIB_NAME}
-CONFIGURE_ARGS+=	--with-berkeley
-.else
-LIB_DEPENDS+=	libgdbm.so:${PORTSDIR}/databases/gdbm
-CONFIGURE_ARGS+=	--without-berkeley
-.endif
+BACKEND_DESC=		Database backend
+BDB_USE=		bdb=yes
+BDB_CONFIGURE_ON=	--with-berkeley \
+			--with-bdb-include-dir=${BDB_INCLUDE_DIR} \
+			--with-bdb-lib-dir=${BDB_LIB_DIR}
+EXAMPLES_RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
+GDBM_LIB_DEPENDS=	libgdbm.so:${PORTSDIR}/databases/gdbm
+GDBM_CONFIGURE_ON=	--with-gdbm \
+			--with-gdbm-dir=${LOCALBASE}
 
 post-patch:
-	${REINPLACE_CMD} -e "s,stdin,input,g" ${WRKSRC}/dbtool.cc ${WRKSRC}/engine.cc ${WRKSRC}/engine.h
-.if ${PORT_OPTIONS:MEXAMPLES}
-	${REINPLACE_CMD} -e "s|/bin/sh|${LOCALBASE}/bin/bash|" ${SH2BASH:S|^|${WRKSRC}/|}
-	${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" ${UB2PFX:S|^|${WRKSRC}/|}
-	${RM} ${UB2PFX:C|.*|${WRKSRC}/&.orig|}
+	@${REINPLACE_CMD} -e \
+		'/try_libs=/s|"-ldb_cxx.*"|"-ldb_cxx"| ; \
+		 /try_headers=/s|"db.*"|"db_cxx.h"|' ${WRKSRC}/configure
 
-post-install:
-	#@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+post-install-EXAMPLES-on:
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC}/samples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
-.endif
 
 .include <bsd.port.mk>

databases/dbtool/distinfo

@@ -1,2 +1,2 @@
-SHA256 (dbtool-1.8.tar.gz) = a66e1150cce006daecedd9a592efe75fa19c642addad97ec117f1a2219c4f079
-SIZE (dbtool-1.8.tar.gz) = 133262
+SHA256 (dbtool-1.9.1.tar.gz) = afd3fa03d4b69f25c689817dc1b6ac452eb16ed4b9712c20695b3b4d13a5e647
+SIZE (dbtool-1.9.1.tar.gz) = 965751

databases/dbtool/files/patch-samples_locate_locate

@@ -1,16 +0,0 @@
---- samples/locate/locate.orig	Sat Apr 20 17:14:18 2002
-+++ samples/locate/locate	Sun Mar 23 12:25:01 2003
-@@ -12,10 +12,10 @@
- #
- # $Id: locate,v 1.3 2001/06/26 23:00:02 scip Exp $
- 
--dbtool="/usr/bin/dbtool";
-+dbtool="%%PREFIX%%/bin/dbtool";
- find="/usr/bin/find";
--db="/var/local/locate.db";
--sort="/bin/sort";
-+db="/var/db/locate.db";
-+sort="/usr/bin/sort";
- regex=$1;
- 
- if [ "x$regex" != "x" ]; then

databases/dbtool/files/patch-samples_locate_updatedb

@@ -1,16 +0,0 @@
---- samples/locate/updatedb.orig	Sat Apr 20 17:14:18 2002
-+++ samples/locate/updatedb	Sun Mar 23 12:24:47 2003
-@@ -11,10 +11,10 @@
- # $Id: updatedb,v 1.2 2001/06/26 23:00:02 scip Exp $
- #
- 
--dbtool="/usr/bin/dbtool";
-+dbtool="%%PREFIX%%/bin/dbtool";
- find="/usr/bin/find";
--db="/var/local/locate.db";
--egrep="/bin/egrep";
-+db="/var/db/locate.db";
-+egrep="/usr/bin/egrep";
- cp="/bin/cp"
- 
- $cp /dev/null $db;

databases/dbtool/pkg-plist

@@ -1,9 +0,0 @@
-bin/dbtool
-man/man1/dbtool.1.gz
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/account-db/README
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/account-db/accdb
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/locate/README
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/locate/locate
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/locate/updatedb
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/uback/README
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README

databases/hbase/Makefile

@@ -52,6 +52,13 @@ PLIST_SUB=	HBASE_USER=${HBASE_USER} \
 		HBASE_RUNDIR=${HBASE_RUNDIR} \
 		PORTVERSION="${PORTVERSION}"
 
+.include <bsd.port.pre.mk>
+
+.if ${JAVA_PORT_VERSION:M1.8.*}
+EXTRA_PATCHES=	${FILESDIR}/extra-patch-PoolMap.java \
+		${FILESDIR}/extra-patch-pom.xml
+.endif
+
 post-patch:
 	${REINPLACE_CMD} -e "s#%%ETCDIR%%#${ETCDIR}#" ${WRKSRC}/conf/hbase-env.sh ${WRKSRC}/bin/hbase
 	${RM} ${WRKSRC}/conf/hbase-env.sh.bak ${WRKSRC}/conf/hbase-env.sh.orig
@@ -77,4 +84,4 @@ do-install:
 	${MKDIR} ${STAGEDIR}${HBASE_LOGDIR}
 	${MKDIR} ${STAGEDIR}${HBASE_RUNDIR}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>

databases/hbase/files/extra-patch-PoolMap.java

@@ -0,0 +1,17 @@
+--- hbase-client/src/main/java/org/apache/hadoop/hbase/util/PoolMap.java.orig	2014-12-16 06:16:53 UTC
++++ hbase-client/src/main/java/org/apache/hadoop/hbase/util/PoolMap.java
+@@ -93,14 +93,6 @@ public class PoolMap<K, V> implements Ma
+     return null;
+   }
+ 
+-  /**
+-   * @deprecated Will be removed for Java 8, use {@link #removeValue} instead
+-   */
+-  @Deprecated
+-  public boolean remove(K key, V value) {
+-    return removeValue(key, value);
+-  }
+-
+   public boolean removeValue(K key, V value) {
+     Pool<V> pool = pools.get(key);
+     boolean res = false;

databases/hbase/files/extra-patch-pom.xml

@@ -0,0 +1,10 @@
+--- pom.xml.orig	2015-10-02 13:51:13.974582000 +0000
++++ pom.xml	2015-10-02 13:51:17.416694000 +0000
+@@ -2064,6 +2064,7 @@
+         <version>2.9.1</version>
+         <configuration>
+           <maxmemory>2048m</maxmemory>
++          <additionalparam>-Xdoclint:none</additionalparam>
+         </configuration>
+         <reportSets>
+           <reportSet>

databases/mysql-connector-java/Makefile

@@ -3,7 +3,7 @@
 
 
 PORTNAME=	mysql-connector-java
-PORTVERSION=	5.1.36
+PORTVERSION=	5.1.37
 CATEGORIES=	databases java
 MASTER_SITES=	MYSQL/Connector-J
 

databases/mysql-connector-java/distinfo

@@ -1,2 +1,2 @@
-SHA256 (mysql-connector-java-5.1.36.tar.gz) = 2e8ae92c68e719732ff5d75dc7e50f2d893d5e8efd65e5c0acb372291a8fd114
-SIZE (mysql-connector-java-5.1.36.tar.gz) = 3888402
+SHA256 (mysql-connector-java-5.1.37.tar.gz) = 01e2f104c169863b4937a77045b008a372e5e254b803f69f030986167e626824
+SIZE (mysql-connector-java-5.1.37.tar.gz) = 3928553

databases/p5-Test-DatabaseRow/Makefile

@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	Test-DatabaseRow
-PORTVERSION=	2.03
-PORTREVISION=	1
+PORTVERSION=	2.04
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -11,10 +10,13 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	culot@FreeBSD.org
 COMMENT=	Simple database tests
 
-BUILD_DEPENDS=	p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
-		p5-Test-Simple>=0:${PORTSDIR}/devel/p5-Test-Simple
+LICENSE=	ART10 GPLv1
+LICENSE_COMB=	dual
+
+BUILD_DEPENDS=	p5-DBI>=0:${PORTSDIR}/databases/p5-DBI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
+NO_ARCH=	yes
 USES=		perl5
 USE_PERL5=	configure
 

databases/p5-Test-DatabaseRow/distinfo

@@ -1,2 +1,2 @@
-SHA256 (Test-DatabaseRow-2.03.tar.gz) = 67e22bc06acdc67b608f184739ba6af6aa182034263a672a26fe00489041f548
-SIZE (Test-DatabaseRow-2.03.tar.gz) = 44548
+SHA256 (Test-DatabaseRow-2.04.tar.gz) = 3bcacc2061bfa743ea9d5471ffb0ca6b858153be0527bdadce93f58e85981ddf
+SIZE (Test-DatabaseRow-2.04.tar.gz) = 47090

deskutils/ganttproject/Makefile

@@ -2,27 +2,38 @@
 # $FreeBSD$
 
 PORTNAME=	ganttproject
-PORTVERSION=	2.6.2
-PORTREVISION=	1
+PORTVERSION=	2.7.1
+DISTVERSIONSUFFIX=	-r1924
 CATEGORIES=	deskutils java
-MASTER_SITES=	GOOGLE_CODE
-DISTNAME=	${PORTNAME}-${PORTVERSION}-r1544
+MASTER_SITES=	https://dl.ganttproject.biz/%SUBDIR%/
+MASTER_SITE_SUBDIR=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Gantt chart based project scheduling and management tool
 
 LICENSE=	GPLv3
 
+NO_ARCH=	yes
+NO_BUILD=	yes
+
 USES=		shebangfix zip
 SHEBANG_FILES=	ganttproject
+bash_CMD=	${SH}
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
-NO_BUILD=	yes
+INSTALLS_ICONS=	yes
+
+DESKTOP_ENTRIES="GanttProject" "" "ganttproject" "ganttproject" "" ""
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
-	cd ${WRKSRC} && ${COPYTREE_SHARE} \* ${STAGEDIR}${DATADIR}
-	${CHMOD} 0755 ${STAGEDIR}${DATADIR}/ganttproject
+	(cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR})
+	${CHMOD} ${BINMODE} ${STAGEDIR}${DATADIR}/ganttproject
 	${LN} -sf ${DATADIR}/ganttproject ${STAGEDIR}${PREFIX}/bin
+.for i in 16 24 32 48 64
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${i}x${i}/apps
+	${LN} -sf ${DATADIR}/plugins/net.sourceforge.ganttproject/data/resources/logos/icon${i}.png \
+		${STAGEDIR}${PREFIX}/share/icons/hicolor/${i}x${i}/apps/ganttproject.png
+.endfor
 
 .include <bsd.port.mk>

deskutils/ganttproject/distinfo

@@ -1,2 +1,2 @@
-SHA256 (ganttproject-2.6.2-r1544.zip) = 3cec1fb1dcdb6846af98797cbc70995024bf5fa2fbd30b471b146c8812a11cf1
-SIZE (ganttproject-2.6.2-r1544.zip) = 13985585
+SHA256 (ganttproject-2.7.1-r1924.zip) = b0a981bc7c92d8a4eb3bc1e1bc365b8c9603fa2fa87f5207fa8a1bce456d3e5b
+SIZE (ganttproject-2.7.1-r1924.zip) = 13698982

deskutils/ganttproject/pkg-descr

@@ -1,9 +1,9 @@
-GanttProject is a free and easy to use Gantt chart based project scheduling and
-management tool. With GanttProject you can:
+GanttProject is a free and easy to use Gantt chart based project
+scheduling and management tool. With GanttProject you can:
 
 * Create work breakdown structure, draw dependencies, define milestones.
-* Assign human resources to work on tasks, see their allocation on the Resource
-  Load chart.
+* Assign human resources to work on tasks, see their allocation on the
+  Resource Load chart.
 * Generate PERT chart from Gantt chart.
 * Save charts as PNG images, generate PDF and HTML reports.
 * Import projects from and export them to Microsoft Project formats.

deskutils/ganttproject/pkg-plist

@@ -9,23 +9,32 @@ bin/ganttproject
 %%DATADIR%%/ganttproject.exe
 %%DATADIR%%/ganttproject_16.ico
 %%DATADIR%%/ganttproject_32_2.ico
+%%DATADIR%%/lib/javagalician.jar
 %%DATADIR%%/plugins/biz.ganttproject.core/ganttproject-core.jar
 %%DATADIR%%/plugins/biz.ganttproject.core/lib/ganttproject-guava.jar
 %%DATADIR%%/plugins/biz.ganttproject.core/plugin.xml
 %%DATADIR%%/plugins/biz.ganttproject.core/resources/img/notes.png
+%%DATADIR%%/plugins/biz.ganttproject.impex.ical/ganttproject-ical.jar
+%%DATADIR%%/plugins/biz.ganttproject.impex.ical/lib/backport-util-concurrent-3.1.jar
+%%DATADIR%%/plugins/biz.ganttproject.impex.ical/lib/commons-codec-1.5.jar
+%%DATADIR%%/plugins/biz.ganttproject.impex.ical/lib/commons-lang-2.6.jar
+%%DATADIR%%/plugins/biz.ganttproject.impex.ical/lib/ical4j-1.0.3.jar
+%%DATADIR%%/plugins/biz.ganttproject.impex.ical/plugin.xml
 %%DATADIR%%/plugins/biz.ganttproject.impex.msproject2/ganttproject-msproject2.jar
 %%DATADIR%%/plugins/biz.ganttproject.impex.msproject2/lib/mpxj.jar
 %%DATADIR%%/plugins/biz.ganttproject.impex.msproject2/lib/mspdi_fix.xsl
-%%DATADIR%%/plugins/biz.ganttproject.impex.msproject2/lib/poi-3.7-20101029.jar
+%%DATADIR%%/plugins/biz.ganttproject.impex.msproject2/lib/poi-3.10-PATCHED.jar
 %%DATADIR%%/plugins/biz.ganttproject.impex.msproject2/plugin.xml
 %%DATADIR%%/plugins/net.sourceforge.ganttproject/data/resources/calendar/i18n_ch.calendar
 %%DATADIR%%/plugins/net.sourceforge.ganttproject/data/resources/calendar/i18n_cn.calendar
 %%DATADIR%%/plugins/net.sourceforge.ganttproject/data/resources/calendar/i18n_de.calendar
+%%DATADIR%%/plugins/net.sourceforge.ganttproject/data/resources/calendar/i18n_de_austria.calendar
 %%DATADIR%%/plugins/net.sourceforge.ganttproject/data/resources/calendar/i18n_en_australia.calendar
 %%DATADIR%%/plugins/net.sourceforge.ganttproject/data/resources/calendar/i18n_en_canada.calendar
 %%DATADIR%%/plugins/net.sourceforge.ganttproject/data/resources/calendar/i18n_en_england.calendar
 %%DATADIR%%/plugins/net.sourceforge.ganttproject/data/resources/calendar/i18n_es.calendar
 %%DATADIR%%/plugins/net.sourceforge.ganttproject/data/resources/calendar/i18n_es_AR.calendar
+%%DATADIR%%/plugins/net.sourceforge.ganttproject/data/resources/calendar/i18n_es_cl.calendar
 %%DATADIR%%/plugins/net.sourceforge.ganttproject/data/resources/calendar/i18n_es_colombia.calendar
 %%DATADIR%%/plugins/net.sourceforge.ganttproject/data/resources/calendar/i18n_fr.calendar
 %%DATADIR%%/plugins/net.sourceforge.ganttproject/data/resources/calendar/i18n_hr.calendar
@@ -37,8 +46,13 @@ bin/ganttproject
 %%DATADIR%%/plugins/net.sourceforge.ganttproject/data/resources/calendar/i18n_pl.calendar
 %%DATADIR%%/plugins/net.sourceforge.ganttproject/data/resources/calendar/i18n_pt_brazil.calendar
 %%DATADIR%%/plugins/net.sourceforge.ganttproject/data/resources/calendar/i18n_pt_portugal.calendar
+%%DATADIR%%/plugins/net.sourceforge.ganttproject/data/resources/calendar/i18n_ru.calendar
 %%DATADIR%%/plugins/net.sourceforge.ganttproject/data/resources/calendar/i18n_sk.calendar
+%%DATADIR%%/plugins/net.sourceforge.ganttproject/data/resources/calendar/i18n_sr.calendar
 %%DATADIR%%/plugins/net.sourceforge.ganttproject/data/resources/calendar/i18n_tg_non_working_days.calendar
+%%DATADIR%%/plugins/net.sourceforge.ganttproject/data/resources/calendar/i18n_uk_england.calendar
+%%DATADIR%%/plugins/net.sourceforge.ganttproject/data/resources/calendar/i18n_uk_northern_ireland.calendar
+%%DATADIR%%/plugins/net.sourceforge.ganttproject/data/resources/calendar/i18n_uk_scotland.calendar
 %%DATADIR%%/plugins/net.sourceforge.ganttproject/data/resources/calendar/i18n_us.calendar
 %%DATADIR%%/plugins/net.sourceforge.ganttproject/data/resources/charsets.properties
 %%DATADIR%%/plugins/net.sourceforge.ganttproject/data/resources/chart.properties
@@ -284,20 +298,19 @@ bin/ganttproject
 %%DATADIR%%/plugins/net.sourceforge.ganttproject/data/resources/language/i18n_fi.properties
 %%DATADIR%%/plugins/net.sourceforge.ganttproject/data/resources/language/i18n_fr.properties
 %%DATADIR%%/plugins/net.sourceforge.ganttproject/data/resources/language/i18n_gl.properties
-%%DATADIR%%/plugins/net.sourceforge.ganttproject/data/resources/language/i18n_hi.properties
 %%DATADIR%%/plugins/net.sourceforge.ganttproject/data/resources/language/i18n_hr.properties
 %%DATADIR%%/plugins/net.sourceforge.ganttproject/data/resources/language/i18n_hu.properties
-%%DATADIR%%/plugins/net.sourceforge.ganttproject/data/resources/language/i18n_id.properties
-%%DATADIR%%/plugins/net.sourceforge.ganttproject/data/resources/language/i18n_in.properties
 %%DATADIR%%/plugins/net.sourceforge.ganttproject/data/resources/language/i18n_it.properties
+%%DATADIR%%/plugins/net.sourceforge.ganttproject/data/resources/language/i18n_iw_IL.properties
 %%DATADIR%%/plugins/net.sourceforge.ganttproject/data/resources/language/i18n_ja_JP.properties
 %%DATADIR%%/plugins/net.sourceforge.ganttproject/data/resources/language/i18n_ko_KR.properties
 %%DATADIR%%/plugins/net.sourceforge.ganttproject/data/resources/language/i18n_lt.properties
+%%DATADIR%%/plugins/net.sourceforge.ganttproject/data/resources/language/i18n_lv.properties
 %%DATADIR%%/plugins/net.sourceforge.ganttproject/data/resources/language/i18n_nl.properties
 %%DATADIR%%/plugins/net.sourceforge.ganttproject/data/resources/language/i18n_no.properties
 %%DATADIR%%/plugins/net.sourceforge.ganttproject/data/resources/language/i18n_pl.properties
-%%DATADIR%%/plugins/net.sourceforge.ganttproject/data/resources/language/i18n_pt.properties
 %%DATADIR%%/plugins/net.sourceforge.ganttproject/data/resources/language/i18n_pt_BR.properties
+%%DATADIR%%/plugins/net.sourceforge.ganttproject/data/resources/language/i18n_pt_PT.properties
 %%DATADIR%%/plugins/net.sourceforge.ganttproject/data/resources/language/i18n_ro_RO.properties
 %%DATADIR%%/plugins/net.sourceforge.ganttproject/data/resources/language/i18n_ru.properties
 %%DATADIR%%/plugins/net.sourceforge.ganttproject/data/resources/language/i18n_sk.properties
@@ -309,7 +322,6 @@ bin/ganttproject
 %%DATADIR%%/plugins/net.sourceforge.ganttproject/data/resources/language/i18n_vi.properties
 %%DATADIR%%/plugins/net.sourceforge.ganttproject/data/resources/language/i18n_zh_CN.properties
 %%DATADIR%%/plugins/net.sourceforge.ganttproject/data/resources/language/i18n_zh_TW.properties
-%%DATADIR%%/plugins/net.sourceforge.ganttproject/data/resources/language/index.html
 %%DATADIR%%/plugins/net.sourceforge.ganttproject/data/resources/logging.properties
 %%DATADIR%%/plugins/net.sourceforge.ganttproject/data/resources/logos/bee-element-01.svg
 %%DATADIR%%/plugins/net.sourceforge.ganttproject/data/resources/logos/bee-element-02.svg
@@ -349,20 +361,22 @@ bin/ganttproject
 %%DATADIR%%/plugins/net.sourceforge.ganttproject/data/resources/xslt/gantt.xsl
 %%DATADIR%%/plugins/net.sourceforge.ganttproject/ganttproject.jar
 %%DATADIR%%/plugins/net.sourceforge.ganttproject/lib/core/AppleJavaExtensions.jar
-%%DATADIR%%/plugins/net.sourceforge.ganttproject/lib/core/balloontip-1.2.1.jar
+%%DATADIR%%/plugins/net.sourceforge.ganttproject/lib/core/balloontip-1.2.4.1.jar
 %%DATADIR%%/plugins/net.sourceforge.ganttproject/lib/core/commons-codec-1.4.jar
 %%DATADIR%%/plugins/net.sourceforge.ganttproject/lib/core/commons-csv.jar
 %%DATADIR%%/plugins/net.sourceforge.ganttproject/lib/core/commons-io.jar
 %%DATADIR%%/plugins/net.sourceforge.ganttproject/lib/core/commons-logging.jar
 %%DATADIR%%/plugins/net.sourceforge.ganttproject/lib/core/commons-net-ftpclient-3.0.1.jar
+%%DATADIR%%/plugins/net.sourceforge.ganttproject/lib/core/concurrentlinkedhashmap-lru-1.3.2.jar
 %%DATADIR%%/plugins/net.sourceforge.ganttproject/lib/core/endrick-cache-1.7.9.jar
+%%DATADIR%%/plugins/net.sourceforge.ganttproject/lib/core/endrick-common-1.7.9.jar
 %%DATADIR%%/plugins/net.sourceforge.ganttproject/lib/core/ganttproject-jxbusycomponent-1.2.2.jar
 %%DATADIR%%/plugins/net.sourceforge.ganttproject/lib/core/httpclient-4.2.1.jar
 %%DATADIR%%/plugins/net.sourceforge.ganttproject/lib/core/httpcore-4.2.1.jar
 %%DATADIR%%/plugins/net.sourceforge.ganttproject/lib/core/jcommander-1.17.jar
 %%DATADIR%%/plugins/net.sourceforge.ganttproject/lib/core/jdom-1.0.jar
-%%DATADIR%%/plugins/net.sourceforge.ganttproject/lib/core/jgoodies-common-1.1.1.jar
-%%DATADIR%%/plugins/net.sourceforge.ganttproject/lib/core/jgoodies-looks-2.4.0.jar
+%%DATADIR%%/plugins/net.sourceforge.ganttproject/lib/core/jgoodies-common-1.7.0.jar
+%%DATADIR%%/plugins/net.sourceforge.ganttproject/lib/core/jgoodies-looks-2.5.3.jar
 %%DATADIR%%/plugins/net.sourceforge.ganttproject/lib/core/jxlayer.jar
 %%DATADIR%%/plugins/net.sourceforge.ganttproject/lib/core/licenses/apple.LICENSE
 %%DATADIR%%/plugins/net.sourceforge.ganttproject/lib/core/licenses/commons-csv.LICENSE
@@ -370,21 +384,17 @@ bin/ganttproject
 %%DATADIR%%/plugins/net.sourceforge.ganttproject/lib/core/licenses/jakarta-slide-webdavlib.LICENSE
 %%DATADIR%%/plugins/net.sourceforge.ganttproject/lib/core/licenses/jdnc.LICENSE
 %%DATADIR%%/plugins/net.sourceforge.ganttproject/lib/core/licenses/jgoodies-looks.LICENSE
-%%DATADIR%%/plugins/net.sourceforge.ganttproject/lib/core/milton-api-2.0.1.jar
-%%DATADIR%%/plugins/net.sourceforge.ganttproject/lib/core/milton-client-2.0.1.jar
+%%DATADIR%%/plugins/net.sourceforge.ganttproject/lib/core/milton-api-2.6.2.4.jar
+%%DATADIR%%/plugins/net.sourceforge.ganttproject/lib/core/milton-client-2.6.2.4.jar
 %%DATADIR%%/plugins/net.sourceforge.ganttproject/lib/core/slf4j-api-1.5.11.jar
 %%DATADIR%%/plugins/net.sourceforge.ganttproject/lib/core/slf4j-simple-1.5.11.jar
-%%DATADIR%%/plugins/net.sourceforge.ganttproject/lib/core/swingx-1.6.3.jar
+%%DATADIR%%/plugins/net.sourceforge.ganttproject/lib/core/swingx-1.6.4.jar
 %%DATADIR%%/plugins/net.sourceforge.ganttproject/plugin.xml
 %%DATADIR%%/plugins/org.ganttproject.chart.pert/pert.jar
 %%DATADIR%%/plugins/org.ganttproject.chart.pert/plugin.xml
 %%DATADIR%%/plugins/org.ganttproject.chart.pert/resources/icons/pert_16.gif
 %%DATADIR%%/plugins/org.ganttproject.chart.pert/resources/icons/pert_24.gif
 %%DATADIR%%/plugins/org.ganttproject.impex.htmlpdf/ganttproject-htmlpdf.jar
-%%DATADIR%%/plugins/org.ganttproject.impex.htmlpdf/lib/fop-font-metrics.jar
-%%DATADIR%%/plugins/org.ganttproject.impex.htmlpdf/lib/fop.jar
-%%DATADIR%%/plugins/org.ganttproject.impex.htmlpdf/lib/ganttproject-avalon.jar
-%%DATADIR%%/plugins/org.ganttproject.impex.htmlpdf/lib/ganttproject-batik.jar
 %%DATADIR%%/plugins/org.ganttproject.impex.htmlpdf/lib/itextpdf-5.3.1.jar
 %%DATADIR%%/plugins/org.ganttproject.impex.htmlpdf/plugin.xml
 %%DATADIR%%/plugins/org.ganttproject.impex.htmlpdf/resource/fonts/LiberationSans-Regular.ttf
@@ -417,3 +427,8 @@ bin/ganttproject
 %%DATADIR%%/plugins/org.ganttproject.impex.htmlpdf/resource/pdf-export-themes/samara/samara-generic.xml
 %%DATADIR%%/plugins/org.ganttproject.impex.htmlpdf/resource/pdf-export-themes/samara/samara-landscape.xsl
 %%DATADIR%%/plugins/org.ganttproject.impex.htmlpdf/resource/pdf-export-themes/samara/samara-portrait.xsl
+share/icons/hicolor/16x16/apps/ganttproject.png
+share/icons/hicolor/24x24/apps/ganttproject.png
+share/icons/hicolor/32x32/apps/ganttproject.png
+share/icons/hicolor/48x48/apps/ganttproject.png
+share/icons/hicolor/64x64/apps/ganttproject.png

deskutils/treesheets/Makefile

@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	treesheets
-PORTVERSION=	0.0.20150711
+PORTVERSION=	0.0.20151008
 CATEGORIES=	deskutils
 
 MAINTAINER=	lightside@gmx.com
@@ -13,7 +13,7 @@ LICENSE_FILE=	${WRKSRC}/ZLIB_LICENSE.txt
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	aardappel
-GH_TAGNAME=	3a6be83
+GH_TAGNAME=	10fbc77
 
 BUILD_WRKSRC=	${WRKSRC}/src
 EXTRACT_AFTER_ARGS=	--exclude .gitignore

deskutils/treesheets/distinfo

@@ -1,2 +1,2 @@
-SHA256 (aardappel-treesheets-0.0.20150711-3a6be83_GH0.tar.gz) = 93929ac8d470e697e4ee33b6e79ca91f6e40502316ad199e86846824dd284a4e
-SIZE (aardappel-treesheets-0.0.20150711-3a6be83_GH0.tar.gz) = 1789118
+SHA256 (aardappel-treesheets-0.0.20151008-10fbc77_GH0.tar.gz) = 2397232f69f11361aa985013b11244699fbadfcf4a305d52fe11af990676f6b3
+SIZE (aardappel-treesheets-0.0.20151008-10fbc77_GH0.tar.gz) = 1792956

devel/autogen/Makefile

@@ -3,15 +3,18 @@
 
 PORTNAME=	autogen
 PORTVERSION=	5.18.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	GNU/${PORTNAME}/rel${PORTVERSION}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:DEFAULT,gnu
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	The Automated Program Generator
+COMMENT=	Tool designed to simplify the creation and maintenance of programs
+
+LICENSE=	GPLv2
 
 BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
+RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
 LIB_DEPENDS=	libguile-2.0.so:${PORTSDIR}/lang/guile2
 
 USES=		gmake libtool pathfix perl5 pkgconfig shebangfix tar:xz
@@ -19,7 +22,7 @@ USE_PERL5=	build
 USE_GNOME=	libxml2
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-libguile=yes --with-libxml2=yes \
-		--datadir=${PREFIX}/share
+		--datadir=${PREFIX}/share CONFIG_SHELL=${PREFIX}/bin/bash
 USE_LDCONFIG=	yes
 SHEBANG_FILES=	autoopts/tpl/*.pl
 INSTALL_TARGET=	install-strip

devel/gdb/Makefile

@@ -3,6 +3,7 @@
 
 PORTNAME=	gdb
 PORTVERSION=	7.10
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	GNU
 
@@ -34,7 +35,7 @@ ONLY_FOR_ARCHS=	i386 amd64 powerpc powerpc64	# untested elsewhere, might work
 
 OPTIONS_DEFINE=	DEBUG EXPAT GDB_LINK GUILE KGDB PYTHON THREADS TUI
 
-OPTIONS_DEFAULT=	GDB_LINK THREADS TUI PORT_READLINE
+OPTIONS_DEFAULT=	GDB_LINK KGDB THREADS TUI PORT_READLINE
 
 OPTIONS_SINGLE=	READLINE
 OPTIONS_SINGLE_READLINE=	BASE_READLINE BUNDLED_READLINE PORT_READLINE

devel/goffice010/Makefile

@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	goffice
-PORTVERSION=	0.10.23
+PORTVERSION=	0.10.24
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
 PKGNAMESUFFIX=	010

devel/goffice010/distinfo

@@ -1,2 +1,2 @@
-SHA256 (goffice-0.10.23.tar.xz) = 1325fc38f2476977bd8d71588ccb2a57aa418260406b7c28a20098b6b4e33f9f
-SIZE (goffice-0.10.23.tar.xz) = 2356604
+SHA256 (goffice-0.10.24.tar.xz) = cda70eab0b0b0e29c3bea09849bcfca0c2ccc20038ee69e7e14cde664484af5a
+SIZE (goffice-0.10.24.tar.xz) = 2358736

devel/goffice010/pkg-plist

@@ -196,7 +196,7 @@ lib/goffice/%%VERSION%%/plugins/smoothing/smoothing.so
 lib/goffice/%%VERSION%%/plugins/smoothing/types.xml
 lib/libgoffice-%%SHORT_VER%%.so
 lib/libgoffice-%%SHORT_VER%%.so.10
-lib/libgoffice-%%SHORT_VER%%.so.10.0.23
+lib/libgoffice-%%SHORT_VER%%.so.10.0.24
 libdata/pkgconfig/libgoffice-%%SHORT_VER%%.pc
 share/gir-1.0/GOffice-%%SHORT_VER%%.gir
 %%DATADIR%%/%%VERSION%%/mmlitex/README

devel/libunistring/Makefile

@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	libunistring
-PORTVERSION=	0.9.4
+PORTVERSION=	0.9.6
 CATEGORIES=	devel
 MASTER_SITES=	GNU
 
@@ -11,7 +11,7 @@ COMMENT=	Unicode string library
 LICENSE=	GPLv3 LGPL3
 LICENSE_COMB=	dual
 
-USES=		alias charsetfix gmake iconv libtool
+USES=		alias charsetfix gmake iconv libtool tar:xz
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip

devel/libunistring/distinfo

@@ -1,2 +1,2 @@
-SHA256 (libunistring-0.9.4.tar.gz) = f5246d63286a42902dc096d6d44541fbe4204b6c02d6d5d28b457c9882ddd8a6
-SIZE (libunistring-0.9.4.tar.gz) = 2966483
+SHA256 (libunistring-0.9.6.tar.xz) = 2df42eae46743e3f91201bf5c100041540a7704e8b9abfd57c972b2d544de41b
+SIZE (libunistring-0.9.6.tar.xz) = 1960488

devel/libuutil/Makefile

@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	libuutil
-PORTVERSION=	1.0.1
+PORTVERSION=	1.0.3
 CATEGORIES=	devel
 
 MAINTAINER=	marino@FreeBSD.org
@@ -13,8 +13,6 @@ LICENSE=	CDDL
 GH_ACCOUNT=	jrmarino
 USE_GITHUB=	yes
 
-BROKEN=		produces broken library (undefined reference to `avl_*')
-
 USES=		uidfix
 MAKE_ARGS=	LIBDIR=${PREFIX}/lib
 USE_LDCONFIG=	yes

devel/libuutil/distinfo

@@ -1,2 +1,2 @@
-SHA256 (jrmarino-libuutil-1.0.1_GH0.tar.gz) = 396daa5f4be1266c1262b405021f0aebf9ecbbd8bfa1252a7845591509a47a37
-SIZE (jrmarino-libuutil-1.0.1_GH0.tar.gz) = 20643
+SHA256 (jrmarino-libuutil-1.0.3_GH0.tar.gz) = 8694b537bb6481fea7855c626923e5d114397e81d7a8cf723cec47d4f5b06129
+SIZE (jrmarino-libuutil-1.0.3_GH0.tar.gz) = 27701

devel/p5-Exception-Class-TryCatch/Makefile

@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	Exception-Class-TryCatch
-PORTVERSION=	1.12
-PORTREVISION=	1
+PORTVERSION=	1.13
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -11,11 +10,12 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	culot@FreeBSD.org
 COMMENT=	Syntactic try/catch sugar for use with Exception::Class
 
-BUILD_DEPENDS+=	p5-Exception-Class>=0:${PORTSDIR}/devel/p5-Exception-Class \
-		p5-Test-Simple>=0:${PORTSDIR}/devel/p5-Test-Simple
-RUN_DEPENDS+=	p5-Exception-Class>=0:${PORTSDIR}/devel/p5-Exception-Class \
-		p5-Test-Simple>=0:${PORTSDIR}/devel/p5-Test-Simple
+LICENSE=	APACHE20
 
+BUILD_DEPENDS+=	p5-Exception-Class>=0:${PORTSDIR}/devel/p5-Exception-Class
+RUN_DEPENDS+=	p5-Exception-Class>=0:${PORTSDIR}/devel/p5-Exception-Class
+
+NO_ARCH=	yes
 USES=		perl5
 USE_PERL5=	configure
 

devel/p5-Exception-Class-TryCatch/distinfo

@@ -1,2 +1,2 @@
-SHA256 (Exception-Class-TryCatch-1.12.tar.gz) = 4161c9bcd11ac60f053db94a0fcb74844372bdea1701477f4bd31c132eb4235c
-SIZE (Exception-Class-TryCatch-1.12.tar.gz) = 17811
+SHA256 (Exception-Class-TryCatch-1.13.tar.gz) = 5e05770a09a52c7d3d9139e10a93757133f099b863d0823c8e4a021df7ffa502
+SIZE (Exception-Class-TryCatch-1.13.tar.gz) = 20629

devel/p5-Exception-Class-TryCatch/pkg-plist

@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Exception/Class/TryCatch.pm
-%%SITE_PERL%%/Exception/Class/TryCatch.pod
 %%PERL5_MAN3%%/Exception::Class::TryCatch.3.gz

devel/p5-Geo-ShapeFile/Makefile

@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	Geo-ShapeFile
-PORTVERSION=	2.52
-PORTREVISION=	1
+PORTVERSION=	2.60
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -11,6 +10,14 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	culot@FreeBSD.org
 COMMENT=	Perl extension for handling ESRI GIS Shapefiles
 
+LICENSE=	ART10 GPLv1
+LICENSE_COMB=	dual
+
+BUILD_DEPENDS=	p5-Tree-R>0:${PORTSDIR}/devel/p5-Tree-R \
+		p5-autovivification>0:${PORTSDIR}/devel/p5-autovivification
+RUN_DEPENDS:=	${BUILD_DEPENDS}
+
+NO_ARCH=	yes
 USES=		perl5
 USE_PERL5=	configure
 

devel/p5-Geo-ShapeFile/distinfo

@@ -1,2 +1,2 @@
-SHA256 (Geo-ShapeFile-2.52.tar.gz) = 6ccc2bd992d8474f473b3b33064baabd906d5a45afc75db035ab0136058a1edb
-SIZE (Geo-ShapeFile-2.52.tar.gz) = 278581
+SHA256 (Geo-ShapeFile-2.60.tar.gz) = 90ad66df2a408d4ee91ba3e7b382fe40056a086c1abf51cd48ce2cde2c9047bc
+SIZE (Geo-ShapeFile-2.60.tar.gz) = 331941

devel/p5-Geo-ShapeFile/files/patch-t_main__tests.t

@@ -0,0 +1,14 @@
+--- t/main_tests.t.orig	2015-10-16 16:34:06.906634577 +0200
++++ t/main_tests.t	2015-10-16 16:34:56.598631573 +0200
+@@ -3,7 +3,10 @@
+ use Test::More;
+ use strict;
+ use warnings;
+-use rlib '../lib', './lib';
++#use rlib '../lib', './lib';
++use FindBin;
++use lib "$FindBin::Bin/lib";
++use lib "$FindBin::Bin/../lib";
+ 
+ use Geo::ShapeFile;
+ use Geo::ShapeFile::Shape;

devel/p5-Geo-ShapeFile/pkg-plist

@@ -1,6 +1,8 @@
 %%SITE_PERL%%/Geo/ShapeFile.pm
 %%SITE_PERL%%/Geo/ShapeFile/Point.pm
 %%SITE_PERL%%/Geo/ShapeFile/Shape.pm
+%%SITE_PERL%%/Geo/ShapeFile/Shape/Index.pm
 %%PERL5_MAN3%%/Geo::ShapeFile.3.gz
 %%PERL5_MAN3%%/Geo::ShapeFile::Point.3.gz
 %%PERL5_MAN3%%/Geo::ShapeFile::Shape.3.gz
+%%PERL5_MAN3%%/Geo::ShapeFile::Shape::Index.3.gz

devel/p5-Minion/Makefile

@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	Minion
-PORTVERSION=	2.04
+PORTVERSION=	2.05
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:SRI

devel/p5-Minion/distinfo

@@ -1,2 +1,2 @@
-SHA256 (Minion-2.04.tar.gz) = 7b1a6a85cf933a30a718d9ab4d89d209388303a5347e76a8994dac5efa523b3b
-SIZE (Minion-2.04.tar.gz) = 27097
+SHA256 (Minion-2.05.tar.gz) = 955baf59d2012b3abdf105512d27f9c1624735b297b8539bcf7f07267b058007
+SIZE (Minion-2.05.tar.gz) = 27152

devel/p5-Test-Moose-More/Makefile

@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	Test-Moose-More
-PORTVERSION=	0.025
+PORTVERSION=	0.035
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -13,12 +13,13 @@ LICENSE=	LGPL21
 
 BUILD_DEPENDS=	p5-Data-OptList>=0:${PORTSDIR}/devel/p5-Data-OptList \
 		p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-Moose-Autobox>=0:${PORTSDIR}/devel/p5-Moose-Autobox \
 		p5-Syntax-Keyword-Junction>=0:${PORTSDIR}/devel/p5-Syntax-Keyword-Junction \
-		p5-Sub-Exporter>=0:${PORTSDIR}/devel/p5-Sub-Exporter \
+		p5-Sub-Exporter-Progressive>=0:${PORTSDIR}/devel/p5-Sub-Exporter-Progressive \
 		p5-TAP-SimpleOutput>=0:${PORTSDIR}/devel/p5-TAP-SimpleOutput \
 		p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
+TEST_DEPENDS=	p5-aliased>=0:${PORTSDIR}/devel/p5-aliased \
+		p5-Perl-Version>=0:${PORTSDIR}/devel/p5-Perl-Version
 
 USES=		perl5
 USE_PERL5=	configure

devel/p5-Test-Moose-More/distinfo

@@ -1,2 +1,2 @@
-SHA256 (Test-Moose-More-0.025.tar.gz) = 215a5e8e811aa4dace5c92f98c16e05d28acc5bd3f434777a4e78cb66adc037e
-SIZE (Test-Moose-More-0.025.tar.gz) = 35717
+SHA256 (Test-Moose-More-0.035.tar.gz) = 848ac884198371729708a4f857fbfc0f6f0ba6ec65d856080497ed4aec80274d
+SIZE (Test-Moose-More-0.035.tar.gz) = 43862

devel/rubygem-aws-sdk-core/Makefile

@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	aws-sdk-core
-PORTVERSION=	2.1.29
+PORTVERSION=	2.1.30
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 

devel/rubygem-aws-sdk-core/distinfo

@@ -1,2 +1,2 @@
-SHA256 (rubygem/aws-sdk-core-2.1.29.gem) = 6cded72633b4ec29a3cf9927eb59a1c73ba68acb3217b2e93400edbbf795e79f
-SIZE (rubygem/aws-sdk-core-2.1.29.gem) = 474624
+SHA256 (rubygem/aws-sdk-core-2.1.30.gem) = 88028bdab7ee7c77208b6716b3289e5d26dc7ce3bea480c16997533017de010a
+SIZE (rubygem/aws-sdk-core-2.1.30.gem) = 475136

devel/rubygem-aws-sdk-resources/Makefile

@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	aws-sdk-resources
-PORTVERSION=	2.1.29
+PORTVERSION=	2.1.30
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 

devel/rubygem-aws-sdk-resources/distinfo

@@ -1,2 +1,2 @@
-SHA256 (rubygem/aws-sdk-resources-2.1.29.gem) = ab7dd58d4ff3bc5c136d8d13ff4ec0dfeb22a218353bdd1a7145b1ca9a1f6c5f
-SIZE (rubygem/aws-sdk-resources-2.1.29.gem) = 44032
+SHA256 (rubygem/aws-sdk-resources-2.1.30.gem) = 78a46022373e0aca59658457321ce085b4aca057e529a77611d74386babd5bda
+SIZE (rubygem/aws-sdk-resources-2.1.30.gem) = 44032

devel/rubygem-slack-notifier/Makefile

@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	slack-notifier
-PORTVERSION=	1.3.1
+PORTVERSION=	1.4.0
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
@@ -12,7 +12,6 @@ COMMENT=	Ruby wrapper for posting to slack webhooks
 LICENSE=	MIT
 
 NO_ARCH=	yes
-
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
 RUBYGEM_AUTOPLIST=	yes

devel/rubygem-slack-notifier/distinfo

@@ -1,2 +1,2 @@
-SHA256 (rubygem/slack-notifier-1.3.1.gem) = 24eb6454a9f2d2865685b8fbea30f2b7508115dd53eeebaae20660c58cf11f58
-SIZE (rubygem/slack-notifier-1.3.1.gem) = 7680
+SHA256 (rubygem/slack-notifier-1.4.0.gem) = 13b1488191f2cc67fe529420b38d6e800656e16e8411dc5a0e2f3fbc2b302b44
+SIZE (rubygem/slack-notifier-1.4.0.gem) = 7680

dns/maradns/Makefile

@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	maradns
-PORTVERSION=	2.0.12
+PORTVERSION=	2.0.13
 CATEGORIES=	dns
 MASTER_SITES=	http://maradns.samiam.org/download/2.0/${PORTVERSION}/\
 		SF/${PORTNAME}/MaraDNS/${PORTVERSION}/
@@ -13,7 +13,7 @@ COMMENT=	DNS server with focus on security and simplicity
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-DEADWOOD_VER=	3.2.08
+DEADWOOD_VER=	3.2.09
 
 REINPLACE_ARGS=	-i ""
 MAKE_ENV=	FLAGS="${CFLAGS}"
@@ -21,57 +21,57 @@ CONFIGURE_ENV=	LANG=
 
 HAS_CONFIGURE=	yes
 USE_RC_SUBR=	${PORTNAME} zoneserver Deadwood
-USES=		tar:bz2
+USES=		tar:bz2 shebangfix
 USERS=		bind
 GROUPS=		bind
 INSTALL_TARGET=	install PREFIX=${STAGEDIR}${PREFIX}
+SHEBANG_FILES=	${WRKSRC}/tools/bind2csv2.py
 
-OPTIONS_DEFINE=	IPV6 DOCS EXAMPLES
+OPTIONS_DEFINE=	IPV6 DOCS EXAMPLES CONV
+OPTIONS_SUB=	yes
+CONV_DESC=	Install bind2csv2 tool (needs python)
 
 IPV6_CONFIGURE_ON=	--ipv6
+CONV_USES=	python:run
 
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|cc|${CC}|' ${WRKSRC}/build/Makefile.freebsd
+	@${REINPLACE_CMD} -e 's|\<cc\>|${CC}|' ${WRKSRC}/build/Makefile.freebsd
 	@${FIND} ${WRKSRC} -type f ! -name "*.orig" | ${XARGS} ${REINPLACE_CMD} -e \
-		's|/etc/maradns|${ETCDIR}|g; s|/etc/mararc|${ETCDIR}|g' -e\
-		's|/etc/deadwood|${ETCDIR}|g' -e\
-		's| = 99| = 53|g'
+		's|/etc/maradns|${ETCDIR}|g; s|/etc/mararc|${ETCDIR}|g; \
+		 s|/etc/deadwood|${ETCDIR}|g; s| = 99| = 53|g'
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/deadwood-${DEADWOOD_VER}/src/Deadwood ${STAGEDIR}${PREFIX}/sbin
 	${INSTALL_PROGRAM} ${WRKSRC}/server/maradns ${STAGEDIR}${PREFIX}/sbin
-	${INSTALL_PROGRAM} ${WRKSRC}/tcp/getzone ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/tcp/fetchzone ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/tcp/getzone ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/tcp/zoneserver ${STAGEDIR}${PREFIX}/sbin
 	${INSTALL_PROGRAM} ${WRKSRC}/tools/askmara ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/tools/duende ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/tools/misc/mqhash ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/tools/bind2csv2.py ${STAGEDIR}${PREFIX}/bin/bind2csv2
 
-	${INSTALL_MAN} ${WRKSRC}/doc/en/man/askmara.1 ${STAGEDIR}${MANPREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/doc/en/man/getzone.1 ${STAGEDIR}${MANPREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/doc/en/man/fetchzone.1 ${STAGEDIR}${MANPREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/doc/en/man/maradns.8 ${STAGEDIR}${MANPREFIX}/man/man8
-	${INSTALL_MAN} ${WRKSRC}/doc/en/man/zoneserver.8 ${STAGEDIR}${MANPREFIX}/man/man8
-	${INSTALL_MAN} ${WRKSRC}/doc/en/man/duende.8 ${STAGEDIR}${MANPREFIX}/man/man8
-	${INSTALL_MAN} ${WRKSRC}/doc/en/man/mararc.5 ${STAGEDIR}${MANPREFIX}/man/man5
-	${INSTALL_MAN} ${WRKSRC}/doc/en/man/csv1.5 ${STAGEDIR}${MANPREFIX}/man/man5
-	${INSTALL_MAN} ${WRKSRC}/doc/en/man/csv2.5 ${STAGEDIR}${MANPREFIX}/man/man5
-	${INSTALL_MAN} ${WRKSRC}/doc/en/man/csv2_txt.5 ${STAGEDIR}${MANPREFIX}/man/man5
-	${INSTALL_MAN} ${WRKSRC}/doc/en/man/Deadwood.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/doc/en/man/*.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/doc/en/man/*.8 ${STAGEDIR}${MANPREFIX}/man/man8
+	${INSTALL_MAN} ${WRKSRC}/doc/en/man/*.5 ${STAGEDIR}${MANPREFIX}/man/man5
 
 	@${MKDIR} ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/en/examples/example_full_mararc ${STAGEDIR}${ETCDIR}/mararc.sample
 	${INSTALL_DATA} ${WRKSRC}/doc/en/examples/example_csv2 ${STAGEDIR}${ETCDIR}/csv2.sample
 	${INSTALL_DATA} ${WRKSRC}/deadwood-${DEADWOOD_VER}/doc/dwood3rc ${STAGEDIR}${ETCDIR}/dwood3rc.sample
 
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/doc/en && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
 	@${RM} -rf ${STAGEDIR}${DOCSDIR}/man \
 		${STAGEDIR}${DOCSDIR}/source \
 		${STAGEDIR}${DOCSDIR}/pdf
 	@${FIND} ${STAGEDIR}${DOCSDIR} -name Makefile -delete
+
+post-install-EXAMPLES-on:
 	${MV} ${STAGEDIR}${DOCSDIR}/examples ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>

dns/maradns/distinfo

@@ -1,2 +1,2 @@
-SHA256 (maradns-2.0.12.tar.bz2) = a7683749d312f469e7f42d0f9b74588eb207bfa69391a9f2364b67af83d32ebc
-SIZE (maradns-2.0.12.tar.bz2) = 1159457
+SHA256 (maradns-2.0.13.tar.bz2) = 661ea06fb18df6d2469b2bf824ffd93545a091af185362cbc738d1aa408210c3
+SIZE (maradns-2.0.13.tar.bz2) = 1148494

dns/maradns/files/patch-MaraDns.h

@@ -1,6 +1,6 @@
---- ./MaraDns.h.orig	2014-02-12 08:17:18.000000000 +0000
-+++ ./MaraDns.h	2014-02-20 15:23:22.000000000 +0000
-@@ -77,21 +77,21 @@
+--- MaraDns.h.orig	2015-09-26 05:35:18 UTC
++++ MaraDns.h
+@@ -71,21 +71,21 @@
       line to point to Bash
   */
  

dns/maradns/files/patch-build_Makefile.freebsd

@@ -0,0 +1,12 @@
+--- build/Makefile.freebsd.orig	2012-02-12 06:04:11 UTC
++++ build/Makefile.freebsd
+@@ -47,7 +47,8 @@ all: 
+ 	cd ../qual ; make $(M) ; cd ../server ; \
+ 	make $(M) $(Q) COMPILED=\"$(COMPILED)\" $(V) ; \
+ 	cd ../tools ; make $(M) ; \
+-	cd ../deadwood-*/src/ ; make FLAGS="-O2"; \
++	cd misc ; make $(M) ; \
++	cd ../../deadwood-*/src/ ; make FLAGS="-O2"; \
+ 	cd ../../tcp ; make $(M) $(V) ; cat ../00README.FIRST
+ 
+ debug: 

dns/maradns/pkg-plist

@@ -1,14 +1,18 @@
 bin/askmara
+%%CONV%%bin/bind2csv2
 bin/duende
 bin/fetchzone
 bin/getzone
+bin/mqhash
 @sample %%ETCDIR%%/csv2.sample
 @sample %%ETCDIR%%/dwood3rc.sample
 @sample %%ETCDIR%%/mararc.sample
 man/man1/Deadwood.1.gz
 man/man1/askmara.1.gz
+man/man1/bind2csv2.1.gz
 man/man1/fetchzone.1.gz
 man/man1/getzone.1.gz
+man/man1/mqhash.1.gz
 man/man5/csv1.5.gz
 man/man5/csv2.5.gz
 man/man5/csv2_txt.5.gz

editors/aee/Makefile

@@ -2,12 +2,12 @@
 # $FreeBSD$
 
 PORTNAME=	aee
-PORTVERSION=	2.2.15b
+PORTVERSION=	2.2.21
 PORTREVISION=	2
 CATEGORIES=	editors
 MASTER_SITES=	http://www.users.uswest.net/~hmahon/sources/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	portmaster@BSDforge.com
 COMMENT=	Easy editor with both curses and X11 interfaces
 
 LICENSE=	ART10

editors/aee/distinfo

@@ -1,2 +1,2 @@
-SHA256 (aee-2.2.15b.tar.gz) = 7abbaffe35018f9de87c8685f9bee2ea3f261e88ce60674f1a5a9a3a0f54d752
-SIZE (aee-2.2.15b.tar.gz) = 184218
+SHA256 (aee-2.2.21.tar.gz) = b8a9a20679736ec44e74faae1550b33411cc675f7c587d2316e578f97b0d3727
+SIZE (aee-2.2.21.tar.gz) = 186304

editors/fxite/Makefile

@@ -2,8 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	fxite
-PORTVERSION=	0.92
-PORTREVISION=	3
+DISTVERSIONPREFIX=	FXITE-
+DISTVERSION=	0_92
+PORTREVISION=	4
 CATEGORIES=	editors
 
 MAINTAINER=	ports@FreeBSD.org
@@ -12,45 +13,35 @@ COMMENT=	Advanced cross-platform text editor
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	#
-
-OPTIONS_SINGLE=		#FOX
-OPTIONS_SINGLE_FOX=	FOX16 FOX17
-FOX16_DESC=		Use FOX 1.6
-FOX17_DESC=		Use FOX 1.7
-OPTIONS_DEFAULT=	FOX16
-
 USE_GITHUB=	yes
 GH_ACCOUNT=	yetanothergeek
-GH_TAGNAME=	FXITE-0_91
 
-USES=		autoreconf gmake pkgconfig lua:51 desktop-file-utils
+USES=		autoreconf desktop-file-utils gettext gmake lua pkgconfig
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--with-system-lua \
+		--with-lua-pkg=lua-${LUA_VER}
+
 CXXFLAGS+=	-fPIC
 LDFLAGS+=	-L${LOCALBASE}/lib -lintl
-CONFIGURE_ARGS+=--with-system-lua \
-		--with-lua-pkg=lua-${LUA_VER}
-CONFIGURE_ENV+=	FOX_CFLAGS="${FOX_CFLAGS}" \
-		FOX_LIBS="${FOX_LIBS}"
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MFOX16}
-LIB_DEPENDS+=	libFOX-1.6.so:${PORTSDIR}/x11-toolkits/fox16
-CONFIGURE_ENV+=	RESWRAP=${LOCALBASE}/bin/reswrap
-FOX_CFLAGS+=	`fox-config --cflags`
-FOX_LIBS+=	`fox-config --libs`
-.endif
-
-.if ${PORT_OPTIONS:MFOX17}
-LIB_DEPENDS+=	libFOX-1.7.so:${PORTSDIR}/x11-toolkits/fox17
-CONFIGURE_ENV+=	RESWRAP=${LOCALBASE}/bin/fox-1.7/reswrap
-FOX_CFLAGS+=	`pkgconf fox17 --cflags`
-FOX_LIBS+=	`pkgconf fox17 --libs`
-.endif
 
 PLIST_FILES=	bin/fxite \
-		share/pixmaps/fxite.xpm \
-		share/applications/fxite.desktop
+		share/applications/fxite.desktop \
+		share/pixmaps/fxite.xpm
+
+OPTIONS_SINGLE=		TOOLKIT
+OPTIONS_SINGLE_TOOLKIT=	FOX16 FOX17
+OPTIONS_DEFAULT=	FOX16
+
+FOX16_DESC=		Fox 1.6 GUI toolkit support
+FOX16_LIB_DEPENDS=	libFOX-1.6.so:${PORTSDIR}/x11-toolkits/fox16
+FOX16_CONFIGURE_ENV=	FOX_CFLAGS="$$(fox-config --cflags)" \
+			FOX_LIBS="$$(fox-config --libs)" \
+			RESWRAP="${LOCALBASE}/bin/reswrap"
+FOX17_DESC=		Fox 1.7 GUI toolkit support
+FOX17_LIB_DEPENDS=	libFOX-1.7.so:${PORTSDIR}/x11-toolkits/fox17
+FOX17_CONFIGURE_ENV=	FOX_CFLAGS="$$(pkgconf fox17 --cflags)" \
+			FOX_LIBS="$$(pkgconf fox17 --libs) -lX11" \
+			RESWRAP="${LOCALBASE}/bin/fox-1.7/reswrap"
+TOOLKIT_DESC=		GUI toolkit
 
 .include <bsd.port.mk>

editors/fxite/distinfo

@@ -1,2 +1,2 @@
-SHA256 (yetanothergeek-fxite-0.92-FXITE-0_91_GH0.tar.gz) = 1d5e876eb398ae1f370fb22cc29299f8dd539dc459ecb8a35f8dbba3f2ca194c
-SIZE (yetanothergeek-fxite-0.92-FXITE-0_91_GH0.tar.gz) = 1012313
+SHA256 (yetanothergeek-fxite-FXITE-0_92_GH0.tar.gz) = 4a8e1ceebed01fb10ec7c0d2851a806e8e5e2cbd9c9dcc0d6a67fbcda3c1bca2
+SIZE (yetanothergeek-fxite-FXITE-0_92_GH0.tar.gz) = 1044415

editors/fxite/files/patch-fxscintilla__ScintillaFOX.cxx

@@ -0,0 +1,29 @@
+--- fxscintilla/ScintillaFOX.cxx.orig	2013-10-03 09:22:51 UTC
++++ fxscintilla/ScintillaFOX.cxx
+@@ -171,7 +171,7 @@ private:
+   // From ScintillaBase
+   virtual bool ModifyScrollBars(int nMax, int nPage);
+   virtual void ReconfigureScrollBars();
+-  virtual PRectangle GetClientRectangle();
++  virtual PRectangle GetClientRectangle() const;
+   virtual int KeyDefault(int key, int modifiers);
+ 
+   // Popup flag
+@@ -662,7 +662,7 @@ sptr_t ScintillaFOX::DirectFunction(
+   return sciThis->WndProc(iMessage, wParam, lParam);
+ }
+ 
+-PRectangle ScintillaFOX::GetClientRectangle() {
++PRectangle ScintillaFOX::GetClientRectangle() const {
+   // Have to call FXScrollArea::getViewportXxxx instead of getViewportXxxx
+   // to prevent infinite loop
+ #ifdef FOX_1_6
+@@ -1256,7 +1256,7 @@ long FXScintilla::onDNDMotion(FXObject* 
+   FXDragAction action;
+   FXint pos;
+   // Scroll into view
+-  if(startAutoScroll(ev, TRUE)) return 1;
++  if(startAutoScroll(ev, true)) return 1;
+ 
+   // Handled elsewhere
+   if(FXScrollArea::onDNDMotion(sender,sel,ptr)) return 1;

editors/fxite/files/patch-fxsleep

@@ -1,15 +0,0 @@
---- src/luafuncs.cpp.orig	2013-09-18 14:19:18.000000000 +0200
-+++ src/luafuncs.cpp	2013-09-18 14:19:36.000000000 +0200
-@@ -942,10 +942,10 @@
-   ms=ms%1000;
-   for (int i=0; i<secs; i++) { // Just sleep for one second at a time, to give user a chance to cancel
-     if (!breathe(L)) { return 0; }
--    fxsleep(1000000);
-+    FXThread::sleep(1000000);
-   }
-   if (!breathe(L)) { return 0; }
--  fxsleep(ms*1000);
-+  FXThread::sleep(ms*1000);
-   return 0;
- }
- 

editors/fxite/files/patch-jef__compat.h

@@ -0,0 +1,89 @@
+--- jef/compat.h.orig	2013-10-03 09:22:51 UTC
++++ jef/compat.h
+@@ -1,3 +1,25 @@
++/*
++  FXiTe - The Free eXtensIble Text Editor
++  Copyright (c) 2009-2014 Jeffrey Pohlmeyer <yetanothergeek@gmail.com>
++
++  This program is free software; you can redistribute it and/or modify it
++  under the terms of the GNU General Public License version 3 as
++  published by the Free Software Foundation.
++
++  This software is distributed in the hope that it will be useful,
++  but WITHOUT ANY WARRANTY; without even the implied warranty of
++  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++  GNU General Public License for more details.
++
++  You should have received a copy of the GNU General Public License
++  along with this program; if not, write to the Free Software
++  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
++*/
++
++#if (FOX_MAJOR==1) && (FOX_MINOR==6) && !defined(FOX_1_6)
++# define FOX_1_6
++#endif
++
+ #ifdef FOX_1_6
+ # define ONE_SECOND ((FXuint)1000)
+ # define PathMatch(pattern,file,flags) FXPath::match(pattern,file,flags)
+@@ -20,8 +42,16 @@ FXbool LocaleIsUTF8();
+ # define FILEMATCH_NOESCAPE FXPath::NoEscape
+ # define FILEMATCH_FILE_NAME FXPath::PathName
+ # define FILEMATCH_CASEFOLD FXPath::CaseFold
+-# define REX_FORWARD    FXRex::Forward
+-# define REX_BACKWARD   FXRex::Backward
++# if (FOX_MAJOR>1) || (FOX_MINOR>7) || (FOX_LEVEL>49)
++#  define FOX_1_7_50_OR_NEWER
++# endif
++# ifdef FOX_1_7_50_OR_NEWER
++#  define REX_FORWARD    0
++#  define REX_BACKWARD   0
++# else
++#  define REX_FORWARD    FXRex::Forward
++#  define REX_BACKWARD   FXRex::Backward
++# endif
+ # define REX_CAPTURE    FXRex::Capture
+ # define REX_NEWLINE    FXRex::Newline
+ # define REX_NORMAL     FXRex::Normal
+@@ -35,6 +65,9 @@ FXbool LocaleIsUTF8();
+ # if (FOX_MAJOR>1)||(FOX_MINOR>7)||(FOX_LEVEL>26)
+ #  define fxgetpid() (FXProcess::current())
+ # endif
++# if (FOX_MAJOR>1) || (FOX_MINOR>7) || (FOX_LEVEL>44)
++#  define FOX_1_7_45_OR_NEWER
++# endif
+ #endif
+ 
+ 
+@@ -69,8 +102,31 @@ bool IsDesktopCurrent(FXMainWindow*tw);
+ # endif
+ #endif
+ 
++#ifdef FOX_1_7_45_OR_NEWER
++# define Dictionary FXDictionary
++# define DictKeyName(d,n)     ((d).key(n).text())
++# define TotalSlotsInDict(d)  ((d)->no())
++# define UsedSlotsInDict(d)   ((d)->used())
++# define ReplaceInDict(d,k,v) ((d)->at(k)=(v))
++# define LookupInDict(d,k)    ((d)->at(k))
++#else
++# define Dictionary FXDict
++# define DictKeyName(d,n)     ((d).key(n))
++# define TotalSlotsInDict(d)  ((d)->size())
++# define UsedSlotsInDict(d)   ((d)->no())
++# define ReplaceInDict(d,k,v) ((d)->replace((k),(v)))
++# define LookupInDict(d,k)    ((d)->find(k))
++#endif
+ 
+ FXID GetNetActiveWindow();
+ 
+ void WaitForWindowFocus(FXTopWindow*w, FXuint msecs=1000);
+ 
++// #define SetPadLRTB(o,l,r,t,b) \
++//   (o)->setPadLeft(l); \
++//   (o)->setPadRight(r); \
++//   (o)->setPadTop(t); \
++//   (o)->setPadBottom(b);
++// 
++// #define SetPad(o,p) SetPadLRTB(o,p,p,p,p)
++

editors/fxite/files/patch-jef__interproc.cpp

@@ -0,0 +1,30 @@
+--- jef/interproc.cpp.orig	2013-10-03 09:22:51 UTC
++++ jef/interproc.cpp
+@@ -323,6 +323,18 @@ static int SocketFailure(const char*func
+ }
+ 
+ 
++#if (FOX_MINOR>6)
++# if (FOX_MAJOR>1) || (FOX_MINOR>7) || (FOX_LEVEL>49)
++# define FOX_1_7_50_OR_NEWER
++# endif
++#endif
++
++#ifdef FOX_1_7_50_OR_NEWER
++# define LookupInHash(d,k) ((d)->at(k))
++#else
++# define LookupInHash(d,k) ((d)->find(k))
++#endif
++
+ 
+ long InterProc::onSocketRead(FXObject*o,FXSelector sel,void*p)
+ {
+@@ -344,7 +356,7 @@ long InterProc::onSocketRead(FXObject*o,
+       ssize_t len=0;
+       char buf[bufsize];
+       int read_fd=(FXival)p;
+-      FXString*s=(FXString*)connlist->find(p);
++      FXString*s=(FXString*)LookupInHash(connlist,p);
+       do {
+         len=read(read_fd,buf,bufsize);
+         if (len>0) { s->append(buf, len); }

editors/fxite/files/patch-jef__shady_tabs.h

@@ -0,0 +1,11 @@
+--- jef/shady_tabs.h.orig	2013-10-03 09:22:51 UTC
++++ jef/shady_tabs.h
+@@ -28,7 +28,7 @@ protected:
+   void UpdateTabs();
+ public:
+   long onCmdOpenItem  ( FXObject* sender, FXSelector sel, void* p );
+-  void setCurrent(FXint i, FXbool notify=FALSE);
++  void setCurrent(FXint i, FXbool notify=false);
+   ShadyTabs(FXComposite* p,FXObject* tgt=NULL, FXSelector sel=0, FXuint opts=TABBOOK_NORMAL,
+               FXint x=0, FXint y=0, FXint w=0, FXint h=0, FXint pl=DEFAULT_SPACING,
+               FXint pr=DEFAULT_SPACING, FXint pt=DEFAULT_SPACING, FXint pb=DEFAULT_SPACING);

editors/fxite/files/patch-jef_compat.cpp

@@ -1,11 +0,0 @@
---- jef/compat.cpp.orig	2013-04-02 11:39:14.000000000 +0200
-+++ jef/compat.cpp	2013-04-02 11:39:34.000000000 +0200
-@@ -292,7 +292,7 @@
- 
- 
- 
--static bool ClientMsg(FXTopWindow*w, const char *msg, ulong d0=0, ulong d1=0, ulong d2=0, ulong d3=0, ulong d4=0) {
-+static bool ClientMsg(FXTopWindow*w, const char *msg, FXulong d0=0, FXulong d1=0, FXulong d2=0, FXulong d3=0, FXulong d4=0) {
-   Display*dpy=(Display*)w->getApp()->getDisplay();
-   Window root=w->getApp()->getRootWindow()->id();
-   XEvent event;

editors/fxite/files/patch-src__appmain.h

@@ -0,0 +1,11 @@
+--- src/appmain.h.orig	2013-10-03 09:22:51 UTC
++++ src/appmain.h
+@@ -49,7 +49,7 @@ public:
+   long onIpcExec(FXObject*o,FXSelector sel,void*p);
+   AppClass(const FXString& name, const FXString& title);
+   void exit(FXint code);
+-  virtual void init(int& argc,char** argv,bool connect=TRUE);
++  virtual void init(int& argc,char** argv,bool connect=true);
+   FXString &Commands() { return commands; }
+   const FXString &ConfigDir() { return configdir; }
+   const FXString &SessionFile() { return sessionfile; }

editors/fxite/files/patch-src__appwin.cpp

@@ -0,0 +1,18 @@
+--- src/appwin.cpp.orig	2013-10-03 09:22:51 UTC
++++ src/appwin.cpp
+@@ -20,6 +20,7 @@
+ #include <fx.h>
+ #include <fxkeys.h>
+ 
++#include "compat.h"
+ #include "scidoc.h"
+ #include "doctabs.h"
+ #include "search.h"
+@@ -36,7 +37,6 @@
+ #include "statusbar.h"
+ #include "scidoc_util.h"
+ #include "foreachtab.h"
+-#include "compat.h"
+ 
+ #include "intl.h"
+ #include "appwin.h"

editors/fxite/files/patch-src__appwin_base.cpp

@@ -0,0 +1,48 @@
+--- src/appwin_base.cpp.orig	2013-10-03 09:22:51 UTC
++++ src/appwin_base.cpp
+@@ -25,6 +25,7 @@
+ #include "prefs.h"
+ #include "lang.h"
+ 
++#include "compat.h"
+ #include "scidoc.h"
+ #include "filer.h"
+ #include "toolmgr.h"
+@@ -45,7 +46,6 @@
+ #include "cmd_utils.h"
+ #include "scidoc_util.h"
+ #include "foreachtab.h"
+-#include "compat.h"
+ 
+ #include "intl.h"
+ #include "appwin_base.h"
+@@ -405,7 +405,14 @@ long TopWindowBase::onTimer(FXObject*o, 
+ long TopWindowBase::onCloseWait(FXObject*o, FXSelector sel, void*p)
+ {
+   if (FXSELTYPE(sel)==SEL_CHORE) {
+-    getApp()->addTimeout(this,ID_CLOSEWAIT, ONE_SECOND/10, NULL);
++    static FXint CloseWaitChoreCount=10;
++    if (CloseWaitChoreCount>0) {
++      CloseWaitChoreCount--;
++      getApp()->addChore(this,ID_CLOSEWAIT, NULL);
++    } else {
++      CloseWaitChoreCount=10;
++      getApp()->addTimeout(this,ID_CLOSEWAIT, ONE_SECOND/10, NULL);
++    }
+   } else {
+     close();
+   }
+@@ -1246,7 +1253,12 @@ void TopWindowBase::ParseCommands(FXStri
+             FXString filename=sect.text();
+             if (rowcol.empty()) {
+               FXint beg,end;
+-              if (rx_rowcol.match(filename,&beg,&end)) {
++#ifdef FOX_1_7_50_OR_NEWER
++              if (rx_rowcol.search(filename,0,filename.length(),Normal,&beg,&end,1)>=0)
++#else
++              if (rx_rowcol.match(filename,&beg,&end))
++#endif
++              {
+                 if (!FXStat::isFile(filename)) {
+                   rowcol=filename.mid(beg,end-beg).text();
+                   filename=filename.left(beg).text();

editors/fxite/files/patch-src__appwin_base.h

@@ -0,0 +1,11 @@
+--- src/appwin_base.h.orig	2013-10-03 09:22:51 UTC
++++ src/appwin_base.h
+@@ -114,7 +114,7 @@ public:
+   virtual ~TopWindowBase();
+   static TopWindowBase* instance();
+   virtual void create();
+-  virtual FXbool close(FXbool notify=FALSE);
++  virtual FXbool close(FXbool notify=false);
+   void ParseCommands(FXString &commands);
+   bool Closing();
+   bool IsMacroCancelled();

editors/fxite/files/patch-src__appwin_pub.h

@@ -0,0 +1,11 @@
+--- src/appwin_pub.h.orig	2013-10-03 09:22:51 UTC
++++ src/appwin_pub.h
+@@ -55,7 +55,7 @@ public:
+   static void ParseCommands(FXString &commands);
+   static FXMainWindow* instantiate(FXApp*a);
+   static void create();
+-  static FXbool close(FXbool notify=FALSE);
++  static FXbool close(FXbool notify=false);
+   static FXMainWindow* instance();
+   static void DumpLexers();
+   static void FindText(const char*searchfor, FXuint searchmode, bool forward);

editors/fxite/files/patch-src__doctabs.cpp

@@ -0,0 +1,20 @@
+--- src/doctabs.cpp.orig	2013-10-03 09:22:51 UTC
++++ src/doctabs.cpp
+@@ -56,7 +56,7 @@ long DocTabs::onDnd(FXObject* sender,FXS
+   switch (FXSELTYPE(sel)) {
+     case SEL_DND_ENTER: {
+       if (getApp()->getCursorWindow()==this) { return 0; }
+-      setDragRectangle(0,0,width,height,FALSE);
++      setDragRectangle(0,0,width,height,false);
+       if (offeredDNDType(FROM_DRAGNDROP,urilistType)) {
+         acceptDrop();
+         dnd_accept=true;
+@@ -504,7 +504,7 @@ long DocTab::onDnd(FXObject* sender,FXSe
+   FXEvent* ev=(FXEvent*)p;
+   switch(FXSELTYPE(sel)) {
+     case SEL_DND_ENTER:  {
+-      setDragRectangle(0,0,width,height,FALSE);
++      setDragRectangle(0,0,width,height,false);
+       if (offeredDNDType(FROM_DRAGNDROP,FxteDnDTabType)) {
+         acceptDrop();
+         dnd_accept=true;

editors/fxite/files/patch-src__fxasq.cpp

@@ -0,0 +1,67 @@
+--- src/fxasq.cpp.orig	2013-10-03 09:22:51 UTC
++++ src/fxasq.cpp
+@@ -133,7 +133,7 @@ int FxAsqWin::Run(FxAsqItem**results)
+   dlg->create();
+   dlg->setWidth(dlg->getDefaultWidth());
+   dlg->setHeight(dlg->getDefaultHeight());
+-  for (FXint i=keylist.first(); i<=keylist.last(); i=keylist.next(i))
++  if (UsedSlotsInDict(&keylist)>0) for (FXint i=0; i<TotalSlotsInDict(&keylist); ++i)
+   {
+     focused_btn=-1; // Focusing a button doesn't make much sense for interactive dialogs.
+     FXWindow*obj=(FXWindow*)(keylist.data(i));
+@@ -186,8 +186,8 @@ int FxAsqWin::Run(FxAsqItem**results)
+ 
+ void FxAsqWin::PutResults()
+ {
+-  for (FXint i=keylist.first(); i<=keylist.last(); i=keylist.next(i)) {
+-    const char*k=keylist.key(i);
++  for (FXint i=0; i<TotalSlotsInDict(&keylist); ++i) {
++    const char*k=DictKeyName(keylist,i);
+     FXWindow*obj=(FXWindow*)keylist.data(i);
+     if (k&&obj) {
+       if (IsGroup(obj)) {
+@@ -299,7 +299,7 @@ void FxAsqWin::Select(const char*key, co
+ {
+   FXHorizontalFrame *frm = new FXHorizontalFrame(userbox,LAYOUT_FILL_X);
+   new FXLabel(frm,label,NULL);
+-  FXListBox*list=(FXListBox*)(keylist.find(key));
++  FXListBox*list=(FXListBox*)(LookupInDict(&keylist,key));
+   if (list) {
+     list->reparent(frm);
+     void*p=list->getUserData();
+@@ -315,7 +315,7 @@ void FxAsqWin::Select(const char*key, co
+ 
+ void FxAsqWin::Option(const char*key, const char*value, const char*label)
+ {
+-  FXListBox*list=(FXListBox*)(keylist.find(key));
++  FXListBox*list=(FXListBox*)(LookupInDict(&keylist,key));
+   if (!IsList(list)) {
+     list=new FXListBox(userbox,NULL,0,LISTBOX_OPTS);
+     keylist.insert(key,list);
+@@ -327,7 +327,7 @@ void FxAsqWin::Option(const char*key, co
+ 
+ void FxAsqWin::Group(const char*key, const char*value, const char*label)
+ {
+-  GroupBox*grp=(GroupBox*)(keylist.find(key));
++  GroupBox*grp=(GroupBox*)(LookupInDict(&keylist,key));
+   if (grp) {
+     ((FXWindow*)grp)->reparent(userbox);
+     grp->setText(label);
+@@ -341,7 +341,7 @@ void FxAsqWin::Group(const char*key, con
+ 
+ void FxAsqWin::Radio(const char*key, const char*value, const char*label)
+ {
+-  GroupBox*grp=(GroupBox*)(keylist.find(key));
++  GroupBox*grp=(GroupBox*)(LookupInDict(&keylist,key));
+   if (!IsGroup(grp)) {
+     grp=new GroupBox(userbox,NULL);
+     keylist.insert(key,grp);
+@@ -505,7 +505,7 @@ void FxAsqWin::Font(const char*key, cons
+ FxAsqWin::~FxAsqWin()
+ {
+   void*p=NULL;
+-  for (FXint i=keylist.first(); i<=keylist.last(); i=keylist.next(i)) {
++  for (FXint i=0; i<TotalSlotsInDict(&keylist); ++i) {
+     FXWindow*obj=(FXWindow*)(keylist.data(i));
+     if (IsList(obj)) {
+       FXListBox*listbox=(FXListBox*)obj;

editors/fxite/files/patch-src__fxasq.h

@@ -0,0 +1,29 @@
+--- src/fxasq.h.orig	2013-10-03 09:22:51 UTC
++++ src/fxasq.h
+@@ -17,8 +17,11 @@
+   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+ 
++#ifndef FXASQ_H
++#define FXASQ_H
+ 
+ #include "fxasq_c.h"
++#include "compat.h"
+ 
+ 
+ class FxAsqWin: public FXObject {
+@@ -33,7 +36,7 @@ class FxAsqWin: public FXObject {
+     void AppendResult(const char*key, const char*value);
+     void PutResults();
+   protected:
+-    FXDict keylist;
++    Dictionary keylist;
+     FXVerticalFrame *userbox;
+   public:
+ 
+@@ -55,4 +58,5 @@ class FxAsqWin: public FXObject {
+     void Color(    const char*key, const char*value, const char*label);
+     void Font(     const char*key, const char*value, const char*label);
+ };
++#endif
+ 

editors/fxite/files/patch-src__fxasq_lua.c

@@ -0,0 +1,50 @@
+--- src/fxasq_lua.c.orig	2013-10-03 09:22:51 UTC
++++ src/fxasq_lua.c
+@@ -31,6 +31,9 @@
+ #include "intl.h"
+ #include "fxasq_lua.h"
+ 
++#if LUA_VERSION_NUM<502
++# define lua_rawlen lua_objlen
++#endif
+ 
+ #define DLG_MODULE_NAME "dialog"
+ #define MetaName "_fxasq_metatable"
+@@ -234,7 +237,7 @@ static int asq_new(lua_State *L) {
+   if (argc>=2) {
+     luaL_argcheck(L,lua_istable(L,2),2,_("expected table"));
+   }
+-  n=lua_objlen(L,2);
++  n=lua_rawlen(L,2);
+   for (i=1;i<=n; i++) {
+     lua_rawgeti(L,2,i);
+     char msg[64];
+@@ -301,7 +304,7 @@ static int asq_done(lua_State *L)
+ 
+ 
+ 
+-static const struct luaL_reg asq_funcs[] = {
++static const struct luaL_Reg asq_funcs[] = {
+   {"new",      asq_new},
+   {"run",      asq_run},
+   {"label",    asq_label},
+@@ -330,12 +333,15 @@ int luaopen_dialog(lua_State *L)
+   lua_pushvalue(L, -2);
+   lua_settable(L, -3);
+ 
+-  luaL_getmetatable(L, MetaName);
+   lua_pushstring(L,"__gc");
+   lua_pushcfunction(L,asq_done);
+   lua_rawset(L,-3);
+ 
+-  luaL_register(L, NULL, &asq_funcs[1]);
+-  luaL_register(L, DLG_MODULE_NAME, asq_funcs);
+-  return 0;
++#if LUA_VERSION_NUM < 502
++  luaL_Register(L, NULL, &asq_funcs[1]);
++  luaL_Register(L, DLG_MODULE_NAME, asq_funcs);
++#else
++  luaL_setfuncs(L,asq_funcs,0);
++#endif
++  return 1;
+ }

editors/fxite/files/patch-src__help.cpp

@@ -0,0 +1,42 @@
+--- src/help.cpp.orig	2013-10-03 09:22:51 UTC
++++ src/help.cpp
+@@ -36,6 +36,12 @@
+ #define sendString(iMessage, wParam, lParam) sendMessage(iMessage, wParam, reinterpret_cast<long>(lParam))
+ 
+ 
++#ifdef FOX_1_7_50_OR_NEWER
++# define RxFind(rx,subj,start,beg,end,npar) (rx.search(subj,strlen(subj),start,strlen(subj),FXRex::Normal,beg,end,npar)>=0)
++#else
++# define RxFind(rx,subj,start,beg,end,npar) (rx.match(subj,beg,end,REX_FORWARD,npar,start))
++#endif
++
+ 
+ enum {
+   SCHLP_FIXED,
+@@ -224,7 +230,7 @@ void SciHelp::replace(const char*oldstr,
+   FXRex generic_rx(oldstr, REX_NORMAL|REX_NEWLINE);
+   content=(const char*)(sendMessage(SCI_GETCHARACTERPOINTER,0,0));
+   FXint n=strlen(newstr);
+-  while (generic_rx.match(content,beg,end,REX_FORWARD,1)) {
++  while (RxFind(generic_rx,content,0,beg,end,1)) {
+     sendMessage(SCI_SETTARGETSTART,beg[0],0);
+     sendMessage(SCI_SETTARGETEND,end[0],0);
+     sendString(SCI_REPLACETARGET,n,newstr);
+@@ -261,7 +267,7 @@ void SciHelp::parse(const char*txt, unsi
+   for (FXint i=SCHLP_FIRST; i<SCHLP_LAST; i++) {
+     content=(const char*)(sendMessage(SCI_GETCHARACTERPOINTER,0,0));
+     FXRex rx(phrases[i], REX_CAPTURE|REX_NEWLINE);
+-    while (rx.match(content,beg,end,REX_FORWARD,2)) {
++    while (RxFind(rx,content,0,beg,end,2)) {
+       sendMessage(SCI_SETTARGETSTART,beg[0],0);
+       sendMessage(SCI_SETTARGETEND,end[0],0);
+       char*tmp=my_strndup(content+beg[1], end[1]-beg[1]);
+@@ -292,7 +298,7 @@ void SciHelp::parse(const char*txt, unsi
+   FXRex appname_rx("\\<"APP_NAME"\\>", REX_NORMAL|REX_NEWLINE);
+   content=(const char*)(sendMessage(SCI_GETCHARACTERPOINTER,0,0));
+   FXint p=0;
+-  while (appname_rx.match(content,beg,end,REX_FORWARD,1, p)) {
++  while (RxFind(appname_rx,content,p,beg,end,1)) {
+     sendMessage(SCI_STARTSTYLING,beg[0],0xff);
+     sendMessage(SCI_SETSTYLING,(end[0]-beg[0]),SCHLP_LOGO);
+     p=end[0];

editors/fxite/files/patch-src__luacmds.cpp

@@ -0,0 +1,20 @@
+--- src/luacmds.cpp.orig	2013-10-03 09:22:51 UTC
++++ src/luacmds.cpp
+@@ -530,7 +530,7 @@ static int view_clear_output(lua_State* 
+ }
+ 
+ 
+-static const struct luaL_reg fxte_commands[] = {
++static const struct luaL_Reg fxte_commands[] = {
+   {"file_new",                  file_new},
+   {"file_open",                 file_open},
+   {"file_reload",               file_reload},
+@@ -585,7 +585,7 @@ static const struct luaL_reg fxte_comman
+ 
+ 
+ 
+-const luaL_reg* LuaCommands(FXMainWindow*topwin)
++const luaL_Reg* LuaCommands(FXMainWindow*topwin)
+ {
+   if (!tw) {
+     tw=(TopWindow*)topwin;

editors/fxite/files/patch-src__luacmds.h

@@ -0,0 +1,9 @@
+--- src/luacmds.h.orig	2013-10-03 09:22:51 UTC
++++ src/luacmds.h
+@@ -17,5 +17,5 @@
+ */
+ 
+ 
+-const luaL_reg* LuaCommands(FXMainWindow*topwin);
++const luaL_Reg* LuaCommands(FXMainWindow*topwin);
+ 

editors/fxite/files/patch-src__luafuncs.cpp

@@ -0,0 +1,58 @@
+--- src/luafuncs.cpp.orig	2013-10-03 09:22:51 UTC
++++ src/luafuncs.cpp
+@@ -25,8 +25,8 @@
+ #include <FX88591Codec.h>
+ #include <FXUTF16Codec.h>
+ 
+-#include "macro.h"
+ #include "compat.h"
++#include "macro.h"
+ #include "appwin_pub.h"
+ #include "scidoc.h"
+ #include "doctabs.h"
+@@ -38,6 +38,9 @@
+ #include "intl.h"
+ #include "luafuncs.h"
+ 
++#if LUA_VERSION_NUM<502
++# define lua_rawlen lua_objlen
++#endif
+ 
+ 
+ /*
+@@ -86,7 +89,7 @@ static bool check_find_flags(lua_State* 
+ {
+   flags=0;
+   luaL_argcheck(L, lua_istable(L,pos), pos, _("expected table"));
+-  int n=lua_objlen(L, pos);
++  int n=lua_rawlen(L, pos);
+   for (int i=1; i<=n; i++) {
+     lua_rawgeti(L, pos, i);
+     if (lua_isstring(L,-1)) {
+@@ -287,7 +290,7 @@ static int select(lua_State* L)
+     sel_start=luaL_checkinteger(L,1);
+     sel_end=(1==argc)?sel_start:luaL_checkinteger(L,2);
+     sci->sendMessage(SCI_SETSELECTIONMODE, rectsel?SC_SEL_RECTANGLE:SC_SEL_STREAM, 0);
+-    sci->sendMessage(SCI_SETCURRENTPOS, sel_end, FALSE);
++    sci->sendMessage(SCI_SETCURRENTPOS, sel_end, false);
+     sci->sendMessage(SCI_SETANCHOR, sel_start, 0);
+     sci->ScrollCaret();
+     sci->sendMessage(SCI_SETSELECTIONMODE, rectsel?SC_SEL_RECTANGLE:SC_SEL_STREAM, 0);
+@@ -1354,7 +1357,7 @@ static int tagfiles(lua_State* L)
+ 
+ 
+ 
+-static const struct luaL_reg fxte_funcs[] = {
++static const struct luaL_Reg fxte_funcs[] = {
+   {"seltext", seltext},
+   {"text", text},
+   {"documents", documents},
+@@ -1403,7 +1406,7 @@ static const struct luaL_reg fxte_funcs[
+ 
+ 
+ 
+-const luaL_reg* LuaFuncs()
++const luaL_Reg* LuaFuncs()
+ {
+   return fxte_funcs;
+ }

editors/fxite/files/patch-src__luafuncs.h

@@ -0,0 +1,15 @@
+--- src/luafuncs.h.orig	2013-10-03 09:22:51 UTC
++++ src/luafuncs.h
+@@ -17,10 +17,10 @@
+ */
+ 
+ 
+-struct luaL_reg;
++struct luaL_Reg;
+ class TopWindow;
+ 
+-const luaL_reg* LuaFuncs();
++const luaL_Reg* LuaFuncs();
+ void LuaFuncsCleanup();
+ const char *LuaQuitMessage();
+ 

editors/fxite/files/patch-src__luafx.h

@@ -0,0 +1,9 @@
+--- src/luafx.h.orig	2013-10-03 09:22:51 UTC
++++ src/luafx.h
+@@ -17,5 +17,5 @@
+ */
+ 
+ 
+-const luaL_reg* LuaFxUtils(FXWindow*topwin, const char*exe_name);
++const luaL_Reg* LuaFxUtils(FXWindow*topwin, const char*exe_name);
+ 

editors/fxite/files/patch-src__macro.cpp

@@ -0,0 +1,103 @@
+--- src/macro.cpp.orig	2013-10-03 09:22:51 UTC
++++ src/macro.cpp
+@@ -47,7 +47,7 @@ MacroRunner::~MacroRunner()
+ /* Catch and report script errors */
+ static FXint traceback(lua_State *L)
+ {
+-  lua_getfield(L, LUA_GLOBALSINDEX, "debug");
++  lua_getglobal(L, "debug");
+   if (!lua_istable(L, -1)) {
+     lua_pop(L, 1);
+     return 1;
+@@ -324,7 +324,7 @@ static void debug_hook(lua_State *L, lua
+ /* Override a builtin Lua function, or add a new one if it doesn't exist */
+ static void override(lua_State *L, const char*module, const char* funcname, lua_CFunction newfunc)
+ {
+-  lua_getfield(L,LUA_GLOBALSINDEX,module);
++  lua_getglobal(L,module);
+   if (lua_istable(L,-1)) {
+     lua_pushstring(L,funcname);
+     if (newfunc) {
+@@ -342,7 +342,7 @@ static void override(lua_State *L, const
+ /* Don't let scripts try to read from stdin, as this would block indefinitely */
+ static void close_stdin(lua_State *L)
+ {
+-  lua_getfield(L, LUA_GLOBALSINDEX, "io");
++  lua_getglobal(L, "io");
+   if (!lua_istable(L, -1)) {
+     lua_pop(L, 1);
+     return;
+@@ -384,7 +384,7 @@ typedef struct {
+ 
+ void MacroRunner::ClearKeepers()
+ {
+-  for (FXint i=keepers.first(); i<=keepers.last(); i=keepers.next(i)) {
++  if (UsedSlotsInDict(&keepers)>0) for (FXint i=0; i<TotalSlotsInDict(&keepers); ++i) {
+     PersistRecord*pr=(PersistRecord*)keepers.data(i);
+     if (pr) {
+       if (pr->t==LUA_TSTRING) {
+@@ -406,11 +406,12 @@ void MacroRunner::PushKeepers(lua_State 
+     lua_pushstring(L,PERSIST_TABLE_NAME);
+     lua_newtable(L);
+     lua_settable(L, -3);
+-    for (FXint i=keepers.first(); i<=keepers.last(); i=keepers.next(i)) {
++    if (UsedSlotsInDict(&keepers)>0) for (FXint i=0; i<TotalSlotsInDict(&keepers); ++i) {
+       PersistRecord*pr=(PersistRecord*)keepers.data(i);
++      if (!pr) { continue; }
+       lua_getglobal(L, LUA_MODULE_NAME);
+       lua_getfield(L,-1,PERSIST_TABLE_NAME);
+-      lua_pushstring(L,keepers.key(i));
++      lua_pushstring(L,DictKeyName(keepers,i));
+       switch (pr->t) {
+         case LUA_TNUMBER: { lua_pushnumber(L, pr->n);  break;}
+         case LUA_TBOOLEAN:{ lua_pushboolean(L, pr->b); break;}
+@@ -455,7 +456,7 @@ void MacroRunner::PopKeepers(lua_State *
+             }
+           }
+           if (pr) {
+-            keepers.replace(lua_tostring(L,-2), pr);
++            ReplaceInDict(&keepers,lua_tostring(L,-2),pr);
+           }
+         }
+         lua_pop(L, 1);
+@@ -479,6 +480,9 @@ bool MacroRunner::RunMacro(const FXStrin
+   lua_State *L=luaL_newstate();
+   luaL_openlibs(L);
+   luaopen_dialog(L);
++#if LUA_VERSION_NUM>=502
++  lua_setglobal(L, "dialog");
++#endif
+   override(L,"os","exit", osexit);
+   override(L,"io","stdin", NULL);
+   override(L,"_G","print", print);
+@@ -487,11 +491,27 @@ bool MacroRunner::RunMacro(const FXStrin
+   si->script=isfilename?source.text():NULL;
+   states.append(si);
+   lua_sethook(L,debug_hook,LUA_MASKLINE,1);
+-  luaL_register(L, LUA_MODULE_NAME, LuaFuncs());
+-  luaL_register(L, LUA_MODULE_NAME, LuaFxUtils(TopWinPub::instance(), EXE_NAME));
++#if LUA_VERSION_NUM<502
++  luaL_Register(L, LUA_MODULE_NAME, LuaFuncs());
++  luaL_Register(L, LUA_MODULE_NAME, LuaFxUtils(TopWinPub::instance(), EXE_NAME));
++  luaL_Register(L, LUA_MODULE_NAME, LuaCommands(TopWinPub::instance()));
++#else
++  int n=0;
++  const luaL_Reg*p;
++  const luaL_Reg*funcs = LuaFuncs();
++  const luaL_Reg*utils = LuaFxUtils(TopWinPub::instance(), EXE_NAME);
++  const luaL_Reg*cmds = LuaCommands(TopWinPub::instance());
++  for (p=funcs; p->name; p++) { n++; }
++  for (p=utils; p->name; p++) { n++; }
++  for (p=cmds; p->name; p++) { n++; }
++  lua_createtable(L, 0, n);
++  luaL_setfuncs(L, funcs, 0);
++  luaL_setfuncs(L, utils, 0);
++  luaL_setfuncs(L, cmds, 0);
++  lua_setglobal(L, LUA_MODULE_NAME);
++#endif
+   override(L,LUA_MODULE_NAME,"script", scriptname);
+   override(L,LUA_MODULE_NAME,"optimize", optimize);
+-  luaL_openlib(L, LUA_MODULE_NAME, LuaCommands(TopWinPub::instance()), 0);
+   set_string_token(L, "_VERSION", VERSION);
+   PushKeepers(L);
+   if (isfilename) {

editors/fxite/files/patch-src__macro.h

@@ -0,0 +1,11 @@
+--- src/macro.h.orig	2013-10-03 09:22:51 UTC
++++ src/macro.h
+@@ -25,7 +25,7 @@ struct lua_State;
+ 
+ class MacroRunner: public FXObject {
+ private:
+-  FXDict keepers; // <- Data stored between Lua states
++  Dictionary keepers; // <- Data stored between Lua states
+   void ClearKeepers();
+   void PushKeepers(lua_State *L);
+   void PopKeepers(lua_State *L);

editors/fxite/files/patch-src__menuspec.cpp

@@ -0,0 +1,12 @@
+--- src/menuspec.cpp.orig	2013-10-03 09:22:51 UTC
++++ src/menuspec.cpp
+@@ -616,7 +616,8 @@ void MenuMgr::ReadPopupMenu(FXRegistry*r
+       memset(keyname,0, sizeof(keyname));
+       snprintf(keyname,sizeof(keyname)-1,"Command_%d", i+1);
+       if (reg->existingEntry(popup_sect,keyname)) {
+-        PopupCommands[i]=strdup(reg->readStringEntry(popup_sect,keyname));
++        const char*tmp=reg->readStringEntry(popup_sect,keyname);
++        PopupCommands[i]=strdup(tmp?tmp:"");
+       }
+     }
+   } else {

editors/fxite/files/patch-src__outpane.cpp

@@ -0,0 +1,28 @@
+--- src/outpane.cpp.orig	2013-10-03 09:22:51 UTC
++++ src/outpane.cpp
+@@ -115,7 +115,12 @@ void OutputList::GoToError()
+           FXint begs[4]={0,0,0,0};
+           FXint ends[4]={0,0,0,0};
+           FXRex rx(pats[i].pat, REX_CAPTURE);
+-          if (rx.match(txt,begs,ends,REX_FORWARD,3)) {
++#ifdef FOX_1_7_50_OR_NEWER
++          if (rx.search(txt,0,txt.length(),FXRex::Normal,begs,ends,3)>=0)
++#else
++          if (rx.match(txt,begs,ends,REX_FORWARD,3))
++#endif
++          {
+             FXString filename = txt.mid(begs[1],ends[1]-begs[1]);
+             FXString linenum =  txt.mid(begs[2],ends[2]-begs[2]);
+             if (FXStat::isFile(filename)) {
+@@ -228,7 +233,11 @@ void OutputList::SelectFirstError()
+   FXRex rx(_(": [Ee]rror: "));
+   for (FXint i=0; i<getNumItems(); i++) {
+     FXListItem *item=getItem(i);
++#ifdef FOX_1_7_50_OR_NEWER
++    if (rx.search(item->getText(),0,item->getText().length())>=0) {
++#else
+     if (rx.match(item->getText())) {
++#endif
+       selectItem(i);
+       setCurrentItem(i);
+       makeItemVisible(i);

editors/fxite/files/patch-src__prefdlg.cpp

@@ -0,0 +1,113 @@
+--- src/prefdlg.cpp.orig	2013-10-03 09:22:51 UTC
++++ src/prefdlg.cpp
+@@ -415,13 +415,13 @@ void PrefsDialog::MakeGeneralTab()
+   right_column=new FXVerticalFrame(hframe,FRAME_SUNKEN|LAYOUT_FILL/*|PACK_UNIFORM_HEIGHT*/);
+ 
+   chk=new FXCheckButton(left_column, _("Watch files for external changes."), prefs, Settings::ID_TOGGLE_WATCH_EXTERN);
+-  chk->setCheck(prefs->WatchExternChanges, FALSE);
++  chk->setCheck(prefs->WatchExternChanges, false);
+   chk->setPadBottom(8);
+ 
+   hframe=new FXHorizontalFrame(left_column);
+   SetPad(hframe,0);
+   chk=new FXCheckButton(hframe, _("Backup files every "), prefs, Settings::ID_TOGGLE_AUTOSAVE);
+-  chk->setCheck(prefs->Autosave, FALSE);
++  chk->setCheck(prefs->Autosave, false);
+   chk->setPadBottom(12);
+   spin=new FXSpinner(hframe, 3, prefs, Settings::ID_SET_AUTOSAVE_INT,SPIN_OPTS);
+   spin->setRange(15,900);
+@@ -433,10 +433,10 @@ void PrefsDialog::MakeGeneralTab()
+ 
+   new FXLabel(left_column,  _("Ask before closing multiple files:"));
+   chk=new FXCheckButton(left_column, _("From menu"), prefs, Settings::ID_TOGGLE_ASK_CLOSE_MULTI_MENU);
+-  chk->setCheck(prefs->PromptCloseMultiMenu, FALSE);
++  chk->setCheck(prefs->PromptCloseMultiMenu, false);
+   chk->setPadLeft(12);
+   chk=new FXCheckButton(left_column, _("On exit"), prefs, Settings::ID_TOGGLE_ASK_CLOSE_MULTI_EXIT);
+-  chk->setCheck(prefs->PromptCloseMultiExit, FALSE);
++  chk->setCheck(prefs->PromptCloseMultiExit, false);
+   chk->setPadLeft(12);
+   chk->setPadBottom(12);
+ 
+@@ -464,15 +464,15 @@ void PrefsDialog::MakeGeneralTab()
+ 
+   new FXLabel(right_column,_("Save open files before executing:"));
+   chk=new FXCheckButton(right_column, _("Tools->Filter Selection"), prefs, Settings::ID_SAVE_ON_FILTER_SEL);
+-  chk->setCheck(prefs->SaveBeforeFilterSel, FALSE);
++  chk->setCheck(prefs->SaveBeforeFilterSel, false);
+   chk->setPadLeft(12);
+ 
+   chk=new FXCheckButton(right_column, _("Tools->Insert Command"), prefs, Settings::ID_SAVE_ON_INS_CMD);
+-  chk->setCheck(prefs->SaveBeforeInsCmd, FALSE);
++  chk->setCheck(prefs->SaveBeforeInsCmd, false);
+   chk->setPadLeft(12);
+ 
+   chk=new FXCheckButton(right_column, _("Tools->Execute Command"), prefs, Settings::ID_SAVE_ON_EXEC_CMD);
+-  chk->setCheck(prefs->SaveBeforeExecCmd, FALSE);
++  chk->setCheck(prefs->SaveBeforeExecCmd, false);
+   chk->setPadLeft(12);
+ 
+ #ifndef WIN32
+@@ -539,19 +539,19 @@ void PrefsDialog::MakeEditorTab()
+   list->setCurrentItem(prefs->AutoIndent);
+ 
+   chk=new FXCheckButton(column, _("Smart home key"), prefs, Settings::ID_TOGGLE_SMART_HOME);
+-  chk->setCheck(prefs->SmartHome, FALSE);
++  chk->setCheck(prefs->SmartHome, false);
+ 
+   chk=new FXCheckButton(column, _("Smooth scrolling"), prefs, Settings::ID_TOGGLE_SMOOTH_SCROLL);
+-  chk->setCheck(prefs->SmoothScroll, FALSE);
++  chk->setCheck(prefs->SmoothScroll, false);
+ 
+   chk=new FXCheckButton(column, _("Allow caret beyond end of line"), prefs, Settings::ID_TOGGLE_CARET_PAST_EOL);
+-  chk->setCheck(prefs->CaretPastEOL, FALSE);
++  chk->setCheck(prefs->CaretPastEOL, false);
+ 
+   chk=new FXCheckButton(column,_("Turn line wrapping on by default"),prefs,Settings::ID_TOGGLE_WORD_WRAP);
+   chk->setCheck(prefs->WordWrap);
+ 
+   chk=new FXCheckButton(column, _("Wrap-aware home/end keys"), prefs, Settings::ID_TOGGLE_WRAP_AWARE);
+-  chk->setCheck(prefs->WrapAwareHomeEnd, FALSE);
++  chk->setCheck(prefs->WrapAwareHomeEnd, false);
+ 
+   spinframe=new FXHorizontalFrame(column);
+   spin=new FXSpinner(spinframe, 2, prefs, Settings::ID_SET_CARET_WIDTH, SPIN_OPTS);
+@@ -605,14 +605,14 @@ void PrefsDialog::MakeEditorTab()
+   new FXLabel(spinframe, _("Indent width"));
+ 
+   chk->setUserData((void*)spin);
+-  chk->setCheck(prefs->UseTabs, TRUE);
++  chk->setCheck(prefs->UseTabs, true);
+ 
+   new FXHorizontalSeparator(column,LAYOUT_SIDE_TOP|LAYOUT_FILL_X|SEPARATOR_GROOVE);
+   new FXLabel(column, _("Default search options:"));
+   srchopts=new SciSearchOptions(column, prefs,Settings::ID_SET_SEARCH_OPTS);
+   srchopts->SetSciFlags(prefs->SearchOptions);
+   chk=new FXCheckButton(column, _("Verbose search messages"), prefs, Settings::ID_TOGGLE_SEARCH_VERBOSE);
+-  chk->setCheck(prefs->SearchVerbose, FALSE);
++  chk->setCheck(prefs->SearchVerbose, false);
+   chk->setPadLeft(6);
+ 
+   spinframe=new FXHorizontalFrame(column);
+@@ -635,10 +635,10 @@ void PrefsDialog::MakeEditorTab()
+ 
+   new FXHorizontalSeparator(column,LAYOUT_SIDE_TOP|LAYOUT_FILL_X|SEPARATOR_GROOVE);
+   chk=new FXCheckButton(column, _("Open 7-bit ASCII files as UTF-8"), prefs, Settings::ID_TOGGLE_ASCII_DEFAULT);
+-  chk->setCheck(!prefs->DefaultToAscii, FALSE);
++  chk->setCheck(!prefs->DefaultToAscii, false);
+   chk->setPadBottom(4);
+   chk=new FXCheckButton(column, _("Treat other files as broken UTF-8"), prefs, Settings::ID_TOGGLE_SBCS_DEFAULT);
+-  chk->setCheck(!prefs->DefaultToSbcs, FALSE);
++  chk->setCheck(!prefs->DefaultToSbcs, false);
+   chk->setPadBottom(8);
+   spinframe=new FXHorizontalFrame(column);
+   new FXLabel(spinframe, _("Default file format:"));
+@@ -651,7 +651,7 @@ void PrefsDialog::MakeEditorTab()
+ 
+   chk=new FXCheckButton(column, _("Show line endings with \"View Whitespace\""),
+                           prefs, Settings::ID_TOGGLE_VIEW_WHITESPACE_EOL);
+-  chk->setCheck(prefs->WhitespaceShowsEOL, FALSE);
++  chk->setCheck(prefs->WhitespaceShowsEOL, false);
+   chk->setPadLeft(6);
+ }
+ 

editors/fxite/files/patch-src__prefdlg_sntx.cpp

@@ -0,0 +1,11 @@
+--- src/prefdlg_sntx.cpp.orig	2013-10-03 09:22:51 UTC
++++ src/prefdlg_sntx.cpp
+@@ -84,7 +84,7 @@ long MyColorWell::onDoubleClicked(FXObje
+   colordialog.setSelector(ID_COLORDIALOG);
+   colordialog.setRGBA(oldcolor);
+   colordialog.setOpaqueOnly(isOpaqueOnly());
+-  if(!colordialog.execute(PLACEMENT_SCREEN)) { setRGBA(oldcolor,TRUE); }
++  if(!colordialog.execute(PLACEMENT_SCREEN)) { setRGBA(oldcolor,true); }
+   return 1;
+ }
+ 

editors/fxite/files/patch-src__recorder.cpp

@@ -0,0 +1,10 @@
+--- src/recorder.cpp.orig	2013-10-03 09:22:51 UTC
++++ src/recorder.cpp
+@@ -20,6 +20,7 @@
+ #include <fx.h>
+ #include <Scintilla.h>
+ 
++#include "compat.h"
+ #include "macro.h"
+ 
+ #include "intl.h"

editors/fxite/files/patch-src__scidoc.cpp

@@ -0,0 +1,14 @@
+--- src/scidoc.cpp.orig	2013-10-03 09:22:51 UTC
++++ src/scidoc.cpp
+@@ -620,7 +620,11 @@ bool SciDoc::SetLanguageForHeader(const 
+     } else {
+       // Take a wild guess - if the file contains the word "class" it's probably  C++
+       const char *content=(const char*)(sendMessage(SCI_GETCHARACTERPOINTER,0,0));
++#ifdef FOX_1_7_50_OR_NEWER
++      if (FXRex("\\<class\\>").search(content,strlen(content),0,strlen(content))>=0) {
++#else
+       if (FXRex("\\<class\\>").match(content)) {
++#endif
+         setLanguage("cpp");
+       } else {
+         setLanguage("c");

editors/fxite/files/patch-src__scisrch.cpp

@@ -0,0 +1,64 @@
+--- src/scisrch.cpp.orig	2013-10-03 09:22:51 UTC
++++ src/scisrch.cpp
+@@ -29,6 +29,12 @@
+ #define SciMsg(im,wp,lp) sci->sendMessage(im,wp,lp)
+ #define SciStr(im,wp,lp) sci->sendString(im,wp,lp)
+ 
++#ifdef FOX_1_7_50_OR_NEWER
++# define RxMatch(rx, str, len, beg, end, mode, npar, fm, to) ( ((rx)->search((str), (len), (fm), (to), (mode), (beg), (end), (npar))) >=0 )
++#else
++# define RxMatch(rx, str, len, beg, end, mode, npar, fm, to) ( ((rx)->match ((str), (len), (beg), (end), (mode), (npar), (fm), (to))) !=0 )
++#endif
++
+ #if 1
+ 
+ // The capitalization of text inserted by `&' or `\1', `\2', ... `\9' can be altered by
+@@ -222,7 +228,7 @@ int SciSearch::FindTextNoSel(const FXStr
+   if (fm<0) { fm=0; }
+   if (to>len) { to=len; }
+   FXuint dirn=isfwd?REX_FORWARD:REX_BACKWARD;
+-  if (rx.match(content,len,begs,ends,dirn,MAX_CAPTURES,fm,to)) {
++  if (RxMatch(&rx,content,len,begs,ends,dirn,MAX_CAPTURES,fm,to)) {
+     beg=isfwd?begs[0]:ends[0];
+     end=isfwd?ends[0]:begs[0];
+     return 1;
+@@ -256,8 +262,8 @@ bool SciSearch::FindText(const FXString 
+   long fm = isfwd? pos : 0;
+   long to = isfwd? len : (pos-1);
+   if (
+-    rx.match(content,len,begs,ends,dirn,MAX_CAPTURES,fm,to) ||
+-    (wrap && rx.match(content,len,begs,ends,dirn,MAX_CAPTURES,0,len))
++    RxMatch(&rx,content,len,begs,ends,dirn,MAX_CAPTURES,fm,to) ||
++    (wrap && RxMatch(&rx,content,len,begs,ends,dirn,MAX_CAPTURES,0,len))
+   ) {
+     SciMsg(SCI_SETTARGETSTART,begs[0],0);
+     SciMsg(SCI_SETTARGETEND,ends[0],0);
+@@ -383,8 +389,8 @@ long SciSearch::ReplaceAllInDoc(const FX
+   SciMsg(SCI_SETSEARCHFLAGS,0,0);
+   SciMsg(SCI_BEGINUNDOACTION,0,0);
+   while (1) {
+-    if (end==start) { break; }
+-    if (rx.match(content,end,begs,ends,srchflags,MAX_CAPTURES,start,end)) {
++    if (end<=start) { break; }
++    if (RxMatch(&rx,content,end,begs,ends,REX_FORWARD|REX_NOT_EMPTY,MAX_CAPTURES,start,end)) {
+       SciMsg(SCI_SETTARGETSTART,begs[0],0);
+       SciMsg(SCI_SETTARGETEND,ends[0],0);
+       FXString newstr=DoSubstitute(content,begs,ends,repl_template,MAX_CAPTURES);
+@@ -438,7 +444,7 @@ long SciSearch::ReplaceAllInSel(const FX
+ 
+     SciMsg(SCI_SETSEARCHFLAGS,0,0);
+     if (bol_only) { // Special case, start of first line
+-      if (rx.match(content,end,begs,ends,REX_FORWARD|REX_NOT_EMPTY,MAX_CAPTURES,start,end)) {
++      if (RxMatch(&rx,content,end,begs,ends,REX_FORWARD|REX_NOT_EMPTY,MAX_CAPTURES,start,end)) {
+         SciMsg(SCI_SETTARGETSTART,begs[0],0);
+         SciMsg(SCI_SETTARGETEND,ends[0],0);
+         FXString newstr=DoSubstitute(content,begs,ends,repl_template,MAX_CAPTURES);
+@@ -452,7 +458,7 @@ long SciSearch::ReplaceAllInSel(const FX
+     long substart=start;
+     while (1) {
+       if (end<=substart) { break; }
+-      if (rx.match(content,end,begs,ends,srchflags,MAX_CAPTURES,substart,end)) {
++      if (RxMatch(&rx,content,end,begs,ends,srchflags,MAX_CAPTURES,substart,end)) {
+         SciMsg(SCI_SETTARGETSTART,begs[0],0);
+         SciMsg(SCI_SETTARGETEND,ends[0],0);
+         FXString newstr=DoSubstitute(content,begs,ends,repl_template,MAX_CAPTURES);

editors/fxite/files/patch-src__tagread.cpp

@@ -0,0 +1,33 @@
+--- src/tagread.cpp.orig	2013-10-03 09:22:51 UTC
++++ src/tagread.cpp
+@@ -532,11 +532,11 @@ void AutoCompleter::Show(SciDoc*sci)
+   if (no()&&sci->PrefixAtPos(part)) {
+     FXint partlen=part.length();
+     FXint len=0; // save lots of reallocs by calculating overall length first
+-    for (FXint i=first(); i<=last(); i=next(i)) {
+-      const char*ctag=key(i);
+-      int taglen=strlen(ctag);
+-      if ((taglen>partlen)&&(strncmp(part.text(),ctag,partlen)==0)) {
+-        replace(ctag,(void*)((FXival)1)); // flag it for inclusion
++    for (FXint i=0; i<TotalSlotsInDict(this); ++i) {
++      FXString ctag=key(i);
++      int taglen=ctag.length();
++      if ((taglen>partlen)&&(compare(part,ctag,partlen)==0)) {
++        ReplaceInDict(this,ctag.text(),(void*)((FXival)1)); // flag it for inclusion
+         len+=taglen+1; // count its length
+       }
+     }
+@@ -544,10 +544,10 @@ void AutoCompleter::Show(SciDoc*sci)
+       FXString list=FXString::null;
+       list.length(len);
+       list.trunc(0);
+-      for (FXint i=first(); i<=last(); i=next(i)) {
++      for (FXint i=0; i<TotalSlotsInDict(this); ++i) {
+         if (data(i)) {
+-          const char*ctag=key(i);
+-          replace(ctag,NULL); // reset our flag
++          FXString ctag=key(i);
++          ReplaceInDict(this,ctag.text(),NULL); // reset our flag
+           list.append(ctag);
+           list.append(' ');
+         }

editors/fxite/files/patch-src__tagread.h

@@ -0,0 +1,11 @@
+--- src/tagread.h.orig	2013-10-03 09:22:51 UTC
++++ src/tagread.h
+@@ -26,7 +26,7 @@ public:
+ 
+ 
+ 
+-class AutoCompleter:public FXDict {
++class AutoCompleter:public Dictionary {
+ private:
+   void Show(SciDoc*sci);
+   void Parse(char startchar, const char*filename);

editors/fxite/files/patch-src__theme.cpp

@@ -0,0 +1,29 @@
+--- src/theme.cpp.orig	2013-10-03 09:22:51 UTC
++++ src/theme.cpp
+@@ -644,16 +644,16 @@ void ThemeGUI::SetDemoColors()
+ long ThemeGUI::onSelectTheme(FXObject*o, FXSelector sel, void*p)
+ {
+   AppColors*ac=(AppColors*)(list->getItemData((FXint)((FXival)p)));
+-  cw_base->setRGBA(ac->base,TRUE);
+-  cw_bord->setRGBA(ac->border,TRUE);
+-  cw_fore->setRGBA(ac->fore,TRUE);
+-  cw_back->setRGBA(ac->back,TRUE);
+-  cw_self->setRGBA(ac->selfore,TRUE);
+-  cw_selb->setRGBA(ac->selback,TRUE);
+-  cw_menf->setRGBA(ac->selmenutext,TRUE);
+-  cw_menb->setRGBA(ac->selmenuback,TRUE);
+-  cw_tipf->setRGBA(ac->tipfore,TRUE);
+-  cw_tipb->setRGBA(ac->tipback,TRUE);
++  cw_base->setRGBA(ac->base,true);
++  cw_bord->setRGBA(ac->border,true);
++  cw_fore->setRGBA(ac->fore,true);
++  cw_back->setRGBA(ac->back,true);
++  cw_self->setRGBA(ac->selfore,true);
++  cw_selb->setRGBA(ac->selback,true);
++  cw_menf->setRGBA(ac->selmenutext,true);
++  cw_menb->setRGBA(ac->selmenuback,true);
++  cw_tipf->setRGBA(ac->tipfore,true);
++  cw_tipb->setRGBA(ac->tipback,true);
+   if (&custom_colors!=ac) {
+     memcpy(&custom_colors.base,&ac->base,sizeof(AppColors)-sizeof(char*));
+   }

editors/fxite/files/patch-src_export.cpp

@@ -1,6 +1,6 @@
---- src/export.cpp.orig	2014-07-24 14:11:00.000000000 +0200
-+++ src/export.cpp	2014-07-24 14:11:00.000000000 +0200
-@@ -464,7 +464,7 @@
+--- src/export.cpp.orig	2013-10-03 09:22:51 UTC
++++ src/export.cpp
+@@ -464,7 +464,7 @@ void SaveToPDF(SciDoc*sci,  FILE *fp)
        }
        // start to write PDF file here (PDF1.4Ref(p63))
        // ASCII>127 characters to indicate binary-possible stream

editors/fxite/files/patch-src_luafx.cpp

@@ -1,6 +1,17 @@
---- src/luafx.cpp.orig	2014-07-24 14:16:55.000000000 +0200
-+++ src/luafx.cpp	2014-07-24 14:19:21.000000000 +0200
-@@ -173,7 +173,7 @@
+--- src/luafx.cpp.orig	2013-10-03 09:22:51 UTC
++++ src/luafx.cpp
+@@ -36,6 +36,10 @@
+ #include "intl.h"
+ #include "luafx.h"
+ 
++#if LUA_VERSION_NUM<502
++# define lua_rawlen lua_objlen
++#endif
++
+ static FXWindow*main_window=NULL;
+ 
+ static const char*default_title;
+@@ -173,7 +177,7 @@ static int input(lua_State*L)
    switch (toupper(type[0])) {
      case 'I' : {
        if (!lua_isnil(L,3)) {
@@ -9,3 +20,30 @@
        }
        opt=INPUTDIALOG_INTEGER;
        break;
+@@ -248,7 +252,7 @@ static int choose(lua_State*L) {
+   FXString fmsg;
+   int i,n;
+   luaL_argcheck(L, lua_istable(L,argtbl), argtbl, _("table expected") );
+-  n=lua_objlen(L,argtbl);
++  n=lua_rawlen(L,argtbl);
+   luaL_argcheck(L, n>0, argtbl, _("table can't be empty"));
+   for (i=1;i<=n; i++) {
+     lua_rawgeti(L,argtbl,i);
+@@ -599,7 +603,7 @@ static int pid(lua_State* L)
+ 
+ 
+ 
+-static const struct luaL_reg fx_util_funcs[] = {
++static const struct luaL_Reg fx_util_funcs[] = {
+   {"message", message},
+   {"confirm", confirm},
+   {"input", input},
+@@ -620,7 +624,7 @@ static const struct luaL_reg fx_util_fun
+ 
+ 
+ 
+-const luaL_reg* LuaFxUtils(FXWindow*topwin, const char*exe_name)
++const luaL_Reg* LuaFxUtils(FXWindow*topwin, const char*exe_name)
+ {
+   default_title=exe_name;
+   if (!main_window) { main_window=topwin; }

editors/fxite/pkg-descr

@@ -1,8 +1,9 @@
-FXiTe is an advanced cross-platform text editor built with the Fox GUI toolkit
-and the FXScintilla text widget. It features built-in syntax highlighting for
-40+ languages, an embedded Lua scripting engine, macro recording and playback,
-multi-line regular expression search and replace, rudimentary ctags and calltip
-support, a flexible interface to external tools, and a built-in "message window"
-to capture the output of external commands such as compiler error messages, etc.
+FXiTe is an advanced cross-platform text editor built with the Fox GUI
+toolkit and the FXScintilla text widget. It features built-in syntax
+highlighting for 40+ languages, an embedded Lua scripting engine, macro
+recording and playback, multi-line regular expression search and
+replace, rudimentary ctags and calltip support, a flexible interface to
+external tools, and a built-in "message window" to capture the output of
+external commands such as compiler error messages, etc.
 
-WWW: http://code.google.com/p/fxite/
+WWW: https://github.com/yetanothergeek/fxite/

editors/mp/Makefile

@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mp
-PORTVERSION=	5.2.9
+PORTVERSION=	5.2.10
 CATEGORIES=	editors
 MASTER_SITES=	http://triptico.com/download/mp/
 
@@ -10,6 +10,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Programming text editor
 
 LICENSE=	GPLv2 # (or later)
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		iconv ncurses
 HAS_CONFIGURE=	yes
@@ -18,40 +19,48 @@ CONFIGURE_ARGS=	--prefix=${PREFIX} --without-win32 --without-kde4
 
 DATADIR=	${PREFIX}/share/mp-5
 
-OPTIONS_DEFINE=	NLS PCRE DOCS
-OPTIONS_RADIO=	GUI
-OPTIONS_RADIO_GUI=	GTK3 GTK2 QT4
+OPTIONS_DEFINE=		DOCS NLS PCRE
+OPTIONS_RADIO=		GUI
+OPTIONS_RADIO_GUI=	GTK2 GTK3 QT4
 OPTIONS_DEFAULT=	PCRE
-OPTIONS_SUB=	yes
+OPTIONS_SUB=		yes
 
-NLS_USES=	gettext
+NLS_USES=		gettext
 NLS_CONFIGURE_WITH=	gettext
-
+GTK2_USE=		gnome=gtk20
+GTK3_USE=		gnome=gtk30
 PCRE_LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
 PCRE_CONFIGURE_WITH=	pcre
-
-QT4_USE=		QT4=corelib,gui,moc_build
+QT4_USE=		qt4=corelib,gui,moc_build
 QT4_CONFIGURE_ENV=	CPP="${CXX}" CCLINK="${CXX}"
 QT4_CONFIGURE_WITH=	qt4
 
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MGTK3}
-USE_GNOME+=	gtk30
-CONFOPT_GTK=	3
+.if ${PORT_OPTIONS:MGTK2} || ${PORT_OPTIONS:MGTK3} || ${PORT_OPTIONS:MQT4}
+USES+=		pkgconfig
+PLIST_SUB+=	GUI=""
+.else
+PLIST_SUB+=	GUI="@comment "
 .endif
 
-.if ${PORT_OPTIONS:MGTK2}
-USE_GNOME+=	gtk20
-CONFOPT_GTK=	2
-.endif
-
-.if empty(PORT_OPTIONS:MGTK3) && empty(PORT_OPTIONS:MGTK2)
+.if ${PORT_OPTIONS:MGTK2} || ${PORT_OPTIONS:MGTK3}
+DESKTOP_ENTRIES="Minimum Profit" "" "mp-5" "mp" "Develpment;TextEditor;GTK;" ""
+.else
 CONFIGURE_ARGS+=	--without-gtk
 CONFOPT_GTK=	0
 .endif
 
+.if ${PORT_OPTIONS:MGTK2}
+CONFOPT_GTK=	2
+.endif
+
+.if ${PORT_OPTIONS:MGTK3}
+CONFOPT_GTK=	3
+.endif
+
 .if ${PORT_OPTIONS:MQT4}
+DESKTOP_ENTRIES="Minimum Profit" "" "mp-5" "mp" "Development;TextEditor;Qt;" ""
 QT_NONSTANDARD=	yes
 .endif
 
@@ -60,7 +69,6 @@ post-patch:
 		's|<ncursesw/|<| ; \
 		 s|-I/usr/local/include|| ; \
 		 s|-L/usr/local/lib|| ; \
-		 s|-lX11|| ; \
 		 /gtk+/s|3.0|${CONFOPT_GTK}.0| ; \
 		 /OK/s|3.0|${CONFOPT_GTK}.0| ; \
 		 /CONFOPT_GTK/s|3|${CONFOPT_GTK}|' ${WRKSRC}/config.sh
@@ -83,6 +91,9 @@ do-install:
 	(cd ${WRKSRC} && ${INSTALL_DATA} mp_*.mpsl ${STAGEDIR}${DATADIR})
 	@${MKDIR} ${STAGEDIR}${DATADIR}/lang
 	(cd ${WRKSRC}/lang && ${INSTALL_DATA} *.mpsl ${STAGEDIR}${DATADIR}/lang)
+.if ${PORT_OPTIONS:MGTK2} || ${PORT_OPTIONS:MGTK3} || ${PORT_OPTIONS:MQT4}
+	(cd ${WRKSRC} && ${INSTALL_DATA} mp.png ${STAGEDIR}${PREFIX}/share/pixmaps)
+.endif
 .if ${PORT_OPTIONS:MNLS}
 .for lang in de es it nl ru sv
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/locale/${lang}/LC_MESSAGES