CVS commit: pkgsrc/sysutils/gvfs

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Thu Apr 21 16:41:26 UTC 2022

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

Log Message:
gvfs: Refactor options into options.mk


To generate a diff of this commit:
cvs rdiff -u -r1.120 -r1.121 pkgsrc/sysutils/gvfs/Makefile
cvs rdiff -u -r0 -r1.1 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.120 pkgsrc/sysutils/gvfs/Makefile:1.121
--- pkgsrc/sysutils/gvfs/Makefile:1.120 Mon Apr 18 19:12:05 2022
+++ pkgsrc/sysutils/gvfs/Makefile       Thu Apr 21 16:41:26 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.120 2022/04/18 19:12:05 adam Exp $
+# $NetBSD: Makefile,v 1.121 2022/04/21 16:41:26 nia Exp $
 #
 
 DISTNAME=      gvfs-1.6.7
@@ -18,56 +18,6 @@ USE_TOOLS+=          intltool gmake pkg-config m
 CONFIGURE_ARGS+=       --enable-http
 CONFIGURE_ARGS+=       --disable-bash-completion
 
-.include "../../mk/bsd.prefs.mk"
-
-PKG_OPTIONS_VAR=       PKG_OPTIONS.gvfs
-PKG_SUPPORTED_OPTIONS+=        avahi hal fuse samba
-PKG_SUGGESTED_OPTIONS+=        samba
-PLIST_VARS+=           ${PKG_SUPPORTED_OPTIONS}
-
-# XXX fuse.bl3.mk will fail if we include it and fuse is not available
-.if ${OPSYS} == "Linux" #|| (${OPSYS} == "NetBSD" && exists(/usr/include/fuse.h))
-PKG_SUGGESTED_OPTIONS+=        fuse
-.endif
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mavahi)
-.include "../../net/avahi/buildlink3.mk"
-CONFIGURE_ARGS+=       --enable-avahi
-PLIST.avahi=           yes
-.else
-CONFIGURE_ARGS+=       --disable-avahi
-.endif
-
-.if !empty(PKG_OPTIONS:Msamba)
-CONFIGURE_ARGS+=       --with-samba-includes=${BUILDLINK_PREFIX.samba}/include
-CONFIGURE_ARGS+=       --with-samba-libs=${BUILDLINK_PREFIX.samba}/lib
-.include "../../net/samba4/buildlink3.mk"
-PLIST.samba=           yes
-.else
-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)
-.include "../../mk/fuse.buildlink3.mk"
-CONFIGURE_ARGS+=       --enable-fuse
-PLIST.fuse=            yes
-.else
-CONFIGURE_ARGS+=       --disable-fuse
-.endif
-
 BUILDLINK_TRANSFORM+=  rm:-DG_DISABLE_DEPRECATED
 
 .include "../../mk/compiler.mk"
@@ -78,6 +28,7 @@ CFLAGS.SunOS+=                -D_XOPEN_SOURCE=600 -D__
 CFLAGS.SunOS+=         -D_XOPEN_SOURCE=500 -D__EXTENSIONS__
 .endif
 
+.include "options.mk"
 BUILDLINK_API_DEPENDS.glib2+=  glib2>=2.23.4
 .include "../../devel/glib2/modules.mk"
 .include "../../sysutils/dbus/buildlink3.mk"

Added files:

Index: pkgsrc/sysutils/gvfs/options.mk
diff -u /dev/null pkgsrc/sysutils/gvfs/options.mk:1.1
--- /dev/null   Thu Apr 21 16:41:26 2022
+++ pkgsrc/sysutils/gvfs/options.mk     Thu Apr 21 16:41:26 2022
@@ -0,0 +1,53 @@
+# $NetBSD: options.mk,v 1.1 2022/04/21 16:41:26 nia Exp $
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.gvfs
+PKG_SUPPORTED_OPTIONS+=        avahi hal fuse samba
+PKG_SUGGESTED_OPTIONS+=        samba
+PLIST_VARS+=           ${PKG_SUPPORTED_OPTIONS}
+
+.include "../../mk/bsd.fast.prefs.mk"
+
+# XXX fuse.bl3.mk will fail if we include it and fuse is not available
+.if ${OPSYS} == "Linux" || (${OPSYS} == "NetBSD" && exists(/usr/include/fuse.h))
+PKG_SUGGESTED_OPTIONS=+        fuse
+.endif
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mavahi)
+.include "../../net/avahi/buildlink3.mk"
+CONFIGURE_ARGS+=       --enable-avahi
+PLIST.avahi=           yes
+.else
+CONFIGURE_ARGS+=       --disable-avahi
+.endif
+
+.if !empty(PKG_OPTIONS:Msamba)
+CONFIGURE_ARGS+=       --with-samba-includes=${BUILDLINK_PREFIX.samba}/include
+CONFIGURE_ARGS+=       --with-samba-libs=${BUILDLINK_PREFIX.samba}/lib
+.include "../../net/samba4/buildlink3.mk"
+PLIST.samba=           yes
+.else
+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)
+.include "../../mk/fuse.buildlink3.mk"
+CONFIGURE_ARGS+=       --enable-fuse
+PLIST.fuse=            yes
+.else
+CONFIGURE_ARGS+=       --disable-fuse
+.endif
+
+