Update to 1.14.3 (after repo-copy).

This version port is only for emacs20.

14 files changed, 141 insertions, 127 deletions

diff --git a/editors/semi/Makefile b/editors/semi/Makefile
index 64e742c6ccc8..8c902ff510b5 100644
--- a/editors/semi/Makefile
+++ b/editors/semi/Makefile
@@ -8,10 +8,11 @@
 PORTNAME=	semi
 PORTVERSION=	${SEMI_VER}
 CATEGORIES=	editors elisp
-MASTER_SITES=	ftp://ftp.etl.go.jp/pub/mule/semi/semi-1.13-for-flim-1.13/ \
-		ftp://ftp.media.kyoto-u.ac.jp/pub/mule/semi/semi-1.13-for-flim-1.13/ \
-		ftp://ftp.win.or.jp/pub/word/mule/semi/semi-1.13-for-flim-1.13/ \
-		ftp://ftp.eos.hokudai.ac.jp/pub/GNU/emacs/mule/semi/semi-1.13-for-flim-1.13/
+MASTER_SITES=	ftp://ftp.m17n.org/pub/mule/semi/semi-1.14-for-flim-1.14/ \
+		ftp://ftp.etl.go.jp/pub/mule/semi/semi-1.14-for-flim-1.14/ \
+		ftp://ftp.media.kyoto-u.ac.jp/pub/mule/semi/semi-1.14-for-flim-1.14/ \
+		ftp://ftp.win.or.jp/pub/word/mule/semi/semi-1.14-for-flim-1.14/ \
+		ftp://ftp.eos.hokudai.ac.jp/pub/GNU/emacs/mule/semi/semi-1.14-for-flim-1.14/
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 
 MAINTAINER?=	shige@FreeBSD.org
@@ -19,20 +20,19 @@ MAINTAINER?=	shige@FreeBSD.org
 PORTCLASS?=	master
 
 # distfile version
-FLIM_VER=	1.13.2
-SEMI_VER=	1.13.7
+FLIM_TRUNK=	1.14
+SEMI_TRUNK=	1.14
+SEMI_VER=	1.14.3
 # setupel filename
 SEMI_SETUPEL=	semi-setupel.el
 # document install directory by install-doc target
 SEMIDOCDIR?=	share/doc/semi
-FLIM_COOKIE=	flim-${EMACS_PORT_NAME}-${FLIM_VER}.FreeBSD-packages
-SEMI_COOKIE=	semi-${EMACS_PORT_NAME}-${SEMI_VER}.FreeBSD-packages
+FLIM_COOKIE=	flim-${EMACS_PORT_NAME}-${FLIM_TRUNK}.FreeBSD-packages
+SEMI_COOKIE=	semi-${EMACS_PORT_NAME}-${SEMI_TRUNK}.FreeBSD-packages
 
 .if (${PORTCLASS} == "master")
 # emacs port setup
-EMACS_PORT_NAME=	emacs
-# whether emacs requires *-setupel.el
-REQUIRE_SETUPEL=	YES
+EMACS_PORT_NAME=	emacs20
 .endif
 
 # target name for make build
@@ -46,8 +46,8 @@ PLIST_SUB+=	SEMIDOCDIR=${SEMIDOCDIR} SEMI_SETUPEL=${SEMI_SETUPEL} \
 
 .if defined(EMACS_PORT_NAME)
 # depends on flim
-BUILD_DEPENDS+=	${LOCALBASE}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim-${EMACS_PORT_NAME}-current
-RUN_DEPENDS+=	${LOCALBASE}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim-${EMACS_PORT_NAME}-current
+BUILD_DEPENDS+=	${LOCALBASE}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim${FLIM_TRUNK:S/.//}-${EMACS_PORT_NAME}
+RUN_DEPENDS+=	${LOCALBASE}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim${FLIM_TRUNK:S/.//}-${EMACS_PORT_NAME}
 .else
 .BEGIN:
 	@${ECHO} "Error: Bad port."
diff --git a/editors/semi/distinfo b/editors/semi/distinfo
index e5285f2f2660..554d8f799065 100644
--- a/editors/semi/distinfo
+++ b/editors/semi/distinfo
@@ -1 +1 @@
-MD5 (semi-1.13.7.tar.gz) = 76c6aec75ae03c3b4813c65be0511018
+MD5 (semi-1.14.3.tar.gz) = 1947c164814f6f9a11e03c49cd98a776
diff --git a/editors/semi/files/semi-setupel.el.in b/editors/semi/files/semi-setupel.el.in
deleted file mode 100644
index 7fdd3efd2ae0..000000000000
--- a/editors/semi/files/semi-setupel.el.in
+++ /dev/null
@@ -1,8 +0,0 @@
-;;
-;; @(#)semi-setupel.el -- semi emacs load-path setup elisp file.
-;;                                            --  by shige@FreeBSD.ORG
-
-(setq load-path (append '(
-	"@@LOCALBASE@@/@@EMACS_LIBDIR@@/site-lisp/semi"
- ) load-path))
-(provide 'semi-setupel)
diff --git a/editors/semi/pkg-comment.emacs20 b/editors/semi/pkg-comment.emacs20
index d645639bb462..5fedc11e1f37 100644
--- a/editors/semi/pkg-comment.emacs20
+++ b/editors/semi/pkg-comment.emacs20
@@ -1 +1 @@
-SEMI, Library of MIME feature for GNU Emacs for emacs
+SEMI, Library of MIME feature for GNU Emacs for emacs20
diff --git a/editors/semi/pkg-descr.emacs20 b/editors/semi/pkg-descr.emacs20
index 6643b26f426b..6cdf8aac2e11 100644
--- a/editors/semi/pkg-descr.emacs20
+++ b/editors/semi/pkg-descr.emacs20
@@ -1,4 +1,4 @@
-SEMI, Library of MIME feature for GNU Emacs for emacs.
+SEMI, Library of MIME feature for GNU Emacs for emacs20.
 
   SEMI is a library to provide MIME feature for GNU Emacs.  MIME is a
   proposed internet standard for including content and headers other
@@ -20,13 +20,6 @@ SEMI, Library of MIME feature for GNU Emacs for emacs.
   MUAs.  They are released as separated packages.
 
   SEMI is installed the following directory tree:
-	${LOCALBASE}/share/emacs/site-lisp/semi/	--- SEMI
+	${LOCALBASE}/share/emacs/site-lisp/semi/
 
-
-To use flim, put the following setup into your ~/.emacs:
-
-	(require 'apel-setupel)
-	(require 'flim-setupel)
-	(require 'semi-setupel)
-
---- Porting by shige <shige@FreeBSD.ORG>
+Ported by shige@FreeBSD.ORG
diff --git a/editors/semi/pkg-descr.emacs21 b/editors/semi/pkg-descr.emacs21
index 6643b26f426b..6cdf8aac2e11 100644
--- a/editors/semi/pkg-descr.emacs21
+++ b/editors/semi/pkg-descr.emacs21
@@ -1,4 +1,4 @@
-SEMI, Library of MIME feature for GNU Emacs for emacs.
+SEMI, Library of MIME feature for GNU Emacs for emacs20.
 
   SEMI is a library to provide MIME feature for GNU Emacs.  MIME is a
   proposed internet standard for including content and headers other
@@ -20,13 +20,6 @@ SEMI, Library of MIME feature for GNU Emacs for emacs.
   MUAs.  They are released as separated packages.
 
   SEMI is installed the following directory tree:
-	${LOCALBASE}/share/emacs/site-lisp/semi/	--- SEMI
+	${LOCALBASE}/share/emacs/site-lisp/semi/
 
-
-To use flim, put the following setup into your ~/.emacs:
-
-	(require 'apel-setupel)
-	(require 'flim-setupel)
-	(require 'semi-setupel)
-
---- Porting by shige <shige@FreeBSD.ORG>
+Ported by shige@FreeBSD.ORG
diff --git a/editors/semi/pkg-plist.emacs20 b/editors/semi/pkg-plist.emacs20
index e82055c5f68c..0b61f7ee11bc 100644
--- a/editors/semi/pkg-plist.emacs20
+++ b/editors/semi/pkg-plist.emacs20
@@ -1,26 +1,43 @@
+%%EMACS_LIBDIR%%/site-lisp/semi/mail-mime-setup.el
+%%EMACS_LIBDIR%%/site-lisp/semi/mail-mime-setup.elc
+%%EMACS_LIBDIR%%/site-lisp/semi/mime-bbdb.el
+%%EMACS_LIBDIR%%/site-lisp/semi/mime-edit.el
+%%EMACS_LIBDIR%%/site-lisp/semi/mime-edit.elc
+%%EMACS_LIBDIR%%/site-lisp/semi/mime-image.el
+%%EMACS_LIBDIR%%/site-lisp/semi/mime-image.elc
+%%EMACS_LIBDIR%%/site-lisp/semi/mime-partial.el
+%%EMACS_LIBDIR%%/site-lisp/semi/mime-partial.elc
+%%EMACS_LIBDIR%%/site-lisp/semi/mime-pgp.el
+%%EMACS_LIBDIR%%/site-lisp/semi/mime-pgp.elc
+%%EMACS_LIBDIR%%/site-lisp/semi/mime-play.el
+%%EMACS_LIBDIR%%/site-lisp/semi/mime-play.elc
 %%EMACS_LIBDIR%%/site-lisp/semi/mime-setup.el
 %%EMACS_LIBDIR%%/site-lisp/semi/mime-setup.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/signature.el
-%%EMACS_LIBDIR%%/site-lisp/semi/signature.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/semi-def.el
-%%EMACS_LIBDIR%%/site-lisp/semi/semi-def.elc
 %%EMACS_LIBDIR%%/site-lisp/semi/mime-view.el
 %%EMACS_LIBDIR%%/site-lisp/semi/mime-view.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-play.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-play.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-partial.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-partial.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-edit.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-edit.elc
+%%EMACS_LIBDIR%%/site-lisp/semi/mime-w3.el
+%%EMACS_LIBDIR%%/site-lisp/semi/pgg-def.el
+%%EMACS_LIBDIR%%/site-lisp/semi/pgg-def.elc
+%%EMACS_LIBDIR%%/site-lisp/semi/pgg-gpg.el
+%%EMACS_LIBDIR%%/site-lisp/semi/pgg-gpg.elc
+%%EMACS_LIBDIR%%/site-lisp/semi/pgg-parse.el
+%%EMACS_LIBDIR%%/site-lisp/semi/pgg-parse.elc
+%%EMACS_LIBDIR%%/site-lisp/semi/pgg-pgp.el
+%%EMACS_LIBDIR%%/site-lisp/semi/pgg-pgp.elc
+%%EMACS_LIBDIR%%/site-lisp/semi/pgg-pgp5.el
+%%EMACS_LIBDIR%%/site-lisp/semi/pgg-pgp5.elc
+%%EMACS_LIBDIR%%/site-lisp/semi/pgg.el
+%%EMACS_LIBDIR%%/site-lisp/semi/pgg.elc
+%%EMACS_LIBDIR%%/site-lisp/semi/postpet.el
+%%EMACS_LIBDIR%%/site-lisp/semi/postpet.elc
+%%EMACS_LIBDIR%%/site-lisp/semi/semi-def.el
+%%EMACS_LIBDIR%%/site-lisp/semi/semi-def.elc
 %%EMACS_LIBDIR%%/site-lisp/semi/semi-setup.el
 %%EMACS_LIBDIR%%/site-lisp/semi/semi-setup.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/mail-mime-setup.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mail-mime-setup.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-pgp.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-mc.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-bbdb.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-w3.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/%%SEMI_SETUPEL%%
+%%EMACS_LIBDIR%%/site-lisp/semi/signature.el
+%%EMACS_LIBDIR%%/site-lisp/semi/signature.elc
+%%EMACS_LIBDIR%%/site-lisp/semi/smime.el
+%%EMACS_LIBDIR%%/site-lisp/semi/smime.elc
 @dirrm %%EMACS_LIBDIR%%/site-lisp/semi
 %%SEMIDOCDIR%%/ChangeLog
 %%SEMIDOCDIR%%/NEWS
diff --git a/editors/semi/pkg-plist.emacs21 b/editors/semi/pkg-plist.emacs21
index e82055c5f68c..0b61f7ee11bc 100644
--- a/editors/semi/pkg-plist.emacs21
+++ b/editors/semi/pkg-plist.emacs21
@@ -1,26 +1,43 @@
+%%EMACS_LIBDIR%%/site-lisp/semi/mail-mime-setup.el
+%%EMACS_LIBDIR%%/site-lisp/semi/mail-mime-setup.elc
+%%EMACS_LIBDIR%%/site-lisp/semi/mime-bbdb.el
+%%EMACS_LIBDIR%%/site-lisp/semi/mime-edit.el
+%%EMACS_LIBDIR%%/site-lisp/semi/mime-edit.elc
+%%EMACS_LIBDIR%%/site-lisp/semi/mime-image.el
+%%EMACS_LIBDIR%%/site-lisp/semi/mime-image.elc
+%%EMACS_LIBDIR%%/site-lisp/semi/mime-partial.el
+%%EMACS_LIBDIR%%/site-lisp/semi/mime-partial.elc
+%%EMACS_LIBDIR%%/site-lisp/semi/mime-pgp.el
+%%EMACS_LIBDIR%%/site-lisp/semi/mime-pgp.elc
+%%EMACS_LIBDIR%%/site-lisp/semi/mime-play.el
+%%EMACS_LIBDIR%%/site-lisp/semi/mime-play.elc
 %%EMACS_LIBDIR%%/site-lisp/semi/mime-setup.el
 %%EMACS_LIBDIR%%/site-lisp/semi/mime-setup.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/signature.el
-%%EMACS_LIBDIR%%/site-lisp/semi/signature.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/semi-def.el
-%%EMACS_LIBDIR%%/site-lisp/semi/semi-def.elc
 %%EMACS_LIBDIR%%/site-lisp/semi/mime-view.el
 %%EMACS_LIBDIR%%/site-lisp/semi/mime-view.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-play.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-play.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-partial.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-partial.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-edit.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-edit.elc
+%%EMACS_LIBDIR%%/site-lisp/semi/mime-w3.el
+%%EMACS_LIBDIR%%/site-lisp/semi/pgg-def.el
+%%EMACS_LIBDIR%%/site-lisp/semi/pgg-def.elc
+%%EMACS_LIBDIR%%/site-lisp/semi/pgg-gpg.el
+%%EMACS_LIBDIR%%/site-lisp/semi/pgg-gpg.elc
+%%EMACS_LIBDIR%%/site-lisp/semi/pgg-parse.el
+%%EMACS_LIBDIR%%/site-lisp/semi/pgg-parse.elc
+%%EMACS_LIBDIR%%/site-lisp/semi/pgg-pgp.el
+%%EMACS_LIBDIR%%/site-lisp/semi/pgg-pgp.elc
+%%EMACS_LIBDIR%%/site-lisp/semi/pgg-pgp5.el
+%%EMACS_LIBDIR%%/site-lisp/semi/pgg-pgp5.elc
+%%EMACS_LIBDIR%%/site-lisp/semi/pgg.el
+%%EMACS_LIBDIR%%/site-lisp/semi/pgg.elc
+%%EMACS_LIBDIR%%/site-lisp/semi/postpet.el
+%%EMACS_LIBDIR%%/site-lisp/semi/postpet.elc
+%%EMACS_LIBDIR%%/site-lisp/semi/semi-def.el
+%%EMACS_LIBDIR%%/site-lisp/semi/semi-def.elc
 %%EMACS_LIBDIR%%/site-lisp/semi/semi-setup.el
 %%EMACS_LIBDIR%%/site-lisp/semi/semi-setup.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/mail-mime-setup.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mail-mime-setup.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-pgp.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-mc.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-bbdb.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-w3.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/%%SEMI_SETUPEL%%
+%%EMACS_LIBDIR%%/site-lisp/semi/signature.el
+%%EMACS_LIBDIR%%/site-lisp/semi/signature.elc
+%%EMACS_LIBDIR%%/site-lisp/semi/smime.el
+%%EMACS_LIBDIR%%/site-lisp/semi/smime.elc
 @dirrm %%EMACS_LIBDIR%%/site-lisp/semi
 %%SEMIDOCDIR%%/ChangeLog
 %%SEMIDOCDIR%%/NEWS
diff --git a/editors/semi114-emacs20/Makefile b/editors/semi114-emacs20/Makefile
index 64e742c6ccc8..8c902ff510b5 100644
--- a/editors/semi114-emacs20/Makefile
+++ b/editors/semi114-emacs20/Makefile
@@ -8,10 +8,11 @@
 PORTNAME=	semi
 PORTVERSION=	${SEMI_VER}
 CATEGORIES=	editors elisp
-MASTER_SITES=	ftp://ftp.etl.go.jp/pub/mule/semi/semi-1.13-for-flim-1.13/ \
-		ftp://ftp.media.kyoto-u.ac.jp/pub/mule/semi/semi-1.13-for-flim-1.13/ \
-		ftp://ftp.win.or.jp/pub/word/mule/semi/semi-1.13-for-flim-1.13/ \
-		ftp://ftp.eos.hokudai.ac.jp/pub/GNU/emacs/mule/semi/semi-1.13-for-flim-1.13/
+MASTER_SITES=	ftp://ftp.m17n.org/pub/mule/semi/semi-1.14-for-flim-1.14/ \
+		ftp://ftp.etl.go.jp/pub/mule/semi/semi-1.14-for-flim-1.14/ \
+		ftp://ftp.media.kyoto-u.ac.jp/pub/mule/semi/semi-1.14-for-flim-1.14/ \
+		ftp://ftp.win.or.jp/pub/word/mule/semi/semi-1.14-for-flim-1.14/ \
+		ftp://ftp.eos.hokudai.ac.jp/pub/GNU/emacs/mule/semi/semi-1.14-for-flim-1.14/
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 
 MAINTAINER?=	shige@FreeBSD.org
@@ -19,20 +20,19 @@ MAINTAINER?=	shige@FreeBSD.org
 PORTCLASS?=	master
 
 # distfile version
-FLIM_VER=	1.13.2
-SEMI_VER=	1.13.7
+FLIM_TRUNK=	1.14
+SEMI_TRUNK=	1.14
+SEMI_VER=	1.14.3
 # setupel filename
 SEMI_SETUPEL=	semi-setupel.el
 # document install directory by install-doc target
 SEMIDOCDIR?=	share/doc/semi
-FLIM_COOKIE=	flim-${EMACS_PORT_NAME}-${FLIM_VER}.FreeBSD-packages
-SEMI_COOKIE=	semi-${EMACS_PORT_NAME}-${SEMI_VER}.FreeBSD-packages
+FLIM_COOKIE=	flim-${EMACS_PORT_NAME}-${FLIM_TRUNK}.FreeBSD-packages
+SEMI_COOKIE=	semi-${EMACS_PORT_NAME}-${SEMI_TRUNK}.FreeBSD-packages
 
 .if (${PORTCLASS} == "master")
 # emacs port setup
-EMACS_PORT_NAME=	emacs
-# whether emacs requires *-setupel.el
-REQUIRE_SETUPEL=	YES
+EMACS_PORT_NAME=	emacs20
 .endif
 
 # target name for make build
@@ -46,8 +46,8 @@ PLIST_SUB+=	SEMIDOCDIR=${SEMIDOCDIR} SEMI_SETUPEL=${SEMI_SETUPEL} \
 
 .if defined(EMACS_PORT_NAME)
 # depends on flim
-BUILD_DEPENDS+=	${LOCALBASE}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim-${EMACS_PORT_NAME}-current
-RUN_DEPENDS+=	${LOCALBASE}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim-${EMACS_PORT_NAME}-current
+BUILD_DEPENDS+=	${LOCALBASE}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim${FLIM_TRUNK:S/.//}-${EMACS_PORT_NAME}
+RUN_DEPENDS+=	${LOCALBASE}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim${FLIM_TRUNK:S/.//}-${EMACS_PORT_NAME}
 .else
 .BEGIN:
 	@${ECHO} "Error: Bad port."
diff --git a/editors/semi114-emacs20/distinfo b/editors/semi114-emacs20/distinfo
index e5285f2f2660..554d8f799065 100644
--- a/editors/semi114-emacs20/distinfo
+++ b/editors/semi114-emacs20/distinfo
@@ -1 +1 @@
-MD5 (semi-1.13.7.tar.gz) = 76c6aec75ae03c3b4813c65be0511018
+MD5 (semi-1.14.3.tar.gz) = 1947c164814f6f9a11e03c49cd98a776
diff --git a/editors/semi114-emacs20/files/semi-setupel.el.in b/editors/semi114-emacs20/files/semi-setupel.el.in
deleted file mode 100644
index 7fdd3efd2ae0..000000000000
--- a/editors/semi114-emacs20/files/semi-setupel.el.in
+++ /dev/null
@@ -1,8 +0,0 @@
-;;
-;; @(#)semi-setupel.el -- semi emacs load-path setup elisp file.
-;;                                            --  by shige@FreeBSD.ORG
-
-(setq load-path (append '(
-	"@@LOCALBASE@@/@@EMACS_LIBDIR@@/site-lisp/semi"
- ) load-path))
-(provide 'semi-setupel)
diff --git a/editors/semi114-emacs20/pkg-comment b/editors/semi114-emacs20/pkg-comment
index d645639bb462..5fedc11e1f37 100644
--- a/editors/semi114-emacs20/pkg-comment
+++ b/editors/semi114-emacs20/pkg-comment
@@ -1 +1 @@
-SEMI, Library of MIME feature for GNU Emacs for emacs
+SEMI, Library of MIME feature for GNU Emacs for emacs20
diff --git a/editors/semi114-emacs20/pkg-descr b/editors/semi114-emacs20/pkg-descr
index 6643b26f426b..6cdf8aac2e11 100644
--- a/editors/semi114-emacs20/pkg-descr
+++ b/editors/semi114-emacs20/pkg-descr
@@ -1,4 +1,4 @@
-SEMI, Library of MIME feature for GNU Emacs for emacs.
+SEMI, Library of MIME feature for GNU Emacs for emacs20.
 
   SEMI is a library to provide MIME feature for GNU Emacs.  MIME is a
   proposed internet standard for including content and headers other
@@ -20,13 +20,6 @@ SEMI, Library of MIME feature for GNU Emacs for emacs.
   MUAs.  They are released as separated packages.
 
   SEMI is installed the following directory tree:
-	${LOCALBASE}/share/emacs/site-lisp/semi/	--- SEMI
+	${LOCALBASE}/share/emacs/site-lisp/semi/
 
-
-To use flim, put the following setup into your ~/.emacs:
-
-	(require 'apel-setupel)
-	(require 'flim-setupel)
-	(require 'semi-setupel)
-
---- Porting by shige <shige@FreeBSD.ORG>
+Ported by shige@FreeBSD.ORG
diff --git a/editors/semi114-emacs20/pkg-plist b/editors/semi114-emacs20/pkg-plist
index e82055c5f68c..0b61f7ee11bc 100644
--- a/editors/semi114-emacs20/pkg-plist
+++ b/editors/semi114-emacs20/pkg-plist
@@ -1,26 +1,43 @@
+%%EMACS_LIBDIR%%/site-lisp/semi/mail-mime-setup.el
+%%EMACS_LIBDIR%%/site-lisp/semi/mail-mime-setup.elc
+%%EMACS_LIBDIR%%/site-lisp/semi/mime-bbdb.el
+%%EMACS_LIBDIR%%/site-lisp/semi/mime-edit.el
+%%EMACS_LIBDIR%%/site-lisp/semi/mime-edit.elc
+%%EMACS_LIBDIR%%/site-lisp/semi/mime-image.el
+%%EMACS_LIBDIR%%/site-lisp/semi/mime-image.elc
+%%EMACS_LIBDIR%%/site-lisp/semi/mime-partial.el
+%%EMACS_LIBDIR%%/site-lisp/semi/mime-partial.elc
+%%EMACS_LIBDIR%%/site-lisp/semi/mime-pgp.el
+%%EMACS_LIBDIR%%/site-lisp/semi/mime-pgp.elc
+%%EMACS_LIBDIR%%/site-lisp/semi/mime-play.el
+%%EMACS_LIBDIR%%/site-lisp/semi/mime-play.elc
 %%EMACS_LIBDIR%%/site-lisp/semi/mime-setup.el
 %%EMACS_LIBDIR%%/site-lisp/semi/mime-setup.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/signature.el
-%%EMACS_LIBDIR%%/site-lisp/semi/signature.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/semi-def.el
-%%EMACS_LIBDIR%%/site-lisp/semi/semi-def.elc
 %%EMACS_LIBDIR%%/site-lisp/semi/mime-view.el
 %%EMACS_LIBDIR%%/site-lisp/semi/mime-view.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-play.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-play.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-partial.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-partial.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-edit.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-edit.elc
+%%EMACS_LIBDIR%%/site-lisp/semi/mime-w3.el
+%%EMACS_LIBDIR%%/site-lisp/semi/pgg-def.el
+%%EMACS_LIBDIR%%/site-lisp/semi/pgg-def.elc
+%%EMACS_LIBDIR%%/site-lisp/semi/pgg-gpg.el
+%%EMACS_LIBDIR%%/site-lisp/semi/pgg-gpg.elc
+%%EMACS_LIBDIR%%/site-lisp/semi/pgg-parse.el
+%%EMACS_LIBDIR%%/site-lisp/semi/pgg-parse.elc
+%%EMACS_LIBDIR%%/site-lisp/semi/pgg-pgp.el
+%%EMACS_LIBDIR%%/site-lisp/semi/pgg-pgp.elc
+%%EMACS_LIBDIR%%/site-lisp/semi/pgg-pgp5.el
+%%EMACS_LIBDIR%%/site-lisp/semi/pgg-pgp5.elc
+%%EMACS_LIBDIR%%/site-lisp/semi/pgg.el
+%%EMACS_LIBDIR%%/site-lisp/semi/pgg.elc
+%%EMACS_LIBDIR%%/site-lisp/semi/postpet.el
+%%EMACS_LIBDIR%%/site-lisp/semi/postpet.elc
+%%EMACS_LIBDIR%%/site-lisp/semi/semi-def.el
+%%EMACS_LIBDIR%%/site-lisp/semi/semi-def.elc
 %%EMACS_LIBDIR%%/site-lisp/semi/semi-setup.el
 %%EMACS_LIBDIR%%/site-lisp/semi/semi-setup.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/mail-mime-setup.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mail-mime-setup.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-pgp.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-mc.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-bbdb.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-w3.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/%%SEMI_SETUPEL%%
+%%EMACS_LIBDIR%%/site-lisp/semi/signature.el
+%%EMACS_LIBDIR%%/site-lisp/semi/signature.elc
+%%EMACS_LIBDIR%%/site-lisp/semi/smime.el
+%%EMACS_LIBDIR%%/site-lisp/semi/smime.elc
 @dirrm %%EMACS_LIBDIR%%/site-lisp/semi
 %%SEMIDOCDIR%%/ChangeLog
 %%SEMIDOCDIR%%/NEWS