diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2014-06-04 22:10:18 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2014-06-04 22:10:18 +0000 |
| commit | aabf7966f681581c47cc971c305c703bc8d597e5 (patch) | |
| tree | 8de74c724bcf03eaee6473c6d8c1cc3a85ef7359 | |
| parent | cd3820ee778c362d86788d87fbde8bdfd948c4cf (diff) | |
| download | ports-aabf7966f681581c47cc971c305c703bc8d597e5.tar.gz ports-aabf7966f681581c47cc971c305c703bc8d597e5.zip | |
Notes
| -rw-r--r-- | www/cocoon/Makefile | 19 | ||||
| -rw-r--r-- | www/cocoon/files/message-advanced.in | 2 |
2 files changed, 6 insertions, 15 deletions
diff --git a/www/cocoon/Makefile b/www/cocoon/Makefile index 17e33da9cf3c..57c48794db30 100644 --- a/www/cocoon/Makefile +++ b/www/cocoon/Makefile @@ -13,7 +13,7 @@ COMMENT= XML Web Development Framework USE_RC_SUBR= ${PORTNAME} USE_JAVA= yes -JAVA_VERSION= 1.6+ +JAVA_VERSION= 1.6 USE_PYTHON= yes MAKE_ENV= JAVA_HOME=${JAVA_HOME} WRKSRC= ${WRKDIR}/${PDISTNAME} @@ -61,7 +61,6 @@ SUB_FILES= \ message-advanced # Load options (before including bsd.port.pre.mk) -NO_STAGE= yes .include "${.CURDIR}/Makefile.options" .include <bsd.port.pre.mk> @@ -128,19 +127,11 @@ pre-install: do-install: @${ECHO_MSG} "===> Installing ${COPYDIRS}" - @${MKDIR} ${APP_HOME} - @cd ${WRKSRC} && ${FIND} -H ${COPYDIRS} | ${CPIO} -pdmuL -R ${LIBOWN}:${LIBGRP} ${APP_HOME} - @${INSTALL} ${WRKDIR}/upstreams-cocoon.sh ${APP_HOME}/cocoon.sh + @${MKDIR} ${STAGEDIR}${APP_HOME} + @cd ${WRKSRC} && ${FIND} -H ${COPYDIRS} | ${CPIO} -pdmuL -R ${LIBOWN}:${LIBGRP} ${STAGEDIR}${APP_HOME} + @${INSTALL} ${WRKDIR}/upstreams-cocoon.sh ${STAGEDIR}${APP_HOME}/cocoon.sh @${ECHO_MSG} "===> Installing into ${PREFIX}/sbin" - @${INSTALL_SCRIPT} ${WRKDIR}/${APP_NAME}ctl ${PREFIX}/sbin - -post-install: - @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL - @${ECHO_CMD} - @${ECHO_CMD} "********************************************************************************" - @${CAT} ${PKGMESSAGE} - @${ECHO_CMD} "********************************************************************************" - @${ECHO_CMD} + @${INSTALL_SCRIPT} ${WRKDIR}/${APP_NAME}ctl ${STAGEDIR}${PREFIX}/sbin .include <bsd.port.post.mk> diff --git a/www/cocoon/files/message-advanced.in b/www/cocoon/files/message-advanced.in index 60f676a9c59a..868b590b6e2e 100644 --- a/www/cocoon/files/message-advanced.in +++ b/www/cocoon/files/message-advanced.in @@ -19,5 +19,5 @@ If you need to pass special options to Java, please set the To specify the java version to use, please use %%APP_NAME%%_java_version: - %%APP_NAME%%_java_version="1.4" + %%APP_NAME%%_java_version="1.6" |