Index: head/textproc/yodl/Makefile =================================================================== --- head/textproc/yodl/Makefile (revision 475250) +++ head/textproc/yodl/Makefile (revision 475251) @@ -1,94 +1,95 @@ # Created by: Donald Burr # $FreeBSD$ PORTNAME= yodl PORTVERSION= 3.10.00 +PORTREVISION= 1 CATEGORIES= textproc MAINTAINER= bofh@FreeBSD.org COMMENT= Easy to use but powerful document formatting/preparation language LICENSE= GPLv3 RUN_DEPENDS= bash:shells/bash \ ${LOCALBASE}/bin/getopt:misc/getopt BUILD_DEPENDS= icmake:devel/icmake \ bash:shells/bash \ gsed:textproc/gsed USES= perl5 shebangfix compiler:c++14-lang USE_PERL5= build USE_GITLAB= yes GL_ACCOUNT= fbb-git GL_COMMIT= 5fa97b175c85581d01329013cfdb4239f019b023 SHEBANG_LANG= icmake icmake_OLD_CMD= /usr/bin/icmake icmake_CMD= ${LOCALBASE}/bin/icmake SHEBANG_FILES= ${WRKSRC}/macros/rawmacros/create \ ${WRKSRC}/macros/rawmacros/keepdiff \ ${WRKSRC}/macros/rawmacros/makeyoin \ ${WRKSRC}/macros/rawmacros/repairs \ ${WRKSRC}/macros/rawmacros/separator \ ${WRKSRC}/macros/rawmacros/separator.pl \ ${WRKSRC}/macros/rawmacros/startdoc \ ${WRKSRC}/macros/rawmacros/startdoc.pl \ ${WRKSRC}/contrib/build.pl \ ${WRKSRC}/src/yodl/replace \ ${WRKSRC}/scripts/configreplacements \ ${WRKSRC}/scripts/macroseparator.pl \ ${WRKSRC}/scripts/stdmacros \ ${WRKSRC}/scripts/yodl2whatever.in \ ${WRKSRC}/build DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION} PORTDOCS= * PLIST_SUB+= PORTVERSION="${PORTVERSION}" WRKSRC_SUBDIR= ${PORTNAME} OPTIONS_DEFINE= DOCS DOCS_USE= TEX=latex:build,dvipsk:build post-patch: @${REINPLACE_CMD} -e 's|"/usr"|"${PREFIX}"| ; \ s|"/share/yodl"|"/share/${PORTNAME}-${PORTVERSION}"| ; \ s|"/share/man"|"/man"| ; \ s|"/share/doc/yodl"|"/share/doc/${PORTNAME}-${PORTVERSION}"| ; \ s|"/share/doc/yodl-doc"|"/share/doc/${PORTNAME}-${PORTVERSION}/doc"| ; \ s|"gcc"|"${CC}"| ; \ s|"g++"|"${CXX}"|' \ ${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|sed |${LOCALBASE}/bin/gsed | ; \ s|getopt |${LOCALBASE}/bin/getopt |' \ ${WRKSRC}/scripts/configreplacements \ ${WRKSRC}/scripts/yodl2whatever.in \ ${WRKSRC}/scripts/yodlstriproff \ ${WRKSRC}/macros/rawmacros/repairs do-build: @cd ${WRKSRC} && ./build programs strip @cd ${WRKSRC} && ./build macros @cd ${WRKSRC} && ./build man do-build-DOCS-on: @cd ${WRKSRC} && ./build manual do-install: @cd ${WRKSRC} && ./build install programs ${STAGEDIR} @cd ${WRKSRC} && ./build install macros ${STAGEDIR} @cd ${WRKSRC} && ./build install man ${STAGEDIR} do-install-DOCS-on: @cd ${WRKSRC} && ./build install manual ${STAGEDIR} @cd ${WRKSRC} && ./build install docs ${STAGEDIR} .include Index: head/textproc/yodl/files/patch-src_verbinsert_verbinsert.cc =================================================================== --- head/textproc/yodl/files/patch-src_verbinsert_verbinsert.cc (revision 475250) +++ head/textproc/yodl/files/patch-src_verbinsert_verbinsert.cc (nonexistent) @@ -1,34 +0,0 @@ ---- src/verbinsert/verbinsert.cc.orig 2014-09-23 19:16:48 UTC -+++ src/verbinsert/verbinsert.cc -@@ -2,6 +2,7 @@ - #include - #include - #include -+#include - #include - - using namespace std; -@@ -37,19 +38,19 @@ int main(int argc, char **argv) - continue; - - case 's': -- indent.append(stoul(optarg), ' '); -+ indent.append(strtoul(optarg, NULL, 0), ' '); - continue; - - case 't': -- indent.insert(0, stoul(optarg), '\t'); -+ indent.insert(0, strtoul(optarg, NULL, 0), '\t'); - continue; - - case 'S': -- vindent.append(stoul(optarg), ' '); -+ vindent.append(strtoul(optarg, NULL, 0), ' '); - continue; - - case 'T': -- vindent.insert(0, stoul(optarg), '\t'); -+ vindent.insert(0, strtoul(optarg, NULL, 0), '\t'); - continue; - - case 'N': Property changes on: head/textproc/yodl/files/patch-src_verbinsert_verbinsert.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/textproc/yodl/files/patch-src_verbinsert_main.cc =================================================================== --- head/textproc/yodl/files/patch-src_verbinsert_main.cc (nonexistent) +++ head/textproc/yodl/files/patch-src_verbinsert_main.cc (revision 475251) @@ -0,0 +1,34 @@ +--- src/verbinsert/main.cc.orig 2018-07-22 13:07:15 UTC ++++ src/verbinsert/main.cc +@@ -2,6 +2,7 @@ + #include + #include + #include ++#include + #include + #include + +@@ -43,19 +44,19 @@ int main(int argc, char **argv) + continue; + + case 's': +- indent.append(stoul(optarg), ' '); ++ indent.append(stoul(optarg, NULL, 0), ' '); + continue; + + case 't': +- indent.insert(0, stoul(optarg), '\t'); ++ indent.insert(0, stoul(optarg, NULL, 0), '\t'); + continue; + + case 'S': +- vindent.append(stoul(optarg), ' '); ++ vindent.append(stoul(optarg, NULL, 0), ' '); + continue; + + case 'T': +- vindent.insert(0, stoul(optarg), '\t'); ++ vindent.insert(0, stoul(optarg, NULL, 0), '\t'); + continue; + + case 'N': Property changes on: head/textproc/yodl/files/patch-src_verbinsert_main.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property