[44176] trunk/dports/lang/python24

[blb at macports.org]

Revision: 44176
          http://trac.macports.org/changeset/44176
Author:   blb at macports.org
Date:     2008-12-22 20:46:09 -0800 (Mon, 22 Dec 2008)
Log Message:
-----------
lang/python24 - version bump to 2.4.6, fix differing libpython and Python
framework files (ticket #16111), and switch to bzip2 to match with the
modules that use the same distfile

Modified Paths:
--------------
    trunk/dports/lang/python24/Portfile
    trunk/dports/lang/python24/files/patch-Makefile.pre.in
    trunk/dports/lang/python24/files/patch-configure

Modified: trunk/dports/lang/python24/Portfile
===================================================================
--- trunk/dports/lang/python24/Portfile	2008-12-23 03:52:00 UTC (rev 44175)
+++ trunk/dports/lang/python24/Portfile	2008-12-23 04:46:09 UTC (rev 44176)
@@ -3,8 +3,7 @@
 PortSystem 1.0
 
 name                    python24
-version                 2.4.5
-revision                4
+version                 2.4.6
 set major               [lindex [split $version .] 0]
 set branch              [join [lrange [split ${version} .] 0 1] .]
 categories              lang
@@ -22,11 +21,11 @@
                         ftp://ftp.python.jp/pub/python/${version}/
 
 distname                Python-${version}
-extract.suffix          .tgz
+use_bzip2               yes
 
-checksums               md5     750b652bfdd12675e102bbe25e5e9893 \
-                        sha1    927c6e93ed3ea3bee4e07eff4b0f14254dc04147 \
-                        rmd160  6c1c2905b166038fda5edb14baadbeb59acc8005
+checksums               md5     76083277f6c7e4d78992f36d7ad9018d \
+                        sha1    cb1972a554a458f6a26d3e047b359251865d7c96 \
+                        rmd160  0687989193dec2ac108142759281be7ddcf7f31e
 
 patchfiles              patch-configure \
                         patch-Makefile.pre.in \
@@ -61,7 +60,7 @@
            ${worksrcpath}/Mac/OSX/PythonLauncher/Makefile.in
 }
 
-build.target            all libpython${branch}.dylib
+build.target            all
 
 # Workaround for case-sensitive file systems
 post-build {
@@ -84,8 +83,7 @@
             ln -s ${prefix}/${dir}/python${branch} ${destroot}${framewdir}/${dir}/python${branch}
         }
 
-        file rename ${destroot}${framewdir}/lib/libpython${branch}.dylib ${destroot}${prefix}/lib
-        ln -s ${prefix}/lib/libpython${branch}.dylib ${destroot}${framewdir}/lib/libpython${branch}.dylib
+        ln -s ${framewdir}/Python ${destroot}${prefix}/lib/libpython${branch}.dylib
 
         file rename ${destroot}${prefix}/share/man/man1/python.1 ${destroot}${prefix}/share/man/man1/python${branch}.1
 
@@ -124,3 +122,4 @@
 livecheck.check         regex
 livecheck.url           ${homepage}download/releases/
 livecheck.regex         Python (${branch}.\[0-9\]+)
+

Modified: trunk/dports/lang/python24/files/patch-Makefile.pre.in
===================================================================
--- trunk/dports/lang/python24/files/patch-Makefile.pre.in	2008-12-23 03:52:00 UTC (rev 44175)
+++ trunk/dports/lang/python24/files/patch-Makefile.pre.in	2008-12-23 04:46:09 UTC (rev 44176)
@@ -9,29 +9,3 @@
  LDFLAGS=	@LDFLAGS@
  LDLAST=		@LDLAST@
  SGI_ABI=	@SGI_ABI@
-@@ -364,6 +364,10 @@
- libpython$(VERSION).sl: $(LIBRARY_OBJS)
- 	$(LDSHARED) -o $@ $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM)
- 
-+libpython$(VERSION).dylib: $(LIBRARY_OBJS)
-+	$(LINKCC) -dynamiclib -install_name $(LIBDIR)/$@ -current_version $(VERSION) -compatibility_version $(VERSION) -o $@ -flat_namespace -undefined suppress $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM)
-+
-+
- # This rule is here for OPENSTEP/Rhapsody/MacOSX. It builds a temporary
- # minimal framework (not including the Lib directory and such) in the current
- # directory.
-@@ -655,7 +659,12 @@
- 				(cd $(DESTDIR)$(LIBDIR); $(LN) -sf $(INSTSONAME) libpython$(VERSION)$(SO)); \
- 			fi \
- 		fi; \
--	else	true; \
-+	else \
-+		if test -f libpython$(VERSION).dylib; then \
-+			$(INSTALL_SHARED) libpython$(VERSION).dylib $(DESTDIR)$(LIBDIR)/libpython$(VERSION).dylib; \
-+		else \
-+			true; \
-+		fi \
- 	fi
- 
- # Install the manual page
- 

Modified: trunk/dports/lang/python24/files/patch-configure
===================================================================
--- trunk/dports/lang/python24/files/patch-configure	2008-12-23 03:52:00 UTC (rev 44175)
+++ trunk/dports/lang/python24/files/patch-configure	2008-12-23 04:46:09 UTC (rev 44176)
@@ -23,14 +23,3 @@
      LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
      LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
  esac
-@@ -10472,8 +10477,8 @@
- 				LDSHARED="$LDSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(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 -bundle_loader $(BUILDPYTHON)'
-+				LDSHARED="$LDSHARED "'-flat_namespace -undefined suppress -bundle_loader $(BINDIR)/python$(VERSION)$(EXE)'
- 			fi
- 		fi
- 		;;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20081222/103c45d7/attachment.html>