kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add pkgsrc X and netbsd-5+ native X font dirs to the list of candidate

Browse source 
directories for the default fontpath. PKGREVISION++. ok agc.

The font handling is still fairly problematic; I guess Someone(TM)
should teach this to use fontconfig sometime.
This commit is contained in:
dholland 2011-01-06 07:03:55 +00:00
parent e58989bcee
commit 7df9ccf3e2
4 changed files with 28 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
graphics/gnuplot/Makefile
View file

@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.50 2010/06/13 22:44:33 wiz Exp $
# $NetBSD: Makefile,v 1.51 2011/01/06 07:03:55 dholland Exp $
CATEGORIES+= x11
PKGREVISION= 2
PKGREVISION= 3
CONFLICTS+= gnuplot-nox11-[0-9]*

5
graphics/gnuplot/Makefile.common
View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile.common,v 1.20 2010/09/19 11:40:05 obache Exp $
# $NetBSD: Makefile.common,v 1.21 2011/01/06 07:03:55 dholland Exp $
# used by graphics/gnuplot/Makefile
# used by graphics/gnuplot-nox11/Makefile
@ -36,3 +36,6 @@ CONFIGURE_ARGS+= --with-readline=bsd
CONFIGURE_ARGS+= --with-readline=${BUILDLINK_PREFIX.readline}
.include "../../devel/readline/buildlink3.mk"
.endif
# Make this available to patch-ah so the font path can include pkgsrc fonts.
CFLAGS+=-DPKGSRC_PREFIX=\"${PREFIX}\"

3
graphics/gnuplot/distinfo
View file

@ -1,4 +1,4 @@
$NetBSD: distinfo,v 1.14 2009/10/27 20:48:07 asau Exp $
$NetBSD: distinfo,v 1.15 2011/01/06 07:03:55 dholland Exp $
SHA1 (gnuplot-4.2.6.tar.gz) = d11fdde8218bee98597ee836cbc17e4bf6093b70
RMD160 (gnuplot-4.2.6.tar.gz) = 3b1726e5327b17bb7b528198e62a12b9fe3e5a76
@ -10,3 +10,4 @@ SHA1 (patch-ad) = 5165374c6e8275f2f030659daa45051851e98413
SHA1 (patch-ae) = 622630495587a963fe713ca18d871b5b51aafadc
SHA1 (patch-af) = 02a661965a9af633f9a4dc6ef74f8ad312610362
SHA1 (patch-ag) = 22354c38ac2a8a85c804c269bbfa8da03ae55708
SHA1 (patch-ah) = 43303314778c4e921e9f9457c34e564acfcd1e69

20
graphics/gnuplot/patches/patch-ah Normal file
View file

@ -0,0 +1,20 @@
$NetBSD: patch-ah,v 1.1 2011/01/06 07:03:55 dholland Exp $
Add NetBSD native X and pkgsrc modular X directories to the candidate
font path list.
--- src/variable.c.orig 2008-12-15 04:18:36.000000000 +0000
+++ src/variable.c
@@ -262,6 +262,12 @@ static const struct path_table fontpath_
{ "$`kpsexpand '$TEXMFMAIN'`/fonts/type1!" },
{ "$`kpsexpand '$TEXMFDIST'`/fonts/type1!" },
#endif
+ /* NetBSD pkgsrc X.org */
+ { PKGSRC_PREFIX "/lib/X11/fonts/Type1" },
+ { PKGSRC_PREFIX "/lib/X11/fonts/truetype" },
+ /* NetBSD native X.org */
+ { "/usr/X11R7/lib/X11/fonts/Type1" },
+ { "/usr/X11R7/lib/X11/fonts/truetype" },
/* Linux paths */
{ "/usr/X11R6/lib/X11/fonts/Type1" },
{ "/usr/X11R6/lib/X11/fonts/truetype" },