Jim Razmus II avatar Jim Razmus II committed e911a25

cvs up

Comments (0)

Files changed (164)

astro/CVS/Entries

 D/xphoon////
 D/xworld////
 D/gcal////
-/Makefile/1.26/Mon Jan  2 23:34:34 2012//
+/Makefile/1.27/Sat Aug 18 11:04:27 2012//
-# $OpenBSD: Makefile,v 1.26 2010/02/01 17:00:12 espie Exp $
-# $FreeBSD: Makefile,v 1.4 1997/06/03 09:14:50 asami Exp $
+# $OpenBSD: Makefile,v 1.27 2012/08/18 07:25:25 ajacoutot Exp $
 
      SUBDIR =
      SUBDIR += celestia

audio/CVS/Entries

 D/opus////
 D/opus-tools////
 D/deadbeef////
-/Makefile/1.285/Fri Aug 17 11:04:07 2012//
 D/aubio////
 D/liblo////
+/Makefile/1.287/Sat Aug 18 11:04:32 2012//
+D/ardour////
-# $OpenBSD: Makefile,v 1.285 2012/08/16 15:09:29 stsp Exp $
-# $FreeBSD: Makefile,v 1.40 1997/11/16 22:49:20 fenner Exp $
+# $OpenBSD: Makefile,v 1.287 2012/08/18 07:25:25 ajacoutot Exp $
 
      SUBDIR =
      SUBDIR += abcde
      SUBDIR += alac_decoder
      SUBDIR += amarok
      SUBDIR += aqualung
+     SUBDIR += ardour
      SUBDIR += ascd
      SUBDIR += aubio
      SUBDIR += aucatctl

audio/ardour/CVS/Entries

+/Makefile/1.2/Sat Aug 18 08:50:19 2012//
+/distinfo/1.1.1.1/Fri Aug 17 15:33:32 2012//
+D/files////
+D/patches////
+D/pkg////

audio/ardour/CVS/Repository

+ports/audio/ardour

audio/ardour/CVS/Root

+/home/jtr2/openbsd/mirror

audio/ardour/Makefile

+# $OpenBSD: Makefile,v 1.2 2012/08/18 08:50:19 ajacoutot Exp $
+
+SHARED_ONLY =		Yes
+COMMENT =		digital audio workstation
+DISTNAME =		ardour-2.8.14
+CATEGORIES =		audio
+HOMEPAGE =		http://ardour.org
+REVISION =		0
+
+# GPLv2+
+PERMIT_PACKAGE_CDROM =	Yes
+PERMIT_PACKAGE_FTP =	Yes
+PERMIT_DISTFILES_CDROM =Yes
+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 \
+	expat fftw3 fftw3f fontconfig freetype gailutil gdk-x11-2.0 \
+	gdk_pixbuf-2.0 gdkmm-2.4 gio-2.0 giomm-2.4 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 \
+	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
+
+# Use mirrors as official site has click-through donation-request download.
+MASTER_SITES =		http://stsp.name/openbsd/distfiles/ \
+			http://pkgs.fedoraproject.org/repo/pkgs/ardour/ardour-2.8.14.tar.bz2/c79219ba10735d0b061d53a84ae611a4/
+EXTRACT_SUFX =		.tar.bz2
+
+MODULES =		devel/gettext \
+			devel/scons
+
+VMEM_WARNING =	Yes
+NO_REGRESS=	Yes
+
+MODSCONS_ENV=	CC="${CC}" \
+		CXX="${CXX}" \
+		CCFLAGS="${CFLAGS}" \
+		CXXFLAGS="${CXXFLAGS}" \
+		LINKFLAGS="${LDFLAGS}" \
+		CPPPATH="${LOCALBASE}/include ${X11BASE}/include" \
+		LIBPATH="${LOCALBASE}/lib ${X11BASE}/lib" \
+		PREFIX="${TRUEPREFIX}" \
+		debug=0 \
+		DIST_LIBDIR=lib \
+		LIBLO=1 \
+		FREEDESKTOP=1 \
+		SYSLIBS=1
+
+BUILD_DEPENDS = 	devel/boost
+RUN_DEPENDS = 		devel/desktop-file-utils \
+			x11/gtk+2,-guic \
+			misc/shared-mime-info
+LIB_DEPENDS =		audio/aubio \
+			audio/liblo \
+			devel/libexecinfo \
+			math/fftw3 \
+			textproc/liblrdf \
+			x11/gnome/libgnomecanvasmm
+
+post-extract:
+	cp ${FILESDIR}/sndio_midiport.h ${WRKSRC}/libs/midi++2/midi++/
+	cp ${FILESDIR}/sndio_midiport.cc ${WRKSRC}/libs/midi++2/
+
+post-install:
+	mv ${WRKINST}/etc/ardour2 ${PREFIX}/share/examples/
+
+.include <bsd.port.mk>

audio/ardour/distinfo

+SHA256 (ardour-2.8.14.tar.bz2) = 4H5IOhI1TADYIdr77F9dJpAGK3WCBdrOq3I78emmM/4=
+SIZE (ardour-2.8.14.tar.bz2) = 2169985

audio/ardour/files/CVS/Entries

+/sndio_midiport.cc/1.1.1.1/Fri Aug 17 15:33:32 2012//
+/sndio_midiport.h/1.1.1.1/Fri Aug 17 15:33:32 2012//
+D

audio/ardour/files/CVS/Repository

+ports/audio/ardour/files

audio/ardour/files/CVS/Root

+/home/jtr2/openbsd/mirror

audio/ardour/files/sndio_midiport.cc

+/*
+ * Copyright (c) 2012 Stefan Sperling <stsp@openbsd.org>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <cstdlib>
+#include <poll.h>
+
+#include <pbd/xml++.h>
+
+#include <midi++/sndio_midiport.h>
+#include <midi++/types.h>
+
+#include "i18n.h"
+
+using namespace std;
+using namespace MIDI;
+
+SndioMidi_MidiPort::SndioMidi_MidiPort(const XMLNode& node) : Port(node)
+{
+	const char *dev;
+
+	Descriptor desc(node);
+
+	if (strcmp(desc.device.c_str(), "ardour") == 0)
+		dev = NULL; /* default */
+	else
+		dev = desc.device.c_str();
+	hdl = mio_open(dev, MIO_IN | MIO_OUT, 1);
+	if (hdl) {
+		pfd = new struct pollfd[mio_nfds(hdl)];
+		_ok = true;
+	}
+}
+
+SndioMidi_MidiPort::~SndioMidi_MidiPort()
+{
+	if (hdl) {
+		mio_close(hdl);
+		delete[] pfd;
+	}
+}
+
+int SndioMidi_MidiPort::poll(int event) const
+{
+	int n = mio_pollfd(hdl, pfd, event);
+	if (n == 0)
+		return -1;
+
+	if (::poll(pfd, n, 100) < 0)
+		return -1;
+
+	int revents = mio_revents(hdl, pfd);
+	if (revents & event) {
+		for (unsigned int i = 0; i < sizeof(pfd)/sizeof(pfd[0]); i++) {
+			if (pfd[i].revents & event)
+				return pfd[i].fd;
+		}
+	}
+
+	return -1;
+}
+
+int SndioMidi_MidiPort::read(byte *buf, size_t max)	
+{
+	if (mio_eof(hdl)) {
+		cerr << "sndio MIDI read error" << endl;
+		return 0;
+	}
+
+	if (input_parser) {
+		size_t n = mio_read(hdl, buf, max);
+		if (n == 0)
+			return 0;
+		input_parser->raw_preparse(*input_parser, buf, n);
+		for (unsigned int i = 0; i < n; i++)
+			input_parser->scanner(buf[i]);
+		input_parser->raw_postparse(*input_parser, buf, n);
+		return (int)n;
+	}
+
+	return 0;
+}
+
+int SndioMidi_MidiPort::write(byte *buf, size_t len)
+{
+	if (mio_eof(hdl)) {
+		cerr << "sndio MIDI write error" << endl;
+		return 0;
+	}
+
+	return (int)mio_write(hdl, buf, len);
+}
+
+int 
+SndioMidi_MidiPort::selectable() const
+{
+	return poll(POLLIN|POLLOUT);
+}
+
+int
+SndioMidi_MidiPort::discover(vector<PortSet>& ports)
+{
+	int ret = 0;
+
+	/* Try to find usable sndio midi ports.
+	 * Users can add additional ports manually. */
+	for (int n = 0; n < 8; n++) {
+		std::string dev_name = "rmidi/" + n;
+		struct mio_hdl *hdl;
+		
+		hdl = mio_open(dev_name.c_str(), MIO_IN | MIO_OUT, 1);
+		if (hdl) {
+			mio_close(hdl);
+			XMLNode node(X_("MIDI-port"));
+			node.add_property("tag", "ardour");
+			node.add_property("device", dev_name);
+			node.add_property("type", "sndio");
+			node.add_property("mode", "duplex");
+			ports.back().ports.push_back(node);
+			ret = 1;
+		}
+	}
+	return ret;
+}

audio/ardour/files/sndio_midiport.h

+/*
+ * Copyright (c) 2012 Stefan Sperling <stsp@openbsd.org>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifndef __sndio_midiport_h__
+#define __sndio_midiport_h__
+
+#include <list>
+#include <string>
+#include <vector>
+
+#include <midi++/port.h>
+
+#include <sndio.h>
+
+namespace MIDI {
+
+    class SndioMidi_MidiPort:public Port {
+      public:
+	SndioMidi_MidiPort(const XMLNode& node);
+	virtual ~ SndioMidi_MidiPort();
+
+	virtual int selectable() const;
+
+	static int discover(std::vector<PortSet>&);
+	static std::string typestring;
+
+      protected:
+	/* Direct I/O */
+
+	int write(byte * msg, size_t msglen);
+	int read(byte * buf, size_t max);
+
+	std::string get_typestring() const {
+		return typestring;
+	}
+
+      private:
+	struct mio_hdl *hdl;
+	int poll(int event) const;
+	struct pollfd *pfd;
+    };
+
+} // namespace MIDI
+
+#endif	// __sndio_midiport_h__

audio/ardour/patches/CVS/Entries

+/patch-SConstruct/1.1.1.1/Fri Aug 17 15:33:32 2012//
+/patch-gtk2_ardour_SConscript/1.1.1.1/Fri Aug 17 15:33:32 2012//
+/patch-gtk2_ardour_ardour_sh_in/1.1.1.1/Fri Aug 17 15:33:32 2012//
+/patch-gtk2_ardour_ardour_ui_cc/1.1.1.1/Fri Aug 17 15:33:32 2012//
+/patch-gtk2_ardour_engine_dialog_cc/1.1.1.1/Fri Aug 17 15:33:32 2012//
+/patch-gtk2_ardour_engine_dialog_h/1.1.1.1/Fri Aug 17 15:33:32 2012//
+/patch-gtk2_ardour_new_session_dialog_cc/1.1.1.1/Fri Aug 17 15:33:32 2012//
+/patch-libs_ardour_SConscript/1.1.1.1/Fri Aug 17 15:33:32 2012//
+/patch-libs_ardour_source_cc/1.1.1.1/Fri Aug 17 15:33:32 2012//
+/patch-libs_midi++2_SConscript/1.1.1.1/Fri Aug 17 15:33:32 2012//
+/patch-libs_midi++2_midi++_port_h/1.1.1.1/Fri Aug 17 15:33:32 2012//
+/patch-libs_midi++2_midifactory_cc/1.1.1.1/Fri Aug 17 15:33:32 2012//
+/patch-libs_midi++2_midiport_cc/1.1.1.1/Fri Aug 17 15:33:32 2012//
+/patch-libs_pbd_SConscript/1.1.1.1/Fri Aug 17 15:33:32 2012//
+D

audio/ardour/patches/CVS/Repository

+ports/audio/ardour/patches

audio/ardour/patches/CVS/Root

+/home/jtr2/openbsd/mirror

audio/ardour/patches/patch-SConstruct

+$OpenBSD: patch-SConstruct,v 1.1.1.1 2012/08/17 15:33:32 stsp Exp $
+--- SConstruct.orig	Fri Jul 20 17:25:16 2012
++++ SConstruct	Fri Aug 17 15:23:17 2012
+@@ -441,7 +441,6 @@ deps = \
+ 	'gtk+-2.0'             : '2.8.1',
+ 	'libxml-2.0'           : '2.6.0',
+ 	'samplerate'           : '0.1.0',
+-	'raptor2'              : '2.0.0',
+ 	'lrdf'                 : '0.4.0',
+ 	'jack'                 : '0.120.0',
+ 	'libgnomecanvas-2.0'   : '2.0',
+@@ -588,9 +587,6 @@ libraries['lrdf'].ParseConfig('pkg-config --cflags --l
+ libraries['liblo'] = LibraryInfo()
+ libraries['liblo'].ParseConfig('pkg-config --cflags --libs liblo')
+ 
+-libraries['raptor'] = LibraryInfo()
+-libraries['raptor'].ParseConfig('pkg-config --cflags --libs raptor2')
+-
+ libraries['sndfile'] = LibraryInfo()
+ libraries['sndfile'].ParseConfig ('pkg-config --cflags --libs sndfile')
+ 
+@@ -629,6 +625,9 @@ libraries['midi++2'] = LibraryInfo (LIBS='midi++', LIB
+ libraries['pbd']    = LibraryInfo (LIBS='pbd', LIBPATH='#libs/pbd', CPPPATH='#libs/pbd')
+ libraries['gtkmm2ext'] = LibraryInfo (LIBS='gtkmm2ext', LIBPATH='#libs/gtkmm2ext', CPPPATH='#libs/gtkmm2ext')
+ 
++libraries['execinfo'] = LibraryInfo (LIBS='execinfo')
++conf = Configure(libraries['execinfo'])
++conf.Finish()
+ 
+ # SCons should really do this for us
+ 
+@@ -678,6 +677,9 @@ if env['DIST_TARGET'] == 'auto':
+         else:
+             env['DIST_TARGET'] = 'leopard'
+     else:
++        if re.search("openbsd", config[config_kernel]):
++	    if config[config_cpu] == 'amd64':
++	        config[config_cpu] = 'x86_64'
+         if re.search ("x86_64", config[config_cpu]) != None:
+             env['DIST_TARGET'] = 'x86_64'
+         elif re.search("i[0-5]86", config[config_cpu]) != None:
+@@ -698,6 +700,7 @@ if env['DIST_TARGET'] != 'tiger' and env['DIST_TARGET'
+ 	env['AUSTATE'] = 0
+ 	env['WITH_CARBON'] = 0
+ 
++build_host_supports_sse = 0
+ if config[config_cpu] == 'powerpc' and env['DIST_TARGET'] != 'none':
+     # Apple/PowerPC optimization options
+     #
+@@ -929,6 +932,7 @@ libraries['vamphost'] = LibraryInfo (LIBS='vamphostsdk
+ 
+ env['RUBBERBAND'] = False
+ 
++env.Merge([libraries['fftw3f']])
+ conf = Configure (env)
+ 
+ if conf.CheckHeader ('fftw3.h'):
+@@ -1061,6 +1065,11 @@ elif conf.CheckCHeader('/System/Library/Frameworks/Cor
+     env['SYSMIDI'] = 'CoreMIDI'
+     subst_dict['%MIDITAG%'] = "ardour"
+     subst_dict['%MIDITYPE%'] = "coremidi"
++elif conf.CheckHeader("sndio.h"):
++    libraries['sysmidi'] = LibraryInfo (LIBS='sndio')
++    env['SYSMIDI'] = 'SndioMIDI'
++    subst_dict['%MIDITAG%'] = "ardour"
++    subst_dict['%MIDITYPE%'] = "sndio"
+ else:
+     print "It appears you don't have the required MIDI libraries installed. For Linux this means you are missing the development package for ALSA libraries."
+     sys.exit (1)
+@@ -1283,11 +1292,7 @@ subst_dict['%INSTALL_PREFIX%'] = install_prefix;
+ subst_dict['%FINAL_PREFIX%'] = final_prefix;
+ subst_dict['%PREFIX%'] = final_prefix;
+ 
+-if env['PREFIX'] == '/usr':
+-    final_config_prefix = '/etc'
+-else:
+-    final_config_prefix = env['PREFIX'] + '/etc'
+-
++final_config_prefix = '/etc'
+ config_prefix = '$DESTDIR' + final_config_prefix
+ 
+ #

audio/ardour/patches/patch-gtk2_ardour_SConscript

+$OpenBSD: patch-gtk2_ardour_SConscript,v 1.1.1.1 2012/08/17 15:33:32 stsp Exp $
+--- gtk2_ardour/SConscript.orig	Thu Apr 19 20:33:57 2012
++++ gtk2_ardour/SConscript	Sat Aug 11 15:12:45 2012
+@@ -413,7 +413,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:
+-	ardour_menus = env.Command ('ardour.menus', 'ardour.menus.in', "cpp -E -P ardour.menus.in ardour.menus", chdir=1)
++	ardour_menus = env.Command ('ardour.menus', 'ardour.menus.in', "cpp -E -P ardour.menus.in > ardour.menus", chdir=1)
+ 
+ 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']:
+ 	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'))
+-	env.Alias('install', env.Command (os.path.join(install_prefix, 'share', 'mime'), [], 'update-mime-database $TARGET'))
+-	# Update the icon cache #
+-	env.Alias('install', env.Command (desktop_icon_install_prefix, [], 'touch --no-create $TARGET'))
+-	env.Alias('install', env.Command (desktop_icon_install_prefix, [], 'gtk-update-icon-cache $TARGET'))
+ 	# Make the ardour2.desktop file and install it #
+ 	env.Alias('install', env.Command ('ardour2.desktop', 'ardour2.desktop.in', 'cat $SOURCES  > $TARGET'))
+ 	env.Alias('install', env.Install(os.path.join(install_prefix, 'share', 'applications'), 'ardour2.desktop'))
+-	env.Alias('install', env.Command (os.path.join(install_prefix, 'share', 'applications'), [], 'update-desktop-database $TARGET'))
+ 	# uninstall target.. needed to run  update-mime-database and update-desktop-database after removal. #`
+ 	remove_desktop_files = env.Command ('another_frobnicatory_decoy', [],
+                              [ Delete (install_prefix + '/share/mime/packages/ardour2.xml'),

audio/ardour/patches/patch-gtk2_ardour_ardour_sh_in

+$OpenBSD: patch-gtk2_ardour_ardour_sh_in,v 1.1.1.1 2012/08/17 15:33:32 stsp Exp $
+--- gtk2_ardour/ardour.sh.in.orig	Tue Feb 24 13:37:42 2009
++++ gtk2_ardour/ardour.sh.in	Mon Jan 23 17:30:29 2012
+@@ -13,28 +13,9 @@ if [ "$MLOCK_LIMIT" != "unlimited" ]; then
+ 	echo "WARNING: Your system has a limit for maximum amount of locked memory!"
+         echo "         This might cause Ardour to run out of memory before your system runs"
+ 	echo "         out of memory. You can view the memory limit with 'ulimit -l', and it"
+-	echo "         is normally controlled by /etc/security/limits.conf"
++	echo "         is normally controlled by /etc/login.conf"
+ 	echo ""
+ 
+-fi
+-
+-
+-## Glib atomic test
+-
+-GLIB=$(ldd %INSTALL_PREFIX%/%LIBDIR%/ardour2/ardour-%VERSION% 2> /dev/null | grep glib-2.0 | sed 's/.*=> \([^ ]*\) .*/\1/')
+-
+-if [ "$GLIB" = "" ]; then
+-	echo "WARNING: Could not check your glib-2.0 for mutex locking atomic operations."
+-	echo ""
+-elif [ $(nm -D --radix=dec --defined-only -S $GLIB | grep -w g_atomic_int_add | cut -d ' ' -f 2) -gt 32 ]; then
+-	echo "WARNING: Your system contains a suspect libglib-2.0. Your version might be built"
+-	echo "         to use mutex locking atomic operations. This is a fallback solution to"
+-	echo "         a more robust hardware supported atomicity. It might cause reduced "
+-	echo "         performance and/or deadlocks. Please contact your distribution support"
+-	echo "         about this issue."
+-	echo "         Unfortunately this check is not 100% accurate, so this might not be"
+-	echo "         the case with your system."
+-	echo ""
+ fi
+ 
+ exec %INSTALL_PREFIX%/%LIBDIR%/ardour2/ardour-%VERSION% "$@"

audio/ardour/patches/patch-gtk2_ardour_ardour_ui_cc

+$OpenBSD: patch-gtk2_ardour_ardour_ui_cc,v 1.1.1.1 2012/08/17 15:33:32 stsp Exp $
+--- gtk2_ardour/ardour_ui.cc.orig	Sat Aug 11 23:50:19 2012
++++ gtk2_ardour/ardour_ui.cc	Sat Aug 11 23:50:33 2012
+@@ -716,7 +716,7 @@ ARDOUR_UI::check_memory_locking ()
+ 								     "This might cause %1 to run out of memory before your system "
+ 								     "runs out of memory. \n\n"
+ 								     "You can view the memory limit with 'ulimit -l', "
+-								     "and it is normally controlled by /etc/security/limits.conf"), PROGRAM_NAME));
++								     "and it is normally controlled by /etc/login.conf"), PROGRAM_NAME));
+ 						   
+ 				VBox* vbox = msg.get_vbox();
+ 				HBox hbox;

audio/ardour/patches/patch-gtk2_ardour_engine_dialog_cc

+$OpenBSD: patch-gtk2_ardour_engine_dialog_cc,v 1.1.1.1 2012/08/17 15:33:32 stsp Exp $
+--- gtk2_ardour/engine_dialog.cc.orig	Thu Apr 19 16:35:13 2012
++++ gtk2_ardour/engine_dialog.cc	Sat Aug 11 15:12:45 2012
+@@ -14,7 +14,7 @@
+ #include <CoreFoundation/CFString.h>
+ #include <sys/param.h>
+ #include <mach-o/dyld.h>
+-#else
++#elif defined(__linux__)
+ #include <alsa/asoundlib.h>
+ #endif
+ 
+@@ -116,6 +116,8 @@ EngineControl::EngineControl ()
+ 	strings.clear ();
+ #ifdef __APPLE__
+ 	strings.push_back (X_("CoreAudio"));
++#elif defined(__OpenBSD__)
++	strings.push_back (X_("sndio"));
+ #else
+ 	strings.push_back (X_("ALSA"));
+ 	strings.push_back (X_("OSS"));
+@@ -131,7 +133,9 @@ EngineControl::EngineControl ()
+ 
+ 	strings.clear ();
+ 	strings.push_back (_("Playback/Recording on 1 Device"));
++#ifndef __OpenBSD__
+ 	strings.push_back (_("Playback/Recording on 2 Devices"));
++#endif
+ 	strings.push_back (_("Playback only"));
+ 	strings.push_back (_("Recording only"));
+ 	set_popdown_strings (audio_mode_combo, strings);
+@@ -162,7 +166,7 @@ EngineControl::EngineControl ()
+ 	basic_packer.attach (period_size_combo, 1, 2, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
+ 	row++;
+ 
+-#ifndef __APPLE__
++#if !defined(__APPLE__) && !defined(__OpenBSD__)
+ 	label = manage (new Label (_("Number of buffers")));
+ 	basic_packer.attach (*label, 0, 1, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
+ 	basic_packer.attach (periods_spinner, 1, 2, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
+@@ -183,7 +187,7 @@ EngineControl::EngineControl ()
+ 	row++;
+ 	/* no audio mode with CoreAudio, its duplex or nuthin' */
+ 
+-#ifndef __APPLE__
++#if !defined(__APPLE__) && !defined(__OpenBSD__)
+ 	label = manage (new Label (_("Audio Mode")));
+ 	basic_packer.attach (*label, 0, 1, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
+ 	basic_packer.attach (audio_mode_combo, 1, 2, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
+@@ -223,7 +227,7 @@ EngineControl::EngineControl ()
+ 	realtime_button.signal_toggled().connect (mem_fun (*this, &EngineControl::realtime_changed));
+ 	realtime_changed ();
+ 
+-#ifndef __APPLE__
++#if !defined(__APPLE__) && !defined(__OpenBSD__)
+ 	label = manage (new Label (_("Realtime Priority")));
+ 	label->set_alignment (1.0, 0.5);
+ 	options_packer.attach (*label, 0, 1, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
+@@ -273,7 +277,7 @@ EngineControl::EngineControl ()
+ 	options_packer.attach (*label, 0, 1, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
+ 	++row;
+ 
+-#ifndef __APPLE__
++#if !defined(__APPLE__) && !defined(__OpenBSD__)
+ 	label = manage (new Label (_("Dither")));	
+ 	label->set_alignment (1.0, 0.5);
+ 	options_packer.attach (dither_mode_combo, 1, 2, row, row + 1, FILL|EXPAND, AttachOptions(0));
+@@ -289,7 +293,7 @@ EngineControl::EngineControl ()
+ 	device_packer.set_spacings (6);
+ 	row = 0;
+ 
+-#ifndef __APPLE__
++#if !defined(__APPLE__) && !defined(__OpenBSD__)
+ 	label = manage (new Label (_("Input device")));
+ 	label->set_alignment (1.0, 0.5);
+ 	device_packer.attach (*label, 0, 1, row, row+1, FILL|EXPAND, (AttachOptions) 0);
+@@ -433,6 +437,8 @@ EngineControl::build_command_line (vector<string>& cmd
+ 	} else if (driver == X_("CoreAudio")) {
+ 		using_coreaudio = true;
+ 		cmd.push_back ("coreaudio");
++	} else if (driver == X_("sndio")) {
++		cmd.push_back ("sndio");
+ 	} else if (driver == X_("NetJACK")) {
+ 		using_netjack = true;
+ 		cmd.push_back ("netjack");
+@@ -613,7 +619,7 @@ EngineControl::setup_engine ()
+ void
+ EngineControl::realtime_changed ()
+ {
+-#ifndef __APPLE__
++#if !defined(__APPLE__) && !defined(__OpenBSD__)
+ 	priority_spinner.set_sensitive (realtime_button.get_active());
+ #endif
+ }
+@@ -628,7 +634,12 @@ EngineControl::enumerate_devices (const string& driver
+ 		devices[driver] = enumerate_coreaudio_devices ();
+ #endif
+ 
+-#ifndef __APPLE__
++#ifdef __OpenBSD__
++	} else if (driver == "sndio") {
++		devices[driver] = enumerate_sndio_devices ();
++#endif
++
++#ifdef __linux__
+ 	} else if (driver == "ALSA") {
+ 		devices[driver] = enumerate_alsa_devices ();
+ 	} else if (driver == "FFADO") {
+@@ -753,6 +764,17 @@ Ardour and choose the relevant device then."
+ 		exit (1);
+ 	}
+ 
++
++	return devs;
++}
++#elif defined(__OpenBSD__)
++vector<string>
++EngineControl::enumerate_sndio_devices ()
++{
++	vector<string> devs;
++
++	backend_devs.clear ();
++	devs.push_back ("default");
+ 
+ 	return devs;
+ }

audio/ardour/patches/patch-gtk2_ardour_engine_dialog_h

+$OpenBSD: patch-gtk2_ardour_engine_dialog_h,v 1.1.1.1 2012/08/17 15:33:32 stsp Exp $
+--- gtk2_ardour/engine_dialog.h.orig	Sat Jan 21 16:42:23 2012
++++ gtk2_ardour/engine_dialog.h	Sat Jan 21 16:42:41 2012
+@@ -92,6 +92,8 @@ class EngineControl : public Gtk::VBox {
+ 
+ #ifdef __APPLE__
+ 	std::vector<std::string> enumerate_coreaudio_devices ();
++#elif defined(__OpenBSD__)
++	std::vector<std::string> enumerate_sndio_devices ();
+ #else
+ 	std::vector<std::string> enumerate_alsa_devices ();
+ 	std::vector<std::string> enumerate_oss_devices ();

audio/ardour/patches/patch-gtk2_ardour_new_session_dialog_cc

+$OpenBSD: patch-gtk2_ardour_new_session_dialog_cc,v 1.1.1.1 2012/08/17 15:33:32 stsp Exp $
+--- gtk2_ardour/new_session_dialog.cc.orig	Mon Jul  2 02:19:40 2012
++++ gtk2_ardour/new_session_dialog.cc	Sat Aug 11 15:12:45 2012
+@@ -589,7 +589,7 @@ NewSessionDialog::set_session_folder(const std::string
+ 	*/
+ 
+ 
+-#ifdef __APPLE__
++#if defined(__APPLE__) || defined(__OpenBSD__)
+ 
+ 	char buf[PATH_MAX];
+ 

audio/ardour/patches/patch-libs_ardour_SConscript

+$OpenBSD: patch-libs_ardour_SConscript,v 1.1.1.1 2012/08/17 15:33:32 stsp Exp $
+--- libs/ardour/SConscript.orig	Sat Aug 11 17:46:06 2012
++++ libs/ardour/SConscript	Sat Aug 11 17:46:10 2012
+@@ -327,7 +327,6 @@ ardour.Merge ([
+ 	     libraries['lrdf'],
+ 	     libraries['midi++2'],
+ 	     libraries['pbd'],
+-	     libraries['raptor'],
+ 	     libraries['samplerate'],
+ 	     libraries['sigc2'],
+ 	     libraries['sndfile'],

audio/ardour/patches/patch-libs_ardour_source_cc

+$OpenBSD: patch-libs_ardour_source_cc,v 1.1.1.1 2012/08/17 15:33:32 stsp Exp $
+--- libs/ardour/source.cc.orig	Mon Jan 23 18:22:43 2012
++++ libs/ardour/source.cc	Mon Jan 23 18:23:32 2012
+@@ -79,7 +79,7 @@ Source::get_state ()
+ 	node->add_property ("id", buf);
+ 
+ 	if (_timestamp != 0) {
+-		snprintf (buf, sizeof (buf), "%ld", _timestamp);
++		snprintf (buf, sizeof (buf), "%d", _timestamp);
+ 		node->add_property ("timestamp", buf);
+ 	}
+ 
+@@ -104,7 +104,7 @@ Source::set_state (const XMLNode& node)
+ 	}
+ 
+ 	if ((prop = node.property ("timestamp")) != 0) {
+-		sscanf (prop->value().c_str(), "%ld", &_timestamp);
++		sscanf (prop->value().c_str(), "%d", &_timestamp);
+ 	}
+ 
+ 	return 0;

audio/ardour/patches/patch-libs_midi++2_SConscript

+$OpenBSD: patch-libs_midi++2_SConscript,v 1.1.1.1 2012/08/17 15:33:32 stsp Exp $
+--- libs/midi++2/SConscript.orig	Mon Jan  2 20:01:31 2012
++++ libs/midi++2/SConscript	Mon Jan  2 20:05:13 2012
+@@ -32,6 +32,7 @@ version.cc
+ sysdep_sources = Split ("""
+ alsa_sequencer_midiport.cc
+ coremidi_midiport.cc
++sndio_midiport.cc
+ """)
+ 
+ if env['SYSMIDI'] == 'CoreMIDI':
+@@ -39,6 +40,9 @@ if env['SYSMIDI'] == 'CoreMIDI':
+    midi2.Append (CCFLAGS="-DWITH_COREMIDI")
+    midi2.Append (LINKFLAGS="-framework CoreMIDI")
+    midi2.Append (LINKFLAGS="-framework CoreFoundation")
++elif env['SYSMIDI'] == 'SndioMIDI':
++   sysdep_src = [ 'sndio_midiport.cc' ]
++   midi2.Append (CCFLAGS="-DWITH_SNDIO")
+ else:
+    sysdep_src = [ 'alsa_sequencer_midiport.cc' ]
+    midi2.Append (CCFLAGS="-DWITH_ALSA")

audio/ardour/patches/patch-libs_midi++2_midi++_port_h

+$OpenBSD: patch-libs_midi++2_midi++_port_h,v 1.1.1.1 2012/08/17 15:33:32 stsp Exp $
+--- libs/midi++2/midi++/port.h.orig	Sun Jan 22 04:25:49 2012
++++ libs/midi++2/midi++/port.h	Sun Jan 22 04:26:02 2012
+@@ -40,6 +40,7 @@ class Port : public sigc::trackable {
+ 		ALSA_RawMidi,
+ 		ALSA_Sequencer,
+ 		CoreMidi_MidiPort,
++		SndioMidi_MidiPort,
+ 		Null,
+ 		FIFO
+ 	};

audio/ardour/patches/patch-libs_midi++2_midifactory_cc

+$OpenBSD: patch-libs_midi++2_midifactory_cc,v 1.1.1.1 2012/08/17 15:33:32 stsp Exp $
+--- libs/midi++2/midifactory.cc.orig	Tue Feb 24 13:37:50 2009
++++ libs/midi++2/midifactory.cc	Mon Jan 23 17:31:34 2012
+@@ -46,7 +46,15 @@ std::string MIDI::CoreMidi_MidiPort::typestring = "cor
+ 
+ #endif // WITH_COREMIDI
+ 
++#ifdef WITH_SNDIO
+ 
++#include <midi++/sndio_midiport.h>
++
++std::string MIDI::SndioMidi_MidiPort::typestring = "sndio";
++
++#endif // WITH_SNDIO
++
++
+ using namespace std;
+ using namespace MIDI;
+ using namespace PBD;
+@@ -74,6 +82,12 @@ PortFactory::create_port (const XMLNode& node)
+ 		break;
+ #endif // WITH_COREMIDI
+ 
++#if WITH_SNDIO
++	case Port::SndioMidi_MidiPort:
++		port = new SndioMidi_MidiPort (node);
++		break;
++#endif // WITH_SNDIO
++
+ 	case Port::Null:
+ 		port = new Null_MidiPort (node);
+ 		break;
+@@ -107,6 +121,12 @@ PortFactory::ignore_duplicate_devices (Port::Type type
+ 		break;
+ #endif // WITH_COREMIDI
+ 
++#if WITH_SNDIO
++	case Port::SndioMidi_MidiPort:
++		ret = false;
++		break;
++#endif // WITH_SNDIO
++
+ 	default:
+ 		break;
+ 	}
+@@ -126,6 +146,10 @@ PortFactory::get_known_ports (vector<PortSet>& ports)
+ 	n += CoreMidi_MidiPort::discover (ports);
+ #endif // WITH_COREMIDI
+ 	
++#if WITH_SNDIO
++	n += SndioMidi_MidiPort::discover (ports);
++#endif // WITH_SNDIO
++
+ 	return n;
+ }
+ 
+@@ -141,6 +165,9 @@ PortFactory::default_port_type ()
+ 	return "coremidi";
+ #endif // WITH_COREMIDI
+ 	
++#ifdef WITH_SNDIO
++	return "sndio";
++#endif
+ 	PBD::fatal << "programming error: no default port type defined in midifactory.cc" << endmsg;
+ }
+ 
+@@ -157,6 +184,10 @@ PortFactory::string_to_type (const string& xtype)
+ #ifdef WITH_COREMIDI
+ 	} else if (strings_equal_ignore_case (xtype, CoreMidi_MidiPort::typestring)) {
+ 		return Port::CoreMidi_MidiPort;
++#endif
++#ifdef WITH_SNDIO
++	} else if (strings_equal_ignore_case (xtype, SndioMidi_MidiPort::typestring)) {
++		return Port::SndioMidi_MidiPort;
+ #endif
+ 	} else if (strings_equal_ignore_case (xtype, Null_MidiPort::typestring)) {
+ 		return Port::Null;

audio/ardour/patches/patch-libs_midi++2_midiport_cc

+$OpenBSD: patch-libs_midi++2_midiport_cc,v 1.1.1.1 2012/08/17 15:33:32 stsp Exp $
+--- libs/midi++2/midiport.cc.orig	Mon Jan 23 16:25:09 2012
++++ libs/midi++2/midiport.cc	Mon Jan 23 16:26:26 2012
+@@ -51,6 +51,7 @@ Port::Port (const XMLNode& node)
+ 	_devname = desc.device;
+ 	_tagname = desc.tag;
+ 	_mode = desc.mode;
++	_type = desc.type;
+ 
+ 	if (_mode == O_RDONLY || _mode == O_RDWR) {
+ 		input_parser = new Parser (*this);

audio/ardour/patches/patch-libs_pbd_SConscript

+$OpenBSD: patch-libs_pbd_SConscript,v 1.1.1.1 2012/08/17 15:33:32 stsp Exp $
+--- libs/pbd/SConscript.orig	Wed Nov 23 15:08:24 2011
++++ libs/pbd/SConscript	Sat Aug 11 15:12:45 2012
+@@ -58,6 +58,9 @@ if conf.CheckCHeader('execinfo.h'):
+     conf.env.Append(CXXFLAGS="-DHAVE_EXECINFO")
+ pbd = conf.Finish()
+ 
++if libraries.has_key('execinfo'):
++    pbd.Merge([libraries['execinfo']])
++
+ pbd.Merge ([ libraries['sigc2'],
+              libraries['xml'],
+              libraries['glibmm2'],

audio/ardour/pkg/CVS/Entries

+/DESCR/1.1.1.1/Fri Aug 17 15:33:32 2012//
+/PLIST/1.2/Sat Aug 18 08:50:19 2012//
+D

audio/ardour/pkg/CVS/Repository

+ports/audio/ardour/pkg

audio/ardour/pkg/CVS/Root

+/home/jtr2/openbsd/mirror

audio/ardour/pkg/DESCR

+Ardour is a full-featured, free and open-source hard disk recorder and
+digital audio workstation program suitable for professional use. It
+features unlimited audio tracks and buses, non-destructive, non-linear
+editing with unlimited undo, and anything-to-anywhere signal routing. It
+supports standard file formats, such as BWF, WAV, WAV64, AIFF and CAF,
+and it can use LADSPA, LV2, VST and AudioUnit plugin formats.

audio/ardour/pkg/PLIST

+@comment $OpenBSD: PLIST,v 1.2 2012/08/18 08:50:19 ajacoutot Exp $
+bin/ardour2
+lib/ardour2/
+@bin lib/ardour2/ardour-2.8.14
+lib/ardour2/engines/
+lib/ardour2/engines/libclearlooks.so
+lib/ardour2/libardour.so
+lib/ardour2/libardour_cp.so
+lib/ardour2/libgtkmm2ext.so
+lib/ardour2/libmidi++.so
+lib/ardour2/libpbd.so
+lib/ardour2/librubberband.so
+lib/ardour2/libvamphostsdk.so
+lib/ardour2/libvampsdk.so
+lib/ardour2/surfaces/
+lib/ardour2/surfaces/libardour_genericmidi.so
+lib/ardour2/surfaces/libardour_mackie.so
+lib/ardour2/vamp/
+lib/ardour2/vamp/libardourvampplugins.so
+share/applications/ardour2.desktop
+share/ardour2/
+share/ardour2/icons/
+share/ardour2/icons/application-x-ardour_16px.png
+share/ardour2/icons/application-x-ardour_22px.png
+share/ardour2/icons/application-x-ardour_32px.png
+share/ardour2/icons/application-x-ardour_48px.png
+share/ardour2/icons/ardour_icon_16px.png
+share/ardour2/icons/ardour_icon_22px.png
+share/ardour2/icons/ardour_icon_32px.png
+share/ardour2/icons/ardour_icon_48px.png
+share/ardour2/icons/computer_keyboard.png
+share/ardour2/icons/computer_keyboard_active.png
+share/ardour2/icons/crossfade-in-S1.png
+share/ardour2/icons/crossfade-in-S2.png
+share/ardour2/icons/crossfade-in-constant-power.png
+share/ardour2/icons/crossfade-in-fast-cut.png
+share/ardour2/icons/crossfade-in-linear.png
+share/ardour2/icons/crossfade-in-long-cut.png
+share/ardour2/icons/crossfade-in-short-cut.png
+share/ardour2/icons/crossfade-in-slow-cut.png
+share/ardour2/icons/crossfade-out-S1.png
+share/ardour2/icons/crossfade-out-S2.png
+share/ardour2/icons/crossfade-out-constant-power.png
+share/ardour2/icons/crossfade-out-fast-cut.png
+share/ardour2/icons/crossfade-out-linear.png
+share/ardour2/icons/crossfade-out-long-cut.png
+share/ardour2/icons/crossfade-out-short-cut.png
+share/ardour2/icons/crossfade-out-slow-cut.png
+share/ardour2/icons/fader_belt.png
+share/ardour2/icons/fader_belt_h.png
+share/ardour2/icons/ferret_02.png
+share/ardour2/icons/grabber_edit_point.png
+share/ardour2/icons/hide.png
+share/ardour2/icons/nudge_left.png
+share/ardour2/icons/nudge_right.png
+share/ardour2/icons/record_normal_red.png
+share/ardour2/icons/record_tape_red.png
+share/ardour2/icons/sae.png
+share/ardour2/icons/saelogo.png
+share/ardour2/icons/strip_width.png
+share/ardour2/icons/tool_audition.png
+share/ardour2/icons/tool_gain.png
+share/ardour2/icons/tool_object.png
+share/ardour2/icons/tool_stretch.png
+share/ardour2/icons/tool_zoom.png
+share/ardour2/icons/transport_end.png
+share/ardour2/icons/transport_loop.png
+share/ardour2/icons/transport_play.png
+share/ardour2/icons/transport_range.png
+share/ardour2/icons/transport_record.png
+share/ardour2/icons/transport_start.png
+share/ardour2/icons/transport_stop.png
+share/ardour2/icons/zoom_full.png
+share/ardour2/icons/zoom_in.png
+share/ardour2/icons/zoom_out.png
+share/ardour2/pixmaps/
+share/ardour2/pixmaps/forwardblarrow.xpm
+share/ardour2/pixmaps/hiin.xpm
+share/ardour2/pixmaps/hiout.xpm
+share/ardour2/pixmaps/hslider00.xpm
+share/ardour2/pixmaps/hslider01.xpm
+share/ardour2/pixmaps/left_arrow.xpm
+share/ardour2/pixmaps/linin.xpm
+share/ardour2/pixmaps/linout.xpm
+share/ardour2/pixmaps/loin.xpm
+share/ardour2/pixmaps/loop.xpm
+share/ardour2/pixmaps/loout.xpm
+share/ardour2/pixmaps/lr.xpm
+share/ardour2/pixmaps/regin.xpm
+share/ardour2/pixmaps/regin2.xpm
+share/ardour2/pixmaps/regout.xpm
+share/ardour2/pixmaps/regout2.xpm
+share/ardour2/pixmaps/revdblarrow.xpm
+share/ardour2/pixmaps/right_arrow.xpm
+share/ardour2/pixmaps/set-next-button.xpm
+share/ardour2/pixmaps/small-round-button-01.xpm
+share/ardour2/pixmaps/small_x.xpm
+share/ardour2/pixmaps/toggle-button-00.xpm
+share/ardour2/pixmaps/toggle-button-01.xpm
+share/ardour2/pixmaps/tool_audition.xpm
+share/ardour2/pixmaps/tool_gain.xpm
+share/ardour2/pixmaps/tool_object.xpm
+share/ardour2/pixmaps/tool_range.xpm
+share/ardour2/pixmaps/tool_stretch.xpm
+share/ardour2/pixmaps/tool_zoom.xpm
+share/ardour2/pixmaps/vslider00.xpm
+share/ardour2/pixmaps/vslider01.xpm
+share/ardour2/pixmaps/vslider02_rail.xpm
+share/ardour2/pixmaps/vslider02_slider.xpm
+share/ardour2/pixmaps/vslider_slider_16wide.xpm
+share/ardour2/pixmaps/zoom_full.xpm
+share/ardour2/pixmaps/zoom_in.xpm
+share/ardour2/pixmaps/zoom_out.xpm
+share/ardour2/splash.png
+share/ardour2/templates/
+share/ardour2/templates/16 Tracks.template
+share/ardour2/templates/2 Track.template
+share/ardour2/templates/32 Tracks.template
+share/ardour2/templates/4 Tracks.template
+share/ardour2/templates/8 Tracks.template
+share/examples/ardour2/
+@sample ${SYSCONFDIR}/ardour2/
+share/examples/ardour2/SAE-de-keypad.bindings
+@sample ${SYSCONFDIR}/ardour2/SAE-de-keypad.bindings
+share/examples/ardour2/SAE-de-nokeypad.bindings
+@sample ${SYSCONFDIR}/ardour2/SAE-de-nokeypad.bindings
+share/examples/ardour2/SAE-us-keypad.bindings
+@sample ${SYSCONFDIR}/ardour2/SAE-us-keypad.bindings
+share/examples/ardour2/SAE-us-nokeypad.bindings
+@sample ${SYSCONFDIR}/ardour2/SAE-us-nokeypad.bindings
+share/examples/ardour2/ardour-sae.menus
+@sample ${SYSCONFDIR}/ardour2/ardour-sae.menus
+share/examples/ardour2/ardour.menus
+@sample ${SYSCONFDIR}/ardour2/ardour.menus
+share/examples/ardour2/ardour2_ui_dark.rc
+@sample ${SYSCONFDIR}/ardour2/ardour2_ui_dark.rc
+share/examples/ardour2/ardour2_ui_dark_sae.rc
+@sample ${SYSCONFDIR}/ardour2/ardour2_ui_dark_sae.rc
+share/examples/ardour2/ardour2_ui_default.conf
+@sample ${SYSCONFDIR}/ardour2/ardour2_ui_default.conf
+share/examples/ardour2/ardour2_ui_light.rc
+@sample ${SYSCONFDIR}/ardour2/ardour2_ui_light.rc
+share/examples/ardour2/ardour2_ui_light_sae.rc
+@sample ${SYSCONFDIR}/ardour2/ardour2_ui_light_sae.rc
+share/examples/ardour2/ardour_system.rc
+@sample ${SYSCONFDIR}/ardour2/ardour_system.rc
+share/examples/ardour2/ergonomic-us.bindings
+@sample ${SYSCONFDIR}/ardour2/ergonomic-us.bindings
+share/examples/ardour2/mnemonic-us.bindings
+@sample ${SYSCONFDIR}/ardour2/mnemonic-us.bindings
+share/icons/hicolor/16x16/apps/ardour2.png
+share/icons/hicolor/16x16/mimetypes/application-x-ardour2.png
+share/icons/hicolor/22x22/apps/ardour2.png
+share/icons/hicolor/22x22/mimetypes/application-x-ardour2.png
+share/icons/hicolor/32x32/apps/ardour2.png
+share/icons/hicolor/32x32/mimetypes/application-x-ardour2.png
+share/icons/hicolor/48x48/apps/ardour2.png
+share/icons/hicolor/48x48/mimetypes/application-x-ardour2.png
+share/locale/cs/LC_MESSAGES/gtk2_ardour.mo
+share/locale/de/LC_MESSAGES/gtk2_ardour.mo
+share/locale/el/LC_MESSAGES/gtk2_ardour.mo
+share/locale/el/LC_MESSAGES/libardour2.mo
+share/locale/el/LC_MESSAGES/libgtkmm2ext.mo
+share/locale/es/LC_MESSAGES/gtk2_ardour.mo
+share/locale/es/LC_MESSAGES/libardour2.mo
+share/locale/es/LC_MESSAGES/libgtkmm2ext.mo
+share/locale/eu/LC_MESSAGES/gtk2_ardour.mo
+share/locale/eu/LC_MESSAGES/libardour2.mo
+share/locale/eu/LC_MESSAGES/libgtkmm2ext.mo
+share/locale/fr/LC_MESSAGES/gtk2_ardour.mo
+share/locale/fr/LC_MESSAGES/libardour2.mo
+share/locale/it/LC_MESSAGES/gtk2_ardour.mo
+share/locale/it/LC_MESSAGES/libardour2.mo
+share/locale/nn/LC_MESSAGES/gtk2_ardour.mo
+share/locale/nn/LC_MESSAGES/libardour2.mo
+share/locale/nn/LC_MESSAGES/libgtkmm2ext.mo
+share/locale/pl/LC_MESSAGES/gtk2_ardour.mo
+share/locale/pl/LC_MESSAGES/libardour2.mo
+share/locale/pl/LC_MESSAGES/libgtkmm2ext.mo
+share/locale/pt/LC_MESSAGES/gtk2_ardour.mo
+share/locale/pt/LC_MESSAGES/libgtkmm2ext.mo
+share/locale/pt_PT/
+share/locale/pt_PT/LC_MESSAGES/
+share/locale/pt_PT/LC_MESSAGES/gtk2_ardour.mo
+share/locale/ru/LC_MESSAGES/gtk2_ardour.mo
+share/locale/ru/LC_MESSAGES/libardour2.mo
+share/locale/ru/LC_MESSAGES/libgtkmm2ext.mo
+share/locale/sv/LC_MESSAGES/gtk2_ardour.mo
+share/locale/sv/LC_MESSAGES/libardour2.mo
+share/mime/packages/ardour2.xml
+@exec %D/bin/update-mime-database %D/share/mime
+@unexec-delete %D/bin/update-mime-database %D/share/mime
+@exec %D/bin/update-desktop-database
+@unexec-delete %D/bin/update-desktop-database
+@exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
+@unexec-delete %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor

audio/aubio/CVS/Entries

-/Makefile/1.2/Fri Aug 17 07:20:08 2012//
 /distinfo/1.1.1.1/Thu Aug 16 15:08:09 2012//
 D/patches////
 D/pkg////
+/Makefile/1.3/Sat Aug 18 11:04:34 2012//

audio/aubio/Makefile

-# $OpenBSD: Makefile,v 1.2 2012/08/17 07:20:08 jasper Exp $
+# $OpenBSD: Makefile,v 1.3 2012/08/18 07:18:26 ajacoutot Exp $
 
 COMMENT =		extract annotations from audio signals
 DISTNAME =		aubio-0.3.2
 SHARED_LIBS += 		aubioext	0.0 # 3.1
 CATEGORIES =		audio
 HOMEPAGE =		http://aubio.org
+REVISION =		0
 
 # GPLv2+ 
 PERMIT_PACKAGE_CDROM =	Yes

audio/aubio/pkg/CVS/Entries

 /DESCR/1.1.1.1/Thu Aug 16 15:08:09 2012//
-/PLIST/1.1.1.1/Thu Aug 16 15:08:09 2012//
+/PLIST/1.2/Sat Aug 18 11:04:35 2012//
 D

audio/aubio/pkg/PLIST

-@comment $OpenBSD: PLIST,v 1.1.1.1 2012/08/16 15:08:09 stsp Exp $
+@comment $OpenBSD: PLIST,v 1.2 2012/08/18 07:18:26 ajacoutot Exp $
 bin/aubiocut
 @bin bin/aubionotes
 @bin bin/aubioonset
 lib/python${MODPY_VERSION}/site-packages/aubio/web/html.py
 lib/python${MODPY_VERSION}/site-packages/aubio/web/html.pyc
 lib/python${MODPY_VERSION}/site-packages/aubio/web/html.pyo
+@man man/man1/aubiocut.1
+@man man/man1/aubionotes.1
+@man man/man1/aubioonset.1
+@man man/man1/aubiopitch.1
+@man man/man1/aubiotrack.1
 share/sounds/
 share/sounds/aubio/
 share/sounds/aubio/woodblock.aiff

benchmarks/CVS/Entries

 D/tcpblast////
 D/xengine////
 D/httperf////
-/Makefile/1.17/Mon Jan  2 23:35:26 2012//
+/Makefile/1.18/Sat Aug 18 11:05:34 2012//

benchmarks/Makefile

-# $OpenBSD: Makefile,v 1.17 2010/07/24 07:55:41 ajacoutot Exp $
-# $FreeBSD: Makefile,v 1.4 1997/02/16 13:32:59 andreas Exp $
-#
+# $OpenBSD: Makefile,v 1.18 2012/08/18 07:25:25 ajacoutot Exp $
 
      SUBDIR =
      SUBDIR += blogbench

biology/CVS/Entries

 D/nutdb////
 D/p5-Bio-ASN1-EntrezGene////
 D/py-biopython////
-/Makefile/1.7/Mon Jan  2 23:35:29 2012//
+/Makefile/1.8/Sat Aug 18 11:05:38 2012//
-# $OpenBSD: Makefile,v 1.7 2010/02/01 17:00:12 espie Exp $
-#
+# $OpenBSD: Makefile,v 1.8 2012/08/18 07:25:25 ajacoutot Exp $
 
      SUBDIR =
      SUBDIR += AcePerl

chinese/CVS/Entries

 D/lunar////
 D/ttfm////
 D/cconv////
-/Makefile/1.22/Mon Jan  2 23:35:37 2012//
+/Makefile/1.23/Sat Aug 18 11:05:43 2012//
-# $OpenBSD: Makefile,v 1.22 2011/07/19 16:51:34 jasper Exp $
-# $FreeBSD: Makefile,v 1.16 1997/11/17 18:36:43 max Exp $
+# $OpenBSD: Makefile,v 1.23 2012/08/18 07:25:25 ajacoutot Exp $
 
      SUBDIR =
      SUBDIR += c2t

comms/CVS/Entries

 D/owx////
 D/lcdproc////
 D/amtterm////
-/Makefile/1.53/Mon Jul  9 11:02:50 2012//
 D/picocom////
+/Makefile/1.54/Sat Aug 18 11:05:54 2012//
-# $OpenBSD: Makefile,v 1.53 2012/07/08 18:21:49 lteo Exp $
-# $FreeBSD: Makefile,v 1.27 1997/11/22 14:56:56 peter Exp $
+# $OpenBSD: Makefile,v 1.54 2012/08/18 07:25:25 ajacoutot Exp $
 
      SUBDIR =
      SUBDIR += amtterm

converters/CVS/Entries

 D/dos2unix////
 D/libunistring////
 D/ripmime////
-/Makefile/1.59/Sat Jul  7 11:02:19 2012//
+/Makefile/1.60/Sat Aug 18 11:06:04 2012//

converters/Makefile

-# $OpenBSD: Makefile,v 1.59 2012/07/07 07:52:50 ajacoutot Exp $
-#
+# $OpenBSD: Makefile,v 1.60 2012/08/18 07:25:25 ajacoutot Exp $
 
     SUBDIR =
     SUBDIR += base64

databases/CVS/Entries

 D/node-sqlite3////
 D/tinycdb////
 D/ports-readmes////
-/Makefile/1.217/Fri Aug 17 11:05:51 2012//
 D/luadbi////
+/Makefile/1.218/Sat Aug 18 11:06:16 2012//

databases/Makefile

-# $OpenBSD: Makefile,v 1.217 2012/08/16 15:21:52 jasper Exp $
-# $FreeBSD: Makefile,v 1.24 1997/10/04 23:32:05 andreas Exp $
-#
+# $OpenBSD: Makefile,v 1.218 2012/08/18 07:25:25 ajacoutot Exp $
+
      SUBDIR =
      SUBDIR += apache-couchdb
      SUBDIR += architect

databases/sqlite/CVS/Entries

 D/patches////
 D/pkg////
-/Makefile/1.18/Mon Jan  2 23:36:23 2012//
-/distinfo/1.7/Mon Jan  2 23:36:23 2012//
+/Makefile/1.19/Sat Aug 18 11:06:47 2012//
+/distinfo/1.8/Sat Aug 18 11:06:47 2012//

databases/sqlite/Makefile

-# $OpenBSD: Makefile,v 1.18 2010/11/15 00:22:54 espie Exp $
+# $OpenBSD: Makefile,v 1.19 2012/08/17 16:05:03 stu Exp $
 
 COMMENT=	Embedded SQL implementation
 DISTNAME=	sqlite-2.8.17
 PKGNAME=	${DISTNAME}
-REVISION =	1
+REVISION =	2
 CATEGORIES=	databases
 SHARED_LIBS +=	sqlite               8.6      # .0.0
 
 CONFIGURE_ARGS+=--disable-tcl
 .else
 REGRESS_TARGET=	test
-BUILD_DEPENDS+=	lang/tcl/8.4
-CONFIGURE_ENV+=	config_TARGET_TCL_LIBS="-L${LOCALBASE}/lib -ltcl84 -lm"
-CONFIGURE_ENV+=	config_TARGET_TCL_INC="-I${LOCALBASE}/include/tcl8.4"
+MODULES=	lang/tcl
+MODTCL_VERSION=	8.4
+BUILD_DEPENDS+=	${MODTCL_BUILD_DEPENDS}
+CONFIGURE_ENV+=	config_TARGET_TCL_LIBS="-L${LOCALBASE}/lib -ltcl${MODTCL_VERSION:S/.//} -lm"
+CONFIGURE_ENV+=	config_TARGET_TCL_INC="-I${MODTCL_INCDIR}"
 .endif
 
 .include <bsd.port.mk>

databases/sqlite/distinfo

-MD5 (sqlite-2.8.17.tar.gz) = g426wgtW0sQpLpiEhQWgWw==
-RMD160 (sqlite-2.8.17.tar.gz) = 8T7csML3JG6X6nRD3hdYtEQqlIM=
-SHA1 (sqlite-2.8.17.tar.gz) = ddsc87AOoYroUo5nb8n99pji/lg=
 SHA256 (sqlite-2.8.17.tar.gz) = PzXr+2eGf7W1g6A+SA+QAgavY37+cXmzIpSmoM+Abzc=
 SIZE (sqlite-2.8.17.tar.gz) = 969805

devel/CVS/Entries

 D/py-gevent////
 D/py-greenlet////
 D/nagelfar////
-/Makefile/1.1060/Mon Aug 13 11:06:30 2012//
+/Makefile/1.1061/Sat Aug 18 11:06:50 2012//
-# $OpenBSD: Makefile,v 1.1060 2012/08/12 22:21:27 pascal Exp $
-# $FreeBSD: Makefile,v 1.85 1997/11/20 05:22:14 asami Exp $
+# $OpenBSD: Makefile,v 1.1061 2012/08/18 07:25:25 ajacoutot Exp $
 
      SUBDIR =
      SUBDIR += ElectricFence

devel/py-greenlet/CVS/Entries

-/Makefile/1.1.1.1/Tue Jul 17 19:24:47 2012//
 /distinfo/1.1.1.1/Tue Jul 17 19:24:47 2012//
 D/pkg////
+/Makefile/1.2/Sat Aug 18 11:09:43 2012//
+D/patches////

devel/py-greenlet/Makefile

-# $OpenBSD: Makefile,v 1.1.1.1 2012/07/17 19:24:47 landry Exp $
+# $OpenBSD: Makefile,v 1.2 2012/08/17 21:51:49 landry Exp $
 
 COMMENT =	lightweight in-process concurrent programming
+# see slp_platformselect.h
+ONLY_FOR_ARCHS =	amd64 arm i386 mips64 mips64el powerpc sparc sparc64
 
 MODPY_EGG_VERSION = 0.4.0
 DISTNAME =	greenlet-${MODPY_EGG_VERSION}

devel/py-greenlet/patches/CVS/Entries

+/patch-slp_platformselect_h/1.1/Fri Aug 17 21:51:49 2012//
+D

devel/py-greenlet/patches/CVS/Repository

+ports/devel/py-greenlet/patches

devel/py-greenlet/patches/CVS/Root

+/home/jtr2/openbsd/mirror

devel/py-greenlet/patches/patch-slp_platformselect_h

+$OpenBSD: patch-slp_platformselect_h,v 1.1 2012/08/17 21:51:49 landry Exp $
+Give it a chance to build on ppc & mips
+--- slp_platformselect.h.orig	Fri Aug 17 23:44:37 2012
++++ slp_platformselect.h	Fri Aug 17 23:46:43 2012
+@@ -18,6 +18,8 @@
+ #include "platform/switch_ppc_macosx.h" /* Apple MacOS X on PowerPC */
+ #elif defined(__GNUC__) && defined(_ARCH_PPC) && defined(_AIX)
+ #include "platform/switch_ppc_aix.h" /* gcc on AIX/PowerPC */
++#elif defined(__GNUC__) && defined(__powerpc__)
++#include "platform/switch_ppc_unix.h" /* gcc on unix/PowerPC */
+ #elif defined(__GNUC__) && defined(sparc)
+ #include "platform/switch_sparc_sun_gcc.h" /* SunOS sparc with gcc */
+ #elif defined(__SUNPRO_C) && defined(sparc) && defined(sun)
+@@ -30,6 +32,6 @@
+ #include "platform/switch_s390_unix.h"	/* Linux/S390 zSeries (64-bit) */
+ #elif defined(__GNUC__) && defined(__arm__)
+ #include "platform/switch_arm32_gcc.h" /* gcc using arm32 */
+-#elif defined(__GNUC__) && defined(__mips__) && defined(__linux__)
++#elif defined(__GNUC__) && defined(__mips__)
+ #include "platform/switch_mips_unix.h" /* Linux/MIPS */
+ #endif

editors/CVS/Entries

 D/emacs23////
 D/py-qscintilla////
 D/ged////
-/Makefile/1.87/Sat Jul 14 11:04:32 2012//
 D/nvi////
+/Makefile/1.88/Sat Aug 18 11:10:15 2012//
-# $OpenBSD: Makefile,v 1.87 2012/07/14 10:01:14 naddy Exp $
-# $FreeBSD: Makefile,v 1.44 1997/09/13 20:19:28 chuckr Exp $
-#
+# $OpenBSD: Makefile,v 1.88 2012/08/18 07:25:25 ajacoutot Exp $
 
      SUBDIR =
      SUBDIR += abiword

editors/emacs23/CVS/Entries

 D/patches////
 D/pkg////
 /distinfo/1.3/Wed Feb  1 12:03:08 2012//
-/Makefile/1.18/Sun Aug 12 11:09:21 2012//
+/Makefile/1.19/Sat Aug 18 11:10:19 2012//

editors/emacs23/Makefile

-# $OpenBSD: Makefile,v 1.18 2012/08/11 22:55:39 pascal Exp $
+# $OpenBSD: Makefile,v 1.19 2012/08/17 09:09:01 jasper Exp $
 
 COMMENT-main =		GNU editor: extensible, customizable, self-documenting
 COMMENT-el =		elisp sources for those who want to read/modify them
 FULLPKGNAME-el =	emacs-el-${VERSION}
 FULLPKGPATH-el =	editors/emacs23,-el
 
-REVISION =		2
+REVISION-main =		4
+REVISION-el =		4
 
 CATEGORIES =		editors
 

editors/emacs23/patches/CVS/Entries

 /patch-src_s_openbsd_h/1.1.1.1/Mon Jan  2 23:39:20 2012//
 /patch-src_unexelf_c/1.2/Mon Jan  2 23:39:20 2012//
 /patch-src_xgselect_c/1.1/Thu Mar 29 18:07:27 2012//
+/patch-lisp_files_el/1.1/Fri Aug 17 09:09:01 2012//
 D

editors/emacs23/patches/patch-lisp_files_el

+$OpenBSD: patch-lisp_files_el,v 1.1 2012/08/17 09:09:01 jasper Exp $
+
+Security fix for CVE-2012-3479, GNU Emacs "enable-local-variables" Variable Processing Vulnerability
+
+From 90c310d22c6f06332257c816253c642fd2bf90aa Mon Sep 17 00:00:00 2001
+From: Glenn Morris <rgm@gnu.org>
+Date: Tue, 07 Aug 2012 18:41:39 +0000
+Subject: hack-local-variables-filter fix for bug#12155
+
+* lisp/files.el (hack-local-variables-filter): If an eval: form is not
+known to be safe, and enable-local-variables is :safe, then ignore
+the form totally, as is done for non-eval forms.
+
+--- lisp/files.el.orig	Wed Jan 11 13:35:01 2012
++++ lisp/files.el	Fri Aug 17 10:54:45 2012
+@@ -2986,11 +2986,16 @@ DIR-NAME is a directory name if these settings come fr
+ 	      ;; Obey `enable-local-eval'.
+ 	      ((eq var 'eval)
+ 	       (when enable-local-eval
+-		 (push elt all-vars)
+-		 (or (eq enable-local-eval t)
+-		     (hack-one-local-variable-eval-safep (eval (quote val)))
+-		     (safe-local-variable-p var val)
+-		     (push elt unsafe-vars))))
++		 (let ((safe (or (hack-one-local-variable-eval-safep
++				  (eval (quote val)))
++				 ;; In case previously marked safe (bug#5636).
++				 (safe-local-variable-p var val))))
++		   ;; If not safe and e-l-v = :safe, ignore totally.
++		   (when (or safe (not (eq enable-local-variables :safe)))
++		     (push elt all-vars)
++		     (or (eq enable-local-eval t)
++			 safe
++			 (push elt unsafe-vars))))))
+ 	      ;; Ignore duplicates (except `mode') in the present list.
+ 	      ((and (assq var all-vars) (not (eq var 'mode))) nil)
+ 	      ;; Accept known-safe variables.

education/CVS/Entries

 D/gtypist////
 D/verbiste////
 D/epte////
-/Makefile/1.18/Fri Mar  2 12:02:31 2012//
 D/anki////
+/Makefile/1.19/Sat Aug 18 11:10:32 2012//

education/Makefile

-# $OpenBSD: Makefile,v 1.18 2012/03/02 09:36:05 fgsch Exp $
-#
+# $OpenBSD: Makefile,v 1.19 2012/08/18 07:25:25 ajacoutot Exp $
 
      SUBDIR =
      SUBDIR += algotutor

emulators/frodo/CVS/Entries

 D/files////
 D/patches////
 D/pkg////
-/Makefile/1.22/Mon Jan  2 23:39:35 2012//
-/distinfo/1.4/Mon Jan  2 23:39:35 2012//
+/Makefile/1.23/Sat Aug 18 11:10:38 2012//
+/distinfo/1.5/Sat Aug 18 11:10:38 2012//

emulators/frodo/Makefile

-# $OpenBSD: Makefile,v 1.22 2010/11/15 23:22:08 espie Exp $
+# $OpenBSD: Makefile,v 1.23 2012/08/17 14:48:34 stu Exp $
 
 COMMENT=	Commodore 64 emulator
 
 DISTNAME=	FrodoV4_1b.Src
 PKGNAME=	frodo-4.1b
-REVISION=	5
+REVISION=	6
 DISTFILES=	FrodoV4_1b.Src${EXTRACT_SUFX}
 
 CATEGORIES=	emulators games
 
 CONFIGURE_STYLE=	gnu
 
-RUN_DEPENDS=	x11/tk/8.4
+MODULES=	x11/tk
+MODTK_VERSION=	8.4
+RUN_DEPENDS=	${MODTK_RUN_DEPENDS}
 LIB_DEPENDS=	sdl-*-!no_x11:devel/sdl
 
-WISH=wish8.4
+WISH=wish${MODTK_VERSION}
 FRODOLIBDIR=${PREFIX}/lib/frodo
 
 CONFIGURE_ENV=		CFLAGS='${CFLAGS} -O3 -D__unix -DX_USE_SHM -DUSE_SNDIO -fno-exceptions' \

emulators/frodo/distinfo

-MD5 (FrodoV4_1b.Src.tar.gz) = CVufIcAyBMwT9/JJ6IZs2Q==
-RMD160 (FrodoV4_1b.Src.tar.gz) = sIIx8PESHU+ALOCEB6bmw3GQW9M=
-SHA1 (FrodoV4_1b.Src.tar.gz) = rz4mRN1NJjMMrTgkmMQMqeTefmI=
 SHA256 (FrodoV4_1b.Src.tar.gz) = /64UbcIEWGmKz1zMOE3DIxfOod8MlbRLXUfMqLJryYY=
 SIZE (FrodoV4_1b.Src.tar.gz) = 377002

games/CVS/Entries

 D/eduke32////
 D/duke3ddata////
 D/minetest////
-/Makefile/1.246/Mon Aug 13 11:10:33 2012//
+/Makefile/1.247/Sat Aug 18 11:10:53 2012//
-# $OpenBSD: Makefile,v 1.246 2012/08/12 17:21:03 jasper Exp $
-# $FreeBSD: Makefile,v 1.91 1997/11/18 09:29:31 tg Exp $
-#
+# $OpenBSD: Makefile,v 1.247 2012/08/18 07:25:25 ajacoutot Exp $
 
      SUBDIR =
      SUBDIR += abuse
 D/viking////
 D/garmindev////
 D/qlandkartegt////
-/Makefile/1.33/Tue Jul 17 11:04:58 2012//
 D/memphis////
+/Makefile/1.34/Sat Aug 18 11:11:44 2012//
-# $OpenBSD: Makefile,v 1.33 2012/07/16 14:00:20 jasper Exp $
-# $FreeBSD: Makefile,v 1.4 1997/06/03 09:14:50 asami Exp $
+# $OpenBSD: Makefile,v 1.34 2012/08/18 07:25:25 ajacoutot Exp $
  
      SUBDIR =
      SUBDIR += emerillon

graphics/CVS/Entries

 D/node-canvas////
 D/ipe////
 D/colord-gtk////
-/Makefile/1.331/Mon Aug 13 11:11:29 2012//
+/Makefile/1.332/Sat Aug 18 11:11:50 2012//

graphics/Makefile

-# $OpenBSD: Makefile,v 1.331 2012/08/13 08:22:30 jasper Exp $
-# $FreeBSD: Makefile,v 1.55 1997/11/03 12:12:27 tg Exp $
-#
+# $OpenBSD: Makefile,v 1.332 2012/08/18 07:25:25 ajacoutot Exp $
 
      SUBDIR =
      SUBDIR += DevIL

infrastructure/db/CVS/Entries

 /systrace.filter.ccache/1.1/Mon Jan  2 23:41:25 2012//
 /config.site/1.20/Wed Jan 18 12:04:56 2012//
 /systrace.filter/1.35/Thu Jul  5 11:04:28 2012//
-/user.list/1.192/Sun Aug  5 11:12:54 2012//
 /config.no-fileutils/1.1/Sun Aug 12 17:19:00 2012//
+/user.list/1.193/Sat Aug 18 11:12:47 2012//
 D

infrastructure/db/user.list

-$OpenBSD: user.list,v 1.192 2012/08/04 15:15:00 ajacoutot Exp $
+$OpenBSD: user.list,v 1.193 2012/08/17 09:00:10 ajacoutot Exp $
 
 This file lists all users and groups that are created by ports or that
 users are encouraged to create after installing a port (these are marked
 698 _yule		_yule		security/samhain
 699 _mozsync		_mozsync	www/mozilla-sync
 700 _yubiserve		_yubiserve	security/yubiserve
+701 _polkitd		_polkitd	sysutils/polkit

infrastructure/mk/CVS/Entries

 /java.port.mk/1.1/Mon Jan  2 23:41:26 2012//
 /modules.port.mk/1.6/Mon Jan  2 23:41:26 2012//
 /bsd.port.subdir.mk/1.108/Mon May 28 11:04:00 2012//
-/pkgpath.mk/1.48/Mon May 28 11:04:00 2012//
 /apache-module.port.mk/1.8/Fri Jun  8 11:04:01 2012//
 /arch-defines.mk/1.6/Mon Jul  9 11:05:05 2012//
-/bsd.port.mk/1.1183/Sun Aug  5 11:12:55 2012//
 /gnu.port.mk/1.50/Mon Aug 13 11:12:27 2012//
 /perl.port.mk/1.20/Wed Aug 15 11:11:57 2012//
+/bsd.port.mk/1.1185/Sat Aug 18 11:12:47 2012//
+/pkgpath.mk/1.49/Sat Aug 18 11:12:48 2012//
 D

infrastructure/mk/bsd.port.mk

 #-*- mode: Makefile; tab-width: 4; -*-
 # ex:ts=4 sw=4 filetype=make:
-#	$OpenBSD: bsd.port.mk,v 1.1183 2012/08/04 14:23:30 espie Exp $
+#	$OpenBSD: bsd.port.mk,v 1.1185 2012/08/18 07:58:20 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 $
 #
 
 # Lock infrastructure:
 # to remove locks handling, define LOCKDIR to an empty value
+LOCKDIR ?= ${WRKOBJDIR}/locks
 
 LOCK_CMD ?= ${_PERLSCRIPT}/dolock
 UNLOCK_CMD ?= rm -f
 .endfor
 
 subpackage:
-	@${_DO_LOCK}; ${_cache_fragment}; cd ${.CURDIR} && ${MAKE} _internal-subpackage
+	@${_DO_LOCK}; (${_cache_fragment}; cd ${.CURDIR} && ${MAKE} _internal-subpackage)
 
 _internal-package: 
 	@${_cache_fragment}; cd ${.CURDIR} && ${MAKE} _internal-package-only
 
 _internal-package-only: ${_PACKAGE_COOKIES}
 
-_internal-subpackage: ${_PACKAGE_COOKIES${SUBPACKAGE}
+_internal-subpackage: ${_PACKAGE_COOKIES${SUBPACKAGE}}
 
 # Separate target for each file fetch-all will retrieve
 

infrastructure/mk/pkgpath.mk

-# $OpenBSD: pkgpath.mk,v 1.48 2012/05/28 09:43:17 espie Exp $
+# $OpenBSD: pkgpath.mk,v 1.49 2012/08/18 07:58:20 espie Exp $
 # ex:ts=4 sw=4 filetype=make:
 #	pkgpath.mk - 2003 Marc Espie
 #	This file is in the public domain.
 TMPDIR ?= /tmp
 READMES_TOP ?= ${PORTSDIR}
 DANGEROUS ?= No
-LOCKDIR ?= ${TMPDIR}/portslocks
 
 _PERLSCRIPT = perl ${PORTSDIR}/infrastructure/bin
 
 D/java-getopt////
 D/jna////
 D/asm////
-/Makefile/1.9/Thu May 24 11:04:14 2012//
 D/jBCrypt////
+/Makefile/1.10/Sat Aug 18 11:12:58 2012//
-# $OpenBSD: Makefile,v 1.9 2012/05/23 15:04:30 sthen Exp $
-#
+# $OpenBSD: Makefile,v 1.10 2012/08/18 07:25:25 ajacoutot Exp $
 
      SUBDIR =
      SUBDIR += asm
 D/gambit////
 D/node////
 D/elixir////
-/Makefile/1.138/Wed Jun 27 11:04:44 2012//
 D/tinyscheme////
+/Makefile/1.139/Sat Aug 18 11:13:01 2012//
-# $OpenBSD: Makefile,v 1.138 2012/06/26 19:54:00 jasper Exp $
-# $FreeBSD: Makefile,v 1.89 1997/11/24 09:24:06 tg Exp $
-#
+# $OpenBSD: Makefile,v 1.139 2012/08/18 07:25:25 ajacoutot Exp $
 
      SUBDIR =
      SUBDIR += STk
 D/rcube-sieverules////
 D/dovecot-antispam////
 D/py-authres////
-/Makefile/1.279/Thu May 31 11:04:31 2012//
 D/altermime////
+/Makefile/1.280/Sat Aug 18 11:13:46 2012//
-# $OpenBSD: Makefile,v 1.279 2012/05/30 16:47:35 ajacoutot Exp $
-# $FreeBSD: Makefile,v 1.51 1997/11/14 22:56:43 hoek Exp $
-#
+# $OpenBSD: Makefile,v 1.280 2012/08/18 07:25:25 ajacoutot Exp $
  
      SUBDIR =
      SUBDIR += abook
 D/p5-Algorithm-Combinatorics////
 D/p5-Math-Random-ISAAC////
 D/lpsolve////
-/Makefile/1.109/Thu Jun  7 11:04:47 2012//
 D/py-sympy////
+/Makefile/1.110/Sat Aug 18 11:14:38 2012//
-# $OpenBSD: Makefile,v 1.109 2012/06/07 10:20:34 edd Exp $
-#
+# $OpenBSD: Makefile,v 1.110 2012/08/18 07:25:25 ajacoutot Exp $
 
      SUBDIR =
      SUBDIR += R
 D/p5-Umph-Prompt////
 D/fasd////
 D/cmdpack////
-/Makefile/1.153/Wed Jul  4 11:04:58 2012//
+/Makefile/1.154/Sat Aug 18 11:15:02 2012//
-# $OpenBSD: Makefile,v 1.153 2012/07/04 07:47:05 sthen Exp $
-# $FreeBSD: Makefile,v 1.121 1997/11/17 10:14:33 tg Exp $
-#
+# $OpenBSD: Makefile,v 1.154 2012/08/18 07:25:25 ajacoutot Exp $
 
      SUBDIR =
      SUBDIR += WordGenerator
 D/sic////