cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Fix conflict & lib links

Browse Source 
- Bump PORTREVISION

PR:		ports/168824
Submitted by:	John Hein <jhein@symmetricom.com> (maintainer)
This commit is contained in:
Michael Scheidell 2012-06-29 19:14:08 +00:00
parent b2a1aaa839
commit c8dae3eaff
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=300224
3 changed files with 43 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
astro/gpstk/Makefile
View File

@ -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

40
astro/gpstk/files/patch-scale Normal file
View File

@ -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 ;

2
astro/gpstk/pkg-plist
View File

@ -74,7 +74,7 @@ bin/rnwdiff
bin/rowcheck
bin/rowdiff
bin/rstats
bin/scale
bin/scale-gpstk
bin/sp3version
bin/svvis
bin/tallandev