aboutsummaryrefslogtreecommitdiff
path: root/www/resin3
diff options
context:
space:
mode:
Diffstat (limited to 'www/resin3')
-rw-r--r--www/resin3/Makefile14
-rw-r--r--www/resin3/distinfo6
-rw-r--r--www/resin3/pkg-plist2
3 files changed, 11 insertions, 11 deletions
diff --git a/www/resin3/Makefile b/www/resin3/Makefile
index f3bfb0b21e48..c1b17d4a08c0 100644
--- a/www/resin3/Makefile
+++ b/www/resin3/Makefile
@@ -6,20 +6,17 @@
#
PORTNAME= resin
-PORTVERSION= 3.0.17
+PORTVERSION= 3.0.18
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
-BROKEN= Hard-codes libc_r linkage
-
USE_JAVA= yes
JAVA_VERSION= 1.2+
HAS_CONFIGURE= yes
USE_PYTHON= yes
-USE_REINPLACE= yes
USE_OPENSSL= yes
# Customizable settings
@@ -62,6 +59,9 @@ CONFIGURE_ARGS+= --with-java-home=${JAVA_HOME} \
--with-openssl-lib=${OPENSSLLIB} \
--with-openssl-include=${OPENSSLINC}
LDFLAGS+= -L${OPENSSLLIB} -lcrypto -lssl
+# We need to link with cc instead of ld for the FreeBSD specific options used
+# by threading libraries
+CONFIGURE_ENV= LD=${CC} PTHREAD_LIBS=${PTHREAD_LIBS}
# Install the Apache plugin if needed
.if defined(WITH_APACHE) && (${WITH_APACHE} == yes || ${WITH_APACHE} == YES)
@@ -96,16 +96,16 @@ SUBSTITUTIONS= -e "s|%%APP_HOME%%|${APP_HOME}|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|%%GROUP%%|${GROUP}|g" \
-e "s|%%JAVA%%|${JAVA}|g" \
+ -e "s|%%JAVA_HOME%%|${JAVA_HOME}|g" \
-e "s|%%LOG_FILE%%|${LOG_FILE}|g" \
- -e "s|%%PYTHON_CMD%%|${PYTHON_CMD}|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|%%PYTHON_CMD%%|${PYTHON_CMD}|g" \
-e "s|%%RUNASUID%%|${RUNASUID}|g" \
-e "s|%%RUNASUSER%%|${RUNASUSER}|g" \
-e "s|%%WRKDIR%%|${WRKDIR}|g" \
diff --git a/www/resin3/distinfo b/www/resin3/distinfo
index 28d36cacb051..eac2732218f6 100644
--- a/www/resin3/distinfo
+++ b/www/resin3/distinfo
@@ -1,3 +1,3 @@
-MD5 (resin-3.0.17.tar.gz) = 19a2afd5c5fd8a8439bd55ef58922478
-SHA256 (resin-3.0.17.tar.gz) = 2a3218fc50e16fa73609e6b36855ae25e36f746a1b583139126c066e78d6af80
-SIZE (resin-3.0.17.tar.gz) = 7656477
+MD5 (resin-3.0.18.tar.gz) = 4616fe700b815e62e5050cc6687d2646
+SHA256 (resin-3.0.18.tar.gz) = 27df18c3e567af185f1cfb5c4e5faa1689b74f32fece15463c5d26df8d3ed378
+SIZE (resin-3.0.18.tar.gz) = 7101345
diff --git a/www/resin3/pkg-plist b/www/resin3/pkg-plist
index 5162f328cb46..5c750efb359e 100644
--- a/www/resin3/pkg-plist
+++ b/www/resin3/pkg-plist
@@ -1,6 +1,5 @@
@comment $FreeBSD$
%%APP_NAME%%/lib/aopalliance.jar
-%%APP_NAME%%/lib/eclipse-compiler.jar
%%APP_NAME%%/lib/ejb-20.jar
%%APP_NAME%%/lib/ejb-30.jar
%%APP_NAME%%/lib/j2eedeploy.jar
@@ -15,6 +14,7 @@
%%APP_NAME%%/lib/resin-jdk15.jar
%%APP_NAME%%/lib/resin.jar
%%APP_NAME%%/lib/resinboot.jar
+%%APP_NAME%%/lib/saaj.jar
%%APP_NAME%%/lib/script-10.jar
%%APP_NAME%%/lib/webutil.jar
%%APP_NAME%%/webapps/ROOT/index.jsp