FreeBSD Bugzilla – Attachment 125232 Details for
Bug 168824
[PATCH] astro/gpstk: fix conflict & lib links
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
gpstk-1.7_1.patch
gpstk-1.7_1.patch (text/plain), 2.36 KB, created by
John Hein
on 2012-06-07 21:30:18 UTC
(
hide
)
Description:
gpstk-1.7_1.patch
Filename:
MIME Type:
Creator:
John Hein
Created:
2012-06-07 21:30:18 UTC
Size:
2.36 KB
patch
obsolete
>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 ;
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 168824
: 125232