Fix build when DOCS=on.

5 files changed, 24 insertions, 16 deletions

diff --git a/textproc/xmlroff/Makefile b/textproc/xmlroff/Makefile
index 95ad1c0bbed9..5063444d5022 100644
--- a/textproc/xmlroff/Makefile
+++ b/textproc/xmlroff/Makefile
@@ -22,7 +22,6 @@ 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= --with-html-dir=${PREFIX}/share/doc
@@ -30,6 +29,6 @@ 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
+DOCS_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gtk-doc.pc:textproc/gtk-doc
 
 .include <bsd.port.mk>
diff --git a/textproc/xmlroff/files/patch-Makefile.am b/textproc/xmlroff/files/patch-Makefile.am
index 30813381d272..d2f5c1e7733d 100644
--- a/textproc/xmlroff/files/patch-Makefile.am
+++ b/textproc/xmlroff/files/patch-Makefile.am
@@ -1,6 +1,6 @@
---- 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 @@
+--- Makefile.am.orig	2009-03-11 21:08:57 UTC
++++ Makefile.am
+@@ -6,26 +6,14 @@ if ENABLE_CUNIT
  CUNIT_DIRS = cunit
  endif
  
diff --git a/textproc/xmlroff/files/patch-configure.ac b/textproc/xmlroff/files/patch-configure.ac
index 2cd5146849dd..d06c812b2090 100644
--- a/textproc/xmlroff/files/patch-configure.ac
+++ b/textproc/xmlroff/files/patch-configure.ac
@@ -1,6 +1,6 @@
---- 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 @@
+--- configure.ac.orig	2009-03-11 21:08:57 UTC
++++ configure.ac
+@@ -230,30 +230,26 @@ fi
  AM_CONDITIONAL(ENABLE_MAN, test x$enable_man != xno)
  
  #
@@ -42,7 +42,7 @@
  
  AC_ARG_ENABLE(rebuilds,
  	      AC_HELP_STRING([--disable-rebuilds],
-@@ -623,14 +619,6 @@
+@@ -623,14 +619,6 @@ cunit/Makefile
  docs/Makefile
  examples/Makefile
  examples/xml2003/Makefile
diff --git a/textproc/xmlroff/files/patch-docs-Makefile.am b/textproc/xmlroff/files/patch-docs-Makefile.am
index 4e36cb4488d8..5bff1d580dbf 100644
--- a/textproc/xmlroff/files/patch-docs-Makefile.am
+++ b/textproc/xmlroff/files/patch-docs-Makefile.am
@@ -1,6 +1,15 @@
---- 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 @@
+--- docs/Makefile.am.orig	2009-03-11 21:08:57 UTC
++++ docs/Makefile.am
+@@ -186,7 +186,7 @@ GTKDOC_CFLAGS = \
+ 	-I$(top_builddir)
+ 
+ GTKDOC_LIBS = \
+-	../libfo/libfo-0.6.la \
++	$(LIBFO_LIBS) \
+ 	$(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
  
  xmlroff.fo:	xmlroff.xml ../libfo-compat.xsl
diff --git a/textproc/xmlroff/files/patch-xmlroff-Makefile.am b/textproc/xmlroff/files/patch-xmlroff-Makefile.am
index 2ba6530d6c32..8417cadffc52 100644
--- a/textproc/xmlroff/files/patch-xmlroff-Makefile.am
+++ b/textproc/xmlroff/files/patch-xmlroff-Makefile.am
@@ -1,6 +1,6 @@
---- 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 @@
+--- xmlroff/Makefile.am.orig	2009-03-11 21:08:57 UTC
++++ xmlroff/Makefile.am
+@@ -6,8 +6,7 @@ endif
  
  INCLUDES = \
  	-DG_LOG_DOMAIN=\"libfo\"	\
@@ -10,7 +10,7 @@
  
  bin_PROGRAMS = \
  	xmlroff
-@@ -18,11 +17,8 @@
+@@ -18,11 +17,8 @@ bin_PROGRAMS = \
  xmlroff_SOURCES = \
  	xmlroff.c