summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authortron <tron>1999-06-06 20:22:45 +0000
committertron <tron>1999-06-06 20:22:45 +0000
commitb7704e8f3a627b0103362cf0aeffdcbf5388c0ea (patch)
tree34c37427707862e796cb5fb882e95a22b2395b8b /x11
parent3954975e7ffaf4180df42132f3db75a95350d727 (diff)
downloadpkgsrc-b7704e8f3a627b0103362cf0aeffdcbf5388c0ea.tar.gz
Update "afterstep" package to version 1.6.10. Patches supplied by
Frederick Bruckman in PR pkg/7712.
Diffstat (limited to 'x11')
-rw-r--r--x11/afterstep/Makefile34
-rw-r--r--x11/afterstep/files/md54
-rw-r--r--x11/afterstep/patches/patch-ae13
-rw-r--r--x11/afterstep/pkg/MESSAGE36
-rw-r--r--x11/afterstep/pkg/PLIST5
5 files changed, 51 insertions, 41 deletions
diff --git a/x11/afterstep/Makefile b/x11/afterstep/Makefile
index a1eb9c87e47..53c22aa4b23 100644
--- a/x11/afterstep/Makefile
+++ b/x11/afterstep/Makefile
@@ -1,22 +1,23 @@
-# $NetBSD: Makefile,v 1.9 1999/03/04 14:59:24 tron Exp $
+# $NetBSD: Makefile,v 1.10 1999/06/06 20:22:45 tron Exp $
-DISTNAME= AfterStep-1.6.0
-PKGNAME= afterstep-1.6.0
-CATEGORIES= x11
-MASTER_SITES= ftp://ftp.afterstep.org/pub/stable/ \
- ftp://ftp.digex.net/pub/os/wm/AfterStep/stable/
+DISTNAME= AfterStep-1.6.10
+PKGNAME= afterstep-1.6.10
+CATEGORIES= x11
+MASTER_SITES= ftp://ftp.afterstep.org/pub/stable/ \
+ ftp://ftp.digex.net/pub/X11/window-managers/afterstep/AfterStep/pub/stable/
+EXTRACT_SUFX= .tar.bz2
-MAINTAINER= root@garbled.net
-HOMEPAGE= http://www.afterstep.org/
+MAINTAINER= packages@netbsd.org
+HOMEPAGE= http://www.afterstep.org/
-DEPENDS+= xpm-3.4k:../../graphics/xpm
-DEPENDS+= jpeg-6b:../../graphics/jpeg
-DEPENDS+= png-1.0.3:../../graphics/png
-DEPENDS+= rplay-3.2.0b6:../../audio/rplay
-DEPENDS+= asclock-11:../../x11/asclock
+DEPENDS+= xpm-3.4k:../../graphics/xpm
+DEPENDS+= jpeg-6b:../../graphics/jpeg
+DEPENDS+= png-1.0.3:../../graphics/png
+DEPENDS+= rplay-3.2.0b6:../../audio/rplay
+DEPENDS+= asclock-11:../../x11/asclock
-USE_X11BASE= yes
-GNU_CONFIGURE= yes
+USE_X11BASE= yes
+GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-png-includes=${LOCALBASE}/include \
--with-png-lib=${LOCALBASE}/lib \
@@ -26,8 +27,9 @@ CONFIGURE_ENV+= LOCALBASE=${LOCALBASE}
post-patch:
for i in ` find ${WRKSRC} -name "*.man" -print `; do \
- ${CP} $$i $$i.orig ;\
+ ${MV} $$i $$i.orig ;\
${SED} -e 's@/usr/local/@${PREFIX}/@g' < $$i.orig > $$i ; \
+ ${RM} $$i.orig ;\
done
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/afterstep/files/md5 b/x11/afterstep/files/md5
index 44b8e43e80c..e3904253f2f 100644
--- a/x11/afterstep/files/md5
+++ b/x11/afterstep/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.2 1998/12/28 23:36:44 tron Exp $
+$NetBSD: md5,v 1.3 1999/06/06 20:22:45 tron Exp $
-MD5 (AfterStep-1.6.0.tar.gz) = 026257f589285b8e0414b890ed71c9d5
+MD5 (AfterStep-1.6.10.tar.bz2) = 09f3303ca1e599fe0ce74c54ba8611ad
diff --git a/x11/afterstep/patches/patch-ae b/x11/afterstep/patches/patch-ae
deleted file mode 100644
index ff9cff8c991..00000000000
--- a/x11/afterstep/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.3 1999/03/29 16:14:40 tron Exp $
-
---- src/afterstep/afterstep.c.orig Fri Dec 11 00:34:43 1998
-+++ src/afterstep/afterstep.c Mon Mar 29 18:07:04 1999
-@@ -194,7 +194,7 @@
- else if (!strcmp(argv[i], "-f") && i + 1 < argc)
- {
- shall_override_config_file = True;
-- config_file_to_override = argv[i];
-+ config_file_to_override = argv[++i];
- }
- else
- usage();
diff --git a/x11/afterstep/pkg/MESSAGE b/x11/afterstep/pkg/MESSAGE
index c742d8867fd..2af6fb04ba3 100644
--- a/x11/afterstep/pkg/MESSAGE
+++ b/x11/afterstep/pkg/MESSAGE
@@ -1,14 +1,32 @@
-In order to use afterstep.. create a directory called
-~/GNUstep/Library/AfterStep and issue the command:
+FIRST TIME USERS:
+To use afterstep, put "exec afterstep" at the end of your .xinitrc
+or .xsession file, as applies, commenting out any line(s) for your
+current window manager.
-cp -R /usr/X11R6/share/afterstep/* ~/GNUstep/Library/AfterStep
-Replacing /usr/X11R6 with the location of your X tree or installation
-base dir (if different).
+UPGRADERS:
+The format of many of the config files may change with the minor
+version number, as from 1.5.x to 1.6.10. Upgraders are advised to
+back up their old custom configs,
+"cp ~/GNUstep/Library/AfterStep ~/GNUstep/Library/AfterStep.old",
+review the defaults in ~/usr/X11R6/share/afterstep for compatibility,
+and edit as required before moving them back.
-Then place afterstep in your .xinitrc or .xsession file, replacing your
-current window manager.
-More information about using afterstep is available at:
+EVERYBODY:
+Try the AfterStep Control Panel (available as a separate package,
+x11/ascp) for configuring AfterStep.
+
+If the "Afterstep Documentation" item in the default start menu
+fails to work, it's probably because you don't have a binary called
+either "netscape" or "lynx" on your system. With your favorite
+browser, try
+
+ file://usr/X11R6/share/afterstep/doc/afterstep.html
+
+AfterStep has a homepage,
+
+ http://www.afterstep.org/FAQ/
-http://www.afterstep.org/FAQ/
+There find the latest version of the FAQ and links to subscribe to
+the mailing list.
diff --git a/x11/afterstep/pkg/PLIST b/x11/afterstep/pkg/PLIST
index b5113e78915..a71d63c5104 100644
--- a/x11/afterstep/pkg/PLIST
+++ b/x11/afterstep/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 1998/12/28 23:36:44 tron Exp $
+@comment $NetBSD: PLIST,v 1.3 1999/06/06 20:22:46 tron Exp $
bin/ASSound
bin/Animate
bin/Audio
@@ -617,6 +617,9 @@ share/afterstep/start/Desktop/Animations/Animations-3/8_rotor
share/afterstep/start/Desktop/Animations/Animations-3/0_nose
share/afterstep/start/Desktop/Animations/0_random
share/afterstep/start/Desktop/Animations/0_stop
+@exec mkdir -p %D/share/afterstep/start/Desktop/Feel
+@exec mkdir -p %D/share/afterstep/start/Desktop/Look
+@exec mkdir -p %D/share/afterstep/start/Desktop/Pictures
share/afterstep/start/Desktop/Mouse/9_slow
share/afterstep/start/Desktop/Mouse/1_faster
share/afterstep/start/Desktop/Mouse/2_fastest