The FreeBSD GNOME team proudly presents GNOME 3.28 for FreeBSD.

The offical GNOME 3.28 release notes can be found at
https://help.gnome.org/misc/release-notes/3.28/

Thanks to Antoine Brodin for running the exp-runs.

PR:		229761

4 files changed, 82 insertions, 10 deletions

diff --git a/textproc/xmlroff/Makefile b/textproc/xmlroff/Makefile
index 3f1fe4f642bc..b7f9fb6fc776 100644
--- a/textproc/xmlroff/Makefile
+++ b/textproc/xmlroff/Makefile
@@ -3,8 +3,8 @@
 
 PORTNAME=	xmlroff
 PORTVERSION=	0.6.2
-PORTREVISION=	7
 DISTVERSIONPREFIX=	v
+PORTREVISION=	7
 CATEGORIES=	textproc
 
 MAINTAINER=	hrs@FreeBSD.org
@@ -16,7 +16,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 BUILD_DEPENDS=	libfo>=0.6.2:textproc/libfo
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-USES=		autoreconf gmake gettext libtool pkgconfig
+USES=		autoreconf gmake gnome gettext libtool pkgconfig
 USE_GITHUB=	yes
 USE_GNOME=	libgnomeprint libartlgpl2 pango glib20 \
 		libxslt libxml2 gdkpixbuf2
@@ -24,11 +24,14 @@ GH_ACCOUNT=	xmlroff
 GH_PROJECT=	xmlroff
 WRKSRC_SUBDIR=	${PORTNAME}
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc
+CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc --enable-man
 INSTALL_TARGET=	install-strip
 
 OPTIONS_DEFINE=	DOCS
 DOCS_CONFIGURE_ENABLE=	gtk-doc
 DOCS_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gtk-doc.pc:textproc/gtk-doc
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/docs/Makefile.am
+
 .include <bsd.port.mk>
diff --git a/textproc/xmlroff/files/patch-configure.ac b/textproc/xmlroff/files/patch-configure.ac
index d06c812b2090..167fdcd402ef 100644
--- a/textproc/xmlroff/files/patch-configure.ac
+++ b/textproc/xmlroff/files/patch-configure.ac
@@ -5,11 +5,11 @@
  
  #
 -# Checks for libxslt
--#
--# Variables for libxslt will also include values appropriate for
--# libxml2.
 +# Checks for libfo
  #
+-# Variables for libxslt will also include values appropriate for
+-# libxml2.
+-#
 -LIBXSLT_PACKAGES=libxslt
 -LIBXSLT_REQUIRED_VERSION=1.0.3
 +LIBFO_PACKAGES=libfo-0.6
diff --git a/textproc/xmlroff/files/patch-docs-Makefile.am b/textproc/xmlroff/files/patch-docs-Makefile.am
index 17785cf54cfa..3d634b20c5e1 100644
--- a/textproc/xmlroff/files/patch-docs-Makefile.am
+++ b/textproc/xmlroff/files/patch-docs-Makefile.am
@@ -9,16 +9,73 @@
  	$(PANGO_LIBS) \
  	$(GNOMEPRINT_LIBS) \
  	$(GDKPIXBUF_LIBS)	\
-@@ -228,7 +228,7 @@ dist-hook-local:
- DOCBOOK_XSL=http://docbook.sourceforge.net/release/xsl/current/fo/docbook.xsl
+@@ -203,7 +203,7 @@ if ENABLE_MAN
+ man_MANS = xmlroff.1 
+ 
+ .xml.1:
+-	@XSLTPROC@ -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
++	@XSLTPROC@ -nonet file://%%LOCALBASE%%/share/xsl/docbook/manpages/docbook.xsl $<
+ 
+ BUILT_EXTRA_DIST = $(man_MANS)
+ endif
+@@ -225,10 +225,10 @@ dist-hook-local:
+ #	done
+ 
+ # Location of DocBook XSL stylesheet.
+-DOCBOOK_XSL=http://docbook.sourceforge.net/release/xsl/current/fo/docbook.xsl
++DOCBOOK_XSL=file://%%LOCALBASE%%/share/xsl/docbook/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
++	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
  
-@@ -341,8 +341,6 @@ install-data-local:
+@@ -254,8 +254,8 @@ EXTRA_DIST = 				\
+ 	$(DOC_MODULE)-sections.txt	\
+ 	$(DOC_MODULE)-overrides.txt
+ 
+-DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \
+-	   $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp
++DOC_STAMPS=scan-build.stamp sgml-build.stamp html-build.stamp \
++	   $(srcdir)/sgml.stamp $(srcdir)/html.stamp
+ 
+ SCANOBJ_FILES = 		 \
+ 	$(DOC_MODULE).args  	 \
+@@ -286,22 +286,9 @@ scan-build.stamp: $(HFILE_GLOB)
+ $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES): scan-build.stamp
+ 	@true
+ 
+-#### templates ####
+-
+-tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
+-	@echo '*** Rebuilding template files ***'
+-	cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE)
+-	touch tmpl-build.stamp
+-
+-tmpl.stamp: tmpl-build.stamp
+-	@true
+-
+-tmpl/*.sgml:
+-	@true
+-
+ #### sgml ####
+ 
+-sgml-build.stamp: tmpl.stamp $(CFILE_GLOB) $(srcdir)/tmpl/*.sgml
++sgml-build.stamp: scan-build.stamp $(CFILE_GLOB)
+ 	@echo '*** Building SGML ***'
+ 	cd $(srcdir) && \
+ 	gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) $(MKDB_OPTIONS)
+@@ -319,7 +306,7 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(c
+ 	cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
+ 	test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
+ 	@echo '-- Fixing Crossreferences' 
+-	cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
++	cd $(srcdir) && gtkdoc-fixxref --module=xmlroff --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
+ 	touch html-build.stamp
+ endif
+ 
+@@ -341,8 +328,6 @@ install-data-local:
  	    echo '-- Installing '$$i ; \
  	    $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
  	  done; \
@@ -27,3 +84,14 @@
  	fi)
  
  #
+@@ -357,10 +342,8 @@ dist-check-gtkdoc:
+ endif
+ 
+ dist-hook: dist-check-gtkdoc dist-hook-local
+-	mkdir $(distdir)/tmpl
+ 	mkdir $(distdir)/xml
+ 	mkdir $(distdir)/html
+-	-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
+ 	-cp $(srcdir)/xml/*.xml $(distdir)/xml
+ 	-cp $(srcdir)/html/* $(distdir)/html
+ 
diff --git a/textproc/xmlroff/pkg-plist b/textproc/xmlroff/pkg-plist
index fd427c0e7bb4..18756ea12c51 100644
--- a/textproc/xmlroff/pkg-plist
+++ b/textproc/xmlroff/pkg-plist
@@ -344,3 +344,4 @@ share/xml/libfo-0.6.2/xmlroff.xml
 %%PORTDOCS%%%%DOCSDIR%%/xmlroff.1.html
 %%PORTDOCS%%%%DOCSDIR%%/xmlroff.css
 %%PORTDOCS%%%%DOCSDIR%%/xmlroff.devhelp2
+man/man1/xmlroff.1.gz