ports/167642: [PATCH] textproc/augeas: Make Puppet lenses work on FreeBSD

Tim Bishop tdb at FreeBSD.org
Sun May 6 14:10:10 UTC 2012


>Number:         167642
>Category:       ports
>Synopsis:       [PATCH] textproc/augeas: Make Puppet lenses work on FreeBSD
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun May 06 14:10:08 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     Tim Bishop
>Release:        FreeBSD 9.0-STABLE i386
>Organization:
>Environment:
System: FreeBSD pendennis.kent.ac.uk 9.0-STABLE FreeBSD 9.0-STABLE #3: Tue Jan 10 18:13:10 GMT 2012
>Description:
The two Puppet lenses expect the config files to be in /etc. On
FreeBSD they're in /usr/local/etc. This patch fixes the two lenses so
they'll correctly identify the Puppet config files on FreeBSD.

I'll submit something upstream too.

Added file(s):
- files/patch-lenses__puppet.aug
- files/patch-lenses__puppetfileserver.aug

Port maintainer (swills at FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:

--- augeas-0.10.0_4.patch begins here ---
Index: Makefile
===================================================================
RCS file: /u1/freebsd/cvs/ports/textproc/augeas/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- Makefile	3 May 2012 01:55:03 -0000	1.12
+++ Makefile	6 May 2012 12:17:25 -0000
@@ -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 @@
 	@${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>
Index: files/patch-lenses__puppet.aug
===================================================================
RCS file: files/patch-lenses__puppet.aug
diff -N files/patch-lenses__puppet.aug
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-lenses__puppet.aug	6 May 2012 12:15:14 -0000
@@ -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
Index: files/patch-lenses__puppetfileserver.aug
===================================================================
RCS file: files/patch-lenses__puppetfileserver.aug
diff -N files/patch-lenses__puppetfileserver.aug
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-lenses__puppetfileserver.aug	6 May 2012 12:15:14 -0000
@@ -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
--- augeas-0.10.0_4.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:



More information about the freebsd-ports-bugs mailing list