Split the PLIST into common and os dependent parts. Start with NetBSD

and Linux. Disable the curses module on Linux.

7 files changed, 97 insertions, 136 deletions

diff --git a/lang/python23-pth/Makefile b/lang/python23-pth/Makefile
index 9c89a972eb7..6635e251fbb 100644
--- a/lang/python23-pth/Makefile
+++ b/lang/python23-pth/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2003/08/18 17:16:54 recht Exp $
+# $NetBSD: Makefile,v 1.4 2003/08/18 20:57:13 recht Exp $
 #
 
 DISTNAME=	Python-2.3
@@ -34,6 +34,16 @@ post-install:
 
 .include "../../mk/bsd.prefs.mk"
 
+.if ${OPSYS} == "SunOS"
+LOWER_OPSYS=   sunos
+.endif
+
+.if ${OPSYS} == "Darwin" || ${OPSYS} == "IRIX"
+PLIST_SUBST+=  PY_PLATNAME=${LOWER_OPSYS}
+.else
+PLIST_SUBST+=  PY_PLATNAME=${LOWER_OPSYS}${OS_VERSION:C/\..*//}
+.endif
+
 .if ${OPSYS} != "NetBSD"
 .include "../../databases/db/buildlink2.mk"
 CPPFLAGS+=	-I${BUILDLINK_PREFIX.db}/include/db2
diff --git a/lang/python23-pth/PLIST.Linux b/lang/python23-pth/PLIST.Linux
new file mode 100644
index 00000000000..13d5816a59d
--- /dev/null
+++ b/lang/python23-pth/PLIST.Linux
@@ -0,0 +1,13 @@
+@comment $NetBSD: PLIST.Linux,v 1.1 2003/08/18 20:57:14 recht Exp $
+lib/python2p3/lib-dynload/_bsddb.so
+lib/python2p3/lib-dynload/${LOWER_OPSYS}audiodev.so
+lib/python2p3/lib-dynload/ossaudiodev.so
+lib/python2p3/plat-${LOWER_OPSYS}2/CDROM.py
+lib/python2p3/plat-${LOWER_OPSYS}2/CDROM.pyc
+lib/python2p3/plat-${LOWER_OPSYS}2/CDROM.pyo
+lib/python2p3/plat-${LOWER_OPSYS}2/DLFCN.py
+lib/python2p3/plat-${LOWER_OPSYS}2/DLFCN.pyc
+lib/python2p3/plat-${LOWER_OPSYS}2/DLFCN.pyo
+lib/python2p3/plat-${LOWER_OPSYS}2/TYPES.py
+lib/python2p3/plat-${LOWER_OPSYS}2/TYPES.pyc
+lib/python2p3/plat-${LOWER_OPSYS}2/TYPES.pyo
diff --git a/lang/python23-pth/PLIST.NetBSD b/lang/python23-pth/PLIST.NetBSD
new file mode 100644
index 00000000000..562af4876a0
--- /dev/null
+++ b/lang/python23-pth/PLIST.NetBSD
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST.NetBSD,v 1.1 2003/08/18 20:57:14 recht Exp $
+lib/python2p3/lib-dynload/bsddb185.so
diff --git a/lang/python23-pth/PLIST b/lang/python23-pth/PLIST.common
index 5771b793c09..2ae9a72973e 100644
--- a/lang/python23-pth/PLIST
+++ b/lang/python23-pth/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2003/08/06 11:51:30 drochner Exp $
+@comment $NetBSD: PLIST.common,v 1.1 2003/08/18 20:57:14 recht Exp $
 bin/pydoc2p3
 bin/python2p3
 include/python2p3/Python.h
@@ -1126,7 +1126,6 @@ lib/python2p3/lib-dynload/_testcapi.so
 lib/python2p3/lib-dynload/_weakref.so
 lib/python2p3/lib-dynload/array.so
 lib/python2p3/lib-dynload/binascii.so
-lib/python2p3/lib-dynload/bsddb185.so
 lib/python2p3/lib-dynload/bz2.so
 lib/python2p3/lib-dynload/cPickle.so
 lib/python2p3/lib-dynload/cStringIO.so
@@ -1362,13 +1361,13 @@ lib/python2p3/pickletools.pyo
 lib/python2p3/pipes.py
 lib/python2p3/pipes.pyc
 lib/python2p3/pipes.pyo
+lib/python2p3/plat-${PY_PLATNAME}/IN.py
+lib/python2p3/plat-${PY_PLATNAME}/IN.pyc
+lib/python2p3/plat-${PY_PLATNAME}/IN.pyo
+lib/python2p3/plat-${PY_PLATNAME}/regen
 lib/python2p3/pkgutil.py
 lib/python2p3/pkgutil.pyc
 lib/python2p3/pkgutil.pyo
-lib/python2p3/plat-${LOWER_OPSYS}1/IN.py
-lib/python2p3/plat-${LOWER_OPSYS}1/IN.pyc
-lib/python2p3/plat-${LOWER_OPSYS}1/IN.pyo
-lib/python2p3/plat-${LOWER_OPSYS}1/regen
 lib/python2p3/platform.py
 lib/python2p3/platform.pyc
 lib/python2p3/platform.pyo
@@ -2557,31 +2556,3 @@ lib/python2p3/xmlrpclib.pyo
 lib/python2p3/zipfile.py
 lib/python2p3/zipfile.pyc
 lib/python2p3/zipfile.pyo
-@dirrm lib/python2p3/xml/sax
-@dirrm lib/python2p3/xml/parsers
-@dirrm lib/python2p3/xml/dom
-@dirrm lib/python2p3/xml
-@dirrm lib/python2p3/test/output
-@dirrm lib/python2p3/test
-@dirrm lib/python2p3/site-packages
-@dirrm lib/python2p3/plat-${LOWER_OPSYS}1
-@dirrm lib/python2p3/logging
-@dirrm lib/python2p3/lib-tk
-@dirrm lib/python2p3/lib-old
-@dirrm lib/python2p3/lib-dynload
-@dirrm lib/python2p3/idlelib/Icons
-@dirrm lib/python2p3/idlelib
-@dirrm lib/python2p3/hotshot
-@dirrm lib/python2p3/encodings
-@dirrm lib/python2p3/email/test/data
-@dirrm lib/python2p3/email/test
-@dirrm lib/python2p3/email
-@dirrm lib/python2p3/distutils/command
-@dirrm lib/python2p3/distutils
-@dirrm lib/python2p3/curses
-@dirrm lib/python2p3/config
-@dirrm lib/python2p3/compiler
-@dirrm lib/python2p3/bsddb/test
-@dirrm lib/python2p3/bsddb
-@dirrm lib/python2p3
-@dirrm include/python2p3
diff --git a/lang/python23-pth/PLIST.common_end b/lang/python23-pth/PLIST.common_end
new file mode 100644
index 00000000000..47405eb123e
--- /dev/null
+++ b/lang/python23-pth/PLIST.common_end
@@ -0,0 +1,29 @@
+@comment $NetBSD: PLIST.common_end,v 1.1 2003/08/18 20:57:14 recht Exp $
+@dirrm lib/python2p3/xml/sax
+@dirrm lib/python2p3/xml/parsers
+@dirrm lib/python2p3/xml/dom
+@dirrm lib/python2p3/xml
+@dirrm lib/python2p3/test/output
+@dirrm lib/python2p3/test
+@dirrm lib/python2p3/site-packages
+@dirrm lib/python2p3/plat-${PY_PLATNAME}
+@dirrm lib/python2p3/logging
+@dirrm lib/python2p3/lib-tk
+@dirrm lib/python2p3/lib-old
+@dirrm lib/python2p3/lib-dynload
+@dirrm lib/python2p3/idlelib/Icons
+@dirrm lib/python2p3/idlelib
+@dirrm lib/python2p3/hotshot
+@dirrm lib/python2p3/encodings
+@dirrm lib/python2p3/email/test/data
+@dirrm lib/python2p3/email/test
+@dirrm lib/python2p3/email
+@dirrm lib/python2p3/distutils/command
+@dirrm lib/python2p3/distutils
+@dirrm lib/python2p3/curses
+@dirrm lib/python2p3/config
+@dirrm lib/python2p3/compiler
+@dirrm lib/python2p3/bsddb/test
+@dirrm lib/python2p3/bsddb
+@dirrm lib/python2p3
+@dirrm include/python2p3
diff --git a/lang/python23-pth/distinfo b/lang/python23-pth/distinfo
index 944f027a272..35b0b6091bf 100644
--- a/lang/python23-pth/distinfo
+++ b/lang/python23-pth/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.4 2003/08/18 17:16:54 recht Exp $
+$NetBSD: distinfo,v 1.5 2003/08/18 20:57:14 recht Exp $
 
 SHA1 (Python-2.3.tgz) = ce5fbde09be17ea5dddd4baa62d2b90e06e7e5c1
 Size (Python-2.3.tgz) = 8436880 bytes
-SHA1 (patch-aa) = df21c528376acb74e417a05c64a8ec0133a1bb72
+SHA1 (patch-aa) = c00652fd038a881c1bb07f871d820b93651ddc54
 SHA1 (patch-ae) = ff045dc1b42ce8a4fe5e64fde72469e1be8dab28
 SHA1 (patch-ag) = c11f521d3bd3172289b67224ad4b07d861d8fe18
 SHA1 (patch-ah) = 9bc1b5bf1ee0e76fc19bd582299bf70ee3a10535
diff --git a/lang/python23-pth/patches/patch-aa b/lang/python23-pth/patches/patch-aa
index c8f22943bec..e3558b3f04d 100644
--- a/lang/python23-pth/patches/patch-aa
+++ b/lang/python23-pth/patches/patch-aa
@@ -1,43 +1,54 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/08/04 08:29:32 drochner Exp $
+$NetBSD: patch-aa,v 1.2 2003/08/18 20:57:14 recht Exp $
 
 --- setup.py.orig	2003-07-10 14:48:39.000000000 +0200
-+++ setup.py	2003-08-03 12:13:44.000000000 +0200
-@@ -240,9 +240,13 @@
++++ setup.py	2003-08-18 21:19:14.000000000 +0200
+@@ -15,7 +15,7 @@
+ from distutils.command.install_lib import install_lib
+ 
+ # This global variable is used to hold the list of modules to be disabled.
+-disabled_module_list = []
++disabled_module_list = ["_curses", "_curses_panel", "_tkinter", "gdbm", "mpz", "pyexpat", "readline"]
+ 
+ def add_dir_to_list(dirlist, dir):
+     """Add the directory 'dir' to the list 'dirlist' (at the front) if
+@@ -240,9 +240,15 @@
          return sys.platform
  
      def detect_modules(self):
 -        # Ensure that /usr/local is always used
 -        add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
 -        add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
-+	# Add the buildlink directories for pkgsrc
-+	if os.environ.has_key('BUILDLINK_DIR'):
-+	    dir = os.environ['BUILDLINK_DIR']
-+	    libdir = dir + '/lib'
-+	    incdir = dir + '/include'
-+	    add_dir_to_list(self.compiler.library_dirs, libdir)
-+	    add_dir_to_list(self.compiler.include_dirs, incdir)
++        # Add the buildlink directories for pkgsrc
++        if os.environ.has_key('BUILDLINK_DIR'):
++            dir = os.environ['BUILDLINK_DIR']
++            libdir = dir + '/lib'
++            incdir = dir + '/include'
++            if libdir not in self.compiler.library_dirs:
++                self.compiler.library_dirs.insert(0, libdir)
++            if incdir not in self.compiler.include_dirs:
++                self.compiler.include_dirs.insert(0, incdir)
  
          # fink installs lots of goodies in /sw/... - make sure we
          # check there
-@@ -396,7 +400,7 @@
+@@ -396,13 +402,13 @@
          # These represent audio samples or images as strings:
  
          # Disabled on 64-bit platforms
 -        if sys.maxint != 9223372036854775807L:
-+        if 0 and sys.maxint != 9223372036854775807L:
++#        if sys.maxint != 9223372036854775807L:
              # Operations on audio samples
-             exts.append( Extension('audioop', ['audioop.c']) )
+-            exts.append( Extension('audioop', ['audioop.c']) )
++#            exts.append( Extension('audioop', ['audioop.c']) )
              # Operations on images
-@@ -405,7 +409,7 @@
-             exts.append( Extension('rgbimg', ['rgbimgmodule.c']) )
+-            exts.append( Extension('imageop', ['imageop.c']) )
++#            exts.append( Extension('imageop', ['imageop.c']) )
+             # Read SGI RGB image files (but coded portably)
+-            exts.append( Extension('rgbimg', ['rgbimgmodule.c']) )
++#            exts.append( Extension('rgbimg', ['rgbimgmodule.c']) )
  
          # readline
--        if self.compiler.find_library_file(lib_dirs, 'readline'):
-+        if 0 and self.compiler.find_library_file(lib_dirs, 'readline'):
-             readline_libs = ['readline']
-             if self.compiler.find_library_file(lib_dirs,
-                                                  'ncurses'):
-@@ -436,9 +440,7 @@
+         if self.compiler.find_library_file(lib_dirs, 'readline'):
+@@ -436,9 +442,7 @@
                                 depends = ['socketmodule.h']) )
          # Detect SSL support for the socket module (via _ssl)
          ssl_incs = find_file('openssl/ssl.h', inc_dirs,
@@ -48,7 +59,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2003/08/04 08:29:32 drochner Exp $
                               )
          if ssl_incs is not None:
              krb5_h = find_file('krb5.h', inc_dirs,
-@@ -446,9 +448,7 @@
+@@ -446,9 +450,7 @@
              if krb5_h:
                  ssl_incs += krb5_h
          ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
@@ -59,87 +70,12 @@ $NetBSD: patch-aa,v 1.1.1.1 2003/08/04 08:29:32 drochner Exp $
  
          if (ssl_incs is not None and
              ssl_libs is not None):
-@@ -608,7 +608,7 @@
-                                        libraries=dblibs))
- 
-         # Anthony Baxter's gdbm module.  GNU dbm(3) will require -lgdbm:
--        if (self.compiler.find_library_file(lib_dirs, 'gdbm')):
-+        if 0 and (self.compiler.find_library_file(lib_dirs, 'gdbm')):
-             exts.append( Extension('gdbm', ['gdbmmodule.c'],
-                                    libraries = ['gdbm'] ) )
- 
-@@ -626,7 +626,7 @@
-         # FTP archive sites. One URL for it is:
-         # ftp://gatekeeper.dec.com/.b/usenet/comp.sources.misc/volume40/fgmp/part01.Z
- 
--        if (self.compiler.find_library_file(lib_dirs, 'gmp')):
-+        if 0 and (self.compiler.find_library_file(lib_dirs, 'gmp')):
-             exts.append( Extension('mpz', ['mpzmodule.c'],
-                                    libraries = ['gmp'] ) )
- 
-@@ -658,7 +658,7 @@
-             curses_libs = ['ncurses']
-             exts.append( Extension('_curses', ['_cursesmodule.c'],
-                                    libraries = curses_libs) )
--        elif (self.compiler.find_library_file(lib_dirs, 'curses')
-+        elif 0 and (self.compiler.find_library_file(lib_dirs, 'curses')
-               and platform != 'darwin'):
-                 # OSX has an old Berkeley curses, not good enough for
-                 # the _curses module.
-@@ -730,21 +730,21 @@
-         else:
-             xmlbo = "4321"
-         expatinc = os.path.join(os.getcwd(), srcdir, 'Modules', 'expat')
--        exts.append(Extension('pyexpat',
--                              sources = [
--            'pyexpat.c',
--            'expat/xmlparse.c',
--            'expat/xmlrole.c',
--            'expat/xmltok.c',
--            ],
--                              define_macros = [
--            ('XML_NS', '1'),
--            ('XML_DTD', '1'),
--            ('BYTEORDER', xmlbo),
--            ('XML_CONTEXT_BYTES','1024'),
--            ],
--                              include_dirs = [expatinc]
--                               ))
-+#        exts.append(Extension('pyexpat',
-+#                              sources = [
-+#            'pyexpat.c',
-+#            'expat/xmlparse.c',
-+#            'expat/xmlrole.c',
-+#            'expat/xmltok.c',
-+#            ],
-+#                              define_macros = [
-+#            ('XML_NS', '1'),
-+#            ('XML_DTD', '1'),
-+#            ('BYTEORDER', xmlbo),
-+#            ('XML_CONTEXT_BYTES','1024'),
-+#            ],
-+#                              include_dirs = [expatinc]
-+#                               ))
- 
-         # Dynamic loading module
-         if sys.maxint == 0x7fffffff:
-@@ -867,7 +867,7 @@
-         self.extensions.extend(exts)
- 
-         # Call the method for detecting whether _tkinter can be compiled
--        self.detect_tkinter(inc_dirs, lib_dirs)
-+#        self.detect_tkinter(inc_dirs, lib_dirs)
- 
-     def detect_tkinter_darwin(self, inc_dirs, lib_dirs):
-         # The _tkinter module, using frameworks. Since frameworks are quite
-@@ -1128,7 +1128,9 @@
+@@ -1128,7 +1130,7 @@
            ext_modules=[Extension('struct', ['structmodule.c'])],
  
            # Scripts to install
 -          scripts = ['Tools/scripts/pydoc', 'Tools/scripts/idle']
-+          scripts = ['Tools/scripts/pydoc2p3',
-+#'Tools/scripts/idle'
-+	  ]
++          scripts = ['Tools/scripts/pydoc2p3']
          )
  
  # --install-platlib