aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpav <pav@FreeBSD.org>2004-06-17 02:47:17 +0800
committerpav <pav@FreeBSD.org>2004-06-17 02:47:17 +0800
commit5b6edbe33c971384c6dd2e82eecfedae7de38948 (patch)
treec1989d10835313b64d7be39a19b76c7ec8736600
parent65107443f0bcb56312032f25a4e7cc2489808e8b (diff)
downloadfreebsd-ports-graphics-5b6edbe33c971384c6dd2e82eecfedae7de38948.tar.gz
freebsd-ports-graphics-5b6edbe33c971384c6dd2e82eecfedae7de38948.tar.zst
freebsd-ports-graphics-5b6edbe33c971384c6dd2e82eecfedae7de38948.zip
- Fix plist and unbreak for tamago-emacs20
PR: ports/67957 Submitted by: KIMURA Yasuhiro <yasu@utahime.org>
-rw-r--r--editors/tamago-emacs20/Makefile2
-rw-r--r--editors/tamago-emacs21/Makefile6
-rw-r--r--editors/tamago-emacs21/pkg-plist4
-rw-r--r--editors/tamago/Makefile6
-rw-r--r--editors/tamago/pkg-plist4
5 files changed, 16 insertions, 6 deletions
diff --git a/editors/tamago-emacs20/Makefile b/editors/tamago-emacs20/Makefile
index 1950e28fef5..cb436ebbbc1 100644
--- a/editors/tamago-emacs20/Makefile
+++ b/editors/tamago-emacs20/Makefile
@@ -11,6 +11,4 @@ COMMENT= The Multilingual Input Method - Egg V4 for Emacs20
MASTERDIR= ${.CURDIR}/../tamago
EMACS_PORT_NAME= emacs20
-BROKEN= "Broken pkg-plist"
-
.include "${MASTERDIR}/Makefile"
diff --git a/editors/tamago-emacs21/Makefile b/editors/tamago-emacs21/Makefile
index e8fdaad0e77..02a15a72e00 100644
--- a/editors/tamago-emacs21/Makefile
+++ b/editors/tamago-emacs21/Makefile
@@ -32,6 +32,12 @@ WRKSRC= ${WRKDIR}/egg-4.0.6+0.20020909cvs.orig
ELISPDIR= ${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp
PLIST_SUB= ELISPDIR="${EMACS_LIBDIR_WITH_VER}/site-lisp"
+.if ${EMACS_PORT_NAME} == emacs21
+PLIST_SUB+= HAS_JISX0213=""
+.else
+PLIST_SUB+= HAS_JISX0213="@comment "
+.endif
+
pre-configure:
@${REINPLACE_CMD} -e 's|emacs/site-lisp|${EMACS_NAME}/${EMACS_VER}/site-lisp|g' \
${WRKSRC}/configure
diff --git a/editors/tamago-emacs21/pkg-plist b/editors/tamago-emacs21/pkg-plist
index 6281d8427cc..13ace1a4f0a 100644
--- a/editors/tamago-emacs21/pkg-plist
+++ b/editors/tamago-emacs21/pkg-plist
@@ -34,8 +34,8 @@
%%ELISPDIR%%/egg/its.elc
%%ELISPDIR%%/egg/its/ascii.el
%%ELISPDIR%%/egg/its/ascii.elc
-%%ELISPDIR%%/egg/its/aynu.el
-%%ELISPDIR%%/egg/its/aynu.elc
+%%HAS_JISX0213%%%%ELISPDIR%%/egg/its/aynu.el
+%%HAS_JISX0213%%%%ELISPDIR%%/egg/its/aynu.elc
%%ELISPDIR%%/egg/its/bixing.el
%%ELISPDIR%%/egg/its/bixing.elc
%%ELISPDIR%%/egg/its/erpin.el
diff --git a/editors/tamago/Makefile b/editors/tamago/Makefile
index e8fdaad0e77..02a15a72e00 100644
--- a/editors/tamago/Makefile
+++ b/editors/tamago/Makefile
@@ -32,6 +32,12 @@ WRKSRC= ${WRKDIR}/egg-4.0.6+0.20020909cvs.orig
ELISPDIR= ${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp
PLIST_SUB= ELISPDIR="${EMACS_LIBDIR_WITH_VER}/site-lisp"
+.if ${EMACS_PORT_NAME} == emacs21
+PLIST_SUB+= HAS_JISX0213=""
+.else
+PLIST_SUB+= HAS_JISX0213="@comment "
+.endif
+
pre-configure:
@${REINPLACE_CMD} -e 's|emacs/site-lisp|${EMACS_NAME}/${EMACS_VER}/site-lisp|g' \
${WRKSRC}/configure
diff --git a/editors/tamago/pkg-plist b/editors/tamago/pkg-plist
index 6281d8427cc..13ace1a4f0a 100644
--- a/editors/tamago/pkg-plist
+++ b/editors/tamago/pkg-plist
@@ -34,8 +34,8 @@
%%ELISPDIR%%/egg/its.elc
%%ELISPDIR%%/egg/its/ascii.el
%%ELISPDIR%%/egg/its/ascii.elc
-%%ELISPDIR%%/egg/its/aynu.el
-%%ELISPDIR%%/egg/its/aynu.elc
+%%HAS_JISX0213%%%%ELISPDIR%%/egg/its/aynu.el
+%%HAS_JISX0213%%%%ELISPDIR%%/egg/its/aynu.elc
%%ELISPDIR%%/egg/its/bixing.el
%%ELISPDIR%%/egg/its/bixing.elc
%%ELISPDIR%%/egg/its/erpin.el