Remove; this has become devel/apr and devel/apr-util.

10 files changed, 0 insertions, 328 deletions

diff --git a/devel/apr1/DESCR b/devel/apr1/DESCR
deleted file mode 100644
index 4961cf68f32..00000000000
--- a/devel/apr1/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index 0c3266dcd45..00000000000
--- a/devel/apr1/Makefile
+++ /dev/null
@@ -1,79 +0,0 @@
-# $NetBSD: Makefile,v 1.3 2007/01/21 17:11: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
-
-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
deleted file mode 100644
index 095394bfdec..00000000000
--- a/devel/apr1/PLIST
+++ /dev/null
@@ -1,101 +0,0 @@
-@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
deleted file mode 100644
index 2e4f37b2c59..00000000000
--- a/devel/apr1/buildlink3.mk
+++ /dev/null
@@ -1,46 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/12/12 21:55:27 rillig 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.fast.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
-
-.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"
-
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/apr1/distinfo b/devel/apr1/distinfo
deleted file mode 100644
index 58a81578eeb..00000000000
--- a/devel/apr1/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.2 2007/01/21 17:11:53 xtraeme Exp $
-
-SHA1 (httpd-2.2.4.tar.bz2) = 64ceae373434a986dc99b8ed953afa0d4fad85ce
-RMD160 (httpd-2.2.4.tar.bz2) = bb6e8a7447fa8e8f629010f30b548068de518523
-Size (httpd-2.2.4.tar.bz2) = 4930375 bytes
-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
deleted file mode 100644
index 52ffe085463..00000000000
--- a/devel/apr1/options.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# $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-an b/devel/apr1/patches/patch-an
deleted file mode 100644
index c61e6dc9089..00000000000
--- a/devel/apr1/patches/patch-an
+++ /dev/null
@@ -1,13 +0,0 @@
-$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
deleted file mode 100644
index 24f383b6e54..00000000000
--- a/devel/apr1/patches/patch-ao
+++ /dev/null
@@ -1,13 +0,0 @@
-$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
deleted file mode 100644
index 43e70817459..00000000000
--- a/devel/apr1/patches/patch-ap
+++ /dev/null
@@ -1,22 +0,0 @@
-$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
deleted file mode 100644
index f6400230b39..00000000000
--- a/devel/apr1/patches/patch-aq
+++ /dev/null
@@ -1,22 +0,0 @@
-$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>