cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- fix GCONF_ETCDIR

Browse Source 
before this change it wasn't possible to add mandatory settings without
tweaking gconf
- while here, rework the way we build this port so we can drop some
patching
This commit is contained in:
ajacoutot 2008-07-25 13:42:57 +00:00
parent 35b5036f7c
commit 4e96d0b36a
4 changed files with 22 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
devel/gconf2/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.30 2008/06/18 20:24:12 sthen Exp $
# $OpenBSD: Makefile,v 1.31 2008/07/25 13:42:57 ajacoutot Exp $
COMMENT= configuration database system for GNOME
GNOME_PROJECT= GConf
GNOME_VERSION= 2.22.0
PKGNAME= gconf2-${GNOME_VERSION}p0
PKGNAME= gconf2-${GNOME_VERSION}p1
SHARED_LIBS += gconf-2 6.1 # .5.5
CATEGORIES= devel
@ -15,6 +15,7 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_PACKAGE_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
WANTLIB= X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \
Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat fontconfig \
freetype glitz m pango-1.0 pangocairo-1.0 pangoft2-1.0 \
@ -33,5 +34,8 @@ USE_X11= Yes
CONFIGURE_STYLE=gnu
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS= ${CONFIGURE_SHARED}
FAKE_FLAGS= sysgconfdir=${PREFIX}/share/examples/gconf2
.include <bsd.port.mk>

19
devel/gconf2/patches/patch-gconf_Makefile_in
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-gconf_Makefile_in,v 1.11 2008/04/29 18:23:56 jasper Exp $
$OpenBSD: patch-gconf_Makefile_in,v 1.12 2008/07/25 13:42:57 ajacoutot Exp $
--- gconf/Makefile.in.orig Mon Mar 10 15:54:18 2008
+++ gconf/Makefile.in Tue Apr 29 20:06:19 2008
@@ -303,7 +303,7 @@ INCLUDES = \
@ -6,22 +6,7 @@ $OpenBSD: patch-gconf_Makefile_in,v 1.11 2008/04/29 18:23:56 jasper Exp $
-DGCONF_SRCDIR=\""$(absolute_top_srcdir)"\" \
-DGCONF_CONFDIR=\""$(sysgconfdir)/$(MAJOR_VERSION)"\" \
- -DGCONF_ETCDIR=\""$(sysgconfdir)"\" \
+ -DGCONF_ETCDIR=\""/var/db/"\" \
+ -DGCONF_ETCDIR=\""/var/db/gconf"\" \
-DGCONF_BINDIR=\""$(bindir)"\" \
-DGCONF_SERVERDIR=\""$(libexecdir)"\" \
-DGCONF_BUILDDIR=\""$(top_builddir)"\" \
@@ -795,11 +795,11 @@ default.path: $(srcdir)/default.path.in
<$(srcdir)/default.path.in >default.path
install-data-local: default.path
- $(mkinstalldirs) $(DESTDIR)$(sysgconfdir)/$(MAJOR_VERSION)
- if test -f $(DESTDIR)$(sysgconfdir)/$(MAJOR_VERSION)/path; then \
+ $(mkinstalldirs) $(DESTDIR)$(datarootdir)/examples/gconf2/
+ if test -f $(DESTDIR)$(datarootdir)/examples/gconf2/path; then \
echo "Existing path configuration file not changed"; \
else \
- $(INSTALL_DATA) default.path $(DESTDIR)$(sysgconfdir)/$(MAJOR_VERSION)/path; \
+ $(INSTALL_DATA) default.path $(DESTDIR)$(datarootdir)/examples/gconf2/path; \
fi
uninstall-local:

12
devel/gconf2/patches/patch-gconf_gconftool_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-gconf_gconftool_c,v 1.7 2007/11/10 14:08:16 jasper Exp $
--- gconf/gconftool.c.orig Wed Aug 1 07:36:59 2007
+++ gconf/gconftool.c Fri Oct 19 13:55:59 2007
@@ -4182,7 +4182,7 @@ do_get_default_source (const gchar** args)
}
/* Use default database */
- source = g_strconcat("xml:merged:", GCONF_ETCDIR, "/gconf.xml.defaults", NULL);
+ source = g_strconcat("xml:merged:", "/var/db/gconf/gconf.xml.defaults", NULL);
g_print ("%s\n", source);
g_free(source);

27
devel/gconf2/pkg/PLIST
View File

@ -1,7 +1,7 @@
@comment $OpenBSD: PLIST,v 1.19 2008/04/29 18:23:56 jasper Exp $
@comment $OpenBSD: PLIST,v 1.20 2008/07/25 13:42:57 ajacoutot Exp $
%%SHARED%%
bin/gconf-merge-tree
bin/gconftool-2
@bin bin/gconf-merge-tree
@bin bin/gconftool-2
include/gconf/
include/gconf/2/
include/gconf/2/gconf/
@ -24,15 +24,22 @@ lib/libgconf-2.a
lib/libgconf-2.la
lib/pkgconfig/
lib/pkgconfig/gconf-2.0.pc
libexec/gconf-sanity-check-2
libexec/gconfd-2
@bin libexec/gconf-sanity-check-2
@bin libexec/gconfd-2
@man man/man1/gconftool-2.1
share/aclocal/gconf-2.m4
@sample ${SYSCONFDIR}/gconf/
share/examples/gconf2/
@sample ${SYSCONFDIR}/gconf/
share/examples/gconf2/2/
@sample ${SYSCONFDIR}/gconf/2/
share/examples/gconf2/path
share/examples/gconf2/2/path
@sample ${SYSCONFDIR}/gconf/2/path
share/examples/gconf2/gconf.xml.defaults/
@sample /var/db/gconf/
@sample /var/db/gconf/2/
@sample /var/db/gconf/gconf.xml.defaults/
share/examples/gconf2/gconf.xml.mandatory/
@sample /var/db/gconf/gconf.xml.mandatory/
share/gtk-doc/
share/gtk-doc/html/
share/gtk-doc/html/gconf/
@ -100,8 +107,6 @@ share/locale/en_GB/LC_MESSAGES/
share/locale/en_GB/LC_MESSAGES/GConf2.mo
share/locale/es/LC_MESSAGES/GConf2.mo
share/locale/et/LC_MESSAGES/GConf2.mo
share/locale/eu/
share/locale/eu/LC_MESSAGES/
share/locale/eu/LC_MESSAGES/GConf2.mo
share/locale/fa/
share/locale/fa/LC_MESSAGES/
@ -214,9 +219,5 @@ share/locale/zh_TW/LC_MESSAGES/GConf2.mo
share/sgml/
share/sgml/gconf/
share/sgml/gconf/gconf-1.0.dtd
@sample /var/db/gconf/
@sample /var/db/gconf/2/
@sample /var/db/gconf/gconf.xml.defaults/
@sample /var/db/gconf/gconf.xml.mandatory/
@extraunexec rm -fr /var/db/gconf/gconf.xml.defaults/*
@extraunexec rm -fr /var/db/gconf/gconf.xml.mandatory/*