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

update gconf2 to 2.18.0.1

Browse Source 
based on diffs by alek@

ok martynas@
This commit is contained in:
jasper 2007-04-24 12:53:37 +00:00
parent 8ec17ba02f
commit 2cd16d7f5e
9 changed files with 116 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
devel/gconf2/Makefile
View File

@ -1,50 +1,40 @@
# $OpenBSD: Makefile,v 1.22 2007/04/14 21:20:19 sturm Exp $
# $OpenBSD: Makefile,v 1.23 2007/04/24 12:53:37 jasper Exp $
COMMENT= "configuration database system for GNOME"
COMMENT= "configuration database system for GNOME"
VERSION= 2.10.1
DISTNAME= GConf-${VERSION}
PKGNAME= gconf2-${VERSION}p4
SHARED_LIBS += gconf-2 5.0 # .5.0
VERSION= 2.18.0.1
DISTNAME= GConf-${VERSION}
PKGNAME= gconf2-${VERSION}
SHARED_LIBS += gconf-2 5.2 # .5.2
CATEGORIES= devel
CATEGORIES= devel
HOMEPAGE= http://www.gnome.org/projects/gconf/
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/GConf/2.10/}
EXTRACT_SUFX= .tar.bz2
MODULES= devel/gettext
LIB_DEPENDS= ORBit-2::devel/ORBit2 \
gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2 \
xml2.>=6::textproc/libxml
HOMEPAGE= http://www.gnome.org/projects/gconf/
# GPL
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_PACKAGE_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= X11 Xau Xdmcp Xrender atk-1.0 c expat m \
fontconfig freetype glib-2.0 gmodule-2.0 \
gobject-2.0 gthread-2.0 pango-1.0 \
pangoft2-1.0 pangocairo-1.0 cairo glitz png \
popt pthread z
PERMIT_DISTFILES_CDROM= Yes
WANTLIB= X11 Xau Xcursor 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 png pthread z
DEFAULT_GCONF_SOURCE= xml::/var/db/gconf/gconf.xml.defaults
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/GConf/2.18/}
EXTRACT_SUFX= .tar.bz2
USE_X11= Yes
USE_GMAKE= Yes
USE_LIBTOOL= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
CONFIGURE_ARGS+= --disable-gtk-conf
CONFIGURE_ARGS+= --enable-gconf-source=${DEFAULT_GCONF_SOURCE}
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
MODULES= devel/gettext
BUILD_DEPENDS= :p5-XML-Parser-*:textproc/p5-XML-Parser
LIB_DEPENDS= glib-2.0.>=1200.0,gmodule-2.0.>=1200.0,gobject-2.0.>=1200.0,gthread-2.0.>=1200.0::devel/glib2 \
gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2 \
ORBit-2.>=2.0::devel/ORBit2 \
xml2.>=9::textproc/libxml
post-install:
@${INSTALL_DATA_DIR} ${PREFIX}/share/examples/gconf2; \
cp -Rp ${WRKINST}/${SYSCONFDIR}/* ${PREFIX}/share/examples/gconf2; \
USE_LIBTOOL= Yes
USE_GMAKE= Yes
USE_X11= Yes
CONFIGURE_STYLE=gnu
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
.include <bsd.port.mk>

10
devel/gconf2/distinfo
View File

@ -1,5 +1,5 @@
MD5 (GConf-2.10.1.tar.bz2) = xBG9bp4lNi6mE7uaCEvpBA==
RMD160 (GConf-2.10.1.tar.bz2) = XxOEbNo/ThMmjeUfPEZwV6rQEr4=
SHA1 (GConf-2.10.1.tar.bz2) = oo+VuRYucQgzhuoT9aTJvELE/fM=
SHA256 (GConf-2.10.1.tar.bz2) = MZz0devpbZdL7aVy9TUosrvUu5oIWsqfhDRYaJ7NycE=
SIZE (GConf-2.10.1.tar.bz2) = 1797862
MD5 (GConf-2.18.0.1.tar.bz2) = qg4KByn7AhurcrQWb9OS+Q==
RMD160 (GConf-2.18.0.1.tar.bz2) = ebrVoZQEJ3q/vX8Xth4JJ03MGqM=
SHA1 (GConf-2.18.0.1.tar.bz2) = a7zq/GNkV+wU7C17Q1gjX/bPCNM=
SHA256 (GConf-2.18.0.1.tar.bz2) = WKc480B43ps5BkYKKX51HoCghG5PO/M+GIQhbQ2kK/E=
SIZE (GConf-2.18.0.1.tar.bz2) = 1347765

12
devel/gconf2/patches/patch-configure Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-configure,v 1.6 2007/04/24 12:53:37 jasper Exp $
--- configure.orig Mon Mar 19 01:10:53 2007
+++ configure Mon Mar 19 01:11:06 2007
@@ -21939,6 +21939,8 @@ else
LDAP_SUPPORT_FALSE=
fi
+LDAP_SUPPORT_TRUE='#'
+LDAP_SUPPORT_FALSE=
if test "$os_win32" != yes; then

11
devel/gconf2/patches/patch-doc_gconf_Makefile_in
View File

@ -1,11 +0,0 @@
$OpenBSD: patch-doc_gconf_Makefile_in,v 1.6 2004/12/30 04:30:12 marcm Exp $
--- doc/gconf/Makefile.in.orig Tue Oct 12 09:49:08 2004
+++ doc/gconf/Makefile.in Wed Dec 22 18:48:43 2004
@@ -432,6 +432,7 @@ uninstall-am: uninstall-info-am uninstal
@ENABLE_GTK_DOC_TRUE@all-local: html-build.stamp
+@ENABLE_GTK_DOC_FALSE@all-local:
#### scan ####

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

@ -1,10 +1,14 @@
--- gconf/Makefile.in.orig Tue Oct 12 09:49:08 2004
+++ gconf/Makefile.in Wed Dec 22 18:48:43 2004
@@ -208,6 +208,7 @@ INCLUDES = \
-DVERSION=\""$(VERSION)"\" \
-DGCONF_ENABLE_INTERNALS=1 \
-DGCONFD=\""$(GCONFD_BINARY_NAME)"\" \
+ -DGCONF_CONFIG_SOURCE=\""$(GCONF_CONFIG_SOURCE)"\" \
$(NULL)
$OpenBSD: patch-gconf_Makefile_in,v 1.8 2007/04/24 12:53:38 jasper Exp $
--- gconf/Makefile.in.orig Mon Mar 19 01:50:27 2007
+++ gconf/Makefile.in Mon Mar 19 01:51:46 2007
@@ -797,8 +797,8 @@ 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
uninstall-local:
rm -f $(DESTDIR)$(sysgconfdir)/$(MAJOR_VERSION)/path

25
devel/gconf2/patches/patch-gconf_default_path_in
View File

@ -1,19 +1,30 @@
--- gconf/default.path.in.orig Thu Jul 8 22:44:44 2004
+++ gconf/default.path.in Wed Dec 22 18:48:43 2004
@@ -6,7 +6,7 @@
$OpenBSD: patch-gconf_default_path_in,v 1.5 2007/04/24 12:53:38 jasper Exp $
--- gconf/default.path.in.orig Mon Mar 19 01:21:37 2007
+++ gconf/default.path.in Mon Mar 19 01:22:39 2007
@@ -6,12 +6,12 @@
# See the GConf manual for details
# Look first in systemwide mandatory settings directory
-xml:readonly:@EXPANDED_SYSGCONFDIR@/gconf.xml.mandatory
-xml:readonly:@sysgconfdir@/gconf.xml.mandatory
+xml:readonly:/var/db/gconf/gconf.xml.mandatory
# To read in any mandatory settings that the Sys Admin may have created
# prior to a desktop system upgrade. The SysAdmin can stick read-only system
@@ -26,7 +26,7 @@ xml:readwrite:$(HOME)/.gconf
include @EXPANDED_SYSGCONFDIR@/2/local-defaults.path
# wide sources in this file.
-include @sysgconfdir@/2/local-mandatory.path
+include /var/db/gconf/2/local-mandatory.path
# Now see where users want us to look - basically the user can stick arbitrary
# sources in a ~/.gconf.path file and they're inserted here
@@ -23,10 +23,10 @@ xml:readwrite:$(HOME)/.gconf
# To read in any defaults settings that the Sys Admin may have created
# prior to a desktop system upgrade. The SysAdmin can stick default values
# system-wide in this file.
-include @sysgconfdir@/2/local-defaults.path
+include /var/db/gconf/2/local-defaults.path
# Finally, look at the systemwide defaults
-xml:readonly:@EXPANDED_SYSGCONFDIR@/gconf.xml.defaults
-xml:readonly:@sysgconfdir@/gconf.xml.defaults
+xml:readonly:/var/db/gconf/gconf.xml.defaults

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

@ -1,12 +1,12 @@
$OpenBSD: patch-gconf_gconftool_c,v 1.5 2004/12/30 04:30:12 marcm Exp $
--- gconf/gconftool.c.orig Mon Aug 30 00:35:33 2004
+++ gconf/gconftool.c Wed Dec 22 18:48:43 2004
@@ -4008,7 +4008,7 @@ do_get_default_source (const gchar** arg
$OpenBSD: patch-gconf_gconftool_c,v 1.6 2007/04/24 12:53:38 jasper Exp $
--- gconf/gconftool.c.orig Fri Mar 2 23:10:13 2007
+++ gconf/gconftool.c Thu Apr 19 20:32:10 2007
@@ -4049,7 +4049,7 @@ do_get_default_source (const gchar** args)
}
/* Use default database */
- source = g_strconcat("xml::", GCONF_ETCDIR, "/gconf.xml.defaults", NULL);
+ source = g_strconcat(GCONF_CONFIG_SOURCE, NULL);
- 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);

3
devel/gconf2/pkg/PFRAG.shared
View File

@ -1,3 +1,4 @@
@comment $OpenBSD: PFRAG.shared,v 1.3 2006/01/06 17:51:02 bernd Exp $
@comment $OpenBSD: PFRAG.shared,v 1.4 2007/04/24 12:53:38 jasper Exp $
lib/GConf/2/libgconfbackend-oldxml.so
lib/GConf/2/libgconfbackend-xml.so
@lib lib/libgconf-2.so.${LIBgconf-2_VERSION}

46
devel/gconf2/pkg/PLIST
View File

@ -1,4 +1,5 @@
@comment $OpenBSD: PLIST,v 1.15 2006/01/06 17:51:02 bernd Exp $
@comment $OpenBSD: PLIST,v 1.16 2007/04/24 12:53:38 jasper Exp $
%%SHARED%%
bin/gconf-merge-tree
bin/gconftool-2
include/gconf/
@ -17,7 +18,6 @@ lib/GConf/
lib/GConf/2/
lib/GConf/2/libgconfbackend-oldxml.a
lib/GConf/2/libgconfbackend-oldxml.la
lib/GConf/2/libgconfbackend-oldxml.so
lib/GConf/2/libgconfbackend-xml.a
lib/GConf/2/libgconfbackend-xml.la
lib/libgconf-2.a
@ -28,18 +28,11 @@ libexec/gconf-sanity-check-2
libexec/gconfd-2
@man man/man1/gconftool-2.1
share/aclocal/gconf-2.m4
share/examples/gconf2/
share/examples/gconf2/gconf/
@sample ${SYSCONFDIR}/gconf/
share/examples/gconf2/gconf/2/
share/examples/gconf2/
@sample ${SYSCONFDIR}/gconf/2/
share/examples/gconf2/gconf/2/path
share/examples/gconf2/path
@sample ${SYSCONFDIR}/gconf/2/path
@sample /var/db/gconf/
@sample /var/db/gconf/gconf.xml.defaults/
@sample /var/db/gconf/gconf.xml.mandatory/
@comment share/examples/gconf2/gconf/gconf.xml.defaults/
@comment share/examples/gconf2/gconf/gconf.xml.mandatory/
share/gtk-doc/
share/gtk-doc/html/
share/gtk-doc/html/gconf/
@ -57,6 +50,7 @@ share/gtk-doc/html/gconf/gconf-gconf-sources.html
share/gtk-doc/html/gconf/gconf-gconf-value.html
share/gtk-doc/html/gconf/gconf-gconf.html
share/gtk-doc/html/gconf/gconf.devhelp
share/gtk-doc/html/gconf/gconf.devhelp2
share/gtk-doc/html/gconf/home.png
share/gtk-doc/html/gconf/index.html
share/gtk-doc/html/gconf/index.sgml
@ -78,6 +72,9 @@ share/locale/bg/LC_MESSAGES/GConf2.mo
share/locale/bn/
share/locale/bn/LC_MESSAGES/
share/locale/bn/LC_MESSAGES/GConf2.mo
share/locale/bn_IN/
share/locale/bn_IN/LC_MESSAGES/
share/locale/bn_IN/LC_MESSAGES/GConf2.mo
share/locale/bs/
share/locale/bs/LC_MESSAGES/
share/locale/bs/LC_MESSAGES/GConf2.mo
@ -110,19 +107,32 @@ share/locale/gl/LC_MESSAGES/GConf2.mo
share/locale/gu/
share/locale/gu/LC_MESSAGES/
share/locale/gu/LC_MESSAGES/GConf2.mo
share/locale/he/LC_MESSAGES/GConf2.mo
share/locale/hi/
share/locale/hi/LC_MESSAGES/
share/locale/hi/LC_MESSAGES/GConf2.mo
share/locale/hr/LC_MESSAGES/GConf2.mo
share/locale/hu/LC_MESSAGES/GConf2.mo
share/locale/id/LC_MESSAGES/GConf2.mo
share/locale/is/
share/locale/is/LC_MESSAGES/
share/locale/is/LC_MESSAGES/GConf2.mo
share/locale/it/LC_MESSAGES/GConf2.mo
share/locale/ja/LC_MESSAGES/GConf2.mo
share/locale/ka/
share/locale/ka/LC_MESSAGES/
share/locale/ka/LC_MESSAGES/GConf2.mo
share/locale/ko/LC_MESSAGES/GConf2.mo
share/locale/ku/
share/locale/ku/LC_MESSAGES/
share/locale/ku/LC_MESSAGES/GConf2.mo
share/locale/lt/
share/locale/lt/LC_MESSAGES/
share/locale/lt/LC_MESSAGES/GConf2.mo
share/locale/lv/LC_MESSAGES/GConf2.mo
share/locale/mg/
share/locale/mg/LC_MESSAGES/
share/locale/mg/LC_MESSAGES/GConf2.mo
share/locale/mk/
share/locale/mk/LC_MESSAGES/
share/locale/mk/LC_MESSAGES/GConf2.mo
@ -141,7 +151,9 @@ share/locale/ne/LC_MESSAGES/
share/locale/ne/LC_MESSAGES/GConf2.mo
share/locale/nl/LC_MESSAGES/GConf2.mo
share/locale/nn/LC_MESSAGES/GConf2.mo
share/locale/no/LC_MESSAGES/GConf2.mo
share/locale/or/
share/locale/or/LC_MESSAGES/
share/locale/or/LC_MESSAGES/GConf2.mo
share/locale/pa/
share/locale/pa/LC_MESSAGES/
share/locale/pa/LC_MESSAGES/GConf2.mo
@ -166,6 +178,9 @@ share/locale/sv/LC_MESSAGES/GConf2.mo
share/locale/ta/
share/locale/ta/LC_MESSAGES/
share/locale/ta/LC_MESSAGES/GConf2.mo
share/locale/th/
share/locale/th/LC_MESSAGES/
share/locale/th/LC_MESSAGES/GConf2.mo
share/locale/tr/LC_MESSAGES/GConf2.mo
share/locale/uk/LC_MESSAGES/GConf2.mo
share/locale/vi/LC_MESSAGES/GConf2.mo
@ -176,10 +191,15 @@ share/locale/yi/
share/locale/yi/LC_MESSAGES/
share/locale/yi/LC_MESSAGES/GConf2.mo
share/locale/zh_CN/LC_MESSAGES/GConf2.mo
share/locale/zh_HK/
share/locale/zh_HK/LC_MESSAGES/
share/locale/zh_HK/LC_MESSAGES/GConf2.mo
share/locale/zh_TW/LC_MESSAGES/GConf2.mo
share/sgml/
share/sgml/gconf/
share/sgml/gconf/gconf-1.0.dtd
%%SHARED%%
@sample /var/db/gconf/
@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/*