5 files changed, 43 insertions, 73 deletions

diff --git a/textproc/yodl/Makefile b/textproc/yodl/Makefile
index b56e77330f1a..f124d676e4b9 100644
--- a/textproc/yodl/Makefile
+++ b/textproc/yodl/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	yodl
-PORTVERSION=	2.14.0
+PORTVERSION=	2.14.2
 CATEGORIES=	textproc
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}_${PORTVERSION}
@@ -24,8 +24,8 @@ BUILD_DEPENDS=	icmake:${PORTSDIR}/devel/icmake \
 USE_PERL5_BUILD=	yes
 
 MANCOMPRESSED=	no
-MAN1=		yodl.1 yodlpost.1 yodlconverters.1 yodlverbinsert.1
-MAN7=		yodlmanpage.7 yodlletter.7 yodlmacros.7 yodlbuiltins.7
+MAN1=		yodl.1 yodlpost.1 yodlconverters.1 yodlverbinsert.1 yodlstriproff.1
+MAN7=		yodlmanpage.7 yodlletter.7 yodlmacros.7
 
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION}
 PORTDOCS=	*
@@ -40,29 +40,26 @@ BUILD_DEPENDS+=	latex:${PORTSDIR}/print/teTeX-base \
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|"/usr/share/yodl"|"${PREFIX}/share/${PORTNAME}-${PORTVERSION}"| ; \
-		s|"/usr/bin"|"${PREFIX}/bin"|' \
-		${WRKSRC}/src/config.h
-	@${REINPLACE_CMD} -e 's|"/share/yodl"|"/share/yodl-${PORTVERSION}"| ; \
-		s|"-r"|"-R"| ; \
+	@${REINPLACE_CMD} -e 's|"/usr"|"${PREFIX}"| ; \
+		s|"/share/yodl"|"/share/${PORTNAME}-${PORTVERSION}"| ; \
 		s|"/share/man"|"/man"| ; \
-		s|"/share/doc"|"/share/doc/yodl-${PORTVERSION}"| ; \
-		s|"/share/doc/yodl"|"/share/doc/yodl-${PORTVERSION}"|' \
+		s|"/share/doc/yodl"|"/share/doc/${PORTNAME}-${PORTVERSION}"| ; \
+		s|"/share/doc/yodl-doc"|"/share/doc/${PORTNAME}-${PORTVERSION}/doc"| ; \
+		s|"gcc"|"${CC}"|' \
+		${WRKSRC}/INSTALL.im
+	@${REINPLACE_CMD} -e 's|yodlconverters.1|yodlconverters.1.gz| ; \
+		s|".1"|".1.gz"|' \
+		${WRKSRC}/icmake/install
+	@${REINPLACE_CMD} -e 's|#!/usr/bin/icmake|#!${LOCALBASE}/bin/icmake| ; \
+		s|"-O2 -Wall"|"-Wall ${CFLAGS}"|' \
 		${WRKSRC}/build
-	@${REINPLACE_CMD} -e 's|#!/usr/bin/icmake|#!${LOCALBASE}/bin/icmake|' \
-		${WRKSRC}/build \
-		${WRKSRC}/src/build \
-		${WRKSRC}/src/yodlpost/build \
-		${WRKSRC}/src/yodl/build \
-		${WRKSRC}/manual/build \
-		${WRKSRC}/man/build \
-		${WRKSRC}/macros/build
 	@${REINPLACE_CMD} -e 's|#!/bin/bash|#!${LOCALBASE}/bin/bash| ; \
 		s|sed |${LOCALBASE}/bin/gsed | ; \
 		s|getopt |${LOCALBASE}/bin/getopt |' \
 		${WRKSRC}/src/yodl/replace \
 		${WRKSRC}/scripts/yodl2whatever.in \
 		${WRKSRC}/scripts/configreplacements \
+		${WRKSRC}/scripts/createmacros \
 		${WRKSRC}/macros/rawmacros/separator \
 		${WRKSRC}/macros/rawmacros/keepdiff \
 		${WRKSRC}/macros/rawmacros/repairs \
@@ -73,17 +70,32 @@ post-patch:
 		${WRKSRC}/macros/rawmacros/separator.pl \
 		${WRKSRC}/macros/rawmacros/startdoc.pl \
 		${WRKSRC}/contrib/build.pl
+	@${REINPLACE_CMD} -e 's|@STD_INCLUDE@|tmp/install@STD_INCLUDE@|' \
+		${WRKSRC}/macros/in/html.in \
+		${WRKSRC}/macros/in/latex.in \
+		${WRKSRC}/macros/in/man.in \
+		${WRKSRC}/macros/in/txt.in \
+		${WRKSRC}/macros/in/xml.in
+	@${REINPLACE_CMD} -e 's|../../yodl/|../../../${PORTNAME}-${PORTVERSION}/|' \
+		${WRKSRC}/manual/yo/manual.yo
 
 do-build:
-	@cd ${WRKSRC} && ./build package
+	@cd ${WRKSRC} && ./build programs
+.if !defined(NO_INSTALL_MANPAGES)
+	@cd ${WRKSRC} && ./build man
+.endif
 .if !defined(NOPORTDOCS)
-	@cd ${WRKSRC} && ./build doc
+	@cd ${WRKSRC} && ./build manual
 .endif
 
 do-install:
-	@cd ${WRKSRC} && ./build install ${PREFIX}
+	@cd ${WRKSRC} && ./build install programs ""
+	@cd ${WRKSRC} && ./build install macros ""
+.if !defined(NO_INSTALL_MANPAGES)
+	@cd ${WRKSRC} && ./build install man ""
+.endif
 .if !defined(NOPORTDOCS)
-	@cd ${WRKSRC} && ./build install_doc ${PREFIX}
+	@cd ${WRKSRC} && ./build install manual "" && ./build install docs ""
 .endif
 
 .include <bsd.port.mk>
diff --git a/textproc/yodl/distinfo b/textproc/yodl/distinfo
index dfa01fd20c2f..d0c25a209d23 100644
--- a/textproc/yodl/distinfo
+++ b/textproc/yodl/distinfo
@@ -1,3 +1,3 @@
-MD5 (yodl_2.14.0.orig.tar.gz) = 152640d3bc95d14e62d47862b2d09893
-SHA256 (yodl_2.14.0.orig.tar.gz) = a99566dbe4f124ac7b1bba95e8cf59f560ef1239c7eff8f7d64764389405e822
-SIZE (yodl_2.14.0.orig.tar.gz) = 703000
+MD5 (yodl_2.14.2.orig.tar.gz) = 23bfc74724eb7ad1c6bd60e0d6926db2
+SHA256 (yodl_2.14.2.orig.tar.gz) = 5501b697fb665f6278c54be52f950d9a5ea03ed4dd87007744c76af1b13b6a15
+SIZE (yodl_2.14.2.orig.tar.gz) = 291406
diff --git a/textproc/yodl/files/patch-build b/textproc/yodl/files/patch-build
deleted file mode 100644
index 891021c9ab44..000000000000
--- a/textproc/yodl/files/patch-build
+++ /dev/null
@@ -1,43 +0,0 @@
---- build.orig	2007-02-12 20:01:56.000000000 +0100
-+++ build	2009-03-04 19:27:30.000000000 +0100
-@@ -28,11 +28,15 @@
-     buildIn("macros",   "std", "");     // and the std conversions
-     
-     buildIn("manual",   "docmacros", "");// macrolist for the manual
--    buildIn("manual",   "manual", "");  // create the manual
- 
-     buildIn("man",      "man", "");     // create the manpages
- }
- 
-+void doc()
-+{
-+    buildIn("manual",   "manual", "");  // create the manual
-+}
-+
- void install(string where)
- {
-     system("mkdir -p " + where);
-@@ -40,6 +44,10 @@
-     buildIn("src",      "install",  where + "/bin");
-     buildIn("macros",   "install",  where + "/share/yodl");
-     buildIn("man",      "install",  where + "/share/man");
-+}
-+
-+void install_doc(string where)
-+{
-     buildIn("manual",   "install",  where + "/share/doc");
- 
-     exec("cp", "-r", 
-@@ -74,8 +82,12 @@
-         cleanup();
-     else if (arg1 == "install")
-         install(element(2, argv));
-+    else if (arg1 == "install_doc")
-+	install_doc(element(2, argv));
-     else if (arg1 == "package")
-         package();
-+    else if (arg1 == "doc")
-+	doc();
-     else
-     {
-         printf("request `", arg1, "' not yet available\n");
diff --git a/textproc/yodl/pkg-descr b/textproc/yodl/pkg-descr
index 5e7e99e5fa7e..b443de7624e4 100644
--- a/textproc/yodl/pkg-descr
+++ b/textproc/yodl/pkg-descr
@@ -1,6 +1,6 @@
-YODL - Your Own Document Language, an easy to use but powerful document
-preparation language with converters for ASCII, man, latex, XML, and HTML.
+YODL - Your Own Document Language, implements an easy-to-use, yet
+powerful document preparation language.  It also includes converters to
+convert documents written in that language to several formats, including
+ASCII, man page format, LaTeX, DVI, XML, and HTML.
 
-YODL implements an easy-to-use, yet powerful document preparation language.
-It also includes converters to convert documents written in that language to
-several formats, including ASCII, man page format, LaTeX, dvi, XML, and HTML.
+WWW: http://yodl.sourceforge.net/
diff --git a/textproc/yodl/pkg-plist b/textproc/yodl/pkg-plist
index 3891da7a5094..ba85fa7db13c 100644
--- a/textproc/yodl/pkg-plist
+++ b/textproc/yodl/pkg-plist
@@ -7,6 +7,7 @@ bin/yodl2txt
 bin/yodl2whatever
 bin/yodl2xml
 bin/yodlpost
+bin/yodlstriproff
 bin/yodlverbinsert
 man/man1/yodl2html.1.gz
 man/man1/yodl2latex.1.gz