5 files changed, 54 insertions, 21 deletions

diff --git a/textproc/augeas/Makefile b/textproc/augeas/Makefile
index 1cb896fe1b18..c12b78001797 100644
--- a/textproc/augeas/Makefile
+++ b/textproc/augeas/Makefile
@@ -1,29 +1,24 @@
-# vim: ts=8 sw=8
-# Ports collection makefile for:  textproc/augeas
-# Date created:			  19 May 2010
-# Whom:				  Russell Jackson <raj@csub.edu>
-#
+# Created by: Russell Jackson <raj@csub.edu>
 # $FreeBSD$
-#
 
 PORTNAME=	augeas
-PORTVERSION=	1.0.0
-#PORTREVISION=	0
+PORTVERSION=	1.1.0
 CATEGORIES=	textproc
 MASTER_SITES=	http://download.augeas.net/
 
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	A configuration editing tool
 
+TEST_DEPENDS=	bash:${PORTSDIR}/shells/bash \
+		gsed:${PORTSDIR}/textproc/gsed
+
 USE_GMAKE=	yes
-USE_GNOME=	pkgconfig libxml2
+USE_GNOME=	libxml2
 USE_AUTOTOOLS=	autoconf aclocal autoheader automake libtool
 ACLOCAL_ARGS=	-I . -I gnulib/m4 -I ${LOCALBASE}/share/aclocal
 AUTOMAKE_ARGS=	--add-missing
 USE_LDCONFIG=	yes
-
-TEST_DEPENDS=	bash:${PORTSDIR}/shells/bash \
-		gsed:${PORTSDIR}/textproc/gsed
+USE_PKGCONFIG=	yes
 
 MAN1=		augparse.1 augtool.1
 MANCOMPRESSED=	no
diff --git a/textproc/augeas/distinfo b/textproc/augeas/distinfo
index 864da49d4992..7430e03d0dca 100644
--- a/textproc/augeas/distinfo
+++ b/textproc/augeas/distinfo
@@ -1,2 +1,2 @@
-SHA256 (augeas-1.0.0.tar.gz) = 31bf757c5b8197765946b3805f3793c32b03cd92a7a77ec95d37e71a1f131912
-SIZE (augeas-1.0.0.tar.gz) = 1880630
+SHA256 (augeas-1.1.0.tar.gz) = 9d81e4228329e2d5cccb018ab06bc8b734fb2dede2c4d9b5c02303d4a690b76b
+SIZE (augeas-1.1.0.tar.gz) = 1940928
diff --git a/textproc/augeas/files/patch-lenses__shellvars.aug b/textproc/augeas/files/patch-lenses__shellvars.aug
index 9c4e1f5dfb86..1e93ce82e977 100644
--- a/textproc/augeas/files/patch-lenses__shellvars.aug
+++ b/textproc/augeas/files/patch-lenses__shellvars.aug
@@ -1,15 +1,15 @@
---- lenses/shellvars.aug.orig	2012-12-17 16:39:45.000000000 -0500
-+++ lenses/shellvars.aug	2013-05-13 19:34:17.538347901 -0400
+--- 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 key_re = /[A-Za-z0-9_.]+(\[[0-9]+\])?/ - "unset" - "export"
    let matching_re = "${!" . key_re . /[\*@]\}/
    let eq = Util.del_str "="
  
-@@ -201,7 +201,8 @@
+@@ -200,7 +200,8 @@
    let filter_default = incl "/etc/default/*"
                       . excl "/etc/default/grub_installdevice*"
                       . excl "/etc/default/whoopsie"
@@ -19,11 +19,11 @@
                       . incl "/etc/cron-apt/config"
                       . incl "/etc/environment"
                       . incl "/etc/blkid.conf"
-@@ -213,6 +214,7 @@
+@@ -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/selinux/config"
+                      . incl "/etc/rc.conf.local"
diff --git a/textproc/augeas/pkg-descr b/textproc/augeas/pkg-descr
index 85414b8b72ba..0e18c52d78bf 100644
--- a/textproc/augeas/pkg-descr
+++ b/textproc/augeas/pkg-descr
@@ -1,3 +1,5 @@
 Augeas is a configuration editing tool. It parses configuration files in their
 native formats and transforms them into a tree. Configuration changes are made
 by manipulating this tree and saving it back into native config files.
+
+WWW: http://augeas.net/
diff --git a/textproc/augeas/pkg-plist b/textproc/augeas/pkg-plist
index 22536ef0b721..63b32444187b 100644
--- a/textproc/augeas/pkg-plist
+++ b/textproc/augeas/pkg-plist
@@ -6,17 +6,20 @@ include/fa.h
 lib/libaugeas.a
 lib/libaugeas.la
 lib/libaugeas.so
-lib/libaugeas.so.16
+lib/libaugeas.so.17
 lib/libfa.a
 lib/libfa.la
 lib/libfa.so
 lib/libfa.so.5
 libdata/pkgconfig/augeas.pc
 %%DATADIR%%/lenses/dist/access.aug
+%%DATADIR%%/lenses/dist/activemq_conf.aug
+%%DATADIR%%/lenses/dist/activemq_xml.aug
 %%DATADIR%%/lenses/dist/aliases.aug
 %%DATADIR%%/lenses/dist/anacron.aug
 %%DATADIR%%/lenses/dist/approx.aug
 %%DATADIR%%/lenses/dist/apt_update_manager.aug
+%%DATADIR%%/lenses/dist/aptcacherngsecurity.aug
 %%DATADIR%%/lenses/dist/aptconf.aug
 %%DATADIR%%/lenses/dist/aptpreferences.aug
 %%DATADIR%%/lenses/dist/aptsources.aug
@@ -26,6 +29,7 @@ libdata/pkgconfig/augeas.pc
 %%DATADIR%%/lenses/dist/avahi.aug
 %%DATADIR%%/lenses/dist/backuppchosts.aug
 %%DATADIR%%/lenses/dist/bbhosts.aug
+%%DATADIR%%/lenses/dist/bootconf.aug
 %%DATADIR%%/lenses/dist/build.aug
 %%DATADIR%%/lenses/dist/cachefilesd.aug
 %%DATADIR%%/lenses/dist/carbon.aug
@@ -46,6 +50,7 @@ libdata/pkgconfig/augeas.pc
 %%DATADIR%%/lenses/dist/dhclient.aug
 %%DATADIR%%/lenses/dist/dhcpd.aug
 %%DATADIR%%/lenses/dist/dnsmasq.aug
+%%DATADIR%%/lenses/dist/dovecot.aug
 %%DATADIR%%/lenses/dist/dpkg.aug
 %%DATADIR%%/lenses/dist/dput.aug
 %%DATADIR%%/lenses/dist/erlang.aug
@@ -70,7 +75,12 @@ libdata/pkgconfig/augeas.pc
 %%DATADIR%%/lenses/dist/inittab.aug
 %%DATADIR%%/lenses/dist/inputrc.aug
 %%DATADIR%%/lenses/dist/interfaces.aug
+%%DATADIR%%/lenses/dist/iproute2.aug
 %%DATADIR%%/lenses/dist/iptables.aug
+%%DATADIR%%/lenses/dist/jaas.aug
+%%DATADIR%%/lenses/dist/jettyrealm.aug
+%%DATADIR%%/lenses/dist/jmxaccess.aug
+%%DATADIR%%/lenses/dist/jmxpassword.aug
 %%DATADIR%%/lenses/dist/json.aug
 %%DATADIR%%/lenses/dist/kdump.aug
 %%DATADIR%%/lenses/dist/keepalived.aug
@@ -83,6 +93,7 @@ libdata/pkgconfig/augeas.pc
 %%DATADIR%%/lenses/dist/logrotate.aug
 %%DATADIR%%/lenses/dist/logwatch.aug
 %%DATADIR%%/lenses/dist/lokkit.aug
+%%DATADIR%%/lenses/dist/lvm.aug
 %%DATADIR%%/lenses/dist/mcollective.aug
 %%DATADIR%%/lenses/dist/mdadm_conf.aug
 %%DATADIR%%/lenses/dist/memcached.aug
@@ -90,6 +101,7 @@ libdata/pkgconfig/augeas.pc
 %%DATADIR%%/lenses/dist/modprobe.aug
 %%DATADIR%%/lenses/dist/modules.aug
 %%DATADIR%%/lenses/dist/modules_conf.aug
+%%DATADIR%%/lenses/dist/mongodbserver.aug
 %%DATADIR%%/lenses/dist/monit.aug
 %%DATADIR%%/lenses/dist/multipath.aug
 %%DATADIR%%/lenses/dist/mysql.aug
@@ -102,7 +114,11 @@ libdata/pkgconfig/augeas.pc
 %%DATADIR%%/lenses/dist/nrpe.aug
 %%DATADIR%%/lenses/dist/nsswitch.aug
 %%DATADIR%%/lenses/dist/ntp.aug
+%%DATADIR%%/lenses/dist/ntpd.aug
 %%DATADIR%%/lenses/dist/odbc.aug
+%%DATADIR%%/lenses/dist/openshift_config.aug
+%%DATADIR%%/lenses/dist/openshift_http.aug
+%%DATADIR%%/lenses/dist/openshift_quickstarts.aug
 %%DATADIR%%/lenses/dist/openvpn.aug
 %%DATADIR%%/lenses/dist/pam.aug
 %%DATADIR%%/lenses/dist/pamconf.aug
@@ -142,11 +158,13 @@ libdata/pkgconfig/augeas.pc
 %%DATADIR%%/lenses/dist/shellvars_list.aug
 %%DATADIR%%/lenses/dist/simplelines.aug
 %%DATADIR%%/lenses/dist/simplevars.aug
+%%DATADIR%%/lenses/dist/sip_conf.aug
 %%DATADIR%%/lenses/dist/slapd.aug
 %%DATADIR%%/lenses/dist/smbusers.aug
 %%DATADIR%%/lenses/dist/solaris_system.aug
 %%DATADIR%%/lenses/dist/soma.aug
 %%DATADIR%%/lenses/dist/spacevars.aug
+%%DATADIR%%/lenses/dist/splunk.aug
 %%DATADIR%%/lenses/dist/squid.aug
 %%DATADIR%%/lenses/dist/ssh.aug
 %%DATADIR%%/lenses/dist/sshd.aug
@@ -159,10 +177,13 @@ libdata/pkgconfig/augeas.pc
 %%DATADIR%%/lenses/dist/syslog.aug
 %%DATADIR%%/lenses/dist/systemd.aug
 %%DATADIR%%/lenses/dist/tests/test_access.aug
+%%DATADIR%%/lenses/dist/tests/test_activemq_conf.aug
+%%DATADIR%%/lenses/dist/tests/test_activemq_xml.aug
 %%DATADIR%%/lenses/dist/tests/test_aliases.aug
 %%DATADIR%%/lenses/dist/tests/test_anacron.aug
 %%DATADIR%%/lenses/dist/tests/test_approx.aug
 %%DATADIR%%/lenses/dist/tests/test_apt_update_manager.aug
+%%DATADIR%%/lenses/dist/tests/test_aptcacherngsecurity.aug
 %%DATADIR%%/lenses/dist/tests/test_aptconf.aug
 %%DATADIR%%/lenses/dist/tests/test_aptpreferences.aug
 %%DATADIR%%/lenses/dist/tests/test_aptsource.aug
@@ -172,6 +193,7 @@ libdata/pkgconfig/augeas.pc
 %%DATADIR%%/lenses/dist/tests/test_avahi.aug
 %%DATADIR%%/lenses/dist/tests/test_backuppchosts.aug
 %%DATADIR%%/lenses/dist/tests/test_bbhosts.aug
+%%DATADIR%%/lenses/dist/tests/test_bootconf.aug
 %%DATADIR%%/lenses/dist/tests/test_build.aug
 %%DATADIR%%/lenses/dist/tests/test_cachefilesd.aug
 %%DATADIR%%/lenses/dist/tests/test_carbon.aug
@@ -192,6 +214,7 @@ libdata/pkgconfig/augeas.pc
 %%DATADIR%%/lenses/dist/tests/test_dhclient.aug
 %%DATADIR%%/lenses/dist/tests/test_dhcpd.aug
 %%DATADIR%%/lenses/dist/tests/test_dnsmasq.aug
+%%DATADIR%%/lenses/dist/tests/test_dovecot.aug
 %%DATADIR%%/lenses/dist/tests/test_dpkg.aug
 %%DATADIR%%/lenses/dist/tests/test_dput.aug
 %%DATADIR%%/lenses/dist/tests/test_erlang.aug
@@ -216,7 +239,12 @@ libdata/pkgconfig/augeas.pc
 %%DATADIR%%/lenses/dist/tests/test_inittab.aug
 %%DATADIR%%/lenses/dist/tests/test_inputrc.aug
 %%DATADIR%%/lenses/dist/tests/test_interfaces.aug
+%%DATADIR%%/lenses/dist/tests/test_iproute2.aug
 %%DATADIR%%/lenses/dist/tests/test_iptables.aug
+%%DATADIR%%/lenses/dist/tests/test_jaas.aug
+%%DATADIR%%/lenses/dist/tests/test_jettyrealm.aug
+%%DATADIR%%/lenses/dist/tests/test_jmxaccess.aug
+%%DATADIR%%/lenses/dist/tests/test_jmxpassword.aug
 %%DATADIR%%/lenses/dist/tests/test_json.aug
 %%DATADIR%%/lenses/dist/tests/test_kdump.aug
 %%DATADIR%%/lenses/dist/tests/test_keepalived.aug
@@ -230,6 +258,7 @@ libdata/pkgconfig/augeas.pc
 %%DATADIR%%/lenses/dist/tests/test_logrotate.aug
 %%DATADIR%%/lenses/dist/tests/test_logwatch.aug
 %%DATADIR%%/lenses/dist/tests/test_lokkit.aug
+%%DATADIR%%/lenses/dist/tests/test_lvm.aug
 %%DATADIR%%/lenses/dist/tests/test_mcollective.aug
 %%DATADIR%%/lenses/dist/tests/test_mdadm_conf.aug
 %%DATADIR%%/lenses/dist/tests/test_memcached.aug
@@ -237,6 +266,7 @@ libdata/pkgconfig/augeas.pc
 %%DATADIR%%/lenses/dist/tests/test_modprobe.aug
 %%DATADIR%%/lenses/dist/tests/test_modules.aug
 %%DATADIR%%/lenses/dist/tests/test_modules_conf.aug
+%%DATADIR%%/lenses/dist/tests/test_mongodbserver.aug
 %%DATADIR%%/lenses/dist/tests/test_monit.aug
 %%DATADIR%%/lenses/dist/tests/test_multipath.aug
 %%DATADIR%%/lenses/dist/tests/test_mysql.aug
@@ -249,7 +279,11 @@ libdata/pkgconfig/augeas.pc
 %%DATADIR%%/lenses/dist/tests/test_nrpe.aug
 %%DATADIR%%/lenses/dist/tests/test_nsswitch.aug
 %%DATADIR%%/lenses/dist/tests/test_ntp.aug
+%%DATADIR%%/lenses/dist/tests/test_ntpd.aug
 %%DATADIR%%/lenses/dist/tests/test_odbc.aug
+%%DATADIR%%/lenses/dist/tests/test_openshift_config.aug
+%%DATADIR%%/lenses/dist/tests/test_openshift_http.aug
+%%DATADIR%%/lenses/dist/tests/test_openshift_quickstarts.aug
 %%DATADIR%%/lenses/dist/tests/test_openvpn.aug
 %%DATADIR%%/lenses/dist/tests/test_pam.aug
 %%DATADIR%%/lenses/dist/tests/test_pamconf.aug
@@ -288,11 +322,13 @@ libdata/pkgconfig/augeas.pc
 %%DATADIR%%/lenses/dist/tests/test_shellvars_list.aug
 %%DATADIR%%/lenses/dist/tests/test_simplelines.aug
 %%DATADIR%%/lenses/dist/tests/test_simplevars.aug
+%%DATADIR%%/lenses/dist/tests/test_sip_conf.aug
 %%DATADIR%%/lenses/dist/tests/test_slapd.aug
 %%DATADIR%%/lenses/dist/tests/test_smbusers.aug
 %%DATADIR%%/lenses/dist/tests/test_solaris_system.aug
 %%DATADIR%%/lenses/dist/tests/test_soma.aug
 %%DATADIR%%/lenses/dist/tests/test_spacevars.aug
+%%DATADIR%%/lenses/dist/tests/test_splunk.aug
 %%DATADIR%%/lenses/dist/tests/test_squid.aug
 %%DATADIR%%/lenses/dist/tests/test_ssh.aug
 %%DATADIR%%/lenses/dist/tests/test_sshd.aug