Date: Fri, 20 Sep 2013 07:43:52 +0000 (UTC) From: Pietro Cerutti <gahr@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r327665 - in head: lang/tcl84 lang/tcl85 lang/tcl86 x11-toolkits/tk84 x11-toolkits/tk85 x11-toolkits/tk86 Message-ID: <201309200743.r8K7hqQZ071375@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gahr Date: Fri Sep 20 07:43:51 2013 New Revision: 327665 URL: http://svnweb.freebsd.org/changeset/ports/327665 Log: - Finish up the change of PKGNAME for Tcl/Tk ports to match LATEST_LINK Suggested by: bapt Modified: head/lang/tcl84/Makefile head/lang/tcl85/Makefile head/lang/tcl86/Makefile head/x11-toolkits/tk84/Makefile head/x11-toolkits/tk85/Makefile head/x11-toolkits/tk86/Makefile Modified: head/lang/tcl84/Makefile ============================================================================== --- head/lang/tcl84/Makefile Fri Sep 20 07:32:38 2013 (r327664) +++ head/lang/tcl84/Makefile Fri Sep 20 07:43:51 2013 (r327665) @@ -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}" \ Modified: head/lang/tcl85/Makefile ============================================================================== --- head/lang/tcl85/Makefile Fri Sep 20 07:32:38 2013 (r327664) +++ head/lang/tcl85/Makefile Fri Sep 20 07:43:51 2013 (r327665) @@ -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} \ Modified: head/lang/tcl86/Makefile ============================================================================== --- head/lang/tcl86/Makefile Fri Sep 20 07:32:38 2013 (r327664) +++ head/lang/tcl86/Makefile Fri Sep 20 07:43:51 2013 (r327665) @@ -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} \ Modified: head/x11-toolkits/tk84/Makefile ============================================================================== --- head/x11-toolkits/tk84/Makefile Fri Sep 20 07:32:38 2013 (r327664) +++ head/x11-toolkits/tk84/Makefile Fri Sep 20 07:43:51 2013 (r327665) @@ -6,6 +6,8 @@ PORTEPOCH= 2 CATEGORIES= x11-toolkits tk MASTER_SITES= ${MASTER_SITE_TCLTK} \ SF/tcl/Tcl/${PORTVERSION} +MASTER_SITE_SUBDIR=tcl8_4 +PKGNAMESUFFIX= ${PORTVERSION:R:S/.//} DISTNAME= ${PORTNAME}${PORTVERSION}-src MAINTAINER= tcltk@FreeBSD.org @@ -23,8 +25,8 @@ WRKSRC= ${WRKDIR}/${PORTNAME}${PORTVERS ALL_TARGET= all INSTALL_TARGET= install +USES+= tcl:${SHORT_TK_VER} USE_LDCONFIG= yes -USE_TCL= ${SHORT_TK_VER} USE_XORG= x11 CFLAGS+= -I${TCL_INCLUDEDIR}/generic GNU_CONFIGURE= yes @@ -39,7 +41,6 @@ CFLAGS+= -I${TCL_INCLUDEDIR} TK_VER= ${PORTVERSION:R} SHORT_TK_VER= ${TK_VER:S/.//} -LATEST_LINK= ${PORTNAME}${SHORT_TK_VER} MAN_SUFFIX= ${LATEST_LINK} MAKE_ENV= SHORT_TK_VER=${SHORT_TK_VER} Modified: head/x11-toolkits/tk85/Makefile ============================================================================== --- head/x11-toolkits/tk85/Makefile Fri Sep 20 07:32:38 2013 (r327664) +++ head/x11-toolkits/tk85/Makefile Fri Sep 20 07:43:51 2013 (r327665) @@ -2,12 +2,13 @@ # $FreeBSD$ PORTNAME= tk -DISTVERSION= 8.5.15 +PORTVERSION= 8.5.15 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_TCLTK} \ SF/tcl/Tcl/${PORTVERSION} MASTER_SITE_SUBDIR=tcl8_5 -DISTNAME= ${PORTNAME}${DISTVERSION}-src +PKGNAMESUFFIX= ${PORTVERSION:R:S/.//} +DISTNAME= ${PORTNAME}${PORTVERSION}-src MAINTAINER= tcltk@FreeBSD.org COMMENT= Graphical toolkit for Tcl @@ -16,7 +17,7 @@ LICENSE= BSD LICENSE_TERMS= ${WRKSRC}/../license.terms -LATEST_LINK= tk85 +USES+= tcl:${SHORT_TK_VER} USE_XORG= x11 xft xscrnsaver USE_LDCONFIG= yes WRKSRC= ${WRKDIR}/${DISTNAME:S/-src//}/unix @@ -32,7 +33,6 @@ CONFIGURE_ARGS= --enable-shared \ CONFIGURE_ENV= PORTSDIR=${PORTSDIR} TK_LIB_FILE=libtk${SHORT_TK_VER}.so.1 \ ac_cv_path_tclsh="${LOCALBASE}/bin/tclsh${TK_VER}" -LATEST_LINK= ${PORTNAME}${SHORT_TK_VER} MAN_SUFFIX= ${LATEST_LINK} INSTALL_TARGET= install @@ -44,8 +44,6 @@ MANCOMPRESSED= no DATADIR= ${PREFIX}/share/${PORTNAME}${TK_VER} SUB_FILES= pkgIndex.tcl -USE_TCL= ${SHORT_TK_VER} - OPTIONS_DEFINE= TK85_MAN DEMOS THREADS OPTIONS_DEFAULT=THREADS TK85_MAN_DESC= Install tk 8.5 function manpages Modified: head/x11-toolkits/tk86/Makefile ============================================================================== --- head/x11-toolkits/tk86/Makefile Fri Sep 20 07:32:38 2013 (r327664) +++ head/x11-toolkits/tk86/Makefile Fri Sep 20 07:43:51 2013 (r327665) @@ -45,7 +45,6 @@ CFLAGS+= -I${TCL_INCLUDEDIR} \ TK_VER= ${PORTVERSION:R} SHORT_TK_VER= ${TK_VER:S/.//} -LATEST_LINK= ${PORTNAME}${SHORT_TK_VER} MAN_SUFFIX= ${LATEST_LINK} MAKE_ENV= SHORT_TK_VER=${SHORT_TK_VER}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309200743.r8K7hqQZ071375>