Upgrade to v1.06

Add conditionals to allow installation of hi-color icons
added two 8bit icons that don't come with distribution
remove obsolete patchfile.
Submitted by:	Jeremy Prior <jez@netcraft.co.uk>

8 files changed, 187 insertions, 18 deletions

diff --git a/x11-wm/afterstep-stable/Makefile b/x11-wm/afterstep-stable/Makefile
index 122b89d1166..0f29b8090c9 100644
--- a/x11-wm/afterstep-stable/Makefile
+++ b/x11-wm/afterstep-stable/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	afterstep
-# Version required:	1.0pre5
+# Version required:	1.0pre6
 # Date created:		October 29th 1996
 # Whom:			jfitz@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.14 1996/12/10 20:07:30 obrien Exp $
+# $Id: Makefile,v 1.15 1997/03/23 16:22:41 jfitz Exp $
 #
 
-DISTNAME=	AfterStep-1.0pre5
-PKGNAME=	afterstep-1.0pr5
+DISTNAME=	AfterStep-1.0pre6
+PKGNAME=	afterstep-1.0pr6
 CATEGORIES=	x11
 MASTER_SITES=	ftp://afterstep.foo.net/pub/AfterStep/
 
@@ -16,7 +16,6 @@ MAINTAINER=	jfitz@FreeBSD.ORG
 LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
 
 USE_X11=	yes
-WRKSRC=		${WRKDIR}/AfterStep-1.0pre5
 INSTALL_TARGET=	install install.man
 MANCOMPRESSED=	yes
 MAN1=		afterstep.1 asclock.1 Animate.1 Audio.1 Auto.1 Banner.1 Pager.1 Wharf.1
@@ -30,10 +29,21 @@ post-install:
 		@ ${MKDIR} -p ${PREFIX}/lib/X11/afterstep/sounds/
 		${INSTALL_DATA} ${WRKSRC}/sounds/* ${PREFIX}/lib/X11/afterstep/sounds/
 		@ ${MKDIR} -p ${PREFIX}/include/X11/pixmaps/
+.if defined(USE_HICOLOR_ICONS)
 		${INSTALL_DATA} ${WRKSRC}/icons/*.xpm ${PREFIX}/include/X11/pixmaps/
+.else
+.if !defined(BATCH)
+		@echo "===>  Note: to use the hi-color icons,"
+		@echo "      reinstall this port with -DUSE_HICOLOR_ICONS"
+		@echo "      defined"
+.endif
+		@for file in AFstep.xpm penguin.xpm; do \
+			${CP} ${FILESDIR}/$$file ${WRKSRC}/icons/8bit; \
+		done
 		${INSTALL_DATA} ${WRKSRC}/icons/8bit/*.xpm ${PREFIX}/include/X11/pixmaps/
+.endif
 		@ ${MKDIR} -p ${PREFIX}/lib/X11/afterstep/doc/
-		@for file in CHANGES CREDITS README README.8bit afterstep.faq; do \
+		@for file in CHANGES CREDITS README README.8bit FAQ module-interface.txt; do \
 			${INSTALL_DATA} ${WRKSRC}/$$file ${PREFIX}/lib/X11/afterstep/doc/; \
 		done
 
diff --git a/x11-wm/afterstep-stable/distinfo b/x11-wm/afterstep-stable/distinfo
index eff706ba464..84e76193ce8 100644
--- a/x11-wm/afterstep-stable/distinfo
+++ b/x11-wm/afterstep-stable/distinfo
@@ -1 +1 @@
-MD5 (AfterStep-1.0pre5.tar.gz) = bbc3f2cff7214e7c62529496da43937d
+MD5 (AfterStep-1.0pre6.tar.gz) = 4861adaf81208c70067b8ad0093b6efe
diff --git a/x11-wm/afterstep-stable/pkg-plist b/x11-wm/afterstep-stable/pkg-plist
index f71f6b653c3..358f2be8904 100644
--- a/x11-wm/afterstep-stable/pkg-plist
+++ b/x11-wm/afterstep-stable/pkg-plist
@@ -25,7 +25,8 @@ lib/X11/afterstep/doc/CHANGES
 lib/X11/afterstep/doc/CREDITS
 lib/X11/afterstep/doc/README
 lib/X11/afterstep/doc/README.8bit
-lib/X11/afterstep/doc/afterstep.faq
+lib/X11/afterstep/doc/FAQ
+lib/X11/afterstep/doc/module-interface.txt
 lib/X11/afterstep/sounds/beaming.au
 lib/X11/afterstep/sounds/bong.au
 lib/X11/afterstep/sounds/clink.au
@@ -38,7 +39,7 @@ lib/X11/afterstep/sounds/meepmeep.au
 lib/X11/afterstep/sounds/small-step.au
 lib/X11/afterstep/sounds/train.au
 include/X11/pixmaps/3dpaint.xpm
-include/X11/pixmaps/AfterStep.xpm
+include/X11/pixmaps/AFstep.xpm
 include/X11/pixmaps/FileFolders.xpm
 include/X11/pixmaps/KeysOnChain.xpm
 include/X11/pixmaps/YellowBlueRedGeometry.xpm
@@ -46,6 +47,7 @@ include/X11/pixmaps/interface.xpm
 include/X11/pixmaps/monalisa.xpm
 include/X11/pixmaps/monitor.xpm
 include/X11/pixmaps/netscape3.xpm
+include/X11/pixmaps/penguin.xpm
 include/X11/pixmaps/shutdown.xpm
 include/X11/pixmaps/text.xpm
 include/X11/pixmaps/writeletter.xpm
diff --git a/x11-wm/afterstep/Makefile b/x11-wm/afterstep/Makefile
index 122b89d1166..0f29b8090c9 100644
--- a/x11-wm/afterstep/Makefile
+++ b/x11-wm/afterstep/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	afterstep
-# Version required:	1.0pre5
+# Version required:	1.0pre6
 # Date created:		October 29th 1996
 # Whom:			jfitz@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.14 1996/12/10 20:07:30 obrien Exp $
+# $Id: Makefile,v 1.15 1997/03/23 16:22:41 jfitz Exp $
 #
 
-DISTNAME=	AfterStep-1.0pre5
-PKGNAME=	afterstep-1.0pr5
+DISTNAME=	AfterStep-1.0pre6
+PKGNAME=	afterstep-1.0pr6
 CATEGORIES=	x11
 MASTER_SITES=	ftp://afterstep.foo.net/pub/AfterStep/
 
@@ -16,7 +16,6 @@ MAINTAINER=	jfitz@FreeBSD.ORG
 LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
 
 USE_X11=	yes
-WRKSRC=		${WRKDIR}/AfterStep-1.0pre5
 INSTALL_TARGET=	install install.man
 MANCOMPRESSED=	yes
 MAN1=		afterstep.1 asclock.1 Animate.1 Audio.1 Auto.1 Banner.1 Pager.1 Wharf.1
@@ -30,10 +29,21 @@ post-install:
 		@ ${MKDIR} -p ${PREFIX}/lib/X11/afterstep/sounds/
 		${INSTALL_DATA} ${WRKSRC}/sounds/* ${PREFIX}/lib/X11/afterstep/sounds/
 		@ ${MKDIR} -p ${PREFIX}/include/X11/pixmaps/
+.if defined(USE_HICOLOR_ICONS)
 		${INSTALL_DATA} ${WRKSRC}/icons/*.xpm ${PREFIX}/include/X11/pixmaps/
+.else
+.if !defined(BATCH)
+		@echo "===>  Note: to use the hi-color icons,"
+		@echo "      reinstall this port with -DUSE_HICOLOR_ICONS"
+		@echo "      defined"
+.endif
+		@for file in AFstep.xpm penguin.xpm; do \
+			${CP} ${FILESDIR}/$$file ${WRKSRC}/icons/8bit; \
+		done
 		${INSTALL_DATA} ${WRKSRC}/icons/8bit/*.xpm ${PREFIX}/include/X11/pixmaps/
+.endif
 		@ ${MKDIR} -p ${PREFIX}/lib/X11/afterstep/doc/
-		@for file in CHANGES CREDITS README README.8bit afterstep.faq; do \
+		@for file in CHANGES CREDITS README README.8bit FAQ module-interface.txt; do \
 			${INSTALL_DATA} ${WRKSRC}/$$file ${PREFIX}/lib/X11/afterstep/doc/; \
 		done
 
diff --git a/x11-wm/afterstep/distinfo b/x11-wm/afterstep/distinfo
index eff706ba464..84e76193ce8 100644
--- a/x11-wm/afterstep/distinfo
+++ b/x11-wm/afterstep/distinfo
@@ -1 +1 @@
-MD5 (AfterStep-1.0pre5.tar.gz) = bbc3f2cff7214e7c62529496da43937d
+MD5 (AfterStep-1.0pre6.tar.gz) = 4861adaf81208c70067b8ad0093b6efe
diff --git a/x11-wm/afterstep/files/AFstep.xpm b/x11-wm/afterstep/files/AFstep.xpm
new file mode 100644
index 00000000000..2f07b6bebc5
--- /dev/null
+++ b/x11-wm/afterstep/files/AFstep.xpm
@@ -0,0 +1,72 @@
+/* XPM */

+static char *noname[] = {

+/* width height ncolors chars_per_pixel */

+"48 47 18 1",

+/* colors */

+"` c #858678",

+"a c #B2C0DC",

+"b c #3D4C41",

+"c c #14E314",

+"d c #E3DF2A",

+"e c #4E5151",

+"f c #3F3D3F",

+"g c #101214",

+"h c #686560",

+"i c #020102",

+"j c #2F3538",

+"k c #A30E1C",

+"l c #7D6F73",

+"m c #00018D",

+"n c #545851",

+"o c #A19685",

+"p c #356E3B",

+"q c #242134",

+/* pixels */

+"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",

+"aaaaaaaaaaaaaaaaaaaaaaaaa`aaaaaaaaaaaaaaaaaaaaaa",

+"aaaaaaaaaaaaaaaaaaaaaaaa``aaaaaaaaaaaaaaaaaaaaaa",

+"aaaaaaaaaaaaaaaaaaaaakkkkig``aaaaaaaaaaaaaaaaaaa",

+"aaaaaaaaaaaaaaaaaaa`kkggqfqiqo`aaaaaaaaaaaaaaaaa",

+"aaaaaaaaaaaaaaaaaooqgkkgkkbfgifo`aaaaaaaaaaaaaaa",

+"aaaaaaaaaaaaaaa``qggikkkkkjbffqgbaaaaaaaaaaaaaaa",

+"aaaaaaaaaaaaaaoqiqfgikkkkkfjbnejqqn`aaaaaaaaaaaa",

+"aaaaaaaaaao`lggqeeebkkkkkkkkqjgjbfiboaaaaaaaaaaa",

+"aaaaaaaaaahdpbqgqqjebbpbkkkkkkkkbegoaaaaaaaaaaaa",

+"aaaaaaaaagiddddddbqqqjfbpfkkkkkkpeg`aaaaaaaaaaaa",

+"aaaaaoafiiidbjhdddddpbqqqqgkkknpefq`aaaaaaaaaaaa",

+"aaaoofiqfqgddqjgjdddddddhdpkkppeeqn`aaaaaaaaaaaa",

+"`ooeggjebqgpdggpdddjppddddhfpbeebqoaaaaaaaaaaaaa",

+"abgqjbbfbqgqdpddd`ejjjdddhebnneeejeaaaaaaaaaaaaa",

+"oibeefefefggddddnjjegpd`ejeenefenfjfl`aaaaaaaaaa",

+"aiqnebbfneqgbdhmjjbhenhjeneeeenbgqa`eqaaaaaaaaaa",

+"`gijebffnnqqjdegbeeeenneeeebfnejlhooejqhaaaaaaaa",

+"o`iijnefenqqgddddefnenhnefeenhifa`afjnngqaaaaaaa",

+"aoiiijhnfnbggddddfnenneeebnehqioaa`afjnhegn`aaaa",

+"a`iigiqnefggpdd`jeheennenhebcccphla```qjffqfaoaa",

+"a`figiiqnnjqpdhjehnnneenhjpccccccoooa`aehleege`a",

+"aaoigggijhhbeejnhnnenenhjgcgigccphn`oa``alnhgh`a",

+"aa`iigggiqenehnnhnneehhnqccqgccchjccolaahehbg`aa",

+"aa`giggggifhhnehejmpnnnbqpcpccphljccjhaenhnih`aa",

+"aa`higgggiqlneenbmmnjmmhqgcccblleqccfllnhbgiaaaa",

+"aaaoiigggiqhnnnejimmmmm`fipcccccccccehh`fgin`aaa",

+"aaaoeigggighebnejimmmmn`lfggcccccccph`ljgiioaaaa",

+"aaaaofiggginnnhegmmqmmmhhhnpggpcpgghllqgiioaaaaa",

+"aaaaa`jigginnnnqgmmimmmmhh`hpppppghohqgigaaaaaaa",

+"aaaaaa`qigiflhhhbmejqmmmmhpfm`nnh``hqgiq`aaaaaaa",

+"aaaaaaa`giiijhhhhhhbqgmmmmjmmhhl`lfqgij`aaaaaaaa",

+"aaaaaaaaaiiiifhhhnhhnqgmmmmmm`lhleqgif`aaaaaaaaa",

+"aaaaaaaaaaiiiijl`hhlhnjgmmmmh`lhbqginoaaaaaaaaaa",

+"aaaaaaaaaaoiiiiflhnhh`hfqmgjh`hfqgih`aaaaaaaaaaa",

+"aaaaaaaaaaaoiiiiflhhhlhhhhnh`hqqgilaaaaaaaaaaaaa",

+"aaaaaaaaaaaaoiigieohnhnhhhllnqggi`aaaaaaaaaaaaaa",

+"aaaaaaaaaaaaa`iiiiflhnnhll`ngqgi`aaaaaaaaaaaaaaa",

+"aaaaaaaaaaaaaaliigieohnnh`ngqgioaaaaaaaaaaaaaaaa",

+"aaaaaaaaaaaaaaahiiiinoh``ngqigoaaaaaaaaaaaaaaaaa",

+"aaaaaaaaaaaaaaaonigiib`hfggig`aaaaaaaaaaaaaaaaaa",

+"aaaaaaaaaaaaaaaaobigiiffqgij`aaaaaaaaaaaaaaaaaaa",

+"aaaaaaaaaaaaaaaaa`jigigjgif`aaaaaaaaaaaaaaaaaaaa",

+"aaaaaaaaaaaaaaaaaa`gigqqin`aaaaaaaaaaaaaaaaaaaaa",

+"aaaaaaaaaaaaaaaaaaa`iiiin`aaaaaaaaaaaaaaaaaaaaaa",

+"aaaaaaaaaaaaaaaaaaaa`iihaaaaaaaaaaaaaaaaaaaaaaaa",

+"aaaaaaaaaaaaaaaaaaaa`oo`aaaaaaaaaaaaaaaaaaaaaaaa"

+};

diff --git a/x11-wm/afterstep/files/penguin.xpm b/x11-wm/afterstep/files/penguin.xpm
new file mode 100644
index 00000000000..13401bd352b
--- /dev/null
+++ b/x11-wm/afterstep/files/penguin.xpm
@@ -0,0 +1,73 @@
+/* XPM */

+static char *noname[] = {

+/* width height ncolors chars_per_pixel */

+"48 48 18 1",

+/* colors */

+"` c #000000",

+"a c #F3BD14",

+"b c #828796",

+"c c #B2C0DC",

+"d c #221C1D",

+"e c #160011",

+"f c #685A5E",

+"g c #A0A3AC",

+"h c #F6F6F3",

+"i c #6E727E",

+"j c #040304",

+"k c #FCFCF7",

+"l c #A28359",

+"m c #DFCF80",

+"n c #E3EDF1",

+"o c #FFFFFF",

+"p c #E1B11E",

+"q c #EEEEED",

+/* pixels */

+"cccccccccccccccccccccccjjjjjjjjccccccccccccccccc",

+"ccnooooooooooooooooooojjjjjjjffjoooooooooooooodc",

+"cnqqqnqqqnqqqnqqqnqqqjjjjjjjjjfdjqqqqqnqhhhhhidc",

+"conqnhnqnhnqnhnqnhnqjjjjjejjjjjjjjnnqnhnhhhhhidc",

+"coqnqqqnqqqnqqqnqqqnjjjjjjjjjjjjjjqqnqqqhhhhgidc",

+"conhnqnhnqnhnqnhnqnhjjjdjjjjjjjjjjjnhnqnnhhggidc",

+"coqqqn``````````````jdgidjjigcfdjjj``````fgggidc",

+"conqnh`iiiiiiiibibbbjhnhhjdqhhgjjjjbbbbbiobggidc",

+"coqnqq`iiiiiiibbbbbbjcjdhddhjbhdjjjff`diioggcidc",

+"conhnq`iiiibbbbbgbggjcjdfdehjbnfjjjf`dffiogcgidc",

+"coqqqn`iiibbbbbbggggjdflaaaajihjjjjeeddfiocggidc",

+"conqnh`iibbbggggggggjjpaaaaaappjjjj`ddffiogcgidc",

+"coqnqq`ibbbbbgggggggjlpaaaaaappejjjddfffiocggidc",

+"conhnq`ibbbgggbggbggjdpaaaaalppjjdjffffiiogggidc",

+"coqqqn`ibbbgggbggbggdifpaalpppmdjjfjffiiiogggidc",

+"conqnh`bbbggggggggggdbclpppgmcncjjjjdiiiiogggidc",

+"coqnqq`ibbbgggbggbggjbncllgcchhhdjjjjiiiiogggidc",

+"conhnq`bbbgggggggggdjqhccccnhhhhqjjejjiiiogggiec",

+"coqqqn`ibbbbggbbgbdjghkhcchhhhhhkjjjjjiiiogggfdc",

+"conqnh`ibbgbgggbgbjdhhhhhhhhkhhhhgjjjjjiiogggiec",

+"coqnqq`ibbbbbgbgcjjbhhhkkhkkhhhhhqjjjjjjiogggfdc",

+"conhnq`iibbbbbggjjjgcqhhnnhhhccccndjjjjjdogggiec",

+"coqqqn`iiibbbbbbjjdckhhhqhhhkhhncchjdjjjjogggfec",

+"conqnh`iiibbbbbjjjghhkqhhhhhhhhhkncjjjjjjjggbfec",

+"coqnqq`iiiiibbbjdjhhhkkkhhhhkhhkhknnjjjjjjgggfec",

+"conhnq`iiiiiibijjbhhhhkhhhkkhhhhhkhhdjjjjjbgbfjc",

+"coqqqn`iiiiiiijdjhhhhkhqhkhhhkhhkhkhdjjjjjjbbfec",

+"conqnn`iiiiiiijjfhhhhhhnkhkhhhhhhhhhfjjjjjjgbfjc",

+"coqnqn`iiiiiijjjchhkhkhnhhhhhhkhhhhhbjjjjjjbbfec",

+"connnn`iiiiiijdjqhhhkhhnhhhhhhkkhhhhgjjjjjjjbf`c",

+"coqnnn`iiiiijjdjqhhhhkhnhhhhkhhkhhkhcjjjjjjjbfec",

+"connnn`iiiiijjdjnhhkhhhnkhhhhhhhhhhhnjjjjjjjbf`c",

+"connnngooooojpfdhkhhhkhnhhhhhhhhhhhhbdjjjjjjbf`c",

+"connnnncncccpaalfhkhkhhnhhhhhhhhhhmpljjjjjjbbf`c",

+"connncnccccmpaaafdhhhhknhhhhhhhhhhpapjjjjjpabf`c",

+"connncccccmppaaaaejqhhhhhhhkhhhhhhpapejjjfaaif`c",

+"cogiiiiilpppaaaaapjjnhkhkhhhhhkhhcpaplddlpaaff`c",

+"ci`````ppaaaaaaaaadjjfqhhhhhkhhhhclppppppaaaa``c",

+"cccccccaaaaaaaaaaapejjqhhhhhhhhhkclpppppaaaaaacc",

+"cccccccpaaaaaaaaaaaljjqkhhhhhhkhhglpaaaaaaaaaapc",

+"cccccccpaaaaaaaaaaaamhhhhkhhhhhhgjlpaaaaaaaaaaaa",

+"cccccccpaaaaaaaaaaaapqhhkkhhhhhdjelpaaaaaaaaaaac",

+"cccccccpaaaaaaaaaaaapfhhhkhhhbjjjelpaaaaaaaaaacc",

+"cccccccpppaaaaaaaaaapljjjjjjjjjjjdppaaaaaaapcccc",

+"ccccccclpppppppaaaappfejjjjjjjjjjdlpaaaapplccccc",

+"ccccccci```lllpppppplfejj```````jdfppppplccccccc",

+"ccccccccccccccffllllffccccccccccccdlplplcccccccc",

+"cccccccccccccccccdfdfccccccccccccccdffdccccccccc"

+};

diff --git a/x11-wm/afterstep/pkg-plist b/x11-wm/afterstep/pkg-plist
index f71f6b653c3..358f2be8904 100644
--- a/x11-wm/afterstep/pkg-plist
+++ b/x11-wm/afterstep/pkg-plist
@@ -25,7 +25,8 @@ lib/X11/afterstep/doc/CHANGES
 lib/X11/afterstep/doc/CREDITS
 lib/X11/afterstep/doc/README
 lib/X11/afterstep/doc/README.8bit
-lib/X11/afterstep/doc/afterstep.faq
+lib/X11/afterstep/doc/FAQ
+lib/X11/afterstep/doc/module-interface.txt
 lib/X11/afterstep/sounds/beaming.au
 lib/X11/afterstep/sounds/bong.au
 lib/X11/afterstep/sounds/clink.au
@@ -38,7 +39,7 @@ lib/X11/afterstep/sounds/meepmeep.au
 lib/X11/afterstep/sounds/small-step.au
 lib/X11/afterstep/sounds/train.au
 include/X11/pixmaps/3dpaint.xpm
-include/X11/pixmaps/AfterStep.xpm
+include/X11/pixmaps/AFstep.xpm
 include/X11/pixmaps/FileFolders.xpm
 include/X11/pixmaps/KeysOnChain.xpm
 include/X11/pixmaps/YellowBlueRedGeometry.xpm
@@ -46,6 +47,7 @@ include/X11/pixmaps/interface.xpm
 include/X11/pixmaps/monalisa.xpm
 include/X11/pixmaps/monitor.xpm
 include/X11/pixmaps/netscape3.xpm
+include/X11/pixmaps/penguin.xpm
 include/X11/pixmaps/shutdown.xpm
 include/X11/pixmaps/text.xpm
 include/X11/pixmaps/writeletter.xpm