Minix/pkgsrc-ng
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Import of pkgsrc-2015Q1

Browse Source
This commit is contained in:
Lionel Sambuc
2015-04-22 14:34:26 +02:00
committed by Lionel Sambuc
parent 9a8c06dafb
commit 4af1cdf7a9
25114 changed files with 870550 additions and 795435 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
shells/Makefile
View File

@@ -1,9 +1,10 @@
# $NetBSD: Makefile,v 1.51 2013/01/31 09:36:01 wiz Exp $
# $NetBSD: Makefile,v 1.54 2015/02/08 17:32:08 wiz Exp $
#
COMMENT= Shells
SUBDIR+= ast-ksh
SUBDIR+= autojump
SUBDIR+= bash
SUBDIR+= bash-completion
SUBDIR+= bash2
@@ -13,10 +14,10 @@ SUBDIR+= eltclsh
SUBDIR+= es
SUBDIR+= esh
SUBDIR+= fish
SUBDIR+= git-sh
SUBDIR+= heirloom-sh
SUBDIR+= lshell
SUBDIR+= mksh
SUBDIR+= mudsh
SUBDIR+= nologinmsg
SUBDIR+= osh
SUBDIR+= pdksh

7
shells/ast-ksh/Makefile
View File

@@ -1,6 +1,7 @@
# $NetBSD: Makefile,v 1.20 2012/09/11 23:25:07 asau Exp $
#
# $NetBSD: Makefile,v 1.22 2014/11/06 12:25:36 joerg Exp $
.include "Makefile.common"
.include "../../shells/ast-ksh/Makefile.common"
PKGREVISION= 1
.include "../../mk/bsd.pkg.mk"

7
shells/ast-ksh/Makefile.common
View File

@@ -1,4 +1,7 @@
# $NetBSD: Makefile.common,v 1.32 2013/04/08 11:17:22 rodent Exp $
# $NetBSD: Makefile.common,v 1.33 2014/07/03 15:00:41 wiz Exp $
#
# used by shells/ast-ksh/Makefile
# used by shells/static-ast-ksh/Makefile
DISTNAME= ast-ksh-${ASTKSH_VERSION}
PKGNAME= ast-ksh-${ASTKSH_VERSION:S/-//g}
@@ -58,7 +61,7 @@ do-install:
${INSTALL_PROGRAM} ${WRKSRC}/arch/"$${arch}"/bin/ksh \
${DESTDIR}${PREFIX}/bin/ksh93; \
${INSTALL_MAN} ${WRKSRC}/arch/"$${arch}"/man/man1/sh.1 \
${DESTDIR}${PREFIX}/man/man1/ksh93.1
${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/ksh93.1
# Part of regression test
do-test:

8
shells/ast-ksh/distinfo
View File

@@ -1,4 +1,4 @@
$NetBSD: distinfo,v 1.14 2012/10/06 12:23:36 ryoon Exp $
$NetBSD: distinfo,v 1.18 2014/11/11 15:40:37 joerg Exp $
SHA1 (INIT.2012-08-01.tgz) = 0b472a615db384fe707042baaa3347dc1aa1c81e
RMD160 (INIT.2012-08-01.tgz) = 48f1830bc85a26125dd986256d38be435668d445
@@ -8,3 +8,9 @@ RMD160 (ast-ksh.2012-08-01.tgz) = 74bf4735182a6b527e3eb5c5ae6d7854ea72d78b
Size (ast-ksh.2012-08-01.tgz) = 2053532 bytes
SHA1 (patch-ab) = 98ec5d5e90f3f9bf45bdbd7199f85e932e07eada
SHA1 (patch-ad) = a85c7ac72c3443e4c140ee36bbc35b2a4eb42062
SHA1 (patch-src_lib_libast_features_lib) = 28bee8d00364a415c46bef63899329bc3326fe34
SHA1 (patch-src_lib_libast_features_map.c) = efc25164d5e153ee3fc3b519d4d2abbc7c3f2f6b
SHA1 (patch-src_lib_libast_features_sys) = 32a3f793395bb06e23c58e31ef534415da0d626b
SHA1 (patch-src_lib_libast_features_vmalloc) = 714b1437cac8f49618581c6284a362163b37feba
SHA1 (patch-src_lib_libast_include_vmalloc.h) = 165a39666a4f9c155e8c1af6220e351ac3b8189a
SHA1 (patch-src_lib_libast_vmalloc_malloc.c) = 1256ade4a1bee59dccde6c549736a84bf14f0ae4

13
shells/ast-ksh/patches/patch-src_lib_libast_features_lib Normal file
View File

@@ -0,0 +1,13 @@
$NetBSD: patch-src_lib_libast_features_lib,v 1.3 2014/11/11 15:40:37 joerg Exp $
--- src/lib/libast/features/lib.orig 2014-11-06 01:38:59.000000000 +0000
+++ src/lib/libast/features/lib
@@ -28,7 +28,7 @@ lib getopt,getsubopt,getopt_long,getopt_
lib glob,index,iswblank,iswctype,killpg,link,localeconv,madvise
lib mbtowc,mbrtowc,memalign,memchr,memcpy,memdup,memmove,memset
lib mkdir,mkfifo,mktemp,mktime
-lib mount,on_exit,onexit,opendir,pathconf
+lib mount,on_exit,onexit,opendir,pathconf,posix_memalign
lib readlink,remove,rename,rewinddir,rindex,rmdir,setlocale
lib setpgid,setpgrp,setpgrp2,setreuid,setsid,setuid,sigaction
lib sigprocmask,sigsetmask,sigunblock,sigvec,socketpair

16
shells/ast-ksh/patches/patch-src_lib_libast_features_map.c Normal file
View File

@@ -0,0 +1,16 @@
$NetBSD: patch-src_lib_libast_features_map.c,v 1.3 2014/11/11 15:40:37 joerg Exp $
--- src/lib/libast/features/map.c.orig 2010-06-25 16:59:08.000000000 +0000
+++ src/lib/libast/features/map.c
@@ -432,6 +432,11 @@ main()
printf("#define memalign _ast_memalign\n");
printf("extern void* memalign(size_t, size_t);\n");
#endif
+#if _lib_posix_memalign
+ printf("#undef posix_memalign\n");
+ printf("#define posix_memalign _ast_posix_memalign\n");
+ printf("extern int posix_memalign(void **, size_t, size_t);\n");
+#endif
#if _lib_mstats
printf("#undef mstats\n");
printf("#define mstats _ast_mstats\n");

12
shells/ast-ksh/patches/patch-src_lib_libast_features_sys Normal file
View File

@@ -0,0 +1,12 @@
$NetBSD: patch-src_lib_libast_features_sys,v 1.3 2014/11/11 15:40:37 joerg Exp $
--- src/lib/libast/features/sys.orig 2012-06-15 02:11:26.000000000 +0000
+++ src/lib/libast/features/sys
@@ -224,6 +224,7 @@ extern memset void* (void*, int, size_
extern pathconf long (const char*, int)
extern pause int (void)
extern pipe int (int[])
+extern posix_memalign int (void**,size_t, size_t)
extern pvalloc void* (size_t)
extern qsort void (void*, size_t, size_t, int(*)(const void*, const void*))
extern rand int (void)

13
shells/ast-ksh/patches/patch-src_lib_libast_features_vmalloc Normal file
View File

@@ -0,0 +1,13 @@
$NetBSD: patch-src_lib_libast_features_vmalloc,v 1.3 2014/11/11 15:40:37 joerg Exp $
--- src/lib/libast/features/vmalloc.orig 2014-11-06 01:39:22.000000000 +0000
+++ src/lib/libast/features/vmalloc
@@ -9,7 +9,7 @@
ref -D_def_map_ast=1
lib atexit,getpagesize,mallinfo,mallopt,memalign,mstats
-lib onexit,pvalloc,strdup,valloc,vmalloc
+lib onexit,posix_memalign,pvalloc,strdup,valloc,vmalloc
lib _malloc,__malloc,__libc_malloc
hdr alloca,malloc,stat,stdlib,unistd
mem mallinfo.arena,mstats.bytes_total malloc.h

45
shells/ast-ksh/patches/patch-src_lib_libast_include_vmalloc.h Normal file
View File

@@ -0,0 +1,45 @@
$NetBSD: patch-src_lib_libast_include_vmalloc.h,v 1.3 2014/11/11 15:40:37 joerg Exp $
--- src/lib/libast/include/vmalloc.h.orig 2014-11-06 00:44:20.000000000 +0000
+++ src/lib/libast/include/vmalloc.h
@@ -199,6 +199,7 @@ extern void free _ARG_(( Void_t* ));
extern void cfree _ARG_(( Void_t* ));
extern Void_t* calloc _ARG_(( size_t, size_t ));
extern Void_t* memalign _ARG_(( size_t, size_t ));
+extern int posix_memalign _ARG_(( Void_t **, size_t, size_t ));
extern Void_t* valloc _ARG_(( size_t ));
#endif
extern int setregmax _ARG_(( int ));
@@ -247,6 +248,7 @@ _END_EXTERNS_
#undef calloc
#undef free
#undef memalign
+#undef posix_memalign
#undef valloc
#if _map_malloc
@@ -256,6 +258,7 @@ _END_EXTERNS_
#define calloc(n,s) (_VMFL_(Vmregion), _ast_calloc((size_t)n, (size_t)(s)) )
#define free(d) (_VMFL_(Vmregion), _ast_free((Void_t*)(d)) )
#define memalign(a,s) (_VMFL_(Vmregion), _ast_memalign((size_t)(a),(size_t)(s)) )
+#define posix_memalign(p,a,s) (_VMFL_(Vmregion), _ast_posix_memalign((Void_t**)(p),(size_t)(a),(size_t)(s)) )
#define valloc(s) (_VMFL_(Vmregion), _ast_valloc((size_t)(s) )
#else
@@ -269,6 +272,7 @@ _END_EXTERNS_
#define calloc(n,s) (_VMFL_(Vmregion), calloc((size_t)n, (size_t)(s)) )
#define free(d) (_VMFL_(Vmregion), free((Void_t*)(d)) )
#define memalign(a,s) (_VMFL_(Vmregion), memalign((size_t)(a),(size_t)(s)) )
+#define posix_memalign(p,a,s) (_VMFL_(Vmregion), posix_memalign((Void_t**)(p),(size_t)(a),(size_t)(s)) )
#define valloc(s) (_VMFL_(Vmregion), valloc((size_t)(s) )
#ifndef strdup
#define strdup(s) ( _VMFL_(Vmregion), (strdup)((char*)(s)) )
@@ -286,6 +290,8 @@ _END_EXTERNS_
#define free(d) (_VMFL_(Vmregion), _VMNM_(fre,/,*,*,/,e)((Void_t*)(d)) )
#define memalign(a,s) (_VMFL_(Vmregion), _VMNM_(memalig,/,*,*,/,n)\
((size_t)(a),(size_t)(s)) )
+#define posix_memalign(p,a,s) (_VMFL_(Vmregion), _VMNM_(posix_memalig,/,*,*,/,n)\
+ ((Void_t**)(p),(size_t)(a),(size_t)(s)) )
#define valloc(s) (_VMFL_(Vmregion), _VMNM_(vallo,/,*,*,/,c)\
((size_t)(s) )
#ifndef strdup

91
shells/ast-ksh/patches/patch-src_lib_libast_vmalloc_malloc.c Normal file
View File

@@ -0,0 +1,91 @@
$NetBSD: patch-src_lib_libast_vmalloc_malloc.c,v 1.3 2014/11/11 15:40:37 joerg Exp $
--- src/lib/libast/vmalloc/malloc.c.orig 2012-06-28 06:52:46.000000000 +0000
+++ src/lib/libast/vmalloc/malloc.c
@@ -61,6 +61,10 @@ extern char* getenv(const char*);
#undef mallinfo
typedef struct ______mallinfo Mallinfo_t;
#undef mallopt
+#undef memalign
+#define memalign _ast_memalign
+#undef posix_memalign
+#define posix_memalign _ast_posix_memalign
#undef mstats
typedef struct ______mstats Mstats_t;
#undef realloc
@@ -153,6 +157,7 @@ static int _Vmpffd = -1;
#undef malloc
#undef mallopt
#undef memalign
+#undef posix_memalign
#undef mstats
#undef realloc
#undef valloc
@@ -166,6 +171,7 @@ static int _Vmpffd = -1;
#undef free
#undef malloc
#undef memalign
+#undef posix_memalign
#undef realloc
#define calloc _ast_calloc
@@ -173,6 +179,7 @@ static int _Vmpffd = -1;
#define free _ast_free
#define malloc _ast_malloc
#define memalign _ast_memalign
+#define posix_memalign _ast_posix_memalign
#define realloc _ast_realloc
#endif
@@ -847,6 +854,9 @@ extern Void_t* F1(_malloc, size_t,n) { r
#if _lib_memalign
extern Void_t* F2(_memalign, size_t,a, size_t,n) { return memalign(a, n); }
#endif
+#if _lib_posix_memalign
+extern Void_t* F2(_posix_memalign, size_t,a, size_t,n) { return posix_memalign(a, n); }
+#endif
#if _lib_pvalloc
extern Void_t* F1(_pvalloc, size_t,n) { return pvalloc(n); }
#endif
@@ -864,6 +874,9 @@ extern Void_t* F1(__malloc, size_t,n) {
#if _lib_memalign
extern Void_t* F2(__memalign, size_t,a, size_t,n) { return memalign(a, n); }
#endif
+#if _lib_posix_memalign
+extern Void_t* F2(__posix_memalign, size_t,a, size_t,n) { return posix_memalign(a, n); }
+#endif
#if _lib_pvalloc
extern Void_t* F1(__pvalloc, size_t,n) { return pvalloc(n); }
#endif
@@ -881,6 +894,9 @@ extern Void_t* F1(__libc_malloc, size_t,
#if _lib_memalign
extern Void_t* F2(__libc_memalign, size_t,a, size_t,n) { return memalign(a, n); }
#endif
+#if _lib_posix_memalign
+extern Void_t* F2(__libc_posix_memalign, size_t,a, size_t,n) { return posix_memalign(a, n); }
+#endif
#if _lib_pvalloc
extern Void_t* F1(__libc_pvalloc, size_t,n) { return pvalloc(n); }
#endif
@@ -1015,6 +1031,11 @@ extern Void_t* malloc _ARG_((size_t));
extern Void_t* memalign _ARG_((size_t, size_t));
#endif
+#if _lib_posix_memalign
+#undef posix_memalign
+extern Void_t* posix_memalign _ARG_((size_t, size_t));
+#endif
+
#if _lib_pvalloc
#undef pvalloc
extern Void_t* pvalloc _ARG_((size_t));
@@ -1039,6 +1060,9 @@ extern Void_t* F1(_ast_malloc, size_t,n)
#if _lib_memalign
extern Void_t* F2(_ast_memalign, size_t,a, size_t,n) { return memalign(a, n); }
#endif
+#if _lib_posix_memalign
+extern Void_t* F2(_ast_posix_memalign, size_t,a, size_t,n) { return memalign(a, n); }
+#endif
extern Void_t* F2(_ast_realloc, Void_t*,p, size_t,n) { return realloc(p, n); }
#endif

5
shells/autojump/DESCR Normal file
View File

@@ -0,0 +1,5 @@
autojump is a faster way to navigate your filesystem. It works by
maintaining a database of the directories you use the most from
the command line.
Directories must be visited first before they can be jumped to.

33
shells/autojump/Makefile Normal file
View File

@@ -0,0 +1,33 @@
# $NetBSD: Makefile,v 1.3 2015/02/10 22:47:33 wiz Exp $
VERSION= 22.2.4
DISTNAME= autojump-${VERSION}
PKGREVISION= 1
CATEGORIES= shells
MASTER_SITES= -https://github.com/joelthelion/autojump/archive/release-v${VERSION}${EXTRACT_SUFX}
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= https://github.com/joelthelion/autojump/
COMMENT= Change directory command that learns to easily navigate directories
LICENSE= gnu-gpl-v3
WRKSRC= ${WRKDIR}/autojump-release-v${VERSION}
INSTALLATION_DIRS+= bin share/autojump ${PKGMANDIR}/man1
REPLACE_PYTHON+= bin/autojump bin/*.py
do-build:
# nothing
# the install.py script is not friendly to destdir installation as non-root
# cd ${WRKSRC} && ${ENV} SHELL=${BASH} ${PYTHONBIN} install.py -fs -p ${PREFIX} -d ${DESTDIR}
# see also https://github.com/joelthelion/autojump/issues/338
do-install:
cd ${WRKSRC}/bin && ${INSTALL_SCRIPT} autojump autojump_argparse.py autojump_data.py autojump_utils.py ${DESTDIR}${PREFIX}/bin
cd ${WRKSRC}/bin && ${INSTALL_SCRIPT} icon.png ${DESTDIR}${PREFIX}/share/autojump
cd ${WRKSRC}/bin && ${INSTALL_SCRIPT} autojump*sh ${DESTDIR}${PREFIX}/share/autojump
cd ${WRKSRC}/docs && ${INSTALL_SCRIPT} autojump.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/
.include "../../lang/python/application.mk"
.include "../../mk/bsd.pkg.mk"

12
shells/autojump/PLIST Normal file
View File

@@ -0,0 +1,12 @@
@comment $NetBSD: PLIST,v 1.1 2015/02/08 17:31:49 wiz Exp $
bin/autojump
bin/autojump_argparse.py
bin/autojump_data.py
bin/autojump_utils.py
man/man1/autojump.1
share/autojump/autojump.bash
share/autojump/autojump.fish
share/autojump/autojump.sh
share/autojump/autojump.tcsh
share/autojump/autojump.zsh
share/autojump/icon.png

6
shells/autojump/distinfo Normal file
View File

@@ -0,0 +1,6 @@
$NetBSD: distinfo,v 1.2 2015/02/08 17:40:25 wiz Exp $
SHA1 (autojump-22.2.4.tar.gz) = df9ff56e128efb8a8e1af574dbac9e4b3c47c1d6
RMD160 (autojump-22.2.4.tar.gz) = 761710ce83a67059a3abe771c577b111acb77245
Size (autojump-22.2.4.tar.gz) = 52724 bytes
SHA1 (patch-install.py) = b1c09b8da766861192c3097cb813461099957a4b

23
shells/autojump/patches/patch-install.py Normal file
View File

@@ -0,0 +1,23 @@
$NetBSD: patch-install.py,v 1.2 2015/02/08 17:40:25 wiz Exp $
Remove duplicate mkdirs.
https://github.com/joelthelion/autojump/issues/350
--- install.py.orig 2015-01-25 07:13:20.000000000 +0000
+++ install.py
@@ -175,7 +175,6 @@ def main(args):
mkdir(bin_dir, args.dryrun)
mkdir(doc_dir, args.dryrun)
- mkdir(etc_dir, args.dryrun)
mkdir(share_dir, args.dryrun)
cp('./bin/autojump', bin_dir, args.dryrun)
@@ -197,7 +196,6 @@ def main(args):
modify_autojump_lua(args.clinkdir, bin_dir, args.dryrun)
else:
mkdir(etc_dir, args.dryrun)
- mkdir(share_dir, args.dryrun)
mkdir(zshshare_dir, args.dryrun)
cp('./bin/autojump.sh', etc_dir, args.dryrun)

20
shells/bash/Makefile
View File

@@ -1,15 +1,21 @@
# $NetBSD: Makefile,v 1.61 2014/03/12 10:08:46 wiz Exp $
# $NetBSD: Makefile,v 1.74 2015/03/08 01:38:35 tnn Exp $
BASH_VERSION= 4.3
BASH_PATCHLEVEL= 030
DISTNAME= bash-${BASH_VERSION}
#PKGNAME= bash-${BASH_VERSION}.${BASH_PATCHLEVEL}
PKGNAME= bash-${BASH_VERSION}.${BASH_PATCHLEVEL}
CATEGORIES= shells
MASTER_SITES= ${MASTER_SITE_GNU:=bash/} \
ftp://ftp.cwru.edu/pub/bash/
#PATCH_SITES= ${MASTER_SITES:=bash-4.0-patches/}
#PATCHFILES+= bash40-001 bash40-002 bash40-003 bash40-004 bash40-005
PATCH_SITES= ${MASTER_SITES:=bash-4.3-patches/}
PATCHFILES+= bash43-001 bash43-002 bash43-003 bash43-004 bash43-005
PATCHFILES+= bash43-006 bash43-007 bash43-008 bash43-009 bash43-010
PATCHFILES+= bash43-011 bash43-012 bash43-013 bash43-014 bash43-015
PATCHFILES+= bash43-016 bash43-017 bash43-018 bash43-019 bash43-020
PATCHFILES+= bash43-021 bash43-022 bash43-023 bash43-024 bash43-025
PATCHFILES+= bash43-026 bash43-027 bash43-028 bash43-029 bash43-030
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.gnu.org/software/bash/bash.html
@@ -18,8 +24,6 @@ LICENSE= gnu-gpl-v3
CONFLICTS= static-bash-[0-9]*
PKG_INSTALLATION_TYPES= overwrite pkgviews
USE_TOOLS+= makeinfo bison
USE_PKGLOCALEDIR= yes
TEXINFO_REQD= 4.1
@@ -27,7 +31,6 @@ GNU_CONFIGURE= yes
MAKE_ENV+= INSTALL_SCRIPT=${INSTALL_SCRIPT:Q}
CONFIGURE_ARGS= LOCAL_LDFLAGS=${EXPORT_SYMBOLS_LDFLAGS:M*:Q}
CPPFLAGS+= -DDEFAULT_PATH_VALUE="\"/usr/bin:/bin:${LOCALBASE}/bin:/usr/local/bin\""
MAKE_JOBS_SAFE= no
TEST_TARGET= test
INFO_FILES= YES # PLIST
@@ -97,6 +100,9 @@ CONFIGURE_ENV+= bash_cv_func_ctype_nonascii=yes
CONFIGURE_ENV+= bash_cv_wexitstatus_offset=8
.endif
pre-configure:
${RM} -f ${WRKSRC}/y.tab.c
post-install:
${INSTALL_MAN} ${WRKSRC}/doc/bash.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
${INSTALL_MAN} ${WRKSRC}/doc/bashbug.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1

104
shells/bash/distinfo
View File

@@ -1,9 +1,103 @@
$NetBSD: distinfo,v 1.29 2014/03/12 10:08:46 wiz Exp $
$NetBSD: distinfo,v 1.40 2015/03/07 22:40:48 rodent Exp $
SHA1 (bash-4.3.tar.gz) = 45ac3c5727e7262334f4dfadecdf601b39434e84
RMD160 (bash-4.3.tar.gz) = cd21a9f51ea7780994d4e2c9c7d16d5eb000f845
Size (bash-4.3.tar.gz) = 7955839 bytes
SHA1 (patch-af) = dfd1d1be3d822cfc3ae0fd21bb2bbd3e35b11f0d
SHA1 (patch-ag) = 4da0a43f6b890482affff46b18eef4be67770e48
SHA1 (patch-aj) = 8b3c52c2aee9cf53ee5a9ce64ead243d0970305e
SHA1 (patch-builtins_ulimit.def) = d4cb59bedc6a6199f9a99a3530c99374e428baeb
SHA1 (bash43-001) = d67ffd6833b30fd41f429205953714a184caa03b
RMD160 (bash43-001) = 6fc9c8c814602c60f6cda0965848dc19a2601a62
Size (bash43-001) = 1617 bytes
SHA1 (bash43-002) = 0c1d486387e5f3bea6a97b317de54f9c3de71c7c
RMD160 (bash43-002) = eecdd1863f8cb8f6ae6055d88b5ea811f5cc5674
Size (bash43-002) = 1594 bytes
SHA1 (bash43-003) = 024d9a6dc6822bb5424f83478b495de29883fb3c
RMD160 (bash43-003) = 957f27933224699fff6c508be93ac9b378af174d
Size (bash43-003) = 1465 bytes
SHA1 (bash43-004) = ece4a6450842a5c13048b86ce1746576f1df7ccd
RMD160 (bash43-004) = edeef6ffee97759db6a834fcafb14661321efa1b
Size (bash43-004) = 1534 bytes
SHA1 (bash43-005) = e7745508829892e3627cef63e56299d584689e07
RMD160 (bash43-005) = 11aad94b8fbd1f88052741de8e09386e711c2fb7
Size (bash43-005) = 2636 bytes
SHA1 (bash43-006) = df3e72bbca83bcac4513b3574d03ab25ac501928
RMD160 (bash43-006) = 21ae70170ae4338d0fdf177dd3cf90d8b638db86
Size (bash43-006) = 1445 bytes
SHA1 (bash43-007) = 1394ecd50212d1bc192db5fbfbf08b996d2582a3
RMD160 (bash43-007) = 0e15af3ff9bdf7a348ecb45698ec79b4f9d84504
Size (bash43-007) = 1331 bytes
SHA1 (bash43-008) = 482f9583f1a3a83256ded3c745cc3b98ccc9b3ea
RMD160 (bash43-008) = 1cfaef93a75c6315711e0b81c56f84da9a6fe577
Size (bash43-008) = 4575 bytes
SHA1 (bash43-009) = 1909cd7f214f4ebedc60bf022132dd4e1284e65b
RMD160 (bash43-009) = 1d64cf44aa6d732988f52dd02aadbddb54aa3e81
Size (bash43-009) = 2413 bytes
SHA1 (bash43-010) = d932228b23e795030132dc8eeea04d9919c90aa7
RMD160 (bash43-010) = 8b8ce230d0635e982d7beaf8578d63568895a5d6
Size (bash43-010) = 5357 bytes
SHA1 (bash43-011) = c53032a18e6491c91117aff5a330620ed8db0f38
RMD160 (bash43-011) = 7b94ad9f7cb92b6dc072451fbdf0754d676f4a71
Size (bash43-011) = 1533 bytes
SHA1 (bash43-012) = 49b8865ca31df4ab0c270500fd12b9e06697272d
RMD160 (bash43-012) = 42da2ec9e6585314ed4ed6ba361d270e6eb9cdcb
Size (bash43-012) = 1365 bytes
SHA1 (bash43-013) = 7c8a4bf8b556504ae9bbf0435b4a505de230e4e1
RMD160 (bash43-013) = c0c2a1680c301f50d24e3f0184289b1c1ee0e947
Size (bash43-013) = 2151 bytes
SHA1 (bash43-014) = 582c8aa707e05b4423df982ee2ed3034f71673bc
RMD160 (bash43-014) = ee39820ed5a94b00d4e233f0e0223671f55a2c8e
Size (bash43-014) = 3533 bytes
SHA1 (bash43-015) = 90969e367c9aaf8127ea61b9c23131eb9d9712fc
RMD160 (bash43-015) = 7c4d91841ca9d0ca594a149cb391db65d1701c96
Size (bash43-015) = 1894 bytes
SHA1 (bash43-016) = 9bbe955e8b332c468e7c5704ea9143cbeb87752d
RMD160 (bash43-016) = 53ef75be07a9c73297018251a51d1375ff4d5ffc
Size (bash43-016) = 3674 bytes
SHA1 (bash43-017) = 20be46bb4714ec53e2a961a8b48ccf6289991cba
RMD160 (bash43-017) = 580c01692c5d7e91196d56eac345ee4aadcdbce9
Size (bash43-017) = 1565 bytes
SHA1 (bash43-018) = 4f4033a4d40463804ead6f87bfa734acb3df9fbe
RMD160 (bash43-018) = a779bbfebc72b1a0c7e15284efc658b298618050
Size (bash43-018) = 1315 bytes
SHA1 (bash43-019) = 2cfd59869d2cfdee1f77560d7e9fd12f305725b8
RMD160 (bash43-019) = d5f610fd7f10268efd7fc84d7a6d0c6c6f9836ab
Size (bash43-019) = 2610 bytes
SHA1 (bash43-020) = a3ed65d860788cb8eaa761a77a0abe7b5cbd9240
RMD160 (bash43-020) = 4e59ef2dbbcbd0de85f04dd08fe8bcdde387a4d6
Size (bash43-020) = 2777 bytes
SHA1 (bash43-021) = 9786720bd7fc72280ff6d61476c83e39ed8213aa
RMD160 (bash43-021) = b8931b1dda5e03cbae43b32a814503a8ef2a02d4
Size (bash43-021) = 1623 bytes
SHA1 (bash43-022) = 7c67c4277eb024d17051aabaa750b6cc388d173e
RMD160 (bash43-022) = 8e17f783ba2535d3f7b1cc320d6c9a8639de4964
Size (bash43-022) = 1782 bytes
SHA1 (bash43-023) = 5fe81781847c5bad848b790d3c2c0e3df19e8719
RMD160 (bash43-023) = 86e0fe2326a81b7182f52cd3cd7da087a52ea962
Size (bash43-023) = 3414 bytes
SHA1 (bash43-024) = 875accb818ebecdb77a2fc3dc6167056ea1ce347
RMD160 (bash43-024) = a1fd34a95f55b37b065e824b494f3a35c4eb4361
Size (bash43-024) = 1909 bytes
SHA1 (bash43-025) = 484d85e54547a18f9702284c55145e34e74768d1
RMD160 (bash43-025) = 9fd51a95756fcaf9b57cab9c29d6e3f6e3b900fe
Size (bash43-025) = 3940 bytes
SHA1 (bash43-026) = ddfe741f358fb6ff0182d7d1eb6b36aabe0598b7
RMD160 (bash43-026) = bec0d5846a592fee0b62b02713b8d9c908c02edb
Size (bash43-026) = 1575 bytes
SHA1 (bash43-027) = d934917a67e353dc645a2af0e10ce0ecc2aa9282
RMD160 (bash43-027) = 0203d8d9bd3c07c9763211f2f2c8c3410ab79af9
Size (bash43-027) = 6889 bytes
SHA1 (bash43-028) = 1e05d95e4abd32b631d991fa374d030c1651645d
RMD160 (bash43-028) = 47869ab7b3174732ad3c2ccb138a23348e84e22e
Size (bash43-028) = 69606 bytes
SHA1 (bash43-029) = 883ae5901a45940d04136b0beae491238d50f70b
RMD160 (bash43-029) = 1103874024539f44b40e14058e4f7be3ed4b8b0e
Size (bash43-029) = 1824 bytes
SHA1 (bash43-030) = ad1e978c051ef58584343ad24f165e614ed2a184
RMD160 (bash43-030) = 9634eb9f937b10507fb5b750633b0d7ea17c3456
Size (bash43-030) = 63206 bytes
SHA1 (patch-af) = 31cb0d8af1e9e83bf1cc9094475c710792ca2a1c
SHA1 (patch-ag) = 61573c7b068b1e9df886655efb3d89c89643f25e
SHA1 (patch-aj) = 2e4c15afd9b50d44967ee8e1f85bdc908c0eeeb0
SHA1 (patch-builtins_ulimit.def) = 2106ed5b76f8bccb8d82f9ada70b336675bf6672
SHA1 (patch-configure) = c4e1ab53a1ee85f3e6121047f0aca8ceb85e6e5d
SHA1 (patch-lib_readline_colors.c) = f2f47e7aa0b5c1e999368109de10f80e39fd4438
SHA1 (patch-shell.c) = daa07914d4c318cd72463f80344f4f7c364809cd
SHA1 (patch-variables.c) = d300318230e5d2c31b15bc0ee8d8416a6b6e8ee1

12
shells/bash/patches/patch-af
View File

@@ -1,8 +1,8 @@
$NetBSD: patch-af,v 1.6 2011/03/12 15:26:45 wiz Exp $
$NetBSD: patch-af,v 1.7 2015/03/07 22:40:48 rodent Exp $
--- builtins/printf.def.orig 2010-11-23 15:02:55.000000000 +0000
--- builtins/printf.def.orig 2014-01-03 15:35:33.000000000 +0000
+++ builtins/printf.def
@@ -90,6 +90,11 @@ $END
@@ -95,6 +95,11 @@ $END
# undef PRIdMAX
#endif
@@ -14,7 +14,7 @@ $NetBSD: patch-af,v 1.6 2011/03/12 15:26:45 wiz Exp $
#if !defined (PRIdMAX)
# if HAVE_LONG_LONG
# define PRIdMAX "lld"
@@ -97,6 +102,13 @@ $END
@@ -102,6 +107,13 @@ $END
# define PRIdMAX "ld"
# endif
#endif
@@ -28,7 +28,7 @@ $NetBSD: patch-af,v 1.6 2011/03/12 15:26:45 wiz Exp $
#if !defined (errno)
extern int errno;
@@ -571,7 +583,11 @@ printf_builtin (list)
@@ -594,7 +606,11 @@ printf_builtin (list)
p = pp = getintmax ();
if (p != pp)
{
@@ -40,7 +40,7 @@ $NetBSD: patch-af,v 1.6 2011/03/12 15:26:45 wiz Exp $
PF (f, pp);
}
else
@@ -598,7 +614,11 @@ printf_builtin (list)
@@ -621,7 +637,11 @@ printf_builtin (list)
p = pp = getuintmax ();
if (p != pp)
{

4
shells/bash/patches/patch-ag
View File

@@ -1,6 +1,6 @@
$NetBSD: patch-ag,v 1.2 2005/12/31 00:02:28 wiz Exp $
$NetBSD: patch-ag,v 1.3 2015/03/07 22:40:48 rodent Exp $
--- builtins/psize.c.orig 2005-07-07 14:21:32.000000000 +0200
--- builtins/psize.c.orig 2008-08-14 19:56:53.000000000 +0000
+++ builtins/psize.c
@@ -41,10 +41,6 @@
#include "../general.h"

8
shells/bash/patches/patch-aj
View File

@@ -1,11 +1,11 @@
$NetBSD: patch-aj,v 1.1 2011/02/20 14:22:15 wiz Exp $
$NetBSD: patch-aj,v 1.2 2015/03/07 22:40:48 rodent Exp $
This patch fixes the build on MirBSD and OpenBSD, where LIBINTL and
LIBICONV are incorrectly set.
--- Makefile.in.orig Wed Dec 30 18:05:16 2009
--- Makefile.in.orig 2014-01-25 21:27:30.000000000 +0000
+++ Makefile.in
@@ -341,7 +341,7 @@ INTL_LIBDIR = $(dot)/$(LIBSUBDIR)/intl
@@ -353,7 +353,7 @@ INTL_LIBDIR = $(dot)/$(LIBSUBDIR)/intl
INTL_ABSSRC = ${topdir}/$(INTL_LIB)
INTL_BUILDDIR = ${LIBBUILD}/intl
@@ -14,7 +14,7 @@ LIBICONV are incorrectly set.
INTL_LIBRARY = $(INTL_LIBDIR)/libintl.a
INTL_DEP = @INTL_DEP@
INTL_INC = @INTL_INC@
@@ -349,7 +349,7 @@ INTL_INC = @INTL_INC@
@@ -361,7 +361,7 @@ INTL_INC = @INTL_INC@
LIBINTL_H = @LIBINTL_H@
# libiconv

6
shells/bash/patches/patch-builtins_ulimit.def
View File

@@ -1,10 +1,10 @@
$NetBSD: patch-builtins_ulimit.def,v 1.1 2013/06/09 18:12:14 bsiegert Exp $
$NetBSD: patch-builtins_ulimit.def,v 1.2 2015/03/07 22:40:48 rodent Exp $
Add support for the "number of threads" ulimit that appeared
in NetBSD 6.99.x.
--- builtins/ulimit.def.orig 2013-06-09 17:33:51.000000000 +0000
--- builtins/ulimit.def.orig 2013-11-01 01:46:06.000000000 +0000
+++ builtins/ulimit.def
@@ -140,6 +140,10 @@ extern int errno;
@@ -143,6 +143,10 @@ extern int errno;
# define RLIMIT_FILESIZE 256
#endif

25
shells/bash/patches/patch-configure Normal file
View File

@@ -0,0 +1,25 @@
$NetBSD: patch-configure,v 1.2 2015/03/07 22:40:48 rodent Exp $
Use -Wl,-R instead of just -R to avoid breaking the build on FreeBSD.
From Dennis Lindroos in PR 49375.
--- configure.orig 2014-02-11 15:38:00.000000000 +0000
+++ configure
@@ -8047,7 +8047,7 @@ fi
fi
if test "X$ltrpathdirs" != "X"; then
for found_dir in $ltrpathdirs; do
- LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-R$found_dir"
+ LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-Wl,-R$found_dir"
done
fi
@@ -8837,7 +8837,7 @@ fi
fi
if test "X$ltrpathdirs" != "X"; then
for found_dir in $ltrpathdirs; do
- LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-R$found_dir"
+ LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-Wl,-R$found_dir"
done
fi

17
shells/bash/patches/patch-lib_readline_colors.c Normal file
View File

@@ -0,0 +1,17 @@
$NetBSD: patch-lib_readline_colors.c,v 1.1 2014/07/17 12:49:15 ryoon Exp $
* SCO OpenServer 5.0.7/3.2 has no S_ISSOCK.
--- lib/readline/colors.c.orig 2013-03-20 15:19:08.000000000 +0000
+++ lib/readline/colors.c
@@ -187,8 +187,10 @@ _rl_print_color_indicator (char *f)
? C_ORPHAN : C_LINK);
else if (S_ISFIFO (mode))
colored_filetype = C_FIFO;
+#if defined(S_ISSOCK)
else if (S_ISSOCK (mode))
colored_filetype = C_SOCK;
+#endif
else if (S_ISBLK (mode))
colored_filetype = C_BLK;
else if (S_ISCHR (mode))

22
shells/bash/patches/patch-shell.c Normal file
View File

@@ -0,0 +1,22 @@
$NetBSD: patch-shell.c,v 1.2 2015/03/07 22:40:48 rodent Exp $
Add flag to disable importing of function unless explicitly enabled
--- shell.c.orig 2014-01-14 13:04:32.000000000 +0000
+++ shell.c
@@ -229,6 +229,7 @@ int posixly_correct = 1; /* Non-zero mea
#else
int posixly_correct = 0; /* Non-zero means posix.2 superset. */
#endif
+int import_functions = 0; /* Import functions from environment */
/* Some long-winded argument names. These are obviously new. */
#define Int 1
@@ -248,6 +249,7 @@ static const struct {
{ "help", Int, &want_initial_help, (char **)0x0 },
{ "init-file", Charp, (int *)0x0, &bashrc_file },
{ "login", Int, &make_login_shell, (char **)0x0 },
+ { "import-functions", Int, &import_functions, (char **)0x0 },
{ "noediting", Int, &no_line_editing, (char **)0x0 },
{ "noprofile", Int, &no_profile, (char **)0x0 },
{ "norc", Int, &no_rc, (char **)0x0 },

23
shells/bash/patches/patch-variables.c Normal file
View File

@@ -0,0 +1,23 @@
$NetBSD: patch-variables.c,v 1.3 2015/03/07 22:40:48 rodent Exp $
Only read functions from environment if flag is set.
--- variables.c.orig 2015-03-07 22:36:12.000000000 +0000
+++ variables.c
@@ -110,6 +110,7 @@ extern time_t shell_start_time;
extern int assigning_in_environment;
extern int executing_builtin;
extern int funcnest_max;
+extern int import_functions;
#if defined (READLINE)
extern int no_line_editing;
@@ -354,7 +355,7 @@ initialize_shell_variables (env, privmod
/* If exported function, define it now. Don't import functions from
the environment in privileged mode. */
- if (privmode == 0 && read_but_dont_execute == 0 &&
+ if (import_functions && privmode == 0 && read_but_dont_execute == 0 &&
STREQN (BASHFUNC_PREFIX, name, BASHFUNC_PREFLEN) &&
STREQ (BASHFUNC_SUFFIX, name + char_index - BASHFUNC_SUFFLEN) &&
STREQN ("() {", string, 4))

12
shells/bash2/Makefile
View File

@@ -1,16 +1,17 @@
# $NetBSD: Makefile,v 1.84 2013/07/15 02:02:28 ryoon Exp $
# $NetBSD: Makefile,v 1.89 2015/03/13 17:25:52 tnn Exp $
#
DISTNAME= bash-2.05b
PKGNAME= bash-2.05.2.7
PKGREVISION= 11
PKGNAME= bash-2.05.2.13
CATEGORIES= shells
MASTER_SITES= ${MASTER_SITE_GNU:=bash/} \
ftp://ftp.cwru.edu/pub/bash/
PATCH_SITES= ${MASTER_SITES:=bash-2.05b-patches/}
PATCHFILES= bash205b-001 bash205b-002 bash205b-003 bash205b-004 \
bash205b-005 bash205b-006 bash205b-007
bash205b-005 bash205b-006 bash205b-007 bash205b-008 \
bash205b-009 bash205b-010 bash205b-011 bash205b-012 \
bash205b-013
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.gnu.org/software/bash/bash.html
@@ -18,10 +19,9 @@ COMMENT= The GNU Bourne Again Shell (version 2)
CONFLICTS= static-bash-[0-9]*
PKG_INSTALLATION_TYPES= overwrite pkgviews
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-installed-readline
USE_TOOLS+= yacc
MAKE_ENV+= INSTALL_SCRIPT=${INSTALL_SCRIPT:Q}
CPPFLAGS+= -DDEFAULT_PATH_VALUE="\"/usr/bin:/bin:${LOCALBASE}/bin:/usr/local/bin\""
TEST_TARGET= test

22
shells/bash2/distinfo
View File

@@ -1,4 +1,4 @@
$NetBSD: distinfo,v 1.15 2005/12/19 00:28:02 joerg Exp $
$NetBSD: distinfo,v 1.18 2014/10/25 14:09:19 ryoon Exp $
SHA1 (bash-2.05b.tar.gz) = b3e158877f94e66ec1c8ef604e994851ee388b09
RMD160 (bash-2.05b.tar.gz) = d9826db03c5d38e6175af5b3ef0bc07fafa14add
@@ -24,6 +24,24 @@ Size (bash205b-006) = 3155 bytes
SHA1 (bash205b-007) = 758301e500c23779da9236c5cd3f6612d29d5f7b
RMD160 (bash205b-007) = 78c333ebfd8958d7c39b14620dddddbe78310f4f
Size (bash205b-007) = 1072 bytes
SHA1 (bash205b-008) = c5376d02ae4e93544d8e5fe14c3714fb2d5cde8e
RMD160 (bash205b-008) = 0f9cf3f990d58973ad8f1a15e5c9e506e1fe18fd
Size (bash205b-008) = 2824 bytes
SHA1 (bash205b-009) = 360353009fc018be5d5b61699b71c84ebf2f1d2d
RMD160 (bash205b-009) = 55fe8fcdaea560f3b1834e17166c2bbff04eaa18
Size (bash205b-009) = 713 bytes
SHA1 (bash205b-010) = e4f5c6100bbd1846a20c5a063c8f9058a164881b
RMD160 (bash205b-010) = 356cc30604226c370afcd788439ba917a07b0532
Size (bash205b-010) = 6267 bytes
SHA1 (bash205b-011) = a4c5daadd4778d599c8a385f732dd29aec6b89d1
RMD160 (bash205b-011) = 07b341f60d6847211c1c6216a105608ca3c28a44
Size (bash205b-011) = 3223 bytes
SHA1 (bash205b-012) = 965c1e6fa129e7f625ca4d2544ebbd2bdc71acd7
RMD160 (bash205b-012) = 025aa71300a651f189a68f427d15298f727f1756
Size (bash205b-012) = 1377 bytes
SHA1 (bash205b-013) = a76e1f2606dde23616f19cdf1f634bd6b650d38d
RMD160 (bash205b-013) = a0120eba484a91b9ebd754ad49f820d861481fa2
Size (bash205b-013) = 2779 bytes
SHA1 (patch-aa) = f6f5eb9b70e609164b35c57de70a1c404c7f52ba
SHA1 (patch-ab) = 1a2fc87648b7e73a4987454bb249149ae15bed93
SHA1 (patch-ac) = 7f68d80de74a887fe0c3f42e9fb5d7e6ad311c30
@@ -35,3 +53,5 @@ SHA1 (patch-ah) = 00732b402fc0479e153d3f5b24ea8151a3d42dc0
SHA1 (patch-ai) = db34e25bef3572d2bf198216e8c2aebb98362925
SHA1 (patch-aj) = c5c541a5e3c06127ccbc8a560e3ea97fbf77ef4f
SHA1 (patch-ak) = b76eadbf6ced8c1b98454eb3579345ff8739ccb5
SHA1 (patch-shell.c) = 151446e30fcaa395cd326552e72d1810d5f01671
SHA1 (patch-variables.c) = e7638f06ad8577aa3ab015469d86ed110e05872b

22
shells/bash2/patches/patch-shell.c Normal file
View File

@@ -0,0 +1,22 @@
$NetBSD: patch-shell.c,v 1.1 2014/09/27 03:00:06 christos Exp $
Add flag to disable importing of function unless explicitly enabled
--- shell.c.orig 2002-07-01 11:27:11.000000000 -0400
+++ shell.c 2014-09-26 22:52:27.000000000 -0400
@@ -197,6 +197,7 @@
int dump_translatable_strings; /* Dump strings in $"...", don't execute. */
int dump_po_strings; /* Dump strings in $"..." in po format */
int wordexp_only = 0; /* Do word expansion only */
+int import_functions = 0; /* Import functions from environment */
/* Some long-winded argument names. These are obviously new. */
#define Int 1
@@ -213,6 +214,7 @@
{ "help", Int, &want_initial_help, (char **)0x0 },
{ "init-file", Charp, (int *)0x0, &bashrc_file },
{ "login", Int, &make_login_shell, (char **)0x0 },
+ { "import-functions", Int, &import_functions, (char **)0x0 },
{ "noediting", Int, &no_line_editing, (char **)0x0 },
{ "noprofile", Int, &no_profile, (char **)0x0 },
{ "norc", Int, &no_rc, (char **)0x0 },

23
shells/bash2/patches/patch-variables.c Normal file
View File

@@ -0,0 +1,23 @@
$NetBSD: patch-variables.c,v 1.2 2014/09/30 18:27:40 christos Exp $
Only read functions from environment if flag is set.
--- variables.c.orig 2014-09-30 14:22:56.000000000 -0400
+++ variables.c 2014-09-30 14:23:31.000000000 -0400
@@ -87,6 +87,7 @@
extern SHELL_VAR *this_shell_function;
extern char *this_command_name;
extern time_t shell_start_time;
+extern int import_functions;
/* The list of shell variables that the user has created at the global
scope, or that came from the environment. */
@@ -265,7 +266,7 @@
/* If exported function, define it now. Don't import functions from
the environment in privileged mode. */
- if (privmode == 0 && read_but_dont_execute == 0 &&
+ if (import_functions && privmode == 0 && read_but_dont_execute == 0 &&
STREQN (BASHFUNC_PREFIX, name, BASHFUNC_PREFLEN) &&
STREQ (BASHFUNC_SUFFIX, name + char_index - BASHFUNC_SUFFLEN) &&
STREQN ("() {", string, 4))

3
shells/eltclsh/Makefile
View File

@@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.10 2014/01/11 14:42:05 adam Exp $
# $NetBSD: Makefile,v 1.11 2014/09/25 19:21:03 jperkin Exp $
DISTNAME= eltclsh-1.9
PKGREVISION= 5
@@ -20,5 +20,6 @@ USE_TOOLS+= gmake
INSTALL_ENV+= ELTCL_LIBRARY=${DESTDIR}${PREFIX}/share/eltcl
.include "../../devel/editline/buildlink3.mk"
.include "../../lang/tcl/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"

16
shells/fish/Makefile
View File

@@ -1,15 +1,16 @@
# $NetBSD: Makefile,v 1.4 2014/02/07 21:29:09 wiz Exp $
# $NetBSD: Makefile,v 1.6 2015/03/06 21:03:20 ryoon Exp $
DISTNAME= fish-1.23.1
PKGREVISION= 1
FISHVER= 2.1.2
DISTNAME= fish-${FISHVER}
CATEGORIES= shells
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fish/}
MASTER_SITES= http://fishshell.com/files/${FISHVER}/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.fishshell.org/
HOMEPAGE= http://www.fishshell.com/
COMMENT= User friendly command line shell for UNIX-like operating systems
LICENSE= gnu-gpl-v2
USE_LANGUAGES+= c++
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
CONFIGURE_ARGS+= --without-xsel
@@ -20,13 +21,18 @@ INSTALL_ENV+= EGDIR=${EGDIR}
PKG_SHELL= bin/fish
REPLACE_PYTHON+= share/tools/*.py
REPLACE_PYTHON+= share/tools/web_config/webconfig.py
.include "../../mk/bsd.prefs.mk"
.if ${OPSYS} == "NetBSD" && exists(/usr/include/execinfo.h)
CPPFLAGS+= -DHAVE_BACKTRACE
CPPFLAGS+= -DHAVE_BACKTRACE_SYMBOLS
CXXFLAGS.NetBSD+= -fpermissive
LDFLAGS+= -lexecinfo
.endif
.include "../../lang/python/application.mk"
.include "../../mk/curses.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"

397
shells/fish/PLIST
View File

@@ -1,36 +1,62 @@
@comment $NetBSD: PLIST,v 1.1 2012/12/12 13:21:42 wiz Exp $
@comment $NetBSD: PLIST,v 1.2 2015/03/06 21:03:20 ryoon Exp $
bin/fish
bin/fish_indent
bin/fish_pager
bin/fishd
bin/mimedb
bin/set_color
man/man1/fish.1
man/man1/fish_indent.1
man/man1/fish_pager.1
man/man1/fishd.1
man/man1/mimedb.1
man/man1/set_color.1
share/doc/fish/ChangeLog
share/doc/fish/arrowdown.png
share/doc/fish/arrowright.png
share/doc/fish/bc_s.png
share/doc/fish/bdwn.png
share/doc/fish/closed.png
share/doc/fish/commands.html
share/doc/fish/design.html
share/doc/fish/doc_8h-source.html
share/doc/fish/doc.png
share/doc/fish/doc_8h_source.html
share/doc/fish/doxygen.css
share/doc/fish/doxygen.png
share/doc/fish/dynsections.js
share/doc/fish/faq.html
share/doc/fish/files.html
share/doc/fish/folderclosed.png
share/doc/fish/folderopen.png
share/doc/fish/index.html
share/doc/fish/jquery.js
share/doc/fish/license.html
share/doc/fish/nav_f.png
share/doc/fish/nav_g.png
share/doc/fish/nav_h.png
share/doc/fish/open.png
share/doc/fish/pages.html
share/doc/fish/tab_b.gif
share/doc/fish/tab_l.gif
share/doc/fish/tab_r.gif
share/doc/fish/splitbar.png
share/doc/fish/sync_off.png
share/doc/fish/sync_on.png
share/doc/fish/tab_a.png
share/doc/fish/tab_b.png
share/doc/fish/tab_h.png
share/doc/fish/tab_s.png
share/doc/fish/tabs.css
share/doc/fish/tutorial.html
share/examples/fish/fish/config.fish
share/fish/completions/abook.fish
share/fish/completions/acat.fish
share/fish/completions/accept.fish
share/fish/completions/ack.fish
share/fish/completions/acpi.fish
share/fish/completions/adduser.fish
share/fish/completions/adiff.fish
share/fish/completions/als.fish
share/fish/completions/amixer.fish
share/fish/completions/anamnesis.fish
share/fish/completions/and.fish
share/fish/completions/animate.fish
share/fish/completions/ant.fish
share/fish/completions/apack.fish
share/fish/completions/apm.fish
share/fish/completions/apropos.fish
share/fish/completions/apt-build.fish
@@ -44,6 +70,7 @@ share/fish/completions/apt-get.fish
share/fish/completions/apt-key.fish
share/fish/completions/apt-listbugs.fish
share/fish/completions/apt-listchanges.fish
share/fish/completions/apt-mark.fish
share/fish/completions/apt-move.fish
share/fish/completions/apt-proxy-import.fish
share/fish/completions/apt-rdepends.fish
@@ -56,11 +83,14 @@ share/fish/completions/apt-src.fish
share/fish/completions/apt-zip-inst.fish
share/fish/completions/apt-zip-list.fish
share/fish/completions/aptitude.fish
share/fish/completions/arepack.fish
share/fish/completions/arp.fish
share/fish/completions/at.fish
share/fish/completions/atd.fish
share/fish/completions/atool.fish
share/fish/completions/atq.fish
share/fish/completions/atrm.fish
share/fish/completions/aunpack.fish
share/fish/completions/awk.fish
share/fish/completions/badblocks.fish
share/fish/completions/bc.fish
@@ -69,13 +99,20 @@ share/fish/completions/bind.fish
share/fish/completions/bison.fish
share/fish/completions/block.fish
share/fish/completions/break.fish
share/fish/completions/brew.fish
share/fish/completions/btdownloadcurses.py.fish
share/fish/completions/btdownloadheadless.py.fish
share/fish/completions/builtin.fish
share/fish/completions/bundle.fish
share/fish/completions/bunzip2.fish
share/fish/completions/bzcat.fish
share/fish/completions/bzip2.fish
share/fish/completions/bzip2recover.fish
share/fish/completions/bzr.fish
share/fish/completions/cabal-dev.fish
share/fish/completions/cabal.fish
share/fish/completions/cancel.fish
share/fish/completions/canto.fish
share/fish/completions/case.fish
share/fish/completions/cat.fish
share/fish/completions/cd.fish
@@ -84,26 +121,48 @@ share/fish/completions/chgrp.fish
share/fish/completions/chmod.fish
share/fish/completions/chown.fish
share/fish/completions/chsh.fish
share/fish/completions/colordiff.fish
share/fish/completions/colorsvn.fish
share/fish/completions/combine.fish
share/fish/completions/command.fish
share/fish/completions/commandline.fish
share/fish/completions/compare.fish
share/fish/completions/complete.fish
share/fish/completions/composite.fish
share/fish/completions/configure.fish
share/fish/completions/conjure.fish
share/fish/completions/continue.fish
share/fish/completions/convert.fish
share/fish/completions/cower.fish
share/fish/completions/cowsay.fish
share/fish/completions/cowthink.fish
share/fish/completions/cp.fish
share/fish/completions/cupsaccept.fish
share/fish/completions/cupsdisable.fish
share/fish/completions/cupsenable.fish
share/fish/completions/cupsreject.fish
share/fish/completions/cut.fish
share/fish/completions/cvs.fish
share/fish/completions/darcs.fish
share/fish/completions/date.fish
share/fish/completions/dcop.fish
share/fish/completions/dd.fish
share/fish/completions/df.fish
share/fish/completions/diff.fish
share/fish/completions/display.fish
share/fish/completions/djview.fish
share/fish/completions/djview3.fish
share/fish/completions/djview4.fish
share/fish/completions/dlocate.fish
share/fish/completions/dmesg.fish
share/fish/completions/dpkg.fish
share/fish/completions/du.fish
share/fish/completions/duply.fish
share/fish/completions/dvipdf.fish
share/fish/completions/dvipdfm.fish
share/fish/completions/echo.fish
share/fish/completions/effectv.fish
share/fish/completions/egrep.fish
share/fish/completions/eix-sync.fish
share/fish/completions/eix.fish
share/fish/completions/elatex.fish
@@ -116,146 +175,263 @@ share/fish/completions/eval.fish
share/fish/completions/evince.fish
share/fish/completions/exec.fish
share/fish/completions/exit.fish
share/fish/completions/expand.fish
share/fish/completions/fg.fish
share/fish/completions/fgrep.fish
share/fish/completions/file.fish
share/fish/completions/find.fish
share/fish/completions/fish.fish
share/fish/completions/fish_indent.fish
share/fish/completions/flac.fish
share/fish/completions/fluxbox-remote.fish
share/fish/completions/ftp.fish
share/fish/completions/funced.fish
share/fish/completions/funcsave.fish
share/fish/completions/function.fish
share/fish/completions/functions.fish
share/fish/completions/fuser.fish
share/fish/completions/fusermount.fish
share/fish/completions/gcc.fish
share/fish/completions/gdb.fish
share/fish/completions/gem.fish
share/fish/completions/git.fish
share/fish/completions/go.fish
share/fish/completions/gpasswd.fish
share/fish/completions/gpg.fish
share/fish/completions/gphoto2.fish
share/fish/completions/gprof.fish
share/fish/completions/grep.fish
share/fish/completions/groupadd.fish
share/fish/completions/gunzip.fish
share/fish/completions/gv.fish
share/fish/completions/gvim.fish
share/fish/completions/gvimdiff.fish
share/fish/completions/gzip.fish
share/fish/completions/head.fish
share/fish/completions/help.fish
share/fish/completions/hg.fish
share/fish/completions/highlight.fish
share/fish/completions/history.fish
share/fish/completions/htop.fish
share/fish/completions/iconv.fish
share/fish/completions/id.fish
share/fish/completions/identify.fish
share/fish/completions/ifconfig.fish
share/fish/completions/ifdata.fish
share/fish/completions/ifdown.fish
share/fish/completions/ifup.fish
share/fish/completions/import.fish
share/fish/completions/invoke-rc.d.fish
share/fish/completions/jobs.fish
share/fish/completions/kill.fish
share/fish/completions/killall.fish
share/fish/completions/la.fish
share/fish/completions/latex.fish
share/fish/completions/latexmk.fish
share/fish/completions/lein.fish
share/fish/completions/less.fish
share/fish/completions/ll.fish
share/fish/completions/ln.fish
share/fish/completions/locate.fish
share/fish/completions/logkeys.fish
share/fish/completions/lp.fish
share/fish/completions/lpadmin.fish
share/fish/completions/lpinfo.fish
share/fish/completions/lpmove.fish
share/fish/completions/lpoptions.fish
share/fish/completions/lppasswd.fish
share/fish/completions/lpq.fish
share/fish/completions/lpr.fish
share/fish/completions/lprm.fish
share/fish/completions/lpstat.fish
share/fish/completions/ls.fish
share/fish/completions/lsblk.fish
share/fish/completions/lsof.fish
share/fish/completions/lua.fish
share/fish/completions/lualatex.fish
share/fish/completions/lunchy.fish
share/fish/completions/lxpanel.fish
share/fish/completions/m4.fish
share/fish/completions/make.fish
share/fish/completions/makedepend.fish
share/fish/completions/makepkg.fish
share/fish/completions/man.fish
share/fish/completions/mc.fish
share/fish/completions/md5sum.fish
share/fish/completions/mimedb.fish
share/fish/completions/mktemp.fish
share/fish/completions/mocp.fish
share/fish/completions/modprobe.fish
share/fish/completions/mogrify.fish
share/fish/completions/montage.fish
share/fish/completions/mosh.fish
share/fish/completions/mount.fish
share/fish/completions/mplayer.fish
share/fish/completions/msgfmt.fish
share/fish/completions/mupdf.fish
share/fish/completions/mutt.fish
share/fish/completions/mv.fish
share/fish/completions/namei.fish
share/fish/completions/ncdu.fish
share/fish/completions/netcat.fish
share/fish/completions/netctl.fish
share/fish/completions/nextd.fish
share/fish/completions/nice.fish
share/fish/completions/nl.fish
share/fish/completions/nm.fish
share/fish/completions/nmcli.fish
share/fish/completions/not.fish
share/fish/completions/oggenc.fish
share/fish/completions/omega.fish
share/fish/completions/or.fish
share/fish/completions/pacman-color.fish
share/fish/completions/pacman-key.fish
share/fish/completions/pacman.fish
share/fish/completions/pacmatic.fish
share/fish/completions/pactree.fish
share/fish/completions/patch.fish
share/fish/completions/pbget.fish
share/fish/completions/pdfelatex.fish
share/fish/completions/pdfetex.fish
share/fish/completions/pdflatex.fish
share/fish/completions/pdftex.fish
share/fish/completions/perl.fish
share/fish/completions/pftp.fish
share/fish/completions/pgrep.fish
share/fish/completions/pine.fish
share/fish/completions/ping.fish
share/fish/completions/pinky.fish
share/fish/completions/pkgadd.fish
share/fish/completions/pkgfile.fish
share/fish/completions/pkginfo.fish
share/fish/completions/pkgmk.fish
share/fish/completions/pkgrm.fish
share/fish/completions/pkill.fish
share/fish/completions/poff.fish
share/fish/completions/pon.fish
share/fish/completions/portmaster.fish
share/fish/completions/ports.fish
share/fish/completions/prevd.fish
share/fish/completions/prt-get.fish
share/fish/completions/ps.fish
share/fish/completions/ps2pdf.fish
share/fish/completions/psql.fish
share/fish/completions/psub.fish
share/fish/completions/pushd.fish
share/fish/completions/pydf.fish
share/fish/completions/python.fish
share/fish/completions/python2.fish
share/fish/completions/python3.fish
share/fish/completions/quilt.fish
share/fish/completions/random.fish
share/fish/completions/rbenv.fish
share/fish/completions/rc.d.fish
share/fish/completions/read.fish
share/fish/completions/readlink.fish
share/fish/completions/realpath.fish
share/fish/completions/reject.fish
share/fish/completions/rejmerge.fish
share/fish/completions/renice.fish
share/fish/completions/return.fish
share/fish/completions/rfkill.fish
share/fish/completions/rgrep.fish
share/fish/completions/rm.fish
share/fish/completions/rmdir.fish
share/fish/completions/root.fish
share/fish/completions/rpm.fish
share/fish/completions/rsync.fish
share/fish/completions/ruby-build.fish
share/fish/completions/ruby.fish
share/fish/completions/scanimage.fish
share/fish/completions/scons.fish
share/fish/completions/scp.fish
share/fish/completions/screen.fish
share/fish/completions/scrot.fish
share/fish/completions/sed.fish
share/fish/completions/seq.fish
share/fish/completions/service.fish
share/fish/completions/set.fish
share/fish/completions/set_color.fish
share/fish/completions/setxkbmap.fish
share/fish/completions/sha1sum.fish
share/fish/completions/sha224sum.fish
share/fish/completions/sha256sum.fish
share/fish/completions/sha384sum.fish
share/fish/completions/sha512sum.fish
share/fish/completions/sort.fish
share/fish/completions/ssh.fish
share/fish/completions/sshfs.fish
share/fish/completions/stat.fish
share/fish/completions/status.fish
share/fish/completions/stream.fish
share/fish/completions/su.fish
share/fish/completions/sudo.fish
share/fish/completions/svn.fish
share/fish/completions/sylpheed.fish
share/fish/completions/systemctl.fish
share/fish/completions/tail.fish
share/fish/completions/tar.fish
share/fish/completions/tee.fish
share/fish/completions/telnet.fish
share/fish/completions/test.fish
share/fish/completions/tex.fish
share/fish/completions/time.fish
share/fish/completions/timeout.fish
share/fish/completions/tmux.fish
share/fish/completions/top.fish
share/fish/completions/totem.fish
share/fish/completions/touch.fish
share/fish/completions/tr.fish
share/fish/completions/trap.fish
share/fish/completions/tree.fish
share/fish/completions/type.fish
share/fish/completions/ulimit.fish
share/fish/completions/umount.fish
share/fish/completions/uname.fish
share/fish/completions/unexpand.fish
share/fish/completions/uniq.fish
share/fish/completions/unrar.fish
share/fish/completions/update-eix-remote.fish
share/fish/completions/update-eix.fish
share/fish/completions/useradd.fish
share/fish/completions/vagrant.fish
share/fish/completions/valgrind.fish
share/fish/completions/vared.fish
share/fish/completions/vi.fish
share/fish/completions/vim-addons.fish
share/fish/completions/vim.fish
share/fish/completions/vimdiff.fish
share/fish/completions/w.fish
share/fish/completions/wajig.fish
share/fish/completions/watch.fish
share/fish/completions/wc.fish
share/fish/completions/wesnoth.fish
share/fish/completions/wget.fish
share/fish/completions/whatis.fish
share/fish/completions/which.fish
share/fish/completions/who.fish
share/fish/completions/wicd-cli.fish
share/fish/completions/wicd-client.fish
share/fish/completions/wicd-gtk.fish
share/fish/completions/wpa_cli.fish
share/fish/completions/wvdial.fish
share/fish/completions/xargs.fish
share/fish/completions/xdg-mime.fish
share/fish/completions/xdvi.fish
share/fish/completions/xelatex.fish
share/fish/completions/xgettext.fish
share/fish/completions/xmms.fish
share/fish/completions/xpdf.fish
share/fish/completions/xprop.fish
share/fish/completions/xrandr.fish
share/fish/completions/xrdb.fish
share/fish/completions/xsel.fish
share/fish/completions/xterm.fish
share/fish/completions/yaourt.fish
share/fish/completions/yum.fish
share/fish/completions/zcat.fish
share/fish/completions/zip.fish
share/fish/completions/zypper.fish
share/fish/config.fish
share/fish/functions/N_.fish
share/fish/functions/_.fish
@@ -263,42 +439,68 @@ share/fish/functions/__fish_append.fish
share/fish/functions/__fish_bind_test1.fish
share/fish/functions/__fish_bind_test2.fish
share/fish/functions/__fish_commandline_test.fish
share/fish/functions/__fish_complete_abook_formats.fish
share/fish/functions/__fish_complete_ant_targets.fish
share/fish/functions/__fish_complete_atool.fish
share/fish/functions/__fish_complete_atool_archive_contents.fish
share/fish/functions/__fish_complete_bittorrent.fish
share/fish/functions/__fish_complete_cabal.fish
share/fish/functions/__fish_complete_cd.fish
share/fish/functions/__fish_complete_command.fish
share/fish/functions/__fish_complete_convert_options.fish
share/fish/functions/__fish_complete_diff.fish
share/fish/functions/__fish_complete_directories.fish
share/fish/functions/__fish_complete_file_url.fish
share/fish/functions/__fish_complete_ftp.fish
share/fish/functions/__fish_complete_grep.fish
share/fish/functions/__fish_complete_groups.fish
share/fish/functions/__fish_complete_list.fish
share/fish/functions/__fish_complete_lpr.fish
share/fish/functions/__fish_complete_lpr_option.fish
share/fish/functions/__fish_complete_ls.fish
share/fish/functions/__fish_complete_man.fish
share/fish/functions/__fish_complete_mime.fish
share/fish/functions/__fish_complete_pacman.fish
share/fish/functions/__fish_complete_pgrep.fish
share/fish/functions/__fish_complete_pids.fish
share/fish/functions/__fish_complete_ppp_peer.fish
share/fish/functions/__fish_complete_proc.fish
share/fish/functions/__fish_complete_python.fish
share/fish/functions/__fish_complete_setxkbmap.fish
share/fish/functions/__fish_complete_ssh.fish
share/fish/functions/__fish_complete_subcommand.fish
share/fish/functions/__fish_complete_subcommand_root.fish
share/fish/functions/__fish_complete_suffix.fish
share/fish/functions/__fish_complete_svn.fish
share/fish/functions/__fish_complete_svn_diff.fish
share/fish/functions/__fish_complete_tar.fish
share/fish/functions/__fish_complete_tex.fish
share/fish/functions/__fish_complete_unrar.fish
share/fish/functions/__fish_complete_users.fish
share/fish/functions/__fish_complete_vi.fish
share/fish/functions/__fish_complete_wvdial_peers.fish
share/fish/functions/__fish_complete_xsum.fish
share/fish/functions/__fish_config_interactive.fish
share/fish/functions/__fish_contains_opt.fish
share/fish/functions/__fish_crux_packages.fish
share/fish/functions/__fish_describe_command.fish
share/fish/functions/__fish_filter_ant_targets.fish
share/fish/functions/__fish_filter_mime.fish
share/fish/functions/__fish_git_branch_prompt.fish
share/fish/functions/__fish_git_prompt.fish
share/fish/functions/__fish_gnu_complete.fish
share/fish/functions/__fish_is_first_token.fish
share/fish/functions/__fish_is_token_n.fish
share/fish/functions/__fish_list_current_token.fish
share/fish/functions/__fish_make_completion_signals.fish
share/fish/functions/__fish_move_last.fish
share/fish/functions/__fish_no_arguments.fish
share/fish/functions/__fish_not_contain_opt.fish
share/fish/functions/__fish_paginate.fish
share/fish/functions/__fish_ports_dirs.fish
share/fish/functions/__fish_print_abook_emails.fish
share/fish/functions/__fish_print_addresses.fish
share/fish/functions/__fish_print_arch_daemons.fish
share/fish/functions/__fish_print_commands.fish
share/fish/functions/__fish_print_debian_services.fish
share/fish/functions/__fish_print_encodings.fish
share/fish/functions/__fish_print_filesystems.fish
@@ -306,35 +508,56 @@ share/fish/functions/__fish_print_function_prototypes.fish
share/fish/functions/__fish_print_help.fish
share/fish/functions/__fish_print_hostnames.fish
share/fish/functions/__fish_print_interfaces.fish
share/fish/functions/__fish_print_lpr_options.fish
share/fish/functions/__fish_print_lpr_printers.fish
share/fish/functions/__fish_print_lsblk_columns.fish
share/fish/functions/__fish_print_make_targets.fish
share/fish/functions/__fish_print_mounted.fish
share/fish/functions/__fish_print_packages.fish
share/fish/functions/__fish_print_svn_rev.fish
share/fish/functions/__fish_print_users.fish
share/fish/functions/__fish_print_xdg_mimeapps.fish
share/fish/functions/__fish_print_xdg_mimetypes.fish
share/fish/functions/__fish_print_xrandr_modes.fish
share/fish/functions/__fish_print_xrandr_outputs.fish
share/fish/functions/__fish_print_xwindows.fish
share/fish/functions/__fish_prt_no_subcommand.fish
share/fish/functions/__fish_prt_packages.fish
share/fish/functions/__fish_prt_ports.fish
share/fish/functions/__fish_prt_use_package.fish
share/fish/functions/__fish_prt_use_port.fish
share/fish/functions/__fish_pwd.fish
share/fish/functions/__fish_seen_subcommand_from.fish
share/fish/functions/__fish_test_arg.fish
share/fish/functions/__fish_urlencode.fish
share/fish/functions/__fish_use_subcommand.fish
share/fish/functions/__terlar_git_prompt.fish
share/fish/functions/alias.fish
share/fish/functions/cd.fish
share/fish/functions/contains_seq.fish
share/fish/functions/delete-or-exit.fish
share/fish/functions/dirh.fish
share/fish/functions/dirs.fish
share/fish/functions/down-or-search.fish
share/fish/functions/eval.fish
share/fish/functions/fish_config.fish
share/fish/functions/fish_default_key_bindings.fish
share/fish/functions/fish_indent.fish
share/fish/functions/fish_prompt.fish
share/fish/functions/fish_update_completions.fish
share/fish/functions/funced.fish
share/fish/functions/funcsave.fish
share/fish/functions/grep.fish
share/fish/functions/help.fish
share/fish/functions/history.fish
share/fish/functions/hostname.fish
share/fish/functions/isatty.fish
share/fish/functions/la.fish
share/fish/functions/ll.fish
share/fish/functions/ls.fish
share/fish/functions/man.fish
share/fish/functions/math.fish
share/fish/functions/mimedb.fish
share/fish/functions/nextd-or-forward-word.fish
share/fish/functions/nextd.fish
share/fish/functions/open.fish
@@ -344,7 +567,7 @@ share/fish/functions/prevd.fish
share/fish/functions/prompt_pwd.fish
share/fish/functions/psub.fish
share/fish/functions/pushd.fish
share/fish/functions/pwd.fish
share/fish/functions/seq.fish
share/fish/functions/setenv.fish
share/fish/functions/sgrep.fish
share/fish/functions/trap.fish
@@ -352,67 +575,93 @@ share/fish/functions/type.fish
share/fish/functions/umask.fish
share/fish/functions/up-or-search.fish
share/fish/functions/vared.fish
share/fish/man/alias.1
share/fish/man/and.1
share/fish/man/begin.1
share/fish/man/bg.1
share/fish/man/bind.1
share/fish/man/block.1
share/fish/man/break.1
share/fish/man/breakpoint.1
share/fish/man/builtin.1
share/fish/man/case.1
share/fish/man/cd.1
share/fish/man/command.1
share/fish/man/commandline.1
share/fish/man/complete.1
share/fish/man/contains.1
share/fish/man/continue.1
share/fish/man/count.1
share/fish/man/dirh.1
share/fish/man/dirs.1
share/fish/man/else.1
share/fish/man/emit.1
share/fish/man/end.1
share/fish/man/eval.1
share/fish/man/exec.1
share/fish/man/exit.1
share/fish/man/fg.1
share/fish/man/fish.1
share/fish/man/fish_indent.1
share/fish/man/fish_pager.1
share/fish/man/fish_prompt.1
share/fish/man/fishd.1
share/fish/man/for.1
share/fish/man/funced.1
share/fish/man/funcsave.1
share/fish/man/function.1
share/fish/man/functions.1
share/fish/man/help.1
share/fish/man/if.1
share/fish/man/isatty.1
share/fish/man/jobs.1
share/fish/man/math.1
share/fish/man/mimedb.1
share/fish/man/nextd.1
share/fish/man/not.1
share/fish/man/open.1
share/fish/man/or.1
share/fish/man/popd.1
share/fish/man/prevd.1
share/fish/man/psub.1
share/fish/man/pushd.1
share/fish/man/random.1
share/fish/man/read.1
share/fish/man/return.1
share/fish/man/set.1
share/fish/man/set_color.1
share/fish/man/source.1
share/fish/man/status.1
share/fish/man/switch.1
share/fish/man/trap.1
share/fish/man/type.1
share/fish/man/ulimit.1
share/fish/man/umask.1
share/fish/man/vared.1
share/fish/man/while.1
share/fish/man/man1/alias.1
share/fish/man/man1/and.1
share/fish/man/man1/begin.1
share/fish/man/man1/bg.1
share/fish/man/man1/bind.1
share/fish/man/man1/block.1
share/fish/man/man1/break.1
share/fish/man/man1/breakpoint.1
share/fish/man/man1/builtin.1
share/fish/man/man1/case.1
share/fish/man/man1/cd.1
share/fish/man/man1/command.1
share/fish/man/man1/commandline.1
share/fish/man/man1/complete.1
share/fish/man/man1/contains.1
share/fish/man/man1/continue.1
share/fish/man/man1/count.1
share/fish/man/man1/dirh.1
share/fish/man/man1/dirs.1
share/fish/man/man1/echo.1
share/fish/man/man1/else.1
share/fish/man/man1/emit.1
share/fish/man/man1/end.1
share/fish/man/man1/eval.1
share/fish/man/man1/exec.1
share/fish/man/man1/exit.1
share/fish/man/man1/fg.1
share/fish/man/man1/fish.1
share/fish/man/man1/fish_config.1
share/fish/man/man1/fish_indent.1
share/fish/man/man1/fish_pager.1
share/fish/man/man1/fish_prompt.1
share/fish/man/man1/fish_right_prompt.1
share/fish/man/man1/fish_update_completions.1
share/fish/man/man1/fishd.1
share/fish/man/man1/for.1
share/fish/man/man1/funced.1
share/fish/man/man1/funcsave.1
share/fish/man/man1/function.1
share/fish/man/man1/functions.1
share/fish/man/man1/help.1
share/fish/man/man1/history.1
share/fish/man/man1/if.1
share/fish/man/man1/isatty.1
share/fish/man/man1/jobs.1
share/fish/man/man1/math.1
share/fish/man/man1/mimedb.1
share/fish/man/man1/nextd.1
share/fish/man/man1/not.1
share/fish/man/man1/or.1
share/fish/man/man1/popd.1
share/fish/man/man1/prevd.1
share/fish/man/man1/psub.1
share/fish/man/man1/pushd.1
share/fish/man/man1/pwd.1
share/fish/man/man1/random.1
share/fish/man/man1/read.1
share/fish/man/man1/return.1
share/fish/man/man1/set.1
share/fish/man/man1/set_color.1
share/fish/man/man1/source.1
share/fish/man/man1/status.1
share/fish/man/man1/switch.1
share/fish/man/man1/test.1
share/fish/man/man1/trap.1
share/fish/man/man1/type.1
share/fish/man/man1/ulimit.1
share/fish/man/man1/umask.1
share/fish/man/man1/vared.1
share/fish/man/man1/while.1
share/fish/tools/create_manpage_completions.py
share/fish/tools/deroff.py
share/fish/tools/web_config/delete.png
share/fish/tools/web_config/index.html
share/fish/tools/web_config/jquery.js
share/fish/tools/web_config/sample_prompts/classic.fish
share/fish/tools/web_config/sample_prompts/classic_git.fish
share/fish/tools/web_config/sample_prompts/classic_status.fish
share/fish/tools/web_config/sample_prompts/informative.fish
share/fish/tools/web_config/sample_prompts/informative_git.fish
share/fish/tools/web_config/sample_prompts/justadollar.fish
share/fish/tools/web_config/sample_prompts/lonetwin.fish
share/fish/tools/web_config/sample_prompts/minimalist.fish
share/fish/tools/web_config/sample_prompts/nim.fish
share/fish/tools/web_config/sample_prompts/pythonista.fish
share/fish/tools/web_config/sample_prompts/robbyrussell.fish
share/fish/tools/web_config/sample_prompts/screen_savvy.fish
share/fish/tools/web_config/sample_prompts/terlar.fish
share/fish/tools/web_config/sample_prompts/user_host_path.fish
share/fish/tools/web_config/webconfig.py

27
shells/fish/distinfo
View File

@@ -1,9 +1,20 @@
$NetBSD: distinfo,v 1.2 2013/10/20 17:53:26 joerg Exp $
$NetBSD: distinfo,v 1.4 2015/03/18 15:03:43 joerg Exp $
SHA1 (fish-1.23.1.tar.gz) = 7b839ffc5b260f1bd1782e4adf84300f5438f833
RMD160 (fish-1.23.1.tar.gz) = b77fe7ffec4ae52b82c1c86b2dc7037306c5fede
Size (fish-1.23.1.tar.gz) = 1152997 bytes
SHA1 (patch-Makefile.in) = d92c531cb15e511f1a712d98a64e222b3316fcdd
SHA1 (patch-configure) = 40a27c297ec56bdba7f34ff6f18a415ae88b504d
SHA1 (patch-proc.h) = 7ac0b704f6ee1b1e966f0bfdc87dfa1e23e9c338
SHA1 (patch-screen.c) = eae536bb965bd2a236a5cd3ff44e5ddbeb24f519
SHA1 (fish-2.1.2.tar.gz) = f7f8d8d26721833be3458b8113c74b747296ec0b
RMD160 (fish-2.1.2.tar.gz) = 109e3fbb07e36a6cf2b651b148d3a60eca9f8930
Size (fish-2.1.2.tar.gz) = 1730198 bytes
SHA1 (patch-Makefile.in) = b7a62d30095fd58cade131ba800b3124ccad29f2
SHA1 (patch-builtin.cpp) = 8fcc2f9a38aaff0c2994d53788b81e789cf05670
SHA1 (patch-common.cpp) = 7ea4e2aa2fed5ddec0916ecdafb49bc16142c491
SHA1 (patch-common.h) = 93082e43847f1f94e00dc6fa991b28f919674d8f
SHA1 (patch-configure) = 9153240e4037fda4ef03412c65b7f3bb5bfb0cd2
SHA1 (patch-env.cpp) = ac3c188de1b24d4a0433d2516c2afa0a8b6f137d
SHA1 (patch-exec.cpp) = 711c2ca4a7c100e40e7e1a2a9235546105d36098
SHA1 (patch-fallback.h) = d2c4edb11877c1b7cf97362bb61fe03d535caef5
SHA1 (patch-history.cpp) = d4d874bd805f9d9e547aebeb780c855a67be079b
SHA1 (patch-output.cpp) = 5c44bec667f4aac0d88e5825a76be893f9852295
SHA1 (patch-output.h) = c40ae78baf08c69e67365c2f032178b0aa12e844
SHA1 (patch-parser.cpp) = e0d2b127e205c23664aab60f6dc0c7872de82dee
SHA1 (patch-parser__keywords.cpp) = 3f8589db528a7e970d5f1bb61104e7db27435571
SHA1 (patch-proc.h) = 3eaf2c20ad0c3a228f20067b1218bdca039bdab6
SHA1 (patch-screen.cpp) = 057d357e312fe55965ff0b92f9ae935b31dfcf4b

15
shells/fish/patches/patch-Makefile.in
View File

@@ -1,21 +1,24 @@
$NetBSD: patch-Makefile.in,v 1.1 2012/12/12 13:21:42 wiz Exp $
$NetBSD: patch-Makefile.in,v 1.2 2015/03/06 21:03:20 ryoon Exp $
Install configuration files to EGDIR
--- Makefile.in.orig 2009-03-08 14:46:47.000000000 +0000
--- Makefile.in.orig 2015-02-16 19:07:12.000000000 +0000
+++ Makefile.in
@@ -569,12 +569,12 @@ install-force: all install-translations
for i in $(PROGRAMS); do\
@@ -600,7 +600,7 @@ install-force: all install-translations
$(INSTALL) -m 755 $$i $(DESTDIR)$(bindir) ; \
true ;\
done;
- $(INSTALL) -m 755 -d $(DESTDIR)$(sysconfdir)/fish
+ $(INSTALL) -m 755 -d $(DESTDIR)$(EGDIR)/fish
$(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/fish
$(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/fish/completions
$(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/fish/functions
$(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/fish/man
@@ -608,7 +608,7 @@ install-force: all install-translations
$(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/fish/tools
$(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/fish/tools/web_config
$(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/fish/tools/web_config/sample_prompts
- $(INSTALL) -m 644 etc/config.fish $(DESTDIR)$(sysconfdir)/fish/
+ $(INSTALL) -m 644 etc/config.fish $(DESTDIR)$(EGDIR)/fish/
$(INSTALL) -m 644 share/config.fish $(DESTDIR)$(datadir)/fish/
for i in $(COMPLETIONS_DIR_FILES); do \
for i in $(COMPLETIONS_DIR_FILES:%='%'); do \
$(INSTALL) -m 644 $$i $(DESTDIR)$(datadir)/fish/completions/; \

19
shells/fish/patches/patch-builtin.cpp Normal file
View File

@@ -0,0 +1,19 @@
$NetBSD: patch-builtin.cpp,v 1.1 2015/03/18 15:03:43 joerg Exp $
--- builtin.cpp.orig 2015-03-17 21:48:35.000000000 +0000
+++ builtin.cpp
@@ -268,11 +268,11 @@ static void builtin_print_help(parser_t
the rest won't fit
*/
- int screen_height, lines;
+ int screen_height, my_lines;
screen_height = common_get_height();
- lines = count_char(str, L'\n');
- if (!get_is_interactive() || (lines > 2*screen_height/3))
+ my_lines = count_char(str, L'\n');
+ if (!get_is_interactive() || (my_lines > 2*screen_height/3))
{
wchar_t *pos;
int cut=0;

22
shells/fish/patches/patch-common.cpp Normal file
View File

@@ -0,0 +1,22 @@
$NetBSD: patch-common.cpp,v 1.1 2015/03/18 15:03:43 joerg Exp $
--- common.cpp.orig 2015-03-17 21:55:04.000000000 +0000
+++ common.cpp
@@ -599,7 +599,7 @@ bool contains_internal(const wchar_t *a,
}
/* wcstring variant of contains_internal. The first parameter is a wcstring, the rest are const wchar_t* */
-__sentinel bool contains_internal(const wcstring &needle, ...)
+__sentinel bool contains_internal(const wcstring *needle, ...)
{
const wchar_t *arg;
va_list va;
@@ -608,7 +608,7 @@ __sentinel bool contains_internal(const
va_start(va, needle);
while ((arg=va_arg(va, const wchar_t *))!= 0)
{
- if (needle == arg)
+ if (*needle == arg)
{
res=1;
break;

13
shells/fish/patches/patch-common.h Normal file
View File

@@ -0,0 +1,13 @@
$NetBSD: patch-common.h,v 1.1 2015/03/18 15:03:43 joerg Exp $
--- common.h.orig 2015-03-17 21:55:55.000000000 +0000
+++ common.h
@@ -654,7 +654,7 @@ wcstring wsetlocale(int category, const
\return zero if needle is not found, of if needle is null, non-zero otherwise
*/
__sentinel bool contains_internal(const wchar_t *needle, ...);
-__sentinel bool contains_internal(const wcstring &needle, ...);
+__sentinel bool contains_internal(const wcstring *needle, ...);
/**
Call read while blocking the SIGCHLD signal. Should only be called

15
shells/fish/patches/patch-configure
View File

@@ -1,10 +1,10 @@
$NetBSD: patch-configure,v 1.2 2013/10/20 17:53:26 joerg Exp $
$NetBSD: patch-configure,v 1.3 2015/03/06 21:03:20 ryoon Exp $
Expand variable where it's defined
--- configure.orig 2009-03-08 14:46:47.000000000 +0000
--- configure.orig 2015-02-24 18:17:38.000000000 +0000
+++ configure
@@ -740,7 +740,7 @@ sharedstatedir='${prefix}/com'
@@ -814,7 +814,7 @@ sharedstatedir='${prefix}/com'
localstatedir='${prefix}/var'
includedir='${prefix}/include'
oldincludedir='/usr/include'
@@ -13,12 +13,3 @@ Expand variable where it's defined
infodir='${datarootdir}/info'
htmldir='${docdir}'
dvidir='${docdir}'
@@ -1848,7 +1848,7 @@ echo $ECHO_N "checking for $i/lib librar
if test -d $i/lib; then
{ echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6; }
- LDFLAGS="$LDFLAGS -L$i/lib/ -R$i/lib/"
+ LDFLAGS="$LDFLAGS -L$i/lib/ ${COMPILER_RPATH_FLAG}$i/lib/"
else
{ echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6; }

13
shells/fish/patches/patch-env.cpp Normal file
View File

@@ -0,0 +1,13 @@
$NetBSD: patch-env.cpp,v 1.1 2015/03/18 15:03:43 joerg Exp $
--- env.cpp.orig 2015-03-17 21:56:51.000000000 +0000
+++ env.cpp
@@ -710,7 +710,7 @@ int env_set(const wcstring &key, const w
int is_universal = 0;
- if (val && contains(key, L"PWD", L"HOME"))
+ if (val && contains(&key, L"PWD", L"HOME"))
{
/* Canoncalize our path; if it changes, recurse and try again. */
wcstring val_canonical = val;

13
shells/fish/patches/patch-exec.cpp Normal file
View File

@@ -0,0 +1,13 @@
$NetBSD: patch-exec.cpp,v 1.1 2015/03/18 15:03:43 joerg Exp $
--- exec.cpp.orig 2015-03-17 21:57:15.000000000 +0000
+++ exec.cpp
@@ -572,7 +572,7 @@ static void exec_no_exec(parser_t &parse
if (builtin_name_cstr != NULL)
{
const wcstring builtin_name = builtin_name_cstr;
- if (contains(builtin_name, L"for", L"function", L"begin", L"switch"))
+ if (contains(&builtin_name, L"for", L"function", L"begin", L"switch"))
{
// The above builtins are the ones that produce an unbalanced block from within their function implementation
// This list should be maintained somewhere else

25
shells/fish/patches/patch-fallback.h Normal file
View File

@@ -0,0 +1,25 @@
$NetBSD: patch-fallback.h,v 1.1 2015/03/18 15:03:43 joerg Exp $
--- fallback.h.orig 2015-03-17 21:45:59.000000000 +0000
+++ fallback.h
@@ -43,7 +43,7 @@ int fish_wcswidth(const wchar_t *str, si
expects. Hopefully.
*/
-#ifdef NCURSES_VERSION
+#if defined(__NetBSD__) || defined(NCURSES_VERSION)
typedef int tputs_arg_t;
#else
typedef char tputs_arg_t;
@@ -86,7 +86,10 @@ int tputs(const char *str, int affcnt, i
#endif
-#ifdef TPARM_SOLARIS_KLUDGE
+#ifdef __NetBSD__
+#include <term.h>
+#define tparm tiparm
+#elif defined(TPARM_SOLARIS_KLUDGE)
/**
Solaris tparm has a set fixed of paramters in it's curses implementation,

61
shells/fish/patches/patch-history.cpp Normal file
View File

@@ -0,0 +1,61 @@
$NetBSD: patch-history.cpp,v 1.1 2015/03/18 15:03:43 joerg Exp $
--- history.cpp.orig 2015-03-17 21:50:56.000000000 +0000
+++ history.cpp
@@ -380,12 +380,12 @@ static size_t offset_of_next_item_fish_2
const char * const line_start = begin + cursor;
/* Advance the cursor to the next line */
- const char *newline = (const char *)memchr(line_start, '\n', mmap_length - cursor);
- if (newline == NULL)
+ const char *my_newline = (const char *)memchr(line_start, '\n', mmap_length - cursor);
+ if (my_newline == NULL)
break;
/* Advance the cursor past this line. +1 is for the newline */
- size_t line_len = newline - line_start;
+ size_t line_len = my_newline - line_start;
cursor += line_len + 1;
/* Skip lines with a leading space, since these are in the interior of one of our items */
@@ -699,14 +699,14 @@ static size_t read_line(const char *base
/* Locate the newline */
assert(cursor <= len);
const char *start = base + cursor;
- const char *newline = (char *)memchr(start, '\n', len - cursor);
- if (newline != NULL)
+ const char *my_newline = (char *)memchr(start, '\n', len - cursor);
+ if (my_newline != NULL)
{
/* We found a newline. */
- result.assign(start, newline - start);
+ result.assign(start, my_newline - start);
/* Return the amount to advance the cursor; skip over the newline */
- return newline - start + 1;
+ return my_newline - start + 1;
}
else
{
@@ -1610,9 +1610,9 @@ void history_t::populate_from_bash(FILE
if (success)
{
/* Skip the newline */
- char *newline = strchr(buff, '\n');
- if (newline) *newline = '\0';
- has_newline = (newline != NULL);
+ char *my_newline = strchr(buff, '\n');
+ if (my_newline) *my_newline = '\0';
+ has_newline = (my_newline != NULL);
/* Append what we've got */
line.append(buff);
@@ -1737,7 +1737,7 @@ void history_t::add_with_file_detection(
potential_paths.push_back(potential_path);
/* What a hack! */
- impending_exit = impending_exit || contains(potential_path, L"exec", L"exit", L"reboot");
+ impending_exit = impending_exit || contains(&potential_path, L"exec", L"exit", L"reboot");
}
}
}

22
shells/fish/patches/patch-output.cpp Normal file
View File

@@ -0,0 +1,22 @@
$NetBSD: patch-output.cpp,v 1.1 2015/03/18 15:03:43 joerg Exp $
--- output.cpp.orig 2015-03-17 21:47:33.000000000 +0000
+++ output.cpp
@@ -151,7 +151,7 @@ unsigned char index_for_color(rgb_color_
}
-static bool write_color(char *todo, unsigned char idx, bool is_fg)
+static bool write_color(const char *todo, unsigned char idx, bool is_fg)
{
bool result = false;
if (idx < 16 || term256_support_is_native())
@@ -418,7 +418,7 @@ int writeb(tputs_arg_t b)
return 0;
}
-int writembs_internal(char *str)
+int writembs_internal(const char *str)
{
CHECK(str, 1);

22
shells/fish/patches/patch-output.h Normal file
View File

@@ -0,0 +1,22 @@
$NetBSD: patch-output.h,v 1.1 2015/03/18 15:03:43 joerg Exp $
--- output.h.orig 2015-03-17 21:47:35.000000000 +0000
+++ output.h
@@ -80,7 +80,7 @@ void set_color(rgb_color_t c, rgb_color_
*/
#define writembs( mbs ) \
{ \
- char *tmp = mbs; \
+ const char *tmp = mbs; \
if( tmp ) \
{ \
writembs_internal( tmp ); \
@@ -104,7 +104,7 @@ void set_color(rgb_color_t c, rgb_color_
as the sending function. But a weird bug on PPC Linux means that on
this platform, write is instead used directly.
*/
-int writembs_internal(char *str);
+int writembs_internal(const char *str);
/**
Write a wide character using the output method specified using output_set_writer().

62
shells/fish/patches/patch-parser.cpp Normal file
View File

@@ -0,0 +1,62 @@
$NetBSD: patch-parser.cpp,v 1.1 2015/03/18 15:03:43 joerg Exp $
--- parser.cpp.orig 2015-03-17 21:50:15.000000000 +0000
+++ parser.cpp
@@ -446,7 +446,7 @@ const wchar_t *parser_t::get_block_desc(
*/
static int parser_is_pipe_forbidden(const wcstring &word)
{
- return contains(word,
+ return contains(&word,
L"exec",
L"case",
L"break",
@@ -1726,7 +1726,7 @@ int parser_t::parse_job(process_t *p,
mark = tok_get_pos(tok);
- if (contains(nxt,
+ if (contains(&nxt,
L"command",
L"builtin",
L"not",
@@ -2398,9 +2398,9 @@ void parser_t::eval_job(tokenizer_t *tok
if (job_start_pos < tok_get_pos(tok))
{
long stop_pos = tok_get_pos(tok);
- const wchar_t *newline = wcschr(tok_string(tok)+start_pos, L'\n');
- if (newline)
- stop_pos = mini<long>(stop_pos, newline - tok_string(tok));
+ const wchar_t *my_newline = wcschr(tok_string(tok)+start_pos, L'\n');
+ if (my_newline)
+ stop_pos = mini<long>(stop_pos, my_newline - tok_string(tok));
j->set_command(wcstring(tok_string(tok)+start_pos, stop_pos-start_pos));
}
@@ -3024,7 +3024,7 @@ int parser_t::test(const wchar_t *buff,
command is needed, such as after 'and' or
'while'
*/
- if (contains(command,
+ if (contains(&command,
L"end"))
{
err=1;
@@ -3129,7 +3129,7 @@ int parser_t::test(const wchar_t *buff,
had_cmd = 0;
}
- if (contains(command,
+ if (contains(&command,
L"or",
L"and"))
{
@@ -3255,7 +3255,7 @@ int parser_t::test(const wchar_t *buff,
/*
Test that break and continue are only used within loop blocks
*/
- if (contains(command, L"break", L"continue"))
+ if (contains(&command, L"break", L"continue"))
{
bool found_loop = false;
size_t block_idx = block_infos.size();

40
shells/fish/patches/patch-parser__keywords.cpp Normal file
View File

@@ -0,0 +1,40 @@
$NetBSD: patch-parser__keywords.cpp,v 1.1 2015/03/18 15:03:43 joerg Exp $
--- parser_keywords.cpp.orig 2015-03-17 22:07:00.000000000 +0000
+++ parser_keywords.cpp
@@ -32,7 +32,7 @@ bool parser_keywords_is_switch(const wcs
bool parser_keywords_skip_arguments(const wcstring &cmd)
{
- return contains(cmd,
+ return contains(&cmd,
L"else",
L"begin");
}
@@ -42,7 +42,7 @@ bool parser_keywords_is_subcommand(const
{
return parser_keywords_skip_arguments(cmd) ||
- contains(cmd,
+ contains(&cmd,
L"command",
L"builtin",
L"while",
@@ -56,7 +56,7 @@ bool parser_keywords_is_subcommand(const
bool parser_keywords_is_block(const wcstring &word)
{
- return contains(word,
+ return contains(&word,
L"for",
L"while",
L"if",
@@ -69,7 +69,7 @@ bool parser_keywords_is_reserved(const w
{
return parser_keywords_is_block(word) ||
parser_keywords_is_subcommand(word) ||
- contains(word,
+ contains(&word,
L"end",
L"case",
L"else",

10
shells/fish/patches/patch-proc.h
View File

@@ -1,15 +1,15 @@
$NetBSD: patch-proc.h,v 1.1 2012/12/12 13:21:42 wiz Exp $
$NetBSD: patch-proc.h,v 1.2 2015/03/06 21:03:20 ryoon Exp $
Fix missing include
--- proc.h.orig 2009-03-08 14:46:47.000000000 +0000
--- proc.h.orig 2015-02-16 19:07:12.000000000 +0000
+++ proc.h
@@ -16,6 +16,8 @@
#include <unistd.h>
@@ -17,6 +17,8 @@
#include <sys/time.h>
#include <list>
+#include <termios.h>
+
#include "util.h"
#include "io.h"
#include "common.h"

24
shells/fish/patches/patch-screen.c
View File

@@ -1,24 +0,0 @@
$NetBSD: patch-screen.c,v 1.1 2012/12/12 13:21:42 wiz Exp $
Fix compilation on NetBSD, where init_tabs is not suitable for assignment.
--- screen.c.orig 2009-03-08 14:46:47.000000000 +0000
+++ screen.c
@@ -92,13 +93,14 @@ static int try_sequence( char *seq, wcha
*/
static int next_tab_stop( int in )
{
+ int itabs = init_tabs;
/*
Assume tab stops every 8 characters if undefined
*/
- if( init_tabs <= 0 )
- init_tabs = 8;
+ if( itabs <= 0 )
+ itabs = 8;
- return ( (in/init_tabs)+1 )*init_tabs;
+ return ( (in/itabs)+1 )*itabs;
}
/**

53
shells/fish/patches/patch-screen.cpp Normal file
View File

@@ -0,0 +1,53 @@
$NetBSD: patch-screen.cpp,v 1.2 2015/03/18 15:03:43 joerg Exp $
--- screen.cpp.orig 2015-02-16 19:07:12.000000000 +0000
+++ screen.cpp
@@ -112,10 +112,11 @@ static size_t try_sequence(const char *s
*/
static size_t next_tab_stop(size_t in)
{
+ int itabs = init_tabs;
/*
Assume tab stops every 8 characters if undefined
*/
- size_t tab_width = (init_tabs > 0 ? (size_t)init_tabs : 8);
+ size_t tab_width = (itabs > 0 ? (size_t)itabs : 8);
return ((in/tab_width)+1)*tab_width;
}
@@ -151,7 +152,7 @@ size_t escape_code_length(const wchar_t
Detect these terminfo color escapes with parameter
value 0..7, all of which don't move the cursor
*/
- char * const esc[] =
+ const char * const esc[] =
{
set_a_foreground,
set_a_background,
@@ -183,7 +184,7 @@ size_t escape_code_length(const wchar_t
Detect these semi-common terminfo escapes without any
parameter values, all of which don't move the cursor
*/
- char * const esc2[] =
+ const char * const esc2[] =
{
enter_bold_mode,
exit_attribute_mode,
@@ -604,7 +605,7 @@ static void s_move(screen_t *s, data_buf
int i;
int x_steps, y_steps;
- char *str;
+ const char *str;
/*
debug( 0, L"move from %d %d to %d %d",
s->screen_cursor[0], s->screen_cursor[1],
@@ -707,7 +708,7 @@ static void s_write_char(screen_t *s, da
Send the specified string through tputs and append the output to
the specified buffer.
*/
-static void s_write_mbs(data_buffer_t *b, char *s)
+static void s_write_mbs(data_buffer_t *b, const char *s)
{
scoped_buffer_t scoped_buffer(b);
writembs(s);

17
shells/git-sh/DESCR Normal file
View File

@@ -0,0 +1,17 @@
git-sh is a customized bash shell suitable for git work.
The git-sh command starts an interactive bash shell tweaked for
heavy git interaction:
* All git commands available at top-level (checkout master = git
checkout master)
* All git aliases defined in the [alias] section of ~/.gitconfig
available at top-level.
* Shawn O. Pearce's excellent bash completion strapped onto all
core commands and git aliases.
* Custom prompt with current branch, repository, and work tree
dirty indicator.
* Customizable via /etc/gitshrc and ~/.gitshrc config files; for
creating aliases, changing the prompt, etc.
* Runs on top of normal bash (~/.bashrc) and readline (~/.inputrc)
configurations.

19
shells/git-sh/Makefile Normal file
View File

@@ -0,0 +1,19 @@
# $NetBSD: Makefile,v 1.1 2015/02/08 16:53:55 wiz Exp $
VERSION= 1.3
DISTNAME= git-sh-${VERSION}
CATEGORIES= shells
MASTER_SITES= -https://github.com/rtomayko/git-sh/archive/${VERSION}${EXTRACT_SUFX}
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= https://github.com/rtomayko/git-sh/
COMMENT= Customized bash environment suitable for git work
LICENSE= gnu-gpl-v2
USE_LANGUAGES= # none
USE_TOOLS+= bash:run
REPLACE_BASH+= git-sh.bash
MAKE_FLAGS+= PREFIX=${DESTDIR}${PREFIX}
MAKE_FLAGS+= mandir=${DESTDIR}${PREFIX}/${PKGMANDIR}/
.include "../../mk/bsd.pkg.mk"

3
shells/git-sh/PLIST Normal file
View File

@@ -0,0 +1,3 @@
@comment $NetBSD: PLIST,v 1.1 2015/02/08 16:53:55 wiz Exp $
bin/git-sh
man/man1/git-sh.1

5
shells/git-sh/distinfo Normal file
View File

@@ -0,0 +1,5 @@
$NetBSD: distinfo,v 1.1 2015/02/08 16:53:55 wiz Exp $
SHA1 (git-sh-1.3.tar.gz) = b96801ed2a63ef510583e7f1c1b4bc234d991507
RMD160 (git-sh-1.3.tar.gz) = 4ffccaac2ff4c7a9b1ae60424e236f68feb94070
Size (git-sh-1.3.tar.gz) = 26757 bytes

4
shells/lshell/Makefile
View File

@@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.13 2014/01/23 17:34:26 wiz Exp $
# $NetBSD: Makefile,v 1.14 2014/05/09 07:37:18 wiz Exp $
DISTNAME= lshell-0.9.16
CATEGORIES= shells python
@@ -17,7 +17,7 @@ PKG_SHELL= bin/lshell
USE_LANGUAGES= # none
PYDISTUTILSPKG= yes
PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.9.16
PYTHON_VERSIONS_INCOMPATIBLE= 33 34 # not yet ported as of 0.9.16
EGDIR= share/examples/lshell

9
shells/mksh/Makefile
View File

@@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.26 2014/01/26 08:57:32 bsiegert Exp $
# $NetBSD: Makefile,v 1.30 2014/11/27 13:38:15 joerg Exp $
DISTNAME= mksh-R49
DISTNAME= mksh-R50d
PKGNAME= ${DISTNAME:S/-R/-/}
CATEGORIES= shells
MASTER_SITES= http://www.mirbsd.org/MirOS/dist/mir/mksh/ \
@@ -17,8 +17,6 @@ LICENSE= miros
WRKSRC= ${WRKDIR}/mksh
WRKBUILD?= ${WRKSRC}
PKG_INSTALLATION_TYPES= pkgviews overwrite
PKG_SHELL= bin/mksh
LIBS.Interix+= -lcrypt
@@ -26,8 +24,7 @@ LIBS.Interix+= -lcrypt
INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 share/examples/mksh
do-build:
cd ${WRKBUILD} && LIBS=${LIBS:Q} CC=${CC:Q} CFLAGS=${CFLAGS:Q} \
CPPFLAGS=${CPPFLAGS:Q} LDFLAGS=${LDFLAGS:Q} \
cd ${WRKBUILD} && ${SETENV} ${MAKE_ENV} LIBS=${LIBS:Q} \
${TOOLS_SHELL} ${WRKSRC}/Build.sh -r
do-install:

10
shells/mksh/distinfo
View File

@@ -1,6 +1,6 @@
$NetBSD: distinfo,v 1.24 2014/01/26 08:57:32 bsiegert Exp $
$NetBSD: distinfo,v 1.26 2014/10/07 18:51:02 bsiegert Exp $
SHA1 (mksh-R49.tgz) = 06b9d0162d1f91ff28d3fa66533e67edb168694d
RMD160 (mksh-R49.tgz) = fa7a24e604daea30d5e5fd7bb78e24b2d7044764
Size (mksh-R49.tgz) = 371550 bytes
SHA1 (patch-mksh.1) = d36f106e22755b3daafbdc12fc4b83fee5531a12
SHA1 (mksh-R50d.tgz) = 0066c260e0ae6736c56189f481607d8306449c53
RMD160 (mksh-R50d.tgz) = 473417750fe50ed0f947076752677432aa9fbd82
Size (mksh-R50d.tgz) = 374014 bytes
SHA1 (patch-mksh.1) = 0b3ad407b3963cc92944724658d63c898728e335

21
shells/mksh/patches/patch-mksh.1
View File

@@ -1,13 +1,12 @@
$NetBSD: patch-mksh.1,v 1.5 2014/01/26 08:57:32 bsiegert Exp $
$NetBSD: patch-mksh.1,v 1.7 2014/10/07 18:51:02 bsiegert Exp $
Kill the .Dt override and restore installation a normal man page.
--- mksh.1.orig 2014-01-11 18:10:06.000000000 +0000
--- mksh.1.orig 2014-10-03 12:36:28.000000000 +0000
+++ mksh.1
@@ -59,22 +59,7 @@
. ds ha ^
@@ -60,21 +60,11 @@
. ds en \(em
.\}
-.\"
.\"
-.\" Implement .Dd with the Mdocdate RCS keyword
-.\"
-.rn Dd xD
@@ -18,12 +17,12 @@ Kill the .Dt override and restore installation a normal man page.
-.el .xD \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8
-..
-.\"
-.\" .Dd must come before definition of .Mx, because when called
-.\" with -mandoc, it might implement .Mx itself, but we want to
-.\" use our own definition. And .Dd must come *first*, always.
-.\"
-.Dd $Mdocdate: January 11 2014 $
+.Dd January 11 2014
.\" .Dd must come before definition of .Mx, because when called
.\" with -mandoc, it might implement .Mx itself, but we want to
.\" use our own definition. And .Dd must come *first*, always.
.\"
-.Dd $Mdocdate: October 7 2014 $
+.Dd October 7, 2014
.\"
.\" Check which macro package we use, and do other -mdoc setup.
.\"

7
shells/mudsh/DESCR
View File

@@ -1,7 +0,0 @@
Is there any reason why a shell (or command line) cannot be as
tolerant or as intelligent as a text adventure game like Zork, or a
MUD (Multi User Dungeon)? Is there any reason why a shell cannot work
like such a game? ("Go North", etc.)
Actually, the answer is no and this is a perl implementation to prove it.
Have fun, and don't get eaten by a Grue!

28
shells/mudsh/Makefile
View File

@@ -1,28 +0,0 @@
# $NetBSD: Makefile,v 1.16 2013/05/31 12:41:58 wiz Exp $
#
DISTNAME= mudsh
PKGNAME= mudsh-20010311
PKGREVISION= 2
CATEGORIES= shells
MASTER_SITES= ${MASTER_SITE_FREEBSD}
EXTRACT_SUFX= # empty
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.xirium.com/tech/mud-shell/index.html
COMMENT= M.U.D. game-like shell
WRKSRC= ${WRKDIR}
USE_TOOLS+= perl:run
INSTALLATION_DIRS= bin
do-build:
@${CP} ${WRKSRC}/mudsh ${WRKSRC}/mudsh.orig
@${SED} -e 's|/usr/local/bin/perl|${LOCALBASE}/bin/perl|g' \
${WRKSRC}/mudsh.orig >${WRKSRC}/mudsh
do-install:
${INSTALL_SCRIPT} ${WRKSRC}/mudsh ${DESTDIR}${PREFIX}/bin
.include "../../mk/bsd.pkg.mk"

2
shells/mudsh/PLIST
View File

@@ -1,2 +0,0 @@
@comment $NetBSD: PLIST,v 1.1.1.1 2002/11/18 17:10:17 cjep Exp $
bin/mudsh

5
shells/mudsh/distinfo
View File

@@ -1,5 +0,0 @@
$NetBSD: distinfo,v 1.2 2005/02/24 13:14:41 agc Exp $
SHA1 (mudsh) = 545f3a095cad25e0334df598a63ced3a1c3aeef1
RMD160 (mudsh) = 885133cbb847581e7ecc1f63eed4ab5ff3bf9d2d
Size (mudsh) = 21309 bytes

4
shells/osh/Makefile
View File

@@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.30 2012/09/11 23:25:08 asau Exp $
# $NetBSD: Makefile,v 1.31 2014/10/09 14:06:56 wiz Exp $
DISTNAME= osh-20100430
PKGREVISION= 1
@@ -10,8 +10,6 @@ HOMEPAGE= http://v6shell.org/
COMMENT= Port of the Sixth Edition UNIX shell
LICENSE= original-bsd
PKG_INSTALLATION_TYPES= overwrite pkgviews
PKG_SHELL= bin/osh
BUILD_TARGET= oshall

3
shells/pdksh/Makefile
View File

@@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.21 2012/09/11 23:25:09 asau Exp $
# $NetBSD: Makefile,v 1.22 2014/10/09 14:06:56 wiz Exp $
#
DISTNAME= pdksh-5.2.14
@@ -15,7 +15,6 @@ MAINTAINER= schmonz@NetBSD.org
HOMEPAGE= http://web.cs.mun.ca/~michael/pdksh/
COMMENT= Free clone of the AT&T Korn shell
PKG_INSTALLATION_TYPES= overwrite pkgviews
BOOTSTRAP_PKG= yes
GNU_CONFIGURE= yes

8
shells/perlsh/Makefile
View File

@@ -1,13 +1,13 @@
# $NetBSD: Makefile,v 1.24 2013/12/09 14:17:52 obache Exp $
# $NetBSD: Makefile,v 1.26 2014/12/16 02:49:35 mef Exp $
DISTNAME= psh-1.8
PKGNAME= perlsh-1.8
PKGREVISION= 10
PKGREVISION= 11
CATEGORIES= shells perl5
MASTER_SITES= http://www.focusresearch.com/gregor/download/
MASTER_SITES= http://search.cpan.org/CPAN/authors/id/G/GR/GREGOR/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.focusresearch.com/gregor/sw/psh/
HOMEPAGE= http://search.cpan.org/dist/psh/
COMMENT= The Perl Shell
DEPENDS+= p5-Term-ReadKey>=2.21:../../devel/p5-Term-ReadKey

7
shells/posh/Makefile
View File

@@ -1,18 +1,17 @@
# $NetBSD: Makefile,v 1.16 2013/09/13 06:41:33 mef Exp $
# $NetBSD: Makefile,v 1.18 2014/10/09 14:06:56 wiz Exp $
#
DISTNAME= posh_0.12.2
DISTNAME= posh_0.12.3
PKGNAME= ${DISTNAME:S/_/-/}
CATEGORIES= shells
MASTER_SITES= ${MASTER_SITE_DEBIAN:=pool/main/p/posh/}
EXTRACT_SUFX= .tar.xz
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://packages.debian.org/posh
COMMENT= Debian Policy-compliant Ordinary SHell
LICENSE= gnu-gpl-v2
PKG_INSTALLATION_TYPES= overwrite pkgviews
GNU_CONFIGURE= YES
PKG_SHELL= bin/posh
WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}

8
shells/posh/distinfo
View File

@@ -1,7 +1,7 @@
$NetBSD: distinfo,v 1.10 2013/09/13 06:41:33 mef Exp $
$NetBSD: distinfo,v 1.11 2014/10/07 14:50:58 mef Exp $
SHA1 (posh_0.12.2.tar.gz) = 047c9f3fcd20915ce9e4dd74ad7c6775dc1599be
RMD160 (posh_0.12.2.tar.gz) = 4f00d3ba49202a2ede479a983fd55b2a6a73451d
Size (posh_0.12.2.tar.gz) = 475068 bytes
SHA1 (posh_0.12.3.tar.xz) = b6d9865fbbadf482facee5618ed43b64f6dbeed9
RMD160 (posh_0.12.3.tar.xz) = 69ae05ff3159d018e524c3f7353155c7404c9c62
Size (posh_0.12.3.tar.xz) = 278436 bytes
SHA1 (patch-aa) = d70d108e73884f3c91a6bb22504853f6270290ec
SHA1 (patch-ab) = 148632d17bc7ecb047169912eedea145d8b7698f

4
shells/scsh/Makefile
View File

@@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.43 2012/09/11 23:25:09 asau Exp $
# $NetBSD: Makefile,v 1.44 2015/01/04 04:04:23 dholland Exp $
DISTNAME= scsh-0.6.7
PKGREVISION= 1
@@ -11,7 +11,7 @@ HOMEPAGE= http://www.scsh.net/
COMMENT= Unix shell embedded into Scheme, with access to all Posix calls
LICENSE= modified-bsd
NOT_FOR_PLATFORM= ${LP64PLATFORMS} # Not 64-bit clean.
BROKEN_ON_PLATFORM= ${LP64PLATFORMS} # Not 64-bit clean.
GNU_CONFIGURE= yes

11
shells/standalone-tcsh/Makefile
View File

@@ -1,18 +1,19 @@
# $NetBSD: Makefile,v 1.23 2012/05/22 08:46:53 marino Exp $
# $NetBSD: Makefile,v 1.25 2015/03/15 18:32:12 tnn Exp $
#
# FIXME: This is because of PREFIX=/ below.
CHECK_FILES_SUPPORTED= no
NOT_FOR_UNPRIVILEGED= yes
PKGNAME= standalone-${DISTNAME}
WRKSRC= ${WRKDIR}/${DISTNAME}
PATCHDIR= ${.CURDIR}/../../shells/tcsh/patches
# DragonFly already has native /bin/tcsh
# This package is not restricted to ${LOCALBASE} and will replace system tcsh
# Instead, see shells/tcsh which installs at ${LOCALBASE}/bin/tcsh
NOT_FOR_PLATFORM+= DragonFly-*-*
# This package only makes sense on platforms that don't themselves ship tcsh
# in /bin. Otherwise it clobbers the native copy, which really isn't what
# anyone wants.
ONLY_FOR_PLATFORM+= NetBSD-*-* OpenBSD-*-* SunOS-*-*
.include "../../shells/tcsh/Makefile"

6
shells/static-ast-ksh/Makefile
View File

@@ -1,13 +1,15 @@
# $NetBSD: Makefile,v 1.13 2014/01/09 12:24:41 jperkin Exp $
# $NetBSD: Makefile,v 1.14 2014/11/06 12:25:36 joerg Exp $
#
.include "../../shells/ast-ksh/Makefile.common"
PKGREVISION= 1
CONFLICTS= ast-ksh-[0-9]* # Override.
DISTINFO_FILE= ${.CURDIR}/../../shells/ast-ksh/distinfo
PATCHDIR= ${.CURDIR}/../../shells/ast-ksh/patches
PKGDIR= ${.CURDIR}/../../shells/ast-ksh
PLIST_SRC= ${.CURDIR}/../../shells/ast-ksh/PLIST
DESCR_SRC?= ${.CURDIR}/../../shells/ast-ksh/DESCR
PKGNAME:= static-${PKGNAME}
COMMENT:= Statically-linked version of the ${COMMENT}

67
shells/tcsh/Makefile
View File

@@ -1,24 +1,21 @@
# $NetBSD: Makefile,v 1.76 2013/05/11 16:43:50 riastradh Exp $
# $NetBSD: Makefile,v 1.78 2015/01/20 11:00:32 hauke Exp $
DISTNAME= tcsh-6.18.01
PKGREVISION= 4
PKGREVISION= 6
CATEGORIES= shells
MASTER_SITES= ftp://ftp.astron.com/pub/tcsh/ \
ftp://ftp.funet.fi/pub/unix/shells/tcsh/
MAINTAINER= kim@tac.nyc.ny.us
HOMEPAGE= http://www.tcsh.org/Welcome
MAINTAINER= kim@NetBSD.org
HOMEPAGE= http://www.tcsh.org/
COMMENT= Extended C-shell with many useful features
LICENSE= original-bsd
CONFLICTS?= static-tcsh-[0-9]*
GNU_CONFIGURE= yes
BUILD_TARGET= all catalogs
INSTALL_TARGET= install install.man
NLSDIR= share/nls
PLIST_SRC= ${WRKDIR}/PLIST-src
EGDIR= ${PREFIX}/share/examples/tcsh
.include "../../mk/bsd.prefs.mk"
@@ -37,57 +34,9 @@ PKG_SHELL?= bin/tcsh
INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
post-install:
@${ECHO} "Installing message catalogues"
cp ${PKGDIR}/PLIST ${PLIST_SRC}
set -e; \
if [ -f ${WRKSRC}/tcsh.C.cat ]; \
then \
[ -d ${DESTDIR}${PREFIX}/${NLSDIR}/C ] || \
${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/${NLSDIR}/C; \
${INSTALL_DATA} ${WRKSRC}/tcsh.C.cat \
${DESTDIR}${PREFIX}/${NLSDIR}/C/tcsh.cat; \
${ECHO} ${NLSDIR}/C/tcsh.cat >> ${PLIST_SRC}; \
for i in \
et:ISO_8859-15:et:EE \
finnish:ISO_8859-1:fi:FI \
french:ISO_8859-1:fr:BE:CA:CH:FR \
german:ISO_8859-1:de:AT:CH:DE \
greek:ISO_8859-7:el:GR \
italian:ISO_8859-1:it:CH:IT \
ja:eucJP:ja:JP \
pl:ISO_8859-2:pl:PL \
russian:KOI8-R:ru:RU:SU \
spanish:ISO_8859-1:es:ES \
ukrainian:KOI8-U:uk:UA \
; \
do \
OIFS="$${IFS}"; \
IFS=":$${IFS}"; \
set -- $$i; \
IFS="$${OIFS}"; \
l=$$1; shift; \
s=$$1; shift; \
c=$$1; shift; \
o=; \
while [ $$# -gt 0 ]; \
do \
d=${NLSDIR}/$${c}_$$1.$${s}; \
[ -d ${DESTDIR}${PREFIX}/$$d ] || \
${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/$$d; \
if [ -z "$$o" ]; \
then \
o="$$d"; \
${INSTALL_DATA} ${WRKSRC}/tcsh.$${l}.cat \
${DESTDIR}${PREFIX}/$${d}/tcsh.cat; \
else \
${LN} -f ${DESTDIR}${PREFIX}/$${o}/tcsh.cat \
${DESTDIR}${PREFIX}/$${d}; \
fi; \
${ECHO} $${d}/tcsh.cat >> ${PLIST_SRC}; \
shift 1; \
done; \
done; \
fi
${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}
${INSTALL_DATA} ${WRKSRC}/complete.tcsh ${DESTDIR}${EGDIR}
${INSTALL_DATA} ${WRKSRC}/csh-mode.el ${DESTDIR}${EGDIR}
.include "../../mk/termcap.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"

16
shells/tcsh/PLIST
View File

@@ -1,3 +1,17 @@
@comment $NetBSD: PLIST,v 1.2 2002/11/17 09:02:02 salo Exp $
@comment $NetBSD: PLIST,v 1.4 2015/01/20 11:00:32 hauke Exp $
bin/tcsh
man/man1/tcsh.1
share/examples/tcsh/complete.tcsh
share/examples/tcsh/csh-mode.el
share/locale/C/LC_MESSAGES/tcsh.cat
share/locale/de/LC_MESSAGES/tcsh.cat
share/locale/es/LC_MESSAGES/tcsh.cat
share/locale/et/LC_MESSAGES/tcsh.cat
share/locale/fi/LC_MESSAGES/tcsh.cat
share/locale/fr/LC_MESSAGES/tcsh.cat
share/locale/gr/LC_MESSAGES/tcsh.cat
share/locale/it/LC_MESSAGES/tcsh.cat
share/locale/ja/LC_MESSAGES/tcsh.cat
share/locale/pl/LC_MESSAGES/tcsh.cat
share/locale/ru/LC_MESSAGES/tcsh.cat
share/locale/ru_UA.koi8u/LC_MESSAGES/tcsh.cat

4
shells/tcsh/distinfo
View File

@@ -1,4 +1,4 @@
$NetBSD: distinfo,v 1.31 2013/04/02 20:37:55 bsiegert Exp $
$NetBSD: distinfo,v 1.33 2014/05/25 03:59:17 rodent Exp $
SHA1 (tcsh-6.18.01.tar.gz) = eee2035645737197ff8059c84933a75d23cd76f9
RMD160 (tcsh-6.18.01.tar.gz) = ea18bb6d4d6dca2700d74daa2940f67d45a18cb9
@@ -7,4 +7,6 @@ SHA1 (patch-aa) = eadb2c1f4ad8bab7826c8e07c8edfc68569c74d4
SHA1 (patch-ab) = 8cf26988778b5331360eb1aab98bfcc920c71ac2
SHA1 (patch-ac) = c2a944f9c6857cdd8ba9753e3ce7c496749f8f87
SHA1 (patch-configure) = 91c2019da8c074bd6f24b84bf798ccd497110727
SHA1 (patch-nls_Makefile.in) = 50c6d7a038799db60393a4daf3a491961a40fdc7
SHA1 (patch-sh.c) = 9f7a1449a0ff0da5a3af886fcf86bdc551e10732
SHA1 (patch-sh.h) = ac6211ddd5e552e9baec2d35aed5e7e573cab04e

115
shells/tcsh/patches/patch-nls_Makefile.in Normal file
View File

@@ -0,0 +1,115 @@
$NetBSD: patch-nls_Makefile.in,v 1.1 2014/04/04 12:00:37 kim Exp $
Use allsrc as impsrc is not set for non-suffix rules.
This is fine because there is only one source per rule.
--- nls/Makefile.in.orig 2012-01-05 11:54:25.000000000 -0500
+++ nls/Makefile.in 2014-04-04 07:47:28.000000000 -0400
@@ -19,7 +19,7 @@
INSTALLED+=${localedir}/C/LC_MESSAGES/tcsh.cat
${localedir}/C/LC_MESSAGES/tcsh.cat: C.cat
mkdir -p $(@D)
- $(INSTALL) $< $@
+ $(INSTALL) $> $@
C.cat: ${srcdir}/C/charset ${srcdir}/C/*set[0-9]*
@${CATGEN} $(GENCAT) $@ $^ $>
@@ -27,7 +27,7 @@
INSTALLED+=${localedir}/et/LC_MESSAGES/tcsh.cat
${localedir}/et/LC_MESSAGES/tcsh.cat: et.cat
mkdir -p $(@D)
- $(INSTALL) $< $@
+ $(INSTALL) $> $@
et.cat: ${srcdir}/et/charset ${srcdir}/et/*set[0-9]*
@${CATGEN} $(GENCAT) $@ $^ $>
@@ -35,7 +35,7 @@
INSTALLED+=${localedir}/fi/LC_MESSAGES/tcsh.cat
${localedir}/fi/LC_MESSAGES/tcsh.cat: finnish.cat
mkdir -p $(@D)
- $(INSTALL) $< $@
+ $(INSTALL) $> $@
finnish.cat: ${srcdir}/finnish/charset ${srcdir}/finnish/*set[0-9]*
@${CATGEN} $(GENCAT) $@ $^ $>
@@ -43,7 +43,7 @@
INSTALLED+=${localedir}/fr/LC_MESSAGES/tcsh.cat
${localedir}/fr/LC_MESSAGES/tcsh.cat: french.cat
mkdir -p $(@D)
- $(INSTALL) $< $@
+ $(INSTALL) $> $@
french.cat: ${srcdir}/french/charset ${srcdir}/french/*set[0-9]*
@${CATGEN} $(GENCAT) $@ $^ $>
@@ -51,7 +51,7 @@
INSTALLED+=${localedir}/de/LC_MESSAGES/tcsh.cat
${localedir}/de/LC_MESSAGES/tcsh.cat: german.cat
mkdir -p $(@D)
- $(INSTALL) $< $@
+ $(INSTALL) $> $@
german.cat: ${srcdir}/german/charset ${srcdir}/german/*set[0-9]*
@${CATGEN} $(GENCAT) $@ $^ $>
@@ -59,7 +59,7 @@
INSTALLED+=${localedir}/gr/LC_MESSAGES/tcsh.cat
${localedir}/gr/LC_MESSAGES/tcsh.cat: greek.cat
mkdir -p $(@D)
- $(INSTALL) $< $@
+ $(INSTALL) $> $@
greek.cat: ${srcdir}/greek/charset ${srcdir}/greek/*set[0-9]*
@${CATGEN} $(GENCAT) $@ $^ $>
@@ -67,7 +67,7 @@
INSTALLED+=${localedir}/it/LC_MESSAGES/tcsh.cat
${localedir}/it/LC_MESSAGES/tcsh.cat: italian.cat
mkdir -p $(@D)
- $(INSTALL) $< $@
+ $(INSTALL) $> $@
italian.cat: ${srcdir}/italian/charset ${srcdir}/italian/*set[0-9]*
@${CATGEN} $(GENCAT) $@ $^ $>
@@ -75,7 +75,7 @@
INSTALLED+=${localedir}/ja/LC_MESSAGES/tcsh.cat
${localedir}/ja/LC_MESSAGES/tcsh.cat: ja.cat
mkdir -p $(@D)
- $(INSTALL) $< $@
+ $(INSTALL) $> $@
ja.cat: ${srcdir}/ja/charset ${srcdir}/ja/*set[0-9]*
@${CATGEN} $(GENCAT) $@ $^ $>
@@ -83,7 +83,7 @@
INSTALLED+=${localedir}/pl/LC_MESSAGES/tcsh.cat
${localedir}/pl/LC_MESSAGES/tcsh.cat: pl.cat
mkdir -p $(@D)
- $(INSTALL) $< $@
+ $(INSTALL) $> $@
pl.cat: ${srcdir}/pl/charset ${srcdir}/pl/*set[0-9]*
@${CATGEN} $(GENCAT) $@ $^ $>
@@ -91,7 +91,7 @@
INSTALLED+=${localedir}/ru/LC_MESSAGES/tcsh.cat
${localedir}/ru/LC_MESSAGES/tcsh.cat: russian.cat
mkdir -p $(@D)
- $(INSTALL) $< $@
+ $(INSTALL) $> $@
russian.cat: ${srcdir}/russian/charset ${srcdir}/russian/*set[0-9]*
@${CATGEN} $(GENCAT) $@ $^ $>
@@ -99,7 +99,7 @@
INSTALLED+=${localedir}/es/LC_MESSAGES/tcsh.cat
${localedir}/es/LC_MESSAGES/tcsh.cat: spanish.cat
mkdir -p $(@D)
- $(INSTALL) $< $@
+ $(INSTALL) $> $@
spanish.cat: ${srcdir}/spanish/charset ${srcdir}/spanish/*set[0-9]*
@${CATGEN} $(GENCAT) $@ $^ $>
@@ -107,7 +107,7 @@
INSTALLED+=${localedir}/ru_UA.koi8u/LC_MESSAGES/tcsh.cat
${localedir}/ru_UA.koi8u/LC_MESSAGES/tcsh.cat: ukrainian.cat
mkdir -p $(@D)
- $(INSTALL) $< $@
+ $(INSTALL) $> $@
ukrainian.cat: ${srcdir}/ukrainian/charset ${srcdir}/ukrainian/*set[0-9]*
@${CATGEN} $(GENCAT) $@ $^ $>

15
shells/tcsh/patches/patch-sh.h Normal file
View File

@@ -0,0 +1,15 @@
$NetBSD: patch-sh.h,v 1.1 2014/05/25 03:59:17 rodent Exp $
Add OpenBSD support.
--- sh.h.orig 2011-04-14 18:25:25.000000000 +0000
+++ sh.h
@@ -310,7 +310,7 @@ typedef long tcsh_number_t;
* redefines malloc(), so we define the following
* to avoid it.
*/
-# if defined(SYSMALLOC) || defined(__linux__) || defined(__GNU__) || defined(__GLIBC__) || defined(sgi) || defined(_OSD_POSIX)
+# if defined(SYSMALLOC) || defined(__linux__) || defined(__GNU__) || defined(__GLIBC__) || defined(sgi) || defined(_OSD_POSIX) || defined(__OpenBSD__)
# define NO_FIX_MALLOC
# include <stdlib.h>
# else /* glibc */

4
shells/xsh/Makefile
View File

@@ -1,8 +1,8 @@
# $NetBSD: Makefile,v 1.21 2013/12/09 14:17:52 obache Exp $
# $NetBSD: Makefile,v 1.22 2014/05/29 23:37:26 wiz Exp $
DISTNAME= XML-XSH-1.8.2
PKGNAME= ${DISTNAME:S/XML-XSH/xsh/}
PKGREVISION= 12
PKGREVISION= 13
CATEGORIES= shells
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xsh/}

5
shells/zsh/Makefile
View File

@@ -1,8 +1,9 @@
# $NetBSD: Makefile,v 1.65 2014/01/08 16:30:01 ryoon Exp $
# $NetBSD: Makefile,v 1.68 2015/02/04 09:22:34 snj Exp $
.include "../../shells/zsh/Makefile.common"
ZSH_VERSION= 5.0.5
ZSH_VERSION= 5.0.7
PKGREVISION= 1
ZSH_MAINTAINER= uebayasi@NetBSD.org
CONFIGURE_ARGS+= --disable-gdbm

5
shells/zsh/Makefile.common
View File

@@ -1,4 +1,4 @@
# $NetBSD: Makefile.common,v 1.72 2014/01/08 16:30:01 ryoon Exp $
# $NetBSD: Makefile.common,v 1.74 2015/02/02 13:54:59 jperkin Exp $
# used by shells/zsh/Makefile
# used by shells/zsh-current/Makefile
@@ -15,12 +15,11 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --enable-etcdir=${PKG_SYSCONFDIR:Q}
USE_LANGUAGES= c c99
USE_TOOLS+= makeinfo
INFO_FILES= yes
TEXINFO_REQD= 4.0
PKG_INSTALLATION_TYPES= overwrite pkgviews
.include "../../mk/bsd.prefs.mk"
.if ${OPSYS} == "Darwin"

20
shells/zsh/PLIST
View File

@@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.29 2014/01/08 16:30:01 ryoon Exp $
@comment $NetBSD: PLIST,v 1.30 2014/12/12 08:27:47 wiz Exp $
bin/zsh
bin/${PKGNAME}
info/zsh.info
@@ -92,7 +92,7 @@ share/zsh/${PKGVERSION}/functions/VCS_INFO_quilt
share/zsh/${PKGVERSION}/functions/VCS_INFO_realpath
share/zsh/${PKGVERSION}/functions/VCS_INFO_reposub
share/zsh/${PKGVERSION}/functions/VCS_INFO_set
share/zsh/${PKGVERSION}/functions/_SuSEconfig
share/zsh/${PKGVERSION}/functions/_SUSEconfig
share/zsh/${PKGVERSION}/functions/_a2ps
share/zsh/${PKGVERSION}/functions/_a2utils
share/zsh/${PKGVERSION}/functions/_aap
@@ -126,6 +126,7 @@ share/zsh/${PKGVERSION}/functions/_arrays
share/zsh/${PKGVERSION}/functions/_assign
share/zsh/${PKGVERSION}/functions/_at
share/zsh/${PKGVERSION}/functions/_attr
share/zsh/${PKGVERSION}/functions/_augeas
share/zsh/${PKGVERSION}/functions/_auto-apt
share/zsh/${PKGVERSION}/functions/_autocd
share/zsh/${PKGVERSION}/functions/_awk
@@ -139,6 +140,7 @@ share/zsh/${PKGVERSION}/functions/_bindkey
share/zsh/${PKGVERSION}/functions/_bison
share/zsh/${PKGVERSION}/functions/_bittorrent
share/zsh/${PKGVERSION}/functions/_bogofilter
share/zsh/${PKGVERSION}/functions/_bpython
share/zsh/${PKGVERSION}/functions/_brace_parameter
share/zsh/${PKGVERSION}/functions/_brctl
share/zsh/${PKGVERSION}/functions/_bsd_pkg
@@ -166,6 +168,7 @@ share/zsh/${PKGVERSION}/functions/_chkconfig
share/zsh/${PKGVERSION}/functions/_chmod
share/zsh/${PKGVERSION}/functions/_chown
share/zsh/${PKGVERSION}/functions/_chrt
share/zsh/${PKGVERSION}/functions/_chsh
share/zsh/${PKGVERSION}/functions/_clay
share/zsh/${PKGVERSION}/functions/_combination
share/zsh/${PKGVERSION}/functions/_comm
@@ -236,6 +239,7 @@ share/zsh/${PKGVERSION}/functions/_django
share/zsh/${PKGVERSION}/functions/_dladm
share/zsh/${PKGVERSION}/functions/_dlocate
share/zsh/${PKGVERSION}/functions/_dmidecode
share/zsh/${PKGVERSION}/functions/_docker
share/zsh/${PKGVERSION}/functions/_domains
share/zsh/${PKGVERSION}/functions/_dpatch-edit-patch
share/zsh/${PKGVERSION}/functions/_dpkg
@@ -244,6 +248,7 @@ share/zsh/${PKGVERSION}/functions/_dpkg-cross
share/zsh/${PKGVERSION}/functions/_dpkg-repack
share/zsh/${PKGVERSION}/functions/_dpkg_source
share/zsh/${PKGVERSION}/functions/_dput
share/zsh/${PKGVERSION}/functions/_dsh
share/zsh/${PKGVERSION}/functions/_dtrace
share/zsh/${PKGVERSION}/functions/_du
share/zsh/${PKGVERSION}/functions/_dumpadm
@@ -267,6 +272,7 @@ share/zsh/${PKGVERSION}/functions/_ethtool
share/zsh/${PKGVERSION}/functions/_expand
share/zsh/${PKGVERSION}/functions/_expand_alias
share/zsh/${PKGVERSION}/functions/_expand_word
share/zsh/${PKGVERSION}/functions/_extensions
share/zsh/${PKGVERSION}/functions/_fakeroot
share/zsh/${PKGVERSION}/functions/_fc
share/zsh/${PKGVERSION}/functions/_feh
@@ -437,6 +443,7 @@ share/zsh/${PKGVERSION}/functions/_module-assistant
share/zsh/${PKGVERSION}/functions/_modutils
share/zsh/${PKGVERSION}/functions/_mondo
share/zsh/${PKGVERSION}/functions/_monotone
share/zsh/${PKGVERSION}/functions/_moosic
share/zsh/${PKGVERSION}/functions/_mosh
share/zsh/${PKGVERSION}/functions/_most_recent_file
share/zsh/${PKGVERSION}/functions/_mount
@@ -472,6 +479,7 @@ share/zsh/${PKGVERSION}/functions/_notmuch
share/zsh/${PKGVERSION}/functions/_npm
share/zsh/${PKGVERSION}/functions/_nslookup
share/zsh/${PKGVERSION}/functions/_object_classes
share/zsh/${PKGVERSION}/functions/_od
share/zsh/${PKGVERSION}/functions/_okular
share/zsh/${PKGVERSION}/functions/_oldlist
share/zsh/${PKGVERSION}/functions/_open
@@ -581,6 +589,7 @@ share/zsh/${PKGVERSION}/functions/_schroot
share/zsh/${PKGVERSION}/functions/_screen
share/zsh/${PKGVERSION}/functions/_sed
share/zsh/${PKGVERSION}/functions/_sep_parts
share/zsh/${PKGVERSION}/functions/_sequence
share/zsh/${PKGVERSION}/functions/_service
share/zsh/${PKGVERSION}/functions/_services
share/zsh/${PKGVERSION}/functions/_set
@@ -604,6 +613,7 @@ share/zsh/${PKGVERSION}/functions/_source
share/zsh/${PKGVERSION}/functions/_spamassassin
share/zsh/${PKGVERSION}/functions/_sqlite
share/zsh/${PKGVERSION}/functions/_sqsh
share/zsh/${PKGVERSION}/functions/_ss
share/zsh/${PKGVERSION}/functions/_ssh
share/zsh/${PKGVERSION}/functions/_sshfs
share/zsh/${PKGVERSION}/functions/_stat
@@ -626,6 +636,8 @@ share/zsh/${PKGVERSION}/functions/_svcs
share/zsh/${PKGVERSION}/functions/_svcs_fmri
share/zsh/${PKGVERSION}/functions/_svn-buildpackage
share/zsh/${PKGVERSION}/functions/_sysctl
share/zsh/${PKGVERSION}/functions/_sysstat
share/zsh/${PKGVERSION}/functions/_system_profiler
share/zsh/${PKGVERSION}/functions/_systemd
share/zsh/${PKGVERSION}/functions/_tags
share/zsh/${PKGVERSION}/functions/_tar
@@ -671,7 +683,6 @@ share/zsh/${PKGVERSION}/functions/_unhash
share/zsh/${PKGVERSION}/functions/_uniq
share/zsh/${PKGVERSION}/functions/_unison
share/zsh/${PKGVERSION}/functions/_units
share/zsh/${PKGVERSION}/functions/_unsetopt
share/zsh/${PKGVERSION}/functions/_update-alternatives
share/zsh/${PKGVERSION}/functions/_update-rc.d
share/zsh/${PKGVERSION}/functions/_urls
@@ -817,6 +828,7 @@ share/zsh/${PKGVERSION}/functions/delete-whole-word-match
share/zsh/${PKGVERSION}/functions/down-case-word-match
share/zsh/${PKGVERSION}/functions/down-line-or-beginning-search
share/zsh/${PKGVERSION}/functions/edit-command-line
share/zsh/${PKGVERSION}/functions/expand-absolute-path
share/zsh/${PKGVERSION}/functions/forward-word-match
share/zsh/${PKGVERSION}/functions/getjobs
share/zsh/${PKGVERSION}/functions/harden
@@ -865,6 +877,7 @@ share/zsh/${PKGVERSION}/functions/quote-and-complete-word
share/zsh/${PKGVERSION}/functions/read-from-minibuffer
share/zsh/${PKGVERSION}/functions/regexp-replace
share/zsh/${PKGVERSION}/functions/relative
share/zsh/${PKGVERSION}/functions/replace-argument
share/zsh/${PKGVERSION}/functions/replace-string
share/zsh/${PKGVERSION}/functions/replace-string-again
share/zsh/${PKGVERSION}/functions/run-help
@@ -914,6 +927,7 @@ share/zsh/${PKGVERSION}/functions/which-command
share/zsh/${PKGVERSION}/functions/xtermctl
share/zsh/${PKGVERSION}/functions/zargs
share/zsh/${PKGVERSION}/functions/zcalc
share/zsh/${PKGVERSION}/functions/zcalc-auto-insert
share/zsh/${PKGVERSION}/functions/zed
share/zsh/${PKGVERSION}/functions/zed-set-file-name
${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/zfanon

11
shells/zsh/distinfo
View File

@@ -1,8 +1,9 @@
$NetBSD: distinfo,v 1.46 2014/01/08 16:30:01 ryoon Exp $
$NetBSD: distinfo,v 1.51 2015/03/19 12:34:37 jperkin Exp $
SHA1 (zsh-5.0.5.tar.bz2) = 75426146bce45ee176d9d50b32f1ced78418ae16
RMD160 (zsh-5.0.5.tar.bz2) = 4299f33ba0de2542f7567ae4f16a4de16ba560a0
Size (zsh-5.0.5.tar.bz2) = 3104375 bytes
SHA1 (patch-ac) = f83e5f38c262c779f32e0368815ce02308bc3fff
SHA1 (zsh-5.0.7.tar.bz2) = 1500191d16af8a71aec4f719a92775a074682096
RMD160 (zsh-5.0.7.tar.bz2) = 4b1aac38996414783522762b5a8677533bf77d2d
Size (zsh-5.0.7.tar.bz2) = 3181030 bytes
SHA1 (patch-Completion_Base_Utility__call__program) = 3abf3a4f8ef77e6e84038a1fb552f1ac0e1e5041
SHA1 (patch-ac) = 75c1b9e56858289adf9f1d9c58d2319bb6df7abc
SHA1 (patch-aczsh.m4) = 36c270d8d7cf727f48787ef889b2bd89cbf065e2
SHA1 (patch-configure.ac) = e34bbae6385442b51a7263b22681898203d0c013

19
shells/zsh/patches/patch-Completion_Base_Utility__call__program Normal file
View File

@@ -0,0 +1,19 @@
$NetBSD: patch-Completion_Base_Utility__call__program,v 1.1 2015/02/04 09:22:34 snj Exp $
Revision 22c4ea424ce2e8febce04d324c5ec9898f5d534b upstream.
Thix fixes, at the very least, issues with cvs command/filename completion.
--- Completion/Base/Utility/_call_program.orig 2014-09-24 11:03:17.000000000 -0700
+++ Completion/Base/Utility/_call_program 2015-02-04 00:52:56.000000000 -0800
@@ -2,8 +2,8 @@
local tmp err_fd=-1
-if (( ${debug_fd:--1} > 2 ))
-then exec {err_fd}>&2 # debug_fd is saved stderr, 2 is log file
+if (( ${debug_fd:--1} > 2 )) || [[ ! -t 2 ]]
+then exec {err_fd}>&2 # debug_fd is saved stderr, 2 is trace or redirect
else exec {err_fd}>/dev/null
fi

85
shells/zsh/patches/patch-ac
View File

@@ -1,72 +1,35 @@
$NetBSD: patch-ac,v 1.29 2013/05/10 01:17:33 riastradh Exp $
$NetBSD: patch-ac,v 1.31 2015/03/19 12:34:37 jperkin Exp $
First chunk:
Add support for thread limits.
From Peter Stephenson <Peter.Stephenson@csr.com> on zsh-workers.
Accepted by Peter Stephenson <p.w.stephenson@ntlworld.com> on
zsh-workers on 2012-08-16.
Don't use _POSIX_C_SOURCE on SunOS with c99.
Middle chunks:
Next chunks:
Use a compile test, not a run test, for whether various rlimit values
are equivalent. A compile test is sufficient because zsh uses these
values in switch cases, so they must be compile-time, if not
preprocessor-time, constants.
Last chunk:
Last-but-one chunk:
Make this package build on Interix. Patches provided by Hiramatsu
Yoshifumi in PR pkg/25946.
Last chunk only:
Don't force -Wl,--whole-archive for NetBSD, it breaks the build with
clang, which doesn't have a reason to disable it again.
Accepted by Peter Stephenson <p.w.stephenson@ntlworld.com> on
zsh-workers on 2012-08-16.
--- configure.orig 2012-09-15 20:13:14.000000000 +0000
Last chunk:
Use -shared instead of -G on SunOS.
Fixes 64-bit package.
--- configure.orig 2014-09-23 18:56:57.000000000 +0000
+++ configure
@@ -9645,6 +9645,42 @@ if test $zsh_cv_have_RLIMIT_NTHR = yes;
fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for limit RLIMIT_NTHR" >&5
+$as_echo_n "checking for limit RLIMIT_NTHR... " >&6; }
+if ${zsh_cv_have_RLIMIT_NTHR+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+#include <sys/types.h>
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
@@ -7645,7 +7645,9 @@ if ${zsh_cv_type_sigset_t+:} false; then
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
+#ifndef __sun
#define _POSIX_C_SOURCE 200809L
+#endif
+#include <sys/resource.h>
+int
+main ()
+{
+RLIMIT_NTHR
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ zsh_cv_have_RLIMIT_NTHR=yes
+else
+ zsh_cv_have_RLIMIT_NTHR=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_have_RLIMIT_NTHR" >&5
+$as_echo "$zsh_cv_have_RLIMIT_NTHR" >&6; }
+
+if test $zsh_cv_have_RLIMIT_NTHR = yes; then
+ $as_echo "#define HAVE_RLIMIT_NTHR 1" >>confdefs.h
+
+fi
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for limit RLIMIT_NOFILE" >&5
$as_echo_n "checking for limit RLIMIT_NOFILE... " >&6; }
if ${zsh_cv_have_RLIMIT_NOFILE+:} false; then :
@@ -10011,9 +10047,6 @@ $as_echo_n "checking if RLIMIT_VMEM and
#include <sys/types.h>
#include <signal.h>
int
@@ -10233,9 +10235,6 @@ $as_echo_n "checking if RLIMIT_VMEM and
if ${zsh_cv_rlimit_vmem_is_rss+:} false; then :
$as_echo_n "(cached) " >&6
else
@@ -76,7 +39,7 @@ zsh-workers on 2012-08-16.
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -10022,43 +10055,33 @@ else
@@ -10244,43 +10243,33 @@ else
#include <sys/time.h>
#endif
#include <sys/resource.h>
@@ -127,7 +90,7 @@ zsh-workers on 2012-08-16.
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -10067,43 +10090,33 @@ else
@@ -10289,43 +10278,33 @@ else
#include <sys/time.h>
#endif
#include <sys/resource.h>
@@ -178,7 +141,7 @@ zsh-workers on 2012-08-16.
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -10112,28 +10125,23 @@ else
@@ -10334,28 +10313,23 @@ else
#include <sys/time.h>
#endif
#include <sys/resource.h>
@@ -214,7 +177,7 @@ zsh-workers on 2012-08-16.
if test x$zsh_cv_rlimit_rss_is_as = xyes; then
$as_echo "#define RLIMIT_RSS_IS_AS 1" >>confdefs.h
@@ -11630,6 +11638,10 @@ $as_echo "$zsh_cv_sys_elf" >&6; }
@@ -11852,6 +11826,10 @@ $as_echo "$zsh_cv_sys_elf" >&6; }
DLLD="${DLLD=$CC}"
DLLDARG=""
;;
@@ -225,7 +188,7 @@ zsh-workers on 2012-08-16.
* )
DLLD="${DLLD=ld}"
DLLDARG=""
@@ -11659,7 +11699,7 @@ $as_echo "$zsh_cv_sys_elf" >&6; }
@@ -11881,7 +11859,7 @@ $as_echo "$zsh_cv_sys_elf" >&6; }
sunos*) DLLDFLAGS="${DLLDFLAGS=-assert nodefinitions}" ;;
sysv4*|esix*) DLLDFLAGS="${DLLDFLAGS=-G $ldflags}" ;;
aix*) DLLDFLAGS="${DLLDFLAGS=-G -bexpall -lc}" ;;