From nobody@FreeBSD.org  Fri Jun 14 07:12:04 2013
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
	by hub.freebsd.org (Postfix) with ESMTP id D1FDEA9B
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 14 Jun 2013 07:12:04 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from oldred.freebsd.org (oldred.freebsd.org [8.8.178.121])
	by mx1.freebsd.org (Postfix) with ESMTP id C34911715
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 14 Jun 2013 07:12:04 +0000 (UTC)
Received: from oldred.freebsd.org ([127.0.1.6])
	by oldred.freebsd.org (8.14.5/8.14.7) with ESMTP id r5E7C3jC055805
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 14 Jun 2013 07:12:03 GMT
	(envelope-from nobody@oldred.freebsd.org)
Received: (from nobody@localhost)
	by oldred.freebsd.org (8.14.5/8.14.5/Submit) id r5E7C3YN055804;
	Fri, 14 Jun 2013 07:12:03 GMT
	(envelope-from nobody)
Message-Id: <201306140712.r5E7C3YN055804@oldred.freebsd.org>
Date: Fri, 14 Jun 2013 07:12:03 GMT
From: Alexey Markov <redrat@mail.ru>
To: freebsd-gnats-submit@FreeBSD.org
Subject: net/svnup: inconsistency in the $FreeBSD$ line
X-Send-Pr-Version: www-3.1
X-GNATS-Notify: jcm@visi.com

>Number:         179548
>Category:       ports
>Synopsis:       net/svnup: inconsistency in the $FreeBSD$ line
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    jgh
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jun 14 07:20:00 UTC 2013
>Closed-Date:    Sun Jun 16 07:08:00 UTC 2013
>Last-Modified:  Sun Jun 16 07:10:01 UTC 2013
>Originator:     Alexey Markov
>Release:        8.4-RELEASE
>Organization:
JSC Complitex
>Environment:
FreeBSD boson.zhks.kharkov.ua 8.4-RELEASE FreeBSD 8.4-RELEASE #0: Fri May 31 17:
13:48 EEST 2013 redrat@boson.zhks.kharkov.ua:/usr/obj/usr/src/sys/BOSON amd64
>Description:
There is some inconsistency between svnup and release infrastructure of project concerning processing the $FreeBSD$ line in the head of source files: for example, for root Makefile in the 8.4-RELEASE source svnup changes this line to "$FreeBSD: base/release/8.4.0/Makefile 247537 2013-03-01 09:39:29Z des $", while in the distributed release this line looks like "$FreeBSD: release/8.4.0/Makefile 247537 2013-03-01 09:39:29Z des $".

It makes no difference for building the world or kernel, but very inconvenient for updating config files in the /etc (and running mergemaster generally).

I think it should be a uniform pattern for this line to use by svnup and release infrastructure of the project. Maybe an option for svnup to omit the "base/" part in this line?
>How-To-Repeat:
Get the sources for 8.4-RELEASE by svnup and compare it with sources from distribution media.
>Fix:


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->jgh 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Fri Jun 14 07:20:08 UTC 2013 
Responsible-Changed-Why:  
jgh@ wants this port PRs (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=179548 
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Fri Jun 14 07:20:10 UTC 2013 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

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

From: Edwin Groothuis <edwin@FreeBSD.org>
To: jcm@visi.com
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/179548: net/svnup: inconsistency in the $FreeBSD$ line
Date: Fri, 14 Jun 2013 07:20:09 UT

 Maintainer of net/svnup,
 
 Please note that PR ports/179548 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/179548
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org
State-Changed-From-To: feedback->closed 
State-Changed-By: jgh 
State-Changed-When: Sun Jun 16 07:07:59 UTC 2013 
State-Changed-Why:  
fixed in r321024 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/179548: commit references a PR
Date: Sun, 16 Jun 2013 07:07:25 +0000 (UTC)

 Author: jgh
 Date: Sun Jun 16 07:07:17 2013
 New Revision: 321024
 URL: http://svnweb.freebsd.org/changeset/ports/321024
 
 Log:
   - update to 0.95
   
   svnup-0.95 - 15 June 2013
   - Fixed a bug with the $FreeBSD$ line (pr ports/179548)
   - Fixed a bug where local files were not being removed when using
     the -t option.
   
   PR:		179548
   Reported by:	redrat@mail.ru
   Submitted by:	jcm@visi.com (maintainer)
 
 Modified:
   head/net/svnup/Makefile
   head/net/svnup/distinfo
 
 Modified: head/net/svnup/Makefile
 ==============================================================================
 --- head/net/svnup/Makefile	Sun Jun 16 05:49:15 2013	(r321023)
 +++ head/net/svnup/Makefile	Sun Jun 16 07:07:17 2013	(r321024)
 @@ -1,7 +1,7 @@
  # $FreeBSD$
  
  PORTNAME=	svnup
 -PORTVERSION=	0.90
 +PORTVERSION=	0.95
  CATEGORIES=	net
  MASTER_SITES=	http://jcm.dsl.visi.com/freebsd/svnup/ \
  		LOCAL/jgh/net/${PORTNAME}/
 
 Modified: head/net/svnup/distinfo
 ==============================================================================
 --- head/net/svnup/distinfo	Sun Jun 16 05:49:15 2013	(r321023)
 +++ head/net/svnup/distinfo	Sun Jun 16 07:07:17 2013	(r321024)
 @@ -1,2 +1,2 @@
 -SHA256 (svnup-0.90.tar.xz) = 766d5caedd500430c8595dd2f0a0c0024137138a68e1002ece9083c122179caa
 -SIZE (svnup-0.90.tar.xz) = 18068
 +SHA256 (svnup-0.95.tar.xz) = 03fad644168b0aa514cf9b6e955d8ac8ca9dee5d55a3b6dece40c206aae66430
 +SIZE (svnup-0.95.tar.xz) = 18120
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/179548: commit references a PR
Date: Sun, 16 Jun 2013 07:07:25 +0000 (UTC)

 Author: jgh
 Date: Sun Jun 16 07:07:17 2013
 New Revision: 321024
 URL: http://svnweb.freebsd.org/changeset/ports/321024
 
 Log:
   - update to 0.95
   
   svnup-0.95 - 15 June 2013
   - Fixed a bug with the $FreeBSD$ line (pr ports/179548)
   - Fixed a bug where local files were not being removed when using
     the -t option.
   
   PR:		179548
   Reported by:	redrat@mail.ru
   Submitted by:	jcm@visi.com (maintainer)
 
 Modified:
   head/net/svnup/Makefile
   head/net/svnup/distinfo
 
 Modified: head/net/svnup/Makefile
 ==============================================================================
 --- head/net/svnup/Makefile	Sun Jun 16 05:49:15 2013	(r321023)
 +++ head/net/svnup/Makefile	Sun Jun 16 07:07:17 2013	(r321024)
 @@ -1,7 +1,7 @@
  # $FreeBSD$
  
  PORTNAME=	svnup
 -PORTVERSION=	0.90
 +PORTVERSION=	0.95
  CATEGORIES=	net
  MASTER_SITES=	http://jcm.dsl.visi.com/freebsd/svnup/ \
  		LOCAL/jgh/net/${PORTNAME}/
 
 Modified: head/net/svnup/distinfo
 ==============================================================================
 --- head/net/svnup/distinfo	Sun Jun 16 05:49:15 2013	(r321023)
 +++ head/net/svnup/distinfo	Sun Jun 16 07:07:17 2013	(r321024)
 @@ -1,2 +1,2 @@
 -SHA256 (svnup-0.90.tar.xz) = 766d5caedd500430c8595dd2f0a0c0024137138a68e1002ece9083c122179caa
 -SIZE (svnup-0.90.tar.xz) = 18068
 +SHA256 (svnup-0.95.tar.xz) = 03fad644168b0aa514cf9b6e955d8ac8ca9dee5d55a3b6dece40c206aae66430
 +SIZE (svnup-0.95.tar.xz) = 18120
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
