svn commit: r335078 - in head/textproc/yodl: . files
Gabor Pali
pgj at FreeBSD.org
Thu Nov 28 07:15:23 UTC 2013
Author: pgj
Date: Thu Nov 28 07:15:22 2013
New Revision: 335078
URL: http://svnweb.freebsd.org/changeset/ports/335078
Log:
- Update to 3.03.0
- Add support for staging, use shebangfix
- Give up maintainership
Added:
head/textproc/yodl/files/
head/textproc/yodl/files/patch-icmake__manual (contents, props changed)
head/textproc/yodl/files/patch-manual__yo__manual.yo (contents, props changed)
Modified:
head/textproc/yodl/Makefile
head/textproc/yodl/distinfo
head/textproc/yodl/pkg-plist
Modified: head/textproc/yodl/Makefile
==============================================================================
--- head/textproc/yodl/Makefile Thu Nov 28 07:13:42 2013 (r335077)
+++ head/textproc/yodl/Makefile Thu Nov 28 07:15:22 2013 (r335078)
@@ -2,15 +2,14 @@
# $FreeBSD$
PORTNAME= yodl
-PORTVERSION= 3.00.0
-PORTREVISION= 1
+PORTVERSION= 3.03.0
CATEGORIES= textproc
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}
DISTNAME= ${PORTNAME}_${PORTVERSION}
EXTRACT_SUFX= .orig.tar.gz
-MAINTAINER= pgj at FreeBSD.org
-COMMENT= An easy to use but powerful document formatting/preparation language
+MAINTAINER= ports at FreeBSD.org
+COMMENT= Easy to use but powerful document formatting/preparation language
RUN_DEPENDS= bash:${PORTSDIR}/shells/bash \
${LOCALBASE}/bin/getopt:${PORTSDIR}/misc/getopt
@@ -21,15 +20,6 @@ BUILD_DEPENDS= icmake:${PORTSDIR}/devel/
USES= perl5
USE_PERL5= build
-.if !defined(NO_INSTALL_MANPAGES)
-MANCOMPRESSED= no
-MAN1= yodl.1 yodlpost.1 yodlconverters.1 yodlverbinsert.1 yodlstriproff.1
-MAN7= yodlbuiltins.7 yodlmanpage.7 yodlletter.7 yodlmacros.7
-PLIST_SUB+= NO_MANPAGES=""
-.else
-PLIST_SUB+= NO_MANPAGES="@comment "
-.endif
-
DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION}
PORTDOCS= *
@@ -37,11 +27,34 @@ PLIST_SUB+= PORTVERSION="${PORTVERSION}"
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
-.if !defined(NOPORTDOCS)
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MDOCS}
USE_TEX= latex:build dvipsk:build
.endif
-NO_STAGE= yes
+USES= shebangfix
+
+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
+
post-patch:
@${REINPLACE_CMD} -e 's|"/usr"|"${PREFIX}"| ; \
s|"/share/yodl"|"/share/${PORTNAME}-${PORTVERSION}"| ; \
@@ -56,45 +69,28 @@ post-patch:
@${REINPLACE_CMD} -e 's|#!/usr/bin/icmake|#!${LOCALBASE}/bin/icmake| ; \
s|"-O2 -Wall"|"-Wall ${CFLAGS}"|' \
${WRKSRC}/build
- @${REINPLACE_CMD} -e 's|#!/bin/bash|#!${LOCALBASE}/bin/bash| ; \
- s|sed |${LOCALBASE}/bin/gsed | ; \
+ @${REINPLACE_CMD} -e '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}/scripts/hrefnotmpinstall \
- ${WRKSRC}/macros/rawmacros/separator \
- ${WRKSRC}/macros/rawmacros/keepdiff \
- ${WRKSRC}/macros/rawmacros/repairs \
- ${WRKSRC}/macros/rawmacros/startdoc \
- ${WRKSRC}/macros/rawmacros/makeyoin \
- ${WRKSRC}/macros/rawmacros/create
- @${REINPLACE_CMD} -e 's|#!/usr/bin/perl|#!${PERL}|' \
- ${WRKSRC}/macros/rawmacros/separator.pl \
- ${WRKSRC}/macros/rawmacros/startdoc.pl \
- ${WRKSRC}/contrib/build.pl
- @${REINPLACE_CMD} -e 's|../../yodl/|../../../${PORTNAME}-${PORTVERSION}/|' \
- ${WRKSRC}/manual/yo/manual.yo
+ ${WRKSRC}/scripts/yodl2whatever.in \
+ ${WRKSRC}/scripts/yodlstriproff \
+ ${WRKSRC}/macros/rawmacros/repairs
do-build:
- @cd ${WRKSRC} && ./build programs
+ @cd ${WRKSRC} && ./build programs strip
@cd ${WRKSRC} && ./build macros
-.if !defined(NO_INSTALL_MANPAGES)
@cd ${WRKSRC} && ./build man
-.endif
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
@cd ${WRKSRC} && ./build manual
.endif
do-install:
- @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 manual "" && ./build install docs ""
+ @cd ${WRKSRC} && ./build install programs ${STAGEDIR}
+ @cd ${WRKSRC} && ./build install macros ${STAGEDIR}
+ @cd ${WRKSRC} && ./build install man ${STAGEDIR}
+.if ${PORT_OPTIONS:MDOCS}
+ @cd ${WRKSRC} && ./build install manual ${STAGEDIR}
+ @cd ${WRKSRC} && ./build install docs ${STAGEDIR}
.endif
.include <bsd.port.mk>
Modified: head/textproc/yodl/distinfo
==============================================================================
--- head/textproc/yodl/distinfo Thu Nov 28 07:13:42 2013 (r335077)
+++ head/textproc/yodl/distinfo Thu Nov 28 07:15:22 2013 (r335078)
@@ -1,2 +1,2 @@
-SHA256 (yodl_3.00.0.orig.tar.gz) = 321e30794373ff651c44a84a7c5137e43d772c8b0b54b8698869432081e1b86c
-SIZE (yodl_3.00.0.orig.tar.gz) = 294797
+SHA256 (yodl_3.03.0.orig.tar.gz) = d33e89fa34c6d266d438bd5d22ef6a35ef8411b54312a1a1e8c5bb40a88214bf
+SIZE (yodl_3.03.0.orig.tar.gz) = 295929
Added: head/textproc/yodl/files/patch-icmake__manual
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/textproc/yodl/files/patch-icmake__manual Thu Nov 28 07:15:22 2013 (r335078)
@@ -0,0 +1,10 @@
+--- ./icmake/manual.orig 2013-10-09 14:21:36.000000000 +0200
++++ ./icmake/manual 2013-11-27 12:11:43.000000000 +0100
+@@ -35,6 +35,7 @@
+
+ if (conversion == "latex")
+ {
++ run("cp " + g_wip + "/macros/xlatin1.tex " + g_install + DOCDOC);
+ chdir(g_install + DOCDOC);
+
+ runP(P_NOCHECK, "latex yodl.latex");
Added: head/textproc/yodl/files/patch-manual__yo__manual.yo
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/textproc/yodl/files/patch-manual__yo__manual.yo Thu Nov 28 07:15:22 2013 (r335078)
@@ -0,0 +1,11 @@
+--- ./manual/yo/manual.yo.orig 2013-11-27 11:59:12.000000000 +0100
++++ ./manual/yo/manual.yo 2013-11-27 12:06:02.000000000 +0100
+@@ -4,7 +4,7 @@
+
+ whenlatex(\
+ SETSYMBOL(XXusexlatin)
+- (NOTRANS(\input{../../../../../wip/macros/xlatin1.tex}))
++ (NOTRANS(\input{xlatin1.tex}))
+ )
+
+ SUBST(YODL)(tt(Yodl))
Modified: head/textproc/yodl/pkg-plist
==============================================================================
--- head/textproc/yodl/pkg-plist Thu Nov 28 07:13:42 2013 (r335077)
+++ head/textproc/yodl/pkg-plist Thu Nov 28 07:15:22 2013 (r335078)
@@ -9,12 +9,21 @@ bin/yodl2xml
bin/yodlpost
bin/yodlstriproff
bin/yodlverbinsert
-%%NO_MANPAGES%%man/man1/yodl2html.1.gz
-%%NO_MANPAGES%%man/man1/yodl2latex.1.gz
-%%NO_MANPAGES%%man/man1/yodl2man.1.gz
-%%NO_MANPAGES%%man/man1/yodl2txt.1.gz
-%%NO_MANPAGES%%man/man1/yodl2whatever.1.gz
-%%NO_MANPAGES%%man/man1/yodl2xml.1.gz
+man/man1/yodl.1.gz
+man/man1/yodlconverters.1.gz
+man/man1/yodlpost.1.gz
+man/man1/yodlstriproff.1.gz
+man/man1/yodlverbinsert.1.gz
+man/man1/yodl2html.1.gz
+man/man1/yodl2latex.1.gz
+man/man1/yodl2man.1.gz
+man/man1/yodl2txt.1.gz
+man/man1/yodl2whatever.1.gz
+man/man1/yodl2xml.1.gz
+man/man7/yodlbuiltins.7.gz
+man/man7/yodlletter.7.gz
+man/man7/yodlmacros.7.gz
+man/man7/yodlmanpage.7.gz
share/yodl-%%PORTVERSION%%/chartables/html.tables.yo
share/yodl-%%PORTVERSION%%/chartables/latex.tables.yo
share/yodl-%%PORTVERSION%%/chartables/latex2.tables.yo
More information about the svn-ports-all
mailing list