[pkgsrc/trunk]: pkgsrc/shells/fish fish: don't install own version of pcre2, ...

[maya <maya%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/883bf4d55ef8
branches:  trunk
changeset: 370849:883bf4d55ef8
user:      maya <maya%pkgsrc.org@localhost>
date:      Wed Oct 25 14:47:40 2017 +0000

description:
fish: don't install own version of pcre2, delete hopefully
unneeded file (from pcre2 configure)

bump pkgrevision

diffstat:

 shells/fish/Makefile                |   5 +++--
 shells/fish/patches/patch-configure |  15 ---------------
 2 files changed, 3 insertions(+), 17 deletions(-)

diffs (40 lines):

diff -r b56bce018b01 -r 883bf4d55ef8 shells/fish/Makefile
--- a/shells/fish/Makefile      Wed Oct 25 14:27:20 2017 +0000
+++ b/shells/fish/Makefile      Wed Oct 25 14:47:40 2017 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2017/10/25 09:32:38 maya Exp $
+# $NetBSD: Makefile,v 1.14 2017/10/25 14:47:40 maya Exp $
 
 DISTNAME=              fish-2.6.0
-PKGREVISION=           2
+PKGREVISION=           3
 CATEGORIES=            shells
 MASTER_SITES=          http://fishshell.com/files/${PKGVERSION_NOREV}/
 
@@ -46,6 +46,7 @@
 pre-configure:
        ${RUN} cd ${WRKSRC} && autoreconf -fiv
 
+.include "../../devel/pcre2/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/gettext-tools/buildlink3.mk"
 .include "../../lang/python/application.mk"
diff -r b56bce018b01 -r 883bf4d55ef8 shells/fish/patches/patch-configure
--- a/shells/fish/patches/patch-configure       Wed Oct 25 14:27:20 2017 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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}'