pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc devel/apr:
details: https://anonhg.NetBSD.org/pkgsrc/rev/bf34b9a1c899
branches: trunk
changeset: 524403:bf34b9a1c899
user: epg <epg%pkgsrc.org@localhost>
date: Wed Jan 24 19:46:45 2007 +0000
description:
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:
devel/apr/Makefile | 64 +++------------
devel/apr/PLIST | 127 ++++++++++----------------------
devel/apr/buildlink3.mk | 32 +-------
devel/apr/distinfo | 17 +---
devel/apr/options.mk | 20 -----
devel/apr/patches/patch-aa | 22 -----
devel/apr/patches/patch-an | 13 ---
devel/apr/patches/patch-ao | 13 ---
devel/apr/patches/patch-ap | 22 -----
devel/apr/patches/patch-aq | 22 -----
devel/apr/patches/patch-ar | 20 -----
devel/apr/patches/patch-as | 22 -----
devel/apr/patches/patch-at | 17 ----
devel/apr/patches/patch-au | 15 ---
devel/rapidsvn/Makefile | 4 +-
devel/subversion-base/Makefile | 4 +-
devel/subversion-base/buildlink3.mk | 4 +-
parallel/ganglia-monitor-core/Makefile | 4 +-
security/hydra/options.mk | 4 +-
www/apache2/Makefile | 4 +-
www/apache2/buildlink3.mk | 4 +-
www/apache22/Makefile | 9 +-
www/apache22/Makefile.common | 6 +-
www/apache22/buildlink3.mk | 5 +-
24 files changed, 88 insertions(+), 386 deletions(-)
diffs (truncated from 720 to 300 lines):
diff -r 1562598015a3 -r bf34b9a1c899 devel/apr/Makefile
--- a/devel/apr/Makefile Wed Jan 24 19:45:54 2007 +0000
+++ b/devel/apr/Makefile Wed Jan 24 19:46:45 2007 +0000
@@ -1,69 +1,35 @@
-# $NetBSD: Makefile,v 1.49 2006/12/09 00:52:23 xtraeme Exp $
-
-.include "../../www/apache2/Makefile.common"
+# $NetBSD: Makefile,v 1.50 2007/01/24 19:46:45 epg Exp $
+#
-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@localhost
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
+USE_TOOLS+= pkg-config
-USE_LIBTOOL= yes
-GNU_CONFIGURE= yes
+PKGCONFIG_OVERRIDE+= apr.pc.in
+
+CONFIGURE_ARGS+= \
+ --with-devrandom=/dev/urandom \
+ --with-installbuilddir=${PREFIX}/libexec/apr
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"
+ ${INSTALL_SCRIPT} ${PKG_LIBTOOL} \
+ ${DESTDIR}${PREFIX}/libexec/apr/libtool
.include "../../mk/bsd.pkg.mk"
diff -r 1562598015a3 -r bf34b9a1c899 devel/apr/PLIST
--- a/devel/apr/PLIST Wed Jan 24 19:45:54 2007 +0000
+++ b/devel/apr/PLIST Wed Jan 24 19:46:45 2007 +0000
@@ -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 -r 1562598015a3 -r bf34b9a1c899 devel/apr/buildlink3.mk
--- a/devel/apr/buildlink3.mk Wed Jan 24 19:45:54 2007 +0000
+++ b/devel/apr/buildlink3.mk Wed Jan 24 19:46:45 2007 +0000
@@ -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_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-config
-BUILDLINK_FILES.apr+= bin/apu-config
-BUILDLINK_FILES.apr+= lib/*.exp
+BUILDLINK_FILES.apr+= bin/apr-1-config
+BUILDLINK_FILES.apr+= lib/apr.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 1562598015a3 -r bf34b9a1c899 devel/apr/distinfo
--- a/devel/apr/distinfo Wed Jan 24 19:45:54 2007 +0000
+++ b/devel/apr/distinfo Wed Jan 24 19:46:45 2007 +0000
@@ -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 -r 1562598015a3 -r bf34b9a1c899 devel/apr/options.mk
--- a/devel/apr/options.mk Wed Jan 24 19:45:54 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
Home |
Main Index |
Thread Index |
Old Index