- Update to 0.10.0 plus a patch from github to make it build

- Take maintainership, see
  http://lists.freebsd.org/pipermail/freebsd-ports/2011-October/071195.html

- Use %%DATADIR%% in plist where appropriate

- Add a few TEST_DEPENDS. Most of the tests pass, the ones that don't seem to
  be upstream issues and/or already existing

7 files changed, 284 insertions, 156 deletions

diff --git a/textproc/augeas/Makefile b/textproc/augeas/Makefile
index 9ad2f4bd0d41..d6b855c22b9e 100644
--- a/textproc/augeas/Makefile
+++ b/textproc/augeas/Makefile
@@ -7,35 +7,40 @@
 #
 
 PORTNAME=	augeas
-PORTVERSION=	0.7.1
-PORTREVISION=	2
+PORTVERSION=	0.10.0
 CATEGORIES=	textproc
 MASTER_SITES=	http://augeas.net/download/
 
-MAINTAINER=	raj@csub.edu
+MAINTAINER=	swills@FreeBSD.org
 COMMENT=	A configuration editing tool
 
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
+USE_GNOME=	pkgconfig 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
+
 MAN1=		augparse.1 augtool.1
 MANCOMPRESSED=	no
 
 LENSESDIR=	${PREFIX}/share/augeas/lenses
 
-post-extract:
-	@${RM} ${WRKSRC}/gnulib/lib/gettext.h
-
 post-patch:
 	@${REINPLACE_CMD} -e 's:$$(libdir)/pkgconfig:${PREFIX}/libdata/pkgconfig:' ${WRKSRC}/Makefile.am
+	@${REINPLACE_CMD} -e 's:/bin/bash:/usr/bin/env bash:' ${WRKSRC}/tests/*.sh
+	@${REINPLACE_CMD} -e 's:sed:gsed:' ${WRKSRC}/tests/test-augtool.sh
 
 post-install:
 	${MKDIR} ${LENSESDIR}/tests
 	${INSTALL_DATA} ${FILESDIR}/rcconf.aug ${LENSESDIR}/rcconf.aug
 	${INSTALL_DATA} ${FILESDIR}/test_rcconf.aug ${LENSESDIR}/tests/rcconf.aug
 
+test: install
+	@cd ${WRKSRC}/tests && make check
+
 .include <bsd.port.mk>
diff --git a/textproc/augeas/distinfo b/textproc/augeas/distinfo
index 94623d54f9a1..ebf7b81107e1 100644
--- a/textproc/augeas/distinfo
+++ b/textproc/augeas/distinfo
@@ -1,2 +1,2 @@
-SHA256 (augeas-0.7.1.tar.gz) = f45749251dbc382b89458bfa25ca1f4090520f4b853b77c854de3861e9f82636
-SIZE (augeas-0.7.1.tar.gz) = 1346645
+SHA256 (augeas-0.10.0.tar.gz) = ec111af06186216930176ebe5ecccdf7bf528528aee9acde1d5d70088484afca
+SIZE (augeas-0.10.0.tar.gz) = 1676906
diff --git a/textproc/augeas/files/patch-021ea39f8e b/textproc/augeas/files/patch-021ea39f8e
new file mode 100644
index 000000000000..86df8f12c5da
--- /dev/null
+++ b/textproc/augeas/files/patch-021ea39f8e
@@ -0,0 +1,13 @@
+diff --git a/src/regexp.c b/src/regexp.c
+index cf0ea5d..811087d 100644
+--- src/regexp.c
++++ src/regexp.c
+@@ -50,7 +50,7 @@
+     ret = fa_restrict_alphabet(r->pattern->str, strlen(r->pattern->str),
+                                &nre, &nre_len, 2, 1);
+     if (ret == 0) {
+-        pat = escape(nre, nre_len);
++        pat = escape(nre, nre_len, RX_ESCAPES);
+         free(nre);
+     }
+ #endif
diff --git a/textproc/augeas/files/patch-configure.ac b/textproc/augeas/files/patch-configure.ac
index bdc379d6e405..9c416554c065 100644
--- a/textproc/augeas/files/patch-configure.ac
+++ b/textproc/augeas/files/patch-configure.ac
@@ -1,5 +1,5 @@
---- configure.ac.orig	2010-04-28 13:15:44.000000000 -0700
-+++ configure.ac	2010-04-28 13:16:07.000000000 -0700
+--- ./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])
diff --git a/textproc/augeas/files/patch-src-augrun.c b/textproc/augeas/files/patch-src-augrun.c
new file mode 100644
index 000000000000..26e4193e5927
--- /dev/null
+++ b/textproc/augeas/files/patch-src-augrun.c
@@ -0,0 +1,19 @@
+--- ./src/augrun.c.orig	2012-02-11 04:26:33.948339055 -0500
++++ ./src/augrun.c	2012-02-11 04:29:28.090339060 -0500
+@@ -988,6 +988,16 @@
+     &cmd_def_last
+ };
+ 
++char *strchrnul(const char *s, int c) {
++  char *i;
++  for (i = (char*)s; *i != '\0'; ++i) {
++    if (*i == c) {
++      return i;
++    }
++  }
++  return i;
++}
++
+ int aug_srun(augeas *aug, FILE *out, const char *text) {
+     char *line = NULL;
+     const char *eol;
diff --git a/textproc/augeas/files/patch-tests-cutest.c b/textproc/augeas/files/patch-tests-cutest.c
new file mode 100644
index 000000000000..f843c25f7b9b
--- /dev/null
+++ b/textproc/augeas/files/patch-tests-cutest.c
@@ -0,0 +1,10 @@
+--- 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"
diff --git a/textproc/augeas/pkg-plist b/textproc/augeas/pkg-plist
index bc7cdf8787db..183827dc0fae 100644
--- a/textproc/augeas/pkg-plist
+++ b/textproc/augeas/pkg-plist
@@ -6,159 +6,240 @@ include/fa.h
 lib/libaugeas.a
 lib/libaugeas.la
 lib/libaugeas.so
-lib/libaugeas.so.10
+lib/libaugeas.so.15
 lib/libfa.a
 lib/libfa.la
 lib/libfa.so
 lib/libfa.so.4
 libdata/pkgconfig/augeas.pc
-share/augeas/lenses/dist/aliases.aug
-share/augeas/lenses/dist/approx.aug
-share/augeas/lenses/dist/aptpreferences.aug
-share/augeas/lenses/dist/aptsources.aug
-share/augeas/lenses/dist/bbhosts.aug
-share/augeas/lenses/dist/build.aug
-share/augeas/lenses/dist/cgconfig.aug
-share/augeas/lenses/dist/cgrules.aug
-share/augeas/lenses/dist/cobblermodules.aug
-share/augeas/lenses/dist/cobblersettings.aug
-share/augeas/lenses/dist/cron.aug
-share/augeas/lenses/dist/darkice.aug
-share/augeas/lenses/dist/debctrl.aug
-share/augeas/lenses/dist/dhclient.aug
-share/augeas/lenses/dist/dnsmasq.aug
-share/augeas/lenses/dist/dpkg.aug
-share/augeas/lenses/dist/dput.aug
-share/augeas/lenses/dist/ethers.aug
-share/augeas/lenses/dist/exports.aug
-share/augeas/lenses/dist/fstab.aug
-share/augeas/lenses/dist/gdm.aug
-share/augeas/lenses/dist/group.aug
-share/augeas/lenses/dist/grub.aug
-share/augeas/lenses/dist/hosts.aug
-share/augeas/lenses/dist/inetd.aug
-share/augeas/lenses/dist/inifile.aug
-share/augeas/lenses/dist/inittab.aug
-share/augeas/lenses/dist/interfaces.aug
-share/augeas/lenses/dist/iptables.aug
-share/augeas/lenses/dist/json.aug
-share/augeas/lenses/dist/krb5.aug
-share/augeas/lenses/dist/limits.aug
-share/augeas/lenses/dist/logrotate.aug
-share/augeas/lenses/dist/lokkit.aug
-share/augeas/lenses/dist/modprobe.aug
-share/augeas/lenses/dist/monit.aug
-share/augeas/lenses/dist/multipath.aug
-share/augeas/lenses/dist/nagioscfg.aug
-share/augeas/lenses/dist/ntp.aug
-share/augeas/lenses/dist/openvpn.aug
-share/augeas/lenses/dist/pam.aug
-share/augeas/lenses/dist/passwd.aug
-share/augeas/lenses/dist/pbuilder.aug
-share/augeas/lenses/dist/php.aug
-share/augeas/lenses/dist/phpvars.aug
-share/augeas/lenses/dist/postfix_access.aug
-share/augeas/lenses/dist/postfix_main.aug
-share/augeas/lenses/dist/postfix_master.aug
-share/augeas/lenses/dist/puppet.aug
-share/augeas/lenses/dist/rsyncd.aug
-share/augeas/lenses/dist/rx.aug
-share/augeas/lenses/dist/samba.aug
-share/augeas/lenses/dist/securetty.aug
-share/augeas/lenses/dist/sep.aug
-share/augeas/lenses/dist/services.aug
-share/augeas/lenses/dist/shellvars.aug
-share/augeas/lenses/dist/slapd.aug
-share/augeas/lenses/dist/soma.aug
-share/augeas/lenses/dist/spacevars.aug
-share/augeas/lenses/dist/squid.aug
-share/augeas/lenses/dist/sshd.aug
-share/augeas/lenses/dist/sudoers.aug
-share/augeas/lenses/dist/sysctl.aug
-share/augeas/lenses/dist/tests/test_aliases.aug
-share/augeas/lenses/dist/tests/test_approx.aug
-share/augeas/lenses/dist/tests/test_aptpreferences.aug
-share/augeas/lenses/dist/tests/test_aptsource.aug
-share/augeas/lenses/dist/tests/test_bbhosts.aug
-share/augeas/lenses/dist/tests/test_cgconfig.aug
-share/augeas/lenses/dist/tests/test_cgrules.aug
-share/augeas/lenses/dist/tests/test_cobblermodules.aug
-share/augeas/lenses/dist/tests/test_cobblersettings.aug
-share/augeas/lenses/dist/tests/test_cron.aug
-share/augeas/lenses/dist/tests/test_darkice.aug
-share/augeas/lenses/dist/tests/test_debctrl.aug
-share/augeas/lenses/dist/tests/test_dhclient.aug
-share/augeas/lenses/dist/tests/test_dnsmasq.aug
-share/augeas/lenses/dist/tests/test_dpkg.aug
-share/augeas/lenses/dist/tests/test_dput.aug
-share/augeas/lenses/dist/tests/test_ethers.aug
-share/augeas/lenses/dist/tests/test_exports.aug
-share/augeas/lenses/dist/tests/test_fstab.aug
-share/augeas/lenses/dist/tests/test_gdm.aug
-share/augeas/lenses/dist/tests/test_group.aug
-share/augeas/lenses/dist/tests/test_grub.aug
-share/augeas/lenses/dist/tests/test_hosts.aug
-share/augeas/lenses/dist/tests/test_inetd.aug
-share/augeas/lenses/dist/tests/test_inifile.aug
-share/augeas/lenses/dist/tests/test_inittab.aug
-share/augeas/lenses/dist/tests/test_interfaces.aug
-share/augeas/lenses/dist/tests/test_iptables.aug
-share/augeas/lenses/dist/tests/test_json.aug
-share/augeas/lenses/dist/tests/test_krb5.aug
-share/augeas/lenses/dist/tests/test_ldap.aug
-share/augeas/lenses/dist/tests/test_limits.aug
-share/augeas/lenses/dist/tests/test_logrotate.aug
-share/augeas/lenses/dist/tests/test_lokkit.aug
-share/augeas/lenses/dist/tests/test_modprobe.aug
-share/augeas/lenses/dist/tests/test_monit.aug
-share/augeas/lenses/dist/tests/test_multipath.aug
-share/augeas/lenses/dist/tests/test_nagioscfg.aug
-share/augeas/lenses/dist/tests/test_ntp.aug
-share/augeas/lenses/dist/tests/test_openvpn.aug
-share/augeas/lenses/dist/tests/test_pam.aug
-share/augeas/lenses/dist/tests/test_passwd.aug
-share/augeas/lenses/dist/tests/test_pbuilder.aug
-share/augeas/lenses/dist/tests/test_php.aug
-share/augeas/lenses/dist/tests/test_phpvars.aug
-share/augeas/lenses/dist/tests/test_postfix_access.aug
-share/augeas/lenses/dist/tests/test_postfix_main.aug
-share/augeas/lenses/dist/tests/test_postfix_master.aug
-share/augeas/lenses/dist/tests/test_puppet.aug
-share/augeas/lenses/dist/tests/test_rsyncd.aug
-share/augeas/lenses/dist/tests/test_rx.aug
-share/augeas/lenses/dist/tests/test_samba.aug
-share/augeas/lenses/dist/tests/test_securetty.aug
-share/augeas/lenses/dist/tests/test_services.aug
-share/augeas/lenses/dist/tests/test_shellvars.aug
-share/augeas/lenses/dist/tests/test_slapd.aug
-share/augeas/lenses/dist/tests/test_soma.aug
-share/augeas/lenses/dist/tests/test_spacevars.aug
-share/augeas/lenses/dist/tests/test_squid.aug
-share/augeas/lenses/dist/tests/test_sshd.aug
-share/augeas/lenses/dist/tests/test_sudoers.aug
-share/augeas/lenses/dist/tests/test_sysctl.aug
-share/augeas/lenses/dist/tests/test_vsftpd.aug
-share/augeas/lenses/dist/tests/test_webmin.aug
-share/augeas/lenses/dist/tests/test_wine.aug
-share/augeas/lenses/dist/tests/test_xinetd.aug
-share/augeas/lenses/dist/tests/test_xorg.aug
-share/augeas/lenses/dist/tests/test_yum.aug
-share/augeas/lenses/dist/util.aug
-share/augeas/lenses/dist/vsftpd.aug
-share/augeas/lenses/dist/webmin.aug
-share/augeas/lenses/dist/wine.aug
-share/augeas/lenses/dist/xinetd.aug
-share/augeas/lenses/dist/xorg.aug
-share/augeas/lenses/dist/yum.aug
-share/augeas/lenses/rcconf.aug
-share/augeas/lenses/tests/rcconf.aug
+%%DATADIR%%/lenses/dist/access.aug
+%%DATADIR%%/lenses/dist/aliases.aug
+%%DATADIR%%/lenses/dist/approx.aug
+%%DATADIR%%/lenses/dist/aptconf.aug
+%%DATADIR%%/lenses/dist/aptpreferences.aug
+%%DATADIR%%/lenses/dist/aptsources.aug
+%%DATADIR%%/lenses/dist/backuppchosts.aug
+%%DATADIR%%/lenses/dist/bbhosts.aug
+%%DATADIR%%/lenses/dist/build.aug
+%%DATADIR%%/lenses/dist/cgconfig.aug
+%%DATADIR%%/lenses/dist/cgrules.aug
+%%DATADIR%%/lenses/dist/cobblermodules.aug
+%%DATADIR%%/lenses/dist/cobblersettings.aug
+%%DATADIR%%/lenses/dist/cron.aug
+%%DATADIR%%/lenses/dist/crypttab.aug
+%%DATADIR%%/lenses/dist/darkice.aug
+%%DATADIR%%/lenses/dist/debctrl.aug
+%%DATADIR%%/lenses/dist/desktop.aug
+%%DATADIR%%/lenses/dist/device_map.aug
+%%DATADIR%%/lenses/dist/dhclient.aug
+%%DATADIR%%/lenses/dist/dhcpd.aug
+%%DATADIR%%/lenses/dist/dnsmasq.aug
+%%DATADIR%%/lenses/dist/dpkg.aug
+%%DATADIR%%/lenses/dist/dput.aug
+%%DATADIR%%/lenses/dist/ethers.aug
+%%DATADIR%%/lenses/dist/exports.aug
+%%DATADIR%%/lenses/dist/fai_diskconfig.aug
+%%DATADIR%%/lenses/dist/fstab.aug
+%%DATADIR%%/lenses/dist/gdm.aug
+%%DATADIR%%/lenses/dist/group.aug
+%%DATADIR%%/lenses/dist/grub.aug
+%%DATADIR%%/lenses/dist/host_conf.aug
+%%DATADIR%%/lenses/dist/hostname.aug
+%%DATADIR%%/lenses/dist/hosts.aug
+%%DATADIR%%/lenses/dist/hosts_access.aug
+%%DATADIR%%/lenses/dist/httpd.aug
+%%DATADIR%%/lenses/dist/inetd.aug
+%%DATADIR%%/lenses/dist/inifile.aug
+%%DATADIR%%/lenses/dist/inittab.aug
+%%DATADIR%%/lenses/dist/interfaces.aug
+%%DATADIR%%/lenses/dist/iptables.aug
+%%DATADIR%%/lenses/dist/json.aug
+%%DATADIR%%/lenses/dist/kdump.aug
+%%DATADIR%%/lenses/dist/keepalived.aug
+%%DATADIR%%/lenses/dist/krb5.aug
+%%DATADIR%%/lenses/dist/limits.aug
+%%DATADIR%%/lenses/dist/login_defs.aug
+%%DATADIR%%/lenses/dist/logrotate.aug
+%%DATADIR%%/lenses/dist/lokkit.aug
+%%DATADIR%%/lenses/dist/mdadm_conf.aug
+%%DATADIR%%/lenses/dist/mke2fs.aug
+%%DATADIR%%/lenses/dist/modprobe.aug
+%%DATADIR%%/lenses/dist/modules.aug
+%%DATADIR%%/lenses/dist/modules_conf.aug
+%%DATADIR%%/lenses/dist/monit.aug
+%%DATADIR%%/lenses/dist/multipath.aug
+%%DATADIR%%/lenses/dist/mysql.aug
+%%DATADIR%%/lenses/dist/nagioscfg.aug
+%%DATADIR%%/lenses/dist/nagiosobjects.aug
+%%DATADIR%%/lenses/dist/networks.aug
+%%DATADIR%%/lenses/dist/nrpe.aug
+%%DATADIR%%/lenses/dist/nsswitch.aug
+%%DATADIR%%/lenses/dist/ntp.aug
+%%DATADIR%%/lenses/dist/odbc.aug
+%%DATADIR%%/lenses/dist/openvpn.aug
+%%DATADIR%%/lenses/dist/pam.aug
+%%DATADIR%%/lenses/dist/passwd.aug
+%%DATADIR%%/lenses/dist/pbuilder.aug
+%%DATADIR%%/lenses/dist/pg_hba.aug
+%%DATADIR%%/lenses/dist/php.aug
+%%DATADIR%%/lenses/dist/phpvars.aug
+%%DATADIR%%/lenses/dist/postfix_access.aug
+%%DATADIR%%/lenses/dist/postfix_main.aug
+%%DATADIR%%/lenses/dist/postfix_master.aug
+%%DATADIR%%/lenses/dist/properties.aug
+%%DATADIR%%/lenses/dist/puppet.aug
+%%DATADIR%%/lenses/dist/puppetfileserver.aug
+%%DATADIR%%/lenses/dist/reprepro_uploaders.aug
+%%DATADIR%%/lenses/dist/resolv.aug
+%%DATADIR%%/lenses/dist/rsyncd.aug
+%%DATADIR%%/lenses/dist/rx.aug
+%%DATADIR%%/lenses/dist/samba.aug
+%%DATADIR%%/lenses/dist/schroot.aug
+%%DATADIR%%/lenses/dist/securetty.aug
+%%DATADIR%%/lenses/dist/sep.aug
+%%DATADIR%%/lenses/dist/services.aug
+%%DATADIR%%/lenses/dist/shells.aug
+%%DATADIR%%/lenses/dist/shellvars.aug
+%%DATADIR%%/lenses/dist/shellvars_list.aug
+%%DATADIR%%/lenses/dist/slapd.aug
+%%DATADIR%%/lenses/dist/solaris_system.aug
+%%DATADIR%%/lenses/dist/soma.aug
+%%DATADIR%%/lenses/dist/spacevars.aug
+%%DATADIR%%/lenses/dist/squid.aug
+%%DATADIR%%/lenses/dist/ssh.aug
+%%DATADIR%%/lenses/dist/sshd.aug
+%%DATADIR%%/lenses/dist/stunnel.aug
+%%DATADIR%%/lenses/dist/sudoers.aug
+%%DATADIR%%/lenses/dist/sysconfig.aug
+%%DATADIR%%/lenses/dist/sysctl.aug
+%%DATADIR%%/lenses/dist/syslog.aug
+%%DATADIR%%/lenses/dist/tests/test_access.aug
+%%DATADIR%%/lenses/dist/tests/test_aliases.aug
+%%DATADIR%%/lenses/dist/tests/test_approx.aug
+%%DATADIR%%/lenses/dist/tests/test_aptconf.aug
+%%DATADIR%%/lenses/dist/tests/test_aptpreferences.aug
+%%DATADIR%%/lenses/dist/tests/test_aptsource.aug
+%%DATADIR%%/lenses/dist/tests/test_backuppchosts.aug
+%%DATADIR%%/lenses/dist/tests/test_bbhosts.aug
+%%DATADIR%%/lenses/dist/tests/test_cgconfig.aug
+%%DATADIR%%/lenses/dist/tests/test_cgrules.aug
+%%DATADIR%%/lenses/dist/tests/test_cobblermodules.aug
+%%DATADIR%%/lenses/dist/tests/test_cobblersettings.aug
+%%DATADIR%%/lenses/dist/tests/test_cron.aug
+%%DATADIR%%/lenses/dist/tests/test_crypttab.aug
+%%DATADIR%%/lenses/dist/tests/test_darkice.aug
+%%DATADIR%%/lenses/dist/tests/test_debctrl.aug
+%%DATADIR%%/lenses/dist/tests/test_desktop.aug
+%%DATADIR%%/lenses/dist/tests/test_device_map.aug
+%%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_dpkg.aug
+%%DATADIR%%/lenses/dist/tests/test_dput.aug
+%%DATADIR%%/lenses/dist/tests/test_ethers.aug
+%%DATADIR%%/lenses/dist/tests/test_exports.aug
+%%DATADIR%%/lenses/dist/tests/test_fai_diskconfig.aug
+%%DATADIR%%/lenses/dist/tests/test_fstab.aug
+%%DATADIR%%/lenses/dist/tests/test_gdm.aug
+%%DATADIR%%/lenses/dist/tests/test_group.aug
+%%DATADIR%%/lenses/dist/tests/test_grub.aug
+%%DATADIR%%/lenses/dist/tests/test_host_conf.aug
+%%DATADIR%%/lenses/dist/tests/test_hostname.aug
+%%DATADIR%%/lenses/dist/tests/test_hosts.aug
+%%DATADIR%%/lenses/dist/tests/test_hosts_access.aug
+%%DATADIR%%/lenses/dist/tests/test_httpd.aug
+%%DATADIR%%/lenses/dist/tests/test_inetd.aug
+%%DATADIR%%/lenses/dist/tests/test_inifile.aug
+%%DATADIR%%/lenses/dist/tests/test_inittab.aug
+%%DATADIR%%/lenses/dist/tests/test_interfaces.aug
+%%DATADIR%%/lenses/dist/tests/test_iptables.aug
+%%DATADIR%%/lenses/dist/tests/test_json.aug
+%%DATADIR%%/lenses/dist/tests/test_kdump.aug
+%%DATADIR%%/lenses/dist/tests/test_keepalived.aug
+%%DATADIR%%/lenses/dist/tests/test_krb5.aug
+%%DATADIR%%/lenses/dist/tests/test_ldap.aug
+%%DATADIR%%/lenses/dist/tests/test_limits.aug
+%%DATADIR%%/lenses/dist/tests/test_login_defs.aug
+%%DATADIR%%/lenses/dist/tests/test_logrotate.aug
+%%DATADIR%%/lenses/dist/tests/test_lokkit.aug
+%%DATADIR%%/lenses/dist/tests/test_mdadm_conf.aug
+%%DATADIR%%/lenses/dist/tests/test_mke2fs.aug
+%%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_monit.aug
+%%DATADIR%%/lenses/dist/tests/test_multipath.aug
+%%DATADIR%%/lenses/dist/tests/test_mysql.aug
+%%DATADIR%%/lenses/dist/tests/test_nagioscfg.aug
+%%DATADIR%%/lenses/dist/tests/test_nagiosobjects.aug
+%%DATADIR%%/lenses/dist/tests/test_networks.aug
+%%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_odbc.aug
+%%DATADIR%%/lenses/dist/tests/test_openvpn.aug
+%%DATADIR%%/lenses/dist/tests/test_pam.aug
+%%DATADIR%%/lenses/dist/tests/test_passwd.aug
+%%DATADIR%%/lenses/dist/tests/test_pbuilder.aug
+%%DATADIR%%/lenses/dist/tests/test_pg_hba.aug
+%%DATADIR%%/lenses/dist/tests/test_php.aug
+%%DATADIR%%/lenses/dist/tests/test_phpvars.aug
+%%DATADIR%%/lenses/dist/tests/test_postfix_access.aug
+%%DATADIR%%/lenses/dist/tests/test_postfix_main.aug
+%%DATADIR%%/lenses/dist/tests/test_postfix_master.aug
+%%DATADIR%%/lenses/dist/tests/test_properties.aug
+%%DATADIR%%/lenses/dist/tests/test_puppet.aug
+%%DATADIR%%/lenses/dist/tests/test_puppetfileserver.aug
+%%DATADIR%%/lenses/dist/tests/test_reprepro_uploaders.aug
+%%DATADIR%%/lenses/dist/tests/test_resolv.aug
+%%DATADIR%%/lenses/dist/tests/test_rsyncd.aug
+%%DATADIR%%/lenses/dist/tests/test_rx.aug
+%%DATADIR%%/lenses/dist/tests/test_samba.aug
+%%DATADIR%%/lenses/dist/tests/test_schroot.aug
+%%DATADIR%%/lenses/dist/tests/test_securetty.aug
+%%DATADIR%%/lenses/dist/tests/test_services.aug
+%%DATADIR%%/lenses/dist/tests/test_shells.aug
+%%DATADIR%%/lenses/dist/tests/test_shellvars.aug
+%%DATADIR%%/lenses/dist/tests/test_shellvars_list.aug
+%%DATADIR%%/lenses/dist/tests/test_slapd.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_squid.aug
+%%DATADIR%%/lenses/dist/tests/test_ssh.aug
+%%DATADIR%%/lenses/dist/tests/test_sshd.aug
+%%DATADIR%%/lenses/dist/tests/test_stunnel.aug
+%%DATADIR%%/lenses/dist/tests/test_sudoers.aug
+%%DATADIR%%/lenses/dist/tests/test_sysconfig.aug
+%%DATADIR%%/lenses/dist/tests/test_sysctl.aug
+%%DATADIR%%/lenses/dist/tests/test_syslog.aug
+%%DATADIR%%/lenses/dist/tests/test_util.aug
+%%DATADIR%%/lenses/dist/tests/test_vsftpd.aug
+%%DATADIR%%/lenses/dist/tests/test_webmin.aug
+%%DATADIR%%/lenses/dist/tests/test_wine.aug
+%%DATADIR%%/lenses/dist/tests/test_xendconfsxp.aug
+%%DATADIR%%/lenses/dist/tests/test_xinetd.aug
+%%DATADIR%%/lenses/dist/tests/test_xml.aug
+%%DATADIR%%/lenses/dist/tests/test_xorg.aug
+%%DATADIR%%/lenses/dist/tests/test_yum.aug
+%%DATADIR%%/lenses/dist/util.aug
+%%DATADIR%%/lenses/dist/vsftpd.aug
+%%DATADIR%%/lenses/dist/webmin.aug
+%%DATADIR%%/lenses/dist/wine.aug
+%%DATADIR%%/lenses/dist/xendconfsxp.aug
+%%DATADIR%%/lenses/dist/xinetd.aug
+%%DATADIR%%/lenses/dist/xml.aug
+%%DATADIR%%/lenses/dist/xorg.aug
+%%DATADIR%%/lenses/dist/yum.aug
+%%DATADIR%%/lenses/rcconf.aug
+%%DATADIR%%/lenses/tests/rcconf.aug
 share/vim/vimfiles/ftdetect/augeas.vim
 share/vim/vimfiles/syntax/augeas.vim
-@dirrm share/augeas/lenses/dist/tests
-@dirrm share/augeas/lenses/dist
-@dirrm share/augeas/lenses/tests
-@dirrm share/augeas/lenses
-@dirrm share/augeas
+@dirrm %%DATADIR%%/lenses/dist/tests
+@dirrm %%DATADIR%%/lenses/dist
+@dirrm %%DATADIR%%/lenses/tests
+@dirrm %%DATADIR%%/lenses
+@dirrm %%DATADIR%%
 @dirrmtry share/vim/vimfiles/syntax
 @dirrmtry share/vim/vimfiles/ftdetect
 @dirrmtry share/vim/vimfiles