diff options
author | epg <epg@pkgsrc.org> | 2007-01-24 19:46:45 +0000 |
---|---|---|
committer | epg <epg@pkgsrc.org> | 2007-01-24 19:46:45 +0000 |
commit | e4f20d343c4ea31e9b27f29b39b819a041e5b0eb (patch) | |
tree | a131b63e2a062a545ef489d3a1e888298a8cc94d /devel | |
parent | 36ba184135e940175cdcc6ce8fa77070d0ea2283 (diff) | |
download | pkgsrc-e4f20d343c4ea31e9b27f29b39b819a041e5b0eb.tar.gz |
devel/apr:
Update to 1.2.8 (formerly in devel/apr1), no longer build from the
httpd distfile.
devel/rapidsvn:
devel/subversion-base:
parallel/ganglia-monitor-core:
security/hydra:
www/apache2:
Use devel/apr0.
www/apache22:
Use devel/apr and devel/apr-util.
Diffstat (limited to 'devel')
-rw-r--r-- | devel/apr/Makefile | 62 | ||||
-rw-r--r-- | devel/apr/PLIST | 127 | ||||
-rw-r--r-- | devel/apr/buildlink3.mk | 32 | ||||
-rw-r--r-- | devel/apr/distinfo | 17 | ||||
-rw-r--r-- | devel/apr/options.mk | 20 | ||||
-rw-r--r-- | devel/apr/patches/patch-aa | 22 | ||||
-rw-r--r-- | devel/apr/patches/patch-an | 13 | ||||
-rw-r--r-- | devel/apr/patches/patch-ao | 13 | ||||
-rw-r--r-- | devel/apr/patches/patch-ap | 22 | ||||
-rw-r--r-- | devel/apr/patches/patch-aq | 22 | ||||
-rw-r--r-- | devel/apr/patches/patch-ar | 20 | ||||
-rw-r--r-- | devel/apr/patches/patch-as | 22 | ||||
-rw-r--r-- | devel/apr/patches/patch-at | 17 | ||||
-rw-r--r-- | devel/apr/patches/patch-au | 15 | ||||
-rw-r--r-- | devel/rapidsvn/Makefile | 4 | ||||
-rw-r--r-- | devel/subversion-base/Makefile | 4 | ||||
-rw-r--r-- | devel/subversion-base/buildlink3.mk | 4 |
17 files changed, 69 insertions, 367 deletions
diff --git a/devel/apr/Makefile b/devel/apr/Makefile index 76e89cc09a2..9afb90f43bc 100644 --- a/devel/apr/Makefile +++ b/devel/apr/Makefile @@ -1,69 +1,35 @@ -# $NetBSD: Makefile,v 1.49 2006/12/09 00:52:23 xtraeme Exp $ +# $NetBSD: Makefile,v 1.50 2007/01/24 19:46:45 epg Exp $ +# -.include "../../www/apache2/Makefile.common" - -PKGNAME= apr-${APR_VERSION}.${APACHE_VERSION} -PKGREVISION= 2 +DISTNAME= apr-1.2.8 CATEGORIES= devel +MASTER_SITES= ${MASTER_SITE_APACHE:=apr/} +MAINTAINER= xtraeme@NetBSD.org 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 - PKG_INSTALLATION_TYPES= overwrite pkgviews -WRKSRC= ${WRKDIR}/${DISTNAME}/srclib -BUILD_DIRS= apr apr-util - +GNU_CONFIGURE= yes USE_LIBTOOL= yes -GNU_CONFIGURE= yes -CONFIGURE_ENV+= LIBS=${LIBS:M*:Q} -LIBS.SunOS+= -lnsl +USE_TOOLS+= pkg-config + +PKGCONFIG_OVERRIDE+= apr.pc.in -APR_CONFIGURE_ARGS= \ - --prefix=${PREFIX} \ +CONFIGURE_ARGS+= \ --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. +CONFIGURE_ENV+= LIBS=${LIBS:M*:Q} +LIBS.SunOS+= -lnsl 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-0/arch/unix - ${INSTALL_DATA} ${WRKSRC}/apr/include/arch/*.h ${DESTDIR}${PREFIX}/include/apr-0/arch - ${INSTALL_DATA} ${WRKSRC}/apr/include/arch/unix/*.h ${DESTDIR}${PREFIX}/include/apr-0/arch/unix/ - ${CHMOD} ${SHAREMODE} ${DESTDIR}${PREFIX}/include/apr-0/*.h - ${CHMOD} ${PKGDIRMODE} ${DESTDIR}${PREFIX}/include/apr-0 - ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DESTDIR}${PREFIX}/include/apr-0/ - -.include "../../converters/libiconv/buildlink3.mk" + ${INSTALL_SCRIPT} ${PKG_LIBTOOL} \ + ${DESTDIR}${PREFIX}/libexec/apr/libtool .include "../../mk/bsd.pkg.mk" diff --git a/devel/apr/PLIST b/devel/apr/PLIST index 201f7253874..4be96451f88 100644 --- a/devel/apr/PLIST +++ b/devel/apr/PLIST @@ -1,93 +1,48 @@ -@comment $NetBSD: PLIST,v 1.7 2006/05/07 12:35:27 tron Exp $ -bin/apr-config -bin/apu-config -include/apr-0/apr.h -include/apr-0/apr_allocator.h -include/apr-0/apr_anylock.h -include/apr-0/apr_atomic.h -include/apr-0/apr_base64.h -include/apr-0/apr_buckets.h -include/apr-0/apr_compat.h -include/apr-0/apr_date.h -include/apr-0/apr_dbm.h -include/apr-0/apr_dso.h -include/apr-0/apr_env.h -include/apr-0/apr_errno.h -include/apr-0/apr_file_info.h -include/apr-0/apr_file_io.h -include/apr-0/apr_fnmatch.h -include/apr-0/apr_general.h -include/apr-0/apr_getopt.h -include/apr-0/apr_global_mutex.h -include/apr-0/apr_hash.h -include/apr-0/apr_hooks.h -include/apr-0/apr_inherit.h -include/apr-0/apr_ldap.h -include/apr-0/apr_ldap_url.h -include/apr-0/apr_lib.h -include/apr-0/apr_md4.h -include/apr-0/apr_md5.h -include/apr-0/apr_mmap.h -include/apr-0/apr_network_io.h -include/apr-0/apr_optional.h -include/apr-0/apr_optional_hooks.h -include/apr-0/apr_poll.h -include/apr-0/apr_pools.h -include/apr-0/apr_portable.h -include/apr-0/apr_proc_mutex.h -include/apr-0/apr_queue.h -include/apr-0/apr_reslist.h -include/apr-0/apr_ring.h -include/apr-0/apr_rmm.h -include/apr-0/apr_sdbm.h -include/apr-0/apr_sha1.h -include/apr-0/apr_shm.h -include/apr-0/apr_signal.h -include/apr-0/apr_strings.h -include/apr-0/apr_strmatch.h -include/apr-0/apr_support.h -include/apr-0/apr_tables.h -include/apr-0/apr_thread_cond.h -include/apr-0/apr_thread_mutex.h -include/apr-0/apr_thread_proc.h -include/apr-0/apr_thread_rwlock.h -include/apr-0/apr_time.h -include/apr-0/apr_uri.h -include/apr-0/apr_user.h -include/apr-0/apr_uuid.h -include/apr-0/apr_version.h -include/apr-0/apr_want.h -include/apr-0/apr_xlate.h -include/apr-0/apr_xml.h -include/apr-0/apu.h -include/apr-0/apu_compat.h -include/apr-0/apu_version.h -include/apr-0/apu_want.h -include/apr-0/arch/apr_private_common.h -include/apr-0/arch/unix/apr_arch_dso.h -include/apr-0/arch/unix/apr_arch_file_io.h -include/apr-0/arch/unix/apr_arch_global_mutex.h -include/apr-0/arch/unix/apr_arch_inherit.h -include/apr-0/arch/unix/apr_arch_internal_time.h -include/apr-0/arch/unix/apr_arch_misc.h -include/apr-0/arch/unix/apr_arch_networkio.h -include/apr-0/arch/unix/apr_arch_proc_mutex.h -include/apr-0/arch/unix/apr_arch_shm.h -include/apr-0/arch/unix/apr_arch_thread_cond.h -include/apr-0/arch/unix/apr_arch_thread_mutex.h -include/apr-0/arch/unix/apr_arch_thread_rwlock.h -include/apr-0/arch/unix/apr_arch_threadproc.h -include/apr-0/arch/unix/apr_private.h +@comment $NetBSD: PLIST,v 1.8 2007/01/24 19:46:45 epg Exp $ +bin/apr-1-config +include/apr-1/apr.h +include/apr-1/apr_allocator.h +include/apr-1/apr_atomic.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_inherit.h +include/apr-1/apr_lib.h +include/apr-1/apr_mmap.h +include/apr-1/apr_network_io.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_random.h +include/apr-1/apr_ring.h +include/apr-1/apr_shm.h +include/apr-1/apr_signal.h +include/apr-1/apr_strings.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_user.h +include/apr-1/apr_version.h +include/apr-1/apr_want.h lib/apr.exp -lib/aprutil.exp -lib/libapr-0.la -lib/libaprutil-0.la +lib/libapr-1.la +lib/pkgconfig/apr-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-0/arch/unix -@dirrm include/apr-0/arch -@dirrm include/apr-0 +@dirrm include/apr-1 diff --git a/devel/apr/buildlink3.mk b/devel/apr/buildlink3.mk index 3a37f953f0f..ba4682238e9 100644 --- a/devel/apr/buildlink3.mk +++ b/devel/apr/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.28 2006/12/12 21:52:35 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.29 2007/01/24 19:46:45 epg Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ APR_BUILDLINK3_MK:= ${APR_BUILDLINK3_MK}+ @@ -12,36 +12,12 @@ BUILDLINK_PACKAGES+= apr BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}apr .if !empty(APR_BUILDLINK3_MK:M+) -BUILDLINK_API_DEPENDS.apr+= apr>=0.9.5.2.0.51nb1 -BUILDLINK_ABI_DEPENDS.apr+= apr>=0.9.7.2.0.55nb2 +BUILDLINK_API_DEPENDS.apr+= apr>=1.2.8 BUILDLINK_PKGSRCDIR.apr?= ../../devel/apr -WRAPPER_REORDER_CMDS+= reorder:l:aprutil-0:crypt +BUILDLINK_FILES.apr+= bin/apr-1-config +BUILDLINK_FILES.apr+= lib/apr.exp -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/apr/distinfo b/devel/apr/distinfo index 6bd415a2e40..06613e7e6b2 100644 --- a/devel/apr/distinfo +++ b/devel/apr/distinfo @@ -1,14 +1,5 @@ -$NetBSD: distinfo,v 1.19 2006/10/04 21:51:31 rillig Exp $ +$NetBSD: distinfo,v 1.20 2007/01/24 19:46:45 epg Exp $ -SHA1 (httpd-2.0.59.tar.bz2) = 908209cd6e52f700d2a841a25de36e44d469c376 -RMD160 (httpd-2.0.59.tar.bz2) = 78b802354e338798a6978ece8b3568be97542174 -Size (httpd-2.0.59.tar.bz2) = 4743549 bytes -SHA1 (patch-aa) = c84bdb6bcb14bf6bc7ea0d8f13334dd8c3ef2ef9 -SHA1 (patch-an) = 76d9ac0cdddec7c0f41535baee63bf0aa26ed596 -SHA1 (patch-ao) = e35630af53a78fce9aa5347a81cb1bcf8fb3058e -SHA1 (patch-ap) = 357776c7208407936e09891ae87d23b112a12756 -SHA1 (patch-aq) = 6cc1fb879fb5d9280f543ebe068a441e2e6560f3 -SHA1 (patch-ar) = defa2be14ec057e1c41151b8cd1edc0ffb219694 -SHA1 (patch-as) = 37e70ff8b1a3344e47bcd2fe2b145a6e3e6a4562 -SHA1 (patch-at) = 9935c308ba96a8c92dedd3288429a989f9d643f5 -SHA1 (patch-au) = 270a478bdfead4ffe2d069e8441655854fa54e5a +SHA1 (apr-1.2.8.tar.gz) = b8c89bab084d1bae1cb15d7b9d5f40d03dfe2c4a +RMD160 (apr-1.2.8.tar.gz) = 299e1ddb1f7c9b0169a410e120c30abea38557c5 +Size (apr-1.2.8.tar.gz) = 1107189 bytes diff --git a/devel/apr/options.mk b/devel/apr/options.mk deleted file mode 100644 index 092296110fe..00000000000 --- a/devel/apr/options.mk +++ /dev/null @@ -1,20 +0,0 @@ -# $NetBSD: options.mk,v 1.5 2006/05/31 18:22:23 ghen 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/apr/patches/patch-aa b/devel/apr/patches/patch-aa deleted file mode 100644 index 1979d1c9be9..00000000000 --- a/devel/apr/patches/patch-aa +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-aa,v 1.3 2005/09/21 00:01:01 tv 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/apr/patches/patch-an b/devel/apr/patches/patch-an deleted file mode 100644 index 600e57de029..00000000000 --- a/devel/apr/patches/patch-an +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-an,v 1.2 2005/04/25 09:13:02 adam 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/apr/patches/patch-ao b/devel/apr/patches/patch-ao deleted file mode 100644 index 34b61055ca8..00000000000 --- a/devel/apr/patches/patch-ao +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ao,v 1.3 2005/10/17 10:28:46 tron 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/apr/patches/patch-ap b/devel/apr/patches/patch-ap deleted file mode 100644 index fe0d7ee9eb7..00000000000 --- a/devel/apr/patches/patch-ap +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ap,v 1.2 2003/06/06 10:50:00 jmmv Exp $ - ---- apr-util/config.layout.orig Thu Apr 3 17:15:08 2003 -+++ apr-util/config.layout Thu Apr 3 17:14:15 2003 -@@ -229,3 +229,17 @@ - infodir: ${exec_prefix}/share/info - libsuffix -${APRUTIL_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> diff --git a/devel/apr/patches/patch-aq b/devel/apr/patches/patch-aq deleted file mode 100644 index 4fcedf3f764..00000000000 --- a/devel/apr/patches/patch-aq +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-aq,v 1.2 2003/06/06 10:50:00 jmmv 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> diff --git a/devel/apr/patches/patch-ar b/devel/apr/patches/patch-ar deleted file mode 100644 index de2e9382d54..00000000000 --- a/devel/apr/patches/patch-ar +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-ar,v 1.1 2005/09/07 11:39:55 reed Exp $ - ---- apr/network_io/unix/sendrecv.c.orig 2005-07-15 15:11:22.000000000 +0000 -+++ apr/network_io/unix/sendrecv.c -@@ -372,11 +372,13 @@ do_select: - return rv < 0 ? errno : APR_SUCCESS; - } - --#elif defined(__FreeBSD__) -+#elif defined(__FreeBSD__) || defined(__DragonFly__) - - static int include_hdrs_in_length(void) - { --#ifdef HAVE_SYS_SYSCTL_H -+#ifdef __DragonFly__ -+ return(0); -+#elif defined(HAVE_SYS_SYSCTL_H) - /* this assumes: - * if the header exists, so does the sysctlbyname() syscall, and - * if the header doesn't exist, the kernel is really old diff --git a/devel/apr/patches/patch-as b/devel/apr/patches/patch-as deleted file mode 100644 index 1cc5767945a..00000000000 --- a/devel/apr/patches/patch-as +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-as,v 1.1 2005/09/07 11:39:55 reed Exp $ - ---- apr/include/apr_atomic.h.orig 2005-07-15 15:16:55.000000000 +0000 -+++ apr/include/apr_atomic.h -@@ -28,7 +28,7 @@ - /* Platform includes for atomics */ - #if defined(NETWARE) || defined(__MVS__) /* OS/390 */ - #include <stdlib.h> --#elif defined(__FreeBSD__) -+#elif defined(__FreeBSD__) || defined(__DragonFly__) - #include <machine/atomic.h> - #endif - -@@ -159,7 +159,7 @@ inline void *apr_atomic_casptr(void **me - return (void*)atomic_cmpxchg((unsigned long *)mem,(unsigned long)cmp,(unsigned long)with); - } - --#elif defined(__FreeBSD__) -+#elif defined(__FreeBSD__) || defined(__DragonFly__) - - #define apr_atomic_t apr_uint32_t - #define apr_atomic_add(mem, val) (atomic_add_int(mem,val),mem) diff --git a/devel/apr/patches/patch-at b/devel/apr/patches/patch-at deleted file mode 100644 index 19329eb730a..00000000000 --- a/devel/apr/patches/patch-at +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-at,v 1.1 2005/09/07 11:39:55 reed Exp $ - ---- apr/build/apr_hints.m4.orig 2005-07-15 15:19:19.000000000 +0000 -+++ apr/build/apr_hints.m4 -@@ -140,6 +140,12 @@ dnl # Not a problem in 10.20. Ot - # fcntl() lies about O_NONBLOCK on an accept()ed socket (PR kern/26950) - APR_SETIFNULL(ac_cv_o_nonblock_inherited, [yes]) - ;; -+ *-dragonfly*) -+ APR_ADDTO(CFLAGS, [-funsigned-char]) -+ APR_SETIFNULL(enable_threads, [no]) -+ APR_SETIFNULL(apr_lock_method, [USE_FLOCK_SERIALIZE]) -+ APR_ADDTO(CPPFLAGS, [-D_REENTRANT]) -+ ;; - *-freebsd*) - case $host in - *freebsd[2345]*) diff --git a/devel/apr/patches/patch-au b/devel/apr/patches/patch-au deleted file mode 100644 index 376913bae60..00000000000 --- a/devel/apr/patches/patch-au +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-au,v 1.1 2006/10/04 21:51:32 rillig Exp $ - -NetBSD 3.0 does not have pthread_setconcurrency(). - ---- apr/test/testatomic.c.orig 2005-02-04 21:36:31.000000000 +0100 -+++ apr/test/testatomic.c 2006-10-04 22:30:21.000000000 +0200 -@@ -227,7 +227,7 @@ int main(int argc, char**argv) - } - - printf("APR Atomic Test\n===============\n\n"); --#if !(defined WIN32) && !(defined NETWARE) && !(defined __MVS__) && !(defined DARWIN) -+#if !(defined WIN32) && !(defined NETWARE) && !(defined __MVS__) && !(defined DARWIN) && !defined(__NetBSD__) - pthread_setconcurrency(8); - #endif - printf("%-60s", "Initializing the context"); diff --git a/devel/rapidsvn/Makefile b/devel/rapidsvn/Makefile index 5ecaabd6ff0..11e06887e4e 100644 --- a/devel/rapidsvn/Makefile +++ b/devel/rapidsvn/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2007/01/06 15:37:02 rillig Exp $ +# $NetBSD: Makefile,v 1.31 2007/01/24 19:46:45 epg Exp $ DISTNAME= rapidsvn-0.9.4 CATEGORIES= devel x11 @@ -27,7 +27,7 @@ post-install: ${PREFIX}/${PKGMANDIR}/man1 -.include "../../devel/apr/buildlink3.mk" +.include "../../devel/apr0/buildlink3.mk" .include "../../devel/subversion-base/buildlink3.mk" .include "../../x11/wxGTK/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/subversion-base/Makefile b/devel/subversion-base/Makefile index 02585279827..bbe13c22c94 100644 --- a/devel/subversion-base/Makefile +++ b/devel/subversion-base/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.39 2006/11/03 19:34:11 joerg Exp $ +# $NetBSD: Makefile,v 1.40 2007/01/24 19:46:45 epg Exp $ PKGNAME= subversion-base-${SVNVER} COMMENT= Version control system, base programs and libraries @@ -22,7 +22,7 @@ CONFIGURE_ARGS+= --without-apxs BUILDLINK_API_DEPENDS.apr+= apr>=0.9.5 BUILDLINK_API_DEPENDS.neon+= neon>=0.24.7 -.include "../../devel/apr/buildlink3.mk" +.include "../../devel/apr0/buildlink3.mk" .include "../../www/neon/buildlink3.mk" .if !empty(PKG_BUILD_OPTIONS.apr:Mdb4) diff --git a/devel/subversion-base/buildlink3.mk b/devel/subversion-base/buildlink3.mk index 5e651f1c726..bca6e0b7361 100644 --- a/devel/subversion-base/buildlink3.mk +++ b/devel/subversion-base/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.6 2006/12/12 21:52:35 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2007/01/24 19:46:45 epg Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ SUBVERSION_BASE_BUILDLINK3_MK:= ${SUBVERSION_BASE_BUILDLINK3_MK}+ @@ -22,7 +22,7 @@ BUILDLINK_PKGSRCDIR.subversion-base?= ../../devel/subversion-base BUILDLINK_FILES.subversion-base+= bin/svn-config .endif # SUBVERSION_BASE_BUILDLINK3_MK -.include "../../devel/apr/buildlink3.mk" +.include "../../devel/apr0/buildlink3.mk" .include "../../www/neon/buildlink3.mk" BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} |