diff options
| author | stefan <stefan@FreeBSD.org> | 2006-08-28 18:40:20 +0000 |
|---|---|---|
| committer | stefan <stefan@FreeBSD.org> | 2006-08-28 18:40:20 +0000 |
| commit | 7711d8e0bb51d41505ed664b1b34f18e89bf4f1c (patch) | |
| tree | 8a915adb5d0fb393953e97ade2e55c289d6ab681 /textproc | |
| parent | 489cb9fe8251fe5323bcc5ea067d724f7cd9759c (diff) | |
| download | FreeBSD-ports-7711d8e0bb51d41505ed664b1b34f18e89bf4f1c.zip FreeBSD-ports-7711d8e0bb51d41505ed664b1b34f18e89bf4f1c.tar.gz | |
- Update to bsd.java.mk 2.0
- Install JAR in ${JAVASHAREDIR}/${PORTNAME} (${JAVAJARDIR} is for JAR
libraries used by other ports)
- Register an explicit dependency on java/javavmwrapper
- Set JAVA_VERSION in the launcher script so that a correct JVM is chosen
- Use 'exec' to launch JVM (as encouraged in the Porter's Handbook)
- Use SUB_FILES to build the launcher script (some substitutions are provided by
default, such as %%JAVA_VERSION%%)
- Add $FreeBSD$ tags
- Bump PORTREVISION because of packing list changes
PR: 102193
Submitted by: Herve Quiroz <hq@freebsd.org>
Diffstat (limited to 'textproc')
| -rw-r--r-- | textproc/ppower4/Makefile | 20 | ||||
| -rw-r--r-- | textproc/ppower4/files/ppower4 | 4 | ||||
| -rw-r--r-- | textproc/ppower4/files/ppower4.sh.in | 4 | ||||
| -rw-r--r-- | textproc/ppower4/pkg-plist | 1 |
4 files changed, 14 insertions, 15 deletions
diff --git a/textproc/ppower4/Makefile b/textproc/ppower4/Makefile index 50d04ae..90cead0 100644 --- a/textproc/ppower4/Makefile +++ b/textproc/ppower4/Makefile @@ -7,7 +7,7 @@ PORTNAME= ppower4 PORTVERSION= 0.9.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc java MASTER_SITES= ${MASTER_SITE_TEX_CTAN} MASTER_SITE_SUBDIR= support/${PORTNAME} @@ -18,15 +18,16 @@ EXTRACT_ONLY= pp4sty.zip leveldemo.zip MAINTAINER= stefan@FreeBSD.org COMMENT= Post processor for PDF presentations made with (La)TeX -RUN_DEPENDS= latex:${PORTSDIR}/print/teTeX +RUN_DEPENDS= latex:${PORTSDIR}/print/teTeX \ + java:${PORTSDIR}/java/javavmwrapper USE_ZIP= yes -USE_JAVA= 1.3+ +USE_JAVA= yes +JAVA_VERSION= 1.3+ NO_BUILD= yes -NO_BUILD_DEPENDS_JAVA= yes NO_WRKSUBDIR= yes -JAR_DIR= ${JAVAJARDIR}/${PORTNAME} +JAR_DIR= ${JAVASHAREDIR}/${PORTNAME} STY_DIR= ${PREFIX}/share/texmf/tex/latex/${PORTNAME} STY_FILES= ${WRKDIR}/pause.sty ${WRKDIR}/background.sty \ ${WRKDIR}/pp4link.sty ${WRKDIR}/mpmulti.sty @@ -37,11 +38,8 @@ EXAMPLE_FILES+= ${WRKDIR}/example.${i} PLIST_SUB= STY_DIR="${STY_DIR:S,^${PREFIX}/,,}" \ JAR_DIR="${JAR_DIR:S,^${PREFIX}/,,}" -post-patch: -# prepare wrapper script - @${SED} -e "s,%%JAVAVM%%,${LOCALBASE}/bin/javavm,; \ - s,%%JARFILE%%,${JAR_DIR}/pp4p.jar," \ - ${FILESDIR}/ppower4 > ${WRKDIR}/ppower4 +SUB_FILES= ppower4.sh +SUB_LIST= JARFILE=${JAR_DIR}/pp4p.jar do-install: # install docs? @@ -59,7 +57,7 @@ do-install: @${MKDIR} ${JAR_DIR} @${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/pp4p.jar ${JAR_DIR} # install wrapper script - @${INSTALL_SCRIPT} ${WRKDIR}/ppower4 ${PREFIX}/bin/ppower4 + @${INSTALL_SCRIPT} ${WRKDIR}/ppower4.sh ${PREFIX}/bin/ppower4 post-install: ${SETENV} LOCALBASE=${LOCALBASE} PKG_PREFIX=${PREFIX} \ diff --git a/textproc/ppower4/files/ppower4 b/textproc/ppower4/files/ppower4 deleted file mode 100644 index 9ea832a..0000000 --- a/textproc/ppower4/files/ppower4 +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -JAVAVM_CALL="%%JAVAVM%%" -JARFILE="%%JARFILE%%" -${JAVAVM_CALL} -jar ${JARFILE} "$@" diff --git a/textproc/ppower4/files/ppower4.sh.in b/textproc/ppower4/files/ppower4.sh.in new file mode 100644 index 0000000..4336fce --- /dev/null +++ b/textproc/ppower4/files/ppower4.sh.in @@ -0,0 +1,4 @@ +#!/bin/sh +# $FreeBSD$ + +JAVA_VERSION="%%JAVA_VERSION%%" exec "%%LOCALBASE%%/bin/java" -jar "%%JARFILE%%" "$@" diff --git a/textproc/ppower4/pkg-plist b/textproc/ppower4/pkg-plist index 361bb08..b9ab181 100644 --- a/textproc/ppower4/pkg-plist +++ b/textproc/ppower4/pkg-plist @@ -1,3 +1,4 @@ +@comment $FreeBSD$ bin/ppower4 %%PORTDOCS%%%%DOCSDIR%%/manual.pdf %%PORTDOCS%%%%EXAMPLESDIR%%/leveldemo.tex |
