CVS commit: pkgsrc/shells/fish

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Mon May 15 13:46:47 UTC 2017

Modified Files:
        pkgsrc/shells/fish: Makefile distinfo
Added Files:
        pkgsrc/shells/fish/patches: patch-src_wutil.cpp

Log Message:
Requires gettext-lib.  SunOS needs an explcit -lintl and a patch to
handle malloc'd getcwd() properly.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/shells/fish/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/shells/fish/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/shells/fish/patches/patch-src_wutil.cpp

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

Modified files:

Index: pkgsrc/shells/fish/Makefile
diff -u pkgsrc/shells/fish/Makefile:1.8 pkgsrc/shells/fish/Makefile:1.9
--- pkgsrc/shells/fish/Makefile:1.8     Sat May 13 01:19:05 2017
+++ pkgsrc/shells/fish/Makefile Mon May 15 13:46:47 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2017/05/13 01:19:05 wen Exp $
+# $NetBSD: Makefile,v 1.9 2017/05/15 13:46:47 jperkin Exp $
 
 FISHVER=               2.5.0
 DISTNAME=              fish-${FISHVER}
@@ -26,6 +26,8 @@ PKG_SHELL=            bin/fish
 REPLACE_PYTHON+=       share/tools/*.py
 REPLACE_PYTHON+=       share/tools/web_config/webconfig.py
 
+LDFLAGS.SunOS+=                -lintl
+
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "NetBSD" && exists(/usr/include/execinfo.h)
@@ -35,6 +37,7 @@ CXXFLAGS.NetBSD+=     -fpermissive
 LDFLAGS+=              -lexecinfo
 .endif
 
+.include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../lang/python/application.mk"
 .include "../../mk/curses.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/shells/fish/distinfo
diff -u pkgsrc/shells/fish/distinfo:1.6 pkgsrc/shells/fish/distinfo:1.7
--- pkgsrc/shells/fish/distinfo:1.6     Sat May 13 01:19:05 2017
+++ pkgsrc/shells/fish/distinfo Mon May 15 13:46:47 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2017/05/13 01:19:05 wen Exp $
+$NetBSD: distinfo,v 1.7 2017/05/15 13:46:47 jperkin Exp $
 
 SHA1 (fish-2.5.0.tar.gz) = ec52debe0a829b9df29f658697523af7c18ee778
 RMD160 (fish-2.5.0.tar.gz) = 7c206d612f4316900dfecfe46b9a3f95411c4d79
@@ -7,3 +7,4 @@ Size (fish-2.5.0.tar.gz) = 3496831 bytes
 SHA1 (patch-Makefile.in) = e2f5722d2e08e644e0813a662b64bbfe811a8ec6
 SHA1 (patch-configure) = 867ad2e2b93aa58fd93db05646efd9c0335c8bb8
 SHA1 (patch-src_builtin.cpp) = b48a52d45ba545a92043e58dc554305670c7fcfc
+SHA1 (patch-src_wutil.cpp) = dbb73cf81d850c4b73598d0c711f68b0d74cabd6

Added files:

Index: pkgsrc/shells/fish/patches/patch-src_wutil.cpp
diff -u /dev/null pkgsrc/shells/fish/patches/patch-src_wutil.cpp:1.1
--- /dev/null   Mon May 15 13:46:47 2017
+++ pkgsrc/shells/fish/patches/patch-src_wutil.cpp      Mon May 15 13:46:47 2017
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_wutil.cpp,v 1.1 2017/05/15 13:46:47 jperkin Exp $
+
+SunOS needs an explicit size to getcwd().
+
+--- src/wutil.cpp.orig 2017-02-03 01:46:58.000000000 +0000
++++ src/wutil.cpp
+@@ -129,7 +129,11 @@ bool wreaddir_for_dirs(DIR *dir, wcstrin
+ const wcstring wgetcwd() {
+     wcstring retval;
+ 
++#ifdef __sun
++    char *res = getcwd(NULL, PATH_MAX);
++#else
+     char *res = getcwd(NULL, 0);
++#endif
+     if (res) {
+         retval = str2wcstring(res);
+         free(res);