mail/alpine: Update to 2.21.1

- Move to new master site.  The old one is gone.
- The maildir patch is gone too, so remove the MAILDIR option for now.
- While here add LICENSE_FILE and fix plist

PR:		226790
Submitted by:	Alexandre C. Guimarães <lebarondemerde@privacychain.ch>
Approved by:	Marco Beishuizen <mbeis@xs4all.nl> (maintainer)

4 files changed, 16 insertions, 18 deletions

diff --git a/mail/alpine/Makefile b/mail/alpine/Makefile
index d98ffadd80ae..dea0257f48e1 100644
--- a/mail/alpine/Makefile
+++ b/mail/alpine/Makefile
@@ -1,18 +1,17 @@
 # $FreeBSD$
 
 PORTNAME?=	alpine
-PORTVERSION=	2.21
-PORTREVISION?=	1
+PORTVERSION=	2.21.1
 CATEGORIES?=	mail news ipv6
-MASTER_SITES=	http://alpine.freeiz.com/alpine/release/src/
-DIST_SUBDIR=	alpine-${PORTVERSION}
+MASTER_SITES=	http://repo.or.cz/alpine.git/snapshot/${GIT_COMMIT}${EXTRACT_SUFX}?dummy=/
 
 MAINTAINER=	mbeis@xs4all.nl
 COMMENT?=	Mail and news client descended from Pine
 
 LICENSE=	APACHE20
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES+=			ssl libtool ncurses tar:xz gettext-runtime
+USES+=			ssl libtool ncurses gettext-runtime
 GNU_CONFIGURE=		yes
 MAKE_JOBS_UNSAFE=	yes
 CONFIGURE_ARGS+=	--with-debug-level=2 \
@@ -28,11 +27,16 @@ CONFIGURE_ARGS+=	--with-debug-level=2 \
 			--with-ssl-lib-dir=${OPENSSLLIB} \
 			--with-ssl-certs-dir=${OPENSSLDIR}/certs
 MAKE_ARGS+=		CC="${CC}" CXX="${CXX}" GCCCFLAGS="${CFLAGS}"
+# When you update please double check that the commit corresponds to
+# the actual version you've set in PORTVERSION.
+GIT_COMMIT=		843b2f16abfd949e09b1c5465387b1b0f724994a
+GIT_COMMIT_SHORT=	843b2f1
+WRKSRC=			${WRKDIR}/alpine-${GIT_COMMIT_SHORT}
 
-OPTIONS_DEFINE=		ASPELL CONS25 DOCS IPV6 LDAP MAILDIR MOUSE PASSFILE NLS THREADS
+OPTIONS_DEFINE=		ASPELL CONS25 DOCS IPV6 LDAP MOUSE NLS PASSFILE THREADS
 OPTIONS_DEFAULT=	ASPELL MOUSE THREADS
 .if defined(PICO_ALPINE_SLAVE)
-OPTIONS_EXCLUDE=	CONS25 IPV6 LDAP MAILDIR PASSFILE
+OPTIONS_EXCLUDE=	CONS25 IPV6 LDAP PASSFILE
 .endif
 
 CONS25_DESC=	Add a patch to support color for default console
@@ -56,10 +60,6 @@ LDAP_USE=			openldap=yes
 LDAP_CONFIGURE_WITH=		ldap
 LDAP_CONFIGURE_ON=		--with-ldap-dir=${LOCALBASE}
 
-# Option MAILDIR
-MAILDIR_PATCH_SITES=		http://alpine.freeiz.com/alpine/patches/alpine-${PORTVERSION}/
-MAILDIR_PATCHFILES+=		maildir.patch.gz:-p1
-
 # Option MOUSE
 MOUSE_CONFIGURE_ENABLE=		mouse
 
diff --git a/mail/alpine/distinfo b/mail/alpine/distinfo
index 13c1bcd6f954..466f62e72d7a 100644
--- a/mail/alpine/distinfo
+++ b/mail/alpine/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1490818618
-SHA256 (alpine-2.21/alpine-2.21.tar.xz) = 6030b6881b8168546756ab3a5e43628d8d564539b0476578e287775573a77438
-SIZE (alpine-2.21/alpine-2.21.tar.xz) = 4720856
-SHA256 (alpine-2.21/maildir.patch.gz) = 1229ea9ec4e150dda1d2da866730a777148874e4667c54cd2c488101b5db8099
-SIZE (alpine-2.21/maildir.patch.gz) = 33789
+TIMESTAMP = 1521633649
+SHA256 (alpine-2.21.1.tar.gz) = 1583278a2adbb112e584879cac0faaf157f8a9a478559d7e4514d53219cce316
+SIZE (alpine-2.21.1.tar.gz) = 7490140
diff --git a/mail/alpine/pkg-descr b/mail/alpine/pkg-descr
index dbbec3e97127..3aca6a3480cf 100644
--- a/mail/alpine/pkg-descr
+++ b/mail/alpine/pkg-descr
@@ -18,4 +18,4 @@ Alpine's basic feature set includes:
 Alpine supports MIME (Multipurpose Internet Mail Extensions), an Internet
 Standard for representing multipart and multimedia data in email.
 
-WWW: http://alpine.freeiz.com/alpine/
+WWW: http://repo.or.cz/alpine.git
diff --git a/mail/alpine/pkg-plist b/mail/alpine/pkg-plist
index 523921dac150..638e4b888064 100644
--- a/mail/alpine/pkg-plist
+++ b/mail/alpine/pkg-plist
@@ -1,7 +1,7 @@
 bin/alpine
 bin/rpdump
 bin/rpload
-%%ETCDIR%%.conf.sample
+etc/alpine.conf.sample
 man/man1/alpine.1.gz
 man/man1/rpdump.1.gz
 man/man1/rpload.1.gz