fish: Switch to autoreconfigure and fix dirfd(3) detection

[Kamil Rytarowski <n54%gmx.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Sun Oct 22 00:54:43 2017 +0200
Changeset:	21bb0d5ddcc7868b630f04e48c44b72b240da8aa

Modified Files:
	fish/Makefile
	fish/distinfo
Added Files:
	fish/patches/patch-configure.ac
Removed Files:
	fish/patches/patch-configure

Log Message:
fish: Switch to autoreconfigure and fix dirfd(3) detection

Work in progress.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=21bb0d5ddcc7868b630f04e48c44b72b240da8aa

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 fish/Makefile                   |  5 ++++-
 fish/distinfo                   |  2 +-
 fish/patches/patch-configure    | 15 ---------------
 fish/patches/patch-configure.ac | 30 ++++++++++++++++++++++++++++++
 4 files changed, 35 insertions(+), 17 deletions(-)

diffs:
diff --git a/fish/Makefile b/fish/Makefile
index 9f0f82d6dd..8ec72a2a3a 100644
--- a/fish/Makefile
+++ b/fish/Makefile
@@ -15,7 +15,7 @@ USE_LANGUAGES+=		c c++
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=	--without-xsel
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake autoreconf autoconf automake
 
 EGDIR=			${PREFIX}/share/examples/fish
 INSTALL_ENV+=		EGDIR=${EGDIR}
@@ -42,6 +42,9 @@ PLIST_VARS+=	open
 PLIST.open=	yes
 .endif
 
+pre-configure:
+	${RUN} cd ${WRKSRC} && autoreconf -fiv
+
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/gettext-tools/buildlink3.mk"
 .include "../../lang/python/application.mk"
diff --git a/fish/distinfo b/fish/distinfo
index 1b09425226..d09481549e 100644
--- a/fish/distinfo
+++ b/fish/distinfo
@@ -5,6 +5,6 @@ RMD160 (fish-2.6.0.tar.gz) = f12093fef235487b7c02c245cbbd600750fff874
 SHA512 (fish-2.6.0.tar.gz) = d4ded5ce24600e85673a7bb016e9dc36bce999b27f40e6b1ce0b9ca49a421be2d444d9d2b6f178f6eee963e59daa4a65df4c3de2a8086a610486f758fcfb0ed1
 Size (fish-2.6.0.tar.gz) = 3575346 bytes
 SHA1 (patch-Makefile.in) = e2f5722d2e08e644e0813a662b64bbfe811a8ec6
-SHA1 (patch-configure) = 867ad2e2b93aa58fd93db05646efd9c0335c8bb8
+SHA1 (patch-configure.ac) = 862b6cef9e269531924965ce928031e063aa90ba
 SHA1 (patch-src_builtin.cpp) = b48a52d45ba545a92043e58dc554305670c7fcfc
 SHA1 (patch-src_wutil.cpp) = dbb73cf81d850c4b73598d0c711f68b0d74cabd6
diff --git a/fish/patches/patch-configure b/fish/patches/patch-configure
deleted file mode 100644
index 5c7c216566..0000000000
--- a/fish/patches/patch-configure
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-configure,v 1.4 2017/05/13 01:19:05 wen Exp $
-
-Expand variable where it's defined
-
---- configure.orig	2017-04-30 00:11:48.000000000 +0000
-+++ configure
-@@ -827,7 +827,7 @@ sharedstatedir='${prefix}/com'
- localstatedir='${prefix}/var'
- includedir='${prefix}/include'
- oldincludedir='/usr/include'
--docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
-+docdir='${datarootdir}/doc/'"${PACKAGE_TARNAME}"
- infodir='${datarootdir}/info'
- htmldir='${docdir}'
- dvidir='${docdir}'
diff --git a/fish/patches/patch-configure.ac b/fish/patches/patch-configure.ac
new file mode 100644
index 0000000000..63aba02188
--- /dev/null
+++ b/fish/patches/patch-configure.ac
@@ -0,0 +1,30 @@
+$NetBSD$
+
+--- configure.ac.orig	2017-06-03 12:45:13.000000000 +0000
++++ configure.ac
+@@ -323,7 +323,24 @@ AC_CHECK_FUNCS( wcslcpy lrand48_r killpg
+ AC_CHECK_FUNCS( backtrace_symbols getifaddrs )
+ AC_CHECK_FUNCS( futimens clock_gettime )
+ AC_CHECK_FUNCS( getpwent flock )
+-AC_CHECK_FUNCS( dirfd )
++
++AC_MSG_CHECKING([dirfd])
++AC_LINK_IFELSE([
++
++#include <dirent.h>
++
++DIR *dirp;
++
++int
++main(void)
++{
++	return dirfd(dirp);
++}
++], [ AC_MSG_RESULT([yes])
++     AC_DEFINE([HAVE_DIRFD], 1, [ Define to 1 if you have the `dirfd' function or macro. ])
++   ],
++   [ AC_MSG_RESULT([no])]
++)
+ 
+ AC_CHECK_DECL( [mkostemp], [ AC_CHECK_FUNCS([mkostemp]) ] )
+