Update to use tk80. More cleanup.

PR:		4896
Submitted by:	Brett Taylor <brett@peloton.physics.montana.edu>

3 files changed, 121 insertions, 155 deletions

diff --git a/devel/tkcvs/Makefile b/devel/tkcvs/Makefile
index e9b3429507b7..0482b5bfb4c5 100644
--- a/devel/tkcvs/Makefile
+++ b/devel/tkcvs/Makefile
@@ -3,32 +3,33 @@
 # Date created:         02 Aug 1996
 # Whom:                 shanee@augusta.de
 #
-# $Id: Makefile,v 1.9 1997/05/29 02:26:46 fenner Exp $
+# $Id: Makefile,v 1.10 1997/10/26 23:57:02 fenner Exp $
 #
 
 DISTNAME=	tkcvs-6.0
-CATEGORIES=	devel tk41
-MASTER_SITES=	ftp://ftp.neosoft.com/pub/tcl/sorted/apps/
+CATEGORIES=	devel tk80
+MASTER_SITES=	http://www.neosoft.com/tcl/ftparchive/sorted/apps/tkcvs-6.0/ \
+		http://ftp.sunet.se/pub/lang/tcl/sorted/apps/tkcvs-6.0/
 
 MAINTAINER=	shanee@augusta.de
 
-LIB_DEPENDS=	tk41\\.1\\.:${PORTSDIR}/x11/tk41
+LIB_DEPENDS=	tk80\\.1\\.:${PORTSDIR}/x11/tk80
 
 NO_BUILD=	yes
-
 MAN1=		tkcvs.1 tkdiff.1
 
-do-install:
-	(cd $(WRKSRC)/tkcvs; sh ./doinstall)
-
 post-extract:
-	cp ${WRKSRC}/tkcvs/tkcvs.n ${WRKSRC}/tkcvs/tkcvs.1
-	cp ${WRKSRC}/tkdiff/tkdiff.n ${WRKSRC}/tkdiff/tkdiff.1
+	${CP} ${WRKSRC}/tkcvs/tkcvs.n ${WRKSRC}/tkcvs/tkcvs.1
+	${CP} ${WRKSRC}/tkdiff/tkdiff.n ${WRKSRC}/tkdiff/tkdiff.1
+
+do-install:
+	(cd $(WRKSRC)/tkcvs; ${SETENV} ${MAKE_ENV} sh ./doinstall)
 
 post-install:
 .if !defined(NOPORTDOCS)
-	install -c ${WRKSRC}/README.tkcvs $(PREFIX)/lib/tkcvs/
-	install -c ${WRKSRC}/tkdiff/README $(PREFIX)/lib/tkcvs/README.tkdiff
+	${MKDIR} ${PREFIX}/share/doc/tkcvs
+	${INSTALL_DATA} ${WRKSRC}/README.tkcvs $(PREFIX)/share/doc/tkcvs/
+	${INSTALL_DATA} ${WRKSRC}/tkdiff/README $(PREFIX)/share/doc/tkcvs/README.tkdiff
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/tkcvs/files/patch-aa b/devel/tkcvs/files/patch-aa
index 34cd7ea0a988..2fbced5d12af 100644
--- a/devel/tkcvs/files/patch-aa
+++ b/devel/tkcvs/files/patch-aa
@@ -1,103 +1,65 @@
-*** tkcvs/doinstall.orig	Tue Jan  9 22:17:52 1996
---- tkcvs/doinstall	Fri Aug  2 13:16:24 1996
-***************
-*** 7,35 ****
-  
-  INSTALLDIR=/usr/local/lib
-  BINDIR=/usr/local/bin
-! MANDIR=/usr/local/man/mann
-  
-  INSTALL_PROG=./install-sh
-  
-  # This must be an X based editor -- do NOT use vi except via an xterm
-  # or shelltool.
-  
-! EDITOR=nedit
-  
-  # Find a Tk interpreter.
-   
-! WISH=`which wish4.0`
-  if [ ! -f $WISH ]; then
-!   WISH=`which wish4.1`
-  fi
-  if [ ! -f $WISH ]; then
-!   echo "I cant find a Tk interpreter on your system"
-    exit 1
-  fi
-  
-  # Find where the global bitmaps are.
-  
-! for GDIR in /usr/include/X11/bitmaps /usr/openwin/include/X11/bitmaps /usr/X11/include/bitmaps /usr/include/bitmaps /usr/local/include/bitmaps
-  do
-    if [ -d "$GDIR" ]; then
-      break
---- 7,35 ----
-  
-  INSTALLDIR=/usr/local/lib
-  BINDIR=/usr/local/bin
-! MANDIR=/usr/local/man/man1
-  
-  INSTALL_PROG=./install-sh
-  
-  # This must be an X based editor -- do NOT use vi except via an xterm
-  # or shelltool.
-  
-! EDITOR="xedit"
-  
-  # Find a Tk interpreter.
-   
-! WISH=`which wish4.1`
-  if [ ! -f $WISH ]; then
-!   WISH=`which wish4.0`
-  fi
-  if [ ! -f $WISH ]; then
-!   echo "I cant find a usefull Tk interpreter on your system"
-    exit 1
-  fi
-  
-  # Find where the global bitmaps are.
-  
-! for GDIR in /usr/X11R6/include/X11/bitmaps /usr/openwin/include/X11/bitmaps /usr/X11/include/bitmaps /usr/include/bitmaps /usr/local/include/bitmaps
-  do
-    if [ -d "$GDIR" ]; then
-      break
-***************
-*** 62,71 ****
-  
-  # Some directories we have to create.
-  
-- LDIR=${INSTALLDIR}/bitmaps
-  TCDIR=${INSTALLDIR}/tkcvs
-! mkdir -p $LDIR $TCDIR
-! for dir in $LDIR $TCDIR
-  do
-    if [ ! -d $dir ]; then
-      echo "I cant create the directory $dir"
---- 62,71 ----
-  
-  # Some directories we have to create.
-  
-  TCDIR=${INSTALLDIR}/tkcvs
-! LDIR=${TCDIR}/bitmaps
-! mkdir -p $LDIR $TCDIR 
-! for dir in $TCDIR $LDIR
-  do
-    if [ ! -d $dir ]; then
-      echo "I cant create the directory $dir"
-***************
-*** 99,105 ****
-    fi
-  done
-  
-! for f in *.n ../tkdiff/*.n
-  do
-          $INSTALL_PROG -m 444 $f $MANDIR
-  done
---- 99,105 ----
-    fi
-  done
-  
-! for f in *.1 ../tkdiff/*.1
-  do
-          $INSTALL_PROG -m 444 $f $MANDIR
-  done
+--- tkcvs/doinstall.orig	Tue Jan  9 22:17:52 1996
++++ tkcvs/doinstall	Fri Oct 31 09:21:23 1997
+@@ -5,31 +5,31 @@
+ 
+ # Some rational and reasonable defaults.
+ 
+-INSTALLDIR=/usr/local/lib
+-BINDIR=/usr/local/bin
+-MANDIR=/usr/local/man/mann
++INSTALLDIR=${PREFIX}/share
++BINDIR=${PREFIX}/bin
++MANDIR=${PREFIX}/man/man1
+ 
+ INSTALL_PROG=./install-sh
+ 
+ # This must be an X based editor -- do NOT use vi except via an xterm
+ # or shelltool.
+ 
+-EDITOR=nedit
++EDITOR="xedit"
+ 
+ # Find a Tk interpreter.
+  
+-WISH=`which wish4.0`
++WISH=`which wish8.0`
+ if [ ! -f $WISH ]; then
+-  WISH=`which wish4.1`
++  WISH=`which wish4.0`
+ fi
+ if [ ! -f $WISH ]; then
+-  echo "I cant find a Tk interpreter on your system"
++  echo "I cant find a usefull Tk interpreter on your system"
+   exit 1
+ fi
+ 
+ # Find where the global bitmaps are.
+ 
+-for GDIR in /usr/include/X11/bitmaps /usr/openwin/include/X11/bitmaps /usr/X11/include/bitmaps /usr/include/bitmaps /usr/local/include/bitmaps
++for GDIR in /usr/X11R6/include/X11/bitmaps /usr/openwin/include/X11/bitmaps /usr/X11/include/bitmaps /usr/include/bitmaps ${PREFIX}/include/bitmaps
+ do
+   if [ -d "$GDIR" ]; then
+     break
+@@ -62,10 +62,10 @@
+ 
+ # Some directories we have to create.
+ 
+-LDIR=${INSTALLDIR}/bitmaps
+ TCDIR=${INSTALLDIR}/tkcvs
+-mkdir -p $LDIR $TCDIR
+-for dir in $LDIR $TCDIR
++LDIR=${TCDIR}/bitmaps
++mkdir -p $LDIR $TCDIR 
++for dir in $TCDIR $LDIR
+ do
+   if [ ! -d $dir ]; then
+     echo "I cant create the directory $dir"
+@@ -99,7 +99,7 @@
+   fi
+ done
+ 
+-for f in *.n ../tkdiff/*.n
++for f in *.1 ../tkdiff/*.1
+ do
+         $INSTALL_PROG -m 444 $f $MANDIR
+ done
diff --git a/devel/tkcvs/pkg-plist b/devel/tkcvs/pkg-plist
index 18d211aeaeb2..d07958ea75cc 100644
--- a/devel/tkcvs/pkg-plist
+++ b/devel/tkcvs/pkg-plist
@@ -1,44 +1,47 @@
 bin/tkcvs
 bin/tkdiff
-lib/tkcvs/README.tkcvs
-lib/tkcvs/README.tkdiff
-lib/tkcvs/bindings.tcl
-lib/tkcvs/checkout.tcl
-lib/tkcvs/commit.tcl
-lib/tkcvs/cvs.tcl
-lib/tkcvs/errors.tcl
-lib/tkcvs/filebrowse.tcl
-lib/tkcvs/help.tcl
-lib/tkcvs/import.tcl
-lib/tkcvs/logcanvas.tcl
-lib/tkcvs/merge.tcl
-lib/tkcvs/modules.tcl
-lib/tkcvs/reports.tcl
-lib/tkcvs/search.tcl
-lib/tkcvs/static.tcl
-lib/tkcvs/tag.tcl
-lib/tkcvs/tclIndex
-lib/tkcvs/tkcvs_def.tcl
-lib/tkcvs/tooltips.tcl
-lib/tkcvs/update.tcl
-lib/tkcvs/venget.tcl
-lib/tkcvs/workdir.tcl
-lib/tkcvs/bitmaps/add.xbm
-lib/tkcvs/bitmaps/check.xbm
-lib/tkcvs/bitmaps/checkin.xbm
-lib/tkcvs/bitmaps/clean.xbm
-lib/tkcvs/bitmaps/clear.xbm
-lib/tkcvs/bitmaps/delete.xbm
-lib/tkcvs/bitmaps/diff.xbm
-lib/tkcvs/bitmaps/import.xbm
-lib/tkcvs/bitmaps/logfile.xbm
-lib/tkcvs/bitmaps/notebook.xbm
-lib/tkcvs/bitmaps/refresh.xbm
-lib/tkcvs/bitmaps/remove.xbm
-lib/tkcvs/bitmaps/tkcvs16.xbm
-lib/tkcvs/bitmaps/tkcvs32.xbm
-lib/tkcvs/bitmaps/tkcvs32_mask.xbm
-lib/tkcvs/bitmaps/tree16.xbm
-lib/tkcvs/bitmaps/update.xbm
+share/doc/tkcvs/README.tkcvs
+share/doc/tkcvs/README.tkdiff
+share/tkcvs/bindings.tcl
+share/tkcvs/checkout.tcl
+share/tkcvs/commit.tcl
+share/tkcvs/cvs.tcl
+share/tkcvs/errors.tcl
+share/tkcvs/filebrowse.tcl
+share/tkcvs/help.tcl
+share/tkcvs/import.tcl
+share/tkcvs/logcanvas.tcl
+share/tkcvs/merge.tcl
+share/tkcvs/modules.tcl
+share/tkcvs/reports.tcl
+share/tkcvs/search.tcl
+share/tkcvs/static.tcl
+share/tkcvs/tag.tcl
+share/tkcvs/tclIndex
+share/tkcvs/tkcvs_def.tcl
+share/tkcvs/tooltips.tcl
+share/tkcvs/update.tcl
+share/tkcvs/venget.tcl
+share/tkcvs/workdir.tcl
+share/tkcvs/bitmaps/add.xbm
+share/tkcvs/bitmaps/check.xbm
+share/tkcvs/bitmaps/checkin.xbm
+share/tkcvs/bitmaps/clean.xbm
+share/tkcvs/bitmaps/clear.xbm
+share/tkcvs/bitmaps/delete.xbm
+share/tkcvs/bitmaps/diff.xbm
+share/tkcvs/bitmaps/import.xbm
+share/tkcvs/bitmaps/logfile.xbm
+share/tkcvs/bitmaps/notebook.xbm
+share/tkcvs/bitmaps/refresh.xbm
+share/tkcvs/bitmaps/remove.xbm
+share/tkcvs/bitmaps/tkcvs16.xbm
+share/tkcvs/bitmaps/tkcvs32.xbm
+share/tkcvs/bitmaps/tkcvs32_mask.xbm
+share/tkcvs/bitmaps/tree16.xbm
+share/tkcvs/bitmaps/update.xbm
 man/man1/tkcvs.1.gz
 man/man1/tkdiff.1.gz
+@dirrm share/tkcvs/bitmaps
+@dirrm share/tkcvs
+@dirrm share/doc/tkcvs