CVS commit: pkgsrc/print/hplip

["Kamil Rytarowski" <kamil%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   kamil
Date:           Sun Oct 27 15:20:22 UTC 2019

Modified Files:
        pkgsrc/print/hplip: Makefile options.mk
Removed Files:
        pkgsrc/print/hplip: PLIST.qt4

Log Message:
hplip: Drop the qt4 option (disabled by default)

Keep the qt5 options.


To generate a diff of this commit:
cvs rdiff -u -r1.82 -r1.83 pkgsrc/print/hplip/Makefile
cvs rdiff -u -r1.1 -r0 pkgsrc/print/hplip/PLIST.qt4
cvs rdiff -u -r1.17 -r1.18 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/Makefile
diff -u pkgsrc/print/hplip/Makefile:1.82 pkgsrc/print/hplip/Makefile:1.83
--- pkgsrc/print/hplip/Makefile:1.82    Sun Aug 11 13:22:39 2019
+++ pkgsrc/print/hplip/Makefile Sun Oct 27 15:20:22 2019
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.82 2019/08/11 13:22:39 wiz Exp $
+# $NetBSD: Makefile,v 1.83 2019/10/27 15:20:22 kamil Exp $
 
 DISTNAME=      hplip-3.18.5
-PKGREVISION=   10
+PKGREVISION=   11
 CATEGORIES=    print
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=hplip/}
 

Index: pkgsrc/print/hplip/options.mk
diff -u pkgsrc/print/hplip/options.mk:1.17 pkgsrc/print/hplip/options.mk:1.18
--- pkgsrc/print/hplip/options.mk:1.17  Mon Sep  2 13:19:59 2019
+++ pkgsrc/print/hplip/options.mk       Sun Oct 27 15:20:22 2019
@@ -1,21 +1,19 @@
-# $NetBSD: options.mk,v 1.17 2019/09/02 13:19:59 adam Exp $
+# $NetBSD: options.mk,v 1.18 2019/10/27 15:20:22 kamil 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
+PKG_SUPPORTED_OPTIONS= fax sane qt5
 PKG_SUGGESTED_OPTIONS= fax
-PKG_OPTIONS_GROUP.gui= qt4 qt5
-PKG_OPTIONS_OPTIONAL_GROUPS += gui
 
 PKG_OPTIONS_LEGACY_OPTS+=      scan:sane
-PKG_OPTIONS_LEGACY_OPTS+=      gui:qt4
-PKG_OPTIONS_LEGACY_OPTS+=      qt:qt4
+PKG_OPTIONS_LEGACY_OPTS+=      gui:qt5
+PKG_OPTIONS_LEGACY_OPTS+=      qt:qt5
 
 .include "../../mk/bsd.options.mk"
 
-.if !empty(PKG_OPTIONS:Mqt4) || !empty(PKG_OPTIONS:Mqt5)
+.if !empty(PKG_OPTIONS:Mqt5)
 PYTHON_VERSIONS_ACCEPTED=       27 # py-notify
 CONFIGURE_ARGS+=       --enable-gui-build
 CONFIGURE_ARGS+=       --enable-policykit
@@ -24,16 +22,10 @@ MAKE_DIRS+=         ${PKG_SYSCONFDIR}/dbus-1/sy
 .include "../../security/policykit/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 DEPENDS+=      ${PYPKGPREFIX}-notify-[0-9]*:../../sysutils/py-notify
-. if !empty(PKG_OPTIONS:Mqt4)
-PLIST_SRC+=            PLIST.qt4
-CONFIGURE_ARGS+=       --enable-qt4
-.  include "../../x11/py-qt4/buildlink3.mk"
-. endif
-. if !empty(PKG_OPTIONS:Mqt5)
 PLIST_SRC+=            PLIST.qt5
+CONFIGURE_ARGS+=       --disable-qt4
 CONFIGURE_ARGS+=       --enable-qt5
-.  include "../../x11/py-qt5/buildlink3.mk"
-. endif
+.include "../../x11/py-qt5/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=       --disable-policykit
 CONFIGURE_ARGS+=       --disable-qt4