Sat Apr 18 22:30:04 2015 UTC ()
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.


(tron)
diff -r1.7 -r1.7.20.1 pkgsrc/devel/st/distinfo
diff -r1.1 -r1.1.20.1 pkgsrc/devel/st/patches/patch-md_h
cvs diff -r1.7 -r1.7.20.1 pkgsrc/devel/st/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/st/distinfo 2012/12/17 01:58:55 1.7
+++ pkgsrc/devel/st/distinfo 2015/04/18 22:30:04 1.7.20.1
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.7 2012/12/17 01:58:55 dholland Exp $ 1$NetBSD: distinfo,v 1.7.20.1 2015/04/18 22:30:04 tron Exp $
2 2
3SHA1 (st-1.8.tar.gz) = 3f9c9bfe0a6074ccfcb642c1b95320dba496b9e8 3SHA1 (st-1.8.tar.gz) = 3f9c9bfe0a6074ccfcb642c1b95320dba496b9e8
4RMD160 (st-1.8.tar.gz) = 951c55807d2164c1a8f1fcde75d97aeb6a47a256 4RMD160 (st-1.8.tar.gz) = 951c55807d2164c1a8f1fcde75d97aeb6a47a256
5Size (st-1.8.tar.gz) = 106604 bytes 5Size (st-1.8.tar.gz) = 106604 bytes
6SHA1 (patch-aa) = 57fcd19a3768d198a874edddaf9f4395e002d243 6SHA1 (patch-aa) = 57fcd19a3768d198a874edddaf9f4395e002d243
7SHA1 (patch-ab) = b1967d6ee1dcdd549f3f90f53f51aa253be2dc5c 7SHA1 (patch-ab) = b1967d6ee1dcdd549f3f90f53f51aa253be2dc5c
8SHA1 (patch-md_h) = 1c542014ac3607908b7484642293b9e0a5709ac2 8SHA1 (patch-md_h) = 954e32e14277d6875c0fe60d51d8c374c88c6c50
cvs diff -r1.1 -r1.1.20.1 pkgsrc/devel/st/patches/patch-md_h (expand / switch to unified diff)

--- pkgsrc/devel/st/patches/patch-md_h 2012/12/17 01:58:55 1.1
+++ pkgsrc/devel/st/patches/patch-md_h 2015/04/18 22:30:04 1.1.20.1
@@ -1,15 +1,17 @@ @@ -1,15 +1,17 @@
1$NetBSD: patch-md_h,v 1.1 2012/12/17 01:58:55 dholland Exp $ 1$NetBSD: patch-md_h,v 1.1.20.1 2015/04/18 22:30:04 tron Exp $
2 2
3Add amd64 support on NetBSD by cribbing from existing OpenBSD support. 3Support for NetBSD/amd64 and NetBSD/arm.
4 4
5--- md.h~ 2007-03-14 02:53:10.000000000 +0000 5--- md.h~ 2007-03-14 02:53:10.000000000 +0000
6+++ md.h 6+++ md.h
7@@ -482,6 +482,8 @@ extern void _st_md_cxt_restore(jmp_buf e 7@@ -482,6 +482,10 @@ extern void _st_md_cxt_restore(jmp_buf e
8 #define MD_JB_SP 0 8 #define MD_JB_SP 0
9 #elif defined(__vax__) 9 #elif defined(__vax__)
10 #define MD_JB_SP 2 10 #define MD_JB_SP 2
11+#elif defined(__amd64__) 11+#elif defined(__amd64__)
12+#define MD_JB_SP 6 12+#define MD_JB_SP _JB_RSP
 13+#elif defined(__arm__)
 14+#define MD_JB_SP _JB_REG_R13
13 #else 15 #else
14 #error Unknown CPU architecture 16 #error Unknown CPU architecture
15 #endif 17 #endif