Use tcl-7.6/tk-4.2.

4 files changed, 66 insertions, 47 deletions

diff --git a/x11-toolkits/tix/Makefile b/x11-toolkits/tix/Makefile
index 2c4cb845e783..45073227d501 100644
--- a/x11-toolkits/tix/Makefile
+++ b/x11-toolkits/tix/Makefile
@@ -3,23 +3,23 @@
 # Date created:		22 December 1996
 # Whom:			Thomas Gellekum <tg@freebsd.org>
 #
-# $Id: Makefile,v 1.9 1997/07/17 15:13:01 max Exp $
+# $Id: Makefile,v 1.10 1997/07/30 06:08:35 tg Exp $
 #
 
 DISTNAME=	Tix4.1.0.005
 PKGNAME=	tix-4.1.0.005
-CATEGORIES=	x11 tk41
+CATEGORIES=	x11 tk42
 MASTER_SITES=	ftp://ftp.xpi.com/pub/
 
 MAINTAINER=	ports@FreeBSD.ORG
 
-LIB_DEPENDS=	tk41\\.1\\.:${PORTSDIR}/x11/tk41
+LIB_DEPENDS=	tk42\\.1\\.:${PORTSDIR}/x11/tk42
 
-WRKSRC=		${WRKDIR}/Tix4.1.0/unix/tk4.1
+WRKSRC=		${WRKDIR}/Tix4.1.0/unix/tk4.2
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared --enable-sam \
-		--with-tcl="${PREFIX}/include/tcl7.5" \
-		--with-tk="${PREFIX}/include/tk4.1"
+		--with-tcl="${PREFIX}/include/tcl7.6" \
+		--with-tk="${PREFIX}/include/tk4.2"
 # this should probably be added to bsd.port.mk
 CONFIGURE_ENV=	PREFIX=${PREFIX}
 MAN1=		tixwish.1 
@@ -44,7 +44,7 @@ post-install:
 	    ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${INSTALL_TARGET})
 	@${MKDIR} ${PREFIX}/man/man1
 	@mv ${PREFIX}/man/mann/tixwish.1 ${PREFIX}/man/man1
-	@ln -sf ${PREFIX}/bin/tixwish4.1.7.5 ${PREFIX}/bin/tixwish
+	@ln -sf ${PREFIX}/bin/tixwish4.2.7.6 ${PREFIX}/bin/tixwish
 	${LDCONFIG} -m ${PREFIX}/lib
 .for dir in generic unix
 	@${MKDIR} ${PREFIX}/include/tix/${dir}
diff --git a/x11-toolkits/tix/files/patch-aa b/x11-toolkits/tix/files/patch-aa
index 5e76cc8e0d30..87eaa581d9be 100644
--- a/x11-toolkits/tix/files/patch-aa
+++ b/x11-toolkits/tix/files/patch-aa
@@ -1,24 +1,32 @@
---- configure.orig	Sun Feb 16 06:12:44 1997
-+++ configure	Fri Feb 21 10:18:12 1997
-@@ -1047,7 +1047,7 @@
+--- configure.orig	Sat Jun 28 02:49:27 1997
++++ configure	Wed Aug 20 13:33:21 1997
+@@ -1060,6 +1060,7 @@
+ 
+ if test "$val" != ""; then
+     TCL_SRC_DIR=$val
++    tclsrcdir=$val
+     if test ! -d $TCL_SRC_DIR; then
+         { echo "configure: error: Directory $TCL_SRC_DIR doesn't exist" 1>&2; exit 1; }
+         { echo "configure: error: Please install the source code of Tcl 7.6" 1>&2; exit 1; }
+@@ -1082,7 +1083,7 @@
  fi
  echo "$ac_t""$TCL_SRC_DIR" 1>&6
  
 -TCL_BIN_DIR=$TCL_SRC_DIR/unix
-+TCL_BIN_DIR=$TCL_SRC_DIR/../../lib/tcl7.5
++TCL_BIN_DIR=$TCL_SRC_DIR/../../lib/tcl7.6
  
  #--------------------------------------------------------------------
  #	See if there was a command-line option for where Tk is;  if
-@@ -1089,7 +1089,7 @@
+@@ -1124,7 +1125,7 @@
  fi
  echo "$ac_t""$TK_SRC_DIR" 1>&6
  
 -TK_BIN_DIR=$TK_SRC_DIR/unix
-+TK_BIN_DIR=$TK_SRC_DIR/../../lib/tk4.1
++TK_BIN_DIR=$TK_SRC_DIR/../../lib/tk4.2
  
  #--------------------------------------------------------------------
  #	Find out the top level source directory of the Tix package.
-@@ -1671,12 +1671,12 @@
+@@ -1707,12 +1708,12 @@
  s%@SHLIB_VERSION@%$SHLIB_VERSION%g
  s%@DL_LIBS@%$DL_LIBS%g
  s%@LD_FLAGS@%$LD_FLAGS%g
@@ -26,14 +34,15 @@
 +s%@TCL_LIB_SPEC@%$TCL_LIB_SPEC%g
  s%@TCL_LIBS@%$TCL_LIBS%g
  s%@TCL_VERSION@%$TCL_VERSION%g
- s%@TCL_SRC_DIR@%$TCL_SRC_DIR%g
+-s%@TCL_SRC_DIR@%$TCL_SRC_DIR%g
++s%@TCL_SRC_DIR@%$tclsrcdir%g
  s%@TCL_BIN_DIR@%$TCL_BIN_DIR%g
 -s%@TK_BUILD_LIB_SPEC@%$TK_BUILD_LIB_SPEC%g
 +s%@TK_LIB_SPEC@%$TK_LIB_SPEC%g
  s%@TK_LIBS@%$TK_LIBS%g
  s%@TK_VERSION@%$TK_VERSION%g
  s%@TK_SRC_DIR@%$TK_SRC_DIR%g
-@@ -1702,8 +1702,8 @@
+@@ -1738,8 +1739,8 @@
  s%@TIX_SAM_FILE@%$TIX_SAM_FILE%g
  s%@TIX_MAKE_SAM@%$TIX_MAKE_SAM%g
  s%@TIX_DEFS@%$TIX_DEFS%g
diff --git a/x11-toolkits/tix/files/patch-ac b/x11-toolkits/tix/files/patch-ac
index b8a7675c4561..041bc77f2ee8 100644
--- a/x11-toolkits/tix/files/patch-ac
+++ b/x11-toolkits/tix/files/patch-ac
@@ -1,5 +1,5 @@
---- Makefile.in.orig	Sat Jun 28 02:49:15 1997
-+++ Makefile.in	Tue Jul 29 18:56:35 1997
+--- Makefile.in.orig	Sat Jun 28 02:49:21 1997
++++ Makefile.in	Wed Aug 20 13:45:58 1997
 @@ -29,7 +29,7 @@
  # Directory in which to install the library of Tix scripts and demos
  # (note: you can set the TIX_LIBRARY environment variable at run-time to
@@ -26,9 +26,9 @@
 -RUN_TCLSH	= TCL_LIBRARY=$(TCL_SRC_DIR)/library \
 -		  TK_LIBRARY=$(TK_SRC_DIR)/library \
 -	          $(TCL_SRC_DIR)/unix/tclsh
-+RUN_TCLSH	= TCL_LIBRARY=$(TCL_SRC_DIR)/../../lib/tcl7.5 \
-+		  TK_LIBRARY=$(TK_SRC_DIR)/../../lib/tk4.1 \
-+	          $(TCL_SRC_DIR)/../../bin/tclsh7.5
++RUN_TCLSH	= TCL_LIBRARY=$(TCL_SRC_DIR)/../../lib/tcl7.6 \
++		  TK_LIBRARY=$(TK_SRC_DIR)/../../lib/tk4.2 \
++	          $(TCL_SRC_DIR)/../../bin/tclsh7.6
  
  
  #----------------------------------------------------------------
@@ -42,12 +42,12 @@
  
  #----------------------------------------------------------------
  # The information below should be usable as is. You shouldn't need
-@@ -211,24 +212,24 @@
+@@ -211,29 +212,29 @@
  # scripts of TK must be included in the fixed order.
  #----------------------------------------------------------------------
  
 -TCL_SCRIPTS = $(TCL_SRC_DIR)/library/*.tcl
-+TCL_SCRIPTS = $(TCL_SRC_DIR)/../../lib/tcl7.5/*.tcl
++TCL_SCRIPTS = $(TCL_SRC_DIR)/../../lib/tcl7.6/*.tcl
  
  TK_SCRIPTS = \
 -    $(TK_SRC_DIR)/library/bgerror.tcl \
@@ -57,14 +57,24 @@
 -    $(TK_SRC_DIR)/library/optMenu.tcl \
 -    $(TK_SRC_DIR)/library/palette.tcl \
 -    $(TK_SRC_DIR)/library/tearoff.tcl \
-+    $(TK_SRC_DIR)/../../lib/tk4.1/bgerror.tcl \
-+    $(TK_SRC_DIR)/../../lib/tk4.1/dialog.tcl \
-+    $(TK_SRC_DIR)/../../lib/tk4.1/focus.tcl \
-+    $(TK_SRC_DIR)/../../lib/tk4.1/obsolete.tcl \
-+    $(TK_SRC_DIR)/../../lib/tk4.1/optMenu.tcl \
-+    $(TK_SRC_DIR)/../../lib/tk4.1/palette.tcl \
-+    $(TK_SRC_DIR)/../../lib/tk4.1/tearoff.tcl \
-     $(SRC_DIR)/generic/tk4.1/tk.tcl \
+-    $(TK_SRC_DIR)/library/clrpick.tcl \
+-    $(TK_SRC_DIR)/library/comdlg.tcl \
+-    $(TK_SRC_DIR)/library/msgbox.tcl \
+-    $(TK_SRC_DIR)/library/tkfbox.tcl \
+-    $(TK_SRC_DIR)/library/xmfbox.tcl \
++    $(TK_SRC_DIR)/../../lib/tk4.2/bgerror.tcl \
++    $(TK_SRC_DIR)/../../lib/tk4.2/dialog.tcl \
++    $(TK_SRC_DIR)/../../lib/tk4.2/focus.tcl \
++    $(TK_SRC_DIR)/../../lib/tk4.2/obsolete.tcl \
++    $(TK_SRC_DIR)/../../lib/tk4.2/optMenu.tcl \
++    $(TK_SRC_DIR)/../../lib/tk4.2/palette.tcl \
++    $(TK_SRC_DIR)/../../lib/tk4.2/tearoff.tcl \
++    $(TK_SRC_DIR)/../../lib/tk4.2/clrpick.tcl \
++    $(TK_SRC_DIR)/../../lib/tk4.2/comdlg.tcl \
++    $(TK_SRC_DIR)/../../lib/tk4.2/msgbox.tcl \
++    $(TK_SRC_DIR)/../../lib/tk4.2/tkfbox.tcl \
++    $(TK_SRC_DIR)/../../lib/tk4.2/xmfbox.tcl \
+     $(SRC_DIR)/generic/tk4.2/tk.tcl \
 -    $(TK_SRC_DIR)/library/button.tcl \
 -    $(TK_SRC_DIR)/library/entry.tcl \
 -    $(TK_SRC_DIR)/library/listbox.tcl \
@@ -72,13 +82,13 @@
 -    $(TK_SRC_DIR)/library/scale.tcl \
 -    $(TK_SRC_DIR)/library/scrlbar.tcl \
 -    $(TK_SRC_DIR)/library/text.tcl \
-+    $(TK_SRC_DIR)/../../lib/tk4.1/button.tcl \
-+    $(TK_SRC_DIR)/../../lib/tk4.1/entry.tcl \
-+    $(TK_SRC_DIR)/../../lib/tk4.1/listbox.tcl \
-+    $(TK_SRC_DIR)/../../lib/tk4.1/menu.tcl \
-+    $(TK_SRC_DIR)/../../lib/tk4.1/scale.tcl \
-+    $(TK_SRC_DIR)/../../lib/tk4.1/scrlbar.tcl \
-+    $(TK_SRC_DIR)/../../lib/tk4.1/text.tcl \
-     $(SRC_DIR)/generic/tk4.1/console.tcl
++    $(TK_SRC_DIR)/../../lib/tk4.2/button.tcl \
++    $(TK_SRC_DIR)/../../lib/tk4.2/entry.tcl \
++    $(TK_SRC_DIR)/../../lib/tk4.2/listbox.tcl \
++    $(TK_SRC_DIR)/../../lib/tk4.2/menu.tcl \
++    $(TK_SRC_DIR)/../../lib/tk4.2/scale.tcl \
++    $(TK_SRC_DIR)/../../lib/tk4.2/scrlbar.tcl \
++    $(TK_SRC_DIR)/../../lib/tk4.2/text.tcl \
+     $(SRC_DIR)/generic/tk4.2/console.tcl
  
  TIX_SCRIPTS = \
diff --git a/x11-toolkits/tix/pkg-plist b/x11-toolkits/tix/pkg-plist
index 9fed47deb1ad..f96996e9158d 100644
--- a/x11-toolkits/tix/pkg-plist
+++ b/x11-toolkits/tix/pkg-plist
@@ -1,9 +1,9 @@
-bin/satixwish4.1.7.5
-bin/tixwish4.1.7.5
+bin/satixwish4.1.7.6
+bin/tixwish4.1.7.6
 @exec ln -s %D/%F %B/tixwish
 @unexec rm %B/tixwish
-bin/sawish4.1
-bin/satclsh7.5
+bin/sawish4.2
+bin/satclsh7.6
 include/tix.h
 include/tix/generic/tix.h
 include/tix/generic/tixBitmaps.h
@@ -19,10 +19,10 @@ include/tix/generic/tixPort.h
 include/tix/generic/tixTList.h
 include/tix/unix/tixUnixInt.h
 include/tix/unix/tixUnixPort.h
-lib/libtix4175.so.1.0
-lib/libtixsam4175.so.1.0
-lib/libtksam41.so.1.0
-lib/libtclsam75.so.1.0
+lib/libtix4176.so.1.0
+lib/libtixsam4176.so.1.0
+lib/libtksam42.so.1.0
+lib/libtclsam76.so.1.0
 @exec /sbin/ldconfig -m %B
 man/mann/BtnBox.n.gz
 man/mann/Balloon.n.gz