Changeset 15412 for trunk/dports

Timestamp:

Dec 11, 2005, 1:07:05 AM (18 years ago)

Author:

mww

Message:

Submitted by: blb@
Reviewed by: mww@

update to 2.4.2

Location:

trunk/dports/lang/python24

Files:

• Portfile (modified) (3 diffs)
• files/patch-Makefile.pre.in (modified) (2 diffs)
• files/patch-configure (modified) (2 diffs)

trunk/dports/lang/python24/Portfile

@@ -1 @@
-# $Id: Portfile,v 1.23 2005/09/13 18:06:43 gwright Exp $
+# $Id: Portfile,v 1.24 2005/12/11 01:07:05 mww Exp $
 
 PortSystem 1.0
 
 name                    python24
-version                 2.4.1
+version                 2.4.2
 set major_version       2
 set minor_version       4
-revision                6
 categories              lang
 platforms               darwin
@@ -16 +15 @@
 
 homepage                http://www.python.org/
-master_sites    ${homepage}/ftp/python/2.4.1/ \
-                                ftp://ftp.python.org/pub/python/2.4.1/
+master_sites    ${homepage}/ftp/python/2.4.2/ \
+                                ftp://ftp.python.org/pub/python/2.4.2/
 distname                Python-${version}
-checksums               md5 de3e9a8836fab6df7c7ce545331afeb3
+checksums               md5 98db1465629693fc434d4dc52db93838
 patchfiles              patch-Makefile.pre.in \
                                 patch-configure \
@@ -75 +74 @@
                 ln -s libpython${version}.dylib  libpython.dylib"
 }
+
+platform darwin 8 {
+        configure.env CC=/usr/bin/gcc-4.0 CPP=/usr/bin/cpp-4.0 CXX=/usr/bin/g++-4.0
+        configure.args-append --with-cxx=/usr/bin/g++-4.0
+}
+

trunk/dports/lang/python24/files/patch-Makefile.pre.in

@@ -14 +14 @@
         $(LDSHARED) -o $@ $(LIBRARY_OBJS) $(LIBC) $(LIBM)
  
-+libpython.2.4.1.dylib: $(LIBRARY_OBJS)
-+       $(LINKCC) -dynamiclib -install_name $(LIBDIR)/$@ -current_version 2.4.1 -compatibility_version 2.4 -o $@ -flat_namespace -undefined suppress $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM)
++libpython.2.4.2.dylib: $(LIBRARY_OBJS)
++       $(LINKCC) -dynamiclib -install_name $(LIBDIR)/$@ -current_version 2.4.2 -compatibility_version 2.4 -o $@ -flat_namespace -undefined suppress $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM)
 +
 +
@@ -27 +27 @@
 -       else    true; \
 +       else \
-+               if test -f libpython.2.4.1.dylib; then \
-+                       $(INSTALL_SHARED) libpython.2.4.1.dylib $(DESTDIR)$(LIBDIR)/libpython.2.4.1.dylib; \
++               if test -f libpython.2.4.2.dylib; then \
++                       $(INSTALL_SHARED) libpython.2.4.2.dylib $(DESTDIR)$(LIBDIR)/libpython.2.4.2.dylib; \
 +               else \
 +                       true; \

trunk/dports/lang/python24/files/patch-configure

@@ -1 @@
---- configure   Tue Mar 29 01:23:02 2005
-+++ ../../configure     Thu Mar 31 10:32:45 2005
-@@ -3826,7 +3826,12 @@
+--- work/Python-2.4.2/configure 2005-08-07 23:08:42.000000000 +0200
++++ configure   2005-12-11 01:27:37.000000000 +0100
+@@ -3828,7 +3828,12 @@
             ;;
         # is there any other compiler on Darwin besides gcc?
@@ -15 +15 @@
      esac
      ;;
-@@ -10362,8 +10367,8 @@
+@@ -10364,8 +10369,8 @@
                                 LDSHARED="$LDSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
                         else