From jhein@symmetricom.com  Thu Jun  7 20:25:58 2012
Return-Path: <jhein@symmetricom.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id AF320106564A
	for <FreeBSD-gnats-submit@freebsd.org>; Thu,  7 Jun 2012 20:25:58 +0000 (UTC)
	(envelope-from jhein@symmetricom.com)
Received: from duck.symmetricom.us (duck.symmetricom.us [206.168.13.214])
	by mx1.freebsd.org (Postfix) with ESMTP id 7550E8FC0A
	for <FreeBSD-gnats-submit@freebsd.org>; Thu,  7 Jun 2012 20:25:58 +0000 (UTC)
Received: from gromit.timing.com (gromit.timing.com [206.168.13.209])
	by duck.symmetricom.us (8.14.5/8.14.5) with ESMTP id q57KPpMa091486;
	Thu, 7 Jun 2012 14:25:51 -0600 (MDT)
	(envelope-from jhein@symmetricom.com)
Received: from gromit.timing.com (localhost [127.0.0.1])
	by gromit.timing.com (8.14.5/8.14.5) with ESMTP id q57KPjfN042708;
	Thu, 7 Jun 2012 14:25:45 -0600 (MDT)
	(envelope-from jhein@gromit.timing.com)
Received: (from jhein@localhost)
	by gromit.timing.com (8.14.5/8.14.5/Submit) id q57KPenZ042707;
	Thu, 7 Jun 2012 14:25:40 -0600 (MDT)
	(envelope-from jhein)
Message-Id: <20433.3652.5203.966499@gromit.timing.com>
Date: Thu, 7 Jun 2012 14:25:40 -0600
From: John Hein <jhein@symmetricom.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc: jhein@symmetricom.com
Subject: [PATCH] astro/gpstk: fix conflict & lib links
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         168824
>Category:       ports
>Synopsis:       [PATCH] astro/gpstk: fix conflict & lib links
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    scheidell
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jun 07 20:30:18 UTC 2012
>Closed-Date:    Fri Jun 29 19:14:22 UTC 2012
>Last-Modified:  Fri Jun 29 19:20:06 UTC 2012
>Originator:     John Hein
>Release:        
>Organization:
>Environment:
>Description:

Fix lib link targets.

'scale' is a pretty generic name to put into bin/, especially
considering how non-generic this implementation is.
To avoid naming collisions, rename scale to scale-gpstk.
It conflicts with bin/scale in audio/csound.  Noticed by
a recent run by Sulev-Madis Silber's automated conflicts checker.

scale is an end user tool.  Nothing in the port itself uses it.
But for end users who may have used scale in their scripts
or something, they'll need to adjust.

Added file(s):
- files/patch-scale

Generated with FreeBSD Port Tools 0.99_6 (mode: change, diff: CVS)
>How-To-Repeat:
>Fix:

--- gpstk-1.7_1.patch begins here ---
Index: Makefile
===================================================================
RCS file: /base/FreeBSD-CVS/ports/astro/gpstk/Makefile,v
retrieving revision 1.15
diff -u -p -u -r1.15 Makefile
--- Makefile	29 Feb 2012 02:41:49 -0000	1.15
+++ Makefile	7 Jun 2012 19:47:34 -0000
@@ -7,6 +7,7 @@
 
 PORTNAME=	gpstk
 PORTVERSION=	1.7
+PORTREVISION=	1
 CATEGORIES=	astro devel
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-${PORTVERSION}.src
@@ -36,7 +37,7 @@ do-build:
 
 NOSTRIPFILES=	ddPlot|ordPlot  # don't strip scripts
 SHLIBS=		geodyn geomatics gpstk procframe rxio vdraw vplot
-SHLIBVER=	${PORTVERSION:C/.//g}
+SHLIBVER=	${PORTVERSION:C/\.//g}
 do-install:
 	@${MKDIR} ${PREFIX}/include/${PORTNAME}
 	cd ${WRKSRC} && ${SETENV} ${JAM_ENV} ${JAM} install
diff -uN files/patch-scale.orig files/patch-scale
--- files/patch-scale.orig	1969-12-31 17:00:00.000000000 -0700
+++ files/patch-scale	2012-06-07 13:47:35.000000000 -0600
@@ -0,0 +1,40 @@
+$FreeBSD$
+
+'scale' is a pretty generic name to put into bin/, especially
+considering how non-generic this implementation is.
+To avoid naming collisions, rename scale to scale-gpstk.
+
+--- apps/clocktools/help.orig	2011-02-22 09:10:25.000000000 -0700
++++ apps/clocktools/help	2012-06-05 15:31:51.000000000 -0600
+@@ -20,9 +20,9 @@
+ ----
+ 
+ 
+-scale - Scales fractional frequency or phase data by a factor of 10^-6
++scale-gpstk - Scales fractional frequency or phase data by a factor of 10^-6
+ 
+-example: cat data | scale > scdata
++example: cat data | scale-gpstk > scdata
+ 
+ 
+ ----
+--- apps/clocktools/Jamfile.orig	2011-02-22 09:10:25.000000000 -0700
++++ apps/clocktools/Jamfile	2012-06-05 15:32:30.000000000 -0600
+@@ -2,7 +2,7 @@
+ 
+ SubDir TOP apps clocktools ;
+ 
+-GPSLinkLibraries dallandev ffp mallandev nallandev oallandev ohadamarddev ORDPhaseParser pff rmoutlier scale tallandev TIAPhaseParser trunc : gpstk ;
++GPSLinkLibraries dallandev ffp mallandev nallandev oallandev ohadamarddev ORDPhaseParser pff rmoutlier scale-gpstk tallandev TIAPhaseParser trunc : gpstk ;
+ 
+ GPSMain dallandev : dallandev.cpp ;
+ GPSMain ffp : ffp.cpp ;
+@@ -13,7 +13,7 @@
+ GPSMain ORDPhaseParser : ORDPhaseParser.cpp ;
+ GPSMain pff : pff.cpp ;
+ GPSMain rmoutlier : rmoutlier.cpp ;
+-GPSMain scale : scale.cpp ;
++GPSMain scale-gpstk : scale.cpp ;
+ GPSMain tallandev : tallandev.cpp ;
+ GPSMain TIAPhaseParser : TIAPhaseParser.cpp ;
+ GPSMain trunc : trunc.cpp ;
--- gpstk-1.7_1.patch ends here ---
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: arved 
State-Changed-When: Fri Jun 8 12:51:14 UTC 2012 
State-Changed-Why:  
Asked for feedback 

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

From: =?UTF-8?B?VGlsbWFuIEtlc2tpbsO2eg==?= <arved@FreeBSD.org>
To: bug-followup@FreeBSD.org, jhein@symmetricom.com
Cc:  
Subject: Re: ports/168824: [PATCH] astro/gpstk: fix conflict &amp; lib links
Date: Fri, 08 Jun 2012 14:51:03 +0200

 Have you tested this?
 
 This does not work:
 
 C++ apps/visibility/CalcDOPs.o
 Link apps/visibility/CalcDOPs
 Chmod1 apps/visibility/CalcDOPs
 Install /usr/local/bin/CalcDOPs
 Chmod1 /usr/local/bin/CalcDOPs
 ...updated 1214 target(s)...
 /usr/bin/strip: '/usr/local/bin/scale-gpstk': No such file
 *** Error code 1
 
 Stop in /usr/home/arved/ports/gpstk.
 
 
 Also there is no change to the pkg-plist in your patch.
 

From: John Hein <jhein@symmetricom.com>
To: Tilman =?iso-8859-1?Q?Keskin=F6z?= <arved@FreeBSD.org>
Cc: <bug-followup@FreeBSD.org>
Subject: Re: ports/168824: [PATCH] astro/gpstk: fix conflict &amp; lib links
Date: Fri, 8 Jun 2012 08:43:09 -0600

 Tilman Keskin=F6z wrote at 14:51 +0200 on Jun  8, 2012:
  > Have you tested this=3F
    .
    .
  > /usr/bin/strip: '/usr/local/bin/scale-gpstk': No such file
 
 Yes.  On redports [1], I also have this:
 
 Index: pkg-plist
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 RCS file: /base/FreeBSD-CVS/ports/astro/gpstk/pkg-plist,v
 retrieving revision 1.5
 diff -u -p -r1.5 pkg-plist
 --- pkg-plist=0927 Feb 2012 17:39:39 -0000=091.5
 +++ pkg-plist=098 Jun 2012 14:40:24 -0000
 @@ -74,7 +74,7 @@ bin/rnwdiff
  bin/rowcheck
  bin/rowdiff
  bin/rstats
 -bin/scale
 +bin/scale-gpstk
  bin/sp3version
  bin/svvis
  bin/tallandev
 
 
 Forgot to include that in the pr.  Sorry.
 
 [1] http://redports.org/~jhein/20120606052541-42217-28005/gpstk-1.7=5F1=
 .log
Responsible-Changed-From-To: freebsd-ports-bugs->scheidell 
Responsible-Changed-By: scheidell 
Responsible-Changed-When: Fri Jun 29 17:33:07 UTC 2012 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=168824 
State-Changed-From-To: feedback->closed 
State-Changed-By: scheidell 
State-Changed-When: Fri Jun 29 19:14:21 UTC 2012 
State-Changed-Why:  
Committed. Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/168824: commit references a PR
Date: Fri, 29 Jun 2012 19:14:23 +0000 (UTC)

 scheidell    2012-06-29 19:14:09 UTC
 
   FreeBSD ports repository
 
   Modified files:
     astro/gpstk          Makefile pkg-plist 
   Added files:
     astro/gpstk/files    patch-scale 
   Log:
   - Fix conflict & lib links
   - Bump PORTREVISION
   
   PR:             ports/168824
   Submitted by:   John Hein <jhein@symmetricom.com> (maintainer)
   
   Revision  Changes    Path
   1.16      +2 -1      ports/astro/gpstk/Makefile
   1.1       +40 -0     ports/astro/gpstk/files/patch-scale (new)
   1.6       +2 -2      ports/astro/gpstk/pkg-plist
 _______________________________________________
 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:
