summaryrefslogtreecommitdiffstats
path: root/devel
diff options
context:
space:
mode:
authormarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2003-04-12 14:08:38 +0800
committermarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2003-04-12 14:08:38 +0800
commita9a5fd7af85e69d0e54168ef792c4169f7a62484 (patch)
treef4888d0e43fd8171b771a7e93ef78660916eb1cf /devel
parent1d073ce4dff059e5bfb69910e1809f03e53feba9 (diff)
downloadmarcuscom-ports-a9a5fd7af85e69d0e54168ef792c4169f7a62484.tar
marcuscom-ports-a9a5fd7af85e69d0e54168ef792c4169f7a62484.tar.gz
marcuscom-ports-a9a5fd7af85e69d0e54168ef792c4169f7a62484.tar.bz2
marcuscom-ports-a9a5fd7af85e69d0e54168ef792c4169f7a62484.tar.lz
marcuscom-ports-a9a5fd7af85e69d0e54168ef792c4169f7a62484.tar.xz
marcuscom-ports-a9a5fd7af85e69d0e54168ef792c4169f7a62484.tar.zst
marcuscom-ports-a9a5fd7af85e69d0e54168ef792c4169f7a62484.zip
Fix a logic issue when trying to decide where to write the lock file.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@591 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'devel')
-rw-r--r--devel/gconf2/Makefile2
-rw-r--r--devel/gconf2/files/patch-gconf::gconf-internals.c16
2 files changed, 13 insertions, 5 deletions
diff --git a/devel/gconf2/Makefile b/devel/gconf2/Makefile
index 14906290c..b4e314413 100644
--- a/devel/gconf2/Makefile
+++ b/devel/gconf2/Makefile
@@ -7,6 +7,8 @@
PORTNAME= gconf2
PORTVERSION= 2.3.1
+#PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/GConf/2.3
diff --git a/devel/gconf2/files/patch-gconf::gconf-internals.c b/devel/gconf2/files/patch-gconf::gconf-internals.c
index c0aec0804..3b70e7699 100644
--- a/devel/gconf2/files/patch-gconf::gconf-internals.c
+++ b/devel/gconf2/files/patch-gconf::gconf-internals.c
@@ -1,8 +1,5 @@
-
-$FreeBSD: ports/devel/gconf2/files/patch-gconf::gconf-internals.c,v 1.3 2003/02/07 18:42:02 marcus Exp $
-
---- gconf/gconf-internals.c 2002/02/15 19:13:07 1.1
-+++ gconf/gconf-internals.c 2002/02/15 19:13:32
+--- gconf/gconf-internals.c.orig Wed Mar 26 13:52:31 2003
++++ gconf/gconf-internals.c Sat Apr 12 02:02:23 2003
@@ -26,6 +26,9 @@
#include <string.h>
#include <sys/stat.h>
@@ -13,3 +10,12 @@ $FreeBSD: ports/devel/gconf2/files/patch-gconf::gconf-internals.c,v 1.3 2003/02/
#include <unistd.h>
#include <stdlib.h>
#include <stdio.h>
+@@ -2781,7 +2784,7 @@
+ char*
+ gconf_get_daemon_dir (void)
+ {
+- if (gconf_use_local_locks ())
++ if (!gconf_use_local_locks ())
+ return linc_get_tmpdir ();
+ else
+ return g_strconcat (g_get_home_dir (), "/.gconfd", NULL);