Use __sparc instead of __sparc__ as per pkglint, mentioned by Adrien Auzanneau following up to PR 45036. Add patch comments.diff -r1.7 -r1.8 pkgsrc/lang/see/distinfo
(dholland)
@@ -1,9 +1,9 @@ | @@ -1,9 +1,9 @@ | |||
1 | $NetBSD: distinfo,v 1.7 2015/02/19 22:26:22 joerg Exp $ | 1 | $NetBSD: distinfo,v 1.8 2015/03/18 17:46:31 dholland Exp $ | |
2 | 2 | |||
3 | SHA1 (see-3.0.1376.tar.gz) = d803adac6298a0f556d59f501f0376d9196d0821 | 3 | SHA1 (see-3.0.1376.tar.gz) = d803adac6298a0f556d59f501f0376d9196d0821 | |
4 | RMD160 (see-3.0.1376.tar.gz) = 1fb3eb7a796ba96fe68fbc3225bcaafff5692f6f | 4 | RMD160 (see-3.0.1376.tar.gz) = 1fb3eb7a796ba96fe68fbc3225bcaafff5692f6f | |
5 | Size (see-3.0.1376.tar.gz) = 1066852 bytes | 5 | Size (see-3.0.1376.tar.gz) = 1066852 bytes | |
6 | SHA1 (patch-Makefile.am) = 1cc4828c6e9eb7c220bb3825b6f0de90a035bf5e | 6 | SHA1 (patch-Makefile.am) = 61a539d9b1ec7393a0a14913af89711faf7f2feb | |
7 | SHA1 (patch-aa) = 9ca4a05a019ba7a886ec8fde0a5fa400a83d9ff9 | 7 | SHA1 (patch-aa) = a8d244c0fa6c9163c1641f3d0e65bb961a67921d | |
8 | SHA1 (patch-ab) = 2617c8d1da42f94db3138f1c989b878311b99528 | 8 | SHA1 (patch-ab) = 7bae56ab363e0578ca47982681eae720c96979e3 | |
9 | SHA1 (patch-ac) = 387fcc2139fe2b558ea1556770b40bc339b195ff | 9 | SHA1 (patch-ac) = 5e25af16766b7ae951869d734a7fba42db58358a |
@@ -1,13 +1,15 @@ | @@ -1,13 +1,15 @@ | |||
1 | $NetBSD: patch-Makefile.am,v 1.1 2013/03/28 21:30:49 joerg Exp $ | 1 | $NetBSD: patch-Makefile.am,v 1.2 2015/03/18 17:46:32 dholland Exp $ | |
2 | ||||
3 | Don't build own libltdl. | |||
2 | 4 | |||
3 | --- Makefile.am.orig 2007-09-13 22:01:46.000000000 +0000 | 5 | --- Makefile.am.orig 2007-09-13 22:01:46.000000000 +0000 | |
4 | +++ Makefile.am | 6 | +++ Makefile.am | |
5 | @@ -3,7 +3,7 @@ | 7 | @@ -3,7 +3,7 @@ | |
6 | 8 | |||
7 | AUTOMAKE_OPTIONS= foreign | 9 | AUTOMAKE_OPTIONS= foreign | |
8 | 10 | |||
9 | -SUBDIRS = include libsee libltdl shell doc | 11 | -SUBDIRS = include libsee libltdl shell doc | |
10 | +SUBDIRS = include libsee shell doc | 12 | +SUBDIRS = include libsee shell doc | |
11 | if SSP | 13 | if SSP | |
12 | SUBDIRS += ssp | 14 | SUBDIRS += ssp | |
13 | endif | 15 | endif |
@@ -1,13 +1,15 @@ | @@ -1,13 +1,15 @@ | |||
1 | $NetBSD: patch-ac,v 1.1 2009/06/03 06:03:50 hasso Exp $ | 1 | $NetBSD: patch-ac,v 1.2 2015/03/18 17:46:32 dholland Exp $ | |
2 | ||||
3 | Fix detection of isnan. | |||
2 | 4 | |||
3 | --- libsee/math.c.orig 2009-06-03 06:31:41 +0300 | 5 | --- libsee/math.c.orig 2009-06-03 06:31:41 +0300 | |
4 | +++ libsee/math.c 2009-06-03 06:33:02 +0300 | 6 | +++ libsee/math.c 2009-06-03 06:33:02 +0300 | |
5 | @@ -47,7 +47,7 @@ _SEE_isnan(n) | 7 | @@ -47,7 +47,7 @@ _SEE_isnan(n) | |
6 | { | 8 | { | |
7 | #if SEE_NUMBER_IS_FLOAT && HAVE_ISNANF | 9 | #if SEE_NUMBER_IS_FLOAT && HAVE_ISNANF | |
8 | return isnanf(n); | 10 | return isnanf(n); | |
9 | -#elif HAVE_ISNAN | 11 | -#elif HAVE_ISNAN | |
10 | +#elif HAVE_ISNAN || HAVE_DECL_ISNAN | 12 | +#elif HAVE_ISNAN || HAVE_DECL_ISNAN | |
11 | return isnan(n); | 13 | return isnan(n); | |
12 | #elif HAVE__ISNAN | 14 | #elif HAVE__ISNAN | |
13 | return _isnan(n); | 15 | return _isnan(n); |
@@ -1,23 +1,26 @@ | @@ -1,23 +1,26 @@ | |||
1 | $NetBSD: patch-aa,v 1.2 2015/02/19 22:26:22 joerg Exp $ | 1 | $NetBSD: patch-aa,v 1.3 2015/03/18 17:46:32 dholland Exp $ | |
2 | ||||
3 | Handle powerpc and arm. | |||
4 | Use __sparc according to pkglint. | |||
2 | 5 | |||
3 | --- libsee/dtoa_config.h.orig 2007-09-13 22:01:42.000000000 +0000 | 6 | --- libsee/dtoa_config.h.orig 2007-09-13 22:01:42.000000000 +0000 | |
4 | +++ libsee/dtoa_config.h | 7 | +++ libsee/dtoa_config.h | |
5 | @@ -16,10 +16,19 @@ | 8 | @@ -16,10 +16,19 @@ | |
6 | # define IEEE_8087 | 9 | # define IEEE_8087 | |
7 | #endif | 10 | #endif | |
8 | 11 | |||
9 | -#if defined(__m68k__) || defined(__sparc__) || defined(__ppc__) | 12 | -#if defined(__m68k__) || defined(__sparc__) || defined(__ppc__) | |
10 | +#if defined(__m68k__) || defined(__sparc__) || defined(__ppc__) || defined(__powerpc__) | 13 | +#if defined(__m68k__) || defined(__sparc) || defined(__ppc__) || defined(__powerpc__) | |
11 | # define IEEE_MC68k | 14 | # define IEEE_MC68k | |
12 | #endif | 15 | #endif | |
13 | 16 | |||
14 | +#if defined(__arm__) | 17 | +#if defined(__arm__) | |
15 | +# include <sys/endian.h> | 18 | +# include <sys/endian.h> | |
16 | +# if BYTE_ORDER == BIG_ENDIAN | 19 | +# if BYTE_ORDER == BIG_ENDIAN | |
17 | +# define IEEE_MC68k | 20 | +# define IEEE_MC68k | |
18 | +# else | 21 | +# else | |
19 | +# define IEEE_8087 | 22 | +# define IEEE_8087 | |
20 | +# endif | 23 | +# endif | |
21 | +#endif | 24 | +#endif | |
22 | + | 25 | + | |
23 | #if defined(__vax__) && !defined(VAX) | 26 | #if defined(__vax__) && !defined(VAX) |
@@ -1,17 +1,19 @@ | @@ -1,17 +1,19 @@ | |||
1 | $NetBSD: patch-ab,v 1.4 2013/03/28 21:30:49 joerg Exp $ | 1 | $NetBSD: patch-ab,v 1.5 2015/03/18 17:46:32 dholland Exp $ | |
2 | 2 | |||
3 | First chunk: automake-1.13 compat. | 3 | First chunk: automake-1.13 compat. | |
4 | Rest: ? | 4 | Second chunk: use pkgsrc libltdl | |
5 | Third chunk (about dtoa): ? (XXX) | |||
6 | Fourth chunk: fix detection of isnan | |||
5 | 7 | |||
6 | --- configure.ac.orig 2008-02-10 10:31:33.000000000 +0000 | 8 | --- configure.ac.orig 2008-02-10 10:31:33.000000000 +0000 | |
7 | +++ configure.ac | 9 | +++ configure.ac | |
8 | @@ -5,7 +5,7 @@ AC_INIT([see], | 10 | @@ -5,7 +5,7 @@ AC_INIT([see], | |
9 | [leonard@users.sourceforge.net]) | 11 | [leonard@users.sourceforge.net]) | |
10 | AC_PREREQ(2.52) | 12 | AC_PREREQ(2.52) | |
11 | AM_INIT_AUTOMAKE | 13 | AM_INIT_AUTOMAKE | |
12 | -AM_CONFIG_HEADER(include/config.h) | 14 | -AM_CONFIG_HEADER(include/config.h) | |
13 | +AC_CONFIG_HEADERS(include/config.h) | 15 | +AC_CONFIG_HEADERS(include/config.h) | |
14 | AC_CONFIG_FILES([Makefile | 16 | AC_CONFIG_FILES([Makefile | |
15 | include/Makefile | 17 | include/Makefile | |
16 | include/see/Makefile | 18 | include/see/Makefile | |
17 | @@ -29,11 +29,11 @@ dnl | 19 | @@ -29,11 +29,11 @@ dnl |