4 files changed, 44 insertions, 27 deletions

diff --git a/x11/tkgoodstuff/Makefile b/x11/tkgoodstuff/Makefile
index 42ec105a578c..b80ee3233a76 100644
--- a/x11/tkgoodstuff/Makefile
+++ b/x11/tkgoodstuff/Makefile
@@ -1,25 +1,29 @@
 # New ports collection makefile for:	tkgoodstuff
-# Version required:	4.1
+# Version required:	4.2b1-8
 # Date created:		7 Oct 1996
 # Whom:			pst
 #
 # $Id: Makefile,v 1.5 1997/04/20 13:20:00 wosch Exp $
 #
 
-DISTNAME=	tkgoodstuff4.1
-PKGNAME=	tkgoodstuff-4.1
-CATEGORIES=	x11 tk41
-MASTER_SITES=	ftp://merv.philosophy.lsa.umich.edu/pub/
-EXTRACT_SUFX=	.tgz
+DISTNAME=	tkgoodstuff4.2
+PKGNAME=	tkgoodstuff-4.2b1.8
+CATEGORIES=	x11
+MASTER_SITES=	http://www-personal.umich.edu/~markcrim/tkgoodstuff/dists/
 
 MAINTAINER=	pst@FreeBSD.org
 
 RUN_DEPENDS=	fvwm:${PORTSDIR}/x11/fvwm2
-LIB_DEPENDS=	tk41\\.1:${PORTSDIR}/x11/tk41
+LIB_DEPENDS=	tk42\\.1:${PORTSDIR}/x11/tk42
 
+WRKSRC=		${WRKDIR}/tkgoodstuff4.2b1-8
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	TCLCONFIGSH=/usr/libdata/tcl/tclConfig.sh TCLSH=/usr/bin/tclsh
+CONFIGURE_ENV=	TCLCONFIGSH=${PREFIX}/lib/tcl7.6/tclConfig.sh \
+		TKCONFIGSH=${PREFIX}/lib/tk4.2/tkConfig.sh
 CONFIGURE_ARGS=	--enable-libs
 STRIP=
 
+post-patch:
+	@${RM} -f ${WRKSRC}/tcl/*.orig
+
 .include <bsd.port.mk>
diff --git a/x11/tkgoodstuff/distinfo b/x11/tkgoodstuff/distinfo
index 2abd3fa122bb..01d819351b92 100644
--- a/x11/tkgoodstuff/distinfo
+++ b/x11/tkgoodstuff/distinfo
@@ -1 +1 @@
-MD5 (tkgoodstuff4.1.tgz) = cf4eb8d459243e5975eefd57c1eceebe
+MD5 (tkgoodstuff4.2.tar.gz) = 3c505f1d8ac566b233f7d27b6eef9692
diff --git a/x11/tkgoodstuff/files/patch-aa b/x11/tkgoodstuff/files/patch-aa
index f6ceeb4f3242..051d6fd36471 100644
--- a/x11/tkgoodstuff/files/patch-aa
+++ b/x11/tkgoodstuff/files/patch-aa
@@ -1,7 +1,24 @@
-*** libs/Makefile.in.ORIG	Thu Sep 19 13:08:41 1996
---- libs/Makefile.in	Mon Oct  7 21:21:13 1996
+*** libs/Makefile.in.orig	Sat Nov 23 12:09:43 1996
+--- libs/Makefile.in	Sat Jun 21 13:43:32 1997
 ***************
-*** 72,97 ****
+*** 44,50 ****
+  INSTALL_DATA =		@INSTALL_DATA@
+  
+  CC_SWITCHES = ${CFLAGS} -I$(SRCDIR) \
+! 	-I$(TK_PREFIX)/include -I$(TK_PREFIX)/include/tcl \
+  	$(XINCLUDES) $(SHLIB_CFLAGS)
+  
+  OBJS = tkFvwm.o tixImgXpm.o tkXAccess.o tkNetscape.o clientWin.o \
+--- 44,50 ----
+  INSTALL_DATA =		@INSTALL_DATA@
+  
+  CC_SWITCHES = ${CFLAGS} -I$(SRCDIR) \
+! 	-I$(TK_PREFIX)/include/tk4.2 -I$(TK_PREFIX)/include/tcl7.6 \
+  	$(XINCLUDES) $(SHLIB_CFLAGS)
+  
+  OBJS = tkFvwm.o tixImgXpm.o tkXAccess.o tkNetscape.o clientWin.o \
+***************
+*** 58,79 ****
   libs: $(SHLIBS) pkgIndex.tcl
   
   $(TKG_SHLIB): tkg.o tkgButton.o
@@ -12,10 +29,6 @@
 ! 	${SHLIB_LD} -o $@ $(LIBS) $(SHLIB_LD_LIBS) tixImgXpm.o
   	@chmod 0755 $@
   
-  $(BLT_SHLIB): $(BLTSHARED)
-! 	${SHLIB_LD} -o $@ $(LIBS) $(SHLIB_LD_LIBS) $(BLTSHARED)
-  	@chmod 0755 $@
-  
   $(NETSCAPE_SHLIB): tkNetscape.o clientWin.o
 ! 	${SHLIB_LD} -o $@ $(LIBS) $(SHLIB_LD_LIBS) tkNetscape.o clientWin.o
   
@@ -28,7 +41,7 @@
   	@chmod 0755 $@
   
   tkgwish: $(TKGWISH_NAME)
---- 72,97 ----
+--- 58,79 ----
   libs: $(SHLIBS) pkgIndex.tcl
   
   $(TKG_SHLIB): tkg.o tkgButton.o
@@ -39,10 +52,6 @@
 ! 	${SHLIB_LD} -o $@ $(SHLIB_LD_LIBS) tixImgXpm.o
   	@chmod 0755 $@
   
-  $(BLT_SHLIB): $(BLTSHARED)
-! 	${SHLIB_LD} -o $@ $(SHLIB_LD_LIBS) $(BLTSHARED)
-  	@chmod 0755 $@
-  
   $(NETSCAPE_SHLIB): tkNetscape.o clientWin.o
 ! 	${SHLIB_LD} -o $@ $(SHLIB_LD_LIBS) tkNetscape.o clientWin.o
   
diff --git a/x11/tkgoodstuff/pkg-plist b/x11/tkgoodstuff/pkg-plist
index 7aa92632c338..3a2b9c18b1e4 100644
--- a/x11/tkgoodstuff/pkg-plist
+++ b/x11/tkgoodstuff/pkg-plist
@@ -169,10 +169,14 @@ lib/tkgoodstuff/sample-rc/stacks
 lib/tkgoodstuff/sample-rc/win95
 lib/tkgoodstuff/tkgoodstuff
 lib/tkgoodstuff/Dialer
-lib/tkgoodstuff/libtkg41.so
-lib/tkgoodstuff/libpixmap41.so
-lib/tkgoodstuff/libblt41.so
-lib/tkgoodstuff/libtkNetscape41.so
-lib/tkgoodstuff/libtkfvwm41.so
-lib/tkgoodstuff/libtkSteal41.so
+lib/tkgoodstuff/libtkg42.so
+lib/tkgoodstuff/libpixmap42.so
+lib/tkgoodstuff/libtkNetscape42.so
+lib/tkgoodstuff/libtkfvwm42.so
+lib/tkgoodstuff/libtkSteal42.so
 lib/tkgoodstuff/pkgIndex.tcl
+@dirrm lib/tkgoodstuff/tcl
+@dirrm lib/tkgoodstuff/sample-rc
+@dirrm lib/tkgoodstuff/icons
+@dirrm lib/tkgoodstuff/doc
+@dirrm lib/tkgoodstuff