Attachment 83785 Details for Bug 119650 – resin-3.1.4.patch

[patch] resin-3.1.4.patch

resin-3.1.4.patch (text/plain), 3.02 KB, created by Boris Kovalenko on 2008-01-14 07:50:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Boris Kovalenko

Created: 2008-01-14 07:50:01 UTC

Size: 3.02 KB

patch

obsolete

>diff -ruN --exclude=CVS /usr/ports/www/resin3.orig/Makefile /usr/ports/www/resin3/Makefile
>--- /usr/ports/www/resin3.orig/Makefile	Wed Oct 24 10:03:03 2007
>+++ /usr/ports/www/resin3/Makefile	Mon Jan 14 12:18:04 2008
>@@ -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 @@
> 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 -ruN --exclude=CVS /usr/ports/www/resin3.orig/distinfo /usr/ports/www/resin3/distinfo
>--- /usr/ports/www/resin3.orig/distinfo	Wed Oct 24 10:03:03 2007
>+++ /usr/ports/www/resin3/distinfo	Mon Jan 14 11:15:36 2008
>@@ -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 -ruN --exclude=CVS /usr/ports/www/resin3.orig/files/patch-configure /usr/ports/www/resin3/files/patch-configure
>--- /usr/ports/www/resin3.orig/files/patch-configure	Wed Apr 12 00:04:38 2006
>+++ /usr/ports/www/resin3/files/patch-configure	Mon Jan 14 12:20:21 2008
>@@ -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 -ruN --exclude=CVS /usr/ports/www/resin3.orig/pkg-plist /usr/ports/www/resin3/pkg-plist
>--- /usr/ports/www/resin3.orig/pkg-plist	Wed Oct 24 10:03:03 2007
>+++ /usr/ports/www/resin3/pkg-plist	Mon Jan 14 11:26:00 2008
>@@ -1,6 +1,7 @@
> @comment $FreeBSD: ports/www/resin3/pkg-plist,v 1.18 2007/10/23 14:43:18 vanilla Exp $
> %%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

Actions: View | Diff

Attachments on bug 119650: 83785