[pkgsrc/pkgsrc-2015Q1]: pkgsrc/devel/st Pullup ticket #4672 - requested by joerg

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4f620721a49e
branches:  pkgsrc-2015Q1
changeset: 649173:4f620721a49e
user:      tron <tron%pkgsrc.org@localhost>
date:      Sat Apr 18 22:30:04 2015 +0000

description:
Pullup ticket #4672 - requested by joerg
devel/st: build fix

Revisions pulled up:
- devel/st/distinfo                                             1.8
- devel/st/patches/patch-md_h                                   1.2

---
   Module Name: pkgsrc
   Committed By:        joerg
   Date:                Sat Apr 18 20:41:44 UTC 2015

   Modified Files:
        pkgsrc/devel/st: distinfo
        pkgsrc/devel/st/patches: patch-md_h

   Log Message:
   Support NetBSD/ARM. Simplify NetBSD/amd64.

diffstat:

 devel/st/distinfo           |   4 ++--
 devel/st/patches/patch-md_h |  10 ++++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diffs (39 lines):

diff -r bd57a02b6a9b -r 4f620721a49e devel/st/distinfo
--- a/devel/st/distinfo Sat Apr 18 22:13:47 2015 +0000
+++ b/devel/st/distinfo Sat Apr 18 22:30:04 2015 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.7 2012/12/17 01:58:55 dholland Exp $
+$NetBSD: distinfo,v 1.7.20.1 2015/04/18 22:30:04 tron Exp $
 
 SHA1 (st-1.8.tar.gz) = 3f9c9bfe0a6074ccfcb642c1b95320dba496b9e8
 RMD160 (st-1.8.tar.gz) = 951c55807d2164c1a8f1fcde75d97aeb6a47a256
 Size (st-1.8.tar.gz) = 106604 bytes
 SHA1 (patch-aa) = 57fcd19a3768d198a874edddaf9f4395e002d243
 SHA1 (patch-ab) = b1967d6ee1dcdd549f3f90f53f51aa253be2dc5c
-SHA1 (patch-md_h) = 1c542014ac3607908b7484642293b9e0a5709ac2
+SHA1 (patch-md_h) = 954e32e14277d6875c0fe60d51d8c374c88c6c50
diff -r bd57a02b6a9b -r 4f620721a49e devel/st/patches/patch-md_h
--- a/devel/st/patches/patch-md_h       Sat Apr 18 22:13:47 2015 +0000
+++ b/devel/st/patches/patch-md_h       Sat Apr 18 22:30:04 2015 +0000
@@ -1,15 +1,17 @@
-$NetBSD: patch-md_h,v 1.1 2012/12/17 01:58:55 dholland Exp $
+$NetBSD: patch-md_h,v 1.1.20.1 2015/04/18 22:30:04 tron Exp $
 
-Add amd64 support on NetBSD by cribbing from existing OpenBSD support.
+Support for NetBSD/amd64 and NetBSD/arm.
 
 --- md.h~      2007-03-14 02:53:10.000000000 +0000
 +++ md.h
-@@ -482,6 +482,8 @@ extern void _st_md_cxt_restore(jmp_buf e
+@@ -482,6 +482,10 @@ extern void _st_md_cxt_restore(jmp_buf e
  #define MD_JB_SP   0
  #elif defined(__vax__)
  #define MD_JB_SP   2
 +#elif defined(__amd64__)
-+#define MD_JB_SP   6
++#define MD_JB_SP   _JB_RSP
++#elif defined(__arm__)
++#define MD_JB_SP   _JB_REG_R13
  #else
  #error Unknown CPU architecture
  #endif