Remove UNIQUENAME and LATEST_LINK.

UNIQUENAME was never unique, it was only used by USE_LDCONFIG and now,
we won't have conflicts there.

Use PKGBASE instead of LATEST_LINK in PKGLATESTFILE, the *only* consumer
is pkg-devel, and it works just fine without LATEST_LINK as pkg-devel
has the correct PKGNAME anyway.

Now that UNIQUENAME is gone, OPTIONSFILE is too. (it's been called
OPTIONS_FILE now.)

Reviewed by:	antoine, bapt
Exp-run by:	antoine
Sponsored by:	Absolight
Differential Revision:	https://reviews.freebsd.org/D3336

33 files changed, 6 insertions, 43 deletions

diff --git a/devel/cl-asdf/bsd.cl-asdf.mk b/devel/cl-asdf/bsd.cl-asdf.mk
index 5af2d0c5f2d2..5f291a9e9293 100644
--- a/devel/cl-asdf/bsd.cl-asdf.mk
+++ b/devel/cl-asdf/bsd.cl-asdf.mk
@@ -8,7 +8,7 @@
 # CL_LIBDIR_REL	- Common Lisp library directory, relative to LOCALBASE or PREFIX
 # ASDF_PATHNAME	- Where to install compiled FASL files (depends on FASL_DIR_REL)
 # ASDF_REGISTRY	- Path to ASDF registry
-# DOCSDIR	- DOCSDIR using UNIQUENAME (to account for optional cl- PKGNAMEPREFIX)
+# DOCSDIR	- DOCSDIR using PKGBASE (to account for optional cl- PKGNAMEPREFIX)
 # EXAMPLESDIR	- Same as above, for EXAMPLESDIR
 # FASL_DIR_REL	- Relative path to compiled FASL files; depends on FASL_TARGET
 # FASL_TARGET	- Platform for building FASL files (currently "sbcl" or "clisp")
@@ -32,8 +32,8 @@ FASL_PATHNAME=	${PREFIX}/${CL_LIBDIR_REL}/${PORTNAME}/${FASL_DIR_REL}
 ASDF_REGISTRY=	${PREFIX}/${CL_LIBDIR_REL}/system-registry
 
 # Include PKGNAMEPREFIX in DOCSDIR and EXAMPLESDIR
-DOCSDIR=	${PREFIX}/share/doc/${UNIQUENAME}
-EXAMPLESDIR=	${PREFIX}/share/examples/${UNIQUENAME}
+DOCSDIR=	${PREFIX}/share/doc/${PKGBASE}
+EXAMPLESDIR=	${PREFIX}/share/examples/${PKGBASE}
 
 .if defined(FASL_TARGET)
 FASL_DIR_REL=	${FASL_TARGET}fasl
diff --git a/devel/glib20-reference/bsd.gnome-reference.mk b/devel/glib20-reference/bsd.gnome-reference.mk
index 6b9a50178ecf..3312475b5cba 100644
--- a/devel/glib20-reference/bsd.gnome-reference.mk
+++ b/devel/glib20-reference/bsd.gnome-reference.mk
@@ -22,9 +22,6 @@ DISTNAME:=	${PORTNAME}-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}
 MASTER_SITE_SUBDIR:=	${MASTER_SITE_SUBDIR}
 .endif
 PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-reference
-.if defined(LATEST_LINK)
-LATEST_LINK:=	${LATEST_LINK}-reference
-.endif
 
 COMMENT=	Programming reference for ${REFERENCE_PORT}
 
diff --git a/devel/insight/Makefile b/devel/insight/Makefile
index 4558797141bd..12671cbe61c4 100644
--- a/devel/insight/Makefile
+++ b/devel/insight/Makefile
@@ -6,8 +6,6 @@ PORTREVISION=	2
 MAINTAINER=	mi@aldan.algebra.com
 COMMENT=	Gnu debugger with the Insight GUI front-end
 
-LATEST_LINK=	insight
-
 MASTERDIR=	${.CURDIR:H}/gdb66
 OPTIONS_SLAVE=	INSIGHT
 CONFLICTS=	gdb-[6-9]*
diff --git a/devel/llvm-cheri/Makefile b/devel/llvm-cheri/Makefile
index 86bb81df383f..5f39dcfc5ed7 100644
--- a/devel/llvm-cheri/Makefile
+++ b/devel/llvm-cheri/Makefile
@@ -15,7 +15,6 @@ COMMAND_PREFIX=	cheri-unknown-freebsd-
 COMMAND_SUFFIX=
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${LLVM_SUFFIX}
 DATADIR=	${PREFIX}/share/${PORTNAME}${LLVM_SUFFIX}
-UNIQUENAME=	${PORTNAME}${LLVM_SUFFIX}
 
 USES=		cmake:outsource compiler:c++11-lib libedit ninja perl5
 USE_LDCONFIG=	${LLVM_PREFIX}/lib
diff --git a/devel/llvm-devel/Makefile b/devel/llvm-devel/Makefile
index 79d38fb78ad8..8add55a06e9e 100644
--- a/devel/llvm-devel/Makefile
+++ b/devel/llvm-devel/Makefile
@@ -14,7 +14,6 @@ LLVM_SUFFIX=	-devel
 LLVM_PREFIX=	${PREFIX}/llvm${LLVM_SUFFIX}
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${LLVM_SUFFIX}
 DATADIR=	${PREFIX}/share/${PORTNAME}${LLVM_SUFFIX}
-UNIQUENAME=	${PORTNAME}${LLVM_SUFFIX}
 
 USES=		cmake:outsource compiler:c++11-lib libedit ninja perl5
 USE_LDCONFIG=	${LLVM_PREFIX}/lib
diff --git a/devel/llvm33/Makefile b/devel/llvm33/Makefile
index 6d205c2bbca8..48c0979cac4d 100644
--- a/devel/llvm33/Makefile
+++ b/devel/llvm33/Makefile
@@ -15,7 +15,6 @@ LLVM_SUFFIX=	${PORTVERSION:S/.//g}
 LLVM_PREFIX=	${PREFIX}/llvm${LLVM_SUFFIX}
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${LLVM_SUFFIX}
 DATADIR=	${PREFIX}/share/${PORTNAME}${LLVM_SUFFIX}
-UNIQUENAME=	${PORTNAME}${LLVM_SUFFIX}
 
 USES=		execinfo gmake perl5
 GNU_CONFIGURE=	yes
diff --git a/devel/llvm34/Makefile b/devel/llvm34/Makefile
index 228db1d83275..c5473b1645c6 100644
--- a/devel/llvm34/Makefile
+++ b/devel/llvm34/Makefile
@@ -15,7 +15,6 @@ LLVM_SUFFIX=	${PORTVERSION:C/([0-9]\.[0-9]).*/\1/:S/.//g:C/r.//}
 LLVM_PREFIX=	${PREFIX}/llvm${LLVM_SUFFIX}
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${LLVM_SUFFIX}
 DATADIR=	${PREFIX}/share/${PORTNAME}${LLVM_SUFFIX}
-UNIQUENAME=	${PORTNAME}${LLVM_SUFFIX}
 
 WRKSRC=		${WRKDIR}/llvm-${PORTVERSION}.src
 
diff --git a/devel/llvm35/Makefile b/devel/llvm35/Makefile
index 0d23e84cb30c..f81baf5c9ce3 100644
--- a/devel/llvm35/Makefile
+++ b/devel/llvm35/Makefile
@@ -15,7 +15,6 @@ LLVM_SUFFIX=	${PORTVERSION:C/([0-9]\.[0-9]).*/\1/:S/.//g:C/r.//}
 LLVM_PREFIX=	${PREFIX}/llvm${LLVM_SUFFIX}
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${LLVM_SUFFIX}
 DATADIR=	${PREFIX}/share/${PORTNAME}${LLVM_SUFFIX}
-UNIQUENAME=	${PORTNAME}${LLVM_SUFFIX}
 
 WRKSRC=		${WRKDIR}/llvm-${DISTVERSION}.src
 
diff --git a/devel/llvm36/Makefile b/devel/llvm36/Makefile
index 1a556bed52cd..3401ed520891 100644
--- a/devel/llvm36/Makefile
+++ b/devel/llvm36/Makefile
@@ -16,7 +16,6 @@ LLVM_RELEASE=	${PORTVERSION:C/([0-9]\.[0-9].[0-9]).*/\1/}
 LLVM_PREFIX=	${PREFIX}/llvm${LLVM_SUFFIX}
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${LLVM_SUFFIX}
 DATADIR=	${PREFIX}/share/${PORTNAME}${LLVM_SUFFIX}
-UNIQUENAME=	${PORTNAME}${LLVM_SUFFIX}
 
 WRKSRC=		${WRKDIR}/llvm-${DISTVERSION}.src
 
diff --git a/devel/llvm37/Makefile b/devel/llvm37/Makefile
index 132a23ba929c..b0b85c6aef2f 100644
--- a/devel/llvm37/Makefile
+++ b/devel/llvm37/Makefile
@@ -20,7 +20,6 @@ LLVM_SUFFIX=	${DISTVERSION:R:S/.//}
 LLVM_PREFIX=	${PREFIX}/llvm${LLVM_SUFFIX}
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${LLVM_SUFFIX}
 DATADIR=	${PREFIX}/share/${PORTNAME}${LLVM_SUFFIX}
-UNIQUENAME=	${PORTNAME}${LLVM_SUFFIX}
 
 USES=		cmake:outsource compiler:c++11-lib libedit ninja perl5 tar:xz
 USE_LDCONFIG=	${LLVM_PREFIX}/lib
diff --git a/devel/ocaml-camlp5/Makefile b/devel/ocaml-camlp5/Makefile
index abe78306ed38..1fda9f816cd3 100644
--- a/devel/ocaml-camlp5/Makefile
+++ b/devel/ocaml-camlp5/Makefile
@@ -8,7 +8,7 @@ MASTER_SITES=	http://camlp5.gforge.inria.fr/distrib/src/ \
 		http://cristal.inria.fr/~ddr/camlp5/distrib/src/ \
 		http://pauillac.inria.fr/~ddr/camlp5/distrib/src/
 PKGNAMEPREFIX=	ocaml-
-DIST_SUBDIR=	${UNIQUENAME}
+DIST_SUBDIR=	${PKGBASE}
 
 PATCH_SITES=	${MASTER_SITES}
 
diff --git a/devel/oniguruma/Makefile b/devel/oniguruma/Makefile
index cfa9e8f4c4d4..dc126082e348 100644
--- a/devel/oniguruma/Makefile
+++ b/devel/oniguruma/Makefile
@@ -15,7 +15,6 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	BSDL Regular Expressions library compatible with POSIX/GNU/Perl
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
-NO_LATEST_LINK=	yes
 CONFLICTS_INSTALL=	oniguruma-4.*
 GNU_CONFIGURE=	yes
 DOCS=		HISTORY README doc/*
diff --git a/devel/oniguruma4/Makefile b/devel/oniguruma4/Makefile
index 87956c2a13d5..29ef741c15f1 100644
--- a/devel/oniguruma4/Makefile
+++ b/devel/oniguruma4/Makefile
@@ -15,7 +15,6 @@ COMMENT=	BSDL Regular Expressions library compatible with POSIX/GNU/Perl
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-NO_LATEST_LINK=	yes
 USES=		libtool
 CONFLICTS=	oniguruma-2.*
 GNU_CONFIGURE=	yes
diff --git a/devel/php-memoize/Makefile b/devel/php-memoize/Makefile
index e035775d00f7..a34e7431a48c 100644
--- a/devel/php-memoize/Makefile
+++ b/devel/php-memoize/Makefile
@@ -1,19 +1,17 @@
 # Created by: Gasol Wu <gasol.wu@gmail.com>
 # $FreeBSD$
 
-PORTNAME=	memoize
+PORTNAME=	php-memoize
 PORTVERSION=	0.2.0b1
 DISTVERSIONPREFIX=	v
 PORTREVISION=	2
 CATEGORIES=	devel
-PKGNAMEPREFIX=	php-
 
 MAINTAINER=	gasol.wu@gmail.com
 COMMENT=	PHP extension which transparently caches PHP functions
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	arraypad
-GH_PROJECT=	${UNIQUENAME}
 
 USE_PHP=	yes
 USE_PHPEXT=	yes
diff --git a/devel/py-funcparserlib/Makefile b/devel/py-funcparserlib/Makefile
index 0caa5c50f30e..f947752a814c 100644
--- a/devel/py-funcparserlib/Makefile
+++ b/devel/py-funcparserlib/Makefile
@@ -17,7 +17,7 @@ USES=		python
 USE_PYTHON=	distutils autoplist
 
 PORTDOCS=	README doc
-DOCSDIR=	${PREFIX}/share/doc/${UNIQUENAME}
+DOCSDIR=	${PREFIX}/share/doc/${PKGBASE}
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/devel/py-gdata/Makefile b/devel/py-gdata/Makefile
index cf3f0c3f8471..c583120ec190 100644
--- a/devel/py-gdata/Makefile
+++ b/devel/py-gdata/Makefile
@@ -23,8 +23,6 @@ GMPY_DESC=	Multiprecision arithmetic
 M2CRYPTO_DESC=	Cryptography and SSL toolkit
 PYCRYPTO_DESC=	Cryptography toolkit
 
-OPTIONSFILE?=	${PORT_DBDIR}/py-${PORTNAME}/options
-
 EXAMPLESDIR=	${PREFIX}/share/examples/py-${PORTNAME}
 
 .include <bsd.port.options.mk>
diff --git a/devel/py-ice/Makefile b/devel/py-ice/Makefile
index a36e430feb1a..331bb1dd4593 100644
--- a/devel/py-ice/Makefile
+++ b/devel/py-ice/Makefile
@@ -30,7 +30,6 @@ LIB_VRS=	${PORTVERSION:S|.||g:C|[0-9]$||}
 PLIST_SUB=	LIB_VERSION="${PORTVERSION}" LIB_VRS="${LIB_VRS}"
 
 # bypass infrastructure bug (taken from www/py-django)
-OPTIONSFILE=	${PORT_DBDIR}/py-${PORTNAME}/options
 OPTIONS_DEFINE=	DEBUG TESTS
 OPTIONS_DEFAULT=TESTS
 TESTS_DESC=	Run tests
diff --git a/devel/py-jsonrpclib/Makefile b/devel/py-jsonrpclib/Makefile
index 3b617a64c763..cd761a48046c 100644
--- a/devel/py-jsonrpclib/Makefile
+++ b/devel/py-jsonrpclib/Makefile
@@ -16,7 +16,6 @@ LICENSE=	APACHE20
 USES=		python:2
 USE_PYTHON=	distutils autoplist
 
-OPTIONSFILE=	${PORT_DBDIR}/${PORTNAME}/options
 OPTIONS_DEFINE=	CJSON
 CJSON_DESC=	Use cjson instead of json or simplejson
 
diff --git a/devel/py-memoryprofiler/Makefile b/devel/py-memoryprofiler/Makefile
index 24cc034b72cf..078dfb5cc06e 100644
--- a/devel/py-memoryprofiler/Makefile
+++ b/devel/py-memoryprofiler/Makefile
@@ -17,8 +17,6 @@ OPTIONS_DEFINE=	PSUTIL
 PSUTIL_DESC=	Use psutil for better performance
 PSUTIL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psutil>1.0.0:${PORTSDIR}/sysutils/py-psutil
 
-OPTIONSFILE?=	${PORT_DBDIR}/py-${PORTNAME}/options
-
 USES=		python
 USE_PYTHON=	distutils autoplist
 
diff --git a/devel/py-qt4-qscintilla2/Makefile b/devel/py-qt4-qscintilla2/Makefile
index 664d83c8e0c7..94c655d39e6d 100644
--- a/devel/py-qt4-qscintilla2/Makefile
+++ b/devel/py-qt4-qscintilla2/Makefile
@@ -28,7 +28,6 @@ QT_NONSTANDARD=	yes  # Do not add unknown arguments to CONFIGURE_ARGS.
 OPTIONS_DEFINE=		DEBUG
 DEBUG_CONFIGURE_ON=	--debug --trace
 
-OPTIONSFILE?=	${PORT_DBDIR}/py-qt4-${PORTNAME}/options
 SIPDIR=		${PREFIX}/share/py-sip
 QSCIDIR=	${PREFIX}/share/qt4/qsci
 CONFIGURE_ARGS=	--pyqt PyQt4 -d ${PYTHONPREFIX_SITELIBDIR}/PyQt4 -v ${SIPDIR} \
diff --git a/devel/py-qt4/bsd.pyqt.mk b/devel/py-qt4/bsd.pyqt.mk
index 259ac4381a26..bc3e7ddcfd4b 100644
--- a/devel/py-qt4/bsd.pyqt.mk
+++ b/devel/py-qt4/bsd.pyqt.mk
@@ -98,7 +98,6 @@ USES+=		python
 QT_NONSTANDARD=	yes  # Do not add unknown arguments to CONFIGURE_ARGS.
 
 PATCHDIR=	${.CURDIR}/../../devel/py-qt4-core/files
-OPTIONSFILE?=	${PORT_DBDIR}/py-qt4-${PORTNAME}/options
 SIPDIR=		${PREFIX}/share/py-sip
 QSCIDIR=	${PREFIX}/share/qt4/qsci
 CONFIGURE_ARGS+=-b ${PREFIX}/bin \
diff --git a/devel/py-rauth/Makefile b/devel/py-rauth/Makefile
index c8361c71b984..ee28723db2df 100644
--- a/devel/py-rauth/Makefile
+++ b/devel/py-rauth/Makefile
@@ -20,7 +20,6 @@ TEST_DEPENDS:=	${RUN_DEPENDS} \
 
 OPTIONS_DEFINE=	TESTS
 TESTS_DESC=	Install tools for unit testing
-OPTIONSFILE?=	${PORT_DBDIR}/py-${PORTNAME}/options
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	litl
diff --git a/devel/py-tables/Makefile b/devel/py-tables/Makefile
index 277bf511752d..327df88fcdb1 100644
--- a/devel/py-tables/Makefile
+++ b/devel/py-tables/Makefile
@@ -30,7 +30,6 @@ PLIST_FILES=	bin/pt2to3 bin/ptdump bin/ptrepack bin/pttree
 OPTIONS_DEFINE=		PYREX DOCS EXAMPLES
 PYREX_DESC=		Use code generated by Pyrex to build
 PYREX_BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/Pyrex/__init__.py:${PORTSDIR}/devel/pyrex
-OPTIONSFILE=		${PORT_DBDIR}/py-${PORTNAME}/options
 
 .include <bsd.port.options.mk>
 
diff --git a/devel/py-twisted/Makefile b/devel/py-twisted/Makefile
index 87596e221b8e..77951e5c737b 100644
--- a/devel/py-twisted/Makefile
+++ b/devel/py-twisted/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}twistedCore>=${PORTVERSION}:${PORTSDIR}/deve
 USES=		metaport python:2
 
 # Bypass infrastructure bug
-OPTIONSFILE=	${PORT_DBDIR}/py-${PORTNAME}/options
 OPTIONS_DEFINE=	CONCH LORE MAIL NAMES NEWS PAIR RUNNER WEB WORDS
 OPTIONS_DEFAULT=CONCH LORE MAIL NAMES NEWS PAIR RUNNER WEB WORDS
 CONCH_DESC=	SSH and SFTP protocol
diff --git a/devel/py-urwid/Makefile b/devel/py-urwid/Makefile
index 2bcda12b66d3..1caaad0e8ca5 100644
--- a/devel/py-urwid/Makefile
+++ b/devel/py-urwid/Makefile
@@ -12,8 +12,6 @@ COMMENT=	Curses-based user interface library for Python
 
 LICENSE=	LGPL21
 
-# Bypass ports infrastructure bug
-OPTIONSFILE=	${PORT_DBDIR}/py-${PORTNAME}/options
 OPTIONS_DEFINE=	EXAMPLES
 
 USES=		python
diff --git a/devel/py-watchdog/Makefile b/devel/py-watchdog/Makefile
index 1850cedd2f6f..40aeb476eed7 100644
--- a/devel/py-watchdog/Makefile
+++ b/devel/py-watchdog/Makefile
@@ -22,7 +22,6 @@ DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
 
 GH_ACCOUNT=	gorakhargosh
 
-OPTIONSFILE=	${PORT_DBDIR}/py-${PORTNAME}/options
 OPTIONS_DEFINE=	DOCS
 
 PORTDOCS=	*
diff --git a/devel/py-wheel/Makefile b/devel/py-wheel/Makefile
index ab2452d226ec..5eed7f8e6e3a 100644
--- a/devel/py-wheel/Makefile
+++ b/devel/py-wheel/Makefile
@@ -14,7 +14,6 @@ COMMENT=	Built-package format for Python
 LICENSE=	MIT
 
 OPTIONS_DEFINE=	PIP SIGNATURE
-OPTIONSFILE=	${PORT_DBDIR}/py-${PORTNAME}/options
 
 PIP_DESC=	Use pip to install wheels
 PIP_RUN_DEPENDS=	pip:${PORTSDIR}/devel/py-pip
diff --git a/devel/ruby-langscan/Makefile b/devel/ruby-langscan/Makefile
index 085fb203633e..425dc9c8f4e9 100644
--- a/devel/ruby-langscan/Makefile
+++ b/devel/ruby-langscan/Makefile
@@ -30,7 +30,6 @@ PORTDOCS=	ChangeLog NEWS README
 DOCSDIR=	${RUBY_MODDOCDIR}
 
 OPTIONS_DEFINE=	DOCS
-OPTIONSFILE=	${PORT_DBDIR}/ruby-${PORTNAME}/options
 
 CFLAGS+=	-fPIC
 
diff --git a/devel/rubygem-app_config/Makefile b/devel/rubygem-app_config/Makefile
index 24e174639a0c..454a62fb50de 100644
--- a/devel/rubygem-app_config/Makefile
+++ b/devel/rubygem-app_config/Makefile
@@ -15,7 +15,6 @@ OPTIONS_DEFAULT=	SQLITE3
 
 MONGO_DESC=	mongo backend support
 SQLITE3_DESC=	sqlite3 backend support
-OPTIONSFILE=	${PORT_DBDIR}/rubygem-${PORTNAME}/options
 
 .include <bsd.port.options.mk>
 
diff --git a/devel/subcommander2/Makefile b/devel/subcommander2/Makefile
index 6702d84baa18..6b3676c28dd4 100644
--- a/devel/subcommander2/Makefile
+++ b/devel/subcommander2/Makefile
@@ -16,7 +16,6 @@ LICENSE=	GPLv2
 LIB_DEPENDS=	libboost_thread.so:${PORTSDIR}/devel/boost-libs \
 		libsvn_client-1.so:${PORTSDIR}/devel/subversion
 
-LATEST_LINK=	subcommander2
 CONFLICTS=	subcommander-1.*
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R:S,.b,b,}p${PORTVERSION:E}
diff --git a/devel/subversion-static/Makefile b/devel/subversion-static/Makefile
index 9250f442f307..891b799cbea1 100644
--- a/devel/subversion-static/Makefile
+++ b/devel/subversion-static/Makefile
@@ -3,7 +3,6 @@
 PKGNAMESUFFIX=	-static
 
 CONFLICTS_INSTALL=	${PORTNAME}-[0-9]*
-LATEST_LINK=		${PORTNAME}${PKGNAMESUFFIX}
 
 OPTIONS_EXCLUDE=	${OPTIONS_DEFINE}
 OPTIONS_SLAVE=		FREEBSD_TEMPLATE P4_STYLE_MARKERS SERF STATIC
diff --git a/devel/subversion/Makefile.common b/devel/subversion/Makefile.common
index 4fc34b3861ad..648b980e4352 100644
--- a/devel/subversion/Makefile.common
+++ b/devel/subversion/Makefile.common
@@ -28,7 +28,6 @@ CONFIGURE_ARGS+=	--without-swig \
 .if defined(SVN_BUILD_ADDONS)
 CONFLICTS_BUILD+=	${PORTNAME}-1.[^8].[0-9]*
 LIB_DEPENDS+=		libsvn_client-1.so:${PORTSDIR}/devel/subversion
-OPTIONSFILE=		${PORT_DBDIR}/subversion/options
 OPTIONS_NAME=		devel_subversion
 .endif
 
diff --git a/devel/subversion17/Makefile.common b/devel/subversion17/Makefile.common
index 829b582ed302..7de904f74ce5 100644
--- a/devel/subversion17/Makefile.common
+++ b/devel/subversion17/Makefile.common
@@ -31,7 +31,6 @@ CONFIGURE_ARGS+=	--without-swig \
 .if defined(SVN_BUILD_BINDINGS)
 CONFLICTS_BUILD+=	${PORTNAME}-1.[^7].[0-9]*
 LIB_DEPENDS+=		libsvn_client-1.so:${PORTSDIR}/devel/subversion17
-OPTIONSFILE=		${PORT_DBDIR}/${PORTNAME}/options
 OPTIONS_NAME=		devel_subversion17
 .endif