6 files changed, 20 insertions, 23 deletions
diff --git a/x11/lesstif12/Makefile b/x11/lesstif12/Makefile
index ad178ba64ee..b1d031e3a0a 100644
--- a/x11/lesstif12/Makefile
+++ b/x11/lesstif12/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2000/12/22 17:26:22 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2001/01/29 11:34:48 wiz Exp $
 
 PKGNAME=		lesstif12-${LESSTIF_VERSION}
 
@@ -11,12 +11,6 @@ CONFIGURE_ARGS+=	--enable-build-12
 CONFIGURE_ARGS+=	--disable-build-20
 CONFIGURE_ARGS+=	--enable-default-12
 
-MESSAGE_FILE=		${WRKDIR}/MESSAGE
-
-pre-install:
-	${SED} -e "s,@PREFIX@,${PREFIX},g" \
-		< ${PKGDIR}/MESSAGE > ${MESSAGE_FILE}
-
 # We don't install any documentation, but the installation process creates
 # this directory anyway, so remove it if it's empty.
 #
diff --git a/x11/lesstif12/pkg/MESSAGE b/x11/lesstif12/pkg/MESSAGE
index 7bd83b2b197..8d24067eff2 100644
--- a/x11/lesstif12/pkg/MESSAGE
+++ b/x11/lesstif12/pkg/MESSAGE
@@ -1,14 +1,15 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.2 2000/12/22 17:26:22 jlam Exp $
+$NetBSD: MESSAGE,v 1.3 2001/01/29 11:34:48 wiz Exp $
 
 Please note that this package is provided for those programs
 which will not work with newer versions of LessTif.  To allow this
 package to coexist with newer versions of LessTif, it has been installed
-in @PREFIX@/LessTif/1.2/{include,lib}.
+in ${PREFIX}/LessTif/1.2/{include,lib}.
 
 You should be able to select this version of LessTif when compiling
 programs which use it by passing the following flags to the compiler:
 
-    -I@PREFIX@/LessTif/Motif1.2/include
-    -L@PREFIX@/LessTif/Motif1.2/lib -Wl,-R@PREFIX@/LessTif/Motif1.2/lib
+    -I${PREFIX}/LessTif/Motif1.2/include
+    -L${PREFIX}/LessTif/Motif1.2/lib -Wl,-R${PREFIX}/LessTif/Motif1.2/lib
+
 ===========================================================================
diff --git a/x11/tkman/Makefile b/x11/tkman/Makefile
index 0125c9bf159..81890c22180 100644
--- a/x11/tkman/Makefile
+++ b/x11/tkman/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2000/09/11 21:08:49 fredb Exp $
+# $NetBSD: Makefile,v 1.25 2001/01/29 11:34:49 wiz Exp $
 # FreeBSD Id: Makefile,v 1.28 1997/12/08 15:51:20 tg Exp
 #
 
@@ -17,7 +17,6 @@ DEPENDS+=		tk-8.3.2:../../x11/tk
 
 USE_X11=		yes
 
-MESSAGE_FILE=		${WRKDIR}/MESSAGE
 WRKSRC=			${WRKDIR}/${PKGNAME}
 
 post-install:
@@ -25,8 +24,6 @@ post-install:
 		-e 's|@@PREFIX@@|${PREFIX}|' \
 		-e 's|@@X11BASE@@|${X11BASE}|' \
 		< ${FILESDIR}/mkindex > ${WRKDIR}/mkindex
-	${SED} -e 's|@@PREFIX@@|${PREFIX}|' \
-		< ${PKGDIR}/MESSAGE > ${WRKDIR}/MESSAGE
 	${INSTALL_SCRIPT} ${WRKDIR}/mkindex ${PREFIX}/libexec
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/tkman/pkg/MESSAGE b/x11/tkman/pkg/MESSAGE
index 1662d1ae510..2058d72db4b 100644
--- a/x11/tkman/pkg/MESSAGE
+++ b/x11/tkman/pkg/MESSAGE
@@ -1,5 +1,10 @@
+======================================================================
+$NetBSD: MESSAGE,v 1.2 2001/01/29 11:34:49 wiz Exp $
+
 You can have the glimpse and apropos databases, needed by tkman,
 kept up-to-date by adding the following entry to root's crontab
 (edit to taste):
 
-10      2       *       *       6       @@PREFIX@@/libexec/mkindex
+10      2       *       *       6       ${PREFIX}/libexec/mkindex
+
+======================================================================
diff --git a/x11/xscribble/Makefile b/x11/xscribble/Makefile
index 3d435366152..c562bff56b4 100644
--- a/x11/xscribble/Makefile
+++ b/x11/xscribble/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2000/11/17 14:40:16 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2001/01/29 11:34:49 wiz Exp $
 
 DISTNAME=	xscribble
 PKGNAME=	xscribble-20000616
@@ -12,11 +12,6 @@ HOMEPAGE=	http://www.handhelds.org/projects/xscribble.html
 USE_IMAKE=	YES
 NO_INSTALL_MANPAGES=	YES
 
-MESSAGE_FILE=	${WRKDIR}/MESSAGE
-
-post-patch:
-	${SED} -e "s,@PREFIX@,${PREFIX},g" <${PKGDIR}/MESSAGE >${MESSAGE_FILE}
-
 post-install:
 	${MKDIR} ${PREFIX}/share/examples/xscribble
 	${CP} ${WRKSRC}/classifiers/*.cl ${PREFIX}/share/examples/xscribble
diff --git a/x11/xscribble/pkg/MESSAGE b/x11/xscribble/pkg/MESSAGE
index a63d82fc932..ce6d9eb2775 100644
--- a/x11/xscribble/pkg/MESSAGE
+++ b/x11/xscribble/pkg/MESSAGE
@@ -1,2 +1,7 @@
+======================================================================
+$NetBSD: MESSAGE,v 1.2 2001/01/29 11:34:49 wiz Exp $
+
 To actually use xscribble, you need to copy
-@PREFIX@/share/examples/xscribble/*.cl into ~/.classifiers.
+${PREFIX}/share/examples/xscribble/*.cl into ~/.classifiers.
+
+======================================================================