ports/90322: [PATCH] www/resin3: update to 3.0.16
Jean-Baptiste Quenot
jb.quenot at caraldi.com
Tue Dec 20 14:37:01 UTC 2005
Updated patch, a $FreeBSD$ line was erroneously changed. And it
may also fix an OpenSSL build failure.
Reported by Hervé Quiroz
--
Jean-Baptiste Quenot
http://caraldi.com/jbq/
-------------- next part --------------
diff --ignore-matching-lines=\$FreeBSD.*\$ --exclude=.svn --exclude=work --exclude=admin -ruN /usr/ports/www/resin3/Makefile ./Makefile
--- /usr/ports/www/resin3/Makefile Mon Dec 5 00:15:05 2005
+++ ./Makefile Mon Dec 19 11:13:36 2005
@@ -6,7 +6,7 @@
#
PORTNAME= resin
-PORTVERSION= 3.0.14
+PORTVERSION= 3.0.16
CATEGORIES= www java
MASTER_SITES= http://www.caucho.com/download/
@@ -59,6 +59,7 @@
CONFIGURE_ARGS+= --with-java-home=${JAVA_HOME} \
--with-openssl-lib=${OPENSSLLIB} \
--with-openssl-include=${OPENSSLINC}
+LDFLAGS+= -L${OPENSSLLIB} -lcrypto -lssl
# Install the Apache plugin if needed
.if defined(WITH_APACHE) && (${WITH_APACHE} == yes || ${WITH_APACHE} == YES)
@@ -128,8 +129,9 @@
.endif
post-build:
- cd ${WRKSRC}/modules/c/src && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} install
+ cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} install
+# Resin does not handle installation, so proceed now
do-install:
@${SETENV} RUNASUSER=${RUNASUSER} GROUP=${GROUP} ${SH} ${WRKDIR}/install.sh
.if (defined(WITH_APACHE2) && (${WITH_APACHE2} == yes || ${WITH_APACHE2} == YES))
diff --ignore-matching-lines=\$FreeBSD.*\$ --exclude=.svn --exclude=work --exclude=admin -ruN /usr/ports/www/resin3/distinfo ./distinfo
--- /usr/ports/www/resin3/distinfo Wed Aug 31 00:40:52 2005
+++ ./distinfo Tue Dec 13 14:06:19 2005
@@ -1,2 +1,3 @@
-MD5 (resin-3.0.14.tar.gz) = 1348ca83d945a8905238989ba0eb7d23
-SIZE (resin-3.0.14.tar.gz) = 6275586
+MD5 (resin-3.0.16.tar.gz) = 8f5a88fa14190bc768b083c17f864ea3
+SHA256 (resin-3.0.16.tar.gz) = 17326fc79ec941cd18b9c25d251aa595a9b9bcaa5ff653cb44b9f129c7b948a2
+SIZE (resin-3.0.16.tar.gz) = 7667120
diff --ignore-matching-lines=\$FreeBSD.*\$ --exclude=.svn --exclude=work --exclude=admin -ruN /usr/ports/www/resin3/files/pkg-message.in ./files/pkg-message.in
--- /usr/ports/www/resin3/files/pkg-message.in Fri Feb 25 09:54:44 2005
+++ ./files/pkg-message.in Fri Dec 16 13:11:27 2005
@@ -8,7 +8,40 @@
env - %%PREFIX%%/etc/rc.d/%%APP_NAME%%.sh start
-And point your web browser to the default home page at
+For this control script to run seamlessly, it is recommended to increase the
+maximum length of commands displayed by ps(1). Please append the following
+setting to /etc/sysctl.conf:
+
+ # Do not truncate command line arguments in ps(1) listing
+ kern.ps_arg_cache_limit=10000
+
+This setting will take effect at next reboot, however it is possible to have
+immediate effect with the following command as root:
+
+ # sysctl kern.ps_arg_cache_limit=10000
+
+If you wish to skip this setting, please note that the `stop', `restart' and
+`status' will not function properly with %%APP_NAME%%.sh.
+
+Once Resin is started, point your web browser to the default home page at
http://localhost:%%PORT%%/ to read the documentation and test the samples.
Resin configuration is located at %%PREFIX%%/etc/%%APP_NAME%%/resin.xml
+
+
+Enjoy!
+
+--------------------------------------------------------------------------------
+ADVANCED USAGE
+
+If you need to pass special options to Java, please set the
+%%APP_NAME%%_flags option in /etc/rc.conf, see examples below:
+
+ # Prevent Java from opening an X11 display
+ %%APP_NAME%%_flags="-Djava.awt.headless=true"
+
+ # Increase memory limit of the Java virtual machine
+ %%APP_NAME%%_flags="-Xms32m -Xmx256m"
+
+ # Run Java with remote debugging turned on on port 8000
+ %%APP_NAME%%_flags="-Xdebug -Xnoagent -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8000"
diff --ignore-matching-lines=\$FreeBSD.*\$ --exclude=.svn --exclude=work --exclude=admin -ruN /usr/ports/www/resin3/files/resinctl ./files/resinctl
--- /usr/ports/www/resin3/files/resinctl Thu Apr 21 00:04:55 2005
+++ ./files/resinctl Tue Dec 20 15:31:37 2005
@@ -157,8 +157,7 @@
COMMAND = "%%JAVA%%"
ARGS = [COMMAND]
- if os.environ.has_key('JAVA_OPTS'):
- ARGS += os.environ['JAVA_OPTS'].split(" ")
+ ARGS += sys.argv[1:-1]
ARGS += [
"-Dresin.home=%%APP_HOME%%",
@@ -170,17 +169,17 @@
os.environ['JAVA_HOME'] = "%%JAVA_HOME%%"
os.environ['CLASSPATH'] = classpath()
- if len(sys.argv) != 2:
+ if len(sys.argv) < 2:
usage()
sys.exit(1)
- if sys.argv[1] == "start":
+ if sys.argv[-1] == "start":
start()
- elif sys.argv[1] == "stop":
+ elif sys.argv[-1] == "stop":
stop()
- elif sys.argv[1] == "restart":
+ elif sys.argv[-1] == "restart":
stop()
start()
diff --ignore-matching-lines=\$FreeBSD.*\$ --exclude=.svn --exclude=work --exclude=admin -ruN /usr/ports/www/resin3/pkg-plist ./pkg-plist
--- /usr/ports/www/resin3/pkg-plist Wed Aug 31 00:40:53 2005
+++ ./pkg-plist Tue Dec 20 15:31:20 2005
@@ -1,5 +1,7 @@
@comment $FreeBSD: ports/www/resin3/pkg-plist,v 1.10 2005/08/29 14:56:50 hq Exp $
%%APP_NAME%%/lib/aopalliance.jar
+%%APP_NAME%%/lib/default.xsl
+%%APP_NAME%%/lib/eclipse-compiler.jar
%%APP_NAME%%/lib/ejb-20.jar
%%APP_NAME%%/lib/ejb-30.jar
%%APP_NAME%%/lib/j2eedeploy.jar
@@ -10,6 +12,7 @@
%%APP_NAME%%/lib/jstl-11.jar
%%APP_NAME%%/lib/jta-101.jar
%%APP_NAME%%/lib/portlet-10.jar
+%%APP_NAME%%/lib/quercus.jar
%%APP_NAME%%/lib/resin-jdk15.jar
%%APP_NAME%%/lib/resin.jar
%%APP_NAME%%/lib/resinboot.jar
More information about the freebsd-ports-bugs
mailing list