Updating tkcvs port, from 6.0a1 (alpha) to 6.0 (release).

Submitted by:	Andreas Kohout

5 files changed, 135 insertions, 23 deletions

diff --git a/devel/tkcvs/Makefile b/devel/tkcvs/Makefile
index 72e462d9130e..8e42a5ebf957 100644
--- a/devel/tkcvs/Makefile
+++ b/devel/tkcvs/Makefile
@@ -1,26 +1,37 @@
-# Ports makefile for:	tkcvs and tkdiff
-# Versions required:	tkvcvs-6.0a1 and tkdiff-1.0b9
-# Date created:		6 July 1996
-# Whom:			Sander Vesik <sander@haldjas.folklore.ee>
+# New ports collection makefile for:	tkcvs
+# Version required:     6.0
+# Date created:         02 Aug 1996
+# Whom:                 shanee@rabbit.augusta.de
 #
 # $Id$
 #
 
-DISTNAME=	tkcvs-6.0a1
+DISTNAME=	tkcvs-6.0
 CATEGORIES+=	devel
-MASTER_SITES=	ftp://ftp.neosoft.com/languages/tcl/alcatel/code/
+MASTER_SITES=	ftp://ftp.neosoft.com/pub/tcl/code/
 
-MAINTAINER=	sander@haldjas.folklore.ee
+MAINTAINER=	shanee@rabbit.augusta.de
 
-RUN_DEPENDS=	wish4\.1:${PORTSDIR}/x11/tk41
+LIB_DEPENDS=	tcl75\\.1\\.:${PORTSDIR}/lang/tcl75 \
+		tk41\\.1\\.:${PORTSDIR}/x11/tk41
 
-WRKSRC=		${WRKDIR}/tkCVS-r6.0a1
+NO_BUILD=	yes
+
+do-install:
+	(cd $(WRKSRC)/tkcvs; sh ./doinstall)
 
 post-extract:
-	@cp files/Makefile.tkcvs-6.0a1	${WRKSRC}/Makefile
-	@cp files/Makefile.tkcvs	${WRKSRC}/tkcvs/Makefile
-	@cp files/Makefile.tkdiff	${WRKSRC}/tkdiff/Makefile
-	@cp files/Makefile.bitmaps	${WRKSRC}/bitmaps/Makefile
-	@cp files/Makefile.inc		${WRKSRC}/Makefile.inc
+	cp ${WRKDIR}/tkcvs-6.0/tkcvs/tkcvs.n ${WRKDIR}/tkcvs-6.0/tkcvs/tkcvs.1
+	cp ${WRKDIR}/tkcvs-6.0/tkdiff/tkdiff.n ${WRKDIR}/tkcvs-6.0/tkdiff/tkdiff.1
+
+post-install:
+.if !defined(NOPORTDOCS)
+	cp ${WRKDIR}/tkcvs-6.0/README.tkcvs $(PREFIX)/lib/tkcvs/
+	cp ${WRKDIR}/tkcvs-6.0/tkdiff/README $(PREFIX)/lib/tkcvs/README.tkdiff
+.endif
+.if !defined(NOMANCOMPRESS)
+	gzip -9nf $(PREFIX)/man/man1/tkcvs.1
+	gzip -9nf $(PREFIX)/man/man1/tkdiff.1
+.endif
 
 .include <bsd.port.mk>
diff --git a/devel/tkcvs/distinfo b/devel/tkcvs/distinfo
index 17b080e2aad4..9bef07b0d7ec 100644
--- a/devel/tkcvs/distinfo
+++ b/devel/tkcvs/distinfo
@@ -1 +1 @@
-MD5 (tkcvs-6.0a1.tar.gz) = 3774e4b4000ebaa2e1a86d5df6401dd1
+MD5 (tkcvs-6.0.tar.gz) = e04f38cc344f9ea222fa48cb774ab7a5
diff --git a/devel/tkcvs/files/patch-aa b/devel/tkcvs/files/patch-aa
new file mode 100644
index 000000000000..34cd7ea0a988
--- /dev/null
+++ b/devel/tkcvs/files/patch-aa
@@ -0,0 +1,103 @@
+*** 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
diff --git a/devel/tkcvs/pkg-descr b/devel/tkcvs/pkg-descr
index cd0962684f4b..003dc4ca5c6a 100644
--- a/devel/tkcvs/pkg-descr
+++ b/devel/tkcvs/pkg-descr
@@ -1,6 +1,3 @@
-This is a port of tkcvs, the Tcl/Tk frontend to CVS and tkdiff, Tcl/Tk frontend to 
-diff. 
+This is a port of tkcvs and tkdiff, the Tcl/Tk frontends to CVS and diff 
 
-This is tkcvs version 6.0a1 and tkdiff version 1.0b9.
-
--Sander 
+This is tkcvs version 6.0 and tkdiff version 1.0.
diff --git a/devel/tkcvs/pkg-plist b/devel/tkcvs/pkg-plist
index ca95bbbfe1b6..89b0b87f943b 100644
--- a/devel/tkcvs/pkg-plist
+++ b/devel/tkcvs/pkg-plist
@@ -1,8 +1,8 @@
+@cwd /usr/local
 bin/tkcvs
 bin/tkdiff
 lib/tkcvs/README.tkcvs
 lib/tkcvs/README.tkdiff
-lib/tkcvs/tclIndex
 lib/tkcvs/bindings.tcl
 lib/tkcvs/checkout.tcl
 lib/tkcvs/commit.tcl
@@ -18,6 +18,7 @@ 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
@@ -40,5 +41,5 @@ lib/tkcvs/bitmaps/tkcvs32.xbm
 lib/tkcvs/bitmaps/tkcvs32_mask.xbm
 lib/tkcvs/bitmaps/tree16.xbm
 lib/tkcvs/bitmaps/update.xbm
-man/mann/tkcvs.n.gz
-man/mann/tkdiff.n.gz
+man/man1/tkcvs.1.gz
+man/man1/tkdiff.1.gz