pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/lang Convert the python packages to use the alternativ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/0ec4b09754e6
branches:  trunk
changeset: 488405:0ec4b09754e6
user:      jmmv <jmmv%pkgsrc.org@localhost>
date:      Sun Jan 30 12:44:39 2005 +0000

description:
Convert the python packages to use the alternatives system to install a
bin/python wrapper.  Bump their PKGREVISION to 1.

Also remove the python package.  In order to preserve a similar behavior to
this one using the new framework, start by installing pkg_alternatives.
Then just open its manpage, scroll down to the EXAMPLES section, Applying
filters subsection, and follow the (rather short) directions given there.

diffstat:

 lang/python/DESCR              |  19 -------------------
 lang/python/Makefile           |  29 -----------------------------
 lang/python/PLIST              |   2 --
 lang/python15/ALTERNATIVES     |   1 +
 lang/python15/Makefile         |   6 ++++--
 lang/python20/ALTERNATIVES     |   1 +
 lang/python20/Makefile         |   5 +++--
 lang/python21/ALTERNATIVES     |   1 +
 lang/python21/Makefile         |   6 ++++--
 lang/python22/ALTERNATIVES     |   1 +
 lang/python22/Makefile         |   6 ++++--
 lang/python23-nth/ALTERNATIVES |   1 +
 lang/python23-nth/Makefile     |   5 ++++-
 lang/python23/ALTERNATIVES     |   1 +
 lang/python23/Makefile         |   6 ++++--
 lang/python24/ALTERNATIVES     |   1 +
 lang/python24/Makefile         |   6 ++++--
 17 files changed, 34 insertions(+), 63 deletions(-)

diffs (247 lines):

diff -r 374a393c9a92 -r 0ec4b09754e6 lang/python/DESCR
--- a/lang/python/DESCR Sun Jan 30 12:35:50 2005 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-Python is an interpreted, interactive, object-oriented
-programming language that combines remarkable power with
-very clear syntax. For an introduction to programming in
-Python you are referred to the Python Tutorial. The
-Python Library Reference documents built-in and standard
-types, constants, functions and modules. Finally, the
-Python Reference Manual describes the syntax and semantics
-of the core language in (perhaps too) much detail.
-
-Python's basic power can be extended with your own modules
-written in C or C++. On most systems such modules may be
-dynamically loaded. Python is also adaptable as an exten-
-sion language for existing applications. See the internal
-documentation for hints.
-
-This package provides easy installation of the preferred
-version of python (selected with PYTHON_VERSION_DEFAULT)
-and installs a symbolic link from ${PKGBASE}/bin/python
-to that version.
diff -r 374a393c9a92 -r 0ec4b09754e6 lang/python/Makefile
--- a/lang/python/Makefile      Sun Jan 30 12:35:50 2005 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-# $NetBSD: Makefile,v 1.28 2004/07/22 09:16:03 recht Exp $
-#
-
-DISTNAME=      python
-PKGNAME=       python-${PYVERSSUFFIX}
-CATEGORIES=    lang python
-MASTER_SITES=  # empty
-DISTFILES=     # empty
-
-MAINTAINER=    lukem%NetBSD.org@localhost
-HOMEPAGE=      http://www.python.org/
-COMMENT=       The "meta-package" for Python
-
-EXTRACT_ONLY=  # empty
-NO_CHECKSUM=   yes
-NO_CONFIGURE=  yes
-NO_BUILD=      yes
-
-# Ensure version of python the user asks for is selected, even
-# if it's not yet installed.
-_PYTHON_VERSION=${PYTHON_VERSION_DEFAULT}
-
-do-install:
-       @${ECHO} "Linking ${PREFIX}/bin/python to ${PYTHONBIN}"
-       @${RM} -f ${PREFIX}/bin/python
-       @${LN} -s ${PYTHONBIN} ${PREFIX}/bin/python
-
-.include "../../lang/python/pyversion.mk"
-.include "../../mk/bsd.pkg.mk"
diff -r 374a393c9a92 -r 0ec4b09754e6 lang/python/PLIST
--- a/lang/python/PLIST Sun Jan 30 12:35:50 2005 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2004/02/06 08:37:22 lukem Exp $
-bin/python
diff -r 374a393c9a92 -r 0ec4b09754e6 lang/python15/ALTERNATIVES
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/python15/ALTERNATIVES        Sun Jan 30 12:44:39 2005 +0000
@@ -0,0 +1,1 @@
+bin/python @PREFIX@/bin/python1.5
diff -r 374a393c9a92 -r 0ec4b09754e6 lang/python15/Makefile
--- a/lang/python15/Makefile    Sun Jan 30 12:35:50 2005 +0000
+++ b/lang/python15/Makefile    Sun Jan 30 12:44:39 2005 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2004/10/04 00:49:26 jschauma Exp $
+# $NetBSD: Makefile,v 1.12 2005/01/30 12:44:39 jmmv Exp $
 #
 
 DISTNAME=      py152
 PKGNAME=       python15-1.5.2
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    lang python
 MASTER_SITES=  http://www.python.org/ftp/python/src/
 EXTRACT_SUFX=  .tgz
@@ -12,6 +12,8 @@
 HOMEPAGE=      http://www.python.org/
 COMMENT=       Interpreted, interactive, object-oriented programming language
 
+CONFLICTS+=    python-[0-9]*
+
 WRKSRC=                ${WRKDIR}/Python-1.5.2
 GNU_CONFIGURE= YES
 CONFIGURE_ARGS+=       --without-thread
diff -r 374a393c9a92 -r 0ec4b09754e6 lang/python20/ALTERNATIVES
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/python20/ALTERNATIVES        Sun Jan 30 12:44:39 2005 +0000
@@ -0,0 +1,1 @@
+bin/python @PREFIX@/bin/python2.0
diff -r 374a393c9a92 -r 0ec4b09754e6 lang/python20/Makefile
--- a/lang/python20/Makefile    Sun Jan 30 12:35:50 2005 +0000
+++ b/lang/python20/Makefile    Sun Jan 30 12:44:39 2005 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.25 2004/12/19 05:34:07 grant Exp $
+# $NetBSD: Makefile,v 1.26 2005/01/30 12:44:39 jmmv Exp $
 #
 
 DISTNAME=      Python-2.0.1
 PKGNAME=       python20-2.0.1
-PKGREVISION=   9
+PKGREVISION=   10
 CATEGORIES=    lang python
 MASTER_SITES=  ftp://ftp.python.org/pub/python/2.0.1/
 EXTRACT_SUFX=  .tgz
@@ -12,6 +12,7 @@
 HOMEPAGE=      http://www.python.org/
 COMMENT=       Interpreted, interactive, object-oriented programming language
 
+CONFLICTS+=    python-[0-9]*
 CONFLICTS+=    python-2.0.*
 
 PLIST_SRC=     ${WRKDIR}/.PLIST_SRC
diff -r 374a393c9a92 -r 0ec4b09754e6 lang/python21/ALTERNATIVES
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/python21/ALTERNATIVES        Sun Jan 30 12:44:39 2005 +0000
@@ -0,0 +1,1 @@
+bin/python @PREFIX@/bin/python2.1
diff -r 374a393c9a92 -r 0ec4b09754e6 lang/python21/Makefile
--- a/lang/python21/Makefile    Sun Jan 30 12:35:50 2005 +0000
+++ b/lang/python21/Makefile    Sun Jan 30 12:44:39 2005 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.17 2005/01/23 20:41:46 recht Exp $
+# $NetBSD: Makefile,v 1.18 2005/01/30 12:44:39 jmmv Exp $
 #
 
 DISTNAME=      Python-2.1.3
 PKGNAME=       python21-2.1.3
-PKGREVISION=   5
+PKGREVISION=   6
 CATEGORIES=    lang python
 MASTER_SITES=  ftp://ftp.python.org/pub/python/2.1.3/
 EXTRACT_SUFX=  .tgz
@@ -12,6 +12,8 @@
 HOMEPAGE=      http://www.python.org/
 COMMENT=       Interpreted, interactive, object-oriented programming language
 
+CONFLICTS+=    python-[0-9]*
+
 USE_LANGUAGES= c c++
 USE_BUILDLINK3=        YES
 GNU_CONFIGURE= YES
diff -r 374a393c9a92 -r 0ec4b09754e6 lang/python22/ALTERNATIVES
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/python22/ALTERNATIVES        Sun Jan 30 12:44:39 2005 +0000
@@ -0,0 +1,1 @@
+bin/python @PREFIX@/bin/python2.2
diff -r 374a393c9a92 -r 0ec4b09754e6 lang/python22/Makefile
--- a/lang/python22/Makefile    Sun Jan 30 12:35:50 2005 +0000
+++ b/lang/python22/Makefile    Sun Jan 30 12:44:39 2005 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.24 2005/01/25 13:09:03 tv Exp $
+# $NetBSD: Makefile,v 1.25 2005/01/30 12:44:39 jmmv Exp $
 #
 
 DISTNAME=      Python-2.2.3
 PKGNAME=       python22-2.2.3
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    lang python
 MASTER_SITES=  ftp://ftp.python.org/pub/python/2.2.3/
 EXTRACT_SUFX=  .tgz
@@ -12,6 +12,8 @@
 HOMEPAGE=      http://www.python.org/
 COMMENT=       Interpreted, interactive, object-oriented programming language
 
+CONFLICTS+=    python-[0-9]*
+
 USE_LANGUAGES= c c++
 USE_BUILDLINK3=        YES
 GNU_CONFIGURE= YES
diff -r 374a393c9a92 -r 0ec4b09754e6 lang/python23-nth/ALTERNATIVES
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/python23-nth/ALTERNATIVES    Sun Jan 30 12:44:39 2005 +0000
@@ -0,0 +1,1 @@
+bin/python @PREFIX@/bin/python2n3
diff -r 374a393c9a92 -r 0ec4b09754e6 lang/python23-nth/Makefile
--- a/lang/python23-nth/Makefile        Sun Jan 30 12:35:50 2005 +0000
+++ b/lang/python23-nth/Makefile        Sun Jan 30 12:44:39 2005 +0000
@@ -1,7 +1,10 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/01/23 22:57:19 recht Exp $
+# $NetBSD: Makefile,v 1.2 2005/01/30 12:44:40 jmmv Exp $
 #
 
 PKGNAME=       python23-nth-2.3.4
+PKGREVISION=   1
+
+CONFLICTS+=    python-[0-9]*
 
 CONFIGURE_ARGS+=        --without-threads
 
diff -r 374a393c9a92 -r 0ec4b09754e6 lang/python23/ALTERNATIVES
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/python23/ALTERNATIVES        Sun Jan 30 12:44:39 2005 +0000
@@ -0,0 +1,1 @@
+bin/python @PREFIX@/bin/python2.3
diff -r 374a393c9a92 -r 0ec4b09754e6 lang/python23/Makefile
--- a/lang/python23/Makefile    Sun Jan 30 12:35:50 2005 +0000
+++ b/lang/python23/Makefile    Sun Jan 30 12:44:39 2005 +0000
@@ -1,8 +1,10 @@
-# $NetBSD: Makefile,v 1.24 2005/01/24 19:50:43 recht Exp $
+# $NetBSD: Makefile,v 1.25 2005/01/30 12:44:40 jmmv Exp $
 #
 
 PKGNAME=       python23-2.3.4
-PKGREVISION=   5
+PKGREVISION=   6
+
+CONFLICTS+=    python-[0-9]*
 
 #PKG_INSTALLATION_TYPES=       overwrite pkgviews
 
diff -r 374a393c9a92 -r 0ec4b09754e6 lang/python24/ALTERNATIVES
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/python24/ALTERNATIVES        Sun Jan 30 12:44:39 2005 +0000
@@ -0,0 +1,1 @@
+bin/python @PREFIX@/bin/python2.4
diff -r 374a393c9a92 -r 0ec4b09754e6 lang/python24/Makefile
--- a/lang/python24/Makefile    Sun Jan 30 12:35:50 2005 +0000
+++ b/lang/python24/Makefile    Sun Jan 30 12:44:39 2005 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2005/01/23 20:41:47 recht Exp $
+# $NetBSD: Makefile,v 1.3 2005/01/30 12:44:40 jmmv Exp $
 #
 
 DISTNAME=      Python-2.4
 PKGNAME=       python24-2.4
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    lang python
 MASTER_SITES=  ftp://ftp.python.org/pub/python/2.4/
 EXTRACT_SUFX=  .tar.bz2
@@ -12,6 +12,8 @@
 HOMEPAGE=      http://www.python.org/
 COMMENT=       Interpreted, interactive, object-oriented programming language
 
+CONFLICTS+=    python-[0-9]*
+
 USE_LANGUAGES=         c c++
 USE_BUILDLINK3=                yes
 GNU_CONFIGURE=         yes



Home | Main Index | Thread Index | Old Index