Sun Apr 14 02:00:15 2013 UTC ()
Try to work around a fatal compiler diagnostic in the Solaris build.


(dholland)
diff -r1.15 -r1.16 pkgsrc/emulators/tme/distinfo
diff -r1.6 -r1.7 pkgsrc/emulators/tme/patches/patch-aa
cvs diff -r1.15 -r1.16 pkgsrc/emulators/tme/distinfo (expand / switch to unified diff)

--- pkgsrc/emulators/tme/distinfo 2013/02/26 23:39:18 1.15
+++ pkgsrc/emulators/tme/distinfo 2013/04/14 02:00:15 1.16
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1$NetBSD: distinfo,v 1.15 2013/02/26 23:39:18 joerg Exp $ 1$NetBSD: distinfo,v 1.16 2013/04/14 02:00:15 dholland Exp $
2 2
3SHA1 (tme-0.8.tar.gz) = dd4f3421c20ceed548c5328a21dbb26e80f46b9c 3SHA1 (tme-0.8.tar.gz) = dd4f3421c20ceed548c5328a21dbb26e80f46b9c
4RMD160 (tme-0.8.tar.gz) = 6bd505c5fa7810d37f436883383c4ba655df2ded 4RMD160 (tme-0.8.tar.gz) = 6bd505c5fa7810d37f436883383c4ba655df2ded
5Size (tme-0.8.tar.gz) = 2100123 bytes 5Size (tme-0.8.tar.gz) = 2100123 bytes
6SHA1 (patch-aa) = 41d42a5bbad9f87bce4bada14ca482f5e8f79d9a 6SHA1 (patch-aa) = 587f7a3d61a6b37e65d625f1bab0f3c2d740bba9
7SHA1 (patch-ab) = 3825986759da24c628b870a1493e4d37ec37358f 7SHA1 (patch-ab) = 3825986759da24c628b870a1493e4d37ec37358f
8SHA1 (patch-ac) = ba581f10ec54b056564a7a84a5833f2d854b55df 8SHA1 (patch-ac) = ba581f10ec54b056564a7a84a5833f2d854b55df
9SHA1 (patch-ad) = e90986262fe9d883ae64fe01dfb4ae07bde6a916 9SHA1 (patch-ad) = e90986262fe9d883ae64fe01dfb4ae07bde6a916
10SHA1 (patch-ae) = cfcea636744991c6eef84ea34ca78d40eb01c086 10SHA1 (patch-ae) = cfcea636744991c6eef84ea34ca78d40eb01c086
11SHA1 (patch-af) = cd3ffe52d4d75d05394ca74c3f69052bfdc41989 11SHA1 (patch-af) = cd3ffe52d4d75d05394ca74c3f69052bfdc41989
12SHA1 (patch-host_bsd_bsd-bpf.c) = 02a94a141da7d1790969deb8624d3a219d3e64ed 12SHA1 (patch-host_bsd_bsd-bpf.c) = 02a94a141da7d1790969deb8624d3a219d3e64ed
13SHA1 (patch-ic_ieee754_ieee754-misc-auto.sh) = afeb7452ef64bcae71e4dbae21881cff12cb9d4f 13SHA1 (patch-ic_ieee754_ieee754-misc-auto.sh) = afeb7452ef64bcae71e4dbae21881cff12cb9d4f
14SHA1 (patch-machine_sun2_sun2-mainbus.c) = 91b901d37d5f9a72064831d440c4371b81857640 14SHA1 (patch-machine_sun2_sun2-mainbus.c) = 91b901d37d5f9a72064831d440c4371b81857640
15SHA1 (patch-machine_sun3_sun3-mainbus.c) = bfe56fdee109824ccf8a81760406b6c5d1ab7157 15SHA1 (patch-machine_sun3_sun3-mainbus.c) = bfe56fdee109824ccf8a81760406b6c5d1ab7157
16SHA1 (patch-machine_sun4_sun4-mainbus.c) = 9dda3c5365e608cce2faa180d6a58351c8e58095 16SHA1 (patch-machine_sun4_sun4-mainbus.c) = 9dda3c5365e608cce2faa180d6a58351c8e58095
17SHA1 (patch-tmesh_tmesh-cmds.c) = 6fffc98ea828e0b58261d810382665ae56da03ff 17SHA1 (patch-tmesh_tmesh-cmds.c) = 6fffc98ea828e0b58261d810382665ae56da03ff
18SHA1 (patch-tmesh_tmesh-input.y) = 745bb1eb860635b89ebf9a0d8560c6c6f49a8c11 18SHA1 (patch-tmesh_tmesh-input.y) = 745bb1eb860635b89ebf9a0d8560c6c6f49a8c11
cvs diff -r1.6 -r1.7 pkgsrc/emulators/tme/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/emulators/tme/patches/Attic/patch-aa 2013/02/26 23:39:18 1.6
+++ pkgsrc/emulators/tme/patches/Attic/patch-aa 2013/04/14 02:00:15 1.7
@@ -1,14 +1,19 @@ @@ -1,14 +1,19 @@
1$NetBSD: patch-aa,v 1.6 2013/02/26 23:39:18 joerg Exp $ 1$NetBSD: patch-aa,v 1.7 2013/04/14 02:00:15 dholland Exp $
 2
 3- XXX: some unexplained/undocumented libtool fix
 4- fix printf formats
 5- explicitly ignore the variable "rc" in tme_module_close() as the
 6Sun compiler is objecting to it being assigned and not used.
2 7
3--- libtme/module.c.orig 2010-06-05 19:04:42.000000000 +0000 8--- libtme/module.c.orig 2010-06-05 19:04:42.000000000 +0000
4+++ libtme/module.c 9+++ libtme/module.c
5@@ -62,11 +62,13 @@ _TME_RCSID("$Id: module.c,v 1.10 2010/06 10@@ -62,11 +62,13 @@ _TME_RCSID("$Id: module.c,v 1.10 2010/06
6 #endif /* !lt_ptr_t */ 11 #endif /* !lt_ptr_t */
7 #endif /* !lt_ptr */ 12 #endif /* !lt_ptr */
8  13
9+#if 0 /* XXX: we always use pkgsrc/devel/libltdl */ 14+#if 0 /* XXX: we always use pkgsrc/devel/libltdl */
10 /* similarly, the installed libltdl may be so recent that its ltdl.h 15 /* similarly, the installed libltdl may be so recent that its ltdl.h
11 renames lt_preloaded_symbols with a macro, to a name different from 16 renames lt_preloaded_symbols with a macro, to a name different from
12 what our libtool script makes. it's possible that the renaming 17 what our libtool script makes. it's possible that the renaming
13 macro is meant to be undefined to handle this problem: */ 18 macro is meant to be undefined to handle this problem: */
14 #undef lt_preloaded_symbols 19 #undef lt_preloaded_symbols
@@ -42,13 +47,20 @@ $NetBSD: patch-aa,v 1.6 2013/02/26 23:39 @@ -42,13 +47,20 @@ $NetBSD: patch-aa,v 1.6 2013/02/26 23:39
42+ tme_output_append_error(_output, "%s", module_fake_pathname); 47+ tme_output_append_error(_output, "%s", module_fake_pathname);
43 tme_free(modules_dir); 48 tme_free(modules_dir);
44 return (ENOENT); 49 return (ENOENT);
45 } 50 }
46@@ -325,7 +327,7 @@ tme_module_open(const char *module_fake_ 51@@ -325,7 +327,7 @@ tme_module_open(const char *module_fake_
47 tme_mutex_unlock(&_tme_module_mutex); 52 tme_mutex_unlock(&_tme_module_mutex);
48 tme_free(module_pathname); 53 tme_free(module_pathname);
49 if (handle == NULL) { 54 if (handle == NULL) {
50- tme_output_append_error(_output, module_fake_pathname); 55- tme_output_append_error(_output, module_fake_pathname);
51+ tme_output_append_error(_output, "%s", module_fake_pathname); 56+ tme_output_append_error(_output, "%s", module_fake_pathname);
52 tme_free_string_array(tokens, -1); 57 tme_free_string_array(tokens, -1);
53 return (ENOENT); 58 return (ENOENT);
54 } 59 }
 60@@ -400,5 +402,6 @@ tme_module_close(void *_module)
 61 tme_free(module);
 62
 63 /* XXX assume success: */
 64+ (void)rc;
 65 return (TME_OK);
 66 }