*/*: sync with upstream

Taken from: FreeBSD

archivers/Makefile

@@ -47,6 +47,7 @@
     SUBDIR += hs-zlib
     SUBDIR += hs-zlib-bindings
     SUBDIR += hs-zlib-enum
+    SUBDIR += innoextract
     SUBDIR += javatar
     SUBDIR += jzip.org
     SUBDIR += jzlib

archivers/innoextract/Makefile

@@ -0,0 +1,26 @@
+# Created by: Nikolai Lifanov <[email protected]>
+# $FreeBSD$
+
+PORTNAME=	innoextract
+PORTVERSION=	1.5
+CATEGORIES=	archivers
+MASTER_SITES=	http://constexpr.org/innoextract/files/
+
+MAINTAINER=	[email protected]
+COMMENT=	Program to extract Inno Setup files
+
+LICENSE=	ZLIB
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+LIB_DEPENDS=	libboost_iostreams.so:${PORTSDIR}/devel/boost-libs \
+		libboost_filesystem.so:${PORTSDIR}/devel/boost-libs \
+		libboost_system.so:${PORTSDIR}/devel/boost-libs \
+		libboost_program_options.so:${PORTSDIR}/devel/boost-libs
+
+USES=		cmake iconv
+CMAKE_ARGS=	-DCMAKE_INSTALL_MANDIR=man
+
+PLIST_FILES=	bin/innoextract \
+		man/man1/innoextract.1.gz
+
+.include <bsd.port.mk>

archivers/innoextract/distinfo

@@ -0,0 +1,2 @@
+SHA256 (innoextract-1.5.tar.gz) = f2594e992ccf2859455475794803b29a67393fadb69d4df1eec34c451ffa48cf
+SIZE (innoextract-1.5.tar.gz) = 179582

archivers/innoextract/pkg-descr

@@ -0,0 +1,5 @@
+Inno Setup is a tool to create installers for Microsoft Windows applications.
+innoextract allows to extract such installers under non-windows systems without
+running the actual installer using Wine.
+
+WWW: http://constexpr.org/innoextract/

audio/Makefile

@@ -134,6 +134,13 @@
     SUBDIR += festlex-oald
     SUBDIR += festlex-ogi
     SUBDIR += festlex-poslex
+    SUBDIR += festvox-cmu_us_awb_arctic
+    SUBDIR += festvox-cmu_us_bdl_arctic
+    SUBDIR += festvox-cmu_us_clb_arctic
+    SUBDIR += festvox-cmu_us_jmk_arctic
+    SUBDIR += festvox-cmu_us_ksp_arctic
+    SUBDIR += festvox-cmu_us_rms_arctic
+    SUBDIR += festvox-cmu_us_slt_arctic
     SUBDIR += festvox-czech
     SUBDIR += festvox-don
     SUBDIR += festvox-el11

audio/festvox-cmu_us_awb_arctic/Makefile

@@ -0,0 +1,9 @@
+# $FreeBSD$
+
+VOICE=	cmu_us_awb_arctic
+
+COMMENT=	CMU US English Scottish male voice for festival
+
+MASTERDIR=	${.CURDIR}/../festvox-cmu_us_slt_arctic
+
+.include "${MASTERDIR}/Makefile"

audio/festvox-cmu_us_awb_arctic/distinfo

@@ -0,0 +1,2 @@
+SHA256 (festival/cmu_us_awb_arctic-0.95-release.tar.bz2) = 3f42f17fcb7eaec5cac61f7e6b6aa928a6ffb45f51b1da124278fd300d47984a
+SIZE (festival/cmu_us_awb_arctic-0.95-release.tar.bz2) = 128979457

audio/festvox-cmu_us_awb_arctic/pkg-descr

@@ -0,0 +1,13 @@
+US English Scottish male voice by the Language Technologies Institute
+at Carnegie Mellon University constructed from phonetically balanced,
+US English single speaker database designed for unit selection
+speech synthesis research.
+
+The speaker is very experienced in building synthetic voices and
+matched prompted US English, though his vowels are very different
+from US English vowels. Scottish English speakers will probably
+find synthesizers based on this voice strange.
+
+(voice_cmu_us_awb_arctic_clunits)
+
+WWW: http://festvox.org/cmu_arctic/dbs_awb.html

audio/festvox-cmu_us_bdl_arctic/Makefile

@@ -0,0 +1,9 @@
+# $FreeBSD$
+
+VOICE=	cmu_us_bdl_arctic
+
+COMMENT=	CMU US English male voice for festival
+
+MASTERDIR=	${.CURDIR}/../festvox-cmu_us_slt_arctic
+
+.include "${MASTERDIR}/Makefile"

audio/festvox-cmu_us_bdl_arctic/distinfo

@@ -0,0 +1,2 @@
+SHA256 (festival/cmu_us_bdl_arctic-0.95-release.tar.bz2) = 3c9ec89942056cb4609ea788a6a455d507f5fa3729fc5d0ffcb6ba7ae1d594c9
+SIZE (festival/cmu_us_bdl_arctic-0.95-release.tar.bz2) = 94333107

audio/festvox-cmu_us_bdl_arctic/pkg-descr

@@ -0,0 +1,8 @@
+US English male voice by the Language Technologies Institute at
+Carnegie Mellon University constructed from phonetically balanced,
+US English single speaker database designed for unit selection
+speech synthesis research.
+
+(voice_cmu_us_bdl_arctic_clunits)
+
+WWW: http://festvox.org/cmu_arctic/dbs_bdl.html

audio/festvox-cmu_us_clb_arctic/Makefile

@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+VOICE=	cmu_us_clb_arctic
+
+COMMENT=	CMU US English female voice for festival
+
+MASTERDIR=	${.CURDIR}/../festvox-cmu_us_slt_arctic
+
+PORTDATA=       *
+
+.include "${MASTERDIR}/Makefile"

audio/festvox-cmu_us_clb_arctic/distinfo

@@ -0,0 +1,2 @@
+SHA256 (festival/cmu_us_clb_arctic-0.95-release.tar.bz2) = 399e49e8a3ad310e5aa1ab57b215dc4abb06013da634e09a0f800220ec19ed35
+SIZE (festival/cmu_us_clb_arctic-0.95-release.tar.bz2) = 130040259

audio/festvox-cmu_us_clb_arctic/pkg-descr

@@ -0,0 +1,8 @@
+US English female voice by the Language Technologies Institute at
+Carnegie Mellon University constructed from phonetically balanced,
+US English single speaker database designed for unit selection
+speech synthesis research.
+
+(voice_cmu_us_clb_arctic_clunits)
+
+WWW: http://festvox.org/cmu_arctic/dbs_clb.html

audio/festvox-cmu_us_jmk_arctic/Makefile

@@ -0,0 +1,9 @@
+# $FreeBSD$
+
+VOICE=	cmu_us_jmk_arctic
+
+COMMENT=	CMU US English Canadian male voice for festival
+
+MASTERDIR=	${.CURDIR}/../festvox-cmu_us_slt_arctic
+
+.include "${MASTERDIR}/Makefile"

audio/festvox-cmu_us_jmk_arctic/distinfo

@@ -0,0 +1,2 @@
+SHA256 (festival/cmu_us_jmk_arctic-0.95-release.tar.bz2) = 9f418da3db9dc037056990dbbb2ce6ad91b84e853ab7f9839c6db50c8ad6b411
+SIZE (festival/cmu_us_jmk_arctic-0.95-release.tar.bz2) = 91729965

audio/festvox-cmu_us_jmk_arctic/pkg-descr

@@ -0,0 +1,8 @@
+US English Canadian male voice by the Language Technologies Institute
+at Carnegie Mellon University constructed from phonetically balanced,
+US English single speaker database designed for unit selection
+speech synthesis research.
+
+(voice_cmu_us_jmk_arctic_clunits)
+
+WWW: http://festvox.org/cmu_arctic/dbs_jmk.html

audio/festvox-cmu_us_ksp_arctic/Makefile

@@ -0,0 +1,9 @@
+# $FreeBSD$
+
+VOICE=	cmu_us_ksp_arctic
+
+COMMENT=	CMU US English Indian male voice for festival
+
+MASTERDIR=	${.CURDIR}/../festvox-cmu_us_slt_arctic
+
+.include "${MASTERDIR}/Makefile"

audio/festvox-cmu_us_ksp_arctic/distinfo

@@ -0,0 +1,2 @@
+SHA256 (festival/cmu_us_ksp_arctic-0.95-release.tar.bz2) = a968b063012c3efcc4a3f0e93e0eda4765df8f92426a4b06bf470eba7ab574b0
+SIZE (festival/cmu_us_ksp_arctic-0.95-release.tar.bz2) = 119175914

audio/festvox-cmu_us_ksp_arctic/pkg-descr

@@ -0,0 +1,8 @@
+US English Indian male voice by the Language Technologies Institute
+at Carnegie Mellon University constructed from phonetically balanced,
+US English single speaker database designed for unit selection
+speech synthesis research.
+
+(voice_cmu_us_ksp_arctic_clunits)
+
+WWW: http://festvox.org/cmu_arctic/dbs_ksp.html

audio/festvox-cmu_us_rms_arctic/Makefile

@@ -0,0 +1,9 @@
+# $FreeBSD$
+
+VOICE=	cmu_us_rms_arctic
+
+COMMENT=	CMU US English male voice for festival
+
+MASTERDIR=	${.CURDIR}/../festvox-cmu_us_slt_arctic
+
+.include "${MASTERDIR}/Makefile"

audio/festvox-cmu_us_rms_arctic/distinfo

@@ -0,0 +1,2 @@
+SHA256 (festival/cmu_us_rms_arctic-0.95-release.tar.bz2) = 86fbf03c366775e962bb576597fb47bcfe7805206b35b5aee564c0920f9e00f1
+SIZE (festival/cmu_us_rms_arctic-0.95-release.tar.bz2) = 116056928

audio/festvox-cmu_us_rms_arctic/pkg-descr

@@ -0,0 +1,8 @@
+US English male voice by the Language Technologies Institute at
+Carnegie Mellon University constructed from phonetically balanced,
+US English single speaker database designed for unit selection
+speech synthesis research.
+
+(voice_cmu_us_rms_arctic_clunits)
+
+WWW: http://festvox.org/cmu_arctic/dbs_rms.html

audio/festvox-cmu_us_slt_arctic/Makefile

@@ -0,0 +1,46 @@
+# $FreeBSD$
+
+PORTNAME=	festvox-${VOICE}
+PORTVERSION=	0.95
+CATEGORIES=	audio
+MASTER_SITES=	http://www.speech.cs.cmu.edu/cmu_arctic/packed/
+DISTNAME=	${VOICE}-${PORTVERSION}-release
+DIST_SUBDIR=	festival
+
+MAINTAINER=	[email protected]
+COMMENT?=	CMU US English female voice for festival
+
+LICENSE=	MIT-variant
+LICENSE_NAME=	MIT License (CMU variant)
+LICENSE_FILE=	${WRKSRC}/COPYING
+LICENSE_PERMS=	dist-mirror pkg-mirror auto-accept dist-sell pkg-sell
+
+RUN_DEPENDS=	festival:${PORTSDIR}/audio/festival \
+	${LOCALBASE}/share/festival/lib/dicts/cmu/cmulex.scm:${PORTSDIR}/audio/festlex-cmu \
+	${LOCALBASE}/share/festival/lib/dicts/wsj.wp39.poslexR:${PORTSDIR}/audio/festlex-poslex
+
+USES=	tar:bzip2
+
+WRKSRC=	${WRKDIR}/${VOICE}
+
+NO_BUILD=	yes
+NO_ARCH=	yes
+
+SUB_FILES=	pkg-message
+SUB_LIST+=	VOICE=${VOICE}
+
+DATADIR=	${PREFIX}/share/festival/lib/voices/us/${VOICE}_clunits
+PORTDATA?=	*
+
+VOICE?=	cmu_us_slt_arctic
+
+DESCR=		${.CURDIR}/pkg-descr
+DISTINFO_FILE=	${.CURDIR}/distinfo
+PKGMESSAGE=	${.CURDIR}/pkg-message
+
+do-install:
+	cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}
+	${RM} ${STAGEDIR}${DATADIR}/.time-stamp
+	${FIND} ${STAGEDIR}${DATADIR} -type d -empty -delete
+
+.include <bsd.port.mk>

audio/festvox-cmu_us_slt_arctic/distinfo

@@ -0,0 +1,2 @@
+SHA256 (festival/cmu_us_slt_arctic-0.95-release.tar.bz2) = 9fddec16fbfbfb7d4989dff0fe77ccbe31f80b07b57be49d09994aa7a67d6dba
+SIZE (festival/cmu_us_slt_arctic-0.95-release.tar.bz2) = 119914432

audio/festvox-cmu_us_slt_arctic/files/pkg-message.in

@@ -0,0 +1,5 @@
+==========================================================================
+For correct operation, please add %%VOICE%%_clunits
+after "(defvar default-voice-priority-list"
+in %%PREFIX%%/share/festival/lib/voices.scm
+==========================================================================

audio/festvox-cmu_us_slt_arctic/pkg-descr

@@ -0,0 +1,8 @@
+US English female voice by the Language Technologies Institute at
+Carnegie Mellon University constructed from phonetically balanced,
+US English single speaker database designed for unit selection
+speech synthesis research.
+
+(voice_cmu_us_slt_arctic_clunits)
+
+WWW: http://festvox.org/cmu_arctic/dbs_slt.html

audio/midipp/Makefile

@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	midipp
-PORTVERSION=	1.2.18
+PORTVERSION=	1.3.0
 CATEGORIES=	audio
 MASTER_SITES=	http://www.selasky.org/hans_petter/distfiles/ \
 		http://home.selasky.org:8192/distfiles/

audio/midipp/distinfo

@@ -1,2 +1,2 @@
-SHA256 (midipp-1.2.18.tar.bz2) = ff15a65aef2e5bd636b82983201eca389f3e890e8a3eeabc48763479209ae805
-SIZE (midipp-1.2.18.tar.bz2) = 103906
+SHA256 (midipp-1.3.0.tar.bz2) = d69db8c440754fddcdb52b52f2cde4a2431d8886d7bbc00b12d96468965bfaa6
+SIZE (midipp-1.3.0.tar.bz2) = 104097

biology/seqtools/Makefile

@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	seqtools
-PORTVERSION=	4.39.1
+PORTVERSION=	4.39.2
 CATEGORIES=	biology
 MASTER_SITES=	ftp://ftp.sanger.ac.uk/pub4/resources/software/seqtools/PRODUCTION/
 

biology/seqtools/distinfo

@@ -1,2 +1,2 @@
-SHA256 (seqtools-4.39.1.tar.gz) = 6faf67a562a7a68446849426baddb91631a496922de8f9ff046da34a78c73e1e
-SIZE (seqtools-4.39.1.tar.gz) = 5602576
+SHA256 (seqtools-4.39.2.tar.gz) = 5d279cf4dcbd1acd83768865c90603380a93564a638f06dd21b9e81132e9cd68
+SIZE (seqtools-4.39.2.tar.gz) = 5602442

cad/opencascade/Makefile

@@ -3,6 +3,7 @@
 
 PORTNAME=	opencascade
 PORTVERSION=	6.9.1
+PORTREVISION=	1
 CATEGORIES=	cad science
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	thierry
@@ -29,7 +30,7 @@ SHEBANG_FILES=	adm/templates/env.sh.in adm/templates/draw.sh		\
 		adm/templates/custom.sh.in adm/templates/custom.sh.main	\
 		adm/start.tcl draw.sh xcode.sh env.sh custom.sh.in	\
 		gendoc codeblocks.sh
-VTKVER=		6.1
+VTKVER=		6.2
 
 OPTIONS_DEFINE=	VIS DOCS
 VIS_DESC=	Build Visualizazion module (requires OpenGL, freetype, ftgl and gl2ps)
@@ -98,6 +99,10 @@ pre-configure:
 	${REINPLACE_CMD} -e 's|tcl8.6|tcl${TCL_VER:C|\.||}|;s|tk8.6|tk${TK_VER:C|\.||}|'	\
 		${WRKSRC}/adm/cmake/${mod}/CMakeLists.txt
 .endfor
+.for mod in TKIVtk TKIVtkDraw
+	${REINPLACE_CMD} -E 's/(vtk[[:alnum:]]+)\-6.1/\1\-${VTKVER}/'	\
+		${WRKSRC}/adm/cmake/${mod}/CMakeLists.txt
+.endfor
 .for es in env.sh adm/templates/env.sh.in
 	${REINPLACE_CMD} -e 's|lin|bsd|' ${WRKSRC}/${es}
 .endfor

converters/p5-Cpanel-JSON-XS/Makefile

@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	Cpanel-JSON-XS
-PORTVERSION=	3.0203
+PORTVERSION=	3.0205
 CATEGORIES=	converters perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:RURBAN

converters/p5-Cpanel-JSON-XS/distinfo

@@ -1,2 +1,2 @@
-SHA256 (Cpanel-JSON-XS-3.0203.tar.gz) = 8dee53561a1e590514a88ff7ee3a34da3e86909a01af5148ce411cb2535ecaa2
-SIZE (Cpanel-JSON-XS-3.0203.tar.gz) = 154429
+SHA256 (Cpanel-JSON-XS-3.0205.tar.gz) = 504791c66dd2227dcab6bb1ca596d8d795953b2830544e189122f07d4cfdd186
+SIZE (Cpanel-JSON-XS-3.0205.tar.gz) = 155960

converters/vda2fbd/Makefile

@@ -9,19 +9,25 @@ MASTER_SITES=	http://www.dhondt.de/
 MAINTAINER=	[email protected]
 COMMENT=	Add-on converter for CalculiX
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
+LICENSE=	GPLv2 # or later
+LICENSE_FILE=	${WRKSRC}/../LICENSE
 
 MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}" YACC="${YACC}"
+WRKSRC_SUBDIR=	src
 
 PORTDOCS=	model.ps.gz
 PLIST_FILES=	bin/vda2fbd
 
+OPTIONS_DEFINE=	DOCS
+
 post-build:
 	cd ${WRKSRC}/../doc && ${GZIP_CMD} -c model.ps > model.ps.gz
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/vda2fbd ${STAGEDIR}${PREFIX}/bin
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
+
+do-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/../doc/model.ps.gz ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>

databases/cego/Makefile

@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	cego
-PORTVERSION=	2.26.14
+PORTVERSION=	2.26.16
 CATEGORIES=	databases
 MASTER_SITES=	http://www.lemke-it.com/
 

databases/cego/distinfo

@@ -1,2 +1,2 @@
-SHA256 (cego-2.26.14.tar.gz) = 86ebe6818b1392cf0f8e2e84eff927a96e2335eaf1ecaa2ff972b38b28826514
-SIZE (cego-2.26.14.tar.gz) = 1365895
+SHA256 (cego-2.26.16.tar.gz) = f139eacb7316d3d67f17de46abc59bf616e799db2f149f8fab49914bb717e01e
+SIZE (cego-2.26.16.tar.gz) = 1366521

databases/mariadb55-client/Makefile

@@ -5,15 +5,17 @@ PKGNAMESUFFIX=	55-client
 
 COMMENT=	Multithreaded SQL database (client)
 
+LICENSE+=	LGPL21
+
 MASTERDIR=	${.CURDIR}/../mariadb55-server
 
 FILESDIR=	${.CURDIR}/files
 PATCHDIR=	${.CURDIR}/files
 PLIST=		${.CURDIR}/pkg-plist
 
-CONFLICTS_INSTALL=	mysql*-client-* \
-			mariadb1[0-9][0-9]-client-* \
-			mariadb5[0-46-9]-client-* \
+CONFLICTS_INSTALL=	mariadb5[0-46-9]-client-* \
+			mariadb1*-client-* \
+			mysql*-client-* \
 			percona*-client-*
 
 CMAKE_ARGS+=	-DWITHOUT_SERVER=1