Changeset 44176


Ignore:
Timestamp:
Dec 23, 2008, 4:46:09 AM (11 years ago)
Author:
blb@…
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

Location:
trunk/dports/lang/python24
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/lang/python24/Portfile

    r44028 r44176  
    44
    55name                    python24
    6 version                 2.4.5
    7 revision                4
     6version                 2.4.6
    87set major               [lindex [split $version .] 0]
    98set branch              [join [lrange [split ${version} .] 0 1] .]
     
    2322
    2423distname                Python-${version}
    25 extract.suffix          .tgz
     24use_bzip2               yes
    2625
    27 checksums               md5     750b652bfdd12675e102bbe25e5e9893 \
    28                         sha1    927c6e93ed3ea3bee4e07eff4b0f14254dc04147 \
    29                         rmd160  6c1c2905b166038fda5edb14baadbeb59acc8005
     26checksums               md5     76083277f6c7e4d78992f36d7ad9018d \
     27                        sha1    cb1972a554a458f6a26d3e047b359251865d7c96 \
     28                        rmd160  0687989193dec2ac108142759281be7ddcf7f31e
    3029
    3130patchfiles              patch-configure \
     
    6261}
    6362
    64 build.target            all libpython${branch}.dylib
     63build.target            all
    6564
    6665# Workaround for case-sensitive file systems
     
    8584        }
    8685
    87         file rename ${destroot}${framewdir}/lib/libpython${branch}.dylib ${destroot}${prefix}/lib
    88         ln -s ${prefix}/lib/libpython${branch}.dylib ${destroot}${framewdir}/lib/libpython${branch}.dylib
     86        ln -s ${framewdir}/Python ${destroot}${prefix}/lib/libpython${branch}.dylib
    8987
    9088        file rename ${destroot}${prefix}/share/man/man1/python.1 ${destroot}${prefix}/share/man/man1/python${branch}.1
     
    125123livecheck.url           ${homepage}download/releases/
    126124livecheck.regex         Python (${branch}.\[0-9\]+)
     125
  • trunk/dports/lang/python24/files/patch-Makefile.pre.in

    r27652 r44176  
    1010 LDLAST=                @LDLAST@
    1111 SGI_ABI=       @SGI_ABI@
    12 @@ -364,6 +364,10 @@
    13  libpython$(VERSION).sl: $(LIBRARY_OBJS)
    14         $(LDSHARED) -o $@ $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM)
    15  
    16 +libpython$(VERSION).dylib: $(LIBRARY_OBJS)
    17 +       $(LINKCC) -dynamiclib -install_name $(LIBDIR)/$@ -current_version $(VERSION) -compatibility_version $(VERSION) -o $@ -flat_namespace -undefined suppress $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM)
    18 +
    19 +
    20  # This rule is here for OPENSTEP/Rhapsody/MacOSX. It builds a temporary
    21  # minimal framework (not including the Lib directory and such) in the current
    22  # directory.
    23 @@ -655,7 +659,12 @@
    24                                 (cd $(DESTDIR)$(LIBDIR); $(LN) -sf $(INSTSONAME) libpython$(VERSION)$(SO)); \
    25                         fi \
    26                 fi; \
    27 -       else    true; \
    28 +       else \
    29 +               if test -f libpython$(VERSION).dylib; then \
    30 +                       $(INSTALL_SHARED) libpython$(VERSION).dylib $(DESTDIR)$(LIBDIR)/libpython$(VERSION).dylib; \
    31 +               else \
    32 +                       true; \
    33 +               fi \
    34         fi
    35  
    36  # Install the manual page
    37  
  • trunk/dports/lang/python24/files/patch-configure

    r24902 r44176  
    2424     LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
    2525 esac
    26 @@ -10472,8 +10477,8 @@
    27                                 LDSHARED="$LDSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
    28                         else
    29                                 # No framework, use the Python app as bundle-loader
    30 -                               BLDSHARED="$LDSHARED "'-bundle_loader $(BUILDPYTHON)'
    31 -                               LDSHARED="$LDSHARED "'-bundle_loader $(BINDIR)/python$(VERSION)$(EXE)'
    32 +                               BLDSHARED="$LDSHARED "'-flat_namespace -undefined suppress -bundle_loader $(BUILDPYTHON)'
    33 +                               LDSHARED="$LDSHARED "'-flat_namespace -undefined suppress -bundle_loader $(BINDIR)/python$(VERSION)$(EXE)'
    34                         fi
    35                 fi
    36                 ;;
Note: See TracChangeset for help on using the changeset viewer.