CVS commit: pkgsrc/sysutils/gvfs

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sat Nov  4 12:27:36 UTC 2023

Modified Files:
        pkgsrc/sysutils/gvfs: Makefile options.mk

Log Message:
gvfs: remove hal option

Bump PKGREVISION


To generate a diff of this commit:
cvs rdiff -u -r1.127 -r1.128 pkgsrc/sysutils/gvfs/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/sysutils/gvfs/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/gvfs/Makefile
diff -u pkgsrc/sysutils/gvfs/Makefile:1.127 pkgsrc/sysutils/gvfs/Makefile:1.128
--- pkgsrc/sysutils/gvfs/Makefile:1.127 Tue Oct 24 22:11:08 2023
+++ pkgsrc/sysutils/gvfs/Makefile       Sat Nov  4 12:27:36 2023
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.127 2023/10/24 22:11:08 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.128 2023/11/04 12:27:36 wiz Exp $
 
 DISTNAME=      gvfs-1.6.7
-PKGREVISION=   64
+PKGREVISION=   65
 CATEGORIES=    sysutils
 MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/gvfs/1.6/}
 EXTRACT_SUFX=  .tar.bz2
@@ -22,7 +21,7 @@ BUILDLINK_TRANSFORM+= rm:-DG_DISABLE_DEP
 
 .include "../../mk/compiler.mk"
 
-.if !empty(PKGSRC_COMPILER:Mclang) || !empty(CC_VERSION:Mgcc-[6-9]*) || !empty(CC_VERSION:Mgcc-1[0-9].*)
+.if !empty(PKGSRC_COMPILER:Mclang) || ${CC_VERSION:Mgcc-[6-9]*} || ${CC_VERSION:Mgcc-1[0-9].*}
 CFLAGS.SunOS+=         -D_XOPEN_SOURCE=600 -D__EXTENSIONS__
 .else
 CFLAGS.SunOS+=         -D_XOPEN_SOURCE=500 -D__EXTENSIONS__
@@ -33,7 +32,6 @@ BUILDLINK_API_DEPENDS.glib2+= glib2>=2.2
 .include "../../devel/glib2/modules.mk"
 .include "../../sysutils/dbus/buildlink3.mk"
 .include "../../archivers/libarchive/buildlink3.mk"
-BUILDLINK_API_DEPENDS.libsoup+=        libsoup>=2.26.0
 .include "../../net/libsoup/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../devel/GConf/buildlink3.mk"

Index: pkgsrc/sysutils/gvfs/options.mk
diff -u pkgsrc/sysutils/gvfs/options.mk:1.5 pkgsrc/sysutils/gvfs/options.mk:1.6
--- pkgsrc/sysutils/gvfs/options.mk:1.5 Fri Apr 29 23:56:36 2022
+++ pkgsrc/sysutils/gvfs/options.mk     Sat Nov  4 12:27:36 2023
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.5 2022/04/29 23:56:36 gutteridge Exp $
+# $NetBSD: options.mk,v 1.6 2023/11/04 12:27:36 wiz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.gvfs
-PKG_SUPPORTED_OPTIONS+=        avahi hal fuse samba
+PKG_SUPPORTED_OPTIONS+=        avahi fuse samba
 PLIST_VARS+=           ${PKG_SUPPORTED_OPTIONS}
 
 .include "../../mk/bsd.fast.prefs.mk"
@@ -33,17 +33,6 @@ PLIST.samba=         yes
 CONFIGURE_ARGS+=       --disable-samba
 .endif
 
-.if !empty(PKG_OPTIONS:Mhal)
-.include "../../misc/libcdio-paranoia/buildlink3.mk"
-.include "../../sysutils/hal/buildlink3.mk"
-CONFIGURE_ARGS+=       --enable-hal
-CONFIGURE_ARGS+=       --enable-cdda
-PLIST.hal=             yes
-.else
-CONFIGURE_ARGS+=       --disable-hal
-CONFIGURE_ARGS+=       --disable-cdda
-.endif
-
 .if !empty(PKG_OPTIONS:Mfuse)
 BUILDLINK_API_DEPENDS.fuse+=   fuse>=2.8
 .include "../../mk/fuse.buildlink3.mk"