From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Oct 1 19:00:06 2007 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C1CD516A418 for ; Mon, 1 Oct 2007 19:00:06 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 8DB3513C4C1 for ; Mon, 1 Oct 2007 19:00:06 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.1/8.14.1) with ESMTP id l91J06rC090695 for ; Mon, 1 Oct 2007 19:00:06 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.1/8.14.1/Submit) id l91J06kM090694; Mon, 1 Oct 2007 19:00:06 GMT (envelope-from gnats) Resent-Date: Mon, 1 Oct 2007 19:00:06 GMT Resent-Message-Id: <200710011900.l91J06kM090694@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Greg Larkin Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8ABC916A420 for ; Mon, 1 Oct 2007 18:53:26 +0000 (UTC) (envelope-from glarkin@sourcehosting.net) Received: from mail1.sourcehosting.net (mail1.sourcehosting.net [74.205.51.45]) by mx1.freebsd.org (Postfix) with ESMTP id 61DFE13C465 for ; Mon, 1 Oct 2007 18:53:26 +0000 (UTC) (envelope-from glarkin@sourcehosting.net) Received: from 68-189-244-97.dhcp.oxfr.ma.charter.com ([68.189.244.97] helo=Gregory-Larkins-Computer.local) by mail1.sourcehosting.net with esmtp (Exim 4.68 (FreeBSD)) (envelope-from ) id 1IcQOL-000FnZ-UD; Mon, 01 Oct 2007 14:53:25 -0400 Received: from ports.entropy.prv (ports.entropy.prv [192.168.1.18]) by Gregory-Larkins-Computer.local (Postfix) with ESMTP id CA187159224A; Mon, 1 Oct 2007 14:53:17 -0400 (EDT) Received: from ports.entropy.prv (localhost [127.0.0.1]) by ports.entropy.prv (8.13.6/8.13.6) with ESMTP id l91IqReY060976; Mon, 1 Oct 2007 14:52:27 -0400 (EDT) (envelope-from glarkin@ports.entropy.prv) Received: (from root@localhost) by ports.entropy.prv (8.13.6/8.13.6/Submit) id l91IqR6I060975; Mon, 1 Oct 2007 14:52:27 -0400 (EDT) (envelope-from glarkin) Message-Id: <200710011852.l91IqR6I060975@ports.entropy.prv> Date: Mon, 1 Oct 2007 14:52:27 -0400 (EDT) From: Greg Larkin To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: fjoe@FreeBSD.org Subject: ports/116792: [PATCH] devel/cvsnt: update to 2.5.03.2704 + enable RCS wrappers X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Oct 2007 19:00:06 -0000 >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 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; nRelease-Note: >Audit-Trail: >Unformatted: