From nobody@FreeBSD.org  Mon Jan  2 17:32:10 2012
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 7EA57106567A
	for <freebsd-gnats-submit@FreeBSD.org>; Mon,  2 Jan 2012 17:32:10 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id 6E21B8FC17
	for <freebsd-gnats-submit@FreeBSD.org>; Mon,  2 Jan 2012 17:32:10 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.4/8.14.4) with ESMTP id q02HW9os072243
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 2 Jan 2012 17:32:09 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.4/8.14.4/Submit) id q02HW9g1072242;
	Mon, 2 Jan 2012 17:32:09 GMT
	(envelope-from nobody)
Message-Id: <201201021732.q02HW9g1072242@red.freebsd.org>
Date: Mon, 2 Jan 2012 17:32:09 GMT
From: Dmitriy Limonov <earl1k@mail.ru>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [Update] net-p2p/ncdc to 1.7
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         163785
>Category:       ports
>Synopsis:       [Update] net-p2p/ncdc to 1.7
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    jgh
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jan 02 17:40:08 UTC 2012
>Closed-Date:    Fri Jan 06 17:31:50 UTC 2012
>Last-Modified:  Fri Jan 06 17:31:50 UTC 2012
>Originator:     Dmitriy Limonov
>Release:        FreeBSD 8.2-RELEASE-p5 amd64
>Organization:
>Environment:
FreeBSD excluzive.ws 8.2-RELEASE-p5 FreeBSD 8.2-RELEASE-p5 #0: Sun Dec 25 09:12:20 MSK 2011 earl@excluzive.ws:/usr/obj/usr/src/sys/EXCLUZIVE amd64
>Description:
Update ncdc to version 1.7
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -Naur ncdc.orig/Makefile ncdc/Makefile
--- ncdc.orig/Makefile	2011-12-26 21:37:42.000000000 +0400
+++ ncdc/Makefile	2012-01-02 21:18:49.050985521 +0400
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ncdc
-PORTVERSION=	1.6
+PORTVERSION=	1.7
 CATEGORIES=	net-p2p
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://dev.yorhel.nl/download/
@@ -33,15 +33,17 @@
 
 .include <bsd.port.options.mk>
 
+pre-patch:
+	@${REINPLACE_CMD} \
+		-e 's/\(GRegex \*nand\[fl_.*\)\]/\1+1]/' \
+		${WRKSRC}/src/fl_util.c
+
 .if defined(WITH_GDBM)
 LIB_DEPENDS+=	gdbm:${PORTSDIR}/databases/gdbm
 PLIST_FILES+=	bin/ncdc-db-upgrade
 .else
 post-patch:
 	@${REINPLACE_CMD} \
-		-e '/#include <gdbm.h>/d' \
-		${WRKSRC}/src/fl_local.c
-	@${REINPLACE_CMD} \
 		-e '/have_gdbm=yes/d' \
 		${WRKSRC}/configure
 .endif
diff -Naur ncdc.orig/distinfo ncdc/distinfo
--- ncdc.orig/distinfo	2011-12-26 21:37:42.000000000 +0400
+++ ncdc/distinfo	2012-01-02 20:54:24.826056070 +0400
@@ -1,2 +1,2 @@
-SHA256 (ncdc-1.6.tar.gz) = 13d898455c5892364ff0769be76cc5fb188a801b08ba3a646e0ecf217db6ddfc
-SIZE (ncdc-1.6.tar.gz) = 304918
+SHA256 (ncdc-1.7.tar.gz) = 5198a88d797bcd246e9d33080b9e07ce747fd14e5146902175055676b6d8145f
+SIZE (ncdc-1.7.tar.gz) = 309915


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->jgh 
Responsible-Changed-By: jgh 
Responsible-Changed-When: Mon Jan 2 20:50:47 UTC 2012 
Responsible-Changed-Why:  
I'll take this 

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

From: Jason Helfman <jgh@FreeBSD.org>
To: Dmitriy Limonov <earl1k@mail.ru>
Cc: bug-followup@freebsd.org
Subject: Re: ports/163785: [Update] net-p2p/ncdc to 1.7
Date: Wed, 4 Jan 2012 12:24:26 -0800

 Any reason why the REINPLACE block can't be put into a post-patch target?
 
 Thanks!
 -jgh
 -- 
 Jason Helfman         | FreeBSD Committer
 jgh@FreeBSD.org       | http://people.freebsd.org/~jgh

From: EARL <earl1k@mail.ru>
To: bug-followup@FreeBSD.org, jgh@FreeBSD.org
Cc:  
Subject: Re: ports/163785: [Update] net-p2p/ncdc to 1.7
Date: Thu, 05 Jan 2012 11:42:48 +0400

 This is a multi-part message in MIME format.
 --------------000304030206050104090902
 Content-Type: text/plain; charset=UTF-8; format=flowed
 Content-Transfer-Encoding: 7bit
 
 Ohh.. Sorry, you are right.  You can use  this patch file for commit port.
 
 
 --------------000304030206050104090902
 Content-Type: text/plain;
  name="patch.txt"
 Content-Transfer-Encoding: base64
 Content-Disposition: attachment;
  filename="patch.txt"
 
 ZGlmZiAtTmF1ciBuY2RjLm9yaWcvTWFrZWZpbGUgbmNkYy9NYWtlZmlsZQotLS0gbmNkYy5v
 cmlnL01ha2VmaWxlCTIwMTEtMTItMjYgMjE6Mzc6NDIuMDAwMDAwMDAwICswNDAwCisrKyBu
 Y2RjL01ha2VmaWxlCTIwMTItMDEtMDUgMTE6MDE6MTkuNjI3ODI2Njc4ICswNDAwCkBAIC02
 LDcgKzYsNyBAQAogIwogCiBQT1JUTkFNRT0JbmNkYwotUE9SVFZFUlNJT049CTEuNgorUE9S
 VFZFUlNJT049CTEuNwogQ0FURUdPUklFUz0JbmV0LXAycAogTUFTVEVSX1NJVEVTPQkke01B
 U1RFUl9TSVRFX1NPVVJDRUZPUkdFfSBcCiAJCWh0dHA6Ly9kZXYueW9yaGVsLm5sL2Rvd25s
 b2FkLwpAQCAtMzYsMTEgKzM2LDEzIEBACiAuaWYgZGVmaW5lZChXSVRIX0dEQk0pCiBMSUJf
 REVQRU5EUys9CWdkYm06JHtQT1JUU0RJUn0vZGF0YWJhc2VzL2dkYm0KIFBMSVNUX0ZJTEVT
 Kz0JYmluL25jZGMtZGItdXBncmFkZQotLmVsc2UKKy5lbmRpZgorCiBwb3N0LXBhdGNoOgog
 CUAke1JFSU5QTEFDRV9DTUR9IFwKLQkJLWUgJy8jaW5jbHVkZSA8Z2RibS5oPi9kJyBcCi0J
 CSR7V1JLU1JDfS9zcmMvZmxfbG9jYWwuYworCQktZSAncy9cKEdSZWdleCBcKm5hbmRcW2Zs
 Xy4qXClcXS9cMSsxXS8nIFwKKwkJJHtXUktTUkN9L3NyYy9mbF91dGlsLmMKKy5pZiBkZWZp
 bmVkKFdJVEhPVVRfR0RCTSkKIAlAJHtSRUlOUExBQ0VfQ01EfSBcCiAJCS1lICcvaGF2ZV9n
 ZGJtPXllcy9kJyBcCiAJCSR7V1JLU1JDfS9jb25maWd1cmUKZGlmZiAtTmF1ciBuY2RjLm9y
 aWcvZGlzdGluZm8gbmNkYy9kaXN0aW5mbwotLS0gbmNkYy5vcmlnL2Rpc3RpbmZvCTIwMTEt
 MTItMjYgMjE6Mzc6NDIuMDAwMDAwMDAwICswNDAwCisrKyBuY2RjL2Rpc3RpbmZvCTIwMTIt
 MDEtMDIgMjA6NTQ6MjQuODI2MDU2MDcwICswNDAwCkBAIC0xLDIgKzEsMiBAQAotU0hBMjU2
 IChuY2RjLTEuNi50YXIuZ3opID0gMTNkODk4NDU1YzU4OTIzNjRmZjA3NjliZTc2Y2M1ZmIx
 ODhhODAxYjA4YmEzYTY0NmUwZWNmMjE3ZGI2ZGRmYwotU0laRSAobmNkYy0xLjYudGFyLmd6
 KSA9IDMwNDkxOAorU0hBMjU2IChuY2RjLTEuNy50YXIuZ3opID0gNTE5OGE4OGQ3OTdiY2Qy
 NDZlOWQzMzA4MGI5ZTA3Y2U3NDdmZDE0ZTUxNDY5MDIxNzUwNTU2NzZiNmQ4MTQ1ZgorU0la
 RSAobmNkYy0xLjcudGFyLmd6KSA9IDMwOTkxNQo=
 --------------000304030206050104090902--

From: Jason Helfman <jgh@FreeBSD.org>
To: EARL <earl1k@mail.ru>
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/163785: [Update] net-p2p/ncdc to 1.7
Date: Thu, 5 Jan 2012 00:01:32 -0800

 --PNTmBPCT7hxwcZjr
 Content-Type: text/plain; charset=us-ascii; format=flowed
 Content-Disposition: inline
 
 I'm confused, as this patch differs from your original. Please see the
 attached patched for what I am proposing.
 
 Thanks,
 Jason
 
 -- 
 Jason Helfman         | FreeBSD Committer
 jgh@FreeBSD.org       | http://people.freebsd.org/~jgh
 
 --PNTmBPCT7hxwcZjr
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: attachment; filename="patch.txt"
 
 Index: Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/net-p2p/ncdc/Makefile,v
 retrieving revision 1.2
 diff -u -r1.2 Makefile
 --- Makefile	26 Dec 2011 17:37:42 -0000	1.2
 +++ Makefile	5 Jan 2012 08:00:30 -0000
 @@ -6,7 +6,7 @@
  #
  
  PORTNAME=	ncdc
 -PORTVERSION=	1.6
 +PORTVERSION=	1.7
  CATEGORIES=	net-p2p
  MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
  		http://dev.yorhel.nl/download/
 @@ -33,15 +33,17 @@
  
  .include <bsd.port.options.mk>
  
 +post-patch:
 +	@${REINPLACE_CMD} \
 +		-e 's/\(GRegex \*nand\[fl_.*\)\]/\1+1]/' \
 +		${WRKSRC}/src/fl_util.c
 +
  .if defined(WITH_GDBM)
  LIB_DEPENDS+=	gdbm:${PORTSDIR}/databases/gdbm
  PLIST_FILES+=	bin/ncdc-db-upgrade
  .else
  post-patch:
  	@${REINPLACE_CMD} \
 -		-e '/#include <gdbm.h>/d' \
 -		${WRKSRC}/src/fl_local.c
 -	@${REINPLACE_CMD} \
  		-e '/have_gdbm=yes/d' \
  		${WRKSRC}/configure
  .endif
 Index: distinfo
 ===================================================================
 RCS file: /home/pcvs/ports/net-p2p/ncdc/distinfo,v
 retrieving revision 1.2
 diff -u -r1.2 distinfo
 --- distinfo	26 Dec 2011 17:37:42 -0000	1.2
 +++ distinfo	5 Jan 2012 08:00:30 -0000
 @@ -1,2 +1,2 @@
 -SHA256 (ncdc-1.6.tar.gz) = 13d898455c5892364ff0769be76cc5fb188a801b08ba3a646e0ecf217db6ddfc
 -SIZE (ncdc-1.6.tar.gz) = 304918
 +SHA256 (ncdc-1.7.tar.gz) = 5198a88d797bcd246e9d33080b9e07ce747fd14e5146902175055676b6d8145f
 +SIZE (ncdc-1.7.tar.gz) = 309915
 
 --PNTmBPCT7hxwcZjr--

From: Jason Helfman <jgh@FreeBSD.org>
To: EARL <earl1k@mail.ru>
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/163785: [Update] net-p2p/ncdc to 1.7
Date: Thu, 5 Jan 2012 00:07:32 -0800

 On Thu, Jan 05, 2012 at 11:42:48AM +0400, EARL thus spake:
 >Ohh.. Sorry, you are right.  You can use  this patch file for commit port.
 
 I had misread this. I will review this.
 Thanks!
 
 -- 
 Jason Helfman         | FreeBSD Committer
 jgh@FreeBSD.org       | http://people.freebsd.org/~jgh

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/163785: commit references a PR
Date: Fri,  6 Jan 2012 17:26:04 +0000 (UTC)

 jgh         2012-01-06 17:25:50 UTC
 
   FreeBSD ports repository
 
   Modified files:
     net-p2p/ncdc         Makefile distinfo 
   Log:
   - Update to 1.7
   - adjust patch target
   
   PR:             ports/163785
   Submitted by:   maintainer, Dmitriy Limonov <earl1k at mail.ru>
   Approved by:    crees (mentor)
   
   Revision  Changes    Path
   1.3       +6 -4      ports/net-p2p/ncdc/Makefile
   1.3       +2 -2      ports/net-p2p/ncdc/distinfo
 _______________________________________________
 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"
 
State-Changed-From-To: open->closed 
State-Changed-By: jgh 
State-Changed-When: Fri Jan 6 17:31:47 UTC 2012 
State-Changed-Why:  
Committed. Thanks! 

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