diff options
author | Baptiste Daroussin <bapt@FreeBSD.org> | 2022-03-15 17:52:09 +0000 |
---|---|---|
committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2022-03-15 18:06:50 +0000 |
commit | 23f68b9f73641a8c35fcc81e19d87927a5681b14 (patch) | |
tree | 515f43ca158dde768358dcc707d30c2f838accae | |
parent | c60d66cd93abf5e80f46352e02f0591c9d89d354 (diff) | |
download | ports-23f68b9f73641a8c35fcc81e19d87927a5681b14.tar.gz ports-23f68b9f73641a8c35fcc81e19d87927a5681b14.zip |
devel/gconf2: cleanup and reduce the number of dependency
Switch the ipc mecanism from Orbit2 to dbus (ORBit2 is not used
anywhere anymore).
While here remove the default services, since gconf is not used
anymore by any desktop, having the default service started to allow
configuring system wide configuration is pointless.
Drop the option for ldap, given that no desktop uses it anymore, the ability
so deal with ldap is now pointless as well
Drop the dependency on gtk only used for gconf-sanity check
This shave the dependency lits removing rust, polkit and orbit from it
while not changing the features for the few left consumers.
-rw-r--r-- | Mk/Uses/gnome.mk | 2 | ||||
-rw-r--r-- | devel/gconf2/Makefile | 25 | ||||
-rw-r--r-- | devel/gconf2/pkg-plist | 29 |
3 files changed, 11 insertions, 45 deletions
diff --git a/Mk/Uses/gnome.mk b/Mk/Uses/gnome.mk index 8329b4ab78d1..d6a4e203fa05 100644 --- a/Mk/Uses/gnome.mk +++ b/Mk/Uses/gnome.mk @@ -206,7 +206,7 @@ introspection_USE_GNOME_IMPL= glib20 introspection_MAKE_ENV= GI_SCANNER_DISABLE_CACHE=1 gconf2_LIB_DEPENDS= libgconf-2.so:devel/gconf2 -gconf2_USE_GNOME_IMPL= orbit2 libxml2 gtk20 +gconf2_USE_GNOME_IMPL= libxml2 libgnomecanvas_LIB_DEPENDS= libgnomecanvas-2.so:graphics/libgnomecanvas libgnomecanvas_USE_GNOME_IMPL= libglade2 libartlgpl2 diff --git a/devel/gconf2/Makefile b/devel/gconf2/Makefile index 4d9e268c35c0..992e08073ad7 100644 --- a/devel/gconf2/Makefile +++ b/devel/gconf2/Makefile @@ -3,7 +3,7 @@ PORTNAME= gconf2 PORTVERSION= 3.2.6 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= devel gnome MASTER_SITES= GNOME/sources/GConf/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} DISTNAME= GConf-${PORTVERSION} @@ -17,31 +17,26 @@ LICENSE_FILE= ${WRKSRC}/COPYING USES= tar:xz -LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib \ - libpolkit-gobject-1.so:sysutils/polkit +LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib USES+= gettext gmake gnome libtool pathfix pkgconfig python:run \ - shebangfix -USE_GNOME= orbit2 gtk20 libxml2 \ - referencehack intlhack dconf introspection:build + shebangfix localbase +USE_GNOME= libxml2 dconf intltool introspection:build USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \ --with-gtk=2.0 \ - --disable-gtk-doc -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib + --without-openldap \ + --disable-gtk \ + --disable-gtk-doc-html \ + --disable-gtk-doc \ + --disable-orbit \ + --disable-defaults-service INSTALL_TARGET= install-strip SHEBANG_FILES= gsettings/gsettings-schema-convert DOCSDIR= ${PREFIX}/share/doc/gconf -OPTIONS_DEFINE= LDAP DOCS -OPTIONS_SUB= yes - -LDAP_USE= OPENLDAP=yes -LDAP_CONFIGURE_WITH= openldap - post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/etc/gconf/gconf.xml.system diff --git a/devel/gconf2/pkg-plist b/devel/gconf2/pkg-plist index 0a84c9d002ee..50f6d2dc2b61 100644 --- a/devel/gconf2/pkg-plist +++ b/devel/gconf2/pkg-plist @@ -2,8 +2,6 @@ bin/gconf-merge-tree bin/gconftool-2 bin/gsettings-data-convert bin/gsettings-schema-convert -etc/dbus-1/system.d/org.gnome.GConf.Defaults.conf -%%LDAP%%etc/gconf/2/evoldap.conf etc/gconf/2/path etc/xdg/autostart/gsettings-data-convert.desktop include/gconf/2/gconf/gconf-changeset.h @@ -15,8 +13,6 @@ 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.so lib/GConf/2/libgconfbackend-oldxml.a lib/GConf/2/libgconfbackend-oldxml.so lib/GConf/2/libgconfbackend-xml.a @@ -29,36 +25,12 @@ lib/libgconf-2.so lib/libgconf-2.so.4 lib/libgconf-2.so.4.1.5 libdata/pkgconfig/gconf-2.0.pc -libexec/gconf-defaults-mechanism libexec/gconfd-2 man/man1/gconftool-2.1.gz man/man1/gsettings-data-convert.1.gz man/man1/gsettings-schema-convert.1.gz -%%LDAP%%share/GConf/schema/evoldap.schema share/aclocal/gconf-2.m4 -share/dbus-1/system-services/org.gnome.GConf.Defaults.service share/dbus-1/services/org.gnome.GConf.service -%%PORTDOCS%%%%DOCSDIR%%/ch01.html -%%PORTDOCS%%%%DOCSDIR%%/gconf-gconf-backend.html -%%PORTDOCS%%%%DOCSDIR%%/gconf-gconf-changeset.html -%%PORTDOCS%%%%DOCSDIR%%/gconf-gconf-client.html -%%PORTDOCS%%%%DOCSDIR%%/gconf-gconf-engine.html -%%PORTDOCS%%%%DOCSDIR%%/gconf-gconf-error.html -%%PORTDOCS%%%%DOCSDIR%%/gconf-gconf-internals.html -%%PORTDOCS%%%%DOCSDIR%%/gconf-gconf-listeners.html -%%PORTDOCS%%%%DOCSDIR%%/gconf-gconf-locale.html -%%PORTDOCS%%%%DOCSDIR%%/gconf-gconf-schema.html -%%PORTDOCS%%%%DOCSDIR%%/gconf-gconf-sources.html -%%PORTDOCS%%%%DOCSDIR%%/gconf-gconf-value.html -%%PORTDOCS%%%%DOCSDIR%%/gconf-gconf.html -%%PORTDOCS%%%%DOCSDIR%%/gconf.devhelp2 -%%PORTDOCS%%%%DOCSDIR%%/home.png -%%PORTDOCS%%%%DOCSDIR%%/index.html -%%PORTDOCS%%%%DOCSDIR%%/index.sgml -%%PORTDOCS%%%%DOCSDIR%%/left.png -%%PORTDOCS%%%%DOCSDIR%%/right.png -%%PORTDOCS%%%%DOCSDIR%%/style.css -%%PORTDOCS%%%%DOCSDIR%%/up.png share/gir-1.0/GConf-2.0.gir share/locale/am/LC_MESSAGES/GConf2.mo share/locale/ar/LC_MESSAGES/GConf2.mo @@ -146,7 +118,6 @@ 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/polkit-1/actions/org.gnome.gconf.defaults.policy share/sgml/gconf/gconf-1.0.dtd @dir etc/gconf/gconf.xml.defaults @dir etc/gconf/gconf.xml.mandatory |