From 1613f9f638c7ac72cc3d224b5287780d2c59ff7a Mon Sep 17 00:00:00 2001 From: tsutsui Date: Sun, 7 May 2017 06:49:23 +0000 Subject: Make this build (i.e. dump with -batch etc. work) on NetBSD/amd64 7.1. Bump PKGREVISION to denote changes. `emacs -nw' gets a startup window, but emacs (with Xt) still dumps core. XXX: maybe much more prototypes are neccesary for LONG_LISP_OBJECT and XXX: VALBITS>=32 on LP64. --- editors/mule/Makefile | 4 ++-- editors/mule/distinfo | 16 +++++++-------- editors/mule/patches/patch-aa | 18 +++++++++------- editors/mule/patches/patch-ak | 22 +++++++++++++------- editors/mule/patches/patch-bz | 14 +++++++++++-- editors/mule/patches/patch-cb | 16 +++++++++++---- editors/mule/patches/patch-src_alloc_c | 15 +++++++++++++- editors/mule/patches/patch-src_charset_c | 35 +++++++++++++++++++++++++++++--- editors/mule/patches/patch-src_m_amd64.h | 11 +++++++--- 9 files changed, 114 insertions(+), 37 deletions(-) (limited to 'editors') diff --git a/editors/mule/Makefile b/editors/mule/Makefile index a1be5a1423b..578aa350850 100644 --- a/editors/mule/Makefile +++ b/editors/mule/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.53 2017/05/07 04:52:43 tsutsui Exp $ +# $NetBSD: Makefile,v 1.54 2017/05/07 06:49:23 tsutsui Exp $ DISTNAME= mule-2.3 -PKGREVISION= 8 +PKGREVISION= 9 CATEGORIES= editors MASTER_SITES= ftp://ftp.m17n.org/pub/mule/ diff --git a/editors/mule/distinfo b/editors/mule/distinfo index 1f3b189d13c..45e64b2df89 100644 --- a/editors/mule/distinfo +++ b/editors/mule/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.15 2017/04/29 01:11:55 tsutsui Exp $ +$NetBSD: distinfo,v 1.16 2017/05/07 06:49:23 tsutsui Exp $ SHA1 (mule-2.3.tar.gz) = 52737767955caf2fde34b994f367a89c5d8a045f RMD160 (mule-2.3.tar.gz) = 52b93e746a7a796549a44104ab1898954df044bf SHA512 (mule-2.3.tar.gz) = 5f6a9047e6c9d752787d6cab3573516c6efd65cd901fbab74d314a5967e6c68b2dc7c2aa7454d8588d421553530c87dd3ee9692d523d818e01739580cb1201fd Size (mule-2.3.tar.gz) = 10240256 bytes -SHA1 (patch-aa) = 1bae7875584cdc6a26d02481713d6fe774374ad8 +SHA1 (patch-aa) = 0bfb3e5ed5596ac40fb0de6c579a1617b9e2f7b0 SHA1 (patch-ab) = edad8003d994d4418b0effe93d0cce4e807d96fe SHA1 (patch-ac) = 170fa4f6c17c805dd32a90e8bfb3e38c48a9fc20 SHA1 (patch-ad) = 7a52802cd614441320221f450cf97d4e30f40f2b @@ -14,7 +14,7 @@ SHA1 (patch-ag) = 6f86f0f97b24d85964b250ac22124369a5b0ab74 SHA1 (patch-ah) = 4aa61507d90ead8326962180cf75ff88d8fac868 SHA1 (patch-ai) = b3504a83bc51b3712e016f5b3efe9155fcaffa4b SHA1 (patch-aj) = c240cbff3da3ca33663fc2e1d04a3c60c84b4d70 -SHA1 (patch-ak) = 6e020d64fb7d8e76d7bb0772c97f59f179ae31e3 +SHA1 (patch-ak) = 159c211d383c3a25b8772daa3a15019517290ab0 SHA1 (patch-al) = c5e2542651c795a57864811c7019a65f4d991247 SHA1 (patch-am) = 336e2dfa617866265948f6d749ee5325b26714ee SHA1 (patch-an) = 9221c9747c7cf600e9915f8428178d33a55d180b @@ -55,9 +55,9 @@ SHA1 (patch-bv) = b92611d27a1fc4fc0d4bbe171683e057e6dcaf60 SHA1 (patch-bw) = 460728484379cc4325f7b1836cec9a4b3b25e46a SHA1 (patch-bx) = 29a53c87e4038ec02ae1710314d36cf58f58855f SHA1 (patch-by) = 2b1c42e36d5217208fcc83bb0464c09bc38db933 -SHA1 (patch-bz) = e48f13d6194976f8f4174257a06c300a959c9ac7 +SHA1 (patch-bz) = b8030f68f36781583a9eae4a66e3d5e0062f6169 SHA1 (patch-ca) = a98c0d794427e858c6232283f50598d0c55c3f16 -SHA1 (patch-cb) = 4b60c6a54e3e3e20891ef65e3f2d353e64773373 +SHA1 (patch-cb) = 775c85bceb8aff3248becb22cacad40d398fa925 SHA1 (patch-cc) = b85f9888f51d3cdab13a80b20e083e2cfaac85d2 SHA1 (patch-cd) = b34643821a844ef828dbf4e6d9af53c501ac08d3 SHA1 (patch-ce) = d7a0a72c37c2f0e0b34d900da084a776e522754c @@ -75,13 +75,13 @@ SHA1 (patch-lib-src_profile_c) = b4e74a5fc7ab5444dd48dcc6dc231d0382fb7621 SHA1 (patch-lib-src_sorted-doc_c) = 9965f6a6722c2735dfc609a7a15c669f3df8fae4 SHA1 (patch-lib-src_yow_c) = 38fb3e70395525ce8bb4816acd1b9e64c20f3735 SHA1 (patch-src_abbrev_c) = c8dc21ca974625b8fe20e96bea37c61f709fbc1a -SHA1 (patch-src_alloc_c) = aaa4315c2487e3b32deb13940609fbcf4b895bce +SHA1 (patch-src_alloc_c) = 558b195cccab24828cc1ce4d1f8f9c7f31eb6ddc SHA1 (patch-src_buffer_h) = 3d2d0dba98a37265cc4df54bd14b6b51941d9c42 SHA1 (patch-src_bytecode_c) = 93508ddb17e3ba2c7bb921caf85ce1e4e15791f3 SHA1 (patch-src_callint_c) = 0b44807e049c12d2625c950efb14fd5409aba058 SHA1 (patch-src_canna.c) = 77ae8d4f000d6d46f04ff03ef4c06e12635dd566 SHA1 (patch-src_casefiddle.c) = e81ca135224a962ce369c0cdb2e3e4476d5b1d4d -SHA1 (patch-src_charset_c) = 0ccabcbc2f752ec40c05c3f2dd7da342d2c1173e +SHA1 (patch-src_charset_c) = 1d567b4867ff6553aca7abc7100964066bda0180 SHA1 (patch-src_cm.c) = 4c0789eefb23909cec1c6d710a24814f9db5be5d SHA1 (patch-src_cm.h) = ab0e053d24fc23b0a589954dfe89dd70aab4cb41 SHA1 (patch-src_data.c) = 86909ed980ff73841a0500dba5080e10d63a3c93 @@ -94,7 +94,7 @@ SHA1 (patch-src_frame.h) = 3a36099f161543af0a05f125699f36bd17c49b39 SHA1 (patch-src_insdel.c) = 75aca770fd35ac99d258ee1c4392a0f7119150c9 SHA1 (patch-src_keyboard.h) = 4729c97d1d80b93f387ad3187d7d8260d504ab24 SHA1 (patch-src_keymap_c) = dd0201aca4c50c249d2412998f9fd5249c34d58c -SHA1 (patch-src_m_amd64.h) = eadba5e4bc5f4e8351208f52d5130e6919cb480b +SHA1 (patch-src_m_amd64.h) = 91c497b3a1d51275b36d6f9c03c9f852c9235823 SHA1 (patch-src_macros_c) = c26d867719a2c87aa0e1a9586a6043751d6d0e7d SHA1 (patch-src_marker.c) = 7c013ec210071d6c84d6c6d955186aa882aeaaf3 SHA1 (patch-src_mcpath_c) = 6f2fb95a1b77d2bacd50e3361d31d2b8c45df002 diff --git a/editors/mule/patches/patch-aa b/editors/mule/patches/patch-aa index c73eddd8eb2..29cb8f60322 100644 --- a/editors/mule/patches/patch-aa +++ b/editors/mule/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.3 2017/04/29 01:11:55 tsutsui Exp $ +$NetBSD: patch-aa,v 1.4 2017/05/07 06:49:23 tsutsui Exp $ --- src/s/netbsd.h.orig 1995-10-12 10:53:15.000000000 +0000 +++ src/s/netbsd.h @@ -38,7 +38,7 @@ $NetBSD: patch-aa,v 1.3 2017/04/29 01:11:55 tsutsui Exp $ /* These definitions should work for either dynamic or static linking, whichever is the default for `cc -nostdlib'. */ #define HAVE_TEXT_START /* No need to define `start_of_text'. */ -@@ -54,14 +61,34 @@ +@@ -54,14 +61,40 @@ #define N_BSSADDR(x) (N_ALIGN(x, N_DATADDR(x)+x.a_data)) #define N_TRELOFF(x) N_RELOFF(x) #endif @@ -50,11 +50,7 @@ $NetBSD: patch-aa,v 1.3 2017/04/29 01:11:55 tsutsui Exp $ #define HAVE_WAIT_HEADER +#define WAIT_USE_INT - --/* 94.7.29 by T.Sakakibara */ --#ifdef emacs --#include --#endif ++ +#define NO_MATHERR + +#define AMPERSAND_FULL_NAME @@ -81,3 +77,11 @@ $NetBSD: patch-aa,v 1.3 2017/04/29 01:11:55 tsutsui Exp $ + this problem, and will also work on earlier NetBSD releases */ + +#define LINKER $(CC) -nostartfiles + +-/* 94.7.29 by T.Sakakibara */ + #ifdef emacs +-#include ++#include ++#include ++#include + #endif diff --git a/editors/mule/patches/patch-ak b/editors/mule/patches/patch-ak index f700368f525..184e954930f 100644 --- a/editors/mule/patches/patch-ak +++ b/editors/mule/patches/patch-ak @@ -1,4 +1,4 @@ -$NetBSD: patch-ak,v 1.5 2013/04/21 15:39:59 joerg Exp $ +$NetBSD: patch-ak,v 1.6 2017/05/07 06:49:23 tsutsui Exp $ - use standard headers - don't declare own errno @@ -14,7 +14,15 @@ $NetBSD: patch-ak,v 1.5 2013/04/21 15:39:59 joerg Exp $ #undef NULL #include "termchar.h" #include "termopts.h" -@@ -100,8 +101,6 @@ the Free Software Foundation, 675 Mass A +@@ -63,6 +64,7 @@ the Free Software Foundation, 675 Mass A + #include "termhooks.h" + #endif + #include "macros.h" ++#include "process.h" + #include "frame.h" + #include "window.h" + #include "commands.h" +@@ -100,8 +102,6 @@ the Free Software Foundation, 675 Mass A /* Include systime.h after xterm.h to avoid double inclusion of time.h. */ #include "systime.h" @@ -23,7 +31,7 @@ $NetBSD: patch-ak,v 1.5 2013/04/21 15:39:59 joerg Exp $ /* Variables for blockinput.h: */ /* Non-zero if interrupt input is blocked right now. */ -@@ -301,7 +300,7 @@ Lisp_Object Vlast_event_frame; +@@ -301,7 +301,7 @@ Lisp_Object Vlast_event_frame; /* The timestamp of the last input event we received from the X server. X Windows wants this for selection ownership. */ @@ -32,7 +40,7 @@ $NetBSD: patch-ak,v 1.5 2013/04/21 15:39:59 joerg Exp $ Lisp_Object Qself_insert_command; Lisp_Object Qforward_char; -@@ -582,8 +581,7 @@ echo_prompt (str) +@@ -582,8 +582,7 @@ echo_prompt (str) C can be a character, which is printed prettily ("M-C-x" and all that jazz), or a symbol, whose name is printed. */ @@ -42,7 +50,7 @@ $NetBSD: patch-ak,v 1.5 2013/04/21 15:39:59 joerg Exp $ { extern char *push_key_description (); -@@ -629,7 +627,7 @@ echo_char (c) +@@ -629,7 +628,7 @@ echo_char (c) /* Temporarily add a dash to the end of the echo string if it's not empty, so that it serves as a mini-prompt for the very next character. */ @@ -51,7 +59,7 @@ $NetBSD: patch-ak,v 1.5 2013/04/21 15:39:59 joerg Exp $ { if (!immediate_echo && echoptr == echobuf) return; -@@ -3570,7 +3568,7 @@ gobble_input (expected) +@@ -3570,7 +3569,7 @@ gobble_input (expected) /* Put a buffer_switch_event in the buffer so that read_key_sequence will notice the new current buffer. */ @@ -60,7 +68,7 @@ $NetBSD: patch-ak,v 1.5 2013/04/21 15:39:59 joerg Exp $ { struct input_event event; Lisp_Object tem; -@@ -5633,7 +5631,6 @@ On such systems, Emacs starts a subshell +@@ -5633,7 +5632,6 @@ On such systems, Emacs starts a subshell int old_height, old_width; int width, height; struct gcpro gcpro1, gcpro2; diff --git a/editors/mule/patches/patch-bz b/editors/mule/patches/patch-bz index b86534324b9..42bfcf43dc3 100644 --- a/editors/mule/patches/patch-bz +++ b/editors/mule/patches/patch-bz @@ -1,6 +1,6 @@ -$NetBSD: patch-bz,v 1.1 2006/01/04 20:35:08 joerg Exp $ +$NetBSD: patch-bz,v 1.2 2017/05/07 06:49:23 tsutsui Exp $ ---- lib-src/emacsclient.c.orig 2006-01-04 17:44:54.000000000 +0000 +--- lib-src/emacsclient.c.orig 1994-07-27 17:57:35.000000000 +0000 +++ lib-src/emacsclient.c @@ -53,7 +53,6 @@ main (argc, argv) #include @@ -10,3 +10,13 @@ $NetBSD: patch-bz,v 1.1 2006/01/04 20:35:08 joerg Exp $ main (argc, argv) int argc; +@@ -66,9 +65,6 @@ main (argc, argv) + char *homedir, *cwd, *str; + char string[BUFSIZ]; + +- char *getenv (), *getwd (); +- int geteuid (); +- + if (argc < 2) + { + fprintf (stderr, "Usage: %s [+linenumber] filename\n", argv[0]); diff --git a/editors/mule/patches/patch-cb b/editors/mule/patches/patch-cb index ceaeff9fa22..30433de32f6 100644 --- a/editors/mule/patches/patch-cb +++ b/editors/mule/patches/patch-cb @@ -1,4 +1,4 @@ -$NetBSD: patch-cb,v 1.3 2013/04/21 15:39:59 joerg Exp $ +$NetBSD: patch-cb,v 1.4 2017/05/07 06:49:23 tsutsui Exp $ - use standard headers - don't declare own errno @@ -14,7 +14,15 @@ $NetBSD: patch-cb,v 1.3 2013/04/21 15:39:59 joerg Exp $ #include "lisp.h" #include "termchar.h" -@@ -2047,7 +2049,6 @@ SIGTYPE +@@ -71,6 +73,7 @@ the Free Software Foundation, 675 Mass A + #include "dispextern.h" + #endif + #include "buffer.h" ++#include "process.h" + #include "frame.h" + #include "window.h" + #include "commands.h" +@@ -2047,7 +2050,6 @@ SIGTYPE window_change_signal () { int width, height; @@ -22,7 +30,7 @@ $NetBSD: patch-cb,v 1.3 2013/04/21 15:39:59 joerg Exp $ int old_errno = errno; get_frame_size (&width, &height); -@@ -2111,9 +2112,7 @@ do_pending_window_change () +@@ -2111,9 +2113,7 @@ do_pending_window_change () redisplay. Since this tries to resize windows, we can't call it from a signal handler. */ @@ -33,7 +41,7 @@ $NetBSD: patch-cb,v 1.3 2013/04/21 15:39:59 joerg Exp $ { /* If we can't deal with the change now, queue it for later. */ if (delay) -@@ -2451,7 +2450,7 @@ char *terminal_type; +@@ -2451,7 +2451,7 @@ char *terminal_type; /* Then invoke its decoding routine to set up variables in the terminal package */ diff --git a/editors/mule/patches/patch-src_alloc_c b/editors/mule/patches/patch-src_alloc_c index 94f0d8b68af..8d4df9f0eac 100644 --- a/editors/mule/patches/patch-src_alloc_c +++ b/editors/mule/patches/patch-src_alloc_c @@ -1,4 +1,4 @@ -$NetBSD: patch-src_alloc_c,v 1.3 2017/04/29 01:11:55 tsutsui Exp $ +$NetBSD: patch-src_alloc_c,v 1.4 2017/05/07 06:49:23 tsutsui Exp $ - use standard includes @@ -12,3 +12,16 @@ $NetBSD: patch-src_alloc_c,v 1.3 2017/04/29 01:11:55 tsutsui Exp $ #include #include "lisp.h" +@@ -128,9 +129,11 @@ int stack_copy_size; + /* Non-zero means ignore malloc warnings. Set during initialization. */ + int ignore_warnings; + +-static void mark_object (), mark_buffer (); ++static void mark_object (Lisp_Object *), mark_buffer (Lisp_Object); ++static void mark_interval (INTERVAL, Lisp_Object); + static void clear_marks (), gc_sweep (); + static void compact_strings (); ++Lisp_Object make_pure_vector (int); + + /* Versions of malloc and realloc that print warnings as memory gets full. */ + diff --git a/editors/mule/patches/patch-src_charset_c b/editors/mule/patches/patch-src_charset_c index f3ebed0312e..a1921cc676b 100644 --- a/editors/mule/patches/patch-src_charset_c +++ b/editors/mule/patches/patch-src_charset_c @@ -1,10 +1,16 @@ -$NetBSD: patch-src_charset_c,v 1.1 2011/12/24 17:07:07 dholland Exp $ +$NetBSD: patch-src_charset_c,v 1.2 2017/05/07 06:49:23 tsutsui Exp $ - use standard headers ---- src/charset.c~ 1995-07-18 11:35:56.000000000 +0000 +--- src/charset.c.orig 1995-07-18 11:35:56.000000000 +0000 +++ src/charset.c -@@ -73,6 +73,7 @@ the Free Software Foundation, 675 Mass A +@@ -68,11 +68,13 @@ the Free Software Foundation, 675 Mass A + Bug in charwidth() fixed. */ + + #include ++#include + + #ifdef emacs #include #include #else /* not emacs */ @@ -12,3 +18,26 @@ $NetBSD: patch-src_charset_c,v 1.1 2011/12/24 17:07:07 dholland Exp $ #define xmalloc (void *)malloc #define xrealloc (void *)realloc #endif /* emacs */ +@@ -117,10 +119,14 @@ unsigned char lc_table[4][128]; + but reverse DIRECTION. */ + unsigned char rev_lc_table[256]; + ++int mchar_to_string(unsigned int, unsigned char *); ++void update_mc_table(unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, char *, char *); ++ + /* 93.5.27 by K.Handa + Use macro CHARtoSTR (c,str) instead of calling mchar_to_string() directly. + */ + /* 92.1.16 by K.Handa */ ++int + mchar_to_string (c, str) + register unsigned int c; + register unsigned char *str; +@@ -194,6 +200,7 @@ string_to_mchar (str, size) + /* end of patch */ + + /* Add direction, 92.8.2 Y.Niibe */ ++void + update_mc_table(lc, bytes, clm, type, graphic, final, direction, doc, reg) + unsigned char lc, bytes, clm, type, graphic, final, direction; + char *doc, *reg; diff --git a/editors/mule/patches/patch-src_m_amd64.h b/editors/mule/patches/patch-src_m_amd64.h index 483b072e33a..e887b245c53 100644 --- a/editors/mule/patches/patch-src_m_amd64.h +++ b/editors/mule/patches/patch-src_m_amd64.h @@ -1,10 +1,10 @@ -$NetBSD: patch-src_m_amd64.h,v 1.2 2011/12/24 17:07:07 dholland Exp $ +$NetBSD: patch-src_m_amd64.h,v 1.3 2017/05/07 06:49:23 tsutsui Exp $ amd64 support. ---- src/m/amd64.h.orig 2011-12-24 14:41:29.000000000 +0000 +--- src/m/amd64.h.orig 2017-05-06 21:49:54.000000000 +0000 +++ src/m/amd64.h -@@ -0,0 +1,156 @@ +@@ -0,0 +1,161 @@ +/* machine description file for AMD x86-64. + Copyright (C) 2002 Free Software Foundation, Inc. + @@ -44,6 +44,8 @@ amd64 support. + +#define LISP_OBJECT_BITS 64 + ++#define PNTR_COMPARISON_TYPE unsigned long ++ +/* The following line tells the configuration script what sort of + operating system this machine is likely to run. + USUAL-OPSYS="linux" */ @@ -156,6 +158,9 @@ amd64 support. + +#define XPNTR(a) XUINT (a) + ++/* Define XMARKBIT to avoid a dumb optimization using sign bit */ ++#define XMARKBIT(a) ((a) & MARKBIT) ++ +/* #undef START_FILES */ /* XXX */ +/* #define START_FILES pre-crt0.o /usr/lib64/crt1.o /usr/lib64/crti.o */ /* XXX */ + -- cgit v1.2.3