6 files changed, 103 insertions, 105 deletions

diff --git a/x11-toolkits/tix/Makefile b/x11-toolkits/tix/Makefile
index 4beeee018f5f..98add4746188 100644
--- a/x11-toolkits/tix/Makefile
+++ b/x11-toolkits/tix/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	tix
-# Version required:	4.1b2
+# Version required:	4.1.0
 # Date created:		22 December 1996
 # Whom:			Thomas Gellekum <tg@freebsd.org>
 #
-# $Id: Makefile,v 1.3 1997/01/07 08:17:11 tg Exp $
+# $Id: Makefile,v 1.4 1997/01/24 10:43:07 asami Exp $
 #
 
-DISTNAME=	Tix4.1b2
-PKGNAME=	tix-4.1b2
+DISTNAME=	Tix4.1.0
+PKGNAME=	tix-4.1.0
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.xpi.com/pub/
 
@@ -15,11 +15,11 @@ MAINTAINER=	ports@FreeBSD.ORG
 
 LIB_DEPENDS=	tk41\\.1\\.:${PORTSDIR}/x11/tk41
 
+WRKSRC=		${WRKDIR}/${DISTNAME}/unix/tk4.1
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--disable-tk40 --enable-tk41 --enable-tk41-shared \
-		--with-tcl75_src_dir=/usr/include/tcl \
-		--with-tk41_src_dir="${PREFIX}/include/tk4.1" \
-		--with-extra_ldflags="-L${PREFIX}/lib"
+CONFIGURE_ARGS=	--enable-shared \
+		--with-tcl=/usr/include/tcl \
+		--with-tk="${PREFIX}/include/tk"
 # this should probably be added to bsd.port.mk
 CONFIGURE_ENV=	PREFIX=${PREFIX}
 MAN1=		tixwish.1 
@@ -32,14 +32,23 @@ MANN=		BtnBox.n Balloon.n ChkList.n Destroy.n ComboBox.n Control.n \
 		Select.n StdBBox.n TixIntro.n Tree.n Utils.n Wm.n compound.n \
 		pixmap.n tix.n
 
+pre-configure:
+	@(cd ${WRKDIR}/${DISTNAME}/unix && \
+	    CC="${CC}" ac_cv_path_CC="${CC}" CFLAGS="${CFLAGS}" \
+            INSTALL="/usr/bin/install -c -o ${BINOWN} -g ${BINGRP}" \
+            INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
+            ${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS})
+		
 post-install:
+	@(cd ${WRKDIR}/${DISTNAME}/unix && \
+	    ${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.4.1 ${PREFIX}/bin/tixwish
+	@ln -sf ${PREFIX}/bin/tixwish4.1.7.5 ${PREFIX}/bin/tixwish
 	/sbin/ldconfig -m ${PREFIX}/lib
 .for dir in generic unix
 	@${MKDIR} ${PREFIX}/include/tix/${dir}
-	${INSTALL_DATA} ${WRKSRC}/${dir}/*.h ${PREFIX}/include/tix/${dir}
+	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/${dir}/*.h ${PREFIX}/include/tix/${dir}
 .endfor
 	${RM} ${PREFIX}/include/tix/generic/tix.h
 	@# These two files are the same
diff --git a/x11-toolkits/tix/distinfo b/x11-toolkits/tix/distinfo
index de1573d75148..c19cb3559121 100644
--- a/x11-toolkits/tix/distinfo
+++ b/x11-toolkits/tix/distinfo
@@ -1 +1 @@
-MD5 (Tix4.1b2.tar.gz) = 9148c089154255656c6dc2b9e3a35d0e
+MD5 (Tix4.1.0.tar.gz) = 8bae10f609a029f4c1c5df54023688a8
diff --git a/x11-toolkits/tix/files/patch-aa b/x11-toolkits/tix/files/patch-aa
index 666be5d53564..1cfcc91ffd59 100644
--- a/x11-toolkits/tix/files/patch-aa
+++ b/x11-toolkits/tix/files/patch-aa
@@ -1,86 +1,46 @@
---- configure.orig	Wed Dec 25 06:03:25 1996
-+++ configure	Sun Jan  5 20:14:01 1997
-@@ -2583,20 +2583,20 @@
-         done
-     fi
+--- configure.orig	Sun Feb 16 06:12:44 1997
++++ configure	Fri Feb 21 10:18:12 1997
+@@ -1047,7 +1047,7 @@
+ fi
+ echo "$ac_t""$TCL_SRC_DIR" 1>&6
  
--    if test ! -r $TCL75_SRC_DIR/unix/tclConfig.sh.in; then
--	TCL75_SRC_DIR=""
--    fi
-+#    if test ! -r $TCL75_SRC_DIR/unix/tclConfig.sh.in; then
-+#	TCL75_SRC_DIR=""
-+#    fi
+-TCL_BIN_DIR=$TCL_SRC_DIR/unix
++TCL_BIN_DIR=$TCL_SRC_DIR/../../libdata/tcl
  
-     if test "$TCL75_SRC_DIR" = ""; then
-         echo "$ac_t""(not found)" 1>&6
-     else
-         echo "$ac_t""$TCL75_SRC_DIR" 1>&6
+ #--------------------------------------------------------------------
+ #	See if there was a command-line option for where Tk is;  if
+@@ -1089,7 +1089,7 @@
+ fi
+ echo "$ac_t""$TK_SRC_DIR" 1>&6
  
--	if test ! -r "$TCL75_SRC_DIR/unix/tclConfig.sh"; then
--	    echo "warning: $TCL75_SRC_DIR/unix/tclConfig.sh missing"
--	    echo "         Please to configure tcl 7.5 first."
--	    TCL75_SRC_DIR=""
--        fi
-+#	if test ! -r "$TCL75_SRC_DIR/unix/tclConfig.sh"; then
-+#	    echo "warning: $TCL75_SRC_DIR/unix/tclConfig.sh missing"
-+#	    echo "         Please to configure tcl 7.5 first."
-+#	    TCL75_SRC_DIR=""
-+#        fi
-     fi
+-TK_BIN_DIR=$TK_SRC_DIR/unix
++TK_BIN_DIR=$TK_SRC_DIR/../../lib
  
-     #
-@@ -2614,20 +2614,20 @@
-         done
-     fi
- 
--    if test ! -r $TK41_SRC_DIR/unix/tkConfig.sh.in; then
--	TK41_SRC_DIR=""
--    fi
-+#    if test ! -r $TK41_SRC_DIR/unix/tkConfig.sh.in; then
-+#	TK41_SRC_DIR=""
-+#    fi
- 
-     if test "$TK41_SRC_DIR" = ""; then
-         echo "$ac_t""(not found)" 1>&6
-     else
-         echo "$ac_t""$TK41_SRC_DIR" 1>&6
- 
--        if test ! -r "$TK41_SRC_DIR/unix/tkConfig.sh"; then
--	    echo "warning: $TK41_SRC_DIR/unix/tkConfig.sh missing"
--  	    echo "         Please to configure tk 4.1 first."
--	    TK41_SRC_DIR=""
--        fi
-+#        if test ! -r "$TK41_SRC_DIR/unix/tkConfig.sh"; then
-+#	    echo "warning: $TK41_SRC_DIR/unix/tkConfig.sh missing"
-+#  	    echo "         Please to configure tk 4.1 first."
-+#	    TK41_SRC_DIR=""
-+#        fi
-     fi
-     #----------------------------------------------------------------------
-     #	MAIN STUFF
-@@ -2635,7 +2635,7 @@
-     if test "$TK41_SRC_DIR" != "" -a "$TCL75_SRC_DIR" != ""; then
- 	# 1. Load the compilation flags for TCL 7.5
- 	#
--	file="$TCL75_SRC_DIR/unix/tclConfig.sh"
-+	file=/usr/libdata/tcl/tclConfig.sh
- 	. $file
- 	
- 	
-@@ -2646,14 +2646,14 @@
- 	SHLIB_CFLAGS=$TCL_SHLIB_CFLAGS
- 	SHLIB_LD=$TCL_SHLIB_LD
- 	SHLIB_LD_LIBS=$TCL_SHLIB_LD_LIBS
--	SHLIB_SUFFIX=$TCL_SHLIB_SUFFIX
- 	SHLIB_VERSION=$TCL_SHLIB_VERSION
-+	SHLIB_SUFFIX=${TCL_SHLIB_SUFFIX}.1.0
- 	DL_LIBS=$TCL_DL_LIBS
- 	LD_FLAGS=$TCL_LD_FLAGS
- 	
- 	# 2. Load the compilation flags for TK 4.1
- 	#
--	file="$TK41_SRC_DIR/unix/tkConfig.sh"
-+	file="${PREFIX}/lib/tkConfig.sh"
- 	. $file
- 	
- 	TIX_TARGETS="$TIX_TARGETS unix-tk4.1"
+ #--------------------------------------------------------------------
+ #	Find out the top level source directory of the Tix package.
+@@ -1671,12 +1671,12 @@
+ s%@SHLIB_VERSION@%$SHLIB_VERSION%g
+ s%@DL_LIBS@%$DL_LIBS%g
+ s%@LD_FLAGS@%$LD_FLAGS%g
+-s%@TCL_BUILD_LIB_SPEC@%$TCL_BUILD_LIB_SPEC%g
++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_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 @@
+ s%@TIX_SAM_FILE@%$TIX_SAM_FILE%g
+ s%@TIX_MAKE_SAM@%$TIX_MAKE_SAM%g
+ s%@TIX_DEFS@%$TIX_DEFS%g
+-s%@ITCL_BUILD_LIB_SPEC@%$ITCL_BUILD_LIB_SPEC%g
+-s%@ITK_BUILD_LIB_SPEC@%$ITK_BUILD_LIB_SPEC%g
++s%@ITCL_LIB_SPEC@%$ITCL_LIB_SPEC%g
++s%@ITK_LIB_SPEC@%$ITK_LIB_SPEC%g
+ s%@TCL_SAMEXE_FILE@%$TCL_SAMEXE_FILE%g
+ s%@TK_SAMEXE_FILE@%$TK_SAMEXE_FILE%g
+ s%@TIX_SAMEXE_FILE@%$TIX_SAMEXE_FILE%g
diff --git a/x11-toolkits/tix/files/patch-ab b/x11-toolkits/tix/files/patch-ab
index 741001bf6d72..549d5aa976ab 100644
--- a/x11-toolkits/tix/files/patch-ab
+++ b/x11-toolkits/tix/files/patch-ab
@@ -1,6 +1,6 @@
---- Makefile.in.orig	Sat Dec 28 05:09:39 1996
-+++ Makefile.in	Mon Dec 30 19:22:52 1996
-@@ -29,7 +29,7 @@
+--- ../Makefile.in.orig	Sat Feb 15 08:35:34 1997
++++ ../Makefile.in	Fri Feb 21 09:16:34 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
  # override the compiled-in location):
@@ -9,12 +9,12 @@
  
  # Directory in which to install the archive libtix.a:
  LIB_DIR =	$(exec_prefix)/lib
-@@ -201,7 +201,7 @@
+@@ -115,7 +115,7 @@
  		fi; \
  	    done;
  	@echo "installing the tixindex program for builing tclIndex for Tix scripts"
--	@cd tools; $(INSTALL_PROGRAM) tixindex $(BIN_DIR)/tixindex
-+	-@cd tools; $(INSTALL_PROGRAM) tixindex $(BIN_DIR)/tixindex
+-	@cd $(TOOLS_DIR); $(INSTALL_PROGRAM) tixindex $(BIN_DIR)/tixindex
++	-@cd $(TOOLS_DIR); $(INSTALL_PROGRAM) tixindex $(BIN_DIR)/tixindex
  
  install-headers:
  	@for i in $(INCLUDE_DIR); \
diff --git a/x11-toolkits/tix/files/patch-ac b/x11-toolkits/tix/files/patch-ac
index 85bade1b97af..937a18e40784 100644
--- a/x11-toolkits/tix/files/patch-ac
+++ b/x11-toolkits/tix/files/patch-ac
@@ -1,6 +1,6 @@
---- unix-tk4.1/Makefile.in.orig	Sat Dec 28 06:15:15 1996
-+++ unix-tk4.1/Makefile.in	Mon Dec 30 19:29:02 1996
-@@ -31,7 +31,7 @@
+--- Makefile.in.orig	Sun Feb 16 06:12:37 1997
++++ Makefile.in	Fri Feb 21 11:18:44 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
  # override the compiled-in location):
@@ -9,3 +9,29 @@
  
  # Directory in which to install the archive libtix.a:
  LIB_DIR =	$(exec_prefix)/lib
+@@ -70,12 +70,12 @@
+ TK_GENERIC_DIR  = $(TK_SRC_DIR)/generic
+ 
+ # Libraries to use when linking:
+-LIBS = @ITK_BUILD_LIB_SPEC@ @ITCL_BUILD_LIB_SPEC@ \
+-    @TK_BUILD_LIB_SPEC@ @TCL_BUILD_LIB_SPEC@ @TK_LIBS@
++LIBS = @ITK_LIB_SPEC@ @ITCL_LIB_SPEC@ \
++    @TK_LIB_SPEC@ @TCL_LIB_SPEC@ @TK_LIBS@
+ 
+ # Libraries for building a stand-alone Tclsh.
+ #
+-LIBS_TCLONLY = @TCL_BUILD_LIB_SPEC@ @TCL_LIBS@
++LIBS_TCLONLY = @TCL_LIB_SPEC@ @TCL_LIBS@
+ 
+ RUN_TCLSH	= TCL_LIBRARY=$(TCL_SRC_DIR)/library \
+ 		  TK_LIBRARY=$(TK_SRC_DIR)/library \
+@@ -131,7 +131,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) \
+-    -I$(GENERIC_DIR) -I$(UNIX_DIR) $(TK_XINCLUDES) $(TIX_SHLIB_CFLAGS)
++    -I$(GENERIC_DIR) -I$(UNIX_DIR) $(TK_XINCLUDES) $(TIX_SHLIB_CFLAGS) \
++    -DTIX_LIBRARY=\"${TIX_LIBRARY}\"
+ 
+ #----------------------------------------------------------------
+ # The information below should be usable as is. You shouldn't need
diff --git a/x11-toolkits/tix/pkg-plist b/x11-toolkits/tix/pkg-plist
index dfb4dd0a89b3..0edad35f59ff 100644
--- a/x11-toolkits/tix/pkg-plist
+++ b/x11-toolkits/tix/pkg-plist
@@ -1,8 +1,9 @@
-bin/tixwish4.1.4.1
+bin/tixwish4.1.7.5
 @exec ln -s %D/%F %B/tixwish
 @unexec rm %B/tixwish
 include/tix.h
 include/tix/generic/tix.h
+include/tix/generic/tixBitmaps.h
 include/tix/generic/tixDef.h
 include/tix/generic/tixForm.h
 include/tix/generic/tixGrData.h
@@ -11,12 +12,11 @@ include/tix/generic/tixHList.h
 include/tix/generic/tixImgXpm.h
 include/tix/generic/tixInt.h
 include/tix/generic/tixItcl.h
-include/tix/generic/tixPatchLevel.h
 include/tix/generic/tixPort.h
 include/tix/generic/tixTList.h
 include/tix/unix/tixUnixInt.h
 include/tix/unix/tixUnixPort.h
-lib/libtix4141.so.1.0
+lib/libtix4175.so.1.0
 @exec /sbin/ldconfig -m %B
 man/mann/BtnBox.n.gz
 man/mann/Balloon.n.gz
@@ -170,6 +170,7 @@ share/tix4.1/demos/bitmaps/select.xpm
 share/tix4.1/demos/bitmaps/tix.gif
 share/tix4.1/demos/bitmaps/underlin.xbm
 share/tix4.1/demos/samples/AllSampl.tcl
+share/tix4.1/demos/samples/ArrowBtn.tcl
 share/tix4.1/demos/samples/Balloon.tcl
 share/tix4.1/demos/samples/BtnBox.tcl
 share/tix4.1/demos/samples/CObjView.tcl
@@ -186,6 +187,7 @@ share/tix4.1/demos/samples/DirTree.tcl
 share/tix4.1/demos/samples/DragDrop.tcl
 share/tix4.1/demos/samples/DynTree.tcl
 share/tix4.1/demos/samples/EFileDlg.tcl
+share/tix4.1/demos/samples/EditGrid.tcl
 share/tix4.1/demos/samples/FileDlg.tcl
 share/tix4.1/demos/samples/FileEnt.tcl
 share/tix4.1/demos/samples/HList1.tcl
@@ -293,4 +295,5 @@ share/tix4.1/Verify.tcl
 share/tix4.1/Version.tcl
 share/tix4.1/WInfo.tcl
 share/tix4.1/WinFile.tcl
+share/tix4.1/pkgIndex.tcl
 share/tix4.1/tclIndex