gdm: Use SUBST_VARS framework to set PREFIX in patches

[nia <nia%netbsd.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	nia <nia%netbsd.org@localhost>
Pushed By:	nee
Date:		Thu Nov 5 11:08:46 2020 +0100
Changeset:	e1b4b60ace1f9f6052865ab3d68e56c83294fe27

Modified Files:
	gdm/Makefile
	gdm/distinfo
	gdm/patches/patch-configure_ac
	gdm/patches/patch-daemon_gdm-session-worker_c

Log Message:
gdm: Use SUBST_VARS framework to set PREFIX in patches

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=e1b4b60ace1f9f6052865ab3d68e56c83294fe27

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 gdm/Makefile                                  | 6 +++---
 gdm/distinfo                                  | 4 ++--
 gdm/patches/patch-configure_ac                | 8 ++++----
 gdm/patches/patch-daemon_gdm-session-worker_c | 2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diffs:
diff --git a/gdm/Makefile b/gdm/Makefile
index 1e8553e9c0..b9f6125d63 100644
--- a/gdm/Makefile
+++ b/gdm/Makefile
@@ -25,9 +25,9 @@ USE_LANGUAGES=		c c++
 
 SUBST_CLASSES+=		paths
 SUBST_STAGE.paths=	pre-configure
-SUBST_FILES.paths=	daemon/gdm-session-worker.c
-SUBST_SED.paths=	-e 's,$${LOCALBASE},${PREFIX},g'
-SUUBST_VARS.paths=	PREFIX
+SUBST_FILES.paths+=	configure.ac
+SUBST_FILES.paths+=	daemon/gdm-session-worker.c
+SUBST_VARS.paths=	PREFIX
 
 CONFIGURE_ARGS+=	--localstatedir=${VARBASE}
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
diff --git a/gdm/distinfo b/gdm/distinfo
index fba09f10e4..260cb3a8bd 100644
--- a/gdm/distinfo
+++ b/gdm/distinfo
@@ -9,7 +9,7 @@ SHA1 (patch-common_gdm-address_c) = dbcf524882299d890103ed1d90b5d20af28cf667
 SHA1 (patch-common_gdm-common_c) = 347e9a527b22a79bfee6fd2e6f41f0e75e34cec2
 SHA1 (patch-common_gdm-common_h) = dfdb0758c65bc5426b214dd8f4a47a7f9df48aa4
 SHA1 (patch-common_gdm-log_c) = 270e98fd085ac2e7d39a48daa2c52954f7527869
-SHA1 (patch-configure_ac) = 4d8019833c432b550ea6bad1b3e49d3dc57d159f
+SHA1 (patch-configure_ac) = 8b6f3a95e1921970f2511aa107f7b1cf20000998
 SHA1 (patch-daemon_Makefile_am) = d22f31609e2024aa7fa229d96a276a4f2312dab5
 SHA1 (patch-daemon_gdm-display_c) = db972d3248c6e2cd5ac24cc72b838e6d1a8529c3
 SHA1 (patch-daemon_gdm-launch-environment_c) = 8804435a54afe85145cd995eb709096d9928a2b7
@@ -18,7 +18,7 @@ SHA1 (patch-daemon_gdm-manager_c) = 10e61840ceadc2eee610b67399063b565f1b15cc
 SHA1 (patch-daemon_gdm-server_c) = 738e9e17c2b8102ff3d248fbac017b3bf3b114ea
 SHA1 (patch-daemon_gdm-session-record_c) = 367e4b9351a41abf78b4ac47e501e40ed9a93fe5
 SHA1 (patch-daemon_gdm-session-worker-job_c) = 11b5f2c1dde26aa6b6ff25d7913eff009c707724
-SHA1 (patch-daemon_gdm-session-worker_c) = 57f7b4914bb29b2fa78c01cc3f959bd7a7622ea7
+SHA1 (patch-daemon_gdm-session-worker_c) = 89246c3b7d2ac2b3e4b03033a7a6262c149457b0
 SHA1 (patch-daemon_gdm-session-worker_xml) = e384aed90c0ffc6483dad9c806e55a8e9d9f3e13
 SHA1 (patch-daemon_gdm-session_c) = 6cb462c9aebb6958624a6c11416a1dcdbdab0aa4
 SHA1 (patch-daemon_gdm-session_h) = b350278af12865e4f0565e69a0e52238ff9aa4b0
diff --git a/gdm/patches/patch-configure_ac b/gdm/patches/patch-configure_ac
index f921717239..4b1bc2a109 100644
--- a/gdm/patches/patch-configure_ac
+++ b/gdm/patches/patch-configure_ac
@@ -154,10 +154,10 @@ Index: configure.ac
     X_PATH="/opt/X11R6/bin"
     X_SERVER_PATH="/opt/X11R6/bin"
     X_SERVER="/opt/X11R6/bin/X"
-+elif test -x /usr/pkg/bin/X; then
-+   X_PATH="/usr/pkg/bin"
-+   X_SERVER_PATH="/usr/pkg/bin"
-+   X_SERVER="/usr/pkg/bin/X"
++elif test -x @PREFIX@/bin/X; then
++   X_PATH="@PREFIX@/bin"
++   X_SERVER_PATH="@PREFIX@/bin"
++   X_SERVER="@PREFIX@/bin/X"
  else
     # what to do, what to do, this is wrong, but this just sets the
     # defaults, perhaps this user is cross compiling or some such
diff --git a/gdm/patches/patch-daemon_gdm-session-worker_c b/gdm/patches/patch-daemon_gdm-session-worker_c
index fe133a3dfc..4249902110 100644
--- a/gdm/patches/patch-daemon_gdm-session-worker_c
+++ b/gdm/patches/patch-daemon_gdm-session-worker_c
@@ -56,7 +56,7 @@ Index: daemon/gdm-session-worker.c
  
  #ifndef GDM_SESSION_DEFAULT_PATH
 -#define GDM_SESSION_DEFAULT_PATH "/usr/local/bin:/usr/bin:/bin"
-+#define GDM_SESSION_DEFAULT_PATH "${LOCALBASE}/bin:/usr/bin:/bin"
++#define GDM_SESSION_DEFAULT_PATH "@PREFIX@/bin:/usr/bin:/bin"
  #endif
  
  #ifndef GDM_SESSION_ROOT_UID