|
From: Justin F. H. <th...@us...> - 2003-10-25 20:41:50
|
Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/languages In directory sc8-pr-cvs1:/tmp/cvs-serv16740 Added Files: python23.info python23.patch Log Message: Adding python23, new filename, plus 10 removed dlcompat, libpoll and freetype2 and changed to gdbm3 --- NEW FILE: python23.info --- Package: python23 Version: 2.3 Revision: 23 Epoch: 1 Maintainer: Jeffrey Whitaker <js...@fa...> Conflicts: python23-nox, python-nox (<= 2.2.1-8) Replaces: python23-nox, python (<= 2.2.1-8), python-nox (<= 2.2.1-8) Depends: %N-shlibs (= %v-%r), tcltk (>= 8.4.1-1), python23-socket BuildDepends: readline (>= 4.3-15), db4 (>= 4.0.14-22), gdbm3, gmp (>= 4.1.2-11), tcltk-dev, expat, bzip2-dev, gettext-dev, gettext-bin, ncurses-dev (>= 5.3-12) Source: http://python.org/ftp/python/2.3/Python-%v.tgz Source-MD5: 595620a4769073a812e353597585c4e8 PatchScript: (sed 's|@PREFIX@|%p|g' < %a/%f.patch | patch -p1) ConfigureParams: --mandir='${prefix}/share/man' GCC: 3.3 InstallScript: << make install prefix=%i (cd %i/bin; sed 's|%i/bin/python|%p/bin/python2.3|g' < idle > idle2.3; chmod 755 idle2.3; rm -f idle) (cd %i/bin; sed 's|%p/bin/python|%p/bin/python2.3|g' < pydoc > pydoc2.3; chmod 755 pydoc2.3; rm -f pydoc) (cd Misc; /bin/rm -rf RPM) mkdir -p %i/share/doc/%n cp -R Demo Doc %i/share/doc/%n cp -R Misc Tools %i/lib/python2.3 /bin/rm -f %i/bin/python /bin/mv %i/share/man/man1/python.1 %i/share/man/man1/python23.1 cc -dynamiclib -all_load -framework System -framework CoreServices -framework Foundation %i/lib/python2.3/config/libpython2.3.a -o %i/lib/python2.3/config/libpython2.3.dylib -install_name %p/lib/python2.3/config/libpython2.3.dylib -current_version 2.3 -compatibility_version 2.3 -L%p/lib -ldl (cd %i/lib/python2.3/config; mv Makefile Makefile.orig; sed 's|-fno-common||g' < Makefile.orig > Makefile; /bin/rm -f Makefile.orig) ln -s %p/bin/python2.3 %i/bin/python ln -s %p/bin/pydoc2.3 %i/bin/pydoc ln -s %p/bin/idle2.3 %i/bin/idle ln -s %p/share/man/man1/python23.1 %i/share/man/man1/python.1 << SplitOff: << Package: %N-shlibs Depends: readline-shlibs (>= 4.3-15), expat-shlibs, gdbm3-shlibs (>= 1.8.0-4), gmp-shlibs (>= 4.1.2-11), db4-shlibs (>= 4.0.14-22), tcltk-shlibs (>= 8.4.1) Conflicts: python23-nox-shlibs Replaces: python23-nox-shlibs, python (<= 2.2.1-8), python-nox (<= 2.2.1-8) Files: lib/python2.3/config/libpython2.3.dylib Shlibs: %p/lib/python2.3/config/libpython2.3.dylib 2.3.0 python23-shlibs (>= 2.3-1) | python23-nox-shlibs (>= 2.3-1) DocFiles: README LICENSE << SplitOff2: << Package: python Epoch: 1 Depends: python23 Conflicts: python-nox Replaces: python-nox Files: bin/pydoc bin/python bin/idle share/man/man1/python.1 DocFiles: README LICENSE << SplitOff3: << Package: python23-socket Epoch: 1 Replaces: python23-socket-ssl, python23-socket-nox Files: lib/python2.3/lib-dynload/_socket.so DocFiles: README LICENSE Description: Socket plugin for python << DocFiles: README LICENSE Description: Interpreted, object-oriented language DescDetail: << Python is often compared to Tcl, Perl, Scheme or Java. This package installs unix python - not the OSX Framework version. Builds a two-level namespace dynamic libpython (needed for koffice). Much help from Dave Morrison and Peter O'Gorman << DescPackaging: All available extension modules are built. License: OSI-Approved Homepage: http://www.python.org --- NEW FILE: python23.patch --- --- Python-2.3/Lib/distutils/util.py.orig Thu Feb 20 06:07:01 2003 +++ Python-2.3/Lib/distutils/util.py Thu Feb 20 06:07:37 2003 @@ -39,6 +39,12 @@ # Try to distinguish various flavours of Unix (osname, host, release, version, machine) = os.uname() + + # On MacOS X, remove space from machine name + + if machine == "Power Macintosh": + machine = "PowerMacintosh" + # Convert the OS name to lowercase, remove '/' characters # (to accommodate BSD/OS), and translate spaces (for "Power Macintosh") --- Python-2.3/Makefile.pre.in.orig Thu Feb 20 06:07:50 2003 +++ Python-2.3/Makefile.pre.in Thu Feb 20 06:08:33 2003 @@ -56,7 +56,7 @@ OPT= @OPT@ BASECFLAGS= @BASECFLAGS@ CFLAGS= $(BASECFLAGS) $(OPT) -CPPFLAGS= -I. -I$(srcdir)/Include +CPPFLAGS= -I. -I$(srcdir)/Include -I@PREFIX@/include LDFLAGS= @LDFLAGS@ LDLAST= @LDLAST@ SGI_ABI= @SGI_ABI@ --- Python-2.3/Misc/setuid-prog.c.orig Thu Feb 20 06:08:53 2003 +++ Python-2.3/Misc/setuid-prog.c Thu Feb 20 06:09:50 2003 @@ -70,6 +70,12 @@ #define environ _environ #endif +#if defined(__APPLE__) +# include <sys/time.h> +# include <crt_externs.h> +# define environ (*_NSGetEnviron()) +#endif /* __APPLE__ */ + /* don't change def_IFS */ char def_IFS[] = "IFS= \t\n"; /* you may want to change def_PATH, but you should really change it in */ --- Python-2.3/Modules/posixmodule.c.orig Thu Feb 20 06:10:18 2003 +++ Python-2.3/Modules/posixmodule.c Thu Feb 20 06:10:39 2003 @@ -325,7 +325,7 @@ #endif /* Return a dictionary corresponding to the POSIX environment table */ -#ifdef WITH_NEXT_FRAMEWORK +#ifdef __APPLE__ /* On Darwin/MacOSX a shared library or framework has no access to ** environ directly, we must obtain it with _NSGetEnviron(). */ @@ -535,7 +535,7 @@ d = PyDict_New(); if (d == NULL) return NULL; -#ifdef WITH_NEXT_FRAMEWORK +#ifdef __APPLE__ if (environ == NULL) environ = *_NSGetEnviron(); #endif --- Python-2.3/setup.py.orig Thu Feb 20 06:11:12 2003 +++ Python-2.3/setup.py Thu Feb 20 06:12:47 2003 @@ -244,11 +244,11 @@ add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') - # fink installs lots of goodies in /sw/... - make sure we + # fink installs lots of goodies in @PREFIX@/... - make sure we # check there if sys.platform == "darwin": - add_dir_to_list(self.compiler.library_dirs, '/sw/lib') - add_dir_to_list(self.compiler.include_dirs, '/sw/include') + add_dir_to_list(self.compiler.library_dirs, '@PREFIX@/lib') + add_dir_to_list(self.compiler.include_dirs, '@PREFIX@/include') if os.path.normpath(sys.prefix) != '/usr': add_dir_to_list(self.compiler.library_dirs, @@ -449,7 +449,7 @@ ['/usr/local/ssl/lib', '/usr/contrib/ssl/lib/' ] ) - + ssl_incs = None if (ssl_incs is not None and ssl_libs is not None): exts.append( Extension('_ssl', ['_ssl.c'], @@ -481,14 +481,14 @@ '/usr/local/BerkeleyDB.4.0/lib', '/usr/local/lib', '/opt/sfw', - '/sw/lib', + '@PREFIX@/lib', ), 'incdirs': ('/usr/local/BerkeleyDB.4.1/include', '/usr/local/include/db41', '/usr/local/BerkeleyDB.4.0/include', '/usr/local/include/db4', '/opt/sfw/include/db4', - '/sw/include/db4', + '@PREFIX@/include/db4', '/usr/include/db4', )}, 'db3': {'libs': ('db-3.3', 'db-3.2', 'db-3.1', 'db3',), @@ -497,14 +497,14 @@ '/usr/local/BerkeleyDB.3.1/lib', '/usr/local/lib', '/opt/sfw/lib', - '/sw/lib', + '@PREFIX@/lib', ), 'incdirs': ('/usr/local/BerkeleyDB.3.3/include', '/usr/local/BerkeleyDB.3.2/include', '/usr/local/BerkeleyDB.3.1/include', '/usr/local/include/db3', '/opt/sfw/include/db3', - '/sw/include/db3', + '@PREFIX@/include/db3', '/usr/include/db3', )}, } @@ -930,9 +930,9 @@ # AquaTk is a separate method. Only one Tkinter will be built on # Darwin - either AquaTk, if it is found, or X11 based Tk. platform = self.get_platform() - if platform == 'darwin' and \ - self.detect_tkinter_darwin(inc_dirs, lib_dirs): - return +# if platform == 'darwin' and \ +# self.detect_tkinter_darwin(inc_dirs, lib_dirs): +# return # Assume we haven't found any of the libraries or include files # The versions with dots are used on Unix, and the versions without --- Python-2.3/configure.orig Thu Feb 20 06:13:05 2003 +++ Python-2.3/configure Thu Feb 20 06:13:59 2003 @@ -3695,7 +3695,7 @@ ;; # is there any other compiler on Darwin besides gcc? Darwin*) - BASECFLAGS="$BASECFLAGS -Wno-long-double -no-cpp-precomp -mno-fused-madd" + BASECFLAGS="$BASECFLAGS -fno-common -Wno-long-double -no-cpp-precomp -mno-fused-madd" ;; esac ;; @@ -9627,7 +9627,7 @@ LDSHARED="$LDSHARED "'-framework $(PYTHONFRAMEWORK)' else # No framework. Ignore undefined symbols, assuming they come from Python - LDSHARED="$LDSHARED -undefined suppress" + LDSHARED="$LDSHARED -flat_namespace -undefined suppress" fi ;; Darwin/*) LDSHARED='$(CC) $(LDFLAGS) -bundle' @@ -9636,8 +9636,8 @@ LDSHARED="$LDSHARED "'-framework $(PYTHONFRAMEWORK)' else # No framework, use the Python app as bundle-loader - BLDSHARED="$LDSHARED "'-bundle_loader $(BUILDPYTHON)' - LDSHARED="$LDSHARED "'-bundle_loader $(BINDIR)/python$(VERSION)$(EXE)' + BLDSHARED="$LDSHARED -flat_namespace -undefined suppress" + LDSHARED="$LDSHARED -flat_namespace -undefined suppress" fi ;; Linux*|GNU*) LDSHARED='$(CC) -shared';; dgux*) LDSHARED="ld -G";; |