[pkgsrc/trunk]: pkgsrc/lang/guile Simplify approach to dealing with upstream ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d83083064b47
branches:  trunk
changeset: 539081:d83083064b47
user:      gdt <gdt%pkgsrc.org@localhost>
date:      Wed Feb 27 12:19:45 2008 +0000

description:
Simplify approach to dealing with upstream cruft.

diffstat:

 lang/guile/Makefile         |   3 +--
 lang/guile/distinfo         |   4 ++--
 lang/guile/patches/patch-aj |  22 +++++++++++++---------
 3 files changed, 16 insertions(+), 13 deletions(-)

diffs (59 lines):

diff -r da5d707aee61 -r d83083064b47 lang/guile/Makefile
--- a/lang/guile/Makefile       Wed Feb 27 11:04:29 2008 +0000
+++ b/lang/guile/Makefile       Wed Feb 27 12:19:45 2008 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.82 2008/02/22 02:28:06 gdt Exp $
+# $NetBSD: Makefile,v 1.83 2008/02/27 12:19:45 gdt Exp $
 
 DISTNAME=              guile-1.8.4
-PKGREVISION=           1
 CATEGORIES=            lang
 MASTER_SITES=          ${MASTER_SITE_GNU:=guile/}
 
diff -r da5d707aee61 -r d83083064b47 lang/guile/distinfo
--- a/lang/guile/distinfo       Wed Feb 27 11:04:29 2008 +0000
+++ b/lang/guile/distinfo       Wed Feb 27 12:19:45 2008 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.34 2008/02/19 23:33:35 gdt Exp $
+$NetBSD: distinfo,v 1.35 2008/02/27 12:19:45 gdt Exp $
 
 SHA1 (guile-1.8.4.tar.gz) = 1e80fe242acfde2bfa39fd1e8409a8f010e24e2b
 RMD160 (guile-1.8.4.tar.gz) = 58a502e553519b7f4e409ede361ad12141f20fec
@@ -7,4 +7,4 @@
 SHA1 (patch-ae) = c3e5065408082978df5b6ddd62e47dda8ab41f40
 SHA1 (patch-ag) = 8aeb781ba43597f37b1ce4aaa2fb0baba2e4ce9c
 SHA1 (patch-ah) = 7a33742c2b4ae21a6e673ceeccc48ccae6a26ba3
-SHA1 (patch-aj) = bcb095105f4a956a1766052893f0545f22e8b25f
+SHA1 (patch-aj) = e00579d933cec744538851b62d372a027f20b6b6
diff -r da5d707aee61 -r d83083064b47 lang/guile/patches/patch-aj
--- a/lang/guile/patches/patch-aj       Wed Feb 27 11:04:29 2008 +0000
+++ b/lang/guile/patches/patch-aj       Wed Feb 27 12:19:45 2008 +0000
@@ -1,15 +1,19 @@
-$NetBSD: patch-aj,v 1.3 2007/07/20 00:09:23 gdt Exp $
+$NetBSD: patch-aj,v 1.4 2008/02/27 12:19:45 gdt Exp $
 
---- libguile/_scm.h.orig       2007-05-09 16:22:03.000000000 -0400
+--- libguile/_scm.h.orig       2008-02-06 08:09:18.000000000 -0500
 +++ libguile/_scm.h
-@@ -119,7 +119,9 @@
+@@ -95,14 +95,6 @@
  # define SCM_SYSCALL(line) line;
  #endif /* ndef SCM_SYSCALL */
  
 -#if !defined (MSDOS) && !defined (__MINGW32__)
-+#include <errno.h>
-+
-+#if !defined (MSDOS) && !defined (__MINGW32__) && !defined(errno)
- # ifdef ARM_ULIB
-     extern volatile int errno;
- # else
+-# ifdef ARM_ULIB
+-    extern volatile int errno;
+-# else
+-    extern int errno;
+-# endif /* def ARM_ULIB */
+-#endif /* ndef MSDOS && ndef __MINGW32__*/
+-
+ 
+ 
+ #ifndef min