6 files changed, 117 insertions, 97 deletions

diff --git a/devel/gcvs/Makefile b/devel/gcvs/Makefile
index 5c5534e2cc40..0e31b49e10c9 100644
--- a/devel/gcvs/Makefile
+++ b/devel/gcvs/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gcvs
 PORTVERSION=	1.0
-PORTREVISION=	6
+PORTREVISION=	7
 PORTEPOCH=	1
 CATEGORIES=	devel tk84
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -19,8 +19,6 @@ COMMENT=	High-end interface client for CVS
 BUILD_DEPENDS+=	wish8.4:${PORTSDIR}/x11-toolkits/tk84
 RUN_DEPENDS+=	wish8.4:${PORTSDIR}/x11-toolkits/tk84
 
-BROKEN=	Does not build
-
 USE_GETOPT_LONG=yes
 USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
diff --git a/devel/gcvs/files/patch-cvsunix-configure b/devel/gcvs/files/patch-cvsunix-configure
deleted file mode 100644
index 923ef5a215ce..000000000000
--- a/devel/gcvs/files/patch-cvsunix-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- cvsunix/configure.orig	Wed Mar  7 04:02:21 2001
-+++ cvsunix/configure	Mon Jan 21 16:24:32 2002
-@@ -3423,7 +3423,7 @@
-   includeopt="${includeopt} -I$GSSAPI/include"
-   # FIXME: This is ugly, but these things don't seem to be standardized.
-   if test "$ac_cv_header_gssapi_h" = "yes"; then
--    LIBS="$LIBS -L$GSSAPI/lib -lgssapi -lkrb5 -lasn1 -ldes -lroken"
-+    LIBS="$LIBS -L$GSSAPI/lib -lgssapi -lkrb5 -lasn1 -lcrypto -lroken -lcrypt -lcom_err"
-   else
-     LIBS="$LIBS -L$GSSAPI/lib -lgssapi_krb5 -lkrb5 -lcrypto -lcom_err"
-   fi
diff --git a/devel/gcvs/files/patch-cvsunix-configure.in b/devel/gcvs/files/patch-cvsunix-configure.in
new file mode 100644
index 000000000000..af3824b87088
--- /dev/null
+++ b/devel/gcvs/files/patch-cvsunix-configure.in
@@ -0,0 +1,20 @@
+--- cvsunix/configure.in.orig	Wed Nov 22 16:09:07 2006
++++ cvsunix/configure.in	Wed Nov 22 16:10:02 2006
+@@ -178,7 +178,7 @@
+     # the user's setting for LDFLAGS
+     hold_ldflags=$LDFLAGS
+     test -n "${krb_libdir}" && LDFLAGS="$LDFLAGS -L${krb_libdir}"
+-    AC_CHECK_LIB(des,printf,[LIBS="${LIBS} -ldes"])
++    AC_CHECK_LIB(des,printf,[LIBS="${LIBS} -lcrypt"])
+     LDFLAGS=$hold_ldflags
+     if test -n "$krb_incdir"; then
+       includeopt="${includeopt} -I$krb_incdir"
+@@ -212,7 +212,7 @@
+   includeopt="${includeopt} -I$GSSAPI/include"
+   # FIXME: This is ugly, but these things don't seem to be standardized.
+   if test "$ac_cv_header_gssapi_h" = "yes"; then
+-    LIBS="$LIBS -L$GSSAPI/lib -lgssapi -lkrb5 -lasn1 -ldes -lroken"
++    LIBS="$LIBS -L$GSSAPI/lib -lgssapi -lkrb5 -lasn1 -lcrypto -lroken -lcrypt -lcom_err"
+   else
+     LIBS="$LIBS -L$GSSAPI/lib -lgssapi_krb5 -lkrb5 -lcrypto -lcom_err"
+   fi
diff --git a/devel/gcvs/files/patch-cvsunix-lib-hostname.c b/devel/gcvs/files/patch-cvsunix-lib-hostname.c
new file mode 100644
index 000000000000..da14a2e23ad6
--- /dev/null
+++ b/devel/gcvs/files/patch-cvsunix-lib-hostname.c
@@ -0,0 +1,15 @@
+--- cvsunix/lib/hostname.c.orig	Wed Nov 22 15:14:13 2006
++++ cvsunix/lib/hostname.c	Wed Nov 22 15:15:36 2006
+@@ -28,6 +28,7 @@
+ 
+ /* Put this host's name into NAME, using at most NAMELEN characters */
+ 
++#if 0
+ int
+ gethostname(name, namelen)
+      char *name;
+@@ -43,3 +44,4 @@
+ 
+   return (0);
+ }
++#endif
diff --git a/devel/gcvs/files/patch-make_configure b/devel/gcvs/files/patch-make_configure
index 4d69d59cb622..2a98a042a807 100644
--- a/devel/gcvs/files/patch-make_configure
+++ b/devel/gcvs/files/patch-make_configure
@@ -1,21 +1,19 @@
 --- make_configure.orig	Thu Nov  7 19:42:00 2002
-+++ make_configure	Fri Dec 20 19:23:07 2002
-@@ -1,14 +1,14 @@
++++ make_configure	Wed Nov 22 15:07:42 2006
+@@ -1,14 +1,4 @@
 -aclocal
 -autoheader
-+aclocal14
-+autoheader213
- 
- list=`find . -name Makefile.am -exec dirname {} \;`
- 
- for subdir in $list
- do
- 	echo making $subdir/Makefile.in
+-
+-list=`find . -name Makefile.am -exec dirname {} \;`
+-
+-for subdir in $list
+-do
+-	echo making $subdir/Makefile.in
 -	automake --add-missing --gnu $subdir/Makefile
-+	automake14 --add-missing --gnu $subdir/Makefile
- done
- 
+-done
+-
 -autoconf 
-+autoconf213
++cd cvsunix && autoreconf259
++cd ..
  
  ./configure $*
diff --git a/devel/gcvs/pkg-plist b/devel/gcvs/pkg-plist
index 716702cff586..c28791097640 100644
--- a/devel/gcvs/pkg-plist
+++ b/devel/gcvs/pkg-plist
@@ -21,72 +21,72 @@ lib/cvs/contrib/rcslock
 lib/cvs/contrib/sccs2rcs
 @dirrm lib/cvs/contrib
 @dirrm lib/cvs
-share/gcvs/ChangeRoot.tcl
-share/gcvs/ChangeRootTK.tcl
-share/gcvs/Cleanup.tcl
-share/gcvs/ColorTest.tcl
-share/gcvs/CvsAddAll.tcl
-share/gcvs/DocMacros.txt
-share/gcvs/EditSafely.tcl
-share/gcvs/FastModSearch.tcl
-share/gcvs/FolderTest.tcl
-share/gcvs/ForceUpdate.tcl
-share/gcvs/ListDeleted.tcl
-share/gcvs/ListLockedFiles.tcl
-share/gcvs/ListModules.tcl
-share/gcvs/ListNonCVS.tcl
-share/gcvs/ListStickyTags.tcl
-share/gcvs/PrepPatch.tcl
-share/gcvs/QueryState.tcl
-share/gcvs/RevertChanges.tcl
-share/gcvs/SelectionTest.tcl
-share/gcvs/SetCurrentVersion.tcl
-share/gcvs/TclVersion.tcl
-share/gcvs/cvs2cl.tcl
-share/gcvs/cvsignore_add.tcl
-share/gcvs/cvsignore_remove.tcl
-share/gcvs/startup.tcl
-share/gcvs/pixmaps/about.xpm
-share/gcvs/pixmaps/add.xpm
-share/gcvs/pixmaps/addb.xpm
-share/gcvs/pixmaps/addfile.xpm
-share/gcvs/pixmaps/binfile.xpm
-share/gcvs/pixmaps/branch.xpm
-share/gcvs/pixmaps/commit.xpm
-share/gcvs/pixmaps/conflict.xpm
-share/gcvs/pixmaps/cvsfile.xpm
-share/gcvs/pixmaps/delfile.xpm
-share/gcvs/pixmaps/diff.xpm
-share/gcvs/pixmaps/edit.xpm
-share/gcvs/pixmaps/error.xpm
-share/gcvs/pixmaps/explore.xpm
-share/gcvs/pixmaps/folder.xpm
-share/gcvs/pixmaps/foldign.xpm
-share/gcvs/pixmaps/foldmiss.xpm
-share/gcvs/pixmaps/foldunk.xpm
-share/gcvs/pixmaps/graph.xpm
-share/gcvs/pixmaps/ignfile.xpm
-share/gcvs/pixmaps/ignore.xpm
-share/gcvs/pixmaps/lock.xpm
-share/gcvs/pixmaps/log.xpm
-share/gcvs/pixmaps/missfile.xpm
-share/gcvs/pixmaps/modbin.xpm
-share/gcvs/pixmaps/modfile.xpm
-share/gcvs/pixmaps/release.xpm
-share/gcvs/pixmaps/reload.xpm
-share/gcvs/pixmaps/remove.xpm
-share/gcvs/pixmaps/status.xpm
-share/gcvs/pixmaps/stop.xpm
-share/gcvs/pixmaps/tag.xpm
-share/gcvs/pixmaps/trash.xpm
-share/gcvs/pixmaps/unedit.xpm
-share/gcvs/pixmaps/unkfile.xpm
-share/gcvs/pixmaps/unlock.xpm
-share/gcvs/pixmaps/untag.xpm
-share/gcvs/pixmaps/unwatch.xpm
-share/gcvs/pixmaps/update.xpm
-share/gcvs/pixmaps/upfolder.xpm
-share/gcvs/pixmaps/warning.xpm
-share/gcvs/pixmaps/watch.xpm
-@dirrm share/gcvs/pixmaps
-@dirrm share/gcvs
+%%DATADIR%%/ChangeRoot.tcl
+%%DATADIR%%/ChangeRootTK.tcl
+%%DATADIR%%/Cleanup.tcl
+%%DATADIR%%/ColorTest.tcl
+%%DATADIR%%/CvsAddAll.tcl
+%%DATADIR%%/DocMacros.txt
+%%DATADIR%%/EditSafely.tcl
+%%DATADIR%%/FastModSearch.tcl
+%%DATADIR%%/FolderTest.tcl
+%%DATADIR%%/ForceUpdate.tcl
+%%DATADIR%%/ListDeleted.tcl
+%%DATADIR%%/ListLockedFiles.tcl
+%%DATADIR%%/ListModules.tcl
+%%DATADIR%%/ListNonCVS.tcl
+%%DATADIR%%/ListStickyTags.tcl
+%%DATADIR%%/PrepPatch.tcl
+%%DATADIR%%/QueryState.tcl
+%%DATADIR%%/RevertChanges.tcl
+%%DATADIR%%/SelectionTest.tcl
+%%DATADIR%%/SetCurrentVersion.tcl
+%%DATADIR%%/TclVersion.tcl
+%%DATADIR%%/cvs2cl.tcl
+%%DATADIR%%/cvsignore_add.tcl
+%%DATADIR%%/cvsignore_remove.tcl
+%%DATADIR%%/startup.tcl
+%%DATADIR%%/pixmaps/about.xpm
+%%DATADIR%%/pixmaps/add.xpm
+%%DATADIR%%/pixmaps/addb.xpm
+%%DATADIR%%/pixmaps/addfile.xpm
+%%DATADIR%%/pixmaps/binfile.xpm
+%%DATADIR%%/pixmaps/branch.xpm
+%%DATADIR%%/pixmaps/commit.xpm
+%%DATADIR%%/pixmaps/conflict.xpm
+%%DATADIR%%/pixmaps/cvsfile.xpm
+%%DATADIR%%/pixmaps/delfile.xpm
+%%DATADIR%%/pixmaps/diff.xpm
+%%DATADIR%%/pixmaps/edit.xpm
+%%DATADIR%%/pixmaps/error.xpm
+%%DATADIR%%/pixmaps/explore.xpm
+%%DATADIR%%/pixmaps/folder.xpm
+%%DATADIR%%/pixmaps/foldign.xpm
+%%DATADIR%%/pixmaps/foldmiss.xpm
+%%DATADIR%%/pixmaps/foldunk.xpm
+%%DATADIR%%/pixmaps/graph.xpm
+%%DATADIR%%/pixmaps/ignfile.xpm
+%%DATADIR%%/pixmaps/ignore.xpm
+%%DATADIR%%/pixmaps/lock.xpm
+%%DATADIR%%/pixmaps/log.xpm
+%%DATADIR%%/pixmaps/missfile.xpm
+%%DATADIR%%/pixmaps/modbin.xpm
+%%DATADIR%%/pixmaps/modfile.xpm
+%%DATADIR%%/pixmaps/release.xpm
+%%DATADIR%%/pixmaps/reload.xpm
+%%DATADIR%%/pixmaps/remove.xpm
+%%DATADIR%%/pixmaps/status.xpm
+%%DATADIR%%/pixmaps/stop.xpm
+%%DATADIR%%/pixmaps/tag.xpm
+%%DATADIR%%/pixmaps/trash.xpm
+%%DATADIR%%/pixmaps/unedit.xpm
+%%DATADIR%%/pixmaps/unkfile.xpm
+%%DATADIR%%/pixmaps/unlock.xpm
+%%DATADIR%%/pixmaps/untag.xpm
+%%DATADIR%%/pixmaps/unwatch.xpm
+%%DATADIR%%/pixmaps/update.xpm
+%%DATADIR%%/pixmaps/upfolder.xpm
+%%DATADIR%%/pixmaps/warning.xpm
+%%DATADIR%%/pixmaps/watch.xpm
+@dirrm %%DATADIR%%/pixmaps
+@dirrm %%DATADIR%%