summaryrefslogtreecommitdiff
path: root/devel/GConf2/patches/patch-ac
diff options
context:
space:
mode:
Diffstat (limited to 'devel/GConf2/patches/patch-ac')
-rw-r--r--devel/GConf2/patches/patch-ac28
1 files changed, 13 insertions, 15 deletions
diff --git a/devel/GConf2/patches/patch-ac b/devel/GConf2/patches/patch-ac
index ab3ef8cadfc..1ef31eec0d1 100644
--- a/devel/GConf2/patches/patch-ac
+++ b/devel/GConf2/patches/patch-ac
@@ -1,19 +1,17 @@
-$NetBSD: patch-ac,v 1.2 2003/12/14 19:44:38 jmmv Exp $
+$NetBSD: patch-ac,v 1.3 2004/05/03 20:55:36 jmmv Exp $
---- gconf/Makefile.in.orig 2003-10-25 23:27:25.000000000 +0000
-+++ gconf/Makefile.in 2003-10-25 23:29:40.000000000 +0000
-@@ -148,8 +148,8 @@
- -DG_LOG_DOMAIN=\"GConf\" \
- -DGCONF_LOCALE_DIR=\""$(gconflocaledir)"\" \
- -DGCONF_SRCDIR=\""$(absolute_top_srcdir)"\" \
-- -DGCONF_CONFDIR=\""$(sysconfdir)/gconf/$(MAJOR_VERSION)"\" \
-- -DGCONF_ETCDIR=\""$(sysconfdir)/gconf"\" \
-+ -DGCONF_CONFDIR=\""$(sysconfdir)/$(MAJOR_VERSION)"\" \
-+ -DGCONF_ETCDIR=\""$(sysconfdir)"\" \
- -DGCONF_BINDIR=\""$(bindir)"\" \
- -DGCONF_SERVERDIR=\""$(libexecdir)"\" \
- -DGCONF_BUILDDIR=\""$(top_builddir)"\" \
-@@ -606,8 +606,8 @@
+--- gconf/Makefile.in.orig 2004-04-19 14:11:03.000000000 +0200
++++ gconf/Makefile.in
+@@ -144,7 +144,7 @@ NULL =
+
+ GCONFD_BINARY_NAME = gconfd-2
+
+-INCLUDES = -I$(top_srcdir) -I$(top_builddir) $(DEPENDENT_WITH_XML_AND_GTK_CFLAGS) -DG_LOG_DOMAIN=\"GConf\" -DGCONF_LOCALE_DIR=\""$(gconflocaledir)"\" -DGCONF_SRCDIR=\""$(absolute_top_srcdir)"\" -DGCONF_CONFDIR=\""$(sysconfdir)/gconf/$(MAJOR_VERSION)"\" -DGCONF_ETCDIR=\""$(sysconfdir)/gconf"\" -DGCONF_BINDIR=\""$(bindir)"\" -DGCONF_SERVERDIR=\""$(libexecdir)"\" -DGCONF_BUILDDIR=\""$(top_builddir)"\" -DGCONF_BACKEND_DIR=\""$(pkglibdir)/$(MAJOR_VERSION)"\" -DVERSION=\""$(VERSION)"\" -DGCONF_ENABLE_INTERNALS=1 -DGCONFD=\""$(GCONFD_BINARY_NAME)"\" $(NULL)
++INCLUDES = -I$(top_srcdir) -I$(top_builddir) $(DEPENDENT_WITH_XML_AND_GTK_CFLAGS) -DG_LOG_DOMAIN=\"GConf\" -DGCONF_LOCALE_DIR=\""$(gconflocaledir)"\" -DGCONF_SRCDIR=\""$(absolute_top_srcdir)"\" -DGCONF_CONFDIR=\""$(sysconfdir)/$(MAJOR_VERSION)"\" -DGCONF_ETCDIR=\""$(sysconfdir)"\" -DGCONF_BINDIR=\""$(bindir)"\" -DGCONF_SERVERDIR=\""$(libexecdir)"\" -DGCONF_BUILDDIR=\""$(top_builddir)"\" -DGCONF_BACKEND_DIR=\""$(pkglibdir)/$(MAJOR_VERSION)"\" -DVERSION=\""$(VERSION)"\" -DGCONF_ENABLE_INTERNALS=1 -DGCONFD=\""$(GCONFD_BINARY_NAME)"\" $(NULL)
+
+
+ EFENCE =
+@@ -620,8 +620,8 @@ $(CORBA_SOURCECODE): $(srcdir)/GConfX.id
$(ORBIT_IDL) $(srcdir)/GConfX.idl
install-data-local: