diff options
| author | wiz <wiz> | 2001-01-29 11:34:21 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2001-01-29 11:34:21 +0000 |
| commit | 3ce638ed02adf3649ce7b39076071ccb64529784 (patch) | |
| tree | 86f14acd24842161759a420487862022044c2b4b /pkgtools | |
| parent | 33d3218590bab0dca7122812c6edc6f6b124689f (diff) | |
| download | pkgsrc-3ce638ed02adf3649ce7b39076071ccb64529784.tar.gz | |
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.
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/xpkgwedge/Makefile | 5 | ||||
| -rw-r--r-- | pkgtools/xpkgwedge/pkg/MESSAGE (renamed from pkgtools/xpkgwedge/pkg/MESSAGE.pre) | 4 |
2 files changed, 3 insertions, 6 deletions
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.pre b/pkgtools/xpkgwedge/pkg/MESSAGE index 230ad06225e..5cbea1cbc94 100644 --- a/pkgtools/xpkgwedge/pkg/MESSAGE.pre +++ b/pkgtools/xpkgwedge/pkg/MESSAGE @@ -1,5 +1,5 @@ ========================================================================== -$NetBSD: MESSAGE.pre,v 1.6 2000/10/23 17:32:08 jlam Exp $ +$NetBSD: MESSAGE,v 1.3 2001/01/29 11:34:39 wiz Exp $ NOTES: @@ -7,7 +7,7 @@ NOTES: /etc/csh.login by hand in order to make pkgs built with xpkgwedge run properly, e.g. - XAPPLRESDIR=@PREFIX@/lib/X11/app-defaults + 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 |