From c8dae3eaff2980d44f97da32f390cfa35192124c Mon Sep 17 00:00:00 2001 From: Michael Scheidell Date: Fri, 29 Jun 2012 19:14:08 +0000 Subject: [PATCH] - Fix conflict & lib links - Bump PORTREVISION PR: ports/168824 Submitted by: John Hein (maintainer) --- astro/gpstk/Makefile | 3 ++- astro/gpstk/files/patch-scale | 40 +++++++++++++++++++++++++++++++++++ astro/gpstk/pkg-plist | 2 +- 3 files changed, 43 insertions(+), 2 deletions(-) create mode 100644 astro/gpstk/files/patch-scale diff --git a/astro/gpstk/Makefile b/astro/gpstk/Makefile index 152d189929ca..64d223befd58 100644 --- a/astro/gpstk/Makefile +++ b/astro/gpstk/Makefile @@ -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 --git a/astro/gpstk/files/patch-scale b/astro/gpstk/files/patch-scale new file mode 100644 index 000000000000..4a9baf74b2e4 --- /dev/null +++ b/astro/gpstk/files/patch-scale @@ -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 ; \ No newline at end of file diff --git a/astro/gpstk/pkg-plist b/astro/gpstk/pkg-plist index bb4c602dca4c..e6fffdddc087 100644 --- a/astro/gpstk/pkg-plist +++ b/astro/gpstk/pkg-plist @@ -74,7 +74,7 @@ bin/rnwdiff bin/rowcheck bin/rowdiff bin/rstats -bin/scale +bin/scale-gpstk bin/sp3version bin/svvis bin/tallandev