textproc/augeas: update to 1.3.0

Differential Revision:	https://reviews.freebsd.org/D2635
Approved by:	swills (mentor, maintainer), mat (mentor)

7 files changed, 25 insertions, 267 deletions

diff --git a/textproc/augeas/files/patch-configure.ac b/textproc/augeas/files/patch-configure.ac
deleted file mode 100644
index 9c416554c065..000000000000
--- a/textproc/augeas/files/patch-configure.ac
+++ /dev/null
@@ -1,12 +0,0 @@
---- ./configure.ac.orig	2011-12-02 14:48:40.000000000 -0500
-+++ ./configure.ac	2012-02-11 04:24:40.222339225 -0500
-@@ -2,8 +2,7 @@
- AC_CONFIG_SRCDIR([src/augeas.c])
- AC_CONFIG_AUX_DIR([build/aux])
- AM_CONFIG_HEADER([config.h])
--AM_INIT_AUTOMAKE([-Wno-portability 1.11 color-tests parallel-tests])
--AM_SILENT_RULES([yes]) # make --enable-silent-rules the default.
-+AM_INIT_AUTOMAKE()
- 
- 
- dnl Check for NaturalDocs
diff --git a/textproc/augeas/files/patch-gnulib__lib__Makefile.am b/textproc/augeas/files/patch-gnulib__lib__Makefile.am
index c89747137e5b..278cfa827305 100644
--- a/textproc/augeas/files/patch-gnulib__lib__Makefile.am
+++ b/textproc/augeas/files/patch-gnulib__lib__Makefile.am
@@ -1,6 +1,6 @@
---- gnulib/lib/Makefile.am.orig	2010-04-28 14:46:00.000000000 -0700
-+++ gnulib/lib/Makefile.am	2010-04-28 14:47:00.000000000 -0700
-@@ -395,7 +395,7 @@
+--- gnulib/lib/Makefile.am.orig	2015-05-24 00:50:24 UTC
++++ gnulib/lib/Makefile.am
+@@ -463,7 +463,7 @@ install-exec-localcharset: all-local
  	  case '$(host_os)' in \
  	    darwin[56]*) \
  	      need_charset_alias=true ;; \
diff --git a/textproc/augeas/files/patch-lenses__shellvars.aug b/textproc/augeas/files/patch-lenses__shellvars.aug
deleted file mode 100644
index 1e93ce82e977..000000000000
--- a/textproc/augeas/files/patch-lenses__shellvars.aug
+++ /dev/null
@@ -1,29 +0,0 @@
---- lenses/shellvars.aug.orig	2013-06-15 04:39:33.000000000 +0800
-+++ lenses/shellvars.aug	2013-07-11 22:06:44.821259529 +0800
-@@ -18,7 +18,7 @@
-   let eol = del (/[ \t]+|[ \t]*[;\n]/ . empty_part_re*) "\n"
-   let semicol_eol = del (/[ \t]*[;\n]/ . empty_part_re*) "\n"
- 
--  let key_re = /[A-Za-z0-9_]+(\[[0-9]+\])?/ - ("unset" | "export")
-+  let key_re = /[A-Za-z0-9_.]+(\[[0-9]+\])?/ - "unset" - "export"
-   let matching_re = "${!" . key_re . /[\*@]\}/
-   let eq = Util.del_str "="
- 
-@@ -200,7 +200,8 @@
-   let filter_default = incl "/etc/default/*"
-                      . excl "/etc/default/grub_installdevice*"
-                      . excl "/etc/default/whoopsie"
--  let filter_misc    = incl "/etc/arno-iptables-firewall/debconf.cfg"
-+  let filter_misc    = incl "/boot/loader.conf"
-+                     . incl "/etc/arno-iptables-firewall/debconf.cfg"
-                      . incl "/etc/cron-apt/config"
-                      . incl "/etc/environment"
-                      . incl "/etc/blkid.conf"
-@@ -212,6 +213,7 @@
-                      . incl "/etc/lintianrc"
-                      . incl "/etc/lsb-release"
-                      . incl "/etc/os-release"
-+                     . incl "/etc/periodic.conf"
-                      . incl "/etc/popularity-contest.conf"
-                      . incl "/etc/rc.conf"
-                      . incl "/etc/rc.conf.local"
diff --git a/textproc/augeas/files/patch-lenses__xymon_alerting.aug b/textproc/augeas/files/patch-lenses__xymon_alerting.aug
deleted file mode 100644
index 1d6449b333a1..000000000000
--- a/textproc/augeas/files/patch-lenses__xymon_alerting.aug
+++ /dev/null
@@ -1,213 +0,0 @@
---- lenses/xymon_alerting.aug.orig	2014-01-27 10:36:08 UTC
-+++ lenses/xymon_alerting.aug
-@@ -37,16 +37,16 @@
-     let comparison  = store /[<>]/
- 
-     (* View: equal *)
--    let equal       = del /=/ "="
-+    let equal       = Sep.equal
- 
-     (* View: ws *)
--    let ws          = del /[ \t]+?/ " "
-+    let ws          = Sep.space
- 
-     (* View: eol *)
--    let eol         = del /\n/ "\n"
-+    let eol         = Util.eol
- 
-     (* View: ws_or_eol *)
--    let ws_or_eol   = del /[ \t\n]+?/ " "
-+    let ws_or_eol   = del /([ \t]+|[ \t]*\n[ \t]*)/ " "
- 
-     (* View: comment *)
-     let comment = Util.comment
-@@ -63,70 +63,75 @@
- 
-     (* View: macrodefinition
-          A string that starts with $ and that is assigned something *)
--    let macrodefinition = [ key /\$[^ =\t\n#\/]+/ . equal . store /.*/ . eol ]
-+    let macrodefinition = [ key /\$[^ =\t\n#\/]+/ . Sep.space_equal . store Rx.space_in . eol ]
-+
- 
-+    (* View: flag
-+         A flag value *)
-+    let flag (kw:string) = Build.flag kw
-+
-+    (* View: kw_word
-+         A key=value value *)
-+    let kw_word (kw:regexp) = Build.key_value kw equal store_word
- 
-     (************************************************************************
-      * Group:                 FILTERS 
-      *************************************************************************)
- 
-     (* View: page
--         The page filter definition *)
--    let page      = [ ws . key "PAGE" . equal . store_word . ws ]
--    (* View: expage
--         The expage filter definition *)
--    let expage    = [ ws . key "EXPAGE" . equal . store_word . ws ]
-+         The (ex)?page filter definition *)
-+    let page      = kw_word /(EX)?PAGE/
-+
-     (* View: group
--         The group filter definition *)
--    let group     = [ ws . key "GROUP" . equal . store_word . ws ]
--    (* View: exgroup
--         The exgroup filter definition *)
--    let exgroup   = [ ws . key "EXGROUP" . equal . store_word . ws ]
-+         The (ex)?group filter definition *)
-+    let group     = kw_word /(EX)?GROUP/
-+
-     (* View: host
--         The host filter definition *)
--    let host      = [ ws . key "HOST" . equal . store_word . ws ]
--    (* View: exhost
--         The exhost filter definition *)
--    let exhost    = [ ws . key "EXHOST" . equal . store_word . ws ]
-+         The (ex)?host filter definition *)
-+    let host      = kw_word /(EX)?HOST/
-+
-     (* View: service
--         The service filter definition *)
--    let service   = [ ws . key "SERVICE" . equal . store_word . ws ]
--    (* View: exservice
--         The exservice filter definition *)
--    let exservice = [ ws . key "EXSERVICE" . equal . store_word . ws ]
-+         The (ex)?service filter definition *)
-+    let service   = kw_word /(EX)?SERVICE/
-+
-     (* View: color
-          The color filter definition *)
--    let color     = [ ws . key "COLOR" . equal . store_word . ws ]
-+    let color     = kw_word "COLOR"
-+
-     (* View: time
-          The time filter definition *)
--    let time      = [ ws . key "TIME" . equal . store_word . ws ]
-+    let time      = kw_word "TIME"
-+
-     (* View: duration
-          The duration filter definition *)
--    let duration  = [ ws . key "DURATION" . [ label "operator" . comparison ] . [ label "value" . store_word ] . ws ]
-+    let duration  = [ key "DURATION" . [ label "operator" . comparison ] . [ label "value" . store_word ] ]
-     (* View: recover
-          The recover filter definition *)
--    let recover   = [ ws . key "RECOVER" . ws ]
-+    let recover   = flag "RECOVER"
-     (* View: notice
-          The notice filter definition *)
--    let notice    = [ ws . key "NOTICE" . ws ]
-+    let notice    = flag "NOTICE"
- 
--    (* View: filters
-+    (* View: rule_filter
-          Filters are made out of any of the above filter definitions *)
--    let filters = 
--        page |
--        expage |
--        group |
--        exgroup |
--        host |
--        exhost |
--        service |
--        exservice |
--        color |
--        time |
--        duration |
--        recover |
--        notice
-+    let rule_filter = page | group | host | service
-+                    | color | time | duration | recover | notice
- 
-+    (* View: filters
-+         One or more filters *)
-+    let filters = [ label "filters" . Build.opt_list rule_filter ws ]
-+
-+    (* View: filters_opt
-+         Zero, one or more filters *)
-+    let filters_opt = [ label "filters" . (ws . Build.opt_list rule_filter ws)? ]
-+
-+    (* View: kw_word_filters_opt
-+         A <kw_word> entry with optional filters *)
-+    let kw_word_filters_opt (kw:string) = [ key kw . equal . store_word . filters_opt ]
-+
-+    (* View: flag_filters_opt
-+         A <flag> with optional filters *) 
-+    let flag_filters_opt (kw:string) = [ key kw . filters_opt ]
- 
-     (************************************************************************
-      * Group:                 RECIPIENTS
-@@ -134,40 +139,43 @@
- 
-     (* View: mail
-          The mail recipient definition *)
--    let mail      = [ key "MAIL" . ws . store_word . ws . [ label "filters" . filters* ] . ws_or_eol ]
-+    let mail      = [ key "MAIL" . ws . store_word . filters_opt ]
-+
-     (* View: script
-          The script recipient definition *)
--    let script    = [ key "SCRIPT" . ws . [ label "script" . store_word ] . ws . [ label "recipient" . store_word ] . ws . [ label "filters" . filters* ] . ws_or_eol ]
-+    let script    = [ key "SCRIPT" . ws . [ label "script" . store_word ]
-+                  . ws . [ label "recipient" . store_word ] . filters_opt ]
-+
-     (* View: ignore
-          The ignore recipient definition *)
--    let ignore    = [ key "IGNORE" . ws . [ label "filters" . filters* ] . ws_or_eol ]
-+    let ignore    = flag_filters_opt "IGNORE"
-+
-     (* View: format
-          The format recipient definition *)
--    let format    = [ key "FORMAT" . equal . store_word . ws . [ label "filters" . filters* ] . ws_or_eol ]
-+    let format    = kw_word_filters_opt "FORMAT"
-+
-     (* View: repeat
-          The repeat recipient definition *)
--    let repeat    = [ key "REPEAT" . equal . store_word . ws . [ label "filters" . filters* ] . ws_or_eol ]
-+    let repeat    = kw_word_filters_opt "REPEAT"
-+
-     (* View: unmatched
-          The unmatched recipient definition *)
--    let unmatched = [ key "UNMATCHED" . ws . [ label "filters" . filters* ] . ws_or_eol ]
-+    let unmatched = flag_filters_opt "UNMATCHED"
-+
-     (* View: stop
-          The stop recipient definition *)
--    let stop      = [ key "STOP" . ws . [ label "filters" . filters* ] . ws_or_eol ]
-+    let stop      = flag_filters_opt "STOP"
-+
-     (* View: macro
-          The macro recipient definition *)
--    let macro     = [ key /\$[^ =\t\n#\/]+/ . ws . [ label "filters" . filters* ] . ws_or_eol ]
-+    let macro     = [ key /\$[^ =\t\n#\/]+/ . filters_opt ]
- 
--    (* View: recipients
-+    (* View: recipient
-          Recipients are made out of any of the above recipient definitions *)
--    let recipients =
--        mail |
--        script |
--        ignore |
--        format |
--        repeat |
--        unmatched |
--        stop |
--        macro
-+    let recipient = mail | script | ignore | format | repeat | unmatched
-+                  | stop | macro
-+
-+    let recipients = [ label "recipients" . Build.opt_list recipient ws_or_eol ]
- 
- 
-     (************************************************************************
-@@ -175,8 +183,8 @@
-      *************************************************************************)
- 
-     (* View: rule
--         Rules are made of filters and then recipients sperarated by a whitespace *)
--    let rule = [ seq "rules" . [ label "filters" . filters+ ] . ws_or_eol . [ label "recipients" . ( recipients )+ ] . eol ] 
-+         Rules are made of rule_filter and then recipients sperarated by a whitespace *)
-+    let rule = [ seq "rules" . filters . ws_or_eol . recipients . eol ] 
- 
-     (* View: lns
-          The Xymon_Alerting lens *)
diff --git a/textproc/augeas/files/patch-lenses_shellvars.aug b/textproc/augeas/files/patch-lenses_shellvars.aug
new file mode 100644
index 000000000000..2b9feb101fa7
--- /dev/null
+++ b/textproc/augeas/files/patch-lenses_shellvars.aug
@@ -0,0 +1,10 @@
+--- lenses/shellvars.aug.orig	2015-05-24 00:46:22 UTC
++++ lenses/shellvars.aug
+@@ -244,6 +244,7 @@ module Shellvars =
+                      . incl "/etc/lintianrc"
+                      . incl "/etc/lsb-release"
+                      . incl "/etc/os-release"
++                     . incl "/etc/periodic.conf"
+                      . incl "/etc/popularity-contest.conf"
+                      . incl "/etc/rc.conf"
+                      . incl "/etc/rc.conf.local"
diff --git a/textproc/augeas/files/patch-lenses_sysctl.aug b/textproc/augeas/files/patch-lenses_sysctl.aug
new file mode 100644
index 000000000000..61fc6ef9281d
--- /dev/null
+++ b/textproc/augeas/files/patch-lenses_sysctl.aug
@@ -0,0 +1,12 @@
+--- lenses/sysctl.aug.orig	2015-05-24 00:46:35 UTC
++++ lenses/sysctl.aug
+@@ -23,7 +23,8 @@ module Sysctl =
+ autoload xfm
+ 
+ (* Variable: filter *)
+-let filter = incl "/etc/sysctl.conf"
++let filter = incl "boot/loader.conf"
++           . incl "/etc/sysctl.conf"
+            . incl "/etc/sysctl.d/*"
+            . excl "/etc/sysctl.d/README"
+            . excl "/etc/sysctl.d/README.sysctl"
diff --git a/textproc/augeas/files/patch-tests-cutest.c b/textproc/augeas/files/patch-tests-cutest.c
deleted file mode 100644
index f843c25f7b9b..000000000000
--- a/textproc/augeas/files/patch-tests-cutest.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- tests/cutest.c.orig	2012-02-11 05:08:50.706340443 -0500
-+++ tests/cutest.c	2012-02-11 05:09:03.816423151 -0500
-@@ -34,6 +34,7 @@
- #include <stdio.h>
- #include <string.h>
- #include <math.h>
-+#include <sys/wait.h>
- 
- #include "cutest.h"
- #include "memory.h"