Commits

Jim Razmus II  committed 2af1ba6

cvs up

  • Participants
  • Parent commits 0fbf945

Comments (0)

Files changed (81)

File audio/hgd/CVS/Entries

 D/pkg////
 /Makefile/1.12/Thu Mar 22 11:01:50 2012//
 /distinfo/1.7/Thu Mar 22 11:01:50 2012//
+D/patches////

File audio/hgd/patches/CVS/Entries

+/patch-Makefile_in/1.4/Sun Apr 15 15:23:54 2012//
+D

File audio/hgd/patches/CVS/Repository

+ports/audio/hgd/patches

File audio/hgd/patches/CVS/Root

+/nfs/openbsd/mirror

File audio/hgd/patches/patch-Makefile_in

+$OpenBSD: patch-Makefile_in,v 1.4 2012/04/15 15:23:54 edd Exp $
+--- Makefile.in.orig	Wed Mar 21 17:26:33 2012
++++ Makefile.in	Sun Apr 15 01:35:35 2012
+@@ -84,7 +84,7 @@ mplayer.o: mplayer.c mplayer.h
+ 
+ hgd-playd: common.o db.o py.o hgd-playd.c hgd.h config.h crypto.o mplayer.o cfg.o
+ 	@echo "\n--> Building: \"hgd-playd\""
+-	${CC} hgd-playd.c ${CPPFLAGS} ${SQL_CFLAGS} ${PY_CFLAGS} ${CFLAGS} \
++	${CC} hgd-playd.c ${CPPFLAGS} ${SQL_CFLAGS} ${CONFIG_CFLAGS} ${PY_CFLAGS} ${CFLAGS} \
+ 		db.o common.o crypto.o py.o mplayer.o cfg.o \
+ 		${SQL_LDFLAGS} ${SSL_LDFLAGS} ${LDFLAGS} ${PY_LDFLAGS} \
+ 		${BSD_LDFLAGS} ${CONFIG_LDFLAGS} \
+@@ -92,7 +92,7 @@ hgd-playd: common.o db.o py.o hgd-playd.c hgd.h config
+ 
+ hgd-netd: cfg.o common.o net.o mplayer.o hgd-netd.c hgd.h db.o cfg.o crypto.o user.o
+ 	@echo "\n--> Building: \"hgd-netd\""
+-	${CC} hgd-netd.c ${TAG_CFLAGS} ${CPPFLAGS} ${SQL_CFLAGS} ${CFLAGS} ${PY_CFLAGS} \
++	${CC} hgd-netd.c ${TAG_CFLAGS} ${CPPFLAGS} ${SQL_CFLAGS} ${CONFIG_CFLAGS} ${CFLAGS} ${PY_CFLAGS} \
+ 		mplayer.o cfg.o common.o db.o net.o crypto.o user.o \
+ 		${TAG_LDFLAGS} ${SQL_LDFLAGS} ${SSL_LDFLAGS} ${LDFLAGS} \
+ 		${BSD_LDFLAGS} ${CONFIG_LDFLAGS} \

File audio/mpd/CVS/Entries

 D/patches////
 D/pkg////
-/Makefile/1.44/Wed Apr 11 11:01:34 2012//
 /distinfo/1.14/Wed Apr 11 11:01:34 2012//
+/Makefile/1.45/Mon Apr 16 11:01:56 2012//

File audio/mpd/Makefile

-# $OpenBSD: Makefile,v 1.44 2012/04/10 15:12:54 dcoppa Exp $
+# $OpenBSD: Makefile,v 1.45 2012/04/16 09:50:17 dcoppa Exp $
 
 COMMENT =		Music Player Daemon
 DISTNAME =		mpd-0.16.8
+REVISION =		0
 CATEGORIES =		audio
 HOMEPAGE =		http://www.musicpd.org/
 MAINTAINER =		David Coppa <dcoppa@openbsd.org>

File audio/mpd/pkg/CVS/Entries

-/DESCR/1.4/Mon Jan  2 23:35:02 2012//
 /PLIST/1.8/Mon Jan  2 23:35:02 2012//
 /mpd.rc/1.4/Mon Jan  2 23:35:02 2012//
+/DESCR/1.5/Mon Apr 16 11:01:56 2012//
 D

File audio/mpd/pkg/DESCR

-Music Player Daemon allows remote access for playing music (mp3,
-ogg, flac, aac, mod and wav files) and managing playlists. MPD is
+Music Player Daemon allows remote access for playing music (MP3,
+Ogg, FLAC, AAC, Mod and WAV files) and managing playlists. MPD is
 designed for integrating a computer into a stereo system that
 provides control for music playback over a local network.  It also
 makes a great desktop music player and has several frontend options.
 
 Flavors
 
-tremor:	Use the tremor integer-only ogg decoder. This disables
-	use of flac files in ogg containers and the network
-	streaming functionality.
+tremor:	Use the tremor integer-only Vorbis decoder. This disables
+	the use of the FLAC codec within Ogg containers and the
+	network streaming functionality.

File devel/cppcheck/CVS/Entries

 D/pkg////
-/Makefile/1.11/Fri Mar 16 11:02:22 2012//
-/distinfo/1.9/Fri Mar 16 11:02:22 2012//
+/Makefile/1.12/Mon Apr 16 11:02:21 2012//
+/distinfo/1.10/Mon Apr 16 11:02:21 2012//

File devel/cppcheck/Makefile

-# $OpenBSD: Makefile,v 1.11 2012/03/15 17:05:45 gsoares Exp $
+# $OpenBSD: Makefile,v 1.12 2012/04/15 14:33:50 gsoares Exp $
 
 COMMENT =		C/C++ static checker
 
-DISTNAME =		cppcheck-1.53
+DISTNAME =		cppcheck-1.54
 
 CATEGORIES =		devel
 
 # GPLv3
 PERMIT_PACKAGE_CDROM =	Yes
 PERMIT_PACKAGE_FTP =	Yes
-PERMIT_DISTFILES_CDROM = Yes
+PERMIT_DISTFILES_CDROM =Yes
 PERMIT_DISTFILES_FTP =	Yes
 
-WANTLIB =		c m pcre stdc++ 
+WANTLIB =		c m pcre stdc++
 
 BUILD_DEPENDS =		textproc/docbook-xsl \
 			textproc/libxslt

File devel/cppcheck/distinfo

-MD5 (cppcheck-1.53.tar.gz) = I8Jys/ALDpz4pTEZbasuNw==
-RMD160 (cppcheck-1.53.tar.gz) = s3weSUW0vqBVY6ZiLb9z1HjTRJk=
-SHA1 (cppcheck-1.53.tar.gz) = LS8fALWH5zQAnaSe4ZSCCfG5hlc=
-SHA256 (cppcheck-1.53.tar.gz) = uvAC/O3tMoFuuqsctYSNIoM+1T2dqQDDkTcFrYTNp+g=
-SIZE (cppcheck-1.53.tar.gz) = 1294557
+MD5 (cppcheck-1.54.tar.gz) = x2Qx9yg0QyVz2KENrCtGXg==
+RMD160 (cppcheck-1.54.tar.gz) = APOSYUO0PRR8OaqdGjjxcVCpFKQ=
+SHA1 (cppcheck-1.54.tar.gz) = vBOt0ooBnuxsj75Z4J5QeeQXnLw=
+SHA256 (cppcheck-1.54.tar.gz) = aWmmVA+PJIYDhFaTOga93xU7TIvmLYJq409Xra68Qm0=
+SIZE (cppcheck-1.54.tar.gz) = 1315447

File devel/glib2/CVS/Entries

 D/patches////
 D/pkg////
-/Makefile/1.168/Sat Apr 14 11:02:20 2012//
 /distinfo/1.66/Sat Apr 14 11:02:20 2012//
+/Makefile/1.169/Mon Apr 16 11:02:25 2012//

File devel/glib2/Makefile

-# $OpenBSD: Makefile,v 1.168 2012/04/14 07:47:55 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.169 2012/04/16 10:04:49 landry Exp $
 
 COMMENT-main=		general-purpose utility library
 COMMENT-docs=		glib2 documentation
 EXTRACT_SUFX=		.tar.xz
 
 PKGNAME-main=		glib2-${VERSION}
+REVISION-main=		0
 PKGNAME-docs=		glib2-docs-${VERSION}
 
 CATEGORIES=		devel

File devel/glib2/patches/CVS/Entries

 /patch-glib-2_0_pc_in/1.1/Fri Mar 23 13:19:32 2012//
 /patch-gio_gunixmounts_c/1.7/Sat Mar 31 11:02:25 2012//
 /patch-gio_kqueue_kqueue-exclusions_c/1.1/Sun Apr  8 07:45:30 2012//
+/patch-glib_gmain_c/1.12/Mon Apr 16 10:04:49 2012//
 D

File devel/glib2/patches/patch-glib_gmain_c

+$OpenBSD: patch-glib_gmain_c,v 1.12 2012/04/16 10:04:49 landry Exp $
+gmain: block child sources when blocking the parent
+
+When blocking a source that has child sources, we need to consider the
+children blocked as well. Otherwise they will still trigger repeatedly
+in an inner loop started from the parent source's callback.
+
+patch from https://bugzilla.gnome.org/attachment.cgi?id=212002
+https://bugzilla.gnome.org/show_bug.cgi?id=669260
+Fixes https://bugs.launchpad.net/midori/+bug/780133
+--- glib/gmain.c.orig	Mon Apr  2 05:08:41 2012
++++ glib/gmain.c	Mon Apr 16 10:41:41 2012
+@@ -191,7 +191,8 @@ typedef struct _GSourceCallback GSourceCallback;
+ typedef enum
+ {
+   G_SOURCE_READY = 1 << G_HOOK_FLAG_USER_SHIFT,
+-  G_SOURCE_CAN_RECURSE = 1 << (G_HOOK_FLAG_USER_SHIFT + 1)
++  G_SOURCE_CAN_RECURSE = 1 << (G_HOOK_FLAG_USER_SHIFT + 1),
++  G_SOURCE_BLOCKED = 1 << (G_HOOK_FLAG_USER_SHIFT + 2)
+ } GSourceFlags;
+ 
+ typedef struct _GMainWaiter GMainWaiter;
+@@ -313,8 +314,7 @@ struct _GSourcePrivate
+ #define G_THREAD_SELF g_thread_self ()
+ 
+ #define SOURCE_DESTROYED(source) (((source)->flags & G_HOOK_FLAG_ACTIVE) == 0)
+-#define SOURCE_BLOCKED(source) (((source)->flags & G_HOOK_FLAG_IN_CALL) != 0 && \
+-		                ((source)->flags & G_SOURCE_CAN_RECURSE) == 0)
++#define SOURCE_BLOCKED(source) (((source)->flags & G_SOURCE_BLOCKED) != 0)
+ 
+ #define SOURCE_UNREF(source, context)                       \
+    G_STMT_START {                                           \
+@@ -2426,12 +2426,24 @@ block_source (GSource *source)
+ 
+   g_return_if_fail (!SOURCE_BLOCKED (source));
+ 
++  source->flags |= G_SOURCE_BLOCKED;
++
+   tmp_list = source->poll_fds;
+   while (tmp_list)
+     {
+       g_main_context_remove_poll_unlocked (source->context, tmp_list->data);
+       tmp_list = tmp_list->next;
+     }
++
++  if (source->priv && source->priv->child_sources)
++    {
++      tmp_list = source->priv->child_sources;
++      while (tmp_list)
++	{
++	  block_source (tmp_list->data);
++	  tmp_list = tmp_list->next;
++	}
++    }
+ }
+ 
+ /* HOLDS: source->context's lock */
+@@ -2440,15 +2452,27 @@ unblock_source (GSource *source)
+ {
+   GSList *tmp_list;
+   
+-  g_return_if_fail (!SOURCE_BLOCKED (source)); /* Source already unblocked */
++  g_return_if_fail (SOURCE_BLOCKED (source)); /* Source already unblocked */
+   g_return_if_fail (!SOURCE_DESTROYED (source));
+   
++  source->flags &= ~G_SOURCE_BLOCKED;
++
+   tmp_list = source->poll_fds;
+   while (tmp_list)
+     {
+       g_main_context_add_poll_unlocked (source->context, source->priority, tmp_list->data);
+       tmp_list = tmp_list->next;
+     }
++
++  if (source->priv && source->priv->child_sources)
++    {
++      tmp_list = source->priv->child_sources;
++      while (tmp_list)
++	{
++	  unblock_source (tmp_list->data);
++	  tmp_list = tmp_list->next;
++	}
++    }
+ }
+ 
+ /* HOLDS: context's lock */
+@@ -2527,8 +2551,7 @@ g_main_dispatch (GMainContext *context)
+ 	  if (!was_in_call)
+ 	    source->flags &= ~G_HOOK_FLAG_IN_CALL;
+ 
+-	  if ((source->flags & G_SOURCE_CAN_RECURSE) == 0 &&
+-	      !SOURCE_DESTROYED (source))
++	  if (SOURCE_BLOCKED (source) && !SOURCE_DESTROYED (source))
+ 	    unblock_source (source);
+ 	  
+ 	  /* Note: this depends on the fact that we can't switch

File editors/ht/CVS/Entries

 D/patches////
 D/pkg////
-/Makefile/1.19/Mon Jan  2 23:39:21 2012//
-/distinfo/1.11/Mon Jan  2 23:39:21 2012//
+/Makefile/1.20/Mon Apr 16 11:03:17 2012//
+/distinfo/1.12/Mon Apr 16 11:03:17 2012//

File editors/ht/Makefile

-# $OpenBSD: Makefile,v 1.19 2010/11/15 23:22:07 espie Exp $
+# $OpenBSD: Makefile,v 1.20 2012/04/15 18:38:53 gonzalo Exp $
 
 COMMENT =		file editor/viewer/analyzer for executables
 
-DISTNAME =		ht-2.0.18
+DISTNAME =		ht-2.0.20
 CATEGORIES =		editors
 
 HOMEPAGE =		http://hte.sourceforge.net/
 PERMIT_DISTFILES_CDROM =Yes
 PERMIT_DISTFILES_FTP =	Yes
 
-WANTLIB =		c m ncurses stdc++
+WANTLIB =		c m ncursesw stdc++
 
 MASTER_SITES =		${MASTER_SITE_SOURCEFORGE:=hte/}
 

File editors/ht/distinfo

-MD5 (ht-2.0.18.tar.gz) = znaYuAA1vOKXN0szgEXa3Q==
-RMD160 (ht-2.0.18.tar.gz) = kh9bV9tp2DJsJh7IQPV4osBifTw=
-SHA1 (ht-2.0.18.tar.gz) = fZ2JfdUPFRIXE3xBB6pyWuhaoOw=
-SHA256 (ht-2.0.18.tar.gz) = dTVdgP99pxRBG2gvAvzGjC4JEOYba3JgABNWZW4HvXY=
-SIZE (ht-2.0.18.tar.gz) = 1068063
+MD5 (ht-2.0.20.tar.gz) = ItWjBHADLsi4WNSjok+NAg==
+RMD160 (ht-2.0.20.tar.gz) = rng3HIR6DD/jUT/0hBt3r6W6nxA=
+SHA1 (ht-2.0.20.tar.gz) = ie0z1KZpmpfvE9e/2Q++T0QhWP0=
+SHA256 (ht-2.0.20.tar.gz) = 79ZfGzDuE9g2NG3idGh/0obF7srVEER6gzf0VukIfXo=
+SIZE (ht-2.0.20.tar.gz) = 1078031

File editors/ht/patches/CVS/Entries

-/patch-configure/1.5/Mon Jan  2 23:39:21 2012//
+/patch-configure/1.6/Mon Apr 16 11:03:17 2012//
 D

File editors/ht/patches/patch-configure

-$OpenBSD: patch-configure,v 1.5 2008/06/02 19:38:09 okan Exp $
---- configure.orig	Sun May 18 17:13:16 2008
-+++ configure	Sun May 18 17:13:35 2008
-@@ -1979,7 +1979,7 @@ fi
+$OpenBSD: patch-configure,v 1.6 2012/04/15 18:38:53 gonzalo Exp $
+--- configure.orig	Sat Mar  3 12:16:47 2012
++++ configure	Fri Apr 13 09:49:30 2012
+@@ -2571,7 +2571,7 @@ fi
  
  if test "x$enable_maintainermode" = "xno"; then
  if test "x$enable_release" = "xyes"; then

File emulators/openmsx/CVS/Entries

 D/patches////
 D/pkg////
-/Makefile/1.6/Tue Jan  3 00:42:19 2012//
-/distinfo/1.1.1.1/Mon Jan  2 23:39:37 2012//
+/Makefile/1.7/Mon Apr 16 11:03:24 2012//
+/distinfo/1.2/Mon Apr 16 11:03:24 2012//

File emulators/openmsx/Makefile

-# $OpenBSD: Makefile,v 1.6 2011/12/26 08:53:11 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.7 2012/04/15 17:47:00 bentley Exp $
 
 BROKEN-powerpc =CPUCore.cc:2347: error: insn does not satisfy its constraints
 
 COMMENT =	MSX home computer emulator
 
-DISTNAME =	openmsx-0.8.1
-REVISION =	2
+DISTNAME =	openmsx-0.8.2
 
 CATEGORIES =	emulators
 
 		INSTALL_SHARE_DIR=${PREFIX}/share/openmsx \
 		INSTALL_DOC_DIR=${PREFIX}/share/doc/openmsx
 
-WANTLIB +=	GL c freetype m pthread stdc++ z ${MODTCL_LIB}
+WANTLIB +=	GL c freetype m pthread stdc++ z ${MODTCL_LIB} ao
 WANTLIB +=	GLEW SDL SDL_ttf ogg png theoradec vorbis xml2
 
-LIB_DEPENDS =	audio/libvorbis \
+LIB_DEPENDS =	audio/libao \
+		audio/libvorbis \
 		devel/sdl-ttf \
 		graphics/glew \
 		graphics/png \
 MAKE_FILE =	GNUmakefile
 USE_GMAKE =	Yes
 
+MAKE_FLAGS =	CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS}" \
+		CXXFLAGS="${CXXFLAGS}"
+
 pre-configure:
 	${SUBST_CMD} ${WRKSRC}/build/python-search.sh
 

File emulators/openmsx/distinfo

-MD5 (openmsx-0.8.1.tar.gz) = +xUMvpCrmAlUX4dGTuJSFg==
-RMD160 (openmsx-0.8.1.tar.gz) = Kit+h0B+XSPDEba0N5DO9i2A800=
-SHA1 (openmsx-0.8.1.tar.gz) = COveuttnuMMmCAxYG/yRJELrKr8=
-SHA256 (openmsx-0.8.1.tar.gz) = Wogt/B+qm8MMBV4WRfZ1xlK4FzkImR7SltvHNZypAeU=
-SIZE (openmsx-0.8.1.tar.gz) = 2834894
+MD5 (openmsx-0.8.2.tar.gz) = QrzqvdiaSYbnRfdKxE2mMQ==
+RMD160 (openmsx-0.8.2.tar.gz) = 8jgBnvkkawFGVV0kZxrVyY9IIOQ=
+SHA1 (openmsx-0.8.2.tar.gz) = Br+zxknsyC0Sm74ljSFn6onrrPo=
+SHA256 (openmsx-0.8.2.tar.gz) = Q3xDzaQ62334TirmGAtudqnf2S0XeYGwx9EL8WzDJBE=
+SIZE (openmsx-0.8.2.tar.gz) = 2881089

File emulators/openmsx/patches/CVS/Entries

-/patch-build_detectsys_py/1.1/Fri Oct 21 13:04:17 2011//
-/patch-build_libraries_py/1.1.1.1/Mon Jan  2 23:39:37 2012//
 /patch-build_main_mk/1.1/Mon Jan  2 23:39:37 2012//
 /patch-build_python-search_sh/1.1/Fri Oct 21 13:04:17 2011//
 /patch-build_version2code_py/1.1.1.1/Mon Jan  2 23:39:37 2012//
-/patch-src_video_PNG_cc/1.1.1.1/Mon Jan  2 23:39:37 2012//
+/patch-build_detectsys_py/1.2/Mon Apr 16 11:03:24 2012//
 D

File emulators/openmsx/patches/patch-build_detectsys_py

-$OpenBSD: patch-build_detectsys_py,v 1.1 2011/10/21 13:04:17 ajacoutot Exp $
+$OpenBSD: patch-build_detectsys_py,v 1.2 2012/04/15 17:47:00 bentley Exp $
 
-Recognize macppc, socppc.
+Recognize macppc, socppc. Added to upstream in r12471.
 
 --- build/detectsys.py.orig	Fri Oct 21 03:19:41 2011
 +++ build/detectsys.py	Fri Oct 21 03:19:05 2011

File emulators/openmsx/patches/patch-build_libraries_py

-$OpenBSD: patch-build_libraries_py,v 1.1.1.1 2011/08/28 18:57:51 bentley Exp $
-
-Correctly find our tclConfig.sh. From upstream r12183.
-
---- build/libraries.py.orig	Sun Jun 12 13:25:30 2011
-+++ build/libraries.py	Sun Jun 12 13:26:13 2011
-@@ -396,7 +396,7 @@ class TCL(Library):
- 				roots = (distroRoot, )
- 			for root in roots:
- 				if isdir(root):
--					for libdir in ('lib', 'lib64'):
-+					for libdir in ('lib', 'lib64', 'lib/tcl'):
- 						libpath = root + '/' + libdir
- 						if isdir(libpath):
- 							yield libpath

File emulators/openmsx/patches/patch-src_video_PNG_cc

-$OpenBSD: patch-src_video_PNG_cc,v 1.1.1.1 2011/08/28 18:57:51 bentley Exp $
-
-Fix build with libpng 1.5.x. From upstream r12214.
-
---- src/video/PNG.cc.orig	Sun Aug 21 10:48:08 2011
-+++ src/video/PNG.cc	Sun Aug 21 10:48:29 2011
-@@ -167,7 +167,7 @@ SDLSurfacePtr load(const std::string& filename)
- 				"Attempted to create a surface with excessive height: "
- 				<< height << ", max " << MAX_SIZE);
- 		}
--		int bpp = png.info->channels * 8;
-+		int bpp = png_get_channels(png.ptr, png.info) * 8;
- 		assert(bpp == 24 || bpp == 32);
- 		Uint32 redMask, grnMask, bluMask, alpMask;
- 		if (OPENMSX_BIGENDIAN) {

File emulators/openmsx/pkg/CVS/Entries

 /DESCR/1.1.1.1/Mon Jan  2 23:39:37 2012//
-/PLIST/1.1.1.1/Mon Jan  2 23:39:37 2012//
 /README/1.2/Mon Jan  2 23:39:37 2012//
+/PLIST/1.2/Mon Apr 16 11:03:24 2012//
 D

File emulators/openmsx/pkg/PLIST

-@comment $OpenBSD: PLIST,v 1.1.1.1 2011/08/28 18:57:51 bentley Exp $
+@comment $OpenBSD: PLIST,v 1.2 2012/04/15 17:47:00 bentley Exp $
 @bin bin/openmsx
 share/doc/openmsx/
 share/doc/openmsx/GPL.txt
 share/openmsx/extensions/Konami_SD-Snatcher_Sound_Cartridge/hardwareconfig.xml
 share/openmsx/extensions/Konami_Snatcher_Sound_Cartridge/
 share/openmsx/extensions/Konami_Snatcher_Sound_Cartridge/hardwareconfig.xml
+share/openmsx/extensions/Lascom_Kanji/
+share/openmsx/extensions/Lascom_Kanji/hardwareconfig.xml
+share/openmsx/extensions/Lascom_Kanji/roms/
+share/openmsx/extensions/Lascom_Kanji/roms/lascom_kanji.rom.gz
 share/openmsx/extensions/MegaRAM_Disk/
 share/openmsx/extensions/MegaRAM_Disk/hardwareconfig.xml
 share/openmsx/extensions/MegaRAM_Disk/roms/
 share/openmsx/extensions/Sony_HBD-F1/hardwareconfig.xml
 share/openmsx/extensions/Sony_HBD-F1/roms/
 share/openmsx/extensions/Sony_HBD-F1/roms/SHA1SUMS
+share/openmsx/extensions/Sony_HBI-232/
+share/openmsx/extensions/Sony_HBI-232/hardwareconfig.xml
+share/openmsx/extensions/Sony_HBI-232/roms/
+share/openmsx/extensions/Sony_HBI-232/roms/SHA1SUMS
 share/openmsx/extensions/Sony_HBI-55/
 share/openmsx/extensions/Sony_HBI-55/hardwareconfig.xml
 share/openmsx/extensions/Sony_HBK-30/
 share/openmsx/machines/Al_Alamiah_AX170/hardwareconfig.xml
 share/openmsx/machines/Al_Alamiah_AX170/roms/
 share/openmsx/machines/Al_Alamiah_AX170/roms/SHA1SUMS
+share/openmsx/machines/Boosted_MSX2+_JP/
+share/openmsx/machines/Boosted_MSX2+_JP/README
+share/openmsx/machines/Boosted_MSX2+_JP/hardwareconfig.xml
 share/openmsx/machines/Boosted_MSX2_EN/
 share/openmsx/machines/Boosted_MSX2_EN/README
 share/openmsx/machines/Boosted_MSX2_EN/hardwareconfig.xml
-share/openmsx/machines/Boosted_MSX2_EN/roms/
-share/openmsx/machines/Boosted_MSX2_EN/roms/README
 share/openmsx/machines/C-BIOS_MSX1/
 share/openmsx/machines/C-BIOS_MSX1/hardwareconfig.xml
 share/openmsx/machines/C-BIOS_MSX1/roms/
 share/openmsx/machines/Sony_HB-F9P_Russian/hardwareconfig.xml
 share/openmsx/machines/Sony_HB-F9P_Russian/roms/
 share/openmsx/machines/Sony_HB-F9P_Russian/roms/SHA1SUMS
+share/openmsx/machines/Sony_HB-F9S/
+share/openmsx/machines/Sony_HB-F9S/hardwareconfig.xml
+share/openmsx/machines/Sony_HB-F9S/roms/
+share/openmsx/machines/Sony_HB-F9S/roms/SHA1SUMS
+share/openmsx/machines/Sony_HB-G900P/
+share/openmsx/machines/Sony_HB-G900P/hardwareconfig.xml
+share/openmsx/machines/Sony_HB-G900P/roms/
+share/openmsx/machines/Sony_HB-G900P/roms/SHA1SUMS
 share/openmsx/machines/Spectravideo_SVI-728/
 share/openmsx/machines/Spectravideo_SVI-728/hardwareconfig.xml
 share/openmsx/machines/Spectravideo_SVI-728/roms/

File geo/gpsbabel/CVS/Entries

 D/patches////
 D/pkg////
-/Makefile/1.21/Sun Feb 19 12:03:05 2012//
 /distinfo/1.7/Sun Feb 19 12:03:05 2012//
+/Makefile/1.22/Mon Apr 16 11:03:46 2012//

File geo/gpsbabel/Makefile

-# $OpenBSD: Makefile,v 1.21 2012/02/18 22:04:07 sthen Exp $
+# $OpenBSD: Makefile,v 1.22 2012/04/15 20:03:16 kirby Exp $
 
 COMMENT-main=		GPS waypoint, track, and route conversion tool
 COMMENT-tk=		Tk front-end to gpsbabel
 VERSION=		1.4.3
 DISTNAME=		gpsbabel-${VERSION}
 PKGNAME-main=		gpsbabel-${VERSION}
+REVISION-main=		0
 PKGNAME-tk=		gpsbabel-tk-${VERSION}
 PKGNAME-qt=		gpsbabel-qt-${VERSION}
+REVISION-qt=		0
 CATEGORIES=		geo
 
 HOMEPAGE=		http://www.gpsbabel.org/
 PKG_ARCH-tk=	*
 RUN_DEPENDS-tk=		geo/gpsbabel \
 			${MODTK_RUN_DEPENDS}
-RUN_DEPENDS-qt=		geo/gpsbabel
+RUN_DEPENDS-qt=		geo/gpsbabel \
+			devel/desktop-file-utils
 
 pre-configure:
 	${SUBST_CMD} ${WRKSRC}/guibabel
+	@perl -pi -e 's/gpsbabelfe-bin/guibabel-qt/' \
+		${WRKSRC}/gui/gpsbabel.desktop
 post-configure:
 	cd ${WRKSRC}/gui && ${SETENV} ${CONFIGURE_ENV} qmake4 \
 		app.pro
 	${INSTALL_DATA} ${WRKSRC}/babelweb/htmldoc-*/*.html \
 		${PREFIX}/share/doc/gpsbabel
 	${INSTALL_DATA} ${WRKSRC}/README* ${PREFIX}/share/doc/gpsbabel
+	${INSTALL_DATA_DIR} ${PREFIX}/share/applications
+	${INSTALL_DATA} ${WRKSRC}/gui/gpsbabel.desktop \
+		${PREFIX}/share/applications
+	${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps
+	${INSTALL_DATA} ${WRKSRC}/gui/images/appicon.png \
+		${PREFIX}/share/pixmaps/gpsbabel.png
 
 .include <bsd.port.mk>

File geo/gpsbabel/pkg/CVS/Entries

 /DESCR-main/1.1/Mon Jan  2 23:40:35 2012//
 /DESCR-qt/1.1/Sat Feb 18 22:04:07 2012//
 /DESCR-tk/1.1/Sat Feb 18 22:04:07 2012//
-/PLIST-main/1.3/Sun Feb 19 12:03:05 2012//
-/PLIST-qt/1.1/Sat Feb 18 22:04:07 2012//
 /PLIST-tk/1.1/Sat Feb 18 22:04:08 2012//
+/PLIST-main/1.4/Mon Apr 16 11:03:46 2012//
+/PLIST-qt/1.2/Mon Apr 16 11:03:46 2012//
 D

File geo/gpsbabel/pkg/PLIST-main

-@comment $OpenBSD: PLIST-main,v 1.3 2012/02/18 22:04:07 sthen Exp $
+@comment $OpenBSD: PLIST-main,v 1.4 2012/04/15 20:03:16 kirby Exp $
 @pkgpath geo/gpsbabel
 @bin bin/gpsbabel
+@comment share/applications/
 share/doc/gpsbabel/
 share/doc/gpsbabel/Advanced_Usage.html
 share/doc/gpsbabel/Data_Filters.html

File geo/gpsbabel/pkg/PLIST-qt

-@comment $OpenBSD: PLIST-qt,v 1.1 2012/02/18 22:04:07 sthen Exp $
+@comment $OpenBSD: PLIST-qt,v 1.2 2012/04/15 20:03:16 kirby Exp $
 @bin bin/guibabel-qt
+share/applications/gpsbabel.desktop
+share/pixmaps/
+share/pixmaps/gpsbabel.png
+@exec %D/bin/update-desktop-database
+@unexec-delete %D/bin/update-desktop-database

File infrastructure/mk/CVS/Entries

 /perl.port.mk/1.19/Mon Jan  2 23:41:26 2012//
 /bsd.port.subdir.mk/1.106/Fri Feb 17 12:03:03 2012//
 /pkgpath.mk/1.44/Fri Feb 17 12:03:03 2012//
-/bsd.port.mk/1.1161/Fri Mar 23 11:03:14 2012//
 /arch-defines.mk/1.3/Fri Apr 13 11:03:52 2012//
+/bsd.port.mk/1.1162/Mon Apr 16 11:03:58 2012//
 D

File infrastructure/mk/bsd.port.mk

 #-*- mode: Makefile; tab-width: 4; -*-
 # ex:ts=4 sw=4 filetype=make:
-#	$OpenBSD: bsd.port.mk,v 1.1161 2012/03/22 14:08:50 espie Exp $
+#	$OpenBSD: bsd.port.mk,v 1.1162 2012/04/16 09:21:39 espie Exp $
 #	$FreeBSD: bsd.port.mk,v 1.264 1996/12/25 02:27:44 imp Exp $
 #	$NetBSD: bsd.port.mk,v 1.62 1998/04/09 12:47:02 hubertf Exp $
 #
 .  endif
 	@echo -n ${_COMMENT${_S}:S/^"//:S/"$//:S/^'//:S/'$//:Q}"|"; \
 	if [ -f ${DESCR${_S}} ]; then \
-		echo -n "${DESCR${_S}:S,^${PORTSDIR}/,,}|"; \
+		echo -n `PORTSDIR_PATH=${PORTSDIR_PATH} ${_PERLSCRIPT}/getpkgpath ${DESCR${_S}}`'|';  \
 	else \
 		echo -n "/dev/null|"; \
 	fi; \

File lang/go/CVS/Entries

-/Makefile/1.1.1.1/Sat Mar 31 12:37:15 2012//
 /distinfo/1.1.1.1/Sat Mar 31 12:37:16 2012//
 /systrace.filter/1.1.1.1/Sat Mar 31 12:37:16 2012//
 D/patches////
 D/pkg////
+/Makefile/1.2/Mon Apr 16 11:04:07 2012//

File lang/go/Makefile

-# $OpenBSD: Makefile,v 1.1.1.1 2012/03/31 12:37:15 jsing Exp $
+# $OpenBSD: Makefile,v 1.2 2012/04/15 13:37:27 jsing Exp $
 
 ONLY_FOR_ARCHS =	amd64 i386
 
 COMMENT =		Go programming language
 
 VERSION =		1
+REVISION =		0
 EXTRACT_SUFX =		.src.tar.gz
 DISTNAME = 		go.go${VERSION}
 PKGNAME = 		go-${VERSION}

File lang/go/patches/CVS/Entries

 /patch-src_pkg_runtime_os_openbsd_h/1.1.1.1/Sat Mar 31 12:37:16 2012//
 /patch-src_pkg_runtime_signals_openbsd_h/1.1.1.1/Sat Mar 31 12:37:16 2012//
-/patch-src_pkg_runtime_sys_openbsd_386_s/1.1.1.1/Sat Mar 31 12:37:16 2012//
-/patch-src_pkg_runtime_sys_openbsd_amd64_s/1.1.1.1/Sat Mar 31 12:37:16 2012//
-/patch-src_pkg_runtime_thread_openbsd_c/1.1.1.1/Sat Mar 31 12:37:16 2012//
+/patch-src_pkg_runtime_sys_openbsd_386_s/1.2/Mon Apr 16 11:04:07 2012//
+/patch-src_pkg_runtime_sys_openbsd_amd64_s/1.2/Mon Apr 16 11:04:07 2012//
+/patch-src_pkg_runtime_thread_openbsd_c/1.2/Mon Apr 16 11:04:07 2012//
 D

File lang/go/patches/patch-src_pkg_runtime_sys_openbsd_386_s

-$OpenBSD: patch-src_pkg_runtime_sys_openbsd_386_s,v 1.1.1.1 2012/03/31 12:37:16 jsing Exp $
---- src/pkg/runtime/sys_openbsd_386.s.orig	Mon Mar 19 00:13:54 2012
-+++ src/pkg/runtime/sys_openbsd_386.s	Mon Mar 19 00:13:54 2012
+$OpenBSD: patch-src_pkg_runtime_sys_openbsd_386_s,v 1.2 2012/04/15 13:37:27 jsing Exp $
+--- src/pkg/runtime/sys_openbsd_386.s.orig	Wed Mar 28 15:49:26 2012
++++ src/pkg/runtime/sys_openbsd_386.s	Fri Mar  2 02:14:56 2012
 @@ -12,14 +12,16 @@
  TEXT runtime·exit(SB),7,$-4
  	MOVL	$1, AX
  TEXT runtime·sigtramp(SB),7,$44
  	get_tls(CX)
  
-@@ -174,7 +184,7 @@ TEXT runtime·sigtramp(SB),7,$44
+@@ -174,40 +184,46 @@ TEXT runtime·sigtramp(SB),7,$44
  	MOVL	AX, 4(SP)		// arg 1 - sigcontext
  	MOVL	$103, AX		// sys_sigreturn
  	INT	$0x80
 +	MOVL	$0xf1, 0xf1		// crash
  	RET
  
- // int32 rfork_thread(int32 flags, void *stack, M *m, G *g, void (*fn)(void));
-@@ -286,7 +296,7 @@ TEXT runtime·settls(SB),7,$16
+-// int32 rfork_thread(int32 flags, void *stack, M *m, G *g, void (*fn)(void));
+-TEXT runtime·rfork_thread(SB),7,$8
+-	MOVL	flags+8(SP), AX
+-	MOVL	stack+12(SP), CX
++// int32 tfork_thread(void *stack, M *m, G *g, void (*fn)(void));
++TEXT runtime·tfork_thread(SB),7,$20
+ 
+ 	// Copy m, g, fn off parent stack for use by child.
++	MOVL	stack+4(FP), CX
+ 	SUBL	$16, CX
+-	MOVL	mm+16(SP), SI
++	MOVL	mm+8(FP), SI
+ 	MOVL	SI, 0(CX)
+-	MOVL	gg+20(SP), SI
++	MOVL	gg+12(FP), SI
+ 	MOVL	SI, 4(CX)
+-	MOVL	fn+24(SP), SI
++	MOVL	fn+16(FP), SI
+ 	MOVL	SI, 8(CX)
+ 	MOVL	$1234, 12(CX)
+ 	MOVL	CX, SI
+ 
++	LEAL	8(SP), AX
++	MOVL	$0, 0(AX)		// tf_tcb
++	MOVL	$0, 4(AX)		// tf_tid
++	MOVL	$0, 8(AX)		// tf_flags
++
+ 	MOVL	$0, 0(SP)		// syscall gap
+-	MOVL	AX, 4(SP)		// arg 1 - flags
+-	MOVL	$251, AX		// sys_rfork
++	MOVL	AX, 4(SP)		// arg 1 - params
++	MOVL	$328, AX		// sys___tfork
+ 	INT	$0x80
+ 
+-	// Return if rfork syscall failed
+-	JCC	4(PC)
++	// Return if tfork syscall failed.
++	JCC	5(PC)
+ 	NEGL	AX
+-	MOVL	AX, 48(SP)
++	MOVL	ret+0(FP), DX
++	MOVL	AX, 0(DX)
+ 	RET
+ 
+ 	// In parent, return.
+ 	CMPL	AX, $0
+-	JEQ	3(PC)
+-	MOVL	AX, 48(SP)
++	JEQ	4(PC)
++	MOVL	ret+0(FP), DX
++	MOVL	AX, 0(DX)
+ 	RET
+ 
+ 	// In child, on new stack.
+@@ -286,7 +302,7 @@ TEXT runtime·settls(SB),7,$16
  	MOVL	$165, AX		// sys_sysarch
  	INT	$0x80
  	JCC	2(PC)
  	RET
  
  TEXT runtime·osyield(SB),7,$-4
-@@ -295,12 +305,12 @@ TEXT runtime·osyield(SB),7,$-4
+@@ -295,12 +311,12 @@ TEXT runtime·osyield(SB),7,$-4
  	RET
  
  TEXT runtime·thrsleep(SB),7,$-4

File lang/go/patches/patch-src_pkg_runtime_sys_openbsd_amd64_s

-$OpenBSD: patch-src_pkg_runtime_sys_openbsd_amd64_s,v 1.1.1.1 2012/03/31 12:37:16 jsing Exp $
---- src/pkg/runtime/sys_openbsd_amd64.s.orig	Mon Mar 19 00:13:54 2012
-+++ src/pkg/runtime/sys_openbsd_amd64.s	Mon Mar 19 00:13:54 2012
-@@ -53,7 +53,8 @@ TEXT runtime·rfork_thread(SB),7,$0
+$OpenBSD: patch-src_pkg_runtime_sys_openbsd_amd64_s,v 1.2 2012/04/15 13:37:27 jsing Exp $
+--- src/pkg/runtime/sys_openbsd_amd64.s.orig	Wed Mar 28 15:49:26 2012
++++ src/pkg/runtime/sys_openbsd_amd64.s	Fri Mar  2 02:03:18 2012
+@@ -8,20 +8,23 @@
+ 
+ #include "zasm_GOOS_GOARCH.h"
+ 
+-// int64 rfork_thread(int32 flags, void *stack, M *m, G *g, void (*fn)(void));
+-TEXT runtime·rfork_thread(SB),7,$0
+-	MOVL	flags+8(SP), DI
+-	MOVQ	stack+16(SP), SI
++// int64 tfork_thread(void *stack, M *m, G *g, void (*fn)(void));
++TEXT runtime·tfork_thread(SB),7,$32
+ 
+-	// Copy m, g, fn off parent stack for use by child.
+-	MOVQ	mm+24(SP), R8
+-	MOVQ	gg+32(SP), R9
+-	MOVQ	fn+40(SP), R12
++	// Copy stack, m, g, fn off parent stack for use by child.
++	MOVQ	stack+0(FP), SI
++	MOVQ	mm+8(FP), R8
++	MOVQ	gg+16(FP), R9
++	MOVQ	fn+24(FP), R12
+ 
+-	MOVL	$251, AX		// sys_rfork
++	LEAQ	8(SP), DI
++	MOVQ	$0, 0(DI)		// tf_tcb
++	MOVQ	$0, 8(DI)		// tf_tid
++	MOVL	$0, 16(DI)		// tf_flags
++	MOVL	$328, AX		// sys___tfork
+ 	SYSCALL
+ 
+-	// Return if rfork syscall failed
++	// Return if tfork syscall failed
+ 	JCC	3(PC)
+ 	NEGL	AX
+ 	RET
+@@ -53,7 +56,8 @@ TEXT runtime·rfork_thread(SB),7,$0
  	CALL	R12
  
  	// It shouldn't return.  If it does, exit
  	SYSCALL
  	JMP	-3(PC)			// keep exiting
  
-@@ -67,14 +68,15 @@ TEXT runtime·thrsleep(SB),7,$0
+@@ -67,14 +71,15 @@ TEXT runtime·thrsleep(SB),7,$0
  	MOVL	16(SP), SI		// arg 2 - clock_id
  	MOVQ	24(SP), DX		// arg 3 - tp
  	MOVQ	32(SP), R10		// arg 4 - lock
  	SYSCALL
  	RET
  
-@@ -83,13 +85,14 @@ TEXT runtime·exit(SB),7,$-8
+@@ -83,13 +88,14 @@ TEXT runtime·exit(SB),7,$-8
  	MOVL	8(SP), DI		// arg 1 - exit status
  	MOVL	$1, AX			// sys_exit
  	SYSCALL
  	RET
  
  TEXT runtime·write(SB),7,$-8
-@@ -140,7 +143,7 @@ TEXT time·now(SB), 7, $32
+@@ -140,7 +146,7 @@ TEXT time·now(SB), 7, $32
  	MOVL	$116, AX		// sys_gettimeofday
  	SYSCALL
  	MOVQ	8(SP), AX		// sec
  
  	// sec is in AX, usec in DX
  	MOVQ	AX, sec+0(FP)
-@@ -154,7 +157,7 @@ TEXT runtime·nanotime(SB),7,$32
+@@ -154,7 +160,7 @@ TEXT runtime·nanotime(SB),7,$32
  	MOVL	$116, AX		// sys_gettimeofday
  	SYSCALL
  	MOVQ	8(SP), AX		// sec
  
  	// sec is in AX, usec in DX
  	// return nsec in AX
-@@ -170,9 +173,19 @@ TEXT runtime·sigaction(SB),7,$-8
+@@ -170,9 +176,19 @@ TEXT runtime·sigaction(SB),7,$-8
  	MOVL	$46, AX
  	SYSCALL
  	JCC	2(PC)
  TEXT runtime·sigtramp(SB),7,$64
  	get_tls(BX)
  	
-@@ -226,7 +239,7 @@ TEXT runtime·munmap(SB),7,$0
+@@ -226,7 +242,7 @@ TEXT runtime·munmap(SB),7,$0
  	MOVL	$73, AX			// sys_munmap
  	SYSCALL
  	JCC	2(PC)
  	RET
  
  TEXT runtime·sigaltstack(SB),7,$-8
-@@ -235,7 +248,7 @@ TEXT runtime·sigaltstack(SB),7,$-8
+@@ -235,7 +251,7 @@ TEXT runtime·sigaltstack(SB),7,$-8
  	MOVQ	$288, AX		// sys_sigaltstack
  	SYSCALL
  	JCC	2(PC)
  	RET
  
  // set tls base to DI
-@@ -248,7 +261,7 @@ TEXT runtime·settls(SB),7,$8
+@@ -248,7 +264,7 @@ TEXT runtime·settls(SB),7,$8
  	MOVQ	$165, AX		// sys_sysarch
  	SYSCALL
  	JCC	2(PC)
  	RET
  
  TEXT runtime·sysctl(SB),7,$0
-@@ -260,7 +273,7 @@ TEXT runtime·sysctl(SB),7,$0
+@@ -260,7 +276,7 @@ TEXT runtime·sysctl(SB),7,$0
  	MOVQ	48(SP), R9		// arg 6 - newlen
  	MOVQ	$202, AX		// sys___sysctl
  	SYSCALL

File lang/go/patches/patch-src_pkg_runtime_thread_openbsd_c

-$OpenBSD: patch-src_pkg_runtime_thread_openbsd_c,v 1.1.1.1 2012/03/31 12:37:16 jsing Exp $
---- src/pkg/runtime/thread_openbsd.c.orig	Mon Mar 19 00:13:54 2012
-+++ src/pkg/runtime/thread_openbsd.c	Mon Mar 19 00:13:54 2012
+$OpenBSD: patch-src_pkg_runtime_thread_openbsd_c,v 1.2 2012/04/15 13:37:27 jsing Exp $
+--- src/pkg/runtime/thread_openbsd.c.orig	Wed Mar 28 15:49:26 2012
++++ src/pkg/runtime/thread_openbsd.c	Fri Mar  2 02:03:18 2012
 @@ -20,8 +20,11 @@ enum
  
  extern SigTab runtime·sigtab[];
  
+-extern int64 runtime·rfork_thread(int32 flags, void *stack, M *m, G *g, void (*fn)(void));
+-extern int32 runtime·thrsleep(void *ident, int32 clock_id, void *tsp, void *lock);
 +static Sigset sigset_all = ~(Sigset)0;
 +static Sigset sigset_none;
 +
- extern int64 runtime·rfork_thread(int32 flags, void *stack, M *m, G *g, void (*fn)(void));
--extern int32 runtime·thrsleep(void *ident, int32 clock_id, void *tsp, void *lock);
++extern int64 runtime·tfork_thread(void *stack, M *m, G *g, void (*fn)(void));
 +extern int32 runtime·thrsleep(void *ident, int32 clock_id, void *tsp, void *lock, const int32 *abort);
  extern int32 runtime·thrwakeup(void *ident, int32 n);
  
  			}
  			// reacquire lock
  			while(runtime·xchg(&m->waitsemalock, 1))
-@@ -128,6 +131,7 @@ runtime·semawakeup(M *mp)
+@@ -119,21 +122,13 @@ runtime·semawakeup(M *mp)
+ 	runtime·atomicstore(&mp->waitsemalock, 0);
+ }
+ 
+-// From OpenBSD's sys/param.h
+-#define	RFPROC		(1<<4)	/* change child (else changes curproc) */
+-#define	RFMEM		(1<<5)	/* share `address space' */
+-#define	RFNOWAIT	(1<<6)	/* parent need not wait() on child */
+-#define	RFTHREAD	(1<<13)	/* create a thread, not a process */
+-
  void
  runtime·newosproc(M *m, G *g, void *stk, void (*fn)(void))
  {
+-	int32 flags;
 +	Sigset oset;
- 	int32 flags;
  	int32 ret;
  
-@@ -141,7 +145,11 @@ runtime·newosproc(M *m, G *g, void *stk, void (*fn)(v
+-	flags = RFPROC | RFTHREAD | RFMEM | RFNOWAIT;
+-
+-	if (0) {
++	if(0) {
+ 		runtime·printf(
+ 			"newosproc stk=%p m=%p g=%p fn=%p id=%d/%d ostk=%p\n",
+ 			stk, m, g, fn, m->id, m->tls[0], &m);
+@@ -141,7 +136,11 @@ runtime·newosproc(M *m, G *g, void *stk, void (*fn)(v
  
  	m->tls[0] = m->id;	// so 386 asm can find it
  
 -	if((ret = runtime·rfork_thread(flags, stk, m, g, fn)) < 0) {
 +	oset = runtime·sigprocmask(SIG_SETMASK, sigset_all);
-+	ret = runtime·rfork_thread(flags, stk, m, g, fn);
++	ret = runtime·tfork_thread(stk, m, g, fn);
 +	runtime·sigprocmask(SIG_SETMASK, oset);
 +
 +	if(ret < 0) {
  		runtime·printf("runtime: failed to create new OS thread (have %d already; errno=%d)\n", runtime·mcount() - 1, -ret);
  		if (ret == -ENOTSUP)
  			runtime·printf("runtime: is kern.rthreads disabled?\n");
-@@ -168,6 +176,7 @@ runtime·minit(void)
+@@ -168,6 +167,7 @@ runtime·minit(void)
  	// Initialize signal handling
  	m->gsignal = runtime·malg(32*1024);
  	runtime·signalstack(m->gsignal->stackguard - StackGuard, 32*1024);

File lang/go/pkg/CVS/Entries

 /DESCR/1.1.1.1/Sat Mar 31 12:37:16 2012//
 /PFRAG.amd64/1.1.1.1/Sat Mar 31 12:37:16 2012//
 /PFRAG.i386/1.1.1.1/Sat Mar 31 12:37:16 2012//
-/PLIST/1.1.1.1/Sat Mar 31 12:37:16 2012//
+/PLIST/1.2/Mon Apr 16 11:04:07 2012//
 D

File lang/go/pkg/PLIST

-@comment $OpenBSD: PLIST,v 1.1.1.1 2012/03/31 12:37:16 jsing Exp $
+@comment $OpenBSD: PLIST,v 1.2 2012/04/15 13:19:15 jsing Exp $
 %%amd64%%
 %%i386%%
 bin/go
 go/doc/ie.css
 go/doc/install-source.html
 go/doc/install.html
-go/doc/lo${FULLPKGNAME}53x55.png
+go/doc/logo-153x55.png
 go/doc/play/
 go/doc/play/fib.go
 go/doc/play/hello.go

File math/qhull/CVS/Entries

 D/patches////
 D/pkg////
-/Makefile/1.1.1.1/Mon Jan  2 23:42:58 2012//
-/distinfo/1.1.1.1/Mon Jan  2 23:42:58 2012//
+/Makefile/1.2/Mon Apr 16 11:04:35 2012//
+/distinfo/1.2/Mon Apr 16 11:04:35 2012//

File math/qhull/Makefile

-# $OpenBSD: Makefile,v 1.1.1.1 2010/11/19 09:01:12 shadchin Exp $
+# $OpenBSD: Makefile,v 1.2 2012/04/16 08:07:39 jasper Exp $
 
 COMMENT =		computing the convex hull
 
-VERSION =		2010.1
+VERSION =		2011.1
 DISTNAME =		qhull-${VERSION}
 
-SHARED_LIBS =		qhull		0.0
+SHARED_LIBS =		qhull6		0.0 # 6.2
 
 CATEGORIES =		math
 
 PERMIT_DISTFILES_CDROM =Yes
 PERMIT_DISTFILES_FTP =	Yes
 
-WANTLIB =		c m
+WANTLIB =		c m stdc++
 
 MASTER_SITES =		${HOMEPAGE}download/
 DISTFILES =		${DISTNAME}-src${EXTRACT_SUFX}
 NO_REGRESS =		Yes
 
 CFLAGS +=		-fno-strict-aliasing
+CONFIGURE_ARGS +=	-DDOC_INSTALL_DIR=${PREFIX}/share/doc/qhull
 
 .include <bsd.port.mk>

File math/qhull/distinfo

-MD5 (qhull-2010.1-src.tgz) = 5kE4RwrN6xj3UqC8KhHOtA==
-RMD160 (qhull-2010.1-src.tgz) = hAUw8NEDz6C9htAiakEISGbdXKI=
-SHA1 (qhull-2010.1-src.tgz) = 7UgJEuA+/ddnGVwGx+jCUseBErE=
-SHA256 (qhull-2010.1-src.tgz) = VXCF+0Qbm1okWJ4I17GucezSNPy0PvT4/94UHSLjFr4=
-SIZE (qhull-2010.1-src.tgz) = 674457
+MD5 (qhull-2011.1-src.tgz) = plBhzypuZYEYL03w82Z6jg==
+RMD160 (qhull-2011.1-src.tgz) = Rons50bBEldX8dDhYrvpXThkuls=
+SHA1 (qhull-2011.1-src.tgz) = Njm1Lpm8CDf7JnDTqKS6w/A0erg=
+SHA256 (qhull-2011.1-src.tgz) = ra5EJfUcLq9JHoItxbCgwv3rwliEHhwYW7uKUgDHVMQ=
+SIZE (qhull-2011.1-src.tgz) = 687728

File math/qhull/patches/CVS/Entries

-/patch-CMakeLists_txt/1.1.1.1/Mon Jan  2 23:42:58 2012//
-/patch-src_CMakeLists_txt/1.1.1.1/Mon Jan  2 23:42:58 2012//
+/patch-CMakeLists_txt/1.2/Mon Apr 16 11:04:35 2012//
 D

File math/qhull/patches/patch-CMakeLists_txt

-$OpenBSD: patch-CMakeLists_txt,v 1.1.1.1 2010/11/19 09:01:12 shadchin Exp $
---- CMakeLists.txt.orig	Sun Jan 10 05:07:32 2010
-+++ CMakeLists.txt	Fri Nov 19 00:53:52 2010
-@@ -4,5 +4,9 @@ if(COMMAND cmake_policy)
-   cmake_policy(SET CMP0003 NEW)
- endif(COMMAND cmake_policy)
+$OpenBSD: patch-CMakeLists_txt,v 1.2 2012/04/16 08:07:39 jasper Exp $
+
+Do not create versioned executables.
+
+--- CMakeLists.txt.orig	Thu May 19 02:53:36 2011
++++ CMakeLists.txt	Sat Oct 15 10:11:29 2011
+@@ -254,38 +254,24 @@ endif()
  
-+set(INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/include)
-+set(LIB_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/lib)
-+set(BIN_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/bin)
-+
- add_subdirectory(src)
+ add_executable(qhull ${qhull_SOURCES})
+ target_link_libraries(qhull ${qhull_STATIC})
+-set_target_properties(qhull PROPERTIES 
+-    VERSION ${qhull_VERSION})
  
+ add_executable(rbox ${rbox_SOURCES})
+ target_link_libraries(rbox ${qhull_STATIC})
+-set_target_properties(rbox PROPERTIES
+-    VERSION ${qhull_VERSION})
+ 
+ add_executable(qconvex ${qconvex_SOURCES})
+ target_link_libraries(qconvex ${qhull_STATIC})
+-set_target_properties(qconvex PROPERTIES
+-    VERSION ${qhull_VERSION})
+ 
+ add_executable(qdelaunay ${qdelaunay_SOURCES})
+ target_link_libraries(qdelaunay ${qhull_STATIC})
+-set_target_properties(qdelaunay PROPERTIES
+-    VERSION ${qhull_VERSION})
+ 
+ add_executable(qvoronoi ${qvoronoi_SOURCES})
+ target_link_libraries(qvoronoi ${qhull_STATIC})
+-set_target_properties(qvoronoi PROPERTIES
+-    VERSION ${qhull_VERSION})
+ 
+ add_executable(qhalf ${qhalf_SOURCES})
+ target_link_libraries(qhalf ${qhull_STATIC})
+-set_target_properties(qhalf PROPERTIES
+-    VERSION ${qhull_VERSION})
+ 
+ add_executable(user_eg2 ${user_eg2_SOURCES})
+ target_link_libraries(user_eg2 ${qhull_STATIC})
+-set_target_properties(user_eg2 PROPERTIES
+-    VERSION ${qhull_VERSION})
+ 
+ # ---------------------------------------
+ # Define qhull executables linked to qhull shared library
+@@ -297,8 +283,7 @@ add_executable(user_eg ${user_eg_SOURCES})
+ # user_eg may be linked to qhull_STATIC if user_eg_DEFINES is removed
+ target_link_libraries(user_eg ${qhull_SHARED})
+ set_target_properties(user_eg PROPERTIES
+-    COMPILE_DEFINITIONS "${user_eg_DEFINES}"
+-    VERSION ${qhull_VERSION})
++    COMPILE_DEFINITIONS "${user_eg_DEFINES}")
+ 
+ # ---------------------------------------
+ # Define qhull executables linked to qhullstatic_p and qhullcpp static library
+@@ -314,8 +299,7 @@ add_executable(user_eg3 ${user_eg3_SOURCES})
+ # qhull_STATICP must be last, otherwise qh_fprintf,etc. are not loaded from qhull_CPP
+ target_link_libraries(user_eg3 ${qhull_CPP} ${qhull_STATICP})
+ set_target_properties(user_eg3 PROPERTIES
+-    COMPILE_DEFINITIONS "qh_QHpointer"
+-    VERSION ${qhull_VERSION})
++    COMPILE_DEFINITIONS "qh_QHpointer")
+ 
+ # ---------------------------------------
+ # Define install

File math/qhull/patches/patch-src_CMakeLists_txt

-$OpenBSD: patch-src_CMakeLists_txt,v 1.1.1.1 2010/11/19 09:01:12 shadchin Exp $
---- src/CMakeLists.txt.orig	Thu Nov 18 17:02:29 2010
-+++ src/CMakeLists.txt	Thu Nov 18 17:19:19 2010
-@@ -23,9 +23,14 @@ set(
- 
- file(GLOB qhull_hdr *.h)
- 
--add_library(qhull ${qhull_src})
-+add_library(qhull SHARED ${qhull_src})
- target_link_libraries(qhull m)
-+set_target_properties(qhull PROPERTIES INSTALL_NAME_DIR "${LIB_INSTALL_DIR}")
- 
-+add_library(qhullstatic STATIC ${qhull_src})
-+set_property(TARGET qhullstatic PROPERTY OUTPUT_NAME "qhull")
-+install(TARGETS qhullstatic ARCHIVE DESTINATION ${LIB_INSTALL_DIR})
-+
- set(qhullcmd_SOURCES  unix.c)
- set(rbox_SOURCES  rbox.c)
- set(qconvex_SOURCES  qconvex.c)
-@@ -36,6 +41,7 @@ set(qhalf_SOURCES  qhalf.c)
- 
- add_executable(qhullcmd ${qhullcmd_SOURCES})
- target_link_libraries(qhullcmd qhull)
-+set_property(TARGET qhullcmd PROPERTY OUTPUT_NAME "qhull")
- 
- add_executable(rbox ${rbox_SOURCES})
- target_link_libraries(rbox qhull)
-@@ -52,3 +58,7 @@ target_link_libraries(qvoronoi qhull)
- add_executable(qhalf ${qhalf_SOURCES})
- target_link_libraries(qhalf qhull)
- 
-+install(TARGETS qhull qhullcmd rbox qconvex qdelaunay qvoronoi qhalf
-+	RUNTIME DESTINATION ${BIN_INSTALL_DIR}
-+	LIBRARY DESTINATION ${LIB_INSTALL_DIR})
-+install(FILES ${qhull_hdr} DESTINATION ${INCLUDE_INSTALL_DIR}/qhull)

File math/qhull/pkg/CVS/Entries

 /DESCR/1.1.1.1/Mon Jan  2 23:42:58 2012//
-/PFRAG.shared/1.1.1.1/Mon Jan  2 23:42:58 2012//
-/PLIST/1.1.1.1/Mon Jan  2 23:42:58 2012//
+/PFRAG.shared/1.2/Mon Apr 16 11:04:35 2012//
+/PLIST/1.2/Mon Apr 16 11:04:35 2012//
 D

File math/qhull/pkg/PFRAG.shared

-@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2010/11/19 09:01:12 shadchin Exp $
-@lib lib/libqhull.so.${LIBqhull_VERSION}
+@comment $OpenBSD: PFRAG.shared,v 1.2 2012/04/16 08:07:39 jasper Exp $
+@lib lib/libqhull6.so.${LIBqhull6_VERSION}

File math/qhull/pkg/PLIST

-@comment $OpenBSD: PLIST,v 1.1.1.1 2010/11/19 09:01:12 shadchin Exp $
+@comment $OpenBSD: PLIST,v 1.2 2012/04/16 08:07:39 jasper Exp $
 %%SHARED%%
 @bin bin/qconvex
 @bin bin/qdelaunay
 @bin bin/qhull
 @bin bin/qvoronoi
 @bin bin/rbox
-include/qhull/
-include/qhull/geom.h
-include/qhull/io.h
-include/qhull/libqhull.h
-include/qhull/mem.h
-include/qhull/merge.h
-include/qhull/poly.h
-include/qhull/qhull.h
-include/qhull/qhull_a.h
-include/qhull/qset.h
-include/qhull/random.h
-include/qhull/stat.h
-include/qhull/user.h
-lib/libqhull.a
+@bin bin/user_eg
+@bin bin/user_eg2
+@bin bin/user_eg3
+include/libqhull/
+include/libqhull/geom.h
+include/libqhull/io.h
+include/libqhull/libqhull.h
+include/libqhull/mem.h
+include/libqhull/merge.h
+include/libqhull/poly.h
+include/libqhull/qhull_a.h
+include/libqhull/qset.h
+include/libqhull/random.h
+include/libqhull/stat.h
+include/libqhull/user.h
+include/libqhullcpp/
+include/libqhullcpp/Coordinates.h
+include/libqhullcpp/PointCoordinates.h
+include/libqhullcpp/Qhull.h
+include/libqhullcpp/QhullError.h
+include/libqhullcpp/QhullFacet.h
+include/libqhullcpp/QhullFacetList.h
+include/libqhullcpp/QhullFacetSet.h
+include/libqhullcpp/QhullHyperplane.h
+include/libqhullcpp/QhullIterator.h
+include/libqhullcpp/QhullLinkedList.h
+include/libqhullcpp/QhullPoint.h
+include/libqhullcpp/QhullPointSet.h
+include/libqhullcpp/QhullPoints.h
+include/libqhullcpp/QhullQh.h
+include/libqhullcpp/QhullRidge.h
+include/libqhullcpp/QhullSet.h
+include/libqhullcpp/QhullSets.h
+include/libqhullcpp/QhullStat.h
+include/libqhullcpp/QhullVertex.h
+include/libqhullcpp/QhullVertexSet.h
+include/libqhullcpp/RboxPoints.h
+include/libqhullcpp/UsingLibQhull.h
+include/libqhullcpp/functionObjects.h
+include/road/
+include/road/RoadError.h
+include/road/RoadLogEvent.h
+include/road/RoadTest.h
+lib/libqhullcpp.a
+lib/libqhullstatic.a
+lib/libqhullstatic_p.a
+@man man/man1/qhull.1
+@man man/man1/rbox.1
+share/doc/qhull/
+share/doc/qhull/index.htm
+share/doc/qhull/normal_voronoi_knauss_oesterle.jpg
+share/doc/qhull/qconvex.htm
+share/doc/qhull/qdelau_f.htm
+share/doc/qhull/qdelaun.htm
+share/doc/qhull/qh--4d.gif
+share/doc/qhull/qh--cone.gif
+share/doc/qhull/qh--dt.gif
+share/doc/qhull/qh--geom.gif
+share/doc/qhull/qh--half.gif
+share/doc/qhull/qh--rand.gif
+share/doc/qhull/qh-code.htm
+share/doc/qhull/qh-eg.htm
+share/doc/qhull/qh-faq.htm
+share/doc/qhull/qh-get.htm
+share/doc/qhull/qh-impre.htm
+share/doc/qhull/qh-optc.htm
+share/doc/qhull/qh-optf.htm
+share/doc/qhull/qh-optg.htm
+share/doc/qhull/qh-opto.htm
+share/doc/qhull/qh-optp.htm
+share/doc/qhull/qh-optq.htm
+share/doc/qhull/qh-optt.htm
+share/doc/qhull/qh-quick.htm
+share/doc/qhull/qhalf.htm
+share/doc/qhull/qhull-cpp.xml
+share/doc/qhull/qhull.htm
+share/doc/qhull/qhull.man
+share/doc/qhull/qhull.txt
+share/doc/qhull/qvoron_f.htm
+share/doc/qhull/qvoronoi.htm
+share/doc/qhull/rbox.htm
+share/doc/qhull/rbox.man
+share/doc/qhull/rbox.txt

File multimedia/avidemux/CVS/Entries

 D/patches////
 D/pkg////
 D/files////
-/Makefile/1.34/Mon Jan  2 23:43:18 2012//
 /distinfo/1.7/Mon Jan  2 23:43:18 2012//
+/Makefile/1.35/Mon Apr 16 11:04:45 2012//

File multimedia/avidemux/Makefile

-# $OpenBSD: Makefile,v 1.34 2011/09/16 10:31:23 espie Exp $
+# $OpenBSD: Makefile,v 1.35 2012/04/15 11:37:41 naddy Exp $
 
 COMMENT=	free video editor
 
 DISTNAME=	avidemux_${V}
 PKGNAME=	avidemux-${V}
 
-REVISION=	9
+REVISION=	10
 
 CATEGORIES=	multimedia
 

File multimedia/avidemux/patches/CVS/Entries

 /patch-avidemux_gui_action_names/1.1/Mon Jan  2 23:43:19 2012//
 /patch-configure_in_bot/1.1/Mon Jan  2 23:43:19 2012//
 /patch-configure_in_in/1.7/Fri Apr 13 11:04:38 2012//
+/patch-avidemux_ADM_script_ADM_JSFunctions_cpp/1.4/Sun Apr 15 11:37:41 2012//
 D

File multimedia/avidemux/patches/patch-avidemux_ADM_script_ADM_JSFunctions_cpp

+$OpenBSD: patch-avidemux_ADM_script_ADM_JSFunctions_cpp,v 1.4 2012/04/15 11:37:41 naddy Exp $
+--- avidemux/ADM_script/ADM_JSFunctions.cpp.orig	Sun Apr 15 13:20:44 2012
++++ avidemux/ADM_script/ADM_JSFunctions.cpp	Sun Apr 15 13:21:00 2012
+@@ -370,9 +370,9 @@ JSBool systemExecute(JSContext *cx, JSObject *obj, uin
+ 
+         enterLock();
+ 	// clear file descriptor table of forked process and fork
+-#if defined( __linux__) || defined(__macosx__) || defined(__APPLE__)
++#if defined( __linux__) || defined(__macosx__) || defined(__APPLE__) || defined(__OpenBSD__)
+ 	pid_t pidRtn = fork();
+-#elif defined(__FreeBSD__) || defined(__OpenBSD__)
++#elif defined(__FreeBSD__)
+ 	pid_t pidRtn = rfork(RFPROC|RFCFDG);
+ #endif
+ 

File www/chromium/CVS/Entries

 D/files////
 D/pkg////
 D/patches////
-/Makefile/1.91/Wed Apr 11 11:06:16 2012//
-/distinfo/1.39/Wed Apr 11 11:06:16 2012//
+/Makefile/1.93/Mon Apr 16 11:06:42 2012//
+/distinfo/1.40/Mon Apr 16 11:06:42 2012//

File www/chromium/Makefile

-# $OpenBSD: Makefile,v 1.91 2012/04/10 19:13:46 robert Exp $
+# $OpenBSD: Makefile,v 1.93 2012/04/15 13:33:24 robert Exp $
 
 ONLY_FOR_ARCHS=		i386 amd64
 
 COMMENT=		Chromium browser
 
-V=			18.0.1025.152
+V=			18.0.1025.162
 DISTNAME=		chromium-${V}
 
 CATEGORIES=		www

File www/chromium/distinfo

-MD5 (chromium-18.0.1025.152.tar.bz2) = d/pkosA6xJpFIiBHjundmg==
-RMD160 (chromium-18.0.1025.152.tar.bz2) = Ofaf4U8HB+mgtmFbbRXaDMKU35o=
-SHA1 (chromium-18.0.1025.152.tar.bz2) = 4gLUIiHxBZAAxWB1kH6CVsXMnGw=
-SHA256 (chromium-18.0.1025.152.tar.bz2) = OQASDTRsVWPajiOewIPegqDM5KQqmvRDpmbERBRypAk=
-SIZE (chromium-18.0.1025.152.tar.bz2) = 174664515
+MD5 (chromium-18.0.1025.162.tar.bz2) = LfjHKylBHbvGapWr+NKoDw==
+RMD160 (chromium-18.0.1025.162.tar.bz2) = ai+QWyON9qVCkQhplrCSWjOHROA=
+SHA1 (chromium-18.0.1025.162.tar.bz2) = McMBvd6xIShdkEHfOtv9Dc0u9vA=
+SHA256 (chromium-18.0.1025.162.tar.bz2) = yFh1GIxAxBIll37vWPOwTe8WyumHfTLO2OE6dSB8c80=
+SIZE (chromium-18.0.1025.162.tar.bz2) = 174675400

File www/chromium/patches/CVS/Entries

 /patch-content_browser_browser_main_loop_cc/1.2/Wed Apr  4 11:09:51 2012//
 /patch-content_content_browser_gypi/1.9/Wed Apr  4 11:09:51 2012//
 /patch-content_content_renderer_gypi/1.1/Tue Apr  3 13:59:35 2012//
-/patch-content_renderer_render_view_impl_cc/1.1/Tue Apr  3 13:59:35 2012//
 /patch-content_shell_shell_content_browser_client_cc/1.3/Wed Apr  4 11:09:51 2012//
 /patch-media_audio_openbsd_audio_manager_openbsd_cc/1.9/Tue Apr  3 13:59:35 2012//
 /patch-media_audio_openbsd_audio_manager_openbsd_h/1.9/Tue Apr  3 13:59:35 2012//
 /patch-tools_gyp_pylib_gyp_generator_make_py/1.9/Wed Apr  4 11:09:51 2012//
 /patch-webkit_glue_webcursor_gtk_cc/1.1/Tue Apr  3 18:53:28 2012//
 /patch-webkit_plugins_ppapi_ppapi_plugin_instance_cc/1.9/Wed Apr  4 11:09:51 2012//
+/patch-base_debug_debugger_posix_cc/1.8/Sun Apr 15 10:40:44 2012//
+/patch-base_process_util_openbsd_cc/1.9/Sun Apr 15 10:40:44 2012//
+/patch-content_renderer_render_view_impl_cc/1.2/Mon Apr 16 11:06:42 2012//
 D

File www/chromium/patches/patch-base_debug_debugger_posix_cc

+$OpenBSD: patch-base_debug_debugger_posix_cc,v 1.8 2012/04/15 10:40:44 robert Exp $
+--- base/debug/debugger_posix.cc.orig	Sat Apr 14 12:17:19 2012
++++ base/debug/debugger_posix.cc	Sat Apr 14 16:54:46 2012
+@@ -92,33 +92,36 @@ bool BeingDebugged() {
+ 
+   // Caution: struct kinfo_proc is marked __APPLE_API_UNSTABLE.  The source and
+   // binary interfaces may change.
+-  struct kinfo_proc info;
+-  size_t info_size = sizeof(info);
++  struct kinfo_proc *info;
++  size_t info_size;
+ 
+-#if defined(OS_OPENBSD)
+   if (sysctl(mib, arraysize(mib), NULL, &info_size, NULL, 0) < 0)
+     return -1;
+ 
++  info = (struct kinfo_proc *)malloc(info_size);
++
+   mib[5] = (info_size / sizeof(struct kinfo_proc));
+-#endif
+ 
+-  int sysctl_result = sysctl(mib, arraysize(mib), &info, &info_size, NULL, 0);
++  int sysctl_result = sysctl(mib, arraysize(mib), info, &info_size, NULL, 0);
+   DCHECK_EQ(sysctl_result, 0);
+   if (sysctl_result != 0) {
+     is_set = true;
+     being_debugged = false;
+-    return being_debugged;
++    goto out;
+   }
+ 
+   // This process is being debugged if the P_TRACED flag is set.
+   is_set = true;
+ #if defined(OS_FREEBSD)
+-  being_debugged = (info.ki_flag & P_TRACED) != 0;
++  being_debugged = (info->ki_flag & P_TRACED) != 0;
+ #elif defined(OS_BSD)
+-  being_debugged = (info.p_flag & P_TRACED) != 0;
++  being_debugged = (info->p_flag & P_TRACED) != 0;
+ #else
+-  being_debugged = (info.kp_proc.p_flag & P_TRACED) != 0;
++  being_debugged = (info->kp_proc.p_flag & P_TRACED) != 0;
+ #endif
++
++out:
++  free(info);
+   return being_debugged;
+ }
+ 

File www/chromium/patches/patch-base_process_util_openbsd_cc

+$OpenBSD: patch-base_process_util_openbsd_cc,v 1.9 2012/04/15 10:40:44 robert Exp $
+--- base/process_util_openbsd.cc.orig	Sat Apr 14 12:10:29 2012
++++ base/process_util_openbsd.cc	Sat Apr 14 16:55:59 2012
+@@ -30,39 +30,59 @@
+ namespace base {
+ 
+ ProcessId GetParentProcessId(ProcessHandle process) {
+-  struct kinfo_proc info;
++  struct kinfo_proc *info;
+   size_t length;
++  pid_t ppid;
+   int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, process,
+                 sizeof(struct kinfo_proc), 0 };
+ 
+   if (sysctl(mib, arraysize(mib), NULL, &length, NULL, 0) < 0)
+     return -1;
+ 
++  info = (struct kinfo_proc *)malloc(length);
++
+   mib[5] = (length / sizeof(struct kinfo_proc));
+ 
+-  if (sysctl(mib, arraysize(mib), &info, &length, NULL, 0) < 0)
+-    return -1;
++  if (sysctl(mib, arraysize(mib), info, &length, NULL, 0) < 0) {
++    ppid = -1;
++    goto out;
++  }
+ 
+-  return info.p_ppid;
++  ppid = info->p_ppid;
++
++out:
++  free(info);
++  return ppid;
+ }
+ 
+ FilePath GetProcessExecutablePath(ProcessHandle process) {
+-  struct kinfo_proc kp;
+-  size_t len;
++  struct kinfo_proc *info;
++  size_t length;
++  char *path = NULL;
+   int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, process,
+                 sizeof(struct kinfo_proc), 0 };
+ 
+-  if (sysctl(mib, arraysize(mib), NULL, &len, NULL, 0) == -1)
++  if (sysctl(mib, arraysize(mib), NULL, &length, NULL, 0) == -1)
+     return FilePath();
+-  mib[5] = (len / sizeof(struct kinfo_proc));
+-  if (sysctl(mib, arraysize(mib), &kp, &len, NULL, 0) < 0)
+-    return FilePath();
+-  if ((kp.p_flag & P_SYSTEM) != 0)
+-    return FilePath();
+-  if (strcmp(kp.p_comm, "chrome") == 0)
+-    return FilePath(kp.p_comm);
+ 
+-  return FilePath();
++  info = (struct kinfo_proc *)malloc(length);
++
++  mib[5] = (length / sizeof(struct kinfo_proc));
++
++  if (sysctl(mib, arraysize(mib), info, &length, NULL, 0) < 0)
++    goto out;
++
++  if ((info->p_flag & P_SYSTEM) != 0)
++    goto out;
++
++  if (strcmp(info->p_comm, "chrome") == 0) {
++    path = info->p_comm;
++    goto out;
++  }
++
++out:
++  free(info);
++  return FilePath(path);
+ }
+ 
+ ProcessIterator::ProcessIterator(const ProcessFilter* filter)
+@@ -194,20 +214,28 @@ ProcessMetrics* ProcessMetrics::CreateProcessMetrics(P
+ }
+ 
+ size_t ProcessMetrics::GetPagefileUsage() const {
+-  struct kinfo_proc info;
+-  size_t length;
++  struct kinfo_proc *info;
++  size_t length, pfu;
+   int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, process_,
+                 sizeof(struct kinfo_proc), 0 };
+ 
+   if (sysctl(mib, arraysize(mib), NULL, &length, NULL, 0) < 0)
+     return -1;
+ 
++  info = (struct kinfo_proc *)malloc(length);
++
+   mib[5] = (length / sizeof(struct kinfo_proc));
+ 
+-  if (sysctl(mib, arraysize(mib), &info, &length, NULL, 0) < 0)
+-    return -1;
++  if (sysctl(mib, arraysize(mib), info, &length, NULL, 0) < 0) {
++    pfu = -1;
++    goto out;
++  }
+ 
+-  return (info.p_vm_tsize + info.p_vm_dsize + info.p_vm_ssize);
++  pfu = (info->p_vm_tsize + info->p_vm_dsize + info->p_vm_ssize);
++
++out:
++  free(info);
++  return pfu;
+ }
+ 
+ size_t ProcessMetrics::GetPeakPagefileUsage() const {
+@@ -216,20 +244,28 @@ size_t ProcessMetrics::GetPeakPagefileUsage() const {
+ }
+ 
+ size_t ProcessMetrics::GetWorkingSetSize() const {
+-  struct kinfo_proc info;
+-  size_t length;
++  struct kinfo_proc *info;
++  size_t length, wss;
+   int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, process_,
+                 sizeof(struct kinfo_proc), 0 };
+ 
+   if (sysctl(mib, arraysize(mib), NULL, &length, NULL, 0) < 0)
+     return -1;
+ 
++  info = (struct kinfo_proc *)malloc(length);
++
+   mib[5] = (length / sizeof(struct kinfo_proc));
+ 
+-  if (sysctl(mib, arraysize(mib), &info, &length, NULL, 0) < 0)
+-    return -1;
++  if (sysctl(mib, arraysize(mib), info, &length, NULL, 0) < 0) {
++    wss = -1;
++    goto out;
++  }
+ 
+-  return info.p_vm_rssize * getpagesize();
++  wss = (info->p_vm_rssize * getpagesize());
++
++out:
++  free(info);
++  return wss;
+ }
+ 
+ size_t ProcessMetrics::GetPeakWorkingSetSize() const {
+@@ -270,20 +306,27 @@ bool ProcessMetrics::GetIOCounters(IoCounters* io_coun
+ }
+ 
+ static int GetProcessCPU(pid_t pid) {
+-  struct kinfo_proc info;
++  struct kinfo_proc *info;
+   size_t length;
++  int pctcpu = 0;
+   int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, pid,
+                 sizeof(struct kinfo_proc), 0 };
+ 
+   if (sysctl(mib, arraysize(mib), NULL, &length, NULL, 0) < 0)
+     return -1;
+ 
++  info = (struct kinfo_proc *)malloc(length);
++
+   mib[5] = (length / sizeof(struct kinfo_proc));
+ 
+-  if (sysctl(mib, arraysize(mib), &info, &length, NULL, 0) < 0)
+-    return 0;
++  if (sysctl(mib, arraysize(mib), info, &length, NULL, 0) < 0)
++    goto out;
+ 
+-  return info.p_pctcpu;
++  pctcpu = info->p_pctcpu;
++
++out:
++  free(info);
++  return pctcpu;
+ }
+ 
+ double ProcessMetrics::GetCPUUsage() {

File www/chromium/patches/patch-content_renderer_render_view_impl_cc

-$OpenBSD: patch-content_renderer_render_view_impl_cc,v 1.1 2012/04/03 13:59:35 robert Exp $
---- content/renderer/render_view_impl.cc.orig	Mon Apr  2 10:59:45 2012
-+++ content/renderer/render_view_impl.cc	Mon Apr  2 11:06:13 2012
-@@ -3088,6 +3088,7 @@ void RenderViewImpl::EnsureMediaStreamImpl() {
+$OpenBSD: patch-content_renderer_render_view_impl_cc,v 1.2 2012/04/15 10:40:44 robert Exp $
+--- content/renderer/render_view_impl.cc.orig	Mon Apr  9 21:01:24 2012
++++ content/renderer/render_view_impl.cc	Fri Apr 13 18:46:36 2012
+@@ -3096,6 +3096,7 @@ void RenderViewImpl::EnsureMediaStreamImpl() {
      p2p_socket_dispatcher_ = new content::P2PSocketDispatcher(this);
  #endif
  
    if (!media_stream_dispatcher_)
      media_stream_dispatcher_ = new MediaStreamDispatcher(this);
  
-@@ -3099,6 +3100,7 @@ void RenderViewImpl::EnsureMediaStreamImpl() {
+@@ -3107,6 +3108,7 @@ void RenderViewImpl::EnsureMediaStreamImpl() {
          RenderThreadImpl::current()->video_capture_impl_manager(),
          factory);
    }

File www/midori/CVS/Entries

 D/patches////
 D/pkg////
-/Makefile/1.46/Sat Mar 10 12:06:32 2012//
-/distinfo/1.27/Sat Mar 10 12:06:32 2012//
+/Makefile/1.47/Mon Apr 16 11:06:51 2012//
+/distinfo/1.28/Mon Apr 16 11:06:51 2012//

File www/midori/Makefile

-# $OpenBSD: Makefile,v 1.46 2012/03/10 10:25:27 landry Exp $
+# $OpenBSD: Makefile,v 1.47 2012/04/16 10:08:43 landry Exp $
 
 COMMENT =	lightweight web browser
 
-XFCE_VERSION =	0.4.4
+XFCE_VERSION =	0.4.5
 XFCE_GOODIE =	midori
 
 MAINTAINER =	Landry Breuil <landry@openbsd.org>
 WANTLIB += gtk-x11-2.0 javascriptcoregtk-1.0 m notify pango-1.0
 WANTLIB += pangocairo-1.0 pangoft2-1.0 pixman-1 png pthread pthread-stubs
 WANTLIB += soup-2.4 sqlite3 unique-1.0 webkitgtk-1.0 xcb xcb-render
-WANTLIB += xcb-shm xml2 z
+WANTLIB += xcb-shm xml2 z pcre
 
 .include <bsd.port.mk>

File www/midori/distinfo

-MD5 (midori-0.4.4.tar.bz2) = pleOv9I3wPIszkkRO5X3DA==
-RMD160 (midori-0.4.4.tar.bz2) = IN2fD51UBUNVPi3X3Mylkris70s=
-SHA1 (midori-0.4.4.tar.bz2) = 6tCbbOucrcTCJ2FJDL+ZFDRrfuA=
-SHA256 (midori-0.4.4.tar.bz2) = +t1D92wcn2oWSD5gqATlj7aBfGpZWxrN1ZvL3Xs1vKI=
-SIZE (midori-0.4.4.tar.bz2) = 939294
+MD5 (midori-0.4.5.tar.bz2) = FCiBl6HiJRt8CAPhRI2qDg==
+RMD160 (midori-0.4.5.tar.bz2) = M7cmmATQLyf0gqkche2ARBHjkuA=
+SHA1 (midori-0.4.5.tar.bz2) = Fz3Q6+HLjjUlwZBQZduPjC1f7pc=
+SHA256 (midori-0.4.5.tar.bz2) = e1fPPrtW7vWGNR8q6fceyWg67f8LeaBxtwuBHZh2/4Q=
+SIZE (midori-0.4.5.tar.bz2) = 950950

File www/midori/patches/CVS/Entries

-/patch-midori_main_c/1.12/Sat Mar 10 12:06:32 2012//
-/patch-wscript/1.19/Sat Mar 10 12:06:32 2012//
+/patch-wscript/1.20/Mon Apr 16 11:06:51 2012//
 D

File www/midori/patches/patch-midori_main_c

-$OpenBSD: patch-midori_main_c,v 1.12 2012/03/10 10:25:27 landry Exp $
-
-use path to our root ca list for ssl cert validation
-
---- midori/main.c.orig	Thu Mar  8 23:34:45 2012
-+++ midori/main.c	Fri Mar  9 09:38:12 2012
-@@ -1005,11 +1005,7 @@ midori_load_soup_session (gpointer settings)
-     #elif defined (HAVE_LIBSOUP_2_29_91)
-     const gchar* certificate_files[] =
-     {
--        "/etc/pki/tls/certs/ca-bundle.crt",
--        "/etc/ssl/certs/ca-certificates.crt",
--        "/etc/ssl/certs/ca-bundle.crt",
--        "/usr/local/share/certs/ca-root-nss.crt", /* FreeBSD */
--        "/var/lib/ca-certificates/ca-bundle.pem", /* openSUSE */
-+        "/etc/ssl/cert.pem",
-         NULL
-     };
-     guint i;

File www/midori/patches/patch-wscript

-$OpenBSD: patch-wscript,v 1.19 2012/03/10 10:25:27 landry Exp $
+$OpenBSD: patch-wscript,v 1.20 2012/04/16 10:08:43 landry Exp $
 
 Fix paths to config files.
 
---- wscript.orig	Thu Mar  8 23:34:45 2012
-+++ wscript	Fri Mar  9 09:38:12 2012
+--- wscript.orig	Sat Apr 14 21:17:35 2012
++++ wscript	Sun Apr 15 11:43:17 2012
 @@ -73,7 +73,7 @@ def rc_file(self, node):
      self.compiled_tasks.append (rctask)
  rc_file = extension ('.rc')(rc_file)
  
  def configure (conf):
      def option_checkfatal (option, desc):
-@@ -441,7 +441,7 @@ def build (bld):
+@@ -459,7 +459,7 @@ def build (bld):
              'AUTHORS COPYING ChangeLog EXPAT README data/faq.html data/faq.css')
  
      # Install default configuration
  
      if bld.env['INTLTOOL']:
          obj = bld.new_task_gen ('intltool_po')
-@@ -513,7 +513,7 @@ def build (bld):
+@@ -531,7 +531,7 @@ def build (bld):
              for extension in extensions:
                  source = 'data/extensions/' + extension +  '/config'
                  if os.path.exists (source):

File www/midori/pkg/CVS/Entries

 /DESCR/1.1.1.1/Mon Jan  2 23:48:52 2012//
-/PLIST/1.27/Sat Mar 10 12:06:32 2012//
+/PLIST/1.28/Mon Apr 16 11:06:51 2012//
 D

File www/midori/pkg/PLIST

-@comment $OpenBSD: PLIST,v 1.27 2012/03/10 10:25:27 landry Exp $
+@comment $OpenBSD: PLIST,v 1.28 2012/04/16 10:08:43 landry Exp $
 @bin bin/midori
 include/midori-0.4/
 include/midori-0.4/extensions/
+include/midori-0.4/extensions/external-download-manager.h
 include/midori-0.4/extensions/history-list.h
 lib/midori/
 lib/midori/libadblock.so
 lib/midori/libcolorful-tabs.so
 lib/midori/libcookie-manager.so
 lib/midori/libcopy-tabs.so
+lib/midori/libexternal-download-manager.so
 lib/midori/libfeed-panel.so
 lib/midori/libformhistory.so
 lib/midori/libhistory-list.so
 share/midori/res/close.png
 share/midori/res/error.html
 share/midori/res/logo-shade.png
-share/midori/res/speeddial-head-0.4.4.html
+share/midori/res/speeddial-head-0.4.5.html
+share/vala/vapi/external-download-manager.deps
+share/vala/vapi/external-download-manager.vapi
 share/vala/vapi/history-list.deps
 share/vala/vapi/history-list.vapi
 @exec %D/bin/gtk-update-icon-cache -q %D/share/icons/hicolor 2>/dev/null || true

File x11/gnome/gnote/CVS/Entries

 D/patches////
 D/pkg////
-/Makefile/1.23/Tue Jan  3 00:50:13 2012//
-/distinfo/1.5/Tue Jan  3 00:50:13 2012//
+/Makefile/1.24/Mon Apr 16 11:07:16 2012//
+/distinfo/1.6/Mon Apr 16 11:07:16 2012//