Date: Wed, 4 Jun 2014 22:10:18 +0000 (UTC) From: Jung-uk Kim <jkim@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r356552 - in head/www/cocoon: . files Message-ID: <201406042210.s54MAIoE045038@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jkim Date: Wed Jun 4 22:10:18 2014 New Revision: 356552 URL: http://svnweb.freebsd.org/changeset/ports/356552 QAT: https://qat.redports.org/buildarchive/r356552/ Log: - Do not build with JDK7 and later. This port uses deprecated JPEG classes. - Support staging. Reported by: exp-run (PR190511) Modified: head/www/cocoon/Makefile head/www/cocoon/files/message-advanced.in Modified: head/www/cocoon/Makefile ============================================================================== --- head/www/cocoon/Makefile Wed Jun 4 22:08:14 2014 (r356551) +++ head/www/cocoon/Makefile Wed Jun 4 22:10:18 2014 (r356552) @@ -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> Modified: head/www/cocoon/files/message-advanced.in ============================================================================== --- head/www/cocoon/files/message-advanced.in Wed Jun 4 22:08:14 2014 (r356551) +++ head/www/cocoon/files/message-advanced.in Wed Jun 4 22:10:18 2014 (r356552) @@ -19,5 +19,5 @@ If you need to pass special options to J 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"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201406042210.s54MAIoE045038>