svn commit: r376985 - in head/net-mgmt/netdot: . files
Kurt Jaeger
pi at FreeBSD.org
Tue Jan 13 20:44:46 UTC 2015
Author: pi
Date: Tue Jan 13 20:44:44 2015
New Revision: 376985
URL: https://svnweb.freebsd.org/changeset/ports/376985
QAT: https://qat.redports.org/buildarchive/r376985/
Log:
net-mgmt/netdot: 1.0.6 -> 1.0.7
Changes:
https://osl.uoregon.edu/redmine/projects/netdot/activity
- Works with Apache 2.4
PR: 195968
Submitted by: Nick Hilliard <nick at foobar.org> (maintainer)
Modified:
head/net-mgmt/netdot/Makefile
head/net-mgmt/netdot/distinfo
head/net-mgmt/netdot/files/patch-stagedir
head/net-mgmt/netdot/files/pkg-message.in
head/net-mgmt/netdot/pkg-plist
Modified: head/net-mgmt/netdot/Makefile
==============================================================================
--- head/net-mgmt/netdot/Makefile Tue Jan 13 20:23:58 2015 (r376984)
+++ head/net-mgmt/netdot/Makefile Tue Jan 13 20:44:44 2015 (r376985)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= netdot
-PORTVERSION= 1.0.6
+PORTVERSION= 1.0.7
CATEGORIES= net-mgmt
MASTER_SITES= http://netdot.uoregon.edu/pub/dists/
@@ -12,6 +12,7 @@ COMMENT= Open source tool to organize an
LICENSE= GPLv2
RUN_DEPENDS= p5-libapreq2>=0:${PORTSDIR}/www/p5-libapreq2 \
+ mp2bug:${PORTSDIR}/www/mod_perl2 \
p5-Apache-Session>=1.6:${PORTSDIR}/www/p5-Apache-Session \
p5-Apache-AuthCookie>=0:${PORTSDIR}/www/p5-Apache-AuthCookie \
p5-Apache2-SiteControl>=1.0:${PORTSDIR}/www/p5-Apache2-SiteControl \
Modified: head/net-mgmt/netdot/distinfo
==============================================================================
--- head/net-mgmt/netdot/distinfo Tue Jan 13 20:23:58 2015 (r376984)
+++ head/net-mgmt/netdot/distinfo Tue Jan 13 20:44:44 2015 (r376985)
@@ -1,2 +1,2 @@
-SHA256 (netdot-1.0.6.tar.gz) = 0b1d98f8bf2a92901a290cf6689880fe9e98790bb54d95e7747d67b92783501e
-SIZE (netdot-1.0.6.tar.gz) = 2208181
+SHA256 (netdot-1.0.7.tar.gz) = f8fe9804973d09f953dd520795312d5ef2b595151fadd595a1fec2758d99d79c
+SIZE (netdot-1.0.7.tar.gz) = 2216634
Modified: head/net-mgmt/netdot/files/patch-stagedir
==============================================================================
--- head/net-mgmt/netdot/files/patch-stagedir Tue Jan 13 20:23:58 2015 (r376984)
+++ head/net-mgmt/netdot/files/patch-stagedir Tue Jan 13 20:44:44 2015 (r376985)
@@ -1,158 +1,11 @@
-diff -bur Makefile.orig Makefile
---- Makefile.orig 2013-12-19 15:09:48.000000000 +0000
-+++ Makefile 2014-06-29 16:27:32.000000000 +0100
-@@ -7,7 +7,8 @@
- # Netdot Makefile
- #
- PERL ?= /usr/bin/perl
--PREFIX ?= /usr/local/netdot
-+PREFIX ?= /usr/local/www/netdot
-+STAGEDIR ?= $(PREFIX)
- APACHEUSER ?= apache
- APACHEGROUP ?= apache
- MAKE ?= make
-@@ -23,6 +24,7 @@
- @echo
- @echo " PERL = $(PERL)"
- @echo " PREFIX = $(PREFIX)"
-+ @echo " STAGEDIR = $(STAGEDIR)"
- @echo " APACHEUSER = $(APACHEUSER)"
- @echo " APACHEGROUP = $(APACHEGROUP)"
- @echo " MAKE = $(MAKE)"
-@@ -88,14 +90,14 @@
- @echo "Creating necessary directories..."
- echo $(PREFIX) > ./.prefix
- for dir in $(DIR); do \
-- if test -d $(PREFIX)/$$dir; then \
-- echo "Skipping dir $(PREFIX)/$$dir; already exists"; \
-+ if test -d $(STAGEDIR)/$$dir; then \
-+ echo "Skipping dir $(STAGEDIR)/$$dir; already exists"; \
- else \
-- mkdir -m $(DMOD) -p $(PREFIX)/$$dir ; \
-+ mkdir -m $(DMOD) -p $(STAGEDIR)/$$dir ; \
- fi ; \
- done
-- chown -R $(APACHEUSER):$(APACHEGROUP) $(PREFIX)/tmp
-- chmod 750 $(PREFIX)/tmp
-+ chown -R $(APACHEUSER):$(APACHEGROUP) $(STAGEDIR)/tmp
-+ chmod 750 $(STAGEDIR)/tmp
-
- htdocs:
- cd $@ ; $(MAKE) all DIR=$@
-diff -bur doc/Makefile.orig doc/Makefile
---- doc/Makefile.orig 2011-09-23 16:00:36.000000000 +0100
-+++ doc/Makefile 2014-06-29 16:32:27.000000000 +0100
-@@ -11,8 +11,8 @@
- $(substitute)
-
- for dir in $(NDIR); do \
-- chown $(APACHEUSER):$(APACHEGROUP) $(PREFIX)/$(DIR)/$$dir; \
-- chmod 0755 $(PREFIX)/$(DIR)/$$dir; \
-+ chown $(APACHEUSER):$(APACHEGROUP) $(STAGEDIR)/$(DIR)/$$dir; \
-+ chmod 0755 $(STAGEDIR)/$(DIR)/$$dir; \
- done
-
- # This section creates the doc/ subdirs
-diff -bur etc/utility-Makefile.orig etc/utility-Makefile
---- etc/utility-Makefile.orig 2012-07-13 19:17:17.000000000 +0100
-+++ etc/utility-Makefile 2014-06-29 16:37:23.000000000 +0100
-@@ -17,6 +17,7 @@
-
- # Defaults
- REPLACE_PREFIX = $(PREFIX)
-+REPLACE_STAGEDIR=$(STAGEDIR)
- REPLACE_LIB = $(REPLACE_PREFIX)/lib
- REPLACE_ETC = $(REPLACE_PREFIX)/etc
- REPLACE_PERL = $(PERL)
-@@ -41,7 +42,7 @@
- for file in $(FILES); do\
- $(SED) -r $(REPLACEMENT_EXPRESSIONS) $$file\
- > $$file.tmp;\
-- install -m $(FMOD) $$file.tmp $(PREFIX)/$(DIR)/$$file;\
-+ install -m $(FMOD) $$file.tmp $(STAGEDIR)/$(DIR)/$$file;\
- rm -rf $$file.tmp;\
- done
- @echo "Done."
-@@ -51,10 +52,10 @@
- define mkdirs
- @echo "Creating necessary directories..."
- for dir in $(NDIR); do \
-- if test -d $(PREFIX)/$(DIR)/$$dir; then \
-- echo "Skipping dir $(PREFIX)/$(DIR)/$$dir; already exists"; \
-+ if test -d $(STAGEDIR)/$(DIR)/$$dir; then \
-+ echo "Skipping dir $(STAGEDIR)/$(DIR)/$$dir; already exists"; \
- else \
-- mkdir -m $(DMOD) -p $(PREFIX)/$(DIR)/$$dir ; \
-+ mkdir -m $(DMOD) -p $(STAGEDIR)/$(DIR)/$$dir ; \
- fi ; \
- done
- @echo "Done."
-@@ -64,6 +65,6 @@
- # left hanging around
- define wipedir
- @echo "Wiping out directory before installing"
--rm -fr $(PREFIX)/$(DIR)
-+rm -fr $(STAGEDIR)/$(DIR)
- @echo "done"
- endef
-diff -bur export/Makefile.orig export/Makefile
---- export/Makefile.orig 2012-07-13 19:17:17.000000000 +0100
-+++ export/Makefile 2014-06-29 16:32:47.000000000 +0100
-@@ -11,8 +11,8 @@
- $(substitute)
-
- for dir in $(NDIR); do \
-- chown $(APACHEUSER):$(APACHEGROUP) $(PREFIX)/$(DIR)/$$dir; \
-- chmod 0755 $(PREFIX)/$(DIR)/$$dir; \
-+ chown $(APACHEUSER):$(APACHEGROUP) $(STAGEDIR)/$(DIR)/$$dir; \
-+ chmod 0755 $(STAGEDIR)/$(DIR)/$$dir; \
- done
-
- # This section creates the export/ subdirs
-diff -bur htdocs/Makefile.orig htdocs/Makefile
---- htdocs/Makefile.orig 2012-07-13 19:17:17.000000000 +0100
-+++ htdocs/Makefile 2014-06-29 16:33:00.000000000 +0100
+--- 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 $(PREFIX)/doc/manual/netdot-manual.htm $(PREFIX)/$(DIR)/help/manual.html
+- 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:
-@@ -20,10 +20,10 @@
- $(mkdirs)
-
- @echo "Hacking together mason permissions fix..."
-- touch $(PREFIX)/$(DIR)/masondata/obj/.__obj_create_marker
-- chown -R $(APACHEUSER):$(APACHEGROUP) $(PREFIX)/$(DIR)/masondata
-- chmod 0755 $(PREFIX)/$(DIR)/masondata
-+ 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) $(PREFIX)/$(DIR)/img/graphs
-- chmod 0750 $(PREFIX)/$(DIR)/img/graphs
-+ chown $(APACHEUSER):$(APACHEGROUP) $(STAGEDIR)/$(DIR)/img/graphs
-+ chmod 0750 $(STAGEDIR)/$(DIR)/img/graphs
-
-diff -bur var/Makefile.orig var/Makefile
---- var/Makefile.orig 2011-09-23 16:00:38.000000000 +0100
-+++ var/Makefile 2014-06-29 16:34:01.000000000 +0100
-@@ -13,7 +13,7 @@
- POLLSTATSRRD = pollstats.rrd
-
- all:
-- if ! test -r $(PREFIX)/$(DIR)/$(POLLSTATSRRD); then \
-+ if ! test -r $(STAGEDIR)/$(DIR)/$(POLLSTATSRRD); then \
- rrdtool create $(POLLSTATSRRD) -s 3600 \
- DS:ips:GAUGE:7200:0:4294967296 \
- DS:macs:GAUGE:7200:0:4294967296 \
-@@ -24,5 +24,5 @@
- RRA:AVERAGE:0.5:24:365 \
- RRA:MAX:0.5:24:30 \
- RRA:MIN:0.5:24:30; \
-- install -m $(FMOD) $(POLLSTATSRRD) $(PREFIX)/$(DIR)/$(POLLSTATSRRD); \
-+ install -m $(FMOD) $(POLLSTATSRRD) $(STAGEDIR)/$(DIR)/$(POLLSTATSRRD); \
- fi;
Modified: head/net-mgmt/netdot/files/pkg-message.in
==============================================================================
--- head/net-mgmt/netdot/files/pkg-message.in Tue Jan 13 20:23:58 2015 (r376984)
+++ head/net-mgmt/netdot/files/pkg-message.in Tue Jan 13 20:44:44 2015 (r376985)
@@ -28,5 +28,11 @@ what should be added to your server's cr
%%WWWDIR%%/etc/netdot_apache2_local.conf
%%WWWDIR%%/etc/netdot_apache2_ldap.conf
+6. Running Apache 2.4? Make sure that both the mod_perl and mod_apreq2 have
+been added to httpd.conf:
+
+LoadModule perl_module libexec/apache24/mod_perl.so
+LoadModule apreq_module libexec/apache24/mod_apreq2.so
+
Note that any changes to Site.conf require an apache reload.
###############################################################################
Modified: head/net-mgmt/netdot/pkg-plist
==============================================================================
--- head/net-mgmt/netdot/pkg-plist Tue Jan 13 20:23:58 2015 (r376984)
+++ head/net-mgmt/netdot/pkg-plist Tue Jan 13 20:44:44 2015 (r376985)
@@ -28,6 +28,7 @@
%%WWWDIR%%/etc/default_data
%%WWWDIR%%/etc/netdot.cron
%%WWWDIR%%/etc/netdot.meta
+%%WWWDIR%%/etc/netdot_apache24_local.conf
%%WWWDIR%%/etc/netdot_apache2_ldap.conf
%%WWWDIR%%/etc/netdot_apache2_local.conf
%%WWWDIR%%/etc/netdot_apache2_radius.conf
@@ -202,6 +203,7 @@
%%WWWDIR%%/htdocs/rest/host
%%WWWDIR%%/htdocs/rest/host_contacts
%%WWWDIR%%/htdocs/rest/index.html
+%%WWWDIR%%/htdocs/rest/updatedev
%%WWWDIR%%/htdocs/user_help/autohandler
%%WWWDIR%%/htdocs/user_help/dhandler
%%WWWDIR%%/htdocs/user_help/hosts.html
@@ -319,58 +321,58 @@
%%WWWDIR%%/upgrade/updatedb
%%WWWDIR%%/upgrade/upgrade-tasks
%%WWWDIR%%/var/pollstats.rrd
- at dirrmtry %%WWWDIR%%/bin
- at dirrmtry %%WWWDIR%%/doc/manual
- at dirrmtry %%WWWDIR%%/doc
- at dirrmtry %%WWWDIR%%/htdocs/cable_plant
- at dirrmtry %%WWWDIR%%/htdocs/css
- at dirrmtry %%WWWDIR%%/htdocs/generic
- at dirrmtry %%WWWDIR%%/htdocs/help
- at dirrmtry %%WWWDIR%%/htdocs/img/graphs
- at dirrmtry %%WWWDIR%%/htdocs/img
- at dirrmtry %%WWWDIR%%/htdocs/java_script
- at dirrmtry %%WWWDIR%%/htdocs/management
- at dirrmtry %%WWWDIR%%/htdocs/contacts
- at dirrmtry %%WWWDIR%%/htdocs/operations
- at dirrmtry %%WWWDIR%%/htdocs/reports
- at dirrmtry %%WWWDIR%%/htdocs/export
- at dirrmtry %%WWWDIR%%/htdocs/user_management
- at dirrmtry %%WWWDIR%%/htdocs/user_help
- at dirrmtry %%WWWDIR%%/htdocs/rest
- at dirrmtry %%WWWDIR%%/lib/Netdot/Manual
- at dirrmtry %%WWWDIR%%/lib/Netdot/Meta/Table
- at dirrmtry %%WWWDIR%%/lib/Netdot/Meta
- at dirrmtry %%WWWDIR%%/lib/Netdot/Model/Plugins
- at dirrmtry %%WWWDIR%%/lib/Netdot/Model/Device/CLI
- at dirrmtry %%WWWDIR%%/lib/Netdot/Model/Device
- at dirrmtry %%WWWDIR%%/lib/Netdot/Model
- at dirrmtry %%WWWDIR%%/lib/Netdot/UI
- at dirrmtry %%WWWDIR%%/lib/Netdot/Util
- at dirrmtry %%WWWDIR%%/lib/Netdot/Exporter
- at dirrmtry %%WWWDIR%%/lib/Netdot
- at dirrmtry %%WWWDIR%%/lib
- at dirrmtry %%WWWDIR%%/etc
- at dirrmtry %%WWWDIR%%/import
- at dirrmtry %%WWWDIR%%/export/docs
- at dirrmtry %%WWWDIR%%/export/nagios
- at dirrmtry %%WWWDIR%%/export/sysmon
- at dirrmtry %%WWWDIR%%/export/rancid
- at dirrmtry %%WWWDIR%%/export/cacti
- at dirrmtry %%WWWDIR%%/export/ethers
- at dirrmtry %%WWWDIR%%/export/bind
- at dirrmtry %%WWWDIR%%/export/dhcpd
- at dirrmtry %%WWWDIR%%/export/smokeping
- at dirrmtry %%WWWDIR%%/export
- at dirrmtry %%WWWDIR%%/htdocs/masondata/obj
+ at dir %%WWWDIR%%/bin
+ at dir %%WWWDIR%%/doc/manual
+ at dir %%WWWDIR%%/doc
+ at dir %%WWWDIR%%/htdocs/cable_plant
+ at dir %%WWWDIR%%/htdocs/css
+ at dir %%WWWDIR%%/htdocs/generic
+ at dir %%WWWDIR%%/htdocs/help
+ at dir %%WWWDIR%%/htdocs/img/graphs
+ at dir %%WWWDIR%%/htdocs/img
+ at dir %%WWWDIR%%/htdocs/java_script
+ at dir %%WWWDIR%%/htdocs/management
+ at dir %%WWWDIR%%/htdocs/contacts
+ at dir %%WWWDIR%%/htdocs/operations
+ at dir %%WWWDIR%%/htdocs/reports
+ at dir %%WWWDIR%%/htdocs/export
+ at dir %%WWWDIR%%/htdocs/user_management
+ at dir %%WWWDIR%%/htdocs/user_help
+ at dir %%WWWDIR%%/htdocs/rest
+ at dir %%WWWDIR%%/lib/Netdot/Manual
+ at dir %%WWWDIR%%/lib/Netdot/Meta/Table
+ at dir %%WWWDIR%%/lib/Netdot/Meta
+ at dir %%WWWDIR%%/lib/Netdot/Model/Plugins
+ at dir %%WWWDIR%%/lib/Netdot/Model/Device/CLI
+ at dir %%WWWDIR%%/lib/Netdot/Model/Device
+ at dir %%WWWDIR%%/lib/Netdot/Model
+ at dir %%WWWDIR%%/lib/Netdot/UI
+ at dir %%WWWDIR%%/lib/Netdot/Util
+ at dir %%WWWDIR%%/lib/Netdot/Exporter
+ at dir %%WWWDIR%%/lib/Netdot
+ at dir %%WWWDIR%%/lib
+ at dir %%WWWDIR%%/etc
+ at dir %%WWWDIR%%/import
+ at dir %%WWWDIR%%/export/docs
+ at dir %%WWWDIR%%/export/nagios
+ at dir %%WWWDIR%%/export/sysmon
+ at dir %%WWWDIR%%/export/rancid
+ at dir %%WWWDIR%%/export/cacti
+ at dir %%WWWDIR%%/export/ethers
+ at dir %%WWWDIR%%/export/bind
+ at dir %%WWWDIR%%/export/dhcpd
+ at dir %%WWWDIR%%/export/smokeping
+ at dir %%WWWDIR%%/export
+ at dir %%WWWDIR%%/htdocs/masondata/obj
@unexec rm -rf %D/%%WWWDIR%%/htdocs/masondata/obj 2> /dev/null || true
- at dirrmtry %%WWWDIR%%/htdocs/masondata/cache
- at dirrmtry %%WWWDIR%%/htdocs/masondata
- at dirrmtry %%WWWDIR%%/htdocs
- at dirrmtry %%WWWDIR%%/tmp/sessions/locks
- at dirrmtry %%WWWDIR%%/tmp/sessions
+ at dir %%WWWDIR%%/htdocs/masondata/cache
+ at dir %%WWWDIR%%/htdocs/masondata
+ at dir %%WWWDIR%%/htdocs
+ at dir %%WWWDIR%%/tmp/sessions/locks
+ at dir %%WWWDIR%%/tmp/sessions
@unexec rm -rf %D/%%WWWDIR%%/tmp/sessions 2> /dev/null || true
- at dirrmtry %%WWWDIR%%/tmp
- at dirrmtry %%WWWDIR%%/upgrade
- at dirrmtry %%WWWDIR%%/var
- at dirrmtry %%WWWDIR%%
+ at dir %%WWWDIR%%/tmp
+ at dir %%WWWDIR%%/upgrade
+ at dir %%WWWDIR%%/var
+ at dir %%WWWDIR%%
@unexec if [ -d %%WWWDIR%% ]; then echo "===> There are files/directories remaining under %D/%%WWWDIR%%. If you wish to deinstall netdot completely, inspect this directory for any files you may want to keep and then remove it."; fi
More information about the svn-ports-head
mailing list