This is an update of www/resin3 to 3.0.14. A patch has been removed: files/patch-configure.
Responsible Changed From-To: freebsd-ports-bugs->hq I'll handle this. The ports tree is frozen ATM so please be patient.
Jean-Baptiste, The changes look good. However, I think it's time for us to fix the "install" target issue we discussed before. I have had another look at the port and I've comme up with a patch to fix this. Could you pleaase review it? Index: Makefile =================================================================== RCS file: /home/ncvs/ports/www/resin3/Makefile,v retrieving revision 1.14 diff -u -r1.14 Makefile --- Makefile 16 May 2005 20:33:47 -0000 1.14 +++ Makefile 9 Aug 2005 15:22:10 -0000 @@ -6,7 +6,7 @@ # PORTNAME= resin -PORTVERSION= 3.0.13 +PORTVERSION= 3.0.14 CATEGORIES= www java MASTER_SITES= http://www.caucho.com/download/ @@ -127,8 +127,10 @@ @${ECHO_CMD} "</IfModule>" >> ${PKGMESSAGE} .endif -# Resin does not handle installation, so proceed now -post-install: +post-build: + cd ${WRKSRC}/modules/c/src && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} install + +do-install: @${SETENV} RUNASUSER=${RUNASUSER} GROUP=${GROUP} ${SH} ${WRKDIR}/install.sh @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL @${ECHO_MSG} BTW, unless I missed some point, I don't really see the purpose of install.sh. The first step (comparing between installed configurations files) could (and even should IMHO) be performed within pkg-install, whereas the next steps would just be fine as command lines in the 'do-install' target of the Makefile. This would also allow to use ${INSTALL_DATA} and such, rather than 'cp' which is not correct regarding persmissions IMHO. Herve
State Changed From-To: open->feedback Submitter asked for feedback
Your patch seems perfect, thanks. About install.sh, I agree that it could be done in the Makefile, but it would become unreadable. Please also close ports/85077 once this one is committed. -- Jean-Baptiste Quenot http://caraldi.com/jbq/
State Changed From-To: feedback->open Feedback received. We're just waiting for the ports tree to unfreeze now. Check http://www.freebsd.org/releases/6.0R/schedule.html for more details.
State Changed From-To: open->closed Patch commited with the modifications we discussed. Thanks for your contribution.