diff options
| author | schwarz <schwarz@pkgsrc.org> | 2006-02-25 17:31:57 +0000 |
|---|---|---|
| committer | schwarz <schwarz@pkgsrc.org> | 2006-02-25 17:31:57 +0000 |
| commit | 8c91924c95a3fc41c7601418245a3572ad5f28d7 (patch) | |
| tree | 3d24b89f94eef10c6aa9c18273d147a5a8ac1c83 /devel/nbitools | |
| parent | f42adc069b78dfd93a8cfc6b6717fc011ffcfeb2 (diff) | |
| download | pkgsrc-8c91924c95a3fc41c7601418245a3572ad5f28d7.tar.gz | |
modified patch-ag for IRIX and Solaris, closing pkg/27267
Diffstat (limited to 'devel/nbitools')
| -rw-r--r-- | devel/nbitools/distinfo | 4 | ||||
| -rw-r--r-- | devel/nbitools/patches/patch-ag | 31 |
2 files changed, 25 insertions, 10 deletions
diff --git a/devel/nbitools/distinfo b/devel/nbitools/distinfo index 628dc2aef79..d904b1e9a4f 100644 --- a/devel/nbitools/distinfo +++ b/devel/nbitools/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.8 2005/12/02 22:59:40 joerg Exp $ +$NetBSD: distinfo,v 1.9 2006/02/25 17:31:57 schwarz Exp $ SHA1 (nbitools-R6.3.tar.gz) = 0f6751417d7ef412be04611fbe4f56386a04322a RMD160 (nbitools-R6.3.tar.gz) = 047f64b113a0307b045573bfe429b59063ae38ea @@ -9,7 +9,7 @@ SHA1 (patch-ac) = 4cb8804bae2d7e815b36640c55789b5ed7b7fb75 SHA1 (patch-ad) = b0c18505891834182c57819489b7d9890802d550 SHA1 (patch-ae) = 0a0acf8798055a7b1b292e8d2edf998857641550 SHA1 (patch-af) = 9a7e4bd19863d086a1e57f1cd9484b05189cbda6 -SHA1 (patch-ag) = f0d09ad369eef0ceb64b946679eb910ee8909c59 +SHA1 (patch-ag) = 2563b2e5105d000cc0b57717d4dadfadec34ee4f SHA1 (patch-ah) = 10645ba6e875cca81c7cb67e570b737f16ccfa26 SHA1 (patch-ai) = 9085fda5360c672865561e2c0aeafdc34596eb66 SHA1 (patch-aj) = b3ec58e0fcbed869e230e0e3fa8b37517ed1b52e diff --git a/devel/nbitools/patches/patch-ag b/devel/nbitools/patches/patch-ag index b128db6514b..85ffd54aedc 100644 --- a/devel/nbitools/patches/patch-ag +++ b/devel/nbitools/patches/patch-ag @@ -1,17 +1,32 @@ -$NetBSD: patch-ag,v 1.3 2005/12/02 22:59:40 joerg Exp $ +$NetBSD: patch-ag,v 1.4 2006/02/25 17:31:57 schwarz Exp $ ---- config/imake/imake.c.orig 2002-02-13 10:32:00.000000000 -0600 -+++ config/imake/imake.c -@@ -145,7 +145,7 @@ in this Software without prior written a +--- config/imake/imake.c.orig 2006-02-25 18:12:25.000000000 +0100 ++++ config/imake/imake.c 2006-02-25 18:15:10.000000000 +0100 +@@ -145,11 +145,13 @@ * #include INCLUDE_IMAKEFILE * <add any global targets like 'clean' and long dependencies> */ -#if defined(__FreeBSD__) || defined(__NetBSD__) -+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__) || defined(__linux__) || defined(__DragonFly__) ++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__) || defined(__linux__) || defined(__DragonFly__) || defined(__sgi) || defined(sun) || defined(__sun) /* This needs to be before _POSIX_SOURCE gets defined */ # include <sys/param.h> # include <sys/types.h> -@@ -1028,7 +1028,7 @@ static void get_ld_version(inFile) ++# if !defined(__sgi) && !defined(sun) && !defined(__sun) + # include <sys/sysctl.h> ++# endif + # include <sys/stat.h> + #endif + #include <stdio.h> +@@ -281,7 +283,7 @@ + * Xos.h, which we don't want to include here for bootstrapping reasons. + */ + #ifndef USE_STRERROR +-# ifndef strerror ++# if !defined(strerror) && !defined(sun) && !defined(__sun) + extern char *sys_errlist[]; + extern int sys_nerr; + # define strerror(n) \ +@@ -1028,7 +1030,7 @@ } #endif @@ -20,7 +35,7 @@ $NetBSD: patch-ag,v 1.3 2005/12/02 22:59:40 joerg Exp $ static void get_binary_format(FILE *inFile) { -@@ -1064,7 +1064,7 @@ static void get_gcc_incdir(inFile) +@@ -1064,7 +1066,7 @@ FILE* inFile; { static char* gcc_path[] = { @@ -29,7 +44,7 @@ $NetBSD: patch-ag,v 1.3 2005/12/02 22:59:40 joerg Exp $ "/usr/bin/cc", /* for Linux PostIncDir */ #endif "/usr/local/bin/gcc", -@@ -1161,7 +1161,7 @@ define_os_defaults(inFile) +@@ -1161,7 +1163,7 @@ get_ld_version(inFile); #endif get_gcc_incdir(inFile); |