aboutsummaryrefslogtreecommitdiffstats
path: root/games
diff options
context:
space:
mode:
authorsteve <steve@FreeBSD.org>1999-11-29 02:32:45 +0800
committersteve <steve@FreeBSD.org>1999-11-29 02:32:45 +0800
commit08c63c7539787146848177b39e6859b9318119c8 (patch)
tree045e72940e0580d322686df49fa5f8edfa473315 /games
parent775d6227a319547ad506dac9b94354b25428275c (diff)
downloadfreebsd-ports-graphics-08c63c7539787146848177b39e6859b9318119c8.tar.gz
freebsd-ports-graphics-08c63c7539787146848177b39e6859b9318119c8.tar.zst
freebsd-ports-graphics-08c63c7539787146848177b39e6859b9318119c8.zip
Update to use Tcl/Tk version 8.2.
Submitted by: Ade Lovett <ade@lovett.com>
Diffstat (limited to 'games')
-rw-r--r--games/awele/Makefile6
-rw-r--r--games/awele/files/patch-aa4
-rw-r--r--games/bogged/Makefile2
-rw-r--r--games/bogged/files/patch-aa2
-rw-r--r--games/dontspace/Makefile6
-rw-r--r--games/ifm/Makefile3
-rw-r--r--games/merlin/Makefile2
-rw-r--r--games/merlin/files/patch-aa2
-rw-r--r--games/tksol/Makefile4
-rw-r--r--games/tksol/files/patch-a2
-rw-r--r--games/tvp/Makefile19
-rw-r--r--games/tvp/files/patch-aa32
-rw-r--r--games/tvp/files/patch-ab11
-rw-r--r--games/xchain/Makefile2
-rw-r--r--games/xchain/files/patch-aa2
15 files changed, 66 insertions, 33 deletions
diff --git a/games/awele/Makefile b/games/awele/Makefile
index 81cbc562d87..709e48ad003 100644
--- a/games/awele/Makefile
+++ b/games/awele/Makefile
@@ -8,13 +8,13 @@
DISTNAME= awele
PKGNAME= awele-1.0
-CATEGORIES= games tk80
-MASTER_SITES= http://www-rocq.inria.fr/air/ftp/Jean-Paul/
+CATEGORIES= games tk82
+MASTER_SITES= http://www-air.inria.fr/ftp/Jean-Paul/
EXTRACT_SUFX= 1.0.tgz
MAINTAINER= tg@FreeBSD.org
-LIB_DEPENDS= tk80.1:${PORTSDIR}/x11-toolkits/tk80
+LIB_DEPENDS= tk82.1:${PORTSDIR}/x11-toolkits/tk82
USE_IMAKE= yes
NO_INSTALL_MANPAGES= yes
diff --git a/games/awele/files/patch-aa b/games/awele/files/patch-aa
index 3879b3204e6..49b3146ec23 100644
--- a/games/awele/files/patch-aa
+++ b/games/awele/files/patch-aa
@@ -11,10 +11,10 @@
XCOMM libs, includes
XCOMM TK_LIB AND TK_INCLUDE stand for tk and tcl
- TK_LIB = -L/usr/local/lib -ltk -ltcl
-+ TK_LIB = -L@@LOCALBASE@@/lib -ltk80 -ltcl80
++ TK_LIB = -L@@LOCALBASE@@/lib -ltk82 -ltcl82
XCOMM TK_LIB = -L/usr/local/lib -ltk4.0 -ltcl7.4
- TK_INCLUDE = -I/usr/local/include
-+ TK_INCLUDE = -I@@LOCALBASE@@/include/tcl8.0 -I@@LOCALBASE@@/include/tk8.0
++ TK_INCLUDE = -I@@LOCALBASE@@/include/tcl8.2 -I@@LOCALBASE@@/include/tk8.2
DEFINES = $(TK_INCLUDE)
LOCAL_LIBRARIES = $(TK_LIB) -lX11 -lm
XCOMM ANSI-C compiler
diff --git a/games/bogged/Makefile b/games/bogged/Makefile
index 1bff553948e..ac5115c81a0 100644
--- a/games/bogged/Makefile
+++ b/games/bogged/Makefile
@@ -14,7 +14,7 @@ EXTRACT_SUFX= .gz
MAINTAINER= andy@icc.surw.chel.su
-RUN_DEPENDS= wish8.0:${PORTSDIR}/x11-toolkits/tk80
+RUN_DEPENDS= wish8.2:${PORTSDIR}/x11-toolkits/tk82
EXTRACT_CMD= ${CP}
EXTRACT_BEFORE_ARGS=
diff --git a/games/bogged/files/patch-aa b/games/bogged/files/patch-aa
index f303074519f..c34a7d5be4f 100644
--- a/games/bogged/files/patch-aa
+++ b/games/bogged/files/patch-aa
@@ -4,7 +4,7 @@
#!/bin/sh
# the next line restarts using wish \
-exec wish "$0" "$@"
-+exec wish8.0 "$0" "$@"
++exec wish8.2 "$0" "$@"
#
# Bogged is Copyright 1998 Todd David Rudick
diff --git a/games/dontspace/Makefile b/games/dontspace/Makefile
index 6546ce166cd..7fcd8f117b7 100644
--- a/games/dontspace/Makefile
+++ b/games/dontspace/Makefile
@@ -7,17 +7,17 @@
#
DISTNAME= dontspace-1.2
-CATEGORIES= games tk80
+CATEGORIES= games tk82
MASTER_SITES= http://www.isi.edu/~johnh/SOFTWARE/JACOBY/
MAINTAINER= johnh@isi.edu
-RUN_DEPENDS= wish8.0:${PORTSDIR}/x11-toolkits/tk80
+RUN_DEPENDS= wish8.2:${PORTSDIR}/x11-toolkits/tk82
GNU_CONFIGURE= Yes
CONFIGURE_ARGS= --bindir=${PREFIX}/bin --datadir=${PREFIX}/share/games \
--mandir=${PREFIX}/man
-CONFIGURE_ENV= WISHX=${PREFIX}/bin/wish8.0
+CONFIGURE_ENV= WISHX=${PREFIX}/bin/wish8.2
MAN6= dontspace.6
.include <bsd.port.mk>
diff --git a/games/ifm/Makefile b/games/ifm/Makefile
index d2e3acbe8ad..00a52b6528e 100644
--- a/games/ifm/Makefile
+++ b/games/ifm/Makefile
@@ -20,11 +20,12 @@ EXTRACT_SUFX= .tgz
MAINTAINER= dchapes@ddm.on.ca
-RUN_DEPENDS= wish8.0:${PORTSDIR}/x11-toolkits/tk80
+RUN_DEPENDS= wish8.2:${PORTSDIR}/x11-toolkits/tk82
WRKSRC= ${WRKDIR}/${PKGNAME}
USE_GMAKE= yes
GNU_CONFIGURE= yes
+CONFIGURE_ENV= WISH=${LOCALBASE}/bin/wish8.2
post-install:
install-info ${PREFIX}/info/ifm.info ${PREFIX}/info/dir
diff --git a/games/merlin/Makefile b/games/merlin/Makefile
index bb1b33560df..992078232b3 100644
--- a/games/merlin/Makefile
+++ b/games/merlin/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://outoften.doc.ic.ac.uk/~np2/software/download/
MAINTAINER= andy@icc.surw.chel.su
-RUN_DEPENDS= wish8.0:${PORTSDIR}/x11-toolkits/tk80
+RUN_DEPENDS= wish8.2:${PORTSDIR}/x11-toolkits/tk82
NO_BUILD= yes
USE_X_PREFIX= yes
diff --git a/games/merlin/files/patch-aa b/games/merlin/files/patch-aa
index 8f594d5f95a..589bb717c3f 100644
--- a/games/merlin/files/patch-aa
+++ b/games/merlin/files/patch-aa
@@ -2,7 +2,7 @@
+++ merlin Sun Aug 23 18:09:17 1998
@@ -1,4 +1,4 @@
-#!/usr/local/bin/wish4.1
-+#!/usr/local/bin/wish8.0
++#!/usr/local/bin/wish8.2
#
# Merlin - a pointless puzzle game
#
diff --git a/games/tksol/Makefile b/games/tksol/Makefile
index 3d5bae52060..e30da487d82 100644
--- a/games/tksol/Makefile
+++ b/games/tksol/Makefile
@@ -7,13 +7,13 @@
#
DISTNAME= tksol-1.0
-CATEGORIES= games tk80
+CATEGORIES= games tk82
MASTER_SITES= ftp://ftp.cs.umd.edu/pub/misc_software/tksol/
EXTRACT_SUFX= .tar.Z
MAINTAINER= tg@FreeBSD.org
-RUN_DEPENDS= wish8.0:${PORTSDIR}/x11-toolkits/tk80
+RUN_DEPENDS= wish8.2:${PORTSDIR}/x11-toolkits/tk82
PATCH_STRIP= -p1
WRKSRC= ${WRKDIR}/release
diff --git a/games/tksol/files/patch-a b/games/tksol/files/patch-a
index f68768b2b93..81c49ebb0bd 100644
--- a/games/tksol/files/patch-a
+++ b/games/tksol/files/patch-a
@@ -14,7 +14,7 @@
# Absolute pathname of the wish executable #
############################################
-WISH = /usr/imports/bin/wish
-+WISH = ${PREFIX}/bin/wish8.0
++WISH = ${PREFIX}/bin/wish8.2
####################################################
# Directory where the script tksol will be located #
diff --git a/games/tvp/Makefile b/games/tvp/Makefile
index f8f7e9ea692..89addc832f6 100644
--- a/games/tvp/Makefile
+++ b/games/tvp/Makefile
@@ -7,19 +7,22 @@
#
DISTNAME= tvp-0.9.7.1
-CATEGORIES= games tk80
+CATEGORIES= games tk82
MASTER_SITES= http://www3.sympatico.ca/john.vanderhoek/tim/src/president/
MAINTAINER= hoek@FreeBSD.org
# Comment-out this (and CFLAGS) to compile only the CLI and ansi interfaces
-LIB_DEPENDS= tk80.1:${PORTSDIR}/x11-toolkits/tk80
-
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --enable-carddir=${PREFIX}/share/games/tvp
-# Comment-out this (and LIB_DEPENDS) to compile only the CLI and ansi interfaces
-CFLAGS+= -lX11 -lm -ltcl80 -ltk80 \
- -L ${LOCALBASE}/lib -L ${X11BASE}/lib
+LIB_DEPENDS= tk82.1:${PORTSDIR}/x11-toolkits/tk82
+
+GNU_CONFIGURE= yes
+CONFIGURE_ARGS= --enable-carddir=${PREFIX}/share/games/tvp
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/tcl8.2 \
+ -I${LOCALBASE}/include/tk8.2" \
+ LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib \
+ -ltcl82 -ltk82 -lX11 -lm"
+#CFLAGS+= -lX11 -lm -ltcl82 -ltk82 \
+# -L${LOCALBASE}/lib -L${X11BASE}/lib
MAN6= tvp.6
MLINKS= tvp.6 xprez.6 - aprez.6 - prez.6
diff --git a/games/tvp/files/patch-aa b/games/tvp/files/patch-aa
index 59f93db9d80..9dfeeecaee0 100644
--- a/games/tvp/files/patch-aa
+++ b/games/tvp/files/patch-aa
@@ -1,20 +1,38 @@
---- configure.orig Thu Oct 23 08:34:26 1997
-+++ configure Thu Oct 23 08:36:34 1997
-@@ -1306,7 +1306,7 @@
+--- configure.orig Tue Aug 19 20:57:12 1997
++++ configure Wed Nov 3 17:33:31 1999
+@@ -1306,10 +1306,10 @@
WINDLL=true
TCLTK=""
-for tkver in 42 4.2 41 4.1 80 8.0
-+for tkver in 80 8.0 42 4.2 41 4.1
++for tkver in 82
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
+- 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
++ echo $ac_n "checking for Tk_MainEx in -ltk${tkver}""... $ac_c" 1>&6
++echo "configure:1313: checking for Tk_MainEx in -ltk${tkver}" >&5
+ ac_lib_var=`echo tk${tkver}'_'Tk_Main | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+@@ -1322,10 +1322,10 @@
+ /* Override any gcc2 internal prototype to avoid an error. */
+ /* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+-char Tk_Main();
++char Tx_MainEx();
+
+ int main() {
+-Tk_Main()
++Tk_MainEx()
+ ; return 0; }
+ EOF
+ if { (eval echo configure:1332: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
@@ -1345,7 +1345,7 @@
echo "$ac_t""yes" 1>&6
WINDLL=false
- for tclver in 76 7.6 75 7.5 80 8.0
-+ for tclver in 80 8.0 76 7.6 75 7.5
++ for tclver in 82
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
diff --git a/games/tvp/files/patch-ab b/games/tvp/files/patch-ab
new file mode 100644
index 00000000000..7fb1a6f40f1
--- /dev/null
+++ b/games/tvp/files/patch-ab
@@ -0,0 +1,11 @@
+--- xprez/xpwish.c.orig Sat Jun 28 17:38:35 1997
++++ xprez/xpwish.c Wed Nov 3 17:45:12 1999
+@@ -37,7 +37,7 @@
+
+ int
+ main (int argc, char **argv) {
+- Tk_Main (argc, argv, Tcl_AppInit);
++ Tk_MainEx (argc, argv, Tcl_AppInit, Tcl_CreateInterp());
+
+ return 0;
+ }
diff --git a/games/xchain/Makefile b/games/xchain/Makefile
index d89a285bb43..dd726f96c4a 100644
--- a/games/xchain/Makefile
+++ b/games/xchain/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://thor.cam.ac.uk/~ac212/xchain/
MAINTAINER= andy@icc.surw.chel.su
-RUN_DEPENDS= wish8.0:${PORTSDIR}/x11-toolkits/tk80
+RUN_DEPENDS= wish8.2:${PORTSDIR}/x11-toolkits/tk82
USE_X_PREFIX= yes
WRKSRC= ${WRKDIR}/xchain-1.0
diff --git a/games/xchain/files/patch-aa b/games/xchain/files/patch-aa
index 3e1b5892e65..37d8a233a25 100644
--- a/games/xchain/files/patch-aa
+++ b/games/xchain/files/patch-aa
@@ -5,7 +5,7 @@
#include <time.h>
-#define DEF_WISH_PATH "/usr/bin/wish"
-+#define DEF_WISH_PATH "/usr/local/bin/wish8.0"
++#define DEF_WISH_PATH "/usr/local/bin/wish8.2"
void wprintf(char *, ...);
void draw_screen(void);
generated by cgit (git 2.34.1) at 2024-12-19 11:53:44 +0800