pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/www/ap2-subversion Don't try to check for apache22 opt...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/1fa570f6517f
branches:  trunk
changeset: 539589:1fa570f6517f
user:      gdt <gdt%pkgsrc.org@localhost>
date:      Sat Mar 08 21:00:06 2008 +0000

description:
Don't try to check for apache22 option, but instead just
PKG_APACHE_ACCEPTED=    apache2 apache22
like every other ap2-foo package.

diffstat:

 www/ap2-subversion/Makefile |  9 ++-------
 1 files changed, 2 insertions(+), 7 deletions(-)

diffs (23 lines):

diff -r bdfe2633cc1f -r 1fa570f6517f www/ap2-subversion/Makefile
--- a/www/ap2-subversion/Makefile       Sat Mar 08 20:56:37 2008 +0000
+++ b/www/ap2-subversion/Makefile       Sat Mar 08 21:00:06 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2008/01/18 05:09:47 tnn Exp $
+# $NetBSD: Makefile,v 1.32 2008/03/08 21:00:06 gdt Exp $
 
 PKGNAME=       ${APACHE_PKG_PREFIX}-subversion-${SVNVER}
 PKGREVISION=   1
@@ -18,12 +18,7 @@
        ${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
+PKG_APACHE_ACCEPTED=   apache2 apache22
 
 .include "../../devel/subversion-base/buildlink3.mk"
 .include "../../mk/apache.mk"



Home | Main Index | Thread Index | Old Index