From 348d6de4aafa31a3256e168bd231627c7e1d1294 Mon Sep 17 00:00:00 2001 From: Mohamed Akram Date: Mon, 20 Apr 2026 20:04:27 +0400 Subject: [PATCH] gconf: fix dependencies --- gnome/gconf/Portfile | 40 ++++++++++-------------------------- gnome/gconf/files/autogen.sh | 24 ---------------------- 2 files changed, 11 insertions(+), 53 deletions(-) delete mode 100644 gnome/gconf/files/autogen.sh diff --git a/gnome/gconf/Portfile b/gnome/gconf/Portfile index ede10f052c7..43a5cf6ac4a 100644 --- a/gnome/gconf/Portfile +++ b/gnome/gconf/Portfile @@ -9,7 +9,7 @@ name gconf set my_name GConf epoch 1 version 3.2.6 -revision 5 +revision 6 set branch [join [lrange [split ${version} .] 0 1] .] maintainers nomaintainer categories gnome @@ -29,18 +29,19 @@ distname ${my_name}-${version} use_xz yes checksums rmd160 63c382672abfcee51440ff1e1524020e82fc304c \ - sha256 1912b91803ab09a5eed34d364bf09fe3a2a9c96751fde03a4e0cfa51a04d784c + sha256 1912b91803ab09a5eed34d364bf09fe3a2a9c96751fde03a4e0cfa51a04d784c \ + size 1559904 -depends_build port:pkgconfig \ +depends_build path:bin/pkg-config:pkgconfig \ + port:gettext \ port:gtk-doc \ port:intltool \ - port:gnome-common \ - port:autoconf \ - port:automake \ - port:libtool + port:gnome-common -depends_lib path:lib/pkgconfig/gtk+-3.0.pc:gtk3 \ +depends_lib path:lib/pkgconfig/glib-2.0.pc:glib2 \ + port:gettext-runtime \ port:libxml2 \ + port:dbus \ port:dbus-glib \ port:policykit \ port:orbit2 @@ -49,34 +50,15 @@ gobject_introspection yes configure.args --disable-silent-rules \ --enable-gsettings-backend \ - --with-gtk=3.0 \ --without-openldap -# reconfigure using upstream autogen.sh for intltool 0.51 compatibility - -post-patch { - xinstall -m 755 ${filespath}/autogen.sh ${worksrcpath} -} - -configure.cmd ./autogen.sh - destroot.keepdirs \ ${destroot}${prefix}/etc/gconf/gconf.xml.mandatory \ ${destroot}${prefix}/etc/gconf/gconf.xml.defaults variant openldap description {Enable support for openldap} { - depends_lib-append path:lib/libldap.dylib:openldap - configure.args-delete --without-openldap -} - -variant quartz conflicts x11 {} -variant x11 conflicts quartz {} - -if {![variant_isset quartz]} { - require_active_variants gtk3 x11 quartz - default_variants +x11 -} else { - require_active_variants gtk3 quartz x11 + depends_lib-append path:lib/libldap.dylib:openldap + configure.args-delete --without-openldap } post-activate { diff --git a/gnome/gconf/files/autogen.sh b/gnome/gconf/files/autogen.sh deleted file mode 100644 index a514d11a807..00000000000 --- a/gnome/gconf/files/autogen.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh -# Run this to generate all the initial makefiles, etc. - -srcdir=`dirname $0` -test -z "$srcdir" && srcdir=. - -REQUIRED_AUTOMAKE_VERSION=1.9 -REQUIRED_M4MACROS=introspection.m4 - -PKG_NAME="GConf" - -(test -f $srcdir/gconf/gconf.h) || { - echo -n "**Error**: Directory "\`$srcdir\'" does not look like the" - echo " top-level $PKG_NAME directory" - exit 1 -} - -which gnome-autogen.sh || { - echo "You need to install gnome-common from GNOME SVN and make" - echo "sure the gnome-autogen.sh script is in your \$PATH." - exit 1 -} - -REQUIRED_AUTOMAKE_VERSION=1.9 USE_GNOME2_MACROS=1 . gnome-autogen.sh