Module Name:	pkgsrc
Committed By:	epg
Date:		Thu Jan 25 07:35:30 UTC 2007

Modified Files:
	pkgsrc/devel/apr0: buildlink3.mk
	pkgsrc/devel/subversion: Makefile.common
	pkgsrc/devel/subversion-base: Makefile buildlink3.mk
	pkgsrc/www/ap2-subversion: Makefile
Added Files:
	pkgsrc/devel/subversion-base: options.mk

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.


To generate a diff of this commit:
cvs rdiff -r1.1.1.1 -r1.2 pkgsrc/devel/apr0/buildlink3.mk
cvs rdiff -r1.25 -r1.26 pkgsrc/devel/subversion/Makefile.common
cvs rdiff -r1.40 -r1.41 pkgsrc/devel/subversion-base/Makefile
cvs rdiff -r1.7 -r1.8 pkgsrc/devel/subversion-base/buildlink3.mk
cvs rdiff -r0 -r1.1 pkgsrc/devel/subversion-base/options.mk
cvs rdiff -r1.25 -r1.26 pkgsrc/www/ap2-subversion/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.