From e08405c5af05e0e664c0ec2ac2f5442153c81a9c Mon Sep 17 00:00:00 2001 From: lebel Date: Thu, 10 May 2001 19:42:32 +0000 Subject: [PATCH] - reorg shells/zsh and shells/zsh-devel into zsh/stable and zsh/snapshot. - update shells/Makefile - OK'ed by naddy@ --- shells/Makefile | 5 +-- shells/zsh/Makefile | 43 +++---------------- shells/{zsh-devel => zsh/snapshot}/Makefile | 2 +- shells/{zsh-devel => zsh/snapshot}/files/md5 | 0 .../snapshot}/patches/patch-Doc-Makefile.in | 0 .../snapshot}/patches/patch-Doc-zsh.texi | 0 .../snapshot}/patches/patch-Makefile.in | 0 .../{zsh-devel => zsh/snapshot}/pkg/DEINSTALL | 2 +- shells/{zsh-devel => zsh/snapshot}/pkg/DESCR | 0 shells/zsh/{ => snapshot}/pkg/INSTALL | 2 +- shells/{zsh-devel => zsh/snapshot}/pkg/PLIST | 2 +- shells/zsh/stable/Makefile | 39 +++++++++++++++++ shells/zsh/{ => stable}/files/md5 | 0 .../patches/patch-Doc-Makefile.in | 0 .../{ => stable}/patches/patch-Doc-zsh.texi | 0 .../patches/patch-Src-Makefile.in | 0 shells/zsh/{ => stable}/pkg/DEINSTALL | 2 +- shells/zsh/{ => stable}/pkg/DESCR | 0 shells/{zsh-devel => zsh/stable}/pkg/INSTALL | 2 +- shells/zsh/{ => stable}/pkg/PLIST | 2 +- 20 files changed, 53 insertions(+), 48 deletions(-) rename shells/{zsh-devel => zsh/snapshot}/Makefile (93%) rename shells/{zsh-devel => zsh/snapshot}/files/md5 (100%) rename shells/{zsh-devel => zsh/snapshot}/patches/patch-Doc-Makefile.in (100%) rename shells/{zsh-devel => zsh/snapshot}/patches/patch-Doc-zsh.texi (100%) rename shells/{zsh-devel => zsh/snapshot}/patches/patch-Makefile.in (100%) rename shells/{zsh-devel => zsh/snapshot}/pkg/DEINSTALL (87%) rename shells/{zsh-devel => zsh/snapshot}/pkg/DESCR (100%) rename shells/zsh/{ => snapshot}/pkg/INSTALL (94%) rename shells/{zsh-devel => zsh/snapshot}/pkg/PLIST (99%) create mode 100644 shells/zsh/stable/Makefile rename shells/zsh/{ => stable}/files/md5 (100%) rename shells/zsh/{ => stable}/patches/patch-Doc-Makefile.in (100%) rename shells/zsh/{ => stable}/patches/patch-Doc-zsh.texi (100%) rename shells/zsh/{ => stable}/patches/patch-Src-Makefile.in (100%) rename shells/zsh/{ => stable}/pkg/DEINSTALL (87%) rename shells/zsh/{ => stable}/pkg/DESCR (100%) rename shells/{zsh-devel => zsh/stable}/pkg/INSTALL (94%) rename shells/zsh/{ => stable}/pkg/PLIST (83%) diff --git a/shells/Makefile b/shells/Makefile index ad6354daeca..d7d742c8001 100644 --- a/shells/Makefile +++ b/shells/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.8 2001/05/05 21:28:13 espie Exp $ +# $OpenBSD: Makefile,v 1.9 2001/05/10 19:42:32 lebel Exp $ # $FreeBSD: Makefile,v 1.13 1997/01/03 00:40:55 max Exp $ # @@ -11,8 +11,5 @@ SUBDIR += tcsh SUBDIR += tcsh,static SUBDIR += zsh - SUBDIR += zsh,static - SUBDIR += zsh-devel - SUBDIR += zsh-devel,static .include diff --git a/shells/zsh/Makefile b/shells/zsh/Makefile index 15d2f48dc48..3e24e4a4550 100644 --- a/shells/zsh/Makefile +++ b/shells/zsh/Makefile @@ -1,39 +1,8 @@ -# $OpenBSD: Makefile,v 1.24 2001/05/10 18:58:30 lebel Exp $ +# $OpenBSD: Makefile,v 1.25 2001/05/10 19:42:32 lebel Exp $ -COMMENT= "the Z shell, Bourne shell-compatible, release flavor" + SUBDIR += stable + SUBDIR += stable:static + SUBDIR += snapshot + SUBDIR += snapshot:static -VERSION= 3.0.8 -DISTNAME= zsh-${VERSION} -CATEGORIES= shells -NEED_VERSION= 1.402 -MASTER_SITES= ftp://ftp.zsh.org/zsh/ \ - ftp://ftp.sterling.com/zsh/ \ - ftp://ftp.rge.com/pub/zsh/ \ - ftp://ftp.cenatls.cena.dgac.fr/pub/shells/zsh/ \ - ftp://mrrl.lut.ac.uk/zsh/ \ - ftp://ftp.fu-berlin.de/pub/unix/shells/zsh/ \ - ftp://ftp.ips.oz.au/pub/packages/zsh/ \ - ftp://ftp.uit.no/pub/unix/shells/zsh/ - -HOMEPAGE= http://www.zsh.org/ - -MAINTAINER= David Lebel - -PERMIT_PACKAGE_CDROM= Yes -PERMIT_PACKAGE_FTP= Yes -PERMIT_DISTFILES_CDROM= Yes -PERMIT_DISTFILES_FTP= Yes - -SUBST_VARS= VERSION - -CONFIGURE_STYLE= gnu dest -CONFIGURE_ARGS= --enable-zsh-mem --enable-zsh-secure-free - -FLAVORS= static -FLAVOR?= - -.if ${FLAVOR:L} == "static" -CONFIGURE_ENV= LDFLAGS="-static" -.endif - -.include +.include diff --git a/shells/zsh-devel/Makefile b/shells/zsh/snapshot/Makefile similarity index 93% rename from shells/zsh-devel/Makefile rename to shells/zsh/snapshot/Makefile index eef2daf8ae8..c005d80fa5a 100644 --- a/shells/zsh-devel/Makefile +++ b/shells/zsh/snapshot/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.19 2001/05/10 18:58:30 lebel Exp $ +# $OpenBSD: Makefile,v 1.1 2001/05/10 19:42:34 lebel Exp $ COMMENT= "the Z shell, Bourne shell-compatible, development flavor" diff --git a/shells/zsh-devel/files/md5 b/shells/zsh/snapshot/files/md5 similarity index 100% rename from shells/zsh-devel/files/md5 rename to shells/zsh/snapshot/files/md5 diff --git a/shells/zsh-devel/patches/patch-Doc-Makefile.in b/shells/zsh/snapshot/patches/patch-Doc-Makefile.in similarity index 100% rename from shells/zsh-devel/patches/patch-Doc-Makefile.in rename to shells/zsh/snapshot/patches/patch-Doc-Makefile.in diff --git a/shells/zsh-devel/patches/patch-Doc-zsh.texi b/shells/zsh/snapshot/patches/patch-Doc-zsh.texi similarity index 100% rename from shells/zsh-devel/patches/patch-Doc-zsh.texi rename to shells/zsh/snapshot/patches/patch-Doc-zsh.texi diff --git a/shells/zsh-devel/patches/patch-Makefile.in b/shells/zsh/snapshot/patches/patch-Makefile.in similarity index 100% rename from shells/zsh-devel/patches/patch-Makefile.in rename to shells/zsh/snapshot/patches/patch-Makefile.in diff --git a/shells/zsh-devel/pkg/DEINSTALL b/shells/zsh/snapshot/pkg/DEINSTALL similarity index 87% rename from shells/zsh-devel/pkg/DEINSTALL rename to shells/zsh/snapshot/pkg/DEINSTALL index 23c3e9a2b77..532ec0a0063 100644 --- a/shells/zsh-devel/pkg/DEINSTALL +++ b/shells/zsh/snapshot/pkg/DEINSTALL @@ -1,5 +1,5 @@ #!/bin/sh -# $OpenBSD: DEINSTALL,v 1.2 2000/07/19 09:31:25 brad Exp $ +# $OpenBSD: DEINSTALL,v 1.1 2001/05/10 19:42:34 lebel Exp $ # # zsh-devel de-installation diff --git a/shells/zsh-devel/pkg/DESCR b/shells/zsh/snapshot/pkg/DESCR similarity index 100% rename from shells/zsh-devel/pkg/DESCR rename to shells/zsh/snapshot/pkg/DESCR diff --git a/shells/zsh/pkg/INSTALL b/shells/zsh/snapshot/pkg/INSTALL similarity index 94% rename from shells/zsh/pkg/INSTALL rename to shells/zsh/snapshot/pkg/INSTALL index bbedaded182..833a38b1601 100644 --- a/shells/zsh/pkg/INSTALL +++ b/shells/zsh/snapshot/pkg/INSTALL @@ -1,5 +1,5 @@ #!/bin/sh -# $OpenBSD: INSTALL,v 1.2 2000/07/05 02:05:28 brad Exp $ +# $OpenBSD: INSTALL,v 1.1 2001/05/10 19:42:34 lebel Exp $ # # Pre/post-installation setup of zsh diff --git a/shells/zsh-devel/pkg/PLIST b/shells/zsh/snapshot/pkg/PLIST similarity index 99% rename from shells/zsh-devel/pkg/PLIST rename to shells/zsh/snapshot/pkg/PLIST index b4ff15f588a..c3f7de7c021 100644 --- a/shells/zsh-devel/pkg/PLIST +++ b/shells/zsh/snapshot/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.7 2001/02/11 04:20:10 brad Exp $ +@comment $OpenBSD: PLIST,v 1.1 2001/05/10 19:42:34 lebel Exp $ bin/zsh bin/zsh-${VERSION} @unexec install-info --delete %D/info/zsh.info %D/info/dir diff --git a/shells/zsh/stable/Makefile b/shells/zsh/stable/Makefile new file mode 100644 index 00000000000..135b49d4a00 --- /dev/null +++ b/shells/zsh/stable/Makefile @@ -0,0 +1,39 @@ +# $OpenBSD: Makefile,v 1.1 2001/05/10 19:42:35 lebel Exp $ + +COMMENT= "the Z shell, Bourne shell-compatible, release flavor" + +VERSION= 3.0.8 +DISTNAME= zsh-${VERSION} +CATEGORIES= shells +NEED_VERSION= 1.402 +MASTER_SITES= ftp://ftp.zsh.org/zsh/ \ + ftp://ftp.sterling.com/zsh/ \ + ftp://ftp.rge.com/pub/zsh/ \ + ftp://ftp.cenatls.cena.dgac.fr/pub/shells/zsh/ \ + ftp://mrrl.lut.ac.uk/zsh/ \ + ftp://ftp.fu-berlin.de/pub/unix/shells/zsh/ \ + ftp://ftp.ips.oz.au/pub/packages/zsh/ \ + ftp://ftp.uit.no/pub/unix/shells/zsh/ + +HOMEPAGE= http://www.zsh.org/ + +MAINTAINER= David Lebel + +PERMIT_PACKAGE_CDROM= Yes +PERMIT_PACKAGE_FTP= Yes +PERMIT_DISTFILES_CDROM= Yes +PERMIT_DISTFILES_FTP= Yes + +SUBST_VARS= VERSION + +CONFIGURE_STYLE= gnu dest +CONFIGURE_ARGS= --enable-zsh-mem --enable-zsh-secure-free + +FLAVORS= static +FLAVOR?= + +.if ${FLAVOR:L} == "static" +CONFIGURE_ENV= LDFLAGS="-static" +.endif + +.include diff --git a/shells/zsh/files/md5 b/shells/zsh/stable/files/md5 similarity index 100% rename from shells/zsh/files/md5 rename to shells/zsh/stable/files/md5 diff --git a/shells/zsh/patches/patch-Doc-Makefile.in b/shells/zsh/stable/patches/patch-Doc-Makefile.in similarity index 100% rename from shells/zsh/patches/patch-Doc-Makefile.in rename to shells/zsh/stable/patches/patch-Doc-Makefile.in diff --git a/shells/zsh/patches/patch-Doc-zsh.texi b/shells/zsh/stable/patches/patch-Doc-zsh.texi similarity index 100% rename from shells/zsh/patches/patch-Doc-zsh.texi rename to shells/zsh/stable/patches/patch-Doc-zsh.texi diff --git a/shells/zsh/patches/patch-Src-Makefile.in b/shells/zsh/stable/patches/patch-Src-Makefile.in similarity index 100% rename from shells/zsh/patches/patch-Src-Makefile.in rename to shells/zsh/stable/patches/patch-Src-Makefile.in diff --git a/shells/zsh/pkg/DEINSTALL b/shells/zsh/stable/pkg/DEINSTALL similarity index 87% rename from shells/zsh/pkg/DEINSTALL rename to shells/zsh/stable/pkg/DEINSTALL index 66105fb71bf..1da981ab6ab 100644 --- a/shells/zsh/pkg/DEINSTALL +++ b/shells/zsh/stable/pkg/DEINSTALL @@ -1,5 +1,5 @@ #!/bin/sh -# $OpenBSD: DEINSTALL,v 1.2 2000/07/19 09:31:25 brad Exp $ +# $OpenBSD: DEINSTALL,v 1.1 2001/05/10 19:42:35 lebel Exp $ # # zsh de-installation diff --git a/shells/zsh/pkg/DESCR b/shells/zsh/stable/pkg/DESCR similarity index 100% rename from shells/zsh/pkg/DESCR rename to shells/zsh/stable/pkg/DESCR diff --git a/shells/zsh-devel/pkg/INSTALL b/shells/zsh/stable/pkg/INSTALL similarity index 94% rename from shells/zsh-devel/pkg/INSTALL rename to shells/zsh/stable/pkg/INSTALL index a94926a598f..bb7b570cf31 100644 --- a/shells/zsh-devel/pkg/INSTALL +++ b/shells/zsh/stable/pkg/INSTALL @@ -1,5 +1,5 @@ #!/bin/sh -# $OpenBSD: INSTALL,v 1.2 2000/07/05 03:51:25 brad Exp $ +# $OpenBSD: INSTALL,v 1.1 2001/05/10 19:42:35 lebel Exp $ # # Pre/post-installation setup of zsh diff --git a/shells/zsh/pkg/PLIST b/shells/zsh/stable/pkg/PLIST similarity index 83% rename from shells/zsh/pkg/PLIST rename to shells/zsh/stable/pkg/PLIST index 373f66179ab..7b412f0ac2c 100644 --- a/shells/zsh/pkg/PLIST +++ b/shells/zsh/stable/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.10 2001/02/11 04:20:09 brad Exp $ +@comment $OpenBSD: PLIST,v 1.1 2001/05/10 19:42:35 lebel Exp $ bin/zsh bin/zsh-${VERSION} @unexec install-info --delete %D/info/zsh.info %D/info/dir