ports/81103: Maintainer update: www/resin3 updated to 3.0.13

Jean-Baptiste Quenot jb.quenot at caraldi.com
Mon May 16 10:50:08 UTC 2005 

>Number:         81103
>Category:       ports
>Synopsis:       Maintainer update: www/resin3 updated to 3.0.13
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon May 16 10:50:07 GMT 2005
>Closed-Date:
>Last-Modified:
>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 at vision.anyware:/usr/obj/usr/src/sys/GENERIC i386
>Description:
This is an update of www/resin3 to version [1]3.0.13.  A new patch has been
added, it has also been [2]submitted to upstreams author.

[1] http://www.caucho.com/support/resin-interest/0505/0054.html
[2] http://www.caucho.com/support/resin-interest/0505/0091.html
>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	Wed Apr 27 00:04:40 2005
+++ ./Makefile	Thu May 12 12:41:25 2005
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=		resin
-PORTVERSION=		3.0.12
+PORTVERSION=		3.0.13
 CATEGORIES=		www java
 MASTER_SITES=		http://www.caucho.com/download/
 
@@ -42,8 +42,8 @@
 PKGINSTALL=		${WRKDIR}/pkg-install
 PKGDEINSTALL=		${WRKDIR}/pkg-deinstall
 PKGMESSAGE=		${WRKDIR}/pkg-message
-REINPLACE_FILES=	${WRKSRC}/src/c/apache1/Makefile.in \
-			${WRKSRC}/src/c/apache2/Makefile.in
+REINPLACE_FILES=	${WRKSRC}/modules/c/src/apache1/Makefile.in \
+			${WRKSRC}/modules/c/src/apache2/Makefile.in
 REPLACE_FILES=		${FILESDIR}/pkg-install \
 			${FILESDIR}/pkg-deinstall \
 			${FILESDIR}/install.sh \
diff --ignore-matching-lines=\$FreeBSD.*\$ --exclude=.svn --exclude=work --exclude=admin -ruN /usr/ports/www/resin3/distinfo ./distinfo
--- /usr/ports/www/resin3/distinfo	Sat Feb 26 00:17:10 2005
+++ ./distinfo	Tue May 10 10:41:01 2005
@@ -1,2 +1,2 @@
-MD5 (resin-3.0.12.tar.gz) = 90a302b5e76bcb29457d3f68529e6587
-SIZE (resin-3.0.12.tar.gz) = 6965320
+MD5 (resin-3.0.13.tar.gz) = 4e5a07b29b6b8ed86630c169bf62aba2
+SIZE (resin-3.0.13.tar.gz) = 6858367
diff --ignore-matching-lines=\$FreeBSD.*\$ --exclude=.svn --exclude=work --exclude=admin -ruN /usr/ports/www/resin3/files/patch-apache1-Makefile.in ./files/patch-apache1-Makefile.in
--- /usr/ports/www/resin3/files/patch-apache1-Makefile.in	Fri Feb 25 09:54:44 2005
+++ ./files/patch-apache1-Makefile.in	Thu May 12 12:10:17 2005
@@ -1,7 +1,7 @@
 $FreeBSD: ports/www/resin3/files/patch-apache1-Makefile.in,v 1.2 2005/02/24 22:50:29 hq Exp $
 
---- src/c/apache1/Makefile.in.orig	Mon Oct 11 11:34:53 2004
-+++ src/c/apache1/Makefile.in	Mon Oct 11 12:44:59 2004
+--- modules/c/src/apache1/Makefile.in.orig	Mon Oct 11 11:34:53 2004
++++ modules/c/src/apache1/Makefile.in	Mon Oct 11 12:44:59 2004
 @@ -38,8 +38,7 @@
  	$(LIBTOOL) --mode=install $(CP) mod_caucho.la $(apache_libexec)
  	- rm -f $(apache_libexec)/mod_caucho.la
diff --ignore-matching-lines=\$FreeBSD.*\$ --exclude=.svn --exclude=work --exclude=admin -ruN /usr/ports/www/resin3/files/patch-apache2-Makefile.in ./files/patch-apache2-Makefile.in
--- /usr/ports/www/resin3/files/patch-apache2-Makefile.in	Fri Feb 25 09:54:44 2005
+++ ./files/patch-apache2-Makefile.in	Thu May 12 12:10:22 2005
@@ -1,7 +1,7 @@
 $FreeBSD: ports/www/resin3/files/patch-apache2-Makefile.in,v 1.5 2005/02/24 22:50:29 hq Exp $
 
---- src/c/apache2/Makefile.in.orig	Mon Oct 11 11:34:53 2004
-+++ src/c/apache2/Makefile.in	Mon Oct 11 12:44:59 2004
+--- modules/c/src/apache2/Makefile.in.orig	Mon Oct 11 11:34:53 2004
++++ modules/c/src/apache2/Makefile.in	Mon Oct 11 12:44:59 2004
 @@ -38,8 +38,7 @@
  	$(LIBTOOL) --mode=install $(CP) mod_caucho.la $(apache_libexec)
  	- rm -f $(apache_libexec)/mod_caucho.la
diff --ignore-matching-lines=\$FreeBSD.*\$ --exclude=.svn --exclude=work --exclude=admin -ruN /usr/ports/www/resin3/files/patch-resin.conf ./files/patch-resin.conf
--- /usr/ports/www/resin3/files/patch-resin.conf	Fri Feb 25 09:54:44 2005
+++ ./files/patch-resin.conf	Thu May 12 12:13:01 2005
@@ -1,22 +1,20 @@
-$FreeBSD: ports/www/resin3/files/patch-resin.conf,v 1.5 2005/02/24 22:50:29 hq Exp $
-
---- conf/resin.conf.orig	Tue Jun 15 10:50:09 2004
-+++ conf/resin.conf	Tue Jun 15 10:50:47 2004
-@@ -158,7 +158,7 @@
+--- conf/resin.conf.orig	Fri May  6 18:07:34 2005
++++ conf/resin.conf	Thu May 12 12:12:19 2005
+@@ -198,7 +198,7 @@
           - With another web server, like Apache, this can be commented out
           - because the web server will log this information.
          -->
--      <access-log path='logs/access.log' 
-+      <access-log path='log/access.log' 
+-      <access-log path="logs/access.log" 
++      <access-log path="log/access.log" 
              format='%h %l %u %t "%r" %s %b "%{Referer}i" "%{User-Agent}i"'
-             rollover-period='1W'/>
+             rollover-period="1W"/>
  
-@@ -186,7 +186,7 @@
+@@ -226,7 +226,7 @@
      </host-default>
  
      <!-- includes the web-app-default for default web-app behavior -->
 -    <resin:import path="${resinHome}/conf/app-default.xml"/>
 +    <resin:import path="%%PREFIX%%/etc/%%APP_NAME%%/app-default.xml"/>
  
-     <!-- configures the default host, matching any host name -->
-     <host id=''>
+     <!-- configures a deployment directory for virtual hosts -->
+     <host-deploy path="hosts">
diff --ignore-matching-lines=\$FreeBSD.*\$ --exclude=.svn --exclude=work --exclude=admin -ruN /usr/ports/www/resin3/files/patch-src::common::cse.h ./files/patch-src::common::cse.h
--- /usr/ports/www/resin3/files/patch-src::common::cse.h	Thu Jan  1 01:00:00 1970
+++ ./files/patch-src::common::cse.h	Thu May 12 12:56:15 2005
@@ -0,0 +1,12 @@
+--- modules/c/src/common/cse.h.orig	Thu May 12 12:54:14 2005
++++ modules/c/src/common/cse.h	Thu May 12 12:55:30 2005
+@@ -339,6 +339,9 @@
+ 			     const char *host, int port,
+ 			     time_t now);
+ 
++static resin_host_t * cse_match_host_impl(config_t *config, const char *host_name, int
++		port, time_t now);
++
+ cluster_srun_t *
+ cse_add_cluster_server(cluster_t *cluster,
+ 		       const char *host, int port, const char *id,
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	Sat Feb 26 00:17:10 2005
+++ ./pkg-plist	Thu May 12 13:17:26 2005
@@ -1,13 +1,10 @@
- at comment $FreeBSD: ports/www/resin3/pkg-plist,v 1.8 2005/02/25 14:01:15 hq Exp $
+ at comment $FreeBSD: ports/www/resin3/pkg-plist,v 1.7 2005/02/24 22:50:29 hq Exp $
 %%APP_NAME%%/lib/LICENSE.isorelax
-%%APP_NAME%%/lib/LICENSE.retroweaver
 %%APP_NAME%%/lib/aopalliance.jar
-%%APP_NAME%%/lib/boot.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/jaxrpc.jar
 %%APP_NAME%%/lib/jca-15.jar
 %%APP_NAME%%/lib/jms-11.jar
 %%APP_NAME%%/lib/jmx-12.jar
@@ -18,8 +15,6 @@
 %%APP_NAME%%/lib/resin-jdk15.jar
 %%APP_NAME%%/lib/resin.jar
 %%APP_NAME%%/lib/resinboot.jar
-%%APP_NAME%%/lib/retroweaver.jar
-%%APP_NAME%%/lib/saaj.jar
 %%APP_NAME%%/lib/script-10.jar
 %%APP_NAME%%/lib/webutil.jar
 %%APP_NAME%%/webapps/ROOT/index.jsp
>Release-Note:
>Audit-Trail:
>Unformatted:

More information about the freebsd-ports-bugs mailing list