svn commit: r378337 - in head/graphics/mapyrus: . files

[Nicola Vitale]

Author: nivit
Date: Mon Feb  2 22:56:46 2015
New Revision: 378337
URL: https://svnweb.freebsd.org/changeset/ports/378337
QAT: https://qat.redports.org/buildarchive/r378337/

Log:
  - Update to 1.401
  - Sort variables
  - Use COPYTREE_SHARE to install examples

Modified:
  head/graphics/mapyrus/Makefile
  head/graphics/mapyrus/distinfo
  head/graphics/mapyrus/files/mapyrus.in   (contents, props changed)
  head/graphics/mapyrus/pkg-plist

Modified: head/graphics/mapyrus/Makefile
==============================================================================
--- head/graphics/mapyrus/Makefile	Mon Feb  2 22:56:02 2015	(r378336)
+++ head/graphics/mapyrus/Makefile	Mon Feb  2 22:56:46 2015	(r378337)
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	mapyrus
-PORTVERSION=	1.302
-PORTREVISION=	1
+PORTVERSION=	1.401
+PORTREVISION=	0
 CATEGORIES=	graphics print java
 MASTER_SITES=	SF
 
@@ -12,34 +12,33 @@ COMMENT=	Software for creating plots of 
 
 LICENSE=	LGPL21
 
-NO_BUILD=	yes
-NO_WRKSUBDIR=	yes
+DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 
-USE_JAVA=	yes
 JAVA_VERSION=	1.6+
-USES=		zip
-
-DATADIR=	${JAVASHAREDIR}/${PORTNAME}
-SUB_FILES=	${PORTNAME} pkg-message
-SUB_LIST=	MAPYRUSJAR=${MAPYRUSJAR}
 
-MAPYRUSJAR=	${PORTNAME}.jar
 MAPYRUSDOCS=	${PORTNAME}.pdf
+MAPYRUSJAR=	${PORTNAME}.jar
 
-FIND_DATA=	-type f -not \( -iname "copying" -or -iname "*.tex" \)
-FIND_HERE=	userdoc
+NO_BUILD=	yes
+NO_WRKSUBDIR=	yes
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
-.include <bsd.port.options.mk>
+SUB_FILES=	${PORTNAME} pkg-message
+SUB_LIST=	MAPYRUSJAR=${MAPYRUSJAR}
+
+USES=		zip
+USE_JAVA=	yes
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKDIR}/${MAPYRUSJAR} ${STAGEDIR}${DATADIR}/${MAPYRUSJAR}
 	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKDIR}/${MAPYRUSDOCS} ${STAGEDIR}${DOCSDIR}/
+	${INSTALL_DATA} ${WRKDIR}/${MAPYRUSDOCS} ${STAGEDIR}${DOCSDIR}/${MAPYRUSDOCS}
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-	cd ${WRKDIR} && ${FIND} ${FIND_HERE} ${FIND_DATA} -exec ${INSTALL_DATA} {} ${STAGEDIR}${EXAMPLESDIR} \;
+	cd ${WRKDIR}/userdoc && \
+	${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} \
+		"-type f -not -iname copying -and -not -iname *\.tex"
 
 .include <bsd.port.mk>

Modified: head/graphics/mapyrus/distinfo
==============================================================================
--- head/graphics/mapyrus/distinfo	Mon Feb  2 22:56:02 2015	(r378336)
+++ head/graphics/mapyrus/distinfo	Mon Feb  2 22:56:46 2015	(r378337)
@@ -1,2 +1,2 @@
-SHA256 (mapyrus-1.302.zip) = 51414f6a8e5696dfe347a220612306958d9ad2e9ca8d2b284d0b5dc56521c614
-SIZE (mapyrus-1.302.zip) = 5113116
+SHA256 (mapyrus-1.401.zip) = 2781f2e0d9dee943976ffb28ead144542368de81e72bc54e78445c8aad94f7d1
+SIZE (mapyrus-1.401.zip) = 5116813

Modified: head/graphics/mapyrus/files/mapyrus.in
==============================================================================
--- head/graphics/mapyrus/files/mapyrus.in	Mon Feb  2 22:56:02 2015	(r378336)
+++ head/graphics/mapyrus/files/mapyrus.in	Mon Feb  2 22:56:46 2015	(r378337)
@@ -1,5 +1,4 @@
 #!/bin/sh
-# $FreeBSD$
 if [ -z "${DISPLAY}" ]; then
     JAVA_AWT_HEADLESS="-Djava.awt.headless=true"
 else

Modified: head/graphics/mapyrus/pkg-plist
==============================================================================
--- head/graphics/mapyrus/pkg-plist	Mon Feb  2 22:56:02 2015	(r378336)
+++ head/graphics/mapyrus/pkg-plist	Mon Feb  2 22:56:46 2015	(r378337)
@@ -57,6 +57,7 @@ bin/mapyrus
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorialfirst4.mapyrus
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorialflowlabel1.mapyrus
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorialflowlabel2.mapyrus
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorialformatting1.mapyrus
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorialgeoimage1.mapyrus
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorialgeoimage2.mapyrus
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorialgeoimage3.mapyrus