head	1.2;
access;
symbols
	pkgsrc-2016Q1:1.1.0.14
	pkgsrc-2016Q1-base:1.1
	pkgsrc-2015Q4:1.1.0.12
	pkgsrc-2015Q4-base:1.1
	pkgsrc-2015Q3:1.1.0.10
	pkgsrc-2015Q3-base:1.1
	pkgsrc-2015Q2:1.1.0.8
	pkgsrc-2015Q2-base:1.1
	pkgsrc-2015Q1:1.1.0.6
	pkgsrc-2015Q1-base:1.1
	pkgsrc-2014Q4:1.1.0.4
	pkgsrc-2014Q4-base:1.1
	pkgsrc-2014Q3:1.1.0.2
	pkgsrc-2014Q3-base:1.1;
locks; strict;
comment	@# @;


1.2
date	2016.06.11.20.14.35;	author kamil;	state dead;
branches;
next	1.1;
commitid	m8Y21ZVoB7cgs5az;

1.1
date	2014.08.03.22.07.39;	author wiz;	state Exp;
branches;
next	;
commitid	X6wa6osq8XE4TXKx;


desc
@@


1.2
log
@Deduplicate www/webkits -- remove the oldest unneeded version webkit1-gtk*

For future consumers: webkit24 should be compatible with webkit1.
@
text
@$NetBSD: patch-am,v 1.1 2014/08/03 22:07:39 wiz Exp $

--- Source/WTF/wtf/RAMSize.cpp.orig	2012-10-19 13:44:57.000000000 +0000
+++ Source/WTF/wtf/RAMSize.cpp
@@@@ -27,7 +27,7 @@@@
 #include "RAMSize.h"
 
 #include "StdLibExtras.h"
-#if OS(DARWIN)
+#if OS(DARWIN) || OS(NETBSD)
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/sysctl.h>
@@@@ -45,13 +45,17 @@@@ static const size_t ramSizeGuess = 128 *
 
 static size_t computeRAMSize()
 {
-#if OS(DARWIN)
+#if OS(DARWIN) || OS(NETBSD)
     int mib[2];
     uint64_t ramSize;
     size_t length;
 
     mib[0] = CTL_HW;
+#if OS(DARWIN)
     mib[1] = HW_MEMSIZE;
+#else
+    mib[1] = HW_PHYSMEM64;
+#endif
     length = sizeof(int64_t);
     int sysctlResult = sysctl(mib, 2, &ramSize, &length, 0, 0);
     if (sysctlResult == -1)
@


1.1
log
@Re-import webkit-gtk-1.10.2nb17 as www/webkit1-gtk, in preparation
for v2 of the package.

WebKit is an open source web browser engine. WebKit is also the name of
the Mac OS X system framework version of the engine that's used by
Safari, Dashboard, Mail, and many other OS X applications. WebKit's HTML
and JavaScript code began as a branch of the KHTML and KJS libraries
from KDE.

This is the GTK2+ port of major version 1 of the engine.
@
text
@d1 1
a1 1
$NetBSD: patch-am,v 1.1 2012/10/30 12:46:30 drochner Exp $
@