diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2002-09-27 06:05:21 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2002-09-27 06:05:21 +0000 |
| commit | e5fbb8095a181925e012e8ab41fc47477e9cf3fc (patch) | |
| tree | be4d5d14eb04dc24dfea3588c7174f680b5e054d /devel | |
| parent | Bump PORTREVISION after last commit. (diff) | |
Make gconf find gconfd-2 after its move to ${PREFIX}/libexec. This fixes
some compatibility problems between GNOME 1 and GNOME 2.
Reported by: Adam Weinberger <adam@vectors.cx>
Tested by: Adam Weinberger <adam@vectors.cx>
Approved by: portmgr (sobomax)
Notes
Notes:
svn path=/head/; revision=67163
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/gconf/Makefile | 2 | ||||
| -rw-r--r-- | devel/gconf/files/patch-gconf::gconf-internals.c | 16 | ||||
| -rw-r--r-- | devel/gconf/files/patch-gconf_Makefile.in | 10 |
3 files changed, 22 insertions, 6 deletions
diff --git a/devel/gconf/Makefile b/devel/gconf/Makefile index dc939a08d2b9..9bb59cc299bc 100644 --- a/devel/gconf/Makefile +++ b/devel/gconf/Makefile @@ -7,7 +7,7 @@ PORTNAME= gconf PORTVERSION= 1.0.9 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/GConf/1.0 diff --git a/devel/gconf/files/patch-gconf::gconf-internals.c b/devel/gconf/files/patch-gconf::gconf-internals.c index db4e8c961980..29f5d19ddb43 100644 --- a/devel/gconf/files/patch-gconf::gconf-internals.c +++ b/devel/gconf/files/patch-gconf::gconf-internals.c @@ -1,8 +1,5 @@ - -$FreeBSD$ - ---- gconf/gconf-internals.c 2001/11/07 11:27:13 1.1 -+++ gconf/gconf-internals.c 2001/11/07 11:27:52 +--- gconf/gconf-internals.c.orig Thu Mar 14 22:39:51 2002 ++++ gconf/gconf-internals.c Fri Sep 27 00:37:23 2002 @@ -28,6 +28,9 @@ #include <string.h> #include <sys/stat.h> @@ -13,3 +10,12 @@ $FreeBSD$ #include <unistd.h> #include <stdlib.h> #include <stdio.h> +@@ -3040,6 +3043,8 @@ + + if (gconf_file_exists (GCONF_BINDIR"/gconfd-2")) + argv[0] = g_strconcat (GCONF_BINDIR, "/gconfd-2", NULL); ++ else if (gconf_file_exists (GCONF_PREFIX"/libexec/gconfd-2")) ++ argv[0] = g_strconcat (GCONF_PREFIX, "/libexec/gconfd-2", NULL); + else + argv[0] = g_strconcat (GCONF_BINDIR, "/" GCONFD, NULL); + diff --git a/devel/gconf/files/patch-gconf_Makefile.in b/devel/gconf/files/patch-gconf_Makefile.in new file mode 100644 index 000000000000..3e7637f9f39a --- /dev/null +++ b/devel/gconf/files/patch-gconf_Makefile.in @@ -0,0 +1,10 @@ +--- gconf/Makefile.in.orig Fri Sep 27 00:28:12 2002 ++++ gconf/Makefile.in Fri Sep 27 00:28:46 2002 +@@ -154,6 +154,7 @@ + -DGCONF_ETCDIR=\""$(sysconfdir)/gconf"\" \ + -DGCONF_BUILDDIR=\""$(top_builddir)"\" \ + -DGCONF_BINDIR=\""$(bindir)"\" \ ++ -DGCONF_PREFIX=\""$(prefix)"\" \ + -DGCONF_BACKEND_DIR=\""$(pkglibdir)/$(MAJOR_VERSION)"\" \ + -DVERSION=\""$(VERSION)"\" \ + -DIID=\""OAFIID:gconfd:19991118"\" \ |