3 files changed, 58 insertions, 6 deletions

diff --git a/x11-toolkits/tix/Makefile b/x11-toolkits/tix/Makefile
index fc284c39d82d..8a5113b5ea63 100644
--- a/x11-toolkits/tix/Makefile
+++ b/x11-toolkits/tix/Makefile
@@ -3,7 +3,7 @@
 # Date created:		22 December 1996
 # Whom:			Thomas Gellekum <tg@freebsd.org>
 #
-# $Id: Makefile,v 1.6 1997/02/25 08:10:20 asami Exp $
+# $Id: Makefile,v 1.7 1997/04/20 13:19:57 wosch Exp $
 #
 
 DISTNAME=	Tix4.1.0
@@ -17,7 +17,7 @@ LIB_DEPENDS=	tk41\\.1\\.:${PORTSDIR}/x11/tk41
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/unix/tk4.1
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--enable-shared \
+CONFIGURE_ARGS=	--enable-shared --enable-sam \
 		--with-tcl=/usr/include/tcl \
 		--with-tk="${PREFIX}/include/tk4.1"
 # this should probably be added to bsd.port.mk
@@ -38,7 +38,7 @@ pre-configure:
             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})
diff --git a/x11-toolkits/tix/files/patch-ac b/x11-toolkits/tix/files/patch-ac
index 937a18e40784..6c16cdc3cf8f 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	Fri Feb 21 11:18:44 1997
++++ Makefile.in	Sun Apr 20 01:37:54 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
@@ -9,7 +9,7 @@
  
  # Directory in which to install the archive libtix.a:
  LIB_DIR =	$(exec_prefix)/lib
-@@ -70,12 +70,12 @@
+@@ -70,16 +70,16 @@
  TK_GENERIC_DIR  = $(TK_SRC_DIR)/generic
  
  # Libraries to use when linking:
@@ -23,8 +23,14 @@
 -LIBS_TCLONLY = @TCL_BUILD_LIB_SPEC@ @TCL_LIBS@
 +LIBS_TCLONLY = @TCL_LIB_SPEC@ @TCL_LIBS@
  
- RUN_TCLSH	= TCL_LIBRARY=$(TCL_SRC_DIR)/library \
+-RUN_TCLSH	= TCL_LIBRARY=$(TCL_SRC_DIR)/library \
++RUN_TCLSH	= TCL_LIBRARY=/usr/libdata/tcl \
  		  TK_LIBRARY=$(TK_SRC_DIR)/library \
+-	          $(TCL_SRC_DIR)/unix/tclsh
++	          /usr/bin/tclsh
+ 
+ 
+ #----------------------------------------------------------------
 @@ -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 \
@@ -35,3 +41,43 @@
  
  #----------------------------------------------------------------
  # The information below should be usable as is. You shouldn't need
+@@ -210,24 +211,24 @@
+ # scripts of TK must be included in the fixed order.
+ #----------------------------------------------------------------------
+ 
+-TCL_SCRIPTS = $(TCL_SRC_DIR)/library/*.tcl
++TCL_SCRIPTS = /usr/libdata/tcl/*.tcl
+ 
+ TK_SCRIPTS = \
+-    $(TK_SRC_DIR)/library/bgerror.tcl \
+-    $(TK_SRC_DIR)/library/dialog.tcl \
+-    $(TK_SRC_DIR)/library/focus.tcl \
+-    $(TK_SRC_DIR)/library/obsolete.tcl \
+-    $(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/button.tcl \
+-    $(TK_SRC_DIR)/library/entry.tcl \
+-    $(TK_SRC_DIR)/library/listbox.tcl \
+-    $(TK_SRC_DIR)/library/menu.tcl \
+-    $(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
+ 
+ TIX_SCRIPTS = \
diff --git a/x11-toolkits/tix/pkg-plist b/x11-toolkits/tix/pkg-plist
index 0edad35f59ff..9e23f598dade 100644
--- a/x11-toolkits/tix/pkg-plist
+++ b/x11-toolkits/tix/pkg-plist
@@ -1,4 +1,7 @@
+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
 include/tix.h
@@ -17,6 +20,9 @@ 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
 @exec /sbin/ldconfig -m %B
 man/mann/BtnBox.n.gz
 man/mann/Balloon.n.gz