*/*: sync with upstream

Taken from: FreeBSD
2015-09-11 10:06:41 +02:00 · 2015-09-11 10:06:41 +02:00 · 292c1f4024
parent 06e69f030f
commit 292c1f4024
176 changed files with 2562 additions and 799 deletions
--- a/archivers/zopfli/Makefile
+++ b/archivers/zopfli/Makefile
@ -24,6 +24,8 @@ CFLAGS+=	-fPIC # XXX Convert into an implicit rule
 LDFLAGS+=	-lm
 USE_LDCONFIG=	yes

+MAKE_JOBS_UNSAFE=	yes
+
 do-install:
 .for f in ${PORTNAME} ${PORTNAME}png
 	${INSTALL_PROGRAM} ${WRKSRC}/${f} ${STAGEDIR}${PREFIX}/bin
--- a/audio/opus-tools/Makefile
+++ b/audio/opus-tools/Makefile
@ -2,7 +2,7 @@

 PORTNAME=	opus-tools
 PORTVERSION=	0.1.9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	http://downloads.xiph.org/releases/opus/ \
 		MOZILLA/opus
--- a/audio/opus-tools/files/patch-src_audio-in.c
+++ b/audio/opus-tools/files/patch-src_audio-in.c
@ -0,0 +1,85 @@
+--- src/audio-in.c.orig	2014-02-26 00:55:47 UTC
+++ src/audio-in.c
+@@ -42,6 +42,7 @@
+ # define _FILE_OFFSET_BITS 64
+ #endif
+ 
+#include <limits.h>
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
+@@ -287,13 +288,14 @@ static int aiff_permute_matrix[6][6] =
+ int aiff_open(FILE *in, oe_enc_opt *opt, unsigned char *buf, int buflen)
+ {
+     int aifc; /* AIFC or AIFF? */
+-    unsigned int len;
+-    unsigned char *buffer;
+    unsigned int len, readlen;
+    unsigned char buffer[22];
+     unsigned char buf2[8];
+     int bigendian = 1;
+     aiff_fmt format;
+     aifffile *aiff;
+     int i;
+    long channels;
+     (void)buflen;/*unused*/
+ 
+     if(buf[11]=='C')
+@@ -313,19 +315,25 @@ int aiff_open(FILE *in, oe_enc_opt *opt,
+         return 0; /* Weird common chunk */
+     }
+ 
+-    buffer = alloca(len);
+-
+-    if(fread(buffer,1,len,in) < len)
+    readlen = len < sizeof(buffer) ? len : sizeof(buffer);
+    if(fread(buffer,1,readlen,in) < readlen ||
+        (len > readlen && !seek_forward(in, len-readlen)))
+     {
+         fprintf(stderr, _("Warning: Unexpected EOF reading AIFF header\n"));
+         return 0;
+     }
+ 
+-    format.channels = READ_U16_BE(buffer);
+    format.channels = channels = READ_U16_BE(buffer);
+     format.totalframes = READ_U32_BE(buffer+2);
+     format.samplesize = READ_U16_BE(buffer+6);
+     format.rate = (int)read_IEEE80(buffer+8);
+ 
+    if(channels <= 0L || SHRT_MAX < channels)
+    {
+        fprintf(stderr, _("Warning: Unsupported count of channels in AIFF header\n"));
+        return 0;
+    }
+
+     if(aifc)
+     {
+         if(len < 22)
+@@ -442,6 +450,7 @@ int wav_open(FILE *in, oe_enc_opt *opt, 
+     wav_fmt format;
+     wavfile *wav;
+     int i;
+    long channels;
+     (void)buflen;/*unused*/
+     (void)oldbuf;/*unused*/
+ 
+@@ -481,12 +490,18 @@ int wav_open(FILE *in, oe_enc_opt *opt, 
+     }
+ 
+     format.format =      READ_U16_LE(buf);
+-    format.channels =    READ_U16_LE(buf+2);
+    format.channels = channels = READ_U16_LE(buf+2);
+     format.samplerate =  READ_U32_LE(buf+4);
+     format.bytespersec = READ_U32_LE(buf+8);
+     format.align =       READ_U16_LE(buf+12);
+     format.samplesize =  READ_U16_LE(buf+14);
+ 
+    if(channels <= 0L || SHRT_MAX < channels)
+    {
+        fprintf(stderr, _("Warning: Unsupported count of channels in WAV header\n"));
+        return 0;
+    }
+
+     if(format.format == -2) /* WAVE_FORMAT_EXTENSIBLE */
+     {
+       if(len<40)
--- a/audio/praat/Makefile
+++ b/audio/praat/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	praat
 PORTVERSION=	5.4.08
+PORTREVISION=	1
 CATEGORIES=	audio science
 MASTER_SITES=	http://www.fon.hum.uva.nl/praat/
 DISTNAME=	praat5408_sources
@ -13,7 +14,7 @@ COMMENT=	Phonetics by Computer
 LICENSE=	GPLv2

 DOS2UNIX_REGEX=	.*Makefile
-USES=		dos2unix iconv motif pkgconfig
+USES=		dos2unix iconv pkgconfig
 USE_GNOME=	gtk20
 WRKSRC=		${WRKDIR}/sources_5408
 MAKEFILE=	makefile
--- a/audio/py-mutagen/Makefile
+++ b/audio/py-mutagen/Makefile
@ -2,12 +2,12 @@
 # $FreeBSD$

 PORTNAME=	mutagen
-PORTVERSION=	1.29
+PORTVERSION=	1.31
 CATEGORIES=	audio python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}

-MAINTAINER=	johnson.peter@gmail.com
+MAINTAINER=	python@FreeBSD.org
 COMMENT=	Python-based audio metadata tag reader and writer

 LICENSE=	GPLv2
@ -15,5 +15,6 @@ LICENSE_FILE=	${WRKSRC}/COPYING

 USES=		python
 USE_PYTHON=	autoplist distutils
+NO_ARCH=	yes

 .include <bsd.port.mk>
--- a/audio/py-mutagen/distinfo
+++ b/audio/py-mutagen/distinfo
@ -1,2 +1,2 @@
-SHA256 (mutagen-1.29.tar.gz) = dbad61c8db882f849f25183448f21e440f5eceaf614dd8c2c5ae9392f33f599f
-SIZE (mutagen-1.29.tar.gz) = 879767
+SHA256 (mutagen-1.31.tar.gz) = 0aa011707785fe30935d8655380052a20ba8b972aa738d4f144c457b35b4d699
+SIZE (mutagen-1.31.tar.gz) = 897785
--- a/audio/tuxguitar/Makefile
+++ b/audio/tuxguitar/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	tuxguitar
 PORTVERSION=	1.2
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	audio java
 MASTER_SITES=	SF/${PORTNAME}/TuxGuitar/TuxGuitar-${PORTVERSION}:src \
 		LOCAL/gahr/:fluid \
@ -43,11 +43,10 @@ WRKSRC_SUBDIR=	TuxGuitar

 OPTIONS_DEFINE=	DOCS

-.include <bsd.port.pre.mk>
 PLUGINS=	ascii browser-ftp compat converter fluidsynth gervill gtp \
 		jsa lilypond midi musicxml oss pdf ptb tef tray tuner

-SUB_FILES=	tuxguitar
+SUB_FILES=	pkg-message tuxguitar
 SUB_LIST=	DATADIR=${DATADIR} \
 		PREFIX=${PREFIX} \
 		JAVALIBDIR=${JAVALIBDIR} \
@ -115,16 +114,8 @@ do-install:
 	# MAN page
 	${INSTALL_MAN} ${WRKSRC}/../misc/tuxguitar.1 ${STAGEDIR}${PREFIX}/man/man1

-post-install:
-.if ${PORT_OPTIONS:MDOCS}
+do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/doc && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR}
-.endif
-	@${ECHO}
-	@${ECHO} "SoundFonts for the FluidSynth plugin are available at:"
-	@${ECHO} "${DATADIR}/8MBGMSFX.SF2"
-	@${ECHO} "Add this path in the FluidSynth plugin configuration to"
-	@${ECHO} "enable them."
-	@${ECHO}

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/audio/tuxguitar/files/pkg-message.in
+++ b/audio/tuxguitar/files/pkg-message.in
@ -0,0 +1,7 @@
+
+SoundFonts for the FluidSynth plugin are available at:
+
+    %%DATADIR%%/8MBGMSFX.SF2
+
+Add this path in the FluidSynth plugin configuration to enable them.
+
--- a/audio/vorbis-tools/Makefile
+++ b/audio/vorbis-tools/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	vorbis-tools
 PORTVERSION=	1.4.0
-PORTREVISION=	9
+PORTREVISION=	10
 PORTEPOCH=	3
 CATEGORIES=	audio
 MASTER_SITES=	http://downloads.xiph.org/releases/vorbis/
--- a/audio/vorbis-tools/files/patch-oggenc_audio.c
+++ b/audio/vorbis-tools/files/patch-oggenc_audio.c
@ -1,6 +1,14 @@
 --- oggenc/audio.c.orig	2010-03-24 08:27:14 UTC
 +++ oggenc/audio.c
-@@ -245,8 +245,8 @@ static int aiff_permute_matrix[6][6] = 
+@@ -13,6 +13,7 @@
+ #include <config.h>
+ #endif
+ 
+#include <limits.h>
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
+@@ -245,12 +246,13 @@ static int aiff_permute_matrix[6][6] = 
 int aiff_open(FILE *in, oe_enc_opt *opt, unsigned char *buf, int buflen)
 {
     int aifc; /* AIFC or AIFF? */
@ -11,7 +19,12 @@
     unsigned char buf2[8];
     aiff_fmt format;
     aifffile *aiff = malloc(sizeof(aifffile));
-@@ -269,9 +269,9 @@ int aiff_open(FILE *in, oe_enc_opt *opt,
+     int i;
+    long channels;
+ 
+     if(buf[11]=='C')
+         aifc=1;
+@@ -269,19 +271,25 @@ int aiff_open(FILE *in, oe_enc_opt *opt,
         return 0; /* Weird common chunk */
     }
 
@ -24,3 +37,48 @@
     {
         fprintf(stderr, _("Warning: Unexpected EOF in reading AIFF header\n"));
         return 0;
+     }
+ 
+-    format.channels = READ_U16_BE(buffer);
+    format.channels = channels = READ_U16_BE(buffer);
+     format.totalframes = READ_U32_BE(buffer+2);
+     format.samplesize = READ_U16_BE(buffer+6);
+     format.rate = (int)read_IEEE80(buffer+8);
+ 
+    if(channels <= 0L || SHRT_MAX < channels)
+    {
+         fprintf(stderr, _("Warning: Unsupported count of channels in AIFF header\n"));
+         return 0;
+    }
+
+     aiff->bigendian = 1;
+ 
+     if(aifc)
+@@ -412,6 +420,7 @@ int wav_open(FILE *in, oe_enc_opt *opt, 
+     wav_fmt format;
+     wavfile *wav = malloc(sizeof(wavfile));
+     int i;
+    long channels;
+ 
+     /* Ok. At this point, we know we have a WAV file. Now we have to detect
+      * whether we support the subtype, and we have to find the actual data
+@@ -449,12 +458,18 @@ int wav_open(FILE *in, oe_enc_opt *opt, 
+     }
+ 
+     format.format =      READ_U16_LE(buf);
+-    format.channels =    READ_U16_LE(buf+2);
+    format.channels = channels = READ_U16_LE(buf+2);
+     format.samplerate =  READ_U32_LE(buf+4);
+     format.bytespersec = READ_U32_LE(buf+8);
+     format.align =       READ_U16_LE(buf+12);
+     format.samplesize =  READ_U16_LE(buf+14);
+ 
+    if(channels <= 0L || SHRT_MAX < channels)
+    {
+        fprintf(stderr, _("Warning: Unsupported count of channels in WAV header\n"));
+        return 0;
+    }
+
+     if(format.format == -2) /* WAVE_FORMAT_EXTENSIBLE */
+     {
+       if(len<40)
--- a/audio/vorbis-tools/files/patch-oggenc_oggenc.c
+++ b/audio/vorbis-tools/files/patch-oggenc_oggenc.c
@ -0,0 +1,21 @@
+--- oggenc/oggenc.c.orig	2010-03-26 07:07:07 UTC
+++ oggenc/oggenc.c
+@@ -97,6 +97,8 @@ int main(int argc, char **argv)
+               .3,-1,
+               0,0,0.f,
+               0, 0, 0, 0, 0};
+    input_format raw_format = {NULL, 0, raw_open, wav_close, "raw",
+      N_("RAW file reader")};
+ 
+     int i;
+ 
+@@ -239,9 +241,6 @@ int main(int argc, char **argv)
+ 
+         if(opt.rawmode)
+         {
+-            input_format raw_format = {NULL, 0, raw_open, wav_close, "raw", 
+-                N_("RAW file reader")};
+-
+             enc_opts.rate=opt.raw_samplerate;
+             enc_opts.channels=opt.raw_channels;
+             enc_opts.samplesize=opt.raw_samplesize;
--- a/comms/syncterm/Makefile
+++ b/comms/syncterm/Makefile
@ -21,7 +21,7 @@ PLIST_FILES=	bin/syncterm \
 		share/icons/hicolor/64x64/apps/syncterm.png

 NO_CCACHE=	yes
-DISABLE_MAKE_JOBS=	yes
+MAKE_JOBS_UNSAFE=	yes
 MAKE_ARGS+=	WITHOUT_PORTAUDIO=yes
 MAKE_ARGS+=	-C ${WRKSRC}
 MAKE_ARGS+=	PREFIX="${PREFIX}"
--- a/comms/wsjt/Makefile
+++ b/comms/wsjt/Makefile
@ -2,7 +2,6 @@

 PORTNAME=	wsjt
 DISTVERSION=	${VERSION}.r${SVN_REV}
-PORTREVISION=	12
 CATEGORIES=	comms hamradio
 MASTER_SITES=	LOCAL/db
 DISTNAME=	wsjt-r${SVN_REV}
@ -16,12 +15,12 @@ LIB_DEPENDS=	libfftw3.so:${PORTSDIR}/math/fftw3 \
 		libfftw3f.so:${PORTSDIR}/math/fftw3-float \
 		libsamplerate.so:${PORTSDIR}/audio/libsamplerate \
 		libportaudio.so:${PORTSDIR}/audio/portaudio
-WSJT_DEPENDS=	${PYTHON_LIBDIR}/tkinter:${PORTSDIR}/x11-toolkits/py-tkinter \
+WSJT_DEPENDS=	${PYTHON_LIBDIR}/lib-dynload/_tkinter.so:${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=	kvasd:${PORTSDIR}/comms/kvasd \
+RUN_DEPENDS=	${LOCALBASE}/bin/kvasd:${PORTSDIR}/comms/kvasd \
 		${WSJT_DEPENDS}

 USE_GCC=	yes
@ -29,15 +28,13 @@ USES=		autoreconf fortran gmake python:3.3+ tar:bzip2
 SHEBANG_FILES=	${WRKSRC}/wsjt
 GNU_CONFIGURE=	yes
 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
+VERSION=	10
 PLIST_SUB=	PYVER=${PYTHON_VERSION:S/python//} \
 		VERSION=${VERSION}

@ -98,8 +95,4 @@ post-configure:
 	${REINPLACE_CMD} -e 's|f2py|f2py-${PYTHON_VER}|' \
 	    ${WRKSRC}/Makefile

-.if defined(PACKAGE_BUILDING) && ${PYTHON_VER} != ${PYTHON_DEFAULT}
-IGNORE=	you have python ${PYTHON_DEFAULT} set as the default, and this needs ${PYTHON_VER}
-.endif
-
 .include <bsd.port.post.mk>
--- a/comms/wspr/Makefile
+++ b/comms/wspr/Makefile
@ -21,7 +21,7 @@ LIB_DEPENDS=	libhamlib.so:${PORTSDIR}/comms/hamlib \
 		libsamplerate.so:${PORTSDIR}/audio/libsamplerate \
 		libportaudio.so:${PORTSDIR}/audio/portaudio

-DISABLE_MAKE_JOBS=	yes
+MAKE_JOBS_UNSAFE=	yes
 USES=		autoreconf dos2unix fortran gmake libtool python:3.3 tar:bzip2
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-gfortran=${FC} \
--- a/databases/adodb/Makefile
+++ b/databases/adodb/Makefile
@ -6,35 +6,30 @@ PORTVERSION=	4.99.2
 CATEGORIES=	databases www
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-php-4-and-5/${PORTNAME}-${PORTVERSION:S/.//g}-for-php
 DISTNAME=	${PORTNAME}${PORTVERSION:S/.//g}
-EXTRACT_SUFX=	.tgz

 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Database library for PHP

-LICENSE=	BSD4CLAUSE
+LICENSE=	BSD4CLAUSE LGPL21
+LICENSE_COMB=	dual

+USES=		tar:tgz
 USE_PHP=	pcre

 CONFLICTS=	adodb-5.*

 WRKSRC=		${WRKDIR}/${PORTNAME}
-NO_BUILD=	YES
+NO_BUILD=	yes
+NO_ARCH=	yes
+SUB_FILES=	pkg-message

 ADODB_SUBDIRS=	contrib datadict drivers lang pear perf session xsl

 OPTIONS_DEFINE=	TESTS DOCS
+OPTIONS_SUB=	yes
+
 TESTS_DESC=	Install tests

-.include <bsd.port.options.mk>
-
-SUB_FILES+=	pkg-message
-
-.if ${PORT_OPTIONS:MTESTS}
-PLIST_SUB+=	TESTS=
-.else
-PLIST_SUB+=	TESTS="@comment "
-.endif
-
 post-patch:
 	@cd ${WRKSRC}; ${RM} -f cute_icons_for_site/Thumbs.db

@ -47,21 +42,18 @@ do-install:
 	@cd ${WRKSRC}; ${FIND} ${ADODB_SUBDIRS} -type f \
 		-exec ${INSTALL_DATA} ${WRKSRC}/{} ${STAGEDIR}${DATADIR}/{} \;

-.if ${PORT_OPTIONS:MTESTS}
+do-install-TESTS-on:
 	@${MKDIR} ${STAGEDIR}${DATADIR}/tests
 	@cd ${WRKSRC}; ${FIND} tests -type f \
 		-exec ${INSTALL_DATA} ${WRKSRC}/{} ${STAGEDIR}${DATADIR}/{} \;
-.endif

-post-install:
-.if ${PORT_OPTIONS:MDOCS}
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR} ${STAGEDIR}${DOCSDIR}/cute_icons_for_site
 	@cd ${WRKSRC}; ${FIND} . ! -path './*/*' -type f -name '*.txt' \
-		-exec ${INSTALL_MAN} ${WRKSRC}/{} ${STAGEDIR}${DOCSDIR}/{} \;
+		-exec ${INSTALL_DATA} ${WRKSRC}/{} ${STAGEDIR}${DOCSDIR}/{} \;
 	@cd ${WRKSRC}/docs; ${FIND} . -type f \
-		-exec ${INSTALL_MAN} ${WRKSRC}/docs/{} ${STAGEDIR}${DOCSDIR}/{} \;
+		-exec ${INSTALL_DATA} ${WRKSRC}/docs/{} ${STAGEDIR}${DOCSDIR}/{} \;
 	@cd ${WRKSRC}; ${FIND} cute_icons_for_site -type f \
-		-exec ${INSTALL_MAN} ${WRKSRC}/{} ${STAGEDIR}${DOCSDIR}/{} \;
-.endif
+		-exec ${INSTALL_DATA} ${WRKSRC}/{} ${STAGEDIR}${DOCSDIR}/{} \;

 .include <bsd.port.mk>
--- a/databases/adodb/pkg-descr
+++ b/databases/adodb/pkg-descr
@ -11,4 +11,4 @@ ODBC, ODBTP.
 The Sybase, Informix, FrontBase and PostgreSQL, Netezza, LDAP, ODBTP drivers 
 are community contributions.

-WWW: http://adodb.sourceforge.net
+WWW: http://adodb.sourceforge.net/
--- a/databases/adodb5/Makefile
+++ b/databases/adodb5/Makefile
@ -11,7 +11,8 @@ PKGNAMESUFFIX=	5
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Database library for PHP

-LICENSE=	BSD4CLAUSE
+LICENSE=	BSD4CLAUSE LGPL21
+LICENSE_COMB=	dual

 CONFLICTS=	adodb-4.*

@ -19,23 +20,17 @@ USES=		zip
 USE_PHP=	pcre

 WRKSRC=		${WRKDIR}/${PORTNAME}5
-NO_BUILD=	YES
+NO_BUILD=	yes
+NO_ARCH=	yes
+SUB_FILES=	pkg-message

 ADODB_SUBDIRS=	contrib datadict drivers lang pear perf session xsl

 OPTIONS_DEFINE=	TESTS DOCS
+OPTIONS_SUB=	yes
+
 TESTS_DESC=	Install tests

-.include <bsd.port.options.mk>
-
-SUB_FILES+=	pkg-message
-
-.if ${PORT_OPTIONS:MTESTS}
-PLIST_SUB+=	TESTS=
-.else
-PLIST_SUB+=	TESTS="@comment "
-.endif
-
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	@cd ${WRKSRC}; ${FIND} ${ADODB_SUBDIRS} -type d \
@ -45,19 +40,18 @@ do-install:
 	@cd ${WRKSRC}; ${FIND} ${ADODB_SUBDIRS} -type f \
 		-exec ${INSTALL_DATA} ${WRKSRC}/{} ${STAGEDIR}${DATADIR}/{} \;

-.if ${PORT_OPTIONS:MTESTS}
-	@${MKDIR} ${DATADIR}/tests
+do-install-TESTS-on:
+	@${MKDIR} ${STAGEDIR}${DATADIR}/tests
 	@cd ${WRKSRC}; ${FIND} tests -type f \
-		-exec ${INSTALL_DATA} ${WRKSRC}/{} ${DATADIR}/{} \;
-.endif
+		-exec ${INSTALL_DATA} ${WRKSRC}/{} ${STAGEDIR}${DATADIR}/{} \;

-post-install:
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR} ${STAGEDIR}${DOCSDIR}/cute_icons_for_site
 	@cd ${WRKSRC}; ${FIND} . ! -path './*/*' -type f -name '*.txt' \
-		-exec ${INSTALL_MAN} ${WRKSRC}/{} ${STAGEDIR}${DOCSDIR}/{} \;
+		-exec ${INSTALL_DATA} ${WRKSRC}/{} ${STAGEDIR}${DOCSDIR}/{} \;
 	@cd ${WRKSRC}/docs; ${FIND} . -type f \
-		-exec ${INSTALL_MAN} ${WRKSRC}/docs/{} ${STAGEDIR}${DOCSDIR}/{} \;
+		-exec ${INSTALL_DATA} ${WRKSRC}/docs/{} ${STAGEDIR}${DOCSDIR}/{} \;
 	@cd ${WRKSRC}; ${FIND} cute_icons_for_site -type f \
-		-exec ${INSTALL_MAN} ${WRKSRC}/{} ${STAGEDIR}${DOCSDIR}/{} \;
+		-exec ${INSTALL_DATA} ${WRKSRC}/{} ${STAGEDIR}${DOCSDIR}/{} \;

 .include <bsd.port.mk>
--- a/databases/adodb5/pkg-descr
+++ b/databases/adodb5/pkg-descr
@ -11,4 +11,4 @@ ODBC, ODBTP.
 The Sybase, Informix, FrontBase and PostgreSQL, Netezza, LDAP, ODBTP drivers 
 are community contributions.

-WWW: http://adodb.sourceforge.net
+WWW: http://adodb.sourceforge.net/
--- a/databases/cego/Makefile
+++ b/databases/cego/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	cego
-PORTVERSION=	2.24.4
+PORTVERSION=	2.25.0
 CATEGORIES=	databases
 MASTER_SITES=	http://www.lemke-it.com/

--- a/databases/cego/distinfo
+++ b/databases/cego/distinfo
@ -1,2 +1,2 @@
-SHA256 (cego-2.24.4.tar.gz) = 307b0452bcd8157814f040140c2d7191b4d402df5e7997e99392adfa9bf56ad8
-SIZE (cego-2.24.4.tar.gz) = 1103992
+SHA256 (cego-2.25.0.tar.gz) = e2dedf621417596fd8b638af5cb7b03da9e15ee9d51aa486caca4353faacb1e0
+SIZE (cego-2.25.0.tar.gz) = 1105014
--- a/databases/cego/pkg-plist
+++ b/databases/cego/pkg-plist
@ -98,6 +98,7 @@ include/cego/CegoProcPred.h
 include/cego/CegoProcQueryStmt.h
 include/cego/CegoProcReturnStmt.h
 include/cego/CegoProcStmt.h
+include/cego/CegoProcThrowStmt.h
 include/cego/CegoProcVar.h
 include/cego/CegoProcWhileStmt.h
 include/cego/CegoProcedure.h
--- a/databases/cegobridge/Makefile
+++ b/databases/cegobridge/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	cegobridge
-PORTVERSION=	1.0.1
+PORTVERSION=	1.1.0
 CATEGORIES=	databases
 MASTER_SITES=	http://www.lemke-it.com/

--- a/databases/cegobridge/distinfo
+++ b/databases/cegobridge/distinfo
@ -1,2 +1,2 @@
-SHA256 (cegobridge-1.0.1.tar.gz) = b731673d7d4c4f32afc81bc195b0bf08cf9dc2289184625ff393279ca90010f7
-SIZE (cegobridge-1.0.1.tar.gz) = 538542
+SHA256 (cegobridge-1.1.0.tar.gz) = f1493ac83563ea184f1875f5a28eaa05b57c989ea973e1abe7da1ec10c2c76dd
+SIZE (cegobridge-1.1.0.tar.gz) = 538657
--- a/databases/couchdb/Makefile
+++ b/databases/couchdb/Makefile
@ -70,9 +70,9 @@ post-patch:
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} 's|\(info_file_inst = CouchDB\)$$|\1.info|' \
 		${WRKSRC}/share/doc/build/Makefile.in
-.if !${PORT_OPTIONS:MDOCS}
+
+post-patch-DOCS-off:
 	@${REINPLACE_CMD} -e 's/install-data-am$$//' ${WRKSRC}/Makefile.in
-.endif

 post-configure:
 # Cater for parallel Spidermonkey v1.7 and v1.8.5 installs by ensuring that
--- a/databases/ocaml-mysql/Makefile
+++ b/databases/ocaml-mysql/Makefile
@ -29,18 +29,14 @@ PORTDOCS=	*

 OPTIONS_DEFINE=	DOCS

-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MDOCS}
-ALL_TARGET+=		htdoc
-
-post-install:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/mysql/html/* ${STAGEDIR}${DOCSDIR}
-.endif
+DOCS_ALL_TARGET=	htdoc

 post-patch:
 	${REINPLACE_CMD} 's,OCAMLFIND_INSTFLAGS=,OCAMLFIND_INSTFLAGS=-ldconf ignore ,' \
 		${WRKSRC}/Makefile.in

+post-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/mysql/html/* ${STAGEDIR}${DOCSDIR}
+
 .include <bsd.port.mk>
--- a/databases/postgresql-jdbc/Makefile
+++ b/databases/postgresql-jdbc/Makefile
@ -18,26 +18,24 @@ DIST_SUBDIR=	postgresql

 USE_ANT=	yes
 USE_JAVA=	yes
+NO_ARCH=	yes

 PLIST_FILES=	%%JAVAJARDIR%%/postgresql.jar
 PORTDOCS=	*
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
 SUB_FILES=	pkg-message

+OPTIONS_DEFINE=	DOCS
+OPTIONS_SUB=	yes
+
 post-patch:
 	${REINPLACE_CMD} 's,/usr/local/pgsql/share/java,${JAVAJARDIR},' ${WRKSRC}/README

-OPTIONS_DEFINE=	DOCS
-
-.include <bsd.port.options.mk>
-
-OPTIONS_SUB=	yes
-
 do-install:
-	@ ${INSTALL_DATA} ${WRKSRC}/jars/postgresql.jar ${STAGEDIR}${JAVAJARDIR}/postgresql.jar
-.if ${PORT_OPTIONS:MDOCS}
+	${INSTALL_DATA} ${WRKSRC}/jars/postgresql.jar ${STAGEDIR}${JAVAJARDIR}/postgresql.jar
+
+do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
-.endif

 .include <bsd.port.mk>
--- a/databases/py-pg_pqueue/Makefile
+++ b/databases/py-pg_pqueue/Makefile
@ -19,11 +19,8 @@ USE_PYTHON=	distutils autoplist

 OPTIONS_DEFINE=	DOCS

-.include <bsd.port.pre.mk>
-post-install:
-.if ${PORT_OPTIONS:MDOCS}
+post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/changes.txt ${STAGEDIR}${DOCSDIR}
-.endif

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/databases/tablelog/Makefile
+++ b/databases/tablelog/Makefile
@ -17,8 +17,6 @@ MAKE_ARGS=	USE_PGXS=1

 OPTIONS_DEFINE=	DOCS

-.include <bsd.port.options.mk>
-
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/postgresql/
 	@${INSTALL_PROGRAM} ${WRKSRC}/table_log.so \
@ -26,10 +24,10 @@ do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/postgresql/contrib/
 	@${INSTALL_DATA} ${WRKSRC}/table_log_init.sql \
 		${STAGEDIR}${PREFIX}/share/postgresql/contrib/
-.if ${PORT_OPTIONS:MDOCS}
+
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/
 	cd ${WRKSRC} && ${INSTALL_DATA} README.table_log table_log.sql \
 		${STAGEDIR}${DOCSDIR}/
-.endif

 .include <bsd.port.mk>
--- a/databases/tora/Makefile
+++ b/databases/tora/Makefile
@ -43,14 +43,11 @@ ORACLE_BUILD_DEPENDS=	${ORACLE_HOME}/lib/libclntsh.a:${PORTSDIR}/databases/oracl
 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}
+post-patch-DOCS-on:
 	@${REINPLACE_CMD} 's|/etc/torarc|${PREFIX}/etc/torarc|' \
 		${PREFIX2FIX:S|^|${WRKSRC}/|}
-.else
+
+post-patch-DOCS-off:
 	@${REINPLACE_CMD} 's|test doc|test|' ${WRKSRC}/Makefile.am
-.endif

 .include <bsd.port.mk>
--- a/databases/tuning-primer/Makefile
+++ b/databases/tuning-primer/Makefile
@ -6,9 +6,9 @@ PORTVERSION=	1.6.r1
 CATEGORIES=	databases
 MASTER_SITES=	http://launchpad.net/mysql-${PORTNAME}/trunk/1.6-r1/+download/
 DISTNAME=	${PORTNAME}.sh
-EXTRACT_SUFX=
-EXTRACT_ONLY=
+EXTRACT_SUFX=	# empty
 DIST_SUBDIR=	${PORTNAME}/${DISTVERSION}
+EXTRACT_ONLY=	# empty

 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	MySQL performance tuning primer script
@ -16,6 +16,7 @@ COMMENT=	MySQL performance tuning primer script
 LICENSE=	GPLv2

 NO_BUILD=	yes
+NO_ARCH=	yes
 USE_MYSQL=	yes

 PLIST_FILES=	bin/${PORTNAME}
--- a/databases/tuning-primer/pkg-descr
+++ b/databases/tuning-primer/pkg-descr
@ -4,4 +4,4 @@ sane recommendations for tuning server variables.

 It is compatible with all versions of MySQL 3.23 - 5.1.

-WWW:	https://launchpad.net/mysql-tuning-primer
+WWW: https://launchpad.net/mysql-tuning-primer
--- a/deskutils/anamnesis/Makefile
+++ b/deskutils/anamnesis/Makefile
@ -18,8 +18,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
 USES=		python
 PORTDOCS=	ChangeLog README
 OPTIONS_DEFINE=	DOCS
-
-.include <bsd.port.options.mk>
+NO_ARCH=	yes

 post-patch:
 	@${REINPLACE_CMD} 's|cfg_files.reverse()|cfg_files += [os.path.join("'${PREFIX}/etc/'",cfg_filename)]; cfg_files.reverse()|' \
@ -40,10 +39,10 @@ do-install:
 	${LN} -sf ${PREFIX}/share/anamnesis/anamnesis.py ${STAGEDIR}${PREFIX}/bin/anamnesis
 	${INSTALL_DATA} ${WRKSRC}/anamnesis.cfg ${STAGEDIR}${PREFIX}/etc/anamnesis.cfg.sample
 	${INSTALL_MAN} ${WRKSRC}/man/anamnesis.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
-.if ${PORT_OPTIONS:MDOCS}
+
+do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/ChangeLog ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
-.endif

 .include <bsd.port.mk>
--- a/deskutils/gcalcli/Makefile
+++ b/deskutils/gcalcli/Makefile
@ -23,6 +23,7 @@ GH_ACCOUNT=	insanum
 USES=		python

 NO_BUILD=	yes
+NO_ARCH=	yes

 PORTDOCS=	README.md gcalcli_?.png

@ -39,14 +40,12 @@ ICS_VCAL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}vobject>=0.4.8:${PORTSDIR}/deskutil
 SIMPLEJSON_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}simplejson>=0:${PORTSDIR}/devel/py-simplejson
 FUZZYDATES_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}parsedatetime>=0:${PORTSDIR}/devel/py-parsedatetime

-.include <bsd.port.options.mk>
-
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
-.if ${PORT_OPTIONS:MDOCS}
+
+do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}/${DOCSDIR}
 	(cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
-.endif

 .include <bsd.port.mk>
--- a/deskutils/homerun/Makefile
+++ b/deskutils/homerun/Makefile
@ -2,13 +2,14 @@

 PORTNAME=	homerun
 PORTVERSION=	0.2.3
+PORTREVISION=	1
 CATEGORIES=	deskutils
 MASTER_SITES=	KDE/unstable/${PORTNAME}/src/

 MAINTAINER=	yurkis@gmail.com
 COMMENT=	Fullscreen launcher with content organized in tabs

-USES=		cmake compiler:c++0x gettext tar:bzip2
+USES=		cmake:outsource compiler:c++0x gettext tar:bzip2
 USE_KDE4=	kdelibs kdeprefix automoc4 workspace
 USE_QT4=	moc_build qmake_build rcc_build uic_build corelib gui
 USE_XORG=	x11
--- a/deskutils/homerun/pkg-plist
+++ b/deskutils/homerun/pkg-plist
@ -2,7 +2,6 @@ bin/homerunviewer
 include/homerun/abstractsource.h
 include/homerun/actionlist.h
 include/homerun/homerun_export.h
-include/homerun/libhomerun_config.h
 include/homerun/pathmodel.h
 include/homerun/sourceconfigurationwidget.h
 lib/cmake/Homerun/HomerunConfig.cmake
--- a/deskutils/nagaina/Makefile
+++ b/deskutils/nagaina/Makefile
@ -39,14 +39,12 @@ DESKTOP_ENTRIES=	"Nagaina" \
 			"Qt;Office;Utility;" \
 			"true"

-.include <bsd.port.options.mk>
-
 post-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/images/${PORTNAME}.png ${STAGEDIR}${PREFIX}/share/pixmaps
-.if ${PORT_OPTIONS:MDOCS}
+
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
-.endif

 .include <bsd.port.mk>
--- a/deskutils/phpicalendar/Makefile
+++ b/deskutils/phpicalendar/Makefile
@ -21,6 +21,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING

 USES=		tar:bz2
 NO_BUILD=	yes
+NO_ARCH=	yes
 USE_PHP=	session pcre
 PLIST_SUB=	WWWOWN="${WWWOWN}" WWWGRP="${WWWGRP}"
 SUB_FILES=	pkg-message
@ -30,8 +31,6 @@ PORTDOCS=	AUTHORS COPYING README TIMEZONES

 OPTIONS_DEFINE=	DOCS

-.include <bsd.port.options.mk>
-
 do-install:
 	${MKDIR} ${STAGEDIR}${WWWDIR}
 	@${FIND} ${WRKSRC} -name \*.orig -exec ${RM} {} \;
@ -42,9 +41,9 @@ do-install:
 .for f in caldav.php config.inc.php.sample day.php default_config.php error.php index.php month.php preferences.php print.php search.php week.php year.php
 	@${CP} -v ${WRKSRC}/${f} ${STAGEDIR}${WWWDIR}
 .endfor
-.if ${PORT_OPTIONS:MDOCS}
+
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
-.endif

 .include <bsd.port.mk>
--- a/deskutils/zorro/Makefile
+++ b/deskutils/zorro/Makefile
@ -13,15 +13,14 @@ DISTNAME=	${PORTNAME}-1.1p8
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple to-do list manager

-USES+=		tk:run
+USES=		tk:run
 NO_BUILD=	yes
+NO_ARCH=	yes
 PLIST_FILES=	bin/zorro
 PORTDOCS=	*

 OPTIONS_DEFINE=	DOCS

-.include <bsd.port.options.mk>
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local/bin/wish|${WISH}|' \
 		${WRKSRC}/zorro
@ -30,13 +29,11 @@ post-patch:
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/zorro ${STAGEDIR}${PREFIX}/bin/zorro

-.if ${PORT_OPTIONS:MDOCS}
-post-install:
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/DOTzorrorc ${STAGEDIR}${DOCSDIR}/
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "Take a look at ${STAGEDIR}${DOCSDIR}/DOTzorrorc"
 	@${ECHO_MSG} ""
-.endif

 .include <bsd.port.mk>
--- a/devel/Makefile
+++ b/devel/Makefile
@ -3959,6 +3959,7 @@
    SUBDIR += py-doit
    SUBDIR += py-durus
    SUBDIR += py-dynrules
+    SUBDIR += py-efilter
    SUBDIR += py-efl
    SUBDIR += py-eggtestinfo
    SUBDIR += py-enum34
--- a/devel/bin86/Makefile
+++ b/devel/bin86/Makefile
@ -2,38 +2,29 @@
 # $FreeBSD$

 PORTNAME=	bin86
-PORTVERSION=	0.16.19
+PORTVERSION=	0.16.21
 CATEGORIES=	devel
-MASTER_SITES=	http://www.debath.co.uk/dev86/
+MASTER_SITES=	http://v3.sk/~lkundrak/dev86/

 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	16-bit assembler and loader

-OPTIONS_DEFINE=	DOCS
-
-DOCS=	ChangeLog README README-0.4
-
-PORTDOCS=	*
-
 CONFLICTS=	bcc-[0-9]* dev86-[0-9]*

 PLIST_FILES=	bin/as86 bin/catimage bin/ld86 bin/objchop bin/objdump86 \
-	man/man1/as86.1.gz man/man1/ld86.1.gz
+		man/man1/as86.1.gz man/man1/ld86.1.gz
+PORTDOCS=	ChangeLog README README-0.4

-BINS=		as/as86 ld/ld86 ld/objchop ld/catimage ld/objdump86
-
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64"
-BROKEN=		Does not compile on ia64, powerpc, or sparc64
-.endif
+OPTIONS_DEFINE=	DOCS

 do-install:
 	${INSTALL_MAN} ${WRKSRC}/man/*1 ${STAGEDIR}${MAN1PREFIX}/man/man1
-.for i in ${BINS}
-	${INSTALL_PROGRAM} ${WRKSRC}/${i} ${STAGEDIR}${PREFIX}/bin
+.for prog in as/as86 ld/ld86 ld/objchop ld/catimage ld/objdump86
+	${INSTALL_PROGRAM} ${WRKSRC}/${prog} ${STAGEDIR}${PREFIX}/bin
 .endfor
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}

-.include <bsd.port.post.mk>
+do-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
+
+.include <bsd.port.mk>
--- a/devel/bin86/distinfo
+++ b/devel/bin86/distinfo
@ -1,2 +1,2 @@
-SHA256 (bin86-0.16.19.tar.gz) = 35b99e05395264d0692f8b327f9b4f18de9e483484faa5ccbaa7c9f353d9c30c
-SIZE (bin86-0.16.19.tar.gz) = 151088
+SHA256 (bin86-0.16.21.tar.gz) = 021e37cde3a20632c4c9000993cb4aa9f58cb82b1d3c26b9aeb62d6566925738
+SIZE (bin86-0.16.21.tar.gz) = 154283
--- a/devel/boost-libs/Makefile
+++ b/devel/boost-libs/Makefile
@ -4,7 +4,7 @@
 PORTNAME=	boost-libs
 COMMENT=	Free portable C++ libraries (without Boost.Python)

-PORTREVISION=	6
+PORTREVISION=	7

 BUILD_DEPENDS+=	bjam:${PORTSDIR}/devel/boost-jam

--- a/devel/boost-libs/files/patch-boost_static__assert.hpp
+++ b/devel/boost-libs/files/patch-boost_static__assert.hpp
@ -0,0 +1,11 @@
+--- boost/static_assert.hpp.orig	2013-09-21 20:17:00 UTC
+++ boost/static_assert.hpp
+@@ -67,7 +67,7 @@
+ //
+ // If the compiler warns about unused typedefs then enable this:
+ //
+-#if defined(__GNUC__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 7)))
+#if defined(__GNUC__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 7))) || defined(__clang__)
+ #  define BOOST_STATIC_ASSERT_UNUSED_ATTRIBUTE __attribute__((unused))
+ #else
+ #  define BOOST_STATIC_ASSERT_UNUSED_ATTRIBUTE
--- a/devel/elixir-msgpax/Makefile
+++ b/devel/elixir-msgpax/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	msgpax
-PORTVERSION=	0.8.0
+PORTVERSION=	0.8.1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 PKGNAMEPREFIX=	elixir-
--- a/devel/elixir-msgpax/distinfo
+++ b/devel/elixir-msgpax/distinfo
@ -1,2 +1,2 @@
-SHA256 (lexmag-msgpax-v0.8.0_GH0.tar.gz) = 980b1a90fe3f082d2f2a47ccfe6c461457283c9efd9b97054dab75955bb9143f
-SIZE (lexmag-msgpax-v0.8.0_GH0.tar.gz) = 6613
+SHA256 (lexmag-msgpax-v0.8.1_GH0.tar.gz) = e132398478e7cea7546bed50698a13ed40ef3ed92eb65aaef72dcdbe8c5c269c
+SIZE (lexmag-msgpax-v0.8.1_GH0.tar.gz) = 6557
--- a/devel/elixir-msgpax/pkg-plist
+++ b/devel/elixir-msgpax/pkg-plist
@ -3,6 +3,7 @@ lib/elixir/lib/msgpax/ebin/Elixir.Inspect.Msgpax.Ext.beam
 lib/elixir/lib/msgpax/ebin/Elixir.Msgpax.Bin.beam
 lib/elixir/lib/msgpax/ebin/Elixir.Msgpax.Ext.beam
 lib/elixir/lib/msgpax/ebin/Elixir.Msgpax.PackError.beam
+lib/elixir/lib/msgpax/ebin/Elixir.Msgpax.Packer.Any.beam
 lib/elixir/lib/msgpax/ebin/Elixir.Msgpax.Packer.Atom.beam
 lib/elixir/lib/msgpax/ebin/Elixir.Msgpax.Packer.BitString.beam
 lib/elixir/lib/msgpax/ebin/Elixir.Msgpax.Packer.Float.beam
--- a/devel/liblouis/Makefile
+++ b/devel/liblouis/Makefile
@ -2,39 +2,23 @@
 # $FreeBSD$

 PORTNAME=	liblouis
-PORTVERSION=	2.5.4
+PORTVERSION=	2.6.4
+DISTVERSIONPREFIX=	v
 PORTREVISION=	1
 CATEGORIES=	devel
-MASTER_SITES=	http://www.liblouis.org/downloads/

 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Open-source Braille Translator And Back-translator

-LICENSE=	GPLv3
+LICENSE=	LGPL3 # or any later version

-OPTIONS_DEFINE=	DOCS
+BUILD_DEPENDS=	help2man:${PORTSDIR}/misc/help2man

-USES=		gmake libtool
+USES=		autoreconf gmake libtool pathfix
+USE_GITHUB=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-INFO=		liblouis
-
-post-extract:
-	@${REINPLACE_CMD} -e \
-		's#@libdir@#${PREFIX}/libdata#g' ${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e \
-		's#tables doc tests python#tests python#g' ${WRKSRC}/Makefile.in
-
-post-install:
-	@${MKDIR} ${STAGEDIR}${DATADIR}/tables
-	${INSTALL_DATA} ${WRKSRC}/tables/*.dic ${STAGEDIR}${DATADIR}/tables/
-	${INSTALL_DATA} ${WRKSRC}/tables/*.ctb ${STAGEDIR}${DATADIR}/tables/
-	${INSTALL_DATA} ${WRKSRC}/tables/*.utb ${STAGEDIR}${DATADIR}/tables/
-	${INSTALL_DATA} ${WRKSRC}/tables/*.cti ${STAGEDIR}${DATADIR}/tables/
-	${INSTALL_DATA} ${WRKSRC}/tables/*.dis ${STAGEDIR}${DATADIR}/tables/
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for i in liblouis.html liblouis.txt
-	${INSTALL_MAN} ${WRKSRC}/doc/${i} ${STAGEDIR}${DOCSDIR}
-.endfor
+PATHFIX_MAKEFILEIN=	Makefile.am
+INSTALL_TARGET=	install-strip

 .include <bsd.port.mk>
--- a/devel/liblouis/distinfo
+++ b/devel/liblouis/distinfo
@ -1,2 +1,2 @@
-SHA256 (liblouis-2.5.4.tar.gz) = eb45a443bbf382c7d8f2c781eb172834ddde88a2524d2dc0e5b9e4885fada91d
-SIZE (liblouis-2.5.4.tar.gz) = 3887619
+SHA256 (liblouis-liblouis-v2.6.4_GH0.tar.gz) = 0056b12d9cfbd63d6d7c6b5c19e217b842f749da0771f82b5a631f3aa3c64ac3
+SIZE (liblouis-liblouis-v2.6.4_GH0.tar.gz) = 22569444
--- a/devel/liblouis/files/patch-autogen.sh
+++ b/devel/liblouis/files/patch-autogen.sh
@ -0,0 +1,13 @@
+--- autogen.sh.orig	2015-08-31 14:19:59 UTC
+++ autogen.sh
+@@ -28,8 +28,8 @@ set -e
+ 
+ # Refresh GNU autotools toolchain.
+ echo Cleaning autotools files...
+-find -type d -name autom4te.cache -print0 | xargs -0 rm -rf \;
+-find -type f \( -name missing -o -name install-sh -o -name mkinstalldirs \
+find . -type d -name autom4te.cache -print0 | xargs -0 rm -rf \;
+find . -type f \( -name missing -o -name install-sh -o -name mkinstalldirs \
+ 	-o -name depcomp -o -name ltmain.sh -o -name configure \
+ 	-o -name config.sub -o -name config.guess -o -name config.h.in \
+         -o -name mdate-sh -o -name texinfo.tex \
--- a/devel/liblouis/pkg-descr
+++ b/devel/liblouis/pkg-descr
@ -7,4 +7,4 @@ Included are also tools for testing and debugging tables. Liblouis
 also supports math braille (Nemeth and Marburg). The formatting of
 braille is provided by the companion project liblouisxml.

-WWW: http://code.google.com/p/liblouis/
+WWW: http://www.liblouis.org/
--- a/devel/liblouis/pkg-plist
+++ b/devel/liblouis/pkg-plist
@ -1,29 +1,50 @@
+bin/lou_allround
+bin/lou_checkhyphens
+bin/lou_checktable
+bin/lou_debug
+bin/lou_harnessGenerator
+bin/lou_trace
+bin/lou_translate
+include/liblouis/liblouis.h
+include/liblouis/louis.h
+lib/liblouis.a
+lib/liblouis.so
+lib/liblouis.so.9
+lib/liblouis.so.9.0.0
+libdata/pkgconfig/liblouis.pc
+man/man1/lou_allround.1.gz
+man/man1/lou_checkhyphens.1.gz
+man/man1/lou_checktable.1.gz
+man/man1/lou_debug.1.gz
+man/man1/lou_trace.1.gz
+man/man1/lou_translate.1.gz
 %%DATADIR%%/tables/Cz-Cz-g1.utb
 %%DATADIR%%/tables/Es-Es-G0.utb
 %%DATADIR%%/tables/Es-Es-g1.utb
 %%DATADIR%%/tables/Fr-Ca-g2.ctb
 %%DATADIR%%/tables/Fr-Fr-g2.ctb
 %%DATADIR%%/tables/Lv-Lv-g1.utb
-%%DATADIR%%/tables/Nl-Nl-g1.utb
 %%DATADIR%%/tables/Pl-Pl-g1.utb
 %%DATADIR%%/tables/Se-Se-g1.utb
 %%DATADIR%%/tables/UEBC-g1.utb
 %%DATADIR%%/tables/UEBC-g2.ctb
+%%DATADIR%%/tables/afr-za-g1.ctb
 %%DATADIR%%/tables/ar-ar-g1.utb
 %%DATADIR%%/tables/ar-fa.utb
-%%DATADIR%%/tables/as.ctb
-%%DATADIR%%/tables/awa.ctb
+%%DATADIR%%/tables/as-in-g1.utb
+%%DATADIR%%/tables/aw-in-g1.utb
+%%DATADIR%%/tables/be-in-g1.utb
 %%DATADIR%%/tables/bengali.cti
 %%DATADIR%%/tables/bg.ctb
 %%DATADIR%%/tables/bh.ctb
-%%DATADIR%%/tables/bn.ctb
 %%DATADIR%%/tables/bo.ctb
 %%DATADIR%%/tables/boxes.ctb
-%%DATADIR%%/tables/bra.ctb
+%%DATADIR%%/tables/br-in-g1.utb
 %%DATADIR%%/tables/braille-patterns.cti
 %%DATADIR%%/tables/ca-chardefs.cti
 %%DATADIR%%/tables/ca-g1.ctb
 %%DATADIR%%/tables/chardefs.cti
+%%DATADIR%%/tables/chr-us-g1.ctb
 %%DATADIR%%/tables/ckb-chardefs.cti
 %%DATADIR%%/tables/ckb-g1.ctb
 %%DATADIR%%/tables/ckb-translation.cti
@ -36,20 +57,21 @@
 %%DATADIR%%/tables/cs-translation.cti
 %%DATADIR%%/tables/cy-cy-g1.utb
 %%DATADIR%%/tables/cy-cy-g2.ctb
-%%DATADIR%%/tables/da-ansi6.dis
 %%DATADIR%%/tables/da-ansi8.dis
 %%DATADIR%%/tables/da-chardefs6.cti
 %%DATADIR%%/tables/da-chardefs8.cti
+%%DATADIR%%/tables/da-dk-common6.uti
 %%DATADIR%%/tables/da-dk-g16.utb
 %%DATADIR%%/tables/da-dk-g18.utb
+%%DATADIR%%/tables/da-dk-g26-patches.cti
 %%DATADIR%%/tables/da-dk-g26.ctb
+%%DATADIR%%/tables/da-dk-g28-patches.cti
 %%DATADIR%%/tables/da-dk-g28.ctb
 %%DATADIR%%/tables/da-dk-g28caps.cti
 %%DATADIR%%/tables/da-dk-g2core.cti
+%%DATADIR%%/tables/da-dk-nocaps.uti
 %%DATADIR%%/tables/da-dk.dis
 %%DATADIR%%/tables/da-lt.ctb
-%%DATADIR%%/tables/da-unicode6.dis
-%%DATADIR%%/tables/da-unicode8.dis
 %%DATADIR%%/tables/de-ch-accents.cti
 %%DATADIR%%/tables/de-ch-g0.utb
 %%DATADIR%%/tables/de-ch-g1.ctb
@ -77,6 +99,7 @@
 %%DATADIR%%/tables/en-chess.ctb
 %%DATADIR%%/tables/en-gb-comp8.ctb
 %%DATADIR%%/tables/en-gb-g1.utb
+%%DATADIR%%/tables/en-in-g1.ctb
 %%DATADIR%%/tables/en-ueb-chardefs.uti
 %%DATADIR%%/tables/en-ueb-g1.ctb
 %%DATADIR%%/tables/en-ueb-g2.ctb
@ -102,6 +125,7 @@
 %%DATADIR%%/tables/eurodefs.cti
 %%DATADIR%%/tables/fi-fi-8dot.ctb
 %%DATADIR%%/tables/fi-fi.ctb
+%%DATADIR%%/tables/fi.utb
 %%DATADIR%%/tables/fi1.ctb
 %%DATADIR%%/tables/fi2.ctb
 %%DATADIR%%/tables/fr-2007.ctb
@ -110,17 +134,18 @@
 %%DATADIR%%/tables/fr-bfu-g2.ctb
 %%DATADIR%%/tables/fr-ca-g1.utb
 %%DATADIR%%/tables/fr-fr-g1.utb
-%%DATADIR%%/tables/ga.ctb
+%%DATADIR%%/tables/ga-g1.utb
+%%DATADIR%%/tables/ga-g2.ctb
 %%DATADIR%%/tables/gd.ctb
 %%DATADIR%%/tables/gon.ctb
 %%DATADIR%%/tables/gr-bb.ctb
 %%DATADIR%%/tables/gr-gr-g1.utb
-%%DATADIR%%/tables/gu.ctb
+%%DATADIR%%/tables/gu-in-g1.utb
 %%DATADIR%%/tables/gujarati.cti
-%%DATADIR%%/tables/gurmukhi.cti
+%%DATADIR%%/tables/gurumuki.cti
+%%DATADIR%%/tables/haw-us-g1.ctb
 %%DATADIR%%/tables/he.ctb
 %%DATADIR%%/tables/hi-in-g1.utb
-%%DATADIR%%/tables/hi.ctb
 %%DATADIR%%/tables/hr.ctb
 %%DATADIR%%/tables/hu-backtranslate-correction.dis
 %%DATADIR%%/tables/hu-chardefs.cti
@ -150,14 +175,21 @@
 %%DATADIR%%/tables/it-it-comp6.utb
 %%DATADIR%%/tables/it-it-comp8.utb
 %%DATADIR%%/tables/iu-ca-g1.ctb
+%%DATADIR%%/tables/ka-in-g1.utb
 %%DATADIR%%/tables/kannada.cti
-%%DATADIR%%/tables/kha.ctb
-%%DATADIR%%/tables/kn.ctb
+%%DATADIR%%/tables/kh-in-g1.utb
+%%DATADIR%%/tables/ko-2006-g1.ctb
+%%DATADIR%%/tables/ko-2006-g2.ctb
+%%DATADIR%%/tables/ko-2006.cti
+%%DATADIR%%/tables/ko-chars.cti
+%%DATADIR%%/tables/ko-g1-rules.cti
 %%DATADIR%%/tables/ko-g1.ctb
+%%DATADIR%%/tables/ko-g2-rules.cti
 %%DATADIR%%/tables/ko-g2.ctb
 %%DATADIR%%/tables/ko.cti
 %%DATADIR%%/tables/kok.ctb
 %%DATADIR%%/tables/kru.ctb
+%%DATADIR%%/tables/ks-in-g1.utb
 %%DATADIR%%/tables/latinLetterDef6Dots.uti
 %%DATADIR%%/tables/latinLetterDef8Dots.uti
 %%DATADIR%%/tables/litdigits6Dots.uti
@ -165,27 +197,26 @@
 %%DATADIR%%/tables/loweredDigits8Dots.uti
 %%DATADIR%%/tables/lt.ctb
 %%DATADIR%%/tables/malayalam.cti
+%%DATADIR%%/tables/mao-nz-g1.ctb
 %%DATADIR%%/tables/marburg.ctb
 %%DATADIR%%/tables/marburg_edit.ctb
 %%DATADIR%%/tables/marburg_single_cell_defs.cti
 %%DATADIR%%/tables/marburg_unicode_defs.cti
-%%DATADIR%%/tables/ml.ctb
-%%DATADIR%%/tables/mni.ctb
-%%DATADIR%%/tables/mr.ctb
+%%DATADIR%%/tables/ml-in-g1.utb
+%%DATADIR%%/tables/mn-in-g1.utb
+%%DATADIR%%/tables/mr-in-g1.utb
 %%DATADIR%%/tables/mt.ctb
 %%DATADIR%%/tables/mun.ctb
 %%DATADIR%%/tables/mwr.ctb
 %%DATADIR%%/tables/ne.ctb
-%%DATADIR%%/tables/ne.utb
 %%DATADIR%%/tables/nemeth.ctb
 %%DATADIR%%/tables/nemeth_edit.ctb
 %%DATADIR%%/tables/nemethdefs.cti
-%%DATADIR%%/tables/new.ctb
 %%DATADIR%%/tables/nl-BE-chardefs.cti
 %%DATADIR%%/tables/nl-BE-g1.ctb
-%%DATADIR%%/tables/nl-BE-translation.cti
 %%DATADIR%%/tables/nl-BE.dis
-%%DATADIR%%/tables/nl-be-g1.utb
+%%DATADIR%%/tables/nl-NL-chardefs.cti
+%%DATADIR%%/tables/nl-NL-g1.ctb
 %%DATADIR%%/tables/no-no-g0.utb
 %%DATADIR%%/tables/no-no-g1.ctb
 %%DATADIR%%/tables/no-no-g2.ctb
@ -194,14 +225,16 @@
 %%DATADIR%%/tables/no-no-generic.dis
 %%DATADIR%%/tables/no-no.ctb
 %%DATADIR%%/tables/no-no.dis
-%%DATADIR%%/tables/or.ctb
+%%DATADIR%%/tables/np-in-g1.utb
+%%DATADIR%%/tables/or-in-g1.utb
 %%DATADIR%%/tables/oriya.cti
-%%DATADIR%%/tables/pa.ctb
 %%DATADIR%%/tables/pi.ctb
+%%DATADIR%%/tables/pl-pl-comp8.ctb
 %%DATADIR%%/tables/printables.cti
 %%DATADIR%%/tables/pt-pt-comp8.ctb
 %%DATADIR%%/tables/pt-pt-g1.utb
 %%DATADIR%%/tables/pt-pt-g2.ctb
+%%DATADIR%%/tables/pu-in-g1.utb
 %%DATADIR%%/tables/ro.ctb
 %%DATADIR%%/tables/ru-chardefs.cti
 %%DATADIR%%/tables/ru-compbrl.ctb
@ -210,28 +243,28 @@
 %%DATADIR%%/tables/ru-ru-g1.utb
 %%DATADIR%%/tables/ru-ru.dis
 %%DATADIR%%/tables/ru.ctb
-%%DATADIR%%/tables/sa.ctb
-%%DATADIR%%/tables/sat.ctb
-%%DATADIR%%/tables/sd.ctb
+%%DATADIR%%/tables/sa-in-g1.utb
 %%DATADIR%%/tables/se-se.ctb
 %%DATADIR%%/tables/se-se.dis
+%%DATADIR%%/tables/si-in-g1.utb
 %%DATADIR%%/tables/sk-sk-g1.utb
 %%DATADIR%%/tables/sk-sk.utb
 %%DATADIR%%/tables/sl-si-comp8.ctb
 %%DATADIR%%/tables/sl-si-g1.utb
+%%DATADIR%%/tables/sot-za-g1.ctb
 %%DATADIR%%/tables/spaces.ctb
 %%DATADIR%%/tables/sr-chardefs.cti
 %%DATADIR%%/tables/sr-g1.ctb
-%%DATADIR%%/tables/sr-translation.cti
 %%DATADIR%%/tables/sv-1989.ctb
 %%DATADIR%%/tables/sv-1996.ctb
 %%DATADIR%%/tables/ta-ta-g1.ctb
 %%DATADIR%%/tables/ta.ctb
 %%DATADIR%%/tables/tamil.cti
-%%DATADIR%%/tables/te.ctb
+%%DATADIR%%/tables/te-in-g1.utb
 %%DATADIR%%/tables/telugu.cti
 %%DATADIR%%/tables/text_nabcc.dis
 %%DATADIR%%/tables/tr.ctb
+%%DATADIR%%/tables/tsn-za-g1.ctb
 %%DATADIR%%/tables/ukchardefs.cti
 %%DATADIR%%/tables/ukmaths.ctb
 %%DATADIR%%/tables/ukmaths_edit.ctb
@ -241,25 +274,10 @@
 %%DATADIR%%/tables/unicode.dis
 %%DATADIR%%/tables/unicodedefs.cti
 %%DATADIR%%/tables/us-table.dis
+%%DATADIR%%/tables/vi-g1.ctb
 %%DATADIR%%/tables/vi.ctb
 %%DATADIR%%/tables/wiskunde-chardefs.cti
 %%DATADIR%%/tables/wiskunde-translation.cti
 %%DATADIR%%/tables/wiskunde.ctb
 %%DATADIR%%/tables/zh-hk.ctb
 %%DATADIR%%/tables/zh-tw.ctb
-%%PORTDOCS%%%%DOCSDIR%%/liblouis.html
-%%PORTDOCS%%%%DOCSDIR%%/liblouis.txt
-bin/lou_allround
-bin/lou_checkhyphens
-bin/lou_checktable
-bin/lou_debug
-bin/lou_harnessGenerator
-bin/lou_trace
-bin/lou_translate
-include/liblouis/liblouis.h
-include/liblouis/louis.h
-lib/liblouis.a
-lib/liblouis.so
-lib/liblouis.so.2
-lib/liblouis.so.2.4.0
-libdata/pkgconfig/liblouis.pc
--- a/devel/py-efilter/Makefile
+++ b/devel/py-efilter/Makefile
@ -0,0 +1,21 @@
+# Created by: antoine@FreeBSD.org
+# $FreeBSD$
+
+PORTNAME=	efilter
+PORTVERSION=	1438631774
+CATEGORIES=	devel python
+MASTER_SITES=	CHEESESHOP
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER=	antoine@FreeBSD.org
+COMMENT=	EFILTER query language
+
+LICENSE=	APACHE20
+
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>=2:${PORTSDIR}/devel/py-dateutil \
+		${PYTHON_PKGNAMEPREFIX}pytz>=2011:${PORTSDIR}/devel/py-pytz
+
+USES=		python
+USE_PYTHON=	distutils autoplist
+
+.include <bsd.port.mk>
--- a/devel/py-efilter/distinfo
+++ b/devel/py-efilter/distinfo
@ -0,0 +1,2 @@
+SHA256 (efilter-1438631774.tar.gz) = 916dd0b8a5307dd8ad168bfc2eaea0eb9d83c16c5952cc3be8007c8e06e3639b
+SIZE (efilter-1438631774.tar.gz) = 29851
--- a/devel/py-efilter/pkg-descr
+++ b/devel/py-efilter/pkg-descr
@ -0,0 +1,5 @@
+EFILTER is a general-purpose destructuring and search language implemented in
+Python, and suitable for integration with any Python project that requires a
+search function for some of its data.
+
+WWW: https://github.com/google/dotty
--- a/devel/py-fortran/Makefile
+++ b/devel/py-fortran/Makefile
@ -9,7 +9,7 @@ MASTER_SITES=	SF/py${PORTNAME}/py${PORTNAME}/8.5
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	Pyfort-${PORTVERSION}

-MAINTAINER=	wenheping@gmail.com
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Creating extensions to the Python language with Fortran routines

 RUN_DEPENDS=	${PYNUMERIC}
--- a/devel/rubygem-bio/Makefile
+++ b/devel/rubygem-bio/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	bio
 PORTVERSION=	1.4.3.0001
+PORTREVISION=	1
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG

@ -17,6 +18,9 @@ NO_ARCH=	yes
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
 RUBYGEM_AUTOPLIST=	yes
+USES=		shebangfix
+SHEBANG_FILES=	sample/biofetch.rb
+ruby_OLD_CMD=	/usr/proj/bioruby/bin/ruby

 PLIST_FILES=	bin/bioruby \
 		bin/br_biofetch.rb \
--- a/devel/rubygem-ditz/Makefile
+++ b/devel/rubygem-ditz/Makefile
@ -2,13 +2,16 @@

 PORTNAME=	ditz
 PORTVERSION=	0.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG

 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Simple lightweight distributed issue tracker

+LICENSE=	GPLv3 # or later
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
 RUN_DEPENDS=	rubygem-trollop>=1.9:${PORTSDIR}/devel/rubygem-trollop

 NO_ARCH=	yes
@ -17,6 +20,10 @@ USE_RUBY=	yes
 USE_RAKE=	yes
 USE_RUBYGEMS=	yes
 RUBYGEM_AUTOPLIST=	yes
+USES=		shebangfix
+SHEBANG_FILES=	bin/ditz
+ruby_OLD_CMD=	/usr/bin/ruby1.8
+
 PLIST_FILES=	bin/ditz

 .include <bsd.port.mk>
--- a/devel/rubygem-foreman/Makefile
+++ b/devel/rubygem-foreman/Makefile
@ -2,6 +2,7 @@

 PORTNAME=	foreman
 PORTVERSION=	0.78.0
+PORTREVISION=	1
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG

@ -17,6 +18,8 @@ NO_ARCH=	yes
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
 RUBYGEM_AUTOPLIST=	yes
+USES=		shebangfix
+SHEBANG_FILES=	spec/resources/bin/env

 PLIST_FILES=	bin/foreman

--- a/devel/rubygem-ruby-ole/Makefile
+++ b/devel/rubygem-ruby-ole/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	ruby-ole
 PORTVERSION=	1.2.11.8
+PORTREVISION=	1
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG

@ -10,12 +11,16 @@ MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Library for easy read/write access to OLE compound documents

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

 NO_ARCH=	yes

 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
 RUBYGEM_AUTOPLIST=	yes
+USES=		shebangfix
+SHEBANG_FILES=	bin/oletool \
+		test/*.rb

 PLIST_FILES=	bin/oletool

--- a/devel/rubygem-safe_yaml/Makefile
+++ b/devel/rubygem-safe_yaml/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	safe_yaml
 PORTVERSION=	1.0.4
+PORTREVISION=	1
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG

@ -10,12 +11,16 @@ MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Parse YAML safely

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

 NO_ARCH=	yes

 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
 RUBYGEM_AUTOPLIST=	yes
+USES=		shebangfix
+SHEBANG_FILES=	bundle_install_all_ruby_versions.sh \
+		run_specs_all_ruby_versions.sh
 PLIST_FILES=	bin/safe_yaml

 .include <bsd.port.mk>
--- a/devel/rubygem-stella/Makefile
+++ b/devel/rubygem-stella/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	stella
 PORTVERSION=	2.1.2.004
+PORTREVISION=	1
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG

@ -10,6 +11,7 @@ MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Define realistic testplans and run them against your webapps

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

 RUN_DEPENDS=	rubygem-benelux>=0.6.1:${PORTSDIR}/devel/rubygem-benelux \
 		rubygem-drydock>=0.6.9:${PORTSDIR}/devel/rubygem-drydock \
@ -26,6 +28,9 @@ NO_ARCH=	yes
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
 RUBYGEM_AUTOPLIST=	yes
+USES=		shebangfix
+SHEBANG_FILES=	bin/stella \
+		support/sample_webapp/app.rb

 PLIST_FILES=	bin/stella

--- a/devel/tortoisehg/Makefile
+++ b/devel/tortoisehg/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	tortoisehg
-PORTVERSION=	3.4.2
+PORTVERSION=	3.5
 CATEGORIES=	devel
 MASTER_SITES=	https://bitbucket.org/tortoisehg/targz/downloads/
 #MASTER_SITES=	http://cdn.bitbucket.org/tortoisehg/targz/downloads/
--- a/devel/tortoisehg/distinfo
+++ b/devel/tortoisehg/distinfo
@ -1,2 +1,2 @@
-SHA256 (tortoisehg-3.4.2.tar.gz) = d22692166dc6ff61c9d12bfe5ceb77fbf87e7dd52222c956976e7987d84145a1
-SIZE (tortoisehg-3.4.2.tar.gz) = 8205349
+SHA256 (tortoisehg-3.5.tar.gz) = b072180ad851c6c04b003a75ee995a6e1a6cbe7d7a26e86398fd0b32f55194de
+SIZE (tortoisehg-3.5.tar.gz) = 7395688
--- a/devel/tortoisehg/files/patch-setup.py
+++ b/devel/tortoisehg/files/patch-setup.py
@ -1,37 +1,26 @@
--- setup_.py	2013-09-06 04:45:26.000000000 +0400
-+++ setup.py	2013-09-09 09:31:13.148575638 +0400
-@@ -362,7 +362,7 @@
- class build(_build_orig):
-     sub_commands = [
-         ('build_qt', None),
+--- setup.py.orig	2015-08-06 04:30:23.000000000 +0300
+++ setup.py	2015-09-05 21:24:08.309849781 +0300
+@@ -413,7 +413,7 @@
+         ('build_config', lambda self: os.name != 'nt'),
+         ('build_ui', None),
+         ('build_qrc', lambda self: 'py2exe' in self.distribution.commands),
 -        ('build_mo', None),
 +%%NLS%%        ('build_mo', None),
         ] + _build_orig.sub_commands
 
 class clean(_clean_orig):
-@@ -381,7 +381,7 @@
-         'build_mo': build_mo ,
-         'clean': clean,
-         'clean_local': clean_local,
-        'update_pot': update_pot ,
-+%%NLS%%        'update_pot': update_pot ,
-         'import_po': import_po
-     }
- 
-@@ -501,11 +501,11 @@
-     _data_files = [(os.path.join('share/pixmaps/tortoisehg', root),
-         [os.path.join(root, file_) for file_ in files])
-         for root, dirs, files in os.walk('icons')]
-    _data_files += [(os.path.join('share', root),
-        [os.path.join(root, file_) for file_ in files])
-        for root, dirs, files in os.walk('locale')]
-    _data_files += [('/usr/share/nautilus-python/extensions/',
+@@ -567,10 +567,10 @@
+             dirs.remove('svg')  # drop source of .ico files
+         _data_files.append((os.path.join('share/pixmaps/tortoisehg', root),
+                             [os.path.join(root, f) for f in files]))
+-    _data_files.extend((os.path.join('share', modir), [mofile])
+-                       for pofile, modir, mofile in _walklocales())
+-    _data_files += [('share/nautilus-python/extensions',
 -                     ['contrib/nautilus-thg.py'])]
-+%%NLS%%    _data_files += [(os.path.join('share', root),
-+%%NLS%%        [os.path.join(root, file_) for file_ in files])
-+%%NLS%%        for root, dirs, files in os.walk('locale')]
-+%%NAUTILUS%%    _data_files += [('%%PREFIX%%/lib/nautilus/extensions-2.0/python',
+%%NLS%%    _data_files.extend((os.path.join('share', modir), [mofile])
+%%NLS%%                       for pofile, modir, mofile in _walklocales())
+%%NAUTILUS%%    _data_files += [('share/nautilus-python/extensions',
 +%%NAUTILUS%%                     ['contrib/nautilus-thg.py'])]
 
-     # Create a config.py.  Distributions will need to supply their own
-     cfgfile = os.path.join('tortoisehg', 'util', 'config.py')
+     return _scripts, _packages, _data_files, _extra
+ 
--- a/devel/tortoisehg/pkg-plist
+++ b/devel/tortoisehg/pkg-plist
@ -111,9 +111,6 @@ bin/thg
 %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/htmlui.py
 %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/htmlui.pyc
 %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/htmlui.pyo
-%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/icons_rc.py
-%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/icons_rc.pyc
-%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/icons_rc.pyo
 %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/infobar.py
 %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/infobar.pyc
 %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/infobar.pyo
@ -404,26 +401,30 @@ share/applications/tortoisehg.desktop
 %%NLS%%share/locale/uk/LC_MESSAGES/tortoisehg.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/tortoisehg.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/tortoisehg.mo
+share/pixmaps/tortoisehg/icons/16x16/actions/hg-add.png
+share/pixmaps/tortoisehg/icons/16x16/actions/thg-repoconfig.png
+share/pixmaps/tortoisehg/icons/16x16/actions/thg-userconfig.png
 share/pixmaps/tortoisehg/icons/16x16/apps/gnupg.png
 share/pixmaps/tortoisehg/icons/16x16/apps/kiln.png
 share/pixmaps/tortoisehg/icons/16x16/apps/reviewboard.png
 share/pixmaps/tortoisehg/icons/16x16/mimetypes/text-x-generic.png
+share/pixmaps/tortoisehg/icons/16x16/status/hg-removed.png
 share/pixmaps/tortoisehg/icons/22x22/actions/window-close.png
 share/pixmaps/tortoisehg/icons/24x24/actions/hg-incoming.png
 share/pixmaps/tortoisehg/icons/24x24/actions/hg-outgoing.png
 share/pixmaps/tortoisehg/icons/24x24/actions/hg-pull.png
 share/pixmaps/tortoisehg/icons/24x24/actions/hg-push.png
+share/pixmaps/tortoisehg/icons/32x32/actions/hg-add.png
+share/pixmaps/tortoisehg/icons/32x32/actions/hg-branch.png
 share/pixmaps/tortoisehg/icons/32x32/actions/hg-sign.png
+share/pixmaps/tortoisehg/icons/32x32/actions/thg-repoconfig.png
+share/pixmaps/tortoisehg/icons/32x32/actions/thg-userconfig.png
+share/pixmaps/tortoisehg/icons/32x32/status/hg-removed.png
 share/pixmaps/tortoisehg/icons/README.txt
 share/pixmaps/tortoisehg/icons/TortoiseMerge.ico
-share/pixmaps/tortoisehg/icons/branch.ico
 share/pixmaps/tortoisehg/icons/detect_rename.ico
 share/pixmaps/tortoisehg/icons/expander-close.png
 share/pixmaps/tortoisehg/icons/expander-open.png
-share/pixmaps/tortoisehg/icons/fallback.svg
-share/pixmaps/tortoisehg/icons/fileadd.ico
-share/pixmaps/tortoisehg/icons/filedelete.ico
-share/pixmaps/tortoisehg/icons/filemodify.ico
 share/pixmaps/tortoisehg/icons/general.ico
 share/pixmaps/tortoisehg/icons/hg.ico
 share/pixmaps/tortoisehg/icons/hgB.ico
@ -436,16 +437,9 @@ share/pixmaps/tortoisehg/icons/menuclone.ico
 share/pixmaps/tortoisehg/icons/menucommit.ico
 share/pixmaps/tortoisehg/icons/menucreaterepos.ico
 share/pixmaps/tortoisehg/icons/menudelete.ico
-share/pixmaps/tortoisehg/icons/menudiff.ico
-share/pixmaps/tortoisehg/icons/menuhelp.ico
-share/pixmaps/tortoisehg/icons/menuimport.ico
 share/pixmaps/tortoisehg/icons/menulog.ico
-share/pixmaps/tortoisehg/icons/menumerge.ico
-share/pixmaps/tortoisehg/icons/menupatch.ico
 share/pixmaps/tortoisehg/icons/menurepobrowse.ico
 share/pixmaps/tortoisehg/icons/menurevert.ico
-share/pixmaps/tortoisehg/icons/menurevisiongraph.ico
-share/pixmaps/tortoisehg/icons/menusettings.ico
 share/pixmaps/tortoisehg/icons/menushowchanged.ico
 share/pixmaps/tortoisehg/icons/menusynch.ico
 share/pixmaps/tortoisehg/icons/proxy.ico
@ -503,7 +497,10 @@ share/pixmaps/tortoisehg/icons/scalable/actions/hg-recover.svg
 share/pixmaps/tortoisehg/icons/scalable/actions/hg-remove.svg
 share/pixmaps/tortoisehg/icons/scalable/actions/hg-rename.svg
 share/pixmaps/tortoisehg/icons/scalable/actions/hg-revert.svg
+share/pixmaps/tortoisehg/icons/scalable/actions/hg-serve.svg
+share/pixmaps/tortoisehg/icons/scalable/actions/hg-shelve.svg
 share/pixmaps/tortoisehg/icons/scalable/actions/hg-status.svg
+share/pixmaps/tortoisehg/icons/scalable/actions/hg-strip.svg
 share/pixmaps/tortoisehg/icons/scalable/actions/hg-tag.svg
 share/pixmaps/tortoisehg/icons/scalable/actions/hg-transplant.svg
 share/pixmaps/tortoisehg/icons/scalable/actions/hg-unbundle.svg
@ -521,6 +518,8 @@ share/pixmaps/tortoisehg/icons/scalable/actions/status-check.svg
 share/pixmaps/tortoisehg/icons/scalable/actions/tasktab-refresh.svg
 share/pixmaps/tortoisehg/icons/scalable/actions/thg-add-subrepo.svg
 share/pixmaps/tortoisehg/icons/scalable/actions/thg-console.svg
+share/pixmaps/tortoisehg/icons/scalable/actions/thg-guess.svg
+share/pixmaps/tortoisehg/icons/scalable/actions/thg-ignore.svg
 share/pixmaps/tortoisehg/icons/scalable/actions/thg-log-load-all.svg
 share/pixmaps/tortoisehg/icons/scalable/actions/thg-mq.svg
 share/pixmaps/tortoisehg/icons/scalable/actions/thg-password.svg
@ -548,15 +547,17 @@ share/pixmaps/tortoisehg/icons/scalable/actions/view-refresh.svg
 share/pixmaps/tortoisehg/icons/scalable/actions/visualdiff.svg
 share/pixmaps/tortoisehg/icons/scalable/apps/help-browser.svg
 share/pixmaps/tortoisehg/icons/scalable/apps/help-readme.svg
+share/pixmaps/tortoisehg/icons/scalable/apps/hg.svg
 share/pixmaps/tortoisehg/icons/scalable/apps/preferences-desktop-font.svg
 share/pixmaps/tortoisehg/icons/scalable/apps/system-file-manager.svg
-share/pixmaps/tortoisehg/icons/scalable/apps/thg-logo.svg
+share/pixmaps/tortoisehg/icons/scalable/apps/thg.svg
 share/pixmaps/tortoisehg/icons/scalable/apps/tools-hooks.svg
 share/pixmaps/tortoisehg/icons/scalable/apps/tools-spanner-hammer.svg
 share/pixmaps/tortoisehg/icons/scalable/apps/utilities-terminal.svg
 share/pixmaps/tortoisehg/icons/scalable/status/hg-merged-both.svg
 share/pixmaps/tortoisehg/icons/scalable/status/hg-merged-p1.svg
 share/pixmaps/tortoisehg/icons/scalable/status/hg-merged-p2.svg
+share/pixmaps/tortoisehg/icons/scalable/status/hg-modified.svg
 share/pixmaps/tortoisehg/icons/scalable/status/hg-patch-applied.svg
 share/pixmaps/tortoisehg/icons/scalable/status/hg-patch-guarded.svg
 share/pixmaps/tortoisehg/icons/scalable/status/hg-patch-unguarded.svg
@ -573,23 +574,6 @@ share/pixmaps/tortoisehg/icons/scalable/status/thg-warning.svg
 share/pixmaps/tortoisehg/icons/settings_repo.ico
 share/pixmaps/tortoisehg/icons/settings_user.ico
 share/pixmaps/tortoisehg/icons/shelve.ico
-share/pixmaps/tortoisehg/icons/svg/add.svg
-share/pixmaps/tortoisehg/icons/svg/checkout.svg
-share/pixmaps/tortoisehg/icons/svg/clone.svg
-share/pixmaps/tortoisehg/icons/svg/commit.svg
-share/pixmaps/tortoisehg/icons/svg/detect_rename.svg
-share/pixmaps/tortoisehg/icons/svg/ignore.svg
-share/pixmaps/tortoisehg/icons/svg/init.svg
-share/pixmaps/tortoisehg/icons/svg/log.svg
-share/pixmaps/tortoisehg/icons/svg/merge.svg
-share/pixmaps/tortoisehg/icons/svg/proxy.svg
-share/pixmaps/tortoisehg/icons/svg/recovery.svg
-share/pixmaps/tortoisehg/icons/svg/refresh_overlays.svg
-share/pixmaps/tortoisehg/icons/svg/remove.svg
-share/pixmaps/tortoisehg/icons/svg/repobrowse.svg
-share/pixmaps/tortoisehg/icons/svg/shelve.svg
-share/pixmaps/tortoisehg/icons/svg/sync.svg
-share/pixmaps/tortoisehg/icons/svg/thg_logo.svg
 share/pixmaps/tortoisehg/icons/thg_logo.ico
 share/pixmaps/tortoisehg/icons/thg_logo_92x50.png
 %%DATADIR%%/mergetools.rc
--- a/devel/trio/Makefile
+++ b/devel/trio/Makefile
@ -2,16 +2,19 @@
 # $FreeBSD$

 PORTNAME=	trio
-PORTVERSION=	1.14
+PORTVERSION=	1.16
 CATEGORIES=	devel
-MASTER_SITES=	SF/c${PORTNAME}/${PORTNAME}/${PORTVERSION}
+MASTER_SITES=	SF/c${PORTNAME}/${PORTNAME}

 MAINTAINER=	rodrigo@FreeBSD.org
 COMMENT=	Fully matured and stable set of printf and string functions

+LICENSE=	BSD2CLAUSE
+
 GNU_CONFIGURE=	yes

 OPTIONS_DEFINE=	DOCS
+USES=	gmake

 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
--- a/devel/trio/distinfo
+++ b/devel/trio/distinfo
@ -1,2 +1,2 @@
-SHA256 (trio-1.14.tar.gz) = 804d0d8f37bbb572389fe0d6b2770d2e632477687b2aaafb72e036fc4505b1b6
-SIZE (trio-1.14.tar.gz) = 158954
+SHA256 (trio-1.16.tar.gz) = 84d0e74f5b25f0b6c7d9b264ef41f98908e65a5056d4e75c5ef0e05d6a69fc0a
+SIZE (trio-1.16.tar.gz) = 167337
--- a/devel/trio/files/patch-Makefile.in
+++ b/devel/trio/files/patch-Makefile.in
@ -1,15 +1,15 @@
--- ./Makefile.in.orig	2014-02-19 12:30:54.040272078 +0100
-+++ ./Makefile.in	2014-02-19 12:31:21.743269418 +0100
-@@ -43,11 +43,11 @@
+--- Makefile.in.orig	2015-09-09 20:50:10 UTC
+++ Makefile.in
+@@ -44,11 +44,11 @@ test:	regression
 	./regression
 
- install:	$(TARGETLIB)
+ install:	$(TARGETLIB) $(TARGETSHLIB)
 -	$(MKDIR) $(libdir)
 -	$(MKDIR) $(includedir)
-	$(INSTALL_DATA) $(TARGETLIB) $(libdir)/$(TARGETLIB)
+-	$(INSTALL_DATA) $(TARGETLIB) $(TARGETSHLIB) $(libdir)/
 +	$(MKDIR) $(DESTDIR)$(libdir)
 +	$(MKDIR) $(DESTDIR)$(includedir)
-+	$(INSTALL_DATA) $(TARGETLIB) $(DESTDIR)$(libdir)/$(TARGETLIB)
+	$(INSTALL_DATA) $(TARGETLIB) $(TARGETSHLIB) $(DESTDIR)$(libdir)/
 	for i in $(TARGETINCS);do \
 -	(set -x;$(INSTALL_DATA) $(srcdir)/$$i $(includedir)); \
 +	(set -x;$(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(includedir)); \
--- a/devel/trio/pkg-plist
+++ b/devel/trio/pkg-plist
@ -4,6 +4,7 @@ include/triop.h
 include/trionan.h
 include/triostr.h
 lib/libtrio.a
+lib/libtrio.so.2.0.0
 %%PORTDOCS%%%%DOCSDIR%%/doc/doc.h
 %%PORTDOCS%%%%DOCSDIR%%/doc/doc_dynamic.h
 %%PORTDOCS%%%%DOCSDIR%%/doc/doc_printf.h
--- a/dns/openresolv/Makefile
+++ b/dns/openresolv/Makefile
@ -3,18 +3,19 @@

 PORTNAME=	openresolv
 PORTVERSION=	1.1
+PORTREVISION=	1
 CATEGORIES=	dns
-MASTER_SITES= http://roy.marples.name/downloads/openresolv/ \
+MASTER_SITES=	http://roy.marples.name/downloads/openresolv/ \
 		ftp://roy.marples.name/pub/openresolv/

 MAINTAINER=	roy@marples.name
 COMMENT=	Resolvconf compatible framework for managing resolv.conf

-USES=	tar:bzip2
+USES=		tar:bzip2
+NO_ARCH=	yes

 SUB_FILES=	pkg-deinstall pkg-message
 PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
 PKGMESSAGE=	${WRKDIR}/pkg-message

-
 .include <bsd.port.mk>
--- a/dns/openresolv/pkg-plist
+++ b/dns/openresolv/pkg-plist
@ -6,3 +6,4 @@ etc/resolvconf/update.d/libc
 etc/resolvconf/update.d/dnsmasq
 etc/resolvconf/update.d/named
 man/man8/resolvconf.8.gz
+@dir /var/run/resolvconf
--- a/editors/Makefile
+++ b/editors/Makefile
@ -208,6 +208,7 @@
    SUBDIR += nano-devel
    SUBDIR += ne
    SUBDIR += nedit
+    SUBDIR += neovim
    SUBDIR += nvi-devel
    SUBDIR += nvi-m17n
    SUBDIR += omegaT
--- a/editors/libreoffice/Makefile
+++ b/editors/libreoffice/Makefile
@ -304,6 +304,7 @@ _MAKE_JOBS=	#

 .include <bsd.port.pre.mk>

+.if ${OPSYS} == FreeBSD
 .if ${COMPILER_FEATURES:Mlibstdc++}
 BROKEN=		Build with system libstdc++ is unsupported
 .endif
@ -312,6 +313,7 @@ BROKEN=		Build with system libstdc++ is unsupported
 BUILD_DEPENDS+=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex
 CONFIGURE_ENV+=	FLEX=${LOCALBASE}/bin/flex
 .endif
+.endif # FreeBSD

 .if ${COMPILER_TYPE} == "clang"
 CXXFLAGS_WARN=	-Woverloaded-virtual -Wno-unknown-pragmas \
--- a/editors/neovim/Makefile
+++ b/editors/neovim/Makefile
@ -0,0 +1,31 @@
+# Created by: Anton Tornqvist <antont@inbox.lv>
+# $FreeBSD$
+
+PORTNAME=	neovim
+PORTVERSION=	0.0.0.201507060407
+CATEGORIES=	editors
+MASTER_SITES=	GH
+
+MAINTAINER=	antont@inbox.lv
+COMMENT=	Next generation Vim
+
+LICENSE=	APACHE20
+
+BUILD_DEPENDS=	luajit:${PORTSDIR}/lang/luajit \
+		${LUA_MODSHAREDIR}/MessagePack.lua:${PORTSDIR}/devel/lua-MessagePack \
+		${LUA_MODLIBDIR}/bit.so:${PORTSDIR}/devel/lua-bitop \
+		${LUA_MODLIBDIR}/lpeg.so:${PORTSDIR}/devel/lua-lpeg
+LIB_DEPENDS=	libunibilium.so:${PORTSDIR}/devel/unibilium \
+		libvterm.so:${PORTSDIR}/devel/libvterm \
+		libtermkey.so:${PORTSDIR}/devel/libtermkey \
+		libuv.so:${PORTSDIR}/devel/libuv \
+		libmsgpack.so:${PORTSDIR}/devel/msgpack
+
+USES=		cmake lua
+USE_GITHUB=	yes
+GH_TAGNAME=	1b78ad1
+
+CMAKE_ARGS+=	-DLUA_PRG=${LUA_CMD} \
+		-DUSE_BUNDLED_DEPS=OFF
+
+.include <bsd.port.mk>
--- a/editors/neovim/distinfo
+++ b/editors/neovim/distinfo
@ -0,0 +1,2 @@
+SHA256 (neovim-neovim-0.0.0.201507060407-1b78ad1_GH0.tar.gz) = 5514f22c96ccca4861b5668fc09f3f8bf4da655bf593dd30ee6ce0a124a6ab45
+SIZE (neovim-neovim-0.0.0.201507060407-1b78ad1_GH0.tar.gz) = 7268024
--- a/editors/neovim/files/patch-CMakeLists.txt
+++ b/editors/neovim/files/patch-CMakeLists.txt
@ -0,0 +1,12 @@
+--- CMakeLists.txt.orig	2015-07-06 08:07:23 UTC
+++ CMakeLists.txt
+@@ -277,6 +277,9 @@ file(GLOB MANPAGES
+   RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+   man/nvim.1)
+ 
+unset(CMAKE_INSTALL_MANDIR)
+set(CMAKE_INSTALL_MANDIR ${CMAKE_INSTALL_PREFIX}/man)
+
+ install_helper(
+   FILES ${MANPAGES}
+   DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
--- a/editors/neovim/pkg-descr
+++ b/editors/neovim/pkg-descr
@ -0,0 +1,3 @@
+Neovim is a project that seeks to aggresively refactor Vim
+
+WWW: http://neovim.org/
--- a/editors/neovim/pkg-plist
+++ b/editors/neovim/pkg-plist
--- a/emulators/gns3/Makefile
+++ b/emulators/gns3/Makefile
@ -26,6 +26,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-legacy-GNS3-${PORTVERSION}
 USES=		cpe python
 USE_PYTHON=	distutils
 PYDISTUTILS_PKGNAME=	GNS3
+NO_ARCH=	yes

 DESKTOP_ENTRIES=	"GNS3" "${COMMENT}" "" "${PORTNAME}" "System;Emulator;" true

--- a/emulators/gns3/pkg-plist
+++ b/emulators/gns3/pkg-plist
@ -542,7 +542,3 @@ man/man1/gns3.1.gz
 %%PYTHON_SITELIBDIR%%/GNS3/__init__.py
 %%PYTHON_SITELIBDIR%%/GNS3/__init__.pyc
 %%PYTHON_SITELIBDIR%%/GNS3/__init__.pyo
-%%PYTHON_SITELIBDIR%%/GNS3-%%VERSION%%-py%%PYTHON_VERSION%%.egg-info/PKG-INFO
-%%PYTHON_SITELIBDIR%%/GNS3-%%VERSION%%-py%%PYTHON_VERSION%%.egg-info/SOURCES.txt
-%%PYTHON_SITELIBDIR%%/GNS3-%%VERSION%%-py%%PYTHON_VERSION%%.egg-info/dependency_links.txt
-%%PYTHON_SITELIBDIR%%/GNS3-%%VERSION%%-py%%PYTHON_VERSION%%.egg-info/top_level.txt
--- a/graphics/graphite2/Makefile
+++ b/graphics/graphite2/Makefile
@ -1,9 +1,10 @@
 # $FreeBSD$

 PORTNAME=	graphite2
-PORTVERSION=	1.3.1
+PORTVERSION=	1.3.2
 CATEGORIES=	graphics print
-MASTER_SITES=	SF/silgraphite/${PORTNAME}
+MASTER_SITES=	http://projects.palaso.org/attachments/download/434/ \
+		SF/silgraphite/${PORTNAME}

 MAINTAINER=	office@FreeBSD.org
 COMMENT=	Rendering capabilities for complex non-Roman writing systems
--- a/graphics/graphite2/distinfo
+++ b/graphics/graphite2/distinfo
@ -1,2 +1,2 @@
-SHA256 (graphite2-1.3.1.tgz) = a599930cf5b7d78e9ab47708940af572e57a78726222eaf9aa58bcee3dad7077
-SIZE (graphite2-1.3.1.tgz) = 8495904
+SHA256 (graphite2-1.3.2.tgz) = 97af064ff07828f8724b5a9c27d63e2df5aef69a742f0f67cc3f68c3f15d3850
+SIZE (graphite2-1.3.2.tgz) = 8494277
--- a/graphics/graphite2/pkg-descr
+++ b/graphics/graphite2/pkg-descr
@ -9,4 +9,4 @@ displaying writing systems with various complex behaviors, such as:
 * stacking diacritics
 * complex positioning 

-WWW:	http://scripts.sil.org/RenderingGraphite
+WWW: http://graphite.sil.org
--- a/graphics/rubygem-gruff/Makefile
+++ b/graphics/rubygem-gruff/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	gruff
 PORTVERSION=	0.6.0
+PORTREVISION=	1
 CATEGORIES=	graphics rubygems
 MASTER_SITES=	RG

@ -10,6 +11,7 @@ MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Beautiful graphing library for Ruby using RMagick

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

 RUN_DEPENDS=	rubygem-rmagick>=2.13.4:${PORTSDIR}/graphics/rubygem-rmagick

@ -17,5 +19,8 @@ NO_ARCH=	yes
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
 RUBYGEM_AUTOPLIST=	yes
+USES=		shebangfix
+SHEBANG_FILES=	test/image_compare.rb
+ruby_OLD_CMD=	ruby

 .include <bsd.port.mk>
--- a/irc/bitchx/Makefile
+++ b/irc/bitchx/Makefile
@ -28,6 +28,8 @@ DOCSDIR=	${PREFIX}/share/bx/help
 PORTDOCS=	*
 DATADIR=	${PREFIX}/share/bx

+MAKE_JOBS_UNSAFE=	yes
+
 OPTIONS_DEFINE=	DOCS HEBREW IPV6 LATIN PLUGINS SSL TOGGLES

 LATIN_DESC=	Recommended for ISO-8859-1 display
--- a/irc/epic5/Makefile
+++ b/irc/epic5/Makefile
@ -2,8 +2,7 @@
 # $FreeBSD$

 PORTNAME=	epic5
-PORTVERSION=	1.1.11
-PORTREVISION=	1
+PORTVERSION=	1.4
 CATEGORIES=	irc ipv6
 MASTER_SITES=	http://ftp.epicsol.org/pub/epic/EPIC5-PRODUCTION/

@ -22,7 +21,7 @@ OPTIONS_DEFINE=	DOCS PERL RUBY TCL TERMCAP
 TERMCAP_DESC=	Refuse to use terminfo/ncurses

 CONFIGURE_ARGS+=--with-iconv=${ICONV_PREFIX}
-USES=		iconv libarchive tar:bzip2
+USES=		iconv libarchive tar:xz

 PERL_USES=	perl5
 PERL_CONFIGURE_WITH=	perl
--- a/irc/epic5/distinfo
+++ b/irc/epic5/distinfo
@ -1,2 +1,2 @@
-SHA256 (epic5-1.1.11.tar.bz2) = ca9a5c6490ddb00ad6eff5221db38ade205a5ce85bdfdd880de253ed77c9550a
-SIZE (epic5-1.1.11.tar.bz2) = 873117
+SHA256 (epic5-1.4.tar.xz) = 3bc04e07768040db266667513158d2c640544abb49cbab29343f6ef05ebd621e
+SIZE (epic5-1.4.tar.xz) = 799024
--- a/irc/epic5/pkg-message
+++ b/irc/epic5/pkg-message
@ -1,5 +1,4 @@
-EPIC is a toolkit, much akin to a box of legos.  It strives to let you
-build a client the way you want it.  You will not find EPIC usable without
-a script of some sort.
+You will find EPIC to be a bit primitive without a script of some sort.
+
 Some of the more popular scripts can be found at:
 http://scripts.epicsol.org/doku.php/scripts
--- a/irc/ruby-irc/Makefile
+++ b/irc/ruby-irc/Makefile
@ -16,6 +16,7 @@ COMMENT=	IRC client framework for Ruby
 USE_RUBY=	yes

 NO_BUILD=	yes
+NO_ARCH=	yes

 DOCS_EN=	BUGS		ChangeLog	MANIFEST \
 		NEWS		README		TODO
--- a/irc/ruby-irc/pkg-plist
+++ b/irc/ruby-irc/pkg-plist
@ -30,3 +30,5 @@
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/cpi/syslog.cpi
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/cpi/userlog.cpi
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/bot.rb
+@dir %%RUBY_MODEXAMPLESDIR%%/log
+@dir %%RUBY_MODEXAMPLESDIR%%/ja/log
--- a/lang/go/Makefile
+++ b/lang/go/Makefile
@ -39,9 +39,9 @@ GOARCH=arm
 IGNORE=		unknown arch ${ARCH}
 .endif

-PLIST_SUB+=	ARCH=${GOARCH}
+PLIST_SUB+=	opsys_ARCH=${OPSYS:tl}_${GOARCH}

-.if (${OSVERSION} >= 1100000)
+.if ${OPSYS} == FreeBSD && (${OSVERSION} >= 1100000)
 EXTRA_PATCHES+=	${FILESDIR}/struct-if_data-patch
 .endif

--- a/lang/go/files/bsd.go.mk
+++ b/lang/go/files/bsd.go.mk
@ -34,12 +34,12 @@ CGO_LDFLAGS+=	-L${LOCALBASE}/lib
 # Read-only variables
 GO_CMD=		${LOCALBASE}/bin/go
 LOCAL_GOPATH=	${LOCALBASE}/share/go
-GO_LIBDIR=	share/go/pkg/freebsd_${GOARCH}
+GO_LIBDIR=	share/go/pkg/${OPSYS:tl}_${GOARCH}
 GO_SRCDIR=	share/go/src
 GO_WRKSRC=	${GO_WRKDIR_SRC}/${GO_PKGNAME}
 GO_WRKDIR_BIN=	${WRKDIR}/bin
 GO_WRKDIR_SRC=	${WRKDIR}/src
-GO_WRKDIR_PKG=	${WRKDIR}/pkg/freebsd_${GOARCH}
+GO_WRKDIR_PKG=	${WRKDIR}/pkg/${OPSYS:tl}_${GOARCH}

 BUILD_DEPENDS+=	${GO_CMD}:${PORTSDIR}/lang/go
 GO_ENV+=	GOPATH="${WRKDIR}:${LOCAL_GOPATH}" \
--- a/lang/go/pkg-plist
+++ b/lang/go/pkg-plist
@ -374,29 +374,29 @@ go/misc/trace/trace_viewer_lean.html
 go/pkg/bootstrap/bin/asm
 go/pkg/bootstrap/bin/compile
 go/pkg/bootstrap/bin/link
-go/pkg/bootstrap/pkg/freebsd_%%ARCH%%/bootstrap/asm/internal/arch.a
-go/pkg/bootstrap/pkg/freebsd_%%ARCH%%/bootstrap/asm/internal/asm.a
-go/pkg/bootstrap/pkg/freebsd_%%ARCH%%/bootstrap/asm/internal/flags.a
-go/pkg/bootstrap/pkg/freebsd_%%ARCH%%/bootstrap/asm/internal/lex.a
-go/pkg/bootstrap/pkg/freebsd_%%ARCH%%/bootstrap/compile/internal/amd64.a
-go/pkg/bootstrap/pkg/freebsd_%%ARCH%%/bootstrap/compile/internal/arm.a
-go/pkg/bootstrap/pkg/freebsd_%%ARCH%%/bootstrap/compile/internal/arm64.a
-go/pkg/bootstrap/pkg/freebsd_%%ARCH%%/bootstrap/compile/internal/big.a
-go/pkg/bootstrap/pkg/freebsd_%%ARCH%%/bootstrap/compile/internal/gc.a
-go/pkg/bootstrap/pkg/freebsd_%%ARCH%%/bootstrap/compile/internal/ppc64.a
-go/pkg/bootstrap/pkg/freebsd_%%ARCH%%/bootstrap/compile/internal/x86.a
-go/pkg/bootstrap/pkg/freebsd_%%ARCH%%/bootstrap/internal/gcprog.a
-go/pkg/bootstrap/pkg/freebsd_%%ARCH%%/bootstrap/internal/obj.a
-go/pkg/bootstrap/pkg/freebsd_%%ARCH%%/bootstrap/internal/obj/arm.a
-go/pkg/bootstrap/pkg/freebsd_%%ARCH%%/bootstrap/internal/obj/arm64.a
-go/pkg/bootstrap/pkg/freebsd_%%ARCH%%/bootstrap/internal/obj/ppc64.a
-go/pkg/bootstrap/pkg/freebsd_%%ARCH%%/bootstrap/internal/obj/x86.a
-go/pkg/bootstrap/pkg/freebsd_%%ARCH%%/bootstrap/link/internal/amd64.a
-go/pkg/bootstrap/pkg/freebsd_%%ARCH%%/bootstrap/link/internal/arm.a
-go/pkg/bootstrap/pkg/freebsd_%%ARCH%%/bootstrap/link/internal/arm64.a
-go/pkg/bootstrap/pkg/freebsd_%%ARCH%%/bootstrap/link/internal/ld.a
-go/pkg/bootstrap/pkg/freebsd_%%ARCH%%/bootstrap/link/internal/ppc64.a
-go/pkg/bootstrap/pkg/freebsd_%%ARCH%%/bootstrap/link/internal/x86.a
+go/pkg/bootstrap/pkg/%%opsys_ARCH%%/bootstrap/asm/internal/arch.a
+go/pkg/bootstrap/pkg/%%opsys_ARCH%%/bootstrap/asm/internal/asm.a
+go/pkg/bootstrap/pkg/%%opsys_ARCH%%/bootstrap/asm/internal/flags.a
+go/pkg/bootstrap/pkg/%%opsys_ARCH%%/bootstrap/asm/internal/lex.a
+go/pkg/bootstrap/pkg/%%opsys_ARCH%%/bootstrap/compile/internal/amd64.a
+go/pkg/bootstrap/pkg/%%opsys_ARCH%%/bootstrap/compile/internal/arm.a
+go/pkg/bootstrap/pkg/%%opsys_ARCH%%/bootstrap/compile/internal/arm64.a
+go/pkg/bootstrap/pkg/%%opsys_ARCH%%/bootstrap/compile/internal/big.a
+go/pkg/bootstrap/pkg/%%opsys_ARCH%%/bootstrap/compile/internal/gc.a
+go/pkg/bootstrap/pkg/%%opsys_ARCH%%/bootstrap/compile/internal/ppc64.a
+go/pkg/bootstrap/pkg/%%opsys_ARCH%%/bootstrap/compile/internal/x86.a
+go/pkg/bootstrap/pkg/%%opsys_ARCH%%/bootstrap/internal/gcprog.a
+go/pkg/bootstrap/pkg/%%opsys_ARCH%%/bootstrap/internal/obj.a
+go/pkg/bootstrap/pkg/%%opsys_ARCH%%/bootstrap/internal/obj/arm.a
+go/pkg/bootstrap/pkg/%%opsys_ARCH%%/bootstrap/internal/obj/arm64.a
+go/pkg/bootstrap/pkg/%%opsys_ARCH%%/bootstrap/internal/obj/ppc64.a
+go/pkg/bootstrap/pkg/%%opsys_ARCH%%/bootstrap/internal/obj/x86.a
+go/pkg/bootstrap/pkg/%%opsys_ARCH%%/bootstrap/link/internal/amd64.a
+go/pkg/bootstrap/pkg/%%opsys_ARCH%%/bootstrap/link/internal/arm.a
+go/pkg/bootstrap/pkg/%%opsys_ARCH%%/bootstrap/link/internal/arm64.a
+go/pkg/bootstrap/pkg/%%opsys_ARCH%%/bootstrap/link/internal/ld.a
+go/pkg/bootstrap/pkg/%%opsys_ARCH%%/bootstrap/link/internal/ppc64.a
+go/pkg/bootstrap/pkg/%%opsys_ARCH%%/bootstrap/link/internal/x86.a
 go/pkg/bootstrap/src/bootstrap/asm/internal/arch/arch.go
 go/pkg/bootstrap/src/bootstrap/asm/internal/arch/arm.go
 go/pkg/bootstrap/src/bootstrap/asm/internal/arch/arm64.go
@ -615,210 +615,210 @@ go/pkg/bootstrap/src/bootstrap/link/internal/x86/asm.go
 go/pkg/bootstrap/src/bootstrap/link/internal/x86/l.go
 go/pkg/bootstrap/src/bootstrap/link/internal/x86/obj.go
 go/pkg/bootstrap/src/bootstrap/link/main.go
-go/pkg/freebsd_%%ARCH%%/archive/tar.a
-go/pkg/freebsd_%%ARCH%%/archive/zip.a
-go/pkg/freebsd_%%ARCH%%/bufio.a
-go/pkg/freebsd_%%ARCH%%/bytes.a
-go/pkg/freebsd_%%ARCH%%/cmd/asm/internal/arch.a
-go/pkg/freebsd_%%ARCH%%/cmd/asm/internal/asm.a
-go/pkg/freebsd_%%ARCH%%/cmd/asm/internal/flags.a
-go/pkg/freebsd_%%ARCH%%/cmd/asm/internal/lex.a
-go/pkg/freebsd_%%ARCH%%/cmd/compile/internal/amd64.a
-go/pkg/freebsd_%%ARCH%%/cmd/compile/internal/arm.a
-go/pkg/freebsd_%%ARCH%%/cmd/compile/internal/arm64.a
-go/pkg/freebsd_%%ARCH%%/cmd/compile/internal/big.a
-go/pkg/freebsd_%%ARCH%%/cmd/compile/internal/gc.a
-go/pkg/freebsd_%%ARCH%%/cmd/compile/internal/ppc64.a
-go/pkg/freebsd_%%ARCH%%/cmd/compile/internal/x86.a
-go/pkg/freebsd_%%ARCH%%/cmd/internal/gcprog.a
-go/pkg/freebsd_%%ARCH%%/cmd/internal/goobj.a
-go/pkg/freebsd_%%ARCH%%/cmd/internal/obj.a
-go/pkg/freebsd_%%ARCH%%/cmd/internal/obj/arm.a
-go/pkg/freebsd_%%ARCH%%/cmd/internal/obj/arm64.a
-go/pkg/freebsd_%%ARCH%%/cmd/internal/obj/ppc64.a
-go/pkg/freebsd_%%ARCH%%/cmd/internal/obj/x86.a
-go/pkg/freebsd_%%ARCH%%/cmd/internal/objfile.a
-go/pkg/freebsd_%%ARCH%%/cmd/internal/rsc.io/arm/armasm.a
-go/pkg/freebsd_%%ARCH%%/cmd/internal/rsc.io/x86/x86asm.a
-go/pkg/freebsd_%%ARCH%%/cmd/link/internal/amd64.a
-go/pkg/freebsd_%%ARCH%%/cmd/link/internal/arm.a
-go/pkg/freebsd_%%ARCH%%/cmd/link/internal/arm64.a
-go/pkg/freebsd_%%ARCH%%/cmd/link/internal/ld.a
-go/pkg/freebsd_%%ARCH%%/cmd/link/internal/ppc64.a
-go/pkg/freebsd_%%ARCH%%/cmd/link/internal/x86.a
-go/pkg/freebsd_%%ARCH%%/cmd/pprof/internal/commands.a
-go/pkg/freebsd_%%ARCH%%/cmd/pprof/internal/driver.a
-go/pkg/freebsd_%%ARCH%%/cmd/pprof/internal/fetch.a
-go/pkg/freebsd_%%ARCH%%/cmd/pprof/internal/plugin.a
-go/pkg/freebsd_%%ARCH%%/cmd/pprof/internal/profile.a
-go/pkg/freebsd_%%ARCH%%/cmd/pprof/internal/report.a
-go/pkg/freebsd_%%ARCH%%/cmd/pprof/internal/svg.a
-go/pkg/freebsd_%%ARCH%%/cmd/pprof/internal/symbolizer.a
-go/pkg/freebsd_%%ARCH%%/cmd/pprof/internal/symbolz.a
-go/pkg/freebsd_%%ARCH%%/cmd/pprof/internal/tempfile.a
-go/pkg/freebsd_%%ARCH%%/cmd/vet/whitelist.a
-go/pkg/freebsd_%%ARCH%%/compress/bzip2.a
-go/pkg/freebsd_%%ARCH%%/compress/flate.a
-go/pkg/freebsd_%%ARCH%%/compress/gzip.a
-go/pkg/freebsd_%%ARCH%%/compress/lzw.a
-go/pkg/freebsd_%%ARCH%%/compress/zlib.a
-go/pkg/freebsd_%%ARCH%%/container/heap.a
-go/pkg/freebsd_%%ARCH%%/container/list.a
-go/pkg/freebsd_%%ARCH%%/container/ring.a
-go/pkg/freebsd_%%ARCH%%/crypto.a
-go/pkg/freebsd_%%ARCH%%/crypto/aes.a
-go/pkg/freebsd_%%ARCH%%/crypto/cipher.a
-go/pkg/freebsd_%%ARCH%%/crypto/des.a
-go/pkg/freebsd_%%ARCH%%/crypto/dsa.a
-go/pkg/freebsd_%%ARCH%%/crypto/ecdsa.a
-go/pkg/freebsd_%%ARCH%%/crypto/elliptic.a
-go/pkg/freebsd_%%ARCH%%/crypto/hmac.a
-go/pkg/freebsd_%%ARCH%%/crypto/md5.a
-go/pkg/freebsd_%%ARCH%%/crypto/rand.a
-go/pkg/freebsd_%%ARCH%%/crypto/rc4.a
-go/pkg/freebsd_%%ARCH%%/crypto/rsa.a
-go/pkg/freebsd_%%ARCH%%/crypto/sha1.a
-go/pkg/freebsd_%%ARCH%%/crypto/sha256.a
-go/pkg/freebsd_%%ARCH%%/crypto/sha512.a
-go/pkg/freebsd_%%ARCH%%/crypto/subtle.a
-go/pkg/freebsd_%%ARCH%%/crypto/tls.a
-go/pkg/freebsd_%%ARCH%%/crypto/x509.a
-go/pkg/freebsd_%%ARCH%%/crypto/x509/pkix.a
-go/pkg/freebsd_%%ARCH%%/database/sql.a
-go/pkg/freebsd_%%ARCH%%/database/sql/driver.a
-go/pkg/freebsd_%%ARCH%%/debug/dwarf.a
-go/pkg/freebsd_%%ARCH%%/debug/elf.a
-go/pkg/freebsd_%%ARCH%%/debug/gosym.a
-go/pkg/freebsd_%%ARCH%%/debug/macho.a
-go/pkg/freebsd_%%ARCH%%/debug/pe.a
-go/pkg/freebsd_%%ARCH%%/debug/plan9obj.a
-go/pkg/freebsd_%%ARCH%%/encoding.a
-go/pkg/freebsd_%%ARCH%%/encoding/ascii85.a
-go/pkg/freebsd_%%ARCH%%/encoding/asn1.a
-go/pkg/freebsd_%%ARCH%%/encoding/base32.a
-go/pkg/freebsd_%%ARCH%%/encoding/base64.a
-go/pkg/freebsd_%%ARCH%%/encoding/binary.a
-go/pkg/freebsd_%%ARCH%%/encoding/csv.a
-go/pkg/freebsd_%%ARCH%%/encoding/gob.a
-go/pkg/freebsd_%%ARCH%%/encoding/hex.a
-go/pkg/freebsd_%%ARCH%%/encoding/json.a
-go/pkg/freebsd_%%ARCH%%/encoding/pem.a
-go/pkg/freebsd_%%ARCH%%/encoding/xml.a
-go/pkg/freebsd_%%ARCH%%/errors.a
-go/pkg/freebsd_%%ARCH%%/expvar.a
-go/pkg/freebsd_%%ARCH%%/flag.a
-go/pkg/freebsd_%%ARCH%%/fmt.a
-go/pkg/freebsd_%%ARCH%%/go/ast.a
-go/pkg/freebsd_%%ARCH%%/go/build.a
-go/pkg/freebsd_%%ARCH%%/go/constant.a
-go/pkg/freebsd_%%ARCH%%/go/doc.a
-go/pkg/freebsd_%%ARCH%%/go/format.a
-go/pkg/freebsd_%%ARCH%%/go/importer.a
-go/pkg/freebsd_%%ARCH%%/go/internal/gccgoimporter.a
-go/pkg/freebsd_%%ARCH%%/go/internal/gcimporter.a
-go/pkg/freebsd_%%ARCH%%/go/parser.a
-go/pkg/freebsd_%%ARCH%%/go/printer.a
-go/pkg/freebsd_%%ARCH%%/go/scanner.a
-go/pkg/freebsd_%%ARCH%%/go/token.a
-go/pkg/freebsd_%%ARCH%%/go/types.a
-go/pkg/freebsd_%%ARCH%%/hash.a
-go/pkg/freebsd_%%ARCH%%/hash/adler32.a
-go/pkg/freebsd_%%ARCH%%/hash/crc32.a
-go/pkg/freebsd_%%ARCH%%/hash/crc64.a
-go/pkg/freebsd_%%ARCH%%/hash/fnv.a
-go/pkg/freebsd_%%ARCH%%/html.a
-go/pkg/freebsd_%%ARCH%%/html/template.a
-go/pkg/freebsd_%%ARCH%%/image.a
-go/pkg/freebsd_%%ARCH%%/image/color.a
-go/pkg/freebsd_%%ARCH%%/image/color/palette.a
-go/pkg/freebsd_%%ARCH%%/image/draw.a
-go/pkg/freebsd_%%ARCH%%/image/gif.a
-go/pkg/freebsd_%%ARCH%%/image/internal/imageutil.a
-go/pkg/freebsd_%%ARCH%%/image/jpeg.a
-go/pkg/freebsd_%%ARCH%%/image/png.a
-go/pkg/freebsd_%%ARCH%%/index/suffixarray.a
-go/pkg/freebsd_%%ARCH%%/internal/format.a
-go/pkg/freebsd_%%ARCH%%/internal/singleflight.a
-go/pkg/freebsd_%%ARCH%%/internal/testenv.a
-go/pkg/freebsd_%%ARCH%%/internal/trace.a
-go/pkg/freebsd_%%ARCH%%/io.a
-go/pkg/freebsd_%%ARCH%%/io/ioutil.a
-go/pkg/freebsd_%%ARCH%%/log.a
-go/pkg/freebsd_%%ARCH%%/log/syslog.a
-go/pkg/freebsd_%%ARCH%%/math.a
-go/pkg/freebsd_%%ARCH%%/math/big.a
-go/pkg/freebsd_%%ARCH%%/math/cmplx.a
-go/pkg/freebsd_%%ARCH%%/math/rand.a
-go/pkg/freebsd_%%ARCH%%/mime.a
-go/pkg/freebsd_%%ARCH%%/mime/multipart.a
-go/pkg/freebsd_%%ARCH%%/mime/quotedprintable.a
-go/pkg/freebsd_%%ARCH%%/net.a
-go/pkg/freebsd_%%ARCH%%/net/http.a
-go/pkg/freebsd_%%ARCH%%/net/http/cgi.a
-go/pkg/freebsd_%%ARCH%%/net/http/cookiejar.a
-go/pkg/freebsd_%%ARCH%%/net/http/fcgi.a
-go/pkg/freebsd_%%ARCH%%/net/http/httptest.a
-go/pkg/freebsd_%%ARCH%%/net/http/httputil.a
-go/pkg/freebsd_%%ARCH%%/net/http/internal.a
-go/pkg/freebsd_%%ARCH%%/net/http/pprof.a
-go/pkg/freebsd_%%ARCH%%/net/internal/socktest.a
-go/pkg/freebsd_%%ARCH%%/net/mail.a
-go/pkg/freebsd_%%ARCH%%/net/rpc.a
-go/pkg/freebsd_%%ARCH%%/net/rpc/jsonrpc.a
-go/pkg/freebsd_%%ARCH%%/net/smtp.a
-go/pkg/freebsd_%%ARCH%%/net/textproto.a
-go/pkg/freebsd_%%ARCH%%/net/url.a
-go/pkg/freebsd_%%ARCH%%/os.a
-go/pkg/freebsd_%%ARCH%%/os/exec.a
-go/pkg/freebsd_%%ARCH%%/os/signal.a
-go/pkg/freebsd_%%ARCH%%/os/user.a
-go/pkg/freebsd_%%ARCH%%/path.a
-go/pkg/freebsd_%%ARCH%%/path/filepath.a
-go/pkg/freebsd_%%ARCH%%/reflect.a
-go/pkg/freebsd_%%ARCH%%/regexp.a
-go/pkg/freebsd_%%ARCH%%/regexp/syntax.a
-go/pkg/freebsd_%%ARCH%%/runtime.a
-go/pkg/freebsd_%%ARCH%%/runtime/cgo.a
-go/pkg/freebsd_%%ARCH%%/runtime/debug.a
-go/pkg/freebsd_%%ARCH%%/runtime/pprof.a
-go/pkg/freebsd_%%ARCH%%/runtime/race.a
-go/pkg/freebsd_%%ARCH%%/runtime/trace.a
-go/pkg/freebsd_%%ARCH%%/sort.a
-go/pkg/freebsd_%%ARCH%%/strconv.a
-go/pkg/freebsd_%%ARCH%%/strings.a
-go/pkg/freebsd_%%ARCH%%/sync.a
-go/pkg/freebsd_%%ARCH%%/sync/atomic.a
-go/pkg/freebsd_%%ARCH%%/syscall.a
-go/pkg/freebsd_%%ARCH%%/testing.a
-go/pkg/freebsd_%%ARCH%%/testing/iotest.a
-go/pkg/freebsd_%%ARCH%%/testing/quick.a
-go/pkg/freebsd_%%ARCH%%/text/scanner.a
-go/pkg/freebsd_%%ARCH%%/text/tabwriter.a
-go/pkg/freebsd_%%ARCH%%/text/template.a
-go/pkg/freebsd_%%ARCH%%/text/template/parse.a
-go/pkg/freebsd_%%ARCH%%/time.a
-go/pkg/freebsd_%%ARCH%%/unicode.a
-go/pkg/freebsd_%%ARCH%%/unicode/utf16.a
-go/pkg/freebsd_%%ARCH%%/unicode/utf8.a
+go/pkg/%%opsys_ARCH%%/archive/tar.a
+go/pkg/%%opsys_ARCH%%/archive/zip.a
+go/pkg/%%opsys_ARCH%%/bufio.a
+go/pkg/%%opsys_ARCH%%/bytes.a
+go/pkg/%%opsys_ARCH%%/cmd/asm/internal/arch.a
+go/pkg/%%opsys_ARCH%%/cmd/asm/internal/asm.a
+go/pkg/%%opsys_ARCH%%/cmd/asm/internal/flags.a
+go/pkg/%%opsys_ARCH%%/cmd/asm/internal/lex.a
+go/pkg/%%opsys_ARCH%%/cmd/compile/internal/amd64.a
+go/pkg/%%opsys_ARCH%%/cmd/compile/internal/arm.a
+go/pkg/%%opsys_ARCH%%/cmd/compile/internal/arm64.a
+go/pkg/%%opsys_ARCH%%/cmd/compile/internal/big.a
+go/pkg/%%opsys_ARCH%%/cmd/compile/internal/gc.a
+go/pkg/%%opsys_ARCH%%/cmd/compile/internal/ppc64.a
+go/pkg/%%opsys_ARCH%%/cmd/compile/internal/x86.a
+go/pkg/%%opsys_ARCH%%/cmd/internal/gcprog.a
+go/pkg/%%opsys_ARCH%%/cmd/internal/goobj.a
+go/pkg/%%opsys_ARCH%%/cmd/internal/obj.a
+go/pkg/%%opsys_ARCH%%/cmd/internal/obj/arm.a
+go/pkg/%%opsys_ARCH%%/cmd/internal/obj/arm64.a
+go/pkg/%%opsys_ARCH%%/cmd/internal/obj/ppc64.a
+go/pkg/%%opsys_ARCH%%/cmd/internal/obj/x86.a
+go/pkg/%%opsys_ARCH%%/cmd/internal/objfile.a
+go/pkg/%%opsys_ARCH%%/cmd/internal/rsc.io/arm/armasm.a
+go/pkg/%%opsys_ARCH%%/cmd/internal/rsc.io/x86/x86asm.a
+go/pkg/%%opsys_ARCH%%/cmd/link/internal/amd64.a
+go/pkg/%%opsys_ARCH%%/cmd/link/internal/arm.a
+go/pkg/%%opsys_ARCH%%/cmd/link/internal/arm64.a
+go/pkg/%%opsys_ARCH%%/cmd/link/internal/ld.a
+go/pkg/%%opsys_ARCH%%/cmd/link/internal/ppc64.a
+go/pkg/%%opsys_ARCH%%/cmd/link/internal/x86.a
+go/pkg/%%opsys_ARCH%%/cmd/pprof/internal/commands.a
+go/pkg/%%opsys_ARCH%%/cmd/pprof/internal/driver.a
+go/pkg/%%opsys_ARCH%%/cmd/pprof/internal/fetch.a
+go/pkg/%%opsys_ARCH%%/cmd/pprof/internal/plugin.a
+go/pkg/%%opsys_ARCH%%/cmd/pprof/internal/profile.a
+go/pkg/%%opsys_ARCH%%/cmd/pprof/internal/report.a
+go/pkg/%%opsys_ARCH%%/cmd/pprof/internal/svg.a
+go/pkg/%%opsys_ARCH%%/cmd/pprof/internal/symbolizer.a
+go/pkg/%%opsys_ARCH%%/cmd/pprof/internal/symbolz.a
+go/pkg/%%opsys_ARCH%%/cmd/pprof/internal/tempfile.a
+go/pkg/%%opsys_ARCH%%/cmd/vet/whitelist.a
+go/pkg/%%opsys_ARCH%%/compress/bzip2.a
+go/pkg/%%opsys_ARCH%%/compress/flate.a
+go/pkg/%%opsys_ARCH%%/compress/gzip.a
+go/pkg/%%opsys_ARCH%%/compress/lzw.a
+go/pkg/%%opsys_ARCH%%/compress/zlib.a
+go/pkg/%%opsys_ARCH%%/container/heap.a
+go/pkg/%%opsys_ARCH%%/container/list.a
+go/pkg/%%opsys_ARCH%%/container/ring.a
+go/pkg/%%opsys_ARCH%%/crypto.a
+go/pkg/%%opsys_ARCH%%/crypto/aes.a
+go/pkg/%%opsys_ARCH%%/crypto/cipher.a
+go/pkg/%%opsys_ARCH%%/crypto/des.a
+go/pkg/%%opsys_ARCH%%/crypto/dsa.a
+go/pkg/%%opsys_ARCH%%/crypto/ecdsa.a
+go/pkg/%%opsys_ARCH%%/crypto/elliptic.a
+go/pkg/%%opsys_ARCH%%/crypto/hmac.a
+go/pkg/%%opsys_ARCH%%/crypto/md5.a
+go/pkg/%%opsys_ARCH%%/crypto/rand.a
+go/pkg/%%opsys_ARCH%%/crypto/rc4.a
+go/pkg/%%opsys_ARCH%%/crypto/rsa.a
+go/pkg/%%opsys_ARCH%%/crypto/sha1.a
+go/pkg/%%opsys_ARCH%%/crypto/sha256.a
+go/pkg/%%opsys_ARCH%%/crypto/sha512.a
+go/pkg/%%opsys_ARCH%%/crypto/subtle.a
+go/pkg/%%opsys_ARCH%%/crypto/tls.a
+go/pkg/%%opsys_ARCH%%/crypto/x509.a
+go/pkg/%%opsys_ARCH%%/crypto/x509/pkix.a
+go/pkg/%%opsys_ARCH%%/database/sql.a
+go/pkg/%%opsys_ARCH%%/database/sql/driver.a
+go/pkg/%%opsys_ARCH%%/debug/dwarf.a
+go/pkg/%%opsys_ARCH%%/debug/elf.a
+go/pkg/%%opsys_ARCH%%/debug/gosym.a
+go/pkg/%%opsys_ARCH%%/debug/macho.a
+go/pkg/%%opsys_ARCH%%/debug/pe.a
+go/pkg/%%opsys_ARCH%%/debug/plan9obj.a
+go/pkg/%%opsys_ARCH%%/encoding.a
+go/pkg/%%opsys_ARCH%%/encoding/ascii85.a
+go/pkg/%%opsys_ARCH%%/encoding/asn1.a
+go/pkg/%%opsys_ARCH%%/encoding/base32.a
+go/pkg/%%opsys_ARCH%%/encoding/base64.a
+go/pkg/%%opsys_ARCH%%/encoding/binary.a
+go/pkg/%%opsys_ARCH%%/encoding/csv.a
+go/pkg/%%opsys_ARCH%%/encoding/gob.a
+go/pkg/%%opsys_ARCH%%/encoding/hex.a
+go/pkg/%%opsys_ARCH%%/encoding/json.a
+go/pkg/%%opsys_ARCH%%/encoding/pem.a
+go/pkg/%%opsys_ARCH%%/encoding/xml.a
+go/pkg/%%opsys_ARCH%%/errors.a
+go/pkg/%%opsys_ARCH%%/expvar.a
+go/pkg/%%opsys_ARCH%%/flag.a
+go/pkg/%%opsys_ARCH%%/fmt.a
+go/pkg/%%opsys_ARCH%%/go/ast.a
+go/pkg/%%opsys_ARCH%%/go/build.a
+go/pkg/%%opsys_ARCH%%/go/constant.a
+go/pkg/%%opsys_ARCH%%/go/doc.a
+go/pkg/%%opsys_ARCH%%/go/format.a
+go/pkg/%%opsys_ARCH%%/go/importer.a
+go/pkg/%%opsys_ARCH%%/go/internal/gccgoimporter.a
+go/pkg/%%opsys_ARCH%%/go/internal/gcimporter.a
+go/pkg/%%opsys_ARCH%%/go/parser.a
+go/pkg/%%opsys_ARCH%%/go/printer.a
+go/pkg/%%opsys_ARCH%%/go/scanner.a
+go/pkg/%%opsys_ARCH%%/go/token.a
+go/pkg/%%opsys_ARCH%%/go/types.a
+go/pkg/%%opsys_ARCH%%/hash.a
+go/pkg/%%opsys_ARCH%%/hash/adler32.a
+go/pkg/%%opsys_ARCH%%/hash/crc32.a
+go/pkg/%%opsys_ARCH%%/hash/crc64.a
+go/pkg/%%opsys_ARCH%%/hash/fnv.a
+go/pkg/%%opsys_ARCH%%/html.a
+go/pkg/%%opsys_ARCH%%/html/template.a
+go/pkg/%%opsys_ARCH%%/image.a
+go/pkg/%%opsys_ARCH%%/image/color.a
+go/pkg/%%opsys_ARCH%%/image/color/palette.a
+go/pkg/%%opsys_ARCH%%/image/draw.a
+go/pkg/%%opsys_ARCH%%/image/gif.a
+go/pkg/%%opsys_ARCH%%/image/internal/imageutil.a
+go/pkg/%%opsys_ARCH%%/image/jpeg.a
+go/pkg/%%opsys_ARCH%%/image/png.a
+go/pkg/%%opsys_ARCH%%/index/suffixarray.a
+go/pkg/%%opsys_ARCH%%/internal/format.a
+go/pkg/%%opsys_ARCH%%/internal/singleflight.a
+go/pkg/%%opsys_ARCH%%/internal/testenv.a
+go/pkg/%%opsys_ARCH%%/internal/trace.a
+go/pkg/%%opsys_ARCH%%/io.a
+go/pkg/%%opsys_ARCH%%/io/ioutil.a
+go/pkg/%%opsys_ARCH%%/log.a
+go/pkg/%%opsys_ARCH%%/log/syslog.a
+go/pkg/%%opsys_ARCH%%/math.a
+go/pkg/%%opsys_ARCH%%/math/big.a
+go/pkg/%%opsys_ARCH%%/math/cmplx.a
+go/pkg/%%opsys_ARCH%%/math/rand.a
+go/pkg/%%opsys_ARCH%%/mime.a
+go/pkg/%%opsys_ARCH%%/mime/multipart.a
+go/pkg/%%opsys_ARCH%%/mime/quotedprintable.a
+go/pkg/%%opsys_ARCH%%/net.a
+go/pkg/%%opsys_ARCH%%/net/http.a
+go/pkg/%%opsys_ARCH%%/net/http/cgi.a
+go/pkg/%%opsys_ARCH%%/net/http/cookiejar.a
+go/pkg/%%opsys_ARCH%%/net/http/fcgi.a
+go/pkg/%%opsys_ARCH%%/net/http/httptest.a
+go/pkg/%%opsys_ARCH%%/net/http/httputil.a
+go/pkg/%%opsys_ARCH%%/net/http/internal.a
+go/pkg/%%opsys_ARCH%%/net/http/pprof.a
+go/pkg/%%opsys_ARCH%%/net/internal/socktest.a
+go/pkg/%%opsys_ARCH%%/net/mail.a
+go/pkg/%%opsys_ARCH%%/net/rpc.a
+go/pkg/%%opsys_ARCH%%/net/rpc/jsonrpc.a
+go/pkg/%%opsys_ARCH%%/net/smtp.a
+go/pkg/%%opsys_ARCH%%/net/textproto.a
+go/pkg/%%opsys_ARCH%%/net/url.a
+go/pkg/%%opsys_ARCH%%/os.a
+go/pkg/%%opsys_ARCH%%/os/exec.a
+go/pkg/%%opsys_ARCH%%/os/signal.a
+go/pkg/%%opsys_ARCH%%/os/user.a
+go/pkg/%%opsys_ARCH%%/path.a
+go/pkg/%%opsys_ARCH%%/path/filepath.a
+go/pkg/%%opsys_ARCH%%/reflect.a
+go/pkg/%%opsys_ARCH%%/regexp.a
+go/pkg/%%opsys_ARCH%%/regexp/syntax.a
+go/pkg/%%opsys_ARCH%%/runtime.a
+go/pkg/%%opsys_ARCH%%/runtime/cgo.a
+go/pkg/%%opsys_ARCH%%/runtime/debug.a
+go/pkg/%%opsys_ARCH%%/runtime/pprof.a
+go/pkg/%%opsys_ARCH%%/runtime/race.a
+go/pkg/%%opsys_ARCH%%/runtime/trace.a
+go/pkg/%%opsys_ARCH%%/sort.a
+go/pkg/%%opsys_ARCH%%/strconv.a
+go/pkg/%%opsys_ARCH%%/strings.a
+go/pkg/%%opsys_ARCH%%/sync.a
+go/pkg/%%opsys_ARCH%%/sync/atomic.a
+go/pkg/%%opsys_ARCH%%/syscall.a
+go/pkg/%%opsys_ARCH%%/testing.a
+go/pkg/%%opsys_ARCH%%/testing/iotest.a
+go/pkg/%%opsys_ARCH%%/testing/quick.a
+go/pkg/%%opsys_ARCH%%/text/scanner.a
+go/pkg/%%opsys_ARCH%%/text/tabwriter.a
+go/pkg/%%opsys_ARCH%%/text/template.a
+go/pkg/%%opsys_ARCH%%/text/template/parse.a
+go/pkg/%%opsys_ARCH%%/time.a
+go/pkg/%%opsys_ARCH%%/unicode.a
+go/pkg/%%opsys_ARCH%%/unicode/utf16.a
+go/pkg/%%opsys_ARCH%%/unicode/utf8.a
 go/pkg/include/funcdata.h
 go/pkg/include/textflag.h
-go/pkg/tool/freebsd_%%ARCH%%/addr2line
-go/pkg/tool/freebsd_%%ARCH%%/api
-go/pkg/tool/freebsd_%%ARCH%%/asm
-go/pkg/tool/freebsd_%%ARCH%%/cgo
-go/pkg/tool/freebsd_%%ARCH%%/compile
-go/pkg/tool/freebsd_%%ARCH%%/cover
-go/pkg/tool/freebsd_%%ARCH%%/dist
-go/pkg/tool/freebsd_%%ARCH%%/doc
-go/pkg/tool/freebsd_%%ARCH%%/fix
-go/pkg/tool/freebsd_%%ARCH%%/link
-go/pkg/tool/freebsd_%%ARCH%%/nm
-go/pkg/tool/freebsd_%%ARCH%%/objdump
-go/pkg/tool/freebsd_%%ARCH%%/pack
-go/pkg/tool/freebsd_%%ARCH%%/pprof
-go/pkg/tool/freebsd_%%ARCH%%/trace
-go/pkg/tool/freebsd_%%ARCH%%/vet
-go/pkg/tool/freebsd_%%ARCH%%/yacc
+go/pkg/tool/%%opsys_ARCH%%/addr2line
+go/pkg/tool/%%opsys_ARCH%%/api
+go/pkg/tool/%%opsys_ARCH%%/asm
+go/pkg/tool/%%opsys_ARCH%%/cgo
+go/pkg/tool/%%opsys_ARCH%%/compile
+go/pkg/tool/%%opsys_ARCH%%/cover
+go/pkg/tool/%%opsys_ARCH%%/dist
+go/pkg/tool/%%opsys_ARCH%%/doc
+go/pkg/tool/%%opsys_ARCH%%/fix
+go/pkg/tool/%%opsys_ARCH%%/link
+go/pkg/tool/%%opsys_ARCH%%/nm
+go/pkg/tool/%%opsys_ARCH%%/objdump
+go/pkg/tool/%%opsys_ARCH%%/pack
+go/pkg/tool/%%opsys_ARCH%%/pprof
+go/pkg/tool/%%opsys_ARCH%%/trace
+go/pkg/tool/%%opsys_ARCH%%/vet
+go/pkg/tool/%%opsys_ARCH%%/yacc
 go/robots.txt
 go/src/Make.dist
 go/src/all.bash
@ -5328,5 +5328,5 @@ go/test/varerr.go
 go/test/varinit.go
 go/test/writebarrier.go
 go/test/zerodivide.go
-@dir go/pkg/freebsd_%%ARCH%%/internal/syscall/windows
-@dir go/pkg/obj/freebsd_%%ARCH%%
+@dir go/pkg/%%opsys_ARCH%%/internal/syscall/windows
+@dir go/pkg/obj/%%opsys_ARCH%%
--- a/lang/php5/Makefile
+++ b/lang/php5/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	php5
-PORTVERSION=	5.4.44
+PORTVERSION=	5.4.45
 PORTREVISION?=	0
 CATEGORIES?=	lang devel www
 MASTER_SITES=	PHP/distributions
--- a/lang/php5/distinfo
+++ b/lang/php5/distinfo
@ -1,4 +1,4 @@
-SHA256 (php-5.4.44.tar.bz2) = 8dd59e5ce9248cf36ac3de5412a518b8b24c01ace6c46ce3d12e4ce981a3856d
-SIZE (php-5.4.44.tar.bz2) = 12705644
+SHA256 (php-5.4.45.tar.bz2) = 4e0d28b1554c95cfaea6fa2b64aac85433f158ce72bb571bcd5574f98f4c6582
+SIZE (php-5.4.45.tar.bz2) = 12703324
 SHA256 (php-5.4.x-mail-header.patch) = 005ae1cd8ed17c72d7b09dee9c4466e8b16d4ecba7fe11276731ed6ff9fbb344
 SIZE (php-5.4.x-mail-header.patch) = 3379
--- a/lang/php55/Makefile
+++ b/lang/php55/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	php55
-PORTVERSION=	5.5.28
+PORTVERSION=	5.5.29
 PORTREVISION?=	0
 CATEGORIES?=	lang devel www
 MASTER_SITES=	PHP/distributions
--- a/lang/php55/distinfo
+++ b/lang/php55/distinfo
@ -1,4 +1,4 @@
-SHA256 (php-5.5.28.tar.bz2) = 197d2c572e030c177e53d3763d59ac6d363d7c78dc22e6cc1e2ac65573d9c2f3
-SIZE (php-5.5.28.tar.bz2) = 13249927
+SHA256 (php-5.5.29.tar.bz2) = fbcee579ecc77cad6960a541116aee669cf145c2cd9a54bf60503a870843b946
+SIZE (php-5.5.29.tar.bz2) = 13698565
 SHA256 (php-5.5.x-mail-header.patch) = b0b5a7c961b2052eb14d9528e76155cbeaa881fb9b4a49f452f9dab07b6fb1c4
 SIZE (php-5.5.x-mail-header.patch) = 3379
--- a/mail/cyrus-imapd25/Makefile
+++ b/mail/cyrus-imapd25/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	cyrus-imapd
-PORTVERSION=	2.5.5
+PORTVERSION=	2.5.6
 #PORTREVISION=	0
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.cyrusimap.org/cyrus-imapd/ \
--- a/mail/cyrus-imapd25/distinfo
+++ b/mail/cyrus-imapd25/distinfo
@ -1,2 +1,2 @@
-SHA256 (cyrus-imapd-2.5.5.tar.gz) = 6cfd45856c869921fa8f89da9be9d5c640757011a678f964252e95a753182eee
-SIZE (cyrus-imapd-2.5.5.tar.gz) = 2940177
+SHA256 (cyrus-imapd-2.5.6.tar.gz) = 60f9be717c17497e7d69f468a8da3daf926c49edeac958bc769b4547f10103df
+SIZE (cyrus-imapd-2.5.6.tar.gz) = 2938962
--- a/mail/phpmailer/Makefile
+++ b/mail/phpmailer/Makefile
@ -9,36 +9,42 @@ CATEGORIES=	mail
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Full Featured Email Transfer Class for PHP

-LICENSE=	LGPL3
-
-OPTIONS_DEFINE=	DOCS EXAMPLES
+LICENSE=	LGPL21
+LICENSE_FILE=	${WRKSRC}/LICENSE

 USE_GITHUB=	yes
 GH_ACCOUNT=	Synchro
 GH_PROJECT=	PHPMailer

 NO_BUILD=	yes
+NO_ARCH=	yes
 USE_PHP=	yes
 USES=		dos2unix

 SUB_FILES=	pkg-message

+OPTIONS_DEFINE=	DOCS EXAMPLES
+
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 .for f in PHPMailerAutoload.php class.phpmailer.php class.pop3.php \
 	class.smtp.php composer.json
-	@${INSTALL_DATA} ${WRKSRC}/$f ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/$f ${STAGEDIR}${DATADIR}
 .endfor
 .for d in extras language test
 	@${MKDIR} ${STAGEDIR}${DATADIR}/$d
-	@${INSTALL_DATA} ${WRKSRC}/$d/* ${STAGEDIR}${DATADIR}/$d
+	${INSTALL_DATA} ${WRKSRC}/$d/* ${STAGEDIR}${DATADIR}/$d
 .endfor
+
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in changelog.md README.md LICENSE
-	@${INSTALL_DATA} ${WRKSRC}/$f ${STAGEDIR}${DOCSDIR}
-	@${CP} -R ${WRKSRC}/docs/* ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/$f ${STAGEDIR}${DOCSDIR}
 .endfor
+	@cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
+
+do-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-	@${CP} -R ${WRKSRC}/examples/* ${STAGEDIR}${EXAMPLESDIR}
+	@cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}

 .include <bsd.port.mk>
--- a/Show More
+++ b/Show More