pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/print/hplip hplip: Set PYTHON_VERSIONS_INCOMPATIBLE be...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/a104ada26a0d
branches:  trunk
changeset: 389079:a104ada26a0d
user:      nia <nia%pkgsrc.org@localhost>
date:      Wed Dec 19 22:22:59 2018 +0000

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

diffstat:

 print/hplip/options.mk |  54 +++++++++++++++++++++++++-------------------------
 1 files changed, 27 insertions(+), 27 deletions(-)

diffs (72 lines):

diff -r 2f0d7e0af7c0 -r a104ada26a0d print/hplip/options.mk
--- a/print/hplip/options.mk    Wed Dec 19 17:12:53 2018 +0000
+++ b/print/hplip/options.mk    Wed Dec 19 22:22:59 2018 +0000
@@ -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,6 +15,32 @@
 
 .include "../../mk/bsd.options.mk"
 
+.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
+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
+. 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+=       --enable-qt5
+.  include "../../x11/py-qt5/buildlink3.mk"
+. endif
+.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
 CONFIGURE_ARGS+=       --enable-fax-build
@@ -39,29 +65,3 @@
 .else
 CONFIGURE_ARGS+=       --disable-scan-build
 .endif
-
-.if !empty(PKG_OPTIONS:Mqt4) || !empty(PKG_OPTIONS:Mqt5)
-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}-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
-.  include "../../x11/py-qt4/buildlink3.mk"
-. endif
-. if !empty(PKG_OPTIONS:Mqt5)
-PLIST_SRC+=            PLIST.qt5
-CONFIGURE_ARGS+=       --enable-qt5
-.  include "../../x11/py-qt5/buildlink3.mk"
-. endif
-.else
-CONFIGURE_ARGS+=       --disable-policykit
-CONFIGURE_ARGS+=       --disable-qt4
-CONFIGURE_ARGS+=       --disable-qt5
-CONFIGURE_ARGS+=       --disable-gui-build
-.endif



Home | Main Index | Thread Index | Old Index