Date: Mon, 7 Jul 2014 13:28:39 +0000 (UTC) From: William Grzybowski <wg@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r361083 - in head/net-mgmt/netdot: . files Message-ID: <201407071328.s67DSdfm082405@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: wg Date: Mon Jul 7 13:28:39 2014 New Revision: 361083 URL: http://svnweb.freebsd.org/changeset/ports/361083 QAT: https://qat.redports.org/buildarchive/r361083/ Log: net-mgmt/netdot: update to 1.0.6 and support stage PR: 189447 Submitted by: maintainer Added: head/net-mgmt/netdot/files/patch-stagedir (contents, props changed) Modified: head/net-mgmt/netdot/Makefile head/net-mgmt/netdot/distinfo head/net-mgmt/netdot/pkg-plist Modified: head/net-mgmt/netdot/Makefile ============================================================================== --- head/net-mgmt/netdot/Makefile Mon Jul 7 13:28:13 2014 (r361082) +++ head/net-mgmt/netdot/Makefile Mon Jul 7 13:28:39 2014 (r361083) @@ -2,12 +2,12 @@ # $FreeBSD$ PORTNAME= netdot -PORTVERSION= 1.0.4 +PORTVERSION= 1.0.6 CATEGORIES= net-mgmt MASTER_SITES= http://netdot.uoregon.edu/pub/dists/ MAINTAINER= nick@foobar.org -COMMENT= An open source tool to organize and maintain network information +COMMENT= Open source tool to organize and maintain network information LICENSE= GPLv2 @@ -20,14 +20,13 @@ RUN_DEPENDS= p5-libapreq2>=0:${PORTSDIR} p5-SQL-Translator>=0.07:${PORTSDIR}/databases/p5-SQL-Translator \ p5-Class-DBI>=3.0.17:${PORTSDIR}/databases/p5-Class-DBI \ p5-Class-DBI-AbstractSearch>=0:${PORTSDIR}/databases/p5-Class-DBI-AbstractSearch \ - p5-DBIx-DataSource>=0:${PORTSDIR}/databases/p5-DBIx-DataSource \ p5-SNMP-Info>=2.06:${PORTSDIR}/net-mgmt/p5-SNMP-Info \ p5-HTML-Mason>=1.31:${PORTSDIR}/www/p5-HTML-Mason \ p5-Log-Dispatch>=0:${PORTSDIR}/devel/p5-Log-Dispatch \ p5-Log-Log4perl>=0:${PORTSDIR}/devel/p5-Log-Log4perl \ p5-Parallel-ForkManager>=0:${PORTSDIR}/devel/p5-Parallel-ForkManager \ p5-Net-IRR>=0:${PORTSDIR}/net/p5-Net-IRR \ - p5-NetAddr-IP>=0:${PORTSDIR}/net-mgmt/p5-NetAddr-IP \ + p5-NetAddr-IP>=4.042:${PORTSDIR}/net-mgmt/p5-NetAddr-IP \ p5-Net-Patricia>=1.20:${PORTSDIR}/net/p5-Net-Patricia \ p5-Net-Appliance-Session>=3.113.610:${PORTSDIR}/net/p5-Net-Appliance-Session \ p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS \ @@ -51,13 +50,11 @@ SUB_LIST= WWWDIR="${WWWDIR}" \ CHOWN="${CHOWN}" \ CHMOD="${CHMOD}" -PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL - -NO_STAGE= yes .include <bsd.port.pre.mk> INSTALL_TARGET= install \ PREFIX=${WWWDIR} \ + STAGEDIR=${STAGEDIR}${WWWDIR} \ APACHEUSER=${WWWOWN} \ APACHEGROUP=${WWWGRP} @@ -67,17 +64,16 @@ post-patch: post-install: .for f in export/bind export/dhcpd export/ethers export/rancid export/smokeping export/sysmon htdocs/img/graphs lib/Netdot/Manual tmp/sessions/locks htdocs/masondata/cache - @${TOUCH} ${WWWDIR}/${f}/.keep-me + @${TOUCH} ${STAGEDIR}${WWWDIR}/${f}/.keep-me .endfor .for f in initdb - ${INSTALL_SCRIPT} ${WRKSRC}/bin/${f} ${WWWDIR}/bin/${f} + ${INSTALL_SCRIPT} ${WRKSRC}/bin/${f} ${STAGEDIR}${WWWDIR}/bin/${f} .endfor - ${MKDIR} ${WWWDIR}/upgrade + ${MKDIR} ${STAGEDIR}${WWWDIR}/upgrade .for f in Makefile updatedb upgrade-tasks - ${INSTALL_SCRIPT} ${WRKSRC}/upgrade/${f} ${WWWDIR}/upgrade/${f} + ${INSTALL_SCRIPT} ${WRKSRC}/upgrade/${f} ${STAGEDIR}${WWWDIR}/upgrade/${f} .endfor - ${INSTALL_DATA} ${WRKSRC}/netdot.cron ${WWWDIR}/etc/netdot.cron - ${INSTALL_DATA} ${WRKSRC}/etc/default_data ${WWWDIR}/etc/default_data - @${CAT} ${PKGMESSAGE} + ${INSTALL_DATA} ${WRKSRC}/netdot.cron ${STAGEDIR}${WWWDIR}/etc/netdot.cron + ${INSTALL_DATA} ${WRKSRC}/etc/default_data ${STAGEDIR}${WWWDIR}/etc/default_data .include <bsd.port.post.mk> Modified: head/net-mgmt/netdot/distinfo ============================================================================== --- head/net-mgmt/netdot/distinfo Mon Jul 7 13:28:13 2014 (r361082) +++ head/net-mgmt/netdot/distinfo Mon Jul 7 13:28:39 2014 (r361083) @@ -1,2 +1,2 @@ -SHA256 (netdot-1.0.4.tar.gz) = e474005f90514e452b25cb886e2d6a16b488e008fa67e05ade70e45e24490908 -SIZE (netdot-1.0.4.tar.gz) = 2193923 +SHA256 (netdot-1.0.6.tar.gz) = 0b1d98f8bf2a92901a290cf6689880fe9e98790bb54d95e7747d67b92783501e +SIZE (netdot-1.0.6.tar.gz) = 2208181 Added: head/net-mgmt/netdot/files/patch-stagedir ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-mgmt/netdot/files/patch-stagedir Mon Jul 7 13:28:39 2014 (r361083) @@ -0,0 +1,158 @@ +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 +@@ -9,7 +9,7 @@ + + all: wipedir dir + $(substitute) +- ln -s $(PREFIX)/doc/manual/netdot-manual.htm $(PREFIX)/$(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/pkg-plist ============================================================================== --- head/net-mgmt/netdot/pkg-plist Mon Jul 7 13:28:13 2014 (r361082) +++ head/net-mgmt/netdot/pkg-plist Mon Jul 7 13:28:39 2014 (r361083) @@ -173,8 +173,8 @@ %%WWWDIR%%/htdocs/management/vlan_tasks.html %%WWWDIR%%/htdocs/management/zone.html %%WWWDIR%%/htdocs/management/zone_tasks.html -%%WWWDIR%%/htdocs/masondata/obj/.__obj_create_marker %%WWWDIR%%/htdocs/masondata/cache/.keep-me +%%WWWDIR%%/htdocs/masondata/obj/.__obj_create_marker %%WWWDIR%%/htdocs/menu_admin.mhtml %%WWWDIR%%/htdocs/menu_user.mhtml %%WWWDIR%%/htdocs/reports/addr_poll_stats.html @@ -232,8 +232,10 @@ %%WWWDIR%%/lib/Netdot/Exporter/Rancid.pm %%WWWDIR%%/lib/Netdot/Exporter/Smokeping.pm %%WWWDIR%%/lib/Netdot/Exporter/Sysmon.pm +%%WWWDIR%%/lib/Netdot/FakeSNMPSession.pm %%WWWDIR%%/lib/Netdot/LDAP.pm %%WWWDIR%%/lib/Netdot/IPVisual.pm +%%WWWDIR%%/lib/Netdot/Krb5.pm %%WWWDIR%%/lib/Netdot/Manual/.keep-me %%WWWDIR%%/lib/Netdot/Mason.pm %%WWWDIR%%/lib/Netdot/Meta.pm @@ -243,6 +245,7 @@ %%WWWDIR%%/lib/Netdot/Model.pm %%WWWDIR%%/lib/Netdot/Model/AccessRight.pm %%WWWDIR%%/lib/Netdot/Model/ArpCacheEntry.pm +%%WWWDIR%%/lib/Netdot/Model/ASN.pm %%WWWDIR%%/lib/Netdot/Model/Asset.pm %%WWWDIR%%/lib/Netdot/Model/BackboneCable.pm %%WWWDIR%%/lib/Netdot/Model/CableStrand.pm @@ -316,57 +319,58 @@ %%WWWDIR%%/upgrade/updatedb %%WWWDIR%%/upgrade/upgrade-tasks %%WWWDIR%%/var/pollstats.rrd -@dirrm %%WWWDIR%%/bin -@dirrm %%WWWDIR%%/doc/manual -@dirrm %%WWWDIR%%/doc -@dirrm %%WWWDIR%%/htdocs/cable_plant -@dirrm %%WWWDIR%%/htdocs/css -@dirrm %%WWWDIR%%/htdocs/generic -@dirrm %%WWWDIR%%/htdocs/help -@dirrm %%WWWDIR%%/htdocs/img/graphs -@dirrm %%WWWDIR%%/htdocs/img -@dirrm %%WWWDIR%%/htdocs/java_script -@dirrm %%WWWDIR%%/htdocs/management -@dirrm %%WWWDIR%%/htdocs/contacts -@dirrm %%WWWDIR%%/htdocs/operations -@dirrm %%WWWDIR%%/htdocs/reports -@dirrm %%WWWDIR%%/htdocs/export -@dirrm %%WWWDIR%%/htdocs/user_management -@dirrm %%WWWDIR%%/htdocs/user_help -@dirrm %%WWWDIR%%/htdocs/rest -@dirrm %%WWWDIR%%/lib/Netdot/Manual -@dirrm %%WWWDIR%%/lib/Netdot/Meta/Table -@dirrm %%WWWDIR%%/lib/Netdot/Meta -@dirrm %%WWWDIR%%/lib/Netdot/Model/Plugins -@dirrm %%WWWDIR%%/lib/Netdot/Model/Device/CLI -@dirrm %%WWWDIR%%/lib/Netdot/Model/Device -@dirrm %%WWWDIR%%/lib/Netdot/Model -@dirrm %%WWWDIR%%/lib/Netdot/UI -@dirrm %%WWWDIR%%/lib/Netdot/Util -@dirrm %%WWWDIR%%/lib/Netdot/Exporter -@dirrm %%WWWDIR%%/lib/Netdot -@dirrm %%WWWDIR%%/lib +@dirrmtry %%WWWDIR%%/bin +@dirrmtry %%WWWDIR%%/doc/manual +@dirrmtry %%WWWDIR%%/doc +@dirrmtry %%WWWDIR%%/htdocs/cable_plant +@dirrmtry %%WWWDIR%%/htdocs/css +@dirrmtry %%WWWDIR%%/htdocs/generic +@dirrmtry %%WWWDIR%%/htdocs/help +@dirrmtry %%WWWDIR%%/htdocs/img/graphs +@dirrmtry %%WWWDIR%%/htdocs/img +@dirrmtry %%WWWDIR%%/htdocs/java_script +@dirrmtry %%WWWDIR%%/htdocs/management +@dirrmtry %%WWWDIR%%/htdocs/contacts +@dirrmtry %%WWWDIR%%/htdocs/operations +@dirrmtry %%WWWDIR%%/htdocs/reports +@dirrmtry %%WWWDIR%%/htdocs/export +@dirrmtry %%WWWDIR%%/htdocs/user_management +@dirrmtry %%WWWDIR%%/htdocs/user_help +@dirrmtry %%WWWDIR%%/htdocs/rest +@dirrmtry %%WWWDIR%%/lib/Netdot/Manual +@dirrmtry %%WWWDIR%%/lib/Netdot/Meta/Table +@dirrmtry %%WWWDIR%%/lib/Netdot/Meta +@dirrmtry %%WWWDIR%%/lib/Netdot/Model/Plugins +@dirrmtry %%WWWDIR%%/lib/Netdot/Model/Device/CLI +@dirrmtry %%WWWDIR%%/lib/Netdot/Model/Device +@dirrmtry %%WWWDIR%%/lib/Netdot/Model +@dirrmtry %%WWWDIR%%/lib/Netdot/UI +@dirrmtry %%WWWDIR%%/lib/Netdot/Util +@dirrmtry %%WWWDIR%%/lib/Netdot/Exporter +@dirrmtry %%WWWDIR%%/lib/Netdot +@dirrmtry %%WWWDIR%%/lib @dirrmtry %%WWWDIR%%/etc -@dirrm %%WWWDIR%%/import -@dirrm %%WWWDIR%%/export/docs -@dirrm %%WWWDIR%%/export/nagios -@dirrm %%WWWDIR%%/export/sysmon -@dirrm %%WWWDIR%%/export/rancid -@dirrm %%WWWDIR%%/export/cacti -@dirrm %%WWWDIR%%/export/ethers -@dirrm %%WWWDIR%%/export/bind -@dirrm %%WWWDIR%%/export/dhcpd -@dirrm %%WWWDIR%%/export/smokeping -@dirrm %%WWWDIR%%/export -@dirrmtry %%WWWDIR%% -@unexec rm -rf %D/%%WWWDIR%%/tmp/sessions 2> /dev/null || true -@dirrmtry %%WWWDIR%%/tmp +@dirrmtry %%WWWDIR%%/import +@dirrmtry %%WWWDIR%%/export/docs +@dirrmtry %%WWWDIR%%/export/nagios +@dirrmtry %%WWWDIR%%/export/sysmon +@dirrmtry %%WWWDIR%%/export/rancid +@dirrmtry %%WWWDIR%%/export/cacti +@dirrmtry %%WWWDIR%%/export/ethers +@dirrmtry %%WWWDIR%%/export/bind +@dirrmtry %%WWWDIR%%/export/dhcpd +@dirrmtry %%WWWDIR%%/export/smokeping +@dirrmtry %%WWWDIR%%/export +@dirrmtry %%WWWDIR%%/htdocs/masondata/obj @unexec rm -rf %D/%%WWWDIR%%/htdocs/masondata/obj 2> /dev/null || true -@dirrm %%WWWDIR%%/htdocs/masondata/cache -@dirrm %%WWWDIR%%/htdocs/masondata -@dirrm %%WWWDIR%%/htdocs -@dirrm %%WWWDIR%%/upgrade -@dirrm %%WWWDIR%%/var +@dirrmtry %%WWWDIR%%/htdocs/masondata/cache +@dirrmtry %%WWWDIR%%/htdocs/masondata +@dirrmtry %%WWWDIR%%/htdocs +@dirrmtry %%WWWDIR%%/tmp/sessions/locks +@dirrmtry %%WWWDIR%%/tmp/sessions +@unexec rm -rf %D/%%WWWDIR%%/tmp/sessions 2> /dev/null || true @dirrmtry %%WWWDIR%%/tmp +@dirrmtry %%WWWDIR%%/upgrade +@dirrmtry %%WWWDIR%%/var @dirrmtry %%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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407071328.s67DSdfm082405>