diff options
author | joerg <joerg@pkgsrc.org> | 2006-02-26 20:36:58 +0000 |
---|---|---|
committer | joerg <joerg@pkgsrc.org> | 2006-02-26 20:36:58 +0000 |
commit | 388f58ae51e88e89a96dc645344d68294d31d63e (patch) | |
tree | 2fb7afcef200b3acdb8dae6df114ccadbb1800c0 /lang | |
parent | 241419e530c3905247354ef725d054e61597fbd4 (diff) | |
download | pkgsrc-388f58ae51e88e89a96dc645344d68294d31d63e.tar.gz |
Fix spelling of DragonFly. Don't generate a common (!) errno, just
remove the junk for compatibility with strange Visual C environments.
Bump revision for the latter.
Diffstat (limited to 'lang')
-rw-r--r-- | lang/spidermonkey/Makefile | 4 | ||||
-rw-r--r-- | lang/spidermonkey/distinfo | 5 | ||||
-rw-r--r-- | lang/spidermonkey/patches/patch-aa | 4 | ||||
-rw-r--r-- | lang/spidermonkey/patches/patch-ab | 20 |
4 files changed, 27 insertions, 6 deletions
diff --git a/lang/spidermonkey/Makefile b/lang/spidermonkey/Makefile index 24a64cfc49d..aba848dd2e5 100644 --- a/lang/spidermonkey/Makefile +++ b/lang/spidermonkey/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.2 2006/02/05 23:09:51 joerg Exp $ +# $NetBSD: Makefile,v 1.3 2006/02/26 20:36:58 joerg Exp $ # DISTNAME= js-1.5 PKGNAME= ${DISTNAME:S/js/spidermonkey/} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= lang MASTER_SITES= http://ftp.mozilla.org/pub/mozilla.org/js/ diff --git a/lang/spidermonkey/distinfo b/lang/spidermonkey/distinfo index 81b0d8ead73..774d2c5c011 100644 --- a/lang/spidermonkey/distinfo +++ b/lang/spidermonkey/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.1.1.1 2006/01/27 19:47:21 xtraeme Exp $ +$NetBSD: distinfo,v 1.2 2006/02/26 20:36:58 joerg Exp $ SHA1 (js-1.5.tar.gz) = 707755be3a94207d5d10ccd1011ca00babe0a689 RMD160 (js-1.5.tar.gz) = a1f23d53c259a9fa354f29eecdc1c56472f4f626 Size (js-1.5.tar.gz) = 958135 bytes -SHA1 (patch-aa) = 61c0b7e452f67528d982a82bb5ef2b71cd40637b +SHA1 (patch-aa) = 06627df12b3e39a33164257beecff7d8bf89ed6f +SHA1 (patch-ab) = 9f78175b240add7ed2dc3d49c90367c9fa5d16ea diff --git a/lang/spidermonkey/patches/patch-aa b/lang/spidermonkey/patches/patch-aa index ce3f34b19ed..b477f431439 100644 --- a/lang/spidermonkey/patches/patch-aa +++ b/lang/spidermonkey/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.1.1.1 2006/01/27 19:47:21 xtraeme Exp $ +$NetBSD: patch-aa,v 1.2 2006/02/26 20:36:58 joerg Exp $ --- config.mk.orig 2003-11-15 01:10:55.000000000 +0100 +++ config.mk 2006-01-27 20:42:30.000000000 +0100 @@ -12,7 +12,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2006/01/27 19:47:21 xtraeme Exp $ +ifeq ($(OS_ARCH), FreeBSD) +OS_CONFIG := pkgsrc +else -+ifeq ($(OS_ARCH), DragonFlyBSD) ++ifeq ($(OS_ARCH), DragonFly) +OS_CONFIG := pkgsrc +else +ifeq ($(OS_ARCH), OpenBSD) diff --git a/lang/spidermonkey/patches/patch-ab b/lang/spidermonkey/patches/patch-ab new file mode 100644 index 00000000000..e9458123340 --- /dev/null +++ b/lang/spidermonkey/patches/patch-ab @@ -0,0 +1,20 @@ +$NetBSD: patch-ab,v 1.1 2006/02/26 20:36:58 joerg Exp $ + +--- fdlibm/k_standard.c.orig 2006-02-26 20:29:51.000000000 +0000 ++++ fdlibm/k_standard.c +@@ -52,14 +52,7 @@ + + #include "fdlibm.h" + +-/* XXX ugly hack to get msvc to link without error. */ +-#if _LIB_VERSION == _IEEE_ && !(defined(DARWIN) || defined(XP_MACOSX)) +- int errno; +-# define EDOM 0 +-# define ERANGE 0 +-#else +-# include <errno.h> +-#endif ++#include <errno.h> + + + #ifndef _USE_WRITE |