- adjust after uuid changes

- explicitly depend on latest e2fsprogs revision

net/gupnp/core/Makefile

@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.5 2011/07/05 17:27:15 jasper Exp $
+# $OpenBSD: Makefile,v 1.6 2011/07/06 07:23:20 jasper Exp $
 
 COMMENT=		framework for creating UPnP devices and control points
 
 GNOME_PROJECT=		gupnp
 GNOME_VERSION=		0.16.1
-REVISION=		1
+REVISION=		2
 
 SHARED_LIBS +=  gupnp-1.0            0.0      # 3.0
 
@@ -17,13 +17,10 @@ WANTLIB += gssdp-1.0 gthread-2.0 m pcre soup-2.4 xml2 z
 
 BUILD_DEPENDS=		devel/gobject-introspection
 LIB_DEPENDS=		net/gssdp \
-			sysutils/e2fsprogs
+			sysutils/e2fsprogs>=1.41.4p5
 
 MODPY_ADJ_FILES=	tools/gupnp-binding-tool
 
-AUTOCONF_VERSION=	2.68
-
-CONFIGURE_STYLE=	autoconf
 CONFIGURE_ARGS+=	${CONFIGURE_SHARED} \
 			--disable-gtk-doc \
 			--enable-introspection \

net/gupnp/core/patches/patch-configure_ac

@@ -1,43 +0,0 @@
-$OpenBSD: patch-configure_ac,v 1.1.1.1 2011/07/04 15:28:05 jasper Exp $
-
-commit 3d43874a54e1308510af28e63c9c3f72e0ad316a
-Author: Jasper Lievisse Adriaanse <jasper@humppa.nl>
-Date:   Thu Jun 30 15:49:53 2011 +0200
-
-    Recognize OpenBSD so the right uuid library is picked up.
-    
-    https://bugzilla.gnome.org/show_bug.cgi?id=653745
-
---- configure.ac.orig	Sat Apr 30 14:35:11 2011
-+++ configure.ac	Mon Jul  4 11:30:05 2011
-@@ -5,6 +5,7 @@ AC_CONFIG_SRCDIR(libgupnp/gupnp.h)
- AM_CONFIG_HEADER(config.h)
- AM_MAINTAINER_MODE
- AC_CANONICAL_HOST
-+AC_CANONICAL_TARGET
- 
- m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
- 
-@@ -17,7 +18,7 @@ AC_FUNC_MMAP
- AC_SYS_LARGEFILE
- 
- AC_MSG_CHECKING([operating system])
--case "$host_os" in
-+case "$target_os" in
-      mingw*|cygwin*)
-         AC_MSG_RESULT(Win32)
-         UUID=uuid
-@@ -26,8 +27,12 @@ case "$host_os" in
-         AC_MSG_RESULT(Darwin)
-         UUID=
-         ;;
-+     openbsd*)
-+        AC_MSG_RESULT(OpenBSD)
-+        UUID=e2fs-uuid
-+        ;;
-      *)
--        AC_MSG_RESULT($host_os)
-+        AC_MSG_RESULT($target_os)
-         UUID=uuid
-         ;;
- esac

net/gupnp/tools/Makefile

@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.3 2011/07/05 17:14:30 jasper Exp $
+# $OpenBSD: Makefile,v 1.4 2011/07/06 07:23:20 jasper Exp $
 
 COMMENT=		free replacements of Intel UPnP tools
 
 GNOME_PROJECT=		gupnp-tools
 GNOME_VERSION=		0.8.3
-REVISION=		0
+REVISION=		1
 
 MODULES=		devel/gettext \
 			x11/gnome
@@ -19,11 +19,8 @@ WANTLIB += png pthread pthread-stubs soup-2.4 xcb xcb-render xcb-shm
 WANTLIB += xml2 z
 
 LIB_DEPENDS=		net/gupnp/av \
+			sysutils/e2fsprogs>=1.41.4p5 \
 			x11/gtk+3
 RUN_DEPENDS=		devel/desktop-file-utils
 
-AUTOCONF_VERSION=	2.67
-
-CONFIGURE_STYLE=	autoconf
-
 .include <bsd.port.mk>

net/gupnp/tools/patches/patch-configure_ac

@@ -1,12 +0,0 @@
-$OpenBSD: patch-configure_ac,v 1.1.1.1 2011/07/05 17:00:53 jasper Exp $
---- configure.ac.orig	Mon Jul  4 16:37:31 2011
-+++ configure.ac	Mon Jul  4 16:38:23 2011
-@@ -37,7 +37,7 @@ PKG_CHECK_MODULES(GNOME_ICON_THEME, gnome-icon-theme >
- PKG_CHECK_MODULES(GIO, gio-2.0 >= $GIO_REQUIRED)
- 
- if test "x$os_win32" = "xno"; then
--    PKG_CHECK_MODULES(UUID, uuid)
-+    PKG_CHECK_MODULES(UUID, e2fs-uuid)
- else
-     AC_CHECK_TOOL(WINDRES, windres)
-     AC_SUBST([UUID_LIBS], ["-lrpcrt4"])

x11/gnome/gnote/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2011/05/12 06:14:54 jasper Exp $
+# $OpenBSD: Makefile,v 1.5 2011/07/06 07:23:20 jasper Exp $
 
 SHARED_ONLY=		Yes
 
@@ -6,7 +6,7 @@ COMMENT=		desktop note-taking application written in C++
 
 GNOME_PROJECT=		gnote
 GNOME_VERSION=		0.7.4
-REVISION=		1
+REVISION=		2
 
 HOMEPAGE=		http://live.gnome.org/Gnote
 
@@ -31,7 +31,7 @@ WANTLIB += pcre pcrecpp pixman-1 png pthread pthread-stubs sigc-2.0
 WANTLIB += stdc++ xcb xcb-render xcb-shm xml2 xslt z
 
 BUILD_DEPENDS=		devel/boost>=1.42.0p6
-LIB_DEPENDS=		sysutils/e2fsprogs \
+LIB_DEPENDS=		sysutils/e2fsprogs>=1.41.4p5 \
 			textproc/gtkspell \
 			textproc/libxslt \
 			x11/gtk2mm

x11/gnome/gnote/patches/patch-configure_ac

@@ -1,4 +1,4 @@
-$OpenBSD: patch-configure_ac,v 1.1.1.1 2011/05/06 11:25:46 jasper Exp $
+$OpenBSD: patch-configure_ac,v 1.2 2011/07/06 07:23:20 jasper Exp $
 
 Use pkg-config to pickup uuid.
 https://bugzilla.gnome.org/show_bug.cgi?id=649486
@@ -9,7 +9,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=649486
  PKG_CHECK_MODULES(LIBXSLT, [libxslt])
  PKG_CHECK_MODULES(GCONF, [gconf-2.0])
  PKG_CHECK_MODULES(PCRE, [libpcrecpp])
-+PKG_CHECK_MODULES(UUID, [e2fs-uuid])
++PKG_CHECK_MODULES(UUID, [uuid])
  
  PKG_CHECK_EXISTS(gtkmm-2.4 >= 2.14.0,
    [AC_DEFINE(HAVE_CLASS_GTK__WIDGET_SIGNAL_POPUP_MENU, 1, [Define to 1 if class Gtk::Widget has signal_popup_menu])],

x11/gnome/tracker/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.61 2011/07/05 17:54:07 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.62 2011/07/06 07:23:20 jasper Exp $
 
 COMMENT=	powerful desktop search tool and indexer
 
@@ -9,7 +9,7 @@ GNOME_VERSION=	0.8.18
 # as meta-tracker.
 PKGNAME=	meta-tracker-${VERSION}
 
-REVISION=	2
+REVISION=	3
 
 EVO_VERSION=	2.32
 SUBST_VARS=	EVO_VERSION
@@ -65,7 +65,7 @@ LIB_DEPENDS=	audio/libvorbis \
 		x11/gnome/panel \
 		x11/gnome/nautilus>=2.28.4p1 \
 		x11/gnome/totem-pl-parser>=2.28.1 \
-		sysutils/e2fsprogs>=1.41.4p3 \
+		sysutils/e2fsprogs>=1.41.4p5 \
 		devel/libgee
 BUILD_DEPENDS=	devel/xdg-utils \
 		lang/vala

x11/gnome/tracker/patches/patch-configure

@@ -1,60 +1,6 @@
-$OpenBSD: patch-configure,v 1.8 2011/04/27 11:09:50 ajacoutot Exp $
+$OpenBSD: patch-configure,v 1.9 2011/07/06 07:23:20 jasper Exp $
-
-uuid_generate(3):
-    needs e2fs-uuid from sysutils/e2fsprogs over libuuid (devel/uuid).
-
 --- configure.orig	Wed Apr 27 12:05:07 2011
 +++ configure	Wed Apr 27 12:39:53 2011
-@@ -17075,12 +17075,12 @@ if test -n "$UUID_CFLAGS"; then
-     pkg_cv_UUID_CFLAGS="$UUID_CFLAGS"
-  elif test -n "$PKG_CONFIG"; then
-     if test -n "$PKG_CONFIG" && \
--    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"uuid\""; } >&5
--  ($PKG_CONFIG --exists --print-errors "uuid") 2>&5
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"e2fs-uuid\""; } >&5
-+  ($PKG_CONFIG --exists --print-errors "e2fs-uuid") 2>&5
-   ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
--  pkg_cv_UUID_CFLAGS=`$PKG_CONFIG --cflags "uuid" 2>/dev/null`
-+  pkg_cv_UUID_CFLAGS=`$PKG_CONFIG --cflags "e2fs-uuid" 2>/dev/null`
- else
-   pkg_failed=yes
- fi
-@@ -17091,12 +17091,12 @@ if test -n "$UUID_LIBS"; then
-     pkg_cv_UUID_LIBS="$UUID_LIBS"
-  elif test -n "$PKG_CONFIG"; then
-     if test -n "$PKG_CONFIG" && \
--    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"uuid\""; } >&5
--  ($PKG_CONFIG --exists --print-errors "uuid") 2>&5
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"e2fs-uuid\""; } >&5
-+  ($PKG_CONFIG --exists --print-errors "e2fs-uuid") 2>&5
-   ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
--  pkg_cv_UUID_LIBS=`$PKG_CONFIG --libs "uuid" 2>/dev/null`
-+  pkg_cv_UUID_LIBS=`$PKG_CONFIG --libs "e2fs-uuid" 2>/dev/null`
- else
-   pkg_failed=yes
- fi
-@@ -17116,14 +17116,14 @@ else
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        UUID_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "uuid" 2>&1`
-+	        UUID_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "e2fs-uuid" 2>&1`
-         else
--	        UUID_PKG_ERRORS=`$PKG_CONFIG --print-errors "uuid" 2>&1`
-+	        UUID_PKG_ERRORS=`$PKG_CONFIG --print-errors "e2fs-uuid" 2>&1`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$UUID_PKG_ERRORS" >&5
- 
--	as_fn_error $? "Package requirements (uuid) were not met:
-+	as_fn_error $? "Package requirements (e2fs-uuid) were not met:
- 
- $UUID_PKG_ERRORS
- 
 @@ -17380,7 +17380,7 @@ if test "${ac_cv_lib_id3_ID3Tag_New+set}" = set; then 
    $as_echo_n "(cached) " >&6
  else