diff options
| author | Pav Lucistnik <pav@FreeBSD.org> | 2007-03-24 14:04:36 +0000 |
|---|---|---|
| committer | Pav Lucistnik <pav@FreeBSD.org> | 2007-03-24 14:04:36 +0000 |
| commit | 47649f7033a40f88bdbb902b00bb10fde1c82e2a (patch) | |
| tree | c9128f0ea50cfa1c45671f3e7a79326f4cf05185 /net-mgmt/netdisco | |
| parent | - bsd.efl.mk is now in ports/Mk (diff) | |
- WWWDIR is now defined in bsd.ports.mk
PR: ports/105529
Submitted by: laszlof
Notes
Notes:
svn path=/head/; revision=188173
Diffstat (limited to 'net-mgmt/netdisco')
| -rw-r--r-- | net-mgmt/netdisco/Makefile | 22 | ||||
| -rw-r--r-- | net-mgmt/netdisco/files/patch-netdisco_apache.conf | 8 | ||||
| -rw-r--r-- | net-mgmt/netdisco/files/patch-netdisco_apache_dir.conf | 4 |
3 files changed, 15 insertions, 19 deletions
diff --git a/net-mgmt/netdisco/Makefile b/net-mgmt/netdisco/Makefile index 9108e6afa1ee..563a9217d5b5 100644 --- a/net-mgmt/netdisco/Makefile +++ b/net-mgmt/netdisco/Makefile @@ -39,17 +39,13 @@ USE_RC_SUBR= netdisco.sh NO_BUILD= yes -WWWOWN?= www -WWWGRP?= www -WWWDIR?= www/${PORTNAME} -WWWDATADIR= ${PREFIX}/${WWWDIR} RUNDIR?= /var/run DBDIR?= /var/db APACHE_CFG= ${APACHE_CFGDIR}/httpd.conf SUB_FILES= pkg-message pkg-install -SUB_LIST= WWWDIR=${WWWDIR} DBDIR=${DBDIR} -PLIST_SUB= WWWDIR=${WWWDIR} DBDIR=${DBDIR} +SUB_LIST= DBDIR=${DBDIR} +PLIST_SUB= DBDIR=${DBDIR} WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} @@ -83,7 +79,7 @@ pre-install: . endfor cd ${WRKSRC} && \ - ${REINPLACE_CMD} -e 's#%%WWWDATADIR%%#${WWWDATADIR}#g' \ + ${REINPLACE_CMD} -e 's#%%WWWDIR%%#${WWWDIR}#g' \ -e 's#%%PREFIX%%#${PREFIX}#g' \ -e 's#%%DATADIR%%#${DATADIR}#g' \ -e 's#%%RUNDIR%%#${RUNDIR}#g' \ @@ -96,15 +92,15 @@ do-install: cd ${WRKSRC} && ${INSTALL_SCRIPT} ${i} ${PREFIX}/bin . endfor - ${MKDIR} ${WWWDATADIR} - cd ${WRKSRC}/html && ${INSTALL_DATA} autohandler *.* ${WWWDATADIR} + ${MKDIR} ${WWWDIR} + cd ${WRKSRC}/html && ${INSTALL_DATA} autohandler *.* ${WWWDIR} - ${MKDIR} ${WWWDATADIR}/doc - cd ${WRKSRC}/html/doc && ${INSTALL_DATA} *.* ${WWWDATADIR}/doc + ${MKDIR} ${WWWDIR}/doc + cd ${WRKSRC}/html/doc && ${INSTALL_DATA} *.* ${WWWDIR}/doc - ${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDATADIR} + ${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR} - ${MKDIR} ${WWWDATADIR}/mason + ${MKDIR} ${WWWDIR}/mason ${INSTALL_DATA} ${WRKSRC}/netdisco.pm ${SITE_PERL} diff --git a/net-mgmt/netdisco/files/patch-netdisco_apache.conf b/net-mgmt/netdisco/files/patch-netdisco_apache.conf index 816517be41eb..602d1448d9a8 100644 --- a/net-mgmt/netdisco/files/patch-netdisco_apache.conf +++ b/net-mgmt/netdisco/files/patch-netdisco_apache.conf @@ -18,12 +18,12 @@ +%%APACHE2%%PerlModule Apache2::compat +#-------------- + -+<Directory %%WWWDATADIR%%> ++<Directory %%WWWDIR%%> order allow,deny allow from all </Directory> -+<Directory %%WWWDATADIR%%/mason> ++<Directory %%WWWDIR%%/mason> + order allow,deny + deny from all +</Directory> @@ -49,8 +49,8 @@ my $ah = new HTML::Mason::ApacheHandler( - comp_root => '/usr/local/netdisco/html', - data_dir => '/usr/local/netdisco/mason', -+ comp_root => '%%WWWDATADIR%%', -+ data_dir => '%%WWWDATADIR%%/mason', ++ comp_root => '%%WWWDIR%%', ++ data_dir => '%%WWWDIR%%/mason', request_class => 'MasonX::Request::WithApacheSession', session_class => 'Apache::Session::Postgres', +%%APACHE2%% args_method => 'mod_perl', diff --git a/net-mgmt/netdisco/files/patch-netdisco_apache_dir.conf b/net-mgmt/netdisco/files/patch-netdisco_apache_dir.conf index 8426d95bbbce..019a9cb4b826 100644 --- a/net-mgmt/netdisco/files/patch-netdisco_apache_dir.conf +++ b/net-mgmt/netdisco/files/patch-netdisco_apache_dir.conf @@ -6,8 +6,8 @@ -Alias /netdisco "/usr/local/netdisco/html/" -Alias /netdisco/ "/usr/local/netdisco/html/" -+Alias /netdisco "%%WWWDATADIR%%" -+Alias /netdisco/ "%%WWWDATADIR%%" ++Alias /netdisco "%%WWWDIR%%" ++Alias /netdisco/ "%%WWWDIR%%" <Location /netdisco> Options +Indexes |