Date: Mon, 26 Jan 2004 00:40:13 -0800 (PST) From: Jean-Baptiste Quenot <jb.quenot@caraldi.com> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/61766: [PATCH] Update ports/www/resin3 to 3.0.6 Message-ID: <200401260840.i0Q8eDYK067979@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/61766; it has been noted by GNATS. From: Jean-Baptiste Quenot <jb.quenot@caraldi.com> To: FreeBSD-gnats-submit@freebsd.org Cc: Subject: Re: ports/61766: [PATCH] Update ports/www/resin3 to 3.0.6 Date: Mon, 26 Jan 2004 09:30:25 +0100 --kORqDWCi7qDJ0mEj Content-Type: multipart/mixed; boundary="PNTmBPCT7hxwcZjr" Content-Disposition: inline --PNTmBPCT7hxwcZjr Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Please find attached a diff intended for the FreeBSD committers from official maintainer. Thanks to Xin Li for submitting the updated port! Changes: * Use COPYDIRS variable in Makefile * Upgrade to 3.0.6 (removed compile-loader deadlock) * Update patches and packing list * Remove files/patch-apache2 fixed upstreams * Add license information For convenience, a tarball of the updated port is also available at: http://caraldi.com/jbq/resin/distfiles/resin3/resin3.tgz MD5 (resin3.tgz) =3D b37b5f1edfb5a1c9d8987104f35720fe Thanks in advance, --=20 Jean-Baptiste Quenot http://caraldi.com/jbq/ --PNTmBPCT7hxwcZjr Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=diff-resin Content-Transfer-Encoding: quoted-printable diff -ru /usr/ports/www/resin3/Makefile resin3/Makefile --- /usr/ports/www/resin3/Makefile Fri Nov 21 09:47:56 2003 +++ resin3/Makefile Fri Jan 23 16:19:44 2004 @@ -8,8 +8,7 @@ # =20 PORTNAME=3D resin -PORTVERSION=3D 3.0.3 -PORTREVISION=3D 1 +PORTVERSION=3D 3.0.6 CATEGORIES=3D www java MASTER_SITES=3D http://www.caucho.com/download/ =20 @@ -53,6 +52,7 @@ ${WRKSRC}/conf/resin.conf \ ${WRKSRC}/bin/wrapper.pl.in \ ${FILESDIR}/resin.sh.in +COPYDIRS=3D doc lib webapps xsl =20 # Pass JAVA_HOME as determined by bsd.java.mk CONFIGURE_ARGS+=3D --with-java-home=3D${JAVA_HOME} @@ -88,6 +88,7 @@ SUBSTITUTIONS=3D -e "s|%%APP_HOME%%|${APP_HOME}|g" \ -e "s|%%APP_NAME%%|${APP_NAME}|g" \ -e "s|%%APXS%%|${APXS}|g" \ + -e "s|%%COPYDIRS%%|${COPYDIRS}|g" \ -e "s|%%FILESDIR%%|${FILESDIR}|g" \ -e "s|%%GROUP%%|${GROUP}|g" \ -e "s|%%GID%%|${GID}|g" \ @@ -116,9 +117,9 @@ defined(WITH_APACHE) && (${WITH_APACHE} =3D=3D yes || ${WITH_APACHE} =3D= =3D YES)) @${ECHO_CMD} >> ${PKGMESSAGE} @${ECHO_CMD} The Resin Apache module mod_caucho has been activated \ - in the Apache configuration file, where you should also \ - add a line to specify the location of the Resin configuration \ - server, for example: | fmt -w 80 >> ${PKGMESSAGE} + in the Apache configuration file, where you should also \ + add a line to specify the location of the Resin configuration \ + server, for example: | fmt -w 80 >> ${PKGMESSAGE} @${ECHO_CMD} ResinConfigServer localhost 6802 >> ${PKGMESSAGE} .endif @${MV} ${WRKDIR}/wrapper.pl.in ${WRKSRC}/bin/wrapper.pl.in diff -ru /usr/ports/www/resin3/distinfo resin3/distinfo --- /usr/ports/www/resin3/distinfo Mon Sep 29 14:57:59 2003 +++ resin3/distinfo Fri Jan 23 16:19:44 2004 @@ -1 +1 @@ -MD5 (resin-3.0.3.tar.gz) =3D 3ac2280481f81a3ffd4b395498e32dc6 +MD5 (resin-3.0.6.tar.gz) =3D 032fc45db04945a95cb080fda1b8f216 diff -ru /usr/ports/www/resin3/files/install.sh resin3/files/install.sh --- /usr/ports/www/resin3/files/install.sh Mon Jan 5 00:22:23 2004 +++ resin3/files/install.sh Fri Jan 23 16:19:44 2004 @@ -39,13 +39,13 @@ =20 list() { - for dir in doc lib libexec xsl ; do + for dir in %%COPYDIRS%% libexec ; do ( cd %%WRKSRC%% ; find $dir ) done } =20 # Remove all empty dirs -( cd %%WRKSRC%% ; find doc -type d -empty -delete ) +( cd %%WRKSRC%% && find %%COPYDIRS%% libexec -type d -empty -delete ) =20 echo Installing in %%APP_HOME%% list | xargs tar -C %%WRKSRC%% -cf- | tar -C %%APP_HOME%% -xpf- diff -ru /usr/ports/www/resin3/files/patch-apache-Makefile.in resin3/files/= patch-apache-Makefile.in --- /usr/ports/www/resin3/files/patch-apache-Makefile.in Thu Nov 20 22:44:1= 4 2003 +++ resin3/files/patch-apache-Makefile.in Fri Jan 23 16:19:44 2004 @@ -1,6 +1,6 @@ --- src/c/plugin/apache/Makefile.in.orig Thu Nov 13 09:27:52 2003 +++ src/c/plugin/apache/Makefile.in Thu Nov 13 09:28:36 2003 -@@ -28,8 +28,7 @@ +@@ -29,8 +29,7 @@ $(CC) -c $(INCLUDES) $(CFLAGS) $< =20 install : Only in /usr/ports/www/resin3/files: patch-apache2 diff -ru /usr/ports/www/resin3/files/patch-resin.conf resin3/files/patch-re= sin.conf --- /usr/ports/www/resin3/files/patch-resin.conf Mon Sep 29 14:57:59 2003 +++ resin3/files/patch-resin.conf Fri Jan 23 16:19:44 2004 @@ -1,11 +1,11 @@ ---- conf/resin.conf.orig Mon Sep 29 10:29:29 2003 -+++ conf/resin.conf Mon Sep 29 10:29:48 2003 -@@ -37,7 +37,7 @@ +--- conf/resin.conf.orig Wed Jan 21 01:46:58 2004 ++++ conf/resin.conf Fri Jan 23 12:09:34 2004 +@@ -63,7 +63,7 @@ </class-loader> =20 <!-- The http port --> -- <http id=3D'' host=3D'*' port=3D'8080'/> -+ <http id=3D'' host=3D'*' port=3D'%%PORT%%'/> +- <http id=3D"" host=3D"*" port=3D"8080"/> ++ <http id=3D"" host=3D"*" port=3D"%%PORT%%"/> =20 <!-- - SSL port configuration: diff -ru /usr/ports/www/resin3/pkg-descr resin3/pkg-descr --- /usr/ports/www/resin3/pkg-descr Mon Sep 29 14:57:59 2003 +++ resin3/pkg-descr Fri Jan 23 16:19:44 2004 @@ -6,4 +6,20 @@ for Apache, and supports the latest Servlet 2.3 and JSP 1.2 specifications= from Sun. =20 +o You may use Resin for development, evaluation, and demos. +o You must contact us to purchase a deployment license if either: + + * You are paid to use Resin. + * You are paying someone else to use Resin.=20 + +o If no one is paid to use Resin, you may use Resin for deployment: + + * students + * private use + * tiny startups with neither funding nor income.=20 + +o Anyone falling in between should contact us for a waiver. +o Distributors must contact us. +o If you are allowed to use Resin, you may modify the source for that use. + WWW: http://www.caucho.com/ diff -ru /usr/ports/www/resin3/pkg-plist resin3/pkg-plist --- /usr/ports/www/resin3/pkg-plist Fri Nov 21 09:47:56 2003 +++ resin3/pkg-plist Fri Jan 23 16:19:44 2004 @@ -1,13 +1,4 @@ -%%APP_NAME%%/doc/beta.xtp -%%APP_NAME%%/doc/changes-1.xtp -%%APP_NAME%%/doc/changes.xtp -%%APP_NAME%%/doc/errata.xtp -%%APP_NAME%%/doc/features.xtp -%%APP_NAME%%/doc/future.xtp -%%APP_NAME%%/doc/index.xtp -%%APP_NAME%%/doc/href-map.xml -%%APP_NAME%%/doc/toc.xml -%%APP_NAME%%/doc/images/caucho-blue.gif +%%APP_NAME%%/doc/css/default.css %%APP_NAME%%/doc/images/apache_srun.gif %%APP_NAME%%/doc/images/appserver.gif %%APP_NAME%%/doc/images/background.gif @@ -15,6 +6,7 @@ %%APP_NAME%%/doc/images/ball8.gif %%APP_NAME%%/doc/images/bean.gif %%APP_NAME%%/doc/images/bean1.gif +%%APP_NAME%%/doc/images/caucho-white.jpg %%APP_NAME%%/doc/images/caucho.gif %%APP_NAME%%/doc/images/compiler.gif %%APP_NAME%%/doc/images/file.gif @@ -24,6 +16,7 @@ %%APP_NAME%%/doc/images/iis_srun.gif %%APP_NAME%%/doc/images/jndi_tree.gif %%APP_NAME%%/doc/images/jsp.gif +%%APP_NAME%%/doc/images/left_background.gif %%APP_NAME%%/doc/images/logo.gif %%APP_NAME%%/doc/images/pixel.gif %%APP_NAME%%/doc/images/resin_powered.gif @@ -34,33 +27,39 @@ %%APP_NAME%%/doc/images/style.gif %%APP_NAME%%/doc/images/webserver.gif %%APP_NAME%%/doc/images/website_srun.gif -%%APP_NAME%%/doc/images/caucho.jpg -%%APP_NAME%%/doc/images/.xvpics/background.gif -%%APP_NAME%%/doc/images/.xvpics/left_background.gif -%%APP_NAME%%/doc/images/caucho-white.jpg -%%APP_NAME%%/doc/images/left_background.gif -%%APP_NAME%%/lib/resin.jar -%%APP_NAME%%/lib/jsdk24.jar -%%APP_NAME%%/lib/jta_101.jar +%%APP_NAME%%/doc/changes-1.xtp +%%APP_NAME%%/doc/changes.xtp +%%APP_NAME%%/doc/index.xtp +%%APP_NAME%%/doc/toc.xml +%%APP_NAME%%/lib/dom.jar %%APP_NAME%%/lib/isorelax.jar -%%APP_NAME%%/lib/jmx.jar %%APP_NAME%%/lib/jca-15.jar +%%APP_NAME%%/lib/jmx-12.jar +%%APP_NAME%%/lib/jsdk-24.jar %%APP_NAME%%/lib/jstl-11.jar +%%APP_NAME%%/lib/jta-101.jar +%%APP_NAME%%/lib/license.jar +%%APP_NAME%%/lib/resin.jar %%APP_NAME%%/lib/webutil.jar +%%APP_NAME%%/webapps/resin-doc.war %%APP_NAME%%/xsl/caucho/comment.xsl %%APP_NAME%%/xsl/caucho/contents.xsl %%APP_NAME%%/xsl/caucho/control.xsl %%APP_NAME%%/xsl/caucho/debug.xsl %%APP_NAME%%/xsl/caucho/defaultcopy.xsl %%APP_NAME%%/xsl/caucho/format.xsl -%%APP_NAME%%/xsl/caucho/newstyle.xsl -%%APP_NAME%%/xsl/caucho/weblog.xsl %%APP_NAME%%/xsl/caucho/fun.xsl %%APP_NAME%%/xsl/caucho/href.xsl %%APP_NAME%%/xsl/caucho/include.xsl +%%APP_NAME%%/xsl/caucho/newstyle.xsl %%APP_NAME%%/xsl/caucho/nodeinfo.xsl %%APP_NAME%%/xsl/caucho/toc.xsl %%APP_NAME%%/xsl/caucho/viewfile.xsl +%%APP_NAME%%/xsl/caucho/weblog.xsl +%%APP_NAME%%/xsl/js/caucho/defaultcopy.xsl +%%APP_NAME%%/xsl/js/caucho/format.xsl +%%APP_NAME%%/xsl/js/caucho/weblog.xsl +%%APP_NAME%%/xsl/tools/indexer.xsl %%APP_NAME%%/xsl/caucho_default.xsl %%APP_NAME%%/xsl/caucho_header.xsl %%APP_NAME%%/xsl/caucho_subpage.xsl @@ -71,9 +70,6 @@ %%APP_NAME%%/xsl/new_doc_header.xsl %%APP_NAME%%/xsl/search.xsl %%APP_NAME%%/xsl/subpage.xsl -%%APP_NAME%%/xsl/js/caucho/defaultcopy.xsl -%%APP_NAME%%/xsl/js/caucho/format.xsl -%%APP_NAME%%/xsl/js/caucho/weblog.xsl %%APP_NAME%%/libexec/libresin.so %%APP_NAME%%/libexec/libresinssl.so etc/app-default.xml @@ -82,13 +78,15 @@ %%MOD_DIR%%/mod_caucho.so %%APACHE%%@exec %%APXS%% -e -a -n caucho %f %%APACHE%%@unexec %%APXS%% -e -A -n caucho %f -@dirrm %%APP_NAME%%/doc/images/.xvpics +@dirrm %%APP_NAME%%/doc/css @dirrm %%APP_NAME%%/doc/images @dirrm %%APP_NAME%%/doc @dirrm %%APP_NAME%%/lib +@dirrm %%APP_NAME%%/webapps @dirrm %%APP_NAME%%/xsl/caucho @dirrm %%APP_NAME%%/xsl/js/caucho @dirrm %%APP_NAME%%/xsl/js +@dirrm %%APP_NAME%%/xsl/tools @dirrm %%APP_NAME%%/xsl @dirrm %%APP_NAME%%/libexec @dirrm %%APP_NAME%% --PNTmBPCT7hxwcZjr-- --kORqDWCi7qDJ0mEj Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.1 (GNU/Linux) iD8DBQFAFNAe9xx3BCMc9gsRAp+cAJ92wa8QH1plqEco2xvLa+YLnnMTwACfcIJq SnJey1mlC6UJZsaA7lMe9vQ= =eiCu -----END PGP SIGNATURE----- --kORqDWCi7qDJ0mEj--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200401260840.i0Q8eDYK067979>