summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--editors/apel-emacs/Makefile19
-rw-r--r--editors/apel-xemacs21-mule/Makefile4
-rw-r--r--editors/apel/Makefile19
3 files changed, 39 insertions, 3 deletions
diff --git a/editors/apel-emacs/Makefile b/editors/apel-emacs/Makefile
index 8e22fc46d2dd..af616af4fbdb 100644
--- a/editors/apel-emacs/Makefile
+++ b/editors/apel-emacs/Makefile
@@ -52,6 +52,10 @@ RUN_DEPENDS= ${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}
BUILD_DEPENDS+= ${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/custom.el:${PORTSDIR}/editors/custom-${EMACS_PORT}
RUN_DEPENDS+= ${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/custom.el:${PORTSDIR}/editors/custom-${EMACS_PORT}
.endif
+.if defined(EMACS_PACKAGESDIR)
+BUILD_DEPENDS+= ${PREFIX}/${EMACS_PACKAGESDIR}/../xemacs-packages/lisp/xemacs-base/advice.el:${PORTSDIR}/editors/xemacs-sumo-packages
+RUN_DEPENDS+= ${PREFIX}/${EMACS_PACKAGESDIR}/../xemacs-packages/lisp/xemacs-base/advice.el:${PORTSDIR}/editors/xemacs-sumo-packages
+.endif
SCRIPTS_ENV+= EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \
EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \
@@ -74,6 +78,11 @@ pre-configure:
@${CP} ${FILESDIR}/${APEL_SETUPEL}.in ${WRKDIR}
.endif
+pre-install:
+.if defined(EMACS_PACKAGESDIR) && defined(EMACS_PACKAGES_SUBDIRS)
+ @${MAKE} mkdir-site-packages
+.endif
+
post-install:
.if defined(REQUIRE_SETUPEL) && (${REQUIRE_SETUPEL} == "YES")
@${MAKE} setupel-install
@@ -86,7 +95,15 @@ post-install:
.endif
-# install functions
+###############################################################################
+#
+# local functions
+#
+mkdir-site-packages:
+ @(for i in ${EMACS_PACKAGES_SUBDIRS} ; do \
+ ${MKDIR} ${PREFIX}/${EMACS_PACKAGESDIR}/$${i} ; \
+ done)
+
doc-install:
@${MKDIR} ${PREFIX}/${APELDOCDIR}
@(cd ${WRKSRC} ; \
diff --git a/editors/apel-xemacs21-mule/Makefile b/editors/apel-xemacs21-mule/Makefile
index 0e66acac5da8..23e01638bc95 100644
--- a/editors/apel-xemacs21-mule/Makefile
+++ b/editors/apel-xemacs21-mule/Makefile
@@ -17,7 +17,9 @@ MASTERDIR= ${.CURDIR}/../../editors/apel-emacs
EMACS_NAME= xemacs
EMACS_PORT= xemacs-mule
EMACS_VER= 21.1.6
-EMACS_PACKAGESDIR= lib/${EMACS_NAME}/${EMACS_NAME}-packages
+EMACS_PACKAGESDIR= lib/${EMACS_NAME}/site-packages
+# packages-subdirectories which this port requires
+EMACS_PACKAGES_SUBDIRS= lisp pkginfo
# how to install
ALL_TARGET= package
diff --git a/editors/apel/Makefile b/editors/apel/Makefile
index 8e22fc46d2dd..af616af4fbdb 100644
--- a/editors/apel/Makefile
+++ b/editors/apel/Makefile
@@ -52,6 +52,10 @@ RUN_DEPENDS= ${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}
BUILD_DEPENDS+= ${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/custom.el:${PORTSDIR}/editors/custom-${EMACS_PORT}
RUN_DEPENDS+= ${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/custom.el:${PORTSDIR}/editors/custom-${EMACS_PORT}
.endif
+.if defined(EMACS_PACKAGESDIR)
+BUILD_DEPENDS+= ${PREFIX}/${EMACS_PACKAGESDIR}/../xemacs-packages/lisp/xemacs-base/advice.el:${PORTSDIR}/editors/xemacs-sumo-packages
+RUN_DEPENDS+= ${PREFIX}/${EMACS_PACKAGESDIR}/../xemacs-packages/lisp/xemacs-base/advice.el:${PORTSDIR}/editors/xemacs-sumo-packages
+.endif
SCRIPTS_ENV+= EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \
EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \
@@ -74,6 +78,11 @@ pre-configure:
@${CP} ${FILESDIR}/${APEL_SETUPEL}.in ${WRKDIR}
.endif
+pre-install:
+.if defined(EMACS_PACKAGESDIR) && defined(EMACS_PACKAGES_SUBDIRS)
+ @${MAKE} mkdir-site-packages
+.endif
+
post-install:
.if defined(REQUIRE_SETUPEL) && (${REQUIRE_SETUPEL} == "YES")
@${MAKE} setupel-install
@@ -86,7 +95,15 @@ post-install:
.endif
-# install functions
+###############################################################################
+#
+# local functions
+#
+mkdir-site-packages:
+ @(for i in ${EMACS_PACKAGES_SUBDIRS} ; do \
+ ${MKDIR} ${PREFIX}/${EMACS_PACKAGESDIR}/$${i} ; \
+ done)
+
doc-install:
@${MKDIR} ${PREFIX}/${APELDOCDIR}
@(cd ${WRKSRC} ; \