diff options
| author | Alexey Zelkin <phantom@FreeBSD.org> | 2005-01-29 12:19:15 +0000 |
|---|---|---|
| committer | Alexey Zelkin <phantom@FreeBSD.org> | 2005-01-29 12:19:15 +0000 |
| commit | 1c39d32f2f0d5044bbe0d330f7e3a874bc69981b (patch) | |
| tree | 5a787a48b8a048184cf3c6daf0f14e3eb46e8e84 /java/jdk15 | |
| parent | Update to 2004c1. (diff) | |
Unbreak plist generation
Notes
Notes:
svn path=/head/; revision=127599
Diffstat (limited to 'java/jdk15')
| -rw-r--r-- | java/jdk15/Makefile | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/java/jdk15/Makefile b/java/jdk15/Makefile index 5c2d7174c57d..f1d2f1ce3db8 100644 --- a/java/jdk15/Makefile +++ b/java/jdk15/Makefile @@ -25,7 +25,6 @@ BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 \ ${X11BASE}/lib/libXm.so:${PORTSDIR}/x11-toolkits/open-motif RUN_DEPENDS= javavm:${PORTSDIR}/java/javavmwrapper -PLIST= ${WRKDIR}/pkg-plist PKGINSTALL= ${WRKDIR}/pkg-install WRKSRC= ${WRKDIR}/control/make @@ -256,23 +255,21 @@ pre-install: .endif do-install: - ${RM} -f ${PLIST} - ${TOUCH} ${PLIST} ${MKDIR} ${PREFIX}/jdk${JDK_VERSION} cd ${JDKIMAGEDIR} && ${FIND} . \ | ${CPIO} -pdmu -R ${LIBOWN}:${LIBGRP} ${PREFIX}/jdk${JDK_VERSION} @${FIND} -s ${JDKIMAGEDIR} -not -type d | \ - ${SED} -ne 's#^${JDKIMAGEDIR}#jdk${JDK_VERSION}#p' >> ${PLIST} + ${SED} -ne 's#^${JDKIMAGEDIR}#jdk${JDK_VERSION}#p' >> ${TMPPLIST} .if defined(WITH_DEBUG) cd ${JDKIMAGEDIR_G} && ${FIND} . \ | ${CPIO} -pdmu -R ${LIBOWN}:${LIBGRP} ${PREFIX}/jdk${JDK_VERSION} @${FIND} -s ${JDKIMAGEDIR_G} -not -type d | \ - ${SED} -ne 's#^${JDKIMAGEDIR}#jdk${JDK_VERSION}#p' >> ${PLIST} + ${SED} -ne 's#^${JDKIMAGEDIR}#jdk${JDK_VERSION}#p' >> ${TMPPLIST} .endif @${FIND} -s -d ${PREFIX}/jdk${JDK_VERSION} -type d | \ - ${SED} -ne 's#^${PREFIX}/#@dirrm #p' >> ${PLIST} - @${ECHO_MSG} "@exec ${LOCALBASE}/bin/registervm ${PREFIX}/jdk${JDK_VERSION}/bin/java # FREEBSD-JDK${JDK_VERSION}" >> ${PLIST} - @${ECHO_MSG} "@unexec ${LOCALBASE}/bin/unregistervm ${PREFIX}/jdk${JDK_VERSION}/bin/java" >> ${PLIST} + ${SED} -ne 's#^${PREFIX}/#@dirrm #p' >> ${TMPPLIST} + @${ECHO_MSG} "@exec ${LOCALBASE}/bin/registervm ${PREFIX}/jdk${JDK_VERSION}/bin/java # FREEBSD-JDK${JDK_VERSION}" >> ${TMPPLIST} + @${ECHO_MSG} "@unexec ${LOCALBASE}/bin/unregistervm ${PREFIX}/jdk${JDK_VERSION}/bin/java" >> ${TMPPLIST} # XXX: put unregistervm into install script ? post-install: |