summaryrefslogtreecommitdiff
path: root/x11-toolkits/tix
diff options
context:
space:
mode:
authorThomas Gellekum <tg@FreeBSD.org>1997-10-01 12:19:43 +0000
committerThomas Gellekum <tg@FreeBSD.org>1997-10-01 12:19:43 +0000
commit73165f974309f631d9b54e97f69d38112101a0d2 (patch)
tree02494a25a86d9dc06c313385a3ac36b92c0f3bb4 /x11-toolkits/tix
parentUpgrade to 0.84. (diff)
Upgrade to 4.1.0.006. Uses tk-8.0 now.
Notes
Notes: svn path=/head/; revision=8076
Diffstat (limited to 'x11-toolkits/tix')
-rw-r--r--x11-toolkits/tix/Makefile20
-rw-r--r--x11-toolkits/tix/distinfo2
-rw-r--r--x11-toolkits/tix/files/patch-aa30
-rw-r--r--x11-toolkits/tix/files/patch-ab4
-rw-r--r--x11-toolkits/tix/files/patch-ac59
-rw-r--r--x11-toolkits/tix/pkg-plist11
6 files changed, 67 insertions, 59 deletions
diff --git a/x11-toolkits/tix/Makefile b/x11-toolkits/tix/Makefile
index 45073227d501..9d4744c80285 100644
--- a/x11-toolkits/tix/Makefile
+++ b/x11-toolkits/tix/Makefile
@@ -1,25 +1,25 @@
# New ports collection makefile for: tix
-# Version required: 4.1.0.005
+# Version required: 4.1.0.006
# Date created: 22 December 1996
# Whom: Thomas Gellekum <tg@freebsd.org>
#
-# $Id: Makefile,v 1.10 1997/07/30 06:08:35 tg Exp $
+# $Id: Makefile,v 1.11 1997/08/20 12:12:15 tg Exp $
#
-DISTNAME= Tix4.1.0.005
-PKGNAME= tix-4.1.0.005
-CATEGORIES= x11 tk42
+DISTNAME= Tix4.1.0.006
+PKGNAME= tix-4.1.0.006
+CATEGORIES= x11 tk80
MASTER_SITES= ftp://ftp.xpi.com/pub/
MAINTAINER= ports@FreeBSD.ORG
-LIB_DEPENDS= tk42\\.1\\.:${PORTSDIR}/x11/tk42
+LIB_DEPENDS= tk80\\.1\\.:${PORTSDIR}/x11/tk80
-WRKSRC= ${WRKDIR}/Tix4.1.0/unix/tk4.2
+WRKSRC= ${WRKDIR}/Tix4.1.0/unix/tk8.0
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-shared --enable-sam \
- --with-tcl="${PREFIX}/include/tcl7.6" \
- --with-tk="${PREFIX}/include/tk4.2"
+ --with-tcl="${PREFIX}/include/tcl8.0" \
+ --with-tk="${PREFIX}/include/tk8.0"
# 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.2.7.6 ${PREFIX}/bin/tixwish
+ @ln -sf ${PREFIX}/bin/tixwish8.0.8.0 ${PREFIX}/bin/tixwish
${LDCONFIG} -m ${PREFIX}/lib
.for dir in generic unix
@${MKDIR} ${PREFIX}/include/tix/${dir}
diff --git a/x11-toolkits/tix/distinfo b/x11-toolkits/tix/distinfo
index f235bc96913a..927791c36e5c 100644
--- a/x11-toolkits/tix/distinfo
+++ b/x11-toolkits/tix/distinfo
@@ -1 +1 @@
-MD5 (Tix4.1.0.005.tar.gz) = 7a2246d10e98f51f118addf5d7e8c124
+MD5 (Tix4.1.0.006.tar.gz) = a3f5af73dfcd2b5dd9dab96040358efa
diff --git a/x11-toolkits/tix/files/patch-aa b/x11-toolkits/tix/files/patch-aa
index 87eaa581d9be..fd93f3e55c39 100644
--- a/x11-toolkits/tix/files/patch-aa
+++ b/x11-toolkits/tix/files/patch-aa
@@ -1,5 +1,5 @@
---- configure.orig Sat Jun 28 02:49:27 1997
-+++ configure Wed Aug 20 13:33:21 1997
+--- configure.orig Wed Sep 24 01:57:21 1997
++++ configure Wed Oct 1 13:31:58 1997
@@ -1060,6 +1060,7 @@
if test "$val" != ""; then
@@ -7,26 +7,34 @@
+ 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; }
+ { echo "configure: error: Please install the source code of Tcl 8.0" 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.6
++TCL_BIN_DIR=$TCL_SRC_DIR/../../lib/tcl8.0
#--------------------------------------------------------------------
# See if there was a command-line option for where Tk is; if
-@@ -1124,7 +1125,7 @@
+@@ -1102,6 +1103,7 @@
+
+ if test "$val" != ""; then
+ TK_SRC_DIR=$val
++ tksrcdir=$val
+ if test ! -d $TK_SRC_DIR; then
+ { echo "configure: error: Directory $TK_SRC_DIR doesn't exist" 1>&2; exit 1; }
+ { echo "configure: error: Please install the source code of Tk 8.0" 1>&2; exit 1; }
+@@ -1124,7 +1126,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.2
++TK_BIN_DIR=$TK_SRC_DIR/../../lib/tk8.0
#--------------------------------------------------------------------
# Find out the top level source directory of the Tix package.
-@@ -1707,12 +1708,12 @@
+@@ -1707,15 +1709,15 @@
s%@SHLIB_VERSION@%$SHLIB_VERSION%g
s%@DL_LIBS@%$DL_LIBS%g
s%@LD_FLAGS@%$LD_FLAGS%g
@@ -41,8 +49,12 @@
+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
-@@ -1738,8 +1739,8 @@
+-s%@TK_SRC_DIR@%$TK_SRC_DIR%g
++s%@TK_SRC_DIR@%$tksrcdir%g
+ s%@TK_BIN_DIR@%$TK_BIN_DIR%g
+ s%@TK_XINCLUDES@%$TK_XINCLUDES%g
+ s%@TIX_LD_SEARCH_FLAGS@%$TIX_LD_SEARCH_FLAGS%g
+@@ -1738,8 +1740,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-ab b/x11-toolkits/tix/files/patch-ab
index 549d5aa976ab..4f1522890f89 100644
--- a/x11-toolkits/tix/files/patch-ab
+++ b/x11-toolkits/tix/files/patch-ab
@@ -1,5 +1,5 @@
---- ../Makefile.in.orig Sat Feb 15 08:35:34 1997
-+++ ../Makefile.in Fri Feb 21 09:16:34 1997
+--- ../Makefile.in.orig Wed Jul 9 22:33:48 1997
++++ ../Makefile.in Wed Oct 1 12:03:37 1997
@@ -28,7 +28,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
diff --git a/x11-toolkits/tix/files/patch-ac b/x11-toolkits/tix/files/patch-ac
index 041bc77f2ee8..7f05e53bb035 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:21 1997
-+++ Makefile.in Wed Aug 20 13:45:58 1997
+--- Makefile.in.orig Wed Sep 24 01:57:18 1997
++++ Makefile.in Wed Oct 1 13:23:24 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,13 +26,13 @@
-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.6 \
-+ TK_LIBRARY=$(TK_SRC_DIR)/../../lib/tk4.2 \
-+ $(TCL_SRC_DIR)/../../bin/tclsh7.6
++RUN_TCLSH = TCL_LIBRARY=$(TCL_SRC_DIR)/../../lib/tcl8.0 \
++ TK_LIBRARY=$(TK_SRC_DIR)/../../lib/tk8.0 \
++ $(TCL_SRC_DIR)/../../bin/tclsh8.0
#----------------------------------------------------------------
-@@ -133,7 +133,8 @@
+@@ -132,7 +133,8 @@
CC_SWITCHES = $(CFLAGS) $(AC_FLAGS) -I$(TCL_GENERIC_DIR) \
-I$(TCL_SRC_DIR)/unix -I$(TK_GENERIC_DIR) -I$(TK_SRC_DIR)/unix \
$(ITCL_CFLAGS) \
@@ -42,12 +42,12 @@
#----------------------------------------------------------------
# The information below should be usable as is. You shouldn't need
-@@ -211,29 +212,29 @@
+@@ -210,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.6/*.tcl
++TCL_SCRIPTS = $(TCL_SRC_DIR)/../../lib/tcl8.0/*.tcl
TK_SCRIPTS = \
- $(TK_SRC_DIR)/library/bgerror.tcl \
@@ -62,19 +62,7 @@
- $(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 \
+- $(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 \
@@ -82,13 +70,26 @@
- $(TK_SRC_DIR)/library/scale.tcl \
- $(TK_SRC_DIR)/library/scrlbar.tcl \
- $(TK_SRC_DIR)/library/text.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
++ $(TK_SRC_DIR)/../../lib/tk8.0/bgerror.tcl \
++ $(TK_SRC_DIR)/../../lib/tk8.0/dialog.tcl \
++ $(TK_SRC_DIR)/../../lib/tk8.0/focus.tcl \
++ $(TK_SRC_DIR)/../../lib/tk8.0/obsolete.tcl \
++ $(TK_SRC_DIR)/../../lib/tk8.0/optMenu.tcl \
++ $(TK_SRC_DIR)/../../lib/tk8.0/palette.tcl \
++ $(TK_SRC_DIR)/../../lib/tk8.0/tearoff.tcl \
++ $(TK_SRC_DIR)/../../lib/tk8.0/clrpick.tcl \
++ $(TK_SRC_DIR)/../../lib/tk8.0/comdlg.tcl \
++ $(TK_SRC_DIR)/../../lib/tk8.0/msgbox.tcl \
++ $(TK_SRC_DIR)/../../lib/tk8.0/tkfbox.tcl \
++ $(TK_SRC_DIR)/../../lib/tk8.0/xmfbox.tcl \
++ $(SRC_DIR)/generic/tk8.0/tk.tcl \
++ $(TK_SRC_DIR)/../../lib/tk8.0/button.tcl \
++ $(TK_SRC_DIR)/../../lib/tk8.0/entry.tcl \
++ $(TK_SRC_DIR)/../../lib/tk8.0/listbox.tcl \
++ $(TK_SRC_DIR)/../../lib/tk8.0/menu.tcl \
++ $(TK_SRC_DIR)/../../lib/tk8.0/scale.tcl \
++ $(TK_SRC_DIR)/../../lib/tk8.0/scrlbar.tcl \
++ $(TK_SRC_DIR)/../../lib/tk8.0/text.tcl \
+ $(SRC_DIR)/generic/tk8.0/console.tcl
TIX_SCRIPTS = \
diff --git a/x11-toolkits/tix/pkg-plist b/x11-toolkits/tix/pkg-plist
index f96996e9158d..d9063e631064 100644
--- a/x11-toolkits/tix/pkg-plist
+++ b/x11-toolkits/tix/pkg-plist
@@ -1,9 +1,6 @@
-bin/satixwish4.1.7.6
-bin/tixwish4.1.7.6
+bin/tixwish4.1.8.0
@exec ln -s %D/%F %B/tixwish
@unexec rm %B/tixwish
-bin/sawish4.2
-bin/satclsh7.6
include/tix.h
include/tix/generic/tix.h
include/tix/generic/tixBitmaps.h
@@ -19,10 +16,8 @@ include/tix/generic/tixPort.h
include/tix/generic/tixTList.h
include/tix/unix/tixUnixInt.h
include/tix/unix/tixUnixPort.h
-lib/libtix4176.so.1.0
-lib/libtixsam4176.so.1.0
-lib/libtksam42.so.1.0
-lib/libtclsam76.so.1.0
+lib/libtix4180.so.1.0
+lib/libtixsam4180.so.1.0
@exec /sbin/ldconfig -m %B
man/mann/BtnBox.n.gz
man/mann/Balloon.n.gz