aboutsummaryrefslogtreecommitdiffstats
path: root/www
diff options
context:
space:
mode:
authorjkim <jkim@FreeBSD.org>2014-06-05 06:10:18 +0800
committerjkim <jkim@FreeBSD.org>2014-06-05 06:10:18 +0800
commit065b1f0ce4789a05a5a610ebb00eb3803b3455b2 (patch)
tree8de74c724bcf03eaee6473c6d8c1cc3a85ef7359 /www
parente301951c4ff7fc11c26e0d9137e1786eca6e8ef7 (diff)
downloadfreebsd-ports-gnome-065b1f0ce4789a05a5a610ebb00eb3803b3455b2.tar.gz
freebsd-ports-gnome-065b1f0ce4789a05a5a610ebb00eb3803b3455b2.tar.zst
freebsd-ports-gnome-065b1f0ce4789a05a5a610ebb00eb3803b3455b2.zip
- Do not build with JDK7 and later. This port uses deprecated JPEG classes.
- Support staging. Reported by: exp-run (PR190511)
Diffstat (limited to 'www')
-rw-r--r--www/cocoon/Makefile19
-rw-r--r--www/cocoon/files/message-advanced.in2
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"