6 files changed, 149 insertions, 100 deletions

diff --git a/www/resin3/Makefile b/www/resin3/Makefile
index 2b62b51b8bc9..a06e410732d9 100644
--- a/www/resin3/Makefile
+++ b/www/resin3/Makefile
@@ -2,60 +2,58 @@
 # Whom:                                Jean-Baptiste Quenot <jb.quenot@caraldi.com>
 # Date Created:                        2003-09-29 14:17:14
 #
-# ex:ts=20:sw=20
-#
 # $FreeBSD$
 #
 
-PORTNAME=	resin
-PORTVERSION=	3.0.8
-CATEGORIES=	www java
-MASTER_SITES=	http://www.caucho.com/download/
+PORTNAME=		resin
+PORTVERSION=		3.0.9
+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
+MAINTAINER=		jb.quenot@caraldi.com
+COMMENT=		Resin, a Java-based Application Server, 3.x branch
 
-USE_JAVA=	1.2+
-HAS_CONFIGURE=	yes
-USE_GMAKE=	yes
-USE_PERL5=	yes
-USE_REINPLACE=	yes
+USE_JAVA=		1.2+
+HAS_CONFIGURE=		yes
+USE_GMAKE=		yes
+USE_PERL5_RUN=		yes
+USE_REINPLACE=		yes
 
 # Customizable settings
-RUNASUSER?=	www
-RUNASUID?=	80
-GROUP?=	${RUNASUSER}
-GID?=	${RUNASUID}
-PORT?=	8080
+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}
-LATEST_LINK=	${APP_NAME}
-APP_HOME?=	${PREFIX}/${APP_NAME}
-WITH_APACHE?=	NO
-WITH_APACHE2?=	NO
-PID_FILE?=	/var/run/${APP_NAME}.pid
+APP_NAME?=		${PORTNAME}${APP_NAME_SUFFIX}
+LATEST_LINK=		${APP_NAME}
+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
+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 libexec webapps
+WRKSRC=			${WRKDIR}/${PORTNAME}-${PORTVERSION}
+WRKDIR?=		${WRKDIRPREFIX}${.CURDIR}/work
+REINPLACE_FILES=	${WRKSRC}/src/c/apache1/Makefile.in \
+			${WRKSRC}/src/c/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=		lib webapps
 
 .include <bsd.port.pre.mk>
 
@@ -67,90 +65,90 @@ CONFIGURE_ARGS+=	--with-java-home=${JAVA_HOME}
 #
 # Apache 1.3
 #
-BUILD_DEPENDS+=	${APXS}:${PORTSDIR}/www/apache13
+BUILD_DEPENDS+=		${APXS}:${PORTSDIR}/www/apache13
 CONFIGURE_ARGS+=	--with-apxs=${APXS}
-PLIST_SUB+=	MOD_DIR=libexec/apache
+PLIST_SUB+=		MOD_DIR=libexec/apache
 # Allow apxs invocations
-PLIST_SUB+=	APACHE=""
+PLIST_SUB+=		APACHE=""
 .elif defined(WITH_APACHE2) && (${WITH_APACHE2} == yes || ${WITH_APACHE2} == YES)
 #
 # Apache 2
 #
-BUILD_DEPENDS+=	${APXS}:${PORTSDIR}/www/apache2
+BUILD_DEPENDS+=		${APXS}:${PORTSDIR}/www/apache2
 CONFIGURE_ARGS+=	--with-apxs=${APXS}
-PLIST_SUB+=	MOD_DIR=libexec/apache2
+PLIST_SUB+=		MOD_DIR=libexec/apache2
 # Allow apxs invocations
-PLIST_SUB+=	APACHE=""
+PLIST_SUB+=		APACHE=""
 .else
-PLIST_SUB+=	MOD_DIR="@comment "
+PLIST_SUB+=		MOD_DIR="@comment "
 # Prevent apxs invocations
-PLIST_SUB+=	APACHE="@comment "
+PLIST_SUB+=		APACHE="@comment "
 .endif
 
-PLIST_SUB+=	APP_NAME=${APP_NAME}
-PLIST_SUB+=	APXS=${APXS}
+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
+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" \
-	-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"
+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"
 
 post-patch:
 .for FILE in ${REINPLACE_FILES}
-	@${REINPLACE_CMD} ${SUBSTITUTIONS} ${FILE}
+			@${REINPLACE_CMD} ${SUBSTITUTIONS} ${FILE}
 .endfor
 .for FILE in ${REPLACE_FILES}
-	@${SED} ${SUBSTITUTIONS} ${FILE} > ${WRKDIR}/`basename ${FILE}`
+			@${SED} ${SUBSTITUTIONS} ${FILE} > ${WRKDIR}/`basename ${FILE}`
 .endfor
-	@fmt -w 80 < ${WRKDIR}/pkg-message.in > ${PKGMESSAGE}
+			@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}
-	@${ECHO_CMD} >> ${PKGMESSAGE}
-	@${ECHO_CMD} "<IfModule mod_caucho.c>" >> ${PKGMESSAGE}
+			@${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}
+			@${ECHO_CMD} >> ${PKGMESSAGE}
+			@${ECHO_CMD} "<IfModule mod_caucho.c>" >> ${PKGMESSAGE}
 .if (defined(WITH_APACHE2) && (${WITH_APACHE2} == yes || ${WITH_APACHE2} == YES))
-	@${ECHO_CMD} "    ResinConfigServer localhost 6802" >> ${PKGMESSAGE}
+			@${ECHO_CMD} "    ResinConfigServer localhost 6802" >> ${PKGMESSAGE}
 .endif
 .if (defined(WITH_APACHE) && (${WITH_APACHE} == yes || ${WITH_APACHE} == YES))
-	@${ECHO_CMD} "    CauchoConfigFile ${PREFIX}/etc/${APP_NAME}/resin.xml" >> ${PKGMESSAGE}
+			@${ECHO_CMD} "    CauchoConfigFile ${PREFIX}/etc/${APP_NAME}/resin.xml" >> ${PKGMESSAGE}
 .endif
-	@${ECHO_CMD} "</IfModule>" >> ${PKGMESSAGE}
+			@${ECHO_CMD} "</IfModule>" >> ${PKGMESSAGE}
 .endif
-	@${MV} ${WRKDIR}/wrapper.pl.in ${WRKSRC}/bin/wrapper.pl.in
+			@${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}
+			@${SH} ${WRKDIR}/install.sh
+			@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+			@${ECHO_CMD}
+			@${ECHO_CMD} "********************************************************************************"
+			@${CAT} ${PKGMESSAGE}
+			@${ECHO_CMD} "********************************************************************************"
+			@${ECHO_CMD}
 
 .include <bsd.port.post.mk>
diff --git a/www/resin3/distinfo b/www/resin3/distinfo
index 862a1aaeee58..1a90dbce027d 100644
--- a/www/resin3/distinfo
+++ b/www/resin3/distinfo
@@ -1,2 +1,2 @@
-MD5 (resin-3.0.8.tar.gz) = 30498b230b287d45ce914befdeaa0fee
-SIZE (resin-3.0.8.tar.gz) = 5757738
+MD5 (resin-3.0.9.tar.gz) = 97a68da3582b7cd98c9e729f136abf27
+SIZE (resin-3.0.9.tar.gz) = 6326402
diff --git a/www/resin3/files/patch-apache1-Makefile.in b/www/resin3/files/patch-apache1-Makefile.in
new file mode 100644
index 000000000000..d227228139de
--- /dev/null
+++ b/www/resin3/files/patch-apache1-Makefile.in
@@ -0,0 +1,12 @@
+--- src/c/apache1/Makefile.in.orig	Mon Oct 11 11:34:53 2004
++++ src/c/apache1/Makefile.in	Mon Oct 11 12:44:59 2004
+@@ -38,8 +38,7 @@
+ 	$(LIBTOOL) --mode=install $(CP) mod_caucho.la $(apache_libexec)
+ 	- rm -f $(apache_libexec)/mod_caucho.la
+ 	- rm -f $(apache_libexec)/mod_caucho.a
+-	sh install.sh -conf $(apache_conf) -libexec $(apache_libexec) \
+-	   -resin_home $(resin_home)
++	%%APXS%% -e -a -n caucho mod_caucho.so
+ 
+ clean	:
+ 	- rm *.o *.lo *.la *.so .libs
diff --git a/www/resin3/files/patch-apache2-Makefile.in b/www/resin3/files/patch-apache2-Makefile.in
new file mode 100644
index 000000000000..d7d041eb7213
--- /dev/null
+++ b/www/resin3/files/patch-apache2-Makefile.in
@@ -0,0 +1,12 @@
+--- src/c/apache2/Makefile.in.orig	Mon Oct 11 11:34:53 2004
++++ src/c/apache2/Makefile.in	Mon Oct 11 12:44:59 2004
+@@ -38,8 +38,7 @@
+ 	$(LIBTOOL) --mode=install $(CP) mod_caucho.la $(apache_libexec)
+ 	- rm -f $(apache_libexec)/mod_caucho.la
+ 	- rm -f $(apache_libexec)/mod_caucho.a
+-	sh install.sh -conf $(apache_conf) -libexec $(apache_libexec) \
+-	   -resin_home $(resin_home)
++	%%APXS%% -e -a -n caucho mod_caucho.so
+ 
+ clean	:
+ 	- rm *.o *.lo *.la *.so .libs
diff --git a/www/resin3/files/patch-configure b/www/resin3/files/patch-configure
new file mode 100644
index 000000000000..503fd1585c3e
--- /dev/null
+++ b/www/resin3/files/patch-configure
@@ -0,0 +1,23 @@
+--- configure.orig	Tue Oct 12 18:34:32 2004
++++ configure	Tue Oct 12 18:34:48 2004
+@@ -8487,20 +8487,6 @@
+ # Using Perl if it's available.
+ #
+ PERL=`which perl`
+-if test -z "${LD_SHLIB}"; then
+-  if test -z "${LD_SHLIB}" -a "x`$PERL -V:dlsrc 2>/dev/null | grep dlopen`" != "x"; then
+-    PCC="`$PERL -V:cc | cut -d\' -f2`"
+-    if test "${PCC}" = "${CC}"; then
+-      CFLAGS_SHLIB="`$PERL -V:cccdlflags | cut -d\' -f2`"
+-      LDFLAGS_SHLIB="`$PERL -V:lddlflags | cut -d\' -f2`"
+-      LD_SHLIB="`$PERL -V:ld | cut -d\' -f2`"
+-
+-      has_clflags=1
+-
+-      echo "Using shared library flags from Perl"
+-    fi
+-  fi
+-fi
+ 
+ #if test -z "${LD_SHLIB}"; then
+ #  AC_MSG_ERROR([Can't determine compilation flags.]);
diff --git a/www/resin3/pkg-plist b/www/resin3/pkg-plist
index d257ff7f6e1f..e5372ec9c686 100644
--- a/www/resin3/pkg-plist
+++ b/www/resin3/pkg-plist
@@ -1,28 +1,32 @@
-%%APP_NAME%%/doc/index.jsp
-%%APP_NAME%%/lib/dom.jar
+%%APP_NAME%%/lib/LICENSE.isorelax
+%%APP_NAME%%/lib/LICENSE.retroweaver
+%%APP_NAME%%/lib/ejb-20.jar
+%%APP_NAME%%/lib/ejb-30.jar
 %%APP_NAME%%/lib/isorelax.jar
+%%APP_NAME%%/lib/j2eedeploy.jar
+%%APP_NAME%%/lib/jaxrpc.jar
 %%APP_NAME%%/lib/jca-15.jar
+%%APP_NAME%%/lib/jms-11.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/portlet-10.jar
+%%APP_NAME%%/lib/resin-jdk15.jar
 %%APP_NAME%%/lib/resin.jar
+%%APP_NAME%%/lib/retroweaver.jar
 %%APP_NAME%%/lib/webutil.jar
+%%APP_NAME%%/webapps/ROOT/index.jsp
 %%APP_NAME%%/webapps/resin-doc.war
-%%APP_NAME%%/libexec/libresin.so
-%%APP_NAME%%/libexec/libresinssl.so
 etc/%%APP_NAME%%/app-default.xml
 etc/rc.d/%%APP_NAME%%.sh
 sbin/%%APP_NAME%%ctl
 %%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
 @dirrm %%APP_NAME%%/lib
+@dirrm %%APP_NAME%%/webapps/ROOT
 @dirrm %%APP_NAME%%/webapps
-@dirrm %%APP_NAME%%/libexec
 @dirrm %%APP_NAME%%
 @unexec if cmp -s %D/etc/%%APP_NAME%%/resin.xml %D/etc/%%APP_NAME%%/resin.xml-dist; then rm -f %D/etc/%%APP_NAME%%/resin.xml ; else echo If permanently deleting this package, %D/etc/%%APP_NAME%%/resin.xml must be removed manually; fi
 etc/%%APP_NAME%%/resin.xml-dist