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

[Nicola Vitale]

Author: nivit
Date: Sun Mar 30 15:43:49 2014
New Revision: 349638
URL: http://svnweb.freebsd.org/changeset/ports/349638
QAT: https://qat.redports.org/buildarchive/r349638/

Log:
  - Fix a typo in mapyrus script, that prevented the program to start
    (bump PORTREVISION)
  - Remove leading article from COMMENT
  - Add support for stage dir

Modified:
  head/graphics/mapyrus/Makefile
  head/graphics/mapyrus/files/mapyrus.in

Modified: head/graphics/mapyrus/Makefile
==============================================================================
--- head/graphics/mapyrus/Makefile	Sun Mar 30 15:28:37 2014	(r349637)
+++ head/graphics/mapyrus/Makefile	Sun Mar 30 15:43:49 2014	(r349638)
@@ -1,14 +1,14 @@
-# Created by: Nicola Vitale	<nivit at email.it>
+# Created by: Nicola Vitale <nivit at email.it>
 # $FreeBSD$
 
 PORTNAME=	mapyrus
 PORTVERSION=	1.302
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	graphics print java
 MASTER_SITES=	SF
 
 MAINTAINER=	nivit at FreeBSD.org
-COMMENT=	A software for creating plots of points, lines, etc
+COMMENT=	Software for creating plots of points, lines, etc
 
 LICENSE=	LGPL21
 
@@ -21,8 +21,7 @@ USES=		zip
 
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 SUB_FILES=	${PORTNAME} pkg-message
-SUB_LIST=	JAVA_VERSION=${JAVA_VERSION} \
-		MAPYRUSJAR=${MAPYRUSJAR}
+SUB_LIST=	MAPYRUSJAR=${MAPYRUSJAR}
 
 MAPYRUSJAR=	${PORTNAME}.jar
 MAPYRUSDOCS=	${PORTNAME}.pdf
@@ -32,23 +31,15 @@ FIND_HERE=	userdoc
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 do-install:
-	${MKDIR} ${DATADIR}
-	${INSTALL_DATA} ${WRKDIR}/${MAPYRUSJAR} ${DATADIR}/${MAPYRUSJAR}
-	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin/${PORTNAME}
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKDIR}/${MAPYRUSDOCS} ${DOCSDIR}/
-.endif
-.if ${PORT_OPTIONS:MEXAMPLES}
-	${MKDIR} ${EXAMPLESDIR}
-	cd ${WRKDIR} && ${FIND} ${FIND_HERE} ${FIND_DATA} -exec ${INSTALL_DATA} {} ${EXAMPLESDIR} \;
-.endif
-
-post-install:
-	@${CAT} ${PKGMESSAGE}
+	@${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}/
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	cd ${WRKDIR} && ${FIND} ${FIND_HERE} ${FIND_DATA} -exec ${INSTALL_DATA} {} ${STAGEDIR}${EXAMPLESDIR} \;
 
 .include <bsd.port.mk>

Modified: head/graphics/mapyrus/files/mapyrus.in
==============================================================================
--- head/graphics/mapyrus/files/mapyrus.in	Sun Mar 30 15:28:37 2014	(r349637)
+++ head/graphics/mapyrus/files/mapyrus.in	Sun Mar 30 15:43:49 2014	(r349638)
@@ -10,5 +10,5 @@ if [ -z "$1" ]; then
 else
     MAPYRUS_ARGS="$@"
 fi
-JAVA_VERSION="%%JAVAVERSION%%" \
+JAVA_VERSION="%%JAVA_VERSION%%" \
 	exec "%%LOCALBASE%%/bin/java" ${JAVA_AWT_HEADLESS} -jar "%%DATADIR%%/mapyrus.jar" ${MAPYRUS_ARGS}