ports/94131: Maintainer update: www/resin3 updated to 3.0.18 and unbreak port
Jean-Baptiste Quenot
jb.quenot at caraldi.com
Mon Mar 6 09:40:10 UTC 2006
>Number: 94131
>Category: ports
>Synopsis: Maintainer update: www/resin3 updated to 3.0.18 and unbreak port
>Confidential: no
>Severity: serious
>Priority: high
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Mon Mar 06 09:40:04 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Jean-Baptiste Quenot
>Release: FreeBSD 5.4-STABLE i386
>Organization:
>Environment:
System: FreeBSD vision.anyware 5.4-STABLE FreeBSD 5.4-STABLE #0: Wed Oct 5 09:32:29 CEST 2005 jbq at vision.anyware:/usr/src/sys/i386/compile/VISION i386
>Description:
This is an update of www/resin3 to 3.0.18. The attached patch also unbreaks the
port, see PR 93289
>How-To-Repeat:
>Fix:
diff --ignore-matching-lines=\$FreeBSD.*\$ --exclude=.svn --exclude=work --exclude=admin -ruN /usr/ports/www/resin3/Makefile ./Makefile
--- /usr/ports/www/resin3/Makefile Sat Mar 4 00:14:52 2006
+++ ./Makefile Mon Mar 6 10:21:36 2006
@@ -6,15 +6,13 @@
#
PORTNAME= resin
-PORTVERSION= 3.0.17
+PORTVERSION= 3.0.18
CATEGORIES= www java
MASTER_SITES= http://www.caucho.com/download/
MAINTAINER= jb.quenot at 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
@@ -62,6 +60,7 @@
--with-openssl-lib=${OPENSSLLIB} \
--with-openssl-include=${OPENSSLINC}
LDFLAGS+= -L${OPENSSLLIB} -lcrypto -lssl
+CFLAGS+= ${PTHREAD_LIBS}
# Install the Apache plugin if needed
.if defined(WITH_APACHE) && (${WITH_APACHE} == yes || ${WITH_APACHE} == YES)
diff --ignore-matching-lines=\$FreeBSD.*\$ --exclude=.svn --exclude=work --exclude=admin -ruN /usr/ports/www/resin3/distinfo ./distinfo
--- /usr/ports/www/resin3/distinfo Sun Jan 8 00:12:46 2006
+++ ./distinfo Mon Mar 6 10:23:22 2006
@@ -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 --ignore-matching-lines=\$FreeBSD.*\$ --exclude=.svn --exclude=work --exclude=admin -ruN /usr/ports/www/resin3/files/patch-configure-cflags ./files/patch-configure-cflags
--- /usr/ports/www/resin3/files/patch-configure-cflags Thu Jan 1 01:00:00 1970
+++ ./files/patch-configure-cflags Mon Feb 13 15:28:35 2006
@@ -0,0 +1,10 @@
+--- configure.orig Mon Feb 13 15:28:10 2006
++++ configure Mon Feb 13 15:28:12 2006
+@@ -9012,7 +9012,6 @@
+ ;;
+
+ *freebsd*)
+- PROXY_LIBS='-lc_r'
+ jni_os=freebsd
+ ;;
+
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 Sun Jan 8 00:12:46 2006
+++ ./files/pkg-message.in Fri Dec 16 13:11:27 2005
@@ -41,7 +41,7 @@
%%APP_NAME%%_flags="-Djava.awt.headless=true"
# Increase memory limit of the Java virtual machine
- %%APP_NAME%%_flags="-Xms32m -Xmx256m"
+ %%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/pkg-plist ./pkg-plist
--- /usr/ports/www/resin3/pkg-plist Sun Jan 8 00:12:46 2006
+++ ./pkg-plist Mon Mar 6 10:24:07 2006
@@ -1,6 +1,5 @@
- at comment $FreeBSD: ports/www/resin3/pkg-plist,v 1.12 2006/01/07 02:14:18 edwin Exp $
+ at comment $FreeBSD: ports/www/resin3/pkg-plist,v 1.11 2005/12/20 22:38:35 edwin Exp $
%%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
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list