ports/110326: Use TCL/TK 8.4: games/tvp

[Martin Tournoij]

>Number:         110326
>Category:       ports
>Synopsis:       Use TCL/TK 8.4: games/tvp
>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 08:40:05 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
- Inform the user of the different binaries

>How-To-Repeat:

>Fix:

--- patch-tvp begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/games/tvp/Makefile,v
retrieving revision 1.20
diff -u -r1.20 Makefile
--- Makefile	7 Mar 2005 02:01:51 -0000	1.20
+++ Makefile	15 Mar 2007 08:36:48 -0000
@@ -7,24 +7,23 @@
 
 PORTNAME=	tvp
 PORTVERSION=	0.9.7.1
-PORTREVISION=	1
-CATEGORIES=	games tk82
+PORTREVISION=	2
+CATEGORIES=	games tk84
 MASTER_SITES=	http://www3.sympatico.ca/john.vanderhoek/tim/src/president/
 
 MAINTAINER=	hoek at FreeBSD.org
 COMMENT=	Play the cardgame President (or Ass) against 3 AIs
 
 # Comment-out this (and CFLAGS) to compile only the CLI and ansi interfaces
-LIB_DEPENDS=	tk82.1:${PORTSDIR}/x11-toolkits/tk82
-
+USE_TK=		yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-carddir=${PREFIX}/share/games/tvp \
 		--x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/tcl8.2 \
-			  -I${LOCALBASE}/include/tk8.2" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/tcl8.4 \
+			  -I${LOCALBASE}/include/tk8.4" \
 		LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib \
-		      -ltcl82 -ltk82 -lX11 -lm"
-#CFLAGS+=		-lX11 -lm -ltcl82 -ltk82 \
+		      -ltcl84 -ltk84 -lX11 -lm"
+#CFLAGS+=		-lX11 -lm -ltcl84 -ltk84 \
 #			-L${LOCALBASE}/lib -L${X11BASE}/lib
 USE_PERL5_BUILD=yes
 
@@ -46,5 +45,11 @@
 	a='${PREFIX}/share/doc/tvp/' ${PERL} -pi -e 's/TOKEN/$$ENV{a}/' \
 		${PREFIX}/man/man6/tvp.6
 	${STRIP_CMD} ${PREFIX}/bin/aprez ${PREFIX}/bin/prez ${PREFIX}/bin/xpwish
+	@${ECHO_CMD} ""
+	@${ECHO_CMD} "Use one of the following commands:"
+	@${ECHO_CMD} "prez - CLI version"
+	@${ECHO_CMD} "aprez - Curses version"
+	@${ECHO_CMD} "xprex - X11 version"
+	@${ECHO_CMD} ""
 
 .include <bsd.port.post.mk>
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/games/tvp/pkg-plist,v
retrieving revision 1.7
diff -u -r1.7 pkg-plist
--- pkg-plist	7 Mar 2005 02:15:46 -0000	1.7
+++ pkg-plist	15 Mar 2007 08:36:48 -0000
@@ -104,5 +104,4 @@
 share/games/tvp/spades-8.gif
 share/games/tvp/spades-9.gif
 @dirrm share/games/tvp
- at dirrm share/games
 @dirrm share/doc/tvp
Index: files/patch-aa
===================================================================
RCS file: /home/ncvs/ports/games/tvp/files/patch-aa,v
retrieving revision 1.2
diff -u -r1.2 patch-aa
--- files/patch-aa	28 Nov 1999 18:32:28 -0000	1.2
+++ files/patch-aa	15 Mar 2007 08:36:49 -0000
@@ -5,7 +5,7 @@
  WINDLL=true
  TCLTK=""
 -for tkver in 42 4.2 41 4.1 80 8.0
-+for tkver in 82
++for tkver in 84
  do
 -	echo $ac_n "checking for Tk_Main in -ltk${tkver}""... $ac_c" 1>&6
 -echo "configure:1313: checking for Tk_Main in -ltk${tkver}" >&5
@@ -32,7 +32,7 @@
    
  		WINDLL=false
 -		for tclver in 76 7.6 75 7.5 80 8.0
-+		for tclver in 82
++		for tclver in 84
  		do
  			echo $ac_n "checking for Tcl_Main in -ltcl${tclver}""... $ac_c" 1>&6
  echo "configure:1352: checking for Tcl_Main in -ltcl${tclver}" >&5
--- patch-tvp ends here ---

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