Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 14 Mar 2004 11:24:17 +0100 (CET)
From:      Jean-Baptiste Quenot <jb.quenot@caraldi.com>
To:        FreeBSD-gnats-submit@freebsd.org
Cc:        ports@freebsd.org
Subject:   Maintainer update: www/resin2 upgraded to 2.1.12
Message-ID:  <20040314102417.E8E0DBB@watt.intra.caraldi.com>

next in thread | raw e-mail | index | archive | help

>Submitter-Id:	current-users
>Originator:	Jean-Baptiste Quenot
>Confidential:	no
>Synopsis:	Maintainer update: www/resin2 upgraded to 2.1.12
>Severity:	non-critical
>Priority:	medium
>Category:	ports
>Class:		maintainer-update
>Release:	FreeBSD 5.1-CURRENT i386
>Environment:
System: FreeBSD watt.intra.caraldi.com 5.1-CURRENT FreeBSD 5.1-CURRENT #6: Tue Oct 14 19:03:28 CEST 2003 jbq@watt.intra.caraldi.com:/usr/obj/usr/src/sys/WATT i386
>Description:
* Upgrade to 2.1.12
* Set LATEST_LINK
* Add libresin.so to packing list
* Add license information to pkg-descr
* USE_REINPLACE and REINPLACE_CMD instead of sed -i
* patch for src/c/plugin/resin/Makefile.in removed: Changelog from upstreams
  states: updated makefile/configure.in for FreeBSD bin/resin (rep by Sujay
  D'Souza)
>Fix:
Remove files/patch-Makefile.in and apply the following patch:
---------------------------------------8<---------------------------------------
diff -ru /usr/ports/www/resin2/Makefile mk-resin2/Makefile
--- /usr/ports/www/resin2/Makefile	Thu Nov 20 22:25:09 2003
+++ mk-resin2/Makefile	Thu Mar 11 14:10:47 2004
@@ -8,8 +8,7 @@
 #
 
 PORTNAME=	resin
-PORTVERSION=	2.1.11
-PORTREVISION=	1
+PORTVERSION=	2.1.12
 CATEGORIES=	www java
 MASTER_SITES=	http://www.caucho.com/download/
 
@@ -19,6 +18,7 @@
 USE_JAVA=	1.2+
 HAS_CONFIGURE=	yes
 USE_PERL5=	yes
+USE_REINPLACE=	yes
 
 # Customizable settings
 RUNASUSER?=	www
@@ -30,6 +30,7 @@
 # If we used PKGNAMESUFFIX, the package name would be resin2-2.1.11
 APP_NAME_SUFFIX=	${PORTVERSION:C/\..*$//}
 APP_NAME?=	${PORTNAME}${APP_NAME_SUFFIX}
+LATEST_LINK=	${APP_NAME}
 APP_HOME?=	${PREFIX}/${APP_NAME}
 WITH_APACHE?=	NO
 WITH_APACHE2?=	NO
@@ -53,6 +54,7 @@
 	${WRKSRC}/conf/resin.conf \
 	${WRKSRC}/bin/wrapper.pl.in \
 	${FILESDIR}/resin.sh.in
+COPYDIRS=	doc lib libexec xsl
 
 # Pass JAVA_HOME as determined by bsd.java.mk
 CONFIGURE_ARGS+=	--with-java-home=${JAVA_HOME}
@@ -88,6 +90,7 @@
 SUBSTITUTIONS=	-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" \
@@ -106,7 +109,7 @@
 
 post-patch:
 .for FILE in ${REINPLACE_FILES}
-	@${SED} -i bak ${SUBSTITUTIONS} ${FILE}
+	@${REINPLACE_CMD} ${SUBSTITUTIONS} ${FILE}
 .endfor
 .for FILE in ${REPLACE_FILES}
 	@${SED} ${SUBSTITUTIONS} ${FILE} > ${WRKDIR}/`basename ${FILE}`
@@ -116,9 +119,9 @@
 defined(WITH_APACHE) && (${WITH_APACHE} == yes || ${WITH_APACHE} == 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 \
-	file, 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 \
+	    file, for example: | fmt -w 80 >> ${PKGMESSAGE}
 	@${ECHO_CMD} CauchoConfigFile ${PREFIX}/etc/${APP_NAME}.xml >> ${PKGMESSAGE}
 .endif
 	@${MV} ${WRKDIR}/wrapper.pl.in ${WRKSRC}/bin/wrapper.pl.in
diff -ru /usr/ports/www/resin2/distinfo mk-resin2/distinfo
--- /usr/ports/www/resin2/distinfo	Wed Oct  1 13:20:42 2003
+++ mk-resin2/distinfo	Thu Mar 11 13:52:35 2004
@@ -1 +1,2 @@
-MD5 (resin-2.1.11.tar.gz) = 97cd4be46138bf86ce582e437d747d1e
+MD5 (resin-2.1.12.tar.gz) = d435aae4b9a7154d643bba19a6d06098
+SIZE (resin-2.1.12.tar.gz) = 3301331
diff -ru /usr/ports/www/resin2/files/install.sh mk-resin2/files/install.sh
--- /usr/ports/www/resin2/files/install.sh	Thu Nov 20 22:25:09 2003
+++ mk-resin2/files/install.sh	Sun Feb 22 19:23:51 2004
@@ -36,13 +36,13 @@
 
 list()
 {
-    for dir in doc lib xsl ; do
+    for dir in %%COPYDIRS%% ; do
         ( cd %%WRKSRC%% ; find $dir )
     done
 }
 
 # Remove all empty dirs
-( cd %%WRKSRC%% ; find doc -type d -empty -delete )
+( cd %%WRKSRC%% && find %%COPYDIRS%% -type d -empty -delete )
 
 echo Installing in %%APP_HOME%%
 list | xargs tar -C %%WRKSRC%% -cf- | tar -C %%APP_HOME%% -xpf-
Only in /usr/ports/www/resin2/files: patch-Makefile.in
diff -ru /usr/ports/www/resin2/pkg-descr mk-resin2/pkg-descr
--- /usr/ports/www/resin2/pkg-descr	Wed Oct  1 13:20:42 2003
+++ mk-resin2/pkg-descr	Sun Feb  8 18:02:33 2004
@@ -6,4 +6,20 @@
 for Apache, and supports the latest Servlet 2.3 and JSP 1.2 specifications from
 Sun.
 
+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. 
+
+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. 
+
+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/resin2/pkg-plist mk-resin2/pkg-plist
--- /usr/ports/www/resin2/pkg-plist	Thu Nov 20 22:25:09 2003
+++ mk-resin2/pkg-plist	Thu Mar 11 13:58:23 2004
@@ -381,6 +381,7 @@
 %%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
 etc/rc.d/%%APP_NAME%%.sh
 sbin/%%APP_NAME%%ctl
 %%MOD_DIR%%/mod_caucho.so
@@ -451,6 +452,7 @@
 @dirrm %%APP_NAME%%/xsl/js/caucho
 @dirrm %%APP_NAME%%/xsl/js
 @dirrm %%APP_NAME%%/xsl
+@dirrm %%APP_NAME%%/libexec
 @dirrm %%APP_NAME%%
 @unexec if cmp -s %D/etc/%%APP_NAME%%.xml %D/etc/%%APP_NAME%%.xml-dist; then rm -f %D/etc/%%APP_NAME%%.xml; else echo If permanently deleting this package, %D/etc/%%APP_NAME%%.xml must be removed manually; fi
 etc/%%APP_NAME%%.xml-dist
---------------------------------------8<---------------------------------------



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040314102417.E8E0DBB>