From a4ac16c6f3ddf74681a13f7021cc85e3f3851cc3 Mon Sep 17 00:00:00 2001
From: amdmi3 <amdmi3@FreeBSD.org>
Date: Sat, 28 Sep 2013 15:31:40 +0000
Subject: - Update to r2724 - Support staging

---
 astro/mkgmap/Makefile  | 23 +++++++++++++----------
 astro/mkgmap/distinfo  |  4 ++--
 astro/mkgmap/pkg-plist |  7 -------
 3 files changed, 15 insertions(+), 19 deletions(-)
 delete mode 100644 astro/mkgmap/pkg-plist

(limited to 'astro')

diff --git a/astro/mkgmap/Makefile b/astro/mkgmap/Makefile
index d529fb5e96b6..758c9a7b96b7 100644
--- a/astro/mkgmap/Makefile
+++ b/astro/mkgmap/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mkgmap
-PORTVERSION=	r2648
+PORTVERSION=	r2724
 CATEGORIES=	astro converters java
 MASTER_SITES=	http://www.mkgmap.org.uk/download/ \
 		http://mirror.amdmi3.ru/distfiles/
@@ -10,7 +10,6 @@ MASTER_SITES=	http://www.mkgmap.org.uk/download/ \
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Convert OpenStreetMap data into a Garmin format
 
-NO_STAGE=	yes
 NO_BUILD=	yes
 
 USE_JAVA=	yes
@@ -18,20 +17,24 @@ JAVA_VERSION=	1.6+
 
 SUB_FILES=	${PORTNAME}.sh
 
+PLIST_FILES=	bin/${PORTNAME}
 PORTDOCS=	*
+PORTDATA=	*
+
+OPTIONS_DEFINE=	DOCS
+OPTIONS_DEFAULT=DOCS
 
 .include <bsd.port.options.mk>
 
 do-install:
-	${MKDIR} ${DATADIR}/lib
-	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.jar ${DATADIR}/
-	${INSTALL_DATA} ${WRKSRC}/lib/* ${DATADIR}/lib/
-	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.sh ${PREFIX}/bin/${PORTNAME}
+	${MKDIR} ${STAGEDIR}${DATADIR}/lib
+	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.jar ${STAGEDIR}${DATADIR}/
+	${INSTALL_DATA} ${WRKSRC}/lib/* ${STAGEDIR}${DATADIR}/lib/
+	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.sh ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 .if ${PORT_OPTIONS:MDOCS}
-post-install:
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}/
-	${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${DOCSDIR}/
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}/
+	${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${STAGEDIR}${DOCSDIR}/
 .endif
 
 .include <bsd.port.mk>
diff --git a/astro/mkgmap/distinfo b/astro/mkgmap/distinfo
index f904d4b47376..e9235a9f9b2f 100644
--- a/astro/mkgmap/distinfo
+++ b/astro/mkgmap/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mkgmap-r2648.tar.gz) = b5f3b8757acee845289a648761dcefedeaa14e4677ed526578e4137bcb9814a7
-SIZE (mkgmap-r2648.tar.gz) = 2751777
+SHA256 (mkgmap-r2724.tar.gz) = 7339cacdcd5231b732d8dfbbc4f9f164ac897ce9b5e6a561310198679347456e
+SIZE (mkgmap-r2724.tar.gz) = 2766415
diff --git a/astro/mkgmap/pkg-plist b/astro/mkgmap/pkg-plist
deleted file mode 100644
index f31aa0959def..000000000000
--- a/astro/mkgmap/pkg-plist
+++ /dev/null
@@ -1,7 +0,0 @@
-bin/mkgmap
-%%DATADIR%%/lib/fastutil-6.5.2-mkg.1.jar
-%%DATADIR%%/lib/osmpbf-1.1.1-754a33af.jar
-%%DATADIR%%/lib/protobuf-java-2.4.1.jar
-%%DATADIR%%/mkgmap.jar
-@dirrm %%DATADIR%%/lib
-@dirrm %%DATADIR%%
-- 
cgit