Fix fallout from recursive jpeg shlib bump.

The man page says that you should check the diff before committing,
especially for the case that went wrong here (PYPKGPREFIX -> py25).
Hi sno!

13 files changed, 26 insertions, 26 deletions

diff --git a/devel/py-at-spi/buildlink3.mk b/devel/py-at-spi/buildlink3.mk
index c81a4512225..a345e522e98 100644
--- a/devel/py-at-spi/buildlink3.mk
+++ b/devel/py-at-spi/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2009/08/26 19:57:07 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2009/08/27 18:53:36 wiz Exp $
 
 BUILDLINK_TREE+=	py-at-spi
 
@@ -8,7 +8,7 @@ PY_AT_SPI_BUILDLINK3_MK:=
 .include "../../lang/python/pyversion.mk"
 
 BUILDLINK_API_DEPENDS.py-at-spi+=	${PYPKGPREFIX}-at-spi>=1.20.1
-BUILDLINK_ABI_DEPENDS.py-at-spi?=		py25-at-spi>=1.26.0nb1
+BUILDLINK_ABI_DEPENDS.py-at-spi?=		${PYPKGPREFIX}-at-spi>=1.26.0nb1
 BUILDLINK_PKGSRCDIR.py-at-spi?=		../../devel/py-at-spi
 
 .include "../../devel/at-spi/buildlink3.mk"
diff --git a/devel/py-game/buildlink3.mk b/devel/py-game/buildlink3.mk
index 776ce30b45f..8a544b60c93 100644
--- a/devel/py-game/buildlink3.mk
+++ b/devel/py-game/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2009/08/26 19:56:49 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2009/08/27 18:53:37 wiz Exp $
 
 BUILDLINK_TREE+=	${PYPKGPREFIX}-game
 
@@ -8,7 +8,7 @@ PY_GAME_BUILDLINK3_MK:=
 .include "../../lang/python/pyversion.mk"
 
 BUILDLINK_API_DEPENDS.${PYPKGPREFIX}-game+=	${PYPKGPREFIX}-game>=1.6
-BUILDLINK_ABI_DEPENDS.${PYPKGPREFIX}-game?=	py25-game>=1.8.1nb3
+BUILDLINK_ABI_DEPENDS.${PYPKGPREFIX}-game?=	${PYPKGPREFIX}-game>=1.8.1nb3
 BUILDLINK_PKGSRCDIR.${PYPKGPREFIX}-game?=	../../devel/py-game
 
 .include "../../audio/SDL_mixer/buildlink3.mk"
diff --git a/graphics/py-imaging/buildlink3.mk b/graphics/py-imaging/buildlink3.mk
index ea05a7b201a..caf56214f1b 100644
--- a/graphics/py-imaging/buildlink3.mk
+++ b/graphics/py-imaging/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2009/08/26 19:56:42 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2009/08/27 18:53:37 wiz Exp $
 
 BUILDLINK_TREE+=	pyimaging
 
@@ -8,7 +8,7 @@ PY_IMAGING_BUILDLINK3_MK:=
 .include "../../lang/python/pyversion.mk"
 
 BUILDLINK_API_DEPENDS.pyimaging+=	${PYPKGPREFIX}-imaging>=1.1.4
-BUILDLINK_ABI_DEPENDS.pyimaging?=	py25-imaging>=1.1.6nb1
+BUILDLINK_ABI_DEPENDS.pyimaging?=	${PYPKGPREFIX}-imaging>=1.1.6nb1
 BUILDLINK_PKGSRCDIR.pyimaging?=	../../graphics/py-imaging
 
 .include "../../graphics/jpeg/buildlink3.mk"
diff --git a/print/py-cups/buildlink3.mk b/print/py-cups/buildlink3.mk
index fc9aab68c7d..1e718468241 100644
--- a/print/py-cups/buildlink3.mk
+++ b/print/py-cups/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2009/08/26 19:56:52 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2009/08/27 18:53:37 wiz Exp $
 
 BUILDLINK_TREE+=	py-cups
 
@@ -8,7 +8,7 @@ PY_CUPS_BUILDLINK3_MK:=
 .include "../../lang/python/pyversion.mk"
 
 BUILDLINK_API_DEPENDS.py-cups+=	${PYPKGPREFIX}-cups>=1.9.44
-BUILDLINK_ABI_DEPENDS.py-cups?=	py25-cups>=1.9.46nb1
+BUILDLINK_ABI_DEPENDS.py-cups?=	${PYPKGPREFIX}-cups>=1.9.46nb1
 BUILDLINK_PKGSRCDIR.py-cups?=	../../print/py-cups
 
 #.include "../../print/cups/buildlink3.mk"
diff --git a/sysutils/py-notify/buildlink3.mk b/sysutils/py-notify/buildlink3.mk
index a250fd9489f..fb32f49cde1 100644
--- a/sysutils/py-notify/buildlink3.mk
+++ b/sysutils/py-notify/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2009/08/26 19:57:05 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2009/08/27 18:53:37 wiz Exp $
 
 BUILDLINK_TREE+=	py-notify
 
@@ -8,7 +8,7 @@ PY_NOTIFY_BUILDLINK3_MK:=
 .include "../../lang/python/pyversion.mk"
 
 BUILDLINK_API_DEPENDS.py-notify+=	${PYPKGPREFIX}-notify>=0.1.1
-BUILDLINK_ABI_DEPENDS.py-notify?=	py25-notify>=0.1.1nb2
+BUILDLINK_ABI_DEPENDS.py-notify?=	${PYPKGPREFIX}-notify>=0.1.1nb2
 BUILDLINK_PKGSRCDIR.py-notify?=	../../sysutils/py-notify
 
 .include "../../x11/py-gtk2/buildlink3.mk"
diff --git a/x11/py-gnome2-desktop/buildlink3.mk b/x11/py-gnome2-desktop/buildlink3.mk
index fd9b09ee328..9870f171c59 100644
--- a/x11/py-gnome2-desktop/buildlink3.mk
+++ b/x11/py-gnome2-desktop/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2009/08/26 19:57:05 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2009/08/27 18:53:37 wiz Exp $
 
 BUILDLINK_TREE+=	py-gnome2-desktop
 
@@ -8,7 +8,7 @@ PY_GNOME2_DESKTOP_BUILDLINK3_MK:=
 .include "../../lang/python/pyversion.mk"
 
 BUILDLINK_API_DEPENDS.py-gnome2-desktop+=	${PYPKGPREFIX}-gnome2-desktop>=2.16.0
-BUILDLINK_ABI_DEPENDS.py-gnome2-desktop?=		py25-gnome2-desktop>=2.26.0nb3
+BUILDLINK_ABI_DEPENDS.py-gnome2-desktop?=		${PYPKGPREFIX}-gnome2-desktop>=2.26.0nb3
 BUILDLINK_PKGSRCDIR.py-gnome2-desktop?=		../../x11/py-gnome2-desktop
 
 .include "../../x11/py-gnome2/buildlink3.mk"
diff --git a/x11/py-gnome2-extras/buildlink3.mk b/x11/py-gnome2-extras/buildlink3.mk
index 124b58001d7..793a571144b 100644
--- a/x11/py-gnome2-extras/buildlink3.mk
+++ b/x11/py-gnome2-extras/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2009/08/26 19:57:05 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2009/08/27 18:53:37 wiz Exp $
 
 BUILDLINK_TREE+=	pygnome2ex
 
@@ -8,7 +8,7 @@ PYGNOME2EX_BUILDLINK3_MK:=
 .include "../../lang/python/pyversion.mk"
 
 BUILDLINK_API_DEPENDS.pygnome2ex+=	${PYPKGPREFIX}-gnome2-extras>=2.12.0nb3
-BUILDLINK_ABI_DEPENDS.pygnome2ex+=	py25-gnome2-extras>=2.14.3nb5
+BUILDLINK_ABI_DEPENDS.pygnome2ex+=	${PYPKGPREFIX}-gnome2-extras>=2.14.3nb5
 BUILDLINK_PKGSRCDIR.pygnome2ex?=	../../x11/py-gnome2-extras
 
 .include "../../x11/py-gnome2/buildlink3.mk"
diff --git a/x11/py-gnome2/buildlink3.mk b/x11/py-gnome2/buildlink3.mk
index 5f9e2a4818c..a3b66bf3b0b 100644
--- a/x11/py-gnome2/buildlink3.mk
+++ b/x11/py-gnome2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.24 2009/08/26 19:57:05 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.25 2009/08/27 18:53:38 wiz Exp $
 
 BUILDLINK_TREE+=	pygnome2
 
@@ -8,7 +8,7 @@ PYGNOME2_BUILDLINK3_MK:=
 .include "../../lang/python/pyversion.mk"
 
 BUILDLINK_API_DEPENDS.pygnome2+=	${PYPKGPREFIX}-gnome2>=2.10.0
-BUILDLINK_ABI_DEPENDS.pygnome2+=	py25-gnome2>=2.26.1nb1
+BUILDLINK_ABI_DEPENDS.pygnome2+=	${PYPKGPREFIX}-gnome2>=2.26.1nb1
 BUILDLINK_PKGSRCDIR.pygnome2?=	../../x11/py-gnome2
 
 .include "../../net/py-ORBit/buildlink3.mk"
diff --git a/x11/py-gtk2/buildlink3.mk b/x11/py-gtk2/buildlink3.mk
index ad0793a3b9e..97830b7a5e1 100644
--- a/x11/py-gtk2/buildlink3.mk
+++ b/x11/py-gtk2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.24 2009/08/26 19:57:00 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.25 2009/08/27 18:53:38 wiz Exp $
 
 BUILDLINK_TREE+=	pygtk2
 
@@ -8,7 +8,7 @@ PYGTK2_BUILDLINK3_MK:=
 .include "../../lang/python/pyversion.mk"
 
 BUILDLINK_API_DEPENDS.pygtk2+=	${PYPKGPREFIX}-gtk2>=2.8.4
-BUILDLINK_ABI_DEPENDS.pygtk2+=	py25-gtk2>=2.14.1nb2
+BUILDLINK_ABI_DEPENDS.pygtk2+=	${PYPKGPREFIX}-gtk2>=2.14.1nb2
 BUILDLINK_PKGSRCDIR.pygtk2?=	../../x11/py-gtk2
 
 .include "../../devel/py-gobject/buildlink3.mk"
diff --git a/x11/py-kiwi/buildlink3.mk b/x11/py-kiwi/buildlink3.mk
index d2b741859c5..fc032c66fa0 100644
--- a/x11/py-kiwi/buildlink3.mk
+++ b/x11/py-kiwi/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2009/08/26 19:57:05 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2009/08/27 18:53:38 wiz Exp $
 
 BUILDLINK_TREE+=	py-kiwi
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	py-kiwi
 PY_KIWI_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.py-kiwi+=	${PYPKGPREFIX}-kiwi>=1.9.22
-BUILDLINK_ABI_DEPENDS.py-kiwi?=	py25-kiwi>=1.9.22nb1
+BUILDLINK_ABI_DEPENDS.py-kiwi?=	${PYPKGPREFIX}-kiwi>=1.9.22nb1
 BUILDLINK_PKGSRCDIR.py-kiwi?=	../../x11/py-kiwi
 
 .include "../../x11/py-gtk2/buildlink3.mk"
diff --git a/x11/py-qt3-base/buildlink3.mk b/x11/py-qt3-base/buildlink3.mk
index 20fd2308a29..9cd70c84ba4 100644
--- a/x11/py-qt3-base/buildlink3.mk
+++ b/x11/py-qt3-base/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2009/08/26 19:56:47 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2009/08/27 18:53:38 wiz Exp $
 
 BUILDLINK_TREE+=	pyqt3-base
 
@@ -8,7 +8,7 @@ PYQT3_BASE_BUILDLINK3_MK:=
 .include "../../lang/python/pyversion.mk"
 
 BUILDLINK_API_DEPENDS.pyqt3-base+=	${PYPKGPREFIX}-qt3-base>=3.11
-BUILDLINK_ABI_DEPENDS.pyqt3-base?=	py25-qt3-base>=3.18.1
+BUILDLINK_ABI_DEPENDS.pyqt3-base?=	${PYPKGPREFIX}-qt3-base>=3.18.1
 BUILDLINK_PKGSRCDIR.pyqt3-base?=	../../x11/py-qt3-base
 
 BUILDLINK_LIBDIRS.pyqt3-base+=	${PYSITELIB}
diff --git a/x11/py-qt3-modules/buildlink3.mk b/x11/py-qt3-modules/buildlink3.mk
index e29b57059a8..4b5e8264de9 100644
--- a/x11/py-qt3-modules/buildlink3.mk
+++ b/x11/py-qt3-modules/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2009/08/26 19:56:48 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2009/08/27 18:53:38 wiz Exp $
 
 BUILDLINK_TREE+=	pyqt3-mod
 
@@ -8,7 +8,7 @@ PYQT3_MOD_BUILDLINK3_MK:=
 .include "../../lang/python/pyversion.mk"
 
 BUILDLINK_API_DEPENDS.pyqt3-mod+=	${PYPKGPREFIX}-qt3-modules>=3.11
-BUILDLINK_ABI_DEPENDS.pyqt3-mod+=	py25-qt3-modules>=3.18.1
+BUILDLINK_ABI_DEPENDS.pyqt3-mod+=	${PYPKGPREFIX}-qt3-modules>=3.18.1
 BUILDLINK_PKGSRCDIR.pyqt3-mod?=	../../x11/py-qt3-modules
 
 BUILDLINK_LIBDIRS.pyqt3-mod+=	${PYSITELIB}
diff --git a/x11/py-wxWidgets/buildlink3.mk b/x11/py-wxWidgets/buildlink3.mk
index 128607ced4a..da864f09c36 100644
--- a/x11/py-wxWidgets/buildlink3.mk
+++ b/x11/py-wxWidgets/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.16 2009/08/26 19:56:44 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2009/08/27 18:53:38 wiz Exp $
 
 BUILDLINK_TREE+=	${PYPKGPREFIX}-wxWidgets
 
@@ -8,7 +8,7 @@ PY_WXWIDGETS_BUILDLINK3_MK:=
 .include "../../lang/python/pyversion.mk"
 
 BUILDLINK_API_DEPENDS.${PYPKGPREFIX}-wxWidgets+=	${PYPKGPREFIX}-wxWidgets>=2.6.1.0
-BUILDLINK_ABI_DEPENDS.${PYPKGPREFIX}-wxWidgets?=	py25-wxWidgets>=2.8.10.1nb1
+BUILDLINK_ABI_DEPENDS.${PYPKGPREFIX}-wxWidgets?=	${PYPKGPREFIX}-wxWidgets>=2.8.10.1nb1
 BUILDLINK_PKGSRCDIR.${PYPKGPREFIX}-wxWidgets?=	../../x11/py-wxWidgets
 
 .include "../../x11/wxGTK28/buildlink3.mk"