diff -Naur stackless-20020917.old/Lib/distutils/util.py stackless-20020917/Lib/distutils/util.py
--- stackless-20020917.old/Lib/distutils/util.py	2002-09-17 19:42:25.000000000 +0200
+++ stackless-20020917/Lib/distutils/util.py	2002-09-17 19:49:24.000000000 +0200
@@ -39,8 +39,12 @@
         return sys.platform
 
     # 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 stackless-20020917.old/Makefile.pre.in stackless-20020917/Makefile.pre.in
--- stackless-20020917.old/Makefile.pre.in	2002-09-17 19:43:23.000000000 +0200
+++ stackless-20020917/Makefile.pre.in	2002-09-17 19:50:53.000000000 +0200
@@ -56,7 +56,7 @@
 OPT=		@OPT@
 DEFS=		@DEFS@
 CFLAGS=		$(OPT)
-CPPFLAGS=	-I. -I$(srcdir)/Include -I$(srcdir)/Stackless $(DEFS)
+CPPFLAGS=	-I. -IFINK_PREFIX/include -I$(srcdir)/Include -I$(srcdir)/Stackless $(DEFS)
 LDFLAGS=	@LDFLAGS@
 LDLAST=		@LDLAST@
 SGI_ABI=	@SGI_ABI@
@@ -408,7 +408,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 stackless-20020917.old/Misc/setuid-prog.c stackless-20020917/Misc/setuid-prog.c
--- stackless-20020917.old/Misc/setuid-prog.c	2002-09-17 19:43:25.000000000 +0200
+++ stackless-20020917/Misc/setuid-prog.c	2002-09-17 19:51:23.000000000 +0200
@@ -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 stackless-20020917.old/Modules/posixmodule.c stackless-20020917/Modules/posixmodule.c
--- stackless-20020917.old/Modules/posixmodule.c	2002-09-17 19:43:28.000000000 +0200
+++ stackless-20020917/Modules/posixmodule.c	2002-09-17 19:51:49.000000000 +0200
@@ -19,6 +19,12 @@
 #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
diff -Naur stackless-20020917.old/Modules/socketmodule.c stackless-20020917/Modules/socketmodule.c
--- stackless-20020917.old/Modules/socketmodule.c	2002-09-17 19:43:28.000000000 +0200
+++ stackless-20020917/Modules/socketmodule.c	2002-09-17 19:52:15.000000000 +0200
@@ -222,10 +222,12 @@
    determine the bug just by checking for __APPLE__. If this bug
    gets ever fixed, perhaps checking for sys/version.h would be
    appropriate, which is 10/0 on the system with the bug. */
+#ifndef ENABLE_IPV6 
 #undef HAVE_GETADDRINFO
 /* avoid clashes with the C library definition of the symbol. */
 #define getaddrinfo fake_getaddrinfo
 #endif
+#endif
 
 /* I know this is a bad practice, but it is the easiest... */
 #if !defined(HAVE_GETADDRINFO)
diff -Naur stackless-20020917.old/configure stackless-20020917/configure
--- stackless-20020917.old/configure	2002-09-17 19:42:19.000000000 +0200
+++ stackless-20020917/configure	2002-09-17 19:52:46.000000000 +0200
@@ -7272,7 +7272,7 @@
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
-LIBS="-lreadline -ltermcap $LIBS"
+LIBS="-lreadline $LIBS"
 cat > conftest.$ac_ext <<EOF
 #line 7278 "configure"
 #include "confdefs.h"
@@ -7317,7 +7317,7 @@
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
-LIBS="-lreadline -ltermcap $LIBS"
+LIBS="-lreadline $LIBS"
 cat > conftest.$ac_ext <<EOF
 #line 7323 "configure"
 #include "confdefs.h"
diff -Naur stackless-20020917.old/setup.py stackless-20020917/setup.py
--- stackless-20020917.old/setup.py	2002-09-17 19:55:50.000000000 +0200
+++ stackless-20020917/setup.py	2002-09-17 19:55:32.000000000 +0200
@@ -203,6 +203,11 @@
         if '/usr/local/include' not in self.compiler.include_dirs:
             self.compiler.include_dirs.insert(0, '/usr/local/include' )
 
+        if '/FINK_PREFIX/lib' not in self.compiler.library_dirs:
+            self.compiler.library_dirs.insert(0, '/FINK_PREFIX/lib')
+        if '/FINK_PREFIX/include' not in self.compiler.include_dirs:
+            self.compiler.include_dirs.insert(0, '/FINK_PREFIX/include' )
+
         try:
             have_unicode = unicode
         except NameError:
@@ -345,7 +350,6 @@
                                                'termcap'):
                 readline_libs.append('termcap')
             exts.append( Extension('readline', ['readline.c'],
-                                   library_dirs=['/usr/lib/termcap'],
                                    libraries=readline_libs) )
 
         # crypt module.
@@ -356,27 +360,7 @@
             libs = []
         exts.append( Extension('crypt', ['cryptmodule.c'], libraries=libs) )
 
-        # socket(2)
-        # Detect SSL support for the socket module
-        ssl_incs = find_file('openssl/ssl.h', inc_dirs,
-                             ['/usr/local/ssl/include',
-                              '/usr/contrib/ssl/include/'
-                             ]
-                             )
-        ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
-                                     ['/usr/local/ssl/lib',
-                                      '/usr/contrib/ssl/lib/'
-                                     ] )
-
-        if (ssl_incs is not None and
-            ssl_libs is not None):
-            exts.append( Extension('_socket', ['socketmodule.c'],
-                                   include_dirs = ssl_incs,
-                                   library_dirs = ssl_libs,
-                                   libraries = ['ssl', 'crypto'],
-                                   define_macros = [('USE_SSL',1)] ) )
-        else:
-            exts.append( Extension('_socket', ['socketmodule.c']) )
+        exts.append( Extension('_socket', ['socketmodule.c']) )
 
         # Modules that provide persistent dictionary-like semantics.  You will
         # probably want to arrange for at least one of them to be available on