From 42689a2f5befbce4cd50c316f06cde02d66e5337 Mon Sep 17 00:00:00 2001 From: ahze Date: Mon, 17 Jul 2006 17:20:28 +0000 Subject: - Move to LOCALBASE, This includes a path update so everything in X11BASE/etc/gconf will still work. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@6610 df743ca5-7f9a-e211-a948-0013205c9059 --- devel/gconf2/Makefile | 63 ++++++++++++++ devel/gconf2/distinfo | 3 + devel/gconf2/files/patch-ab | 11 +++ devel/gconf2/files/patch-gconf_default.path.in | 12 +++ devel/gconf2/files/patch-gconf_gconfd.c | 64 ++++++++++++++ devel/gconf2/files/patch-gconf_gconftool.c | 28 +++++++ devel/gconf2/pkg-descr | 18 ++++ devel/gconf2/pkg-plist | 112 +++++++++++++++++++++++++ 8 files changed, 311 insertions(+) create mode 100644 devel/gconf2/Makefile create mode 100644 devel/gconf2/distinfo create mode 100644 devel/gconf2/files/patch-ab create mode 100644 devel/gconf2/files/patch-gconf_default.path.in create mode 100644 devel/gconf2/files/patch-gconf_gconfd.c create mode 100644 devel/gconf2/files/patch-gconf_gconftool.c create mode 100644 devel/gconf2/pkg-descr create mode 100644 devel/gconf2/pkg-plist (limited to 'devel') diff --git a/devel/gconf2/Makefile b/devel/gconf2/Makefile new file mode 100644 index 000000000..3d5d01eef --- /dev/null +++ b/devel/gconf2/Makefile @@ -0,0 +1,63 @@ +# New ports collection makefile for: gconf2 +# Date created: 28th June 2000 +# Whom: Ade Lovett +# +# $FreeBSD$ +# $MCom: ports/devel/gconf2/Makefile,v 1.72 2006/04/13 07:52:32 bland Exp $ +# + +PORTNAME= gconf2 +PORTVERSION= 2.14.0 +PORTREVISION?= 3 +CATEGORIES= devel gnome +MASTER_SITES= ${MASTER_SITE_GNOME} +MASTER_SITE_SUBDIR= sources/GConf/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} +DISTNAME= GConf-${PORTVERSION} +DIST_SUBDIR= gnome2 + +MAINTAINER= gnome@FreeBSD.org +COMMENT= A configuration database system for GNOME + +USE_BZIP2= yes + +.if !defined(REFERENCE_PORT) + +USE_GMAKE= yes +USE_GETTEXT= yes +USE_XLIB= yes +USE_GNOME= gnomehier gnomehack orbit2 gtk20 libxml2 linc ltverhack referencehack +INSTALLS_SHLIB= yes +USE_AUTOTOOLS= libtool:15 +CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \ + --disable-gtk-doc +# --enable-gconf-source=${PREFIX}/etc/gconf/schemas \ + +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" +MAN1= gconftool-2.1 + +.include + +.if defined(WITH_LDAP) || exists(${LOCALBASE}/include/ldap.h) +USE_OPENLDAP= yes + +PLIST_SUB+= LDAP="" +.else +PLIST_SUB+= LDAP="@comment " +.endif + +pre-everything:: +.if !defined(WITH_LDAP) + @${ECHO_MSG} + @${ECHO_MSG} "You can enable ldap support by defining" + @${ECHO_MSG} "WITH_LDAP" + @${ECHO_MSG} +.endif + +post-patch: + @${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|' \ + ${WRKSRC}/gconf/default.path.in + +.include + +.endif diff --git a/devel/gconf2/distinfo b/devel/gconf2/distinfo new file mode 100644 index 000000000..5bc575714 --- /dev/null +++ b/devel/gconf2/distinfo @@ -0,0 +1,3 @@ +MD5 (gnome2/GConf-2.14.0.tar.bz2) = d07c2efcaf477cf34225c604a04b6271 +SHA256 (gnome2/GConf-2.14.0.tar.bz2) = 040c512ebc39285bce78c177e9e434e7b6731fd53a001768ee3405a919837525 +SIZE (gnome2/GConf-2.14.0.tar.bz2) = 1895477 diff --git a/devel/gconf2/files/patch-ab b/devel/gconf2/files/patch-ab new file mode 100644 index 000000000..6f25900e7 --- /dev/null +++ b/devel/gconf2/files/patch-ab @@ -0,0 +1,11 @@ +--- Makefile.in.orig Sun Aug 4 22:38:39 2002 ++++ Makefile.in Sun Aug 4 22:39:52 2002 +@@ -35,7 +35,7 @@ + DESTDIR = + + pkgdatadir = $(datadir)/@PACKAGE@ +-pkglibdir = $(libdir)/@PACKAGE@ ++pkglibdir = $(prefix)/libdata/pkgconfig + pkgincludedir = $(includedir)/@PACKAGE@ + + top_builddir = . diff --git a/devel/gconf2/files/patch-gconf_default.path.in b/devel/gconf2/files/patch-gconf_default.path.in new file mode 100644 index 000000000..32b327490 --- /dev/null +++ b/devel/gconf2/files/patch-gconf_default.path.in @@ -0,0 +1,12 @@ +--- gconf/default.path.in.orig Mon Jul 17 13:14:41 2006 ++++ gconf/default.path.in Mon Jul 17 13:15:19 2006 +@@ -28,5 +28,8 @@ + # Finally, look at the systemwide defaults + xml:readonly:@EXPANDED_SYSGCONFDIR@/gconf.xml.defaults + +- ++xml:readonly:%%X11BASE%%/etc/gconf/gconf.xml.mandatory ++include %%X11BASE%%/etc/gconf/2/local-mandatory.path ++include %%X11BASE%%/etc/gconf/2/local-defaults.path ++xml:readonly:%%X11BASE%%/etc/gconf/gconf.xml.defaults + diff --git a/devel/gconf2/files/patch-gconf_gconfd.c b/devel/gconf2/files/patch-gconf_gconfd.c new file mode 100644 index 000000000..ef551cb28 --- /dev/null +++ b/devel/gconf2/files/patch-gconf_gconfd.c @@ -0,0 +1,64 @@ +--- gconf/gconfd.c.orig Fri May 5 12:40:23 2006 ++++ gconf/gconfd.c Fri May 5 12:41:43 2006 +@@ -124,12 +124,6 @@ + + static gboolean in_shutdown = FALSE; + +-/* +- * Flag indicating we received a SIGHUP and we should reaload +- * all sources during the next periodic_cleanup() +- */ +-static gboolean need_db_reload = FALSE; +- + /* + * CORBA goo + */ +@@ -410,6 +404,18 @@ + } + + static void ++reload_db (void) ++{ ++ gconf_log (GCL_INFO, _("SIGHUP received, reloading all databases")); ++ ++ logfile_save (); ++ shutdown_databases (); ++ init_databases (); ++ gconf_server_load_sources (); ++ logfile_read (); ++} ++ ++static void + signal_handler (int signo) + { + static gint in_fatal = 0; +@@ -482,8 +488,8 @@ + case SIGHUP: + --in_fatal; + +- /* reload sources during next periodic_cleanup() */ +- need_db_reload = TRUE; ++ /* reload sources immediately */ ++ reload_db (); + break; + #endif + +@@ -864,18 +870,6 @@ + static gboolean + periodic_cleanup_timeout(gpointer data) + { +- if (need_db_reload) +- { +- gconf_log (GCL_INFO, _("SIGHUP received, reloading all databases")); +- +- need_db_reload = FALSE; +- logfile_save (); +- shutdown_databases (); +- init_databases (); +- gconf_server_load_sources (); +- logfile_read (); +- } +- + gconf_log (GCL_DEBUG, "Performing periodic cleanup, expiring cache cruft"); + + drop_old_clients (); diff --git a/devel/gconf2/files/patch-gconf_gconftool.c b/devel/gconf2/files/patch-gconf_gconftool.c new file mode 100644 index 000000000..c47e5e426 --- /dev/null +++ b/devel/gconf2/files/patch-gconf_gconftool.c @@ -0,0 +1,28 @@ +--- gconf/gconftool.c.orig Fri May 5 12:36:01 2006 ++++ gconf/gconftool.c Fri May 5 12:39:29 2006 +@@ -3724,6 +3724,8 @@ + static int + do_makefile_install(GConfEngine* conf, const gchar** args, gboolean unload) + { ++ int sync_result; ++ + if (args == NULL) + { + g_printerr (_("Must specify some schema files to install\n")); +@@ -3738,7 +3740,15 @@ + ++args; + } + +- return do_sync (conf); ++ sync_result = do_sync (conf); ++ ++ /* ++ * Send all the gconfd-2 processes a SIGHUP so that they reload the ++ * databases and pick up the added/removed schemas. ++ */ ++ system("/usr/bin/killall -SIGHUP gconfd-2 >/dev/null 2>&1"); ++ ++ return sync_result; + } + + typedef enum { diff --git a/devel/gconf2/pkg-descr b/devel/gconf2/pkg-descr new file mode 100644 index 000000000..010cc810e --- /dev/null +++ b/devel/gconf2/pkg-descr @@ -0,0 +1,18 @@ +GConf extends the concept of a configuration registry. It provides +a simple way for applications and administrators to store data; +often GConf is used to store preferences for applications. + +Some of the features of GConf are: +GConf provides: + + * Documentation for each configuration key, so that administrators + can better modify the value. + + * Notifications to interested applications when configuration data + is changed. The notification service works across networks, + affecting all login sessions for a single user. + + * Proper locking so that configuration data doesn't get corrupted + when accessed by multiple applications at the same time. + +WWW: http://www.gnome.org/projects/gconf/ diff --git a/devel/gconf2/pkg-plist b/devel/gconf2/pkg-plist new file mode 100644 index 000000000..44df20244 --- /dev/null +++ b/devel/gconf2/pkg-plist @@ -0,0 +1,112 @@ +bin/gconf-merge-tree +bin/gconftool-2 +%%LDAP%%etc/gconf/2/evoldap.conf +etc/gconf/2/path +include/gconf/2/gconf/gconf-changeset.h +include/gconf/2/gconf/gconf-client.h +include/gconf/2/gconf/gconf-engine.h +include/gconf/2/gconf/gconf-enum-types.h +include/gconf/2/gconf/gconf-error.h +include/gconf/2/gconf/gconf-listeners.h +include/gconf/2/gconf/gconf-schema.h +include/gconf/2/gconf/gconf-value.h +include/gconf/2/gconf/gconf.h +%%LDAP%%lib/GConf/2/libgconfbackend-evoldap.a +%%LDAP%%lib/GConf/2/libgconfbackend-evoldap.la +%%LDAP%%lib/GConf/2/libgconfbackend-evoldap.so +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/GConf/2/libgconfbackend-xml.so +lib/libgconf-2.a +lib/libgconf-2.la +lib/libgconf-2.so +lib/libgconf-2.so.4 +libdata/pkgconfig/gconf-2.0.pc +libexec/gconf-sanity-check-2 +libexec/gconfd-2 +%%LDAP%%share/GConf/schema/evoldap.schema +share/aclocal/gconf-2.m4 +share/locale/am/LC_MESSAGES/GConf2.mo +share/locale/ar/LC_MESSAGES/GConf2.mo +share/locale/az/LC_MESSAGES/GConf2.mo +share/locale/be/LC_MESSAGES/GConf2.mo +share/locale/bg/LC_MESSAGES/GConf2.mo +share/locale/bn/LC_MESSAGES/GConf2.mo +share/locale/bs/LC_MESSAGES/GConf2.mo +share/locale/ca/LC_MESSAGES/GConf2.mo +share/locale/cs/LC_MESSAGES/GConf2.mo +share/locale/cy/LC_MESSAGES/GConf2.mo +share/locale/da/LC_MESSAGES/GConf2.mo +share/locale/de/LC_MESSAGES/GConf2.mo +share/locale/el/LC_MESSAGES/GConf2.mo +share/locale/en_CA/LC_MESSAGES/GConf2.mo +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/LC_MESSAGES/GConf2.mo +share/locale/fa/LC_MESSAGES/GConf2.mo +share/locale/fi/LC_MESSAGES/GConf2.mo +share/locale/fr/LC_MESSAGES/GConf2.mo +share/locale/ga/LC_MESSAGES/GConf2.mo +share/locale/gl/LC_MESSAGES/GConf2.mo +share/locale/gu/LC_MESSAGES/GConf2.mo +share/locale/he/LC_MESSAGES/GConf2.mo +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/LC_MESSAGES/GConf2.mo +share/locale/it/LC_MESSAGES/GConf2.mo +share/locale/ja/LC_MESSAGES/GConf2.mo +share/locale/ko/LC_MESSAGES/GConf2.mo +share/locale/ku/LC_MESSAGES/GConf2.mo +share/locale/lt/LC_MESSAGES/GConf2.mo +share/locale/lv/LC_MESSAGES/GConf2.mo +share/locale/mk/LC_MESSAGES/GConf2.mo +share/locale/ml/LC_MESSAGES/GConf2.mo +share/locale/mn/LC_MESSAGES/GConf2.mo +share/locale/ms/LC_MESSAGES/GConf2.mo +share/locale/nb/LC_MESSAGES/GConf2.mo +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/pa/LC_MESSAGES/GConf2.mo +share/locale/pl/LC_MESSAGES/GConf2.mo +share/locale/pt/LC_MESSAGES/GConf2.mo +share/locale/pt_BR/LC_MESSAGES/GConf2.mo +share/locale/ro/LC_MESSAGES/GConf2.mo +share/locale/ru/LC_MESSAGES/GConf2.mo +share/locale/rw/LC_MESSAGES/GConf2.mo +share/locale/sk/LC_MESSAGES/GConf2.mo +share/locale/sl/LC_MESSAGES/GConf2.mo +share/locale/sq/LC_MESSAGES/GConf2.mo +share/locale/sr/LC_MESSAGES/GConf2.mo +share/locale/sr@Latn/LC_MESSAGES/GConf2.mo +share/locale/sv/LC_MESSAGES/GConf2.mo +share/locale/ta/LC_MESSAGES/GConf2.mo +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 +share/locale/xh/LC_MESSAGES/GConf2.mo +share/locale/yi/LC_MESSAGES/GConf2.mo +share/locale/zh_CN/LC_MESSAGES/GConf2.mo +share/locale/zh_HK/LC_MESSAGES/GConf2.mo +share/locale/zh_TW/LC_MESSAGES/GConf2.mo +share/sgml/gconf/gconf-1.0.dtd +@dirrm share/sgml/gconf +@dirrmtry share/locale/zh_HK/LC_MESSAGES +@dirrmtry share/locale/zh_HK +@dirrmtry share/locale/ku/LC_MESSAGES +@dirrmtry share/locale/ku +%%LDAP%%@dirrm share/GConf/schema +%%LDAP%%@dirrm share/GConf +@dirrm lib/GConf/2 +@dirrm include/gconf/2/gconf +@dirrm include/gconf/2 +@dirrm etc/gconf/2 +@dirrmtry share/sgml -- cgit v1.2.3