diff options
author | James FitzGibbon <jfitz@FreeBSD.org> | 1997-03-23 16:22:51 +0000 |
---|---|---|
committer | James FitzGibbon <jfitz@FreeBSD.org> | 1997-03-23 16:22:51 +0000 |
commit | 1116fbcbaa2efc77029d8ea15524ae750f10cc54 (patch) | |
tree | 406935c593178ecdfcb9be1524850734ba8c6920 /x11-wm/afterstep | |
parent | Use official patches from dist site. Included is a possible fix to the (diff) |
Upgrade to v1.0pr5
Reviewed by: James FitzGibbon <jfitz@FreeBSD.ORG>
Submitted by: "Brian N. Handy" <handy@sag.space.lockheed.com>
Notes
Notes:
svn path=/head/; revision=5985
Diffstat (limited to 'x11-wm/afterstep')
-rw-r--r-- | x11-wm/afterstep/Makefile | 16 | ||||
-rw-r--r-- | x11-wm/afterstep/distinfo | 2 | ||||
-rw-r--r-- | x11-wm/afterstep/files/patch-aa | 12 | ||||
-rw-r--r-- | x11-wm/afterstep/files/patch-ab | 188 | ||||
-rw-r--r-- | x11-wm/afterstep/pkg-plist | 4 |
5 files changed, 130 insertions, 92 deletions
diff --git a/x11-wm/afterstep/Makefile b/x11-wm/afterstep/Makefile index fde9557e3c68..122b89d1166f 100644 --- a/x11-wm/afterstep/Makefile +++ b/x11-wm/afterstep/Makefile @@ -1,25 +1,25 @@ # New ports collection makefile for: afterstep -# Version required: 1.0pre1 +# Version required: 1.0pre5 # Date created: October 29th 1996 # Whom: jfitz@FreeBSD.ORG # -# $Id: Makefile,v 1.13 1996/11/18 11:42:39 asami Exp $ +# $Id: Makefile,v 1.14 1996/12/10 20:07:30 obrien Exp $ # -DISTNAME= as-10pre1 -PKGNAME= afterstep-1.0pr1 +DISTNAME= AfterStep-1.0pre5 +PKGNAME= afterstep-1.0pr5 CATEGORIES= x11 -MASTER_SITES= ftp://oak.sfasu.edu/pub/AfterStep/ +MASTER_SITES= ftp://afterstep.foo.net/pub/AfterStep/ MAINTAINER= jfitz@FreeBSD.ORG LIB_DEPENDS= Xpm\\.4\\.:${PORTSDIR}/graphics/xpm USE_X11= yes -WRKSRC= ${WRKDIR}/AfterStep-1.0pre1 +WRKSRC= ${WRKDIR}/AfterStep-1.0pre5 INSTALL_TARGET= install install.man MANCOMPRESSED= yes -MAN1= afterstep.1 asclock.1 Audio.1 Auto.1 Banner.1 Pager.1 Wharf.1 +MAN1= afterstep.1 asclock.1 Animate.1 Audio.1 Auto.1 Banner.1 Pager.1 Wharf.1 pre-build: @ cd ${WRKSRC}; sh MakeMakefiles @@ -33,7 +33,7 @@ post-install: ${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 NEW README README.8bit afterstep.faq; do \ + @for file in CHANGES CREDITS README README.8bit afterstep.faq; do \ ${INSTALL_DATA} ${WRKSRC}/$$file ${PREFIX}/lib/X11/afterstep/doc/; \ done diff --git a/x11-wm/afterstep/distinfo b/x11-wm/afterstep/distinfo index 4a6eed8d0df1..eff706ba4641 100644 --- a/x11-wm/afterstep/distinfo +++ b/x11-wm/afterstep/distinfo @@ -1 +1 @@ -MD5 (as-10pre1.tar.gz) = b780e7868973b615893cf6334bd8f0e3 +MD5 (AfterStep-1.0pre5.tar.gz) = bbc3f2cff7214e7c62529496da43937d diff --git a/x11-wm/afterstep/files/patch-aa b/x11-wm/afterstep/files/patch-aa index afa5a688878b..600754d7e578 100644 --- a/x11-wm/afterstep/files/patch-aa +++ b/x11-wm/afterstep/files/patch-aa @@ -1,5 +1,5 @@ -*** configure.h.orig Tue Sep 3 12:32:22 1996 ---- configure.h Tue Sep 3 12:38:20 1996 +*** configure.h.orig Sun Mar 2 11:50:40 1997 +--- configure.h Thu Mar 20 21:31:42 1997 *************** *** 1,6 **** ! #define AFTERDIR "/usr/lib/X11/afterstep" @@ -16,7 +16,7 @@ /* If you would like gradients, uncomment this */ #define ENABLE_TEXTURE *************** -*** 15,21 **** +*** 17,23 **** * 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 */ @@ -24,7 +24,7 @@ /* Compiler over-ride for Imakefiles */ /* Leave it as shown to get your default compiler */ ---- 15,21 ---- +--- 17,23 ---- * 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 */ @@ -33,7 +33,7 @@ /* Compiler over-ride for Imakefiles */ /* Leave it as shown to get your default compiler */ *************** -*** 57,63 **** +*** 59,65 **** ***************************************************************************/ #define XPM /* linker flags needed to locate and link in the Xpm library, if you use it */ @@ -41,7 +41,7 @@ /*************************************************************************** *#define M4 ---- 57,63 ---- +--- 59,65 ---- ***************************************************************************/ #define XPM /* linker flags needed to locate and link in the Xpm library, if you use it */ diff --git a/x11-wm/afterstep/files/patch-ab b/x11-wm/afterstep/files/patch-ab index b2a780815166..2f9a5cb43737 100644 --- a/x11-wm/afterstep/files/patch-ab +++ b/x11-wm/afterstep/files/patch-ab @@ -1,76 +1,112 @@ ---- sample.steprc.orig Fri Oct 25 11:35:36 1996 -+++ sample.steprc Tue Oct 29 13:57:05 1996 -@@ -156,11 +156,11 @@ - # 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 -+ModulePath %%PREFIX%%/lib/X11/afterstep - # Another colon-separated list pointing to your pixmaps (color icons) --PixmapPath /usr/include/X11/pixmaps/ -+PixmapPath %%PREFIX%%/include/X11/pixmaps/ - # Path for your ugly black&white icons --IconPath /usr/include/X11/bitmaps/ -+IconPath %%PREFIX%%/include/X11/bitmaps/ - - # Various styles which can be associated with specific applications - # Sticky -- remains "stuck" on all desks -@@ -259,7 +259,7 @@ - # 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 -+ # Exec "I" exec xv -root -quit %%PREFIX%%/lib/X11/afterstep/backgrounds/carpet.green.jpg - Exec "I" exec xsetroot -solid DarkGrey - EndFunction - -@@ -433,21 +433,21 @@ - # 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 -+ 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 -@@ -573,10 +573,10 @@ - Module Audio - - # Select your normal audio player --#*AudioPlayCmd /usr/bin/showaudio -+#*AudioPlayCmd /usr/local/bin/showaudio - - # Select the directory containing your sounds --#*AudioDir /home/frank/mac/sounds -+#*AudioDir %%PREFIX%%/lib/X11/afterstep/sounds - - #*AudioDelay 1 - +*** sample.steprc.orig Sun Mar 9 06:30:22 1997 +--- sample.steprc Thu Mar 20 21:37:46 1997 +*************** +*** 166,176 **** + # 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/ + + # Various styles which can be associated with specific applications + # Sticky -- remains "stuck" on all desks +--- 166,176 ---- + # 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 + # 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/ + + # Various styles which can be associated with specific applications + # Sticky -- remains "stuck" on all desks +*************** +*** 290,296 **** + # 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 /usr/lib/X11/afterstep/backgrounds/carpet.green.jpg + Exec "I" exec xsetroot -solid DarkGrey + EndFunction + +--- 290,296 ---- + # 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 + Exec "I" exec xsetroot -solid DarkGrey + EndFunction + +*************** +*** 465,485 **** + # Images ... quick way to view the included default background images + Popup "Images" + Title "Images" +! Exec "Brick" exec xv -root -quit /usr/lib/X11/afterstep/backgrounds/brick.jpg +! Exec "Coins" exec xv -root -quit /usr/lib/X11/afterstep/backgrounds/coins.jpg +! Exec "Dark Wood" exec xv -root -quit /usr/lib/X11/afterstep/backgrounds/darkwood.jpg +! Exec "Eyes" exec xv -root -quit /usr/lib/X11/afterstep/backgrounds/eyes.jpg +! Exec "Glass" exec xv -root -quit /usr/lib/X11/afterstep/backgrounds/glass.jpg +! Exec "Green Carpet" exec xv -root -quit /usr/lib/X11/afterstep/backgrounds/carpet.green.jpg +! Exec "Parquet" exec xv -root -quit /usr/lib/X11/afterstep/backgrounds/parquet.jpg +! Exec "Pebbles" exec xv -root -quit /usr/lib/X11/afterstep/backgrounds/pebbles.jpg +! Exec "Rock" exec xv -root -quit /usr/lib/X11/afterstep/backgrounds/rock.tile.jpg +! Exec "Rope" exec xv -root -quit /usr/lib/X11/afterstep/backgrounds/rope.weave.jpg +! Exec "Stucco" exec xv -root -quit /usr/lib/X11/afterstep/backgrounds/stucco.jpg +! Exec "Tile" exec xv -root -quit /usr/lib/X11/afterstep/backgrounds/tile.check.jpg +! Exec "Tree Bark" exec xv -root -quit /usr/lib/X11/afterstep/backgrounds/bark.jpg +! Exec "Volcanic" exec xv -root -quit /usr/lib/X11/afterstep/backgrounds/volcanic.jpg +! Exec "Wood" exec xv -root -quit /usr/lib/X11/afterstep/backgrounds/wood.jpg + EndPopup + + # Background settings ... choose from either Solid Colors or Color Images +--- 465,485 ---- + # 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 +*************** +*** 605,614 **** + Module Audio + + # Select your normal audio player +! #*AudioPlayCmd /usr/bin/showaudio + + # Select the directory containing your sounds +! #*AudioDir /home/frank/mac/sounds + + #*AudioDelay 1 + +--- 605,614 ---- + 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 bc41d953d907..f71f6b653c38 100644 --- a/x11-wm/afterstep/pkg-plist +++ b/x11-wm/afterstep/pkg-plist @@ -1,4 +1,5 @@ bin/afterstep +lib/X11/afterstep/Animate lib/X11/afterstep/Audio lib/X11/afterstep/Auto lib/X11/afterstep/Banner @@ -21,7 +22,7 @@ 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/NEW +lib/X11/afterstep/doc/CREDITS lib/X11/afterstep/doc/README lib/X11/afterstep/doc/README.8bit lib/X11/afterstep/doc/afterstep.faq @@ -50,6 +51,7 @@ include/X11/pixmaps/text.xpm include/X11/pixmaps/writeletter.xpm man/man1/afterstep.1.gz man/man1/asclock.1.gz +man/man1/Animate.1.gz man/man1/Audio.1.gz man/man1/Auto.1.gz man/man1/Banner.1.gz |