6 files changed, 21 insertions, 25 deletions

diff --git a/textproc/libfo/Makefile b/textproc/libfo/Makefile
index 9a808c61d3a0..b1bf15d2dfbd 100644
--- a/textproc/libfo/Makefile
+++ b/textproc/libfo/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	libfo
-PORTVERSION=	0.6.2
+PORTVERSION=	0.6.3
 DISTVERSIONPREFIX=	v
 CATEGORIES=	textproc
 
@@ -18,9 +18,8 @@ LIB_DEPENDS=	libcairo.so:graphics/cairo \
 
 CONFLICTS_INSTALL=	xmlroff-0.6.[12] xmlroff-0.6.2_[12345]
 
-USES=		autoreconf gettext gmake gnome libtool pathfix pkgconfig
-USE_GNOME=	libgnomeprint libxslt \
-		libxml2 gtk20 glib20 pango \
+USES=		autoreconf gettext gmake gnome localbase libtool pathfix pkgconfig
+USE_GNOME=	libxslt libxml2 gtk20 glib20 pango \
 		librsvg2 gdkpixbuf2
 USE_GITHUB=	yes
 GH_PROJECT=	xmlroff
@@ -28,9 +27,8 @@ GH_ACCOUNT=	xmlroff
 USE_LDCONFIG=	yes
 WRKSRC_SUBDIR=	xmlroff
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS= --disable-gtk-doc
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+CONFIGURE_ARGS= --disable-gtk-doc \
+		--disable-gp
 INSTALL_TARGET=	install-strip
 
 post-patch:
diff --git a/textproc/libfo/distinfo b/textproc/libfo/distinfo
index 2a1c36f9e732..de49655fd006 100644
--- a/textproc/libfo/distinfo
+++ b/textproc/libfo/distinfo
@@ -1,2 +1,3 @@
-SHA256 (xmlroff-xmlroff-v0.6.2_GH0.tar.gz) = 9c4777c27418eeb013b50246a4852f49893829ee6463b9686f4e7f26bbb19fe9
-SIZE (xmlroff-xmlroff-v0.6.2_GH0.tar.gz) = 2195618
+TIMESTAMP = 1577395774
+SHA256 (xmlroff-xmlroff-v0.6.3_GH0.tar.gz) = ef8386da3cd2fb12ac0d59899e3017b5ab2bebe8df23a94dbe95191724c3bc8f
+SIZE (xmlroff-xmlroff-v0.6.3_GH0.tar.gz) = 2183347
diff --git a/textproc/libfo/pkg-plist b/textproc/libfo/pkg-plist
index 2c08ca147e34..2ebdd24012e2 100644
--- a/textproc/libfo/pkg-plist
+++ b/textproc/libfo/pkg-plist
@@ -13,10 +13,6 @@ 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
@@ -41,7 +37,7 @@ 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
+lib/libfo-0.6.so.0.603.0
 libdata/pkgconfig/libfo-0.6.pc
-@xmlcatmgr share/xml/libfo-0.6.2/catalog.xml
-share/xml/libfo-0.6.2/libfo-compat.xsl
+@xmlcatmgr share/xml/libfo-0.6.3/catalog.xml
+share/xml/libfo-0.6.3/libfo-compat.xsl
diff --git a/textproc/xmlroff/Makefile b/textproc/xmlroff/Makefile
index b7f9fb6fc776..6c4a3c304929 100644
--- a/textproc/xmlroff/Makefile
+++ b/textproc/xmlroff/Makefile
@@ -2,9 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	xmlroff
-PORTVERSION=	0.6.2
+PORTVERSION=	0.6.3
 DISTVERSIONPREFIX=	v
-PORTREVISION=	7
 CATEGORIES=	textproc
 
 MAINTAINER=	hrs@FreeBSD.org
@@ -16,15 +15,16 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 BUILD_DEPENDS=	libfo>=0.6.2:textproc/libfo
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-USES=		autoreconf gmake gnome gettext libtool pkgconfig
+USES=		autoreconf gmake gnome gettext localbase libtool pkgconfig
 USE_GITHUB=	yes
-USE_GNOME=	libgnomeprint libartlgpl2 pango glib20 \
+USE_GNOME=	libartlgpl2 pango glib20 \
 		libxslt libxml2 gdkpixbuf2
 GH_ACCOUNT=	xmlroff
 GH_PROJECT=	xmlroff
 WRKSRC_SUBDIR=	${PORTNAME}
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc --enable-man
+CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc --enable-man \
+		--disable-gp
 INSTALL_TARGET=	install-strip
 
 OPTIONS_DEFINE=	DOCS
diff --git a/textproc/xmlroff/distinfo b/textproc/xmlroff/distinfo
index 2a1c36f9e732..10f670115407 100644
--- a/textproc/xmlroff/distinfo
+++ b/textproc/xmlroff/distinfo
@@ -1,2 +1,3 @@
-SHA256 (xmlroff-xmlroff-v0.6.2_GH0.tar.gz) = 9c4777c27418eeb013b50246a4852f49893829ee6463b9686f4e7f26bbb19fe9
-SIZE (xmlroff-xmlroff-v0.6.2_GH0.tar.gz) = 2195618
+TIMESTAMP = 1577395747
+SHA256 (xmlroff-xmlroff-v0.6.3_GH0.tar.gz) = ef8386da3cd2fb12ac0d59899e3017b5ab2bebe8df23a94dbe95191724c3bc8f
+SIZE (xmlroff-xmlroff-v0.6.3_GH0.tar.gz) = 2183347
diff --git a/textproc/xmlroff/pkg-plist b/textproc/xmlroff/pkg-plist
index 18756ea12c51..38cac2fd8857 100644
--- a/textproc/xmlroff/pkg-plist
+++ b/textproc/xmlroff/pkg-plist
@@ -1,6 +1,6 @@
 bin/xmlroff
-share/xml/libfo-0.6.2/xmlroff.fo
-share/xml/libfo-0.6.2/xmlroff.xml
+share/xml/libfo-0.6.3/xmlroff.fo
+share/xml/libfo-0.6.3/xmlroff.xml
 %%PORTDOCS%%%%DOCSDIR%%/FoArea.html
 %%PORTDOCS%%%%DOCSDIR%%/FoAreaArea.html
 %%PORTDOCS%%%%DOCSDIR%%/FoAreaLayout.html