Upgrade net-mgmt/netmagis-* ports to 2.2.0

PR:		ports/180000
Submitted by:	maintainer

4 files changed, 78 insertions, 37 deletions

diff --git a/net-mgmt/netmagis-common/Makefile b/net-mgmt/netmagis-common/Makefile
index e32265badd0..0e4cbce13ec 100644
--- a/net-mgmt/netmagis-common/Makefile
+++ b/net-mgmt/netmagis-common/Makefile
@@ -2,7 +2,8 @@
 # $FreeBSD$
 
 PORTNAME?=	netmagis
-DISTVERSION?=	2.1.1
+DISTVERSION?=	2.2.0
+PORTREVISION?=	1
 CATEGORIES?=	net-mgmt
 MASTER_SITES=	http://netmagis.org/files/
 PKGNAMESUFFIX?=	-common
diff --git a/net-mgmt/netmagis-common/distinfo b/net-mgmt/netmagis-common/distinfo
index e35bd4f3547..d13d8bdb2d0 100644
--- a/net-mgmt/netmagis-common/distinfo
+++ b/net-mgmt/netmagis-common/distinfo
@@ -1,2 +1,2 @@
-SHA256 (netmagis-2.1.1.tar.gz) = 94302c74c05c8e4a1ab779bf5713fa254402a285edcd4d5a9d46c87650b2de6e
-SIZE (netmagis-2.1.1.tar.gz) = 613018
+SHA256 (netmagis-2.2.0.tar.gz) = e40f9f7b3592989c58a8491e44cad017ae47db35cac307e6c9819b7a2706ae9b
+SIZE (netmagis-2.2.0.tar.gz) = 644691
diff --git a/net-mgmt/netmagis-database/pkg-plist b/net-mgmt/netmagis-database/pkg-plist
index 14c9d0fef2c..745ca439f1f 100644
--- a/net-mgmt/netmagis-database/pkg-plist
+++ b/net-mgmt/netmagis-database/pkg-plist
@@ -1,15 +1,31 @@
+lib/netmagis/functions.sql
+lib/netmagis/schema-mac.sql
+lib/netmagis/schema-main.sql
+lib/netmagis/sql22/functions.sql
+lib/netmagis/sql22/schema-mac.sql
+lib/netmagis/sql22/schema-main.sql
+lib/netmagis/sql22/triggers.sql
+lib/netmagis/triggers.sql
 sbin/netmagis-dbcreate
 sbin/netmagis-dbimport
 sbin/netmagis-dbmaint
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README.database
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/crontab.database
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/domain.txt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/group.txt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mailrelay.txt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mailrole.txt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/network.txt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rrsup.txt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/run-all.sh
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/no-view/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/no-view/domain.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/no-view/group.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/no-view/mailrelay.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/no-view/mailrole.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/no-view/network.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/no-view/rrsup.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/no-view/run-all.sh
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/no-view/view.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/no-view/zones/1.168.192.in-addr.arpa
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/no-view/zones/16.172.in-addr.arpa
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/no-view/zones/4.3.2.1.8.b.d.0.1.0.0.2.ip6.arpa
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/no-view/zones/example.com
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/no-view/zones/example.org
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/no-view/zones/plant1.example.com
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/no-view/zones/subsid.co.zz
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/upgrade/12-13/upgrade.sql
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/upgrade/13-14/upgrade.sql
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/upgrade/14-15/upgrade.sql
@@ -17,22 +33,35 @@ sbin/netmagis-dbmaint
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/upgrade/15-20/pgauth.sed
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/upgrade/15-20/upgrade.sql
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/upgrade/20-21/upgrade.sql
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/zones/1.168.192.in-addr.arpa
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/zones/16.172.in-addr.arpa
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/zones/4.3.2.1.8.b.d.0.1.0.0.2.ip6.arpa
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/zones/example.com
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/zones/example.org
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/zones/plant1.example.com
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/zones/subsid.co.zz
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/upgrade/21-22/upgrade.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/with-views/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/with-views/domain.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/with-views/group.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/with-views/mailrelay.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/with-views/mailrole.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/with-views/network.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/with-views/rrsup.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/with-views/run-all.sh
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/with-views/view.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/with-views/zones/100.51.198.in-addr.arpa
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/with-views/zones/16.172.in-addr.arpa
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/with-views/zones/4.3.2.1.8.b.d.0.1.0.0.2.ip6.arpa
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/with-views/zones/example.com-ext
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/with-views/zones/example.com-int
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/with-views/zones/example.org
 @dirrmtry var/netmagis/dbdump
 @dirrmtry var/netmagis
 @dirrmtry var
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/zones
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/with-views/zones
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/with-views
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/upgrade/21-22
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/upgrade/20-21
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/upgrade/15-20
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/upgrade/14-15
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/upgrade/13-14
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/upgrade/12-13
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/upgrade
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/no-view/zones
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/no-view
 %%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%
 @exec mkdir -p %D/var/netmagis/dbdump
diff --git a/net-mgmt/netmagis-www/pkg-plist b/net-mgmt/netmagis-www/pkg-plist
index ce938f72e65..8135f775fa7 100644
--- a/net-mgmt/netmagis-www/pkg-plist
+++ b/net-mgmt/netmagis-www/pkg-plist
@@ -114,10 +114,7 @@ lib/netmagis/tmpl/en/admpar-help.html
 lib/netmagis/tmpl/en/admref-edit.html
 lib/netmagis/tmpl/en/admzgen-mod.html
 lib/netmagis/tmpl/en/admzgen-sel.html
-lib/netmagis/tmpl/en/del-alias.html
-lib/netmagis/tmpl/en/del-ip1.html
-lib/netmagis/tmpl/en/del-ipobj.html
-lib/netmagis/tmpl/en/del-name.html
+lib/netmagis/tmpl/en/del-confirm.html
 lib/netmagis/tmpl/en/del-ok.html
 lib/netmagis/tmpl/en/del-sel.html
 lib/netmagis/tmpl/en/dhcp-edit.html
@@ -126,15 +123,21 @@ lib/netmagis/tmpl/en/dhcp-sel.html
 lib/netmagis/tmpl/en/edit.html
 lib/netmagis/tmpl/en/eq.html
 lib/netmagis/tmpl/en/error.html
-lib/netmagis/tmpl/en/help-commu.html
-lib/netmagis/tmpl/en/help-dhcpprofil.html
-lib/netmagis/tmpl/en/help-domaine.html
+lib/netmagis/tmpl/en/genl-confirm.html
+lib/netmagis/tmpl/en/genl-edit.html
+lib/netmagis/tmpl/en/genl-ok.html
+lib/netmagis/tmpl/en/genl.html
+lib/netmagis/tmpl/en/help-comm.html
+lib/netmagis/tmpl/en/help-confcmd.html
+lib/netmagis/tmpl/en/help-dhcpprof.html
+lib/netmagis/tmpl/en/help-domain.html
 lib/netmagis/tmpl/en/help-dotattr.html
 lib/netmagis/tmpl/en/help-eq.html
 lib/netmagis/tmpl/en/help-eqtype.html
-lib/netmagis/tmpl/en/help-etabl.html
 lib/netmagis/tmpl/en/help-hinfo.html
-lib/netmagis/tmpl/en/help-reseau.html
+lib/netmagis/tmpl/en/help-net.html
+lib/netmagis/tmpl/en/help-org.html
+lib/netmagis/tmpl/en/help-view.html
 lib/netmagis/tmpl/en/help-vlan.html
 lib/netmagis/tmpl/en/help-zone.html
 lib/netmagis/tmpl/en/ifchg-mod.html
@@ -155,11 +158,13 @@ lib/netmagis/tmpl/en/mail-edit.html
 lib/netmagis/tmpl/en/mail-list.html
 lib/netmagis/tmpl/en/mail-mod.html
 lib/netmagis/tmpl/en/mail-sel.html
+lib/netmagis/tmpl/en/mail-view.html
 lib/netmagis/tmpl/en/metro.html
 lib/netmagis/tmpl/en/mod-edit.html
 lib/netmagis/tmpl/en/mod-ok.html
 lib/netmagis/tmpl/en/mod-sel.html
 lib/netmagis/tmpl/en/mod-smtp.html
+lib/netmagis/tmpl/en/mod-view.html
 lib/netmagis/tmpl/en/net-list.html
 lib/netmagis/tmpl/en/net-list.tex
 lib/netmagis/tmpl/en/net.html
@@ -214,10 +219,7 @@ lib/netmagis/tmpl/fr/admpar-help.html
 lib/netmagis/tmpl/fr/admref-edit.html
 lib/netmagis/tmpl/fr/admzgen-mod.html
 lib/netmagis/tmpl/fr/admzgen-sel.html
-lib/netmagis/tmpl/fr/del-alias.html
-lib/netmagis/tmpl/fr/del-ip1.html
-lib/netmagis/tmpl/fr/del-ipobj.html
-lib/netmagis/tmpl/fr/del-name.html
+lib/netmagis/tmpl/fr/del-confirm.html
 lib/netmagis/tmpl/fr/del-ok.html
 lib/netmagis/tmpl/fr/del-sel.html
 lib/netmagis/tmpl/fr/dhcp-edit.html
@@ -226,15 +228,21 @@ lib/netmagis/tmpl/fr/dhcp-sel.html
 lib/netmagis/tmpl/fr/edit.html
 lib/netmagis/tmpl/fr/eq.html
 lib/netmagis/tmpl/fr/error.html
-lib/netmagis/tmpl/fr/help-commu.html
-lib/netmagis/tmpl/fr/help-dhcpprofil.html
-lib/netmagis/tmpl/fr/help-domaine.html
+lib/netmagis/tmpl/fr/genl-confirm.html
+lib/netmagis/tmpl/fr/genl-edit.html
+lib/netmagis/tmpl/fr/genl-ok.html
+lib/netmagis/tmpl/fr/genl.html
+lib/netmagis/tmpl/fr/help-comm.html
+lib/netmagis/tmpl/fr/help-confcmd.html
+lib/netmagis/tmpl/fr/help-dhcpprof.html
+lib/netmagis/tmpl/fr/help-domain.html
 lib/netmagis/tmpl/fr/help-dotattr.html
 lib/netmagis/tmpl/fr/help-eq.html
 lib/netmagis/tmpl/fr/help-eqtype.html
-lib/netmagis/tmpl/fr/help-etabl.html
 lib/netmagis/tmpl/fr/help-hinfo.html
-lib/netmagis/tmpl/fr/help-reseau.html
+lib/netmagis/tmpl/fr/help-net.html
+lib/netmagis/tmpl/fr/help-org.html
+lib/netmagis/tmpl/fr/help-view.html
 lib/netmagis/tmpl/fr/help-vlan.html
 lib/netmagis/tmpl/fr/help-zone.html
 lib/netmagis/tmpl/fr/ifchg-mod.html
@@ -255,11 +263,13 @@ lib/netmagis/tmpl/fr/mail-edit.html
 lib/netmagis/tmpl/fr/mail-list.html
 lib/netmagis/tmpl/fr/mail-mod.html
 lib/netmagis/tmpl/fr/mail-sel.html
+lib/netmagis/tmpl/fr/mail-view.html
 lib/netmagis/tmpl/fr/metro.html
 lib/netmagis/tmpl/fr/mod-edit.html
 lib/netmagis/tmpl/fr/mod-ok.html
 lib/netmagis/tmpl/fr/mod-sel.html
 lib/netmagis/tmpl/fr/mod-smtp.html
+lib/netmagis/tmpl/fr/mod-view.html
 lib/netmagis/tmpl/fr/net-list.html
 lib/netmagis/tmpl/fr/net-list.tex
 lib/netmagis/tmpl/fr/net.html
@@ -305,6 +315,7 @@ lib/netmagis/tmpl/fr/topotop.html
 %%WWWDIR%%/dhcp
 %%WWWDIR%%/edit
 %%WWWDIR%%/eq
+%%WWWDIR%%/genl
 %%WWWDIR%%/graph
 %%WWWDIR%%/ifchg
 %%WWWDIR%%/index