From bc71e726b1b9d8dbd5b4ddf7012c80459a7f00d4 Mon Sep 17 00:00:00 2001 From: Satoshi Taoka Date: Thu, 9 Sep 1999 02:36:37 +0000 Subject: Updated to 1.93.4 Submitted by: maintainer Obtained from: private communication --- mail/prom-mew/Makefile | 9 ++++---- mail/prom-mew/distinfo | 2 +- mail/prom-mew/files/byte-compile | 48 +++++++++++++++++++++++----------------- 3 files changed, 34 insertions(+), 25 deletions(-) (limited to 'mail') diff --git a/mail/prom-mew/Makefile b/mail/prom-mew/Makefile index f636116bd4f4..b90242440c89 100644 --- a/mail/prom-mew/Makefile +++ b/mail/prom-mew/Makefile @@ -1,19 +1,20 @@ # New ports collection makefile for: prom-mew -# Version required: 1.93.3 +# Version required: 1.93.4 # Date created: 28 Jun 1999 # Whom: KIRIYAMA Kazuhiko # # $FreeBSD$ # -DISTNAME= prom-mew-1.93.3 +DISTNAME= prom-mew-1.93.4 CATEGORIES= mail elisp MASTER_SITES= http://www02.so-net.ne.jp/~murata/software/pub/ MAINTAINER= kiri@pis.toba-cmt.ac.jp -# This port requires Mew and procmail. But for conveniency, there is NO RUN_DEPNDS -# ediotrs/mew* nor mail/procmail. +# This port requires Mew. But we can't decide which mew to depends, there is +# NO RUN_DEPNDS mail/mew*. +RUN_DEPENDS= procmail:${PORTSDIR}/mail/procmail NO_BUILD= yes diff --git a/mail/prom-mew/distinfo b/mail/prom-mew/distinfo index c46d11ecb6f0..f98e7e33e064 100644 --- a/mail/prom-mew/distinfo +++ b/mail/prom-mew/distinfo @@ -1 +1 @@ -MD5 (prom-mew-1.93.3.tar.gz) = 5fdb5cfbdf5c8787509efd0bca3690c2 +MD5 (prom-mew-1.93.4.tar.gz) = 28b1427ab7a1fbd7397f9a36ef789b46 diff --git a/mail/prom-mew/files/byte-compile b/mail/prom-mew/files/byte-compile index 6f589cb7a25f..bd9a3b7897e1 100644 --- a/mail/prom-mew/files/byte-compile +++ b/mail/prom-mew/files/byte-compile @@ -12,7 +12,7 @@ byte_compile [options] emacs_name port_name [files] emacs_name : should be one of below \"emacs\", \"emacs20\", \"mule\", \"xemacs19\", \"xemacs20\", \"xemacs21\", \"xemacs-mule\" - port_name : port name(replaced *.el when files not specified) + port_name : port name(replaced port_name.el when files not specified) files : *.el files should be compiled" while [ -z "`getopts "l: h" opt > /tmp/${tmprfx}:getopt_err.log`" \ @@ -64,34 +64,43 @@ fi case ${emacs_name} in emacs) - load_path=${PREFIX}/share/emacs/19.34/${load_el} + elispdir=${PREFIX}/share/emacs/site-lisp + load_path=${PREFIX}/share/emacs/site-lisp/${load_el} emacscmd=emacs ;; emacs20) - load_path=${PREFIX}/share/emacs/20.3/${load_el} + elispdir=${PREFIX}/share/emacs/site-lisp + load_path=${PREFIX}/share/emacs/site-lisp/${load_el} emacscmd=emacs20 ;; mule) - load_path=${PREFIX}/share/mule/19.34/${load_el} + elispdir=${PREFIX}/share/mule/site-lisp + load_path=${PREFIX}/share/mule/site-lisp/${load_el} emacscmd=mule ;; xemacs19) - load_path=${PREFIX}/lib/xemacs-19.16/${load_el} + elispdir=${PREFIX}/lib/xemacs/site-lisp + load_path=${PREFIX}/lib/xemacs/site-lisp/${load_el} emacscmd=xemacs ;; xemacs20) - load_path=${PREFIX}/lib/xemacs-20.4/${load_el} + elispdir=${PREFIX}/lib/xemacs/site-lisp + load_path=${PREFIX}/lib/xemacs/site-lisp/${load_el} emacscmd=xemacs ;; xemacs21) - load_path=${PREFIX}/lib/xemacs-21.1.4/${load_el} + elispdir=${PREFIX}/lib/xemacs/site-packages/lisp/${port_name} + load_path=${PREFIX}/lib/xemacs/site-packages/lisp/${load_el} pkg_path=${PREFIX}/lib/xemacs/site-packages emacscmd=xemacs + package_install=yes ;; xemacs-mule) - load_path=${PREFIX}/lib/xemacs/xemacs-packages/lisp/${load_el} + elispdir=${PREFIX}/lib/xemacs/site-packages/lisp/${port_name} + load_path=${PREFIX}/lib/xemacs/site-packages/lisp/${load_el} pkg_path=${PREFIX}/lib/xemacs/site-packages emacscmd=xemacs + package_install=yes ;; *) echo "${Usage}" @@ -101,31 +110,30 @@ esac if [ -n "${load_el}" ]; then echo "(setq load-path (cons \"${load_path}\" load-path))" > /tmp/${tmprfx}:load.el fi -cp ${pkg_path}/pkginfo/MANIFEST.${port_name} ${pkg_path}/pkginfo/MANIFEST.${port_name}.bak for f in ${files}; do if [ -f ${WRKDIR}/${f} ]; then + f_elc=`basename ${f} .el`.elc if [ -n "${load_el}" ]; then ${emacscmd} -batch -l /tmp/${tmprfx}:load.el -q -no-site-file \ -f batch-byte-compile ${WRKDIR}/${f} else ${emacscmd} -batch -q -no-site-file -f batch-byte-compile ${WRKDIR}/${f} fi - if [ $? -eq 0 -a -d ${pkg_path}/lisp/${port_name} ]; then - rm -f ${pkg_path}/lisp/${port_name}/${f}.elc - ln -s ${WRKDIR}/${f}.elc ${pkg_path}/lisp/${port_name}/${f}.elc - cp ${pkg_path}/pkginfo/MANIFEST.${port_name} /tmp/${tmprfx}:tempfile - grep -v "${f}.elc" /tmp/${tmprfx}:tempfile \ - > ${pkg_path}/pkginfo/MANIFEST.${port_name} - echo "lisp/${port_name}/${f}.elc" >> ${pkg_path}/pkginfo/MANIFEST.${port_name} - else + if [ X"${WRKDIR}" != "X${elispdir}" -a -d ${elispdir} ]; then + rm -f ${elispdir}/${f_elc} + ln -sf ${WRKDIR}/${f} ${elispdir}/${f} + install -c -m 444 -g bin -o bin ${WRKDIR}/${f_elc} ${elispdir}/${f_elc} + rm -f ${WRKDIR}/${f_elc} + fi + if [ $? -eq 0 -a -n "${package_install}" -a -d ${elispdir} ]; then cp ${pkg_path}/pkginfo/MANIFEST.${port_name} /tmp/${tmprfx}:tempfile - grep -v "${f}.elc" /tmp/${tmprfx}:tempfile \ + grep -v "${f_elc}" /tmp/${tmprfx}:tempfile \ > ${pkg_path}/pkginfo/MANIFEST.${port_name} - rm -f ${pkg_path}/lisp/${port_name}/${f}.elc + echo "lisp/${port_name}/${f_elc}" >> ${pkg_path}/pkginfo/MANIFEST.${port_name} fi else echo "\"${WRKDIR}/${f}\": file not found!" fi done -rm -f /tmp/${tmprfx}:load.el ${pkg_path}/pkginfo/MANIFEST.${port_name}.bak +rm -f /tmp/${tmprfx}:load.el /tmp/${tmprfx}:tempfile -- cgit v1.2.3