Attachment #106498 for bug #147113

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




# $FreeBSD: ports/devel/apr1/Makefile,v 1.103 2010/05/18 05:44:56 pgollucci Exp $

PORTNAME=	apr
PORTVERSION=	2.0.0.${SNAPDATE}
PORTREVISION=	1
CATEGORIES=	devel
MASTER_SITES=	http://svn.apache.org/snapshots/apr/
DISTNAME=	${PORTNAME}_${SNAPDATE}
DISTFILES=	apr-${APR_VERSION}.tar.gz apr-util-${APU_VERSION}.tar.gz

MAINTAINER=	apache@FreeBSD.org
COMMENT=	Apache Portability Library

LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2

SNAPDATE=	20100527031346

MAKE_JOBS_SAFE=	yes


		NDBM	"Enable NDBM support in apr-util"		off \
		PGSQL	"Enable Postgresql suport in apr-util"		off \
		SQLITE  "Enable SQLite3 support in apr-util"		off \
		DEVRANDOM "Use /dev/random or compatible in apr"	on \
		DEVELOPER_ONLY "I want to test apr2 not the maintainer" off
APR_VERSION=	1.4.2
APU_VERSION=	1.3.9

USE_ICONV=		yes
USE_AUTOTOOLS=	automake:19 autoconf:262 libtool:22:env


CONFIGURE_ENV=	CC="${CC}"

CONFIGURE_ARGS=	--with-installbuilddir=${DATADIR}/build-2 \
	--with-expat=${LOCALBASE} \
	--with-iconv=${LOCALBASE}

WRKSRC=	${WRKDIR}/apr

SHLIB_MAJOR=	0
PLIST_SUB=	SHLIB_MAJOR="${SHLIB_MAJOR}"
APR_CONF_ARGS=	--with-installbuilddir=${DATADIR}/build-1
APU_CONF_ARGS=	--with-apr=${APR_WRKDIR} \
		--with-expat=${LOCALBASE} \
		--with-iconv=${LOCALBASE}

.include <bsd.port.options.mk>

.if !defined(WITH_DEVELOPER_ONLY)
IGNORE=	not for the general public. Maintainer only very limited support for developers of apr
.endif

.if defined(WITHOUT_THREADS)
CONFIGURE_ARGS+=	--disable-threads
.if defined(PKGNAMESUFFIX)
PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-nothr
.else
PKGNAMESUFFIX=	-nothr
.endif
.else
CONFIGURE_ARGS+=	--enable-threads
.endif

.if defined(WITHOUT_IPV6)
CONFIGURE_ARGS+=	--disable-ipv6
.else
CONFIGURE_ARGS+=	--enable-ipv6
.if defined(PKGNAMESUFFIX)
PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-ipv6
.else

.endif

.if defined(WITHOUT_DEVRANDOM)
CONFIGURE_ARGS+=	--without-devrandom
.else
CONFIGURE_ARGS+=	--with-devrandom
.if defined(PKGNAMESUFFIX)
PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-devrandom
.else

######### APR-Util Options
.if defined(WITHOUT_GDBM)
PLIST_SUB+=	GDBM="@comment "
CONFIGURE_ARGS+=	--without-gdbm
.else
PLIST_SUB+=	GDBM=""
EXTRAS=	yes
LIB_DEPENDS+=	gdbm.3:${PORTSDIR}/databases/gdbm
CONFIGURE_ARGS+=	--with-gdbm=${LOCALBASE}
.if defined(PKGNAMESUFFIX)
PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-gdbm
.else


.if defined(WITHOUT_BDB)
PLIST_SUB+=	BDB="@comment "
CONFIGURE_ARGS+=	--without-berkeley-db
.else
EXTRAS=	yes
PLIST_SUB+=	BDB=""
USE_BDB=	42+
INVALID_BDB_VER=	50
CONFIGURE_ARGS+=	--with-berkeley-db=${BDB_INCLUDE_DIR}:${BDB_LIB_DIR}
.if defined(PKGNAMESUFFIX)
PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-${BDB_INCLUDE_DIR:S,^${LOCALBASE}/include/,,}
.else

.endif

.if defined(WITH_NDBM)
EXTRAS=	yes
PLIST_SUB+=	NDBM=""
CONFIGURE_ARGS+=	--with-ndbm=/usr
.if defined(PKGNAMESUFFIX)
PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-ndbm
.else

.endif
.else
PLIST_SUB+=	NDBM="@comment "
CONFIGURE_ARGS+=	--without-ndbm
.endif

.if defined(WITH_LDAP)
EXTRAS=	yes
PLIST_SUB+=	LDAP=""
USE_OPENLDAP=	yes
CONFIGURE_ARGS+=	--with-ldap-include=${LOCALBASE}/include \
	--with-ldap-lib=${LOCALBASE}/lib --with-ldap=ldap
.if defined(PKGNAMESUFFIX)
PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-ldap${OPENLDAP_VER}

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

.if defined(WITH_MYSQL)
EXTRAS=	yes
PLIST_SUB+=	MYSQL=""
USE_MYSQL=	YES
CONFIGURE_ARGS+=	--with-mysql=${LOCALBASE}
CONFIGURE_ENV+=	LIBS="${LIBS}"
CFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/mysql -DHAVE_MYSQL_H
LDFLAGS+=	-L${LOCALBASE}/lib/mysql

.endif
.else
PLIST_SUB+=	MYSQL="@comment "
CONFIGURE_ARGS+=	--without-mysql
.endif

.if defined(WITH_PGSQL)
EXTRAS=	yes
PLIST_SUB+=	PGSQL=""
USE_PGSQL=	YES
CONFIGURE_ARGS+=	--with-pgsql=${LOCALBASE}
CONFIGURE_ENV+=	ac_cv_path_PGSQL_CONFIG=""
.if defined(PKGNAMESUFFIX)
PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-pgsql${PGSQL_VER}

.endif
.else
PLIST_SUB+=	PGSQL="@comment "
CONFIGURE_ARGS+=	--without-pgsql
.endif

.if defined(WITH_SQLITE)
EXTRAS=	yes
PLIST_SUB+=	SQLITE3=""
USE_SQLITE=	YES
CONFIGURE_ARGS+=	--with-sqlite3=${LOCALBASE}
.if defined(PKGNAMESUFFIX)
PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-sqlite3
.else
PKGNAMESUFFIX=	-sqlite3
.endif
.else
CONFIGURE_ARGS+=	--without-sqlite3
PLIST_SUB+=	SQLITE3="@comment "
.endif

.if defined(EXTRAS)
PLIST_SUB+=	EXTRAS=""
.else
PLIST_SUB+=	EXTRAS="@comment "
.endif

post-patch:
	${REINPLACE_CMD} -e 's/OSVERSION/${OSVERSION}/g' ${WRKSRC}/build/apr_hints.m4
	${FIND} ${WRKSRC} -name "Makefile.in*" | ${XARGS} ${REINPLACE_CMD} -e \
	${FIND} ${APR_WRKDIR} ${APU_WRKDIR} -name "Makefile.in*" | ${XARGS} ${REINPLACE_CMD} -e \
		's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g'
	${REINPLACE_CMD} -e 's,-lpthread,${PTHREAD_LIBS},g' \
		${WRKSRC}/build/apr_threads.m4 \
		${WRKSRC}/build/apr_hints.m4 \
		${WRKSRC}/build/apu-conf.m4
	${REINPLACE_CMD} -e '1 s/python/${PYTHON_VERSION}/' ${WRKSRC}/build/gen-build.py

run-autotools:
	@(cd ${WRKSRC} ; ${SETENV} ${CONFIGURE_ENV} ${SH} ./buildconf)

test:	build
	@(cd ${WRKSRC}; make test)

#regression-test:	test
		--with-apr=${APR_WRKDIR}
	cd ${APR_WRKDIR}; \
		${SETENV} ${CONFIGURE_ENV} ${SH} \
		./configure ${CONFIGURE_ARGS} ${APR_CONF_ARGS}
	cd ${APU_WRKDIR}; \
		${SETENV} ${CONFIGURE_ENV} ${SH} \
		./configure ${CONFIGURE_ARGS} ${APU_CONF_ARGS}

do-configure:
	${DO_NADA}

do-build:
	cd ${APR_WRKDIR}; ${SETENV} ${MAKE_ENV} ${MAKE}
	cd ${APU_WRKDIR}; ${SETENV} ${MAKE_ENV} ${MAKE}

do-install:
	cd ${APR_WRKDIR}; ${SETENV} ${MAKE_ENV} ${MAKE} ${INSTALL_TARGET}
	cd ${APU_WRKDIR}; ${SETENV} ${MAKE_ENV} ${MAKE} ${INSTALL_TARGET}

debug_autoconf:
	@${ECHO} "LIBTOOL: ${LIBTOOL_VERSION}"

	@${ECHO} "LIBTOOL_SHAREDIR: ${LIBTOOL_SHAREDIR}"
	@${ECHO} "LIBTOOL_LIBEXECDIR: ${LIBTOOL_LIBEXECDIR}"
	@${ECHO} "LIBTOOL_M4: ${LIBTOOL_M4}"
	@${ECHO} "${SETENV} ${CONFIGURE_ENV} ${SH} ./configure ${CONFIGURE_ARGS} ${CONFIGURE_ARGS}"
	@${ECHO} "${SETENV} ${CONFIGURE_ENV} ${SH} ./configure ${CONFIGURE_ARGS} ${APR_UTIL_CONF_ARGS}"

.include <bsd.port.mk>

Lines 1-6 Link Here

(-)distinfo (-6 / +3 lines)
1	MD5 (apr-1.4.2.tar.gz) = fc80cb54f158c2674f9eeb47a1f672cd	1	MD5 (apr_20100527031346.tar.gz) = 46c4e65409e12273c36a420ec22dfa78
2	SHA256 (apr-1.4.2.tar.gz) = 6a0291d6f6a59d5eab5ae5441c37b78b17f7a1a2fa1478741b7178f5fbc33ebe	2	SHA256 (apr_20100527031346.tar.gz) = 1fbb2276f030941f044ce927a7dc160868a07a87172f14dab4077d14dfc19d09
3	SIZE (apr-1.4.2.tar.gz) = 949945	3	SIZE (apr_20100527031346.tar.gz) = 990126
4	MD5 (apr-util-1.3.9.tar.gz) = cc2ec0ba4f01d88375f1170f762518fa
5	SHA256 (apr-util-1.3.9.tar.gz) = 20897069274a026057df26b90a6424da9d70318d930c99885c451d8753b8e4d9
6	SIZE (apr-util-1.3.9.tar.gz) = 790952




bin/apr-2-config
%%DATADIR%%/build-2/libtool
%%DATADIR%%/build-2/mkdir.sh
%%DATADIR%%/build-2/make_exports.awk
%%DATADIR%%/build-2/make_var_export.awk
%%DATADIR%%/build-2/apr_rules.mk
include/apr-2/apr.h
include/apr-2/apr_allocator.h
include/apr-2/apr_anylock.h
include/apr-2/apr_atomic.h
include/apr-2/apr_base64.h
include/apr-2/apr_buckets.h
include/apr-2/apr_crypto.h
include/apr-2/apr_date.h
include/apr-2/apr_dbd.h
include/apr-2/apr_dbm.h
include/apr-2/apr_dso.h
include/apr-2/apr_env.h
include/apr-2/apr_errno.h
include/apr-2/apu_errno.h
include/apr-2/apr_file_info.h
include/apr-2/apr_file_io.h
include/apr-2/apr_fnmatch.h
include/apr-2/apr_general.h
include/apr-2/apr_getopt.h
include/apr-2/apr_global_mutex.h
include/apr-2/apr_hash.h
include/apr-2/apr_hooks.h
include/apr-2/apr_inherit.h
include/apr-2/apr_ldap.h
include/apr-2/apr_ldap_init.h
include/apr-2/apr_ldap_option.h
include/apr-2/apr_ldap_rebind.h
include/apr-2/apr_ldap_url.h
include/apr-2/apr_lib.h
include/apr-2/apr_md4.h
include/apr-2/apr_md5.h
include/apr-2/apr_memcache.h
include/apr-2/apr_mmap.h
include/apr-2/apr_network_io.h
include/apr-2/apr_optional.h
include/apr-2/apr_optional_hooks.h
include/apr-2/apr_perms_set.h
include/apr-2/apr_poll.h
include/apr-2/apr_pools.h
include/apr-2/apr_portable.h
include/apr-2/apr_proc_mutex.h
include/apr-2/apr_queue.h
include/apr-2/apr_random.h
include/apr-2/apr_reslist.h
include/apr-2/apr_ring.h
include/apr-2/apr_rmm.h
include/apr-2/apr_sdbm.h
include/apr-2/apr_sha1.h
include/apr-2/apr_shm.h
include/apr-2/apr_signal.h
include/apr-2/apr_strings.h
include/apr-2/apr_strmatch.h
include/apr-2/apr_tables.h
include/apr-2/apr_thread_cond.h
include/apr-2/apr_thread_mutex.h
include/apr-2/apr_thread_pool.h
include/apr-2/apr_thread_proc.h
include/apr-2/apr_thread_rwlock.h
include/apr-2/apr_time.h
include/apr-2/apr_uri.h
include/apr-2/apr_user.h
include/apr-2/apr_uuid.h
include/apr-2/apr_version.h
include/apr-2/apr_want.h
include/apr-2/apr_xlate.h
include/apr-2/apr_xml.h
include/apr-2/apu.h
include/apr-2/apu_version.h
include/apr-2/apu_want.h
libdata/pkgconfig/apr-2.pc
lib/apr.exp
lib/libapr-2.a
lib/libapr-2.la
lib/libapr-2.so
lib/libapr-2.so.%%SHLIB_MAJOR%%
%%GDBM%%lib/apr-2/apr_dbm_gdbm-2.so
%%GDBM%%lib/apr-2/apr_dbm_gdbm.so
%%GDBM%%lib/apr-2/apr_dbm_gdbm.la
%%GDBM%%lib/apr-2/apr_dbm_gdbm.a
%%BDB%%lib/apr-2/apr_dbm_db-2.so
%%BDB%%lib/apr-2/apr_dbm_db.so
%%BDB%%lib/apr-2/apr_dbm_db.la
%%BDB%%lib/apr-2/apr_dbm_db.a
%%NDBM%%lib/apr-2/apr_dbm_ndbm-2.so
%%NDBM%%lib/apr-2/apr_dbm_ndbm.so
%%NDBM%%lib/apr-2/apr_dbm_ndbm.la
%%NDBM%%lib/apr-2/apr_dbm_ndbm.a
%%LDAP%%lib/apr-2/apr_ldap-2.so
%%LDAP%%lib/apr-2/apr_ldap.so
%%LDAP%%lib/apr-2/apr_ldap.la
%%LDAP%%lib/apr-2/apr_ldap.a
%%MYSQL%%lib/apr-2/apr_dbd_mysql-2.so
%%MYSQL%%lib/apr-2/apr_dbd_mysql.so
%%MYSQL%%lib/apr-2/apr_dbd_mysql.la
%%MYSQL%%lib/apr-2/apr_dbd_mysql.a
%%PGSQL%%lib/apr-2/apr_dbd_pgsql-2.so
%%PGSQL%%lib/apr-2/apr_dbd_pgsql.so
%%PGSQL%%lib/apr-2/apr_dbd_pgsql.la
%%PGSQL%%lib/apr-2/apr_dbd_pgsql.a
%%SQLITE3%%lib/apr-2/apr_dbd_sqlite3-2.so
%%SQLITE3%%lib/apr-2/apr_dbd_sqlite3.so
%%SQLITE3%%lib/apr-2/apr_dbd_sqlite3.la
%%SQLITE3%%lib/apr-2/apr_dbd_sqlite3.a
%%EXTRAS%%@dirrm lib/apr-2
@dirrm %%DATADIR%%/build-2
%%SQLITE3%%lib/apr-util-1/apr_dbd_sqlite3.so
%%SQLITE3%%lib/apr-util-1/apr_dbd_sqlite3.la
%%SQLITE3%%lib/apr-util-1/apr_dbd_sqlite3.a
%%APU_EXTRAS%%@dirrm lib/apr-util-1
@dirrm %%DATADIR%%/build-1
@dirrm %%DATADIR%%
@dirrm include/apr-2




--- ./apr-util-1.3.9/build/dbm.m4.orig	2008-11-21 01:32:58.000000000 -0500
+++ ./apr-util-1.3.9/build/dbm.m4	2010-05-06 20:21:58.910611623 -0400
@@ -522,6 +522,25 @@
     apu_db_version=4
   fi
 ])
+dnl
+dnl APU_CHECK_DB48: is DB4.8 present?
+dnl
+dnl if present: sets apu_db_header, apu_db_lib, and apu_db_version
+dnl
+AC_DEFUN([APU_CHECK_DB48], [
+  places=$1
+  if test -z "$places"; then
+    places="std /usr/local/BerkeleyDB.4.8 /boot/home/config"
+  fi
+  APU_CHECK_BERKELEY_DB("4", "8", "-1",
+    "$places",
+    "db48/db.h db4/db.h db.h",
+    "db-4.8 db4-4.8 db48 db4 db"
+  )
+  if test "$apu_have_db" = "1"; then
+    apu_db_version=4
+  fi
+])
 
 AC_DEFUN([APU_CHECK_DB], [
   requested=$1
@@ -606,6 +625,12 @@
       AC_MSG_ERROR(Berkeley db4 not found)
     fi
     ;;
+  db48)
+    APU_CHECK_DB48("$check_places")
+    if test "$apu_db_version" != "4"; then
+      AC_MSG_ERROR(Berkeley db4 not found)
+    fi
+    ;;
   default)
     APU_CHECK_DB_ALL("$check_places")
     ;;
@@ -613,34 +638,37 @@
 ])
 
 dnl
-dnl APU_CHECK_DB_ALL: Try all Berkeley DB versions, from 4.7 to 1.
+dnl APU_CHECK_DB_ALL: Try all Berkeley DB versions, from 4.8 to 1.
 dnl
 AC_DEFUN([APU_CHECK_DB_ALL], [
   all_places=$1
  
-  APU_CHECK_DB47("$all_places")
+  APU_CHECK_DB48("$all_places")
   if test "$apu_db_version" != "4"; then
-    APU_CHECK_DB46("$all_places")
+    APU_CHECK_DB47("$all_places")
     if test "$apu_db_version" != "4"; then
-      APU_CHECK_DB45("$all_places")
+      APU_CHECK_DB46("$all_places")
       if test "$apu_db_version" != "4"; then
-        APU_CHECK_DB44("$all_places")
+        APU_CHECK_DB45("$all_places")
         if test "$apu_db_version" != "4"; then
-          APU_CHECK_DB43("$all_places")
+          APU_CHECK_DB44("$all_places")
           if test "$apu_db_version" != "4"; then
-            APU_CHECK_DB42("$all_places")
+            APU_CHECK_DB43("$all_places")
             if test "$apu_db_version" != "4"; then
-              APU_CHECK_DB41("$all_places")
+              APU_CHECK_DB42("$all_places")
               if test "$apu_db_version" != "4"; then
-                APU_CHECK_DB4("$all_places")
+                APU_CHECK_DB41("$all_places")
                 if test "$apu_db_version" != "4"; then
-                  APU_CHECK_DB3("$all_places")
-                  if test "$apu_db_version" != "3"; then
-                    APU_CHECK_DB2("$all_places")
-                    if test "$apu_db_version" != "2"; then
-                      APU_CHECK_DB1("$all_places")
-                      if test "$apu_db_version" != "1"; then
-                        APU_CHECK_DB185("$all_places")
+                  APU_CHECK_DB4("$all_places")
+                  if test "$apu_db_version" != "4"; then
+                    APU_CHECK_DB3("$all_places")
+                    if test "$apu_db_version" != "3"; then
+                      APU_CHECK_DB2("$all_places")
+                      if test "$apu_db_version" != "2"; then
+                        APU_CHECK_DB1("$all_places")
+                        if test "$apu_db_version" != "1"; then
+                          APU_CHECK_DB185("$all_places")
+                        fi
                       fi
                     fi
                   fi
@@ -679,11 +707,11 @@
   apu_db_version=0
 
   AC_ARG_WITH(dbm, [APR_HELP_STRING([--with-dbm=DBM], [choose the DBM type to use.
-      DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db41,db42,db43,db44,db45,db46,db47}])],
+      DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db41,db42,db43,db44,db45,db46,db47,db48}])],
   [
     if test "$withval" = "yes"; then
       AC_MSG_ERROR([--with-dbm needs to specify a DBM type to use.
-        One of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47])
+        One of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47, db48])
     fi
     requested="$withval"
   ], [
@@ -882,6 +910,10 @@
       apu_use_db=1
       apu_default_dbm=db4
       ;;
+    db48)
+      apu_use_db=1
+      apu_default_dbm=db4
+      ;;
     default)
       dnl ### use more sophisticated DBMs for the default?
       apu_default_dbm="sdbm (default)"
@@ -889,7 +921,7 @@
       ;;
     *)
       AC_MSG_ERROR([--with-dbm=$look_for is an unknown DBM type.
-        Use one of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47])
+        Use one of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47, db48])
       ;;
   esac
 

Removed Link Here

(-)files/patch-apr_buildconf (-10 lines)
1	--- apr-1.4.2/buildconf.orig 2009-02-24 06:37:18.000000000 +0300
2	+++ apr-1.4.2/buildconf 2009-09-27 14:25:11.000000000 +0400
3	@@ -71,6 +71,7 @@
4
5	echo "buildconf: Using libtool.m4 at ${ltfile}."
6
7	+chmod 664 build/libtool.m4
8	cat $ltfile \| sed -e 's/LIBTOOL=$.*$top_build/LIBTOOL=\1apr_build/' > build/libtool.m4
9
10	# libtool.m4 from 1.6 requires ltsugar.m4




--- apr-1.4.2/build/apr_hints.m4.orig	Wed Oct 27 11:12:28 2004
+++ apr-1.4.2/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"




--- ./build/apr_hints.m4.orig	2010-02-06 16:14:03.000000000 -0500
+++ ./build/apr_hints.m4	2010-05-26 23:19:19.263812317 -0400
@@ -159,15 +159,11 @@
 	;;
     *-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
+        osversion="${900010}"
         # 502102 is when libc_r switched to libpthread (aka libkse).
         if test $os_version -ge "502102"; then
           apr_cv_pthreads_cflags="none"
-          apr_cv_pthreads_lib="-lpthread"
+          apr_cv_pthreads_lib="-pthread"
         else
           APR_ADDTO(CPPFLAGS, [-D_THREAD_SAFE -D_REENTRANT])
           APR_SETIFNULL(enable_threads, [no])

Added Link Here

(-)files/patch-build__iconv.m4 (+11 lines)
1	--- ./build/iconv.m4.orig 2010-05-26 23:19:28.011405098 -0400
2	+++ ./build/iconv.m4 2010-05-26 23:19:37.002271826 -0400
3	@@ -44,7 +44,7 @@
4	if test -f "$apu_iconv_dir/include/iconv.h"; then
5	have_iconv="1"
6	APR_ADDTO(CPPFLAGS,[-I$apu_iconv_dir/include])
7	- APR_ADDTO(LDFLAGS,[-L$apu_iconv_dir/lib])
8	+ APR_ADDTO(LDFLAGS,[-L$apu_iconv_dir/lib -liconv])
9	fi
10	fi
11	])




--- ./buildconf.orig	2009-11-13 22:13:59.000000000 -0500
+++ ./buildconf	2010-05-26 23:19:19.245814435 -0400
@@ -69,6 +69,7 @@
   fi
   # Do we need this anymore?
   echo "buildconf: Using libtool.m4 at ${ltfile}."
+  chmod 644 build/libtool.m4 
   cat $ltfile | sed -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' > build/libtool.m4
 fi
 if test "$1" = "2"; then
@@ -76,6 +77,7 @@
   # Wouldn't it just be better to define top_builddir??
   mv build/libtool.m4 build/libtool.m4.$$
   cat build/libtool.m4.$$ | sed -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' > build/libtool.m4
+  chmod 644 build/libtool.m4.$$
   rm build/libtool.m4.$$
 fi
 

Return to bug 147113

Lines 5-21 Link Here

(-)Makefile (-88 / +65 lines)
5	# $FreeBSD: ports/devel/apr1/Makefile,v 1.103 2010/05/18 05:44:56 pgollucci Exp $	5	# $FreeBSD: ports/devel/apr1/Makefile,v 1.103 2010/05/18 05:44:56 pgollucci Exp $
6		6
7	PORTNAME= apr	7	PORTNAME= apr
8	PORTVERSION= ${APR_VERSION}.${APU_VERSION}	8	PORTVERSION= 2.0.0.${SNAPDATE}
9	PORTREVISION= 1
10	CATEGORIES= devel	9	CATEGORIES= devel
11	MASTER_SITES= ${MASTER_SITE_APACHE}	10	MASTER_SITES= http://svn.apache.org/snapshots/apr/
12	MASTER_SITE_SUBDIR= apr	11	DISTNAME= ${PORTNAME}_${SNAPDATE}
13	DISTFILES= apr-${APR_VERSION}.tar.gz apr-util-${APU_VERSION}.tar.gz
14		12
15	MAINTAINER= apache@FreeBSD.org	13	MAINTAINER= apache@FreeBSD.org
16	COMMENT= Apache Portability Library	14	COMMENT= Apache Portability Library
17		15
18	LIB_DEPENDS+= expat.6:${PORTSDIR}/textproc/expat2	16	LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2
		17
		18	SNAPDATE= 20100527031346
19		19
20	MAKE_JOBS_SAFE= yes	20	MAKE_JOBS_SAFE= yes
21		21
Lines 28-37 Link Here
28	NDBM "Enable NDBM support in apr-util" off \	28	NDBM "Enable NDBM support in apr-util" off \
29	PGSQL "Enable Postgresql suport in apr-util" off \	29	PGSQL "Enable Postgresql suport in apr-util" off \
30	SQLITE "Enable SQLite3 support in apr-util" off \	30	SQLITE "Enable SQLite3 support in apr-util" off \
31	DEVRANDOM "Use /dev/random or compatible in apr" on	31	DEVRANDOM "Use /dev/random or compatible in apr" on \
32		32	DEVELOPER_ONLY "I want to test apr2 not the maintainer" off
33	APR_VERSION= 1.4.2
34	APU_VERSION= 1.3.9
35		33
36	USE_ICONV= yes	34	USE_ICONV= yes
37	USE_AUTOTOOLS= automake:19 autoconf:262 libtool:22:env	35	USE_AUTOTOOLS= automake:19 autoconf:262 libtool:22:env
Lines 42-78 Link Here
42		40
43	CONFIGURE_ENV= CC="${CC}"	41	CONFIGURE_ENV= CC="${CC}"
44		42
45	NO_WRKSUBDIR= yes	43	CONFIGURE_ARGS= --with-installbuilddir=${DATADIR}/build-2 \
46	APR_WRKDIR= ${WRKDIR}/apr-${APR_VERSION}	44	--with-expat=${LOCALBASE} \
47	APU_WRKDIR= ${WRKDIR}/apr-util-${APU_VERSION}	45	--with-iconv=${LOCALBASE}
48		46
49	PLIST_SUB= SHLIB_APR_MAJOR="${SHLIB_APR_MAJOR}" SHLIB_APU_MAJOR="${SHLIB_APU_MAJOR}"	47	WRKSRC= ${WRKDIR}/apr
50	SHLIB_APR_MAJOR= 4	48
51	SHLIB_APU_MAJOR= 3	49	SHLIB_MAJOR= 0
52		50	PLIST_SUB= SHLIB_MAJOR="${SHLIB_MAJOR}"
53	APR_CONF_ARGS= --with-installbuilddir=${DATADIR}/build-1
54	APU_CONF_ARGS= --with-apr=${APR_WRKDIR} \
55	--with-expat=${LOCALBASE} \
56	--with-iconv=${LOCALBASE}
57		51
58	.include <bsd.port.options.mk>	52	.include <bsd.port.options.mk>
59		53
60	########## APR Options	54	.if !defined(WITH_DEVELOPER_ONLY)
		55	IGNORE= not for the general public. Maintainer only very limited support for developers of apr
		56	.endif
		57
61	.if defined(WITHOUT_THREADS)	58	.if defined(WITHOUT_THREADS)
62	APR_CONF_ARGS+= --disable-threads	59	CONFIGURE_ARGS+= --disable-threads
63	.if defined(PKGNAMESUFFIX)	60	.if defined(PKGNAMESUFFIX)
64	PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-nothr	61	PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-nothr
65	.else	62	.else
66	PKGNAMESUFFIX= -nothr	63	PKGNAMESUFFIX= -nothr
67	.endif	64	.endif
68	.else	65	.else
69	APR_CONF_ARGS+= --enable-threads	66	CONFIGURE_ARGS+= --enable-threads
70	.endif	67	.endif
71		68
72	.if defined(WITHOUT_IPV6)	69	.if defined(WITHOUT_IPV6)
73	APR_CONF_ARGS+= --disable-ipv6	70	CONFIGURE_ARGS+= --disable-ipv6
74	.else	71	.else
75	APR_CONF_ARGS+= --enable-ipv6	72	CONFIGURE_ARGS+= --enable-ipv6
76	.if defined(PKGNAMESUFFIX)	73	.if defined(PKGNAMESUFFIX)
77	PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-ipv6	74	PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-ipv6
78	.else	75	.else
Lines 81-89 Link Here
81	.endif	78	.endif
82		79
83	.if defined(WITHOUT_DEVRANDOM)	80	.if defined(WITHOUT_DEVRANDOM)
84	APR_CONF_ARGS+= --without-devrandom	81	CONFIGURE_ARGS+= --without-devrandom
85	.else	82	.else
86	APR_CONF_ARGS+= --with-devrandom	83	CONFIGURE_ARGS+= --with-devrandom
87	.if defined(PKGNAMESUFFIX)	84	.if defined(PKGNAMESUFFIX)
88	PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-devrandom	85	PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-devrandom
89	.else	86	.else
Lines 94-105 Link Here
94	######### APR-Util Options	91	######### APR-Util Options
95	.if defined(WITHOUT_GDBM)	92	.if defined(WITHOUT_GDBM)
96	PLIST_SUB+= GDBM="@comment "	93	PLIST_SUB+= GDBM="@comment "
97	APU_CONF_ARGS+= --without-gdbm	94	CONFIGURE_ARGS+= --without-gdbm
98	.else	95	.else
99	PLIST_SUB+= GDBM=""	96	PLIST_SUB+= GDBM=""
100	APU_EXTRAS= yes	97	EXTRAS= yes
101	LIB_DEPENDS+= gdbm.3:${PORTSDIR}/databases/gdbm	98	LIB_DEPENDS+= gdbm.3:${PORTSDIR}/databases/gdbm
102	APU_CONF_ARGS+= --with-gdbm=${LOCALBASE}	99	CONFIGURE_ARGS+= --with-gdbm=${LOCALBASE}
103	.if defined(PKGNAMESUFFIX)	100	.if defined(PKGNAMESUFFIX)
104	PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-gdbm	101	PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-gdbm
105	.else	102	.else
Lines 109-121 Link Here
109		106
110	.if defined(WITHOUT_BDB)	107	.if defined(WITHOUT_BDB)
111	PLIST_SUB+= BDB="@comment "	108	PLIST_SUB+= BDB="@comment "
112	APU_CONF_ARGS+= --without-berkeley-db	109	CONFIGURE_ARGS+= --without-berkeley-db
113	.else	110	.else
114	APU_EXTRAS= yes	111	EXTRAS= yes
115	PLIST_SUB+= BDB=""	112	PLIST_SUB+= BDB=""
116	USE_BDB= 42+	113	USE_BDB= 42+
117	INVALID_BDB_VER= 50	114	INVALID_BDB_VER= 50
118	APU_CONF_ARGS+= --with-berkeley-db=${BDB_INCLUDE_DIR}:${BDB_LIB_DIR}	115	CONFIGURE_ARGS+= --with-berkeley-db=${BDB_INCLUDE_DIR}:${BDB_LIB_DIR}
119	.if defined(PKGNAMESUFFIX)	116	.if defined(PKGNAMESUFFIX)
120	PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-${BDB_INCLUDE_DIR:S,^${LOCALBASE}/include/,,}	117	PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-${BDB_INCLUDE_DIR:S,^${LOCALBASE}/include/,,}
121	.else	118	.else
Lines 124-132 Link Here
124	.endif	121	.endif
125		122
126	.if defined(WITH_NDBM)	123	.if defined(WITH_NDBM)
127	APU_EXTRAS= yes	124	EXTRAS= yes
128	PLIST_SUB+= NDBM=""	125	PLIST_SUB+= NDBM=""
129	APU_CONF_ARGS+= --with-ndbm=/usr	126	CONFIGURE_ARGS+= --with-ndbm=/usr
130	.if defined(PKGNAMESUFFIX)	127	.if defined(PKGNAMESUFFIX)
131	PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-ndbm	128	PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-ndbm
132	.else	129	.else
Lines 134-147 Link Here
134	.endif	131	.endif
135	.else	132	.else
136	PLIST_SUB+= NDBM="@comment "	133	PLIST_SUB+= NDBM="@comment "
137	APU_CONF_ARGS+= --without-ndbm	134	CONFIGURE_ARGS+= --without-ndbm
138	.endif	135	.endif
139		136
140	.if defined(WITH_LDAP)	137	.if defined(WITH_LDAP)
141	APU_EXTRAS= yes	138	EXTRAS= yes
142	PLIST_SUB+= LDAP=""	139	PLIST_SUB+= LDAP=""
143	USE_OPENLDAP= yes	140	USE_OPENLDAP= yes
144	APU_CONF_ARGS+= --with-ldap-include=${LOCALBASE}/include \	141	CONFIGURE_ARGS+= --with-ldap-include=${LOCALBASE}/include \
145	--with-ldap-lib=${LOCALBASE}/lib --with-ldap=ldap	142	--with-ldap-lib=${LOCALBASE}/lib --with-ldap=ldap
146	.if defined(PKGNAMESUFFIX)	143	.if defined(PKGNAMESUFFIX)
147	PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-ldap${OPENLDAP_VER}	144	PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-ldap${OPENLDAP_VER}
Lines 150-163 Link Here
150	.endif	147	.endif
151	.else	148	.else
152	PLIST_SUB+= LDAP="@comment "	149	PLIST_SUB+= LDAP="@comment "
153	APU_CONF_ARGS+= --without-ldap	150	CONFIGURE_ARGS+= --without-ldap
154	.endif	151	.endif
155		152
156	.if defined(WITH_MYSQL)	153	.if defined(WITH_MYSQL)
157	APU_EXTRAS= yes	154	EXTRAS= yes
158	PLIST_SUB+= MYSQL=""	155	PLIST_SUB+= MYSQL=""
159	USE_MYSQL= YES	156	USE_MYSQL= YES
160	APU_CONF_ARGS+= --with-mysql=${LOCALBASE}	157	CONFIGURE_ARGS+= --with-mysql=${LOCALBASE}
161	CONFIGURE_ENV+= LIBS="${LIBS}"	158	CONFIGURE_ENV+= LIBS="${LIBS}"
162	CFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/mysql -DHAVE_MYSQL_H	159	CFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/mysql -DHAVE_MYSQL_H
163	LDFLAGS+= -L${LOCALBASE}/lib/mysql	160	LDFLAGS+= -L${LOCALBASE}/lib/mysql
Lines 168-181 Link Here
168	.endif	165	.endif
169	.else	166	.else
170	PLIST_SUB+= MYSQL="@comment "	167	PLIST_SUB+= MYSQL="@comment "
171	APU_CONF_ARGS+= --without-mysql	168	CONFIGURE_ARGS+= --without-mysql
172	.endif	169	.endif
173		170
174	.if defined(WITH_PGSQL)	171	.if defined(WITH_PGSQL)
175	APU_EXTRAS= yes	172	EXTRAS= yes
176	PLIST_SUB+= PGSQL=""	173	PLIST_SUB+= PGSQL=""
177	USE_PGSQL= YES	174	USE_PGSQL= YES
178	APU_CONF_ARGS+= --with-pgsql=${LOCALBASE}	175	CONFIGURE_ARGS+= --with-pgsql=${LOCALBASE}
179	CONFIGURE_ENV+= ac_cv_path_PGSQL_CONFIG=""	176	CONFIGURE_ENV+= ac_cv_path_PGSQL_CONFIG=""
180	.if defined(PKGNAMESUFFIX)	177	.if defined(PKGNAMESUFFIX)
181	PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-pgsql${PGSQL_VER}	178	PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-pgsql${PGSQL_VER}
Lines 184-249 Link Here
184	.endif	181	.endif
185	.else	182	.else
186	PLIST_SUB+= PGSQL="@comment "	183	PLIST_SUB+= PGSQL="@comment "
187	APU_CONF_ARGS+= --without-pgsql	184	CONFIGURE_ARGS+= --without-pgsql
188	.endif	185	.endif
189		186
190	.if defined(WITH_SQLITE)	187	.if defined(WITH_SQLITE)
191	APU_EXTRAS= yes	188	EXTRAS= yes
192	PLIST_SUB+= SQLITE3=""	189	PLIST_SUB+= SQLITE3=""
193	USE_SQLITE= YES	190	USE_SQLITE= YES
194	APU_CONF_ARGS+= --with-sqlite3=${LOCALBASE}	191	CONFIGURE_ARGS+= --with-sqlite3=${LOCALBASE}
195	.if defined(PKGNAMESUFFIX)	192	.if defined(PKGNAMESUFFIX)
196	PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-sqlite3	193	PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-sqlite3
197	.else	194	.else
198	PKGNAMESUFFIX= -sqlite3	195	PKGNAMESUFFIX= -sqlite3
199	.endif	196	.endif
200	.else	197	.else
201	APU_CONF_ARGS+= --without-sqlite3	198	CONFIGURE_ARGS+= --without-sqlite3
202	PLIST_SUB+= SQLITE3="@comment "	199	PLIST_SUB+= SQLITE3="@comment "
203	.endif	200	.endif
204		201
205	.if defined(APU_EXTRAS)	202	.if defined(EXTRAS)
206	PLIST_SUB+= APU_EXTRAS=""	203	PLIST_SUB+= EXTRAS=""
207	.else	204	.else
208	PLIST_SUB+= APU_EXTRAS="@comment "	205	PLIST_SUB+= EXTRAS="@comment "
209	.endif	206	.endif
210		207
211	post-patch:	208	post-patch:
212	${REINPLACE_CMD} -e 's/OSVERSION/${OSVERSION}/g' \	209	${REINPLACE_CMD} -e 's/OSVERSION/${OSVERSION}/g' ${WRKSRC}/build/apr_hints.m4
213	${APR_WRKDIR}/build/apr_hints.m4	210	${FIND} ${WRKSRC} -name "Makefile.in*" \| ${XARGS} ${REINPLACE_CMD} -e \
214	${FIND} ${APR_WRKDIR} ${APU_WRKDIR} -name "Makefile.in*" \| ${XARGS} ${REINPLACE_CMD} -e \
215	's\|[(]libdir[)]/pkgconfig\|(prefix)/libdata/pkgconfig\|g'	211	's\|[(]libdir[)]/pkgconfig\|(prefix)/libdata/pkgconfig\|g'
216	${REINPLACE_CMD} -e 's,-lpthread,${PTHREAD_LIBS},g' \	212	${REINPLACE_CMD} -e 's,-lpthread,${PTHREAD_LIBS},g' \
217	${APR_WRKDIR}/build/apr_threads.m4 ${APR_WRKDIR}/build/apr_hints.m4 \	213	${WRKSRC}/build/apr_threads.m4 \
218	${APU_WRKDIR}/build/apu-conf.m4	214	${WRKSRC}/build/apr_hints.m4 \
219	${REINPLACE_CMD} -e '1 s/python/${PYTHON_VERSION}/' \	215	${WRKSRC}/build/apu-conf.m4
220	${APR_WRKDIR}/build/gen-build.py	216	${REINPLACE_CMD} -e '1 s/python/${PYTHON_VERSION}/' ${WRKSRC}/build/gen-build.py
221		217
222	run-autotools::	218	run-autotools:
223	cd ${APR_WRKDIR} ; \	219	@(cd ${WRKSRC} ; ${SETENV} ${CONFIGURE_ENV} ${SH} ./buildconf)
224	${SETENV} ${CONFIGURE_ENV} ${SH} ./buildconf	220
225	cd ${APU_WRKDIR} ; \	221	test: build
226	${RM} -fr xml/expat	222	@(cd ${WRKSRC}; make test)
227	cd ${APU_WRKDIR} ; \	223
228	${SETENV} ${CONFIGURE_ENV} ${SH} ./buildconf \	224	#regression-test: test
229	--with-apr=${APR_WRKDIR}
230	cd ${APR_WRKDIR}; \
231	${SETENV} ${CONFIGURE_ENV} ${SH} \
232	./configure ${CONFIGURE_ARGS} ${APR_CONF_ARGS}
233	cd ${APU_WRKDIR}; \
234	${SETENV} ${CONFIGURE_ENV} ${SH} \
235	./configure ${CONFIGURE_ARGS} ${APU_CONF_ARGS}
236
237	do-configure:
238	${DO_NADA}
239
240	do-build:
241	cd ${APR_WRKDIR}; ${SETENV} ${MAKE_ENV} ${MAKE}
242	cd ${APU_WRKDIR}; ${SETENV} ${MAKE_ENV} ${MAKE}
243
244	do-install:
245	cd ${APR_WRKDIR}; ${SETENV} ${MAKE_ENV} ${MAKE} ${INSTALL_TARGET}
246	cd ${APU_WRKDIR}; ${SETENV} ${MAKE_ENV} ${MAKE} ${INSTALL_TARGET}
247		225
248	debug_autoconf:	226	debug_autoconf:
249	@${ECHO} "LIBTOOL: ${LIBTOOL_VERSION}"	227	@${ECHO} "LIBTOOL: ${LIBTOOL_VERSION}"
Lines 256-262 Link Here
256	@${ECHO} "LIBTOOL_SHAREDIR: ${LIBTOOL_SHAREDIR}"	234	@${ECHO} "LIBTOOL_SHAREDIR: ${LIBTOOL_SHAREDIR}"
257	@${ECHO} "LIBTOOL_LIBEXECDIR: ${LIBTOOL_LIBEXECDIR}"	235	@${ECHO} "LIBTOOL_LIBEXECDIR: ${LIBTOOL_LIBEXECDIR}"
258	@${ECHO} "LIBTOOL_M4: ${LIBTOOL_M4}"	236	@${ECHO} "LIBTOOL_M4: ${LIBTOOL_M4}"
259	@${ECHO} "${SETENV} ${CONFIGURE_ENV} ${SH} ./configure ${CONFIGURE_ARGS} ${APR_CONF_ARGS}"	237	@${ECHO} "${SETENV} ${CONFIGURE_ENV} ${SH} ./configure ${CONFIGURE_ARGS} ${CONFIGURE_ARGS}"
260	@${ECHO} "${SETENV} ${CONFIGURE_ENV} ${SH} ./configure ${CONFIGURE_ARGS} ${APR_UTIL_CONF_ARGS}"
261		238
262	.include <bsd.port.mk>	239	.include <bsd.port.mk>

Lines 1-118 Link Here

(-)pkg-plist (-116 / +111 lines)
1	bin/apr-1-config	1	bin/apr-2-config
2	bin/apu-1-config	2	%%DATADIR%%/build-2/libtool
3	%%DATADIR%%/build-1/apr_rules.mk	3	%%DATADIR%%/build-2/mkdir.sh
4	%%DATADIR%%/build-1/libtool	4	%%DATADIR%%/build-2/make_exports.awk
5	%%DATADIR%%/build-1/make_exports.awk	5	%%DATADIR%%/build-2/make_var_export.awk
6	%%DATADIR%%/build-1/make_var_export.awk	6	%%DATADIR%%/build-2/apr_rules.mk
7	%%DATADIR%%/build-1/mkdir.sh	7	include/apr-2/apr.h
8	include/apr-1/apr.h	8	include/apr-2/apr_allocator.h
9	include/apr-1/apr_allocator.h	9	include/apr-2/apr_anylock.h
10	include/apr-1/apr_anylock.h	10	include/apr-2/apr_atomic.h
11	include/apr-1/apr_atomic.h	11	include/apr-2/apr_base64.h
12	include/apr-1/apr_base64.h	12	include/apr-2/apr_buckets.h
13	include/apr-1/apr_buckets.h	13	include/apr-2/apr_crypto.h
14	include/apr-1/apr_date.h	14	include/apr-2/apr_date.h
15	include/apr-1/apr_dbd.h	15	include/apr-2/apr_dbd.h
16	include/apr-1/apr_dbm.h	16	include/apr-2/apr_dbm.h
17	include/apr-1/apr_dso.h	17	include/apr-2/apr_dso.h
18	include/apr-1/apr_env.h	18	include/apr-2/apr_env.h
19	include/apr-1/apr_errno.h	19	include/apr-2/apr_errno.h
20	include/apr-1/apr_file_info.h	20	include/apr-2/apu_errno.h
21	include/apr-1/apr_file_io.h	21	include/apr-2/apr_file_info.h
22	include/apr-1/apr_fnmatch.h	22	include/apr-2/apr_file_io.h
23	include/apr-1/apr_general.h	23	include/apr-2/apr_fnmatch.h
24	include/apr-1/apr_getopt.h	24	include/apr-2/apr_general.h
25	include/apr-1/apr_global_mutex.h	25	include/apr-2/apr_getopt.h
26	include/apr-1/apr_hash.h	26	include/apr-2/apr_global_mutex.h
27	include/apr-1/apr_hooks.h	27	include/apr-2/apr_hash.h
28	include/apr-1/apr_inherit.h	28	include/apr-2/apr_hooks.h
29	include/apr-1/apr_ldap.h	29	include/apr-2/apr_inherit.h
30	include/apr-1/apr_ldap_init.h	30	include/apr-2/apr_ldap.h
31	include/apr-1/apr_ldap_option.h	31	include/apr-2/apr_ldap_init.h
32	include/apr-1/apr_ldap_rebind.h	32	include/apr-2/apr_ldap_option.h
33	include/apr-1/apr_ldap_url.h	33	include/apr-2/apr_ldap_rebind.h
34	include/apr-1/apr_lib.h	34	include/apr-2/apr_ldap_url.h
35	include/apr-1/apr_md4.h	35	include/apr-2/apr_lib.h
36	include/apr-1/apr_md5.h	36	include/apr-2/apr_md4.h
37	include/apr-1/apr_memcache.h	37	include/apr-2/apr_md5.h
38	include/apr-1/apr_mmap.h	38	include/apr-2/apr_memcache.h
39	include/apr-1/apr_network_io.h	39	include/apr-2/apr_mmap.h
40	include/apr-1/apr_optional.h	40	include/apr-2/apr_network_io.h
41	include/apr-1/apr_optional_hooks.h	41	include/apr-2/apr_optional.h
42	include/apr-1/apr_poll.h	42	include/apr-2/apr_optional_hooks.h
43	include/apr-1/apr_pools.h	43	include/apr-2/apr_perms_set.h
44	include/apr-1/apr_portable.h	44	include/apr-2/apr_poll.h
45	include/apr-1/apr_proc_mutex.h	45	include/apr-2/apr_pools.h
46	include/apr-1/apr_queue.h	46	include/apr-2/apr_portable.h
47	include/apr-1/apr_random.h	47	include/apr-2/apr_proc_mutex.h
48	include/apr-1/apr_reslist.h	48	include/apr-2/apr_queue.h
49	include/apr-1/apr_ring.h	49	include/apr-2/apr_random.h
50	include/apr-1/apr_rmm.h	50	include/apr-2/apr_reslist.h
51	include/apr-1/apr_sdbm.h	51	include/apr-2/apr_ring.h
52	include/apr-1/apr_sha1.h	52	include/apr-2/apr_rmm.h
53	include/apr-1/apr_shm.h	53	include/apr-2/apr_sdbm.h
54	include/apr-1/apr_signal.h	54	include/apr-2/apr_sha1.h
55	include/apr-1/apr_strings.h	55	include/apr-2/apr_shm.h
56	include/apr-1/apr_strmatch.h	56	include/apr-2/apr_signal.h
57	include/apr-1/apr_support.h	57	include/apr-2/apr_strings.h
58	include/apr-1/apr_tables.h	58	include/apr-2/apr_strmatch.h
59	include/apr-1/apr_thread_cond.h	59	include/apr-2/apr_tables.h
60	include/apr-1/apr_thread_mutex.h	60	include/apr-2/apr_thread_cond.h
61	include/apr-1/apr_thread_pool.h	61	include/apr-2/apr_thread_mutex.h
62	include/apr-1/apr_thread_proc.h	62	include/apr-2/apr_thread_pool.h
63	include/apr-1/apr_thread_rwlock.h	63	include/apr-2/apr_thread_proc.h
64	include/apr-1/apr_time.h	64	include/apr-2/apr_thread_rwlock.h
65	include/apr-1/apr_uri.h	65	include/apr-2/apr_time.h
66	include/apr-1/apr_user.h	66	include/apr-2/apr_uri.h
67	include/apr-1/apr_uuid.h	67	include/apr-2/apr_user.h
68	include/apr-1/apr_version.h	68	include/apr-2/apr_uuid.h
69	include/apr-1/apr_want.h	69	include/apr-2/apr_version.h
70	include/apr-1/apr_xlate.h	70	include/apr-2/apr_want.h
71	include/apr-1/apr_xml.h	71	include/apr-2/apr_xlate.h
72	include/apr-1/apu.h	72	include/apr-2/apr_xml.h
73	include/apr-1/apu_version.h	73	include/apr-2/apu.h
74	include/apr-1/apu_want.h	74	include/apr-2/apu_version.h
75	libdata/pkgconfig/apr-1.pc	75	include/apr-2/apu_want.h
76	libdata/pkgconfig/apr-util-1.pc	76	libdata/pkgconfig/apr-2.pc
77	lib/apr.exp	77	lib/apr.exp
78	lib/aprutil.exp	78	lib/libapr-2.a
79	lib/libapr-1.a	79	lib/libapr-2.la
80	lib/libapr-1.la	80	lib/libapr-2.so
81	lib/libapr-1.so	81	lib/libapr-2.so.%%SHLIB_MAJOR%%
82	lib/libapr-1.so.%%SHLIB_APR_MAJOR%%	82	%%GDBM%%lib/apr-2/apr_dbm_gdbm-2.so
83	lib/libaprutil-1.a	83	%%GDBM%%lib/apr-2/apr_dbm_gdbm.so
84	lib/libaprutil-1.la	84	%%GDBM%%lib/apr-2/apr_dbm_gdbm.la
85	lib/libaprutil-1.so	85	%%GDBM%%lib/apr-2/apr_dbm_gdbm.a
86	lib/libaprutil-1.so.%%SHLIB_APU_MAJOR%%	86	%%BDB%%lib/apr-2/apr_dbm_db-2.so
87	%%BDB%%lib/apr-util-1/apr_dbm_db-1.so	87	%%BDB%%lib/apr-2/apr_dbm_db.so
88	%%BDB%%lib/apr-util-1/apr_dbm_db.so	88	%%BDB%%lib/apr-2/apr_dbm_db.la
89	%%BDB%%lib/apr-util-1/apr_dbm_db.la	89	%%BDB%%lib/apr-2/apr_dbm_db.a
90	%%BDB%%lib/apr-util-1/apr_dbm_db.a	90	%%NDBM%%lib/apr-2/apr_dbm_ndbm-2.so
91	%%GDBM%%lib/apr-util-1/apr_dbm_gdbm-1.so	91	%%NDBM%%lib/apr-2/apr_dbm_ndbm.so
92	%%GDBM%%lib/apr-util-1/apr_dbm_gdbm.so	92	%%NDBM%%lib/apr-2/apr_dbm_ndbm.la
93	%%GDBM%%lib/apr-util-1/apr_dbm_gdbm.la	93	%%NDBM%%lib/apr-2/apr_dbm_ndbm.a
94	%%GDBM%%lib/apr-util-1/apr_dbm_gdbm.a	94	%%LDAP%%lib/apr-2/apr_ldap-2.so
95	%%NDBM%%lib/apr-util-1/apr_dbm_ndbm-1.so	95	%%LDAP%%lib/apr-2/apr_ldap.so
96	%%NDBM%%lib/apr-util-1/apr_dbm_ndbm.so	96	%%LDAP%%lib/apr-2/apr_ldap.la
97	%%NDBM%%lib/apr-util-1/apr_dbm_ndbm.la	97	%%LDAP%%lib/apr-2/apr_ldap.a
98	%%NDBM%%lib/apr-util-1/apr_dbm_ndbm.a	98	%%MYSQL%%lib/apr-2/apr_dbd_mysql-2.so
99	%%LDAP%%lib/apr-util-1/apr_ldap-1.so	99	%%MYSQL%%lib/apr-2/apr_dbd_mysql.so
100	%%LDAP%%lib/apr-util-1/apr_ldap.so	100	%%MYSQL%%lib/apr-2/apr_dbd_mysql.la
101	%%LDAP%%lib/apr-util-1/apr_ldap.la	101	%%MYSQL%%lib/apr-2/apr_dbd_mysql.a
102	%%LDAP%%lib/apr-util-1/apr_ldap.a	102	%%PGSQL%%lib/apr-2/apr_dbd_pgsql-2.so
103	%%MYSQL%%lib/apr-util-1/apr_dbd_mysql-1.so	103	%%PGSQL%%lib/apr-2/apr_dbd_pgsql.so
104	%%MYSQL%%lib/apr-util-1/apr_dbd_mysql.so	104	%%PGSQL%%lib/apr-2/apr_dbd_pgsql.la
105	%%MYSQL%%lib/apr-util-1/apr_dbd_mysql.la	105	%%PGSQL%%lib/apr-2/apr_dbd_pgsql.a
106	%%MYSQL%%lib/apr-util-1/apr_dbd_mysql.a	106	%%SQLITE3%%lib/apr-2/apr_dbd_sqlite3-2.so
107	%%PGSQL%%lib/apr-util-1/apr_dbd_pgsql-1.so	107	%%SQLITE3%%lib/apr-2/apr_dbd_sqlite3.so
108	%%PGSQL%%lib/apr-util-1/apr_dbd_pgsql.so	108	%%SQLITE3%%lib/apr-2/apr_dbd_sqlite3.la
109	%%PGSQL%%lib/apr-util-1/apr_dbd_pgsql.la	109	%%SQLITE3%%lib/apr-2/apr_dbd_sqlite3.a
110	%%PGSQL%%lib/apr-util-1/apr_dbd_pgsql.a	110	%%EXTRAS%%@dirrm lib/apr-2
111	%%SQLITE3%%lib/apr-util-1/apr_dbd_sqlite3-1.so	111	@dirrm %%DATADIR%%/build-2
112	%%SQLITE3%%lib/apr-util-1/apr_dbd_sqlite3.so
113	%%SQLITE3%%lib/apr-util-1/apr_dbd_sqlite3.la
114	%%SQLITE3%%lib/apr-util-1/apr_dbd_sqlite3.a
115	%%APU_EXTRAS%%@dirrm lib/apr-util-1
116	@dirrm %%DATADIR%%/build-1
117	@dirrm %%DATADIR%%	112	@dirrm %%DATADIR%%
118	@dirrm include/apr-1	113	@dirrm include/apr-2

Removed Link Here

(-)files/patch-apr-util-1.3.9__build__dbm.m4 (-129 lines)
1	--- ./apr-util-1.3.9/build/dbm.m4.orig 2008-11-21 01:32:58.000000000 -0500
2	+++ ./apr-util-1.3.9/build/dbm.m4 2010-05-06 20:21:58.910611623 -0400
3	@@ -522,6 +522,25 @@
4	apu_db_version=4
5	fi
6	])
7	+dnl
8	+dnl APU_CHECK_DB48: is DB4.8 present?
9	+dnl
10	+dnl if present: sets apu_db_header, apu_db_lib, and apu_db_version
11	+dnl
12	+AC_DEFUN([APU_CHECK_DB48], [
13	+ places=$1
14	+ if test -z "$places"; then
15	+ places="std /usr/local/BerkeleyDB.4.8 /boot/home/config"
16	+ fi
17	+ APU_CHECK_BERKELEY_DB("4", "8", "-1",
18	+ "$places",
19	+ "db48/db.h db4/db.h db.h",
20	+ "db-4.8 db4-4.8 db48 db4 db"
21	+ )
22	+ if test "$apu_have_db" = "1"; then
23	+ apu_db_version=4
24	+ fi
25	+])
26
27	AC_DEFUN([APU_CHECK_DB], [
28	requested=$1
29	@@ -606,6 +625,12 @@
30	AC_MSG_ERROR(Berkeley db4 not found)
31	fi
32	;;
33	+ db48)
34	+ APU_CHECK_DB48("$check_places")
35	+ if test "$apu_db_version" != "4"; then
36	+ AC_MSG_ERROR(Berkeley db4 not found)
37	+ fi
38	+ ;;
39	default)
40	APU_CHECK_DB_ALL("$check_places")
41	;;
42	@@ -613,34 +638,37 @@
43	])
44
45	dnl
46	-dnl APU_CHECK_DB_ALL: Try all Berkeley DB versions, from 4.7 to 1.
47	+dnl APU_CHECK_DB_ALL: Try all Berkeley DB versions, from 4.8 to 1.
48	dnl
49	AC_DEFUN([APU_CHECK_DB_ALL], [
50	all_places=$1
51
52	- APU_CHECK_DB47("$all_places")
53	+ APU_CHECK_DB48("$all_places")
54	if test "$apu_db_version" != "4"; then
55	- APU_CHECK_DB46("$all_places")
56	+ APU_CHECK_DB47("$all_places")
57	if test "$apu_db_version" != "4"; then
58	- APU_CHECK_DB45("$all_places")
59	+ APU_CHECK_DB46("$all_places")
60	if test "$apu_db_version" != "4"; then
61	- APU_CHECK_DB44("$all_places")
62	+ APU_CHECK_DB45("$all_places")
63	if test "$apu_db_version" != "4"; then
64	- APU_CHECK_DB43("$all_places")
65	+ APU_CHECK_DB44("$all_places")
66	if test "$apu_db_version" != "4"; then
67	- APU_CHECK_DB42("$all_places")
68	+ APU_CHECK_DB43("$all_places")
69	if test "$apu_db_version" != "4"; then
70	- APU_CHECK_DB41("$all_places")
71	+ APU_CHECK_DB42("$all_places")
72	if test "$apu_db_version" != "4"; then
73	- APU_CHECK_DB4("$all_places")
74	+ APU_CHECK_DB41("$all_places")
75	if test "$apu_db_version" != "4"; then
76	- APU_CHECK_DB3("$all_places")
77	- if test "$apu_db_version" != "3"; then
78	- APU_CHECK_DB2("$all_places")
79	- if test "$apu_db_version" != "2"; then
80	- APU_CHECK_DB1("$all_places")
81	- if test "$apu_db_version" != "1"; then
82	- APU_CHECK_DB185("$all_places")
83	+ APU_CHECK_DB4("$all_places")
84	+ if test "$apu_db_version" != "4"; then
85	+ APU_CHECK_DB3("$all_places")
86	+ if test "$apu_db_version" != "3"; then
87	+ APU_CHECK_DB2("$all_places")
88	+ if test "$apu_db_version" != "2"; then
89	+ APU_CHECK_DB1("$all_places")
90	+ if test "$apu_db_version" != "1"; then
91	+ APU_CHECK_DB185("$all_places")
92	+ fi
93	fi
94	fi
95	fi
96	@@ -679,11 +707,11 @@
97	apu_db_version=0
98
99	AC_ARG_WITH(dbm, [APR_HELP_STRING([--with-dbm=DBM], [choose the DBM type to use.
100	- DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db41,db42,db43,db44,db45,db46,db47}])],
101	+ DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db41,db42,db43,db44,db45,db46,db47,db48}])],
102	[
103	if test "$withval" = "yes"; then
104	AC_MSG_ERROR([--with-dbm needs to specify a DBM type to use.
105	- One of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47])
106	+ One of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47, db48])
107	fi
108	requested="$withval"
109	], [
110	@@ -882,6 +910,10 @@
111	apu_use_db=1
112	apu_default_dbm=db4
113	;;
114	+ db48)
115	+ apu_use_db=1
116	+ apu_default_dbm=db4
117	+ ;;
118	default)
119	dnl ### use more sophisticated DBMs for the default?
120	apu_default_dbm="sdbm (default)"
121	@@ -889,7 +921,7 @@
122	;;
123	*)
124	AC_MSG_ERROR([--with-dbm=$look_for is an unknown DBM type.
125	- Use one of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47])
126	+ Use one of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47, db48])
127	;;
128	esac
129

Removed Link Here

(-)files/patch-apr_hints.m4 (-15 lines)
1	--- apr-1.4.2/build/apr_hints.m4.orig Wed Oct 27 11:12:28 2004
2	+++ apr-1.4.2/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"

Added Link Here

(-)files/patch-build__apr_hints.m4 (+20 lines)
1	--- ./build/apr_hints.m4.orig 2010-02-06 16:14:03.000000000 -0500
2	+++ ./build/apr_hints.m4 2010-05-26 23:19:19.263812317 -0400
3	@@ -159,15 +159,11 @@
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	+ osversion="${900010}"
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"
16	- apr_cv_pthreads_lib="-lpthread"
17	+ apr_cv_pthreads_lib="-pthread"
18	else
19	APR_ADDTO(CPPFLAGS, [-D_THREAD_SAFE -D_REENTRANT])
20	APR_SETIFNULL(enable_threads, [no])

Added Link Here

(-)files/patch-buildconf (+18 lines)
1	--- ./buildconf.orig 2009-11-13 22:13:59.000000000 -0500
2	+++ ./buildconf 2010-05-26 23:19:19.245814435 -0400
3	@@ -69,6 +69,7 @@
4	fi
5	# Do we need this anymore?
6	echo "buildconf: Using libtool.m4 at ${ltfile}."
7	+ chmod 644 build/libtool.m4
8	cat $ltfile \| sed -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' > build/libtool.m4
9	fi
10	if test "$1" = "2"; then
11	@@ -76,6 +77,7 @@
12	# Wouldn't it just be better to define top_builddir??
13	mv build/libtool.m4 build/libtool.m4.$$
14	cat build/libtool.m4.$$ \| sed -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' > build/libtool.m4
15	+ chmod 644 build/libtool.m4.$$
16	rm build/libtool.m4.$$
17	fi
18