diff options
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/cvs/Makefile | 10 | ||||
| -rw-r--r-- | devel/cvs/PLIST | 3 | ||||
| -rw-r--r-- | devel/cvs/distinfo | 18 | ||||
| -rw-r--r-- | devel/cvs/patches/patch-aa | 10 | ||||
| -rw-r--r-- | devel/cvs/patches/patch-aq | 19 | ||||
| -rw-r--r-- | devel/cvs/patches/patch-ar | 18 | ||||
| -rw-r--r-- | devel/cvs/patches/patch-av | 34 |
7 files changed, 42 insertions, 70 deletions
diff --git a/devel/cvs/Makefile b/devel/cvs/Makefile index 31a881a6f3b..9bcf1536c20 100644 --- a/devel/cvs/Makefile +++ b/devel/cvs/Makefile @@ -1,10 +1,11 @@ -# $NetBSD: Makefile,v 1.55 2002/12/24 23:00:18 schmonz Exp $ +# $NetBSD: Makefile,v 1.56 2003/01/15 22:49:37 wiz Exp $ # -DISTNAME= cvs-1.11.2 +DISTNAME= cvs-1.11.4 CATEGORIES= devel MASTER_SITES= http://ftp.cvshome.org/${DISTNAME}/ \ ${MASTER_SITE_GNU:=non-gnu/cvs/} +EXTRACT_SUFX= .tar.bz2 MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.cvshome.org/ @@ -19,7 +20,7 @@ USE_BUILDLINK2= yes .if ${OPSYS} == "NetBSD" PATCH_SITES= ftp://ftp.kame.net/pub/kame/misc/ -PATCHFILES= cvs-1.11.2-v6-20020709.diff.gz +PATCHFILES= cvs-1.11.4-v6-20030102.diff.gz PATCH_DIST_STRIP= -p1 .if defined(USE_INET6) && ${USE_INET6} == "YES" @@ -37,6 +38,7 @@ LDFLAGS+= -framework Kerberos .if defined(KERBEROS) CONFIGURE_ARGS+= --with-krb4=/usr --enable-encryption CONFIGURE_ARGS+= --with-gssapi=/usr +CPPFLAGS+= -I/usr/include/krb5 .endif .if defined(RCS_LOCALID) @@ -47,7 +49,7 @@ pre-fetch: CONFIGURE_ENV+= perl_path=${PERL5} INFO_FILES= cvs.info cvsclient.info -TEXINFO_REQD?= 4.2 +TEXINFO_REQD?= 4.0 TEXINFO_OVERRIDE= YES .include "../../devel/zlib/buildlink2.mk" diff --git a/devel/cvs/PLIST b/devel/cvs/PLIST index 4b6bf52361f..ba3039ab7df 100644 --- a/devel/cvs/PLIST +++ b/devel/cvs/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2002/11/24 21:31:21 hubertf Exp $ +@comment $NetBSD: PLIST,v 1.4 2003/01/15 22:49:37 wiz Exp $ bin/cvs bin/cvsbug bin/rcs2log @@ -24,6 +24,7 @@ man/man1/cvs.1 man/man5/cvs.5 man/man8/cvsbug.8 share/cvs/contrib/README +share/cvs/contrib/check_cvs share/cvs/contrib/clmerge share/cvs/contrib/cln_hist share/cvs/contrib/commit_prep diff --git a/devel/cvs/distinfo b/devel/cvs/distinfo index f845cb8aee5..47e4fd47423 100644 --- a/devel/cvs/distinfo +++ b/devel/cvs/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.7 2002/11/26 10:30:19 junyoung Exp $ +$NetBSD: distinfo,v 1.8 2003/01/15 22:49:37 wiz Exp $ -SHA1 (cvs-1.11.2.tar.gz) = f522ac0d8bb316718ea1a167d6e1e0322cc016c4 -Size (cvs-1.11.2.tar.gz) = 2695311 bytes -SHA1 (cvs-1.11.2-v6-20020709.diff.gz) = 7b03fe31141f507e9b2c1118b6a746c457a4de0c -Size (cvs-1.11.2-v6-20020709.diff.gz) = 23862 bytes -SHA1 (patch-aa) = c4321f158cf5768b8696f9babf25f81a7c7a4134 +SHA1 (cvs-1.11.4.tar.bz2) = 377caae540f251d2c956778bff3bdf69724f839e +Size (cvs-1.11.4.tar.bz2) = 2170878 bytes +SHA1 (cvs-1.11.4-v6-20030102.diff.gz) = e162597be51853fde2f849c2bc07ba580891ae1e +Size (cvs-1.11.4-v6-20030102.diff.gz) = 12671 bytes +SHA1 (patch-aa) = f4edc7f2c99937881042d8fd39aec3ef6a4ba70a SHA1 (patch-ab) = d803ed98eb512873d662efc161b357b78adf7dfa SHA1 (patch-ac) = 432bc81bc7fb89644b2b7a9fff991a1dee32ee38 SHA1 (patch-ae) = 509ba28b402049573cff6d9dba471332e39834fa @@ -18,11 +18,11 @@ SHA1 (patch-am) = 8523249e8bef265449ddbb491dcc1d5d36fa8255 SHA1 (patch-an) = 2061110f6f5f44397182b917bd44abe3e63d47a4 SHA1 (patch-ao) = 0f8472015729f95451c5da6034057ed81695395a SHA1 (patch-ap) = ca2b22cde32b13904d7c6d047a30109fb9b53ec4 -SHA1 (patch-aq) = a6bf7e0c4d923e77c660d3ea8f6bdf70f663675d -SHA1 (patch-ar) = cb57f806bb25f50dd1eca54b7749a38746065ecb +SHA1 (patch-aq) = d346e0034589969e88ef5e1efb750302d3d44898 +SHA1 (patch-ar) = 28801dd20007fd50b7a852989197a6cf4eed5b75 SHA1 (patch-as) = 1553c1c32eef8872a6d8b0b4866be447335119f2 SHA1 (patch-at) = 0243e9179442efebfd81cb8900daa7032f9ee9ea SHA1 (patch-au) = 50795e0c4d4d7100aabcde20e54fce913291e0c1 -SHA1 (patch-av) = 385f5155e60f9fac255242e56902ef8a450f587f +SHA1 (patch-av) = be58c2e99b8e90e924a39d888e3bf81884847bdc SHA1 (patch-ay) = fc032523f28431dae99d03e677eb43b7d2cd5901 SHA1 (patch-az) = 9ae7d47ad2295c4598b88d425fee52f9afeb6081 diff --git a/devel/cvs/patches/patch-aa b/devel/cvs/patches/patch-aa index 5880c798f7c..dfe53993b75 100644 --- a/devel/cvs/patches/patch-aa +++ b/devel/cvs/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.5 2002/11/24 21:31:22 hubertf Exp $ +$NetBSD: patch-aa,v 1.6 2003/01/15 22:49:37 wiz Exp $ ---- Makefile.in.orig Wed Apr 17 21:47:32 2002 +--- Makefile.in.orig Sat Dec 28 19:04:33 2002 +++ Makefile.in -@@ -96,7 +96,7 @@ +@@ -102,7 +102,7 @@ install_sh = @install_sh@ # Unix source subdirs, where we'll want to run lint and etags: # This is a legacy variable from b4 Automake @@ -11,10 +11,10 @@ $NetBSD: patch-aa,v 1.5 2002/11/24 21:31:22 hubertf Exp $ # All other subdirs: SUBDIRS = $(USOURCE_SUBDIRS) man doc contrib tools \ windows-NT os2 emx vms -@@ -124,7 +124,7 @@ +@@ -130,7 +130,7 @@ subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = config.h $(top_builddir)/src/options.h + CONFIG_HEADER = config.h -CONFIG_CLEAN_FILES = cvs.spec emx/Makefile os2/Makefile zlib/Makefile +CONFIG_CLEAN_FILES = cvs.spec emx/Makefile os2/Makefile DIST_SOURCES = diff --git a/devel/cvs/patches/patch-aq b/devel/cvs/patches/patch-aq index a77d6e1ffa2..e05732d50a5 100644 --- a/devel/cvs/patches/patch-aq +++ b/devel/cvs/patches/patch-aq @@ -1,22 +1,13 @@ -$NetBSD: patch-aq,v 1.3 2002/11/24 21:31:25 hubertf Exp $ +$NetBSD: patch-aq,v 1.4 2003/01/15 22:49:38 wiz Exp $ ---- src/recurse.c.orig Wed Jun 27 06:20:51 2001 +--- src/recurse.c.orig Sat Dec 28 19:01:30 2002 +++ src/recurse.c -@@ -511,7 +511,7 @@ +@@ -511,7 +511,7 @@ do_recursion (frame) if (frame->flags == R_SKIP_ALL) return (0); -- should_readlock = noexec ? 0 : frame->readlock; -+ should_readlock = nolock ? 0 : frame->readlock; +- locktype = noexec ? CVS_LOCK_NONE : frame->locktype; ++ locktype = nolock ? CVS_LOCK_NONE : frame->locktype; /* The fact that locks are not active here is what makes us fail to have the -@@ -553,7 +553,7 @@ - */ - if (server_active - /* If there are writelocks around, we cannot pause here. */ -- && (should_readlock || noexec)) -+ && (should_readlock || nolock)) - server_pause_check(); - #endif - diff --git a/devel/cvs/patches/patch-ar b/devel/cvs/patches/patch-ar index 09533fb3958..e53f427a093 100644 --- a/devel/cvs/patches/patch-ar +++ b/devel/cvs/patches/patch-ar @@ -1,24 +1,24 @@ -$NetBSD: patch-ar,v 1.5 2002/11/24 21:31:25 hubertf Exp $ +$NetBSD: patch-ar,v 1.6 2003/01/15 22:49:38 wiz Exp $ ---- src/server.c.orig Tue Mar 19 20:15:45 2002 +--- src/server.c.orig Wed Jan 15 23:00:31 2003 +++ src/server.c -@@ -782,6 +782,7 @@ +@@ -772,6 +772,7 @@ E Protocol error: Root says \"%s\" but p nothing. But for rsh, we need to do it now. */ parse_config (current_parsed_root->directory); + if (!nolock) { - path = malloc (strlen (current_parsed_root->directory) + path = xmalloc (strlen (current_parsed_root->directory) + sizeof (CVSROOTADM) + 2); -@@ -799,6 +800,7 @@ +@@ -789,6 +790,7 @@ E Protocol error: Root says \"%s\" but p pending_error = save_errno; } free (path); + } #ifdef HAVE_PUTENV - env = malloc (strlen (CVSROOT_ENV) + strlen (current_parsed_root->directory) + 2); -@@ -2181,6 +2183,8 @@ + env = xmalloc (strlen (CVSROOT_ENV) + strlen (current_parsed_root->directory) + 2); +@@ -2174,6 +2176,8 @@ serve_global_option (arg) { case 'n': noexec = 1; @@ -27,7 +27,7 @@ $NetBSD: patch-ar,v 1.5 2002/11/24 21:31:25 hubertf Exp $ break; case 'q': quiet = 1; -@@ -5283,6 +5287,7 @@ +@@ -5237,6 +5241,7 @@ switch_to_user (username) const char *username; { struct passwd *pw; @@ -35,7 +35,7 @@ $NetBSD: patch-ar,v 1.5 2002/11/24 21:31:25 hubertf Exp $ pw = getpwnam (username); if (pw == NULL) -@@ -5342,7 +5347,15 @@ +@@ -5296,7 +5301,15 @@ error 0 %s: no such user\n", username); } } diff --git a/devel/cvs/patches/patch-av b/devel/cvs/patches/patch-av index 34938afe826..53c923268b0 100644 --- a/devel/cvs/patches/patch-av +++ b/devel/cvs/patches/patch-av @@ -1,30 +1,8 @@ -$NetBSD: patch-av,v 1.6 2002/11/24 21:31:25 hubertf Exp $ +$NetBSD: patch-av,v 1.7 2003/01/15 22:49:38 wiz Exp $ ---- configure.in.orig Tue Mar 26 17:16:02 2002 +--- configure.in.orig Wed Jan 15 23:00:31 2003 +++ configure.in -@@ -223,16 +223,19 @@ - dnl libkrb in the system libraries, so --with-krb4=value needs to - dnl override the system -lkrb. - dnl --KRB4=/usr/kerberos -+KRB4= - define(WITH_KRB4,[ - AC_ARG_WITH([krb4], - [ --with-krb4=value set default \$(KRB4) from value], -- [KRB4=$withval], -+ [if test X"$withval" != X"no"; then KRB4=$withval; fi], - )dnl -+if test X"$KRB4" != X""; then - echo "default place for krb4 is $KRB4" -+fi - AC_SUBST(KRB4)])dnl - WITH_KRB4 - -+if test X"$KRB4" != X""; then - krb_h= - AC_MSG_CHECKING([for krb.h]) - if test "$cross_compiling" != yes && test -r $KRB4/include/krb.h; then -@@ -272,7 +275,7 @@ +@@ -345,7 +345,7 @@ if test -n "$krb_h"; then [LDFLAGS=$hold_ldflags # Using open here instead of printf so we don't # get confused by the cached value for printf from above. @@ -33,9 +11,9 @@ $NetBSD: patch-av,v 1.6 2002/11/24 21:31:25 hubertf Exp $ LDFLAGS=$hold_ldflags else AC_CHECK_LIB(krb,printf,[krb_lib=yes krb_libdir=]) -@@ -280,7 +283,7 @@ - if test -n "$krb_lib"; then - AC_DEFINE(HAVE_KERBEROS) +@@ -354,7 +354,7 @@ if test -n "$krb_h"; then + AC_DEFINE([HAVE_KERBEROS], 1, + [Define if you have MIT Kerberos version 4 available.]) test -n "${krb_libdir}" && LIBS="${LIBS} -L${krb_libdir}" - LIBS="${LIBS} -lkrb" + LIBS="${LIBS} -lkrb -ldes -lcom_err -lroken -lcrypt" |