svn commit: r504421 - head/mail/aerc

[Tobias Kortkamp]

Author: tobik
Date: Mon Jun 17 13:35:17 2019
New Revision: 504421
URL: https://svnweb.freebsd.org/changeset/ports/504421

Log:
  mail/aerc: Update to latest master
  
  Also fix handling of tcell dependency which is actually replaced
  with a patched version.

Modified:
  head/mail/aerc/Makefile
  head/mail/aerc/distinfo

Modified: head/mail/aerc/Makefile
==============================================================================
--- head/mail/aerc/Makefile	Mon Jun 17 13:29:22 2019	(r504420)
+++ head/mail/aerc/Makefile	Mon Jun 17 13:35:17 2019	(r504421)
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
 PORTNAME=	aerc
-DISTVERSION=	0.1.1-37
-DISTVERSIONSUFFIX=	-gd22a914
+DISTVERSION=	0.1.1-53
+DISTVERSIONSUFFIX=	-gdfe114b
 CATEGORIES=	mail
 
 MAINTAINER=	tobik at FreeBSD.org
@@ -25,7 +25,6 @@ GH_TUPLE=	danwakefield:fnmatch:cbb64ac3d964:danwakefie
 		emersion:go-smtp:v0.11.1:emersion_go_smtp/vendor/github.com/emersion/go-smtp \
 		emersion:go-textwrapper:d0e65e56babe:emersion_go_textwrapper/vendor/github.com/emersion/go-textwrapper \
 		gdamore:encoding:v1.0.0:gdamore_encoding/vendor/github.com/gdamore/encoding \
-		gdamore:tcell:b5d0c1ac5702:gdamore_tcell/vendor/github.com/gdamore/tcell \
 		go-ini:ini:v1.42.0:go_ini_ini/vendor/github.com/go-ini/ini \
 		golang:sys:4c4f7f33c9ed:golang_sys/vendor/golang.org/x/sys \
 		golang:text:v0.3.2:golang_text/vendor/golang.org/x/text \
@@ -44,9 +43,10 @@ GH_TUPLE=	danwakefield:fnmatch:cbb64ac3d964:danwakefie
 		stretchr:testify:v1.3.0:stretchr_testify/vendor/github.com/stretchr/testify
 
 # Additional distfiles to fetch from https://git.sr.ht
-SRHT_TUPLE=	sircmpwn aerc ${DISTVERSIONFULL} \
-		sircmpwn getopt e7e23d1cd3a3 \
-		sircmpwn pty 3a43678975a9
+SRHT_TUPLE=	sircmpwn aerc ${DISTVERSIONFULL} "" \
+		sircmpwn getopt e7e23d1cd3a3 vendor/git.sr.ht/~sircmpwn/getopt \
+		sircmpwn pty 3a43678975a9 vendor/git.sr.ht/~sircmpwn/pty \
+		sircmpwn tcell 1f7dcc638286 vendor/github.com/gdamore/tcell
 
 MAKE_ARGS=	MANDIR=${STAGEDIR}${PREFIX}/man
 MAKE_ENV=	${GO_ENV} \
@@ -63,15 +63,15 @@ HTML_FILTER_RUN_DEPENDS=	socksify:net/dante \
 
 .include <bsd.port.pre.mk>
 
-.for account project tag in ${SRHT_TUPLE}
+.for account project tag subdir in ${SRHT_TUPLE}
 MASTER_SITES+=	https://git.sr.ht/~${account}/${project}/archive/${tag}${EXTRACT_SUFX}?dummy=/:${account}_${project}
 DISTFILES+=	${account}-${project}-${tag}_SRHT0${EXTRACT_SUFX}:${account}_${project}
 .endfor
 
 post-extract:
-.for account project tag in ${SRHT_TUPLE:[4..-1]}
-	@${MKDIR} ${WRKSRC}/vendor/git.sr.ht/~${account}
-	@${MV} ${WRKDIR}/${project}-${tag} ${WRKSRC}/vendor/git.sr.ht/~${account}/${project}
+.for account project tag subdir in ${SRHT_TUPLE:[5..-1]}
+	@${MKDIR} ${WRKSRC}/${subdir:H}
+	@${MV} ${WRKDIR}/${project}-${tag} ${WRKSRC}/${subdir}
 .endfor
 
 post-patch:

Modified: head/mail/aerc/distinfo
==============================================================================
--- head/mail/aerc/distinfo	Mon Jun 17 13:29:22 2019	(r504420)
+++ head/mail/aerc/distinfo	Mon Jun 17 13:35:17 2019	(r504421)
@@ -1,10 +1,12 @@
-TIMESTAMP = 1560184690
-SHA256 (sircmpwn-aerc-0.1.1-37-gd22a914_SRHT0.tar.gz) = c47fd1923594e932db31d770e9099b06b7a79b6307e1f1e13ef6b3d3c56e668f
-SIZE (sircmpwn-aerc-0.1.1-37-gd22a914_SRHT0.tar.gz) = 63661
+TIMESTAMP = 1560777630
+SHA256 (sircmpwn-aerc-0.1.1-53-gdfe114b_SRHT0.tar.gz) = 081241511fe7a80a96c64acf5b4edc4773f8a63817dc3b4ce0ae7ac5c801671d
+SIZE (sircmpwn-aerc-0.1.1-53-gdfe114b_SRHT0.tar.gz) = 65212
 SHA256 (sircmpwn-getopt-e7e23d1cd3a3_SRHT0.tar.gz) = 39ce05a3d7f58fdc5cca2c3413a326a5a3e4fb8025470d875818353cb0007ea7
 SIZE (sircmpwn-getopt-e7e23d1cd3a3_SRHT0.tar.gz) = 3715
 SHA256 (sircmpwn-pty-3a43678975a9_SRHT0.tar.gz) = 3cdfaff4ef27553045417a28e9d8d916ab23a6f32fb565c1dc39246c970094bf
 SIZE (sircmpwn-pty-3a43678975a9_SRHT0.tar.gz) = 5834
+SHA256 (sircmpwn-tcell-1f7dcc638286_SRHT0.tar.gz) = 597bdd77df220022b7df64b0f139267e97e6af9de7390781d9086c06b8260157
+SIZE (sircmpwn-tcell-1f7dcc638286_SRHT0.tar.gz) = 744326
 SHA256 (danwakefield-fnmatch-cbb64ac3d964_GH0.tar.gz) = 7ebff38d382142f9220d2cfcb4731d0ae90cdef71238c94a15c35f8aa746007f
 SIZE (danwakefield-fnmatch-cbb64ac3d964_GH0.tar.gz) = 4955
 SHA256 (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 7d82b9bb7291adbe7498fe946920ab3e7fc9e6cbfc3b2294693fad00bf0dd17e
@@ -25,8 +27,6 @@ SHA256 (emersion-go-textwrapper-d0e65e56babe_GH0.tar.g
 SIZE (emersion-go-textwrapper-d0e65e56babe_GH0.tar.gz) = 2168
 SHA256 (gdamore-encoding-v1.0.0_GH0.tar.gz) = 8fb8593a69cd86f16233d63dd6d74181136ec8f22900c509e961a25eb4b2e013
 SIZE (gdamore-encoding-v1.0.0_GH0.tar.gz) = 10886
-SHA256 (gdamore-tcell-b5d0c1ac5702_GH0.tar.gz) = f6bae2233826d53b880a462357ab49667b5e124c633e0f1177a8d97e0bc7dd9f
-SIZE (gdamore-tcell-b5d0c1ac5702_GH0.tar.gz) = 745939
 SHA256 (go-ini-ini-v1.42.0_GH0.tar.gz) = 49136717e5db9000e02f86807cfd9faa98f943553a3c40319020b7c32e7c142c
 SIZE (go-ini-ini-v1.42.0_GH0.tar.gz) = 35078
 SHA256 (golang-sys-4c4f7f33c9ed_GH0.tar.gz) = d1e6184629bc6ad5db894fe80d2e1456f8e5721c9031574d2f721c8c2ef8b1f3