Upgrade to 4.1.0.005. Fix PLIST and dependency on tcl7.5/tk4.1 along the way.

5 files changed, 33 insertions, 22 deletions

diff --git a/x11-toolkits/tix/Makefile b/x11-toolkits/tix/Makefile
index 65f6b30db8fc..2c4cb845e783 100644
--- a/x11-toolkits/tix/Makefile
+++ b/x11-toolkits/tix/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	tix
-# Version required:	4.1.0
+# Version required:	4.1.0.005
 # Date created:		22 December 1996
 # Whom:			Thomas Gellekum <tg@freebsd.org>
 #
-# $Id: Makefile,v 1.8 1997/04/22 10:16:06 tg Exp $
+# $Id: Makefile,v 1.9 1997/07/17 15:13:01 max Exp $
 #
 
-DISTNAME=	Tix4.1.0
-PKGNAME=	tix-4.1.0
+DISTNAME=	Tix4.1.0.005
+PKGNAME=	tix-4.1.0.005
 CATEGORIES=	x11 tk41
 MASTER_SITES=	ftp://ftp.xpi.com/pub/
 
@@ -15,10 +15,10 @@ MAINTAINER=	ports@FreeBSD.ORG
 
 LIB_DEPENDS=	tk41\\.1\\.:${PORTSDIR}/x11/tk41
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/unix/tk4.1
+WRKSRC=		${WRKDIR}/Tix4.1.0/unix/tk4.1
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared --enable-sam \
-		--with-tcl=/usr/include/tcl \
+		--with-tcl="${PREFIX}/include/tcl7.5" \
 		--with-tk="${PREFIX}/include/tk4.1"
 # this should probably be added to bsd.port.mk
 CONFIGURE_ENV=	PREFIX=${PREFIX}
@@ -33,14 +33,14 @@ MANN=		BtnBox.n Balloon.n ChkList.n Destroy.n ComboBox.n Control.n \
 		pixmap.n tix.n
 
 pre-configure:
-	@(cd ${WRKDIR}/${DISTNAME}/unix && \
+	@(cd ${WRKSRC}/.. && \
 	    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 && \
+	@(cd ${WRKSRC}/.. && \
 	    ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${INSTALL_TARGET})
 	@${MKDIR} ${PREFIX}/man/man1
 	@mv ${PREFIX}/man/mann/tixwish.1 ${PREFIX}/man/man1
@@ -48,7 +48,7 @@ post-install:
 	${LDCONFIG} -m ${PREFIX}/lib
 .for dir in generic unix
 	@${MKDIR} ${PREFIX}/include/tix/${dir}
-	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/${dir}/*.h ${PREFIX}/include/tix/${dir}
+	${INSTALL_DATA} ${WRKSRC}/../../${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 9a406c4a0088..f235bc96913a 100644
--- a/x11-toolkits/tix/distinfo
+++ b/x11-toolkits/tix/distinfo
@@ -1 +1 @@
-MD5 (Tix4.1.0.tar.gz) = 6083d1dc53d55fe03e24603f8bb42186
+MD5 (Tix4.1.0.005.tar.gz) = 7a2246d10e98f51f118addf5d7e8c124
diff --git a/x11-toolkits/tix/files/patch-aa b/x11-toolkits/tix/files/patch-aa
index 1cfcc91ffd59..5e76cc8e0d30 100644
--- a/x11-toolkits/tix/files/patch-aa
+++ b/x11-toolkits/tix/files/patch-aa
@@ -5,7 +5,7 @@
  echo "$ac_t""$TCL_SRC_DIR" 1>&6
  
 -TCL_BIN_DIR=$TCL_SRC_DIR/unix
-+TCL_BIN_DIR=$TCL_SRC_DIR/../../libdata/tcl
++TCL_BIN_DIR=$TCL_SRC_DIR/../../lib/tcl7.5
  
  #--------------------------------------------------------------------
  #	See if there was a command-line option for where Tk is;  if
@@ -14,7 +14,7 @@
  echo "$ac_t""$TK_SRC_DIR" 1>&6
  
 -TK_BIN_DIR=$TK_SRC_DIR/unix
-+TK_BIN_DIR=$TK_SRC_DIR/../../lib
++TK_BIN_DIR=$TK_SRC_DIR/../../lib/tk4.1
  
  #--------------------------------------------------------------------
  #	Find out the top level source directory of the Tix package.
diff --git a/x11-toolkits/tix/files/patch-ac b/x11-toolkits/tix/files/patch-ac
index 6c16cdc3cf8f..b8a7675c4561 100644
--- a/x11-toolkits/tix/files/patch-ac
+++ b/x11-toolkits/tix/files/patch-ac
@@ -1,5 +1,5 @@
---- Makefile.in.orig	Sun Feb 16 06:12:37 1997
-+++ Makefile.in	Sun Apr 20 01:37:54 1997
+--- Makefile.in.orig	Sat Jun 28 02:49:15 1997
++++ Makefile.in	Tue Jul 29 18:56:35 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
@@ -24,14 +24,15 @@
 +LIBS_TCLONLY = @TCL_LIB_SPEC@ @TCL_LIBS@
  
 -RUN_TCLSH	= TCL_LIBRARY=$(TCL_SRC_DIR)/library \
-+RUN_TCLSH	= TCL_LIBRARY=/usr/libdata/tcl \
- 		  TK_LIBRARY=$(TK_SRC_DIR)/library \
+-		  TK_LIBRARY=$(TK_SRC_DIR)/library \
 -	          $(TCL_SRC_DIR)/unix/tclsh
-+	          /usr/bin/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
  
  
  #----------------------------------------------------------------
-@@ -131,7 +131,8 @@
+@@ -133,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) \
@@ -41,12 +42,12 @@
  
  #----------------------------------------------------------------
  # The information below should be usable as is. You shouldn't need
-@@ -210,24 +211,24 @@
+@@ -211,24 +212,24 @@
  # scripts of TK must be included in the fixed order.
  #----------------------------------------------------------------------
  
 -TCL_SCRIPTS = $(TCL_SRC_DIR)/library/*.tcl
-+TCL_SCRIPTS = /usr/libdata/tcl/*.tcl
++TCL_SCRIPTS = $(TCL_SRC_DIR)/../../lib/tcl7.5/*.tcl
  
  TK_SCRIPTS = \
 -    $(TK_SRC_DIR)/library/bgerror.tcl \
diff --git a/x11-toolkits/tix/pkg-plist b/x11-toolkits/tix/pkg-plist
index 9e23f598dade..9fed47deb1ad 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/sawish4.1
-bin/satclsh7.5
 @exec ln -s %D/%F %B/tixwish
 @unexec rm %B/tixwish
+bin/sawish4.1
+bin/satclsh7.5
 include/tix.h
 include/tix/generic/tix.h
 include/tix/generic/tixBitmaps.h
@@ -185,6 +185,7 @@ share/tix4.1/demos/samples/CmpImg.tcl
 share/tix4.1/demos/samples/CmpImg1.tcl
 share/tix4.1/demos/samples/CmpImg2.tcl
 share/tix4.1/demos/samples/CmpImg3.tcl
+share/tix4.1/demos/samples/CmpImg4.tcl
 share/tix4.1/demos/samples/ComboBox.tcl
 share/tix4.1/demos/samples/Control.tcl
 share/tix4.1/demos/samples/DirDlg.tcl
@@ -303,3 +304,12 @@ share/tix4.1/WInfo.tcl
 share/tix4.1/WinFile.tcl
 share/tix4.1/pkgIndex.tcl
 share/tix4.1/tclIndex
+@dirrm include/tix/generic
+@dirrm include/tix/unix
+@dirrm include/tix
+@dirrm share/tix4.1/pref
+@dirrm share/tix4.1/demos/samples
+@dirrm share/tix4.1/demos/bitmaps
+@dirrm share/tix4.1/demos
+@dirrm share/tix4.1/bitmaps
+@dirrm share/tix4.1