pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc No need to list the same PYTHON_VERSIONS_INCOMPATIBLE ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/ebbfb3e82a1a
branches:  trunk
changeset: 648990:ebbfb3e82a1a
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Thu Mar 26 22:11:47 2015 +0000

description:
No need to list the same PYTHON_VERSIONS_INCOMPATIBLE version mulitple times.

diffstat:

 devel/py-proteus/options.mk |   4 ++--
 devel/py-trytond/options.mk |  10 +++++-----
 misc/py-anki2/Makefile      |   6 +++---
 print/hplip/options.mk      |   8 ++++----
 www/ja-trac/options.mk      |   6 +++---
 www/py-django14/options.mk  |   6 +++---
 6 files changed, 20 insertions(+), 20 deletions(-)

diffs (166 lines):

diff -r 6069332c9603 -r ebbfb3e82a1a devel/py-proteus/options.mk
--- a/devel/py-proteus/options.mk       Thu Mar 26 21:04:34 2015 +0000
+++ b/devel/py-proteus/options.mk       Thu Mar 26 22:11:47 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2015/03/15 00:21:45 rodent Exp $
+# $NetBSD: options.mk,v 1.2 2015/03/26 22:11:47 jperkin Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.py-proteus
 PKG_SUPPORTED_OPTIONS+=        cdecimal simplejson
@@ -12,7 +12,7 @@
 # XXX python-Levenshtein (http://github.com/miohtama/python-Levenshtein) options
 
 .if !empty(PKG_OPTIONS:Mcdecimal)
-PYTHON_VERSIONS_INCOMPATIBLE=  33 34 34 34 34 # py-cdecimal is obsolete for that version and thus not available
+PYTHON_VERSIONS_INCOMPATIBLE=  33 34 # py-cdecimal is obsolete for that version and thus not available
 DEPENDS+=              ${PYPKGPREFIX}-cdecimal-[0-9]*:../../math/py-cdecimal
 .endif
 
diff -r 6069332c9603 -r ebbfb3e82a1a devel/py-trytond/options.mk
--- a/devel/py-trytond/options.mk       Thu Mar 26 21:04:34 2015 +0000
+++ b/devel/py-trytond/options.mk       Thu Mar 26 22:11:47 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.5 2014/05/09 07:37:03 wiz Exp $
+# $NetBSD: options.mk,v 1.6 2015/03/26 22:11:47 jperkin Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.py-trytond
 PKG_SUPPORTED_OPTIONS= cdecimal mysql pydot psycopg pytz simplejson sphinx
@@ -11,17 +11,17 @@
 # XXX python-Levenshtein (http://github.com/miohtama/python-Levenshtein) options
 
 .if !empty(PKG_OPTIONS:Mcdecimal)
-PYTHON_VERSIONS_INCOMPATIBLE=  33 34 34 34 34 # py-cdecimal is obsolete for that version and thus not available
+PYTHON_VERSIONS_INCOMPATIBLE=  33 34 # py-cdecimal is obsolete for that version and thus not available
 DEPENDS+=              ${PYPKGPREFIX}-cdecimal-[0-9]*:../../math/py-cdecimal
 .endif
 
 .if !empty(PKG_OPTIONS:Mmysql)
-PYTHON_VERSIONS_INCOMPATIBLE=  33 34 34 34 34 # py-mysqldb
+PYTHON_VERSIONS_INCOMPATIBLE=  33 34 # py-mysqldb
 DEPENDS+=              ${PYPKGPREFIX}-mysqldb-[0-9]*:../../databases/py-mysqldb
 .endif
 
 .if !empty(PKG_OPTIONS:Mpydot)
-PYTHON_VERSIONS_INCOMPATIBLE=  33 34 34 34 34 # py-dot
+PYTHON_VERSIONS_INCOMPATIBLE=  33 34 # py-dot
 DEPENDS+=              ${PYPKGPREFIX}-dot-[0-9]*:../../graphics/py-dot
 .endif
 
@@ -42,6 +42,6 @@
 .endif
 
 .if !empty(PKG_OPTIONS:Mwebdav)
-PYTHON_VERSIONS_INCOMPATIBLE=  33 34 34 34 34 # py-pywebdav
+PYTHON_VERSIONS_INCOMPATIBLE=  33 34 # py-pywebdav
 DEPENDS+=              ${PYPKGPREFIX}-pywebdav-[0-9]*:../../www/py-pywebdav
 .endif
diff -r 6069332c9603 -r ebbfb3e82a1a misc/py-anki2/Makefile
--- a/misc/py-anki2/Makefile    Thu Mar 26 21:04:34 2015 +0000
+++ b/misc/py-anki2/Makefile    Thu Mar 26 22:11:47 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2014/10/20 10:22:19 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2015/03/26 22:12:41 jperkin Exp $
 
 DISTNAME=      anki-2.0.31
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:C/anki/anki2/}
@@ -15,12 +15,12 @@
 # Actually, these hurt more than they help.
 # anki comes with its own version of the two, and if the pkgsrc versions
 # are newer, it might break
-#PYTHON_VERSIONS_INCOMPATIBLE=33 34 34 # py-beautifulsoup
+#PYTHON_VERSIONS_INCOMPATIBLE=33 34 # py-beautifulsoup
 #DEPENDS+=     ${PYPKGPREFIX}-beautifulsoup>=3.2:../../www/py-beautifulsoup
 #DEPENDS+=     ${PYPKGPREFIX}-httplib2-[0-9]*:../../www/py-httplib2
 # XXX: python portaudio
 
-PYTHON_VERSIONS_INCOMPATIBLE=  33 34 34 # not yet ported as of 2.0.21
+PYTHON_VERSIONS_INCOMPATIBLE=  33 34 # not yet ported as of 2.0.21
 
 .include "options.mk"
 
diff -r 6069332c9603 -r ebbfb3e82a1a print/hplip/options.mk
--- a/print/hplip/options.mk    Thu Mar 26 21:04:34 2015 +0000
+++ b/print/hplip/options.mk    Thu Mar 26 22:11:47 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2014/05/09 07:37:17 wiz Exp $
+# $NetBSD: options.mk,v 1.5 2015/03/26 22:13:14 jperkin Exp $
 #
 # HPLIP dependencies are detailed in the following page:
 # http://hplipopensource.com/hplip-web/install/manual/distros/other.html
@@ -18,7 +18,7 @@
 EGFILES+=              cups/pstotiff.convs cups/pstotiff.types
 MAKE_DIRS+=            ${PKG_SYSCONFDIR}/cups
 DEPENDS+=      ${PYPKGPREFIX}-reportlab-[0-9]*:../../print/py-reportlab
-PYTHON_VERSIONS_INCOMPATIBLE=  33 34 34 34 # py-reportlab
+PYTHON_VERSIONS_INCOMPATIBLE=  33 34 # py-reportlab
 .include "../../sysutils/dbus/buildlink3.mk"
 .include "../../sysutils/py-dbus/buildlink3.mk"
 .else
@@ -34,7 +34,7 @@
 .include "../../graphics/sane-backends/buildlink3.mk"
 # XXX: a dependency installs py-Pillow, which conflicts
 .include "../../graphics/py-imaging/buildlink3.mk"
-PYTHON_VERSIONS_INCOMPATIBLE=  33 34 34 34 # py-imaging
+PYTHON_VERSIONS_INCOMPATIBLE=  33 34 # py-imaging
 .else
 CONFIGURE_ARGS+=       --disable-scan-build
 .endif
@@ -49,7 +49,7 @@
 .include "../../x11/py-qt4/buildlink3.mk"
 .include "../../security/policykit/buildlink3.mk"
 DEPENDS+=      ${PYPKGPREFIX}-notify-[0-9]*:../../sysutils/py-notify
-PYTHON_VERSIONS_INCOMPATIBLE=  33 34 34 34 # py-notify
+PYTHON_VERSIONS_INCOMPATIBLE=  33 34 # py-notify
 .else
 CONFIGURE_ARGS+=       --disable-policykit
 CONFIGURE_ARGS+=       --disable-qt4
diff -r 6069332c9603 -r ebbfb3e82a1a www/ja-trac/options.mk
--- a/www/ja-trac/options.mk    Thu Mar 26 21:04:34 2015 +0000
+++ b/www/ja-trac/options.mk    Thu Mar 26 22:11:47 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.6 2014/05/09 07:37:24 wiz Exp $
+# $NetBSD: options.mk,v 1.7 2015/03/26 22:13:52 jperkin Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.trac
 PKG_OPTIONS_REQUIRED_GROUPS=   db
@@ -14,12 +14,12 @@
 # preferred over "py-sqlite3", the bundled version of sqlite3 support,
 # because it is more up to date.
 DEPENDS+=      ${PYPKGPREFIX}-sqlite2>=2.5.5:../../databases/py-sqlite2
-PYTHON_VERSIONS_INCOMPATIBLE=  33 34 34 # py-sqlite2
+PYTHON_VERSIONS_INCOMPATIBLE=  33 34 # py-sqlite2
 .endif
 .if !empty(PKG_OPTIONS:Mpgsql)
 DEPENDS+=      ${PYPKGPREFIX}-psycopg2>=2:../../databases/py-psycopg2
 .endif
 .if !empty(PKG_OPTIONS:Mmysql)
 DEPENDS+=      ${PYPKGPREFIX}-mysqldb>=1.2.2:../../databases/py-mysqldb
-PYTHON_VERSIONS_INCOMPATIBLE=  33 34 34 # py-mysqldb
+PYTHON_VERSIONS_INCOMPATIBLE=  33 34 # py-mysqldb
 .endif
diff -r 6069332c9603 -r ebbfb3e82a1a www/py-django14/options.mk
--- a/www/py-django14/options.mk        Thu Mar 26 21:04:34 2015 +0000
+++ b/www/py-django14/options.mk        Thu Mar 26 22:11:47 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2014/05/09 07:37:25 wiz Exp $
+# $NetBSD: options.mk,v 1.4 2015/03/26 22:13:52 jperkin Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.django
 PKG_SUPPORTED_OPTIONS= mysql oracle pgsql sqlite
@@ -10,7 +10,7 @@
 
 .if !empty(PKG_OPTIONS:Mmysql)
 DEPENDS+=      ${PYPKGPREFIX}-mysqldb-[0-9]*:../../databases/py-mysqldb
-PYTHON_VERSIONS_INCOMPATIBLE=  33 34 34 # py-mysqldb
+PYTHON_VERSIONS_INCOMPATIBLE=  33 34 # py-mysqldb
 PLIST.mysql=   yes
 .endif
 
@@ -26,6 +26,6 @@
 
 .if !empty(PKG_OPTIONS:Msqlite)
 DEPENDS+=      ${PYPKGPREFIX}-sqlite2-[0-9]*:../../databases/py-sqlite2
-PYTHON_VERSIONS_INCOMPATIBLE=  33 34 34 # py-sqlite2
+PYTHON_VERSIONS_INCOMPATIBLE=  33 34 # py-sqlite2
 PLIST.sqlite=  yes
 .endif



Home | Main Index | Thread Index | Old Index