- Simplify PLIST, BUILD_DEPENDS and RUN_DEPENDS selection.

- Regenerate patches by 'make makepatch'.
- Pet portlint.

PR:		213183
Submitted by:	Yasuhiro KIMURA <yasu@utahime.org>

5 files changed, 12 insertions, 86 deletions

diff --git a/editors/semi/Makefile b/editors/semi/Makefile
index 39887ba902ec..67160ce526f1 100644
--- a/editors/semi/Makefile
+++ b/editors/semi/Makefile
@@ -8,8 +8,8 @@ CATEGORIES=	editors elisp
 MASTER_SITES=	http://git.chise.org/elisp/dist/semi/semi-1.14-for-flim-1.14/
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 
-MAINTAINER?=	nobutaka@FreeBSD.org
-COMMENT?=	SEMI, Library of MIME feature for GNU Emacs for emacs
+MAINTAINER=	nobutaka@FreeBSD.org
+COMMENT=	SEMI, Library of MIME feature for GNU Emacs for emacs
 
 LICENSE=	GPLv2
 
@@ -47,24 +47,10 @@ OPTIONS_DEFINE=	DOCS
 .include <bsd.port.pre.mk>
 .include <bsd.port.options.mk>
 
-.if defined(EMACS_PORT_NAME)
-.if (${EMACS_PORT_NAME} == "emacs25") || (${EMACS_PORT_NAME} == "emacs-nox11") || (${EMACS_PORT_NAME} == "emacs-devel")
-DEPPORT_SUFFIX=
-.else
-DEPPORT_SUFFIX=	-${EMACS_PORT_NAME}
-.endif
-.if (${EMACS_PORT_NAME} == "emacs25") || (${EMACS_PORT_NAME} == "emacs-nox11") || (${EMACS_PORT_NAME} == "emacs-devel")
 PLIST=		${PKGDIR}/pkg-plist.emacs20
-.endif
 # depends on flim
-BUILD_DEPENDS+=	${LOCALBASE}/share/flim/${FLIM_COOKIE}:editors/flim${DEPPORT_SUFFIX}
-RUN_DEPENDS+=	${LOCALBASE}/share/flim/${FLIM_COOKIE}:editors/flim${DEPPORT_SUFFIX}
-.else
-.BEGIN:
-	@${ECHO} "Error: Bad port."
-	@${ECHO} "You must define EMACS_PORT_NAME."
-	@${FALSE}
-.endif
+BUILD_DEPENDS+=	flim-${EMACS_PORT_NAME}>0:editors/flim
+RUN_DEPENDS+=	flim-${EMACS_PORT_NAME}>0:editors/flim
 
 .if !defined(BUILD_INFO_BY_EMACS) || (${BUILD_INFO_BY_EMACS} == "NO")
 # info files JIS to EUC
diff --git a/editors/semi/files/patch-SEMI-CFG b/editors/semi/files/patch-SEMI-CFG
index 2c7aa48962d6..3ba0e756d74e 100644
--- a/editors/semi/files/patch-SEMI-CFG
+++ b/editors/semi/files/patch-SEMI-CFG
@@ -1,6 +1,6 @@
---- SEMI-CFG.orig	Wed Sep 16 15:48:58 1998
-+++ SEMI-CFG	Sun May  9 21:54:02 1999
-@@ -11,6 +11,8 @@
+--- 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
@@ -8,4 +8,4 @@
 +(add-to-list 'load-path
  	     (expand-file-name "." data-directory))
  
- (when (boundp 'LISPDIR)
+ (if (boundp 'LISPDIR)
diff --git a/editors/semi/files/patch-mime-ui-en.texi b/editors/semi/files/patch-mime-ui-en.texi
index 2634e47e7c17..5c14551723e5 100644
--- a/editors/semi/files/patch-mime-ui-en.texi
+++ b/editors/semi/files/patch-mime-ui-en.texi
@@ -1,5 +1,5 @@
---- ./mime-ui-en.texi.orig	2002-10-15 06:59:21.000000000 +0000
-+++ ./mime-ui-en.texi	2014-06-29 07:49:25.000000000 +0000
+--- 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
diff --git a/editors/semi/files/patch-mime-ui-ja.texi b/editors/semi/files/patch-mime-ui-ja.texi
index 4e926a4d6024..83e52d68ed81 100644
--- a/editors/semi/files/patch-mime-ui-ja.texi
+++ b/editors/semi/files/patch-mime-ui-ja.texi
@@ -1,5 +1,5 @@
---- ./mime-ui-ja.texi.orig	2002-10-15 06:59:21.000000000 +0000
-+++ ./mime-ui-ja.texi	2014-06-29 07:49:58.000000000 +0000
+--- mime-ui-ja.texi.orig	2002-10-15 06:59:21 UTC
++++ mime-ui-ja.texi
 @@ -1,6 +1,10 @@
  \input texinfo.tex
  @setfilename mime-ui-ja.info
diff --git a/editors/semi/pkg-plist.xemacs21-mule b/editors/semi/pkg-plist.xemacs21-mule
deleted file mode 100644
index db7d153559b0..000000000000
--- a/editors/semi/pkg-plist.xemacs21-mule
+++ /dev/null
@@ -1,60 +0,0 @@
-%%EMACS_PACKAGESDIR%%/pkginfo/MANIFEST.semi
-%%PORTDOCS%%%%EMACS_PACKAGESDIR%%/lisp/semi/ChangeLog
-%%PORTDOCS%%%%EMACS_PACKAGESDIR%%/lisp/semi/NEWS
-%%PORTDOCS%%%%EMACS_PACKAGESDIR%%/lisp/semi/README.en
-%%PORTDOCS%%%%EMACS_PACKAGESDIR%%/lisp/semi/README.ja
-%%PORTDOCS%%%%EMACS_PACKAGESDIR%%/lisp/semi/TODO
-%%PORTDOCS%%%%EMACS_PACKAGESDIR%%/lisp/semi/VERSION
-%%EMACS_PACKAGESDIR%%/lisp/semi/_pkg.el
-%%EMACS_PACKAGESDIR%%/lisp/semi/auto-autoloads.el
-%%EMACS_PACKAGESDIR%%/lisp/semi/auto-autoloads.elc
-%%EMACS_PACKAGESDIR%%/lisp/semi/custom-load.el
-%%EMACS_PACKAGESDIR%%/lisp/semi/custom-load.elc
-%%EMACS_PACKAGESDIR%%/lisp/semi/mail-mime-setup.el
-%%EMACS_PACKAGESDIR%%/lisp/semi/mail-mime-setup.elc
-%%EMACS_PACKAGESDIR%%/lisp/semi/mime-bbdb.el
-%%EMACS_PACKAGESDIR%%/lisp/semi/mime-bbdb.elc
-%%EMACS_PACKAGESDIR%%/lisp/semi/mime-edit.el
-%%EMACS_PACKAGESDIR%%/lisp/semi/mime-edit.elc
-%%EMACS_PACKAGESDIR%%/lisp/semi/mime-image.el
-%%EMACS_PACKAGESDIR%%/lisp/semi/mime-image.elc
-%%EMACS_PACKAGESDIR%%/lisp/semi/mime-pgp.el
-%%EMACS_PACKAGESDIR%%/lisp/semi/mime-pgp.elc
-%%EMACS_PACKAGESDIR%%/lisp/semi/mime-play.el
-%%EMACS_PACKAGESDIR%%/lisp/semi/mime-play.elc
-%%EMACS_PACKAGESDIR%%/lisp/semi/mime-partial.el
-%%EMACS_PACKAGESDIR%%/lisp/semi/mime-partial.elc
-%%EMACS_PACKAGESDIR%%/lisp/semi/mime-setup.el
-%%EMACS_PACKAGESDIR%%/lisp/semi/mime-setup.elc
-%%EMACS_PACKAGESDIR%%/lisp/semi/mime-view.el
-%%EMACS_PACKAGESDIR%%/lisp/semi/mime-view.elc
-%%EMACS_PACKAGESDIR%%/lisp/semi/mime-w3.el
-%%EMACS_PACKAGESDIR%%/lisp/semi/mime-w3.elc
-%%EMACS_PACKAGESDIR%%/lisp/semi/pgg-def.el
-%%EMACS_PACKAGESDIR%%/lisp/semi/pgg-def.elc
-%%EMACS_PACKAGESDIR%%/lisp/semi/pgg-gpg.el
-%%EMACS_PACKAGESDIR%%/lisp/semi/pgg-gpg.elc
-%%EMACS_PACKAGESDIR%%/lisp/semi/pgg-parse.el
-%%EMACS_PACKAGESDIR%%/lisp/semi/pgg-parse.elc
-%%EMACS_PACKAGESDIR%%/lisp/semi/pgg-pgp.el
-%%EMACS_PACKAGESDIR%%/lisp/semi/pgg-pgp.elc
-%%EMACS_PACKAGESDIR%%/lisp/semi/pgg-pgp5.el
-%%EMACS_PACKAGESDIR%%/lisp/semi/pgg-pgp5.elc
-%%EMACS_PACKAGESDIR%%/lisp/semi/pgg.el
-%%EMACS_PACKAGESDIR%%/lisp/semi/pgg.elc
-%%EMACS_PACKAGESDIR%%/lisp/semi/postpet.el
-%%EMACS_PACKAGESDIR%%/lisp/semi/postpet.elc
-%%EMACS_PACKAGESDIR%%/lisp/semi/semi-def.el
-%%EMACS_PACKAGESDIR%%/lisp/semi/semi-def.elc
-%%EMACS_PACKAGESDIR%%/lisp/semi/semi-setup.el
-%%EMACS_PACKAGESDIR%%/lisp/semi/semi-setup.elc
-%%EMACS_PACKAGESDIR%%/lisp/semi/signature.el
-%%EMACS_PACKAGESDIR%%/lisp/semi/signature.elc
-%%EMACS_PACKAGESDIR%%/lisp/semi/smime.el
-%%EMACS_PACKAGESDIR%%/lisp/semi/smime.elc
-%%EMACS_PACKAGESDIR%%/info/mime-ui-en.info
-%%EMACS_PACKAGESDIR%%/info/mime-ui-ja.info
-%%EMACS_PACKAGESDIR%%/man/semi/mime-ui-en.texi
-%%EMACS_PACKAGESDIR%%/man/semi/mime-ui-ja.texi
-share/semi/%%SEMI_COOKIE%%
-@unexec rmdir %D/share/semi||(echo "===>  Please ignore above error.";true)