- Update to 1 May version of opencvs

- Redo patches to please portlint

10 files changed, 36 insertions, 37 deletions

diff --git a/devel/opencvs/Makefile b/devel/opencvs/Makefile
index 2fe7d9f74f34..8c356024e80b 100644
--- a/devel/opencvs/Makefile
+++ b/devel/opencvs/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	opencvs
-PORTVERSION=	20140108
+PORTVERSION=	20150501
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.stack.nl/pub/users/%SUBDIR%/opencvs/ \
 		${MASTER_SITE_LOCAL}
diff --git a/devel/opencvs/distinfo b/devel/opencvs/distinfo
index 745394277746..b4b5b78ed904 100644
--- a/devel/opencvs/distinfo
+++ b/devel/opencvs/distinfo
@@ -1,2 +1,2 @@
-SHA256 (opencvs-20140108.tar.gz) = c4a074b2e87f6d1ee67f08cc799ce3bc9ab8265efb600332aaf69de9e8e78db5
-SIZE (opencvs-20140108.tar.gz) = 162820
+SHA256 (opencvs-20150501.tar.gz) = 9d615b2d37ff58e8b052cb95403e89aed7593c08568df193d318addadcf51992
+SIZE (opencvs-20150501.tar.gz) = 162638
diff --git a/devel/opencvs/files/patch-Makefile b/devel/opencvs/files/patch-Makefile
index 67b91828df5e..b67da4cc7114 100644
--- a/devel/opencvs/files/patch-Makefile
+++ b/devel/opencvs/files/patch-Makefile
@@ -1,5 +1,5 @@
---- Makefile.orig	2011-04-20 20:46:33.000000000 +0200
-+++ Makefile	2011-04-20 21:22:34.000000000 +0200
+--- Makefile.orig	2011-04-20 18:46:33 UTC
++++ Makefile
 @@ -1,7 +1,7 @@
  #	$OpenBSD: Makefile,v 1.48 2010/10/15 08:44:12 tobias Exp $
  
@@ -9,7 +9,7 @@
  CPPFLAGS+=-I${.CURDIR}
  
  SRCS=	cvs.c add.c admin.c annotate.c atomicio.c commit.c config.c \
-@@ -12,14 +12,14 @@
+@@ -12,14 +12,14 @@ SRCS=	cvs.c add.c admin.c annotate.c ato
  	root.c server.c status.c tag.c trigger.c worklist.c util.c update.c \
  	version.c watch.c xmalloc.c
  
@@ -20,7 +20,7 @@
 -CFLAGS+=-Wsign-compare
 -DEBUG=	-g -ggdb
 -YFLAGS=
-+CFLAGS+=-DSIZE_MAX=ULONG_MAX
++CFLAGS+=-DSIZE_MAX=ULONG_MAX -DHOST_NAME_MAX=_POSIX_HOST_NAME_MAX
 +DPADD+= ${LIBZ}
 +LDADD+= -lz -lmd
  
diff --git a/devel/opencvs/files/patch-cvs.h b/devel/opencvs/files/patch-cvs.h
index ed6cd70bade5..1ee069a064cf 100644
--- a/devel/opencvs/files/patch-cvs.h
+++ b/devel/opencvs/files/patch-cvs.h
@@ -1,5 +1,5 @@
---- cvs.h.orig	2009-03-25 14:19:20.000000000 -0700
-+++ cvs.h	2011-04-18 23:55:35.000000000 -0700
+--- cvs.h.orig	2015-05-04 09:15:45 UTC
++++ cvs.h
 @@ -29,6 +29,10 @@
  
  #include <signal.h>
diff --git a/devel/opencvs/files/patch-log.h b/devel/opencvs/files/patch-log.h
index 42b17cc21770..b204131f238b 100644
--- a/devel/opencvs/files/patch-log.h
+++ b/devel/opencvs/files/patch-log.h
@@ -1,5 +1,5 @@
---- log.h.orig	2008-06-09 18:00:34.000000000 -0700
-+++ log.h	2011-04-18 23:44:44.000000000 -0700
+--- log.h.orig	2008-06-10 01:00:34 UTC
++++ log.h
 @@ -29,6 +29,9 @@
  
  #include <stdarg.h>
diff --git a/devel/opencvs/files/patch-rcsparse.c b/devel/opencvs/files/patch-rcsparse.c
new file mode 100644
index 000000000000..e6d39a2263e4
--- /dev/null
+++ b/devel/opencvs/files/patch-rcsparse.c
@@ -0,0 +1,11 @@
+--- rcsparse.c.orig	2015-05-04 09:15:45 UTC
++++ rcsparse.c
+@@ -1228,8 +1228,6 @@ valid_login(char *login_name)
+ 			return 0;
+ 		}
+ 	}
+-	if ((char *)cp - login_name > _PW_NAME_LEN)
+-		return 0;
+ 	return 1;
+ }
+ 
diff --git a/devel/opencvs/files/patch-rcsparse.h b/devel/opencvs/files/patch-rcsparse.h
deleted file mode 100644
index 25c105127ffd..000000000000
--- a/devel/opencvs/files/patch-rcsparse.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- rcsparse.c.orig	2011-04-20 21:08:22.000000000 +0200
-+++ rcsparse.c	2011-04-20 21:08:46.000000000 +0200
-@@ -1221,8 +1221,6 @@
- 			return 0;
- 		}
- 	}
--	if ((char *)cp - login_name > _PW_NAME_LEN)
--		return 0;
- 	return 1;
- }
- 
diff --git a/devel/opencvs/files/patch-util.c b/devel/opencvs/files/patch-util.c
index c891fa7b1f8c..2cddb74bd906 100644
--- a/devel/opencvs/files/patch-util.c
+++ b/devel/opencvs/files/patch-util.c
@@ -1,5 +1,5 @@
---- util.c.orig	2009-03-24 07:59:19.000000000 +0100
-+++ util.c	2010-06-08 20:18:08.000000000 +0200
+--- util.c.orig	2015-05-04 09:15:45 UTC
++++ util.c
 @@ -30,7 +30,7 @@
  #include <sys/types.h>
  #include <sys/wait.h>
@@ -8,4 +8,4 @@
 +#include "atomicio.h"
  #include <errno.h>
  #include <fcntl.h>
- #include <md5.h>
+ #include <stdlib.h>
diff --git a/devel/opencvs/files/patch-xmalloc.c b/devel/opencvs/files/patch-xmalloc.c
index 8d1f9660820d..b8d2e940bc6a 100644
--- a/devel/opencvs/files/patch-xmalloc.c
+++ b/devel/opencvs/files/patch-xmalloc.c
@@ -1,11 +1,10 @@
---- xmalloc.c.orig	2009-06-07 10:39:13.000000000 +0200
-+++ xmalloc.c	2010-06-08 20:18:08.000000000 +0200
-@@ -13,6 +13,8 @@
-  * called by a name other than "ssh" or "Secure Shell".
-  */
- 
-+#include <sys/types.h>
-+
- #include <limits.h>
+--- xmalloc.c.orig	2015-05-04 09:15:45 UTC
++++ xmalloc.c
+@@ -17,6 +17,7 @@
  #include <stdio.h>
  #include <stdlib.h>
+ #include <string.h>
++#include <sys/types.h>
+ 
+ #include "log.h"
+ #include "xmalloc.h"
diff --git a/devel/opencvs/files/patch-xmalloc.h b/devel/opencvs/files/patch-xmalloc.h
index cf941d50197b..1167cab5ea0e 100644
--- a/devel/opencvs/files/patch-xmalloc.h
+++ b/devel/opencvs/files/patch-xmalloc.h
@@ -1,6 +1,6 @@
---- xmalloc.h.orig	2007-01-29 17:22:29.000000000 +0100
-+++ xmalloc.h	2010-06-08 20:18:08.000000000 +0200
-@@ -29,7 +29,6 @@
+--- xmalloc.h.orig	2015-05-04 09:15:45 UTC
++++ xmalloc.h
+@@ -29,7 +29,6 @@ int	 xasprintf(char **, const char *, ..
                  __attribute__((__nonnull__ (2)));
  int	 xsnprintf(char *, size_t, const char *, ...)
  		__attribute__((__format__ (printf, 3, 4)))