From 5c833b9e2d2d70c536f6336f4bb24134a26931e7 Mon Sep 17 00:00:00 2001 From: Herve Quiroz Date: Mon, 16 May 2005 20:33:47 +0000 Subject: - Update to 3.0.13 - Add a patch to handle this issue: http://www.caucho.com/support/resin-interest/0505/0091.html - Add $FreeBSD$ tags PR: 81103 Submitted by: maintainer --- www/resin3/Makefile | 6 +++--- www/resin3/distinfo | 4 ++-- www/resin3/files/patch-apache1-Makefile.in | 4 ++-- www/resin3/files/patch-apache2-Makefile.in | 4 ++-- www/resin3/files/patch-configure | 2 ++ www/resin3/files/patch-cse.h | 14 ++++++++++++++ www/resin3/files/patch-resin.conf | 20 +++++++++----------- www/resin3/pkg-plist | 5 ----- 8 files changed, 34 insertions(+), 25 deletions(-) create mode 100644 www/resin3/files/patch-cse.h (limited to 'www/resin3') diff --git a/www/resin3/Makefile b/www/resin3/Makefile index 4182be29cb33..39436521e7ec 100644 --- a/www/resin3/Makefile +++ b/www/resin3/Makefile @@ -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 @@ APXS?= ${LOCALBASE}/sbin/apxs 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 --git a/www/resin3/distinfo b/www/resin3/distinfo index d3636be47b21..6f32ceaa10c8 100644 --- a/www/resin3/distinfo +++ b/www/resin3/distinfo @@ -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 --git a/www/resin3/files/patch-apache1-Makefile.in b/www/resin3/files/patch-apache1-Makefile.in index ad61eca13003..4a5992dfc236 100644 --- a/www/resin3/files/patch-apache1-Makefile.in +++ b/www/resin3/files/patch-apache1-Makefile.in @@ -1,7 +1,7 @@ $FreeBSD$ ---- 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 --git a/www/resin3/files/patch-apache2-Makefile.in b/www/resin3/files/patch-apache2-Makefile.in index 5f8eade528a7..aa6c2b38f528 100644 --- a/www/resin3/files/patch-apache2-Makefile.in +++ b/www/resin3/files/patch-apache2-Makefile.in @@ -1,7 +1,7 @@ $FreeBSD$ ---- 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 --git a/www/resin3/files/patch-configure b/www/resin3/files/patch-configure index 266d490f8a4c..ffa7617a3bcd 100644 --- a/www/resin3/files/patch-configure +++ b/www/resin3/files/patch-configure @@ -1,3 +1,5 @@ +$FreeBSD$ + --- configure.orig Wed Jan 12 00:00:26 2005 +++ configure Mon Apr 25 11:21:46 2005 @@ -8669,20 +8669,6 @@ diff --git a/www/resin3/files/patch-cse.h b/www/resin3/files/patch-cse.h new file mode 100644 index 000000000000..49617cdab330 --- /dev/null +++ b/www/resin3/files/patch-cse.h @@ -0,0 +1,14 @@ +$FreeBSD$ + +--- 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 --git a/www/resin3/files/patch-resin.conf b/www/resin3/files/patch-resin.conf index dcc5cf7a3a65..01f6a77b7a45 100644 --- a/www/resin3/files/patch-resin.conf +++ b/www/resin3/files/patch-resin.conf @@ -1,22 +1,20 @@ -$FreeBSD$ - ---- 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. --> -- + rollover-period="1W"/> -@@ -186,7 +186,7 @@ +@@ -226,7 +226,7 @@ - + - - + + diff --git a/www/resin3/pkg-plist b/www/resin3/pkg-plist index cc982fa8ac56..5eb30bf30642 100644 --- a/www/resin3/pkg-plist +++ b/www/resin3/pkg-plist @@ -1,13 +1,10 @@ @comment $FreeBSD$ %%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 -- cgit v1.2.3