1 files changed, 21 insertions, 1 deletions

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} ; \