Date: Sun, 15 Oct 2017 19:04:24 +0000 (UTC) From: Adam Weinberger <adamw@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r452161 - head/mail/neomutt Message-ID: <201710151904.v9FJ4OpR068200@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adamw Date: Sun Oct 15 19:04:23 2017 New Revision: 452161 URL: https://svnweb.freebsd.org/changeset/ports/452161 Log: Fix packaging when DOCS=off The manpages are once again only built when DOCS=on, but now so is the default neomuttrc. The manpages are fine to protect with %%PORTDOCS%% (not great, but permissible), but the default neomuttrc needs to be there. So, generate it manually after the build. This is kludgey, but it at least gets the port packaging again. Approved by: maintainer (bapt) Modified: head/mail/neomutt/Makefile head/mail/neomutt/pkg-plist Modified: head/mail/neomutt/Makefile ============================================================================== --- head/mail/neomutt/Makefile Sun Oct 15 18:26:19 2017 (r452160) +++ head/mail/neomutt/Makefile Sun Oct 15 19:04:23 2017 (r452161) @@ -93,11 +93,21 @@ DOCS_BUILD_DEPENDS= xsltproc:textproc/libxslt \ ${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:textproc/docbook-xsl \ lynx:www/lynx +post-build-DOCS-off: + ${SED} -e 's,@docdir@,${DOCSDIR},' ${WRKSRC}/doc/neomuttrc.head > ${WRKSRC}/doc/neomuttrc + cd ${WRKSRC} && ${CC} -I. -o doc/makedoc doc/makedoc.c + cd ${WRKSRC} && ${CPP} -isystem ${LOCALBASE}/include -D_MAKEDOC -C -I. ./init.h | doc/makedoc -c >> doc/neomuttrc + post-install: ${RM} ${STAGEDIR}${PREFIX}/etc/mime* - ${MV} ${STAGEDIR}${PREFIX}/etc/neomuttrc ${STAGEDIR}${PREFIX}/etc/neomuttrc.dist ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/neomutt \ ${STAGEDIR}${PREFIX}/lib/neomutt/pgpring \ ${STAGEDIR}${PREFIX}/lib/neomutt/pgpewrap + +post-install-DOCS-on: + ${MV} ${STAGEDIR}${PREFIX}/etc/neomuttrc ${STAGEDIR}${PREFIX}/etc/neomuttrc.dist + +post-install-DOCS-off: + ${INSTALL_DATA} ${WRKSRC}/doc/neomuttrc ${STAGEDIR}${PREFIX}/etc/neomuttrc.dist .include <bsd.port.mk> Modified: head/mail/neomutt/pkg-plist ============================================================================== --- head/mail/neomutt/pkg-plist Sun Oct 15 18:26:19 2017 (r452160) +++ head/mail/neomutt/pkg-plist Sun Oct 15 19:04:23 2017 (r452161) @@ -2,13 +2,13 @@ bin/neomutt lib/neomutt/pgpewrap lib/neomutt/pgpring lib/neomutt/smime_keys -man/man1/neomutt.1.gz -man/man1/pgpewrap_neomutt.1.gz -man/man1/pgpring_neomutt.1.gz -man/man1/smime_keys_neomutt.1.gz -man/man5/mbox_neomutt.5.gz -man/man5/mmdf_neomutt.5.gz -man/man5/neomuttrc.5.gz +%%PORTDOCS%%man/man1/neomutt.1.gz +%%PORTDOCS%%man/man1/pgpewrap_neomutt.1.gz +%%PORTDOCS%%man/man1/pgpring_neomutt.1.gz +%%PORTDOCS%%man/man1/smime_keys_neomutt.1.gz +%%PORTDOCS%%man/man5/mbox_neomutt.5.gz +%%PORTDOCS%%man/man5/mmdf_neomutt.5.gz +%%PORTDOCS%%man/man5/neomuttrc.5.gz @sample etc/neomuttrc.dist etc/neomuttrc %%NLS%%share/locale/bg/LC_MESSAGES/neomutt.mo %%NLS%%share/locale/ca/LC_MESSAGES/neomutt.mo
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201710151904.v9FJ4OpR068200>