Changeset 118664


Ignore:
Timestamp:
Apr 7, 2014, 8:05:56 PM (4 years ago)
Author:
mcalhoun@…
Message:

readline:

  • Update version 6.2.0->6.3.3
  • Remove some dead code
  • Reduce the number of links to older versions of the library.
  • Fixes #43266.
Location:
trunk/dports/devel/readline
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/devel/readline/Portfile

    r76438 r118664  
    55
    66name            readline
    7 set milestone   6.2
    8 set patchlevel  000
     7set milestone   6.3
     8set patchlevel  003
    99version         ${milestone}.${patchlevel}
    1010distname        ${name}-${milestone}
     
    3535}
    3636
     37# remove "-arch_only `/usr/bin/arch`"
    3738patchfiles-append  patch-shobj-conf.diff
    3839while {$i <= $lastpatch} {
     
    4142}
    4243
    43 post-patch {
    44     reinplace "s|__MACPORTS_PATCHLEVEL__|${patchlevel}|" ${worksrcpath}/support/shobj-conf
    45 }
    46 
    47 checksums       ${distfiles} \
    48                 md5     67948acb2ca081f23359d0256e9a271c \
    49                 sha1    a9761cd9c3da485eb354175fcc2fe35856bc43ac \
    50                 rmd160  5e7fb934e7c83cd0cd37463f7865bc257c3ea743
     44checksums           ${patchname}-001 \
     45                    rmd160  feb98062e9407192a65ab85d62e54b947f119d97 \
     46                    sha256  1a79bbb6eaee750e0d6f7f3d059b30a45fc54e8e388a8e05e9c3ae598590146f \
     47                    ${patchname}-002 \
     48                    rmd160  8985874564ff3d1630231e333e87d7d7596fbe63 \
     49                    sha256  39e304c7a526888f9e112e733848215736fb7b9d540729b9e31f3347b7a1e0a5 \
     50                    ${patchname}-003 \
     51                    rmd160  bc0765b54e0e97cacfe9ddbacc123b4ce007e350 \
     52                    sha256  ec41bdd8b00fd884e847708513df41d51b1243cecb680189e31b7173d01ca52f \
     53                    ${distfiles} \
     54                    rmd160  986262d811d9dbe1e38bc9d714853272967dca7e \
     55                    sha256  56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43
    5156
    5257configure.args  --with-curses
     
    6772}
    6873
    69 # Install symlinks to avoid breaking ports linked against the old versions
     74# Prior to 6.3, the "install_name" of shared libraries were
     75#    libreadline.X.Y.dylib and libhistory.X.Y.dylib instead of   
     76#    libreadline.X.dylib   and libhistory.X.dylib
     77# Therefore, when upgrading, symlinks were installed to avoid breaking ports linked
     78#    against old versions.
     79# This was fixed in 6.3.
     80# For 6.4, therefore, the following should probably be removed.
     81# Version 6.1 hasn't been around for over three years (76438), so only create a
     82#    link for 6.2.
    7083platform darwin {
    7184    post-destroot {
    7285        foreach f {history readline} {
    73             foreach v {5.0 5.1 5.2 6.1} {
     86            foreach v {6.2} {
    7487                ln -sf lib${f}.${milestone}.dylib ${destroot}${prefix}/lib/lib${f}.${v}.dylib
    7588            }
     
    8093if {[variant_isset universal]} {
    8194
    82     pre-configure {
    83         # Eliminate warning.
    84         configure.args-delete  --disable-dependency-tracking
    85     }
    86 
    8795    configure.args-append   bash_cv_must_reinstall_sighandlers=no \
    8896                            bash_cv_func_sigsetjmp=present \
  • trunk/dports/devel/readline/files/patch-shobj-conf.diff

    r77217 r118664  
    1 --- support/shobj-conf.orig     2009-10-29 00:20:21.000000000 +1100
    2 +++ support/shobj-conf  2011-03-24 13:43:03.000000000 +1100
    3 @@ -157,19 +157,19 @@
    4         ;;
    5  
    6  # Darwin/MacOS X
    7 -darwin[89]*|darwin10*)
    8 +darwin[89]*|darwin1[0-9]*)
    9         SHOBJ_STATUS=supported
    10         SHLIB_STATUS=supported
    11        
    12         SHOBJ_CFLAGS='-fno-common'
    13  
    14 -       SHOBJ_LD='MACOSX_DEPLOYMENT_TARGET=10.3 ${CC}'
    15 +       SHOBJ_LD='${CC}'
    16  
    17         SHLIB_LIBVERSION='$(SHLIB_MAJOR)$(SHLIB_MINOR).$(SHLIB_LIBSUFF)'
    18         SHLIB_LIBSUFF='dylib'
    19  
    20 -       SHOBJ_LDFLAGS='-dynamiclib -dynamic -undefined dynamic_lookup -arch_only `/usr/bin/arch`'
    21 -       SHLIB_XLDFLAGS='-dynamiclib -arch_only `/usr/bin/arch` -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v'
    22 +       SHOBJ_LDFLAGS='-dynamiclib -dynamic -undefined dynamic_lookup'
    23 +       SHLIB_XLDFLAGS='-dynamiclib -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v'
    24  
    25         SHLIB_LIBS='-lncurses'  # see if -lcurses works on MacOS X 10.1
    26         ;;
    27 @@ -186,11 +186,11 @@
    28         SHLIB_LIBSUFF='dylib'
    29  
    30         case "${host_os}" in
    31 -       darwin[789]*|darwin10*) SHOBJ_LDFLAGS=''
    32 -                       SHLIB_XLDFLAGS='-dynamiclib -arch_only `/usr/bin/arch` -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v'
    33 +       darwin[789]*|darwin1[0-9]*)     SHOBJ_LDFLAGS=''
    34 +                       SHLIB_XLDFLAGS='-dynamiclib -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v'
     1--- support/shobj-conf.orig     2014-02-23 19:06:29.000000000 -0700
     2+++ support/shobj-conf  2014-04-07 09:23:17.000000000 -0700
     3@@ -189,13 +189,13 @@
     4        darwin[1-7].*)
     5                SHOBJ_STATUS=unsupported
     6                SHOBJ_LDFLAGS='-dynamic'
     7-               SHLIB_XLDFLAGS='-arch_only `/usr/bin/arch` -install_name $(libdir)/`echo $@ | sed "s:\\..*::"`.$(SHLIB_MAJOR).$(SHLIB_LIBSUFF) -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v'
     8+               SHLIB_XLDFLAGS='-install_name $(libdir)/`echo $@ | sed "s:\\..*::"`.$(SHLIB_MAJOR).$(SHLIB_LIBSUFF) -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v'
     9                ;;
     10        # Darwin 8 == Mac OS X 10.4; Mac OS X 10.N == Darwin N+4
     11        *)
     12                case "${host_os}" in
     13                darwin[89]*|darwin1[012]*)
     14-                       SHOBJ_ARCHFLAGS='-arch_only `/usr/bin/arch`'
     15+                       SHOBJ_ARCHFLAGS=
    3516                        ;;
    36         *)              SHOBJ_LDFLAGS='-dynamic'
    37 -                       SHLIB_XLDFLAGS='-arch_only `/usr/bin/arch` -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v'
    38 +                       SHLIB_XLDFLAGS='-install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v'
    39                         ;;
    40         esac
    41  
     17                 *)     # Mac OS X 10.9 (Mavericks) and later
     18                        SHOBJ_ARCHFLAGS=
Note: See TracChangeset for help on using the changeset viewer.