Split off dconf-editor into a sperate port. I got a update for Gtk+ to 3.6

whch depends on at-spi2-atk, at-spi2-* conflicts with at-spi which is used
by GNOME 2. And the editor is written in gtk3.

While here update header to new format.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@17086 df743ca5-7f9a-e211-a948-0013205c9059

5 files changed, 62 insertions, 26 deletions

diff --git a/devel/dconf-editor/Makefile b/devel/dconf-editor/Makefile
new file mode 100644
index 000000000..c184a0550
--- /dev/null
+++ b/devel/dconf-editor/Makefile
@@ -0,0 +1,21 @@
+# Created by: Koop Mast <kwm@FreeBSD.org>
+# $FreeBSD$
+#   $MCom: ports/devel/dconf/Makefile,v 1.29 2012/05/28 11:45:14 kwm Exp $
+
+PORTNAME=	dconf-editor
+
+COMMENT=	configuration editor for dconf
+
+DCONF_SLAVE=	editor
+
+MASTERDIR=	${.CURDIR}/../dconf
+
+PLIST=		${.CURDIR}/pkg-plist
+
+do-build:
+	@cd ${WRKSRC}/editor && ${GMAKE}
+
+do-install:
+	@cd ${WRKSRC}/editor && ${GMAKE} install
+
+.include "${MASTERDIR}/Makefile"
diff --git a/devel/dconf-editor/pkg-plist b/devel/dconf-editor/pkg-plist
new file mode 100644
index 000000000..ce8b52cef
--- /dev/null
+++ b/devel/dconf-editor/pkg-plist
@@ -0,0 +1,8 @@
+bin/dconf-editor
+share/applications/dconf-editor.desktop
+share/dconf-editor/dconf-editor.ui
+share/icons/hicolor/128x128/apps/dconf-editor.png
+share/icons/hicolor/32x32/apps/dconf-editor.png
+share/icons/hicolor/48x48/apps/dconf-editor.png
+share/icons/hicolor/64x64/apps/dconf-editor.png
+@dirrm share/dconf-editor
diff --git a/devel/dconf/Makefile b/devel/dconf/Makefile
index 58f1641fc..bbb22ecbc 100644
--- a/devel/dconf/Makefile
+++ b/devel/dconf/Makefile
@@ -1,23 +1,21 @@
-# New ports collection makefile for:	dconf
-# Date created:				28 May 2010
-# Whom:					Koop Mast <kwm@FreeBSD.org>
-#
+# Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/devel/dconf/Makefile,v 1.28 2011/10/16 19:35:42 kwm Exp $
-#
+#   $MCom: ports/devel/dconf/Makefile,v 1.29 2012/05/28 11:45:14 kwm Exp $
 
-PORTNAME=	dconf
+PORTNAME?=	dconf
 PORTVERSION=	0.12.1
+PORTREVISION=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
+DISTNAME=	dconf-${PORTVERSION}
 DIST_SUBDIR=	gnome3
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A configuration database system for GNOME
 
 BUILD_DEPENDS=	vala>=0.11.7:${PORTSDIR}/lang/vala
-LIB_DEPENDS=	gee.2:${PORTSDIR}/devel/libgee \
-		dbus-1.3:${PORTSDIR}/devel/dbus
+LIB_DEPENDS=	gee:${PORTSDIR}/devel/libgee \
+		dbus-1:${PORTSDIR}/devel/dbus
 
 USE_XZ=		yes
 USE_GMAKE=	yes
@@ -25,21 +23,18 @@ USE_GNOME=	gnomehack glib20 gnomehier
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 MAKE_JOBS_UNSAFE=	yes
-INSTALLS_ICONS=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-OPTIONS=	EDITOR "Build the dconf editor (requires Gtk+3)" On
-
-.include <bsd.port.options.mk>
+DCONF_SLAVE?=	no
 
-.if defined(WITHOUT_EDITOR)
-CONFIGURE_ARGS+=--disable-editor
-PLIST_SUB+=	EDITOR="@comment "
-.else
+.if ${DCONF_SLAVE} == "editor"
 USE_GNOME+=	gtk30
+INSTALLS_ICONS=	yes
 GLIB_SCHEMAS=	ca.desrt.dconf-editor.gschema.xml
-PLIST_SUB+=	EDITOR=""
+LIB_DEPENDS+=	dconf:${PORTSDIR}/devel/dconf
+.else
+CONFIGURE_ARGS+=--disable-editor
 .endif
 
 post-patch:
diff --git a/devel/dconf/files/patch-editor_Makefile.in b/devel/dconf/files/patch-editor_Makefile.in
new file mode 100644
index 000000000..8f158fced
--- /dev/null
+++ b/devel/dconf/files/patch-editor_Makefile.in
@@ -0,0 +1,20 @@
+--- editor/Makefile.in.orig	2012-10-03 17:32:51.000000000 +0000
++++ editor/Makefile.in	2012-10-03 17:35:54.000000000 +0000
+@@ -55,7 +55,7 @@
+ 	dconf-schema.$(OBJEXT) dconf-view.$(OBJEXT)
+ dconf_editor_OBJECTS = $(am_dconf_editor_OBJECTS)
+ am__DEPENDENCIES_1 =
+-dconf_editor_DEPENDENCIES = ../client/libdconf.so.0 \
++dconf_editor_DEPENDENCIES = -ldconf \
+ 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ 	$(am__DEPENDENCIES_1)
+ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+@@ -232,7 +232,7 @@
+ top_srcdir = @top_srcdir@
+ AM_CFLAGS = $(gtk_CFLAGS) $(gmodule_CFLAGS) $(libxml_CFLAGS) -I$(top_srcdir)/common -I$(top_srcdir)/client -DPKGDATADIR=\"@datadir@/dconf-editor\"
+ AM_VALAFLAGS = --vapidir ../client --pkg gtk+-3.0 --pkg gmodule-2.0 --pkg libxml-2.0 --pkg dconf
+-dconf_editor_LDADD = ../client/libdconf.so.0 $(gtk_LIBS) $(gmodule_LIBS) $(gee_LIBS) $(libxml_LIBS)
++dconf_editor_LDADD = -ldconf $(gtk_LIBS) $(gmodule_LIBS) $(gee_LIBS) $(libxml_LIBS)
+ dconf_editor_SOURCES = config.vapi dconf-editor.vala dconf-model.vala dconf-schema.vala dconf-view.vala
+ desktopdir = $(datadir)/applications
+ desktop_in_files = dconf-editor.desktop.in.in
diff --git a/devel/dconf/pkg-plist b/devel/dconf/pkg-plist
index 3144bbca1..8207a4aaf 100644
--- a/devel/dconf/pkg-plist
+++ b/devel/dconf/pkg-plist
@@ -1,5 +1,4 @@
 bin/dconf
-%%EDITOR%%bin/dconf-editor
 etc/bash_completion.d/dconf-bash-completion.sh
 include/dconf/dconf-client.h
 include/dconf-dbus-1/dconf-dbus-1.h
@@ -14,9 +13,7 @@ lib/libdconf-dbus-1.so.0
 libdata/pkgconfig/dconf.pc
 libdata/pkgconfig/dconf-dbus-1.pc
 libexec/dconf-service
-%%EDITOR%%share/applications/dconf-editor.desktop
 share/dbus-1/services/ca.desrt.dconf.service
-%%EDITOR%%share/dconf-editor/dconf-editor.ui
 share/gtk-doc/html/dconf/DConfClient.html
 share/gtk-doc/html/dconf/dconf-DConf-Paths.html
 share/gtk-doc/html/dconf/annotation-glossary.html
@@ -31,16 +28,11 @@ share/gtk-doc/html/dconf/object-tree.html
 share/gtk-doc/html/dconf/right.png
 share/gtk-doc/html/dconf/style.css
 share/gtk-doc/html/dconf/up.png
-share/icons/hicolor/128x128/apps/dconf-editor.png
-share/icons/hicolor/32x32/apps/dconf-editor.png
-share/icons/hicolor/48x48/apps/dconf-editor.png
-share/icons/hicolor/64x64/apps/dconf-editor.png
 share/vala/vapi/dconf.deps
 share/vala/vapi/dconf.vapi
 @dirrm share/gtk-doc/html/dconf
 @dirrmtry share/gtk-doc/html
 @dirrmtry share/gtk-doc
-@dirrmtry share/dconf-editor
 @dirrmtry share/applications
 @dirrm include/dconf-dbus-1
 @dirrm include/dconf