Attachment #86164 for bug #122555

Lines 15-22 Link Here

(-)Makefile (-2 / +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 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

Lines 1-21 Link Here

(-)files/patch-apr-util_build_dbm.m4 (-11 / +14 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-05-03 20:10:41.000000000 -0400
3	@@ -588,6 +588,8 @@	3	@@ -672,8 +672,10 @@
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
		7	- CPPFLAGS="-I$withval/include"
		8	- LIBS="-L$withval/lib "
7	+ saved_cppflags="$CPPFLAGS"	9	+ saved_cppflags="$CPPFLAGS"
8	+ saved_libs="$LIBS"	10	+ saved_ldflags="$LDFLAGS"
9	CPPFLAGS="-I$withval/include"	11	+ CPPFLAGS="$CPPFLAGS -I$withval/include"
10	LIBS="-L$withval/lib "	12	+ LDFLAGS="$LDFLAGS -L$withval/lib "
11		13
12	@@ -597,6 +599,9 @@	14	AC_MSG_CHECKING(checking for gdbm in $withval)
		15	AC_CHECK_HEADER(gdbm.h, AC_CHECK_LIB(gdbm, gdbm_open, [apu_have_gdbm=1]))
		16	@@ -681,6 +683,8 @@
13	APR_ADDTO(APRUTIL_LDFLAGS, [-L$withval/lib])	17	APR_ADDTO(APRUTIL_LDFLAGS, [-L$withval/lib])
14	APR_ADDTO(APRUTIL_INCLUDES, [-I$withval/include])	18	APR_ADDTO(APRUTIL_INCLUDES, [-I$withval/include])
15	fi	19	fi
16	+
17	+ CPPFLAGS="$saved_cppflags"	20	+ CPPFLAGS="$saved_cppflags"
18	+ LIBS="$saved_libs"	21	+ LDFLAGS="$saved_ldflags"
19	fi	22	fi
20	], [	23	])
21	apu_have_gdbm=0	24

Lines 1-21 Link Here

(-)files/patch-apr-util_configure (-10 / +13 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-05-03 20:03:18.000000000 -0400
2	+++ apr-util-1.2.8/configure Fri Dec 23 15:06:09 2005	2	+++ ./apr-util-1.2.12/configure 2008-05-03 20:11:05.000000000 -0400
3	@@ -13806,6 +13806,8 @@	3	@@ -14323,8 +14323,10 @@
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
		7	- CPPFLAGS="-I$withval/include"
		8	- LIBS="-L$withval/lib "
7	+ saved_cppflags="$CPPFLAGS"	9	+ saved_cppflags="$CPPFLAGS"
8	+ saved_libs="$LIBS"	10	+ saved_ldflags="$LDFLAGS"
9	CPPFLAGS="-I$withval/include"	11	+ CPPFLAGS="$CPPFLAGS -I$withval/include"
10	LIBS="-L$withval/lib "	12	+ LDFLAGS="$LDFLAGS -L$withval/lib "
11		13
12	@@ -14064,6 +14066,9 @@	14	{ echo "$as_me:$LINENO: checking checking for gdbm in $withval" >&5
		15	echo $ECHO_N "checking checking for gdbm in $withval... $ECHO_C" >&6; }
		16	@@ -14566,6 +14568,8 @@
13	fi	17	fi
14		18
15	fi	19	fi
16	+
17	+ CPPFLAGS="$saved_cppflags"	20	+ CPPFLAGS="$saved_cppflags"
18	+ LIBS="$saved_libs"	21	+ LDFLAGS="$saved_ldflags"
19	fi	22	fi
20		23
21	else	24	fi

Lines 1-5 Link Here

(-)files/patch-apr_hints.m4 (-2 / +2 lines)
1	--- apr-1.2.8/build/apr_hints.m4.orig Wed Oct 27 11:12:28 2004	1	--- apr-1.2.12hints.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	2	+++ apr-1.2.12/build/apr_hints.m4 Wed Oct 27 11:25:32 2004
3	@@ -137,11 +137,7 @@	3	@@ -137,11 +137,7 @@
4	;;	4	;;
5	-freebsd)	5	-freebsd)

Return to bug 122555