cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFH: r527102

Browse Source 
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

Approved by:	ports-secteam (joenum)
This commit is contained in:
Niclas Zeising 2020-02-26 20:53:39 +00:00
parent c4b69fd407
commit d9b554e4ec
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/branches/2020Q1/; revision=527210
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
x11/xdm/Makefile
View File

@ -2,7 +2,7 @@
PORTNAME= xdm
PORTVERSION= 1.1.12
PORTREVISION= 1
PORTREVISION= 3
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org

13
x11/xdm/files/patch-config_Makefile.in Normal file
View File

@ -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)|'