Date: Mon, 30 Nov 1998 18:10:01 -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: <199812010210.SAA00780@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: 01 Dec 1998 11:12:41 +0900
Followings have been fixed:
(1) Skeltons don't make any addition or deletion during install process.
(2) Unnecessary files deleted (mew-xemacs-mule/pkg/MESSAGE)
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ /usr/ports/tmp.cur/mail/mew-common/Makefile mail/mew-common/Makefile
--- /usr/ports/tmp.cur/mail/mew-common/Makefile Tue Dec 1 11:02:23 1998
+++ mail/mew-common/Makefile Mon Nov 30 21:34:20 1998
@@ -49,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}
@@ -60,6 +60,7 @@
${COMMON_PHASE} ${ELISP_PHASE}
VERSION= 1.93
+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
@@ -126,7 +127,9 @@
MEWSAMPLEDIR=${SAMPLEDIR:S@^${PREFIX}/@@}
.if defined(ELISP)
+EXTRA_PKG_ARGS= -i ${WRKTMPDIR}/INSTALL -k ${WRKTMPDIR}/DEINSTALL -D ${WRKTMPDIR}/MESSAGE
do-extract:
+ @${MKDIR} ${WRKTMPDIR}
@${MKDIR} ${WRKSRC}
.if !defined(WRKDIR_EXIST)
@${MKDIR} ${WRKRDIR}
@@ -175,14 +178,10 @@
.if defined(ELISP)
post-configure:
- @${MKDIR} ${WRKDIR}/files
@cd ${FILESDIR}; \
- ${CP} MESSAGE INSTALL DEINSTALL ${PKGDIR}; \
- ${CP} user-install ${SAMPLEFILES} ${SAMPLEDOTEMACS} ${WRKDIR}/files
-.if defined(EMACS_MULE)
- @${CP} ${FILESDIR}/mew-1.93.el ${WRKDIR}/files
-.elif defined(XEMACS)
- @${CP} ${FILESDIR}/mew-1.93.xemacs.el ${WRKDIR}/files/mew-1.93.el
+ ${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}
@@ -208,7 +207,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)
@@ -219,7 +218,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}
@@ -231,12 +230,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/tmp.cur/mail/mew-common/files/mew-1.93.xemacs.el.tmpl mail/mew-common/files/mew-1.93.xemacs.el.tmpl
--- /usr/ports/tmp.cur/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/tmp.cur/mail/mew-common/scripts/configure mail/mew-common/scripts/configure
--- /usr/ports/tmp.cur/mail/mew-common/scripts/configure Tue Dec 1 11:01:59 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/tmp.cur/mail/mew-xemacs-mule/pkg/MESSAGE mail/mew-xemacs-mule/pkg/MESSAGE
--- /usr/ports/tmp.cur/mail/mew-xemacs-mule/pkg/MESSAGE Tue Dec 1 11:01:58 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?199812010210.SAA00780>