Attachment 56022 Details for Bug 84577 – file.diff

[patch] file.diff

file.diff (text/plain), 3.25 KB, created by Jean-Baptiste Quenot on 2005-08-05 11:10:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jean-Baptiste Quenot

Created: 2005-08-05 11:10:14 UTC

Size: 3.25 KB

patch

obsolete

>diff --ignore-matching-lines=\$FreeBSD.*\$ --exclude=.svn --exclude=work --exclude=admin -ruN /usr/ports/www/resin3/Makefile ./Makefile
>--- /usr/ports/www/resin3/Makefile	Tue May 17 00:06:25 2005
>+++ ./Makefile	Fri Aug  5 11:25:10 2005
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=		resin
>-PORTVERSION=		3.0.13
>+PORTVERSION=		3.0.14
> CATEGORIES=		www java
> MASTER_SITES=		http://www.caucho.com/download/
> 
>diff --ignore-matching-lines=\$FreeBSD.*\$ --exclude=.svn --exclude=work --exclude=admin -ruN /usr/ports/www/resin3/distinfo ./distinfo
>--- /usr/ports/www/resin3/distinfo	Tue May 17 00:06:25 2005
>+++ ./distinfo	Fri Aug  5 11:28:40 2005
>@@ -1,2 +1,2 @@
>-MD5 (resin-3.0.13.tar.gz) = 4e5a07b29b6b8ed86630c169bf62aba2
>-SIZE (resin-3.0.13.tar.gz) = 6858367
>+MD5 (resin-3.0.14.tar.gz) = 1348ca83d945a8905238989ba0eb7d23
>+SIZE (resin-3.0.14.tar.gz) = 6275586
>diff --ignore-matching-lines=\$FreeBSD.*\$ --exclude=.svn --exclude=work --exclude=admin -ruN /usr/ports/www/resin3/files/patch-configure ./files/patch-configure
>--- /usr/ports/www/resin3/files/patch-configure	Tue May 17 00:06:25 2005
>+++ ./files/patch-configure	Thu Jan  1 01:00:00 1970
>@@ -1,45 +0,0 @@
>-$FreeBSD: ports/www/resin3/files/patch-configure,v 1.4 2005/05/16 20:33:47 hq Exp $
>-
>---- 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`
>--if test -z "${LD_SHLIB}"; then
>--  if test -z "${LD_SHLIB}" -a "x`$PERL -V:dlsrc 2>/dev/null | grep dlopen`" != "x"; then
>--    PCC="`$PERL -V:cc | cut -d\' -f2`"
>--    if test "${PCC}" = "${CC}"; then
>--      CFLAGS_SHLIB="`$PERL -V:cccdlflags | cut -d\' -f2`"
>--      LDFLAGS_SHLIB="`$PERL -V:lddlflags | cut -d\' -f2`"
>--      LD_SHLIB="`$PERL -V:ld | cut -d\' -f2`"
>--
>--      has_clflags=1
>--
>--      echo "Using shared library flags from Perl"
>--    fi
>--  fi
>--fi
>- 
>- #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
>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	Tue May 17 00:06:25 2005
>+++ ./pkg-plist	Fri Aug  5 12:00:46 2005
>@@ -1,9 +1,7 @@
> @comment $FreeBSD: ports/www/resin3/pkg-plist,v 1.9 2005/05/16 20:33:47 hq Exp $
>-%%APP_NAME%%/lib/LICENSE.isorelax
> %%APP_NAME%%/lib/aopalliance.jar
> %%APP_NAME%%/lib/ejb-20.jar
> %%APP_NAME%%/lib/ejb-30.jar
>-%%APP_NAME%%/lib/isorelax.jar
> %%APP_NAME%%/lib/j2eedeploy.jar
> %%APP_NAME%%/lib/jca-15.jar
> %%APP_NAME%%/lib/jms-11.jar

Actions: View | Diff

Attachments on bug 84577: 56022