Bug 84577

Summary: Maintainer update: www/resin3 3.0.14
Product: Ports & Packages Reporter: Jean-Baptiste Quenot <jb.quenot>
Component: Individual Port(s)Assignee: Herve Quiroz <hq>
Status: Closed FIXED    
Severity: Affects Only Me    
Priority: Normal    
Version: Latest   
Hardware: Any   
OS: Any   
Attachments:
Description Flags
file.diff none

Description Jean-Baptiste Quenot 2005-08-05 11:10:14 UTC 
This is an update of www/resin3 to 3.0.14.  A patch has been removed:
files/patch-configure.
Comment 1 Herve Quiroz freebsd_committer freebsd_triage 2005-08-05 12:03:55 UTC 
Responsible Changed
From-To: freebsd-ports-bugs->hq

I'll handle this. 

The ports tree is frozen ATM so please be patient.
Comment 2 Hervé Quiroz 2005-08-09 16:28:59 UTC 
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
Comment 3 Herve Quiroz freebsd_committer freebsd_triage 2005-08-09 16:41:43 UTC 
State Changed
From-To: open->feedback

Submitter asked for feedback
Comment 4 Jean-Baptiste Quenot 2005-08-18 12:29:28 UTC 
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/
Comment 5 Herve Quiroz freebsd_committer freebsd_triage 2005-08-23 12:09:40 UTC 
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.
Comment 6 Herve Quiroz freebsd_committer freebsd_triage 2005-08-29 15:59:39 UTC 
State Changed
From-To: open->closed

Patch commited with the modifications we discussed. 

Thanks for your contribution.