From owner-freebsd-arch Wed Mar 13 4:56:33 2002 Delivered-To: freebsd-arch@freebsd.org Received: from flood.ping.uio.no (flood.ping.uio.no [129.240.78.31]) by hub.freebsd.org (Postfix) with ESMTP id DF1D537B400 for ; Wed, 13 Mar 2002 04:56:25 -0800 (PST) Received: by flood.ping.uio.no (Postfix, from userid 2602) id DFC7A5346; Wed, 13 Mar 2002 13:56:23 +0100 (CET) X-URL: http://www.ofug.org/~des/ X-Disclaimer: The views expressed in this message do not necessarily coincide with those of any organisation or company with which I am or have been affiliated. To: arch@freebsd.org Subject: Unmoronify CVS From: Dag-Erling Smorgrav Date: 13 Mar 2002 13:56:22 +0100 Message-ID: Lines: 8 User-Agent: Gnus/5.0808 (Gnus v5.8.8) Emacs/21.1 MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Sender: owner-freebsd-arch@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG --=-=-= Any objections to the attached patch? DES -- Dag-Erling Smorgrav - des@ofug.org --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=cvs.diff Index: contrib/cvs/src/cvs.h =================================================================== RCS file: /home/ncvs/src/contrib/cvs/src/cvs.h,v retrieving revision 1.14 diff -u -r1.14 cvs.h --- contrib/cvs/src/cvs.h 15 Sep 2001 05:57:52 -0000 1.14 +++ contrib/cvs/src/cvs.h 13 Mar 2002 12:50:24 -0000 @@ -894,9 +894,15 @@ char *normalize_cvsroot PROTO((const cvsroot_t *root)); #endif /* AUTH_CLIENT_SUPPORT */ +#ifndef NO_VAL_TAGS extern void tag_check_valid PROTO ((char *, int, char **, int, int, char *)); extern void tag_check_valid_join PROTO ((char *, int, char **, int, int, char *)); +#else +#define tag_check_valid(a, b, c, d, e, f) do { /* nothing */ } while (0) +#define tag_check_valid_join(a, b, c, d, e, f) do { /* nothing */ } while (0) +#endif /* !NO_VAL_TAGS */ + #include "server.h" Index: contrib/cvs/src/mkmodules.c =================================================================== RCS file: /home/ncvs/src/contrib/cvs/src/mkmodules.c,v retrieving revision 1.11 diff -u -r1.11 mkmodules.c --- contrib/cvs/src/mkmodules.c 10 Aug 2001 09:53:06 -0000 1.11 +++ contrib/cvs/src/mkmodules.c 13 Mar 2002 12:49:10 -0000 @@ -949,6 +949,7 @@ chmod (info, 0666); } +#ifndef NO_VAL_TAGS /* Make an empty val-tags file to prevent problems creating it later. */ strcpy (info, adm); strcat (info, "/"); @@ -966,6 +967,7 @@ because xchmod() is too shy. */ chmod (info, 0666); } +#endif /* !NO_VAL_TAGS */ free (info); free (info_v); Index: contrib/cvs/src/tag.c =================================================================== RCS file: /home/ncvs/src/contrib/cvs/src/tag.c,v retrieving revision 1.1.1.8 diff -u -r1.1.1.8 tag.c --- contrib/cvs/src/tag.c 10 Aug 2001 09:43:21 -0000 1.1.1.8 +++ contrib/cvs/src/tag.c 13 Mar 2002 12:49:06 -0000 @@ -1032,6 +1032,7 @@ return (R_PROCESS); } +#ifndef NO_VAL_TAGS /* Code relating to the val-tags file. Note that this file has no way of knowing when a tag has been deleted. The problem is that there is no way of knowing whether a tag still exists somewhere, when we @@ -1300,3 +1301,4 @@ free (c); } +#endif /* !NO_VAL_TAGS */ Index: gnu/usr.bin/cvs/cvs/Makefile =================================================================== RCS file: /home/ncvs/src/gnu/usr.bin/cvs/cvs/Makefile,v retrieving revision 1.36 diff -u -r1.36 Makefile --- gnu/usr.bin/cvs/cvs/Makefile 10 Aug 2001 11:24:23 -0000 1.36 +++ gnu/usr.bin/cvs/cvs/Makefile 13 Mar 2002 12:45:57 -0000 @@ -25,6 +25,7 @@ CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../lib -DHAVE_CONFIG_H \ -I${CVSDIR}/src -I${CVSDIR}/lib -I${CVSDIR}/diff +CFLAGS+= -DNO_VAL_TAGS DPADD+= ${LIBCVS} ${LIBDIFF} ${LIBGNUREGEX} ${LIBMD} ${LIBCRYPT} ${LIBZ} LDADD+= ${LIBCVS} ${LIBDIFF} -lgnuregex -lmd -lcrypt -lz --=-=-=-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-arch" in the body of the message