From 1cec52af7ba6437d30499555a5179925a610aa6a Mon Sep 17 00:00:00 2001 From: bapt Date: Thu, 6 Feb 2014 07:25:16 +0000 Subject: Support stage --- java/javavmwrapper/Makefile | 37 +++++++++++-------------------------- java/javavmwrapper/pkg-plist | 7 +++++++ 2 files changed, 18 insertions(+), 26 deletions(-) diff --git a/java/javavmwrapper/Makefile b/java/javavmwrapper/Makefile index 3bb59487a78e..fc4ef860f800 100644 --- a/java/javavmwrapper/Makefile +++ b/java/javavmwrapper/Makefile @@ -18,19 +18,12 @@ NO_WRKSUBDIR= yes PKGINSTALL= ${WRKDIR}/pkg-install -MAN1= checkvms.1 javavm.1 manvm.1 registervm.1 unregistervm.1 -MAN5= javavm_opts.conf.5 javavms.5 - SRC= ${.CURDIR}/src SCRIPTS= classpath javavmwrapper # This is normally defined by bsd.java.mk when USE_JAVA is defined, but # we can't do that here since it would result in a circular dependency JAVALIBDIR= ${LOCALBASE}/share/java/classes -NO_STAGE= yes -do-fetch: - @${DO_NADA} - do-configure: .for _script in ${SCRIPTS} ${SED} -e 's|%%PREFIX%%|${PREFIX}|;' \ @@ -39,7 +32,7 @@ do-configure: .endfor ${SED} -e 's|%%LOCALBASE%%|${LOCALBASE}|;' \ ${FILESDIR}/pkg-install.in > ${PKGINSTALL} -.for _man in checkvms.1 javavm.1 manvm.1 registervm.1 ${MAN5} +.for _man in checkvms.1 javavm.1 manvm.1 registervm.1 javavm_opts.conf.5 javavms.5 ${SED} -e 's|%%PREFIX%%|${PREFIX}|;' \ -e 's|%%LOCALBASE%%|${LOCALBASE}|;' \ -e 's|%%PORTSDIR%%|${PORTSDIR}|;' \ @@ -47,25 +40,17 @@ do-configure: .endfor do-install: - ${INSTALL_SCRIPT} ${WRKDIR}/classpath.sh ${PREFIX}/bin/classpath - ${INSTALL_SCRIPT} ${WRKDIR}/javavmwrapper.sh ${PREFIX}/bin/javavm - ${LN} -sf ${PREFIX}/bin/javavm ${PREFIX}/bin/checkvms - ${LN} -sf ${PREFIX}/bin/javavm ${PREFIX}/bin/manvm - ${LN} -sf ${PREFIX}/bin/javavm ${PREFIX}/bin/registervm - ${LN} -sf ${PREFIX}/bin/javavm ${PREFIX}/bin/unregistervm -.for _man in checkvms.1 javavm.1 manvm.1 registervm.1 - ${INSTALL_MAN} ${WRKDIR}/${_man} ${MAN1PREFIX}/man/man1 -.endfor + ${INSTALL_SCRIPT} ${WRKDIR}/classpath.sh ${STAGEDIR}${PREFIX}/bin/classpath + ${INSTALL_SCRIPT} ${WRKDIR}/javavmwrapper.sh ${STAGEDIR}${PREFIX}/bin/javavm + ${LN} -sf javavm ${STAGEDIR}${PREFIX}/bin/checkvms + ${LN} -sf javavm ${STAGEDIR}${PREFIX}/bin/manvm + ${LN} -sf javavm ${STAGEDIR}${PREFIX}/bin/registervm + ${LN} -sf javavm ${STAGEDIR}${PREFIX}/bin/unregistervm + ${INSTALL_MAN} ${WRKDIR}/*.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 ${INSTALL_MAN} ${WRKDIR}/registervm.1 \ - ${MAN1PREFIX}/man/man1/unregistervm.1 -.for _man in ${MAN5} - ${INSTALL_MAN} ${WRKDIR}/${_man} ${MAN5PREFIX}/man/man5 -.endfor + ${STAGEDIR}${MAN1PREFIX}/man/man1/unregistervm.1 + ${INSTALL_MAN} ${WRKDIR}/*.5 ${STAGEDIR}${MAN5PREFIX}/man/man5 ${INSTALL_DATA} ${FILESDIR}/javavm_opts.conf.dist \ - ${PREFIX}/etc/javavm_opts.conf.dist - -post-install: - ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} \ - POST-INSTALL + ${STAGEDIR}${PREFIX}/etc/javavm_opts.conf.dist .include diff --git a/java/javavmwrapper/pkg-plist b/java/javavmwrapper/pkg-plist index 254d0559d91a..03f8a854f67a 100644 --- a/java/javavmwrapper/pkg-plist +++ b/java/javavmwrapper/pkg-plist @@ -5,3 +5,10 @@ bin/manvm bin/registervm bin/unregistervm etc/javavm_opts.conf.dist +man/man1/checkvms.1.gz +man/man1/javavm.1.gz +man/man1/manvm.1.gz +man/man1/registervm.1.gz +man/man1/unregistervm.1.gz +man/man5/javavm_opts.conf.5.gz +man/man5/javavms.5.gz -- cgit