Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/shells
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv598
Modified Files:
fish.info fish.patch
Log Message:
New upstream version.
Index: fish.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/shells/fish.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- fish.info 21 Aug 2008 19:34:48 -0000 1.1
+++ fish.info 8 Mar 2009 19:43:51 -0000 1.2
@@ -1,18 +1,19 @@
Package: fish
-Version: 1.23.0
+Version: 1.23.1
Revision: 1
Description: Friendly interactive shell
Source: http://www.fishshell.org/files/%v/%n-%v.tar.bz2
-Source-MD5: aa2f09bb54652b16bf4f7708848a7416
+Source-MD5: ead6b7c6cdb21f35a3d4aa1d5fa596f1
PatchFile: %n.patch
-PatchFile-MD5: 43eca968c5e5f47a18747377b54aa2df
+PatchFile-MD5: 6bb3647159792f9bed425dbefa6284db
-SetLDFLAGS: -liconv
+SetLDFLAGS: -L%p/lib -liconv
BuildDepends: <<
autoconf (>= 2.62-2),
+ automake1.10,
fink (>= 0.24.12),
gettext-bin,
libgettext3-dev,
@@ -27,6 +28,11 @@
ConfigureParams: --without-xsel docdir='%p/share/doc/%n'
+CompileScript: <<
+ autoreconf -fiv
+ %{default_script}
+<<
+
InstallScript: make install DESTDIR=%d
DocFiles: ChangeLog README
Index: fish.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/shells/fish.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- fish.patch 21 Aug 2008 19:34:48 -0000 1.1
+++ fish.patch 8 Mar 2009 19:43:51 -0000 1.2
@@ -1,49 +1,19 @@
-diff -ru fish-1.23.0.orig/configure.ac fish-1.23.0/configure.ac
---- fish-1.23.0.orig/configure.ac 2008-01-12 20:47:44.000000000 -0500
-+++ fish-1.23.0/configure.ac 2008-08-21 11:16:36.000000000 -0400
-@@ -16,22 +16,22 @@
- # List of output variables produced by this configure script
- #
-
--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)
+diff -ru fish-1.23.1.orig/configure.ac fish-1.23.1/configure.ac
+--- fish-1.23.1.orig/configure.ac 2009-03-08 10:46:47.000000000 -0400
++++ fish-1.23.1/configure.ac 2009-03-08 15:40:25.000000000 -0400
+@@ -90,43 +90,6 @@
+ fi
- #
- # If needed, run autoconf to regenerate the configure file
-@@ -99,34 +99,6 @@
- # tree and doesn't update CFLAGS.
- #
+-#
+-# 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])
@@ -75,11 +45,27 @@
#
-@@ -519,7 +491,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
------------------------------------------------------------------------------
Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA
-OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise
-Strategies to boost innovation and cut costs with open source participation
-Receive a $600 discount off the registration fee with the source code: SFAD
http://p.sf.net/sfu/XcvMzF8H
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
