[22169] trunk/dports/shells/fish/Portfile

[source_changes at macosforge.org]

Revision: 22169
          http://trac.macosforge.org/projects/macports/changeset/22169
Author:   pipping at macports.org
Date:     2007-02-20 12:58:34 -0800 (Tue, 20 Feb 2007)

Log Message:
-----------
 * apply patch submitted by zoarre.37258548 at bloglines.com

Modified Paths:
--------------
    trunk/dports/shells/fish/Portfile

Modified: trunk/dports/shells/fish/Portfile
===================================================================
--- trunk/dports/shells/fish/Portfile	2007-02-20 20:57:32 UTC (rev 22168)
+++ trunk/dports/shells/fish/Portfile	2007-02-20 20:58:34 UTC (rev 22169)
@@ -1,3 +1,4 @@
+
 # $Id$
 
 PortSystem 1.0
@@ -3,5 +4,5 @@
 
 name			fish
-version			1.21.11
+version			1.22.3
 categories		shells
 platforms		darwin
@@ -11,22 +12,28 @@
 long_description	fish is a user friendly command line shell for UNIX-like \
 			operating systems like Darwin.
 
-homepage		http://roo.no-ip.org/fish/
-master_sites	http://roo.no-ip.org/fish/files/${version}/
-checksums		md5 522fba3b00939f9c36f2eac14ffc10a6
+homepage		http://www.fishshell.org/
+master_sites		http://www.fishshell.org/files/${version}/
+checksums		md5 016a5944861ea48e363521c240834415
 use_bzip2		yes
 
 depends_build	bin:doxygen:doxygen
+depends_lib	lib:libiconv:libiconv lib:libncurses:ncurses lib:libintl:gettext
 
 configure.args	--mandir=${prefix}/share/man
 
 platform darwin 8 {
-	configure.env CC=/usr/bin/gcc-4.0 CPP=/usr/bin/cpp-4.0 CXX=/usr/bin/g++-4.0
-    # The following fixes a build bug in 1.21.11. Fixed for 1.21.12.
-    # See http://comments.gmane.org/gmane.comp.shells.fish.user/672
+    # 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.
+    pre-configure {
+	reinplace "s|AC_SEARCH_LIBS( iconv_open|#AC_SEARCH_LIBS( iconv_open|g" "${worksrcpath}/configure.ac"
+    }
     post-configure {
-        reinplace "s|-D_XOPEN_SOURCE=600 -D_POSIX_C_SOURCE=200112L||" \
-        "${worksrcpath}/Makefile"
+	reinplace "s|LDFLAGS= |LDFLAGS= -liconv |g" "${worksrcpath}/Makefile"
     }
+	configure.env CC=/usr/bin/gcc-4.0 CPP=/usr/bin/cpp-4.0 CXX=/usr/bin/g++-4.0
 }
 

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070220/061b9e75/attachment.html