summaryrefslogtreecommitdiff
path: root/devel/apr2
diff options
context:
space:
mode:
Diffstat (limited to 'devel/apr2')
-rw-r--r--devel/apr2/Makefile188
-rw-r--r--devel/apr2/distinfo6
-rw-r--r--devel/apr2/files/patch-apr-util_build_dbm.m421
-rw-r--r--devel/apr2/files/patch-apr-util_configure21
-rw-r--r--devel/apr2/files/patch-apr_dbd_sqlite3.c101
-rw-r--r--devel/apr2/files/patch-apr_hints.m415
-rw-r--r--devel/apr2/pkg-descr8
-rw-r--r--devel/apr2/pkg-plist85
8 files changed, 0 insertions, 445 deletions
diff --git a/devel/apr2/Makefile b/devel/apr2/Makefile
deleted file mode 100644
index 7c9517cf27c1..000000000000
--- a/devel/apr2/Makefile
+++ /dev/null
@@ -1,188 +0,0 @@
-# New ports collection makefile for: apr
-# Date created: 19 February 2002
-# Whom: Garrett Rooney <rooneg@electricjellyfish.net>
-#
-# $FreeBSD$
-#
-# Tunables:
-# APR_UTIL_WITHOUT_THREADS: disable threads support
-# APR_UTIL_WITH_GDBM: force dependency on the GNU dbm
-# APR_UTIL_WITHOUT_GDBM: unconditionally disable the use of GNU dbm
-# APR_UTIL_WITH_BERKELEY_DB: force dependency on Sleepycat's Berkeley DB 4.2
-# APR_UTIL_WITHOUT_BERKELEY_DB: unconditionally disable the use of db4.2
-# (the database bindings are detected and recorded automatically if these
-# switches are not set)
-# APR_UTIL_WITH_LDAP: force dependency on OpenLDAP
-
-PORTNAME= apr
-PORTVERSION= 1.2.7
-PORTREVISION= 1
-CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_APACHE}
-MASTER_SITE_SUBDIR= apr
-DISTFILES= apr-${PORTVERSION}.tar.gz apr-util-${PORTVERSION}.tar.gz
-
-MAINTAINER= rodrigc@crodrigues.org
-COMMENT= The Apache Group's Portability Library
-
-LIB_DEPENDS+= expat.6:${PORTSDIR}/textproc/expat2
-
-USE_ICONV= yes
-USE_AUTOTOOLS= automake:19 autoconf:259 libtool:15:env
-USE_PERL5= yes
-USE_GMAKE= yes
-USE_PYTHON_BUILD= yes
-INSTALLS_SHLIB= yes
-GNU_CONFIGURE= yes
-WRKSRC= ${WRKDIR}
-
-APR_UTIL_CONF_ARGS= --with-apr=../apr-${PORTVERSION} \
- --with-expat=${PREFIX} \
- --with-iconv=${PREFIX}
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 500000 && defined(APR_SVN_WITHOUT_THREADS_4)
-APR_UTIL_WITHOUT_THREADS= yes
-.endif
-
-.if defined(APR_UTIL_WITHOUT_THREADS)
-CONFIGURE_ARGS+= --disable-threads
-APR_UTIL_CONF_ARGS+= --disable-threads
-.if defined(PKGNAMESUFFIX)
-PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-nothr
-.else
-PKGNAMESUFFIX= -nothr
-.endif
-.else
-CONFIGURE_ARGS+= --enable-threads
-.endif
-
-.if defined(APR_UTIL_WITHOUT_GDBM)
-APR_UTIL_CONF_ARGS+= --without-gdbm
-.elif defined(APR_UTIL_WITH_GDBM) || exists(${LOCALBASE}/lib/libgdbm.so.3)
-LIB_DEPENDS+= gdbm.3:${PORTSDIR}/databases/gdbm
-APR_UTIL_CONF_ARGS+= --with-gdbm=${LOCALBASE}
-.if defined(PKGNAMESUFFIX)
-PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-gdbm
-.else
-PKGNAMESUFFIX= -gdbm
-.endif
-.else
-APR_UTIL_CONF_ARGS+= --without-gdbm
-.endif
-
-.if defined(WITH_BDB)
-APR_UTIL_WITH_BERKELEY_DB= yes
-.endif
-
-.if defined(APR_UTIL_WITHOUT_BERKELEY_DB)
-APR_UTIL_CONF_ARGS+= --without-berkeley-db
-.elif defined(APR_UTIL_WITH_BERKELEY_DB) || exists(${LOCALBASE}/lib/libdb-4.2.so.2)
-USE_BDB= 42+
-APR_UTIL_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(APR_UTIL_WITH_LDAP)
-USE_OPENLDAP= yes
-APR_UTIL_CONF_ARGS+= --with-ldap-include=${PREFIX}/include \
- --with-ldap-lib=${PREFIX}/lib --with-ldap=ldap
-.if defined(PKGNAMESUFFIX)
-PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-ldap
-.else
-PKGNAMESUFFIX= -ldap
-.endif
-.endif
-
-pre-extract:
- @${ECHO_MSG} ""
-.if defined(APR_UTIL_WITHOUT_THREADS)
- @${ECHO_MSG} "apr library will be built without threads support."
-.else
- @${ECHO_MSG} "apr library will be built with threads support."
- @${ECHO_MSG} "All programs which use apr must be linked with threads too."
- @${ECHO_MSG} "You can disable threads by defining APR_UTIL_WITHOUT_THREADS."
-.endif
- @${ECHO_MSG} ""
-.if defined(APR_UTIL_WITHOUT_GDBM)
- @${ECHO_MSG} "GDBM support is disabled."
-.elif defined(APR_UTIL_WITH_GDBM)
- @${ECHO_MSG} "GDBM support is forced."
-.elif exists(${LOCALBASE}/lib/libgdbm.so.3)
- @${ECHO_MSG} "GDBM support is enabled."
- @${ECHO_MSG} "You can disable GDBM support by defining APR_UTIL_WITHOUT_GDBM."
-.else
- @${ECHO_MSG} "GDBM was not found."
- @${ECHO_MSG} "You can force GDBM support by defining APR_UTIL_WITH_GDBM."
-.endif
- @${ECHO_MSG} ""
-.if defined(APR_UTIL_WITHOUT_BERKELEY_DB)
- @${ECHO_MSG} "Berkeley DB support is disabled."
-.elif defined(APR_UTIL_WITH_BERKELEY_DB)
- @${ECHO_MSG} "Berkeley DB support forced."
-.elif exists(${LOCALBASE}/lib/libdb-4.2.so.2)
- @${ECHO_MSG} "Berkeley db4.2 support is enabled."
- @${ECHO_MSG} "You can disable Berkeley db4.2 support by defining APR_UTIL_WITHOUT_BERKELEY_DB."
-.else
- @${ECHO_MSG} "Berkeley DB was not found."
- @${ECHO_MSG} "You can force Berkeley DB support by defining APR_UTIL_WITH_BERKELEY_DB."
-.endif
- @${ECHO_MSG} ""
-
-post-patch:
- ${REINPLACE_CMD} -e 's/OSVERSION/'${OSVERSION}'/g' \
- ${WRKDIR}/apr-${PORTVERSION}/build/apr_hints.m4
- ${FIND} ${WRKDIR} -name "Makefile.in*" | ${XARGS} ${REINPLACE_CMD} -e \
- 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g'
-
-pre-configure:
-.for d in apr apr-util
-.for f in config.guess config.sub
- ${CP} -f ${TEMPLATES}/${f} ${WRKDIR}/${d}-${PORTVERSION}/build/${f}
- ${CHMOD} a+rx ${WRKDIR}/${d}-${PORTVERSION}/build/${f}
-.endfor
-.endfor
-
-run-autotools::
- cd ${WRKDIR}/apr-${PORTVERSION} ; \
- ${SETENV} ${CONFIGURE_ENV} ${SH} ./buildconf
- cd ${WRKDIR}/apr-util-${PORTVERSION} ; \
- ${RM} -fr xml/expat
- cd ${WRKDIR}/apr-util-${PORTVERSION} ; \
- ${SETENV} ${CONFIGURE_ENV} ${SH} ./buildconf \
- --with-apr=../apr-${PORTVERSION}
- cd ${WRKDIR}/apr-${PORTVERSION}; \
- ${SETENV} ${CONFIGURE_ENV} ${SH} ./configure ${CONFIGURE_ARGS}
- cd ${WRKDIR}/apr-util-${PORTVERSION}; \
- ${SETENV} ${CONFIGURE_ENV} ${SH} \
- ./configure ${CONFIGURE_ARGS} ${APR_UTIL_CONF_ARGS}
-
-do-configure:
- ${DO_NADA}
-
-do-build:
- cd ${WRKDIR}/apr-${PORTVERSION}; ${SETENV} ${MAKE_ENV} ${GMAKE}
- cd ${WRKDIR}/apr-util-${PORTVERSION}; ${SETENV} ${MAKE_ENV} ${GMAKE}
-
-do-install:
- cd ${WRKDIR}/apr-${PORTVERSION}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${INSTALL_TARGET}
- cd ${WRKDIR}/apr-util-${PORTVERSION}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${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}"
-
-.include <bsd.port.post.mk>
diff --git a/devel/apr2/distinfo b/devel/apr2/distinfo
deleted file mode 100644
index 847dbdc2dd2b..000000000000
--- a/devel/apr2/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 (apr-1.2.7.tar.gz) = aea926cbe588f844ad9e317157d60175
-SHA256 (apr-1.2.7.tar.gz) = 4bde26d8168216f00e0f652e34e20e527dab38edca6a7c0d85aea542bf0fc5fa
-SIZE (apr-1.2.7.tar.gz) = 1102370
-MD5 (apr-util-1.2.7.tar.gz) = c3702668a640be1695956115857ec22e
-SHA256 (apr-util-1.2.7.tar.gz) = 8cd84eb2031a91572e1be2975f4171730a9be72c4cd88718c4c40ac7dc4fd7d3
-SIZE (apr-util-1.2.7.tar.gz) = 641600
diff --git a/devel/apr2/files/patch-apr-util_build_dbm.m4 b/devel/apr2/files/patch-apr-util_build_dbm.m4
deleted file mode 100644
index 68dd6cb2f837..000000000000
--- a/devel/apr2/files/patch-apr-util_build_dbm.m4
+++ /dev/null
@@ -1,21 +0,0 @@
---- apr-util-1.2.7/build/dbm.m4-orig Wed Dec 7 09:02:23 2005
-+++ apr-util-1.2.7/build/dbm.m4 Wed Dec 23 09:07:34 2005
-@@ -588,6 +588,8 @@
- elif test "$withval" = "no"; then
- apu_have_gdbm=0
- else
-+ saved_cppflags="$CPPFLAGS"
-+ saved_libs="$LIBS"
- CPPFLAGS="-I$withval/include"
- LIBS="-L$withval/lib "
-
-@@ -597,6 +599,9 @@
- APR_ADDTO(APRUTIL_LDFLAGS, [-L$withval/lib])
- APR_ADDTO(APRUTIL_INCLUDES, [-I$withval/include])
- fi
-+
-+ CPPFLAGS="$saved_cppflags"
-+ LIBS="$saved_libs"
- fi
- ], [
- apu_have_gdbm=0
diff --git a/devel/apr2/files/patch-apr-util_configure b/devel/apr2/files/patch-apr-util_configure
deleted file mode 100644
index 9bfd536bc5aa..000000000000
--- a/devel/apr2/files/patch-apr-util_configure
+++ /dev/null
@@ -1,21 +0,0 @@
---- apr-util-1.2.7/configure.orig Mon Sep 26 18:28:49 2005
-+++ apr-util-1.2.7/configure Fri Dec 23 15:06:09 2005
-@@ -13806,6 +13806,8 @@
- elif test "$withval" = "no"; then
- apu_have_gdbm=0
- else
-+ saved_cppflags="$CPPFLAGS"
-+ saved_libs="$LIBS"
- CPPFLAGS="-I$withval/include"
- LIBS="-L$withval/lib "
-
-@@ -14064,6 +14066,9 @@
- fi
-
- fi
-+
-+ CPPFLAGS="$saved_cppflags"
-+ LIBS="$saved_libs"
- fi
-
- else
diff --git a/devel/apr2/files/patch-apr_dbd_sqlite3.c b/devel/apr2/files/patch-apr_dbd_sqlite3.c
deleted file mode 100644
index bedbfb6c1474..000000000000
--- a/devel/apr2/files/patch-apr_dbd_sqlite3.c
+++ /dev/null
@@ -1,101 +0,0 @@
---- apr-util-1.2.7/dbd/apr_dbd_sqlite3.c.orig Wed Mar 15 01:04:54 2006
-+++ apr-util-1.2.7/dbd/apr_dbd_sqlite3.c Mon May 29 09:08:08 2006
-@@ -24,6 +24,7 @@
- #include <sqlite3.h>
-
- #include "apr_strings.h"
-+#include "apr_thread_mutex.h"
- #include "apr_time.h"
-
- #include "apr_dbd_internal.h"
-@@ -39,7 +40,9 @@
- struct apr_dbd_t {
- sqlite3 *conn;
- apr_dbd_transaction_t *trans;
-+#if APR_HAS_THREADS
- apr_thread_mutex_t *mutex;
-+#endif
- apr_pool_t *pool;
- };
-
-@@ -93,11 +96,15 @@
- return sql->trans->errnum;
- }
-
-+#if APR_HAS_THREADS
- apr_thread_mutex_lock(sql->mutex);
-+#endif
-
- ret = sqlite3_prepare(sql->conn, query, strlen(query), &stmt, &tail);
- if (!dbd_sqlite3_is_success(ret)) {
-+#if APR_HAS_THREADS
- apr_thread_mutex_unlock(sql->mutex);
-+#endif
- return ret;
- } else {
- int column_count;
-@@ -118,7 +125,9 @@
- if (retry_count++ > MAX_RETRY_COUNT) {
- ret = SQLITE_ERROR;
- } else {
-+#if APR_HAS_THREADS
- apr_thread_mutex_unlock(sql->mutex);
-+#endif
- apr_sleep(MAX_RETRY_SLEEP);
- apr_thread_mutex_lock(sql->mutex);
- }
-@@ -179,7 +188,9 @@
- } while (ret == SQLITE_ROW || ret == SQLITE_BUSY);
- }
- ret = sqlite3_finalize(stmt);
-+#if APR_HAS_THREADS
- apr_thread_mutex_unlock(sql->mutex);
-+#endif
-
- if (sql->trans) {
- sql->trans->errnum = ret;
-@@ -242,7 +253,9 @@
- }
-
- length = strlen(query);
-+#if APR_HAS_THREADS
- apr_thread_mutex_lock(sql->mutex);
-+#endif
-
- do {
- ret = sqlite3_prepare(sql->conn, query, length, &stmt, &tail);
-@@ -260,7 +273,9 @@
- if (dbd_sqlite3_is_success(ret)) {
- ret = 0;
- }
-+#if APR_HAS_THREADS
- apr_thread_mutex_unlock(sql->mutex);
-+#endif
- if (sql->trans) {
- sql->trans->errnum = ret;
- }
-@@ -366,12 +381,14 @@
- sql->conn = conn;
- sql->pool = pool;
- sql->trans = NULL;
-+#if APR_HAS_THREADS
- /* Create a mutex */
- res = apr_thread_mutex_create(&sql->mutex, APR_THREAD_MUTEX_DEFAULT,
- pool);
- if (res != APR_SUCCESS) {
- return NULL;
- }
-+#endif
-
- return sql;
- }
-@@ -379,7 +396,9 @@
- static apr_status_t dbd_sqlite3_close(apr_dbd_t *handle)
- {
- sqlite3_close(handle->conn);
-+#if APR_HAS_THREADS
- apr_thread_mutex_destroy(handle->mutex);
-+#endif
- return APR_SUCCESS;
- }
-
diff --git a/devel/apr2/files/patch-apr_hints.m4 b/devel/apr2/files/patch-apr_hints.m4
deleted file mode 100644
index 3891ecae5176..000000000000
--- a/devel/apr2/files/patch-apr_hints.m4
+++ /dev/null
@@ -1,15 +0,0 @@
---- apr-1.2.7/build/apr_hints.m4.orig Wed Oct 27 11:12:28 2004
-+++ apr-1.2.7/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"
diff --git a/devel/apr2/pkg-descr b/devel/apr2/pkg-descr
deleted file mode 100644
index 171e56b08723..000000000000
--- a/devel/apr2/pkg-descr
+++ /dev/null
@@ -1,8 +0,0 @@
-The Apache Portable Runtime is a library of C data structures and routines,
-forming a system portability layer that covers as many operating systems as
-possible, including Unices, Win32, BeOS, and OS/2.
-
-This port also includes the APR-Util package, which contains some useful
-utilities built on top of APR.
-
-WWW: http://apr.apache.org/
diff --git a/devel/apr2/pkg-plist b/devel/apr2/pkg-plist
deleted file mode 100644
index a52a515abe10..000000000000
--- a/devel/apr2/pkg-plist
+++ /dev/null
@@ -1,85 +0,0 @@
-bin/apr-1-config
-bin/apu-1-config
-build-1/apr_rules.mk
-build-1/libtool
-build-1/make_exports.awk
-build-1/make_var_export.awk
-build-1/mkdir.sh
-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
-libdata/pkgconfig/apr-1.pc
-libdata/pkgconfig/apr-util-1.pc
-lib/apr.exp
-lib/aprutil.exp
-lib/libapr-1.a
-lib/libapr-1.la
-lib/libapr-1.so
-lib/libapr-1.so.2
-lib/libaprutil-1.a
-lib/libaprutil-1.la
-lib/libaprutil-1.so
-lib/libaprutil-1.so.2
-@dirrm build-1
-@dirrm include/apr-1