Commits

Jim Razmus II  committed 5a7ca56

cvs up

  • Participants
  • Parent commits 88f22dc

Comments (0)

Files changed (95)

File audio/CVS/Entries

 D/opencore-amr////
 D/opus////
 D/opus-tools////
-/Makefile/1.283/Thu Aug  9 11:03:59 2012//
 D/deadbeef////
+/Makefile/1.285/Fri Aug 17 11:04:07 2012//
+D/aubio////
+D/liblo////

File audio/Makefile

-# $OpenBSD: Makefile,v 1.283 2012/08/08 18:12:35 shadchin Exp $
+# $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 $
 
      SUBDIR =
      SUBDIR += amarok
      SUBDIR += aqualung
      SUBDIR += ascd
+     SUBDIR += aubio
      SUBDIR += aucatctl
      SUBDIR += audacious
      SUBDIR += audacious-plugins
      SUBDIR += libdca
      SUBDIR += libgpod
      SUBDIR += libid3tag
+     SUBDIR += liblo
      SUBDIR += libmad
      SUBDIR += libmikmod
      SUBDIR += libmodplug

File 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////

File audio/aubio/CVS/Repository

+ports/audio/aubio

File audio/aubio/CVS/Root

+/home/jtr2/openbsd/mirror

File audio/aubio/Makefile

+# $OpenBSD: Makefile,v 1.2 2012/08/17 07:20:08 jasper Exp $
+
+COMMENT =		extract annotations from audio signals
+DISTNAME =		aubio-0.3.2
+SHARED_LIBS += 		aubio		0.0 # 3.1
+SHARED_LIBS += 		aubioext	0.0 # 3.1
+CATEGORIES =		audio
+HOMEPAGE =		http://aubio.org
+
+# GPLv2+ 
+PERMIT_PACKAGE_CDROM =	Yes
+PERMIT_PACKAGE_FTP =	Yes
+PERMIT_DISTFILES_CDROM =Yes
+PERMIT_DISTFILES_FTP =	Yes
+
+WANTLIB =		c m pthread fftw3f jack samplerate sndfile
+
+MASTER_SITES=		${HOMEPAGE}/pub/
+
+MODULES =		lang/python
+
+BUILD_DEPENDS =		devel/swig \
+			textproc/docbook-to-man
+LIB_DEPENDS =		audio/jack \
+			math/fftw3,float
+
+USE_LIBTOOL =		Yes
+
+CONFIGURE_STYLE =	gnu
+CONFIGURE_ARGS += 	${CONFIGURE_SHARED}
+CONFIGURE_FLAGS +=	--enable-test-progs
+CONFIGURE_ENV += 	CPPFLAGS="-I${LOCALBASE}/include" \
+			LDFLAGS="-L${LOCALBASE}/lib"
+
+REGRESS_TARGET = 	run-tests
+# regress requires a running jackd instance
+REGRESS_IS_INTERACTIVE = Yes
+do-regress:
+	(cd ${WRKSRC}/examples/tests && env -i ${MAKE_ENV} ${MAKE_PROGRAM} \
+		${ALL_REGRESS_FLAGS} -f ${MAKE_FILE} ${REGRESS_TARGET} \
+		${REGRESS_LOG})
+
+.include <bsd.port.mk>

File audio/aubio/distinfo

+MD5 (aubio-0.3.2.tar.gz) = /8Pl5IgP7GcGTwQyUiY6RA==
+RMD160 (aubio-0.3.2.tar.gz) = ROO7irOKpxUFJGbnrlASMImRS1s=
+SHA1 (aubio-0.3.2.tar.gz) = jvfMvxik+m23EqkZKsr8nI0ICXg=
+SHA256 (aubio-0.3.2.tar.gz) = 3BOHsEhhCmFB9SPCcxS3pgvSmcPWeJw3JEXdxlEVEs0=
+SIZE (aubio-0.3.2.tar.gz) = 609006

File audio/aubio/patches/CVS/Entries

+/patch-src_pitchschmitt_c/1.1.1.1/Thu Aug 16 15:08:09 2012//
+D

File audio/aubio/patches/CVS/Repository

+ports/audio/aubio/patches

File audio/aubio/patches/CVS/Root

+/home/jtr2/openbsd/mirror

File audio/aubio/patches/patch-src_pitchschmitt_c

+$OpenBSD: patch-src_pitchschmitt_c,v 1.1.1.1 2012/08/16 15:08:09 stsp Exp $
+Fix an out-of-bounds array access during 'make regress'.
+--- src/pitchschmitt.c.orig	Thu Jul 27 01:27:23 2006
++++ src/pitchschmitt.c	Thu Aug 16 12:50:53 2012
+@@ -73,9 +73,9 @@ smpl_t aubio_schmittS16LE (aubio_pitchschmitt_t *p, ui
+       t1 =   (sint_t)( A1 * trigfact + 0.5);
+       t2 = - (sint_t)( A2 * trigfact + 0.5);
+       startpoint=0;
+-      for (j=1; schmittBuffer[j]<=t1 && j<blockSize; j++);
+-      for (; !(schmittBuffer[j]  >=t2 &&
+-	       schmittBuffer[j+1]< t2) && j<blockSize; j++);
++      for (j=1; j<blockSize && schmittBuffer[j]<=t1; j++);
++      for (; j<blockSize-1 && !(schmittBuffer[j]  >=t2 &&
++	       schmittBuffer[j+1]< t2); j++);
+       startpoint=j;
+       schmittTriggered=0;
+       endpoint=startpoint+1;

File 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//
+D

File audio/aubio/pkg/CVS/Repository

+ports/audio/aubio/pkg

File audio/aubio/pkg/CVS/Root

+/home/jtr2/openbsd/mirror

File audio/aubio/pkg/DESCR

+aubio is a tool designed for the extraction of annotations from audio
+signals. Its features include segmenting a sound file before each of its
+attacks, performing pitch detection, tapping the beat and producing midi
+streams from live audio.

File audio/aubio/pkg/PLIST

+@comment $OpenBSD: PLIST,v 1.1.1.1 2012/08/16 15:08:09 stsp Exp $
+bin/aubiocut
+@bin bin/aubionotes
+@bin bin/aubioonset
+bin/aubiopitch
+@bin bin/aubiotrack
+include/aubio/
+include/aubio/aubio.h
+include/aubio/aubioext.h
+include/aubio/beattracking.h
+include/aubio/biquad.h
+include/aubio/config.h
+include/aubio/fft.h
+include/aubio/filter.h
+include/aubio/hist.h
+include/aubio/jackio.h
+include/aubio/mathutils.h
+include/aubio/midi/
+include/aubio/midi/list.h
+include/aubio/midi/midi.h
+include/aubio/midi/midi_driver.h
+include/aubio/midi/midi_event.h
+include/aubio/midi/midi_file.h
+include/aubio/midi/midi_parser.h
+include/aubio/midi/midi_player.h
+include/aubio/midi/midi_track.h
+include/aubio/midi/timer.h
+include/aubio/onset.h
+include/aubio/onsetdetection.h
+include/aubio/peakpick.h
+include/aubio/phasevoc.h
+include/aubio/pitchdetection.h
+include/aubio/pitchfcomb.h
+include/aubio/pitchmcomb.h
+include/aubio/pitchschmitt.h
+include/aubio/pitchyin.h
+include/aubio/pitchyinfft.h
+include/aubio/resample.h
+include/aubio/sample.h
+include/aubio/scale.h
+include/aubio/sndfileio.h
+include/aubio/tempo.h
+include/aubio/tss.h
+include/aubio/types.h
+lib/libaubio.a
+lib/libaubio.la
+@lib lib/libaubio.so.${LIBaubio_VERSION}
+lib/libaubioext.a
+lib/libaubioext.la
+@lib lib/libaubioext.so.${LIBaubioext_VERSION}
+lib/pkgconfig/aubio.pc
+lib/python${MODPY_VERSION}/site-packages/aubio/
+lib/python${MODPY_VERSION}/site-packages/aubio/__init__.py
+lib/python${MODPY_VERSION}/site-packages/aubio/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/aubio/__init__.pyo
+@comment lib/python${MODPY_VERSION}/site-packages/aubio/_aubiowrapper.a
+@comment lib/python${MODPY_VERSION}/site-packages/aubio/_aubiowrapper.la
+lib/python${MODPY_VERSION}/site-packages/aubio/_aubiowrapper.so
+lib/python${MODPY_VERSION}/site-packages/aubio/aubioclass.py
+lib/python${MODPY_VERSION}/site-packages/aubio/aubioclass.pyc
+lib/python${MODPY_VERSION}/site-packages/aubio/aubioclass.pyo
+lib/python${MODPY_VERSION}/site-packages/aubio/aubiowrapper.py
+lib/python${MODPY_VERSION}/site-packages/aubio/aubiowrapper.pyc
+lib/python${MODPY_VERSION}/site-packages/aubio/aubiowrapper.pyo
+lib/python${MODPY_VERSION}/site-packages/aubio/bench/
+lib/python${MODPY_VERSION}/site-packages/aubio/bench/__init__.py
+lib/python${MODPY_VERSION}/site-packages/aubio/bench/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/aubio/bench/__init__.pyo
+lib/python${MODPY_VERSION}/site-packages/aubio/bench/broadcast.py
+lib/python${MODPY_VERSION}/site-packages/aubio/bench/broadcast.pyc
+lib/python${MODPY_VERSION}/site-packages/aubio/bench/broadcast.pyo
+lib/python${MODPY_VERSION}/site-packages/aubio/bench/config.py
+lib/python${MODPY_VERSION}/site-packages/aubio/bench/config.pyc
+lib/python${MODPY_VERSION}/site-packages/aubio/bench/config.pyo
+lib/python${MODPY_VERSION}/site-packages/aubio/bench/node.py
+lib/python${MODPY_VERSION}/site-packages/aubio/bench/node.pyc
+lib/python${MODPY_VERSION}/site-packages/aubio/bench/node.pyo
+lib/python${MODPY_VERSION}/site-packages/aubio/bench/onset.py
+lib/python${MODPY_VERSION}/site-packages/aubio/gnuplot.py
+lib/python${MODPY_VERSION}/site-packages/aubio/median.py
+lib/python${MODPY_VERSION}/site-packages/aubio/median.pyc
+lib/python${MODPY_VERSION}/site-packages/aubio/median.pyo
+lib/python${MODPY_VERSION}/site-packages/aubio/onsetcompare.py
+lib/python${MODPY_VERSION}/site-packages/aubio/onsetcompare.pyc
+lib/python${MODPY_VERSION}/site-packages/aubio/onsetcompare.pyo
+lib/python${MODPY_VERSION}/site-packages/aubio/plot/
+lib/python${MODPY_VERSION}/site-packages/aubio/plot/__init__.py
+lib/python${MODPY_VERSION}/site-packages/aubio/plot/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/aubio/plot/__init__.pyo
+lib/python${MODPY_VERSION}/site-packages/aubio/plot/keyboard.py
+lib/python${MODPY_VERSION}/site-packages/aubio/task/
+lib/python${MODPY_VERSION}/site-packages/aubio/task/__init__.py
+lib/python${MODPY_VERSION}/site-packages/aubio/task/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/aubio/task/__init__.pyo
+lib/python${MODPY_VERSION}/site-packages/aubio/task/beat.py
+lib/python${MODPY_VERSION}/site-packages/aubio/task/cut.py
+lib/python${MODPY_VERSION}/site-packages/aubio/task/cut.pyc
+lib/python${MODPY_VERSION}/site-packages/aubio/task/cut.pyo
+lib/python${MODPY_VERSION}/site-packages/aubio/task/notes.py
+lib/python${MODPY_VERSION}/site-packages/aubio/task/onset.py
+lib/python${MODPY_VERSION}/site-packages/aubio/task/params.py
+lib/python${MODPY_VERSION}/site-packages/aubio/task/params.pyc
+lib/python${MODPY_VERSION}/site-packages/aubio/task/params.pyo
+lib/python${MODPY_VERSION}/site-packages/aubio/task/pitch.py
+lib/python${MODPY_VERSION}/site-packages/aubio/task/silence.py
+lib/python${MODPY_VERSION}/site-packages/aubio/task/silence.pyc
+lib/python${MODPY_VERSION}/site-packages/aubio/task/silence.pyo
+lib/python${MODPY_VERSION}/site-packages/aubio/task/task.py
+lib/python${MODPY_VERSION}/site-packages/aubio/task/task.pyc
+lib/python${MODPY_VERSION}/site-packages/aubio/task/task.pyo
+lib/python${MODPY_VERSION}/site-packages/aubio/task/utils.py
+lib/python${MODPY_VERSION}/site-packages/aubio/task/utils.pyc
+lib/python${MODPY_VERSION}/site-packages/aubio/task/utils.pyo
+lib/python${MODPY_VERSION}/site-packages/aubio/txtfile.py
+lib/python${MODPY_VERSION}/site-packages/aubio/txtfile.pyc
+lib/python${MODPY_VERSION}/site-packages/aubio/txtfile.pyo
+lib/python${MODPY_VERSION}/site-packages/aubio/web/
+lib/python${MODPY_VERSION}/site-packages/aubio/web/__init__.py
+lib/python${MODPY_VERSION}/site-packages/aubio/web/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/aubio/web/__init__.pyo
+lib/python${MODPY_VERSION}/site-packages/aubio/web/browser.py
+lib/python${MODPY_VERSION}/site-packages/aubio/web/browser.pyc
+lib/python${MODPY_VERSION}/site-packages/aubio/web/browser.pyo
+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
+share/sounds/
+share/sounds/aubio/
+share/sounds/aubio/woodblock.aiff

File audio/liblo/CVS/Entries

+/Makefile/1.3/Fri Aug 17 07:11:39 2012//
+/distinfo/1.1.1.1/Thu Aug 16 12:26:28 2012//
+D/patches////
+D/pkg////

File audio/liblo/CVS/Repository

+ports/audio/liblo

File audio/liblo/CVS/Root

+/home/jtr2/openbsd/mirror

File audio/liblo/Makefile

+# $OpenBSD: Makefile,v 1.3 2012/08/17 07:11:39 jasper Exp $
+
+COMMENT =		leightweight open sound control (OSC) implementation
+DISTNAME =		liblo-0.26
+SHARED_LIBS +=  lo                   0.0      # 7.0
+CATEGORIES =		audio
+HOMEPAGE =		http://liblo.sourceforge.net/
+REVISION =		1
+
+# LGPLv2+
+PERMIT_PACKAGE_CDROM =	Yes
+PERMIT_PACKAGE_FTP =	Yes
+PERMIT_DISTFILES_CDROM =Yes
+PERMIT_DISTFILES_FTP =	Yes
+
+WANTLIB =		c m pthread
+MASTER_SITES =		${MASTER_SITE_SOURCEFORGE:=liblo/}
+BUILD_DEPENDS =		devel/doxygen
+USE_LIBTOOL =		Yes
+CONFIGURE_STYLE =	gnu
+
+.include <bsd.port.mk>

File audio/liblo/distinfo

+MD5 (liblo-0.26.tar.gz) = U1HeFCYlYOFefyOGUpOxbw==
+RMD160 (liblo-0.26.tar.gz) = OAAl0NeSgLE5KdqC2y4JCKP0vjk=
+SHA1 (liblo-0.26.tar.gz) = IZQsjxnpgptYQsuFNS+YxJ37yCM=
+SHA256 (liblo-0.26.tar.gz) = pjb7CfgXitDVMD6U/sN7GC0wYqDj2u6F7tKjmrYjIlg=
+SIZE (liblo-0.26.tar.gz) = 519750

File audio/liblo/patches/CVS/Entries

+/patch-src_lo_types_internal_h/1.1.1.1/Thu Aug 16 12:26:28 2012//
+D

File audio/liblo/patches/CVS/Repository

+ports/audio/liblo/patches

File audio/liblo/patches/CVS/Root

+/home/jtr2/openbsd/mirror

File audio/liblo/patches/patch-src_lo_types_internal_h

+$OpenBSD: patch-src_lo_types_internal_h,v 1.1.1.1 2012/08/16 12:26:28 stsp Exp $
+--- src/lo_types_internal.h.orig	Mon Jan  2 19:04:53 2012
++++ src/lo_types_internal.h	Mon Jan  2 19:05:09 2012
+@@ -6,6 +6,7 @@
+ #endif
+ 
+ #ifdef HAVE_SYS_SOCKET_H
++#include <sys/types.h>
+ #include <sys/socket.h>
+ #endif
+ 

File audio/liblo/pkg/CVS/Entries

+/DESCR/1.1.1.1/Thu Aug 16 12:26:28 2012//
+/PFRAG.shared/1.1.1.1/Thu Aug 16 12:26:28 2012//
+/PLIST/1.1.1.1/Thu Aug 16 12:26:28 2012//
+D

File audio/liblo/pkg/CVS/Repository

+ports/audio/liblo/pkg

File audio/liblo/pkg/CVS/Root

+/home/jtr2/openbsd/mirror

File audio/liblo/pkg/DESCR

+liblo is a lightweight library that provides an easy to use implementation of
+the OSC protocol. For more information about the OSC protocol, please see:
+- http://www.cnmat.berkeley.edu/OpenSoundControl/
+- http://www.opensoundcontrol.org/

File audio/liblo/pkg/PFRAG.shared

+@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2012/08/16 12:26:28 stsp Exp $
+@lib lib/liblo.so.${LIBlo_VERSION}

File audio/liblo/pkg/PLIST

+@comment $OpenBSD: PLIST,v 1.1.1.1 2012/08/16 12:26:28 stsp Exp $
+%%SHARED%%
+@bin bin/oscdump
+@bin bin/oscsend
+include/lo/
+include/lo/lo.h
+include/lo/lo_endian.h
+include/lo/lo_errors.h
+include/lo/lo_lowlevel.h
+include/lo/lo_macros.h
+include/lo/lo_osc_types.h
+include/lo/lo_throw.h
+include/lo/lo_types.h
+lib/liblo.a
+lib/liblo.la
+lib/pkgconfig/
+lib/pkgconfig/liblo.pc

File databases/CVS/Entries

 D/node-sqlite3////
 D/tinycdb////
 D/ports-readmes////
-/Makefile/1.216/Sat Jun 30 11:02:22 2012//
+/Makefile/1.217/Fri Aug 17 11:05:51 2012//
+D/luadbi////

File databases/Makefile

-# $OpenBSD: Makefile,v 1.216 2012/06/29 16:38:21 jeremy Exp $
+# $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 $
 #
      SUBDIR =
      SUBDIR += libdbi
      SUBDIR += libdbi-drivers
      SUBDIR += libpqxx
+     SUBDIR += luadbi
      SUBDIR += luasqlite3
      SUBDIR += luma
      SUBDIR += mdbtools/snapshot

File databases/luadbi/CVS/Entries

+/Makefile/1.1.1.1/Thu Aug 16 15:21:30 2012//
+/distinfo/1.1.1.1/Thu Aug 16 15:21:30 2012//
+D/patches////
+D/pkg////

File databases/luadbi/CVS/Repository

+ports/databases/luadbi

File databases/luadbi/CVS/Root

+/home/jtr2/openbsd/mirror

File databases/luadbi/Makefile

+# $OpenBSD: Makefile,v 1.1.1.1 2012/08/16 15:21:30 jasper Exp $
+
+SHARED_ONLY=	Yes
+
+COMMENT-main=	database interface library for Lua (including SQLite3)
+COMMENT-mysql=	MySQL driver for luadbi
+COMMENT-pgsql=	PostgreSQL driver for luadbi
+
+V=		0.5
+DISTNAME=	luadbi.$V
+PKGNAME-main=	luadbi-$V
+PKGNAME-mysql=	luadbi-mysql-$V
+PKGNAME-pgsql=	luadbi-pgsql-$V
+
+CATEGORIES=	databases
+
+HOMEPAGE=	http://luadbi.googlecode.com/
+
+# MIT
+PERMIT_PACKAGE_CDROM=	Yes
+PERMIT_PACKAGE_FTP=	Yes
+PERMIT_DISTFILES_CDROM=	Yes
+PERMIT_DISTFILES_FTP=	Yes
+
+MASTER_SITES=		${HOMEPAGE}/files/
+
+MULTI_PACKAGES=		-main -mysql -pgsql
+
+WANTLIB-main=		sqlite3
+RUN_DEPENDS-main=	#empty
+
+WANTLIB-mysql=		mysqlclient
+LIB_DEPENDS-mysql=	databases/mysql
+RUN_DEPENDS-mysql=	${BASE_PKGPATH},-main
+
+WANTLIB-pgsql=		pq
+BUILD_DEPENDS-pgsql=	databases/postgresql,-server
+LIB_DEPENDS-pgsql=	databases/postgresql
+RUN_DEPENDS-pgsql=	${BASE_PKGPATH},-main
+
+MODULES=		lang/lua
+
+USE_GMAKE=		Yes
+
+ALL_TARGET=		free # == sqlite3 mysql postgresql
+NO_REGRESS=		Yes
+
+MAKE_FLAGS=	CC="${CC}" \
+		COMMON_LDFLAGS="-L${LOCALBASE}/lib" \
+		CFLAGS="${CFLAGS} -I${MODLUA_INCL_DIR} -I${LOCALBASE}/include/mysql \
+			-I${LOCALBASE}/include/postgresql/ -I${LOCALBASE}/include/postgresql/server \
+			-I. -fpic -shared"
+
+WRKDIST=	${WRKDIR}
+
+do-install:
+	${INSTALL_DATA_DIR} ${MODLUA_LIBDIR} ${MODLUA_DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/DBI.lua ${MODLUA_DATADIR}
+# XXX: Not using INSTALL_PROGRAM, it strips the library.
+	${INSTALL_SCRIPT} ${WRKSRC}/*.so ${MODLUA_LIBDIR}
+
+.include <bsd.port.mk>

File databases/luadbi/distinfo

+SHA256 (luadbi.0.5.tar.gz) = SRFkWN2ABSU2v11+KyofWg+kKmcc538ctzVe9/rrMx4=
+SIZE (luadbi.0.5.tar.gz) = 22454

File databases/luadbi/patches/CVS/Entries

+/patch-dbd_sqlite3_connection_c/1.1.1.1/Thu Aug 16 15:21:30 2012//
+/patch-dbd_sqlite3_dbd_sqlite3_h/1.1.1.1/Thu Aug 16 15:21:30 2012//
+/patch-dbd_sqlite3_statement_c/1.1.1.1/Thu Aug 16 15:21:30 2012//
+D

File databases/luadbi/patches/CVS/Repository

+ports/databases/luadbi/patches

File databases/luadbi/patches/CVS/Root

+/home/jtr2/openbsd/mirror

File databases/luadbi/patches/patch-dbd_sqlite3_connection_c

+$OpenBSD: patch-dbd_sqlite3_connection_c,v 1.1.1.1 2012/08/16 15:21:30 jasper Exp $
+
+Fix DBD.SQLite3 transaction handling
+From upstream svn rev 75
+
+--- dbd/sqlite3/connection.c.orig	Sat May  1 06:25:12 2010
++++ dbd/sqlite3/connection.c	Sun Jul 22 22:23:54 2012
+@@ -9,20 +9,37 @@ static int run(connection_t *conn, const char *command
+ }
+ 
+ static int commit(connection_t *conn) {
+-    return run(conn, "COMMIT");
++    conn->txn_in_progress = 0;
++    return run(conn, "COMMIT TRANSACTION");
+ }
+ 
+ 
+ static int begin(connection_t *conn) {
+-    return run(conn, "BEGIN");
+-}
++    int err = 0;
+ 
++    if (conn->txn_in_progress) {
++        err = 0;
++    } else {
++        conn->txn_in_progress = 1;
++        err = run(conn, "BEGIN TRANSACTION");
++    }
+ 
++    return err;
++}
++
+ static int rollback(connection_t *conn) {
+-    return run(conn, "ROLLBACK");
++    conn->txn_in_progress = 0;
++    return run(conn, "ROLLBACK TRANSACTION");
+ }
+ 
++int try_begin_transaction(connection_t *conn) {
++    if (conn->autocommit) {
++        return 1;
++    }
+ 
++    return begin(conn) == 0;
++}
++
+ /* 
+  * connection,err = DBD.SQLite3.New(dbfile)
+  */
+@@ -50,7 +67,7 @@ static int connection_new(lua_State *L) {
+     }
+ 
+     conn->autocommit = 0;
+-    begin(conn);
++    conn->txn_in_progress = 0;
+ 
+     luaL_getmetatable(L, DBD_SQLITE_CONNECTION);
+     lua_setmetatable(L, -2);
+@@ -67,10 +84,13 @@ static int connection_autocommit(lua_State *L) {
+     int err = 1;
+ 
+     if (conn->sqlite) {
+-	if (on)
++	if (on) {
+ 	    err = rollback(conn);
++        }
++        /*
+ 	else
+ 	    err = begin(conn);
++        */
+ 
+ 	conn->autocommit = on;	
+     }
+@@ -88,6 +108,7 @@ static int connection_close(lua_State *L) {
+     int disconnect = 0;   
+ 
+     if (conn->sqlite) {
++        rollback(conn);
+ 	sqlite3_close(conn->sqlite);
+ 	disconnect = 1;
+ 	conn->sqlite = NULL;
+@@ -105,12 +126,7 @@ static int connection_commit(lua_State *L) {
+     int err = 1;
+ 
+     if (conn->sqlite) {
+-	commit(conn);
+-
+-	if (!conn->autocommit)
+-	    err = begin(conn);
+-	else
+-	    err = 1;
++	err = commit(conn);
+     }
+ 
+     lua_pushboolean(L, !err);
+@@ -176,12 +192,14 @@ static int connection_rollback(lua_State *L) {
+     int err = 1;
+ 
+     if (conn->sqlite) {
+-	rollback(conn);
++	err =rollback(conn);
+ 
++        /*
+ 	if (!conn->autocommit)
+ 	    err = begin(conn);
+ 	else
+ 	    err = 1;
++        */
+     }
+ 
+     lua_pushboolean(L, !err);

File databases/luadbi/patches/patch-dbd_sqlite3_dbd_sqlite3_h

+$OpenBSD: patch-dbd_sqlite3_dbd_sqlite3_h,v 1.1.1.1 2012/08/16 15:21:30 jasper Exp $
+
+Fix DBD.SQLite3 transaction handling
+From upstream svn rev 75
+
+--- dbd/sqlite3/dbd_sqlite3.h.orig	Fri Dec 19 07:33:32 2008
++++ dbd/sqlite3/dbd_sqlite3.h	Sun Jul 22 22:23:54 2012
+@@ -10,14 +10,15 @@
+ typedef struct _connection {
+     sqlite3 *sqlite;
+     int autocommit;
++    int txn_in_progress;
+ } connection_t;
+ 
+ /*
+  * statement object
+  */
+ typedef struct _statement {
++    connection_t *conn;
+     sqlite3_stmt *stmt;
+-    sqlite3 *sqlite;
+     int more_data;
+     int affected;
+ } statement_t;

File databases/luadbi/patches/patch-dbd_sqlite3_statement_c

+$OpenBSD: patch-dbd_sqlite3_statement_c,v 1.1.1.1 2012/08/16 15:21:30 jasper Exp $
+
+Fix DBD.SQLite3 transaction handling
+From upstream svn rev 75
+
+--- dbd/sqlite3/statement.c.orig	Sat May  1 06:25:12 2010
++++ dbd/sqlite3/statement.c	Sun Jul 22 22:23:54 2012
+@@ -1,5 +1,8 @@
+ #include "dbd_sqlite3.h"
+ 
++extern int try_begin_transaction(connection_t *conn);
++extern int try_end_transaction(connection_t *conn);
++
+ /*
+  * Converts SQLite types to Lua types
+  */
+@@ -128,10 +131,12 @@ static int statement_execute(lua_State *L) {
+      */
+     if (sqlite3_reset(statement->stmt) != SQLITE_OK) {
+ 	lua_pushboolean(L, 0);
+-	lua_pushfstring(L, DBI_ERR_EXECUTE_FAILED, sqlite3_errmsg(statement->sqlite));
++	lua_pushfstring(L, DBI_ERR_EXECUTE_FAILED, sqlite3_errmsg(statement->conn->sqlite));
+ 	return 2;
+     }
+ 
++    sqlite3_clear_bindings(statement->stmt);
++
+     expected_params = sqlite3_bind_parameter_count(statement->stmt);
+     if (expected_params != num_bind_params) {
+ 	/*
+@@ -180,18 +185,20 @@ static int statement_execute(lua_State *L) {
+ 	if (errstr)
+ 	    lua_pushfstring(L, DBI_ERR_BINDING_PARAMS, errstr);
+ 	else
+-	    lua_pushfstring(L, DBI_ERR_BINDING_PARAMS, sqlite3_errmsg(statement->sqlite));
++	    lua_pushfstring(L, DBI_ERR_BINDING_PARAMS, sqlite3_errmsg(statement->conn->sqlite));
+     
+ 	return 2;
+     }
++    
++    try_begin_transaction(statement->conn);
+ 
+     if (!step(statement)) {
+ 	lua_pushboolean(L, 0);
+-	lua_pushfstring(L, DBI_ERR_EXECUTE_FAILED, sqlite3_errmsg(statement->sqlite));
++	lua_pushfstring(L, DBI_ERR_EXECUTE_FAILED, sqlite3_errmsg(statement->conn->sqlite));
+ 	return 2;
+     }
+ 
+-    statement->affected = sqlite3_changes(statement->sqlite);
++    statement->affected = sqlite3_changes(statement->conn->sqlite);
+ 
+     lua_pushboolean(L, 1);
+     return 1;
+@@ -283,7 +290,7 @@ static int statement_fetch_impl(lua_State *L, statemen
+ 	    /* 
+ 	     * reset needs to be called to retrieve the 'real' error message
+ 	     */
+-	    luaL_error(L, DBI_ERR_FETCH_FAILED, sqlite3_errmsg(statement->sqlite));
++	    luaL_error(L, DBI_ERR_FETCH_FAILED, sqlite3_errmsg(statement->conn->sqlite));
+ 	}
+     }
+ 
+@@ -357,14 +364,14 @@ int dbd_sqlite3_statement_create(lua_State *L, connect
+     statement_t *statement = NULL;
+ 
+     statement = (statement_t *)lua_newuserdata(L, sizeof(statement_t));
+-    statement->sqlite = conn->sqlite;
++    statement->conn = conn;
+     statement->stmt = NULL;
+     statement->more_data = 0;
+     statement->affected = 0;
+ 
+-    if (sqlite3_prepare_v2(statement->sqlite, sql_query, strlen(sql_query), &statement->stmt, NULL) != SQLITE_OK) {
++    if (sqlite3_prepare_v2(statement->conn->sqlite, sql_query, strlen(sql_query), &statement->stmt, NULL) != SQLITE_OK) {
+ 	lua_pushnil(L);
+-	lua_pushfstring(L, DBI_ERR_PREP_STATEMENT, sqlite3_errmsg(statement->sqlite));	
++	lua_pushfstring(L, DBI_ERR_PREP_STATEMENT, sqlite3_errmsg(statement->conn->sqlite));	
+ 	return 2;
+     } 
+ 

File databases/luadbi/pkg/CVS/Entries

+/DESCR-main/1.1.1.1/Thu Aug 16 15:21:30 2012//
+/DESCR-mysql/1.1.1.1/Thu Aug 16 15:21:30 2012//
+/DESCR-pgsql/1.1.1.1/Thu Aug 16 15:21:30 2012//
+/PLIST-main/1.1.1.1/Thu Aug 16 15:21:30 2012//
+/PLIST-mysql/1.1.1.1/Thu Aug 16 15:21:30 2012//
+/PLIST-pgsql/1.1.1.1/Thu Aug 16 15:21:30 2012//
+D

File databases/luadbi/pkg/CVS/Repository

+ports/databases/luadbi/pkg

File databases/luadbi/pkg/CVS/Root

+/home/jtr2/openbsd/mirror

File databases/luadbi/pkg/DESCR-main

+LuaDBI is a database interface library for Lua. It is designed to
+provide a RDBMS agnostic API for handling database operations. LuaDBI
+also provides support for prepared statement handles, placeholders and
+bind parameters for all database operations.

File databases/luadbi/pkg/DESCR-mysql

+MySQL driver for luadbi.

File databases/luadbi/pkg/DESCR-pgsql

+PostgreSQL driver for luadbi.

File databases/luadbi/pkg/PLIST-main

+@comment $OpenBSD: PLIST-main,v 1.1.1.1 2012/08/16 15:21:30 jasper Exp $
+lib/lua/${MODLUA_VERSION}/dbdsqlite3.so
+share/lua/${MODLUA_VERSION}/DBI.lua

File databases/luadbi/pkg/PLIST-mysql

+@comment $OpenBSD: PLIST-mysql,v 1.1.1.1 2012/08/16 15:21:30 jasper Exp $
+lib/lua/${MODLUA_VERSION}/dbdmysql.so

File databases/luadbi/pkg/PLIST-pgsql

+@comment $OpenBSD: PLIST-pgsql,v 1.1.1.1 2012/08/16 15:21:30 jasper Exp $
+lib/lua/${MODLUA_VERSION}/dbdpostgresql.so

File graphics/cairo/CVS/Entries

 D/patches////
 D/pkg////
-/Makefile/1.37/Tue Jan  3 00:43:00 2012//
-/distinfo/1.18/Mon Jan  2 23:40:43 2012//
+/Makefile/1.39/Fri Aug 17 11:11:29 2012//
+/distinfo/1.19/Fri Aug 17 11:11:29 2012//

File graphics/cairo/Makefile

-# $OpenBSD: Makefile,v 1.37 2011/11/01 20:30:49 jasper Exp $
+# $OpenBSD: Makefile,v 1.39 2012/08/17 07:58:50 ajacoutot Exp $
 
 COMMENT=		vector graphics library
 
-DISTNAME=		cairo-1.10.2
-REVISION=		3
-SHARED_LIBS=		cairo 11.1
-SHARED_LIBS+=		cairo-trace 0.0
-SHARED_LIBS+=		cairo-gobject 0.0
-SHARED_LIBS+=		cairo-script-interpreter 0.0
+DISTNAME=		cairo-1.12.2
+SHARED_LIBS+=		cairo 12.0
+SHARED_LIBS+=		cairo-trace 1.0
+SHARED_LIBS+=		cairo-gobject 1.0
+SHARED_LIBS+=		cairo-script-interpreter 1.0
 CATEGORIES=		graphics
+EXTRACT_SUFX=		.tar.xz
+REVISION=		0
 
-HOMEPAGE=		http://cairographics.org/introduction
+HOMEPAGE=		http://cairographics.org/
 
 MAINTAINER=		Eric Faurot <eric@openbsd.org>
 
 WANTLIB=		GL X11 Xau Xdamage Xdmcp Xext Xfixes Xrender \
-			Xxf86vm drm expat fontconfig freetype glib-2.0 \
+			Xxf86vm drm expat ffi fontconfig freetype glib-2.0 \
 			gobject-2.0 gthread-2.0 m pcre pixman-1 png \
-			pthread-stubs xcb xcb-render xcb-shm z ffi stdc++
+			pthread-stubs stdc++ xcb xcb-render xcb-shm z
 
 # LGPLv2.1 / MPL 1.1
 PERMIT_PACKAGE_CDROM=	Yes
 			devel/glib2
 
 CONFIGURE_STYLE=	gnu
-CONFIGURE_ENV=		PTHREAD_LIBS="-pthread"
-CONFIGURE_ARGS=		--enable-gl \
+CONFIGURE_ARGS=		${CONFIGURE_SHARED} \
+			--enable-gl \
 			--enable-tee \
-			--enable-xml \
-			--enable-xcb
-
-REGRESS_DEPENDS=	print/ghostscript/gnu
+			--enable-xml
 
 .include <bsd.port.mk>
-
-.for i in ${GCC2_ARCHS}
-. if ${MACHINE_ARCH} == $i
-PATCH_LIST=	patch-* gcc2-patch-*
-. endif
-.endfor

File graphics/cairo/distinfo

-MD5 (cairo-1.10.2.tar.gz) = 8QGp6It4MzeyCy4m39JtXw==
-RMD160 (cairo-1.10.2.tar.gz) = jI3gASA5j+KzpgoI/1mkZLLuv0c=
-SHA1 (cairo-1.10.2.tar.gz) = zM5a4D+ZxQXbl8KGoMmpCpJtPG4=
-SHA256 (cairo-1.10.2.tar.gz) = MgGMeZg1juvCrVeP+NhVnTT8gCUglfEQpXLtI9mJ/EE=
-SIZE (cairo-1.10.2.tar.gz) = 23558405
+SHA256 (cairo-1.12.2.tar.xz) = t4a8SnBUK8sJ8tnRPl5qDIZAjL9tHt3l8N6Afuz5P5Y=
+SIZE (cairo-1.12.2.tar.xz) = 42051584

File graphics/cairo/patches/CVS/Entries

-/gcc2-patch-src_cairo-gl-private_h/1.1/Mon Jan  2 23:40:43 2012//
-/patch-configure/1.9/Mon Jan  2 23:40:43 2012//
-/patch-src_Makefile_in/1.6/Mon Jan  2 23:40:43 2012//
-/patch-src_cairo-xlib-display_c/1.1/Mon Jan  2 23:40:43 2012//
+/patch-configure/1.10/Fri Aug 17 11:11:29 2012//
+/patch-src_cairo-polygon-reduce_c/1.1/Thu Aug 16 17:03:18 2012//
+/patch-util_Makefile_in/1.1/Thu Aug 16 17:03:18 2012//
+/patch-util_cairo-fdr_Makefile_in/1.1/Thu Aug 16 17:03:18 2012//
 D

File graphics/cairo/patches/gcc2-patch-src_cairo-gl-private_h

-remove unnamed union to please gcc-2.95
-
-$OpenBSD: gcc2-patch-src_cairo-gl-private_h,v 1.1 2011/01/05 13:26:05 eric Exp $
---- src/cairo-gl-private.h.orig	Mon Jan  3 12:23:14 2011
-+++ src/cairo-gl-private.h	Mon Jan  3 12:23:40 2011
-@@ -142,7 +142,6 @@ typedef enum cairo_gl_var_type {
-  */
- typedef struct cairo_gl_operand {
-     cairo_gl_operand_type_t type;
--    union {
- 	struct {
- 	    GLuint tex;
- 	    cairo_gl_surface_t *surface;
-@@ -167,7 +166,6 @@ typedef struct cairo_gl_operand {
- 	    float radius_1;
-             cairo_extend_t extend;
- 	} radial;
--    };
-     unsigned int vertex_offset;
- } cairo_gl_operand_t;
- 

File graphics/cairo/patches/patch-configure

-$OpenBSD: patch-configure,v 1.9 2011/06/28 11:04:40 kili Exp $
+$OpenBSD: patch-configure,v 1.10 2012/08/16 17:03:18 eric Exp $
 
 Use `Requires', not `Requires.private', because otherwise libraries
 required for linking aren't exposed.
 
---- configure.orig	Sat Dec 25 15:22:57 2010
-+++ configure	Tue Jun 28 12:27:44 2011
-@@ -16983,10 +16983,7 @@ if test "x$PKG_CONFIG" = x; then
+--- configure.orig	Sun Apr 29 14:49:59 2012
++++ configure	Mon Aug  6 00:31:32 2012
+@@ -17696,10 +17696,7 @@ if test "x$PKG_CONFIG" = x; then
  	as_fn_error $? "pkg-config >= $PKGCONFIG_REQUIRED required but not found (http://pkgconfig.freedesktop.org/)" "$LINENO" 5
  fi
  

File graphics/cairo/patches/patch-src_Makefile_in

-$OpenBSD: patch-src_Makefile_in,v 1.6 2011/01/05 13:26:05 eric Exp $
---- src/Makefile.in.orig	Sat Dec 25 15:22:52 2010
-+++ src/Makefile.in	Mon Dec 27 10:07:21 2010
-@@ -2429,7 +2429,7 @@ cairo.def: cairo-features.h $(enabled_cairo_headers)
- 	) >$@
- 	@ ! grep -q cairo_ERROR $@ || ($(RM) $@; false)
- 
--check: headers-standalone
-+check:
- 
- # The pre-processed result is used by check-{def,plt}.sh to determine whether
- # cairo has been compiled with symbol hiding.

File graphics/cairo/patches/patch-src_cairo-polygon-reduce_c

+polygon-reduce: Reduce broken stopped-edge continuation
+
+This is hopefully a lesser used path and the attempted optimisation to
+continue a stopped edge with a colinear stopped edge highly unlikely and
+lost in the noise of the general inefficiency of the routine. As it was
+broken, rather than attempt to rectify the "optimisation" remove it.
+
+$OpenBSD: patch-src_cairo-polygon-reduce_c,v 1.1 2012/08/16 17:03:18 eric Exp $
+--- src/cairo-polygon-reduce.c.orig	Thu Apr 19 14:17:58 2012
++++ src/cairo-polygon-reduce.c	Sun Aug  5 10:17:23 2012
+@@ -42,6 +42,8 @@
+ #include "cairo-freelist-private.h"
+ #include "cairo-combsort-inline.h"
+ 
++#define DEBUG_POLYGON 0
++
+ typedef cairo_point_t cairo_bo_point32_t;
+ 
+ typedef struct _cairo_bo_intersect_ordinate {
+@@ -114,7 +116,6 @@ typedef struct _cairo_bo_event_queue {
+ 
+ typedef struct _cairo_bo_sweep_line {
+     cairo_bo_edge_t *head;
+-    cairo_bo_edge_t *stopped;
+     int32_t current_y;
+     cairo_bo_edge_t *current_edge;
+ } cairo_bo_sweep_line_t;
+@@ -476,8 +477,8 @@ edges_compare_x_for_y (const cairo_bo_edge_t *a,
+ static inline int
+ _line_equal (const cairo_line_t *a, const cairo_line_t *b)
+ {
+-    return a->p1.x == b->p1.x && a->p1.y == b->p1.y &&
+-           a->p2.x == b->p2.x && a->p2.y == b->p2.y;
++    return (a->p1.x == b->p1.x && a->p1.y == b->p1.y &&
++	    a->p2.x == b->p2.x && a->p2.y == b->p2.y);
+ }
+ 
+ static int
+@@ -1024,7 +1025,6 @@ static void
+ _cairo_bo_sweep_line_init (cairo_bo_sweep_line_t *sweep_line)
+ {
+     sweep_line->head = NULL;
+-    sweep_line->stopped = NULL;
+     sweep_line->current_y = INT32_MIN;
+     sweep_line->current_edge = NULL;
+ }
+@@ -1139,6 +1139,8 @@ edges_colinear (const cairo_bo_edge_t *a, const cairo_
+      */
+     if (a->edge.line.p1.y == b->edge.line.p1.y) {
+ 	return a->edge.line.p1.x == b->edge.line.p1.x;
++    } else if (a->edge.line.p2.y == b->edge.line.p2.y) {
++	return a->edge.line.p2.x == b->edge.line.p2.x;
+     } else if (a->edge.line.p1.y < b->edge.line.p1.y) {
+ 	return edge_compare_for_y_against_x (b,
+ 					     a->edge.line.p1.y,
+@@ -1205,82 +1207,48 @@ _active_edges_to_polygon (cairo_bo_edge_t		*left,
+ 			  cairo_polygon_t	        *polygon)
+ {
+     cairo_bo_edge_t *right;
++    unsigned int mask;
+ 
+-    if (fill_rule == CAIRO_FILL_RULE_WINDING) {
+-	while (left != NULL) {
+-	    int in_out = left->edge.dir;
++    if (fill_rule == CAIRO_FILL_RULE_WINDING)
++	mask = ~0;
++    else
++	mask = 1;
+ 
+-	    right = left->next;
+-	    if (left->deferred.right == NULL) {
+-		while (right != NULL && right->deferred.right == NULL)
+-		    right = right->next;
++    while (left != NULL) {
++	int in_out = left->edge.dir;
+ 
+-		if (right != NULL && edges_colinear (left, right)) {
+-		    /* continuation on left */
+-		    left->deferred = right->deferred;
+-		    right->deferred.right = NULL;
+-		}
+-	    }
+-
+-	    right = left->next;
+-	    while (right != NULL) {
+-		if (right->deferred.right != NULL)
+-		    _cairo_bo_edge_end (right, top, polygon);
+-
+-		in_out += right->edge.dir;
+-		if (in_out == 0) {
+-		    cairo_bo_edge_t *next;
+-		    cairo_bool_t skip = FALSE;
+-
+-		    /* skip co-linear edges */
+-		    next = right->next;
+-		    if (next != NULL)
+-			skip = edges_colinear (right, next);
+-
+-		    if (! skip)
+-			break;
+-		}
+-
++	right = left->next;
++	if (left->deferred.right == NULL) {
++	    while (right != NULL && right->deferred.right == NULL)
+ 		right = right->next;
+-	    }
+ 
+-	    _cairo_bo_edge_start_or_continue (left, right, top, polygon);
+-
+-	    left = right;
+-	    if (left != NULL)
+-		left = left->next;
++	    if (right != NULL && edges_colinear (left, right)) {
++		/* continuation on left */
++		left->deferred = right->deferred;
++		right->deferred.right = NULL;
++	    }
+ 	}
+-    } else {
+-	while (left != NULL) {
+-	    int in_out = 0;
+ 
+-	    right = left->next;
+-	    while (right != NULL) {
+-		if (right->deferred.right != NULL)
+-		    _cairo_bo_edge_end (right, top, polygon);
++	right = left->next;
++	while (right != NULL) {
++	    if (right->deferred.right != NULL)
++		_cairo_bo_edge_end (right, top, polygon);
+ 
+-		if ((in_out++ & 1) == 0) {
+-		    cairo_bo_edge_t *next;
+-		    cairo_bool_t skip = FALSE;
+-
+-		    /* skip co-linear edges */
+-		    next = right->next;
+-		    if (next != NULL)
+-			skip = edges_colinear (right, next);
+-
+-		    if (! skip)
+-			break;
+-		}
+-
+-		right = right->next;
++	    in_out += right->edge.dir;
++	    if ((in_out & mask) == 0) {
++		/* skip co-linear edges */
++		if (right->next == NULL || !edges_colinear (right, right->next))
++		    break;
+ 	    }
+ 
+-	    _cairo_bo_edge_start_or_continue (left, right, top, polygon);
+-
+-	    left = right;
+-	    if (left != NULL)
+-		left = left->next;
++	    right = right->next;
+ 	}
++
++	_cairo_bo_edge_start_or_continue (left, right, top, polygon);
++
++	left = right;
++	if (left != NULL)
++	    left = left->next;
+     }
+ }
+ 
+@@ -1303,12 +1271,6 @@ _cairo_bentley_ottmann_tessellate_bo_edges (cairo_bo_e
+ 
+     while ((event = _cairo_bo_event_dequeue (&event_queue))) {
+ 	if (event->point.y != sweep_line.current_y) {
+-	    for (e1 = sweep_line.stopped; e1; e1 = e1->next) {
+-		if (e1->deferred.right != NULL)
+-		     _cairo_bo_edge_end (e1, e1->edge.bottom, polygon);
+-	    }
+-	    sweep_line.stopped = NULL;
+-
+ 	    _active_edges_to_polygon (sweep_line.head,
+ 				      sweep_line.current_y,
+ 				      fill_rule, polygon);
+@@ -1328,23 +1290,6 @@ _cairo_bentley_ottmann_tessellate_bo_edges (cairo_bo_e
+ 	    if (unlikely (status))
+ 		goto unwind;
+ 
+-	    /* check to see if this is a continuation of a stopped edge */
+-	    /* XXX change to an infinitesimal lengthening rule */
+-	    for (left = sweep_line.stopped; left; left = left->next) {
+-		if (e1->edge.top <= left->edge.bottom &&
+-		    edges_colinear (e1, left))
+-		{
+-		    e1->deferred = left->deferred;
+-		    if (left->prev != NULL)
+-			left->prev = left->next;
+-		    else
+-			sweep_line.stopped = left->next;
+-		    if (left->next != NULL)
+-			left->next->prev = left->prev;
+-		    break;
+-		}
+-	    }
+-
+ 	    left = e1->prev;
+ 	    right = e1->next;
+ 
+@@ -1371,14 +1316,8 @@ _cairo_bentley_ottmann_tessellate_bo_edges (cairo_bo_e
+ 
+ 	    _cairo_bo_sweep_line_delete (&sweep_line, e1);
+ 
+-	    /* first, check to see if we have a continuation via a fresh edge */
+-	    if (e1->deferred.right != NULL) {
+-		e1->next = sweep_line.stopped;
+-		if (sweep_line.stopped != NULL)
+-		    sweep_line.stopped->prev = e1;
+-		sweep_line.stopped = e1;
+-		e1->prev = NULL;
+-	    }
++	    if (e1->deferred.right != NULL)
++		_cairo_bo_edge_end (e1, e1->edge.bottom, polygon);
+ 
+ 	    if (left != NULL && right != NULL) {
+ 		status = _cairo_bo_event_queue_insert_if_intersect_below_current_y (&event_queue, left, right);
+@@ -1420,10 +1359,6 @@ _cairo_bentley_ottmann_tessellate_bo_edges (cairo_bo_e
+ 	}
+     }
+ 
+-    for (e1 = sweep_line.stopped; e1; e1 = e1->next) {
+-	if (e1->deferred.right != NULL)
+-	    _cairo_bo_edge_end (e1, e1->edge.bottom, polygon);
+-    }
+  unwind:
+     _cairo_bo_event_queue_fini (&event_queue);
+ 
+@@ -1447,6 +1382,12 @@ _cairo_polygon_reduce (cairo_polygon_t *polygon,
+     if (unlikely (0 == num_events))
+ 	return CAIRO_STATUS_SUCCESS;
+ 
++    if (DEBUG_POLYGON) {
++	FILE *file = fopen ("reduce_in.txt", "w");
++	_cairo_debug_print_polygon (file, polygon);
++	fclose (file);
++    }
++
+     events = stack_events;
+     event_ptrs = stack_event_ptrs;
+     if (num_events > ARRAY_LENGTH (stack_events)) {
+@@ -1482,10 +1423,16 @@ _cairo_polygon_reduce (cairo_polygon_t *polygon,
+ 							 num_events,
+ 							 fill_rule,
+ 							 polygon);
+-     polygon->num_limits = num_limits;
++    polygon->num_limits = num_limits;
+ 
+     if (events != stack_events)
+ 	free (events);
++
++    if (DEBUG_POLYGON) {
++	FILE *file = fopen ("reduce_out.txt", "w");
++	_cairo_debug_print_polygon (file, polygon);
++	fclose (file);
++    }
+ 
+     return status;
+ }

File graphics/cairo/patches/patch-src_cairo-xlib-display_c

-$OpenBSD: patch-src_cairo-xlib-display_c,v 1.1 2010/10/17 12:50:53 eric Exp $
---- src/cairo-xlib-display.c.orig	Sat Oct 16 13:08:38 2010
-+++ src/cairo-xlib-display.c	Sat Oct 16 13:08:56 2010
-@@ -353,11 +353,7 @@ _cairo_xlib_device_create (Display *dpy)
-     /* Prior to Render 0.10, there is no protocol support for gradients and
-      * we call function stubs instead, which would silently consume the drawing.
-      */
--#if RENDER_MAJOR == 0 && RENDER_MINOR < 10
-     display->buggy_gradients = TRUE;
--#else
--    display->buggy_gradients = FALSE;
--#endif
-     display->buggy_pad_reflect = FALSE;
-     display->buggy_repeat = FALSE;
- 

File graphics/cairo/patches/patch-util_Makefile_in

+$OpenBSD: patch-util_Makefile_in,v 1.1 2012/08/16 17:03:18 eric Exp $
+--- util/Makefile.in.orig	Sun Jul 29 23:41:25 2012
++++ util/Makefile.in	Sun Jul 29 23:41:45 2012
+@@ -61,7 +61,6 @@ check_PROGRAMS =
+ @CAIRO_HAS_INTERPRETER_TRUE@am__append_2 = cairo-script
+ @CAIRO_HAS_TRACE_TRUE@am__append_3 = cairo-trace
+ @CAIRO_HAS_DLSYM_TRUE@@CAIRO_HAS_SCRIPT_SURFACE_TRUE@@CAIRO_HAS_TEE_SURFACE_TRUE@@CAIRO_HAS_TRACE_TRUE@am__append_4 = cairo-fdr
+-@BUILD_SPHINX_TRUE@@CAIRO_HAS_DLSYM_TRUE@@CAIRO_HAS_SCRIPT_SURFACE_TRUE@@CAIRO_HAS_TEE_SURFACE_TRUE@am__append_5 = cairo-sphinx
+ @CAIRO_HAS_INTERPRETER_TRUE@am__append_6 = trace-to-xml xml-to-trace
+ 
+ #malloc_stats_la_LIBADD  = $(backtrace_symbols_la_LIBADD) backtrace-symbols.lo

File graphics/cairo/patches/patch-util_cairo-fdr_Makefile_in

+$OpenBSD: patch-util_cairo-fdr_Makefile_in,v 1.1 2012/08/16 17:03:18 eric Exp $
+--- util/cairo-fdr/Makefile.in.orig	Sun Apr 29 20:49:57 2012
++++ util/cairo-fdr/Makefile.in	Thu Aug 16 18:08:18 2012
+@@ -376,8 +376,8 @@ AM_CPPFLAGS = -I$(top_srcdir)/src \
+ cairo_fdr_la_SOURCES = fdr.c
+ cairo_fdr_la_CPPFLAGS = $(AM_CPPFLAGS)
+ cairo_fdr_la_CFLAGS = $(CAIRO_CFLAGS)
+-cairo_fdr_la_LDFLAGS = -module -no-undefined
+-cairo_fdr_la_LIBADD = -ldl
++cairo_fdr_la_LDFLAGS = -module -no-undefined -avoid-version
++cairo_fdr_la_LIBADD = 
+ all: all-am
+ 
+ .SUFFIXES:

File graphics/cairo/pkg/CVS/Entries

-/DESCR/1.1.1.1/Mon Jan  2 23:40:43 2012//
-/PFRAG.shared/1.4/Mon Jan  2 23:40:43 2012//
-/PLIST/1.11/Mon Jan  2 23:40:43 2012//
+/DESCR/1.2/Fri Aug 17 11:11:30 2012//
+/PFRAG.shared/1.5/Fri Aug 17 11:11:30 2012//
+/PLIST/1.13/Fri Aug 17 11:11:30 2012//
 D

File graphics/cairo/pkg/DESCR

-Cairo is a vector graphics library with cross-device output
-support. Currently supported output targets include the X Window
-System and in-memory image buffers. PostScript and PDF file output is
-planned. Cairo is designed to produce identical output on all output
-media while taking advantage of display hardware acceleration when
-available (eg. through the X Render Extension).
+Cairo is a 2D graphics library with support for multiple output devices.
+Currently supported output targets include the X Window System (via both
+Xlib and XCB), quartz, win32, and image buffers, as well as PDF,
+PostScript, and SVG file output. Experimental backends include OpenGL,
+BeOS, OS/2, and DirectFB.
 
-Cairo provides a stateful user-level API with capabilities similar to
-the PDF 1.4 imaging model. Cairo provides operations including
-stroking and filling Bezier cubic splines, transforming and
-compositing translucent images, and antialiased text rendering.
+Cairo is designed to produce consistent output on all output media while
+taking advantage of display hardware acceleration when available (for
+example, through the X Render Extension).
+
+The cairo API provides operations similar to the drawing operators of
+PostScript and PDF. Operations in cairo include stroking and filling
+cubic Bezier splines, transforming and compositing translucent
+images, and antialiased text rendering. All drawing operations can be
+transformed by any affine transformation (scale, rotation, shear, etc.).

File graphics/cairo/pkg/PFRAG.shared

-@comment $OpenBSD: PFRAG.shared,v 1.4 2010/10/11 08:09:44 eric Exp $
+@comment $OpenBSD: PFRAG.shared,v 1.5 2012/08/16 17:03:18 eric Exp $
+lib/cairo/cairo-fdr.so
 @lib lib/cairo/libcairo-trace.so.${LIBcairo-trace_VERSION}
 @lib lib/libcairo-gobject.so.${LIBcairo-gobject_VERSION}
 @lib lib/libcairo-script-interpreter.so.${LIBcairo-script-interpreter_VERSION}

File graphics/cairo/pkg/PLIST

-@comment $OpenBSD: PLIST,v 1.11 2011/05/04 08:01:56 dcoppa Exp $
+@comment $OpenBSD: PLIST,v 1.13 2012/08/17 07:58:51 ajacoutot Exp $
 %%SHARED%%
 bin/cairo-trace
 include/cairo/
 include/cairo/cairo-pdf.h
 include/cairo/cairo-ps.h
 include/cairo/cairo-script-interpreter.h
+include/cairo/cairo-script.h
 include/cairo/cairo-svg.h
 include/cairo/cairo-tee.h
 include/cairo/cairo-version.h
 include/cairo/cairo-xml.h
 include/cairo/cairo.h
 lib/cairo/
+@comment lib/cairo/cairo-fdr.a
+@comment lib/cairo/cairo-fdr.la
 lib/cairo/libcairo-trace.a
 lib/cairo/libcairo-trace.la
 lib/libcairo-gobject.a
 lib/pkgconfig/cairo-pdf.pc
 lib/pkgconfig/cairo-png.pc
 lib/pkgconfig/cairo-ps.pc
+lib/pkgconfig/cairo-script.pc
 lib/pkgconfig/cairo-svg.pc
 lib/pkgconfig/cairo-tee.pc
 lib/pkgconfig/cairo-xcb-shm.pc
 share/gtk-doc/html/cairo/cairo-PostScript-Surfaces.html
 share/gtk-doc/html/cairo/cairo-Quartz-(CGFont)-Fonts.html
 share/gtk-doc/html/cairo/cairo-Quartz-Surfaces.html
+share/gtk-doc/html/cairo/cairo-Raster-Sources.html
 share/gtk-doc/html/cairo/cairo-Recording-Surfaces.html
 share/gtk-doc/html/cairo/cairo-Regions.html
 share/gtk-doc/html/cairo/cairo-SVG-Surfaces.html
+share/gtk-doc/html/cairo/cairo-Script-Surfaces.html
 share/gtk-doc/html/cairo/cairo-Transformations.html
 share/gtk-doc/html/cairo/cairo-Types.html
 share/gtk-doc/html/cairo/cairo-User-Fonts.html
-share/gtk-doc/html/cairo/cairo-Version-Information.html
 share/gtk-doc/html/cairo/cairo-Win32-Fonts.html
 share/gtk-doc/html/cairo/cairo-Win32-Surfaces.html
+share/gtk-doc/html/cairo/cairo-XCB-Surfaces.html
 share/gtk-doc/html/cairo/cairo-XLib-Surfaces.html
+share/gtk-doc/html/cairo/cairo-XLib-XRender-Backend.html
 share/gtk-doc/html/cairo/cairo-cairo-device-t.html
 share/gtk-doc/html/cairo/cairo-cairo-font-face-t.html
 share/gtk-doc/html/cairo/cairo-cairo-font-options-t.html
 share/gtk-doc/html/cairo/cairo-support.html
 share/gtk-doc/html/cairo/cairo-surfaces.html
 share/gtk-doc/html/cairo/cairo-text.html
-share/gtk-doc/html/cairo/cairo.devhelp
 share/gtk-doc/html/cairo/cairo.devhelp2
 share/gtk-doc/html/cairo/home.png
 share/gtk-doc/html/cairo/index-1.10.html
+share/gtk-doc/html/cairo/index-1.12.html
 share/gtk-doc/html/cairo/index-1.2.html
 share/gtk-doc/html/cairo/index-1.4.html
 share/gtk-doc/html/cairo/index-1.6.html

File graphics/geeqie/CVS/Entries

 D/patches////
 D/pkg////
-/Makefile/1.7/Tue Jan  3 00:43:07 2012//
-/distinfo/1.1.1.1/Mon Jan  2 23:40:50 2012//
+/Makefile/1.8/Fri Aug 17 11:11:40 2012//
+/distinfo/1.2/Fri Aug 17 11:11:40 2012//

File graphics/geeqie/Makefile

-# $OpenBSD: Makefile,v 1.7 2011/11/01 20:30:49 jasper Exp $
+# $OpenBSD: Makefile,v 1.8 2012/08/17 08:24:39 ajacoutot Exp $
 
 COMMENT=	lightweight Gtk+2 based image viewer
 
-DISTNAME=	geeqie-1.0
+DISTNAME=	geeqie-1.1
 CATEGORIES=	graphics
-
-REVISION=	4
-
 EPOCH=		0
 
 HOMEPAGE=	http://geeqie.sourceforge.net/
 WANTLIB += GL X11 Xcomposite Xcursor Xdamage Xext Xfixes
 WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 c cairo
 WANTLIB += exiv2 expat fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0
-WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0
+WANTLIB += gio-2.0 glib-2.0 jpeg tiff gobject-2.0 gthread-2.0
 WANTLIB += gtk-x11-2.0 lcms m pango-1.0 pangocairo-1.0 pangoft2-1.0
 WANTLIB += pixman-1 png pthread pthread-stubs stdc++ xcb xcb-render
 WANTLIB += xcb-shm z

File graphics/geeqie/distinfo

-MD5 (geeqie-1.0.tar.gz) = HWfvmQOQIkxQUml9k7tJwA==
-RMD160 (geeqie-1.0.tar.gz) = 9BC197yocvTmfcK5+f/o4M7fKRo=
-SHA1 (geeqie-1.0.tar.gz) = hJSlV9Z9IOatcgZF7Hid0rM6MmY=
-SHA256 (geeqie-1.0.tar.gz) = 0a1kZmRGwdSQQ3qUQSZ+jXwbncarZAcWshPjhtkhH90=
-SIZE (geeqie-1.0.tar.gz) = 1934236
+SHA256 (geeqie-1.1.tar.gz) = VUToHCmRemR/Gb/oANnw3RzVuJAyn+69mr2Akn4a/s8=
+SIZE (geeqie-1.1.tar.gz) = 1966211

File graphics/geeqie/pkg/CVS/Entries

 /DESCR/1.1.1.1/Mon Jan  2 23:40:50 2012//
-/PLIST/1.2/Tue Jan  3 00:43:07 2012//
+/PLIST/1.3/Fri Aug 17 11:11:41 2012//
 D

File graphics/geeqie/pkg/PLIST

-@comment $OpenBSD: PLIST,v 1.2 2011/10/22 08:10:45 jasper Exp $
+@comment $OpenBSD: PLIST,v 1.3 2012/08/17 08:24:39 ajacoutot Exp $
 @conflict gqview-*
 @pkgpath graphics/gqview
 @bin bin/geeqie
 share/locale/tr/LC_MESSAGES/geeqie.mo
 share/locale/uk/LC_MESSAGES/geeqie.mo
 share/locale/vi/LC_MESSAGES/geeqie.mo
-share/locale/zh_CN.GB2312/
-share/locale/zh_CN.GB2312/LC_MESSAGES/
-share/locale/zh_CN.GB2312/LC_MESSAGES/geeqie.mo
+share/locale/zh_CN/LC_MESSAGES/geeqie.mo
 share/locale/zh_TW/LC_MESSAGES/geeqie.mo
 share/pixmaps/
 share/pixmaps/geeqie.png

File net/p5-OSPF-LSDB/CVS/Entries

 D/pkg////
-/Makefile/1.2/Wed Jul  4 11:05:38 2012//
-/distinfo/1.2/Wed Jul  4 11:05:38 2012//
+/Makefile/1.3/Fri Aug 17 11:16:47 2012//
+/distinfo/1.3/Fri Aug 17 11:16:47 2012//

File net/p5-OSPF-LSDB/Makefile

-# $OpenBSD: Makefile,v 1.2 2012/07/04 08:25:45 bluhm Exp $
+# $OpenBSD: Makefile,v 1.3 2012/08/17 01:50:18 bluhm Exp $
 
 COMMENT =		ospf link-state database viewer
 
-DISTNAME =		OSPF-LSDB-1.02
+DISTNAME =		OSPF-LSDB-1.04
 
 CATEGORIES =		net
 

File net/p5-OSPF-LSDB/distinfo

-MD5 (OSPF-LSDB-1.02.tar.gz) = XorN98+gyqVP0ubrbFTs6g==
-RMD160 (OSPF-LSDB-1.02.tar.gz) = +iAW3HY8eal4PyopR11L9T2aoNQ=
-SHA1 (OSPF-LSDB-1.02.tar.gz) = kEqAlVuucNfEkPfNZJaizYBgHu0=
-SHA256 (OSPF-LSDB-1.02.tar.gz) = BFRqMGqt3AB6X8Uc36JWiYjS72x9q06Wl+6PagS36O8=
-SIZE (OSPF-LSDB-1.02.tar.gz) = 108288
+SHA256 (OSPF-LSDB-1.04.tar.gz) = rHmEvjUEMUDSnAWyoFKI/c5QkRNWabOomcFBQvhHoSc=
+SIZE (OSPF-LSDB-1.04.tar.gz) = 111097

File net/p5-OSPF-LSDB/pkg/CVS/Entries

 /DESCR/1.1.1.1/Fri Jun 29 00:10:28 2012//
-/PLIST/1.1.1.1/Fri Jun 29 00:10:28 2012//
+/PLIST/1.2/Fri Aug 17 11:16:47 2012//
 D

File net/p5-OSPF-LSDB/pkg/PLIST

-@comment $OpenBSD: PLIST,v 1.1.1.1 2012/06/29 00:10:28 bluhm Exp $
+@comment $OpenBSD: PLIST,v 1.2 2012/08/17 01:50:18 bluhm Exp $
 bin/ciscoospf2yaml
 bin/gated2yaml
 bin/ospf2dot
 bin/ospfconvert
 bin/ospfd2yaml
 bin/ospfview
+bin/ospfview.cgi
 ${P5SITE}/OSPF/
 ${P5SITE}/OSPF/LSDB/
 ${P5SITE}/OSPF/LSDB.pm
 @man man/man1/ospfconvert.1
 @man man/man1/ospfd2yaml.1
 @man man/man1/ospfview.1
+@man man/man1/ospfview.cgi.1
 @man man/man3p/OSPF::LSDB.3p
 @man man/man3p/OSPF::LSDB::Cisco.3p
 @man man/man3p/OSPF::LSDB::View.3p

File x11/gnome/CVS/Entries

 D/caribou////
 D/documents////
 D/sushi////
-/Makefile/1.186/Mon Jul  9 11:08:50 2012//
 D/mutter////
 D/shell////
+/Makefile/1.187/Fri Aug 17 11:24:05 2012//
+D/libgnomecanvasmm////

File x11/gnome/Makefile

-# $OpenBSD: Makefile,v 1.186 2012/07/08 14:53:59 jasper Exp $
+# $OpenBSD: Makefile,v 1.187 2012/08/16 13:14:30 stsp Exp $
 
      SUBDIR =
      SUBDIR += anjuta
      SUBDIR += libgnome-keyring
      SUBDIR += libgnome-media-profiles
      SUBDIR += libgnomecanvas
+     SUBDIR += libgnomecanvasmm
      SUBDIR += libgnomekbd
      SUBDIR += libgnomeui
      SUBDIR += libgweather

File x11/gnome/grilo/CVS/Entries

 D/pkg////
-/Makefile/1.5/Mon Aug 13 11:24:21 2012//
 /distinfo/1.5/Mon Aug 13 11:24:21 2012//
+/Makefile/1.6/Fri Aug 17 11:24:20 2012//

File x11/gnome/grilo/Makefile

-# $OpenBSD: Makefile,v 1.5 2012/08/12 21:02:37 jasper Exp $
+# $OpenBSD: Makefile,v 1.6 2012/08/16 13:50:09 jasper Exp $
 
 COMMENT=	framework for making media discovery and browsing easy
 
 GNOME_PROJECT=	grilo
 GNOME_VERSION=	0.1.20
+API=		0.1
 
 SHARED_LIBS +=  grilo-0.1            0.0      # unknown
 SHARED_LIBS +=  grlnet-0.1           1.0      # unknown
 
 CONFIGURE_ARGS+=--enable-grl-net
 
+SUBST_VARS+=	API
+
 .include <bsd.port.mk>

File x11/gnome/grilo/pkg/CVS/Entries

 /DESCR/1.1.1.1/Sun Nov  6 19:05:03 2011//
-/PFRAG.shared/1.2/Mon Feb 27 12:07:16 2012//
-/PLIST/1.4/Mon Aug 13 11:24:22 2012//
+/PFRAG.shared/1.3/Fri Aug 17 11:24:20 2012//
+/PLIST/1.5/Fri Aug 17 11:24:20 2012//
 D

File x11/gnome/grilo/pkg/PFRAG.shared

-@comment $OpenBSD: PFRAG.shared,v 1.2 2012/02/26 15:06:35 ajacoutot Exp $
-@lib lib/libgrilo-0.1.so.${LIBgrilo-0.1_VERSION}
-@lib lib/libgrlnet-0.1.so.${LIBgrlnet-0.1_VERSION}
+@comment $OpenBSD: PFRAG.shared,v 1.3 2012/08/16 13:50:09 jasper Exp $
+@lib lib/libgrilo-${API}.so.${LIBgrilo-0.1_VERSION}
+@lib lib/libgrlnet-${API}.so.${LIBgrlnet-0.1_VERSION}

File x11/gnome/grilo/pkg/PLIST

-@comment $OpenBSD: PLIST,v 1.4 2012/08/12 21:02:37 jasper Exp $
+@comment $OpenBSD: PLIST,v 1.5 2012/08/16 13:50:09 jasper Exp $
 %%SHARED%%
 @bin bin/grilo-simple-playlist
-@bin bin/grilo-test-ui-0.1
-@bin bin/grl-inspect-0.1
-include/grilo-0.1/
-include/grilo-0.1/grilo.h
-include/grilo-0.1/grl-config.h
-include/grilo-0.1/grl-data.h
-include/grilo-0.1/grl-definitions.h
-include/grilo-0.1/grl-error.h
-include/grilo-0.1/grl-log.h
-include/grilo-0.1/grl-media-audio.h
-include/grilo-0.1/grl-media-box.h
-include/grilo-0.1/grl-media-image.h
-include/grilo-0.1/grl-media-plugin.h
-include/grilo-0.1/grl-media-source.h
-include/grilo-0.1/grl-media-video.h
-include/grilo-0.1/grl-media.h
-include/grilo-0.1/grl-metadata-key.h
-include/grilo-0.1/grl-metadata-source.h
-include/grilo-0.1/grl-multiple.h
-include/grilo-0.1/grl-operation.h
-include/grilo-0.1/grl-plugin-registry.h
-include/grilo-0.1/grl-related-keys.h
-include/grilo-0.1/grl-util.h
-include/grilo-0.1/net/
-include/grilo-0.1/net/grl-net-wc.h
-include/grilo-0.1/net/grl-net.h
+@bin bin/grilo-test-ui-${API}
+@bin bin/grl-inspect-${API}
+include/grilo-${API}/
+include/grilo-${API}/grilo.h
+include/grilo-${API}/grl-config.h
+include/grilo-${API}/grl-data.h
+include/grilo-${API}/grl-definitions.h
+include/grilo-${API}/grl-error.h
+include/grilo-${API}/grl-log.h
+include/grilo-${API}/grl-media-audio.h
+include/grilo-${API}/grl-media-box.h
+include/grilo-${API}/grl-media-image.h
+include/grilo-${API}/grl-media-plugin.h
+include/grilo-${API}/grl-media-source.h
+include/grilo-${API}/grl-media-video.h
+include/grilo-${API}/grl-media.h
+include/grilo-${API}/grl-metadata-key.h
+include/grilo-${API}/grl-metadata-source.h
+include/grilo-${API}/grl-multiple.h
+include/grilo-${API}/grl-operation.h
+include/grilo-${API}/grl-plugin-registry.h
+include/grilo-${API}/grl-related-keys.h
+include/grilo-${API}/grl-util.h
+include/grilo-${API}/net/
+include/grilo-${API}/net/grl-net-wc.h
+include/grilo-${API}/net/grl-net.h
 lib/girepository-1.0/
-lib/girepository-1.0/Grl-0.1.typelib
-lib/girepository-1.0/GrlNet-0.1.typelib
-lib/libgrilo-0.1.a
-lib/libgrilo-0.1.la
-lib/libgrlnet-0.1.a
-lib/libgrlnet-0.1.la
+lib/girepository-1.0/Grl-${API}.typelib
+lib/girepository-1.0/GrlNet-${API}.typelib
+lib/libgrilo-${API}.a
+lib/libgrilo-${API}.la
+lib/libgrlnet-${API}.a
+lib/libgrlnet-${API}.la
 lib/pkgconfig/
-lib/pkgconfig/grilo-0.1.pc
-lib/pkgconfig/grilo-net-0.1.pc
+lib/pkgconfig/grilo-${API}.pc
+lib/pkgconfig/grilo-net-${API}.pc
 share/gir-1.0/
-share/gir-1.0/Grl-0.1.gir
-share/gir-1.0/GrlNet-0.1.gir
+share/gir-1.0/Grl-${API}.gir
+share/gir-1.0/GrlNet-${API}.gir
 share/vala/
 share/vala/vapi/
-share/vala/vapi/grilo-0.1.deps
-share/vala/vapi/grilo-0.1.vapi
-share/vala/vapi/grilo-net-0.1.deps
-share/vala/vapi/grilo-net-0.1.vapi
+share/vala/vapi/grilo-${API}.deps
+share/vala/vapi/grilo-${API}.vapi
+share/vala/vapi/grilo-net-${API}.deps
+share/vala/vapi/grilo-net-${API}.vapi

File x11/gnome/libgnomecanvasmm/CVS/Entries

+/Makefile/1.28/Thu Aug 16 12:02:49 2012//
+/distinfo/1.8/Thu Aug 16 12:02:49 2012//
+D/pkg////

File x11/gnome/libgnomecanvasmm/CVS/Repository

+ports/x11/gnome/libgnomecanvasmm

File x11/gnome/libgnomecanvasmm/CVS/Root

+/home/jtr2/openbsd/mirror

File x11/gnome/libgnomecanvasmm/Makefile

+# $OpenBSD: Makefile,v 1.28 2012/08/16 12:02:49 stsp Exp $
+
+SHARED_ONLY=	Yes
+
+COMMENT=	C++ interface to the graphics library for GNOME
+
+GNOME_PROJECT=	libgnomecanvasmm
+GNOME_VERSION=	2.26.0
+REVISION=	5
+EXTRACT_SUFX=	.tar.bz2
+
+SHARED_LIBS +=  gnomecanvasmm-2.6         1.0 # 1.6
+
+CATEGORIES=	x11
+
+# LGPLv2.1
+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
+WANTLIB += Xi Xinerama Xrandr Xrender Xxf86vm art_lgpl_2 atk-1.0
+WANTLIB += atkmm-1.6 cairo cairomm-1.0 drm expat ffi fontconfig
+WANTLIB += freetype gailutil gdk-x11-2.0 gdk_pixbuf-2.0 gdkmm-2.4
+WANTLIB += gio-2.0 giomm-2.4 glib-2.0 glibmm-2.4 gmodule-2.0 gnomecanvas-2
+WANTLIB += gobject-2.0 gthread-2.0 gtk-x11-2.0 gtkmm-2.4 m pango-1.0
+WANTLIB += pangocairo-1.0 pangoft2-1.0 pangomm-1.4 pcre pixman-1
+WANTLIB += png pthread-stubs sigc-2.0 stdc++ xcb xcb-render xcb-shm z
+
+MODULES=	devel/gettext \
+		x11/gnome
+
+LIB_DEPENDS=	x11/gnome/libgnomecanvas \
+		x11/gtk2mm
+
+.include <bsd.port.mk>

File x11/gnome/libgnomecanvasmm/distinfo

+SHA256 (gnome/libgnomecanvasmm-2.26.0.tar.bz2) = mWV3+X9FmldJGeFbp/7mr4zaOKh6mCiemk9UdS2D6Rg=
+SIZE (gnome/libgnomecanvasmm-2.26.0.tar.bz2) = 327215

File x11/gnome/libgnomecanvasmm/pkg/CVS/Entries

+/DESCR/1.3/Thu Aug 16 12:02:52 2012//
+/PLIST/1.4/Thu Aug 16 12:02:52 2012//
+D

File x11/gnome/libgnomecanvasmm/pkg/CVS/Repository

+ports/x11/gnome/libgnomecanvasmm/pkg

File x11/gnome/libgnomecanvasmm/pkg/CVS/Root

+/home/jtr2/openbsd/mirror

File x11/gnome/libgnomecanvasmm/pkg/DESCR

+libgnomecanvasmm provides C++ wrappers for libgnomecanvas.

File x11/gnome/libgnomecanvasmm/pkg/PLIST

+@comment $OpenBSD: PLIST,v 1.4 2012/08/16 12:02:52 stsp Exp $
+include/libgnomecanvasmm-2.6/
+include/libgnomecanvasmm-2.6/libgnomecanvasmm/
+include/libgnomecanvasmm-2.6/libgnomecanvasmm.h
+include/libgnomecanvasmm-2.6/libgnomecanvasmm/affinetrans.h
+include/libgnomecanvasmm-2.6/libgnomecanvasmm/bpath.h
+include/libgnomecanvasmm-2.6/libgnomecanvasmm/canvas.h
+include/libgnomecanvasmm-2.6/libgnomecanvasmm/ellipse.h
+include/libgnomecanvasmm-2.6/libgnomecanvasmm/group.h
+include/libgnomecanvasmm-2.6/libgnomecanvasmm/init.h
+include/libgnomecanvasmm-2.6/libgnomecanvasmm/item.h
+include/libgnomecanvasmm-2.6/libgnomecanvasmm/line.h
+include/libgnomecanvasmm-2.6/libgnomecanvasmm/path-def.h
+include/libgnomecanvasmm-2.6/libgnomecanvasmm/pixbuf.h
+include/libgnomecanvasmm-2.6/libgnomecanvasmm/point.h
+include/libgnomecanvasmm-2.6/libgnomecanvasmm/polygon.h
+include/libgnomecanvasmm-2.6/libgnomecanvasmm/private/
+include/libgnomecanvasmm-2.6/libgnomecanvasmm/private/bpath_p.h
+include/libgnomecanvasmm-2.6/libgnomecanvasmm/private/canvas_p.h
+include/libgnomecanvasmm-2.6/libgnomecanvasmm/private/ellipse_p.h
+include/libgnomecanvasmm-2.6/libgnomecanvasmm/private/group_p.h
+include/libgnomecanvasmm-2.6/libgnomecanvasmm/private/item_p.h
+include/libgnomecanvasmm-2.6/libgnomecanvasmm/private/line_p.h
+include/libgnomecanvasmm-2.6/libgnomecanvasmm/private/path-def_p.h
+include/libgnomecanvasmm-2.6/libgnomecanvasmm/private/pixbuf_p.h
+include/libgnomecanvasmm-2.6/libgnomecanvasmm/private/polygon_p.h