3 files changed, 41 insertions, 15 deletions

diff --git a/devel/cvs-devel/Makefile b/devel/cvs-devel/Makefile
index 70744a695104..68e6a48efd65 100644
--- a/devel/cvs-devel/Makefile
+++ b/devel/cvs-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	cvs+ipv6
 PORTVERSION=	1.11.2
+PORTREVISION=	1
 CATEGORIES=	devel ipv6
 MASTER_SITES=	http://ftp.cvshome.org/cvs-1.11.2/
 #		${MASTER_SITE_GNU}
diff --git a/devel/cvs-devel/files/patch-lib-Makefile.in b/devel/cvs-devel/files/patch-lib-Makefile.in
index 25904c7d1834..11ad67a815fe 100644
--- a/devel/cvs-devel/files/patch-lib-Makefile.in
+++ b/devel/cvs-devel/files/patch-lib-Makefile.in
@@ -1,36 +1,42 @@
---- lib/Makefile.in.orig	Sun Aug 25 05:41:20 2002
-+++ lib/Makefile.in	Sun Aug 25 05:42:30 2002
-@@ -126,7 +126,6 @@
+--- lib/Makefile.in.orig	Mon Aug 26 20:50:59 2002
++++ lib/Makefile.in	Mon Aug 26 20:51:12 2002
+@@ -126,8 +126,6 @@
  	getline.c \
  	getopt.c \
  	getopt1.c \
 -	md5.c \
- 	regex.c \
+-	regex.c \
  	savecwd.c \
  	sighandle.c \
-@@ -162,7 +161,7 @@
+ 	stripslash.c \
+@@ -162,7 +160,7 @@
  libcvs_a_DEPENDENCIES = @LIBOBJS@
  am_libcvs_a_OBJECTS = argmatch.$(OBJEXT) ftruncate.$(OBJEXT) \
  	getdate.$(OBJEXT) getline.$(OBJEXT) getopt.$(OBJEXT) \
 -	getopt1.$(OBJEXT) md5.$(OBJEXT) regex.$(OBJEXT) \
-+	getopt1.$(OBJEXT) regex.$(OBJEXT) \
++	getopt1.$(OBJEXT) \
  	savecwd.$(OBJEXT) sighandle.$(OBJEXT) stripslash.$(OBJEXT) \
  	xgetwd.$(OBJEXT) yesno.$(OBJEXT)
  libcvs_a_OBJECTS = $(am_libcvs_a_OBJECTS)
-@@ -179,7 +178,7 @@
+@@ -179,8 +177,8 @@
  @AMDEP_TRUE@	$(DEPDIR)/getdate.Po $(DEPDIR)/getline.Po \
  @AMDEP_TRUE@	$(DEPDIR)/getnameinfo.Po $(DEPDIR)/getopt.Po \
  @AMDEP_TRUE@	$(DEPDIR)/getopt1.Po $(DEPDIR)/hostname.Po \
 -@AMDEP_TRUE@	$(DEPDIR)/md5.Po $(DEPDIR)/memmove.Po \
+-@AMDEP_TRUE@	$(DEPDIR)/mkdir.Po $(DEPDIR)/regex.Po \
 +@AMDEP_TRUE@	$(DEPDIR)/memmove.Po \
- @AMDEP_TRUE@	$(DEPDIR)/mkdir.Po $(DEPDIR)/regex.Po \
++@AMDEP_TRUE@	$(DEPDIR)/mkdir.Po \
  @AMDEP_TRUE@	$(DEPDIR)/rename.Po $(DEPDIR)/savecwd.Po \
  @AMDEP_TRUE@	$(DEPDIR)/sighandle.Po $(DEPDIR)/strerror.Po \
-@@ -239,7 +238,6 @@
+ @AMDEP_TRUE@	$(DEPDIR)/stripslash.Po $(DEPDIR)/strstr.Po \
+@@ -239,10 +237,8 @@
  @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/getopt.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/getopt1.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/hostname.Po@am__quote@
 -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/md5.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/memmove.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/mkdir.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/regex.Po@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/regex.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/rename.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/savecwd.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/sighandle.Po@am__quote@
diff --git a/devel/cvs-devel/files/patch-src-Makefile.in b/devel/cvs-devel/files/patch-src-Makefile.in
index 959b600f8af9..b339c5269b41 100644
--- a/devel/cvs-devel/files/patch-src-Makefile.in
+++ b/devel/cvs-devel/files/patch-src-Makefile.in
@@ -1,5 +1,14 @@
 --- src/Makefile.in.orig	Fri Apr 19 00:55:55 2002
-+++ src/Makefile.in	Sun Aug 25 05:44:36 2002
++++ src/Makefile.in	Mon Aug 26 20:51:29 2002
+@@ -98,7 +98,7 @@
+ # some namespace hackery going on that maybe shouldn't be.  Long term fix is to
+ # try and remove naming ocnflicts and fix Automake to allow particular includes
+ # to be attached only to particular object files.  Short term fix is either or.
+-INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/diff -I$(top_srcdir)/zlib $(includeopt)
++INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/diff $(includeopt)
+ 
+ bin_PROGRAMS = cvs
+ bin_SCRIPTS = cvsbug
 @@ -139,6 +139,7 @@
  	no_diff.c \
  	parseinfo.c \
@@ -8,7 +17,17 @@
  	rcs.c \
  	rcscmds.c \
  	recurse.c \
-@@ -216,6 +217,7 @@
+@@ -179,8 +180,7 @@
+ 
+ cvs_LDADD = \
+ 	../diff/libdiff.a \
+-	../lib/libcvs.a \
+-	../zlib/libz.a
++	../lib/libcvs.a
+ 
+ 
+ # extra clean targets
+@@ -216,6 +216,7 @@
  	main.$(OBJEXT) mkmodules.$(OBJEXT) modules.$(OBJEXT) \
  	myndbm.$(OBJEXT) no_diff.$(OBJEXT) parseinfo.$(OBJEXT) \
  	patch.$(OBJEXT) rcs.$(OBJEXT) rcscmds.$(OBJEXT) \
@@ -16,16 +35,16 @@
  	recurse.$(OBJEXT) release.$(OBJEXT) remove.$(OBJEXT) \
  	repos.$(OBJEXT) root.$(OBJEXT) run.$(OBJEXT) scramble.$(OBJEXT) \
  	server.$(OBJEXT) status.$(OBJEXT) subr.$(OBJEXT) tag.$(OBJEXT) \
-@@ -231,7 +233,7 @@
+@@ -231,7 +232,7 @@
  DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir) -I.
  CPPFLAGS = @CPPFLAGS@
  LDFLAGS = @LDFLAGS@
 -LIBS = @LIBS@
-+LIBS = @LIBS@ -lmd
++LIBS = @LIBS@ -lmd -lgnuregex -lz
  depcomp = $(SHELL) $(top_srcdir)/depcomp
  @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/add.Po $(DEPDIR)/admin.Po \
  @AMDEP_TRUE@	$(DEPDIR)/annotate.Po $(DEPDIR)/buffer.Po \
-@@ -250,7 +252,8 @@
+@@ -250,7 +251,8 @@
  @AMDEP_TRUE@	$(DEPDIR)/main.Po $(DEPDIR)/mkmodules.Po \
  @AMDEP_TRUE@	$(DEPDIR)/modules.Po $(DEPDIR)/myndbm.Po \
  @AMDEP_TRUE@	$(DEPDIR)/no_diff.Po $(DEPDIR)/parseinfo.Po \