From b979f7222ad9bade13f010cd27e5bc6afab1681c Mon Sep 17 00:00:00 2001
From: wiz <wiz@pkgsrc.org>
Date: Mon, 29 Jan 2001 11:34:21 +0000
Subject: Add automatic ${VARIABLE} handling for MESSAGE files. Convert most
 MESSAGE files to new syntax (${VARIABLE} gets replaced, not @VARIABLE@, nor
 @@VARIABLE@@). By default, substitutions are done for LOCALBASE, PKGNAME,
 PREFIX, X11BASE, X11PREFIX; additional patterns can be added via
 MESSAGE_SUBST. Clean up some packages while I'm there; add RCS tags to most
 MESSAGEs. Remove some uninteresting MESSAGEs.

---
 wm/afterstep/Makefile    |  7 +------
 wm/afterstep/pkg/MESSAGE | 11 ++++++++---
 2 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'wm')

diff --git a/wm/afterstep/Makefile b/wm/afterstep/Makefile
index a2f6d3f8bc0..c99fb6746c5 100644
--- a/wm/afterstep/Makefile
+++ b/wm/afterstep/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/01/25 12:36:16 fredb Exp $
+# $NetBSD: Makefile,v 1.4 2001/01/29 11:34:44 wiz Exp $
 
 DISTNAME=	AfterStep-1.8.0
 PKGNAME=	afterstep-1.8.0
@@ -34,8 +34,6 @@ CONFIGURE_ARGS+=	--with-png-includes=${LOCALBASE}/include
 CONFIGURE_ARGS+=	--with-png-lib=${LOCALBASE}/lib
 CONFIGURE_ENV+=		LOCALBASE=${LOCALBASE}
 
-MESSAGE_FILE=		${WRKDIR}/MESSAGE
-
 post-patch:
 	for i in `${FIND} ${WRKSRC} -name "*.man" -print` \
 		${WRKSRC}/autoconf/Makefile.common.in; do \
@@ -49,7 +47,4 @@ pre-configure:
 	  ${CHMOD} 755 configure; \
 	  autoheader --localdir=autoconf autoconf/configure.in > autoconf/config.h.in;
 
-post-build:
-	${SED} 's|@PREFIX@|${PREFIX}|g' < ${PKGDIR}/MESSAGE > ${MESSAGE_FILE}
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/afterstep/pkg/MESSAGE b/wm/afterstep/pkg/MESSAGE
index b4f0bb6c487..f502e015bde 100644
--- a/wm/afterstep/pkg/MESSAGE
+++ b/wm/afterstep/pkg/MESSAGE
@@ -1,3 +1,6 @@
+======================================================================
+$NetBSD: MESSAGE,v 1.2 2001/01/29 11:34:44 wiz Exp $
+
 FIRST TIME USERS:
 To use afterstep as your window manager, simply invoke "exec afterstep"
 at the end of your .xinitrc (for "startx), or .xsession file (for xdm).
@@ -6,15 +9,17 @@ Don't forget to comment out any line(s) for your current window manager.
 UPGRADERS:
 Afterstep-1.8.x is more configurable than ever, but note: the format of
 many of the configuration files has changed! In particular, it is no
-longer necessary to maintain a complete copy of @PREFIX@/share/afterstep
+longer necessary to maintain a complete copy of ${PREFIX}/share/afterstep
 in each home directory--your ~/Gnu/Library/Afterstep directory now need
-only contain changes from the defaults in @PREFIX@/share/afterstep.
+only contain changes from the defaults in ${PREFIX}/share/afterstep.
 Upgraders are advised to back up their old ~/Gnu/Library/Afterstep directory,
 and review the documentation before merging diffs carefully. 
 
 EVERYBODY:
 The AfterStep Control Panel for 1.8.x is still under development.
 See the online docs--Wharf top button, or bottom item of start menu,
-or view @PREFIX@/share/afterstep/doc/afterstep.html with any browser.
+or view ${PREFIX}/share/afterstep/doc/afterstep.html with any browser.
 If you are connected to the Internet, a FAQ, mailing lists, and other
 resources may be found on the Afterstep Home Page:
+
+======================================================================
-- 
cgit v1.2.3