summaryrefslogtreecommitdiff
path: root/lang/guile
diff options
context:
space:
mode:
authorgdt <gdt>2008-02-27 12:19:45 +0000
committergdt <gdt>2008-02-27 12:19:45 +0000
commitdf9858f8a956862060025bd90cf95f053e6b6f3a (patch)
tree31010b76e7055a2764865ce74ac5b52e8fc1e140 /lang/guile
parentbbb73ea60fc1b10ba8487a41455a38de48be88d7 (diff)
downloadpkgsrc-df9858f8a956862060025bd90cf95f053e6b6f3a.tar.gz
Simplify approach to dealing with upstream cruft.
Diffstat (limited to 'lang/guile')
-rw-r--r--lang/guile/Makefile3
-rw-r--r--lang/guile/distinfo4
-rw-r--r--lang/guile/patches/patch-aj22
3 files changed, 16 insertions, 13 deletions
diff --git a/lang/guile/Makefile b/lang/guile/Makefile
index 31b750f241c..9bbeb07f0fb 100644
--- a/lang/guile/Makefile
+++ b/lang/guile/Makefile
@@ -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 --git a/lang/guile/distinfo b/lang/guile/distinfo
index 7d369f82108..37e76f46de1 100644
--- a/lang/guile/distinfo
+++ b/lang/guile/distinfo
@@ -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-aa) = 37fdeb8171b13468bfd0fa4e45aaf1770b8668ea
SHA1 (patch-ae) = c3e5065408082978df5b6ddd62e47dda8ab41f40
SHA1 (patch-ag) = 8aeb781ba43597f37b1ce4aaa2fb0baba2e4ce9c
SHA1 (patch-ah) = 7a33742c2b4ae21a6e673ceeccc48ccae6a26ba3
-SHA1 (patch-aj) = bcb095105f4a956a1766052893f0545f22e8b25f
+SHA1 (patch-aj) = e00579d933cec744538851b62d372a027f20b6b6
diff --git a/lang/guile/patches/patch-aj b/lang/guile/patches/patch-aj
index 0490dd01fe8..1b7defbf7cf 100644
--- a/lang/guile/patches/patch-aj
+++ b/lang/guile/patches/patch-aj
@@ -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