[pkgsrc/trunk]: pkgsrc Update font path reference. Bump PKGREVISION.

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc Update font path reference. Bump PKGREVISION.
From: wiz <wiz%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 15:57:25 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/d95d4208921f
branches:  trunk
changeset: 635225:d95d4208921f
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sun Jun 01 17:56:57 2014 +0000

description:
Update font path reference. Bump PKGREVISION.

diffstat:

 multimedia/dvd-slideshow/Makefile    |   6 +++---
 multimedia/vlc/Makefile              |   6 +++---
 multimedia/vlc2/Makefile             |   6 +++---
 net/tightvnc/Makefile                |   6 +++---
 print/acroread7/Makefile             |   6 +++---
 print/acroread8/Makefile             |   6 +++---
 print/acroread9/Makefile             |   6 +++---
 print/xpdf-korean/Makefile           |   9 ++++-----
 sysutils/grub2/Makefile              |   9 ++++-----
 x11/mlterm/Makefile                  |   3 ++-
 x11/mlterm/distinfo                  |   4 ++--
 x11/mlterm/patches/patch-etc_font-fb |  10 +++++-----
 12 files changed, 38 insertions(+), 39 deletions(-)

diffs (265 lines):

diff -r c43df146ef39 -r d95d4208921f multimedia/dvd-slideshow/Makefile
--- a/multimedia/dvd-slideshow/Makefile Sun Jun 01 17:55:33 2014 +0000
+++ b/multimedia/dvd-slideshow/Makefile Sun Jun 01 17:56:57 2014 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2012/10/08 09:20:59 asau Exp $
+# $NetBSD: Makefile,v 1.16 2014/06/01 17:58:14 wiz Exp $
 # FreeBSD Id: ports/multimedia/dvd-slideshow/Makefile,v 1.12 2007/09/23 04:42:06 edwin Exp
 
 DISTNAME=      dvd-slideshow-0.7.5
-PKGREVISION=   10
+PKGREVISION=   11
 CATEGORIES=    multimedia
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=dvd-slideshow/}
 
@@ -39,7 +39,7 @@
 SUBST_CLASSES+=                        fonts
 SUBST_STAGE.fonts=             post-configure
 SUBST_FILES.fonts=             dvd-menu dvd-slideshow
-SUBST_SED.fonts=               -e 's,/usr/share/fonts/,${X11BASE}/lib/X11/fonts/,g'
+SUBST_SED.fonts=               -e 's,/usr/share/fonts/,${PREFIX}/share/fonts/,g'
 SUBST_MESSAGE.fonts=   Fixing hardcoded fonts paths.
 
 SUBST_CLASSES+=                        pipeline
diff -r c43df146ef39 -r d95d4208921f multimedia/vlc/Makefile
--- a/multimedia/vlc/Makefile   Sun Jun 01 17:55:33 2014 +0000
+++ b/multimedia/vlc/Makefile   Sun Jun 01 17:56:57 2014 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.173 2014/05/29 23:37:01 wiz Exp $
+# $NetBSD: Makefile,v 1.174 2014/06/01 17:56:57 wiz Exp $
 
 DISTNAME=              vlc-${VLC_VERSION}
-PKGREVISION=           45
+PKGREVISION=           46
 CATEGORIES=            multimedia
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=vlc/} \
                        http://download.videolan.org/pub/videolan/vlc/${VLC_VERSION}/
@@ -85,7 +85,7 @@
 # Let's use dejavu-ttf as it has nice unicode support
 #
 ORIGFNT=               /usr/share/fonts/truetype/freefont/FreeSerifBold.ttf
-DEFAULT_FONT?=         ${PREFIX}/lib/X11/fonts/TTF/DejaVuSans.ttf
+DEFAULT_FONT?=         ${PREFIX}/share/fonts/X11/TTF/DejaVuSans.ttf
 DEPENDS+=              dejavu-ttf>=2.26:../../fonts/dejavu-ttf
 
 SUBST_CLASSES+=                oss
diff -r c43df146ef39 -r d95d4208921f multimedia/vlc2/Makefile
--- a/multimedia/vlc2/Makefile  Sun Jun 01 17:55:33 2014 +0000
+++ b/multimedia/vlc2/Makefile  Sun Jun 01 17:56:57 2014 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.56 2014/05/29 23:37:02 wiz Exp $
+# $NetBSD: Makefile,v 1.57 2014/06/01 17:56:57 wiz Exp $
 
 DISTNAME=              vlc-${VLC_VERSION}
-PKGREVISION=           10
+PKGREVISION=           11
 CATEGORIES=            multimedia
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=vlc/} \
                        http://download.videolan.org/pub/videolan/vlc/${VLC_VERSION}/
@@ -88,7 +88,7 @@
 # Let's use dejavu-ttf as it has nice unicode support
 #
 ORIGFNT=               /usr/share/fonts/truetype/freefont/FreeSerifBold.ttf
-DEFAULT_FONT?=         ${PREFIX}/lib/X11/fonts/TTF/DejaVuSans.ttf
+DEFAULT_FONT?=         ${PREFIX}/share/fonts/X11/TTF/DejaVuSans.ttf
 DEPENDS+=              dejavu-ttf>=2.26:../../fonts/dejavu-ttf
 
 SUBST_CLASSES+=                oss
diff -r c43df146ef39 -r d95d4208921f net/tightvnc/Makefile
--- a/net/tightvnc/Makefile     Sun Jun 01 17:55:33 2014 +0000
+++ b/net/tightvnc/Makefile     Sun Jun 01 17:56:57 2014 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.45 2014/05/29 23:37:12 wiz Exp $
+# $NetBSD: Makefile,v 1.46 2014/06/01 18:04:07 wiz Exp $
 
 DISTNAME=              tightvnc-1.3.10
-PKGREVISION=           11
+PKGREVISION=           12
 CATEGORIES=            net x11
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=vnc-tight/}
 DISTFILES=             ${DISTNAME}_unixsrc.tar.bz2
@@ -44,7 +44,7 @@
 .else
 RGBPATH=               ${X11BASE}/lib/X11/rgb
 .endif
-FONTPATH=              ${X11BASE}/share/fonts/X11/misc,${X11BASE}/share/fonts/X11/75dpi,${X11BASE}/lib/X11/fonts/misc,${X11BASE}/lib/X11/fonts/75dpi
+FONTPATH=              ${PREFIX}/share/fonts/X11/misc,${PREFIX}/share/fonts/X11/75dpi,${X11BASE}/lib/X11/fonts/misc,${X11BASE}/lib/X11/fonts/75dpi
 
 SUBST_CLASSES+=                hpath
 SUBST_STAGE.hpath=     pre-configure
diff -r c43df146ef39 -r d95d4208921f print/acroread7/Makefile
--- a/print/acroread7/Makefile  Sun Jun 01 17:55:33 2014 +0000
+++ b/print/acroread7/Makefile  Sun Jun 01 17:56:57 2014 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2012/10/08 13:45:35 asau Exp $
+# $NetBSD: Makefile,v 1.26 2014/06/01 18:06:13 wiz Exp $
 
 DISTNAME=      acroread7       # overridden below
 PKGNAME=       acroread7-7.0.9
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    print
 MASTER_SITES=  http://ardownload.adobe.com/pub/adobe/reader/unix/7x/7.0.9/enu/
 
@@ -39,7 +39,7 @@
 
 # Additional directories to search for fonts
 BUILD_DEFS+=           ACROREAD_FONTPATH
-ACROREAD_FONTPATH?=    ${PREFIX}/lib/X11/fonts/TTF
+ACROREAD_FONTPATH?=    ${PREFIX}/share/fonts/X11/TTF
 
 INSTALLATION_DIRS=     bin Acrobat7
 
diff -r c43df146ef39 -r d95d4208921f print/acroread8/Makefile
--- a/print/acroread8/Makefile  Sun Jun 01 17:55:33 2014 +0000
+++ b/print/acroread8/Makefile  Sun Jun 01 17:56:57 2014 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2012/10/08 13:45:35 asau Exp $
+# $NetBSD: Makefile,v 1.15 2014/06/01 18:06:14 wiz Exp $
 
 DISTNAME=      acroread8       # overridden below
 PKGNAME=       acroread8-8.1.7
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    print
 MASTER_SITES=  http://ardownload.adobe.com/pub/adobe/reader/unix/8.x/8.1.7/enu/
 
@@ -45,7 +45,7 @@
 
 # Additional directories to search for fonts
 BUILD_DEFS+=           ACROREAD_FONTPATH
-ACROREAD_FONTPATH?=    ${PREFIX}/lib/X11/fonts/TTF
+ACROREAD_FONTPATH?=    ${PREFIX}/share/fonts/X11/TTF
 
 INSTALLATION_DIRS=     Acrobat8 bin
 
diff -r c43df146ef39 -r d95d4208921f print/acroread9/Makefile
--- a/print/acroread9/Makefile  Sun Jun 01 17:55:33 2014 +0000
+++ b/print/acroread9/Makefile  Sun Jun 01 17:56:57 2014 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2014/04/08 10:12:10 obache Exp $
+# $NetBSD: Makefile,v 1.14 2014/06/01 18:06:14 wiz Exp $
 
 DISTNAME=      acroread9       # overridden below
 PKGNAME=       acroread9-9.5.5
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    print
 MASTER_SITES=  http://ardownload.adobe.com/pub/adobe/reader/unix/9.x/${PKGVERSION_NOREV}/enu/
 
@@ -40,7 +40,7 @@
 
 # Additional directories to search for fonts
 BUILD_DEFS+=           ACROREAD_FONTPATH
-ACROREAD_FONTPATH?=    ${PREFIX}/lib/X11/fonts/TTF
+ACROREAD_FONTPATH?=    ${PREFIX}/share/fonts/X11/TTF
 
 INSTALLATION_DIRS=     Acrobat9 bin ${PKGMANDIR}/man1
 
diff -r c43df146ef39 -r d95d4208921f print/xpdf-korean/Makefile
--- a/print/xpdf-korean/Makefile        Sun Jun 01 17:55:33 2014 +0000
+++ b/print/xpdf-korean/Makefile        Sun Jun 01 17:56:57 2014 +0000
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2012/10/08 13:45:49 asau Exp $
-#
+# $NetBSD: Makefile,v 1.22 2014/06/01 18:07:15 wiz Exp $
 
 DISTNAME=      xpdf-korean-2005-jul-07
 PKGNAME=       xpdf-korean-20050707
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    print
 MASTER_SITES=  ftp://ftp.foolabs.com/pub/xpdf/ \
                http://gd.tuwien.ac.at/publishing/xpdf/
@@ -24,8 +23,8 @@
 post-patch:
        ${MV} ${WRKSRC}/add-to-xpdfrc ${WRKSRC}/add-to-xpdfrc.orig
        ${SED} -e 's:/usr/local:'${PREFIX}':g' < ${WRKSRC}/add-to-xpdfrc.orig > ${WRKSRC}/add-to-xpdfrc
-       ${ECHO} "displayCIDFontTT       Adobe-Korea1    ${PREFIX}/lib/X11/fonts/TTF/batang.ttf" >> ${WRKSRC}/add-to-xpdfrc
-       ${ECHO} "displayCIDFontTT       Unidocs-Korea1  ${PREFIX}/lib/X11/fonts/TTF/batang.ttf" >> ${WRKSRC}/add-to-xpdfrc
+       ${ECHO} "displayCIDFontTT       Adobe-Korea1    ${PREFIX}/share/fonts/X11/TTF/batang.ttf" >> ${WRKSRC}/add-to-xpdfrc
+       ${ECHO} "displayCIDFontTT       Unidocs-Korea1  ${PREFIX}/share/fonts/X11/TTF/batang.ttf" >> ${WRKSRC}/add-to-xpdfrc
 
 do-install:
        ${INSTALL_DATA} ${WRKSRC}/Adobe-Korea1.cidToUnicode \
diff -r c43df146ef39 -r d95d4208921f sysutils/grub2/Makefile
--- a/sysutils/grub2/Makefile   Sun Jun 01 17:55:33 2014 +0000
+++ b/sysutils/grub2/Makefile   Sun Jun 01 17:56:57 2014 +0000
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2014/02/19 09:44:56 jperkin Exp $
-#
+# $NetBSD: Makefile,v 1.6 2014/06/01 18:08:24 wiz Exp $
 
 DISTNAME=              grub-2.00
-PKGNAME=               grub2-2.00
-PKGREVISION=           2
+PKGNAME=               ${DISTNAME:S/grub/grub2/}
+PKGREVISION=           3
 CATEGORIES=            sysutils
 MASTER_SITES=          ftp://ftp.gnu.org/gnu/grub/
 DISTFILES=             ${DISTNAME}${EXTRACT_SUFX}
@@ -128,7 +127,7 @@
 SUBST_STAGE.fix-dejavu=                pre-configure
 SUBST_MESSAGE.fix-dejavu=      Fixing dejavu search paths in configure.
 SUBST_FILES.fix-dejavu=                configure
-SUBST_SED.fix-dejavu=          -e 's, \(/usr/share/fonts/dejavu\);, \1 ${PREFIX}/lib/X11/fonts/TTF;,g'
+SUBST_SED.fix-dejavu=          -e 's, \(/usr/share/fonts/dejavu\);, \1 ${PREFIX}/share/fonts/X11/TTF;,g'
 
 #
 # Do not use `\t' with sed, as it's not portable.
diff -r c43df146ef39 -r d95d4208921f x11/mlterm/Makefile
--- a/x11/mlterm/Makefile       Sun Jun 01 17:55:33 2014 +0000
+++ b/x11/mlterm/Makefile       Sun Jun 01 17:56:57 2014 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.106 2014/06/01 16:00:30 tsutsui Exp $
+# $NetBSD: Makefile,v 1.107 2014/06/01 18:11:35 wiz Exp $
 
 DISTNAME=      mlterm-3.3.6
+PKGREVISION=   1
 CATEGORIES=    x11
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=mlterm/}
 
diff -r c43df146ef39 -r d95d4208921f x11/mlterm/distinfo
--- a/x11/mlterm/distinfo       Sun Jun 01 17:55:33 2014 +0000
+++ b/x11/mlterm/distinfo       Sun Jun 01 17:56:57 2014 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.46 2014/06/01 16:00:30 tsutsui Exp $
+$NetBSD: distinfo,v 1.47 2014/06/01 18:11:35 wiz Exp $
 
 SHA1 (mlterm-3.3.6.tar.gz) = 02ce7544c17aa6c33ddc4ad4e103d2e2bbfde85a
 RMD160 (mlterm-3.3.6.tar.gz) = a4145851a09595f1c07c9151f939a30fc55865bb
 Size (mlterm-3.3.6.tar.gz) = 3600399 bytes
 SHA1 (patch-configure) = 5e3b0c709d447c49b0d26c40bde8ded4ade013c3
-SHA1 (patch-etc_font-fb) = 7e5c1ced916fdb2b6da1dc86dd37d7bad5a7ede7
+SHA1 (patch-etc_font-fb) = c9f116aae7640807f4adc4042adc49ddd9805e67
diff -r c43df146ef39 -r d95d4208921f x11/mlterm/patches/patch-etc_font-fb
--- a/x11/mlterm/patches/patch-etc_font-fb      Sun Jun 01 17:55:33 2014 +0000
+++ b/x11/mlterm/patches/patch-etc_font-fb      Sun Jun 01 17:56:57 2014 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-etc_font-fb,v 1.6 2014/03/23 07:04:00 tsutsui Exp $
+$NetBSD: patch-etc_font-fb,v 1.7 2014/06/01 18:11:36 wiz Exp $
 
 add more examples for typical NetBSD and pkgsrc installation
 
@@ -6,7 +6,7 @@
 +++ etc/font-fb
 @@ -1,10 +1,17 @@
  #DEFAULT = /usr/share/fonts/X11/misc/unifont.pcf.gz:100
-+#DEFAULT = /usr/pkg/lib/X11/fonts/efont/b16.pcf.gz
++#DEFAULT = /usr/pkg/share/fonts/X11/efont/b16.pcf.gz
  
  #ISO8859_1 = /usr/share/fonts/X11/misc/mplus_f12r.pcf.gz
 +#ISO8859_1 = /usr/X11R7/lib/X11/fonts/misc/8x16.pcf.gz
@@ -16,9 +16,9 @@
  JISC6226_1978 = &JISX0208_1983
  JISX0208_1990 = &JISX0208_1983
  JISX0213_2000_1 = &JISX0208_1983
-+#JISX0213_2000_1=/usr/pkg/lib/X11/fonts/local/jiskan16-2000-1.pcf.gz
-+#JISX0213_2000_2=/usr/pkg/lib/X11/fonts/local/jiskan16-2000-2.pcf.gz
++#JISX0213_2000_1=/usr/pkg/share/fonts/X11/local/jiskan16-2000-1.pcf.gz
++#JISX0213_2000_2=/usr/pkg/share/fonts/X11/local/jiskan16-2000-2.pcf.gz
  
  #ISO10646_UCS4_1 = /usr/share/fonts/X11/misc/unifont.pcf.gz:100
-+#ISO10646_UCS4_1 = /usr/pkg/lib/X11/fonts/efont/b16.pcf.gz
++#ISO10646_UCS4_1 = /usr/pkg/share/fonts/X11/efont/b16.pcf.gz
  ISO10646_UCS4_1_FULLWIDTH = &ISO10646_UCS4_1
Prev by Date: [pkgsrc/trunk]: pkgsrc/misc/ruby-daemons Update ruby-daemons to 1.2.1.
Next by Date: [pkgsrc/trunk]: pkgsrc/mk/check Fixes floating point exceptions on VAX.
Previous by Thread: [pkgsrc/trunk]: pkgsrc/misc/ruby-daemons Update ruby-daemons to 1.2.1.
Next by Thread: [pkgsrc/trunk]: pkgsrc/mk/check Fixes floating point exceptions on VAX.
Indexes:
Home | Main Index | Thread Index | Old Index