From 3ce638ed02adf3649ce7b39076071ccb64529784 Mon Sep 17 00:00:00 2001
From: wiz <wiz>
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.

---
 pkgtools/xpkgwedge/Makefile        |  5 +----
 pkgtools/xpkgwedge/pkg/MESSAGE     | 16 ++++++++++++++++
 pkgtools/xpkgwedge/pkg/MESSAGE.pre | 16 ----------------
 3 files changed, 17 insertions(+), 20 deletions(-)
 create mode 100644 pkgtools/xpkgwedge/pkg/MESSAGE
 delete mode 100644 pkgtools/xpkgwedge/pkg/MESSAGE.pre

(limited to 'pkgtools')

diff --git a/pkgtools/xpkgwedge/Makefile b/pkgtools/xpkgwedge/Makefile
index a13164e7d06..23d8ecbe192 100644
--- a/pkgtools/xpkgwedge/Makefile
+++ b/pkgtools/xpkgwedge/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2001/01/18 17:05:50 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2001/01/29 11:34:39 wiz Exp $
 #
 
 DISTNAME=	xpkgwedge-1.1
@@ -16,7 +16,6 @@ NO_CHECKSUM=	# defined
 
 DEINSTALL_FILE=	${WRKDIR}/DEINSTALL
 INSTALL_FILE=	${WRKDIR}/INSTALL
-MESSAGE_FILE=	${WRKDIR}/MESSAGE
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -44,8 +43,6 @@ do-build:
 		< ${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE}
 	${SED}	-e "s,@X11BASE@,${X11BASE},g" \
 		< ${PKGDIR}/INSTALL > ${INSTALL_FILE}
-	${SED}	-e "s,@PREFIX@,${PREFIX},g" \
-		< ${PKGDIR}/MESSAGE.pre > ${MESSAGE_FILE}
 
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/lib/X11/config
diff --git a/pkgtools/xpkgwedge/pkg/MESSAGE b/pkgtools/xpkgwedge/pkg/MESSAGE
new file mode 100644
index 00000000000..5cbea1cbc94
--- /dev/null
+++ b/pkgtools/xpkgwedge/pkg/MESSAGE
@@ -0,0 +1,16 @@
+==========================================================================
+$NetBSD: MESSAGE,v 1.3 2001/01/29 11:34:39 wiz Exp $
+
+NOTES:
+
+* You MUST set the environment variable XAPPLRESDIR in /etc/profile and
+  /etc/csh.login by hand in order to make pkgs built with xpkgwedge run
+  properly, e.g.
+
+	XAPPLRESDIR=${PREFIX}/lib/X11/app-defaults
+
+  If any users set XAPPLRESDIR in their own environment, these settings
+  will not work -- such users need to set XUSERFILESEARCHPATH (syntax
+  can be found in XtResolvePathname(3Xt)).
+
+==========================================================================
diff --git a/pkgtools/xpkgwedge/pkg/MESSAGE.pre b/pkgtools/xpkgwedge/pkg/MESSAGE.pre
deleted file mode 100644
index 230ad06225e..00000000000
--- a/pkgtools/xpkgwedge/pkg/MESSAGE.pre
+++ /dev/null
@@ -1,16 +0,0 @@
-==========================================================================
-$NetBSD: MESSAGE.pre,v 1.6 2000/10/23 17:32:08 jlam Exp $
-
-NOTES:
-
-* You MUST set the environment variable XAPPLRESDIR in /etc/profile and
-  /etc/csh.login by hand in order to make pkgs built with xpkgwedge run
-  properly, e.g.
-
-	XAPPLRESDIR=@PREFIX@/lib/X11/app-defaults
-
-  If any users set XAPPLRESDIR in their own environment, these settings
-  will not work -- such users need to set XUSERFILESEARCHPATH (syntax
-  can be found in XtResolvePathname(3Xt)).
-
-==========================================================================
-- 
cgit v1.2.3