From fb273302bb7f0997e857fb5c942d64178e192d9a Mon Sep 17 00:00:00 2001
From: ajacoutot <ajacoutot@openbsd.org>
Date: Tue, 26 Mar 2013 16:33:25 +0000
Subject: [PATCH] Adapt now that --disable-maintainer-mode is the default.
 Merge plists.

---
 x11/gnome/grilo-mediaserver2/Makefile         | 7 +++----
 x11/gnome/grilo-mediaserver2/pkg/PFRAG.shared | 2 --
 x11/gnome/grilo-mediaserver2/pkg/PLIST        | 4 ++--
 3 files changed, 5 insertions(+), 8 deletions(-)
 delete mode 100644 x11/gnome/grilo-mediaserver2/pkg/PFRAG.shared

diff --git a/x11/gnome/grilo-mediaserver2/Makefile b/x11/gnome/grilo-mediaserver2/Makefile
index 69011869c4f..ad30c523550 100644
--- a/x11/gnome/grilo-mediaserver2/Makefile
+++ b/x11/gnome/grilo-mediaserver2/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.5 2013/03/11 11:46:10 espie Exp $
+# $OpenBSD: Makefile,v 1.6 2013/03/26 16:33:25 ajacoutot Exp $
 
 COMMENT=	expose media content over D-Bus for Rygel to consume
 
 GNOME_PROJECT=	grilo-mediaserver2
 GNOME_VERSION=	0.0.2
 # git clone of 4614b1969dcdea2c254af3178b70966282468c07
+REVISION=	0
 
 SHARED_LIBS +=  mediaserver2              0.0 # 0.0
 
@@ -45,9 +46,7 @@ do-configure:
 		AUTOCONF_VERSION=${AUTOCONF_VERSION} \
 		AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \
 		env ${CONFIGURE_ENV} \
-		./autogen.sh ${CONFIGURE_ARGS} \
-			--disable-maintainer-mode \
-			--disable-silent-rules
+		./autogen.sh ${CONFIGURE_ARGS}
 ############################################################
 
 .include <bsd.port.mk>
diff --git a/x11/gnome/grilo-mediaserver2/pkg/PFRAG.shared b/x11/gnome/grilo-mediaserver2/pkg/PFRAG.shared
deleted file mode 100644
index 07ec4620946..00000000000
--- a/x11/gnome/grilo-mediaserver2/pkg/PFRAG.shared
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2011/11/11 15:50:28 jasper Exp $
-@lib lib/libmediaserver2.so.${LIBmediaserver2_VERSION}
diff --git a/x11/gnome/grilo-mediaserver2/pkg/PLIST b/x11/gnome/grilo-mediaserver2/pkg/PLIST
index 14420e1dd4f..4af8db06f60 100644
--- a/x11/gnome/grilo-mediaserver2/pkg/PLIST
+++ b/x11/gnome/grilo-mediaserver2/pkg/PLIST
@@ -1,5 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2011/11/11 15:50:28 jasper Exp $
-%%SHARED%%
+@comment $OpenBSD: PLIST,v 1.2 2013/03/26 16:33:25 ajacoutot Exp $
 @bin bin/grilo-ms2
 include/media-server2-client.h
 include/media-server2-common.h
@@ -7,6 +6,7 @@ include/media-server2-observer.h
 include/media-server2-server.h
 lib/libmediaserver2.a
 lib/libmediaserver2.la
+@lib lib/libmediaserver2.so.${LIBmediaserver2_VERSION}
 lib/pkgconfig/
 lib/pkgconfig/mediaserver2.pc
 share/examples/grilo-mediaserver2/