Page MenuHomeFreeBSD
Files F153254327

D27951.id82207.diff
No OneTemporary
Actions

D27951.id82207.diff
View Options

Index: head/mail/mutt/Makefile
===================================================================
--- head/mail/mutt/Makefile
+++ head/mail/mutt/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= mutt
-DISTVERSION= 2.0.3
+DISTVERSION= 2.0.4
CATEGORIES+= mail
MASTER_SITES= ftp://ftp.mutt.org/pub/mutt/ \
https://bitbucket.org/mutt/mutt/downloads/ \
@@ -11,9 +11,9 @@
DIST_SUBDIR= mutt
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
-PATCH_SITES+= http://www.mutt.org.ua/download/mutt-${VVV_PATCH_VERSION}/:vvv \
- http://www2.mutt.org.ua/download/mutt-${VVV_PATCH_VERSION}/:vvv \
- http://vc.org.ua/mutt/:vc
+PATCH_SITES+= http://www.mutt.org.ua/download/mutt-${VVV_PATCH_VERSION}/:vvv \
+ http://www2.mutt.org.ua/download/mutt-${VVV_PATCH_VERSION}/:vvv \
+ http://vc.org.ua/mutt/:vc
PATCH_DIST_STRIP= -p1
MAINTAINER= dereks@lifeofadishwasher.com
@@ -26,67 +26,75 @@
USES= cpe perl5 shebangfix ssl
USE_PERL5= build
-SHEBANG_FILES= doc/gen-map-doc smime_keys.pl contrib/smime_keys_test.pl
+SHEBANG_FILES= contrib/smime_keys_test.pl doc/gen-map-doc smime_keys.pl
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --disable-fcntl --with-ssl=${OPENSSLBASE} \
- --with-docdir=${DOCSDIR} --sysconfdir=${PREFIX}/etc \
- --enable-external-dotlock --enable-pop --enable-imap \
- --enable-compressed --enable-sidebar
+CONFIGURE_ARGS= --disable-fcntl \
+ --enable-compressed \
+ --enable-external-dotlock \
+ --enable-imap \
+ --enable-pop \
+ --enable-sidebar \
+ --sysconfdir=${PREFIX}/etc \
+ --with-docdir=${DOCSDIR} \
+ --with-ssl=${OPENSSLBASE}
.if defined(MUTT_CONFIGURE_ARGS)
CONFIGURE_ARGS+= ${MUTT_CONFIGURE_ARGS}
.endif
-CONFLICTS= ja-mutt-[0-9]* ja-mutt-devel-[0-9]* mutt-1.4* mutt-devel-lite-[0-9]* mutt-lite-[0-9]* zh-mutt-devel-[0-9]*
+CONFLICTS= ja-mutt-[0-9]* ja-mutt-devel-[0-9]* mutt-1.4* \
+ mutt-devel-lite-[0-9]* mutt-lite-[0-9]* zh-mutt-devel-[0-9]*
-INFO= ${PORTNAME}
+INFO= ${PORTNAME}
OPTIONS_SUB= yes
-OPTIONS_DEFINE= AUTOCRYPT DEBUG_LOGS DOCS EXAMPLES FLOCK GPGME \
- GREETING_PATCH HTML ICONV IDN IFDEF_PATCH LOCALES_FIX \
- MAILBOX_MANPAGES MAILDIR_MTIME_PATCH NLS QUOTE_PATCH \
- REVERSE_REPLY_PATCH SASL SMIME SMART_DATE SMTP URLVIEW
+OPTIONS_DEFINE= AUTOCRYPT DEBUG_LOGS DOCS EXAMPLES FLOCK GPGME GREETING_PATCH \
+ HTML ICONV IDN IFDEF_PATCH LOCALES_FIX MAILBOX_MANPAGES \
+ MAILDIR_MTIME_PATCH NLS QUOTE_PATCH REVERSE_REPLY_PATCH SASL \
+ SMART_DATE SMIME SMTP URLVIEW
-OPTIONS_SINGLE= GSSAPI HCACHE SCREEN
+OPTIONS_SINGLE= GSSAPI HCACHE SCREEN
OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
-OPTIONS_SINGLE_HCACHE= HCACHE_BDB HCACHE_TOKYOCABINET HCACHE_KYOTOCABINET HCACHE_NONE
+OPTIONS_SINGLE_HCACHE= HCACHE_BDB HCACHE_KYOTOCABINET HCACHE_NONE \
+ HCACHE_TOKYOCABINET
OPTIONS_SINGLE_SCREEN= NCURSES SLANG
-AUTOCRYPT_DESC= Convenient End-to-End Encryption
-DEBUG_LOGS_DESC= Debugging capabilities
-FLOCK_DESC= flock() usage
-GPGME_DESC= Gpgme interface
-GREETING_PATCH_DESC= Greeting support
-HCACHE_BDB_DESC= Use Berkeley DB (BDB)
-HCACHE_DESC= Header Cache support
+AUTOCRYPT_DESC= Convenient End-to-End Encryption
+DEBUG_LOGS_DESC= Debugging capabilities
+FLOCK_DESC= flock() usage
+GPGME_DESC= Gpgme interface
+GREETING_PATCH_DESC= Greeting support
+HCACHE_BDB_DESC= Use Berkeley DB (BDB)
+HCACHE_DESC= Header Cache support
HCACHE_KYOTOCABINET_DESC= Use Kyoto Cabinet
-HCACHE_NONE_DESC= Disable Header Cache
+HCACHE_NONE_DESC= Disable Header Cache
HCACHE_TOKYOCABINET_DESC= Use Tokyo Cabinet
-HTML_DESC= HTML documentation
-IDN_DESC= International Domain Names (implies ICONV)
-IFDEF_PATCH_DESC= ifdef feature
-LOCALES_FIX_DESC= Locales fix
-MAILBOX_MANPAGES_DESC= Install mbox.5/mmdf.5 manpages
+HTML_DESC= HTML documentation
+IDN_DESC= International Domain Names (implies ICONV)
+IFDEF_PATCH_DESC= ifdef feature
+LOCALES_FIX_DESC= Locales fix
+MAILBOX_MANPAGES_DESC= Install mbox.5/mmdf.5 manpages
MAILDIR_MTIME_PATCH_DESC= Maildir mtime patch
-NCURSES_DESC= Ncurses support
-NLS_DESC= Native language support (implies ICONV)
-QUOTE_PATCH_DESC= Extended quoting
+NCURSES_DESC= Ncurses support
+NLS_DESC= Native language support (implies ICONV)
+QUOTE_PATCH_DESC= Extended quoting
REVERSE_REPLY_PATCH_DESC= Reverse_reply
-SASL_DESC= SASL authentication
-SMIME_DESC= SMIME email check option patch
-SLANG_DESC= SLANG support
-SMART_DATE_DESC= Dynamic date formatting with "%@"
-SMTP_DESC= SMTP relay support
-URLVIEW_DESC= Use urlview for the URL selector menu
+SASL_DESC= SASL authentication
+SMIME_DESC= SMIME email check option patch
+SLANG_DESC= SLANG support
+SMART_DATE_DESC= Dynamic date formatting with "%@"
+SMTP_DESC= SMTP relay support
+URLVIEW_DESC= Use urlview for the URL selector menu
-OPTIONS_DEFAULT= AUTOCRYPT DEBUG_LOGS GPGME GSSAPI_NONE HCACHE_BDB HTML ICONV IDN \
- IFDEF_PATCH LOCALES_FIX MAILBOX_MANPAGES MAILDIR_MTIME_PATCH NCURSES \
- NLS QUOTE_PATCH REVERSE_REPLY_PATCH SASL SMIME SMART_DATE SMTP URLVIEW
+OPTIONS_DEFAULT= AUTOCRYPT DEBUG_LOGS GPGME GSSAPI_NONE HCACHE_BDB HTML \
+ ICONV IDN IFDEF_PATCH LOCALES_FIX MAILBOX_MANPAGES \
+ MAILDIR_MTIME_PATCH NCURSES NLS QUOTE_PATCH \
+ REVERSE_REPLY_PATCH SASL SMART_DATE SMIME SMTP URLVIEW
.ifmake makesum # for optional distfiles patchfiles
-OPTIONS_OVERRIDE= ${OPTIONS_DEFINE} ${OPTIONS_DEFAULT}
+OPTIONS_OVERRIDE= ${OPTIONS_DEFAULT} ${OPTIONS_DEFINE}
.MAKEOVERRIDES+= OPTIONS_OVERRIDE
.endif
@@ -103,33 +111,39 @@
DEBUG_LOGS_CONFIGURE_ON= --enable-debug
+DOCS_CONFIGURE_OFF= --disable-doc
DOCS_BUILD_DEPENDS= lynx:www/lynx
# Handle ncurses/ncurses-port/slang
SLANG_CONFIGURE_ON= --with-slang=${LOCALBASE}
SLANG_LIB_DEPENDS= libslang.so:devel/libslang2
-SLANG_VARS= PKGMESSAGE=${FILESDIR}/pkg-message.slang
+SLANG_VARS= PKGMESSAGE=${FILESDIR}/pkg-message.slang
NCURSES_USES= ncurses
-NLS_USES= gettext
+NLS_USES= gettext
NLS_CONFIGURE_ENABLE= nls
-NLS_IMPLIES= ICONV
+NLS_IMPLIES= ICONV
# Handle GSSAPI from various places
-GSSAPI_BASE_USES= gssapi
-GSSAPI_BASE_CONFIGURE_ON= --with-gss=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
-GSSAPI_HEIMDAL_USES= gssapi:heimdal
-GSSAPI_HEIMDAL_CONFIGURE_ON= --with-gss=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
-GSSAPI_MIT_USES= gssapi:mit
-GSSAPI_MIT_CONFIGURE_ON= --with-gss=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
+GSSAPI_BASE_USES= gssapi
+GSSAPI_BASE_CONFIGURE_ON= ${GSSAPI_CONFIGURE_ARGS} \
+ --with-gss=${GSSAPIBASEDIR}
+GSSAPI_HEIMDAL_USES= gssapi:heimdal
+GSSAPI_HEIMDAL_CONFIGURE_ON= ${GSSAPI_CONFIGURE_ARGS} \
+ --with-gss=${GSSAPIBASEDIR}
+GSSAPI_MIT_USES= gssapi:mit
+GSSAPI_MIT_CONFIGURE_ON= ${GSSAPI_CONFIGURE_ARGS} \
+ --with-gss=${GSSAPIBASEDIR}
GSSAPI_NONE_CONFIGURE_ON= --without-gss
HCACHE_NONE_CONFIGURE_ON= --disable-hcache
-HCACHE_NONE_CONFIGURE_OFF= --enable-hcache --without-qdbm --without-gdbm
+HCACHE_NONE_CONFIGURE_OFF= --enable-hcache \
+ --without-gdbm \
+ --without-qdbm
HCACHE_BDB_CONFIGURE_WITH= bdb=${LOCALBASE}
-HCACHE_BDB_USES= bdb:42+
+HCACHE_BDB_USES= bdb:42+
HCACHE_TOKYOCABINET_CONFIGURE_WITH= tokyocabinet=${LOCALBASE}
HCACHE_TOKYOCABINET_LIB_DEPENDS= libtokyocabinet.so:databases/tokyocabinet
@@ -137,7 +151,7 @@
HCACHE_KYOTOCABINET_CONFIGURE_WITH= kyotocabinet=${LOCALBASE}
HCACHE_KYOTOCABINET_LIB_DEPENDS= libkyotocabinet.so:databases/kyotocabinet
-ICONV_USES= iconv:translit
+ICONV_USES= iconv:translit
ICONV_CONFIGURE_ON= ${ICONV_CONFIGURE_ARG}
ICONV_CONFIGURE_OFF= --disable-iconv
@@ -157,13 +171,13 @@
IDN_LIB_DEPENDS= libidn2.so:dns/libidn2 \
libunistring.so:devel/libunistring
IDN_CONFIGURE_WITH= idn2=${LOCALBASE}
-IDN_IMPLIES= ICONV
+IDN_IMPLIES= ICONV
IFDEF_PATCH_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-ifdef
-GPGME_LIB_DEPENDS+= libgpgme.so:security/gpgme
-GPGME_LIB_DEPENDS+= libgpg-error.so:security/libgpg-error
-GPGME_LIB_DEPENDS+= libassuan.so:security/libassuan
+GPGME_LIB_DEPENDS+= libassuan.so:security/libassuan \
+ libgpg-error.so:security/libgpg-error \
+ libgpgme.so:security/gpgme
GPGME_CONFIGURE_ENABLE= gpgme
SMTP_CONFIGURE_ENABLE= smtp
@@ -173,7 +187,7 @@
GREETING_PATCH_PATCHFILES= mutt-${GREETING_PATCH_VERSION}.vc.greeting:vc
QUOTE_PATCH_PATCHFILES= patch-${VVV_PATCH_VERSION}.vvv.initials.xz:vvv \
- patch-${VVV_PATCH_VERSION}.vvv.quote.xz:vvv
+ patch-${VVV_PATCH_VERSION}.vvv.quote.xz:vvv
.include <bsd.port.options.mk>
@@ -184,14 +198,14 @@
${INSTALL_MAN} ${FILESDIR}/mailcap.5 ${STAGEDIR}${MANPREFIX}/man/man5
pre-configure::
- # Stop make from setgid mutt_dotlock
+# Stop make from setgid mutt_dotlock
@${REINPLACE_CMD} \
-e '/if test.*mutt_dotlock.*DOTLOCK_GROUP/s/if/if ${FALSE} \&\&/' \
${WRKSRC}/Makefile.in
- # Base FreeBSD krb5-config --version returns "FreeBSD heimdal"
+# Base FreeBSD krb5-config --version returns "FreeBSD heimdal"
@${REINPLACE_CMD} -e 's,?eimdal\*),?eimdal*|\"FreeBSD heimdal\"*),' \
${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
- # Install contrib samples to ${EXAMPLESDIR}
+# Install contrib samples to ${EXAMPLESDIR}
@${REINPLACE_CMD} -e 's#$$(docdir)/samples#${EXAMPLESDIR}#g' \
${WRKSRC}/contrib/Makefile.in
Index: head/mail/mutt/distinfo
===================================================================
--- head/mail/mutt/distinfo
+++ head/mail/mutt/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1607131693
-SHA256 (mutt/mutt-2.0.3.tar.gz) = 9c327cafb7acbfd4a57e7c817148fe438720a4545a5f628926f7745bc752c1ed
-SIZE (mutt/mutt-2.0.3.tar.gz) = 5292808
+TIMESTAMP = 1609370754
+SHA256 (mutt/mutt-2.0.4.tar.gz) = 45087e78105e9abc7cc37827865d319081587cb53a94412aa4e3118e937991d4
+SIZE (mutt/mutt-2.0.4.tar.gz) = 5293913
SHA256 (mutt/mutt-2.0.1.vc.greeting) = 28d157df0ca36f2448dcc3d1cd19e34ec0eefe88251ebf1951e080d7178cccd2
SIZE (mutt/mutt-2.0.1.vc.greeting) = 4452
SHA256 (mutt/patch-1.13.0.vvv.initials.xz) = 8b25ad6596bd57d94f6551e7e73ceb8da620468e96fb507b2f51545d5b3eaa02

File Metadata

Mime Type
text/plain
Expires
Tue, Apr 21, 2:21 AM (17 h, 16 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31878879
Default Alt Text
D27951.id82207.diff (9 KB)

Event Timeline