- reorg shells/zsh and shells/zsh-devel into zsh/stable and zsh/snapshot.

- update shells/Makefile
- OK'ed by naddy@

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 <bsd.port.subdir.mk>

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 <lebel@openbsd.org>
-
-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 <bsd.port.mk>
+.include <bsd.port.subdir.mk>

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"
 

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
 

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
 

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

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 <lebel@openbsd.org>
+
+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 <bsd.port.mk>

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
 

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
 

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