diff options
| author | Niclas Zeising <zeising@FreeBSD.org> | 2020-02-26 04:45:40 +0800 |
|---|---|---|
| committer | Niclas Zeising <zeising@FreeBSD.org> | 2020-02-26 04:45:40 +0800 |
| commit | eb482bc1288bbe057da83182745b511b15e6b7d3 (patch) | |
| tree | d12ffb446591bdf52ff15f695b280ecace3c8651 /x11/xdm | |
| parent | 1bfefbec5da6a33d114bab1771111756307a9d4f (diff) | |
| download | freebsd-ports-gnome-eb482bc1288bbe057da83182745b511b15e6b7d3.tar.gz freebsd-ports-gnome-eb482bc1288bbe057da83182745b511b15e6b7d3.tar.zst freebsd-ports-gnome-eb482bc1288bbe057da83182745b511b15e6b7d3.zip | |
x11/xdm: Fix generation of etc/X11/xdm/Xresources
By some stupidity of autotools, spacing for a sed regexp used to generate
Xresources gets broken, and the sed command doen't match as it should. This
results in an Xresources file with an extra '#endif /* XPM */', which breaks
the file.
Patch Makefile.in to fix the regexp and have Xresources generated properly.
PR: 244404
Reported by: olgeni
MFH: 2020Q1
Diffstat (limited to 'x11/xdm')
| -rw-r--r-- | x11/xdm/Makefile | 2 | ||||
| -rw-r--r-- | x11/xdm/files/patch-config_Makefile.in | 13 |
2 files changed, 14 insertions, 1 deletions
diff --git a/x11/xdm/Makefile b/x11/xdm/Makefile index 30ed7bfb3ce9..3d651a4e19a6 100644 --- a/x11/xdm/Makefile +++ b/x11/xdm/Makefile @@ -2,7 +2,7 @@ PORTNAME= xdm PORTVERSION= 1.1.12 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/xdm/files/patch-config_Makefile.in b/x11/xdm/files/patch-config_Makefile.in new file mode 100644 index 000000000000..794c1f2d8abf --- /dev/null +++ b/x11/xdm/files/patch-config_Makefile.in @@ -0,0 +1,13 @@ +--- config/Makefile.in.orig 2019-03-02 22:06:24 UTC ++++ config/Makefile.in +@@ -391,8 +391,8 @@ EXTRA_DIST = Xservers.ws.in Xservers.fs \ + @USE_XPM_FALSE@XPM_SED_FLAGS = -e '/ifdef XPM/,/endif \/\* XPM \*\//d' + + # Defines used when sed'ing config files to replace settings in the files +-@USE_XPM_TRUE@XPM_SED_FLAGS = -e '/ifdef XPM/d' -e '/endif \/\* XPM \ +-@USE_XPM_TRUE@ \*\//d' -e 's|BITMAPDIR|$(XDM_PIXMAPDIR)|' -e \ ++@USE_XPM_TRUE@XPM_SED_FLAGS = -e '/ifdef XPM/d' -e '/endif \/\* XPM \*\//d' \ ++@USE_XPM_TRUE@ -e 's|BITMAPDIR|$(XDM_PIXMAPDIR)|' -e \ + @USE_XPM_TRUE@ 's|XDM_PIXMAP|$(XDM_PIXMAP)|' -e \ + @USE_XPM_TRUE@ 's|XDM_BWPIXMAP|$(XDM_BWPIXMAP)|' + |