[pkgsrc/trunk]: pkgsrc/lang split the common parts of python22 and python22-p...

[grant <grant%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b38f5ba6601f
branches:  trunk
changeset: 466881:b38f5ba6601f
user:      grant <grant%pkgsrc.org@localhost>
date:      Sat Jan 24 08:13:14 2004 +0000

description:
split the common parts of python22 and python22-pth into Makefile.common
and fix PLIST for some modules which are only installed on Solaris.

diffstat:

 lang/python22-pth/Makefile         |    32 +-
 lang/python22-pth/PLIST.Linux      |    11 -
 lang/python22-pth/PLIST.NetBSD     |     2 -
 lang/python22-pth/PLIST.common     |  2047 ------------------
 lang/python22-pth/PLIST.common_end |    25 -
 lang/python22/Makefile             |    47 +-
 lang/python22/Makefile.common      |    49 +
 lang/python22/PLIST.Darwin         |    60 +-
 lang/python22/PLIST.IRIX           |   134 +-
 lang/python22/PLIST.Linux          |    22 +-
 lang/python22/PLIST.NetBSD         |     4 +-
 lang/python22/PLIST.SunOS          |    34 +-
 lang/python22/PLIST.common         |  4091 +++++++++++++++++------------------
 lang/python22/PLIST.common_end     |    50 +-
 14 files changed, 2252 insertions(+), 4356 deletions(-)

diffs (truncated from 6681 to 300 lines):

diff -r e408faf5adf0 -r b38f5ba6601f lang/python22-pth/Makefile
--- a/lang/python22-pth/Makefile        Sat Jan 24 07:09:15 2004 +0000
+++ b/lang/python22-pth/Makefile        Sat Jan 24 08:13:14 2004 +0000
@@ -1,22 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2003/07/17 21:45:16 grant Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/24 08:13:14 grant Exp $
 #
 
-DISTNAME=      Python-2.2.3
 PKGNAME=       python22-pth-2.2.3
-CATEGORIES=    lang
-MASTER_SITES=  ftp://ftp.python.org/pub/python/2.2.3/
-EXTRACT_SUFX=  .tgz
-
-MAINTAINER=    tech-pkg%NetBSD.org@localhost
-HOMEPAGE=      http://www.python.org/
-COMMENT=       Interpreted, interactive, object-oriented programming language
-
-USE_BUILDLINK2=                YES
-GNU_CONFIGURE=         YES
-
-.include "../../mk/bsd.prefs.mk"
-
-PLIST_SUBST+=  PY_PLATNAME=${LOWER_OPSYS}${OS_VERSION:C/\..*//}
 
 PTHREAD_OPTS=  require
 .include "../../mk/pthread.buildlink2.mk"
@@ -24,17 +9,6 @@
 CONFIGURE_ARGS+=       --with-pth
 .endif
 
-INSTALL_TARGET=        altinstall
-
-post-extract:
-       ${MV} ${WRKSRC}/Tools/scripts/pydoc ${WRKSRC}/Tools/scripts/pydoc2p2
+PY_VER_SUFFIX= 2p2
 
-.include "../../devel/zlib/buildlink2.mk"
-.include "../../mk/bsd.pkg.mk"
-
-# This comes after bsd.pkg.mk so that the LDFLAGS here overrides the one
-# set earlier in the environment (last definition wins).
-#
-.if ${OBJECT_FMT} == "a.out"
-MAKE_ENV+=      LDFLAGS="${LDFLAGS:S/-Wl,//}"
-.endif
+.include "../../lang/python22/Makefile.common"
diff -r e408faf5adf0 -r b38f5ba6601f lang/python22-pth/PLIST.Linux
--- a/lang/python22-pth/PLIST.Linux     Sat Jan 24 07:09:15 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-@comment $NetBSD: PLIST.Linux,v 1.1 2002/12/25 16:57:43 grant Exp $
-lib/python2p2/plat-linux2/CDROM.py
-lib/python2p2/plat-linux2/CDROM.pyc
-lib/python2p2/plat-linux2/CDROM.pyo
-lib/python2p2/plat-linux2/DLFCN.py
-lib/python2p2/plat-linux2/DLFCN.pyc
-lib/python2p2/plat-linux2/DLFCN.pyo
-lib/python2p2/plat-linux2/TYPES.py
-lib/python2p2/plat-linux2/TYPES.pyc
-lib/python2p2/plat-linux2/TYPES.pyo
-lib/python2p2/lib-dynload/linuxaudiodev.so
diff -r e408faf5adf0 -r b38f5ba6601f lang/python22-pth/PLIST.NetBSD
--- a/lang/python22-pth/PLIST.NetBSD    Sat Jan 24 07:09:15 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST.NetBSD,v 1.1 2002/12/25 16:57:44 grant Exp $
-lib/python2p2/lib-dynload/bsddb.so
diff -r e408faf5adf0 -r b38f5ba6601f lang/python22-pth/PLIST.common
--- a/lang/python22-pth/PLIST.common    Sat Jan 24 07:09:15 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,2047 +0,0 @@
-@comment $NetBSD: PLIST.common,v 1.2 2003/06/06 17:31:20 drochner Exp $
-bin/pydoc2p2
-bin/python2p2
-include/python2p2/Python.h
-include/python2p2/abstract.h
-include/python2p2/bitset.h
-include/python2p2/bufferobject.h
-include/python2p2/cStringIO.h
-include/python2p2/cellobject.h
-include/python2p2/ceval.h
-include/python2p2/classobject.h
-include/python2p2/cobject.h
-include/python2p2/codecs.h
-include/python2p2/compile.h
-include/python2p2/complexobject.h
-include/python2p2/descrobject.h
-include/python2p2/dictobject.h
-include/python2p2/errcode.h
-include/python2p2/eval.h
-include/python2p2/fileobject.h
-include/python2p2/floatobject.h
-include/python2p2/frameobject.h
-include/python2p2/funcobject.h
-include/python2p2/graminit.h
-include/python2p2/grammar.h
-include/python2p2/import.h
-include/python2p2/intobject.h
-include/python2p2/intrcheck.h
-include/python2p2/iterobject.h
-include/python2p2/listobject.h
-include/python2p2/longintrepr.h
-include/python2p2/longobject.h
-include/python2p2/marshal.h
-include/python2p2/metagrammar.h
-include/python2p2/methodobject.h
-include/python2p2/modsupport.h
-include/python2p2/moduleobject.h
-include/python2p2/node.h
-include/python2p2/object.h
-include/python2p2/objimpl.h
-include/python2p2/opcode.h
-include/python2p2/osdefs.h
-include/python2p2/parsetok.h
-include/python2p2/patchlevel.h
-include/python2p2/pgenheaders.h
-include/python2p2/py_curses.h
-include/python2p2/pyconfig.h
-include/python2p2/pydebug.h
-include/python2p2/pyerrors.h
-include/python2p2/pyfpe.h
-include/python2p2/pygetopt.h
-include/python2p2/pymactoolbox.h
-include/python2p2/pymem.h
-include/python2p2/pyport.h
-include/python2p2/pystate.h
-include/python2p2/pythonrun.h
-include/python2p2/pythread.h
-include/python2p2/rangeobject.h
-include/python2p2/sliceobject.h
-include/python2p2/stringobject.h
-include/python2p2/structmember.h
-include/python2p2/structseq.h
-include/python2p2/symtable.h
-include/python2p2/sysmodule.h
-include/python2p2/token.h
-include/python2p2/traceback.h
-include/python2p2/tupleobject.h
-include/python2p2/ucnhash.h
-include/python2p2/unicodeobject.h
-include/python2p2/weakrefobject.h
-lib/python2p2/BaseHTTPServer.py
-lib/python2p2/BaseHTTPServer.pyc
-lib/python2p2/BaseHTTPServer.pyo
-lib/python2p2/Bastion.py
-lib/python2p2/Bastion.pyc
-lib/python2p2/Bastion.pyo
-lib/python2p2/CGIHTTPServer.py
-lib/python2p2/CGIHTTPServer.pyc
-lib/python2p2/CGIHTTPServer.pyo
-lib/python2p2/ConfigParser.py
-lib/python2p2/ConfigParser.pyc
-lib/python2p2/ConfigParser.pyo
-lib/python2p2/Cookie.py
-lib/python2p2/Cookie.pyc
-lib/python2p2/Cookie.pyo
-lib/python2p2/FCNTL.py
-lib/python2p2/FCNTL.pyc
-lib/python2p2/FCNTL.pyo
-lib/python2p2/HTMLParser.py
-lib/python2p2/HTMLParser.pyc
-lib/python2p2/HTMLParser.pyo
-lib/python2p2/LICENSE.txt
-lib/python2p2/MimeWriter.py
-lib/python2p2/MimeWriter.pyc
-lib/python2p2/MimeWriter.pyo
-lib/python2p2/Queue.py
-lib/python2p2/Queue.pyc
-lib/python2p2/Queue.pyo
-lib/python2p2/SimpleHTTPServer.py
-lib/python2p2/SimpleHTTPServer.pyc
-lib/python2p2/SimpleHTTPServer.pyo
-lib/python2p2/SimpleXMLRPCServer.py
-lib/python2p2/SimpleXMLRPCServer.pyc
-lib/python2p2/SimpleXMLRPCServer.pyo
-lib/python2p2/SocketServer.py
-lib/python2p2/SocketServer.pyc
-lib/python2p2/SocketServer.pyo
-lib/python2p2/StringIO.py
-lib/python2p2/StringIO.pyc
-lib/python2p2/StringIO.pyo
-lib/python2p2/TERMIOS.py
-lib/python2p2/TERMIOS.pyc
-lib/python2p2/TERMIOS.pyo
-lib/python2p2/UserDict.py
-lib/python2p2/UserDict.pyc
-lib/python2p2/UserDict.pyo
-lib/python2p2/UserList.py
-lib/python2p2/UserList.pyc
-lib/python2p2/UserList.pyo
-lib/python2p2/UserString.py
-lib/python2p2/UserString.pyc
-lib/python2p2/UserString.pyo
-lib/python2p2/__future__.py
-lib/python2p2/__future__.pyc
-lib/python2p2/__future__.pyo
-lib/python2p2/__phello__.foo.py
-lib/python2p2/__phello__.foo.pyc
-lib/python2p2/__phello__.foo.pyo
-lib/python2p2/aifc.py
-lib/python2p2/aifc.pyc
-lib/python2p2/aifc.pyo
-lib/python2p2/anydbm.py
-lib/python2p2/anydbm.pyc
-lib/python2p2/anydbm.pyo
-lib/python2p2/asynchat.py
-lib/python2p2/asynchat.pyc
-lib/python2p2/asynchat.pyo
-lib/python2p2/asyncore.py
-lib/python2p2/asyncore.pyc
-lib/python2p2/asyncore.pyo
-lib/python2p2/atexit.py
-lib/python2p2/atexit.pyc
-lib/python2p2/atexit.pyo
-lib/python2p2/audiodev.py
-lib/python2p2/audiodev.pyc
-lib/python2p2/audiodev.pyo
-lib/python2p2/base64.py
-lib/python2p2/base64.pyc
-lib/python2p2/base64.pyo
-lib/python2p2/bdb.py
-lib/python2p2/bdb.pyc
-lib/python2p2/bdb.pyo
-lib/python2p2/binhex.py
-lib/python2p2/binhex.pyc
-lib/python2p2/binhex.pyo
-lib/python2p2/bisect.py
-lib/python2p2/bisect.pyc
-lib/python2p2/bisect.pyo
-lib/python2p2/calendar.py
-lib/python2p2/calendar.pyc
-lib/python2p2/calendar.pyo
-lib/python2p2/cgi.py
-lib/python2p2/cgi.pyc
-lib/python2p2/cgi.pyo
-lib/python2p2/cgitb.py
-lib/python2p2/cgitb.pyc
-lib/python2p2/cgitb.pyo
-lib/python2p2/chunk.py
-lib/python2p2/chunk.pyc
-lib/python2p2/chunk.pyo
-lib/python2p2/cmd.py
-lib/python2p2/cmd.pyc
-lib/python2p2/cmd.pyo
-lib/python2p2/code.py
-lib/python2p2/code.pyc
-lib/python2p2/code.pyo
-lib/python2p2/codecs.py
-lib/python2p2/codecs.pyc
-lib/python2p2/codecs.pyo
-lib/python2p2/codeop.py
-lib/python2p2/codeop.pyc
-lib/python2p2/codeop.pyo
-lib/python2p2/colorsys.py
-lib/python2p2/colorsys.pyc
-lib/python2p2/colorsys.pyo
-lib/python2p2/commands.py
-lib/python2p2/commands.pyc
-lib/python2p2/commands.pyo
-lib/python2p2/compileall.py
-lib/python2p2/compileall.pyc
-lib/python2p2/compileall.pyo
-lib/python2p2/compiler/__init__.py
-lib/python2p2/compiler/__init__.pyc
-lib/python2p2/compiler/__init__.pyo
-lib/python2p2/compiler/ast.py
-lib/python2p2/compiler/ast.pyc
-lib/python2p2/compiler/ast.pyo
-lib/python2p2/compiler/consts.py
-lib/python2p2/compiler/consts.pyc
-lib/python2p2/compiler/consts.pyo
-lib/python2p2/compiler/future.py
-lib/python2p2/compiler/future.pyc
-lib/python2p2/compiler/future.pyo
-lib/python2p2/compiler/misc.py
-lib/python2p2/compiler/misc.pyc
-lib/python2p2/compiler/misc.pyo
-lib/python2p2/compiler/pyassem.py
-lib/python2p2/compiler/pyassem.pyc
-lib/python2p2/compiler/pyassem.pyo
-lib/python2p2/compiler/pycodegen.py
-lib/python2p2/compiler/pycodegen.pyc
-lib/python2p2/compiler/pycodegen.pyo
-lib/python2p2/compiler/symbols.py
-lib/python2p2/compiler/symbols.pyc
-lib/python2p2/compiler/symbols.pyo
-lib/python2p2/compiler/syntax.py
-lib/python2p2/compiler/syntax.pyc
-lib/python2p2/compiler/syntax.pyo
-lib/python2p2/compiler/transformer.py
-lib/python2p2/compiler/transformer.pyc
-lib/python2p2/compiler/transformer.pyo
-lib/python2p2/compiler/visitor.py
-lib/python2p2/compiler/visitor.pyc
-lib/python2p2/compiler/visitor.pyo
-lib/python2p2/config/Makefile
-lib/python2p2/config/Setup
-lib/python2p2/config/Setup.config
-lib/python2p2/config/Setup.local