[107633] trunk/dports/shells/fish
and.damore at macports.org
and.damore at macports.org
Wed Jul 3 05:27:26 PDT 2013
Revision: 107633
https://trac.macports.org/changeset/107633
Author: and.damore at macports.org
Date: 2013-07-03 05:27:26 -0700 (Wed, 03 Jul 2013)
Log Message:
-----------
port fish: update to fishfish (new development) 2.0.0, Portfile made tidier, dropped patchfiles not needed anymore
Modified Paths:
--------------
trunk/dports/shells/fish/Portfile
trunk/dports/shells/fish/files/patch-share_config_fish.diff
Removed Paths:
-------------
trunk/dports/shells/fish/files/patch-alias_function.diff
trunk/dports/shells/fish/files/patch-configure.ac.diff
trunk/dports/shells/fish/files/patch-fix-freeze.diff
Modified: trunk/dports/shells/fish/Portfile
===================================================================
--- trunk/dports/shells/fish/Portfile 2013-07-03 11:33:53 UTC (rev 107632)
+++ trunk/dports/shells/fish/Portfile 2013-07-03 12:27:26 UTC (rev 107633)
@@ -5,24 +5,21 @@
name fish
license GPL-2
-version 1.23.1
-revision 6
+version 2.0.0
categories shells
platforms darwin
maintainers nomaintainer
-description user friendly command line shell for UNIX-like \
- operating systems
-long_description fish is a user friendly command line shell for \
- UNIX-like operating systems like Darwin.
+description A command line shell for the 90s
+long_description fish is a smart and user-friendly command line shell for OS X, Linux, and the rest of the family
homepage http://fishshell.com/
master_sites ${homepage}files/${version}/
-use_bzip2 yes
-checksums md5 ead6b7c6cdb21f35a3d4aa1d5fa596f1 \
- sha1 3a6a5d0cfff348e5f9b1e7cd771865fd1dcd802e \
- rmd160 820b7a57f31b98a6faf1520b356a06422891e787
+worksrcdir fish
+checksums md5 fe5907e6af61607d4128ce891a1f6501 \
+ sha1 2d28553e2ff975f8e5fed6b266f7a940493b6636 \
+ rmd160 23848c1e577abb6893d253c1253fee98a53f0c74
depends_build port:doxygen \
path:bin/dot:graphviz
@@ -30,35 +27,15 @@
port:ncurses \
port:gettext
-configure.ccache no
-configure.args --mandir=${prefix}/share/man \
- --docdir=${prefix}/share/doc/${name} \
- --without-xsel
-# ticket #29839
-patchfiles patch-fix-freeze.diff \
- patch-share_config_fish.diff \
- patch-alias_function.diff \
- patch-proc_c.diff
-# patch-alias_function.diff and patch-proc_c.diff should be in upstream development tree
-# remember to delete them when version from github.com/fish-shell becomes stable
+use_autoconf yes
+# MEMO: patchfile patch-proc_c.diff could be still needed
+patchfiles patch-share_config_fish.diff
+
post-patch {
- reinplace "s|@@PREFIX@@|${prefix}/bin|g" "${worksrcpath}/share/config.fish.in"
+ reinplace "s|@@PREFIX@@|${prefix}/bin|g" "${worksrcpath}/share/config.fish"
}
-platform darwin {
- # there's something wonky about the libiconv headers installed by
- # macports that prevents autoconf from detecting libiconv, so i
- # have to fake it. See
- # <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"
- }
-}
-
notes "
To set MacPorts' ${name} as default login shell, run:
@@ -75,4 +52,4 @@
"
livecheck.type regex
-livecheck.regex fish-(.*?).tar.bz2
+livecheck.regex fish-(.*?).tar.gz
Deleted: trunk/dports/shells/fish/files/patch-alias_function.diff
===================================================================
--- trunk/dports/shells/fish/files/patch-alias_function.diff 2013-07-03 11:33:53 UTC (rev 107632)
+++ trunk/dports/shells/fish/files/patch-alias_function.diff 2013-07-03 12:27:26 UTC (rev 107633)
@@ -1,14 +0,0 @@
---- share/functions/alias.fish.orig 2012-11-07 14:52:32.000000000 +0100
-+++ share/functions/alias.fish 2012-11-07 14:52:44.000000000 +0100
-@@ -14,9 +14,8 @@
- switch (count $argv)
-
- case 1
-- set -l tmp (echo $argv|sed -e "s/\([^=]\)=/\1\n/")
-- set name $tmp[1]
-- set body $tmp[2]
-+ set name (echo $argv| cut -d\= -f 1)
-+ set body (echo $argv| cut -d\= -f 2-)
-
- case 2
- set name $argv[1]
Deleted: trunk/dports/shells/fish/files/patch-configure.ac.diff
===================================================================
--- trunk/dports/shells/fish/files/patch-configure.ac.diff 2013-07-03 11:33:53 UTC (rev 107632)
+++ trunk/dports/shells/fish/files/patch-configure.ac.diff 2013-07-03 12:27:26 UTC (rev 107633)
@@ -1,71 +0,0 @@
-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
-
-
--#
--# 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
-
-
- #
-@@ -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])] )] )
-
- 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
-
Deleted: trunk/dports/shells/fish/files/patch-fix-freeze.diff
===================================================================
--- trunk/dports/shells/fish/files/patch-fix-freeze.diff 2013-07-03 11:33:53 UTC (rev 107632)
+++ trunk/dports/shells/fish/files/patch-fix-freeze.diff 2013-07-03 12:27:26 UTC (rev 107633)
@@ -1,13 +0,0 @@
---- proc.c.orig 2011-06-15 17:10:33.000000000 -0300
-+++ proc.c 2011-06-15 17:10:43.000000000 -0300
-@@ -822,8 +822,8 @@
- int retval;
- struct timeval tv;
-
-- tv.tv_sec=5;
-- tv.tv_usec=0;
-+ tv.tv_sec=0;
-+ tv.tv_usec=10000;
-
- retval =select( maxfd+1, &fds, 0, 0, &tv );
- return retval > 0;
Modified: trunk/dports/shells/fish/files/patch-share_config_fish.diff
===================================================================
--- trunk/dports/shells/fish/files/patch-share_config_fish.diff 2013-07-03 11:33:53 UTC (rev 107632)
+++ trunk/dports/shells/fish/files/patch-share_config_fish.diff 2013-07-03 12:27:26 UTC (rev 107633)
@@ -1,24 +1,23 @@
---- share/config.fish.in.orig 2012-11-04 20:14:03.000000000 +0100
-+++ share/config.fish.in 2012-11-04 20:16:31.000000000 +0100
-@@ -88,6 +88,21 @@
- end
- end
+--- share/config.fish.orig 2013-07-03 12:24:07.000000000 +0200
++++ share/config.fish 2013-07-03 12:24:36.000000000 +0200
+@@ -91,6 +91,20 @@
+ for pathfile in /etc/paths.d/* ; __fish_load_path_helper_paths < $pathfile ; end
+ functions -e __fish_load_path_helper_paths
+# MacPorts specific PATH setting, move ${prefix}/bin at PATH's head
-+set MP_PREFIX @@PREFIX@@
++set MP_PREFIX /opt/local/bin
+if contains $MP_PREFIX $PATH
+ set -e MP_PATH
-+ for i in $PATH
-+ if test $i != /opt/local/bin
++ for path_component in $PATH
++ if test $path_component != /opt/local/bin
+ set MP_PATH $MP_PATH $i
+ end
+ end
+ set MP_PATH $MP_PREFIX $MP_PATH
++ set PATH $MP_PATH
++ set -e MP_PATH
+end
-+set PATH $MP_PATH
-+set -e MP_PATH
+set -e MP_PREFIX
-+
+
#
# Launch debugger on SIGTRAP
- #
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130703/c3c0f1e1/attachment.html>
More information about the macports-changes
mailing list