Changeset 54254


Ignore:
Timestamp:
Jul 23, 2009, 10:59:44 PM (10 years ago)
Author:
raimue@…
Message:

shells/fish:
Update to 1.23.1, closes #20100 (maintainer timeout)

Location:
trunk/dports/shells/fish
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/shells/fish/Portfile

    r50980 r54254  
    44
    55name                    fish
    6 version                 1.23.0
     6version                 1.23.1
    77categories              shells
    88platforms               darwin
     
    1414homepage                http://www.fishshell.org/
    1515master_sites            http://www.fishshell.org/files/${version}/
    16 checksums               md5 aa2f09bb54652b16bf4f7708848a7416 \
    17                         sha1 8f2c4ca6b760dde5d4c4f8d745c97ce9e283879f
     16checksums               md5     ead6b7c6cdb21f35a3d4aa1d5fa596f1 \
     17                        sha1    3a6a5d0cfff348e5f9b1e7cd771865fd1dcd802e \
     18                        rmd160  820b7a57f31b98a6faf1520b356a06422891e787
    1819use_bzip2               yes
    1920
     
    3334    # for details.
    3435    patchfiles-append   patch-configure.ac.diff
     36    use_autoconf        yes
    3537    post-configure {
    3638        reinplace "s|LDFLAGS = |LDFLAGS= -liconv |g" "${worksrcpath}/Makefile"
  • trunk/dports/shells/fish/files/patch-configure.ac.diff

    r38414 r54254  
    1 --- configure.ac        2008-01-12 19:47:44.000000000 -0600
    2 +++ configure.ac        2008-07-19 00:56:11.000000000 -0500
    3 @@ -16,22 +16,22 @@
    4  # List of output variables produced by this configure script
    5  #
    6  
    7 -AC_SUBST( docdir )
    8 -AC_SUBST( HAVE_GETTEXT )
    9 -AC_SUBST( LDFLAGS_FISH )
    10 -AC_SUBST( LIBS_FISH )
    11 -AC_SUBST( LIBS_FISH_INDENT )
    12 -AC_SUBST( LIBS_FISH_PAGER )
    13 -AC_SUBST( LIBS_FISHD )
    14 -AC_SUBST( LIBS_MIMEDB )
    15 -AC_SUBST( LIBS_SET_COLOR )
    16 -AC_SUBST( localedir )
    17 -AC_SUBST( optbindirs )
    18 -AC_SUBST( prefix )
    19 -AC_SUBST( SEQ_FALLBACK )
    20 -AC_SUBST( XSEL )
    21 -AC_SUBST( XSEL_MAN )
    22 -AC_SUBST( XSEL_MAN_PATH )
    23 +AC_SUBST(docdir)
    24 +AC_SUBST(HAVE_GETTEXT)
    25 +AC_SUBST(LDFLAGS_FISH)
    26 +AC_SUBST(LIBS_FISH)
    27 +AC_SUBST(LIBS_FISH_INDENT)
    28 +AC_SUBST(LIBS_FISH_PAGER)
    29 +AC_SUBST(LIBS_FISHD)
    30 +AC_SUBST(LIBS_MIMEDB)
    31 +AC_SUBST(LIBS_SET_COLOR)
    32 +AC_SUBST(localedir)
    33 +AC_SUBST(optbindirs)
    34 +AC_SUBST(prefix)
    35 +AC_SUBST(SEQ_FALLBACK)
    36 +AC_SUBST(XSEL)
    37 +AC_SUBST(XSEL_MAN)
    38 +AC_SUBST(XSEL_MAN_PATH)
    39  
    40  #
    41  # If needed, run autoconf to regenerate the configure file
    42 @@ -519,7 +519,6 @@
     1diff -ru fish-1.23.1.orig/configure.ac fish-1.23.1/configure.ac
     2--- configure.ac-old    2009-03-08 10:46:47.000000000 -0400
     3+++ configure.ac        2009-03-08 15:40:25.000000000 -0400
     4@@ -90,43 +90,6 @@
    435 fi
    446 
    457 
    46 -AC_SEARCH_LIBS( iconv_open, iconv, , [AC_MSG_ERROR([Could not find an iconv implementation, needed to build fish])] )
     8-#
     9-# Detect directories which may contain additional headers, libraries
     10-# and commands. This needs to be done early - before Autoconf starts
     11-# to mess with CFLAGS and all the other environemnt variables.
     12-#
     13-# This mostly helps OS X users, since fink usually installs out of
     14-# tree and doesn't update CFLAGS.
     15-#
     16-
     17-for i in /usr/pkg /sw /opt /opt/local; do
     18-
     19-       AC_MSG_CHECKING([for $i/include include directory])
     20-       if test -d $i/include; then
     21-               AC_MSG_RESULT(yes)
     22-               CPPFLAGS="$CPPFLAGS -I$i/include/"
     23-               CFLAGS="$CFLAGS -I$i/include/"
     24-       else
     25-       AC_MSG_RESULT(no)
     26-       fi
     27-
     28-       AC_MSG_CHECKING([for $i/lib library directory])
     29-       if test -d $i/lib; then
     30-               AC_MSG_RESULT(yes)
     31-               LDFLAGS="$LDFLAGS -L$i/lib/ -R$i/lib/"
     32-       else
     33-               AC_MSG_RESULT(no)
     34-       fi
     35-
     36-       AC_MSG_CHECKING([for $i/bin command directory])
     37-       if test -d $i/bin; then
     38-               AC_MSG_RESULT(yes)
     39-               optbindirs="$optbindirs $i/bin"
     40-       else
     41-               AC_MSG_RESULT(no)
     42-       fi
     43-
     44-done
     45 
     46 
     47 #
     48@@ -521,7 +484,6 @@
     49 
     50 # Check for libiconv_open if we can't find iconv_open. Silly OS X does
     51 # weird macro magic for the sole purpose of amusing me.
     52-AC_SEARCH_LIBS( iconv_open, iconv, , [AC_SEARCH_LIBS( libiconv_open, iconv, , [AC_MSG_ERROR([Could not find an iconv implementation, needed to build fish])] )] )
     53 
    4754 LIBS_FISH=$LIBS
    4855 LIBS=$LIBS_COMMON
     56@@ -547,7 +509,6 @@
     57 if test x$local_gettext != xno; then
     58        AC_SEARCH_LIBS( gettext, intl,,)
     59 fi
     60-AC_SEARCH_LIBS( iconv_open, iconv, , [AC_MSG_ERROR([Could not find an iconv implementation, needed to build fish])] )
     61 LIBS_FISH_PAGER=$LIBS
     62 LIBS=$LIBS_COMMON
    4963 
     64@@ -560,7 +521,6 @@
     65 if test x$local_gettext != xno; then
     66        AC_SEARCH_LIBS( gettext, intl,,)
     67 fi
     68-AC_SEARCH_LIBS( iconv_open, iconv, , [AC_MSG_ERROR([Could not find an iconv implementation, needed to build fish])] )
     69 LIBS_FISHD=$LIBS
     70 LIBS=$LIBS_COMMON
     71 
Note: See TracChangeset for help on using the changeset viewer.