diff options
-rw-r--r-- | devel/apr-devel/Makefile | 32 | ||||
-rw-r--r-- | devel/apr-devel/PLIST | 141 | ||||
-rw-r--r-- | devel/apr-devel/buildlink2.mk | 124 | ||||
-rw-r--r-- | devel/apr-devel/distinfo | 12 | ||||
-rw-r--r-- | devel/apr-devel/patches/patch-aa | 23 | ||||
-rw-r--r-- | devel/apr-devel/patches/patch-ab | 13 |
6 files changed, 193 insertions, 152 deletions
diff --git a/devel/apr-devel/Makefile b/devel/apr-devel/Makefile index 889b630530b..f0ca3191dac 100644 --- a/devel/apr-devel/Makefile +++ b/devel/apr-devel/Makefile @@ -1,22 +1,26 @@ -# $NetBSD: Makefile,v 1.6 2002/10/09 19:00:55 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2002/11/25 19:52:43 wiz Exp $ -DISTNAME= apr_20020725223645 -PKGNAME= apr-0.20020725223645 +DISTNAME= apr_20021123173453 +PKGNAME= apr-0.20021123173453 CATEGORIES= devel -MASTER_SITES= http://www.apache.org/dist/apr/not-released/ -DISTFILES= apr_20020725223645.tar.gz apr-util_20020725223700.tar.gz +MASTER_SITES= # http://www.apache.org/dist/apr/not-released/ +DISTFILES= apr_20021123173453.tar.gz apr-util_20021123173519.tar.gz MAINTAINER= joelw@unix.se HOMEPAGE= http://apr.apache.org/ COMMENT= Apache Portable Run-time, a system portability layer -AUTOCONF_REQD= 2.50 +AUTOCONF_REQD= 2.56 GNU_CONFIGURE= yes USE_BUILDLINK2= yes +# Programs using apr-config --apr-libtool will also need USE_LIBTOOL +# That's no reason to make it a dependency, though. -- wiz USE_LIBTOOL= yes -LTCONFIG_OVERRIDE= ${WRKSRC}/build/ldconfig +LIBTOOL_OVERRIDE= ${WRKSRC}/apr/libtool WRKSRC= ${WRKDIR} +BUILD_DIRS= ${WRKSRC}/apr ${WRKSRC}/apr-util + pre-configure: (cd ${WRKDIR}/apr && ./buildconf) (cd ${WRKDIR}/apr-util && ./buildconf) @@ -26,15 +30,11 @@ do-configure: --prefix=${PREFIX} \ --with-devrandom=/dev/urandom \ ) - (cd ${WRKDIR}/apr-util && ${SETENV} ${CONFIGURE_ENV} ./configure --prefix=${PREFIX} --with-apr=../apr --with-expat=${LOCALBASE}) - -do-build: - (cd ${WRKDIR}/apr && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS}) - (cd ${WRKDIR}/apr-util && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS}) - -do-install: - (cd ${WRKDIR}/apr && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKEFILE} ${INSTALL_TARGET}) - (cd ${WRKDIR}/apr-util && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKEFILE} ${INSTALL_TARGET}) + (cd ${WRKDIR}/apr-util && ${SETENV} ${CONFIGURE_ENV} ./configure \ + --prefix=${PREFIX} \ + --with-apr=../apr \ + --with-expat=${BUILDLINK_PREFIX.expat} \ + ) .include "../../textproc/expat/buildlink2.mk" .include "../../mk/autoconf.mk" diff --git a/devel/apr-devel/PLIST b/devel/apr-devel/PLIST index 89de1e718a9..2995e95be8b 100644 --- a/devel/apr-devel/PLIST +++ b/devel/apr-devel/PLIST @@ -1,74 +1,75 @@ -@comment $NetBSD: PLIST,v 1.2 2002/11/09 14:25:59 wiz Exp $ +@comment $NetBSD: PLIST,v 1.3 2002/11/25 19:52:44 wiz Exp $ bin/apr-config bin/apu-config -include/apr.h -include/apr_allocator.h -include/apr_anylock.h -include/apr_atomic.h -include/apr_base64.h -include/apr_buckets.h -include/apr_compat.h -include/apr_date.h -include/apr_dbm.h -include/apr_dso.h -include/apr_errno.h -include/apr_file_info.h -include/apr_file_io.h -include/apr_fnmatch.h -include/apr_general.h -include/apr_getopt.h -include/apr_global_mutex.h -include/apr_hash.h -include/apr_hooks.h -include/apr_inherit.h -include/apr_ldap.h -include/apr_lib.h -include/apr_md4.h -include/apr_md5.h -include/apr_mmap.h -include/apr_network_io.h -include/apr_optional.h -include/apr_optional_hooks.h -include/apr_poll.h -include/apr_pools.h -include/apr_portable.h -include/apr_proc_mutex.h -include/apr_ring.h -include/apr_rmm.h -include/apr_sdbm.h -include/apr_sha1.h -include/apr_shm.h -include/apr_signal.h -include/apr_strings.h -include/apr_strmatch.h -include/apr_support.h -include/apr_tables.h -include/apr_thread_cond.h -include/apr_thread_mutex.h -include/apr_thread_proc.h -include/apr_thread_rwlock.h -include/apr_time.h -include/apr_uri.h -include/apr_user.h -include/apr_uuid.h -include/apr_version.h -include/apr_want.h -include/apr_xlate.h -include/apr_xml.h -include/apu.h -include/apu_compat.h -lib/APRVARS +include/apr-0/apr.h +include/apr-0/apr_version.h +include/apr-0/apr_user.h +include/apr-0/apr_time.h +include/apr-0/apr_thread_rwlock.h +include/apr-0/apr_thread_proc.h +include/apr-0/apr_thread_mutex.h +include/apr-0/apr_thread_cond.h +include/apr-0/apr_tables.h +include/apr-0/apr_support.h +include/apr-0/apr_strings.h +include/apr-0/apr_signal.h +include/apr-0/apr_shm.h +include/apr-0/apr_ring.h +include/apr-0/apr_proc_mutex.h +include/apr-0/apr_portable.h +include/apr-0/apr_pools.h +include/apr-0/apr_poll.h +include/apr-0/apr_network_io.h +include/apr-0/apr_mmap.h +include/apr-0/apr_lib.h +include/apr-0/apr_inherit.h +include/apr-0/apr_hash.h +include/apr-0/apr_global_mutex.h +include/apr-0/apr_getopt.h +include/apr-0/apr_general.h +include/apr-0/apr_fnmatch.h +include/apr-0/apr_file_io.h +include/apr-0/apr_file_info.h +include/apr-0/apr_errno.h +include/apr-0/apr_dso.h +include/apr-0/apr_compat.h +include/apr-0/apr_atomic.h +include/apr-0/apr_allocator.h +include/apr-0/apr_want.h +include/apr-0/apr_anylock.h +include/apr-0/apu_compat.h +include/apr-0/apu.h +include/apr-0/apr_xml.h +include/apr-0/apr_xlate.h +include/apr-0/apr_uuid.h +include/apr-0/apr_uri.h +include/apr-0/apr_strmatch.h +include/apr-0/apr_sha1.h +include/apr-0/apr_sdbm.h +include/apr-0/apr_rmm.h +include/apr-0/apr_reslist.h +include/apr-0/apr_queue.h +include/apr-0/apr_optional_hooks.h +include/apr-0/apr_optional.h +include/apr-0/apr_md5.h +include/apr-0/apr_md4.h +include/apr-0/apr_ldap.h +include/apr-0/apr_hooks.h +include/apr-0/apr_dbm.h +include/apr-0/apr_date.h +include/apr-0/apr_buckets.h +include/apr-0/apr_base64.h +include/apr-0/apu_version.h lib/apr.exp lib/aprutil.exp -lib/libapr.a -lib/libapr.la -lib/libapr.so -lib/libapr.so.0 -lib/libapr.so.0.0 -lib/libaprutil.a -lib/libaprutil.la -lib/libaprutil.so -lib/libaprutil.so.0 -lib/libaprutil.so.0.0 -share/build/libtool -@dirrm share/build +lib/libapr-0.a +lib/libapr-0.la +lib/libapr-0.so +lib/libapr-0.so.9 +lib/libapr-0.so.9.2 +lib/libaprutil-0.a +lib/libaprutil-0.la +lib/libaprutil-0.so +lib/libaprutil-0.so.9 +lib/libaprutil-0.so.9.2 +@dirrm include/apr-0 diff --git a/devel/apr-devel/buildlink2.mk b/devel/apr-devel/buildlink2.mk index e230414000f..907fc91f4a1 100644 --- a/devel/apr-devel/buildlink2.mk +++ b/devel/apr-devel/buildlink2.mk @@ -1,76 +1,78 @@ -# $NetBSD: buildlink2.mk,v 1.1 2002/11/09 15:17:17 wiz Exp $ +# $NetBSD: buildlink2.mk,v 1.2 2002/11/25 19:52:44 wiz Exp $ # .if !defined(APR_BUILDLINK2_MK) APR_BUILDLINK2_MK= # defined BUILDLINK_PACKAGES+= apr -BUILDLINK_DEPENDS.apr?= apr>=0.20020725223645 +BUILDLINK_DEPENDS.apr?= apr>=0.20021123173453 BUILDLINK_PKGSRCDIR.apr?= ../../devel/apr-devel EVAL_PREFIX+= BUILDLINK_PREFIX.apr=apr BUILDLINK_PREFIX.apr_DEFAULT= ${LOCALBASE} -BUILDLINK_FILES.apr+= include/apr.h -BUILDLINK_FILES.apr+= include/apr_allocator.h -BUILDLINK_FILES.apr+= include/apr_anylock.h -BUILDLINK_FILES.apr+= include/apr_atomic.h -BUILDLINK_FILES.apr+= include/apr_base64.h -BUILDLINK_FILES.apr+= include/apr_buckets.h -BUILDLINK_FILES.apr+= include/apr_compat.h -BUILDLINK_FILES.apr+= include/apr_date.h -BUILDLINK_FILES.apr+= include/apr_dbm.h -BUILDLINK_FILES.apr+= include/apr_dso.h -BUILDLINK_FILES.apr+= include/apr_errno.h -BUILDLINK_FILES.apr+= include/apr_file_info.h -BUILDLINK_FILES.apr+= include/apr_file_io.h -BUILDLINK_FILES.apr+= include/apr_fnmatch.h -BUILDLINK_FILES.apr+= include/apr_general.h -BUILDLINK_FILES.apr+= include/apr_getopt.h -BUILDLINK_FILES.apr+= include/apr_global_mutex.h -BUILDLINK_FILES.apr+= include/apr_hash.h -BUILDLINK_FILES.apr+= include/apr_hooks.h -BUILDLINK_FILES.apr+= include/apr_inherit.h -BUILDLINK_FILES.apr+= include/apr_ldap.h -BUILDLINK_FILES.apr+= include/apr_lib.h -BUILDLINK_FILES.apr+= include/apr_md4.h -BUILDLINK_FILES.apr+= include/apr_md5.h -BUILDLINK_FILES.apr+= include/apr_mmap.h -BUILDLINK_FILES.apr+= include/apr_network_io.h -BUILDLINK_FILES.apr+= include/apr_optional.h -BUILDLINK_FILES.apr+= include/apr_optional_hooks.h -BUILDLINK_FILES.apr+= include/apr_poll.h -BUILDLINK_FILES.apr+= include/apr_pools.h -BUILDLINK_FILES.apr+= include/apr_portable.h -BUILDLINK_FILES.apr+= include/apr_proc_mutex.h -BUILDLINK_FILES.apr+= include/apr_ring.h -BUILDLINK_FILES.apr+= include/apr_rmm.h -BUILDLINK_FILES.apr+= include/apr_sdbm.h -BUILDLINK_FILES.apr+= include/apr_sha1.h -BUILDLINK_FILES.apr+= include/apr_shm.h -BUILDLINK_FILES.apr+= include/apr_signal.h -BUILDLINK_FILES.apr+= include/apr_strings.h -BUILDLINK_FILES.apr+= include/apr_strmatch.h -BUILDLINK_FILES.apr+= include/apr_support.h -BUILDLINK_FILES.apr+= include/apr_tables.h -BUILDLINK_FILES.apr+= include/apr_thread_cond.h -BUILDLINK_FILES.apr+= include/apr_thread_mutex.h -BUILDLINK_FILES.apr+= include/apr_thread_proc.h -BUILDLINK_FILES.apr+= include/apr_thread_rwlock.h -BUILDLINK_FILES.apr+= include/apr_time.h -BUILDLINK_FILES.apr+= include/apr_uri.h -BUILDLINK_FILES.apr+= include/apr_user.h -BUILDLINK_FILES.apr+= include/apr_uuid.h -BUILDLINK_FILES.apr+= include/apr_version.h -BUILDLINK_FILES.apr+= include/apr_want.h -BUILDLINK_FILES.apr+= include/apr_xlate.h -BUILDLINK_FILES.apr+= include/apr_xml.h -BUILDLINK_FILES.apr+= include/apu.h -BUILDLINK_FILES.apr+= include/apu_compat.h -BUILDLINK_FILES.apr+= lib/APRVARS +BUILDLINK_FILES.apr+= include/apr-0/apr.h +BUILDLINK_FILES.apr+= include/apr-0/apr_version.h +BUILDLINK_FILES.apr+= include/apr-0/apr_user.h +BUILDLINK_FILES.apr+= include/apr-0/apr_time.h +BUILDLINK_FILES.apr+= include/apr-0/apr_thread_rwlock.h +BUILDLINK_FILES.apr+= include/apr-0/apr_thread_proc.h +BUILDLINK_FILES.apr+= include/apr-0/apr_thread_mutex.h +BUILDLINK_FILES.apr+= include/apr-0/apr_thread_cond.h +BUILDLINK_FILES.apr+= include/apr-0/apr_tables.h +BUILDLINK_FILES.apr+= include/apr-0/apr_support.h +BUILDLINK_FILES.apr+= include/apr-0/apr_strings.h +BUILDLINK_FILES.apr+= include/apr-0/apr_signal.h +BUILDLINK_FILES.apr+= include/apr-0/apr_shm.h +BUILDLINK_FILES.apr+= include/apr-0/apr_ring.h +BUILDLINK_FILES.apr+= include/apr-0/apr_proc_mutex.h +BUILDLINK_FILES.apr+= include/apr-0/apr_portable.h +BUILDLINK_FILES.apr+= include/apr-0/apr_pools.h +BUILDLINK_FILES.apr+= include/apr-0/apr_poll.h +BUILDLINK_FILES.apr+= include/apr-0/apr_network_io.h +BUILDLINK_FILES.apr+= include/apr-0/apr_mmap.h +BUILDLINK_FILES.apr+= include/apr-0/apr_lib.h +BUILDLINK_FILES.apr+= include/apr-0/apr_inherit.h +BUILDLINK_FILES.apr+= include/apr-0/apr_hash.h +BUILDLINK_FILES.apr+= include/apr-0/apr_global_mutex.h +BUILDLINK_FILES.apr+= include/apr-0/apr_getopt.h +BUILDLINK_FILES.apr+= include/apr-0/apr_general.h +BUILDLINK_FILES.apr+= include/apr-0/apr_fnmatch.h +BUILDLINK_FILES.apr+= include/apr-0/apr_file_io.h +BUILDLINK_FILES.apr+= include/apr-0/apr_file_info.h +BUILDLINK_FILES.apr+= include/apr-0/apr_errno.h +BUILDLINK_FILES.apr+= include/apr-0/apr_dso.h +BUILDLINK_FILES.apr+= include/apr-0/apr_compat.h +BUILDLINK_FILES.apr+= include/apr-0/apr_atomic.h +BUILDLINK_FILES.apr+= include/apr-0/apr_allocator.h +BUILDLINK_FILES.apr+= include/apr-0/apr_want.h +BUILDLINK_FILES.apr+= include/apr-0/apr_anylock.h +BUILDLINK_FILES.apr+= include/apr-0/apu_compat.h +BUILDLINK_FILES.apr+= include/apr-0/apu.h +BUILDLINK_FILES.apr+= include/apr-0/apr_xml.h +BUILDLINK_FILES.apr+= include/apr-0/apr_xlate.h +BUILDLINK_FILES.apr+= include/apr-0/apr_uuid.h +BUILDLINK_FILES.apr+= include/apr-0/apr_uri.h +BUILDLINK_FILES.apr+= include/apr-0/apr_strmatch.h +BUILDLINK_FILES.apr+= include/apr-0/apr_sha1.h +BUILDLINK_FILES.apr+= include/apr-0/apr_sdbm.h +BUILDLINK_FILES.apr+= include/apr-0/apr_rmm.h +BUILDLINK_FILES.apr+= include/apr-0/apr_reslist.h +BUILDLINK_FILES.apr+= include/apr-0/apr_queue.h +BUILDLINK_FILES.apr+= include/apr-0/apr_optional_hooks.h +BUILDLINK_FILES.apr+= include/apr-0/apr_optional.h +BUILDLINK_FILES.apr+= include/apr-0/apr_md5.h +BUILDLINK_FILES.apr+= include/apr-0/apr_md4.h +BUILDLINK_FILES.apr+= include/apr-0/apr_ldap.h +BUILDLINK_FILES.apr+= include/apr-0/apr_hooks.h +BUILDLINK_FILES.apr+= include/apr-0/apr_dbm.h +BUILDLINK_FILES.apr+= include/apr-0/apr_date.h +BUILDLINK_FILES.apr+= include/apr-0/apr_buckets.h +BUILDLINK_FILES.apr+= include/apr-0/apr_base64.h +BUILDLINK_FILES.apr+= include/apr-0/apu_version.h BUILDLINK_FILES.apr+= lib/apr.exp BUILDLINK_FILES.apr+= lib/aprutil.exp -BUILDLINK_FILES.apr+= lib/libapr.* -BUILDLINK_FILES.apr+= lib/libaprutil.* +BUILDLINK_FILES.apr+= lib/libapr-0.* +BUILDLINK_FILES.apr+= lib/libaprutil-0.* .include "../../textproc/expat/buildlink2.mk" diff --git a/devel/apr-devel/distinfo b/devel/apr-devel/distinfo index 25c17bb499e..ddc973e86a7 100644 --- a/devel/apr-devel/distinfo +++ b/devel/apr-devel/distinfo @@ -1,6 +1,8 @@ -$NetBSD: distinfo,v 1.1.1.1 2002/08/03 01:30:31 hubertf Exp $ +$NetBSD: distinfo,v 1.2 2002/11/25 19:52:44 wiz Exp $ -SHA1 (apr_20020725223645.tar.gz) = a3843df9ebc72e6630cf58cc8fcd410ab3f8fb81 -Size (apr_20020725223645.tar.gz) = 723293 bytes -SHA1 (apr-util_20020725223700.tar.gz) = b7d74cad3648a468d287102dd79fca01097d84c0 -Size (apr-util_20020725223700.tar.gz) = 239975 bytes +SHA1 (apr_20021123173453.tar.gz) = 40eaed4649fd0972c340a8f8b9a8db717d0f92bd +Size (apr_20021123173453.tar.gz) = 756762 bytes +SHA1 (apr-util_20021123173519.tar.gz) = 798076546aef353fcce005a31d9fdcb5ebfc670a +Size (apr-util_20021123173519.tar.gz) = 255214 bytes +SHA1 (patch-aa) = 17d6e5d9f68247497ef4f2d88e7678d8edc66598 +SHA1 (patch-ab) = 8992f359314167df9390d915857e4dd212810344 diff --git a/devel/apr-devel/patches/patch-aa b/devel/apr-devel/patches/patch-aa new file mode 100644 index 00000000000..94d60938093 --- /dev/null +++ b/devel/apr-devel/patches/patch-aa @@ -0,0 +1,23 @@ +$NetBSD: patch-aa,v 1.1 2002/11/25 19:52:45 wiz Exp $ + +--- apr/Makefile.in.orig Fri Oct 11 18:35:11 2002 ++++ apr/Makefile.in +@@ -75,12 +75,12 @@ install: $(TARGET_LIB) + fi; + $(LIBTOOL) --mode=install cp $(TARGET_LIB) $(DESTDIR)$(libdir) + $(LIBTOOL) --mode=install cp apr.exp $(DESTDIR)$(libdir) +- if [ ! -d $(DESTDIR)$(installbuilddir) ]; then \ +- $(top_srcdir)/build/mkdir.sh $(DESTDIR)$(installbuilddir); \ +- fi; +- if [ -f libtool ]; then \ +- $(LIBTOOL) --mode=install cp libtool $(DESTDIR)$(installbuilddir); \ +- fi; ++# if [ ! -d $(DESTDIR)$(installbuilddir) ]; then \ ++# $(top_srcdir)/build/mkdir.sh $(DESTDIR)$(installbuilddir); \ ++# fi; ++# if [ -f libtool ]; then \ ++# $(LIBTOOL) --mode=install cp libtool $(DESTDIR)$(installbuilddir); \ ++# fi; + if [ -f shlibtool ]; then \ + $(LIBTOOL) --mode=install cp shlibtool $(DESTDIR)$(installbuilddir); \ + fi; diff --git a/devel/apr-devel/patches/patch-ab b/devel/apr-devel/patches/patch-ab new file mode 100644 index 00000000000..0eeebe12e40 --- /dev/null +++ b/devel/apr-devel/patches/patch-ab @@ -0,0 +1,13 @@ +$NetBSD: patch-ab,v 1.1 2002/11/25 19:52:45 wiz Exp $ + +--- apr/apr-config.in.orig Thu Sep 19 12:38:31 2002 ++++ apr/apr-config.in +@@ -232,7 +232,7 @@ while test $# -gt 0; do + ;; + --apr-libtool) + if test "$location" = "installed"; then +- echo "${SHELL} ${installbuilddir}/libtool" ++ echo "${SHELL} ${bindir}/libtool" + else + echo "${SHELL} $thisdir/libtool" + fi |