pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/www/ap-ruby Remove logic to pass the right apr include...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/bbc68c090adc
branches:  trunk
changeset: 529277:bbc68c090adc
user:      schmonz <schmonz%pkgsrc.org@localhost>
date:      Tue May 29 22:41:46 2007 +0000

description:
Remove logic to pass the right apr includes to configure based on
Apache version. The apr buildlink3.mk files take care of this now.

diffstat:

 www/ap-ruby/Makefile |  13 ++-----------
 1 files changed, 2 insertions(+), 11 deletions(-)

diffs (32 lines):

diff -r 1499c0faeb84 -r bbc68c090adc www/ap-ruby/Makefile
--- a/www/ap-ruby/Makefile      Tue May 29 22:39:17 2007 +0000
+++ b/www/ap-ruby/Makefile      Tue May 29 22:41:46 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2007/03/24 09:37:33 taca Exp $
+# $NetBSD: Makefile,v 1.32 2007/05/29 22:41:46 schmonz Exp $
 #
 
 DISTNAME=      mod_ruby-${VERSION}
@@ -31,16 +31,6 @@
 CONF_FILES+=           ${RUBY_EXAMPLESDIR}/mod_ruby/mod_ruby.conf \
                        ${PKG_SYSCONFDIR}/mod_ruby.conf
 
-.include "../../mk/apache.mk"
-
-.if empty(PKG_APACHE:Mapache13)
-.if empty(PKG_APACHE:Mapache22)
-CONFIGURE_ARGS+=       --with-apr-includes=${PREFIX}/include/apr-0
-.else
-CONFIGURE_ARGS+=       --with-apr-includes=${PREFIX}/include/apr-1
-.endif
-.endif
-
 post-build:
        cd ${WRKSRC}/doc; ${MAKE}
        ${SED} -e 's|/usr/local/apache/libexec|${LOCALBASE}/lib/httpd|g' \
@@ -60,4 +50,5 @@
 .include "../../lang/ruby/modules.mk"
 .include "../../textproc/ruby-eruby/buildlink3.mk"
 .include "../../textproc/ruby-rdtool/buildlink3.mk"
+.include "../../mk/apache.mk"
 .include "../../mk/bsd.pkg.mk"



Home | Main Index | Thread Index | Old Index