diff options
author | minskim <minskim@pkgsrc.org> | 2006-02-15 02:53:29 +0000 |
---|---|---|
committer | minskim <minskim@pkgsrc.org> | 2006-02-15 02:53:29 +0000 |
commit | c15633b67d6134ccd712b5d15a2697abe581b3ae (patch) | |
tree | 7d62999ff01223c3a6486f88b52717e47dd74162 /graphics | |
parent | 946fcde2c5fa5a725af77f5009156de3f23e06f0 (diff) | |
download | pkgsrc-c15633b67d6134ccd712b5d15a2697abe581b3ae.tar.gz |
Use _NSGetEnviron() instead of environ if it is available (e.g. on Darwin).
Suggested by Idar Tollefsen in PR pkg/32753.
Diffstat (limited to 'graphics')
-rw-r--r-- | graphics/graphviz/distinfo | 6 | ||||
-rw-r--r-- | graphics/graphviz/patches/patch-aa | 20 | ||||
-rw-r--r-- | graphics/graphviz/patches/patch-ab | 24 | ||||
-rw-r--r-- | graphics/graphviz/patches/patch-ac | 26 | ||||
-rw-r--r-- | graphics/graphviz/patches/patch-ad | 19 |
5 files changed, 94 insertions, 1 deletions
diff --git a/graphics/graphviz/distinfo b/graphics/graphviz/distinfo index 93f3fef7ace..0641d7af60a 100644 --- a/graphics/graphviz/distinfo +++ b/graphics/graphviz/distinfo @@ -1,5 +1,9 @@ -$NetBSD: distinfo,v 1.17 2005/10/08 08:11:10 adam Exp $ +$NetBSD: distinfo,v 1.18 2006/02/15 02:53:29 minskim Exp $ SHA1 (graphviz-2.6.tar.gz) = 062897f364c905f33852caff93899df97c817def RMD160 (graphviz-2.6.tar.gz) = 555c6c635b5271b09ffb7ee142192a1b4ec07919 Size (graphviz-2.6.tar.gz) = 4109848 bytes +SHA1 (patch-aa) = 814d6b54de2b39a97326d35af15a5155c37cc271 +SHA1 (patch-ab) = 66ad49b481d774bedad0efda65ae2f112b06062a +SHA1 (patch-ac) = adbaa1f265d5a1781574e5c6aad3d35709c3a853 +SHA1 (patch-ad) = d14bfef61caec543812b9d5ea8d2c331bf350af8 diff --git a/graphics/graphviz/patches/patch-aa b/graphics/graphviz/patches/patch-aa new file mode 100644 index 00000000000..3a2a2a60086 --- /dev/null +++ b/graphics/graphviz/patches/patch-aa @@ -0,0 +1,20 @@ +$NetBSD: patch-aa,v 1.5 2006/02/15 02:53:29 minskim Exp $ + +--- configure.ac.orig 2005-08-28 05:47:29.000000000 -0700 ++++ configure.ac +@@ -1265,6 +1265,7 @@ AC_FUNC_ALLOCA + + AC_CHECK_FUNCS([lrand48 drand48 srand48 setmode setenv getenv \ + __freadable _sysconf getrusage strerror cbrt lsqrt vsnprintf \ ++ _NSGetEnviron \ + strtoul strtoll strtoull uname]) + + AC_REPLACE_FUNCS([strcasecmp strncasecmp]) +@@ -1281,6 +1282,7 @@ dnl ----------------------------------- + # AC_HAVE_HEADERS(string.h) + AC_CHECK_HEADERS(stdarg.h stddef.h stddef.h stdlib.h stdint.h malloc.h \ + search.h getopt.h pthread.h values.h float.h limits.h termios.h \ ++ crt_externs.h \ + errno.h time.h sys/time.h sys/times.h sys/types.h unistd.h fenv.h \ + sys/select.h fpu_control.h sys/fpu.h strings.h sys/socket.h sys/stat.h) + AC_HEADER_TIME diff --git a/graphics/graphviz/patches/patch-ab b/graphics/graphviz/patches/patch-ab new file mode 100644 index 00000000000..b4513387e53 --- /dev/null +++ b/graphics/graphviz/patches/patch-ab @@ -0,0 +1,24 @@ +$NetBSD: patch-ab,v 1.11 2006/02/15 02:53:29 minskim Exp $ + +--- config.h.in.orig 2005-08-28 06:09:52.000000000 -0700 ++++ config.h.in +@@ -42,6 +42,9 @@ + /* Define to 1 if you have the `cbrt' function. */ + #undef HAVE_CBRT + ++/* Define to 1 if you have the <crt_externs.h> header file. */ ++#undef HAVE_CRT_EXTERNS_H ++ + /* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'. + */ + #undef HAVE_DIRENT_H +@@ -300,6 +303,9 @@ + /* Define to 1 if the system has the type `_Bool'. */ + #undef HAVE__BOOL + ++/* Define to 1 if you have the `_NSGetEnviron' function. */ ++#undef HAVE__NSGETENVIRON ++ + /* Define to 1 if you have the `_sysconf' function. */ + #undef HAVE__SYSCONF + diff --git a/graphics/graphviz/patches/patch-ac b/graphics/graphviz/patches/patch-ac new file mode 100644 index 00000000000..3f382b80dd1 --- /dev/null +++ b/graphics/graphviz/patches/patch-ac @@ -0,0 +1,26 @@ +$NetBSD: patch-ac,v 1.15 2006/02/15 02:53:29 minskim Exp $ + +--- configure.orig 2006-02-12 12:13:19.000000000 -0800 ++++ configure +@@ -30100,8 +30100,10 @@ fi + + + ++ + for ac_func in lrand48 drand48 srand48 setmode setenv getenv \ + __freadable _sysconf getrusage strerror cbrt lsqrt vsnprintf \ ++ _NSGetEnviron \ + strtoul strtoll strtoull uname + do + as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +@@ -30353,8 +30355,10 @@ done + + + ++ + for ac_header in stdarg.h stddef.h stddef.h stdlib.h stdint.h malloc.h \ + search.h getopt.h pthread.h values.h float.h limits.h termios.h \ ++ crt_externs.h \ + errno.h time.h sys/time.h sys/times.h sys/types.h unistd.h fenv.h \ + sys/select.h fpu_control.h sys/fpu.h strings.h sys/socket.h sys/stat.h + do diff --git a/graphics/graphviz/patches/patch-ad b/graphics/graphviz/patches/patch-ad new file mode 100644 index 00000000000..a9a1896b519 --- /dev/null +++ b/graphics/graphviz/patches/patch-ad @@ -0,0 +1,19 @@ +$NetBSD: patch-ad,v 1.8 2006/02/15 02:53:29 minskim Exp $ + +--- lib/ast/pathpath.c.orig 2005-08-28 05:47:29.000000000 -0700 ++++ lib/ast/pathpath.c +@@ -33,7 +33,14 @@ + #include <unistd.h> + + /* #include <option.h> */ ++#ifdef HAVE_CRT_EXTERNS_H ++#include <crt_externs.h> ++#endif ++#ifdef HAVE__NSGETENVIRON ++#define environ (*_NSGetEnviron()) ++#else + extern char **environ; ++#endif + char **opt_info_argv; + + char *pathpath(register char *path, const char *p, const char *a, int mode) |