Date: Wed, 16 Jun 2004 11:34:36 +0200 (CEST) From: Jean-Baptiste Quenot <jb.quenot@caraldi.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/68002: Maintainer update: Resin 3.0.8 released Message-ID: <20040616093436.EC9976532@anyware12.anyware> Resent-Message-ID: <200406160940.i5G9eKF9012970@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 68002 >Category: ports >Synopsis: Maintainer update: Resin 3.0.8 released >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Wed Jun 16 09:40:20 GMT 2004 >Closed-Date: >Last-Modified: >Originator: Jean-Baptiste Quenot <jb.quenot@caraldi.com> >Release: FreeBSD 5.2-CURRENT i386 >Organization: >Environment: System: FreeBSD anyware12.anyware 5.2-CURRENT FreeBSD 5.2-CURRENT #0: Fri Mar 26 17:43:44 CET 2004 jbq@anyware12.anyware:/usr/obj/usr/src/sys/ANYWARE12 i386 >Description: * Resin has been updated to 3.0.8, see http://www.caucho.com/resin-3.0/features/resin-3.0.8.xtp for details. * The updated port removes two patches: patch-apache-Makefile.in and patch-apache2-Makefile.in and adds Apache options to CONFIGURE_ARGS instead * Note that Apache virtual hosts support still needs improvements >How-To-Repeat: >Fix: diff -ru /usr/ports/www/resin3/Makefile resin3/Makefile --- /usr/ports/www/resin3/Makefile Tue Mar 30 10:03:57 2004 +++ resin3/Makefile Wed Jun 16 10:45:50 2004 @@ -8,7 +8,7 @@ # PORTNAME= resin -PORTVERSION= 3.0.7 +PORTVERSION= 3.0.8 CATEGORIES= www java MASTER_SITES= http://www.caucho.com/download/ @@ -57,6 +57,8 @@ ${FILESDIR}/resin.sh.in COPYDIRS= doc lib libexec webapps +.include <bsd.port.pre.mk> + # Pass JAVA_HOME as determined by bsd.java.mk CONFIGURE_ARGS+= --with-java-home=${JAVA_HOME} @@ -88,6 +90,14 @@ PLIST_SUB+= APP_NAME=${APP_NAME} PLIST_SUB+= APXS=${APXS} +.if ((defined(WITH_APACHE) && (${WITH_APACHE} == yes || ${WITH_APACHE} == YES)) \ +|| (defined(WITH_APACHE2) && (${WITH_APACHE2} == yes || ${WITH_APACHE2} == YES))) +LIBEXECDIR!= ${APXS} -q LIBEXECDIR +SYSCONFDIR!= ${APXS} -q SYSCONFDIR +CONFIGURE_ARGS+= --with-apache-libexec=${LIBEXECDIR} +CONFIGURE_ARGS+= --with-apache-conf=${SYSCONFDIR} +.endif + SUBSTITUTIONS= -e "s|%%APP_HOME%%|${APP_HOME}|g" \ -e "s|%%APP_NAME%%|${APP_NAME}|g" \ -e "s|%%APXS%%|${APXS}|g" \ @@ -105,8 +115,6 @@ -e "s|%%RUNASUSER%%|${RUNASUSER}|g" \ -e "s|%%WRKDIR%%|${WRKDIR}|g" \ -e "s|%%WRKSRC%%|${WRKSRC}|g" - -.include <bsd.port.pre.mk> post-patch: .for FILE in ${REINPLACE_FILES} diff -ru /usr/ports/www/resin3/distinfo resin3/distinfo --- /usr/ports/www/resin3/distinfo Tue Mar 30 10:03:57 2004 +++ resin3/distinfo Wed Jun 16 10:45:50 2004 @@ -1,2 +1,2 @@ -MD5 (resin-3.0.7.tar.gz) = 337043c5e20341409628002afa263cdd -SIZE (resin-3.0.7.tar.gz) = 5332182 +MD5 (resin-3.0.8.tar.gz) = 30498b230b287d45ce914befdeaa0fee +SIZE (resin-3.0.8.tar.gz) = 5757738 diff -ru /usr/ports/www/resin3/files/install.sh resin3/files/install.sh --- /usr/ports/www/resin3/files/install.sh Tue Mar 30 10:03:57 2004 +++ resin3/files/install.sh Wed Jun 16 10:45:50 2004 @@ -18,15 +18,15 @@ else test -d %%PREFIX%%/etc/%%APP_NAME%% || mkdir %%PREFIX%%/etc/%%APP_NAME%% echo Created configuration directory %%PREFIX%%/etc/%%APP_NAME%% - install %%WRKDIR%%/resin.conf %%PREFIX%%/etc/%%APP_NAME%%/resin.xml + cp %%WRKDIR%%/resin.conf %%PREFIX%%/etc/%%APP_NAME%%/resin.xml echo Installed %%PREFIX%%/etc/%%APP_NAME%%/resin.xml fi # Install new config file with '-dist' appended -install %%WRKDIR%%/resin.conf %%PREFIX%%/etc/%%APP_NAME%%/resin.xml-dist +cp %%WRKDIR%%/resin.conf %%PREFIX%%/etc/%%APP_NAME%%/resin.xml-dist echo Installed %%PREFIX%%/etc/%%APP_NAME%%/resin.xml-dist -install %%WRKSRC%%/conf/app-default.xml %%PREFIX%%/etc/%%APP_NAME%% +cp %%WRKSRC%%/conf/app-default.xml %%PREFIX%%/etc/%%APP_NAME%% echo Installed %%PREFIX%%/etc/%%APP_NAME%%/app-default.xml install %%WRKDIR%%/resin.sh.in %%PREFIX%%/etc/rc.d/%%APP_NAME%%.sh Only in /usr/ports/www/resin3/files: patch-apache-Makefile.in Only in /usr/ports/www/resin3/files: patch-apache2-Makefile.in diff -ru /usr/ports/www/resin3/files/patch-resin.conf resin3/files/patch-resin.conf --- /usr/ports/www/resin3/files/patch-resin.conf Tue Mar 30 10:03:57 2004 +++ resin3/files/patch-resin.conf Wed Jun 16 10:45:50 2004 @@ -1,15 +1,6 @@ ---- conf/resin.conf.orig Thu Mar 25 01:28:47 2004 -+++ conf/resin.conf Sun Mar 28 13:07:28 2004 -@@ -67,7 +67,7 @@ - <keepalive-timeout>120s</keepalive-timeout> - - <!-- The http port --> -- <http id="" host="*" port="8080"/> -+ <http id="" host="*" port="%%PORT%%"/> - - <!-- - - SSL port configuration: -@@ -148,7 +148,7 @@ +--- 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 @@ - With another web server, like Apache, this can be commented out - because the web server will log this information. --> @@ -18,7 +9,7 @@ format='%h %l %u %t "%r" %s %b "%{Referer}i" "%{User-Agent}i"' rollover-period='1W'/> -@@ -176,7 +176,7 @@ +@@ -186,7 +186,7 @@ </host-default> <!-- includes the web-app-default for default web-app behavior --> diff -ru /usr/ports/www/resin3/files/pkg-message.in resin3/files/pkg-message.in --- /usr/ports/www/resin3/files/pkg-message.in Tue Mar 30 10:03:57 2004 +++ resin3/files/pkg-message.in Wed Jun 16 10:45:50 2004 @@ -3,4 +3,6 @@ You may want to start it using the startup script installed as %%PREFIX%%/etc/rc.d/%%APP_NAME%%.sh and then point your web browser to the default home page at http://localhost:%%PORT%%/ to read -the doc. Resin configuration is located at %%PREFIX%%/etc/%%APP_NAME%%/resin.xml +the documentation and test the samples. + +Resin configuration is located at %%PREFIX%%/etc/%%APP_NAME%%/resin.xml diff -ru /usr/ports/www/resin3/files/resin.sh.in resin3/files/resin.sh.in --- /usr/ports/www/resin3/files/resin.sh.in Tue Mar 30 10:03:57 2004 +++ resin3/files/resin.sh.in Fri Apr 9 18:05:56 2004 @@ -22,6 +22,7 @@ -pid %%PID_FILE%%" PATH=/usr/sbin:/usr/bin:/bin +unset CLASSPATH export JAVA_HOME=%%JAVA_HOME%% export RESIN_HOME=$PREFIX/%%APP_NAME%% diff -ru /usr/ports/www/resin3/pkg-plist resin3/pkg-plist --- /usr/ports/www/resin3/pkg-plist Tue Mar 30 10:03:57 2004 +++ resin3/pkg-plist Wed Jun 16 10:45:50 2004 @@ -7,6 +7,7 @@ %%APP_NAME%%/lib/jstl-11.jar %%APP_NAME%%/lib/jta-101.jar %%APP_NAME%%/lib/license.jar +%%APP_NAME%%/lib/portlet-10.jar %%APP_NAME%%/lib/resin.jar %%APP_NAME%%/lib/webutil.jar %%APP_NAME%%/webapps/resin-doc.war >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040616093436.EC9976532>