multiple ports: fix vala dependency type

macports · Jan 4, 2025 · 0856484 · 0856484
1 parent 8e5b5d7
commit 0856484
Show file tree

Hide file tree

Showing 45 changed files with 126 additions and 156 deletions.
diff --git a/devel/geoclue2/Portfile b/devel/geoclue2/Portfile
@@ -24,13 +24,13 @@ depends_build       port:intltool \
                     port:gtk-doc \
                     port:autoconf \
                     port:automake \
-                    port:libtool
+                    port:libtool \
+                    path:bin/vala:vala
 
 depends_lib         path:lib/pkgconfig/glib-2.0.pc:glib2 \
                     port:json-glib \
                     port:libnotify \
-                    path:lib/pkgconfig/libsoup-2.4.pc:libsoup \
-                    path:bin/vala:vala
+                    path:lib/pkgconfig/libsoup-2.4.pc:libsoup
 
 gobject_introspection yes
 

diff --git a/devel/libayatana-appindicator/Portfile b/devel/libayatana-appindicator/Portfile
@@ -17,7 +17,8 @@ checksums           rmd160  b0c53b01244681524acaa1874179918b7d2f3a32 \
 github.tarball_from archive
 
 depends_build-append \
-                    path:bin/pkg-config:pkgconfig
+                    path:bin/pkg-config:pkgconfig \
+                    path:bin/vala:vala
 
 depends_lib-append  port:atk \
                     port:ayatana-ido \
@@ -29,8 +30,7 @@ depends_lib-append  port:atk \
                     path:lib/pkgconfig/harfbuzz.pc:harfbuzz \
                     port:libayatana-indicator \
                     port:libdbusmenu \
-                    path:lib/pkgconfig/pango.pc:pango \
-                    path:bin/vala:vala
+                    path:lib/pkgconfig/pango.pc:pango
 
 # https://github.com/AyatanaIndicators/libayatana-appindicator/pull/78
 patchfiles-append   0001-Fix-build-on-macOS.patch

diff --git a/devel/libdmapsharing/Portfile b/devel/libdmapsharing/Portfile
@@ -21,15 +21,15 @@ checksums           rmd160  c4c6cb0fb224a66c0c379649226447d52ae15d5d \
                     sha256  aa47e405c5059ff35ff6fc447e497dc1ff15558859a57710a664350314abf750 \
                     size    801055
 
-depends_build       port:pkgconfig
+depends_build       port:pkgconfig \
+                    path:bin/vala:vala
 
 # gst-plugins-base for libgstapp.
 depends_lib         port:avahi \
                     port:gstreamer1-gst-plugins-base \
                     path:lib/pkgconfig/gtk+-3.0.pc:gtk3 \
                     port:libgee \
-                    path:lib/pkgconfig/libsoup-2.4.pc:libsoup \
-                    bin:vala:vala
+                    path:lib/pkgconfig/libsoup-2.4.pc:libsoup
 
 gobject_introspection   no
 

diff --git a/devel/zeitgeist/Portfile b/devel/zeitgeist/Portfile
@@ -31,7 +31,8 @@ depends_build-append \
                     port:autoconf \
                     port:automake \
                     port:libtool \
-                    port:gettext
+                    port:gettext \
+                    path:bin/vala:vala
 
 depends_lib-append \
                     path:lib/pkgconfig/gtk+-3.0.pc:gtk3 \
@@ -42,8 +43,7 @@ depends_lib-append \
                     port:telepathy-glib \
                     port:python310 \
                     port:py310-rdflib \
-                    port:raptor2 \
-                    path:bin/vala:vala
+                    port:raptor2
 
 gobject_introspection yes
 

diff --git a/gnome/baobab/Portfile b/gnome/baobab/Portfile
@@ -17,7 +17,6 @@ long_description    Disk Usage Analyzer is a graphical, menu-driven application
 
 maintainers         {devans @dbevans} openmaintainer
 categories          gnome
-platforms           darwin
 homepage            https://wiki.gnome.org/Apps/Baobab
 master_sites        gnome:sources/${name}/${branch}/
 
@@ -29,12 +28,12 @@ checksums           rmd160  72598c0a0213abc4b332fab405dd47f976fa2bbe \
 depends_build       port:pkgconfig \
                     port:itstool \
                     port:yelp-tools \
-                    port:appstream-glib
+                    port:appstream-glib \
+                    path:bin/vala:vala
 
 depends_lib         port:desktop-file-utils \
                     path:lib/pkgconfig/gdk-pixbuf-2.0.pc:gdk-pixbuf2 \
-                    path:lib/pkgconfig/gtk+-3.0.pc:gtk3 \
-                    path:bin/vala:vala
+                    path:lib/pkgconfig/gtk+-3.0.pc:gtk3
 
 depends_run         port:adwaita-icon-theme
 

diff --git a/gnome/dconf/Portfile b/gnome/dconf/Portfile
@@ -7,7 +7,6 @@ version             0.26.1
 set branch          [join [lrange [split ${version} .] 0 1] .]
 maintainers         {devans @dbevans} openmaintainer
 categories          gnome
-platforms           darwin
 license             GPL-2+
 description         dconf is a simple key/value storage system that is heavily optimised for \
                     reading.
@@ -27,11 +26,11 @@ checksums           rmd160  4f756c2d1eeb32c6c7d068a08e8ff0f5340e1553 \
 depends_build       port:pkgconfig \
                     port:docbook-xsl-nons \
                     port:gtk-doc \
-                    port:libxslt
-
-depends_lib         path:lib/pkgconfig/glib-2.0.pc:glib2 \
+                    port:libxslt \
                     path:bin/vala:vala
 
+depends_lib         path:lib/pkgconfig/glib-2.0.pc:glib2
+
 patchfiles          patch-fix-lib-names-Makefile.am.diff
 
 use_autoreconf      yes

diff --git a/gnome/folks/Portfile b/gnome/folks/Portfile
@@ -29,15 +29,15 @@ checksums           rmd160  3c62587c6d0240459353bb5f5d18de04427e86e5 \
 depends_build-append \
                     path:bin/pkg-config:pkgconfig \
                     port:gtk-doc \
-                    port:python38
+                    port:python38 \
+                    path:bin/vala:vala
 
 depends_lib         path:lib/pkgconfig/glib-2.0.pc:glib2 \
                     port:dbus-glib \
                     port:libgee \
                     port:libxml2 \
                     port:ncurses \
-                    port:readline \
-                    path:bin/vala:vala
+                    port:readline
 
 post-patch {
     reinplace -W ${worksrcpath} "s|^#!.*|#!${prefix}/bin/python3.8|" \

diff --git a/gnome/gcab/Portfile b/gnome/gcab/Portfile
@@ -26,12 +26,12 @@ checksums           rmd160  c98850b41f6baec5c3997fef342ad4a42b18b8af \
 depends_build-append \
                     port:gettext \
                     port:gtk-doc \
-                    path:bin/pkg-config:pkgconfig
+                    path:bin/pkg-config:pkgconfig \
+                    path:bin/vala:vala
 
 depends_lib-append  port:gettext-runtime \
                     path:lib/pkgconfig/glib-2.0.pc:glib2 \
                     path:lib/pkgconfig/gobject-introspection-1.0.pc:gobject-introspection \
-                    path:bin/vala:vala \
                     port:zlib
 
 patchfiles          dont-use-version-script.patch

diff --git a/gnome/gcr/Portfile b/gnome/gcr/Portfile
@@ -30,7 +30,8 @@ checksums           rmd160  19cc19bdfd2f1dd6aaa838ffbd11d087dc0cebc2 \
 depends_build-append \
                     port:cctools \
                     port:gettext \
-                    port:pkgconfig
+                    port:pkgconfig \
+                    path:bin/vala:vala
 
 depends_lib-append  port:desktop-file-utils \
                     port:gettext-runtime \
@@ -39,8 +40,7 @@ depends_lib-append  port:desktop-file-utils \
                     path:lib/pkgconfig/gtk+-3.0.pc:gtk3 \
                     port:libgcrypt \
                     port:libsecret \
-                    port:p11-kit \
-                    bin:vala:vala
+                    port:p11-kit
 
 # gck-private.h: error: redefinition of typedef ‘GckCall’
 compiler.blacklist-append \

diff --git a/gnome/gedit-plugins/Portfile b/gnome/gedit-plugins/Portfile
@@ -28,16 +28,16 @@ depends_build-append \
                     port:pkgconfig \
                     port:appstream-glib \
                     port:gettext \
-                    port:itstool
+                    port:itstool \
+                    path:bin/vala:vala
 
 depends_lib         port:gedit \
                     port:gettext-runtime \
                     path:lib/pkgconfig/glib-2.0.pc:glib2 \
                     path:lib/pkgconfig/gobject-introspection-1.0.pc:gobject-introspection \
                     path:lib/pkgconfig/gtk+-3.0.pc:gtk3 \
                     port:gtksourceview4 \
-                    port:libpeas \
-                    path:bin/vala:vala
+                    port:libpeas
 
 patchfiles          patch-python3-bin.diff
 

diff --git a/gnome/gedit/Portfile b/gnome/gedit/Portfile
@@ -37,7 +37,8 @@ depends_build-append \
                     port:gettext \
                     bin:git:git \
                     port:gtk-doc \
-                    port:itstool
+                    port:itstool \
+                    path:bin/vala:vala
 
 depends_lib-append  port:desktop-file-utils \
                     port:amtk \
@@ -52,8 +53,7 @@ depends_lib-append  port:desktop-file-utils \
                     port:libpeas \
                     path:lib/pkgconfig/libsoup-2.4.pc:libsoup \
                     port:libxml2 \
-                    port:tepl \
-                    path:bin/vala:vala
+                    port:tepl
 
 depends_run         port:adwaita-icon-theme
 

diff --git a/gnome/gnome-autoar/Portfile b/gnome/gnome-autoar/Portfile
@@ -12,7 +12,6 @@ description         An automatic archive creating and extracting library
 long_description    GNOME Autoar is a library to integrate compressed files management with GNOME
 maintainers         {devans @dbevans} openmaintainer
 categories          gnome
-platforms           darwin
 
 homepage            https://git.gnome.org/browse/gnome-autoar
 master_sites        gnome:sources/${name}/${branch}/
@@ -23,12 +22,12 @@ checksums           rmd160  14e59e0b1f74ba4e12c139751120cc15b1136eab \
                     sha256  0a34c377f8841abbf4c29bc848b301fbd8e4e20c03d7318c777c58432033657a \
                     size    294956
 
-depends_build       port:pkgconfig
+depends_build       port:pkgconfig \
+                    path:bin/vala:vala
 
 depends_lib         path:lib/pkgconfig/glib-2.0.pc:glib2 \
                     path:lib/pkgconfig/gtk+-3.0.pc:gtk3 \
-                    port:libarchive \
-                    path:bin/vala:vala
+                    port:libarchive
 
 gobject_introspection yes
 

diff --git a/gnome/gnome-calculator/Portfile b/gnome/gnome-calculator/Portfile
@@ -15,7 +15,6 @@ long_description    Calculator is an application that solves mathematical equati
                     and is suitable as a default application in a Desktop environment.
 maintainers         {devans @dbevans} openmaintainer
 categories          gnome
-platforms           darwin
 homepage            https://wiki.gnome.org/Apps/Calculator
 master_sites        gnome:sources/${name}/${branch}/
 
@@ -27,7 +26,8 @@ checksums           rmd160  37eb56bd37a7da0d66edbb31880b96d9ee6be7f3 \
 
 depends_build       port:pkgconfig \
                     port:appstream-glib \
-                    port:itstool
+                    port:itstool \
+                    path:bin/vala:vala
 
 depends_lib         port:desktop-file-utils \
                     path:lib/pkgconfig/gdk-pixbuf-2.0.pc:gdk-pixbuf2 \
@@ -37,8 +37,7 @@ depends_lib         port:desktop-file-utils \
                     port:libmpc \
                     path:lib/pkgconfig/libsoup-2.4.pc:libsoup \
                     port:libxml2 \
-                    port:mpfr \
-                    path:bin/vala:vala
+                    port:mpfr
 
 depends_run         port:adwaita-icon-theme
 

diff --git a/gnome/gnome-chess/Portfile b/gnome/gnome-chess/Portfile
@@ -11,7 +11,6 @@ description         Play the classic two-player boardgame of chess
 long_description    ${description}
 maintainers         {devans @dbevans} openmaintainer
 categories          gnome games
-platforms           darwin
 homepage            https://wiki.gnome.org/Apps/Chess
 master_sites        gnome:sources/${name}/${branch}/
 
@@ -23,13 +22,13 @@ checksums           rmd160  711d9816c21f31e0cc81c0d4d33bb37339be9919 \
 depends_build       port:pkgconfig \
                     port:appstream-glib \
                     port:yelp-tools \
-                    port:itstool
+                    port:itstool \
+                    path:bin/vala:vala
 
 depends_lib         port:desktop-file-utils \
                     path:lib/pkgconfig/gdk-pixbuf-2.0.pc:gdk-pixbuf2 \
                     path:lib/pkgconfig/gtk+-3.0.pc:gtk3 \
-                    path:lib/pkgconfig/librsvg-2.0.pc:librsvg \
-                    path:bin/vala:vala
+                    path:lib/pkgconfig/librsvg-2.0.pc:librsvg
 
 depends_run         port:adwaita-icon-theme
 

diff --git a/gnome/gnome-online-accounts/Portfile b/gnome/gnome-online-accounts/Portfile
@@ -12,7 +12,6 @@ description         Single sign-on framework for GNOME
 long_description    ${description}
 maintainers         {devans @dbevans} openmaintainer
 categories          gnome
-platforms           darwin
 homepage            https://wiki.gnome.org/Projects/GnomeOnlineAccounts
 master_sites        gnome:sources/${name}/${branch}/
 
@@ -24,7 +23,8 @@ checksums           rmd160  af52cb4b6da4545df2b9740f42ff52c1c995af4b \
 
 depends_build       port:pkgconfig \
                     port:gettext \
-                    port:gtk-doc
+                    port:gtk-doc \
+                    path:bin/vala:vala
 
 depends_lib         port:gcr \
                     path:lib/pkgconfig/gdk-pixbuf-2.0.pc:gdk-pixbuf2 \
@@ -36,7 +36,6 @@ depends_lib         port:gcr \
                     path:lib/pkgconfig/libsoup-2.4.pc:libsoup \
                     port:libxml2 \
                     port:rest \
-                    path:bin/vala:vala \
                     path:lib/pkgconfig/webkit2gtk-4.0.pc:webkit2-gtk
 
 gobject_introspection yes

diff --git a/gnome/grilo/Portfile b/gnome/grilo/Portfile
@@ -14,7 +14,6 @@ long_description    Grilo is a framework for browsing and searching media \
 
 maintainers         {devans @dbevans} openmaintainer
 categories          gnome
-platforms           darwin
 homepage            https://wiki.gnome.org/Projects/Grilo
 master_sites        gnome:sources/${name}/${branch}/
 
@@ -26,15 +25,15 @@ checksums           rmd160  6391c559f6c3e98059a18e63c9c1c8073fac9a76 \
 
 depends_build-append \
                     port:pkgconfig \
-                    port:gtk-doc
+                    port:gtk-doc \
+                    path:bin/vala:vala
 
 depends_lib         path:lib/pkgconfig/gobject-introspection-1.0.pc:gobject-introspection \
                     path:lib/pkgconfig/gtk+-3.0.pc:gtk3 \
                     port:liboauth \
                     path:lib/pkgconfig/libsoup-2.4.pc:libsoup \
                     port:libxml2 \
-                    port:totem-pl-parser \
-                    path:bin/vala:vala
+                    port:totem-pl-parser
 
 patchfiles          no-undefined.patch
 

diff --git a/gnome/gspell/Portfile b/gnome/gspell/Portfile
@@ -25,7 +25,8 @@ checksums           rmd160  83204e9d5894e5970eed2fc34d804155b5891928 \
 
 depends_build       port:pkgconfig \
                     port:gettext \
-                    port:gtk-doc
+                    port:gtk-doc \
+                    path:bin/vala:vala
 
 depends_lib         path:lib/pkgconfig/gdk-pixbuf-2.0.pc:gdk-pixbuf2 \
                     path:lib/pkgconfig/gtk+-3.0.pc:gtk3 \
@@ -34,8 +35,7 @@ depends_lib         path:lib/pkgconfig/gdk-pixbuf-2.0.pc:gdk-pixbuf2 \
                     port:libxml2 \
                     port:enchant2 \
                     path:lib/pkgconfig/icu-uc.pc:icu \
-                    port:iso-codes \
-                    path:bin/vala:vala
+                    port:iso-codes
 
 gobject_introspection yes
 

diff --git a/gnome/gtksourceview3/Portfile b/gnome/gtksourceview3/Portfile
@@ -13,7 +13,6 @@ license             LGPL-2.1+
 set branch          [join [lrange [split ${version} .] 0 1] .]
 maintainers         {devans @dbevans} openmaintainer
 categories          gnome
-platforms           darwin
 description         GtkSourceView-3.0 is a source highlighting text widget for GTK+ 3
 
 long_description    GtkSourceView is a text widget that extends the standard \
@@ -36,13 +35,13 @@ set port_ver_major  [lindex [split ${version} .] 0]
 
 depends_build       port:gettext \
                     port:gtk-doc \
-                    port:pkgconfig
+                    port:pkgconfig \
+                    path:bin/vala:vala
 
 depends_lib         path:lib/pkgconfig/glib-2.0.pc:glib2 \
                     port:gettext-runtime \
                     path:lib/pkgconfig/gtk+-3.0.pc:gtk3 \
-                    port:libxml2 \
-                    path:bin/vala:vala
+                    port:libxml2
 
 gobject_introspection yes