- The project was renamed, rename port accordingly (astro/prune -> astro/gpsprune)

- Update to version 14
- OptionsNG (1)
- Trim header (1)

PR:		173817 (1)
Submitted by:	Chris Petrik <c.petrik.sosa@gmail.com>
Feature safe:	yes

7 files changed, 18 insertions, 20 deletions

diff --git a/MOVED b/MOVED
index bb3d48f1f6ee..536a840a31bb 100644
--- a/MOVED
+++ b/MOVED
@@ -3940,3 +3940,4 @@ www/jetspeed||2012-11-30|Has expired: Dead upstream
 deskutils/abacus||2012-12-03|Has expired: Dead upstream
 lang/tcl82||2012-12-03|No longer developed, no more consumers
 x11-toolkits/tk82||2012-12-03|No longer developed, no more consumers
+astro/prune|astro/gpsprune|Project was renamed
diff --git a/astro/Makefile b/astro/Makefile
index 80a0ee21faab..bec296fef8c9 100644
--- a/astro/Makefile
+++ b/astro/Makefile
@@ -27,6 +27,7 @@
     SUBDIR += gpsd
     SUBDIR += gpsdrive
     SUBDIR += gpsman
+    SUBDIR += gpsprune
     SUBDIR += gpstk
     SUBDIR += gpxloggerd
     SUBDIR += jday
@@ -80,7 +81,6 @@
     SUBDIR += phoon
     SUBDIR += planets
     SUBDIR += pp3
-    SUBDIR += prune
     SUBDIR += ptiger
     SUBDIR += py-RO
     SUBDIR += py-aipy
diff --git a/astro/prune/Makefile b/astro/gpsprune/Makefile
index 88403dff6fb3..cb49bfffb3f0 100644
--- a/astro/prune/Makefile
+++ b/astro/gpsprune/Makefile
@@ -1,14 +1,10 @@
-# New ports collection makefile for:	prune
-# Date created:		25 Jun 2009
-# Whom:			Dmitry Marakasov <amdmi3@FreeBSD.org>
-#
+# Created by: Dmitry Marakasov <amdmi3@FreeBSD.org>
 # $FreeBSD$
-#
 
-PORTNAME=	prune
-PORTVERSION=	11
+PORTNAME=	gpsprune
+PORTVERSION=	14
 CATEGORIES=	astro java
-MASTER_SITES=	http://activityworkshop.net/software/prune/ \
+MASTER_SITES=	http://activityworkshop.net/software/${PORTNAME}/ \
 		http://mirror.amdmi3.ru/distfiles/
 DISTNAME=	${PORTNAME}_${PORTVERSION}.jar
 EXTRACT_SUFX=	# empty
@@ -23,22 +19,23 @@ NO_BUILD=	yes
 USE_JAVA=	yes
 JAVA_VERSION=	1.5+
 
-SUB_FILES=	prune.sh
+SUB_FILES=	gpsprune.sh
 SUB_LIST=	JARNAME=${DISTNAME}
 
-PLIST_FILES=	bin/prune-gps-tool ${JAVAJARDIR:C,${PREFIX}/?,,}/${DISTNAME}
+PLIST_FILES=	bin/gpsprune ${JAVAJARDIR:C,${PREFIX}/?,,}/${DISTNAME}
 
-OPTIONS=	THREED "Support for 3D view of track" off
+OPTIONS_DEFINE=	JAVA3D
+JAVA3D_DESC=	Support for 3D view of track
 
 .include <bsd.port.options.mk>
 
-.if defined(WITH_THREED)
+.if ${PORT_OPTIONS:MJAVA3D}
 RUN_DEPENDS+=	java3d>=1.5.2:${PORTSDIR}/java/java3d
 .endif
 
 do-install:
 	${MKDIR} ${JAVAJARDIR}/
 	${INSTALL_DATA} ${DISTDIR}/${DISTNAME} ${JAVAJARDIR}/
-	${INSTALL_SCRIPT} ${WRKDIR}/prune.sh ${PREFIX}/bin/prune-gps-tool
+	${INSTALL_SCRIPT} ${WRKDIR}/gpsprune.sh ${PREFIX}/bin/gpsprune
 
 .include <bsd.port.mk>
diff --git a/astro/gpsprune/distinfo b/astro/gpsprune/distinfo
new file mode 100644
index 000000000000..ecd0042b9944
--- /dev/null
+++ b/astro/gpsprune/distinfo
@@ -0,0 +1,2 @@
+SHA256 (gpsprune_14.jar) = e39eadbbde65510e9d569666f31c2eb0eec40654cd00d0ba3b10bda962ad4e0d
+SIZE (gpsprune_14.jar) = 825614
diff --git a/astro/prune/files/prune.sh.in b/astro/gpsprune/files/gpsprune.sh.in
index 5a91e4813542..5a91e4813542 100644
--- a/astro/prune/files/prune.sh.in
+++ b/astro/gpsprune/files/gpsprune.sh.in
diff --git a/astro/prune/pkg-descr b/astro/gpsprune/pkg-descr
index 5c9f74be2bf6..601a5a14fc50 100644
--- a/astro/prune/pkg-descr
+++ b/astro/gpsprune/pkg-descr
@@ -1,6 +1,6 @@
-Prune is an application for viewing, editing and converting coordinate
-data from GPS systems. Basically it's a tool to let you play with
-your GPS data after you get home from your trip.
+GpsPrune is an application for viewing, editing and converting
+coordinate data from GPS systems. Basically it's a tool to let you
+play with your GPS data after you get home from your trip.
 
 It can load data from arbitrary text-based formats (for example,
 any tab-separated or comma-separated file) or Xml, or directly from
@@ -11,4 +11,4 @@ data (in various text-based formats). It can also export data as a
 Gpx file, or as Kml/Kmz for import into Google Earth, or send it
 to a GPS receiver.
 
-WWW: http://activityworkshop.net/software/prune/
+WWW: http://activityworkshop.net/software/gpsprune/
diff --git a/astro/prune/distinfo b/astro/prune/distinfo
deleted file mode 100644
index 7181043eb24f..000000000000
--- a/astro/prune/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (prune_11.jar) = d1be8333fb6b100134615048f8d6594a785f1251f56ac1d051fdd697673484a9
-SIZE (prune_11.jar) = 646959