From 5e0219acda7d984479567588c5d6316a0f032dcf Mon Sep 17 00:00:00 2001 From: Clement Laforet Date: Mon, 26 Jan 2004 10:23:38 +0000 Subject: - Update to 3.0.6 PR: 61766 [1] Submitted by: Xin LI [1], Jean-Baptiste Quenot (maintainer) --- www/resin3/Makefile | 11 +++---- www/resin3/distinfo | 2 +- www/resin3/files/install.sh | 4 +-- www/resin3/files/patch-apache-Makefile.in | 2 +- www/resin3/files/patch-apache2 | 11 ------- www/resin3/files/patch-resin.conf | 10 +++---- www/resin3/pkg-descr | 16 +++++++++++ www/resin3/pkg-plist | 48 +++++++++++++++---------------- 8 files changed, 54 insertions(+), 50 deletions(-) delete mode 100644 www/resin3/files/patch-apache2 (limited to 'www/resin3') diff --git a/www/resin3/Makefile b/www/resin3/Makefile index 74b028245d07..011a7b145c7b 100644 --- a/www/resin3/Makefile +++ b/www/resin3/Makefile @@ -8,8 +8,7 @@ # PORTNAME= resin -PORTVERSION= 3.0.3 -PORTREVISION= 1 +PORTVERSION= 3.0.6 CATEGORIES= www java MASTER_SITES= http://www.caucho.com/download/ @@ -53,6 +52,7 @@ REPLACE_FILES= ${FILESDIR}/pkg-install \ ${WRKSRC}/conf/resin.conf \ ${WRKSRC}/bin/wrapper.pl.in \ ${FILESDIR}/resin.sh.in +COPYDIRS= doc lib webapps xsl # Pass JAVA_HOME as determined by bsd.java.mk CONFIGURE_ARGS+= --with-java-home=${JAVA_HOME} @@ -88,6 +88,7 @@ PLIST_SUB+= APXS=${APXS} 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" \ @@ -116,9 +117,9 @@ post-patch: 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 \ - 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 --git a/www/resin3/distinfo b/www/resin3/distinfo index 3647fc3647f8..5941d9f40d8a 100644 --- a/www/resin3/distinfo +++ b/www/resin3/distinfo @@ -1 +1 @@ -MD5 (resin-3.0.3.tar.gz) = 3ac2280481f81a3ffd4b395498e32dc6 +MD5 (resin-3.0.6.tar.gz) = 032fc45db04945a95cb080fda1b8f216 diff --git a/www/resin3/files/install.sh b/www/resin3/files/install.sh index 24794c4e9be9..2499baf9607d 100644 --- a/www/resin3/files/install.sh +++ b/www/resin3/files/install.sh @@ -39,13 +39,13 @@ echo Created installation directory %%APP_HOME%% list() { - for dir in doc lib libexec xsl ; do + for dir in %%COPYDIRS%% libexec ; do ( cd %%WRKSRC%% ; find $dir ) done } # Remove all empty dirs -( cd %%WRKSRC%% ; find doc -type d -empty -delete ) +( cd %%WRKSRC%% && find %%COPYDIRS%% libexec -type d -empty -delete ) echo Installing in %%APP_HOME%% list | xargs tar -C %%WRKSRC%% -cf- | tar -C %%APP_HOME%% -xpf- diff --git a/www/resin3/files/patch-apache-Makefile.in b/www/resin3/files/patch-apache-Makefile.in index 4b10a88f34b5..161e6d7151d7 100644 --- a/www/resin3/files/patch-apache-Makefile.in +++ b/www/resin3/files/patch-apache-Makefile.in @@ -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) $< install : diff --git a/www/resin3/files/patch-apache2 b/www/resin3/files/patch-apache2 deleted file mode 100644 index 2130da28e974..000000000000 --- a/www/resin3/files/patch-apache2 +++ /dev/null @@ -1,11 +0,0 @@ ---- src/c/plugin/apache2/mod_caucho.c.orig Tue Apr 15 23:28:46 2003 -+++ src/c/plugin/apache2/mod_caucho.c Fri Jun 6 01:37:29 2003 -@@ -52,7 +52,7 @@ - #include "cse.h" - #include "version.h" - --#ifndef APR_HAS_THREADS -+#if !APR_HAS_THREADS - #define apr_thread_mutex_t int - #define apr_thread_mutex_create(a,b,c) - #define apr_thread_mutex_lock(a) diff --git a/www/resin3/files/patch-resin.conf b/www/resin3/files/patch-resin.conf index f88ee07191c4..7d059801e11f 100644 --- a/www/resin3/files/patch-resin.conf +++ b/www/resin3/files/patch-resin.conf @@ -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 @@ -- -+ +- ++