diff options
author | wiz <wiz> | 2001-01-29 11:34:21 +0000 |
---|---|---|
committer | wiz <wiz> | 2001-01-29 11:34:21 +0000 |
commit | 6e5db71f33d6f19d9bc2ccef08527c4fd58ea7ba (patch) | |
tree | 86f14acd24842161759a420487862022044c2b4b /emulators/xbeeb | |
parent | e79bc93dd230b17193ddcfca298d9cf5d3cf7205 (diff) | |
download | pkgsrc-6e5db71f33d6f19d9bc2ccef08527c4fd58ea7ba.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 'emulators/xbeeb')
-rw-r--r-- | emulators/xbeeb/Makefile | 19 | ||||
-rw-r--r-- | emulators/xbeeb/files/xbeeb.1 (renamed from emulators/xbeeb/pkg/xbeeb.1) | 2 | ||||
-rw-r--r-- | emulators/xbeeb/pkg/MESSAGE (renamed from emulators/xbeeb/pkg/MESSAGE.post) | 27 | ||||
-rw-r--r-- | emulators/xbeeb/pkg/PLIST | 40 |
4 files changed, 46 insertions, 42 deletions
diff --git a/emulators/xbeeb/Makefile b/emulators/xbeeb/Makefile index 917747db94f..bff97c1cabf 100644 --- a/emulators/xbeeb/Makefile +++ b/emulators/xbeeb/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2000/09/03 10:01:41 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2001/01/29 11:34:26 wiz Exp $ # DISTNAME= xbeeb-0.3.6 @@ -11,11 +11,11 @@ HOMEPAGE= http://www.netcomuk.co.uk/~james/BBCMicro/Xbeeb/index.html USE_IMAKE= yes WRKSRC= ${WRKDIR}/xbeeb -PLIST_SRC= ${WRKDIR}/PLIST -MESSAGE_FILE= ${WRKDIR}/MESSAGE MAN_PAGE= ${WRKDIR}/xbeeb.1 XBEEBROOT= share/xbeeb +MESSAGE_SUBST+= XBEEBROOT=${XBEEBROOT} +PLIST_SUBST+= XBEEBROOT=${XBEEBROOT} # xbeeb build starts in the source directory do-configure: @@ -25,10 +25,10 @@ post-patch: (cd ${WRKSRC}/src && \ ${MV} Config.h Config.h.dist && \ ${SED} 's+^\(#define[ ]*XBEEBROOT[ ]*\)[^ ].*$$+\1"${PREFIX}/${XBEEBROOT}/"+' Config.h.dist > Config.h) - ${SED} 's+#XBEEBROOT#+${XBEEBROOT}+g' ${PKGDIR}/PLIST > ${PLIST_SRC} +testt: ${SED} -e 's+@XBEEBROOT@+${XBEEBROOT}+g' \ -e 's+@PREFIX@+${PREFIX}+g' \ - ${PKGDIR}/xbeeb.1 > ${MAN_PAGE} + ${FILESDIR}/xbeeb.1 > ${MAN_PAGE} do-build: (cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} xbeeb) @@ -37,15 +37,6 @@ do-build: do \ bdftopcf $$i -o `basename $$i .bdf`.pcf ; \ done) - ${ECHO} > ${MESSAGE_FILE} "You must copy the BBC \"BASIC2\" ROM image to" - ${ECHO} >> ${MESSAGE_FILE} "" - ${ECHO} >> ${MESSAGE_FILE} " ${PREFIX}/${XBEEBROOT}/roms/BASIC2.rom" - ${ECHO} >> ${MESSAGE_FILE} "" - ${ECHO} >> ${MESSAGE_FILE} "and the BBC \"OS1.2\" ROM image to" - ${ECHO} >> ${MESSAGE_FILE} "" - ${ECHO} >> ${MESSAGE_FILE} " ${PREFIX}/${XBEEBROOT}/roms/OS1.2.rom" - ${ECHO} >> ${MESSAGE_FILE} "" - ${SED} -e 's#@PREFIX@#${PREFIX}#g' <${PKGDIR}/MESSAGE.post >>${MESSAGE_FILE} do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/xbeeb ${PREFIX}/bin/xbeeb diff --git a/emulators/xbeeb/pkg/xbeeb.1 b/emulators/xbeeb/files/xbeeb.1 index dee8decefd0..b38fd4317a6 100644 --- a/emulators/xbeeb/pkg/xbeeb.1 +++ b/emulators/xbeeb/files/xbeeb.1 @@ -1,4 +1,4 @@ -.\" $NetBSD: xbeeb.1,v 1.2 2000/06/05 18:12:57 skrll Exp $ +.\" $NetBSD: xbeeb.1,v 1.1 2001/01/29 11:34:26 wiz Exp $ .\" .Dd May 27, 2000 .Dt XBEEB 1 diff --git a/emulators/xbeeb/pkg/MESSAGE.post b/emulators/xbeeb/pkg/MESSAGE index 432b5b0a01c..f82f2f36ee4 100644 --- a/emulators/xbeeb/pkg/MESSAGE.post +++ b/emulators/xbeeb/pkg/MESSAGE @@ -1,7 +1,18 @@ +====================================================================== +$NetBSD: MESSAGE,v 1.3 2001/01/29 11:34:26 wiz Exp $ + +You must copy the BBC "BASIC2" ROM image to + + ${PREFIX}/${XBEEBROOT}/roms/BASIC2.rom + +and the BBC "OS1.2" ROM image to + + ${PREFIX}/${XBEEBROOT}/roms/OS1.2.rom + You also need to ensure that your X session can access the fonts needed. This can be done with: - $ xset fp+ @PREFIX@/lib/X11/fonts/xbeeb + $ xset fp+ ${PREFIX}/lib/X11/fonts/xbeeb To make the effect permanent for future X sessions, you can do this by editing certain files in your X installation. @@ -19,9 +30,11 @@ intlfonts install directory to the xfs/config file in the comma separated list of directories given for the "catalogue" setting. For example: - catalogue = @PREFIX@/lib/X11/fonts/misc/, - @PREFIX@/lib/X11/fonts/Speedo/, - @PREFIX@/lib/X11/fonts/Type1/, - @PREFIX@/lib/X11/fonts/100dpi/, - @PREFIX@/lib/X11/fonts/75dpi/, - @PREFIX@/lib/X11/fonts/xbeeb/ + catalogue = ${PREFIX}/lib/X11/fonts/misc/, + ${PREFIX}/lib/X11/fonts/Speedo/, + ${PREFIX}/lib/X11/fonts/Type1/, + ${PREFIX}/lib/X11/fonts/100dpi/, + ${PREFIX}/lib/X11/fonts/75dpi/, + ${PREFIX}/lib/X11/fonts/xbeeb/ + +====================================================================== diff --git a/emulators/xbeeb/pkg/PLIST b/emulators/xbeeb/pkg/PLIST index 9e97326ccf4..36c91f53f83 100644 --- a/emulators/xbeeb/pkg/PLIST +++ b/emulators/xbeeb/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2000/06/01 20:47:02 skrll Exp $ +@comment $NetBSD: PLIST,v 1.3 2001/01/29 11:34:26 wiz Exp $ bin/xbeeb lib/X11/fonts/xbeeb/ttext-grc-ldh.pcf lib/X11/fonts/xbeeb/ttext-std-udh.pcf @@ -10,23 +10,23 @@ lib/X11/fonts/xbeeb/ttext-grc.pcf lib/X11/fonts/xbeeb/ttext-grc-udh.pcf lib/X11/fonts/xbeeb/ttext-std.pcf lib/X11/fonts/xbeeb/fonts.dir -#XBEEBROOT#/roms/xdfs0.70.rom -#XBEEBROOT#/docs/64doc -#XBEEBROOT#/docs/Configuration -#XBEEBROOT#/docs/DataXfer -#XBEEBROOT#/docs/DiskEmulation -#XBEEBROOT#/docs/Help -#XBEEBROOT#/docs/Installation -#XBEEBROOT#/docs/Keyboard -#XBEEBROOT#/docs/KnownBugs -#XBEEBROOT#/docs/MailingLists -#XBEEBROOT#/docs/Options -#XBEEBROOT#/docs/RomPatches -#XBEEBROOT#/docs/SnapshotFormat -#XBEEBROOT#/docs/Thanks -#XBEEBROOT#/docs/WWWSites -#XBEEBROOT#/docs/WorkingSoftware +${XBEEBROOT}/roms/xdfs0.70.rom +${XBEEBROOT}/docs/64doc +${XBEEBROOT}/docs/Configuration +${XBEEBROOT}/docs/DataXfer +${XBEEBROOT}/docs/DiskEmulation +${XBEEBROOT}/docs/Help +${XBEEBROOT}/docs/Installation +${XBEEBROOT}/docs/Keyboard +${XBEEBROOT}/docs/KnownBugs +${XBEEBROOT}/docs/MailingLists +${XBEEBROOT}/docs/Options +${XBEEBROOT}/docs/RomPatches +${XBEEBROOT}/docs/SnapshotFormat +${XBEEBROOT}/docs/Thanks +${XBEEBROOT}/docs/WWWSites +${XBEEBROOT}/docs/WorkingSoftware @dirrm lib/X11/fonts/xbeeb -@dirrm #XBEEBROOT#/docs -@dirrm #XBEEBROOT#/roms -@dirrm #XBEEBROOT# +@dirrm ${XBEEBROOT}/docs +@dirrm ${XBEEBROOT}/roms +@dirrm ${XBEEBROOT} |