From 288bbe0fdb66dbe4fbae5730b72737a8e89131d4 Mon Sep 17 00:00:00 2001 From: James FitzGibbon Date: Tue, 29 Oct 1996 19:50:21 +0000 Subject: Upgrade to v1.0prerelease-1 Now includes manpages! --- x11-wm/afterstep-stable/Makefile | 24 +++-- x11-wm/afterstep-stable/distinfo | 2 +- x11-wm/afterstep-stable/pkg-plist | 10 +- x11-wm/afterstep/Makefile | 24 +++-- x11-wm/afterstep/distinfo | 2 +- x11-wm/afterstep/files/patch-aa | 10 +- x11-wm/afterstep/files/patch-ab | 188 +++++++++++++++---------------------- x11-wm/afterstep/pkg-plist | 10 +- x11-wm/afterstep/scripts/configure | 13 ++- 9 files changed, 135 insertions(+), 148 deletions(-) (limited to 'x11-wm') diff --git a/x11-wm/afterstep-stable/Makefile b/x11-wm/afterstep-stable/Makefile index 83b36330950a..f71d34bf5b84 100644 --- a/x11-wm/afterstep-stable/Makefile +++ b/x11-wm/afterstep-stable/Makefile @@ -1,22 +1,23 @@ # New ports collection makefile for: afterstep -# Version required: 0.98b33 -# Date created: 17 July 96 -# Whom: james@bdd.net +# Version required: 1.0pre1 +# Date created: October 29th 1996 +# Whom: jfitz@FreeBSD.ORG # -# $Id: Makefile,v 1.10 1996/09/30 20:29:12 jfitz Exp $ +# $Id: Makefile,v 1.11 1996/10/09 04:53:23 jfitz Exp $ # -DISTNAME= as-b33 -PKGNAME= afterstep-0.98b33 +DISTNAME= as-10pre1 +PKGNAME= afterstep-1.0pr1 CATEGORIES+= x11 MASTER_SITES= ftp://oak.sfasu.edu/pub/AfterStep/ -MAINTAINER= jfitz@freebsd.org +MAINTAINER= jfitz@FreeBSD.ORG LIB_DEPENDS= Xpm\\.4\\.:${PORTSDIR}/graphics/xpm USE_X11= yes -WRKSRC= ${WRKDIR}/AfterStep-0.98aBETA33 +WRKSRC= ${WRKDIR}/AfterStep-1.0pre1 +INSTALL_TARGET= install install.man pre-build: @ cd ${WRKSRC}; sh MakeMakefiles @@ -30,8 +31,13 @@ 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 README README.8bit README.gradient afterstep.faq; do \ + @for file in CHANGES NEW README README.8bit afterstep.faq; do \ ${INSTALL_DATA} ${WRKSRC}/$$file ${PREFIX}/lib/X11/afterstep/doc/; \ done +.if defined(NOMANCOMPRESS) + @ for file in afterstep asclock Audio Auto Banner Pager Wharf; do \ + gunzip ${PREFIX}/man/man1/$$file.1.gz; \ + done +.endif .include diff --git a/x11-wm/afterstep-stable/distinfo b/x11-wm/afterstep-stable/distinfo index dd59aed808cf..4a6eed8d0df1 100644 --- a/x11-wm/afterstep-stable/distinfo +++ b/x11-wm/afterstep-stable/distinfo @@ -1 +1 @@ -MD5 (as-b33.tar.gz) = 8093b2d60fc3c61a7198fe6f6ca56858 +MD5 (as-10pre1.tar.gz) = b780e7868973b615893cf6334bd8f0e3 diff --git a/x11-wm/afterstep-stable/pkg-plist b/x11-wm/afterstep-stable/pkg-plist index d0f6b3aeeab3..bc41d953d907 100644 --- a/x11-wm/afterstep-stable/pkg-plist +++ b/x11-wm/afterstep-stable/pkg-plist @@ -21,9 +21,9 @@ 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/README lib/X11/afterstep/doc/README.8bit -lib/X11/afterstep/doc/README.gradient lib/X11/afterstep/doc/afterstep.faq lib/X11/afterstep/sounds/beaming.au lib/X11/afterstep/sounds/bong.au @@ -48,8 +48,14 @@ include/X11/pixmaps/netscape3.xpm include/X11/pixmaps/shutdown.xpm include/X11/pixmaps/text.xpm include/X11/pixmaps/writeletter.xpm +man/man1/afterstep.1.gz +man/man1/asclock.1.gz +man/man1/Audio.1.gz +man/man1/Auto.1.gz +man/man1/Banner.1.gz +man/man1/Pager.1.gz +man/man1/Wharf.1.gz @dirrm lib/X11/afterstep/doc @dirrm lib/X11/afterstep/backgrounds @dirrm lib/X11/afterstep/sounds @dirrm lib/X11/afterstep -@dirrm include/X11/pixmaps diff --git a/x11-wm/afterstep/Makefile b/x11-wm/afterstep/Makefile index 83b36330950a..f71d34bf5b84 100644 --- a/x11-wm/afterstep/Makefile +++ b/x11-wm/afterstep/Makefile @@ -1,22 +1,23 @@ # New ports collection makefile for: afterstep -# Version required: 0.98b33 -# Date created: 17 July 96 -# Whom: james@bdd.net +# Version required: 1.0pre1 +# Date created: October 29th 1996 +# Whom: jfitz@FreeBSD.ORG # -# $Id: Makefile,v 1.10 1996/09/30 20:29:12 jfitz Exp $ +# $Id: Makefile,v 1.11 1996/10/09 04:53:23 jfitz Exp $ # -DISTNAME= as-b33 -PKGNAME= afterstep-0.98b33 +DISTNAME= as-10pre1 +PKGNAME= afterstep-1.0pr1 CATEGORIES+= x11 MASTER_SITES= ftp://oak.sfasu.edu/pub/AfterStep/ -MAINTAINER= jfitz@freebsd.org +MAINTAINER= jfitz@FreeBSD.ORG LIB_DEPENDS= Xpm\\.4\\.:${PORTSDIR}/graphics/xpm USE_X11= yes -WRKSRC= ${WRKDIR}/AfterStep-0.98aBETA33 +WRKSRC= ${WRKDIR}/AfterStep-1.0pre1 +INSTALL_TARGET= install install.man pre-build: @ cd ${WRKSRC}; sh MakeMakefiles @@ -30,8 +31,13 @@ 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 README README.8bit README.gradient afterstep.faq; do \ + @for file in CHANGES NEW README README.8bit afterstep.faq; do \ ${INSTALL_DATA} ${WRKSRC}/$$file ${PREFIX}/lib/X11/afterstep/doc/; \ done +.if defined(NOMANCOMPRESS) + @ for file in afterstep asclock Audio Auto Banner Pager Wharf; do \ + gunzip ${PREFIX}/man/man1/$$file.1.gz; \ + done +.endif .include diff --git a/x11-wm/afterstep/distinfo b/x11-wm/afterstep/distinfo index dd59aed808cf..4a6eed8d0df1 100644 --- a/x11-wm/afterstep/distinfo +++ b/x11-wm/afterstep/distinfo @@ -1 +1 @@ -MD5 (as-b33.tar.gz) = 8093b2d60fc3c61a7198fe6f6ca56858 +MD5 (as-10pre1.tar.gz) = b780e7868973b615893cf6334bd8f0e3 diff --git a/x11-wm/afterstep/files/patch-aa b/x11-wm/afterstep/files/patch-aa index be189e7e5394..afa5a688878b 100644 --- a/x11-wm/afterstep/files/patch-aa +++ b/x11-wm/afterstep/files/patch-aa @@ -9,9 +9,9 @@ /* 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" +! #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 @@ -28,7 +28,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=@@PREFIX@@/bin +! #define AFTER_BIN_DIR BINDIR=%%PREFIX%%/bin /* Compiler over-ride for Imakefiles */ /* Leave it as shown to get your default compiler */ @@ -45,7 +45,7 @@ ***************************************************************************/ #define XPM /* linker flags needed to locate and link in the Xpm library, if you use it */ -! #define XPMLIBRARY -L@@PREFIX@@/lib -lXpm +! #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 e4defe461f8d..b2a780815166 100644 --- a/x11-wm/afterstep/files/patch-ab +++ b/x11-wm/afterstep/files/patch-ab @@ -1,112 +1,76 @@ -*** sample.steprc.orig Tue Sep 3 12:32:19 1996 ---- sample.steprc Tue Sep 3 12:36:49 1996 -*************** -*** 145,155 **** - # 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 ---- 145,155 ---- - # 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/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 -*************** -*** 246,252 **** - # 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 ---- 246,252 ---- - # 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 -*************** -*** 419,439 **** - # 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 ---- 419,439 ---- - # 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 -*************** -*** 559,568 **** - Module Audio - - # Select your normal audio player -! #*AudioPlayCmd /usr/bin/showaudio - - # Select the directory containing your sounds -! #*AudioDir /home/frank/mac/sounds - - #*AudioDelay 1 - ---- 559,568 ---- - 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 - +--- 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 + diff --git a/x11-wm/afterstep/pkg-plist b/x11-wm/afterstep/pkg-plist index d0f6b3aeeab3..bc41d953d907 100644 --- a/x11-wm/afterstep/pkg-plist +++ b/x11-wm/afterstep/pkg-plist @@ -21,9 +21,9 @@ 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/README lib/X11/afterstep/doc/README.8bit -lib/X11/afterstep/doc/README.gradient lib/X11/afterstep/doc/afterstep.faq lib/X11/afterstep/sounds/beaming.au lib/X11/afterstep/sounds/bong.au @@ -48,8 +48,14 @@ include/X11/pixmaps/netscape3.xpm include/X11/pixmaps/shutdown.xpm include/X11/pixmaps/text.xpm include/X11/pixmaps/writeletter.xpm +man/man1/afterstep.1.gz +man/man1/asclock.1.gz +man/man1/Audio.1.gz +man/man1/Auto.1.gz +man/man1/Banner.1.gz +man/man1/Pager.1.gz +man/man1/Wharf.1.gz @dirrm lib/X11/afterstep/doc @dirrm lib/X11/afterstep/backgrounds @dirrm lib/X11/afterstep/sounds @dirrm lib/X11/afterstep -@dirrm include/X11/pixmaps diff --git a/x11-wm/afterstep/scripts/configure b/x11-wm/afterstep/scripts/configure index a66835c092f3..0b1ba89bbcb1 100644 --- a/x11-wm/afterstep/scripts/configure +++ b/x11-wm/afterstep/scripts/configure @@ -1,9 +1,8 @@ -#!/bin/sh +#!/usr/bin/perl +# -cd $WRKSRC || exit 1 +eval '(exit $?0)' && eval 'exec /usr/bin/perl -S $0 ${1+"$@"}' +& eval 'exec /usr/bin/perl -S $0 $argv:q' +if 0; -cp configure.h configure.h.orig -cp sample.steprc sample.steprc.orig -sed -e "s:@@PREFIX@@:$PREFIX:g" < configure.h.orig > configure.h -sed -e "s:@@PREFIX@@:$PREFIX:g" < sample.steprc.orig > sample.steprc -chmod u+x Installme +system( "/usr/bin/perl -pi -e 's|%%PREFIX%%|$ENV{'PREFIX'}|g' $ENV{'WRKSRC'}/sample.steprc $ENV{'WRKSRC'}/configure.h" ); -- cgit v1.2.3