summaryrefslogtreecommitdiff
path: root/mail
diff options
context:
space:
mode:
authorShigeyuki Fukushima <shige@FreeBSD.org>1999-09-10 20:54:17 +0000
committerShigeyuki Fukushima <shige@FreeBSD.org>1999-09-10 20:54:17 +0000
commit711ebf67a90f4bc38338f6de43c612506bbca023 (patch)
treefd089c3d529f2e0e39a89d2e50f5d06a8df16ead /mail
parentTypo (diff)
Fix for xemacs-21.1.6.
Notes
Notes: svn path=/head/; revision=21608
Diffstat (limited to 'mail')
-rw-r--r--mail/wanderlust-emacs/Makefile5
-rw-r--r--mail/wanderlust-xemacs21-mule/Makefile5
-rw-r--r--mail/wanderlust/Makefile5
3 files changed, 13 insertions, 2 deletions
diff --git a/mail/wanderlust-emacs/Makefile b/mail/wanderlust-emacs/Makefile
index d1f916d5c5ab..46b1bf1a4db0 100644
--- a/mail/wanderlust-emacs/Makefile
+++ b/mail/wanderlust-emacs/Makefile
@@ -38,8 +38,13 @@ RUN_DEPENDS= ${PKG_DBDIR}/${EMACS_PORT}-common-${MULE_VER}:${PORTSDIR}/editors/$
RUN_DEPENDS= ${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}
.endif
# depends on semi
+.if defined(EMACS_PACKAGESDIR)
+BUILD_DEPENDS+= ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/semi/mime-setup.el:${PORTSDIR}/editors/semi-${EMACS_PORT}-current
+RUN_DEPENDS+= ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/semi/mime-setup.el:${PORTSDIR}/editors/semi-${EMACS_PORT}-current
+.else
BUILD_DEPENDS+= ${PREFIX}/${EMACS_LIBDIR}/site-lisp/semi/mime-setup.el:${PORTSDIR}/editors/semi-${EMACS_PORT}-current
RUN_DEPENDS+= ${PREFIX}/${EMACS_LIBDIR}/site-lisp/semi/mime-setup.el:${PORTSDIR}/editors/semi-${EMACS_PORT}-current
+.endif
.if (${EMACS_PORT} == "xemacs-mule")
DIRSECTION= "Local Packages:"
diff --git a/mail/wanderlust-xemacs21-mule/Makefile b/mail/wanderlust-xemacs21-mule/Makefile
index 74edfe66288a..c7f64b92f59e 100644
--- a/mail/wanderlust-xemacs21-mule/Makefile
+++ b/mail/wanderlust-xemacs21-mule/Makefile
@@ -14,8 +14,9 @@ EMACS_NAME= xemacs
EMACS_PORT= xemacs-mule
EMACS_VER= 21.1.6
MULE_VER= 21.1.6
-EMACS_LIBDIR= lib/xemacs-21.1.6
-EMACS_VER_LIBDIR= lib/xemacs-21.1.6
+EMACS_LIBDIR= lib/xemacs
+EMACS_VER_LIBDIR= lib/xemacs
+EMACS_PACKAGESDIR= lib/${EMACS_NAME}/${EMACS_NAME}-packages
HAVE_COMMON_PORT= yes
diff --git a/mail/wanderlust/Makefile b/mail/wanderlust/Makefile
index d1f916d5c5ab..46b1bf1a4db0 100644
--- a/mail/wanderlust/Makefile
+++ b/mail/wanderlust/Makefile
@@ -38,8 +38,13 @@ RUN_DEPENDS= ${PKG_DBDIR}/${EMACS_PORT}-common-${MULE_VER}:${PORTSDIR}/editors/$
RUN_DEPENDS= ${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}
.endif
# depends on semi
+.if defined(EMACS_PACKAGESDIR)
+BUILD_DEPENDS+= ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/semi/mime-setup.el:${PORTSDIR}/editors/semi-${EMACS_PORT}-current
+RUN_DEPENDS+= ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/semi/mime-setup.el:${PORTSDIR}/editors/semi-${EMACS_PORT}-current
+.else
BUILD_DEPENDS+= ${PREFIX}/${EMACS_LIBDIR}/site-lisp/semi/mime-setup.el:${PORTSDIR}/editors/semi-${EMACS_PORT}-current
RUN_DEPENDS+= ${PREFIX}/${EMACS_LIBDIR}/site-lisp/semi/mime-setup.el:${PORTSDIR}/editors/semi-${EMACS_PORT}-current
+.endif
.if (${EMACS_PORT} == "xemacs-mule")
DIRSECTION= "Local Packages:"