This is the Apache Portable Runtime 1.2.8, required by the

upcoming Apache 2.2.3 package.

APR 1.x is neither source nor binary compatible with earlier APR
0.9 releases. Users of APR 1.x can expect consistent interfaces
and binary backwards compatibility throughout the entire APR 1.x
release cycle.

12 files changed, 378 insertions, 0 deletions

diff --git a/devel/apr1/DESCR b/devel/apr1/DESCR
new file mode 100644
index 00000000000..4961cf68f32
--- /dev/null
+++ b/devel/apr1/DESCR
@@ -0,0 +1,3 @@
+The Apache Portable Run-time mission is to provide a library of
+routines that allows programmers to write a program once and be
+able to compile it anywhere.
diff --git a/devel/apr1/Makefile b/devel/apr1/Makefile
new file mode 100644
index 00000000000..b24dc1edba2
--- /dev/null
+++ b/devel/apr1/Makefile
@@ -0,0 +1,83 @@
+# $NetBSD: Makefile,v 1.1.1.1 2006/12/08 23:29:53 xtraeme Exp $
+
+.include "../../www/apache22/Makefile.common"
+
+PKGNAME=	apr-${APR_VERSION}
+#PKGREVISION=	1
+CATEGORIES=	devel
+
+HOMEPAGE=	http://apr.apache.org/
+COMMENT=	Apache Portable Runtime
+
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+# Don't bump this when apache upgrades; it is only apache2-2.0.45 and
+# under that includes its own apr.  apr was split out in 2.0.45nb1.
+CONFLICTS=		apache2<=2.0.45 apr<=0.10
+
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
+WRKSRC=			${WRKDIR}/${DISTNAME}/srclib
+BUILD_DIRS=		apr apr-util
+
+CHECK_PORTABILITY_SKIP+=	pcre/*
+
+USE_LIBTOOL=		yes
+USE_TOOLS+=		pkg-config
+GNU_CONFIGURE=		yes
+CONFIGURE_ENV+=		LIBS=${LIBS:M*:Q}
+LIBS.SunOS+=		-lnsl
+
+PKGCONFIG_OVERRIDE+=	apr-util/apr-util.pc.in
+PKGCONFIG_OVERRIDE+=	apr/apr.pc.in
+
+APR_CONFIGURE_ARGS= \
+		--prefix=${PREFIX} \
+		--with-devrandom=/dev/urandom \
+		--with-installbuilddir=${PREFIX}/libexec/apr
+
+APU_CONFIGURE_ARGS= \
+		--prefix=${PREFIX} \
+		--with-apr=${WRKSRC}/apr \
+		--with-expat=${BUILDLINK_PREFIX.expat} \
+		--without-gdbm
+
+.include "../../mk/bsd.prefs.mk"
+.include "../../textproc/expat/buildlink3.mk"
+.include "options.mk"
+
+SUBST_CLASSES+=		conf
+SUBST_STAGE.conf=	pre-configure
+SUBST_FILES.conf=	apr/config.layout apr-util/config.layout
+SUBST_SED.conf=		-e "s,@PREFIX@,${PREFIX},g"
+SUBST_MESSAGE.conf=	Fixing hardcoded paths.
+
+TEST_TARGET=		check
+
+do-configure:
+	cd ${WRKSRC}/apr && ${SETENV} ${CONFIGURE_ENV} ./configure \
+		${APR_CONFIGURE_ARGS}
+	cd ${WRKSRC}/apr-util && ${SETENV} ${CONFIGURE_ENV} ./configure \
+		${APU_CONFIGURE_ARGS}
+
+post-install:
+	${RM} ${DESTDIR}${PREFIX}/libexec/apr/libtool
+	${INSTALL_SCRIPT} ${PKG_LIBTOOL} \
+		${DESTDIR}${PREFIX}/libexec/apr/libtool
+	${INSTALL_DATA_DIR} \
+		${DESTDIR}${PREFIX}/include/apr-1/arch/unix
+	${INSTALL_DATA} ${WRKSRC}/apr/include/arch/*.h \
+		${DESTDIR}${PREFIX}/include/apr-1/arch
+	${INSTALL_DATA} ${WRKSRC}/apr/include/arch/unix/*.h \
+		${DESTDIR}${PREFIX}/include/apr-1/arch/unix/
+	${CHMOD} ${SHAREMODE} ${DESTDIR}${PREFIX}/include/apr-1/*.h
+	${CHMOD} ${PKGDIRMODE} ${DESTDIR}${PREFIX}/include/apr-1
+	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DESTDIR}${PREFIX}/include/apr-1/
+
+	# Create links to be compatible with existing modules
+	${LN} -sf ${PREFIX}/bin/apr-1-config ${PREFIX}/bin/apr-config
+	${LN} -sf ${PREFIX}/bin/apu-1-config ${PREFIX}/bin/apu-config
+
+.include "../../converters/libiconv/buildlink3.mk"
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/devel/apr1/PLIST b/devel/apr1/PLIST
new file mode 100644
index 00000000000..095394bfdec
--- /dev/null
+++ b/devel/apr1/PLIST
@@ -0,0 +1,101 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2006/12/08 23:29:53 xtraeme Exp $
+bin/apr-1-config
+bin/apr-config
+bin/apu-1-config
+bin/apu-config
+include/apr-1/arch/unix/apr_arch_poll_private.h
+include/apr-1/apr.h
+include/apr-1/apr_allocator.h
+include/apr-1/apr_anylock.h
+include/apr-1/apr_atomic.h
+include/apr-1/apr_base64.h
+include/apr-1/apr_buckets.h
+include/apr-1/apr_date.h
+include/apr-1/apr_dbd.h
+include/apr-1/apr_dbm.h
+include/apr-1/apr_dso.h
+include/apr-1/apr_env.h
+include/apr-1/apr_errno.h
+include/apr-1/apr_file_info.h
+include/apr-1/apr_file_io.h
+include/apr-1/apr_fnmatch.h
+include/apr-1/apr_general.h
+include/apr-1/apr_getopt.h
+include/apr-1/apr_global_mutex.h
+include/apr-1/apr_hash.h
+include/apr-1/apr_hooks.h
+include/apr-1/apr_inherit.h
+include/apr-1/apr_ldap.h
+include/apr-1/apr_ldap_init.h
+include/apr-1/apr_ldap_option.h
+include/apr-1/apr_ldap_url.h
+include/apr-1/apr_lib.h
+include/apr-1/apr_md4.h
+include/apr-1/apr_md5.h
+include/apr-1/apr_mmap.h
+include/apr-1/apr_network_io.h
+include/apr-1/apr_optional.h
+include/apr-1/apr_optional_hooks.h
+include/apr-1/apr_poll.h
+include/apr-1/apr_pools.h
+include/apr-1/apr_portable.h
+include/apr-1/apr_proc_mutex.h
+include/apr-1/apr_queue.h
+include/apr-1/apr_random.h
+include/apr-1/apr_reslist.h
+include/apr-1/apr_ring.h
+include/apr-1/apr_rmm.h
+include/apr-1/apr_sdbm.h
+include/apr-1/apr_sha1.h
+include/apr-1/apr_shm.h
+include/apr-1/apr_signal.h
+include/apr-1/apr_strings.h
+include/apr-1/apr_strmatch.h
+include/apr-1/apr_support.h
+include/apr-1/apr_tables.h
+include/apr-1/apr_thread_cond.h
+include/apr-1/apr_thread_mutex.h
+include/apr-1/apr_thread_proc.h
+include/apr-1/apr_thread_rwlock.h
+include/apr-1/apr_time.h
+include/apr-1/apr_uri.h
+include/apr-1/apr_user.h
+include/apr-1/apr_uuid.h
+include/apr-1/apr_version.h
+include/apr-1/apr_want.h
+include/apr-1/apr_xlate.h
+include/apr-1/apr_xml.h
+include/apr-1/apu.h
+include/apr-1/apu_version.h
+include/apr-1/apu_want.h
+include/apr-1/arch/apr_private_common.h
+include/apr-1/arch/unix/apr_arch_dso.h
+include/apr-1/arch/unix/apr_arch_file_io.h
+include/apr-1/arch/unix/apr_arch_global_mutex.h
+include/apr-1/arch/unix/apr_arch_inherit.h
+include/apr-1/arch/unix/apr_arch_internal_time.h
+include/apr-1/arch/unix/apr_arch_misc.h
+include/apr-1/arch/unix/apr_arch_networkio.h
+include/apr-1/arch/unix/apr_arch_poll_private.h
+include/apr-1/arch/unix/apr_arch_proc_mutex.h
+include/apr-1/arch/unix/apr_arch_shm.h
+include/apr-1/arch/unix/apr_arch_thread_cond.h
+include/apr-1/arch/unix/apr_arch_thread_mutex.h
+include/apr-1/arch/unix/apr_arch_thread_rwlock.h
+include/apr-1/arch/unix/apr_arch_threadproc.h
+include/apr-1/arch/unix/apr_private.h
+lib/apr.exp
+lib/aprutil.exp
+lib/libapr-1.la
+lib/libaprutil-1.la
+lib/pkgconfig/apr-1.pc
+lib/pkgconfig/apr-util-1.pc
+libexec/apr/apr_rules.mk
+libexec/apr/libtool
+libexec/apr/make_exports.awk
+libexec/apr/make_var_export.awk
+libexec/apr/mkdir.sh
+@dirrm libexec/apr
+@dirrm include/apr-1/arch/unix
+@dirrm include/apr-1/arch
+@dirrm include/apr-1
diff --git a/devel/apr1/buildlink3.mk b/devel/apr1/buildlink3.mk
new file mode 100644
index 00000000000..87037bfc5b4
--- /dev/null
+++ b/devel/apr1/buildlink3.mk
@@ -0,0 +1,46 @@
+# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/12/08 23:29:53 xtraeme Exp $
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+APR_BUILDLINK3_MK:=	${APR_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	apr
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Napr}
+BUILDLINK_PACKAGES+=	apr
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}apr
+
+.if !empty(APR_BUILDLINK3_MK:M+)
+BUILDLINK_API_DEPENDS.apr+=	apr>=1.2.8
+BUILDLINK_PKGSRCDIR.apr?=	../../devel/apr1
+
+WRAPPER_REORDER_CMDS+=	reorder:l:aprutil-1:crypt
+
+BUILDLINK_FILES.apr+=	bin/apr-config
+BUILDLINK_FILES.apr+=	bin/apu-config
+BUILDLINK_FILES.apr+=	lib/*.exp
+
+.include "../../mk/bsd.prefs.mk"
+
+.  if !defined(PKG_BUILD_OPTIONS.apr)
+PKG_BUILD_OPTIONS.apr!=	cd ${BUILDLINK_PKGSRCDIR.apr} && \
+			${MAKE} show-var ${MAKEFLAGS} VARNAME=PKG_OPTIONS
+MAKEFLAGS+=	PKG_BUILD_OPTIONS.apr=${PKG_BUILD_OPTIONS.apr:Q}
+.  endif
+MAKEVARS+=	PKG_BUILD_OPTIONS.apr
+.endif	# APR_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+
+.if !empty(PKG_BUILD_OPTIONS.apr:Mdb4)
+.  include "../../databases/db4/buildlink3.mk"
+.endif
+
+.if !empty(PKG_BUILD_OPTIONS.apr:Mldap)
+.  include "../../databases/openldap-client/buildlink3.mk"
+.endif
+
+.include "../../converters/libiconv/buildlink3.mk"
+.include "../../textproc/expat/buildlink3.mk"
+.include "../../mk/dlopen.buildlink3.mk"
diff --git a/devel/apr1/distinfo b/devel/apr1/distinfo
new file mode 100644
index 00000000000..851cd4a5487
--- /dev/null
+++ b/devel/apr1/distinfo
@@ -0,0 +1,11 @@
+$NetBSD: distinfo,v 1.1.1.1 2006/12/08 23:29:53 xtraeme Exp $
+
+SHA1 (httpd-2.2.3.tar.bz2) = 30d445302e63326d81705687ee734fdfb692dcde
+RMD160 (httpd-2.2.3.tar.bz2) = 291e093f48d980daba482140581a525ecbfae4d2
+Size (httpd-2.2.3.tar.bz2) = 4905728 bytes
+SHA1 (patch-aa) = c84bdb6bcb14bf6bc7ea0d8f13334dd8c3ef2ef9
+SHA1 (patch-ab) = 6627fd125840f3f348b31dd79f69e0eea9cf918f
+SHA1 (patch-an) = 76d9ac0cdddec7c0f41535baee63bf0aa26ed596
+SHA1 (patch-ao) = e35630af53a78fce9aa5347a81cb1bcf8fb3058e
+SHA1 (patch-ap) = cefbc6da94d1038be97128689ca413be3e1fd33c
+SHA1 (patch-aq) = 6cc1fb879fb5d9280f543ebe068a441e2e6560f3
diff --git a/devel/apr1/options.mk b/devel/apr1/options.mk
new file mode 100644
index 00000000000..52ffe085463
--- /dev/null
+++ b/devel/apr1/options.mk
@@ -0,0 +1,20 @@
+# $NetBSD: options.mk,v 1.1.1.1 2006/12/08 23:29:53 xtraeme Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.apr
+PKG_SUPPORTED_OPTIONS=	db4 ldap
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mdb4)
+APU_CONFIGURE_ARGS+=	\
+	--with-berkeley-db=${BUILDLINK_PREFIX.db4}/include:${LOCALBASE}
+.  include "../../databases/db4/buildlink3.mk"
+.else
+APU_CONFIGURE_ARGS+=	--with-dbm=sdbm
+.endif
+
+.if !empty(PKG_OPTIONS:Mldap)
+APU_CONFIGURE_ARGS+=	--with-ldap
+APR_CONFIGURE_ARGS+=	--with-ldap
+.  include "../../databases/openldap-client/buildlink3.mk"
+.endif
diff --git a/devel/apr1/patches/patch-aa b/devel/apr1/patches/patch-aa
new file mode 100644
index 00000000000..c179b327bde
--- /dev/null
+++ b/devel/apr1/patches/patch-aa
@@ -0,0 +1,22 @@
+$NetBSD: patch-aa,v 1.1.1.1 2006/12/08 23:29:53 xtraeme Exp $
+
+--- apr/threadproc/unix/signals.c.orig	2005-02-04 15:36:31.000000000 -0500
++++ apr/threadproc/unix/signals.c
+@@ -49,7 +49,7 @@ APR_DECLARE(apr_status_t) apr_proc_kill(
+ 
+ #if APR_HAVE_SIGACTION
+ 
+-#ifdef DARWIN
++#if defined(__NetBSD__) || defined(DARWIN)
+ static void avoid_zombies(int signo)
+ {
+     int exit_status;
+@@ -85,7 +85,7 @@ APR_DECLARE(apr_sigfunc_t *) apr_signal(
+         act.sa_flags |= SA_NOCLDWAIT;
+     }
+ #endif
+-#ifdef DARWIN
++#if defined(__NetBSD__) || defined(DARWIN)
+     /* ignoring SIGCHLD or leaving the default disposition doesn't avoid zombies,
+      * and there is no SA_NOCLDWAIT flag, so catch the signal and reap status in 
+      * the handler to avoid zombies
diff --git a/devel/apr1/patches/patch-ab b/devel/apr1/patches/patch-ab
new file mode 100644
index 00000000000..2014710e60c
--- /dev/null
+++ b/devel/apr1/patches/patch-ab
@@ -0,0 +1,22 @@
+$NetBSD: patch-ab,v 1.1.1.1 2006/12/08 23:29:53 xtraeme Exp $
+
+--- apr-util/configure.orig	2006-12-08 18:05:10.000000000 +0100
++++ apr-util/configure	2006-12-08 18:05:58.000000000 +0100
+@@ -31501,7 +31501,7 @@
+ fi
+ 
+ 
+-      if test "$apu_have_pgsql" == "0"; then
++      if test "$apu_have_pgsql" = "0"; then
+         if test "${ac_cv_header_postgresql_libpq_fe_h+set}" = set; then
+   echo "$as_me:$LINENO: checking for postgresql/libpq-fe.h" >&5
+ echo $ECHO_N "checking for postgresql/libpq-fe.h... $ECHO_C" >&6
+@@ -32732,7 +32732,7 @@
+ fi
+ 
+ 
+-      if test "$apu_have_mysql" == "0"; then
++      if test "$apu_have_mysql" = "0"; then
+         if test "${ac_cv_header_mysql_mysql_h+set}" = set; then
+   echo "$as_me:$LINENO: checking for mysql/mysql.h" >&5
+ echo $ECHO_N "checking for mysql/mysql.h... $ECHO_C" >&6
diff --git a/devel/apr1/patches/patch-an b/devel/apr1/patches/patch-an
new file mode 100644
index 00000000000..c61e6dc9089
--- /dev/null
+++ b/devel/apr1/patches/patch-an
@@ -0,0 +1,13 @@
+$NetBSD: patch-an,v 1.1.1.1 2006/12/08 23:29:53 xtraeme Exp $
+
+--- apr/configure.in.orig	2005-02-04 16:58:13.000000000 +0000
++++ apr/configure.in
+@@ -1679,7 +1679,7 @@ if test "$rand" != "1"; then
+   if test "$apr_devrandom" = "yes"; then
+     # /dev/random on OpenBSD doesn't provide random data, so
+     # prefer /dev/arandom, which does; see random(4).
+-    for f in /dev/arandom /dev/random /dev/urandom; do
++    for f in /dev/arandom /dev/urandom /dev/random; do
+       if test -r $f; then
+         apr_devrandom=$f
+         rand=1
diff --git a/devel/apr1/patches/patch-ao b/devel/apr1/patches/patch-ao
new file mode 100644
index 00000000000..24f383b6e54
--- /dev/null
+++ b/devel/apr1/patches/patch-ao
@@ -0,0 +1,13 @@
+$NetBSD: patch-ao,v 1.1.1.1 2006/12/08 23:29:53 xtraeme Exp $
+
+--- apr/configure.orig	2005-10-09 18:34:19.000000000 -0700
++++ apr/configure
+@@ -40851,7 +40851,7 @@ fi;
+   if test "$apr_devrandom" = "yes"; then
+     # /dev/random on OpenBSD doesn't provide random data, so
+     # prefer /dev/arandom, which does; see random(4).
+-    for f in /dev/arandom /dev/random /dev/urandom; do
++    for f in /dev/arandom /dev/urandom /dev/random; do
+       if test -r $f; then
+         apr_devrandom=$f
+         rand=1
diff --git a/devel/apr1/patches/patch-ap b/devel/apr1/patches/patch-ap
new file mode 100644
index 00000000000..43e70817459
--- /dev/null
+++ b/devel/apr1/patches/patch-ap
@@ -0,0 +1,22 @@
+$NetBSD: patch-ap,v 1.1.1.1 2006/12/08 23:29:53 xtraeme Exp $
+
+--- apr-util/config.layout.orig	2006-12-08 17:55:16.000000000 +0100
++++ apr-util/config.layout	2006-12-08 17:56:48.000000000 +0100
+@@ -230,3 +230,17 @@
+     libsuffix:     -${APRUTIL_MAJOR_VERSION}
+     installbuilddir: ${prefix}/usr/share/apache2/build
+ </Layout>
++
++#   NetBSD (pkgsrc) layout
++<Layout NetBSD>
++     prefix:        @PREFIX@
++     exec_prefix:   ${prefix}
++     bindir:        ${exec_prefix}/bin
++     sbindir:       ${exec_prefix}/sbin
++     libexecdir:    ${exec_prefix}/lib/httpd
++     mandir:        ${prefix}/man
++     datadir:       ${prefix}/share/httpd
++     includedir:    ${prefix}/include/apr
++     localstatedir: /var
++     runtimedir:    ${localstatedir}/run
++</Layout>
diff --git a/devel/apr1/patches/patch-aq b/devel/apr1/patches/patch-aq
new file mode 100644
index 00000000000..f6400230b39
--- /dev/null
+++ b/devel/apr1/patches/patch-aq
@@ -0,0 +1,22 @@
+$NetBSD: patch-aq,v 1.1.1.1 2006/12/08 23:29:53 xtraeme Exp $
+
+--- apr/config.layout.orig	Thu Apr  3 17:14:54 2003
++++ apr/config.layout	Thu Apr  3 17:14:01 2003
+@@ -229,3 +229,17 @@
+     infodir:       ${exec_prefix}/share/info
+     libsuffix:    -${APR_MAJOR_VERSION}
+ </Layout>
++
++#   NetBSD (pkgsrc) layout
++<Layout NetBSD>
++    prefix:        @PREFIX@
++    exec_prefix:   ${prefix}
++    bindir:        ${exec_prefix}/bin
++    sbindir:       ${exec_prefix}/sbin
++    libexecdir:    ${exec_prefix}/lib/httpd
++    mandir:        ${prefix}/man
++    datadir:       ${prefix}/share/httpd
++    includedir:    ${prefix}/include/apr
++    localstatedir: /var
++    runtimedir:    ${localstatedir}/run
++</Layout>