From de7c0ae4dbd21f67330f149151b445fda27a900c Mon Sep 17 00:00:00 2001
From: kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059>
Date: Sat, 23 Oct 2010 11:29:28 +0000
Subject: Update to 0.5.1.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@14826 df743ca5-7f9a-e211-a948-0013205c9059
---
 devel/dconf/Makefile                          |  6 +++---
 devel/dconf/distinfo                          |  6 +++---
 devel/dconf/files/patch-common_shmdir.c       | 16 ++++++++++++++++
 devel/dconf/files/patch-engine_dconf-engine.c | 19 +++++++++++++++++++
 4 files changed, 41 insertions(+), 6 deletions(-)
 create mode 100644 devel/dconf/files/patch-common_shmdir.c
 create mode 100644 devel/dconf/files/patch-engine_dconf-engine.c

(limited to 'devel')

diff --git a/devel/dconf/Makefile b/devel/dconf/Makefile
index 974ebab6f..539d30329 100644
--- a/devel/dconf/Makefile
+++ b/devel/dconf/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Koop Mast <kwm@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/dconf/Makefile,v 1.5 2010/06/29 21:13:58 kwm Exp $
+#   $MCom: ports/devel/dconf/Makefile,v 1.6 2010/07/13 08:07:04 kwm Exp $
 #
 
 PORTNAME=	dconf
-PORTVERSION=	0.4.2
+PORTVERSION=	0.5.1
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -22,7 +22,7 @@ LIB_DEPENDS=	gee.2:${PORTSDIR}/devel/libgee
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 #USE_GETTEXT=	yes
-USE_GNOME=	gnomehack glib20
+USE_GNOME=	gnomehack gtk20
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 
diff --git a/devel/dconf/distinfo b/devel/dconf/distinfo
index 83638a26e..d22d25649 100644
--- a/devel/dconf/distinfo
+++ b/devel/dconf/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome3/dconf-0.4.2.tar.bz2) = 599bdaa3b91eff3a69c6307a39d9bc37
-SHA256 (gnome3/dconf-0.4.2.tar.bz2) = 81ad18eff80eea5ad3e612e3164d42a5a9989c499a61a5536197107d0b05afa1
-SIZE (gnome3/dconf-0.4.2.tar.bz2) = 322396
+MD5 (gnome3/dconf-0.5.1.tar.bz2) = c905497d0255fe2ba58564f9655908ab
+SHA256 (gnome3/dconf-0.5.1.tar.bz2) = 0083d70e1b5e540d8d4b3f04fa5d17dff4c574136682fe3bdd9b5ecc196ec4f6
+SIZE (gnome3/dconf-0.5.1.tar.bz2) = 251287
diff --git a/devel/dconf/files/patch-common_shmdir.c b/devel/dconf/files/patch-common_shmdir.c
new file mode 100644
index 000000000..b8ed3eeb2
--- /dev/null
+++ b/devel/dconf/files/patch-common_shmdir.c
@@ -0,0 +1,16 @@
+--- common/dconf-shmdir.c.orig	2010-10-21 13:46:17.000000000 +0200
++++ common/dconf-shmdir.c	2010-10-21 13:47:46.000000000 +0200
+@@ -21,8 +21,13 @@
+ 
+ #include "dconf-shmdir.h"
+ 
++#ifdef __linux__
+ #include <sys/statfs.h>
+ #include <sys/vfs.h>
++#elif __FreeBSD__
++#include <sys/param.h>
++#include <sys/mount.h>
++#endif
+ #include <errno.h>
+ 
+ #ifndef NFS_SUPER_MAGIC
diff --git a/devel/dconf/files/patch-engine_dconf-engine.c b/devel/dconf/files/patch-engine_dconf-engine.c
new file mode 100644
index 000000000..9dcb9e594
--- /dev/null
+++ b/devel/dconf/files/patch-engine_dconf-engine.c
@@ -0,0 +1,19 @@
+--- engine/dconf-engine.c.orig	2010-10-21 13:49:19.000000000 +0200
++++ engine/dconf-engine.c	2010-10-21 14:16:31.000000000 +0200
+@@ -144,6 +144,7 @@ dconf_engine_setup_user (DConfEngine *en
+ 
+           if (fd >= 0)
+             {
++/*
+               if (posix_fallocate (fd, 0, 1) == 0)
+                 {
+                   engine->shm = mmap (NULL, 1, PROT_READ, MAP_SHARED, fd, 0);
+@@ -151,7 +152,7 @@ dconf_engine_setup_user (DConfEngine *en
+                   if (engine->shm == MAP_FAILED)
+                     engine->shm = NULL;
+                 }
+-
++*/
+               close (fd);
+             }
+         }
-- 
cgit v1.2.3