pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/sysutils/gvfs gvfs: Refactor options into options.mk
details: https://anonhg.NetBSD.org/pkgsrc/rev/3123785c624f
branches: trunk
changeset: 377526:3123785c624f
user: nia <nia%pkgsrc.org@localhost>
date: Thu Apr 21 16:41:26 2022 +0000
description:
gvfs: Refactor options into options.mk
diffstat:
sysutils/gvfs/Makefile | 53 +----------------------------------------------
sysutils/gvfs/options.mk | 53 ++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 55 insertions(+), 51 deletions(-)
diffs (131 lines):
diff -r f708a0a2a19b -r 3123785c624f sysutils/gvfs/Makefile
--- a/sysutils/gvfs/Makefile Thu Apr 21 14:15:05 2022 +0000
+++ b/sysutils/gvfs/Makefile Thu Apr 21 16:41:26 2022 +0000
@@ -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 @@
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=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"
diff -r f708a0a2a19b -r 3123785c624f sysutils/gvfs/options.mk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/gvfs/options.mk Thu Apr 21 16:41:26 2022 +0000
@@ -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
+
+
Home |
Main Index |
Thread Index |
Old Index