*/*: sync with upstream

Taken from: FreeBSD

arabic/libreoffice/Makefile

@@ -1,7 +1,8 @@
 # $FreeBSD$
 
+CATEGORIES=	arabic
 LO_I18N=	ar
-CATEGORIES=	arabic editors
 
-.include "${.CURDIR}/../../editors/libreoffice/Makefile.common"
+.include "${.CURDIR}/../../editors/libreoffice/Makefile.i18n"
+
 .include <bsd.port.mk>

arabic/libreoffice/distinfo

@@ -1,2 +1,2 @@
-SHA256 (libreoffice/i18n/LibreOffice_5.0.1_Linux_x86_deb_langpack_ar.tar.gz) = 41bf0e02d42c596d6e596aaf2024c88b5b32a7621742a83e163c31889eb6870d
-SIZE (libreoffice/i18n/LibreOffice_5.0.1_Linux_x86_deb_langpack_ar.tar.gz) = 2255909
+SHA256 (libreoffice/i18n/LibreOffice_5.0.2_Linux_x86_deb_langpack_ar.tar.gz) = a97931103d1588b84769c1e81f15390a186844b43a25079a4448cadb0bd44909
+SIZE (libreoffice/i18n/LibreOffice_5.0.2_Linux_x86_deb_langpack_ar.tar.gz) = 2256043

audio/playgsf/Makefile

@@ -27,12 +27,6 @@ ONLY_FOR_ARCHS=	i386 amd64
 
 PORTSCOUT=	skipv:0.7.2
 
-.include <bsd.port.options.mk>
-
-.if ${OSVERSION} >= 901000
-EXTRA_PATCHES=	${FILESDIR}/extrapatch-VBA__Util.cpp
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} \
 		-e 's|\([[:space:]]*\).*configure.*|\1@true|' \

chinese/libreoffice-zh_CN/Makefile

@@ -1,9 +1,9 @@
 # $FreeBSD$
 
+CATEGORIES=	chinese
 LO_I18N=	zh_CN
 LO_HAS_HELPPACK=	yes
-CATEGORIES=	chinese editors
 
-.include "${.CURDIR}/../../editors/libreoffice/Makefile.common"
+.include "${.CURDIR}/../../editors/libreoffice/Makefile.i18n"
 
 .include <bsd.port.mk>

chinese/libreoffice-zh_CN/distinfo

@@ -1,4 +1,4 @@
-SHA256 (libreoffice/i18n/LibreOffice_5.0.1_Linux_x86_deb_langpack_zh-CN.tar.gz) = c3dbb388ce0a03dc707ea488c41e10d2cbeac6eff9a3c130900ffffec10784b0
-SIZE (libreoffice/i18n/LibreOffice_5.0.1_Linux_x86_deb_langpack_zh-CN.tar.gz) = 568021
-SHA256 (libreoffice/i18n/LibreOffice_5.0.1_Linux_x86_deb_helppack_zh-CN.tar.gz) = 9d74ea20c66061f10e1f94dbda4bb319824d58d5081795ddcb788cfaf92eac7a
-SIZE (libreoffice/i18n/LibreOffice_5.0.1_Linux_x86_deb_helppack_zh-CN.tar.gz) = 10640497
+SHA256 (libreoffice/i18n/LibreOffice_5.0.2_Linux_x86_deb_langpack_zh-CN.tar.gz) = 7aae88629bae27448424ede685cb727f640020b94944cf48354ad487d8956c9d
+SIZE (libreoffice/i18n/LibreOffice_5.0.2_Linux_x86_deb_langpack_zh-CN.tar.gz) = 568024
+SHA256 (libreoffice/i18n/LibreOffice_5.0.2_Linux_x86_deb_helppack_zh-CN.tar.gz) = d82836ba162a9c828e7538f5ff8135ff288d13f9238085faecd67c659499e386
+SIZE (libreoffice/i18n/LibreOffice_5.0.2_Linux_x86_deb_helppack_zh-CN.tar.gz) = 10640521

chinese/libreoffice-zh_TW/Makefile

@@ -1,9 +1,9 @@
 # $FreeBSD$
 
+CATEGORIES=	chinese
 LO_I18N=	zh_TW
 LO_HAS_HELPPACK=	yes
-CATEGORIES=	chinese editors
 
-.include "${.CURDIR}/../../editors/libreoffice/Makefile.common"
+.include "${.CURDIR}/../../editors/libreoffice/Makefile.i18n"
 
 .include <bsd.port.mk>

chinese/libreoffice-zh_TW/distinfo

@@ -1,4 +1,4 @@
-SHA256 (libreoffice/i18n/LibreOffice_5.0.1_Linux_x86_deb_langpack_zh-TW.tar.gz) = 5faebb5aa68f246feb53862cf3e1a2b7cc82b129c75b9840f7826e6236fdfc1c
-SIZE (libreoffice/i18n/LibreOffice_5.0.1_Linux_x86_deb_langpack_zh-TW.tar.gz) = 565003
-SHA256 (libreoffice/i18n/LibreOffice_5.0.1_Linux_x86_deb_helppack_zh-TW.tar.gz) = 37ea3ea4f71c850dd7d067e5f06c33b1be6bf754a0479f08f6866ca05955fbec
-SIZE (libreoffice/i18n/LibreOffice_5.0.1_Linux_x86_deb_helppack_zh-TW.tar.gz) = 10697047
+SHA256 (libreoffice/i18n/LibreOffice_5.0.2_Linux_x86_deb_langpack_zh-TW.tar.gz) = 2b3b567af3a7c3c6c33cb51d3911a343910f355c541c1280b8aab77cbd89d2b0
+SIZE (libreoffice/i18n/LibreOffice_5.0.2_Linux_x86_deb_langpack_zh-TW.tar.gz) = 565312
+SHA256 (libreoffice/i18n/LibreOffice_5.0.2_Linux_x86_deb_helppack_zh-TW.tar.gz) = e0dfa0db2b263ab26afe67dd79b2e37f12adbb87459d098710de85fa25d42a87
+SIZE (libreoffice/i18n/LibreOffice_5.0.2_Linux_x86_deb_helppack_zh-TW.tar.gz) = 10697018

chinese/xpdf/Makefile

@@ -23,6 +23,7 @@ RUN_DEPENDS=	xpdf:${PORTSDIR}/graphics/xpdf \
 		${FONTSDIR}/MSung-Light:${PORTSDIR}/chinese/font-std
 
 NO_BUILD=	yes
+NO_ARCH=	yes
 NO_WRKSUBDIR=	yes
 SUB_FILES=	dot.xpdfrc
 SUB_LIST=	ADOBECMAPDIR=${ADOBECMAPDIR} \

chinese/xpdf/pkg-plist

@@ -7,8 +7,8 @@
 %%DATADIR%%/chinese-traditional/Big5.unicodeMap
 %%DATADIR%%/chinese-traditional/Big5ascii.unicodeMap
 %%DATADIR%%/chinese-traditional/README
-@exec exec < %D/etc/xpdfrc; rm -f %D/etc/xpdfrc; ( grep -v "%%EXTRARC%%"; echo "include %%EXTRARC%%" ) > %D/etc/xpdfrc; chmod 0444 %D/etc/xpdfrc
-@unexec exec < %D/etc/xpdfrc; rm -f %D/etc/xpdfrc; grep -v "%%EXTRARC%%" > %D/etc/xpdfrc; chmod 0444 %D/etc/xpdfrc
+@exec exec < %D/etc/xpdfrc; rm -f %D/etc/xpdfrc; ( grep -v "%%EXTRARC%%"; echo "include %%EXTRARC%%" ) > %D/etc/xpdfrc; chmod 0644 %D/etc/xpdfrc
+@unexec exec < %D/etc/xpdfrc; rm -f %D/etc/xpdfrc; grep -v "%%EXTRARC%%" > %D/etc/xpdfrc; chmod 0644 %D/etc/xpdfrc
 %%DATADIR%%/chinese-traditional/dot.xpdfrc
 %%DATADIR%%/chinese-traditional/CMap/Adobe-CNS1-0
 %%DATADIR%%/chinese-traditional/CMap/Adobe-CNS1-1

databases/firebird25-server/Makefile

@@ -2,12 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	firebird
-PORTVERSION=	2.5.3
-PORTREVISION=	3
+PORTVERSION=	2.5.4
 CATEGORIES?=	databases
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:S/.0//}-Release/
 PKGNAMESUFFIX?=	${PORTVERSION:R:S/.//}-server
-DISTNAME=	${PORTNAME:S/f/F/}-${PORTVERSION}.26780-0
+DISTNAME=	${PORTNAME:S/f/F/}-${PORTVERSION}.26856-0
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	[email protected]
@@ -96,21 +95,18 @@ USES+=		libedit
 USE_LDCONFIG=	yes
 CLIENT_BIN=	gpre isql-fb qli
 
-.include <bsd.port.options.mk>
+OPTIONS_DEFINE=	DOCS
+
+DOCS_PORTDOCS=	*
 
-.if ${PORT_OPTIONS:MDOCS}
-PORTDOCS=	*
 FB_DOCS_FILES=	WhatsNew README.* Firebird* ReleaseNotes.pdf ambiguity.txt \
 		ods11-index-structure.html
 FB_DOCS_DIRS=	sql.extensions license upgrade
 .endif
-.endif
 
 MAKE_ENV+=	FIREBIRD_TMP="${WRKDIR}" FIREBIRD_LOCK="${WRKDIR}"
 MAKE_ARGS+=	PREFIX="${STAGEDIR}${PREFIX}"
 
-OPTIONS_DEFINE=	DOCS
-
 post-extract:
 	@${RM} -rf ${WRKSRC}/extern/icu
 
@@ -204,7 +200,7 @@ do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/gen/firebird/*.msg ${STAGEDIR}${DATADIR}
 
-.if ${PORT_OPTIONS:MDOCS}
+post-install-DOCS-on:
 	@${ECHO_MSG} "===>   Installing documentation for ${PKGNAME}"
 	@${MKDIR} ${FB_DOCS_DIRS:S!^!${STAGEDIR}${DOCSDIR}/!}
 	@${INSTALL_DATA} ${FB_DOCS_FILES:S!^!${WRKSRC}/doc/!} ${STAGEDIR}${DOCSDIR}
@@ -213,6 +209,5 @@ do-install:
 	@${INSTALL_DATA} ${WRKSRC}/doc/license/* ${STAGEDIR}${DOCSDIR}/license
 	@${INSTALL_DATA} ${WRKSRC}/src/misc/upgrade/v2/* ${STAGEDIR}${DOCSDIR}/upgrade
 .endif
-.endif
 
 .include <bsd.port.post.mk>

databases/firebird25-server/distinfo

@@ -1,2 +1,2 @@
-SHA256 (firebird/Firebird-2.5.3.26780-0.tar.bz2) = 0c4b500d189aa9b4c12a7d2cf310a0b770118967c37ebe0edf8581cbcdad7aad
-SIZE (firebird/Firebird-2.5.3.26780-0.tar.bz2) = 13798872
+SHA256 (firebird/Firebird-2.5.4.26856-0.tar.bz2) = 4e775dcf218640d3af507a816aef0060f52a295b9ee5f66ec66f0b0564da18d3
+SIZE (firebird/Firebird-2.5.4.26856-0.tar.bz2) = 13744859

databases/mysql51-scripts/Makefile

@@ -14,5 +14,6 @@ PLIST=		${PKGDIR}/pkg-plist.scripts
 
 SCRIPTS_ONLY=	yes
 USES=		perl5
+NO_ARCH=	yes
 
 .include "${MASTERDIR}/Makefile"

databases/mysql51-server/Makefile

@@ -3,7 +3,7 @@
 
 PORTNAME?=	mysql
 PORTVERSION=	5.1.73
-PORTREVISION?=	2
+PORTREVISION?=	3
 CATEGORIES=	databases
 MASTER_SITES=	MYSQL/MySQL-5.1
 PKGNAMESUFFIX?=	51-server
@@ -14,7 +14,8 @@ COMMENT?=	Multithreaded SQL database (server)
 SLAVEDIRS=	databases/mysql51-client databases/mysql51-scripts
 GNU_CONFIGURE=	yes
 
-USES+=		libtool makeinfo
+USES+=		libtool makeinfo shebangfix
+SHEBANG_FILES=	scripts/*.sh
 CONFIGURE_ARGS=	--localstatedir=/var/db/mysql \
 		--without-debug \
 		--without-readline \

databases/phpmyadmin/Makefile

@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	phpMyAdmin
-DISTVERSION=	4.4.15
+DISTVERSION=	4.5.0.1
 CATEGORIES=	databases www
 MASTER_SITES=	https://files.phpmyadmin.net/${PORTNAME}/${DISTVERSION}/
 DISTNAME=	${PORTNAME}-${DISTVERSION}-all-languages
@@ -18,7 +18,7 @@ CPE_PRODUCT=	${PORTNAME:tl}
 
 NO_BUILD=	yes
 .if !defined(WITHOUT_PHP_DEPENDS)
-IGNORE_WITH_PHP=52
+IGNORE_WITH_PHP=54
 USE_PHP=	ctype session filter mbstring json spl mysqli
 .endif
 

databases/phpmyadmin/distinfo

@@ -1,2 +1,2 @@
-SHA256 (phpMyAdmin-4.4.15-all-languages.tar.xz) = 5b0846cb753a94dfc48993c0626e87fab045dfb7b56c33687a387ad2711b3969
-SIZE (phpMyAdmin-4.4.15-all-languages.tar.xz) = 5595740
+SHA256 (phpMyAdmin-4.5.0.1-all-languages.tar.xz) = ec17e06648a70a6faff2602d00d2dd555b0d99ef3571d0e5153837adce832939
+SIZE (phpMyAdmin-4.5.0.1-all-languages.tar.xz) = 5730712

databases/unixODBC/Makefile

@@ -2,10 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	unixODBC
-PORTVERSION=	2.3.2
-PORTREVISION=	2
+PORTVERSION=	2.3.4
 CATEGORIES=	databases
-MASTER_SITES=	http://www.unixodbc.org/
+MASTER_SITES=	ftp://ftp.unixodbc.org/pub/unixODBC/
 
 MAINTAINER=	[email protected]
 COMMENT=	ODBC library suite for Unix
@@ -27,12 +26,11 @@ USE_LDCONFIG=	yes
 PORTDOCS=	*
 
 post-patch:
-	@${REINPLACE_CMD} -e \
-		'/\.ini/s|^|#|' ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e 's|\.ini$$|.ini.sample|' ${WRKSRC}/Makefile.in
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
-	@${FIND} ${STAGEDIR}${DOCSDIR} -type f -name "*Makefile*" -delete
+	cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} \
+	    "-not -name 'Makefile*'"
 
 .include <bsd.port.mk>

databases/unixODBC/distinfo

@@ -1,2 +1,2 @@
-SHA256 (unixODBC-2.3.2.tar.gz) = 9c3459742f25df5aa3c10a61429bde51a6d4f11552c03095f1d33d7eb02b5c9a
-SIZE (unixODBC-2.3.2.tar.gz) = 1849173
+SHA256 (unixODBC-2.3.4.tar.gz) = 2e1509a96bb18d248bf08ead0d74804957304ff7c6f8b2e5965309c632421e39
+SIZE (unixODBC-2.3.4.tar.gz) = 1830660

databases/unixODBC/pkg-plist

@@ -4,11 +4,14 @@ bin/iusql
 bin/odbc_config
 bin/odbcinst
 bin/slencheck
+@sample etc/odbc.ini.sample
+@sample etc/odbcinst.ini.sample
 include/autotest.h
 include/odbcinst.h
 include/odbcinstext.h
 include/sql.h
 include/sqlext.h
+include/sqlspi.h
 include/sqltypes.h
 include/sqlucode.h
 include/unixodbc_conf.h
@@ -29,12 +32,12 @@ lib/libodbcinst.la
 lib/libodbcinst.so
 lib/libodbcinst.so.2
 lib/libodbcinst.so.2.0.0
+man/man1/dltest.1.gz
 man/man1/isql.1.gz
+man/man1/iusql.1.gz
+man/man1/odbc_config.1.gz
 man/man1/odbcinst.1.gz
 man/man5/odbc.ini.5.gz
 man/man5/odbcinst.ini.5.gz
-@unexec test -s %D/etc/odbcinst.ini || rm -f %D/etc/odbcinst.ini
-@unexec test -s %D/etc/odbc.ini || rm -f %D/etc/odbc.ini
+man/man7/unixODBC.7.gz
 @dir etc/ODBCDataSources
-@exec test -e %D/etc/odbc.ini || touch %D/etc/odbc.ini
-@exec test -e %D/etc/odbcinst.ini || touch %D/etc/odbcinst.ini

deskutils/fbreader/Makefile

@@ -7,7 +7,7 @@ DISTVERSIONSUFFIX=	-freebsdport
 PORTREVISION=	1
 CATEGORIES=	deskutils
 
-MAINTAINER=	fluffy@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Powerful e-book reader
 
 LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \

devel/Makefile

@@ -129,6 +129,7 @@
     SUBDIR += avro-c
     SUBDIR += avro-cpp
     SUBDIR += awscli
+    SUBDIR += b2
     SUBDIR += bam
     SUBDIR += bbfreeze
     SUBDIR += bbfreeze-loader

devel/b2/Makefile

@@ -0,0 +1,29 @@
+# Created by: Bartek Rutkowski <[email protected]>
+# $FreeBSD$
+
+PORTNAME=	b2
+PORTVERSION=	0.2.4
+CATEGORIES=	devel
+MASTER_SITES=	https://www.backblaze.com/b2/docs/
+DISTNAME=	${PORTNAME}
+EXTRACT_SUFX=
+
+MAINTAINER=	[email protected]
+COMMENT=	Command Line Interface for Backblaze's B2 storage service
+
+LICENSE=	MIT
+
+USES=		python:2.6+ shebangfix
+SHEBANG_FILES=	b2
+NO_BUILD=	yes
+
+PLIST_FILES=	bin/${PORTNAME}
+
+do-extract:
+	@${MKDIR} ${WRKSRC}
+	@${CP} ${DISTDIR}/${DISTNAME} ${WRKSRC}
+
+do-install:
+	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+
+.include <bsd.port.mk>

devel/b2/distinfo

@@ -0,0 +1,2 @@
+SHA256 (b2) = 2a73a5daf3915ae30788ebfff51c134bcf5e92157b4079afe8499b2b2eade9f8
+SIZE (b2) = 24688

devel/b2/pkg-descr

@@ -0,0 +1,8 @@
+B2 Cloud Storage is a cloud service for storing files in the cloud.
+Files are available for download at any time, either through the API
+or through a browser-compatible URL.
+
+This package provides Backblaze's official command line tool for
+accessing all of the capabilities of B2 Cloud Storage.
+
+WWW: https://www.backblaze.com/b2/docs/quick_command_line.html

devel/git-cola/Makefile

@@ -16,6 +16,6 @@ USE_GITHUB=	yes
 USES=		desktop-file-utils gettext gmake python
 INSTALLS_ICONS=	YES
 
-MAKE_FLAGS=	"prefix=${PREFIX}"
+MAKE_ARGS=	prefix=${PREFIX} PYTHON=${PYTHON_CMD}
 
 .include <bsd.port.mk>

devel/librcc/Makefile

@@ -8,7 +8,7 @@ CATEGORIES=	devel
 MASTER_SITES=	http://dside.dyndns.org/files/rusxmms/ \
 		LOCAL/fluffy
 
-MAINTAINER=	fluffy@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Library used by rusxmms for language autodetection
 
 LIB_DEPENDS=	librcd.so:${PORTSDIR}/devel/librcd \

devel/librcd/Makefile

@@ -8,7 +8,7 @@ CATEGORIES=	devel
 MASTER_SITES=	http://dside.dyndns.org/files/rusxmms/ \
 		LOCAL/fluffy
 
-MAINTAINER=	fluffy@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Library used by rusxmms for autodetection of Russian charset
 
 GNU_CONFIGURE=	yes

devel/mtbl/Makefile

@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	mtbl
-PORTVERSION=	0.7.0
+PORTVERSION=	0.8.0
 CATEGORIES=	devel
 MASTER_SITES=	FARSIGHT LOCAL/truckman/farsight
 
@@ -11,7 +11,8 @@ COMMENT=	Immutable sorted string table library
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
-LIB_DEPENDS=	libsnappy.so:${PORTSDIR}/archivers/snappy
+LIB_DEPENDS=	liblz4.so:${PORTSDIR}/archivers/liblz4 \
+		libsnappy.so:${PORTSDIR}/archivers/snappy
 
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes

devel/mtbl/distinfo

@@ -1,2 +1,2 @@
-SHA256 (mtbl-0.7.0.tar.gz) = d235695a1393bbe2a5b08b42b0e9577edfcb7b38971ece7f6a0e07eb84e91906
-SIZE (mtbl-0.7.0.tar.gz) = 398848
+SHA256 (mtbl-0.8.0.tar.gz) = 46fa1cc28c49a0b58ff68f803fc1f6d253f9043fa211842ac6265ed101d4ae46
+SIZE (mtbl-0.8.0.tar.gz) = 407912

devel/mtbl/pkg-plist

@@ -1,6 +1,7 @@
 bin/mtbl_dump
 bin/mtbl_info
 bin/mtbl_merge
+bin/mtbl_verify
 include/mtbl.h
 lib/libmtbl.a
 lib/libmtbl.so
@@ -15,6 +16,7 @@ man/man3/mtbl_fileset.3.gz
 man/man3/mtbl_fixed.3.gz
 man/man3/mtbl_iter.3.gz
 man/man3/mtbl_merger.3.gz
+man/man3/mtbl_metadata.3.gz
 man/man3/mtbl_reader.3.gz
 man/man3/mtbl_sorter.3.gz
 man/man3/mtbl_source.3.gz

devel/p5-Perl-OSType/Makefile

@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	Perl-OSType
-PORTVERSION=	1.008
+PORTVERSION=	1.009
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-