diff options
| author | gdt <gdt@pkgsrc.org> | 2008-03-08 21:20:59 +0000 |
|---|---|---|
| committer | gdt <gdt@pkgsrc.org> | 2008-03-08 21:20:59 +0000 |
| commit | 46b90fd96c85fcf9f0dcc555d5df7de8fce0ec4d (patch) | |
| tree | fc0b0b213a552bdaa724ba6df1c06c3619f3ca26 /devel/subversion | |
| parent | b84384bd99ba939d2c2379de58d85449e30a3d5e (diff) | |
| download | pkgsrc-46b90fd96c85fcf9f0dcc555d5df7de8fce0ec4d.tar.gz | |
Use apache.mk and depend on APACHE_PKG_PREFIX instead of switching on
the apache22 option.
Diffstat (limited to 'devel/subversion')
| -rw-r--r-- | devel/subversion/Makefile | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/devel/subversion/Makefile b/devel/subversion/Makefile index cd7eca0ba8c..097986e8eec 100644 --- a/devel/subversion/Makefile +++ b/devel/subversion/Makefile @@ -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 @@ PKG_DESTDIR_SUPPORT= user-destdir 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 @@ PLIST_SRC= # empty (meta-package) .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: |