aboutsummaryrefslogtreecommitdiff
path: root/print
diff options
context:
space:
mode:
authorSatoshi Taoka <taoka@FreeBSD.org>2000-09-18 02:05:45 +0000
committerSatoshi Taoka <taoka@FreeBSD.org>2000-09-18 02:05:45 +0000
commit17450f8b8350d257c705ad3fb7e72359c9e636b9 (patch)
treeb99112f0b91446ed7a6359f8f0e9f434d08d7478 /print
parent6848777e4b42c12a8c2b580869fe438b755b50ea (diff)
downloadports-17450f8b8350d257c705ad3fb7e72359c9e636b9.tar.gz
ports-17450f8b8350d257c705ad3fb7e72359c9e636b9.zip
Notes
Diffstat (limited to 'print')
-rw-r--r--print/yatex-mule/Makefile3
-rw-r--r--print/yatex-xemacs-mule/Makefile3
-rw-r--r--print/yatex-xemacs-mule/pkg-comment2
-rw-r--r--print/yatex-xemacs/Makefile3
-rw-r--r--print/yatex-xemacs/pkg-comment2
-rw-r--r--print/yatex/Makefile68
-rw-r--r--print/yatex/files/DEINSTALL.tmpl2
-rw-r--r--print/yatex/files/INSTALL.tmpl4
-rw-r--r--print/yatex/pkg-comment2
9 files changed, 40 insertions, 49 deletions
diff --git a/print/yatex-mule/Makefile b/print/yatex-mule/Makefile
index d95dee01c06c..04be33a5be9d 100644
--- a/print/yatex-mule/Makefile
+++ b/print/yatex-mule/Makefile
@@ -7,9 +7,8 @@
PKGNAMESUFFIX= -mule
-MULE= yes
-
MASTERDIR= ${.CURDIR}/../yatex
COMMENT= ${.CURDIR}/pkg/COMMENT
+EMACS_PORT_NAME=mule
.include "${MASTERDIR}/Makefile"
diff --git a/print/yatex-xemacs-mule/Makefile b/print/yatex-xemacs-mule/Makefile
index d2bd2830b94e..d46594d109ab 100644
--- a/print/yatex-xemacs-mule/Makefile
+++ b/print/yatex-xemacs-mule/Makefile
@@ -7,9 +7,8 @@
PKGNAMESUFFIX= -xemacs-mule
-XEMACS-MULE= yes
-
MASTERDIR= ${.CURDIR}/../yatex
COMMENT= ${.CURDIR}/pkg/COMMENT
+EMACS_PORT_NAME=xemacs21-mule
.include "${MASTERDIR}/Makefile"
diff --git a/print/yatex-xemacs-mule/pkg-comment b/print/yatex-xemacs-mule/pkg-comment
index 166897be6a9b..2f8b3092f31f 100644
--- a/print/yatex-xemacs-mule/pkg-comment
+++ b/print/yatex-xemacs-mule/pkg-comment
@@ -1 +1 @@
-Yet Another LaTeX mode and html mode on Emacs (for XEmacs-mule)
+Yet Another LaTeX mode and html mode on Emacs (for XEmacs21-mule)
diff --git a/print/yatex-xemacs/Makefile b/print/yatex-xemacs/Makefile
index a6d2245eefd7..0d6e9c346456 100644
--- a/print/yatex-xemacs/Makefile
+++ b/print/yatex-xemacs/Makefile
@@ -7,9 +7,8 @@
PKGNAMESUFFIX= -xemacs
-XEMACS= yes
-
MASTERDIR= ${.CURDIR}/../yatex
COMMENT= ${.CURDIR}/pkg/COMMENT
+EMACS_PORT_NAME=xemacs21
.include "${MASTERDIR}/Makefile"
diff --git a/print/yatex-xemacs/pkg-comment b/print/yatex-xemacs/pkg-comment
index 6e01cc0e1974..afdc8b01ea85 100644
--- a/print/yatex-xemacs/pkg-comment
+++ b/print/yatex-xemacs/pkg-comment
@@ -1 +1 @@
-Yet Another LaTeX mode and html mode on Emacs (for XEmacs19, XEmacs20)
+Yet Another LaTeX mode and html mode on Emacs (for XEmacs21)
diff --git a/print/yatex/Makefile b/print/yatex/Makefile
index 467f3592afce..08c49577aead 100644
--- a/print/yatex/Makefile
+++ b/print/yatex/Makefile
@@ -13,43 +13,46 @@ DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= taoka@FreeBSD.org
-.if defined(XEMACS-MULE)
-BUILD_DEPENDS= xemacs:${PORTSDIR}/japanese/xemacs21-canna \
- {LOCALBASE}/${EMACS_PACKAGESDIR}/../xemacs-packages/lisp/texinfo/texinfmt.el:${PORTSDIR}/editors/xemacs-packages \
- nkf:${PORTSDIR}/japanese/nkf
-.endif
PKGINSTALL= ${WRKDIR}/INSTALL
PKGDEINSTALL= ${WRKDIR}/DEINSTALL
PKGMESSAGE= ${WRKDIR}/MESSAGE
VERSION= 1.67
TARGETNAME= YaTeX
DIRSECTION= The Emacs editor and associated tools
+EMACS_PORT_NAME?=emacs20
+.if (${EMACS_PORT_NAME} == xemacs21-mule)
+BUILD_DEPENDS= xemacs:${PORTSDIR}/japanese/xemacs21-canna \
+ {LOCALBASE}/${EMACS_PACKAGESDIR}/../xemacs-packages/lisp/texinfo/texinfmt.el:${PORTSDIR}/editors/xemacs-packages \
+ nkf:${PORTSDIR}/japanese/nkf
+.endif
+EMACS_PACKAGESDIR=${EMACS_LIBDIR}/site-packages
# Note that 'INFODIR' is defined in bsd.info.mk
-.if defined(XEMACS)
-EMACS= xemacs
-EMACSDIR= ${PREFIX}/lib/xemacs/site-packages
-INFODIR= ${EMACSDIR}/info
+.if (${EMACS_PORT_NAME} == xemacs21)
+INFODIR= ${PREFIX}/${EMACS_PACKAGESDIR}/info
+ELISPDIR= ${PREFIX}/${EMACS_PACKAGESDIR}/lisp
+HELPDIR= ${PREFIX}/${EMACS_LIBDIR}/site-lisp
PLIST= ${PKGDIR}/PLIST.xemacs
MANIFEST= MANIFEST.yatex
-.elif defined(XEMACS-MULE)
-EMACS= xemacs
-EMACSDIR= ${PREFIX}/lib/xemacs/site-packages
-INFODIR= ${EMACSDIR}/info
+.elif (${EMACS_PORT_NAME} == xemacs21-mule)
+INFODIR= ${PREFIX}/${EMACS_PACKAGESDIR}/info
+ELISPDIR= ${PREFIX}/${EMACS_PACKAGESDIR}/lisp
+HELPDIR= ${PREFIX}/${EMACS_LIBDIR}/site-lisp
PLIST= ${PKGDIR}/PLIST.xemacs-mule
MANIFEST= MANIFEST.yatex
-.elif defined(MULE)
-EMACS= mule
-EMACSDIR= ${PREFIX}/share/mule
+.elif (${EMACS_PORT_NAME} == mule)
INFODIR= ${PREFIX}/info
PLIST= ${PKGDIR}/PLIST.mule
+ELISPDIR= ${PREFIX}/${EMACS_LIBDIR}/site-lisp
+HELPDIR= ${ELISPDIR}
.else
-EMACS= emacs
-EMACSDIR= ${PREFIX}/share/emacs
INFODIR= ${PREFIX}/info
PLIST= ${PKGDIR}/PLIST.emacs
+ELISPDIR= ${PREFIX}/${EMACS_LIBDIR}/site-lisp
+HELPDIR= ${ELISPDIR}
.endif
-.if defined(XEMACS)
+PORTSDOCDIR= ${PREFIX}/share/doc/yatex
+.if (${EMACS_PORT_NAME} == xemacs21)
NEW=
HELP= help/YATEXHLP.eng
INFOFILES= yatexe
@@ -70,14 +73,6 @@ INFONODEEXPS= Yet Another tex-mode for Emacs. (Japanese):Yet Another tex-mode fo
DOCSRC+= docs/yatexe.tex \
docs/yatexref.eng \
docs/qanda.eng
-.if defined(XEMACS) || defined(XEMACS-MULE)
-ELISPDIR= ${EMACSDIR}/lisp
-HELPDIR= ${EMACSDIR}/../site-lisp
-.else
-ELISPDIR= ${EMACSDIR}/site-lisp
-HELPDIR= ${ELISPDIR}
-.endif
-PORTSDOCDIR= ${PREFIX}/share/doc/yatex
EL_FILES= comment.el yatex.el yatexadd.el yatexgen.el \
yatexenv.el yatexlib.el \
yatexmth.el yatexhks.el yatexhlp.el yatexprc.el \
@@ -104,17 +99,17 @@ do-build:
-e 's,%%INFONODES%%,${INFONODES},g' \
-e 's,%%INFONODEEXPS%%,${INFONODEEXPS},g' \
-e 's,%%DIRSECTION%%,${DIRSECTION},g' \
- -e 's,%%EMACS%%,${EMACS},g' \
+ -e 's,%%EMACS_NAME%%,${EMACS_NAME},g' \
< ${FILESDIR}/$${file}.tmpl > ${WRKDIR}/$${file}; \
done
# For XEmacs-mule 20.4, yatexj.info (in Japanese) should be remade
# after Kanji code of yatexj.tex is convert from shift jis (MS-Kanji)
# to EUC.
-.if defined(XEMACS-MULE)
+.if (${EMACS_PORT_NAME} == xemacs21-mule)
(cd ${WRKSRC}/docs; \
${MV} yatexj.tex yatexj.tex.org; \
nkf -e yatexj.tex.org > yatexj.tex; \
- ${SETENV} LANG=ja_JP.EUC ${EMACS} -no-site-file -no-init-file \
+ ${SETENV} LANG=ja_JP.EUC ${EMACS_CMD} -no-site-file -no-init-file \
-batch -l texinfmt -f batch-texinfo-format yatexj.tex; \
)
.endif
@@ -126,7 +121,7 @@ do-install:
${INSTALL_DATA} ${EL_FILES} ${ELISPDIR}/yatex; \
${INSTALL_DATA} ${HELP} ${HELPDIR}; \
${MKDIR} ${INFODIR}
-.if defined(XEMACS) || defined(XEMACS-MULE)
+.if (${EMACS_PORT_NAME} == xemacs21) || (${EMACS_PORT_NAME} == xemacs21-mule)
cd ${WRKSRC}; \
for file in `${ECHO} ${INFOFILES} | ${SED} "s,:, ,g"`; do \
${INSTALL_DATA} ${WRKSRC}/docs/$${file} ${INFODIR}/$${file}.info; \
@@ -149,14 +144,13 @@ post-install:
${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
@${INSTALL_DATA} ${WRKDIR}/yatex-startup.el ${ELISPDIR}
@${CAT} ${PKGMESSAGE}
-.if defined(XEMACS) || defined(XEMACS-MULE)
+.if (${EMACS_PORT_NAME} == xemacs21) || (${EMACS_PORT_NAME} == xemacs21-mule)
${RM} -f ${WRKDIR}/${MANIFEST}
- emacsdir=`${ECHO} ${EMACSDIR} | ${SED} -e "s;^${PREFIX}/;;"`; \
- ${CAT} ${PLIST} | ${GREP} -e "^$${emacsdir}" | \
- ${SED} -e "s;^$${emacsdir}/;;" > ${WRKDIR}/${MANIFEST}
- ${MKDIR} ${EMACSDIR}/pkginfo
+ ${CAT} ${PLIST} | ${GREP} -e "^${EMACS_LIBDIR}" | \
+ ${SED} -e "s;^${EMACS_LIBDIR}/;;" > ${WRKDIR}/${MANIFEST}
+ ${MKDIR} ${PREFIX}/${EMACS_LIBDIR}/site-packages/pkginfo
${INSTALL_DATA} ${WRKDIR}/${MANIFEST} \
- ${EMACSDIR}/pkginfo/
+ ${PREFIX}/${EMACS_LIBDIR}/site-packages/pkginfo/
.endif
.include <bsd.port.mk>
diff --git a/print/yatex/files/DEINSTALL.tmpl b/print/yatex/files/DEINSTALL.tmpl
index 3691c577f747..a5fb17959c23 100644
--- a/print/yatex/files/DEINSTALL.tmpl
+++ b/print/yatex/files/DEINSTALL.tmpl
@@ -11,7 +11,7 @@ SED=${SED:-%%SED%%}
infodir=${INFODIR:-%%INFODIR%%}
infofiles=${INFOFILES:-%%INFOFILES%%}
-if [ "X$2" = X"DEINSTALL" -a %%EMACS%% != xemacs ]; then
+if [ "X$2" = X"DEINSTALL" -a %%EMACS_NAME%% != xemacs ]; then
${ECHO} "Deleting entry for \"${pkgname}\" from ${infodir}/dir"
for file in `echo ${infofiles} | ${SED} "s,:, ,g"`; do
install-info --delete ${infodir}/${file} ${infodir}/dir
diff --git a/print/yatex/files/INSTALL.tmpl b/print/yatex/files/INSTALL.tmpl
index 6b343f1846df..1a7b39c38195 100644
--- a/print/yatex/files/INSTALL.tmpl
+++ b/print/yatex/files/INSTALL.tmpl
@@ -28,7 +28,7 @@ if [ "X$2" = X"POST-INSTALL" ]; then
break
fi
file=`${ECHO} ${infofiles} | ${CUT} -d : -f $count`
- if [ X%%EMACS%% = Xxemacs ]; then
+ if [ X%%EMACS_NAME%% = Xxemacs ]; then
file=${file}.info
fi
nodename=`${ECHO} ${infonodes} | ${CUT} -d : -f $count`
@@ -43,7 +43,7 @@ if [ "X$2" = X"POST-INSTALL" ]; then
fi
count=`${EXPR} $count + 1`
done
- if [ X%%EMACS%% != Xxemacs ]; then
+ if [ X%%EMACS_NAME%% != Xxemacs ]; then
${ECHO} "Adding entry for \"${pkgname}\" to ${infodir}/dir"
for file in `${ECHO} ${infofiles} | ${SED} "s,:, ,g"`; do
install-info ${infodir}/${file} ${infodir}/dir
diff --git a/print/yatex/pkg-comment b/print/yatex/pkg-comment
index 143020537968..048dedbc1198 100644
--- a/print/yatex/pkg-comment
+++ b/print/yatex/pkg-comment
@@ -1 +1 @@
-Yet Another LaTeX mode and html mode on Emacs (for Emacs19, Emacs20)
+Yet Another LaTeX mode and html mode on Emacs (for Emacs{19,20} and XEmacs{19,20})