summaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
authorwiz <wiz>2014-01-25 10:29:56 +0000
committerwiz <wiz>2014-01-25 10:29:56 +0000
commit6e3758a969debd301b6931288ac42e5d42199019 (patch)
tree3bbaa4e1a32886abb417eed9e3a6c4c742388c9a /misc
parentfb45f400d1b2ec5d1aad2a7d1d4bbfb776231f5e (diff)
downloadpkgsrc-6e3758a969debd301b6931288ac42e5d42199019.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 'misc')
-rw-r--r--misc/byobu/Makefile3
-rw-r--r--misc/calibre/Makefile3
-rw-r--r--misc/deskbar-applet/Makefile5
-rw-r--r--misc/kdeutils3/Makefile6
-rw-r--r--misc/kodos/Makefile5
-rw-r--r--misc/koffice/Makefile4
-rw-r--r--misc/mnemosyne/Makefile4
-rw-r--r--misc/openoffice3/Makefile4
-rw-r--r--misc/orca/Makefile8
-rw-r--r--misc/py-anita/Makefile5
-rw-r--r--misc/py-anki2/Makefile3
-rw-r--r--misc/py-carddav/Makefile4
-rw-r--r--misc/routeplanner-cli/Makefile3
-rw-r--r--misc/superkaramba/Makefile4
14 files changed, 40 insertions, 21 deletions
diff --git a/misc/byobu/Makefile b/misc/byobu/Makefile
index 76b30992b12..71f86b8f250 100644
--- a/misc/byobu/Makefile
+++ b/misc/byobu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2014/01/01 07:15:58 ryoon Exp $
+# $NetBSD: Makefile,v 1.2 2014/01/25 10:30:14 wiz Exp $
DISTNAME= byobu_5.69.orig
PKGNAME= ${DISTNAME:S/_/-/:S/.orig//}
@@ -22,6 +22,7 @@ REPLACE_BASH+= usr/share/byobu/tests/*
REPLACE_PERL+= usr/lib/byobu/include/*
REPLACE_PYTHON+= usr/lib/byobu/include/*
+PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-newt
EGDIR= share/examples/byobu
CONFIGURE_ARGS+= --sysconfdir=${PREFIX}/${EGDIR}
diff --git a/misc/calibre/Makefile b/misc/calibre/Makefile
index d25b0fb513e..6329f7ca2d6 100644
--- a/misc/calibre/Makefile
+++ b/misc/calibre/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.64 2014/01/17 23:11:27 wiz Exp $
+# $NetBSD: Makefile,v 1.65 2014/01/25 10:30:14 wiz Exp $
DISTNAME= calibre-0.9.7
PKGREVISION= 15
@@ -32,6 +32,7 @@ PYTHON_VERSIONED_DEPENDENCIES= dateutil dns
USE_LANGUAGES= c c++
USE_TOOLS+= pkg-config pax
PYTHON_VERSIONS_ACCEPTED= 27
+PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-mechanize, py-beautifulsoup, py-imaging, py-netifaces
PYDISTUTILSPKG= yes
PYSETUPOPTARGS= # empty
PYSETUPINSTALLARGS= --prefix=${PREFIX} --root=${DESTDIR:Q}${PREFIX}
diff --git a/misc/deskbar-applet/Makefile b/misc/deskbar-applet/Makefile
index 89af84aaee8..e4f8d6770da 100644
--- a/misc/deskbar-applet/Makefile
+++ b/misc/deskbar-applet/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.81 2014/01/01 11:52:23 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.82 2014/01/25 10:30:14 wiz Exp $
DISTNAME= deskbar-applet-2.32.0
PKGREVISION= 31
@@ -21,6 +20,8 @@ PKGCONFIG_OVERRIDE= data/deskbar-applet.pc.in
GCONF_SCHEMAS= deskbar-applet.schemas
+PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-ORBit via py-gnome2, py-gtk2
+
PYTHON_PATCH_SCRIPTS= deskbar/deskbar-applet.py
PY_PATCHPLIST= yes
diff --git a/misc/kdeutils3/Makefile b/misc/kdeutils3/Makefile
index 2350dc6a534..38a2b0cb2d8 100644
--- a/misc/kdeutils3/Makefile
+++ b/misc/kdeutils3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.101 2014/01/01 11:52:24 wiz Exp $
+# $NetBSD: Makefile,v 1.102 2014/01/25 10:30:14 wiz Exp $
DISTNAME= kdeutils-${_KDE_VERSION}
PKGREVISION= 32
@@ -26,7 +26,7 @@ SUBST_SED.tarexe= -e 's:<default>tar</default>:<default>${PREFIX.gtar}/bin/gtar<
.include "../../mk/bsd.prefs.mk"
.if ${OPSYS} == "NetBSD" && exists(/usr/include/machine/apmvar.h)
-CPPFLAGS+= -D__NetBSD_APM__
+CPPFLAGS+= -D__NetBSD_APM__
.endif
.if ${OPSYS} == "DragonFly"
@@ -37,6 +37,8 @@ CONFIGURE_ARGS+= --with-snmp=no
CONFIGURE_ARGS+= --with-pythondir=${LOCALBASE}
CONFIGURE_ENV+= PYVERSSUFFIX=${PYVERSSUFFIX:Q}
+PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 3.5.10
+
.include "../../meta-pkgs/kde3/kde3.mk"
.include "../../devel/gmp/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
diff --git a/misc/kodos/Makefile b/misc/kodos/Makefile
index d600af3e012..604a81e57d8 100644
--- a/misc/kodos/Makefile
+++ b/misc/kodos/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2013/10/09 17:39:13 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2014/01/25 10:30:14 wiz Exp $
DISTNAME= kodos-2.4.9
PKGREVISION= 6
@@ -10,7 +10,8 @@ HOMEPAGE= http://kodos.sourceforge.net/
COMMENT= GUI for creating, testing and debugging Python REs
PYDISTUTILSPKG= yes
-USE_LANGUAGES=
+USE_LANGUAGES= # empty
+PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-qt3-modules
SUBST_CLASSES+= libpath
SUBST_STAGE.libpath= pre-configure
diff --git a/misc/koffice/Makefile b/misc/koffice/Makefile
index 0a48f595a5d..0d274352a82 100644
--- a/misc/koffice/Makefile
+++ b/misc/koffice/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.156 2014/01/01 11:52:25 wiz Exp $
+# $NetBSD: Makefile,v 1.157 2014/01/25 10:30:14 wiz Exp $
DISTNAME= koffice-1.6.3
PKGREVISION= 51
@@ -43,6 +43,8 @@ REPLACE_PERL+= tools/scripts/gdb_output_to_text.pl
REPLACE_PERL+= tools/thesaurus/extract.pl
REPLACE_PERL+= kpresenter/kprconverter.pl
+PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 1.6.3
+
# Ensure we export symbols in the linked shared object.
LDFLAGS+= ${EXPORT_SYMBOLS_LDFLAGS}
diff --git a/misc/mnemosyne/Makefile b/misc/mnemosyne/Makefile
index 9f0e33a2bf8..ead8ec3828f 100644
--- a/misc/mnemosyne/Makefile
+++ b/misc/mnemosyne/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2013/10/24 12:32:38 ryoon Exp $
-#
+# $NetBSD: Makefile,v 1.28 2014/01/25 10:30:14 wiz Exp $
DISTNAME= mnemosyne-1.2.2
PKGREVISION= 16
@@ -15,6 +14,7 @@ LICENSE= gnu-gpl-v2
USE_LANGUAGES= # none
EGG_NAME= ${DISTNAME:S/^m/M/}
+PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-qt3-base, py-imaging
SUBST_CLASSES+= installpath
SUBST_SED.installpath= -e 's,/usr/share,${PREFIX}/share,'
diff --git a/misc/openoffice3/Makefile b/misc/openoffice3/Makefile
index 88a08e48267..9b6064521e9 100644
--- a/misc/openoffice3/Makefile
+++ b/misc/openoffice3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.96 2014/01/01 11:52:26 wiz Exp $
+# $NetBSD: Makefile,v 1.97 2014/01/25 10:30:14 wiz Exp $
OO_VER= 3.1.1
OO_TAG= OOO310_m19
@@ -32,6 +32,8 @@ WRKSRC= ${WRKDIR}/${OO_TAG}
GCC_REQD+= 3.4
USE_LANGUAGES+= c c++
+PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 3.1.1
+
CONFLICTS+= staroffice-[0-9]*
CONFLICTS+= openoffice-[0-9]*
CONFLICTS+= openoffice2-[0-9]*
diff --git a/misc/orca/Makefile b/misc/orca/Makefile
index c72e96e5c43..86773b6d68a 100644
--- a/misc/orca/Makefile
+++ b/misc/orca/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2012/10/08 09:57:32 asau Exp $
-#
+# $NetBSD: Makefile,v 1.36 2014/01/25 10:30:14 wiz Exp $
DISTNAME= orca-2.32.1
PKGREVISION= 1
@@ -16,7 +15,6 @@ LICENSE= gnu-lgpl-v2
DEPENDS+= ${PYPKGPREFIX}-at-spi>=1.32:../../devel/py-at-spi
DEPENDS+= ${PYPKGPREFIX}-gobject>=2.26:../../devel/py-gobject
DEPENDS+= ${PYPKGPREFIX}-xdg-[0-9]*:../../devel/py-xdg
-DEPENDS+= ${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo
DEPENDS+= ${PYPKGPREFIX}-ORBit>=2.24:../../net/py-ORBit
DEPENDS+= ${PYPKGPREFIX}-dbus-[0-9]*:../../sysutils/py-dbus
DEPENDS+= ${PYPKGPREFIX}-gnome2>=2.28:../../x11/py-gnome2
@@ -32,6 +30,9 @@ USE_PKGLOCALEDIR= yes
CONFIGURE_ENV+= PYTHON=${PYTHONBIN}
PY_PATCHPLIST= yes
+PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-ORBit, py-gnome2, py-gtk2
+PYTHON_VERSIONED_DEPENDENCIES= cairo
+
.include "../../mk/bsd.prefs.mk"
.if ${X11_TYPE} == "modular" || !exists(${X11BASE}/bin/xmodmap)
DEPENDS+= xmodmap-[0-9]*:../../x11/xmodmap
@@ -41,4 +42,5 @@ DEPENDS+= xmodmap-[0-9]*:../../x11/xmodmap
.include "../../lang/python/application.mk"
.include "../../lang/python/extension.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../lang/python/versioned_dependencies.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/misc/py-anita/Makefile b/misc/py-anita/Makefile
index 7dd83885c6e..795e45c7353 100644
--- a/misc/py-anita/Makefile
+++ b/misc/py-anita/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2014/01/15 19:05:34 martin Exp $
-#
+# $NetBSD: Makefile,v 1.28 2014/01/25 10:30:14 wiz Exp $
DISTNAME= anita-1.31
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
@@ -16,6 +15,8 @@ DEPENDS+= ${PYPKGPREFIX}-pexpect>=2.1:../../devel/py-pexpect
USE_LANGUAGES= #none
+PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 1.31
+
.include "options.mk"
.include "../../lang/python/distutils.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/misc/py-anki2/Makefile b/misc/py-anki2/Makefile
index b004b6bd6ac..bd9ca5462f9 100644
--- a/misc/py-anki2/Makefile
+++ b/misc/py-anki2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2013/12/31 17:47:21 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2014/01/25 10:30:14 wiz Exp $
DISTNAME= anki-2.0.20
PKGNAME= ${PYPKGPREFIX}-${DISTNAME:C/anki/anki2/}
@@ -18,6 +18,7 @@ DEPENDS+= portaudio-devel-[0-9]*:../../audio/portaudio-devel
# 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 # py-beautifulsoup
#DEPENDS+= ${PYPKGPREFIX}-beautifulsoup>=3.2:../../www/py-beautifulsoup
#DEPENDS+= ${PYPKGPREFIX}-httplib2-[0-9]*:../../www/py-httplib2
# XXX: python portaudio
diff --git a/misc/py-carddav/Makefile b/misc/py-carddav/Makefile
index 418d12e30cf..0df52126d9c 100644
--- a/misc/py-carddav/Makefile
+++ b/misc/py-carddav/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2013/11/26 13:46:30 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2014/01/25 10:30:14 wiz Exp $
DISTNAME= pyCardDAV-0.6.1
PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/pyCardDAV/carddav/}
@@ -17,6 +17,8 @@ DEPENDS+= ${PYPKGPREFIX}-requests-[0-9]*:../../devel/py-requests
USE_LANGUAGES= # none
+PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-vobject
+
REPLACE_PYTHON= pycarddav/ui.py
REPLACE_PYTHON+= pycarddav/controllers.py
REPLACE_PYTHON+= pycarddav/model.py
diff --git a/misc/routeplanner-cli/Makefile b/misc/routeplanner-cli/Makefile
index f9017dfb274..f1f591dc4c1 100644
--- a/misc/routeplanner-cli/Makefile
+++ b/misc/routeplanner-cli/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2012/10/08 09:57:36 asau Exp $
+# $NetBSD: Makefile,v 1.16 2014/01/25 10:30:14 wiz Exp $
#
DISTNAME= routeplanner_0.11
@@ -41,6 +41,7 @@ do-install:
done
# optional speedup
+#PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-kjbuckets
#.include "../../devel/py-kjbuckets/buildlink3.mk"
#.include "../../devel/py-pqueue/buildlink3.mk"
diff --git a/misc/superkaramba/Makefile b/misc/superkaramba/Makefile
index e862446a94b..246a0312fa4 100644
--- a/misc/superkaramba/Makefile
+++ b/misc/superkaramba/Makefile
@@ -1,10 +1,12 @@
-# $NetBSD: Makefile,v 1.20 2014/01/01 11:52:26 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2014/01/25 10:30:15 wiz Exp $
DISTNAME= superkaramba-${_KDE_VERSION}
PKGREVISION= 1
CATEGORIES= misc
COMMENT= KDE desktop widgets
+PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 4.11.3
+
.include "../../meta-pkgs/kde4/Makefile.kde4"
#make sure cmake picks up the same Python version as pkgsrc
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-25 00:38:42 +0000