Attachment #88597 for bug #125411

View | Details | Raw Unified | Return to bug 125411
Collapse All | Expand All





PORTNAME=	apr
PORTVERSION=	1.3.2
PORTREVISION=	1
CATEGORIES=	devel
MASTER_SITES=	${MASTER_SITE_APACHE}
MASTER_SITE_SUBDIR=	apr

GNU_CONFIGURE=		yes
WRKSRC=	${WRKDIR}

PLIST_SUB=	SHLIB_MAJOR="${SHLIB_MAJOR}"
SHLIB_MAJOR=	3

APR_UTIL_CONF_ARGS=	--with-apr=../apr-${PORTVERSION} \

.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

.else
PKGNAMESUFFIX=	-ldap
.endif
.else
PLIST_SUB+=	LDAP="@comment "
.endif

pre-extract:

Lines 84-88 Link Here

(-)pkg-plist (+5 lines)
84	lib/libaprutil-1.la	84	lib/libaprutil-1.la
85	lib/libaprutil-1.so	85	lib/libaprutil-1.so
86	lib/libaprutil-1.so.%%SHLIB_MAJOR%%	86	lib/libaprutil-1.so.%%SHLIB_MAJOR%%
		87	%%LDAP%%lib/apr-util-1/apr_ldap-1.so
		88	%%LDAP%%lib/apr-util-1/apr_ldap.so
		89	%%LDAP%%lib/apr-util-1/apr_ldap.la
		90	%%LDAP%%lib/apr-util-1/apr_ldap.a
		91	%%LDAP%%@dirrm lib/apr-util-1
87	@dirrm build-1	92	@dirrm build-1
88	@dirrm include/apr-1	93	@dirrm include/apr-1




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)

Return to bug 125411

Lines 16-21 Link Here

(-)Makefile (-1 / +5 lines)
16		16
17	PORTNAME= apr	17	PORTNAME= apr
18	PORTVERSION= 1.3.2	18	PORTVERSION= 1.3.2
		19	PORTREVISION= 1
19	CATEGORIES= devel	20	CATEGORIES= devel
20	MASTER_SITES= ${MASTER_SITE_APACHE}	21	MASTER_SITES= ${MASTER_SITE_APACHE}
21	MASTER_SITE_SUBDIR= apr	22	MASTER_SITE_SUBDIR= apr
Lines 35-41 Link Here
35	GNU_CONFIGURE= yes	36	GNU_CONFIGURE= yes
36	WRKSRC= ${WRKDIR}	37	WRKSRC= ${WRKDIR}
37		38
38	PLIST_SUB= SHLIB_MAJOR="${SHLIB_MAJOR}"	39	PLIST_SUB= SHLIB_MAJOR="${SHLIB_MAJOR}"
39	SHLIB_MAJOR= 3	40	SHLIB_MAJOR= 3
40		41
41	APR_UTIL_CONF_ARGS= --with-apr=../apr-${PORTVERSION} \	42	APR_UTIL_CONF_ARGS= --with-apr=../apr-${PORTVERSION} \
Lines 87-92 Link Here
87	.endif	88	.endif
88		89
89	.if defined(APR_UTIL_WITH_LDAP)	90	.if defined(APR_UTIL_WITH_LDAP)
		91	PLIST_SUB+= LDAP=""
90	USE_OPENLDAP= yes	92	USE_OPENLDAP= yes
91	APR_UTIL_CONF_ARGS+= --with-ldap-include=${LOCALBASE}/include \	93	APR_UTIL_CONF_ARGS+= --with-ldap-include=${LOCALBASE}/include \
92	--with-ldap-lib=${LOCALBASE}/lib --with-ldap=ldap	94	--with-ldap-lib=${LOCALBASE}/lib --with-ldap=ldap
Lines 95-100 Link Here
95	.else	97	.else
96	PKGNAMESUFFIX= -ldap	98	PKGNAMESUFFIX= -ldap
97	.endif	99	.endif
		100	.else
		101	PLIST_SUB+= LDAP="@comment "
98	.endif	102	.endif
99		103
100	pre-extract:	104	pre-extract:

Added Link Here

(-)files/patch-apr-util-1.3.2__build__apu-conf.m4 (+27 lines)
1	Index: apr-util-1.3.2/build/apu-conf.m4
2	===================================================================
3	--- apr-util-1.3.2/build/apu-conf.m4 (revision 674869)
4	+++ apr-util-1.3.2/build/apu-conf.m4 (working copy)
5	@@ -357,6 +357,11 @@
6	])
7
8	if test "$apu_has_ldap_openldap" = "1"; then
9	+ CPPFLAGS=$save_cppflags
10	+ LDFLAGS=$save_ldflags
11	+ LIBS=$save_libs
12	+
13	+ CPPFLAGS="$CPPFLAGS $APRUTIL_INCLUDES"
14	AC_CACHE_CHECK([style of ldap_set_rebind_proc routine], ac_cv_ldap_set_rebind_proc_style,
15	APR_TRY_COMPILE_NO_WARNING([
16	#ifdef HAVE_LBER_H
17	@@ -374,6 +379,10 @@
18	if test "$ac_cv_ldap_set_rebind_proc_style" = "three"; then
19	AC_DEFINE(LDAP_SET_REBIND_PROC_THREE, 1, [Define if ldap_set_rebind_proc takes three arguments])
20	fi
21	+
22	+ CPPFLAGS=$save_cppflags
23	+ LDFLAGS=$save_ldflags
24	+ LIBS=$save_libs
25	fi
26
27	AC_SUBST(ldap_h)