diff options
| author | jperkin <jperkin@pkgsrc.org> | 2017-05-15 13:46:47 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2017-05-15 13:46:47 +0000 |
| commit | 067fb680b08e9a1bb1b886a6b535549a4092f6dd (patch) | |
| tree | 776bdc62eaf30be18b22fdcd280304eae6f1467e /shells/fish | |
| parent | 3b21330f271fbba4bbe473fe9512a4aa814cf1d3 (diff) | |
| download | pkgsrc-067fb680b08e9a1bb1b886a6b535549a4092f6dd.tar.gz | |
Requires gettext-lib. SunOS needs an explcit -lintl and a patch to
handle malloc'd getcwd() properly.
Diffstat (limited to 'shells/fish')
| -rw-r--r-- | shells/fish/Makefile | 5 | ||||
| -rw-r--r-- | shells/fish/distinfo | 3 | ||||
| -rw-r--r-- | shells/fish/patches/patch-src_wutil.cpp | 18 |
3 files changed, 24 insertions, 2 deletions
diff --git a/shells/fish/Makefile b/shells/fish/Makefile index 86a0cb6b103..2be81bff726 100644 --- a/shells/fish/Makefile +++ b/shells/fish/Makefile @@ -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" diff --git a/shells/fish/distinfo b/shells/fish/distinfo index c5967534155..f455ea69ff6 100644 --- a/shells/fish/distinfo +++ b/shells/fish/distinfo @@ -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 diff --git a/shells/fish/patches/patch-src_wutil.cpp b/shells/fish/patches/patch-src_wutil.cpp new file mode 100644 index 00000000000..bc870026d02 --- /dev/null +++ b/shells/fish/patches/patch-src_wutil.cpp @@ -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); |