Index: head/devel/opencvs/Makefile =================================================================== --- head/devel/opencvs/Makefile (revision 385417) +++ head/devel/opencvs/Makefile (revision 385418) @@ -1,28 +1,28 @@ # Created by: Gabor Kovesdan # $FreeBSD$ PORTNAME= opencvs -PORTVERSION= 20140108 +PORTVERSION= 20150501 CATEGORIES= devel MASTER_SITES= ftp://ftp.stack.nl/pub/users/%SUBDIR%/opencvs/ \ ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= johans MAINTAINER= johans@FreeBSD.org COMMENT= BSD-licensed CVS implementation LICENSE= BSD2CLAUSE WRKSRC= ${WRKDIR}/cvs USES= uidfix MAKE_ENV+= BINDIR="${PREFIX}/bin" \ MANDIR="${MANPREFIX}/man/man" \ CATDIR="${MANPREFIX}/man/man" PLIST_FILES= bin/opencvs \ man/man1/opencvs.1.gz \ man/man5/opencvs.5.gz \ man/man7/cvsintro.7.gz .include Index: head/devel/opencvs/distinfo =================================================================== --- head/devel/opencvs/distinfo (revision 385417) +++ head/devel/opencvs/distinfo (revision 385418) @@ -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 Index: head/devel/opencvs/files/patch-rcsparse.h =================================================================== --- head/devel/opencvs/files/patch-rcsparse.h (revision 385417) +++ head/devel/opencvs/files/patch-rcsparse.h (nonexistent) @@ -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; - } - Property changes on: head/devel/opencvs/files/patch-rcsparse.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/opencvs/files/patch-Makefile =================================================================== --- head/devel/opencvs/files/patch-Makefile (revision 385417) +++ head/devel/opencvs/files/patch-Makefile (revision 385418) @@ -1,34 +1,34 @@ ---- 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 $ PROG= opencvs -MAN= cvsintro.7 # cvs.1 cvs.5 +MAN= cvsintro.7 opencvs.1 opencvs.5 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 -CFLAGS+=-Wall -CFLAGS+=-Wstrict-prototypes -Wmissing-prototypes -CFLAGS+=-Wmissing-declarations -CFLAGS+=-Wshadow -Wpointer-arith -Wcast-qual -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 -INSTALL_STRIP= +opencvs.1: + mv cvs.1 opencvs.1 + +opencvs.5: + mv cvs.5 opencvs.5 .include Index: head/devel/opencvs/files/patch-cvs.h =================================================================== --- head/devel/opencvs/files/patch-cvs.h (revision 385417) +++ head/devel/opencvs/files/patch-cvs.h (revision 385418) @@ -1,13 +1,13 @@ ---- 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 +/* For building on FreeBSD */ +#include +#define __dead + #include "config.h" #include "file.h" #include "log.h" Index: head/devel/opencvs/files/patch-log.h =================================================================== --- head/devel/opencvs/files/patch-log.h (revision 385417) +++ head/devel/opencvs/files/patch-log.h (revision 385418) @@ -1,12 +1,12 @@ ---- 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 +/* For building on FreeBSD */ +#define __dead + /* log priority levels */ #define LP_NOTICE 0 #define LP_ERR 1 Index: head/devel/opencvs/files/patch-rcsparse.c =================================================================== --- head/devel/opencvs/files/patch-rcsparse.c (nonexistent) +++ head/devel/opencvs/files/patch-rcsparse.c (revision 385418) @@ -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; + } + Property changes on: head/devel/opencvs/files/patch-rcsparse.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/devel/opencvs/files/patch-util.c =================================================================== --- head/devel/opencvs/files/patch-util.c (revision 385417) +++ head/devel/opencvs/files/patch-util.c (revision 385418) @@ -1,11 +1,11 @@ ---- 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 #include -#include +#include "atomicio.h" #include #include - #include + #include Index: head/devel/opencvs/files/patch-xmalloc.c =================================================================== --- head/devel/opencvs/files/patch-xmalloc.c (revision 385417) +++ head/devel/opencvs/files/patch-xmalloc.c (revision 385418) @@ -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 -+ - #include +--- xmalloc.c.orig 2015-05-04 09:15:45 UTC ++++ xmalloc.c +@@ -17,6 +17,7 @@ #include #include + #include ++#include + + #include "log.h" + #include "xmalloc.h" Index: head/devel/opencvs/files/patch-xmalloc.h =================================================================== --- head/devel/opencvs/files/patch-xmalloc.h (revision 385417) +++ head/devel/opencvs/files/patch-xmalloc.h (revision 385418) @@ -1,11 +1,11 @@ ---- 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))) - __attribute__((__nonnull__ (3))) - __attribute__((__bounded__ (__string__,1,2))); + __attribute__((__nonnull__ (3))); #endif /* XMALLOC_H */