diff options
| author | Nicola Vitale <nivit@FreeBSD.org> | 2014-03-30 15:43:49 +0000 |
|---|---|---|
| committer | Nicola Vitale <nivit@FreeBSD.org> | 2014-03-30 15:43:49 +0000 |
| commit | 0488fc4a351fd6bff14bac096f8451fb5df5da9b (patch) | |
| tree | f4f437b68d5de5445d8165fcc93bfb2ae13e09d2 /graphics | |
| parent | e11b73a3102093e248c107df3fe5eac574758872 (diff) | |
- Fix a typo in mapyrus script, that prevented the program to start
(bump PORTREVISION)
- Remove leading article from COMMENT
- Add support for stage dir
Notes
Notes:
svn path=/head/; revision=349638
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/mapyrus/Makefile | 31 | ||||
| -rw-r--r-- | graphics/mapyrus/files/mapyrus.in | 2 |
2 files changed, 12 insertions, 21 deletions
diff --git a/graphics/mapyrus/Makefile b/graphics/mapyrus/Makefile index e2ebf83541c7..69561af3956a 100644 --- a/graphics/mapyrus/Makefile +++ b/graphics/mapyrus/Makefile @@ -1,14 +1,14 @@ -# Created by: Nicola Vitale <nivit@email.it> +# Created by: Nicola Vitale <nivit@email.it> # $FreeBSD$ PORTNAME= mapyrus PORTVERSION= 1.302 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= graphics print java MASTER_SITES= SF MAINTAINER= nivit@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> diff --git a/graphics/mapyrus/files/mapyrus.in b/graphics/mapyrus/files/mapyrus.in index e4053295a2df..f8f8234c3a70 100644 --- a/graphics/mapyrus/files/mapyrus.in +++ b/graphics/mapyrus/files/mapyrus.in @@ -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} |