Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update mutt to v2.1.3 #4922

Merged
merged 1 commit into from
Oct 25, 2021
Merged

update mutt to v2.1.3 #4922

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions cross/mutt/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PKG_NAME = mutt
PKG_VERS = 2.0.6
PKG_VERS = 2.1.3
PKG_EXT = tar.gz
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = ftp://ftp.mutt.org/pub/$(PKG_NAME)
Expand All @@ -12,7 +12,13 @@ COMMENT = Mutt is a small but very powerful text-based mail client for Unix ope
LICENSE = GPLv2

GNU_CONFIGURE = 1
CONFIGURE_ARGS = --with-ssl=openssl --enable-pop --enable-imap --enable-smtp --with-sasl
CONFIGURE_ARGS = --with-ssl=openssl
CONFIGURE_ARGS += --enable-pop
CONFIGURE_ARGS += --enable-imap
CONFIGURE_ARGS += --enable-smtp
CONFIGURE_ARGS += --with-sasl
CONFIGURE_ARGS += --disable-doc
CONFIGURE_ARGS += --sysconfdir=$(INSTALL_PREFIX)/var

INSTALL_TARGET = mutt_install

Expand All @@ -21,4 +27,5 @@ include ../../mk/spksrc.cross-cc.mk
.PHONY: mutt_install
mutt_install:
$(RUN) $(MAKE) install DESTDIR=$(INSTALL_DIR)
cp $(WORK_DIR)/$(PKG_DIR)/doc/Muttrc.head $(STAGING_INSTALL_PREFIX)/etc/Muttrc
install -m 755 -d $(STAGING_INSTALL_PREFIX)/var
cp $(WORK_DIR)/$(PKG_DIR)/doc/Muttrc.head $(STAGING_INSTALL_PREFIX)/var/Muttrc
6 changes: 3 additions & 3 deletions cross/mutt/PLIST
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ bin:bin/mutt_pgpring
rsc:bin/muttbug
bin:bin/pgpewrap
rsc:bin/smime_keys
rsc:etc/Muttrc
rsc:etc/mime.types
rsc:etc/mime.types.dist
rsc:var/Muttrc
rsc:var/mime.types
rsc:var/mime.types.dist
rsc:share/
6 changes: 3 additions & 3 deletions cross/mutt/digests
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
mutt-2.0.6.tar.gz SHA1 c4621f76c5493db8055ccfd1b0ed37800962229c
mutt-2.0.6.tar.gz SHA256 81e31c45895fd624747f19106aa2697d2aa135049ff2e9e9db0a6ed876bcb598
mutt-2.0.6.tar.gz MD5 585072c134ac5cd9e264187685dcd4ae
mutt-2.1.3.tar.gz SHA1 ae1499006b4b338b32c9887f5e67706ba5214a1f
mutt-2.1.3.tar.gz SHA256 ef759cc94b921b099a3ee88085d384fd3564c97f511e907bc83cf9812dd5e47c
mutt-2.1.3.tar.gz MD5 af58d4428359fdfe21952906d2d95782
23 changes: 0 additions & 23 deletions cross/mutt/patches/001_not-build-doc.patch
View file
Open in desktop

This file was deleted.

8 changes: 4 additions & 4 deletions spk/mutt/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
SPK_NAME = mutt
SPK_VERS = 2.0.6
SPK_REV = 7
SPK_VERS = 2.1.3
SPK_REV = 8
SPK_ICON = src/mutt.png

DEPENDS = cross/mutt
Expand All @@ -10,7 +10,7 @@ DESCRIPTION = Mutt is a small but very powerful text-based mail client for Unix
DISPLAY_NAME = Mutt
STARTABLE = no

CHANGELOG = "1. Update to mutt v2.0.6.<br/>2. utf-8 wrapper removed."
CHANGELOG = "1. Update mutt to v2.1.3.<br/>2. Update openssl to v1.1.1l."

HOMEPAGE = http://www.mutt.org
LICENSE = GPLv2
Expand All @@ -27,4 +27,4 @@ include ../../mk/spksrc.spk.mk
mutt_extra_install:
install -d -m 755 $(STAGING_DIR)/var
install -m 644 src/Muttrc.local $(STAGING_DIR)/var/Muttrc.local
echo "source $(INSTALL_PREFIX)/var/Muttrc.local" >> $(STAGING_DIR)/etc/Muttrc
echo "source $(INSTALL_PREFIX)/var/Muttrc.local" >> $(STAGING_DIR)/var/Muttrc
4 changes: 2 additions & 2 deletions spk/mutt/src/service-setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@

service_save ()
{
# Save configuration of previous installation in ${SYNOPKG_PKGDEST}/etc (upgrades use ${SYNOPKG_PKGDEST}/var)
# Save configuration of previous installation in ${SYNOPKG_PKGDEST}/etc (upgrades use ${SYNOPKG_PKGVAR})
if [ -e "${SYNOPKG_PKGDEST}/etc/Muttrc.local" ]; then
echo "migrate ${SYNOPKG_PKGDEST}/etc/Muttrc.local to ${SYNOPKG_PKGDEST}/var/Muttrc.local"
echo "migrate ${SYNOPKG_PKGDEST}/etc/Muttrc.local to ${SYNOPKG_PKGVAR}/Muttrc.local"
mv ${SYNOPKG_PKGDEST}/etc/Muttrc.local ${TMP_DIR}/Muttrc.local
fi
}
Expand Down