svn commit: r380703 - in head/mail/alpine: . files

[Thomas Zander]

Author: riggs
Date: Sat Mar  7 14:51:05 2015
New Revision: 380703
URL: https://svnweb.freebsd.org/changeset/ports/380703
QAT: https://qat.redports.org/buildarchive/r380703/

Log:
  - Update to upstream version 2.20
  
  While on it:
  - Pet portlint
  
  PR:		197885
  Submitted by:	mbeis at xs4all.nl (maintainer)

Deleted:
  head/mail/alpine/files/patch-alpine__Makefile.am
  head/mail/alpine/files/patch-alpine__Makefile.in
  head/mail/alpine/files/patch-alpine__alpine.c
  head/mail/alpine/files/patch-alpine__mailview.c
  head/mail/alpine/files/patch-alpine__makefile.wnt
  head/mail/alpine/files/patch-alpine__send.c
  head/mail/alpine/files/patch-alpine__send.h
  head/mail/alpine/files/patch-pith__filter.c
  head/mail/alpine/files/patch-pith__pine.hlp
  head/mail/alpine/files/patch-pith__send.c
  head/mail/alpine/files/patch-pith__send.h
  head/mail/alpine/files/patch-pith__state.h
  head/mail/alpine/files/patch-po__POTFILES.in
Modified:
  head/mail/alpine/Makefile
  head/mail/alpine/distinfo
  head/mail/alpine/pkg-message
  head/mail/alpine/pkg-plist

Modified: head/mail/alpine/Makefile
==============================================================================
--- head/mail/alpine/Makefile	Sat Mar  7 14:48:12 2015	(r380702)
+++ head/mail/alpine/Makefile	Sat Mar  7 14:51:05 2015	(r380703)
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
 PORTNAME?=	alpine
-PORTVERSION=	2.11
-PORTREVISION?=	2
+PORTVERSION=	2.20
+PORTREVISION?=	0
 CATEGORIES?=	mail news ipv6
 MASTER_SITES=	http://patches.freeiz.com/alpine/release/src/
 DIST_SUBDIR=	alpine-${PORTVERSION}
@@ -38,11 +38,12 @@ GNU_CONFIGURE=	yes
 .if !defined(PICO_ALPINE_SLAVE)
 
 PORTDOCSbase=	LICENSE NOTICE README
-PORTDOCSdoc=	brochure.txt tech-notes.txt
+PORTDOCSdoc=	brochure.txt
 PORTDOCShtml=	tech-notes/background.html tech-notes/cmd-line.html \
 		tech-notes/config-notes.html tech-notes/config.html \
 		tech-notes/index.html tech-notes/installation.html \
-		tech-notes/introduction.html tech-notes/low-level.html
+		tech-notes/introduction.html tech-notes/low-level.html \
+		tech-notes/tech-notes.txt
 PORTDOCS=	${PORTDOCSbase} ${PORTDOCSdoc} ${PORTDOCShtml}
 
 CONFIGURE_ARGS+=--with-system-pinerc=${PREFIX}/etc/alpine.conf \
@@ -113,7 +114,7 @@ CONFIGURE_ARGS+=	--with-passfile=.alpine
 .endif
 
 .if ${PORT_OPTIONS:MMAILDIR}
-PATCH_SITES=		http://patches.freeiz.com/alpine/patches/alpine-2.11/
+PATCH_SITES=		http://patches.freeiz.com/alpine/patches/alpine-${PORTVERSION}/
 PATCHFILES+=		maildir.patch.gz
 PATCH_DIST_ARGS+=	-E --quiet -d ${PATCH_WRKSRC} -p1
 .endif
@@ -142,7 +143,9 @@ post-patch:
 	    ${WRKSRC}/imap/src/osdep/unix/Makefile.presed \
 	    > ${WRKSRC}/imap/src/osdep/unix/Makefile
 	@for i in ${WRKSRC}/README ${WRKSRC}/doc/alpine.1 \
-	    ${WRKSRC}/doc/tech-notes.txt ${WRKSRC}/doc/tech-notes/*.html \
+	    ${WRKSRC}/doc/*.txt \
+	    ${WRKSRC}/doc/tech-notes/*.txt \
+	    ${WRKSRC}/doc/tech-notes/*.html \
 	    ${WRKSRC}/pith/pine.hlp ; do \
 		${CP} $$i $$i.presed ; \
 		${SED} -e "s:/usr/local/lib/:${PREFIX}/etc/:g" \

Modified: head/mail/alpine/distinfo
==============================================================================
--- head/mail/alpine/distinfo	Sat Mar  7 14:48:12 2015	(r380702)
+++ head/mail/alpine/distinfo	Sat Mar  7 14:51:05 2015	(r380703)
@@ -1,4 +1,4 @@
-SHA256 (alpine-2.11/alpine-2.11.tar.xz) = fecc9ca5df03e0f368edec65cd61444325157b5635b5c92380cedf9c4ce8fbf6
-SIZE (alpine-2.11/alpine-2.11.tar.xz) = 4403188
-SHA256 (alpine-2.11/maildir.patch.gz) = 8de4e1f8e5d505e0071dfb573279b0472bdbca3d45a59bcc526a6a664cffde69
-SIZE (alpine-2.11/maildir.patch.gz) = 33737
+SHA256 (alpine-2.20/alpine-2.20.tar.xz) = ed639b6e5bb97e6b0645c85262ca6a784316195d461ce8d8411999bf80449227
+SIZE (alpine-2.20/alpine-2.20.tar.xz) = 4841816
+SHA256 (alpine-2.20/maildir.patch.gz) = 80c1a147d9092f463dce365f12b9e74f7d0a0c15e03267010f5dcb42a27493d3
+SIZE (alpine-2.20/maildir.patch.gz) = 33935

Modified: head/mail/alpine/pkg-message
==============================================================================
--- head/mail/alpine/pkg-message	Sat Mar  7 14:48:12 2015	(r380702)
+++ head/mail/alpine/pkg-message	Sat Mar  7 14:51:05 2015	(r380703)
@@ -2,4 +2,3 @@
 *******************************************************************************
 *** To use GnuPG with Alpine, take a look at the mail/pine-pgp-filters port ***
 *******************************************************************************
-

Modified: head/mail/alpine/pkg-plist
==============================================================================
--- head/mail/alpine/pkg-plist	Sat Mar  7 14:48:12 2015	(r380702)
+++ head/mail/alpine/pkg-plist	Sat Mar  7 14:51:05 2015	(r380703)
@@ -1,7 +1,7 @@
 bin/alpine
 bin/rpdump
 bin/rpload
+%%ETCDIR%%.conf.sample
 man/man1/alpine.1.gz
 man/man1/rpdump.1.gz
 man/man1/rpload.1.gz
- at sample etc/alpine.conf.sample