*/*: sync with upstream

Taken from: FreeBSD

archivers/hs-zip-archive/pkg-descr

@@ -1,4 +1,4 @@
 The zip-archive library provides functions for creating, modifying, and
 extracting files from zip archives.
 
-WWW: http://github.com/jgm/zip-archive
+WWW: https://github.com/jgm/zip-archive

archivers/hs-zlib-bindings/pkg-descr

@@ -1,4 +1,4 @@
 Provides necessary functions for producing a streaming interface. This
 is used for example by zlib-conduit and zlib-enum.
 
-WWW: http://github.com/snoyberg/zlib-bindings
+WWW: https://github.com/snoyberg/zlib-bindings

archivers/hs-zlib-enum/pkg-descr

@@ -1,4 +1,4 @@
 zlib-enum is a stop-gap package to provide enumeratees for zlib
 compression/decompression.
 
-WWW: http://github.com/maltem/zlib-enum
+WWW: https://github.com/maltem/zlib-enum

archivers/p5-Compress-LZ4/Makefile

@@ -15,7 +15,7 @@ LICENSE_COMB=	dual
 USES=		perl5
 USE_PERL5=	configure
 
-post-stage:
+post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Compress/LZ4/LZ4.so
 
 .include <bsd.port.mk>

archivers/pixz/files/pixz.1

@@ -119,7 +119,7 @@ Extract one file from an archive, quickly\&.
 pixz is written by Dave Vasilevsky\&.
 .SH "RESOURCES"
 .sp
-The pixz homepage: http://github\&.com/vasi/pixz/
+The pixz homepage: https://github\&.com/vasi/pixz/
 .sp
 Source downloads: http://sourceforge\&.net/projects/pixz/files/
 .SH "COPYRIGHT"

archivers/py-brotli/Makefile

@@ -3,7 +3,7 @@
 
 PORTNAME=	brotli
 PORTVERSION=	0.5.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	archivers
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -15,7 +15,7 @@ COMMENT=	Generic-purpose lossless compression algorithm
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USE_PYTHON=	autoplist distutils
+USE_PYTHON=	autoplist concurrent distutils
 USES=		compiler:c++0x python zip
 
 PLIST_FILES=	bin/brotli

archivers/zipper/Makefile

@@ -15,6 +15,6 @@ USES=		gnustep
 USE_GNUSTEP=	back build
 
 post-patch:
-	cd ${WRKSRC} && ${FIND} . -name "*#*" -exec ${RM} -v "{}" ";"
+	cd ${WRKSRC} && ${FIND} . -name "*#*" -exec ${RM} -v {} ";"
 
 .include <bsd.port.mk>

astro/p5-Starlink-AST/Makefile

@@ -22,7 +22,7 @@ TEST_DEPENDS=	p5-Test-Number-Delta>=0:devel/p5-Test-Number-Delta
 USES=		perl5
 USE_PERL5=	modbuild
 
-post-stage:
+post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Starlink/AST/AST.so
 
 .include <bsd.port.mk>

audio/audiotag/pkg-descr

@@ -1,4 +1,4 @@
 Audiotag is a command-line tool for mass tagging/renaming of audio files
 it supports the vorbis comment, id3 tags, and MP4 tags.
 
-WWW: http://github.com/Daenyth/audiotag
+WWW: https://github.com/Daenyth/audiotag

audio/harp/pkg-descr

@@ -2,4 +2,4 @@ HARP is a music player designed for the purpose of providing
 minimalist users with a suitable replacement for music players
 with bulky user interfaces.
 
-WWW: http://github.com/heckendorfc/harp
+WWW: https://github.com/heckendorfc/harp

audio/hs-libmpd/pkg-descr

@@ -1,3 +1,3 @@
 A client library for MPD, the Music Player Daemon.
 
-WWW: http://github.com/vimus/libmpd-haskell#readme
+WWW: https://github.com/vimus/libmpd-haskell#readme

audio/id3mtag/Makefile

@@ -4,7 +4,7 @@
 PORTNAME=	id3mtag
 PORTVERSION=	0.80
 CATEGORIES=	audio
-MASTER_SITES=	http://github.com/squell/id3/releases/download/${PORTVERSION}/
+MASTER_SITES=	https://github.com/squell/id3/releases/download/${PORTVERSION}/
 DISTNAME=	id3-${PORTVERSION}
 
 MAINTAINER=	[email protected]

audio/libechonest/pkg-descr

@@ -1,4 +1,4 @@
 libechonest is a collection of C++/Qt classes designed to make a developer's
 life easy when trying to use the APIs provided by The Echo Nest.
 
-WWW: http://github.com/lfranchi/libechonest
+WWW: https://github.com/lfranchi/libechonest

audio/liblastfm/pkg-descr

@@ -2,4 +2,4 @@ liblastfm is a collection of libraries to help you integrate Last.fm services
 into your rich desktop software. It is officially supported software developed
 by Last.fm staff.
 
-WWW: http://github.com/lastfm/liblastfm
+WWW: https://github.com/lastfm/liblastfm

audio/mp3unicode/Makefile

@@ -3,7 +3,7 @@
 PORTNAME=	mp3unicode
 PORTVERSION=	1.2.1
 CATEGORIES=	audio
-MASTER_SITES=	http://github.com/downloads/alonbl/mp3unicode/
+MASTER_SITES=	https://github.com/downloads/alonbl/mp3unicode/
 
 MAINTAINER=	[email protected]
 COMMENT=	ID3 tags charset converter

audio/mpdas/pkg-descr

@@ -5,6 +5,6 @@ In case of a downtime or connectivity problems,
 mpdas will cache the played songs to ~/.mpdascache.
 
 Please read the README at:
-http://github.com/hrkfdn/mpdas/tree/master/README
+https://github.com/hrkfdn/mpdas/tree/master/README
 
 WWW: http://50hz.ws/mpdas/

audio/mps/pkg-descr

@@ -8,4 +8,4 @@ Terminal based MP3 search, playback and download.
  - No Python dependencies
  - Requires mplayer or mpv
 
-WWW: http://github.com/np1/mps/
+WWW: https://github.com/np1/mps/

audio/p5-Net-FreeDB/Makefile

@@ -21,7 +21,7 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		alias perl5
 USE_PERL5=	configure
 
-post-stage:
+post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Net/FreeDB/FreeDB.so
 
 .include <bsd.port.mk>

audio/praat/Makefile

@@ -28,9 +28,9 @@ USE_GCC=	yes
 
 post-patch:
 	@${FIND} ${WRKSRC} -name Makefile -exec \
-		${REINPLACE_CMD} -e 's|^CFLAGS =|CFLAGS +=|' "{}" \;
+		${REINPLACE_CMD} -e 's|^CFLAGS =|CFLAGS +=|' {} \;
 	@${FIND} ${WRKSRC} -name Makefile -exec \
-		${REINPLACE_CMD} -e 's|^CPPFLAGS =|CPPFLAGS +=|' "{}" \;
+		${REINPLACE_CMD} -e 's|^CPPFLAGS =|CPPFLAGS +=|' {} \;
 	@${CP} ${FILESDIR}/makefile.defs.freebsd.alsa \
 		${WRKSRC}/makefile.defs
 	@${REINPLACE_CMD} -e 's|%%WRKSRC%%|${WRKSRC}|g' \

audio/py-gmusicapi/pkg-descr

@@ -10,4 +10,4 @@ This project is not supported nor endorsed by Google. The author kindly
 asks the users of this API to use common sense (protocol compliance,
 reasonable load, etc) when accessing Google Play Music through this API.
 
-WWW: http://github.com/simon-weber/Unofficial-Google-Music-API
+WWW: https://github.com/simon-weber/Unofficial-Google-Music-API

biology/cd-hit/Makefile

@@ -31,7 +31,7 @@ post-patch:
 		-e 's|/bin/bash|${LOCALBASE}/bin/bash|g' \
 		${WRKSRC}/*.pl
 
-post-stage:
+post-install:
 	@cd ${STAGEDIR}${PREFIX}/bin && \
 		${STRIP_CMD} cd-hit cd-hit-2d cd-hit-454 \
 		cd-hit-div cd-hit-est cd-hit-est-2d

cad/tkgate/Makefile

@@ -25,7 +25,7 @@ post-patch:
 		${WRKSRC}/configure
 
 # Remove backup files somehow installed to the stagedir
-post-stage:
+post-install:
 	${FIND} ${STAGEDIR}/${DATADIR} -name '*~' -delete -or -name '*~?' -delete
 
 .include <bsd.port.mk>

chinese/ibus-libpinyin/pkg-descr

@@ -3,4 +3,4 @@ Intelligent Pinyin engine based on libpinyin for IBus
 It includes a Chinese Pinyin input method and a Chinese ZhuYin (Bopomofo)
 input method based on libpinyin for IBus.
 
-WWW: http://github.com/libpinyin/ibus-libpinyin
+WWW: https://github.com/libpinyin/ibus-libpinyin

chinese/librime/Makefile

@@ -36,6 +36,6 @@ BROKEN_powerpc64=	Does not build on powerpc64
 
 post-patch:     .SILENT
 	${FIND} ${WRKSRC} \( -name '*.cc' -or -name '*.h' \) \
-		-exec ${PERL} -i -pe '$$. == 1 && s/^\xef\xbb\xbf//;' '{}' \;
+		-exec ${PERL} -i -pe '$$. == 1 && s/^\xef\xbb\xbf//;' {} \;
 
 .include <bsd.port.mk>

chinese/mutt/Makefile

@@ -6,7 +6,7 @@ CATEGORIES=	chinese
 
 MASTERDIR=	${.CURDIR}/../../mail/mutt
 #REVISEDATE=	20100927
-#PORTREVISION=	${REVISEDATE}
+PORTREVISION=	3
 
 # XXX: Currently PORTREVISION assignment is not perfect. It needs to
 # inherit its master port's PORTREVISION and be appended.
@@ -38,5 +38,6 @@ post-patch::
 		${ECHO_MSG} "===>  Applying extra patch $$i"; \
 		${PATCH} ${PATCH_ARGS} < $$i; \
 	done
+	@${REINPLACE_CMD} -e 's|裏|裡|' ${WRKSRC}/po/zh_TW.po
 
 .include "${MASTERDIR}/Makefile"

chinese/mutt/files/patch-init.h

@@ -0,0 +1,32 @@
+--- init.h.orig	2016-12-02 11:18:42.572961000 +0800
++++ init.h	2016-12-02 11:18:42.600298000 +0800
+@@ -290,6 +290,11 @@ struct option_t MuttVars[] = {
+   ** .pp
+   ** Also see $$fast_reply.
+   */
++  { "bbsislame",	DT_BOOL, R_NONE, OPTBBSISLAME, 0 },
++  /*
++  ** .pp
++  ** When this variable is set, mutt will beep when an error occurs.
++  */
+   { "beep",		DT_BOOL, R_NONE, OPTBEEP, 1 },
+   /*
+   ** .pp
+@@ -2667,7 +2672,7 @@ struct option_t MuttVars[] = {
+   ** For the pager, this variable specifies the number of lines shown
+   ** before search results. By default, search results will be top-aligned.
+   */
+-  { "send_charset",	DT_STR,  R_NONE, UL &SendCharset, UL "us-ascii:iso-8859-1:utf-8" },
++  { "send_charset",	DT_STR,  R_NONE, UL &SendCharset, UL "big5:gb2312:us-ascii:iso-8859-1:utf-8" },
+   /*
+   ** .pp
+   ** A colon-delimited list of character sets for outgoing messages. Mutt will use the
+@@ -3649,7 +3654,7 @@ struct option_t MuttVars[] = {
+   ** When \fIset\fP, Mutt will jump to the next unread message, if any,
+   ** when the current thread is \fIun\fPcollapsed.
+   */
+-  { "use_8bitmime",	DT_BOOL, R_NONE, OPTUSE8BITMIME, 0 },
++  { "use_8bitmime",	DT_BOOL, R_NONE, OPTUSE8BITMIME, 1 },
+   /*
+   ** .pp
+   ** \fBWarning:\fP do not set this variable unless you are using a version

chinese/mutt/files/patch-mbyte.c

@@ -0,0 +1,135 @@
+--- mbyte.c.orig	2016-10-09 03:35:50.000000000 +0800
++++ mbyte.c	2016-12-02 11:18:42.600658000 +0800
+@@ -24,6 +24,9 @@
+ # include "config.h"
+ #endif
+
++/*
++ * Trad. Chinese (Big5) support by [email protected]
++ */
+ #include "mutt.h"
+ #include "mbyte.h"
+ #include "charset.h"
+@@ -39,6 +42,7 @@
+ int Charset_is_utf8 = 0;
+ #ifndef HAVE_WC_FUNCS
+ static int charset_is_ja = 0;
++static int charset_is_big5 = 0;
+ static iconv_t charset_to_utf8 = (iconv_t)(-1);
+ static iconv_t charset_from_utf8 = (iconv_t)(-1);
+ #endif
+@@ -52,6 +56,7 @@ void mutt_set_charset (char *charset)
+   Charset_is_utf8 = 0;
+ #ifndef HAVE_WC_FUNCS
+   charset_is_ja = 0;
++  charset_is_big5 = 0;
+   if (charset_to_utf8 != (iconv_t)(-1))
+   {
+     iconv_close (charset_to_utf8);
+@@ -82,6 +87,14 @@ void mutt_set_charset (char *charset)
+     charset_from_utf8 = mutt_iconv_open (charset, "utf-8", 0);
+   }
+ #endif
++#ifndef HAVE_WC_FUNCS
++  else if (!strcmp(buffer, "big5"))
++  {
++    charset_is_big5 = 1;
++    charset_to_utf8 = iconv_open ("UTF-8", charset);
++    charset_from_utf8 = iconv_open (charset, "UTF-8");
++  }
++#endif
+
+ #if defined(HAVE_BIND_TEXTDOMAIN_CODESET) && defined(ENABLE_NLS)
+   bind_textdomain_codeset(PACKAGE, buffer);
+@@ -256,7 +269,7 @@ size_t mbrtowc (wchar_t *pwc, const char
+
+ int iswprint (wint_t wc)
+ {
+-  if (Charset_is_utf8 || charset_is_ja)
++  if (Charset_is_utf8 || charset_is_ja || charset_is_big5)
+     return ((0x20 <= wc && wc < 0x7f) || 0xa0 <= wc);
+   else
+     return (0 <= wc && wc < 256) ? IsPrint (wc) : 0;
+@@ -264,7 +277,7 @@ int iswprint (wint_t wc)
+
+ int iswspace (wint_t wc)
+ {
+-  if (Charset_is_utf8 || charset_is_ja)
++  if (Charset_is_utf8 || charset_is_ja || charset_is_big5)
+     return (9 <= wc && wc <= 13) || wc == 32;
+   else
+     return (0 <= wc && wc < 256) ? isspace (wc) : 0;
+@@ -347,7 +360,7 @@ static int iswalpha_ucs (wint_t wc)
+
+ wint_t towupper (wint_t wc)
+ {
+-  if (Charset_is_utf8 || charset_is_ja)
++  if (Charset_is_utf8 || charset_is_ja || charset_is_big5)
+     return towupper_ucs (wc);
+   else
+     return (0 <= wc && wc < 256) ? toupper (wc) : wc;
+@@ -355,7 +368,7 @@ wint_t towupper (wint_t wc)
+
+ wint_t towlower (wint_t wc)
+ {
+-  if (Charset_is_utf8 || charset_is_ja)
++  if (Charset_is_utf8 || charset_is_ja || charset_is_big5)
+     return towlower_ucs (wc);
+   else
+     return (0 <= wc && wc < 256) ? tolower (wc) : wc;
+@@ -363,7 +376,7 @@ wint_t towlower (wint_t wc)
+
+ int iswalnum (wint_t wc)
+ {
+-  if (Charset_is_utf8 || charset_is_ja)
++  if (Charset_is_utf8 || charset_is_ja || charset_is_big5)
+     return iswalnum_ucs (wc);
+   else
+     return (0 <= wc && wc < 256) ? isalnum (wc) : 0;
+@@ -404,13 +417,31 @@ int wcwidth_ja (wchar_t ucs)
+     return -1;
+ }
+
++int wcwidth_big5(wchar_t ucs)
++{
++  return wcwidth_ja (ucs);
++}
++
+ int wcwidth_ucs(wchar_t ucs);
+
+ int wcwidth (wchar_t wc)
+ {
+   if (!Charset_is_utf8)
+   {
+-    if (!charset_is_ja)
++    if (charset_is_ja)
++    {
++      /* Japanese */
++      int k = wcwidth_ja (wc);
++      if (k != -1)
++	return k;
++    }
++    else if (charset_is_big5)
++    {
++      int k = wcwidth_big5 (wc);
++      if (k != -1)
++        return k;
++    }
++    else
+     {
+       /* 8-bit case */
+       if (!wc)
+@@ -420,13 +451,6 @@ int wcwidth (wchar_t wc)
+       else
+ 	return -1;
+     }
+-    else
+-    {
+-      /* Japanese */
+-      int k = wcwidth_ja (wc);
+-      if (k != -1)
+-	return k;
+-    }
+   }
+   return wcwidth_ucs (wc);
+ }

chinese/mutt/files/patch-mutt.h

@@ -0,0 +1,10 @@
+--- mutt.h.orig	2016-12-02 11:18:42.574880000 +0800
++++ mutt.h	2016-12-02 11:18:42.601038000 +0800
+@@ -342,6 +342,7 @@ enum
+   OPTATTACHSPLIT,
+   OPTAUTOEDIT,
+   OPTAUTOTAG,
++  OPTBBSISLAME,
+   OPTBEEP,
+   OPTBEEPNEW,
+   OPTBOUNCEDELIVERED,