37 files changed, 35 insertions, 75 deletions

diff --git a/www/apache22-event-mpm/Makefile b/www/apache22-event-mpm/Makefile
index f091cf4d6366..0ccb8df31aec 100644
--- a/www/apache22-event-mpm/Makefile
+++ b/www/apache22-event-mpm/Makefile
@@ -6,7 +6,6 @@ MAINTAINER=		apache@FreeBSD.org
 
 WITH_MPM=		event
 
-LATEST_LINK=		apache22-${WITH_MPM}-mpm
 DESCR=			${.CURDIR}/pkg-descr
 
 PORT_OPTIONS+=		CGID
diff --git a/www/apache22-itk-mpm/Makefile b/www/apache22-itk-mpm/Makefile
index eabd2c01ffae..baf840347f6e 100644
--- a/www/apache22-itk-mpm/Makefile
+++ b/www/apache22-itk-mpm/Makefile
@@ -18,7 +18,6 @@ MAINTAINER=		apache@FreeBSD.org
 
 WITH_MPM=		itk
 
-LATEST_LINK=		apache22-${WITH_MPM}-mpm
 DESCR=			${.CURDIR}/pkg-descr
 
 MPM_ITK_VERSION?=	20110321-01
diff --git a/www/apache22-peruser-mpm/Makefile b/www/apache22-peruser-mpm/Makefile
index 61ec2e00c4e5..704fe5cd538d 100644
--- a/www/apache22-peruser-mpm/Makefile
+++ b/www/apache22-peruser-mpm/Makefile
@@ -11,7 +11,6 @@ MAINTAINER=		ports@FreeBSD.org
 
 WITH_MPM=		peruser
 
-LATEST_LINK=		apache22-${WITH_MPM}-mpm
 DESCR=			${.CURDIR}/pkg-descr
 
 EXTRA_PATCHES+=		${.CURDIR}/files/httpd-2.2.3-peruser-0.3.0.patch
diff --git a/www/apache22-worker-mpm/Makefile b/www/apache22-worker-mpm/Makefile
index 77792c19c23b..05f5c773af72 100644
--- a/www/apache22-worker-mpm/Makefile
+++ b/www/apache22-worker-mpm/Makefile
@@ -6,7 +6,6 @@ MAINTAINER=		apache@FreeBSD.org
 
 WITH_MPM=		worker
 
-LATEST_LINK=		apache22-${WITH_MPM}-mpm
 DESCR=			${.CURDIR}/pkg-descr
 
 PORT_OPTIONS+=		CGID
diff --git a/www/apache22/Makefile.modules b/www/apache22/Makefile.modules
index 209956a263e6..38c58ba36712 100644
--- a/www/apache22/Makefile.modules
+++ b/www/apache22/Makefile.modules
@@ -9,7 +9,7 @@
 # Maintainer note for OPTION handling:
 # To set additional option use
 #    PORT_OPTIONS+=
-# To unset an OPTION, even the OPTION is set in OPTIONSFILE use
+# To unset an OPTION, even the OPTION is set in OPTIONS_FILE use
 #    WITHOUT_MODULES+=
 #  Using OPTIONS_EXCLUDE and OPTIONS_OVERRIDE do not work as expected
 #  if the OPTION is enabled by the user, therefore we calculate
diff --git a/www/apache24/Makefile.modules b/www/apache24/Makefile.modules
index d6a7484618a9..051ffd6e4e37 100644
--- a/www/apache24/Makefile.modules
+++ b/www/apache24/Makefile.modules
@@ -9,7 +9,7 @@
 # Maintainer note for OPTION handling:
 # To set additional option use
 #    PORT_OPTIONS+=
-# To unset an OPTION, even the OPTION is set in OPTIONSFILE use
+# To unset an OPTION, even the OPTION is set in OPTIONS_FILE use
 #    WITHOUT_MODULES+=
 #  Using OPTIONS_EXCLUDE and OPTIONS_OVERRIDE do not work as expected
 #  if the OPTION is enabled by the user, therefore we calculate
diff --git a/www/autoindex2/Makefile b/www/autoindex2/Makefile
index 01295171945e..bf49a61e3fc9 100644
--- a/www/autoindex2/Makefile
+++ b/www/autoindex2/Makefile
@@ -16,7 +16,6 @@ USES=		dos2unix
 USE_PHP=	session
 DEFAULT_VERSIONS+=	php=5
 CONFLICTS=	AutoIndex-1*
-LATEST_LINK=	AutoIndex2
 NO_BUILD=	yes
 
 INSTALLDIR?=	${WWWDIR}
diff --git a/www/cocoon/Makefile b/www/cocoon/Makefile
index cd1e22265c88..86072257145d 100644
--- a/www/cocoon/Makefile
+++ b/www/cocoon/Makefile
@@ -19,7 +19,6 @@ MAKE_ENV=	JAVA_HOME=${JAVA_HOME}
 WRKSRC=		${WRKDIR}/${PDISTNAME}
 APP_NAME?=	${PORTNAME}
 APP_HOME?=	${PREFIX}/${APP_NAME}
-LATEST_LINK=	${APP_NAME}
 PLIST=		${WRKDIR}/pkg-plist
 PDISTNAME=	${PORTNAME}-${PORTVERSION}
 PKGMESSAGE=	${WRKDIR}/pkg-message
diff --git a/www/dillo2/Makefile b/www/dillo2/Makefile
index e7dc9b9dc491..9d35fe698949 100644
--- a/www/dillo2/Makefile
+++ b/www/dillo2/Makefile
@@ -23,7 +23,6 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--libdir=${PREFIX}/libexec
 CONFLICTS=	dillo-i18n-[0-9]* \
 		dillo-0*
-LATEST_LINK=	dillo2
 
 OPTIONS_DEFINE=		COOKIES HYPHENATION IPV6 SSL THREADS DOCS
 OPTIONS_DEFAULT=	COOKIES HYPHENATION IPV6 SSL THREADS
diff --git a/www/free-sa-devel/Makefile b/www/free-sa-devel/Makefile
index 23aa839372d6..9bb34d7d480f 100644
--- a/www/free-sa-devel/Makefile
+++ b/www/free-sa-devel/Makefile
@@ -14,7 +14,6 @@ COMMENT=	Statistic analyzer for daemons log files similar to SARG
 LICENSE=	GPLv3
 
 CONFLICTS=	free-sa-[0-9]*
-LATEST_LINK=	free-sa-devel
 
 WWWDIR?=	${PREFIX}/www/${PORTNAME}
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${DISTVERSION}
diff --git a/www/gaeutilities/Makefile b/www/gaeutilities/Makefile
index 5788bf528bb9..ff720ac4623e 100644
--- a/www/gaeutilities/Makefile
+++ b/www/gaeutilities/Makefile
@@ -17,7 +17,6 @@ USES=		python:2 # same as www/google-appengine
 
 WRKSRC=	${WRKDIR}/joerussbowman-gaeutilities-ea3f7e1
 
-OPTIONSFILE=	${PORT_DBDIR}/py-${PORTNAME}/options
 OPTIONS_DEFINE=	DOCS
 
 do-build:
diff --git a/www/geronimo/Makefile b/www/geronimo/Makefile
index 5404117b5a9b..600bb3dece39 100644
--- a/www/geronimo/Makefile
+++ b/www/geronimo/Makefile
@@ -50,7 +50,6 @@ PID_FILE=	/var/run/${APP_SHORTNAME}.pid
 WRKDIR?=	${WRKDIRPREFIX}${.CURDIR}/work
 WRKSRC=		${WRKDIR}/${DISTNAME:S/-bin//}
 JAR_FILE=	bin/server.jar
-LATEST_LINK=	${APP_SHORTNAME}
 PLIST_FILES=	"@(${GERONIMO_USER},${GERONIMO_GROUP},) ${GERONIMO_OUT:S,^${PREFIX}/,,}"
 
 SUB_LIST=	GERONIMO_HOME=${APP_HOME} \
diff --git a/www/linux-opera/Makefile b/www/linux-opera/Makefile
index 6950c22a5461..ae2cf8c26bbe 100644
--- a/www/linux-opera/Makefile
+++ b/www/linux-opera/Makefile
@@ -31,8 +31,8 @@ NO_BUILD=	yes
 
 OPERA_VER?=	12.16
 OPERA_BUILD?=	1860
-DATADIR=	${PREFIX}/share/${UNIQUENAME}
-DOCSDIR=	${PREFIX}/share/doc/${UNIQUENAME}
+DATADIR=	${PREFIX}/share/${PKGBASE}
+DOCSDIR=	${PREFIX}/share/doc/${PKGBASE}
 
 RENAME=		opera lib/opera \
 		share/applications/opera-browser.desktop \
@@ -44,63 +44,63 @@ post-extract:
 	@${MV} ${WRKSRC}/share/man ${WRKSRC}/man
 	@for _r in ${RENAME}; do \
 		linux=`${ECHO_CMD} $${_r} | \
-		       ${SED} -e 's|opera|${UNIQUENAME}|g'`; \
+		       ${SED} -e 's|opera|${PKGBASE}|g'`; \
 		${MV} ${WRKSRC}/$${_r} ${WRKSRC}/$${linux}; \
 	done; \
 	for _f in `find ${WRKSRC}/share/icons -type f | \
 		   ${SED} -e 's|${WRKSRC}/||g'`; do \
 		linux=`${ECHO_CMD} $${_f} | \
-		       ${SED} -e 's|opera|${UNIQUENAME}|g'`; \
+		       ${SED} -e 's|opera|${PKGBASE}|g'`; \
 		${MV} ${WRKSRC}/$${_f} ${WRKSRC}/$${linux}; \
 	done; \
 	for _l in `find ${WRKSRC}/share/icons -name opera-widget.png | \
 		   ${SED} -e 's|/opera-widget\.png||g'`; do \
 		${RM} $${_l}/opera-widget.png; \
 		cd $${_l}; \
-		${LN} -s ../mimetypes/${UNIQUENAME}-widget.png \
-			$${_l}/${UNIQUENAME}-widget.png; \
+		${LN} -s ../mimetypes/${PKGBASE}-widget.png \
+			$${_l}/${PKGBASE}-widget.png; \
 	done
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g ; \
 		s|%%LOCALBASE%%|${LOCALBASE}|g ; \
 		s|%%LINUXBASE%%|${LINUXBASE}|g' \
-			${WRKSRC}/share/${UNIQUENAME}/defaults/pluginpath.ini
-	@${REINPLACE_CMD} -e '/man1/s|opera|${UNIQUENAME}|g ; \
+			${WRKSRC}/share/${PKGBASE}/defaults/pluginpath.ini
+	@${REINPLACE_CMD} -e '/man1/s|opera|${PKGBASE}|g ; \
 		/man1/s|1.gz|1|g ; /man1/s|share/||g ; \
-		s|bin/opera|bin/${UNIQUENAME}|g ; \
+		s|bin/opera|bin/${PKGBASE}|g ; \
 		s|name=$$(uname -s)|name=Linux|g ; \
-		s|lib/opera|lib/${UNIQUENAME}|g ; \
-		s|applications/opera|applications/${UNIQUENAME}|g ; \
-		s|doc/opera|doc/${UNIQUENAME}|g ; \
-		/hicolor/s|/opera|/${UNIQUENAME}|g ; \
-		s|packages/opera|packages/${UNIQUENAME}|g ; \
-		s|share/opera|share/${UNIQUENAME}|g ; \
+		s|lib/opera|lib/${PKGBASE}|g ; \
+		s|applications/opera|applications/${PKGBASE}|g ; \
+		s|doc/opera|doc/${PKGBASE}|g ; \
+		/hicolor/s|/opera|/${PKGBASE}|g ; \
+		s|packages/opera|packages/${PKGBASE}|g ; \
+		s|share/opera|share/${PKGBASE}|g ; \
 		s|PREFIX=/usr/local|PREFIX=${PREFIX}|g ; \
-		/OPERA_PERSONALDIR/s|.opera|.${UNIQUENAME}|g ; \
-		s|opera)|${UNIQUENAME})|g ; \
-		s|opera-widget-manager)|${UNIQUENAME}-widget-manager)|g ; \
+		/OPERA_PERSONALDIR/s|.opera|.${PKGBASE}|g ; \
+		s|opera)|${PKGBASE})|g ; \
+		s|opera-widget-manager)|${PKGBASE}-widget-manager)|g ; \
 		s|^.*rmdir.*mime/packages.*||g ; \
 		s|^.*GX - bin/uninstall-opera@.*||g ; \
 		s|[$$]tempdir/damaged|${WRKSRC}/damaged|g ; \
 		s|PREFIX/bin/uninstall-opera|PREFIX/bin/disabled-opera|g' \
 			${WRKSRC}/install
 	@${REINPLACE_CMD} -e '/^Name/s|$$| (Linux version)|g ; \
-		/Exec/s|opera|${UNIQUENAME}|g ; \
-		/Icon/s|opera|${UNIQUENAME}|g ; \
-		/StartupWMClass/s|opera|${UNIQUENAME}|g ; \
+		/Exec/s|opera|${PKGBASE}|g ; \
+		/Icon/s|opera|${PKGBASE}|g ; \
+		/StartupWMClass/s|opera|${PKGBASE}|g ; \
 		s|TryExec=.*||g ; /^$$/d' \
 			${WRKSRC}/share/applications/*.desktop
-	@${REINPLACE_CMD} -e 's|lib/opera|lib/${UNIQUENAME}|g ; \
-		s|doc/opera|doc/${UNIQUENAME}|g ; \
-		s|share/opera|share/${UNIQUENAME}|g ; \
-		s|opera-widget-manager|${UNIQUENAME}-widget-manager|g ; \
-		s|opera (1)|${UNIQUENAME} (1)|g ; \
-		s|\.opera@@|\.${UNIQUENAME}@@|g ; \
-		s|B opera@@|B ${UNIQUENAME}@@|g ; \
-		/standards-compliant/s|opera|${UNIQUENAME}|g' \
+	@${REINPLACE_CMD} -e 's|lib/opera|lib/${PKGBASE}|g ; \
+		s|doc/opera|doc/${PKGBASE}|g ; \
+		s|share/opera|share/${PKGBASE}|g ; \
+		s|opera-widget-manager|${PKGBASE}-widget-manager|g ; \
+		s|opera (1)|${PKGBASE} (1)|g ; \
+		s|\.opera@@|\.${PKGBASE}@@|g ; \
+		s|B opera@@|B ${PKGBASE}@@|g ; \
+		/standards-compliant/s|opera|${PKGBASE}|g' \
 			${WRKSRC}/man/man1/*.1
-	@${REINPLACE_CMD} -e '/<generic-icon/s|opera|${UNIQUENAME}|g' \
+	@${REINPLACE_CMD} -e '/<generic-icon/s|opera|${PKGBASE}|g' \
 			${WRKSRC}/share/mime/packages/*.xml
 	@${FIND} ${WRKSRC} -name '*.orig' -delete
 	@${FIND} ${WRKSRC} -name '*.bak' -delete
diff --git a/www/mod_auth_kerb2/Makefile b/www/mod_auth_kerb2/Makefile
index 9df643b12f07..5f832654acab 100644
--- a/www/mod_auth_kerb2/Makefile
+++ b/www/mod_auth_kerb2/Makefile
@@ -17,7 +17,6 @@ LICENSE_COMB=	multi
 LICENSE_FILE_MIT=	${WRKSRC}/LICENSE
 LICENSE_FILE_BSD3CLAUSE=	${WRKSRC}/LICENSE
 
-LATEST_LINK=	mod_auth_kerb2
 PORTSCOUT=	limit:^5.4
 
 USE_APACHE=	22+
diff --git a/www/mod_extract_forwarded/Makefile b/www/mod_extract_forwarded/Makefile
index 13058aaf5310..fd678d77637d 100644
--- a/www/mod_extract_forwarded/Makefile
+++ b/www/mod_extract_forwarded/Makefile
@@ -23,10 +23,6 @@ PATCH_STRIP=	-p1
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 
-# Workaround for UNIQUENAME v.s. OptionsNG problem.
-#   http://lists.freebsd.org/pipermail/freebsd-ports/2012-June/075466.html
-UNIQUENAME=	ap22-${PORTNAME}
-
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MYOSHFUJI}
diff --git a/www/mod_layout22/Makefile b/www/mod_layout22/Makefile
index 7d86f83147a2..8cb2bfd86e24 100644
--- a/www/mod_layout22/Makefile
+++ b/www/mod_layout22/Makefile
@@ -16,7 +16,6 @@ CONFLICTS=	mod_layout-3.* mod_layout-4.*
 PORTSCOUT=	limit:^5
 
 USE_APACHE=	22
-LATEST_LINK=	mod_layout22
 
 MAKE_ARGS+=	builddir=${WRKSRC}
 
diff --git a/www/mod_macro22/Makefile b/www/mod_macro22/Makefile
index cd0f197df34c..96306788ebb3 100644
--- a/www/mod_macro22/Makefile
+++ b/www/mod_macro22/Makefile
@@ -19,7 +19,6 @@ OPTIONS_DEFINE=	DOCS
 .include <bsd.port.options.mk>
 
 USE_APACHE=	22
-LATEST_LINK=	mod_macro22
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 PORTDOCS=	${PORTNAME}.html
diff --git a/www/mod_myvhost/Makefile b/www/mod_myvhost/Makefile
index 8b9a02da7de0..f2418cd9cf00 100644
--- a/www/mod_myvhost/Makefile
+++ b/www/mod_myvhost/Makefile
@@ -15,7 +15,6 @@ LICENSE=	APACHE20
 MANUAL_PACKAGE_BUILD=	needs apr and apache with DBD options enabled
 
 USE_APACHE=	22+
-UNIQUENAME=	${PORTNAME}
 
 PORTDOCS=	changelog.html documentation.html download.html \
 		index.html my.css
diff --git a/www/mod_security/Makefile b/www/mod_security/Makefile
index 6928266b3461..c21c436d0095 100644
--- a/www/mod_security/Makefile
+++ b/www/mod_security/Makefile
@@ -58,9 +58,6 @@ FUZZYHASH_LIB_DEPENDS=	libfuzzy.so:${PORTSDIR}/security/ssdeep
 
 ETCDIR=		${PREFIX}/etc/modsecurity
 
-# ap2x- prefix OPTIONSFILE fix
-OPTIONSFILE=	${PORT_DBDIR}/www_mod_security/options
-
 REINPLACE_ARGS=	-i ""
 AP_EXTRAS+=	-DWITH_LIBXML2
 CONFIGURE_ARGS+=--with-apxs=${APXS} --with-pcre=${LOCALBASE} --with-yajl=${LOCALBASE} --with-curl=${LOCALBASE}
diff --git a/www/p5-Apache-Clean2/Makefile b/www/p5-Apache-Clean2/Makefile
index fefc9ec01328..6cfc2c1cada9 100644
--- a/www/p5-Apache-Clean2/Makefile
+++ b/www/p5-Apache-Clean2/Makefile
@@ -16,8 +16,6 @@ BUILD_DEPENDS=	${APACHE_PKGNAMEPREFIX}mod_perl2>=0:${PORTSDIR}/www/mod_perl2 \
 		p5-HTML-Clean>=0.8:${PORTSDIR}/www/p5-HTML-Clean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-LATEST_LINK=	${PKGNAMEPREFIX}${PORTNAME}2
-
 USES=		perl5
 USE_PERL5=	configure
 USE_APACHE=	22+
diff --git a/www/pear-HTTP_FloodControl/Makefile b/www/pear-HTTP_FloodControl/Makefile
index e5142a200a1c..3fae48adbf5d 100644
--- a/www/pear-HTTP_FloodControl/Makefile
+++ b/www/pear-HTTP_FloodControl/Makefile
@@ -11,7 +11,6 @@ COMMENT=	PEAR classes to detect and protect from attempts to flood a site
 BUILD_DEPENDS=	${PEARDIR}/HTTP.php:${PORTSDIR}/www/pear-HTTP
 RUN_DEPENDS=	${PEARDIR}/HTTP.php:${PORTSDIR}/www/pear-HTTP
 
-LATEST_LINK=	pear-HTTP_FloodControl
 DOCS=		README LICENSE
 OPTIONS_DEFINE=	PEAR_DB PEAR_MDB PEAR_MDB2
 PEAR_DB_DESC=	PEAR::DB support
diff --git a/www/pelican/Makefile b/www/pelican/Makefile
index b8a15d074fed..4b78cbc87fc0 100644
--- a/www/pelican/Makefile
+++ b/www/pelican/Makefile
@@ -26,7 +26,6 @@ TEST_DEPENDS:=	${RUN_DEPENDS} \
 		${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock \
 
 OPTIONS_DEFINE=	TEST
-OPTIONSFILE?=	${PORT_DBDIR}/py-${PORTNAME}/options
 
 .include <bsd.port.options.mk>
 
diff --git a/www/py-cssselect/Makefile b/www/py-cssselect/Makefile
index eb0f372192ef..f8185a8227c0 100644
--- a/www/py-cssselect/Makefile
+++ b/www/py-cssselect/Makefile
@@ -14,7 +14,6 @@ COMMENT=	Cssselect parses CSS3 Selectors and translates them to XPath 1.0
 LICENSE=	BSD3CLAUSE
 
 OPTIONS_DEFINE=	DOCS
-OPTIONSFILE=	${PORT_DBDIR}/py-${PORTNAME}/options
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/www/py-cssutils/Makefile b/www/py-cssutils/Makefile
index a394b92d66c6..bbbee752ec66 100644
--- a/www/py-cssutils/Makefile
+++ b/www/py-cssutils/Makefile
@@ -15,7 +15,6 @@ COMMENT=	CSS Cascading Style Sheets library for Python
 LICENSE=	LGPL3
 
 OPTIONS_DEFINE=	EXAMPLES
-OPTIONSFILE=	${PORT_DBDIR}/py-${PORTNAME}/options
 
 USE_PYTHON=	autoplist distutils
 USES=		python zip
diff --git a/www/py-django-cms/Makefile b/www/py-django-cms/Makefile
index d2232cae39ad..b6f850dd8da0 100644
--- a/www/py-django-cms/Makefile
+++ b/www/py-django-cms/Makefile
@@ -23,7 +23,6 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}south>=0.7.3:${PORTSDIR}/databases/py-south
 USES=		python:2
 USE_PYTHON=	autoplist distutils
 
-OPTIONSFILE=	${PORT_DBDIR}/${PORTNAME}/options
 OPTIONS_MULTI=	DATABASE
 OPTIONS_DEFAULT=SQLITE
 OPTIONS_MULTI_DATABASE=MYSQL PGSQL SQLITE
diff --git a/www/py-django-photologue/Makefile b/www/py-django-photologue/Makefile
index 98ef62853af2..93b25743be28 100644
--- a/www/py-django-photologue/Makefile
+++ b/www/py-django-photologue/Makefile
@@ -19,7 +19,6 @@ RUN_DEPENDS=	${PYTHON_SITELIBDIR}/django/bin/django-admin.py:${PORTSDIR}/www/py-
 USES=		python zip
 USE_PYTHON=	autoplist distutils
 
-OPTIONSFILE=		${PORT_DBDIR}/py-${PORTNAME}/options
 OPTIONS_DEFINE=		TAGGING
 OPTIONS_DEFAULT=	TAGGING
 
diff --git a/www/py-qp/Makefile b/www/py-qp/Makefile
index 7ef58d9ed5ce..6f1d73cf5fa3 100644
--- a/www/py-qp/Makefile
+++ b/www/py-qp/Makefile
@@ -17,7 +17,6 @@ BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}durus>=0:${PORTSDIR}/devel/py-durus \
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
-OPTIONSFILE=	${PORT_DBDIR}/py-${PORTNAME}/options
 
 USE_PYTHON=	distutils
 USES=		python:2
diff --git a/www/py-qpy/Makefile b/www/py-qpy/Makefile
index b857cbd3c8af..a04898b5e017 100644
--- a/www/py-qpy/Makefile
+++ b/www/py-qpy/Makefile
@@ -13,7 +13,6 @@ MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Generating safely-quoted html text from python code
 
 OPTIONS_DEFINE=	DOCS
-OPTIONSFILE=	${PORT_DBDIR}/py-${PORTNAME}/options
 
 USE_PYTHON=	autoplist distutils
 USES=		python:2
diff --git a/www/py-rhodecode/Makefile b/www/py-rhodecode/Makefile
index 800641aa77d5..4703d229ff44 100644
--- a/www/py-rhodecode/Makefile
+++ b/www/py-rhodecode/Makefile
@@ -44,7 +44,6 @@ USE_PYTHON=	distutils autoplist
 USE_RC_SUBR=		rhodecode
 SUB_FILES=		pkg-message
 
-OPTIONSFILE?=		${PORT_DBDIR}/py-${PORTNAME}/options
 OPTIONS_DEFINE=		LDAP GIT
 OPTIONS_DEFAULT=	GIT
 
diff --git a/www/py-scrapy/Makefile b/www/py-scrapy/Makefile
index b825f7a7e195..adbdc6ffdf27 100644
--- a/www/py-scrapy/Makefile
+++ b/www/py-scrapy/Makefile
@@ -23,7 +23,6 @@ USE_PYTHON=	distutils autoplist
 
 OPTIONS_DEFINE=	SSL
 OPTIONS_DEFAULT=SSL
-OPTIONSFILE=	${PORT_DBDIR}/py-${PORTNAME}/options
 
 .include <bsd.port.options.mk>
 
diff --git a/www/py-turbogears/Makefile b/www/py-turbogears/Makefile
index a125f0207664..3bde9dfcb90b 100644
--- a/www/py-turbogears/Makefile
+++ b/www/py-turbogears/Makefile
@@ -27,7 +27,6 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cherrypy>=3.1.2:${PORTSDIR}/www/py-cherrypy
 USES=		gettext python:2
 USE_PYTHON=	distutils autoplist
 
-OPTIONSFILE=	${PORT_DBDIR}/py-${PORTNAME}/options
 OPTIONS_DEFINE=	ELIXIR NOSE SQLOBJECT SQLALCHEMY
 OPTIONS_DEFAULT=SQLOBJECT
 ELIXIR_DESC=	Use Elixir as plugin
diff --git a/www/py-urlgrabber/Makefile b/www/py-urlgrabber/Makefile
index c5b89ce45284..63ff73389a04 100644
--- a/www/py-urlgrabber/Makefile
+++ b/www/py-urlgrabber/Makefile
@@ -23,7 +23,6 @@ USE_PYTHON=	distutils
 REINPLACE_ARGS=	-i.bak -e 's,%%DOCSDIR%%,${DOCSDIR},'
 DOCSDIR=	${PREFIX}/share/doc/${PYTHON_PKGNAMEPREFIX}${PORTNAME}
 
-OPTIONSFILE?=	${PORT_DBDIR}/py-${PORTNAME}/options
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.options.mk>
diff --git a/www/py-ws4py/Makefile b/www/py-ws4py/Makefile
index 103f2e782ef1..abb45e65ffcb 100644
--- a/www/py-ws4py/Makefile
+++ b/www/py-ws4py/Makefile
@@ -17,7 +17,6 @@ USE_PYTHON=	distutils autoplist
 
 NO_ARCH=	yes
 
-OPTIONSFILE=	${PORT_DBDIR}/py-${PORTNAME}/options
 OPTIONS_DEFINE=	CHERRYPY GEVENT TORNADO
 OPTIONS_DEFAULT=	CHERRYPY GEVENT
 CHERRYPY_DESC=	CherryPy server support
diff --git a/www/rubygem-rails/Makefile b/www/rubygem-rails/Makefile
index 46c75ac0dabc..e6a5805485ab 100644
--- a/www/rubygem-rails/Makefile
+++ b/www/rubygem-rails/Makefile
@@ -57,7 +57,6 @@ CPE_PRODUCT=	ruby_on_rails
 OPTIONS_DEFINE=	PASSENGER MEMCACHE_CLIENT
 PASSENGER_DESC=	Passenger backend
 MEMCACHE_CLIENT_DESC=	MemCache-Client support
-OPTIONSFILE=	${PORT_DBDIR}/rubygem-${PORTNAME}/options
 
 MEMCACHE_CLIENT_RUN_DEPENDS=	rubygem-memcache-client>=1.2.0:${PORTSDIR}/databases/rubygem-memcache-client
 PASSENGER_RUN_DEPENDS=	rubygem-passenger>=2.2.15:${PORTSDIR}/www/rubygem-passenger
diff --git a/www/rubygem-rails4/Makefile b/www/rubygem-rails4/Makefile
index c02d3f22cc20..cac86ef3ecb2 100644
--- a/www/rubygem-rails4/Makefile
+++ b/www/rubygem-rails4/Makefile
@@ -54,7 +54,6 @@ CPE_PRODUCT=	ruby_on_rails
 OPTIONS_DEFINE=	PASSENGER MEMCACHE_CLIENT
 PASSENGER_DESC=	Passenger backend
 MEMCACHE_CLIENT_DESC=	MemCache-Client support
-OPTIONSFILE=	${PORT_DBDIR}/rubygem-${PORTNAME}/options
 
 MEMCACHE_CLIENT_RUN_DEPENDS=	rubygem-memcache-client>=1.2.0:${PORTSDIR}/databases/rubygem-memcache-client
 PASSENGER_RUN_DEPENDS=	rubygem-passenger>=2.2.15:${PORTSDIR}/www/rubygem-passenger
diff --git a/www/tdiary/Makefile b/www/tdiary/Makefile
index 8c58a9ebf9b3..ad067731a898 100644
--- a/www/tdiary/Makefile
+++ b/www/tdiary/Makefile
@@ -48,10 +48,10 @@ SUB_FILES=	pkg-message tdiaryinst.rb
 SUB_LIST+=	TDIARY_LANG=${TDIARY_LANG} \
 		TDIARY_SCRIPT=${TDIARY_SCRIPT}
 WRKSRC=		${WRKDIR}/${PORTNAME}-v${PORTVERSION}.1
-DOCSDIR=	${PREFIX}/share/doc/${UNIQUENAME}
-WWWDIR=		${PREFIX}/www/${UNIQUENAME}
+DOCSDIR=	${PREFIX}/share/doc/${PKGBASE}
+WWWDIR=		${PREFIX}/www/${PKGBASE}
 
-TDIARY_SCRIPT=	${UNIQUENAME}-inst.rb
+TDIARY_SCRIPT=	${PKGBASE}-inst.rb
 
 #TDIARY_LANG	ja:Japanese en:English
 .if !defined(TDIARY_LANG) || ( defined(TDIARY_LANG) && ${TDIARY_LANG} != ja )
diff --git a/www/xpi-adblock/Makefile.xpi b/www/xpi-adblock/Makefile.xpi
index 6a58675a1693..81790907ebc6 100644
--- a/www/xpi-adblock/Makefile.xpi
+++ b/www/xpi-adblock/Makefile.xpi
@@ -17,7 +17,6 @@
 #				  MOZILLA_ADDONS/addons/${XPI_NUM}
 #				  or
 #				  MOZILLA_ADDONS/extensions/${XPI_DISTNAME}
-# LATEST_LINK	- Default: ${PKGBASE:S/_//g}
 # XPI_LIBDIR	- Name of the directory to install extensions in.
 #				  Default: ${PREFIX}/lib/xpi
 # XPI_XPIDIR	- Name of the directory to install extension's files in.
@@ -70,7 +69,6 @@ PKGNAMEPREFIX?=	xpi-
 EXTRACT_SUFX?=	.xpi
 DISTNAME?=		${XPI_DISTNAME}-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}
 DIST_SUBDIR?=	xpi
-LATEST_LINK?=	${PKGBASE:S/_//g}
 
 NO_BUILD=	yes
 USES+=		zip:infozip