From 0c23dfb50125a1c79826ddb4d9fe85eb241a90ee Mon Sep 17 00:00:00 2001
From: "Vanilla I. Shu" <vanilla@FreeBSD.org>
Date: Tue, 15 Jan 2008 01:09:30 +0000
Subject: Upgrade to 3.1.4.

PR:		ports/119650
Submitted by:	maintainer
---
 www/resin3/Makefile              |  4 ++--
 www/resin3/distinfo              |  6 +++---
 www/resin3/files/patch-configure | 32 +++++++++++++++++++++++++-------
 www/resin3/pkg-plist             |  2 ++
 4 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/www/resin3/Makefile b/www/resin3/Makefile
index 161a3fddb943..126f7dcc4118 100644
--- a/www/resin3/Makefile
+++ b/www/resin3/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=		resin
-PORTVERSION=		3.1.3
+PORTVERSION=		3.1.4
 CATEGORIES=		www java
 MASTER_SITES=		http://www.caucho.com/download/
 
@@ -73,7 +73,7 @@ CONFIGURE_ARGS+=	--with-java-home=${JAVA_HOME} \
 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} LDFLAGS="${LDFLAGS}" LIBTOOL=${LIBTOOL}
+CONFIGURE_ENV=		LD=${CC} PTHREAD_LIBS="${PTHREAD_LIBS}" LDFLAGS="${LDFLAGS}" LIBTOOL=${LIBTOOL}
 
 # Install the Apache plugin if needed
 .if defined(WITH_APACHE) && (${WITH_APACHE} == yes || ${WITH_APACHE} == YES)
diff --git a/www/resin3/distinfo b/www/resin3/distinfo
index 80a15b932c17..d59e8b22fddd 100644
--- a/www/resin3/distinfo
+++ b/www/resin3/distinfo
@@ -1,3 +1,3 @@
-MD5 (resin-3.1.3.tar.gz) = 67bc9ddfc1da6365a4132beeb5744e99
-SHA256 (resin-3.1.3.tar.gz) = 59b5c53f98195742a1dfd8e6c8b15b0383734479752d67e08dfb031e9b2f05bf
-SIZE (resin-3.1.3.tar.gz) = 9721240
+MD5 (resin-3.1.4.tar.gz) = 8f39e9d1204724189a5a602a730fb5e7
+SHA256 (resin-3.1.4.tar.gz) = 0c144d9812de2379612d8048f47008567f8f2beeb28f53eae98316be0bc5dc56
+SIZE (resin-3.1.4.tar.gz) = 9904165
diff --git a/www/resin3/files/patch-configure b/www/resin3/files/patch-configure
index ef4b3705d313..bb894c3f552e 100644
--- a/www/resin3/files/patch-configure
+++ b/www/resin3/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Thu Feb 23 00:59:58 2006
-+++ configure	Wed Apr  5 11:03:16 2006
-@@ -8193,37 +8193,12 @@
+--- configure.orig	Wed Dec  5 12:06:55 2007
++++ configure	Mon Jan 14 11:22:05 2008
+@@ -19096,55 +19096,9 @@
  
  
  
@@ -13,9 +13,27 @@
 -# Prevent multiple expansion
 -
 -
- #
- # libtool stuff
- #
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-#
+-# libtool stuff
+-#
 -if test -z "${LTFLAGS}"; then
 -  LTFLAGS="--silent"
 -fi
@@ -41,7 +59,7 @@
  
  
  
-@@ -9026,33 +9001,8 @@
+@@ -19903,33 +19857,8 @@
  	PROXY_LIBS='-lnsl -lsocket -lthread'
  	;;
  
diff --git a/www/resin3/pkg-plist b/www/resin3/pkg-plist
index 7d3b8819dedf..d4e08f52d145 100644
--- a/www/resin3/pkg-plist
+++ b/www/resin3/pkg-plist
@@ -1,6 +1,7 @@
 @comment $FreeBSD$
 %%APP_NAME%%/lib/activation.jar
 %%APP_NAME%%/lib/ejb-15.jar
+%%APP_NAME%%/lib/hessian.jar
 %%APP_NAME%%/lib/j2ee-deploy-10.jar
 %%APP_NAME%%/lib/j2ee-management-10.jar
 %%APP_NAME%%/lib/jsf-12.jar
@@ -19,6 +20,7 @@
 %%APP_NAME%%/lib/resin.jar
 %%APP_NAME%%/lib/saaj.jar
 %%APP_NAME%%/lib/script-10.jar
+%%APP_NAME%%/lib/webbeans-16.jar
 %%APP_NAME%%/lib/webutil.jar
 %%APP_NAME%%/webapps/ROOT/index.jsp
 %%APP_NAME%%/webapps/resin-doc.war
-- 
cgit v1.2.3