Date: Tue, 8 Jul 2008 18:24:17 GMT From: "Philip M. Gollucci" <pgollucci@p6m7g8.com> To: FreeBSD-gnats-submit@FreeBSD.org Cc: rodrigc@FreeBSD.org, araujo@riderwayinc.com Subject: ports/125411: [PATCH] devel/apr: [SUMMARIZE CHANGES] Message-ID: <200807081824.m68IOHBb070578@riderwayinc.com> Resent-Message-ID: <200807081830.m68IU2BN084563@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 125411
>Category: ports
>Synopsis: [PATCH] devel/apr: [SUMMARIZE CHANGES]
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Tue Jul 08 18:30:02 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator: Philip M. Gollucci
>Release: FreeBSD 7.0-RELEASE amd64
>Organization:
Riderway Inc.
>Environment:
System: FreeBSD riderwayinc.com 7.0-RELEASE FreeBSD 7.0-RELEASE #2: Thu Feb 28 21:20:48 UTC 2008
>Description:
- Bump PORTREVISION
- silence a portlint warning(tab)
- fix pkg-plist for LDAP case
- fixes ports/125400
Added file(s):
- files/patch-apr-util-1.3.2__build__apu-conf.m4
(Will be removed in 1.3.3 release)
Port maintainer (rodrigc@FreeBSD.org) is cc'd.
Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:
--- apr-1.3.2_1.patch begins here ---
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)
--- apr-1.3.2_1.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200807081824.m68IOHBb070578>