Index: head/Mk/bsd.sanity.mk
===================================================================
--- head/Mk/bsd.sanity.mk	(revision 508828)
+++ head/Mk/bsd.sanity.mk	(revision 508829)
@@ -1,302 +1,310 @@
 # $FreeBSD$
 #
 # MAINTAINER: portmgr@FreeBSD.org
 #
 
 # Warnings for everyone
 
 .for opt in ${ALL_OPTIONS:NDEBUG}
 .if defined(WITH_${opt})
 WARNING+=     "WITH_${opt} is unsupported, use WITH=${opt} on the command line, or one of these in /etc/make.conf, OPTIONS_SET+=${opt} to set it globally, or ${OPTIONS_NAME}_SET+=${opt} for only this port."
 .endif
 .if defined(WITHOUT_${opt})
 WARNING+=     "WITHOUT_${opt} is unsupported, use WITHOUT=${opt} on the command line, or one of these in /etc/make.conf, OPTIONS_UNSET+=${opt} to set it globally, or ${OPTIONS_NAME}_UNSET+=${opt} for only this port."
 .endif
 .endfor
 
 ALL_UNSUPPORTED=	WITHOUT_NLS NOPORTDOCS NOPORTEXAMPLES WITH_BDB_VER \
 			OVERRIDE_LINUX_BASE_PORT WITH_OPENSSL_PORT \
 			WITH_OPENSSL_BASE PYTHON_DEFAULT_VERSION \
 			PYTHON2_DEFAULT_VERSION PYTHON3_DEFAULT_VERSION
 ALL_DEPRECATED=
 ALL_NOTNEEDED=		WITH_NEW_XORG WITHOUT_NEW_XORG WITH_KMS WITHOUT_KMS
 
 WITHOUT_NLS_ALT=	"OPTIONS_UNSET=NLS, or ${OPTIONS_NAME}_UNSET+=NLS instead"
 NOPORTDOCS_ALT=		"OPTIONS_UNSET=DOCS, or ${OPTIONS_NAME}_UNSET+=DOCS instead"
 NOPORTEXAMPLES_ALT=	"OPTIONS_UNSET=EXAMPLES, or ${OPTIONS_NAME}_UNSET+=EXAMPLES instead"
 WITH_BDB_VER_ALT=	"DEFAULT_VERSIONS+=bdb=${WITH_BDB_VER}"
 OVERRIDE_LINUX_BASE_PORT_ALT=	"DEFAULT_VERSIONS+=linux=${OVERRIDE_LINUX_BASE_PORT}"
 WITH_OPENSSL_PORT_ALT=	"DEFAULT_VERSIONS+=ssl=${SSL_DEFAULT:Uopenssl} in your make.conf"
 WITH_OPENSSL_BASE_ALT=	"DEFAULT_VERSIONS+=ssl=base in your make.conf"
 WITH_NEW_XORG_ALT=	"removed and has no effect"
 WITHOUT_NEW_XORG_ALT=	${WITH_NEW_XORG_ALT}
 WITH_MKS_ALT=	"removed and has no effect"
 WITHOUT_MKS_ALT=	${WITH_MKS_ALT}
 PYTHON_DEFAULT_VERSION_ALT=	"DEFAULT_VERSIONS=python=${PYTHON_DEFAULT_VERSION:S/^python//}"
 PYTHON2_DEFAULT_VERSION_ALT=	"DEFAULT_VERSIONS=python2=${PYTHON2_DEFAULT_VERSION:S/^python//}"
 PYTHON3_DEFAULT_VERSION_ALT=	"DEFAULT_VERSIONS=python3=${PYTHON3_DEFAULT_VERSION:S/^python//}"
 
 .for a in ${ALL_DEPRECATED}
 .if defined(${a})
 WARNING+=	"${a} is deprecated, please use ${${a}_ALT}"
 .endif
 .endfor
 
 .for a in ${ALL_NOTNEEDED}
 .if defined(${a})
 WARNING+=	"${a} is not needed: ${${a}_REASON}"
 .endif
 .endfor
 
 .for a in ${ALL_UNSUPPORTED}
 .if defined(${a})
 ERROR+=	"${a} is unsupported, please use ${${a}_ALT}"
 .endif
 .endfor
 
 
 
 # Warnings only when DEVELOPER=yes
 
 .if exists(${.CURDIR}/../../Mk/bsd.port.mk)
 .if ${.CURDIR:H:T} != ${PKGCATEGORY}
 DEV_ERROR+=	"The first entry in CATEGORIES should be the directory where the port lives"
 .endif
 .else
 DEV_WARNING+=	"Not validating first entry in CATEGORIES due to being outside of PORTSDIR. Please ensure this is proper when committing."
 .endif
 
 .if defined(USE_PERL5) && ${USE_PERL5} == yes
 DEV_ERROR+=	"USE_PERL5=yes is unsupported, please use USES=perl5 instead"
 .endif
 
 .if !empty(LIB_DEPENDS:M*/../*)
 DEV_ERROR+=	"LIB_DEPENDS contains unsupported relative path to dependency"
 .endif
 
 .if !empty(RUN_DEPENDS:M*/../*)
 DEV_ERROR+=	"RUN_DEPENDS contains unsupported relative path to dependency"
 .endif
 
 .if defined(USE_GNOME) && ${USE_GNOME:Mpkgconfig}
 DEV_ERROR+=	"USE_GNOME=pkgconfig is unsupported, please use USES=pkgconfig"
 .endif
 
 .if defined(USE_ZOPE) && ${USE_ZOPE} == yes
 DEV_ERROR+=	"USE_ZOPE=yes is unsupported, please use USES=zope instead"
 .endif
 
 .if defined(USE_SDL) && ${USE_SDL} == yes
 DEV_ERROR+=	"USE_SDL=yes is unsupported, please use USE_SDL=sdl instead"
 .endif
 
 .if defined(USE_GITHUB) && defined(GH_COMMIT)
 DEV_ERROR+=	"GH_COMMIT is unsupported, please convert GHL-\>GH in MASTER_SITES and set GH_TAGNAME to tag or commit hash and remove GH_COMMIT"
 .endif
 
 .if defined(USE_GNOME) && ${USE_GNOME:Mgnomehack}
 DEV_WARNING+=	"USE_GNOME=gnomehack is deprecated, please use USES=pathfix"
 .endif
 
 .if defined(USE_GNOME) && ${USE_GNOME:Mdesktopfileutils}
 DEV_WARNING+=	"USE_GNOME=desktopfileutils is deprecated, please use USES=desktop-file-utils"
 .endif
 
 .if defined(LIB_DEPENDS) && ${LIB_DEPENDS:Nlib*}
 DEV_ERROR+=	"All LIB_DEPENDS should use the new format and start out with lib.  \(libfoo.so vs foo.so\)"
 .endif
 
 .if defined(LICENSE)
 .if ${LICENSE:MBSD}
 DEV_WARNING+=	"LICENSE must not contain BSD, instead use BSD[234]CLAUSE"
 .endif
 .else
 .  if empty(USES:Mmetaport)
 DEV_WARNING+=	"Please set LICENSE for this port"
 .  endif
 .endif
 
 .for _a in ${ONLY_FOR_ARCHS}
 .if defined(ONLY_FOR_ARCHS_REASON_${_a})
 DEV_WARNING+=	"ONLY_FOR_ARCHS_${_a} is defined and ${_a} is in ONLY_FOR_ARCHS, the message will never be used."
 .endif
 .endfor
 
 .if defined(USE_PYDISTUTILS) && ${USE_PYDISTUTILS} == "easy_install"
 DEV_ERROR+=	"USE_PYDISTUTILS=easy_install is no longer supported, please use USE_PYDISTUTILS=yes"
 .endif
 
 .if defined(USE_PYTHON) && (${USE_PYTHON} == "yes" || ${USE_PYTHON:C/[-0-9.+]*//} == "")
 _PYTHON_VAL := ${USE_PYTHON}
 .if ${_PYTHON_VAL} != "yes"
 DEV_ERROR+=	"USE_PYTHON=${_PYTHON_VAL} is no longer supported, please use USES=python:${_PYTHON_VAL}"
 .else
 DEV_ERROR+=	"USE_PYTHON=yes is no longer supported, please use USES=python"
 .endif
 .endif
 .if defined(USE_PYTHON_RUN)
 .if ${USE_PYTHON_RUN} != "yes"
 DEV_ERROR+=	"USE_PYTHON_RUN is no longer supported, please use USES=python:${USE_PYTHON_RUN},run"
 .else
 DEV_ERROR+=	"USE_PYTHON_RUN is no longer supported, please use USES=python:run"
 .endif
 .endif
 .if defined(USE_PYTHON_BUILD)
 .if ${USE_PYTHON_BUILD} != "yes"
 DEV_ERROR+=	"USE_PYTHON_BUILD is no longer supported, please use USES=python:${USE_PYTHON_BUILD},build"
 .else
 DEV_ERROR+=	"USE_PYTHON_BUILD is no longer supported, please use USES=python:build"
 .endif
 .endif
 
 .if defined(USE_RC_SUBR) && ${USE_RC_SUBR:tu} == YES
 DEV_ERROR+=	"USE_RC_SUBR=yes has not been supported for a long time, remove it."
 .endif
 
 .if defined(USE_TCL) || defined(USE_TCL_BUILD) || defined(USE_TCL_RUN) || defined(USE_TCL_WRAPPER) || \
    defined(USE_TK)  || defined(USE_TK_BUILD)  || defined(USE_TK_RUN)  || defined(USE_TK_WRAPPER)
 DEV_ERROR+=	"USE_TCL and USE_TK are no longer supported, please use USES=tcl or USES=tk"
 .endif
 
 .if defined(USE_FPC) && ${USE_FPC:tl} == "yes"
 DEV_ERROR+=	"USE_FPC=yes is no longer supported, please use USES=fpc"
 .endif
 
 .for _type in EXAMPLES DOCS
 .  if defined(PORT${_type}) && empty(_REALLY_ALL_POSSIBLE_OPTIONS:M${_type})
 DEV_ERROR+=	"PORT${_type} does not do anything unless the ${_type} option is present."
 .  endif
 .endfor
 
+.if empty(PORTEPOCH) || !empty(PORTEPOCH:C/[0-9]+//)
+DEV_ERROR+=	"PORTEPOCH needs to be an integer \>= 0"
+.endif
+
+.if empty(PORTREVISION) || !empty(PORTREVISION:C/[0-9]+//)
+DEV_ERROR+=	"PORTREVISION needs to be an integer \>= 0"
+.endif
+
 # Whitelist of options helper lookalikes that should not be reported on:
 _OPTIONS_HELPERS_SEEN+=	OPENSSL_LDFLAGS
 _BROKEN_OPTIONS_HELPERS=
 .for opt in ${_REALLY_ALL_POSSIBLE_OPTIONS}
 .  for helper in ${_ALL_OPTIONS_HELPERS}
 .    if defined(${opt}_${helper}) && empty(_OPTIONS_HELPERS_SEEN:M${opt}_${helper})
 _BROKEN_OPTIONS_HELPERS+=	${opt}_${helper}
 .    endif
 .  endfor
 .endfor
 .if !empty(_BROKEN_OPTIONS_HELPERS)
 DEV_ERROR+=	"The following options helpers are incorrectly set after bsd.port.options.mk and are ineffective: ${_BROKEN_OPTIONS_HELPERS}"
 .endif
 
 SANITY_UNSUPPORTED=	USE_OPENAL USE_FAM USE_MAKESELF USE_ZIP USE_LHA USE_CMAKE \
 		USE_READLINE USE_ICONV PERL_CONFIGURE PERL_MODBUILD \
 		USE_PERL5_BUILD USE_PERL5_RUN USE_DISPLAY USE_FUSE \
 		USE_GETTEXT USE_GMAKE USE_SCONS USE_DRUPAL NO_INSTALL_MANPAGES \
 		INSTALLS_SHLIB USE_PYDISTUTILS PYTHON_CONCURRENT_INSTALL \
 		PYDISTUTILS_AUTOPLIST PYTHON_PY3K_PLIST_HACK PYDISTUTILS_NOEGGINFO \
 		USE_PYTHON_PREFIX USE_BZIP2 USE_XZ USE_PGSQL NEED_ROOT \
 		UNIQUENAME LATEST_LINK USE_SQLITE USE_FIREBIRD USE_PHPEXT \
 		USE_ZENDEXT USE_PHP_BUILD USE_PHPIZE WANT_PHP_CLI WANT_PHP_CGI \
 		WANT_PHP_MOD WANT_PHP_WEB WANT_PHP_EMB USE_BDB PLIST_DIRSTRY \
 		USE_RCORDER USE_OPENSSL WANT_GNOME RUBYGEM_AUTOPLIST WANT_SDL \
 		INSTALLS_EGGINFO USE_DOS2UNIX NO_STAGE USE_RUBYGEMS USE_GHOSTSCRIPT \
 		USE_GHOSTSCRIPT_BUILD USE_GHOSTSCRIPT_RUN USE_AUTOTOOLS APACHE_PORT \
 		USE_FPC_RUN WANT_FPC_BASE WANT_FPC_ALL USE_QT4 USE_QT5 QT_NONSTANDARD
 SANITY_DEPRECATED=	MLINKS \
 			USE_MYSQL WANT_MYSQL_VER \
 			PYDISTUTILS_INSTALLNOSINGLE \
 			USE_APACHE USE_APACHE_BUILD USE_APACHE_RUN
 SANITY_NOTNEEDED=	CMAKE_NINJA WX_UNICODE USE_KDEBASE_VER \
 			USE_KDELIBS_VER USE_QT_VER
 
 .for a in 1 2 3 4 5 6 7 8 9 L N
 SANITY_DEPRECATED+=	MAN${a}
 MAN${a}_ALT=		pkg-plist to list manpages
 .endfor
 
 USE_AUTOTOOLS_ALT=	USES=autoreconf and GNU_CONFIGURE=yes
 USE_OPENAL_ALT=		USES=openal
 USE_FAM_ALT=		USES=fam
 USE_MAKESELF_ALT=	USES=makeself
 USE_ZIP_ALT=		USES=zip
 USE_LHA_ALT=		USES=lha
 USE_BZIP2_ALT=		USES=tar:bzip2
 USE_XZ_ALT=		USES=tar:xz
 USE_CMAKE_ALT=		USES=cmake
 USE_READLINE_ALT=	USES=readline
 USE_ICONV_ALT=		USES=iconv
 USE_GMAKE_ALT=		USES=gmake
 PERL_CONFIGURE_ALT=	USES=perl5 along with USE_PERL5=configure
 PERL_MODBUILD_ALT=	USES=perl5 along with USE_PERL5=modbuild
 USE_PERL5_BUILD_ALT=	USES=perl5 along with USE_PERL5=build
 USE_PERL5_RUN_ALT=	USES=perl5 along with USE_PERL5=run
 USE_DISPLAY_ALT=	USES=display
 USE_FUSE_ALT=		USES=fuse
 USE_GETTEXT_ALT=	USES=gettext
 USE_SCONS_ALT=		USES=scons
 USE_DRUPAL_ALT=		USES=drupal
 USE_PYDISTUTILS_ALT=		USE_PYTHON=distutils
 USE_PGSQL_ALT=		USES=pgsql
 INSTALLS_SHLIB_ALT=	USE_LDCONFIG
 NEED_ROOT_ALT=		USES=fakeroot or USES=uidfix
 PYTHON_CONCURRENT_INSTALL_ALT=	USE_PYTHON=concurrent
 PYDISTUTILS_AUTOPLIST_ALT=	USE_PYTHON=autoplist
 PYTHON_PY3K_PLIST_HACK_ALT=	USE_PYTHON=py3kplist
 PYDISTUTILS_NOEGGINFO_ALT=	USE_PYTHON=noegginfo
 USE_PYTHON_PREFIX_ALT=		USE_PYTHON=pythonprefix
 NO_INSTALL_MANPAGES_ALT=	USES=imake:noman
 UNIQUENAME_ALT=		PKGBASE
 LATEST_LINK_ALT=	PKGBASE
 CMAKE_NINJA_REASON=	Now the ninja generator is the default
 WX_UNICODE_REASON=	Now no-op as only unicode is supported now
 PLIST_DIRSTRY_ALT=	PLIST_DIRS
 USE_SQLITE_ALT=		USES=sqlite
 USE_FIREBIRD_ALT=	USES=firebird
 USE_BDB_ALT=		USES=bdb:${USE_BDB}
 USE_MYSQL_ALT=		USES=mysql:${USE_MYSQL}
 WANT_MYSQL_VER_ALT=	USES=mysql:${WANT_MYSQL_VER}
 USE_OPENSSL_ALT=	USES=ssl
 USE_PHPIZE_ALT=		USES=php:phpize
 USE_PHPEXT_ALT=		USES=php:ext
 USE_ZENDEXT_ALT=	USES=php:zend
 USE_PHP_BUILD_ALT=	USES=php:build
 WANT_PHP_CLI_ALT=	USES=php:cli
 WANT_PHP_CGI_ALT=	USES=php:cgi
 WANT_PHP_MOD_ALT=	USES=php:mod
 WANT_PHP_WEB_ALT=	USES=php:web
 WANT_PHP_EMB_ALT=	USES=php:embed
 USE_RCORDER_ALT=	USE_RC_SUBR=${USE_RCORDER}
 WANT_GNOME_ALT=		USES=gnome
 MLINKS_ALT=		it no more
 USE_DOS2UNIX_ALT=	USES=dos2unix
 PYDISTUTILS_INSTALLNOSINGLE_ALT=	it no more
 INSTALLS_EGGINFO_ALT=	an entry in the plist
 WANT_SDL_ALT=		USE_SDL for SDL directly, if you need optional dependency, use options
 RUBYGEM_AUTOPLIST_ALT=	USES=gem
 USE_RUBYGEMS_ALT=	USES=gem
 USE_GHOSTSCRIPT_ALT=	USES=ghostscript
 USE_GHOSTSCRIPT_BUILD_ALT=	USES=ghostscript
 USE_GHOSTSCRIPT_RUN_ALT=	USES=ghostscript
 NO_STAGE_ALT=	https://wiki.freebsd.org/ports/StageDir to convert your port to staging
 USE_APACHE_ALT=		USES=apache:${USE_APACHE:C/2(0-9)/2.\1/g}
 USE_APACHE_BUILD_ALT=	USES=apache:build,${USE_APACHE_BUILD:C/2(0-9)/2.\1/g}
 USE_APACHE_RUN_ALT=	USES=apache:run,${USE_APACHE_RUN:C/2(0-9)/2.\1/g}
 APACHE_PORT_ALT=	DEFAULT_VERSIONS+=apache=${APACHE_PORT:S/www\/apache//:C/2(0-9)/2.\1/}
 USE_FPC_RUN_ALT=	USES=fpc:run
 WANT_FPC_BASE_ALT=	USES=fpc:base
 WANT_FPC_ALL_ALT=	USES=fpc:all
 USE_QT4_ALT=		USES=qt:5 and USE_QT=${USE_QT4} (beware) as Qt4 has been removed
 USE_QT5_ALT=		USES=qt:5 and USE_QT=${USE_QT5}
 QT_NONSTANDARD_ALT=	USES=qmake:no_env
 
 .for a in ${SANITY_DEPRECATED}
 .if defined(${a})
 DEV_WARNING+=	"${a} is deprecated, please use ${${a}_ALT}"
 .endif
 .endfor
 
 .for a in ${SANITY_NOTNEEDED}
 .if defined(${a})
 DEV_WARNING+=	"${a} is not needed: ${${a}_REASON}"
 .endif
 .endfor
 
 .for a in ${SANITY_UNSUPPORTED}
 .if defined(${a})
 DEV_ERROR+=	"${a} is unsupported, please use ${${a}_ALT}"
 .endif
 .endfor
Index: head/devel/elfio/Makefile
===================================================================
--- head/devel/elfio/Makefile	(revision 508828)
+++ head/devel/elfio/Makefile	(revision 508829)
@@ -1,33 +1,33 @@
 # Created by: ijliao
 # $FreeBSD$
 
 PORTNAME=	elfio
 PORTVERSION=	3.4
-PORTREVISION=
+PORTREVISION=	0
 CATEGORIES=	devel
 MASTER_SITES=	SF/elfio/ELFIO-sources/ELFIO-${PORTVERSION}
 
 MAINTAINER=	james.wright@digital-chaos.com
 COMMENT=	Small C++ library for reading and generating ELF files
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		compiler:c++11-lang
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--bindir=${EXAMPLESDIR}
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 OPTIONS_SUB=	yes
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_MAN} ${WRKSRC}/doc/elfio.pdf ${STAGEDIR}${DOCSDIR}
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	@${FIND} ${WRKSRC}/examples/ -name "*.cpp" -exec ${INSTALL_DATA} {} \
 	${STAGEDIR}${EXAMPLESDIR}/ \;
 
 .include <bsd.port.mk>
Index: head/devel/subversion/Makefile.addons
===================================================================
--- head/devel/subversion/Makefile.addons	(revision 508828)
+++ head/devel/subversion/Makefile.addons	(revision 508829)
@@ -1,33 +1,33 @@
 # Created by: lev@FreeBSD.org
 # $FreeBSD$
 
 WITH_SUBVERSION_VER?=	112
 
 PKGDIR=			${.CURDIR}
 
 SVN_BUILD_ADDONS=	yes
 
 .if ${WITH_SUBVERSION_VER} == 112
 CONFLICTS_BUILD+=	${PORTNAME}-1.[0-9].[0-9]* \
 			${PORTNAME}-1.[^1][0-9].[0-9]* \
 			${PORTNAME}-1.1[0-1].[0-9]* \
 			${PORTNAME}-lts-1.[0-9][0-9].[0-9]*
-PORTREVISION=		${PORTREVISION_112}
+PORTREVISION=		${PORTREVISION_112:U0}
 PLIST_SUB+=		SVN112="" SVNLTS="@comment "
 LIB_DEPENDS+=		libsvn_client-1.so:devel/subversion
 OPTIONS_NAME=		devel_subversion
 MASTERDIR=		${.CURDIR}/../../devel/subversion
 .include		"${MASTERDIR}/Makefile.common"
 .elif ${WITH_SUBVERSION_VER} == LTS
 PKGNAMESUFFIX:=		${PKGNAMESUFFIX}-lts
 CONFLICTS_BUILD+=	${PORTNAME}-1.[0-9].[0-9]* \
 			${PORTNAME}-1.[0-9][0-9].[0-9]*
-PORTREVISION=		${PORTREVISION_LTS}
+PORTREVISION=		${PORTREVISION_LTS:U0}
 PLIST_SUB+=		SVN112="@comment " SVNLTS=""
 LIB_DEPENDS+=		libsvn_client-1.so:devel/subversion-lts
 OPTIONS_NAME=		devel_subversion-lts
 MASTERDIR=		${.CURDIR}/../../devel/subversion-lts
 .include		"${MASTERDIR}/Makefile.common"
 .else
 BROKEN=			Wrong WITH_SUBVERSION_VER=${WITH_SUBVERSION_VER}, only 112 (default) and LTS are supported
 .endif
Index: head/games/xboard/Makefile
===================================================================
--- head/games/xboard/Makefile	(revision 508828)
+++ head/games/xboard/Makefile	(revision 508829)
@@ -1,149 +1,149 @@
 # Created by: xaa@stack.nl
 # $FreeBSD$
 
 PORTNAME?=	xboard
 PORTVERSION?=	4.9.1
 PORTREVISION?=	1
-PORTEPOCH?=
+PORTEPOCH?=	0
 CATEGORIES?=	games
 MASTER_SITES?=	GNU
 
 MAINTAINER?=	johans@FreeBSD.org
 COMMENT?=	X frontend for Crafty, GNUChess, Chess Servers, or e-mail chess
 
 LICENSE?=	GPLv3
 
 LIB_DEPENDS?=	libcairo.so:graphics/cairo
 
 CONFLICTS?=	xboard-devel-[0-9]*
 
 OPTIONS_DEFINE?=	NLS DOCS ZIPPY
 OPTIONS_SINGLE?=	FRONTEND
 OPTIONS_SINGLE_FRONTEND?=	XAW XAW3D GTK2
 OPTIONS_GROUP?=	ENGINES
 OPTIONS_GROUP_ENGINES?=	FAIRYMAX CRAFTY GNUCHESS KNIGHTCAP PHALANX
 OPTIONS_RADIO?=	SOUND
 OPTIONS_RADIO_SOUND?=	SOX ALSA
 OPTIONS_DEFAULT?=	XAW
 OPTIONS_SUB?=	yes
 
 ZIPPY_DESC=	Add Zippy capability (computer player on ICS)
 ENGINES_DESC=	Chess Engines
 CRAFTY_DESC=	Install crafty engine
 FAIRYMAX_DESC=	Install fairymax engine (many chess variants)
 GNUCHESS_DESC=	Install GnuChess engine
 KNIGHTCAP_DESC=	Install KnightCap engine
 PHALANX_DESC=	Install phalanx engine
 FRONTEND_DESC=	Front End
 XAW_DESC=	Xaw GUI toolkit support (default)
 XAW3D_DESC=	Xaw3d GUI toolkit support (not fully supported)
 GTK2_DESC=	GTK+ 2 GUI toolkit support (experimental)
 SOUND_DESC=	Sound Output
 SOX_DESC=	SoX audio support
 
 CRAFTY_RUN_DEPENDS=	crafty:games/crafty
 FAIRYMAX_RUN_DEPENDS=	fairymax:games/fairymax
 GNUCHESS_RUN_DEPENDS=	gnuchess:games/gnuchess
 KNIGHTCAP_RUN_DEPENDS=	KnightCap:games/KnightCap
 PHALANX_RUN_DEPENDS=	phalanx:games/phalanx
 XAW3D_DEPENDS=		libXaw3d.so:x11-toolkits/Xaw3d
 SOX_RUN_DEPENDS=	play:audio/sox
 ALSA_RUN_DEPENDS=	aplay:audio/alsa-utils
 NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
 ZIPPY_CONFIGURE_ENABLE=	zippy
 XAW_CONFIGURE_WITH=	Xaw
 XAW3D_CONFIGURE_WITH=	Xaw3d
 GTK2_CONFIGURE_WITH=	gtk
 
 .include <bsd.port.options.mk>
 
 USES+=		desktop-file-utils makeinfo perl5 pkgconfig shared-mime-info \
 		shebangfix
 USE_XORG+=	xt xpm
 USE_GNOME+=	librsvg2
 .if ${PORT_OPTIONS:MXAW}
 USE_XORG+=	xaw
 .endif
 .if ${PORT_OPTIONS:MGTK2}
 USE_GNOME+=	gtk20
 .endif
 SHEBANG_FILES=	texi2man
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=MKDIR_P="${MKDIR}" PERLPATH=${PERL}
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 INFO=		xboard
 USE_PERL5=	build
 INSTALLS_ICONS=	yes
 DATADIR?=	${PREFIX}/share/games/${PORTNAME}
 XBOARDCONF?=	${WRKSRC}/xboard.conf
 
 PORTDOCS=	AUTHORS COPYING COPYRIGHT ChangeLog DIFFSTAT FAQ.html NEWS README SHORTLOG TODO
 
 .if ${PORT_OPTIONS:MZIPPY}
 USES+=		shebangfix
 SHEBANG_FILES+=	./texi2man
 PORTDOCS+=	zippy.README
 .endif
 
 .if ${PORT_OPTIONS:MNLS}
 PORTDOCS+=	ABOUT-NLS
 .endif
 
 post-patch:
 	-@[ -f ${WRKSRC}/Makefile.in ] && ${REINPLACE_CMD} -e \
 		'/xboard_LDADD/s/-ldl //' ${WRKSRC}/Makefile.in
 	@${ECHO_CMD} -n "" > ${WRKSRC}/engineEntries.txt
 	@${ECHO_CMD} -n "" > ${WRKSRC}/firstEngine.txt
 .if ${PORT_OPTIONS:MCRAFTY}
 	@${ECHO_CMD} "\"Crafty\" -fcp crafty\\" >> ${WRKSRC}/engineEntries.txt
 	@${ECHO_CMD} -n "crafty" > ${WRKSRC}/firstEngine.txt
 .endif
 .if ${PORT_OPTIONS:MGNUCHESS}
 	@${ECHO_CMD} "\"GNU Chess\" -fcp gnuchess\\" >> ${WRKSRC}/engineEntries.txt
 	@${ECHO_CMD} -n "gnuchess" > ${WRKSRC}/firstEngine.txt
 .endif
 .if ${PORT_OPTIONS:MKNIGHTCAP}
 	@${ECHO_CMD} "\"KnightCap\" -fcp \"KnightCap -n -X -A -f ${PREFIX}/share/games/KnightCap/coeffs.dat\"\\" >> ${WRKSRC}/engineEntries.txt
 	@${ECHO_CMD} -n "KnightCap" > ${WRKSRC}/firstEngine.txt
 .endif
 .if ${PORT_OPTIONS:MPHALANX}
 	@${ECHO_CMD} "\"Phalanx\" -fcp phalanx\\" >> ${WRKSRC}/engineEntries.txt
 	@${ECHO_CMD} -n "phalanx" > ${WRKSRC}/firstEngine.txt
 .endif
 .if ${PORT_OPTIONS:MFAIRYMAX}
 	@${ECHO_CMD} "\"FairyMax\" -fcp fairymax\\" >> ${WRKSRC}/engineEntries.txt
 	@${ECHO_CMD} -n "fairymax" > ${WRKSRC}/firstEngine.txt
 .endif
 	@firstEngine=`cat ${WRKSRC}/firstEngine.txt` && \
 	 ${REINPLACE_CMD} -e "s|\(-firstChessProgram\) .*|\1 $${firstEngine}|" ${XBOARDCONF}
 	@engineEntries=`cat ${WRKSRC}/engineEntries.txt` && \
 	 ${REINPLACE_CMD} -e "s|\(firstChessProgramNames[ 	]*{\)[ 	]*.*|\1$${engineEntries}}|" ${XBOARDCONF}
 	@${REINPLACE_CMD} -e '/^#include..malloc.h/d' \
 		${WRKSRC}/engineoutput.c ${WRKSRC}/uci.c
 .if ${PORT_OPTIONS:MZIPPY}
 	@cd ${WRKSRC} && ${PATCH} < ${PATCHDIR}/OPTION_ZIPPY__patch-xboard.texi
 	@${REINPLACE_CMD} -e 's|%%DOCSDIR%%|${DOCSDIR}|g' ${WRKSRC}/xboard.texi
 .endif
 .if ${PORT_OPTIONS:MSOX}
 	@${REINPLACE_CMD} -e "s|\(soundProgram\) .*|\1 \"play -q\"|" ${XBOARDCONF}
 .elif ${PORT_OPTIONS:MALSA}
 	@${REINPLACE_CMD} -e "s|\(soundProgram\) .*|\1 \"aplay -q\"|" ${XBOARDCONF}
 .else
 	@${REINPLACE_CMD} -e "s|\(soundProgram\) .*|\1 \"\"|" ${XBOARDCONF}
 .endif
 	@${REINPLACE_CMD} -e "1s|^|int initialSquareSize;|" \
 		${WRKSRC}/xaw/xboard.c
 
 post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/cmail ${STAGEDIR}${PREFIX}/bin/
 	${MV} ${STAGEDIR}${PREFIX}/etc/xboard.conf \
 		 ${STAGEDIR}${PREFIX}/etc/xboard.conf.sample
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
Index: head/games/xboard-devel/Makefile
===================================================================
--- head/games/xboard-devel/Makefile	(revision 508828)
+++ head/games/xboard-devel/Makefile	(revision 508829)
@@ -1,41 +1,41 @@
 # $FreeBSD$
 
 PORTNAME=	xboard-devel
 PORTVERSION=	4.8.0.20151020.3
-PORTREVISION=
-PORTEPOCH=
+PORTREVISION=	0
+PORTEPOCH=	0
 MASTER_SITES=	http://freeheimdall.spdns.org/files/
 # http://hgm.nubati.net/cgi-bin/gitweb.cgi?p=xboard.git;a=snapshot;h=${COMMIT_HASH};sf=tgz
 # http://hgm.nubati.net/cgi-bin/gitweb.cgi/xboard.git/snapshot/${COMMIT_HASH}
 # but sha256 changes, as creation date of *.tar inside *.tar.gz changes.
 DISTNAME=	xboard-${COMMIT_HASH}
 
 MAINTAINER=	kalten@gmx.at
 
 LICENSE=	GPLv3
 
 LIB_DEPENDS?=	libpangocairo-1.0.so:x11-toolkits/pango
 
 CONFLICTS=	xboard-[0-9]*
 
 MASTERDIR=	${.CURDIR}/../xboard
 DISTINFO_FILE=	${.CURDIR}/distinfo
 PATCHDIR=	${.CURDIR}/files
 PLIST=	${.CURDIR}/pkg-plist
 
 COMMIT_HASH=	f49e7e1
 DATADIR=	${PREFIX}/share/games/xboard
 DOCSDIR=	${PREFIX}/share/doc/xboard
 XBOARDCONF=	${WRKSRC}/xboard.conf
 
 USES=		autoreconf desktop-file-utils gettext-tools gmake shared-mime-info shebangfix
 SHEBANG_FILES=	texi2man
 
 INSTALL_TARGET=	install-strip
 
 pre-configure:
 	${RM} ${WRKSRC}/m4/*.m4
 	${REINPLACE_CMD} -e "s|\(GITVERSION=\).*|\1${COMMIT_HASH}|" ${WRKSRC}/Makefile.am
 	${REINPLACE_CMD} -E "s|(AC_INIT\(\[xboard\],\[)[^]]+(\].+\))|\1${PORTVERSION}-git:${COMMIT_HASH}\2|" ${WRKSRC}/configure.ac
 
 .include "${MASTERDIR}/Makefile"
Index: head/misc/dnetc/Makefile
===================================================================
--- head/misc/dnetc/Makefile	(revision 508828)
+++ head/misc/dnetc/Makefile	(revision 508829)
@@ -1,69 +1,69 @@
 # Created by: dbaker
 # $FreeBSD$
 
 PORTNAME=	dnetc
 PORTVERSION=	${VERSION}
-PORTREVISION=	${REVISION}
+PORTREVISION=	${REVISION:U0}
 PORTEPOCH=	1
 CATEGORIES=	misc
 MASTER_SITES=	http://http.distributed.net/pub/dcti/v${PORTVERSION:R}/ \
 		ftp://ftp.distributed.net/pub/dcti/v${PORTVERSION:R}/
 # This is architecture dependent
 DISTNAME=	dnetc${PORTVERSION:E}-freebsd-${ARCH:S/i386/x86/}-elf
 
 MAINTAINER=	tdb@FreeBSD.org
 COMMENT=	Distributed.net distributed computing project client
 
 # These are architecture dependent
 WRKSRC=		${WRKDIR}/dnetc${PORTVERSION:E}-freebsd-${ARCH:S/i386/x86/}-elf
 DISTINFO_FILE=	${MASTERDIR}/distinfo.${ARCH}
 
 ONLY_FOR_ARCHS=	amd64 i386 powerpc sparc64
 
 USE_RC_SUBR=	dnetc
 NO_BUILD=	yes
 
 BINDIR=		${PREFIX}/distributed.net
 
 USERS=		dnetc
 GROUPS=		dnetc
 
 SUB_FILES=	pkg-message
 SUB_LIST=	BINDIR="${BINDIR}"
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == i386
 VERSION=	2.9112.521
 DISTNAME=	dnetc${PORTVERSION:E}-freebsd9-${ARCH:S/i386/x86/}
 WRKSRC=		${WRKDIR}/dnetc${PORTVERSION:E}-freebsd9-${ARCH:S/i386/x86/}
 
 .elif ${ARCH} == amd64
 VERSION=	2.9112.521
 DISTNAME=	dnetc${PORTVERSION:E}-freebsd10-${ARCH}
 WRKSRC=		${WRKDIR}/dnetc${PORTVERSION:E}-freebsd10-${ARCH}
 
 .elif ${ARCH} == sparc64
 VERSION=	2.9109.518
 REVISION=	1
 DISTNAME=	dnetc${PORTVERSION:E}-freebsd8-${ARCH}
 WRKSRC=		${WRKDIR}/dnetc${PORTVERSION:E}-freebsd8-${ARCH}
 
 .elif ${ARCH} == powerpc
 VERSION=	2.9109.518
 REVISION=	1
 DISTNAME=	dnetc${PORTVERSION:E}-freebsd8-${ARCH}
 WRKSRC=		${WRKDIR}/dnetc${PORTVERSION:E}-freebsd8-${ARCH}
 
 .else
 # create a backstop for PORTVERSION for unimplemented arches to get a sane PKGNAME
 VERSION=	0
 .endif
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${BINDIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/dnetc ${STAGEDIR}${BINDIR}
 	${INSTALL_MAN} ${WRKSRC}/dnetc.1 ${STAGEDIR}${PREFIX}/man/man1
 	${INSTALL_DATA} ${FILESDIR}/dnetc.ini ${STAGEDIR}${BINDIR}/dnetc.ini.sample
 
 .include <bsd.port.post.mk>
Index: head/www/mod_dav_svn/Makefile
===================================================================
--- head/www/mod_dav_svn/Makefile	(revision 508828)
+++ head/www/mod_dav_svn/Makefile	(revision 508829)
@@ -1,35 +1,32 @@
 # Created by: lev@FreeBSD.org
 # $FreeBSD$
 
 PORTNAME=	mod_dav_svn
 DISTNAME=	subversion-${PORTVERSION}
 
 CATEGORIES=	www
 
 MAINTAINER=	lev@FreeBSD.org
 COMMENT=	Apache module for subversion serving
 
 USES=		apache:2.2+
 
-PORTREVISION_111=	1
-PORTREVISION_19=	0
-
 .include "${.CURDIR}/../../devel/subversion/Makefile.addons"
 
 CONFIGURE_ARGS+=	--with-apxs=${APXS} \
 			--with-apache-libexecdir \
 			--without-gnome-keyring \
 			--without-kwallet
 SUB_FILES+=	220_subversion.conf.sample
 
 PLIST_SUB+=	SED=${SED}
 
 ALL_TARGET=	apache-mod
 INSTALL_TARGET=	install-mods-shared
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEETCDIR}/modules.d
 	${INSTALL_DATA} ${WRKDIR}/220_subversion.conf.sample \
 		${STAGEDIR}${PREFIX}/${APACHEETCDIR}/modules.d
 
 .include <bsd.port.post.mk>
Index: head/www/nuvolaplayer-all-services/Makefile
===================================================================
--- head/www/nuvolaplayer-all-services/Makefile	(revision 508828)
+++ head/www/nuvolaplayer-all-services/Makefile	(revision 508829)
@@ -1,78 +1,78 @@
 # $FreeBSD$
 
 PORTNAME=	nuvolaplayer
 PORTVERSION?=	1.0
 # Do not set PORTREVISION here.
 CATEGORIES?=	www audio
 
 MAINTAINER?=	ports@FreeBSD.org
 
 .include "Makefile.services"
 
 _DATADIR=	${PREFIX}/share/${PORTNAME}3
 
 .ifndef(MASTERDIR)
 PORTREVISION=	0
 PKGNAMESUFFIX=	-all-services
 
 COMMENT=	Web app integrations for Nuvola Player
 
 USES=		metaport
 
 OPTIONS_DEFINE=	${NV_SERVICES}
 OPTIONS_DEFAULT=${OPTIONS_DEFINE}
 
 . for o in ${OPTIONS_DEFINE}
 ${o}_DESC=	${NV_${o}_DESC} support
 ${o}_RUN_DEPENDS=${_DATADIR:S,^${PREFIX}/,${LOCALBASE}/,}/web_apps/${NV_${o}_NAME:S/-/_/g}/metadata.json:www/${PORTNAME}-${NV_${o}_NAME}
 . endfor
 .else
 NV_ID=		${${.CURDIR:T:S/${PORTNAME}-//}_ID}
 
 PORTVERSION=	${NV_${NV_ID}_VERSION}
-PORTREVISION?=	${NV_${NV_ID}_REVISION}
+PORTREVISION?=	${NV_${NV_ID}_REVISION:U0}
 PKGNAMESUFFIX?=	-${NV_${NV_ID}_NAME}
 
 COMMENT?=	${NV_${NV_ID}_DESC} integration for Nuvola Player
 
 LICENSE?=	BSD2CLAUSE
 
 .ifdef(NV_${NV_ID}_LICENSE)
 LICENSE=	${NV_${NV_ID}_LICENSE}
 .endif
 
 .ifdef(NV_${NV_ID}_LICENSE_COMB)
 LICENSE_COMB=	${NV_${NV_ID}_LICENSE_COMB}
 .endif
 
 BUILD_DEPENDS+=	lasem-render:textproc/lasem \
 		scour:textproc/py-scour
 
 USE_GITHUB=	yes
 GH_ACCOUNT?=	tiliado
 GH_PROJECT?=	nuvola-app${PKGNAMESUFFIX}
 
 USES+=		gmake
 NO_ARCH=	yes
 ALL_TARGET?=	build
 MAKE_ARGS+=	DEST=${STAGEDIR}${_DATADIR}/web_apps
 INSTALLS_ICONS=	yes
 
 DISTINFO_FILE?=	${.CURDIR}/distinfo
 PLIST?=		${PKGDIR}/pkg-plist.service
 
 PLIST_FILES?=	${NV_${NV_ID}_PLIST_FILES}
 PLIST_SUB+=	SERVICE="${NV_${NV_ID}_NAME:S/-/_/g}"
 
 DATADIR=	${_DATADIR}/web_apps/${NV_${NV_ID}_NAME:S/-/_/g}
 
 pre-build:
 # Do not install license files, the Ports framework takes care of it.
 	@${REINPLACE_CMD} -E -e 's,icons/icon,src/icon,' \
 		-e '/install/ s,-t ([^ ]+)(.+),\2 \1,' \
 		-e '/ln/ s,-T,,' \
 		-e 's,\$$\(LICENSES),,' \
 		${WRKSRC}/Makefile
 .endif
 
 .include <bsd.port.mk>