ports/110423: Use TCL/TK 8.4: textproc/cost, take maintainership

[Martin Tournoij]

>Number:         110423
>Category:       ports
>Synopsis:       Use TCL/TK 8.4: textproc/cost, take maintainership
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Mar 17 04:40:04 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Martin Tournoij
>Release:        FreeBSD 6.2-RELEASE-p1 i386
>Organization:
>Environment:
FreeBSD glitch.carpetsmoker.net 6.2-RELEASE-p1 FreeBSD 6.2-RELEASE-p1 #0: Thu Feb 15 20:56:16 CET 2007 carpetsmoker at glitch.carpetsmoker.net:/usr/obj/nfs/tinderbox/jails/6.2/src/sys/GENERICri386

>Description:

- Use TCL/TK 8.4
- Take maintainership

>How-To-Repeat:

>Fix:

--- patch-cost begins here ---
diff -ruN --exclude=CVS /usr/ports/textproc/cost/Makefile /usr/local/tinderbox/portstrees/FreeBSD/ports/textproc/cost/Makefile
--- /usr/ports/textproc/cost/Makefile	Tue Nov  2 07:24:23 2004
+++ Makefile	Fri Mar 16 11:41:30 2007
@@ -5,21 +5,30 @@
 # $FreeBSD: ports/textproc/cost/Makefile,v 1.10 2004/11/02 06:24:23 dinoex Exp $
 #
 
-PORTNAME=		cost
-PORTVERSION=		2.2p1
-CATEGORIES=		textproc tk82
-MASTER_SITES=		http://www.flightlab.com/~joe/cost/
+PORTNAME=	cost
+PORTVERSION=	2.2p1
+PORTREVISION=	1
+CATEGORIES=	textproc tcl84
+MASTER_SITES=	http://www.flightlab.com/~joe/cost/
 
-MAINTAINER=		ports at FreeBSD.org
+MAINTAINER=	carpetsmoker at xs4all.nl
 COMMENT=	SGML/XML application programming tool
 
-LIB_DEPENDS=		tcl82.1:${PORTSDIR}/lang/tcl82
+USE_TCL=	yes
+USE_TCL_BUILD=	yes
+WRKSRC=		${WRKDIR}/${DISTNAME}/src
+GNU_CONFIGURE=	YES
+CONFIGURE_ARGS+=--with-tcl=${LOCALBASE}/lib/tcl8.4 \
+		--with-docdir=${PREFIX}/share/doc/cost --with-charmaps
+CONFIGURE_ENV+=	CFLAGS="${CFLAGS} -fPIC" TCL_INCLUDE_SPEC="${LOCALBASE}/include/tcl8.4"
 
-WRKSRC=			${WRKDIR}/${DISTNAME}/src
-GNU_CONFIGURE=		YES
-CONFIGURE_ARGS+=	--with-tcl=${LOCALBASE}/lib/tcl8.2 \
-			--with-docdir=${PREFIX}/share/doc/cost --with-charmaps
-CONFIGURE_ENV+=	CFLAGS="${CFLAGS} -fPIC" TCL_INCLUDE_SPEC="${LOCALBASE}/include/tcl8.2"
+post-patch:
+	@${REINPLACE_CMD} -e 's|TCL_SRC_DIR%g|TCL_INCLUDE_SPEC%g|' \
+		${WRKSRC}/configure
+
+post-configure:
+	@${REINPLACE_CMD} -e 's|-I$$(TCL_SRC_DIR)/generic|$$(TCL_SRC_DIR)|' \
+		${WRKSRC}/Makefile
 
 do-install:
 	${MKDIR} ${PREFIX}/lib/cost2.2
diff -ruN --exclude=CVS /usr/ports/textproc/cost/files/patch-configure /usr/local/tinderbox/portstrees/FreeBSD/ports/textproc/cost/files/patch-configure
--- /usr/ports/textproc/cost/files/patch-configure	Tue Nov  2 07:24:23 2004
+++ files/patch-configure	Thu Jan  1 01:00:00 1970
@@ -1,11 +0,0 @@
---- configure.orig	Mon Jul 19 00:36:25 1999
-+++ configure	Tue Nov  2 07:00:46 2004
-@@ -1174,7 +1174,7 @@
- s%@TCL_SHLIB_LD@%$TCL_SHLIB_LD%g
- s%@TCL_SHLIB_LD_LIBS@%$TCL_SHLIB_LD_LIBS%g
- s%@TCL_SHLIB_SUFFIX@%$TCL_SHLIB_SUFFIX%g
--s%@TCL_SRC_DIR@%$TCL_SRC_DIR%g
-+s%@TCL_SRC_DIR@%$TCL_INCLUDE_SPEC%g
- s%@TCL_PREFIX@%$TCL_PREFIX%g
- s%@TCL_EXEC_PREFIX@%$TCL_EXEC_PREFIX%g
- s%@TCL_LD_SEARCH_FLAGS@%$TCL_LD_SEARCH_FLAGS%g
--- patch-cost ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: