Index: head/mail/neomutt/Makefile =================================================================== --- head/mail/neomutt/Makefile (revision 452277) +++ head/mail/neomutt/Makefile (revision 452278) @@ -1,113 +1,110 @@ # $FreeBSD$ PORTNAME= neomutt PORTVERSION= 20171013 DISTVERSIONPREFIX= ${PORTNAME}- +PORTREVISION= 1 CATEGORIES= mail MAINTAINER= bapt@FreeBSD.org COMMENT= Bringing together all the Mutt Code LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE.md RUN_DEPENDS= ${LOCALBASE}/etc/mime.types:misc/mime-support \ urlview:textproc/urlview USES= iconv:translit localbase shebangfix ssl USE_GITHUB= yes HAS_CONFIGURE= yes CONFIGURE_SCRIPT= configure.autosetup OPTIONS_SUB= yes SHEBANG_FILES= contrib/smime_keys OPTIONS_DEFINE= NLS DOCS SASL IDN FLOCK GPGME NOTMUCH OPTIONS_DEFAULT=SASL TOKYOCABINET NOTMUCH GPGME LMDB NCURSES OPTIONS_MULTI= HCACHE OPTIONS_MULTI_HCACHE= BDB GDBM KYOTOCABINET LMDB QDBM TOKYOCABINET OPTIONS_SINGLE= SCREEN OPTIONS_SINGLE_SCREEN= NCURSES SLANG FLOCK_DESC= Use flock() to lock files GPGME_DESC= Use gpgme to handle pgp NOTMUCH_DESC= Use notmuch for tagging and searching HCACHE_DESC= Header-cache backend KYOTOCABINET_DESC= Kyoto Cabinet support LMDB_DESC= Lightning Memory-Mapped Database support QDBM_DESC= Quick DataBase Manager support TOKYOCABINET_DESC= Tokyo Cabinet support SCREEN_DESC= Screen options CONFIGURE_ARGS= --with-ssl="${OPENSSLBASE}" \ --disable-fcntl \ --locales-fix \ --mandir=${PREFIX}/man \ ${ICONV_CONFIGURE_ARGS} # Header cache BDB_CONFIGURE_ON= --bdb BDB_USES= bdb GDBM_CONFIGURE_ON= --gdbm GDBM_LIB_DEPENDS= libgdbm.so:databases/gdbm KYOTOCABINET_CONFIGURE_ON= --kyotocabinet KYOTOCABINET_LIB_DEPENDS= libkyotocabinet.so:databases/kyotocabinet LMDB_CONFIGURE_ON= --lmdb LMDB_LIB_DEPENDS= liblmdb.so:databases/lmdb QDBM_CONFIGURE_ON= --qdbm QDBM_LIB_DEPENDS= libqdbm.so:databases/qdbm TOKYOCABINET_CONFIGURE_ON= --tokyocabinet TOKYOCABINET_LIB_DEPENDS= libtokyocabinet.so:databases/tokyocabinet NLS_CONFIGURE_ENABLE= nls NLS_USES= gettext NLS_USES_OFF= gettext-runtime:build gettext-tools:build IDN_LIB_DEPENDS= libidn.so:dns/libidn IDN_CONFIGURE_ENABLE= idn FLOCK_CONFIGURE_ENABLE= flock SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 SASL_CONFIGURE_ON= --sasl GPGME_LIB_DEPENDS= libgpgme.so:security/gpgme \ libassuan.so:security/libassuan \ libgpg-error.so:security/libgpg-error GPGME_CONFIGURE_ENABLE= gpgme NOTMUCH_LIB_DEPENDS= libnotmuch.so:mail/notmuch NOTMUCH_CONFIGURE_ENABLE= notmuch SLANG_CONFIGURE_ON= --with-slang=${LOCALBASE} --with-ui=slang SLANG_CONFIGURE_OFF= --with-ui=ncurses SLANG_LIB_DEPENDS= libslang.so:devel/libslang2 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,@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 +# 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 Index: head/mail/neomutt/pkg-plist =================================================================== --- head/mail/neomutt/pkg-plist (revision 452277) +++ head/mail/neomutt/pkg-plist (revision 452278) @@ -1,107 +1,107 @@ 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 %%NLS%%share/locale/cs/LC_MESSAGES/neomutt.mo %%NLS%%share/locale/da/LC_MESSAGES/neomutt.mo %%NLS%%share/locale/de/LC_MESSAGES/neomutt.mo %%NLS%%share/locale/el/LC_MESSAGES/neomutt.mo %%NLS%%share/locale/en_GB/LC_MESSAGES/neomutt.mo %%NLS%%share/locale/eo/LC_MESSAGES/neomutt.mo %%NLS%%share/locale/es/LC_MESSAGES/neomutt.mo %%NLS%%share/locale/et/LC_MESSAGES/neomutt.mo %%NLS%%share/locale/eu/LC_MESSAGES/neomutt.mo %%NLS%%share/locale/fr/LC_MESSAGES/neomutt.mo %%NLS%%share/locale/ga/LC_MESSAGES/neomutt.mo %%NLS%%share/locale/gl/LC_MESSAGES/neomutt.mo %%NLS%%share/locale/hu/LC_MESSAGES/neomutt.mo %%NLS%%share/locale/id/LC_MESSAGES/neomutt.mo %%NLS%%share/locale/it/LC_MESSAGES/neomutt.mo %%NLS%%share/locale/ja/LC_MESSAGES/neomutt.mo %%NLS%%share/locale/ko/LC_MESSAGES/neomutt.mo %%NLS%%share/locale/lt/LC_MESSAGES/neomutt.mo %%NLS%%share/locale/nl/LC_MESSAGES/neomutt.mo %%NLS%%share/locale/pl/LC_MESSAGES/neomutt.mo %%NLS%%share/locale/pt_BR/LC_MESSAGES/neomutt.mo %%NLS%%share/locale/ru/LC_MESSAGES/neomutt.mo %%NLS%%share/locale/sk/LC_MESSAGES/neomutt.mo %%NLS%%share/locale/sv/LC_MESSAGES/neomutt.mo %%NLS%%share/locale/tr/LC_MESSAGES/neomutt.mo %%NLS%%share/locale/uk/LC_MESSAGES/neomutt.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/neomutt.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/neomutt.mo %%PORTDOCS%%%%DOCSDIR%%/CODE_OF_CONDUCT.md %%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT %%PORTDOCS%%%%DOCSDIR%%/ChangeLog.md %%PORTDOCS%%%%DOCSDIR%%/INSTALL %%PORTDOCS%%%%DOCSDIR%%/LICENSE.md %%PORTDOCS%%%%DOCSDIR%%/PGP-Notes.txt %%PORTDOCS%%%%DOCSDIR%%/README.SSL %%PORTDOCS%%%%DOCSDIR%%/README.md %%PORTDOCS%%%%DOCSDIR%%/advancedusage.html %%PORTDOCS%%%%DOCSDIR%%/colorschemes/neonwolf-256.neomuttrc %%PORTDOCS%%%%DOCSDIR%%/colorschemes/solarized-dark-256.neomuttrc %%PORTDOCS%%%%DOCSDIR%%/colorschemes/vombatidae.neomuttrc %%PORTDOCS%%%%DOCSDIR%%/colorschemes/zenburn.neomuttrc %%PORTDOCS%%%%DOCSDIR%%/configuration.html %%PORTDOCS%%%%DOCSDIR%%/gettingstarted.html %%PORTDOCS%%%%DOCSDIR%%/hcache-bench/README.md %%PORTDOCS%%%%DOCSDIR%%/hcache-bench/neomuttrc %%PORTDOCS%%%%DOCSDIR%%/hcache-bench/neomutt-hcache-bench.sh %%PORTDOCS%%%%DOCSDIR%%/index.html %%PORTDOCS%%%%DOCSDIR%%/intro.html %%PORTDOCS%%%%DOCSDIR%%/keybase/LICENSE %%PORTDOCS%%%%DOCSDIR%%/keybase/README.md %%PORTDOCS%%%%DOCSDIR%%/keybase/attachmentView.png %%PORTDOCS%%%%DOCSDIR%%/keybase/decrypt.sh %%PORTDOCS%%%%DOCSDIR%%/keybase/install.sh %%PORTDOCS%%%%DOCSDIR%%/keybase/keybase.py %%PORTDOCS%%%%DOCSDIR%%/keybase/neomuttrc %%PORTDOCS%%%%DOCSDIR%%/keybase/pagerMode.png %%PORTDOCS%%%%DOCSDIR%%/keybase/pgpdecrypt.sh %%PORTDOCS%%%%DOCSDIR%%/keybase/pgpverify.sh %%PORTDOCS%%%%DOCSDIR%%/keybase/verify.sh %%PORTDOCS%%%%DOCSDIR%%/logo/neomutt-128.png %%PORTDOCS%%%%DOCSDIR%%/logo/neomutt-256.png %%PORTDOCS%%%%DOCSDIR%%/logo/neomutt-32.png %%PORTDOCS%%%%DOCSDIR%%/logo/neomutt-64.png %%PORTDOCS%%%%DOCSDIR%%/logo/neomutt.svg %%PORTDOCS%%%%DOCSDIR%%/lua/test_lua-api_runner.neomuttrc %%PORTDOCS%%%%DOCSDIR%%/lua/test_lua-api_spec.lua %%PORTDOCS%%%%DOCSDIR%%/manual.html %%PORTDOCS%%%%DOCSDIR%%/manual.txt %%PORTDOCS%%%%DOCSDIR%%/mimesupport.html %%PORTDOCS%%%%DOCSDIR%%/mime.types %%PORTDOCS%%%%DOCSDIR%%/miscellany.html %%PORTDOCS%%%%DOCSDIR%%/neomutt-syntax.vim %%PORTDOCS%%%%DOCSDIR%%/optionalfeatures.html %%PORTDOCS%%%%DOCSDIR%%/reference.html %%PORTDOCS%%%%DOCSDIR%%/samples/Mush.rc %%PORTDOCS%%%%DOCSDIR%%/samples/Pine.rc %%PORTDOCS%%%%DOCSDIR%%/samples/Tin.rc %%PORTDOCS%%%%DOCSDIR%%/samples/colors.default %%PORTDOCS%%%%DOCSDIR%%/samples/colors.linux %%PORTDOCS%%%%DOCSDIR%%/samples/gpg.rc %%PORTDOCS%%%%DOCSDIR%%/samples/pgp2.rc %%PORTDOCS%%%%DOCSDIR%%/samples/pgp5.rc %%PORTDOCS%%%%DOCSDIR%%/samples/pgp6.rc %%PORTDOCS%%%%DOCSDIR%%/samples/sample.mailcap %%PORTDOCS%%%%DOCSDIR%%/samples/sample.neomuttrc %%PORTDOCS%%%%DOCSDIR%%/samples/sample.neomuttrc-tlr %%PORTDOCS%%%%DOCSDIR%%/samples/smime.rc %%PORTDOCS%%%%DOCSDIR%%/samples/smime_keys_test.pl %%PORTDOCS%%%%DOCSDIR%%/security.html %%PORTDOCS%%%%DOCSDIR%%/smime-notes.txt %%PORTDOCS%%%%DOCSDIR%%/tuning.html %%PORTDOCS%%%%DOCSDIR%%/vim-keys/README.md %%PORTDOCS%%%%DOCSDIR%%/vim-keys/vim-keys.rc