[43000] trunk/dports/lang/python25

[blb at macports.org]

Revision: 43000
          http://trac.macports.org/changeset/43000
Author:   blb at macports.org
Date:     2008-12-02 22:04:11 -0800 (Tue, 02 Dec 2008)
Log Message:
-----------
lang/python25 - fix issue where the framework and library in ${prefix}/lib
were considered different, causing some thing to crash; ticket #16111
(maintainer timeout)

Modified Paths:
--------------
    trunk/dports/lang/python25/Portfile
    trunk/dports/lang/python25/files/patch-Makefile.pre.in.diff

Modified: trunk/dports/lang/python25/Portfile
===================================================================
--- trunk/dports/lang/python25/Portfile	2008-12-03 05:51:46 UTC (rev 42999)
+++ trunk/dports/lang/python25/Portfile	2008-12-03 06:04:11 UTC (rev 43000)
@@ -4,7 +4,7 @@
 
 name                    python25
 version                 2.5.2
-revision                6
+revision                7
 set major               2
 set branch              2.5
 categories              lang
@@ -58,7 +58,7 @@
                 Mac/PythonLauncher/Makefile.in
 }
 
-build.target            all libpython${branch}.dylib
+build.target            all
 
 # TODO: From python24, do we still need this?
 # Workaround for case-sensitive file systems
@@ -82,8 +82,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
 

Modified: trunk/dports/lang/python25/files/patch-Makefile.pre.in.diff
===================================================================
--- trunk/dports/lang/python25/files/patch-Makefile.pre.in.diff	2008-12-03 05:51:46 UTC (rev 42999)
+++ trunk/dports/lang/python25/files/patch-Makefile.pre.in.diff	2008-12-03 06:04:11 UTC (rev 43000)
@@ -11,30 +11,6 @@
  	esac
  
  # Build static library
-@@ -376,6 +376,13 @@
- libpython$(VERSION).sl: $(LIBRARY_OBJS)
- 	$(LDSHARED) -o $@ $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM)
- 
-+libpython$(VERSION).dylib: $(LIBRARY)
-+	/usr/bin/libtool -o $@ -dynamic $(OTHER_LIBTOOL_OPT) \
-+		-all_load $(LIBRARY) -single_module \
-+		-install_name $(LIBDIR)/$@ \
-+		-compatibility_version $(VERSION) \
-+		-current_version $(VERSION) -lSystem -lSystemStubs $(LDFLAGS)
-+
- # 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.
-@@ -684,6 +691,9 @@
- 			fi \
- 		fi; \
- 	else	true; \
-+	fi; \
-+	if test -f libpython$(VERSION).dylib; then \
-+		$(INSTALL_SHARED) libpython$(VERSION).dylib $(DESTDIR)$(LIBDIR); \
- 	fi
- 
- # Install the manual page
 @@ -894,7 +904,7 @@
  # Install the dynamically loadable modules
  # This goes into $(exec_prefix)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20081202/813dd86a/attachment-0001.html>