Update for newer Boost.

From Amit Kulkarni.

ok sthen@

audio/ardour/Makefile

@@ -1,12 +1,14 @@
-# $OpenBSD: Makefile,v 1.6 2013/01/11 13:44:24 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.7 2013/03/08 01:25:44 brad Exp $
 
 ONLY_FOR_ARCHS =	amd64 i386 powerpc
 SHARED_ONLY =		Yes
+
 COMMENT =		digital audio workstation
+
 DISTNAME =		ardour-2.8.14
 CATEGORIES =		audio
 HOMEPAGE =		http://ardour.org
-REVISION =		2
+REVISION =		3
 
 # GPLv2+
 PERMIT_PACKAGE_CDROM =	Yes
@@ -16,15 +18,15 @@ PERMIT_DISTFILES_FTP =	Yes
 
 WANTLIB = GL X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \
 	Xi Xinerama Xrandr Xrender Xxf86vm art_lgpl_2 atk-1.0 \
-	atkmm-1.6 aubio c cairo cairomm-1.0 curl drm execinfo \
+	atkmm-1.6 aubio boost_system-mt c cairo cairomm-1.0 curl drm \
-	expat fftw3 fftw3f fontconfig freetype gailutil gdk-x11-2.0 \
+	execinfo expat fftw3 fftw3f fontconfig freetype gailutil \
-	gdk_pixbuf-2.0 gdkmm-2.4 gio-2.0 giomm-2.4 glib-2.0 \
+	gdk-x11-2.0 gdk_pixbuf-2.0 gdkmm-2.4 gio-2.0 giomm-2.4 \
-	glibmm-2.4 gmodule-2.0 gnomecanvas-2 gnomecanvasmm-2.6 \
+	glib-2.0 glibmm-2.4 gmodule-2.0 gnomecanvas-2 gnomecanvasmm-2.6 \
-	gobject-2.0 gthread-2.0 gtk-x11-2.0 gtkmm-2.4 jack \
+	gobject-2.0 gthread-2.0 gtk-x11-2.0 gtkmm-2.4 harfbuzz jack \
 	lo lrdf m pango-1.0 pangocairo-1.0 pangoft2-1.0 pangomm-1.4 \
 	pcre pixman-1 png pthread pthread-stubs samplerate \
 	sigc-2.0 sndfile sndio stdc++ xcb xcb-render xcb-shm \
-	xml2 xslt z harfbuzz
+	xml2 xslt z
 
 # Use mirrors as official site has click-through donation-request download.
 MASTER_SITES =		http://stsp.name/openbsd/distfiles/ \
@@ -51,13 +53,13 @@ MODSCONS_ENV=	CC="${CC}" \
 		FREEDESKTOP=1 \
 		SYSLIBS=1
 
-BUILD_DEPENDS = 	devel/boost \
+BUILD_DEPENDS =		${RUN_DEPENDS}
-			${RUN_DEPENDS}
 RUN_DEPENDS = 		devel/desktop-file-utils \
 			x11/gtk+2,-guic \
 			misc/shared-mime-info
 LIB_DEPENDS =		audio/aubio \
 			audio/liblo \
+			devel/boost \
 			devel/libexecinfo \
 			math/fftw3 \
 			textproc/liblrdf \

audio/ardour/patches/patch-gtk2_ardour_SConscript

@@ -1,7 +1,16 @@
-$OpenBSD: patch-gtk2_ardour_SConscript,v 1.1.1.1 2012/08/17 15:33:32 stsp Exp $
+$OpenBSD: patch-gtk2_ardour_SConscript,v 1.2 2013/03/08 01:25:44 brad Exp $
---- gtk2_ardour/SConscript.orig	Thu Apr 19 20:33:57 2012
+--- gtk2_ardour/SConscript.orig	Thu Apr 19 14:33:57 2012
-+++ gtk2_ardour/SConscript	Sat Aug 11 15:12:45 2012
++++ gtk2_ardour/SConscript	Sat Jan 26 01:17:52 2013
-@@ -413,7 +413,7 @@ for style in ['', 'BOLD', 'ITALIC']:
+@@ -27,6 +27,8 @@ gtkardour.Append(POTFILE=domain + '.pot')
+ if gtkardour['IS_OSX']:
+ 	gtkardour.Append (LINKFLAGS="-Xlinker -headerpad -Xlinker 2048")
+ 
++env.Append(LINKFLAGS = "-lboost_system-mt")
++
+ gtkardour.Merge ([
+     libraries['ardour'],
+     libraries['ardour_cp'],
+@@ -413,7 +415,7 @@ for style in ['', 'BOLD', 'ITALIC']:
  if env['GTKOSX']:
  	ardour_menus = env.Command ('ardour.menus', 'ardour.menus.in', "cpp -E -P -DGTKOSX -DTOP_MENUBAR ardour.menus.in ardour.menus", chdir=1)
  else:
@@ -10,7 +19,7 @@ $OpenBSD: patch-gtk2_ardour_SConscript,v 1.1.1.1 2012/08/17 15:33:32 stsp Exp $
  
  ardour_dark_theme = env.SubstInFile ('ardour2_ui_dark.rc', 'ardour2_ui_dark.rc.in', SUBST_DICT = my_font_dict)
  ardour_light_theme = env.SubstInFile ('ardour2_ui_light.rc', 'ardour2_ui_light.rc.in', SUBST_DICT = my_font_dict)
-@@ -529,14 +529,9 @@ if env['FREEDESKTOP']:
+@@ -529,14 +531,9 @@ if env['FREEDESKTOP']:
  	env.Alias('install', env.InstallAs(os.path.join(desktop_icon_install_prefix, '22x22', 'mimetypes', 'application-x-ardour2.png'), 'icons/application-x-ardour_22px.png'))
  	env.Alias('install', env.InstallAs(os.path.join(desktop_icon_install_prefix, '32x32', 'mimetypes', 'application-x-ardour2.png'), 'icons/application-x-ardour_32px.png'))
  	env.Alias('install', env.InstallAs(os.path.join(desktop_icon_install_prefix, '48x48', 'mimetypes', 'application-x-ardour2.png'), 'icons/application-x-ardour_48px.png'))

games/frogatto/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2011/08/26 11:30:32 jasper Exp $
+# $OpenBSD: Makefile,v 1.5 2013/03/08 01:31:25 brad Exp $
 
 ONLY_FOR_ARCHS=	${GCC4_ARCHS}
 
@@ -6,6 +6,7 @@ COMMENT=	2D adventure platformer game
 
 DISTNAME=	frogatto-1.1.1
 EXTRACT_SUFX=	.tar.bz2
+REVISION=	0
 
 CATEGORIES=	games
 

games/frogatto/distinfo

@@ -1,5 +1,2 @@
-MD5 (frogatto-1.1.1.tar.bz2) = v1ou5MMlSkJHZolf8lB1iw==
-RMD160 (frogatto-1.1.1.tar.bz2) = 3lTPSW57emFhTQBE6XjtWn1tZpI=
-SHA1 (frogatto-1.1.1.tar.bz2) = vFV2uWhjVioFIEU7Wts/b2vnack=
 SHA256 (frogatto-1.1.1.tar.bz2) = 0kBNjYPV1eK0KyX2MhE9X7/CLS73LEpE7HgzJX5VBnA=
 SIZE (frogatto-1.1.1.tar.bz2) = 151088361

games/frogatto/patches/patch-src_server_cpp

@@ -0,0 +1,19 @@
+$OpenBSD: patch-src_server_cpp,v 1.1 2013/03/08 01:31:25 brad Exp $
+
+replacement function call from upstream git. double-checked that this function disappeared in Boost 1.47.0
+
+--- src/server.cpp.orig	Thu Nov 22 14:51:25 2012
++++ src/server.cpp	Thu Nov 22 15:05:14 2012
+@@ -37,7 +37,11 @@ class server (public)
+ private:
+ 	void start_accept()
+ 	{
+-		socket_ptr socket(new tcp::socket(acceptor_.io_service()));
++		#if (BOOST_VERSION) <= 104600
++			socket_ptr socket(new tcp::socket(acceptor_.io_service()));
++		#else
++			socket_ptr socket(new tcp::socket(acceptor_.get_io_service()));
++		#endif
+ 		acceptor_.async_accept(*socket, boost::bind(&server::handle_accept, this, socket, boost::asio::placeholders::error));
+ 	}
+ 

graphics/enblend-enfuse/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.18 2012/12/21 17:55:57 landry Exp $
+# $OpenBSD: Makefile,v 1.19 2013/03/08 01:30:37 brad Exp $
 
 VMEM_WARNING =	Yes
 ONLY_FOR_ARCHS = ${GCC4_ARCHS}
@@ -14,7 +14,7 @@ COMMENT =	blend seams in panoramic image mosaics
 DISTNAME =	enblend-enfuse-4.0
 PKGNAME =	${DISTNAME:L}
 WRKDIST =	${WRKDIR}/enblend-enfuse-4.0-753b534c819d
-REVISION =	2
+REVISION =	3
 CATEGORIES =	graphics
 
 HOMEPAGE =	http://enblend.sourceforge.net/
@@ -46,7 +46,8 @@ LIB_DEPENDS =	devel/boost \
 		graphics/png \
 		graphics/tiff
 
-CONFIGURE_STYLE = gnu
+CONFIGURE_STYLE = autoconf gnu
+AUTOCONF_VERSION = 2.61
 MODGNU_CONFIG_GUESS_DIRS = ${WRKSRC}
 USE_GMAKE = Yes
 USE_GROFF =	Yes

graphics/enblend-enfuse/patches/patch-configure_in

@@ -0,0 +1,33 @@
+$OpenBSD: patch-configure_in,v 1.3 2013/03/08 01:30:37 brad Exp $
+
+adapt patch from http://enblend.hg.sourceforge.net/hgweb/enblend/enblend/diff/57db56afb9a9/configure.in
+
+--- configure.in.orig	Sat Nov 24 14:57:20 2012
++++ configure.in	Sat Nov 24 15:01:33 2012
+@@ -196,8 +196,26 @@ AC_CHECK_HEADER(boost/random/mersenne_twister.hpp, [],
+                 AC_MSG_ERROR([Boost "mersenne_twister" header file is required to compile Enblend.]))
+ AC_CHECK_HEADER(boost/scoped_ptr.hpp, [],
+                 AC_MSG_ERROR([Boost "scoped_ptr" header file is required to compile Enblend.]))
++AC_CHECK_HEADER(boost/system/error_code.hpp, [],
++                AC_MSG_ERROR([Boost "error code" header file is required to compile Enblend.]))
+ AC_CHECK_HEADER(boost/static_assert.hpp, [],
+                 AC_MSG_ERROR([Boost "static_assert" header file is required to compile Enblend.]))
++
++
++LIBS="-lboost_system $LIBS"
++AC_MSG_CHECKING([for new Boost system library])
++AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include "boost/system/error_code.hpp"]],
++                                [[boost::system::generic_category();
++                                  boost::system::system_category()]])],
++               [AC_MSG_RESULT(yes)],
++               [AC_MSG_RESULT(no)
++                AC_MSG_CHECKING([for old Boost system library])
++                AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include "boost/system/error_code.hpp"]],
++                                [[boost::system::get_generic_category();
++                                  boost::system::get_system_category()]])],
++                               [AC_MSG_RESULT(yes)],
++                               [AC_MSG_RESULT(no)
++                                AC_MSG_ERROR([Boost "system" library is required to compile Enblend.])])])
+ 
+ AC_ARG_WITH([boost-filesystem],
+             [AS_HELP_STRING([--with-boost-filesystem],

multimedia/mkvtoolnix/Makefile

@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.29 2013/02/09 14:49:51 sthen Exp $
+# $OpenBSD: Makefile,v 1.30 2013/03/08 01:32:25 brad Exp $
 
 COMMENT =	create, alter and inspect Matroska files
 
 DISTNAME =	mkvtoolnix-4.0.0
 CATEGORIES =	multimedia x11
-REVISION =	1
+REVISION =	2
 
 HOMEPAGE =	http://www.bunkus.org/videotools/mkvtoolnix/
 

multimedia/mkvtoolnix/distinfo

@@ -1,5 +1,2 @@
-MD5 (mkvtoolnix-4.0.0.tar.bz2) = Q06yS5xJqZrDhr0sTFJVOA==
-RMD160 (mkvtoolnix-4.0.0.tar.bz2) = RE2KyocaOagm9uBLqFF54lltmqc=
-SHA1 (mkvtoolnix-4.0.0.tar.bz2) = 7p8vjiXoxrNJBcmBpoZpEhChtcw=
 SHA256 (mkvtoolnix-4.0.0.tar.bz2) = uB9jf+k54uCVO8L6sBxy+ZpP5VSkodT7Ct3n06UUy/s=
 SIZE (mkvtoolnix-4.0.0.tar.bz2) = 1605839

multimedia/mkvtoolnix/patches/patch-src_common_mm_multi_file_io_cpp

@@ -0,0 +1,29 @@
+$OpenBSD: patch-src_common_mm_multi_file_io_cpp,v 1.1 2013/03/08 01:32:25 brad Exp $
+
+adapt patch from https://github.com/mbunkus/mkvtoolnix/blob/master/src/common/mm_multi_file_io.cpp
+
+--- src/common/mm_multi_file_io.cpp.orig	Thu Nov 22 14:26:26 2012
++++ src/common/mm_multi_file_io.cpp	Thu Nov 22 14:31:59 2012
+@@ -155,14 +155,17 @@ mm_multi_file_io_c::create_verbose_identification_info
+ 
+ void
+ mm_multi_file_io_c::display_other_file_info() {
+-  std::vector<std::string> file_names;
++  std::stringstream out;
+ 
+   foreach(const mm_multi_file_io_c::file_t &file, m_files)
+-    if (file.m_file_name != m_files.front().m_file_name)
+-      file_names.push_back(file.m_file_name.leaf());
++    if (file.m_file_name != m_files.front().m_file_name) {
++      if (!out.str().empty())
++        out << ", ";
++      out << file.m_file_name.filename();
++    }
+ 
+-  if (!file_names.empty())
+-    mxinfo(boost::format(Y("'%1%': Processing the following files as well: %2%\n")) % m_display_file_name % join(", ", file_names));
++  if (!out.str().empty())
++    mxinfo(boost::format(Y("'%1%': Processing the following files as well: %2%\n")) % m_display_file_name % out.str());
+ }
+ 
+ struct path_sorter_t {