Bump PKGREVISION.

* buildlink to xulrunner10
* Try to fix build on DragonFly 3.0.1

5 files changed, 34 insertions, 19 deletions

diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile
index b2f540b0621..0ff58722665 100644
--- a/www/seamonkey/Makefile
+++ b/www/seamonkey/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.65 2012/03/10 03:26:04 ryoon Exp $
+# $NetBSD: Makefile,v 1.66 2012/03/15 08:36:43 ryoon Exp $
 #
 
 DISTNAME=	seamonkey-${SM_VER}.source
 PKGNAME=	seamonkey-${SM_VER}
+PKGREVISION=	1
 SM_VER=		2.7.2
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA:=seamonkey/releases/${SM_VER}/source/}
@@ -45,6 +46,6 @@ do-build:
 # XXX for some reason it doesn't work unless -j is explicitly specified
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} -j${MAKE_JOBS:U1}
 
-.include "../../devel/xulrunner/mozilla-common.mk"
+.include "../../devel/xulrunner10/mozilla-common.mk"
 .include "options.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/seamonkey/distinfo b/www/seamonkey/distinfo
index 7aa9e9ee055..62877fc8240 100644
--- a/www/seamonkey/distinfo
+++ b/www/seamonkey/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.74 2012/03/10 03:26:04 ryoon Exp $
+$NetBSD: distinfo,v 1.75 2012/03/15 08:36:43 ryoon Exp $
 
 SHA1 (seamonkey-2.7.2.source.tar.bz2) = 4c3004f129a26cfb4d085ac7b3c128dd9d5a89c5
 RMD160 (seamonkey-2.7.2.source.tar.bz2) = fd8712a63f70cf2e05ace47cc25204d0774f838c
@@ -61,13 +61,13 @@ SHA1 (patch-mozilla_build_autoconf_nss.m4) = d07c020d6903ffec1b808e1d22e3e0242df
 SHA1 (patch-mozilla_dom_plugins_ipc_PluginModuleChild.cpp) = 379733f5018e0ece33b9301143b1dffa6943c81a
 SHA1 (patch-mozilla_dom_plugins_ipc_PluginModuleChild.h) = c027190ef4f2dd57d158b333c3ee4c99172e5803
 SHA1 (patch-mozilla_ipc_chromium_Makefile.in) = 8671984c61e7310aa6d3de45bb9080b723332322
-SHA1 (patch-mozilla_ipc_chromium_chromium-config.mk) = f33de1c90e99f1e5b9d108883c00865a070ddef9
+SHA1 (patch-mozilla_ipc_chromium_chromium-config.mk) = 21dd321c09108c2567698bcd3510957435be24be
 SHA1 (patch-mozilla_ipc_chromium_src_base_base__paths.h) = e2b197f22bb44008881480291f9e890f005c65c6
 SHA1 (patch-mozilla_ipc_chromium_src_base_file__util__bsd.cc) = 251ed873e26a47c69f4ddf809c4f5b496cbd9e97
 SHA1 (patch-mozilla_ipc_chromium_src_base_message__loop.cc) = ecbcb2d966490d0d438c28e02a8cef731ff43094
 SHA1 (patch-mozilla_ipc_chromium_src_base_platform__thread.h) = ef83a20b54fb8b09b1b8e23373628a1a00f295a2
 SHA1 (patch-mozilla_ipc_chromium_src_base_process__util.h) = 263ae63a4c9b8ef82dacc3e72afcadb3de5c82fd
-SHA1 (patch-mozilla_ipc_chromium_src_base_process__util__bsd.cc) = 8dd159ab48e9727fb7e6802ba1de63461c7792f2
+SHA1 (patch-mozilla_ipc_chromium_src_base_process__util__bsd.cc) = c0a5f86bc9db4c137c8bb77e9773e5134fd755c1
 SHA1 (patch-mozilla_ipc_chromium_src_base_process__util__posix.cc) = 61c8eaa26205e8be2135a05188226556f79a27da
 SHA1 (patch-mozilla_ipc_chromium_src_base_third__party_nspr_prtime.cc) = 35e33a07f7185ed6c68783c760b53919689dae76
 SHA1 (patch-mozilla_ipc_chromium_src_chrome_common_ipc__message__utils.h) = 00ed184c5e7561ddcd166b307985396ffe5dbff4
diff --git a/www/seamonkey/hacks.mk b/www/seamonkey/hacks.mk
index 46f7b288952..b24fab7ac19 100644
--- a/www/seamonkey/hacks.mk
+++ b/www/seamonkey/hacks.mk
@@ -1,3 +1,3 @@
-# $NetBSD: hacks.mk,v 1.1 2011/07/11 20:49:29 tnn Exp $
+# $NetBSD: hacks.mk,v 1.2 2012/03/15 08:36:43 ryoon Exp $
 
-.include "../../devel/xulrunner/hacks.mk"
+.include "../../devel/xulrunner10/hacks.mk"
diff --git a/www/seamonkey/patches/patch-mozilla_ipc_chromium_chromium-config.mk b/www/seamonkey/patches/patch-mozilla_ipc_chromium_chromium-config.mk
index a7ddbb80023..c53415e1f28 100644
--- a/www/seamonkey/patches/patch-mozilla_ipc_chromium_chromium-config.mk
+++ b/www/seamonkey/patches/patch-mozilla_ipc_chromium_chromium-config.mk
@@ -1,8 +1,8 @@
-$NetBSD: patch-mozilla_ipc_chromium_chromium-config.mk,v 1.1 2012/03/10 03:26:06 ryoon Exp $
+$NetBSD: patch-mozilla_ipc_chromium_chromium-config.mk,v 1.2 2012/03/15 08:36:43 ryoon Exp $
 
---- mozilla/ipc/chromium/chromium-config.mk.orig	2012-02-16 14:09:02.000000000 +0000
-+++ mozilla/ipc/chromium/chromium-config.mk
-@@ -56,17 +56,6 @@ LOCAL_INCLUDES += \
+--- mozilla/ipc/chromium/chromium-config.mk.orig	2012-02-16 07:40:33.000000000 +0100
++++ mozilla/ipc/chromium/chromium-config.mk	2012-03-11 11:05:40.397182000 +0100
+@@ -56,17 +56,6 @@
    -I$(DEPTH)/ipc/ipdl/_ipdlheaders \
    $(NULL)
  
@@ -20,7 +20,7 @@ $NetBSD: patch-mozilla_ipc_chromium_chromium-config.mk,v 1.1 2012/03/10 03:26:06
  ifeq ($(OS_ARCH),WINNT) # {
  OS_LIBS += $(call EXPAND_LIBNAME,psapi shell32 dbghelp)
  
-@@ -93,13 +82,62 @@ DEFINES += -DCOMPILER_MSVC
+@@ -93,13 +82,64 @@
  endif
  
  else # } {
@@ -41,6 +41,7 @@ $NetBSD: patch-mozilla_ipc_chromium_chromium-config.mk,v 1.1 2012/03/10 03:26:06
 +
 +OS_DRAGONFLY = 1
 +OS_BSD = 1
++OS_LIBS += $(call EXPAND_LIBNAME,kvm)
 +DEFINES += \
 +  -DOS_DRAGONFLY=1 \
 +  -DOS_BSD=1 \
@@ -51,6 +52,7 @@ $NetBSD: patch-mozilla_ipc_chromium_chromium-config.mk,v 1.1 2012/03/10 03:26:06
 +
 +OS_FREEBSD = 1
 +OS_BSD = 1
++OS_LIBS += $(call EXPAND_LIBNAME,kvm)
 +DEFINES += \
 +  -DOS_FREEBSD=1 \
 +  -DOS_BSD=1 \
@@ -86,7 +88,7 @@ $NetBSD: patch-mozilla_ipc_chromium_chromium-config.mk,v 1.1 2012/03/10 03:26:06
    $(NULL)
  
  # NB: to stop gcc warnings about exporting template instantiation
-@@ -107,4 +145,8 @@ OS_CXXFLAGS := $(filter-out -pedantic,$(
+@@ -107,4 +147,8 @@
  
  endif # }
  endif # }
diff --git a/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_base_process__util__bsd.cc b/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_base_process__util__bsd.cc
index 3088c383bc9..3d6f5112227 100644
--- a/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_base_process__util__bsd.cc
+++ b/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_base_process__util__bsd.cc
@@ -1,28 +1,38 @@
-$NetBSD: patch-mozilla_ipc_chromium_src_base_process__util__bsd.cc,v 1.1 2012/03/10 03:26:06 ryoon Exp $
+$NetBSD: patch-mozilla_ipc_chromium_src_base_process__util__bsd.cc,v 1.2 2012/03/15 08:36:43 ryoon Exp $
 
---- mozilla/ipc/chromium/src/base/process_util_bsd.cc.orig	2012-03-09 13:13:25.000000000 +0000
-+++ mozilla/ipc/chromium/src/base/process_util_bsd.cc
-@@ -0,0 +1,298 @@
+
+--- mozilla/ipc/chromium/src/base/process_util_bsd.cc.orig	2012-03-08 18:52:15.229788000 +0100
++++ mozilla/ipc/chromium/src/base/process_util_bsd.cc	2012-03-11 10:59:50.559480000 +0100
+@@ -0,0 +1,309 @@
 +// Copyright (c) 2008 The Chromium Authors. All rights reserved.
 +// Use of this source code is governed by a BSD-style license that can be
 +// found in the LICENSE file.
 +
 +// derived from process_util_linux.cc and process_util_mac.cc
 +
-+// TODO: - add code for FreeBSD/DragonFly/MirBSD (?) to use kvm_getprocx
-+
 +#include "base/process_util.h"
 +
 +#include <ctype.h>
 +#include <fcntl.h>
 +#include <unistd.h>
 +#include <string>
++#if defined(OS_DRAGONFLY)
++/* DragonFly, as of v3.0.1, does not explicitly mark symbols public */
++#define PRE_SYS_INCLUDE		_Pragma("GCC visibility push(default)")
++#define POST_SYS_INCLUDE	_Pragma("GCC visibility pop")
++#else
++#define PRE_SYS_INCLUDE
++#define POST_SYS_INCLUDE
++#endif
++PRE_SYS_INCLUDE
 +#include <kvm.h>
++POST_SYS_INCLUDE
 +#include <sys/sysctl.h>
 +#include <sys/types.h>
 +#include <sys/wait.h>
 +#if defined(OS_DRAGONFLY)
 +#include <sys/user.h>
++#define HAVE_POSIX_SPAWN	1
 +#endif
 +
 +#include "base/debug_util.h"
@@ -40,7 +50,9 @@ $NetBSD: patch-mozilla_ipc_chromium_src_base_process__util__bsd.cc,v 1.1 2012/03
 +#endif
 +
 +#ifdef HAVE_POSIX_SPAWN
++PRE_SYS_INCLUDE
 +#include <spawn.h>
++POST_SYS_INCLUDE
 +extern "C" char **environ __dso_public;
 +#endif
 +