Index: head/devel/opencvs/Makefile =================================================================== --- head/devel/opencvs/Makefile (revision 408315) +++ head/devel/opencvs/Makefile (revision 408316) @@ -1,27 +1,27 @@ # Created by: Gabor Kovesdan # $FreeBSD$ PORTNAME= opencvs -PORTVERSION= 20150501 +PORTVERSION= 20151230 CATEGORIES= devel MASTER_SITES= ftp://ftp.stack.nl/pub/users/johans/opencvs/ \ LOCAL/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 408315) +++ head/devel/opencvs/distinfo (revision 408316) @@ -1,2 +1,2 @@ -SHA256 (opencvs-20150501.tar.gz) = 9d615b2d37ff58e8b052cb95403e89aed7593c08568df193d318addadcf51992 -SIZE (opencvs-20150501.tar.gz) = 162638 +SHA256 (opencvs-20151230.tar.gz) = c8de7cd9786265ef43b909bc44642144d8fe7e342c42679fd30cc449c06d95df +SIZE (opencvs-20151230.tar.gz) = 162228 Index: head/devel/opencvs/files/patch-Makefile =================================================================== --- head/devel/opencvs/files/patch-Makefile (revision 408315) +++ head/devel/opencvs/files/patch-Makefile (revision 408316) @@ -1,34 +1,34 @@ ---- Makefile.orig 2011-04-20 18:46:33 UTC -+++ Makefile +--- Makefile.orig 2011-04-20 20:46:33.000000000 +0200 ++++ Makefile 2016-02-06 23:33:35.512773000 +0100 @@ -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 @@ 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 -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.c =================================================================== --- head/devel/opencvs/files/patch-cvs.c (nonexistent) +++ head/devel/opencvs/files/patch-cvs.c (revision 408316) @@ -0,0 +1,13 @@ +--- cvs.c.orig 2016-02-06 23:39:08.240246000 +0100 ++++ cvs.c 2016-02-06 23:39:10.243855000 +0100 +@@ -187,8 +187,10 @@ main(int argc, char **argv) + struct stat st; + char fpath[PATH_MAX]; + ++#if 0 + if (pledge("stdio rpath wpath cpath fattr proc exec", NULL) == -1) + err(1, "pledge"); ++#endif + + tzset(); + Property changes on: head/devel/opencvs/files/patch-cvs.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-cvs.h =================================================================== --- head/devel/opencvs/files/patch-cvs.h (revision 408315) +++ head/devel/opencvs/files/patch-cvs.h (revision 408316) @@ -1,13 +1,13 @@ ---- cvs.h.orig 2015-05-04 09:15:45 UTC -+++ cvs.h +--- cvs.h.orig 2015-05-04 11:15:45.000000000 +0200 ++++ cvs.h 2016-02-06 23:33:35.522379000 +0100 @@ -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-date.y =================================================================== --- head/devel/opencvs/files/patch-date.y (nonexistent) +++ head/devel/opencvs/files/patch-date.y (revision 408316) @@ -0,0 +1,10 @@ +--- date.y.orig 2016-02-06 23:34:07.626970000 +0100 ++++ date.y 2016-02-06 23:34:12.389277000 +0100 +@@ -16,6 +16,7 @@ + + #include + #include ++#include + + #include "cvs.h" + Property changes on: head/devel/opencvs/files/patch-date.y ___________________________________________________________________ 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-log.h =================================================================== --- head/devel/opencvs/files/patch-log.h (revision 408315) +++ head/devel/opencvs/files/patch-log.h (revision 408316) @@ -1,12 +1,12 @@ ---- log.h.orig 2008-06-10 01:00:34 UTC -+++ log.h +--- log.h.orig 2008-06-10 03:00:34.000000000 +0200 ++++ log.h 2016-02-06 23:33:35.531120000 +0100 @@ -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 (revision 408315) +++ head/devel/opencvs/files/patch-rcsparse.c (revision 408316) @@ -1,11 +1,11 @@ ---- rcsparse.c.orig 2015-05-04 09:15:45 UTC -+++ rcsparse.c -@@ -1228,8 +1228,6 @@ valid_login(char *login_name) +--- rcsparse.c.orig 2016-02-06 23:25:25.000000000 +0100 ++++ rcsparse.c 2016-02-06 23:33:35.539982000 +0100 +@@ -1227,8 +1227,6 @@ valid_login(char *login_name) return 0; } } - if ((char *)cp - login_name > _PW_NAME_LEN) - return 0; return 1; } Index: head/devel/opencvs/files/patch-util.c =================================================================== --- head/devel/opencvs/files/patch-util.c (revision 408315) +++ head/devel/opencvs/files/patch-util.c (revision 408316) @@ -1,11 +1,11 @@ ---- util.c.orig 2015-05-04 09:15:45 UTC -+++ util.c +--- util.c.orig 2016-02-06 23:25:26.000000000 +0100 ++++ util.c 2016-02-06 23:33:35.548485000 +0100 @@ -30,7 +30,7 @@ #include #include -#include +#include "atomicio.h" #include #include #include Index: head/devel/opencvs/files/patch-xmalloc.c =================================================================== --- head/devel/opencvs/files/patch-xmalloc.c (revision 408315) +++ head/devel/opencvs/files/patch-xmalloc.c (revision 408316) @@ -1,10 +1,19 @@ ---- xmalloc.c.orig 2015-05-04 09:15:45 UTC -+++ xmalloc.c -@@ -17,6 +17,7 @@ +--- xmalloc.c.orig 2016-02-06 23:25:26.000000000 +0100 ++++ xmalloc.c 2016-02-06 23:38:08.189826000 +0100 +@@ -19,6 +19,7 @@ #include #include #include +#include #include "log.h" #include "xmalloc.h" +@@ -58,7 +59,7 @@ xreallocarray(void *ptr, size_t nmemb, s + + if (nmemb == 0 || size == 0) + fatal("xreallocarray: zero size"); +- new_ptr = reallocarray(ptr, nmemb, size); ++ new_ptr = realloc(ptr, nmemb * size); /* this lacks overflow check */ + if (new_ptr == NULL) + fatal("xreallocarray: allocating %zu * %zu bytes: %s", + nmemb, size, strerror(errno)); Index: head/devel/opencvs/files/patch-xmalloc.h =================================================================== --- head/devel/opencvs/files/patch-xmalloc.h (revision 408315) +++ head/devel/opencvs/files/patch-xmalloc.h (revision 408316) @@ -1,11 +1,11 @@ ---- xmalloc.h.orig 2015-05-04 09:15:45 UTC -+++ xmalloc.h -@@ -29,7 +29,6 @@ int xasprintf(char **, const char *, .. +--- xmalloc.h.orig 2016-02-06 23:25:26.000000000 +0100 ++++ xmalloc.h 2016-02-06 23:33:35.565364000 +0100 +@@ -28,7 +28,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 */