Date: Mon, 18 Apr 2011 23:57:29 -0700 (PDT) From: "David O'Brien" <obrien@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/156491: License and patch updates for OpenCVS Message-ID: <201104190657.p3J6vTRV096891@dragon.nuxi.org> Resent-Message-ID: <201104190730.p3J7U9cm029669@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 156491 >Category: ports >Synopsis: License and patch updates for OpenCVS >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Tue Apr 19 07:30:09 UTC 2011 >Closed-Date: >Last-Modified: >Originator: David O'Brien >Release: FreeBSD 9.0-CURRENT i386 >Organization: The FreeBSD Project >Environment: System: FreeBSD dragon.NUXI.org 9.0-CURRENT FreeBSD 9.0-CURRENT #662 r218815:218845M: Tue Feb 22 00:13:31 PST 2011 rootk@dragon.NUXI.org:/sys/i386/compile/DRAGON i386 >Description: OpenCVS fails to declare its license. Given one big reason to use OpenCVS vs. GNU CVS is the license, it would be nice to list it. I also found I could reduce the number of patches the port has: patch-atomicio.h: the added atomiciov() prototype is no longer needed patch-checkout.c: TAILQ_END is no longer used patch-cvs.c: define out "__dead" in cvs.h so all uses of it are handled in one place patch-log.h: xmalloc.c does not include cvs.h, so define out "__dead" so any future prototype uses of it are automatically handled >How-To-Repeat: make clean all >Fix: Index: Makefile =================================================================== RCS file: /home/pcvs/ports/devel/opencvs/Makefile,v retrieving revision 1.3 diff -u -p -r1.3 Makefile --- Makefile 8 Jun 2010 20:57:43 -0000 1.3 +++ Makefile 19 Apr 2011 06:56:05 -0000 @@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= johans MAINTAINER= johans@FreeBSD.org COMMENT= BSD-licensed CVS implementation +LICENSE= BSD WRKSRC= ${WRKDIR}/cvs MANCOMPRESSED= maybe Index: files/patch-atomicio.h =================================================================== RCS file: files/patch-atomicio.h diff -N files/patch-atomicio.h --- files/patch-atomicio.h 8 Jun 2010 20:57:43 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,21 +0,0 @@ ---- atomicio.h.orig 2007-09-17 12:07:21.000000000 +0200 -+++ atomicio.h 2010-06-08 20:35:43.000000000 +0200 -@@ -28,6 +28,7 @@ - - #ifndef _ATOMICIO_H - #define _ATOMICIO_H -+#include <sys/socket.h> - - /* - * Ensure all of data on socket comes through. f==read || f==vwrite -@@ -36,4 +37,10 @@ size_t atomicio(ssize_t (*)(int, void *, - - #define vwrite (ssize_t (*)(int, void *, size_t))write - -+/* -+ * ensure all of data on socket comes through. f==readv || f==writev -+ */ -+size_t atomiciov(ssize_t (*)(int, const struct iovec *, int), -+ int, const struct iovec *, int); -+ - #endif /* _ATOMICIO_H */ Index: files/patch-checkout.c =================================================================== RCS file: files/patch-checkout.c diff -N files/patch-checkout.c --- files/patch-checkout.c 8 Jun 2010 20:57:43 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,10 +0,0 @@ ---- checkout.c.orig 2009-06-21 22:23:01.000000000 +0200 -+++ checkout.c 2010-06-08 20:18:08.000000000 +0200 -@@ -364,6 +364,7 @@ - xfree(module_repo_root); - } - -+#define TAILQ_END(head) NULL - if (mc->mc_canfree == 1) { - for (fl = RB_MIN(cvs_flisthead, &(mc->mc_modules)); - fl != NULL; fl = nxt) { Index: files/patch-cvs.c =================================================================== RCS file: files/patch-cvs.c diff -N files/patch-cvs.c --- files/patch-cvs.c 8 Jun 2010 20:57:44 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,20 +0,0 @@ ---- cvs.c.orig 2008-06-21 17:39:15.000000000 +0200 -+++ cvs.c 2010-06-08 20:18:08.000000000 +0200 -@@ -70,7 +70,7 @@ - struct cvs_cmd *cmdp; /* struct of command we are running */ - - int cvs_getopt(int, char **); --__dead void usage(void); -+void usage(void); - static void cvs_read_rcfile(void); - - struct cvs_wklhead temp_files; -@@ -122,7 +122,7 @@ - cvs_ent_close(current_list, ENT_SYNC); - } - --__dead void -+void - usage(void) - { - (void)fprintf(stderr, Index: files/patch-cvs.h =================================================================== RCS file: /home/pcvs/ports/devel/opencvs/files/patch-cvs.h,v retrieving revision 1.2 diff -u -p -r1.2 patch-cvs.h --- files/patch-cvs.h 8 Jun 2010 20:57:44 -0000 1.2 +++ files/patch-cvs.h 19 Apr 2011 06:56:05 -0000 @@ -1,10 +1,13 @@ ---- cvs.h.orig 2009-03-25 22:19:20.000000000 +0100 -+++ cvs.h 2010-06-08 20:19:07.000000000 +0200 -@@ -28,6 +28,7 @@ - #define CVS_H +--- cvs.h.orig 2009-03-25 14:19:20.000000000 -0700 ++++ cvs.h 2011-04-18 23:55:35.000000000 -0700 +@@ -29,6 +29,10 @@ #include <signal.h> -+#include <time.h> ++/* For building on FreeBSD */ ++#include <time.h> ++#define __dead ++ #include "config.h" #include "file.h" + #include "log.h" Index: files/patch-log.h =================================================================== RCS file: /home/pcvs/ports/devel/opencvs/files/patch-log.h,v retrieving revision 1.2 diff -u -p -r1.2 patch-log.h --- files/patch-log.h 8 Jun 2010 20:57:44 -0000 1.2 +++ files/patch-log.h 19 Apr 2011 06:56:05 -0000 @@ -1,10 +1,12 @@ ---- log.h.orig 2008-06-10 03:00:34.000000000 +0200 -+++ log.h 2010-06-08 20:18:08.000000000 +0200 -@@ -47,6 +47,6 @@ - void cvs_vlog(u_int, const char *, va_list); - int cvs_printf(const char *, ...) __attribute__((format(printf, 1, 2))); - int cvs_vprintf(const char *, va_list); --void fatal(const char *, ...) __dead __attribute__((format(printf, 1,2))); -+void fatal(const char *, ...) __attribute__((format(printf, 1,2))); +--- log.h.orig 2008-06-09 18:00:34.000000000 -0700 ++++ log.h 2011-04-18 23:44:44.000000000 -0700 +@@ -29,6 +29,9 @@ - #endif /* LOG_H */ + #include <stdarg.h> + ++/* For building on FreeBSD */ ++#define __dead ++ + /* log priority levels */ + #define LP_NOTICE 0 + #define LP_ERR 1 >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201104190657.p3J6vTRV096891>