5 files changed, 51 insertions, 18 deletions

diff --git a/x11-toolkits/tk84/Makefile b/x11-toolkits/tk84/Makefile
index e35efd9ead18..6a8af97dc58d 100644
--- a/x11-toolkits/tk84/Makefile
+++ b/x11-toolkits/tk84/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tk
 PORTVERSION=	8.4a4
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	tcl
@@ -21,14 +22,14 @@ USE_XLIB=	yes
 INSTALLS_SHLIB=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}${PORTVERSION}/unix
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--enable-shared --with-tcl=${PREFIX}/lib/tcl8.4
-CONFIGURE_ENV=	PORTSDIR=${PORTSDIR} TK_LIB_FILE=libtk84.so.1
-MAKE_ENV=	SHORT_TK_VER=84
+TK_VER=		8.4
+SHORT_TK_VER=	84
+CONFIGURE_ARGS=	--enable-shared --with-tcl=${PREFIX}/lib/tcl${TK_VER}
+CONFIGURE_ENV=	PORTSDIR=${PORTSDIR} TK_LIB_FILE=libtk${SHORT_TK_VER}.so.1
+MAKE_ENV=	SHORT_TK_VER=${SHORT_TK_VER}
+PLIST_SUB=	TK_VER=${TK_VER} SHORT_TK_VER=${SHORT_TK_VER}
 PKGINSTALL=	${PKGDIR}/pkg-install.wish
 PKGDEINSTALL=	${PKGDIR}/pkg-deinstall.wish
-TK_VER=		8.4
-
-PLIST_SUB=	TK_VER=${TK_VER} SHORT_TK_VER=84
 
 MANCOMPRESSED=	no
 
@@ -335,11 +336,14 @@ MLINKS=	3DBorder.3 Tk_Alloc3DBorderFromObj.3 \
 .include <bsd.port.pre.mk>
 
 post-install:
+	${INSTALL_DATA} ${FILESDIR}/pkgIndex.tcl ${PREFIX}/lib/tk${TK_VER}/
 .if exists(${PKGINSTALL})
 	${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL}
 .endif
 
 test:
 	cd ${WRKSRC}; make test
+	echo "package require Tk" | tclsh${TK_VER}
+	echo "load libtk${SHORT_TK_VER}.so" | tclsh${TK_VER}
 
 .include <bsd.port.post.mk>
diff --git a/x11-toolkits/tk84/files/patch-aa b/x11-toolkits/tk84/files/patch-aa
index b52e4e273843..7fe4d892b4e6 100644
--- a/x11-toolkits/tk84/files/patch-aa
+++ b/x11-toolkits/tk84/files/patch-aa
@@ -1,5 +1,5 @@
 --- configure.orig	Wed Mar  6 09:51:50 2002
-+++ configure	Sun Mar 17 14:49:04 2002
++++ configure	Thu May  9 10:43:59 2002
 @@ -2482,22 +2482,23 @@
  	FreeBSD-*)
  	    # FreeBSD 3.* and greater have ELF.
@@ -36,3 +36,20 @@
  
  LIB_RUNTIME_DIR='${LIB_RUNTIME_DIR}'
  
+@@ -4733,7 +4735,7 @@
+ if test "${SHARED_BUILD}" = "1" -a "${SHLIB_SUFFIX}" != ""; then
+     TK_SHLIB_CFLAGS="${SHLIB_CFLAGS}"
+     TK_LIB_FILE=libtk${TK_SHARED_LIB_SUFFIX}
+-    MAKE_LIB="\${SHLIB_LD} -o \$@ \${OBJS} \$(TK_LD_SEARCH_FLAGS) \${TCL_STUB_LIB_SPEC} \${SHLIB_LD_LIBS}"
++    MAKE_LIB="\${SHLIB_LD} \${TCL_SHLIB_LD_EXTRAS} -o \$@ \${OBJS} \$(TK_LD_SEARCH_FLAGS) \${TCL_STUB_LIB_SPEC} \${SHLIB_LD_LIBS}"
+     RANLIB=":"
+ 
+     TCL_STUB_FLAGS="-DUSE_TCL_STUBS"
+@@ -5046,6 +5048,7 @@
+ s%@STLIB_LD@%$STLIB_LD%g
+ s%@SHLIB_LD@%$SHLIB_LD%g
+ s%@SHLIB_LD_LIBS@%$SHLIB_LD_LIBS%g
++s%@TCL_SHLIB_LD_EXTRAS@%$TCL_SHLIB_LD_EXTRAS%g
+ s%@SHLIB_SUFFIX@%$SHLIB_SUFFIX%g
+ s%@SHLIB_VERSION@%$SHLIB_VERSION%g
+ s%@TK_BUILD_LIB_SPEC@%$TK_BUILD_LIB_SPEC%g
diff --git a/x11-toolkits/tk84/files/patch-ab b/x11-toolkits/tk84/files/patch-ab
index fc9166672eab..e066ba11773c 100644
--- a/x11-toolkits/tk84/files/patch-ab
+++ b/x11-toolkits/tk84/files/patch-ab
@@ -1,5 +1,5 @@
---- Makefile.in.orig	Tue Aug  7 05:12:23 2001
-+++ Makefile.in	Tue Nov 13 07:39:32 2001
+--- Makefile.in.orig	Wed Mar  6 09:51:50 2002
++++ Makefile.in	Thu May  9 10:44:55 2002
 @@ -58,7 +58,9 @@
  SCRIPT_INSTALL_DIR	= $(INSTALL_ROOT)$(TK_LIBRARY)
  
@@ -20,7 +20,15 @@
  
  # Flags to pass to the linker
  LDFLAGS_DEBUG		= @LDFLAGS_DEBUG@
-@@ -354,6 +356,8 @@
+@@ -213,6 +215,7 @@
+ STLIB_LD		= @STLIB_LD@
+ SHLIB_LD		= @SHLIB_LD@
+ SHLIB_LD_LIBS		= @SHLIB_LD_LIBS@
++TCL_SHLIB_LD_EXTRAS	= @TCL_SHLIB_LD_EXTRAS@
+ 
+ # Additional search flags needed to find the various shared libraries
+ # at run-time.  The first symbol is for use when creating a binary
+@@ -356,6 +359,8 @@
  	default.h ks_names.h tkPatch.h tk.h tkButton.h tkCanvas.h tkInt.h  \
  	tkPort.h tkScrollbar.h tkText.h
  
@@ -29,7 +37,7 @@
  DEMOPROGS = browse hello ixset rmt rolodex square tcolor timer widget
  
  all: binaries libraries doc
-@@ -373,8 +377,14 @@
+@@ -375,8 +380,14 @@
  ${TK_LIB_FILE}: ${OBJS}
  	rm -f ${TK_LIB_FILE}
  	@MAKE_LIB@
@@ -44,7 +52,7 @@
  ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
  	rm -f ${STUB_LIB_FILE}
  	@MAKE_STUB_LIB@
-@@ -474,7 +484,7 @@
+@@ -485,7 +496,7 @@
  # some ranlibs write to current directory, and this might not always be
  # possible (e.g. if installing as root).
  
@@ -53,7 +61,7 @@
  	@for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) ; \
  	    do \
  	    if [ ! -d $$i ] ; then \
-@@ -492,12 +502,18 @@
+@@ -503,12 +514,18 @@
  	    fi
  	@echo "Installing $(TK_LIB_FILE) to $(LIB_INSTALL_DIR)/"
  	@$(INSTALL_DATA) $(TK_LIB_FILE) $(LIB_INSTALL_DIR)/$(TK_LIB_FILE)
@@ -73,7 +81,7 @@
  	@if test "$(TK_BUILD_EXP_FILE)" != ""; then \
  	    echo "Installing $(TK_EXP_FILE) to $(LIB_INSTALL_DIR)/"; \
  	    $(INSTALL_DATA) $(TK_BUILD_EXP_FILE) \
-@@ -511,6 +527,7 @@
+@@ -522,6 +539,7 @@
  
  install-libraries:
  	@for i in $(INCLUDE_INSTALL_DIR) \
@@ -81,7 +89,7 @@
  		$(SCRIPT_INSTALL_DIR) $(SCRIPT_INSTALL_DIR)/images \
  		$(SCRIPT_INSTALL_DIR)/msgs; \
  	    do \
-@@ -525,10 +542,18 @@
+@@ -536,10 +554,18 @@
  	    chmod +x $(UNIX_DIR)/install-sh; \
  	    fi
  	@echo "Installing header files";
@@ -103,7 +111,7 @@
  	    done;
  	@echo "Installing library files to $(SCRIPT_INSTALL_DIR)";
  	@for i in $(SRC_DIR)/library/*.tcl $(GENERIC_DIR)/prolog.ps \
-@@ -602,7 +627,6 @@
+@@ -613,7 +639,6 @@
  	    chmod 444 $(MAN1_INSTALL_DIR)/$$i; \
  	    done;
  	@echo "Cross-linking top-level (.1) docs";
@@ -111,7 +119,7 @@
  	@echo "Installing C API (.3) docs";
  	@cd $(SRC_DIR)/doc; for i in *.3; \
  	    do \
-@@ -612,7 +636,6 @@
+@@ -623,7 +648,6 @@
  	    chmod 444 $(MAN3_INSTALL_DIR)/$$i; \
  	    done;
  	@echo "Cross-linking top-level (.3) docs";
@@ -119,7 +127,7 @@
  	@echo "Installing command (.n) docs";
  	@cd $(SRC_DIR)/doc; for i in *.n; \
  	    do \
-@@ -622,7 +645,6 @@
+@@ -633,7 +657,6 @@
  	    chmod 444 $(MANN_INSTALL_DIR)/$$i; \
  	    done;
  	@echo "Cross-linking command (.n) docs";
diff --git a/x11-toolkits/tk84/files/pkgIndex.tcl b/x11-toolkits/tk84/files/pkgIndex.tcl
new file mode 100644
index 000000000000..56e13fa70ef6
--- /dev/null
+++ b/x11-toolkits/tk84/files/pkgIndex.tcl
@@ -0,0 +1,3 @@
+# Tcl package index file, version 1.0
+
+package ifneeded Tk 8.4 [list load "[file join [file dirname $dir] libtk84.so.1]" Tk]
diff --git a/x11-toolkits/tk84/pkg-plist b/x11-toolkits/tk84/pkg-plist
index e224d9626237..ae31031f75c8 100644
--- a/x11-toolkits/tk84/pkg-plist
+++ b/x11-toolkits/tk84/pkg-plist
@@ -133,6 +133,7 @@ lib/tk%%TK_VER%%/msgbox.tcl
 lib/tk%%TK_VER%%/obsolete.tcl
 lib/tk%%TK_VER%%/optMenu.tcl
 lib/tk%%TK_VER%%/palette.tcl
+lib/tk%%TK_VER%%/pkgIndex.tcl
 lib/tk%%TK_VER%%/panedwindow.tcl
 lib/tk%%TK_VER%%/prolog.ps
 lib/tk%%TK_VER%%/safetk.tcl