Date: Mon, 1 Oct 2007 14:52:27 -0400 (EDT) From: Greg Larkin <glarkin@sourcehosting.net> To: FreeBSD-gnats-submit@FreeBSD.org Cc: fjoe@FreeBSD.org Subject: ports/116792: [PATCH] devel/cvsnt: update to 2.5.03.2704 + enable RCS wrappers Message-ID: <200710011852.l91IqR6I060975@ports.entropy.prv> Resent-Message-ID: <200710011900.l91J06kM090694@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 116792 >Category: ports >Synopsis: [PATCH] devel/cvsnt: update to 2.5.03.2704 + enable RCS wrappers >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Mon Oct 01 19:00:05 GMT 2007 >Closed-Date: >Last-Modified: >Originator: Greg Larkin >Release: FreeBSD 6.1-SECURITY i386 >Organization: SourceHosting.net, LLC >Environment: System: FreeBSD ports.entropy.prv 6.1-SECURITY FreeBSD 6.1-SECURITY #0: Thu Apr 26 14:24:01 UTC 2007 >Description: - Update to 2.5.03.2704 - Enabled the RCS wrapper tools - Added a patch so the RCS wrapper tools will find the installed CVSNT binary, rather than relying on the PATH variable. This avoids an error caused by executing the base system version of CVS. Added file(s): - files/patch-rcs-common.cpp.in Port maintainer (fjoe@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- cvsnt-2.5.03.2704.patch begins here --- diff -ruN --exclude=CVS /usr/ports/devel/cvsnt.orig/Makefile /usr/ports/devel/cvsnt/Makefile --- /usr/ports/devel/cvsnt.orig/Makefile Sun Nov 12 06:59:56 2006 +++ /usr/ports/devel/cvsnt/Makefile Mon Oct 1 11:41:25 2007 @@ -6,7 +6,7 @@ # PORTNAME= cvsnt -PORTVERSION= 2.5.03.2382 +PORTVERSION= 2.5.03.2704 CATEGORIES= devel MASTER_SITES= http://www.cvsnt.org/archive/ @@ -15,9 +15,11 @@ CONFLICTS= cvs-1* +SUB_FILES= patch-rcs-common.cpp + GNU_CONFIGURE= yes USE_RC_SUBR= cvslockd.sh -CONFIGURE_ARGS= --enable-fork\ +CONFIGURE_ARGS= --enable-fork --enable-rcs \ --disable-odbc --disable-postgres\ --disable-mysql --disable-sqlite CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} @@ -32,6 +34,10 @@ MAN1= cvs.1 MAN5= cvs.5 MLINKS= cvs.1 cvsnt.1 cvs.5 cvsnt.5 + +post-configure: + @${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" \ + ${WRKSRC}/rcs/common.cpp .include <bsd.port.pre.mk> diff -ruN --exclude=CVS /usr/ports/devel/cvsnt.orig/distinfo /usr/ports/devel/cvsnt/distinfo --- /usr/ports/devel/cvsnt.orig/distinfo Sun Nov 12 06:59:56 2006 +++ /usr/ports/devel/cvsnt/distinfo Fri Sep 7 10:54:14 2007 @@ -1,3 +1,3 @@ -MD5 (cvsnt-2.5.03.2382.tar.gz) = 4f7d2e54c5529829a43b089f9b37c86e -SHA256 (cvsnt-2.5.03.2382.tar.gz) = 53b85c045df2594bc16c3c7ec6d9a937891ad3f557f6df715ba78dab712288a0 -SIZE (cvsnt-2.5.03.2382.tar.gz) = 6935773 +MD5 (cvsnt-2.5.03.2704.tar.gz) = f7b854bfbab784f331b58f9df012f64d +SHA256 (cvsnt-2.5.03.2704.tar.gz) = f7ae5f010b214751e70c064550e31bc939b71656ae4594e7b218a7e3d54581d6 +SIZE (cvsnt-2.5.03.2704.tar.gz) = 7088568 diff -ruN --exclude=CVS /usr/ports/devel/cvsnt.orig/files/patch-rcs-common.cpp.in /usr/ports/devel/cvsnt/files/patch-rcs-common.cpp.in --- /usr/ports/devel/cvsnt.orig/files/patch-rcs-common.cpp.in Wed Dec 31 19:00:00 1969 +++ /usr/ports/devel/cvsnt/files/patch-rcs-common.cpp.in Mon Oct 1 11:20:21 2007 @@ -0,0 +1,11 @@ +--- rcs/common.cpp.orig Mon Oct 1 10:54:14 2007 ++++ rcs/common.cpp Mon Oct 1 10:56:12 2007 +@@ -68,7 +68,7 @@ + int n; + char **nargv = (char**)malloc((argc+3)*sizeof(char*)); + +- nargv[0]="cvs"; ++ nargv[0]="%%PREFIX%%/bin/cvs"; + nargv[1]="rcsfile"; + nargv[2]=(char*)command; + for(n=1; n<argc; n++) diff -ruN --exclude=CVS /usr/ports/devel/cvsnt.orig/pkg-plist /usr/ports/devel/cvsnt/pkg-plist --- /usr/ports/devel/cvsnt.orig/pkg-plist Sun Nov 12 06:59:56 2006 +++ /usr/ports/devel/cvsnt/pkg-plist Mon Oct 1 14:04:58 2007 @@ -1,6 +1,9 @@ bin/cvs bin/cvslockd bin/cvsnt +bin/co +bin/rcsdiff +bin/rlog etc/cvsnt/PServer.example etc/cvsnt/Plugins.example etc/cvsnt/ca.pem @@ -32,19 +35,20 @@ lib/cvsnt/triggers/info.so lib/cvsnt/xdiff/extdiff.la lib/cvsnt/xdiff/extdiff.so -lib/libcvsapi-2.5.03.2382.so +lib/libcvsapi-2.5.03.2704.so lib/libcvsapi.la lib/libcvsapi.so -lib/libcvstools-2.5.03.2382.so +lib/libcvstools-2.5.03.2704.so lib/libcvstools.la lib/libcvstools.so -lib/libmdnsclient-2.5.03.2382.so +lib/libmdnsclient-2.5.03.2704.so lib/libmdnsclient.la lib/libmdnsclient.so @dirrm lib/cvsnt/xdiff @dirrm lib/cvsnt/triggers @dirrm lib/cvsnt/protocols @dirrm lib/cvsnt/mdns +@exec mkdir -p %D/lib/cvsnt/database @dirrm lib/cvsnt/database @dirrm lib/cvsnt @dirrm etc/cvsnt --- cvsnt-2.5.03.2704.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200710011852.l91IqR6I060975>