Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/editors In directory sc8-pr-cvs17:/tmp/cvs-serv17644/10.3/unstable/main/finkinfo/editors
Modified Files: mew.info mew.patch Log Message: Version bumped. Index: mew.patch =================================================================== RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/editors/mew.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- mew.patch 12 May 2007 17:59:59 -0000 1.3 +++ mew.patch 7 Jul 2007 09:12:49 -0000 1.4 @@ -1,7 +1,19 @@ +diff -Naur mew-5.2.orig/mew-pop.el mew-5.2/mew-pop.el +--- mew-5.2.orig/mew-pop.el Thu Jan 1 09:00:00 1970 ++++ mew-5.2/mew-pop.el Mon Mar 14 19:29:36 2005 +@@ -77,7 +77,7 @@ + "Auth'ing" + nil + (mew-pop-secure-p pnm)) +- (if (re-search-forward "<[^<>[EMAIL PROTECTED]<>]+>" nil t) ++ (if (re-search-forward "<[=!-;[EMAIL PROTECTED];?-~]+>" nil t) + (mew-pop-set-key pnm (mew-match-string 0))) + (mew-pop-process-send-string pro "CAPA")) + diff -Naur mew-4.2.orig/fink/mew-install mew-4.2/fink/mew-install --- mew-4.2.orig/fink/mew-install Thu Jan 1 09:00:00 1970 +++ mew-4.2/fink/mew-install Mon Mar 14 19:29:36 2005 -@@ -0,0 +1,156 @@ +@@ -0,0 +1,191 @@ +#!/bin/sh +# @PREFIX@/lib/emacsen-common/packages/install/mew +set -e @@ -23,34 +35,34 @@ + [EMAIL PROTECTED]@/share/emacs/site-lisp/mew [EMAIL PROTECTED]@/share/${FLAVOR}/site-lisp/mew -+FLAGS="-no-site-file -q -batch -l path.el -f batch-byte-compile" ++FLAGS="-no-site-file -q -batch -l __path.el -f batch-byte-compile" + +EMACSEN_MULE=${FLAVOR} +EMACSEN_NOMULE="" + +FLAVOR_SUFFIX=`echo ${FLAVOR} | cut -s -d - -f 2` -+FLAVORTEST=`echo ${FLAVOR} | cut -c-6` ++FLAVORTEST=`echo ${FLAVOR} | sed -e s/^s// | cut -c-6` +if [ "X${FLAVORTEST}" = "Xxemacs" ]; then + FLAVOR_BODY=`echo ${FLAVOR} | cut -d - -f 1` + if [ "X${FLAVOR_SUFFIX}" = "Xmule" ]; then -+ EMACSEN_MULE=`ls @PREFIX@/bin/${FLAVOR_BODY}*-mule* 2>/dev/null | head -1` ++ EMACSEN_MULE=`ls @PREFIX@/bin/${FLAVOR_BODY}*-mule* 2>/dev/null | head -n 1` + if [ -n "${EMACSEN_MULE}" ]; then + EMACSEN_MULE=`basename ${EMACSEN_MULE}` + fi + EMACSEN_NOMULE="" + elif [ "X${FLAVOR_SUFFIX}" = "Xnomule" ]; then + EMACSEN_MULE="" -+ EMACSEN_NOMULE=`ls @PREFIX@/bin/${FLAVOR_BODY}*-nomule* 2>/dev/null | head -1` ++ EMACSEN_NOMULE=`ls @PREFIX@/bin/${FLAVOR_BODY}*-nomule* 2>/dev/null | head -n 1` + if [ -n "${EMACSEN_NOMULE}" ]; then + EMACSEN_NOMULE=`basename ${EMACSEN_NOMULE}` + fi + else + FLAVOR_SUFFIX="" -+ EMACSEN_MULE=`ls @PREFIX@/bin/${FLAVOR}*-mule* 2>/dev/null | head -1` ++ EMACSEN_MULE=`ls @PREFIX@/bin/${FLAVOR}*-mule* 2>/dev/null | head -n 1` + if [ -n "${EMACSEN_MULE}" ]; then + EMACSEN_MULE=`basename ${EMACSEN_MULE}` + fi -+ EMACSEN_NOMULE=`ls @PREFIX@/bin/${FLAVOR}*-nomule* 2>/dev/null | head -1` ++ EMACSEN_NOMULE=`ls @PREFIX@/bin/${FLAVOR}*-nomule* 2>/dev/null | head -n 1` + if [ -n "${EMACSEN_NOMULE}" ]; then + EMACSEN_NOMULE=`basename ${EMACSEN_NOMULE}` + fi @@ -92,29 +104,34 @@ + if [ "X${EMACSEN}" != "X${EMACSEN_MULE}" ]; then + rm -f mew-lang-jp.el mew-mule3.el + fi -+ # files except mew-nmz*.el -+ FILES=`echo *.el | awk '{gsub("mew-nmz[-a-z]*[.]el", ""); print}'` -+ cat << EOF > path.el -+(setq load-path (cons "." load-path) byte-compile-warnings nil) ++ rm -f auxiliary.el ++ FILES=`ls -1 *.el | grep -v '^mew-nmz'` ++ cat << EOF > __path.el ++(setq load-path (cons "." load-path)) ++(setq byte-compile-warnings nil) ++(setq mew-compiling t) +EOF + ${EMACSEN} ${FLAGS} ${FILES} >CompilationLog 2>&1 || abort_install + if [ "X${EMACSEN}" != "X${EMACSEN_MULE}" ]; then + rm -f mew-nmz*.el + else + # compile mew-nmz*.el if possible -+ if [ -e @PREFIX@/share/${FLAVOR}/site-lisp/namazu/namazu.elc ]; then -+ cat << EOF > path.el -+(setq load-path (cons "." (cons "@PREFIX@/share/${FLAVOR}/site-lisp/namazu" load-path)) byte-compile-warnings nil) ++ if [ -e @PREFIX@/share/${FLAVOR}/site-lisp/w3m/w3m-namazu.elc ]; then ++ cat << EOF >> __path.el ++(setq load-path (cons "@PREFIX@/share/${FLAVOR}/site-lisp/w3m" load-path)) +EOF -+ ${EMACSEN} ${FLAGS} mew-nmz.el mew-nmz-*.el >>CompilationLog 2>&1 || abort_install ++ ${EMACSEN} ${FLAGS} mew-nmz*.el >>CompilationLog 2>&1 || abort_install + rm -f mew-nmz*.el + else + rm -f mew-nmz*.el + ln -sf ${ELDIR}/mew-nmz*.el . + ln -sf ${ELDIR}/contrib/mew-nmz*.el . ++ rm -f 'mew-nmz*.el' + fi + fi -+ rm -f ${FILES} path.el ++ rm -f etc ++ ln -sf ${ELDIR}/etc . ++ rm -f ${FILES} __path.el + ( for d in "${ELDIR}" "${ELDIR}/contrib"; do + if [ -d ${d} ]; then + cd ${d} @@ -126,10 +143,10 @@ + fi + done + ) -+ gzip -9 ${ELCDIR}/CompilationLog -+ chmod 644 ${ELCDIR}/CompilationLog.gz -+ if [ -f ${ELCDIR}/mew.elc ]; then -+ chmod 644 ${ELCDIR}/*.elc ++ gzip -9 CompilationLog ++ chmod 644 CompilationLog.gz ++ if [ -f mew.elc ]; then ++ chmod 644 *.elc + echo "${VERSION}" > ${STAMP} + chmod 644 ${STAMP} + COMPILED=yes @@ -147,12 +164,42 @@ +done + +if [ "X${COMPILED}" = Xyes ]; then -+ # recompile mhc for mhc-mew -+ pkg=mhc -+ if [ -d @PREFIX@/share/${FLAVOR}/site-lisp/${pkg} ]; then -+ if [ -f @PREFIX@/lib/emacsen-common/packages/install/${pkg} ]; then -+ @PREFIX@/lib/emacsen-common/packages/remove/${pkg} ${FLAVOR} -+ @PREFIX@/lib/emacsen-common/packages/install/${pkg} ${FLAVOR} ++ RECOMPILE_MHC=no ++ RECOMPILE_W3MEL=no ++ if [ -d @PREFIX@/share/${FLAVOR}/site-lisp/mhc ]; then ++ RECOMPILE_MHC=yes ++ fi ++ if [ -d @PREFIX@/share/${FLAVOR}/site-lisp/w3m ]; then ++ RECOMPILE_W3MEL=yes ++ fi ++ if [ "X${RECOMPILE_MHC}" = Xyes ]; then ++ # remove mhc before removing emacs-w3m to prevent redundant byte-compiling ++ pkg=mhc ++ [EMAIL PROTECTED]@/lib/emacsen-common/packages/remove/${pkg} ++ if [ -f ${f} ]; then ++ ${f} ${FLAVOR} ++ fi ++ fi ++ if [ "X${RECOMPILE_W3MEL}" = Xyes ]; then ++ pkg=emacs-w3m ++ [EMAIL PROTECTED]@/lib/emacsen-common/packages/remove/${pkg} ++ if [ -f ${f} ]; then ++ ${f} ${FLAVOR} ++ fi ++ # install emacs-w3m before installing mhc to prevent redundant byte-compiling ++ pkg=emacs-w3m ++ [EMAIL PROTECTED]@/lib/emacsen-common/packages/install/${pkg} ++ if [ -f ${f} ]; then ++ ${f} ${FLAVOR} ++ fi ++ fi ++ if [ "X${RECOMPILE_MHC}" = Xyes ]; then ++ pkg=mhc ++ if [ ! -d @PREFIX@/share/${FLAVOR}/site-lisp/${pkg} ]; then ++ [EMAIL PROTECTED]@/lib/emacsen-common/packages/install/${pkg} ++ if [ -f ${f} ]; then ++ ${f} ${FLAVOR} ++ fi + fi + fi +fi @@ -184,8 +231,8 @@ diff -Naur mew-4.2.orig/fink/mew-startup mew-4.2/fink/mew-startup --- mew-4.2.orig/fink/mew-startup Thu Jan 1 09:00:00 1970 +++ mew-4.2/fink/mew-startup Thu Mar 24 16:13:05 2005 -@@ -0,0 +1,36 @@ -+;;; 50mew.el --- Debian mew startup file -*-mode: emacs-lisp;-*- +@@ -0,0 +1,39 @@ ++;;; 50mew.el --- Fink mew startup file -*-mode: emacs-lisp;-*- + +;;; Code: + @@ -212,11 +259,14 @@ + 'mew-send-hook)) + (autoload 'mew "mew" nil t) + (autoload 'mew-send "mew" nil t) ++ (if (featurep 'xemacs) ++ (eval-after-load "mew" '(require 'timer))) + (setq mew-icon-directory "@PREFIX@/share/pixmaps/mew") + (if (file-executable-p "@PREFIX@/sbin/stunnel4") + (setq mew-prog-ssl "@PREFIX@/sbin/stunnel4") + (setq mew-prog-ssl "@PREFIX@/sbin/stunnel")) -+ (setq mew-icon-directory "@PREFIX@/share/pixmaps/mew") ++ (setq mew-ssl-cert-directory "@PREFIX@/etc/ssl/certs") ++ (setq mew-ssl-verify-level 2) + ;; + )) + Index: mew.info =================================================================== RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/editors/mew.info,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- mew.info 12 May 2007 17:59:59 -0000 1.6 +++ mew.info 7 Jul 2007 09:12:49 -0000 1.7 @@ -1,22 +1,21 @@ Package: mew -Version: 4.2 -Revision: 7 +Version: 5.2 +Revision: 1 BuildDepends: fink (>= 0.24.12) Depends: %N-bin (= %v-%r), emacsen Provides: mail-reader, imap-client, news-reader -Suggests: gnupg, stunnel4 | stunnel, w3m-el, wv, compface, netpbm, mu-cite, mule-ucs, mhc +Suggests: emacs-w3m, gnupg, wv2, compface, netpbm, mu-cite, mule-ucs, bogofilter, mhc Source: http://www.Mew.org/Release/%n-%v.tar.gz -Source-MD5: 713e45d6358330309414adbaad3944f5 +Source-MD5: be0ac05179daed9b7c1329c9264d0f17 PatchFile: %n.patch -PatchFile-MD5: 39b3b6a6db89a366d295f352b2fa5d0e +PatchFile-MD5: 65920282a69b61e91153b52fd694d045 PatchScript: << sed 's|@PREFIX@|%p|g' < %{PatchFile} | sed 's|@VERSION@|%v-%r|g' | patch -p1 << ConfigureParams:--infodir='${prefix}/share/info' --mandir='${prefix}/share/man' CompileScript: << ./configure %c - make bin info jinfo - rm info/*~ + make bin << InstallScript: << make install-bin install-etc prefix=%i etcdir=%i/share/pixmaps/mew @@ -40,6 +39,8 @@ install -m 755 -d %i/lib/emacsen-common/packages/{install,remove} install -m 755 fink/%n-install %i/lib/emacsen-common/packages/install/%n install -m 755 fink/%n-remove %i/lib/emacsen-common/packages/remove/%n + +ln -s ../../../pixmaps/mew %i/share/emacs/site-lisp/mew/etc << InfoDocs: mew.info mew.jis.info PostInstScript: << @@ -56,6 +57,8 @@ SplitOff: << Package: %N-bin Depends: emacsen-common + Recommends: stunnel4 | stunnel, ca-roots + Enhances: mew Files: bin share/man/man1 DocFiles: 00api 00changes* 00copyright* 00diff 00readme* 00roadmap << @@ -71,6 +74,6 @@ and icon-based interface are supported. More information is available at http://www.Mew.org/ << -License: Restrictive/Distributable +License: BSD Maintainer: Todai Fink Team <[EMAIL PROTECTED]> Homepage: http://www.Mew.org/ ------------------------------------------------------------------------- This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits