Attachment 86164 Details for Bug 122555 – devel_apr.diff

[patch] devel_apr.diff

devel_apr.diff (text/plain), 5.08 KB, created by philip on 2008-05-04 06:30:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: philip

Created: 2008-05-04 06:30:22 UTC

Size: 5.08 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /home/ncvs/ports/devel/apr/Makefile,v
>retrieving revision 1.69
>diff -u -r1.69 Makefile
>--- Makefile	31 Mar 2008 13:55:58 -0000	1.69
>+++ Makefile	3 May 2008 23:59:47 -0000
>@@ -15,8 +15,7 @@
> # APR_UTIL_WITH_LDAP:		force dependency on OpenLDAP
> 
> PORTNAME=	apr
>-PORTVERSION=	1.2.8
>-PORTREVISION=	3
>+PORTVERSION=	1.2.12
> CATEGORIES=	devel
> MASTER_SITES=	${MASTER_SITE_APACHE}
> MASTER_SITE_SUBDIR=	apr
>Index: distinfo
>===================================================================
>RCS file: /home/ncvs/ports/devel/apr/distinfo,v
>retrieving revision 1.16
>diff -u -r1.16 distinfo
>--- distinfo	16 Jun 2007 19:56:47 -0000	1.16
>+++ distinfo	4 May 2008 00:00:39 -0000
>@@ -1,6 +1,6 @@
>-MD5 (apr-1.2.8.tar.gz) = 814f19528d9cfc79aef188dd752e04d8
>-SHA256 (apr-1.2.8.tar.gz) = 96e31f0ea2e028f372d5fdbbd4f88f31d59e14eda85cd12153183759f8e221c7
>-SIZE (apr-1.2.8.tar.gz) = 1107189
>-MD5 (apr-util-1.2.8.tar.gz) = a2e2e54d65e9eae961f7171335cf2550
>-SHA256 (apr-util-1.2.8.tar.gz) = 6527cb0b3dd619acfca668412e84e52860dfd862054246ca903822d5ea824de6
>-SIZE (apr-util-1.2.8.tar.gz) = 646379
>+MD5 (apr-1.2.12.tar.gz) = 020ea947446dca2d1210c099c7a4c837
>+SHA256 (apr-1.2.12.tar.gz) = 23759142c483be869a0aec0529c5b8c94745b4dfd1c2c23f38417f4e02adcead
>+SIZE (apr-1.2.12.tar.gz) = 1127522
>+MD5 (apr-util-1.2.12.tar.gz) = e292942e22edd21b68609086352212e4
>+SHA256 (apr-util-1.2.12.tar.gz) = 7d70ff17bec733bdb04a6653a8e9c15ab7d88429dac91a4ae58c1db5caaee07f
>+SIZE (apr-util-1.2.12.tar.gz) = 668292
>Index: files/patch-apr-util_build_dbm.m4
>===================================================================
>RCS file: /home/ncvs/ports/devel/apr/files/patch-apr-util_build_dbm.m4,v
>retrieving revision 1.3
>diff -u -r1.3 patch-apr-util_build_dbm.m4
>--- files/patch-apr-util_build_dbm.m4	16 Jun 2007 19:56:47 -0000	1.3
>+++ files/patch-apr-util_build_dbm.m4	4 May 2008 00:11:11 -0000
>@@ -1,21 +1,24 @@
>---- apr-util-1.2.8/build/dbm.m4-orig	Wed Dec  7 09:02:23 2005
>-+++ apr-util-1.2.8/build/dbm.m4	Wed Dec 23 09:07:34 2005
>-@@ -588,6 +588,8 @@
>+--- ./apr-util-1.2.12/build/dbm.m4.orig	2007-11-01 10:07:19.000000000 -0400
>++++ ./apr-util-1.2.12/build/dbm.m4	2008-05-03 20:10:41.000000000 -0400
>+@@ -672,8 +672,10 @@
>      elif test "$withval" = "no"; then
>        apu_have_gdbm=0
>      else
>+-      CPPFLAGS="-I$withval/include"
>+-      LIBS="-L$withval/lib "
> +      saved_cppflags="$CPPFLAGS"
>-+      saved_libs="$LIBS"
>-       CPPFLAGS="-I$withval/include"
>-       LIBS="-L$withval/lib "
>++      saved_ldflags="$LDFLAGS"
>++      CPPFLAGS="$CPPFLAGS -I$withval/include"
>++      LDFLAGS="$LDFLAGS -L$withval/lib "
>  
>-@@ -597,6 +599,9 @@
>+       AC_MSG_CHECKING(checking for gdbm in $withval)
>+       AC_CHECK_HEADER(gdbm.h, AC_CHECK_LIB(gdbm, gdbm_open, [apu_have_gdbm=1]))
>+@@ -681,6 +683,8 @@
>          APR_ADDTO(APRUTIL_LDFLAGS, [-L$withval/lib])
>          APR_ADDTO(APRUTIL_INCLUDES, [-I$withval/include])
>        fi
>-+
> +      CPPFLAGS="$saved_cppflags"
>-+      LIBS="$saved_libs"
>++      LDFLAGS="$saved_ldflags"
>      fi
>-   ], [
>-     apu_have_gdbm=0
>+   ])
>+ 
>Index: files/patch-apr-util_configure
>===================================================================
>RCS file: /home/ncvs/ports/devel/apr/files/patch-apr-util_configure,v
>retrieving revision 1.3
>diff -u -r1.3 patch-apr-util_configure
>--- files/patch-apr-util_configure	16 Jun 2007 19:56:47 -0000	1.3
>+++ files/patch-apr-util_configure	4 May 2008 00:11:11 -0000
>@@ -1,21 +1,24 @@
>---- apr-util-1.2.8/configure.orig	Mon Sep 26 18:28:49 2005
>-+++ apr-util-1.2.8/configure	Fri Dec 23 15:06:09 2005
>-@@ -13806,6 +13806,8 @@
>+--- ./apr-util-1.2.12/configure.orig	2008-05-03 20:03:18.000000000 -0400
>++++ ./apr-util-1.2.12/configure	2008-05-03 20:11:05.000000000 -0400
>+@@ -14323,8 +14323,10 @@
>      elif test "$withval" = "no"; then
>        apu_have_gdbm=0
>      else
>+-      CPPFLAGS="-I$withval/include"
>+-      LIBS="-L$withval/lib "
> +      saved_cppflags="$CPPFLAGS"
>-+      saved_libs="$LIBS"
>-       CPPFLAGS="-I$withval/include"
>-       LIBS="-L$withval/lib "
>++      saved_ldflags="$LDFLAGS"
>++      CPPFLAGS="$CPPFLAGS -I$withval/include"
>++      LDFLAGS="$LDFLAGS -L$withval/lib "
>  
>-@@ -14064,6 +14066,9 @@
>+       { echo "$as_me:$LINENO: checking checking for gdbm in $withval" >&5
>+ echo $ECHO_N "checking checking for gdbm in $withval... $ECHO_C" >&6; }
>+@@ -14566,6 +14568,8 @@
>    fi
>  
>        fi
>-+
> +      CPPFLAGS="$saved_cppflags"
>-+      LIBS="$saved_libs"
>++      LDFLAGS="$saved_ldflags"
>      fi
>  
>- else
>+ fi
>Index: files/patch-apr_hints.m4
>===================================================================
>RCS file: /home/ncvs/ports/devel/apr/files/patch-apr_hints.m4,v
>retrieving revision 1.11
>diff -u -r1.11 patch-apr_hints.m4
>--- files/patch-apr_hints.m4	16 Jun 2007 19:56:47 -0000	1.11
>+++ files/patch-apr_hints.m4	4 May 2008 00:12:29 -0000
>@@ -1,5 +1,5 @@
>---- apr-1.2.8/build/apr_hints.m4.orig	Wed Oct 27 11:12:28 2004
>-+++ apr-1.2.8/build/apr_hints.m4	Wed Oct 27 11:25:32 2004
>+--- apr-1.2.12hints.m4.orig	Wed Oct 27 11:12:28 2004
>++++ apr-1.2.12/build/apr_hints.m4	Wed Oct 27 11:25:32 2004
> @@ -137,11 +137,7 @@
>  	;;
>      *-freebsd*)

Actions: View | Diff

Attachments on bug 122555: 86163 | 86164