[pkgsrc/trunk]: pkgsrc/devel/subversion Use apache.mk and depend on APACHE_PK...

[gdt <gdt%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3db601b958c7
branches:  trunk
changeset: 539592:3db601b958c7
user:      gdt <gdt%pkgsrc.org@localhost>
date:      Sat Mar 08 21:20:59 2008 +0000

description:
Use apache.mk and depend on APACHE_PKG_PREFIX instead of switching on
the apache22 option.

diffstat:

 devel/subversion/Makefile |  9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

diffs (30 lines):

diff -r 9a9eaec13710 -r 3db601b958c7 devel/subversion/Makefile
--- a/devel/subversion/Makefile Sat Mar 08 21:02:05 2008 +0000
+++ b/devel/subversion/Makefile Sat Mar 08 21:20:59 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2007/10/25 22:00:43 jlam Exp $
+# $NetBSD: Makefile,v 1.33 2008/03/08 21:20:59 gdt Exp $
 
 PKGNAME=       subversion-${SVNVER}
 COMMENT=       Version control system, meta-package
@@ -9,11 +9,7 @@
 
 DEPENDS+=      subversion-base-${SVNVER}{,nb[0-9]*}:../../devel/subversion-base
 DEPENDS+=      p5-subversion-${SVNVER}{,nb[0-9]*}:../../devel/p5-subversion
-.if !empty(PKG_OPTIONS:Mapache22)
-DEPENDS+=      ap22-subversion-${SVNVER}{,nb[0-9]*}:../../www/ap2-subversion
-.else
-DEPENDS+=      ap2-subversion-${SVNVER}{,nb[0-9]*}:../../www/ap2-subversion
-.endif
+DEPENDS+=      ${APACHE_PKG_PREFIX}-subversion-${SVNVER}{,nb[0-9]*}:../../www/ap2-subversion
 DEPENDS+=      ${PYPKGPREFIX}-subversion-${SVNVER}{,nb[0-9]*}:../../devel/py-subversion
 DEPENDS+=      ${RUBY_PKGPREFIX}-subversion-${SVNVER}{,nb[0-9]*}:../../devel/ruby-subversion
 
@@ -28,6 +24,7 @@
 
 .include "../../lang/python/pyversion.mk"
 .include "../../lang/ruby/rubyversion.mk"
+.include "../../mk/apache.mk"
 
 # The NO_PATCH macro is gone so we have to do this to prevent the
 # patches from being applied: