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
svn path=/head/; revision=394508
2015-08-17 14:20:40 +00:00 · 2015-08-17 14:20:40 +00:00 · 21a283f3be · 2021-03-31 03:12:20 +00:00
commit 21a283f3be
parent cda45bfa8a
271 changed files with 144 additions and 587 deletions
--- a/8
+++ b/8
@ -10,6 +10,14 @@ in the release notes and/or placed into UPDATING.

 All ports committers are allowed to commit to this file.

+20150817:
+AUTHOR: mat@FreeBSD.org
+
+  UNIQUENAME and LATEST_LINK have been removed. LATEST_LINK was only used by
+  ports-mgmt/pkg{,-devel} and PKGBASE can be used in its stead.  UNIQUENAME was
+  used by USE_LDCONFIG where it was not unique enough, and as old compat shims
+  with options.
+
 20150716:
 AUTHOR:	kwm@FreeBSD.org

--- a/Mk/bsd.database.mk
+++ b/Mk/bsd.database.mk
@ -47,7 +47,7 @@ Database_Include_MAINTAINER=	ports@FreeBSD.org
 #			  build this port with (overrides WITH_BDB_VER).
 # WITH_BDB_VER
 #			- User defined global variable to set Berkeley DB version.
-# <UNIQUENAME>_WITH_BDB_VER
+# <BDB_UNIQUENAME>_WITH_BDB_VER
 #			- User defined port specific variable to set Berkeley DB
 #			  version.
 # WITH_BDB_HIGHEST
@ -191,6 +191,8 @@ IGNORE=		cannot install: unknown MySQL version: ${MYSQL_VER}
 # TODO: avoid malformed conditional with invalid USE_BDB/WITH_BDB_VER
 # check if + works properly from test builds 01h12m23s

+BDB_UNIQUENAME?=	${PKGNAMEPREFIX}${PORTNAME}
+
 _USE_BDB_save:=${USE_BDB}
 _WITH_BDB_VER_save:=${WITH_BDB_VER}

@ -211,9 +213,9 @@ db5_FIND=	${LOCALBASE}/include/db5/db.h
 db6_FIND=	${LOCALBASE}/include/db6/db.h

 # Override the global WITH_BDB_VER with the
-# port specific <UNIQUENAME>_WITH_BDB_VER
-.if defined(${UNIQUENAME:tu:S,-,_,}_WITH_BDB_VER)
-WITH_BDB_VER=	${${UNIQUENAME:tu:S,-,_,}_WITH_BDB_VER}
+# port specific <BDB_UNIQUENAME>_WITH_BDB_VER
+.if defined(${BDB_UNIQUENAME:tu:S,-,_,}_WITH_BDB_VER)
+WITH_BDB_VER=	${${BDB_UNIQUENAME:tu:S,-,_,}_WITH_BDB_VER}
 .endif

 # Override USE_BDB with global WITH_BDB_VER
@ -340,7 +342,7 @@ BDB_VER=	${_BDB_VER}

 debug-bdb:
 	@${ECHO_CMD} "--INPUTS----------------------------------------------------"
-	@${ECHO_CMD} "${UNIQUENAME:tu:S,-,_,}_WITH_BDB_VER: ${${UNIQUENAME:tu:S,-,_,}_WITH_BDB_VER}"
+	@${ECHO_CMD} "${BDB_UNIQUENAME:tu:S,-,_,}_WITH_BDB_VER: ${${BDB_UNIQUENAME:tu:S,-,_,}_WITH_BDB_VER}"
 	@${ECHO_CMD} "WITH_BDB_VER: ${_WITH_BDB_VER_save}"
 	@${ECHO_CMD} "WANT_BDB_VER: ${WANT_BDB_VER}"
 	@${ECHO_CMD} "BDB_BUILD_DEPENDS: ${BDB_BUILD_DEPENDS}"
@ -374,7 +376,7 @@ BAD_VAR+=	${var},
 .  endif
 . endfor
 . if defined(BAD_VAR)
-_IGNORE_MSG=	Obsolete variable(s) ${BAD_VAR} use WITH_BDB_VER or ${UNIQUENAME:tu:S,-,_,}_WITH_BDB_VER to select Berkeley DB version
+_IGNORE_MSG=	Obsolete variable(s) ${BAD_VAR} use WITH_BDB_VER or ${BDB_UNIQUENAME:tu:S,-,_,}_WITH_BDB_VER to select Berkeley DB version
 .  if defined(IGNORE)
 IGNORE+= ${_IGNORE_MSG}
 .  else
--- a/Mk/bsd.options.mk
+++ b/Mk/bsd.options.mk
@ -127,7 +127,6 @@
 OPTIONSMKINCLUDED=	bsd.options.mk

 OPTIONS_NAME?=	${PKGORIGIN:S/\//_/}
-OPTIONSFILE?=	${PORT_DBDIR}/${UNIQUENAME}/options
 OPTIONS_FILE?=	${PORT_DBDIR}/${OPTIONS_NAME}/options

 _OPTIONS_FLAGS=	ALL_TARGET CATEGORIES CFLAGS CONFIGURE_ENV CONFLICTS \
@ -244,22 +243,6 @@ PORT_OPTIONS:=	${PORT_OPTIONS:N${opt}}
 NEW_OPTIONS:=	${NEW_OPTIONS:N${opt}}
 .  endfor

-# XXX To remove once UNIQUENAME will be removed
-## Set the options specified per-port (set by user in make.conf)
-.  for opt in ${${UNIQUENAME}_SET}
-.    if !empty(COMPLETE_OPTIONS_LIST:M${opt})
-PORT_OPTIONS+=	${opt}
-NEW_OPTIONS:=	${NEW_OPTIONS:N${opt}}
-.    endif
-.  endfor
-
-## Unset the options excluded per-port (set by user in make.conf)
-.  for opt in ${${UNIQUENAME}_UNSET}
-PORT_OPTIONS:=	${PORT_OPTIONS:N${opt}}
-NEW_OPTIONS:=	${NEW_OPTIONS:N${opt}}
-.  endfor
-# XXX To remove once UNIQUENAME will be removed
-
 ## Set the options specified per-port (set by user in make.conf)
 .  for opt in ${${OPTIONS_NAME}_SET}
 .    if !empty(COMPLETE_OPTIONS_LIST:M${opt})
@ -274,14 +257,6 @@ PORT_OPTIONS:=	${PORT_OPTIONS:N${opt}}
 NEW_OPTIONS:=	${NEW_OPTIONS:N${opt}}
 .  endfor

-# XXX to remove once UNIQUENAME is removed
-## options files (from dialog)
-.  if exists(${OPTIONSFILE}) && !make(rmconfig)
-.  include "${OPTIONSFILE}"
-.  endif
-.  sinclude "${OPTIONSFILE}.local"
-# XXX to remove once UNIQUENAME is removed
-
 ## options files (from dialog)
 .  if exists(${OPTIONS_FILE}) && !make(rmconfig)
 .  include "${OPTIONS_FILE}"
@ -303,6 +278,14 @@ PORT_OPTIONS:=	${PORT_OPTIONS:N${opt}}
 .endif
 .endfor

+_OPTIONS_UNIQUENAME=	${PKGNAMEPREFIX}${PORTNAME}
+.for _k in SET UNSET SET_FORCE UNSET_FORCE
+.if defined(${_OPTIONS_UNIQUENAME}_${_k})
+WARNING+=	"You are using ${_OPTIONS_UNIQUENAME}_${_k} which is not supported any more, use:"
+WARNING+=	"${OPTIONS_NAME}_${_k}=	${${_OPTIONS_UNIQUENAME}_${_k}}"
+.endif
+.endfor
+
 .if defined(OPTIONS_WARNINGS)
 WARNING+=	"You are using the following deprecated options: ${OPTIONS_WARNINGS}"
 WARNING+=	"If you added them on the command line, you should replace them by"
@ -355,22 +338,6 @@ PORT_OPTIONS:=	${PORT_OPTIONS:N${opt}}
 NEW_OPTIONS:=	${NEW_OPTIONS:N${opt}}
 .  endfor

-# XXX To remove once UNIQUENAME will be removed
-## Set the options specified per-port (set by user in make.conf)
-.  for opt in ${${UNIQUENAME}_SET_FORCE}
-.    if !empty(COMPLETE_OPTIONS_LIST:M${opt})
-PORT_OPTIONS+=	${opt}
-NEW_OPTIONS:=	${NEW_OPTIONS:N${opt}}
-.    endif
-.  endfor
-
-## Unset the options excluded per-port (set by user in make.conf)
-.  for opt in ${${UNIQUENAME}_UNSET_FORCE}
-PORT_OPTIONS:=	${PORT_OPTIONS:N${opt}}
-NEW_OPTIONS:=	${NEW_OPTIONS:N${opt}}
-.  endfor
-# XXX To remove once UNIQUENAME will be removed
-
 ## Set the options specified per-port (set by user in make.conf)
 .  for opt in ${${OPTIONS_NAME}_SET_FORCE}
 .    if !empty(COMPLETE_OPTIONS_LIST:M${opt})
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@ -74,9 +74,6 @@ FreeBSD_MAINTAINER=	portmgr@FreeBSD.org
 #				  Optional.
 # PKGVERSION	- Always defined as ${PORTVERSION}.
 #				  Do not define this in your Makefile.
-# UNIQUENAME	- A name for your port that is globally unique.  By default,
-#				  this is set to ${LATEST_LINK} when LATEST_LINK is set,
-#				  and to ${PKGNAMEPREFIX}${PORTNAME} otherwise.
 # DISTVERSION	- Vendor version of the distribution.
 #				  Default: ${PORTVERSION}
 # DISTNAME		- Name of port or distribution used in generating
@ -892,7 +889,7 @@ FreeBSD_MAINTAINER=	portmgr@FreeBSD.org
 #				  directories to be searched for shared libraries.
 #				  Otherwise, this is a list of directories to be added to that
 #				  list. The directory names are written to
-#				  ${LOCALBASE}/libdata/ldconfig/${UNIQUENAME} which is then
+#				  ${LOCALBASE}/libdata/ldconfig/${PKGBASE} which is then
 #				  used by the ldconfig startup script.
 #				  This mechanism replaces ldconfig scripts installed by some
 #				  ports, often under such names as 000.${UNQUENAME}.sh.
@ -901,7 +898,7 @@ FreeBSD_MAINTAINER=	portmgr@FreeBSD.org
 #				  version, and the directory list given will be ignored.
 # USE_LDCONFIG32
 # 				- Same as USE_LDCONFIG but the target file is
-# 				  ${LOCALBASE}/libdata/ldconfig32/${UNIQUENAME} instead.
+# 				  ${LOCALBASE}/libdata/ldconfig32/${PKGBASE} instead.
 # 				  Note: that should only be used on 64-bit architectures.
 #
 # DOCSDIR		- Name of the directory to install the packages docs in.
@ -977,11 +974,6 @@ FreeBSD_MAINTAINER=	portmgr@FreeBSD.org
 # generating the packing list on-the-fly, make sure it's generated before
 # do-install is called!
 #
-# For package:
-#
-# LATEST_LINK	- Install the "Latest" link for the package as ___.  Define
-#				  this if the "Latest" link name will be incorrectly determined.
-#
 # This is used in all stages:
 #
 # SCRIPTS_ENV	- Additional environment vars passed to scripts in
@ -1252,12 +1244,6 @@ USERS_BLACKLIST=	_dhcp _pflogd auditdistd bin bind daemon games hast kmem mailnu
 LDCONFIG_DIR=	libdata/ldconfig
 LDCONFIG32_DIR=	libdata/ldconfig32

-.if defined(LATEST_LINK)
-UNIQUENAME?=	${LATEST_LINK}
-.else
-UNIQUENAME?=	${PKGNAMEPREFIX}${PORTNAME}
-.endif
-
 .endif

 # At least KDE needs TMPDIR for the package building,
@ -2571,8 +2557,7 @@ WRKDIR_PKGFILE=	${WRKDIR}/pkg/${PKGNAME}${PKG_SUFX}
 # The "latest version" link -- ${PKGNAME} minus everthing after the last '-'
 PKGLATESTREPOSITORY?=	${PACKAGES}/Latest
 PKGBASE?=			${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
-LATEST_LINK?=		${PKGBASE}
-PKGLATESTFILE=		${PKGLATESTREPOSITORY}/${LATEST_LINK}${PKG_SUFX}
+PKGLATESTFILE=		${PKGLATESTREPOSITORY}/${PKGBASE}${PKG_SUFX}

 CONFIGURE_SCRIPT?=	configure
 CONFIGURE_CMD?=		./${CONFIGURE_SCRIPT}
@ -2903,7 +2888,7 @@ DEPENDS_ARGS+=	NOCLEANDEPENDS=yes
 ################################################################
 .if ((!defined(OPTIONS_DEFINE) && !defined(OPTIONS_SINGLE) && !defined(OPTIONS_MULTI)) \
 	&& !defined(OPTIONS_GROUP) && !defined(OPTIONS_RADIO) \
-	|| defined(CONFIG_DONE_${UNIQUENAME:tu}) || \
+	|| defined(CONFIG_DONE_${PKGBASE:tu}) || \
 	defined(PACKAGE_BUILDING) || defined(BATCH))
 _OPTIONS_OK=yes
 .endif
@ -3584,8 +3569,8 @@ install-ldconfig-file:
 	@${MKDIR} ${STAGEDIR}${LOCALBASE}/${LDCONFIG_DIR}
 .endif
 	@${ECHO_CMD} ${USE_LDCONFIG} | ${TR} ' ' '\n' \
-		> ${STAGEDIR}${LOCALBASE}/${LDCONFIG_DIR}/${UNIQUENAME}
-	@${ECHO_CMD} ${LOCALBASE}/${LDCONFIG_DIR}/${UNIQUENAME} >> ${TMPPLIST}
+		> ${STAGEDIR}${LOCALBASE}/${LDCONFIG_DIR}/${PKGBASE}
+	@${ECHO_CMD} ${LOCALBASE}/${LDCONFIG_DIR}/${PKGBASE} >> ${TMPPLIST}
 .endif
 .endif
 .endif
@ -3596,8 +3581,8 @@ install-ldconfig-file:
 	@${MKDIR} ${STAGEDIR}${LOCALBASE}/${LDCONFIG32_DIR}
 .endif
 	@${ECHO_CMD} ${USE_LDCONFIG32} | ${TR} ' ' '\n' \
-		> ${STAGEDIR}${LOCALBASE}/${LDCONFIG32_DIR}/${UNIQUENAME}
-	@${ECHO_CMD} ${LOCALBASE}/${LDCONFIG32_DIR}/${UNIQUENAME} >> ${TMPPLIST}
+		> ${STAGEDIR}${LOCALBASE}/${LDCONFIG32_DIR}/${PKGBASE}
+	@${ECHO_CMD} ${LOCALBASE}/${LDCONFIG32_DIR}/${PKGBASE} >> ${TMPPLIST}
 .endif
 .endif
 .endif
@ -5117,18 +5102,12 @@ do-config:
 	@${ECHO_MSG} "===> No options to configure"
 .else
 	@optionsdir=${OPTIONS_FILE:H}; \
-	oldoptionsdir=${OPTIONSFILE:H}; \
 	if [ ${UID} != 0 -a -z "${INSTALL_AS_USER}" -a ! -w "${PORT_DBDIR}" ] ; then \
 		${ECHO_MSG} "===>  Switching to root credentials to create $${optionsdir}"; \
-		(${SU_CMD} "${SH} -c \"if [ -d $${oldoptionsdir} -a ! -d $${optionsdir} ]; then ${MV} $${oldoptionsdir} $${optionsdir}; elif [ -d $${oldoptionsdir} -a -d $${optionsdir} ]; then ${RM} -rf $${oldoptionsdir} ; fi ; ${MKDIR} $${optionsdir} 2> /dev/null\"") || \
+		(${SU_CMD} "${SH} -c \"${MKDIR} $${optionsdir} 2> /dev/null\"") || \
 			(${ECHO_MSG} "===> Cannot create $${optionsdir}, check permissions"; exit 1); \
 		${ECHO_MSG} "===>  Returning to user credentials" ; \
 	else \
-	if [ -d $${oldoptionsdir} -a ! -d $${optionsdir} ]; then \
-		${MV} $${oldoptionsdir} $${optionsdir}; \
-	elif [ -d $${oldoptionsdir} -a -d $${optionsdir} ]; then \
-		${RM} -rf $${oldoptionsdir} ; \
-	fi ; \
 	${MKDIR} $${optionsdir} 2> /dev/null || \
 	(${ECHO_MSG} "===> Cannot create $${optionsdir}, check permissions"; exit 1) ; \
 	fi
@ -5246,19 +5225,6 @@ showconfig-recursive:

 .if !target(rmconfig)
 rmconfig:
-.if exists(${OPTIONSFILE})
-	-@${ECHO_MSG} "===> Removing user-configured options for ${PKGNAME}"; \
-	optionsdir=${OPTIONSFILE:H}; \
-	if [ ${UID} != 0 -a "x${INSTALL_AS_USER}" = "x" -a ! -w "${OPTIONSFILE}" ]; then \
-		${ECHO_MSG} "===> Switching to root credentials to remove ${OPTIONSFILE} and $${optionsdir}"; \
-		${SU_CMD} "${RM} -f ${OPTIONSFILE} ; \
-			${RMDIR} $${optionsdir}"; \
-		${ECHO_MSG} "===> Returning to user credentials"; \
-	else \
-		${RM} -f ${OPTIONSFILE}; \
-		${RMDIR} $${optionsdir} 2>/dev/null || return 0; \
-	fi
-.endif
 .if exists(${OPTIONS_FILE})
 	-@${ECHO_MSG} "===> Removing user-configured options for ${PKGNAME}"; \
 	optionsdir=${OPTIONS_FILE:H}; \
@ -5675,7 +5641,7 @@ _PHONY_TARGETS+= ${target}
 ${target}: ${${target:tu}_COOKIE}
 .elif !target(${target})
 ${target}: config-conditional
-	@cd ${.CURDIR} && ${MAKE} CONFIG_DONE_${UNIQUENAME:tu}=1 ${${target:tu}_COOKIE}
+	@cd ${.CURDIR} && ${MAKE} CONFIG_DONE_${PKGBASE:tu}=1 ${${target:tu}_COOKIE}
 .elif target(${target}) && defined(IGNORE)
 .endif

--- a/Mk/bsd.sanity.mk
+++ b/Mk/bsd.sanity.mk
@ -159,7 +159,8 @@ SANITY_UNSUPPORTED=	USE_OPENAL USE_FAM USE_MAKESELF USE_ZIP USE_LHA USE_CMAKE \
 		USE_GETTEXT USE_GMAKE USE_SCONS USE_DRUPAL NO_INSTALL_MANPAGES \
 		INSTALLS_SHLIB USE_PYDISTUTILS PYTHON_CONCURRENT_INSTALL \
 		PYDISTUTILS_AUTOPLIST PYTHON_PY3K_PLIST_HACK PYDISTUTILS_NOEGGINFO \
-		USE_PYTHON_PREFIX USE_BZIP2 USE_XZ USE_PGSQL NEED_ROOT
+		USE_PYTHON_PREFIX USE_BZIP2 USE_XZ USE_PGSQL NEED_ROOT \
+		UNIQUENAME LATEST_LINK
 SANITY_DEPRECATED=	PYTHON_PKGNAMESUFFIX USE_AUTOTOOLS

 USE_AUTOTOOLS_ALT=	USES=autoreconf and GNU_CONFIGURE=yes
@ -194,6 +195,8 @@ PYDISTUTILS_NOEGGINFO_ALT=	USE_PYTHON=noegginfo
 USE_PYTHON_PREFIX_ALT=		USE_PYTHON=pythonprefix
 PYTHON_PKGNAMESUFFIX_ALT=	PYTHON_PKGNAMEPREFIX
 NO_INSTALL_MANPAGES_ALT=	USES=imake:noman
+UNIQUENAME_ALT=		PKGBASE
+LATEST_LINK_ALT=	PKGBASE

 .for a in ${SANITY_DEPRECATED}
 .if defined(${a})
--- a/Tools/scripts/README
+++ b/Tools/scripts/README
@ -12,8 +12,6 @@ bad-pkgdescrs.sh - locate identical pkg descriptions
 bump_revision.pl - Small script to bump the PORTREVISION variable of ports
                   which are depending on a port with a changed shared lib
                   version.
-check-latest-link - search for duplicate LATEST_LINK values and send nag
-                    mails to the responsible maintainers
 checkcats.py - verify that master categories in all ports are correct and
               report any problems. Beware that the full check takes quite
 			   some time.
--- a/Tools/scripts/check-latest-link
+++ b/Tools/scripts/check-latest-link
@ -1,80 +0,0 @@
-#!/bin/sh
-#
-# Iterate over the ports collection, assemble the list of LATEST_LINKs and
-# then look for duplicates.  Send a nag-mail to the responsible maintainers.
-
-# Sanitize environment
-export __MAKE_CONF=/dev/null
-export PORT_DBDIR=/nonexistent
-export PKG_DBDIR=/nonexistent
-export LOCALBASE=/nonexistent
-
-if [ -z "${PORTSDIR}" ]; then
-	PORTSDIR=/usr/ports
-fi
-
-if [ "$1" = "-nomail" ]; then
-	NOMAIL=1
-else
-	NOMAIL=0
-fi
-
-cd ${PORTSDIR}
-CATEGORIES=$(make -V SUBDIR)
-
-for cat in ${CATEGORIES}; do
-	cd ${PORTSDIR}/${cat}
-	dirs=$(make -V SUBDIR)
-
-	make "PORTSDIR=${PORTSDIR}" "CATEGORY=${cat}" "DIRS=${dirs}" -k -j3 -f - << "EOF"
-all:	${DIRS:S/$/.portinfo/}
-
-.for d in ${DIRS}
-${d}.portinfo:
-	@cd ${PORTSDIR}/${CATEGORY}/${d}; make 'portinfo=$${NO_LATEST_LINK}| $${MAINTAINER} $${.CURDIR:S,${PORTSDIR}/,,} $${LATEST_LINK}' -V portinfo
-.endfor
-EOF
-done | grep '^|' > ${PORTSDIR}/.latest_link
-
-cd ${PORTSDIR}
-(awk '{print " " $4 "$"}' < .latest_link) | sort | uniq -d > .latest_dups
-
-grep -f .latest_dups .latest_link | sort -i -k4 > .latest_full
-
-maint=$(awk '{print $2}' < .latest_full | sort -ui | tr '\n' ' ')
-
-(echo "Dear port maintainers,"
-  echo
-  echo "The following list includes ports maintained by you that have duplicate"
-  echo "LATEST_LINK values.  They should either be modified to use a unique"
-  echo "PKGNAME, e.g. by using PKGNAMESUFFIX.  Note that NO_LATEST_LINK is"
-  echo "deprecated.  See the portmgr blog post for more information:"
-  echo "http://blogs.freebsdish.org/portmgr/2013/10/03/package-name-collisions/"
-  echo
-  echo
-  echo "Thanks,"
-  echo "Erwin \"Annoying Reminder Guy III\" Lansing"
-  echo
-  echo
-
-  printf "%-20s %-30s %-20s\n"  "LATEST_LINK" "PORTNAME" "MAINTAINER"
-  echo "=========================================================================="
-  while read dummy i j k; do
-    printf "%-20s %-30s %-20s\n" $k $j $i
-  done < .latest_full
-
-  num=$(wc -l .latest_full | awk '{print $1}')
-  echo
-  echo "Total: $num ports") > .latest_mail
-
-if [ "${NOMAIL}" = "0" ]; then
-  for i in ${maint}; do
-    mail -s "Ports with duplicate LATEST_LINKs" $i < .latest_mail
-  done
-  # Copy to erwin@
-  mail -s "Ports with duplicate LATEST_LINKs" erwin@FreeBSD.org < .latest_mail
-else
-  cat .latest_mail
-fi
-
-rm .latest_dups .latest_full .latest_link .latest_mail
--- a/13
+++ b/13
@ -5,6 +5,19 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.

+20150817:
+  AFFECTS: everybody who still uses <UNIQUENAME>_SET/UNSET in make.conf
+  AUTHOR: mat@FreeBSD.org
+
+  The use of <UNIQUENAME>_SET/UNSET has been deprecated for a long time,
+  replaced by <OPTIONNS_NAME>_SET/UNSET.  It is now not supported any more.
+  A warning will be issued telling you what to do, for example:
+
+    $ make
+    /!\ WARNING /!\
+    You are using perl_SET which is not supported any more, use:
+    lang_perl5.20_SET= DEBUG
+
 20150816:
  AFFECTS: users of sysutils/s6
  AUTHOR: Colin Booth <colin@heliocat.net>
--- a/audio/amarok-kde4/Makefile
+++ b/audio/amarok-kde4/Makefile
@ -22,8 +22,6 @@ BUILD_DEPENDS=	${LOCALBASE}/lib/qt4/plugins/script/libqtscript_core.so.1.0.0:${P
 RUN_DEPENDS=	${LOCALBASE}/lib/qt4/plugins/script/libqtscript_core.so.1.0.0:${PORTSDIR}/devel/qtscriptgenerator \
 		${KDE4_PREFIX}/lib/kde4/kio_upnp_ms.so:${PORTSDIR}/net/kio-upnp-ms

-LATEST_LINK=	${PORTNAME}-kde4
-
 USE_KDE4=	kdelibs kdeprefix libkcddb libkcompactdisc \
 		nepomuk-core runtime automoc4 strigi
 USE_MYSQL=	embedded
--- a/audio/jack/Makefile
+++ b/audio/jack/Makefile
@ -32,8 +32,6 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib -L${BDB_LIB_DIR}
 INSTALL_TARGET=	install-strip

-LATEST_LINK=	jack
-
 OPTIONS_DEFINE=	ALSA DOXYGEN READLINE
 OPTIONS_DEFAULT=READLINE
 OPTIONS_SUB=	yes
--- a/audio/lua51-mpd/Makefile
+++ b/audio/lua51-mpd/Makefile
@ -12,7 +12,7 @@ COMMENT=	Lua library for musicpd
 RUN_DEPENDS=	${LUA_MODLIBDIR}/socket/core.so:${PORTSDIR}/net/luasocket

 OPTIONS_DEFINE=	DOCS
-DOCSDIR=	${PREFIX}/share/doc/${UNIQUENAME}
+DOCSDIR=	${PREFIX}/share/doc/${PKGBASE}

 GH_ACCOUNT=	silentbicycle
 GH_PROJECT=	lua-mpd
--- a/audio/py-mpd2/Makefile
+++ b/audio/py-mpd2/Makefile
@ -23,7 +23,6 @@ USE_PYTHON=	autoplist concurrent distutils

 NO_ARCH=	yes

-OPTIONSFILE=	${PORT_DBDIR}/py-${PORTNAME}/options
 OPTIONS_DEFINE=	DOCS EXAMPLES

 DOCSDIR=	${PREFIX}/share/doc/py-${PORTNAME}
--- a/biology/ruby-bio/Makefile
+++ b/biology/ruby-bio/Makefile
@ -16,8 +16,6 @@ OPTIONS_DEFINE=	XMLPARSER BDB4 MYSQL PGSQL DOCS
 XMLPARSER_DESC=	xmlparser support for faster Blast processing
 BDB4_DESC=	bdb4 support for faster flat file indexing

-OPTIONSFILE=	${PORT_DBDIR}/ruby-${PORTNAME}/options
-
 USES=	shebangfix
 USE_RUBY=	yes
 USE_RUBY_SETUP=	yes
--- a/chinese/joe/Makefile
+++ b/chinese/joe/Makefile
@ -9,8 +9,6 @@ PATCH_DIST_STRIP=	-p1

 MAINTAINER=	ports@FreeBSD.org

-LATEST_LINK=	${PKGNAMEPREFIX}joe
-
 DEPRECATED=	The difference with editors/joe is too trivial to warrant a separate port
 EXPIRATION_DATE=2015-09-27

--- a/chinese/phpbb3-tw/Makefile
+++ b/chinese/phpbb3-tw/Makefile
@ -15,8 +15,6 @@ COMMENT=	The Traditional Chinese version of phpBB3

 CONFLICTS=	phpbb-tw-[0-2]* phpbb-devel-[0-3]* phpbb-[0-3]*

-LATEST_LINK=	${PKGNAMEPREFIX}${PORTNAME}3${PKGNAMESUFFIX}
-
 USES=		zip

 # The phpBB3 port supports a number of variables that may be tweaked at build
--- a/databases/jdbm2/Makefile
+++ b/databases/jdbm2/Makefile
@ -19,7 +19,6 @@ JAVA_VERSION=	1.6+
 NO_BUILD=	yes

 PROJECTHOST=	jdbm2
-LATEST_LINK=	jdbm2

 PORTDOCS=	*
 PORTEXAMPLES=	*
--- a/databases/luasql-mysql/Makefile
+++ b/databases/luasql-mysql/Makefile
@ -53,7 +53,6 @@ MAKE_ARGS+=	DRIVER_LIBS="-L ${LOCALBASE}/lib -lsqlite3" \
 IGNORE=		unknown or unsupported luasql driver
 .endif

-LATEST_LINK=	${PORTNAME}-${LUASQL_DRIVER}
 PLIST_SUB+=	LUASQL_DRIVER=${LUASQL_DRIVER}

 do-install:
--- a/databases/mariadb-client/Makefile
+++ b/databases/mariadb-client/Makefile
@ -4,8 +4,6 @@ PORTNAME=	mariadb
 PORTREVISION=	7
 PKGNAMESUFFIX=	53-client

-UNIQUENAME=	${PORTNAME}${PKGNAMESUFFIX}
-
 COMMENT=	Database client - drop-in replacement for MySQL

 MASTERDIR=	${.CURDIR}/../mariadb-server
--- a/databases/mariadb-scripts/Makefile
+++ b/databases/mariadb-scripts/Makefile
@ -7,7 +7,6 @@ COMMENT=	Scripts for mariadb - drop-in replacement for MySQL

 LICENSE=	GPLv2

-UNIQUENAME=	${PORTNAME}${PKGNAMESUFFIX}
 USES=		perl5

 MASTERDIR=	${.CURDIR}/../mariadb-server
--- a/databases/mariadb-server/Makefile
+++ b/databases/mariadb-server/Makefile
@ -20,8 +20,6 @@ COMMENT=	Database server - drop-in replacement for MySQL

 LICENSE=	GPLv2

-UNIQUENAME=	${PORTNAME}${PKGNAMESUFFIX}
-
 CONFLICTS?=	mariadb5[4-9]-server-* \
 		mariadb1[0-9][0-9]-server-* \
 		mysql*-server-* \
--- a/databases/mariadb100-server/Makefile
+++ b/databases/mariadb100-server/Makefile
@ -21,7 +21,6 @@ LICENSE=	GPLv2
 SUB_FILES=	pkg-message
 PKGMESSAGE=	${WRKDIR}/pkg-message

-UNIQUENAME=	${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
 SLAVEDIRS=	databases/mariadb100-client
 USES=		bison:build cmake execinfo gmake shebangfix cpe
 USE_LDCONFIG=	${PREFIX}/lib/mysql ${PREFIX}/lib/mysql/plugin
--- a/databases/pear-DoctrineDBAL/Makefile
+++ b/databases/pear-DoctrineDBAL/Makefile
@ -16,7 +16,6 @@ RUN_DEPENDS=	${PEARDIR}/.channels/pear.doctrine-project.org.reg:${PORTSDIR}/deve
 	${PEARDIR}/Doctrine/Common/Version.php:${PORTSDIR}/databases/pear-DoctrineCommon \
 	${PEARDIR}/Symfony/Component/Console/Application.php:${PORTSDIR}/devel/pear-Symfony_Component_Console

-OPTIONSFILE?=	${PORT_DBDIR}/pear-${PORTNAME}/options
 OPTIONS_DEFINE=	DBLIB MYSQL ODBC PGSQL SQLITE
 OPTIONS_DEFAULT=MYSQL

--- a/databases/proftpd-mod_sql_mysql/Makefile
+++ b/databases/proftpd-mod_sql_mysql/Makefile
@ -12,7 +12,6 @@ LICENSE=	GPLv2

 DESCR=		${.CURDIR}/pkg-descr

-LATEST_LINK=	${PKGNAMEPREFIX}-${PORTNAME}
 MASTERDIR=	${.CURDIR}/../../ftp/proftpd

 USE_MYSQL=	yes
--- a/databases/proftpd-mod_sql_odbc/Makefile
+++ b/databases/proftpd-mod_sql_odbc/Makefile
@ -14,7 +14,6 @@ LIB_DEPENDS=	libiodbc.so:${PORTSDIR}/databases/libiodbc

 DESCR=		${.CURDIR}/pkg-descr

-LATEST_LINK=	${PKGNAMEPREFIX}-${PORTNAME}
 MASTERDIR=	${.CURDIR}/../../ftp/proftpd

 CONFIGURE_ARGS=	LIBS=-liodbc \
--- a/databases/proftpd-mod_sql_sqlite/Makefile
+++ b/databases/proftpd-mod_sql_sqlite/Makefile
@ -13,7 +13,6 @@ LICENSE=	GPLv2

 DESCR=		${.CURDIR}/pkg-descr

-LATEST_LINK=	${PKGNAMEPREFIX}-${PORTNAME}
 MASTERDIR=	${.CURDIR}/../../ftp/proftpd

 USE_SQLITE=	yes
--- a/databases/proftpd-mod_sql_tds/Makefile
+++ b/databases/proftpd-mod_sql_tds/Makefile
@ -14,7 +14,6 @@ LICENSE=	GPLv2

 DESCR=		${.CURDIR}/pkg-descr

-LATEST_LINK=	${PKGNAMEPREFIX}-${PORTNAME}
 MASTERDIR=	${.CURDIR}/../../ftp/proftpd

 LIB_DEPENDS+=	libsybdb.so.5:${PORTSDIR}/databases/freetds
--- a/databases/py-MySQLdb/Makefile
+++ b/databases/py-MySQLdb/Makefile
@ -23,7 +23,6 @@ PORTDOCS=	*
 DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
 WRKSRC=		${WRKDIR}/${PORTNAME}1-${PORTNAME}-${PORTVERSION}

-OPTIONSFILE=	${PORT_DBDIR}/${PORTNAME}/options
 OPTIONS_DEFINE=		DOCS MYSQLCLIENT_R
 OPTIONS_DEFAULT=	MYSQLCLIENT_R
 MYSQLCLIENT_R_DESC=	Use libmysqlclient_r (thread safe)
--- a/databases/py-pyPgSQL/Makefile
+++ b/databases/py-pyPgSQL/Makefile
@ -25,9 +25,6 @@ OPTIONS_DEFINE=	BYTEA_CONN EXAMPLES DOCS
 OPTIONS_DEFAULT=	BYTEA_CONN
 BYTEA_CONN_DESC=	Apply Bytea connection patch

-# bypass infrastructure bug
-OPTIONSFILE=	${PORT_DBDIR}/py-${PORTNAME}/options
-
 .include <bsd.port.options.mk>

 .if ${PORT_OPTIONS:MBYTEA_CONN}
--- a/databases/py-sqlalchemy-devel/Makefile
+++ b/databases/py-sqlalchemy-devel/Makefile
@ -32,9 +32,6 @@ OPTIONS_DEFAULT=	SQLITE
 SYBASE_DESC=	Sybase backend
 TESTS_DESC=	Include nose for unit tests

-# bypass infrastructure bug
-OPTIONSFILE=	${PORT_DBDIR}/py-${PORTNAME}/options
-
 MSSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mssql>0:${PORTSDIR}/databases/py-mssql
 PGSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psycopg2>=2.0.8:${PORTSDIR}/databases/py-psycopg2
 SQLITE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3
--- a/databases/py-sqlalchemy/Makefile
+++ b/databases/py-sqlalchemy/Makefile
@ -32,9 +32,6 @@ MSSQL_DESC=	MS SQL Server backend
 TESTS_DESC=	Include nose for unit tests
 SYBASE_DESC=	Sybase backend

-# bypass infrastructure bug
-OPTIONSFILE=	${PORT_DBDIR}/py-${PORTNAME}/options
-
 .include <bsd.port.options.mk>

 DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
--- a/databases/py-sqlalchemy06/Makefile
+++ b/databases/py-sqlalchemy06/Makefile
@ -18,9 +18,6 @@ LICENSE=	MIT
 USES=		python
 USE_PYTHON=	distutils autoplist

-# bypass infrastructure bug
-OPTIONSFILE=	${PORT_DBDIR}/py-${PORTNAME}/options
-
 OPTIONS_DEFINE=	CEXTENSIONS DOCS EXAMPLES NOSE

 OPTIONS_MULTI=	BACKEND
--- a/databases/ruby-bdb/Makefile
+++ b/databases/ruby-bdb/Makefile
@ -20,7 +20,6 @@ LICENSE=	RUBY
 USE_BDB=	yes

 OPTIONS_DEFINE=	DOCS EXAMPLES
-OPTIONSFILE=	${PORT_DBDIR}/ruby-${PORTNAME}/options

 USE_RUBY=		yes
 USE_RUBY_EXTCONF=	yes
--- a/databases/rubygem-activerecord/Makefile
+++ b/databases/rubygem-activerecord/Makefile
@ -26,7 +26,6 @@ OPTIONS_DEFINE=	MYSQL PGSQL SQLITE3
 MYSQL_DESC=	Use native MySQL bindings
 PGSQL_DESC=	Use native PostgreSQL bindings
 SQLITE3_DESC=	Use native SQLite3 bindings
-OPTIONSFILE=	${PORT_DBDIR}/rubygem-${PORTNAME}/options

 GEM_ENV+=	LANG=en_US.UTF-8

--- a/databases/squirrel-sql/Makefile
+++ b/databases/squirrel-sql/Makefile
@ -20,7 +20,7 @@ WRKSRC=		${WRKDIR}/${DISTNAME}

 SUB_FILES=	squirrel-sql

-DATADIR=	${PREFIX}/share/java/${UNIQUENAME}
+DATADIR=	${PREFIX}/share/java/${PKGBASE}

 DESKTOP_ENTRIES="Squirrel-SQL Client" \
 		"${COMMENT}" \
--- a/deskutils/gworkspace-gwmetadata/Makefile
+++ b/deskutils/gworkspace-gwmetadata/Makefile
@ -22,7 +22,6 @@ USE_LDCONFIG=	${GNUSTEP_SYSTEM_LIBRARIES}
 USE_SQLITE=	yes
 LDFLAGS+=	-lpthread

-UNIQUENAME=	${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
 WRKSRC=		${WRKDIR}/gworkspace-${PORTVERSION}/GWMetadata
 CONFIGURE_ARGS+=	--with-sqlite-include=${LOCALBASE}/include
 CONFIGURE_ARGS+=	--with-sqlite-library=${LOCALBASE}/lib
--- 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
--- 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}

--- 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]*
--- 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
--- 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
--- 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
--- 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

--- 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

--- 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

--- 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
--- 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}

--- 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/*
--- 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
--- 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
--- 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

--- 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>
--- 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
--- 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

--- 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

--- 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} \
--- 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 \
--- 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
--- 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>

--- 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
--- 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
--- 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=	*
--- 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
--- 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

--- 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>

--- 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}
--- 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
--- 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

--- 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

--- a/dns/samba-nsupdate/Makefile
+++ b/dns/samba-nsupdate/Makefile
@ -41,8 +41,8 @@ OPTIONS_DEFINE=	IPV6
 SIGCHASE_CONFIGURE_ARGS+=	STD_CDEFINES="-DDIG_SIGCHASE=1"
 IPV6_CONFIGURE_ON=	--enable-ipv6

-PLIST_FILES=		bin/${UNIQUENAME} \
-			man/man1/${UNIQUENAME}.1.gz
+PLIST_FILES=		bin/${PKGBASE} \
+			man/man1/${PKGBASE}.1.gz

 .include <bsd.port.pre.mk>

@ -76,11 +76,11 @@ post-patch:
 		-e 's|^.*check confgen ||' \
 	${WRKSRC}/bin/Makefile.in
 	@${REINPLACE_CMD} \
-		-e 's|${PORTNAME}|${UNIQUENAME}|g' \
+		-e 's|${PORTNAME}|${PKGBASE}|g' \
 	${WRKSRC}/bin/nsupdate/${PORTNAME}.1

 do-install:
-	${INSTALL_MAN} ${WRKSRC}/bin/nsupdate/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1/${UNIQUENAME}.1
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/nsupdate/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${UNIQUENAME}
+	${INSTALL_MAN} ${WRKSRC}/bin/nsupdate/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1/${PKGBASE}.1
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/nsupdate/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PKGBASE}

 .include <bsd.port.post.mk>
--- a/editors/2bsd-vi/Makefile
+++ b/editors/2bsd-vi/Makefile
@ -17,7 +17,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE

 USES=	tar:bzip2

-PRESERVEDIR=	/var/preserve/${UNIQUENAME}
+PRESERVEDIR=	/var/preserve/${PKGBASE}
 PLIST_SUB=	PRESERVEDIR="${PRESERVEDIR}"

 post-extract:	.SILENT
--- a/editors/emacs-nox11/Makefile
+++ b/editors/emacs-nox11/Makefile
@ -10,6 +10,5 @@ OPTIONS_EXCLUDE=GCONF GIF JPEG OTF M17N PNG SVG TIFF SYNC_INPUT GTK2 GTK3 \
 EMACS_NO_X11_SLAVE=	yes

 MASTERDIR=	${.CURDIR}/../emacs
-LATEST_LINK=	emacs-nox11

 .include "${MASTERDIR}/Makefile"
--- a/editors/libreoffice-i18n/Makefile
+++ b/editors/libreoffice-i18n/Makefile
@ -2,7 +2,6 @@

 .include "${.CURDIR}/../libreoffice/Makefile.common"
 PORTREVISION=	0
-UNIQUENAME=	${PORTNAME}${PKGNAMESUFFIX}
 PKGNAMESUFFIX=	-i18n
 DISTFILES=	#none
 MASTER_SITES=	#none
--- a/editors/openoffice-4/Makefile
+++ b/editors/openoffice-4/Makefile
@ -111,8 +111,6 @@ AOOUDIR=		.openoffice.org\/${AOOVERSION1}
 INSTALLATION_BASEDIR?=	openoffice-${AOOSUFFIX}
 EXECBASE?=		openoffice-${AOOSUFFIX}

-NO_LATEST_LINK=	yes
-
 ONLY_FOR_ARCHS=	i386 amd64

 USE_GL=		gl glu
--- a/editors/openoffice-devel/Makefile
+++ b/editors/openoffice-devel/Makefile
@ -123,8 +123,6 @@ AOOUDIR=		.openoffice.org\/${AOOVERSION1}
 INSTALLATION_BASEDIR?=	openoffice-${AOOSUFFIX}
 EXECBASE?=		openoffice-${AOOSUFFIX}

-NO_LATEST_LINK=	yes
-
 ONLY_FOR_ARCHS=	i386 amd64

 USE_GL=		gl glu
--- a/emulators/generator-cbiere/Makefile
+++ b/emulators/generator-cbiere/Makefile
@ -19,14 +19,14 @@ USES=		gmake jpeg tar:bzip2
 USE_GNOME=	gtk12
 USE_SDL=	sdl
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--program-transform-name=s/${PORTNAME}/${UNIQUENAME}/ \
+CONFIGURE_ARGS=	--program-transform-name=s/${PORTNAME}/${PORTNAME}/ \
 		--with-gtk
 MAKE_JOBS_UNSAFE=	yes

 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib

-PLIST_FILES=	bin/${UNIQUENAME}-gtk
+PLIST_FILES=	bin/${PORTNAME}-gtk

 OPTIONS_DEFINE=		OPTIMIZED_CFLAGS SDL
 OPTIONS_DEFINE_i386=	RAZE
--- a/emulators/i386-wine-devel/Makefile.inc
+++ b/emulators/i386-wine-devel/Makefile.inc
@ -28,7 +28,7 @@ CONFLICTS_INSTALL?=     wine-[0-9]* wine-staging-[0-9]* wine-devel-[0-9]* \

 EXTRACT_AFTER_ARGS=	-C / --exclude +COMPACT_MANIFEST --exclude +MANIFEST \
 				--exclude +MTREE_DIRS --exclude share/licenses/'*' \
-				--exclude libdata/ldconfig32/${UNIQUENAME} \
+				--exclude libdata/ldconfig32/${PKGNAMEPREFIX}${PORTNAME} \
 				-s '|/usr/local|${STAGEDIR}${PREFIX}|gs'
 NO_BUILD=	yes
 ONLY_FOR_ARCHS=	i386 amd64
--- a/emulators/i386-wine/Makefile.inc
+++ b/emulators/i386-wine/Makefile.inc
@ -28,7 +28,7 @@ CONFLICTS_INSTALL?=	wine-[0-9]* wine-staging-[0-9]* wine-devel-[0-9]* \

 EXTRACT_AFTER_ARGS=	-C / --exclude +COMPACT_MANIFEST --exclude +MANIFEST \
 				--exclude +MTREE_DIRS --exclude share/licenses/'*' \
-				--exclude libdata/ldconfig32/${UNIQUENAME} \
+				--exclude libdata/ldconfig32/${PKGNAMEPREFIX}-${PORTNAME} \
 				-s '|/usr/local|${STAGEDIR}${PREFIX}|gs'
 NO_BUILD=	yes
 ONLY_FOR_ARCHS=	i386 amd64
--- a/emulators/linux_base-c6/Makefile
+++ b/emulators/linux_base-c6/Makefile
@ -175,7 +175,6 @@ FALLBACK_ELF_MIB=	kern.fallback_elf_brand

 .if (${ARCH} == "amd64")
 .	if defined(OVERRIDE_LINUX_BASE_PORT) && ${OVERRIDE_LINUX_BASE_PORT} != "c6_64"
-LATEST_LINK:=		${PKGBASE:C/linux/linux32/}
 ARCH=			i386
 .	endif
 .endif
--- a/emulators/linux_base-f10/Makefile
+++ b/emulators/linux_base-f10/Makefile
@ -146,7 +146,6 @@ FALLBACK_ELF_MIB=	kern.fallback_elf_brand
 .endif

 .if (${ARCH} == "amd64")
-LATEST_LINK:=		${PKGBASE:C/linux/linux32/}
 ARCH=			i386
 .endif

--- a/emulators/mupen64plus-core/Makefile
+++ b/emulators/mupen64plus-core/Makefile
@ -24,7 +24,6 @@ ONLY_FOR_ARCHS=	i386 amd64
 OPTFLAGS=	#

 MAKE_ENV+=	OPTFLAGS="${OPTFLAGS}"
-OPTIONSFILE=	${PORT_DBDIR}/${PORTNAME}${PKGNAMESUFFIX}/options

 .include "${.CURDIR}/../mupen64plus-core/Makefile.common"
 .include <bsd.port.mk>
--- a/emulators/virtualbox-ose-additions/Makefile
+++ b/emulators/virtualbox-ose-additions/Makefile
@ -22,7 +22,6 @@ BUILD_DEPENDS=	yasm:${PORTSDIR}/devel/yasm \
 CPE_VENDOR=	oracle
 CPE_PRODUCT=	vm_virtualbox

-UNIQUENAME=	${PORTNAME}${PKGNAMESUFFIX}
 PATCHDIR=	${.CURDIR}/../${PORTNAME}/files
 WRKSRC=		${WRKDIR}/VirtualBox-${PORTVERSION}
 USE_RC_SUBR=	vboxguest vboxservice
--- a/emulators/virtualbox-ose-kmod/Makefile
+++ b/emulators/virtualbox-ose-kmod/Makefile
@ -22,7 +22,6 @@ CPE_VENDOR=	oracle
 CPE_PRODUCT=	vm_virtualbox

 USES=		cpe kmod tar:bzip2
-UNIQUENAME=	${PORTNAME}${PKGNAMESUFFIX}
 PATCHDIR=	${.CURDIR}/../${PORTNAME}/files
 WRKSRC=		${WRKDIR}/VirtualBox-${PORTVERSION}
 USE_RC_SUBR=	vboxnet
--- a/finance/ledgersmb12/Makefile
+++ b/finance/ledgersmb12/Makefile
@ -15,8 +15,6 @@ BUILD_DEPENDS=	p5-DBD-Pg>=0:${PORTSDIR}/databases/p5-DBD-Pg \
 		p5-Config-Std>=0:${PORTSDIR}/devel/p5-Config-Std
 RUN_DEPENDS:=	${BUILD_DEPENDS}

-LATEST_LINK=	ledgersmb12
-
 WRKSRC=		${WRKDIR}/${PORTNAME}
 NO_BUILD=	yes
 NO_ARCH=	yes
--- a/ftp/curl-hiphop/Makefile
+++ b/ftp/curl-hiphop/Makefile
@ -15,7 +15,6 @@ EXTRA_PATCHES=	${.CURDIR}/files/extra-patch-hiphop
 GNU_CONFIGURE_PREFIX=	${PREFIX}/${HIPHOP_DIR}/ext
 CONFIGURE_ARGS+=	--disable-shared --enable-static
 PLIST_SUB+=	HIPHOP_DIR="${HIPHOP_DIR}"
-LATEST_LINK=	curl-hiphop
 PLIST=		${.CURDIR}/pkg-plist
 DESCR=		${.CURDIR}/pkg-descr

--- a/ftp/proftpd-mod_geoip/Makefile
+++ b/ftp/proftpd-mod_geoip/Makefile
@ -14,7 +14,6 @@ LIB_DEPENDS=	libGeoIP.so:${PORTSDIR}/net/GeoIP

 DESCR=		${.CURDIR}/pkg-descr

-LATEST_LINK=	${PKGNAMEPREFIX}-${PORTNAME}
 MASTERDIR=	${.CURDIR}/../../ftp/proftpd

 INCLUDEDIRS=	${LOCALBASE}/include
--- a/ftp/py-pyftpdlib/Makefile
+++ b/ftp/py-pyftpdlib/Makefile
@ -21,9 +21,6 @@ OPTIONS_DEFAULT=	SENDFILE OPENSSL
 SENDFILE_DESC=		Enable sendfile(2) support
 OPENSSL_DESC=		Enable FTP over SSL/TLS (RFC4217)

-# Workaround ports infrastructure bug
-OPTIONSFILE=	${PORT_DBDIR}/py-${PORTNAME}/options
-
 SENDFILE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pysendfile>0:${PORTSDIR}/net/py-pysendfile
 OPENSSL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}openssl>0:${PORTSDIR}/security/py-openssl

--- a/games/doom-data/Makefile
+++ b/games/doom-data/Makefile
@ -28,7 +28,6 @@ STRIFE_DESC=	Install Strife shareware data

 SUB_FILES=	pkg-message

-LATEST_LINK=	${PKGNAMEPREFIX}${PORTNAME}
 DATADIR=	${DMDIR}

 DOOM_DISTFILES=	doom1.wad.bz2
--- a/games/ioquake3-devel-server/Makefile
+++ b/games/ioquake3-devel-server/Makefile
@ -7,7 +7,6 @@ PKGNAMESUFFIX=	-server
 MAINTAINER=	kamikaze@bsdforen.de
 COMMENT=	Ioquake3 development snapshot dedicated server

-UNIQUENAME=	${PORTNAME}${PKGNAMESUFFIX}
 MASTERDIR=	${.CURDIR}/../${PORTNAME}

 IOQ3=		SERVER GAMELIBS
--- a/games/ioquake3-server/Makefile
+++ b/games/ioquake3-server/Makefile
@ -7,7 +7,6 @@ PKGNAMESUFFIX=	-server
 MAINTAINER=	kamikaze@bsdforen.de
 COMMENT=	Ioquake3 dedicated server

-UNIQUENAME=	${PORTNAME}${PKGNAMESUFFIX}
 MASTERDIR=	${.CURDIR}/../${PORTNAME}

 IOQ3=		SERVER GAMELIBS
--- a/games/iourbanterror-server/Makefile
+++ b/games/iourbanterror-server/Makefile
@ -7,7 +7,6 @@ PKGNAMESUFFIX=	-server
 MAINTAINER=	kamikaze@bsdforen.de
 COMMENT=	Urban Terror dedicated server

-UNIQUENAME=	${PORTNAME}${PKGNAMESUFFIX}
 MASTERDIR=	${.CURDIR}/../${PORTNAME}

 IOQ3=		SERVER
--- a/games/linux-quake3/Makefile
+++ b/games/linux-quake3/Makefile
@ -35,7 +35,6 @@ PUNKBUSTER_DESC=	Install PunkBuster
 SMP_DESC=	Install SMP (threaded) client

 PLIST_SUB+=	LIBDIR="libexec/${PKGNAMEPREFIX}${PORTNAME}"
-LATEST_LINK=	${PKGNAMEPREFIX}${PORTNAME}

 LIBDIR=		${PREFIX}/libexec/${PKGNAMEPREFIX}${PORTNAME}
 Q3DATAFILE=	linuxq3apoint-1.32b-3.x86.run
--- a/games/nethack33/Makefile
+++ b/games/nethack33/Makefile
@ -12,7 +12,6 @@ MAINTAINER=	glewis@FreeBSD.org
 COMMENT=	Dungeon explorin', slashin', hackin' game

 WRKSRC=		${WRKDIR}/${TRUEPORTNAME}-${PORTVERSION}
-LATEST_LINK=	${TRUEPORTNAME}33${PKGNAMESUFFIX}

 USES=		gmake tar:tgz
 MAKE_ENV=	GRAPHICS="${GRAPHICS}"
--- a/games/openarena-server/Makefile
+++ b/games/openarena-server/Makefile
@ -7,7 +7,6 @@ PKGNAMESUFFIX=	-server
 MAINTAINER=	kamikaze@bsdforen.de
 COMMENT=	OpenArena dedicated server

-UNIQUENAME=	${PORTNAME}${PKGNAMESUFFIX}
 MASTERDIR=	${.CURDIR}/../${PORTNAME}

 IOQ3=		SERVER
--- a/games/opengfx/Makefile
+++ b/games/opengfx/Makefile
@ -16,7 +16,6 @@ LICENSE=	GPLv2

 USES=		zip
 NO_BUILD=	yes
-LATEST_LINK=	openttd-${PORTNAME}

 # upstream zipped a tar file, unpack it.
 post-extract:
--- a/games/opensfx/Makefile
+++ b/games/opensfx/Makefile
@ -20,7 +20,6 @@ LICENSE_PERMS=	auto-accept

 USES=		zip
 NO_BUILD=	yes
-LATEST_LINK=	openttd-${PORTNAME}

 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/openttd/baseset/opensfx
--- a/games/quake-source/Makefile
+++ b/games/quake-source/Makefile
@ -16,8 +16,6 @@ COMMENT=	Quake game source code
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes

-LATEST_LINK=	${PKGNAMEPREFIX}${PORTNAME}
-
 OPTIONS_DEFINE=	QUAKEWORLD
 OPTIONS_DEFAULT=	QUAKEWORLD

--- a/games/quake2-3zb2/Makefile
+++ b/games/quake2-3zb2/Makefile
@ -21,7 +21,7 @@ DOS2UNIX_FILES=	*.[ch]
 NO_WRKSUBDIR=	yes
 SUB_FILES=	pkg-message

-DOCSDIR=	${PREFIX}/share/doc/${LATEST_LINK}
+DOCSDIR=	${PREFIX}/share/doc/${PKGBASE}

 OPTIONS_DEFINE=	ROUTES DOCS
 OPTIONS_DEFAULT=	ROUTES
--- a/games/quake2-ctf/Makefile
+++ b/games/quake2-ctf/Makefile
@ -17,8 +17,7 @@ USES=		dos2unix zip:infozip
 DOS2UNIX_FILES=	../../../ctf/readme.txt ../../../ctf/server.cfg
 WRKSRC=		${WRKDIR}/${CTF_SRC:S/.tar.gz//}/src/ctf

-DOCSDIR=	${PREFIX}/share/doc/${LATEST_LINK}
-LATEST_LINK=	${PKGNAMEPREFIX}${PORTNAME}
+DOCSDIR=	${PREFIX}/share/doc/${PKGBASE}

 CTF_DATA=	q2ctf150.zip
 CTF_SRC=	quake2-r0.16.2.tar.gz
--- a/games/quake2-data/Makefile
+++ b/games/quake2-data/Makefile
@ -16,9 +16,8 @@ COMMENT=	Quake II data files
 USES=		zip:infozip
 NO_WRKSUBDIR=	yes

-LATEST_LINK=	${PKGNAMEPREFIX}${PORTNAME}
 DATADIR=	${Q2DIR}
-DOCSDIR=	${PREFIX}/share/doc/${LATEST_LINK}
+DOCSDIR=	${PREFIX}/share/doc/${PKGBASE}

 Q2_DEMO=	q2-314-demo-x86.exe
 Q2_SRC=		q2src${PORTVERSION:S|.||}.shar.Z
--- a/games/quake2-extras/Makefile
+++ b/games/quake2-extras/Makefile
@ -10,7 +10,7 @@ MASTER_SITES=	http://offload1.icculus.org/quake2/files/:retex \
 		http://www-personal.umich.edu/~jimw/q2/aq2_install/:models
 PKGNAMEPREFIX=	${Q2PKGNAMEPREFIX}
 DISTFILES=	#
-DIST_SUBDIR=	${LATEST_LINK}
+DIST_SUBDIR=	${PKGBASE}
 EXTRACT_ONLY=	#

 MAINTAINER=	danfe@FreeBSD.org
@ -19,8 +19,6 @@ COMMENT=	Quake II extras (high quality textures and skins)
 USES=		zip
 NO_WRKSUBDIR=	yes

-LATEST_LINK=	${PKGNAMEPREFIX}${PORTNAME}
-
 RETEX_PAKS=	10 11 12 13 14 16 17 19
 RETEX_FULL=	all_q2_textures_07_17_2006zip
 SKINS=		models.zip
--- a/Show More
+++ b/Show More