Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 10 Jun 2016 19:37:47 +0000 (UTC)
From:      Hiroki Sato <hrs@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r416689 - in head: . textproc textproc/libfo textproc/libfo/files textproc/xmlroff textproc/xmlroff/files
Message-ID:  <201606101937.u5AJblsc056795@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: hrs
Date: Fri Jun 10 19:37:47 2016
New Revision: 416689
URL: https://svnweb.freebsd.org/changeset/ports/416689

Log:
  - Use Github to fetch the distfile.
  - Split library part of textproc/xmlroff into textproc/libfo.

Added:
  head/textproc/libfo/
     - copied from r395030, head/textproc/xmlroff/
  head/textproc/libfo/files/
  head/textproc/libfo/files/patch-Makefile.am   (contents, props changed)
  head/textproc/libfo/files/patch-docs-Makefile.am   (contents, props changed)
  head/textproc/xmlroff/files/
  head/textproc/xmlroff/files/patch-Makefile.am   (contents, props changed)
  head/textproc/xmlroff/files/patch-configure.ac   (contents, props changed)
  head/textproc/xmlroff/files/patch-docs-Makefile.am   (contents, props changed)
  head/textproc/xmlroff/files/patch-xmlroff-Makefile.am   (contents, props changed)
Modified:
  head/UPDATING
  head/textproc/Makefile
  head/textproc/libfo/Makefile
  head/textproc/libfo/distinfo
  head/textproc/libfo/pkg-descr
  head/textproc/libfo/pkg-plist
  head/textproc/xmlroff/Makefile
  head/textproc/xmlroff/distinfo
  head/textproc/xmlroff/pkg-plist

Modified: head/UPDATING
==============================================================================
--- head/UPDATING	Fri Jun 10 19:37:17 2016	(r416688)
+++ head/UPDATING	Fri Jun 10 19:37:47 2016	(r416689)
@@ -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.
 
+20160611
+  AFFECTS: users of textproc/xmlroff
+  AUTHOR: hrs@FreeBSD.org
+
+  The library part of xmlroff has been separated into textproc/libfo.
+  Remove the installed xmlroff first when upgrading it because older
+  xmlroff than 0.6.2_6 have files which libfo installs.  A typical
+  error message is the following:
+
+  pkg-static: libfo-0.6.2 conflicts with xmlroff-0.6.2_5 (installs files into the same place).  Problematic file: /usr/local/include/libfo-0.6/libfo/area/fo-area.h
+
 20160610
   AFFECTS: users of databases/postgresql-repmgr
   AUTHOR: bofh@FreeBSD.org

Modified: head/textproc/Makefile
==============================================================================
--- head/textproc/Makefile	Fri Jun 10 19:37:17 2016	(r416688)
+++ head/textproc/Makefile	Fri Jun 10 19:37:47 2016	(r416689)
@@ -396,6 +396,7 @@
     SUBDIR += libextractor
     SUBDIR += libexttextcat
     SUBDIR += libflate
+    SUBDIR += libfo
     SUBDIR += libguess
     SUBDIR += libkmfl
     SUBDIR += libkolabxml

Modified: head/textproc/libfo/Makefile
==============================================================================
--- head/textproc/xmlroff/Makefile	Sat Aug 22 13:27:34 2015	(r395030)
+++ head/textproc/libfo/Makefile	Fri Jun 10 19:37:47 2016	(r416689)
@@ -1,32 +1,40 @@
-# Created by: James Earl
 # $FreeBSD$
 
-PORTNAME=	xmlroff
+PORTNAME=	libfo
 PORTVERSION=	0.6.2
-PORTREVISION=	5
+DISTVERSIONPREFIX=	v
 CATEGORIES=	textproc
-MASTER_SITES=	http://xmlroff.org/download/
 
 MAINTAINER=	hrs@FreeBSD.org
-COMMENT=	XSL formatter that produces PDF and PostScript
+COMMENT=	XSL formatter library for xmlroff
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libcairo.so:${PORTSDIR}/graphics/cairo
+BUILD_DEPENDS=	${LOCALBASE}/share/xsl/docbook/catalog.xml:textproc/docbook-xsl \
+		xmlcatmgr:textproc/xmlcatmgr
+LIB_DEPENDS=	libcairo.so:graphics/cairo \
+		libfreetype.so:print/freetype2
 
-USES=		gmake libtool pkgconfig pathfix
+CONFLICTS_INSTALL=	xmlroff-0.6.[12] xmlroff-0.6.2_[12345]
+
+USES=		autoreconf gettext gmake libtool pkgconfig pathfix
 USE_GNOME=	libgnomeprint libxslt \
-		libxml2 gtk20 glib20 pango
+		libxml2 gtk20 glib20 pango \
+		librsvg2 gdkpixbuf2
+USE_GITHUB=	yes
+GH_PROJECT=	xmlroff
+GH_ACCOUNT=	xmlroff
 USE_LDCONFIG=	yes
+WRKSRC=		${WRKDIR}/xmlroff-${PORTVERSION}/xmlroff
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--disable-gtk-doc \
-		--with-html-dir=${PREFIX}/share/doc
+CONFIGURE_ARGS= --disable-gtk-doc
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
+INSTALL_TARGET=	install-strip
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g' \
-		${WRKSRC}/libfo/fo-libfo-basic.h
+	${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g' \
+	    ${WRKSRC}/libfo/fo-libfo-basic.h
 
 .include <bsd.port.mk>

Modified: head/textproc/libfo/distinfo
==============================================================================
--- head/textproc/xmlroff/distinfo	Sat Aug 22 13:27:34 2015	(r395030)
+++ head/textproc/libfo/distinfo	Fri Jun 10 19:37:47 2016	(r416689)
@@ -1,2 +1,2 @@
-SHA256 (xmlroff-0.6.2.tar.gz) = 305be62e51406baaa74870cb95f813f436a756170d2cd14eb48ffd13c7b20f74
-SIZE (xmlroff-0.6.2.tar.gz) = 2827261
+SHA256 (xmlroff-xmlroff-v0.6.2_GH0.tar.gz) = 9c4777c27418eeb013b50246a4852f49893829ee6463b9686f4e7f26bbb19fe9
+SIZE (xmlroff-xmlroff-v0.6.2_GH0.tar.gz) = 2195618

Added: head/textproc/libfo/files/patch-Makefile.am
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/textproc/libfo/files/patch-Makefile.am	Fri Jun 10 19:37:47 2016	(r416689)
@@ -0,0 +1,20 @@
+--- Makefile.am.orig	2009-03-11 21:08:57 UTC
++++ Makefile.am
+@@ -6,7 +6,7 @@ if ENABLE_CUNIT
+ CUNIT_DIRS = cunit
+ endif
+ 
+-SUBDIRS = libfo xmlroff . examples docs $(CUNIT_DIRS)
++SUBDIRS = libfo . examples $(CUNIT_DIRS)
+ 
+ if PLATFORM_WIN32
+ no_undefined = -no-undefined
+@@ -19,7 +19,7 @@ INCLUDES = \
+ 	-Ilibfo
+ 
+ 
+-pkgconfigdir = $(libdir)/pkgconfig
++pkgconfigdir = ${LOCALBASE}/libdata/pkgconfig
+ pkgconfig_DATA = libfo-0.6.pc
+ 
+ xmldir = $(datadir)/xml/libfo-@VERSION@

Added: head/textproc/libfo/files/patch-docs-Makefile.am
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/textproc/libfo/files/patch-docs-Makefile.am	Fri Jun 10 19:37:47 2016	(r416689)
@@ -0,0 +1,11 @@
+--- docs/Makefile.am.orig	2009-03-11 21:08:57 UTC
++++ docs/Makefile.am
+@@ -228,7 +228,7 @@ dist-hook-local:
+ DOCBOOK_XSL=http://docbook.sourceforge.net/release/xsl/current/fo/docbook.xsl
+ 
+ xmlroff.fo:	xmlroff.xml ../libfo-compat.xsl
+-	xsltproc $(DOCBOOK_XSL) xmlroff.xml > xmlroff.tmp
++	env XML_CATALOG_FILES=file://${LOCALBASE}/share/xml/catalog xsltproc --nonet $(DOCBOOK_XSL) xmlroff.xml > xmlroff.tmp
+ 	xsltproc ../libfo-compat.xsl xmlroff.tmp > xmlroff.fo
+ 	rm -f xmlroff.tmp
+ 

Modified: head/textproc/libfo/pkg-descr
==============================================================================
--- head/textproc/xmlroff/pkg-descr	Sat Aug 22 13:27:34 2015	(r395030)
+++ head/textproc/libfo/pkg-descr	Fri Jun 10 19:37:47 2016	(r416689)
@@ -1,3 +1,3 @@
-xmlroff is an XSL formatter written in C that produces PDF and PostScript.
+libfo is library part of xmlroff XSL formatter. 
 
 WWW: http://xmlroff.org

Modified: head/textproc/libfo/pkg-plist
==============================================================================
--- head/textproc/xmlroff/pkg-plist	Sat Aug 22 13:27:34 2015	(r395030)
+++ head/textproc/libfo/pkg-plist	Fri Jun 10 19:37:47 2016	(r416689)
@@ -1,4 +1,3 @@
-bin/xmlroff
 include/libfo-0.6/libfo/area/fo-area.h
 include/libfo-0.6/libfo/fo/fo-fo.h
 include/libfo-0.6/libfo/datatype/fo-datatype.h
@@ -44,349 +43,5 @@ lib/libfo-0.6.so
 lib/libfo-0.6.so.0
 lib/libfo-0.6.so.0.602.0
 libdata/pkgconfig/libfo-0.6.pc
-%%DOCSDIR%%/FoArea.html
-%%DOCSDIR%%/FoAreaArea.html
-%%DOCSDIR%%/FoAreaLayout.html
-%%DOCSDIR%%/FoAreaListItem.html
-%%DOCSDIR%%/FoAreaNormal.html
-%%DOCSDIR%%/FoAreaPage.html
-%%DOCSDIR%%/FoAreaReference.html
-%%DOCSDIR%%/FoAreaSpanningTableCell.html
-%%DOCSDIR%%/FoAreaTable.html
-%%DOCSDIR%%/FoAreaTableBody.html
-%%DOCSDIR%%/FoAreaTableCell.html
-%%DOCSDIR%%/FoAreaTableCellProxy.html
-%%DOCSDIR%%/FoAreaTableContinuation.html
-%%DOCSDIR%%/FoAreaTableFooter.html
-%%DOCSDIR%%/FoAreaTableHeader.html
-%%DOCSDIR%%/FoAreaTablePart.html
-%%DOCSDIR%%/FoAreaTableRow.html
-%%DOCSDIR%%/FoAreaTree.html
-%%DOCSDIR%%/FoAreaViewportReference.html
-%%DOCSDIR%%/FoBlockBlock.html
-%%DOCSDIR%%/FoBlockFoIface.html
-%%DOCSDIR%%/FoBlockLayout.html
-%%DOCSDIR%%/FoBlockWhitespace.html
-%%DOCSDIR%%/FoBoolean.html
-%%DOCSDIR%%/FoChar.html
-%%DOCSDIR%%/FoCharacter.html
-%%DOCSDIR%%/FoColor.html
-%%DOCSDIR%%/FoContext.html
-%%DOCSDIR%%/FoDatatype.html
-%%DOCSDIR%%/FoEnum.html
-%%DOCSDIR%%/FoExpression.html
-%%DOCSDIR%%/FoFo.html
-%%DOCSDIR%%/FoHashTable.html
-%%DOCSDIR%%/FoId.html
-%%DOCSDIR%%/FoInlineFoIface.html
-%%DOCSDIR%%/FoInteger.html
-%%DOCSDIR%%/FoKeep.html
-%%DOCSDIR%%/FoLength.html
-%%DOCSDIR%%/FoLengthBpIpD.html
-%%DOCSDIR%%/FoLengthCond.html
-%%DOCSDIR%%/FoLengthRange.html
-%%DOCSDIR%%/FoName.html
-%%DOCSDIR%%/FoNode.html
-%%DOCSDIR%%/FoNumber.html
-%%DOCSDIR%%/FoNumeric.html
-%%DOCSDIR%%/FoObject.html
-%%DOCSDIR%%/FoPercentage.html
-%%DOCSDIR%%/FoProperty.html
-%%DOCSDIR%%/FoPropertyTextPropertyIface.html
-%%DOCSDIR%%/FoSpace.html
-%%DOCSDIR%%/FoString.html
-%%DOCSDIR%%/FoTableBorderFoIface.html
-%%DOCSDIR%%/FoTablePart.html
-%%DOCSDIR%%/FoText.html
-%%DOCSDIR%%/FoTree.html
-%%DOCSDIR%%/FoUnknown.html
-%%DOCSDIR%%/FoUriSpecification.html
-%%DOCSDIR%%/FoWrapper.html
-%%DOCSDIR%%/FoWrapperBlock.html
-%%DOCSDIR%%/FoWrapperInline.html
-%%DOCSDIR%%/FoWrapperWhitespace.html
-%%DOCSDIR%%/areas.html
-%%DOCSDIR%%/backends.html
-%%DOCSDIR%%/basic-interface.html
-%%DOCSDIR%%/context.html
-%%DOCSDIR%%/datatypes.html
-%%DOCSDIR%%/debugging.html
-%%DOCSDIR%%/developers.html
-%%DOCSDIR%%/directory-structure.html
-%%DOCSDIR%%/fo-area-c-file.html
-%%DOCSDIR%%/fo-c-file.html
-%%DOCSDIR%%/fo-h-file.html
-%%DOCSDIR%%/home.png
-%%DOCSDIR%%/formatting-objects.html
-%%DOCSDIR%%/generating-source.html
-%%DOCSDIR%%/index.html
-%%DOCSDIR%%/index.sgml
-%%DOCSDIR%%/interfaces.html
-%%DOCSDIR%%/left.png
-%%DOCSDIR%%/node.html
-%%DOCSDIR%%/object.html
-%%DOCSDIR%%/object-hierarchy.html
-%%DOCSDIR%%/other-objects.html
-%%DOCSDIR%%/properties.html
-%%DOCSDIR%%/right.png
-%%DOCSDIR%%/style.css
-%%DOCSDIR%%/up.png
-%%DOCSDIR%%/users.html
-%%DOCSDIR%%/utility-modules.html
-%%DOCSDIR%%/utility-objects.html
-%%DOCSDIR%%/xmlroff-code-rules.html
-%%DOCSDIR%%/xmlroff-fo-utils.html
-%%DOCSDIR%%/xmlroff-libfo-version.html
-%%DOCSDIR%%/xmlroff.1.html
-%%DOCSDIR%%/xmlroff.css
-%%DOCSDIR%%/xmlroff-Additional-Pango-attributes-needed-by-LibFO.html
-%%DOCSDIR%%/xmlroff-FoDoc.html
-%%DOCSDIR%%/xmlroff-FoPcw.html
-%%DOCSDIR%%/xmlroff-FoDocCairo.html
-%%DOCSDIR%%/xmlroff-FoDocGP.html
-%%DOCSDIR%%/xmlroff-FoError.html
-%%DOCSDIR%%/xmlroff-FoFontDesc.html
-%%DOCSDIR%%/xmlroff-FoImage.html
-%%DOCSDIR%%/xmlroff-FoLayout.html
-%%DOCSDIR%%/xmlroff-FoLayoutCairo.html
-%%DOCSDIR%%/xmlroff-FoLibfoContext.html
-%%DOCSDIR%%/xmlroff-FoNeutralFoIface.html
-%%DOCSDIR%%/xmlroff-FoPixbuf.html
-%%DOCSDIR%%/xmlroff-FoTblr.html
-%%DOCSDIR%%/xmlroff-FoWrapperInlineEmpty.html
-%%DOCSDIR%%/xmlroff-FoWsc.html
-%%DOCSDIR%%/xmlroff-FoXmlDoc.html
-%%DOCSDIR%%/xmlroff-FoXmlNode.html
-%%DOCSDIR%%/xmlroff-FoXslFormatter.html
-%%DOCSDIR%%/xmlroff-FoXsltTransformer.html
-%%DOCSDIR%%/xmlroff-LibFO-compatibility-stylesheet.html
-%%DOCSDIR%%/xmlroff-alignment-adjust.html
-%%DOCSDIR%%/xmlroff-alignment-baseline.html
-%%DOCSDIR%%/xmlroff-background-color.html
-%%DOCSDIR%%/xmlroff-background-image.html
-%%DOCSDIR%%/xmlroff-baseline-shift.html
-%%DOCSDIR%%/xmlroff-basic-link.html
-%%DOCSDIR%%/xmlroff-bidi-override.html
-%%DOCSDIR%%/xmlroff-block-container.html
-%%DOCSDIR%%/xmlroff-block-progression-dimension.html
-%%DOCSDIR%%/xmlroff-block.html
-%%DOCSDIR%%/xmlroff-block-progression-dimensionmaximum.html
-%%DOCSDIR%%/xmlroff-block-progression-dimensionminimum.html
-%%DOCSDIR%%/xmlroff-block-progression-dimensionoptimum.html
-%%DOCSDIR%%/xmlroff-border-after-color.html
-%%DOCSDIR%%/xmlroff-border-after-precedence.html
-%%DOCSDIR%%/xmlroff-border-after-style.html
-%%DOCSDIR%%/xmlroff-border-after-width.html
-%%DOCSDIR%%/xmlroff-border-before-color.html
-%%DOCSDIR%%/xmlroff-border-before-precedence.html
-%%DOCSDIR%%/xmlroff-border-before-style.html
-%%DOCSDIR%%/xmlroff-border-bottom.html
-%%DOCSDIR%%/xmlroff-border-before-width.html
-%%DOCSDIR%%/xmlroff-border-bottom-color.html
-%%DOCSDIR%%/xmlroff-border-bottom-style.html
-%%DOCSDIR%%/xmlroff-border-bottom-width.html
-%%DOCSDIR%%/xmlroff-border-collapse.html
-%%DOCSDIR%%/xmlroff-border-end-color.html
-%%DOCSDIR%%/xmlroff-border-end-precedence.html
-%%DOCSDIR%%/xmlroff-border-end-style.html
-%%DOCSDIR%%/xmlroff-border-end-width.html
-%%DOCSDIR%%/xmlroff-border-left-color.html
-%%DOCSDIR%%/xmlroff-border-left-style.html
-%%DOCSDIR%%/xmlroff-border-left-width.html
-%%DOCSDIR%%/xmlroff-border-left.html
-%%DOCSDIR%%/xmlroff-border-right-color.html
-%%DOCSDIR%%/xmlroff-border-right-style.html
-%%DOCSDIR%%/xmlroff-border-right-width.html
-%%DOCSDIR%%/xmlroff-border-right.html
-%%DOCSDIR%%/xmlroff-border-separation.html
-%%DOCSDIR%%/xmlroff-border-start-color.html
-%%DOCSDIR%%/xmlroff-border-start-precedence.html
-%%DOCSDIR%%/xmlroff-border-start-style.html
-%%DOCSDIR%%/xmlroff-border-start-width.html
-%%DOCSDIR%%/xmlroff-border-style.html
-%%DOCSDIR%%/xmlroff-border-top-color.html
-%%DOCSDIR%%/xmlroff-border-top.html
-%%DOCSDIR%%/xmlroff-border-top-style.html
-%%DOCSDIR%%/xmlroff-border-top-width.html
-%%DOCSDIR%%/xmlroff-border-width.html
-%%DOCSDIR%%/xmlroff-border.html
-%%DOCSDIR%%/xmlroff-break-after.html
-%%DOCSDIR%%/xmlroff-break-before.html
-%%DOCSDIR%%/xmlroff-character.html
-%%DOCSDIR%%/xmlroff-clip.html
-%%DOCSDIR%%/xmlroff-color-profile.html
-%%DOCSDIR%%/xmlroff-color.html
-%%DOCSDIR%%/xmlroff-column-number.html
-%%DOCSDIR%%/xmlroff-column-width.html
-%%DOCSDIR%%/xmlroff-conditional-page-master-reference.html
-%%DOCSDIR%%/xmlroff-content-height.html
-%%DOCSDIR%%/xmlroff-content-type.html
-%%DOCSDIR%%/xmlroff-content-width.html
-%%DOCSDIR%%/xmlroff-declarations.html
-%%DOCSDIR%%/xmlroff-direction.html
-%%DOCSDIR%%/xmlroff-display-align.html
-%%DOCSDIR%%/xmlroff-dominant-baseline.html
-%%DOCSDIR%%/xmlroff-end-indent.html
-%%DOCSDIR%%/xmlroff-extent.html
-%%DOCSDIR%%/xmlroff-external-graphic.html
-%%DOCSDIR%%/xmlroff-float.html
-%%DOCSDIR%%/xmlroff-flow-name.html
-%%DOCSDIR%%/xmlroff-flow.html
-%%DOCSDIR%%/xmlroff-fo-area-graphic.html
-%%DOCSDIR%%/xmlroff-fo-area-inline.html
-%%DOCSDIR%%/xmlroff-font-size.html
-%%DOCSDIR%%/xmlroff-fo-doc-commands.html
-%%DOCSDIR%%/xmlroff-fo-layout-gp.html
-%%DOCSDIR%%/xmlroff-fo-libfo-basic.html
-%%DOCSDIR%%/xmlroff-fo-marker-parent.html
-%%DOCSDIR%%/xmlroff-fo-property-border-color.html
-%%DOCSDIR%%/xmlroff-fo-retrieve-marker.html
-%%DOCSDIR%%/xmlroff-font-family.html
-%%DOCSDIR%%/xmlroff-font-stretch.html
-%%DOCSDIR%%/xmlroff-font-style.html
-%%DOCSDIR%%/xmlroff-font-variant.html
-%%DOCSDIR%%/xmlroff-font-weight.html
-%%DOCSDIR%%/xmlroff-footnote-body.html
-%%DOCSDIR%%/xmlroff-footnote.html
-%%DOCSDIR%%/xmlroff-format.html
-%%DOCSDIR%%/xmlroff-grouping-separator.html
-%%DOCSDIR%%/xmlroff-grouping-size.html
-%%DOCSDIR%%/xmlroff-height.html
-%%DOCSDIR%%/xmlroff-id.html
-%%DOCSDIR%%/xmlroff-initial-property-set.html
-%%DOCSDIR%%/xmlroff-inline-container.html
-%%DOCSDIR%%/xmlroff-inline-progression-dimension.html
-%%DOCSDIR%%/xmlroff-inline-progression-dimensionmaximum.html
-%%DOCSDIR%%/xmlroff-inline-progression-dimensionminimum.html
-%%DOCSDIR%%/xmlroff-inline-progression-dimensionoptimum.html
-%%DOCSDIR%%/xmlroff-inline.html
-%%DOCSDIR%%/xmlroff-keep-together.html
-%%DOCSDIR%%/xmlroff-instream-foreign-object.html
-%%DOCSDIR%%/xmlroff-keep-togetherwithin-column.html
-%%DOCSDIR%%/xmlroff-keep-togetherwithin-line.html
-%%DOCSDIR%%/xmlroff-keep-togetherwithin-page.html
-%%DOCSDIR%%/xmlroff-keep-with-next.html
-%%DOCSDIR%%/xmlroff-keep-with-nextwithin-column.html
-%%DOCSDIR%%/xmlroff-keep-with-nextwithin-line.html
-%%DOCSDIR%%/xmlroff-keep-with-nextwithin-page.html
-%%DOCSDIR%%/xmlroff-keep-with-previous.html
-%%DOCSDIR%%/xmlroff-keep-with-previouswithin-column.html
-%%DOCSDIR%%/xmlroff-layout-master-set.html
-%%DOCSDIR%%/xmlroff-keep-with-previouswithin-line.html
-%%DOCSDIR%%/xmlroff-keep-with-previouswithin-page.html
-%%DOCSDIR%%/xmlroff-leader.html
-%%DOCSDIR%%/xmlroff-letter-value.html
-%%DOCSDIR%%/xmlroff-line-height.html
-%%DOCSDIR%%/xmlroff-line-stacking-strategy.html
-%%DOCSDIR%%/xmlroff-linefeed-treatment.html
-%%DOCSDIR%%/xmlroff-list-block.html
-%%DOCSDIR%%/xmlroff-list-item-body.html
-%%DOCSDIR%%/xmlroff-list-item-label.html
-%%DOCSDIR%%/xmlroff-list-item.html
-%%DOCSDIR%%/xmlroff-margin-bottom.html
-%%DOCSDIR%%/xmlroff-margin-left.html
-%%DOCSDIR%%/xmlroff-margin-right.html
-%%DOCSDIR%%/xmlroff-margin-top.html
-%%DOCSDIR%%/xmlroff-margin.html
-%%DOCSDIR%%/xmlroff-marker.html
-%%DOCSDIR%%/xmlroff-master-name.html
-%%DOCSDIR%%/xmlroff-master-reference.html
-%%DOCSDIR%%/xmlroff-media-usage.html
-%%DOCSDIR%%/xmlroff-multi-case.html
-%%DOCSDIR%%/xmlroff-multi-properties.html
-%%DOCSDIR%%/xmlroff-multi-property-set.html
-%%DOCSDIR%%/xmlroff-multi-switch.html
-%%DOCSDIR%%/xmlroff-multi-toggle.html
-%%DOCSDIR%%/xmlroff-number-columns-repeated.html
-%%DOCSDIR%%/xmlroff-number-columns-spanned.html
-%%DOCSDIR%%/xmlroff-number-rows-spanned.html
-%%DOCSDIR%%/xmlroff-orphans.html
-%%DOCSDIR%%/xmlroff-overflow.html
-%%DOCSDIR%%/xmlroff-padding-after.html
-%%DOCSDIR%%/xmlroff-padding-before.html
-%%DOCSDIR%%/xmlroff-padding-bottom.html
-%%DOCSDIR%%/xmlroff-padding-end.html
-%%DOCSDIR%%/xmlroff-padding-left.html
-%%DOCSDIR%%/xmlroff-padding-right.html
-%%DOCSDIR%%/xmlroff-padding-start.html
-%%DOCSDIR%%/xmlroff-padding-top.html
-%%DOCSDIR%%/xmlroff-padding.html
-%%DOCSDIR%%/xmlroff-page-height.html
-%%DOCSDIR%%/xmlroff-page-number-citation.html
-%%DOCSDIR%%/xmlroff-page-number.html
-%%DOCSDIR%%/xmlroff-page-sequence-master.html
-%%DOCSDIR%%/xmlroff-page-sequence.html
-%%DOCSDIR%%/xmlroff-page-width.html
-%%DOCSDIR%%/xmlroff-provisional-distance-between-starts.html
-%%DOCSDIR%%/xmlroff-provisional-label-separation.html
-%%DOCSDIR%%/xmlroff-ref-id.html
-%%DOCSDIR%%/xmlroff-region-after.html
-%%DOCSDIR%%/xmlroff-region-before.html
-%%DOCSDIR%%/xmlroff-region-body.html
-%%DOCSDIR%%/xmlroff-region-end.html
-%%DOCSDIR%%/xmlroff-region-name.html
-%%DOCSDIR%%/xmlroff-region-start.html
-%%DOCSDIR%%/xmlroff-repeatable-page-master-alternatives.html
-%%DOCSDIR%%/xmlroff-repeatable-page-master-reference.html
-%%DOCSDIR%%/xmlroff-role.html
-%%DOCSDIR%%/xmlroff-root.html
-%%DOCSDIR%%/xmlroff-scaling-method.html
-%%DOCSDIR%%/xmlroff-scaling.html
-%%DOCSDIR%%/xmlroff-score-spaces.html
-%%DOCSDIR%%/xmlroff-simple-page-master.html
-%%DOCSDIR%%/xmlroff-single-page-master-reference.html
-%%DOCSDIR%%/xmlroff-source-document.html
-%%DOCSDIR%%/xmlroff-space-after.html
-%%DOCSDIR%%/xmlroff-space-afterconditionality.html
-%%DOCSDIR%%/xmlroff-space-aftermaximum.html
-%%DOCSDIR%%/xmlroff-space-afterminimum.html
-%%DOCSDIR%%/xmlroff-space-afteroptimum.html
-%%DOCSDIR%%/xmlroff-space-afterprecedence.html
-%%DOCSDIR%%/xmlroff-space-before.html
-%%DOCSDIR%%/xmlroff-space-beforeconditionality.html
-%%DOCSDIR%%/xmlroff-space-beforemaximum.html
-%%DOCSDIR%%/xmlroff-space-beforeminimum.html
-%%DOCSDIR%%/xmlroff-space-beforeoptimum.html
-%%DOCSDIR%%/xmlroff-space-beforeprecedence.html
-%%DOCSDIR%%/xmlroff-space-end.html
-%%DOCSDIR%%/xmlroff-space-endconditionality.html
-%%DOCSDIR%%/xmlroff-space-endmaximum.html
-%%DOCSDIR%%/xmlroff-space-endminimum.html
-%%DOCSDIR%%/xmlroff-space-endoptimum.html
-%%DOCSDIR%%/xmlroff-space-endprecedence.html
-%%DOCSDIR%%/xmlroff-space-start.html
-%%DOCSDIR%%/xmlroff-space-startconditionality.html
-%%DOCSDIR%%/xmlroff-space-startmaximum.html
-%%DOCSDIR%%/xmlroff-space-startminimum.html
-%%DOCSDIR%%/xmlroff-space-startoptimum.html
-%%DOCSDIR%%/xmlroff-space-startprecedence.html
-%%DOCSDIR%%/xmlroff-span.html
-%%DOCSDIR%%/xmlroff-src.html
-%%DOCSDIR%%/xmlroff-start-indent.html
-%%DOCSDIR%%/xmlroff-static-content.html
-%%DOCSDIR%%/xmlroff-table-and-caption.html
-%%DOCSDIR%%/xmlroff-table-body.html
-%%DOCSDIR%%/xmlroff-table-caption.html
-%%DOCSDIR%%/xmlroff-table-cell.html
-%%DOCSDIR%%/xmlroff-table-column.html
-%%DOCSDIR%%/xmlroff-table-footer.html
-%%DOCSDIR%%/xmlroff-table-header.html
-%%DOCSDIR%%/xmlroff-table-layout.html
-%%DOCSDIR%%/xmlroff-table-row.html
-%%DOCSDIR%%/xmlroff-table.html
-%%DOCSDIR%%/xmlroff-text-align.html
-%%DOCSDIR%%/xmlroff-text-indent.html
-%%DOCSDIR%%/xmlroff-title.html
-%%DOCSDIR%%/xmlroff-unicode-bidi.html
-%%DOCSDIR%%/xmlroff-white-space-collapse.html
-%%DOCSDIR%%/xmlroff-white-space-treatment.html
-%%DOCSDIR%%/xmlroff-widows.html
-%%DOCSDIR%%/xmlroff-width.html
-%%DOCSDIR%%/xmlroff-wrap-option.html
-%%DOCSDIR%%/xmlroff-writing-mode.html
-%%DOCSDIR%%/xmlroff.devhelp
-%%DOCSDIR%%/xmlroff.devhelp2
-share/xml/libfo-0.6.2/catalog.xml
+@xmlcatmgr share/xml/libfo-0.6.2/catalog.xml
 share/xml/libfo-0.6.2/libfo-compat.xsl
-share/xml/libfo-0.6.2/xmlroff.fo
-share/xml/libfo-0.6.2/xmlroff.xml

Modified: head/textproc/xmlroff/Makefile
==============================================================================
--- head/textproc/xmlroff/Makefile	Fri Jun 10 19:37:17 2016	(r416688)
+++ head/textproc/xmlroff/Makefile	Fri Jun 10 19:37:47 2016	(r416689)
@@ -3,9 +3,9 @@
 
 PORTNAME=	xmlroff
 PORTVERSION=	0.6.2
-PORTREVISION=	5
+PORTREVISION=	6
+DISTVERSIONPREFIX=	v
 CATEGORIES=	textproc
-MASTER_SITES=	http://xmlroff.org/download/
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	XSL formatter that produces PDF and PostScript
@@ -13,20 +13,23 @@ COMMENT=	XSL formatter that produces PDF
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libcairo.so:graphics/cairo
+BUILD_DEPENDS=	libfo>=0.6.2:textproc/libfo
+RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-USES=		gmake libtool pkgconfig pathfix
-USE_GNOME=	libgnomeprint libxslt \
-		libxml2 gtk20 glib20 pango
-USE_LDCONFIG=	yes
+USES=		autoreconf gmake gettext pkgconfig pathfix
+USE_GITHUB=	yes
+USE_GNOME=	libgnomeprint libartlgpl2 pango glib20 \
+		libxslt libxml2 gdkpixbuf2
+GH_ACCOUNT=	xmlroff
+GH_PROJECT=	xmlroff
+EXTRACT_AFTER_ARGS=	--exclude=xmlroff/libfo
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/${PORTNAME}
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--disable-gtk-doc \
-		--with-html-dir=${PREFIX}/share/doc
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g' \
-		${WRKSRC}/libfo/fo-libfo-basic.h
+CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc
+INSTALL_TARGET=	install-strip
+
+OPTIONS_DEFINE=	DOCS
+DOCS_CONFIGURE_ENABLE=	gtk-doc
+DOCS_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gtk-doc.pc:${PORTSDIR}/textproc/gtk-doc
 
 .include <bsd.port.mk>

Modified: head/textproc/xmlroff/distinfo
==============================================================================
--- head/textproc/xmlroff/distinfo	Fri Jun 10 19:37:17 2016	(r416688)
+++ head/textproc/xmlroff/distinfo	Fri Jun 10 19:37:47 2016	(r416689)
@@ -1,2 +1,2 @@
-SHA256 (xmlroff-0.6.2.tar.gz) = 305be62e51406baaa74870cb95f813f436a756170d2cd14eb48ffd13c7b20f74
-SIZE (xmlroff-0.6.2.tar.gz) = 2827261
+SHA256 (xmlroff-xmlroff-v0.6.2_GH0.tar.gz) = 9c4777c27418eeb013b50246a4852f49893829ee6463b9686f4e7f26bbb19fe9
+SIZE (xmlroff-xmlroff-v0.6.2_GH0.tar.gz) = 2195618

Added: head/textproc/xmlroff/files/patch-Makefile.am
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/textproc/xmlroff/files/patch-Makefile.am	Fri Jun 10 19:37:47 2016	(r416689)
@@ -0,0 +1,31 @@
+--- Makefile.am.orig	2009-03-12 06:08:57.000000000 +0900
++++ Makefile.am	2016-03-26 11:11:44.004539000 +0900
+@@ -6,26 +6,14 @@
+ CUNIT_DIRS = cunit
+ endif
+ 
+-SUBDIRS = libfo xmlroff . examples docs $(CUNIT_DIRS)
++SUBDIRS = xmlroff examples docs $(CUNIT_DIRS)
+ 
+ if PLATFORM_WIN32
+ no_undefined = -no-undefined
+ endif
+ 
+ INCLUDES = \
+-	-DG_LOG_DOMAIN=\"libfo\"	\
+-	$(LIBXSLT_CFLAGS)	\
+-	$(GLIB_CFLAGS)		\
+-	-Ilibfo
+-
+-
+-pkgconfigdir = $(libdir)/pkgconfig
+-pkgconfig_DATA = libfo-0.6.pc
+-
+-xmldir = $(datadir)/xml/libfo-@VERSION@
+-xml_DATA = \
+-	catalog.xml		\
+-	libfo-compat.xsl
++	-DG_LOG_DOMAIN=\"libfo\"
+ 
+ EXTRA_DIST = \
+ 	catalog.xml.in		\

Added: head/textproc/xmlroff/files/patch-configure.ac
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/textproc/xmlroff/files/patch-configure.ac	Fri Jun 10 19:37:47 2016	(r416689)
@@ -0,0 +1,59 @@
+--- configure.ac.orig	2009-03-12 06:08:57.000000000 +0900
++++ configure.ac	2016-03-26 11:07:28.607576000 +0900
+@@ -230,30 +230,26 @@
+ AM_CONDITIONAL(ENABLE_MAN, test x$enable_man != xno)
+ 
+ #
+-# Checks for libxslt
+-#
+-# Variables for libxslt will also include values appropriate for
+-# libxml2.
++# Checks for libfo
+ #
+-LIBXSLT_PACKAGES=libxslt
+-LIBXSLT_REQUIRED_VERSION=1.0.3
++LIBFO_PACKAGES=libfo-0.6
++LIBFO_REQUIRED_VERSION=0.6
+ 
+-have_libxslt=false
++have_libfo=false
+ 
+-PKG_CHECK_MODULES(LIBXSLT,
+-		  $LIBXSLT_PACKAGES >= $LIBXSLT_REQUIRED_VERSION,
+-		  have_libxslt=true,
++PKG_CHECK_MODULES(LIBFO,
++		  $LIBFO_PACKAGES >= $LIBFO_REQUIRED_VERSION,
++		  have_libfo=true,
+ 		  :)
+ 
+-if $have_libxslt ; then : ; else
++if $have_libfo ; then : ; else
+       AC_MSG_ERROR([
+-*** Libxslt $LIBXSLT_REQUIRED_VERSION or newer is required.
+-*** Libxslt is available at http://xsltsoft.org/.
++*** Libfo $LIBFO_REQUIRED_VERSION or newer is required.
+   ])
+ fi
+ 
+-AC_SUBST(LIBXSLT_LIBS)
+-AC_SUBST(LIBXSLT_CFLAGS)
++AC_SUBST(LIBFO_LIBS)
++AC_SUBST(LIBFO_CFLAGS)
+ 
+ AC_ARG_ENABLE(rebuilds,
+ 	      AC_HELP_STRING([--disable-rebuilds],
+@@ -623,14 +619,6 @@
+ docs/Makefile
+ examples/Makefile
+ examples/xml2003/Makefile
+-libfo/Makefile
+-libfo/area/Makefile
+-libfo/datatype/Makefile
+-libfo/expr/Makefile
+-libfo/fo/Makefile
+-libfo/property/Makefile
+-libfo/util/Makefile
+-libfo-0.6.pc
+ xmlroff.spec
+ xmlroff/Makefile
+ catalog.xml

Added: head/textproc/xmlroff/files/patch-docs-Makefile.am
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/textproc/xmlroff/files/patch-docs-Makefile.am	Fri Jun 10 19:37:47 2016	(r416689)
@@ -0,0 +1,11 @@
+--- docs/Makefile.am.orig	2009-03-12 06:08:57.000000000 +0900
++++ docs/Makefile.am	2016-03-25 14:22:51.475354000 +0900
+@@ -228,7 +228,7 @@
+ DOCBOOK_XSL=http://docbook.sourceforge.net/release/xsl/current/fo/docbook.xsl
+ 
+ xmlroff.fo:	xmlroff.xml ../libfo-compat.xsl
+-	xsltproc $(DOCBOOK_XSL) xmlroff.xml > xmlroff.tmp
++	env XML_CATALOG_FILES=file://${LOCALBASE}/share/xml/catalog xsltproc --nonet $(DOCBOOK_XSL) xmlroff.xml > xmlroff.tmp
+ 	xsltproc ../libfo-compat.xsl xmlroff.tmp > xmlroff.fo
+ 	rm -f xmlroff.tmp
+ 

Added: head/textproc/xmlroff/files/patch-xmlroff-Makefile.am
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/textproc/xmlroff/files/patch-xmlroff-Makefile.am	Fri Jun 10 19:37:47 2016	(r416689)
@@ -0,0 +1,27 @@
+--- xmlroff/Makefile.am.orig	2016-03-26 11:00:22.298011000 +0900
++++ xmlroff/Makefile.am	2016-03-26 11:01:28.445341000 +0900
+@@ -6,8 +6,7 @@
+ 
+ INCLUDES = \
+ 	-DG_LOG_DOMAIN=\"libfo\"	\
+-	$(LIBXSLT_CFLAGS)	\
+-	$(GLIB_CFLAGS)
++	$(LIBFO_CFLAGS)
+ 
+ bin_PROGRAMS = \
+ 	xmlroff
+@@ -18,11 +17,8 @@
+ xmlroff_SOURCES = \
+ 	xmlroff.c
+ 
+-xmlroff_LDFLAGS = -static
++xmlroff_LDFLAGS = \
++	$(LIBFO_LDFLAGS)
+ 
+ xmlroff_LDADD = \
+-	../libfo/libfo-0.6.la \
+-	$(PANGO_LIBS) \
+-	$(GNOMEPRINT_LIBS) \
+-	$(LIBXSLT_LIBS) \
+-	$(FREETYPE_LIBS)
++	$(LIBFO_LIBS)

Modified: head/textproc/xmlroff/pkg-plist
==============================================================================
--- head/textproc/xmlroff/pkg-plist	Fri Jun 10 19:37:17 2016	(r416688)
+++ head/textproc/xmlroff/pkg-plist	Fri Jun 10 19:37:47 2016	(r416689)
@@ -1,392 +1,347 @@
 bin/xmlroff
-include/libfo-0.6/libfo/area/fo-area.h
-include/libfo-0.6/libfo/fo/fo-fo.h
-include/libfo-0.6/libfo/datatype/fo-datatype.h
-include/libfo-0.6/libfo/datatype/fo-enum.h
-include/libfo-0.6/libfo/property/fo-property.h
-include/libfo-0.6/libfo/util/fo-hash-table.h
-include/libfo-0.6/libfo/util/fo-image.h
-include/libfo-0.6/libfo/util/fo-pixbuf.h
-include/libfo-0.6/libfo/fo-object.h
-include/libfo-0.6/libfo/fo-node.h
-include/libfo-0.6/libfo/fo-context.h
-include/libfo-0.6/libfo/fo-doc-cairo.h
-include/libfo-0.6/libfo/fo-doc-cairo-private.h
-include/libfo-0.6/libfo/fo-layout-cairo.h
-include/libfo-0.6/libfo/fo-layout-cairo-private.h
-include/libfo-0.6/libfo/fo-doc-gp.h
-include/libfo-0.6/libfo/fo-doc-gp-private.h
-include/libfo-0.6/libfo/fo-layout-gp.h
-include/libfo-0.6/libfo/fo-layout-gp-private.h
-include/libfo-0.6/libfo/fo-doc.h
-include/libfo-0.6/libfo/fo-doc-private.h
-include/libfo-0.6/libfo/fo-utils.h
-include/libfo-0.6/libfo/fo-font-desc.h
-include/libfo-0.6/libfo/fo-layout.h
-include/libfo-0.6/libfo/fo-font-desc-private.h
-include/libfo-0.6/libfo/fo-layout-private.h
-include/libfo-0.6/libfo/fo-libfo.h
-include/libfo-0.6/libfo/fo-libfo-basic.h
-include/libfo-0.6/libfo/fo-libfo-context.h
-include/libfo-0.6/libfo/fo-xml-doc-private.h
-include/libfo-0.6/libfo/fo-xml-doc.h
-include/libfo-0.6/libfo/fo-xml-node-private.h
-include/libfo-0.6/libfo/fo-xml-node.h
-include/libfo-0.6/libfo/fo-xsl-formatter.h
-include/libfo-0.6/libfo/fo-xslt-transformer.h
-include/libfo-0.6/libfo/fo-libfo-module-private.h
-include/libfo-0.6/libfo/fo-libfo-module.h
-include/libfo-0.6/libfo/libfo-features.h
-include/libfo-0.6/libfo/libfo-version.h
-include/libfo-0.6/libfo/libfo-compat.h
-lib/libfo-0.6.a
-lib/libfo-0.6.so
-lib/libfo-0.6.so.0
-lib/libfo-0.6.so.0.602.0
-libdata/pkgconfig/libfo-0.6.pc
-%%DOCSDIR%%/FoArea.html
-%%DOCSDIR%%/FoAreaArea.html
-%%DOCSDIR%%/FoAreaLayout.html
-%%DOCSDIR%%/FoAreaListItem.html
-%%DOCSDIR%%/FoAreaNormal.html
-%%DOCSDIR%%/FoAreaPage.html
-%%DOCSDIR%%/FoAreaReference.html
-%%DOCSDIR%%/FoAreaSpanningTableCell.html
-%%DOCSDIR%%/FoAreaTable.html
-%%DOCSDIR%%/FoAreaTableBody.html
-%%DOCSDIR%%/FoAreaTableCell.html
-%%DOCSDIR%%/FoAreaTableCellProxy.html
-%%DOCSDIR%%/FoAreaTableContinuation.html
-%%DOCSDIR%%/FoAreaTableFooter.html
-%%DOCSDIR%%/FoAreaTableHeader.html
-%%DOCSDIR%%/FoAreaTablePart.html
-%%DOCSDIR%%/FoAreaTableRow.html
-%%DOCSDIR%%/FoAreaTree.html
-%%DOCSDIR%%/FoAreaViewportReference.html
-%%DOCSDIR%%/FoBlockBlock.html
-%%DOCSDIR%%/FoBlockFoIface.html
-%%DOCSDIR%%/FoBlockLayout.html
-%%DOCSDIR%%/FoBlockWhitespace.html
-%%DOCSDIR%%/FoBoolean.html
-%%DOCSDIR%%/FoChar.html
-%%DOCSDIR%%/FoCharacter.html
-%%DOCSDIR%%/FoColor.html
-%%DOCSDIR%%/FoContext.html
-%%DOCSDIR%%/FoDatatype.html
-%%DOCSDIR%%/FoEnum.html
-%%DOCSDIR%%/FoExpression.html
-%%DOCSDIR%%/FoFo.html
-%%DOCSDIR%%/FoHashTable.html
-%%DOCSDIR%%/FoId.html
-%%DOCSDIR%%/FoInlineFoIface.html
-%%DOCSDIR%%/FoInteger.html
-%%DOCSDIR%%/FoKeep.html
-%%DOCSDIR%%/FoLength.html
-%%DOCSDIR%%/FoLengthBpIpD.html
-%%DOCSDIR%%/FoLengthCond.html
-%%DOCSDIR%%/FoLengthRange.html
-%%DOCSDIR%%/FoName.html
-%%DOCSDIR%%/FoNode.html
-%%DOCSDIR%%/FoNumber.html
-%%DOCSDIR%%/FoNumeric.html
-%%DOCSDIR%%/FoObject.html
-%%DOCSDIR%%/FoPercentage.html
-%%DOCSDIR%%/FoProperty.html
-%%DOCSDIR%%/FoPropertyTextPropertyIface.html
-%%DOCSDIR%%/FoSpace.html
-%%DOCSDIR%%/FoString.html
-%%DOCSDIR%%/FoTableBorderFoIface.html
-%%DOCSDIR%%/FoTablePart.html
-%%DOCSDIR%%/FoText.html
-%%DOCSDIR%%/FoTree.html
-%%DOCSDIR%%/FoUnknown.html
-%%DOCSDIR%%/FoUriSpecification.html
-%%DOCSDIR%%/FoWrapper.html
-%%DOCSDIR%%/FoWrapperBlock.html
-%%DOCSDIR%%/FoWrapperInline.html
-%%DOCSDIR%%/FoWrapperWhitespace.html
-%%DOCSDIR%%/areas.html
-%%DOCSDIR%%/backends.html
-%%DOCSDIR%%/basic-interface.html
-%%DOCSDIR%%/context.html
-%%DOCSDIR%%/datatypes.html
-%%DOCSDIR%%/debugging.html
-%%DOCSDIR%%/developers.html
-%%DOCSDIR%%/directory-structure.html
-%%DOCSDIR%%/fo-area-c-file.html
-%%DOCSDIR%%/fo-c-file.html
-%%DOCSDIR%%/fo-h-file.html
-%%DOCSDIR%%/home.png
-%%DOCSDIR%%/formatting-objects.html
-%%DOCSDIR%%/generating-source.html
-%%DOCSDIR%%/index.html
-%%DOCSDIR%%/index.sgml
-%%DOCSDIR%%/interfaces.html
-%%DOCSDIR%%/left.png
-%%DOCSDIR%%/node.html
-%%DOCSDIR%%/object.html
-%%DOCSDIR%%/object-hierarchy.html
-%%DOCSDIR%%/other-objects.html
-%%DOCSDIR%%/properties.html
-%%DOCSDIR%%/right.png
-%%DOCSDIR%%/style.css
-%%DOCSDIR%%/up.png
-%%DOCSDIR%%/users.html
-%%DOCSDIR%%/utility-modules.html
-%%DOCSDIR%%/utility-objects.html
-%%DOCSDIR%%/xmlroff-code-rules.html
-%%DOCSDIR%%/xmlroff-fo-utils.html
-%%DOCSDIR%%/xmlroff-libfo-version.html
-%%DOCSDIR%%/xmlroff.1.html
-%%DOCSDIR%%/xmlroff.css
-%%DOCSDIR%%/xmlroff-Additional-Pango-attributes-needed-by-LibFO.html
-%%DOCSDIR%%/xmlroff-FoDoc.html
-%%DOCSDIR%%/xmlroff-FoPcw.html
-%%DOCSDIR%%/xmlroff-FoDocCairo.html
-%%DOCSDIR%%/xmlroff-FoDocGP.html
-%%DOCSDIR%%/xmlroff-FoError.html
-%%DOCSDIR%%/xmlroff-FoFontDesc.html
-%%DOCSDIR%%/xmlroff-FoImage.html
-%%DOCSDIR%%/xmlroff-FoLayout.html
-%%DOCSDIR%%/xmlroff-FoLayoutCairo.html
-%%DOCSDIR%%/xmlroff-FoLibfoContext.html
-%%DOCSDIR%%/xmlroff-FoNeutralFoIface.html
-%%DOCSDIR%%/xmlroff-FoPixbuf.html
-%%DOCSDIR%%/xmlroff-FoTblr.html
-%%DOCSDIR%%/xmlroff-FoWrapperInlineEmpty.html
-%%DOCSDIR%%/xmlroff-FoWsc.html
-%%DOCSDIR%%/xmlroff-FoXmlDoc.html
-%%DOCSDIR%%/xmlroff-FoXmlNode.html
-%%DOCSDIR%%/xmlroff-FoXslFormatter.html
-%%DOCSDIR%%/xmlroff-FoXsltTransformer.html
-%%DOCSDIR%%/xmlroff-LibFO-compatibility-stylesheet.html
-%%DOCSDIR%%/xmlroff-alignment-adjust.html
-%%DOCSDIR%%/xmlroff-alignment-baseline.html
-%%DOCSDIR%%/xmlroff-background-color.html
-%%DOCSDIR%%/xmlroff-background-image.html
-%%DOCSDIR%%/xmlroff-baseline-shift.html
-%%DOCSDIR%%/xmlroff-basic-link.html
-%%DOCSDIR%%/xmlroff-bidi-override.html
-%%DOCSDIR%%/xmlroff-block-container.html
-%%DOCSDIR%%/xmlroff-block-progression-dimension.html
-%%DOCSDIR%%/xmlroff-block.html
-%%DOCSDIR%%/xmlroff-block-progression-dimensionmaximum.html
-%%DOCSDIR%%/xmlroff-block-progression-dimensionminimum.html
-%%DOCSDIR%%/xmlroff-block-progression-dimensionoptimum.html
-%%DOCSDIR%%/xmlroff-border-after-color.html
-%%DOCSDIR%%/xmlroff-border-after-precedence.html
-%%DOCSDIR%%/xmlroff-border-after-style.html
-%%DOCSDIR%%/xmlroff-border-after-width.html
-%%DOCSDIR%%/xmlroff-border-before-color.html
-%%DOCSDIR%%/xmlroff-border-before-precedence.html
-%%DOCSDIR%%/xmlroff-border-before-style.html
-%%DOCSDIR%%/xmlroff-border-bottom.html
-%%DOCSDIR%%/xmlroff-border-before-width.html
-%%DOCSDIR%%/xmlroff-border-bottom-color.html
-%%DOCSDIR%%/xmlroff-border-bottom-style.html
-%%DOCSDIR%%/xmlroff-border-bottom-width.html
-%%DOCSDIR%%/xmlroff-border-collapse.html
-%%DOCSDIR%%/xmlroff-border-end-color.html
-%%DOCSDIR%%/xmlroff-border-end-precedence.html
-%%DOCSDIR%%/xmlroff-border-end-style.html
-%%DOCSDIR%%/xmlroff-border-end-width.html
-%%DOCSDIR%%/xmlroff-border-left-color.html
-%%DOCSDIR%%/xmlroff-border-left-style.html
-%%DOCSDIR%%/xmlroff-border-left-width.html
-%%DOCSDIR%%/xmlroff-border-left.html
-%%DOCSDIR%%/xmlroff-border-right-color.html
-%%DOCSDIR%%/xmlroff-border-right-style.html
-%%DOCSDIR%%/xmlroff-border-right-width.html
-%%DOCSDIR%%/xmlroff-border-right.html
-%%DOCSDIR%%/xmlroff-border-separation.html
-%%DOCSDIR%%/xmlroff-border-start-color.html
-%%DOCSDIR%%/xmlroff-border-start-precedence.html
-%%DOCSDIR%%/xmlroff-border-start-style.html
-%%DOCSDIR%%/xmlroff-border-start-width.html
-%%DOCSDIR%%/xmlroff-border-style.html
-%%DOCSDIR%%/xmlroff-border-top-color.html
-%%DOCSDIR%%/xmlroff-border-top.html
-%%DOCSDIR%%/xmlroff-border-top-style.html
-%%DOCSDIR%%/xmlroff-border-top-width.html
-%%DOCSDIR%%/xmlroff-border-width.html
-%%DOCSDIR%%/xmlroff-border.html
-%%DOCSDIR%%/xmlroff-break-after.html
-%%DOCSDIR%%/xmlroff-break-before.html
-%%DOCSDIR%%/xmlroff-character.html
-%%DOCSDIR%%/xmlroff-clip.html
-%%DOCSDIR%%/xmlroff-color-profile.html
-%%DOCSDIR%%/xmlroff-color.html
-%%DOCSDIR%%/xmlroff-column-number.html
-%%DOCSDIR%%/xmlroff-column-width.html
-%%DOCSDIR%%/xmlroff-conditional-page-master-reference.html
-%%DOCSDIR%%/xmlroff-content-height.html
-%%DOCSDIR%%/xmlroff-content-type.html
-%%DOCSDIR%%/xmlroff-content-width.html
-%%DOCSDIR%%/xmlroff-declarations.html
-%%DOCSDIR%%/xmlroff-direction.html
-%%DOCSDIR%%/xmlroff-display-align.html
-%%DOCSDIR%%/xmlroff-dominant-baseline.html
-%%DOCSDIR%%/xmlroff-end-indent.html
-%%DOCSDIR%%/xmlroff-extent.html
-%%DOCSDIR%%/xmlroff-external-graphic.html
-%%DOCSDIR%%/xmlroff-float.html
-%%DOCSDIR%%/xmlroff-flow-name.html
-%%DOCSDIR%%/xmlroff-flow.html
-%%DOCSDIR%%/xmlroff-fo-area-graphic.html
-%%DOCSDIR%%/xmlroff-fo-area-inline.html
-%%DOCSDIR%%/xmlroff-font-size.html
-%%DOCSDIR%%/xmlroff-fo-doc-commands.html
-%%DOCSDIR%%/xmlroff-fo-layout-gp.html
-%%DOCSDIR%%/xmlroff-fo-libfo-basic.html
-%%DOCSDIR%%/xmlroff-fo-marker-parent.html
-%%DOCSDIR%%/xmlroff-fo-property-border-color.html
-%%DOCSDIR%%/xmlroff-fo-retrieve-marker.html
-%%DOCSDIR%%/xmlroff-font-family.html
-%%DOCSDIR%%/xmlroff-font-stretch.html
-%%DOCSDIR%%/xmlroff-font-style.html
-%%DOCSDIR%%/xmlroff-font-variant.html
-%%DOCSDIR%%/xmlroff-font-weight.html
-%%DOCSDIR%%/xmlroff-footnote-body.html
-%%DOCSDIR%%/xmlroff-footnote.html
-%%DOCSDIR%%/xmlroff-format.html
-%%DOCSDIR%%/xmlroff-grouping-separator.html
-%%DOCSDIR%%/xmlroff-grouping-size.html
-%%DOCSDIR%%/xmlroff-height.html
-%%DOCSDIR%%/xmlroff-id.html
-%%DOCSDIR%%/xmlroff-initial-property-set.html
-%%DOCSDIR%%/xmlroff-inline-container.html
-%%DOCSDIR%%/xmlroff-inline-progression-dimension.html
-%%DOCSDIR%%/xmlroff-inline-progression-dimensionmaximum.html
-%%DOCSDIR%%/xmlroff-inline-progression-dimensionminimum.html
-%%DOCSDIR%%/xmlroff-inline-progression-dimensionoptimum.html
-%%DOCSDIR%%/xmlroff-inline.html
-%%DOCSDIR%%/xmlroff-keep-together.html
-%%DOCSDIR%%/xmlroff-instream-foreign-object.html
-%%DOCSDIR%%/xmlroff-keep-togetherwithin-column.html
-%%DOCSDIR%%/xmlroff-keep-togetherwithin-line.html
-%%DOCSDIR%%/xmlroff-keep-togetherwithin-page.html
-%%DOCSDIR%%/xmlroff-keep-with-next.html
-%%DOCSDIR%%/xmlroff-keep-with-nextwithin-column.html
-%%DOCSDIR%%/xmlroff-keep-with-nextwithin-line.html
-%%DOCSDIR%%/xmlroff-keep-with-nextwithin-page.html
-%%DOCSDIR%%/xmlroff-keep-with-previous.html
-%%DOCSDIR%%/xmlroff-keep-with-previouswithin-column.html
-%%DOCSDIR%%/xmlroff-layout-master-set.html
-%%DOCSDIR%%/xmlroff-keep-with-previouswithin-line.html
-%%DOCSDIR%%/xmlroff-keep-with-previouswithin-page.html
-%%DOCSDIR%%/xmlroff-leader.html
-%%DOCSDIR%%/xmlroff-letter-value.html
-%%DOCSDIR%%/xmlroff-line-height.html
-%%DOCSDIR%%/xmlroff-line-stacking-strategy.html
-%%DOCSDIR%%/xmlroff-linefeed-treatment.html
-%%DOCSDIR%%/xmlroff-list-block.html
-%%DOCSDIR%%/xmlroff-list-item-body.html
-%%DOCSDIR%%/xmlroff-list-item-label.html
-%%DOCSDIR%%/xmlroff-list-item.html
-%%DOCSDIR%%/xmlroff-margin-bottom.html
-%%DOCSDIR%%/xmlroff-margin-left.html
-%%DOCSDIR%%/xmlroff-margin-right.html
-%%DOCSDIR%%/xmlroff-margin-top.html
-%%DOCSDIR%%/xmlroff-margin.html
-%%DOCSDIR%%/xmlroff-marker.html
-%%DOCSDIR%%/xmlroff-master-name.html
-%%DOCSDIR%%/xmlroff-master-reference.html
-%%DOCSDIR%%/xmlroff-media-usage.html
-%%DOCSDIR%%/xmlroff-multi-case.html
-%%DOCSDIR%%/xmlroff-multi-properties.html
-%%DOCSDIR%%/xmlroff-multi-property-set.html
-%%DOCSDIR%%/xmlroff-multi-switch.html
-%%DOCSDIR%%/xmlroff-multi-toggle.html
-%%DOCSDIR%%/xmlroff-number-columns-repeated.html
-%%DOCSDIR%%/xmlroff-number-columns-spanned.html
-%%DOCSDIR%%/xmlroff-number-rows-spanned.html
-%%DOCSDIR%%/xmlroff-orphans.html
-%%DOCSDIR%%/xmlroff-overflow.html
-%%DOCSDIR%%/xmlroff-padding-after.html

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***



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