mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-01 05:45:45 +00:00
Code Issues Releases Activity

- Remove custom rc.conf lens in favor of using of a patch which let's the

Browse Source 
built in shellvars lens take care of this file. Upstream has already
  patched to do this and it should be in the next release. Users should
  be aware that extra quoting may be necessary.
This commit is contained in:
Steve Wills 2012-05-02 00:23:27 +00:00
parent b6539a2ee9
commit f17877dea1
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=295825
5 changed files with 11 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
textproc/augeas/Makefile
View File

@ -8,7 +8,7 @@
PORTNAME= augeas
PORTVERSION= 0.10.0
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= textproc
MASTER_SITES= http://augeas.net/download/
@ -36,9 +36,4 @@ post-patch:
@${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
.include <bsd.port.mk>

10
textproc/augeas/files/patch-lenses__shellvars.aug Normal file
View File

@ -0,0 +1,10 @@
--- ./lenses/shellvars.aug.orig 2012-05-01 13:51:21.934163842 -0400
+++ ./lenses/shellvars.aug 2012-05-01 13:52:04.015160071 -0400
@@ -196,6 +196,7 @@
. incl "/etc/cron-apt/config"
. incl "/etc/environment"
. incl "/etc/blkid.conf"
+ . incl "/etc/rc.conf"
let filter = filter_sysconfig
. filter_ifcfg

21
textproc/augeas/files/rcconf.aug
View File

@ -1,21 +0,0 @@
module RcConf =
autoload xfm
let comment = Util.comment
let empty = Util.empty
let eol = Util.eol
let eq = Util.del_str "="
let dquot = Util.del_str "\""
let char = /[^\n]/
let var_name = /[A-Za-z0-9_.]+/
let value = dquot . store char* . dquot
let kv_pair = [ key var_name . eq . value . eol ]
let lns = (comment | empty | kv_pair)*
let filter = incl "/etc/rc.conf"
. incl "/boot/loader.conf"
. Util.stdexcl
let xfm = transform lns filter

24
textproc/augeas/files/test_rcconf.aug
View File

@ -1,24 +0,0 @@
module Test_RcConf =
let conf = "# /etc/rc.conf
hostname=\"host.domain\"
defaultrouter=\"4.3.2.1\"
ipv4_addrs_em0=\"4.3.2.2/24\"
foo_enable=\"YES\"
foo_flags=\"-a --foobar\"
bar_enable=\"NO\"
bar_flags=\"\"
"
test RcConf.lns get conf =
{ "#comment" = "/etc/rc.conf" }
{}
{ "hostname" = "host.domain" }
{ "defaultrouter" = "4.3.2.1" }
{ "ipv4_addrs_em0" = "4.3.2.2/24" }
{}
{ "foo_enable" = "YES" }
{ "foo_flags" = "-a --foobar" }
{ "bar_enable" = "NO" }
{ "bar_flags" = "" }

2
textproc/augeas/pkg-plist
View File

@ -231,8 +231,6 @@ libdata/pkgconfig/augeas.pc
%%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 %%DATADIR%%/lenses/dist/tests