From owner-svn-ports-branches@freebsd.org Wed Feb 26 20:53:40 2020 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C1642244CCA; Wed, 26 Feb 2020 20:53:40 +0000 (UTC) (envelope-from zeising@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48SSh4318Dz3x09; Wed, 26 Feb 2020 20:53:40 +0000 (UTC) (envelope-from zeising@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 243785A11; Wed, 26 Feb 2020 20:53:40 +0000 (UTC) (envelope-from zeising@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 01QKreBq016860; Wed, 26 Feb 2020 20:53:40 GMT (envelope-from zeising@FreeBSD.org) Received: (from zeising@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 01QKrdZm016858; Wed, 26 Feb 2020 20:53:39 GMT (envelope-from zeising@FreeBSD.org) Message-Id: <202002262053.01QKrdZm016858@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: zeising set sender to zeising@FreeBSD.org using -f From: Niclas Zeising Date: Wed, 26 Feb 2020 20:53:39 +0000 (UTC) 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 X-SVN-Group: ports-branches X-SVN-Commit-Author: zeising X-SVN-Commit-Paths: in branches/2020Q1/x11/xdm: . files X-SVN-Commit-Revision: 527210 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Feb 2020 20:53:40 -0000 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)|' +