Date: Thu, 24 Dec 1998 04:30:00 -0800 (PST) From: KIRIYAMA Kazuhiko <kiri@pis.toba-cmt.ac.jp> To: freebsd-ports@FreeBSD.ORG Subject: Re:ports/8860:Updateports:Mew-1.93 Message-ID: <199812241230.EAA22386@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/8860; it has been noted by GNATS.
From: KIRIYAMA Kazuhiko <kiri@pis.toba-cmt.ac.jp>
To: freebsd-gnats-submit@freebsd.org, kiri@pis.toba-cmt.ac.jp
Cc: Subject: Re:ports/8860:Updateports:Mew-1.93
Date: 24 Dec 1998 21:35:00 +0900
Above patches have been obsoleted. Please apply following patches.
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ /usr/ports/current/mail/mew/Makefile mail/mew/Makefile
--- /usr/ports/current/mail/mew/Makefile Wed Dec 2 02:37:40 1998
+++ mail/mew/Makefile Thu Dec 24 21:27:11 1998
@@ -9,6 +9,7 @@
PKGNAME= mew-emacs-1.93
EMACS_NAME= Emacs-19.34b
+DIRSECTION= The Emacs editor and associated tools
DIRENTRY= "* Mew: (mew). Messaging in the Emacs World."
INFOFILE= mew.info
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ /usr/ports/current/mail/mew-common/Makefile mail/mew-common/Makefile
--- /usr/ports/current/mail/mew-common/Makefile Wed Dec 2 02:37:40 1998
+++ mail/mew-common/Makefile Thu Dec 24 20:58:28 1998
@@ -17,6 +17,10 @@
RESTRICTED= "USA ITAR export restrictions (has PGP hooks)"
+PATCHDIR= ${.CURDIR}/../../mail/mew-common/patches
+FILESDIR= ${.CURDIR}/../../mail/mew-common/files
+SCRIPTDIR= ${.CURDIR}/../../mail/mew-common/scripts
+
.if !defined(EMACS_NAME)
COMMON= yes
COMMON_PHASE= "COMMON=${COMMON}"
@@ -45,7 +49,7 @@
SCRIPTS_ENV= AWK=${AWK} CP=${CP} CAT=${CAT} ECHO=${ECHO} GREP=${GREP} \
MKDIR="${MKDIR}" MV=${MV} SED=${SED} TOUCH=${TOUCH} \
INFODIR=${INFODIR} EMACSDIR=${EMACSDIR} ELISPDIR=${ELISPDIR} \
- SAMPLEDIR=${SAMPLEDIR} \
+ SAMPLEDIR=${SAMPLEDIR} WRKTMPDIR=${WRKTMPDIR} \
INFOFILE="${INFOFILE}" TMPL_FILES="${TMPL_FILES}" \
DIRENTRY='${DIRENTRY}' DIRSECTION="${DIRSECTION}" VERSION=${VERSION} \
EMACS_NAME="${EMACS_NAME}" EMACSCMD=${EMACSCMD}
@@ -56,13 +60,12 @@
${COMMON_PHASE} ${ELISP_PHASE}
VERSION= 1.93
-DIRSECTION?= The Emacs editor and associated tools
-TMPL_FILES= user-install MESSAGE INSTALL DEINSTALL mew-1.93.el
+WRKTMPDIR= ${WRKDIR}/tmp
+TMPL_FILES= user-install MESSAGE INSTALL DEINSTALL mew-1.93.el mew-1.93.xemacs.el
.if defined(EMACS_NAME)
ELISPDIR= ${EMACSDIR}/site-lisp
INFODIR= ${EMACSDIR}/info
SAMPLEDIR= ${PREFIX}/share/examples/mew/${EMACS_NAME}
-SAMPLEBASE= share/examples/mew
SAMPLEFILES= Aliases
SAMPLEDOTEMACS= dot.emacs.el
.else
@@ -121,11 +124,14 @@
PLIST_SUB= ELISPDIR=${ELISPDIR:S@^${PREFIX}/@@} \
MEWETCDIR=${EMACSDIR:S@^${PREFIX}/@@}/etc/mew \
MEWINFODIR=${INFODIR:S@^${PREFIX}/@@} \
- MEWSAMPLEDIR=${SAMPLEDIR:S@^${PREFIX}/@@} \
- MEWSAMPLEBASE=${SAMPLEBASE}
+ MEWSAMPLEDIR=${SAMPLEDIR:S@^${PREFIX}/@@}
.if defined(ELISP)
+PKGINSTALL= ${WRKTMPDIR}/INSTALL
+PKGDEINSTALL= ${WRKTMPDIR}/DEINSTALL
+PKGMESSAGE= ${WRKTMPDIR}/MESSAGE
do-extract:
+ @${MKDIR} ${WRKTMPDIR}
@${MKDIR} ${WRKSRC}
.if !defined(WRKDIR_EXIST)
@${MKDIR} ${WRKRDIR}
@@ -174,10 +180,11 @@
.if defined(ELISP)
post-configure:
- @${MKDIR} ${WRKDIR}/files
@cd ${FILESDIR}; \
- ${CP} MESSAGE INSTALL DEINSTALL ${PKGDIR}; \
- ${CP} mew-1.93.el user-install ${SAMPLEFILES} ${SAMPLEDOTEMACS} ${WRKDIR}/files
+ ${CP} ${SAMPLEFILES} ${SAMPLEDOTEMACS} ${WRKTMPDIR}
+.if defined(XEMACS)
+ @${CP} ${WRKTMPDIR}/mew-1.93.xemacs.el ${WRKTMPDIR}/mew-1.93.el
+.endif
.if !defined(WRKDIR_EXIST)
@${TOUCH} ${TOUCH_FLAGS} ${CONFIGURER_COOKIE}
.endif
@@ -202,7 +209,7 @@
for f in mew.info* ; do \
${LN} -sf ${PREFIX}/info/$${f} ${INFODIR}/$${f}; \
done
- @${INSTALL_DATA} ${WRKDIR}/files/mew-1.93.el ${ELISPDIR}
+ @${INSTALL_DATA} ${WRKTMPDIR}/mew-1.93.el ${ELISPDIR}
.endif
.if !defined(NOPORTDOCS)
.if defined(COMMON)
@@ -213,7 +220,7 @@
.endif
.if defined(ELISP)
@${MKDIR} ${SAMPLEDIR}/dot.emacs
- @cd ${WRKDIR}/files; \
+ @cd ${WRKTMPDIR}; \
${INSTALL_DATA} ${SAMPLEFILES} ${SAMPLEDIR}; \
${INSTALL_DATA} ${SAMPLEDOTEMACS} ${SAMPLEDIR}/dot.emacs; \
${INSTALL_SCRIPT} user-install ${SAMPLEDIR}
@@ -225,12 +232,8 @@
${INSTALL_DATA} etc/etc/COLOR etc/etc/*.xpm ${EMACSDIR}/etc/mew/etc
.endif
.if defined(ELISP)
- @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
- @${CAT} ${PKGDIR}/MESSAGE
+ @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${WRKTMPDIR}/INSTALL ${PKGNAME} POST-INSTALL
+ @${CAT} ${WRKTMPDIR}/MESSAGE
.endif
-
-pre-clean:
- @cd ${FILESDIR}; ${RM} -f ${TMPL_FILES}
- @cd ${PKGDIR}; ${RM} -f INSTALL DEINSTALL
.include <bsd.port.mk>
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ /usr/ports/current/mail/mew-common/files/Aliases mail/mew-common/files/Aliases
--- /usr/ports/current/mail/mew-common/files/Aliases Fri Nov 6 02:31:48 1998
+++ mail/mew-common/files/Aliases Wed Nov 25 21:02:57 1998
@@ -1,6 +1,5 @@
; See comments at end of this file
; This file is almost empty as MH now supports personal aliases.
-; @(#)$Id: Aliases,v 1.2 1998/11/05 14:31:07 kuriyama Exp $
;everyone: *
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ /usr/ports/current/mail/mew-common/files/mew-1.93.xemacs.el.tmpl mail/mew-common/files/mew-1.93.xemacs.el.tmpl
--- /usr/ports/current/mail/mew-common/files/mew-1.93.xemacs.el.tmpl Thu Jan 1 09:00:00 1970
+++ mail/mew-common/files/mew-1.93.xemacs.el.tmpl Sun Nov 8 19:32:53 1998
@@ -0,0 +1,3 @@
+(setq load-path (cons "%%ELISPDIR%%/mew" load-path))
+(setq mew-icon-directory "%%EMACSDIR%%/etc/mew")
+(provide 'mew-1.93)
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ /usr/ports/current/mail/mew-common/pkg/PLIST-Emacs mail/mew-common/pkg/PLIST-Emacs
--- /usr/ports/current/mail/mew-common/pkg/PLIST-Emacs Thu Nov 5 23:31:08 1998
+++ mail/mew-common/pkg/PLIST-Emacs Thu Sep 17 17:08:38 1998
@@ -79,5 +79,4 @@
%%MEWSAMPLEDIR%%/user-install
@dirrm %%MEWSAMPLEDIR%%/dot.emacs
@dirrm %%MEWSAMPLEDIR%%
-@dirrm %%MEWSAMPLEBASE%%
@dirrm %%ELISPDIR%%/mew
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ /usr/ports/current/mail/mew-common/pkg/PLIST-XEmacs mail/mew-common/pkg/PLIST-XEmacs
--- /usr/ports/current/mail/mew-common/pkg/PLIST-XEmacs Thu Nov 5 23:31:08 1998
+++ mail/mew-common/pkg/PLIST-XEmacs Thu Sep 17 17:08:48 1998
@@ -114,7 +114,6 @@
%%MEWSAMPLEDIR%%/user-install
@dirrm %%MEWSAMPLEDIR%%/dot.emacs
@dirrm %%MEWSAMPLEDIR%%
-@dirrm %%MEWSAMPLEBASE%%
@dirrm %%MEWETCDIR%%/etc
@dirrm %%MEWETCDIR%%
@dirrm %%ELISPDIR%%/mew
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ /usr/ports/current/mail/mew-common/scripts/configure mail/mew-common/scripts/configure
--- /usr/ports/current/mail/mew-common/scripts/configure Fri Nov 6 02:31:54 1998
+++ mail/mew-common/scripts/configure Mon Nov 30 21:43:21 1998
@@ -28,10 +28,11 @@
-e "s,%%SAMPLEDIR%%,${SAMPLEDIR},g" \
-e "s,%%DIRSECTION%%,${DIRSECTION},g" \
-e "s,%%DIRENTRY%%,${DIRENTRY},g" \
- < ${FILESDIR}/${f}.tmpl > ${FILESDIR}/${f}
+ < ${FILESDIR}/${f}.tmpl > ${WRKTMPDIR}/${f}
done
+
for f in INSTALL DEINSTALL; do
- perl -p -i -e 's@$ENV{"PREFIX"}@\${PKG_PREFIX}@g' ${FILESDIR}/${f}
+ perl -p -i -e 's@$ENV{"PREFIX"}@\${PKG_PREFIX}@g' ${WRKTMPDIR}/${f}
done
cd ${WRKSRC}/info
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ /usr/ports/current/mail/mew-emacs20/Makefile mail/mew-emacs20/Makefile
--- /usr/ports/current/mail/mew-emacs20/Makefile Wed Dec 2 02:37:41 1998
+++ mail/mew-emacs20/Makefile Thu Dec 24 21:28:11 1998
@@ -9,6 +9,7 @@
PKGNAME= mew-emacs20-1.93
EMACS_NAME= Emacs-20.3
+DIRSECTION= The Emacs editor and associated tools
DIRENTRY= "* Mew: (mew). Messaging in the Emacs World."
INFOFILE= mew.info
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ /usr/ports/current/mail/mew-mule/Makefile mail/mew-mule/Makefile
--- /usr/ports/current/mail/mew-mule/Makefile Wed Dec 2 02:37:41 1998
+++ mail/mew-mule/Makefile Thu Dec 24 21:28:59 1998
@@ -9,6 +9,7 @@
PKGNAME= mew-mule-1.93
EMACS_NAME= Mule-2.3
+DIRSECTION= The Emacs editor and associated tools
DIRENTRY= "* Mew: (mew). Messaging in the Emacs World (English)." \
"* Mew.jis: (mew.jis). Messaging in the Emacs World (Japanese)."
INFOFILE= mew.info \
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ /usr/ports/current/mail/mew-xemacs/Makefile mail/mew-xemacs/Makefile
--- /usr/ports/current/mail/mew-xemacs/Makefile Wed Dec 2 02:37:41 1998
+++ mail/mew-xemacs/Makefile Thu Dec 24 21:29:47 1998
@@ -9,6 +9,7 @@
PKGNAME= mew-xemacs-1.93
EMACS_NAME= XEmacs-19.16
+DIRSECTION= Local Packages:
DIRENTRY= "* Mew:: Messaging in the Emacs World."
INFOFILE= mew.info
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ /usr/ports/current/mail/mew-xemacs-mule/pkg/MESSAGE mail/mew-xemacs-mule/pkg/MESSAGE
--- /usr/ports/current/mail/mew-xemacs-mule/pkg/MESSAGE Fri Nov 6 07:11:54 1998
+++ mail/mew-xemacs-mule/pkg/MESSAGE Thu Jan 1 09:00:00 1970
@@ -1,11 +0,0 @@
-*************************************************************************
-* You must set at least following elisp to your own dot.emacs file: *
-* *
-* (require 'mew-1.93) *
-* (autoload 'mew "mew" nil t) *
-* (autoload 'mew-send "mew" nil t) *
-* (setq mew-mail-domain-list '("Name_Server_Domain_Name")) *
-* *
-* Most easy way for setting dot.emacs is to use "user-install" script *
-* in "/usr/local/share/examples/mew/XEmacs-Mule-20.4". *
-*************************************************************************
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?199812241230.EAA22386>