6 files changed, 36 insertions, 0 deletions

diff --git a/editors/apel-emacs/Makefile b/editors/apel-emacs/Makefile
index a58a5bca498e..6dabc126969d 100644
--- a/editors/apel-emacs/Makefile
+++ b/editors/apel-emacs/Makefile
@@ -20,6 +20,9 @@ APEL_VER=	10.3
 APEL_SETUPEL=	apel-setupel.el
 # document install directory by install-doc target
 APELDOCDIR?=	share/doc/apel
+# apel lispdir
+APEL_LISPDIR?=			${LOCALBASE}/${EMACS_SITE_LISPDIR}
+APEL_VERSION_SPECIFIC_LISPDIR?=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}
 
 # This is a master port.
 PORTCLASS?=	master
@@ -36,6 +39,9 @@ ALL_TARGET?=	elc
 # environments
 SCRIPTS_ENV+=	TARGETS="${APEL_SETUPEL}"
 PLIST_SUB+=	APELDOCDIR=${APELDOCDIR} APEL_SETUPEL=${APEL_SETUPEL}
+MAKE_ARGS+=	PREFIX="${LOCALBASE}" \
+		LISPDIR="${APEL_LISPDIR}" \
+		VERSION_SPECIFIC_LISPDIR="${APEL_VERSION_SPECIFIC_LISPDIR}"
 
 .include <bsd.port.pre.mk>
 
diff --git a/editors/apel/Makefile b/editors/apel/Makefile
index a58a5bca498e..6dabc126969d 100644
--- a/editors/apel/Makefile
+++ b/editors/apel/Makefile
@@ -20,6 +20,9 @@ APEL_VER=	10.3
 APEL_SETUPEL=	apel-setupel.el
 # document install directory by install-doc target
 APELDOCDIR?=	share/doc/apel
+# apel lispdir
+APEL_LISPDIR?=			${LOCALBASE}/${EMACS_SITE_LISPDIR}
+APEL_VERSION_SPECIFIC_LISPDIR?=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}
 
 # This is a master port.
 PORTCLASS?=	master
@@ -36,6 +39,9 @@ ALL_TARGET?=	elc
 # environments
 SCRIPTS_ENV+=	TARGETS="${APEL_SETUPEL}"
 PLIST_SUB+=	APELDOCDIR=${APELDOCDIR} APEL_SETUPEL=${APEL_SETUPEL}
+MAKE_ARGS+=	PREFIX="${LOCALBASE}" \
+		LISPDIR="${APEL_LISPDIR}" \
+		VERSION_SPECIFIC_LISPDIR="${APEL_VERSION_SPECIFIC_LISPDIR}"
 
 .include <bsd.port.pre.mk>
 
diff --git a/editors/flim113-emacs/Makefile b/editors/flim113-emacs/Makefile
index 2647851569e7..309df21669e2 100644
--- a/editors/flim113-emacs/Makefile
+++ b/editors/flim113-emacs/Makefile
@@ -27,6 +27,9 @@ FLIM_SETUPEL=	flim-setupel.el
 # document install directory by install-doc target
 FLIMDOCDIR?=	share/doc/flim
 FLIM_COOKIE=	flim-${EMACS_PORT_NAME}-${FLIM_TRUNK}.FreeBSD-packages
+# flim lispdir
+FLIM_LISPDIR?=			${LOCALBASE}/${EMACS_SITE_LISPDIR}
+FLIM_VERSION_SPECIFIC_LISPDIR?=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}
 
 .if (${PORTCLASS} == "master")
 # for emacs
@@ -41,6 +44,9 @@ ALL_TARGET?=	elc
 SCRIPTS_ENV+=	TARGETS="${FLIM_SETUPEL}"
 PLIST_SUB+=	FLIMDOCDIR=${FLIMDOCDIR} FLIM_SETUPEL=${FLIM_SETUPEL} \
 		FLIM_COOKIE=${FLIM_COOKIE}
+MAKE_ARGS+=	PREFIX="${LOCALBASE}" \
+		LISPDIR="${FLIM_LISPDIR}" \
+		VERSION_SPECIFIC_LISPDIR="${FLIM_VERSION_SPECIFIC_LISPDIR}"
 
 .include <bsd.port.pre.mk>
 
diff --git a/editors/flim113/Makefile b/editors/flim113/Makefile
index 2647851569e7..309df21669e2 100644
--- a/editors/flim113/Makefile
+++ b/editors/flim113/Makefile
@@ -27,6 +27,9 @@ FLIM_SETUPEL=	flim-setupel.el
 # document install directory by install-doc target
 FLIMDOCDIR?=	share/doc/flim
 FLIM_COOKIE=	flim-${EMACS_PORT_NAME}-${FLIM_TRUNK}.FreeBSD-packages
+# flim lispdir
+FLIM_LISPDIR?=			${LOCALBASE}/${EMACS_SITE_LISPDIR}
+FLIM_VERSION_SPECIFIC_LISPDIR?=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}
 
 .if (${PORTCLASS} == "master")
 # for emacs
@@ -41,6 +44,9 @@ ALL_TARGET?=	elc
 SCRIPTS_ENV+=	TARGETS="${FLIM_SETUPEL}"
 PLIST_SUB+=	FLIMDOCDIR=${FLIMDOCDIR} FLIM_SETUPEL=${FLIM_SETUPEL} \
 		FLIM_COOKIE=${FLIM_COOKIE}
+MAKE_ARGS+=	PREFIX="${LOCALBASE}" \
+		LISPDIR="${FLIM_LISPDIR}" \
+		VERSION_SPECIFIC_LISPDIR="${FLIM_VERSION_SPECIFIC_LISPDIR}"
 
 .include <bsd.port.pre.mk>
 
diff --git a/editors/semi113-emacs/Makefile b/editors/semi113-emacs/Makefile
index 9d7c48495241..58bf4fa4ccad 100644
--- a/editors/semi113-emacs/Makefile
+++ b/editors/semi113-emacs/Makefile
@@ -29,6 +29,9 @@ SEMI_SETUPEL=	semi-setupel.el
 SEMIDOCDIR?=	share/doc/semi
 FLIM_COOKIE=	flim-${EMACS_PORT_NAME}-${FLIM_TRUNK}.FreeBSD-packages
 SEMI_COOKIE=	semi-${EMACS_PORT_NAME}-${SEMI_TRUNK}.FreeBSD-packages
+# semi lispdir
+SEMI_LISPDIR?=			${LOCALBASE}/${EMACS_SITE_LISPDIR}
+SEMI_VERSION_SPECIFIC_LISPDIR?=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}
 
 .if (${PORTCLASS} == "master")
 # emacs port setup
@@ -43,6 +46,9 @@ ALL_TARGET?=	elc
 SCRIPTS_ENV+=	TARGETS="${SEMI_SETUPEL}"
 PLIST_SUB+=	SEMIDOCDIR=${SEMIDOCDIR} SEMI_SETUPEL=${SEMI_SETUPEL} \
 		SEMI_COOKIE=${SEMI_COOKIE}
+MAKE_ARGS+=	PREFIX="${LOCALBASE}" \
+		LISPDIR="${SEMI_LISPDIR}" \
+		VERSION_SPECIFIC_LISPDIR="${SEMI_VERSION_SPECIFIC_LISPDIR}"
 
 .include <bsd.port.pre.mk>
 
diff --git a/editors/semi113/Makefile b/editors/semi113/Makefile
index 9d7c48495241..58bf4fa4ccad 100644
--- a/editors/semi113/Makefile
+++ b/editors/semi113/Makefile
@@ -29,6 +29,9 @@ SEMI_SETUPEL=	semi-setupel.el
 SEMIDOCDIR?=	share/doc/semi
 FLIM_COOKIE=	flim-${EMACS_PORT_NAME}-${FLIM_TRUNK}.FreeBSD-packages
 SEMI_COOKIE=	semi-${EMACS_PORT_NAME}-${SEMI_TRUNK}.FreeBSD-packages
+# semi lispdir
+SEMI_LISPDIR?=			${LOCALBASE}/${EMACS_SITE_LISPDIR}
+SEMI_VERSION_SPECIFIC_LISPDIR?=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}
 
 .if (${PORTCLASS} == "master")
 # emacs port setup
@@ -43,6 +46,9 @@ ALL_TARGET?=	elc
 SCRIPTS_ENV+=	TARGETS="${SEMI_SETUPEL}"
 PLIST_SUB+=	SEMIDOCDIR=${SEMIDOCDIR} SEMI_SETUPEL=${SEMI_SETUPEL} \
 		SEMI_COOKIE=${SEMI_COOKIE}
+MAKE_ARGS+=	PREFIX="${LOCALBASE}" \
+		LISPDIR="${SEMI_LISPDIR}" \
+		VERSION_SPECIFIC_LISPDIR="${SEMI_VERSION_SPECIFIC_LISPDIR}"
 
 .include <bsd.port.pre.mk>