Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 2 Oct 2019 08:46:19 +0000 (UTC)
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r513559 - in head: . textproc/groff textproc/groff/files
Message-ID:  <201910020846.x928kJH1080249@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bapt
Date: Wed Oct  2 08:46:19 2019
New Revision: 513559
URL: https://svnweb.freebsd.org/changeset/ports/513559

Log:
  groff: remove X11 option and dependency
  
  Now that groff is required for manpages that are not supported by mandoc
  the default dependency on X11 has become a big concern for many people.
  
  From now the entire X11 option has been removed as it is only needed for
  legacy part of groff that have little end user value.
  
  The other part that was dragging in all the X11 dependencies was the ghostscript
  dependency which is needed for 2 cases:
  1. find the path of the urw fonts which is needed for pdf generation. the
  configure script has been patched to stop using ghostscript to find that path,
  but directly use the one provided.
  2. the html driver which calls at runtime the gs binary along with some binaries
  provided by the netpbm package. Given how little use it is, add a message to
  tell the users to manually install ghostscript and netpbm as optional dependency
  if they do need to use groff -Thtml.
  
  Requested by:	many

Added:
  head/textproc/groff/files/patch-configure   (contents, props changed)
  head/textproc/groff/pkg-message   (contents, props changed)
Modified:
  head/UPDATING
  head/textproc/groff/Makefile
  head/textproc/groff/pkg-plist

Modified: head/UPDATING
==============================================================================
--- head/UPDATING	Wed Oct  2 08:40:32 2019	(r513558)
+++ head/UPDATING	Wed Oct  2 08:46:19 2019	(r513559)
@@ -5,6 +5,17 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20191002:
+  AFFECTS: users of groff
+  AUTHOR: bapt@FreeBSD.org
+
+  with groff 1.2.4_3, groff does not depends anymore on ghostscript and
+  netpbm. In order to be able to properly use the html backend the user
+  can install ghostscript and netpbm from ports without the need of
+  reinstalling the package.
+
+  Also note that the X11 option has been removed.
+
 20190930:
   AFFECTS: users of NetBox
   AUTHOR: kai@FreeBSD.org

Modified: head/textproc/groff/Makefile
==============================================================================
--- head/textproc/groff/Makefile	Wed Oct  2 08:40:32 2019	(r513558)
+++ head/textproc/groff/Makefile	Wed Oct  2 08:46:19 2019	(r513559)
@@ -3,7 +3,7 @@
 
 PORTNAME=	groff
 PORTVERSION=	1.22.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc
 MASTER_SITES=	GNU
 
@@ -12,23 +12,26 @@ COMMENT=	Software typesetting package
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	psselect:print/psutils
+BUILD_DEPENDS=	psselect:print/psutils \
+		gsfonts>=0:print/gsfonts
+LIB_DEPENDS=	libuchardet.so:textproc/uchardet
 RUN_DEPENDS:=	psselect:print/psutils
 
 MAKE_JOBS_UNSAFE=	yes
 
-USES=		cpe gmake perl5 shebangfix makeinfo
+USES=		cpe gmake perl5 makeinfo
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--with-awk=/usr/bin/awk
-CONFIGURE_ENV+=	PERLPATH=${perl_CMD} # shebangfix
+CONFIGURE_ARGS+=	--with-urw-fonts-dir=${LOCALBASE}/share/ghostscript/fonts/ \
+			--with-awk=/usr/bin/awk \
+			--without-x \
+			--without-gs \
+			pnmcrop=missing \
+			pnmcut=missing \
+			pnmtopng=missing \
+			pnmtops=missing \
+			psselect=missing
 
 CPE_VENDOR=	gnu
-SHEBANG_FILES=	src/utils/afmtodit/afmtodit.pl \
-		contrib/mm/mmroff.pl \
-		font/devps/generate/symbol.sed
-SHEBANG_LANG=	sed
-sed_OLD_CMD=	/bin/sed
-sed_CMD=	/usr/bin/sed
 
 .ifdef QEMU_EMULATING
 # XXX bug 224740: configure hangs: GSlice: failed to allocate 496 bytes (alignment: 512)
@@ -43,11 +46,6 @@ PAPERSIZE=A4
 CONFIGURE_ENV+=	PAGE=${PAPERSIZE}
 .endif
 
-OPTIONS_DEFINE=	X11 URWFONTS
-X11_DESC=	X11 devices (-TX*) and gxditview
-URWFONTS_DESC=	URW fonts support (needed for growpdf)
-OPTIONS_DEFAULT=	X11 URWFONTS
-
 CONFLICTS=	ja-groff-[0-9]*
 
 INFO=	groff
@@ -56,30 +54,8 @@ DATADIR=	${PREFIX}/share/${PORTNAME}/${PORTVERSION}
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION}
 EXAMPLESDIR=	${DOCSDIR}/examples
 
-URWFONTS_CONFIGURE_OFF= --without-urw-fonts-dir --without-gs
-URWFONTS_USES=	ghostscript:build
-URWFONTS_BUILD_DEPENDS=	gsfonts>=0:print/gsfonts
-OPTIONS_SUB=	yes
-
-.include <bsd.port.options.mk>
-
-.if ! ${PORT_OPTIONS:MX11}
-CONFIGURE_ARGS+=--without-x
-.if exists(${LOCALBASE}/bin/pnmcut) && exists(${LOCALBASE}/bin/pnmcrop) && \
-    exists(${LOCALBASE}/bin/pnmtops) && exists(${LOCALBASE}/bin/pnmtopng)
-PLIST_SUB+=	HTMLDOCS=""
-.else
-PLIST_SUB+=	HTMLDOCS="@comment "
-.endif
-.else
-USE_XORG=	x11 xaw xmu
-BUILD_DEPENDS+=	${LOCALBASE}/bin/pnmtops:graphics/netpbm
-RUN_DEPENDS+=	${LOCALBASE}/bin/pnmtops:graphics/netpbm
-CONFIGURE_ARGS+=--with-x --with-appresdir=${PREFIX}/lib/X11/app-defaults
-PLIST_SUB+=	HTMLDOCS=""
-.endif
-
 post-install:
-	${INSTALL_DATA} ${FILESDIR}/mdoc.local ${STAGEDIR}/${PREFIX}/share/groff/site-tmac
+	${INSTALL_DATA} ${FILESDIR}/mdoc.local ${STAGEDIR}${PREFIX}/share/groff/site-tmac
+	${REINPLACE_CMD} -i "" -e "s/missing/gs/" ${STAGEDIR}${DATADIR}/font/devhtml/DESC
 
 .include <bsd.port.mk>

Added: head/textproc/groff/files/patch-configure
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/textproc/groff/files/patch-configure	Wed Oct  2 08:46:19 2019	(r513559)
@@ -0,0 +1,28 @@
+--- configure.orig	2018-12-23 14:34:25 UTC
++++ configure
+@@ -24750,11 +24750,11 @@ $as_echo_n "checking whether URW fonts in pfb format a
+ 
+ 
+    groff_have_urw_fonts=no
+-   if test "$AWK" = "missing" -o "$GHOSTSCRIPT" = "missing"; then
+-     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: awk and gs are required, can't look for URW fonts" >&5
+-$as_echo "$as_me: WARNING: awk and gs are required, can't look for URW fonts" >&2;}
+-   else
+-     _list_paths=`$GHOSTSCRIPT -h | $AWK 'BEGIN { found = 0 } /Search path:/ { found = 1 } /^ *\// { print $'0' }'| tr : ' '`
++  # if test "$AWK" = "missing" -o "$GHOSTSCRIPT" = "missing"; then
++  #   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: awk and gs are required, can't look for URW fonts" >&5
++#$as_echo "$as_me: WARNING: awk and gs are required, can't look for URW fonts" >&2;}
++  # else
++#     _list_paths=`$GHOSTSCRIPT -h | $AWK 'BEGIN { found = 0 } /Search path:/ { found = 1 } /^ *\// { print $'0' }'| tr : ' '`
+      _list_paths="$_list_paths /usr/share/fonts/type1/gsfonts/ \
+                /opt/local/share/fonts/urw-fonts/"
+      if test -n "$urwfontsdir"; then
+@@ -24768,7 +24768,7 @@ $as_echo "found in $k" >&6; }
+          break
+        fi
+      done
+-   fi
++  # fi
+    if test $groff_have_urw_fonts = no; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }

Added: head/textproc/groff/pkg-message
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/textproc/groff/pkg-message	Wed Oct  2 08:46:19 2019	(r513559)
@@ -0,0 +1,21 @@
+[
+{
+	type: install,
+	message: <<EOD
+In order to be able to use the html driver, you need to install the following
+packages:
+ - ghostscript
+ - netpbm
+EOD
+},
+{
+	type: upgrade,
+	maximum_version = "1.2.4_3",
+	message: <<EOD
+In order to be able to use the html driver, you need to install the following
+packages:
+ - ghostscript
+ - netpbm
+EOD
+}
+]

Modified: head/textproc/groff/pkg-plist
==============================================================================
--- head/textproc/groff/pkg-plist	Wed Oct  2 08:40:32 2019	(r513558)
+++ head/textproc/groff/pkg-plist	Wed Oct  2 08:46:19 2019	(r513559)
@@ -18,7 +18,6 @@ bin/grolj4
 bin/gropdf
 bin/grops
 bin/grotty
-%%X11%%bin/gxditview
 bin/hpftodit
 bin/indxbib
 bin/lkbib
@@ -45,7 +44,6 @@ bin/soelim
 bin/tbl
 bin/tfmtodit
 bin/troff
-%%X11%%bin/xtotroff
 lib/groff/glilypond/args.pl
 lib/groff/glilypond/oop_fh.pl
 lib/groff/glilypond/subs.pl
@@ -58,8 +56,6 @@ lib/groff/groffer/split_env.sh
 lib/groff/groffer/subs.pl
 lib/groff/groffer/version.sh
 lib/groff/grog/subs.pl
-%%X11%%lib/X11/app-defaults/GXditview
-%%X11%%lib/X11/app-defaults/GXditview-color
 man/man1/addftinfo.1.gz
 man/man1/afmtodit.1.gz
 man/man1/chem.1.gz
@@ -81,7 +77,6 @@ man/man1/grolj4.1.gz
 man/man1/gropdf.1.gz
 man/man1/grops.1.gz
 man/man1/grotty.1.gz
-%%X11%%man/man1/gxditview.1.gz
 man/man1/hpftodit.1.gz
 man/man1/indxbib.1.gz
 man/man1/lkbib.1.gz
@@ -106,7 +101,6 @@ man/man1/soelim.1.gz
 man/man1/tbl.1.gz
 man/man1/tfmtodit.1.gz
 man/man1/troff.1.gz
-%%X11%%man/man1/xtotroff.1.gz
 man/man5/groff_filenames.5.gz
 man/man5/groff_font.5.gz
 man/man5/groff_out.5.gz
@@ -210,92 +204,18 @@ man/man7/roff.7.gz
 %%EXAMPLESDIR%%/hdtbl/rainbow.roff
 %%EXAMPLESDIR%%/hdtbl/short_reference.ps
 %%EXAMPLESDIR%%/hdtbl/short_reference.roff
-%%HTMLDOCS%%%%EXAMPLESDIR%%/img/webpage1.png
-%%HTMLDOCS%%%%EXAMPLESDIR%%/img/webpage2.png
 %%EXAMPLESDIR%%/mom/README.txt
 %%EXAMPLESDIR%%/mom/elvis_syntax
 %%EXAMPLESDIR%%/mom/elvis_syntax.new
 %%EXAMPLESDIR%%/mom/letter.mom
-%%URWFONTS%%%%EXAMPLESDIR%%/mom/letter.pdf
 %%EXAMPLESDIR%%/mom/mom-pdf.mom
-%%URWFONTS%%%%EXAMPLESDIR%%/mom/mom-pdf.pdf
 %%EXAMPLESDIR%%/mom/mom.vim
 %%EXAMPLESDIR%%/mom/penguin.pdf
 %%EXAMPLESDIR%%/mom/penguin.ps
 %%EXAMPLESDIR%%/mom/sample_docs.mom
-%%URWFONTS%%%%EXAMPLESDIR%%/mom/sample_docs.pdf
 %%EXAMPLESDIR%%/mom/typesetting.mom
-%%URWFONTS%%%%EXAMPLESDIR%%/mom/typesetting.pdf
-%%HTMLDOCS%%%%EXAMPLESDIR%%/webpage-1.html
-%%HTMLDOCS%%%%EXAMPLESDIR%%/webpage-10.html
-%%HTMLDOCS%%%%EXAMPLESDIR%%/webpage-11.html
-%%HTMLDOCS%%%%EXAMPLESDIR%%/webpage-12.html
-%%HTMLDOCS%%%%EXAMPLESDIR%%/webpage-13.html
-%%HTMLDOCS%%%%EXAMPLESDIR%%/webpage-14.html
-%%HTMLDOCS%%%%EXAMPLESDIR%%/webpage-15.html
-%%HTMLDOCS%%%%EXAMPLESDIR%%/webpage-16.html
-%%HTMLDOCS%%%%EXAMPLESDIR%%/webpage-17.html
-%%HTMLDOCS%%%%EXAMPLESDIR%%/webpage-2.html
-%%HTMLDOCS%%%%EXAMPLESDIR%%/webpage-3.html
-%%HTMLDOCS%%%%EXAMPLESDIR%%/webpage-4.html
-%%HTMLDOCS%%%%EXAMPLESDIR%%/webpage-5.html
-%%HTMLDOCS%%%%EXAMPLESDIR%%/webpage-6.html
-%%HTMLDOCS%%%%EXAMPLESDIR%%/webpage-7.html
-%%HTMLDOCS%%%%EXAMPLESDIR%%/webpage-8.html
-%%HTMLDOCS%%%%EXAMPLESDIR%%/webpage-9.html
-%%HTMLDOCS%%%%EXAMPLESDIR%%/webpage.html
 %%EXAMPLESDIR%%/webpage.ms
 %%EXAMPLESDIR%%/webpage.ps
-%%HTMLDOCS%%%%DOCSDIR%%/html/img/pic1.png
-%%HTMLDOCS%%%%DOCSDIR%%/html/img/pic10.png
-%%HTMLDOCS%%%%DOCSDIR%%/html/img/pic11.png
-%%HTMLDOCS%%%%DOCSDIR%%/html/img/pic12.png
-%%HTMLDOCS%%%%DOCSDIR%%/html/img/pic13.png
-%%HTMLDOCS%%%%DOCSDIR%%/html/img/pic14.png
-%%HTMLDOCS%%%%DOCSDIR%%/html/img/pic15.png
-%%HTMLDOCS%%%%DOCSDIR%%/html/img/pic16.png
-%%HTMLDOCS%%%%DOCSDIR%%/html/img/pic17.png
-%%HTMLDOCS%%%%DOCSDIR%%/html/img/pic18.png
-%%HTMLDOCS%%%%DOCSDIR%%/html/img/pic19.png
-%%HTMLDOCS%%%%DOCSDIR%%/html/img/pic2.png
-%%HTMLDOCS%%%%DOCSDIR%%/html/img/pic20.png
-%%HTMLDOCS%%%%DOCSDIR%%/html/img/pic21.png
-%%HTMLDOCS%%%%DOCSDIR%%/html/img/pic22.png
-%%HTMLDOCS%%%%DOCSDIR%%/html/img/pic23.png
-%%HTMLDOCS%%%%DOCSDIR%%/html/img/pic24.png
-%%HTMLDOCS%%%%DOCSDIR%%/html/img/pic25.png
-%%HTMLDOCS%%%%DOCSDIR%%/html/img/pic26.png
-%%HTMLDOCS%%%%DOCSDIR%%/html/img/pic27.png
-%%HTMLDOCS%%%%DOCSDIR%%/html/img/pic28.png
-%%HTMLDOCS%%%%DOCSDIR%%/html/img/pic29.png
-%%HTMLDOCS%%%%DOCSDIR%%/html/img/pic3.png
-%%HTMLDOCS%%%%DOCSDIR%%/html/img/pic30.png
-%%HTMLDOCS%%%%DOCSDIR%%/html/img/pic31.png
-%%HTMLDOCS%%%%DOCSDIR%%/html/img/pic32.png
-%%HTMLDOCS%%%%DOCSDIR%%/html/img/pic33.png
-%%HTMLDOCS%%%%DOCSDIR%%/html/img/pic34.png
-%%HTMLDOCS%%%%DOCSDIR%%/html/img/pic35.png
-%%HTMLDOCS%%%%DOCSDIR%%/html/img/pic36.png
-%%HTMLDOCS%%%%DOCSDIR%%/html/img/pic37.png
-%%HTMLDOCS%%%%DOCSDIR%%/html/img/pic38.png
-%%HTMLDOCS%%%%DOCSDIR%%/html/img/pic39.png
-%%HTMLDOCS%%%%DOCSDIR%%/html/img/pic4.png
-%%HTMLDOCS%%%%DOCSDIR%%/html/img/pic40.png
-%%HTMLDOCS%%%%DOCSDIR%%/html/img/pic41.png
-%%HTMLDOCS%%%%DOCSDIR%%/html/img/pic42.png
-%%HTMLDOCS%%%%DOCSDIR%%/html/img/pic43.png
-%%HTMLDOCS%%%%DOCSDIR%%/html/img/pic44.png
-%%HTMLDOCS%%%%DOCSDIR%%/html/img/pic45.png
-%%HTMLDOCS%%%%DOCSDIR%%/html/img/pic47.png
-%%HTMLDOCS%%%%DOCSDIR%%/html/img/pic48.png
-%%HTMLDOCS%%%%DOCSDIR%%/html/img/pic49.png
-%%HTMLDOCS%%%%DOCSDIR%%/html/img/pic5.png
-%%HTMLDOCS%%%%DOCSDIR%%/html/img/pic50.png
-%%HTMLDOCS%%%%DOCSDIR%%/html/img/pic51.png
-%%HTMLDOCS%%%%DOCSDIR%%/html/img/pic6.png
-%%HTMLDOCS%%%%DOCSDIR%%/html/img/pic7.png
-%%HTMLDOCS%%%%DOCSDIR%%/html/img/pic8.png
-%%HTMLDOCS%%%%DOCSDIR%%/html/img/pic9.png
 %%DOCSDIR%%/html/mom/appendices.html
 %%DOCSDIR%%/html/mom/color.html
 %%DOCSDIR%%/html/mom/cover.html
@@ -319,113 +239,15 @@ man/man7/roff.7.gz
 %%DOCSDIR%%/html/mom/typesetting.html
 %%DOCSDIR%%/html/mom/using.html
 %%DOCSDIR%%/html/mom/version-2.html
-%%HTMLDOCS%%%%DOCSDIR%%/html/pic-1.html
-%%HTMLDOCS%%%%DOCSDIR%%/html/pic-10.html
-%%HTMLDOCS%%%%DOCSDIR%%/html/pic-11.html
-%%HTMLDOCS%%%%DOCSDIR%%/html/pic-12.html
-%%HTMLDOCS%%%%DOCSDIR%%/html/pic-13.html
-%%HTMLDOCS%%%%DOCSDIR%%/html/pic-14.html
-%%HTMLDOCS%%%%DOCSDIR%%/html/pic-15.html
-%%HTMLDOCS%%%%DOCSDIR%%/html/pic-16.html
-%%HTMLDOCS%%%%DOCSDIR%%/html/pic-17.html
-%%HTMLDOCS%%%%DOCSDIR%%/html/pic-18.html
-%%HTMLDOCS%%%%DOCSDIR%%/html/pic-19.html
-%%HTMLDOCS%%%%DOCSDIR%%/html/pic-2.html
-%%HTMLDOCS%%%%DOCSDIR%%/html/pic-20.html
-%%HTMLDOCS%%%%DOCSDIR%%/html/pic-21.html
-%%HTMLDOCS%%%%DOCSDIR%%/html/pic-22.html
-%%HTMLDOCS%%%%DOCSDIR%%/html/pic-23.html
-%%HTMLDOCS%%%%DOCSDIR%%/html/pic-3.html
-%%HTMLDOCS%%%%DOCSDIR%%/html/pic-4.html
-%%HTMLDOCS%%%%DOCSDIR%%/html/pic-5.html
-%%HTMLDOCS%%%%DOCSDIR%%/html/pic-6.html
-%%HTMLDOCS%%%%DOCSDIR%%/html/pic-7.html
-%%HTMLDOCS%%%%DOCSDIR%%/html/pic-8.html
-%%HTMLDOCS%%%%DOCSDIR%%/html/pic-9.html
-%%HTMLDOCS%%%%DOCSDIR%%/html/pic.html
 %%DOCSDIR%%/meintro.me
 %%DOCSDIR%%/meintro.ps
 %%DOCSDIR%%/meintro_fr.me
 %%DOCSDIR%%/meintro_fr.ps
 %%DOCSDIR%%/meref.me
 %%DOCSDIR%%/meref.ps
-%%URWFONTS%%%%DOCSDIR%%/pdf/mom-pdf.pdf
-%%URWFONTS%%%%DOCSDIR%%/pdf/pdfmark.pdf
 %%DOCSDIR%%/pic.ms
 %%DOCSDIR%%/pic.ps
 %%DATADIR%%/eign
-%%X11%%%%DATADIR%%/font/devX100-12/CB
-%%X11%%%%DATADIR%%/font/devX100-12/CBI
-%%X11%%%%DATADIR%%/font/devX100-12/CI
-%%X11%%%%DATADIR%%/font/devX100-12/CR
-%%X11%%%%DATADIR%%/font/devX100-12/DESC
-%%X11%%%%DATADIR%%/font/devX100-12/HB
-%%X11%%%%DATADIR%%/font/devX100-12/HBI
-%%X11%%%%DATADIR%%/font/devX100-12/HI
-%%X11%%%%DATADIR%%/font/devX100-12/HR
-%%X11%%%%DATADIR%%/font/devX100-12/NB
-%%X11%%%%DATADIR%%/font/devX100-12/NBI
-%%X11%%%%DATADIR%%/font/devX100-12/NI
-%%X11%%%%DATADIR%%/font/devX100-12/NR
-%%X11%%%%DATADIR%%/font/devX100-12/S
-%%X11%%%%DATADIR%%/font/devX100-12/TB
-%%X11%%%%DATADIR%%/font/devX100-12/TBI
-%%X11%%%%DATADIR%%/font/devX100-12/TI
-%%X11%%%%DATADIR%%/font/devX100-12/TR
-%%X11%%%%DATADIR%%/font/devX100/CB
-%%X11%%%%DATADIR%%/font/devX100/CBI
-%%X11%%%%DATADIR%%/font/devX100/CI
-%%X11%%%%DATADIR%%/font/devX100/CR
-%%X11%%%%DATADIR%%/font/devX100/DESC
-%%X11%%%%DATADIR%%/font/devX100/HB
-%%X11%%%%DATADIR%%/font/devX100/HBI
-%%X11%%%%DATADIR%%/font/devX100/HI
-%%X11%%%%DATADIR%%/font/devX100/HR
-%%X11%%%%DATADIR%%/font/devX100/NB
-%%X11%%%%DATADIR%%/font/devX100/NBI
-%%X11%%%%DATADIR%%/font/devX100/NI
-%%X11%%%%DATADIR%%/font/devX100/NR
-%%X11%%%%DATADIR%%/font/devX100/S
-%%X11%%%%DATADIR%%/font/devX100/TB
-%%X11%%%%DATADIR%%/font/devX100/TBI
-%%X11%%%%DATADIR%%/font/devX100/TI
-%%X11%%%%DATADIR%%/font/devX100/TR
-%%X11%%%%DATADIR%%/font/devX75-12/CB
-%%X11%%%%DATADIR%%/font/devX75-12/CBI
-%%X11%%%%DATADIR%%/font/devX75-12/CI
-%%X11%%%%DATADIR%%/font/devX75-12/CR
-%%X11%%%%DATADIR%%/font/devX75-12/DESC
-%%X11%%%%DATADIR%%/font/devX75-12/HB
-%%X11%%%%DATADIR%%/font/devX75-12/HBI
-%%X11%%%%DATADIR%%/font/devX75-12/HI
-%%X11%%%%DATADIR%%/font/devX75-12/HR
-%%X11%%%%DATADIR%%/font/devX75-12/NB
-%%X11%%%%DATADIR%%/font/devX75-12/NBI
-%%X11%%%%DATADIR%%/font/devX75-12/NI
-%%X11%%%%DATADIR%%/font/devX75-12/NR
-%%X11%%%%DATADIR%%/font/devX75-12/S
-%%X11%%%%DATADIR%%/font/devX75-12/TB
-%%X11%%%%DATADIR%%/font/devX75-12/TBI
-%%X11%%%%DATADIR%%/font/devX75-12/TI
-%%X11%%%%DATADIR%%/font/devX75-12/TR
-%%X11%%%%DATADIR%%/font/devX75/CB
-%%X11%%%%DATADIR%%/font/devX75/CBI
-%%X11%%%%DATADIR%%/font/devX75/CI
-%%X11%%%%DATADIR%%/font/devX75/CR
-%%X11%%%%DATADIR%%/font/devX75/DESC
-%%X11%%%%DATADIR%%/font/devX75/HB
-%%X11%%%%DATADIR%%/font/devX75/HBI
-%%X11%%%%DATADIR%%/font/devX75/HI
-%%X11%%%%DATADIR%%/font/devX75/HR
-%%X11%%%%DATADIR%%/font/devX75/NB
-%%X11%%%%DATADIR%%/font/devX75/NBI
-%%X11%%%%DATADIR%%/font/devX75/NI
-%%X11%%%%DATADIR%%/font/devX75/NR
-%%X11%%%%DATADIR%%/font/devX75/S
-%%X11%%%%DATADIR%%/font/devX75/TB
-%%X11%%%%DATADIR%%/font/devX75/TBI
-%%X11%%%%DATADIR%%/font/devX75/TI
-%%X11%%%%DATADIR%%/font/devX75/TR
 %%DATADIR%%/font/devascii/B
 %%DATADIR%%/font/devascii/BI
 %%DATADIR%%/font/devascii/DESC
@@ -574,85 +396,64 @@ man/man7/roff.7.gz
 %%DATADIR%%/font/devlj4/generate/symbol.map
 %%DATADIR%%/font/devlj4/generate/text.map
 %%DATADIR%%/font/devlj4/generate/wingdings.map
-%%URWFONTS%%%%DATADIR%%/font/devpdf/AB
-%%URWFONTS%%%%DATADIR%%/font/devpdf/ABI
-%%URWFONTS%%%%DATADIR%%/font/devpdf/AI
-%%URWFONTS%%%%DATADIR%%/font/devpdf/AR
-%%URWFONTS%%%%DATADIR%%/font/devpdf/BMB
-%%URWFONTS%%%%DATADIR%%/font/devpdf/BMBI
-%%URWFONTS%%%%DATADIR%%/font/devpdf/BMI
-%%URWFONTS%%%%DATADIR%%/font/devpdf/BMR
-%%URWFONTS%%%%DATADIR%%/font/devpdf/CB
-%%URWFONTS%%%%DATADIR%%/font/devpdf/CBI
-%%URWFONTS%%%%DATADIR%%/font/devpdf/CI
-%%URWFONTS%%%%DATADIR%%/font/devpdf/CR
-%%URWFONTS%%%%DATADIR%%/font/devpdf/DESC
-%%URWFONTS%%%%DATADIR%%/font/devpdf/EURO
-%%URWFONTS%%%%DATADIR%%/font/devpdf/Foundry
-%%URWFONTS%%%%DATADIR%%/font/devpdf/HB
-%%URWFONTS%%%%DATADIR%%/font/devpdf/HBI
-%%URWFONTS%%%%DATADIR%%/font/devpdf/HI
-%%URWFONTS%%%%DATADIR%%/font/devpdf/HNB
-%%URWFONTS%%%%DATADIR%%/font/devpdf/HNBI
-%%URWFONTS%%%%DATADIR%%/font/devpdf/HNI
-%%URWFONTS%%%%DATADIR%%/font/devpdf/HNR
-%%URWFONTS%%%%DATADIR%%/font/devpdf/HR
-%%URWFONTS%%%%DATADIR%%/font/devpdf/NB
-%%URWFONTS%%%%DATADIR%%/font/devpdf/NBI
-%%URWFONTS%%%%DATADIR%%/font/devpdf/NI
-%%URWFONTS%%%%DATADIR%%/font/devpdf/NR
-%%URWFONTS%%%%DATADIR%%/font/devpdf/PB
-%%URWFONTS%%%%DATADIR%%/font/devpdf/PBI
-%%URWFONTS%%%%DATADIR%%/font/devpdf/PI
-%%URWFONTS%%%%DATADIR%%/font/devpdf/PR
-%%URWFONTS%%%%DATADIR%%/font/devpdf/S
-%%URWFONTS%%%%DATADIR%%/font/devpdf/TB
-%%URWFONTS%%%%DATADIR%%/font/devpdf/TBI
-%%URWFONTS%%%%DATADIR%%/font/devpdf/TI
-%%URWFONTS%%%%DATADIR%%/font/devpdf/TR
-%%URWFONTS%%%%DATADIR%%/font/devpdf/U-AB
-%%URWFONTS%%%%DATADIR%%/font/devpdf/U-ABI
-%%URWFONTS%%%%DATADIR%%/font/devpdf/U-AI
-%%URWFONTS%%%%DATADIR%%/font/devpdf/U-AR
-%%URWFONTS%%%%DATADIR%%/font/devpdf/U-BMB
-%%URWFONTS%%%%DATADIR%%/font/devpdf/U-BMBI
-%%URWFONTS%%%%DATADIR%%/font/devpdf/U-BMI
-%%URWFONTS%%%%DATADIR%%/font/devpdf/U-BMR
-%%URWFONTS%%%%DATADIR%%/font/devpdf/U-CB
-%%URWFONTS%%%%DATADIR%%/font/devpdf/U-CBI
-%%URWFONTS%%%%DATADIR%%/font/devpdf/U-CI
-%%URWFONTS%%%%DATADIR%%/font/devpdf/U-CR
-%%URWFONTS%%%%DATADIR%%/font/devpdf/U-HB
-%%URWFONTS%%%%DATADIR%%/font/devpdf/U-HBI
-%%URWFONTS%%%%DATADIR%%/font/devpdf/U-HI
-%%URWFONTS%%%%DATADIR%%/font/devpdf/U-HNB
-%%URWFONTS%%%%DATADIR%%/font/devpdf/U-HNBI
-%%URWFONTS%%%%DATADIR%%/font/devpdf/U-HNI
-%%URWFONTS%%%%DATADIR%%/font/devpdf/U-HNR
-%%URWFONTS%%%%DATADIR%%/font/devpdf/U-HR
-%%URWFONTS%%%%DATADIR%%/font/devpdf/U-NB
-%%URWFONTS%%%%DATADIR%%/font/devpdf/U-NBI
-%%URWFONTS%%%%DATADIR%%/font/devpdf/U-NI
-%%URWFONTS%%%%DATADIR%%/font/devpdf/U-NR
-%%URWFONTS%%%%DATADIR%%/font/devpdf/U-PB
-%%URWFONTS%%%%DATADIR%%/font/devpdf/U-PBI
-%%URWFONTS%%%%DATADIR%%/font/devpdf/U-PI
-%%URWFONTS%%%%DATADIR%%/font/devpdf/U-PR
-%%URWFONTS%%%%DATADIR%%/font/devpdf/U-S
-%%URWFONTS%%%%DATADIR%%/font/devpdf/U-TB
-%%URWFONTS%%%%DATADIR%%/font/devpdf/U-TBI
-%%URWFONTS%%%%DATADIR%%/font/devpdf/U-TI
-%%URWFONTS%%%%DATADIR%%/font/devpdf/U-TR
-%%URWFONTS%%%%DATADIR%%/font/devpdf/U-ZCMI
-%%URWFONTS%%%%DATADIR%%/font/devpdf/U-ZD
-%%URWFONTS%%%%DATADIR%%/font/devpdf/ZCMI
-%%URWFONTS%%%%DATADIR%%/font/devpdf/ZD
-%%URWFONTS%%%%DATADIR%%/font/devpdf/download
-%%URWFONTS%%%%DATADIR%%/font/devpdf/enc/text.enc
-%%URWFONTS%%%%DATADIR%%/font/devpdf/map/dingbats.map
-%%URWFONTS%%%%DATADIR%%/font/devpdf/map/symbolchars
-%%URWFONTS%%%%DATADIR%%/font/devpdf/map/symbolmap
-%%URWFONTS%%%%DATADIR%%/font/devpdf/map/textmap
+%%DATADIR%%/font/devpdf/CB
+%%DATADIR%%/font/devpdf/CBI
+%%DATADIR%%/font/devpdf/CI
+%%DATADIR%%/font/devpdf/CR
+%%DATADIR%%/font/devpdf/DESC
+%%DATADIR%%/font/devpdf/EURO
+%%DATADIR%%/font/devpdf/Foundry
+%%DATADIR%%/font/devpdf/HB
+%%DATADIR%%/font/devpdf/HBI
+%%DATADIR%%/font/devpdf/HI
+%%DATADIR%%/font/devpdf/HR
+%%DATADIR%%/font/devpdf/S
+%%DATADIR%%/font/devpdf/TB
+%%DATADIR%%/font/devpdf/TBI
+%%DATADIR%%/font/devpdf/TI
+%%DATADIR%%/font/devpdf/TR
+%%DATADIR%%/font/devpdf/U-AB
+%%DATADIR%%/font/devpdf/U-ABI
+%%DATADIR%%/font/devpdf/U-AI
+%%DATADIR%%/font/devpdf/U-AR
+%%DATADIR%%/font/devpdf/U-BMB
+%%DATADIR%%/font/devpdf/U-BMBI
+%%DATADIR%%/font/devpdf/U-BMI
+%%DATADIR%%/font/devpdf/U-BMR
+%%DATADIR%%/font/devpdf/U-CB
+%%DATADIR%%/font/devpdf/U-CBI
+%%DATADIR%%/font/devpdf/U-CI
+%%DATADIR%%/font/devpdf/U-CR
+%%DATADIR%%/font/devpdf/U-HB
+%%DATADIR%%/font/devpdf/U-HBI
+%%DATADIR%%/font/devpdf/U-HI
+%%DATADIR%%/font/devpdf/U-HNB
+%%DATADIR%%/font/devpdf/U-HNBI
+%%DATADIR%%/font/devpdf/U-HNI
+%%DATADIR%%/font/devpdf/U-HNR
+%%DATADIR%%/font/devpdf/U-HR
+%%DATADIR%%/font/devpdf/U-NB
+%%DATADIR%%/font/devpdf/U-NBI
+%%DATADIR%%/font/devpdf/U-NI
+%%DATADIR%%/font/devpdf/U-NR
+%%DATADIR%%/font/devpdf/U-PB
+%%DATADIR%%/font/devpdf/U-PBI
+%%DATADIR%%/font/devpdf/U-PI
+%%DATADIR%%/font/devpdf/U-PR
+%%DATADIR%%/font/devpdf/U-S
+%%DATADIR%%/font/devpdf/U-TB
+%%DATADIR%%/font/devpdf/U-TBI
+%%DATADIR%%/font/devpdf/U-TI
+%%DATADIR%%/font/devpdf/U-TR
+%%DATADIR%%/font/devpdf/U-ZCMI
+%%DATADIR%%/font/devpdf/U-ZD
+%%DATADIR%%/font/devpdf/ZD
+%%DATADIR%%/font/devpdf/download
+%%DATADIR%%/font/devpdf/enc/text.enc
+%%DATADIR%%/font/devpdf/map/dingbats.map
+%%DATADIR%%/font/devpdf/map/symbolchars
+%%DATADIR%%/font/devpdf/map/symbolmap
+%%DATADIR%%/font/devpdf/map/textmap
 %%DATADIR%%/font/devps/AB
 %%DATADIR%%/font/devps/ABI
 %%DATADIR%%/font/devps/AI



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201910020846.x928kJH1080249>