ports/102193: [PATCH] textproc/ppower4: Update to bsd.java.mk 2.0 and other improvements

[Herve Quiroz]

>Number:         102193
>Category:       ports
>Synopsis:       [PATCH] textproc/ppower4: Update to bsd.java.mk 2.0 and other improvements
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Aug 17 16:20:16 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Herve Quiroz
>Release:        FreeBSD 6.1-RELEASE-p3 i386
>Organization:
>Environment:
System: FreeBSD arabica.esil.univ-mrs.fr 6.1-RELEASE-p3 FreeBSD 6.1-RELEASE-p3 #0: Mon Jul 24 17:23:17 CEST 2006
>Description:

- 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

Added file(s):
- files/ppower4.sh.in

Removed file(s):
- files/ppower4

Port maintainer (stefan at FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:

--- ppower4-0.9.4_2.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/textproc/ppower4/Makefile,v
retrieving revision 1.5
diff -u -u -r1.5 Makefile
--- Makefile	7 May 2006 13:32:12 -0000	1.5
+++ Makefile	17 Aug 2006 16:14:50 -0000
@@ -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 @@
 MAINTAINER=	stefan at 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 @@
 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 @@
 	@${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} \
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/textproc/ppower4/pkg-plist,v
retrieving revision 1.1
diff -u -u -r1.1 pkg-plist
--- pkg-plist	10 Nov 2003 19:40:17 -0000	1.1
+++ pkg-plist	17 Aug 2006 16:14:50 -0000
@@ -1,3 +1,4 @@
+$FreeBSD$
 bin/ppower4
 %%PORTDOCS%%%%DOCSDIR%%/manual.pdf
 %%PORTDOCS%%%%EXAMPLESDIR%%/leveldemo.tex
Index: files/ppower4
===================================================================
RCS file: files/ppower4
diff -N files/ppower4
--- files/ppower4	10 Nov 2003 19:40:17 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,4 +0,0 @@
-#!/bin/sh
-JAVAVM_CALL="%%JAVAVM%%"
-JARFILE="%%JARFILE%%"
-${JAVAVM_CALL} -jar ${JARFILE} "$@"
Index: files/ppower4.sh.in
===================================================================
RCS file: files/ppower4.sh.in
diff -N files/ppower4.sh.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/ppower4.sh.in	17 Aug 2006 16:14:50 -0000
@@ -0,0 +1,4 @@
+#!/bin/sh
+# $FreeBSD$
+
+JAVA_VERSION="%%JAVA_VERSION%%" exec "%%LOCALBASE%%/bin/java" -jar "%%JARFILE%%" "$@"
--- ppower4-0.9.4_2.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: