[pkgsrc/trunk]: pkgsrc/www/ap2-ruby Apply some changes from ap-ruby:

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6d54678c79ff
branches:  trunk
changeset: 470848:6d54678c79ff
user:      taca <taca%pkgsrc.org@localhost>
date:      Fri Mar 12 10:23:25 2004 +0000

description:
Apply some changes from ap-ruby:

- stop modifying httpd.conf with apxs.
- honor PKG_SYSCONFVAR.

Bump PKGREVISION.

diffstat:

 www/ap2-ruby/Makefile |  18 +++++++++++++-----
 1 files changed, 13 insertions(+), 5 deletions(-)

diffs (50 lines):

diff -r f00615a7fbce -r 6d54678c79ff www/ap2-ruby/Makefile
--- a/www/ap2-ruby/Makefile     Fri Mar 12 10:21:33 2004 +0000
+++ b/www/ap2-ruby/Makefile     Fri Mar 12 10:23:25 2004 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2003/12/03 15:40:02 epg Exp $
+# $NetBSD: Makefile,v 1.3 2004/03/12 10:23:25 taca Exp $
 
 DISTNAME=      mod_ruby-${VERSION}
 PKGNAME=       ap2-${RUBY_PKGNAMEPREFIX}${VERSION}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    www
 MASTER_SITES=  http://www.modruby.net/archive/
 
@@ -13,6 +13,8 @@
 CONFLICTS+=    ap-ruby
 
 USE_BUILDLINK2=        YES
+USE_PKGINSTALL=        YES
+APACHE_MODULE= YES
 DIST_SUBDIR=   ruby
 USE_RUBY=      YES
 RUBY_REQD=     1.6
@@ -26,17 +28,23 @@
 MAKE_FLAGS+= APACHE_INCLUDES='-I${PREFIX}/include/httpd \
                -I${PREFIX}/include/apr-0'
 
+.include "../../mk/bsd.prefs.mk"
+
+PKG_SYSCONFVAR=                apache
+PKG_SYSCONFSUBDIR?=    httpd
+CONF_FILES+=           ${RUBY_EXAMPLESDIR}/mod_ruby/mod_ruby.conf \
+                       ${PKG_SYSCONFDIR}/mod_ruby.conf
+
 post-build:
        ${SED} -e 's|/usr/local/apache/libexec|${LOCALBASE}/lib/httpd|g' \
                ${WRKSRC}/examples/httpd.conf > ${WRKSRC}/examples/mod_ruby.conf
 
 post-install:
-       ${APXS} -i -A -n ruby ${WRKSRC}/mod_ruby.so
+       ${INSTALL_DATA_DIR} ${RUBY_DOCDIR}/mod_ruby
+       ${INSTALL_DATA} ${WRKSRC}/doc/*  ${RUBY_DOCDIR}/mod_ruby
        ${INSTALL_DATA_DIR} ${RUBY_EXAMPLESDIR}/mod_ruby
        ${INSTALL_DATA} ${WRKSRC}/examples/mod_ruby.conf  \
                ${RUBY_EXAMPLESDIR}/mod_ruby
-       ${INSTALL_DATA_DIR} ${RUBY_DOCDIR}/mod_ruby
-       ${INSTALL_DATA} ${WRKSRC}/doc/*  ${RUBY_DOCDIR}/mod_ruby
 
 .include "../../lang/ruby-base/Makefile.common"
 .include "../../lang/ruby-base/buildlink2.mk"