Attachment #53614 for bug #81103

View | Details | Raw Unified | Return to bug 81103
Collapse All | Expand All

Lines 6-12 Link Here

(-)./Makefile (-3 / +3 lines)
6	#	6	#
7		7
8	PORTNAME= resin	8	PORTNAME= resin
9	PORTVERSION= 3.0.12	9	PORTVERSION= 3.0.13
10	CATEGORIES= www java	10	CATEGORIES= www java
11	MASTER_SITES= http://www.caucho.com/download/	11	MASTER_SITES= http://www.caucho.com/download/
12		12
Lines 42-49 Link Here
42	PKGINSTALL= ${WRKDIR}/pkg-install	42	PKGINSTALL= ${WRKDIR}/pkg-install
43	PKGDEINSTALL= ${WRKDIR}/pkg-deinstall	43	PKGDEINSTALL= ${WRKDIR}/pkg-deinstall
44	PKGMESSAGE= ${WRKDIR}/pkg-message	44	PKGMESSAGE= ${WRKDIR}/pkg-message
45	REINPLACE_FILES= ${WRKSRC}/src/c/apache1/Makefile.in \	45	REINPLACE_FILES= ${WRKSRC}/modules/c/src/apache1/Makefile.in \
46	${WRKSRC}/src/c/apache2/Makefile.in	46	${WRKSRC}/modules/c/src/apache2/Makefile.in
47	REPLACE_FILES= ${FILESDIR}/pkg-install \	47	REPLACE_FILES= ${FILESDIR}/pkg-install \
48	${FILESDIR}/pkg-deinstall \	48	${FILESDIR}/pkg-deinstall \
49	${FILESDIR}/install.sh \	49	${FILESDIR}/install.sh \

Lines 1-2 Link Here

(-)./distinfo (-2 / +2 lines)
1	MD5 (resin-3.0.12.tar.gz) = 90a302b5e76bcb29457d3f68529e6587	1	MD5 (resin-3.0.13.tar.gz) = 4e5a07b29b6b8ed86630c169bf62aba2
2	SIZE (resin-3.0.12.tar.gz) = 6965320	2	SIZE (resin-3.0.13.tar.gz) = 6858367

Lines 1-7 Link Here

(-)./files/patch-apache1-Makefile.in (-2 / +2 lines)
1	$FreeBSD: ports/www/resin3/files/patch-apache1-Makefile.in,v 1.2 2005/02/24 22:50:29 hq Exp $	1	$FreeBSD: ports/www/resin3/files/patch-apache1-Makefile.in,v 1.2 2005/02/24 22:50:29 hq Exp $
2		2
3	--- src/c/apache1/Makefile.in.orig Mon Oct 11 11:34:53 2004	3	--- modules/c/src/apache1/Makefile.in.orig Mon Oct 11 11:34:53 2004
4	+++ src/c/apache1/Makefile.in Mon Oct 11 12:44:59 2004	4	+++ modules/c/src/apache1/Makefile.in Mon Oct 11 12:44:59 2004
5	@@ -38,8 +38,7 @@	5	@@ -38,8 +38,7 @@
6	$(LIBTOOL) --mode=install $(CP) mod_caucho.la $(apache_libexec)	6	$(LIBTOOL) --mode=install $(CP) mod_caucho.la $(apache_libexec)
7	- rm -f $(apache_libexec)/mod_caucho.la	7	- rm -f $(apache_libexec)/mod_caucho.la

Lines 1-7 Link Here

(-)./files/patch-apache2-Makefile.in (-2 / +2 lines)
1	$FreeBSD: ports/www/resin3/files/patch-apache2-Makefile.in,v 1.5 2005/02/24 22:50:29 hq Exp $	1	$FreeBSD: ports/www/resin3/files/patch-apache2-Makefile.in,v 1.5 2005/02/24 22:50:29 hq Exp $
2		2
3	--- src/c/apache2/Makefile.in.orig Mon Oct 11 11:34:53 2004	3	--- modules/c/src/apache2/Makefile.in.orig Mon Oct 11 11:34:53 2004
4	+++ src/c/apache2/Makefile.in Mon Oct 11 12:44:59 2004	4	+++ modules/c/src/apache2/Makefile.in Mon Oct 11 12:44:59 2004
5	@@ -38,8 +38,7 @@	5	@@ -38,8 +38,7 @@
6	$(LIBTOOL) --mode=install $(CP) mod_caucho.la $(apache_libexec)	6	$(LIBTOOL) --mode=install $(CP) mod_caucho.la $(apache_libexec)
7	- rm -f $(apache_libexec)/mod_caucho.la	7	- rm -f $(apache_libexec)/mod_caucho.la




--- 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 @@
+++ conf/resin.conf	Tue Jun 15 10:50:47 2004
@@ -158,7 +158,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" 
             format='%h %l %u %t "%r" %s %b "%{Referer}i" "%{User-Agent}i"'
             rollover-period="1W"/>
 
@@ -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 a deployment directory for virtual hosts -->
     <host-deploy path="hosts">




--- 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,




@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

%%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

Return to bug 81103

Lines 1-22 Link Here

(-)./files/patch-resin.conf (-11 / +9 lines)
1	$FreeBSD: ports/www/resin3/files/patch-resin.conf,v 1.5 2005/02/24 22:50:29 hq Exp $	1	--- conf/resin.conf.orig Fri May 6 18:07:34 2005
2		2	+++ conf/resin.conf Thu May 12 12:12:19 2005
3	--- conf/resin.conf.orig Tue Jun 15 10:50:09 2004	3	@@ -198,7 +198,7 @@
4	+++ conf/resin.conf Tue Jun 15 10:50:47 2004
5	@@ -158,7 +158,7 @@
6	- With another web server, like Apache, this can be commented out	4	- With another web server, like Apache, this can be commented out
7	- because the web server will log this information.	5	- because the web server will log this information.
8	-->	6	-->
9	- <access-log path='logs/access.log'	7	- <access-log path="logs/access.log"
10	+ <access-log path='log/access.log'	8	+ <access-log path="log/access.log"
11	format='%h %l %u %t "%r" %s %b "%{Referer}i" "%{User-Agent}i"'	9	format='%h %l %u %t "%r" %s %b "%{Referer}i" "%{User-Agent}i"'
12	rollover-period='1W'/>	10	rollover-period="1W"/>
13		11
14	@@ -186,7 +186,7 @@	12	@@ -226,7 +226,7 @@
15	</host-default>	13	</host-default>
16		14
17	<!-- includes the web-app-default for default web-app behavior -->	15	<!-- includes the web-app-default for default web-app behavior -->
18	- <resin:import path="${resinHome}/conf/app-default.xml"/>	16	- <resin:import path="${resinHome}/conf/app-default.xml"/>
19	+ <resin:import path="%%PREFIX%%/etc/%%APP_NAME%%/app-default.xml"/>	17	+ <resin:import path="%%PREFIX%%/etc/%%APP_NAME%%/app-default.xml"/>
20		18
21	<!-- configures the default host, matching any host name -->	19	<!-- configures a deployment directory for virtual hosts -->
22	<host id=''>	20	<host-deploy path="hosts">

Line 0 Link Here

(-)./files/patch-src::common::cse.h (+12 lines)
	1	--- modules/c/src/common/cse.h.orig Thu May 12 12:54:14 2005
	2	+++ modules/c/src/common/cse.h Thu May 12 12:55:30 2005
	3	@@ -339,6 +339,9 @@
	4	const char *host, int port,
	5	time_t now);
	6
	7	+static resin_host_t * cse_match_host_impl(config_t config, const char host_name, int
	8	+ port, time_t now);
	9	+
	10	cluster_srun_t *
	11	cse_add_cluster_server(cluster_t *cluster,
	12	const char host, int port, const char id,

Lines 1-13 Link Here

(-)./pkg-plist (-6 / +1 lines)
1	@comment $FreeBSD: ports/www/resin3/pkg-plist,v 1.8 2005/02/25 14:01:15 hq Exp $	1	@comment $FreeBSD: ports/www/resin3/pkg-plist,v 1.7 2005/02/24 22:50:29 hq Exp $
2	%%APP_NAME%%/lib/LICENSE.isorelax	2	%%APP_NAME%%/lib/LICENSE.isorelax
3	%%APP_NAME%%/lib/LICENSE.retroweaver
4	%%APP_NAME%%/lib/aopalliance.jar	3	%%APP_NAME%%/lib/aopalliance.jar
5	%%APP_NAME%%/lib/boot.jar
6	%%APP_NAME%%/lib/ejb-20.jar	4	%%APP_NAME%%/lib/ejb-20.jar
7	%%APP_NAME%%/lib/ejb-30.jar	5	%%APP_NAME%%/lib/ejb-30.jar
8	%%APP_NAME%%/lib/isorelax.jar	6	%%APP_NAME%%/lib/isorelax.jar
9	%%APP_NAME%%/lib/j2eedeploy.jar	7	%%APP_NAME%%/lib/j2eedeploy.jar
10	%%APP_NAME%%/lib/jaxrpc.jar
11	%%APP_NAME%%/lib/jca-15.jar	8	%%APP_NAME%%/lib/jca-15.jar
12	%%APP_NAME%%/lib/jms-11.jar	9	%%APP_NAME%%/lib/jms-11.jar
13	%%APP_NAME%%/lib/jmx-12.jar	10	%%APP_NAME%%/lib/jmx-12.jar
Lines 18-25 Link Here
18	%%APP_NAME%%/lib/resin-jdk15.jar	15	%%APP_NAME%%/lib/resin-jdk15.jar
19	%%APP_NAME%%/lib/resin.jar	16	%%APP_NAME%%/lib/resin.jar
20	%%APP_NAME%%/lib/resinboot.jar	17	%%APP_NAME%%/lib/resinboot.jar
21	%%APP_NAME%%/lib/retroweaver.jar
22	%%APP_NAME%%/lib/saaj.jar
23	%%APP_NAME%%/lib/script-10.jar	18	%%APP_NAME%%/lib/script-10.jar
24	%%APP_NAME%%/lib/webutil.jar	19	%%APP_NAME%%/lib/webutil.jar
25	%%APP_NAME%%/webapps/ROOT/index.jsp	20	%%APP_NAME%%/webapps/ROOT/index.jsp