Index: head/www/resin3/Makefile =================================================================== --- head/www/resin3/Makefile (revision 99173) +++ head/www/resin3/Makefile (revision 99174) @@ -1,136 +1,137 @@ # New ports collection makefile for: resin3 # Whom: Jean-Baptiste Quenot # Date Created: 2003-09-29 14:17:14 # # ex:ts=20:sw=20 # # $FreeBSD$ # PORTNAME= resin -PORTVERSION= 3.0.3 -PORTREVISION= 1 +PORTVERSION= 3.0.6 CATEGORIES= www java MASTER_SITES= http://www.caucho.com/download/ MAINTAINER= jb.quenot@caraldi.com COMMENT= Resin, a Java-based Application Server, 3.x branch USE_JAVA= 1.2+ HAS_CONFIGURE= yes USE_PERL5= yes # Customizable settings RUNASUSER?= www RUNASUID?= 80 GROUP?= ${RUNASUSER} GID?= ${RUNASUID} PORT?= 8080 # Do not use PKGNAMESUFFIX here because version info is already in PORTVERSION # If we used PKGNAMESUFFIX, the package name would be resin2-2.1.11 APP_NAME_SUFFIX= ${PORTVERSION:C/\..*$//} APP_NAME?= ${PORTNAME}${APP_NAME_SUFFIX} APP_HOME?= ${PREFIX}/${APP_NAME} WITH_APACHE?= NO WITH_APACHE2?= NO PID_FILE?= /var/run/${APP_NAME}.pid # Other settings APXS?= ${LOCALBASE}/sbin/apxs MOD_DIR?= `${APXS} -q LIBEXECDIR` PKGINSTALL= ${WRKDIR}/pkg-install PKGDEINSTALL= ${WRKDIR}/pkg-deinstall PKGMESSAGE= ${WRKDIR}/pkg-message # We need WRKSRC and WRKDIR right now so define them "manually" WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} WRKDIR?= ${WRKDIRPREFIX}${.CURDIR}/work REINPLACE_FILES= ${WRKSRC}/src/c/plugin/apache/Makefile.in \ ${WRKSRC}/src/c/plugin/apache2/Makefile.in REPLACE_FILES= ${FILESDIR}/pkg-install \ ${FILESDIR}/pkg-deinstall \ ${FILESDIR}/install.sh \ ${FILESDIR}/pkg-message.in \ ${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} # Install the Apache plugin if needed .if defined(WITH_APACHE) && (${WITH_APACHE} == yes || ${WITH_APACHE} == YES) # # Apache 1.3 # BUILD_DEPENDS+= ${APXS}:${PORTSDIR}/www/apache13 CONFIGURE_ARGS+= --with-apxs=${APXS} PLIST_SUB+= MOD_DIR=libexec/apache # Allow apxs invocations PLIST_SUB+= APACHE="" .elif defined(WITH_APACHE2) && (${WITH_APACHE2} == yes || ${WITH_APACHE2} == YES) # # Apache 2 # BUILD_DEPENDS+= ${APXS}:${PORTSDIR}/www/apache2 CONFIGURE_ARGS+= --with-apxs=${APXS} PLIST_SUB+= MOD_DIR=libexec/apache2 # Allow apxs invocations PLIST_SUB+= APACHE="" .else PLIST_SUB+= MOD_DIR="@comment " # Prevent apxs invocations PLIST_SUB+= APACHE="@comment " .endif PLIST_SUB+= APP_NAME=${APP_NAME} 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" \ -e "s|%%JAVA_HOME%%|${JAVA_HOME}|g" \ -e "s|%%PERL%%|${PERL}|g" \ -e "s|%%PID_FILE%%|${PID_FILE}|g" \ -e "s|%%PORT%%|${PORT}|g" \ -e "s|%%PORTNAME%%|${PORTNAME}|g" \ -e "s|%%PREFIX%%|${PREFIX}|g" \ -e "s|%%RUNASUID%%|${RUNASUID}|g" \ -e "s|%%RUNASUSER%%|${RUNASUSER}|g" \ -e "s|%%WRKDIR%%|${WRKDIR}|g" \ -e "s|%%WRKSRC%%|${WRKSRC}|g" .include post-patch: .for FILE in ${REINPLACE_FILES} @${SED} -i bak ${SUBSTITUTIONS} ${FILE} .endfor .for FILE in ${REPLACE_FILES} @${SED} ${SUBSTITUTIONS} ${FILE} > ${WRKDIR}/`basename ${FILE}` .endfor @fmt -w 80 < ${WRKDIR}/pkg-message.in > ${PKGMESSAGE} .if (defined(WITH_APACHE2) && (${WITH_APACHE2} == yes || ${WITH_APACHE2} == YES) || \ 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 # Resin does not handle installation, so proceed now post-install: @${SH} ${WRKDIR}/install.sh @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL @${ECHO_CMD} @${ECHO_CMD} "********************************************************************************" @${CAT} ${PKGMESSAGE} @${ECHO_CMD} "********************************************************************************" @${ECHO_CMD} .include Property changes on: head/www/resin3/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: head/www/resin3/distinfo =================================================================== --- head/www/resin3/distinfo (revision 99173) +++ head/www/resin3/distinfo (revision 99174) @@ -1 +1 @@ -MD5 (resin-3.0.3.tar.gz) = 3ac2280481f81a3ffd4b395498e32dc6 +MD5 (resin-3.0.6.tar.gz) = 032fc45db04945a95cb080fda1b8f216 Property changes on: head/www/resin3/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/www/resin3/files/patch-apache2 =================================================================== --- head/www/resin3/files/patch-apache2 (revision 99173) +++ head/www/resin3/files/patch-apache2 (nonexistent) @@ -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) Property changes on: head/www/resin3/files/patch-apache2 ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.1 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/www/resin3/files/install.sh =================================================================== --- head/www/resin3/files/install.sh (revision 99173) +++ head/www/resin3/files/install.sh (revision 99174) @@ -1,51 +1,51 @@ #! /bin/sh set -e warning() { echo "Kept %%PREFIX%%/etc/%%APP_NAME%%.xml intact from previous installation, please diff" echo "against %%APP_NAME%%.xml-dist" } # Install config file only if none is already there if test -e %%PREFIX%%/etc/%%APP_NAME%%.xml && \ ! cmp -s %%WRKDIR%%/resin.conf %%PREFIX%%/etc/%%APP_NAME%%.xml ; then echo echo "********************************************************************************" warning | fmt -w 80 echo "********************************************************************************" echo else install %%WRKDIR%%/resin.conf %%PREFIX%%/etc/%%APP_NAME%%.xml echo Installed %%PREFIX%%/etc/%%APP_NAME%%.xml fi # Install new config file with '-dist' appended install %%WRKDIR%%/resin.conf %%PREFIX%%/etc/%%APP_NAME%%.xml-dist echo Installed %%PREFIX%%/etc/%%APP_NAME%%.xml-dist install %%WRKSRC%%/conf/app-default.xml %%PREFIX%%/etc/ echo Installed %%PREFIX%%/etc/app-default.xml install %%WRKDIR%%/resin.sh.in %%PREFIX%%/etc/rc.d/%%APP_NAME%%.sh chmod 755 %%PREFIX%%/etc/rc.d/%%APP_NAME%%.sh echo Installed %%PREFIX%%/etc/rc.d/%%APP_NAME%%.sh install %%WRKSRC%%/bin/wrapper.pl %%PREFIX%%/sbin/%%APP_NAME%%ctl echo Installed %%PREFIX%%/sbin/%%APP_NAME%%ctl test -d %%APP_HOME%% || mkdir %%APP_HOME%% 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- Property changes on: head/www/resin3/files/install.sh ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/www/resin3/files/patch-apache-Makefile.in =================================================================== --- head/www/resin3/files/patch-apache-Makefile.in (revision 99173) +++ head/www/resin3/files/patch-apache-Makefile.in (revision 99174) @@ -1,12 +1,12 @@ --- 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 : - sh install.sh -conf $(apache_conf) -libexec $(apache_libexec) \ - -resin_home $(resin_home) + %%APXS%% -i -a -n caucho mod_caucho.so clean : - rm *.o *.lo *.la *.so Property changes on: head/www/resin3/files/patch-apache-Makefile.in ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/www/resin3/files/patch-resin.conf =================================================================== --- head/www/resin3/files/patch-resin.conf (revision 99173) +++ head/www/resin3/files/patch-resin.conf (revision 99174) @@ -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 @@ -- -+ +- ++