CVS commit: pkgsrc

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Mon Nov 27 11:16:42 UTC 2023

Modified Files:
        pkgsrc/chat/dino: Makefile
        pkgsrc/devel/dconf: Makefile
        pkgsrc/devel/dconf-editor: Makefile
        pkgsrc/devel/libdazzle: Makefile
        pkgsrc/devel/libgee: Makefile
        pkgsrc/devel/libgee0.6: Makefile
        pkgsrc/devel/libhandy: Makefile
        pkgsrc/games/gnome-sudoku: Makefile
        pkgsrc/graphics/cheese: Makefile
        pkgsrc/graphics/pdfpc: Makefile
        pkgsrc/lang/vala: buildlink3.mk
        pkgsrc/net/corebird: Makefile
        pkgsrc/www/midori: Makefile

Log Message:
*: Simplify vala buildlink3.

The default DEPMETHOD for vala's bl3 is "build", so there's no point
duplicating that in each package.  Given that it is only ever a build
dependency, completely remove the indirect dependencies as they should not
be made available.  Also remove obsolete BUILDLINK_API_DEPENDS settings.

Tested with a few of the affected packages.


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 pkgsrc/chat/dino/Makefile
cvs rdiff -u -r1.73 -r1.74 pkgsrc/devel/dconf/Makefile
cvs rdiff -u -r1.74 -r1.75 pkgsrc/devel/dconf-editor/Makefile
cvs rdiff -u -r1.26 -r1.27 pkgsrc/devel/libdazzle/Makefile
cvs rdiff -u -r1.49 -r1.50 pkgsrc/devel/libgee/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/libgee0.6/Makefile
cvs rdiff -u -r1.27 -r1.28 pkgsrc/devel/libhandy/Makefile
cvs rdiff -u -r1.52 -r1.53 pkgsrc/games/gnome-sudoku/Makefile
cvs rdiff -u -r1.112 -r1.113 pkgsrc/graphics/cheese/Makefile
cvs rdiff -u -r1.26 -r1.27 pkgsrc/graphics/pdfpc/Makefile
cvs rdiff -u -r1.40 -r1.41 pkgsrc/lang/vala/buildlink3.mk
cvs rdiff -u -r1.80 -r1.81 pkgsrc/net/corebird/Makefile
cvs rdiff -u -r1.152 -r1.153 pkgsrc/www/midori/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/chat/dino/Makefile
diff -u pkgsrc/chat/dino/Makefile:1.31 pkgsrc/chat/dino/Makefile:1.32
--- pkgsrc/chat/dino/Makefile:1.31      Tue Nov 14 14:01:29 2023
+++ pkgsrc/chat/dino/Makefile   Mon Nov 27 11:16:40 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2023/11/14 14:01:29 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2023/11/27 11:16:40 jperkin Exp $
 
 DISTNAME=      dino-0.3.0
 PKGREVISION=   16
@@ -28,7 +28,6 @@ BUILDLINK_API_DEPENDS.sqlite3+=       sqlite3>
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libgee/buildlink3.mk"
 .include "../../graphics/gdk-pixbuf2/buildlink3.mk"
-BUILDLINK_DEPMETHOD.vala=      build
 .include "../../lang/vala/buildlink3.mk"
 .include "../../multimedia/gst-plugins1-base/buildlink3.mk"
 .include "../../net/libnice/buildlink3.mk"

Index: pkgsrc/devel/dconf/Makefile
diff -u pkgsrc/devel/dconf/Makefile:1.73 pkgsrc/devel/dconf/Makefile:1.74
--- pkgsrc/devel/dconf/Makefile:1.73    Sun Nov 12 13:20:57 2023
+++ pkgsrc/devel/dconf/Makefile Mon Nov 27 11:16:41 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.73 2023/11/12 13:20:57 wiz Exp $
+# $NetBSD: Makefile,v 1.74 2023/11/27 11:16:41 jperkin Exp $
 
 DISTNAME=      dconf-0.40.0
 PKGREVISION=   6
@@ -54,7 +54,6 @@ post-install:
            ${DESTDIR}${PREFIX}/bin/dconf
 .endif
 
-BUILDLINK_DEPMETHOD.vala=      build
 .include "../../lang/vala/buildlink3.mk"
 BUILDLINK_API_DEPENDS.glib2+=  glib2>=2.44.0
 #.include "../../textproc/gtk-doc/buildlink3.mk"

Index: pkgsrc/devel/dconf-editor/Makefile
diff -u pkgsrc/devel/dconf-editor/Makefile:1.74 pkgsrc/devel/dconf-editor/Makefile:1.75
--- pkgsrc/devel/dconf-editor/Makefile:1.74     Tue Nov 14 14:01:35 2023
+++ pkgsrc/devel/dconf-editor/Makefile  Mon Nov 27 11:16:40 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.74 2023/11/14 14:01:35 wiz Exp $
+# $NetBSD: Makefile,v 1.75 2023/11/27 11:16:40 jperkin Exp $
 
 DISTNAME=      dconf-editor-3.38.3
 PKGREVISION=   14
@@ -25,8 +25,6 @@ BUILDLINK_API_DEPENDS.glib2+= glib2>=2.4
 .include "../../devel/glib2/schemas.mk"
 .include "../../devel/meson/build.mk"
 .include "../../lang/python/application.mk"
-BUILDLINK_DEPMETHOD.vala= build
-BUILDLINK_API_DEPENDS.vala+=   vala>=0.40.0
 .include "../../lang/vala/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 BUILDLINK_API_DEPENDS.gtk3+=   gtk3+>=3.22.0

Index: pkgsrc/devel/libdazzle/Makefile
diff -u pkgsrc/devel/libdazzle/Makefile:1.26 pkgsrc/devel/libdazzle/Makefile:1.27
--- pkgsrc/devel/libdazzle/Makefile:1.26        Tue Nov 14 14:01:37 2023
+++ pkgsrc/devel/libdazzle/Makefile     Mon Nov 27 11:16:41 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2023/11/14 14:01:37 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2023/11/27 11:16:41 jperkin Exp $
 
 DISTNAME=      libdazzle-3.38.0
 PKGREVISION=   13
@@ -28,7 +28,6 @@ BUILDLINK_TRANSFORM.SunOS+=   rm:-Werror=i
 BUILDLINK_DEPMETHOD.gobject-introspection?=    build
 .include "../../devel/gobject-introspection/buildlink3.mk"
 .include "../../devel/meson/build.mk"
-BUILDLINK_DEPMETHOD.vala?=     build
 .include "../../lang/vala/buildlink3.mk"
 .include "../../x11/gtk3/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/libgee/Makefile
diff -u pkgsrc/devel/libgee/Makefile:1.49 pkgsrc/devel/libgee/Makefile:1.50
--- pkgsrc/devel/libgee/Makefile:1.49   Sun Nov 12 13:21:05 2023
+++ pkgsrc/devel/libgee/Makefile        Mon Nov 27 11:16:41 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2023/11/12 13:21:05 wiz Exp $
+# $NetBSD: Makefile,v 1.50 2023/11/27 11:16:41 jperkin Exp $
 
 DISTNAME=      libgee-0.20.3
 PKGREVISION=   10
@@ -23,7 +23,5 @@ BUILDLINK_DEPMETHOD.gobject-introspectio
 .include "../../devel/gobject-introspection/buildlink3.mk"
 BUILDLINK_API_DEPENDS.glib2+=  glib2>=2.36
 .include "../../devel/glib2/buildlink3.mk"
-BUILDLINK_DEPMETHOD.vala:= build
-BUILDLINK_API_DEPENDS.vala+=   vala>=0.25.1
 .include "../../lang/vala/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/libgee0.6/Makefile
diff -u pkgsrc/devel/libgee0.6/Makefile:1.6 pkgsrc/devel/libgee0.6/Makefile:1.7
--- pkgsrc/devel/libgee0.6/Makefile:1.6 Wed Dec  8 16:01:57 2021
+++ pkgsrc/devel/libgee0.6/Makefile     Mon Nov 27 11:16:41 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2021/12/08 16:01:57 adam Exp $
+# $NetBSD: Makefile,v 1.7 2023/11/27 11:16:41 jperkin Exp $
 
 DISTNAME=      libgee-0.6.8
 PKGNAME=       ${DISTNAME:S/libgee/libgee0.6/}
@@ -17,7 +17,6 @@ USE_LIBTOOL=  yes
 USE_TOOLS+=    pkg-config gmake
 
 # to regenerate after patches
-#BUILDLINK_DEPMETHOD.vala:=    build
 #.include "../../lang/vala/buildlink3.mk"
 
 PKGCONFIG_OVERRIDE+=   gee-1.0.pc.in

Index: pkgsrc/devel/libhandy/Makefile
diff -u pkgsrc/devel/libhandy/Makefile:1.27 pkgsrc/devel/libhandy/Makefile:1.28
--- pkgsrc/devel/libhandy/Makefile:1.27 Tue Nov 14 14:01:37 2023
+++ pkgsrc/devel/libhandy/Makefile      Mon Nov 27 11:16:41 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2023/11/14 14:01:37 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2023/11/27 11:16:41 jperkin Exp $
 
 DISTNAME=      libhandy-1.8.0
 PKGREVISION=   7
@@ -21,7 +21,6 @@ PKGCONFIG_OVERRIDE+=          output/meson-priva
 BUILDLINK_DEPMETHOD.gobject-introspection?=    build
 .include "../../devel/gobject-introspection/buildlink3.mk"
 .include "../../devel/meson/build.mk"
-BUILDLINK_DEPMETHOD.vala?=     build
 .include "../../lang/vala/buildlink3.mk"
 .include "../../x11/gtk3/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/games/gnome-sudoku/Makefile
diff -u pkgsrc/games/gnome-sudoku/Makefile:1.52 pkgsrc/games/gnome-sudoku/Makefile:1.53
--- pkgsrc/games/gnome-sudoku/Makefile:1.52     Tue Nov 14 14:01:52 2023
+++ pkgsrc/games/gnome-sudoku/Makefile  Mon Nov 27 11:16:41 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2023/11/14 14:01:52 wiz Exp $
+# $NetBSD: Makefile,v 1.53 2023/11/27 11:16:41 jperkin Exp $
 
 DISTNAME=      gnome-sudoku-40.2
 PKGREVISION=   13
@@ -35,7 +35,6 @@ BUILDLINK_API_DEPENDS.glib2+= glib2>=2.4
 BUILDLINK_API_DEPENDS.qqwing+= qqwing>=1.3.4
 .include "../../games/qqwing/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-BUILDLINK_DEPMETHOD.vala:= build
 .include "../../lang/vala/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../textproc/json-glib/buildlink3.mk"

Index: pkgsrc/graphics/cheese/Makefile
diff -u pkgsrc/graphics/cheese/Makefile:1.112 pkgsrc/graphics/cheese/Makefile:1.113
--- pkgsrc/graphics/cheese/Makefile:1.112       Tue Nov 14 14:01:58 2023
+++ pkgsrc/graphics/cheese/Makefile     Mon Nov 27 11:16:41 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.112 2023/11/14 14:01:58 wiz Exp $
+# $NetBSD: Makefile,v 1.113 2023/11/27 11:16:41 jperkin Exp $
 
 DISTNAME=      cheese-3.34.0
 PKGREVISION=   19
@@ -38,7 +38,6 @@ BUILDLINK_DEPMETHOD.gobject-introspectio
 .include "../../devel/gobject-introspection/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../graphics/clutter-gtk/buildlink3.mk"
-BUILDLINK_DEPMETHOD.vala?=     build
 .include "../../lang/vala/buildlink3.mk"
 .include "../../multimedia/clutter-gst/buildlink3.mk"
 .include "../../multimedia/gstreamer1/buildlink3.mk"

Index: pkgsrc/graphics/pdfpc/Makefile
diff -u pkgsrc/graphics/pdfpc/Makefile:1.26 pkgsrc/graphics/pdfpc/Makefile:1.27
--- pkgsrc/graphics/pdfpc/Makefile:1.26 Wed Nov 15 09:25:52 2023
+++ pkgsrc/graphics/pdfpc/Makefile      Mon Nov 27 11:16:41 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2023/11/15 09:25:52 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2023/11/27 11:16:41 jperkin Exp $
 
 DISTNAME=      pdfpc-4.4.0
 PKGREVISION=   25
@@ -21,7 +21,6 @@ EGDIR=                ${PREFIX}/share/examples/pdfpc
 CONF_FILES+=   ${EGDIR}/pdfpcrc        ${PKG_SYSCONFDIR}/pdfpcrc
 
 .include "../../devel/libgee/buildlink3.mk"
-BUILDLINK_DEPMETHOD.vala=      build
 .include "../../lang/vala/buildlink3.mk"
 .include "../../multimedia/gst-plugins1-base/buildlink3.mk"
 .include "../../multimedia/gstreamer1/buildlink3.mk"

Index: pkgsrc/lang/vala/buildlink3.mk
diff -u pkgsrc/lang/vala/buildlink3.mk:1.40 pkgsrc/lang/vala/buildlink3.mk:1.41
--- pkgsrc/lang/vala/buildlink3.mk:1.40 Mon Nov 27 09:45:02 2023
+++ pkgsrc/lang/vala/buildlink3.mk      Mon Nov 27 11:16:42 2023
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.40 2023/11/27 09:45:02 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.41 2023/11/27 11:16:42 jperkin Exp $
 
 BUILDLINK_TREE+=       vala
 
@@ -16,12 +16,6 @@ VAPIGEN=     ${PREFIX}/bin/vapigen-0.56
 CONFIGURE_ENV+=        VALAC=${VALAC} VAPIGEN=${VAPIGEN}
 .endif
 
-.if ${BUILDLINK_DEPMETHOD.vala:U:Mfull}
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/libltdl/buildlink3.mk"
-.include "../../graphics/graphviz/buildlink3.mk"
-.endif
-
 .endif # VALA_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -vala

Index: pkgsrc/net/corebird/Makefile
diff -u pkgsrc/net/corebird/Makefile:1.80 pkgsrc/net/corebird/Makefile:1.81
--- pkgsrc/net/corebird/Makefile:1.80   Tue Nov 14 14:02:37 2023
+++ pkgsrc/net/corebird/Makefile        Mon Nov 27 11:16:42 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.80 2023/11/14 14:02:37 wiz Exp $
+# $NetBSD: Makefile,v 1.81 2023/11/27 11:16:42 jperkin Exp $
 
 DISTNAME=      corebird-1.7.4
 PKGREVISION=   22
@@ -32,7 +32,6 @@ BUILDLINK_API_DEPENDS.json-glib+=     json-g
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../net/libsoup/buildlink3.mk"
 .include "../../devel/libgee/buildlink3.mk"
-BUILDLINK_DEPMETHOD.vala=      build
 .include "../../lang/vala/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../devel/glib2/schemas.mk"

Index: pkgsrc/www/midori/Makefile
diff -u pkgsrc/www/midori/Makefile:1.152 pkgsrc/www/midori/Makefile:1.153
--- pkgsrc/www/midori/Makefile:1.152    Tue Nov 14 14:03:05 2023
+++ pkgsrc/www/midori/Makefile  Mon Nov 27 11:16:42 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.152 2023/11/14 14:03:05 wiz Exp $
+# $NetBSD: Makefile,v 1.153 2023/11/27 11:16:42 jperkin Exp $
 
 DISTNAME=      midori-v9.0
 PKGNAME=       ${DISTNAME:S/v//}
@@ -35,7 +35,6 @@ CONFIGURE_ENV+=       VALAC=${VALAC}
 .include "../../x11/gtk3/buildlink3.mk"
 .include "../../x11/libXScrnSaver/buildlink3.mk"
 .include "../../www/webkit-gtk/buildlink3.mk"
-BUILDLINK_DEPMETHOD.vala= build
 .include "../../lang/vala/buildlink3.mk"
 .include "../../security/gcr/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"