5 files changed, 43 insertions, 46 deletions

diff --git a/textproc/linuxdoc-tools/Makefile b/textproc/linuxdoc-tools/Makefile
index ff9c06ddfb7d..97477a6a7adf 100644
--- a/textproc/linuxdoc-tools/Makefile
+++ b/textproc/linuxdoc-tools/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	linuxdoc-tools
-PORTVERSION=	0.9.69
+PORTVERSION=	0.9.71
 CATEGORIES=	textproc
 MASTER_SITES=	DEBIAN
 DISTNAME=	${PORTNAME}_${DISTVERSION}.orig
@@ -33,11 +33,9 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 OPTIONS_DEFINE=	DOCS
 
 DOCS_BUILD_DEPENDS=	bash:shells/bash
+DOCS_USE=		tex=latex:build tex=pdftex:build tex=dvipsk:build
 DOCS_USES=		makeinfo
-DOCS_MAKE_ENV=		LANG=C BUILD_DOCS=true
-
-post-patch:
-	@${REINPLACE_CMD} -E '/^(CC|CFLAGS)/ s|=|?=|' \
-		${WRKSRC}/rtf-fix/Makefile
+DOCS_CONFIGURE_ENABLE=	docs
+DOCS_MAKE_ENV=		LANG=C
 
 .include <bsd.port.mk>
diff --git a/textproc/linuxdoc-tools/distinfo b/textproc/linuxdoc-tools/distinfo
index d96a3390eb06..ee9c9aa5a533 100644
--- a/textproc/linuxdoc-tools/distinfo
+++ b/textproc/linuxdoc-tools/distinfo
@@ -1,2 +1,2 @@
-SHA256 (linuxdoc-tools_0.9.69.orig.tar.gz) = 7103facee18a2ea97186ca459d743d22f7f89ad4b5cd1dfd1c34f83d6bfd4101
-SIZE (linuxdoc-tools_0.9.69.orig.tar.gz) = 604379
+SHA256 (linuxdoc-tools_0.9.71.orig.tar.gz) = 641e4f02ccbe3ee7fad9e866d334f8880a3f621e70c7412a7bd504a777a992ed
+SIZE (linuxdoc-tools_0.9.71.orig.tar.gz) = 613067
diff --git a/textproc/linuxdoc-tools/files/patch-Makefile.in b/textproc/linuxdoc-tools/files/patch-Makefile.in
index 6ea7e14ff9d3..e76366a0b057 100644
--- a/textproc/linuxdoc-tools/files/patch-Makefile.in
+++ b/textproc/linuxdoc-tools/files/patch-Makefile.in
@@ -1,15 +1,14 @@
---- Makefile.in.orig	2013-04-08 17:11:41 UTC
+--- Makefile.in.orig	2016-04-20 23:33:09 UTC
 +++ Makefile.in
-@@ -47,7 +47,7 @@ INCLUDE  =
- OPTIMIZE = -O
- DEBUG    =
- WARN     =
--CFLAGS   = $(DEBUG) $(INCLUDE) $(WARN) $(PROFILE) $(OPTIMIZE)
-+CFLAGS  += $(DEBUG) $(INCLUDE) $(WARN) $(PROFILE)
- LDFLAGS  = $(DEBUG) $(PROFILE)
- 
- all:
-@@ -113,7 +113,7 @@ ifeq ($(BUILD_ISO_ENTITIES), true)
+@@ -83,6 +83,7 @@ ifneq ($(BUILDDOC_FORMATS),)
+ #    -- Build documentation
+ 	@echo "Building documentation ..."
+ 	(cd doc; \
++		MAKE=$(MAKE) \
+ 		PREFIX=$(prefix) \
+ 		BUILD_ISO_ENTITIES=$(BUILD_ISO_ENTITIES) \
+ 		BUILD_ENTITY_MAP=$(BUILD_ENTITY_MAP) \
+@@ -121,7 +122,7 @@ ifeq ($(BUILD_ISO_ENTITIES), true)
  endif
  
  #    -- Install linuxdoc script
@@ -18,19 +17,3 @@
  
  #    -- Install auxiliary programs
  	mkdir -p $(auxbin_ddir)
-@@ -162,6 +162,7 @@ endif
- 	$(INSTALL_DATA) tex/* $(tex_ddir)
- 
- #    -- Build and install documentation
-+ifeq ($(BUILD_DOCS), true)
- 	@echo "Installing documentation in $(doc_ddir) ..."
- 	(cd doc; \
- 		PATH=${PATH}:$(bin_ddir) \
-@@ -177,6 +178,7 @@ endif
- 	rm -f $(doc_ddir)/Makedoc.sh
- 	find $(doc_ddir) -type d -print | xargs chmod 755
- 	find $(doc_ddir) -type f -print | xargs chmod 644
-+endif
- 
- # what dirs do the targets clean and distclean need?
- DDIRS=
diff --git a/textproc/linuxdoc-tools/files/patch-doc_Makedoc.sh b/textproc/linuxdoc-tools/files/patch-doc_Makedoc.sh
new file mode 100644
index 000000000000..d80ce158b2bd
--- /dev/null
+++ b/textproc/linuxdoc-tools/files/patch-doc_Makedoc.sh
@@ -0,0 +1,27 @@
+--- doc/Makedoc.sh.orig	2015-10-20 11:22:17 UTC
++++ doc/Makedoc.sh
+@@ -33,10 +33,10 @@ if [ "${BUILD_ENTITY_MAP}" = "true" ]; t
+     # Create a modified EntityMap.pm with entity-map location in doc
+     # build temporary dir. Need to properly install entity-map there.
+     mkdir $TMPDIR/Text
+-    make -C ../entity-map install DESTDIR="$TMPDIR"
++    ${MAKE} -C ../entity-map install DESTDIR="$TMPDIR"
+     sed < ../entity-map/EntityMap.pm.in > $TMPDIR/Text/EntityMap.pm \
+-	-e 's|\@localentitymapdir\@|'${TMPDIR}'/usr/share/entity-map|g' \
+-	-e 's|\@entitymapdir\@|'${TMPDIR}'/usr/share/entity-map/0.1.0|g'
++	-e 's|\@localentitymapdir\@|'${TMPDIR}${PREFIX}'/share/entity-map|g' \
++	-e 's|\@entitymapdir\@|'${TMPDIR}${PREFIX}'/share/entity-map/0.1.0|g'
+ 
+     # Set ${TMPDIR} first in perl load path (Will put Text dir there
+     # for modified EntityMap.pm), then our perl5lib
+@@ -49,8 +49,8 @@ fi
+ if [ "${BUILD_ISO_ENTITIES}" = "true" ]; then
+     # --without-installed-iso-entities: Install iso-entities in
+     # "$TMPDIR/usr" and set it as iso-entities prefix.
+-    make -C ../iso-entities install DESTDIR="$TMPDIR"
+-    ISOENTITIES_PREFIX="${TMPDIR}/usr"
++    ${MAKE} -C ../iso-entities install DESTDIR="$TMPDIR"
++    ISOENTITIES_PREFIX="${TMPDIR}${PREFIX}"
+ else
+     # --with-installed-iso-entities: Use system prefix.
+     ISOENTITIES_PREFIX="${PREFIX}"
diff --git a/textproc/linuxdoc-tools/files/patch-rtf-fix_rtf2rtf.l b/textproc/linuxdoc-tools/files/patch-rtf-fix_rtf2rtf.l
deleted file mode 100644
index 15c12ccb31e3..000000000000
--- a/textproc/linuxdoc-tools/files/patch-rtf-fix_rtf2rtf.l
+++ /dev/null
@@ -1,11 +0,0 @@
---- rtf-fix/rtf2rtf.l.orig	2013-04-08 17:11:41 UTC
-+++ rtf-fix/rtf2rtf.l
-@@ -22,7 +22,7 @@
- 
- %{
- 
--#include <malloc.h>
-+#include <stdlib.h>
- #include <stdio.h>
- #include <string.h>
-