Attachment #86163 for bug #122555




# APR_UTIL_WITH_LDAP:		force dependency on OpenLDAP

PORTNAME=	apr
PORTVERSION=	1.2.12
PORTREVISION=	3
CATEGORIES=	devel
MASTER_SITES=	${MASTER_SITE_APACHE}
MASTER_SITE_SUBDIR=	apr

	@${ECHO_MSG} ""

post-patch:
	${REINPLACE_CMD} -e 's/OSVERSION/'${OSVERSION}'/g' \
		${WRKDIR}/apr-${PORTVERSION}/build/apr_hints.m4
	${FIND} ${WRKDIR} -name "Makefile.in*" | ${XARGS} ${REINPLACE_CMD} -e \
		's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g'


Lines 1-6 Link Here

(-)distinfo (-6 / +6 lines)
1	MD5 (apr-1.2.8.tar.gz) = 814f19528d9cfc79aef188dd752e04d8	1	MD5 (apr-1.2.12.tar.gz) = 020ea947446dca2d1210c099c7a4c837
2	SHA256 (apr-1.2.8.tar.gz) = 96e31f0ea2e028f372d5fdbbd4f88f31d59e14eda85cd12153183759f8e221c7	2	SHA256 (apr-1.2.12.tar.gz) = 23759142c483be869a0aec0529c5b8c94745b4dfd1c2c23f38417f4e02adcead
3	SIZE (apr-1.2.8.tar.gz) = 1107189	3	SIZE (apr-1.2.12.tar.gz) = 1127522
4	MD5 (apr-util-1.2.8.tar.gz) = a2e2e54d65e9eae961f7171335cf2550	4	MD5 (apr-util-1.2.12.tar.gz) = e292942e22edd21b68609086352212e4
5	SHA256 (apr-util-1.2.8.tar.gz) = 6527cb0b3dd619acfca668412e84e52860dfd862054246ca903822d5ea824de6	5	SHA256 (apr-util-1.2.12.tar.gz) = 7d70ff17bec733bdb04a6653a8e9c15ab7d88429dac91a4ae58c1db5caaee07f
6	SIZE (apr-util-1.2.8.tar.gz) = 646379	6	SIZE (apr-util-1.2.12.tar.gz) = 668292




--- ./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-04-07 21:01:46.000000000 -0400
@@ -672,6 +672,8 @@
     elif test "$withval" = "no"; then
       apu_have_gdbm=0
     else

       CPPFLAGS="-I$withval/include"
       LIBS="-L$withval/lib "
 
@@ -681,6 +683,9 @@
         APR_ADDTO(APRUTIL_LDFLAGS, [-L$withval/lib])
         APR_ADDTO(APRUTIL_INCLUDES, [-I$withval/include])
       fi
+      
+      CPPFLAGS="$saved_cppflags"
+      LIBS="$saved_libs"
     fi
   ])
 

Lines 1-6 Link Here

(-)files/patch-apr-util_configure (-5 / +5 lines)
1	--- apr-util-1.2.8/configure.orig Mon Sep 26 18:28:49 2005	1	--- ./apr-util-1.2.12/configure.orig 2008-04-07 21:01:59.000000000 -0400
2	+++ apr-util-1.2.8/configure Fri Dec 23 15:06:09 2005	2	+++ ./apr-util-1.2.12/configure 2008-04-07 20:57:18.000000000 -0400
3	@@ -13806,6 +13806,8 @@	3	@@ -14323,6 +14323,8 @@
4	elif test "$withval" = "no"; then	4	elif test "$withval" = "no"; then
5	apu_have_gdbm=0	5	apu_have_gdbm=0
6	else	6	else
Lines 9-15 Link Here
9	CPPFLAGS="-I$withval/include"	9	CPPFLAGS="-I$withval/include"
10	LIBS="-L$withval/lib "	10	LIBS="-L$withval/lib "
11		11
12	@@ -14064,6 +14066,9 @@	12	@@ -14566,6 +14568,9 @@
13	fi	13	fi
14		14
15	fi	15	fi
Lines 18-21 Link Here
18	+ LIBS="$saved_libs"	18	+ LIBS="$saved_libs"
19	fi	19	fi
20		20
21	else	21	fi




--- 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
@@ -137,11 +137,7 @@
 	;;
     *-freebsd*)
         APR_SETIFNULL(apr_lock_method, [USE_FLOCK_SERIALIZE])
-        if test -x /sbin/sysctl; then
-            os_version=`/sbin/sysctl -n kern.osreldate`
-        else
-            os_version=000000
-        fi
+        os_version="OSVERSION"
         # 502102 is when libc_r switched to libpthread (aka libkse).
         if test $os_version -ge "502102"; then
           apr_cv_pthreads_cflags="none"

Return to bug 122555

Lines 15-22 Link Here

(-)Makefile (-4 / +1 lines)
15	# APR_UTIL_WITH_LDAP: force dependency on OpenLDAP	15	# APR_UTIL_WITH_LDAP: force dependency on OpenLDAP
16		16
17	PORTNAME= apr	17	PORTNAME= apr
18	PORTVERSION= 1.2.8	18	PORTVERSION= 1.2.12
19	PORTREVISION= 3
20	CATEGORIES= devel	19	CATEGORIES= devel
21	MASTER_SITES= ${MASTER_SITE_APACHE}	20	MASTER_SITES= ${MASTER_SITE_APACHE}
22	MASTER_SITE_SUBDIR= apr	21	MASTER_SITE_SUBDIR= apr
Lines 131-138 Link Here
131	@${ECHO_MSG} ""	130	@${ECHO_MSG} ""
132		131
133	post-patch:	132	post-patch:
134	${REINPLACE_CMD} -e 's/OSVERSION/'${OSVERSION}'/g' \
135	${WRKDIR}/apr-${PORTVERSION}/build/apr_hints.m4
136	${FIND} ${WRKDIR} -name "Makefile.in*" \| ${XARGS} ${REINPLACE_CMD} -e \	133	${FIND} ${WRKDIR} -name "Makefile.in*" \| ${XARGS} ${REINPLACE_CMD} -e \
137	's\|[(]libdir[)]/pkgconfig\|(prefix)/libdata/pkgconfig\|g'	134	's\|[(]libdir[)]/pkgconfig\|(prefix)/libdata/pkgconfig\|g'
138		135

Lines 1-6 Link Here

(-)files/patch-apr-util_build_dbm.m4 (-7 / +7 lines)
1	--- apr-util-1.2.8/build/dbm.m4-orig Wed Dec 7 09:02:23 2005	1	--- ./apr-util-1.2.12/build/dbm.m4.orig 2007-11-01 10:07:19.000000000 -0400
2	+++ apr-util-1.2.8/build/dbm.m4 Wed Dec 23 09:07:34 2005	2	+++ ./apr-util-1.2.12/build/dbm.m4 2008-04-07 21:01:46.000000000 -0400
3	@@ -588,6 +588,8 @@	3	@@ -672,6 +672,8 @@
4	elif test "$withval" = "no"; then	4	elif test "$withval" = "no"; then
5	apu_have_gdbm=0	5	apu_have_gdbm=0
6	else	6	else
Lines 9-21 Link Here
9	CPPFLAGS="-I$withval/include"	9	CPPFLAGS="-I$withval/include"
10	LIBS="-L$withval/lib "	10	LIBS="-L$withval/lib "
11		11
12	@@ -597,6 +599,9 @@	12	@@ -681,6 +683,9 @@
13	APR_ADDTO(APRUTIL_LDFLAGS, [-L$withval/lib])	13	APR_ADDTO(APRUTIL_LDFLAGS, [-L$withval/lib])
14	APR_ADDTO(APRUTIL_INCLUDES, [-I$withval/include])	14	APR_ADDTO(APRUTIL_INCLUDES, [-I$withval/include])
15	fi	15	fi
16	+	16	+
17	+ CPPFLAGS="$saved_cppflags"	17	+ CPPFLAGS="$saved_cppflags"
18	+ LIBS="$saved_libs"	18	+ LIBS="$saved_libs"
19	fi	19	fi
20	], [	20	])
21	apu_have_gdbm=0	21

Removed Link Here

(-)files/patch-apr_hints.m4 (-15 lines)
1	--- apr-1.2.8/build/apr_hints.m4.orig Wed Oct 27 11:12:28 2004
2	+++ apr-1.2.8/build/apr_hints.m4 Wed Oct 27 11:25:32 2004
3	@@ -137,11 +137,7 @@
4	;;
5	-freebsd)
6	APR_SETIFNULL(apr_lock_method, [USE_FLOCK_SERIALIZE])
7	- if test -x /sbin/sysctl; then
8	- os_version=`/sbin/sysctl -n kern.osreldate`
9	- else
10	- os_version=000000
11	- fi
12	+ os_version="OSVERSION"
13	# 502102 is when libc_r switched to libpthread (aka libkse).
14	if test $os_version -ge "502102"; then
15	apr_cv_pthreads_cflags="none"