Re: UPDATE: shells/zsh

2020-03-29 Thread Matthew Martin 
On Sat, Mar 28, 2020 at 09:46:56AM +0100, Rafael Sadowski wrote:
> On Sat Mar 14, 2020 at 04:31:00PM -0500, Matthew Martin wrote:
> > On Sat, Mar 14, 2020 at 08:21:10PM +0100, Rafael Sadowski wrote:
> > > "Security and bug fix release with a few user visible additions."
> > > Changelog: http://zsh.sourceforge.net/releases.html
> > > 
> > > This release fixes CVE-2019-20044. (Not tested on OpenBSD)
> > > 
> > > OK? Should it go into -stable without the @so changes?
> > 
> > I have the same diff locally; however, I didn't send it because make
> > test hangs in V08zpty and I haven't had time to look into it yet (the
> 
> ./V08zpty.ztst: starting.
> ./V08zpty.ztst: all tests successful.
> 
> with
> 
> OpenBSD 6.6-current (GENERIC.MP) #80: Thu Mar 26 22:10:03 MDT 2020
> dera...@amd64.openbsd.org:/usr/src/sys/arch/amd64/compile/GENERIC.MP

Same here after updating base. Runs fine as well.

(Aside during testing a race in W02 turned up; but since it's
reproducable in 5.7.1, I see no reason to hold up the update.)

Re: UPDATE: shells/zsh

2020-03-28 Thread Rafael Sadowski 
On Sat Mar 14, 2020 at 04:31:00PM -0500, Matthew Martin wrote:
> On Sat, Mar 14, 2020 at 08:21:10PM +0100, Rafael Sadowski wrote:
> > "Security and bug fix release with a few user visible additions."
> > Changelog: http://zsh.sourceforge.net/releases.html
> > 
> > This release fixes CVE-2019-20044. (Not tested on OpenBSD)
> > 
> > OK? Should it go into -stable without the @so changes?
> 
> I have the same diff locally; however, I didn't send it because make
> test hangs in V08zpty and I haven't had time to look into it yet (the

./V08zpty.ztst: starting.
./V08zpty.ztst: all tests successful.

with

OpenBSD 6.6-current (GENERIC.MP) #80: Thu Mar 26 22:10:03 MDT 2020
dera...@amd64.openbsd.org:/usr/src/sys/arch/amd64/compile/GENERIC.MP


> failure in D07multibyte is normal on OpenBSD). Does it not hang for you?
> 
> Personally I think CVE-2019-20044 and the PRIVILEGED option are dumb and
> one shouldn't write security critical things in shell scripts, but I'm
> not against backporting it.
>

Re: UPDATE: shells/zsh

2020-03-15 Thread Rafael Sadowski 
On Sat Mar 14, 2020 at 04:31:00PM -0500, Matthew Martin wrote:
> On Sat, Mar 14, 2020 at 08:21:10PM +0100, Rafael Sadowski wrote:
> > "Security and bug fix release with a few user visible additions."
> > Changelog: http://zsh.sourceforge.net/releases.html
> > 
> > This release fixes CVE-2019-20044. (Not tested on OpenBSD)
> > 
> > OK? Should it go into -stable without the @so changes?
> 
> I have the same diff locally; however, I didn't send it because make
> test hangs in V08zpty and I haven't had time to look into it yet (the
> failure in D07multibyte is normal on OpenBSD). Does it not hang for you?

Yes I see the same hanging test. No time to look deeper for now.

> 
> Personally I think CVE-2019-20044 and the PRIVILEGED option are dumb and
> one shouldn't write security critical things in shell scripts, but I'm
> not against backporting it.
>

Re: UPDATE: shells/zsh

2020-03-14 Thread Matthew Martin 
On Sat, Mar 14, 2020 at 08:21:10PM +0100, Rafael Sadowski wrote:
> "Security and bug fix release with a few user visible additions."
> Changelog: http://zsh.sourceforge.net/releases.html
> 
> This release fixes CVE-2019-20044. (Not tested on OpenBSD)
> 
> OK? Should it go into -stable without the @so changes?

I have the same diff locally; however, I didn't send it because make
test hangs in V08zpty and I haven't had time to look into it yet (the
failure in D07multibyte is normal on OpenBSD). Does it not hang for you?

Personally I think CVE-2019-20044 and the PRIVILEGED option are dumb and
one shouldn't write security critical things in shell scripts, but I'm
not against backporting it.

Re: UPDATE: shells/zsh

2019-03-11 Thread Pierre-Emmanuel Andre 
On Sat, Mar 09, 2019 at 11:24:13PM +, Stuart Henderson wrote:
> On 2019/03/10 00:13, Rafael Sadowski wrote:
> > Simple update to the latest stable version.
> > 
> > Release Notes:
> > 
> > http://zsh.sourceforge.net/releases.html
> > 
> > OK?
> 
> Matthew Martin sent an update for this already, his most recent mail
> about it was 2 days ago ..
> 
> 190204 2359 [  L] 6534 update: shells/zsh 5.7.1         Matthew Martin
> 190214 1623 [  L] 9728 Re: update: shells/zsh 5.7.1         
> Pierre-Emmanuel Andre
> 190215 0143 [  L] 9850 Re: update: shells/zsh 5.7.1         Matthew Martin
> 190307 0422 [  L] 16624 Re: update: shells/zsh 5.7.1 Matthew 
> Martin
> 190309 2313 [  L] 17518 UPDATE: shells/zsh   Rafael 
> Sadowski
> 

It's committed :)
Regards,

Re: update: shells/zsh 5.7.1

2019-03-09 Thread Rafael Sadowski 
On Thu Feb 14, 2019 at 07:43:55PM -0600, Matthew Martin wrote:
> 
> Both make test and env -i make test complete with just the usual failure in 
> D07.
> 

Same here on amd64. OK with me.

Re: UPDATE: shells/zsh

2019-03-09 Thread Stuart Henderson 
On 2019/03/10 00:13, Rafael Sadowski wrote:
> Simple update to the latest stable version.
> 
> Release Notes:
> 
> http://zsh.sourceforge.net/releases.html
> 
> OK?

Matthew Martin sent an update for this already, his most recent mail
about it was 2 days ago ..

190204 2359 [  L] 6534 update: shells/zsh 5.7.1 Matthew Martin
190214 1623 [  L] 9728 Re: update: shells/zsh 5.7.1 Pierre-Emmanuel 
Andre
190215 0143 [  L] 9850 Re: update: shells/zsh 5.7.1 Matthew Martin
190307 0422 [  L] 16624 Re: update: shells/zsh 5.7.1 Matthew Martin
190309 2313 [  L] 17518 UPDATE: shells/zsh   Rafael Sadowski

Re: update: shells/zsh 5.7.1

2019-03-06 Thread Matthew Martin 
ping

On Mon, Feb 4, 2019 at 5:59 PM Matthew Martin  wrote:
>
> Bump zsh to 5.7.1 (5.7 had a bug in vcs_info). Tests pass (just the
> usual failure in D07) and it's running fine here.
>
> Switch to CONFIGURE_STYLE=gnu since there are no autoconf patches
> (reverting a change from 2004). The generated configure does indeed
> match what we'd generate.
>
> Drop PORTHOME and TEST_FLAGS; the rationale from
> shells/zsh/stable/Makefile 1.8 in 2001 was "allow target regress w/o
> being root." The tests run fine without these variables now.
>
> Util/reporter and Util/check-tmux-state are not installed as can be
> check with a quick grep against PLIST. Doc/zsh.texi isn't used to
> generate docs as thankfully upstream provides generated docs. The
> remainder of EXTFILES are all in Functions and intended to be
> autoloaded. I think EXTFILES and pre-configure can be dropped, but the
> commit message in 1.67 isn't clear on why they were added.
>
> I'm unable to send emails from mutt for some reason, so the diff is
> attached as well in case gmail munges things.
>
>
> diff --git Makefile Makefile
> index 69b739e9334..098479dc707 100644
> --- Makefile
> +++ Makefile
> @@ -2,7 +2,7 @@
>
>  COMMENT= Z shell, Bourne shell-compatible
>
> -V= 5.6.2
> +V= 5.7.1
>  DISTNAME= zsh-$V
>  CATEGORIES= shells
>
> @@ -23,8 +23,7 @@ WANTLIB= c curses iconv m pcre
>  LIB_DEPENDS= converters/libiconv \
>   devel/pcre
>
> -AUTOCONF_VERSION=2.69
> -CONFIGURE_STYLE=autoconf
> +CONFIGURE_STYLE=gnu
>  CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
>   LDFLAGS="-L${LOCALBASE}/lib"
>
> @@ -39,25 +38,16 @@ CONFIGURE_ARGS= --enable-zsh-mem \
>
>  SUBST_VARS= V
>
> -# required for regression tests
> -PORTHOME= ${WRKDIR}
> -TEST_FLAGS= INSTALL_PROGRAM="install -c -s -m 555" \
> - INSTALL_DATA="install -c -m 444" \
> - INSTALL="install -c" \
> - TMPPREFIX=${WRKBUILD}/tmp \
> - TERM=xterm
> -
> -EXTFILES= Functions/Misc/checkmail Functions/Misc/run-help \
> - Functions/Misc/run-help-ip Functions/Misc/sticky-note \
> - Functions/Misc/zcalc Functions/Misc/zed Functions/Misc/zkbd \
> - Functions/Calendar/calendar_add Functions/Example/cat \
> - Functions/Example/zless Test/ztst.zsh Test/runtests.zsh \
> - Util/reporter Util/check-tmux-state Doc/zsh.texi
> +EXTFILES= Calendar/calendar_add Example/cat Example/zless \
> + Misc/checkmail Misc/run-help \
> + Misc/run-help-ip \
> + Misc/sticky-note Misc/zcalc \
> + Misc/zed Misc/zkbd
>
>  pre-configure:
>  .for i in ${EXTFILES}
>   sed -i -e "s,/bin/zsh,${TRUEPREFIX}/bin/zsh,g" \
> - ${WRKSRC}/${i}
> + ${WRKSRC}/Functions/${i}
>  .endfor
>
>  .include 
> diff --git distinfo distinfo
> index 9e74544bf66..94271329f48 100644
> --- distinfo
> +++ distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (zsh-5.6.2.tar.xz) = pQvWbAVX6OyjuPok6F0N5TPnddeiLfBC2pBIhiN1Lp4=
> -SIZE (zsh-5.6.2.tar.xz) = 3077368
> +SHA256 (zsh-5.7.1.tar.xz) = cmApLCwdSDstUP6/pQVRdr1RKzKogzsRYXe/XwHnfug=
> +SIZE (zsh-5.7.1.tar.xz) = 3126308
> diff --git pkg/PLIST pkg/PLIST
> index c9376e94025..b8574c2abbd 100644
> --- pkg/PLIST
> +++ pkg/PLIST
> @@ -19,6 +19,7 @@ lib/zsh/${V}/zsh/files.so
>  lib/zsh/${V}/zsh/langinfo.so
>  lib/zsh/${V}/zsh/mapfile.so
>  lib/zsh/${V}/zsh/mathfunc.so
> +lib/zsh/${V}/zsh/nearcolor.so
>  lib/zsh/${V}/zsh/net/
>  lib/zsh/${V}/zsh/net/socket.so
>  lib/zsh/${V}/zsh/net/tcp.so
> @@ -238,6 +239,7 @@ share/zsh/${V}/functions/Completion/Darwin/_scutil
>  share/zsh/${V}/functions/Completion/Darwin/_softwareupdate
>  share/zsh/${V}/functions/Completion/Darwin/_sw_vers
>  share/zsh/${V}/functions/Completion/Darwin/_system_profiler
> +share/zsh/${V}/functions/Completion/Darwin/_xcode-select
>  share/zsh/${V}/functions/Completion/Debian/
>  share/zsh/${V}/functions/Completion/Debian/_a2utils
>  share/zsh/${V}/functions/Completion/Debian/_apt
> @@ -336,6 +338,7 @@ share/zsh/${V}/functions/Completion/Linux/_pkgtool
>  share/zsh/${V}/functions/Completion/Linux/_qdbus
>  share/zsh/${V}/functions/Completion/Linux/_rpmbuild
>  share/zsh/${V}/functions/Completion/Linux/_schedtool
> +share/zsh/${V}/functions/Completion/Linux/_setsid
>  share/zsh/${V}/functions/Completion/Linux/_ss
>  share/zsh/${V}/functions/Completion/Linux/_sshfs
>  share/zsh/${V}/functions/Completion/Linux/_strace
> @@ -399,6 +402,8 @@ share/zsh/${V}/functions/Completion/Unix/_arch_archives
>  share/zsh/${V}/functions/Completion/Unix/_arch_namespace
>  share/zsh/${V}/functions/Completion/Unix/_arp
>  share/zsh/${V}/functions/Completion/Unix/_arping
> +share/zsh/${V}/functions/Completion/Unix/_asciidoctor
> +share/zsh/${V}/functions/Completion/Unix/_asciinema
>  share/zsh/${V}/functions/Completion/Unix/_at
>  share/zsh/${V}/functions/Completion/Unix/_attr
>  share/zsh/${V}/functions/Completion/Unix/_augeas
> @@ -439,6 +444,7 @@ share/zsh/${V}/functions/Completion/Unix/_cmdstring
>  share/zsh/${V}/functions/Completion/Unix/_cmp
>  share/zsh/${V}/functions/Completion/Unix/_column
>  share/zsh/${V}/functions/Completion/Unix/_comm
>

Re: update: shells/zsh 5.7.1

2019-02-14 Thread Matthew Martin 
On Thu, Feb 14, 2019 at 10:23 AM Pierre-Emmanuel Andre  
wrote:
>
> On Mon, Feb 04, 2019 at 05:59:35PM -0600, Matthew Martin wrote:
> > Bump zsh to 5.7.1 (5.7 had a bug in vcs_info). Tests pass (just the
> > usual failure in D07) and it's running fine here.
> >
> > Switch to CONFIGURE_STYLE=gnu since there are no autoconf patches
> > (reverting a change from 2004). The generated configure does indeed
> > match what we'd generate.
> >
> > Drop PORTHOME and TEST_FLAGS; the rationale from
> > shells/zsh/stable/Makefile 1.8 in 2001 was "allow target regress w/o
> > being root." The tests run fine without these variables now.
> >
>
> The regress tests run fine for you ?
> On my machine, they hang forever here:
> ./V08zpty.ztst: starting.
>
> The rest of the diff looks good.
>
> [...]

Both make test and env -i make test complete with just the usual failure in D07.

Re: update: shells/zsh 5.7.1

2019-02-14 Thread Pierre-Emmanuel Andre 
On Mon, Feb 04, 2019 at 05:59:35PM -0600, Matthew Martin wrote:
> Bump zsh to 5.7.1 (5.7 had a bug in vcs_info). Tests pass (just the
> usual failure in D07) and it's running fine here.
> 
> Switch to CONFIGURE_STYLE=gnu since there are no autoconf patches
> (reverting a change from 2004). The generated configure does indeed
> match what we'd generate.
> 
> Drop PORTHOME and TEST_FLAGS; the rationale from
> shells/zsh/stable/Makefile 1.8 in 2001 was "allow target regress w/o
> being root." The tests run fine without these variables now.
>

The regress tests run fine for you ?
On my machine, they hang forever here:
./V08zpty.ztst: starting.

The rest of the diff looks good.

[...]

Re: UPDATE: shells/zsh

2018-09-16 Thread Rafael Sadowski 
On Sat Sep 15, 2018 at 06:37:44PM +0200, Klemens Nanni wrote:
> On Sat, Sep 15, 2018 at 10:04:26AM +0200, Rafael Sadowski wrote:
> > +MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=zsh/} \
> > +   http://www.zsh.org/pub/
> Has TLS.
> 
 

Thanks!

Index: Makefile
===
RCS file: /cvs/ports/shells/zsh/Makefile,v
retrieving revision 1.88
diff -u -p -u -p -r1.88 Makefile
--- Makefile21 Apr 2018 09:24:06 -  1.88
+++ Makefile16 Sep 2018 17:03:23 -
@@ -2,7 +2,7 @@
 
 COMMENT=   Z shell, Bourne shell-compatible
 
-V= 5.5.1
+V= 5.6.2
 DISTNAME=  zsh-$V
 CATEGORIES=shells
 
@@ -10,8 +10,10 @@ MAINTAINER=  Pierre-Emmanuel Andre https://www.zsh.org/
 
-MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=zsh/}
-MASTER_SITES+= http://www.zsh.org/pub/
+MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=zsh/} \
+   https://www.zsh.org/pub/
+
+EXTRACT_SUFX=  .tar.xz
 
 # BSD
 PERMIT_PACKAGE_CDROM=  Yes
@@ -23,15 +25,17 @@ LIB_DEPENDS=converters/libiconv \
 
 AUTOCONF_VERSION=2.69
 CONFIGURE_STYLE=autoconf
-CONFIGURE_ENV=  CPPFLAGS="-I${LOCALBASE}/include" \
-LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+   LDFLAGS="-L${LOCALBASE}/lib"
+
 CONFIGURE_ARGS=--enable-zsh-mem \
--enable-zsh-secure-free \
--enable-maildir-support \
-   --with-tcsetpgrp \
+   --enable-function-subdirs \
--enable-multibyte \
--enable-pcre \
-   --disable-gdbm
+   --disable-gdbm \
+   --with-tcsetpgrp
 
 SUBST_VARS=V
 
@@ -42,22 +46,18 @@ TEST_FLAGS= INSTALL_PROGRAM="install -c 
INSTALL="install -c" \
TMPPREFIX=${WRKBUILD}/tmp \
TERM=xterm
-EXTFILES=  Misc/checkmail Misc/run-help \
-   Misc/sticky-note Misc/zcalc \
-   Misc/zed Misc/zkbd \
-   Calendar/calendar_add Example/cat Example/zless
+
+EXTFILES=  Functions/Misc/checkmail Functions/Misc/run-help \
+   Functions/Misc/run-help-ip Functions/Misc/sticky-note \
+   Functions/Misc/zcalc Functions/Misc/zed Functions/Misc/zkbd \
+   Functions/Calendar/calendar_add Functions/Example/cat \
+   Functions/Example/zless Test/ztst.zsh Test/runtests.zsh \
+   Util/reporter Util/check-tmux-state Doc/zsh.texi
 
 pre-configure:
 .for i in ${EXTFILES}
sed -i -e "s,/bin/zsh,${TRUEPREFIX}/bin/zsh,g" \
-   ${WRKSRC}/Functions/${i}
+   ${WRKSRC}/${i}
 .endfor
-   @find ${WRKSRC} -name "*.orig" -delete
-
-post-install:
-   ${INSTALL_DATA_DIR} ${PREFIX}/share/zsh/$V/scripts/
-
-pre-test:
-   rm -f ${WRKDIR}/bin/chgrp
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/shells/zsh/distinfo,v
retrieving revision 1.28
diff -u -p -u -p -r1.28 distinfo
--- distinfo21 Apr 2018 09:24:34 -  1.28
+++ distinfo16 Sep 2018 17:03:23 -
@@ -1,2 +1,2 @@
-SHA256 (zsh-5.5.1.tar.gz) = d0yqieeupfM8MDPL/9k+KHB/crpRSceXCeSObC0u4IA=
-SIZE (zsh-5.5.1.tar.gz) = 4578700
+SHA256 (zsh-5.6.2.tar.xz) = pQvWbAVX6OyjuPok6F0N5TPnddeiLfBC2pBIhiN1Lp4=
+SIZE (zsh-5.6.2.tar.xz) = 3077368
Index: pkg/PLIST
===
RCS file: /cvs/ports/shells/zsh/pkg/PLIST,v
retrieving revision 1.49
diff -u -p -u -p -r1.49 PLIST
--- pkg/PLIST   21 Apr 2018 09:24:06 -  1.49
+++ pkg/PLIST   16 Sep 2018 17:03:23 -
@@ -61,1103 +61,1165 @@ lib/zsh/${V}/zsh/zutil.so
 share/zsh/
 share/zsh/${V}/
 share/zsh/${V}/functions/
-share/zsh/${V}/functions/VCS_INFO_adjust
-share/zsh/${V}/functions/VCS_INFO_bydir_detect
-share/zsh/${V}/functions/VCS_INFO_check_com
-share/zsh/${V}/functions/VCS_INFO_detect_bzr
-share/zsh/${V}/functions/VCS_INFO_detect_cdv
-share/zsh/${V}/functions/VCS_INFO_detect_cvs
-share/zsh/${V}/functions/VCS_INFO_detect_darcs
-share/zsh/${V}/functions/VCS_INFO_detect_fossil
-share/zsh/${V}/functions/VCS_INFO_detect_git
-share/zsh/${V}/functions/VCS_INFO_detect_hg
-share/zsh/${V}/functions/VCS_INFO_detect_mtn
-share/zsh/${V}/functions/VCS_INFO_detect_p4
-share/zsh/${V}/functions/VCS_INFO_detect_svk
-share/zsh/${V}/functions/VCS_INFO_detect_svn
-share/zsh/${V}/functions/VCS_INFO_detect_tla
-share/zsh/${V}/functions/VCS_INFO_formats
-share/zsh/${V}/functions/VCS_INFO_get_cmd
-share/zsh/${V}/functions/VCS_INFO_get_data_bzr
-share/zsh/${V}/functions/VCS_INFO_get_data_cdv
-share/zsh/${V}/functions/VCS_INFO_get_data_cvs
-share/zsh/${V}/functions/VCS_INFO_get_data_darcs
-share/zsh/${V}/functions/VCS_INFO_get_data_fossil
-share/zsh/${V}/functions/VCS_INFO_get_data_git
-share/zsh/${V}/functions/VCS_INFO_get_data_hg
-share/zsh/${V}/functions/VCS_INFO_get_data_mtn
-share/zsh/${V}/functions/VCS_INFO_get_data_p4

Re: UPDATE: shells/zsh

2018-09-15 Thread Klemens Nanni 
On Sat, Sep 15, 2018 at 10:04:26AM +0200, Rafael Sadowski wrote:
> +MASTER_SITES=${MASTER_SITE_SOURCEFORGE:=zsh/} \
> + http://www.zsh.org/pub/
Has TLS.

Re: UPDATE: shells/zsh

2018-09-15 Thread Rafael Sadowski 
On Sat Sep 08, 2018 at 08:36:29AM +0200, Rafael Sadowski wrote:
> Hi All.
> 
> please find below a simple diff to update ZSH to the latest stable
> version. This release includes security fixes: CVE-2018-0502,
> CVE-2018-13259.
> 
> Notable port changes:
> 
> - Use configure elements instead of post-install tasks.
> -- Avoid version in path name. I don't see any reasons for that, I only
>provide one ZSH version.
> - We need gmake :-(
> - fix tabs
> 
> Tested over the last few days.
> 
> Best regards,
> 
> Rafael Sadowski
> 

My final 5.6.2 diff.

Index: Makefile
===
RCS file: /cvs/ports/shells/zsh/Makefile,v
retrieving revision 1.88
diff -u -p -u -p -r1.88 Makefile
--- Makefile21 Apr 2018 09:24:06 -  1.88
+++ Makefile15 Sep 2018 07:59:39 -
@@ -2,7 +2,7 @@
 
 COMMENT=   Z shell, Bourne shell-compatible
 
-V= 5.5.1
+V= 5.6.2
 DISTNAME=  zsh-$V
 CATEGORIES=shells
 
@@ -10,8 +10,10 @@ MAINTAINER=  Pierre-Emmanuel Andre https://www.zsh.org/
 
-MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=zsh/}
-MASTER_SITES+= http://www.zsh.org/pub/
+MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=zsh/} \
+   http://www.zsh.org/pub/
+
+EXTRACT_SUFX=  .tar.xz
 
 # BSD
 PERMIT_PACKAGE_CDROM=  Yes
@@ -23,15 +25,17 @@ LIB_DEPENDS=converters/libiconv \
 
 AUTOCONF_VERSION=2.69
 CONFIGURE_STYLE=autoconf
-CONFIGURE_ENV=  CPPFLAGS="-I${LOCALBASE}/include" \
-LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+   LDFLAGS="-L${LOCALBASE}/lib"
+
 CONFIGURE_ARGS=--enable-zsh-mem \
--enable-zsh-secure-free \
--enable-maildir-support \
-   --with-tcsetpgrp \
+   --enable-function-subdirs \
--enable-multibyte \
--enable-pcre \
-   --disable-gdbm
+   --disable-gdbm \
+   --with-tcsetpgrp
 
 SUBST_VARS=V
 
@@ -42,22 +46,18 @@ TEST_FLAGS= INSTALL_PROGRAM="install -c 
INSTALL="install -c" \
TMPPREFIX=${WRKBUILD}/tmp \
TERM=xterm
-EXTFILES=  Misc/checkmail Misc/run-help \
-   Misc/sticky-note Misc/zcalc \
-   Misc/zed Misc/zkbd \
-   Calendar/calendar_add Example/cat Example/zless
+
+EXTFILES=  Functions/Misc/checkmail Functions/Misc/run-help \
+   Functions/Misc/run-help-ip Functions/Misc/sticky-note \
+   Functions/Misc/zcalc Functions/Misc/zed Functions/Misc/zkbd \
+   Functions/Calendar/calendar_add Functions/Example/cat \
+   Functions/Example/zless Test/ztst.zsh Test/runtests.zsh \
+   Util/reporter Util/check-tmux-state Doc/zsh.texi
 
 pre-configure:
 .for i in ${EXTFILES}
sed -i -e "s,/bin/zsh,${TRUEPREFIX}/bin/zsh,g" \
-   ${WRKSRC}/Functions/${i}
+   ${WRKSRC}/${i}
 .endfor
-   @find ${WRKSRC} -name "*.orig" -delete
-
-post-install:
-   ${INSTALL_DATA_DIR} ${PREFIX}/share/zsh/$V/scripts/
-
-pre-test:
-   rm -f ${WRKDIR}/bin/chgrp
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/shells/zsh/distinfo,v
retrieving revision 1.28
diff -u -p -u -p -r1.28 distinfo
--- distinfo21 Apr 2018 09:24:34 -  1.28
+++ distinfo15 Sep 2018 07:59:39 -
@@ -1,2 +1,2 @@
-SHA256 (zsh-5.5.1.tar.gz) = d0yqieeupfM8MDPL/9k+KHB/crpRSceXCeSObC0u4IA=
-SIZE (zsh-5.5.1.tar.gz) = 4578700
+SHA256 (zsh-5.6.2.tar.xz) = pQvWbAVX6OyjuPok6F0N5TPnddeiLfBC2pBIhiN1Lp4=
+SIZE (zsh-5.6.2.tar.xz) = 3077368
Index: pkg/PLIST
===
RCS file: /cvs/ports/shells/zsh/pkg/PLIST,v
retrieving revision 1.49
diff -u -p -u -p -r1.49 PLIST
--- pkg/PLIST   21 Apr 2018 09:24:06 -  1.49
+++ pkg/PLIST   15 Sep 2018 07:59:39 -
@@ -61,1103 +61,1165 @@ lib/zsh/${V}/zsh/zutil.so
 share/zsh/
 share/zsh/${V}/
 share/zsh/${V}/functions/
-share/zsh/${V}/functions/VCS_INFO_adjust
-share/zsh/${V}/functions/VCS_INFO_bydir_detect
-share/zsh/${V}/functions/VCS_INFO_check_com
-share/zsh/${V}/functions/VCS_INFO_detect_bzr
-share/zsh/${V}/functions/VCS_INFO_detect_cdv
-share/zsh/${V}/functions/VCS_INFO_detect_cvs
-share/zsh/${V}/functions/VCS_INFO_detect_darcs
-share/zsh/${V}/functions/VCS_INFO_detect_fossil
-share/zsh/${V}/functions/VCS_INFO_detect_git
-share/zsh/${V}/functions/VCS_INFO_detect_hg
-share/zsh/${V}/functions/VCS_INFO_detect_mtn
-share/zsh/${V}/functions/VCS_INFO_detect_p4
-share/zsh/${V}/functions/VCS_INFO_detect_svk
-share/zsh/${V}/functions/VCS_INFO_detect_svn
-share/zsh/${V}/functions/VCS_INFO_detect_tla
-share/zsh/${V}/functions/VCS_INFO_formats
-share/zsh/${V}/functions/VCS_INFO_get_cmd
-share/zsh/${V}/functions/VCS_INFO_get_data_bzr
-share/zsh/${V}/functions/VCS_INFO_get_data_cdv

Re: UPDATE: shells/zsh

2018-09-13 Thread Rafael Sadowski 
On Thu Sep 13, 2018 at 07:18:01AM -0500, Matthew Martin wrote:
> On Thu, Sep 13, 2018 at 01:18:57PM +0200, Rafael Sadowski wrote:
> > New diff, it won't solve the test issue but it repairs some more
> > EXTFILES.
> > 
> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/shells/zsh/Makefile,v
> > retrieving revision 1.88
> > diff -u -p -u -p -r1.88 Makefile
> > --- Makefile21 Apr 2018 09:24:06 -  1.88
> > +++ Makefile13 Sep 2018 11:16:26 -
> > @@ -2,7 +2,7 @@
> >  
> >  COMMENT=   Z shell, Bourne shell-compatible
> >  
> > -V= 5.5.1
> > +V= 5.6.1
> >  DISTNAME=  zsh-$V
> >  CATEGORIES=shells
> >  
> > @@ -10,8 +10,10 @@ MAINTAINER=  Pierre-Emmanuel Andre  >  
> >  HOMEPAGE=  https://www.zsh.org/
> >  
> > -MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=zsh/}
> > -MASTER_SITES+= http://www.zsh.org/pub/
> > +MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=zsh/} \
> > +   http://www.zsh.org/pub/
> > +
> > +EXTRACT_SUFX=  .tar.xz
> >  
> >  # BSD
> >  PERMIT_PACKAGE_CDROM=  Yes
> > @@ -23,15 +25,21 @@ LIB_DEPENDS=converters/libiconv \
> >  
> >  AUTOCONF_VERSION=2.69
> >  CONFIGURE_STYLE=autoconf
> > -CONFIGURE_ENV=  CPPFLAGS="-I${LOCALBASE}/include" \
> > -LDFLAGS="-L${LOCALBASE}/lib"
> > -CONFIGURE_ARGS=--enable-zsh-mem \
> > +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
> > +   LDFLAGS="-L${LOCALBASE}/lib"
> > +
> > +CONFIGURE_ARGS=--enable-fndir=${LOCALBASE}/share/zsh/$V/functions \
> > +   --enable-scriptdir=${LOCALBASE}/share/zsh/$V/scripts \
> > +   --docdir=${LOCALBASE}/share/doc/zsh/$V \
> > +   --htmldir=${LOCALBASE}/share/doc/zsh/html/$V \
> 
> I don't see what problem this change fixes; if there isn't a problem,
> why rearrange the chairs?
> 

I agree, new diff below.

> Also 5.6.2 is due out tomorrow, so should probably wait for that now.
> 

New diff includes the following changes:

- rm: @find ${WRKSRC} -name "*.orig" -delete
- rm: pre-test

Whatever we do, we should commit version >6 before the ports lock!

Index: Makefile
===
RCS file: /cvs/ports/shells/zsh/Makefile,v
retrieving revision 1.88
diff -u -p -u -p -r1.88 Makefile
--- Makefile21 Apr 2018 09:24:06 -  1.88
+++ Makefile14 Sep 2018 04:25:45 -
@@ -2,7 +2,7 @@
 
 COMMENT=   Z shell, Bourne shell-compatible
 
-V= 5.5.1
+V= 5.6.1
 DISTNAME=  zsh-$V
 CATEGORIES=shells
 
@@ -10,8 +10,10 @@ MAINTAINER=  Pierre-Emmanuel Andre https://www.zsh.org/
 
-MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=zsh/}
-MASTER_SITES+= http://www.zsh.org/pub/
+MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=zsh/} \
+   http://www.zsh.org/pub/
+
+EXTRACT_SUFX=  .tar.xz
 
 # BSD
 PERMIT_PACKAGE_CDROM=  Yes
@@ -23,15 +25,17 @@ LIB_DEPENDS=converters/libiconv \
 
 AUTOCONF_VERSION=2.69
 CONFIGURE_STYLE=autoconf
-CONFIGURE_ENV=  CPPFLAGS="-I${LOCALBASE}/include" \
-LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+   LDFLAGS="-L${LOCALBASE}/lib"
+
 CONFIGURE_ARGS=--enable-zsh-mem \
--enable-zsh-secure-free \
--enable-maildir-support \
-   --with-tcsetpgrp \
+   --enable-function-subdirs \
--enable-multibyte \
--enable-pcre \
-   --disable-gdbm
+   --disable-gdbm \
+   --with-tcsetpgrp
 
 SUBST_VARS=V
 
@@ -42,22 +46,18 @@ TEST_FLAGS= INSTALL_PROGRAM="install -c 
INSTALL="install -c" \
TMPPREFIX=${WRKBUILD}/tmp \
TERM=xterm
-EXTFILES=  Misc/checkmail Misc/run-help \
-   Misc/sticky-note Misc/zcalc \
-   Misc/zed Misc/zkbd \
-   Calendar/calendar_add Example/cat Example/zless
+
+EXTFILES=  Functions/Misc/checkmail Functions/Misc/run-help \
+   Functions/Misc/run-help-ip Functions/Misc/sticky-note \
+   Functions/Misc/zcalc Functions/Misc/zed Functions/Misc/zkbd \
+   Functions/Calendar/calendar_add Functions/Example/cat \
+   Functions/Example/zless Test/ztst.zsh Test/runtests.zsh \
+   Util/reporter Util/check-tmux-state Doc/zsh.texi
 
 pre-configure:
 .for i in ${EXTFILES}
sed -i -e "s,/bin/zsh,${TRUEPREFIX}/bin/zsh,g" \
-   ${WRKSRC}/Functions/${i}
+   ${WRKSRC}/${i}
 .endfor
-   @find ${WRKSRC} -name "*.orig" -delete
-
-post-install:
-   ${INSTALL_DATA_DIR} ${PREFIX}/share/zsh/$V/scripts/
-
-pre-test:
-   rm -f ${WRKDIR}/bin/chgrp
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/shells/zsh/distinfo,v
retrieving revision 1.28
diff -u -p -u -p -r1.28 distinfo
--- distinfo21 Apr 2018

Re: UPDATE: shells/zsh

2018-09-13 Thread Matthew Martin 
On Thu, Sep 13, 2018 at 01:18:57PM +0200, Rafael Sadowski wrote:
> New diff, it won't solve the test issue but it repairs some more
> EXTFILES.
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/shells/zsh/Makefile,v
> retrieving revision 1.88
> diff -u -p -u -p -r1.88 Makefile
> --- Makefile  21 Apr 2018 09:24:06 -  1.88
> +++ Makefile  13 Sep 2018 11:16:26 -
> @@ -2,7 +2,7 @@
>  
>  COMMENT= Z shell, Bourne shell-compatible
>  
> -V=   5.5.1
> +V=   5.6.1
>  DISTNAME=zsh-$V
>  CATEGORIES=  shells
>  
> @@ -10,8 +10,10 @@ MAINTAINER=Pierre-Emmanuel Andre   
>  HOMEPAGE=https://www.zsh.org/
>  
> -MASTER_SITES=${MASTER_SITE_SOURCEFORGE:=zsh/}
> -MASTER_SITES+=   http://www.zsh.org/pub/
> +MASTER_SITES=${MASTER_SITE_SOURCEFORGE:=zsh/} \
> + http://www.zsh.org/pub/
> +
> +EXTRACT_SUFX=.tar.xz
>  
>  # BSD
>  PERMIT_PACKAGE_CDROM=Yes
> @@ -23,15 +25,21 @@ LIB_DEPENDS=  converters/libiconv \
>  
>  AUTOCONF_VERSION=2.69
>  CONFIGURE_STYLE=autoconf
> -CONFIGURE_ENV=  CPPFLAGS="-I${LOCALBASE}/include" \
> -LDFLAGS="-L${LOCALBASE}/lib"
> -CONFIGURE_ARGS=  --enable-zsh-mem \
> +CONFIGURE_ENV=   CPPFLAGS="-I${LOCALBASE}/include" \
> + LDFLAGS="-L${LOCALBASE}/lib"
> +
> +CONFIGURE_ARGS=  --enable-fndir=${LOCALBASE}/share/zsh/$V/functions \
> + --enable-scriptdir=${LOCALBASE}/share/zsh/$V/scripts \
> + --docdir=${LOCALBASE}/share/doc/zsh/$V \
> + --htmldir=${LOCALBASE}/share/doc/zsh/html/$V \

I don't see what problem this change fixes; if there isn't a problem,
why rearrange the chairs?

Also 5.6.2 is due out tomorrow, so should probably wait for that now.

- Matthew Martin

Re: UPDATE: shells/zsh

2018-09-13 Thread Rafael Sadowski 
On Thu Sep 13, 2018 at 12:21:38PM +0200, Pierre-Emmanuel Andre wrote:
> On Thu, Sep 13, 2018 at 06:51:16AM +0200, Rafael Sadowski wrote:
> > On Mon Sep 10, 2018 at 03:10:09PM +0200, Pierre-Emmanuel Andre wrote:
> > > On Sat, Sep 08, 2018 at 02:20:49PM -0500, Matthew Martin wrote:
> > > > On Sat, Sep 08, 2018 at 08:36:29AM +0200, Rafael Sadowski wrote:
> > > > > Hi All.
> > > > > 
> > > > > please find below a simple diff to update ZSH to the latest stable
> > > > > version. This release includes security fixes: CVE-2018-0502,
> > > > > CVE-2018-13259.
> > > > 
> > > > zsh 5.6.1 will be out soon (it's tagged and built; just not announced).
> > > > It fixes the error which (I suspect) is why you switched to gmake.
> > > > 
> > > > > Notable port changes:
> > > > > 
> > > > > - Use configure elements instead of post-install tasks.
> > > > > -- Avoid version in path name. I don't see any reasons for that, I 
> > > > > only
> > > > >provide one ZSH version.
> > > > 
> > > > This is the upstream default, and I don't see a compelling reason to
> > > > deviate from it. 
> > > > 
> > > > Patch for 5.6.1 below. It was rolled a bit over an hour ago, so not well
> > > > tested yet. Obviously we should wait until it's officially announced.
> > > > There's one test error over what 5.5.1 had which I haven't had time to
> > > > look at yet.
> > > >
> > > 
> > > 
> > > I agree with Matthew. I prefer to wait for 5.6.1.
> > > 
> > 
> > I also agree with Matthew. Thank you for your feedback, Matthew.
> > 
> > Matthew's and my diff below. Feedback? Ok?
> >
> 
> 
> Thanks. There is a regress failure:
> 
> ./A05execution.ztst: starting.
> Pattern match failed, line 1:
> -<*tstcmd-interp-too-long: bad interpreter: x*xn: no such file or directory
>+>(eval):2: 
> /usr/ports/pobj/zsh-5.6.1/zsh-5.6.1/Test/command.tmp//tstcmd-interp-too-long: 
> bad interpreter: 
> xx$
>  xxn: exec format error
>   >status 126
>   Test ./A05execution.ztst failed: output differs from expected as shown 
> above for:
> path=($shpath $echopath ${ZTST_testdir}/command.tmp/)
>   tstcmd-interp-too-long 2>&1; echo "status $?"
> path=($storepath)
>   Was testing: path (5)
>   ./A05execution.ztst: test failed.
> 
> 
> This test success with the 5.5.1.
> I will look at it.
> 

New diff, it won't solve the test issue but it repairs some more
EXTFILES.

Index: Makefile
===
RCS file: /cvs/ports/shells/zsh/Makefile,v
retrieving revision 1.88
diff -u -p -u -p -r1.88 Makefile
--- Makefile21 Apr 2018 09:24:06 -  1.88
+++ Makefile13 Sep 2018 11:16:26 -
@@ -2,7 +2,7 @@
 
 COMMENT=   Z shell, Bourne shell-compatible
 
-V= 5.5.1
+V= 5.6.1
 DISTNAME=  zsh-$V
 CATEGORIES=shells
 
@@ -10,8 +10,10 @@ MAINTAINER=  Pierre-Emmanuel Andre https://www.zsh.org/
 
-MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=zsh/}
-MASTER_SITES+= http://www.zsh.org/pub/
+MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=zsh/} \
+   http://www.zsh.org/pub/
+
+EXTRACT_SUFX=  .tar.xz
 
 # BSD
 PERMIT_PACKAGE_CDROM=  Yes
@@ -23,15 +25,21 @@ LIB_DEPENDS=converters/libiconv \
 
 AUTOCONF_VERSION=2.69
 CONFIGURE_STYLE=autoconf
-CONFIGURE_ENV=  CPPFLAGS="-I${LOCALBASE}/include" \
-LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=--enable-zsh-mem \
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+   LDFLAGS="-L${LOCALBASE}/lib"
+
+CONFIGURE_ARGS=--enable-fndir=${LOCALBASE}/share/zsh/$V/functions \
+   --enable-scriptdir=${LOCALBASE}/share/zsh/$V/scripts \
+   --docdir=${LOCALBASE}/share/doc/zsh/$V \
+   --htmldir=${LOCALBASE}/share/doc/zsh/html/$V \
+   --enable-zsh-mem \
--enable-zsh-secure-free \
--enable-maildir-support \
-   --with-tcsetpgrp \
+   --enable-function-subdirs \
--enable-multibyte \
--enable-pcre \
-   --disable-gdbm
+   --disable-gdbm \
+   --with-tcsetpgrp
 
 SUBST_VARS=V
 
@@ -42,20 +50,20 @@ TEST_FLAGS= INSTALL_PROGRAM="install -c 
INSTALL="install -c" \
TMPPREFIX=${WRKBUILD}/tmp \
TERM=xterm
-EXTFILES=  Misc/checkmail Misc/run-help \
-   Misc/sticky-note Misc/zcalc \
-   Misc/zed Misc/zkbd \
-   Calendar/calendar_add Example/cat Example/zless
+
+EXTFILES=  Functions/Misc/checkmail Functions/Misc/run-help \
+   Functions/Misc/run-help-ip Functions/Misc/sticky-note \
+   Functions/Misc/zcalc Functions/Misc/zed Functions/Misc/zkbd \
+   Functions/Calendar/calendar_add Functions/Example/cat \
+   Functions/Example/zless Test/ztst.zsh Test/runtests.zsh \
+

Re: UPDATE: shells/zsh

2018-09-13 Thread Stuart Henderson 
On 2018/09/13 12:21, Pierre-Emmanuel Andre wrote:
> On Thu, Sep 13, 2018 at 06:51:16AM +0200, Rafael Sadowski wrote:
> > On Mon Sep 10, 2018 at 03:10:09PM +0200, Pierre-Emmanuel Andre wrote:
> > > On Sat, Sep 08, 2018 at 02:20:49PM -0500, Matthew Martin wrote:
> > > > On Sat, Sep 08, 2018 at 08:36:29AM +0200, Rafael Sadowski wrote:
> > > > > Hi All.
> > > > > 
> > > > > please find below a simple diff to update ZSH to the latest stable
> > > > > version. This release includes security fixes: CVE-2018-0502,
> > > > > CVE-2018-13259.
> > > > 
> > > > zsh 5.6.1 will be out soon (it's tagged and built; just not announced).
> > > > It fixes the error which (I suspect) is why you switched to gmake.
> > > > 
> > > > > Notable port changes:
> > > > > 
> > > > > - Use configure elements instead of post-install tasks.
> > > > > -- Avoid version in path name. I don't see any reasons for that, I 
> > > > > only
> > > > >provide one ZSH version.
> > > > 
> > > > This is the upstream default, and I don't see a compelling reason to
> > > > deviate from it. 
> > > > 
> > > > Patch for 5.6.1 below. It was rolled a bit over an hour ago, so not well
> > > > tested yet. Obviously we should wait until it's officially announced.
> > > > There's one test error over what 5.5.1 had which I haven't had time to
> > > > look at yet.
> > > >
> > > 
> > > 
> > > I agree with Matthew. I prefer to wait for 5.6.1.
> > > 
> > 
> > I also agree with Matthew. Thank you for your feedback, Matthew.
> > 
> > Matthew's and my diff below. Feedback? Ok?
> >
> 
> 
> Thanks. There is a regress failure:
> 
> ./A05execution.ztst: starting.
> Pattern match failed, line 1:
> -<*tstcmd-interp-too-long: bad interpreter: x*xn: no such file or directory
>+>(eval):2: 
> /usr/ports/pobj/zsh-5.6.1/zsh-5.6.1/Test/command.tmp//tstcmd-interp-too-long: 
> bad interpreter: 
> xx$
>  xxn: exec format error
>   >status 126
>   Test ./A05execution.ztst failed: output differs from expected as shown 
> above for:
> path=($shpath $echopath ${ZTST_testdir}/command.tmp/)
>   tstcmd-interp-too-long 2>&1; echo "status $?"
> path=($storepath)
>   Was testing: path (5)
>   ./A05execution.ztst: test failed.
> 
> 
> This test success with the 5.5.1.
> I will look at it.
> 

This test is looking for an OS dependent string (and the test changed
between 5.5.1 and 5.6, and again between 5.6 and 5.6.1). I think it's
just a slightly bogus test and can be ignored for ports.

Re: UPDATE: shells/zsh

2018-09-13 Thread Pierre-Emmanuel Andre 
On Thu, Sep 13, 2018 at 06:51:16AM +0200, Rafael Sadowski wrote:
> On Mon Sep 10, 2018 at 03:10:09PM +0200, Pierre-Emmanuel Andre wrote:
> > On Sat, Sep 08, 2018 at 02:20:49PM -0500, Matthew Martin wrote:
> > > On Sat, Sep 08, 2018 at 08:36:29AM +0200, Rafael Sadowski wrote:
> > > > Hi All.
> > > > 
> > > > please find below a simple diff to update ZSH to the latest stable
> > > > version. This release includes security fixes: CVE-2018-0502,
> > > > CVE-2018-13259.
> > > 
> > > zsh 5.6.1 will be out soon (it's tagged and built; just not announced).
> > > It fixes the error which (I suspect) is why you switched to gmake.
> > > 
> > > > Notable port changes:
> > > > 
> > > > - Use configure elements instead of post-install tasks.
> > > > -- Avoid version in path name. I don't see any reasons for that, I only
> > > >provide one ZSH version.
> > > 
> > > This is the upstream default, and I don't see a compelling reason to
> > > deviate from it. 
> > > 
> > > Patch for 5.6.1 below. It was rolled a bit over an hour ago, so not well
> > > tested yet. Obviously we should wait until it's officially announced.
> > > There's one test error over what 5.5.1 had which I haven't had time to
> > > look at yet.
> > >
> > 
> > 
> > I agree with Matthew. I prefer to wait for 5.6.1.
> > 
> 
> I also agree with Matthew. Thank you for your feedback, Matthew.
> 
> Matthew's and my diff below. Feedback? Ok?
>


Thanks. There is a regress failure:

./A05execution.ztst: starting.
Pattern match failed, line 1:
-<*tstcmd-interp-too-long: bad interpreter: x*xn: no such file or directory
 (eval):2: 
/usr/ports/pobj/zsh-5.6.1/zsh-5.6.1/Test/command.tmp//tstcmd-interp-too-long: 
bad interpreter: 
xx$
 xxn: exec format error
  >status 126
  Test ./A05execution.ztst failed: output differs from expected as shown above 
for:
path=($shpath $echopath ${ZTST_testdir}/command.tmp/)
  tstcmd-interp-too-long 2>&1; echo "status $?"
path=($storepath)
Was testing: path (5)
./A05execution.ztst: test failed.


This test success with the 5.5.1.
I will look at it.

Re: UPDATE: shells/zsh

2018-09-12 Thread Rafael Sadowski 
On Mon Sep 10, 2018 at 03:10:09PM +0200, Pierre-Emmanuel Andre wrote:
> On Sat, Sep 08, 2018 at 02:20:49PM -0500, Matthew Martin wrote:
> > On Sat, Sep 08, 2018 at 08:36:29AM +0200, Rafael Sadowski wrote:
> > > Hi All.
> > > 
> > > please find below a simple diff to update ZSH to the latest stable
> > > version. This release includes security fixes: CVE-2018-0502,
> > > CVE-2018-13259.
> > 
> > zsh 5.6.1 will be out soon (it's tagged and built; just not announced).
> > It fixes the error which (I suspect) is why you switched to gmake.
> > 
> > > Notable port changes:
> > > 
> > > - Use configure elements instead of post-install tasks.
> > > -- Avoid version in path name. I don't see any reasons for that, I only
> > >provide one ZSH version.
> > 
> > This is the upstream default, and I don't see a compelling reason to
> > deviate from it. 
> > 
> > Patch for 5.6.1 below. It was rolled a bit over an hour ago, so not well
> > tested yet. Obviously we should wait until it's officially announced.
> > There's one test error over what 5.5.1 had which I haven't had time to
> > look at yet.
> >
> 
> 
> I agree with Matthew. I prefer to wait for 5.6.1.
> 

I also agree with Matthew. Thank you for your feedback, Matthew.

Matthew's and my diff below. Feedback? Ok?

Index: Makefile
===
RCS file: /cvs/ports/shells/zsh/Makefile,v
retrieving revision 1.88
diff -u -p -u -p -r1.88 Makefile
--- Makefile21 Apr 2018 09:24:06 -  1.88
+++ Makefile13 Sep 2018 04:47:27 -
@@ -2,7 +2,7 @@
 
 COMMENT=   Z shell, Bourne shell-compatible
 
-V= 5.5.1
+V= 5.6.1
 DISTNAME=  zsh-$V
 CATEGORIES=shells
 
@@ -10,8 +10,10 @@ MAINTAINER=  Pierre-Emmanuel Andre https://www.zsh.org/
 
-MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=zsh/}
-MASTER_SITES+= http://www.zsh.org/pub/
+MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=zsh/} \
+   http://www.zsh.org/pub/
+
+EXTRACT_SUFX=  .tar.xz
 
 # BSD
 PERMIT_PACKAGE_CDROM=  Yes
@@ -23,15 +25,21 @@ LIB_DEPENDS=converters/libiconv \
 
 AUTOCONF_VERSION=2.69
 CONFIGURE_STYLE=autoconf
-CONFIGURE_ENV=  CPPFLAGS="-I${LOCALBASE}/include" \
-LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=--enable-zsh-mem \
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+   LDFLAGS="-L${LOCALBASE}/lib"
+
+CONFIGURE_ARGS=--enable-fndir=${LOCALBASE}/share/zsh/$V/functions \
+   --enable-scriptdir=${LOCALBASE}/share/zsh/$V/scripts \
+   --docdir=${LOCALBASE}/share/doc/zsh/$V \
+   --htmldir=${LOCALBASE}/share/doc/zsh/html/$V \
+   --enable-zsh-mem \
--enable-zsh-secure-free \
--enable-maildir-support \
-   --with-tcsetpgrp \
--enable-multibyte \
--enable-pcre \
-   --disable-gdbm
+   --disable-gdbm \
+   --enable-function-subdirs \
+   --with-tcsetpgrp
 
 SUBST_VARS=V
 
@@ -53,9 +61,6 @@ pre-configure:
${WRKSRC}/Functions/${i}
 .endfor
@find ${WRKSRC} -name "*.orig" -delete
-
-post-install:
-   ${INSTALL_DATA_DIR} ${PREFIX}/share/zsh/$V/scripts/
 
 pre-test:
rm -f ${WRKDIR}/bin/chgrp
Index: distinfo
===
RCS file: /cvs/ports/shells/zsh/distinfo,v
retrieving revision 1.28
diff -u -p -u -p -r1.28 distinfo
--- distinfo21 Apr 2018 09:24:34 -  1.28
+++ distinfo13 Sep 2018 04:47:27 -
@@ -1,2 +1,2 @@
-SHA256 (zsh-5.5.1.tar.gz) = d0yqieeupfM8MDPL/9k+KHB/crpRSceXCeSObC0u4IA=
-SIZE (zsh-5.5.1.tar.gz) = 4578700
+SHA256 (zsh-5.6.1.tar.xz) = lWZ1PzF9MbgItrY6ViLHHyXUc6a1/qXDWrHH7Zb7s+g=
+SIZE (zsh-5.6.1.tar.xz) = 3076732
Index: pkg/PLIST
===
RCS file: /cvs/ports/shells/zsh/pkg/PLIST,v
retrieving revision 1.49
diff -u -p -u -p -r1.49 PLIST
--- pkg/PLIST   21 Apr 2018 09:24:06 -  1.49
+++ pkg/PLIST   13 Sep 2018 04:47:27 -
@@ -61,1103 +61,1165 @@ lib/zsh/${V}/zsh/zutil.so
 share/zsh/
 share/zsh/${V}/
 share/zsh/${V}/functions/
-share/zsh/${V}/functions/VCS_INFO_adjust
-share/zsh/${V}/functions/VCS_INFO_bydir_detect
-share/zsh/${V}/functions/VCS_INFO_check_com
-share/zsh/${V}/functions/VCS_INFO_detect_bzr
-share/zsh/${V}/functions/VCS_INFO_detect_cdv
-share/zsh/${V}/functions/VCS_INFO_detect_cvs
-share/zsh/${V}/functions/VCS_INFO_detect_darcs
-share/zsh/${V}/functions/VCS_INFO_detect_fossil
-share/zsh/${V}/functions/VCS_INFO_detect_git
-share/zsh/${V}/functions/VCS_INFO_detect_hg
-share/zsh/${V}/functions/VCS_INFO_detect_mtn
-share/zsh/${V}/functions/VCS_INFO_detect_p4
-share/zsh/${V}/functions/VCS_INFO_detect_svk
-share/zsh/${V}/functions/VCS_INFO_detect_svn
-share/zsh/${V}/functions/VCS_INFO_detect_tla
-share/zsh/${V}/functions/VCS_INFO_formats
-share/zsh/${V}/functions/VCS_INFO_get_cmd

Re: UPDATE: shells/zsh

2018-09-10 Thread Pierre-Emmanuel Andre 
On Sat, Sep 08, 2018 at 02:20:49PM -0500, Matthew Martin wrote:
> On Sat, Sep 08, 2018 at 08:36:29AM +0200, Rafael Sadowski wrote:
> > Hi All.
> > 
> > please find below a simple diff to update ZSH to the latest stable
> > version. This release includes security fixes: CVE-2018-0502,
> > CVE-2018-13259.
> 
> zsh 5.6.1 will be out soon (it's tagged and built; just not announced).
> It fixes the error which (I suspect) is why you switched to gmake.
> 
> > Notable port changes:
> > 
> > - Use configure elements instead of post-install tasks.
> > -- Avoid version in path name. I don't see any reasons for that, I only
> >provide one ZSH version.
> 
> This is the upstream default, and I don't see a compelling reason to
> deviate from it. 
> 
> Patch for 5.6.1 below. It was rolled a bit over an hour ago, so not well
> tested yet. Obviously we should wait until it's officially announced.
> There's one test error over what 5.5.1 had which I haven't had time to
> look at yet.
>


I agree with Matthew. I prefer to wait for 5.6.1.

Re: UPDATE: shells/zsh

2018-09-08 Thread Matthew Martin 
On Sat, Sep 08, 2018 at 08:36:29AM +0200, Rafael Sadowski wrote:
> Hi All.
> 
> please find below a simple diff to update ZSH to the latest stable
> version. This release includes security fixes: CVE-2018-0502,
> CVE-2018-13259.

zsh 5.6.1 will be out soon (it's tagged and built; just not announced).
It fixes the error which (I suspect) is why you switched to gmake.

> Notable port changes:
> 
> - Use configure elements instead of post-install tasks.
> -- Avoid version in path name. I don't see any reasons for that, I only
>provide one ZSH version.

This is the upstream default, and I don't see a compelling reason to
deviate from it. 

Patch for 5.6.1 below. It was rolled a bit over an hour ago, so not well
tested yet. Obviously we should wait until it's officially announced.
There's one test error over what 5.5.1 had which I haven't had time to
look at yet.

- Matthew Martin


diff --git Makefile Makefile
index 20667f23baa..3899ee3cacc 100644
--- Makefile
+++ Makefile
@@ -2,7 +2,7 @@
 
 COMMENT=   Z shell, Bourne shell-compatible
 
-V= 5.5.1
+V= 5.6.1
 DISTNAME=  zsh-$V
 CATEGORIES=shells
 
@@ -13,6 +13,8 @@ HOMEPAGE= https://www.zsh.org/
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=zsh/}
 MASTER_SITES+= http://www.zsh.org/pub/
 
+EXTRACT_SUFX=  .tar.xz
+
 # BSD
 PERMIT_PACKAGE_CDROM=  Yes
 
@@ -23,8 +25,8 @@ LIB_DEPENDS=  converters/libiconv \
 
 AUTOCONF_VERSION=2.69
 CONFIGURE_STYLE=autoconf
-CONFIGURE_ENV=  CPPFLAGS="-I${LOCALBASE}/include" \
-LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+   LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=--enable-zsh-mem \
--enable-zsh-secure-free \
--enable-maildir-support \
diff --git distinfo distinfo
index bdf3045f919..5a51ac13acb 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (zsh-5.5.1.tar.gz) = d0yqieeupfM8MDPL/9k+KHB/crpRSceXCeSObC0u4IA=
-SIZE (zsh-5.5.1.tar.gz) = 4578700
+SHA256 (zsh-5.6.1.tar.xz) = lWZ1PzF9MbgItrY6ViLHHyXUc6a1/qXDWrHH7Zb7s+g=
+SIZE (zsh-5.6.1.tar.xz) = 3076732
diff --git pkg/PLIST pkg/PLIST
index a8a8d95aba0..023edfca087 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -96,7 +96,6 @@ share/zsh/${V}/functions/VCS_INFO_maxexports
 share/zsh/${V}/functions/VCS_INFO_nvcsformats
 share/zsh/${V}/functions/VCS_INFO_patch2subject
 share/zsh/${V}/functions/VCS_INFO_quilt
-share/zsh/${V}/functions/VCS_INFO_realpath
 share/zsh/${V}/functions/VCS_INFO_reposub
 share/zsh/${V}/functions/VCS_INFO_set
 share/zsh/${V}/functions/VCS_INFO_set-patch-format
@@ -105,6 +104,7 @@ share/zsh/${V}/functions/_a2ps
 share/zsh/${V}/functions/_a2utils
 share/zsh/${V}/functions/_aap
 share/zsh/${V}/functions/_absolute_command_paths
+share/zsh/${V}/functions/_ack
 share/zsh/${V}/functions/_acpi
 share/zsh/${V}/functions/_acpitool
 share/zsh/${V}/functions/_acroread
@@ -143,7 +143,9 @@ share/zsh/${V}/functions/_auto-apt
 share/zsh/${V}/functions/_autocd
 share/zsh/${V}/functions/_awk
 share/zsh/${V}/functions/_axi-cache
+share/zsh/${V}/functions/_base64
 share/zsh/${V}/functions/_basename
+share/zsh/${V}/functions/_bash
 share/zsh/${V}/functions/_bash_completions
 share/zsh/${V}/functions/_baudrates
 share/zsh/${V}/functions/_baz
@@ -190,6 +192,7 @@ share/zsh/${V}/functions/_chflags
 share/zsh/${V}/functions/_chkconfig
 share/zsh/${V}/functions/_chmod
 share/zsh/${V}/functions/_chown
+share/zsh/${V}/functions/_chroot
 share/zsh/${V}/functions/_chrt
 share/zsh/${V}/functions/_chsh
 share/zsh/${V}/functions/_cksum
@@ -224,6 +227,7 @@ share/zsh/${V}/functions/_cp
 share/zsh/${V}/functions/_cpio
 share/zsh/${V}/functions/_cplay
 share/zsh/${V}/functions/_cpupower
+share/zsh/${V}/functions/_crontab
 share/zsh/${V}/functions/_cryptsetup
 share/zsh/${V}/functions/_cscope
 share/zsh/${V}/functions/_cssh
@@ -261,6 +265,7 @@ share/zsh/${V}/functions/_debdiff
 share/zsh/${V}/functions/_debfoster
 share/zsh/${V}/functions/_deborphan
 share/zsh/${V}/functions/_debsign
+share/zsh/${V}/functions/_debuild
 share/zsh/${V}/functions/_default
 share/zsh/${V}/functions/_defaults
 share/zsh/${V}/functions/_delimiters
@@ -273,6 +278,7 @@ share/zsh/${V}/functions/_dhcpinfo
 share/zsh/${V}/functions/_dict
 share/zsh/${V}/functions/_dict_words
 share/zsh/${V}/functions/_diff
+share/zsh/${V}/functions/_diff3
 share/zsh/${V}/functions/_diff_options
 share/zsh/${V}/functions/_diffstat
 share/zsh/${V}/functions/_dig
@@ -283,6 +289,7 @@ share/zsh/${V}/functions/_dirs
 share/zsh/${V}/functions/_disable
 share/zsh/${V}/functions/_dispatch
 share/zsh/${V}/functions/_django
+share/zsh/${V}/functions/_dkms
 share/zsh/${V}/functions/_dladm
 share/zsh/${V}/functions/_dlocate
 share/zsh/${V}/functions/_dmesg
@@ -301,15 +308,18 @@ share/zsh/${V}/functions/_dput
 share/zsh/${V}/functions/_drill
 share/zsh/${V}/functions/_dsh
 share/zsh/${V}/functions/_dtrace
+share/zsh/${V}/functions/_dtruss
 share/zsh/${V}/functions/_du
 share/zsh/${V}/functions/_dumpadm

Re: WANTLIB is unmaintainable (was: Re: update: shells/zsh 5.4.2)

2017-12-05 Thread Stuart Henderson 
On 2017/12/05 12:16, Marc Espie wrote:
> Apart from the fact that automatic generation won't work and break package
> updates completely, what do you suggest ?...
> 
> Seriously. This is not a simple problem
> 

Another way it /could/ be done is FreeBSD-style bumping dependent ports
when a dependency change forces an update. But (even speaking as one
of the people doing periodic WANTLIB syncs) I'm honestly happier with
WANTLIB than I am with that.

Many of these chagnes would be easier to handle if portbump's WANTLIB
functions worked a bit better.

Re: WANTLIB is unmaintainable (was: Re: update: shells/zsh 5.4.2)

2017-12-05 Thread Marc Espie 
Apart from the fact that automatic generation won't work and break package
updates completely, what do you suggest ?...

Seriously. This is not a simple problem

Re: WANTLIB is unmaintainable (was: Re: update: shells/zsh 5.4.2)

2017-12-04 Thread Antoine Jacoutot 
On Mon, Dec 04, 2017 at 03:06:45PM +, Christian Weisgerber wrote:
> Stuart Henderson:
> 
> > > Looks like WANTLIB needs an update, curses instead of ncursesw.  Could
> > > you please check that nothing went wrong in the configure step
> > 
> > This changed because of src/share/mk/bsd.lib.mk r1.92, we should probably
> > update it across all the ports tree otherwise the next time somebody does a
> > bulk WANTLIB sync, they're going to have a whole bunch of fun with that :)
> 
> WANTLIB is unmaintainable.
> 
> The curses thing is cosmetic, but every time some popular library
> changes its dependencies, the WANTLIB entries in hundreds of ports
> are outdated.  This happens all the time, so WANTLIB is permanently
> out of sync throughout the tree.
> 
> What exactly prevents @wantlib from being automatically generated
> by pkg_create?
> 
> Currently we build the port, run lib-port-depends-check, and edit
> the WANTLIB variable in the Makefile to match the output.  That's
> already semi-automated.  (Alas, the Makefile format doesn't lend
> itself to automated editing.  I'm beginning to understand why some
> people use XML for such things.)
> 
> I understand that some ports have, exceptionally, for various
> reasons, additional WANTLIB entries that aren't provided by
> lib-port-depends-check.  That's what WANTLIB could be used for.
> 
> It's time to face it: The manual maintenance of WANTLIB simply
> doesn't work.

I can't agree more.

-- 
Antoine

Re: WANTLIB is unmaintainable (was: Re: update: shells/zsh 5.4.2)

2017-12-04 Thread Marc Espie 
On Mon, Dec 04, 2017 at 04:06:45PM +0100, Christian Weisgerber wrote:
> Stuart Henderson:
> 
> > > Looks like WANTLIB needs an update, curses instead of ncursesw.  Could
> > > you please check that nothing went wrong in the configure step
> > 
> > This changed because of src/share/mk/bsd.lib.mk r1.92, we should probably
> > update it across all the ports tree otherwise the next time somebody does a
> > bulk WANTLIB sync, they're going to have a whole bunch of fun with that :)
> 
> WANTLIB is unmaintainable.
> 
> The curses thing is cosmetic, but every time some popular library
> changes its dependencies, the WANTLIB entries in hundreds of ports
> are outdated.  This happens all the time, so WANTLIB is permanently
> out of sync throughout the tree.
> 
> What exactly prevents @wantlib from being automatically generated
> by pkg_create?
> 
> Currently we build the port, run lib-port-depends-check, and edit
> the WANTLIB variable in the Makefile to match the output.  That's
> already semi-automated.  (Alas, the Makefile format doesn't lend
> itself to automated editing.  I'm beginning to understand why some
> people use XML for such things.)
> 
> I understand that some ports have, exceptionally, for various
> reasons, additional WANTLIB entries that aren't provided by
> lib-port-depends-check.  That's what WANTLIB could be used for.
> 
> It's time to face it: The manual maintenance of WANTLIB simply
> doesn't work.

Having wantlib lagging slightly behind  is not a huge problem.

Doing it automatically is not possible right now.  Everything will break.
mainly because packages with different wantlibs are not comparable, so you
can't know which one is the newest.

Adding wantlibs is not a big issue. Removing wantlibs is. 

A bump would be needed.

At least.

WANTLIB is unmaintainable (was: Re: update: shells/zsh 5.4.2)

2017-12-04 Thread Christian Weisgerber 
Stuart Henderson:

> > Looks like WANTLIB needs an update, curses instead of ncursesw.  Could
> > you please check that nothing went wrong in the configure step
> 
> This changed because of src/share/mk/bsd.lib.mk r1.92, we should probably
> update it across all the ports tree otherwise the next time somebody does a
> bulk WANTLIB sync, they're going to have a whole bunch of fun with that :)

WANTLIB is unmaintainable.

The curses thing is cosmetic, but every time some popular library
changes its dependencies, the WANTLIB entries in hundreds of ports
are outdated.  This happens all the time, so WANTLIB is permanently
out of sync throughout the tree.

What exactly prevents @wantlib from being automatically generated
by pkg_create?

Currently we build the port, run lib-port-depends-check, and edit
the WANTLIB variable in the Makefile to match the output.  That's
already semi-automated.  (Alas, the Makefile format doesn't lend
itself to automated editing.  I'm beginning to understand why some
people use XML for such things.)

I understand that some ports have, exceptionally, for various
reasons, additional WANTLIB entries that aren't provided by
lib-port-depends-check.  That's what WANTLIB could be used for.

It's time to face it: The manual maintenance of WANTLIB simply
doesn't work.

-- 
Christian "naddy" Weisgerber  na...@mips.inka.de

Re: update: shells/zsh 5.4.2

2017-12-02 Thread Stuart Henderson 
On 2017/12/02 17:58, Jeremie Courreges-Anglas wrote:
> 
> Hi Matthew,
> 
> On Fri, Dec 01 2017, Matthew Martin  wrote:
> > On Mon, Nov 13, 2017 at 05:08:41PM +0100, Pierre-Emmanuel André wrote:
> >> ok pea@
> >
> > ping?
> 
> Looks like WANTLIB needs an update, curses instead of ncursesw.  Could
> you please check that nothing went wrong in the configure step

This changed because of src/share/mk/bsd.lib.mk r1.92, we should probably
update it across all the ports tree otherwise the next time somebody does a
bulk WANTLIB sync, they're going to have a whole bunch of fun with that :)

Re: update: shells/zsh 5.4.2

2017-12-02 Thread Jeremie Courreges-Anglas 

Hi Matthew,

On Fri, Dec 01 2017, Matthew Martin  wrote:
> On Mon, Nov 13, 2017 at 05:08:41PM +0100, Pierre-Emmanuel André wrote:
>> ok pea@
>
> ping?

Looks like WANTLIB needs an update, curses instead of ncursesw.  Could
you please check that nothing went wrong in the configure step, and
refresh the patch? If everything looks good I'll commit it (unless pea@
beats me to it).

> diff --git Makefile Makefile
> index 58066551155..ebf02b2ed75 100644
> --- Makefile
> +++ Makefile
> @@ -2,7 +2,7 @@
>  
>  COMMENT= Z shell, Bourne shell-compatible
>  
> -V=   5.4.1
> +V=   5.4.2
>  DISTNAME=zsh-$V
>  CATEGORIES=  shells
>  
> diff --git distinfo distinfo
> index 0c68d09cc98..446c618c94b 100644
> --- distinfo
> +++ distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (zsh-5.4.1.tar.gz) = xEe4MsroZvUEWh6WP5vrcjFQJScSIkLjMibbBzwAHOI=
> -SIZE (zsh-5.4.1.tar.gz) = 4468512
> +SHA256 (zsh-5.4.2.tar.gz) = lXvNssV/ZMAvZzaT6lp1GO8ktlV66zpM4iLO+m10rMk=
> +SIZE (zsh-5.4.2.tar.gz) = 4482413
> diff --git patches/patch-Completion_BSD_Command__bsd_pkg 
> patches/patch-Completion_BSD_Command__bsd_pkg
> index 2386825e9f6..7e5b6e8c7d3 100644
> --- patches/patch-Completion_BSD_Command__bsd_pkg
> +++ patches/patch-Completion_BSD_Command__bsd_pkg
> @@ -1,12 +1,7 @@
>  $OpenBSD: patch-Completion_BSD_Command__bsd_pkg,v 1.4 2015/12/21 19:13:17 
> jasper Exp $
> -
> -From 3272bdce987a3e5d5448688529ccb8290e148a67 Mon Sep 17 00:00:00 2001
> -From: Matthew Martin 
> -Date: Fri, 11 Dec 2015 11:51:09 +0100
> -Subject: [PATCH] 37383: add completion type for object files
> -
>  Completion/BSD/Command/_bsd_pkg.orig Wed Jan 21 14:53:28 2004
> -+++ Completion/BSD/Command/_bsd_pkg  Mon Jan 23 21:30:02 2006
> +Index: Completion/BSD/Command/_bsd_pkg
> +--- Completion/BSD/Command/_bsd_pkg.orig
>  Completion/BSD/Command/_bsd_pkg
>  @@ -6,15 +6,19 @@ _bsd_pkg_pkgfiles() {
>   
> case $OSTYPE in
> @@ -39,113 +34,7 @@ Subject: [PATCH] 37383: add completion type for object 
> files
>   }
>   
>   (( $+functions[_bsd_pkg_pkgs_and_files] )) ||
> -@@ -67,9 +71,9 @@ _bsd_pkg() {
> -   ;;
> - netbsd*)
> -   flags=(
> --$flags[@]
> --'-u[update]'
> --'-V[show version and exit]'
> -+$flags[@]
> -+'-u[update]'
> -+'-V[show version and exit]'
> -   )
> -   ;;
> - esac
> -@@ -83,37 +87,37 @@ _bsd_pkg() {
> - case "$OSTYPE" in
> - freebsd*)
> -   flags=(
> --'-f[specify plist file]:plist file:_files'
> --'(-b)-c[specify comment file]:comment file:_files'
> --'(-b)-d[specify descr file]:descr file:_files'
> --'-Y[assume YES for any questions asked]'
> --'-N[assume NO for any questions asked]'
> --'(-b)-O[packing list only mode]'
> --'-v[be verbose]'
> --'-h[force tar to follow symlinks]'
> --'(-b)-i[specify pre-install script]:pre-install script:_files'
> --'(-b)-I[specify post-install script]:post-install script:_files'
> --'(-b)-P[specify initial dependencies]:dependencies:_bsd_pkg_pkgs'
> --'(-b)-p[specify prefix]:prefix directory:_files -/'
> --'(-b)-k[specify deinstall script]:deinstall script:_files'
> --'(-b)-K[specify post-deinstall script]:post-deinstall script:_files'
> --'(-b)-r[specify req script]:req script:_files'
> --'(-b)-s[specify source directory]:source directory:_files -/'
> --'(-b)-t[specify mktemp template]:mktemp template:_files'
> --'(-b)-X[specify exclude file]:exclude file for tar:_files'
> --'(-b)-D[specify message file]:message file:_files'
> --'(-b)-m[specify mtree file]:mtree file:_files'
> --'(-b)-o[specify origin]:origin:_files -W ${PORTSDIR\:-/usr/ports} -/'
> --'-j[use bzip2]'
> --'-z[use gzip]'
> --'(-c -d -O -i -I -P -p -k -K -r -s -t -X -D -m -o)-b[specify 
> pkgname]:pkgname:_bsd_pkg_pkgs'
> --'*:package file name:_files'
> -+'-f[specify plist file]:plist file:_files'
> -+'(-b)-c[specify comment file]:comment file:_files'
> -+'(-b)-d[specify descr file]:descr file:_files'
> -+'-Y[assume YES for any questions asked]'
> -+'-N[assume NO for any questions asked]'
> -+'(-b)-O[packing list only mode]'
> -+'-v[be verbose]'
> -+'-h[force tar to follow symlinks]'
> -+'(-b)-i[specify pre-install script]:pre-install script:_files'
> -+'(-b)-I[specify post-install script]:post-install script:_files'
> -+'(-b)-P[specify initial dependencies]:dependencies:_bsd_pkg_pkgs'
> -+'(-b)-p[specify prefix]:prefix directory:_files -/'
> -+'(-b)-k[specify deinstall script]:deinstall script:_files'
> -+'(-b)-K[specify post-deinstall script]:post-deinstall script:_files'
> -+'(-b)-r[specify req script]:req script:_files'
> -+'(-b)-s[specify source directory]:source directory:_files -/'
> -+'(-b)-t[specify mktemp template]:mktemp template:_files'
> -+'(-b)-X[specify exclude

Re: update: shells/zsh 5.4.2

2017-12-01 Thread Matthew Martin 
On Mon, Nov 13, 2017 at 05:08:41PM +0100, Pierre-Emmanuel André wrote:
> ok pea@

ping?



diff --git Makefile Makefile
index 58066551155..ebf02b2ed75 100644
--- Makefile
+++ Makefile
@@ -2,7 +2,7 @@
 
 COMMENT=   Z shell, Bourne shell-compatible
 
-V= 5.4.1
+V= 5.4.2
 DISTNAME=  zsh-$V
 CATEGORIES=shells
 
diff --git distinfo distinfo
index 0c68d09cc98..446c618c94b 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (zsh-5.4.1.tar.gz) = xEe4MsroZvUEWh6WP5vrcjFQJScSIkLjMibbBzwAHOI=
-SIZE (zsh-5.4.1.tar.gz) = 4468512
+SHA256 (zsh-5.4.2.tar.gz) = lXvNssV/ZMAvZzaT6lp1GO8ktlV66zpM4iLO+m10rMk=
+SIZE (zsh-5.4.2.tar.gz) = 4482413
diff --git patches/patch-Completion_BSD_Command__bsd_pkg 
patches/patch-Completion_BSD_Command__bsd_pkg
index 2386825e9f6..7e5b6e8c7d3 100644
--- patches/patch-Completion_BSD_Command__bsd_pkg
+++ patches/patch-Completion_BSD_Command__bsd_pkg
@@ -1,12 +1,7 @@
 $OpenBSD: patch-Completion_BSD_Command__bsd_pkg,v 1.4 2015/12/21 19:13:17 
jasper Exp $
-
-From 3272bdce987a3e5d5448688529ccb8290e148a67 Mon Sep 17 00:00:00 2001
-From: Matthew Martin 
-Date: Fri, 11 Dec 2015 11:51:09 +0100
-Subject: [PATCH] 37383: add completion type for object files
-
 Completion/BSD/Command/_bsd_pkg.orig   Wed Jan 21 14:53:28 2004
-+++ Completion/BSD/Command/_bsd_pkgMon Jan 23 21:30:02 2006
+Index: Completion/BSD/Command/_bsd_pkg
+--- Completion/BSD/Command/_bsd_pkg.orig
 Completion/BSD/Command/_bsd_pkg
 @@ -6,15 +6,19 @@ _bsd_pkg_pkgfiles() {
  
case $OSTYPE in
@@ -39,113 +34,7 @@ Subject: [PATCH] 37383: add completion type for object files
  }
  
  (( $+functions[_bsd_pkg_pkgs_and_files] )) ||
-@@ -67,9 +71,9 @@ _bsd_pkg() {
-   ;;
- netbsd*)
-   flags=(
--  $flags[@]
--  '-u[update]'
--  '-V[show version and exit]'
-+$flags[@]
-+'-u[update]'
-+'-V[show version and exit]'
-   )
-   ;;
- esac
-@@ -83,37 +87,37 @@ _bsd_pkg() {
- case "$OSTYPE" in
- freebsd*)
-   flags=(
--  '-f[specify plist file]:plist file:_files'
--  '(-b)-c[specify comment file]:comment file:_files'
--  '(-b)-d[specify descr file]:descr file:_files'
--  '-Y[assume YES for any questions asked]'
--  '-N[assume NO for any questions asked]'
--  '(-b)-O[packing list only mode]'
--  '-v[be verbose]'
--  '-h[force tar to follow symlinks]'
--  '(-b)-i[specify pre-install script]:pre-install script:_files'
--  '(-b)-I[specify post-install script]:post-install script:_files'
--  '(-b)-P[specify initial dependencies]:dependencies:_bsd_pkg_pkgs'
--  '(-b)-p[specify prefix]:prefix directory:_files -/'
--  '(-b)-k[specify deinstall script]:deinstall script:_files'
--  '(-b)-K[specify post-deinstall script]:post-deinstall script:_files'
--  '(-b)-r[specify req script]:req script:_files'
--  '(-b)-s[specify source directory]:source directory:_files -/'
--  '(-b)-t[specify mktemp template]:mktemp template:_files'
--  '(-b)-X[specify exclude file]:exclude file for tar:_files'
--  '(-b)-D[specify message file]:message file:_files'
--  '(-b)-m[specify mtree file]:mtree file:_files'
--  '(-b)-o[specify origin]:origin:_files -W ${PORTSDIR\:-/usr/ports} -/'
--  '-j[use bzip2]'
--  '-z[use gzip]'
--  '(-c -d -O -i -I -P -p -k -K -r -s -t -X -D -m -o)-b[specify 
pkgname]:pkgname:_bsd_pkg_pkgs'
--  '*:package file name:_files'
-+'-f[specify plist file]:plist file:_files'
-+'(-b)-c[specify comment file]:comment file:_files'
-+'(-b)-d[specify descr file]:descr file:_files'
-+'-Y[assume YES for any questions asked]'
-+'-N[assume NO for any questions asked]'
-+'(-b)-O[packing list only mode]'
-+'-v[be verbose]'
-+'-h[force tar to follow symlinks]'
-+'(-b)-i[specify pre-install script]:pre-install script:_files'
-+'(-b)-I[specify post-install script]:post-install script:_files'
-+'(-b)-P[specify initial dependencies]:dependencies:_bsd_pkg_pkgs'
-+'(-b)-p[specify prefix]:prefix directory:_files -/'
-+'(-b)-k[specify deinstall script]:deinstall script:_files'
-+'(-b)-K[specify post-deinstall script]:post-deinstall script:_files'
-+'(-b)-r[specify req script]:req script:_files'
-+'(-b)-s[specify source directory]:source directory:_files -/'
-+'(-b)-t[specify mktemp template]:mktemp template:_files'
-+'(-b)-X[specify exclude file]:exclude file for tar:_files'
-+'(-b)-D[specify message file]:message file:_files'
-+'(-b)-m[specify mtree file]:mtree file:_files'
-+'(-b)-o[specify origin]:origin:_files -W ${PORTSDIR\:-/usr/ports} -/'
-+'-j[use bzip2]'
-+'-z[use gzip]'
-+'(-c -d -O -i -I -P -p -k -K -r -s -t -X -D -m -o)-b[specify 
pkgname]:pkgname:_bsd_pkg_pkgs'
-+'*:package file name:_files'
-   )
-   ;;
- netbsd*)
-

Re: update: shells/zsh 5.4.2

2017-11-13 Thread Pierre-Emmanuel André 
On Tue, Nov 07, 2017 at 09:41:38PM -0600, Matthew Martin wrote:
> Ping (with pea@ this time and my apologies). Haven't run into issues in
> the past two months.
>

Oups sorry. I didn't see your update on ports@
ok pea@

Regards,


> - Matthew Martin
> 
> On Sat, Sep 09, 2017 at 09:39:11PM -0500, Matthew Martin wrote:
> > Been running this for about a week now. The patch is only large because
> > I'd like to kill the needless whitespace changes in the _bsd_pkg
> > completion patch. I don't have a strong opinion on the matter if someone
> > prefers to keep it as is.
> > 
> > - Matthew Martin
> > 
> > 
> > diff --git Makefile Makefile
> > index 58066551155..ebf02b2ed75 100644
> > --- Makefile
> > +++ Makefile
> > @@ -2,7 +2,7 @@
> >  
> >  COMMENT=   Z shell, Bourne shell-compatible
> >  
> > -V= 5.4.1
> > +V= 5.4.2
> >  DISTNAME=  zsh-$V
> >  CATEGORIES=shells
> >  
> > diff --git distinfo distinfo
> > index 0c68d09cc98..446c618c94b 100644
> > --- distinfo
> > +++ distinfo
> > @@ -1,2 +1,2 @@
> > -SHA256 (zsh-5.4.1.tar.gz) = xEe4MsroZvUEWh6WP5vrcjFQJScSIkLjMibbBzwAHOI=
> > -SIZE (zsh-5.4.1.tar.gz) = 4468512
> > +SHA256 (zsh-5.4.2.tar.gz) = lXvNssV/ZMAvZzaT6lp1GO8ktlV66zpM4iLO+m10rMk=
> > +SIZE (zsh-5.4.2.tar.gz) = 4482413
> > diff --git patches/patch-Completion_BSD_Command__bsd_pkg 
> > patches/patch-Completion_BSD_Command__bsd_pkg
> > index 2386825e9f6..7e5b6e8c7d3 100644
> > --- patches/patch-Completion_BSD_Command__bsd_pkg
> > +++ patches/patch-Completion_BSD_Command__bsd_pkg
> > @@ -1,12 +1,7 @@
> >  $OpenBSD: patch-Completion_BSD_Command__bsd_pkg,v 1.4 2015/12/21 19:13:17 
> > jasper Exp $
> > -
> > -From 3272bdce987a3e5d5448688529ccb8290e148a67 Mon Sep 17 00:00:00 2001
> > -From: Matthew Martin 
> > -Date: Fri, 11 Dec 2015 11:51:09 +0100
> > -Subject: [PATCH] 37383: add completion type for object files
> > -
> >  Completion/BSD/Command/_bsd_pkg.orig   Wed Jan 21 14:53:28 2004
> > -+++ Completion/BSD/Command/_bsd_pkgMon Jan 23 21:30:02 2006
> > +Index: Completion/BSD/Command/_bsd_pkg
> > +--- Completion/BSD/Command/_bsd_pkg.orig
> >  Completion/BSD/Command/_bsd_pkg
> >  @@ -6,15 +6,19 @@ _bsd_pkg_pkgfiles() {
> >   
> > case $OSTYPE in
> > @@ -39,113 +34,7 @@ Subject: [PATCH] 37383: add completion type for object 
> > files
> >   }
> >   
> >   (( $+functions[_bsd_pkg_pkgs_and_files] )) ||
> > -@@ -67,9 +71,9 @@ _bsd_pkg() {
> > -   ;;
> > - netbsd*)
> > -   flags=(
> > --  $flags[@]
> > --  '-u[update]'
> > --  '-V[show version and exit]'
> > -+$flags[@]
> > -+'-u[update]'
> > -+'-V[show version and exit]'
> > -   )
> > -   ;;
> > - esac
> > -@@ -83,37 +87,37 @@ _bsd_pkg() {
> > - case "$OSTYPE" in
> > - freebsd*)
> > -   flags=(
> > --  '-f[specify plist file]:plist file:_files'
> > --  '(-b)-c[specify comment file]:comment file:_files'
> > --  '(-b)-d[specify descr file]:descr file:_files'
> > --  '-Y[assume YES for any questions asked]'
> > --  '-N[assume NO for any questions asked]'
> > --  '(-b)-O[packing list only mode]'
> > --  '-v[be verbose]'
> > --  '-h[force tar to follow symlinks]'
> > --  '(-b)-i[specify pre-install script]:pre-install script:_files'
> > --  '(-b)-I[specify post-install script]:post-install script:_files'
> > --  '(-b)-P[specify initial dependencies]:dependencies:_bsd_pkg_pkgs'
> > --  '(-b)-p[specify prefix]:prefix directory:_files -/'
> > --  '(-b)-k[specify deinstall script]:deinstall script:_files'
> > --  '(-b)-K[specify post-deinstall script]:post-deinstall script:_files'
> > --  '(-b)-r[specify req script]:req script:_files'
> > --  '(-b)-s[specify source directory]:source directory:_files -/'
> > --  '(-b)-t[specify mktemp template]:mktemp template:_files'
> > --  '(-b)-X[specify exclude file]:exclude file for tar:_files'
> > --  '(-b)-D[specify message file]:message file:_files'
> > --  '(-b)-m[specify mtree file]:mtree file:_files'
> > --  '(-b)-o[specify origin]:origin:_files -W ${PORTSDIR\:-/usr/ports} -/'
> > --  '-j[use bzip2]'
> > --  '-z[use gzip]'
> > --  '(-c -d -O -i -I -P -p -k -K -r -s -t -X -D -m -o)-b[specify 
> > pkgname]:pkgname:_bsd_pkg_pkgs'
> > --  '*:package file name:_files'
> > -+'-f[specify plist file]:plist file:_files'
> > -+'(-b)-c[specify comment file]:comment file:_files'
> > -+'(-b)-d[specify descr file]:descr file:_files'
> > -+'-Y[assume YES for any questions asked]'
> > -+'-N[assume NO for any questions asked]'
> > -+'(-b)-O[packing list only mode]'
> > -+'-v[be verbose]'
> > -+'-h[force tar to follow symlinks]'
> > -+'(-b)-i[specify pre-install script]:pre-install script:_files'
> > -+'(-b)-I[specify post-install script]:post-install script:_files'
> > -+'(-b)-P[specify initial dependencies]:dependencies:_bsd_pkg_pkgs'
> > -+'(-b)-p[specify prefix]:prefix directory:_files -/'
> > -+'(-b)-k[specify deinstall

Re: update: shells/zsh 5.4.2

2017-11-07 Thread Matthew Martin 
Ping (with pea@ this time and my apologies). Haven't run into issues in
the past two months.

- Matthew Martin

On Sat, Sep 09, 2017 at 09:39:11PM -0500, Matthew Martin wrote:
> Been running this for about a week now. The patch is only large because
> I'd like to kill the needless whitespace changes in the _bsd_pkg
> completion patch. I don't have a strong opinion on the matter if someone
> prefers to keep it as is.
> 
> - Matthew Martin
> 
> 
> diff --git Makefile Makefile
> index 58066551155..ebf02b2ed75 100644
> --- Makefile
> +++ Makefile
> @@ -2,7 +2,7 @@
>  
>  COMMENT= Z shell, Bourne shell-compatible
>  
> -V=   5.4.1
> +V=   5.4.2
>  DISTNAME=zsh-$V
>  CATEGORIES=  shells
>  
> diff --git distinfo distinfo
> index 0c68d09cc98..446c618c94b 100644
> --- distinfo
> +++ distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (zsh-5.4.1.tar.gz) = xEe4MsroZvUEWh6WP5vrcjFQJScSIkLjMibbBzwAHOI=
> -SIZE (zsh-5.4.1.tar.gz) = 4468512
> +SHA256 (zsh-5.4.2.tar.gz) = lXvNssV/ZMAvZzaT6lp1GO8ktlV66zpM4iLO+m10rMk=
> +SIZE (zsh-5.4.2.tar.gz) = 4482413
> diff --git patches/patch-Completion_BSD_Command__bsd_pkg 
> patches/patch-Completion_BSD_Command__bsd_pkg
> index 2386825e9f6..7e5b6e8c7d3 100644
> --- patches/patch-Completion_BSD_Command__bsd_pkg
> +++ patches/patch-Completion_BSD_Command__bsd_pkg
> @@ -1,12 +1,7 @@
>  $OpenBSD: patch-Completion_BSD_Command__bsd_pkg,v 1.4 2015/12/21 19:13:17 
> jasper Exp $
> -
> -From 3272bdce987a3e5d5448688529ccb8290e148a67 Mon Sep 17 00:00:00 2001
> -From: Matthew Martin 
> -Date: Fri, 11 Dec 2015 11:51:09 +0100
> -Subject: [PATCH] 37383: add completion type for object files
> -
>  Completion/BSD/Command/_bsd_pkg.orig Wed Jan 21 14:53:28 2004
> -+++ Completion/BSD/Command/_bsd_pkg  Mon Jan 23 21:30:02 2006
> +Index: Completion/BSD/Command/_bsd_pkg
> +--- Completion/BSD/Command/_bsd_pkg.orig
>  Completion/BSD/Command/_bsd_pkg
>  @@ -6,15 +6,19 @@ _bsd_pkg_pkgfiles() {
>   
> case $OSTYPE in
> @@ -39,113 +34,7 @@ Subject: [PATCH] 37383: add completion type for object 
> files
>   }
>   
>   (( $+functions[_bsd_pkg_pkgs_and_files] )) ||
> -@@ -67,9 +71,9 @@ _bsd_pkg() {
> -   ;;
> - netbsd*)
> -   flags=(
> --$flags[@]
> --'-u[update]'
> --'-V[show version and exit]'
> -+$flags[@]
> -+'-u[update]'
> -+'-V[show version and exit]'
> -   )
> -   ;;
> - esac
> -@@ -83,37 +87,37 @@ _bsd_pkg() {
> - case "$OSTYPE" in
> - freebsd*)
> -   flags=(
> --'-f[specify plist file]:plist file:_files'
> --'(-b)-c[specify comment file]:comment file:_files'
> --'(-b)-d[specify descr file]:descr file:_files'
> --'-Y[assume YES for any questions asked]'
> --'-N[assume NO for any questions asked]'
> --'(-b)-O[packing list only mode]'
> --'-v[be verbose]'
> --'-h[force tar to follow symlinks]'
> --'(-b)-i[specify pre-install script]:pre-install script:_files'
> --'(-b)-I[specify post-install script]:post-install script:_files'
> --'(-b)-P[specify initial dependencies]:dependencies:_bsd_pkg_pkgs'
> --'(-b)-p[specify prefix]:prefix directory:_files -/'
> --'(-b)-k[specify deinstall script]:deinstall script:_files'
> --'(-b)-K[specify post-deinstall script]:post-deinstall script:_files'
> --'(-b)-r[specify req script]:req script:_files'
> --'(-b)-s[specify source directory]:source directory:_files -/'
> --'(-b)-t[specify mktemp template]:mktemp template:_files'
> --'(-b)-X[specify exclude file]:exclude file for tar:_files'
> --'(-b)-D[specify message file]:message file:_files'
> --'(-b)-m[specify mtree file]:mtree file:_files'
> --'(-b)-o[specify origin]:origin:_files -W ${PORTSDIR\:-/usr/ports} -/'
> --'-j[use bzip2]'
> --'-z[use gzip]'
> --'(-c -d -O -i -I -P -p -k -K -r -s -t -X -D -m -o)-b[specify 
> pkgname]:pkgname:_bsd_pkg_pkgs'
> --'*:package file name:_files'
> -+'-f[specify plist file]:plist file:_files'
> -+'(-b)-c[specify comment file]:comment file:_files'
> -+'(-b)-d[specify descr file]:descr file:_files'
> -+'-Y[assume YES for any questions asked]'
> -+'-N[assume NO for any questions asked]'
> -+'(-b)-O[packing list only mode]'
> -+'-v[be verbose]'
> -+'-h[force tar to follow symlinks]'
> -+'(-b)-i[specify pre-install script]:pre-install script:_files'
> -+'(-b)-I[specify post-install script]:post-install script:_files'
> -+'(-b)-P[specify initial dependencies]:dependencies:_bsd_pkg_pkgs'
> -+'(-b)-p[specify prefix]:prefix directory:_files -/'
> -+'(-b)-k[specify deinstall script]:deinstall script:_files'
> -+'(-b)-K[specify post-deinstall script]:post-deinstall script:_files'
> -+'(-b)-r[specify req script]:req script:_files'
> -+'(-b)-s[specify source directory]:source directory:_files -/'
> -+'(-b)-t[specify mktemp template]:mktemp template:_files'

Re: UPDATE: shells/zsh

2017-08-10 Thread Stuart Henderson 
On 2017/08/09 22:05, Matthew Martin wrote:
>   If anyone knows how to get a list of
> all packages (installed and not) preferably without having a ports tree,
> I could fix up the patch to push it upstream.

If sqlports is installed, you can do this:

$ sqlite3 /usr/local/share/sqlports 'select fullpkgname from ports'

Re: UPDATE: shells/zsh

2017-08-10 Thread Pierre-Emmanuel Andre 
On Wed, Aug 09, 2017 at 09:41:33PM +0200, Rafael Sadowski wrote:
> Please find below a quite simple patch to update zsh to 5.4.1.
> 
> Ok? Comments?
>


Hi,

I have the same diff in my tree ;)
ok pea@


> Rafael Sadowski
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/shells/zsh/Makefile,v
> retrieving revision 1.84
> diff -u -p -u -p -r1.84 Makefile
> --- Makefile  24 Mar 2017 14:30:14 -  1.84
> +++ Makefile  9 Aug 2017 19:39:32 -
> @@ -2,13 +2,13 @@
>  
>  COMMENT= Z shell, Bourne shell-compatible
>  
> -V=   5.3.1
> +V=   5.4.1
>  DISTNAME=zsh-$V
>  CATEGORIES=  shells
>  
>  MAINTAINER=  Pierre-Emmanuel Andre 
>  
> -HOMEPAGE=http://www.zsh.org/
> +HOMEPAGE=https://www.zsh.org/
>  
>  MASTER_SITES=${MASTER_SITE_SOURCEFORGE:=zsh/}
>  MASTER_SITES+=   http://www.zsh.org/pub/
> Index: distinfo
> ===
> RCS file: /cvs/ports/shells/zsh/distinfo,v
> retrieving revision 1.24
> diff -u -p -u -p -r1.24 distinfo
> --- distinfo  24 Mar 2017 14:30:14 -  1.24
> +++ distinfo  9 Aug 2017 19:39:32 -
> @@ -1,2 +1,2 @@
> -SHA256 (zsh-5.3.1.tar.gz) = PZSlkP88Vi7POH2nisNW1r6nmwUKnvgePsufjuUTBA4=
> -SIZE (zsh-5.3.1.tar.gz) = 4404164
> +SHA256 (zsh-5.4.1.tar.gz) = xEe4MsroZvUEWh6WP5vrcjFQJScSIkLjMibbBzwAHOI=
> +SIZE (zsh-5.4.1.tar.gz) = 4468512
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/shells/zsh/pkg/PLIST,v
> retrieving revision 1.45
> diff -u -p -u -p -r1.45 PLIST
> --- pkg/PLIST 2 Feb 2017 03:41:12 -   1.45
> +++ pkg/PLIST 9 Aug 2017 19:39:32 -
> @@ -99,6 +99,7 @@ share/zsh/${V}/functions/VCS_INFO_quilt
>  share/zsh/${V}/functions/VCS_INFO_realpath
>  share/zsh/${V}/functions/VCS_INFO_reposub
>  share/zsh/${V}/functions/VCS_INFO_set
> +share/zsh/${V}/functions/VCS_INFO_set-patch-format
>  share/zsh/${V}/functions/_SUSEconfig
>  share/zsh/${V}/functions/_a2ps
>  share/zsh/${V}/functions/_a2utils
> @@ -141,6 +142,7 @@ share/zsh/${V}/functions/_auto-apt
>  share/zsh/${V}/functions/_autocd
>  share/zsh/${V}/functions/_awk
>  share/zsh/${V}/functions/_axi-cache
> +share/zsh/${V}/functions/_basename
>  share/zsh/${V}/functions/_bash_completions
>  share/zsh/${V}/functions/_baudrates
>  share/zsh/${V}/functions/_baz
> @@ -187,6 +189,7 @@ share/zsh/${V}/functions/_chown
>  share/zsh/${V}/functions/_chrt
>  share/zsh/${V}/functions/_chsh
>  share/zsh/${V}/functions/_clay
> +share/zsh/${V}/functions/_cmdambivalent
>  share/zsh/${V}/functions/_cmdstring
>  share/zsh/${V}/functions/_cmp
>  share/zsh/${V}/functions/_combination
> @@ -241,6 +244,7 @@ share/zsh/${V}/functions/_dcop
>  share/zsh/${V}/functions/_dcut
>  share/zsh/${V}/functions/_dd
>  share/zsh/${V}/functions/_deb_architectures
> +share/zsh/${V}/functions/_deb_codenames
>  share/zsh/${V}/functions/_deb_packages
>  share/zsh/${V}/functions/_debbugs_bugnumber
>  share/zsh/${V}/functions/_debchange
> @@ -302,6 +306,7 @@ share/zsh/${V}/functions/_email_addresse
>  share/zsh/${V}/functions/_emulate
>  share/zsh/${V}/functions/_enable
>  share/zsh/${V}/functions/_enscript
> +share/zsh/${V}/functions/_entr
>  share/zsh/${V}/functions/_env
>  share/zsh/${V}/functions/_equal
>  share/zsh/${V}/functions/_espeak
> @@ -333,6 +338,7 @@ share/zsh/${V}/functions/_flex
>  share/zsh/${V}/functions/_floppy
>  share/zsh/${V}/functions/_flowadm
>  share/zsh/${V}/functions/_fmadm
> +share/zsh/${V}/functions/_fmt
>  share/zsh/${V}/functions/_fortune
>  share/zsh/${V}/functions/_freebsd-update
>  share/zsh/${V}/functions/_fsh
> @@ -460,6 +466,7 @@ share/zsh/${V}/functions/_look
>  share/zsh/${V}/functions/_losetup
>  share/zsh/${V}/functions/_lp
>  share/zsh/${V}/functions/_ls
> +share/zsh/${V}/functions/_lsblk
>  share/zsh/${V}/functions/_lscfg
>  share/zsh/${V}/functions/_lsdev
>  share/zsh/${V}/functions/_lslv
> @@ -557,6 +564,7 @@ share/zsh/${V}/functions/_other_accounts
>  share/zsh/${V}/functions/_pack
>  share/zsh/${V}/functions/_parameter
>  share/zsh/${V}/functions/_parameters
> +share/zsh/${V}/functions/_paste
>  share/zsh/${V}/functions/_patch
>  share/zsh/${V}/functions/_patchutils
>  share/zsh/${V}/functions/_path_commands
> @@ -716,6 +724,8 @@ share/zsh/${V}/functions/_svcprop
>  share/zsh/${V}/functions/_svcs
>  share/zsh/${V}/functions/_svcs_fmri
>  share/zsh/${V}/functions/_svn-buildpackage
> +share/zsh/${V}/functions/_swaks
> +share/zsh/${V}/functions/_swift
>  share/zsh/${V}/functions/_sys_calls
>  share/zsh/${V}/functions/_sysctl
>  share/zsh/${V}/functions/_sysrc
> @@ -766,6 +776,7 @@ share/zsh/${V}/functions/_twisted
>  share/zsh/${V}/functions/_typeset
>  share/zsh/${V}/functions/_ulimit
>  share/zsh/${V}/functions/_uml
> +share/zsh/${V}/functions/_umountable
>  share/zsh/${V}/functions/_unace
>  share/zsh/${V}/functions/_uname
>  share/zsh/${V}/functions/_unexpand
> @@ -964,6

Re: UPDATE: shells/zsh

2017-08-09 Thread Matthew Martin 
On Wed, Aug 09, 2017 at 09:41:33PM +0200, Rafael Sadowski wrote:
> Please find below a quite simple patch to update zsh to 5.4.1.
> 
> Ok? Comments?
> 
> Rafael Sadowski

Got to it before I could get home :). Works fine here. I had largely the
same diff; however, I thought we might remove the needless whitespace
changes in patches/patch-Completion_BSD_Command__bsd_pkg (I have the
diff locally if anyone wants it). If anyone knows how to get a list of
all packages (installed and not) preferably without having a ports tree,
I could fix up the patch to push it upstream.

- Matthew Martin

Re: UPDATE: shells/zsh

2017-03-24 Thread Pierre-Emmanuel Andre 
On Thu, Mar 23, 2017 at 11:28:21PM +0100, Rafael Sadowski wrote:
> On Thu Mar 23, 2017 at 10:07:05PM +, Edd Barrett wrote:
> > Thanks.
> > 
> > On Thu, Feb 02, 2017 at 08:01:45AM +0100, Rafael Sadowski wrote:
> > > Very simple bug-fix release update.
> > 
> > I've just applied this. Will run with it for a day or so and let you
> > know how I get on.
> > 
> > > - fix: longer than 80 chars in Makefile
> > 
> > There's another long line you could fix if you liked.
> > 
> 
> Oh, you're right. portcheck(1) ignores the line length in "pre-configure".
> 
> New diff below, thanks for all!
> 
> Rafael
>

Committed. Thanks !
Regards,


> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/shells/zsh/Makefile,v
> retrieving revision 1.83
> diff -u -p -u -p -r1.83 Makefile
> --- Makefile  2 Feb 2017 03:41:12 -   1.83
> +++ Makefile  23 Mar 2017 22:25:02 -
> @@ -2,7 +2,7 @@
>  
>  COMMENT= Z shell, Bourne shell-compatible
>  
> -V=   5.3
> +V=   5.3.1
>  DISTNAME=zsh-$V
>  CATEGORIES=  shells
>  
> @@ -42,12 +42,15 @@ TEST_FLAGS=   INSTALL_PROGRAM="install -c 
>   INSTALL="install -c" \
>   TMPPREFIX=${WRKBUILD}/tmp \
>   TERM=xterm
> -EXTFILES=Misc/checkmail Misc/run-help Misc/sticky-note Misc/zcalc 
> Misc/zed Misc/zkbd \
> +EXTFILES=Misc/checkmail Misc/run-help \
> + Misc/sticky-note Misc/zcalc \
> + Misc/zed Misc/zkbd \
>   Calendar/calendar_add Example/cat Example/zless
>  
>  pre-configure:
>  .for i in ${EXTFILES}
> - sed -i -e "s,/bin/zsh,${TRUEPREFIX}/bin/zsh,g" ${WRKSRC}/Functions/${i}
> + sed -i -e "s,/bin/zsh,${TRUEPREFIX}/bin/zsh,g" \
> + ${WRKSRC}/Functions/${i}
>  .endfor
>   @find ${WRKSRC} -name "*.orig" -exec rm -f {} \;
>  
> Index: distinfo
> ===
> RCS file: /cvs/ports/shells/zsh/distinfo,v
> retrieving revision 1.23
> diff -u -p -u -p -r1.23 distinfo
> --- distinfo  2 Feb 2017 03:41:12 -   1.23
> +++ distinfo  23 Mar 2017 22:25:02 -
> @@ -1,2 +1,2 @@
> -SHA256 (zsh-5.3.tar.gz) = HaJz+pYEGzle6fYo0U8q/wj5pi6YQjqZAhji6gN7mm0=
> -SIZE (zsh-5.3.tar.gz) = 4403492
> +SHA256 (zsh-5.3.1.tar.gz) = PZSlkP88Vi7POH2nisNW1r6nmwUKnvgePsufjuUTBA4=
> +SIZE (zsh-5.3.1.tar.gz) = 4404164

Re: UPDATE: shells/zsh

2017-03-23 Thread Rafael Sadowski 
On Thu Mar 23, 2017 at 10:07:05PM +, Edd Barrett wrote:
> Thanks.
> 
> On Thu, Feb 02, 2017 at 08:01:45AM +0100, Rafael Sadowski wrote:
> > Very simple bug-fix release update.
> 
> I've just applied this. Will run with it for a day or so and let you
> know how I get on.
> 
> > - fix: longer than 80 chars in Makefile
> 
> There's another long line you could fix if you liked.
> 

Oh, you're right. portcheck(1) ignores the line length in "pre-configure".

New diff below, thanks for all!

Rafael


Index: Makefile
===
RCS file: /cvs/ports/shells/zsh/Makefile,v
retrieving revision 1.83
diff -u -p -u -p -r1.83 Makefile
--- Makefile2 Feb 2017 03:41:12 -   1.83
+++ Makefile23 Mar 2017 22:25:02 -
@@ -2,7 +2,7 @@
 
 COMMENT=   Z shell, Bourne shell-compatible
 
-V= 5.3
+V= 5.3.1
 DISTNAME=  zsh-$V
 CATEGORIES=shells
 
@@ -42,12 +42,15 @@ TEST_FLAGS= INSTALL_PROGRAM="install -c 
INSTALL="install -c" \
TMPPREFIX=${WRKBUILD}/tmp \
TERM=xterm
-EXTFILES=  Misc/checkmail Misc/run-help Misc/sticky-note Misc/zcalc 
Misc/zed Misc/zkbd \
+EXTFILES=  Misc/checkmail Misc/run-help \
+   Misc/sticky-note Misc/zcalc \
+   Misc/zed Misc/zkbd \
Calendar/calendar_add Example/cat Example/zless
 
 pre-configure:
 .for i in ${EXTFILES}
-   sed -i -e "s,/bin/zsh,${TRUEPREFIX}/bin/zsh,g" ${WRKSRC}/Functions/${i}
+   sed -i -e "s,/bin/zsh,${TRUEPREFIX}/bin/zsh,g" \
+   ${WRKSRC}/Functions/${i}
 .endfor
@find ${WRKSRC} -name "*.orig" -exec rm -f {} \;
 
Index: distinfo
===
RCS file: /cvs/ports/shells/zsh/distinfo,v
retrieving revision 1.23
diff -u -p -u -p -r1.23 distinfo
--- distinfo2 Feb 2017 03:41:12 -   1.23
+++ distinfo23 Mar 2017 22:25:02 -
@@ -1,2 +1,2 @@
-SHA256 (zsh-5.3.tar.gz) = HaJz+pYEGzle6fYo0U8q/wj5pi6YQjqZAhji6gN7mm0=
-SIZE (zsh-5.3.tar.gz) = 4403492
+SHA256 (zsh-5.3.1.tar.gz) = PZSlkP88Vi7POH2nisNW1r6nmwUKnvgePsufjuUTBA4=
+SIZE (zsh-5.3.1.tar.gz) = 4404164

Re: UPDATE: shells/zsh

2017-03-23 Thread Edd Barrett 
Thanks.

On Thu, Feb 02, 2017 at 08:01:45AM +0100, Rafael Sadowski wrote:
> Very simple bug-fix release update.

I've just applied this. Will run with it for a day or so and let you
know how I get on.

> - fix: longer than 80 chars in Makefile

There's another long line you could fix if you liked.

-- 
Best Regards
Edd Barrett

http://www.theunixzoo.co.uk

Re: UPDATE: shells/zsh

2017-03-23 Thread Rafael Sadowski 
*ping*

On Thu Feb 02, 2017 at 08:01:45AM +0100, Rafael Sadowski wrote:
> Hi All!
> 
> Very simple bug-fix release update.
> 
> Changes between versions 5.3 and 5.3.1:
> 
> - Fix handling of "printf -" and "printf --".
> - Minor completion fixes for FreeBSD (sysctl, chflags).
> 
> Ports changes:
> 
> - fix: longer than 80 chars in Makefile
> 
> Cheers,
> 
> Rafael
> 
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/shells/zsh/Makefile,v
> retrieving revision 1.83
> diff -u -p -u -p -r1.83 Makefile
> --- Makefile  2 Feb 2017 03:41:12 -   1.83
> +++ Makefile  2 Feb 2017 06:56:21 -
> @@ -2,7 +2,7 @@
>  
>  COMMENT= Z shell, Bourne shell-compatible
>  
> -V=   5.3
> +V=   5.3.1
>  DISTNAME=zsh-$V
>  CATEGORIES=  shells
>  
> @@ -42,7 +42,9 @@ TEST_FLAGS= INSTALL_PROGRAM="install -c 
>   INSTALL="install -c" \
>   TMPPREFIX=${WRKBUILD}/tmp \
>   TERM=xterm
> -EXTFILES=Misc/checkmail Misc/run-help Misc/sticky-note Misc/zcalc 
> Misc/zed Misc/zkbd \
> +EXTFILES=Misc/checkmail Misc/run-help \
> + Misc/sticky-note Misc/zcalc \
> + Misc/zed Misc/zkbd \
>   Calendar/calendar_add Example/cat Example/zless
>  
>  pre-configure:
> Index: distinfo
> ===
> RCS file: /cvs/ports/shells/zsh/distinfo,v
> retrieving revision 1.23
> diff -u -p -u -p -r1.23 distinfo
> --- distinfo  2 Feb 2017 03:41:12 -   1.23
> +++ distinfo  2 Feb 2017 06:56:21 -
> @@ -1,2 +1,2 @@
> -SHA256 (zsh-5.3.tar.gz) = HaJz+pYEGzle6fYo0U8q/wj5pi6YQjqZAhji6gN7mm0=
> -SIZE (zsh-5.3.tar.gz) = 4403492
> +SHA256 (zsh-5.3.1.tar.gz) = PZSlkP88Vi7POH2nisNW1r6nmwUKnvgePsufjuUTBA4=
> +SIZE (zsh-5.3.1.tar.gz) = 4404164

Re: UPDATE: shells/zsh-5.0.2

2013-08-13 Thread Gleydson Soares 

gsoa...@trusted.com.br writes:

 update to zsh-5.0.2, some minor new features and bug fixes. 

attached a new diff with some minor tweaks:
- remove useless .orig diles, so zap comment markers in PLIST.
OK?

Index: Makefile
===
RCS file: /cvs/ports/shells/zsh/Makefile,v
retrieving revision 1.68
diff -u -p -u -p -r1.68 Makefile
--- Makefile11 Mar 2013 11:41:29 -  1.68
+++ Makefile13 Aug 2013 16:51:15 -
@@ -2,7 +2,7 @@
 
 COMMENT=   Z shell, Bourne shell-compatible
 
-V= 5.0.0
+V= 5.0.2
 DISTNAME=  zsh-$V
 CATEGORIES=shells
 
@@ -51,6 +51,7 @@ pre-configure:
 .for i in ${EXTFILES}
perl -pi -e s,/bin/zsh,${TRUEPREFIX}/bin/zsh,g 
${WRKSRC}/Functions/${i}
 .endfor
+   @find ${WRKSRC} -name *.orig -exec rm -f {} \;
 
 post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/zsh/$V/scripts/
Index: distinfo
===
RCS file: /cvs/ports/shells/zsh/distinfo,v
retrieving revision 1.17
diff -u -p -u -p -r1.17 distinfo
--- distinfo24 Sep 2012 19:33:50 -  1.17
+++ distinfo13 Aug 2013 16:51:15 -
@@ -1,2 +1,2 @@
-SHA256 (zsh-5.0.0.tar.gz) = g1GU6oOr2BK1/bHSv6ZCfExOledxxKdekAYDevjv0mQ=
-SIZE (zsh-5.0.0.tar.gz) = 3795376
+SHA256 (zsh-5.0.2.tar.gz) = rcDHiBUyQZeXcTt8UDvMVnTIj5OhkeJvcAtCwRoagW4=
+SIZE (zsh-5.0.2.tar.gz) = 3823234
Index: patches/patch-Completion_Unix_Command__find
===
RCS file: /cvs/ports/shells/zsh/patches/patch-Completion_Unix_Command__find,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-Completion_Unix_Command__find
--- patches/patch-Completion_Unix_Command__find 8 Feb 2008 04:55:08 -   
1.2
+++ patches/patch-Completion_Unix_Command__find 13 Aug 2013 16:51:15 -
@@ -1,24 +1,29 @@
-$OpenBSD: patch-Completion_Unix_Command__find,v 1.2 2008/02/08 04:55:08 okan 
Exp $
 Completion/Unix/Command/_find.orig Thu Dec 13 15:04:47 2007
-+++ Completion/Unix/Command/_find  Thu Dec 13 15:13:49 2007
-@@ -1,71 +1,40 @@
+$OpenBSD$
+--- Completion/Unix/Command/_find.orig Sun Aug 11 04:52:54 2013
 Completion/Unix/Command/_find  Sun Aug 11 04:53:00 2013
+@@ -1,82 +1,39 @@
 -#compdef find
 +#compdef find (OpenBSD)
 +# Sebastian Stark s...@todesplanet.de
  
  _arguments \
+-  '(- *)-help' '(-)--help' \
+-  '(- *)-version' '(-)--version' \
+-  '(-L -P)-H[only follow symlinks when resolving command-line arguments]' \
+-  '(-H -P)-L[follow symlinks]' \
+-  '(-H -L)-P[never follow symlinks]' \
+-  '-D[print diagnostics]:deb option:(help tree search stat rates opt exec)' \
+-  '-O+[enable query optimisation]:level:(1 2 3)' \
 -  '*-daystart' \
--  '*-depth' \
+-  '*-d' '*-depth' \
 -  '*-follow' \
--  '*-help' \
--  '*-ignore_readdir_race' \
--  '*-maxdepth:maximum search depth:' \
--  '*-mindepth:minimum search depth:' \
+-  '(-noignore_readdir_race)-ignore_readdir_race' \
+-  '*-maxdepth:maximum search depth' \
+-  '*-mindepth:minimum search depth' \
 -  '*-mount' \
--  '*-noignore_readdir_race' \
+-  '(-ignore_readdir_race)-noignore_readdir_race' \
 -  '*-noleaf' \
--  '*-regextype:regexp syntax:(emacs posix-awk posix-basic posix-egrep 
posix-extended)' \
--  '*-version' \
+-  '-regextype:regexp syntax:(emacs posix-awk posix-basic posix-egrep 
posix-extended)' \
 -  '*-warn' \
 -  '*-nowarn' \
 -  '*-xdev' \
@@ -37,6 +42,7 @@ $OpenBSD: patch-Completion_Unix_Command_
 -  '*-used:access after inode change (days):' \
 +  '*-ctime:inode change time (minutes)' \
'*-empty' \
+-  '*-executable' \
 -  '*-false' \
 -  '*-fstype:file system type:_file_systems' \
 -  '*-gid:numeric group ID:' \
@@ -71,6 +77,8 @@ $OpenBSD: patch-Completion_Unix_Command_
'*-nouser' \
'*-nogroup' \
 -  '*-perm:file permission bits:' \
+-  '*-readable' \
+-  '*-writable' \
 -  '*-size:file size:' \
 -  '*-samefile:same inode as:_files' \
 -  '*-true' \
@@ -81,7 +89,7 @@ $OpenBSD: patch-Completion_Unix_Command_
 -  '*-execdir:program: _command_names -e:*\;::program arguments: _normal' \
'*-ok:program: _command_names -e:*\;::program arguments: _normal' \
 -  '*-okdir:program: _command_names -e:*\;::program arguments: _normal' \
-   '*-fls:output file:_files' \
+-  '*-fls:output file:_files' \
 -  '*-fprint:output file:_files' \
 -  '*-fprint0:output file:_files' \
 -  '*-fprintf:output file:_files:output format:' \
@@ -93,6 +101,9 @@ $OpenBSD: patch-Completion_Unix_Command_
'*-prune' \
 -  '*-quit' \
 -  '*-ls' \
+-  '*-and' '*-a' \
+-  '*-or' '*-o' \
+-  '*-not' \
 +  '*-size:file size:' \
 +  '*-type:file type:((b\:block\ special\ file c\:character\ special\ file 
d\:directory p\:named\ pipe f\:normal\ file l\:symbolic\ link s\:socket))' \
 +  '*-user:user:_users' \
Index: pkg/PFRAG.shared
===
RCS file: /cvs/ports/shells/zsh/pkg/PFRAG.shared,v
retrieving revision 1.9
diff -u

Re: UPDATE: shells/zsh-5.0.2

2013-08-13 Thread Antoine Jacoutot 
On Tue, Aug 13, 2013 at 02:00:48PM -0300, Gleydson Soares wrote:
 
 gsoa...@trusted.com.br writes:
 
  update to zsh-5.0.2, some minor new features and bug fixes. 
 
 attached a new diff with some minor tweaks:
 - remove useless .orig diles, so zap comment markers in PLIST.
 OK?
 

 Index: Makefile
 ===
 RCS file: /cvs/ports/shells/zsh/Makefile,v
 retrieving revision 1.68
 diff -u -p -u -p -r1.68 Makefile
 --- Makefile  11 Mar 2013 11:41:29 -  1.68
 +++ Makefile  13 Aug 2013 16:51:15 -
 @@ -2,7 +2,7 @@
  
  COMMENT= Z shell, Bourne shell-compatible
  
 -V=   5.0.0
 +V=   5.0.2
  DISTNAME=zsh-$V
  CATEGORIES=  shells
  
 @@ -51,6 +51,7 @@ pre-configure:
  .for i in ${EXTFILES}
   perl -pi -e s,/bin/zsh,${TRUEPREFIX}/bin/zsh,g 
 ${WRKSRC}/Functions/${i}
  .endfor
 + @find ${WRKSRC} -name *.orig -exec rm -f {} \;
  
  post-install:
   ${INSTALL_DATA_DIR} ${PREFIX}/share/zsh/$V/scripts/
 Index: distinfo
 ===
 RCS file: /cvs/ports/shells/zsh/distinfo,v
 retrieving revision 1.17
 diff -u -p -u -p -r1.17 distinfo
 --- distinfo  24 Sep 2012 19:33:50 -  1.17
 +++ distinfo  13 Aug 2013 16:51:15 -
 @@ -1,2 +1,2 @@
 -SHA256 (zsh-5.0.0.tar.gz) = g1GU6oOr2BK1/bHSv6ZCfExOledxxKdekAYDevjv0mQ=
 -SIZE (zsh-5.0.0.tar.gz) = 3795376
 +SHA256 (zsh-5.0.2.tar.gz) = rcDHiBUyQZeXcTt8UDvMVnTIj5OhkeJvcAtCwRoagW4=
 +SIZE (zsh-5.0.2.tar.gz) = 3823234
 Index: patches/patch-Completion_Unix_Command__find
 ===
 RCS file: /cvs/ports/shells/zsh/patches/patch-Completion_Unix_Command__find,v
 retrieving revision 1.2
 diff -u -p -u -p -r1.2 patch-Completion_Unix_Command__find
 --- patches/patch-Completion_Unix_Command__find   8 Feb 2008 04:55:08 
 -   1.2
 +++ patches/patch-Completion_Unix_Command__find   13 Aug 2013 16:51:15 
 -
 @@ -1,24 +1,29 @@
 -$OpenBSD: patch-Completion_Unix_Command__find,v 1.2 2008/02/08 04:55:08 okan 
 Exp $
  Completion/Unix/Command/_find.orig   Thu Dec 13 15:04:47 2007
 -+++ Completion/Unix/Command/_findThu Dec 13 15:13:49 2007
 -@@ -1,71 +1,40 @@
 +$OpenBSD$
 +--- Completion/Unix/Command/_find.orig   Sun Aug 11 04:52:54 2013
  Completion/Unix/Command/_findSun Aug 11 04:53:00 2013
 +@@ -1,82 +1,39 @@
  -#compdef find
  +#compdef find (OpenBSD)
  +# Sebastian Stark s...@todesplanet.de
   
   _arguments \
 +-  '(- *)-help' '(-)--help' \
 +-  '(- *)-version' '(-)--version' \
 +-  '(-L -P)-H[only follow symlinks when resolving command-line arguments]' \
 +-  '(-H -P)-L[follow symlinks]' \
 +-  '(-H -L)-P[never follow symlinks]' \
 +-  '-D[print diagnostics]:deb option:(help tree search stat rates opt exec)' 
 \
 +-  '-O+[enable query optimisation]:level:(1 2 3)' \
  -  '*-daystart' \
 --  '*-depth' \
 +-  '*-d' '*-depth' \
  -  '*-follow' \
 --  '*-help' \
 --  '*-ignore_readdir_race' \
 --  '*-maxdepth:maximum search depth:' \
 --  '*-mindepth:minimum search depth:' \
 +-  '(-noignore_readdir_race)-ignore_readdir_race' \
 +-  '*-maxdepth:maximum search depth' \
 +-  '*-mindepth:minimum search depth' \
  -  '*-mount' \
 --  '*-noignore_readdir_race' \
 +-  '(-ignore_readdir_race)-noignore_readdir_race' \
  -  '*-noleaf' \
 --  '*-regextype:regexp syntax:(emacs posix-awk posix-basic posix-egrep 
 posix-extended)' \
 --  '*-version' \
 +-  '-regextype:regexp syntax:(emacs posix-awk posix-basic posix-egrep 
 posix-extended)' \
  -  '*-warn' \
  -  '*-nowarn' \
  -  '*-xdev' \
 @@ -37,6 +42,7 @@ $OpenBSD: patch-Completion_Unix_Command_
  -  '*-used:access after inode change (days):' \
  +  '*-ctime:inode change time (minutes)' \
 '*-empty' \
 +-  '*-executable' \
  -  '*-false' \
  -  '*-fstype:file system type:_file_systems' \
  -  '*-gid:numeric group ID:' \
 @@ -71,6 +77,8 @@ $OpenBSD: patch-Completion_Unix_Command_
 '*-nouser' \
 '*-nogroup' \
  -  '*-perm:file permission bits:' \
 +-  '*-readable' \
 +-  '*-writable' \
  -  '*-size:file size:' \
  -  '*-samefile:same inode as:_files' \
  -  '*-true' \
 @@ -81,7 +89,7 @@ $OpenBSD: patch-Completion_Unix_Command_
  -  '*-execdir:program: _command_names -e:*\;::program arguments: _normal' \
 '*-ok:program: _command_names -e:*\;::program arguments: _normal' \
  -  '*-okdir:program: _command_names -e:*\;::program arguments: _normal' \
 -   '*-fls:output file:_files' \
 +-  '*-fls:output file:_files' \
  -  '*-fprint:output file:_files' \
  -  '*-fprint0:output file:_files' \
  -  '*-fprintf:output file:_files:output format:' \
 @@ -93,6 +101,9 @@ $OpenBSD: patch-Completion_Unix_Command_
 '*-prune' \
  -  '*-quit' \
  -  '*-ls' \
 +-  '*-and' '*-a' \
 +-  '*-or' '*-o' \
 +-  '*-not' \
  +  '*-size:file size:' \
  +  '*-type:file type:((b\:block\ special\ file c\:character\ special\ file 
 d\:directory p\:named\ pipe f\:normal\ file l\:symbolic\ link s\:socket))' \

Re: UPDATE: shells/zsh-5.0.2

2013-08-13 Thread Gleydson Soares 

ajacou...@bsdfrog.org writes:

 --- pkg/PLIST24 Sep 2012 19:33:50 -  1.36
 +++ pkg/PLIST13 Aug 2013 16:51:15 -
 @@ -2,7 +2,7 @@
  @pkgpath shells/zsh,-main
  @shell bin/zsh
  %%SHARED%%
 -@bin bin/zsh-${V}
 +@bin bin/${FULLPKGNAME}

 bad bad bad...

sure. thanks aja.
diff updated.

Index: Makefile
===
RCS file: /cvs/ports/shells/zsh/Makefile,v
retrieving revision 1.68
diff -u -p -u -p -r1.68 Makefile
--- Makefile11 Mar 2013 11:41:29 -  1.68
+++ Makefile13 Aug 2013 22:32:12 -
@@ -2,7 +2,7 @@
 
 COMMENT=   Z shell, Bourne shell-compatible
 
-V= 5.0.0
+V= 5.0.2
 DISTNAME=  zsh-$V
 CATEGORIES=shells
 
@@ -51,6 +51,7 @@ pre-configure:
 .for i in ${EXTFILES}
perl -pi -e s,/bin/zsh,${TRUEPREFIX}/bin/zsh,g 
${WRKSRC}/Functions/${i}
 .endfor
+   @find ${WRKSRC} -name *.orig -exec rm -f {} \;
 
 post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/zsh/$V/scripts/
Index: distinfo
===
RCS file: /cvs/ports/shells/zsh/distinfo,v
retrieving revision 1.17
diff -u -p -u -p -r1.17 distinfo
--- distinfo24 Sep 2012 19:33:50 -  1.17
+++ distinfo13 Aug 2013 22:32:12 -
@@ -1,2 +1,2 @@
-SHA256 (zsh-5.0.0.tar.gz) = g1GU6oOr2BK1/bHSv6ZCfExOledxxKdekAYDevjv0mQ=
-SIZE (zsh-5.0.0.tar.gz) = 3795376
+SHA256 (zsh-5.0.2.tar.gz) = rcDHiBUyQZeXcTt8UDvMVnTIj5OhkeJvcAtCwRoagW4=
+SIZE (zsh-5.0.2.tar.gz) = 3823234
Index: patches/patch-Completion_Unix_Command__find
===
RCS file: /cvs/ports/shells/zsh/patches/patch-Completion_Unix_Command__find,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-Completion_Unix_Command__find
--- patches/patch-Completion_Unix_Command__find 8 Feb 2008 04:55:08 -   
1.2
+++ patches/patch-Completion_Unix_Command__find 13 Aug 2013 22:32:12 -
@@ -1,24 +1,29 @@
-$OpenBSD: patch-Completion_Unix_Command__find,v 1.2 2008/02/08 04:55:08 okan 
Exp $
 Completion/Unix/Command/_find.orig Thu Dec 13 15:04:47 2007
-+++ Completion/Unix/Command/_find  Thu Dec 13 15:13:49 2007
-@@ -1,71 +1,40 @@
+$OpenBSD$
+--- Completion/Unix/Command/_find.orig Sun Aug 11 04:52:54 2013
 Completion/Unix/Command/_find  Sun Aug 11 04:53:00 2013
+@@ -1,82 +1,39 @@
 -#compdef find
 +#compdef find (OpenBSD)
 +# Sebastian Stark s...@todesplanet.de
  
  _arguments \
+-  '(- *)-help' '(-)--help' \
+-  '(- *)-version' '(-)--version' \
+-  '(-L -P)-H[only follow symlinks when resolving command-line arguments]' \
+-  '(-H -P)-L[follow symlinks]' \
+-  '(-H -L)-P[never follow symlinks]' \
+-  '-D[print diagnostics]:deb option:(help tree search stat rates opt exec)' \
+-  '-O+[enable query optimisation]:level:(1 2 3)' \
 -  '*-daystart' \
--  '*-depth' \
+-  '*-d' '*-depth' \
 -  '*-follow' \
--  '*-help' \
--  '*-ignore_readdir_race' \
--  '*-maxdepth:maximum search depth:' \
--  '*-mindepth:minimum search depth:' \
+-  '(-noignore_readdir_race)-ignore_readdir_race' \
+-  '*-maxdepth:maximum search depth' \
+-  '*-mindepth:minimum search depth' \
 -  '*-mount' \
--  '*-noignore_readdir_race' \
+-  '(-ignore_readdir_race)-noignore_readdir_race' \
 -  '*-noleaf' \
--  '*-regextype:regexp syntax:(emacs posix-awk posix-basic posix-egrep 
posix-extended)' \
--  '*-version' \
+-  '-regextype:regexp syntax:(emacs posix-awk posix-basic posix-egrep 
posix-extended)' \
 -  '*-warn' \
 -  '*-nowarn' \
 -  '*-xdev' \
@@ -37,6 +42,7 @@ $OpenBSD: patch-Completion_Unix_Command_
 -  '*-used:access after inode change (days):' \
 +  '*-ctime:inode change time (minutes)' \
'*-empty' \
+-  '*-executable' \
 -  '*-false' \
 -  '*-fstype:file system type:_file_systems' \
 -  '*-gid:numeric group ID:' \
@@ -71,6 +77,8 @@ $OpenBSD: patch-Completion_Unix_Command_
'*-nouser' \
'*-nogroup' \
 -  '*-perm:file permission bits:' \
+-  '*-readable' \
+-  '*-writable' \
 -  '*-size:file size:' \
 -  '*-samefile:same inode as:_files' \
 -  '*-true' \
@@ -81,7 +89,7 @@ $OpenBSD: patch-Completion_Unix_Command_
 -  '*-execdir:program: _command_names -e:*\;::program arguments: _normal' \
'*-ok:program: _command_names -e:*\;::program arguments: _normal' \
 -  '*-okdir:program: _command_names -e:*\;::program arguments: _normal' \
-   '*-fls:output file:_files' \
+-  '*-fls:output file:_files' \
 -  '*-fprint:output file:_files' \
 -  '*-fprint0:output file:_files' \
 -  '*-fprintf:output file:_files:output format:' \
@@ -93,6 +101,9 @@ $OpenBSD: patch-Completion_Unix_Command_
'*-prune' \
 -  '*-quit' \
 -  '*-ls' \
+-  '*-and' '*-a' \
+-  '*-or' '*-o' \
+-  '*-not' \
 +  '*-size:file size:' \
 +  '*-type:file type:((b\:block\ special\ file c\:character\ special\ file 
d\:directory p\:named\ pipe f\:normal\ file l\:symbolic\ link s\:socket))' \
 +  '*-user:user:_users' \
Index: pkg/PFRAG.shared

Re: UPDATE: shells/zsh

2006-10-21 Thread Jonathan Schleifer 
[EMAIL PROTECTED] (Christian Weisgerber) wrote:

 Which is still a development release.  Any good reason we should
 update now?

UTF-8 support. I don't know if it works on OpenBSD, though. AFAIR it
requires an UTF-8 locale.

-- 
Jonathan


signature.asc
Description: PGP signature

Re: UPDATE: shells/zsh

2006-10-19 Thread Christian Weisgerber 
Will Maier [EMAIL PROTECTED] wrote:

 This update brings shells/zsh up to 4.3.2, the most recent release.

Which is still a development release.  Any good reason we should
update now?

   - disables failing regression tests; most tests pass
 (E01options.ztst fails due to the temporary environment it runs
 in,

This can be fixed by setting PORTHOME to a dummy directory.

and Y0[1-3]*.ztst fail because they have a bad check in
 their %prep sections)

They don't fail for me.

-- 
Christian naddy Weisgerber  [EMAIL PROTECTED]

Re: UPDATE: shells/zsh

2006-10-19 Thread Will Maier 
On Thu, Oct 19, 2006 at 11:04:11AM +, Christian Weisgerber wrote:
 Will Maier [EMAIL PROTECTED] wrote:
  This update brings shells/zsh up to 4.3.2, the most recent
  release.
 
 Which is still a development release.  Any good reason we should
 update now?

Because I like the new fc features? ;) I've been running 4.3 for so
long that I forgot that 4.2.x was the last release in the 4 series.

- disables failing regression tests; most tests pass
(E01options.ztst fails due to the temporary environment it
runs in,
 
 This can be fixed by setting PORTHOME to a dummy directory.

Thanks for the pointer; fixed.

 and Y0[1-3]*.ztst fail because they have a bad check in
 their %prep sections)
 
 They don't fail for me.

On further inspection, zmodload was running out of file descriptors;
bumping my ulimit (obviously) is a better solution than disabling
the tests.

Attached are two files: the first (zsh-4.3.2.diff) is an updated
diff for 4.3.2 (in case anyone's interested in it), and the second
is against 4.2.6 (zsh-4.2.6p1.diff). The second diff fixes the
regress tests by adding PORTHOME, and adds a patch fixing diff(1)
tab completion.  Both patches were tested on i386/-current.

-- 

o--{ Will Maier }--o
| web:...http://www.lfod.us/ | [EMAIL PROTECTED] |
*--[ BSD Unix: Live Free or Die ]--*
diff -x CVS -Nura ../zsh-old/Makefile ./Makefile
--- ../zsh-old/Makefile Tue Feb  7 15:06:17 2006
+++ ./Makefile  Thu Oct 19 07:18:35 2006
@@ -5,7 +5,7 @@
 
 VERSION=   4.2.6
 DISTNAME=  zsh-${VERSION}
-PKGNAME=   ${DISTNAME}p0
+PKGNAME=   ${DISTNAME}p1
 PKGNAME-zftp=  zsh-zftp-${VERSION}
 CATEGORIES=shells
 MASTER_SITES=  ftp://ftp.zsh.org/zsh/ \
@@ -43,6 +43,8 @@
 .endif
 
 SUBST_VARS=VERSION
+
+PORTHOME=  ${WRKDIR}
 
 REGRESS_FLAGS= INSTALL_PROGRAM=install -c -s -m 555 \
INSTALL_DATA=install -c -m 444 \
diff -x CVS -Nura ../zsh-old/patches/patch-Completion_Unix_Type__diff_options 
./patches/patch-Completion_Unix_Type__diff_options
--- ../zsh-old/patches/patch-Completion_Unix_Type__diff_options Wed Dec 31 
18:00:00 1969
+++ ./patches/patch-Completion_Unix_Type__diff_options  Thu Oct 19 07:13:29 2006
@@ -0,0 +1,41 @@
+$OpenBSD$
+--- Completion/Unix/Type/_diff_options.origThu Sep 30 04:28:18 2004
 Completion/Unix/Type/_diff_options Wed Oct 11 14:23:55 2006
+@@ -120,9 +120,35 @@ else
+ '-S+[set first file in comparison]:start with file:_files'
+   )
+ ;;
++openbsd*)
++  args=(
++'(-c -e -f -q -u -C -D -U)-n[produce an rcsdiff(1)-compatible diff]'
++'(-c -e -f -n -u -C -D -U)-q[only print a line when the files differ; 
does not produce a list of changes]'
++'(-c -e -f -n -q -C -D -U)-u[produce a unified diff with 3 lines of 
context]'
++'(-c -e -f -n -q -u -D -U)-C+[produce a context diff]:number of lines 
of context'
++'(-c -e -f -n -q -u -C -U)-D[produce a merged file with preprocessor 
directives]:preprocessor symbol'
++'(-c -e -f -n -q -u -C -D)-U+[produce a unified diff with NUMBER 
lines of context]:number of lines of context'
++'-a[treat all files as ASCII text]'
++'-d[try to produce the smallest diff possible]'
++'-I[ignore changes whose lines match the extended regular 
expression]:extended regular expression pattern'
++'-i[ignore case]'
++'-l[long output format (paginate with pr(1))]'
++'-L[print a label instead of the file name and time]:label'
++'-p[show characters from the last line before the context]'
++'-t[expand tabs in output lines]'
++'-T[consistently align tabs]'
++'-w[like -b, but totally ignore whitespace]'
++'-N[treat absent files in either directory as if they were empty]'
++'-P[treat absent files in the second directory as if they were empty]'
++'-s[report files that are the same]'
++'-S[start a directory diff from a file name]:file name'
++'-X[Exclude files and subdirectories whose basenames match lines in a 
file]:file name'
++'-x[Exclude files and subdirectories whose basenames match a 
pattern]:pattern'
++  )
++;;
+   esac
+-  
+-  _arguments [EMAIL PROTECTED] \
++
++  _arguments -s [EMAIL PROTECTED] \
+ (-e -f -u -n)-c[output a context diff] \
+ (-c -f -u -n)-e[output an ed script] \
+ (-c -e -u -n)-f[output a reversed ed script] \
diff -x CVS -Nura ../zsh-old/Makefile ./Makefile
--- ../zsh-old/Makefile Tue Feb  7 15:06:17 2006
+++ ./Makefile  Thu Oct 19 06:42:22 2006
@@ -3,9 +3,9 @@
 COMMENT=   Z shell, Bourne shell-compatible
 COMMENT-zftp=  Z shell embedded ftp client
 
-VERSION=   4.2.6
+VERSION=   4.3.2
 DISTNAME=  zsh-${VERSION}
-PKGNAME=   ${DISTNAME}p0
+PKGNAME=   ${DISTNAME}
 PKGNAME-zftp=  zsh-zftp-${VERSION}
 CATEGORIES=shells
 MASTER_SITES=  ftp://ftp.zsh.org/zsh/ \
@@ -43,6 +43,8

Re: UPDATE: shells/zsh

2006-10-19 Thread Christian Weisgerber 
Will Maier [EMAIL PROTECTED] wrote:

  [4.3.2] is still a development release.  Any good reason we should
  update now?
 
 Because I like the new fc features? ;)

If the zsh users are clamoring for an update, we can switch to
4.3.x, but so far they have been rather quiet, so I'll stay on the
conservative side.

-- 
Christian naddy Weisgerber  [EMAIL PROTECTED]

Re: UPDATE: shells/zsh

2006-10-19 Thread Frank Denis 

Le Thu, Oct 19, 2006 at 02:06:45PM +, Christian Weisgerber ecrivait :

If the zsh users are clamoring for an update, we can switch to
4.3.x, but so far they have been rather quiet, so I'll stay on the
conservative side.


 Count me in for clamoring for an update.
 
 Some recently introduced features are really handy. I'm using Zsh 4.3.2

since march without any issue so far.

Re: UPDATE: shells/zsh

2006-10-19 Thread Pedro Martelletto 
On Thu, Oct 19, 2006 at 05:44:43PM +0200, Frank Denis wrote:
 Count me in for clamoring for an update.

Ditto.

-p.

Re: UPDATE: shells/zsh

2006-10-15 Thread Simon Kuhnle 
On Wed, Oct 11, 2006 at 03:01:15PM -0500, Will Maier wrote:
 I've gotten various positive test reports on i386/-current.
Builds, installs and seems to work fine under i386/-current.

--simon


pgppa7YkcktiZ.pgp
Description: PGP signature