CVS commit: pkgsrc/print/hplip

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sat Nov  4 14:22:03 UTC 2023

Modified Files:
        pkgsrc/print/hplip: options.mk

Log Message:
hplip: comment out broken qt5 option

It uses a non-existent bl3.mk file, and has a comment already that it
'needs more work'

Default off, so no bump.


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 pkgsrc/print/hplip/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/print/hplip/options.mk
diff -u pkgsrc/print/hplip/options.mk:1.21 pkgsrc/print/hplip/options.mk:1.22
--- pkgsrc/print/hplip/options.mk:1.21  Tue Mar 15 02:30:23 2022
+++ pkgsrc/print/hplip/options.mk       Sat Nov  4 14:22:03 2023
@@ -1,39 +1,35 @@
-# $NetBSD: options.mk,v 1.21 2022/03/15 02:30:23 gutteridge Exp $
+# $NetBSD: options.mk,v 1.22 2023/11/04 14:22:03 wiz Exp $
 #
 # HPLIP dependencies are detailed in the following page:
 # http://hplipopensource.com/hplip-web/install/manual/distros/other.html
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.hplip
-PKG_SUPPORTED_OPTIONS= fax sane qt5
+PKG_SUPPORTED_OPTIONS= fax sane # qt5
 PKG_SUGGESTED_OPTIONS= fax
 
-PKG_OPTIONS_LEGACY_OPTS+=      scan:sane
-PKG_OPTIONS_LEGACY_OPTS+=      gui:qt5
-PKG_OPTIONS_LEGACY_OPTS+=      qt:qt5
-
 .include "../../mk/bsd.options.mk"
 
 # NB the qt5 option results in components that don't entirely function
 # correctly, at least on NetBSD. This needs more work.
-.if !empty(PKG_OPTIONS:Mqt5)
-PYTHON_VERSIONS_INCOMPATIBLE=  27 # py-pyphen
-CONFIGURE_ARGS+=       --enable-gui-build
-CONFIGURE_ARGS+=       --enable-policykit
-EGFILES+=              dbus-1/system.d/com.hp.hplip.conf
-MAKE_DIRS+=            ${PKG_SYSCONFDIR}/dbus-1/system.d
-.include "../../security/policykit/buildlink3.mk"
-.include "../../sysutils/desktop-file-utils/desktopdb.mk"
-DEPENDS+=      ${PYPKGPREFIX}-notify2-[0-9]*:../../sysutils/py-notify2
-PLIST_SRC+=            PLIST.qt5
-CONFIGURE_ARGS+=       --disable-qt4
-CONFIGURE_ARGS+=       --enable-qt5
-.include "../../x11/py-qt5/buildlink3.mk"
-.else
-CONFIGURE_ARGS+=       --disable-policykit
-CONFIGURE_ARGS+=       --disable-qt4
-CONFIGURE_ARGS+=       --disable-qt5
-CONFIGURE_ARGS+=       --disable-gui-build
-.endif
+#.if !empty(PKG_OPTIONS:Mqt5)
+#PYTHON_VERSIONS_INCOMPATIBLE= 27 # py-pyphen
+#CONFIGURE_ARGS+=              --enable-gui-build
+#CONFIGURE_ARGS+=              --enable-policykit
+#EGFILES+=                     dbus-1/system.d/com.hp.hplip.conf
+#MAKE_DIRS+=                   ${PKG_SYSCONFDIR}/dbus-1/system.d
+#.include "../../security/policykit/buildlink3.mk"
+#.include "../../sysutils/desktop-file-utils/desktopdb.mk"
+#DEPENDS+=                     ${PYPKGPREFIX}-notify2-[0-9]*:../../sysutils/py-notify2
+#PLIST_SRC+=                   PLIST.qt5
+#CONFIGURE_ARGS+=              --disable-qt4
+#CONFIGURE_ARGS+=              --enable-qt5
+#.include "../../x11/py-qt5/buildlink3.mk"
+#.else
+CONFIGURE_ARGS+=               --disable-policykit
+CONFIGURE_ARGS+=               --disable-qt4
+CONFIGURE_ARGS+=               --disable-qt5
+CONFIGURE_ARGS+=               --disable-gui-build
+#.endif
 
 .if !empty(PKG_OPTIONS:Mfax)
 PLIST_SRC+=            PLIST.fax