[38414] trunk/dports/shells/fish

[ryandesign at macports.org]

Revision: 38414
          http://trac.macosforge.org/projects/macports/changeset/38414
Author:   ryandesign at macports.org
Date:     2008-07-18 23:02:02 -0700 (Fri, 18 Jul 2008)
Log Message:
-----------
fish: fix build with newer autoconf, and use a patchfile instead of reinplace to remove the line from configure.ac; fixes #16012 (openmaintainer)

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

Added Paths:
-----------
    trunk/dports/shells/fish/files/
    trunk/dports/shells/fish/files/patch-configure.ac.diff

Modified: trunk/dports/shells/fish/Portfile
===================================================================
--- trunk/dports/shells/fish/Portfile	2008-07-19 01:39:52 UTC (rev 38413)
+++ trunk/dports/shells/fish/Portfile	2008-07-19 06:02:02 UTC (rev 38414)
@@ -31,9 +31,7 @@
     # 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"
-    }
+    patchfiles-append   patch-configure.ac.diff
     post-configure {
         reinplace "s|LDFLAGS = |LDFLAGS= -liconv |g" "${worksrcpath}/Makefile"
     }

Added: trunk/dports/shells/fish/files/patch-configure.ac.diff
===================================================================
--- trunk/dports/shells/fish/files/patch-configure.ac.diff	                        (rev 0)
+++ trunk/dports/shells/fish/files/patch-configure.ac.diff	2008-07-19 06:02:02 UTC (rev 38414)
@@ -0,0 +1,49 @@
+--- 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
+ #
+ 
+-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)
+ 
+ #
+ # If needed, run autoconf to regenerate the configure file
+@@ -519,7 +519,6 @@
+ fi
+ 
+ 
+-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
+ 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080718/b1490bbb/attachment.html