Set TK_LIB_FILE so ports that depend on libtk81.so.1 can find it. Also

a minor cleanup to PLIST while I'm here.

4 files changed, 21 insertions, 15 deletions

diff --git a/x11-toolkits/tk82/Makefile b/x11-toolkits/tk82/Makefile
index 94333ee663c1..fe29fb622ffa 100644
--- a/x11-toolkits/tk82/Makefile
+++ b/x11-toolkits/tk82/Makefile
@@ -3,7 +3,7 @@
 # Date created:		19 August 1997
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.20 1998/12/13 08:49:14 asami Exp $
+# $Id: Makefile,v 1.21 1999/01/17 14:26:32 ejc Exp $
 #
 
 DISTNAME=	tk8.1b1
@@ -21,7 +21,7 @@ NO_LATEST_LINK=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}/unix
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared
-CONFIGURE_ENV=  PORTSDIR=${PORTSDIR}
+CONFIGURE_ENV=  PORTSDIR=${PORTSDIR} TK_LIB_FILE=libtk81.so.1
 PKGINSTALL=     ${PORTSDIR}/x11-toolkits/tk80/pkg/INSTALL.wish
 
 MAN1=	wish.1
diff --git a/x11-toolkits/tk82/files/patch-aa b/x11-toolkits/tk82/files/patch-aa
index 236821a86312..f858d13c6249 100644
--- a/x11-toolkits/tk82/files/patch-aa
+++ b/x11-toolkits/tk82/files/patch-aa
@@ -1,5 +1,5 @@
---- configure.orig	Fri Dec 11 18:38:40 1998
-+++ configure	Sat Jan  2 16:03:14 1999
+--- configure.orig	Fri Dec 11 17:38:40 1998
++++ configure	Sun Jan 24 16:12:10 1999
 @@ -854,14 +854,14 @@
    withval="$with_tcl"
    TCL_BIN_DIR=$withval
@@ -27,6 +27,15 @@
  LIB_RUNTIME_DIR='${LIB_RUNTIME_DIR}'
  
  # If Tcl and Tk are installed in different places, adjust the library
+@@ -2302,7 +2304,7 @@
+ if test "$ok" = "yes" -a "${SHLIB_SUFFIX}" != ""; then
+     TK_SHARED_BUILD=1
+     TK_SHLIB_CFLAGS="${SHLIB_CFLAGS}"
+-    TK_LIB_FILE=libtk${TCL_SHARED_LIB_SUFFIX}
++    TK_LIB_FILE=${TK_LIB_FILE}
+     MAKE_LIB="\${SHLIB_LD} -o \${TK_LIB_FILE} \${OBJS} \$(TK_LD_SEARCH_FLAGS) ${SHLIB_LD_LIBS}"
+     RANLIB=":"
+ else
 @@ -2513,6 +2515,7 @@
  s%@SHLIB_VERSION@%$SHLIB_VERSION%g
  s%@TCL_BIN_DIR@%$TCL_BIN_DIR%g
diff --git a/x11-toolkits/tk82/files/patch-ab b/x11-toolkits/tk82/files/patch-ab
index b519ef375232..50203b395ffe 100644
--- a/x11-toolkits/tk82/files/patch-ab
+++ b/x11-toolkits/tk82/files/patch-ab
@@ -1,5 +1,5 @@
---- Makefile.in.orig	Fri Dec 11 18:38:40 1998
-+++ Makefile.in	Thu Jan 21 12:24:03 1999
+--- Makefile.in.orig	Fri Dec 11 17:38:40 1998
++++ Makefile.in	Sun Jan 24 16:16:06 1999
 @@ -56,7 +56,9 @@
  BIN_DIR =		$(exec_prefix)/bin
  
@@ -62,17 +62,13 @@
  	@for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) ; \
  	    do \
  	    if [ ! -d $$i ] ; then \
-@@ -387,16 +395,23 @@
- 		fi; \
+@@ -388,15 +396,22 @@
  	    done;
  	@echo "Installing $(TK_LIB_FILE)"
--	@$(INSTALL_DATA) $(TK_LIB_FILE) $(LIB_INSTALL_DIR)/$(TK_LIB_FILE)
--	@(cd $(LIB_INSTALL_DIR); $(RANLIB) $(TK_LIB_FILE))
--	@chmod 555 $(LIB_INSTALL_DIR)/$(TK_LIB_FILE)
-+	@$(INSTALL_DATA) $(TK_LIB_FILE) $(LIB_INSTALL_DIR)/libtk81.so.1
-+	@ln -sf libtk81.so.1 $(LIB_INSTALL_DIR)/libtk81.so
-+	@(cd $(LIB_INSTALL_DIR); $(RANLIB) libtk81.so.1)
-+	@chmod 555 $(LIB_INSTALL_DIR)/libtk81.so.1
+ 	@$(INSTALL_DATA) $(TK_LIB_FILE) $(LIB_INSTALL_DIR)/$(TK_LIB_FILE)
++	@ln -sf $(TK_LIB_FILE) $(LIB_INSTALL_DIR)/libtk81.so
+ 	@(cd $(LIB_INSTALL_DIR); $(RANLIB) $(TK_LIB_FILE))
+ 	@chmod 555 $(LIB_INSTALL_DIR)/$(TK_LIB_FILE)
 +	@echo "Installing libtk81.a"
 +	@$(INSTALL_DATA) libtk81.a $(LIB_INSTALL_DIR)/libtk81.a
 +	@(cd $(LIB_INSTALL_DIR); $(RANLIB) libtk81.a)
diff --git a/x11-toolkits/tk82/pkg-plist b/x11-toolkits/tk82/pkg-plist
index 4855c5c5e5d2..18dc742aa134 100644
--- a/x11-toolkits/tk82/pkg-plist
+++ b/x11-toolkits/tk82/pkg-plist
@@ -105,6 +105,7 @@ lib/tk8.1/images/pwrdLogo150.gif
 lib/tk8.1/images/pwrdLogo175.gif
 lib/tk8.1/images/pwrdLogo200.gif
 lib/tk8.1/images/pwrdLogo75.gif
+lib/tk8.1/images/tai-ku.gif
 lib/tk8.1/listbox.tcl
 lib/tk8.1/menu.tcl
 lib/tk8.1/msgbox.tcl