diff options
| author | Philip M. Gollucci <pgollucci@FreeBSD.org> | 2008-07-29 14:04:32 +0000 |
|---|---|---|
| committer | Philip M. Gollucci <pgollucci@FreeBSD.org> | 2008-07-29 14:04:32 +0000 |
| commit | 0a64105e315ae88550b71deb0d1b2090303db59a (patch) | |
| tree | 4073ab0990d8f0b2874f4e7f9bf66307c14c229d /devel/apr1 | |
| parent | fde06f265cbf40fbb7acc0f6e091e2db3d2aed33 (diff) | |
| download | ports-0a64105e315ae88550b71deb0d1b2090303db59a.tar.gz ports-0a64105e315ae88550b71deb0d1b2090303db59a.zip | |
Notes
Diffstat (limited to 'devel/apr1')
| -rw-r--r-- | devel/apr1/Makefile | 6 | ||||
| -rw-r--r-- | devel/apr1/files/patch-apr-util-1.3.2__build__apu-conf.m4 | 26 | ||||
| -rw-r--r-- | devel/apr1/pkg-plist | 5 |
3 files changed, 36 insertions, 1 deletions
diff --git a/devel/apr1/Makefile b/devel/apr1/Makefile index 61c8e2b19101..13a15c71b6c9 100644 --- a/devel/apr1/Makefile +++ b/devel/apr1/Makefile @@ -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 @@ USE_LDCONFIG= yes 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 @@ PKGNAMESUFFIX= -${BDB_INCLUDE_DIR:S,^${LOCALBASE}/include/,,} .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 @@ PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-ldap .else PKGNAMESUFFIX= -ldap .endif +.else +PLIST_SUB+= LDAP="@comment " .endif pre-extract: diff --git a/devel/apr1/files/patch-apr-util-1.3.2__build__apu-conf.m4 b/devel/apr1/files/patch-apr-util-1.3.2__build__apu-conf.m4 new file mode 100644 index 000000000000..d577cbbb58e0 --- /dev/null +++ b/devel/apr1/files/patch-apr-util-1.3.2__build__apu-conf.m4 @@ -0,0 +1,26 @@ +--- apr-util-1.3.2/build/apu-conf.m4 2008/06/16 21:34:50 668323 ++++ apr-util-1.3.2/build/apu-conf.m4 2008/07/08 22:31:59 675009 +@@ -357,6 +357,12 @@ + ]) + + if test "$apu_has_ldap_openldap" = "1"; then ++ save_cppflags="$CPPFLAGS" ++ save_ldflags="$LDFLAGS" ++ save_libs="$LIBS" ++ ++ CPPFLAGS="$CPPFLAGS $APRUTIL_INCLUDES" ++ LDFLAGS="$LDFLAGS $APRUTIL_LDFLAGS" + 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 +380,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) diff --git a/devel/apr1/pkg-plist b/devel/apr1/pkg-plist index 5023f715d620..7402d8e77672 100644 --- a/devel/apr1/pkg-plist +++ b/devel/apr1/pkg-plist @@ -84,5 +84,10 @@ lib/libaprutil-1.a 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 |