*/*: sync with upstream

Taken from: FreeBSD
2015-08-19 07:28:49 +02:00 · 2015-08-19 07:28:49 +02:00 · 895ca7412e
commit 895ca7412e
parent 801799acba
776 changed files with 3233 additions and 11151 deletions
--- a/archivers/fpc-paszlib/Makefile
+++ b/archivers/fpc-paszlib/Makefile
@ -1,7 +1,7 @@
 # Created by: John Merryweather Cooper
 # $FreeBSD$

-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	archivers devel
 PKGNAMESUFFIX=	-paszlib

@ -9,7 +9,6 @@ MAINTAINER=	freebsd-fpc@FreeBSD.org
 COMMENT=	Free Pascal unit for native compression IO

 USE_FPC=	hash
-USE_FPC_RUN=	yes

 MASTERDIR=	${.CURDIR}/../../lang/fpc
 WRKUNITDIR=	${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
--- a/astro/gpsbabel/Makefile
+++ b/astro/gpsbabel/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	gpsbabel
 PORTVERSION=	1.5.2
+PORTREVISION=	1
 CATEGORIES=	astro geography
 MASTER_SITES=	https://secure.ohos.nl/downloads/ \
 		LOCAL/glebius
@ -13,20 +14,41 @@ COMMENT=	GPS file translating tool
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING

-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
-
-USE_AUTOTOOLS=	autoconf
-GNU_CONFIGURE=	yes
-
-USES=		gettext
-USE_QT4=	corelib linguist_build qmake_build
-USE_GNOME=	glib20
-
-PLIST_FILES=	bin/gpsbabel
-
 CONFLICTS=	gpsbabel14-[0-9]*

-post-install:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/gpsbabel
+USE_QT4=	corelib qmake_build
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--with-zlib=system
+
+OPTIONS_DEFINE=	GUI
+OPTIONS_SUB=	GUI
+
+GUI_ALL_TARGET=	gui
+GUI_USE=	QT4=gui,xml,network,webkit
+GUI_USE+=	QT4=linguisttools_build,moc_build,rcc_build,uic_build
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MGUI}
+MAKE_JOBS_UNSAFE=	yes
+.endif
+
+post-patch:
+	@${REINPLACE_CMD} '/langPath_ = / \
+		s|QApplication::applicationDirPath()|"${DATADIR}"|' \
+			${WRKSRC}/gui/mainwindow.cc
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/gpsbabel ${STAGEDIR}${PREFIX}/bin/
+.if ${PORT_OPTIONS:MGUI}
+	${INSTALL_PROGRAM} ${WRKSRC}/gui/objects/gpsbabelfe-bin \
+		${STAGEDIR}${PREFIX}/bin/
+	${INSTALL_DATA} ${WRKSRC}/gui/gpsbabel.desktop \
+		${STAGEDIR}${PREFIX}/share/applications/
+	${MKDIR} ${STAGEDIR}${DATADIR}/translations
+	${INSTALL_DATA} ${WRKSRC}/gui/*.qm ${STAGEDIR}${DATADIR}/translations/
+	${INSTALL_DATA} ${WRKSRC}/gui/images/appicon.png \
+		${STAGEDIR}${PREFIX}/share/pixmaps/gpsbabel.png
+.endif

 .include <bsd.port.mk>
--- a/astro/gpsbabel/files/patch-jeeps-gpslibusb.cc
+++ b/astro/gpsbabel/files/patch-jeeps-gpslibusb.cc
@ -1,5 +1,5 @@
--- jeeps/gpslibusb.cc.orig	2014-09-16 05:49:59.000000000 +0200
-+++ jeeps/gpslibusb.cc	2015-03-14 19:33:11.690407708 +0100
+--- jeeps/gpslibusb.cc.orig	2014-09-16 03:49:59 UTC
+++ jeeps/gpslibusb.cc
@@ -20,7 +20,8 @@
  */
 
--- a/astro/gpsbabel/pkg-plist
+++ b/astro/gpsbabel/pkg-plist
@ -0,0 +1,12 @@
+bin/gpsbabel
+%%GUI%%bin/gpsbabelfe-bin
+%%GUI%%share/applications/gpsbabel.desktop
+%%GUI%%%%DATADIR%%/translations/gpsbabel.qm
+%%GUI%%%%DATADIR%%/translations/gpsbabelfe.qm
+%%GUI%%%%DATADIR%%/translations/gpsbabelfe_de.qm
+%%GUI%%%%DATADIR%%/translations/gpsbabelfe_es.qm
+%%GUI%%%%DATADIR%%/translations/gpsbabelfe_fr.qm
+%%GUI%%%%DATADIR%%/translations/gpsbabelfe_hu.qm
+%%GUI%%%%DATADIR%%/translations/gpsbabelfe_it.qm
+%%GUI%%%%DATADIR%%/translations/gpsbabelfe_ru.qm
+%%GUI%%share/pixmaps/gpsbabel.png
--- a/astro/p5-Astro-PAL/Makefile
+++ b/astro/p5-Astro-PAL/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	Astro-PAL
 PORTVERSION=	1.07
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	astro perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@ -18,4 +18,7 @@ TEST_DEPENDS=	p5-Test-Number-Delta>=1:${PORTSDIR}/devel/p5-Test-Number-Delta
 USE_PERL5=	modbuild
 USES=		perl5

+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Astro/PAL/PAL.so
+
 .include <bsd.port.mk>
--- a/audio/amarok-kde4/Makefile
+++ b/audio/amarok-kde4/Makefile
@ -22,8 +22,6 @@ BUILD_DEPENDS=	${LOCALBASE}/lib/qt4/plugins/script/libqtscript_core.so.1.0.0:${P
 RUN_DEPENDS=	${LOCALBASE}/lib/qt4/plugins/script/libqtscript_core.so.1.0.0:${PORTSDIR}/devel/qtscriptgenerator \
 		${KDE4_PREFIX}/lib/kde4/kio_upnp_ms.so:${PORTSDIR}/net/kio-upnp-ms

-LATEST_LINK=	${PORTNAME}-kde4
-
 USE_KDE4=	kdelibs kdeprefix libkcddb libkcompactdisc \
 		nepomuk-core runtime automoc4 strigi
 USE_MYSQL=	embedded
--- a/audio/jack/Makefile
+++ b/audio/jack/Makefile
@ -32,8 +32,6 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib -L${BDB_LIB_DIR}
 INSTALL_TARGET=	install-strip

-LATEST_LINK=	jack
-
 OPTIONS_DEFINE=	ALSA DOXYGEN READLINE
 OPTIONS_DEFAULT=READLINE
 OPTIONS_SUB=	yes
--- a/audio/lua51-mpd/Makefile
+++ b/audio/lua51-mpd/Makefile
@ -12,7 +12,7 @@ COMMENT=	Lua library for musicpd
 RUN_DEPENDS=	${LUA_MODLIBDIR}/socket/core.so:${PORTSDIR}/net/luasocket

 OPTIONS_DEFINE=	DOCS
-DOCSDIR=	${PREFIX}/share/doc/${UNIQUENAME}
+DOCSDIR=	${PREFIX}/share/doc/${PKGBASE}

 GH_ACCOUNT=	silentbicycle
 GH_PROJECT=	lua-mpd
--- a/audio/mous/Makefile
+++ b/audio/mous/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	mous
 PORTVERSION=	1.1a
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	http://cloud.github.com/downloads/bsdelf/mous/

@ -14,6 +14,7 @@ LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT

 USES=		cmake
+USE_LDCONFIG=	yes

 OPTIONS_DEFINE=		ALSA ASSEMBLY FAAC FAAD FLAC LAME AO CUE MAC4DECODER \
 			MACDECODER MPG123 NCURSES OSS QT4 SDK TAGLIB VORBIS \
@ -81,7 +82,8 @@ OSS_CMAKE_ON=		-DWithPluginOssRenderer=1
 OSS_CMAKE_OFF=		-DWithPluginOssRenderer=0

 QT4_DESC=		QT4 frontend
-QT4_USE=		QT4=gui,linguist,moc_build,qmake_build,rcc_build,uic_build
+QT4_USE=		QT4=corelib,gui,linguisttools_build
+QT4_USE+=		QT4=qmake_build,moc_build,rcc_build,uic_build
 QT4_CMAKE_ON=		-DWithFrontendQt=1
 QT4_CMAKE_OFF=		-DWithFrontendQt=0

--- a/audio/mous/files/patch-CMakeLists.txt
+++ b/audio/mous/files/patch-CMakeLists.txt
@ -1,6 +1,6 @@
--- CMakeLists.txt.orig	2012-06-15 04:46:40.000000000 +0200
-+++ CMakeLists.txt	2012-07-18 17:04:03.462575000 +0200
-@@ -292,7 +292,7 @@
+--- CMakeLists.txt.orig	2012-06-28 14:58:11 UTC
+++ CMakeLists.txt
+@@ -306,7 +306,7 @@ if(WithFrontendQt)
         RUNTIME DESTINATION bin)
     install(
         CODE "file(GLOB TRANSLATION_FILES \"${PROJECT_BINARY_DIR}/*.qm\")"
@ -9,7 +9,7 @@
     )
 endif()
 
-@@ -307,7 +307,7 @@
+@@ -321,7 +321,7 @@ install(
 )
 
 file(GLOB RESOURCE_FILES "${MOUS_SOURCE_DIR}/resource/*")
--- a/audio/mous/files/patch-contribffmpeg-strip-wmacommon.h
+++ b/audio/mous/files/patch-contribffmpeg-strip-wmacommon.h
@ -1,6 +1,6 @@
--- ./contrib/ffmpeg-strip-wma/common.h.orig	2014-07-02 10:52:02.000000000 -0400
-+++ ./contrib/ffmpeg-strip-wma/common.h	2014-07-02 10:52:39.000000000 -0400
-@@ -1150,11 +1150,6 @@
+--- contrib/ffmpeg-strip-wma/common.h.orig	2012-06-28 14:58:11 UTC
+++ contrib/ffmpeg-strip-wma/common.h
+@@ -1150,11 +1150,6 @@ if(256*256*256*64%(tcount+tskip_count)==
 
 #define CLAMP_TO_8BIT(d) ((d > 0xff) ? 0xff : (d < 0) ? 0 : d)
 
--- a/audio/py-mpd2/Makefile
+++ b/audio/py-mpd2/Makefile
@ -23,7 +23,6 @@ USE_PYTHON=	autoplist concurrent distutils

 NO_ARCH=	yes

-OPTIONSFILE=	${PORT_DBDIR}/py-${PORTNAME}/options
 OPTIONS_DEFINE=	DOCS EXAMPLES

 DOCSDIR=	${PREFIX}/share/doc/py-${PORTNAME}
--- a/audio/qmpdclient/Makefile
+++ b/audio/qmpdclient/Makefile
@ -13,7 +13,7 @@ COMMENT=	Easy to use musicpd client written in Qt4
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING

-USES=		tar:bzip2 qmake
+USES=		qmake tar:bzip2
 USE_QT4=	moc_build rcc_build uic_build \
 		corelib gui network xml xmlpatterns
 INSTALLS_ICONS=	yes
@ -23,24 +23,17 @@ OPTIONS_DEFINE=	DBUS NLS DEBUG
 DATADIR=	${PREFIX}/share/QMPDClient
 WRKSRC=		${WRKDIR}/${PORTNAME}

+OPTIONS_SUB=	NLS
+
+NLS_USE=	QT4=linguisttools_build
+
+DBUS_QMAKE_ON=	CONFIG+=qdbus
+DBUS_USE=	QT4=dbus
+
+DEBUG_QMAKE_ON=	CONFIG+=debug
+
 .include  <bsd.port.options.mk>

-.if ! ${PORT_OPTIONS:MNLS}
-PLIST_SUB+=	NLS="@comment "
-.else
-USE_QT4+=	linguist_build
-PLIST_SUB+=	NLS=""
-.endif
-
-.if ${PORT_OPTIONS:MDBUS}
-USE_QT4+=	dbus
-QMAKE_ARGS+=	"CONFIG+=qdbus"
-.endif
-
-.if ${PORT_OPTIONS:MDEBUG}
-QMAKE_ARGS+=	"CONFIG+=debug"
-.endif
-
 post-patch:
 .if ! ${PORT_OPTIONS:MNLS}
 	@${REINPLACE_CMD} -e '/INSTALLS += translations/d' \
--- a/audio/qmpdclient/files/patch-qmpdclient.desktop
+++ b/audio/qmpdclient/files/patch-qmpdclient.desktop
@ -1,6 +1,6 @@
--- qmpdclient.desktop.orig	2011-02-04 14:22:08.000000000 +0300
-+++ qmpdclient.desktop	2011-03-25 13:43:51.000000000 +0300
-@@ -4,6 +4,6 @@
+--- qmpdclient.desktop.orig	2011-06-08 09:16:26 UTC
+++ qmpdclient.desktop
+@@ -4,6 +4,6 @@ Name=QMPDClient
 GenericName=Qt4 based MPD client
 Comment=A nicer MPD client
 Exec=qmpdclient
--- a/audio/qmpdclient/files/patch-qmpdclient.pro
+++ b/audio/qmpdclient/files/patch-qmpdclient.pro
@ -1,6 +1,6 @@
--- qmpdclient.pro.orig	2011-06-08 13:16:26.000000000 +0400
-+++ qmpdclient.pro	2011-09-21 14:18:07.000000000 +0400
-@@ -3,7 +3,7 @@
+--- qmpdclient.pro.orig	2011-06-08 09:16:26 UTC
+++ qmpdclient.pro
+@@ -3,7 +3,7 @@ PREFIX = /usr/local
 
 # Most people need not muck about below here
 #!contains(QT_MAJOR_VERSION, 4):error(QMPDClient requires Qt 4)
@ -9,7 +9,7 @@
 
 # addition ldflags for release build
 QMAKE_LFLAGS_RELEASE += -O2 -g0 -s
-@@ -212,16 +212,15 @@
+@@ -212,16 +212,15 @@ unix {
         SOURCES += src/qmpdclient_x11.cpp
         LIBS += -lX11
         # Check for dbus support
@ -28,7 +28,7 @@
             SOURCES += src/notifications_nodbus.cpp
         }
     }
-@@ -253,6 +252,7 @@
+@@ -253,6 +252,7 @@ unix {
 translations.commands = lrelease $$TRANSLATIONS
 translations.files = lang/cs_CZ.qm lang/de_DE.qm lang/es_ES.qm lang/fr_FR.qm lang/it_IT.qm lang/nl_NL.qm lang/nn_NO.qm lang/no_NO.qm lang/pt_BR.qm lang/ru_RU.qm lang/sv_SE.qm lang/tr_TR.qm lang/uk_UA.qm lang/zh_CN.qm lang/zh_TW.qm
 translations.path = $$PREFIX/share/QMPDClient/translations
--- a/biology/ruby-bio/Makefile
+++ b/biology/ruby-bio/Makefile
@ -16,8 +16,6 @@ OPTIONS_DEFINE=	XMLPARSER BDB4 MYSQL PGSQL DOCS
 XMLPARSER_DESC=	xmlparser support for faster Blast processing
 BDB4_DESC=	bdb4 support for faster flat file indexing

-OPTIONSFILE=	${PORT_DBDIR}/ruby-${PORTNAME}/options
-
 USES=	shebangfix
 USE_RUBY=	yes
 USE_RUBY_SETUP=	yes
--- a/biology/ugene/Makefile
+++ b/biology/ugene/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	ugene
 DISTVERSION=	1.17.0
+PORTREVISION=	1
 CATEGORIES=	biology science
 MASTER_SITES=	http://ugene.unipro.ru/downloads/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} QueryDesigner_UserManual.pdf \
@ -17,10 +18,10 @@ LICENSE=	GPLv2

 RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash

-USES=		execinfo qmake
+USES=		desktop-file-utils execinfo qmake
 USE_GL=		glu
 USE_QT4=	corelib gui network script webkit xml \
-		linguist_build moc_build qmake_build qtestlib_build \
+		linguisttools_build moc_build qmake_build qtestlib_build \
 		rcc_build scripttools_build uic_build \
 		imageformats_run
 USE_XORG=	xtst
--- a/chinese/eric6/distinfo
+++ b/chinese/eric6/distinfo
@ -1,2 +1,2 @@
-SHA256 (eric6-i18n-zh_CN.GB2312-6.0.5.tar.gz) = 6275f3bc827717babb15ee6f442a21fc5d779865bf8eeb38e9fd0e741bd70abf
-SIZE (eric6-i18n-zh_CN.GB2312-6.0.5.tar.gz) = 447183
+SHA256 (eric6-i18n-zh_CN.GB2312-6.0.8.tar.gz) = 95d8179d8ba7c176ee31e6aae11cbec4cbb348c7636d4ded21002677d74ed683
+SIZE (eric6-i18n-zh_CN.GB2312-6.0.8.tar.gz) = 447235
--- a/chinese/joe/Makefile
+++ b/chinese/joe/Makefile
@ -9,8 +9,6 @@ PATCH_DIST_STRIP=	-p1

 MAINTAINER=	ports@FreeBSD.org

-LATEST_LINK=	${PKGNAMEPREFIX}joe
-
 DEPRECATED=	The difference with editors/joe is too trivial to warrant a separate port
 EXPIRATION_DATE=2015-09-27

--- a/chinese/p5-Encode-CNMap/Makefile
+++ b/chinese/p5-Encode-CNMap/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	Encode-CNMap
 PORTVERSION=	0.32
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	chinese perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@ -17,4 +17,7 @@ LICENSE_COMB=	dual
 USE_PERL5=	configure
 USES=		perl5

+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Encode/CNMap/CNMap.so
+
 .include <bsd.port.mk>
--- a/chinese/p5-cconv/Makefile
+++ b/chinese/p5-cconv/Makefile
@ -4,7 +4,7 @@
 PORTNAME=	cconv
 PORTVERSION=	0.6.1
 DISTVERSIONPREFIX=	perl-
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	chinese converters perl5
 MASTER_SITES=	GOOGLE_CODE
 PKGNAMEPREFIX=	p5-
@ -20,4 +20,7 @@ CFLAGS+=	-I${LOCALBASE}/include
 USE_PERL5=	configure
 USES=		perl5

+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/cconv/cconv.so
+
 .include <bsd.port.mk>
--- a/chinese/phpbb3-tw/Makefile
+++ b/chinese/phpbb3-tw/Makefile
@ -15,8 +15,6 @@ COMMENT=	The Traditional Chinese version of phpBB3

 CONFLICTS=	phpbb-tw-[0-2]* phpbb-devel-[0-3]* phpbb-[0-3]*

-LATEST_LINK=	${PKGNAMEPREFIX}${PORTNAME}3${PKGNAMESUFFIX}
-
 USES=		zip

 # The phpBB3 port supports a number of variables that may be tweaked at build
--- a/comms/chirp/Makefile
+++ b/comms/chirp/Makefile
@ -2,7 +2,7 @@

 PORTNAME=	chirp
 PORTVERSION=	0.4.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	comms hamradio
 MASTER_SITES=	http://chirp.danplanet.com/download/${PORTVERSION}/ \
 		LOCAL/db
@ -12,9 +12,10 @@ COMMENT=	Free, open-source tool for programming your amateur radio

 LICENSE=	GPLv3

-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}libxml2>0:${PORTSDIR}/textproc/py-libxml2 \
+BUILD_DEPENDS=	${CHIRP_DEPENDS}
+RUN_DEPENDS=	${CHIRP_DEPENDS}
+CHIRP_DEPENDS=	${PYTHON_PKGNAMEPREFIX}libxml2>0:${PORTSDIR}/textproc/py-libxml2 \
 		${PYTHON_PKGNAMEPREFIX}serial>0:${PORTSDIR}/comms/py-serial
-RUN_DEPENDS=	${BUILD_DEPENDS}

 USES=		desktop-file-utils gettext python
 USE_PYTHON=	distutils
--- a/comms/cqrlog/Makefile
+++ b/comms/cqrlog/Makefile
@ -27,6 +27,7 @@ ALL_TARGET=	${PORTNAME}

 LAZARUS_VER=	1.4.2
 LAZARUS_DIR=	${LOCALBASE}/share/lazarus-${LAZARUS_VER}
+USE_FPC=	fcl-net

 OPTIONS_SINGLE=		LCL
 OPTIONS_SINGLE_LCL=	GTK2 QT4
--- a/comms/gnuradio/Makefile
+++ b/comms/gnuradio/Makefile
@ -35,7 +35,7 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}

 USES=		cmake:outsource iconv perl5 python:2.7 shebangfix
 SHEBANG_FILES=	grc/freedesktop/grc_setup_freedesktop.in
-CMAKE_ENV+=	LD_PRELOAD="${GCC_LIBS}/libstdc++.so:${GCC_LIBS}/libgcc_s.so.1"
+CONFIGURE_ENV+=	LD_PRELOAD="${GCC_LIBS}/libstdc++.so:${GCC_LIBS}/libgcc_s.so.1"
 CMAKE_ARGS+=	-DSWIG_EXECUTABLE:STRING="${LOCALBASE}/bin/swig2.0"
 CMAKE_ARGS+=	-DICONV_PREFIX:STRING="${ICONV_PREFIX}" \
 		-DICONV_LIB:STRING="X${ICONV_LIB}" \
--- a/comms/syncterm/Makefile
+++ b/comms/syncterm/Makefile
@ -12,7 +12,7 @@ COMMENT=	ANSI-BBS terminal which supports telnet, rlogin, and SSH
 LICENSE=	GPLv2

 WRKSRC=		${WRKDIR}/syncterm-${PORTVERSION}/src/syncterm
-USES=		gmake tar:tgz perl5
+USES=		gmake perl5 tar:tgz
 USE_PERL5=	build
 MAKEFILE=	GNUmakefile
 PLIST_FILES=	bin/syncterm \
@ -20,6 +20,7 @@ PLIST_FILES=	bin/syncterm \
 		share/applications/syncterm.desktop \
 		share/icons/hicolor/64x64/apps/syncterm.png

+NO_CCACHE=	yes
 DISABLE_MAKE_JOBS=	yes
 MAKE_ARGS+=	WITHOUT_PORTAUDIO=yes
 MAKE_ARGS+=	-C ${WRKSRC}
--- a/comms/wsjt/Makefile
+++ b/comms/wsjt/Makefile
@ -1,9 +1,8 @@
 # $FreeBSD$

 PORTNAME=	wsjt
-VERSION=	9.1
-PORTREVISION=	11
 DISTVERSION=	${VERSION}.r${SVN_REV}
+PORTREVISION=	12
 CATEGORIES=	comms hamradio
 MASTER_SITES=	LOCAL/db
 DISTNAME=	wsjt-r${SVN_REV}
@ -11,32 +10,43 @@ DISTNAME=	wsjt-r${SVN_REV}
 MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	Weak signal ham radio communication package

-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter \
-		${PYTHON_PKGNAMEPREFIX}pillow>0:${PORTSDIR}/graphics/py-pillow
+LICENSE=	GPLv3
+
 LIB_DEPENDS=	libfftw3.so:${PORTSDIR}/math/fftw3 \
 		libfftw3f.so:${PORTSDIR}/math/fftw3-float \
 		libsamplerate.so:${PORTSDIR}/audio/libsamplerate \
 		libportaudio.so:${PORTSDIR}/audio/portaudio
-BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/scipy:${PORTSDIR}/science/py-scipy \
+WSJT_DEPENDS=	${PYTHON_LIBDIR}/tkinter:${PORTSDIR}/x11-toolkits/py-tkinter \
+		${PYTHON_SITELIBDIR}/scipy:${PORTSDIR}/science/py-scipy \
+		${PYTHON_SITELIBDIR}/PIL:${PORTSDIR}/graphics/py-pillow \
 		${PYNUMPY}
+BUILD_DEPENDS=	${WSJT_DEPENDS}
+RUN_DEPENDS=	${LINUXBASE}/bin/kvasd:${PORTSDIR}/comms/kvasd \
+		${WSJT_DEPENDS}

 USE_GCC=	yes
-USES=		fortran gmake python tar:bzip2
+USES=		autoreconf fortran gmake python:3.3+ tar:bzip2
+SHEBANG_FILES=	${WRKSRC}/wsjt
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--enable-gfortran --prefix=${STAGEDIR}${LOCALBASE} \
-		--with-portaudio-include-dir=${LOCALBASE}/include/ \
-		--with-portaudio-lib-dir=${LOCALBASE}/lib/
+CONFIGURE_ARGS=	--prefix=${STAGEDIR}${LOCALBASE} \
+		--with-python=${PYTHON_CMD} \
+		--with-gfortran=${FC} \
+		--with-portaudio-include-dir=${LOCALBASE}/include \
+		--with-portaudio-lib-dir=${LOCALBASE}/lib
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib
 # Adding this breaks configure
 #LDFLAGS+=	-shared
+VERSION=	9.1
 PLIST_SUB=	PYVER=${PYTHON_VERSION:S/python//} \
 		VERSION=${VERSION}

 .include <bsd.port.pre.mk>

-.if defined(BOOTSTRAP)
-SVN_REV!=	svn info http://svn.code.sf.net/p/wsjt/code/trunk/ | ${GREP} Revision | cut -d' ' -f2
+.if defined(BOOTSTRAP) || defined(SVN_FETCH)
+#portlint freaks over this but it's only for dev. so ignore.
+FETCH_DEPENDS+=	svn:${PORTSDIR}/devel/subversion
+SVN_REV!=	svn info http://svn.code.sf.net/p/wsjt/wsjt/ | ${GREP} Revision | cut -d' ' -f2
 .else
 .include "Makefile.svn_rev"
 .endif
@ -47,32 +57,46 @@ FETCH_DEPENDS+=	svn:${PORTSDIR}/devel/subversion
 do-fetch:
 	${MKDIR} ${WRKDIR}
 	svn export -r ${SVN_REV} \
-		http://svn.code.sf.net/p/wsjt/code/trunk ${WRKDIR}/wsjt-r${SVN_REV}
+		http://svn.code.sf.net/p/wsjt/wsjt/trunk ${WRKDIR}/wsjt-r${SVN_REV}
 	cd ${WRKDIR};rm -f ${DISTNAME}/*.a ${DISTNAME}/*.lib ${DISTNAME}/*.dll;\
 		tar cvfy ${DISTDIR}/${DISTNAME}.tar.bz2 ${DISTNAME}
-	echo "SVN_REV=  ${SVN_REV}" > ${MASTERDIR}/Makefile.svn_rev
+	${ECHO_CMD} "SVN_REV=  ${SVN_REV}" > ${MASTERDIR}/Makefile.svn_rev
 .if ${USER} == db
 	scp ${DISTDIR}/${DISTNAME}.tar.bz2 \
 		freefall.freebsd.org:public_distfiles/
 .endif
 .endif

-pre-patch:
-	@${CP}	${FILESDIR}/configure ${WRKSRC}
-post-install:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for d in ${WRKSRC}/WSJT_Quick_Reference.pdf  ${WRKSRC}/WSJT_Source_Code.txt \
-	${WRKSRC}/WSJT_User_600.pdf ${WRKSRC}/UpdateHistory.txt \
-	${WRKSRC}/WSJT_Source_Code.txt ${WRKSRC}/LICENSE.TXT
-	${INSTALL_DATA} ${WRKSRC}/${d} ${STAGEDIR}${DOCSDIR}
+do-install:
+	${MKDIR} ${STAGEDIR}${DATADIR}
+	${CP} ${FILESDIR}/wsjt ${WRKSRC}
+	${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
+	    ${WRKSRC}/wsjt
+	${REINPLACE_CMD} -e 's|%%PYTHON%%|${PYTHON_CMD}|' \
+	    ${WRKSRC}/wsjt
+	${INSTALL_SCRIPT} ${WRKSRC}/wsjt ${STAGEDIR}${LOCALBASE}/bin
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
+	${MKDIR} ${STAGEDIR}${LOCALBASE}/lib/wsjt/WsjtMod
+.for d in ${WRKSRC}/WsjtMod/Audio.so ${WRKSRC}/WsjtMod/__init__.py \
+	${WRKSRC}/WsjtMod/astro.py ${WRKSRC}/WsjtMod/g.py \
+	${WRKSRC}/WsjtMod/go.py ${WRKSRC}/WsjtMod/options.py \
+	${WRKSRC}/WsjtMod/palettes.py ${WRKSRC}/WsjtMod/smeter.py \
+	${WRKSRC}/WsjtMod/specjt.py
+	${INSTALL_DATA} ${WRKSRC}${d} ${STAGEDIR}${LOCALBASE}/lib/wsjt/WsjtMod
+.endfor
+.for d in ${WRKSRC}/CALL3.TXT  ${WRKSRC}/dmet_10_-1_3.dat \
+	${WRKSRC}/dmet_10_0_3.dat ${WRKSRC}/dmet_20_-2_2.dat \
+	${WRKSRC}/dmet_20_-3_2.dat ${WRCSRC}/wsjtrc ${WRCSRC}/wsjt.py \
+	${WRKSRC}/Pmw.py ${WRKSRC}/PmwColor.py ${WRKSRC}/PmwBlt.py
+	${INSTALL_DATA} ${WRKSRC}${d} ${STAGEDIR}${DATADIR}
 .endfor
-
 do-build:
 	(cd ${WRKSRC};${GMAKE})

-post-stage:
-	(cd ${STAGEDIR}${PREFIX} \
-	  && ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
-	   -d ${PREFIX} -f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;})
+post-configure:
+	echo ZZZ post-configure
+	${REINPLACE_CMD} -e 's|f2py|f2py-${PYTHON_VER}|' \
+	    ${WRKSRC}/Makefile

 .include <bsd.port.post.mk>
--- a/comms/wsjt/Makefile.svn_rev
+++ b/comms/wsjt/Makefile.svn_rev
@ -1 +1 @@
-SVN_REV=  2511
+SVN_REV=  5745
--- a/comms/wsjt/distinfo
+++ b/comms/wsjt/distinfo
@ -1,2 +1,2 @@
-SHA256 (wsjt-r2511.tar.bz2) = 3724fd976c1c7449a486b821018c4014d5a6b316c657118ac30dc120706e9b9b
-SIZE (wsjt-r2511.tar.bz2) = 2208647
+SHA256 (wsjt-r5745.tar.bz2) = 96aeff70903d7ace9e094f739fd25c5453b6211663d75f10d5fb38c8728e72d3
+SIZE (wsjt-r5745.tar.bz2) = 3262114
--- a/comms/wsjt/files/configure
+++ b/comms/wsjt/files/configure
--- a/comms/wsjt/files/patch-Makefile.in
+++ b/comms/wsjt/files/patch-Makefile.in
@ -1,30 +1,40 @@
--- Makefile.in.orig	2011-04-22 13:00:35.000000000 -0400
-+++ Makefile.in	2014-07-29 11:40:12.000000000 -0400
-@@ -6,7 +6,7 @@
- LDFLAGS	= @LDFLAGS@
- LIBS	+= @LIBS@
- CPPFLAGS = @CPPFLAGS@
-CFLAGS	= @CFLAGS@
-+CFLAGS	= "@PORTAUDIO_INCLUDE@ @CFLAGS@"
- PREFIX	= @PREFIX@
- # WSJT specific C flags
- CFLAGS	+= -DBIGSYM=1 -fPIC
-@@ -148,12 +148,12 @@
+--- Makefile.in.orig	2015-01-08 17:33:18 UTC
+++ Makefile.in
+@@ -6,7 +6,13 @@
+ # Prerequisites: Python 3.x, numpy-1.8.1, PIL, Pmw-2.0.0+
 
- install:	WsjtMod/Audio.so
- 	${RM} -rf build/
-	${PYTHON} setup.py install
-	${MKDIR} -p ${PREFIX}/share/wsjt
-	${INSTALL} -m 0644 CALL3.TXT ${PREFIX}/share/wsjt/
-	${INSTALL} -m 0644 wsjtrc ${PREFIX}/share/wsjt/
-	${INSTALL} -m 0644 dmet_*.dat ${PREFIX}/share/wsjt/
-	${INSTALL} wsjt ${PREFIX}/bin
-+	${PYTHON} setup.py install --prefix=${DESTDIR}${PREFIX}
-+	${MKDIR} -p ${DESTDIR}${PREFIX}/share/wsjt
-+	${INSTALL} -m 0644 CALL3.TXT ${DESTDIR}${PREFIX}/share/wsjt/
-+	${INSTALL} -m 0644 wsjtrc ${DESTDIR}${PREFIX}/share/wsjt/
-+	${INSTALL} -m 0644 dmet_*.dat ${DESTDIR}${PREFIX}/share/wsjt/
-+	${INSTALL} wsjt ${DESTDIR}${PREFIX}/bin
+ MV			?= 	mv
+
+# Compiler Information
+ CC			?= 	@CC@
+FC			:=	@FC@
+FCV			:=	@FCV@
+FC_LIB_PATH	=	@FC_LIB_PATH@
+
+ MKDIR		?= 	mkdir
+ RM			?=	@RM@
+ INSTALL		=	install
+@@ -51,7 +57,7 @@ FC			=	@FC@
+ FCV			=	@FCV@
+ FC_LIB_PATH	+=	@FC_LIB_PATH@
 
- deb: wsjt.py WsjtMod/Audio.so WsjtMod/g.py WsjtMod/__init__.py \
- 	WsjtMod/options.py WsjtMod/palettes.py WsjtMod/PmwBlt.py \
+-LDFLAGS		+=	-L${FC_LIB_PATH}
+#LDFLAGS		+=	"-L${FC_LIB_PATH}"
+ 
+ OBJS1 =	a2d.o abc441.o alignmsg.o ana932.o analytic.o astro.o \
+ 	avecho.o avemsg4.o avemsg65.o avemsg6m.o avesp2.o azdist.o \
+@@ -97,12 +103,11 @@ F2PYSRCS = ftn_init.f90 ftn_quit.f90 aud
+ 	 azdist0.f90 astro0.f90 chkt0.f90
+ 
+ WsjtMod/Audio.so: libjt.a ${F2PYSRCS} 
+-	${F2PY} -c -I. --fcompiler=gnu95 --f77exec=gfortran --f90exec=gfortran \
+-	--opt="-cpp -fbounds-check -O2" ${LDFLAGS} \
+	${F2PY} -c -I. --fcompiler=${FCV} --f77exec=${FC} --f90exec=${FC} \
+	--opt="-cpp -fbounds-check" ${LDFLAGS} \
+ 	${LIBS} libjt.a -m Audio ftn_init.f90 ftn_quit.f90 \
+ 	audio_init.f90 spec.f90 getfile.f90 azdist0.f90 \
+ 	astro0.f90 chkt0.f90
+-	
+ 	${MV} Audio*.so WsjtMod/Audio.so
+ 
+ .PHONY : clean
--- a/comms/wsjt/files/patch-WsjtMod_specjt.py
+++ b/comms/wsjt/files/patch-WsjtMod_specjt.py
@ -1,45 +0,0 @@
--- WsjtMod/specjt.py.orig	2011-09-13 12:56:59.000000000 -0700
-+++ WsjtMod/specjt.py	2015-01-09 04:04:37.000000000 -0800
-@@ -11,13 +11,9 @@
- import cPickle
- import tkMessageBox
- 
-try:
-    from numpy.oldnumeric import zeros, multiarray
-#    print "specjt importing from numpy"
-except:
-    from Numeric import zeros, multiarray
-#    print "specjt importing from Numeric"
-import Image, ImageTk, ImageDraw
-+from numpy import zeros
-+from numpy.core import multiarray
-+from PIL import Image, ImageTk, ImageDraw
- from palettes import colormapblue, colormapgray0, colormapHot, \
-      colormapAFMHot, colormapgray1, colormapLinrad, Colormap2Palette
- #import wsjt                         #Is this OK to do?
-@@ -76,7 +72,7 @@
- ttot=0.0
- 
- c=Canvas()
-a=zeros(225000,'s')
-+a=zeros(225000,'uint16')
- im=Image.new('P',(750,300))
- line0=Image.new('P',(750,1))      #Image fragment for top line of waterfall
- draw=ImageDraw.Draw(im)
-@@ -330,11 +326,14 @@
-             except:
-                 print "Images did not match, continuing anyway."
-             for i in range(n):
-                line0.putdata(a[750*i:750*(i+1)])   #One row of pixels to line0
-+                for j in range(0, 749):
-+                    line0.putpixel((j,0), a[750*i+j])
-                 im.paste(line0,(0,i))               #Paste in new top line
-             nscroll=nscroll+n
-         else:                                   #A scale factor has changed
-            im.putdata(a)                       #Compute whole new image
-+            for i in range(0, 300):
-+                for j in range(0, 749):
-+                    im.putpixel((j,i), a[750*i+j])
-             b0=brightness                       #Save scale values
-             c0=contrast
-             logm0=logm
--- a/comms/wsjt/files/patch-aclocal.m4
+++ b/comms/wsjt/files/patch-aclocal.m4
@ -1,10 +1,44 @@
--- aclocal.m4.orig	2014-07-28 21:23:20.000000000 -0400
-+++ aclocal.m4	2014-07-28 21:26:51.000000000 -0400
-@@ -212,4 +212,7 @@
+--- aclocal.m4.orig	2009-05-17 12:27:34 UTC
+++ aclocal.m4
+@@ -175,41 +175,6 @@ if test $[{HAS_PORTAUDIO_H}] -eq 1 -a $[
+ 	else
+ 		HAS_PORTAUDIO=1
 	fi
+-else
+-	AC_MSG_RESULT([portaudio not found trying FreeBSD paths ])
+-	portaudio_lib_dir="/usr/local/lib/portaudio2"
+-	portaudio_include_dir="/usr/local/include/portaudio2"
+-dnl
+-dnl Try again to make sure portaudio dirs are valid
+-dnl
+-	AC_MSG_CHECKING([for a v19 portaudio in FreeBSD paths.])
+-	HAS_PORTAUDIO_H=0
+-	HAS_PORTAUDIO_LIB=0
+-
+-	if test -e $[{portaudio_include_dir}]/portaudio.h; then
+-		HAS_PORTAUDIO_H=1
+-	fi
+-
+-	if test -e $[{portaudio_lib_dir}]/libportaudio.so \
+-	    -o -e $[{portaudio_lib_dir}]/libportaudio.a;then
+-		HAS_PORTAUDIO_LIB=1
+-	fi
+-
+-	if test $[{HAS_PORTAUDIO_H}] -eq 1 -a $[{HAS_PORTAUDIO_LIB}] -eq 1; then
+-		AC_MSG_RESULT([found portaudio in FreeBSD paths, double checking it is v19 ])
+-		LDFLAGS="-L$[{portaudio_lib_dir}] $[{LDFLAGS}]"
+-		LIBS="$[{LIBS}] -lportaudio"
+-		CPPFLAGS="-I$[{portaudio_include_dir}] $[{CPPFLAGS}]"
+-		AC_CHECK_LIB(portaudio, Pa_GetVersion, \
+-			[HAS_PORTAUDIO_VERSION=1], [HAS_PORTAUDIO_VERSION=0])
+-		if test $[{HAS_PORTAUDIO_VERSION}] -eq 0; then
+-			AC_MSG_RESULT([How did you end up with a portaudio v18 here?])
+-		else
+-			AC_MSG_RESULT([found v19])
+-			HAS_PORTAUDIO=1
+-			HAS_PORTAUDIO_H=1
+-		fi
+-	fi
 fi
 
-+AC_SUBST([PORTAUDIO_INCLUDE], ["-I${portaudio_include_dir}"])
-+AC_SUBST([PORTAUDIO_LIBDIR], ["-L${portaudio_lib_dir}"])
-+
 ])dnl }}}
--- a/comms/wsjt/files/patch-wsjt
+++ b/comms/wsjt/files/patch-wsjt
@ -1,15 +0,0 @@
--- wsjt.orig	2014-07-29 12:03:47.000000000 -0400
-+++ wsjt	2014-07-29 12:03:40.000000000 -0400
-@@ -1,5 +1,5 @@
- #!/bin/sh
-if [ -e /usr/local/bin/python ] ; then
-+if [ -e /usr/local/bin/python2 ] ; then
- 	LOCALBASE=/usr/local/
- else
- 	LOCALBASE=/usr/
-@@ -16,4 +16,4 @@
- 	cp -f ${LOCALBASE}/share/wsjt/dmet_10_-1_3.dat ~/.wsjt
- fi
- cd ~/.wsjt
-python ${LOCALBASE}/bin/wsjt.py
-+python2 ${LOCALBASE}/bin/wsjt.py
--- a/comms/wsjt/files/patch-wsjt.py
+++ b/comms/wsjt/files/patch-wsjt.py
@ -1,19 +0,0 @@
--- wsjt.py.orig	2012-01-26 12:01:08.000000000 -0500
-+++ wsjt.py	2014-12-15 21:21:29.000000000 -0500
-@@ -10,14 +10,9 @@
- import os,time
- from WsjtMod import Audio
- from math import log10
-try:
-    from numpy.oldnumeric import zeros
-#    print "importing from numpy"
-except: 
-    from Numeric import zeros
-#    print "importing from Numeric"
-+from numpy import zeros
- import dircache
-import Image,ImageTk  #, ImageDraw
-+from PIL import Image, ImageTk #, ImageDraw
- from WsjtMod.palettes import colormapblue, colormapgray0, colormapHot, \
-      colormapAFMHot, colormapgray1, colormapLinrad, Colormap2Palette
- from types import *
--- a/comms/wsjt/files/wsjt
+++ b/comms/wsjt/files/wsjt
@ -0,0 +1,61 @@
+#!/bin/sh
+#-------------------------------------------------------------------------------
+# This file is part of the WSJT application, Weak Signal Propogation Reporter
+#
+# File Name:    wsjt.sh
+# Description:  Shell script wrapper to update or copy files from system install
+# 
+# Copyright (C) 2001-2014 Joseph Taylor, K1JT
+# License: GNU GPL v3
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 3 of the License, or (at your option) any later
+# version.
+#
+# This program 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
+# Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+#-------------------------------------------------------------------------------
+
+set -e
+
+copyur() {
+        for f in $1/*;do
+        	if [ ! -e `basename $f` ]; then
+			if [ ! -d $f ]; then
+				cp $f .
+			fi
+		elif [ $f -nt `basename $f` ]; then
+			if [ ! -d `basename $f` ]; then
+	                        cp $f .
+			fi
+                fi
+        done
+}
+
+# set dir's
+_HOMEDIR="/home/$USER/.wsjt"
+export PATH=$PATH:/compat/linux/bin
+
+# update out of date files
+if [  -e $_HOMEDIR ] ; then 
+	cd $_HOMEDIR
+	copyur %%LOCALBASE%%/share/wsjt
+	cd $_HOMEDIR/WsjtMod
+        copyur %%LOCALBASE%%/lib/wsjt/WsjtMod
+	cd $_HOMEDIR
+else
+# if _HOMEDIR does not exist make it
+  mkdir  $_HOMEDIR
+  cp -R %%LOCALBASE%%/share/wsjt/* $_HOMEDIR cp -R %%LOCALBASE%%/lib/wsjt/* $_HOMEDIR
+fi
+
+cd $_HOMEDIR
+%%PYTHON%% -O wsjt.py
--- a/comms/wsjt/pkg-plist
+++ b/comms/wsjt/pkg-plist
@ -1,37 +1,75 @@
 bin/wsjt
-bin/wsjt.py
 %%DATADIR%%/CALL3.TXT
 %%DATADIR%%/dmet_10_-1_3.dat
 %%DATADIR%%/dmet_10_0_3.dat
 %%DATADIR%%/dmet_20_-2_2.dat
 %%DATADIR%%/dmet_20_-3_2.dat
+%%DATADIR%%/Pmw.py
+%%DATADIR%%/PmwBlt.py
+%%DATADIR%%/PmwColor.py
+%%DATADIR%%/wsjt.py
 %%DATADIR%%/wsjtrc
-%%PORTDOCS%%%%DOCSDIR%%/LICENSE.TXT
-%%PORTDOCS%%%%DOCSDIR%%/UpdateHistory.txt
-%%PORTDOCS%%%%DOCSDIR%%/WSJT_Quick_Reference.pdf
-%%PORTDOCS%%%%DOCSDIR%%/WSJT_Source_Code.txt
-%%PORTDOCS%%%%DOCSDIR%%/WSJT_User_600.pdf
-%%PYTHON_SITELIBDIR%%/WsjtMod/Audio.so
-%%PYTHON_SITELIBDIR%%/WsjtMod/__init__.py
-%%PYTHON_SITELIBDIR%%/WsjtMod/__init__.pyc
-%%PYTHON_SITELIBDIR%%/WsjtMod/Pmw.py
-%%PYTHON_SITELIBDIR%%/WsjtMod/Pmw.pyc
-%%PYTHON_SITELIBDIR%%/WsjtMod/PmwBlt.py
-%%PYTHON_SITELIBDIR%%/WsjtMod/PmwBlt.pyc
-%%PYTHON_SITELIBDIR%%/WsjtMod/PmwColor.py
-%%PYTHON_SITELIBDIR%%/WsjtMod/PmwColor.pyc
-%%PYTHON_SITELIBDIR%%/WsjtMod/astro.py
-%%PYTHON_SITELIBDIR%%/WsjtMod/astro.pyc
-%%PYTHON_SITELIBDIR%%/WsjtMod/g.py
-%%PYTHON_SITELIBDIR%%/WsjtMod/g.pyc
-%%PYTHON_SITELIBDIR%%/WsjtMod/go.py
-%%PYTHON_SITELIBDIR%%/WsjtMod/go.pyc
-%%PYTHON_SITELIBDIR%%/WsjtMod/options.py
-%%PYTHON_SITELIBDIR%%/WsjtMod/options.pyc
-%%PYTHON_SITELIBDIR%%/WsjtMod/palettes.py
-%%PYTHON_SITELIBDIR%%/WsjtMod/palettes.pyc
-%%PYTHON_SITELIBDIR%%/WsjtMod/smeter.py
-%%PYTHON_SITELIBDIR%%/WsjtMod/smeter.pyc
-%%PYTHON_SITELIBDIR%%/WsjtMod/specjt.py
-%%PYTHON_SITELIBDIR%%/WsjtMod/specjt.pyc
-%%PYTHON_SITELIBDIR%%/Wsjt-WSJT.Version.%%VERSION%%_.by.K1JT-py%%PYVER%%.egg-info
+%%PORTDOCS%%%%DOCSDIR%%/common/communication.adoc
+%%PORTDOCS%%%%DOCSDIR%%/common/license.adoc
+%%PORTDOCS%%%%DOCSDIR%%/common/links.adoc
+%%PORTDOCS%%%%DOCSDIR%%/theme/wsjt/wsjt.css
+%%PORTDOCS%%%%DOCSDIR%%/user_guide/acknowledgments.adoc
+%%PORTDOCS%%%%DOCSDIR%%/user_guide/astrodata.adoc
+%%PORTDOCS%%%%DOCSDIR%%/user_guide/compiling.adoc
+%%PORTDOCS%%%%DOCSDIR%%/user_guide/controls.adoc
+%%PORTDOCS%%%%DOCSDIR%%/user_guide/coop_programs.adoc
+%%PORTDOCS%%%%DOCSDIR%%/user_guide/echo.adoc
+%%PORTDOCS%%%%DOCSDIR%%/user_guide/faq.adoc
+%%PORTDOCS%%%%DOCSDIR%%/user_guide/files.adoc
+%%PORTDOCS%%%%DOCSDIR%%/user_guide/images/AstroData.png
+%%PORTDOCS%%%%DOCSDIR%%/user_guide/images/BandMenu.png
+%%PORTDOCS%%%%DOCSDIR%%/user_guide/images/DecodeMenu.png
+%%PORTDOCS%%%%DOCSDIR%%/user_guide/images/FileMenu.png
+%%PORTDOCS%%%%DOCSDIR%%/user_guide/images/HelpMenu.png
+%%PORTDOCS%%%%DOCSDIR%%/user_guide/images/KeyboardShortcuts.png
+%%PORTDOCS%%%%DOCSDIR%%/user_guide/images/MainButtons.png
+%%PORTDOCS%%%%DOCSDIR%%/user_guide/images/Main_Center.png
+%%PORTDOCS%%%%DOCSDIR%%/user_guide/images/Main_Left.png
+%%PORTDOCS%%%%DOCSDIR%%/user_guide/images/Main_Right.png
+%%PORTDOCS%%%%DOCSDIR%%/user_guide/images/ModeMenu.png
+%%PORTDOCS%%%%DOCSDIR%%/user_guide/images/MouseCommands.png
+%%PORTDOCS%%%%DOCSDIR%%/user_guide/images/SaveMenu.png
+%%PORTDOCS%%%%DOCSDIR%%/user_guide/images/SetupMenu.png
+%%PORTDOCS%%%%DOCSDIR%%/user_guide/images/SpecJT_Controls.png
+%%PORTDOCS%%%%DOCSDIR%%/user_guide/images/SpecJT_DL7UAE.png
+%%PORTDOCS%%%%DOCSDIR%%/user_guide/images/StatusBar.png
+%%PORTDOCS%%%%DOCSDIR%%/user_guide/images/VK7MO_10GHz.png
+%%PORTDOCS%%%%DOCSDIR%%/user_guide/images/VK7MO_10GHz_2.png
+%%PORTDOCS%%%%DOCSDIR%%/user_guide/images/ViewMenu.png
+%%PORTDOCS%%%%DOCSDIR%%/user_guide/images/WhatMessage.png
+%%PORTDOCS%%%%DOCSDIR%%/user_guide/images/console.png
+%%PORTDOCS%%%%DOCSDIR%%/user_guide/images/echo.png
+%%PORTDOCS%%%%DOCSDIR%%/user_guide/images/jt4_Templates.png
+%%PORTDOCS%%%%DOCSDIR%%/user_guide/images/jt65.png
+%%PORTDOCS%%%%DOCSDIR%%/user_guide/images/jt6m.png
+%%PORTDOCS%%%%DOCSDIR%%/user_guide/images/options.png
+%%PORTDOCS%%%%DOCSDIR%%/user_guide/images/prefixes.png
+%%PORTDOCS%%%%DOCSDIR%%/user_guide/images/wsjt9.7_main.png
+%%PORTDOCS%%%%DOCSDIR%%/user_guide/implementation.adoc
+%%PORTDOCS%%%%DOCSDIR%%/user_guide/installation.adoc
+%%PORTDOCS%%%%DOCSDIR%%/user_guide/installed-files.adoc
+%%PORTDOCS%%%%DOCSDIR%%/user_guide/introduction.adoc
+%%PORTDOCS%%%%DOCSDIR%%/user_guide/make-qso.adoc
+%%PORTDOCS%%%%DOCSDIR%%/user_guide/measure.adoc
+%%PORTDOCS%%%%DOCSDIR%%/user_guide/protocols.adoc
+%%PORTDOCS%%%%DOCSDIR%%/user_guide/setup.adoc
+%%PORTDOCS%%%%DOCSDIR%%/user_guide/system-requirements.adoc
+%%PORTDOCS%%%%DOCSDIR%%/user_guide/tutorial.adoc
+%%PORTDOCS%%%%DOCSDIR%%/user_guide/utilities.adoc
+%%PORTDOCS%%%%DOCSDIR%%/user_guide/wsjt-main.adoc
+%%PORTDOCS%%%%DOCSDIR%%/wsjt-jtsdk2.conf
+%%PORTDOCS%%%%DOCSDIR%%/wsjt.conf.in
+lib/wsjt/WsjtMod/Audio.so
+lib/wsjt/WsjtMod/__init__.py
+lib/wsjt/WsjtMod/astro.py
+lib/wsjt/WsjtMod/g.py
+lib/wsjt/WsjtMod/go.py
+lib/wsjt/WsjtMod/options.py
+lib/wsjt/WsjtMod/palettes.py
+lib/wsjt/WsjtMod/smeter.py
+lib/wsjt/WsjtMod/specjt.py
--- a/converters/p5-LaTeXML/Makefile
+++ b/converters/p5-LaTeXML/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	LaTeXML
 PORTVERSION=	0.8.1
+PORTREVISION=	1
 CATEGORIES=	converters perl5
 MASTER_SITES=	http://dlmf.nist.gov/LaTeXML/releases/
 PKGNAMEPREFIX=	p5-
@ -33,8 +34,7 @@ USE_PERL5=	configure
 USE_TEX=	kpathsea
 NO_BUILD=	yes

-DOCS=		Changes INSTALL MANIFEST README manual.pdf
-PORTDOCS=	*
+PORTDOCS=		Changes INSTALL MANIFEST README manual.pdf

 OPTIONS_DEFINE=	DOCS

@ -47,7 +47,7 @@ post-install:

 .if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 .endif

 .include <bsd.port.mk>
--- a/converters/p5-LaTeXML/pkg-descr
+++ b/converters/p5-LaTeXML/pkg-descr
@ -1,6 +1,6 @@
-LaTeXML is a TeX and LaTeX to XML/HTML/MathML converter.
-From XML it can generate various flavors of HTML.
-MathML and ePub, with other formats under development.
+LaTeXML is a TeX and LaTeX to XML/HTML/MathML converter. From XML it 
+can generate various flavors of HTML. MathML and ePub, with other 
+formats under development.

 See the included manual.pdf for an documentation.

--- a/databases/elixir-calecto/Makefile
+++ b/databases/elixir-calecto/Makefile
@ -1,9 +1,8 @@
 # $FreeBSD$

 PORTNAME=	calecto
-PORTVERSION=	0.3.6
+PORTVERSION=	0.3.8
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
 CATEGORIES=	databases
 PKGNAMEPREFIX=	elixir-

--- a/databases/elixir-calecto/distinfo
+++ b/databases/elixir-calecto/distinfo
@ -1,2 +1,2 @@
-SHA256 (lau-calecto-v0.3.6_GH0.tar.gz) = bd4378edd7456979058d284050ec2f95aba0f363233be6ef61d695efdab52f62
-SIZE (lau-calecto-v0.3.6_GH0.tar.gz) = 7695
+SHA256 (lau-calecto-v0.3.8_GH0.tar.gz) = 19bf13aad80ae620e9b13a38041bc7668decb053695f31915f2509b02ed9e6f0
+SIZE (lau-calecto-v0.3.8_GH0.tar.gz) = 9566
--- a/databases/elixir-calecto/pkg-plist
+++ b/databases/elixir-calecto/pkg-plist
@ -4,6 +4,7 @@ lib/elixir/lib/calecto/ebin/Elixir.Calecto.DateTimeUTC.beam
 lib/elixir/lib/calecto/ebin/Elixir.Calecto.Model.beam
 lib/elixir/lib/calecto/ebin/Elixir.Calecto.NaiveDateTime.beam
 lib/elixir/lib/calecto/ebin/Elixir.Calecto.Time.beam
+lib/elixir/lib/calecto/ebin/Elixir.Calecto.Utils.beam
 lib/elixir/lib/calecto/ebin/Elixir.Calecto.beam
 lib/elixir/lib/calecto/ebin/Elixir.Mix.Tasks.Calecto.AddTypeMigration.beam
 lib/elixir/lib/calecto/ebin/calecto.app
@ -14,5 +15,6 @@ lib/elixir/lib/calecto/lib/calecto/date_time_utc.ex
 lib/elixir/lib/calecto/lib/calecto/model.ex
 lib/elixir/lib/calecto/lib/calecto/naive_date_time.ex
 lib/elixir/lib/calecto/lib/calecto/time.ex
+lib/elixir/lib/calecto/lib/calecto/utils.ex
 lib/elixir/lib/calecto/lib/mix/tasks/calecto.add_type_migration.ex
 %%PORTDOCS%%%%DOCSDIR%%/README.md
--- a/databases/elixir-ecto/Makefile
+++ b/databases/elixir-ecto/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	ecto
-PORTVERSION=	0.14.3
+PORTVERSION=	0.16.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	databases
 PKGNAMEPREFIX=	elixir-
@ -15,10 +15,26 @@ USES=		elixir
 USE_GITHUB=	yes
 GH_ACCOUNT=	elixir-lang

+OPTIONS_DEFINE=	POSTGREX MARIAEX
+OPTIONS_SUB=	yes
+POSTGREX_DESC=	PostgreSQL adapter support
+MARIAEX_DESC=	MySQL adapter support
+
 MIX_BUILD_NAME=	shared
 MIX_BUILD_DEPS=	devel/elixir-decimal \
 		devel/elixir-poison \
 		devel/erlang-poolboy
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MPOSTGREX}
+MIX_BUILD_DEPS+=databases/elixir-postgrex
+.endif
+
+.if ${PORT_OPTIONS:MMARIAEX}
+MIX_BUILD_DEPS+=databases/elixir-mariaex
+.endif
+
 MIX_RUN_DEPS:=	${MIX_BUILD_DEPS}
 MIX_REWRITE=	yes

--- a/databases/elixir-ecto/distinfo
+++ b/databases/elixir-ecto/distinfo
@ -1,2 +1,2 @@
-SHA256 (elixir-lang-ecto-v0.14.3_GH0.tar.gz) = e23bcdb7a31505ae5fdb18b83ce612d3632680aee8859bbb76eb5d61f51e6dfe
-SIZE (elixir-lang-ecto-v0.14.3_GH0.tar.gz) = 191285
+SHA256 (elixir-lang-ecto-v0.16.0_GH0.tar.gz) = 05ebfd64bdc30aa7470389129ca03d4977d627e9fa49f699d065286303a3224c
+SIZE (elixir-lang-ecto-v0.16.0_GH0.tar.gz) = 208076
--- a/databases/elixir-ecto/pkg-plist
+++ b/databases/elixir-ecto/pkg-plist
@ -3,7 +3,10 @@ lib/elixir/lib/ecto/ebin/Elixir.Ecto.Adapter.Storage.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.Adapter.Transaction.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.Adapter.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.Adapters.Connection.beam
+%%MARIAEX%%lib/elixir/lib/ecto/ebin/Elixir.Ecto.Adapters.MySQL.Connection.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.Adapters.MySQL.beam
+%%POSTGREX%%lib/elixir/lib/ecto/ebin/Elixir.Ecto.Adapters.Postgres.Connection.beam
+%%POSTGREX%%lib/elixir/lib/ecto/ebin/Elixir.Ecto.Adapters.Postgres.DateTime.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.Adapters.Postgres.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.Adapters.SQL.Query.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.Adapters.SQL.Sandbox.beam
@ -15,9 +18,11 @@ lib/elixir/lib/ecto/ebin/Elixir.Ecto.Association.NotLoaded.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.Association.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.CastError.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.ChangeError.beam
+lib/elixir/lib/ecto/ebin/Elixir.Ecto.Changeset.Relation.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.Changeset.beam
+lib/elixir/lib/ecto/ebin/Elixir.Ecto.ConstraintError.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.Date.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.DateTime.Util.beam
+lib/elixir/lib/ecto/ebin/Elixir.Ecto.DateTime.Utils.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.DateTime.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.Embedded.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.InvalidChangesetError.beam
@ -31,7 +36,6 @@ lib/elixir/lib/ecto/ebin/Elixir.Ecto.Migration.Table.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.Migration.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.MigrationError.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.Migrator.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.MissingPrimaryKeyError.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.Model.Autogenerate.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.Model.Callbacks.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.Model.Dependent.beam
@ -39,7 +43,8 @@ lib/elixir/lib/ecto/ebin/Elixir.Ecto.Model.OptimisticLock.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.Model.Timestamps.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.Model.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.MultipleResultsError.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.NoPrimaryKeyError.beam
+lib/elixir/lib/ecto/ebin/Elixir.Ecto.NoPrimaryKeyFieldError.beam
+lib/elixir/lib/ecto/ebin/Elixir.Ecto.NoPrimaryKeyValueError.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.NoResultsError.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.Pool.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.Pools.Poolboy.Worker.beam
@ -48,6 +53,7 @@ lib/elixir/lib/ecto/ebin/Elixir.Ecto.Pools.SojournBroker.CoDel.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.Pools.SojournBroker.Timeout.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.Pools.SojournBroker.Worker.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.Pools.SojournBroker.beam
+lib/elixir/lib/ecto/ebin/Elixir.Ecto.Query.API.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.Query.Builder.Distinct.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.Query.Builder.Filter.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.Query.Builder.From.beam
@ -74,10 +80,10 @@ lib/elixir/lib/ecto/ebin/Elixir.Ecto.Queryable.Ecto.Query.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.Queryable.Tuple.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.Queryable.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.Repo.Assoc.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.Repo.Config.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.Repo.Model.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.Repo.Preloader.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.Repo.Queryable.beam
+lib/elixir/lib/ecto/ebin/Elixir.Ecto.Repo.Supervisor.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.Repo.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.Schema.Metadata.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.Schema.beam
@ -86,11 +92,13 @@ lib/elixir/lib/ecto/ebin/Elixir.Ecto.Storage.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.Time.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.Type.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.UUID.beam
+lib/elixir/lib/ecto/ebin/Elixir.Ecto.UnmachedRelationError.beam
 lib/elixir/lib/ecto/ebin/Elixir.Ecto.beam
 lib/elixir/lib/ecto/ebin/Elixir.Inspect.Ecto.Association.NotLoaded.beam
 lib/elixir/lib/ecto/ebin/Elixir.Inspect.Ecto.Date.beam
 lib/elixir/lib/ecto/ebin/Elixir.Inspect.Ecto.DateTime.beam
 lib/elixir/lib/ecto/ebin/Elixir.Inspect.Ecto.Query.beam
+lib/elixir/lib/ecto/ebin/Elixir.Inspect.Ecto.Schema.Metadata.beam
 lib/elixir/lib/ecto/ebin/Elixir.Inspect.Ecto.Time.beam
 lib/elixir/lib/ecto/ebin/Elixir.Mix.Ecto.beam
 lib/elixir/lib/ecto/ebin/Elixir.Mix.Tasks.Ecto.Create.beam
@ -123,6 +131,7 @@ lib/elixir/lib/ecto/lib/ecto/adapters/sql/query.ex
 lib/elixir/lib/ecto/lib/ecto/adapters/sql/sandbox.ex
 lib/elixir/lib/ecto/lib/ecto/association.ex
 lib/elixir/lib/ecto/lib/ecto/changeset.ex
+lib/elixir/lib/ecto/lib/ecto/changeset/relation.ex
 lib/elixir/lib/ecto/lib/ecto/datetime.ex
 lib/elixir/lib/ecto/lib/ecto/embedded.ex
 lib/elixir/lib/ecto/lib/ecto/exceptions.ex
@ -146,6 +155,7 @@ lib/elixir/lib/ecto/lib/ecto/pools/sojourn_broker/codel.ex
 lib/elixir/lib/ecto/lib/ecto/pools/sojourn_broker/timeout.ex
 lib/elixir/lib/ecto/lib/ecto/pools/sojourn_broker/worker.ex
 lib/elixir/lib/ecto/lib/ecto/query.ex
+lib/elixir/lib/ecto/lib/ecto/query/api.ex
 lib/elixir/lib/ecto/lib/ecto/query/builder.ex
 lib/elixir/lib/ecto/lib/ecto/query/builder/distinct.ex
 lib/elixir/lib/ecto/lib/ecto/query/builder/filter.ex
@ -163,10 +173,10 @@ lib/elixir/lib/ecto/lib/ecto/query/planner.ex
 lib/elixir/lib/ecto/lib/ecto/queryable.ex
 lib/elixir/lib/ecto/lib/ecto/repo.ex
 lib/elixir/lib/ecto/lib/ecto/repo/assoc.ex
-lib/elixir/lib/ecto/lib/ecto/repo/config.ex
 lib/elixir/lib/ecto/lib/ecto/repo/model.ex
 lib/elixir/lib/ecto/lib/ecto/repo/preloader.ex
 lib/elixir/lib/ecto/lib/ecto/repo/queryable.ex
+lib/elixir/lib/ecto/lib/ecto/repo/supervisor.ex
 lib/elixir/lib/ecto/lib/ecto/schema.ex
 lib/elixir/lib/ecto/lib/ecto/storage.ex
 lib/elixir/lib/ecto/lib/ecto/type.ex
--- a/databases/elixir-ecto_migrate/Makefile
+++ b/databases/elixir-ecto_migrate/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	ecto_migrate
-PORTVERSION=	0.5.0
+PORTVERSION=	0.6.1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	databases
 PKGNAMEPREFIX=	elixir-
--- a/databases/elixir-ecto_migrate/distinfo
+++ b/databases/elixir-ecto_migrate/distinfo
@ -1,2 +1,2 @@
-SHA256 (xerions-ecto_migrate-v0.5.0_GH0.tar.gz) = bb714cef6a1b12edd5fedb90a6878bb4ca9240c71e02a6379b85e950f7a9dea4
-SIZE (xerions-ecto_migrate-v0.5.0_GH0.tar.gz) = 7540
+SHA256 (xerions-ecto_migrate-v0.6.1_GH0.tar.gz) = f93e19f7c1de8333804342ef29da6e2658030bb8dcbbe5f14e7de62bac26a205
+SIZE (xerions-ecto_migrate-v0.6.1_GH0.tar.gz) = 7701
--- a/databases/elixir-geo/Makefile
+++ b/databases/elixir-geo/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	geo
-PORTVERSION=	0.15.1
+PORTVERSION=	0.15.2
 DISTVERSIONPREFIX=	v
 CATEGORIES=	databases
 PKGNAMEPREFIX=	elixir-
--- a/databases/elixir-geo/distinfo
+++ b/databases/elixir-geo/distinfo
@ -1,2 +1,2 @@
-SHA256 (bryanjos-geo-v0.15.1_GH0.tar.gz) = b30b0acf719f90df2e5fdb2ed15565f2b9ff17eff2ab5e278dc2e8c4f92f8059
-SIZE (bryanjos-geo-v0.15.1_GH0.tar.gz) = 15311
+SHA256 (bryanjos-geo-v0.15.2_GH0.tar.gz) = 25b0d3725b2fd2f70fca6a64b49f7dcfc819c9d733c2fab9f6814200fcac98bc
+SIZE (bryanjos-geo-v0.15.2_GH0.tar.gz) = 15564
--- a/databases/elixir-mariaex/Makefile
+++ b/databases/elixir-mariaex/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	mariaex
-PORTVERSION=	0.4.2
+PORTVERSION=	0.4.3
 DISTVERSIONPREFIX=	v
 CATEGORIES=	databases
 PKGNAMEPREFIX=	elixir-
@ -17,5 +17,6 @@ GH_ACCOUNT=	xerions

 MIX_BUILD_DEPS=	devel/elixir-decimal
 MIX_RUN_DEPS:=	${MIX_BUILD_DEPS}
+MIX_REWRITE=	yes

 .include <bsd.port.mk>
--- a/databases/elixir-mariaex/distinfo
+++ b/databases/elixir-mariaex/distinfo
@ -1,2 +1,2 @@
-SHA256 (xerions-mariaex-v0.4.2_GH0.tar.gz) = cfc4e017f0f7466a5db53e1d2711f22b33a27ac8447cdab4b59a01ed2cbce2b5
-SIZE (xerions-mariaex-v0.4.2_GH0.tar.gz) = 17277
+SHA256 (xerions-mariaex-v0.4.3_GH0.tar.gz) = e31e65e200f522fd66f7f12853b83ae1cc174867b53609b9e4e9c872094f98c2
+SIZE (xerions-mariaex-v0.4.3_GH0.tar.gz) = 17643
--- a/databases/elixir-mariaex/files/patch-mix.exs
+++ b/databases/elixir-mariaex/files/patch-mix.exs
@ -1,11 +0,0 @@
--- mix.exs.orig	2015-07-02 11:00:37 UTC
-+++ mix.exs
-@@ -18,7 +18,7 @@ defmodule Mariaex.Mixfile do
-   end
- 
-   defp deps do
-    [{:decimal, "~> 1.0"}]
-+    []
-   end
- 
-   defp description do
--- a/databases/fpc-fpindexer/Makefile
+++ b/databases/fpc-fpindexer/Makefile
@ -1,14 +1,14 @@
 # Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
 # $FreeBSD$

-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases lang
 PKGNAMESUFFIX=	-fpindexer

 MAINTAINER=	freebsd-fpc@FreeBSD.org
 COMMENT=	Database indexer with database/flat file backend

-USE_FPC=	chm fcl-base fcl-db
+USE_FPC=	chm fcl-base fcl-db fcl-xml ibase sqlite

 MASTERDIR=	${.CURDIR}/../../lang/fpc
 WRKUNITDIR=	${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
--- a/databases/jdbm2/Makefile
+++ b/databases/jdbm2/Makefile
@ -19,7 +19,6 @@ JAVA_VERSION=	1.6+
 NO_BUILD=	yes

 PROJECTHOST=	jdbm2
-LATEST_LINK=	jdbm2

 PORTDOCS=	*
 PORTEXAMPLES=	*
--- a/databases/luasql-mysql/Makefile
+++ b/databases/luasql-mysql/Makefile
@ -53,7 +53,6 @@ MAKE_ARGS+=	DRIVER_LIBS="-L ${LOCALBASE}/lib -lsqlite3" \
 IGNORE=		unknown or unsupported luasql driver
 .endif

-LATEST_LINK=	${PORTNAME}-${LUASQL_DRIVER}
 PLIST_SUB+=	LUASQL_DRIVER=${LUASQL_DRIVER}

 do-install:
--- a/databases/mariadb-client/Makefile
+++ b/databases/mariadb-client/Makefile
@ -4,8 +4,6 @@ PORTNAME=	mariadb
 PORTREVISION=	7
 PKGNAMESUFFIX=	53-client

-UNIQUENAME=	${PORTNAME}${PKGNAMESUFFIX}
-
 COMMENT=	Database client - drop-in replacement for MySQL

 MASTERDIR=	${.CURDIR}/../mariadb-server
--- a/databases/mariadb-scripts/Makefile
+++ b/databases/mariadb-scripts/Makefile
@ -7,7 +7,6 @@ COMMENT=	Scripts for mariadb - drop-in replacement for MySQL

 LICENSE=	GPLv2

-UNIQUENAME=	${PORTNAME}${PKGNAMESUFFIX}
 USES=		perl5

 MASTERDIR=	${.CURDIR}/../mariadb-server
--- a/databases/mariadb-server/Makefile
+++ b/databases/mariadb-server/Makefile
@ -20,8 +20,6 @@ COMMENT=	Database server - drop-in replacement for MySQL

 LICENSE=	GPLv2

-UNIQUENAME=	${PORTNAME}${PKGNAMESUFFIX}
-
 CONFLICTS?=	mariadb5[4-9]-server-* \
 		mariadb1[0-9][0-9]-server-* \
 		mysql*-server-* \
--- a/databases/mariadb100-server/Makefile
+++ b/databases/mariadb100-server/Makefile
@ -21,7 +21,6 @@ LICENSE=	GPLv2
 SUB_FILES=	pkg-message
 PKGMESSAGE=	${WRKDIR}/pkg-message

-UNIQUENAME=	${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
 SLAVEDIRS=	databases/mariadb100-client
 USES=		bison:build cmake execinfo gmake shebangfix cpe
 USE_LDCONFIG=	${PREFIX}/lib/mysql ${PREFIX}/lib/mysql/plugin
--- a/databases/p5-BDB/Makefile
+++ b/databases/p5-BDB/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	BDB
 PORTVERSION=	1.90
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MLEHMANN
@ -30,4 +30,7 @@ USES=		perl5
 post-patch:
 	@${REINPLACE_CMD} -e '18 s|-ldb|-l${BDB_LIB_NAME}|' ${WRKSRC}/Makefile.PL

+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/BDB/BDB.so
+
 .include <bsd.port.mk>
--- a/databases/p5-Dancer-Plugin-Database-Core/Makefile
+++ b/databases/p5-Dancer-Plugin-Database-Core/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	Dancer-Plugin-Database-Core
-PORTVERSION=	0.11
+PORTVERSION=	0.12
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
--- a/databases/p5-Dancer-Plugin-Database-Core/distinfo
+++ b/databases/p5-Dancer-Plugin-Database-Core/distinfo
@ -1,2 +1,2 @@
-SHA256 (Dancer-Plugin-Database-Core-0.11.tar.gz) = 511e99b7501eacb082334e8ba5a5f9152af6d14bd4947eef6c872e27b65eaf20
-SIZE (Dancer-Plugin-Database-Core-0.11.tar.gz) = 15460
+SHA256 (Dancer-Plugin-Database-Core-0.12.tar.gz) = 7b9bae84d4cacb11fa9eae6ffc441c16511867e79d958d828b492b836ac2dad1
+SIZE (Dancer-Plugin-Database-Core-0.12.tar.gz) = 15625
--- a/databases/p5-Search-Xapian/Makefile
+++ b/databases/p5-Search-Xapian/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	Search-Xapian
 PORTVERSION=	1.2.21.0
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	http://oligarchy.co.uk/xapian/${PORTVERSION:R}/ \
 		LOCAL/sunpoet \
@ -29,4 +30,7 @@ USES=		perl5
 post-patch:
 	@${REINPLACE_CMD} -e 's|^if (defined $$builddir) {|if (0) {|' ${WRKSRC}/Makefile.PL

+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Search/Xapian/Xapian.so
+
 .include <bsd.port.mk>
--- a/databases/pear-DoctrineDBAL/Makefile
+++ b/databases/pear-DoctrineDBAL/Makefile
@ -16,7 +16,6 @@ RUN_DEPENDS=	${PEARDIR}/.channels/pear.doctrine-project.org.reg:${PORTSDIR}/deve
 	${PEARDIR}/Doctrine/Common/Version.php:${PORTSDIR}/databases/pear-DoctrineCommon \
 	${PEARDIR}/Symfony/Component/Console/Application.php:${PORTSDIR}/devel/pear-Symfony_Component_Console

-OPTIONSFILE?=	${PORT_DBDIR}/pear-${PORTNAME}/options
 OPTIONS_DEFINE=	DBLIB MYSQL ODBC PGSQL SQLITE
 OPTIONS_DEFAULT=MYSQL

--- a/databases/proftpd-mod_sql_mysql/Makefile
+++ b/databases/proftpd-mod_sql_mysql/Makefile
@ -12,7 +12,6 @@ LICENSE=	GPLv2

 DESCR=		${.CURDIR}/pkg-descr

-LATEST_LINK=	${PKGNAMEPREFIX}-${PORTNAME}
 MASTERDIR=	${.CURDIR}/../../ftp/proftpd

 USE_MYSQL=	yes
--- a/databases/proftpd-mod_sql_odbc/Makefile
+++ b/databases/proftpd-mod_sql_odbc/Makefile
@ -14,7 +14,6 @@ LIB_DEPENDS=	libiodbc.so:${PORTSDIR}/databases/libiodbc

 DESCR=		${.CURDIR}/pkg-descr

-LATEST_LINK=	${PKGNAMEPREFIX}-${PORTNAME}
 MASTERDIR=	${.CURDIR}/../../ftp/proftpd

 CONFIGURE_ARGS=	LIBS=-liodbc \
--- a/databases/proftpd-mod_sql_sqlite/Makefile
+++ b/databases/proftpd-mod_sql_sqlite/Makefile
@ -13,7 +13,6 @@ LICENSE=	GPLv2

 DESCR=		${.CURDIR}/pkg-descr

-LATEST_LINK=	${PKGNAMEPREFIX}-${PORTNAME}
 MASTERDIR=	${.CURDIR}/../../ftp/proftpd

 USE_SQLITE=	yes
--- a/databases/proftpd-mod_sql_tds/Makefile
+++ b/databases/proftpd-mod_sql_tds/Makefile
@ -14,7 +14,6 @@ LICENSE=	GPLv2

 DESCR=		${.CURDIR}/pkg-descr

-LATEST_LINK=	${PKGNAMEPREFIX}-${PORTNAME}
 MASTERDIR=	${.CURDIR}/../../ftp/proftpd

 LIB_DEPENDS+=	libsybdb.so.5:${PORTSDIR}/databases/freetds
--- a/databases/py-MySQLdb/Makefile
+++ b/databases/py-MySQLdb/Makefile
@ -23,7 +23,6 @@ PORTDOCS=	*
 DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
 WRKSRC=		${WRKDIR}/${PORTNAME}1-${PORTNAME}-${PORTVERSION}

-OPTIONSFILE=	${PORT_DBDIR}/${PORTNAME}/options
 OPTIONS_DEFINE=		DOCS MYSQLCLIENT_R
 OPTIONS_DEFAULT=	MYSQLCLIENT_R
 MYSQLCLIENT_R_DESC=	Use libmysqlclient_r (thread safe)
--- a/databases/py-pyPgSQL/Makefile
+++ b/databases/py-pyPgSQL/Makefile
@ -25,9 +25,6 @@ OPTIONS_DEFINE=	BYTEA_CONN EXAMPLES DOCS
 OPTIONS_DEFAULT=	BYTEA_CONN
 BYTEA_CONN_DESC=	Apply Bytea connection patch

-# bypass infrastructure bug
-OPTIONSFILE=	${PORT_DBDIR}/py-${PORTNAME}/options
-
 .include <bsd.port.options.mk>

 .if ${PORT_OPTIONS:MBYTEA_CONN}
--- a/databases/py-sqlalchemy-devel/Makefile
+++ b/databases/py-sqlalchemy-devel/Makefile
@ -32,9 +32,6 @@ OPTIONS_DEFAULT=	SQLITE
 SYBASE_DESC=	Sybase backend
 TESTS_DESC=	Include nose for unit tests

-# bypass infrastructure bug
-OPTIONSFILE=	${PORT_DBDIR}/py-${PORTNAME}/options
-
 MSSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mssql>0:${PORTSDIR}/databases/py-mssql
 PGSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psycopg2>=2.0.8:${PORTSDIR}/databases/py-psycopg2
 SQLITE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3
--- a/databases/py-sqlalchemy/Makefile
+++ b/databases/py-sqlalchemy/Makefile
@ -32,9 +32,6 @@ MSSQL_DESC=	MS SQL Server backend
 TESTS_DESC=	Include nose for unit tests
 SYBASE_DESC=	Sybase backend

-# bypass infrastructure bug
-OPTIONSFILE=	${PORT_DBDIR}/py-${PORTNAME}/options
-
 .include <bsd.port.options.mk>

 DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
--- a/databases/py-sqlalchemy06/Makefile
+++ b/databases/py-sqlalchemy06/Makefile
@ -18,9 +18,6 @@ LICENSE=	MIT
 USES=		python
 USE_PYTHON=	distutils autoplist

-# bypass infrastructure bug
-OPTIONSFILE=	${PORT_DBDIR}/py-${PORTNAME}/options
-
 OPTIONS_DEFINE=	CEXTENSIONS DOCS EXAMPLES NOSE

 OPTIONS_MULTI=	BACKEND
--- a/databases/ruby-bdb/Makefile
+++ b/databases/ruby-bdb/Makefile
@ -20,7 +20,6 @@ LICENSE=	RUBY
 USE_BDB=	yes

 OPTIONS_DEFINE=	DOCS EXAMPLES
-OPTIONSFILE=	${PORT_DBDIR}/ruby-${PORTNAME}/options

 USE_RUBY=		yes
 USE_RUBY_EXTCONF=	yes
--- a/databases/rubygem-activerecord/Makefile
+++ b/databases/rubygem-activerecord/Makefile
@ -26,7 +26,6 @@ OPTIONS_DEFINE=	MYSQL PGSQL SQLITE3
 MYSQL_DESC=	Use native MySQL bindings
 PGSQL_DESC=	Use native PostgreSQL bindings
 SQLITE3_DESC=	Use native SQLite3 bindings
-OPTIONSFILE=	${PORT_DBDIR}/rubygem-${PORTNAME}/options

 GEM_ENV+=	LANG=en_US.UTF-8

--- a/databases/sqliteman/Makefile
+++ b/databases/sqliteman/Makefile
@ -14,7 +14,6 @@ LIB_DEPENDS=	libqscintilla2.so:${PORTSDIR}/devel/qscintilla2

 USES=		cmake
 USE_SQLITE=	yes
-CMAKE_ENV+=	QMAKESPEC=${QMAKESPEC}
 USE_QT4=	qmake_build gui moc_build rcc_build uic_build xml sql

 GNU_CONFIGURE=	yes
--- a/databases/squirrel-sql/Makefile
+++ b/databases/squirrel-sql/Makefile
@ -20,7 +20,7 @@ WRKSRC=		${WRKDIR}/${DISTNAME}

 SUB_FILES=	squirrel-sql

-DATADIR=	${PREFIX}/share/java/${UNIQUENAME}
+DATADIR=	${PREFIX}/share/java/${PKGBASE}

 DESKTOP_ENTRIES="Squirrel-SQL Client" \
 		"${COMMENT}" \
--- a/databases/tora/Makefile
+++ b/databases/tora/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	tora
 PORTVERSION=	2.1.3
-PORTREVISION=	9
+PORTREVISION=	10
 PORTEPOCH=	1
 CATEGORIES=	databases
 MASTER_SITES=	SF
@ -21,7 +21,7 @@ OPTIONS_DEFINE=	PGSQL MYSQL DOCS
 OPTIONS_DEFINE_i386=	ORACLE
 OPTIONS_DEFAULT=	PGSQL MYSQL

-USE_QT4=	gui corelib sql xml network linguist moc_build uic_build rcc_build
+USE_QT4=	corelib gui sql xml network moc_build uic_build rcc_build
 USES=		autoreconf gmake libtool makeinfo
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-pcre=${LOCALBASE}
@ -30,29 +30,20 @@ INSTALL_TARGET=	install-strip

 PREFIX2FIX=	doc/help/preferences.texi doc/help/preferences.html

-.include <bsd.port.options.mk>
+DOCS_USES=	makeinfo
+DOCS_INFO=	tora

-.if ${PORT_OPTIONS:MDOCS}
-USES+=		makeinfo
-INFO=		tora
-.endif
-
-.if ${PORT_OPTIONS:MMYSQL}
-RUN_DEPENDS+=	${QT_PLUGINDIR}/sqldrivers/libqsqlmysql.so:${PORTSDIR}/databases/qt4-mysql-plugin
-.endif
-
-.if ${PORT_OPTIONS:MPGSQL}
-RUN_DEPENDS+=	${QT_PLUGINDIR}/sqldrivers/libqsqlpsql.so:${PORTSDIR}/databases/qt4-pgsql-plugin
-.endif
-
-.if ${PORT_OPTIONS:MORACLE}
-BUILD_DEPENDS+=	${ORACLE_HOME}/lib/libclntsh.a:${PORTSDIR}/databases/oracle8-client
-RUN_DEPENDS+=	${ORACLE_HOME}/network/admin/tnsnames.ora:${PORTSDIR}/databases/oracle8-client
+MYSQL_RUN_DEPENDS=	${QT_PLUGINDIR}/sqldrivers/libqsqlmysql.so:${PORTSDIR}/databases/qt4-mysql-plugin
+PGSQL_RUN_DEPENDS=	${QT_PLUGINDIR}/sqldrivers/libqsqlpsql.so:${PORTSDIR}/databases/qt4-pgsql-plugin

 ORACLE_HOME?=	${LOCALBASE}/oracle8-client
 ORACLE_VER=	8i	# Client version
-CONFIGURE_ARGS+=	--with-oracle=${ORACLE_HOME} --with-oci-version=${ORACLE_VER:tu}
-.endif
+
+ORACLE_BUILD_DEPENDS=	${ORACLE_HOME}/lib/libclntsh.a:${PORTSDIR}/databases/oracle8-client
+ORACLE_RUN_DEPENDS=	${ORACLE_HOME}/network/admin/tnsnames.ora:${PORTSDIR}/databases/oracle8-client
+ORACLE_CONFIGURE_ON=	--with-oracle=${ORACLE_HOME} --with-oci-version=${ORACLE_VER:tu}
+
+.include <bsd.port.options.mk>

 post-patch:
 .if ${PORT_OPTIONS:MDOCS}
--- a/databases/tora/files/patch-config_m4_oracle.m4
+++ b/databases/tora/files/patch-config_m4_oracle.m4
@ -1,6 +1,6 @@
--- config/m4/oracle.m4.orig	2008-05-14 19:07:34.000000000 +0200
-+++ config/m4/oracle.m4	2009-05-07 19:15:56.463399933 +0200
-@@ -113,6 +113,11 @@
+--- config/m4/oracle.m4.orig	2009-10-23 16:19:57 UTC
+++ config/m4/oracle.m4
+@@ -113,6 +113,11 @@ Please install the instant client sdk pa
         ora_cflags="$ora_cflags -I$dir"
         echo "adding -I$dir" >&AS_MESSAGE_LOG_FD()
       fi
--- a/databases/tora/files/patch-configure
+++ b/databases/tora/files/patch-configure
@ -1,6 +1,6 @@
--- configure.orig	2008-11-03 21:33:32.000000000 +0100
-+++ configure	2009-05-07 19:58:09.238375523 +0200
-@@ -25140,6 +25140,11 @@
+--- configure.orig	2010-09-19 17:15:52 UTC
+++ configure
+@@ -17436,6 +17436,11 @@ Please install the instant client sdk pa
         ora_cflags="$ora_cflags -I$dir"
         echo "adding -I$dir" >&5
       fi
--- a/databases/tora/files/patch-configure.ac
+++ b/databases/tora/files/patch-configure.ac
@ -1,6 +1,6 @@
--- configure.ac.orig	2008-09-14 23:54:41.000000000 +0200
-+++ configure.ac	2009-05-07 19:16:01.329388208 +0200
-@@ -54,6 +54,9 @@
+--- configure.ac.orig	2010-06-06 19:50:46 UTC
+++ configure.ac
+@@ -57,6 +57,9 @@ TORA_CHECK_QSCINTILLA
 AX_PATH_LIB_PCRE
 AM_PATH_CPPUNIT([1.10.2], found_cppunit=yes)
 AM_CONDITIONAL([CPPUNIT], [test "x$found_cppunit" = "xyes"])
--- a/databases/tora/files/patch-doc_Makefile.am
+++ b/databases/tora/files/patch-doc_Makefile.am
@ -1,6 +1,6 @@
--- doc/Makefile.am.orig	2008-07-30 15:50:50.000000000 +0200
-+++ doc/Makefile.am	2009-05-10 18:04:15.478423171 +0200
-@@ -3,19 +3,20 @@
+--- doc/Makefile.am.orig	2009-10-23 16:19:55 UTC
+++ doc/Makefile.am
+@@ -3,19 +3,20 @@ EXTRA_DIST = help
 dist-hook:
 	rm -rf `find $(distdir) -name .svn`
 
--- a/databases/tora/files/patch-doc_help_tora.texi
+++ b/databases/tora/files/patch-doc_help_tora.texi
@ -1,5 +1,5 @@
--- doc/help/tora.texi.orig	2008-09-14 23:54:41.000000000 +0200
-+++ doc/help/tora.texi	2009-05-07 21:36:32.058998814 +0200
+--- doc/help/tora.texi.orig	2010-07-18 10:48:45 UTC
+++ doc/help/tora.texi
@@ -7,6 +7,10 @@
 @c @image{images/tora_manual}
 @c %**end of header
@ -9,5 +9,5 @@
 +@end direntry
 +
 @copying
- This manual is for TOra, version 1.4.0.
+ This manual is for TOra, version 2.1.3+.
 @end copying
--- a/databases/tora/files/patch-src_Makefile.am
+++ b/databases/tora/files/patch-src_Makefile.am
@ -1,6 +1,6 @@
--- src/Makefile.am.orig	2010-09-19 20:07:44.000000000 +0200
-+++ src/Makefile.am	2010-11-01 23:01:57.000000000 +0100
-@@ -37,7 +37,7 @@
+--- src/Makefile.am.orig	2010-09-19 18:07:44 UTC
+++ src/Makefile.am
+@@ -37,7 +37,7 @@ AM_LDFLAGS = $(PCRE_LIBS) \
 # fix for annoying automake naming problems.
 tora_CXXFLAGS  = $(AM_CXXFLAGS)
 
@ -9,7 +9,7 @@
 
 if HAVE_ORACLE
 EXTRA_ORACLE_MONO_SOURCE = tooracleconnection.cpp tooraclesetting.h \
-@@ -439,6 +439,7 @@
+@@ -439,6 +439,7 @@ BUILT_SOURCES = \
     moc_tobrowserdblinkswidget.cpp \
     moc_tobrowserdirectorieswidget.cpp \
     moc_toresultgrants.cpp \
--- a/databases/tora/files/patch-src_toextract.cpp
+++ b/databases/tora/files/patch-src_toextract.cpp
@ -1,4 +1,4 @@
--- src/toextract.cpp.orig	2010-02-02 18:25:43.000000000 +0000
+--- src/toextract.cpp.orig	2010-02-02 18:25:43 UTC
 +++ src/toextract.cpp
@@ -39,6 +39,7 @@
  *
--- a/databases/tora/files/patch-src_toextract.h
+++ b/databases/tora/files/patch-src_toextract.h
@ -1,16 +1,18 @@
--- src/toextract.h	2010-02-02 13:25:43.000000000 -0500
-+++ src/toextract.h	2015-03-08 20:14:45.000000000 -0400
-@@ -783,5 +783,5 @@
+--- src/toextract.h.orig	2010-02-02 18:25:43 UTC
+++ src/toextract.h
+@@ -782,13 +782,13 @@ public:
+         }
         /** Implement sort order based only on Order field.
          */
 -        bool operator <(const columnInfo &inf)
 +        bool operator <(const columnInfo &inf) const
         {
             return Order < inf.Order;
-@@ -789,5 +789,5 @@
+         }
         /** Implement sort order based only on Order field.
          */
 -        bool operator ==(const columnInfo &inf)
 +        bool operator ==(const columnInfo &inf) const
         {
             return Order == inf.Order;
+         }
--- a/databases/tora/files/patch-src_tooracleconnection.cpp
+++ b/databases/tora/files/patch-src_tooracleconnection.cpp
@ -1,6 +1,6 @@
--- src/tooracleconnection.cpp.orig	2008-10-29 16:59:11.000000000 +0100
-+++ src/tooracleconnection.cpp	2009-05-07 19:16:09.390371657 +0200
-@@ -57,7 +57,6 @@
+--- src/tooracleconnection.cpp.orig	2010-09-19 09:27:38 UTC
+++ src/tooracleconnection.cpp
+@@ -58,7 +58,6 @@
 
 #define OTL_STL
 #define OTL_EXCEPTION_ENABLE_ERROR_OFFSET
--- a/databases/tora/files/patch-src_topiechart.h
+++ b/databases/tora/files/patch-src_topiechart.h
@ -1,5 +1,5 @@
--- ./src/topiechart.h.orig	2009-10-23 18:19:33.000000000 +0200
-+++ ./src/topiechart.h	2014-07-21 19:25:58.000000000 +0200
+--- src/topiechart.h.orig	2009-10-23 16:19:33 UTC
+++ src/topiechart.h
@@ -44,6 +44,7 @@
 
 #include "config.h"
--- a/databases/tora/files/patch-src_toreport.cpp
+++ b/databases/tora/files/patch-src_toreport.cpp
@ -1,4 +1,4 @@
--- src/toreport.cpp.orig	2010-01-14 16:39:02.000000000 +0000
+--- src/toreport.cpp.orig	2010-01-14 16:39:02 UTC
 +++ src/toreport.cpp
@@ -39,6 +39,7 @@
  *
--- a/deskutils/cairo-dock-plugins/Makefile
+++ b/deskutils/cairo-dock-plugins/Makefile
@ -2,7 +2,7 @@

 PORTNAME=	cairo-dock-plugins
 PORTVERSION=	3.4.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	deskutils

 MAINTAINER=	fidaj@ukr.net
--- a/deskutils/cdcat/Makefile
+++ b/deskutils/cdcat/Makefile
@ -23,7 +23,7 @@ CONFIGURE_WRKSRC=	${WRKSRC}/src
 BUILD_WRKSRC=	${CONFIGURE_WRKSRC}

 USES=		libtool qmake:norecursive tar:bzip2
-USE_QT4=	corelib gui xml linguist_build moc_build uic_build
+USE_QT4=	corelib gui xml linguisttools_build moc_build uic_build
 QMAKE_ARGS=	LIBS+="${LOCALBASE}/lib/libcryptopp.a" \
 		LIBS+="-lz -lbz2 -ltar -lexif -lmediainfo -lzen" \
 		DEFINES+="MEDIAINFO_STATIC" \
--- a/deskutils/gworkspace-gwmetadata/Makefile
+++ b/deskutils/gworkspace-gwmetadata/Makefile
@ -22,7 +22,6 @@ USE_LDCONFIG=	${GNUSTEP_SYSTEM_LIBRARIES}
 USE_SQLITE=	yes
 LDFLAGS+=	-lpthread

-UNIQUENAME=	${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
 WRKSRC=		${WRKDIR}/gworkspace-${PORTVERSION}/GWMetadata
 CONFIGURE_ARGS+=	--with-sqlite-include=${LOCALBASE}/include
 CONFIGURE_ARGS+=	--with-sqlite-library=${LOCALBASE}/lib
--- a/deskutils/ladon/Makefile
+++ b/deskutils/ladon/Makefile
@ -10,6 +10,8 @@ COMMENT=	Utility to process many files in parallel

 LICENSE=	MIT

+BROKEN=		does not build
+
 BUILD_DEPENDS=	npm>0:${PORTSDIR}/www/npm
 RUN_DEPENDS=	npm>0:${PORTSDIR}/www/npm

--- a/deskutils/nemo-extensions/Makefile
+++ b/deskutils/nemo-extensions/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	nemo-extensions
 PORTVERSION=	2.4.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	deskutils gnome
 DIST_SUBDIR=	gnome3

@ -13,9 +13,6 @@ COMMENT=	File manager extensions for the Cinnamon desktop
 BUILD_DEPENDS=	gnome-icon-theme>=0:${PORTSDIR}/misc/gnome-icon-theme \
 		gtkdocize:${PORTSDIR}/textproc/gtk-doc \
 		rst2html:${PORTSDIR}/textproc/py-docutils \
-		automake>=0:${PORTSDIR}/devel/automake \
-		autoconf>=0:${PORTSDIR}/devel/autoconf \
-		libtool:${PORTSDIR}/devel/libtool \
 		gnome-autogen.sh:${PORTSDIR}/devel/gnome-common \
 		${LOCALBASE}/libdata/pkgconfig/gsettings-desktop-schemas.pc:${PORTSDIR}/devel/gsettings-desktop-schemas
 LIB_DEPENDS=	libexif.so:${PORTSDIR}/graphics/libexif \
@ -28,21 +25,19 @@ LIB_DEPENDS=	libexif.so:${PORTSDIR}/graphics/libexif \
 		libevdocument3.so:${PORTSDIR}/graphics/evince \
 		libclutter-gtk-1.0.so:${PORTSDIR}/graphics/clutter-gtk3 \
 		libclutter-gst-2.0.so:${PORTSDIR}/multimedia/clutter-gst \
-		libmusicbrainz5.so:${PORTSDIR}/audio/libmusicbrainz5 \
-		libwebkitgtk-3.0.so:${PORTSDIR}/www/webkit-gtk3
+		libmusicbrainz5.so:${PORTSDIR}/audio/libmusicbrainz5
 RUN_DEPENDS=	gnome-icon-theme>=0:${PORTSDIR}/misc/gnome-icon-theme \
 		gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas

-BROKEN_FreeBSD_9=	does not build
-
 USE_GITHUB=	yes
 GH_ACCOUNT=	linuxmint
 GH_TAGNAME=	6c8ec3a

 USE_GNOME=	gconf2 gnomeprefix gnomedocutils gtksourceview3 intlhack \
 		introspection:build libxml2 pygtk2
-USES=		gettext gmake libtool pathfix pkgconfig shebangfix
-SHEBANG_FILES=  nemo-dropbox/dropbox.in
+USES=		autoreconf:build gettext gmake libtool pathfix pkgconfig \
+		shebangfix
+SHEBANG_FILES=	nemo-dropbox/dropbox.in
 INSTALLS_ICONS=	yes
 USE_LDCONFIG=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
@ -56,6 +51,8 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|AM_GNU_GETTEXT_VERSION(\[0.17\])||g ;\
 		s|AM_GNU_GETTEXT(\[external\])||g' \
 		${WRKSRC}/nemo-preview/configure.ac
+	@${REINPLACE_CMD} -e 's|webkitgtk-3.0||' \
+		${WRKSRC}/nemo-preview/configure.ac

 do-configure:
 .for i in ${NON_AUTO_EXTENSIONS}
--- a/deskutils/parcellite/Makefile
+++ b/deskutils/parcellite/Makefile
@ -2,8 +2,7 @@
 # $FreeBSD$

 PORTNAME=	parcellite
-PORTVERSION=	1.1.7
-PORTREVISION=	1
+PORTVERSION=	1.1.9
 PORTEPOCH=	1
 CATEGORIES=	deskutils
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
@ -12,37 +11,52 @@ MAINTAINER=	koalative@gmail.com
 COMMENT=	Lightweight GTK+ clipboard manager

 LICENSE=	GPLv3
+LICENSE_FILE=	${WRKSRC}/COPYING

-BUILD_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
-
-USES=		gettext-tools gmake pkgconfig
+USES=		pkgconfig
 GNU_CONFIGURE=	yes
-USE_GNOME=	gtk20 intltool
+USE_GNOME=	glib20 gtk20 pango
+USE_XORG=	x11
+CONFIGURE_ARGS+=--disable-appindicator

 PORTDOCS=	AUTHORS ChangeLog README

+CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 LIBS+=		-lgio-2.0

-OPTIONS_DEFINE= DOCS NLS
+OPTIONS_DEFINE=	DOCS NLS
 OPTIONS_SUB=	yes

-NLS_CONFIGURE_ENABLE=	nls
-NLS_USES=	gettext-runtime
+NLS_USES=	gmake gettext
+NLS_USE=	GNOME=intltool
+NLS_USES_OFF=	autoreconf
+NLS_EXTRA_PATCHES_OFF=	${PATCHDIR}/extrapatch-configure.ac
 NLS_LIBS=	-lintl

 SUB_FILES=	pkg-message

-.include <bsd.port.options.mk>
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|"/proc/|"/compat/linux/proc/|; \
-		s|"/proc"|"/compat/linux/proc"|' \
-		${WRKSRC}/src/utils.c
-.if ${PORT_OPTIONS:MNLS}
+post-patch-NLS-on:
 	@${REINPLACE_CMD} -e 's|$$(DATADIRNAME)/locale|share/locale|' \
 		${WRKSRC}/po/Makefile.in.in
-.endif
+
+post-patch-NLS-off:
+	@${REINPLACE_CMD} -e 's|@INTLTOOL_DESKTOP_RULE@||' \
+		${WRKSRC}/data/Makefile.am
+	@${REINPLACE_CMD} -e 's|_Name|Name|' -e 's|_Comment|Comment|' \
+		${WRKSRC}/data/parcellite-startup.desktop.in \
+		${WRKSRC}/data/parcellite.desktop.in
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|/proc|/compat/linux/proc|g' \
+		${WRKSRC}/src/utils.c
+
+pre-build-NLS-off:
+	@${REINPLACE_CMD} -e '/SUBDIRS = /s| po||' ${WRKSRC}/Makefile
+	${MV} ${WRKSRC}/data/parcellite-startup.desktop.in \
+		${WRKSRC}/data/parcellite-startup.desktop
+	${MV} ${WRKSRC}/data/parcellite.desktop.in \
+		${WRKSRC}/data/parcellite.desktop

 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
--- a/deskutils/parcellite/distinfo
+++ b/deskutils/parcellite/distinfo
@ -1,2 +1,2 @@
-SHA256 (parcellite-1.1.7.tar.gz) = 870f3789f247b200a609cb6dbefa42204779b2575a9dafa5b90828d2fce05f5f
-SIZE (parcellite-1.1.7.tar.gz) = 723826
+SHA256 (parcellite-1.1.9.tar.gz) = cba89585082eebbe848ac1c0023cc71a0184c0db24ebc5f8a21039e46d7f11d4
+SIZE (parcellite-1.1.9.tar.gz) = 720177
--- a/deskutils/parcellite/files/extrapatch-configure.ac
+++ b/deskutils/parcellite/files/extrapatch-configure.ac
@ -0,0 +1,162 @@
+--- configure.ac.orig	2014-10-01 14:43:09 UTC
+++ configure.ac
+@@ -19,15 +19,9 @@ GETTEXT_PACKAGE=parcellite
+ AC_SUBST(GETTEXT_PACKAGE)
+ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [gettext package])
+ 
+-ALL_LINGUAS="ca cs da de es fr hu it ja nb pl pl_PL pt_BR ro ru sv tr zh_CN"
+-AM_GLIB_GNU_GETTEXT()
+-AC_PROG_INTLTOOL([0.23])
+-
+ parcellitelocaledir='${prefix}/${DATADIRNAME}/locale'
+ AC_SUBST(parcellitelocaledir)
+ 
+-AM_GNU_GETTEXT([external])
+-
+ # -------------------------------------------------------------------------------
+ # Main settings.
+ # -------------------------------------------------------------------------------
+@@ -104,7 +98,7 @@ AC_CHECK_LIB([$gtk_libs],gtk_status_icon
+ # -------------------------------------------------------------------------------
+ # Checks for header files.
+ # -------------------------------------------------------------------------------
+-AC_CHECK_HEADERS([stdlib.h string.h pthread.h libintl.h])
+AC_CHECK_HEADERS([stdlib.h string.h pthread.h])
+ 
+ # -------------------------------------------------------------------------------
+ # Checks for typedefs, structures, and compiler characteristics.
+--- configure.ac.orig	2014-10-01 14:43:09 UTC
+++ configure.ac
+@@ -19,15 +19,9 @@ GETTEXT_PACKAGE=parcellite
+ AC_SUBST(GETTEXT_PACKAGE)
+ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [gettext package])
+ 
+-ALL_LINGUAS="ca cs da de es fr hu it ja nb pl pl_PL pt_BR ro ru sv tr zh_CN"
+-AM_GLIB_GNU_GETTEXT()
+-AC_PROG_INTLTOOL([0.23])
+-
+ parcellitelocaledir='${prefix}/${DATADIRNAME}/locale'
+ AC_SUBST(parcellitelocaledir)
+ 
+-AM_GNU_GETTEXT([external])
+-
+ # -------------------------------------------------------------------------------
+ # Main settings.
+ # -------------------------------------------------------------------------------
+@@ -104,7 +98,7 @@ AC_CHECK_LIB([$gtk_libs],gtk_status_icon
+ # -------------------------------------------------------------------------------
+ # Checks for header files.
+ # -------------------------------------------------------------------------------
+-AC_CHECK_HEADERS([stdlib.h string.h pthread.h libintl.h])
+AC_CHECK_HEADERS([stdlib.h string.h pthread.h])
+ 
+ # -------------------------------------------------------------------------------
+ # Checks for typedefs, structures, and compiler characteristics.
+--- configure.ac.orig	2014-10-01 14:43:09 UTC
+++ configure.ac
+@@ -19,15 +19,9 @@ GETTEXT_PACKAGE=parcellite
+ AC_SUBST(GETTEXT_PACKAGE)
+ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [gettext package])
+ 
+-ALL_LINGUAS="ca cs da de es fr hu it ja nb pl pl_PL pt_BR ro ru sv tr zh_CN"
+-AM_GLIB_GNU_GETTEXT()
+-AC_PROG_INTLTOOL([0.23])
+-
+ parcellitelocaledir='${prefix}/${DATADIRNAME}/locale'
+ AC_SUBST(parcellitelocaledir)
+ 
+-AM_GNU_GETTEXT([external])
+-
+ # -------------------------------------------------------------------------------
+ # Main settings.
+ # -------------------------------------------------------------------------------
+@@ -104,7 +98,7 @@ AC_CHECK_LIB([$gtk_libs],gtk_status_icon
+ # -------------------------------------------------------------------------------
+ # Checks for header files.
+ # -------------------------------------------------------------------------------
+-AC_CHECK_HEADERS([stdlib.h string.h pthread.h libintl.h])
+AC_CHECK_HEADERS([stdlib.h string.h pthread.h])
+ 
+ # -------------------------------------------------------------------------------
+ # Checks for typedefs, structures, and compiler characteristics.
+--- configure.ac.orig	2014-10-01 14:43:09 UTC
+++ configure.ac
+@@ -19,15 +19,9 @@ GETTEXT_PACKAGE=parcellite
+ AC_SUBST(GETTEXT_PACKAGE)
+ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [gettext package])
+ 
+-ALL_LINGUAS="ca cs da de es fr hu it ja nb pl pl_PL pt_BR ro ru sv tr zh_CN"
+-AM_GLIB_GNU_GETTEXT()
+-AC_PROG_INTLTOOL([0.23])
+-
+ parcellitelocaledir='${prefix}/${DATADIRNAME}/locale'
+ AC_SUBST(parcellitelocaledir)
+ 
+-AM_GNU_GETTEXT([external])
+-
+ # -------------------------------------------------------------------------------
+ # Main settings.
+ # -------------------------------------------------------------------------------
+@@ -104,7 +98,7 @@ AC_CHECK_LIB([$gtk_libs],gtk_status_icon
+ # -------------------------------------------------------------------------------
+ # Checks for header files.
+ # -------------------------------------------------------------------------------
+-AC_CHECK_HEADERS([stdlib.h string.h pthread.h libintl.h])
+AC_CHECK_HEADERS([stdlib.h string.h pthread.h])
+ 
+ # -------------------------------------------------------------------------------
+ # Checks for typedefs, structures, and compiler characteristics.
+--- configure.ac.orig	2014-10-01 14:43:09 UTC
+++ configure.ac
+@@ -19,15 +19,9 @@ GETTEXT_PACKAGE=parcellite
+ AC_SUBST(GETTEXT_PACKAGE)
+ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [gettext package])
+ 
+-ALL_LINGUAS="ca cs da de es fr hu it ja nb pl pl_PL pt_BR ro ru sv tr zh_CN"
+-AM_GLIB_GNU_GETTEXT()
+-AC_PROG_INTLTOOL([0.23])
+-
+ parcellitelocaledir='${prefix}/${DATADIRNAME}/locale'
+ AC_SUBST(parcellitelocaledir)
+ 
+-AM_GNU_GETTEXT([external])
+-
+ # -------------------------------------------------------------------------------
+ # Main settings.
+ # -------------------------------------------------------------------------------
+@@ -104,7 +98,7 @@ AC_CHECK_LIB([$gtk_libs],gtk_status_icon
+ # -------------------------------------------------------------------------------
+ # Checks for header files.
+ # -------------------------------------------------------------------------------
+-AC_CHECK_HEADERS([stdlib.h string.h pthread.h libintl.h])
+AC_CHECK_HEADERS([stdlib.h string.h pthread.h])
+ 
+ # -------------------------------------------------------------------------------
+ # Checks for typedefs, structures, and compiler characteristics.
+--- configure.ac.orig	2014-10-01 14:43:09 UTC
+++ configure.ac
+@@ -19,15 +19,9 @@ GETTEXT_PACKAGE=parcellite
+ AC_SUBST(GETTEXT_PACKAGE)
+ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [gettext package])
+ 
+-ALL_LINGUAS="ca cs da de es fr hu it ja nb pl pl_PL pt_BR ro ru sv tr zh_CN"
+-AM_GLIB_GNU_GETTEXT()
+-AC_PROG_INTLTOOL([0.23])
+-
+ parcellitelocaledir='${prefix}/${DATADIRNAME}/locale'
+ AC_SUBST(parcellitelocaledir)
+ 
+-AM_GNU_GETTEXT([external])
+-
+ # -------------------------------------------------------------------------------
+ # Main settings.
+ # -------------------------------------------------------------------------------
+@@ -104,7 +98,7 @@ AC_CHECK_LIB([$gtk_libs],gtk_status_icon
+ # -------------------------------------------------------------------------------
+ # Checks for header files.
+ # -------------------------------------------------------------------------------
+-AC_CHECK_HEADERS([stdlib.h string.h pthread.h libintl.h])
+AC_CHECK_HEADERS([stdlib.h string.h pthread.h])
+ 
+ # -------------------------------------------------------------------------------
+ # Checks for typedefs, structures, and compiler characteristics.
--- a/deskutils/parcellite/files/patch-src__main.c
+++ b/deskutils/parcellite/files/patch-src__main.c
@ -1,10 +0,0 @@
--- ./src/main.c.orig	2013-10-15 19:39:04.000000000 +0200
-+++ ./src/main.c	2013-12-31 15:12:54.000000000 +0100
-@@ -2097,6 +2097,7 @@
- 	}
- 	clip_lock= g_mutex_new();
- 	hist_lock= g_mutex_new();
-+	g_mutex_trylock(clip_lock);
- 	g_mutex_unlock(clip_lock);
- 
-   show_icon=!get_pref_int32("no_icon");
--- a/deskutils/plan/Makefile
+++ b/deskutils/plan/Makefile
@ -19,11 +19,6 @@ MAKE_ENV+=	DATADIR=${DATADIR} EXAMPLESDIR=${EXAMPLESDIR}

 OPTIONS_DEFINE=	DOCS

-.include <bsd.port.pre.mk>
-.if ${OSVERSION} > 900006
-EXTRA_PATCHES=	${PATCHDIR}/utmpx-src-daemon.c
-.endif
-
 do-install:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}

@ -53,4 +48,4 @@ post-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}/netplan.dir
 .endif

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/deskutils/plan/files/patch-utmpx-src-daemon.c
+++ b/deskutils/plan/files/patch-utmpx-src-daemon.c
--- a/Show more
+++ b/Show more