Fix build as a user.

Bump PORTREVISION because I think the package changed a bit.

Sponsored by:	Absolight

7 files changed, 43 insertions, 24 deletions

diff --git a/net-mgmt/netdot/Makefile b/net-mgmt/netdot/Makefile
index 71b750d0c7fb..ea7d9f8ec1c8 100644
--- a/net-mgmt/netdot/Makefile
+++ b/net-mgmt/netdot/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	netdot
 PORTVERSION=	1.0.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://netdot.uoregon.edu/pub/dists/
 
diff --git a/net-mgmt/netdot/files/patch-Makefile b/net-mgmt/netdot/files/patch-Makefile
new file mode 100644
index 000000000000..d83b46541104
--- /dev/null
+++ b/net-mgmt/netdot/files/patch-Makefile
@@ -0,0 +1,11 @@
+--- Makefile.orig	2014-12-08 20:24:38 UTC
++++ Makefile
+@@ -96,8 +96,6 @@ dir:
+ 	       mkdir -m $(DMOD) -p $(STAGEDIR)/$$dir ; \
+ 	    fi ; \
+ 	done
+-	chown -R $(APACHEUSER):$(APACHEGROUP) $(STAGEDIR)/tmp
+-	chmod 750 $(STAGEDIR)/tmp
+ 
+ htdocs:
+ 	cd $@ ; $(MAKE) all DIR=$@ 
diff --git a/net-mgmt/netdot/files/patch-etc-netdot_apache2_local.conf b/net-mgmt/netdot/files/patch-etc-netdot_apache2_local.conf
index ed9ee147fc02..76ca3bc34e9e 100644
--- a/net-mgmt/netdot/files/patch-etc-netdot_apache2_local.conf
+++ b/net-mgmt/netdot/files/patch-etc-netdot_apache2_local.conf
@@ -8,5 +8,5 @@
 +LoadModule perl_module	libexec/apache22/mod_perl.so
 +LoadModule apreq_module	libexec/apache22/mod_apreq2.so
  
- <Perl>
- use lib qw( <<Make:PREFIX>>/lib );
+ # Add Netdot's libraries to @INC
+ PerlSwitches -I<<Make:PREFIX>>/lib
diff --git a/net-mgmt/netdot/files/patch-Default.conf b/net-mgmt/netdot/files/patch-etc_Default.conf
index 6b922fd994ee..8d4f106a36c0 100644
--- a/net-mgmt/netdot/files/patch-Default.conf
+++ b/net-mgmt/netdot/files/patch-etc_Default.conf
@@ -9,9 +9,7 @@
  
  # Set DB_DBA to the name of a DB user with permission to create new databases 
  # Set DB_DBA_PASSWORD to that user's password (if you don't, you'll be prompted
---- etc/Default.conf.orig	2012-10-07 14:34:43.000000000 +0100
-+++ etc/Default.conf	2012-10-07 14:35:27.000000000 +0100
-@@ -213,7 +213,7 @@
+@@ -221,7 +221,7 @@ SNMP_QUERY_TIMEOUT       =>  90,      # 
  # Netdot shares a set of workable MIBs with the Netdisco project.
  # The following variable specifies where the netdisco MIBs were installed in
  # this system.
diff --git a/net-mgmt/netdot/files/patch-htdocs_Makefile b/net-mgmt/netdot/files/patch-htdocs_Makefile
new file mode 100644
index 000000000000..6714b4190d0c
--- /dev/null
+++ b/net-mgmt/netdot/files/patch-htdocs_Makefile
@@ -0,0 +1,21 @@
+--- htdocs/Makefile.orig	2014-12-14 15:02:04.000000000 +0000
++++ htdocs/Makefile	2014-12-14 15:02:12.000000000 +0000
+@@ -9,7 +9,7 @@
+ 
+ all: wipedir dir
+ 	$(substitute)
+-	ln -s $(STAGEDIR)/doc/manual/netdot-manual.htm  $(STAGEDIR)/$(DIR)/help/manual.html
++	ln -s $(PREFIX)/doc/manual/netdot-manual.htm  $(STAGEDIR)/$(DIR)/help/manual.html
+ 
+ # Wipe out dir before installing
+ wipedir:
+@@ -21,9 +21,3 @@ dir:
+ 
+ 	@echo "Hacking together mason permissions fix..."
+ 	touch $(STAGEDIR)/$(DIR)/masondata/obj/.__obj_create_marker
+-	chown -R $(APACHEUSER):$(APACHEGROUP) $(STAGEDIR)/$(DIR)/masondata
+-	chmod 0755 $(STAGEDIR)/$(DIR)/masondata
+-# Graphs can be updated dynamically so apache needs +w
+-	chown $(APACHEUSER):$(APACHEGROUP) $(STAGEDIR)/$(DIR)/img/graphs
+-	chmod 0750 $(STAGEDIR)/$(DIR)/img/graphs
+-
diff --git a/net-mgmt/netdot/files/patch-stagedir b/net-mgmt/netdot/files/patch-stagedir
deleted file mode 100644
index cc36ffbfe2c4..000000000000
--- a/net-mgmt/netdot/files/patch-stagedir
+++ /dev/null
@@ -1,11 +0,0 @@
---- htdocs/Makefile.orig	2014-12-14 15:02:04.000000000 +0000
-+++ htdocs/Makefile	2014-12-14 15:02:12.000000000 +0000
-@@ -9,7 +9,7 @@
- 
- all: wipedir dir
- 	$(substitute)
--	ln -s $(STAGEDIR)/doc/manual/netdot-manual.htm  $(STAGEDIR)/$(DIR)/help/manual.html
-+	ln -s $(PREFIX)/doc/manual/netdot-manual.htm  $(STAGEDIR)/$(DIR)/help/manual.html
- 
- # Wipe out dir before installing
- wipedir:
diff --git a/net-mgmt/netdot/pkg-plist b/net-mgmt/netdot/pkg-plist
index a82b48d82c79..1abeb2081d90 100644
--- a/net-mgmt/netdot/pkg-plist
+++ b/net-mgmt/netdot/pkg-plist
@@ -328,7 +328,7 @@
 @dir %%WWWDIR%%/htdocs/css
 @dir %%WWWDIR%%/htdocs/generic
 @dir %%WWWDIR%%/htdocs/help
-@dir %%WWWDIR%%/htdocs/img/graphs
+@dir(www,www,750) %%WWWDIR%%/htdocs/img/graphs
 @dir %%WWWDIR%%/htdocs/img
 @dir %%WWWDIR%%/htdocs/java_script
 @dir %%WWWDIR%%/htdocs/management
@@ -363,15 +363,15 @@
 @dir %%WWWDIR%%/export/dhcpd
 @dir %%WWWDIR%%/export/smokeping
 @dir %%WWWDIR%%/export
-@dir %%WWWDIR%%/htdocs/masondata/obj
+@dir(www,www,) %%WWWDIR%%/htdocs/masondata/obj
 @unexec rm -rf %D/%%WWWDIR%%/htdocs/masondata/obj 2> /dev/null || true
-@dir %%WWWDIR%%/htdocs/masondata/cache
-@dir %%WWWDIR%%/htdocs/masondata
+@dir(www,www,) %%WWWDIR%%/htdocs/masondata/cache
+@dir(www,www,) %%WWWDIR%%/htdocs/masondata
 @dir %%WWWDIR%%/htdocs
-@dir %%WWWDIR%%/tmp/sessions/locks
-@dir %%WWWDIR%%/tmp/sessions
+@dir(www,www,) %%WWWDIR%%/tmp/sessions/locks
+@dir(www,www,) %%WWWDIR%%/tmp/sessions
 @unexec rm -rf %D/%%WWWDIR%%/tmp/sessions 2> /dev/null || true
-@dir %%WWWDIR%%/tmp
+@dir(www,www,750) %%WWWDIR%%/tmp
 @dir %%WWWDIR%%/upgrade
 @dir %%WWWDIR%%/var
 @dir %%WWWDIR%%