From nobody@FreeBSD.org  Wed Nov 14 07:20:01 2007
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5555E16A479
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 14 Nov 2007 07:20:01 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id 462E313C48A
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 14 Nov 2007 07:20:01 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.1/8.14.1) with ESMTP id lAE7JVTb011127
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 14 Nov 2007 07:19:31 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.1/8.14.1/Submit) id lAE7JV4Z011126;
	Wed, 14 Nov 2007 07:19:31 GMT
	(envelope-from nobody)
Message-Id: <200711140719.lAE7JV4Z011126@www.freebsd.org>
Date: Wed, 14 Nov 2007 07:19:31 GMT
From: Balwinder S Dheeman <bdheeman@gmail.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [update] devel/cvs+ipv6 1.11.17_2
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         118034
>Category:       ports
>Synopsis:       [update] devel/cvs+ipv6 1.11.17_2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    sumikawa
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Wed Nov 14 07:30:01 UTC 2007
>Closed-Date:    Tue May 27 11:47:13 JST 2008
>Last-Modified:  Tue May 27 02:50:01 UTC 2008
>Originator:     Balwinder S Dheeman
>Release:        8.0-CURRENT
>Organization:
Anu'z Linux@HOME
>Environment:
FreeBSD cto.homelinux.net 8.0-CURRENT FreeBSD 8.0-CURRENT #1: Mon Nov 12 21:32:24 IST 2007     bsd@cto.homelinux.net:/usr/obj/usr/src/sys/MYKERNEL  i386

>Description:
* Fixed Makefile and pkg-plist; minimized portlint warnings.

>How-To-Repeat:
Try portlint on the existing port.

>Fix:
A patch against existing port is attached herewith.


Patch attached with submission follows:

diff -Nur ./usr/ports/devel/cvs+ipv6/Makefile.orig ./usr/ports/devel/cvs+ipv6/Makefile
--- ./usr/ports/devel/cvs+ipv6/Makefile.orig	2007-10-13 12:39:19.000000000 +0000
+++ ./usr/ports/devel/cvs+ipv6/Makefile	2007-11-13 19:00:00.000000000 +0000
@@ -7,7 +7,7 @@
 
 PORTNAME=	cvs
 PORTVERSION=	1.11.17
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel ipv6
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	non-gnu/${PORTNAME}/source/stable/${PORTVERSION}
@@ -20,11 +20,10 @@
 MAINTAINER=	sumikawa@FreeBSD.org
 COMMENT=	IPv6 enabled cvs.  You can use IPv6 connection when using pserver
 
-CONFLICTS=	cvsnt-[12]*
+CONFLICTS=	cvsnt-[12]* cvs-devel-[12]*
 
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-#USE_GMAKE=	yes
 CONFIGURE_ARGS=	--enable-ipv6 --without-gssapi \
 		--with-editor="vi" \
 		--with-tmpdir="/tmp"
@@ -41,10 +40,10 @@
 	${REINPLACE_CMD} 's/${PORTVERSION:S/./\./g}/&+IPv6/g' ${WRKSRC}/configure
 	@${CP} ${FILESDIR}/missing ${WRKSRC}
 
-replace:
+post-install:
 .for f in cvs cvsbug
-	${MV} /usr/bin/${f} /usr/bin/${f}.orig
-	${CP} -p ${PREFIX}/bin/${f} /usr/bin/
+	${MV} ${PREFIX:S/\/local//}/bin/${f} ${PREFIX:S/\/local//}/bin/${f}.orig
+	${CP} -p ${PREFIX}/bin/${f} ${PREFIX:S/\/local//}/bin
 .endfor
 
 generate-patch:
diff -Nur ./usr/ports/devel/cvs+ipv6/pkg-plist.orig ./usr/ports/devel/cvs+ipv6/pkg-plist
--- ./usr/ports/devel/cvs+ipv6/pkg-plist.orig	2003-02-22 03:59:11.000000000 +0000
+++ ./usr/ports/devel/cvs+ipv6/pkg-plist	2007-11-13 19:00:00.000000000 +0000
@@ -1,5 +1,10 @@
+@comment $FreeBSD$
+@unexec if [ -x /usr/bin/cvs.orig ]; then mv -f /usr/bin/cvs.orig /usr/bin/cvs; fi
 bin/cvs
+@exec if [ ! -x /usr/bin/cvs.orig ]; then mv /usr/bin/cvs /usr/bin/cvs.orig; cp -p %D/%F /usr/bin/%F; fi
+@unexec if [ -x /usr/bin/cvsbug.orig ]; then mv -f /usr/bin/cvsbug.orig /usr/bin/cvsbug; fi
 bin/cvsbug
+@exec if [ ! -x /usr/bin/cvsbug.orig ]; then mv /usr/bin/cvsbug /usr/bin/cvsbug.orig; cp -p %D/%F /usr/bin/%F; fi
 bin/rcs2log
 share/cvs/contrib/README
 share/cvs/contrib/check_cvs


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->sumikawa 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Wed Nov 14 07:30:13 UTC 2007 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

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

From: Munechika SUMIKAWA / =?iso-2022-jp?B?GyRCM1FAbj0hNmEbKEI=?=
 <sumikawa@alaxala.net>
To: bug-followup@FreeBSD.org, bdheeman@gmail.com
Cc: sumikawa@alaxala.net
Subject: Re: ports/118034: [update] devel/cvs+ipv6 1.11.17_2
Date: Fri, 08 Feb 2008 13:34:45 +0900 (JST)

 Hi,
 
 I have several comments and questions.
 
 > -CONFLICTS=	cvsnt-[12]*
 > +CONFLICTS=	cvsnt-[12]* cvs-devel-[12]*
 
 Where is cvs-devel-[12]* port?  I could not find it out.
 
 > -replace:
 > +post-install:
 
 I don't agree with replacing the original binaries in default.
 
 
 >  .for f in cvs cvsbug
 > -	${MV} /usr/bin/${f} /usr/bin/${f}.orig
 > -	${CP} -p ${PREFIX}/bin/${f} /usr/bin/
 > +	${MV} ${PREFIX:S/\/local//}/bin/${f} ${PREFIX:S/\/local//}/bin/${f}.orig
 > +	${CP} -p ${PREFIX}/bin/${f} ${PREFIX:S/\/local//}/bin
 >  .endfor
 
 This must be paranoia way just for removing warning.  This fix should
 not be necessary.  warning is warning. just ignore it.
 
 -- Sumikawa

From: Balwinder S Dheeman <bdheeman@gmail.com>
To: bug-followup@FreeBSD.org
Cc: =?UTF-8?B?TXVuZWNoaWthIFNVTUlLQVdBIC8g6KeS5bed5a6X6L+R?=
 <sumikawa@alaxala.net>
Subject: Re: ports/118034: [update] devel/cvs+ipv6 1.11.17_2
Date: Sat, 09 Feb 2008 07:19:58 +0530

 On 02/08/2008 10:04 AM, Munechika SUMIKAWA / 角川宗近 wrote:
 > Hi,
 >
 > I have several comments and questions.
 >
 >   
 >> -CONFLICTS=	cvsnt-[12]*
 >> +CONFLICTS=	cvsnt-[12]* cvs-devel-[12]*
 >>     
 >
 > Where is cvs-devel-[12]* port?  I could not find it out.
 >   
 
 It is a new port based on feature/devel branch of the cvs, which I also 
 have submitted to FreeBSD project, see 
 http://cto.homelinux.net/ports#cvs-devel and, or 
 http://www.freebsd.org/cgi/query-pr.cgi?pr=118033
 
 >> -replace:
 >> +post-install:
 >>     
 >
 > I don't agree with replacing the original binaries in default.
 >   
 >>  .for f in cvs cvsbug
 >> -	${MV} /usr/bin/${f} /usr/bin/${f}.orig
 >> -	${CP} -p ${PREFIX}/bin/${f} /usr/bin/
 >> +	${MV} ${PREFIX:S/\/local//}/bin/${f} ${PREFIX:S/\/local//}/bin/${f}.orig
 >> +	${CP} -p ${PREFIX}/bin/${f} ${PREFIX:S/\/local//}/bin
 >>  .endfor
 >>     
 >
 > This must be paranoia way just for removing warning.  This fix should
 > not be necessary.  warning is warning. just ignore it.
 >   
 
 NP, you may go in for the best FreeBSD specific policies and omit/revert 
 both of the above changes
 
 Thanks,
 Regards,
 
 -- 
 Dr Balwinder S "bsd" Dheeman          Registered Linux User: #229709
 Anu'z Linux@HOME (Unix Shoppe)        Machines: #168573, 170593, 259192
 Chandigarh, UT, 160062, India         Gentoo, Fedora, Debian/FreeBSD/XP
 Home: http://cto.homelinux.net/~bsd/  Visit: http://counter.li.org/
 

From: Munechika SUMIKAWA / =?iso-2022-jp?B?GyRCM1FAbj0hNmEbKEI=?=
 <sumikawa@alaxala.net>
To: bdheeman@gmail.com
Cc: bug-followup@FreeBSD.org, sumikawa@alaxala.net
Subject: Re: ports/118034: [update] devel/cvs+ipv6 1.11.17_2
Date: Tue, 12 Feb 2008 13:02:26 +0900 (JST)

 > NP, you may go in for the best FreeBSD specific policies and
 > omit/revert both of the above changes
 
 Okay, I will commit a part of your patch after cvs-devel is imported.
 
 Thanks,
 
 -- Sumikawa
 
State-Changed-From-To: open->closed 
State-Changed-By: sumikawa 
State-Changed-When: Tue May 27 11:47:02 JST 2008 
State-Changed-Why:  
Commited, thanks. 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/118034: commit references a PR
Date: Tue, 27 May 2008 02:46:49 +0000 (UTC)

 sumikawa    2008-05-27 02:46:45 UTC
 
   FreeBSD ports repository
 
   Modified files:
     devel/cvs+ipv6       Makefile 
   Log:
   Add cvs-devel on CONFLICTS.
   
   PR:     ports/118034
   From:   Balwinder S Dheeman
   
   Revision  Changes    Path
   1.23      +1 -2      ports/devel/cvs+ipv6/Makefile
 _______________________________________________
 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:
