pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/devel/apr0 Import renamed devel/apr (0.9.x) so that ca...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/4b3558f27e11
branches:  trunk
changeset: 524384:4b3558f27e11
user:      epg <epg%pkgsrc.org@localhost>
date:      Wed Jan 24 19:31:24 2007 +0000

description:
Import renamed devel/apr (0.9.x) so that can upgrade to 1.2.x.

diffstat:

 devel/apr0/DESCR            |   3 +
 devel/apr0/Makefile         |  69 +++++++++++++++++++++++++++++++++
 devel/apr0/PLIST            |  93 +++++++++++++++++++++++++++++++++++++++++++++
 devel/apr0/buildlink3.mk    |  47 ++++++++++++++++++++++
 devel/apr0/distinfo         |  14 ++++++
 devel/apr0/options.mk       |  20 +++++++++
 devel/apr0/patches/patch-aa |  22 ++++++++++
 devel/apr0/patches/patch-an |  13 ++++++
 devel/apr0/patches/patch-ao |  13 ++++++
 devel/apr0/patches/patch-ap |  22 ++++++++++
 devel/apr0/patches/patch-aq |  22 ++++++++++
 devel/apr0/patches/patch-ar |  20 +++++++++
 devel/apr0/patches/patch-as |  22 ++++++++++
 devel/apr0/patches/patch-at |  17 ++++++++
 devel/apr0/patches/patch-au |  15 +++++++
 15 files changed, 412 insertions(+), 0 deletions(-)

diffs (truncated from 472 to 300 lines):

diff -r f4f739cd5bc8 -r 4b3558f27e11 devel/apr0/DESCR
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/apr0/DESCR  Wed Jan 24 19:31:24 2007 +0000
@@ -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 -r f4f739cd5bc8 -r 4b3558f27e11 devel/apr0/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/apr0/Makefile       Wed Jan 24 19:31:24 2007 +0000
@@ -0,0 +1,69 @@
+# $NetBSD: Makefile,v 1.1.1.1 2007/01/24 19:31:24 epg Exp $
+
+.include "../../www/apache2/Makefile.common"
+
+PKGNAME=       apr-${APR_VERSION}.${APACHE_VERSION}
+PKGREVISION=   2
+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
+
+PKG_INSTALLATION_TYPES=        overwrite pkgviews
+
+WRKSRC=                        ${WRKDIR}/${DISTNAME}/srclib
+BUILD_DIRS=            apr apr-util
+
+USE_LIBTOOL=           yes
+GNU_CONFIGURE=         yes
+CONFIGURE_ENV+=                LIBS=${LIBS:M*:Q}
+LIBS.SunOS+=           -lnsl
+
+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-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"
+
+.include "../../mk/bsd.pkg.mk"
diff -r f4f739cd5bc8 -r 4b3558f27e11 devel/apr0/PLIST
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/apr0/PLIST  Wed Jan 24 19:31:24 2007 +0000
@@ -0,0 +1,93 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2007/01/24 19:31:24 epg 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
+lib/apr.exp
+lib/aprutil.exp
+lib/libapr-0.la
+lib/libaprutil-0.la
+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
diff -r f4f739cd5bc8 -r 4b3558f27e11 devel/apr0/buildlink3.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/apr0/buildlink3.mk  Wed Jan 24 19:31:24 2007 +0000
@@ -0,0 +1,47 @@
+# $NetBSD: buildlink3.mk,v 1.1.1.1 2007/01/24 19:31:24 epg 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>=0.9.5.2.0.51nb1
+BUILDLINK_ABI_DEPENDS.apr+=    apr>=0.9.7.2.0.55nb2
+BUILDLINK_PKGSRCDIR.apr?=      ../../devel/apr0
+
+WRAPPER_REORDER_CMDS+= reorder:l:aprutil-0: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 -r f4f739cd5bc8 -r 4b3558f27e11 devel/apr0/distinfo
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/apr0/distinfo       Wed Jan 24 19:31:24 2007 +0000
@@ -0,0 +1,14 @@
+$NetBSD: distinfo,v 1.1.1.1 2007/01/24 19:31:24 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
diff -r f4f739cd5bc8 -r 4b3558f27e11 devel/apr0/options.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/apr0/options.mk     Wed Jan 24 19:31:24 2007 +0000
@@ -0,0 +1,20 @@
+# $NetBSD: options.mk,v 1.1.1.1 2007/01/24 19:31:24 epg 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 -r f4f739cd5bc8 -r 4b3558f27e11 devel/apr0/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/apr0/patches/patch-aa       Wed Jan 24 19:31:24 2007 +0000
@@ -0,0 +1,22 @@
+$NetBSD: patch-aa,v 1.1.1.1 2007/01/24 19:31:24 epg 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 -r f4f739cd5bc8 -r 4b3558f27e11 devel/apr0/patches/patch-an
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/apr0/patches/patch-an       Wed Jan 24 19:31:24 2007 +0000
@@ -0,0 +1,13 @@



Home | Main Index | Thread Index | Old Index