aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--editors/semi-emacs20/Makefile5
-rw-r--r--editors/semi-emacs20/pkg-comment1
-rw-r--r--editors/semi-emacs20/pkg-descr25
-rw-r--r--editors/semi-emacs20/pkg-plist39
-rw-r--r--editors/semi-xemacs21-mule/Makefile7
-rw-r--r--editors/semi/Makefile12
-rw-r--r--editors/semi/pkg-comment.emacs211
-rw-r--r--editors/semi/pkg-comment.xemacs21-mule (renamed from editors/semi-xemacs21-mule/pkg-comment)0
-rw-r--r--editors/semi/pkg-descr.emacs214
-rw-r--r--editors/semi/pkg-descr.xemacs21-mule (renamed from editors/semi-xemacs21-mule/pkg-descr)5
-rw-r--r--editors/semi/pkg-plist.emacs2082
-rw-r--r--editors/semi/pkg-plist.emacs2182
-rw-r--r--editors/semi/pkg-plist.xemacs21-mule (renamed from editors/semi-xemacs21-mule/pkg-plist)18
13 files changed, 114 insertions, 167 deletions
diff --git a/editors/semi-emacs20/Makefile b/editors/semi-emacs20/Makefile
index 9ff5e65d92ec..dd14fe2aab41 100644
--- a/editors/semi-emacs20/Makefile
+++ b/editors/semi-emacs20/Makefile
@@ -10,12 +10,9 @@ MAINTAINER= shige@FreeBSD.org
# This is a slave port.
PORTCLASS= slave
-MASTERDIR= ${.CURDIR}/../../editors/semi-emacs
+MASTERDIR= ${.CURDIR}/../../editors/semi
# emacs port setup
EMACS_PORT_NAME= emacs20
-# use pkg-* files in ${.CURDIR}
-PKGDIR= ${.CURDIR}
-
.include <${MASTERDIR}/Makefile>
diff --git a/editors/semi-emacs20/pkg-comment b/editors/semi-emacs20/pkg-comment
deleted file mode 100644
index 5fedc11e1f37..000000000000
--- a/editors/semi-emacs20/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-SEMI, Library of MIME feature for GNU Emacs for emacs20
diff --git a/editors/semi-emacs20/pkg-descr b/editors/semi-emacs20/pkg-descr
deleted file mode 100644
index 62b014e02da6..000000000000
--- a/editors/semi-emacs20/pkg-descr
+++ /dev/null
@@ -1,25 +0,0 @@
-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
- than (ASCII) plain text in messages.
-
- SEMI has the following features:
- - MIME message viewer (mime-view-mode) (RFC 2045 .. 2049)
- - MIME message composer (mime-edit-mode) (RFC 2045 .. 2049)
-
- MIME message viewer and composer also support following features:
- - filename handling by Content-Disposition field (RFC 1806)
- - PGP/MIME security Multiparts (RFC 2015)
- - application/pgp (draft-kazu-pgp-mime-00.txt; obsolete)
- - text/richtext (RFC 1521; obsolete; preview only)
- - text/enriched (RFC 1896)
- - External method configuration by mailcap (RFC 1524)
-
- Notice that this package does not contain MIME extender for any
- MUAs. They are released as separated packages.
-
- SEMI is installed the following directory tree:
- ${LOCALBASE}/share/emacs/site-lisp/semi/ --- SEMI
-
---- Porting by shige <shige@FreeBSD.ORG>
diff --git a/editors/semi-emacs20/pkg-plist b/editors/semi-emacs20/pkg-plist
deleted file mode 100644
index 0530ab62eb65..000000000000
--- a/editors/semi-emacs20/pkg-plist
+++ /dev/null
@@ -1,39 +0,0 @@
-%%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-image.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-image.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/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
-@dirrm %%EMACS_LIBDIR%%/site-lisp/semi
-%%SEMIDOCDIR%%/ChangeLog
-%%SEMIDOCDIR%%/NEWS
-%%SEMIDOCDIR%%/README.en
-%%SEMIDOCDIR%%/TODO
-%%SEMIDOCDIR%%/VERSION
-@dirrm %%SEMIDOCDIR%%
-@unexec install-info --delete %D/info/mime-ui-en.info %D/info/dir
-@unexec install-info --delete %D/info/mime-ui-ja.info %D/info/dir
-info/mime-ui-en.info
-info/mime-ui-ja.info
-@exec install-info %D/info/mime-ui-en.info %D/info/dir
-@exec install-info %D/info/mime-ui-ja.info %D/info/dir
-share/semi/%%SEMI_COOKIE%%
-@unexec /bin/rmdir %D/share/semi || true
diff --git a/editors/semi-xemacs21-mule/Makefile b/editors/semi-xemacs21-mule/Makefile
index 2b9d06894324..8e6fd6dbd091 100644
--- a/editors/semi-xemacs21-mule/Makefile
+++ b/editors/semi-xemacs21-mule/Makefile
@@ -10,7 +10,7 @@ MAINTAINER= shige@FreeBSD.org
# This is a slave port.
PORTCLASS= slave
-MASTERDIR= ${.CURDIR}/../../editors/semi-emacs
+MASTERDIR= ${.CURDIR}/../../editors/semi
# emacs port setup
EMACS_PORT_NAME= xemacs21-mule
@@ -36,15 +36,12 @@ BUILD_INFO_BY_EMACS= YES
# texinfo packages
BUILD_DEPENDS+= ${LOCALBASE}/${EMACS_PACKAGESDIR}/../xemacs-packages/lisp/texinfo/texinfmt.el:${PORTSDIR}/editors/xemacs-packages
-# use pkg-* files in ${.CURDIR}
-PKGDIR= ${.CURDIR}
-
# package info manifest
MANIFEST= MANIFEST.semi
# xemacs package
XEMACS_PKGNAME= semi
-XEMACS_PKGVER= 1.13
+XEMACS_PKGVER= 1.14
#XEMACS_PKGVER!= grep version ${.CURDIR}/../semi-emacs/files/_pkg.el | \
# sed 's/.*:version \([0-9.]*\).*/\1/'
XEMACS_PKG_TARBALL= ${XEMACS_PKGNAME}-${XEMACS_PKGVER}-pkg.tar.gz
diff --git a/editors/semi/Makefile b/editors/semi/Makefile
index 87e41e06d1cf..eeba489b89d7 100644
--- a/editors/semi/Makefile
+++ b/editors/semi/Makefile
@@ -32,10 +32,14 @@ SEMI_LISPDIR= ${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}
SEMI_VERSION_SPECIFIC_LISPDIR= ${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}
.if (${PORTCLASS} == "master")
-# emacs port setup
-EMACS_PORT_NAME= emacs20
+EMACS_PORT_NAME= emacs21
+DEPPORT_SUFFIX=
+.else
+DEPPORT_SUFFIX= -${EMACS_PORT_NAME}
.endif
+EMACS_MASTERDIR_PKGFILES=YES
+
# target name for make build
ALL_TARGET?= elc
# environments
@@ -48,8 +52,8 @@ MAKE_ARGS+= PREFIX="${LOCALBASE}" \
.if defined(EMACS_PORT_NAME)
# depends on flim
-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}
+BUILD_DEPENDS+= ${LOCALBASE}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim${DEPPORT_SUFFIX}
+RUN_DEPENDS+= ${LOCALBASE}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim${DEPPORT_SUFFIX}
.else
.BEGIN:
@${ECHO} "Error: Bad port."
diff --git a/editors/semi/pkg-comment.emacs21 b/editors/semi/pkg-comment.emacs21
new file mode 100644
index 000000000000..ee2c44c781fb
--- /dev/null
+++ b/editors/semi/pkg-comment.emacs21
@@ -0,0 +1 @@
+SEMI, Library of MIME feature for GNU Emacs for emacs21
diff --git a/editors/semi-xemacs21-mule/pkg-comment b/editors/semi/pkg-comment.xemacs21-mule
index cecdd81db035..cecdd81db035 100644
--- a/editors/semi-xemacs21-mule/pkg-comment
+++ b/editors/semi/pkg-comment.xemacs21-mule
diff --git a/editors/semi/pkg-descr.emacs21 b/editors/semi/pkg-descr.emacs21
index bfed386fd2b6..7ebfbf0baf14 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 emacs20.
+SEMI, Library of MIME feature for GNU Emacs for emacs21.
SEMI is a library to provide MIME feature for GNU Emacs. MIME is a
proposed internet standard for including content and headers other
@@ -19,6 +19,6 @@ SEMI, Library of MIME feature for GNU Emacs for emacs20.
MUAs. They are released as separated packages.
SEMI is installed the following directory tree:
- ${LOCALBASE}/share/emacs/20.7/site-lisp/semi/
+ ${LOCALBASE}/share/emacs/21.1/site-lisp/semi/
Ported by shige@FreeBSD.ORG
diff --git a/editors/semi-xemacs21-mule/pkg-descr b/editors/semi/pkg-descr.xemacs21-mule
index a02894c10f25..06de7e1160c2 100644
--- a/editors/semi-xemacs21-mule/pkg-descr
+++ b/editors/semi/pkg-descr.xemacs21-mule
@@ -7,7 +7,6 @@ SEMI, Library of MIME feature for GNU Emacs for xemacs21-mule.
SEMI has the following features:
- MIME message viewer (mime-view-mode) (RFC 2045 .. 2049)
- MIME message composer (mime-edit-mode) (RFC 2045 .. 2049)
-
MIME message viewer and composer also support following features:
- filename handling by Content-Disposition field (RFC 1806)
- PGP/MIME security Multiparts (RFC 2015)
@@ -20,6 +19,6 @@ SEMI, Library of MIME feature for GNU Emacs for xemacs21-mule.
MUAs. They are released as separated packages.
SEMI is installed the following directory tree:
- ${LOCALBASE}/lib/xemacs/site-packages/lisp/semi/ --- SEMI
+ ${LOCALBASE}/lib/xemacs/site-packages/lisp/semi/
---- 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 d0b1efca5b5e..8cb5d593f670 100644
--- a/editors/semi/pkg-plist.emacs20
+++ b/editors/semi/pkg-plist.emacs20
@@ -1,44 +1,44 @@
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/mail-mime-setup.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/mail-mime-setup.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/mime-bbdb.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/mime-edit.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/mime-edit.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/mime-image.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/mime-image.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/mime-partial.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/mime-partial.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/mime-pgp.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/mime-pgp.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/mime-play.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/mime-play.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/mime-setup.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/mime-setup.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/mime-view.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/mime-view.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/mime-w3.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/pgg-def.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/pgg-def.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/pgg-gpg.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/pgg-gpg.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/pgg-parse.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/pgg-parse.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/pgg-pgp.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/pgg-pgp.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/pgg-pgp5.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/pgg-pgp5.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/pgg.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/pgg.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/postpet.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/postpet.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/semi-def.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/semi-def.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/semi-setup.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/semi-setup.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/signature.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/signature.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/smime.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/smime.elc
-@dirrm %%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mail-mime-setup.el
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mail-mime-setup.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-bbdb.el
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-edit.el
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-edit.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-image.el
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-image.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-partial.el
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-partial.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-pgp.el
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-pgp.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-play.el
+%%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-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
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/semi-def.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/semi-setup.el
+%%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
+@dirrm %%EMACS_VERSION_SITE_LISPDIR%%/semi
%%SEMIDOCDIR%%/ChangeLog
%%SEMIDOCDIR%%/NEWS
%%SEMIDOCDIR%%/README.en
diff --git a/editors/semi/pkg-plist.emacs21 b/editors/semi/pkg-plist.emacs21
index d0b1efca5b5e..8cb5d593f670 100644
--- a/editors/semi/pkg-plist.emacs21
+++ b/editors/semi/pkg-plist.emacs21
@@ -1,44 +1,44 @@
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/mail-mime-setup.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/mail-mime-setup.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/mime-bbdb.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/mime-edit.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/mime-edit.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/mime-image.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/mime-image.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/mime-partial.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/mime-partial.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/mime-pgp.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/mime-pgp.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/mime-play.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/mime-play.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/mime-setup.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/mime-setup.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/mime-view.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/mime-view.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/mime-w3.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/pgg-def.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/pgg-def.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/pgg-gpg.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/pgg-gpg.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/pgg-parse.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/pgg-parse.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/pgg-pgp.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/pgg-pgp.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/pgg-pgp5.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/pgg-pgp5.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/pgg.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/pgg.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/postpet.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/postpet.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/semi-def.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/semi-def.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/semi-setup.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/semi-setup.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/signature.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/signature.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/smime.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/smime.elc
-@dirrm %%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mail-mime-setup.el
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mail-mime-setup.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-bbdb.el
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-edit.el
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-edit.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-image.el
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-image.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-partial.el
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-partial.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-pgp.el
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-pgp.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-play.el
+%%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-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
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/semi-def.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/semi-setup.el
+%%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
+@dirrm %%EMACS_VERSION_SITE_LISPDIR%%/semi
%%SEMIDOCDIR%%/ChangeLog
%%SEMIDOCDIR%%/NEWS
%%SEMIDOCDIR%%/README.en
diff --git a/editors/semi-xemacs21-mule/pkg-plist b/editors/semi/pkg-plist.xemacs21-mule
index 287a42379263..f9774f4bbcb6 100644
--- a/editors/semi-xemacs21-mule/pkg-plist
+++ b/editors/semi/pkg-plist.xemacs21-mule
@@ -16,8 +16,6 @@
%%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-mc.el
-%%EMACS_PACKAGESDIR%%/lisp/semi/mime-mc.elc
%%EMACS_PACKAGESDIR%%/lisp/semi/mime-pgp.el
%%EMACS_PACKAGESDIR%%/lisp/semi/mime-pgp.elc
%%EMACS_PACKAGESDIR%%/lisp/semi/mime-play.el
@@ -30,12 +28,28 @@
%%EMACS_PACKAGESDIR%%/lisp/semi/mime-view.elc
%%EMACS_PACKAGESDIR%%/lisp/semi/mime-w3.el
@unexec rm -f %D/%%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
@dirrm %%EMACS_PACKAGESDIR%%/lisp/semi
%%EMACS_PACKAGESDIR%%/info/mime-ui-en.info
%%EMACS_PACKAGESDIR%%/info/mime-ui-ja.info