21 files changed, 8 insertions, 30 deletions

diff --git a/games/doom-data/Makefile b/games/doom-data/Makefile
index bd78d4b36311..8022fa1762f0 100644
--- 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
diff --git a/games/ioquake3-devel-server/Makefile b/games/ioquake3-devel-server/Makefile
index 894b994d48a1..d06495ee799c 100644
--- 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
diff --git a/games/ioquake3-server/Makefile b/games/ioquake3-server/Makefile
index 157753675370..f1b6f93d2b4b 100644
--- 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
diff --git a/games/iourbanterror-server/Makefile b/games/iourbanterror-server/Makefile
index 51a1eb2d1a2b..3ecc83653902 100644
--- 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
diff --git a/games/linux-quake3/Makefile b/games/linux-quake3/Makefile
index 5563c6bdd9aa..a60eb0f28405 100644
--- 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
diff --git a/games/nethack33/Makefile b/games/nethack33/Makefile
index 019ae6790276..68c585f04b51 100644
--- 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}"
diff --git a/games/openarena-server/Makefile b/games/openarena-server/Makefile
index f2c5baa89550..9c8c5a3b2319 100644
--- 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
diff --git a/games/opengfx/Makefile b/games/opengfx/Makefile
index 0babdc57b931..3bee7aa19933 100644
--- 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:
diff --git a/games/opensfx/Makefile b/games/opensfx/Makefile
index 6b599a60cd40..a4c15b3b603b 100644
--- 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
diff --git a/games/quake-source/Makefile b/games/quake-source/Makefile
index fa5c9d98ace6..dee28e5eb6f9 100644
--- 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
 
diff --git a/games/quake2-3zb2/Makefile b/games/quake2-3zb2/Makefile
index b5f68a6cab32..87344c5399a8 100644
--- 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
diff --git a/games/quake2-ctf/Makefile b/games/quake2-ctf/Makefile
index 623da296713a..97515a823d7f 100644
--- 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
diff --git a/games/quake2-data/Makefile b/games/quake2-data/Makefile
index d90f2b6b0297..907a12852171 100644
--- 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
diff --git a/games/quake2-extras/Makefile b/games/quake2-extras/Makefile
index b47ff12b3418..edfffa9aaf3c 100644
--- 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
diff --git a/games/quake2-lights/Makefile b/games/quake2-lights/Makefile
index de8f6db6a4f0..95e713945927 100644
--- a/games/quake2-lights/Makefile
+++ b/games/quake2-lights/Makefile
@@ -19,7 +19,7 @@ NO_WRKSUBDIR=	yes
 BUILD_WRKSRC=	${WRKSRC}/${PORTNAME}/src
 ALL_TARGET=	release
 
-DOCSDIR=	${PREFIX}/share/doc/${LATEST_LINK}
+DOCSDIR=	${PREFIX}/share/doc/${PKGBASE}
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/games/quake2-matrix/Makefile b/games/quake2-matrix/Makefile
index 8abba9ef4f96..bfdc416ab2c7 100644
--- a/games/quake2-matrix/Makefile
+++ b/games/quake2-matrix/Makefile
@@ -16,7 +16,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 BUILD_WRKSRC=	${WRKSRC}/MatrixFixSource
 ALL_TARGET=	release
 
-DOCSDIR=	${PREFIX}/share/doc/${LATEST_LINK}
+DOCSDIR=	${PREFIX}/share/doc/${PKGBASE}
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/games/quake2-psychomod/Makefile b/games/quake2-psychomod/Makefile
index 3e93f1d5d9e0..15fed79654b6 100644
--- a/games/quake2-psychomod/Makefile
+++ b/games/quake2-psychomod/Makefile
@@ -15,7 +15,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 BUILD_WRKSRC=	${WRKSRC}/src
 ALL_TARGET=	release
 
-DOCSDIR=	${PREFIX}/share/doc/${LATEST_LINK}
+DOCSDIR=	${PREFIX}/share/doc/${PKGBASE}
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/games/quake2-source/Makefile b/games/quake2-source/Makefile
index 037fb918de68..951496e2b0b9 100644
--- a/games/quake2-source/Makefile
+++ b/games/quake2-source/Makefile
@@ -25,8 +25,6 @@ XATRIX_DESC=	Reckoning (Xatrix) mission pack source
 
 OPTIONS_SUB=	yes
 
-LATEST_LINK=	${PKGNAMEPREFIX}${PORTNAME}
-
 DATADIR=	${PREFIX}/share/${PKGNAMEPREFIX}${PORTNAME}
 
 .include <bsd.port.options.mk>
diff --git a/games/quake2-zaero/Makefile b/games/quake2-zaero/Makefile
index d2c1662cef17..06902ef39ca3 100644
--- a/games/quake2-zaero/Makefile
+++ b/games/quake2-zaero/Makefile
@@ -17,7 +17,7 @@ USES=		dos2unix zip
 DOS2UNIX_FILES=	*.[ch]
 NO_WRKSUBDIR=	yes
 
-DOCSDIR=	${PREFIX}/share/doc/${LATEST_LINK}
+DOCSDIR=	${PREFIX}/share/doc/${PKGBASE}
 
 OPTIONS_DEFINE=	DEMO DM_MAPS DOCS
 OPTIONS_SUB=	yes
diff --git a/games/tuxpaint-fonts/Makefile b/games/tuxpaint-fonts/Makefile
index ce23d06a591c..591f18051da8 100644
--- a/games/tuxpaint-fonts/Makefile
+++ b/games/tuxpaint-fonts/Makefile
@@ -42,9 +42,6 @@ ${l:tu}_DESC=	${l:S/_/ /} fonts
 MASTER_SITES+=	SF/${PORTNAME}/${PORTNAME}-fonts/${${l:tu}_DISTNAME}:${l:tu}
 .endfor
 
-# Do not use the same OPTIONS directory as "games/tuxpaint".
-LATEST_LINK=	${PORTNAME}${PKGNAMESUFFIX}
-
 .include <bsd.port.options.mk>
 
 # Set DISTFILES and PLIST_FILES according to OPTIONS.
diff --git a/games/xpilot-ng-server/Makefile b/games/xpilot-ng-server/Makefile
index 14022a43520b..d3109537c71f 100644
--- a/games/xpilot-ng-server/Makefile
+++ b/games/xpilot-ng-server/Makefile
@@ -23,8 +23,6 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 
 CONFIGURE_ARGS=	--program-prefix=""
 
-UNIQUENAME=	${PORTNAME}${PKGNAMESUFFIX}
-
 PKGFILESUFFIX=	${PKGNAMESUFFIX:S/-/./}
 DESCR=		${PKGDIR}/pkg-descr${PKGFILESUFFIX}
 PLIST=		${PKGDIR}/pkg-plist${PKGFILESUFFIX}