ports/110314: Update to TCL/TK 8.4: editors/vigor

[Martin Tournoij]

>Number:         110314
>Category:       ports
>Synopsis:       Update to TCL/TK 8.4: editors/vigor
>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:   Thu Mar 15 05:00:12 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-vigor begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/editors/vigor/Makefile,v
retrieving revision 1.15
diff -u -r1.15 Makefile
--- Makefile	27 Nov 2006 22:03:27 -0000	1.15
+++ Makefile	15 Mar 2007 04:13:46 -0000
@@ -7,30 +7,27 @@
 
 PORTNAME=	vigor
 PORTVERSION=	0.016
-CATEGORIES=	editors tk82 tcl82
+PORTREVISION=	1
+CATEGORIES=	editors tk84 tcl84
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	ports at FreeBSD.org
+MAINTAINER=	carpetsmoker at xs4all.nl
 COMMENT=	A vi clone inspired by the userfriendly comic strip
 
-LIB_DEPENDS=	tk82.1:${PORTSDIR}/x11-toolkits/tk82 \
-		tcl82.1:${PORTSDIR}/lang/tcl82
-
+USE_TCL=	yes
+USE_TK=		yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--program-transform-name="s,0,1,"
 CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib"
-USE_XLIB=	yes
 
-WRKSRC=	${WRKDIR}/${DISTNAME}/build
-CFLAGS+=	-I${LOCALBASE}/include/tcl8.2 -I${LOCALBASE}/include/tk8.2
+WRKSRC=		${WRKDIR}/${DISTNAME}/build
+CFLAGS+=	-I${LOCALBASE}/include/tcl${TCL_VER} -I${LOCALBASE}/include/tk${TK_VER}
 
-# Uglyness. So is "-ltcl -ltk -ltcl", so I don't feel bad.
 post-patch:
-	${REINPLACE_CMD} \
-		-e 's,-ltcl,-ltcl82 -L${LOCALBASE}/lib,g' \
-		-e 's,-ltk,-ltk82,g' \
-		-e 's,^grantpt,XXXgrantpt,g' \
-		${WRKSRC}/configure
+	${REINPLACE_CMD} -e 's|tcl80|tcl${TCL_VER:S/.//} -L${LOCALBASE}/lib|; \
+		s|tk80|tk${TK_VER:S/.//}|; \
+		s|^grantpt|XXXgrantpt|;' \
+			${WRKSRC}/configure
 
 .include <bsd.port.mk>
--- patch-vigor ends here ---

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