pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/x11 Use default font path. Bump PKGREVISION.
details: https://anonhg.NetBSD.org/pkgsrc/rev/911816cb6385
branches: trunk
changeset: 635226:911816cb6385
user: wiz <wiz%pkgsrc.org@localhost>
date: Sun Jun 01 18:47:24 2014 +0000
description:
Use default font path. Bump PKGREVISION.
diffstat:
x11/x3270/Makefile | 8 ++++----
x11/x3270/PLIST | 36 ++++++++++++++++++------------------
x11/xfstt/Makefile | 5 ++---
x11/xfstt/distinfo | 6 +++---
x11/xfstt/patches/patch-aa | 10 +++++-----
x11/xfstt/patches/patch-ac | 6 +++---
6 files changed, 35 insertions(+), 36 deletions(-)
diffs (168 lines):
diff -r d95d4208921f -r 911816cb6385 x11/x3270/Makefile
--- a/x11/x3270/Makefile Sun Jun 01 17:56:57 2014 +0000
+++ b/x11/x3270/Makefile Sun Jun 01 18:47:24 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2014/05/20 20:05:41 gls Exp $
+# $NetBSD: Makefile,v 1.39 2014/06/01 18:47:24 wiz Exp $
DISTNAME= suite3270-3.3.14ga11-src
PKGNAME= x3270-3.3.14ga11
@@ -17,11 +17,11 @@
USE_IMAKE= yes
USE_TOOLS+= bdftopcf
-FONTS_DIRS.x11+= ${PREFIX}/lib/X11/fonts/misc
-IMAKEOPTS+= -DFontDir=${PREFIX}/lib/X11/fonts
+FONTS_DIRS.x11+= ${PREFIX}/share/fonts/X11/misc
+IMAKEOPTS+= -DFontDir=${PREFIX}/share/fonts/X11
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR}
-CONFIGURE_ARGS+= --with-fontdir=${PREFIX}/lib/X11/fonts/misc
+CONFIGURE_ARGS+= --with-fontdir=${PREFIX}/share/fonts/X11/misc
PKG_SYSCONFSUBDIR= x3270
diff -r d95d4208921f -r 911816cb6385 x11/x3270/PLIST
--- a/x11/x3270/PLIST Sun Jun 01 17:56:57 2014 +0000
+++ b/x11/x3270/PLIST Sun Jun 01 18:47:24 2014 +0000
@@ -1,23 +1,23 @@
-@comment $NetBSD: PLIST,v 1.8 2010/12/27 02:40:23 obache Exp $
+@comment $NetBSD: PLIST,v 1.9 2014/06/01 18:47:24 wiz Exp $
bin/x3270
bin/x3270if
-lib/X11/fonts/misc/3270-12.pcf.gz
-lib/X11/fonts/misc/3270-12b.pcf.gz
-lib/X11/fonts/misc/3270-20.pcf.gz
-lib/X11/fonts/misc/3270-20b.pcf.gz
-lib/X11/fonts/misc/3270.pcf.gz
-lib/X11/fonts/misc/3270b.pcf.gz
-lib/X11/fonts/misc/3270gr.pcf.gz
-lib/X11/fonts/misc/3270gt12.pcf.gz
-lib/X11/fonts/misc/3270gt12b.pcf.gz
-lib/X11/fonts/misc/3270gt16.pcf.gz
-lib/X11/fonts/misc/3270gt16b.pcf.gz
-lib/X11/fonts/misc/3270gt24.pcf.gz
-lib/X11/fonts/misc/3270gt24b.pcf.gz
-lib/X11/fonts/misc/3270gt32.pcf.gz
-lib/X11/fonts/misc/3270gt32b.pcf.gz
-lib/X11/fonts/misc/3270gt8.pcf.gz
-lib/X11/fonts/misc/3270h.pcf.gz
+share/fonts/X11/misc/3270-12.pcf.gz
+share/fonts/X11/misc/3270-12b.pcf.gz
+share/fonts/X11/misc/3270-20.pcf.gz
+share/fonts/X11/misc/3270-20b.pcf.gz
+share/fonts/X11/misc/3270.pcf.gz
+share/fonts/X11/misc/3270b.pcf.gz
+share/fonts/X11/misc/3270gr.pcf.gz
+share/fonts/X11/misc/3270gt12.pcf.gz
+share/fonts/X11/misc/3270gt12b.pcf.gz
+share/fonts/X11/misc/3270gt16.pcf.gz
+share/fonts/X11/misc/3270gt16b.pcf.gz
+share/fonts/X11/misc/3270gt24.pcf.gz
+share/fonts/X11/misc/3270gt24b.pcf.gz
+share/fonts/X11/misc/3270gt32.pcf.gz
+share/fonts/X11/misc/3270gt32b.pcf.gz
+share/fonts/X11/misc/3270gt8.pcf.gz
+share/fonts/X11/misc/3270h.pcf.gz
${IMAKE_MAN_DIR}/x3270.${IMAKE_MAN_SUFFIX}
man/man1/x3270-script.1
man/man1/x3270if.1
diff -r d95d4208921f -r 911816cb6385 x11/xfstt/Makefile
--- a/x11/xfstt/Makefile Sun Jun 01 17:56:57 2014 +0000
+++ b/x11/xfstt/Makefile Sun Jun 01 18:47:24 2014 +0000
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2014/02/08 02:53:05 wiedi Exp $
-#
+# $NetBSD: Makefile,v 1.36 2014/06/01 18:49:41 wiz Exp $
DISTNAME= xfstt-1.9
CATEGORIES= x11 net fonts
@@ -25,7 +24,7 @@
RCD_SCRIPTS= xfstt
INSTALLATION_DIRS= bin \
${PKGMANDIR}/man1 \
- lib/X11/fonts/TTF \
+ share/fonts/X11/TTF \
share/doc/xfstt \
share/examples/xfstt
diff -r d95d4208921f -r 911816cb6385 x11/xfstt/distinfo
--- a/x11/xfstt/distinfo Sun Jun 01 17:56:57 2014 +0000
+++ b/x11/xfstt/distinfo Sun Jun 01 18:47:24 2014 +0000
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.11 2012/06/13 08:15:13 mef Exp $
+$NetBSD: distinfo,v 1.12 2014/06/01 18:49:41 wiz Exp $
SHA1 (xfstt-1.9.tar.gz) = 0bc390a4908ca530b7cb4b67faad3f3abeba7a65
RMD160 (xfstt-1.9.tar.gz) = 6463f2b81846708d9f101fc384419be8cf37fbbe
Size (xfstt-1.9.tar.gz) = 286939 bytes
-SHA1 (patch-aa) = bd4f364d42acd1d0a734b12f140c5a07004c09cb
+SHA1 (patch-aa) = 8210f3929c4adbe5d2a0bdae8bfd4a1b704d1013
SHA1 (patch-ab) = 78dc21537e86e5533e747e7bab3e5280087fa43b
-SHA1 (patch-ac) = 18b4593735ce1e80c55c54a89293e672d22fceac
+SHA1 (patch-ac) = c9bfc230c6be8872da329da8ab54363b7f87cdea
SHA1 (patch-af) = e742a5461925c72e5647b8cfa8e83d1de77ac231
SHA1 (patch-ag) = 270ba4fcaecc289c8b170792481f8353d54498e2
SHA1 (patch-ah) = f563d157e5f23c3badb4e10de77e4db633b072ca
diff -r d95d4208921f -r 911816cb6385 x11/xfstt/patches/patch-aa
--- a/x11/xfstt/patches/patch-aa Sun Jun 01 17:56:57 2014 +0000
+++ b/x11/xfstt/patches/patch-aa Sun Jun 01 18:47:24 2014 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.6 2012/06/13 08:15:14 mef Exp $
+$NetBSD: patch-aa,v 1.7 2014/06/01 18:49:41 wiz Exp $
Convert hardcoded PATH to @PREFIX@
@@ -10,7 +10,7 @@
- mkdir /usr/share/fonts/truetype and put some *ttf fonts there, now
- run:
-+ mkdir @PREFIX@/lib/X11/fonts/TTF and put some *ttf fonts
++ mkdir @PREFIX@/share/fonts/X11/TTF and put some *ttf fonts
+ there, now run:
make xfstt && make install
@@ -22,12 +22,12 @@
- Copy *.ttf fonts into the /usr/share/fonts/truetype/ directory or
- put some softlinks to font directories in there. A typical example
- is:
-+ Copy *.ttf fonts into the @PREFIX@/lib/X11/fonts/TTF/
++ Copy *.ttf fonts into the @PREFIX@/share/fonts/X11/TTF/
+ directory or put some softlinks to font directories in there.
+ A typical example is:
- ln -s /DOS/windows/fonts /usr/share/fonts/truetype/winfonts
-+ ln -s /DOS/windows/fonts @PREFIX@/lib/X11/fonts/TTF/winfonts
++ ln -s /DOS/windows/fonts @PREFIX@/share/fonts/X11/TTF/winfonts
Now run "xfstt --sync" in order to have the new fonts recognized.
Adding fonts while xfstt is running doesn't work yet.
@@ -37,7 +37,7 @@
- Create some subdirectories in /usr/share/fonts/truetype, e.g.
- modern, script, brush, old, symbol, ...
-+ Create some subdirectories in @PREFIX@/lib/X11/fonts/TTF,
++ Create some subdirectories in @PREFIX@/share/fonts/X11/TTF,
+ e.g. modern, script, brush, old, symbol, ...
and put the appropriate fonts in there. The corresponding font
names will be -modern-*, -script-*, -brush-* and so on.
diff -r d95d4208921f -r 911816cb6385 x11/xfstt/patches/patch-ac
--- a/x11/xfstt/patches/patch-ac Sun Jun 01 17:56:57 2014 +0000
+++ b/x11/xfstt/patches/patch-ac Sun Jun 01 18:47:24 2014 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.6 2012/06/13 08:15:14 mef Exp $
+$NetBSD: patch-ac,v 1.7 2014/06/01 18:49:41 wiz Exp $
Adjust fontdir and cachedir to pkgsrc style.
@@ -10,8 +10,8 @@
top_srcdir = @top_srcdir@
-fontdir = $(datadir)/fonts/truetype
-cachedir = $(localstatedir)/cache/xfstt
-+fontdir = $(prefix)/lib/X11/fonts/TTF
-+cachedir = $(prefix)/lib/X11/fonts/TTF
++fontdir = $(prefix)/share/fonts/X11/TTF
++cachedir = $(prefix)/share/fonts/X11/TTF
pidfile = $(localstatedir)/run/xfstt.pid
LDADD = @LIBINTL@ -L$(top_builddir)/libfstt -lfstt
AM_CPPFLAGS = -DLOCALEDIR=\""$(localedir)\"" -DFONTDIR=\""$(fontdir)\"" \
Home |
Main Index |
Thread Index |
Old Index