Fixed incorrect use of INSTALL_ aliases in Makefile

3 files changed, 57 insertions, 14 deletions

diff --git a/x11-wm/afterstep-stable/Makefile b/x11-wm/afterstep-stable/Makefile
index 68bb442c3070..66cce059035b 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:	0.98b27
+# Version required:	0.98b30
 # Date created:		17 July 96
 # Whom:			james@bdd.net
 #
-# $Id: Makefile,v 1.6 1996/08/20 10:57:38 jfitz Exp $
+# $Id: Makefile,v 1.7 1996/08/24 15:19:15 jfitz Exp $
 #
 
-DISTNAME=	as-b27
-PKGNAME=	afterstep-0.98b27
+DISTNAME=	as-b30
+PKGNAME=	afterstep-0.98b30
 CATEGORIES+=	x11
 MASTER_SITES=	ftp://oak.sfasu.edu/pub/AfterStep/
 
@@ -17,14 +17,21 @@ LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
 RUN_DEPENDS=	fvwm:${PORTSDIR}/x11/fvwm
 
 USE_X11=	yes
-WRKSRC=		${WRKDIR}/AfterStep-0.98aBETA27
+WRKSRC=		${WRKDIR}/AfterStep-0.98aBETA30
 
 pre-build:
 		@cd ${WRKSRC}; sh MakeMakefiles
 
 post-install:	
-		@mkdir -p ${PREFIX}/include/X11/pixmaps
-		@cp ${WRKSRC}/icons/*.xpm ${PREFIX}/include/X11/pixmaps
-		@cp ${WRKSRC}/icons/8bit/*.xpm ${PREFIX}/include/X11/pixmaps
+		@mkdir -p ${PREFIX}/lib/X11/afterstep/backgrounds/
+		${INSTALL_DATA} ${WRKSRC}/backgrounds/* ${PREFIX}/lib/X11/afterstep/backgrounds/
+		@mkdir -p ${PREFIX}/lib/X11/afterstep/sounds/
+		${INSTALL_DATA} ${WRKSRC}/sounds/* ${PREFIX}/lib/X11/afterstep/sounds/
+		${INSTALL_DATA} ${WRKSRC}/icons/*.xpm ${PREFIX}/include/X11/pixmaps/
+		${INSTALL_DATA} ${WRKSRC}/icons/8bit/*.xpm ${PREFIX}/include/X11/pixmaps/
+		@mkdir -p ${PREFIX}/lib/X11/afterstep/doc/
+		for file in CHANGES README README.8bit README.gradient mini-faq; do \
+			${INSTALL_DATA} ${WRKSRC}/$$file ${PREFIX}/lib/X11/afterstep/doc/; \
+		done
 
 .include <bsd.port.mk>
diff --git a/x11-wm/afterstep-stable/distinfo b/x11-wm/afterstep-stable/distinfo
index e0087a5f21bc..8a9d85c83e95 100644
--- a/x11-wm/afterstep-stable/distinfo
+++ b/x11-wm/afterstep-stable/distinfo
@@ -1 +1 @@
-MD5 (as-b27.tar.gz) = 5ba7487a1f0a571c89b176b673d55e35
+MD5 (as-b30.tar.gz) = 99fbb1bef5dbb43c60ad5159493f4ccb
diff --git a/x11-wm/afterstep-stable/pkg-plist b/x11-wm/afterstep-stable/pkg-plist
index f3d4d6eec3fa..24eaf87a71d4 100644
--- a/x11-wm/afterstep-stable/pkg-plist
+++ b/x11-wm/afterstep-stable/pkg-plist
@@ -2,17 +2,53 @@ bin/afterstep
 lib/X11/afterstep/Audio
 lib/X11/afterstep/Auto
 lib/X11/afterstep/Banner
+lib/X11/afterstep/Pager
 lib/X11/afterstep/Wharf
 lib/X11/afterstep/system.steprc
+lib/X11/afterstep/backgrounds/bark.jpg
+lib/X11/afterstep/backgrounds/brick.jpg
+lib/X11/afterstep/backgrounds/carpet.green.jpg
+lib/X11/afterstep/backgrounds/coins.jpg
+lib/X11/afterstep/backgrounds/darkwood.jpg
+lib/X11/afterstep/backgrounds/eyes.jpg
+lib/X11/afterstep/backgrounds/glass.jpg
+lib/X11/afterstep/backgrounds/parquet.jpg
+lib/X11/afterstep/backgrounds/pebbles.jpg
+lib/X11/afterstep/backgrounds/rock.tile.jpg
+lib/X11/afterstep/backgrounds/rope.weave.jpg
+lib/X11/afterstep/backgrounds/stucco.jpg
+lib/X11/afterstep/backgrounds/tile.check.jpg
+lib/X11/afterstep/backgrounds/volcanic.jpg
+lib/X11/afterstep/backgrounds/wood.jpg
+lib/X11/afterstep/doc/CHANGES
+lib/X11/afterstep/doc/README
+lib/X11/afterstep/doc/README.8bit
+lib/X11/afterstep/doc/README.gradient
+lib/X11/afterstep/doc/mini-faq
+lib/X11/afterstep/sounds/beaming.au
+lib/X11/afterstep/sounds/bong.au
+lib/X11/afterstep/sounds/clink.au
+lib/X11/afterstep/sounds/cowbell.au
+lib/X11/afterstep/sounds/crash.au
+lib/X11/afterstep/sounds/doorbell.au
+lib/X11/afterstep/sounds/drip.au
+lib/X11/afterstep/sounds/gong.au
+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/monitor.xpm
-include/X11/pixmaps/netscape3.xpm
+include/X11/pixmaps/AfterStep.xpm
 include/X11/pixmaps/FileFolders.xpm
-include/X11/pixmaps/recycler.xpm
+include/X11/pixmaps/KeysOnChain.xpm
 include/X11/pixmaps/YellowBlueRedGeometry.xpm
-include/X11/pixmaps/shutdown.xpm
 include/X11/pixmaps/interface.xpm
-include/X11/pixmaps/text.xpm
 include/X11/pixmaps/monalisa.xpm
+include/X11/pixmaps/monitor.xpm
+include/X11/pixmaps/netscape3.xpm
+include/X11/pixmaps/shutdown.xpm
+include/X11/pixmaps/text.xpm
 include/X11/pixmaps/writeletter.xpm
+@dirrm lib/X11/afterstep/doc
+@dirrm lib/X11/afterstep/backgrounds
+@dirrm lib/X11/afterstep/sounds
 @dirrm lib/X11/afterstep