5 files changed, 99 insertions, 25 deletions

diff --git a/lang/tclX80/Makefile b/lang/tclX80/Makefile
index 11b360f65f34..548f66e29609 100644
--- a/lang/tclX80/Makefile
+++ b/lang/tclX80/Makefile
@@ -3,7 +3,7 @@
 # Date created:		6 February 1996
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.16 1997/08/24 22:20:55 asami Exp $
+# $Id: Makefile,v 1.18 1997/09/12 17:16:18 pst Exp $
 #
 
 DISTNAME=	tclX7.5.2
@@ -11,14 +11,14 @@ PKGNAME=	tclX-7.5.2
 CATEGORIES=	lang tk41
 MASTER_SITES=	ftp://ftp.neosoft.com/pub/tcl/tclx-distrib/
 
-DEPENDS=	${TK_DIR}
-LIB_DEPENDS=	tk41\\.1:${TK_DIR}
+LIB_DEPENDS=	tk41\\.1:${PORTSDIR}/x11/tk41
 
-BROKEN=         "checking macro values from Config.mk... configure: error: Config.mk does not set TK_CONFIG to a valid path to tkConfig.sh"
+MAINTAINER=	ports@FreeBSD.ORG
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/unix
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--enable-shared --with-tk
+CONFIGURE_ARGS+= --enable-shared --with-tk
+CONFIGURE_ENV+=	PREFIX=${PREFIX}
 MAN3=		CmdWrite.3 Handles.3 Keylist.3 TclCommandWriting.3 \
 		TclXInit.3 Tcl_HandleAlloc.3 Tcl_HandleFree.3 \
 		Tcl_HandleTblInit.3 Tcl_HandleTblRelease.3 \
@@ -30,26 +30,6 @@ MAN3=		CmdWrite.3 Handles.3 Keylist.3 TclCommandWriting.3 \
 MANN=		Memory.n TclX.n ckalloc.n memory.n ckfree.n \
 		Tcl_DisplayMemory.n Tcl_InitMemory.n Tcl_ValidateAllMemory.n
 
-TCL_BASE=	/usr/libdata/tcl
-TCL_SRC=	/usr/src/contrib/tcl
-
-TK_DIR=		${PORTSDIR}/x11/tk41
-TK_SRC=		${TK_DIR}/work/tk4.1
-
-pre-configure:
-	cd ${WRKSRC} ; \
-	mv Config.mk Config.mk.orig2 && \
-	sed -e 's;TCL_SRC=$${srcbasedir}/../tcl7.5;TCL_SRC=${TCL_SRC};' \
-	    -e 's;TCL_BUILD=$${bldbasedir}/../tcl7.5;TCL_BUILD=${TCL_SRC};' \
-	    -e 's;TCL_CONFIG=$${TCL_BUILD}/unix/tclConfig.sh;TCL_CONFIG=${TCL_BASE}/tclConfig.sh;' \
-	    -e 's;TCL_LIB=$${TCL_BUILD_LIB_SPEC};TCL_LIB=$${TCL_LIB_SPEC};' \
-	    -e 's;TCL_SHLIB_DIR=$${bldbasedir};TCL_SHLIB_DIR=${TCL_SRC};' \
-	    -e 's;TK_SRC=$${srcbasedir};TK_SRC=${TK_SRC};' \
-	    -e 's;TK_BUILD=$${bldbasedir};TK_BUILD=${TK_SRC};' \
-	    -e 's;TK_LIB=$${bldbasedir};TK_LIB=${TK_SRC};' \
-	    -e 's;TK_SHLIB_DIR=$${bldbasedir};TK_SHLIB_DIR=${TK_SRC};' \
-	Config.mk.orig2 >Config.mk
-
 post-install:
 	$(INSTALL_MAN) $(WRKSRC)/../doc/CmdWrite.3 $(PREFIX)/man/man3
 	$(INSTALL_MAN) $(WRKSRC)/../doc/Handles.3 $(PREFIX)/man/man3
diff --git a/lang/tclX80/files/patch-aa b/lang/tclX80/files/patch-aa
new file mode 100644
index 000000000000..5f3999ce37f6
--- /dev/null
+++ b/lang/tclX80/files/patch-aa
@@ -0,0 +1,32 @@
+--- Config.mk.orig	Sun Jun 16 07:39:18 1996
++++ Config.mk	Thu Oct  9 08:55:04 1997
+@@ -57,10 +57,10 @@
+ # to ${TCL_LIB_SPEC}.
+ # 
+ 
+-TCL_SRC=${srcbasedir}/../tcl7.5
+-TCL_BUILD=${bldbasedir}/../tcl7.5
+-TCL_CONFIG=${TCL_BUILD}/unix/tclConfig.sh
+-TCL_LIB=${TCL_BUILD_LIB_SPEC}
++TCL_SRC=${PREFIX}/include/tcl7.5
++TCL_BUILD=
++TCL_CONFIG=${PREFIX}/lib/tcl7.5/tclConfig.sh
++TCL_LIB=${TCL_LIB_SPEC}
+ 
+ #------------------------------------------------------------------------------
+ # Unless configure is going to be run with --with-tk=NO, these defines must be
+@@ -69,10 +69,10 @@
+ # neccessary to link with the Tk shared library (libtk4.1.so).  If you want to
+ # use the installed Tk library, set TK_LIB to ${TK_LIB_SPEC}.
+ 
+-TK_SRC=${srcbasedir}/../tk4.1
+-TK_BUILD=${bldbasedir}/../tk4.1
+-TK_CONFIG=${TK_BUILD}/unix/tkConfig.sh
+-TK_LIB=${TK_BUILD_LIB_SPEC}
++TK_SRC=${PREFIX}/include/tk4.1
++TK_BUILD=
++TK_CONFIG=${PREFIX}/lib/tk4.1/tkConfig.sh
++TK_LIB=${TK_LIB_SPEC}
+ 
+ #------------------------------------------------------------------------------
+ # C compiler and debug/optimization/profiling flag to use.  Set by configure,
diff --git a/lang/tclX80/files/patch-ab b/lang/tclX80/files/patch-ab
new file mode 100644
index 000000000000..5a621b554637
--- /dev/null
+++ b/lang/tclX80/files/patch-ab
@@ -0,0 +1,20 @@
+--- ../tcl/unix/Makefile.in.orig	Sun Jun 16 07:39:09 1996
++++ ../tcl/unix/Makefile.in	Thu Oct  9 09:49:19 1997
+@@ -85,7 +85,7 @@
+ # If a link fails, purge the executable, as some systems leave invalid
+ # executables around.
+ #
+-all: libtclx.a SHLIB_@BUILD_SHARED@ tcl checkup RUNTIME tclXtest runtest
++all: libtclx.a SHLIB_@BUILD_SHARED@ tcl checkup RUNTIME
+ 
+ tcl: tclXAppInit.o libtclx.a SHLIB_@BUILD_SHARED@
+ 	${CC} ${LD_SWITCHES} tclXAppInit.o ${LDLIBS} -o tcl || \
+@@ -237,7 +237,7 @@
+ # unless we don't have them.
+ #
+ RUNTIME: tcl.tlib tcl.tndx tclx.tcl buildidx.tcl loadouster.tcl help.tmp \
+-         dltest.tmp checkup
++         checkup
+ 
+ tcl.tlib: ${TLIB_SRCS}
+ 	-rm -f tcl.tlib tcl.tndx
diff --git a/lang/tclX80/files/patch-ac b/lang/tclX80/files/patch-ac
new file mode 100644
index 000000000000..b8b932364be2
--- /dev/null
+++ b/lang/tclX80/files/patch-ac
@@ -0,0 +1,12 @@
+--- ../tk/unix/Makefile.in.orig	Sun Jun 16 07:39:17 1996
++++ ../tk/unix/Makefile.in	Thu Oct  9 09:57:43 1997
+@@ -67,8 +67,7 @@
+ # If a link fails, purge the executable, as some systems leave invalid
+ # executables around.
+ #
+-all: libtkx.a SHLIB_@BUILD_SHARED@ wishx RUNTIME tktest runtest \
+-     ${bldbasedir}/tk/tests
++all: libtkx.a SHLIB_@BUILD_SHARED@ wishx RUNTIME
+ 
+ wishx: tkXAppInit.o libtkx.a ${LIBTK} ${LIBTCLX}
+ 	${CC} ${LD_SWITCHES} tkXAppInit.o ${LDLIBS} -o wishx || \
diff --git a/lang/tclX80/pkg-plist b/lang/tclX80/pkg-plist
index 4f031e48c217..7ef2bfcd2906 100644
--- a/lang/tclX80/pkg-plist
+++ b/lang/tclX80/pkg-plist
@@ -285,3 +285,33 @@ tkX/4.1.2/help/tk/widgets/tk_menuBar
 tkX/4.1.2/help/tk/widgets/tk_optionMenu
 tkX/4.1.2/help/tk/widgets/tk_popup
 tkX/4.1.2/help/tk/widgets/toplevel
+@dirrm tclX/7.5.2/help/tcl/variables
+@dirrm tclX/7.5.2/help/tcl/time
+@dirrm tclX/7.5.2/help/tcl/tclshell
+@dirrm tclX/7.5.2/help/tcl/strings
+@dirrm tclX/7.5.2/help/tcl/status
+@dirrm tclX/7.5.2/help/tcl/sockets
+@dirrm tclX/7.5.2/help/tcl/signals
+@dirrm tclX/7.5.2/help/tcl/processes
+@dirrm tclX/7.5.2/help/tcl/math
+@dirrm tclX/7.5.2/help/tcl/lists
+@dirrm tclX/7.5.2/help/tcl/libraries
+@dirrm tclX/7.5.2/help/tcl/keyedlists
+@dirrm tclX/7.5.2/help/tcl/intro
+@dirrm tclX/7.5.2/help/tcl/internation
+@dirrm tclX/7.5.2/help/tcl/filescan
+@dirrm tclX/7.5.2/help/tcl/files
+@dirrm tclX/7.5.2/help/tcl/events
+@dirrm tclX/7.5.2/help/tcl/debug
+@dirrm tclX/7.5.2/help/tcl/control
+@dirrm tclX/7.5.2/help/tcl
+@dirrm tclX/7.5.2/help
+@dirrm tclX/7.5.2
+@dirrm tclX/
+@dirrm tkX/4.1.2/help/tk/widgets
+@dirrm tkX/4.1.2/help/tk/images
+@dirrm tkX/4.1.2/help/tk/control
+@dirrm tkX/4.1.2/help/tk
+@dirrm tkX/4.1.2/help
+@dirrm tkX/4.1.2
+@dirrm tkX/