- update gconf2 to 2.22.0

(mostly bug/build/doc fixes)
This commit is contained in:
jasper 2008-04-29 18:23:56 +00:00
parent ca04046a2e
commit 4cb508f06a
5 changed files with 37 additions and 24 deletions

View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.27 2008/04/18 09:19:21 jasper Exp $
# $OpenBSD: Makefile,v 1.28 2008/04/29 18:23:56 jasper Exp $
COMMENT= configuration database system for GNOME
GNOME_PROJECT= GConf
GNOME_VERSION= 2.20.1
PKGNAME= gconf2-${GNOME_VERSION}p1
SHARED_LIBS += gconf-2 6.0 # .5.2
GNOME_VERSION= 2.22.0
PKGNAME= gconf2-${GNOME_VERSION}
SHARED_LIBS += gconf-2 6.1 # .5.5
CATEGORIES= devel
HOMEPAGE= http://www.gnome.org/projects/gconf/

View File

@ -1,5 +1,5 @@
MD5 (GConf-2.20.1.tar.bz2) = ZG/IlsYoKo8QM2WvD6LjAw==
RMD160 (GConf-2.20.1.tar.bz2) = dDvuNBcxQC5dSTjuAwrfT0Y9mlI=
SHA1 (GConf-2.20.1.tar.bz2) = xijiZFqRsVdJ8eusxi6mhcv6aBw=
SHA256 (GConf-2.20.1.tar.bz2) = D7RGuH5x/hCJ9D5nG1t2ieyR14G1sujw/HLUqDoBSDg=
SIZE (GConf-2.20.1.tar.bz2) = 1404919
MD5 (GConf-2.22.0.tar.bz2) = pWwEOv6xBSq69FQHQJsDMQ==
RMD160 (GConf-2.22.0.tar.bz2) = cfDG8giCaB79/8lX9thq/9SimoA=
SHA1 (GConf-2.22.0.tar.bz2) = KpymSe9YOU5CWgMNyZuGO0mailY=
SHA256 (GConf-2.22.0.tar.bz2) = VOQM8EfrQxzfmU92OuhAEH7W6bj5UhsrLrB8elX5LOA=
SIZE (GConf-2.22.0.tar.bz2) = 1416685

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.7 2007/11/10 14:08:16 jasper Exp $
--- configure.orig Mon Oct 15 04:02:50 2007
+++ configure Fri Oct 19 13:55:59 2007
@@ -22106,6 +22106,8 @@ else
$OpenBSD: patch-configure,v 1.8 2008/04/29 18:23:56 jasper Exp $
--- configure.orig Mon Mar 10 15:54:15 2008
+++ configure Tue Apr 29 20:00:06 2008
@@ -22090,6 +22090,8 @@ else
LDAP_SUPPORT_FALSE=
fi

View File

@ -1,23 +1,27 @@
$OpenBSD: patch-gconf_Makefile_in,v 1.10 2008/04/18 09:19:21 jasper Exp $
--- gconf/Makefile.in.orig Mon Oct 15 12:02:53 2007
+++ gconf/Makefile.in Fri Apr 18 11:04:37 2008
@@ -301,7 +301,7 @@ INCLUDES = \
$OpenBSD: patch-gconf_Makefile_in,v 1.11 2008/04/29 18:23:56 jasper 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 = \
-DGCONF_LOCALE_DIR=\""$(datadir)/locale"\" \
-DGCONF_SRCDIR=\""$(absolute_top_srcdir)"\" \
-DGCONF_CONFDIR=\""$(sysgconfdir)/$(MAJOR_VERSION)"\" \
- -DGCONF_ETCDIR=\""$(sysgconfdir)"\" \
+ -DGCONF_ETCDIR=\""/var/db/"\" \
+ -DGCONF_ETCDIR=\""/var/db/"\" \
-DGCONF_BINDIR=\""$(bindir)"\" \
-DGCONF_SERVERDIR=\""$(libexecdir)"\" \
-DGCONF_BUILDDIR=\""$(top_builddir)"\" \
@@ -794,8 +794,8 @@ default.path: $(srcdir)/default.path.in
@@ -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)
- $(INSTALL_DATA) default.path $(DESTDIR)$(sysgconfdir)/$(MAJOR_VERSION)/path
+ $(mkinstalldirs) $(DESTDIR)$(datarootdir)/examples/gconf2
+ $(INSTALL_DATA) default.path $(DESTDIR)$(datarootdir)/examples/gconf2/path
- 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:
rm -f $(DESTDIR)$(sysgconfdir)/$(MAJOR_VERSION)/path

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.18 2008/04/18 09:07:33 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.19 2008/04/29 18:23:56 jasper Exp $
%%SHARED%%
bin/gconf-merge-tree
bin/gconftool-2
@ -64,6 +64,9 @@ share/locale/am/LC_MESSAGES/GConf2.mo
share/locale/ar/
share/locale/ar/LC_MESSAGES/
share/locale/ar/LC_MESSAGES/GConf2.mo
share/locale/as/
share/locale/as/LC_MESSAGES/
share/locale/as/LC_MESSAGES/GConf2.mo
share/locale/az/
share/locale/az/LC_MESSAGES/
share/locale/az/LC_MESSAGES/GConf2.mo
@ -145,6 +148,9 @@ share/locale/ml/LC_MESSAGES/GConf2.mo
share/locale/mn/
share/locale/mn/LC_MESSAGES/
share/locale/mn/LC_MESSAGES/GConf2.mo
share/locale/mr/
share/locale/mr/LC_MESSAGES/
share/locale/mr/LC_MESSAGES/GConf2.mo
share/locale/ms/
share/locale/ms/LC_MESSAGES/
share/locale/ms/LC_MESSAGES/GConf2.mo
@ -171,6 +177,9 @@ share/locale/ru/LC_MESSAGES/GConf2.mo
share/locale/rw/
share/locale/rw/LC_MESSAGES/
share/locale/rw/LC_MESSAGES/GConf2.mo
share/locale/si/
share/locale/si/LC_MESSAGES/
share/locale/si/LC_MESSAGES/GConf2.mo
share/locale/sk/LC_MESSAGES/GConf2.mo
share/locale/sl/LC_MESSAGES/GConf2.mo
share/locale/sq/