CVS commit: pkgsrc/print/hplip

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Wed Dec 19 22:22:59 UTC 2018

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

Log Message:
hplip: Set PYTHON_VERSIONS_INCOMPATIBLE before including py-dbus's buildlink3.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 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.14 pkgsrc/print/hplip/options.mk:1.15
--- pkgsrc/print/hplip/options.mk:1.14  Tue Jul  3 05:03:30 2018
+++ pkgsrc/print/hplip/options.mk       Wed Dec 19 22:22:59 2018
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.14 2018/07/03 05:03:30 adam Exp $
+# $NetBSD: options.mk,v 1.15 2018/12/19 22:22:59 nia Exp $
 #
 # HPLIP dependencies are detailed in the following page:
 # http://hplipopensource.com/hplip-web/install/manual/distros/other.html
@@ -15,32 +15,8 @@ PKG_OPTIONS_LEGACY_OPTS+=    qt:qt4
 
 .include "../../mk/bsd.options.mk"
 
-.if !empty(PKG_OPTIONS:Mfax)
-PLIST_SRC+=            PLIST.fax
-CONFIGURE_ARGS+=       --enable-fax-build
-CONFIGURE_ARGS+=       --enable-dbus-build
-EGFILES+=              cups/pstotiff.convs cups/pstotiff.types
-MAKE_DIRS+=            ${PKG_SYSCONFDIR}/cups
-DEPENDS+=      ${PYPKGPREFIX}-reportlab-[0-9]*:../../print/py-reportlab
-.include "../../sysutils/dbus/buildlink3.mk"
-.include "../../sysutils/py-dbus/buildlink3.mk"
-.else
-CONFIGURE_ARGS+=       --disable-dbus-build
-CONFIGURE_ARGS+=       --disable-fax-build
-.endif
-
-.if !empty(PKG_OPTIONS:Msane)
-PLIST_SRC+=            PLIST.scan
-CONFIGURE_ARGS+=       --enable-scan-build
-MESSAGE_SRC+=          MESSAGE.scan
-MESSAGE_SUBST+=                EGDIR=${EGDIR}
-.include "../../graphics/sane-backends/buildlink3.mk"
-DEPENDS+=      {${PYPKGPREFIX}-Pillow-[0-9]*,${PYPKGPREFIX}-imaging-[0-9]*}:../../graphics/py-Pillow
-.else
-CONFIGURE_ARGS+=       --disable-scan-build
-.endif
-
 .if !empty(PKG_OPTIONS:Mqt4) || !empty(PKG_OPTIONS:Mqt5)
+PYTHON_VERSIONS_INCOMPATIBLE=  34 35 36 37 # py-notify
 CONFIGURE_ARGS+=       --enable-gui-build
 CONFIGURE_ARGS+=       --enable-policykit
 EGFILES+=              dbus-1/system.d/com.hp.hplip.conf
@@ -48,7 +24,6 @@ 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
-PYTHON_VERSIONS_INCOMPATIBLE=  34 35 36 37 # py-notify
 . if !empty(PKG_OPTIONS:Mqt4)
 PLIST_SRC+=            PLIST.qt4
 CONFIGURE_ARGS+=       --enable-qt4
@@ -65,3 +40,28 @@ CONFIGURE_ARGS+=     --disable-qt4
 CONFIGURE_ARGS+=       --disable-qt5
 CONFIGURE_ARGS+=       --disable-gui-build
 .endif
+
+.if !empty(PKG_OPTIONS:Mfax)
+PLIST_SRC+=            PLIST.fax
+CONFIGURE_ARGS+=       --enable-fax-build
+CONFIGURE_ARGS+=       --enable-dbus-build
+EGFILES+=              cups/pstotiff.convs cups/pstotiff.types
+MAKE_DIRS+=            ${PKG_SYSCONFDIR}/cups
+DEPENDS+=      ${PYPKGPREFIX}-reportlab-[0-9]*:../../print/py-reportlab
+.include "../../sysutils/dbus/buildlink3.mk"
+.include "../../sysutils/py-dbus/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --disable-dbus-build
+CONFIGURE_ARGS+=       --disable-fax-build
+.endif
+
+.if !empty(PKG_OPTIONS:Msane)
+PLIST_SRC+=            PLIST.scan
+CONFIGURE_ARGS+=       --enable-scan-build
+MESSAGE_SRC+=          MESSAGE.scan
+MESSAGE_SUBST+=                EGDIR=${EGDIR}
+.include "../../graphics/sane-backends/buildlink3.mk"
+DEPENDS+=      {${PYPKGPREFIX}-Pillow-[0-9]*,${PYPKGPREFIX}-imaging-[0-9]*}:../../graphics/py-Pillow
+.else
+CONFIGURE_ARGS+=       --disable-scan-build
+.endif