Sun Jun 1 16:48:31 2014 UTC ()
Install fonts into default installation path. Bump PKGREVISION.


(wiz)
diff -r1.28 -r1.29 pkgsrc/emulators/xbeeb/Makefile
diff -r1.6 -r1.7 pkgsrc/emulators/xbeeb/PLIST
cvs diff -r1.28 -r1.29 pkgsrc/emulators/xbeeb/Makefile (expand / switch to unified diff)

--- pkgsrc/emulators/xbeeb/Makefile 2012/10/03 12:55:21 1.28
+++ pkgsrc/emulators/xbeeb/Makefile 2014/06/01 16:48:31 1.29
@@ -1,36 +1,35 @@ @@ -1,36 +1,35 @@
1# $NetBSD: Makefile,v 1.28 2012/10/03 12:55:21 asau Exp $ 1# $NetBSD: Makefile,v 1.29 2014/06/01 16:48:31 wiz Exp $
2# 
3 2
4DISTNAME= xbeeb-0.4.1 3DISTNAME= xbeeb-0.4.1
5PKGREVISION= 1 4PKGREVISION= 2
6CATEGORIES= emulators x11 5CATEGORIES= emulators x11
7MASTER_SITES= http://bbc.nvg.org/emul/Xbeeb/ 6MASTER_SITES= http://bbc.nvg.org/emul/Xbeeb/
8EXTRACT_SUFX= .tgz 7EXTRACT_SUFX= .tgz
9 8
10MAINTAINER= dsainty@NetBSD.org 9MAINTAINER= dsainty@NetBSD.org
11HOMEPAGE= http://www.cloud9.co.uk/james/BBCMicro/Xbeeb/ 10HOMEPAGE= http://www.cloud9.co.uk/james/BBCMicro/Xbeeb/
12COMMENT= Acorn BBC Micro emulator with an X based interface 11COMMENT= Acorn BBC Micro emulator with an X based interface
13 12
14USE_IMAKE= yes 13USE_IMAKE= yes
15USE_TOOLS+= bdftopcf xmkmf mkfontdir 14USE_TOOLS+= bdftopcf xmkmf mkfontdir
16MAN_PAGE= ${WRKDIR}/xbeeb.1 15MAN_PAGE= ${WRKDIR}/xbeeb.1
17 16
18XBEEBROOT= share/xbeeb 17XBEEBROOT= share/xbeeb
19MESSAGE_SUBST+= XBEEBROOT=${XBEEBROOT} 18MESSAGE_SUBST+= XBEEBROOT=${XBEEBROOT}
20PLIST_SUBST+= XBEEBROOT=${XBEEBROOT:Q} 19PLIST_SUBST+= XBEEBROOT=${XBEEBROOT:Q}
21 20
22FONTS_DIRS.x11= ${PREFIX}/lib/X11/fonts/xbeeb 21FONTS_DIRS.x11= ${PREFIX}/share/fonts/X11/xbeeb
23REQD_DIRS= ${PREFIX}/lib/X11/fonts/xbeeb 22REQD_DIRS= ${PREFIX}/share/fonts/X11/xbeeb
24 23
25INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 24INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
26 25
27.include "options.mk" 26.include "options.mk"
28 27
29.include "../../mk/oss.buildlink3.mk" 28.include "../../mk/oss.buildlink3.mk"
30 29
31.if ${OSS_TYPE} != "none" 30.if ${OSS_TYPE} != "none"
32 31
33SUBST_CLASSES+= dsp 32SUBST_CLASSES+= dsp
34SUBST_STAGE.dsp= post-patch 33SUBST_STAGE.dsp= post-patch
35SUBST_MESSAGE.dsp= Adjusting sound device path 34SUBST_MESSAGE.dsp= Adjusting sound device path
36SUBST_FILES.dsp= src/SoundOSS.c 35SUBST_FILES.dsp= src/SoundOSS.c
@@ -48,42 +47,42 @@ SUBST_CLASSES+= nooss @@ -48,42 +47,42 @@ SUBST_CLASSES+= nooss
48SUBST_STAGE.nooss= post-patch 47SUBST_STAGE.nooss= post-patch
49SUBST_MESSAGE.nooss= Disabling sound support: No OSS on this platform 48SUBST_MESSAGE.nooss= Disabling sound support: No OSS on this platform
50SUBST_FILES.nooss= src/Config.h 49SUBST_FILES.nooss= src/Config.h
51SUBST_SED.nooss= -e "s|^\#define\\([ ]*SOUND_OSS.*\\)\$$|\#undef\\1|" 50SUBST_SED.nooss= -e "s|^\#define\\([ ]*SOUND_OSS.*\\)\$$|\#undef\\1|"
52 51
53.endif # OSS_TYPE 52.endif # OSS_TYPE
54 53
55SUBST_CLASSES+= beebroot 54SUBST_CLASSES+= beebroot
56SUBST_STAGE.beebroot= post-patch 55SUBST_STAGE.beebroot= post-patch
57SUBST_MESSAGE.beebroot= Adjusting XBEEBROOT path 56SUBST_MESSAGE.beebroot= Adjusting XBEEBROOT path
58SUBST_FILES.beebroot= src/Config.h 57SUBST_FILES.beebroot= src/Config.h
59SUBST_SED.beebroot= -e "s|^\\(\#define[ ]*XBEEBROOT[ ]*\\)[^ ].*\$$|\\1\"${PREFIX}/${XBEEBROOT}/\"|" 58SUBST_SED.beebroot= -e "s|^\\(\#define[ ]*XBEEBROOT[ ]*\\)[^ ].*\$$|\\1\"${PREFIX}/${XBEEBROOT}/\"|"
60 59
61INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 ${XBEEBROOT}/roms ${XBEEBROOT}/docs lib/X11/fonts/xbeeb 60INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 ${XBEEBROOT}/roms ${XBEEBROOT}/docs share/fonts/X11/xbeeb
62 61
63# xbeeb build starts in the source directory 62# xbeeb build starts in the source directory
64do-configure: 63do-configure:
65 cd ${WRKSRC}/src && xmkmf 64 cd ${WRKSRC}/src && xmkmf
66 65
67post-patch: 66post-patch:
68 sed -e 's+@XBEEBROOT@+${XBEEBROOT}+g' \ 67 sed -e 's+@XBEEBROOT@+${XBEEBROOT}+g' \
69 -e 's+@PREFIX@+${PREFIX}+g' \ 68 -e 's+@PREFIX@+${PREFIX}+g' \
70 ${FILESDIR}/xbeeb.1 > ${MAN_PAGE} 69 ${FILESDIR}/xbeeb.1 > ${MAN_PAGE}
71 70
72do-build: 71do-build:
73 cd ${WRKSRC}/src && env ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} xbeeb 72 cd ${WRKSRC}/src && env ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} xbeeb
74 set -e; \ 73 set -e; \
75 cd ${WRKSRC}/fonts; \ 74 cd ${WRKSRC}/fonts; \
76 for i in *.bdf; do \ 75 for i in *.bdf; do \
77 ${TOOLS_PATH.bdftopcf} "$$i" -o `${BASENAME} "$$i" .bdf`.pcf; \ 76 ${TOOLS_PATH.bdftopcf} "$$i" -o `${BASENAME} "$$i" .bdf`.pcf; \
78 done 77 done
79 78
80do-install: 79do-install:
81 ${INSTALL_PROGRAM} ${WRKSRC}/src/xbeeb ${DESTDIR}${PREFIX}/bin/xbeeb 80 ${INSTALL_PROGRAM} ${WRKSRC}/src/xbeeb ${DESTDIR}${PREFIX}/bin/xbeeb
82 ${INSTALL_MAN} ${MAN_PAGE} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/xbeeb.1 81 ${INSTALL_MAN} ${MAN_PAGE} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/xbeeb.1
83 ${INSTALL_DATA} ${WRKSRC}/roms/xdfs0.90.rom ${DESTDIR}${PREFIX}/${XBEEBROOT}/roms/xdfs0.90.rom 82 ${INSTALL_DATA} ${WRKSRC}/roms/xdfs0.90.rom ${DESTDIR}${PREFIX}/${XBEEBROOT}/roms/xdfs0.90.rom
84 cd ${WRKSRC}/doc && ${INSTALL_DATA} * ${DESTDIR}${PREFIX}/${XBEEBROOT}/docs 83 cd ${WRKSRC}/doc && ${INSTALL_DATA} * ${DESTDIR}${PREFIX}/${XBEEBROOT}/docs
85 cd ${WRKSRC}/fonts && ${INSTALL_DATA} *.pcf ${DESTDIR}${PREFIX}/lib/X11/fonts/xbeeb 84 cd ${WRKSRC}/fonts && ${INSTALL_DATA} *.pcf ${DESTDIR}${PREFIX}/share/fonts/X11/xbeeb
86 85
87.include "../../x11/libXext/buildlink3.mk" 86.include "../../x11/libXext/buildlink3.mk"
88.include "../../x11/libX11/buildlink3.mk" 87.include "../../x11/libX11/buildlink3.mk"
89.include "../../mk/bsd.pkg.mk" 88.include "../../mk/bsd.pkg.mk"
cvs diff -r1.6 -r1.7 pkgsrc/emulators/xbeeb/PLIST (expand / switch to unified diff)

--- pkgsrc/emulators/xbeeb/PLIST 2009/06/14 17:51:10 1.6
+++ pkgsrc/emulators/xbeeb/PLIST 2014/06/01 16:48:31 1.7
@@ -1,24 +1,24 @@ @@ -1,24 +1,24 @@
1@comment $NetBSD: PLIST,v 1.6 2009/06/14 17:51:10 joerg Exp $ 1@comment $NetBSD: PLIST,v 1.7 2014/06/01 16:48:31 wiz Exp $
2bin/xbeeb 2bin/xbeeb
3lib/X11/fonts/xbeeb/ttext-grc-ldh.pcf 3share/fonts/X11/xbeeb/ttext-grc-ldh.pcf
4lib/X11/fonts/xbeeb/ttext-grc-udh.pcf 4share/fonts/X11/xbeeb/ttext-grc-udh.pcf
5lib/X11/fonts/xbeeb/ttext-grc.pcf 5share/fonts/X11/xbeeb/ttext-grc.pcf
6lib/X11/fonts/xbeeb/ttext-grs-ldh.pcf 6share/fonts/X11/xbeeb/ttext-grs-ldh.pcf
7lib/X11/fonts/xbeeb/ttext-grs-udh.pcf 7share/fonts/X11/xbeeb/ttext-grs-udh.pcf
8lib/X11/fonts/xbeeb/ttext-grs.pcf 8share/fonts/X11/xbeeb/ttext-grs.pcf
9lib/X11/fonts/xbeeb/ttext-std-ldh.pcf 9share/fonts/X11/xbeeb/ttext-std-ldh.pcf
10lib/X11/fonts/xbeeb/ttext-std-udh.pcf 10share/fonts/X11/xbeeb/ttext-std-udh.pcf
11lib/X11/fonts/xbeeb/ttext-std.pcf 11share/fonts/X11/xbeeb/ttext-std.pcf
12man/man1/xbeeb.1 12man/man1/xbeeb.1
13${XBEEBROOT}/docs/64doc 13${XBEEBROOT}/docs/64doc
14${XBEEBROOT}/docs/Changes-v0.3 14${XBEEBROOT}/docs/Changes-v0.3
15${XBEEBROOT}/docs/Changes-v0.4 15${XBEEBROOT}/docs/Changes-v0.4
16${XBEEBROOT}/docs/Configuration 16${XBEEBROOT}/docs/Configuration
17${XBEEBROOT}/docs/DataXfer 17${XBEEBROOT}/docs/DataXfer
18${XBEEBROOT}/docs/DiskEmulation 18${XBEEBROOT}/docs/DiskEmulation
19${XBEEBROOT}/docs/Help 19${XBEEBROOT}/docs/Help
20${XBEEBROOT}/docs/Installation 20${XBEEBROOT}/docs/Installation
21${XBEEBROOT}/docs/Keyboard 21${XBEEBROOT}/docs/Keyboard
22${XBEEBROOT}/docs/KnownBugs 22${XBEEBROOT}/docs/KnownBugs
23${XBEEBROOT}/docs/MailingLists 23${XBEEBROOT}/docs/MailingLists
24${XBEEBROOT}/docs/Options 24${XBEEBROOT}/docs/Options