From sgk@kolobov.com  Sun Jun 29 13:00:34 2003
Return-Path: <sgk@kolobov.com>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id C348537B401
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 29 Jun 2003 13:00:34 -0700 (PDT)
Received: from outpost.globcon.net (outpost.globcon.net [62.141.88.161])
	by mx1.FreeBSD.org (Postfix) with SMTP id 5DE8843FF2
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 29 Jun 2003 13:00:33 -0700 (PDT)
	(envelope-from sgk@kolobov.com)
Received: (qmail 20958 invoked from network); 29 Jun 2003 20:00:10 -0000
Received: from dom.kolobov.com (HELO kolobov.com) (213.247.180.114)
  by outpost.globcon.net with SMTP; 29 Jun 2003 20:00:10 -0000
Received: (qmail 7424 invoked by uid 911); 29 Jun 2003 20:00:06 -0000
Message-Id: <20030629200006.7423.qmail@kolobov.com>
Date: 29 Jun 2003 20:00:06 -0000
From: Sergei Kolobov <sergei@kolobov.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc: hrs@FreeBSD.org
Subject: [PATCH] net/cvsync: install documentation, remove USE_REINPLACE
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         53904
>Category:       ports
>Synopsis:       [PATCH] net/cvsync: install documentation, remove USE_REINPLACE
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    hrs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jun 29 13:10:12 PDT 2003
>Closed-Date:    Wed Jul 02 23:12:04 PDT 2003
>Last-Modified:  Wed Jul 02 23:12:04 PDT 2003
>Originator:     Sergei Kolobov
>Release:        FreeBSD 5.1-CURRENT i386
>Organization:
>Environment:
System: FreeBSD elf.chetwood.ru 5.1-CURRENT FreeBSD 5.1-CURRENT #0: Thu Jun  5 02:19:41 MSD
>Description:
- Install documentation
- Remove USE_REINPLACE as it is not used anymore
- Slightly reword pkg-descr, mention that cvsync is BSD-licensed
- Add Author and WWW tags to pkg-descr

Port maintainer (hrs@FreeBSD.org) is cc'd.
>How-To-Repeat:
>Fix:

--- cvsync-0.23.5.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/net/cvsync/Makefile,v
retrieving revision 1.16
diff -u -r1.16 Makefile
--- Makefile	27 Jun 2003 04:04:26 -0000	1.16
+++ Makefile	29 Jun 2003 17:40:59 -0000
@@ -15,13 +15,17 @@
 COMMENT=	A portable CVS repository synchronization utility
 
 USE_GMAKE=	yes
-USE_REINPLACE=	yes
 
 MAN1=		cvscan.1 cvsync.1 cvsyncd.1 rcscan.1 rcscmp.1
+DOCS=		doc/COPYRIGHT doc/ChangeLog doc/FAQ doc/TODO
+EXAMPLES=	samples/cvsync.conf samples/cvsyncd.conf
 
 post-install:
 	@${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/samples/cvsync.conf ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/samples/cvsyncd.conf ${EXAMPLESDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${EXAMPLES} ${EXAMPLESDIR}
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
+.endif
 
 .include <bsd.port.mk>
Index: pkg-descr
===================================================================
RCS file: /home/ncvs/ports/net/cvsync/pkg-descr,v
retrieving revision 1.2
diff -u -r1.2 pkg-descr
--- pkg-descr	16 Apr 2003 06:45:07 -0000	1.2
+++ pkg-descr	29 Jun 2003 17:40:59 -0000
@@ -1,5 +1,8 @@
 cvsync is a portable CVS repository synchronization utility,
-written in C and POSIX pthread library. This is very similar to
-CVSup but not compatible with it.
+written in C and POSIX pthread library, released under BSD license.
+It is very similar to CVSup but not compatible with it.
 
 Note that this utility is still experimental.
+
+Author:	MAEKAWA Masahide <maekawa@daemon-systems.org>
+WWW:	http://www.daemon-systems.org/cvsync/
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/net/cvsync/pkg-plist,v
retrieving revision 1.1
diff -u -r1.1 pkg-plist
--- pkg-plist	23 Mar 2003 18:41:44 -0000	1.1
+++ pkg-plist	29 Jun 2003 17:40:59 -0000
@@ -4,6 +4,11 @@
 bin/cvsyncd
 bin/rcscan
 bin/rcscmp
+%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/FAQ
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 %%EXAMPLESDIR%%/cvsync.conf
 %%EXAMPLESDIR%%/cvsyncd.conf
 @dirrm %%EXAMPLESDIR%%
--- cvsync-0.23.5.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->hrs 
Responsible-Changed-By: erwin 
Responsible-Changed-When: Sun Jun 29 23:47:55 PDT 2003 
Responsible-Changed-Why:  
Over to maintainer 

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

From: Hiroki Sato <hrs@eos.ocn.ne.jp>
To: FreeBSD-gnats-submit@freebsd.org
Cc:  
Subject: Re: ports/53904: [PATCH] net/cvsync: install documentation, remove
 USE_REINPLACE
Date: Mon, 30 Jun 2003 23:33:08 +0900 (JST)

 Sergei Kolobov <sergei@kolobov.com> wrote
   in <20030629200006.7423.qmail@kolobov.com>:
 
 sergei> - Install documentation
 sergei> - Remove USE_REINPLACE as it is not used anymore
 sergei> - Slightly reword pkg-descr, mention that cvsync is BSD-licensed
 sergei> - Add Author and WWW tags to pkg-descr
 
  Thanks.  Your patch is good to me, but the author does not like
  that his email address appears as is in pkg-descr.
 
  The following patch includes sergei@kolobov.com's changes and
  "s/@/ at /;s/\./ dot /" for the email address.  Could anyone commit this?
 
 -- 
 | Hiroki SATO  <hrs@eos.ocn.ne.jp> / <hrs@FreeBSD.org>
 
 Index: Makefile
 ===================================================================
 RCS file: /home/ncvs/ports/net/cvsync/Makefile,v
 retrieving revision 1.16
 diff -d -u -I\$FreeBSD:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.16 Makefile
 --- Makefile	27 Jun 2003 04:04:26 -0000	1.16
 +++ Makefile	30 Jun 2003 13:48:18 -0000
 @@ -15,13 +15,17 @@
  COMMENT=	A portable CVS repository synchronization utility
  
  USE_GMAKE=	yes
 -USE_REINPLACE=	yes
  
  MAN1=		cvscan.1 cvsync.1 cvsyncd.1 rcscan.1 rcscmp.1
 +DOCS=		doc/COPYRIGHT doc/ChangeLog doc/FAQ doc/TODO
 +EXAMPLES=	samples/cvsync.conf samples/cvsyncd.conf
  
  post-install:
  	@${MKDIR} ${EXAMPLESDIR}
 -	${INSTALL_DATA} ${WRKSRC}/samples/cvsync.conf ${EXAMPLESDIR}
 -	${INSTALL_DATA} ${WRKSRC}/samples/cvsyncd.conf ${EXAMPLESDIR}
 +	cd ${WRKSRC} && ${INSTALL_DATA} ${EXAMPLES} ${EXAMPLESDIR}
 +.if !defined(NOPORTDOCS)
 +	@${MKDIR} ${DOCSDIR}
 +	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
 +.endif
  
  .include <bsd.port.mk>
 Index: pkg-descr
 ===================================================================
 RCS file: /home/ncvs/ports/net/cvsync/pkg-descr,v
 retrieving revision 1.2
 diff -d -u -I\$FreeBSD:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.2 pkg-descr
 --- pkg-descr	16 Apr 2003 06:45:07 -0000	1.2
 +++ pkg-descr	30 Jun 2003 13:49:19 -0000
 @@ -1,5 +1,8 @@
  cvsync is a portable CVS repository synchronization utility,
 -written in C and POSIX pthread library. This is very similar to
 -CVSup but not compatible with it.
 +written in C and POSIX pthread library, released under BSD license.
 +It is very similar to CVSup but not compatible with it.
  
  Note that this utility is still experimental.
 +
 +Author:	MAEKAWA Masahide <maekawa at daemon-systems dot org>
 +WWW:	http://www.daemon-systems.org/cvsync/
 Index: pkg-plist
 ===================================================================
 RCS file: /home/ncvs/ports/net/cvsync/pkg-plist,v
 retrieving revision 1.1
 diff -d -u -I\$FreeBSD:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.1 pkg-plist
 --- pkg-plist	23 Mar 2003 18:41:44 -0000	1.1
 +++ pkg-plist	30 Jun 2003 13:47:50 -0000
 @@ -4,6 +4,11 @@
  bin/cvsyncd
  bin/rcscan
  bin/rcscmp
 +%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
 +%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 +%%PORTDOCS%%%%DOCSDIR%%/FAQ
 +%%PORTDOCS%%%%DOCSDIR%%/TODO
 +%%PORTDOCS%%@dirrm %%DOCSDIR%%
  %%EXAMPLESDIR%%/cvsync.conf
  %%EXAMPLESDIR%%/cvsyncd.conf
  @dirrm %%EXAMPLESDIR%%
State-Changed-From-To: open->closed 
State-Changed-By: nork 
State-Changed-When: Wed Jul 2 23:11:55 PDT 2003 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=53904 
>Unformatted:
