Fixed incorrect use of INSTALL_ aliases in Makefile

5 files changed, 254 insertions, 96 deletions

diff --git a/x11-wm/afterstep/Makefile b/x11-wm/afterstep/Makefile
index 68bb442c307..66cce059035 100644
--- a/x11-wm/afterstep/Makefile
+++ b/x11-wm/afterstep/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/distinfo b/x11-wm/afterstep/distinfo
index e0087a5f21b..8a9d85c83e9 100644
--- a/x11-wm/afterstep/distinfo
+++ b/x11-wm/afterstep/distinfo
@@ -1 +1 @@
-MD5 (as-b27.tar.gz) = 5ba7487a1f0a571c89b176b673d55e35
+MD5 (as-b30.tar.gz) = 99fbb1bef5dbb43c60ad5159493f4ccb
diff --git a/x11-wm/afterstep/files/patch-aa b/x11-wm/afterstep/files/patch-aa
index 7ce13b4ba7f..6b400b2a87d 100644
--- a/x11-wm/afterstep/files/patch-aa
+++ b/x11-wm/afterstep/files/patch-aa
@@ -1,30 +1,51 @@
---- configure.h.orig	Sat Aug 17 00:50:55 1996
-+++ configure.h	Sat Aug 17 00:53:36 1996
-@@ -1,6 +1,6 @@
--#define AFTERDIR     "/usr/lib/X11/afterstep"
--#define AFTER_ICONDIR   "/usr/include/X11/bitmaps:/usr/include/X11/pixmaps"
--#define STEPRC         "/usr/lib/X11/afterstep/system.steprc"
-+#define AFTERDIR     "@@PREFIX@@/lib/X11/afterstep"
-+#define AFTER_ICONDIR   "@@PREFIX@@/include/X11/bitmaps:@@PREFIX@@/include/X11/pixmaps"
-+#define STEPRC         "@@PREFIX@@/lib/X11/afterstep/system.steprc"
- 
- /* If you would like gradients, uncomment this */
- #define ENABLE_TEXTURE
-@@ -15,7 +15,7 @@
-  * Imake wants to leave binaries, then choose the second line here.
-  * If you want to install it in a different directory, uncomment and
-  * edit the first line */
--#define AFTER_BIN_DIR BINDIR=/usr/bin/X11
-+#define AFTER_BIN_DIR BINDIR=@@PREFIX@@/bin
- 
- /* Compiler over-ride for Imakefiles */
- /* Leave it as shown to get your default compiler */
-@@ -57,7 +57,7 @@
-  ***************************************************************************/
- #define XPM                      
- /*  linker flags needed to locate and link in the Xpm library, if you use it */
--#define XPMLIBRARY -L/usr/lib/X11 -lXpm -lm
-+#define XPMLIBRARY -L@@PREFIX@@/lib -lXpm -lm
- 
- /***************************************************************************
-  *#define M4
+*** configure.h.orig	Mon Aug 26 15:09:46 1996
+--- configure.h	Mon Aug 26 16:32:09 1996
+***************
+*** 1,6 ****
+! #define AFTERDIR     "/usr/lib/X11/afterstep"
+! #define AFTER_ICONDIR   "/usr/include/X11/bitmaps:/usr/include/X11/pixmaps"
+! #define STEPRC         "/usr/lib/X11/afterstep/system.steprc"
+  
+  /* If you would like gradients, uncomment this */
+  #define ENABLE_TEXTURE
+--- 1,6 ----
+! #define AFTERDIR     "@@PREFIX@@/lib/X11/afterstep"
+! #define AFTER_ICONDIR   "@@PREFIX@@/include/X11/bitmaps:@@PREFIX@@/include/X11/pixmaps"
+! #define STEPRC         "@@PREFIX@@/lib/X11/afterstep/system.steprc"
+  
+  /* If you would like gradients, uncomment this */
+  #define ENABLE_TEXTURE
+***************
+*** 15,21 ****
+   * Imake wants to leave binaries, then choose the second line here.
+   * If you want to install it in a different directory, uncomment and
+   * edit the first line */
+! #define AFTER_BIN_DIR BINDIR=/usr/bin/X11
+  
+  /* Compiler over-ride for Imakefiles */
+  /* Leave it as shown to get your default compiler */
+--- 15,21 ----
+   * Imake wants to leave binaries, then choose the second line here.
+   * If you want to install it in a different directory, uncomment and
+   * edit the first line */
+! #define AFTER_BIN_DIR BINDIR=@@PREFIX@@/bin
+  
+  /* Compiler over-ride for Imakefiles */
+  /* Leave it as shown to get your default compiler */
+***************
+*** 57,63 ****
+   ***************************************************************************/
+  #define XPM                      
+  /*  linker flags needed to locate and link in the Xpm library, if you use it */
+! #define XPMLIBRARY -L/usr/lib/X11 -lXpm
+  
+  /***************************************************************************
+   *#define M4
+--- 57,63 ----
+   ***************************************************************************/
+  #define XPM                      
+  /*  linker flags needed to locate and link in the Xpm library, if you use it */
+! #define XPMLIBRARY -L@@PREFIX@@/lib -lXpm
+  
+  /***************************************************************************
+   *#define M4
diff --git a/x11-wm/afterstep/files/patch-ab b/x11-wm/afterstep/files/patch-ab
index 7f881d506d5..2790baf6285 100644
--- a/x11-wm/afterstep/files/patch-ab
+++ b/x11-wm/afterstep/files/patch-ab
@@ -1,73 +1,167 @@
-*** sample.steprc.orig	Wed Aug 21 17:15:35 1996
---- sample.steprc	Fri Aug 23 12:52:10 1996
+*** sample.steprc.orig	Mon Aug 26 14:45:47 1996
+--- sample.steprc	Mon Aug 26 16:36:13 1996
 ***************
-*** 78,86 ****
-  ##########################################################################
-  # Module path
-  # ModulePath is a colon-separated list, just like regular unix PATH
+*** 141,151 ****
+  # ModulePath is a colon-separated list, just like a regular unix PATH
+  # Any Module must be found within the path in order to be located
+  # and executed
 ! ModulePath          /usr/lib/X11/afterstep:/usr/X11R6/lib/X11/afterstep
+  # Another colon-separated list pointing to your pixmaps (color icons)
 ! PixmapPath          /usr/include/X11/pixmaps/
+  # Path for your ugly black&white icons
 ! IconPath            /usr/include/X11/bitmaps/
-  NoBoundaryWidth 0
-  BoundaryWidth 8
-  Style "oclock" Sticky, NoTitle, StaysOnTop, WindowListSkip
---- 78,86 ----
-  ##########################################################################
-  # Module path
-  # ModulePath is a colon-separated list, just like regular unix PATH
+  
+  # Various styles which can be associated with specific applications
+  # Sticky -- remains "stuck" on all desks
+--- 141,151 ----
+  # ModulePath is a colon-separated list, just like a regular unix PATH
+  # Any Module must be found within the path in order to be located
+  # and executed
 ! ModulePath          @@PREFIX@@/lib/X11/afterstep:@@PREFIX@@/lib/X11/fvwm
+  # Another colon-separated list pointing to your pixmaps (color icons)
 ! PixmapPath          @@PREFIX@@/include/X11/pixmaps/
+  # Path for your ugly black&white icons
 ! IconPath            @@PREFIX@@/include/X11/bitmaps/
-  NoBoundaryWidth 0
-  BoundaryWidth 8
-  Style "oclock" Sticky, NoTitle, StaysOnTop, WindowListSkip
+  
+  # Various styles which can be associated with specific applications
+  # Sticky -- remains "stuck" on all desks
 ***************
-*** 105,118 ****
-  *Wharf xbiff   nil   Swallow "xbiff" xbiff -bg "#8e8a9e" -fg "#00003f" -geometry 45x45-1-1 &
-  *Wharf xload  nil   Swallow "xload" xload -nolabel -hl black -bg "#8e8a9e" -geometry 45x45-1-1 &
-  *Wharf xterm monitor.xpm   Exec "-" /xterm -geometry 80x25 -sl 256 -sb -ls -T 'xterm@afterstep.org' &
+*** 193,201 ****
+    # Open up an xterm
+  *Wharf xterm monitor.xpm   Exec "-" xterm -geometry 80x25 -sl 256 -sb -ls -T 'xterm@afterstep.org' &
+    # Start up the LyX word processor
 ! *Wharf lyx text.xpm Exec "-" /home/frank/bin/lyx &>/dev/null &
-! *Wharf gimp 3dpaint.xpm Exec "-" gimp -geometry +15+373 &
+    # Create amazing art with the freeware masterpiece, The GIMP
+! *Wharf gimp 3dpaint.xpm Exec "-" gimp &
+    # Read some mail
   *Wharf pine writeletter.xpm Exec "-" xterm -T "pine" -e pine &
-  *Wharf - -  Swallow "xload" xload -nolabel -hl black -bg "#8e8a9e" -geometry 48x48-1-1 &
-  *Wharf Netscape netscape3.xpm Exec "-" netscape -geometry 680x565+400+2 &
-! *Wharf moxfm FilingCabinet.xpm Exec "-" moxfm >& /dev/null &
-  *Wharf pager nil SwallowModule "FvwmPager" FvwmPager 0 0
-! *Wharf config interface.xpm Exec "-" xterm -T "vi(.steprc)" -e vim -n ~/.steprc &
-  *Wharf Recycler  recycler.xpm  Restart " " afterstep
-  
-  ##########################################################################
---- 105,118 ----
-  *Wharf xbiff   nil   Swallow "xbiff" xbiff -bg "#8e8a9e" -fg "#00003f" -geometry 45x45-1-1 &
-  *Wharf xload  nil   Swallow "xload" xload -nolabel -hl black -bg "#8e8a9e" -geometry 45x45-1-1 &
-  *Wharf xterm monitor.xpm   Exec "-" /xterm -geometry 80x25 -sl 256 -sb -ls -T 'xterm@afterstep.org' &
+    # Surf the web
+--- 193,201 ----
+    # Open up an xterm
+  *Wharf xterm monitor.xpm   Exec "-" xterm -geometry 80x25 -sl 256 -sb -ls -T 'xterm@afterstep.org' &
+    # Start up the LyX word processor
 ! #*Wharf lyx text.xpm Exec "-" /home/frank/bin/lyx &>/dev/null &
-! #*Wharf gimp 3dpaint.xpm Exec "-" gimp -geometry +15+373 &
+    # Create amazing art with the freeware masterpiece, The GIMP
+! #*Wharf gimp 3dpaint.xpm Exec "-" gimp &
+    # Read some mail
   *Wharf pine writeletter.xpm Exec "-" xterm -T "pine" -e pine &
-  *Wharf - -  Swallow "xload" xload -nolabel -hl black -bg "#8e8a9e" -geometry 48x48-1-1 &
-  *Wharf Netscape netscape3.xpm Exec "-" netscape -geometry 680x565+400+2 &
-! #*Wharf moxfm FilingCabinet.xpm Exec "-" moxfm >& /dev/null &
-  *Wharf pager nil SwallowModule "FvwmPager" FvwmPager 0 0
-! #*Wharf config interface.xpm Exec "-" xterm -T "vi(.steprc)" -e vim -n ~/.steprc &
+    # Surf the web
+***************
+*** 204,210 ****
+    # Click on the different "desks" to change in between them
+  *Wharf pager nil SwallowModule "Pager" Pager 0 0
+    # Edit this file in its own window
+! *Wharf config interface.xpm Exec "-" xterm -T "AfterStep Configuration" -e vi ~/.steprc &
+    # Recycle your AfterStep session (Restart)
   *Wharf Recycler  recycler.xpm  Restart " " afterstep
   
-  ##########################################################################
+--- 204,210 ----
+    # Click on the different "desks" to change in between them
+  *Wharf pager nil SwallowModule "Pager" Pager 0 0
+    # Edit this file in its own window
+! #*Wharf config interface.xpm Exec "-" xterm -T "AfterStep Configuration" -e vi ~/.steprc &
+    # Recycle your AfterStep session (Restart)
+  *Wharf Recycler  recycler.xpm  Restart " " afterstep
+  
+***************
+*** 239,245 ****
+          # Place the green carpet image onto the background upon startup
+          # I personally recommend xli/xloadimage, but xv seems to be
+          # ubiquitous in the unix world so I'll use that 
+! 	Exec	"I"	exec xv -root -quit /backgrounds/carpet.green.jpg
+  EndFunction
+  
+  # These will load up upon every subsequent Restart
+--- 239,245 ----
+          # Place the green carpet image onto the background upon startup
+          # I personally recommend xli/xloadimage, but xv seems to be
+          # ubiquitous in the unix world so I'll use that 
+! 	Exec	"I"	exec xv -root -quit @@PREFIX@@/lib/X11/afterstep/backgrounds/carpet.green.jpg
+  EndFunction
+  
+  # These will load up upon every subsequent Restart
+***************
+*** 412,432 ****
+  # Images ... quick way to view the included default background images
+  Popup "Images"
+  	Title	"Images"
+! 	Exec	"Brick"		exec xv -root -quit /backgrounds/brick.jpg
+! 	Exec	"Coins"		exec xv -root -quit /backgrounds/coins.jpg
+! 	Exec	"Dark Wood"	exec xv -root -quit /backgrounds/darkwood.jpg
+! 	Exec	"Eyes"		exec xv -root -quit /backgrounds/eyes.jpg
+! 	Exec	"Glass"		exec xv -root -quit /backgrounds/glass.jpg
+! 	Exec	"Green Carpet"	exec xv -root -quit /backgrounds/carpet.green.jpg
+! 	Exec	"Parquet"	exec xv -root -quit /backgrounds/parquet.jpg
+! 	Exec	"Pebbles"	exec xv -root -quit /backgrounds/pebbles.jpg
+! 	Exec	"Rock"		exec xv -root -quit /backgrounds/rock.tile.jpg
+! 	Exec	"Rope"		exec xv -root -quit /backgrounds/rope.weave.jpg
+! 	Exec	"Stucco"	exec xv -root -quit /backgrounds/stucco.jpg
+! 	Exec	"Tile"		exec xv -root -quit /backgrounds/tile.check.jpg
+! 	Exec	"Tree Bark"	exec xv -root -quit /backgrounds/bark.jpg
+! 	Exec	"Volcanic"	exec xv -root -quit /backgrounds/volcanic.jpg
+! 	Exec	"Wood"		exec xv -root -quit /backgrounds/wood.jpg
+  EndPopup
+  
+  # Background settings ... choose from either Solid Colors or Color Images
+--- 412,432 ----
+  # Images ... quick way to view the included default background images
+  Popup "Images"
+  	Title	"Images"
+! 	Exec	"Brick"		exec xv -root -quit @@PREFIX@@/lib/X11/afterstep/backgrounds/brick.jpg
+! 	Exec	"Coins"		exec xv -root -quit @@PREFIX@@/lib/X11/afterstep/backgrounds/coins.jpg
+! 	Exec	"Dark Wood"	exec xv -root -quit @@PREFIX@@/lib/X11/afterstep/backgrounds/darkwood.jpg
+! 	Exec	"Eyes"		exec xv -root -quit @@PREFIX@@/lib/X11/afterstep/backgrounds/eyes.jpg
+! 	Exec	"Glass"		exec xv -root -quit @@PREFIX@@/lib/X11/afterstep/backgrounds/glass.jpg
+! 	Exec	"Green Carpet"	exec xv -root -quit @@PREFIX@@/lib/X11/afterstep/backgrounds/carpet.green.jpg
+! 	Exec	"Parquet"	exec xv -root -quit @@PREFIX@@/lib/X11/afterstep/backgrounds/parquet.jpg
+! 	Exec	"Pebbles"	exec xv -root -quit @@PREFIX@@/lib/X11/afterstep/backgrounds/pebbles.jpg
+! 	Exec	"Rock"		exec xv -root -quit @@PREFIX@@/lib/X11/afterstep/backgrounds/rock.tile.jpg
+! 	Exec	"Rope"		exec xv -root -quit @@PREFIX@@/lib/X11/afterstep/backgrounds/rope.weave.jpg
+! 	Exec	"Stucco"	exec xv -root -quit @@PREFIX@@/lib/X11/afterstep/backgrounds/stucco.jpg
+! 	Exec	"Tile"		exec xv -root -quit @@PREFIX@@/lib/X11/afterstep/backgrounds/tile.check.jpg
+! 	Exec	"Tree Bark"	exec xv -root -quit @@PREFIX@@/lib/X11/afterstep/backgrounds/bark.jpg
+! 	Exec	"Volcanic"	exec xv -root -quit @@PREFIX@@/lib/X11/afterstep/backgrounds/volcanic.jpg
+! 	Exec	"Wood"		exec xv -root -quit @@PREFIX@@/lib/X11/afterstep/backgrounds/wood.jpg
+  EndPopup
+  
+  # Background settings ... choose from either Solid Colors or Color Images
 ***************
-*** 229,236 ****
+*** 444,450 ****
   Popup "HotList"
   	Title 	"HotList"
-          Exec    "Xterm"         exec xterm -e tcsh -l &
-!         Exec    "Netscape 1.12" exec netscape.12 -geometry 585x565 &
-!         Exec    "Netscape 3.0"  exec netscape -geometry 680x565 &
-          Nop     ""
+          Exec    "Xterm"         exec xterm -ls -sl 256 -sb -T 'xterm@afterstep.org' &
+!         Exec    "Netscape 3.0"  exec netscape &
           Popup   "Applications"  Applications
-          Nop     ""
---- 229,236 ----
+  	Popup	"Utilities"	Utilities
+          Popup   "Games"         Games
+--- 444,450 ----
   Popup "HotList"
   	Title 	"HotList"
-          Exec    "Xterm"         exec xterm -e tcsh -l &
-! 	Exec	"Rxvt"		exec rxvt -fat &
-!         Exec    "Netscape"  exec netscape -geometry 680x565 &
-          Nop     ""
+          Exec    "Xterm"         exec xterm -ls -sl 256 -sb -T 'xterm@afterstep.org' &
+!         Exec    "Netscape"	exec netscape &
           Popup   "Applications"  Applications
-          Nop     ""
+  	Popup	"Utilities"	Utilities
+          Popup   "Games"         Games
+***************
+*** 550,559 ****
+  Module Audio    
+  
+  # Select your normal audio player
+! #*AudioPlayCmd /usr/bin/showaudio
+  
+  # Select the directory containing your sounds
+! #*AudioDir /home/frank/mac/sounds
+  
+  #*AudioDelay 1
+  
+--- 550,559 ----
+  Module Audio    
+  
+  # Select your normal audio player
+! #*AudioPlayCmd /usr/local/bin/showaudio
+  
+  # Select the directory containing your sounds
+! #*AudioDir @@PREFIX@@/lib/X11/afterstep/sounds
+  
+  #*AudioDelay 1
+  
diff --git a/x11-wm/afterstep/pkg-plist b/x11-wm/afterstep/pkg-plist
index f3d4d6eec3f..24eaf87a71d 100644
--- a/x11-wm/afterstep/pkg-plist
+++ b/x11-wm/afterstep/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