Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/emulators/tme tme: appease pkglint and also rename old...
details: https://anonhg.NetBSD.org/pkgsrc/rev/13d4e31b528e
branches: trunk
changeset: 436964:13d4e31b528e
user: tsutsui <tsutsui%pkgsrc.org@localhost>
date: Thu Aug 13 05:59:51 2020 +0000
description:
tme: appease pkglint and also rename old-style patch-xx files.
diffstat:
emulators/tme/Makefile | 8 +-
emulators/tme/distinfo | 36 ++++----
emulators/tme/patches/patch-aa | 66 -----------------
emulators/tme/patches/patch-ab | 13 ---
emulators/tme/patches/patch-ac | 13 ---
emulators/tme/patches/patch-ad | 13 ---
emulators/tme/patches/patch-ae | 13 ---
emulators/tme/patches/patch-af | 29 -------
emulators/tme/patches/patch-configure | 15 +++
emulators/tme/patches/patch-configure.in | 15 +++
emulators/tme/patches/patch-host_bsd_bsd-bpf.c | 30 -------
emulators/tme/patches/patch-host_bsd_bsd-if.c | 26 ++++++
emulators/tme/patches/patch-ic_m68k_m68k-insns.c | 17 ++++
emulators/tme/patches/patch-ic_m68k_m68k-m68k-insns.c | 17 ----
emulators/tme/patches/patch-ic_sparc_sparc-execute.c | 15 +++
emulators/tme/patches/patch-libtme_memory-auto.sh | 7 +-
emulators/tme/patches/patch-libtme_misc.c | 15 +++
emulators/tme/patches/patch-libtme_module.c | 66 +++++++++++++++++
emulators/tme/patches/patch-machine_sun2_sun2-mainbus.c | 4 +-
emulators/tme/patches/patch-machine_sun3_sun3-mainbus.c | 4 +-
emulators/tme/patches/patch-machine_sun4_sun4-mainbus.c | 4 +-
emulators/tme/patches/patch-machine_sun4_sun4-timer.c | 4 +-
emulators/tme/patches/patch-machine_sun_sun-bwtwo.c | 31 +++++++
emulators/tme/patches/patch-tme_common.h | 4 +-
emulators/tme/patches/patch-tme_generic_float.h | 4 +-
emulators/tme/patches/patch-tmesh_tmesh-cmds.c | 4 +-
emulators/tme/patches/patch-tmesh_tmesh.c | 8 +-
27 files changed, 252 insertions(+), 229 deletions(-)
diffs (truncated from 663 to 300 lines):
diff -r b507b0181b76 -r 13d4e31b528e emulators/tme/Makefile
--- a/emulators/tme/Makefile Thu Aug 13 04:28:42 2020 +0000
+++ b/emulators/tme/Makefile Thu Aug 13 05:59:51 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.77 2020/03/19 02:27:21 rin Exp $
+# $NetBSD: Makefile,v 1.78 2020/08/13 05:59:51 tsutsui Exp $
#
DISTNAME= tme-0.8
@@ -7,17 +7,17 @@
MASTER_SITES= http://csail.mit.edu/~fredette/tme/
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-
-MAKE_JOBS_SAFE= no
-
HOMEPAGE= http://csail.mit.edu/~fredette/tme/
COMMENT= The Machine Emulator
+LICENSE= original-bsd
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
USE_TOOLS+= gmake perl:run pkg-config yacc
+MAKE_JOBS_SAFE= no
+
.if empty(CFLAGS:M*-g*)
CONFIGURE_ARGS+= --disable-debug
.endif
diff -r b507b0181b76 -r 13d4e31b528e emulators/tme/distinfo
--- a/emulators/tme/distinfo Thu Aug 13 04:28:42 2020 +0000
+++ b/emulators/tme/distinfo Thu Aug 13 05:59:51 2020 +0000
@@ -1,37 +1,37 @@
-$NetBSD: distinfo,v 1.26 2020/03/19 02:27:21 rin Exp $
+$NetBSD: distinfo,v 1.27 2020/08/13 05:59:51 tsutsui Exp $
SHA1 (tme-0.8.tar.gz) = dd4f3421c20ceed548c5328a21dbb26e80f46b9c
RMD160 (tme-0.8.tar.gz) = 6bd505c5fa7810d37f436883383c4ba655df2ded
SHA512 (tme-0.8.tar.gz) = 961ccee96d5192ff7373a401834e96d5946f3aa783bd4c8839c6b1f5fa15a768e3241972d1e5049f89b8593ff9db0e9dc2378a50e85dae680327c11bc14323e8
Size (tme-0.8.tar.gz) = 2100123 bytes
-SHA1 (patch-aa) = 587f7a3d61a6b37e65d625f1bab0f3c2d740bba9
-SHA1 (patch-ab) = 3825986759da24c628b870a1493e4d37ec37358f
-SHA1 (patch-ac) = ba581f10ec54b056564a7a84a5833f2d854b55df
-SHA1 (patch-ad) = e90986262fe9d883ae64fe01dfb4ae07bde6a916
-SHA1 (patch-ae) = cfcea636744991c6eef84ea34ca78d40eb01c086
-SHA1 (patch-af) = cd3ffe52d4d75d05394ca74c3f69052bfdc41989
+SHA1 (patch-configure) = 53835d3d9c3f77618962d67b3a72c5d44f72bf2b
+SHA1 (patch-configure.in) = 9795ad35a16698057f01e78314b5ee215065e450
SHA1 (patch-host_bsd_Makefile.am) = db0add22732e95b18886877a92e57e1a19d3099f
SHA1 (patch-host_bsd_Makefile.in) = 0c361aca770ec7e323cef150e0e1b29d6a442306
-SHA1 (patch-host_bsd_bsd-bpf.c) = 02a94a141da7d1790969deb8624d3a219d3e64ed
+SHA1 (patch-host_bsd_bsd-if.c) = 929ddb1cbf3cbbc84dc9b1c8facba42032857dfa
SHA1 (patch-host_posix_posix-serial.c) = b1e009d6432c49672ca07a16ced939c8a46ef6e2
SHA1 (patch-ic_ieee754_ieee754-misc-auto.sh) = afeb7452ef64bcae71e4dbae21881cff12cb9d4f
SHA1 (patch-ic_m68k_m6888x.c) = fe42dce7bf5abc69e2c9e15967d5e862ef651a0e
SHA1 (patch-ic_m68k_m68k-insns-auto.sh) = c493b4c6b066135e093abd7482e0a1e99294848b
-SHA1 (patch-ic_m68k_m68k-m68k-insns.c) = 1a9d8e3d4e11c5710d1f67b65954d6e3de68d99f
+SHA1 (patch-ic_m68k_m68k-insns.c) = dcb23606915beb2bb66e2c53f001603487318c96
SHA1 (patch-ic_m68k_m68k-misc.c) = a5d5f5dfdd0331d30b19815687ead49554a771f1
SHA1 (patch-ic_mm58167.c) = 1c35c599f56f6a13a9dfc85dc5154f094bd8c0d0
-SHA1 (patch-libtme_memory-auto.sh) = f7d989831b2468d1288faabc10b6fc53ce5bd0f4
+SHA1 (patch-ic_sparc_sparc-execute.c) = bccd0f021d3921273f61d9dddb1e93d45ff7d84c
+SHA1 (patch-libtme_memory-auto.sh) = b7f70df312e69d711f9ef5c99dc5244e80ea6a14
+SHA1 (patch-libtme_misc.c) = 30b27fc54550555d54124af20ef746072c083695
+SHA1 (patch-libtme_module.c) = 622db6788f4159b41486bd433a699de75e66d998
SHA1 (patch-machine_sun2_SUN2-MULTIBUS) = cf9f55fcc15e2d977823dd54b9a10c42b11a6666
-SHA1 (patch-machine_sun2_sun2-mainbus.c) = 91b901d37d5f9a72064831d440c4371b81857640
+SHA1 (patch-machine_sun2_sun2-mainbus.c) = a418d2563103c7b5e325a7d0e71121a16aa769a1
SHA1 (patch-machine_sun3_SUN3-CARRERA) = f07eabcab452686277f4f22849474bbc196e7ba7
-SHA1 (patch-machine_sun3_sun3-mainbus.c) = bfe56fdee109824ccf8a81760406b6c5d1ab7157
+SHA1 (patch-machine_sun3_sun3-mainbus.c) = 095f143dad7495cd2205288ab8c0315e20360848
SHA1 (patch-machine_sun4_SUN4-75) = bd5412f970de3a1883b1d27cf3e8f9c2ac70d569
-SHA1 (patch-machine_sun4_sun4-mainbus.c) = 9dda3c5365e608cce2faa180d6a58351c8e58095
-SHA1 (patch-machine_sun4_sun4-timer.c) = 979e62cd68d1e8f9b15ba9511d798cbb4c0e2105
+SHA1 (patch-machine_sun4_sun4-mainbus.c) = 20c94ce83ae9e7fcbe92418fe51c420af82eec96
+SHA1 (patch-machine_sun4_sun4-timer.c) = ff943f1449d2109aa131008422866231d4cf1c14
SHA1 (patch-machine_sun4u_SUN-ULTRA-1) = 1aa0dcefafaa70cdaaaac0161b7adda2b2b00ed8
-SHA1 (patch-tme_common.h) = 1c07068397022ff349c283cbbfaa804deeb2aabf
-SHA1 (patch-tme_generic_float.h) = 4f48ebdd713367d47784caa990d46990e4f8108f
+SHA1 (patch-machine_sun_sun-bwtwo.c) = 5d491c2ca27d13ac0b98b93b14b842a6a8c5f5b0
+SHA1 (patch-tme_common.h) = 424b5fdee33bf76edce0541671a9ef2973624570
+SHA1 (patch-tme_generic_float.h) = 7721fb5689107642f00cabfba097c60af41a7d1c
SHA1 (patch-tmesh_Makefile.in) = 850adc8390ea3031ee3d55396373be8507a43c32
-SHA1 (patch-tmesh_tmesh-cmds.c) = 6fffc98ea828e0b58261d810382665ae56da03ff
+SHA1 (patch-tmesh_tmesh-cmds.c) = ce2d6c155ed3899a58157ffb99af568eca9955d0
SHA1 (patch-tmesh_tmesh-input.y) = 1337a8faa4bc1a90a14c29d0d6853ec8f86b4cf2
-SHA1 (patch-tmesh_tmesh.c) = d14e18cc558e07d0334bc0fa5a8a27c4d92065bc
+SHA1 (patch-tmesh_tmesh.c) = 533e15b534fbd80d6a195b15d69448630ca8b739
diff -r b507b0181b76 -r 13d4e31b528e emulators/tme/patches/patch-aa
--- a/emulators/tme/patches/patch-aa Thu Aug 13 04:28:42 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,66 +0,0 @@
-$NetBSD: patch-aa,v 1.7 2013/04/14 02:00:15 dholland Exp $
-
-- XXX: some unexplained/undocumented libtool fix
-- fix printf formats
-- explicitly ignore the variable "rc" in tme_module_close() as the
-Sun compiler is objecting to it being assigned and not used.
-
---- libtme/module.c.orig 2010-06-05 19:04:42.000000000 +0000
-+++ libtme/module.c
-@@ -62,11 +62,13 @@ _TME_RCSID("$Id: module.c,v 1.10 2010/06
- #endif /* !lt_ptr_t */
- #endif /* !lt_ptr */
-
-+#if 0 /* XXX: we always use pkgsrc/devel/libltdl */
- /* similarly, the installed libltdl may be so recent that its ltdl.h
- renames lt_preloaded_symbols with a macro, to a name different from
- what our libtool script makes. it's possible that the renaming
- macro is meant to be undefined to handle this problem: */
- #undef lt_preloaded_symbols
-+#endif
-
- /* types: */
- struct tme_module {
-@@ -248,7 +250,7 @@ tme_module_open(const char *module_fake_
- /* if there were no slashes in the fake module pathname, there is no
- top name, which is incorrect: */
- if (first_slash == NULL) {
-- tme_output_append_error(_output, module_fake_pathname);
-+ tme_output_append_error(_output, "%s", module_fake_pathname);
- tme_free(module_raw_name);
- return (EINVAL);
- }
-@@ -258,7 +260,7 @@ tme_module_open(const char *module_fake_
- (first_slash - module_raw_name),
- &modules_dir);
- if (modules_index == NULL) {
-- tme_output_append_error(_output, module_fake_pathname);
-+ tme_output_append_error(_output, "%s", module_fake_pathname);
- tme_free(module_raw_name);
- return (ENOENT);
- }
-@@ -300,7 +302,7 @@ tme_module_open(const char *module_fake_
-
- /* if we didn't find the module in the index: */
- if (tokens_count == 0) {
-- tme_output_append_error(_output, module_fake_pathname);
-+ tme_output_append_error(_output, "%s", module_fake_pathname);
- tme_free(modules_dir);
- return (ENOENT);
- }
-@@ -325,7 +327,7 @@ tme_module_open(const char *module_fake_
- tme_mutex_unlock(&_tme_module_mutex);
- tme_free(module_pathname);
- if (handle == NULL) {
-- tme_output_append_error(_output, module_fake_pathname);
-+ tme_output_append_error(_output, "%s", module_fake_pathname);
- tme_free_string_array(tokens, -1);
- return (ENOENT);
- }
-@@ -400,5 +402,6 @@ tme_module_close(void *_module)
- tme_free(module);
-
- /* XXX assume success: */
-+ (void)rc;
- return (TME_OK);
- }
diff -r b507b0181b76 -r 13d4e31b528e emulators/tme/patches/patch-ab
--- a/emulators/tme/patches/patch-ab Thu Aug 13 04:28:42 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2010/06/07 13:34:00 tsutsui Exp $
-
---- ic/sparc/sparc-execute.c 2010-02-21 06:58:15.000000000 +0900
-+++ ic/sparc/sparc-execute.c 2010-04-14 22:55:50.000000000 +0900
-@@ -612,7 +612,7 @@
- != pc_previous)) {
- if (__tme_predict_true(((tme_sparc_ireg_t) (pc + sizeof(tme_uint32_t)))
- == ic->tme_sparc_ireg(TME_SPARC_IREG_PC_NEXT))) {
-- tme_recode_thunk_off_t insns_thunk;
-+ tme_recode_thunk_off_t insns_thunk = 0; /* XXX gcc -Wuninitialized */
-
- /* if the current instruction TLB entry is not the invalid TLB
- entry, and there is an instructions thunk for this PC: */
diff -r b507b0181b76 -r 13d4e31b528e emulators/tme/patches/patch-ac
--- a/emulators/tme/patches/patch-ac Thu Aug 13 04:28:42 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.6 2010/08/14 06:32:34 tsutsui Exp $
-
---- libtme/misc.c.orig 2010-06-05 19:02:38.000000000 +0000
-+++ libtme/misc.c
-@@ -430,7 +430,7 @@ tme_misc_cycles_per_ms(void)
- union tme_value64
- tme_misc_cycles(void)
- {
--#ifdef TME_HAVE_INT64_T */
-+#ifdef TME_HAVE_INT64_T
- struct timeval now;
- tme_uint64_t cycles;
- union tme_value64 value;
diff -r b507b0181b76 -r 13d4e31b528e emulators/tme/patches/patch-ad
--- a/emulators/tme/patches/patch-ad Thu Aug 13 04:28:42 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.4 2010/08/14 06:32:34 tsutsui Exp $
-
---- configure.in.orig 2010-06-05 19:56:37.000000000 +0000
-+++ configure.in
-@@ -599,7 +599,7 @@ i[3456789]86-* | x86_64-*) misc_hosts="x
- esac
- changequote([, ])dnl
- AC_MSG_RESULT([${misc_hosts}])
--if test "x${misc_hosts}" = no; then
-+if test "x${misc_hosts}" = xno; then
- misc_hosts=
- fi
-
diff -r b507b0181b76 -r 13d4e31b528e emulators/tme/patches/patch-ae
--- a/emulators/tme/patches/patch-ae Thu Aug 13 04:28:42 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.3 2010/08/14 06:32:34 tsutsui Exp $
-
---- configure.orig 2010-06-05 19:57:30.000000000 +0000
-+++ configure
-@@ -12985,7 +12985,7 @@ i[3456789]86-* | x86_64-*) misc_hosts="x
- esac
- { echo "$as_me:$LINENO: result: ${misc_hosts}" >&5
- echo "${ECHO_T}${misc_hosts}" >&6; }
--if test "x${misc_hosts}" = no; then
-+if test "x${misc_hosts}" = xno; then
- misc_hosts=
- fi
-
diff -r b507b0181b76 -r 13d4e31b528e emulators/tme/patches/patch-af
--- a/emulators/tme/patches/patch-af Thu Aug 13 04:28:42 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-$NetBSD: patch-af,v 1.3 2011/10/07 01:12:51 christos Exp $
-
---- machine/sun/sun-bwtwo.c.orig 2009-11-08 12:03:58.000000000 -0500
-+++ machine/sun/sun-bwtwo.c 2011-10-06 20:52:30.000000000 -0400
-@@ -339,6 +339,7 @@
- {
- struct tme_sunbw2 *sunbw2;
- int rc;
-+ tme_uint16_t v;
-
- /* start the sunbw2 structure: */
- sunbw2 = tme_new0(struct tme_sunbw2, 1);
-@@ -365,12 +366,10 @@
- case TME_SUNBW2_TYPE_OLD_ONBOARD:
-
- /* set our initial CSR: */
-- sunbw2->tme_sunbw2_csr
-- = tme_htobe_u16(TME_SUNBW2_CSR_ENABLE_VIDEO
-- | (sunbw2->tme_sunbw2_sunfb.tme_sunfb_size == TME_SUNFB_SIZE_1024_1024
-- ? TME_SUNBW2_CSR_JUMPER_HIRES
-- : 0));
--
-+ v = TME_SUNBW2_CSR_ENABLE_VIDEO | (sunbw2->tme_sunbw2_sunfb.tme_sunfb_size
-+ == TME_SUNFB_SIZE_1024_1024
-+ ? TME_SUNBW2_CSR_JUMPER_HIRES : 0);
-+ sunbw2->tme_sunbw2_csr = tme_htobe_u16(v);
- break;
- }
-
diff -r b507b0181b76 -r 13d4e31b528e emulators/tme/patches/patch-configure
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/emulators/tme/patches/patch-configure Thu Aug 13 05:59:51 2020 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-configure,v 1.1 2020/08/13 05:59:52 tsutsui Exp $
+
+- Fix wrong comparison.
+
+--- configure.orig 2010-06-05 19:57:30.000000000 +0000
++++ configure
+@@ -12985,7 +12985,7 @@ i[3456789]86-* | x86_64-*) misc_hosts="x
+ esac
+ { echo "$as_me:$LINENO: result: ${misc_hosts}" >&5
+ echo "${ECHO_T}${misc_hosts}" >&6; }
+-if test "x${misc_hosts}" = no; then
++if test "x${misc_hosts}" = xno; then
+ misc_hosts=
+ fi
+
diff -r b507b0181b76 -r 13d4e31b528e emulators/tme/patches/patch-configure.in
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/emulators/tme/patches/patch-configure.in Thu Aug 13 05:59:51 2020 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-configure.in,v 1.1 2020/08/13 05:59:52 tsutsui Exp $
+
+- Fix wrong comparison.
+
+--- configure.in.orig 2010-06-05 19:56:37.000000000 +0000
++++ configure.in
+@@ -599,7 +599,7 @@ i[3456789]86-* | x86_64-*) misc_hosts="x
+ esac
+ changequote([, ])dnl
+ AC_MSG_RESULT([${misc_hosts}])
+-if test "x${misc_hosts}" = no; then
++if test "x${misc_hosts}" = xno; then
+ misc_hosts=
+ fi
+
diff -r b507b0181b76 -r 13d4e31b528e emulators/tme/patches/patch-host_bsd_bsd-bpf.c
--- a/emulators/tme/patches/patch-host_bsd_bsd-bpf.c Thu Aug 13 04:28:42 2020 +0000
Home |
Main Index |
Thread Index |
Old Index