summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwiz <wiz>2009-09-09 11:16:56 +0000
committerwiz <wiz>2009-09-09 11:16:56 +0000
commit51931a2fe9399e97fadcabb745b99823b2986289 (patch)
tree020874bc1d8c5d03d7dd2bbf50dab8bcba51d895
parent6822724eae27d01a2e084b71db16078752e7a7b8 (diff)
downloadpkgsrc-51931a2fe9399e97fadcabb745b99823b2986289.tar.gz
Remove references to python-2.3.
-rw-r--r--chat/telepathy-gabble/Makefile4
-rw-r--r--chat/telepathy-glib/Makefile4
-rw-r--r--chat/telepathy-idle/Makefile4
-rw-r--r--pkgtools/pkglint/files/makevars.map4
-rw-r--r--pkgtools/revbump/files/revbump.14
-rw-r--r--x11/gnome-terminal/Makefile4
-rw-r--r--x11/gtk2/Makefile4
7 files changed, 14 insertions, 14 deletions
diff --git a/chat/telepathy-gabble/Makefile b/chat/telepathy-gabble/Makefile
index 2eae175747f..4ffd3c36293 100644
--- a/chat/telepathy-gabble/Makefile
+++ b/chat/telepathy-gabble/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2009/04/01 16:20:41 roy Exp $
+# $NetBSD: Makefile,v 1.8 2009/09/09 11:16:56 wiz Exp $
#
DISTNAME= telepathy-gabble-0.7.21
@@ -16,7 +16,7 @@ USE_LIBTOOL= yes
USE_TOOLS+= gmake pkg-config
.include "../../lang/python/pyversion.mk"
-.if ${PYPKGPREFIX} == "py24" || ${PYPKGPREFIX} == "py23"
+.if ${PYPKGPREFIX} == "py24"
BUILD_DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
.endif
CONFIGURE_ENV+= ac_cv_prog_PYTHON=${PYTHONBIN}
diff --git a/chat/telepathy-glib/Makefile b/chat/telepathy-glib/Makefile
index da742bdd022..6fb806d791e 100644
--- a/chat/telepathy-glib/Makefile
+++ b/chat/telepathy-glib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2009/09/09 10:20:30 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2009/09/09 11:16:56 wiz Exp $
#
DISTNAME= telepathy-glib-0.7.36
@@ -19,7 +19,7 @@ PKG_DESTDIR_SUPPORT= user-destdir
PKGCONFIG_OVERRIDE+= telepathy-glib/telepathy-glib.pc.in
.include "../../lang/python/pyversion.mk"
-.if ${PYPKGPREFIX} == "py24" || ${PYPKGPREFIX} == "py23"
+.if ${PYPKGPREFIX} == "py24"
BUILD_DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
.endif
CONFIGURE_ENV+= ac_cv_prog_PYTHON=${PYTHONBIN}
diff --git a/chat/telepathy-idle/Makefile b/chat/telepathy-idle/Makefile
index e7d56173673..10a1f000864 100644
--- a/chat/telepathy-idle/Makefile
+++ b/chat/telepathy-idle/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2009/08/16 18:01:05 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2009/09/09 11:16:56 wiz Exp $
#
DISTNAME= telepathy-idle-0.1.4
@@ -20,7 +20,7 @@ CONFIGURE_ARGS+= OPENSSL_CFLAGS=-I${BUILDLINK_PREFIX.openssl}/include
CONFIGURE_ARGS+= OPENSSL_LIBS="-L${BUILDLINK_PREFIX.openssl}/lib ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.openssl}/lib -lssl"
.include "../../lang/python/pyversion.mk"
-.if ${PYPKGPREFIX} == "py24" || ${PYPKGPREFIX} == "py23"
+.if ${PYPKGPREFIX} == "py24"
BUILD_DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
.endif
CONFIGURE_ENV+= ac_cv_prog_PYTHON=${PYTHONBIN}
diff --git a/pkgtools/pkglint/files/makevars.map b/pkgtools/pkglint/files/makevars.map
index 2a72e1b191e..2f4d7a6368b 100644
--- a/pkgtools/pkglint/files/makevars.map
+++ b/pkgtools/pkglint/files/makevars.map
@@ -1,4 +1,4 @@
-# $NetBSD: makevars.map,v 1.197 2009/08/25 12:32:56 wiz Exp $
+# $NetBSD: makevars.map,v 1.198 2009/09/09 11:16:56 wiz Exp $
#
# This file contains the guessed type of some variables, according to
@@ -626,7 +626,7 @@ PTHREAD_LIBS List of LdFlag [$system]
PTHREAD_OPTS List of { native optional require } [m:as,c:a,b:a]
PTHREAD_TYPE Identifier [$system]
# ^^ or "native" or "none".
-PYPKGPREFIX { py23 py24 py25 } [*:pu, pyversion.mk:s, *:]
+PYPKGPREFIX { py24 py25 py26 } [*:pu, pyversion.mk:s, *:]
PYTHON_FOR_BUILD_ONLY Yes [$package]
PYTHON_PATCH_SCRIPTS List of Pathmask [$package_list]
PYTHON_VERSIONS_ACCEPTED List of Version [$package]
diff --git a/pkgtools/revbump/files/revbump.1 b/pkgtools/revbump/files/revbump.1
index 06271d396e9..fe87feca3ff 100644
--- a/pkgtools/revbump/files/revbump.1
+++ b/pkgtools/revbump/files/revbump.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: revbump.1,v 1.7 2006/04/17 13:40:17 wiz Exp $
+.\" $NetBSD: revbump.1,v 1.8 2009/09/09 11:16:57 wiz Exp $
.\"
.\" Copyright (c) 2003, 2004, 2005, 2006 The NetBSD Foundation, Inc.
.\"
@@ -95,7 +95,7 @@ revbump \*[Lt] makebump \*[Gt] makebump.manual
blbump \*[Lt] bl3bump \*[Gt] bl3bump.manual
[handle the *ABI_DEPENDS* bumps in bl3bump.manual manually]
cvs diff `cat allbump`
-[look for PYPKGPREFIX -\*[Gt] py22 or py23pth expansions
+[look for PYPKGPREFIX -\*[Gt] py25 expansions
in buildlink files and any unrelated diffs you have in your
local tree, and fix them]
lintpkgsrc -d
diff --git a/x11/gnome-terminal/Makefile b/x11/gnome-terminal/Makefile
index ffb4f56dfb0..789f0be22f8 100644
--- a/x11/gnome-terminal/Makefile
+++ b/x11/gnome-terminal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2009/08/26 19:58:30 sno Exp $
+# $NetBSD: Makefile,v 1.27 2009/09/09 11:16:57 wiz Exp $
#
DISTNAME= gnome-terminal-2.26.3.1
@@ -26,7 +26,7 @@ GCONF_SCHEMAS= gnome-terminal.schemas
PYTHON_FOR_BUILD_ONLY= YES
.include "../../lang/python/pyversion.mk"
-.if ${PYPKGPREFIX} == "py24" || ${PYPKGPREFIX} == "py23"
+.if ${PYPKGPREFIX} == "py24"
BUILD_DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
.endif
diff --git a/x11/gtk2/Makefile b/x11/gtk2/Makefile
index 25036f0fa6e..5e026a5bb8e 100644
--- a/x11/gtk2/Makefile
+++ b/x11/gtk2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.185 2009/08/29 18:00:00 wiz Exp $
+# $NetBSD: Makefile,v 1.186 2009/09/09 11:16:57 wiz Exp $
DISTNAME= gtk+-2.16.6
PKGNAME= ${DISTNAME:S/gtk/gtk2/}
@@ -59,7 +59,7 @@ SUBST_FILES.pthread= gdk-pixbuf/Makefile.in
PYTHON_PATCH_SCRIPTS= gtk/gtk-builder-convert
# gtk-builder-convert uses minidom from xml.dom, which needs expat
.include "../../lang/python/pyversion.mk"
-.if ${PYPKGPREFIX} == "py24" || ${PYPKGPREFIX} == "py23"
+.if ${PYPKGPREFIX} == "py24"
DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
.endif