From fba6dc07b9c26d59ed3b5f8a41d6a03f822a9e6a Mon Sep 17 00:00:00 2001
From: gahr <gahr@FreeBSD.org>
Date: Fri, 20 Sep 2013 07:43:51 +0000
Subject: - Finish up the change of PKGNAME for Tcl/Tk ports to match
 LATEST_LINK

Suggested by:	bapt
---
 lang/tcl84/Makefile | 6 +++---
 lang/tcl85/Makefile | 1 -
 lang/tcl86/Makefile | 1 -
 3 files changed, 3 insertions(+), 5 deletions(-)

(limited to 'lang')

diff --git a/lang/tcl84/Makefile b/lang/tcl84/Makefile
index a15bc518ca86..283dba3263d4 100644
--- a/lang/tcl84/Makefile
+++ b/lang/tcl84/Makefile
@@ -2,14 +2,15 @@
 # $FreeBSD$
 
 PORTNAME=	tcl
-DISTVERSION=	8.4.20
+PORTVERSION=	8.4.20
 PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	lang tcl
 MASTER_SITES=	${MASTER_SITE_TCLTK} \
 		SF/tcl/Tcl/${PORTVERSION}
 MASTER_SITE_SUBDIR=	tcl8_4
-DISTNAME=	${PORTNAME}${DISTVERSION}-src
+PKGNAMESUFFIX=	${PORTVERSION:R:S/.//}
+DISTNAME=	${PORTNAME}${PORTVERSION}-src
 
 MAINTAINER=	tcltk@FreeBSD.org
 COMMENT=	Tool Command Language
@@ -34,7 +35,6 @@ CONFIGURE_ENV=	PORTSDIR=${PORTSDIR}
 
 TCL_VER=	8.4
 SHORT_TCL_VER=	${TCL_VER:S/8./8/}
-LATEST_LINK=	${PORTNAME}${SHORT_TCL_VER}
 MAN_SUFFIX=	${LATEST_LINK}
 
 MAKE_ENV=	SHORT_TCL_VER="${SHORT_TCL_VER}" \
diff --git a/lang/tcl85/Makefile b/lang/tcl85/Makefile
index d550467c2e36..8f648a145f62 100644
--- a/lang/tcl85/Makefile
+++ b/lang/tcl85/Makefile
@@ -35,7 +35,6 @@ CONFIGURE_ENV=	PORTSDIR=${PORTSDIR}
 
 TCL_VER=	8.5
 SHORT_TCL_VER=	${TCL_VER:S/8./8/}
-LATEST_LINK=	${PORTNAME}${SHORT_TCL_VER}
 MAN_SUFFIX=	${LATEST_LINK}
 
 MAKE_ENV=	SHORT_TCL_VER=${SHORT_TCL_VER} \
diff --git a/lang/tcl86/Makefile b/lang/tcl86/Makefile
index 2ff98fd7f16f..1c085f8b48c3 100644
--- a/lang/tcl86/Makefile
+++ b/lang/tcl86/Makefile
@@ -36,7 +36,6 @@ CONFIGURE_ENV=	PORTSDIR=${PORTSDIR}
 
 TCL_VER=	${PORTVERSION:R}
 SHORT_TCL_VER=	${TCL_VER:S/.//}
-LATEST_LINK=	${PORTNAME}${SHORT_TCL_VER}
 MAN_SUFFIX=	${LATEST_LINK}
 
 MAKE_ENV=	SHORT_TCL_VER=${SHORT_TCL_VER} \
-- 
cgit