diff options
| -rw-r--r-- | mk/defaults/mk.conf | 6 | ||||
| -rw-r--r-- | mk/pkginstall/fonts | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/mk/defaults/mk.conf b/mk/defaults/mk.conf index b225240fb7b..899cd224e35 100644 --- a/mk/defaults/mk.conf +++ b/mk/defaults/mk.conf @@ -1,4 +1,4 @@ -# $NetBSD: mk.conf,v 1.239 2014/04/06 15:04:16 khorben Exp $ +# $NetBSD: mk.conf,v 1.240 2014/06/01 16:56:47 wiz Exp $ # # This file provides default values for variables that may be overridden @@ -626,10 +626,10 @@ WARN_NO_OBJECT_FMT?=yes # Definitions used only in the packages collection # -#ACROREAD_FONTPATH?= ${PREFIX}/lib/X11/fonts/TTF +#ACROREAD_FONTPATH?= ${PREFIX}/share/fonts/X11/TTF # Colon separated list of additional directories for acroread7 to # look in for TTF/Type1 fonts. -# Default: ${PREFIX}/lib/X11/fonts/TTF +# Default: ${PREFIX}/share/fonts/X11/TTF AMANDA_USER?= amandabackup # Used in the amanda packages to specify the login user and group diff --git a/mk/pkginstall/fonts b/mk/pkginstall/fonts index 0a3639f4791..f61bbe79ff8 100644 --- a/mk/pkginstall/fonts +++ b/mk/pkginstall/fonts @@ -1,4 +1,4 @@ -# $NetBSD: fonts,v 1.6 2010/04/23 12:47:14 jmmv Exp $ +# $NetBSD: fonts,v 1.7 2014/06/01 16:57:27 wiz Exp $ # # Generate a +FONTS script that updates font databases for the package. # @@ -17,9 +17,9 @@ UNPACK,|UNPACK,+FONTS) # Lines starting with "# FONTS: " are data read by this script that name # the directories in which the font database will be rebuilt. # -# # FONTS: /usr/pkg/lib/X11/fonts/TTF ttf -# # FONTS: /usr/pkg/lib/X11/fonts/Type1 type1 -# # FONTS: /usr/pkg/lib/X11/fonts/misc x11 +# # FONTS: /usr/pkg/share/fonts/X11/TTF ttf +# # FONTS: /usr/pkg/share/fonts/X11/Type1 type1 +# # FONTS: /usr/pkg/share/fonts/X11/misc x11 # # For each FONTS entry, if the path is relative, that it is taken to be # relative to ${PKG_PREFIX}. |