Date: Wed, 26 Feb 2020 20:53:39 +0000 (UTC) From: Niclas Zeising <zeising@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r527210 - in branches/2020Q1/x11/xdm: . files Message-ID: <202002262053.01QKrdZm016858@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: zeising Date: Wed Feb 26 20:53:39 2020 New Revision: 527210 URL: https://svnweb.freebsd.org/changeset/ports/527210 Log: MFH: r527102 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) Added: branches/2020Q1/x11/xdm/files/patch-config_Makefile.in - copied unchanged from r527102, head/x11/xdm/files/patch-config_Makefile.in Modified: branches/2020Q1/x11/xdm/Makefile Directory Properties: branches/2020Q1/ (props changed) Modified: branches/2020Q1/x11/xdm/Makefile ============================================================================== --- branches/2020Q1/x11/xdm/Makefile Wed Feb 26 20:53:16 2020 (r527209) +++ branches/2020Q1/x11/xdm/Makefile Wed Feb 26 20:53:39 2020 (r527210) @@ -2,7 +2,7 @@ PORTNAME= xdm PORTVERSION= 1.1.12 -PORTREVISION= 1 +PORTREVISION= 3 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org Copied: branches/2020Q1/x11/xdm/files/patch-config_Makefile.in (from r527102, head/x11/xdm/files/patch-config_Makefile.in) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q1/x11/xdm/files/patch-config_Makefile.in Wed Feb 26 20:53:39 2020 (r527210, copy of r527102, head/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)|' +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202002262053.01QKrdZm016858>