Index: head/devel/subversion/Makefile
===================================================================
--- head/devel/subversion/Makefile	(revision 527672)
+++ head/devel/subversion/Makefile	(revision 527673)
@@ -1,227 +1,225 @@
 # Created by: rooneg@electricjellyfish.net
 # $FreeBSD$
 
 PORTREVISION=	1
 
 MAINTAINER=	lev@FreeBSD.org
 COMMENT=	Version control system
 
 CONFLICTS_INSTALL=	subversion-1.[0-9].[0-9]* \
 			subversion-1.1[0-1].[0-9]* \
 			subversion1[0-9]-1.[0-9].[0-9]*
 
 USE_RC_SUBR=	svnserve
 
 PORTDOCS=	BUGS CHANGES COMMITTERS INSTALL README
 
 OPTIONS_DEFINE=	\
 		BDB		\
 		DOCS		\
 		FREEBSD_TEMPLATE\
 		GPG_AGENT 	\
-		MAINTAINER_DEBUG\
 		NLS		\
 		SASL		\
 		SERF		\
 		STATIC		\
 		SVNSERVE_WRAPPER\
 		TEST		\
 		TOOLS
 
 OPTIONS_DEFAULT=FREEBSD_TEMPLATE GPG_AGENT SERF TOOLS
 
 FREEBSD_TEMPLATE_DESC=	FreeBSD Project log template
 GPG_AGENT_DESC=		Enable GPG agent password store
-MAINTAINER_DEBUG_DESC=	Build debug version
 SERF_DESC=		WebDAV/Delta-V (HTTP/HTTPS) repo access module
 STATIC_DESC=		Build static version (no shared libs)
 SVNSERVE_WRAPPER_DESC=	Enable svnserve wrapper (umask setter)
 TEST_DESC=		Run subversion test suite
 TOOLS_DESC=		Install several tools
 
 # Patches required for use with the FreeBSD Project repository only
 FREEBSD_TEMPLATE_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-fbsd-template
 SVNSERVE_WRAPPER_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-svnserve-wrapper
 
 USES+=			shebangfix python:2.7,env
 python_OLD_CMD+=	"/bin/env python"
 SHEBANG_REGEX=		./tools/.*
 
 .include "Makefile.common"
 
 SVNREPOS?=	/home/svn/repos
 SVNFSTYPE?=	fsfs
 SVNGROUP?=	svn
 SVNUSER?=	svn
 
 CONFIGURE_ARGS+=	--without-gnome-keyring \
 			--without-kwallet \
 			--with-apxs=no
 
 .if ${PORT_OPTIONS:MSVNSERVE_WRAPPER}
 SUB_LIST+=	SVNSERVE_BIN_EXT=".bin"
 PLIST_SUB+=	NO_SVNSERVE_WRAPPER="@comment "
 .else
 SUB_LIST+=	SVNSERVE_BIN_EXT=""
 PLIST_SUB+=	NO_SVNSERVE_WRAPPER=""
 .endif
 
 .if ${PORT_OPTIONS:MTEST}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
 .endif
 
 .if ${PORT_OPTIONS:MSTATIC}
 .  if ${PORT_OPTIONS:MNLS}
 USES+=			gettext-tools
 .  endif
 .  if ${PORT_OPTIONS:MBDB}
 BDB_BUILD_DEPENDS=	yes
 .  endif
 OLD_LIB_DEPENDS:=	${LIB_DEPENDS:S!^!${LOCALBASE}/lib/!:C!(\.so|\.[0-9]+)?:!.a:!}
 BUILD_DEPENDS+=		${OLD_LIB_DEPENDS}
 LIB_DEPENDS=
 .endif
 
 .if make(repository)
 WITH_REPOSITORY_CREATION=	yes
 .endif
 
 .if defined(WITH_REPOSITORY_CREATION)
 MKREPOS_TARGET=	_mkrepos
 .endif
 
 pre-everything::
 	@${ECHO_MSG} ""
 .if defined(WITH_REPOSITORY_CREATION)
 	@${ECHO_MSG} "I will create (or use, if it exists) '${SVNUSER}' user and '${SVNGROUP}' group."
 	@${ECHO_MSG} "Make sure that all committers are its members."
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "Repository will be created at '${SVNREPOS}' with user '${SVNUSER}' and group '${SVNGROUP}'."
 	@${ECHO_MSG} "Type of repository will be '${SVNFSTYPE}'."
 	@${ECHO_MSG} "You could change these settings by defining SVNREPOS, SVNGROUP and SVNFSTYPE."
 .else
 	@${ECHO_MSG} "You can have the repository created for you by defining"
 	@${ECHO_MSG} "WITH_REPOSITORY_CREATION."
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "Make sure that:"
 	@${ECHO_MSG} "* all your svn users are members of a common group"
 	@${ECHO_MSG} "* this group is the group id of the db/ and locks/"
 	@${ECHO_MSG} "  subdirectories of your repository"
 	@${ECHO_MSG} "* the above subdirectories are writable by this group"
 .endif
 
 	@${ECHO_MSG} ""
 .if ${PORT_OPTIONS:MSTATIC}
 	@${ECHO_MSG} "Static binaries will be built."
 .endif # STATIC
 	@${ECHO_MSG} "Many useful scripts will be installed into ${DATADIR}"
 
 pre-configure:
 .if ${PORT_OPTIONS:MBDB}
 	@BDB_VERSION=`${APR_APU_DIR}/${APU_CONFIG} --db-version`; \
 	if [ "$${BDB_VERSION}" != "4" -a "$${BDB_VERSION}" != "5" -a "$${BDB_VERSION}" != "6" ] ; then \
 		${ECHO_MSG} "" ; \
 		${ECHO_MSG} 'You should build `'"devel/apr1' with Berkeley DB (4, 5 or 6) support to use subversion with it." ; \
 		${ECHO_MSG} 'Please rebuild `'"devel/apr1' with option "'`'"BDB' and try again." ; \
 		${ECHO_MSG} "" ; \
 		${ECHO_MSG} "Or you can disable Berkeley DB support. Only 'fs' repository backend will be available." ; \
 		${ECHO_MSG} "" ; \
 		${FALSE} ; \
 	fi
 .endif
 .if ${PORT_OPTIONS:MSTATIC}
 LIBS_SQLITE3!=	pkgconf --libs --static sqlite3
 LIBS+=		${LIBS_SQLITE3}
 # for work with ICU
 LIBS+=		-lc++ -lm
 .endif
 
 post-configure:
 # Enable GNOME Keyring / KWallet support in main code, as it is harmless
 	@${REINPLACE_CMD} -E 's%.*#undef SVN_HAVE_(GNOME_KEYRING|KWALLET).*%#define SVN_HAVE_\1 1%' ${WRKSRC}/subversion/svn_private_config.h
 # ugly hack: save tools directory so we don't have to cleanup before installing
 	@${CP} -R ${WRKSRC}/tools ${WRKSRC}/tools.examples
 	@${CHMOD} -R a-st,o+rX ${WRKSRC}/tools.examples
 
 # takes a long time, and will fail but gives maintainer a good oversight
 .if ${PORT_OPTIONS:MTEST}
 test: build
 	-@make check -C ${WRKSRC}
 .endif
 
 post-build-TOOLS-on:
 	@${MAKE} -C ${WRKSRC} tools ${MAKE_ARGS}
 
 post-install:	${MKREPOS_TARGET}
 	-@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/*
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	(cd ${WRKSRC}/tools.examples && ${TAR} --exclude '*.in' -cf - * | ${TAR} -C ${STAGEDIR}${DATADIR} -xof - )
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 post-install-STATIC-off:
 	-@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so
 
 post-install-SVNSERVE_WRAPPER-on:
 	@${INSTALL_SCRIPT} ${FILESDIR}/svnserve.wrapper ${STAGEDIR}${PREFIX}/bin/svnserve.sample
 
 post-install-TOOLS-on:
 	@${MAKE} -C ${WRKSRC} install-tools ${MAKE_ARGS}
 	-@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/*
 
 # ===============================================================================
 repository:	_mkrepos
 
 _SVNGRPFILES=	db locks locks/db.lock locks/db-logs.lock
 SVNGRPFILES=	${_SVNGRPFILES:S,^,${SVNREPOS}/,}
 
 _mkrepos:	.USE
 .if !exists(${SVNREPOS})
 .if ${PORT_OPTIONS:MSVNSERVE_WRAPPER}
 	@if /usr/sbin/pw groupshow "${SVNGROUP}" >/dev/null 2>&1; then \
 	    ${ECHO_MSG} "You already have a group \"${SVNGROUP}\", so I will use it."; \
 	else \
 	    if /usr/sbin/pw groupadd ${SVNGROUP} -h -; \
 	    then \
 	        ${ECHO_MSG} "Added group \"${SVNGROUP}\"."; \
 	    else \
 	        ${ECHO_MSG} "Adding group \"${SVNGROUP}\" failed..."; \
 	        ${ECHO_MSG} "Please create it, and try again."; \
 	        ${FALSE}; \
 	    fi; \
 	fi
 	@if /usr/sbin/pw usershow "${SVNUSER}" >/dev/null 2>&1; then \
 	    ${ECHO_MSG} "You already have a user \"${SVNUSER}\", so I will use it."; \
 	else \
 	    if /usr/sbin/pw useradd ${SVNUSER} -h -; \
 	    then \
 	        ${ECHO_MSG} "Added user \"${SVNUSER}\"."; \
 	    else \
 	        ${ECHO_MSG} "Adding user \"${SVNUSER}\" failed..."; \
 	        ${ECHO_MSG} "Please create it, and try again."; \
 	        ${FALSE}; \
 	    fi; \
 	fi
 .endif
 	@${MKDIR} ${SVNREPOS}
 	@${PREFIX}/bin/svnadmin create --fs-type ${SVNFSTYPE} ${SVNREPOS}
 .if ${PORT_OPTIONS:MSVNSERVE_WRAPPER}
 	@${CHOWN} ${SVNUSER}:${SVNGROUP} ${SVNGRPFILES}
 	@${CHMOD} g+w ${SVNGRPFILES}
 	@for i in ${SVNREPOS}/db/* ; do \
 	    i=$${i##*/}; \
 	    case $$i in \
 	    DB_CONFIG|fs-type|uuid) ;; \
 	    *) ${CHOWN} -R ${SVNUSER}:${SVNGROUP} ${SVNREPOS}/db/$$i; \
 	       ${CHMOD} -R g+w ${SVNREPOS}/db/$$i; \
 	       ;; \
 	    esac; \
 	done
 .endif
 .endif
 
 svn-build-outputs-hack:
 	(cd ${WRKSRC} && python2.7 gen-make.py --release --installed-libs libsvn_client,libsvn_delta,libsvn_diff,libsvn_fs,libsvn_fs_x,libsvn_ra,libsvn_repos,libsvn_subr,libsvn_wc)
 	${MV} ${WRKSRC}/build-outputs.mk ${FILESDIR}/build-outputs.mk.addons
 
 .include <bsd.port.post.mk>
Index: head/devel/subversion/Makefile.common
===================================================================
--- head/devel/subversion/Makefile.common	(revision 527672)
+++ head/devel/subversion/Makefile.common	(revision 527673)
@@ -1,117 +1,115 @@
 # Created by: rooneg@electricjellyfish.net
 # $FreeBSD$
 
 PORTNAME?=	subversion
 PORTVERSION=	1.13.0
 PORTREVISION?=	0
 CATEGORIES+=	devel
 MASTER_SITES=	APACHE/subversion
 
 GNU_CONFIGURE=	yes
 USES+=		cpe libtool pathfix pkgconfig shebangfix tar:bzip2
 SHEBANG_FILES=	tools/server-side/svnpubsub/rc.d/svnpubsub.solaris \
 		tools/server-side/svnpubsub/rc.d/svnwcsub.solaris
 
 LICENSE=	APACHE20
 
 CPE_VENDOR=	apache
 
 CONFLICTS_INSTALL+=	${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-1.[0-9].[0-9]* \
 			${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-1.[^1][0-9].[0-9]*
 
 LIB_DEPENDS+=		libapr-1.so:devel/apr1 \
 			libsqlite3.so:databases/sqlite3 \
 			libexpat.so:textproc/expat2 \
 			libutf8proc.so:textproc/utf8proc \
 			liblz4.so:archivers/liblz4
 
 CONFIGURE_ARGS+=	--without-swig \
 			--with-sqlite=${LOCALBASE} \
 			--with-expat=${LOCALBASE}/include:${LOCALBASE}/lib:expat
 
 # ===============================================================
 OPTIONS_SUB=			yes
 
 BDB_CONFIGURE_ON=		--enable-bdb6
 BDB_CONFIGURE_OFF=		--without-berkeley-db
 BDB_USES=			bdb
 
-MAINTAINER_DEBUG_CONFIGURE_ON=	--enable-maintainer-mode --enable-debug
-
 NLS_CONFIGURE_OFF=		--disable-nls
 NLS_USES=			gettext
 
 SASL_CONFIGURE_OFF=		--without-sasl
 SASL_CONFIGURE_ON=		--with-sasl=${LOCALBASE}
 SASL_LIB_DEPENDS=		libsasl2.so:security/cyrus-sasl2
 
 SERF_CONFIGURE_OFF=		--without-serf
 SERF_CONFIGURE_ON=		--with-serf
 SERF_LIB_DEPENDS=		libserf-1.so:www/serf
 
 GPG_AGENT_CONFIGURE_OFF=	--without-gpg-agent
 GPG_AGENT_CONFIGURE_ON=		--with-gpg-agent
 GPG_AGENT_BUILD_DEPENDS=	gpg-agent:security/gnupg
 GPG_AGENT_RUN_DEPENDS=		gpg-agent:security/gnupg
 
 STATIC_CONFIGURE_ON=		--enable-all-static PKG_CONFIG="${LOCALBASE}/bin/pkg-config --static"
 
 # ===============================================================
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MMAINTAINER_DEBUG}
-WITH_DEBUG=	yes
+.if defined(WITH_DEBUG)
+CONFIGURE_ARGS+=	--enable-maintainer-mode --enable-debug
 .endif
 
 APR_CONFIG=	${LOCALBASE}/bin/apr-1-config
 APU_CONFIG=	${LOCALBASE}/bin/apu-1-config
 
 CONFIGURE_ARGS+=--with-apr=${APR_CONFIG} --with-apr-util=${APU_CONFIG}
 
 .if ${ARCH} == "amd64" || ${ARCH} == "ia64"
 CFLAGS+=	-fpic -DPIC
 .endif
 
 OPTIONS_FILE_UNSET?=""
 OPTIONS_FILE_SET?=""
 
 .if ( ${PORT_OPTIONS:MFREEBSD_TEMPLATE} || !${OPTIONS_FILE_UNSET:MFREEBSD_TEMPLATE} ) && defined(ORGANIZATION)
 CFLAGS+=	-DHAS_ORGANIZATION_NAME
 .endif
 
 .include <bsd.port.pre.mk>
 
 pre-everything::
 .if defined(SVN_BUILD_ADDONS)
 .if ${PORT_OPTIONS:MSTATIC} || ${OPTIONS_FILE_SET:MSTATIC}
 	@${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
 	@${ECHO_MSG} "!!! addons (bindings, mod_dav_svn, etc). and static build are not compatible !!!"
 	@${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
 	@${FALSE}
 .endif
 .endif
 
 pre-patch:
 .if defined(SVN_BUILD_ADDONS)
 	@${CP} ${FILESDIR}/build-outputs.mk.addons ${WRKSRC}/build-outputs.mk
 .endif
 
 post-patch:
 .if ${PREFIX} != "/usr"
 	@${REINPLACE_CMD} "s#/etc/subversion#${ETCDIR}#g" ${WRKSRC}/subversion/libsvn_subr/config_file.c
 	@${REINPLACE_CMD} "s#/etc/subversion#${ETCDIR}#g" ${WRKSRC}/subversion/libsvn_subr/config_impl.h
 .endif
 	@${REINPLACE_CMD} "s#^swig_pydir =.*#swig_pydir = ${PYTHON_SITELIBDIR}/libsvn#" ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} "s#^swig_pydir_extra =.*#swig_pydir_extra = ${PYTHON_SITELIBDIR}/svn#" ${WRKSRC}/Makefile.in
 .if ( ${PORT_OPTIONS:MFREEBSD_TEMPLATE} || !${OPTIONS_FILE_UNSET:MFREEBSD_TEMPLATE} ) && defined(ORGANIZATION)
 	@${ECHO_CMD} "#define ORGANIZATION_NAME \"${ORGANIZATION}\"" > ${WRKSRC}/subversion/freebsd-organization.h
 .endif
 # shebangfix
 	@${FIND} ${WRKSRC}/tools/ -type f -exec ${GREP} -l -e '#!/bin/b' -e '#!/bin/env' \
 		-e '#!/usr/bin/p' {} + | ${XARGS} ${REINPLACE_CMD} -e \
 		'1s|#\!/bin/b|#\!/usr/local/bin/b|' \
 		-e '1s|#\!/bin/env|#\!/usr/bin/env|' \
 		-e '1s|#\!/usr/bin/p|#\!/usr/local/bin/p|'
 # remove all .bak files to clean the stage
 	@${FIND} ${WRKSRC} -name '*.bak' -delete
 
Index: head/devel/subversion-lts/Makefile
===================================================================
--- head/devel/subversion-lts/Makefile	(revision 527672)
+++ head/devel/subversion-lts/Makefile	(revision 527673)
@@ -1,229 +1,227 @@
 # Created by: rooneg@electricjellyfish.net
 # $FreeBSD$
 
 PORTREVISION=	0
 PKGNAMESUFFIX=	-lts
 
 MAINTAINER=	lev@FreeBSD.org
 COMMENT=	Version control system, long-time-support version
 
 CONFLICTS_INSTALL=	subversion-1.[0-9].[0-9]* \
 			subversion-1.1[0-9].[0-9]* \
 			subversion1[0-9]-1.[0-9].[0-9]*
 
 USE_RC_SUBR=	svnserve
 
 PORTDOCS=	BUGS CHANGES COMMITTERS INSTALL README
 
 OPTIONS_DEFINE=	\
 		BDB		\
 		DOCS		\
 		FREEBSD_TEMPLATE\
 		GPG_AGENT \
-		MAINTAINER_DEBUG\
 		NLS		\
 		SASL		\
 		SERF		\
 		STATIC		\
 		SVNSERVE_WRAPPER\
 		TEST		\
 		TOOLS
 
 OPTIONS_DEFAULT=FREEBSD_TEMPLATE SERF TOOLS
 
 FREEBSD_TEMPLATE_DESC=	FreeBSD Project log template
 GPG_AGENT_DESC=		Enable GPG agent password store
-MAINTAINER_DEBUG_DESC=	Build debug version
 SERF_DESC=		WebDAV/Delta-V (HTTP/HTTPS) repo access module
 STATIC_DESC=		Build static version (no shared libs)
 SVNSERVE_WRAPPER_DESC=	Enable svnserve wrapper (umask setter)
 TEST_DESC=		Run subversion test suite
 TOOLS_DESC=		Install several tools
 
 # Patches required for use with the FreeBSD Project repository only
 FREEBSD_TEMPLATE_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-fbsd-template
 SVNSERVE_WRAPPER_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-svnserve-wrapper
 
 USES+=			shebangfix python:2.7,env
 python_OLD_CMD+=	"/bin/env python"
 SHEBANG_REGEX=		./tools/.*
 
 .include "Makefile.common"
 
 SVNREPOS?=	/home/svn/repos
 SVNFSTYPE?=	fsfs
 SVNGROUP?=	svn
 SVNUSER?=	svn
 
 CONFIGURE_ARGS+=	--without-gnome-keyring \
 			--without-kwallet \
 			--with-apxs=no
 
 .if ${PORT_OPTIONS:MSVNSERVE_WRAPPER}
 SUB_LIST+=	SVNSERVE_BIN_EXT=".bin"
 PLIST_SUB+=	NO_SVNSERVE_WRAPPER="@comment "
 .else
 SUB_LIST+=	SVNSERVE_BIN_EXT=""
 PLIST_SUB+=	NO_SVNSERVE_WRAPPER=""
 .endif
 
 .if ${PORT_OPTIONS:MTEST}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
 .endif
 
 .if ${PORT_OPTIONS:MSTATIC}
 .  if ${PORT_OPTIONS:MNLS}
 USES+=			gettext-tools
 .  endif
 .  if ${PORT_OPTIONS:MBDB}
 BDB_BUILD_DEPENDS=	yes
 .  endif
 OLD_LIB_DEPENDS:=	${LIB_DEPENDS:S!^!${LOCALBASE}/lib/!:C!(\.so|\.[0-9]+)?:!.a:!}
 BUILD_DEPENDS+=		${OLD_LIB_DEPENDS}
 LIB_DEPENDS=
 .endif
 
 .if make(repository)
 WITH_REPOSITORY_CREATION=	yes
 .endif
 
 .if defined(WITH_REPOSITORY_CREATION)
 MKREPOS_TARGET=	_mkrepos
 .endif
 
 pre-everything::
 	@${ECHO_MSG} ""
 .if defined(WITH_REPOSITORY_CREATION)
 	@${ECHO_MSG} "I will create (or use, if it exists) '${SVNUSER}' user and '${SVNGROUP}' group."
 	@${ECHO_MSG} "Make sure that all committers are its members."
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "Repository will be created at '${SVNREPOS}' with user '${SVNUSER}' and group '${SVNGROUP}'."
 	@${ECHO_MSG} "Type of repository will be '${SVNFSTYPE}'."
 	@${ECHO_MSG} "You could change these settings by defining SVNREPOS, SVNGROUP and SVNFSTYPE."
 .else
 	@${ECHO_MSG} "You can have the repository created for you by defining"
 	@${ECHO_MSG} "WITH_REPOSITORY_CREATION."
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "Make sure that:"
 	@${ECHO_MSG} "* all your svn users are members of a common group"
 	@${ECHO_MSG} "* this group is the group id of the db/ and locks/"
 	@${ECHO_MSG} "  subdirectories of your repository"
 	@${ECHO_MSG} "* the above subdirectories are writable by this group"
 .endif
 
 	@${ECHO_MSG} ""
 .if ${PORT_OPTIONS:MSTATIC}
 	@${ECHO_MSG} "Static binaries will be built."
 .endif # STATIC
 	@${ECHO_MSG} "Many useful scripts will be installed into ${DATADIR}"
 
 pre-configure:
 .if ${PORT_OPTIONS:MBDB}
 	@BDB_VERSION=`${APR_APU_DIR}/${APU_CONFIG} --db-version`; \
 	if [ "$${BDB_VERSION}" != "4" -a "$${BDB_VERSION}" != "5" -a "$${BDB_VERSION}" != "6" ] ; then \
 		${ECHO_MSG} "" ; \
 		${ECHO_MSG} 'You should build `'"devel/apr1' with Berkeley DB (4, 5 or 6) support to use subversion with it." ; \
 		${ECHO_MSG} 'Please rebuild `'"devel/apr1' with option "'`'"BDB' and try again." ; \
 		${ECHO_MSG} "" ; \
 		${ECHO_MSG} "Or you can disable Berkeley DB support. Only 'fs' repository backend will be available." ; \
 		${ECHO_MSG} "" ; \
 		${FALSE} ; \
 	fi
 .endif
 .if ${PORT_OPTIONS:MSTATIC}
 LIBS_SQLITE3!=	pkgconf --libs --static sqlite3
 LIBS+=		${LIBS_SQLITE3}
 # for work with ICU
 LIBS+=		-lc++ -lm
 .endif
 
 post-configure:
 # Enable GNOME Keyring / KWallet support in main code, as it is harmless
 	@${REINPLACE_CMD} -E 's%.*#undef SVN_HAVE_(GNOME_KEYRING|KWALLET).*%#define SVN_HAVE_\1 1%' ${WRKSRC}/subversion/svn_private_config.h
 # ugly hack: save tools directory so we don't have to cleanup before installing
 	@${CP} -R ${WRKSRC}/tools ${WRKSRC}/tools.examples
 	@${CHMOD} -R a-st,o+rX ${WRKSRC}/tools.examples
 
 # takes a long time, and will fail but gives maintainer a good oversight
 .if ${PORT_OPTIONS:MTEST}
 test: build
 	-@make check -C ${WRKSRC}
 .endif
 
 post-build-TOOLS-on:
 	@${MAKE} -C ${WRKSRC} tools ${MAKE_ARGS}
 
 post-install:	${MKREPOS_TARGET}
 	-@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/*
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	(cd ${WRKSRC}/tools.examples && ${TAR} --exclude '*.in' -cf - * | ${TAR} -C ${STAGEDIR}${DATADIR} -xof - )
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 post-install-STATIC-off:
 	-@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so
 
 post-install-SVNSERVE_WRAPPER-on:
 	@${INSTALL_SCRIPT} ${FILESDIR}/svnserve.wrapper ${STAGEDIR}${PREFIX}/bin/svnserve.sample
 
 post-install-TOOLS-on:
 	@${MAKE} -C ${WRKSRC} install-tools ${MAKE_ARGS}
 	-@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/*
 
 # ===============================================================================
 repository:	_mkrepos
 
 _SVNGRPFILES=	db locks locks/db.lock locks/db-logs.lock
 SVNGRPFILES=	${_SVNGRPFILES:S,^,${SVNREPOS}/,}
 
 _mkrepos:	.USE
 .if !exists(${SVNREPOS})
 .if ${PORT_OPTIONS:MSVNSERVE_WRAPPER}
 	@if /usr/sbin/pw groupshow "${SVNGROUP}" >/dev/null 2>&1; then \
 	    ${ECHO_MSG} "You already have a group \"${SVNGROUP}\", so I will use it."; \
 	else \
 	    if /usr/sbin/pw groupadd ${SVNGROUP} -h -; \
 	    then \
 	        ${ECHO_MSG} "Added group \"${SVNGROUP}\"."; \
 	    else \
 	        ${ECHO_MSG} "Adding group \"${SVNGROUP}\" failed..."; \
 	        ${ECHO_MSG} "Please create it, and try again."; \
 	        ${FALSE}; \
 	    fi; \
 	fi
 	@if /usr/sbin/pw usershow "${SVNUSER}" >/dev/null 2>&1; then \
 	    ${ECHO_MSG} "You already have a user \"${SVNUSER}\", so I will use it."; \
 	else \
 	    if /usr/sbin/pw useradd ${SVNUSER} -h -; \
 	    then \
 	        ${ECHO_MSG} "Added user \"${SVNUSER}\"."; \
 	    else \
 	        ${ECHO_MSG} "Adding user \"${SVNUSER}\" failed..."; \
 	        ${ECHO_MSG} "Please create it, and try again."; \
 	        ${FALSE}; \
 	    fi; \
 	fi
 .endif
 	@${MKDIR} ${SVNREPOS}
 	@${PREFIX}/bin/svnadmin create --fs-type ${SVNFSTYPE} ${SVNREPOS}
 .if ${PORT_OPTIONS:MSVNSERVE_WRAPPER}
 	@${CHOWN} ${SVNUSER}:${SVNGROUP} ${SVNGRPFILES}
 	@${CHMOD} g+w ${SVNGRPFILES}
 	@for i in ${SVNREPOS}/db/* ; do \
 	    i=$${i##*/}; \
 	    case $$i in \
 	    DB_CONFIG|fs-type|uuid) ;; \
 	    *) ${CHOWN} -R ${SVNUSER}:${SVNGROUP} ${SVNREPOS}/db/$$i; \
 	       ${CHMOD} -R g+w ${SVNREPOS}/db/$$i; \
 	       ;; \
 	    esac; \
 	done
 .endif
 .endif
 
 svn-build-outputs-hack:
 	(cd ${WRKSRC} && ${PATCH} ${PATCH_DIST_ARGS} -p0 < ${PATCHDIR}/extra-patch-build.conf)
 	(cd ${WRKSRC} && python2.7 gen-make.py --release --installed-libs libsvn_client,libsvn_delta,libsvn_diff,libsvn_fs,libsvn_fs_x,libsvn_ra,libsvn_repos,libsvn_subr,libsvn_wc)
 	${MV} ${WRKSRC}/build-outputs.mk ${FILESDIR}/build-outputs.mk.addons
 
 .include <bsd.port.post.mk>
Index: head/devel/subversion-lts/Makefile.common
===================================================================
--- head/devel/subversion-lts/Makefile.common	(revision 527672)
+++ head/devel/subversion-lts/Makefile.common	(revision 527673)
@@ -1,117 +1,115 @@
 # Created by: rooneg@electricjellyfish.net
 # $FreeBSD$
 
 PORTNAME?=	subversion
 PORTVERSION=	1.10.6
 PORTREVISION?=	0
 CATEGORIES+=	devel
 MASTER_SITES=	APACHE/subversion
 
 GNU_CONFIGURE=	yes
 USES+=		cpe libtool pathfix pkgconfig shebangfix tar:bzip2
 SHEBANG_FILES=	tools/server-side/svnpubsub/rc.d/svnpubsub.solaris \
 		tools/server-side/svnpubsub/rc.d/svnwcsub.solaris
 
 LICENSE=	APACHE20
 
 CPE_VENDOR=	apache
 
 CONFLICTS_INSTALL+=	${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-1.[0-9].[0-9]* \
 			${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-1.1[0-9].[0-9]*
 
 LIB_DEPENDS+=		libapr-1.so:devel/apr1 \
 			libsqlite3.so:databases/sqlite3 \
 			libexpat.so:textproc/expat2 \
 			libutf8proc.so:textproc/utf8proc \
 			liblz4.so:archivers/liblz4
 
 CONFIGURE_ARGS+=	--without-swig \
 			--with-sqlite=${LOCALBASE} \
 			--with-expat=${LOCALBASE}/include:${LOCALBASE}/lib:expat
 
 # ===============================================================
 OPTIONS_SUB=			yes
 
 BDB_CONFIGURE_ON=		--enable-bdb6
 BDB_CONFIGURE_OFF=		--without-berkeley-db
 BDB_USES=			bdb
 
-MAINTAINER_DEBUG_CONFIGURE_ON=	--enable-maintainer-mode --enable-debug
-
 NLS_CONFIGURE_OFF=		--disable-nls
 NLS_USES=			gettext
 
 SASL_CONFIGURE_OFF=		--without-sasl
 SASL_CONFIGURE_ON=		--with-sasl=${LOCALBASE}
 SASL_LIB_DEPENDS=		libsasl2.so:security/cyrus-sasl2
 
 SERF_CONFIGURE_OFF=		--without-serf
 SERF_CONFIGURE_ON=		--with-serf
 SERF_LIB_DEPENDS=		libserf-1.so:www/serf
 
 GPG_AGENT_CONFIGURE_OFF=	--without-gpg-agent
 GPG_AGENT_CONFIGURE_ON=		--with-gpg-agent
 GPG_AGENT_BUILD_DEPENDS=	gpg-agent:security/gnupg
 GPG_AGENT_RUN_DEPENDS=		gpg-agent:security/gnupg
 
 STATIC_CONFIGURE_ON=		--enable-all-static PKG_CONFIG="${LOCALBASE}/bin/pkg-config --static"
 
 # ===============================================================
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MMAINTAINER_DEBUG}
-WITH_DEBUG=	yes
+.if defined(WITH_DEBUG)
+CONFIGURE_ARGS+=	--enable-maintainer-mode --enable-debug
 .endif
 
 APR_CONFIG=	${LOCALBASE}/bin/apr-1-config
 APU_CONFIG=	${LOCALBASE}/bin/apu-1-config
 
 CONFIGURE_ARGS+=--with-apr=${APR_CONFIG} --with-apr-util=${APU_CONFIG}
 
 .if ${ARCH} == "amd64" || ${ARCH} == "ia64"
 CFLAGS+=	-fpic -DPIC
 .endif
 
 OPTIONS_FILE_UNSET?=""
 OPTIONS_FILE_SET?=""
 
 .if ( ${PORT_OPTIONS:MFREEBSD_TEMPLATE} || !${OPTIONS_FILE_UNSET:MFREEBSD_TEMPLATE} ) && defined(ORGANIZATION)
 CFLAGS+=	-DHAS_ORGANIZATION_NAME
 .endif
 
 .include <bsd.port.pre.mk>
 
 pre-everything::
 .if defined(SVN_BUILD_ADDONS)
 .if ${PORT_OPTIONS:MSTATIC} || ${OPTIONS_FILE_SET:MSTATIC}
 	@${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
 	@${ECHO_MSG} "!!! addons (bindings, mod_dav_svn, etc). and static build are not compatible !!!"
 	@${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
 	@${FALSE}
 .endif
 .endif
 
 pre-patch:
 .if defined(SVN_BUILD_ADDONS)
 	@${CP} ${FILESDIR}/build-outputs.mk.addons ${WRKSRC}/build-outputs.mk
 .endif
 
 post-patch:
 .if ${PREFIX} != "/usr"
 	@${REINPLACE_CMD} "s#/etc/subversion#${ETCDIR}#g" ${WRKSRC}/subversion/libsvn_subr/config_file.c
 	@${REINPLACE_CMD} "s#/etc/subversion#${ETCDIR}#g" ${WRKSRC}/subversion/libsvn_subr/config_impl.h
 .endif
 	@${REINPLACE_CMD} "s#^swig_pydir =.*#swig_pydir = ${PYTHON_SITELIBDIR}/libsvn#" ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} "s#^swig_pydir_extra =.*#swig_pydir_extra = ${PYTHON_SITELIBDIR}/svn#" ${WRKSRC}/Makefile.in
 .if ( ${PORT_OPTIONS:MFREEBSD_TEMPLATE} || !${OPTIONS_FILE_UNSET:MFREEBSD_TEMPLATE} ) && defined(ORGANIZATION)
 	@${ECHO_CMD} "#define ORGANIZATION_NAME \"${ORGANIZATION}\"" > ${WRKSRC}/subversion/freebsd-organization.h
 .endif
 # shebangfix
 	@${FIND} ${WRKSRC}/tools/ -type f -exec ${GREP} -l -e '#!/bin/b' -e '#!/bin/env' \
 		-e '#!/usr/bin/p' {} + | ${XARGS} ${REINPLACE_CMD} -e \
 		'1s|#\!/bin/b|#\!/usr/local/bin/b|' \
 		-e '1s|#\!/bin/env|#\!/usr/bin/env|' \
 		-e '1s|#\!/usr/bin/p|#\!/usr/local/bin/p|'
 # remove all .bak files to clean the stage
 	@${FIND} ${WRKSRC} -name '*.bak' -delete
 
Index: head/editors/openoffice-4/Makefile
===================================================================
--- head/editors/openoffice-4/Makefile	(revision 527672)
+++ head/editors/openoffice-4/Makefile	(revision 527673)
@@ -1,516 +1,515 @@
 # Created by: Martin Blapp
 # $FreeBSD$
 
 PORTNAME=	apache-openoffice
 PORTVERSION=	${AOOVERSION}
 PORTREVISION=	2
 CATEGORIES=	editors java
 MASTER_SITES=	APACHE/openoffice/${PORTVERSION}/source \
 		http://tools.openoffice.org/unowinreg_prebuild/680/:unoreg \
 		LOCAL/truckman/openoffice:extsrc \
 		SF/oooextras.mirror/:sf
 .if defined(LANG_PKGNAME)
 PKGNAMEPREFIX=		${LANG_PKGNAME}-
 .endif
 .if defined(LANG_SUFFIX)
 PKGNAMESUFFIX=		-${LANG_SUFFIX}
 .endif
 DISTFILES=	${AOOSRC} ${EXTSRC}:extsrc
 DIST_SUBDIR=	openoffice
 EXTRACT_ONLY=	${AOOSRC}
 
 MAINTAINER=	office@FreeBSD.org
 #de facto maintainer is truckman@FreeBSD.org
 #Frequent Patch submitters should (optionally) sign the Apache iCLA
 COMMENT=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser
 
 LICENSE=		APACHE20 ADOBE BSD3CLAUSE BSD4CLAUSE BSL ICU MIT MPL10 \
 			MPL11 PSFL TWAIN W3C
 LICENSE_COMB=		multi
 LICENSE_NAME_ADOBE=	Adobe Systems Incorporated license
 LICENSE_NAME_ICU=	ICU License
 LICENSE_NAME_TWAIN=	TWAIN Working Group license
 LICENSE_NAME_W3C=	W3C license
 LICENSE_FILE_APACHE20=	${WRKSRC}/LICENSE_ALv2
 LICENSE_FILE_ADOBE=	${WRKSRC}/LICENSE_ADOBE
 LICENSE_FILE_BSD3CLAUSE=	${WRKSRC}/LICENSE_BSD3CLAUSE
 LICENSE_FILE_BSD4CLAUSE=	${WRKSRC}/LICENSE_BSD4CLAUSE
 LICENSE_FILE_BSL=	${WRKSRC}/LICENSE_BSL
 LICENSE_FILE_ICU=	${WRKSRC}/LICENSE_ICU
 LICENSE_FILE_MIT=	${WRKSRC}/LICENSE_MIT
 LICENSE_FILE_MPL10=	${WRKSRC}/LICENSE_MPL10
 LICENSE_FILE_MPL11=	${WRKSRC}/LICENSE_MPL11
 LICENSE_FILE_PSFL=	${WRKSRC}/LICENSE_PSFL
 LICENSE_FILE_TWAIN=	${WRKSRC}/LICENSE_TWAIN
 LICENSE_FILE_W3C=	${WRKSRC}/LICENSE_W3C
 LICENSE_PERMS_ADOBE=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 LICENSE_PERMS_ICU=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 LICENSE_PERMS_TWAIN=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 LICENSE_PERMS_W3C=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 ONLY_FOR_ARCHS=	amd64 i386 powerpc64
 
 BUILD_DEPENDS=								\
 		p5-Archive-Zip>=0:archivers/p5-Archive-Zip		\
 		${LOCALBASE}/bin/unzip:archivers/unzip			\
 		zip:archivers/zip					\
 		ant:devel/apache-ant					\
 		dmake:devel/dmake					\
 		epm:devel/epm						\
 		${LOCALBASE}/bin/gperf:devel/gperf			\
 		imake:devel/imake					\
 		gpatch:devel/patch					\
 		${LOCALBASE}/include/sane/sane.h:graphics/sane-backends	\
 		${JAVALIBDIR}/commons-lang.jar:java/apache-commons-lang \
 		${JAVALIBDIR}/junit.jar:java/junit			\
 		${JAVALIBDIR}/bsh.jar:lang/bsh				\
 		bash:shells/bash					\
 		${JAVALIBDIR}/lucene-core-3.6.2.jar:textproc/lucene	\
 		p5-XML-Parser>=0:textproc/p5-XML-Parser			\
 		p5-libwww>=0:www/p5-libwww				\
 		p5-LWP-Protocol-https>0:www/p5-LWP-Protocol-https
 LIB_DEPENDS=								\
 		libapr-1.so:devel/apr1					\
 		libnspr4.so:devel/nspr					\
 		libcurl.so:ftp/curl					\
 		libcairo.so:graphics/cairo				\
 		libpng.so:graphics/png					\
 		libgraphite.so:graphics/silgraphite			\
 		libCoinMP.so:math/coinmp				\
 		libfreetype.so:print/freetype2				\
 		libnss3.so:security/nss					\
 		libexpat.so:textproc/expat2				\
 		libhunspell-1.7.so:textproc/hunspell			\
 		libhyphen.so:textproc/hyphen				\
 		libtextcat.so:textproc/libtextcat			\
 		libmythes-1.2.so:textproc/mythes			\
 		librdf.so:textproc/redland				\
 		libserf-1.so:www/serf					\
 		libfontconfig.so:x11-fonts/fontconfig
 RUN_DEPENDS=								\
 		${LOCALBASE}/share/icons/hicolor/index.theme:misc/hicolor-icon-theme \
 		${JAVALIBDIR}/commons-lang.jar:java/apache-commons-lang \
 		${JAVALIBDIR}/bsh.jar:lang/bsh				\
 		${LOCALBASE}/share/fonts/Caladea/Caladea-Bold.ttf:x11-fonts/crosextrafonts-caladea-ttf \
 		${LOCALBASE}/share/fonts/Carlito/Carlito-Bold.ttf:x11-fonts/crosextrafonts-carlito-ttf \
 		${LOCALBASE}/share/fonts/ChromeOS/Arimo-Bold.ttf:x11-fonts/croscorefonts-fonts-ttf
 
 USES=		autoreconf bison compiler:c++11-lib cpe desktop-file-utils \
 		gettext-runtime gl gmake gnome iconv jpeg perl5 pkgconfig \
 		python:2.7 shared-mime-info ssl tar:bzip2 xorg
 USE_GL=		gl glu
 USE_GNOME=	gtk20 libxslt libidl glib20
 USE_JAVA=	yes
 JAVA_BUILD=	jdk
 JAVA_RUN=	jdk
 JAVA_VENDOR=	openjdk
 USE_PERL5=	build
 USE_XORG=	ice sm x11 xau xaw xcomposite xcursor xdamage xext xfixes xi \
 		xinerama xrandr xrender xt
 
 CONFLICTS_INSTALL=	apache-openoffice-devel-*
 
 AOOVERSION1=	4
 AOOVERSION2=	1
 AOOVERSION3=	7
 # From solenv/inc/minor.mk SOURCEREVISION LAST_MINOR BUILD
 AOOTAG=		AOO417m1\(Build:9800\)
 GITREVISION=	46059c9192
 EXTSRC=		ApacheOpenOffice.ext_sources.${AOOVERSION1}.x.x.20150707.tar.gz
 
 AOOVERSION=	${AOOVERSION1}.${AOOVERSION2}.${AOOVERSION3}
 AOOXXX=		${AOOVERSION1}${AOOVERSION2}${AOOVERSION3}
 AOOSUFFIX=	${PORTVERSION}
 AOOSRC=		apache-openoffice-${AOOVERSION}-${GITREVISION}-src${EXTRACT_SUFX}
 
 AOOUDIR=		.openoffice.org\/${AOOVERSION1}
 INSTALLATION_BASEDIR?=	openoffice-${AOOSUFFIX}
 PRINSTALLATION_BASEDIR=	${PREFIX}/${INSTALLATION_BASEDIR}
 OOPATH=			${PRINSTALLATION_BASEDIR}/openoffice${AOOVERSION1}
 XDGDIR=			${OOPATH}/share/xdg
 XDGREL=			../../${INSTALLATION_BASEDIR}/openoffice${AOOVERSION1}/share/xdg
 EXECBASE?=		openoffice-${AOOSUFFIX}
 
 INSTALLS_ICONS=	yes
 WITHOUT_CPU_CFLAGS=	true
 CPE_PRODUCT=	${PORTNAME:S|apache-||}
 CPE_VENDOR=	apache
 
 OPTIONS_DEFINE=		CRASHDUMP CUPS DBGUTIL DEBUG GNOME GNOMEVFS MMEDIA \
 			SDK WIKI_PUBLISHER
 OPTIONS_DEFAULT=	CUPS GNOME GNOMEVFS MMEDIA WIKI_PUBLISHER
-CRASHDUMP_DESC=		Enable crashdumps, sets WITH_DEBUG
+CRASHDUMP_DESC=		Enable crashdumps, you also need to set WITH_DEBUG_PORTS+=${PKGORIGIN}
 DBGUTIL_DESC=		Enable assertions, object counting. (non-production)
-DEBUG_DESC=		Compile with -O0, sets WITH_DEBUG
+DEBUG_DESC=		Compile with -O0, you also need to set WITH_DEBUG_PORTS+=${PKGORIGIN}
 GNOME_DESC=		GConf + screensaver presentation control via DBUS
 GNOMEVFS_DESC=		GNOME Virtual File System
 MMEDIA_DESC=		Multimedia backend for impress
 SDK_DESC=		Build and install software development kit
 WIKI_PUBLISHER_DESC=	Build and install Wiki Publisher extension
 
 CRASHDUMP_CONFIGURE_ENABLE=	crashdump
-CRASHDUMP_VARS=			WITH_DEBUG=yes
 
 CUPS_CONFIGURE_ENABLE=		cups
 CUPS_LIB_DEPENDS=		libcups.so:print/cups
 
 DBGUTIL_CONFIGURE_ENABLE=	dbgutil
 
 DEBUG_CONFIGURE_ENABLE=		debug
 
 GNOME_CONFIGURE_ENABLE=		dbus gconf lockdown
 GNOME_LIB_DEPENDS=		libdbus-1.so:devel/dbus \
 				libdbus-glib-1.so:devel/dbus-glib
 GNOME_USE=			GNOME=gconf2
 
 GNOMEVFS_CONFIGURE_ENABLE=	gnome-vfs
 GNOMEVFS_CONFIGURE_OFF=		--enable-gio
 GNOMEVFS_CONFIGURE_ON=		--disable-gio
 GNOMEVFS_USE=			GNOME=gnomevfs2
 
 MMEDIA_CONFIGURE_ENABLE=	gstreamer
 MMEDIA_LIB_DEPENDS=		libgstreamer-0.10.so:multimedia/gstreamer
 MMEDIA_USE=			GSTREAMER=yes
 
 SDK_CONFIGURE_ENABLE=		odk
 SDK_DISTFILES=			unowinreg.dll:unoreg
 
 WIKI_PUBLISHER_CONFIGURE_ENABLE=	wiki-publisher
 WIKI_PUBLISHER_CONFIGURE_WITH=						\
 	commons-codec-jar=${JAVALIBDIR}/commons-codec.jar		\
 	commons-httpclient-jar=${JAVALIBDIR}/commons-httpclient.jar	\
 	commons-logging-jar=${JAVALIBDIR}/commons-logging.jar
 WIKI_PUBLISHER_JAR_DEPENDS=						\
 	${JAVALIBDIR}/commons-codec.jar:java/apache-commons-codec	\
 	${JAVALIBDIR}/commons-httpclient.jar:java/apache-commons-httpclient \
 	${JAVALIBDIR}/commons-logging.jar:java/apache-commons-logging
 WIKI_PUBLISHER_BUILD_DEPENDS=	${WIKI_PUBLISHER_JAR_DEPENDS}
 WIKI_PUBLISHER_RUN_DEPENDS=	${WIKI_PUBLISHER_JAR_DEPENDS}
 WIKI_PUBLISHER_VARS=	BUNDLED_EXTENSIONS+=swext/wiki-publisher.oxt
 
 # Don't run gnome-post-icons until after post-install generates the plist
 TARGET_ORDER_OVERRIDE=	710:gnome-post-icons
 
 # Force the SDK option on for makesum to ensure that unowinreg.dll is
 # included in distinfo
 .if make(makesum) || make(distclean)
 WITH=	SDK
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_DEBUG)
 CONFIGURE_ARGS+=	--enable-symbols
 .endif
 
 .include <${FILESDIR}/Makefile.localized>
 
 GCC_EXTRA_DISTFILES=	d6eef4b4cacb2183f2bf265a5a03a354-boost_1_55_0.tar.bz2 \
 			d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz
 
 .if ${CHOSEN_COMPILER_TYPE} == clang
 CPPFLAGS+=		-I${LOCALBASE}/include
 CONFIGURE_ARGS+=	--with-system-boost --with-system-vigra
 BUILD_DEPENDS+=	${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs \
 		${LOCALBASE}/bin/vigra-config:graphics/vigra
 . if ${ARCH} == amd64
 EXTRA_PATCHES+=		${FILESDIR}/extra-patch-align16
 . endif
 .endif
 
 # These extra distfiles are needed to use the bundled versions of
 # boost and vigra for compatiblity with gcc.  Also include them
 # for the makesum target so they are included in distinfo
 .if ${CHOSEN_COMPILER_TYPE} == gcc || make(makesum) || make(distclean)
 DISTFILES+=		${GCC_EXTRA_DISTFILES:C/.*/&:sf/g}
 .endif
 
 .if ${ARCH} == amd64
 FREEBSD_ENV_SET=	FreeBSDAMDEnv.Set.sh
 PACKAGE_MIDDLE=		${PORTVERSION}_${OPSYS}_x86-64
 .elif ${ARCH} == i386
 FREEBSD_ENV_SET=	FreeBSDX86Env.Set.sh
 PACKAGE_MIDDLE=		${PORTVERSION}_${OPSYS}_x86
 .elif ${ARCH} == powerpc64
 FREEBSD_ENV_SET=	FreeBSDPPC64Env.Set.sh
 PACKAGE_MIDDLE=		${PORTVERSION}_${OPSYS}_ppc64
 .endif
 PACKAGE_PREFIX=		Apache_OpenOffice
 
 LOCALIZED_LANG?=	en-US
 
 AOO_MAKE_ENV=	${MAKE_ENV:NCPPFLAGS=*:NCFLAGS=*:NCXXFLAGS=*}
 
 GNU_CONFIGURE=	yes
 WRKSUBDIR=	${WRKDIR}/aoo-${AOOVERSION}
 WRKSRC?=	${WRKSUBDIR}/main
 SUB_FILES=	pkg-message
 SUB_LIST=	EXECBASE=${EXECBASE} AOOTAG=${AOOTAG} AOOUDIR=${AOOUDIR} \
 		PRINSTALLATION_BASEDIR=${PRINSTALLATION_BASEDIR}
 
 CONFIGURE_ARGS+=							\
 			--with-unix-wrapper=${EXECBASE}			\
 			--with-alloc=system				\
 			--with-ant-home=${LOCALBASE}/share/java/apache-ant \
 			--with-system-apache-commons=yes		\
 			--with-commons-lang-jar=${JAVALIBDIR}/commons-lang.jar \
 			--with-system-apr				\
 			--with-system-apr-util				\
 			--with-system-beanshell				\
 			--with-beanshell-jar=${JAVALIBDIR}/bsh.jar	\
 			--enable-category-b				\
 			--with-system-cairo --enable-cairo		\
 			--with-system-coinmp				\
 			--with-system-curl				\
 			--with-system-dicts				\
 			--with-epm=${LOCALBASE}/bin/epm			\
 			--with-system-expat				\
 			--disable-fetch-external			\
 			--without-fonts					\
 			--with-gnu-patch=${LOCALBASE}/bin/gpatch	\
 			--with-gperf=${LOCALBASE}/bin/gperf		\
 			--with-system-graphite				\
 			--enable-gtk					\
 			--with-system-hunspell				\
 			--with-external-dict-dir=${LOCALBASE}/share/hunspell \
 			--with-system-hyphen				\
 			--with-external-hyph-dir=${LOCALBASE}/share/hyphen \
 			--with-jdk-home=${JAVA_HOME}			\
 			--with-system-jpeg				\
 			--with-junit=${JAVALIBDIR}/junit.jar		\
 			--with-system-libtextcat			\
 			--disable-kde					\
 			--disable-kde4					\
 			--with-system-libxml				\
 			--with-system-libxslt				\
 			--with-system-lucene				\
 			--with-lucene-core-jar=${JAVALIBDIR}/lucene-core-3.6.2.jar \
 			--with-lucene-analyzers-jar=${JAVALIBDIR}/lucene-analyzers-3.6.2.jar \
 			--with-system-mythes				\
 			--with-external-thes-dir=${LOCALBASE}/share/mythes \
 			--with-system-nss				\
 			--enable-opengl					\
 			--with-system-openssl				\
 			--with-package-format="archive"			\
 			--with-system-python				\
 			--with-system-redland				\
 			--with-system-sane				\
 			--with-system-serf				\
 			--with-system-stdlibs				\
 			--with-vendor="FreeBSD ports system"		\
 			--with-build-version="PKGNAME: ${PKGNAME:S/,/@/g}" \
 			--enable-verbose				\
 			--with-system-xrender				\
 			--with-system-zlib
 
 .if defined (BUNDLED_EXTENSIONS)
 CONFIGURE_ARGS+=	--with-bundled-prereg-extensions="${BUNDLED_EXTENSIONS}"
 .endif
 
 CREATE_TREE=	${WRKSRC}/sysui/desktop/share/create_tree.sh
 
 .include <${FILESDIR}/Makefile.knobs>
 
 pre-everything::
 # really tweak, extremely useful when you build all localized language versions
 # needed after when you build with ALL_LOCALIZED_LANGS.
 .if defined(TWEAK_L10N)
 	${RM} ${WRKDIR}/.PLIST*
 	${RM} ${WRKDIR}/.install_done.*
 	${RM} ${WRKDIR}/.package_done.*
 	${RM} ${WRKDIR}/.extract_done.*
 	${RM} ${WRKDIR}/.patch_done.*
 	${RM} ${WRKDIR}/.configure_done.*
 	${RM} ${WRKDIR}/.build_done.*
 	${MKDIR} ${WRKDIR}
 	${TOUCH} ${EXTRACT_COOKIE}
 	${TOUCH} ${PATCH_COOKIE}
 	${TOUCH} ${CONFIGURE_COOKIE}
 	${TOUCH} ${BUILD_COOKIE}
 .endif
 
 do-extract-SDK-on:
 	${CP} ${DISTDIR}/${DIST_SUBDIR}/unowinreg.dll ${WRKSRC}/external/unowinreg/
 
 post-extract:
 	${TAR} -C ${WRKSUBDIR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${EXTSRC}
 .if ${CHOSEN_COMPILER_TYPE} == gcc
 .  for f in ${GCC_EXTRA_DISTFILES}
 	${CP} ${DISTDIR}/${DIST_SUBDIR}/${f} ${WRKSUBDIR}/ext_sources/${f}
 .  endfor
 .endif
 	${CP} ${FILESDIR}/freebsd-aoo-intro.png \
 		${WRKSRC}/default_images/introabout/intro.png
 	${CP} ${FILESDIR}/freebsd-aoo-about.png \
 		${WRKSRC}/default_images/introabout/about.png
 	${RM} -r ${WRKSRC}/l10n
 	${LN} -sf ${UNZIP_CMD} ${WRKSRC}/solenv/bin/unzip
 	${SED}  -e '\|^For main/vcl/unx/generic/fontmanager/parseAFM|,/^__/p' \
 		-e '\|^For PostScript(R) AFM|,/^__/p'			\
 		-e d  ${WRKSRC}/LICENSE > ${LICENSE_FILE_ADOBE}
 	${SED}  -e '\|^For main/unixODBC|,/^__/p'			\
 		-e '\|^For main/connectivity|,/^__/p'			\
 		-e '\|^For main/libtextcat/data|,/^__/p'		\
 		-e '\|^For integration of HSQLDB|,/^__/p'		\
 		-e '\|^For C preprocessor|,/^__/p'			\
 		-e d  ${WRKSRC}/LICENSE > ${LICENSE_FILE_BSD3CLAUSE}
 	${SED}  -e '\|^For ICC |,/^__/p'				\
 		-e d  ${WRKSRC}/LICENSE > ${LICENSE_FILE_BSD4CLAUSE}
 	${SED}  -e '\|^For integration of the C++ Boost |,/^__/p'	\
 		-e d  ${WRKSRC}/LICENSE > ${LICENSE_FILE_BSL}
 	${SED}  -e '\|^For main/i18npool/source/breakiterator|,/^__/p'	\
 		-e d  ${WRKSRC}/LICENSE > ${LICENSE_FILE_ICU}
 	${SED}  -e '\|^For Multi-Dimensional Data|,/^__/p'		\
 		-e '\|^For XSLT MathML Library|,/^__/p'			\
 		-e d  ${WRKSRC}/LICENSE > ${LICENSE_FILE_MIT}
 	${SED}  -e '\|^For XMLSec Library|,/^__/p'			\
 		-e d  ${WRKSRC}/LICENSE_category_b >> ${LICENSE_FILE_MIT}
 	${SED}  -e '\|^For Saxon|,/^__/p'				\
 		-e d ${WRKSRC}/LICENSE_category_b > ${LICENSE_FILE_MPL10}
 	${SED}  -e '\|^For Saxon|,$$d'					\
 		      ${WRKSRC}/LICENSE_category_b > ${LICENSE_FILE_MPL11}
 	${SED}  -e '\|^For main/filter/source/config/tools/merge/pyAltFCFGMerge|,/^__/p'	\
 		-e d  ${WRKSRC}/LICENSE > ${LICENSE_FILE_PSFL}
 	${SED}  -e '\|^For main/twain|,/^__/p'				\
 		-e d  ${WRKSRC}/LICENSE > ${LICENSE_FILE_TWAIN}
 	${SED}  -e '\|^For main/MathMLDTD|,/^__/p'			\
 		-e d  ${WRKSRC}/LICENSE > ${LICENSE_FILE_W3C}
 
 post-patch:
 	${REINPLACE_CMD} -e "/^ICONVERSION/s/=.*/= '${AOOVERSION1}'/" \
 		${WRKSRC}/sysui/desktop/productversion.mk
 	${REINPLACE_CMD} -e "s|%%JAVA_HOME%%|${JAVA_HOME}|" \
 		${WRKSRC}/desktop/scripts/soffice.sh
 	${REINPLACE_CMD} -e "/#test/i\\${.newline}	return '${GITREVISION}';" \
 		${WRKSRC}/solenv/bin/modules/SvnRevision.pm
 	${REINPLACE_CMD} -e '/^mkdir -p/,$$d' ${CREATE_TREE}
 .if ${CHOSEN_COMPILER_TYPE} == gcc
 	# g++49 -Os sometimes leaves inline class methods undefined,
 	# affects fmgridif.cxx and ColumnControl.cxx
 	# See: <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=65009>
 	if [ ${CXX} = g++49  ]; then \
 		${REINPLACE_CMD} -e "s/ := -Os/ := -Os -fno-devirtualize -fno-devirtualize-speculatively/" ${WRKSRC}/solenv/gbuild/platform/freebsd.mk; \
 		${REINPLACE_CMD} -e "s/=-Os /=-Os -fno-devirtualize -fno-devirtualize-speculatively /" ${WRKSRC}/solenv/inc/unxfbsdi.mk; \
 	fi
 .elif ${ARCH} == i386 && ${CHOSEN_COMPILER_TYPE} == clang
 	# autodoc and uno (bridgetest) core dump when built with with -Os
 	# on i386, affects file.cxx and bridgetest.cxx (at least).
 	# Using -O2 optimiztion works, and -Os is essentially -O2 with out
 	# loop unrolling.
 	# Changing optimization in just unxfbsdi.mk is sufficient to get
 	# a successful build, but change it in both places to avoid the
 	# possibility of obscure runtime problems, which is likely
 	# since this seems to be a generic bug in code generation for
 	# exception handling.
 	# See: <https://llvm.org/bugs/show_bug.cgi?id=24792>
 	${REINPLACE_CMD} -e "s/=-Os /=-O2 -fno-unroll-loops /" ${WRKSRC}/solenv/inc/unxfbsdi.mk
 	${REINPLACE_CMD} -e "s/ := -Os/ := -O2 -fno-unroll-loops/" ${WRKSRC}/solenv/gbuild/platform/freebsd.mk
 .endif
 
 do-build:
 	${PRINTF} "[repositories]\nmain=active\nextras=active\n" > ${WRKSUBDIR}/source_config
 	cd ${WRKSRC} ; ./bootstrap
 	#
 	# numproc controls the number of parallel makes.
 	#
 	# dmproc is passed to dmake and controls parallelization at that
 	# level.
 	#
 	# dmproc > numproc seems to give shorter build times than
 	# numproc > dmproc.
 	#
 	# Select values for numproc and dmproc such that:
 	#  * numproc*dmproc >= MAKE_JOBS_NUMBER
 	#  * minimize numproc*dmproc-MAKE_JOBS_NUMBER
 	#  * dmproc >= numproc
 	#  * dmproc <= 2*numproc if MAKE_JOBS_NUMBER <= 3
 	#
 	if [ ${MAKE_JOBS_NUMBER} -le 3 ] ; then				  \
 	 numproc=1 ; dmproc=${MAKE_JOBS_NUMBER} ;			  \
 	else								  \
 	 a=1 ;								  \
 	 while [ $$(( 2 * $${a} * $${a} )) -lt ${MAKE_JOBS_NUMBER} ]; do  \
 	  a=$$(( $${a} + 1 )) ;						  \
 	 done ;								  \
 	 b=$$(( $${a} + 1 )) ;						  \
 	 ad=$$(( ( ${MAKE_JOBS_NUMBER} + $${a} - 1 ) / $${a} )) ;	  \
 	 ap=$$(( $${a} * $${ad} )) ;					  \
 	 bd=$$(( ( ${MAKE_JOBS_NUMBER} + $${b} - 1 ) / $${b} )) ;	  \
 	 bp=$$(( $${b} * $${bd} )) ;					  \
 	 if [ $${ap} -le $${bp} ]; then					  \
 	  numproc=$${a} ; dmproc=$${ad} ;				  \
 	 else								  \
 	  numproc=$${b} ; dmproc=$${bd} ;				  \
 	 fi ;								  \
 	fi ;								  \
 	cd ${WRKSRC}/instsetoo_native ;					  \
 	export ${AOO_MAKE_ENV} ;					  \
 	. ../${FREEBSD_ENV_SET} ;					  \
 	build.pl --all -P$${numproc} -- -P$${dmproc}
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PRINSTALLATION_BASEDIR} \
 		${STAGEDIR}${PREFIX}/share/mime/packages
 	@cd ${WRKSRC} ; \
 		. ${FREEBSD_ENV_SET} ; \
 		cd instsetoo_native/$${INPATH}/Apache_OpenOffice/archive/install/${LOCALIZED_LANG}/ ; \
 		for i in *.tar.?z ; do \
 			${ECHO_CMD} "extracting $$i" ; \
 			${TAR} -s '|./[^/]*/||' -xz -f $$i \
 				-C ${STAGEDIR}${PRINSTALLATION_BASEDIR} ; \
 		done
 	${FIND} ${STAGEDIR}${PRINSTALLATION_BASEDIR} -type d -exec ${CHMOD} 755 {} \;
 	${REINPLACE_CMD} \
 		-e '/^UserInstallation/s/=.*/=$$SYSUSERCONFIG\/${AOOUDIR}/' \
 		${STAGEDIR}${OOPATH}/program/bootstraprc
 	@${RM} ${STAGEDIR}${OOPATH}/program/bootstraprc.bak
 	@${ECHO_CMD} "adding wrapper scripts";
 	@${CP} ${FILESDIR}/openoffice-wrapper ${WRKDIR}/
 	@${REINPLACE_CMD} -e 's#%%OOPATH%%#${OOPATH}#g' \
 			-e 's#%%EXECBASE%%#${EXECBASE}#g' \
 			${WRKDIR}/openoffice-wrapper
 	${INSTALL_SCRIPT} ${WRKDIR}/openoffice-wrapper \
 		${STAGEDIR}${PREFIX}/bin/${EXECBASE}
 	@cd ${STAGEDIR}${PREFIX}/bin; for i in printeradmin sbase scalc sdraw \
 		simpress smath spadmin swriter ; do \
 			${LN} -f ${EXECBASE} ${EXECBASE}-$${i} ; \
 	done
 	@${ECHO_CMD} "adding desktop support"
 	@cd ${WRKSRC} ;						\
 	    . ${FREEBSD_ENV_SET} ;				\
 	    cd sysui/$${INPATH}/misc/openoffice ;		\
 	    DESTDIR=${STAGEDIR}					\
 		GNOMEDIR=${PREFIX}				\
 		ICON_PREFIX=openoffice${AOOVERSION1}		\
 		ICON_SOURCE_DIR=${WRKSRC}/sysui/desktop/icons	\
 		ICON_THEMES="hicolor/??x??"			\
 		KDEMAINDIR=${PREFIX}				\
 		PREFIX=openoffice${AOOVERSION1}			\
 		${SH} ${CREATE_TREE} ;				\
 	    ${INSTALL_DATA} apacheopenoffice.xml		\
 		${STAGEDIR}/${PREFIX}/share/mime/packages
 	@cd ${STAGEDIR}${DESKTOPDIR}; for i in base calc draw impress \
 		javafilter math printeradmin qstart startcenter writer ; do \
 			${LN} -sf ${XDGREL}/$${i}.desktop ${EXECBASE}-$${i}.desktop ; \
 	done
 
 do-install-SDK-on:
 	${TAR} -s '|./[^/]*/||' -xz -C ${STAGEDIR}${PRINSTALLATION_BASEDIR} \
 		-f ${WRKSRC}/instsetoo_native/unxfbsd*.pro/Apache_OpenOffice_SDK/archive/install/${LOCALIZED_LANG}/*.tar.gz
 	@f=${STAGEDIR}${OOPATH}/sdk/bin/unoapploader ; \
 		${CHMOD} 644 $${f} ; ${STRIP_CMD} $${f} ; ${CHMOD} 444 $${f}
 
 post-install:
 	@${ECHO_CMD} "generating plist";
 	@cd ${STAGEDIR}${PREFIX} ; (\
 		${FIND} -s bin -name "${EXECBASE}*" ; \
 		${FIND} -s ${INSTALLATION_BASEDIR} share/applications \
 			share/application-registry share/icons \
 			share/mime-info share/mime share/mimelnk \! -type d ; \
 		${FIND} ${INSTALLATION_BASEDIR} -type d -empty | ${SORT} -r | \
 			${SED} -e 's/^/@dir /' ; \
 	) >> ${TMPPLIST}
 
 .include <${FILESDIR}/Makefile.others>
 
 .include <bsd.port.post.mk>
Index: head/editors/openoffice-devel/Makefile
===================================================================
--- head/editors/openoffice-devel/Makefile	(revision 527672)
+++ head/editors/openoffice-devel/Makefile	(revision 527673)
@@ -1,520 +1,519 @@
 # Created by: Martin Blapp
 # $FreeBSD$
 
 PORTNAME=	apache-openoffice
 PORTVERSION=	${AOOVERSION1}.${AOOVERSION2}.${TIMESTAMP}
 PORTREVISION=	1
 PORTEPOCH=	4
 CATEGORIES=	editors java
 MASTER_SITES=	https://dist.apache.org/repos/dist/dev/openoffice/${AOOVERSION}-${AOORC}-${TIMESTAMP}/source/ \
 		http://tools.openoffice.org/unowinreg_prebuild/680/:unoreg \
 		LOCAL/truckman/openoffice:snap,extsrc \
 		SF/oooextras.mirror/:sf
 .if defined(LANG_PKGNAME)
 PKGNAMEPREFIX=		${LANG_PKGNAME}-
 .endif
 .if defined(LANG_SUFFIX)
 PKGNAMESUFFIX=		-${LANG_SUFFIX}
 .endif
 PKGNAMESUFFIX=		-devel
 DISTFILES=	${AOOSRC}${AOODISTTAG} ${EXTSRC}:extsrc
 DIST_SUBDIR=	openoffice
 EXTRACT_ONLY=	${AOOSRC}
 
 MAINTAINER=	office@FreeBSD.org
 #de facto maintainer is truckman@FreeBSD.org
 #Frequent Patch submitters should (optionally) sign the Apache iCLA
 COMMENT=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser (developer version)
 
 LICENSE=		APACHE20 ADOBE BSD3CLAUSE BSD4CLAUSE BSL ICU MIT MPL10 \
 			MPL11 PSFL TWAIN W3C
 LICENSE_COMB=		multi
 LICENSE_NAME_ADOBE=	Adobe Systems Incorporated license
 LICENSE_NAME_ICU=	ICU License
 LICENSE_NAME_TWAIN=	TWAIN Working Group license
 LICENSE_NAME_W3C=	W3C license
 LICENSE_FILE_APACHE20=	${WRKSRC}/LICENSE_ALv2
 LICENSE_FILE_ADOBE=	${WRKSRC}/LICENSE_ADOBE
 LICENSE_FILE_BSD3CLAUSE=	${WRKSRC}/LICENSE_BSD3CLAUSE
 LICENSE_FILE_BSD4CLAUSE=	${WRKSRC}/LICENSE_BSD4CLAUSE
 LICENSE_FILE_BSL=	${WRKSRC}/LICENSE_BSL
 LICENSE_FILE_ICU=	${WRKSRC}/LICENSE_ICU
 LICENSE_FILE_MIT=	${WRKSRC}/LICENSE_MIT
 LICENSE_FILE_MPL10=	${WRKSRC}/LICENSE_MPL10
 LICENSE_FILE_MPL11=	${WRKSRC}/LICENSE_MPL11
 LICENSE_FILE_PSFL=	${WRKSRC}/LICENSE_PSFL
 LICENSE_FILE_TWAIN=	${WRKSRC}/LICENSE_TWAIN
 LICENSE_FILE_W3C=	${WRKSRC}/LICENSE_W3C
 LICENSE_PERMS_ADOBE=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 LICENSE_PERMS_ICU=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 LICENSE_PERMS_TWAIN=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 LICENSE_PERMS_W3C=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 ONLY_FOR_ARCHS=	amd64 i386 powerpc64
 BROKEN_powerpc64=	fails to compile: aoo-4.2.0/main/solver/420/unxfbsdppc64.pro/inc/stl/vector:31:11: fatal error: boost/tr1/tr1/vector: No such file or directory
 
 BUILD_DEPENDS=								\
 		p5-Archive-Zip>=0:archivers/p5-Archive-Zip		\
 		${LOCALBASE}/bin/unzip:archivers/unzip			\
 		zip:archivers/zip					\
 		ant:devel/apache-ant					\
 		dmake:devel/dmake					\
 		epm:devel/epm						\
 		${LOCALBASE}/bin/gperf:devel/gperf			\
 		imake:devel/imake					\
 		gpatch:devel/patch					\
 		${LOCALBASE}/include/sane/sane.h:graphics/sane-backends	\
 		${JAVALIBDIR}/commons-lang3.jar:java/apache-commons-lang3 \
 		${JAVALIBDIR}/junit.jar:java/junit			\
 		${JAVALIBDIR}/bsh.jar:lang/bsh				\
 		bash:shells/bash					\
 		${JAVALIBDIR}/lucene-core-3.6.2.jar:textproc/lucene	\
 		p5-XML-Parser>=0:textproc/p5-XML-Parser			\
 		p5-libwww>=0:www/p5-libwww				\
 		p5-LWP-Protocol-https>0:www/p5-LWP-Protocol-https
 LIB_DEPENDS=								\
 		libapr-1.so:devel/apr1					\
 		libnspr4.so:devel/nspr					\
 		libcurl.so:ftp/curl					\
 		libcairo.so:graphics/cairo				\
 		libpng.so:graphics/png					\
 		libgraphite.so:graphics/silgraphite			\
 		libCoinMP.so:math/coinmp				\
 		libfreetype.so:print/freetype2				\
 		libnss3.so:security/nss					\
 		libexpat.so:textproc/expat2				\
 		libhunspell-1.7.so:textproc/hunspell			\
 		libhyphen.so:textproc/hyphen				\
 		libtextcat.so:textproc/libtextcat			\
 		libmythes-1.2.so:textproc/mythes			\
 		librdf.so:textproc/redland				\
 		libserf-1.so:www/serf					\
 		libfontconfig.so:x11-fonts/fontconfig
 RUN_DEPENDS=								\
 		${LOCALBASE}/share/icons/hicolor/index.theme:misc/hicolor-icon-theme \
 		${JAVALIBDIR}/commons-lang3.jar:java/apache-commons-lang3 \
 		${JAVALIBDIR}/bsh.jar:lang/bsh				\
 		${LOCALBASE}/share/fonts/Caladea/Caladea-Bold.ttf:x11-fonts/crosextrafonts-caladea-ttf \
 		${LOCALBASE}/share/fonts/Carlito/Carlito-Bold.ttf:x11-fonts/crosextrafonts-carlito-ttf \
 		${LOCALBASE}/share/fonts/ChromeOS/Arimo-Bold.ttf:x11-fonts/croscorefonts-fonts-ttf
 
 USES=		autoreconf bison compiler:c++11-lib cpe desktop-file-utils \
 		gettext-runtime gl gmake gnome iconv jpeg perl5 pkgconfig \
 		python:3.7 shared-mime-info ssl tar:${TARTYPE} xorg
 USE_GL=		gl glu
 USE_GNOME=	gtk20 libxslt libidl glib20
 USE_JAVA=	yes
 JAVA_BUILD=	jdk
 JAVA_RUN=	jdk
 JAVA_VENDOR=	openjdk
 USE_PERL5=	build
 USE_XORG=	ice sm x11 xau xaw xcomposite xcursor xdamage xext xfixes xi \
 		xinerama xrandr xrender xt
 
 CONFLICTS_INSTALL=	apache-openoffice-4*
 
 AOOVERSION1=	4
 AOOVERSION2=	2
 AOOVERSION3=	0
 # From solenv/inc/minor.mk SOURCEREVISION LAST_MINOR BUILD
 AOOTAG=		AOO420m1\(Build:9821\)
 GITREVISION=	d12e928220
 TIMESTAMP=	1579913986
 #AOORC=rc3
 EXTSRC=		ApacheOpenOffice.ext_sources.${AOOVERSION1}.x.x.20150707.tar.gz
 
 AOOVERSION=	${AOOVERSION1}.${AOOVERSION2}.${AOOVERSION3}
 AOOXXX=		${AOOVERSION1}${AOOVERSION2}${AOOVERSION3}
 .if defined(AOORC)
 AOOSUFFIX=	${AOOVERSION}-${AOORC}
 AOOSRC=		apache-openoffice-${AOOVERSION}-${GITREVISION}-src${EXTRACT_SUFX}
 AOODISTTAG=
 TARTYPE=	bzip2
 .else
 AOOSUFFIX=	${PORTVERSION}
 AOOSRC=		apache-openoffice-${TIMESTAMP}-${GITREVISION}-src${EXTRACT_SUFX}
 AOODISTTAG=	:snap
 TARTYPE=	xz
 .endif
 
 AOOUDIR=		.openoffice.org\/${AOOVERSION1}
 INSTALLATION_BASEDIR?=	openoffice-${AOOSUFFIX}
 PRINSTALLATION_BASEDIR=	${PREFIX}/${INSTALLATION_BASEDIR}
 OOPATH=			${PRINSTALLATION_BASEDIR}/openoffice${AOOVERSION1}
 XDGDIR=			${OOPATH}/share/xdg
 XDGREL=			../../${INSTALLATION_BASEDIR}/openoffice${AOOVERSION1}/share/xdg
 EXECBASE?=		openoffice-${AOOSUFFIX}
 
 INSTALLS_ICONS=	yes
 WITHOUT_CPU_CFLAGS=	true
 CPE_PRODUCT=	${PORTNAME:S|apache-||}
 CPE_VENDOR=	apache
 
 OPTIONS_DEFINE=		CRASHDUMP CUPS DBGUTIL DEBUG GNOME GNOMEVFS MMEDIA \
 			MYSQL PDFIMPORT REPORT_BUILDER SDK WIKI_PUBLISHER
 OPTIONS_DEFAULT=	CUPS GNOME MMEDIA WIKI_PUBLISHER
-CRASHDUMP_DESC=		Enable crashdumps, sets WITH_DEBUG
+CRASHDUMP_DESC=		Enable crashdumps, you also need to set WITH_DEBUG_PORTS+=${PKGORIGIN}
 DBGUTIL_DESC=		Enable assertions, object counting. (non-production)
-DEBUG_DESC=		Compile with -O0, sets WITH_DEBUG
+DEBUG_DESC=		Compile with -O0, you also need to set WITH_DEBUG_PORTS+=${PKGORIGIN}
 GNOME_DESC=		GConf + screensaver presentation control via DBUS
 GNOMEVFS_DESC=		Use GNOME Virtual File System instead of gio
 MMEDIA_DESC=		Multimedia backend for impress
 MYSQL_DESC=		Build MySQL Connector extension
 PDFIMPORT_DESC=		Build and install PDF import extension
 REPORT_BUILDER_DESC=	Build and install Report builder extension (Broken)
 SDK_DESC=		Build and install software development kit
 WIKI_PUBLISHER_DESC=	Build and install Wiki Publisher extension
 
 CRASHDUMP_CONFIGURE_ENABLE=	crashdump
-CRASHDUMP_VARS=			WITH_DEBUG=yes
 
 CUPS_CONFIGURE_ENABLE=		cups
 CUPS_LIB_DEPENDS=		libcups.so:print/cups
 
 DBGUTIL_CONFIGURE_ENABLE=	dbgutil
 
 DEBUG_CONFIGURE_ENABLE=		debug
 
 GNOME_CONFIGURE_ENABLE=		dbus gconf lockdown
 GNOME_LIB_DEPENDS=		libdbus-1.so:devel/dbus \
 				libdbus-glib-1.so:devel/dbus-glib
 GNOME_USE=			GNOME=gconf2
 
 GNOMEVFS_CONFIGURE_ENABLE=	gnome-vfs
 GNOMEVFS_CONFIGURE_OFF=		--enable-gio
 GNOMEVFS_CONFIGURE_ON=		--disable-gio
 GNOMEVFS_USE=			GNOME=gnomevfs2
 
 MMEDIA_CONFIGURE_ENABLE=	gstreamer
 MMEDIA_USE=			GSTREAMER1=yes
 
 MYSQL_CONFIGURE_ENABLE=		mysql-connector
 MYSQL_CONFIGURE_WITH=		system-mysql
 MYSQL_LIB_DEPENDS=		libmysqlcppconn.so:databases/mysql-connector-c++
 MYSQL_USES=			mysql
 
 SDK_CONFIGURE_ENABLE=		odk
 SDK_DISTFILES=			unowinreg.dll:unoreg
 
 PDFIMPORT_BROKEN=		PDFIMPORT is not compatible with poppler-0.7x API
 PDFIMPORT_CONFIGURE_ENABLE=	pdfimport
 
 REPORT_BUILDER_BROKEN=		REPORT_BUILDER option requires additional .jar files
 REPORT_BUILDER_CONFIGURE_ENABLE=	report-builder
 REPORT_BUILDER_JAR_DEPENDS=
 REPORT_BUILDER_BUILD_DEPENDS=	${REPORT_BUILDER_JAR_DEPENDS}
 REPORT_BUILDER_RUN_DEPENDS=	${REPORT_BUILDER_JAR_DEPENDS}
 
 WIKI_PUBLISHER_CONFIGURE_ENABLE=	wiki-publisher
 WIKI_PUBLISHER_CONFIGURE_WITH=						\
 	commons-codec-jar=${JAVALIBDIR}/commons-codec.jar		\
 	commons-httpclient-jar=${JAVALIBDIR}/commons-httpclient.jar
 WIKI_PUBLISHER_JAR_DEPENDS=						\
 	${JAVALIBDIR}/commons-codec.jar:java/apache-commons-codec	\
 	${JAVALIBDIR}/commons-httpclient.jar:java/apache-commons-httpclient
 WIKI_PUBLISHER_BUILD_DEPENDS=	${WIKI_PUBLISHER_JAR_DEPENDS}
 WIKI_PUBLISHER_RUN_DEPENDS=	${WIKI_PUBLISHER_JAR_DEPENDS}
 
 # Don't run gnome-post-icons until after post-install generates the plist
 TARGET_ORDER_OVERRIDE=	710:gnome-post-icons
 
 # Force the SDK option on for makesum to ensure that unowinreg.dll is
 # included in distinfo
 .if make(makesum) || make(distclean)
 WITH=	SDK
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_DEBUG)
 CONFIGURE_ARGS+=	--enable-symbols
 .endif
 
 .if ${PORT_OPTIONS:MREPORT_BUILDER} || ${PORT_OPTIONS:MWIKI_PUBLISHER}
 BUILD_DEPENDS+=	${JAVALIBDIR}/commons-logging.jar:java/apache-commons-logging
 RUN_DEPENDS+=	${JAVALIBDIR}/commons-logging.jar:java/apache-commons-logging
 CONFIGURE_ARGS+=	--with-commons-logging-jar=${JAVALIBDIR}/commons-logging.jar
 .else
 CONFIGURE_ARGS+=	--without-commons-logging
 .endif
 
 .include <${FILESDIR}/Makefile.localized>
 
 GCC_EXTRA_DISTFILES=	d6eef4b4cacb2183f2bf265a5a03a354-boost_1_55_0.tar.bz2 \
 			d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz
 
 .if ${CHOSEN_COMPILER_TYPE} == clang
 CPPFLAGS+=		-I${LOCALBASE}/include
 CONFIGURE_ARGS+=	--with-system-boost --with-system-vigra
 BUILD_DEPENDS+=		${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs \
 			${LOCALBASE}/bin/vigra-config:graphics/vigra
 .endif
 
 # These extra distfiles are needed to use the bundled versions of
 # boost and vigra for compatiblity with gcc.  Also include them
 # for the makesum target so they are included in distinfo
 .if ${CHOSEN_COMPILER_TYPE} == gcc || make(makesum) || make(distclean)
 DISTFILES+=		${GCC_EXTRA_DISTFILES:C/.*/&:sf/g}
 .endif
 
 .if ${ARCH} == amd64
 FREEBSD_ENV_SET=	FreeBSDAMDEnv.Set.sh
 PACKAGE_MIDDLE=		${PORTVERSION}_${OPSYS}_x86-64
 .elif ${ARCH} == i386
 FREEBSD_ENV_SET=	FreeBSDX86Env.Set.sh
 PACKAGE_MIDDLE=		${PORTVERSION}_${OPSYS}_x86
 .elif ${ARCH} == powerpc64
 FREEBSD_ENV_SET=	FreeBSDPPC64Env.Set.sh
 PACKAGE_MIDDLE=		${PORTVERSION}_${OPSYS}_ppc64
 .endif
 PACKAGE_PREFIX=		Apache_OpenOffice
 
 LOCALIZED_LANG?=	en-US
 
 AOO_MAKE_ENV=	${MAKE_ENV:NCPPFLAGS=*:NCFLAGS=*:NCXXFLAGS=*}
 
 GNU_CONFIGURE=	yes
 WRKSUBDIR=	${WRKDIR}/aoo-${AOOVERSION}
 WRKSRC?=	${WRKSUBDIR}/main
 SUB_FILES=	pkg-message
 SUB_LIST=	EXECBASE=${EXECBASE} AOOTAG=${AOOTAG} AOOUDIR=${AOOUDIR} \
 		PRINSTALLATION_BASEDIR=${PRINSTALLATION_BASEDIR}
 
 CONFIGURE_ARGS+=							\
 			--with-unix-wrapper=${EXECBASE}			\
 			--with-alloc=system				\
 			--with-ant-home=${LOCALBASE}/share/java/apache-ant \
 			--with-system-apache-commons=yes		\
 			--with-commons-lang-jar=${JAVALIBDIR}/commons-lang3.jar \
 			--with-system-apr				\
 			--with-system-apr-util				\
 			--with-system-beanshell				\
 			--with-beanshell-jar=${JAVALIBDIR}/bsh.jar	\
 			--enable-category-b				\
 			--with-system-cairo --enable-cairo		\
 			--with-system-coinmp				\
 			--with-system-curl				\
 			--with-system-dicts				\
 			--with-epm=${LOCALBASE}/bin/epm			\
 			--with-system-expat				\
 			--disable-fetch-external			\
 			--without-fonts					\
 			--with-gnu-patch=${LOCALBASE}/bin/gpatch	\
 			--with-gperf=${LOCALBASE}/bin/gperf		\
 			--with-system-graphite				\
 			--enable-gtk					\
 			--with-system-hunspell				\
 			--with-external-dict-dir=${LOCALBASE}/share/hunspell \
 			--with-system-hyphen				\
 			--with-external-hyph-dir=${LOCALBASE}/share/hyphen \
 			--with-jdk-home=${JAVA_HOME}			\
 			--with-system-jpeg				\
 			--with-junit=${JAVALIBDIR}/junit.jar		\
 			--with-system-libtextcat			\
 			--disable-kde					\
 			--disable-kde4					\
 			--with-system-libxml				\
 			--with-system-libxslt				\
 			--with-system-lucene				\
 			--with-lucene-core-jar=${JAVALIBDIR}/lucene-core-3.6.2.jar \
 			--with-lucene-analyzers-jar=${JAVALIBDIR}/lucene-analyzers-3.6.2.jar \
 			--with-system-mythes				\
 			--with-external-thes-dir=${LOCALBASE}/share/mythes \
 			--with-system-nss				\
 			--enable-opengl					\
 			--with-system-openssl				\
 			--with-package-format="archive"			\
 			--with-system-python				\
 			--with-system-redland				\
 			--with-system-sane				\
 			--with-system-serf				\
 			--with-system-stdlibs				\
 			--with-vendor="FreeBSD ports system"		\
 			--with-build-version="PKGNAME: ${PKGNAME:S/,/@/g}" \
 			--enable-verbose				\
 			--with-system-xrender				\
 			--with-system-zlib
 
 CREATE_TREE=	${WRKSRC}/sysui/desktop/share/create_tree.sh
 
 .include <${FILESDIR}/Makefile.knobs>
 
 pre-everything::
 # really tweak, extremely useful when you build all localized language versions
 # needed after when you build with ALL_LOCALIZED_LANGS.
 .if defined(TWEAK_L10N)
 	${RM} ${WRKDIR}/.PLIST*
 	${RM} ${WRKDIR}/.install_done.*
 	${RM} ${WRKDIR}/.package_done.*
 	${RM} ${WRKDIR}/.extract_done.*
 	${RM} ${WRKDIR}/.patch_done.*
 	${RM} ${WRKDIR}/.configure_done.*
 	${RM} ${WRKDIR}/.build_done.*
 	${MKDIR} ${WRKDIR}
 	${TOUCH} ${EXTRACT_COOKIE}
 	${TOUCH} ${PATCH_COOKIE}
 	${TOUCH} ${CONFIGURE_COOKIE}
 	${TOUCH} ${BUILD_COOKIE}
 .endif
 
 do-extract-SDK-on:
 	${CP} ${DISTDIR}/${DIST_SUBDIR}/unowinreg.dll ${WRKSRC}/external/unowinreg/
 
 post-extract:
 	${TAR} -C ${WRKSUBDIR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${EXTSRC}
 .if ${CHOSEN_COMPILER_TYPE} == gcc
 .  for f in ${GCC_EXTRA_DISTFILES}
 	${CP} ${DISTDIR}/${DIST_SUBDIR}/${f} ${WRKSUBDIR}/ext_sources/${f}
 .  endfor
 .endif
 	${CP} ${FILESDIR}/freebsd-aoo-intro-developer.png \
 		${WRKSRC}/default_images/introabout/intro.png
 	${CP} ${FILESDIR}/freebsd-aoo-about-developer.png \
 		${WRKSRC}/default_images/introabout/about.png
 	${RM} -r ${WRKSRC}/l10n
 	${LN} -sf ${UNZIP_CMD} ${WRKSRC}/solenv/bin/unzip
 	${SED}  -e '\|^For main/vcl/unx/generic/fontmanager/parseAFM|,/^__/p' \
 		-e '\|^For PostScript(R) AFM|,/^__/p'			\
 		-e d  ${WRKSRC}/LICENSE > ${LICENSE_FILE_ADOBE}
 	${SED}  -e '\|^For main/unixODBC|,/^__/p'			\
 		-e '\|^For main/connectivity|,/^__/p'			\
 		-e '\|^For main/libtextcat/data|,/^__/p'		\
 		-e '\|^For integration of HSQLDB|,/^__/p'		\
 		-e '\|^For C preprocessor|,/^__/p'			\
 		-e d  ${WRKSRC}/LICENSE > ${LICENSE_FILE_BSD3CLAUSE}
 	${SED}  -e '\|^For ICC |,/^__/p'				\
 		-e d  ${WRKSRC}/LICENSE > ${LICENSE_FILE_BSD4CLAUSE}
 	${SED}  -e '\|^For integration of the C++ Boost |,/^__/p'	\
 		-e d  ${WRKSRC}/LICENSE > ${LICENSE_FILE_BSL}
 	${SED}  -e '\|^For main/i18npool/source/breakiterator|,/^__/p'	\
 		-e d  ${WRKSRC}/LICENSE > ${LICENSE_FILE_ICU}
 	${SED}  -e '\|^For Multi-Dimensional Data|,/^__/p'		\
 		-e '\|^For XSLT MathML Library|,/^__/p'			\
 		-e d  ${WRKSRC}/LICENSE > ${LICENSE_FILE_MIT}
 	${SED}  -e '\|^For XMLSec Library|,/^__/p'			\
 		-e d  ${WRKSRC}/LICENSE_category_b >> ${LICENSE_FILE_MIT}
 	${SED}  -e '\|^For Saxon|,/^__/p'				\
 		-e d ${WRKSRC}/LICENSE_category_b > ${LICENSE_FILE_MPL10}
 	${SED}  -e '\|^For Saxon|,$$d'					\
 		      ${WRKSRC}/LICENSE_category_b > ${LICENSE_FILE_MPL11}
 	${SED}  -e '\|^For main/filter/source/config/tools/merge/pyAltFCFGMerge|,/^__/p'	\
 		-e d  ${WRKSRC}/LICENSE > ${LICENSE_FILE_PSFL}
 	${SED}  -e '\|^For main/twain|,/^__/p'				\
 		-e d  ${WRKSRC}/LICENSE > ${LICENSE_FILE_TWAIN}
 	${SED}  -e '\|^For main/MathMLDTD|,/^__/p'			\
 		-e d  ${WRKSRC}/LICENSE > ${LICENSE_FILE_W3C}
 
 post-patch:
 	${REINPLACE_CMD} -e "/^ICONVERSION/s/=.*/= '${AOOVERSION1}'/" \
 		${WRKSRC}/sysui/desktop/productversion.mk
 	${REINPLACE_CMD} -e "s|%%JAVA_HOME%%|${JAVA_HOME}|" \
 		${WRKSRC}/desktop/scripts/soffice.sh
 	${REINPLACE_CMD} -e '/^mkdir -p/,$$d' ${CREATE_TREE}
 
 do-build:
 	${PRINTF} "[repositories]\nmain=active\nextras=active\n" > ${WRKSUBDIR}/source_config
 	cd ${WRKSRC} ; ./bootstrap
 	#
 	# numproc controls the number of parallel makes.
 	#
 	# dmproc is passed to dmake and controls parallelization at that
 	# level.
 	#
 	# dmproc > numproc seems to give shorter build times than
 	# numproc > dmproc.
 	#
 	# Select values for numproc and dmproc such that:
 	#  * numproc*dmproc >= MAKE_JOBS_NUMBER
 	#  * minimize numproc*dmproc-MAKE_JOBS_NUMBER
 	#  * dmproc >= numproc
 	#  * dmproc <= 2*numproc if MAKE_JOBS_NUMBER <= 3
 	#
 	if [ ${MAKE_JOBS_NUMBER} -le 3 ] ; then				  \
 	 numproc=1 ; dmproc=${MAKE_JOBS_NUMBER} ;			  \
 	else								  \
 	 a=1 ;								  \
 	 while [ $$(( 2 * $${a} * $${a} )) -lt ${MAKE_JOBS_NUMBER} ]; do  \
 	  a=$$(( $${a} + 1 )) ;						  \
 	 done ;								  \
 	 b=$$(( $${a} + 1 )) ;						  \
 	 ad=$$(( ( ${MAKE_JOBS_NUMBER} + $${a} - 1 ) / $${a} )) ;	  \
 	 ap=$$(( $${a} * $${ad} )) ;					  \
 	 bd=$$(( ( ${MAKE_JOBS_NUMBER} + $${b} - 1 ) / $${b} )) ;	  \
 	 bp=$$(( $${b} * $${bd} )) ;					  \
 	 if [ $${ap} -le $${bp} ]; then					  \
 	  numproc=$${a} ; dmproc=$${ad} ;				  \
 	 else								  \
 	  numproc=$${b} ; dmproc=$${bd} ;				  \
 	 fi ;								  \
 	fi ;								  \
 	cd ${WRKSRC}/instsetoo_native ;					  \
 	export ${AOO_MAKE_ENV} ;					  \
 	. ../${FREEBSD_ENV_SET} ;					  \
 	build.pl --all -P$${numproc} -- -P$${dmproc}
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PRINSTALLATION_BASEDIR} \
 		${STAGEDIR}${PREFIX}/share/mime/packages
 	@cd ${WRKSRC} ; \
 		. ${FREEBSD_ENV_SET} ; \
 		cd instsetoo_native/$${INPATH}/Apache_OpenOffice/archive/install/${LOCALIZED_LANG}/ ; \
 		for i in *.tar.?z ; do \
 			${ECHO_CMD} "extracting $$i" ; \
 			${TAR} -s '|./[^/]*/||' -xz -f $$i \
 				-C ${STAGEDIR}${PRINSTALLATION_BASEDIR} ; \
 		done
 	${FIND} ${STAGEDIR}${PRINSTALLATION_BASEDIR} -type d -exec ${CHMOD} 755 {} \;
 	${REINPLACE_CMD} \
 		-e '/^UserInstallation/s/=.*/=$$SYSUSERCONFIG\/${AOOUDIR}/' \
 		${STAGEDIR}${OOPATH}/program/bootstraprc
 	@${RM} ${STAGEDIR}${OOPATH}/program/bootstraprc.bak
 	@${ECHO_CMD} "adding wrapper scripts";
 	@${CP} ${FILESDIR}/openoffice-wrapper ${WRKDIR}/
 	@${REINPLACE_CMD} -e 's#%%OOPATH%%#${OOPATH}#g' \
 			-e 's#%%EXECBASE%%#${EXECBASE}#g' \
 			${WRKDIR}/openoffice-wrapper
 	${INSTALL_SCRIPT} ${WRKDIR}/openoffice-wrapper \
 		${STAGEDIR}${PREFIX}/bin/${EXECBASE}
 	@cd ${STAGEDIR}${PREFIX}/bin; for i in printeradmin sbase scalc sdraw \
 		simpress smath spadmin swriter ; do \
 			${LN} -f ${EXECBASE} ${EXECBASE}-$${i} ; \
 	done
 	@${ECHO_CMD} "adding desktop support"
 	@cd ${WRKSRC} ;						\
 	    . ${FREEBSD_ENV_SET} ;				\
 	    cd sysui/$${INPATH}/misc/openoffice ;		\
 	    DESTDIR=${STAGEDIR}					\
 		GNOMEDIR=${PREFIX}				\
 		ICON_PREFIX=openoffice${AOOVERSION1}		\
 		ICON_SOURCE_DIR=${WRKSRC}/sysui/desktop/icons	\
 		ICON_THEMES="hicolor/??x??"			\
 		KDEMAINDIR=${PREFIX}				\
 		PREFIX=openoffice${AOOVERSION1}			\
 		${SH} ${CREATE_TREE} ;				\
 	    ${INSTALL_DATA} apacheopenoffice.xml		\
 		${STAGEDIR}/${PREFIX}/share/mime/packages
 	@cd ${STAGEDIR}${DESKTOPDIR}; for i in base calc draw impress \
 		javafilter math printeradmin qstart startcenter writer ; do \
 			${LN} -sf ${XDGREL}/$${i}.desktop ${EXECBASE}-$${i}.desktop ; \
 	done
 
 do-install-SDK-on:
 	${TAR} -s '|./[^/]*/||' -xz -C ${STAGEDIR}${PRINSTALLATION_BASEDIR} \
 		-f ${WRKSRC}/instsetoo_native/unxfbsd*.pro/Apache_OpenOffice_SDK/archive/install/${LOCALIZED_LANG}/*.tar.gz
 	@f=${STAGEDIR}${OOPATH}/sdk/bin/unoapploader ; \
 		${CHMOD} 644 $${f} ; ${STRIP_CMD} $${f} ; ${CHMOD} 444 $${f}
 
 post-install:
 	@${ECHO_CMD} "generating plist";
 	@cd ${STAGEDIR}${PREFIX} ; (\
 		${FIND} -s bin -name "${EXECBASE}*" ; \
 		${FIND} -s ${INSTALLATION_BASEDIR} share/applications \
 			share/application-registry share/icons \
 			share/mime-info share/mime share/mimelnk \! -type d ; \
 		${FIND} ${INSTALLATION_BASEDIR} -type d -empty | ${SORT} -r | \
 			${SED} -e 's/^/@dir /' ; \
 	) >> ${TMPPLIST}
 
 .include <${FILESDIR}/Makefile.others>
 
 .include <bsd.port.post.mk>
Index: head/irc/irssi/Makefile
===================================================================
--- head/irc/irssi/Makefile	(revision 527672)
+++ head/irc/irssi/Makefile	(revision 527673)
@@ -1,72 +1,70 @@
 # $FreeBSD$
 
 PORTNAME=	irssi
 PORTVERSION=	1.2.2
 PORTEPOCH=	1
 CATEGORIES?=	irc
 MASTER_SITES=	https://github.com/irssi/irssi/releases/download/${PORTVERSION}/
 
 MAINTAINER=	dor.bsd@xm0.uk
 COMMENT=	Modular IRC client with many features
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		autoreconf cpe gettext-runtime gmake gnome libtool ncurses \
 		pkgconfig tar:xz
 USE_GNOME=	glib20
 
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 
-OPTIONS_DEFINE=	BOT CAPSICUM DEBUG DOCS OTR PERL PROXY SOCKS TRUECOLOR UTF8PROC
+OPTIONS_DEFINE=	BOT CAPSICUM DOCS OTR PERL PROXY SOCKS TRUECOLOR UTF8PROC
 OPTIONS_DEFAULT=	BOT CAPSICUM PERL PROXY SOCKS TRUECOLOR
 
 OPTIONS_SUB=	yes
 BOT_DESC=	Bot support
 BOT_CONFIGURE_WITH=	bot
 CAPSICUM_DESC=	Capsicum support
 CAPSICUM_CONFIGURE_WITH=	capsicum
-DEBUG_DESC=	Build with debug symbols
-DEBUG_VARS=	WITH_DEBUG=yes
 OTR_DESC=	OTR (off-the-record) support
 OTR_CONFIGURE_ON=	--with-otr \
 			--with-libotr-inc-prefix=${PREFIX}/include
 OTR_CONFIGURE_OFF=	--with-otr=no
 OTR_CONFIGURE_WITH=	otr
 OTR_LIB_DEPENDS=	libgcrypt.so:security/libgcrypt \
 			libgpg-error.so:security/libgpg-error \
 			libotr.so:security/libotr
 PERL_USES=	perl5
 PERL_CONFIGURE_ON=	--with-perl-lib=site
 PERL_CONFIGURE_OFF=	--with-perl=no
 PROXY_CONFIGURE_WITH=	proxy
 SOCKS_DESC=	Socks proxy support
 SOCKS_CONFIGURE_WITH=	socks
 TRUECOLOR_DESC=	Truecolor (24bit) support
 TRUECOLOR_CONFIGURE_ENABLE=	true-color
 UTF8PROC_DESC=	utf8proc support
 UTF8PROC_LIB_DEPENDS=	libutf8proc.so:textproc/utf8proc
 
 .if defined(WITHOUT_SSL)
 CONFIGURE_ARGS+=	--disable-ssl
 .else
 USES+=		ssl
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr|${PREFIX}|' -e 's|/etc|${PREFIX}&|' \
 		${WRKSRC}/docs/irssi.1
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/irssi/modules
 	@${MV} ${STAGEDIR}${PREFIX}/etc/irssi.conf \
 		${STAGEDIR}${PREFIX}/etc/irssi.conf.sample
 
 post-install-PERL-on:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Irssi/Irssi.so
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Irssi/Irc/Irc.so
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Irssi/TextUI/TextUI.so
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Irssi/UI/UI.so
 
 .include <bsd.port.mk>
Index: head/mail/rspamd-devel/Makefile
===================================================================
--- head/mail/rspamd-devel/Makefile	(revision 527672)
+++ head/mail/rspamd-devel/Makefile	(revision 527673)
@@ -1,99 +1,98 @@
 # $FreeBSD$
 
 PORTNAME=	rspamd
 PORTVERSION=	2.4.a1.20200213
 CATEGORIES=	mail
 PKGNAMESUFFIX=	-devel
 
 MAINTAINER=	vsevolod@FreeBSD.org
 COMMENT=	Fast spam filtering system dev version
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 LIB_DEPENDS=	libpcre.so:devel/pcre \
 		libicui18n.so:devel/icu \
 		libsodium.so:security/libsodium
 BUILD_DEPENDS=	ragel:devel/ragel
 RUN_DEPENDS=	ca_root_nss>=3.*:security/ca_root_nss
 
 USES=		cmake compiler:c11 gnome perl5 pkgconfig \
 		sqlite ssl
 USE_LDCONFIG=	yes
 USE_PERL5=	build run
 USE_GNOME=	glib20
 
 CONFLICTS_INSTALL=	rspamd
 
 USERS=		rspamd
 GROUPS=		rspamd
 
 OPTIONS_DEFINE=			BLAS CGP GPERF LUAJIT
 OPTIONS_DEFINE_amd64=		HYPERSCAN
 OPTIONS_DEFAULT_amd64=		LUAJIT
 OPTIONS_DEFAULT_armv7=		LUAJIT
 OPTIONS_DEFAULT_i386=		LUAJIT
 OPTIONS_DEFAULT_powerpc=	LUAJIT
 OPTIONS_SUB=	yes
 
 BLAS_DESC=	Use OpenBLAS to accelerate KANN
 CGP_DESC=	Install Communigate Pro(tm) helper
 GPERF_DESC=	Google perf-tools profiling
 HYPERSCAN_DESC=	Use hyperscan optimizations (amd64 only)
 LUAJIT_DESC=	Use LuaJIT instead of standard Lua
 
 SUB_FILES=	pkg-message rspamd.newsyslog.conf.sample
 PLIST_SUB+=	ETCDIR=etc/rspamd \
 		RSPAMDVERSION=${PORTVERSION:C/^([^.]+\.[^.]+).*/\1/}
 CMAKE_ARGS+=	-DCONFDIR=${PREFIX}/etc/rspamd \
 		-DLOGDIR=/var/log/rspamd \
 		-DDBDIR=/var/db/rspamd \
 		-DRUNDIR=/var/run/rspamd \
 		-DMANDIR=${MANPREFIX}/man \
 		-DCMAKE_INSTALL_PREFIX=${PREFIX} \
 		-DBUILD_PORT=yes \
 		-DLIBDIR=${PREFIX}/lib/rspamd \
 		-DDEBUG=ON \
 		-DGIT_ID=${GH_TAGNAME}
 USE_GITHUB=	yes
 GH_TAGNAME=	2939a82
 
 DEBUG_FLAGS=	-g -O0
-WITH_DEBUG=	yes
 
 USE_RC_SUBR=	rspamd
 
 BLAS_CMAKE_ON=	-DENABLE_BLAS=ON
 BLAS_USES=	blaslapack:openblas
 
 GPERF_CMAKE_ON=	-DENABLE_GPERF_TOOLS=ON
 GPERF_LIB_DEPENDS=	libprofiler.so:devel/google-perftools
 
 HYPERSCAN_CMAKE_ON=	-DENABLE_HYPERSCAN=ON
 HYPERSCAN_LIB_DEPENDS=	libhs.so:devel/hyperscan
 
 LUAJIT_LIB_DEPENDS=	libluajit-5.1.so:lang/luajit
 LUAJIT_USES_OFF=	lua:51
 
 CGP_RUN_DEPENDS+=	\
 	p5-AnyEvent-HTTP>=0:www/p5-AnyEvent-HTTP \
 	p5-AnyEvent>=0:devel/p5-AnyEvent \
 	p5-EV>=0:devel/p5-EV \
 	p5-JSON-XS>=0:converters/p5-JSON-XS
 
 post-install:
 	@${MKDIR} \
 		${STAGEDIR}/var/log/rspamd \
 		${STAGEDIR}/var/db/rspamd \
 		${STAGEDIR}/var/run/rspamd
 	${RM} ${STAGEDIR}/${ETCDIR}/rspamd.conf.sample
 	# Linux specific
 	${RM} ${STAGEDIR}/${ETCDIR}/rspamd.systemd.conf
 	${RM} ${STAGEDIR}/${ETCDIR}/rspamd.sysvinit.conf
 	${INSTALL_DATA} ${WRKDIR}/rspamd.newsyslog.conf.sample ${STAGEDIR}${ETCDIR}
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d
 	${LN} -s ${ETCDIR}/rspamd.newsyslog.conf ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d
 post-install-CGP-on:
 	${INSTALL_SCRIPT} ${WRKSRC}/utils/cgp_rspamd.pl ${STAGEDIR}${PREFIX}/bin/rspamd-cgp-helper
 
 .include <bsd.port.mk>
Index: head/math/wxmaxima/Makefile
===================================================================
--- head/math/wxmaxima/Makefile	(revision 527672)
+++ head/math/wxmaxima/Makefile	(revision 527673)
@@ -1,36 +1,34 @@
 # Created by: Nicola Vitale <nivit@email.it>
 # $FreeBSD$
 
 PORTNAME=	wxmaxima
 PORTVERSION=	20.02.4
 DISTVERSIONPREFIX=	Version-
 CATEGORIES=	math
 
 MAINTAINER=	salvadore@FreeBSD.org
 COMMENT=	WxWidgets GUI for the computer algebra system maxima
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	maxima:math/maxima
 
 USES=		cmake desktop-file-utils shared-mime-info
 USE_WX=		3.0
 USE_GITHUB=	yes
 GH_ACCOUNT=	wxMaxima-Developers
 
 PLIST_SUB=	DESKTOPDIR=${DESKTOPDIR:S,${PREFIX}/,,}
 WX_COMPS=	wx
 WX_CONF_ARGS=	absolute
 
 PORTDATA=	COPYING README README.md
 
-OPTIONS_DEFINE=	DEBUG NLS
+OPTIONS_DEFINE=	NLS
 OPTIONS_SUB=	yes
-
-DEBUG_VARS=	WITH_DEBUG=yes
 
 NLS_EXTRA_PATCHES_OFF=	${PATCHDIR}/extra-patch-CMakeLists.txt
 NLS_USES=	gettext
 
 .include <bsd.port.mk>
Index: head/multimedia/mplayer/Makefile
===================================================================
--- head/multimedia/mplayer/Makefile	(revision 527672)
+++ head/multimedia/mplayer/Makefile	(revision 527673)
@@ -1,100 +1,100 @@
 # Created by: Thomas E. Zander with help from Vladimir Kushnir
 # $FreeBSD$
 
 PORTNAME=	mplayer
 PORTVERSION=	${MPLAYER_PORT_VERSION}.${MPLAYER_SNAPSHOT_DATE:S/-//g}
 CATEGORIES=	multimedia audio
 
 MAINTAINER=	riggs@FreeBSD.org
 COMMENT=	High performance media player supporting many formats
 
 .include "${.CURDIR}/../../multimedia/mplayer/Makefile.common"
 
-OPTIONS_DEFINE=	AALIB AMR_NB AMR_WB ASS BLURAY CACA CDIO DEBUG DV DVDNAV \
+OPTIONS_DEFINE=	AALIB AMR_NB AMR_WB ASS BLURAY CACA CDIO DV DVDNAV \
 		ENCA FONTCONFIG FRIBIDI GIF GNUTLS GSM GUI IPV6 JACK \
 		LADSPA LIBMNG LIRC LZO NAS OPENAL OPENGL \
 		OPENJPEG OPUS PULSEAUDIO RTMP \
 		SDL SKINS SNDIO SMB SPEEX SVGALIB V4L VDPAU VPX \
 		X11 X11DGA X11VM XINERAMA XVIDEO XVMC
 
 OPTIONS_DEFAULT=ASS DVDNAV FONTCONFIG FRIBIDI GNUTLS OPENGL \
 		SKINS X11 X11DGA X11VM XINERAMA XVIDEO
 
 OPTIONS_DEFINE_i386=	RTCPU
 OPTIONS_DEFINE_amd64=	RTCPU
 OPTIONS_DEFINE_powerpc=	RTCPU
 
 OPTIONS_DEFAULT_i386=	RTCPU VDPAU
 OPTIONS_DEFAULT_amd64=	RTCPU VDPAU
 OPTIONS_DEFAULT_powerpc=RTCPU
 
 ASS_DESC?=	Subtitles rendering via libass
 BLURAY_DESC?=	BluRay support
 DVDNAV_DESC?=	DVD navigation features support
 ENCA_DESC?=	Charset conversion via enca
 LZO_DESC?=	External liblzo support
 RTCPU_DESC?=	Use runtime CPU detection
 SKINS_DESC?=	Install skins for GUI
 X11DGA_DESC?=	X11 DGA video driver support
 X11VM_DESC?=	X11 VidMode support
 
 SUB_FILES=	pkg-message
 
 CONFLICTS=	mplayer2-2.*
 
 CONFFILES=	example.conf input.conf menu.conf dvb-menu.conf
 USES+=		iconv pkgconfig
 
 OPTIONS_SUB=	yes
 
 .include "${.CURDIR}/../../multimedia/mplayer/Makefile.optvars"
 .include <bsd.port.pre.mk>
 
 CONFIGURE_ARGS+=	--disable-arts \
 			--disable-directfb \
 			--disable-faac \
 			--disable-libdca \
 			--disable-toolame \
 			--disable-twolame \
 			--disable-x264 \
 			--disable-xvid \
 			--disable-mencoder \
 			--disable-mpg123 \
 			--disable-musepack \
 			--disable-theora
 
 .include "${.CURDIR}/../../multimedia/mplayer/Makefile.options"
 
 pre-everything::
 	@${ECHO_MSG} "N - O - T - E"
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "There are some knobs which *can* *not* be selected via the"
 	@${ECHO_MSG} "OPTIONS framework. At the moment, these settings are:"
 	@${ECHO_MSG} "WITH_KERN_HZ=${DEFAULT_KERN_HZ}"
 	@${ECHO_MSG} "DEFAULT_DVD_DEVICE=${DEFAULT_DVD_DEVICE}"
 	@${ECHO_MSG} "DEFAULT_CDROM_DEVICE=${DEFAULT_CDROM_DEVICE}"
 
 .if ${PORT_OPTIONS:MGUI} && ${PORT_OPTIONS:MX11}
 	@${ECHO_MSG} "If you want to use the GUI, you can use the skins from"
 	@${ECHO_MSG} "${PORTSDIR}/multimedia/mplayer-skins"
 	@${ECHO_MSG} "or download them from"
 	@${ECHO_MSG} "http://www.mplayerhq.hu/"
 .endif
 
 post-patch: common-post-patch
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	@${CHMOD} 755 ${STAGEDIR}${DATADIR}
 	@${MKDIR} ${STAGEDIR}${DATADIR}/examples/etc
 	@${CHMOD} 755 ${STAGEDIR}${DATADIR}/examples/etc
 .for conf in ${CONFFILES}
 	${INSTALL_DATA} ${WRKSRC}/etc/${conf} ${STAGEDIR}${DATADIR}/examples/etc
 .endfor
 .if ${PORT_OPTIONS:MGUI} && ${PORT_OPTIONS:MX11}
 	@${LN} -sf mplayer ${STAGEDIR}${PREFIX}/bin/gmplayer
 	@(cd ${STAGEDIR}${MAN1PREFIX}/man/man1 && ${LN} -sf mplayer.1.gz gmplayer.1.gz)
 	${CP} -f ${WRKSRC}/etc/mplayer256x256.png ${STAGEDIR}${PREFIX}/share/pixmaps/mplayer.png
 .endif
 
 .include <bsd.port.post.mk>
Index: head/multimedia/mplayer/Makefile.options
===================================================================
--- head/multimedia/mplayer/Makefile.options	(revision 527672)
+++ head/multimedia/mplayer/Makefile.options	(revision 527673)
@@ -1,72 +1,71 @@
 # $FreeBSD$
 #
 # Non-helper handling of option variables and build environment.
 # Include after bsd.port.pre.mk
 #
 # Almost all of mplayer's build-time configuration is controlled via the
 # OPTIONS framework. Exceptions are listed below. These variables must be
 # set via make.conf or by passing the variable to make during build, e.g.
 # make WITH_DVD_DEVICE=/dev/cd0
 #
 # WITH_DVD_DEVICE=/path/to/desired/device
 # default: /dev/cd0
 # This option changes the default device where mplayer looks by default
 # for a DVD medium
 #
 # WITH_CDROM_DEVICE=/path/to/desired/device
 # default: /dev/cd0
 # This option changes the default cdrom device, maybe useful for VCDs
 
 # Non-OPTIONS knob handling
 # =========================
 
 .if defined(WITH_DVD_DEVICE)
 DEFAULT_DVD_DEVICE=${WITH_DVD_DEVICE}
 .else
 DEFAULT_DVD_DEVICE=/dev/cd0
 .endif
 
 .if defined(WITH_CDROM_DEVICE)
 DEFAULT_CDROM_DEVICE=${WITH_CDROM_DEVICE}
 .else
 DEFAULT_CDROM_DEVICE=/dev/cd0
 .endif
 
 .if defined(WITH_KERN_HZ)
 DEFAULT_KERN_HZ=${WITH_KERN_HZ}
 .else
 DEFAULT_KERN_HZ=1024
 .endif
 
 # Build system handling (including OPTIONS)
 # =========================================
 
 .if ${CHOSEN_COMPILER_TYPE} == clang
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-clang-version
 # Require 16 byte stack realignment on i386 to interface
 # properly with hand crafted assembler code in ffmpeg
 CFLAGS_i386+=	-mstack-alignment=16 -mstackrealign
 .endif # ${CHOSEN_COMPILER_TYPE} == clang
 
 CFLAGS_armv6+=	-no-integrated-as
 CFLAGS_armv7+=	-no-integrated-as
 
 LDFLAGS_i386+=	-Wl,-z,notext
 
 # Extra build options for debugging
 # =================================
 
-.if ${PORT_OPTIONS:MDEBUG}
-WITH_DEBUG=	yes
+.if defined(WITH_DEBUG)
 CONFIGURE_ARGS+=	--enable-debug=3
 .endif
 
 # Win32 DLL codecs support on i386, mostly superseded by ffmpeg
 # =============================================================
 
 .if ${ARCH} == "i386"
 CONFIGURE_ARGS+=	--codecsdir=${LOCALBASE}/lib/win32
 .else
 CONFIGURE_ARGS+=	--disable-win32dll \
 			--disable-qtx
 .endif
Index: head/net/libzmq4/Makefile
===================================================================
--- head/net/libzmq4/Makefile	(revision 527672)
+++ head/net/libzmq4/Makefile	(revision 527673)
@@ -1,76 +1,78 @@
 # $FreeBSD$
 
 PORTNAME=	libzmq4
 DISTVERSIONPREFIX=	v
 DISTVERSION=	4.3.1
 PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	https://github.com/zeromq/libzmq/releases/download/${DISTVERSIONFULL}/
 DISTNAME=	zeromq-${DISTVERSION}
 
 MAINTAINER=	koobs@FreeBSD.org
 COMMENT=	ZeroMQ core library (Version 4)
 
 LICENSE=	LGPL3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		gmake libtool pkgconfig
 USE_LDCONFIG=	yes
 
 CONFLICTS=	zmq-[0-9]* libzmq[^4]-[0-9]*
 
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 TEST_TARGET=	check
 
-OPTIONS_DEFINE=			DEBUG LIBUNWIND MANPAGES
+OPTIONS_DEFINE=			LIBUNWIND MANPAGES
 OPTIONS_RADIO=			CURVE
 OPTIONS_RADIO_CURVE=		SODIUM TWEETNACL
 OPTIONS_GROUP=			MULTICAST
 OPTIONS_GROUP_MULTICAST=	NORM PGM
 OPTIONS_DEFAULT=		MANPAGES NORM PGM TWEETNACL
 OPTIONS_SUB=		yes
 
 LIBUNWIND_DESC=	Use libunwind to print stack trace in case of error
 CURVE_DESC=	CURVE security backend
 MULTICAST_DESC=	Reliable Multicast Transports
 TWEETNACL_DESC=	Use tweetnacl
 SODIUM_DESC=	Use libsodium
 PGM_DESC=	Enable PGM transport via OpenPGM
 NORM_DESC=	Enable NORM via NRL
 
-DEBUG_CONFIGURE_ENABLE=	debug
-DEBUG_VARS=		WITH_DEBUG=yes
-
 PGM_CONFIGURE_WITH=	pgm
 PGM_LIB_DEPENDS=	libpgm.so:net/openpgm
 
 LIBUNWIND_LIB_DEPENDS=	libunwind.so:devel/libunwind
 LIBUNWIND_CONFIGURE_ENABLE=	libunwind
 
 MANPAGES_BUILD_DEPENDS=		xmlto:textproc/xmlto \
 				asciidoc:textproc/asciidoc
 MANPAGES_CONFIGURE_WITH=	docs
 
 NORM_CONFIGURE_WITH=	norm=${PREFIX}
 NORM_LIB_DEPENDS=	libnorm.so:net/norm
 
 SODIUM_CONFIGURE_WITH=	libsodium
 SODIUM_LIB_DEPENDS=	libsodium.so:security/libsodium
 SODIUM_PLIST_FILES=	bin/curve_keygen
 
 TWEETNACL_PLIST_FILES=	bin/curve_keygen
 
 CONFIGURE_ARGS+=	--with-pkgconfigdir=${PREFIX}/libdata/pkgconfig \
 			--disable-static \
 			--disable-Werror \
 			--disable-silent-rules
 CFLAGS+=		-Wno-long-long
 
 .include <bsd.port.options.mk>
+
+.if defined(WITH_DEBUG)
+CONFIGURE_ARGS+=	--enable-debug
+.endif
+
 
 .if !${PORT_OPTIONS:MSODIUM} && !${PORT_OPTIONS:MTWEETNACL}
 CONFIGURE_ARGS+=	--disable-curve
 .endif
 
 .include <bsd.port.mk>
Index: head/net/samba410/Makefile
===================================================================
--- head/net/samba410/Makefile	(revision 527672)
+++ head/net/samba410/Makefile	(revision 527673)
@@ -1,661 +1,660 @@
 # Created by: timur@FreeBSD.org
 # $FreeBSD$
 
 PORTNAME=			${SAMBA4_BASENAME}410
 PORTVERSION=			${SAMBA4_VERSION}
 PORTREVISION=			0
 CATEGORIES?=			net
 MASTER_SITES=			SAMBA/samba/stable SAMBA/samba/rc
 DISTNAME=			${SAMBA4_DISTNAME}
 
 MAINTAINER=			timur@FreeBSD.org
 COMMENT=			Free SMB/CIFS and AD/DC server and client for Unix
 
 LICENSE=			GPLv3+
 LICENSE_FILE=			${WRKSRC}/COPYING
 
 IGNORE_NONTHREAD_PYTHON=	needs port lang/python${PYTHON_SUFFIX} to be build with THREADS support
 CONFLICTS_INSTALL?=		samba4-4.0.* samba4[1-9]-4.* p5-Parse-Pidl-4.*
 
 USES=				cpe
 
 EXTRA_PATCHES+=			${PATCHDIR}/0001-Zfs-provision-1.patch:-p1
 EXTRA_PATCHES+=			${PATCHDIR}/0001-provision-use-ASCII-quotes.patch:-p1
 
 SAMBA4_BASENAME=		samba
 SAMBA4_PORTNAME=		${SAMBA4_BASENAME}4
 SAMBA4_VERSION=			4.10.13
 SAMBA4_DISTNAME=		${SAMBA4_BASENAME}-${SAMBA4_VERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|}
 
 WRKSRC?=			${WRKDIR}/${DISTNAME}
 
 .if !defined(SAMBA4_SUBPORT)
 CPE_VENDOR=			samba
 CPE_PRODUCT=			samba
 # Directories
 VARDIR=				${DESTDIR}/var
 SAMBA4_RUNDIR=			${VARDIR}/run/${SAMBA4_PORTNAME}
 SAMBA4_LOGDIR=			${VARDIR}/log/${SAMBA4_PORTNAME}
 SAMBA4_LOCKDIR=			${VARDIR}/db/${SAMBA4_PORTNAME}
 SAMBA4_BINDDNSDIR=		${SAMBA4_LOCKDIR}/bind-dns
 SAMBA4_PRIVATEDIR=		${SAMBA4_LOCKDIR}/private
 SAMBA4_PAMDIR=			${PREFIX}/lib
 SAMBA4_LIBDIR=			${PREFIX}/lib/${SAMBA4_PORTNAME}
 SAMBA4_INCLUDEDIR=		${PREFIX}/include/${SAMBA4_PORTNAME}
 SAMBA4_CONFDIR=			${PREFIX}/etc
 SAMBA4_CONFIG=			smb4.conf
 
 CONFIGURE_ARGS+=		--mandir="${MANPREFIX}/man" \
 				--sysconfdir="${SAMBA4_CONFDIR}" \
 				--includedir="${SAMBA4_INCLUDEDIR}" \
 				--datadir="${DATADIR}" \
 				--libdir="${SAMBA4_LIBDIR}" \
 				--with-privatelibdir="${SAMBA4_LIBDIR}/private" \
 				--with-pammodulesdir="${SAMBA4_PAMDIR}" \
 				--with-modulesdir="${SAMBA4_MODULEDIR}" \
 				--with-pkgconfigdir="${PKGCONFIGDIR}" \
 				--localstatedir="${VARDIR}" \
 				--with-piddir="${SAMBA4_RUNDIR}" \
 				--with-sockets-dir="${SAMBA4_RUNDIR}" \
 				--with-privileged-socket-dir="${SAMBA4_RUNDIR}" \
 				--with-lockdir="${SAMBA4_LOCKDIR}" \
 				--with-statedir="${SAMBA4_LOCKDIR}" \
 				--with-cachedir="${SAMBA4_LOCKDIR}" \
 				--with-bind-dns-dir=${SAMBA4_BINDDNSDIR} \
 				--with-privatedir="${SAMBA4_PRIVATEDIR}" \
 				--with-logfilebase="${SAMBA4_LOGDIR}"
 # XXX: Flags
 CONFIGURE_ENV+=			PTHREAD_LDFLAGS="-lpthread"
 
 USES+=				compiler:c++11-lang iconv localbase:ldflags \
 				perl5 pkgconfig shebangfix ssl waf gettext-runtime
 USE_PERL5=			build
 USE_LDCONFIG=			${SAMBA4_LIBDIR}
 WAF_CMD=			buildtools/bin/waf
 CONFIGURE_LOG=			bin/config.log
 
 PKGCONFIGDIR?=			${PREFIX}/libdata/pkgconfig
 PKGCONFIGDIR_REL?=		${PKGCONFIGDIR:S,^${PREFIX}/,,}
 PLIST_SUB+=			PKGCONFIGDIR=${PKGCONFIGDIR_REL}
 SUB_LIST+=			PKGCONFIGDIR=${PKGCONFIGDIR_REL}
 ##############################################################################
 OPTIONS_SUB=			yes
 
 OPTIONS_DEFINE=			AD_DC ADS CLUSTER CUPS DEBUG DOCS FAM GPGME \
 				LDAP NTVFS PROFILE QUOTAS SPOTLIGHT SYSLOG UTMP
 # This shouldn't be default in the release
 OPTIONS_DEFINE+=		DEVELOPER MANDOC
 #OPTIONS_DEFINE+=		MEMORY_DEBUG
 
 OPTIONS_DEFINE_amd64=		AESNI
 OPTIONS_DEFAULT_amd64=		AESNI
 OPTIONS_EXCLUDE_powerpc64=	DEBUG
 
 OPTIONS_GROUP=			VFS
 OPTIONS_GROUP_VFS=		FRUIT GLUSTERFS
 
 OPTIONS_SINGLE=			GSSAPI ZEROCONF
 # GSSAPI_HEIMDAL
 OPTIONS_SINGLE_GSSAPI=		GSSAPI_BUILTIN GSSAPI_MIT
 OPTIONS_SINGLE_ZEROCONF=	ZEROCONF_NONE AVAHI MDNSRESPONDER
 
 OPTIONS_RADIO=			DNS
 OPTIONS_RADIO_DNS=		NSUPDATE BIND911 BIND914
 # Make those default options
 OPTIONS_DEFAULT=		AD_DC ADS DEBUG DOCS FAM LDAP \
 				QUOTAS SYSLOG UTMP PROFILE \
 				FRUIT GSSAPI_BUILTIN AVAHI
 ##############################################################################
 AD_DC_DESC=			Active Directory Domain Controller
 ADS_DESC=			Active Directory client(implies LDAP)
 AESNI_DESC=			Accelerated AES crypto functions(amd64 only)
 CLUSTER_DESC=			Clustering support
 DEVELOPER_DESC=			With developer framework(implies NTVFS)
 FAM_DESC=			File Alteration Monitor
 GPGME_DESC=			GpgME support
 LDAP_DESC=			LDAP client
 LIBZFS_DESC=			LibZFS
 SPOTLIGHT_DESC=			Spotlight server-side search support
 MANDOC_DESC=			Build manpages from DOCBOOK templates
 MEMORY_DEBUG_DESC=		Debug memory allocator
 NTVFS_DESC=			Build *DEPRECATED* NTVFS file server
 PICKY_DEVELOPER_DESC=		Treat compiler warnings as errors(implies DEVELOPER)
 PROFILE_DESC=			Profiling data
 QUOTAS_DESC=			Disk quota support
 UTMP_DESC=			UTMP accounting
 
 VFS_DESC=			VFS modules
 GLUSTERFS_DESC=			GlusterFS support
 FRUIT_DESC=			MacOSX and TimeMachine support
 
 GSSAPI_BUILTIN_DESC=		GSSAPI support via bundled Heimdal
 
 ZEROCONF_DESC=			Zero configuration networking
 ZEROCONF_NONE_DESC=		Zeroconf support is absent
 
 DNS_DESC=			DNS frontend
 BIND911_DESC=			Use Bind 9.11 as AD DC DNS server frontend
 BIND914_DESC=			Use Bind 9.14 as AD DC DNS server frontend
 NSUPDATE_DESC=			Use samba NSUPDATE utility for AD DC
 ##############################################################################
 # XXX: Unconditional dependencies which can't be switched off(if present in
 # the system)
 
 # Readline(sponsored by Python)
 # XXX: USES=readline pollutes CPPFLAGS, so we explicitly put dependency
 LIB_DEPENDS+=			libreadline.so:devel/readline
 # popt
 LIB_DEPENDS+=			libpopt.so:devel/popt
 # inotify
 LIB_DEPENDS+=			libinotify.so:devel/libinotify
 # GNUTLS
 LIB_DEPENDS+=			libgnutls.so:security/gnutls
 LIB_DEPENDS+=			libgcrypt.so:security/libgcrypt
 # NFSv4 ACL glue
 LIB_DEPENDS+=			libsunacl.so:sysutils/libsunacl
 # Jansson
 BUILD_DEPENDS+=			jansson>=2.10:devel/jansson
 RUN_DEPENDS+=			jansson>=2.10:devel/jansson
 # tasn1
 LIB_DEPENDS+=			libtasn1.so:security/libtasn1
 # External Samba dependencies
 # Needed for IDL compiler
 BUILD_DEPENDS+=			p5-Parse-Yapp>=0:devel/p5-Parse-Yapp
 # Libarchive
 SAMBA4_BUNDLED_LIBS+=		!libarchive
 BUILD_DEPENDS+=			libarchive>=3.1.2:archivers/libarchive
 RUN_DEPENDS+=			libarchive>=3.1.2:archivers/libarchive
 
 ### Bundled libraries
 SAMBA4_BUNDLED_CMOCKA?=		no
 SAMBA4_BUNDLED_TALLOC?=		no
 SAMBA4_BUNDLED_TEVENT?=		no
 SAMBA4_BUNDLED_TDB?=		no
 SAMBA4_BUNDLED_LDB?=		yes
 # cmocka
 .if defined(SAMBA4_BUNDLED_CMOCKA) && ${SAMBA4_BUNDLED_CMOCKA} == yes
 SAMBA4_BUNDLED_LIBS+=		cmocka
 CONFLICTS+=			cmocka-1.*
 PLIST_SUB+=			SAMBA4_BUNDLED_CMOCKA=""
 SUB_LIST+=			SAMBA4_BUNDLED_CMOCKA=""
 .else
 SAMBA4_BUNDLED_LIBS+=		!cmocka
 BUILD_DEPENDS+=			cmocka>=1.1.3:sysutils/cmocka
 RUN_DEPENDS+=			cmocka>=1.1.3:sysutils/cmocka
 PLIST_SUB+=			SAMBA4_BUNDLED_CMOCKA="@comment "
 SUB_LIST+=			SAMBA4_BUNDLED_CMOCKA="@comment "
 .endif
 # talloc
 .if defined(SAMBA4_BUNDLED_TALLOC) && ${SAMBA4_BUNDLED_TALLOC} == yes
 SAMBA4_BUNDLED_LIBS+=		talloc
 CONFLICTS+=			talloc-* talloc1-*
 PLIST_SUB+=			SAMBA4_BUNDLED_TALLOC=""
 SUB_LIST+=			SAMBA4_BUNDLED_TALLOC=""
 .else
 SAMBA4_BUNDLED_LIBS+=		!talloc
 BUILD_DEPENDS+=			talloc>=2.2.0:devel/talloc
 RUN_DEPENDS+=			talloc>=2.2.0:devel/talloc
 PLIST_SUB+=			SAMBA4_BUNDLED_TALLOC="@comment "
 SUB_LIST+=			SAMBA4_BUNDLED_TALLOC="@comment "
 .endif
 # tevent
 .if defined(SAMBA4_BUNDLED_TEVENT) && ${SAMBA4_BUNDLED_TEVENT} == yes
 SAMBA4_BUNDLED_LIBS+=		tevent
 CONFLICTS+=			tevent-* tevent1-*
 PLIST_SUB+=			SAMBA4_BUNDLED_TEVENT=""
 SUB_LIST+=			SAMBA4_BUNDLED_TEVENT=""
 .else
 SAMBA4_BUNDLED_LIBS+=		!tevent
 BUILD_DEPENDS+=			tevent>=0.10.0:devel/tevent
 RUN_DEPENDS+=			tevent>=0.10.0:devel/tevent
 PLIST_SUB+=			SAMBA4_BUNDLED_TEVENT="@comment "
 SUB_LIST+=			SAMBA4_BUNDLED_TEVENT="@comment "
 .endif
 # tdb
 .if defined(SAMBA4_BUNDLED_TDB) && ${SAMBA4_BUNDLED_TDB} == yes
 SAMBA4_BUNDLED_LIBS+=		tdb
 CONFLICTS+=			tdb-* tdb1-*
 PLIST_SUB+=			SAMBA4_BUNDLED_TDB=""
 SUB_LIST+=			SAMBA4_BUNDLED_TDB=""
 .else
 SAMBA4_BUNDLED_LIBS+=		!tdb
 BUILD_DEPENDS+=			tdb>=1.4.0:databases/tdb
 RUN_DEPENDS+=			tdb>=1.4.0:databases/tdb
 PLIST_SUB+=			SAMBA4_BUNDLED_TDB="@comment "
 SUB_LIST+=			SAMBA4_BUNDLED_TDB="@comment "
 .endif
 # ldb
 .if defined(SAMBA4_BUNDLED_LDB) && ${SAMBA4_BUNDLED_LDB} == yes
 SAMBA4_BUNDLED_LDB=		yes
 SAMBA4_BUNDLED_LIBS+=		ldb
 PLIST_SUB+=			SAMBA4_BUNDLED_LDB=""
 SUB_LIST+=			SAMBA4_BUNDLED_LDB=""
 SAMBA4_MODULEDIR=		${SAMBA4_LIBDIR}/modules
 .else
 SAMBA4_BUNDLED_LIBS+=		!ldb
 BUILD_DEPENDS+=			ldb15>=1.5.4:databases/ldb15
 RUN_DEPENDS+=			ldb15>=1.5.4:databases/ldb15
 PLIST_SUB+=			SAMBA4_BUNDLED_LDB="@comment "
 SUB_LIST+=			SAMBA4_BUNDLED_LDB="@comment "
 SAMBA4_MODULEDIR=		${PREFIX}/lib/shared-modules
 .endif
 
 .if (defined(SAMBA4_BUNDLED_TALLOC) && ${SAMBA4_BUNDLED_TEVENT} == yes) \
 	|| (defined(SAMBA4_BUNDLED_TDB) && ${SAMBA4_BUNDLED_TDB} == yes) \
 	|| (defined(SAMBA4_BUNDLED_LDB) && ${SAMBA4_BUNDLED_LDB} == yes) \
 	|| (defined(SAMBA4_BUNDLED_TEVENT) && ${SAMBA4_BUNDLED_TEVENT} == yes)
 SAMBA4_BUNDLED_LIBS+=		replace
 .endif
 # Don't use external libcom_err
 SAMBA4_BUNDLED_LIBS+=		com_err
 # Set the test environment variables
 TEST_USES=			python
 TEST_ENV+=			PYTHON="${PYTHON_CMD}" \
 				SHA1SUM=/sbin/sha1 \
 				SHA256SUM=/sbin/sha256 \
 				MD5SUM=/sbin/md5
 TEST_DEPENDS+=			bash:shells/bash \
 				tshark:net/tshark
 ##############################################################################
 CONFIGURE_ARGS+=		\
 				--with-pam \
 				--with-iconv \
 				--with-winbind \
 				--with-regedit \
 				--disable-rpath \
 				--without-lttng \
 				--without-gettext \
 				--enable-pthreadpool \
 				--without-fake-kaserver \
 				--without-systemd \
 				--enable-gnutls \
 				--with-libarchive \
 				--with-acl-support \
 				--with-sendfile-support \
 				--disable-ctdb-tests \
 
 #				${ICONV_CONFIGURE_BASE}
 ##############################################################################
 FRUIT_PREVENTS=			ZEROCONF_NONE
 FRUIT_PREVENTS_MSG=		MacOSX support requires Zeroconf(AVAHI or MDNSRESPONDER)
 FRUIT_VARS=			SAMBA4_MODULES+=vfs_fruit
 FRUIT_PLIST_FILES+=		man/man8/vfs_fruit.8.gz
 
 GLUSTERFS_CONFIGURE_ENABLE=	glusterfs
 GLUSTERFS_LIB_DEPENDS=		libglusterfs.so:net/glusterfs
 GLUSTERFS_VARS=			SAMBA4_MODULES+=vfs_glusterfs
 GLUSTERFS_PLIST_FILES+=		man/man8/vfs_glusterfs.8.gz
 ##############################################################################
 ZEROCONF_NONE_VARS=		MAKE_ENV+=ZEROCONF=none
 
 AVAHI_CONFIGURE_ENABLE=		avahi
 AVAHI_LIB_DEPENDS=		libavahi-client.so:net/avahi-app
 AVAHI_VARS=			SAMBA4_SERVICES+=avahi_daemon
 
 MDNSRESPONDER_CONFIGURE_ENABLE=	dnssd
 MDNSRESPONDER_LIB_DEPENDS=	libdns_sd.so:net/mDNSResponder
 MDNSRESPONDER_VARS=		SAMBA4_SERVICES+=mdnsd
 ##############################################################################
 BIND911_RUN_DEPENDS=		bind911>=9.11.0.0:dns/bind911
 BIND914_RUN_DEPENDS=		bind914>=9.14.0.0:dns/bind914
 NSUPDATE_RUN_DEPENDS=		samba-nsupdate:dns/samba-nsupdate
 ##############################################################################
 DEBUG_CONFIGURE_ON=		--verbose --enable-debug
 DEBUG_MAKE_ARGS=		--verbose
 DEBUG_FLAGS=			-g -ggdb3 -O0
-DEBUG_VARS=			WITH_DEBUG=yes
 
 MEMORY_DEBUG_IMPLIES=		DEBUG
 MEMORY_DEBUG_CONFIGURE_ENV=	ADDITIONAL_CFLAGS="-DENABLE_JEMALLOC `pkg-config --cflags jemalloc`" ADDITIONAL_LDFLAGS="`pkg-config --libs jemalloc`"
 MEMORY_DEBUG_LIB_DEPENDS=	libjemalloc.so.2:devel/jemalloc
 # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=194046
 GDB_CMD?=			${LOCALBASE}/bin/gdb
 # https://bugzilla.samba.org/show_bug.cgi?id=8969
 PICKY_DEVELOPER_IMPLIES=	DEVELOPER
 PICKY_DEVELOPER_CONFIGURE_ON=	--picky-developer
 
 DEVELOPER_IMPLIES=		NTVFS
 DEVELOPER_CONFIGURE_ON=		--enable-developer --enable-selftest --abi-check-disable
 DEVELOPER_RUN_DEPENDS=		${SAMBA4_LMDB_DEPENDS}
 DEVELOPER_BUILD_DEPENDS=	${GDB_CMD}:devel/gdb \
 				${SAMBA4_LMDB_DEPENDS}
 DEVELOPER_TEST_DEPENDS=		${GDB_CMD}:devel/gdb
 DEVELOPER_VARS_OFF=		GDB_CMD=true
 # XXX: Mostly used in conjuction with the DEVELOPER option, don't enable it
 # if you don't know what you are doing
 NTVFS_IMPLIES=			AD_DC
 NTVFS_CONFIGURE_WITH=		ntvfs-fileserver
 NTVFS_PLIST_FILES=		${SAMBA4_MODULEDIR}/service/smb.so \
 				lib/samba4/private/libntvfs-samba4.so
 ##############################################################################
 CLUSTER_CONFIGURE_WITH=		cluster-support
 
 CUPS_CONFIGURE_ENABLE=		cups iprint
 CUPS_LIB_DEPENDS=		libcups.so:print/cups
 # https://bugzilla.samba.org/show_bug.cgi?id=9545
 FAM_USES=			fam
 FAM_CONFIGURE_WITH=		fam
 
 GPGME_CONFIGURE_WITH=		gpgme
 GPGME_LIB_DEPENDS=		libgpgme.so:security/gpgme
 
 PROFILE_CONFIGURE_WITH=		profiling-data
 
 QUOTAS_CONFIGURE_WITH=		quotas
 
 SPOTLIGHT_CONFIGURE_ENABLE=	spotlight
 SPOTLIGHT_BUILD_DEPENDS=	tracker>=1.4.1:sysutils/tracker
 SPOTLIGHT_RUN_DEPENDS=		tracker>=1.4.1:sysutils/tracker
 SPOTLIGHT_USES=			bison gnome
 SPOTLIGHT_USE=			gnome=glib20
 
 SYSLOG_CONFIGURE_WITH=		syslog
 
 UTMP_CONFIGURE_WITH=		utmp
 
 AD_DC_CONFIGURE_OFF=		--without-ad-dc
 AD_DC_BUILD_DEPENDS=		${SAMBA4_LMDB_DEPENDS}
 AD_DC_RUN_DEPENDS=		${SAMBA4_LMDB_DEPENDS}
 
 ADS_IMPLIES=			LDAP
 ADS_CONFIGURE_WITH=		ads dnsupdate
 
 LDAP_CONFIGURE_WITH=		ldap
 LDAP_CONFIGURE_ON=		--with-openldap=${LOCALBASE}
 LDAP_USE=			OPENLDAP=yes
 LDAP_VARS=			SAMBA4_MODULES+=idmap_ldap
 
 GSSAPI_MIT_CONFIGURE_ON=	--with-system-mitkrb5 ${GSSAPIBASEDIR} \
 				--with-system-mitkdc=${GSSAPIBASEDIR}/sbin/krb5kdc \
 				--with-experimental-mit-ad-dc
 GSSAPI_MIT_USES=		gssapi:mit
 
 LIBZFS_CONFIGURE_WITH=		libzfs
 LIBZFS_VARS=			SAMBA4_MODULES+=vfs_zfs_space
 
 MANDOC_BUILD_DEPENDS=		${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl \
 				xsltproc:textproc/libxslt
 MANDOC_CONFIGURE_ENV_OFF=	XSLTPROC="true"
 # !SAMBA4_SUBPORT
 .endif
 
 ##############################################################################
 .include <bsd.port.options.mk>
 ##############################################################################
 
 .if !defined(SAMBA4_SUBPORT)
 
 .if !defined(WANT_EXP_MODULES) || empty(WANT_EXP_MODULES)
 WANT_EXP_MODULES=		vfs_cacheprime
 .endif
 
 .if ${WANT_EXP_MODULES:Mvfs_snapper}
 # snapper needs dbus
 LIB_DEPENDS+=			libdbus-1.so:devel/dbus
 LIB_DEPENDS+=			libdbus-glib-1.so:devel/dbus-glib
 .endif
 
 SAMBA4_MODULES+=		vfs_freebsd
 
 SAMBA4_MODULES+=		idmap_nss idmap_autorid idmap_rid idmap_hash idmap_tdb idmap_tdb2 idmap_script nss-info_hash
 # List of extra modules taken from RHEL build
 # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=197320
 .if ${PORT_OPTIONS:MADS}
 SAMBA4_MODULES+=		idmap_ad idmap_rfc2307 nss-info_template nss-info_rfc2307 nss-info_sfu nss-info_sfu20
 .endif
 
 .if ${PORT_OPTIONS:MDEVELOPER}
 SAMBA4_MODULES+=		auth_skel pdb_test gpext_security gpext_registry gpext_scripts perfcount_test \
 				vfs_fake_dfq vfs_skel_opaque vfs_skel_transparent vfs_shadow_copy_test vfs_fake_acls \
 				vfs_nfs4acl_xattr vfs_error_inject vfs_delay_inject
 .endif
 # Python bindings
 .if defined(NO_PYTHON)
 USES+=				python:build,test
 CONFIGURE_ARGS+=		--disable-python
 PLIST_SUB+=			SAMBA4_PYTHON="@comment "
 SUB_LIST+=			SAMBA4_PYTHON="@comment "
 .else
 USES+=				python:3.4+
 PLIST_SUB+=			SAMBA4_PYTHON=""
 SUB_LIST+=			SAMBA4_PYTHON=""
 CONFIGURE_ARGS+=		--nopycache
 
 .if defined(SAMBA4_BUNDLED_TALLOC) && ${SAMBA4_BUNDLED_TALLOC} == yes
 SAMBA4_BUNDLED_LIBS+=		pytalloc-util
 .else
 SAMBA4_BUNDLED_LIBS+=		!pytalloc-util
 .endif
 
 .if defined(SAMBA4_BUNDLED_TEVENT) && ${SAMBA4_BUNDLED_TEVENT} == yes
 SAMBA4_BUNDLED_LIBS+=		pytevent
 .else
 SAMBA4_BUNDLED_LIBS+=		!pytevent
 .endif
 
 .if defined(SAMBA4_BUNDLED_TDB) && ${SAMBA4_BUNDLED_TDB} == yes
 SAMBA4_BUNDLED_LIBS+=		pytdb
 .else
 SAMBA4_BUNDLED_LIBS+=		!pytdb
 .endif
 
 .if defined(SAMBA4_BUNDLED_LDB) && ${SAMBA4_BUNDLED_LDB} == yes
 SAMBA4_BUNDLED_LIBS+=		pyldb pyldb-util
 .else
 SAMBA4_BUNDLED_LIBS+=		!pyldb !pyldb-util
 .endif
 # External Python modules
 BUILD_DEPENDS+=			${PYTHON_PKGNAMEPREFIX}dnspython>=1.15.0:dns/py-dnspython@${PY_FLAVOR}
 RUN_DEPENDS+=			${PYTHON_PKGNAMEPREFIX}dnspython>=1.15.0:dns/py-dnspython@${PY_FLAVOR}
 
 BUILD_DEPENDS+=			${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601@${PY_FLAVOR}
 RUN_DEPENDS+=			${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601@${PY_FLAVOR}
 .endif
 
 .if defined(WANT_EXP_MODULES) && !empty(WANT_EXP_MODULES)
 SAMBA4_MODULES+=		${WANT_EXP_MODULES}
 .endif
 
 .if defined(SAMBA4_BUNDLED_LIBS) && !empty(SAMBA4_BUNDLED_LIBS)
 CONFIGURE_ARGS+=		--bundled-libraries="${SAMBA4_BUNDLED_LIBS:Q:C|(\\\\ )+|,|g:S|\\||g}"
 .endif
 
 .if defined(SAMBA4_MODULES) && !empty(SAMBA4_MODULES)
 CONFIGURE_ARGS+=		--with-shared-modules="${SAMBA4_MODULES:C|-|_|:Q:C|(\\\\ )+|,|g:S|\\||g}"
 .endif
 # XXX: Hack for nss-info_* -> nss_info/* modules
 # Add selected modules to the plist
 .for module in ${SAMBA4_MODULES}
 PLIST_FILES+=			${SAMBA4_MODULEDIR}/${module:C|_|/|:C|-|_|}.so
 .endfor
 # !SAMBA4_SUBPORT
 .endif
 
 ##############################################################################
 .include <bsd.port.pre.mk>
 ##############################################################################
 
 .if !defined(SAMBA4_SUBPORT)
 # Require llvm 4.0 and AMD64
 .if ${PORT_OPTIONS:MAESNI} && ${ARCH} == "amd64"
 CONFIGURE_ARGS+=		--accel-aes=intelaesni
 PLIST_FILES+=			lib/samba4/private/libaesni-intel-samba4.so
 .else
 CONFIGURE_ARGS+=		--accel-aes=none
 .endif
 
 # Only for 64-bit architectures
 .if ${ARCH} != armv6 && ${ARCH} != armv7 && ${ARCH} != i386 && ${ARCH} != mips && ${ARCH} != powerpc && ${ARCH} != powerpcspe
 .	if defined(SAMBA4_BUNDLED_LDB) && ${SAMBA4_BUNDLED_LDB} == yes && (${PORT_OPTIONS:MAD_DC} || ${PORT_OPTIONS:MDEVELOPER})
 # LMDB
 SAMBA4_LMDB_DEPENDS=		lmdb>=0.9.16:databases/lmdb
 PLIST_FILES+=			lib/samba4/private/libldb-mdb-int-samba4.so \
 				${SAMBA4_MODULEDIR}/ldb/mdb.so
 .	endif
 .endif
 
 .if ${PORT_OPTIONS:MGSSAPI_MIT}
 PLIST_FILES+=			${SAMBA4_MODULEDIR}/krb5/winbind_krb5_localauth.so \
 				man/man8/winbind_krb5_localauth.8.gz
 .	if ${PORT_OPTIONS:MAD_DC}
 PLIST_FILES+=			lib/samba4/krb5/plugins/kdb/samba.so
 .	endif
 .endif
 # for libexecinfo: (so that __builtin_frame_address() finds the top of the stack)
 CFLAGS_amd64+=			-fno-omit-frame-pointer
 # No fancy color error messages
 CONFIGURE_ENV+=			NOCOLOR=yes WAF_LOG_FORMAT='%(c1)s%(zone)s%(c2)s %(message)s'
 MAKE_ENV+=			NOCOLOR=yes WAF_LOG_FORMAT='%(c1)s%(zone)s%(c2)s %(message)s'
 .if ${CHOSEN_COMPILER_TYPE} == clang
 CFLAGS+=			-fno-color-diagnostics
 .endif
 # Allow rpcgen to find proper CPP
 MAKE_ENV+=			RPCGEN_CPP="${CPP}"
 #.if ${readline_ARGS} == port
 #CFLAGS+=			-D_FUNCTION_DEF
 #.endif
 # Make sure that the right version of Python is used by the tools
 # https://bugzilla.samba.org/show_bug.cgi?id=7305
 SHEBANG_FILES=			${PATCH_WRKSRC}/source4/scripting/bin/* ${PATCH_WRKSRC}/selftest/*
 
 SAMBA4_SUB=			SAMBA4_LOGDIR="${SAMBA4_LOGDIR}" \
 				SAMBA4_RUNDIR="${SAMBA4_RUNDIR}" \
 				SAMBA4_LOCKDIR="${SAMBA4_LOCKDIR}" \
 				SAMBA4_MODULEDIR="${SAMBA4_MODULEDIR}" \
 				SAMBA4_BINDDNSDIR="${SAMBA4_BINDDNSDIR}" \
 				SAMBA4_PRIVATEDIR="${SAMBA4_PRIVATEDIR}" \
 				SAMBA4_CONFDIR="${SAMBA4_CONFDIR}" \
 				SAMBA4_CONFIG="${SAMBA4_CONFIG}" \
 				SAMBA4_SERVICES="${SAMBA4_SERVICES}"
 
 PLIST_SUB+=			${SAMBA4_SUB}
 SUB_LIST+=			${SAMBA4_SUB}
 
 USE_RC_SUBR=			samba_server
 SUB_FILES=			pkg-message README.FreeBSD
 
 PORTDOCS=			README.FreeBSD
 
 post-extract:
 				@${RM} -r ${WRKSRC}/pidl/lib/Parse/Yapp
 
 post-patch:
 				@${REINPLACE_CMD} -e 's|$${PKGCONFIGDIR}|${PKGCONFIGDIR}|g' \
 					${PATCH_WRKSRC}/buildtools/wafsamba/pkgconfig.py
 				@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 					${PATCH_WRKSRC}/buildtools/wafsamba/wafsamba.py
 				@${REINPLACE_CMD} -e 's|%%GDB_CMD%%|${GDB_CMD}|g' \
 					${PATCH_WRKSRC}/buildtools/scripts/abi_gen.sh
 				@${REINPLACE_CMD} -e 's|%%SAMBA4_CONFIG%%|${SAMBA4_CONFIG}|g' \
 					${PATCH_WRKSRC}/dynconfig/wscript
 				@${REINPLACE_CMD} -e '1s|/bin/bash|/bin/sh|' \
 					 ${PATCH_WRKSRC}/ctdb/tools/onnode
 
 # Use threading (or multiprocessing) but not thread (renamed in python 3+).
 pre-configure:
 .if ! ${PORT_OPTIONS:MAD_DC} && ${PORT_OPTIONS:MNTVFS}
 				@${ECHO_CMD}; \
 				${ECHO_MSG} "===>  NTVFS option requires AD_DC to be set"; \
 				${ECHO_CMD}; \
 				${FALSE}
 .endif
 				@if ! ${PYTHON_CMD} -c "import multiprocessing;" 2>/dev/null; then \
 					${ECHO_CMD}; \
 					${ECHO_MSG} "===>  ${PKGNAME} "${IGNORE_NONTHREAD_PYTHON:Q}.; \
 					${ECHO_CMD}; \
 					${FALSE}; \
 				fi
 
 pre-build-MANDOC-off:
 				${MKDIR} ${BUILD_WRKSRC}/bin/default/docs-xml/
 				${CP} -rp ${BUILD_WRKSRC}/docs/manpages ${BUILD_WRKSRC}/bin/default/docs-xml/
 .for man in			libcli/nbt/man/nmblookup4.1 \
 				librpc/tools/ndrdump.1 \
 				source4/lib/registry/man/regdiff.1 \
 				source4/lib/registry/man/regpatch.1 \
 				source4/lib/registry/man/regshell.1 \
 				source4/lib/registry/man/regtree.1 \
 				source4/scripting/man/samba-gpupdate.8 \
 				source4/torture/man/gentest.1 \
 				source4/torture/man/locktest.1 \
 				source4/torture/man/masktest.1 \
 				source4/torture/man/smbtorture.1 \
 				source4/utils/man/ntlm_auth4.1 \
 				source4/utils/man/oLschema2ldif.1 \
 				lib/tdb/man/tdbdump.8 \
 				lib/tdb/man/tdbbackup.8 \
 				lib/tdb/man/tdbtool.8 \
 				lib/talloc/man/talloc.3 \
 				lib/tdb/man/tdbrestore.8 \
 				lib/ldb/man/ldbadd.1 \
 				lib/ldb/man/ldbsearch.1 \
 				lib/ldb/man/ldbmodify.1 \
 				lib/ldb/man/ldbrename.1 \
 				lib/ldb/man/ldbdel.1 \
 				lib/ldb/man/ldbedit.1 \
 				docs-xml/manpages/vfs_freebsd.8
 					${MKDIR} `dirname ${BUILD_WRKSRC}/bin/default/${man}`
 					${INSTALL_MAN} ${FILESDIR}/man/`basename ${man}` ${BUILD_WRKSRC}/bin/default/${man}
 .endfor
 .if ${PORT_OPTIONS:MCLUSTER}
 				${MKDIR} ${BUILD_WRKSRC}/bin/default/ctdb/
 .	for man in		ctdb_diagnostics.1 ctdb.1 ctdbd_wrapper.1 ctdbd.1 ltdbtool.1 onnode.1 ping_pong.1 \
 				ctdb.conf.5 ctdb.sysconfig.5 ctdb-script.options.5 \
 				ctdb.7 ctdb-statistics.7 ctdb-tunables.7
 					${INSTALL_MAN} ${FILESDIR}/man/${man} ${BUILD_WRKSRC}/bin/default/ctdb/
 .	endfor
 .endif
 
 post-install-rm-junk:
 .if defined(NO_PYTHON)
 				${RM} -r ${STAGEDIR}${PYTHON_SITELIBDIR}/samba/third_party/dns \
 					 ${STAGEDIR}${PYTHON_SITELIBDIR}/samba/third_party/iso8601
 .endif
 
 post-install-fix-manpages:
 .for f in vfs_aio_linux.8 vfs_btrfs.8 vfs_ceph.8 vfs_gpfs.8
 				${RM} ${STAGEDIR}${PREFIX}/man/man8/${f}
 .endfor
 .if defined(SAMBA4_BUNDLED_LDB) && ${SAMBA4_BUNDLED_LDB} == yes
 .	for f in ldbadd.1 ldbdel.1 ldbedit.1 ldbmodify.1 ldbrename.1 ldbsearch.1
 				${MV} ${STAGEDIR}${PREFIX}/man/man1/${f} ${STAGEDIR}${PREFIX}/man/man1/samba-${f}
 .	endfor
 .endif
 .if defined(SAMBA4_BUNDLED_TDB) && ${SAMBA4_BUNDLED_TDB} == yes
 .	for f in tdbbackup.8 tdbdump.8 tdbrestore.8 tdbtool.8
 				${MV} ${STAGEDIR}${PREFIX}/man/man8/${f} ${STAGEDIR}${PREFIX}/man/man8/samba-${f}
 .	endfor
 .endif
 
 post-install: post-install-rm-junk post-install-fix-manpages
 				${LN} -sf smb.conf.5.gz ${STAGEDIR}${PREFIX}/man/man5/smb4.conf.5.gz
 # Run post-install script
 .for dir in			${SAMBA4_LOGDIR} ${SAMBA4_RUNDIR} ${SAMBA4_LOCKDIR} ${SAMBA4_MODULEDIR}
 					${INSTALL} -d -m 0755 "${STAGEDIR}${dir}"
 .endfor
 				${INSTALL} -d -m 0750 "${STAGEDIR}${SAMBA4_BINDDNSDIR}"
 				${INSTALL} -d -m 0750 "${STAGEDIR}${SAMBA4_PRIVATEDIR}"
 .for dir in			auth bind9 gensec gpext idmap ldb nss_info pdb perfcount process_model service vfs
 					${INSTALL} -d -m 0755 "${STAGEDIR}${SAMBA4_MODULEDIR}/${dir}"
 .endfor
 
 post-install-FRUIT-off:
 				${RM} ${STAGEDIR}${SAMBA4_MODULEDIR}/vfs/fruit.so
 				${RM} ${STAGEDIR}${PREFIX}/man/man8/vfs_fruit.8
 
 post-install-DOCS-on:
 				${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for doc in			${PORTDOCS}
 				${INSTALL_DATA} ${WRKDIR}/${doc} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 post-install-CLUSTER-on:
 				${LN} -nfs ../../../../share/ctdb/events/legacy/00.ctdb.script		${STAGEDIR}${PREFIX}/etc/ctdb/events/legacy/00.ctdb.script
 				${LN} -nfs ../../../../share/ctdb/events/legacy/10.interface.script	${STAGEDIR}${PREFIX}/etc/ctdb/events/legacy/10.interface.script
 				${LN} -nfs ../../../../share/ctdb/events/legacy/05.system.script	${STAGEDIR}${PREFIX}/etc/ctdb/events/legacy/05.system.script
 				${LN} -nfs ../../../../share/ctdb/events/legacy/01.reclock.script	${STAGEDIR}${PREFIX}/etc/ctdb/events/legacy/01.reclock.script
 
 # !SAMBA4_SUBPORT
 .endif
 
 .include <bsd.port.post.mk>
Index: head/net/udpxy/Makefile
===================================================================
--- head/net/udpxy/Makefile	(revision 527672)
+++ head/net/udpxy/Makefile	(revision 527673)
@@ -1,51 +1,49 @@
 # Created by: Alex Deiter <Alex.Deiter@Gmail.COM>
 # $FreeBSD$
 
 PORTNAME=	udpxy
 DISTVERSION=	1.0-24.1
 CATEGORIES=	net
 
 MAINTAINER=	alex.deiter@gmail.com
 COMMENT=	UDP-to-HTTP multicast traffic relay daemon
 
 LICENSE=	GPLv3
 
 USES=		gmake
 USE_RC_SUBR=	udpxy
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	pcherenkov
 WRKSRC_SUBDIR=	chipmunk
 
 OPTIONS_SINGLE=	CONF
-OPTIONS_SINGLE_CONF=	RELEASE LEAN DEBUG
+OPTIONS_SINGLE_CONF=	RELEASE LEAN
 RELEASE_DESC=	No asserts, no debug symbols, verbose on
 LEAN_DESC=	No asserts, no debug symbols, verbose off
-DEBUG_DESC=	Asserts, debug symbols, verbose on
 OPTIONS_DEFAULT=	RELEASE
 
 PLIST_FILES=	sbin/udpxy \
 		sbin/udpxrec \
 		man/man1/udpxy.1.gz \
 		man/man1/udpxrec.1.gz
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/udpxy ${STAGEDIR}${PREFIX}/sbin
 	${LN} -s udpxy ${STAGEDIR}${PREFIX}/sbin/udpxrec
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/en/udpxy.1 ${STAGEDIR}${MANPREFIX}/man/man1/
 	${INSTALL_MAN} ${WRKSRC}/doc/en/udpxrec.1 ${STAGEDIR}${MANPREFIX}/man/man1/
 
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MRELEASE}
+.if defined(WITH_DEBUG)
+ALL_TARGET=debug
+.elif ${PORT_OPTIONS:MRELEASE}
 ALL_TARGET=release
 .elif ${PORT_OPTIONS:MLEAN}
 ALL_TARGET=lean
-.elif ${PORT_OPTIONS:MDEBUG}
-ALL_TARGET=debug
-WITH_DEBUG=yes
 .endif
 
 .include <bsd.port.mk>
Index: head/ports-mgmt/pkg-devel/Makefile
===================================================================
--- head/ports-mgmt/pkg-devel/Makefile	(revision 527672)
+++ head/ports-mgmt/pkg-devel/Makefile	(revision 527673)
@@ -1,61 +1,60 @@
 # $FreeBSD$
 
 PORTNAME=	pkg
 DISTVERSION=	1.13.99.3
 _PKG_VERSION=	${DISTVERSION}
 CATEGORIES=	ports-mgmt
 PKGNAMESUFFIX=	-devel
 
 MAINTAINER=	pkg@FreeBSD.org
 COMMENT=	Package manager
 
 LICENSE=	BSD2CLAUSE
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	freebsd
 GH_TAGNAME=	93c4c82e
 
-WITH_DEBUG=	yes
 CFLAGS+=	-O0 -g -Wno-error
 USE_LDCONFIG=	${PREFIX}/lib/compat/pkg
 HAS_CONFIGURE=	yes
 PORTDOCS=	NEWS
 PORTSCOUT=	ignore:1
 CONFIGURE_ARGS=	--mandir=${PREFIX}/man --prefix="${PREFIX}"
 CONFIGURE_ENV=	CC_FOR_BUILD="${CC}"
 
 # Use a submake as 'deinstall install' needs to reevaluate PKG_REGISTER
 # so that pkg-static is used from the wrkdir
 USE_SUBMAKE=	yes
 
 OPTIONS_DEFINE=	DOCS
 
 .if !exists(/usr/include/jail.h)
 EXTRA_PATCHES=	${FILESDIR}/extra-patch-docs_pkg.8
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_PKG)
 .if ${WITH_PKG} != devel
 .	if !defined(PACKAGE_BUILDING)
 IGNORE=	WITH_PKG is not defined to 'devel', this version is the devel one
 .	endif
 .else
 PKGNAMESUFFIX=
 #define PKG_DEPENDS to nothing to avoid infinite loop looking for pkg :)
 PKG_DEPENDS=
 .endif
 .endif
 
 .undef INSTALLS_DEPENDS
 .if !exists(${LOCALBASE}/sbin/pkg) || !defined(CROSS_TOOLCHAIN)
 PKG_BIN=	${WRKSRC}/src/pkg-static
 .endif
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/compat/pkg
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/NEWS ${STAGEDIR}${DOCSDIR}/NEWS
 
 .include <bsd.port.post.mk>
Index: head/sysutils/e2fsprogs/Makefile
===================================================================
--- head/sysutils/e2fsprogs/Makefile	(revision 527672)
+++ head/sysutils/e2fsprogs/Makefile	(revision 527673)
@@ -1,319 +1,319 @@
 # Created by: Maxim Sobolev <sobomax@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	e2fsprogs
 PORTVERSION=	1.45.5
 PORTREVISION?=	4
 CATEGORIES?=	sysutils
 MASTER_SITES=	KERNEL_ORG/linux/kernel/people/tytso/${PORTNAME}/v${PORTVERSION}
 
 MAINTAINER?=	mandree@FreeBSD.org
 COMMENT?=	Utilities & library to manipulate ext2/3/4 filesystems
 
 LICENSE?=	GPLv2+
 .if !defined(_no_license_file)
 LICENSE_FILE?=	${WRKSRC}/NOTICE
 .endif
 LICENSE_DISTFILES_GPLv2+ =	${DISTNAME}${EXTRACT_SUFX}
 
 USES=		cpe gmake makeinfo pkgconfig tar:xz
 CPE_VENDOR=	e2fsprogs_project
 USE_CSTD=	gnu99
 # this seems a bit redundant to the --rpath below, but
 # the latter should be more robust in case someone needs
 # to deal with the file systems from a system not yet fully booted.
 .if !defined(PKGNAMESUFFIX)
 USE_LDCONFIG=	${PREFIX}/lib/e2fsprogs
 .endif
 GNU_CONFIGURE=	yes
 
 # while we use the system blkid, we need to --enable-libblkid
 # so that the tools get built:
 CONFIGURE_ARGS?=--disable-fsck \
 		--disable-e2initrd-helper \
 		--disable-libuuid \
 		--disable-uuidd \
 		--enable-libblkid \
 		--enable-elf-shlibs \
 		--libdir='${PREFIX}/lib/e2fsprogs/' \
 		--includedir='${PREFIX}/include/e2fsprogs/' \
 		--with-root-prefix='${PREFIX}' \
 		--without-included-gettext \
 		LDFLAGS='${LDFLAGS} -L${LOCALBASE}/lib -Wl,--rpath -Wl,${LOCALBASE}/lib/e2fsprogs'
 CONFIGURE_ENV?=	LIBS='-Wl,--as-needed ${LIBS} -lexecinfo -lelf'
 CPPFLAGS+=	-I${WRKSRC}/lib -I${LOCALBASE}/include # -D_EXT2_USE_C_VERSIONS
 MAKE_ARGS+=	pkgconfigdir='${PREFIX}/libdata/pkgconfig'
 MAKE_ENV+=	CHECK_CMD=@true
 
 PORTSCOUT=	ignore	# cannot handle the version in the directory
 
 .if !defined(MASTERDIR)
 INSTALL_TARGET=		install install-libs
 
 OPTIONS_DEFINE=		DOCS NLS FUSEFS PARALLELTESTS SLOWTESTS BASHTESTS LIBUNWIND
 OPTIONS_EXCLUDE+=	EXAMPLES
 OPTIONS_SUB=		yes
 
 OPTIONS_SINGLE=			SELFTEST
 OPTIONS_SINGLE_SELFTEST=	NOTESTS SMALLTESTS ALLTESTS
 OPTIONS_DEFAULT=		SMALLTESTS
 FUSEFS_DESC=	Build user-land ext2/3/4 FUSE module (slow!)
 SELFTEST_DESC=	Choose which set of self-tests to run
 NOTESTS_DESC=	Do not run any self-tests (Tier-1, DISCOURAGED)
 SMALLTESTS_DESC=Run tests that need <500 MB disk space (DEFAULT)
 ALLTESTS_DESC=	Run most self-tests (needs more RAM/disk space)
 PARALLELTESTS_DESC=	Parallelize self-tests (needs more disk space)
 SLOWTESTS_DESC=	Enable slow tests that are skipped by default
 BASHTESTS_DESC=	Enable tests that require the GNU bash shell
-LIBUNWIND_DESC=	Backtrace with libunwind (do set WITH_DEBUG=yes!)
+LIBUNWIND_DESC=	Backtrace with libunwind (do set WITH_DEBUG_PORTS+=${PKGORIGIN}!)
 
 FUSEFS_CONFIGURE_ENABLE=	fuse2fs
 
 BUILD_DEPENDS+=	gdd:sysutils/coreutils
 BASHTESTS_BUILD_DEPENDS=	${BASH_CMD}:shells/bash
 BASH_CMD=	${LOCALBASE}/bin/bash
 
 LIB_DEPENDS+=	libblkid.so:misc/e2fsprogs-libblkid
 LIB_DEPENDS+=	libss.so:devel/e2fsprogs-libss
 LIB_DEPENDS+=	libuuid.so:misc/e2fsprogs-libuuid
 
 LIBUNWIND_LIB_DEPENDS=	libunwind.so:devel/libunwind
 LIBUNWIND_LIBS+=	-L${LOCALBASE}/lib -lunwind
 LIBUNWIND_LDFLAGS+=	-rdynamic
 LIBUNWIND_EXTRA_PATCHES=${FILESDIR}/extrapatch-e2fsck_sigcatcher.c
 
 PORTDOCS=	NOTICE README RELEASE-NOTES SUBMITTING-PATCHES
 .endif
 
 # even under DEVELOPER, no REINPLACE_CMD warnings desired
 # it simply makes no sense to warn about dozens of files
 # for systematic edits that run over files that don't need the edits.
 # a "warn if nothing was edited by one command" would be acceptable,
 # but until we have that in the framework, just
 # avoid Tools/scripts/sed_checked altogether:
 REINPLACE_CMD=	${SED} ${REINPLACE_ARGS}
 
 PKGDEINSTALL=	${PKGINSTALL}
 
 MAKE_ARGS+=	V=1
 
 .include <bsd.port.options.mk>
 
 . if ! empty(ARCH:Mpowerpc*)
 # Fix powerpc64/powerpc SIGSEGV,
 # see https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=231570 (ppc64)
 # see https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=242798 (ppc32 - untested)
 USES+=		compiler:c11
 . endif
 
 .if ${PORT_OPTIONS:MFUSEFS}
 USES+=		fuse
 .endif
 
 .if ${PORT_OPTIONS:MNLS}
 USES+=		gettext iconv:build
 .endif
 
 .if empty(PORT_OPTIONS:MNOTESTS) && ${MASTERDIR} == ${.CURDIR}
 USES+=		perl5
 USE_PERL5=	build
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MNLS}
 . if empty(ICONV_LIB)
 libintl=	${LOCALBASE}/lib/libintl.a
 . else
 libintl=	${LOCALBASE}/lib/libintl.a ${LOCALBASE}/lib/libiconv.a
 . endif
 .else
 CONFIGURE_ARGS+=--disable-nls
 libintl=
 .endif
 
 .if ${MASTERDIR} == ${.CURDIR} && ${ARCH} == "aarch64"
 EXTRA_PATCHES+=	${FILESDIR}/extrapatch-no-sbrk
 .endif
 
 # d_fallocate_blkmap appears to fail on some systems for unknown reasons.
 post-patch::
 # don't build/install libext2fs.info
 	@${REINPLACE_CMD} -e 's/ install-doc-libs$$//' ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -E -e 's/md5sum ([^ ]*)/printf "%s  %s\\n" $$(md5 -q \1) \1/' \
 	    -e "s/ == 0/ = 0/" -e "s/tar x$$/tar xf -/" -e "s/\<dd\>/gdd/" \
 	    ${WRKSRC}/tests/[a-z]_*/script
 	@${REINPLACE_CMD} -e 's/<malloc\.h>/<stdlib.h>/' ${WRKSRC}/*/*.c
 	@${REINPLACE_CMD} -E -e 's/__GNUC_PREREQ\>/__GNUC_PREREQ__/' ${WRKSRC}/*/*/*.[ch] ${WRKSRC}/*/*.c
 .if empty(PORT_OPTIONS:MALLTESTS)
 . for i in \
 		d_fallocate_blkmap \
 		f_baddir \
 		f_bbfile \
 		f_convert_bmap \
 		f_detect_junk \
 		f_inode_ea_collision \
 		f_lpffile \
 		f_no_cache_corrupt_inode \
 		f_opt_extent \
 		j_corrupt_descr_csum \
 		m_bigjournal \
 		m_hugefile_slack \
 		m_offset \
 		m_raid_opt \
 		r_32to64bit \
 		r_32to64bit_expand_full \
 		r_32to64bit_meta \
 		r_32to64bit_move_itable \
 		r_64to32bit \
 		r_64to32bit_meta \
 		r_expand_full \
 		r_min_itable \
 		t_change_uuid_mounted \
 		t_dangerous \
 		t_disable_changed_csum_seed_mounted \
 		t_disable_mcsum \
 		t_disable_mcsum_noinitbg \
 		t_disable_mcsum_yesinitbg \
 		t_enable_mcsum \
 		t_enable_mcsum_initbg \
 		t_iexpand_full \
 		t_iexpand_mcsum \
 		t_uninit_bg_rm \
 		u_dryrun \
 		u_mke2fs_opt_offset
 	@${MV} ${WRKSRC}/tests/${i} ${WRKSRC}/tests/disabled_test-${i}
 . endfor
 .endif
 .if ${PORT_OPTIONS:MBASHTESTS}
 	${REINPLACE_CMD} -e 's}^SHELL *=.*}SHELL = ${_CHECK_SHELL}}' ${WRKSRC}/MCONFIG.in
 .else
 . for i in f_large_dir
 	@${MV} ${WRKSRC}/tests/${i} ${WRKSRC}/tests/disabled_test-${i}
 . endfor
 .endif
 
 ##############################################################
 # Master port stuff that is not to be seen by the slave ports.
 ##############################################################
 .if ${MASTERDIR} == ${.CURDIR}
 # NOTE: The previous .if block goes all the way to the end of the file.
 
 .if !empty(PORT_OPTIONS:MNOTESTS) && (${OPSYS} == FreeBSD) && (${OSVERSION} >= 1200000 || ((${ARCH} != i386) && (${ARCH} != amd64)))
 BROKEN=	it was not tested on your system by the maintainer; you must run self-tests
 .endif
 
 pre-build:
 # fix up Makefile ordering for parallel builds
 	cd ${WRKSRC}/lib/et && ${DO_MAKE_BUILD} compile_et
 	cd ${WRKSRC}/lib/support && ${DO_MAKE_BUILD} prof_err.h
 
 .if ${PORT_OPTIONS:MPARALLELTESTS}
 _CHECK_JOBS=${_MAKE_JOBS}
 .else
 _CHECK_JOBS=
 .endif
 
 .if ${PORT_OPTIONS:MBASHTESTS}
 _CHECK_SHELL=${SHELL}
 .else
 _CHECK_SHELL=${LOCALBASE}/bin/bash
 .endif
 
 _checkaddargs=
 .if !defined(TMPDIR)
 _checkaddargs+=TMPDIR=${WRKDIR}/tmp
 .endif
 
 .if ${PORT_OPTIONS:MBASHTESTS}
 _checkaddargs+=--eval SHELL:=${BASH_CMD}
 .endif
 
 .if ${PORT_OPTIONS:MSLOWTESTS}
 _check_target=SKIP_SLOW_TESTS= check
 _check_timeout=7200
 .else
 _check_target=check
 _check_timeout=180
 .endif
 
 .if ${PORT_OPTIONS:MLIBUNWIND}
 _staticlibs+=${LOCALBASE}/lib/libunwind.a /usr/lib/liblzma.a
 .endif
 
 post-build:
 # Relink e2fsck statically - We need to make sure that tools for the root file
 # system are statically linked against anything that is outside the root fs,
 # else we're in trouble if e2fsck is needed for boot:
 # (we don't use e2fsck.static, since we can link libc.so dynamically)
 # NOTE: we need to link libgcc statically, it might be under /usr/local!
 # => do not add a -Bdynamic - but instead list the dynamic libraries
 # before the -Bstatic
 	cd ${WRKSRC}/e2fsck && ${RM} -f e2fsck \
 		&& ${MAKE_CMD} e2fsck V=1 \
 		LIBS="-static-libgcc -lc -Bstatic ../lib/libsupport.a ../lib/libext2fs.a ../lib/libcom_err.a \
 		${_staticlibs} /usr/lib/libexecinfo.a /usr/lib/libelf.a \
 		${LOCALBASE}/lib/libblkid.a ${LOCALBASE}/lib/libuuid.a ${libintl} ../lib/libe2p.a "
 # Regression check: avoid a port (not upstream!) regression from 1.40.5,
 # check that e2fsck isn't dynalinked against anything but libc.so:
 	@${ECHO_CMD} -n "===>  checking that e2fsck depends on no shared objects outside /lib: "
 	@a="$$(ldd ${WRKSRC}/e2fsck/e2fsck 2>/dev/null \
 	    | ${GREP} -v 'not a dynamic executable' \
 	    | ${GREP} '=>' \
 	    | ${AWK}  '{print $$3;}' \
 	    | ${EGREP} -v '^/lib/lib.*\.so\.' || :)"; \
 	if test "x$$a" = "x" ; then echo 'PASS' ; else \
 	    echo 'FAIL' ; echo '===>  e2fsck depends on:' ; echo "$$a" ; exit 1 ; fi
 # Update translation binary files
 .if ${PORT_OPTIONS:MNLS}
 	cd ${WRKSRC}/po && ${MAKE_CMD} update-gmo
 .endif
 # Build fsck(8) wrapper
 	${CC} ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -s ${LIBS} \
 		-o ${WRKSRC}/fsck_ext2fs ${FILESDIR}/fsck_ext2fs.c
 # While the ${MAKE} check can take a minute on an end user's system, the
 # correctness of tools such as e2fsck is critical to the health of the
 # file systems.  The upstream is not using any *BSD as his development
 # system, and therefore let's exercise due diligence in running the self-
 # test on each and every system and not just package building hosts.
 # There have been subtle failures induced by Linux-isms in the past.
 # -- Matthias Andree, package maintainer, 2007-09-18
 .if empty(PORT_OPTIONS:MNOTESTS)
 	@${ECHO_CMD} '===>  Running e2fsprogs self-test suite'
 # do not add -j options unconditionally to ${MAKE_CMD} below, this might break
 # due to excessive disk space use.
 	cd ${WRKSRC}/tests && \
 		ulimit -t ${_check_timeout} && \
 		${MKDIR} ${WRKDIR}/tmp && \
 		${SETENV} e2fsprogs_inhibit_SIGINFO=1 BLKID_FILE=${WRKDIR}/tmp/blkid.tab SHELL=${_CHECK_SHELL} \
 		${MAKE_CMD} ${_check_target} ${_CHECK_JOBS} ${_checkaddargs} \
 	    || { head -n30000 ${WRKSRC}/tests/*.failed 2>/dev/null ; exit 1 ; }
 .else
 	@${ECHO_CMD} '===>  SKIPPING e2fsprogs self-test suite (DISCOURAGED!)'
 .endif
 
 post-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/fsck_ext2fs ${STAGEDIR}${PREFIX}/sbin/
 	${INSTALL_MAN} ${FILESDIR}/fsck_ext2fs.8 ${STAGEDIR}${PREFIX}/man/man8/
 .if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
 .endif
 # remove or relocate files installed by other ports already, or shadowing system files:
 	cd ${STAGEDIR}${PREFIX} && \
 		${XARGS} <${FILESDIR}/unwanted ${RM} && \
 		${RMDIR} include/e2fsprogs/blkid include/e2fsprogs/ss share/ss
 	${MV} ${STAGEDIR}${PREFIX}/bin/compile_et ${STAGEDIR}${PREFIX}/bin/e2fsprogs-compile_et
 	${MV} ${STAGEDIR}${PREFIX}/man/man1/compile_et.1 ${STAGEDIR}${PREFIX}/man/man1/e2fsprogs-compile_et.1
 	${MKDIR} ${STAGEDIR}${DATADIR}/et/
 	${MV} ${STAGEDIR}${PREFIX}/share/et/* ${STAGEDIR}${DATADIR}/et/
 	${REINPLACE_CMD} -e 's}^DIR=.*$$}DIR=${DATADIR}/et}' -i '' ${STAGEDIR}${PREFIX}/bin/e2fsprogs-compile_et
 	${RMDIR} ${STAGEDIR}${PREFIX}/share/et
 
 #
 # the next line closes .if ${MASTERDIR} == ${.CURDIR}
 .endif
 
 .include <bsd.port.post.mk>