Gentoo Archives: gentoo-commits

From: "Stephanie J. Lockwood-Childs (wormo)" <wormo@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-misc/cmatrix/files: cmatrix-1.2a-fontdir.patch
Date: Sat, 27 Dec 2008 07:36:35
Message-Id: E1LGTiq-00042J-Ie@stork.gentoo.org
1 wormo 08/12/27 07:36:32
2
3 Added: cmatrix-1.2a-fontdir.patch
4 Log:
5 Fix font install path, patch by David Wildasin (bug #252095)
6 (Portage version: 2.1.4.5)
7
8 Revision Changes Path
9 1.1 app-misc/cmatrix/files/cmatrix-1.2a-fontdir.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-misc/cmatrix/files/cmatrix-1.2a-fontdir.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-misc/cmatrix/files/cmatrix-1.2a-fontdir.patch?rev=1.1&content-type=text/plain
13
14 Index: cmatrix-1.2a-fontdir.patch
15 ===================================================================
16 diff -Naru cmatrix-1.2a.orig/Makefile.am cmatrix-1.2a/Makefile.am
17 --- cmatrix-1.2a.orig/Makefile.am 2008-12-24 02:37:43.000000000 +0000
18 +++ cmatrix-1.2a/Makefile.am 2008-12-24 02:50:08.000000000 +0000
19 @@ -18,20 +18,9 @@
20 $(INSTALL_DATA) $(srcdir)/matrix.fnt $(DESTDIR)/usr/lib/kbd/consolefonts; \
21 $(INSTALL_DATA) $(srcdir)/matrix.psf.gz $(DESTDIR)/usr/lib/kbd/consolefonts; \
22 fi
23 - @if test -d /usr/lib/X11/fonts/misc; then \
24 - echo " Installing X window matrix fonts in $(DESTDIR)/usr/lib/X11/fonts/misc..."; \
25 - $(INSTALL_DATA) $(srcdir)/mtx.pcf $(DESTDIR)/usr/lib/X11/fonts/misc; \
26 - $(INSTALL_DATA) $(srcdir)/mtx.pcf $(DESTDIR)/usr/lib/X11/fonts/misc; \
27 - echo " Running mkfontdir $(DESTDIR)/usr/lib/X11/fonts/misc..."; \
28 - echo " Done. If this is the first time you have installed CMatrix you will"; \
29 + @if test -d /usr/share/fonts/misc; then \
30 + echo " Installing X window matrix fonts in $(DESTDIR)/usr/share/fonts/misc..."; \
31 + $(INSTALL_DATA) $(srcdir)/mtx.pcf $(DESTDIR)/usr/share/fonts/misc; \
32 + echo " If this is the first time you have installed CMatrix you will"; \
33 echo " probably have to restart X window in order to use the mtx.pcf font."; \
34 - else \
35 - if test -d /usr/X11R6/lib/X11/fonts/misc; then \
36 - echo " Installing X window matrix fonts in $(DESTDIR)/usr/X11R6/lib/X11/fonts/misc..."; \
37 - $(INSTALL_DATA) $(srcdir)/mtx.pcf $(DESTDIR)/usr/X11R6/lib/X11/fonts/misc; \
38 - $(INSTALL_DATA) $(srcdir)/mtx.pcf $(DESTDIR)/usr/X11R6/lib/X11/fonts/misc; \
39 - echo " Running mkfontdir $(DESTDIR)/usr/X11R6/lib/X11/fonts/misc..."; \
40 - echo " Done. If this is the first time you have installed CMatrix you will"; \
41 - echo " probably have to restart X window in order to use the mtx.pcf font."; \
42 - fi \
43 fi