diff --git a/textproc/augeas/Makefile b/textproc/augeas/Makefile index 728645ba0704..4d1bd3702b25 100644 --- a/textproc/augeas/Makefile +++ b/textproc/augeas/Makefile @@ -1,44 +1,46 @@ PORTNAME= augeas DISTVERSION= 1.14.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= textproc MASTER_SITES= https://github.com/hercules-team/augeas/releases/download/release-${DISTVERSION}/ -PATCH_SITES= https://github.com/hercules-team/augeas/commit/ +PATCH_SITES= https://github.com/hercules-team/augeas/commit/ \ + https://github.com/hercules-team/augeas/pull/ PATCHFILES+= 7b26cbb74ed634d886ed842e3d5495361d8fd9b1.patch:-p1 # https://github.com/hercules-team/augeas/pull/792 +PATCHFILES+= 863.patch:-p1 # https://github.com/hercules-team/augeas/pull/863 MAINTAINER= puppet@FreeBSD.org COMMENT= Configuration editing tool WWW= https://augeas.net/ LICENSE= LGPL21 TEST_DEPENDS= bash:shells/bash \ gsed:textproc/gsed USES= autoreconf cpe gmake gnome libtool pathfix pkgconfig readline USE_GNOME= libxml2 USE_LDCONFIG= yes GNU_CONFIGURE= yes GNU_CONFIGURE_MANPREFIX=${PREFIX}/share INSTALL_TARGET= install-strip LENSESDIR= ${PREFIX}/share/augeas/lenses .include .if ${OPSYS} == FreeBSD CFLAGS+=-Wno-error=int-conversion .endif 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 @${REINPLACE_CMD} -e 's:/usr/local:${LOCALBASE}:' \ ${WRKSRC}/lenses/puppet.aug \ ${WRKSRC}/lenses/puppet_auth.aug \ ${WRKSRC}/lenses/puppetfileserver.aug .include diff --git a/textproc/augeas/distinfo b/textproc/augeas/distinfo index da7e25700d38..e6e5ad0be998 100644 --- a/textproc/augeas/distinfo +++ b/textproc/augeas/distinfo @@ -1,5 +1,7 @@ -TIMESTAMP = 1683741338 +TIMESTAMP = 1753321317 SHA256 (augeas-1.14.0.tar.gz) = 8c101759ca3d504bd1d805e70e2f615fa686af189dd7cf0529f71d855c087df1 SIZE (augeas-1.14.0.tar.gz) = 2651463 SHA256 (7b26cbb74ed634d886ed842e3d5495361d8fd9b1.patch) = 08b0dbf7f303cd7cb341e2dff13f9b5df7042c2171dcfc89ed00d1d8f4886983 SIZE (7b26cbb74ed634d886ed842e3d5495361d8fd9b1.patch) = 1239 +SHA256 (863.patch) = 7e54e1f98d470c78b297b9e964c88803ff1ac7c290d5eb39e794c2983c238635 +SIZE (863.patch) = 18596 diff --git a/textproc/augeas/files/patch-lenses_rsyslog.aug b/textproc/augeas/files/patch-lenses_rsyslog.aug new file mode 100644 index 000000000000..ee9c839c647a --- /dev/null +++ b/textproc/augeas/files/patch-lenses_rsyslog.aug @@ -0,0 +1,11 @@ +--- lenses/rsyslog.aug.orig 2025-07-24 03:58:56.131711000 +0200 ++++ lenses/rsyslog.aug 2025-07-24 03:59:27.793860000 +0200 +@@ -109,6 +109,8 @@ + + let filter = incl "/etc/rsyslog.conf" + . incl "/etc/rsyslog.d/*" ++ . incl "/usr/local/etc/rsyslog.conf" ++ . incl "/usr/local/etc/rsyslog.d/*" + . Util.stdexcl + + let xfm = transform lns filter