aboutsummaryrefslogtreecommitdiffstats
path: root/textproc/augeas
diff options
context:
space:
mode:
authorswills <swills@FreeBSD.org>2012-05-17 10:26:16 +0800
committerswills <swills@FreeBSD.org>2012-05-17 10:26:16 +0800
commitd8cad434e94d35ef4fbdaa3eba94bcab8221cdfc (patch)
treee7a2d441afb551c86454b28382aee62aee6135e4 /textproc/augeas
parent7bda7364889c95110a3392999c8678e6143db853 (diff)
downloadfreebsd-ports-gnome-d8cad434e94d35ef4fbdaa3eba94bcab8221cdfc.tar.gz
freebsd-ports-gnome-d8cad434e94d35ef4fbdaa3eba94bcab8221cdfc.tar.zst
freebsd-ports-gnome-d8cad434e94d35ef4fbdaa3eba94bcab8221cdfc.zip
- Make Puppet lenses work
PR: ports/167642 Submitted by: tdb
Diffstat (limited to 'textproc/augeas')
-rw-r--r--textproc/augeas/Makefile5
-rw-r--r--textproc/augeas/files/patch-lenses__puppet.aug11
-rw-r--r--textproc/augeas/files/patch-lenses__puppetfileserver.aug11
3 files changed, 26 insertions, 1 deletions
diff --git a/textproc/augeas/Makefile b/textproc/augeas/Makefile
index 2d3411a1f632..2cd25392e3cd 100644
--- a/textproc/augeas/Makefile
+++ b/textproc/augeas/Makefile
@@ -8,7 +8,7 @@
PORTNAME= augeas
PORTVERSION= 0.10.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= textproc
MASTER_SITES= http://augeas.net/download/
@@ -35,5 +35,8 @@ 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
+ @${REINPLACE_CMD} -e 's:%%LOCALBASE%%:${LOCALBASE}:' \
+ ${WRKSRC}/lenses/puppet.aug \
+ ${WRKSRC}/lenses/puppetfileserver.aug
.include <bsd.port.mk>
diff --git a/textproc/augeas/files/patch-lenses__puppet.aug b/textproc/augeas/files/patch-lenses__puppet.aug
new file mode 100644
index 000000000000..9602e1e1388c
--- /dev/null
+++ b/textproc/augeas/files/patch-lenses__puppet.aug
@@ -0,0 +1,11 @@
+--- ./lenses/puppet.aug.orig 2012-05-06 13:14:13.000000000 +0100
++++ ./lenses/puppet.aug 2012-05-06 13:14:45.000000000 +0100
+@@ -38,6 +38,7 @@
+ *************************************************************************)
+ let lns = IniFile.lns record comment
+
+-let filter = (incl "/etc/puppet/puppet.conf")
++let filter = (incl "/etc/puppet/puppet.conf"
++ .incl "%%LOCALBASE%%/etc/puppet/puppet.conf")
+
+ let xfm = transform lns filter
diff --git a/textproc/augeas/files/patch-lenses__puppetfileserver.aug b/textproc/augeas/files/patch-lenses__puppetfileserver.aug
new file mode 100644
index 000000000000..b10683243a61
--- /dev/null
+++ b/textproc/augeas/files/patch-lenses__puppetfileserver.aug
@@ -0,0 +1,11 @@
+--- ./lenses/puppetfileserver.aug.orig 2012-05-06 13:14:17.000000000 +0100
++++ ./lenses/puppetfileserver.aug 2012-05-06 13:15:08.000000000 +0100
+@@ -105,6 +105,7 @@
+ let lns = IniFile.lns record comment
+
+ (* Variable: filter *)
+-let filter = (incl "/etc/puppet/fileserver.conf")
++let filter = (incl "/etc/puppet/fileserver.conf"
++ .incl "%%LOCALBASE%%/etc/puppet/fileserver.conf")
+
+ let xfm = transform lns filter