Make httpd config fragment work for apache-2 too.

Fix PLIST
Add dependancy to p5-Graph, p5-GraphViz isn't enough.
bump PKGREVISION.

4 files changed, 64 insertions, 5 deletions

diff --git a/net/netdisco/Makefile b/net/netdisco/Makefile
index 1c785e1cf63..c211746493b 100644
--- a/net/netdisco/Makefile
+++ b/net/netdisco/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2006/02/05 23:10:27 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2006/03/09 20:25:28 bouyer Exp $
 #
 
 DISTNAME=		netdisco-0.94_with_mibs
 PKGNAME=		netdisco-0.94
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		net
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=netdisco/}
 
@@ -18,6 +18,7 @@ DEPENDS+=		p5-DBD-postgresql-*:../../databases/p5-DBD-postgresql
 DEPENDS+=		p5-DB_File-*:../../databases/p5-DB_File
 DEPENDS+=		p5-MasonX-Request-WithApacheSession-*:../../www/p5-MasonX-Request-WithApacheSession
 DEPENDS+=		p5-HTML-Parser-*:../../www/p5-HTML-Parser
+DEPENDS+=		p5-Graph-*:../../devel/p5-Graph
 DEPENDS+=		p5-GraphViz-*:../../graphics/p5-GraphViz
 DEPENDS+=		p5-Compress-Zlib-*:../../devel/p5-Compress-Zlib
 
@@ -42,7 +43,7 @@ REPLACE_PERL+=  mibs/rm_cisco_dups
 REPLACE_PERL+=  mibs/chk_mibs
 REPLACE_PERL+=  mibs/snmpwalkmib
 
-SUBST_CLASSES+=			installdir path var
+SUBST_CLASSES+=			installdir path var apachevers
 SUBST_STAGE.installdir=		pre-configure
 SUBST_FILES.installdir=		sql/pg_run sql/pg_init sql/pg_back
 SUBST_FILES.installdir+=	bin/netdisco_daemon
@@ -99,6 +100,18 @@ RCD_SCRIPTS=		netdisco
 
 .include "../../mk/apache.mk"
 
+.if ${PKG_APACHE} == "apache13"      
+SUBST_STAGE.apachevers=	pre-configure
+SUBST_FILES.var=	netdisco_apache.conf
+SUBST_SED.var=		-e "s|@APACHE2@|\#uncomment for apache2|g"      
+SUBST_MESSAGE.var=	"Fixing config files for apache-1.3"
+.elif ${PKG_APACHE} == "apache2"     
+SUBST_STAGE.apachevers=	pre-configure
+SUBST_FILES.var=	netdisco_apache.conf
+SUBST_SED.var=		-e "s|@APACHE2@||g"
+SUBST_MESSAGE.var=	"Fixing config files for apache-2"
+.endif
+
 do-build:
 	${RM} -f ${WRKSRC}/html/doc/ChangeLog.txt
 	${RM} -f ${WRKSRC}/Makefile
diff --git a/net/netdisco/PLIST b/net/netdisco/PLIST
index b17274d2596..da0f7b8e214 100644
--- a/net/netdisco/PLIST
+++ b/net/netdisco/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2005/11/03 13:43:39 rillig Exp $
+@comment $NetBSD: PLIST,v 1.3 2006/03/09 20:25:28 bouyer Exp $
 netdisco/bin/catalyst_mac_vlan.pl
 netdisco/bin/debian_install.sh
 netdisco/bin/doc_munge
@@ -994,6 +994,7 @@ share/examples/netdisco/netdisco.conf
 share/examples/netdisco/netdisco.crontab
 share/examples/netdisco/netdisco_apache.conf
 share/examples/netdisco/netdisco_apache_dir.conf
+share/examples/rc.d/netdisco
 @dirrm netdisco/bin
 @dirrm netdisco/sql
 @dirrm netdisco/mibs/rfc
diff --git a/net/netdisco/distinfo b/net/netdisco/distinfo
index cc10a9b47e7..910e54be39a 100644
--- a/net/netdisco/distinfo
+++ b/net/netdisco/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2005/05/27 02:26:00 minskim Exp $
+$NetBSD: distinfo,v 1.3 2006/03/09 20:25:28 bouyer Exp $
 
 SHA1 (netdisco-0.94_with_mibs.tar.gz) = f5179b313aaba4dea88f84d80d1909e65b5ae10d
 RMD160 (netdisco-0.94_with_mibs.tar.gz) = 77c63e99e44926ff3115994ac58c894002164e94
@@ -6,3 +6,4 @@ Size (netdisco-0.94_with_mibs.tar.gz) = 6903970 bytes
 SHA1 (patch-aa) = 8b235fd46284866cc5e2b5f8c682c316900c9b04
 SHA1 (patch-ab) = 935d704459ed85943595d1d4685b4ddeb588a8bc
 SHA1 (patch-ac) = f5b7ab932b096a81c3080d23683c0911a720d5c0
+SHA1 (patch-ad) = 966af8ab75f3df6281b263583369a2962abfef1e
diff --git a/net/netdisco/patches/patch-ad b/net/netdisco/patches/patch-ad
new file mode 100644
index 00000000000..e94c4211531
--- /dev/null
+++ b/net/netdisco/patches/patch-ad
@@ -0,0 +1,44 @@
+$NetBSD: patch-ad,v 1.1 2006/03/09 20:25:28 bouyer Exp $
+
+--- netdisco_apache.conf.orig	2004-03-07 20:13:49.000000000 +0100
++++ netdisco_apache.conf	2006-03-09 16:34:23.000000000 +0100
+@@ -4,8 +4,10 @@
+ 
+ # Pool Database Connections
+ PerlModule Apache::DBI
++@APACHE2@PerlModule CGI
++@APACHE2@PerlModule Apache2::Request
+ 
+-<Directory /usr/local/netdisco/html>
++<Directory /usr/pkg/netdisco/html>
+ 	order allow,deny
+ 	allow from all
+ </Directory>
+@@ -14,12 +16,12 @@
+ # Preload the netdisco module into global server space.
+ #   and parse the config file only once.
+ { package HTML::Mason::Commands;
+-    use lib '/usr/local/netdisco';
++    use lib '/usr/pkg/netdisco';
+     use netdisco qw/:all/;
+-    &netdisco::config('/usr/local/netdisco/netdisco.conf');
++    &netdisco::config('/usr/pkg/netdisco/netdisco.conf');
+ 
+     # Uncomment next two lines to setup switch reverse proxy.
+-    #use lib '/usr/local/netdisco/switch';
++    #use lib '/usr/pkg/netdisco/switch';
+     #use Apache::ProxyRewriteMax;
+ }
+ 
+@@ -30,8 +32,9 @@
+     use strict;
+ 
+     my $ah = new HTML::Mason::ApacheHandler(
+-        comp_root              => '/usr/local/netdisco/html',
+-        data_dir               => '/usr/local/netdisco/mason',
++@APACHE2@        args_method            => 'mod_perl',
++        comp_root              => '/usr/pkg/netdisco/html',
++        data_dir               => '/usr/pkg/netdisco/mason',
+         request_class          => 'MasonX::Request::WithApacheSession',
+         session_class          => 'Apache::Session::Postgres',
+         session_commit         => 1,