21 files changed, 9 insertions, 39 deletions

diff --git a/editors/apel-xemacs21-mule/Makefile b/editors/apel-xemacs21-mule/Makefile
index 9d5e4e40b31b..13022e1e1eed 100644
--- a/editors/apel-xemacs21-mule/Makefile
+++ b/editors/apel-xemacs21-mule/Makefile
@@ -3,7 +3,7 @@
 # Date created:		13 June 1999
 # Whom:			Shigeyuki FUKUSHIMA <shige@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.1.1.1 1999/07/01 13:02:16 shige Exp $
+# $Id: Makefile,v 1.2 1999/08/06 14:52:37 shige Exp $
 #
 
 MAINTAINER=	shige@FreeBSD.ORG
@@ -22,8 +22,6 @@ EMACS_LIBDIR_WITH_VER=	lib/${EMACS_NAME}-${EMACS_VER}
 
 # RUN_DEPENDS port name's suffix is '-common'.
 HAVE_COMMON_PORT=	YES
-# emacs requires *-setupel.el
-REQUIRE_SETUPEL=	YES
 
 # use pkg/* files in ${.CURDIR}
 PKGDIR=		${.CURDIR}/pkg
diff --git a/editors/apel-xemacs21-mule/pkg-plist b/editors/apel-xemacs21-mule/pkg-plist
index d3b731e510cc..d718bc196455 100644
--- a/editors/apel-xemacs21-mule/pkg-plist
+++ b/editors/apel-xemacs21-mule/pkg-plist
@@ -48,7 +48,6 @@
 %%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/richtext.elc
 %%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/static.el
 %%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/static.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/%%APEL_SETUPEL%%
 @dirrm %%EMACS_LIBDIR%%/site-lisp/apel
 @dirrm %%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu
 %%APELDOCDIR%%/ChangeLog
diff --git a/editors/apel/pkg-plist.xemacs21-mule b/editors/apel/pkg-plist.xemacs21-mule
index d3b731e510cc..d718bc196455 100644
--- a/editors/apel/pkg-plist.xemacs21-mule
+++ b/editors/apel/pkg-plist.xemacs21-mule
@@ -48,7 +48,6 @@
 %%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/richtext.elc
 %%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/static.el
 %%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/static.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/%%APEL_SETUPEL%%
 @dirrm %%EMACS_LIBDIR%%/site-lisp/apel
 @dirrm %%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu
 %%APELDOCDIR%%/ChangeLog
diff --git a/editors/flim-xemacs21-mule-current/Makefile b/editors/flim-xemacs21-mule-current/Makefile
index 8fe3eda284da..fd242e2cd68a 100644
--- a/editors/flim-xemacs21-mule-current/Makefile
+++ b/editors/flim-xemacs21-mule-current/Makefile
@@ -3,7 +3,7 @@
 # Date created:		25 July 1999
 # Whom:			Shigeyuki FUKUSHIMA <shige@FreeBSD.ORG>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1999/08/06 19:08:53 shige Exp $
 #
 
 MAINTAINER=	shige@FreeBSD.ORG
@@ -23,8 +23,6 @@ EMACS_LIBDIR_WITH_VER=	${EMACS_LIBDIR}
 
 # RUN_DEPENDS port name's suffix is '-common'.
 HAVE_COMMON_PORT=	YES
-# emacs requires *-setupel.el
-REQUIRE_SETUPEL=	YES
 
 # use pkg/* files in ${.CURDIR}
 PKGDIR=		${.CURDIR}/pkg
diff --git a/editors/flim-xemacs21-mule-current/pkg-plist b/editors/flim-xemacs21-mule-current/pkg-plist
index bb84e793d46a..c651ddbe605b 100644
--- a/editors/flim-xemacs21-mule-current/pkg-plist
+++ b/editors/flim-xemacs21-mule-current/pkg-plist
@@ -32,7 +32,6 @@
 %%EMACS_LIBDIR%%/site-lisp/flim/smtp.elc
 %%EMACS_LIBDIR%%/site-lisp/flim/smtpmail.el
 %%EMACS_LIBDIR%%/site-lisp/flim/smtpmail.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/%%FLIM_SETUPEL%%
 @dirrm %%EMACS_LIBDIR%%/site-lisp/flim
 %%FLIMDOCDIR%%/ChangeLog
 %%FLIMDOCDIR%%/NEWS
diff --git a/editors/flim-xemacs21-mule/Makefile b/editors/flim-xemacs21-mule/Makefile
index e9f70aa94906..9ddfb9914a61 100644
--- a/editors/flim-xemacs21-mule/Makefile
+++ b/editors/flim-xemacs21-mule/Makefile
@@ -3,7 +3,7 @@
 # Date created:		25 July 1999
 # Whom:			Shigeyuki FUKUSHIMA <shige@FreeBSD.ORG>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1999/08/06 19:07:05 shige Exp $
 #
 
 MAINTAINER=	shige@FreeBSD.ORG
@@ -23,8 +23,6 @@ EMACS_LIBDIR_WITH_VER=	${EMACS_LIBDIR}
 
 # RUN_DEPENDS port name's suffix is '-common'.
 HAVE_COMMON_PORT=	YES
-# emacs requires *-setupel.el
-REQUIRE_SETUPEL=	YES
 
 # use pkg/* files in ${.CURDIR}
 PKGDIR=		${.CURDIR}/pkg
diff --git a/editors/flim-xemacs21-mule/pkg-plist b/editors/flim-xemacs21-mule/pkg-plist
index bcadcf81cb58..d5276737f5f7 100644
--- a/editors/flim-xemacs21-mule/pkg-plist
+++ b/editors/flim-xemacs21-mule/pkg-plist
@@ -26,7 +26,6 @@
 %%EMACS_LIBDIR%%/site-lisp/flim/mmcooked.elc
 %%EMACS_LIBDIR%%/site-lisp/flim/std11.el
 %%EMACS_LIBDIR%%/site-lisp/flim/std11.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/%%FLIM_SETUPEL%%
 @dirrm %%EMACS_LIBDIR%%/site-lisp/flim
 %%FLIMDOCDIR%%/ChangeLog
 %%FLIMDOCDIR%%/README.en
diff --git a/editors/flim113-xemacs21-mule/Makefile b/editors/flim113-xemacs21-mule/Makefile
index 8fe3eda284da..fd242e2cd68a 100644
--- a/editors/flim113-xemacs21-mule/Makefile
+++ b/editors/flim113-xemacs21-mule/Makefile
@@ -3,7 +3,7 @@
 # Date created:		25 July 1999
 # Whom:			Shigeyuki FUKUSHIMA <shige@FreeBSD.ORG>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1999/08/06 19:08:53 shige Exp $
 #
 
 MAINTAINER=	shige@FreeBSD.ORG
@@ -23,8 +23,6 @@ EMACS_LIBDIR_WITH_VER=	${EMACS_LIBDIR}
 
 # RUN_DEPENDS port name's suffix is '-common'.
 HAVE_COMMON_PORT=	YES
-# emacs requires *-setupel.el
-REQUIRE_SETUPEL=	YES
 
 # use pkg/* files in ${.CURDIR}
 PKGDIR=		${.CURDIR}/pkg
diff --git a/editors/flim113-xemacs21-mule/pkg-plist b/editors/flim113-xemacs21-mule/pkg-plist
index bb84e793d46a..c651ddbe605b 100644
--- a/editors/flim113-xemacs21-mule/pkg-plist
+++ b/editors/flim113-xemacs21-mule/pkg-plist
@@ -32,7 +32,6 @@
 %%EMACS_LIBDIR%%/site-lisp/flim/smtp.elc
 %%EMACS_LIBDIR%%/site-lisp/flim/smtpmail.el
 %%EMACS_LIBDIR%%/site-lisp/flim/smtpmail.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/%%FLIM_SETUPEL%%
 @dirrm %%EMACS_LIBDIR%%/site-lisp/flim
 %%FLIMDOCDIR%%/ChangeLog
 %%FLIMDOCDIR%%/NEWS
diff --git a/editors/flim113/pkg-plist.xemacs21-mule b/editors/flim113/pkg-plist.xemacs21-mule
index bb84e793d46a..c651ddbe605b 100644
--- a/editors/flim113/pkg-plist.xemacs21-mule
+++ b/editors/flim113/pkg-plist.xemacs21-mule
@@ -32,7 +32,6 @@
 %%EMACS_LIBDIR%%/site-lisp/flim/smtp.elc
 %%EMACS_LIBDIR%%/site-lisp/flim/smtpmail.el
 %%EMACS_LIBDIR%%/site-lisp/flim/smtpmail.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/%%FLIM_SETUPEL%%
 @dirrm %%EMACS_LIBDIR%%/site-lisp/flim
 %%FLIMDOCDIR%%/ChangeLog
 %%FLIMDOCDIR%%/NEWS
diff --git a/editors/semi-xemacs21-mule-current/Makefile b/editors/semi-xemacs21-mule-current/Makefile
index 13974c2e8f02..b9a0806d9273 100644
--- a/editors/semi-xemacs21-mule-current/Makefile
+++ b/editors/semi-xemacs21-mule-current/Makefile
@@ -3,7 +3,7 @@
 # Date created:		25 July 1999
 # Whom:			Shigeyuki FUKUSHIMA <shige@FreeBSD.ORG>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1999/08/06 19:22:08 shige Exp $
 #
 
 MAINTAINER=	shige@FreeBSD.ORG
@@ -23,8 +23,6 @@ EMACS_LIBDIR_WITH_VER=	${EMACS_LIBDIR}
 
 # RUN_DEPENDS port name's suffix is '-common'.
 HAVE_COMMON_PORT=	YES
-# emacs requires *-setupel.el
-REQUIRE_SETUPEL=	YES
 
 # use pkg/* files in ${.CURDIR}
 PKGDIR=		${.CURDIR}/pkg
diff --git a/editors/semi-xemacs21-mule-current/pkg-plist b/editors/semi-xemacs21-mule-current/pkg-plist
index bf012e7c5965..247fab12288a 100644
--- a/editors/semi-xemacs21-mule-current/pkg-plist
+++ b/editors/semi-xemacs21-mule-current/pkg-plist
@@ -25,7 +25,6 @@
 %%EMACS_LIBDIR%%/site-lisp/semi/mime-bbdb.el
 %%EMACS_LIBDIR%%/site-lisp/semi/mime-w3.el
 %%EMACS_LIBDIR%%/site-lisp/semi/mime-w3.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/%%SEMI_SETUPEL%%
 @dirrm %%EMACS_LIBDIR%%/site-lisp/semi
 %%SEMIDOCDIR%%/ChangeLog
 %%SEMIDOCDIR%%/NEWS
diff --git a/editors/semi-xemacs21-mule/Makefile b/editors/semi-xemacs21-mule/Makefile
index 080465b57c33..c349cde96417 100644
--- a/editors/semi-xemacs21-mule/Makefile
+++ b/editors/semi-xemacs21-mule/Makefile
@@ -3,7 +3,7 @@
 # Date created:		25 July 1999
 # Whom:			Shigeyuki FUKUSHIMA <shige@FreeBSD.ORG>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1999/08/06 19:19:53 shige Exp $
 #
 
 MAINTAINER=	shige@FreeBSD.ORG
@@ -23,8 +23,6 @@ EMACS_LIBDIR_WITH_VER=	${EMACS_LIBDIR}
 
 # RUN_DEPENDS port name's suffix is '-common'.
 HAVE_COMMON_PORT=	YES
-# emacs requires *-setupel.el
-REQUIRE_SETUPEL=	YES
 
 # use pkg/* files in ${.CURDIR}
 PKGDIR=		${.CURDIR}/pkg
diff --git a/editors/semi-xemacs21-mule/pkg-plist b/editors/semi-xemacs21-mule/pkg-plist
index 4c904a9a801f..b4b631429c13 100644
--- a/editors/semi-xemacs21-mule/pkg-plist
+++ b/editors/semi-xemacs21-mule/pkg-plist
@@ -27,7 +27,6 @@
 %%EMACS_LIBDIR%%/site-lisp/semi/mime-bbdb.el
 %%EMACS_LIBDIR%%/site-lisp/semi/mime-w3.el
 %%EMACS_LIBDIR%%/site-lisp/semi/mime-w3.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/%%SEMI_SETUPEL%%
 @dirrm %%EMACS_LIBDIR%%/site-lisp/semi
 %%SEMIDOCDIR%%/ChangeLog
 %%SEMIDOCDIR%%/NEWS
diff --git a/editors/semi113-xemacs21-mule/Makefile b/editors/semi113-xemacs21-mule/Makefile
index 13974c2e8f02..b9a0806d9273 100644
--- a/editors/semi113-xemacs21-mule/Makefile
+++ b/editors/semi113-xemacs21-mule/Makefile
@@ -3,7 +3,7 @@
 # Date created:		25 July 1999
 # Whom:			Shigeyuki FUKUSHIMA <shige@FreeBSD.ORG>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1999/08/06 19:22:08 shige Exp $
 #
 
 MAINTAINER=	shige@FreeBSD.ORG
@@ -23,8 +23,6 @@ EMACS_LIBDIR_WITH_VER=	${EMACS_LIBDIR}
 
 # RUN_DEPENDS port name's suffix is '-common'.
 HAVE_COMMON_PORT=	YES
-# emacs requires *-setupel.el
-REQUIRE_SETUPEL=	YES
 
 # use pkg/* files in ${.CURDIR}
 PKGDIR=		${.CURDIR}/pkg
diff --git a/editors/semi113-xemacs21-mule/pkg-plist b/editors/semi113-xemacs21-mule/pkg-plist
index bf012e7c5965..247fab12288a 100644
--- a/editors/semi113-xemacs21-mule/pkg-plist
+++ b/editors/semi113-xemacs21-mule/pkg-plist
@@ -25,7 +25,6 @@
 %%EMACS_LIBDIR%%/site-lisp/semi/mime-bbdb.el
 %%EMACS_LIBDIR%%/site-lisp/semi/mime-w3.el
 %%EMACS_LIBDIR%%/site-lisp/semi/mime-w3.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/%%SEMI_SETUPEL%%
 @dirrm %%EMACS_LIBDIR%%/site-lisp/semi
 %%SEMIDOCDIR%%/ChangeLog
 %%SEMIDOCDIR%%/NEWS
diff --git a/editors/semi113/pkg-plist.xemacs21-mule b/editors/semi113/pkg-plist.xemacs21-mule
index bf012e7c5965..247fab12288a 100644
--- a/editors/semi113/pkg-plist.xemacs21-mule
+++ b/editors/semi113/pkg-plist.xemacs21-mule
@@ -25,7 +25,6 @@
 %%EMACS_LIBDIR%%/site-lisp/semi/mime-bbdb.el
 %%EMACS_LIBDIR%%/site-lisp/semi/mime-w3.el
 %%EMACS_LIBDIR%%/site-lisp/semi/mime-w3.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/%%SEMI_SETUPEL%%
 @dirrm %%EMACS_LIBDIR%%/site-lisp/semi
 %%SEMIDOCDIR%%/ChangeLog
 %%SEMIDOCDIR%%/NEWS
diff --git a/editors/wemi-xemacs21-mule-current/Makefile b/editors/wemi-xemacs21-mule-current/Makefile
index c49a42a0699f..fe07b100bc61 100644
--- a/editors/wemi-xemacs21-mule-current/Makefile
+++ b/editors/wemi-xemacs21-mule-current/Makefile
@@ -3,7 +3,7 @@
 # Date created:		25 July 1999
 # Whom:			Shigeyuki FUKUSHIMA <shige@FreeBSD.ORG>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1999/08/06 19:32:39 shige Exp $
 #
 
 MAINTAINER=	shige@FreeBSD.ORG
@@ -23,8 +23,6 @@ EMACS_LIBDIR_WITH_VER=	${EMACS_LIBDIR}
 
 # RUN_DEPENDS port name's suffix is '-common'.
 HAVE_COMMON_PORT=	YES
-# emacs requires *-setupel.el
-REQUIRE_SETUPEL=	YES
 
 # use pkg/* files in ${.CURDIR}
 PKGDIR=		${.CURDIR}/pkg
diff --git a/editors/wemi-xemacs21-mule-current/pkg-plist b/editors/wemi-xemacs21-mule-current/pkg-plist
index af149f993c8e..02510b10fa47 100644
--- a/editors/wemi-xemacs21-mule-current/pkg-plist
+++ b/editors/wemi-xemacs21-mule-current/pkg-plist
@@ -25,7 +25,6 @@
 %%EMACS_LIBDIR%%/site-lisp/semi/mime-bbdb.el
 %%EMACS_LIBDIR%%/site-lisp/semi/mime-w3.el
 %%EMACS_LIBDIR%%/site-lisp/semi/mime-w3.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/%%WEMI_SETUPEL%%
 @dirrm %%EMACS_LIBDIR%%/site-lisp/semi
 %%WEMIDOCDIR%%/ChangeLog
 %%WEMIDOCDIR%%/NEWS
diff --git a/editors/wemi-xemacs21-mule/Makefile b/editors/wemi-xemacs21-mule/Makefile
index f883f0a9dbf6..e91d9ef58528 100644
--- a/editors/wemi-xemacs21-mule/Makefile
+++ b/editors/wemi-xemacs21-mule/Makefile
@@ -3,7 +3,7 @@
 # Date created:		25 July 1999
 # Whom:			Shigeyuki FUKUSHIMA <shige@FreeBSD.ORG>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1999/08/06 19:28:19 shige Exp $
 #
 
 MAINTAINER=	shige@FreeBSD.ORG
@@ -23,8 +23,6 @@ EMACS_LIBDIR_WITH_VER=	${EMACS_LIBDIR}
 
 # RUN_DEPENDS port name's suffix is '-common'.
 HAVE_COMMON_PORT=	YES
-# emacs requires *-setupel.el
-REQUIRE_SETUPEL=	YES
 
 # use pkg/* files in ${.CURDIR}
 PKGDIR=		${.CURDIR}/pkg
diff --git a/editors/wemi-xemacs21-mule/pkg-plist b/editors/wemi-xemacs21-mule/pkg-plist
index f3d233efbdd4..80b78b4e17c6 100644
--- a/editors/wemi-xemacs21-mule/pkg-plist
+++ b/editors/wemi-xemacs21-mule/pkg-plist
@@ -27,7 +27,6 @@
 %%EMACS_LIBDIR%%/site-lisp/semi/mime-bbdb.el
 %%EMACS_LIBDIR%%/site-lisp/semi/mime-w3.el
 %%EMACS_LIBDIR%%/site-lisp/semi/mime-w3.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/%%WEMI_SETUPEL%%
 @dirrm %%EMACS_LIBDIR%%/site-lisp/semi
 %%WEMIDOCDIR%%/ChangeLog
 %%WEMIDOCDIR%%/NEWS