diff options
| author | Kyle Evans <kevans@FreeBSD.org> | 2020-06-08 04:41:31 +0000 |
|---|---|---|
| committer | Kyle Evans <kevans@FreeBSD.org> | 2020-06-08 04:41:31 +0000 |
| commit | 5fb9edd6bda35148388cbd149c7fa48f4749f514 (patch) | |
| tree | fd3fa9b642407455ac306d9a4732b8ea68fd8c43 /sysutils/conky/Makefile | |
| parent | - Update to 1.1.0.1 (diff) | |
Multiple ports: improve regex compliance
These changes largely fall into just two categories:
1. Need textproc/gsed for GNU extensions
2. Extraneous escapes that can go away
For #1, there's a further subdivision into those that require autoconf magic
and those that can get away with BINARY_ALIAS=sed=${LOCALBASE}/bin/gsed.
-CURRENT will soon gain GNU extensions, but these will take longer to get to
all supported releases; we must switch them to gsed to ensure we're actually
properly building them as intended.
For #2, I've fixed these as I can and we should upstream these fixes.
PORTREVISION is bumped for all of the above, because we will almost
certainly build these differently when the replacements actually start
working.
These were all detected by the below-referenced exp-run [1]. The patch
included forbids many ordinary characters from being escaped, since we'll
later imbue those with special meanings. This has had the nice side effect
of picking up various things that we didn't handle properly, e.g. \t and \r
for tab and carriage return.
PR: 229925 [1]
Approved by: koobs (mentor)
Approved by: portmgr (blanket: trivial build fixes)
MFH: no (invasive risk)
Differential Revision: https://reviews.freebsd.org/D25185
Notes
Notes:
svn path=/head/; revision=538197
Diffstat (limited to '')
| -rw-r--r-- | sysutils/conky/Makefile | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sysutils/conky/Makefile b/sysutils/conky/Makefile index 133b6184863a..694eff71f438 100644 --- a/sysutils/conky/Makefile +++ b/sysutils/conky/Makefile @@ -4,7 +4,7 @@ PORTNAME= conky PORTVERSION= 1.11.5 DISTVERSIONPREFIX= v -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= sysutils MAINTAINER= madpilot@FreeBSD.org @@ -13,7 +13,8 @@ COMMENT?= Advanced, highly configurable system monitor for X11 LIB_DEPENDS= libinotify.so:devel/libinotify BUILD_DEPENDS= db2x_xsltproc:textproc/docbook2X \ docbook-xsl>=0:textproc/docbook-xsl \ - xsltproc:textproc/libxslt + xsltproc:textproc/libxslt \ + gsed:textproc/gsed USES= cpe cmake:noninja compiler:c++11-lib gettext-runtime iconv \ localbase lua:52 pkgconfig tar:bzip2 @@ -23,7 +24,8 @@ CMAKE_ARGS= -DBUILD_PORT_MONITORS:BOOL=false \ -DBUILD_HDDTEMP:BOOL=false \ -DBUILD_IOSTATS:BOOL=false \ -DBUILD_AUDACIOUS:BOOL=false \ - -DBUILD_DOCS:BOOL=true + -DBUILD_DOCS:BOOL=true \ + -DAPP_SED=${LOCALBASE}/bin/gsed CONFLICTS?= conky-awesome-[0-9]* SLAVEDIRS= sysutils/conky-awesome |