- Switch to the version maintained by the developers of Wanderlust.

- Update to the snapshot on 2019-07-08.

8 files changed, 27 insertions, 65 deletions

diff --git a/editors/semi/Makefile b/editors/semi/Makefile
index 5fbf65f93713..591291d32e1a 100644
--- a/editors/semi/Makefile
+++ b/editors/semi/Makefile
@@ -2,10 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	semi
-PORTVERSION=	${SEMI_VER}
-PORTREVISION=	23
+PORTVERSION=	${SEMI_VER}.${SNAPDATE}
 CATEGORIES=	editors elisp
-MASTER_SITES=	http://git.chise.org/elisp/dist/semi/semi-1.14-for-flim-1.14/
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	nobutaka@FreeBSD.org
@@ -13,12 +11,15 @@ COMMENT=	SEMI, Library of MIME feature for GNU Emacs for emacs
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	flim${EMACS_PKGNAMESUFFIX}>0:editors/flim@${EMACS_FLAVOR} \
-		nkf:japanese/nkf
+BUILD_DEPENDS=	flim${EMACS_PKGNAMESUFFIX}>0:editors/flim@${EMACS_FLAVOR}
 RUN_DEPENDS=	flim${EMACS_PKGNAMESUFFIX}>0:editors/flim@${EMACS_FLAVOR}
 
-USES=		emacs makeinfo
+USES=		emacs iconv makeinfo
+USE_GITHUB=	yes
+GH_ACCOUNT=	wanderlust
+GH_TAGNAME=	16228dc
 
+SNAPDATE=	20190708
 NO_ARCH=	yes
 
 FLIM_TRUNK=	1.14
@@ -38,8 +39,8 @@ OPTIONS_DEFINE=	DOCS
 post-build:
 	@(cd ${WRKSRC} ; \
 	for i in mime-ui-en.texi mime-ui-ja.texi; do \
-		${CAT} $${i} | nkf -e > $${i}.jis ; \
-		${MAKEINFO} --no-split --no-validate $${i}.jis ; \
+		${ICONV_CMD} -f ISO-2022-JP -t UTF-8 $${i} > $${i}.utf8 ; \
+		${MAKEINFO} --no-split --no-validate $${i}.utf8 ; \
 	done)
 
 post-install:
diff --git a/editors/semi/distinfo b/editors/semi/distinfo
index f14ad95cf1d7..595e001cbacd 100644
--- a/editors/semi/distinfo
+++ b/editors/semi/distinfo
@@ -1,2 +1,3 @@
-SHA256 (semi-1.14.6.tar.gz) = 717fe9261863b2a36cf5882cc669452848d6b91f48ce6a695d81118500ed1bfb
-SIZE (semi-1.14.6.tar.gz) = 142549
+TIMESTAMP = 1565575398
+SHA256 (wanderlust-semi-1.14.6.20190708-16228dc_GH0.tar.gz) = 8b27eb7e3ab4d2a250237b496c77cf89a77d583e484c577c99448535abb52228
+SIZE (wanderlust-semi-1.14.6.20190708-16228dc_GH0.tar.gz) = 153183
diff --git a/editors/semi/files/_pkg.el b/editors/semi/files/_pkg.el
deleted file mode 100644
index 5bc3c1a4a951..000000000000
--- a/editors/semi/files/_pkg.el
+++ /dev/null
@@ -1,4 +0,0 @@
-;;;###autoload
-(package-provide 'semi
-                 :version 1.18
-                 :type 'regular)
diff --git a/editors/semi/files/patch-SEMI-CFG b/editors/semi/files/patch-SEMI-CFG
deleted file mode 100644
index 3ba0e756d74e..000000000000
--- a/editors/semi/files/patch-SEMI-CFG
+++ /dev/null
@@ -1,11 +0,0 @@
---- SEMI-CFG.orig	2003-01-10 18:12:05 UTC
-+++ SEMI-CFG
-@@ -9,6 +9,8 @@
- (add-to-list 'load-path
- 	     (expand-file-name "../../site-lisp/apel" data-directory))
- (add-to-list 'load-path
-+	     (expand-file-name "../site-lisp/emu" data-directory))
-+(add-to-list 'load-path
- 	     (expand-file-name "." data-directory))
- 
- (if (boundp 'LISPDIR)
diff --git a/editors/semi/files/patch-mime-ui-en.texi b/editors/semi/files/patch-mime-ui-en.texi
deleted file mode 100644
index 5c14551723e5..000000000000
--- a/editors/semi/files/patch-mime-ui-en.texi
+++ /dev/null
@@ -1,14 +0,0 @@
---- mime-ui-en.texi.orig	2002-10-15 06:59:21 UTC
-+++ mime-ui-en.texi
-@@ -1,6 +1,10 @@
- \input texinfo.tex
- @setfilename mime-ui-en.info
--@settitle{SEMI 1.14 Manual}
-+@settitle SEMI 1.14 Manual
-+@dircategory The Emacs editor and associated tools 
-+@direntry 
-+* mime-ui-en: (mime-ui-en).	MIME user interface for GNU Emacs. (English)
-+@end direntry 
- @titlepage
- @title SEMI 1.14 Manual
- @author MORIOKA Tomohiko <morioka@@jaist.ac.jp>
diff --git a/editors/semi/files/patch-mime-ui-ja.texi b/editors/semi/files/patch-mime-ui-ja.texi
index 83e52d68ed81..42c9f5f6250c 100644
--- a/editors/semi/files/patch-mime-ui-ja.texi
+++ b/editors/semi/files/patch-mime-ui-ja.texi
@@ -1,14 +1,10 @@
---- mime-ui-ja.texi.orig	2002-10-15 06:59:21 UTC
+--- mime-ui-ja.texi.orig	2019-08-11 16:55:18 UTC
 +++ mime-ui-ja.texi
-@@ -1,6 +1,10 @@
+@@ -1,6 +1,6 @@
  \input texinfo.tex
  @setfilename mime-ui-ja.info
--@settitle{SEMI 1.14 $B@bL@=q(B}
-+@settitle SEMI 1.14 $B@bL@=q(B
-+@dircategory The Emacs editor and associated tools 
-+@direntry 
-+* mime-ui-ja: (mime-ui-ja).	MIME user interface for GNU Emacs. (Japanese)
-+@end direntry 
- @titlepage
- @title SEMI 1.14 $B@bL@=q(B
- @author $B<i2,(B $BCNI'(B <morioka@@jaist.ac.jp>
+-@documentencoding iso-2022-jp
++@documentencoding utf-8
+ @documentlanguage ja
+ 
+ @dircategory GNU Emacs Lisp
diff --git a/editors/semi/pkg-descr b/editors/semi/pkg-descr
index 52cb3e53c265..cbb6833fbf1d 100644
--- a/editors/semi/pkg-descr
+++ b/editors/semi/pkg-descr
@@ -20,4 +20,4 @@ SEMI, Library of MIME feature for GNU Emacs for emacs20.
 
 Ported by shige@FreeBSD.ORG
 
-WWW: http://git.chise.org/elisp/semi/ (in Japanese)
+WWW: https://github.com/wanderlust/semi
diff --git a/editors/semi/pkg-plist b/editors/semi/pkg-plist
index 72005c440419..51fd252cc1f0 100644
--- a/editors/semi/pkg-plist
+++ b/editors/semi/pkg-plist
@@ -13,21 +13,16 @@
 %%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-play.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-setup.el
 %%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-setup.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-shr.el
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-shr.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-signature.el
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-signature.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-tnef.el
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-tnef.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-vcard.el
 %%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-view.el
 %%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-view.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-w3.el
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/pgg-def.el
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/pgg-def.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/pgg-gpg.el
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/pgg-gpg.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/pgg-parse.el
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/pgg-parse.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/pgg-pgp.el
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/pgg-pgp.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/pgg-pgp5.el
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/pgg-pgp5.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/pgg.el
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/pgg.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/semi/postpet.el
 %%EMACS_VERSION_SITE_LISPDIR%%/semi/postpet.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/semi/semi-def.el
@@ -36,8 +31,6 @@
 %%EMACS_VERSION_SITE_LISPDIR%%/semi/semi-setup.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/semi/signature.el
 %%EMACS_VERSION_SITE_LISPDIR%%/semi/signature.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/smime.el
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/smime.elc
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README.en