svn commit: r452278 - head/mail/neomutt

Adam Weinberger adamw at FreeBSD.org
Tue Oct 17 14:38:18 UTC 2017


Author: adamw
Date: Tue Oct 17 14:38:17 2017
New Revision: 452278
URL: https://svnweb.freebsd.org/changeset/ports/452278

Log:
  Build manpages and neomuttrc when DOCS is off
  
  Using BINARY_ALIAS, we can trick neomutt into building the manpages and
  the neomuttrc. Neomutt already gracefully handles pieces of the documentation
  being unavailable during installation, and pkg-create(8) takes care of the
  rest.
  
  PORTREVISION bump because the plist has changed for anybody building without
  DOCS.

Modified:
  head/mail/neomutt/Makefile
  head/mail/neomutt/pkg-plist

Modified: head/mail/neomutt/Makefile
==============================================================================
--- head/mail/neomutt/Makefile	Tue Oct 17 14:01:48 2017	(r452277)
+++ head/mail/neomutt/Makefile	Tue Oct 17 14:38:17 2017	(r452278)
@@ -3,6 +3,7 @@
 PORTNAME=	neomutt
 PORTVERSION=	20171013
 DISTVERSIONPREFIX=	${PORTNAME}-
+PORTREVISION=	1
 CATEGORIES=	mail
 
 MAINTAINER=	bapt at FreeBSD.org
@@ -88,26 +89,22 @@ SLANG_VARS=	PKGMESSAGE=${FILESDIR}/pkg-message.slang
 
 NCURSES_USES=	ncurses
 
-DOCS_CONFIGURE_ENABLE=	doc
 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, at 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
+.include <bsd.port.options.mk>
 
+# Trick neomutt into building manpages and neomuttrc
+.if empty(PORT_OPTIONS:MDOCS)
+BINARY_ALIAS=	xsltproc=true
+.endif
+
 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	Tue Oct 17 14:01:48 2017	(r452277)
+++ head/mail/neomutt/pkg-plist	Tue Oct 17 14:38:17 2017	(r452278)
@@ -2,13 +2,13 @@ bin/neomutt
 lib/neomutt/pgpewrap
 lib/neomutt/pgpring
 lib/neomutt/smime_keys
-%%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
+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
 @sample etc/neomuttrc.dist etc/neomuttrc
 %%NLS%%share/locale/bg/LC_MESSAGES/neomutt.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/neomutt.mo


More information about the svn-ports-all mailing list