[pkgsrc/trunk]: pkgsrc/editors/TeXmacs When checking for gettimeofday, don't ...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a012b9a2e99a
branches:  trunk
changeset: 518841:a012b9a2e99a
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Tue Sep 19 22:03:54 2006 +0000

description:
When checking for gettimeofday, don't create a fake prototype which is
guarantied to clash with the system version. Better would be to stop
using C++ for the test, but that's a lot more work.

diffstat:

 editors/TeXmacs/distinfo         |   4 +-
 editors/TeXmacs/patches/patch-ab |  48 +++++++++++++++++++++++++++++++++++++--
 2 files changed, 47 insertions(+), 5 deletions(-)

diffs (73 lines):

diff -r a261edf0a12a -r a012b9a2e99a editors/TeXmacs/distinfo
--- a/editors/TeXmacs/distinfo  Tue Sep 19 21:33:30 2006 +0000
+++ b/editors/TeXmacs/distinfo  Tue Sep 19 22:03:54 2006 +0000
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.38 2006/08/11 18:05:12 drochner Exp $
+$NetBSD: distinfo,v 1.39 2006/09/19 22:03:54 joerg Exp $
 
 SHA1 (TeXmacs-1.0.6.5-src.tar.gz) = 7f8d8e7f67ef7cffddc53cd39419ea04422fe3c6
 RMD160 (TeXmacs-1.0.6.5-src.tar.gz) = 4d83e98072cee30e06119d401cc01c942c4cb5b9
 Size (TeXmacs-1.0.6.5-src.tar.gz) = 3782401 bytes
 SHA1 (patch-aa) = 95b9e42fe1ff343e891fe299382c3647636eec99
-SHA1 (patch-ab) = d459a4e848a97ea919cde29433a3a4ce733a2950
+SHA1 (patch-ab) = e2d3dff7ce46ff0a827c6d6e9320060b21d6bd71
 SHA1 (patch-ac) = 21810d4f9d5e6525a86ec2d0c347dcfd1c9e31c8
 SHA1 (patch-ae) = c313a19db160d9f1c0dc950a1eb465869cec777f
 SHA1 (patch-ag) = 2b1c0ce4aa0f6b824f08f05a95beacbb1722436b
diff -r a261edf0a12a -r a012b9a2e99a editors/TeXmacs/patches/patch-ab
--- a/editors/TeXmacs/patches/patch-ab  Tue Sep 19 21:33:30 2006 +0000
+++ b/editors/TeXmacs/patches/patch-ab  Tue Sep 19 22:03:54 2006 +0000
@@ -1,8 +1,50 @@
-$NetBSD: patch-ab,v 1.9 2005/08/26 17:21:04 drochner Exp $
+$NetBSD: patch-ab,v 1.10 2006/09/19 22:03:54 joerg Exp $
 
---- configure.orig     2005-08-21 12:05:29.000000000 +0200
+--- configure.orig     2006-08-06 16:31:00.000000000 +0000
 +++ configure
-@@ -5956,9 +5956,9 @@ echo "$as_me: WARNING: unable to link st
+@@ -4237,38 +4237,13 @@ else
+   cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+ #include "confdefs.h"
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char $ac_func (); below.  */
+-#include <assert.h>
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char $ac_func ();
+-char (*f) ();
+ 
+-#ifdef F77_DUMMY_MAIN
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
+-   int F77_DUMMY_MAIN() { return 1; }
+-#endif
++#include <sys/time.h>
++
+ int
+ main ()
+ {
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+-choke me
+-#else
+-f = $ac_func;
+-#endif
+-
+-  ;
+-  return 0;
++  return gettimeofday(NULL, NULL);
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+@@ -5959,9 +5934,9 @@ echo "$as_me: WARNING: unable to link st
        fi
     fi
  fi