From a9a5fd7af85e69d0e54168ef792c4169f7a62484 Mon Sep 17 00:00:00 2001 From: marcus Date: Sat, 12 Apr 2003 06:08:38 +0000 Subject: 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 --- devel/gconf2/Makefile | 2 ++ devel/gconf2/files/patch-gconf::gconf-internals.c | 16 +++++++++++----- 2 files changed, 13 insertions(+), 5 deletions(-) (limited to 'devel') 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 #include @@ -13,3 +10,12 @@ $FreeBSD: ports/devel/gconf2/files/patch-gconf::gconf-internals.c,v 1.3 2003/02/ #include #include #include +@@ -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); -- cgit v1.2.3