diff options
author | rillig <rillig> | 2007-01-06 15:09:59 +0000 |
---|---|---|
committer | rillig <rillig> | 2007-01-06 15:09:59 +0000 |
commit | b5909c295bf3ffcdd4165d1e6b8e3f154b6c69c3 (patch) | |
tree | a38107ec4898d368e10527efd4675467680043a0 | |
parent | 70bbf369736d7b1b02ed7df9f98971e53de52086 (diff) | |
download | pkgsrc-b5909c295bf3ffcdd4165d1e6b8e3f154b6c69c3.tar.gz |
Fixed pkglint warnings.
-rw-r--r-- | emulators/xbeeb/Makefile | 36 | ||||
-rw-r--r-- | emulators/xbeeb/PLIST | 16 |
2 files changed, 24 insertions, 28 deletions
diff --git a/emulators/xbeeb/Makefile b/emulators/xbeeb/Makefile index 1bb292e0089..de14fcaa1dd 100644 --- a/emulators/xbeeb/Makefile +++ b/emulators/xbeeb/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2006/12/27 12:42:36 joerg Exp $ +# $NetBSD: Makefile,v 1.22 2007/01/06 15:09:59 rillig Exp $ # DISTNAME= xbeeb-0.4.1 @@ -13,7 +13,7 @@ HOMEPAGE= http://www.cloud9.co.uk/james/BBCMicro/Xbeeb/ COMMENT= Acorn BBC Micro emulator with an X based interface USE_IMAKE= yes -USE_TOOLS+= bdftopcf +USE_TOOLS+= bdftopcf xmkmf mkfontdir MAN_PAGE= ${WRKDIR}/xbeeb.1 XBEEBROOT= share/xbeeb @@ -23,7 +23,7 @@ PLIST_SUBST+= XBEEBROOT=${XBEEBROOT:Q} FONTS_DIRS.x11= ${PREFIX}/lib/X11/fonts/xbeeb REQD_DIRS= ${PREFIX}/lib/X11/fonts/xbeeb -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 PKG_OPTIONS_VAR= PKG_OPTIONS.xbeeb PKG_SUPPORTED_OPTIONS= mitshm @@ -75,35 +75,31 @@ SUBST_MESSAGE.beebroot= Adjusting XBEEBROOT path SUBST_FILES.beebroot= src/Config.h SUBST_SED.beebroot= -e "s|^\\(\#define[ ]*XBEEBROOT[ ]*\\)[^ ].*\$$|\\1\"${PREFIX}/${XBEEBROOT}/\"|" +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 ${XBEEBROOT}/roms ${XBEEBROOT}/docs lib/X11/fonts/xbeeb + # xbeeb build starts in the source directory do-configure: - cd ${WRKSRC}/src && ${XMKMF_CMD} + cd ${WRKSRC}/src && xmkmf post-patch: - ${SED} -e 's+@XBEEBROOT@+${XBEEBROOT}+g' \ + sed -e 's+@XBEEBROOT@+${XBEEBROOT}+g' \ -e 's+@PREFIX@+${PREFIX}+g' \ ${FILESDIR}/xbeeb.1 > ${MAN_PAGE} do-build: - (cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} xbeeb) - (cd ${WRKSRC}/fonts && \ - for i in *.bdf ; \ - do \ - bdftopcf $$i -o `${BASENAME} $$i .bdf`.pcf ; \ - done) + cd ${WRKSRC}/src && env ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} xbeeb + set -e; \ + cd ${WRKSRC}/fonts; \ + for i in *.bdf; do \ + bdftopcf "$$i" -o `${BASENAME} "$$i" .bdf`.pcf; \ + done do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/xbeeb ${PREFIX}/bin/xbeeb - ${INSTALL_MAN} ${MAN_PAGE} ${PREFIX}/man/man1/xbeeb.1 - ${INSTALL_DATA_DIR} ${PREFIX}/${XBEEBROOT} - ${INSTALL_DATA_DIR} ${PREFIX}/${XBEEBROOT}/roms - ${INSTALL_DATA_DIR} ${PREFIX}/${XBEEBROOT}/docs - ${INSTALL_DATA_DIR} ${PREFIX}/lib/X11/fonts/xbeeb + ${INSTALL_MAN} ${MAN_PAGE} ${PREFIX}/${PKGMANDIR}/man1/xbeeb.1 ${INSTALL_DATA} ${WRKSRC}/roms/xdfs0.90.rom ${PREFIX}/${XBEEBROOT}/roms/xdfs0.90.rom - for docfile in ${WRKSRC}/doc/*; do \ - ${INSTALL_DATA} $$docfile ${PREFIX}/${XBEEBROOT}/docs; \ - done - ${CP} ${WRKSRC}/fonts/*.pcf ${PREFIX}/lib/X11/fonts/xbeeb + cd ${WRKSRC}/doc && ${INSTALL_DATA} * ${PREFIX}/${XBEEBROOT}/docs + cd ${WRKSRC}/fonts && ${INSTALL_DATA} *.pcf ${PREFIX}/lib/X11/fonts/xbeeb mkfontdir ${PREFIX}/lib/X11/fonts/xbeeb .include "../../mk/x11.buildlink3.mk" diff --git a/emulators/xbeeb/PLIST b/emulators/xbeeb/PLIST index 281a106aca1..8168b9d8620 100644 --- a/emulators/xbeeb/PLIST +++ b/emulators/xbeeb/PLIST @@ -1,16 +1,15 @@ -@comment $NetBSD: PLIST,v 1.3 2006/06/13 13:24:35 dsainty Exp $ +@comment $NetBSD: PLIST,v 1.4 2007/01/06 15:09:59 rillig Exp $ bin/xbeeb lib/X11/fonts/xbeeb/ttext-grc-ldh.pcf -lib/X11/fonts/xbeeb/ttext-std-udh.pcf -lib/X11/fonts/xbeeb/ttext-std-ldh.pcf -lib/X11/fonts/xbeeb/ttext-grs.pcf -lib/X11/fonts/xbeeb/ttext-grs-udh.pcf -lib/X11/fonts/xbeeb/ttext-grs-ldh.pcf -lib/X11/fonts/xbeeb/ttext-grc.pcf lib/X11/fonts/xbeeb/ttext-grc-udh.pcf +lib/X11/fonts/xbeeb/ttext-grc.pcf +lib/X11/fonts/xbeeb/ttext-grs-ldh.pcf +lib/X11/fonts/xbeeb/ttext-grs-udh.pcf +lib/X11/fonts/xbeeb/ttext-grs.pcf +lib/X11/fonts/xbeeb/ttext-std-ldh.pcf +lib/X11/fonts/xbeeb/ttext-std-udh.pcf lib/X11/fonts/xbeeb/ttext-std.pcf man/man1/xbeeb.1 -${XBEEBROOT}/roms/xdfs0.90.rom ${XBEEBROOT}/docs/64doc ${XBEEBROOT}/docs/Changes-v0.3 ${XBEEBROOT}/docs/Changes-v0.4 @@ -27,6 +26,7 @@ ${XBEEBROOT}/docs/RomPatches ${XBEEBROOT}/docs/SnapshotFormat ${XBEEBROOT}/docs/Thanks ${XBEEBROOT}/docs/WWWSites +${XBEEBROOT}/roms/xdfs0.90.rom @dirrm ${XBEEBROOT}/docs @dirrm ${XBEEBROOT}/roms @dirrm ${XBEEBROOT} |