update Tue Jun 22 00:37:00 PDT 2010

diff --git a/wip/erlang/Makefile b/wip/erlang/Makefile
index fbab032..01e25d8 100644 (file)
--- a/wip/erlang/Makefile
+++ b/wip/erlang/Makefile
@@ -19,6 +19,7 @@ GNU_CONFIGURE=                yes
 USE_GNU_CONFIGURE_HOST=        ${USE_CROSS_COMPILE}
 OVERRIDE_DIRDEPTH=     4
 USE_TOOLS+=            gmake perl:run
+USE_LANGUAGES=         c c++
 
 CONFIGURE_ARGS+=       --with-ssl=${BUILDLINK_PREFIX.openssl}
 

diff --git a/wip/erlang/Makefile.versions b/wip/erlang/Makefile.versions
index 5565804..ff4f8bd 100644 (file)
--- a/wip/erlang/Makefile.versions
+++ b/wip/erlang/Makefile.versions
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile.versions,v 1.9 2009/12/15 13:53:24 asau Exp $
 
-ERLANG_VERSION=                        14.1.0
+ERLANG_VERSION=                        14.0.0
 DIST_VERSION_MAJOR=            R14A
 #DIST_VERSION_MINOR=           1
 

diff --git a/wip/erlang/distinfo b/wip/erlang/distinfo
index c50c320..e20b7e1 100644 (file)
--- a/wip/erlang/distinfo
+++ b/wip/erlang/distinfo
@@ -20,7 +20,7 @@ SHA1 (patch-an) = 50a33207affe4831ee107bc80eb37957a0a96973
 SHA1 (patch-ao) = 6cf2128cab7402bbe02553724db6da7b1c2b6684
 SHA1 (patch-ap) = 0962f1f8ce99c2010cbe03ac00c2d0187fcbecdf
 SHA1 (patch-ar) = da70a4889ddca453d70e0e74019e60c29ac31e1b
-SHA1 (patch-as) = 792775c17e50b9f30cd250728d77eda66d8de7fc
+SHA1 (patch-as) = 41b7527f16734d1999393662f6c0c88a344bd7b0
 SHA1 (patch-at) = 8d4831db4e245f31bfd5db0468344c410b34c41d
 SHA1 (patch-au) = fe924a3306a278f51d10b1d2ad14432ec9f1428e
 SHA1 (patch-av) = 3c0a446177036cb2875d68dbf35d265879c032bb

diff --git a/wip/erlang/options.mk b/wip/erlang/options.mk
index 0c15487..9ea9267 100644 (file)
--- a/wip/erlang/options.mk
+++ b/wip/erlang/options.mk
@@ -13,7 +13,7 @@ USE_JAVA2=            yes
 .include "../../mk/java-vm.mk"
 PLIST_SRC+=            PLIST.java
 .else
-CONFIGURE_ENV+=        JAVAC=none
+CONFIGURE_ARGS+=       --without-javac
 .endif
 
 .if !empty(PKG_OPTIONS:Merlang-hipe)

diff --git a/wip/erlang/patches/patch-as b/wip/erlang/patches/patch-as
index 70d01fd..6caaffa 100644 (file)
--- a/wip/erlang/patches/patch-as
+++ b/wip/erlang/patches/patch-as
@@ -1,8 +1,8 @@
 $NetBSD$
 
---- erts/emulator/sys/unix/sys_float.c.orig    2010-02-19 18:04:07.000000000 +0000
-+++ erts/emulator/sys/unix/sys_float.c
-@@ -476,7 +476,7 @@ static int mask_fpe(void)
+--- erts/emulator/sys/unix/sys_float.c.orig    2010-02-19 20:04:07.000000000 +0200
++++ erts/emulator/sys/unix/sys_float.c 2010-06-22 08:00:55.000000000 +0300
+@@ -476,7 +476,7 @@
  
  #endif
  
@@ -11,22 +11,27 @@ $NetBSD$
  
  #if defined(__linux__) && defined(__i386__)
  #if !defined(X86_FXSR_MAGIC)
-@@ -519,6 +519,11 @@ static int mask_fpe(void)
+@@ -519,6 +519,10 @@
  #define mc_pc(mc)     ((mc)->mc_rip)
  #elif defined(__FreeBSD__) && defined(__i386__)
  #define mc_pc(mc)     ((mc)->mc_eip)
-+#elif defined(__NetBSD__) && defined(__i386__)
-+#define mc_pc(mc)     ((mc)->__gregs[_REG_EIP])
 +#elif defined(__NetBSD__) && defined(__x86_64__)
 +#define mc_pc(mc)     ((mc)->__gregs[_REG_RIP])
-+typedef mcontext_t *erts_mcontext_ptr_t;
++#elif defined(__NetBSD__) && defined(__i386__)
++#define mc_pc(mc)     ((mc)->__gregs[_REG_EIP])
  #elif defined(__OpenBSD__) && defined(__x86_64__)
  #define mc_pc(mc)     ((mc)->sc_rip)
  #elif defined(__sun__) && defined(__x86_64__)
-@@ -610,11 +615,28 @@ static void fpe_sig_action(int sig, sigi
+@@ -610,6 +614,23 @@
        struct env87 *env87 = &savefpu->sv_87.sv_env;
        env87->en_sw &= ~0xFF;
      }
++#elif defined(__NetBSD__) && defined(__x86_64__)
++    mcontext_t *mc = &uc->uc_mcontext;
++    struct fxsave64 *fxsave = (struct fxsave64 *)&mc->__fpregs;
++    pc = mc_pc(mc);
++    fxsave->fx_mxcsr = 0x1F80;
++    fxsave->fx_fsw &= ~0xFF;
 +#elif defined(__NetBSD__) && defined(__i386__)
 +    mcontext_t *mc = &uc->uc_mcontext;
 +    pc = mc_pc(mc);
@@ -41,14 +46,3 @@ $NetBSD$
  #elif defined(__OpenBSD__) && defined(__x86_64__)
      struct fxsave64 *fxsave = uc->sc_fpstate;
      pc = mc_pc(uc);
-     fxsave->fx_mxcsr = 0x1F80;
-     fxsave->fx_fsw &= ~0xFF;
-+#elif defined(__NetBSD__) && defined(__x86_64__)
-+    mcontext_t *mc = &uc->uc_mcontext;
-+    struct fxsave64 *fxsave = (struct fxsave64 *)&mc->__fpregs;
-+    pc = mc_pc(mc);
-+    fxsave->fx_mxcsr = 0x1F80;
-+    fxsave->fx_fsw &= ~0xFF;
- #elif defined(__sun__) && defined(__x86_64__)
-     mcontext_t *mc = &uc->uc_mcontext;
-     struct fpchip_state *fpstate = &mc->fpregs.fp_reg_set.fpchip_state;

diff --git a/www/bozohttpd/Makefile b/www/bozohttpd/Makefile
index 066a76b..506e12d 100644 (file)
--- a/www/bozohttpd/Makefile
+++ b/www/bozohttpd/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.71 2010/06/17 19:45:41 mrg Exp $
+# $NetBSD: Makefile,v 1.72 2010/06/22 05:24:59 mrg Exp $
 #
 
-DISTNAME=      bozohttpd-20100617
+DISTNAME=      bozohttpd-20100621
 CATEGORIES=    www
 MASTER_SITES=  ${MASTER_SITE_LOCAL}
 EXTRACT_SUFX=  .tar.bz2

diff --git a/www/bozohttpd/distinfo b/www/bozohttpd/distinfo
index a017f13..52a63a0 100644 (file)
--- a/www/bozohttpd/distinfo
+++ b/www/bozohttpd/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.52 2010/06/17 19:45:41 mrg Exp $
+$NetBSD: distinfo,v 1.53 2010/06/22 05:24:59 mrg Exp $
 
-SHA1 (bozohttpd-20100617.tar.bz2) = f8ce68828f9dcd56f0313759686c6141c1ab47de
-RMD160 (bozohttpd-20100617.tar.bz2) = 1689b5882ac734cf2df1a29210f7e989765b4d24
-Size (bozohttpd-20100617.tar.bz2) = 46355 bytes
+SHA1 (bozohttpd-20100621.tar.bz2) = 31fd889fdb672021b77c18a526c25e864cd40d96
+RMD160 (bozohttpd-20100621.tar.bz2) = 08929ed45f346093d9d289e5912f8d79a3bc714b
+Size (bozohttpd-20100621.tar.bz2) = 46446 bytes
 SHA1 (patch-aa) = 2e70d3d10aa8bc228331cc1a229ef04106aca210
 SHA1 (patch-ab) = 67c4299d7a857d7d6179ee7a437b76d29db596cd