From jbq@anyware-tech.com  Fri Aug  5 10:06:03 2005
Return-Path: <jbq@anyware-tech.com>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id B248616A41F
	for <FreeBSD-gnats-submit@freebsd.org>; Fri,  5 Aug 2005 10:06:02 +0000 (GMT)
	(envelope-from jbq@anyware-tech.com)
Received: from caraldi.com (195-13-58-165.oxyd.net [195.13.58.165])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 453A943D45
	for <FreeBSD-gnats-submit@freebsd.org>; Fri,  5 Aug 2005 10:06:01 +0000 (GMT)
	(envelope-from jbq@anyware-tech.com)
Received: from vision.anyware (10.21.96-84.rev.gaoland.net [84.96.21.10])
	by caraldi.com (Postfix) with ESMTP id 91AAF60DE
	for <FreeBSD-gnats-submit@freebsd.org>; Fri,  5 Aug 2005 12:06:00 +0200 (CEST)
Received: by vision.anyware (Postfix, from userid 1021)
	id 57287611E; Fri,  5 Aug 2005 12:06:01 +0200 (CEST)
Message-Id: <20050805100601.57287611E@vision.anyware>
Date: Fri,  5 Aug 2005 12:06:01 +0200 (CEST)
From: Jean-Baptiste Quenot <jb.quenot@caraldi.com>
To: FreeBSD-gnats-submit@freebsd.org
Subject: Maintainer update: www/resin3 3.0.14
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         84577
>Category:       ports
>Synopsis:       Maintainer update: www/resin3 3.0.14
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    hq
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Aug 05 10:10:14 GMT 2005
>Closed-Date:    Mon Aug 29 15:00:07 GMT 2005
>Last-Modified:  Mon Aug 29 15:00:07 GMT 2005
>Originator:     Jean-Baptiste Quenot
>Release:        FreeBSD 5.4-STABLE i386
>Organization:
>Environment:
System: FreeBSD vision.anyware 5.4-STABLE FreeBSD 5.4-STABLE #0: Thu Apr 21 11:41:35 CEST 2005 jbq@vision.anyware:/usr/obj/usr/src/sys/GENERIC i386
>Description:
This is an update of www/resin3 to 3.0.14.  A patch has been removed:
files/patch-configure.
>How-To-Repeat:
>Fix:
diff --ignore-matching-lines=\$FreeBSD.*\$ --exclude=.svn --exclude=work --exclude=admin -ruN /usr/ports/www/resin3/Makefile ./Makefile
--- /usr/ports/www/resin3/Makefile	Tue May 17 00:06:25 2005
+++ ./Makefile	Fri Aug  5 11:25:10 2005
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=		resin
-PORTVERSION=		3.0.13
+PORTVERSION=		3.0.14
 CATEGORIES=		www java
 MASTER_SITES=		http://www.caucho.com/download/
 
diff --ignore-matching-lines=\$FreeBSD.*\$ --exclude=.svn --exclude=work --exclude=admin -ruN /usr/ports/www/resin3/distinfo ./distinfo
--- /usr/ports/www/resin3/distinfo	Tue May 17 00:06:25 2005
+++ ./distinfo	Fri Aug  5 11:28:40 2005
@@ -1,2 +1,2 @@
-MD5 (resin-3.0.13.tar.gz) = 4e5a07b29b6b8ed86630c169bf62aba2
-SIZE (resin-3.0.13.tar.gz) = 6858367
+MD5 (resin-3.0.14.tar.gz) = 1348ca83d945a8905238989ba0eb7d23
+SIZE (resin-3.0.14.tar.gz) = 6275586
diff --ignore-matching-lines=\$FreeBSD.*\$ --exclude=.svn --exclude=work --exclude=admin -ruN /usr/ports/www/resin3/files/patch-configure ./files/patch-configure
--- /usr/ports/www/resin3/files/patch-configure	Tue May 17 00:06:25 2005
+++ ./files/patch-configure	Thu Jan  1 01:00:00 1970
@@ -1,45 +0,0 @@
-$FreeBSD: ports/www/resin3/files/patch-configure,v 1.4 2005/05/16 20:33:47 hq Exp $
-
---- configure.orig	Wed Jan 12 00:00:26 2005
-+++ configure	Mon Apr 25 11:21:46 2005
-@@ -8669,20 +8669,6 @@
- # Using Perl if it's available.
- #
- PERL=`which perl`
--if test -z "${LD_SHLIB}"; then
--  if test -z "${LD_SHLIB}" -a "x`$PERL -V:dlsrc 2>/dev/null | grep dlopen`" != "x"; then
--    PCC="`$PERL -V:cc | cut -d\' -f2`"
--    if test "${PCC}" = "${CC}"; then
--      CFLAGS_SHLIB="`$PERL -V:cccdlflags | cut -d\' -f2`"
--      LDFLAGS_SHLIB="`$PERL -V:lddlflags | cut -d\' -f2`"
--      LD_SHLIB="`$PERL -V:ld | cut -d\' -f2`"
--
--      has_clflags=1
--
--      echo "Using shared library flags from Perl"
--    fi
--  fi
--fi
- 
- #if test -z "${LD_SHLIB}"; then
- #  AC_MSG_ERROR([Can't determine compilation flags.]);
-@@ -8947,8 +8933,8 @@
- 
- if test -z "${OPENSSL_LIB}"; then
-   foo=bar
--elif test -r "${OPENSSL_LIB}/libcrypt.so"; then
--  SSL_LIBS="${SSL_LIBS} -lcrypt"
-+elif test -r "${OPENSSL_LIB}/libcrypto.so"; then
-+  SSL_LIBS="${SSL_LIBS} -lcrypto"
- elif test -r "${OPENSSL_LIB}/libcrypt.dylib"; then
-   SSL_LIBS="${SSL_LIBS} -lcrypt"
- elif test -r "${OPENSSL_LIB}/libcrypt.a"; then
-@@ -8983,7 +8969,7 @@
-   foo=bar
- elif test -z "${OPENSSL_LIB}"; then
-   foo=bar
--elif test ! -r "${OPENSSL_LIB}/libcrypt.so" -a \
-+elif test ! -r "${OPENSSL_LIB}/libcrypto.so" -a \
-           ! -r "${OPENSSL_LIB}/libcrypt.dylib" -a \
-           ! -r "${OPENSSL_LIB}/libcrypt.a" ; then
-   { { echo "$as_me:$LINENO: error: Can't find valid OpenSSL library in ${OPENSSL_LIB}" >&5
diff --ignore-matching-lines=\$FreeBSD.*\$ --exclude=.svn --exclude=work --exclude=admin -ruN /usr/ports/www/resin3/pkg-plist ./pkg-plist
--- /usr/ports/www/resin3/pkg-plist	Tue May 17 00:06:25 2005
+++ ./pkg-plist	Fri Aug  5 12:00:46 2005
@@ -1,9 +1,7 @@
 @comment $FreeBSD: ports/www/resin3/pkg-plist,v 1.9 2005/05/16 20:33:47 hq Exp $
-%%APP_NAME%%/lib/LICENSE.isorelax
 %%APP_NAME%%/lib/aopalliance.jar
 %%APP_NAME%%/lib/ejb-20.jar
 %%APP_NAME%%/lib/ejb-30.jar
-%%APP_NAME%%/lib/isorelax.jar
 %%APP_NAME%%/lib/j2eedeploy.jar
 %%APP_NAME%%/lib/jca-15.jar
 %%APP_NAME%%/lib/jms-11.jar
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->hq 
Responsible-Changed-By: hq 
Responsible-Changed-When: Fri Aug 5 11:03:55 GMT 2005 
Responsible-Changed-Why:  
I'll handle this. 

The ports tree is frozen ATM so please be patient. 


http://www.freebsd.org/cgi/query-pr.cgi?pr=84577 

From: Herve Quiroz <herve.quiroz@esil.univ-mrs.fr>
To: bug-followup@FreeBSD.org, jb.quenot@caraldi.com
Cc:  
Subject: Re: ports/84577: Maintainer update: www/resin3 3.0.14
Date: Tue, 9 Aug 2005 17:28:59 +0200

 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 
State-Changed-By: hq 
State-Changed-When: Tue Aug 9 15:41:43 GMT 2005 
State-Changed-Why:  
Submitter asked for feedback 

http://www.freebsd.org/cgi/query-pr.cgi?pr=84577 

From: Jean-Baptiste Quenot <jb.quenot@caraldi.com>
To: Herve Quiroz <herve.quiroz@esil.univ-mrs.fr>
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/84577: Maintainer update: www/resin3 3.0.14
Date: Thu, 18 Aug 2005 13:29:28 +0200

 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 
State-Changed-By: hq 
State-Changed-When: Tue Aug 23 11:09:40 GMT 2005 
State-Changed-Why:  
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. 


http://www.freebsd.org/cgi/query-pr.cgi?pr=84577 
State-Changed-From-To: open->closed 
State-Changed-By: hq 
State-Changed-When: Mon Aug 29 14:59:39 GMT 2005 
State-Changed-Why:  
Patch commited with the modifications we discussed. 

Thanks for your contribution. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=84577 
>Unformatted:
