Index: head/devel/apr/Makefile
===================================================================
--- head/devel/apr/Makefile	(revision 235526)
+++ head/devel/apr/Makefile	(revision 235527)
@@ -1,223 +1,229 @@
 # New ports collection makefile for: apr
 # Date created:		19 February 2002
 # Whom:			Garrett Rooney <rooneg@electricjellyfish.net>
 #
 # $FreeBSD$
 
 PORTNAME=	apr
 PORTVERSION=	${APR_VERSION}.${APU_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_APACHE}
 MASTER_SITE_SUBDIR=	apr
 DISTFILES=	apr-${APR_VERSION}.tar.gz apr-util-${APU_VERSION}.tar.gz
 
 MAINTAINER=	pgollucci@FreeBSD.org
 COMMENT=	Apache Portability Library
 
 LIB_DEPENDS+=	expat.6:${PORTSDIR}/textproc/expat2
 
 MAKE_JOBS_SAFE=	yes
 
 OPTIONS=	THREADS "Enable Threads in apr"						on  \
 			IPV6	"Enable IPV6 Support in apr"				off \
 			GDBM	"Enable GNU dbm support in apr-util"		on  \
 			BDB		"Enable Berkley BDB support in apr-util"	on  \
 			NDBM	"Enable NDBM support in apr-util"			off \
 			LDAP	"Enable LDAP support in apr-util"			off \
 			MYSQL	"Enable MySQL suport in apr-util"			off \
 			PGSQL	"Enable Postgresql suport in apr-util"		off
 
 APR_VERSION=	1.3.5
 APU_VERSION=	1.3.7
 
 USE_ICONV=		yes
 USE_AUTOTOOLS=	automake:19 autoconf:262 libtool:15:env
 USE_PERL5_BUILD=	yes
 USE_PYTHON_BUILD=	yes
 USE_LDCONFIG=		yes
 GNU_CONFIGURE=		yes
 
+CONFIGURE_ENV=	CC="${CC}" CFLAGS="${CFLAGS}"
+
 NO_WRKSUBDIR=	yes
 APR_WRKDIR=	${WRKDIR}/apr-${APR_VERSION}
 APU_WRKDIR=	${WRKDIR}/apr-util-${APU_VERSION}
 
 PLIST_SUB=	SHLIB_MAJOR="${SHLIB_MAJOR}"
 SHLIB_MAJOR=	3
 
 APR_CONF_ARGS=
 APU_CONF_ARGS=	--with-apr=${APR_WRKDIR} \
 			--with-expat=${LOCALBASE} \
 			--with-iconv=${LOCALBASE}
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 ########## APR Options
 .if defined(WITHOUT_THREADS)
 APR_CONF_ARGS+=	--disable-threads
 .if defined(PKGNAMESUFFIX)
 PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-nothr
 .else
 PKGNAMESUFFIX=	-nothr
 .endif
 .else
 APR_CONF_ARGS+=	--enable-threads
 .endif
 
 .if defined(WITHOUT_IPV6)
 APR_CONF_ARGS+=	--disable-ipv6
 .else
 APR_CONF_ARGS+=	--enable-ipv6
 .if defined(PKGNAMESUFFIX)
 PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-ipv6
 .else
 PKGNAMESUFFIX=	-ipv6
 .endif
 .endif
 
 ######### APR-Util Options
 .if defined(WITHOUT_GDBM)
 PLIST_SUB+=	GDBM="@comment "
 APU_CONF_ARGS+=	--without-gdbm
 .elif defined(WITH_GDBM)
 PLIST_SUB+=	GDBM=""
 LIB_DEPENDS+=	gdbm.3:${PORTSDIR}/databases/gdbm
 APU_CONF_ARGS+=	--with-gdbm=${LOCALBASE}
 .if defined(PKGNAMESUFFIX)
 PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-gdbm
 .else
 PKGNAMESUFFIX=	-gdbm
 .endif
 .else
 PLIST_SUB+=	GDBM="@comment "
 APR_UTIL_CONF_ARGS+=	--without-gdbm
 .endif
 
 .if defined(WITHOUT_BDB)
 PLIST_SUB+=	BDB="@comment "
 APU_CONF_ARGS+=	--without-berkeley-db
 .elif defined(WITH_BDB)
 APU_EXTRAS=	yes
 PLIST_SUB+=	BDB=""
 USE_BDB=	42+
 APU_CONF_ARGS+=	--with-berkeley-db=${BDB_INCLUDE_DIR}:${BDB_LIB_DIR}
 .if defined(PKGNAMESUFFIX)
 PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-${BDB_INCLUDE_DIR:S,^${LOCALBASE}/include/,,}
 .else
 PKGNAMESUFFIX=	-${BDB_INCLUDE_DIR:S,^${LOCALBASE}/include/,,}
 .endif
 .endif
 
 .if defined(WITHOUT_NDBM)
 PLIST_SUB+=	NDBM="@comment "
 APU_CONF_ARGS+=	--without-ndbm
 .elif defined(WITH_NDBM)
 APU_EXTRAS=	yes
 PLIST_SUB+=	NDBM=""
 APU_CONF_ARGS+=	--with-ndbm=/usr
 .if defined(PKGNAMESUFFIX)
 PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-ndbm
 .else
 PKGNAMESUFFIX=	-ndbm
 .endif
 .endif
 
 .if defined(WITH_LDAP)
 APU_EXTRAS=	yes
 PLIST_SUB+=	LDAP=""
 USE_OPENLDAP=	yes
 APU_CONF_ARGS+=	--with-ldap-include=${LOCALBASE}/include \
 	--with-ldap-lib=${LOCALBASE}/lib --with-ldap=ldap
 .if defined(PKGNAMESUFFIX)
 PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-ldap
 .else
 PKGNAMESUFFIX=	-ldap
 .endif
 .else
 PLIST_SUB+=	LDAP="@comment "
 .endif
 
 .if defined(WITH_MYSQL)
 APU_EXTRAS=	yes
 PLIST_SUB+=	MYSQL=""
 USE_MYSQL=	YES
 APU_CONF_ARGS+=	--with-mysql=${LOCALBASE}
 CONFIGURE_ENV+=	LIBS="${LIBS}"
 CFLAGS+=	-I${LOCALBASE}/include/mysql -DHAVE_MYSQL_H
 LDFLAGS+=	-L${LOCALBASE}/lib/mysql
 .if defined(PKGNAMESUFFIX)
 PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-mysql
 .else
 PKGNAMESUFFIX=	-mysql
 .endif
 .else
 PLIST_SUB+=	MYSQL="@comment "
 .endif
 
 .if defined(WITH_PGSQL)
 APU_EXTRAS=	yes
 PLIST_SUB+=	PGSQL=""
 USE_PGSQL=	YES
 APU_CONF_ARGS+=	--with-pgsql=${LOCALBASE}
 CONFIGURE_ENV+=	ac_cv_path_PGSQL_CONFIG=""
 .if defined(PKGNAMESUFFIX)
 PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-pgsql
 .else
 PKGNAMESUFFIX=	-pgsql
 .endif
 .else
 PLIST_SUB+=	PGSQL="@comment "
 .endif
 
 .if defined(APU_EXTRAS)
 PLIST_SUB+=	APU_EXTRAS=""
 .else
 PLIST_SUB+=	APU_EXTRAS="@comment "
 .endif
 
 post-patch:
 	${REINPLACE_CMD} -e 's/OSVERSION/'${OSVERSION}'/g' \
 		${APR_WRKDIR}/build/apr_hints.m4
-	${FIND} ${WRKDIR} -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,-lpthreads,${PTHREAD_LIBS},g' \
+		${APR_WRKDIR}/build/apr_threads.m4 ${APR_WRKDIR}/build/apr_hints.m4 \
+		${APU_WRKDIR}/build/apu-conf.m4 
 
 run-autotools::
 	cd ${APR_WRKDIR} ; \
 		${SETENV} ${CONFIGURE_ENV} ${SH} ./buildconf
 	cd ${APU_WRKDIR} ; \
 		${RM} -fr xml/expat
 	cd ${APU_WRKDIR} ; \
 		${SETENV} ${CONFIGURE_ENV} ${SH} ./buildconf \
 		--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} "AUTOCONF: dev ${dev_acver} cur ${cur_acver} use ${use_acver}"
 	@${ECHO} "AUTOMAKE: dev ${dev_amver} cur ${cur_amver} use ${use_amver}"
 	@${ECHO} "AUTOCONF_DIR: ${AUTOCONF_DIR}"
 	@${ECHO} "BUILD_DEPENDS: ${BUILD_DEPENDS}"
 	@${ECHO} "ACLOCAL_DIR: ${ACLOCAL_DIR}"
 	@${ECHO} "LIBTOOLFILES: ${LIBTOOLFILES}"
 	@${ECHO} "LIBTOOL_SHAREDIR: ${LIBTOOL_SHAREDIR}"
 	@${ECHO} "LIBTOOL_LIBEXECDIR: ${LIBTOOL_LIBEXECDIR}"
 	@${ECHO} "LIBTOOL_M4: ${LIBTOOL_M4}"
 	@${ECHO} "${SETENV} ${CONFIGURE_ENV} ${SH} ./configure ${CONFIGURE_ARGS} ${APR_CONF_ARGS}"
 	@${ECHO} "${SETENV} ${CONFIGURE_ENV} ${SH} ./configure ${CONFIGURE_ARGS} ${APR_UTIL_CONF_ARGS}"
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Property changes on: head/devel/apr/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.80
\ No newline at end of property
+1.81
\ No newline at end of property
Index: head/devel/apr/files/patch-apr-util-1.3.7__apu-config.in
===================================================================
--- head/devel/apr/files/patch-apr-util-1.3.7__apu-config.in	(nonexistent)
+++ head/devel/apr/files/patch-apr-util-1.3.7__apu-config.in	(revision 235527)
@@ -0,0 +1,39 @@
+--- ./apr-util-1.3.7/apu-config.in.orig	2008-05-23 17:27:59.000000000 -0400
++++ ./apr-util-1.3.7/apu-config.in	2009-06-10 01:03:50.971447822 -0400
+@@ -31,6 +31,7 @@
+ INCLUDES="@APRUTIL_INCLUDES@"
+ LDFLAGS="@APRUTIL_LDFLAGS@"
+ LDAP_LIBS="@LDADD_ldap@"
++DBM_LIBS="@LDADD_dbm_db@ @LDADD_dbm_gdbm@ @LDADD_dbm_ndbm@"
+ 
+ APRUTIL_LIBNAME="@APRUTIL_LIBNAME@"
+ 
+@@ -56,6 +57,8 @@
+   --libs            print library information
+   --avoid-ldap      do not include ldap library information with --libs
+   --ldap-libs       print additional library information to link with ldap
++  --avoid-dbm       do not include DBM library information with --libs
++  --dbm-libs        print additional library information to link with DBM
+   --srcdir          print APR-util source directory
+   --link-ld         print link switch(es) for linking to APR-util
+   --link-libtool    print the libtool inputs for linking to APR-util
+@@ -115,12 +118,18 @@
+     --avoid-ldap)
+     LDAP_LIBS=""
+     ;;
++    --avoid-dbm)
++    DBM_LIBS=""
++    ;;
+     --libs)
+-    flags="$flags $LDAP_LIBS $LIBS"
++    flags="$flags $LDAP_LIBS $DBM_LIBS $LIBS"
+     ;;
+     --ldap-libs)
+     flags="$flags $LDAP_LIBS"
+     ;;
++    --dbm-libs)
++    flags="$flags $DBM_LIBS"
++    ;;
+     --includedir)
+     if test "$location" = "installed"; then
+         flags="$includedir"

Property changes on: head/devel/apr/files/patch-apr-util-1.3.7__apu-config.in
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/devel/apr0/Makefile
===================================================================
--- head/devel/apr0/Makefile	(revision 235526)
+++ head/devel/apr0/Makefile	(revision 235527)
@@ -1,223 +1,229 @@
 # New ports collection makefile for: apr
 # Date created:		19 February 2002
 # Whom:			Garrett Rooney <rooneg@electricjellyfish.net>
 #
 # $FreeBSD$
 
 PORTNAME=	apr
 PORTVERSION=	${APR_VERSION}.${APU_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_APACHE}
 MASTER_SITE_SUBDIR=	apr
 DISTFILES=	apr-${APR_VERSION}.tar.gz apr-util-${APU_VERSION}.tar.gz
 
 MAINTAINER=	pgollucci@FreeBSD.org
 COMMENT=	Apache Portability Library
 
 LIB_DEPENDS+=	expat.6:${PORTSDIR}/textproc/expat2
 
 MAKE_JOBS_SAFE=	yes
 
 OPTIONS=	THREADS "Enable Threads in apr"						on  \
 			IPV6	"Enable IPV6 Support in apr"				off \
 			GDBM	"Enable GNU dbm support in apr-util"		on  \
 			BDB		"Enable Berkley BDB support in apr-util"	on  \
 			NDBM	"Enable NDBM support in apr-util"			off \
 			LDAP	"Enable LDAP support in apr-util"			off \
 			MYSQL	"Enable MySQL suport in apr-util"			off \
 			PGSQL	"Enable Postgresql suport in apr-util"		off
 
 APR_VERSION=	1.3.5
 APU_VERSION=	1.3.7
 
 USE_ICONV=		yes
 USE_AUTOTOOLS=	automake:19 autoconf:262 libtool:15:env
 USE_PERL5_BUILD=	yes
 USE_PYTHON_BUILD=	yes
 USE_LDCONFIG=		yes
 GNU_CONFIGURE=		yes
 
+CONFIGURE_ENV=	CC="${CC}" CFLAGS="${CFLAGS}"
+
 NO_WRKSUBDIR=	yes
 APR_WRKDIR=	${WRKDIR}/apr-${APR_VERSION}
 APU_WRKDIR=	${WRKDIR}/apr-util-${APU_VERSION}
 
 PLIST_SUB=	SHLIB_MAJOR="${SHLIB_MAJOR}"
 SHLIB_MAJOR=	3
 
 APR_CONF_ARGS=
 APU_CONF_ARGS=	--with-apr=${APR_WRKDIR} \
 			--with-expat=${LOCALBASE} \
 			--with-iconv=${LOCALBASE}
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 ########## APR Options
 .if defined(WITHOUT_THREADS)
 APR_CONF_ARGS+=	--disable-threads
 .if defined(PKGNAMESUFFIX)
 PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-nothr
 .else
 PKGNAMESUFFIX=	-nothr
 .endif
 .else
 APR_CONF_ARGS+=	--enable-threads
 .endif
 
 .if defined(WITHOUT_IPV6)
 APR_CONF_ARGS+=	--disable-ipv6
 .else
 APR_CONF_ARGS+=	--enable-ipv6
 .if defined(PKGNAMESUFFIX)
 PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-ipv6
 .else
 PKGNAMESUFFIX=	-ipv6
 .endif
 .endif
 
 ######### APR-Util Options
 .if defined(WITHOUT_GDBM)
 PLIST_SUB+=	GDBM="@comment "
 APU_CONF_ARGS+=	--without-gdbm
 .elif defined(WITH_GDBM)
 PLIST_SUB+=	GDBM=""
 LIB_DEPENDS+=	gdbm.3:${PORTSDIR}/databases/gdbm
 APU_CONF_ARGS+=	--with-gdbm=${LOCALBASE}
 .if defined(PKGNAMESUFFIX)
 PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-gdbm
 .else
 PKGNAMESUFFIX=	-gdbm
 .endif
 .else
 PLIST_SUB+=	GDBM="@comment "
 APR_UTIL_CONF_ARGS+=	--without-gdbm
 .endif
 
 .if defined(WITHOUT_BDB)
 PLIST_SUB+=	BDB="@comment "
 APU_CONF_ARGS+=	--without-berkeley-db
 .elif defined(WITH_BDB)
 APU_EXTRAS=	yes
 PLIST_SUB+=	BDB=""
 USE_BDB=	42+
 APU_CONF_ARGS+=	--with-berkeley-db=${BDB_INCLUDE_DIR}:${BDB_LIB_DIR}
 .if defined(PKGNAMESUFFIX)
 PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-${BDB_INCLUDE_DIR:S,^${LOCALBASE}/include/,,}
 .else
 PKGNAMESUFFIX=	-${BDB_INCLUDE_DIR:S,^${LOCALBASE}/include/,,}
 .endif
 .endif
 
 .if defined(WITHOUT_NDBM)
 PLIST_SUB+=	NDBM="@comment "
 APU_CONF_ARGS+=	--without-ndbm
 .elif defined(WITH_NDBM)
 APU_EXTRAS=	yes
 PLIST_SUB+=	NDBM=""
 APU_CONF_ARGS+=	--with-ndbm=/usr
 .if defined(PKGNAMESUFFIX)
 PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-ndbm
 .else
 PKGNAMESUFFIX=	-ndbm
 .endif
 .endif
 
 .if defined(WITH_LDAP)
 APU_EXTRAS=	yes
 PLIST_SUB+=	LDAP=""
 USE_OPENLDAP=	yes
 APU_CONF_ARGS+=	--with-ldap-include=${LOCALBASE}/include \
 	--with-ldap-lib=${LOCALBASE}/lib --with-ldap=ldap
 .if defined(PKGNAMESUFFIX)
 PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-ldap
 .else
 PKGNAMESUFFIX=	-ldap
 .endif
 .else
 PLIST_SUB+=	LDAP="@comment "
 .endif
 
 .if defined(WITH_MYSQL)
 APU_EXTRAS=	yes
 PLIST_SUB+=	MYSQL=""
 USE_MYSQL=	YES
 APU_CONF_ARGS+=	--with-mysql=${LOCALBASE}
 CONFIGURE_ENV+=	LIBS="${LIBS}"
 CFLAGS+=	-I${LOCALBASE}/include/mysql -DHAVE_MYSQL_H
 LDFLAGS+=	-L${LOCALBASE}/lib/mysql
 .if defined(PKGNAMESUFFIX)
 PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-mysql
 .else
 PKGNAMESUFFIX=	-mysql
 .endif
 .else
 PLIST_SUB+=	MYSQL="@comment "
 .endif
 
 .if defined(WITH_PGSQL)
 APU_EXTRAS=	yes
 PLIST_SUB+=	PGSQL=""
 USE_PGSQL=	YES
 APU_CONF_ARGS+=	--with-pgsql=${LOCALBASE}
 CONFIGURE_ENV+=	ac_cv_path_PGSQL_CONFIG=""
 .if defined(PKGNAMESUFFIX)
 PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-pgsql
 .else
 PKGNAMESUFFIX=	-pgsql
 .endif
 .else
 PLIST_SUB+=	PGSQL="@comment "
 .endif
 
 .if defined(APU_EXTRAS)
 PLIST_SUB+=	APU_EXTRAS=""
 .else
 PLIST_SUB+=	APU_EXTRAS="@comment "
 .endif
 
 post-patch:
 	${REINPLACE_CMD} -e 's/OSVERSION/'${OSVERSION}'/g' \
 		${APR_WRKDIR}/build/apr_hints.m4
-	${FIND} ${WRKDIR} -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,-lpthreads,${PTHREAD_LIBS},g' \
+		${APR_WRKDIR}/build/apr_threads.m4 ${APR_WRKDIR}/build/apr_hints.m4 \
+		${APU_WRKDIR}/build/apu-conf.m4 
 
 run-autotools::
 	cd ${APR_WRKDIR} ; \
 		${SETENV} ${CONFIGURE_ENV} ${SH} ./buildconf
 	cd ${APU_WRKDIR} ; \
 		${RM} -fr xml/expat
 	cd ${APU_WRKDIR} ; \
 		${SETENV} ${CONFIGURE_ENV} ${SH} ./buildconf \
 		--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} "AUTOCONF: dev ${dev_acver} cur ${cur_acver} use ${use_acver}"
 	@${ECHO} "AUTOMAKE: dev ${dev_amver} cur ${cur_amver} use ${use_amver}"
 	@${ECHO} "AUTOCONF_DIR: ${AUTOCONF_DIR}"
 	@${ECHO} "BUILD_DEPENDS: ${BUILD_DEPENDS}"
 	@${ECHO} "ACLOCAL_DIR: ${ACLOCAL_DIR}"
 	@${ECHO} "LIBTOOLFILES: ${LIBTOOLFILES}"
 	@${ECHO} "LIBTOOL_SHAREDIR: ${LIBTOOL_SHAREDIR}"
 	@${ECHO} "LIBTOOL_LIBEXECDIR: ${LIBTOOL_LIBEXECDIR}"
 	@${ECHO} "LIBTOOL_M4: ${LIBTOOL_M4}"
 	@${ECHO} "${SETENV} ${CONFIGURE_ENV} ${SH} ./configure ${CONFIGURE_ARGS} ${APR_CONF_ARGS}"
 	@${ECHO} "${SETENV} ${CONFIGURE_ENV} ${SH} ./configure ${CONFIGURE_ARGS} ${APR_UTIL_CONF_ARGS}"
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Property changes on: head/devel/apr0/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.80
\ No newline at end of property
+1.81
\ No newline at end of property
Index: head/devel/apr0/files/patch-apr-util-1.3.7__apu-config.in
===================================================================
--- head/devel/apr0/files/patch-apr-util-1.3.7__apu-config.in	(nonexistent)
+++ head/devel/apr0/files/patch-apr-util-1.3.7__apu-config.in	(revision 235527)
@@ -0,0 +1,39 @@
+--- ./apr-util-1.3.7/apu-config.in.orig	2008-05-23 17:27:59.000000000 -0400
++++ ./apr-util-1.3.7/apu-config.in	2009-06-10 01:03:50.971447822 -0400
+@@ -31,6 +31,7 @@
+ INCLUDES="@APRUTIL_INCLUDES@"
+ LDFLAGS="@APRUTIL_LDFLAGS@"
+ LDAP_LIBS="@LDADD_ldap@"
++DBM_LIBS="@LDADD_dbm_db@ @LDADD_dbm_gdbm@ @LDADD_dbm_ndbm@"
+ 
+ APRUTIL_LIBNAME="@APRUTIL_LIBNAME@"
+ 
+@@ -56,6 +57,8 @@
+   --libs            print library information
+   --avoid-ldap      do not include ldap library information with --libs
+   --ldap-libs       print additional library information to link with ldap
++  --avoid-dbm       do not include DBM library information with --libs
++  --dbm-libs        print additional library information to link with DBM
+   --srcdir          print APR-util source directory
+   --link-ld         print link switch(es) for linking to APR-util
+   --link-libtool    print the libtool inputs for linking to APR-util
+@@ -115,12 +118,18 @@
+     --avoid-ldap)
+     LDAP_LIBS=""
+     ;;
++    --avoid-dbm)
++    DBM_LIBS=""
++    ;;
+     --libs)
+-    flags="$flags $LDAP_LIBS $LIBS"
++    flags="$flags $LDAP_LIBS $DBM_LIBS $LIBS"
+     ;;
+     --ldap-libs)
+     flags="$flags $LDAP_LIBS"
+     ;;
++    --dbm-libs)
++    flags="$flags $DBM_LIBS"
++    ;;
+     --includedir)
+     if test "$location" = "installed"; then
+         flags="$includedir"

Property changes on: head/devel/apr0/files/patch-apr-util-1.3.7__apu-config.in
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/devel/apr1/Makefile
===================================================================
--- head/devel/apr1/Makefile	(revision 235526)
+++ head/devel/apr1/Makefile	(revision 235527)
@@ -1,223 +1,229 @@
 # New ports collection makefile for: apr
 # Date created:		19 February 2002
 # Whom:			Garrett Rooney <rooneg@electricjellyfish.net>
 #
 # $FreeBSD$
 
 PORTNAME=	apr
 PORTVERSION=	${APR_VERSION}.${APU_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_APACHE}
 MASTER_SITE_SUBDIR=	apr
 DISTFILES=	apr-${APR_VERSION}.tar.gz apr-util-${APU_VERSION}.tar.gz
 
 MAINTAINER=	pgollucci@FreeBSD.org
 COMMENT=	Apache Portability Library
 
 LIB_DEPENDS+=	expat.6:${PORTSDIR}/textproc/expat2
 
 MAKE_JOBS_SAFE=	yes
 
 OPTIONS=	THREADS "Enable Threads in apr"						on  \
 			IPV6	"Enable IPV6 Support in apr"				off \
 			GDBM	"Enable GNU dbm support in apr-util"		on  \
 			BDB		"Enable Berkley BDB support in apr-util"	on  \
 			NDBM	"Enable NDBM support in apr-util"			off \
 			LDAP	"Enable LDAP support in apr-util"			off \
 			MYSQL	"Enable MySQL suport in apr-util"			off \
 			PGSQL	"Enable Postgresql suport in apr-util"		off
 
 APR_VERSION=	1.3.5
 APU_VERSION=	1.3.7
 
 USE_ICONV=		yes
 USE_AUTOTOOLS=	automake:19 autoconf:262 libtool:15:env
 USE_PERL5_BUILD=	yes
 USE_PYTHON_BUILD=	yes
 USE_LDCONFIG=		yes
 GNU_CONFIGURE=		yes
 
+CONFIGURE_ENV=	CC="${CC}" CFLAGS="${CFLAGS}"
+
 NO_WRKSUBDIR=	yes
 APR_WRKDIR=	${WRKDIR}/apr-${APR_VERSION}
 APU_WRKDIR=	${WRKDIR}/apr-util-${APU_VERSION}
 
 PLIST_SUB=	SHLIB_MAJOR="${SHLIB_MAJOR}"
 SHLIB_MAJOR=	3
 
 APR_CONF_ARGS=
 APU_CONF_ARGS=	--with-apr=${APR_WRKDIR} \
 			--with-expat=${LOCALBASE} \
 			--with-iconv=${LOCALBASE}
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 ########## APR Options
 .if defined(WITHOUT_THREADS)
 APR_CONF_ARGS+=	--disable-threads
 .if defined(PKGNAMESUFFIX)
 PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-nothr
 .else
 PKGNAMESUFFIX=	-nothr
 .endif
 .else
 APR_CONF_ARGS+=	--enable-threads
 .endif
 
 .if defined(WITHOUT_IPV6)
 APR_CONF_ARGS+=	--disable-ipv6
 .else
 APR_CONF_ARGS+=	--enable-ipv6
 .if defined(PKGNAMESUFFIX)
 PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-ipv6
 .else
 PKGNAMESUFFIX=	-ipv6
 .endif
 .endif
 
 ######### APR-Util Options
 .if defined(WITHOUT_GDBM)
 PLIST_SUB+=	GDBM="@comment "
 APU_CONF_ARGS+=	--without-gdbm
 .elif defined(WITH_GDBM)
 PLIST_SUB+=	GDBM=""
 LIB_DEPENDS+=	gdbm.3:${PORTSDIR}/databases/gdbm
 APU_CONF_ARGS+=	--with-gdbm=${LOCALBASE}
 .if defined(PKGNAMESUFFIX)
 PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-gdbm
 .else
 PKGNAMESUFFIX=	-gdbm
 .endif
 .else
 PLIST_SUB+=	GDBM="@comment "
 APR_UTIL_CONF_ARGS+=	--without-gdbm
 .endif
 
 .if defined(WITHOUT_BDB)
 PLIST_SUB+=	BDB="@comment "
 APU_CONF_ARGS+=	--without-berkeley-db
 .elif defined(WITH_BDB)
 APU_EXTRAS=	yes
 PLIST_SUB+=	BDB=""
 USE_BDB=	42+
 APU_CONF_ARGS+=	--with-berkeley-db=${BDB_INCLUDE_DIR}:${BDB_LIB_DIR}
 .if defined(PKGNAMESUFFIX)
 PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-${BDB_INCLUDE_DIR:S,^${LOCALBASE}/include/,,}
 .else
 PKGNAMESUFFIX=	-${BDB_INCLUDE_DIR:S,^${LOCALBASE}/include/,,}
 .endif
 .endif
 
 .if defined(WITHOUT_NDBM)
 PLIST_SUB+=	NDBM="@comment "
 APU_CONF_ARGS+=	--without-ndbm
 .elif defined(WITH_NDBM)
 APU_EXTRAS=	yes
 PLIST_SUB+=	NDBM=""
 APU_CONF_ARGS+=	--with-ndbm=/usr
 .if defined(PKGNAMESUFFIX)
 PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-ndbm
 .else
 PKGNAMESUFFIX=	-ndbm
 .endif
 .endif
 
 .if defined(WITH_LDAP)
 APU_EXTRAS=	yes
 PLIST_SUB+=	LDAP=""
 USE_OPENLDAP=	yes
 APU_CONF_ARGS+=	--with-ldap-include=${LOCALBASE}/include \
 	--with-ldap-lib=${LOCALBASE}/lib --with-ldap=ldap
 .if defined(PKGNAMESUFFIX)
 PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-ldap
 .else
 PKGNAMESUFFIX=	-ldap
 .endif
 .else
 PLIST_SUB+=	LDAP="@comment "
 .endif
 
 .if defined(WITH_MYSQL)
 APU_EXTRAS=	yes
 PLIST_SUB+=	MYSQL=""
 USE_MYSQL=	YES
 APU_CONF_ARGS+=	--with-mysql=${LOCALBASE}
 CONFIGURE_ENV+=	LIBS="${LIBS}"
 CFLAGS+=	-I${LOCALBASE}/include/mysql -DHAVE_MYSQL_H
 LDFLAGS+=	-L${LOCALBASE}/lib/mysql
 .if defined(PKGNAMESUFFIX)
 PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-mysql
 .else
 PKGNAMESUFFIX=	-mysql
 .endif
 .else
 PLIST_SUB+=	MYSQL="@comment "
 .endif
 
 .if defined(WITH_PGSQL)
 APU_EXTRAS=	yes
 PLIST_SUB+=	PGSQL=""
 USE_PGSQL=	YES
 APU_CONF_ARGS+=	--with-pgsql=${LOCALBASE}
 CONFIGURE_ENV+=	ac_cv_path_PGSQL_CONFIG=""
 .if defined(PKGNAMESUFFIX)
 PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-pgsql
 .else
 PKGNAMESUFFIX=	-pgsql
 .endif
 .else
 PLIST_SUB+=	PGSQL="@comment "
 .endif
 
 .if defined(APU_EXTRAS)
 PLIST_SUB+=	APU_EXTRAS=""
 .else
 PLIST_SUB+=	APU_EXTRAS="@comment "
 .endif
 
 post-patch:
 	${REINPLACE_CMD} -e 's/OSVERSION/'${OSVERSION}'/g' \
 		${APR_WRKDIR}/build/apr_hints.m4
-	${FIND} ${WRKDIR} -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,-lpthreads,${PTHREAD_LIBS},g' \
+		${APR_WRKDIR}/build/apr_threads.m4 ${APR_WRKDIR}/build/apr_hints.m4 \
+		${APU_WRKDIR}/build/apu-conf.m4 
 
 run-autotools::
 	cd ${APR_WRKDIR} ; \
 		${SETENV} ${CONFIGURE_ENV} ${SH} ./buildconf
 	cd ${APU_WRKDIR} ; \
 		${RM} -fr xml/expat
 	cd ${APU_WRKDIR} ; \
 		${SETENV} ${CONFIGURE_ENV} ${SH} ./buildconf \
 		--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} "AUTOCONF: dev ${dev_acver} cur ${cur_acver} use ${use_acver}"
 	@${ECHO} "AUTOMAKE: dev ${dev_amver} cur ${cur_amver} use ${use_amver}"
 	@${ECHO} "AUTOCONF_DIR: ${AUTOCONF_DIR}"
 	@${ECHO} "BUILD_DEPENDS: ${BUILD_DEPENDS}"
 	@${ECHO} "ACLOCAL_DIR: ${ACLOCAL_DIR}"
 	@${ECHO} "LIBTOOLFILES: ${LIBTOOLFILES}"
 	@${ECHO} "LIBTOOL_SHAREDIR: ${LIBTOOL_SHAREDIR}"
 	@${ECHO} "LIBTOOL_LIBEXECDIR: ${LIBTOOL_LIBEXECDIR}"
 	@${ECHO} "LIBTOOL_M4: ${LIBTOOL_M4}"
 	@${ECHO} "${SETENV} ${CONFIGURE_ENV} ${SH} ./configure ${CONFIGURE_ARGS} ${APR_CONF_ARGS}"
 	@${ECHO} "${SETENV} ${CONFIGURE_ENV} ${SH} ./configure ${CONFIGURE_ARGS} ${APR_UTIL_CONF_ARGS}"
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Property changes on: head/devel/apr1/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.80
\ No newline at end of property
+1.81
\ No newline at end of property
Index: head/devel/apr1/files/patch-apr-util-1.3.7__apu-config.in
===================================================================
--- head/devel/apr1/files/patch-apr-util-1.3.7__apu-config.in	(nonexistent)
+++ head/devel/apr1/files/patch-apr-util-1.3.7__apu-config.in	(revision 235527)
@@ -0,0 +1,39 @@
+--- ./apr-util-1.3.7/apu-config.in.orig	2008-05-23 17:27:59.000000000 -0400
++++ ./apr-util-1.3.7/apu-config.in	2009-06-10 01:03:50.971447822 -0400
+@@ -31,6 +31,7 @@
+ INCLUDES="@APRUTIL_INCLUDES@"
+ LDFLAGS="@APRUTIL_LDFLAGS@"
+ LDAP_LIBS="@LDADD_ldap@"
++DBM_LIBS="@LDADD_dbm_db@ @LDADD_dbm_gdbm@ @LDADD_dbm_ndbm@"
+ 
+ APRUTIL_LIBNAME="@APRUTIL_LIBNAME@"
+ 
+@@ -56,6 +57,8 @@
+   --libs            print library information
+   --avoid-ldap      do not include ldap library information with --libs
+   --ldap-libs       print additional library information to link with ldap
++  --avoid-dbm       do not include DBM library information with --libs
++  --dbm-libs        print additional library information to link with DBM
+   --srcdir          print APR-util source directory
+   --link-ld         print link switch(es) for linking to APR-util
+   --link-libtool    print the libtool inputs for linking to APR-util
+@@ -115,12 +118,18 @@
+     --avoid-ldap)
+     LDAP_LIBS=""
+     ;;
++    --avoid-dbm)
++    DBM_LIBS=""
++    ;;
+     --libs)
+-    flags="$flags $LDAP_LIBS $LIBS"
++    flags="$flags $LDAP_LIBS $DBM_LIBS $LIBS"
+     ;;
+     --ldap-libs)
+     flags="$flags $LDAP_LIBS"
+     ;;
++    --dbm-libs)
++    flags="$flags $DBM_LIBS"
++    ;;
+     --includedir)
+     if test "$location" = "installed"; then
+         flags="$includedir"

Property changes on: head/devel/apr1/files/patch-apr-util-1.3.7__apu-config.in
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/devel/apr2/Makefile
===================================================================
--- head/devel/apr2/Makefile	(revision 235526)
+++ head/devel/apr2/Makefile	(revision 235527)
@@ -1,223 +1,229 @@
 # New ports collection makefile for: apr
 # Date created:		19 February 2002
 # Whom:			Garrett Rooney <rooneg@electricjellyfish.net>
 #
 # $FreeBSD$
 
 PORTNAME=	apr
 PORTVERSION=	${APR_VERSION}.${APU_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_APACHE}
 MASTER_SITE_SUBDIR=	apr
 DISTFILES=	apr-${APR_VERSION}.tar.gz apr-util-${APU_VERSION}.tar.gz
 
 MAINTAINER=	pgollucci@FreeBSD.org
 COMMENT=	Apache Portability Library
 
 LIB_DEPENDS+=	expat.6:${PORTSDIR}/textproc/expat2
 
 MAKE_JOBS_SAFE=	yes
 
 OPTIONS=	THREADS "Enable Threads in apr"						on  \
 			IPV6	"Enable IPV6 Support in apr"				off \
 			GDBM	"Enable GNU dbm support in apr-util"		on  \
 			BDB		"Enable Berkley BDB support in apr-util"	on  \
 			NDBM	"Enable NDBM support in apr-util"			off \
 			LDAP	"Enable LDAP support in apr-util"			off \
 			MYSQL	"Enable MySQL suport in apr-util"			off \
 			PGSQL	"Enable Postgresql suport in apr-util"		off
 
 APR_VERSION=	1.3.5
 APU_VERSION=	1.3.7
 
 USE_ICONV=		yes
 USE_AUTOTOOLS=	automake:19 autoconf:262 libtool:15:env
 USE_PERL5_BUILD=	yes
 USE_PYTHON_BUILD=	yes
 USE_LDCONFIG=		yes
 GNU_CONFIGURE=		yes
 
+CONFIGURE_ENV=	CC="${CC}" CFLAGS="${CFLAGS}"
+
 NO_WRKSUBDIR=	yes
 APR_WRKDIR=	${WRKDIR}/apr-${APR_VERSION}
 APU_WRKDIR=	${WRKDIR}/apr-util-${APU_VERSION}
 
 PLIST_SUB=	SHLIB_MAJOR="${SHLIB_MAJOR}"
 SHLIB_MAJOR=	3
 
 APR_CONF_ARGS=
 APU_CONF_ARGS=	--with-apr=${APR_WRKDIR} \
 			--with-expat=${LOCALBASE} \
 			--with-iconv=${LOCALBASE}
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 ########## APR Options
 .if defined(WITHOUT_THREADS)
 APR_CONF_ARGS+=	--disable-threads
 .if defined(PKGNAMESUFFIX)
 PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-nothr
 .else
 PKGNAMESUFFIX=	-nothr
 .endif
 .else
 APR_CONF_ARGS+=	--enable-threads
 .endif
 
 .if defined(WITHOUT_IPV6)
 APR_CONF_ARGS+=	--disable-ipv6
 .else
 APR_CONF_ARGS+=	--enable-ipv6
 .if defined(PKGNAMESUFFIX)
 PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-ipv6
 .else
 PKGNAMESUFFIX=	-ipv6
 .endif
 .endif
 
 ######### APR-Util Options
 .if defined(WITHOUT_GDBM)
 PLIST_SUB+=	GDBM="@comment "
 APU_CONF_ARGS+=	--without-gdbm
 .elif defined(WITH_GDBM)
 PLIST_SUB+=	GDBM=""
 LIB_DEPENDS+=	gdbm.3:${PORTSDIR}/databases/gdbm
 APU_CONF_ARGS+=	--with-gdbm=${LOCALBASE}
 .if defined(PKGNAMESUFFIX)
 PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-gdbm
 .else
 PKGNAMESUFFIX=	-gdbm
 .endif
 .else
 PLIST_SUB+=	GDBM="@comment "
 APR_UTIL_CONF_ARGS+=	--without-gdbm
 .endif
 
 .if defined(WITHOUT_BDB)
 PLIST_SUB+=	BDB="@comment "
 APU_CONF_ARGS+=	--without-berkeley-db
 .elif defined(WITH_BDB)
 APU_EXTRAS=	yes
 PLIST_SUB+=	BDB=""
 USE_BDB=	42+
 APU_CONF_ARGS+=	--with-berkeley-db=${BDB_INCLUDE_DIR}:${BDB_LIB_DIR}
 .if defined(PKGNAMESUFFIX)
 PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-${BDB_INCLUDE_DIR:S,^${LOCALBASE}/include/,,}
 .else
 PKGNAMESUFFIX=	-${BDB_INCLUDE_DIR:S,^${LOCALBASE}/include/,,}
 .endif
 .endif
 
 .if defined(WITHOUT_NDBM)
 PLIST_SUB+=	NDBM="@comment "
 APU_CONF_ARGS+=	--without-ndbm
 .elif defined(WITH_NDBM)
 APU_EXTRAS=	yes
 PLIST_SUB+=	NDBM=""
 APU_CONF_ARGS+=	--with-ndbm=/usr
 .if defined(PKGNAMESUFFIX)
 PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-ndbm
 .else
 PKGNAMESUFFIX=	-ndbm
 .endif
 .endif
 
 .if defined(WITH_LDAP)
 APU_EXTRAS=	yes
 PLIST_SUB+=	LDAP=""
 USE_OPENLDAP=	yes
 APU_CONF_ARGS+=	--with-ldap-include=${LOCALBASE}/include \
 	--with-ldap-lib=${LOCALBASE}/lib --with-ldap=ldap
 .if defined(PKGNAMESUFFIX)
 PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-ldap
 .else
 PKGNAMESUFFIX=	-ldap
 .endif
 .else
 PLIST_SUB+=	LDAP="@comment "
 .endif
 
 .if defined(WITH_MYSQL)
 APU_EXTRAS=	yes
 PLIST_SUB+=	MYSQL=""
 USE_MYSQL=	YES
 APU_CONF_ARGS+=	--with-mysql=${LOCALBASE}
 CONFIGURE_ENV+=	LIBS="${LIBS}"
 CFLAGS+=	-I${LOCALBASE}/include/mysql -DHAVE_MYSQL_H
 LDFLAGS+=	-L${LOCALBASE}/lib/mysql
 .if defined(PKGNAMESUFFIX)
 PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-mysql
 .else
 PKGNAMESUFFIX=	-mysql
 .endif
 .else
 PLIST_SUB+=	MYSQL="@comment "
 .endif
 
 .if defined(WITH_PGSQL)
 APU_EXTRAS=	yes
 PLIST_SUB+=	PGSQL=""
 USE_PGSQL=	YES
 APU_CONF_ARGS+=	--with-pgsql=${LOCALBASE}
 CONFIGURE_ENV+=	ac_cv_path_PGSQL_CONFIG=""
 .if defined(PKGNAMESUFFIX)
 PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-pgsql
 .else
 PKGNAMESUFFIX=	-pgsql
 .endif
 .else
 PLIST_SUB+=	PGSQL="@comment "
 .endif
 
 .if defined(APU_EXTRAS)
 PLIST_SUB+=	APU_EXTRAS=""
 .else
 PLIST_SUB+=	APU_EXTRAS="@comment "
 .endif
 
 post-patch:
 	${REINPLACE_CMD} -e 's/OSVERSION/'${OSVERSION}'/g' \
 		${APR_WRKDIR}/build/apr_hints.m4
-	${FIND} ${WRKDIR} -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,-lpthreads,${PTHREAD_LIBS},g' \
+		${APR_WRKDIR}/build/apr_threads.m4 ${APR_WRKDIR}/build/apr_hints.m4 \
+		${APU_WRKDIR}/build/apu-conf.m4 
 
 run-autotools::
 	cd ${APR_WRKDIR} ; \
 		${SETENV} ${CONFIGURE_ENV} ${SH} ./buildconf
 	cd ${APU_WRKDIR} ; \
 		${RM} -fr xml/expat
 	cd ${APU_WRKDIR} ; \
 		${SETENV} ${CONFIGURE_ENV} ${SH} ./buildconf \
 		--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} "AUTOCONF: dev ${dev_acver} cur ${cur_acver} use ${use_acver}"
 	@${ECHO} "AUTOMAKE: dev ${dev_amver} cur ${cur_amver} use ${use_amver}"
 	@${ECHO} "AUTOCONF_DIR: ${AUTOCONF_DIR}"
 	@${ECHO} "BUILD_DEPENDS: ${BUILD_DEPENDS}"
 	@${ECHO} "ACLOCAL_DIR: ${ACLOCAL_DIR}"
 	@${ECHO} "LIBTOOLFILES: ${LIBTOOLFILES}"
 	@${ECHO} "LIBTOOL_SHAREDIR: ${LIBTOOL_SHAREDIR}"
 	@${ECHO} "LIBTOOL_LIBEXECDIR: ${LIBTOOL_LIBEXECDIR}"
 	@${ECHO} "LIBTOOL_M4: ${LIBTOOL_M4}"
 	@${ECHO} "${SETENV} ${CONFIGURE_ENV} ${SH} ./configure ${CONFIGURE_ARGS} ${APR_CONF_ARGS}"
 	@${ECHO} "${SETENV} ${CONFIGURE_ENV} ${SH} ./configure ${CONFIGURE_ARGS} ${APR_UTIL_CONF_ARGS}"
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Property changes on: head/devel/apr2/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.80
\ No newline at end of property
+1.81
\ No newline at end of property
Index: head/devel/apr2/files/patch-apr-util-1.3.7__apu-config.in
===================================================================
--- head/devel/apr2/files/patch-apr-util-1.3.7__apu-config.in	(nonexistent)
+++ head/devel/apr2/files/patch-apr-util-1.3.7__apu-config.in	(revision 235527)
@@ -0,0 +1,39 @@
+--- ./apr-util-1.3.7/apu-config.in.orig	2008-05-23 17:27:59.000000000 -0400
++++ ./apr-util-1.3.7/apu-config.in	2009-06-10 01:03:50.971447822 -0400
+@@ -31,6 +31,7 @@
+ INCLUDES="@APRUTIL_INCLUDES@"
+ LDFLAGS="@APRUTIL_LDFLAGS@"
+ LDAP_LIBS="@LDADD_ldap@"
++DBM_LIBS="@LDADD_dbm_db@ @LDADD_dbm_gdbm@ @LDADD_dbm_ndbm@"
+ 
+ APRUTIL_LIBNAME="@APRUTIL_LIBNAME@"
+ 
+@@ -56,6 +57,8 @@
+   --libs            print library information
+   --avoid-ldap      do not include ldap library information with --libs
+   --ldap-libs       print additional library information to link with ldap
++  --avoid-dbm       do not include DBM library information with --libs
++  --dbm-libs        print additional library information to link with DBM
+   --srcdir          print APR-util source directory
+   --link-ld         print link switch(es) for linking to APR-util
+   --link-libtool    print the libtool inputs for linking to APR-util
+@@ -115,12 +118,18 @@
+     --avoid-ldap)
+     LDAP_LIBS=""
+     ;;
++    --avoid-dbm)
++    DBM_LIBS=""
++    ;;
+     --libs)
+-    flags="$flags $LDAP_LIBS $LIBS"
++    flags="$flags $LDAP_LIBS $DBM_LIBS $LIBS"
+     ;;
+     --ldap-libs)
+     flags="$flags $LDAP_LIBS"
+     ;;
++    --dbm-libs)
++    flags="$flags $DBM_LIBS"
++    ;;
+     --includedir)
+     if test "$location" = "installed"; then
+         flags="$includedir"

Property changes on: head/devel/apr2/files/patch-apr-util-1.3.7__apu-config.in
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property