kpriv
/
pkgsrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

*: 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.
This commit is contained in:
jperkin 2023-11-27 11:16:40 +00:00
parent ab3e41e5e4
commit d38f6bbfff
13 changed files with 13 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
chat/dino/Makefile
View File

@ -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>=3.24
.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"

4
devel/dconf-editor/Makefile
View File

@ -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.46.0
.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

3
devel/dconf/Makefile
View File

@ -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"

3
devel/libdazzle/Makefile
View File

@ -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=incompatible-pointer-types
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"

4
devel/libgee/Makefile
View File

@ -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-introspection:= build
.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"

3
devel/libgee0.6/Makefile
View File

@ -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

3
devel/libhandy/Makefile
View File

@ -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-private/libhandy-1.pc
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"

3
games/gnome-sudoku/Makefile
View File

@ -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.40.0
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"

3
graphics/cheese/Makefile
View File

@ -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-introspection?= build
.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"

3
graphics/pdfpc/Makefile
View File

@ -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"

8
lang/vala/buildlink3.mk
View File

@ -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

3
net/corebird/Makefile
View File

@ -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-glib>=1.2.8
.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"

3
www/midori/Makefile
View File

@ -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"