CVS commit: pkgsrc/sysutils/gnome-vfs

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sat Nov  4 12:26:51 UTC 2023

Modified Files:
        pkgsrc/sysutils/gnome-vfs: Makefile buildlink3.mk options.mk

Log Message:
gnome-vfs: remove hal option

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.135 -r1.136 pkgsrc/sysutils/gnome-vfs/Makefile
cvs rdiff -u -r1.73 -r1.74 pkgsrc/sysutils/gnome-vfs/buildlink3.mk
cvs rdiff -u -r1.9 -r1.10 pkgsrc/sysutils/gnome-vfs/options.mk

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

Modified files:

Index: pkgsrc/sysutils/gnome-vfs/Makefile
diff -u pkgsrc/sysutils/gnome-vfs/Makefile:1.135 pkgsrc/sysutils/gnome-vfs/Makefile:1.136
--- pkgsrc/sysutils/gnome-vfs/Makefile:1.135    Tue Oct 24 22:11:07 2023
+++ pkgsrc/sysutils/gnome-vfs/Makefile  Sat Nov  4 12:26:51 2023
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.135 2023/10/24 22:11:07 wiz Exp $
+# $NetBSD: Makefile,v 1.136 2023/11/04 12:26:51 wiz Exp $
 
-PKGREVISION=           52
+PKGREVISION=           53
 
 PKGCONFIG_OVERRIDE=    gnome-vfs-2.0.pc.in
 PKGCONFIG_OVERRIDE+=   gnome-vfs-module-2.0.pc.in

Index: pkgsrc/sysutils/gnome-vfs/buildlink3.mk
diff -u pkgsrc/sysutils/gnome-vfs/buildlink3.mk:1.73 pkgsrc/sysutils/gnome-vfs/buildlink3.mk:1.74
--- pkgsrc/sysutils/gnome-vfs/buildlink3.mk:1.73        Tue Oct 24 22:11:07 2023
+++ pkgsrc/sysutils/gnome-vfs/buildlink3.mk     Sat Nov  4 12:26:51 2023
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.73 2023/10/24 22:11:07 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.74 2023/11/04 12:26:51 wiz Exp $
 
 BUILDLINK_TREE+=       gnome-vfs
 
@@ -12,7 +12,7 @@ BUILDLINK_PKGSRCDIR.gnome-vfs?=               ../../s
 pkgbase := gnome-vfs
 .include "../../mk/pkg-build-options.mk"
 
-.if !empty(PKG_BUILD_OPTIONS.gnome-vfs:Mavahi)
+.if ${PKG_BUILD_OPTIONS.gnome-vfs:Mavahi}
 .  include "../../net/avahi/buildlink3.mk"
 .endif
 

Index: pkgsrc/sysutils/gnome-vfs/options.mk
diff -u pkgsrc/sysutils/gnome-vfs/options.mk:1.9 pkgsrc/sysutils/gnome-vfs/options.mk:1.10
--- pkgsrc/sysutils/gnome-vfs/options.mk:1.9    Sat Jan 18 09:08:39 2020
+++ pkgsrc/sysutils/gnome-vfs/options.mk        Sat Nov  4 12:26:51 2023
@@ -1,9 +1,8 @@
-# $NetBSD: options.mk,v 1.9 2020/01/18 09:08:39 tnn Exp $
-#
+# $NetBSD: options.mk,v 1.10 2023/11/04 12:26:51 wiz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.gnome-vfs
-PKG_SUPPORTED_OPTIONS= fam gssapi hal inet6 avahi
-PKG_SUGGESTED_OPTIONS= fam hal inet6
+PKG_SUPPORTED_OPTIONS= fam gssapi inet6 avahi
+PKG_SUGGESTED_OPTIONS= fam inet6
 
 # Kerberos is built in - no additional dependency
 PKG_SUGGESTED_OPTIONS.NetBSD+= gssapi
@@ -19,20 +18,13 @@ CONFIGURE_ARGS+=    --disable-fam
 
 .if !empty(PKG_OPTIONS:Mgssapi)
 .include "../../mk/krb5.buildlink3.mk"
-.  if !empty(USE_BUILTIN.${KRB5_TYPE}:M[yY][eE][sS])
+.  if ${USE_BUILTIN.${KRB5_TYPE}:tl} == yes
 CONFIGURE_ENV+=                KRB5_CONFIG=${SH_KRB5_CONFIG}
 .  endif
 .else
 CONFIGURE_ENV+=                ac_cv_path_KRB5_CONFIG=none
 .endif
 
-.if !empty(PKG_OPTIONS:Mhal)
-.include "../../sysutils/hal/buildlink3.mk"
-CONFIGURE_ARGS+=       --enable-hal
-.else
-CONFIGURE_ARGS+=       --disable-hal
-.endif
-
 .if !empty(PKG_OPTIONS:Minet6)
 CONFIGURE_ARGS+=       --enable-ipv6
 .else