Date: Thu, 18 Aug 2005 14:49:20 +0600 From: Boris Kovalenko <boris@tagnet.ru> To: FreeBSD-gnats-submit@FreeBSD.org Cc: jb.quenot@caraldi.com Subject: ports/85077: [PATCH] www/resin3: update to 3.0.14 Message-ID: <E1E5g5Q-0009ki-P0@boris.nikom.ru> Resent-Message-ID: <200508180850.j7I8oGLe074165@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 85077 >Category: ports >Synopsis: [PATCH] www/resin3: update to 3.0.14 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Thu Aug 18 08:50:16 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Boris Kovalenko >Release: FreeBSD 5.4-STABLE i386 >Organization: JSC "Tagnet" >Environment: System: FreeBSD boris.nikom.ru 5.4-STABLE FreeBSD 5.4-STABLE #4: Thu Aug 18 08:12:33 YEKST 2005 >Description: - Update to 3.0.14 Port maintainer (jb.quenot@caraldi.com) is cc'd. Generated with FreeBSD Port Tools 0.63 >How-To-Repeat: >Fix: --- resin3-3.0.14.patch begins here --- diff -ruN --exclude=CVS /usr/ports/www/resin3/Makefile /usr/ports/www/resin3.new/Makefile --- /usr/ports/www/resin3/Makefile Tue May 17 08:26:08 2005 +++ /usr/ports/www/resin3.new/Makefile Thu Aug 18 13:08:23 2005 @@ -5,8 +5,8 @@ # $FreeBSD: ports/www/resin3/Makefile,v 1.14 2005/05/16 20:33:47 hq Exp $ # -PORTNAME= resin -PORTVERSION= 3.0.13 +PORTNAME= resin +PORTVERSION= 3.0.14 CATEGORIES= www java MASTER_SITES= http://www.caucho.com/download/ diff -ruN --exclude=CVS /usr/ports/www/resin3/distinfo /usr/ports/www/resin3.new/distinfo --- /usr/ports/www/resin3/distinfo Tue May 17 08:26:08 2005 +++ /usr/ports/www/resin3.new/distinfo Thu Aug 18 12:18:04 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 -ruN --exclude=CVS /usr/ports/www/resin3/files/patch-apache1-Makefile.in /usr/ports/www/resin3.new/files/patch-apache1-Makefile.in --- /usr/ports/www/resin3/files/patch-apache1-Makefile.in Tue May 17 08:26:08 2005 +++ /usr/ports/www/resin3.new/files/patch-apache1-Makefile.in Thu Aug 18 12:21:02 2005 @@ -1,7 +1,5 @@ -$FreeBSD: ports/www/resin3/files/patch-apache1-Makefile.in,v 1.3 2005/05/16 20:33:47 hq Exp $ - ---- 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 +--- modules/c/src/apache1/Makefile.in.orig Sun Mar 6 02:18:38 2005 ++++ modules/c/src/apache1/Makefile.in Thu Aug 18 12:20:18 2005 @@ -38,8 +38,7 @@ $(LIBTOOL) --mode=install $(CP) mod_caucho.la $(apache_libexec) - rm -f $(apache_libexec)/mod_caucho.la diff -ruN --exclude=CVS /usr/ports/www/resin3/files/patch-apache2-Makefile.in /usr/ports/www/resin3.new/files/patch-apache2-Makefile.in --- /usr/ports/www/resin3/files/patch-apache2-Makefile.in Tue May 17 08:26:08 2005 +++ /usr/ports/www/resin3.new/files/patch-apache2-Makefile.in Thu Aug 18 12:22:15 2005 @@ -1,7 +1,5 @@ -$FreeBSD: ports/www/resin3/files/patch-apache2-Makefile.in,v 1.6 2005/05/16 20:33:47 hq Exp $ - ---- 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 +--- modules/c/src/apache2/Makefile.in.orig Sun Mar 6 02:18:38 2005 ++++ modules/c/src/apache2/Makefile.in Thu Aug 18 12:22:01 2005 @@ -38,8 +38,7 @@ $(LIBTOOL) --mode=install $(CP) mod_caucho.la $(apache_libexec) - rm -f $(apache_libexec)/mod_caucho.la diff -ruN --exclude=CVS /usr/ports/www/resin3/files/patch-configure /usr/ports/www/resin3.new/files/patch-configure --- /usr/ports/www/resin3/files/patch-configure Tue May 17 08:26:08 2005 +++ /usr/ports/www/resin3.new/files/patch-configure Thu Aug 18 12:26:24 2005 @@ -1,8 +1,6 @@ -$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 @@ +--- configure.orig Tue May 17 23:21:56 2005 ++++ configure Thu Aug 18 12:23:19 2005 +@@ -8667,20 +8667,6 @@ # Using Perl if it's available. # PERL=`which perl` @@ -23,23 +21,3 @@ #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 -ruN --exclude=CVS /usr/ports/www/resin3/files/patch-cse.h /usr/ports/www/resin3.new/files/patch-cse.h --- /usr/ports/www/resin3/files/patch-cse.h Tue May 17 02:33:47 2005 +++ /usr/ports/www/resin3.new/files/patch-cse.h Thu Aug 18 12:28:50 2005 @@ -1,14 +1,11 @@ -$FreeBSD: ports/www/resin3/files/patch-cse.h,v 1.1 2005/05/16 20:33:47 hq Exp $ - ---- 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 @@ +--- modules/c/src/common/cse.h.orig Tue May 24 05:01:26 2005 ++++ modules/c/src/common/cse.h Thu Aug 18 12:28:02 2005 +@@ -340,6 +340,8 @@ + resin_host_t *cse_match_host(config_t *config, 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 -ruN --exclude=CVS /usr/ports/www/resin3/files/patch-resin.conf /usr/ports/www/resin3.new/files/patch-resin.conf --- /usr/ports/www/resin3/files/patch-resin.conf Tue May 17 08:26:08 2005 +++ /usr/ports/www/resin3.new/files/patch-resin.conf Thu Aug 18 12:31:05 2005 @@ -1,5 +1,5 @@ ---- conf/resin.conf.orig Fri May 6 18:07:34 2005 -+++ conf/resin.conf Thu May 12 12:12:19 2005 +--- conf/resin.conf.orig Wed May 18 00:24:27 2005 ++++ conf/resin.conf Thu Aug 18 12:30:33 2005 @@ -198,7 +198,7 @@ - With another web server, like Apache, this can be commented out - because the web server will log this information. diff -ruN --exclude=CVS /usr/ports/www/resin3/pkg-plist /usr/ports/www/resin3.new/pkg-plist --- /usr/ports/www/resin3/pkg-plist Tue May 17 08:26:08 2005 +++ /usr/ports/www/resin3.new/pkg-plist Thu Aug 18 12:57:27 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 --- resin3-3.0.14.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E1E5g5Q-0009ki-P0>