From glarkin@sourcehosting.net  Mon Oct  1 18:53:26 2007
Return-Path: <glarkin@sourcehosting.net>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8ABC916A420
	for <FreeBSD-gnats-submit@freebsd.org>; 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 <FreeBSD-gnats-submit@freebsd.org>; 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 <glarkin@sourcehosting.net>)
	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 <glarkin@sourcehosting.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc: fjoe@freebsd.org
Subject: [PATCH] devel/cvsnt: update to 2.5.03.2704 + enable RCS wrappers
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>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:    fjoe
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Oct 01 19:00:05 GMT 2007
>Closed-Date:    Mon Oct 15 21:47:47 UTC 2007
>Last-Modified:  Mon Oct 15 21:50:00 UTC 2007
>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:
Responsible-Changed-From-To: freebsd-ports-bugs->fjoe 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Mon Oct 1 19:00:16 UTC 2007 
Responsible-Changed-Why:  
Over to maintainer 

http://www.freebsd.org/cgi/query-pr.cgi?pr=116792 
State-Changed-From-To: open->closed 
State-Changed-By: fjoe 
State-Changed-When: Mon Oct 15 21:47:32 UTC 2007 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=116792 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/116792: commit references a PR
Date: Mon, 15 Oct 2007 21:47:10 +0000 (UTC)

 fjoe        2007-10-15 21:47:04 UTC
 
   FreeBSD ports repository
 
   Modified files:
     devel/cvsnt          Makefile distinfo pkg-plist 
   Added files:
     devel/cvsnt/files    patch-rcs-common.cpp.in 
   Log:
   - 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.
   
   PR:             116792
   
   Revision  Changes    Path
   1.26      +8 -2      ports/devel/cvsnt/Makefile
   1.11      +3 -3      ports/devel/cvsnt/distinfo
   1.1       +11 -0     ports/devel/cvsnt/files/patch-rcs-common.cpp.in (new)
   1.8       +7 -3      ports/devel/cvsnt/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
