28 files changed, 339 insertions, 9 deletions

diff --git a/editors/flim-emacs-current/Makefile b/editors/flim-emacs-current/Makefile
index 86aa9d242739..a35ee3ae6c3e 100644
--- a/editors/flim-emacs-current/Makefile
+++ b/editors/flim-emacs-current/Makefile
@@ -40,7 +40,7 @@ ALL_TARGET?=	elc
 
 .if defined(EMACS_PORT)
 PKGNAME=	flim-${EMACS_PORT}-${FLIM_VER}
-EMACS_CMD=	${PREFIX}/bin/${EMACS_NAME}-${EMACS_VER}
+EMACS_CMD?=	${PREFIX}/bin/${EMACS_NAME}-${EMACS_VER}
 BUILD_DEPENDS+=	${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}
 .if defined(HAS_COMMON_PORT) && (${HAS_COMMON_PORT} == "YES")
 RUN_DEPENDS+=	${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}-common
@@ -95,6 +95,10 @@ MAKEINFO=		makeinfo --no-split --no-validate
 MAKEINFO_EMACS=		${EMACS_CMD} -no-site-file -no-init-file -batch
 MAKEINFO_EMACS_FLAGS=	-e texinfo-format-buffer -f save-buffer
 
+pre-build:
+.if defined(EMACS_PACKAGESDIR) && defined(XEMACS_PKGNAME)
+	@${MAKE} pkg-el-copy
+.endif
 
 post-build:
 .if defined(BUILD_INFO_BY_EMACS) && (${BUILD_INFO_BY_EMACS} == "YES")
@@ -107,6 +111,9 @@ pre-install:
 .if defined(EMACS_PACKAGESDIR) && defined(EMACS_PACKAGES_SUBDIRS)
 	@${MAKE} mkdir-site-packages
 .endif
+.if defined(EMACS_PACKAGESDIR) && defined(XEMACS_PKGNAME)
+	@${MAKE} pkg-el-install
+.endif
 
 post-install:
 # install package-cookie
@@ -157,6 +164,18 @@ info-build-by-emacs:
 		${MAKEINFO_EMACS} $${i} ${MAKEINFO_EMACS_FLAGS} || ${TRUE} ; \
 	done)
 .endif
+ 
+pkg-el-copy:
+	@(if [ -f ${FILESDIR}/_pkg.el ] ; then \
+	${CP} ${FILESDIR}/_pkg.el ${WRKSRC}/_pkg.el ;\
+	fi)
+
+pkg-el-install:
+	@(if [ -f ${FILESDIR}/_pkg.el ] ; then \
+	${MKDIR} ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME} ;\
+	${INSTALL_DATA} ${FILESDIR}/_pkg.el \
+		${PREFIX}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME}/_pkg.el ;\
+	fi)
 
 mkdir-site-packages:
 	@(for i in ${EMACS_PACKAGES_SUBDIRS} ; do \
diff --git a/editors/flim-emacs-current/files/_pkg.el b/editors/flim-emacs-current/files/_pkg.el
new file mode 100644
index 000000000000..7b3df375fb4d
--- /dev/null
+++ b/editors/flim-emacs-current/files/_pkg.el
@@ -0,0 +1,4 @@
+;;;###autoload
+(package-provide 'flim
+                 :version 1.13
+                 :type 'regular)
diff --git a/editors/flim-emacs/Makefile b/editors/flim-emacs/Makefile
index 6ebf3d98b499..fda4a099c159 100644
--- a/editors/flim-emacs/Makefile
+++ b/editors/flim-emacs/Makefile
@@ -40,7 +40,7 @@ ALL_TARGET?=	elc
 
 .if defined(EMACS_PORT)
 PKGNAME=	flim-${EMACS_PORT}-${FLIM_VER}
-EMACS_CMD=	${PREFIX}/bin/${EMACS_NAME}-${EMACS_VER}
+EMACS_CMD?=	${PREFIX}/bin/${EMACS_NAME}-${EMACS_VER}
 BUILD_DEPENDS+=	${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}
 .if defined(HAS_COMMON_PORT) && (${HAS_COMMON_PORT} == "YES")
 RUN_DEPENDS+=	${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}-common
@@ -95,6 +95,10 @@ MAKEINFO=		makeinfo --no-split --no-validate
 MAKEINFO_EMACS=		${EMACS_CMD} -no-site-file -no-init-file -batch
 MAKEINFO_EMACS_FLAGS=	-e texinfo-format-buffer -f save-buffer
 
+pre-build:
+.if defined(EMACS_PACKAGESDIR) && defined(XEMACS_PKGNAME)
+	@${MAKE} pkg-el-copy
+.endif
 
 post-build:
 .if defined(BUILD_INFO_BY_EMACS) && (${BUILD_INFO_BY_EMACS} == "YES")
@@ -107,6 +111,9 @@ pre-install:
 .if defined(EMACS_PACKAGESDIR) && defined(EMACS_PACKAGES_SUBDIRS)
 	@${MAKE} mkdir-site-packages
 .endif
+.if defined(EMACS_PACKAGESDIR) && defined(XEMACS_PKGNAME)
+	@${MAKE} pkg-el-install
+.endif
 
 post-install:
 # install package-cookie
@@ -163,6 +170,18 @@ mkdir-site-packages:
 		${MKDIR} ${PREFIX}/${EMACS_PACKAGESDIR}/$${i} ; \
 	done)
 
+pkg-el-copy:
+	@(if [ -f ${FILESDIR}/_pkg.el ] ; then \
+	${CP} ${FILESDIR}/_pkg.el ${WRKSRC}/_pkg.el ;\
+	fi)
+
+pkg-el-install:
+	@(if [ -f ${FILESDIR}/_pkg.el ] ; then \
+	${MKDIR} ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME} ;\
+	${INSTALL_DATA} ${FILESDIR}/_pkg.el \
+		${PREFIX}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME}/_pkg.el ;\
+	fi)
+
 doc-install:
 	@${MKDIR} ${PREFIX}/${FLIMDOCDIR}
 	@(cd ${WRKSRC} ; \
diff --git a/editors/flim-emacs/files/_pkg.el b/editors/flim-emacs/files/_pkg.el
new file mode 100644
index 000000000000..76e2a44b2bd2
--- /dev/null
+++ b/editors/flim-emacs/files/_pkg.el
@@ -0,0 +1,4 @@
+;;;###autoload
+(package-provide 'flim
+                 :version 1.12
+                 :type 'regular)
diff --git a/editors/flim/Makefile b/editors/flim/Makefile
index 86aa9d242739..a35ee3ae6c3e 100644
--- a/editors/flim/Makefile
+++ b/editors/flim/Makefile
@@ -40,7 +40,7 @@ ALL_TARGET?=	elc
 
 .if defined(EMACS_PORT)
 PKGNAME=	flim-${EMACS_PORT}-${FLIM_VER}
-EMACS_CMD=	${PREFIX}/bin/${EMACS_NAME}-${EMACS_VER}
+EMACS_CMD?=	${PREFIX}/bin/${EMACS_NAME}-${EMACS_VER}
 BUILD_DEPENDS+=	${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}
 .if defined(HAS_COMMON_PORT) && (${HAS_COMMON_PORT} == "YES")
 RUN_DEPENDS+=	${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}-common
@@ -95,6 +95,10 @@ MAKEINFO=		makeinfo --no-split --no-validate
 MAKEINFO_EMACS=		${EMACS_CMD} -no-site-file -no-init-file -batch
 MAKEINFO_EMACS_FLAGS=	-e texinfo-format-buffer -f save-buffer
 
+pre-build:
+.if defined(EMACS_PACKAGESDIR) && defined(XEMACS_PKGNAME)
+	@${MAKE} pkg-el-copy
+.endif
 
 post-build:
 .if defined(BUILD_INFO_BY_EMACS) && (${BUILD_INFO_BY_EMACS} == "YES")
@@ -107,6 +111,9 @@ pre-install:
 .if defined(EMACS_PACKAGESDIR) && defined(EMACS_PACKAGES_SUBDIRS)
 	@${MAKE} mkdir-site-packages
 .endif
+.if defined(EMACS_PACKAGESDIR) && defined(XEMACS_PKGNAME)
+	@${MAKE} pkg-el-install
+.endif
 
 post-install:
 # install package-cookie
@@ -157,6 +164,18 @@ info-build-by-emacs:
 		${MAKEINFO_EMACS} $${i} ${MAKEINFO_EMACS_FLAGS} || ${TRUE} ; \
 	done)
 .endif
+ 
+pkg-el-copy:
+	@(if [ -f ${FILESDIR}/_pkg.el ] ; then \
+	${CP} ${FILESDIR}/_pkg.el ${WRKSRC}/_pkg.el ;\
+	fi)
+
+pkg-el-install:
+	@(if [ -f ${FILESDIR}/_pkg.el ] ; then \
+	${MKDIR} ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME} ;\
+	${INSTALL_DATA} ${FILESDIR}/_pkg.el \
+		${PREFIX}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME}/_pkg.el ;\
+	fi)
 
 mkdir-site-packages:
 	@(for i in ${EMACS_PACKAGES_SUBDIRS} ; do \
diff --git a/editors/flim/files/_pkg.el b/editors/flim/files/_pkg.el
new file mode 100644
index 000000000000..7b3df375fb4d
--- /dev/null
+++ b/editors/flim/files/_pkg.el
@@ -0,0 +1,4 @@
+;;;###autoload
+(package-provide 'flim
+                 :version 1.13
+                 :type 'regular)
diff --git a/editors/flim113-emacs/Makefile b/editors/flim113-emacs/Makefile
index 86aa9d242739..a35ee3ae6c3e 100644
--- a/editors/flim113-emacs/Makefile
+++ b/editors/flim113-emacs/Makefile
@@ -40,7 +40,7 @@ ALL_TARGET?=	elc
 
 .if defined(EMACS_PORT)
 PKGNAME=	flim-${EMACS_PORT}-${FLIM_VER}
-EMACS_CMD=	${PREFIX}/bin/${EMACS_NAME}-${EMACS_VER}
+EMACS_CMD?=	${PREFIX}/bin/${EMACS_NAME}-${EMACS_VER}
 BUILD_DEPENDS+=	${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}
 .if defined(HAS_COMMON_PORT) && (${HAS_COMMON_PORT} == "YES")
 RUN_DEPENDS+=	${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}-common
@@ -95,6 +95,10 @@ MAKEINFO=		makeinfo --no-split --no-validate
 MAKEINFO_EMACS=		${EMACS_CMD} -no-site-file -no-init-file -batch
 MAKEINFO_EMACS_FLAGS=	-e texinfo-format-buffer -f save-buffer
 
+pre-build:
+.if defined(EMACS_PACKAGESDIR) && defined(XEMACS_PKGNAME)
+	@${MAKE} pkg-el-copy
+.endif
 
 post-build:
 .if defined(BUILD_INFO_BY_EMACS) && (${BUILD_INFO_BY_EMACS} == "YES")
@@ -107,6 +111,9 @@ pre-install:
 .if defined(EMACS_PACKAGESDIR) && defined(EMACS_PACKAGES_SUBDIRS)
 	@${MAKE} mkdir-site-packages
 .endif
+.if defined(EMACS_PACKAGESDIR) && defined(XEMACS_PKGNAME)
+	@${MAKE} pkg-el-install
+.endif
 
 post-install:
 # install package-cookie
@@ -157,6 +164,18 @@ info-build-by-emacs:
 		${MAKEINFO_EMACS} $${i} ${MAKEINFO_EMACS_FLAGS} || ${TRUE} ; \
 	done)
 .endif
+ 
+pkg-el-copy:
+	@(if [ -f ${FILESDIR}/_pkg.el ] ; then \
+	${CP} ${FILESDIR}/_pkg.el ${WRKSRC}/_pkg.el ;\
+	fi)
+
+pkg-el-install:
+	@(if [ -f ${FILESDIR}/_pkg.el ] ; then \
+	${MKDIR} ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME} ;\
+	${INSTALL_DATA} ${FILESDIR}/_pkg.el \
+		${PREFIX}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME}/_pkg.el ;\
+	fi)
 
 mkdir-site-packages:
 	@(for i in ${EMACS_PACKAGES_SUBDIRS} ; do \
diff --git a/editors/flim113-emacs/files/_pkg.el b/editors/flim113-emacs/files/_pkg.el
new file mode 100644
index 000000000000..7b3df375fb4d
--- /dev/null
+++ b/editors/flim113-emacs/files/_pkg.el
@@ -0,0 +1,4 @@
+;;;###autoload
+(package-provide 'flim
+                 :version 1.13
+                 :type 'regular)
diff --git a/editors/flim113/Makefile b/editors/flim113/Makefile
index 86aa9d242739..a35ee3ae6c3e 100644
--- a/editors/flim113/Makefile
+++ b/editors/flim113/Makefile
@@ -40,7 +40,7 @@ ALL_TARGET?=	elc
 
 .if defined(EMACS_PORT)
 PKGNAME=	flim-${EMACS_PORT}-${FLIM_VER}
-EMACS_CMD=	${PREFIX}/bin/${EMACS_NAME}-${EMACS_VER}
+EMACS_CMD?=	${PREFIX}/bin/${EMACS_NAME}-${EMACS_VER}
 BUILD_DEPENDS+=	${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}
 .if defined(HAS_COMMON_PORT) && (${HAS_COMMON_PORT} == "YES")
 RUN_DEPENDS+=	${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}-common
@@ -95,6 +95,10 @@ MAKEINFO=		makeinfo --no-split --no-validate
 MAKEINFO_EMACS=		${EMACS_CMD} -no-site-file -no-init-file -batch
 MAKEINFO_EMACS_FLAGS=	-e texinfo-format-buffer -f save-buffer
 
+pre-build:
+.if defined(EMACS_PACKAGESDIR) && defined(XEMACS_PKGNAME)
+	@${MAKE} pkg-el-copy
+.endif
 
 post-build:
 .if defined(BUILD_INFO_BY_EMACS) && (${BUILD_INFO_BY_EMACS} == "YES")
@@ -107,6 +111,9 @@ pre-install:
 .if defined(EMACS_PACKAGESDIR) && defined(EMACS_PACKAGES_SUBDIRS)
 	@${MAKE} mkdir-site-packages
 .endif
+.if defined(EMACS_PACKAGESDIR) && defined(XEMACS_PKGNAME)
+	@${MAKE} pkg-el-install
+.endif
 
 post-install:
 # install package-cookie
@@ -157,6 +164,18 @@ info-build-by-emacs:
 		${MAKEINFO_EMACS} $${i} ${MAKEINFO_EMACS_FLAGS} || ${TRUE} ; \
 	done)
 .endif
+ 
+pkg-el-copy:
+	@(if [ -f ${FILESDIR}/_pkg.el ] ; then \
+	${CP} ${FILESDIR}/_pkg.el ${WRKSRC}/_pkg.el ;\
+	fi)
+
+pkg-el-install:
+	@(if [ -f ${FILESDIR}/_pkg.el ] ; then \
+	${MKDIR} ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME} ;\
+	${INSTALL_DATA} ${FILESDIR}/_pkg.el \
+		${PREFIX}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME}/_pkg.el ;\
+	fi)
 
 mkdir-site-packages:
 	@(for i in ${EMACS_PACKAGES_SUBDIRS} ; do \
diff --git a/editors/flim113/files/_pkg.el b/editors/flim113/files/_pkg.el
new file mode 100644
index 000000000000..7b3df375fb4d
--- /dev/null
+++ b/editors/flim113/files/_pkg.el
@@ -0,0 +1,4 @@
+;;;###autoload
+(package-provide 'flim
+                 :version 1.13
+                 :type 'regular)
diff --git a/editors/flim114-emacs20/Makefile b/editors/flim114-emacs20/Makefile
index 86aa9d242739..a35ee3ae6c3e 100644
--- a/editors/flim114-emacs20/Makefile
+++ b/editors/flim114-emacs20/Makefile
@@ -40,7 +40,7 @@ ALL_TARGET?=	elc
 
 .if defined(EMACS_PORT)
 PKGNAME=	flim-${EMACS_PORT}-${FLIM_VER}
-EMACS_CMD=	${PREFIX}/bin/${EMACS_NAME}-${EMACS_VER}
+EMACS_CMD?=	${PREFIX}/bin/${EMACS_NAME}-${EMACS_VER}
 BUILD_DEPENDS+=	${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}
 .if defined(HAS_COMMON_PORT) && (${HAS_COMMON_PORT} == "YES")
 RUN_DEPENDS+=	${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}-common
@@ -95,6 +95,10 @@ MAKEINFO=		makeinfo --no-split --no-validate
 MAKEINFO_EMACS=		${EMACS_CMD} -no-site-file -no-init-file -batch
 MAKEINFO_EMACS_FLAGS=	-e texinfo-format-buffer -f save-buffer
 
+pre-build:
+.if defined(EMACS_PACKAGESDIR) && defined(XEMACS_PKGNAME)
+	@${MAKE} pkg-el-copy
+.endif
 
 post-build:
 .if defined(BUILD_INFO_BY_EMACS) && (${BUILD_INFO_BY_EMACS} == "YES")
@@ -107,6 +111,9 @@ pre-install:
 .if defined(EMACS_PACKAGESDIR) && defined(EMACS_PACKAGES_SUBDIRS)
 	@${MAKE} mkdir-site-packages
 .endif
+.if defined(EMACS_PACKAGESDIR) && defined(XEMACS_PKGNAME)
+	@${MAKE} pkg-el-install
+.endif
 
 post-install:
 # install package-cookie
@@ -157,6 +164,18 @@ info-build-by-emacs:
 		${MAKEINFO_EMACS} $${i} ${MAKEINFO_EMACS_FLAGS} || ${TRUE} ; \
 	done)
 .endif
+ 
+pkg-el-copy:
+	@(if [ -f ${FILESDIR}/_pkg.el ] ; then \
+	${CP} ${FILESDIR}/_pkg.el ${WRKSRC}/_pkg.el ;\
+	fi)
+
+pkg-el-install:
+	@(if [ -f ${FILESDIR}/_pkg.el ] ; then \
+	${MKDIR} ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME} ;\
+	${INSTALL_DATA} ${FILESDIR}/_pkg.el \
+		${PREFIX}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME}/_pkg.el ;\
+	fi)
 
 mkdir-site-packages:
 	@(for i in ${EMACS_PACKAGES_SUBDIRS} ; do \
diff --git a/editors/flim114-emacs20/files/_pkg.el b/editors/flim114-emacs20/files/_pkg.el
new file mode 100644
index 000000000000..7b3df375fb4d
--- /dev/null
+++ b/editors/flim114-emacs20/files/_pkg.el
@@ -0,0 +1,4 @@
+;;;###autoload
+(package-provide 'flim
+                 :version 1.13
+                 :type 'regular)
diff --git a/editors/semi-emacs-current/Makefile b/editors/semi-emacs-current/Makefile
index 775ececc4b92..50a7ee31e75f 100644
--- a/editors/semi-emacs-current/Makefile
+++ b/editors/semi-emacs-current/Makefile
@@ -100,6 +100,11 @@ MAKEINFO=		makeinfo --no-split --no-validate
 MAKEINFO_EMACS=		${EMACS_CMD} -no-site-file -no-init-file -batch
 MAKEINFO_EMACS_FLAGS=	-e texinfo-format-buffer -f save-buffer
 
+pre-build:
+.if defined(EMACS_PACKAGESDIR) && defined(XEMACS_PKGNAME)
+	@${MAKE} pkg-el-copy
+.endif
+
 post-build:
 .if defined(BUILD_INFO_BY_EMACS) && (${BUILD_INFO_BY_EMACS} == "YES")
 	@${MAKE} info-build-by-emacs
@@ -111,6 +116,9 @@ pre-install:
 .if defined(EMACS_PACKAGESDIR) && defined(EMACS_PACKAGES_SUBDIRS)
 	@${MAKE} mkdir-site-packages
 .endif
+.if defined(EMACS_PACKAGESDIR) && defined(XEMACS_PKGNAME)
+	@${MAKE} pkg-el-install
+.endif
 
 post-install:
 	@${MKDIR} -p ${PREFIX}/share/semi
@@ -161,6 +169,18 @@ info-build-by-emacs:
 	done)
 .endif
 
+pkg-el-copy:
+	@(if [ -f ${FILESDIR}/_pkg.el ] ; then \
+	${CP} ${FILESDIR}/_pkg.el ${WRKSRC}/_pkg.el ;\
+	fi)
+
+pkg-el-install:
+	@(if [ -f ${FILESDIR}/_pkg.el ] ; then \
+	${MKDIR} ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME} ;\
+	${INSTALL_DATA} ${FILESDIR}/_pkg.el \
+		${PREFIX}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME}/_pkg.el ;\
+	fi)
+
 mkdir-site-packages:
 	@(for i in ${EMACS_PACKAGES_SUBDIRS} ; do \
 		${MKDIR} ${PREFIX}/${EMACS_PACKAGESDIR}/$${i} ; \
diff --git a/editors/semi-emacs-current/files/_pkg.el b/editors/semi-emacs-current/files/_pkg.el
new file mode 100644
index 000000000000..5bc3c1a4a951
--- /dev/null
+++ b/editors/semi-emacs-current/files/_pkg.el
@@ -0,0 +1,4 @@
+;;;###autoload
+(package-provide 'semi
+                 :version 1.18
+                 :type 'regular)
diff --git a/editors/semi-emacs/Makefile b/editors/semi-emacs/Makefile
index 2ed93b9c16a5..0a0ad3b09d98 100644
--- a/editors/semi-emacs/Makefile
+++ b/editors/semi-emacs/Makefile
@@ -43,7 +43,7 @@ ALL_TARGET?=	elc
 
 .if defined(EMACS_PORT)
 PKGNAME=	semi-${EMACS_PORT}-${SEMI_VER}
-EMACS_CMD=	${PREFIX}/bin/${EMACS_NAME}-${EMACS_VER}
+EMACS_CMD?=	${PREFIX}/bin/${EMACS_NAME}-${EMACS_VER}
 BUILD_DEPENDS+=	${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}
 .if defined(HAS_COMMON_PORT) && (${HAS_COMMON_PORT} == "YES")
 RUN_DEPENDS+=	${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}-common
@@ -100,6 +100,11 @@ MAKEINFO=		makeinfo --no-split --no-validate
 MAKEINFO_EMACS=		${EMACS_CMD} -no-site-file -no-init-file -batch
 MAKEINFO_EMACS_FLAGS=	-e texinfo-format-buffer -f save-buffer
 
+pre-build:
+.if defined(EMACS_PACKAGESDIR) && defined(XEMACS_PKGNAME)
+	@${MAKE} pkg-el-copy
+.endif
+
 post-build:
 .if defined(BUILD_INFO_BY_EMACS) && (${BUILD_INFO_BY_EMACS} == "YES")
 	@${MAKE} info-build-by-emacs
@@ -111,6 +116,9 @@ pre-install:
 .if defined(EMACS_PACKAGESDIR) && defined(EMACS_PACKAGES_SUBDIRS)
 	@${MAKE} mkdir-site-packages
 .endif
+.if defined(EMACS_PACKAGESDIR) && defined(XEMACS_PKGNAME)
+	@${MAKE} pkg-el-install
+.endif
 
 post-install:
 	@${MKDIR} -p ${PREFIX}/share/semi
@@ -161,6 +169,18 @@ info-build-by-emacs:
 	done)
 .endif
 
+pkg-el-copy:
+	@(if [ -f ${FILESDIR}/_pkg.el ] ; then \
+	${CP} ${FILESDIR}/_pkg.el ${WRKSRC}/_pkg.el ;\
+	fi)
+
+pkg-el-install:
+	@(if [ -f ${FILESDIR}/_pkg.el ] ; then \
+	${MKDIR} ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME} ;\
+	${INSTALL_DATA} ${FILESDIR}/_pkg.el \
+		${PREFIX}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME}/_pkg.el ;\
+	fi)
+
 mkdir-site-packages:
 	@(for i in ${EMACS_PACKAGES_SUBDIRS} ; do \
 		${MKDIR} ${PREFIX}/${EMACS_PACKAGESDIR}/$${i} ; \
diff --git a/editors/semi-emacs/files/_pkg.el b/editors/semi-emacs/files/_pkg.el
new file mode 100644
index 000000000000..3e3770af6a1b
--- /dev/null
+++ b/editors/semi-emacs/files/_pkg.el
@@ -0,0 +1,4 @@
+;;;###autoload
+(package-provide 'semi
+                 :version 1.13
+                 :type 'regular)
diff --git a/editors/semi/Makefile b/editors/semi/Makefile
index 775ececc4b92..50a7ee31e75f 100644
--- a/editors/semi/Makefile
+++ b/editors/semi/Makefile
@@ -100,6 +100,11 @@ MAKEINFO=		makeinfo --no-split --no-validate
 MAKEINFO_EMACS=		${EMACS_CMD} -no-site-file -no-init-file -batch
 MAKEINFO_EMACS_FLAGS=	-e texinfo-format-buffer -f save-buffer
 
+pre-build:
+.if defined(EMACS_PACKAGESDIR) && defined(XEMACS_PKGNAME)
+	@${MAKE} pkg-el-copy
+.endif
+
 post-build:
 .if defined(BUILD_INFO_BY_EMACS) && (${BUILD_INFO_BY_EMACS} == "YES")
 	@${MAKE} info-build-by-emacs
@@ -111,6 +116,9 @@ pre-install:
 .if defined(EMACS_PACKAGESDIR) && defined(EMACS_PACKAGES_SUBDIRS)
 	@${MAKE} mkdir-site-packages
 .endif
+.if defined(EMACS_PACKAGESDIR) && defined(XEMACS_PKGNAME)
+	@${MAKE} pkg-el-install
+.endif
 
 post-install:
 	@${MKDIR} -p ${PREFIX}/share/semi
@@ -161,6 +169,18 @@ info-build-by-emacs:
 	done)
 .endif
 
+pkg-el-copy:
+	@(if [ -f ${FILESDIR}/_pkg.el ] ; then \
+	${CP} ${FILESDIR}/_pkg.el ${WRKSRC}/_pkg.el ;\
+	fi)
+
+pkg-el-install:
+	@(if [ -f ${FILESDIR}/_pkg.el ] ; then \
+	${MKDIR} ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME} ;\
+	${INSTALL_DATA} ${FILESDIR}/_pkg.el \
+		${PREFIX}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME}/_pkg.el ;\
+	fi)
+
 mkdir-site-packages:
 	@(for i in ${EMACS_PACKAGES_SUBDIRS} ; do \
 		${MKDIR} ${PREFIX}/${EMACS_PACKAGESDIR}/$${i} ; \
diff --git a/editors/semi/files/_pkg.el b/editors/semi/files/_pkg.el
new file mode 100644
index 000000000000..5bc3c1a4a951
--- /dev/null
+++ b/editors/semi/files/_pkg.el
@@ -0,0 +1,4 @@
+;;;###autoload
+(package-provide 'semi
+                 :version 1.18
+                 :type 'regular)
diff --git a/editors/semi113-emacs/Makefile b/editors/semi113-emacs/Makefile
index 775ececc4b92..50a7ee31e75f 100644
--- a/editors/semi113-emacs/Makefile
+++ b/editors/semi113-emacs/Makefile
@@ -100,6 +100,11 @@ MAKEINFO=		makeinfo --no-split --no-validate
 MAKEINFO_EMACS=		${EMACS_CMD} -no-site-file -no-init-file -batch
 MAKEINFO_EMACS_FLAGS=	-e texinfo-format-buffer -f save-buffer
 
+pre-build:
+.if defined(EMACS_PACKAGESDIR) && defined(XEMACS_PKGNAME)
+	@${MAKE} pkg-el-copy
+.endif
+
 post-build:
 .if defined(BUILD_INFO_BY_EMACS) && (${BUILD_INFO_BY_EMACS} == "YES")
 	@${MAKE} info-build-by-emacs
@@ -111,6 +116,9 @@ pre-install:
 .if defined(EMACS_PACKAGESDIR) && defined(EMACS_PACKAGES_SUBDIRS)
 	@${MAKE} mkdir-site-packages
 .endif
+.if defined(EMACS_PACKAGESDIR) && defined(XEMACS_PKGNAME)
+	@${MAKE} pkg-el-install
+.endif
 
 post-install:
 	@${MKDIR} -p ${PREFIX}/share/semi
@@ -161,6 +169,18 @@ info-build-by-emacs:
 	done)
 .endif
 
+pkg-el-copy:
+	@(if [ -f ${FILESDIR}/_pkg.el ] ; then \
+	${CP} ${FILESDIR}/_pkg.el ${WRKSRC}/_pkg.el ;\
+	fi)
+
+pkg-el-install:
+	@(if [ -f ${FILESDIR}/_pkg.el ] ; then \
+	${MKDIR} ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME} ;\
+	${INSTALL_DATA} ${FILESDIR}/_pkg.el \
+		${PREFIX}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME}/_pkg.el ;\
+	fi)
+
 mkdir-site-packages:
 	@(for i in ${EMACS_PACKAGES_SUBDIRS} ; do \
 		${MKDIR} ${PREFIX}/${EMACS_PACKAGESDIR}/$${i} ; \
diff --git a/editors/semi113-emacs/files/_pkg.el b/editors/semi113-emacs/files/_pkg.el
new file mode 100644
index 000000000000..5bc3c1a4a951
--- /dev/null
+++ b/editors/semi113-emacs/files/_pkg.el
@@ -0,0 +1,4 @@
+;;;###autoload
+(package-provide 'semi
+                 :version 1.18
+                 :type 'regular)
diff --git a/editors/semi113/Makefile b/editors/semi113/Makefile
index 775ececc4b92..50a7ee31e75f 100644
--- a/editors/semi113/Makefile
+++ b/editors/semi113/Makefile
@@ -100,6 +100,11 @@ MAKEINFO=		makeinfo --no-split --no-validate
 MAKEINFO_EMACS=		${EMACS_CMD} -no-site-file -no-init-file -batch
 MAKEINFO_EMACS_FLAGS=	-e texinfo-format-buffer -f save-buffer
 
+pre-build:
+.if defined(EMACS_PACKAGESDIR) && defined(XEMACS_PKGNAME)
+	@${MAKE} pkg-el-copy
+.endif
+
 post-build:
 .if defined(BUILD_INFO_BY_EMACS) && (${BUILD_INFO_BY_EMACS} == "YES")
 	@${MAKE} info-build-by-emacs
@@ -111,6 +116,9 @@ pre-install:
 .if defined(EMACS_PACKAGESDIR) && defined(EMACS_PACKAGES_SUBDIRS)
 	@${MAKE} mkdir-site-packages
 .endif
+.if defined(EMACS_PACKAGESDIR) && defined(XEMACS_PKGNAME)
+	@${MAKE} pkg-el-install
+.endif
 
 post-install:
 	@${MKDIR} -p ${PREFIX}/share/semi
@@ -161,6 +169,18 @@ info-build-by-emacs:
 	done)
 .endif
 
+pkg-el-copy:
+	@(if [ -f ${FILESDIR}/_pkg.el ] ; then \
+	${CP} ${FILESDIR}/_pkg.el ${WRKSRC}/_pkg.el ;\
+	fi)
+
+pkg-el-install:
+	@(if [ -f ${FILESDIR}/_pkg.el ] ; then \
+	${MKDIR} ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME} ;\
+	${INSTALL_DATA} ${FILESDIR}/_pkg.el \
+		${PREFIX}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME}/_pkg.el ;\
+	fi)
+
 mkdir-site-packages:
 	@(for i in ${EMACS_PACKAGES_SUBDIRS} ; do \
 		${MKDIR} ${PREFIX}/${EMACS_PACKAGESDIR}/$${i} ; \
diff --git a/editors/semi113/files/_pkg.el b/editors/semi113/files/_pkg.el
new file mode 100644
index 000000000000..5bc3c1a4a951
--- /dev/null
+++ b/editors/semi113/files/_pkg.el
@@ -0,0 +1,4 @@
+;;;###autoload
+(package-provide 'semi
+                 :version 1.18
+                 :type 'regular)
diff --git a/editors/semi114-emacs20/Makefile b/editors/semi114-emacs20/Makefile
index 775ececc4b92..50a7ee31e75f 100644
--- a/editors/semi114-emacs20/Makefile
+++ b/editors/semi114-emacs20/Makefile
@@ -100,6 +100,11 @@ MAKEINFO=		makeinfo --no-split --no-validate
 MAKEINFO_EMACS=		${EMACS_CMD} -no-site-file -no-init-file -batch
 MAKEINFO_EMACS_FLAGS=	-e texinfo-format-buffer -f save-buffer
 
+pre-build:
+.if defined(EMACS_PACKAGESDIR) && defined(XEMACS_PKGNAME)
+	@${MAKE} pkg-el-copy
+.endif
+
 post-build:
 .if defined(BUILD_INFO_BY_EMACS) && (${BUILD_INFO_BY_EMACS} == "YES")
 	@${MAKE} info-build-by-emacs
@@ -111,6 +116,9 @@ pre-install:
 .if defined(EMACS_PACKAGESDIR) && defined(EMACS_PACKAGES_SUBDIRS)
 	@${MAKE} mkdir-site-packages
 .endif
+.if defined(EMACS_PACKAGESDIR) && defined(XEMACS_PKGNAME)
+	@${MAKE} pkg-el-install
+.endif
 
 post-install:
 	@${MKDIR} -p ${PREFIX}/share/semi
@@ -161,6 +169,18 @@ info-build-by-emacs:
 	done)
 .endif
 
+pkg-el-copy:
+	@(if [ -f ${FILESDIR}/_pkg.el ] ; then \
+	${CP} ${FILESDIR}/_pkg.el ${WRKSRC}/_pkg.el ;\
+	fi)
+
+pkg-el-install:
+	@(if [ -f ${FILESDIR}/_pkg.el ] ; then \
+	${MKDIR} ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME} ;\
+	${INSTALL_DATA} ${FILESDIR}/_pkg.el \
+		${PREFIX}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME}/_pkg.el ;\
+	fi)
+
 mkdir-site-packages:
 	@(for i in ${EMACS_PACKAGES_SUBDIRS} ; do \
 		${MKDIR} ${PREFIX}/${EMACS_PACKAGESDIR}/$${i} ; \
diff --git a/editors/semi114-emacs20/files/_pkg.el b/editors/semi114-emacs20/files/_pkg.el
new file mode 100644
index 000000000000..5bc3c1a4a951
--- /dev/null
+++ b/editors/semi114-emacs20/files/_pkg.el
@@ -0,0 +1,4 @@
+;;;###autoload
+(package-provide 'semi
+                 :version 1.18
+                 :type 'regular)
diff --git a/editors/wemi-emacs-current/Makefile b/editors/wemi-emacs-current/Makefile
index 81763a8a7bef..44bb106f233e 100644
--- a/editors/wemi-emacs-current/Makefile
+++ b/editors/wemi-emacs-current/Makefile
@@ -41,7 +41,7 @@ ALL_TARGET?=	elc
 
 .if defined(EMACS_PORT)
 PKGNAME=	wemi-${EMACS_PORT}-${WEMI_VER}
-EMACS_CMD=	${PREFIX}/bin/${EMACS_NAME}-${EMACS_VER}
+EMACS_CMD?=	${PREFIX}/bin/${EMACS_NAME}-${EMACS_VER}
 BUILD_DEPENDS+=	${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}
 .if defined(HAS_COMMON_PORT) && (${HAS_COMMON_PORT} == "YES")
 RUN_DEPENDS+=	${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}-common
@@ -98,6 +98,11 @@ MAKEINFO=		makeinfo --no-split --no-validate
 MAKEINFO_EMACS=		${EMACS_CMD} -no-site-file -no-init-file -batch
 MAKEINFO_EMACS_FLAGS=	-e texinfo-format-buffer -f save-buffer
 
+pre-build:
+.if defined(EMACS_PACKAGESDIR) && defined(XEMACS_PKGNAME)
+	@${MAKE} pkg-el-copy
+.endif
+
 post-build:
 .if defined(BUILD_INFO_BY_EMACS) && (${BUILD_INFO_BY_EMACS} == "YES")
 	@${MAKE} info-build-by-emacs
@@ -109,6 +114,9 @@ pre-install:
 .if defined(EMACS_PACKAGESDIR) && defined(EMACS_PACKAGES_SUBDIRS)
 	@${MAKE} mkdir-site-packages
 .endif
+.if defined(EMACS_PACKAGESDIR) && defined(XEMACS_PKGNAME)
+	@${MAKE} pkg-el-install
+.endif
 
 post-install:
 	@${MKDIR} -p ${PREFIX}/share/semi
@@ -160,6 +168,18 @@ info-build-by-emacs:
 	done)
 .endif
 
+pkg-el-copy:
+	@(if [ -f ${FILESDIR}/_pkg.el ] ; then \
+	${CP} ${FILESDIR}/_pkg.el ${WRKSRC}/_pkg.el ;\
+	fi)
+
+pkg-el-install:
+	@(if [ -f ${FILESDIR}/_pkg.el ] ; then \
+	${MKDIR} ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME} ;\
+	${INSTALL_DATA} ${FILESDIR}/_pkg.el \
+		${PREFIX}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME}/_pkg.el ;\
+	fi)
+
 mkdir-site-packages:
 	@(for i in ${EMACS_PACKAGES_SUBDIRS} ; do \
 		${MKDIR} ${PREFIX}/${EMACS_PACKAGESDIR}/$${i} ; \
diff --git a/editors/wemi-emacs-current/files/_pkg.el b/editors/wemi-emacs-current/files/_pkg.el
new file mode 100644
index 000000000000..3a2b68c86f62
--- /dev/null
+++ b/editors/wemi-emacs-current/files/_pkg.el
@@ -0,0 +1,4 @@
+;;;###autoload
+(package-provide 'wemi
+                 :version 1.18
+                 :type 'regular)
diff --git a/editors/wemi-emacs/Makefile b/editors/wemi-emacs/Makefile
index 9f9d41f6fd66..020aeceb3d9a 100644
--- a/editors/wemi-emacs/Makefile
+++ b/editors/wemi-emacs/Makefile
@@ -43,7 +43,7 @@ ALL_TARGET?=	elc
 
 .if defined(EMACS_PORT)
 PKGNAME=	wemi-${EMACS_PORT}-${WEMI_VER}
-EMACS_CMD=	${PREFIX}/bin/${EMACS_NAME}-${EMACS_VER}
+EMACS_CMD?=	${PREFIX}/bin/${EMACS_NAME}-${EMACS_VER}
 BUILD_DEPENDS+=	${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}
 .if defined(HAS_COMMON_PORT) && (${HAS_COMMON_PORT} == "YES")
 RUN_DEPENDS+=	${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}-common
@@ -100,6 +100,11 @@ MAKEINFO=		makeinfo --no-split --no-validate
 MAKEINFO_EMACS=		${EMACS_CMD} -no-site-file -no-init-file -batch
 MAKEINFO_EMACS_FLAGS=	-e texinfo-format-buffer -f save-buffer
 
+pre-build:
+.if defined(EMACS_PACKAGESDIR) && defined(XEMACS_PKGNAME)
+	@${MAKE} pkg-el-copy
+.endif
+
 post-build:
 .if defined(BUILD_INFO_BY_EMACS) && (${BUILD_INFO_BY_EMACS} == "YES")
 	@${MAKE} info-build-by-emacs
@@ -111,6 +116,9 @@ pre-install:
 .if defined(EMACS_PACKAGESDIR) && defined(EMACS_PACKAGES_SUBDIRS)
 	@${MAKE} mkdir-site-packages
 .endif
+.if defined(EMACS_PACKAGESDIR) && defined(XEMACS_PKGNAME)
+	@${MAKE} pkg-el-install
+.endif
 
 post-install:
 	@${MKDIR} -p ${PREFIX}/share/semi
@@ -162,6 +170,18 @@ info-build-by-emacs:
 	done)
 .endif
 
+pkg-el-copy:
+	@(if [ -f ${FILESDIR}/_pkg.el ] ; then \
+	${CP} ${FILESDIR}/_pkg.el ${WRKSRC}/_pkg.el ;\
+	fi)
+
+pkg-el-install:
+	@(if [ -f ${FILESDIR}/_pkg.el ] ; then \
+	${MKDIR} ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME} ;\
+	${INSTALL_DATA} ${FILESDIR}/_pkg.el \
+		${PREFIX}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME}/_pkg.el ;\
+	fi)
+
 mkdir-site-packages:
 	@(for i in ${EMACS_PACKAGES_SUBDIRS} ; do \
 		${MKDIR} ${PREFIX}/${EMACS_PACKAGESDIR}/$${i} ; \
diff --git a/editors/wemi-emacs/files/_pkg.el b/editors/wemi-emacs/files/_pkg.el
new file mode 100644
index 000000000000..3ba71eeec45f
--- /dev/null
+++ b/editors/wemi-emacs/files/_pkg.el
@@ -0,0 +1,4 @@
+;;;###autoload
+(package-provide 'wemi
+                 :version 1.13
+                 :type 'regular)