diff options
| author | wiz <wiz@pkgsrc.org> | 2014-01-25 10:29:56 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2014-01-25 10:29:56 +0000 |
| commit | 4fc0b0ed6a186ccd83fc93c34cc9ed91862930d8 (patch) | |
| tree | 3bbaa4e1a32886abb417eed9e3a6c4c742388c9a /print/hplip | |
| parent | da96a0b73ccce3895e3b718798083bf1740293d8 (diff) | |
| download | pkgsrc-4fc0b0ed6a186ccd83fc93c34cc9ed91862930d8.tar.gz | |
Mark packages as not ready for python-3.x where applicable;
either because they themselves are not ready or because a
dependency isn't. This is annotated by
PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of x.y.z
or
PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-foo, py-bar
respectively, please use the same style for other packages,
and check during updates.
Use versioned_dependencies.mk where applicable.
Use REPLACE_PYTHON instead of handcoded alternatives, where applicable.
Reorder Makefile sections into standard order, where applicable.
Remove PYTHON_VERSIONS_INCLUDE_3X lines since that will be default
with the next commit.
Whitespace cleanups and other nits corrected, where necessary.
Diffstat (limited to 'print/hplip')
| -rw-r--r-- | print/hplip/Makefile | 5 | ||||
| -rw-r--r-- | print/hplip/options.mk | 7 |
2 files changed, 8 insertions, 4 deletions
diff --git a/print/hplip/Makefile b/print/hplip/Makefile index f4ce218fc64..8bc6fb248f2 100644 --- a/print/hplip/Makefile +++ b/print/hplip/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2014/01/23 14:58:28 schnoebe Exp $ -# +# $NetBSD: Makefile,v 1.31 2014/01/25 10:30:18 wiz Exp $ DISTNAME= hplip-3.14.1 CATEGORIES= print @@ -18,6 +17,8 @@ FILES_SUBST+= CUPS_GROUP=${CUPS_GROUP} PKG_GROUPS_VARS+= CUPS_GROUP PKG_USERS_VARS+= CUPS_USER +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-xml + BUILD_DEFS+= CUPS_USER CUPS_GROUP VARBASE GNU_CONFIGURE= yes diff --git a/print/hplip/options.mk b/print/hplip/options.mk index aa4c1c16a6b..766c7bd4a94 100644 --- a/print/hplip/options.mk +++ b/print/hplip/options.mk @@ -1,8 +1,7 @@ -# $NetBSD: options.mk,v 1.2 2013/04/12 03:47:30 schnoebe Exp $ +# $NetBSD: options.mk,v 1.3 2014/01/25 10:30:18 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 qt @@ -19,6 +18,7 @@ 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 +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-reportlab .include "../../sysutils/dbus/buildlink3.mk" .include "../../sysutils/py-dbus/buildlink3.mk" .else @@ -32,7 +32,9 @@ CONFIGURE_ARGS+= --enable-scan-build MESSAGE_SRC+= MESSAGE.scan MESSAGE_SUBST+= EGDIR=${EGDIR} .include "../../graphics/sane-backends/buildlink3.mk" +# XXX: a dependency installs py-Pillow, which conflicts .include "../../graphics/py-imaging/buildlink3.mk" +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-imaging .else CONFIGURE_ARGS+= --disable-scan-build .endif @@ -47,6 +49,7 @@ MAKE_DIRS+= ${PKG_SYSCONFDIR}/dbus-1/system.d .include "../../x11/py-qt4/buildlink3.mk" .include "../../security/policykit/buildlink3.mk" DEPENDS+= ${PYPKGPREFIX}-notify-[0-9]*:../../sysutils/py-notify +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-notify .else CONFIGURE_ARGS+= --disable-policykit CONFIGURE_ARGS+= --disable-qt4 |