ports/118034: [update] devel/cvs+ipv6 1.11.17_2

[Balwinder S Dheeman]

>Number:         118034
>Category:       ports
>Synopsis:       [update] devel/cvs+ipv6 1.11.17_2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Wed Nov 14 07:30:01 UTC 2007
>Closed-Date:
>Last-Modified:
>Originator:     Balwinder S Dheeman
>Release:        8.0-CURRENT
>Organization:
Anu'z Linux at HOME
>Environment:
FreeBSD cto.homelinux.net 8.0-CURRENT FreeBSD 8.0-CURRENT #1: Mon Nov 12 21:32:24 IST 2007     bsd at 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 at 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 @@
+ at comment $FreeBSD$
+ at unexec if [ -x /usr/bin/cvs.orig ]; then mv -f /usr/bin/cvs.orig /usr/bin/cvs; fi
 bin/cvs
+ at exec if [ ! -x /usr/bin/cvs.orig ]; then mv /usr/bin/cvs /usr/bin/cvs.orig; cp -p %D/%F /usr/bin/%F; fi
+ at unexec if [ -x /usr/bin/cvsbug.orig ]; then mv -f /usr/bin/cvsbug.orig /usr/bin/cvsbug; fi
 bin/cvsbug
+ at 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:
>Unformatted: