summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornia <nia@pkgsrc.org>2018-12-19 22:22:59 +0000
committernia <nia@pkgsrc.org>2018-12-19 22:22:59 +0000
commitac78b687edd1fb6817799d938b9d9683d5c25524 (patch)
tree3872804be3fa6b21b6f7a44db3ee45a08e7f6781
parent12c963eb2318d4bb9b5b0045d7855ea1c3ea9084 (diff)
downloadpkgsrc-ac78b687edd1fb6817799d938b9d9683d5c25524.tar.gz
hplip: Set PYTHON_VERSIONS_INCOMPATIBLE before including py-dbus's buildlink3.
-rw-r--r--print/hplip/options.mk54
1 files changed, 27 insertions, 27 deletions
diff --git a/print/hplip/options.mk b/print/hplip/options.mk
index abad5f79b28..b0be958b137 100644
--- a/print/hplip/options.mk
+++ b/print/hplip/options.mk
@@ -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/system.d
.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