tme: appease pkglint and also rename old-style patch-xx files.

19 files changed, 86 insertions, 63 deletions

diff --git a/emulators/tme/Makefile b/emulators/tme/Makefile
index 3ca7dc404e8..c5e9dc0be3e 100644
--- a/emulators/tme/Makefile
+++ b/emulators/tme/Makefile
@@ -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 @@ CATEGORIES=		emulators
 MASTER_SITES=		http://csail.mit.edu/~fredette/tme/
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
-
-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 --git a/emulators/tme/distinfo b/emulators/tme/distinfo
index 7a0172a4c58..3395e0e694b 100644
--- a/emulators/tme/distinfo
+++ b/emulators/tme/distinfo
@@ -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 --git a/emulators/tme/patches/patch-ae b/emulators/tme/patches/patch-configure
index 4180a63ea8d..b5afe852357 100644
--- a/emulators/tme/patches/patch-ae
+++ b/emulators/tme/patches/patch-configure
@@ -1,4 +1,6 @@
-$NetBSD: patch-ae,v 1.3 2010/08/14 06:32:34 tsutsui Exp $
+$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
diff --git a/emulators/tme/patches/patch-ad b/emulators/tme/patches/patch-configure.in
index 67e16ce215e..c26aedbf480 100644
--- a/emulators/tme/patches/patch-ad
+++ b/emulators/tme/patches/patch-configure.in
@@ -1,4 +1,6 @@
-$NetBSD: patch-ad,v 1.4 2010/08/14 06:32:34 tsutsui Exp $
+$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
diff --git a/emulators/tme/patches/patch-host_bsd_bsd-bpf.c b/emulators/tme/patches/patch-host_bsd_bsd-if.c
index 0ec6402ecf8..7d68a00fe8c 100644
--- a/emulators/tme/patches/patch-host_bsd_bsd-bpf.c
+++ b/emulators/tme/patches/patch-host_bsd_bsd-if.c
@@ -1,8 +1,11 @@
-$NetBSD: patch-host_bsd_bsd-bpf.c,v 1.1 2012/08/29 18:11:29 shattered Exp $
+$NetBSD: patch-host_bsd_bsd-if.c,v 1.1 2020/08/13 05:59:52 tsutsui Exp $
+
+- handle the new (post-2007) way SIOCGIFCONF works. (PR/45921)
+  XXX rewrite this to use getifaddrs()
 
 --- host/bsd/bsd-if.c.orig	2003-10-16 02:48:23.000000000 +0000
-+++ host/bsd/bsd-if.c	2012-07-07 12:24:22.000000000 +0000
-@@ -71,14 +72,15 @@
++++ host/bsd/bsd-if.c
+@@ -71,7 +71,8 @@ _TME_RCSID("$Id: bsd-if.c,v 1.3 2003/10/
  
  /* this macro helps us size a struct ifreq: */
  #ifdef HAVE_SOCKADDR_SA_LEN
@@ -12,14 +15,7 @@ $NetBSD: patch-host_bsd_bsd-bpf.c,v 1.1 2012/08/29 18:11:29 shattered Exp $
  #else  /* !HAVE_SOCKADDR_SA_LEN */
  #define SIZEOF_IFREQ(ifr) (sizeof(ifr->ifr_name) + sizeof(struct sockaddr))
  #endif /* !HAVE_SOCKADDR_SA_LEN */
- 
- /* this finds a network interface: */
- int
- tme_bsd_if_find(const char *ifr_name_user, struct ifreq **_ifreq, tme_uint8_t **_if_addr, unsigned int *_if_addr_size)
- {
-   int saved_errno;
-   int dummy_fd;
-@@ -175,7 +192,7 @@
+@@ -175,7 +176,7 @@ tme_bsd_if_find(const char *ifr_name_use
      if (ifr_user == NULL
  	&& (ifr_name_user != NULL
  	    ? !strncmp(ifr->ifr_name, ifr_name_user, sizeof(ifr->ifr_name))
diff --git a/emulators/tme/patches/patch-ic_m68k_m68k-m68k-insns.c b/emulators/tme/patches/patch-ic_m68k_m68k-insns.c
index f0026c7d356..bfa11241083 100644
--- a/emulators/tme/patches/patch-ic_m68k_m68k-m68k-insns.c
+++ b/emulators/tme/patches/patch-ic_m68k_m68k-insns.c
@@ -1,9 +1,9 @@
-$NetBSD: patch-ic_m68k_m68k-m68k-insns.c,v 1.1 2013/12/28 19:16:48 martin Exp $
+$NetBSD: patch-ic_m68k_m68k-insns.c,v 1.1 2020/08/13 05:59:52 tsutsui Exp $
 
 Fix from upstream CVS: fix sequencing for tas (avoid diag assert)
 
---- ic/m68k/m68k-insns.c.orig	2007-08-26 00:05:02.000000000 +0200
-+++ ic/m68k/m68k-insns.c	2013-12-23 13:12:54.000000000 +0100
+--- ic/m68k/m68k-insns.c.orig	2007-08-25 22:05:02.000000000 +0000
++++ ic/m68k/m68k-insns.c
 @@ -288,6 +288,10 @@ TME_M68K_INSN(tme_m68k_tas)
  
      /* store the value read: */
diff --git a/emulators/tme/patches/patch-ab b/emulators/tme/patches/patch-ic_sparc_sparc-execute.c
index 020adccf947..5eb5bad1f58 100644
--- a/emulators/tme/patches/patch-ab
+++ b/emulators/tme/patches/patch-ic_sparc_sparc-execute.c
@@ -1,8 +1,10 @@
-$NetBSD: patch-ab,v 1.5 2010/06/07 13:34:00 tsutsui Exp $
+$NetBSD: patch-ic_sparc_sparc-execute.c,v 1.1 2020/08/13 05:59:52 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 @@
+- Appease gcc warning.
+
+--- ic/sparc/sparc-execute.c.orig	2010-05-22 13:25:10.000000000 +0000
++++ ic/sparc/sparc-execute.c
+@@ -612,7 +612,7 @@ _TME_SPARC_EXECUTE_NAME(struct tme_sparc
  			    != pc_previous)) {
        if (__tme_predict_true(((tme_sparc_ireg_t) (pc + sizeof(tme_uint32_t)))
  			     == ic->tme_sparc_ireg(TME_SPARC_IREG_PC_NEXT))) {
diff --git a/emulators/tme/patches/patch-libtme_memory-auto.sh b/emulators/tme/patches/patch-libtme_memory-auto.sh
index a56384ac10f..c172285a4da 100644
--- a/emulators/tme/patches/patch-libtme_memory-auto.sh
+++ b/emulators/tme/patches/patch-libtme_memory-auto.sh
@@ -1,4 +1,7 @@
-$NetBSD: patch-libtme_memory-auto.sh,v 1.3 2015/11/04 03:33:39 dholland Exp $
+$NetBSD: patch-libtme_memory-auto.sh,v 1.4 2020/08/13 05:59:52 tsutsui Exp $
+
+- Explicitly include required headers
+- Avoid left-shifting negative values
 
 --- libtme/memory-auto.sh.orig	2010-02-15 15:16:28.000000000 +0000
 +++ libtme/memory-auto.sh
@@ -11,7 +14,7 @@ $NetBSD: patch-libtme_memory-auto.sh,v 1.3 2015/11/04 03:33:39 dholland Exp $
  /* macros: */
  
  /* the plain partial read internal macro: */
-@@ -129,7 +130,7 @@ if $header; then
+@@ -129,7 +131,7 @@ if $header; then
  
  /* this returns a mask of all-bits-one in given type: */
  #define _tme_memory_type_mask(type, shift)				\\
diff --git a/emulators/tme/patches/patch-ac b/emulators/tme/patches/patch-libtme_misc.c
index 8633a7e9fed..93629487452 100644
--- a/emulators/tme/patches/patch-ac
+++ b/emulators/tme/patches/patch-libtme_misc.c
@@ -1,4 +1,6 @@
-$NetBSD: patch-ac,v 1.6 2010/08/14 06:32:34 tsutsui Exp $
+$NetBSD: patch-libtme_misc.c,v 1.1 2020/08/13 05:59:52 tsutsui Exp $
+
+- Remove garbage.
 
 --- libtme/misc.c.orig	2010-06-05 19:02:38.000000000 +0000
 +++ libtme/misc.c
diff --git a/emulators/tme/patches/patch-aa b/emulators/tme/patches/patch-libtme_module.c
index ebfd8c6c68f..1c68490ddf6 100644
--- a/emulators/tme/patches/patch-aa
+++ b/emulators/tme/patches/patch-libtme_module.c
@@ -1,9 +1,9 @@
-$NetBSD: patch-aa,v 1.7 2013/04/14 02:00:15 dholland Exp $
+$NetBSD: patch-libtme_module.c,v 1.1 2020/08/13 05:59:52 tsutsui 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.
+  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
diff --git a/emulators/tme/patches/patch-machine_sun2_sun2-mainbus.c b/emulators/tme/patches/patch-machine_sun2_sun2-mainbus.c
index d9cdb887a29..01f2f292971 100644
--- a/emulators/tme/patches/patch-machine_sun2_sun2-mainbus.c
+++ b/emulators/tme/patches/patch-machine_sun2_sun2-mainbus.c
@@ -1,4 +1,6 @@
-$NetBSD: patch-machine_sun2_sun2-mainbus.c,v 1.1 2013/02/26 23:39:18 joerg Exp $
+$NetBSD: patch-machine_sun2_sun2-mainbus.c,v 1.2 2020/08/13 05:59:52 tsutsui Exp $
+
+- Don't use string variables as format strings 
 
 --- machine/sun2/sun2-mainbus.c.orig	2013-02-26 21:49:28.000000000 +0000
 +++ machine/sun2/sun2-mainbus.c
diff --git a/emulators/tme/patches/patch-machine_sun3_sun3-mainbus.c b/emulators/tme/patches/patch-machine_sun3_sun3-mainbus.c
index ec6a00095fb..2a71af38dbc 100644
--- a/emulators/tme/patches/patch-machine_sun3_sun3-mainbus.c
+++ b/emulators/tme/patches/patch-machine_sun3_sun3-mainbus.c
@@ -1,4 +1,6 @@
-$NetBSD: patch-machine_sun3_sun3-mainbus.c,v 1.1 2013/02/26 23:39:18 joerg Exp $
+$NetBSD: patch-machine_sun3_sun3-mainbus.c,v 1.2 2020/08/13 05:59:52 tsutsui Exp $
+
+- Don't use string variables as format strings 
 
 --- machine/sun3/sun3-mainbus.c.orig	2013-02-26 21:51:46.000000000 +0000
 +++ machine/sun3/sun3-mainbus.c
diff --git a/emulators/tme/patches/patch-machine_sun4_sun4-mainbus.c b/emulators/tme/patches/patch-machine_sun4_sun4-mainbus.c
index 79d96bb1fd4..a5e9faa4acb 100644
--- a/emulators/tme/patches/patch-machine_sun4_sun4-mainbus.c
+++ b/emulators/tme/patches/patch-machine_sun4_sun4-mainbus.c
@@ -1,4 +1,6 @@
-$NetBSD: patch-machine_sun4_sun4-mainbus.c,v 1.1 2013/02/26 23:39:18 joerg Exp $
+$NetBSD: patch-machine_sun4_sun4-mainbus.c,v 1.2 2020/08/13 05:59:52 tsutsui Exp $
+
+- Don't use string variables as format strings 
 
 --- machine/sun4/sun4-mainbus.c.orig	2013-02-26 21:53:41.000000000 +0000
 +++ machine/sun4/sun4-mainbus.c
diff --git a/emulators/tme/patches/patch-machine_sun4_sun4-timer.c b/emulators/tme/patches/patch-machine_sun4_sun4-timer.c
index a9521468b10..aee76d568f4 100644
--- a/emulators/tme/patches/patch-machine_sun4_sun4-timer.c
+++ b/emulators/tme/patches/patch-machine_sun4_sun4-timer.c
@@ -1,4 +1,6 @@
-$NetBSD: patch-machine_sun4_sun4-timer.c,v 1.1 2015/09/13 15:08:09 joerg Exp $
+$NetBSD: patch-machine_sun4_sun4-timer.c,v 1.2 2020/08/13 05:59:52 tsutsui Exp $
+
+- Avoid left-shifting negative values
 
 --- machine/sun4/sun4-timer.c.orig	2015-09-03 14:47:23.000000000 +0000
 +++ machine/sun4/sun4-timer.c
diff --git a/emulators/tme/patches/patch-af b/emulators/tme/patches/patch-machine_sun_sun-bwtwo.c
index 92cacd87196..e1f01b9d804 100644
--- a/emulators/tme/patches/patch-af
+++ b/emulators/tme/patches/patch-machine_sun_sun-bwtwo.c
@@ -1,8 +1,10 @@
-$NetBSD: patch-af,v 1.3 2011/10/07 01:12:51 christos Exp $
+$NetBSD: patch-machine_sun_sun-bwtwo.c,v 1.1 2020/08/13 05:59:52 tsutsui 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 @@
+- Avoid a compiler bug (phantom integer oveflow) in gcc 4.5.3
+
+--- machine/sun/sun-bwtwo.c.orig	2009-11-08 17:03:58.000000000 +0000
++++ machine/sun/sun-bwtwo.c
+@@ -339,6 +339,7 @@ tme_sun_bwtwo(struct tme_element *elemen
  {
    struct tme_sunbw2 *sunbw2;
    int rc;
@@ -10,7 +12,7 @@ $NetBSD: patch-af,v 1.3 2011/10/07 01:12:51 christos Exp $
  
    /* start the sunbw2 structure: */
    sunbw2 = tme_new0(struct tme_sunbw2, 1);
-@@ -365,12 +366,10 @@
+@@ -365,12 +366,10 @@ tme_sun_bwtwo(struct tme_element *elemen
    case TME_SUNBW2_TYPE_OLD_ONBOARD:
  
      /* set our initial CSR: */
diff --git a/emulators/tme/patches/patch-tme_common.h b/emulators/tme/patches/patch-tme_common.h
index 9952284f975..deb029fa372 100644
--- a/emulators/tme/patches/patch-tme_common.h
+++ b/emulators/tme/patches/patch-tme_common.h
@@ -1,4 +1,6 @@
-$NetBSD: patch-tme_common.h,v 1.1 2015/09/13 15:08:09 joerg Exp $
+$NetBSD: patch-tme_common.h,v 1.2 2020/08/13 05:59:52 tsutsui Exp $
+
+- Avoid left-shifting negative values
 
 --- tme/common.h.orig	2015-09-03 14:41:12.000000000 +0000
 +++ tme/common.h
diff --git a/emulators/tme/patches/patch-tme_generic_float.h b/emulators/tme/patches/patch-tme_generic_float.h
index d2879292950..56280caa2a9 100644
--- a/emulators/tme/patches/patch-tme_generic_float.h
+++ b/emulators/tme/patches/patch-tme_generic_float.h
@@ -1,4 +1,6 @@
-$NetBSD: patch-tme_generic_float.h,v 1.1 2015/09/13 15:08:09 joerg Exp $
+$NetBSD: patch-tme_generic_float.h,v 1.2 2020/08/13 05:59:52 tsutsui Exp $
+
+- Avoid left-shifting negative values
 
 --- tme/generic/float.h.orig	2015-09-03 14:45:16.000000000 +0000
 +++ tme/generic/float.h
diff --git a/emulators/tme/patches/patch-tmesh_tmesh-cmds.c b/emulators/tme/patches/patch-tmesh_tmesh-cmds.c
index fd36d24d707..4a700c3af8e 100644
--- a/emulators/tme/patches/patch-tmesh_tmesh-cmds.c
+++ b/emulators/tme/patches/patch-tmesh_tmesh-cmds.c
@@ -1,4 +1,6 @@
-$NetBSD: patch-tmesh_tmesh-cmds.c,v 1.1 2013/02/26 23:39:18 joerg Exp $
+$NetBSD: patch-tmesh_tmesh-cmds.c,v 1.2 2020/08/13 05:59:52 tsutsui Exp $
+
+- Don't use string variables as format strings
 
 --- tmesh/tmesh-cmds.c.orig	2013-02-26 21:55:25.000000000 +0000
 +++ tmesh/tmesh-cmds.c
diff --git a/emulators/tme/patches/patch-tmesh_tmesh.c b/emulators/tme/patches/patch-tmesh_tmesh.c
index d6a9021cf10..f8540f0fa55 100644
--- a/emulators/tme/patches/patch-tmesh_tmesh.c
+++ b/emulators/tme/patches/patch-tmesh_tmesh.c
@@ -1,10 +1,10 @@
-$NetBSD: patch-tmesh_tmesh.c,v 1.1 2013/11/02 21:53:36 martin Exp $
+$NetBSD: patch-tmesh_tmesh.c,v 1.2 2020/08/13 05:59:52 tsutsui Exp $
 
 Supply a sane default value for LTDL_LIBRARY_PATH.
 
---- tmesh/tmesh.c.orig	2009-08-30 19:06:38.000000000 +0200
-+++ tmesh/tmesh.c	2013-11-02 21:59:21.000000000 +0100
-@@ -583,6 +586,12 @@
+--- tmesh/tmesh.c.orig	2009-08-30 17:06:38.000000000 +0000
++++ tmesh/tmesh.c
+@@ -583,6 +583,12 @@ where OPTIONS are:\n\
      }
    }