Date: Mon, 11 May 1998 20:51:16 +0900 (JST) From: KIRIYAMA Kazuhiko <kiri@kiri.toba-cmt.ac.jp> To: FreeBSD-gnats-submit@FreeBSD.ORG Subject: ports/6588: Update ports: mew-1.92.4 Message-ID: <199805111151.UAA04908@kiri.toba-cmt.ac.jp>
next in thread | raw e-mail | index | archive | help
>Number: 6588
>Category: ports
>Synopsis: Update ports: mew-1.92.4.
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: support
>Submitter-Id: current-users
>Arrival-Date: Mon May 11 04:50:00 PDT 1998
>Last-Modified:
>Originator: Kazuhiko Kiriyama
>Organization:
Toba National College of Maritime Technology.
Department of Electronic Mechanical Engineering
>Release: FreeBSD 3.0-CURRENT i386
>Environment:
>Description:
I've updated the port mew-1.92.4 which I recentry
updated(ports/6533). Please patch after ports/6533's patch
applied.
Current modifications is
(1) Info in english would be installed with default.
Update files are respecively
[Update] :
mail/mew/Makefile
mail/mew-common/Makefile
mail/mew-common/files/DEINSTALL.tmpl
mail/mew-common/files/INSTALL.tmpl
mail/mew-common/pkg/PLIST-ja-xemacs
mail/mew-mule/Makefile
mail/mew-xemacs/Makefile
japanese/mew-xemacs/Makefile
I put the diff from already send-pr ports/6533 in "Fix:".
>How-To-Repeat:
>Fix:
diff -urN submitted/mail/mew/Makefile mail/mew/Makefile
--- submitted/mail/mew/Makefile Mon May 11 14:46:24 1998
+++ mail/mew/Makefile Fri May 8 00:51:31 1998
@@ -10,7 +10,7 @@
EMACS= yes
-DIRENTRY= "* Mew:: Messaging in the Emacs World."
+DIRENTRY= "* Mew: (mew): Messaging in the Emacs World."
INFOFILE= mew.info
.include "${.CURDIR}/../../mail/mew-common/Makefile"
diff -urN submitted/mail/mew-common/Makefile mail/mew-common/Makefile
--- submitted/mail/mew-common/Makefile Mon May 11 14:46:24 1998
+++ mail/mew-common/Makefile Fri May 8 01:00:21 1998
@@ -61,8 +61,9 @@
MKDIR="${MKDIR}" MV=${MV} RM=${RM} SED=${SED} TOUCH=${TOUCH} \
PKGDIR=${PKGDIR} PKGLDIR=${PKGLDIR} INFODIR=${INFODIR} \
EMACSDIR=${EMACSDIR} ELISPDIR=${ELISPDIR} SAMPLEDIR=${SAMPLEDIR} \
- INFOFILE=${INFOFILE} DEFAULTFILE=${DEFAULTFILE} SITESTARTFILE=${SITESTARTFILE} \
- DIRENTRY=${DIRENTRY} DIRSECTION="${DIRSECTION}" VERSION=${VERSION} \
+ INFOFILE="${INFOFILE}" DEFAULTFILE=${DEFAULTFILE} \
+ SITESTARTFILE=${SITESTARTFILE} \
+ DIRENTRY='${DIRENTRY}' DIRSECTION="${DIRSECTION}" VERSION=${VERSION} \
LANGUAGE=${LANGUAGE} EMACS=${EMACS} EMACSCMD=${EMACSCMD} \
TMPL_FILES="${TMPL_FILES}"
MAKE_ENV= EMACSCMD=${EMACSCMD} ELISPDIR=${ELISPDIR}/mew RM=${RM} \
diff -urN submitted/mail/mew-common/files/DEINSTALL.tmpl mail/mew-common/files/DEINSTALL.tmpl
--- submitted/mail/mew-common/files/DEINSTALL.tmpl Mon May 11 14:46:25 1998
+++ mail/mew-common/files/DEINSTALL.tmpl Mon May 11 14:23:09 1998
@@ -6,7 +6,7 @@
SED=%%SED%%
INFODIR=%%INFODIR%%
-INFOFILE=%%INFOFILE%%
+INFOFILE="%%INFOFILE%%"
DEFAULTFILE=%%DEFAULTFILE%%
SITESTARTFILE=%%SITESTARTFILE%%
ELISPDIR=%%ELISPDIR%%
@@ -18,19 +18,24 @@
OptionEnd=";;; End of Mew configuration options"
if [ "X$2" = X"DEINSTALL" ]; then
- ${ECHO} "Deleting \"Mew\" entry from ${INFODIR}/dir"
- if [ ! "`${GREP} \"START-INFO-DIR-ENTRY\" ${INFODIR}/${INFOFILE}`" ]; then
- install-info --delete --section="${DIRSECTION}" \
- --entry="${DIRENTRY}" ${INFODIR}/${INFOFILE} ${INFODIR}/dir
+ ${ECHO} "Deleting \"Mew\" entry from ${INFODIR}/dir"
+ entry=${DIRENTRY}
+ for f in ${INFOFILE}; do
+ if [ ! "`${GREP} \"START-INFO-DIR-ENTRY\" ${INFODIR}/${f}`" ]; then
+ e=`${ECHO} "${entry}" | ${SED} -e 's/^"\([^"]*\)".*$/\1/'`
+ install-info --delete --section="${DIRSECTION}" \
+ --entry="${e}" ${INFODIR}/${f} ${INFODIR}/dir
else
- install-info --delete ${INFODIR}/${INFOFILE} ${INFODIR}/dir
- fi
- if [ "`${GREP} \"^${OptionStart}\" ${ELISPDIR}/${SITESTARTFILE}`" ]; then
- ${ECHO} "Deleting \"Mew\" entry from ${ELISPDIR}/${SITESTARTFILE}"
- ${SED} -e "/^${OptionStart}/,/^${OptionEnd}/d" \
- ${ELISPDIR}/${SITESTARTFILE} > ${ELISPDIR}/${SITESTARTFILE}.bak
- ${MV} ${ELISPDIR}/${SITESTARTFILE}.bak ${ELISPDIR}/${SITESTARTFILE}
+ install-info --delete ${INFODIR}/${f} ${INFODIR}/dir
fi
+ entry=`${ECHO} "${entry}" | ${SED} -e 's/^"\([^"]*\)" *//'`
+ done
+ if [ "`${GREP} \"^${OptionStart}\" ${ELISPDIR}/${SITESTARTFILE}`" ]; then
+ ${ECHO} "Deleting \"Mew\" entry from ${ELISPDIR}/${SITESTARTFILE}"
+ ${SED} -e "/^${OptionStart}/,/^${OptionEnd}/d" \
+ ${ELISPDIR}/${SITESTARTFILE} > ${ELISPDIR}/${SITESTARTFILE}.bak
+ ${MV} ${ELISPDIR}/${SITESTARTFILE}.bak ${ELISPDIR}/${SITESTARTFILE}
+ fi
else
- exit 0
+ exit 0
fi
diff -urN submitted/mail/mew-common/files/INSTALL.tmpl mail/mew-common/files/INSTALL.tmpl
--- submitted/mail/mew-common/files/INSTALL.tmpl Mon May 11 14:46:25 1998
+++ mail/mew-common/files/INSTALL.tmpl Mon May 11 14:22:42 1998
@@ -8,7 +8,7 @@
TOUCH=%%TOUCH%%
INFODIR=%%INFODIR%%
-INFOFILE=%%INFOFILE%%
+INFOFILE="%%INFOFILE%%"
DEFAULTFILE=%%DEFAULTFILE%%
SITESTARTFILE=%%SITESTARTFILE%%
EMACSDIR=%%EMACSDIR%%
@@ -22,46 +22,51 @@
OptionEnd=";;; End of Mew configuration options"
if [ "X$2" = X"POST-INSTALL" ]; then
- if [ ! -f ${ELISPDIR}/${SITESTARTFILE} ]; then
+ if [ ! -f ${ELISPDIR}/${SITESTARTFILE} ]; then
${TOUCH} ${ELISPDIR}/${SITESTARTFILE}
- fi
- if [ ! -f ${INFODIR}/dir ]; then
- ${CP} /usr/share/info/dir-tmpl ${INFODIR}/dir
- fi
- ${ECHO} "Adding \"Mew\" entry to ${INFODIR}/dir"
- if [ ! "`${GREP} \"START-INFO-DIR-ENTRY\" ${INFODIR}/${INFOFILE}`" ]; then
- install-info --section="${DIRSECTION}" \
- --entry="${DIRENTRY}" ${INFODIR}/${INFOFILE} ${INFODIR}/dir
+ fi
+ if [ ! -f ${INFODIR}/dir ]; then
+ ${CP} /usr/share/info/dir-tmpl ${INFODIR}/dir
+ fi
+ ${ECHO} "Adding \"Mew\" entry to ${INFODIR}/dir"
+ entry=${DIRENTRY}
+ for f in ${INFOFILE}; do
+ if [ ! "`${GREP} \"START-INFO-DIR-ENTRY\" ${INFODIR}/${f}`" ]; then
+ e=`${ECHO} "${entry}" | ${SED} -e 's/^"\([^"]*\)".*$/\1/'`
+ install-info --section="${DIRSECTION}" \
+ --entry="${e}" ${INFODIR}/${f} ${INFODIR}/dir
else
- install-info ${INFODIR}/${INFOFILE} ${INFODIR}/dir
+ install-info ${INFODIR}/${f} ${INFODIR}/dir
fi
- ${ECHO} "Adding \"Mew\" entry to ${ELISPDIR}/${SITESTARTFILE}"
- if [ "`${GREP} \"^${OptionStart}\" ${ELISPDIR}/${SITESTARTFILE}`" ]; then
- ${SED} -e "/^${OptionStart}/,/^${OptionEnd}/d" \
- ${ELISPDIR}/${SITESTARTFILE} > ${ELISPDIR}/${SITESTARTFILE}.bak
- ${MV} ${ELISPDIR}/${SITESTARTFILE}.bak ${ELISPDIR}/${SITESTARTFILE}
- fi
- ${ECHO} "${OptionStart}" >> ${ELISPDIR}/${SITESTARTFILE}
- ${ECHO} "(setq load-path (cons \"${ELISPDIR}/mew\" load-path))" \
+ entry=`${ECHO} "${entry}" | ${SED} -e 's/^"\([^"]*\)" *//'`
+ done
+ ${ECHO} "Adding \"Mew\" entry to ${ELISPDIR}/${SITESTARTFILE}"
+ if [ "`${GREP} \"^${OptionStart}\" ${ELISPDIR}/${SITESTARTFILE}`" ]; then
+ ${SED} -e "/^${OptionStart}/,/^${OptionEnd}/d" \
+ ${ELISPDIR}/${SITESTARTFILE} > ${ELISPDIR}/${SITESTARTFILE}.bak
+ ${MV} ${ELISPDIR}/${SITESTARTFILE}.bak ${ELISPDIR}/${SITESTARTFILE}
+ fi
+ ${ECHO} "${OptionStart}" >> ${ELISPDIR}/${SITESTARTFILE}
+ ${ECHO} "(setq load-path (cons \"${ELISPDIR}/mew\" load-path))" \
>> ${ELISPDIR}/${SITESTARTFILE}
- ${ECHO} "(autoload 'mew \"mew\" nil t)" >> ${ELISPDIR}/${SITESTARTFILE}
- ${ECHO} "(autoload 'mew-send \"mew\" nil t)" >> ${ELISPDIR}/${SITESTARTFILE}
- if [ "X${EMACS}" = X"XEmacs" ]; then
- ${ECHO} "(setq mew-icon-directory \"${EMACSDIR}/etc/mew\")" \
+ ${ECHO} "(autoload 'mew \"mew\" nil t)" >> ${ELISPDIR}/${SITESTARTFILE}
+ ${ECHO} "(autoload 'mew-send \"mew\" nil t)" >> ${ELISPDIR}/${SITESTARTFILE}
+ if [ "X${EMACS}" = X"XEmacs" ]; then
+ ${ECHO} "(setq mew-icon-directory \"${EMACSDIR}/etc/mew\")" \
>> ${ELISPDIR}/${SITESTARTFILE}
- ${ECHO} "(add-menu-item" >> ${ELISPDIR}/${SITESTARTFILE}
- ${ECHO} " '(\"Apps\") \"Read Mail (Mew)\" 'mew t \"Read Mail (VM)...\")" \
+ ${ECHO} "(add-menu-item" >> ${ELISPDIR}/${SITESTARTFILE}
+ ${ECHO} " '(\"Apps\") \"Read Mail (Mew)\" 'mew t \"Read Mail (VM)...\")" \
>> ${ELISPDIR}/${SITESTARTFILE}
- ${ECHO} "(add-menu-item" >> ${ELISPDIR}/${SITESTARTFILE}
- ${ECHO} " '(\"Apps\") \"Send Mail (Mew)\" 'mew-send t \"Read Mail (VM)...\")" \
+ ${ECHO} "(add-menu-item" >> ${ELISPDIR}/${SITESTARTFILE}
+ ${ECHO} " '(\"Apps\") \"Send Mail (Mew)\" 'mew-send t \"Read Mail (VM)...\")" \
>> ${ELISPDIR}/${SITESTARTFILE}
- ${ECHO} "(setq toolbar-mail-reader 'Mew)" >> ${ELISPDIR}/${SITESTARTFILE}
- ${ECHO} "(setq toolbar-mail-commands-alist" >> ${ELISPDIR}/${SITESTARTFILE}
- ${ECHO} " (cons '(Mew . mew) toolbar-mail-commands-alist))" \
+ ${ECHO} "(setq toolbar-mail-reader 'Mew)" >> ${ELISPDIR}/${SITESTARTFILE}
+ ${ECHO} "(setq toolbar-mail-commands-alist" >> ${ELISPDIR}/${SITESTARTFILE}
+ ${ECHO} " (cons '(Mew . mew) toolbar-mail-commands-alist))" \
>> ${ELISPDIR}/${SITESTARTFILE}
- fi
- ${ECHO} "${OptionEnd}" >> ${ELISPDIR}/${SITESTARTFILE}
- exit 0
+ fi
+ ${ECHO} "${OptionEnd}" >> ${ELISPDIR}/${SITESTARTFILE}
+ exit 0
else
- exit 0
+ exit 0
fi
diff -urN submitted/mail/mew-common/pkg/PLIST-ja-xemacs mail/mew-common/pkg/PLIST-ja-xemacs
--- submitted/mail/mew-common/pkg/PLIST-ja-xemacs Mon May 11 14:46:26 1998
+++ mail/mew-common/pkg/PLIST-ja-xemacs Thu May 7 21:34:09 1998
@@ -1,4 +1 @@
lib/xemacs/info/mew.jis.info
-lib/xemacs/info/mew.jis.info-1
-lib/xemacs/info/mew.jis.info-2
-lib/xemacs/info/mew.jis.info-3
diff -urN submitted/mail/mew-mule/Makefile mail/mew-mule/Makefile
--- submitted/mail/mew-mule/Makefile Mon May 11 14:46:26 1998
+++ mail/mew-mule/Makefile Fri May 8 00:52:05 1998
@@ -10,30 +10,20 @@
LANGUAGE?=
MULE= yes
+DIRENTRY= "* Mew: (mew): Messaging in the Emacs World (English)."
+INFOFILE= mew.info
.if (${LANGUAGE} == "Chinese")
-DIRENTRY= "* Mew:: Messaging in the Emacs World (Chinese)."
-INFOFILE= mew.info
.endif
.if (${LANGUAGE} == "Japanese")
-DIRENTRY= "* Mew.jis:: Messaging in the Emacs World (Japanese)."
-INFOFILE= mew.jis.info
+DIRENTRY+= "* Mew.jis: (mew.jis): Messaging in the Emacs World (Japanese)."
+INFOFILE+= mew.jis.info
.endif
.if (${LANGUAGE} == "Korean")
-DIRENTRY= "* Mew:: Messaging in the Emacs World (Korean)."
-INFOFILE= mew.info
.endif
.if (${LANGUAGE} == "Russian")
-DIRENTRY= "* Mew:: Messaging in the Emacs World (Russian)."
-INFOFILE= mew.info
.endif
.if (${LANGUAGE} == "Vietnamese")
-DIRENTRY= "* Mew:: Messaging in the Emacs World (Vietnamese)."
-INFOFILE= mew.info
-.endif
-.if (${LANGUAGE} == "")
-DIRENTRY= "* Mew:: Messaging in the Emacs World (Vietnamese)."
-INFOFILE= mew.info
.endif
.include "${.CURDIR}/../../mail/mew-common/Makefile"
diff -urN submitted/mail/mew-xemacs/Makefile mail/mew-xemacs/Makefile
--- submitted/mail/mew-xemacs/Makefile Mon May 11 14:46:26 1998
+++ mail/mew-xemacs/Makefile Fri May 8 01:52:38 1998
@@ -10,30 +10,20 @@
LANGUAGE?=
XEMACS= yes
+DIRENTRY= "* Mew:: Messaging in the Emacs World (English)."
+INFOFILE= mew.info
.if (${LANGUAGE} == "Chinese")
-DIRENTRY= "* Mew:: Messaging in the Emacs World (Chinese)."
-INFOFILE= mew.info
.endif
.if (${LANGUAGE} == "Japanese")
-DIRENTRY= "* Mew.jis:: Messaging in the Emacs World (Japanese)."
-INFOFILE= mew.jis.info
+DIRENTRY+= "* Mew.jis:: Messaging in the Emacs World (Japanese)."
+INFOFILE+= mew.jis.info
.endif
.if (${LANGUAGE} == "Korean")
-DIRENTRY= "* Mew:: Messaging in the Emacs World (Korean)."
-INFOFILE= mew.info
.endif
.if (${LANGUAGE} == "Russian")
-DIRENTRY= "* Mew:: Messaging in the Emacs World (Russian)."
-INFOFILE= mew.info
.endif
.if (${LANGUAGE} == "Vietnamese")
-DIRENTRY= "* Mew:: Messaging in the Emacs World (Vietnamese)."
-INFOFILE= mew.info
-.endif
-.if (${LANGUAGE} == "")
-DIRENTRY= "* Mew:: Messaging in the Emacs World."
-INFOFILE= mew.info
.endif
post-install::
diff -urN submitted/japanese/mew-xemacs/Makefile japanese/mew-xemacs/Makefile
--- submitted/japanese/mew-xemacs/Makefile Mon May 11 14:46:24 1998
+++ japanese/mew-xemacs/Makefile Thu May 7 21:36:14 1998
@@ -12,6 +12,6 @@
LANGUAGE= Japanese
post-install::
- @${INSTALL_DATA} ${WRKSRC}/info/mew.jis.info* ${INFODIR}
+ @${INSTALL_DATA} ${WRKSRC}/info/mew.jis.info ${INFODIR}
.include "${.CURDIR}/../../mail/mew-xemacs/Makefile"
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199805111151.UAA04908>