Attachment 88597 Details for Bug 125411 – apr-1.3.2_1.patch

[patch] apr-1.3.2_1.patch

apr-1.3.2_1.patch (text/plain), 2.75 KB, created by Philip M. Gollucci on 2008-07-08 19:30:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Philip M. Gollucci

Created: 2008-07-08 19:30:02 UTC

Size: 2.75 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /home/ncvs/ports/devel/apr/Makefile,v
>retrieving revision 1.72
>diff -u -u -r1.72 Makefile
>--- Makefile	4 Jul 2008 19:29:21 -0000	1.72
>+++ Makefile	8 Jul 2008 18:22:20 -0000
>@@ -16,6 +16,7 @@
> 
> PORTNAME=	apr
> PORTVERSION=	1.3.2
>+PORTREVISION=	1
> CATEGORIES=	devel
> MASTER_SITES=	${MASTER_SITE_APACHE}
> MASTER_SITE_SUBDIR=	apr
>@@ -35,7 +36,7 @@
> GNU_CONFIGURE=		yes
> WRKSRC=	${WRKDIR}
> 
>-PLIST_SUB=  SHLIB_MAJOR="${SHLIB_MAJOR}"
>+PLIST_SUB=	SHLIB_MAJOR="${SHLIB_MAJOR}"
> SHLIB_MAJOR=	3
> 
> APR_UTIL_CONF_ARGS=	--with-apr=../apr-${PORTVERSION} \
>@@ -87,6 +88,7 @@
> .endif
> 
> .if defined(APR_UTIL_WITH_LDAP)
>+PLIST_SUB+=	LDAP=""
> USE_OPENLDAP=	yes
> APR_UTIL_CONF_ARGS+=	--with-ldap-include=${LOCALBASE}/include \
> 	--with-ldap-lib=${LOCALBASE}/lib --with-ldap=ldap
>@@ -95,6 +97,8 @@
> .else
> PKGNAMESUFFIX=	-ldap
> .endif
>+.else
>+PLIST_SUB+=	LDAP="@comment "
> .endif
> 
> pre-extract:
>Index: pkg-plist
>===================================================================
>RCS file: /home/ncvs/ports/devel/apr/pkg-plist,v
>retrieving revision 1.17
>diff -u -u -r1.17 pkg-plist
>--- pkg-plist	4 Jul 2008 19:29:21 -0000	1.17
>+++ pkg-plist	8 Jul 2008 18:22:20 -0000
>@@ -84,5 +84,10 @@
> lib/libaprutil-1.la
> lib/libaprutil-1.so
> lib/libaprutil-1.so.%%SHLIB_MAJOR%%
>+%%LDAP%%lib/apr-util-1/apr_ldap-1.so
>+%%LDAP%%lib/apr-util-1/apr_ldap.so
>+%%LDAP%%lib/apr-util-1/apr_ldap.la
>+%%LDAP%%lib/apr-util-1/apr_ldap.a
>+%%LDAP%%@dirrm lib/apr-util-1
> @dirrm build-1
> @dirrm include/apr-1
>Index: files/patch-apr-util-1.3.2__build__apu-conf.m4
>===================================================================
>RCS file: files/patch-apr-util-1.3.2__build__apu-conf.m4
>diff -N files/patch-apr-util-1.3.2__build__apu-conf.m4
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ files/patch-apr-util-1.3.2__build__apu-conf.m4	8 Jul 2008 18:22:20 -0000
>@@ -0,0 +1,27 @@
>+Index: apr-util-1.3.2/build/apu-conf.m4
>+===================================================================
>+--- apr-util-1.3.2/build/apu-conf.m4	(revision 674869)
>++++ apr-util-1.3.2/build/apu-conf.m4	(working copy)
>+@@ -357,6 +357,11 @@
>+   ])
>+ 
>+ if test "$apu_has_ldap_openldap" = "1"; then
>++    CPPFLAGS=$save_cppflags
>++    LDFLAGS=$save_ldflags
>++    LIBS=$save_libs
>++
>++    CPPFLAGS="$CPPFLAGS $APRUTIL_INCLUDES"
>+     AC_CACHE_CHECK([style of ldap_set_rebind_proc routine], ac_cv_ldap_set_rebind_proc_style,
>+     APR_TRY_COMPILE_NO_WARNING([
>+     #ifdef HAVE_LBER_H
>+@@ -374,6 +379,10 @@
>+     if test "$ac_cv_ldap_set_rebind_proc_style" = "three"; then
>+         AC_DEFINE(LDAP_SET_REBIND_PROC_THREE, 1, [Define if ldap_set_rebind_proc takes three arguments])
>+     fi
>++
>++    CPPFLAGS=$save_cppflags
>++    LDFLAGS=$save_ldflags
>++    LIBS=$save_libs
>+ fi
>+ 
>+ AC_SUBST(ldap_h)

Actions: View | Diff

Attachments on bug 125411: 88597