[pkgsrc/trunk]: pkgsrc/editors/emacs25 emacs25: Do not (manually) inject X11 ...

[leot <leot%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4edd464d2131
branches:  trunk
changeset: 386706:4edd464d2131
user:      leot <leot%pkgsrc.org@localhost>
date:      Sat Oct 27 20:36:50 2018 +0000

description:
emacs25: Do not (manually) inject X11 LDFLAGS via configure

On NetBSD and OpenBSD the configure script injects LD_SWITCH_X_SITE_RPATH
(e.g.  `-Wl,-rpath,/usr/X11R7/lib') early as LDFLAGS leading to link with
possible X11 native libraries when it is not requested.

Should fix PR pkg/53688.

Bump PKGREVISION

Thanks to <maya> for debug-fu help!

diffstat:

 editors/emacs25/Makefile                   |   4 ++--
 editors/emacs25/distinfo                   |   4 +++-
 editors/emacs25/patches/patch-configure    |  17 +++++++++++++++++
 editors/emacs25/patches/patch-configure.ac |  17 +++++++++++++++++
 4 files changed, 39 insertions(+), 3 deletions(-)

diffs (72 lines):

diff -r dafcdc434ea2 -r 4edd464d2131 editors/emacs25/Makefile
--- a/editors/emacs25/Makefile  Sat Oct 27 19:16:21 2018 +0000
+++ b/editors/emacs25/Makefile  Sat Oct 27 20:36:50 2018 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2018/07/20 03:34:11 ryoon Exp $
+# $NetBSD: Makefile,v 1.21 2018/10/27 20:36:50 leot Exp $
 
 CONFLICTS+=    emacs25-nox11-[0-9]*
 
-PKGREVISION= 9
+PKGREVISION= 10
 .include "../../editors/emacs25/Makefile.common"
 
 .include "options.mk"
diff -r dafcdc434ea2 -r 4edd464d2131 editors/emacs25/distinfo
--- a/editors/emacs25/distinfo  Sat Oct 27 19:16:21 2018 +0000
+++ b/editors/emacs25/distinfo  Sat Oct 27 20:36:50 2018 +0000
@@ -1,9 +1,11 @@
-$NetBSD: distinfo,v 1.8 2018/04/13 16:37:35 dholland Exp $
+$NetBSD: distinfo,v 1.9 2018/10/27 20:36:50 leot Exp $
 
 SHA1 (emacs-25.3.tar.gz) = 82ad18404d460e32be29aa883a0e6bfc1901ae75
 RMD160 (emacs-25.3.tar.gz) = 8740bb96aeab77cd35c6d4625f3676991281c7bc
 SHA512 (emacs-25.3.tar.gz) = cd3f51ee5f6c95481f22cd48abfe1d4df1407207ed4b046c9563b24d524f85aa80f15900755091d532c31ea9bd9f6978300128c480d74d28b6b937f96846b1bb
 Size (emacs-25.3.tar.gz) = 62988771 bytes
+SHA1 (patch-configure) = ceb64518bd90b9c6dbd46174ad19e540b5ea96ed
+SHA1 (patch-configure.ac) = 232c4466c7de759881169c7016b07537043a6d54
 SHA1 (patch-src_editfns.c) = 9cb6458e58749780e06d90f111368421212a2987
 SHA1 (patch-src_inotify.c) = 1fdc6566ed57e8418f1ddc85bb03518d7d9d6bb3
 SHA1 (patch-src_lread.c) = a1edaea258b00ba10c176a8ad27711dcac1af7c1
diff -r dafcdc434ea2 -r 4edd464d2131 editors/emacs25/patches/patch-configure
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/editors/emacs25/patches/patch-configure   Sat Oct 27 20:36:50 2018 +0000
@@ -0,0 +1,17 @@
+$NetBSD: patch-configure,v 1.1 2018/10/27 20:36:50 leot Exp $
+
+Do not inject X11 LDFLAGS, pkgsrc handles that.
+Fixes PR pkg/53688.
+
+--- configure.orig     2017-09-11 17:28:38.000000000 +0000
++++ configure
+@@ -9549,7 +9549,8 @@ ac_link="$ac_link $LD_SWITCH_SYSTEM"
+ ## LD_SWITCH_SYSTEM_TEMACS.
+ case "$opsys" in
+   netbsd|openbsd)
+-   LD_SWITCH_SYSTEM="\$(LD_SWITCH_X_SITE_RPATH) $LD_SWITCH_SYSTEM" ;;
++### This is handled by pkgsrc.
++###   LD_SWITCH_SYSTEM="\$(LD_SWITCH_X_SITE_RPATH) $LD_SWITCH_SYSTEM" ;;
+ esac
+ 
+ 
diff -r dafcdc434ea2 -r 4edd464d2131 editors/emacs25/patches/patch-configure.ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/editors/emacs25/patches/patch-configure.ac        Sat Oct 27 20:36:50 2018 +0000
@@ -0,0 +1,17 @@
+$NetBSD: patch-configure.ac,v 1.1 2018/10/27 20:36:50 leot Exp $
+
+Do not inject X11 LDFLAGS, pkgsrc handles that.
+Fixes PR pkg/53688.
+
+--- configure.ac.orig  2017-09-11 16:55:00.000000000 +0000
++++ configure.ac
+@@ -1383,7 +1383,8 @@ ac_link="$ac_link $LD_SWITCH_SYSTEM"
+ ## LD_SWITCH_SYSTEM_TEMACS.
+ case "$opsys" in
+   netbsd|openbsd)
+-   LD_SWITCH_SYSTEM="\$(LD_SWITCH_X_SITE_RPATH) $LD_SWITCH_SYSTEM" ;;
++### This is handled by pkgsrc.
++###   LD_SWITCH_SYSTEM="\$(LD_SWITCH_X_SITE_RPATH) $LD_SWITCH_SYSTEM" ;;
+ esac
+ 
+