Make use of bsd.emacs.mk and its variables.

4 files changed, 136 insertions, 132 deletions

diff --git a/editors/tamago-emacs21/Makefile b/editors/tamago-emacs21/Makefile
index dfb022614f28..e96df419c9ce 100644
--- a/editors/tamago-emacs21/Makefile
+++ b/editors/tamago-emacs21/Makefile
@@ -19,11 +19,13 @@ RUN_DEPENDS=	emacs-${EMACS_VER}:${PORTSDIR}/editors/emacs20
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
-EMACS_VER=	20.7
-PLIST_SUB=	EMACS_VER=${EMACS_VER}
+EMACS_PORT_NAME?=	emacs20
+
+ELISPDIR=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp
+PLIST_SUB=	ELISPDIR="${EMACS_LIBDIR_WITH_VER}/site-lisp"
 
 pre-configure:
-	@${PERL} -pi -e 's|emacs/site-lisp|emacs/${EMACS_VER}/site-lisp|g' \
+	@${PERL} -pi -e 's|emacs/site-lisp|${EMACS_NAME}/${EMACS_VER}/site-lisp|g' \
 	    ${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/editors/tamago-emacs21/pkg-plist b/editors/tamago-emacs21/pkg-plist
index df6560a244c8..5d0cae4b8901 100644
--- a/editors/tamago-emacs21/pkg-plist
+++ b/editors/tamago-emacs21/pkg-plist
@@ -1,63 +1,63 @@
-share/emacs/%%EMACS_VER%%/site-lisp/egg/egg-cnv.el
-share/emacs/%%EMACS_VER%%/site-lisp/egg/egg-cnv.elc
-share/emacs/%%EMACS_VER%%/site-lisp/egg/egg-com.el
-share/emacs/%%EMACS_VER%%/site-lisp/egg/egg-com.elc
-share/emacs/%%EMACS_VER%%/site-lisp/egg/egg-edep.el
-share/emacs/%%EMACS_VER%%/site-lisp/egg/egg-edep.elc
-share/emacs/%%EMACS_VER%%/site-lisp/egg/egg-mlh.el
-share/emacs/%%EMACS_VER%%/site-lisp/egg/egg-mlh.elc
-share/emacs/%%EMACS_VER%%/site-lisp/egg/egg-sim.el
-share/emacs/%%EMACS_VER%%/site-lisp/egg/egg-sim.elc
-share/emacs/%%EMACS_VER%%/site-lisp/egg/egg-util.el
-share/emacs/%%EMACS_VER%%/site-lisp/egg/egg-util.elc
-share/emacs/%%EMACS_VER%%/site-lisp/egg/egg.el
-share/emacs/%%EMACS_VER%%/site-lisp/egg/egg.elc
-share/emacs/%%EMACS_VER%%/site-lisp/egg/egg/canna.el
-share/emacs/%%EMACS_VER%%/site-lisp/egg/egg/canna.elc
-share/emacs/%%EMACS_VER%%/site-lisp/egg/egg/cannarpc.el
-share/emacs/%%EMACS_VER%%/site-lisp/egg/egg/cannarpc.elc
-share/emacs/%%EMACS_VER%%/site-lisp/egg/egg/sj3.el
-share/emacs/%%EMACS_VER%%/site-lisp/egg/egg/sj3.elc
-share/emacs/%%EMACS_VER%%/site-lisp/egg/egg/sj3rpc.el
-share/emacs/%%EMACS_VER%%/site-lisp/egg/egg/sj3rpc.elc
-share/emacs/%%EMACS_VER%%/site-lisp/egg/egg/wnn.el
-share/emacs/%%EMACS_VER%%/site-lisp/egg/egg/wnn.elc
-share/emacs/%%EMACS_VER%%/site-lisp/egg/egg/wnnrpc.el
-share/emacs/%%EMACS_VER%%/site-lisp/egg/egg/wnnrpc.elc
-share/emacs/%%EMACS_VER%%/site-lisp/egg/eggrc
-share/emacs/%%EMACS_VER%%/site-lisp/egg/its-keydef.el
-share/emacs/%%EMACS_VER%%/site-lisp/egg/its-keydef.elc
-share/emacs/%%EMACS_VER%%/site-lisp/egg/its.el
-share/emacs/%%EMACS_VER%%/site-lisp/egg/its.elc
-share/emacs/%%EMACS_VER%%/site-lisp/egg/its/ascii.el
-share/emacs/%%EMACS_VER%%/site-lisp/egg/its/ascii.elc
-share/emacs/%%EMACS_VER%%/site-lisp/egg/its/bixing.el
-share/emacs/%%EMACS_VER%%/site-lisp/egg/its/bixing.elc
-share/emacs/%%EMACS_VER%%/site-lisp/egg/its/erpin.el
-share/emacs/%%EMACS_VER%%/site-lisp/egg/its/erpin.elc
-share/emacs/%%EMACS_VER%%/site-lisp/egg/its/hangul.el
-share/emacs/%%EMACS_VER%%/site-lisp/egg/its/hangul.elc
-share/emacs/%%EMACS_VER%%/site-lisp/egg/its/hankata.el
-share/emacs/%%EMACS_VER%%/site-lisp/egg/its/hankata.elc
-share/emacs/%%EMACS_VER%%/site-lisp/egg/its/hira.el
-share/emacs/%%EMACS_VER%%/site-lisp/egg/its/hira.elc
-share/emacs/%%EMACS_VER%%/site-lisp/egg/its/jeonkak.el
-share/emacs/%%EMACS_VER%%/site-lisp/egg/its/jeonkak.elc
-share/emacs/%%EMACS_VER%%/site-lisp/egg/its/kata.el
-share/emacs/%%EMACS_VER%%/site-lisp/egg/its/kata.elc
-share/emacs/%%EMACS_VER%%/site-lisp/egg/its/pinyin.el
-share/emacs/%%EMACS_VER%%/site-lisp/egg/its/pinyin.elc
-share/emacs/%%EMACS_VER%%/site-lisp/egg/its/quanjiao.el
-share/emacs/%%EMACS_VER%%/site-lisp/egg/its/quanjiao.elc
-share/emacs/%%EMACS_VER%%/site-lisp/egg/its/thai.el
-share/emacs/%%EMACS_VER%%/site-lisp/egg/its/thai.elc
-share/emacs/%%EMACS_VER%%/site-lisp/egg/its/zenkaku.el
-share/emacs/%%EMACS_VER%%/site-lisp/egg/its/zenkaku.elc
-share/emacs/%%EMACS_VER%%/site-lisp/egg/its/zhuyin.el
-share/emacs/%%EMACS_VER%%/site-lisp/egg/its/zhuyin.elc
-share/emacs/%%EMACS_VER%%/site-lisp/egg/leim-list.el
-share/emacs/%%EMACS_VER%%/site-lisp/egg/menudiag.el
-share/emacs/%%EMACS_VER%%/site-lisp/egg/menudiag.elc
-@dirrm share/emacs/%%EMACS_VER%%/site-lisp/egg/egg
-@dirrm share/emacs/%%EMACS_VER%%/site-lisp/egg/its
-@dirrm share/emacs/%%EMACS_VER%%/site-lisp/egg
+%%ELISPDIR%%/egg/egg-cnv.el
+%%ELISPDIR%%/egg/egg-cnv.elc
+%%ELISPDIR%%/egg/egg-com.el
+%%ELISPDIR%%/egg/egg-com.elc
+%%ELISPDIR%%/egg/egg-edep.el
+%%ELISPDIR%%/egg/egg-edep.elc
+%%ELISPDIR%%/egg/egg-mlh.el
+%%ELISPDIR%%/egg/egg-mlh.elc
+%%ELISPDIR%%/egg/egg-sim.el
+%%ELISPDIR%%/egg/egg-sim.elc
+%%ELISPDIR%%/egg/egg-util.el
+%%ELISPDIR%%/egg/egg-util.elc
+%%ELISPDIR%%/egg/egg.el
+%%ELISPDIR%%/egg/egg.elc
+%%ELISPDIR%%/egg/egg/canna.el
+%%ELISPDIR%%/egg/egg/canna.elc
+%%ELISPDIR%%/egg/egg/cannarpc.el
+%%ELISPDIR%%/egg/egg/cannarpc.elc
+%%ELISPDIR%%/egg/egg/sj3.el
+%%ELISPDIR%%/egg/egg/sj3.elc
+%%ELISPDIR%%/egg/egg/sj3rpc.el
+%%ELISPDIR%%/egg/egg/sj3rpc.elc
+%%ELISPDIR%%/egg/egg/wnn.el
+%%ELISPDIR%%/egg/egg/wnn.elc
+%%ELISPDIR%%/egg/egg/wnnrpc.el
+%%ELISPDIR%%/egg/egg/wnnrpc.elc
+%%ELISPDIR%%/egg/eggrc
+%%ELISPDIR%%/egg/its-keydef.el
+%%ELISPDIR%%/egg/its-keydef.elc
+%%ELISPDIR%%/egg/its.el
+%%ELISPDIR%%/egg/its.elc
+%%ELISPDIR%%/egg/its/ascii.el
+%%ELISPDIR%%/egg/its/ascii.elc
+%%ELISPDIR%%/egg/its/bixing.el
+%%ELISPDIR%%/egg/its/bixing.elc
+%%ELISPDIR%%/egg/its/erpin.el
+%%ELISPDIR%%/egg/its/erpin.elc
+%%ELISPDIR%%/egg/its/hangul.el
+%%ELISPDIR%%/egg/its/hangul.elc
+%%ELISPDIR%%/egg/its/hankata.el
+%%ELISPDIR%%/egg/its/hankata.elc
+%%ELISPDIR%%/egg/its/hira.el
+%%ELISPDIR%%/egg/its/hira.elc
+%%ELISPDIR%%/egg/its/jeonkak.el
+%%ELISPDIR%%/egg/its/jeonkak.elc
+%%ELISPDIR%%/egg/its/kata.el
+%%ELISPDIR%%/egg/its/kata.elc
+%%ELISPDIR%%/egg/its/pinyin.el
+%%ELISPDIR%%/egg/its/pinyin.elc
+%%ELISPDIR%%/egg/its/quanjiao.el
+%%ELISPDIR%%/egg/its/quanjiao.elc
+%%ELISPDIR%%/egg/its/thai.el
+%%ELISPDIR%%/egg/its/thai.elc
+%%ELISPDIR%%/egg/its/zenkaku.el
+%%ELISPDIR%%/egg/its/zenkaku.elc
+%%ELISPDIR%%/egg/its/zhuyin.el
+%%ELISPDIR%%/egg/its/zhuyin.elc
+%%ELISPDIR%%/egg/leim-list.el
+%%ELISPDIR%%/egg/menudiag.el
+%%ELISPDIR%%/egg/menudiag.elc
+@dirrm %%ELISPDIR%%/egg/egg
+@dirrm %%ELISPDIR%%/egg/its
+@dirrm %%ELISPDIR%%/egg
diff --git a/editors/tamago/Makefile b/editors/tamago/Makefile
index dfb022614f28..e96df419c9ce 100644
--- a/editors/tamago/Makefile
+++ b/editors/tamago/Makefile
@@ -19,11 +19,13 @@ RUN_DEPENDS=	emacs-${EMACS_VER}:${PORTSDIR}/editors/emacs20
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
-EMACS_VER=	20.7
-PLIST_SUB=	EMACS_VER=${EMACS_VER}
+EMACS_PORT_NAME?=	emacs20
+
+ELISPDIR=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp
+PLIST_SUB=	ELISPDIR="${EMACS_LIBDIR_WITH_VER}/site-lisp"
 
 pre-configure:
-	@${PERL} -pi -e 's|emacs/site-lisp|emacs/${EMACS_VER}/site-lisp|g' \
+	@${PERL} -pi -e 's|emacs/site-lisp|${EMACS_NAME}/${EMACS_VER}/site-lisp|g' \
 	    ${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/editors/tamago/pkg-plist b/editors/tamago/pkg-plist
index df6560a244c8..5d0cae4b8901 100644
--- a/editors/tamago/pkg-plist
+++ b/editors/tamago/pkg-plist
@@ -1,63 +1,63 @@
-share/emacs/%%EMACS_VER%%/site-lisp/egg/egg-cnv.el
-share/emacs/%%EMACS_VER%%/site-lisp/egg/egg-cnv.elc
-share/emacs/%%EMACS_VER%%/site-lisp/egg/egg-com.el
-share/emacs/%%EMACS_VER%%/site-lisp/egg/egg-com.elc
-share/emacs/%%EMACS_VER%%/site-lisp/egg/egg-edep.el
-share/emacs/%%EMACS_VER%%/site-lisp/egg/egg-edep.elc
-share/emacs/%%EMACS_VER%%/site-lisp/egg/egg-mlh.el
-share/emacs/%%EMACS_VER%%/site-lisp/egg/egg-mlh.elc
-share/emacs/%%EMACS_VER%%/site-lisp/egg/egg-sim.el
-share/emacs/%%EMACS_VER%%/site-lisp/egg/egg-sim.elc
-share/emacs/%%EMACS_VER%%/site-lisp/egg/egg-util.el
-share/emacs/%%EMACS_VER%%/site-lisp/egg/egg-util.elc
-share/emacs/%%EMACS_VER%%/site-lisp/egg/egg.el
-share/emacs/%%EMACS_VER%%/site-lisp/egg/egg.elc
-share/emacs/%%EMACS_VER%%/site-lisp/egg/egg/canna.el
-share/emacs/%%EMACS_VER%%/site-lisp/egg/egg/canna.elc
-share/emacs/%%EMACS_VER%%/site-lisp/egg/egg/cannarpc.el
-share/emacs/%%EMACS_VER%%/site-lisp/egg/egg/cannarpc.elc
-share/emacs/%%EMACS_VER%%/site-lisp/egg/egg/sj3.el
-share/emacs/%%EMACS_VER%%/site-lisp/egg/egg/sj3.elc
-share/emacs/%%EMACS_VER%%/site-lisp/egg/egg/sj3rpc.el
-share/emacs/%%EMACS_VER%%/site-lisp/egg/egg/sj3rpc.elc
-share/emacs/%%EMACS_VER%%/site-lisp/egg/egg/wnn.el
-share/emacs/%%EMACS_VER%%/site-lisp/egg/egg/wnn.elc
-share/emacs/%%EMACS_VER%%/site-lisp/egg/egg/wnnrpc.el
-share/emacs/%%EMACS_VER%%/site-lisp/egg/egg/wnnrpc.elc
-share/emacs/%%EMACS_VER%%/site-lisp/egg/eggrc
-share/emacs/%%EMACS_VER%%/site-lisp/egg/its-keydef.el
-share/emacs/%%EMACS_VER%%/site-lisp/egg/its-keydef.elc
-share/emacs/%%EMACS_VER%%/site-lisp/egg/its.el
-share/emacs/%%EMACS_VER%%/site-lisp/egg/its.elc
-share/emacs/%%EMACS_VER%%/site-lisp/egg/its/ascii.el
-share/emacs/%%EMACS_VER%%/site-lisp/egg/its/ascii.elc
-share/emacs/%%EMACS_VER%%/site-lisp/egg/its/bixing.el
-share/emacs/%%EMACS_VER%%/site-lisp/egg/its/bixing.elc
-share/emacs/%%EMACS_VER%%/site-lisp/egg/its/erpin.el
-share/emacs/%%EMACS_VER%%/site-lisp/egg/its/erpin.elc
-share/emacs/%%EMACS_VER%%/site-lisp/egg/its/hangul.el
-share/emacs/%%EMACS_VER%%/site-lisp/egg/its/hangul.elc
-share/emacs/%%EMACS_VER%%/site-lisp/egg/its/hankata.el
-share/emacs/%%EMACS_VER%%/site-lisp/egg/its/hankata.elc
-share/emacs/%%EMACS_VER%%/site-lisp/egg/its/hira.el
-share/emacs/%%EMACS_VER%%/site-lisp/egg/its/hira.elc
-share/emacs/%%EMACS_VER%%/site-lisp/egg/its/jeonkak.el
-share/emacs/%%EMACS_VER%%/site-lisp/egg/its/jeonkak.elc
-share/emacs/%%EMACS_VER%%/site-lisp/egg/its/kata.el
-share/emacs/%%EMACS_VER%%/site-lisp/egg/its/kata.elc
-share/emacs/%%EMACS_VER%%/site-lisp/egg/its/pinyin.el
-share/emacs/%%EMACS_VER%%/site-lisp/egg/its/pinyin.elc
-share/emacs/%%EMACS_VER%%/site-lisp/egg/its/quanjiao.el
-share/emacs/%%EMACS_VER%%/site-lisp/egg/its/quanjiao.elc
-share/emacs/%%EMACS_VER%%/site-lisp/egg/its/thai.el
-share/emacs/%%EMACS_VER%%/site-lisp/egg/its/thai.elc
-share/emacs/%%EMACS_VER%%/site-lisp/egg/its/zenkaku.el
-share/emacs/%%EMACS_VER%%/site-lisp/egg/its/zenkaku.elc
-share/emacs/%%EMACS_VER%%/site-lisp/egg/its/zhuyin.el
-share/emacs/%%EMACS_VER%%/site-lisp/egg/its/zhuyin.elc
-share/emacs/%%EMACS_VER%%/site-lisp/egg/leim-list.el
-share/emacs/%%EMACS_VER%%/site-lisp/egg/menudiag.el
-share/emacs/%%EMACS_VER%%/site-lisp/egg/menudiag.elc
-@dirrm share/emacs/%%EMACS_VER%%/site-lisp/egg/egg
-@dirrm share/emacs/%%EMACS_VER%%/site-lisp/egg/its
-@dirrm share/emacs/%%EMACS_VER%%/site-lisp/egg
+%%ELISPDIR%%/egg/egg-cnv.el
+%%ELISPDIR%%/egg/egg-cnv.elc
+%%ELISPDIR%%/egg/egg-com.el
+%%ELISPDIR%%/egg/egg-com.elc
+%%ELISPDIR%%/egg/egg-edep.el
+%%ELISPDIR%%/egg/egg-edep.elc
+%%ELISPDIR%%/egg/egg-mlh.el
+%%ELISPDIR%%/egg/egg-mlh.elc
+%%ELISPDIR%%/egg/egg-sim.el
+%%ELISPDIR%%/egg/egg-sim.elc
+%%ELISPDIR%%/egg/egg-util.el
+%%ELISPDIR%%/egg/egg-util.elc
+%%ELISPDIR%%/egg/egg.el
+%%ELISPDIR%%/egg/egg.elc
+%%ELISPDIR%%/egg/egg/canna.el
+%%ELISPDIR%%/egg/egg/canna.elc
+%%ELISPDIR%%/egg/egg/cannarpc.el
+%%ELISPDIR%%/egg/egg/cannarpc.elc
+%%ELISPDIR%%/egg/egg/sj3.el
+%%ELISPDIR%%/egg/egg/sj3.elc
+%%ELISPDIR%%/egg/egg/sj3rpc.el
+%%ELISPDIR%%/egg/egg/sj3rpc.elc
+%%ELISPDIR%%/egg/egg/wnn.el
+%%ELISPDIR%%/egg/egg/wnn.elc
+%%ELISPDIR%%/egg/egg/wnnrpc.el
+%%ELISPDIR%%/egg/egg/wnnrpc.elc
+%%ELISPDIR%%/egg/eggrc
+%%ELISPDIR%%/egg/its-keydef.el
+%%ELISPDIR%%/egg/its-keydef.elc
+%%ELISPDIR%%/egg/its.el
+%%ELISPDIR%%/egg/its.elc
+%%ELISPDIR%%/egg/its/ascii.el
+%%ELISPDIR%%/egg/its/ascii.elc
+%%ELISPDIR%%/egg/its/bixing.el
+%%ELISPDIR%%/egg/its/bixing.elc
+%%ELISPDIR%%/egg/its/erpin.el
+%%ELISPDIR%%/egg/its/erpin.elc
+%%ELISPDIR%%/egg/its/hangul.el
+%%ELISPDIR%%/egg/its/hangul.elc
+%%ELISPDIR%%/egg/its/hankata.el
+%%ELISPDIR%%/egg/its/hankata.elc
+%%ELISPDIR%%/egg/its/hira.el
+%%ELISPDIR%%/egg/its/hira.elc
+%%ELISPDIR%%/egg/its/jeonkak.el
+%%ELISPDIR%%/egg/its/jeonkak.elc
+%%ELISPDIR%%/egg/its/kata.el
+%%ELISPDIR%%/egg/its/kata.elc
+%%ELISPDIR%%/egg/its/pinyin.el
+%%ELISPDIR%%/egg/its/pinyin.elc
+%%ELISPDIR%%/egg/its/quanjiao.el
+%%ELISPDIR%%/egg/its/quanjiao.elc
+%%ELISPDIR%%/egg/its/thai.el
+%%ELISPDIR%%/egg/its/thai.elc
+%%ELISPDIR%%/egg/its/zenkaku.el
+%%ELISPDIR%%/egg/its/zenkaku.elc
+%%ELISPDIR%%/egg/its/zhuyin.el
+%%ELISPDIR%%/egg/its/zhuyin.elc
+%%ELISPDIR%%/egg/leim-list.el
+%%ELISPDIR%%/egg/menudiag.el
+%%ELISPDIR%%/egg/menudiag.elc
+@dirrm %%ELISPDIR%%/egg/egg
+@dirrm %%ELISPDIR%%/egg/its
+@dirrm %%ELISPDIR%%/egg