Complete the AfterStep division between Classic, Stable, and Devel.

Updated MASTER_SITE mirrors and made all appropriate upgrade changes.

Add the Afterstep virtual category while I'm here.

Provoked by:		asami, (ports/9324)
			Kris Kennaway <kkennawa@physics.adelaide.edu.au>

5 files changed, 27 insertions, 22 deletions

diff --git a/x11-wm/Makefile b/x11-wm/Makefile
index c56061def4b8..4dc0347b45ff 100644
--- a/x11-wm/Makefile
+++ b/x11-wm/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.8 1998/12/24 13:18:53 flathill Exp $
+# $Id: Makefile,v 1.9 1999/01/09 03:19:34 asami Exp $
 #
 
     SUBDIR += 9menu
@@ -6,6 +6,7 @@
     SUBDIR += afterstep
     SUBDIR += afterstep-devel
     SUBDIR += afterstep-i18n
+    SUBDIR += afterstep-stable
     SUBDIR += amiwm
     SUBDIR += blackbox
     SUBDIR += ctwm
diff --git a/x11-wm/afterstep-stable/Makefile b/x11-wm/afterstep-stable/Makefile
index 3a6cd04c5b38..7c91bf7a4db2 100644
--- a/x11-wm/afterstep-stable/Makefile
+++ b/x11-wm/afterstep-stable/Makefile
@@ -1,23 +1,25 @@
-# New ports collection makefile for:	afterstep-1.6
-# Version required:	1.6
+# New ports collection makefile for:	afterstep-stable
+# Version required:	1.6.6
 # Date created:		1 May 1998
 # Whom:			Brett Taylor
 #
-# $Id: Makefile,v 1.28 1998/12/23 01:41:18 steve Exp $
+# $Id: Makefile,v 1.29 1999/01/03 11:52:23 asami Exp $
 #
 
-DISTNAME=	AfterStep-1.6.0
-CATEGORIES=     x11-wm
-MASTER_SITES=   ftp://ftp.afterstep.org/stable/
+DISTNAME=	AfterStep-1.6.6
+PKGNAME=	afterstep-1.6.6
+CATEGORIES=     x11-wm afterstep
+MASTER_SITES=   ftp://ftp.afterstep.org/stable/ \
+		ftp://ftp.starshadow.com/pub/afterstep/stable/ \
+		ftp://ftp.digex.net/pub/os/wm/AfterStep/stable/ \
+		ftp://ftp.alpha1.net/pub/mirrors/ftp.afterstep.org/
 
-MAINTAINER=	ports@freebsd.org
+MAINTAINER=	dima@chg.ru
 
 LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm \
 		png.2:${PORTSDIR}/graphics/png \
 		jpeg.9:${PORTSDIR}/graphics/jpeg
 
-BROKEN=		upgrade
-
 INSTALL_TARGET=	install install.man
 MAN1=	Animate.1x Audio.1x Auto.1x Banner.1x Cascade.1x Clean.1x \
 	Form.1x Ident.1x Pager.1x Save.1x Script.1x Scroll.1x Tile.1x \
diff --git a/x11-wm/afterstep-stable/distinfo b/x11-wm/afterstep-stable/distinfo
index 07c041456813..48557f31a747 100644
--- a/x11-wm/afterstep-stable/distinfo
+++ b/x11-wm/afterstep-stable/distinfo
@@ -1 +1 @@
-MD5 (AfterStep-1.6.0.tar.gz) = 026257f589285b8e0414b890ed71c9d5
+MD5 (AfterStep-1.6.6.tar.gz) = 6411ef02da05eef4a26c77076a9411d8
diff --git a/x11-wm/afterstep/Makefile b/x11-wm/afterstep/Makefile
index 1c6515395c27..ed30871041aa 100644
--- a/x11-wm/afterstep/Makefile
+++ b/x11-wm/afterstep/Makefile
@@ -3,13 +3,16 @@
 # Date created:		October 29th 1996
 # Whom:			jfitz@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.24 1999/01/10 14:54:27 simokawa Exp $
+# $Id: Makefile,v 1.25 1999/01/11 05:03:10 steve Exp $
 #
 
 DISTNAME=	AfterStep-1.0
 PKGNAME=	afterstep-1.0
-CATEGORIES=	x11-wm
+CATEGORIES=	x11-wm afterstep
 MASTER_SITES=	ftp://ftp.afterstep.org/stable/archives/ \
+		ftp://ftp.digex.net/pub/os/wm/AfterStep/stable/archives/ \
+		ftp://ftp.alpha1.net/pub/mirrors/ftp.afterstep.org/stable/archives/ \
+		ftp://ftp.starshadow.com/pub/afterstep/stable/archives/ \
 		ftp://ftp.cs.tu-berlin.de/pub/X/afterstep/
 
 MAINTAINER=	jfitz@FreeBSD.ORG
@@ -29,19 +32,19 @@ SRCDIRS=	afterstep \
 post-patch:
 		@ for i in ${SRCDIRS}; do \
 			cd ${WRKSRC}/$$i; \
-			mv Imakefile Imakefile.orig; \
-			sed -e 's/#ifdef AlphaArchitecture/#if defined(AlphaArchitecture) \&\& !defined(FreeBSDArchitecture)/' < Imakefile.orig  >  Imakefile; \
+			${MV} Imakefile Imakefile.orig; \
+			${SED} -e 's/#ifdef AlphaArchitecture/#if defined(AlphaArchitecture) \&\& !defined(FreeBSDArchitecture)/' < Imakefile.orig  >  Imakefile; \
 		done
 
 pre-build:
 		@ cd ${WRKSRC}; sh MakeMakefiles
 
-post-install:	
-		@ ${MKDIR} -p ${PREFIX}/lib/X11/afterstep/backgrounds/
+post-install:
+		@ ${MKDIR} ${PREFIX}/lib/X11/afterstep/backgrounds/
 		${INSTALL_DATA} ${WRKSRC}/backgrounds/* ${PREFIX}/lib/X11/afterstep/backgrounds/
-		@ ${MKDIR} -p ${PREFIX}/lib/X11/afterstep/sounds/
+		@ ${MKDIR} ${PREFIX}/lib/X11/afterstep/sounds/
 		${INSTALL_DATA} ${WRKSRC}/sounds/* ${PREFIX}/lib/X11/afterstep/sounds/
-		@ ${MKDIR} -p ${PREFIX}/include/X11/pixmaps/
+		@ ${MKDIR} ${PREFIX}/include/X11/pixmaps/
 .if defined(USE_HICOLOR_ICONS)
 		${INSTALL_DATA} ${WRKSRC}/icons/*.xpm ${PREFIX}/include/X11/pixmaps/
 .else
@@ -55,7 +58,7 @@ post-install:
 		done
 		${INSTALL_DATA} ${WRKSRC}/icons/8bit/*.xpm ${PREFIX}/include/X11/pixmaps/
 .endif
-		@ ${MKDIR} -p ${PREFIX}/lib/X11/afterstep/doc/
+		@ ${MKDIR} ${PREFIX}/lib/X11/afterstep/doc/
 		@for file in CHANGES CREDITS README README.8bit INSTALL FAQ module-interface.txt; do \
 			${INSTALL_DATA} ${WRKSRC}/$$file ${PREFIX}/lib/X11/afterstep/doc/; \
 		done
diff --git a/x11-wm/afterstep/pkg-descr b/x11-wm/afterstep/pkg-descr
index 08906295f7db..aaf8b1892fa3 100644
--- a/x11-wm/afterstep/pkg-descr
+++ b/x11-wm/afterstep/pkg-descr
@@ -1,7 +1,7 @@
 AfterStep is a continuation of the BowMan window manager which was
 originally put together by Bo Yang. BowMan was based on the fvwm window
 manager, written by Robert Nation. Fvwm was based on code from twm. And so
-on... It is designed to emulate some of the look and feel of the NEXTSTEP®
+on... It is designed to emulate some of the look and feel of the NEXTSTEP
 user interface, while adding useful, requested, and neat features. The
 changes which comprise AfterStep's personality were originally part of
 BowMan development, but due to a desire to move past simple emulation and
@@ -18,4 +18,3 @@ Major changes from fvwm are:
   applications; they are more of pop-up service lists on the root window.
 - NEXTSTEP style icons. These styles are hard-coded in the program, which is
   good for the consistent look of the NEXTSTEP interface.
-