- Fix package name collision

Approved by:	portmgr (bapt)

3 files changed, 16 insertions, 17 deletions

diff --git a/graphics/povray31/Makefile b/graphics/povray31/Makefile
index 70a6f5f718ca..9086dd9f2dd8 100644
--- a/graphics/povray31/Makefile
+++ b/graphics/povray31/Makefile
@@ -9,8 +9,10 @@ MASTER_SITES=	ftp://ftp.povray.org/pub/povray/%SUBDIR%/ \
 		ftp://ftp.mirrorservice.org/sites/ftp.povray.org/pub/povray/%SUBDIR%/ \
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/povray/%SUBDIR%,}
 MASTER_SITE_SUBDIR=	Old-Versions/Official-3.1g/Unix
-DISTNAME=	povray31
+PKGNAMESUFFIX=	31
+DISTNAME=	${PORTNAME}${PKGNAMESUFFIX}
 DISTFILES=	povuni_s.tgz povuni_d.tgz
+DIST_SUBDIR=	${PORTNAME}${PKGNAMESUFFIX}
 
 MAINTAINER=	bkoenig@alpha-tierchen.de
 COMMENT=	Persistence of Vision Ray Tracer
@@ -20,9 +22,6 @@ LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png
 OPTIONS_DEFINE=	X11
 OPTIONS_DEFAULT=	X11
 
-DIST_SUBDIR=	povray31
-LATEST_LINK=	povray31
-
 #
 #   I think all of this needs some explanation.
 #   The port downloads the MS-DOS source files of POV-Ray 3.1d
@@ -43,9 +42,9 @@ ALL_TARGET=	newunix
 POVBIN=		${BUILD_WRKSRC}/povray
 .endif
 
-MAN1=		${LATEST_LINK}.1
+MAN1=		${PORTNAME}${PKGNAMESUFFIX}.1
 
-POVLIB=		${PREFIX}/lib/${LATEST_LINK}
+POVLIB=		${PREFIX}/lib/${PORTNAME}${PKGNAMESUFFIX}
 
 BUILD_WRKSRC=	${WRKSRC}/source/unix
 MAKEFILE=	makefile
@@ -53,7 +52,7 @@ MAKEFILE=	makefile
 do-install:
 	@${MKDIR} ${POVLIB}/allscene
 	@${TOUCH} ${POVLIB}/allscene/.bla
-	@${INSTALL_PROGRAM} ${POVBIN} ${PREFIX}/bin/${LATEST_LINK}
+	@${INSTALL_PROGRAM} ${POVBIN} ${PREFIX}/bin/${PORTNAME}${PKGNAMESUFFIX}
 	@(cd ${WRKSRC}; ${TAR} cpf - include scenes) | \
 		(cd ${POVLIB}; ${TAR} xpf -)
 	@${INSTALL_DATA} ${WRKSRC}/*.ini ${POVLIB}/
@@ -61,8 +60,8 @@ do-install:
 	@${INSTALL_DATA} ${WRKSRC}/*.txt ${POVLIB}/
 	@${INSTALL_DATA} ${WRKSRC}/*.gif ${WRKSRC}/*.xpm ${POVLIB}/
 	@${INSTALL_SCRIPT} ${WRKSRC}/allscene.sh ${POVLIB}/
-	@${MV} ${WRKSRC}/${PORTNAME}.1 ${WRKSRC}/${LATEST_LINK}.1
-	@${INSTALL_MAN} ${WRKSRC}/${LATEST_LINK}.1 ${PREFIX}/man/man1
+	@${MV} ${WRKSRC}/${PORTNAME}.1 ${WRKSRC}/${PORTNAME}${PKGNAMESUFFIX}.1
+	@${INSTALL_MAN} ${WRKSRC}/${PORTNAME}${PKGNAMESUFFIX}.1 ${PREFIX}/man/man1
 	@${CHMOD} -R a+rX,og-w ${POVLIB}
 
 post-install:
diff --git a/graphics/povray36/Makefile b/graphics/povray36/Makefile
index 13965a475c9a..033ee8e69cff 100644
--- a/graphics/povray36/Makefile
+++ b/graphics/povray36/Makefile
@@ -9,6 +9,7 @@ MASTER_SITES=	ftp://ftp.povray.org/pub/povray/%SUBDIR%/ \
 		ftp://ftp.mirrorservice.org/sites/ftp.povray.org/pub/povray/%SUBDIR%/ \
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/povray/%SUBDIR%,}
 MASTER_SITE_SUBDIR=	Official/Unix
+PKGNAMESUFFIX=	36
 DIST_SUBDIR=	povray36
 
 MAINTAINER=	maho@FreeBSD.org
@@ -26,7 +27,6 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_AUTOTOOLS=	autoconf
-LATEST_LINK=	${PORTNAME}36
 
 NO_STAGE=	yes
 .include <bsd.port.pre.mk>
@@ -57,10 +57,10 @@ CONFIGURE_ARGS=	--x-includes="${LOCALBASE}/include" --includedir=${LOCALBASE} \
 		CXXFLAGS="${CXXFLAGS} -L${LOCALBASE}/lib" \
 		CFLAGS="${CFLAGS} -L${LOCALBASE}/lib" \
 		LDFLAGS="-L${LOCALBASE}/lib" COMPILED_BY=${MAINTAINER} \
-		--program-transform-name='s/${PORTNAME}/${UNIQUENAME}/' \
+		--program-transform-name='s/${PORTNAME}/${PORTNAME}${PKGNAMESUFFIX}/' \
 		--disable-optimiz
 
-MAN1=		${UNIQUENAME}.1
+MAN1=		${PORTNAME}${PKGNAMESUFFIX}.1
 
 post-patch:
 	#@${REINPLACE_CMD} -e 's+@PREFIX@+${PREFIX}+g;' ${WRKSRC}/povray.ini
diff --git a/graphics/povray37/Makefile b/graphics/povray37/Makefile
index bfdf9f7edf46..6cb670002b49 100644
--- a/graphics/povray37/Makefile
+++ b/graphics/povray37/Makefile
@@ -5,7 +5,8 @@ DISTVERSION=	3.7.0.RC6
 PORTREVISION=	4
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.povray.org/beta/source/
-DIST_SUBDIR=	${UNIQUENAME}
+PKGNAMESUFFIX=	37
+DIST_SUBDIR=	${PORTNAME}${PKGNAMESUFFIX}
 
 MAINTAINER=	bkoenig@alpha-tierchen.de
 COMMENT=	Persistence of Vision Ray Tracer
@@ -20,7 +21,6 @@ DOCS_DESC=	Install HTML documentation
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-LATEST_LINK=	${PORTNAME}37
 
 VERSION_BASE=	${PORTVERSION:C/([0-9]+\.[0-9]+).*/\1/}
 
@@ -32,7 +32,7 @@ ETCDIR=		${PREFIX}/etc/${PORTNAME}/${VERSION_BASE}
 INCLUDES=	-I${LOCALBASE}/include
 
 CONFIGURE_ARGS=	COMPILED_BY=${MAINTAINER} --prefix=${PREFIX} \
-		--program-transform-name='s/${PORTNAME}/${UNIQUENAME}/' \
+		--program-transform-name='s/${PORTNAME}/${PORTNAME}${PKGNAMESUFFIX}/' \
 		--disable-optimiz
 
 NO_STAGE=	yes
@@ -111,7 +111,7 @@ BROKEN=		Does not compile on sparc64: thread-local storage not supported
 
 CONFIGURE_ARGS+=CXXFLAGS="${CXXFLAGS} ${INCLUDES}"
 
-MAN1=		${UNIQUENAME}.1
+MAN1=		${PORTNAME}${PKGNAMESUFFIX}.1
 
 DOC_FILES=	AUTHORS ChangeLog NEWS
 PORTDOCS=	*
@@ -131,7 +131,7 @@ pre-build:
 .endif
 
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/unix/${PORTNAME} ${PREFIX}/bin/${UNIQUENAME}
+	@${INSTALL_PROGRAM} ${WRKSRC}/unix/${PORTNAME} ${PREFIX}/bin/${PORTNAME}${PKGNAMESUFFIX}
 	@${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${MAN1PREFIX}/man/man1/${MAN1}
 	@${MKDIR} ${ETCDIR}
 	@${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.conf ${ETCDIR}