[54254] trunk/dports/shells/fish
raimue at macports.org
raimue at macports.org
Thu Jul 23 15:59:45 PDT 2009
Revision: 54254
http://trac.macports.org/changeset/54254
Author: raimue at macports.org
Date: 2009-07-23 15:59:44 -0700 (Thu, 23 Jul 2009)
Log Message:
-----------
shells/fish:
Update to 1.23.1, closes #20100 (maintainer timeout)
Modified Paths:
--------------
trunk/dports/shells/fish/Portfile
trunk/dports/shells/fish/files/patch-configure.ac.diff
Modified: trunk/dports/shells/fish/Portfile
===================================================================
--- trunk/dports/shells/fish/Portfile 2009-07-23 21:53:19 UTC (rev 54253)
+++ trunk/dports/shells/fish/Portfile 2009-07-23 22:59:44 UTC (rev 54254)
@@ -3,7 +3,7 @@
PortSystem 1.0
name fish
-version 1.23.0
+version 1.23.1
categories shells
platforms darwin
maintainers eridius openmaintainer
@@ -13,8 +13,9 @@
homepage http://www.fishshell.org/
master_sites http://www.fishshell.org/files/${version}/
-checksums md5 aa2f09bb54652b16bf4f7708848a7416 \
- sha1 8f2c4ca6b760dde5d4c4f8d745c97ce9e283879f
+checksums md5 ead6b7c6cdb21f35a3d4aa1d5fa596f1 \
+ sha1 3a6a5d0cfff348e5f9b1e7cd771865fd1dcd802e \
+ rmd160 820b7a57f31b98a6faf1520b356a06422891e787
use_bzip2 yes
livecheck.check regex
@@ -32,6 +33,7 @@
# <http://permalink.gmane.org/gmane.comp.shells.fish.user/1217>
# for details.
patchfiles-append patch-configure.ac.diff
+ use_autoconf yes
post-configure {
reinplace "s|LDFLAGS = |LDFLAGS= -liconv |g" "${worksrcpath}/Makefile"
}
Modified: trunk/dports/shells/fish/files/patch-configure.ac.diff
===================================================================
--- trunk/dports/shells/fish/files/patch-configure.ac.diff 2009-07-23 21:53:19 UTC (rev 54253)
+++ trunk/dports/shells/fish/files/patch-configure.ac.diff 2009-07-23 22:59:44 UTC (rev 54254)
@@ -1,49 +1,71 @@
---- configure.ac 2008-01-12 19:47:44.000000000 -0600
-+++ configure.ac 2008-07-19 00:56:11.000000000 -0500
-@@ -16,22 +16,22 @@
- # List of output variables produced by this configure script
- #
+diff -ru fish-1.23.1.orig/configure.ac fish-1.23.1/configure.ac
+--- configure.ac-old 2009-03-08 10:46:47.000000000 -0400
++++ configure.ac 2009-03-08 15:40:25.000000000 -0400
+@@ -90,43 +90,6 @@
+ fi
--AC_SUBST( docdir )
--AC_SUBST( HAVE_GETTEXT )
--AC_SUBST( LDFLAGS_FISH )
--AC_SUBST( LIBS_FISH )
--AC_SUBST( LIBS_FISH_INDENT )
--AC_SUBST( LIBS_FISH_PAGER )
--AC_SUBST( LIBS_FISHD )
--AC_SUBST( LIBS_MIMEDB )
--AC_SUBST( LIBS_SET_COLOR )
--AC_SUBST( localedir )
--AC_SUBST( optbindirs )
--AC_SUBST( prefix )
--AC_SUBST( SEQ_FALLBACK )
--AC_SUBST( XSEL )
--AC_SUBST( XSEL_MAN )
--AC_SUBST( XSEL_MAN_PATH )
-+AC_SUBST(docdir)
-+AC_SUBST(HAVE_GETTEXT)
-+AC_SUBST(LDFLAGS_FISH)
-+AC_SUBST(LIBS_FISH)
-+AC_SUBST(LIBS_FISH_INDENT)
-+AC_SUBST(LIBS_FISH_PAGER)
-+AC_SUBST(LIBS_FISHD)
-+AC_SUBST(LIBS_MIMEDB)
-+AC_SUBST(LIBS_SET_COLOR)
-+AC_SUBST(localedir)
-+AC_SUBST(optbindirs)
-+AC_SUBST(prefix)
-+AC_SUBST(SEQ_FALLBACK)
-+AC_SUBST(XSEL)
-+AC_SUBST(XSEL_MAN)
-+AC_SUBST(XSEL_MAN_PATH)
+-#
+-# Detect directories which may contain additional headers, libraries
+-# and commands. This needs to be done early - before Autoconf starts
+-# to mess with CFLAGS and all the other environemnt variables.
+-#
+-# This mostly helps OS X users, since fink usually installs out of
+-# tree and doesn't update CFLAGS.
+-#
+-
+-for i in /usr/pkg /sw /opt /opt/local; do
+-
+- AC_MSG_CHECKING([for $i/include include directory])
+- if test -d $i/include; then
+- AC_MSG_RESULT(yes)
+- CPPFLAGS="$CPPFLAGS -I$i/include/"
+- CFLAGS="$CFLAGS -I$i/include/"
+- else
+- AC_MSG_RESULT(no)
+- fi
+-
+- AC_MSG_CHECKING([for $i/lib library directory])
+- if test -d $i/lib; then
+- AC_MSG_RESULT(yes)
+- LDFLAGS="$LDFLAGS -L$i/lib/ -R$i/lib/"
+- else
+- AC_MSG_RESULT(no)
+- fi
+-
+- AC_MSG_CHECKING([for $i/bin command directory])
+- if test -d $i/bin; then
+- AC_MSG_RESULT(yes)
+- optbindirs="$optbindirs $i/bin"
+- else
+- AC_MSG_RESULT(no)
+- fi
+-
+-done
+
+
#
- # If needed, run autoconf to regenerate the configure file
-@@ -519,7 +519,6 @@
- fi
+@@ -521,7 +484,6 @@
+ # Check for libiconv_open if we can't find iconv_open. Silly OS X does
+ # weird macro magic for the sole purpose of amusing me.
+-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])] )] )
--AC_SEARCH_LIBS( iconv_open, iconv, , [AC_MSG_ERROR([Could not find an iconv implementation, needed to build fish])] )
LIBS_FISH=$LIBS
LIBS=$LIBS_COMMON
+@@ -547,7 +509,6 @@
+ if test x$local_gettext != xno; then
+ AC_SEARCH_LIBS( gettext, intl,,)
+ fi
+-AC_SEARCH_LIBS( iconv_open, iconv, , [AC_MSG_ERROR([Could not find an iconv implementation, needed to build fish])] )
+ LIBS_FISH_PAGER=$LIBS
+ LIBS=$LIBS_COMMON
+@@ -560,7 +521,6 @@
+ if test x$local_gettext != xno; then
+ AC_SEARCH_LIBS( gettext, intl,,)
+ fi
+-AC_SEARCH_LIBS( iconv_open, iconv, , [AC_MSG_ERROR([Could not find an iconv implementation, needed to build fish])] )
+ LIBS_FISHD=$LIBS
+ LIBS=$LIBS_COMMON
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090723/29deaeee/attachment.html>
More information about the macports-changes
mailing list