Date: Tue, 21 May 2013 03:33:12 +0000 (UTC) From: Hiroki Sato <hrs@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r318638 - in head: . print print/yatex print/yatex-xemacs print/yatex/files Message-ID: <201305210333.r4L3XCmR087399@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: hrs Date: Tue May 21 03:33:12 2013 New Revision: 318638 URL: http://svnweb.freebsd.org/changeset/ports/318638 Log: - Remove obsolete print/yatex-xemacs. - Simplify print/yatex. Added: head/print/yatex/pkg-plist - copied, changed from r317144, head/print/yatex/pkg-plist.emacs Deleted: head/print/yatex-xemacs/ head/print/yatex/files/patch-docs-yahtmle head/print/yatex/files/patch-docs-yahtmlj head/print/yatex/files/patch-docs-yatexe head/print/yatex/files/patch-docs-yatexj head/print/yatex/files/pkg-deinstall.in head/print/yatex/files/pkg-install.in head/print/yatex/pkg-plist.emacs head/print/yatex/pkg-plist.xemacs head/print/yatex/pkg-plist.xemacs-mule Modified: head/MOVED head/print/Makefile head/print/yatex/Makefile head/print/yatex/files/pkg-message.in head/print/yatex/files/yatex-startup.el.in Modified: head/MOVED ============================================================================== --- head/MOVED Tue May 21 02:35:34 2013 (r318637) +++ head/MOVED Tue May 21 03:33:12 2013 (r318638) @@ -4268,3 +4268,4 @@ mail/sendmail-ldap|mail/sendmail|2013-05 databases/innobackup|databases/xtrabackup|2013-05-18|Removed: Use databases/xtrabackup instead audio/gogo-petit||2013-05-20|Has expired: No more public distfiles x11-wm/transset-df|x11-wm/transset|2013-05-20|Project was renamed +print/yatex-xemacs||2013-05-21|Removed: obsolete Modified: head/print/Makefile ============================================================================== --- head/print/Makefile Tue May 21 02:35:34 2013 (r318637) +++ head/print/Makefile Tue May 21 03:33:12 2013 (r318638) @@ -326,6 +326,5 @@ SUBDIR += xpp SUBDIR += xtexsh SUBDIR += yatex - SUBDIR += yatex-xemacs .include <bsd.port.subdir.mk> Modified: head/print/yatex/Makefile ============================================================================== --- head/print/yatex/Makefile Tue May 21 02:35:34 2013 (r318637) +++ head/print/yatex/Makefile Tue May 21 03:33:12 2013 (r318638) @@ -10,129 +10,52 @@ DISTNAME= ${PORTNAME}${PORTVERSION} MAINTAINER= hrs@FreeBSD.org COMMENT= Yet Another LaTeX mode and html mode on Emacs -PKGINSTALL= ${WRKDIR}/pkg-install -PKGDEINSTALL= ${WRKDIR}/pkg-deinstall -PKGMESSAGE= ${WRKDIR}/pkg-message -DESCR= ${PKGDIR}/pkg-descr -WRKSRC= ${WRKDIR}/${PORTNAME}${PORTVERSION} -SUB_FILES= pkg-install pkg-deinstall pkg-message yatex-startup.el -SUB_LIST= TARGETNAME=${TARGETNAME} \ - VERSION=${PORTVERSION} \ - BASENAME=${BASENAME} \ - CAT=${CAT} \ - CP=${CP} \ - ECHO=${ECHO_CMD} \ - GREP=${GREP} \ - RM=${RM} \ - SED=${SED} \ - TOUCH=${TOUCH} \ - DO_NADA=${DO_NADA} \ - INFODIR=${PREFIX}/${INFO_PATH} \ - ELISPDIR=${ELISPDIR} \ - INFOFILES=${INFOFILES} \ - INFONODES="${INFONODES}" \ - INFONODEEXPS="${INFONODEEXPS}" \ - DIRSECTION="${DIRSECTION}" \ - EMACS_NAME=${EMACS_NAME} USE_DOS2UNIX= yes USE_EMACS= yes -EMACS_NO_RUN_DEPENDS=YES -EMACS_MASTERDIR_PKGFILES=YES -EMACS_PACKAGESDIR=${EMACS_LIBDIR}/site-packages - -TARGETNAME= YaTeX -DIRSECTION= The Emacs editor and associated tools - -OPTIONS_DEFINE= DOCS - -.include <bsd.port.pre.mk> +EMACS_NO_RUN_DEPENDS= yes +EMACS_NO_BUILD_DEPENDS= yes +NO_BUILD= yes +PKGMESSAGE= ${WRKDIR}/pkg-message +SUB_FILES= pkg-message yatex-startup.el +SUB_LIST= EMACS_SITE_LISPDIR="${EMACS_SITE_LISPDIR}" -.if (${EMACS_PORT_NAME} == xemacs21) -EMACS_NO_BUILD_DEPENDS= YES -INFO_PATH= ${EMACS_PACKAGESDIR}/info -ELISPDIR= ${PREFIX}/${EMACS_PACKAGESDIR}/lisp -HELPDIR= ${PREFIX}/${EMACS_LIBDIR}/site-lisp -PLIST= ${PKGDIR}/pkg-plist.xemacs -MANIFEST= MANIFEST.yatex -HELP= help/YATEXHLP.eng -INFOFILES= yatexe:yahtmle -INFONODES= YaTeX:yahtml -INFONODEEXPS= Yet Another tex-mode for Emacs.:Yet Another HTML mode. -.elif (${EMACS_PORT_NAME} == xemacs21-mule) -INFO_PATH= ${EMACS_PACKAGESDIR}/info -ELISPDIR= ${PREFIX}/${EMACS_PACKAGESDIR}/lisp -HELPDIR= ${PREFIX}/${EMACS_LIBDIR}/site-lisp -PLIST= ${PKGDIR}/pkg-plist.xemacs-mule -MANIFEST= MANIFEST.yatex -HELP= help/YATEXHLP.jp help/YATEXHLP.eng -PORTDOCS= 00readme readme.meadow.j yatex.new yatexj.tex yatex.ref \ - yahtmlj.tex htmlqa yatexadd.doc yatexgen.doc qanda -INFOFILES= yatexj:yatexe:yahtmlj:yahtmle -INFONODES= YaTeX-jp:YaTeX:yahtml-jp:yahtml -INFONODEEXPS= Yet Another tex-mode for Emacs. (Japanese):Yet Another tex-mode for Emacs.:Yet Another HTML mode. (Japanese):Yet Another HTML mode. -.else -EMACS_NO_BUILD_DEPENDS= YES -PLIST= ${PKGDIR}/pkg-plist.emacs -ELISPDIR= ${PREFIX}/${EMACS_LIBDIR}/site-lisp -HELPDIR= ${ELISPDIR} -HELP= help/YATEXHLP.jp help/YATEXHLP.eng PORTDOCS= 00readme readme.meadow.j yatex.new yatexj.tex yatex.ref \ - yahtmlj.tex htmlqa yatexadd.doc yatexgen.doc qanda -INFOFILES= yatexj:yatexe:yahtmlj:yahtmle -INFONODES= YaTeX-jp:YaTeX:yahtml-jp:yahtml -INFONODEEXPS= Yet Another tex-mode for Emacs. (Japanese):Yet Another tex-mode for Emacs.:Yet Another HTML mode. (Japanese):Yet Another HTML mode. -.endif + yahtmlj.tex htmlqa yatexadd.doc yatexgen.doc qanda \ + yatexe.tex htmlqa.eng yahtmle.tex yatexref.eng qanda.eng +INFO= yahtmle yahtmlj yatexe yatexj -PORTDOCS+= yatexe.tex htmlqa.eng yahtmle.tex yatexref.eng qanda.eng -EL_FILES= comment.el yatex.el yatexadd.el yatexgen.el \ +ELFILES= comment.el yatex.el yatexadd.el yatexgen.el \ yatexenv.el yatexlib.el \ yatexmth.el yatexhks.el yatexhlp.el yatexprc.el \ yatexm-o.el yatexsec.el yatexpkg.el yatexhie.el yahtml.el \ yatex19.el -do-build: - @${DO_NADA} -# For XEmacs, yatexj (a Japanese info file) should be remade. -.if (${EMACS_PORT_NAME} == xemacs21-mule) - cd ${WRKSRC}/docs && \ - ${SETENV} LANG=ja_JP.eucJP ${EMACS_CMD} -no-site-file -no-init-file \ - -batch -l texinfmt -f batch-texinfo-format yatexj.tex -.endif +OPTIONS_DEFINE= DOCS + +.include <bsd.port.options.mk> + +post-extract: + @${INSTALL_DATA} ${WRKSRC}/docs/* ${WRKSRC} do-install: - @${MKDIR} ${ELISPDIR}/yatex ${HELPDIR} ${PREFIX}/${INFO_PATH} + @${MKDIR} ${PREFIX}/${EMACS_SITE_LISPDIR}/yatex cd ${WRKSRC} && \ - ${INSTALL_DATA} ${EL_FILES} ${ELISPDIR}/yatex && \ - ${INSTALL_DATA} ${HELP} ${HELPDIR} -.if (${EMACS_PORT_NAME} == xemacs21) || (${EMACS_PORT_NAME} == xemacs21-mule) - for F in ${INFOFILES:S,:, ,g}; do \ - ${INSTALL_DATA} ${WRKSRC}/docs/$${F} \ - ${PREFIX}/${INFO_PATH}/$${F}.info; \ + ${INSTALL_DATA} ${ELFILES} ${PREFIX}/${EMACS_SITE_LISPDIR}/yatex + ${INSTALL_DATA} \ + ${WRKDIR}/yatex-startup.el \ + ${WRKSRC}/help/YATEXHLP.jp \ + ${WRKSRC}/help/YATEXHLP.eng \ + ${PREFIX}/${EMACS_SITE_LISPDIR} + for F in ${INFO}; do \ + ${INSTALL_DATA} ${WRKSRC}/docs/$$F \ + ${PREFIX}/${INFO_PATH}/$${F}.info; \ done -.else - cd ${WRKSRC}/docs && \ - ${INSTALL_DATA} ${INFOFILES:S,:, ,g} ${PREFIX}/${INFO_PATH} -.endif .if ${PORT_OPTIONS:MDOCS} - ${INSTALL_DATA} ${WRKSRC}/docs/* ${WRKSRC} @${MKDIR} ${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR} .endif post-install: - @${SETENV} TOUCH=${TOUCH} INFODIR=${PREFIX}/${INFO_PATH} \ - ELISPDIR=${ELISPDIR} DIRSECTION="${DIRSECTION}" \ - INFOFILES="${INFOFILES}" \ - ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL - @${INSTALL_DATA} ${WRKDIR}/yatex-startup.el ${ELISPDIR} -.if (${EMACS_PORT_NAME} == xemacs21) || (${EMACS_PORT_NAME} == xemacs21-mule) - @${RM} -f ${WRKDIR}/${MANIFEST} - @${CAT} ${PLIST} | ${GREP} -e "^${EMACS_LIBDIR}" | \ - ${SED} -e "s;^${EMACS_LIBDIR}/;;" > ${WRKDIR}/${MANIFEST} - @${MKDIR} ${PREFIX}/${EMACS_LIBDIR}/site-packages/pkginfo - @${INSTALL_DATA} ${WRKDIR}/${MANIFEST} \ - ${PREFIX}/${EMACS_LIBDIR}/site-packages/pkginfo/ -.endif @${CAT} ${PKGMESSAGE} -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/print/yatex/files/pkg-message.in ============================================================================== --- head/print/yatex/files/pkg-message.in Tue May 21 02:35:34 2013 (r318637) +++ head/print/yatex/files/pkg-message.in Tue May 21 03:33:12 2013 (r318638) @@ -3,9 +3,6 @@ To use YaTeX, add the next line into you (require 'yatex-startup) -where yatex-startup.el is in %%ELISPDIR%%. -Please check the setup file because it has a lot of examples. -To get more information, see the info file of YaTeX: - -Installation:: -Customizations => Lisp variables:: +yatex-startup.el in %%PREFIX%%/%%EMACS_SITE_LISPDIR%% also includes +configuration examples. To get more information, see the info file +of YaTeX. Modified: head/print/yatex/files/yatex-startup.el.in ============================================================================== --- head/print/yatex/files/yatex-startup.el.in Tue May 21 02:35:34 2013 (r318637) +++ head/print/yatex/files/yatex-startup.el.in Tue May 21 03:33:12 2013 (r318638) @@ -2,10 +2,8 @@ ;; -- S. Taoka <taoka@FreeBSD.org> ;; $FreeBSD$ -;;;;;;;;;;; %%TARGETNAME%% (Ver.%%VERSION%%) ;;;;;;;;;;; - (setq load-path (append (list - "%%ELISPDIR%%/yatex" + "%%PREFIX%%/%%EMACS_SITE_LISPDIR%%/yatex" ) load-path)) (setq auto-mode-alist (cons (cons "\\.tex$" 'yatex-mode) auto-mode-alist)) Copied and modified: head/print/yatex/pkg-plist (from r317144, head/print/yatex/pkg-plist.emacs) ============================================================================== --- head/print/yatex/pkg-plist.emacs Thu May 2 19:51:08 2013 (r317144, copy source) +++ head/print/yatex/pkg-plist Tue May 21 03:33:12 2013 (r318638) @@ -1,25 +1,21 @@ @comment $FreeBSD$ -share/emacs/site-lisp/yatex/comment.el -share/emacs/site-lisp/yatex/yahtml.el -share/emacs/site-lisp/yatex/yatex.el -share/emacs/site-lisp/yatex/yatex19.el -share/emacs/site-lisp/yatex/yatexadd.el -share/emacs/site-lisp/yatex/yatexenv.el -share/emacs/site-lisp/yatex/yatexgen.el -share/emacs/site-lisp/yatex/yatexhie.el -share/emacs/site-lisp/yatex/yatexhks.el -share/emacs/site-lisp/yatex/yatexhlp.el -share/emacs/site-lisp/yatex/yatexlib.el -share/emacs/site-lisp/yatex/yatexm-o.el -share/emacs/site-lisp/yatex/yatexmth.el -share/emacs/site-lisp/yatex/yatexprc.el -share/emacs/site-lisp/yatex/yatexsec.el -share/emacs/site-lisp/yatex/yatexpkg.el -share/emacs/site-lisp/yatex-startup.el -share/emacs/site-lisp/YATEXHLP.jp -share/emacs/site-lisp/YATEXHLP.eng -info/yahtmle -info/yahtmlj -info/yatexe -info/yatexj -@dirrm share/emacs/site-lisp/yatex +%%EMACS_SITE_LISPDIR%%/yatex/comment.el +%%EMACS_SITE_LISPDIR%%/yatex/yahtml.el +%%EMACS_SITE_LISPDIR%%/yatex/yatex.el +%%EMACS_SITE_LISPDIR%%/yatex/yatex19.el +%%EMACS_SITE_LISPDIR%%/yatex/yatexadd.el +%%EMACS_SITE_LISPDIR%%/yatex/yatexenv.el +%%EMACS_SITE_LISPDIR%%/yatex/yatexgen.el +%%EMACS_SITE_LISPDIR%%/yatex/yatexhie.el +%%EMACS_SITE_LISPDIR%%/yatex/yatexhks.el +%%EMACS_SITE_LISPDIR%%/yatex/yatexhlp.el +%%EMACS_SITE_LISPDIR%%/yatex/yatexlib.el +%%EMACS_SITE_LISPDIR%%/yatex/yatexm-o.el +%%EMACS_SITE_LISPDIR%%/yatex/yatexmth.el +%%EMACS_SITE_LISPDIR%%/yatex/yatexprc.el +%%EMACS_SITE_LISPDIR%%/yatex/yatexsec.el +%%EMACS_SITE_LISPDIR%%/yatex/yatexpkg.el +@dirrm %%EMACS_SITE_LISPDIR%%/yatex +%%EMACS_SITE_LISPDIR%%/YATEXHLP.jp +%%EMACS_SITE_LISPDIR%%/YATEXHLP.eng +%%EMACS_SITE_LISPDIR%%/yatex-startup.el
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201305210333.r4L3XCmR087399>