diff options
Diffstat (limited to 'www/resin3/Makefile')
| -rw-r--r-- | www/resin3/Makefile | 29 |
1 files changed, 9 insertions, 20 deletions
diff --git a/www/resin3/Makefile b/www/resin3/Makefile index 0b18a9dc7a20..31f1e4470218 100644 --- a/www/resin3/Makefile +++ b/www/resin3/Makefile @@ -13,8 +13,6 @@ MASTER_SITES= http://www.caucho.com/download/ MAINTAINER= jb.quenot@caraldi.com COMMENT= Resin, a Java-based Application Server, 3.x branch -BROKEN= Does not build - USE_JAVA= yes JAVA_VERSION= 1.2+ HAS_CONFIGURE= yes @@ -43,8 +41,6 @@ APXS?= ${LOCALBASE}/sbin/apxs PKGINSTALL= ${WRKDIR}/pkg-install PKGDEINSTALL= ${WRKDIR}/pkg-deinstall PKGMESSAGE= ${WRKDIR}/pkg-message -# We need WRKSRC and WRKDIR right now so define them "manually" -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} REINPLACE_FILES= ${WRKSRC}/src/c/apache1/Makefile.in \ ${WRKSRC}/src/c/apache2/Makefile.in REPLACE_FILES= ${FILESDIR}/pkg-install \ @@ -110,12 +106,10 @@ SUBSTITUTIONS= -e "s|%%APP_HOME%%|${APP_HOME}|g" \ -e "s|%%WRKSRC%%|${WRKSRC}|g" post-patch: -.for FILE in ${REINPLACE_FILES} - @${REINPLACE_CMD} ${SUBSTITUTIONS} ${FILE} -.endfor -.for FILE in ${REPLACE_FILES} - @${SED} ${SUBSTITUTIONS} ${FILE} > ${WRKDIR}/`basename ${FILE}` -.endfor + @${REINPLACE_CMD} ${SUBSTITUTIONS} ${REINPLACE_FILES} + @for FILE in ${REPLACE_FILES} ; do \ + ${SED} ${SUBSTITUTIONS} $${FILE} > ${WRKDIR}/`basename $${FILE}` ; \ + done @${FMT} -w 80 < ${WRKDIR}/pkg-message.in > ${PKGMESSAGE} .if (defined(WITH_APACHE2) && (${WITH_APACHE2} == yes || ${WITH_APACHE2} == YES) || \ defined(WITH_APACHE) && (${WITH_APACHE} == yes || ${WITH_APACHE} == YES)) @@ -126,23 +120,18 @@ defined(WITH_APACHE) && (${WITH_APACHE} == yes || ${WITH_APACHE} == YES)) server, for example: | ${FMT} -w 80 >> ${PKGMESSAGE} @${ECHO_CMD} >> ${PKGMESSAGE} @${ECHO_CMD} "<IfModule mod_caucho.c>" >> ${PKGMESSAGE} -.if (defined(WITH_APACHE2) && (${WITH_APACHE2} == yes || ${WITH_APACHE2} == YES)) @${ECHO_CMD} " ResinConfigServer localhost 6802" >> ${PKGMESSAGE} -.endif -.if (defined(WITH_APACHE) && (${WITH_APACHE} == yes || ${WITH_APACHE} == YES)) - @${ECHO_CMD} " CauchoConfigFile ${PREFIX}/etc/${APP_NAME}/resin.xml" >> ${PKGMESSAGE} -.endif - @${ECHO_CMD} "</IfModule>" >> ${PKGMESSAGE} + @${ECHO_CMD} "</IfModule>" >> ${PKGMESSAGE} .endif # Resin does not handle installation, so proceed now post-install: @${SETENV} RUNASUSER=${RUNASUSER} GROUP=${GROUP} ${SH} ${WRKDIR}/install.sh @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL - @${ECHO_CMD} - @${ECHO_CMD} "********************************************************************************" + @${ECHO_MSG} + @${ECHO_MSG} "********************************************************************************" @${CAT} ${PKGMESSAGE} - @${ECHO_CMD} "********************************************************************************" - @${ECHO_CMD} + @${ECHO_MSG} "********************************************************************************" + @${ECHO_MSG} .include <bsd.port.post.mk> |