Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/languages In directory sc8-pr-cvs1:/tmp/cvs-serv22550
Added Files: guile.info hugs.info hugs.patch python21.info python21.patch python22-nox.info python22-nox.patch python22.info python22.patch Removed Files: guile-1.4-16.info hugs-1998.200102-14.info hugs-1998.200102-14.patch python21-2.1.3-27.info python21-2.1.3-27.patch python22-2.2.3-12.info python22-2.2.3-12.patch python22-nox-2.2.3-12.info python22-nox-2.2.3-12.patch Log Message: name changes and fixed deps --- NEW FILE: guile.info --- Package: guile Version: 1.4 Revision: 17 GCC: 3.3 Depends: %N-shlibs (= %v-%r) BuildDepends: readline (>= 4.3-15), ncurses-dev (>= 5.3-20031018-1)) Source: gnu UpdateLibtool: true ConfigureParams: --infodir=%p/share/info InstallScript: << make install DESTDIR=%d << SplitOff: << Package: %N-shlibs Depends: readline-shlibs (>= 4.3-15), ncurses, ncurses-shlibs Replaces: %N (<= 1.4-3) Files: lib/libguile.*.dylib lib/libguilereadline.*.dylib Shlibs: << %p/lib/libguile.9.dylib 10.0.0 %n (>= 1.4-16) %p/lib/libguilereadline.0.dylib 1.0.0 %n (>= 1.4-16) << DocFiles: README COPYING AUTHORS NEWS THANKS << SplitOff2: << Package: %N-dev BuildDependsOnly: True Depends: %N-shlibs (= %v-%r) Replaces: %N (<= 1.4-3) Files: include lib/*.a lib/*.la lib/libguile.dylib lib/libguilereadline.dylib share/aclocal DocFiles: README COPYING AUTHORS NEWS THANKS << DocFiles: README COPYING AUTHORS NEWS THANKS InfoDocs: data-rep.info # Description: Embedable Scheme interpreter DescPort: << Thread support currently disabled (configure's default). Needs help to link against the right copy of the libraries. Care must be taken not to encode the used paths into the produced library. << License: GPL Homepage: http://www.gnu.org/software/guile/guile.html Maintainer: None <[EMAIL PROTECTED]> Source-MD5: 60430592385b96319ea3eb4cba88062c --- NEW FILE: hugs.info --- Package: hugs Version: 1998.200102 Revision: 15 GCC: 3.3 Maintainer: Ashley Yakeley <[EMAIL PROTECTED]> BuildDepends: ncurses-dev (>= 5.3-20031018-1), readline (>= 4.3-15) Depends: dlcompat, readline-shlibs (>= 4.3-15), ncurses, ncurses-shlibs Source: http://www.cse.ogi.edu/PacSoft/projects/Hugs/downloads/hugs98-Feb2001.tar.gz Source-MD5: 8e234bea0222e8ab88aa235eca919239 Patch: %n.patch ConfigureParams: --mandir=%p/share/man --with-readline CompileScript: << cd src/unix/; ./configure %c cd src/; make CFLAGS="-I%p/include -no-cpp-precomp" << InstallScript: cd src/; make install prefix=%i mandir=%i/share/man DocFiles: Credits License Readme Description: Haskell interpreter DescPort: << The configure script is badly written and doesn't pass CPPFLAGS or CFLAGS to the Makefile, so we set it again on the make command line. The configure script needed a small patch to find readline without ncurses installed. << License: BSD Homepage: http://haskell.org/hugs/ --- NEW FILE: hugs.patch --- diff -ru hugs98-Feb2001/src/unix/configure hugs98-Feb2001-patched/src/unix/configure --- hugs98-Feb2001/src/unix/configure Thu Feb 15 04:18:14 2001 +++ hugs98-Feb2001-patched/src/unix/configure Sun Apr 1 09:42:43 2001 @@ -3426,7 +3426,7 @@ if test "$with_readline" = yes; then use_readline=no - TERMCAP=no + TERMCAP="" echo $ac_n "checking for main in -lncurses""... $ac_c" 1>&6 echo "configure:3432: checking for main in -lncurses" >&5 ac_lib_var=`echo ncurses'_'main | sed 'y%./+-%__p_%'` --- NEW FILE: python21.info --- Package: python21 Version: 2.1.3 Revision: 28 Description: Interpreted, object-oriented language DescDetail: It is often compared to Tcl, Perl, Scheme or Java. Source: ftp://ftp.python.org/pub/python/%v/Python-%v.tgz Source-MD5: a8b04cdc822a6fc833ed9b99c7fba589 Depends: db3-shlibs (>= 3.3.11-23), gdbm-shlibs (>= 1.8.0-4), libpoll-shlibs, tcltk, readline-shlibs (>= 4.3-15), python21-socket | python21-socket-ssl, ncurses, ncurses-shlibs BuildDepends: libpoll, db3 (>= 3.3.11-23), gdbm (>= 1.8.0-4), readline (>= 4.3-15), tcltk-dev, ncurses-dev (>= 5.3-20031018-1) SourceDirectory: Python-%v PatchScript: (sed 's|<PREFIX>|%p|g' < %a/%n.patch | patch -p1) ConfigureParams: --with-dyld --with-suffix GCC: 3.3 DocFiles: README LICENSE License: OSI-Approved InstallScript: << echo '[install_scripts]' >setup.cfg echo 'install_dir='"%i/bin" >>setup.cfg make install prefix=%i MANDIR=%i/share/man (cd Tools/idle; %i/bin/python.exe setup.py install --prefix=%i) (cd %i/bin; sed 's|/usr/bin/env python|%p/bin/python2.1|g' < idle > idle2.1; chmod 755 idle2.1; rm -f idle) (cd %i/bin; sed 's|/usr/bin/env python|%p/bin/python2.1|g' < pydoc > pydoc2.1; chmod 755 pydoc2.1; 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.1 /bin/rm -f %i/bin/python.exe /bin/mv -f %i/bin/python2.1.exe %i/bin/python2.1 /bin/mv %i/share/man/man1/python.1 %i/share/man/man1/python21.1 ln -s %p/bin/python2.1 %i/bin/python ln -s %p/bin/pydoc2.1 %i/bin/pydoc ln -s %p/bin/idle2.1 %i/bin/idle ln -s %p/share/man/man1/python21.1 %i/share/man/man1/python.1 << SplitOff: << Package: python Depends: python21 Conflicts: python-nox Replaces: python-nox Files: bin/pydoc bin/python bin/idle share/man/man1/python.1 DocFiles: README LICENSE << SplitOff2: << Package: python21-socket Conflicts: python21-socket-ssl Replaces: python21 (<= 2.1.3-16), python21-socket-ssl Files: lib/python2.1/lib-dynload/_socket.so DocFiles: README LICENSE Description: Socket plugin for python << Homepage: http://www.python.org Maintainer: Jeffrey Whitaker <[EMAIL PROTECTED]> --- NEW FILE: python21.patch --- diff -ru Python-2.1.3/configure Python-2.1.3-patched/configure --- Python-2.1.3/configure Mon Jul 16 18:07:26 2001 +++ Python-2.1.3-patched/configure Fri Sep 21 13:09:04 2001 @@ -2944,7 +2944,7 @@ DYNIX/ptx*) LDSHARED="ld -G";; Darwin/*|next/*) if test "$ns_dyld" - then LDSHARED='$(CC) $(LDFLAGS) -bundle -undefined suppress' + then LDSHARED='$(CC) $(LDFLAGS) -bundle -flat_namespace -undefined suppress' else LDSHARED='$(CC) $(CFLAGS) -nostdlib -r'; fi if test "$with_next_framework" ; then diff -ru Python-2.1.3/Modules/Setup.dist Python-2.1.3/Modules/Setup.dist --- Python-2.1.3/Modules/Setup.dist Thu Mar 22 23:18:55 2001 +++ Python-2.1.3/Modules/Setup.dist Fri Sep 21 13:07:39 2001 @@ -135,7 +135,7 @@ # it, depending on your system -- see the GNU readline instructions. # It's okay for this to be a shared library, too. -#readline readline.c -lreadline -ltermcap +readline readline.c -lreadline # Modules that should always be present (non UNIX dependent): @@ -298,13 +298,13 @@ # every system. # *** Always uncomment this (leave the leading underscore in!): -# _tkinter _tkinter.c tkappinit.c -DWITH_APPINIT \ + _tkinter _tkinter.c tkappinit.c -DWITH_APPINIT \ # *** Uncomment and edit to reflect where your Tcl/Tk libraries are: # -L/usr/local/lib \ # *** Uncomment and edit to reflect where your Tcl/Tk headers are: # -I/usr/local/include \ # *** Uncomment and edit to reflect where your X11 header files are: -# -I/usr/X11R6/include \ + -I/usr/X11R6/include \ # *** Or uncomment this for Solaris: # -I/usr/openwin/include \ # *** Uncomment and edit for Tix extension only: @@ -317,17 +317,17 @@ # *** Uncomment and edit for TOGL extension only: # -DWITH_TOGL togl.c \ # *** Uncomment and edit to reflect your Tcl/Tk versions: -# -ltk8.2 -ltcl8.2 \ + -ltk -ltcl \ # *** Uncomment and edit to reflect where your X11 libraries are: -# -L/usr/X11R6/lib \ + -L/usr/X11R6/lib \ # *** Or uncomment this for Solaris: # -L/usr/openwin/lib \ # *** Uncomment these for TOGL extension only: -# -lGL -lGLU -lXext -lXmu \ +# -lGL -lGLU -lXext -lXmu \ # *** Uncomment for AIX: # -lld \ # *** Always uncomment this; X11 libraries to link with: -# -lX11 + -lX11 # Lance Ellinghaus's modules: @@ -342,9 +342,9 @@ # # First, look at Setup.config; configure may have set this for you. -#_curses _cursesmodule.c -lcurses -ltermcap +#_curses _cursesmodule.c -lncurses # Wrapper for the panel library that's part of ncurses and SYSV curses. -#_curses_panel _curses_panel.c -lpanel -lncurses +#_curses_panel _curses_panel.c -lpanel -lncurses # Tommy Burnette's 'new' module (creates new empty objects of certain kinds): @@ -436,7 +436,7 @@ # Andrew Kuchling's zlib module. # This require zlib 1.1.3 (or later). # See http://www.cdrom.com/pub/infozip/zlib/ -#zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib -lz +zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib -lz # Interface to the Expat XML parser # diff -ru Python-2.1.3/Makefile.pre.in Python-2.1.3-patched/Makefile.pre.in --- Python-2.1.3/Makefile.pre.in Thu Jul 19 15:21:05 2001 +++ Python-2.1.3-patched/Makefile.pre.in Fri Sep 21 13:07:39 2001 @@ -55,7 +55,7 @@ # Compiler options OPT= @OPT@ DEFS= @DEFS@ -CFLAGS= $(OPT) -I. -I$(srcdir)/Include $(DEFS) +CFLAGS= $(OPT) -I. -I$(srcdir)/Include -I<PREFIX>/include $(DEFS) LDFLAGS= @LDFLAGS@ LDLAST= @LDLAST@ SGI_ABI= @SGI_ABI@ @@ -386,7 +386,7 @@ -$(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C) $(PGEN): $(PGENOBJS) - $(CC) $(OPT) $(PGENOBJS) $(LIBS) -o $(PGEN) + $(CC) $(OPT) $(PGENOBJS) $(LDFLAGS) $(LIBS) -o $(PGEN) Parser/grammar.o: $(srcdir)/Parser/grammar.c \ $(srcdir)/Parser/assert.h \ --- Python-2.1.3/Lib/distutils/util.py.orig Sun Feb 24 17:35:00 2002 +++ Python-2.1.3/Lib/distutils/util.py Sun Feb 24 06:39:44 2002 @@ -41,6 +41,8 @@ # Try to distinguish various flavours of Unix (osname, host, release, version, machine) = os.uname() + if machine == "Power Macintosh": + machine = "PowerMacintosh" # Convert the OS name to lowercase and remove '/' characters # (to accommodate BSD/OS) --- Python-2.1.3/setup.py.orig Thu Apr 25 14:57:58 2002 +++ Python-2.1.3/setup.py Thu Apr 25 14:59:13 2002 @@ -150,6 +150,10 @@ self.compiler.library_dirs.insert(0, '/usr/local/lib') if '/usr/local/include' not in self.compiler.include_dirs: self.compiler.include_dirs.insert(0, '/usr/local/include' ) + if '<PREFIX>/lib' not in self.compiler.library_dirs: + self.compiler.library_dirs.insert(0, '<PREFIX>/lib') + if '<PREFIX>/include' not in self.compiler.include_dirs: + self.compiler.include_dirs.insert(0, '<PREFIX>/include' ) # lib_dirs and inc_dirs are used to search for files; # if a file is found in one of those directories, it can diff -ru Python-2.1.3/setup.py Python-2.1.3-patched/setup.py --- Python-2.1.3/setup.py Thu Dec 27 16:51:02 2001 +++ Python-2.1.3-patched/setup.py Sat Mar 22 20:54:28 2003 @@ -305,6 +305,8 @@ '/usr/contrib/ssl/lib/' ] ) + ssl_incs = None + if (ssl_incs is not None and ssl_libs is not None): exts.append( Extension('_socket', ['socketmodule.c'], --- NEW FILE: python22-nox.info --- Package: python22-nox Version: 2.2.3 Revision: 13 Maintainer: Jeffrey Whitaker <[EMAIL PROTECTED]> Conflicts: python22, python (<= 2.2.1-8) Replaces: python22, python (<= 2.2.1-8), python-nox (<= 2.2.1-8) Depends: dlcompat-shlibs, %N-shlibs (= %v-%r) | python22-shlibs (= %v-%r), python22-socket | python22-socket-nox | python22-socket-ssl BuildDepends: readline (>= 4.3-15), db3 (>= 3.3.11-23), gdbm (>= 1.8.0-4), gmp (>= 4.1.2-11), libpoll, expat, ncurses-dev (>= 5.3-20031018-1) Source: http://python.org/ftp/python/%v/Python-%v.tgz Source-MD5: 169f89f318e252dac0c54dd1b165d229 PatchScript: (sed 's|<PREFIX>|%p|g' < %a/%n.patch | patch -p1) ConfigureParams: --mandir='${prefix}/share/man' GCC: 3.3 CompileScript: (export OPT="-O3 -Wall -Wstrict-prototypes -fno-common"; export HOME=""; ./configure %c; make) InstallScript: << make install prefix=%i (cd %i/bin; sed 's|%p/bin/python|%p/bin/python2.2|g' < pydoc > pydoc2.2; chmod 755 pydoc2.2; 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.2 /bin/rm -f %i/bin/python /bin/mv %i/share/man/man1/python.1 %i/share/man/man1/python22.1 cc -dynamiclib -all_load -framework System -framework CoreServices -framework Foundation %i/lib/python2.2/config/libpython2.2.a -o %i/lib/python2.2/config/libpython2.2.dylib -install_name %p/lib/python2.2/config/libpython2.2.dylib -current_version %v -compatibility_version 2.2 -L%p/lib -ldl (cd %i/lib/python2.2/config; mv Makefile Makefile.orig; sed 's|-fno-common||g' < Makefile.orig > Makefile; /bin/rm -f Makefile.orig) ln -s %p/bin/python2.2 %i/bin/python ln -s %p/bin/pydoc2.2 %i/bin/pydoc ln -s %p/share/man/man1/python22.1 %i/share/man/man1/python.1 << SplitOff: << Package: %N-shlibs Depends: readline-shlibs (>= 4.3-15), dlcompat, expat-shlibs, gdbm-shlibs (>= 1.8.0-4), gmp-shlibs (>= 4.1.2-11), db3-shlibs (>= 3.3.11-23), libpoll-shlibs, ncurses (>= 5.3-12), ncurses-shlibs (>= 5.3-12) Conflicts: python22-shlibs Replaces: python22-shlibs, python (<= 2.2.1-8), python-nox (<= 2.2.1-8) Files: lib/python2.2/config/libpython2.2.dylib Shlibs: %p/lib/python2.2/config/libpython2.2.dylib 2.2.0 python22-shlibs (>= 2.2.3-12) | python22-nox-shlibs (>= 2.2.3-12) DocFiles: README LICENSE << SplitOff2: << Package: python-nox Depends: python22-nox Conflicts: python Replaces: python Provides: python Files: bin/pydoc bin/python share/man/man1/python.1 DocFiles: README LICENSE << SplitOff3: << Package: python22-socket-nox Conflicts: python22-socket-ssl, python22-socket Replaces: python22, python (<= 2.2.1-8), python-nox (<= 2.2.1-8), python22-socket-ssl, python22-socket Files: lib/python2.2/lib-dynload/_socket.so DocFiles: README LICENSE Description: Socket plugin for python (no X11) << 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: python22-nox.patch --- diff -Naur Python-2.2.1.old/Lib/distutils/util.py Python-2.2.1/Lib/distutils/util.py --- Python-2.2.1.old/Lib/distutils/util.py Fri Dec 7 05:51:35 2001 +++ Python-2.2.1/Lib/distutils/util.py Wed Aug 7 21:56:01 2002 @@ -41,6 +41,11 @@ # 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 and remove '/' characters # (to accommodate BSD/OS) diff -Naur Python-2.2.1.old/Makefile.pre.in Python-2.2.1/Makefile.pre.in --- Python-2.2.1.old/Makefile.pre.in Tue Mar 5 22:52:29 2002 +++ Python-2.2.1/Makefile.pre.in Wed Aug 7 21:56:01 2002 @@ -56,7 +56,7 @@ OPT= @OPT@ DEFS= @DEFS@ CFLAGS= $(OPT) -CPPFLAGS= -I. -I$(srcdir)/Include $(DEFS) +CPPFLAGS= -I. -I<PREFIX>/include -I$(srcdir)/Include $(DEFS) LDFLAGS= @LDFLAGS@ LDLAST= @LDLAST@ SGI_ABI= @SGI_ABI@ @@ -407,7 +407,7 @@ -$(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C) $(PGEN): $(PGENOBJS) - $(CC) $(OPT) $(PGENOBJS) $(LIBS) -o $(PGEN) + $(CC) $(OPT) $(PGENOBJS) $(LDFLAGS) $(LIBS) -o $(PGEN) Parser/grammar.o: $(srcdir)/Parser/grammar.c \ $(srcdir)/Include/token.h \ diff -Naur Python-2.2.1.old/Misc/setuid-prog.c Python-2.2.1/Misc/setuid-prog.c --- Python-2.2.1.old/Misc/setuid-prog.c Fri Sep 11 05:18:09 1998 +++ Python-2.2.1/Misc/setuid-prog.c Wed Aug 7 21:56:01 2002 @@ -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 */ diff -Naur Python-2.2.1.old/Modules/posixmodule.c Python-2.2.1/Modules/posixmodule.c --- Python-2.2.1.old/Modules/posixmodule.c Wed Mar 13 06:38:31 2002 +++ Python-2.2.1/Modules/posixmodule.c Wed Aug 7 21:56:01 2002 @@ -19,6 +19,11 @@ #include "Python.h" #include "structseq.h" +#if defined(__APPLE__) +# include <sys/time.h> +# include <crt_externs.h> +# define environ (*_NSGetEnviron()) +#endif /* __APPLE__ */ #if defined(PYOS_OS2) #define INCL_DOS #define INCL_DOSERRORS --- Python-2.2.2.orig/configure Fri Oct 11 00:26:41 2002 +++ Python-2.2.2/configure Thu Feb 6 21:28:19 2003 @@ -3207,8 +3207,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)' + BLDSHARED="$LDSHARED "'-flat_namespace -undefined suppress' + LDSHARED="$LDSHARED "'-flat_namespace -undefined suppress' fi ;; Linux*) LDSHARED='$(CC) -shared';; dgux*) LDSHARED="ld -G";; diff -ru Python-2.2.2/setup.py Python-2.2.2-patched/setup.py --- Python-2.2.2/setup.py Wed Oct 9 20:59:16 2002 +++ Python-2.2.2-patched/setup.py Sat Mar 22 21:29:24 2003 @@ -216,6 +216,12 @@ if '/usr/local/include' not in self.compiler.include_dirs: self.compiler.include_dirs.insert(0, '/usr/local/include' ) + # Ensure that <PREFIX> is always used + if '<PREFIX>/lib' not in self.compiler.library_dirs: + self.compiler.library_dirs.insert(0, '<PREFIX>/lib') + if '<PREFIX>/include' not in self.compiler.include_dirs: + self.compiler.include_dirs.insert(0, '<PREFIX>/include' ) + try: have_unicode = unicode except NameError: @@ -372,6 +378,9 @@ '/usr/contrib/ssl/lib/' ] ) + ssl_incs = None + ssl_libs = None + if ssl_incs is not None: krb5_h = find_file('krb5.h', inc_dirs, ['/usr/kerberos/include']) @@ -690,7 +699,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(self, inc_dirs, lib_dirs): --- NEW FILE: python22.info --- Package: python22 Version: 2.2.3 Revision: 13 Maintainer: Jeffrey Whitaker <[EMAIL PROTECTED]> Conflicts: python22-nox, python-nox (<= 2.2.1-8) Replaces: python22-nox, python (<= 2.2.1-8), python-nox (<= 2.2.1-8) Depends: %N-shlibs (= %v-%r) | python22-nox-shlibs (= %v-%r), tcltk (>= 8.4.1-1), python22-socket | python22-socket-nox | python22-socket-ssl BuildDepends: readline (>= 4.3-15), db3 (>= 3.3.11-23), gdbm (>= 1.8.0-4), gmp (>= 4.1.2-11), libpoll, tcltk-dev, expat, ncurses-dev (>= 5.3-20031018-1) Source: http://python.org/ftp/python/%v/Python-%v.tgz Source-MD5: 169f89f318e252dac0c54dd1b165d229 PatchScript: (sed 's|<PREFIX>|%p|g' < %a/%n.patch | patch -p1) ConfigureParams: --mandir='${prefix}/share/man' GCC: 3.3 CompileScript: (export OPT="-O3 -Wall -Wstrict-prototypes -fno-common"; export HOME=""; ./configure %c; make) InstallScript: << make install prefix=%i (cd Tools/idle; %i/bin/python setup.py install --prefix=%i) (cd %i/bin; sed 's|%i/bin/python|%p/bin/python2.2|g' < idle > idle2.2; chmod 755 idle2.2; rm -f idle) (cd %i/bin; sed 's|%p/bin/python|%p/bin/python2.2|g' < pydoc > pydoc2.2; chmod 755 pydoc2.2; 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.2 /bin/rm -f %i/bin/python /bin/mv %i/share/man/man1/python.1 %i/share/man/man1/python22.1 cc -dynamiclib -all_load -framework System -framework CoreServices -framework Foundation %i/lib/python2.2/config/libpython2.2.a -o %i/lib/python2.2/config/libpython2.2.dylib -install_name %p/lib/python2.2/config/libpython2.2.dylib -current_version %v -compatibility_version 2.2 -L%p/lib -ldl (cd %i/lib/python2.2/config; mv Makefile Makefile.orig; sed 's|-fno-common||g' < Makefile.orig > Makefile; /bin/rm -f Makefile.orig) ln -s %p/bin/python2.2 %i/bin/python ln -s %p/bin/pydoc2.2 %i/bin/pydoc ln -s %p/bin/idle2.2 %i/bin/idle ln -s %p/share/man/man1/python22.1 %i/share/man/man1/python.1 << SplitOff: << Package: %N-shlibs Depends: readline-shlibs (>= 4.3-15), dlcompat, expat-shlibs, gdbm-shlibs (>= 1.8.0-4), gmp-shlibs (>= 4.1.2-11), db3-shlibs (>= 3.3.11-23), tcltk-shlibs (>= 8.4.1-1), libpoll-shlibs, ncurses (>= 5.3-12), ncurses-shlibs (>= 5.3-12) Conflicts: python22-nox-shlibs Replaces: python22-nox-shlibs, python (<= 2.2.1-8), python-nox (<= 2.2.1-8) Files: lib/python2.2/config/libpython2.2.dylib Shlibs: %p/lib/python2.2/config/libpython2.2.dylib 2.2.0 python22-shlibs (>= 2.2.3-12) | python22-nox-shlibs (>= 2.2.3-12) DocFiles: README LICENSE << SplitOff2: << Package: python Depends: python22 Conflicts: python-nox Replaces: python-nox Files: bin/pydoc bin/python bin/idle share/man/man1/python.1 DocFiles: README LICENSE << SplitOff3: << Package: python22-socket Conflicts: python22-socket-ssl, python22-socket-nox Replaces: python22-nox, python (<= 2.2.1-8), python-nox (<= 2.2.1-8), python22-socket-ssl, python22-socket-nox Files: lib/python2.2/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: python22.patch --- diff -Naur Python-2.2.1.old/Lib/distutils/util.py Python-2.2.1/Lib/distutils/util.py --- Python-2.2.1.old/Lib/distutils/util.py Fri Dec 7 05:51:35 2001 +++ Python-2.2.1/Lib/distutils/util.py Wed Aug 7 21:56:01 2002 @@ -41,6 +41,11 @@ # 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 and remove '/' characters # (to accommodate BSD/OS) diff -Naur Python-2.2.1.old/Makefile.pre.in Python-2.2.1/Makefile.pre.in --- Python-2.2.1.old/Makefile.pre.in Tue Mar 5 22:52:29 2002 +++ Python-2.2.1/Makefile.pre.in Wed Aug 7 21:56:01 2002 @@ -56,7 +56,7 @@ OPT= @OPT@ DEFS= @DEFS@ CFLAGS= $(OPT) -CPPFLAGS= -I. -I$(srcdir)/Include $(DEFS) +CPPFLAGS= -I. -I<PREFIX>/include -I$(srcdir)/Include $(DEFS) LDFLAGS= @LDFLAGS@ LDLAST= @LDLAST@ SGI_ABI= @SGI_ABI@ @@ -407,7 +407,7 @@ -$(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C) $(PGEN): $(PGENOBJS) - $(CC) $(OPT) $(PGENOBJS) $(LIBS) -o $(PGEN) + $(CC) $(OPT) $(PGENOBJS) $(LDFLAGS) $(LIBS) -o $(PGEN) Parser/grammar.o: $(srcdir)/Parser/grammar.c \ $(srcdir)/Include/token.h \ diff -Naur Python-2.2.1.old/Misc/setuid-prog.c Python-2.2.1/Misc/setuid-prog.c --- Python-2.2.1.old/Misc/setuid-prog.c Fri Sep 11 05:18:09 1998 +++ Python-2.2.1/Misc/setuid-prog.c Wed Aug 7 21:56:01 2002 @@ -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 */ diff -Naur Python-2.2.1.old/Modules/posixmodule.c Python-2.2.1/Modules/posixmodule.c --- Python-2.2.1.old/Modules/posixmodule.c Wed Mar 13 06:38:31 2002 +++ Python-2.2.1/Modules/posixmodule.c Wed Aug 7 21:56:01 2002 @@ -19,6 +19,11 @@ #include "Python.h" #include "structseq.h" +#if defined(__APPLE__) +# include <sys/time.h> +# include <crt_externs.h> +# define environ (*_NSGetEnviron()) +#endif /* __APPLE__ */ #if defined(PYOS_OS2) #define INCL_DOS #define INCL_DOSERRORS --- Python-2.2.2.orig/configure Fri Oct 11 00:26:41 2002 +++ Python-2.2.2/configure Thu Feb 6 21:28:19 2003 @@ -3207,8 +3207,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)' + BLDSHARED="$LDSHARED "'-flat_namespace -undefined suppress' + LDSHARED="$LDSHARED "'-flat_namespace -undefined suppress' fi ;; Linux*) LDSHARED='$(CC) -shared';; dgux*) LDSHARED="ld -G";; diff -ru Python-2.2.2/setup.py Python-2.2.2-patched/setup.py --- Python-2.2.2/setup.py Wed Oct 9 20:59:16 2002 +++ Python-2.2.2-patched/setup.py Sat Mar 22 21:29:24 2003 @@ -216,6 +216,12 @@ if '/usr/local/include' not in self.compiler.include_dirs: self.compiler.include_dirs.insert(0, '/usr/local/include' ) + # Ensure that <PREFIX> is always used + if '<PREFIX>/lib' not in self.compiler.library_dirs: + self.compiler.library_dirs.insert(0, '<PREFIX>/lib') + if '<PREFIX>/include' not in self.compiler.include_dirs: + self.compiler.include_dirs.insert(0, '<PREFIX>/include' ) + try: have_unicode = unicode except NameError: @@ -371,6 +377,9 @@ ['/usr/local/ssl/lib', '/usr/contrib/ssl/lib/' ] ) + + ssl_incs = None + ssl_libs = None if ssl_incs is not None: krb5_h = find_file('krb5.h', inc_dirs, --- guile-1.4-16.info DELETED --- --- hugs-1998.200102-14.info DELETED --- --- hugs-1998.200102-14.patch DELETED --- --- python21-2.1.3-27.info DELETED --- --- python21-2.1.3-27.patch DELETED --- --- python22-2.2.3-12.info DELETED --- --- python22-2.2.3-12.patch DELETED --- --- python22-nox-2.2.3-12.info DELETED --- --- python22-nox-2.2.3-12.patch DELETED --- ------------------------------------------------------- This SF.net email is sponsored by OSDN developer relations Here's your chance to show off your extensive product knowledge We want to know what you know. Tell us and you have a chance to win $100 http://www.zoomerang.com/survey.zgi?HRPT1X3RYQNC5V4MLNSV3E54 _______________________________________________ Fink-commits mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/fink-commits