[pkgsrc/trunk]: pkgsrc Allow subversion to be built with either apr0 or apr &...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc Allow subversion to be built with either apr0 or apr &...
From: epg <epg%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 04:29:37 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/b6486b2809ea
branches:  trunk
changeset: 524426:b6486b2809ea
user:      epg <epg%pkgsrc.org@localhost>
date:      Thu Jan 25 07:35:30 2007 +0000

description:
Allow subversion to be built with either apr0 or apr & apr-util.

devel/apr0/buildlink3.mk:
    Add apr<1.0 to BUILDLINK_API_DEPENDS.apr .

devel/subversion/Makefile.common:
    Drop --with-apr and --with-apr-util from CONFIGURE_ARGS; these
    have not been needed since the buildlink framework started
    ensuring the PATH is correct.  Drop --with-ssl from
    CONFIGURE_ARGS; this has not been necessary since this stopped
    using the built-in neon.  Include new options.mk .

devel/subversion-base/Makefile:
devel/subversion-base/buildlink3.mk:
    Use devel/apr0 or devel/apr & devel/apr-util if
    PKG_OPTIONS.subversion has the apr1 option.

devel/subversion-base/options.mk:
    Provide apache22 and apr1 options; currently these must be set
    together, so enforce that.

www/ap2-subversion/Makefile:
    Use apache22 if PKG_OPTIONS.subversion has the apache22 option,
    else use apache2.

diffstat:

 devel/apr0/buildlink3.mk            |   4 ++--
 devel/subversion-base/Makefile      |  23 +++++++++++++++++------
 devel/subversion-base/buildlink3.mk |  15 +++++++++++++--
 devel/subversion-base/options.mk    |  12 ++++++++++++
 devel/subversion/Makefile.common    |   9 +++++----
 www/ap2-subversion/Makefile         |  12 ++++++++----
 6 files changed, 57 insertions(+), 18 deletions(-)

diffs (170 lines):

diff -r f31cc57dde17 -r b6486b2809ea devel/apr0/buildlink3.mk
--- a/devel/apr0/buildlink3.mk  Thu Jan 25 07:28:31 2007 +0000
+++ b/devel/apr0/buildlink3.mk  Thu Jan 25 07:35:30 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2007/01/24 19:31:24 epg Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2007/01/25 07:35:30 epg Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 APR_BUILDLINK3_MK:=    ${APR_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@
 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_API_DEPENDS.apr+=    apr>=0.9.5.2.0.51nb1 apr<1.0
 BUILDLINK_ABI_DEPENDS.apr+=    apr>=0.9.7.2.0.55nb2
 BUILDLINK_PKGSRCDIR.apr?=      ../../devel/apr0
 
diff -r f31cc57dde17 -r b6486b2809ea devel/subversion-base/Makefile
--- a/devel/subversion-base/Makefile    Thu Jan 25 07:28:31 2007 +0000
+++ b/devel/subversion-base/Makefile    Thu Jan 25 07:35:30 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2007/01/24 19:46:45 epg Exp $
+# $NetBSD: Makefile,v 1.41 2007/01/25 07:35:30 epg Exp $
 
 PKGNAME=       subversion-base-${SVNVER}
 COMMENT=       Version control system, base programs and libraries
@@ -8,7 +8,13 @@
 
 .include "../../devel/subversion/Makefile.common"
 
-BUILD_DEFS+=           PKG_BUILD_OPTIONS.apr
+.if !empty(PKG_OPTIONS:Mapr1)
+APU_OPTIONS=           PKG_BUILD_OPTIONS.apr-util
+.else
+APU_OPTIONS=           PKG_BUILD_OPTIONS.apr
+.endif
+
+BUILD_DEFS+=           ${APU_OPTIONS}
 
 USE_TOOLS+=            msgfmt
 
@@ -19,13 +25,18 @@
 CONFIGURE_ARGS+=       --without-apache
 CONFIGURE_ARGS+=       --without-apxs
 
-BUILDLINK_API_DEPENDS.apr+=            apr>=0.9.5
-BUILDLINK_API_DEPENDS.neon+=   neon>=0.24.7
+.if !empty(PKG_OPTIONS:Mapr1)
+.  include "../../devel/apr/buildlink3.mk"
+.  include "../../devel/apr-util/buildlink3.mk"
+.else
+BUILDLINK_API_DEPENDS.apr+=    apr>=0.9.5
+.  include "../../devel/apr0/buildlink3.mk"
+.endif
 
-.include "../../devel/apr0/buildlink3.mk"
+BUILDLINK_API_DEPENDS.neon+=   neon>=0.24.7
 .include "../../www/neon/buildlink3.mk"
 
-.if !empty(PKG_BUILD_OPTIONS.apr:Mdb4)
+.if !empty(${APU_OPTIONS}:Mdb4)
 PLIST_SRC=             ${PKGDIR}/PLIST ${PKGDIR}/PLIST.bdb
 .else
 CONFIGURE_ARGS+=       --without-berkeley-db
diff -r f31cc57dde17 -r b6486b2809ea devel/subversion-base/buildlink3.mk
--- a/devel/subversion-base/buildlink3.mk       Thu Jan 25 07:28:31 2007 +0000
+++ b/devel/subversion-base/buildlink3.mk       Thu Jan 25 07:35:30 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2007/01/24 19:46:45 epg Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2007/01/25 07:35:30 epg Exp $
 
 BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH}+
 SUBVERSION_BASE_BUILDLINK3_MK:=        ${SUBVERSION_BASE_BUILDLINK3_MK}+
@@ -20,9 +20,20 @@
 BUILDLINK_PKGSRCDIR.subversion-base?=  ../../devel/subversion-base
 
 BUILDLINK_FILES.subversion-base+=      bin/svn-config
+
+.if !defined(PKG_BUILD_OPTIONS.subversion)
+PKG_BUILD_OPTIONS.subversion!=cd ${BUILDLINK_PKGSRCDIR.subversion-base} && \
+                       ${MAKE} show-var ${MAKEFLAGS} VARNAME=PKG_OPTIONS
+.endif
 .endif # SUBVERSION_BASE_BUILDLINK3_MK
 
-.include "../../devel/apr0/buildlink3.mk"
+.if !empty(PKG_BUILD_OPTIONS.subversion:Mapr1)
+.  include "../../devel/apr/buildlink3.mk"
+.  include "../../devel/apr-util/buildlink3.mk"
+.else
+.  include "../../devel/apr0/buildlink3.mk"
+.endif
+
 .include "../../www/neon/buildlink3.mk"
 
 BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH:S/+$//}
diff -r f31cc57dde17 -r b6486b2809ea devel/subversion-base/options.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/subversion-base/options.mk  Thu Jan 25 07:35:30 2007 +0000
@@ -0,0 +1,12 @@
+# $NetBSD: options.mk,v 1.1 2007/01/25 07:35:30 epg Exp $
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.subversion
+PKG_SUPPORTED_OPTIONS= apache22 apr1
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mapache22)
+PKG_OPTIONS+=          apr1
+.elif !empty(PKG_OPTIONS:Mapr1)
+PKG_OPTIONS+=          apache22
+.endif
diff -r f31cc57dde17 -r b6486b2809ea devel/subversion/Makefile.common
--- a/devel/subversion/Makefile.common  Thu Jan 25 07:28:31 2007 +0000
+++ b/devel/subversion/Makefile.common  Thu Jan 25 07:35:30 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.25 2006/11/08 11:29:14 adam Exp $
+# $NetBSD: Makefile.common,v 1.26 2007/01/25 07:35:30 epg Exp $
 
 DISTNAME=              subversion-${SVNVER}
 CATEGORIES=            devel
@@ -20,10 +20,11 @@
 USE_LIBTOOL=           YES
 USE_PKGLOCALEDIR=      YES
 GNU_CONFIGURE=         YES
-CONFIGURE_ARGS+=       --with-apr=${BUILDLINK_PREFIX.apr}
-CONFIGURE_ARGS+=       --with-apr-util=${BUILDLINK_PREFIX.apr}
+
+.include "../../mk/bsd.prefs.mk"
+.include "../../devel/subversion-base/options.mk"
+
 CONFIGURE_ARGS+=       --with-neon=${BUILDLINK_PREFIX.neon}
-CONFIGURE_ARGS+=       --with-ssl
 # workaround: does not install info file, but does create directory
 CONFIGURE_ARGS+=       --infodir=${PREFIX}/${PKGINFODIR}
 
diff -r f31cc57dde17 -r b6486b2809ea www/ap2-subversion/Makefile
--- a/www/ap2-subversion/Makefile       Thu Jan 25 07:28:31 2007 +0000
+++ b/www/ap2-subversion/Makefile       Thu Jan 25 07:35:30 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2006/12/08 23:34:11 xtraeme Exp $
+# $NetBSD: Makefile,v 1.26 2007/01/25 07:35:30 epg Exp $
 
 PKGNAME=       ap2-subversion-${SVNVER}
 COMMENT=       WebDAV server (Apache module) for Subversion
@@ -9,17 +9,21 @@
 CONFIGURE_ARGS+=       --disable-mod-activation
 
 APACHE_MODULE=         YES
-PKG_APACHE_ACCEPTED=   apache2 apache22
 
 BUILD_TARGET=          apache-mod
 INSTALL_TARGET=                install-mods-shared
 
-BUILDLINK_API_DEPENDS.apache?= apache>=2.0.48
-
 post-patch:
        ${RM} ${WRKSRC}/build-outputs.mk
        ${CP} ${FILESDIR}/build-outputs.mk ${WRKSRC}/build-outputs.mk
 
+.if !empty(PKG_OPTIONS:Mapache22)
+BUILDLINK_API_DEPENDS.apache?= apache>=2.0.48
+PKG_APACHE_ACCEPTED=           apache22
+.else
+PKG_APACHE_ACCEPTED=           apache2
+.endif
+
 .include "../../devel/subversion-base/buildlink3.mk"
 .include "../../mk/apache.mk"
 .include "../../mk/bsd.pkg.mk"
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc Updated editors/emacs to 23.4nb2
Next by Date: [pkgsrc/trunk]: pkgsrc/databases/libgda-mysql Fix typo in CONFIGURE_ARGS, fro...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc Updated editors/emacs to 23.4nb2
Next by Thread: [pkgsrc/trunk]: pkgsrc/databases/libgda-mysql Fix typo in CONFIGURE_ARGS, fro...
Indexes:
Home | Main Index | Thread Index | Old Index