Attachment 53077 Details for Bug 80320 – file.diff

[patch] file.diff

file.diff (text/plain), 2.19 KB, created by Jean-Baptiste Quenot on 2005-04-25 10:40:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jean-Baptiste Quenot

Created: 2005-04-25 10:40:05 UTC

Size: 2.19 KB

patch

obsolete

>diff --exclude=.svn --exclude=work --exclude=admin -ruN /usr/ports/www/resin3/Makefile ./Makefile
>--- /usr/ports/www/resin3/Makefile	Thu Apr 21 00:04:55 2005
>+++ ./Makefile	Mon Apr 25 11:24:50 2005
>@@ -18,6 +18,7 @@
> HAS_CONFIGURE=		yes
> USE_PYTHON=		yes
> USE_REINPLACE=		yes
>+USE_OPENSSL=		yes
> 
> # Customizable settings
> RUNASUSER?=		www
>@@ -55,7 +56,9 @@
> .include <bsd.port.pre.mk>
> 
> # Pass JAVA_HOME as determined by bsd.java.mk
>-CONFIGURE_ARGS+=	--with-java-home=${JAVA_HOME}
>+CONFIGURE_ARGS+=	--with-java-home=${JAVA_HOME} \
>+			--with-openssl-lib=${OPENSSLLIB} \
>+			--with-openssl-include=${OPENSSLINC}
> 
> # Install the Apache plugin if needed
> .if defined(WITH_APACHE) && (${WITH_APACHE} == yes || ${WITH_APACHE} == YES)
>diff --exclude=.svn --exclude=work --exclude=admin -ruN /usr/ports/www/resin3/files/patch-configure ./files/patch-configure
>--- /usr/ports/www/resin3/files/patch-configure	Fri Feb 25 09:54:44 2005
>+++ ./files/patch-configure	Mon Apr 25 11:24:41 2005
>@@ -1,8 +1,6 @@
>-$FreeBSD: ports/www/resin3/files/patch-configure,v 1.2 2005/02/24 22:50:29 hq Exp $
>-
>---- configure.orig	Tue Oct 12 18:34:32 2004
>-+++ configure	Tue Oct 12 18:34:48 2004
>-@@ -8487,20 +8487,6 @@
>+--- configure.orig	Wed Jan 12 00:00:26 2005
>++++ configure	Mon Apr 25 11:21:46 2005
>+@@ -8669,20 +8669,6 @@
>  # Using Perl if it's available.
>  #
>  PERL=`which perl`
>@@ -23,3 +21,23 @@
>  
>  #if test -z "${LD_SHLIB}"; then
>  #  AC_MSG_ERROR([Can't determine compilation flags.]);
>+@@ -8947,8 +8933,8 @@
>+ 
>+ if test -z "${OPENSSL_LIB}"; then
>+   foo=bar
>+-elif test -r "${OPENSSL_LIB}/libcrypt.so"; then
>+-  SSL_LIBS="${SSL_LIBS} -lcrypt"
>++elif test -r "${OPENSSL_LIB}/libcrypto.so"; then
>++  SSL_LIBS="${SSL_LIBS} -lcrypto"
>+ elif test -r "${OPENSSL_LIB}/libcrypt.dylib"; then
>+   SSL_LIBS="${SSL_LIBS} -lcrypt"
>+ elif test -r "${OPENSSL_LIB}/libcrypt.a"; then
>+@@ -8983,7 +8969,7 @@
>+   foo=bar
>+ elif test -z "${OPENSSL_LIB}"; then
>+   foo=bar
>+-elif test ! -r "${OPENSSL_LIB}/libcrypt.so" -a \
>++elif test ! -r "${OPENSSL_LIB}/libcrypto.so" -a \
>+           ! -r "${OPENSSL_LIB}/libcrypt.dylib" -a \
>+           ! -r "${OPENSSL_LIB}/libcrypt.a" ; then
>+   { { echo "$as_me:$LINENO: error: Can't find valid OpenSSL library in ${OPENSSL_LIB}" >&5

Actions: View | Diff

Attachments on bug 80320: 53077