Subject: CVS commit: pkgsrc
From: Eric Gillespie
Date: 2007-01-25 08:35:30
Message id: 20070125073530.9D608211CA@cvs.netbsd.org

Log Message:
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.

Files:
RevisionActionfile
1.2modifypkgsrc/devel/apr0/buildlink3.mk
1.26modifypkgsrc/devel/subversion/Makefile.common
1.41modifypkgsrc/devel/subversion-base/Makefile
1.8modifypkgsrc/devel/subversion-base/buildlink3.mk
1.26modifypkgsrc/www/ap2-subversion/Makefile
1.1addpkgsrc/devel/subversion-base/options.mk