Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 4 Mar 2000 20:30:38 +0900 (JST)
From:      KIRIYAMA Kazuhiko <kiri@pis.toba-cmt.ac.jp>
To:        FreeBSD-gnats-submit@freebsd.org
Subject:   ports/17176: Update ports: Mew-1.94.2
Message-ID:  <200003041130.UAA36096@pis.toba-cmt.ac.jp>

next in thread | raw e-mail | index | archive | help

>Number:         17176
>Category:       ports
>Synopsis:       Update ports: Mew-1.94.2
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Mar  4 03:30:01 PST 2000
>Closed-Date:
>Last-Modified:
>Originator:     KIRIYAMA Kazuhiko
>Release:        FreeBSD 4.0-CURRENT i386
>Organization:
Toba National College of Maritime Technology.
	Department of Electronic Mechanical Engineering
>Environment:
>Description:
Updated the port Mew-1.94.2. This time, I've drastic changed from so far. The
changes has mainly following two points:

(1) apart from ports control for xemacs21* slave ports

  In xemacs21* slave ports(mail/mew-xemacs21 and mail/mew-xemacs21-mule),
there are merely installation it's xemacs package(but few additional files
has been installed too).

(2) put bsd.xemacs21.mk into mew/files/bsd.xemacs21.mk and include

  According to (1), I've included additional makefile which make xemacs
packages control(post-extract and do-install). For more information, see
http://fbsd.toba-cmt.ac.jp/freebsd/tools/en/c318.html

With above changes, please do following step before package building:

o copy xemacs package mew-1.01-pkg.tar.gz to ${MASTER_SITE_PORTS_JP}/xemacs

  Please copy mew-1.01-pkg.tar.gz from
ftp://fbsd.toba-cmt.ac.jp/pub/XEmacs/packages to
${MASTER_SITE_PORTS_JP}/xemacs

Update files are respecively :

[Add] :
-rw-r--r--  1    kiri   staff    2097 Mar  1 19:15 mail/mew/files/bsd.xemacs21.mk
-rw-r--r--  1    kiri   staff    2097 Mar  1 19:15 mail/mew/files/mew-xemacs.el.diff.tmpl
[Delete] :
-rw-r--r--  1    kiri   staff     443 Mar  4 19:37 /mail/mew/patches/patch-ad

put the diff from ports-current in "Fix:".
>How-To-Repeat:
>Fix:
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ -I ^# \$FreeBSD /usr/ports/current/mail/mew/Makefile mail/mew/Makefile
--- /usr/ports/current/mail/mew/Makefile	Sat Feb 19 12:33:48 2000
+++ mail/mew/Makefile	Sat Mar  4 19:47:09 2000
@@ -1,5 +1,5 @@
 # New ports collection makefile for: Mew
-# Version required:	1.94.1
+# Version required:	1.94.2
 # Date created:		21 November 1997
 # Whom:			Kiriyama Kazuhiko <kiri@kiri.toba-cmt.ac.jp>
 #
@@ -7,17 +7,18 @@
 #
 
 DISTNAME=	mew-${VERSION}
-PKGNAME=	mew-${EMACS_PORT_NAME}-${VERSION}
+PKGNAME=	mew-${EMACS_PORT}-${VERSION}
 CATEGORIES=	mail elisp
 MASTER_SITES=	ftp://ftp.mew.org/pub/Mew/ \
 		ftp://ftp.kyushu-u.ac.jp/pub/Misc/mew/ \
-		ftp://ports.jp.freebsd.org/pub/FreeBSD-jp/ports-jp/LOCAL_PORTS/
+		${MASTER_SITE_PORTS_JP}
+DISTFILES=	${DISTNAME}.tar.gz
 
 MAINTAINER=	kiri@kiri.toba-cmt.ac.jp
 
 RESTRICTED=	"USA ITAR export restrictions (has PGP hooks)"
 
-BUILD_DEPENDS=	${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT_NAME}
+BUILD_DEPENDS=	${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}
 RUN_DEPENDS=	imali:${PORTSDIR}/mail/im
 
 SCRIPTS_ENV=	AWK=${AWK} CAT=${CAT} CP=${CP} ECHO=${ECHO} MKDIR="${MKDIR}" \
@@ -25,45 +26,50 @@
 		EMACSDIR=${EMACSDIR} ELISPDIR=${ELISPDIR} INFODIR=${INFODIR} \
 		ETCDIR=${ETCDIR} SAMPLEDIR=${SAMPLEDIR} WRKTMPDIR=${WRKTMPDIR} \
 		PORTDIR=${.CURDIR:S!^${PORTSDIR}/!!} \
-		EMACS_CMD=${EMACS_CMD} EMACS_PORT_NAME=${EMACS_PORT_NAME} \
+		EMACS_CMD=${EMACS_CMD} EMACS_PORT=${EMACS_PORT} \
 		PKGNAME=${PKGNAME} TMPL_FILES="${TMPL_FILES}" VERSION=${VERSION} \
-		SITE_STARTUP_FILE=${SITE_STARTUP_FILE} REQUIRE="${REQUIRE}"
+		SITE_STARTUP_FILE=${SITE_STARTUP_FILE} REQUIRE="${REQUIRE}" \
+		MEW_DIST=${MEW_DIST}
 MAKE_ARGS=	PREFIX=${PREFIX} EMACS=${EMACS_CMD} ELISPDIR=${ELISPDIR} \
 		INFODIR=${INFODIR} ETCDIR=${ETCDIR}
-MAKE_ENV=	EMACSPKGDIR=${EMACSPKGDIR} MANDIR=${PKGMANDIR} \
-		PKG_PKGINFODIR=${PKG_PKGINFODIR} XEMACS_VER_OVER20=${XEMACS_VER_OVER20} \
+MAKE_ENV=	MANDIR=${PKGMANDIR} \
 		MKDIR="${MKDIR}" PERL=${PERL5} PERL_BADLANG=0
 INSTALL_TARGET=	${INST_TARGET_LIST}
 PLIST_SUB=	EMACS_LISPDIR=${EMACS_LISPDIR} \
 		EMACS_ETCDIR=${EMACS_ETCDIR} \
-		EMACS_INFODIR=${EMACS_INFODIR} \
-		EMACS_PKGDIR=${EMACS_PKGDIR}
-PATCHDIR=	${.CURDIR}/../mew/patches
-SCRIPTDIR=	${.CURDIR}/../mew/scripts
-FILESDIR=	${.CURDIR}/../mew/files
+		EMACS_INFODIR=${EMACS_INFODIR}
 
-VERSION=		1.94.1
-EMACS_PORT_NAME?=	emacs
+# mew version and distribution name
+VERSION=		1.94.2
+MEW_DIST=		mew
+
+# default emacs port name
+EMACS_PORT?=		emacs
+
+# common install files
 SAMPLEFILES=		Addrbook
 SAMPLEDOTEMACS=		dot.emacs.el
 PORTDOCS=		00changes 00copyright 00copyright.jis 00diff 00readme
 TMPL_FILES=		user-install ${SITE_STARTUP_FILE} ${SAMPLEDOTEMACS}
+
+# mew install and working directories
 EMACSDIR=		${PREFIX}/${EMACS_LIBDIR_WITH_VER}
-ELISPDIR=		${PREFIX}/${EMACS_LISPDIR}/mew
+ELISPDIR=		${PREFIX}/${EMACS_LISPDIR}/${MEW_DIST}
 INFODIR=		${PREFIX}/${EMACS_INFODIR}
-ETCDIR=			${PREFIX}/${EMACS_ETCDIR}/mew
-EMACSPKGDIR=		${PREFIX}/${EMACS_PKGDIR}
-PKGELISPDIR=		${PREFIX}/${EMACS_PKG_LISPDIR}/mew
-PKGINFODIR=		${PREFIX}/${EMACS_PKG_INFODIR}
-PKGMANDIR=		${PREFIX}/${EMACS_PKG_MANDIR}/mew
-PKGETCDIR=		${PREFIX}/${EMACS_PKG_ETCDIR}/mew
-PKG_PKGINFODIR=		${PREFIX}/${EMACS_PKG_PKGINFODIR}
+ETCDIR=			${PREFIX}/${EMACS_ETCDIR}/${MEW_DIST}
 WRKTMPDIR=		${WRKDIR}/tmp
-SAMPLEDIR=		${PREFIX}/share/examples/mew
-PORTDOCDIR=		${PREFIX}/share/doc/mew
-COMMENT_TEXT=		Message interface to Emacs Window for ${EMACS_PORT_NAME}
+SAMPLEDIR=		${PREFIX}/share/examples/${MEW_DIST}
+PORTDOCDIR=		${PREFIX}/share/doc/${MEW_DIST}
 
-.if (${EMACS_PORT_NAME} == "emacs")
+# for arrange target
+COMMENT_TEXT=		"Message interface to Emacs Window for ${EMACS_PORT}(release version)"
+
+# xemacs package
+XEMACS_PKG_VERSION=	1.01
+XEMACS_PACKAGE=		${MEW_DIST}
+
+# setting emacs variables for each individual port
+.if (${EMACS_PORT} == "emacs")
 EMACS_NAME=		emacs
 EMACS_VER=		19.34
 EMACS_MAJOR_VER=	19
@@ -74,8 +80,8 @@
 EMACS_LISPDIR=		${EMACS_LIBDIR}/site-lisp
 EMACS_INFODIR=		info
 EMACS_SITELISPDIR=	${EMACS_LIBDIR}/site-lisp
-SITE_STARTUP_FILE=	mew-startup.el
-.elif (${EMACS_PORT_NAME} == "emacs20")
+SITE_STARTUP_FILE=	${MEW_DIST}-startup.el
+.elif (${EMACS_PORT} == "emacs20")
 EMACS_NAME=		emacs
 EMACS_VER=		20.5
 EMACS_MAJOR_VER=	20
@@ -85,7 +91,7 @@
 EMACS_ETCDIR=		${EMACS_LIBDIR}/etc
 EMACS_LISPDIR=		${EMACS_LIBDIR}/site-lisp
 EMACS_INFODIR=		info
-.elif (${EMACS_PORT_NAME} == "mule")
+.elif (${EMACS_PORT} == "mule")
 EMACS_NAME=		mule
 EMACS_VER=		19.34
 EMACS_MAJOR_VER=	19
@@ -96,8 +102,8 @@
 EMACS_LISPDIR=		${EMACS_LIBDIR}/site-lisp
 EMACS_INFODIR=		${EMACS_LIBDIR}/info
 EMACS_SITELISPDIR=	${EMACS_LIBDIR}/site-lisp
-SITE_STARTUP_FILE=	mew-startup.el
-.elif (${EMACS_PORT_NAME} == "xemacs")
+SITE_STARTUP_FILE=	${MEW_DIST}-startup.el
+.elif (${EMACS_PORT} == "xemacs")
 EMACS_NAME=		xemacs
 EMACS_VER=		19.16
 EMACS_MAJOR_VER=	19
@@ -108,8 +114,8 @@
 EMACS_LISPDIR=		${EMACS_LIBDIR}/site-lisp
 EMACS_INFODIR=		${EMACS_LIBDIR_WITH_VER}/info
 EMACS_SITELISPDIR=	${EMACS_LISPDIR}
-SITE_STARTUP_FILE=	mew-xemacs-startup.el
-.elif (${EMACS_PORT_NAME} == "xemacs20")
+SITE_STARTUP_FILE=	${MEW_DIST}-xemacs-startup.el
+.elif (${EMACS_PORT} == "xemacs20")
 EMACS_NAME=		xemacs
 EMACS_VER=		20.4
 EMACS_MAJOR_VER=	20
@@ -120,117 +126,116 @@
 EMACS_LISPDIR=		${EMACS_LIBDIR}/site-lisp
 EMACS_INFODIR=		${EMACS_LIBDIR}/info
 EMACS_SITELISPDIR=	${EMACS_LISPDIR}
-SITE_STARTUP_FILE=	mew-xemacs-startup.el
-.elif (${EMACS_PORT_NAME} == "xemacs21")
+SITE_STARTUP_FILE=	${MEW_DIST}-xemacs-startup.el
+.elif (${EMACS_PORT} == "xemacs21")
 EMACS_NAME=		xemacs
-EMACS_VER=		21.1.9
 EMACS_MAJOR_VER=	21
-EMACS_CMD=		${EMACS_NAME}${EMACS_MAJOR_VER}
-EMACS_LIBDIR=		lib/${EMACS_NAME}
-EMACS_LIBDIR_WITH_VER=	lib/${EMACS_NAME}-${EMACS_VER}
-EMACS_PKGDIR=		${EMACS_LIBDIR}/site-packages
-EMACS_PKG_LISPDIR=	${EMACS_PKGDIR}/lisp
-EMACS_PKG_INFODIR=	${EMACS_PKGDIR}/info
-EMACS_PKG_MANDIR=	${EMACS_PKGDIR}/man
-EMACS_PKG_ETCDIR=	${EMACS_PKGDIR}/etc
-EMACS_PKG_PKGINFODIR=	${EMACS_PKGDIR}/pkginfo
-EMACS_ETCDIR=		${EMACS_PKG_ETCDIR}
-EMACS_LISPDIR=		${EMACS_PKG_LISPDIR}
-EMACS_INFODIR=		${EMACS_PKG_INFODIR}
-.elif (${EMACS_PORT_NAME} == "xemacs21-mule")
+.elif (${EMACS_PORT} == "xemacs21-mule")
 EMACS_NAME=		xemacs
-EMACS_VER=		21.1.9
 EMACS_MAJOR_VER=	21
-EMACS_CMD=		${EMACS_NAME}${EMACS_MAJOR_VER}-mule
-EMACS_LIBDIR=		lib/${EMACS_NAME}
-EMACS_LIBDIR_WITH_VER=	lib/${EMACS_NAME}-${EMACS_VER}
-EMACS_PKGDIR=		${EMACS_LIBDIR}/site-packages
-EMACS_PKG_LISPDIR=	${EMACS_PKGDIR}/lisp
-EMACS_PKG_INFODIR=	${EMACS_PKGDIR}/info
-EMACS_PKG_MANDIR=	${EMACS_PKGDIR}/man
-EMACS_PKG_ETCDIR=	${EMACS_PKGDIR}/etc
-EMACS_PKG_PKGINFODIR=	${EMACS_PKGDIR}/pkginfo
-EMACS_ETCDIR=		${EMACS_PKG_ETCDIR}
-EMACS_LISPDIR=		${EMACS_PKG_LISPDIR}
-EMACS_INFODIR=		${EMACS_PKG_INFODIR}
 .else
 NO_BUILD=   yes
 NO_INSTALL= yes
 .endif
-.if (${EMACS_NAME} == "xemacs") && ${EMACS_MAJOR_VER} > 20
-INST_TARGET_LIST=	install-package
-XEMACS_VER_OVER20=	yes
-.else
+
+# install target specifications
 INST_TARGET_LIST=	install install-info
-REQUIRE=		(require \'${SITE_STARTUP_FILE:S/^mew-/&${EMACS_PORT_NAME}-/:S/.el$//})
-.endif
-.if (${EMACS_PORT_NAME} == "emacs20") || (${EMACS_PORT_NAME} == "mule") || \
-    (${EMACS_PORT_NAME} == "xemacs21-mule")
+.if (${EMACS_PORT} == "emacs20") || (${EMACS_PORT} == "mule")
 INST_TARGET_LIST+=	install-jinfo
 .endif
 
+# require directive in SITE_STARTUP_FILE
+REQUIRE=		(require \'${SITE_STARTUP_FILE:S/^${MEW_DIST}-/&${EMACS_PORT}-/:S/.el$//})
+
+# change xpm retrieve directory for xemacs??*(?? >=21)
+post-patch:
+	@${CAT} ${FILESDIR}/mew-xemacs.el.diff.tmpl | \
+		${SED} -e 's/%%MEW_DIST%%/${MEW_DIST}/' | \
+		${PATCH} ${PATCH_ARGS}
+
+# copy sample files to ${WRLDIR}/tmp
 post-configure:
 	@${MKDIR} ${WRKTMPDIR}
 	@cd ${FILESDIR}; \
 	${CP} ${SAMPLEFILES} ${WRKTMPDIR}
 
+# create *-startup.el or sample files
 pre-install:
-	${ENV} ${SCRIPTS_ENV} ${SH} ${FILESDIR}/tmpl2file.sh
+	${SETENV} ${SCRIPTS_ENV} ${SH} ${FILESDIR}/tmpl2file.sh
 	@${MKDIR} ${ELISPDIR} ${INFODIR}
-.if (${EMACS_NAME} == "xemacs")
+.if ${EMACS_NAME} == "xemacs" && ${EMACS_MAJOR_VER} < 21
 	@${MKDIR} ${ETCDIR}/etc
 .endif
 
+# install *-startup.el or sample files
 post-install:
+.if (${EMACS_NAME} == "xemacs") && ${EMACS_MAJOR_VER} > 20
+	cd ${WRKSRC}/bin; \
+	${MKDIR} ${PREFIX}/bin; \
+	$(MAKE) CFLAGS="-O" CC="gcc" BINDIR="${PREFIX}/bin" PERL="$(PERL5)" \
+		${INSTALL_MACROS} install
+.endif
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${PORTDOCDIR}/contrib
-	@cd ${WRKSRC}; \
+	${MKDIR} ${PORTDOCDIR}/contrib
+	cd ${WRKSRC}; \
 	${INSTALL_DATA} ${PORTDOCS} ${PORTDOCDIR}; \
 	${INSTALL_DATA} contrib/* ${PORTDOCDIR}/contrib
-	@${MKDIR} ${SAMPLEDIR}/dot.emacs
-	@cd ${WRKTMPDIR}; \
+	${MKDIR} ${SAMPLEDIR}/dot.emacs
+	cd ${WRKTMPDIR}; \
 	${INSTALL_DATA} ${SAMPLEFILES} ${SAMPLEDIR}; \
 	${INSTALL_DATA} ${SAMPLEDOTEMACS} ${SAMPLEDIR}/dot.emacs; \
 	${INSTALL_SCRIPT} user-install ${SAMPLEDIR}
-.if (${EMACS_NAME} == "xemacs") && ${EMACS_MAJOR_VER} <= 20
-	@cd ${WRKSRC}/etc; \
+.if ${EMACS_NAME} == "xemacs" && ${EMACS_MAJOR_VER} < 21
+	cd ${WRKSRC}/etc; \
 	${INSTALL_DATA} *.xpm Mew.* ${PREFIX}/${EMACS_ETCDIR}/mew; \
 	${INSTALL_DATA} etc/* ${PREFIX}/${EMACS_ETCDIR}/mew/etc
-	@${INSTALL_DATA} ${WRKSRC}/info/*.texi ${PORTDOCDIR}
-.elif (${EMACS_NAME} != "xemacs")
-	@${INSTALL_DATA} ${WRKSRC}/info/*.texi ${PORTDOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/info/*.texi ${PORTDOCDIR}
 .endif
 .endif
-.if (${EMACS_NAME} != "xemacs") || ${EMACS_MAJOR_VER} <= 20
-	@install-info ${WRKSRC}/info/mew.info ${INFODIR}/dir
-.if (${EMACS_PORT_NAME} == "emacs20") || (${EMACS_PORT_NAME} == "mule")
-	@install-info ${WRKSRC}/info/mew.jis.info ${INFODIR}/dir
+.if ${EMACS_NAME} != "xemacs" && ${EMACS_MAJOR_VER} < 21
+	install-info ${WRKSRC}/info/mew.info ${INFODIR}/dir
+.if (${EMACS_PORT} == "emacs20") || (${EMACS_PORT} == "mule")
+	install-info ${WRKSRC}/info/mew.jis.info ${INFODIR}/dir
 .endif
 .endif
 .if defined(SITE_STARTUP_FILE)
-	@${MKDIR} ${PREFIX}/${EMACS_SITELISPDIR}
-	@${INSTALL_DATA} ${WRKTMPDIR}/${SITE_STARTUP_FILE} \
-		${PREFIX}/${EMACS_SITELISPDIR}/mew-${EMACS_PORT_NAME}-startup.el
+	${MKDIR} ${PREFIX}/${EMACS_SITELISPDIR}
+	${INSTALL_DATA} ${WRKTMPDIR}/${SITE_STARTUP_FILE} \
+		${PREFIX}/${EMACS_SITELISPDIR}/${MEW_DIST}-${EMACS_PORT}-startup.el
 .endif
-	@${CAT} ${PKGMESSAGE}
+	${CAT} ${PKGMESSAGE}
 
-## for make DESCR,COMMENT and PLIST (only maintainer use)
-#arrange:
+## for make DESCR and COMMENT (only maintainer use)
+#pre-arrange:
 #	${MKDIR} ${PKGDIR}
 #	${ECHO} ${COMMENT_TEXT} > ${PKGDIR}/COMMENT
-#	${ENV} ${SCRIPTS_ENV} WRKTMPDIR=${PKGDIR} TMPL_FILES=DESCR \
+#	${SETENV} ${SCRIPTS_ENV} WRKTMPDIR=${PKGDIR} TMPL_FILES=DESCR \
 #		${SH} ${FILESDIR}/tmpl2file.sh
-#	${ENV} ${SCRIPTS_ENV} WRKTMPDIR=${PKGDIR} ${SH} ${FILESDIR}/message.sh
-#	${CHOWN} kiri:staff ${PKGDIR} ${PKGDIR}/COMMENT ${PKGDIR}/DESCR ${PKGDIR}/MESSAGE
+#	${SETENV} ${SCRIPTS_ENV} WRKTMPDIR=${PKGDIR} ${SH} ${FILESDIR}/message.sh
+#	${CHOWN} ${USER}:${GROUP} ${PKGDIR} ${PKGDIR}/COMMENT ${PKGDIR}/DESCR \
+#		${PKGDIR}/MESSAGE
+#
+## for make PLIST (only maintainer use)
+#arrange:
 #.if (${EMACS_NAME} == "xemacs") && ${EMACS_MAJOR_VER} > 20
-#	${MAKE} PLIST_SUB_EXCLS="${PLIST_SUB_EXCLS} EMACS_INFODIR=${EMACS_INFODIR}" \
-#		DIRRM2RMDIRS="${EMACS_ETCDIR} ${EMACS_LISPDIR} ${EMACS_INFODIR} ${EMACS_PKGDIR} ${EMACS_PKG_MANDIR} ${EMACS_PKG_PKGINFODIR}" \
+#	${MAKE} -DPLIST_OVERRIDE \
+#		PLIST_SUB_EXCLS="${PLIST_SUB_EXCLS} EMACS_ETCDIR=${EMACS_ETCDIR} EMACS_LISPDIR=${EMACS_LISPDIR} EMACS_INFODIR=${EMACS_INFODIR}" \
+#		DIRRM2RMDIRS="${EMACS_ETCDIR} ${EMACS_LISPDIR} ${EMACS_INFODIR} ${EMACS_PKGINFODIR} ${EMACS_MANDIR}" \
+#		PLIST_EXCLS="${EMACS_PKGDIR}" \
 #		DIRRMDEPTH=2 plist
 #.else
-#	${MAKE} PLIST_SUB_EXCLS="${PLIST_SUB_EXCLS} EMACS_INFODIR=${EMACS_INFODIR}" \
-#		DIRRM2RMDIRS="${EMACS_ETCDIR} ${EMACS_LISPDIR} ${EMACS_INFODIR} ${EMACS_PKGDIR} ${EMACS_PKG_MANDIR} ${EMACS_PKG_PKGINFODIR}" \
+#.if (${EMACS_PORT} == "emacs20") || (${EMACS_PORT} == "mule")
+#	${MAKE} -DPLIST_OVERRIDE \
+#		PLIST_SUB_EXCLS="${PLIST_SUB_EXCLS} EMACS_INFODIR=${EMACS_INFODIR}" \
+#		DIRRM2RMDIRS="${EMACS_ETCDIR} ${EMACS_LISPDIR} ${EMACS_INFODIR}" \
+#		INFOFILES="mew.info mew.jis.info" DIRRMDEPTH=2 plist
+#.else
+#	${MAKE} -DPLIST_OVERRIDE \
+#		PLIST_SUB_EXCLS="${PLIST_SUB_EXCLS} EMACS_INFODIR=${EMACS_INFODIR}" \
+#		DIRRM2RMDIRS="${EMACS_ETCDIR} ${EMACS_LISPDIR} ${EMACS_INFODIR}" \
 #		INFOFILES=mew.info DIRRMDEPTH=2 plist
 #.endif
-#	${INSTALL} -c -m 644 -o kiri -g staff ${WRKPLIST} ${PLIST}
+#.endif
 
+.include "${.CURDIR}/../${MEW_DIST}/files/bsd.xemacs21.mk"
 .include <bsd.port.mk>
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ -I ^# \$FreeBSD /usr/ports/current/mail/mew/files/DESCR.tmpl mail/mew/files/DESCR.tmpl
--- /usr/ports/current/mail/mew/files/DESCR.tmpl	Tue Jan  4 23:29:12 2000
+++ mail/mew/files/DESCR.tmpl	Tue Feb 29 22:41:24 2000
@@ -9,12 +9,11 @@
 picture of a birthday cake with the song "Happy Birthday to you" to your
 friend, which is encrypted by strong cryptograph.
 
-This port is the Mew for %%EMACS_CMD%%(%%PORTDIR%%). 
 The Mew port and corresponding Emacs port are listed bellow and elisp
 `site-lisp' directory(elisp load path), info path and etc directory(only
 effective for xemacs ports) are shown as well. 
 
-%%PORTDIR%%(%%PKGNAME%%) ===> editors/%%EMACS_PORT_NAME%%(%%EMACS_CMD%%) 
+%%PORTDIR%%(%%PKGNAME%%) ===> editors/%%EMACS_PORT%%(%%EMACS_CMD%%) 
 	Lisp directory : %%ELISPDIR%%
 	Info directory : %%INFODIR%%
 	ETC directory  : %%ETCDIR%%
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ -I ^# \$FreeBSD /usr/ports/current/mail/mew/files/bsd.xemacs21.mk mail/mew/files/bsd.xemacs21.mk
--- /usr/ports/current/mail/mew/files/bsd.xemacs21.mk	Thu Jan  1 09:00:00 1970
+++ mail/mew/files/bsd.xemacs21.mk	Wed Mar  1 19:15:57 2000
@@ -0,0 +1,76 @@
+#-*- mode: Makefile; tab-width: 4; -*-
+#
+# for XEmacs-xx (xx >= 21)
+#
+
+.if make(xemacs-build)     || make(xemacs-package)    || make(xemacs-repackage) || \
+	make(xemacs-release)   || make(xemacs-clean)      || \
+	make(do-xemacs-build)  || make(do-xemacs-package) || make(do-xemacs-release)
+XEMACS_PKG_MODE?=		yes
+.endif
+
+.if !defined(XEMACS_PKG_MODE) || ${XEMACS_PKG_MODE} == ""
+
+# add xemacs-pkg master sites
+
+MASTER_SITES+=	ftp://ftp.xemacs.org/pub/xemacs/packages/ \
+				ftp://ftp.mpi-sb.mpg.de/pub/gnu/mirror/ftp.xemacs.org/xemacs/packages/ \
+				ftp://ftp.usyd.edu.au/pub/Xemacs/packages/ \
+				ftp://ftp.lab.kdd.co.jp/xemacs/packages/ \
+				ftp://ftp.th-darmstadt.de/pub/editors/xemacs/packages/ \
+				${MASTER_SITE_PORTS_JP}
+
+# extract only master distfiles in ${MASTERDIR}/Makefile
+
+EXTRACT_ONLY:=	${DISTFILES}
+
+# add xemacs-pkg distfiles
+
+DISTFILES+=		xemacs/${XEMACS_PACKAGE_NAME}.tar.gz
+
+.endif
+
+# xemacs-pkg name
+
+XEMACS_PACKAGE_NAME=	${XEMACS_PACKAGE}-${XEMACS_PKG_VERSION}-pkg
+
+.if ${EMACS_PORT} == "xemacs21" || ${EMACS_PORT} == "xemacs21-mule"
+
+NO_BUILD=				yes
+PLIST_SUB+=				EMACS_PKGDIR=${EMACS_PKGDIR}
+
+XEMACS_SUBDIR=			site-packages
+XEMACS_DIR=				${PREFIX}/lib/xemacs
+
+# setting emacs variables for xemacs21* ports
+
+EMACS_VER=				21.1.9
+.if ${EMACS_PORT} == "xemacs21"
+EMACS_CMD=				xemacs${EMACS_MAJOR_VER}
+.elif ${EMACS_PORT} == "xemacs21-mule"
+EMACS_CMD=				xemacs${EMACS_MAJOR_VER}-mule
+.endif
+EMACS_LIBDIR=			lib/xemacs
+EMACS_LIBDIR_WITH_VER=	lib/xemacs-${EMACS_VER}
+EMACS_PKGDIR=			${EMACS_LIBDIR}/${XEMACS_SUBDIR}
+EMACS_ETCDIR=			${EMACS_PKGDIR}/etc
+EMACS_LISPDIR=			${EMACS_PKGDIR}/lisp
+EMACS_INFODIR=			${EMACS_PKGDIR}/info
+EMACS_PKGINFODIR=		${EMACS_PKGDIR}/pkginfo
+EMACS_MANDIR=			${EMACS_PKGDIR}/man
+
+.if !defined(XEMACS_PKG_MODE) || ${XEMACS_PKG_MODE} == ""
+
+post-extract:
+	${MKDIR} ${WRKDIR}/${XEMACS_SUBDIR}
+	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \
+		${DISTDIR}/xemacs/${XEMACS_PACKAGE_NAME}.tar.gz \
+		${EXTRACT_AFTER_ARGS} -C ${WRKDIR}/${XEMACS_SUBDIR}
+
+do-install:
+	${MKDIR} ${XEMACS_DIR}
+	${CP} -Rp ${WRKDIR}/${XEMACS_SUBDIR} ${XEMACS_DIR}
+
+.endif
+
+.endif
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ -I ^# \$FreeBSD /usr/ports/current/mail/mew/files/md5 mail/mew/files/md5
--- /usr/ports/current/mail/mew/files/md5	Wed Jan  5 04:33:18 2000
+++ mail/mew/files/md5	Tue Feb 29 23:43:27 2000
@@ -1 +1,2 @@
-MD5 (mew-1.94.1.tar.gz) = 35e300b57fadfddb1c1782af13e00cfa
+MD5 (mew-1.94.2.tar.gz) = 8b86e26586c07e9425e470706734a35d
+MD5 (xemacs/mew-1.01-pkg.tar.gz) = 4087340a1f0091ab7ce4e3b011958ac2
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ -I ^# \$FreeBSD /usr/ports/current/mail/mew/files/message.sh mail/mew/files/message.sh
--- /usr/ports/current/mail/mew/files/message.sh	Tue Jan  4 23:29:13 2000
+++ mail/mew/files/message.sh	Tue Feb 29 23:01:46 2000
@@ -16,7 +16,7 @@
 *************************************************************************
 * You must set at least following elisps to your own dot.emacs file:    *
 *                                                                       *
-*       (require 'mew-${EMACS_PORT_NAME}-startup)                                  *
+*       (require '${MEW_DIST}-${EMACS_PORT}-startup)                                    *
 *       (autoload 'mew "mew" nil t)                                     *
 *       (autoload 'mew-send "mew" nil t)                                *
 *       (setq mew-mail-domain-list '("Name_Server_Domain_Name"))        *
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ -I ^# \$FreeBSD /usr/ports/current/mail/mew/files/mew-startup.el.tmpl mail/mew/files/mew-startup.el.tmpl
--- /usr/ports/current/mail/mew/files/mew-startup.el.tmpl	Tue Jan  4 23:29:14 2000
+++ mail/mew/files/mew-startup.el.tmpl	Wed Feb 23 15:18:46 2000
@@ -1,2 +1,2 @@
 (setq load-path (cons "%%ELISPDIR%%" load-path))
-(provide 'mew-%%EMACS_PORT_NAME%%-startup)
+(provide 'mew-%%EMACS_PORT%%-startup)
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ -I ^# \$FreeBSD /usr/ports/current/mail/mew/files/mew-xemacs-startup.el.tmpl mail/mew/files/mew-xemacs-startup.el.tmpl
--- /usr/ports/current/mail/mew/files/mew-xemacs-startup.el.tmpl	Tue Jan  4 23:29:14 2000
+++ mail/mew/files/mew-xemacs-startup.el.tmpl	Wed Feb 23 15:18:36 2000
@@ -1,3 +1,3 @@
 (setq load-path (cons "%%ELISPDIR%%" load-path))
 (setq mew-icon-directory "%%ETCDIR%%")
-(provide 'mew-%%EMACS_PORT_NAME%%-startup)
+(provide 'mew-%%EMACS_PORT%%-startup)
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ -I ^# \$FreeBSD /usr/ports/current/mail/mew/files/mew-xemacs.el.diff.tmpl mail/mew/files/mew-xemacs.el.diff.tmpl
--- /usr/ports/current/mail/mew/files/mew-xemacs.el.diff.tmpl	Thu Jan  1 09:00:00 1970
+++ mail/mew/files/mew-xemacs.el.diff.tmpl	Thu Feb 24 23:56:20 2000
@@ -0,0 +1,13 @@
+--- mew-xemacs.el~	Mon Aug 30 12:43:16 1999
++++ mew-xemacs.el	Mon Aug 30 20:58:26 1999
+@@ -30,8 +30,8 @@
+   (defvar mew-summary-toolbar nil)
+   (defvar mew-draft-toolbar nil))
+  (t
+-  (defvar mew-icon-directory nil)
+-
++  (defvar mew-icon-directory (if (fboundp 'locate-data-directory)
++				 (locate-data-directory "%%MEW_DIST%%")))
+   (defvar mew-icon-separate
+     (toolbar-make-button-list
+      (expand-file-name "mew-sep.xpm" mew-icon-directory)))
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ -I ^# \$FreeBSD /usr/ports/current/mail/mew/files/tmpl2file.sh mail/mew/files/tmpl2file.sh
--- /usr/ports/current/mail/mew/files/tmpl2file.sh	Tue Jan  4 23:29:14 2000
+++ mail/mew/files/tmpl2file.sh	Wed Feb 23 15:49:29 2000
@@ -1,5 +1,11 @@
 #!/bin/sh
 
+if [ X"${EMACS_PORT}" = "Xemacs" ]; then
+    MEW_NAME="mew"
+else
+    MEW_NAME=mew-${EMACS_PORT}
+fi
+
 for f in ${TMPL_FILES}; do
 	${SED} \
 		-e "s,%%PREFIX%%,${PREFIX},g" \
@@ -20,7 +26,8 @@
 		-e "s,%%TOUCH%%,${TOUCH},g" \
 		-e "s,%%EMACS_CMD%%,${EMACS_CMD},g" \
 		-e "s,%%PKGNAME%%,${PKGNAME},g" \
-		-e "s,%%EMACS_PORT_NAME%%,${EMACS_PORT_NAME},g" \
+		-e "s,%%EMACS_PORT%%,${EMACS_PORT},g" \
 		-e "s,%%VERSION%%,${VERSION},g" \
+		-e "s,%%MEW_NAME%%,${MEW_NAME},g" \
 		< ${FILESDIR}/${f}.tmpl > ${WRKTMPDIR}/${f}
 done
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ -I ^# \$FreeBSD /usr/ports/current/mail/mew/patches/patch-aa mail/mew/patches/patch-aa
--- /usr/ports/current/mail/mew/patches/patch-aa	Wed Jan  5 04:33:19 2000
+++ mail/mew/patches/patch-aa	Wed Feb 23 11:05:02 2000
@@ -1,5 +1,5 @@
---- Makefile~	Wed Oct 20 20:20:51 1999
-+++ Makefile	Fri Dec 10 22:42:06 1999
+--- Makefile.orig	Wed Oct 20 20:20:51 1999
++++ Makefile	Mon Feb 21 15:55:08 2000
 @@ -88,12 +88,29 @@
  	mew-temacs.el   mew-xemacs.el  mew-addrbook.el \
  	mew.el
@@ -41,23 +41,13 @@
  	cd $(BIN); $(MAKE) install CFLAGS="$(CFLAGS)" CC="$(CC)" BINDIR="$(BINDIR)"
  
  clean:
-@@ -126,19 +143,32 @@
- 	cd info; $(MAKE) info EMACS=$(EMACS)
- 
- install-info:
--	cd info; $(MAKE) install-info INFODIR=$(INFODIR)
-+	cd info; $(MAKE) install-info INFODIR=$(INFODIR) XEMACS_VER_OVER20=${XEMACS_VER_OVER20}
- 
- jinfo::
- 	cd info; $(MAKE) jinfo EMACS=$(EMACS)
- 
+@@ -134,11 +151,16 @@
  install-jinfo:
--	cd info; $(MAKE) install-jinfo INFODIR=$(INFODIR)
-+	cd info; $(MAKE) install-jinfo INFODIR=$(INFODIR) XEMACS_VER_OVER20=${XEMACS_VER_OVER20}
-+
+ 	cd info; $(MAKE) install-jinfo INFODIR=$(INFODIR)
+ 
 +install-man:
 +	cd info; $(MAKE) install-man MANDIR=$(MANDIR)
- 
++
  install-etc:
  	-@if [ ! -d $(ETCDIR) ]; then \
 -		$(MKDIR) $(ETCDIR); \
@@ -67,14 +57,6 @@
 +	cd etc; \
 +	${BSD_INSTALL_DATA} ${PIXMAPS} ${ETCDIR}; \
 +	${BSD_INSTALL_DATA} ${PIXMAPSETC} ${ETCDIR}/etc
-+
-+
-+install-package: install install-info install-man install-etc
-+	${MKDIR} ${EMACSPKGDIR} ${PKG_PKGINFODIR}
-+	${ECHO} "pkginfo/MANIFEST.mew" > ${PKG_PKGINFODIR}/MANIFEST.mew
-+	find ${EMACSPKGDIR} -type f | sed -e "s,^${EMACSPKGDIR}/,," | \
-+		grep '^etc/mew/\|^info/mew\.\|^lisp/mew/\|^man/mew/' | \
-+		grep -v "pkginfo/MANIFEST.mew" >> ${PKG_PKGINFODIR}/MANIFEST.mew
  
  ##
  ## End of Makefile
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ -I ^# \$FreeBSD /usr/ports/current/mail/mew/patches/patch-ab mail/mew/patches/patch-ab
--- /usr/ports/current/mail/mew/patches/patch-ab	Thu Sep  9 17:06:19 1999
+++ mail/mew/patches/patch-ab	Tue Feb 29 23:15:30 2000
@@ -1,6 +1,6 @@
---- bin/Makefile.orig	Tue Mar  2 12:05:21 1999
-+++ bin/Makefile	Mon Aug 30 22:50:21 1999
-@@ -21,16 +21,16 @@
+--- bin/Makefile.orig	Wed Oct 27 08:55:11 1999
++++ bin/Makefile	Tue Feb 29 23:14:39 2000
+@@ -22,7 +22,7 @@
  	$(CC) -o $@ $(OBJS)
  	$(RM) $(ALT)
  	for f in $(ALT); do \
@@ -9,8 +9,10 @@
  
  uumerge: uumerge.in
  	sed -e "s|@PERL@|${PERL}|" < uumerge.in > uumerge
- 
- install: $(PRG) $(OTH)
+@@ -32,10 +32,10 @@
+ 	-@if [ ! -d $(BINDIR) ]; then \
+ 		$(MKDIR) $(BINDIR); \
+ 	fi; \
 -	cp $(PRG) $(BINDIR)
 +	${BSD_INSTALL_PROGRAM} $(PRG) $(BINDIR)
  	for f in $(ALT); do \
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ -I ^# \$FreeBSD /usr/ports/current/mail/mew/patches/patch-ac mail/mew/patches/patch-ac
--- /usr/ports/current/mail/mew/patches/patch-ac	Wed Jan  5 04:33:21 2000
+++ mail/mew/patches/patch-ac	Wed Feb 23 11:05:02 2000
@@ -1,41 +1,20 @@
 --- info/Makefile.orig	Wed Oct 20 20:20:56 1999
-+++ info/Makefile	Fri Dec 10 22:45:46 1999
-@@ -32,6 +32,7 @@
- 
- INFO  = mew.info mew.info-1 mew.info-2 mew.info-3
- JINFO = mew.jis.info mew.jis.info-1 mew.jis.info-2
-+MANUALS= 00readme mew.texi
- 
- info::
- 	sed -e 's/@setfilename mew.jis.info/@setfilename mew.info/' \
-@@ -55,8 +56,8 @@
++++ info/Makefile	Mon Feb 21 16:02:15 2000
+@@ -55,7 +55,7 @@
  	-@if [ ! -d $(INFODIR) ]; then \
  		$(MKDIR) $(INFODIR); \
  	fi; \
 -	cp $(INFO) $(INFODIR)
--	-@if [ -x "$(INSTALLINFO)" ]; then \
 +	${BSD_INSTALL_DATA} $(INFO) $(INFODIR)
-+	-@if [ -x "$(INSTALLINFO)" -a -z "${XEMACS_VER_OVER20}" ]; then \
+ 	-@if [ -x "$(INSTALLINFO)" ]; then \
  		$(INSTALLINFO) mew.info $(INFODIR)/dir; \
  	else \
- 		echo "Don't forget to edit $(INFODIR)/dir for Mew."; \
-@@ -66,12 +67,17 @@
+@@ -66,7 +66,7 @@
  	-@if [ ! -d $(INFODIR) ]; then \
  		$(MKDIR) $(INFODIR); \
  	fi; \
 -	cp $(JINFO) $(INFODIR)
--	-@if [ -x "$(INSTALLINFO)" ]; then \
 +	${BSD_INSTALL_DATA} $(JINFO) $(INFODIR)
-+	-@if [ -x "$(INSTALLINFO)" -a -z "${XEMACS_VER_OVER20}" ]; then \
+ 	-@if [ -x "$(INSTALLINFO)" ]; then \
  		$(INSTALLINFO) mew.jis.info $(INFODIR)/dir; \
  	else \
- 		echo "Don't forget to edit $(INFODIR)/dir for Mew."; \
- 	fi
-+
-+install-man:
-+	${MKDIR} ${MANDIR}
-+	${BSD_INSTALL_DATA} ${MANUALS} ${MANDIR}
-+
- ##
- ## End of Makefile
- ##
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ -I ^# \$FreeBSD /usr/ports/current/mail/mew/patches/patch-ad mail/mew/patches/patch-ad
--- /usr/ports/current/mail/mew/patches/patch-ad	Thu Sep  9 17:06:19 1999
+++ mail/mew/patches/patch-ad	Thu Jan  1 09:00:00 1970
@@ -1,13 +0,0 @@
---- mew-xemacs.el~	Mon Aug 30 12:43:16 1999
-+++ mew-xemacs.el	Mon Aug 30 20:58:26 1999
-@@ -30,8 +30,8 @@
-   (defvar mew-summary-toolbar nil)
-   (defvar mew-draft-toolbar nil))
-  (t
--  (defvar mew-icon-directory nil)
--
-+  (defvar mew-icon-directory (if (fboundp 'locate-data-directory)
-+				 (locate-data-directory "mew")))
-   (defvar mew-icon-separate
-     (toolbar-make-button-list
-      (expand-file-name "mew-sep.xpm" mew-icon-directory)))
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ -I ^# \$FreeBSD /usr/ports/current/mail/mew/pkg/COMMENT mail/mew/pkg/COMMENT
--- /usr/ports/current/mail/mew/pkg/COMMENT	Wed Jan  5 04:33:21 2000
+++ mail/mew/pkg/COMMENT	Wed Mar  1 20:45:33 2000
@@ -1 +1 @@
-Message interface to Emacs Window for emacs
+Message interface to Emacs Window for emacs(release version)
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ -I ^# \$FreeBSD /usr/ports/current/mail/mew/pkg/DESCR mail/mew/pkg/DESCR
--- /usr/ports/current/mail/mew/pkg/DESCR	Wed Jan  5 04:33:22 2000
+++ mail/mew/pkg/DESCR	Wed Mar  1 20:45:34 2000
@@ -9,12 +9,11 @@
 picture of a birthday cake with the song "Happy Birthday to you" to your
 friend, which is encrypted by strong cryptograph.
 
-This port is the Mew for emacs-19.34(mail/mew).
 The Mew port and corresponding Emacs port are listed bellow and elisp
 `site-lisp' directory(elisp load path), info path and etc directory(only
-effective for xemacs ports) are shown as well.
+effective for xemacs ports) are shown as well. 
 
-mail/mew(mew-emacs-1.94.1) ===> editors/emacs(emacs-19.34)
-       Lisp directory : /usr/local/share/emacs/site-lisp/mew
-       Info directory : /usr/local/info
-       ETC directory  : /usr/local/share/emacs/etc/mew
+mail/mew(mew-emacs-1.94.2) ===> editors/emacs(emacs-19.34) 
+	Lisp directory : /usr/local/share/emacs/site-lisp/mew
+	Info directory : /usr/local/info
+	ETC directory  : /usr/local/share/emacs/etc/mew
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ -I ^# \$FreeBSD /usr/ports/current/mail/mew/pkg/MESSAGE mail/mew/pkg/MESSAGE
--- /usr/ports/current/mail/mew/pkg/MESSAGE	Wed Jan  5 04:33:22 2000
+++ mail/mew/pkg/MESSAGE	Wed Mar  1 20:45:34 2000
@@ -1,7 +1,7 @@
 *************************************************************************
 * You must set at least following elisps to your own dot.emacs file:    *
 *                                                                       *
-*       (require 'mew-emacs-startup)                                  *
+*       (require 'mew-emacs-startup)                                    *
 *       (autoload 'mew "mew" nil t)                                     *
 *       (autoload 'mew-send "mew" nil t)                                *
 *       (setq mew-mail-domain-list '("Name_Server_Domain_Name"))        *
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ -I ^# \$FreeBSD /usr/ports/current/mail/mew/pkg/PLIST mail/mew/pkg/PLIST
--- /usr/ports/current/mail/mew/pkg/PLIST	Tue Jan  4 23:29:17 2000
+++ mail/mew/pkg/PLIST	Wed Mar  1 20:45:38 2000
@@ -16,8 +16,6 @@
 share/doc/mew/00readme
 share/doc/mew/contrib/00readme
 share/doc/mew/contrib/00readme-namazu.jis
-share/doc/mew/contrib/bbdb-ml-ext.el
-share/doc/mew/contrib/bbdb-ml.el
 share/doc/mew/contrib/im+.el
 share/doc/mew/contrib/im+.readme.jis
 share/doc/mew/contrib/imget.sh
@@ -45,7 +43,6 @@
 share/doc/mew/contrib/mew-wheel.el
 share/doc/mew/contrib/mknmz-inc.pl
 share/doc/mew/contrib/rfc2368.el
-share/doc/mew/mew.texi
 %%EMACS_LISPDIR%%/mew-emacs-startup.el
 %%EMACS_LISPDIR%%/mew/mew-addrbook.el
 %%EMACS_LISPDIR%%/mew/mew-addrbook.elc
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ -I ^# \$FreeBSD /usr/ports/current/mail/mew-emacs20/Makefile mail/mew-emacs20/Makefile
--- /usr/ports/current/mail/mew-emacs20/Makefile	Wed Jan  5 04:33:22 2000
+++ mail/mew-emacs20/Makefile	Sat Mar  4 19:47:09 2000
@@ -1,11 +1,14 @@
 # New ports collection makefile for: Mew (for emacs20)
-# Version required:	1.94.1
+# Version required:	1.94.2
 # Date created:		17 January 1998
 # Whom:			Kiriyama Kazuhiko <kiri@kiri.toba-cmt.ac.jp>
 #
 # $FreeBSD: ports/mail/mew-emacs20/Makefile,v 1.6 2000/01/04 14:29:22 shige Exp $
 #
 
-EMACS_PORT_NAME=	emacs20
+EMACS_PORT=	emacs20
 
-.include "${.CURDIR}/../mew/Makefile"
+MASTERDIR=	${.CURDIR}/../mew
+PKGDIR=		${.CURDIR}/pkg
+
+.include <${MASTERDIR}/Makefile>
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ -I ^# \$FreeBSD /usr/ports/current/mail/mew-emacs20/pkg/COMMENT mail/mew-emacs20/pkg/COMMENT
--- /usr/ports/current/mail/mew-emacs20/pkg/COMMENT	Wed Jan  5 04:33:22 2000
+++ mail/mew-emacs20/pkg/COMMENT	Wed Mar  1 20:45:34 2000
@@ -1 +1 @@
-Message interface to Emacs Window for emacs20
+Message interface to Emacs Window for emacs20(release version)
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ -I ^# \$FreeBSD /usr/ports/current/mail/mew-emacs20/pkg/DESCR mail/mew-emacs20/pkg/DESCR
--- /usr/ports/current/mail/mew-emacs20/pkg/DESCR	Wed Jan  5 04:33:22 2000
+++ mail/mew-emacs20/pkg/DESCR	Wed Mar  1 20:45:34 2000
@@ -9,12 +9,11 @@
 picture of a birthday cake with the song "Happy Birthday to you" to your
 friend, which is encrypted by strong cryptograph.
 
-This port is the Mew for emacs-20.5(mail/mew-emacs20). 
 The Mew port and corresponding Emacs port are listed bellow and elisp
 `site-lisp' directory(elisp load path), info path and etc directory(only
 effective for xemacs ports) are shown as well. 
 
-mail/mew-emacs20(mew-emacs20-1.94.1) ===> editors/emacs20(emacs-20.5) 
+mail/mew-emacs20(mew-emacs20-1.94.2) ===> editors/emacs20(emacs-20.5) 
 	Lisp directory : /usr/local/share/emacs/site-lisp/mew
 	Info directory : /usr/local/info
 	ETC directory  : /usr/local/share/emacs/etc/mew
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ -I ^# \$FreeBSD /usr/ports/current/mail/mew-emacs20/pkg/PLIST mail/mew-emacs20/pkg/PLIST
--- /usr/ports/current/mail/mew-emacs20/pkg/PLIST	Tue Jan  4 23:29:23 2000
+++ mail/mew-emacs20/pkg/PLIST	Thu Mar  2 22:47:42 2000
@@ -9,7 +9,10 @@
 info/mew.info-1
 info/mew.info-2
 info/mew.info-3
+@exec [ -f %D/info/dir ] || sed -ne 1,/Menu:/p /usr/share/info/dir > %D/info/dir
+@unexec install-info --delete %D/info/mew.jis.info %D/info/dir
 info/mew.jis.info
+@exec install-info %D/info/mew.jis.info %D/info/dir
 info/mew.jis.info-1
 info/mew.jis.info-2
 share/doc/mew/00changes
@@ -19,8 +22,6 @@
 share/doc/mew/00readme
 share/doc/mew/contrib/00readme
 share/doc/mew/contrib/00readme-namazu.jis
-share/doc/mew/contrib/bbdb-ml-ext.el
-share/doc/mew/contrib/bbdb-ml.el
 share/doc/mew/contrib/im+.el
 share/doc/mew/contrib/im+.readme.jis
 share/doc/mew/contrib/imget.sh
@@ -48,7 +49,6 @@
 share/doc/mew/contrib/mew-wheel.el
 share/doc/mew/contrib/mknmz-inc.pl
 share/doc/mew/contrib/rfc2368.el
-share/doc/mew/mew.texi
 %%EMACS_LISPDIR%%/mew/mew-addrbook.el
 %%EMACS_LISPDIR%%/mew/mew-addrbook.elc
 %%EMACS_LISPDIR%%/mew/mew-attach.el
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ -I ^# \$FreeBSD /usr/ports/current/mail/mew-mule/Makefile mail/mew-mule/Makefile
--- /usr/ports/current/mail/mew-mule/Makefile	Wed Jan  5 04:33:22 2000
+++ mail/mew-mule/Makefile	Sat Mar  4 19:47:09 2000
@@ -1,11 +1,14 @@
 # New ports collection makefile for: Mew (for mule)
-# Version required:	1.94.1
+# Version required:	1.94.2
 # Date created:		17 January 1998
 # Whom:			Kiriyama Kazuhiko <kiri@kiri.toba-cmt.ac.jp>
 #
 # $FreeBSD: ports/mail/mew-mule/Makefile,v 1.8 2000/01/04 14:29:24 shige Exp $
 #
 
-EMACS_PORT_NAME=	mule
+EMACS_PORT=	mule
 
-.include "${.CURDIR}/../mew/Makefile"
+MASTERDIR=	${.CURDIR}/../mew
+PKGDIR=		${.CURDIR}/pkg
+
+.include <${MASTERDIR}/Makefile>
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ -I ^# \$FreeBSD /usr/ports/current/mail/mew-mule/pkg/COMMENT mail/mew-mule/pkg/COMMENT
--- /usr/ports/current/mail/mew-mule/pkg/COMMENT	Wed Jan  5 04:33:22 2000
+++ mail/mew-mule/pkg/COMMENT	Wed Mar  1 20:45:34 2000
@@ -1 +1 @@
-Message interface to Emacs Window for mule
+Message interface to Emacs Window for mule(release version)
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ -I ^# \$FreeBSD /usr/ports/current/mail/mew-mule/pkg/DESCR mail/mew-mule/pkg/DESCR
--- /usr/ports/current/mail/mew-mule/pkg/DESCR	Wed Jan  5 04:33:22 2000
+++ mail/mew-mule/pkg/DESCR	Wed Mar  1 20:45:34 2000
@@ -9,12 +9,11 @@
 picture of a birthday cake with the song "Happy Birthday to you" to your
 friend, which is encrypted by strong cryptograph.
 
-This port is the Mew for mule-19.34(mail/mew-mule). 
 The Mew port and corresponding Emacs port are listed bellow and elisp
 `site-lisp' directory(elisp load path), info path and etc directory(only
 effective for xemacs ports) are shown as well. 
 
-mail/mew-mule(mew-mule-1.94.1) ===> editors/mule(mule-19.34) 
+mail/mew-mule(mew-mule-1.94.2) ===> editors/mule(mule-19.34) 
 	Lisp directory : /usr/local/share/mule/site-lisp/mew
 	Info directory : /usr/local/share/mule/info
 	ETC directory  : /usr/local/share/mule/etc/mew
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ -I ^# \$FreeBSD /usr/ports/current/mail/mew-mule/pkg/MESSAGE mail/mew-mule/pkg/MESSAGE
--- /usr/ports/current/mail/mew-mule/pkg/MESSAGE	Tue Jan  4 23:29:25 2000
+++ mail/mew-mule/pkg/MESSAGE	Wed Mar  1 20:45:34 2000
@@ -1,7 +1,7 @@
 *************************************************************************
 * You must set at least following elisps to your own dot.emacs file:    *
 *                                                                       *
-*       (require 'mew-mule-startup)                                  *
+*       (require 'mew-mule-startup)                                    *
 *       (autoload 'mew "mew" nil t)                                     *
 *       (autoload 'mew-send "mew" nil t)                                *
 *       (setq mew-mail-domain-list '("Name_Server_Domain_Name"))        *
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ -I ^# \$FreeBSD /usr/ports/current/mail/mew-mule/pkg/PLIST mail/mew-mule/pkg/PLIST
--- /usr/ports/current/mail/mew-mule/pkg/PLIST	Tue Jan  4 23:29:25 2000
+++ mail/mew-mule/pkg/PLIST	Thu Mar  2 22:49:05 2000
@@ -9,8 +9,6 @@
 share/doc/mew/00readme
 share/doc/mew/contrib/00readme
 share/doc/mew/contrib/00readme-namazu.jis
-share/doc/mew/contrib/bbdb-ml-ext.el
-share/doc/mew/contrib/bbdb-ml.el
 share/doc/mew/contrib/im+.el
 share/doc/mew/contrib/im+.readme.jis
 share/doc/mew/contrib/imget.sh
@@ -38,7 +36,6 @@
 share/doc/mew/contrib/mew-wheel.el
 share/doc/mew/contrib/mknmz-inc.pl
 share/doc/mew/contrib/rfc2368.el
-share/doc/mew/mew.texi
 share/examples/mew/Addrbook
 share/examples/mew/dot.emacs/dot.emacs.el
 share/examples/mew/user-install
@@ -49,7 +46,10 @@
 share/mule/info/mew.info-1
 share/mule/info/mew.info-2
 share/mule/info/mew.info-3
+@exec [ -f %D/share/mule/info/dir ] || sed -ne 1,/Menu:/p /usr/share/info/dir > %D/share/mule/info/dir
+@unexec install-info --delete %D/share/mule/info/mew.jis.info %D/share/mule/info/dir
 share/mule/info/mew.jis.info
+@exec install-info %D/share/mule/info/mew.jis.info %D/share/mule/info/dir
 share/mule/info/mew.jis.info-1
 share/mule/info/mew.jis.info-2
 %%EMACS_LISPDIR%%/mew-mule-startup.el
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ -I ^# \$FreeBSD /usr/ports/current/mail/mew-xemacs/Makefile mail/mew-xemacs/Makefile
--- /usr/ports/current/mail/mew-xemacs/Makefile	Wed Jan  5 04:33:22 2000
+++ mail/mew-xemacs/Makefile	Sat Mar  4 19:47:09 2000
@@ -1,11 +1,14 @@
 # New ports collection makefile for: Mew (for xemacs)
-# Version required:	1.94.1
+# Version required:	1.94.2
 # Date created:		17 January 1998
 # Whom:			Kiriyama Kazuhiko <kiri@kiri.toba-cmt.ac.jp>
 #
 # $FreeBSD: ports/mail/mew-xemacs/Makefile,v 1.7 2000/01/04 14:29:26 shige Exp $
 #
 
-EMACS_PORT_NAME=	xemacs
+EMACS_PORT=	xemacs
 
-.include "${.CURDIR}/../mew/Makefile"
+MASTERDIR=	${.CURDIR}/../mew
+PKGDIR=		${.CURDIR}/pkg
+
+.include <${MASTERDIR}/Makefile>
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ -I ^# \$FreeBSD /usr/ports/current/mail/mew-xemacs/pkg/COMMENT mail/mew-xemacs/pkg/COMMENT
--- /usr/ports/current/mail/mew-xemacs/pkg/COMMENT	Wed Jan  5 04:33:22 2000
+++ mail/mew-xemacs/pkg/COMMENT	Wed Mar  1 20:45:34 2000
@@ -1 +1 @@
-Message interface to Emacs Window for xemacs
+Message interface to Emacs Window for xemacs(release version)
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ -I ^# \$FreeBSD /usr/ports/current/mail/mew-xemacs/pkg/DESCR mail/mew-xemacs/pkg/DESCR
--- /usr/ports/current/mail/mew-xemacs/pkg/DESCR	Wed Jan  5 04:33:22 2000
+++ mail/mew-xemacs/pkg/DESCR	Wed Mar  1 20:45:34 2000
@@ -9,12 +9,11 @@
 picture of a birthday cake with the song "Happy Birthday to you" to your
 friend, which is encrypted by strong cryptograph.
 
-This port is the Mew for xemacs-19.16(mail/mew-xemacs). 
 The Mew port and corresponding Emacs port are listed bellow and elisp
 `site-lisp' directory(elisp load path), info path and etc directory(only
 effective for xemacs ports) are shown as well. 
 
-mail/mew-xemacs(mew-xemacs-1.94.1) ===> editors/xemacs(xemacs-19.16) 
+mail/mew-xemacs(mew-xemacs-1.94.2) ===> editors/xemacs(xemacs-19.16) 
 	Lisp directory : /usr/local/lib/xemacs/site-lisp/mew
 	Info directory : /usr/local/lib/xemacs-19.16/info
 	ETC directory  : /usr/local/lib/xemacs/etc/mew
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ -I ^# \$FreeBSD /usr/ports/current/mail/mew-xemacs/pkg/MESSAGE mail/mew-xemacs/pkg/MESSAGE
--- /usr/ports/current/mail/mew-xemacs/pkg/MESSAGE	Tue Jan  4 23:29:27 2000
+++ mail/mew-xemacs/pkg/MESSAGE	Wed Mar  1 20:45:34 2000
@@ -1,7 +1,7 @@
 *************************************************************************
 * You must set at least following elisps to your own dot.emacs file:    *
 *                                                                       *
-*       (require 'mew-xemacs-startup)                                  *
+*       (require 'mew-xemacs-startup)                                    *
 *       (autoload 'mew "mew" nil t)                                     *
 *       (autoload 'mew-send "mew" nil t)                                *
 *       (setq mew-mail-domain-list '("Name_Server_Domain_Name"))        *
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ -I ^# \$FreeBSD /usr/ports/current/mail/mew-xemacs/pkg/PLIST mail/mew-xemacs/pkg/PLIST
--- /usr/ports/current/mail/mew-xemacs/pkg/PLIST	Tue Jan  4 23:29:28 2000
+++ mail/mew-xemacs/pkg/PLIST	Wed Mar  1 20:45:46 2000
@@ -123,8 +123,6 @@
 share/doc/mew/00readme
 share/doc/mew/contrib/00readme
 share/doc/mew/contrib/00readme-namazu.jis
-share/doc/mew/contrib/bbdb-ml-ext.el
-share/doc/mew/contrib/bbdb-ml.el
 share/doc/mew/contrib/im+.el
 share/doc/mew/contrib/im+.readme.jis
 share/doc/mew/contrib/imget.sh
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ -I ^# \$FreeBSD /usr/ports/current/mail/mew-xemacs20/Makefile mail/mew-xemacs20/Makefile
--- /usr/ports/current/mail/mew-xemacs20/Makefile	Wed Jan  5 04:33:28 2000
+++ mail/mew-xemacs20/Makefile	Sat Mar  4 19:47:09 2000
@@ -1,11 +1,14 @@
 # New ports collection makefile for: Mew (for xemacs20)
-# Version required:	1.94.1
+# Version required:	1.94.2
 # Date created:		17 January 1998
 # Whom:			Kiriyama Kazuhiko <kiri@kiri.toba-cmt.ac.jp>
 #
 # $FreeBSD: ports/mail/mew-xemacs20/Makefile,v 1.5 2000/01/04 14:29:31 shige Exp $
 #
 
-EMACS_PORT_NAME=	xemacs20
+EMACS_PORT=	xemacs20
 
-.include "${.CURDIR}/../mew/Makefile"
+MASTERDIR=	${.CURDIR}/../mew
+PKGDIR=		${.CURDIR}/pkg
+
+.include <${MASTERDIR}/Makefile>
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ -I ^# \$FreeBSD /usr/ports/current/mail/mew-xemacs20/pkg/COMMENT mail/mew-xemacs20/pkg/COMMENT
--- /usr/ports/current/mail/mew-xemacs20/pkg/COMMENT	Wed Jan  5 04:33:28 2000
+++ mail/mew-xemacs20/pkg/COMMENT	Wed Mar  1 20:45:34 2000
@@ -1 +1 @@
-Message interface to Emacs Window for xemacs20
+Message interface to Emacs Window for xemacs20(release version)
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ -I ^# \$FreeBSD /usr/ports/current/mail/mew-xemacs20/pkg/DESCR mail/mew-xemacs20/pkg/DESCR
--- /usr/ports/current/mail/mew-xemacs20/pkg/DESCR	Wed Jan  5 04:33:28 2000
+++ mail/mew-xemacs20/pkg/DESCR	Wed Mar  1 20:45:34 2000
@@ -9,12 +9,11 @@
 picture of a birthday cake with the song "Happy Birthday to you" to your
 friend, which is encrypted by strong cryptograph.
 
-This port is the Mew for xemacs-20.4(mail/mew-xemacs20). 
 The Mew port and corresponding Emacs port are listed bellow and elisp
 `site-lisp' directory(elisp load path), info path and etc directory(only
 effective for xemacs ports) are shown as well. 
 
-mail/mew-xemacs20(mew-xemacs20-1.94.1) ===> editors/xemacs20(xemacs-20.4) 
+mail/mew-xemacs20(mew-xemacs20-1.94.2) ===> editors/xemacs20(xemacs-20.4) 
 	Lisp directory : /usr/local/lib/xemacs/site-lisp/mew
 	Info directory : /usr/local/lib/xemacs/info
 	ETC directory  : /usr/local/lib/xemacs/etc/mew
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ -I ^# \$FreeBSD /usr/ports/current/mail/mew-xemacs20/pkg/MESSAGE mail/mew-xemacs20/pkg/MESSAGE
--- /usr/ports/current/mail/mew-xemacs20/pkg/MESSAGE	Tue Jan  4 23:29:33 2000
+++ mail/mew-xemacs20/pkg/MESSAGE	Wed Mar  1 20:45:34 2000
@@ -1,7 +1,7 @@
 *************************************************************************
 * You must set at least following elisps to your own dot.emacs file:    *
 *                                                                       *
-*       (require 'mew-xemacs20-startup)                                  *
+*       (require 'mew-xemacs20-startup)                                    *
 *       (autoload 'mew "mew" nil t)                                     *
 *       (autoload 'mew-send "mew" nil t)                                *
 *       (setq mew-mail-domain-list '("Name_Server_Domain_Name"))        *
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ -I ^# \$FreeBSD /usr/ports/current/mail/mew-xemacs20/pkg/PLIST mail/mew-xemacs20/pkg/PLIST
--- /usr/ports/current/mail/mew-xemacs20/pkg/PLIST	Tue Jan  4 23:29:33 2000
+++ mail/mew-xemacs20/pkg/PLIST	Wed Mar  1 20:45:49 2000
@@ -123,8 +123,6 @@
 share/doc/mew/00readme
 share/doc/mew/contrib/00readme
 share/doc/mew/contrib/00readme-namazu.jis
-share/doc/mew/contrib/bbdb-ml-ext.el
-share/doc/mew/contrib/bbdb-ml.el
 share/doc/mew/contrib/im+.el
 share/doc/mew/contrib/im+.readme.jis
 share/doc/mew/contrib/imget.sh
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ -I ^# \$FreeBSD /usr/ports/current/mail/mew-xemacs21/Makefile mail/mew-xemacs21/Makefile
--- /usr/ports/current/mail/mew-xemacs21/Makefile	Wed Jan  5 04:33:28 2000
+++ mail/mew-xemacs21/Makefile	Sat Mar  4 19:47:09 2000
@@ -1,11 +1,14 @@
 # New ports collection makefile for: Mew (for xemacs21)
-# Version required:	1.94.1
+# Version required:	1.94.2
 # Date created:		17 January 1998
 # Whom:			Kiriyama Kazuhiko <kiri@kiri.toba-cmt.ac.jp>
 #
 # $FreeBSD: ports/mail/mew-xemacs21/Makefile,v 1.6 2000/01/04 14:29:34 shige Exp $
 #
 
-EMACS_PORT_NAME=	xemacs21
+EMACS_PORT=	xemacs21
 
-.include "${.CURDIR}/../mew/Makefile"
+MASTERDIR=	${.CURDIR}/../mew
+PKGDIR=		${.CURDIR}/pkg
+
+.include <${MASTERDIR}/Makefile>
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ -I ^# \$FreeBSD /usr/ports/current/mail/mew-xemacs21/pkg/COMMENT mail/mew-xemacs21/pkg/COMMENT
--- /usr/ports/current/mail/mew-xemacs21/pkg/COMMENT	Tue Jan  4 23:37:57 2000
+++ mail/mew-xemacs21/pkg/COMMENT	Wed Mar  1 20:45:34 2000
@@ -1 +1 @@
-Message interface to Emacs Window for xemacs21
+Message interface to Emacs Window for xemacs21(release version)
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ -I ^# \$FreeBSD /usr/ports/current/mail/mew-xemacs21/pkg/DESCR mail/mew-xemacs21/pkg/DESCR
--- /usr/ports/current/mail/mew-xemacs21/pkg/DESCR	Tue Jan  4 23:37:58 2000
+++ mail/mew-xemacs21/pkg/DESCR	Wed Mar  1 20:45:34 2000
@@ -9,12 +9,11 @@
 picture of a birthday cake with the song "Happy Birthday to you" to your
 friend, which is encrypted by strong cryptograph.
 
-This port is the Mew for xemacs-21.1.8(mail/mew-xemacs21). 
 The Mew port and corresponding Emacs port are listed bellow and elisp
 `site-lisp' directory(elisp load path), info path and etc directory(only
 effective for xemacs ports) are shown as well. 
 
-mail/mew-xemacs21(mew-xemacs21-1.94.1) ===> editors/xemacs21(xemacs-21.1.8) 
+mail/mew-xemacs21(mew-xemacs21-1.94.2) ===> editors/xemacs21(xemacs21) 
 	Lisp directory : /usr/local/lib/xemacs/site-packages/lisp/mew
 	Info directory : /usr/local/lib/xemacs/site-packages/info
 	ETC directory  : /usr/local/lib/xemacs/site-packages/etc/mew
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ -I ^# \$FreeBSD /usr/ports/current/mail/mew-xemacs21/pkg/PLIST mail/mew-xemacs21/pkg/PLIST
--- /usr/ports/current/mail/mew-xemacs21/pkg/PLIST	Tue Jan  4 23:37:58 2000
+++ mail/mew-xemacs21/pkg/PLIST	Thu Mar  2 22:58:43 2000
@@ -2,117 +2,132 @@
 bin/mewdecode
 bin/mewencode
 bin/uumerge
-%%EMACS_ETCDIR%%/mew/Mew.img
-%%EMACS_ETCDIR%%/mew/Mew.png
-%%EMACS_ETCDIR%%/mew/Mew.xbm
-%%EMACS_ETCDIR%%/mew/Mew.xpm
-%%EMACS_ETCDIR%%/mew/etc/COLOR
-%%EMACS_ETCDIR%%/mew/etc/mew-Plain.xpm
-%%EMACS_ETCDIR%%/mew/etc/mew-curr.xpm
-%%EMACS_ETCDIR%%/mew/etc/mew-folder.xpm
-%%EMACS_ETCDIR%%/mew/etc/mew-inc2.xpm
-%%EMACS_ETCDIR%%/mew/etc/mew-kill.xpm
-%%EMACS_ETCDIR%%/mew/mew-Audio.xpm
-%%EMACS_ETCDIR%%/mew/mew-Blank.xpm
-%%EMACS_ETCDIR%%/mew/mew-External.xpm
-%%EMACS_ETCDIR%%/mew/mew-Folder.xpm
-%%EMACS_ETCDIR%%/mew/mew-Image.xpm
-%%EMACS_ETCDIR%%/mew/mew-Octet-Stream.xpm
-%%EMACS_ETCDIR%%/mew/mew-Postscript.xpm
-%%EMACS_ETCDIR%%/mew/mew-Rfc822.xpm
-%%EMACS_ETCDIR%%/mew/mew-Text.xpm
-%%EMACS_ETCDIR%%/mew/mew-Unknown.xpm
-%%EMACS_ETCDIR%%/mew/mew-Video.xpm
-%%EMACS_ETCDIR%%/mew/mew-attach.xpm
-%%EMACS_ETCDIR%%/mew/mew-cite.xpm
-%%EMACS_ETCDIR%%/mew/mew-comp.xpm
-%%EMACS_ETCDIR%%/mew/mew-forward.xpm
-%%EMACS_ETCDIR%%/mew/mew-inc.xpm
-%%EMACS_ETCDIR%%/mew/mew-next.xpm
-%%EMACS_ETCDIR%%/mew/mew-pgp-enc.xpm
-%%EMACS_ETCDIR%%/mew/mew-pgp-sigenc.xpm
-%%EMACS_ETCDIR%%/mew/mew-pgp-sign.xpm
-%%EMACS_ETCDIR%%/mew/mew-prev.xpm
-%%EMACS_ETCDIR%%/mew/mew-refile.xpm
-%%EMACS_ETCDIR%%/mew/mew-reply.xpm
-%%EMACS_ETCDIR%%/mew/mew-send.xpm
-%%EMACS_ETCDIR%%/mew/mew-sep.xpm
-%%EMACS_ETCDIR%%/mew/mew-show.xpm
-%%EMACS_ETCDIR%%/mew/mew-write.xpm
-%%EMACS_ETCDIR%%/mew/mew-yank.xpm
+%%EMACS_PKGDIR%%/etc/mew/COLOR
+%%EMACS_PKGDIR%%/etc/mew/Mew.img
+%%EMACS_PKGDIR%%/etc/mew/Mew.png
+%%EMACS_PKGDIR%%/etc/mew/Mew.xbm
+%%EMACS_PKGDIR%%/etc/mew/Mew.xpm
+%%EMACS_PKGDIR%%/etc/mew/mew-Audio.xpm
+%%EMACS_PKGDIR%%/etc/mew/mew-Blank.xpm
+%%EMACS_PKGDIR%%/etc/mew/mew-External.xpm
+%%EMACS_PKGDIR%%/etc/mew/mew-Folder.xpm
+%%EMACS_PKGDIR%%/etc/mew/mew-Image.xpm
+%%EMACS_PKGDIR%%/etc/mew/mew-Octet-Stream.xpm
+%%EMACS_PKGDIR%%/etc/mew/mew-Plain.xpm
+%%EMACS_PKGDIR%%/etc/mew/mew-Postscript.xpm
+%%EMACS_PKGDIR%%/etc/mew/mew-Rfc822.xpm
+%%EMACS_PKGDIR%%/etc/mew/mew-Text.xpm
+%%EMACS_PKGDIR%%/etc/mew/mew-Unknown.xpm
+%%EMACS_PKGDIR%%/etc/mew/mew-Video.xpm
+%%EMACS_PKGDIR%%/etc/mew/mew-attach.xpm
+%%EMACS_PKGDIR%%/etc/mew/mew-cite.xpm
+%%EMACS_PKGDIR%%/etc/mew/mew-comp.xpm
+%%EMACS_PKGDIR%%/etc/mew/mew-curr.xpm
+%%EMACS_PKGDIR%%/etc/mew/mew-folder.xpm
+%%EMACS_PKGDIR%%/etc/mew/mew-forward.xpm
+%%EMACS_PKGDIR%%/etc/mew/mew-inc.xpm
+%%EMACS_PKGDIR%%/etc/mew/mew-inc2.xpm
+%%EMACS_PKGDIR%%/etc/mew/mew-kill.xpm
+%%EMACS_PKGDIR%%/etc/mew/mew-next.xpm
+%%EMACS_PKGDIR%%/etc/mew/mew-pgp-enc.xpm
+%%EMACS_PKGDIR%%/etc/mew/mew-pgp-sigenc.xpm
+%%EMACS_PKGDIR%%/etc/mew/mew-pgp-sign.xpm
+%%EMACS_PKGDIR%%/etc/mew/mew-prev.xpm
+%%EMACS_PKGDIR%%/etc/mew/mew-refile.xpm
+%%EMACS_PKGDIR%%/etc/mew/mew-reply.xpm
+%%EMACS_PKGDIR%%/etc/mew/mew-send.xpm
+%%EMACS_PKGDIR%%/etc/mew/mew-sep.xpm
+%%EMACS_PKGDIR%%/etc/mew/mew-show.xpm
+%%EMACS_PKGDIR%%/etc/mew/mew-write.xpm
+%%EMACS_PKGDIR%%/etc/mew/mew-yank.xpm
 %%EMACS_PKGDIR%%/info/mew.info
 %%EMACS_PKGDIR%%/info/mew.info-1
 %%EMACS_PKGDIR%%/info/mew.info-2
 %%EMACS_PKGDIR%%/info/mew.info-3
-%%EMACS_LISPDIR%%/mew/mew-addrbook.el
-%%EMACS_LISPDIR%%/mew/mew-addrbook.elc
-%%EMACS_LISPDIR%%/mew/mew-attach.el
-%%EMACS_LISPDIR%%/mew/mew-attach.elc
-%%EMACS_LISPDIR%%/mew/mew-bq.el
-%%EMACS_LISPDIR%%/mew/mew-bq.elc
-%%EMACS_LISPDIR%%/mew/mew-cache.el
-%%EMACS_LISPDIR%%/mew/mew-cache.elc
-%%EMACS_LISPDIR%%/mew/mew-complete.el
-%%EMACS_LISPDIR%%/mew/mew-complete.elc
-%%EMACS_LISPDIR%%/mew/mew-decode.el
-%%EMACS_LISPDIR%%/mew/mew-decode.elc
-%%EMACS_LISPDIR%%/mew/mew-demo.el
-%%EMACS_LISPDIR%%/mew/mew-demo.elc
-%%EMACS_LISPDIR%%/mew/mew-draft.el
-%%EMACS_LISPDIR%%/mew/mew-draft.elc
-%%EMACS_LISPDIR%%/mew/mew-encode.el
-%%EMACS_LISPDIR%%/mew/mew-encode.elc
-%%EMACS_LISPDIR%%/mew/mew-env.el
-%%EMACS_LISPDIR%%/mew/mew-env.elc
-%%EMACS_LISPDIR%%/mew/mew-ext.el
-%%EMACS_LISPDIR%%/mew/mew-ext.elc
-%%EMACS_LISPDIR%%/mew/mew-fib.el
-%%EMACS_LISPDIR%%/mew/mew-fib.elc
-%%EMACS_LISPDIR%%/mew/mew-func.el
-%%EMACS_LISPDIR%%/mew/mew-func.elc
-%%EMACS_LISPDIR%%/mew/mew-header.el
-%%EMACS_LISPDIR%%/mew/mew-header.elc
-%%EMACS_LISPDIR%%/mew/mew-highlight.el
-%%EMACS_LISPDIR%%/mew/mew-highlight.elc
-%%EMACS_LISPDIR%%/mew/mew-lang-jp.el
-%%EMACS_LISPDIR%%/mew/mew-mark.el
-%%EMACS_LISPDIR%%/mew/mew-mark.elc
-%%EMACS_LISPDIR%%/mew/mew-message.el
-%%EMACS_LISPDIR%%/mew/mew-message.elc
-%%EMACS_LISPDIR%%/mew/mew-mime.el
-%%EMACS_LISPDIR%%/mew/mew-mime.elc
-%%EMACS_LISPDIR%%/mew/mew-minibuf.el
-%%EMACS_LISPDIR%%/mew/mew-minibuf.elc
-%%EMACS_LISPDIR%%/mew/mew-mule.el
-%%EMACS_LISPDIR%%/mew/mew-mule0.el
-%%EMACS_LISPDIR%%/mew/mew-mule2.el
-%%EMACS_LISPDIR%%/mew/mew-mule3.el
-%%EMACS_LISPDIR%%/mew/mew-os2.el
-%%EMACS_LISPDIR%%/mew/mew-pgp.el
-%%EMACS_LISPDIR%%/mew/mew-pgp.elc
-%%EMACS_LISPDIR%%/mew/mew-pick.el
-%%EMACS_LISPDIR%%/mew/mew-pick.elc
-%%EMACS_LISPDIR%%/mew/mew-refile.el
-%%EMACS_LISPDIR%%/mew/mew-refile.elc
-%%EMACS_LISPDIR%%/mew/mew-scan.el
-%%EMACS_LISPDIR%%/mew/mew-scan.elc
-%%EMACS_LISPDIR%%/mew/mew-sort.el
-%%EMACS_LISPDIR%%/mew/mew-sort.elc
-%%EMACS_LISPDIR%%/mew/mew-summary.el
-%%EMACS_LISPDIR%%/mew/mew-summary.elc
-%%EMACS_LISPDIR%%/mew/mew-syntax.el
-%%EMACS_LISPDIR%%/mew/mew-syntax.elc
-%%EMACS_LISPDIR%%/mew/mew-temacs.el
-%%EMACS_LISPDIR%%/mew/mew-unix.el
-%%EMACS_LISPDIR%%/mew/mew-vars.el
-%%EMACS_LISPDIR%%/mew/mew-vars.elc
-%%EMACS_LISPDIR%%/mew/mew-virtual.el
-%%EMACS_LISPDIR%%/mew/mew-virtual.elc
-%%EMACS_LISPDIR%%/mew/mew-win32.el
-%%EMACS_LISPDIR%%/mew/mew-xemacs.el
-%%EMACS_LISPDIR%%/mew/mew.el
-%%EMACS_LISPDIR%%/mew/mew.elc
-%%EMACS_PKGDIR%%/man/mew/00readme
+%%EMACS_PKGDIR%%/info/mew.jis.info
+%%EMACS_PKGDIR%%/info/mew.jis.info-1
+%%EMACS_PKGDIR%%/info/mew.jis.info-2
+%%EMACS_PKGDIR%%/lisp/mew/ChangeLog
+%%EMACS_PKGDIR%%/lisp/mew/_pkg.el
+%%EMACS_PKGDIR%%/lisp/mew/auto-autoloads.el
+%%EMACS_PKGDIR%%/lisp/mew/auto-autoloads.elc
+%%EMACS_PKGDIR%%/lisp/mew/custom-load.el
+%%EMACS_PKGDIR%%/lisp/mew/custom-load.elc
+%%EMACS_PKGDIR%%/lisp/mew/mew-addrbook.el
+%%EMACS_PKGDIR%%/lisp/mew/mew-addrbook.elc
+%%EMACS_PKGDIR%%/lisp/mew/mew-attach.el
+%%EMACS_PKGDIR%%/lisp/mew/mew-attach.elc
+%%EMACS_PKGDIR%%/lisp/mew/mew-bq.el
+%%EMACS_PKGDIR%%/lisp/mew/mew-bq.elc
+%%EMACS_PKGDIR%%/lisp/mew/mew-cache.el
+%%EMACS_PKGDIR%%/lisp/mew/mew-cache.elc
+%%EMACS_PKGDIR%%/lisp/mew/mew-complete.el
+%%EMACS_PKGDIR%%/lisp/mew/mew-complete.elc
+%%EMACS_PKGDIR%%/lisp/mew/mew-decode.el
+%%EMACS_PKGDIR%%/lisp/mew/mew-decode.elc
+%%EMACS_PKGDIR%%/lisp/mew/mew-demo.el
+%%EMACS_PKGDIR%%/lisp/mew/mew-demo.elc
+%%EMACS_PKGDIR%%/lisp/mew/mew-draft.el
+%%EMACS_PKGDIR%%/lisp/mew/mew-draft.elc
+%%EMACS_PKGDIR%%/lisp/mew/mew-encode.el
+%%EMACS_PKGDIR%%/lisp/mew/mew-encode.elc
+%%EMACS_PKGDIR%%/lisp/mew/mew-env.el
+%%EMACS_PKGDIR%%/lisp/mew/mew-env.elc
+%%EMACS_PKGDIR%%/lisp/mew/mew-ext.el
+%%EMACS_PKGDIR%%/lisp/mew/mew-ext.elc
+%%EMACS_PKGDIR%%/lisp/mew/mew-fib.el
+%%EMACS_PKGDIR%%/lisp/mew/mew-fib.elc
+%%EMACS_PKGDIR%%/lisp/mew/mew-func.el
+%%EMACS_PKGDIR%%/lisp/mew/mew-func.elc
+%%EMACS_PKGDIR%%/lisp/mew/mew-header.el
+%%EMACS_PKGDIR%%/lisp/mew/mew-header.elc
+%%EMACS_PKGDIR%%/lisp/mew/mew-highlight.el
+%%EMACS_PKGDIR%%/lisp/mew/mew-highlight.elc
+%%EMACS_PKGDIR%%/lisp/mew/mew-lang-jp.el
+%%EMACS_PKGDIR%%/lisp/mew/mew-lang-jp.elc
+%%EMACS_PKGDIR%%/lisp/mew/mew-mark.el
+%%EMACS_PKGDIR%%/lisp/mew/mew-mark.elc
+%%EMACS_PKGDIR%%/lisp/mew/mew-message.el
+%%EMACS_PKGDIR%%/lisp/mew/mew-message.elc
+%%EMACS_PKGDIR%%/lisp/mew/mew-mime.el
+%%EMACS_PKGDIR%%/lisp/mew/mew-mime.elc
+%%EMACS_PKGDIR%%/lisp/mew/mew-minibuf.el
+%%EMACS_PKGDIR%%/lisp/mew/mew-minibuf.elc
+%%EMACS_PKGDIR%%/lisp/mew/mew-mule.el
+%%EMACS_PKGDIR%%/lisp/mew/mew-mule.elc
+%%EMACS_PKGDIR%%/lisp/mew/mew-mule0.el
+%%EMACS_PKGDIR%%/lisp/mew/mew-mule2.el
+%%EMACS_PKGDIR%%/lisp/mew/mew-mule3.el
+%%EMACS_PKGDIR%%/lisp/mew/mew-os2.el
+%%EMACS_PKGDIR%%/lisp/mew/mew-os2.elc
+%%EMACS_PKGDIR%%/lisp/mew/mew-pgp.el
+%%EMACS_PKGDIR%%/lisp/mew/mew-pgp.elc
+%%EMACS_PKGDIR%%/lisp/mew/mew-pick.el
+%%EMACS_PKGDIR%%/lisp/mew/mew-pick.elc
+%%EMACS_PKGDIR%%/lisp/mew/mew-refile.el
+%%EMACS_PKGDIR%%/lisp/mew/mew-refile.elc
+%%EMACS_PKGDIR%%/lisp/mew/mew-scan.el
+%%EMACS_PKGDIR%%/lisp/mew/mew-scan.elc
+%%EMACS_PKGDIR%%/lisp/mew/mew-sort.el
+%%EMACS_PKGDIR%%/lisp/mew/mew-sort.elc
+%%EMACS_PKGDIR%%/lisp/mew/mew-summary.el
+%%EMACS_PKGDIR%%/lisp/mew/mew-summary.elc
+%%EMACS_PKGDIR%%/lisp/mew/mew-syntax.el
+%%EMACS_PKGDIR%%/lisp/mew/mew-syntax.elc
+%%EMACS_PKGDIR%%/lisp/mew/mew-temacs.el
+%%EMACS_PKGDIR%%/lisp/mew/mew-temacs.elc
+%%EMACS_PKGDIR%%/lisp/mew/mew-unix.el
+%%EMACS_PKGDIR%%/lisp/mew/mew-unix.elc
+%%EMACS_PKGDIR%%/lisp/mew/mew-vars.el
+%%EMACS_PKGDIR%%/lisp/mew/mew-vars.elc
+%%EMACS_PKGDIR%%/lisp/mew/mew-virtual.el
+%%EMACS_PKGDIR%%/lisp/mew/mew-virtual.elc
+%%EMACS_PKGDIR%%/lisp/mew/mew-win32.el
+%%EMACS_PKGDIR%%/lisp/mew/mew-win32.elc
+%%EMACS_PKGDIR%%/lisp/mew/mew-xemacs.el
+%%EMACS_PKGDIR%%/lisp/mew/mew-xemacs.elc
+%%EMACS_PKGDIR%%/lisp/mew/mew.el
+%%EMACS_PKGDIR%%/lisp/mew/mew.elc
 %%EMACS_PKGDIR%%/man/mew/mew.texi
 %%EMACS_PKGDIR%%/pkginfo/MANIFEST.mew
 share/doc/mew/00changes
@@ -122,8 +137,6 @@
 share/doc/mew/00readme
 share/doc/mew/contrib/00readme
 share/doc/mew/contrib/00readme-namazu.jis
-share/doc/mew/contrib/bbdb-ml-ext.el
-share/doc/mew/contrib/bbdb-ml.el
 share/doc/mew/contrib/im+.el
 share/doc/mew/contrib/im+.readme.jis
 share/doc/mew/contrib/imget.sh
@@ -161,10 +174,8 @@
 @unexec rmdir %D/%%EMACS_PKGDIR%%/pkginfo 2>/dev/null || true
 @dirrm %%EMACS_PKGDIR%%/man/mew
 @unexec rmdir %D/%%EMACS_PKGDIR%%/man 2>/dev/null || true
-@dirrm %%EMACS_LISPDIR%%/mew
-@unexec rmdir %D/%%EMACS_LISPDIR%% 2>/dev/null || true
+@dirrm %%EMACS_PKGDIR%%/lisp/mew
+@unexec rmdir %D/%%EMACS_PKGDIR%%/lisp 2>/dev/null || true
 @unexec rmdir %D/%%EMACS_PKGDIR%%/info 2>/dev/null || true
-@dirrm %%EMACS_ETCDIR%%/mew/etc
-@dirrm %%EMACS_ETCDIR%%/mew
-@unexec rmdir %D/%%EMACS_ETCDIR%% 2>/dev/null || true
-@unexec rmdir %D/%%EMACS_PKGDIR%% 2>/dev/null || true
+@dirrm %%EMACS_PKGDIR%%/etc/mew
+@unexec rmdir %D/%%EMACS_PKGDIR%%/etc 2>/dev/null || true
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ -I ^# \$FreeBSD /usr/ports/current/mail/mew-xemacs21-mule/Inc/xemacs-pkg-info.in mail/mew-xemacs21-mule/Inc/xemacs-pkg-info.in
--- /usr/ports/current/mail/mew-xemacs21-mule/Inc/xemacs-pkg-info.in	Thu Jan  1 09:00:00 1970
+++ mail/mew-xemacs21-mule/Inc/xemacs-pkg-info.in	Tue Feb 29 23:21:31 2000
@@ -0,0 +1,19 @@
+(toolbar-fancy
+  (standards-version 1.0
+   version XEMACS_PKG_VERSION
+   author-version XEMACS_AUTHOR_VERSION
+   date DATE
+   build-date BUILD_DATE
+   maintainer XEMACS_MAINTAINER
+   distribution stable
+   priority medium
+   category XEMACS_CATEGORY
+   dump nil
+   description "Message interface to Emacs Window for xemacs21-mule."
+   filename FILENAME
+   md5sum MD5SUM
+   size SIZE
+   provides (mew)
+   requires (XEMACS_REQUIRES)
+   type regular
+))
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ -I ^# \$FreeBSD /usr/ports/current/mail/mew-xemacs21-mule/Inc/xemacs-pkg.inc mail/mew-xemacs21-mule/Inc/xemacs-pkg.inc
--- /usr/ports/current/mail/mew-xemacs21-mule/Inc/xemacs-pkg.inc	Thu Jan  1 09:00:00 1970
+++ mail/mew-xemacs21-mule/Inc/xemacs-pkg.inc	Tue Feb 29 23:27:03 2000
@@ -0,0 +1,29 @@
+#-*- mode: Makefile; tab-width: 4; -*-
+XEMACS_PKG_VERSION?=	${XEMACS_PKG_VERSION}
+XEMACS_AUTHOR_VERSION=	${VERSION}
+XEMACS_MAINTAINER=		${MAINTAINER}
+XEMACS_PACKAGE?=		${MEW_DIST}
+XEMACS_PKG_TYPE=		regular
+XEMACS_REQUIRES=
+XEMACS_CATEGORY=		comm
+
+XEMACS_WRKSRC=			${WRKSRC}
+
+# xemacs package install destnation usually ${_DISTDIR}
+XEMACS_RELEASE_DIR=		${_DISTDIR}
+
+XEMACS_ELS=				mew-addrbook.el mew-attach.el mew-bq.el mew-cache.el mew-complete.el mew-decode.el mew-demo.el mew-draft.el mew-encode.el mew-env.el mew-ext.el mew-fib.el mew-func.el mew-header.el mew-highlight.el mew-lang-jp.el mew-mark.el mew-message.el mew-mime.el mew-minibuf.el mew-mule.el mew-mule0.el mew-mule2.el mew-mule3.el mew-os2.el mew-pgp.el mew-pick.el mew-refile.el mew-scan.el mew-sort.el mew-summary.el mew-syntax.el mew-temacs.el mew-unix.el mew-vars.el mew-virtual.el mew-win32.el mew-xemacs.el mew.el 
+XEMACS_ELCS=			mew-addrbook.elc mew-attach.elc mew-bq.elc mew-cache.elc mew-complete.elc mew-decode.elc mew-demo.elc mew-draft.elc mew-encode.elc mew-env.elc mew-ext.elc mew-fib.elc mew-func.elc mew-header.elc mew-highlight.elc mew-lang-jp.elc mew-mark.elc mew-message.elc mew-mime.elc mew-minibuf.elc mew-mule.elc mew-os2.elc mew-pgp.elc mew-pick.elc mew-refile.elc mew-scan.elc mew-sort.elc mew-summary.elc mew-syntax.elc mew-temacs.elc mew-unix.elc mew-vars.elc mew-virtual.elc mew-win32.elc mew-xemacs.elc mew.elc 
+
+XEMACS_DATA_DIR=		${XEMACS_WRKSRC}/etc
+XEMACS_INFO_DIR=		${XEMACS_WRKSRC}/info
+XEMACS_MAN_DIR=			${XEMACS_WRKSRC}/info
+
+XEMACS_EXTRA_SOURCES=	# extra files to be install lisp dir
+XEMACS_DATA_FILES=		etc/etc/COLOR etc/etc/mew-Plain.xpm etc/etc/mew-curr.xpm etc/etc/mew-folder.xpm etc/etc/mew-inc2.xpm etc/etc/mew-kill.xpm etc/Mew.img etc/Mew.png etc/Mew.xbm etc/Mew.xpm etc/mew-Audio.xpm etc/mew-Blank.xpm etc/mew-External.xpm etc/mew-Folder.xpm etc/mew-Image.xpm etc/mew-Octet-Stream.xpm etc/mew-Postscript.xpm etc/mew-Rfc822.xpm etc/mew-Text.xpm etc/mew-Unknown.xpm etc/mew-Video.xpm etc/mew-attach.xpm etc/mew-cite.xpm etc/mew-comp.xpm etc/mew-forward.xpm etc/mew-inc.xpm etc/mew-next.xpm etc/mew-pgp-enc.xpm etc/mew-pgp-sigenc.xpm etc/mew-pgp-sign.xpm etc/mew-prev.xpm etc/mew-refile.xpm etc/mew-reply.xpm etc/mew-send.xpm etc/mew-sep.xpm etc/mew-show.xpm etc/mew-write.xpm etc/mew-yank.xpm 
+XEMACS_DATA_DEST=		${XEMACS_PACKAGE}
+XEMACS_INFO_FILES=		info/mew.info info/mew.info-1 info/mew.info-2 info/mew.info-3 info/mew.jis.info info/mew.jis.info-1 info/mew.jis.info-2 
+XEMACS_TEXI_FILES=		info/mew.texi 
+
+# uncomment following line only if you test in private dir
+#INSTALL_DATA=			${INSTALL} -c -o ${USER} -g ${GROUP} -m ${SHAREMODE}
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ -I ^# \$FreeBSD /usr/ports/current/mail/mew-xemacs21-mule/Makefile mail/mew-xemacs21-mule/Makefile
--- /usr/ports/current/mail/mew-xemacs21-mule/Makefile	Sat Jan  8 12:33:21 2000
+++ mail/mew-xemacs21-mule/Makefile	Sat Mar  4 19:47:09 2000
@@ -1,11 +1,14 @@
 # New ports collection makefile for: Mew (for xemacs21-mule)
-# Version required:	1.94.1
+# Version required:	1.94.2
 # Date created:		17 January 1998
 # Whom:			Kiriyama Kazuhiko <kiri@kiri.toba-cmt.ac.jp>
 #
 # $FreeBSD: ports/mail/mew-xemacs21-mule/Makefile,v 1.8 2000/01/07 16:22:45 shige Exp $
 #
 
-EMACS_PORT_NAME=	xemacs21-mule
+EMACS_PORT=	xemacs21-mule
 
-.include "${.CURDIR}/../mew/Makefile"
+MASTERDIR=	${.CURDIR}/../mew
+PKGDIR=		${.CURDIR}/pkg
+
+.include <${MASTERDIR}/Makefile>
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ -I ^# \$FreeBSD /usr/ports/current/mail/mew-xemacs21-mule/pkg/COMMENT mail/mew-xemacs21-mule/pkg/COMMENT
--- /usr/ports/current/mail/mew-xemacs21-mule/pkg/COMMENT	Thu Jan  6 08:28:12 2000
+++ mail/mew-xemacs21-mule/pkg/COMMENT	Wed Mar  1 20:45:34 2000
@@ -1 +1 @@
-Message interface to Emacs Window for xemacs21-mule
+Message interface to Emacs Window for xemacs21-mule(release version)
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ -I ^# \$FreeBSD /usr/ports/current/mail/mew-xemacs21-mule/pkg/DESCR mail/mew-xemacs21-mule/pkg/DESCR
--- /usr/ports/current/mail/mew-xemacs21-mule/pkg/DESCR	Thu Jan  6 08:28:12 2000
+++ mail/mew-xemacs21-mule/pkg/DESCR	Wed Mar  1 20:45:34 2000
@@ -9,12 +9,11 @@
 picture of a birthday cake with the song "Happy Birthday to you" to your
 friend, which is encrypted by strong cryptograph.
 
-This port is the Mew for xemacs-21.1.8(mail/mew-xemacs21-mule). 
 The Mew port and corresponding Emacs port are listed bellow and elisp
 `site-lisp' directory(elisp load path), info path and etc directory(only
 effective for xemacs ports) are shown as well. 
 
-mail/mew-xemacs21-mule(mew-xemacs21-mule-1.94.1) ===> editors/xemacs21-mule(xemacs-21.1.8) 
+mail/mew-xemacs21-mule(mew-xemacs21-mule-1.94.2) ===> editors/xemacs21-mule(xemacs21-mule) 
 	Lisp directory : /usr/local/lib/xemacs/site-packages/lisp/mew
 	Info directory : /usr/local/lib/xemacs/site-packages/info
 	ETC directory  : /usr/local/lib/xemacs/site-packages/etc/mew
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ -I ^# \$FreeBSD /usr/ports/current/mail/mew-xemacs21-mule/pkg/PLIST mail/mew-xemacs21-mule/pkg/PLIST
--- /usr/ports/current/mail/mew-xemacs21-mule/pkg/PLIST	Tue Jan  4 23:29:30 2000
+++ mail/mew-xemacs21-mule/pkg/PLIST	Thu Mar  2 23:00:07 2000
@@ -2,44 +2,44 @@
 bin/mewdecode
 bin/mewencode
 bin/uumerge
-%%EMACS_ETCDIR%%/mew/Mew.img
-%%EMACS_ETCDIR%%/mew/Mew.png
-%%EMACS_ETCDIR%%/mew/Mew.xbm
-%%EMACS_ETCDIR%%/mew/Mew.xpm
-%%EMACS_ETCDIR%%/mew/etc/COLOR
-%%EMACS_ETCDIR%%/mew/etc/mew-Plain.xpm
-%%EMACS_ETCDIR%%/mew/etc/mew-curr.xpm
-%%EMACS_ETCDIR%%/mew/etc/mew-folder.xpm
-%%EMACS_ETCDIR%%/mew/etc/mew-inc2.xpm
-%%EMACS_ETCDIR%%/mew/etc/mew-kill.xpm
-%%EMACS_ETCDIR%%/mew/mew-Audio.xpm
-%%EMACS_ETCDIR%%/mew/mew-Blank.xpm
-%%EMACS_ETCDIR%%/mew/mew-External.xpm
-%%EMACS_ETCDIR%%/mew/mew-Folder.xpm
-%%EMACS_ETCDIR%%/mew/mew-Image.xpm
-%%EMACS_ETCDIR%%/mew/mew-Octet-Stream.xpm
-%%EMACS_ETCDIR%%/mew/mew-Postscript.xpm
-%%EMACS_ETCDIR%%/mew/mew-Rfc822.xpm
-%%EMACS_ETCDIR%%/mew/mew-Text.xpm
-%%EMACS_ETCDIR%%/mew/mew-Unknown.xpm
-%%EMACS_ETCDIR%%/mew/mew-Video.xpm
-%%EMACS_ETCDIR%%/mew/mew-attach.xpm
-%%EMACS_ETCDIR%%/mew/mew-cite.xpm
-%%EMACS_ETCDIR%%/mew/mew-comp.xpm
-%%EMACS_ETCDIR%%/mew/mew-forward.xpm
-%%EMACS_ETCDIR%%/mew/mew-inc.xpm
-%%EMACS_ETCDIR%%/mew/mew-next.xpm
-%%EMACS_ETCDIR%%/mew/mew-pgp-enc.xpm
-%%EMACS_ETCDIR%%/mew/mew-pgp-sigenc.xpm
-%%EMACS_ETCDIR%%/mew/mew-pgp-sign.xpm
-%%EMACS_ETCDIR%%/mew/mew-prev.xpm
-%%EMACS_ETCDIR%%/mew/mew-refile.xpm
-%%EMACS_ETCDIR%%/mew/mew-reply.xpm
-%%EMACS_ETCDIR%%/mew/mew-send.xpm
-%%EMACS_ETCDIR%%/mew/mew-sep.xpm
-%%EMACS_ETCDIR%%/mew/mew-show.xpm
-%%EMACS_ETCDIR%%/mew/mew-write.xpm
-%%EMACS_ETCDIR%%/mew/mew-yank.xpm
+%%EMACS_PKGDIR%%/etc/mew/COLOR
+%%EMACS_PKGDIR%%/etc/mew/Mew.img
+%%EMACS_PKGDIR%%/etc/mew/Mew.png
+%%EMACS_PKGDIR%%/etc/mew/Mew.xbm
+%%EMACS_PKGDIR%%/etc/mew/Mew.xpm
+%%EMACS_PKGDIR%%/etc/mew/mew-Audio.xpm
+%%EMACS_PKGDIR%%/etc/mew/mew-Blank.xpm
+%%EMACS_PKGDIR%%/etc/mew/mew-External.xpm
+%%EMACS_PKGDIR%%/etc/mew/mew-Folder.xpm
+%%EMACS_PKGDIR%%/etc/mew/mew-Image.xpm
+%%EMACS_PKGDIR%%/etc/mew/mew-Octet-Stream.xpm
+%%EMACS_PKGDIR%%/etc/mew/mew-Plain.xpm
+%%EMACS_PKGDIR%%/etc/mew/mew-Postscript.xpm
+%%EMACS_PKGDIR%%/etc/mew/mew-Rfc822.xpm
+%%EMACS_PKGDIR%%/etc/mew/mew-Text.xpm
+%%EMACS_PKGDIR%%/etc/mew/mew-Unknown.xpm
+%%EMACS_PKGDIR%%/etc/mew/mew-Video.xpm
+%%EMACS_PKGDIR%%/etc/mew/mew-attach.xpm
+%%EMACS_PKGDIR%%/etc/mew/mew-cite.xpm
+%%EMACS_PKGDIR%%/etc/mew/mew-comp.xpm
+%%EMACS_PKGDIR%%/etc/mew/mew-curr.xpm
+%%EMACS_PKGDIR%%/etc/mew/mew-folder.xpm
+%%EMACS_PKGDIR%%/etc/mew/mew-forward.xpm
+%%EMACS_PKGDIR%%/etc/mew/mew-inc.xpm
+%%EMACS_PKGDIR%%/etc/mew/mew-inc2.xpm
+%%EMACS_PKGDIR%%/etc/mew/mew-kill.xpm
+%%EMACS_PKGDIR%%/etc/mew/mew-next.xpm
+%%EMACS_PKGDIR%%/etc/mew/mew-pgp-enc.xpm
+%%EMACS_PKGDIR%%/etc/mew/mew-pgp-sigenc.xpm
+%%EMACS_PKGDIR%%/etc/mew/mew-pgp-sign.xpm
+%%EMACS_PKGDIR%%/etc/mew/mew-prev.xpm
+%%EMACS_PKGDIR%%/etc/mew/mew-refile.xpm
+%%EMACS_PKGDIR%%/etc/mew/mew-reply.xpm
+%%EMACS_PKGDIR%%/etc/mew/mew-send.xpm
+%%EMACS_PKGDIR%%/etc/mew/mew-sep.xpm
+%%EMACS_PKGDIR%%/etc/mew/mew-show.xpm
+%%EMACS_PKGDIR%%/etc/mew/mew-write.xpm
+%%EMACS_PKGDIR%%/etc/mew/mew-yank.xpm
 %%EMACS_PKGDIR%%/info/mew.info
 %%EMACS_PKGDIR%%/info/mew.info-1
 %%EMACS_PKGDIR%%/info/mew.info-2
@@ -47,75 +47,87 @@
 %%EMACS_PKGDIR%%/info/mew.jis.info
 %%EMACS_PKGDIR%%/info/mew.jis.info-1
 %%EMACS_PKGDIR%%/info/mew.jis.info-2
-%%EMACS_LISPDIR%%/mew/mew-addrbook.el
-%%EMACS_LISPDIR%%/mew/mew-addrbook.elc
-%%EMACS_LISPDIR%%/mew/mew-attach.el
-%%EMACS_LISPDIR%%/mew/mew-attach.elc
-%%EMACS_LISPDIR%%/mew/mew-bq.el
-%%EMACS_LISPDIR%%/mew/mew-bq.elc
-%%EMACS_LISPDIR%%/mew/mew-cache.el
-%%EMACS_LISPDIR%%/mew/mew-cache.elc
-%%EMACS_LISPDIR%%/mew/mew-complete.el
-%%EMACS_LISPDIR%%/mew/mew-complete.elc
-%%EMACS_LISPDIR%%/mew/mew-decode.el
-%%EMACS_LISPDIR%%/mew/mew-decode.elc
-%%EMACS_LISPDIR%%/mew/mew-demo.el
-%%EMACS_LISPDIR%%/mew/mew-demo.elc
-%%EMACS_LISPDIR%%/mew/mew-draft.el
-%%EMACS_LISPDIR%%/mew/mew-draft.elc
-%%EMACS_LISPDIR%%/mew/mew-encode.el
-%%EMACS_LISPDIR%%/mew/mew-encode.elc
-%%EMACS_LISPDIR%%/mew/mew-env.el
-%%EMACS_LISPDIR%%/mew/mew-env.elc
-%%EMACS_LISPDIR%%/mew/mew-ext.el
-%%EMACS_LISPDIR%%/mew/mew-ext.elc
-%%EMACS_LISPDIR%%/mew/mew-fib.el
-%%EMACS_LISPDIR%%/mew/mew-fib.elc
-%%EMACS_LISPDIR%%/mew/mew-func.el
-%%EMACS_LISPDIR%%/mew/mew-func.elc
-%%EMACS_LISPDIR%%/mew/mew-header.el
-%%EMACS_LISPDIR%%/mew/mew-header.elc
-%%EMACS_LISPDIR%%/mew/mew-highlight.el
-%%EMACS_LISPDIR%%/mew/mew-highlight.elc
-%%EMACS_LISPDIR%%/mew/mew-lang-jp.el
-%%EMACS_LISPDIR%%/mew/mew-mark.el
-%%EMACS_LISPDIR%%/mew/mew-mark.elc
-%%EMACS_LISPDIR%%/mew/mew-message.el
-%%EMACS_LISPDIR%%/mew/mew-message.elc
-%%EMACS_LISPDIR%%/mew/mew-mime.el
-%%EMACS_LISPDIR%%/mew/mew-mime.elc
-%%EMACS_LISPDIR%%/mew/mew-minibuf.el
-%%EMACS_LISPDIR%%/mew/mew-minibuf.elc
-%%EMACS_LISPDIR%%/mew/mew-mule.el
-%%EMACS_LISPDIR%%/mew/mew-mule0.el
-%%EMACS_LISPDIR%%/mew/mew-mule2.el
-%%EMACS_LISPDIR%%/mew/mew-mule3.el
-%%EMACS_LISPDIR%%/mew/mew-os2.el
-%%EMACS_LISPDIR%%/mew/mew-pgp.el
-%%EMACS_LISPDIR%%/mew/mew-pgp.elc
-%%EMACS_LISPDIR%%/mew/mew-pick.el
-%%EMACS_LISPDIR%%/mew/mew-pick.elc
-%%EMACS_LISPDIR%%/mew/mew-refile.el
-%%EMACS_LISPDIR%%/mew/mew-refile.elc
-%%EMACS_LISPDIR%%/mew/mew-scan.el
-%%EMACS_LISPDIR%%/mew/mew-scan.elc
-%%EMACS_LISPDIR%%/mew/mew-sort.el
-%%EMACS_LISPDIR%%/mew/mew-sort.elc
-%%EMACS_LISPDIR%%/mew/mew-summary.el
-%%EMACS_LISPDIR%%/mew/mew-summary.elc
-%%EMACS_LISPDIR%%/mew/mew-syntax.el
-%%EMACS_LISPDIR%%/mew/mew-syntax.elc
-%%EMACS_LISPDIR%%/mew/mew-temacs.el
-%%EMACS_LISPDIR%%/mew/mew-unix.el
-%%EMACS_LISPDIR%%/mew/mew-vars.el
-%%EMACS_LISPDIR%%/mew/mew-vars.elc
-%%EMACS_LISPDIR%%/mew/mew-virtual.el
-%%EMACS_LISPDIR%%/mew/mew-virtual.elc
-%%EMACS_LISPDIR%%/mew/mew-win32.el
-%%EMACS_LISPDIR%%/mew/mew-xemacs.el
-%%EMACS_LISPDIR%%/mew/mew.el
-%%EMACS_LISPDIR%%/mew/mew.elc
-%%EMACS_PKGDIR%%/man/mew/00readme
+%%EMACS_PKGDIR%%/lisp/mew/ChangeLog
+%%EMACS_PKGDIR%%/lisp/mew/_pkg.el
+%%EMACS_PKGDIR%%/lisp/mew/auto-autoloads.el
+%%EMACS_PKGDIR%%/lisp/mew/auto-autoloads.elc
+%%EMACS_PKGDIR%%/lisp/mew/custom-load.el
+%%EMACS_PKGDIR%%/lisp/mew/custom-load.elc
+%%EMACS_PKGDIR%%/lisp/mew/mew-addrbook.el
+%%EMACS_PKGDIR%%/lisp/mew/mew-addrbook.elc
+%%EMACS_PKGDIR%%/lisp/mew/mew-attach.el
+%%EMACS_PKGDIR%%/lisp/mew/mew-attach.elc
+%%EMACS_PKGDIR%%/lisp/mew/mew-bq.el
+%%EMACS_PKGDIR%%/lisp/mew/mew-bq.elc
+%%EMACS_PKGDIR%%/lisp/mew/mew-cache.el
+%%EMACS_PKGDIR%%/lisp/mew/mew-cache.elc
+%%EMACS_PKGDIR%%/lisp/mew/mew-complete.el
+%%EMACS_PKGDIR%%/lisp/mew/mew-complete.elc
+%%EMACS_PKGDIR%%/lisp/mew/mew-decode.el
+%%EMACS_PKGDIR%%/lisp/mew/mew-decode.elc
+%%EMACS_PKGDIR%%/lisp/mew/mew-demo.el
+%%EMACS_PKGDIR%%/lisp/mew/mew-demo.elc
+%%EMACS_PKGDIR%%/lisp/mew/mew-draft.el
+%%EMACS_PKGDIR%%/lisp/mew/mew-draft.elc
+%%EMACS_PKGDIR%%/lisp/mew/mew-encode.el
+%%EMACS_PKGDIR%%/lisp/mew/mew-encode.elc
+%%EMACS_PKGDIR%%/lisp/mew/mew-env.el
+%%EMACS_PKGDIR%%/lisp/mew/mew-env.elc
+%%EMACS_PKGDIR%%/lisp/mew/mew-ext.el
+%%EMACS_PKGDIR%%/lisp/mew/mew-ext.elc
+%%EMACS_PKGDIR%%/lisp/mew/mew-fib.el
+%%EMACS_PKGDIR%%/lisp/mew/mew-fib.elc
+%%EMACS_PKGDIR%%/lisp/mew/mew-func.el
+%%EMACS_PKGDIR%%/lisp/mew/mew-func.elc
+%%EMACS_PKGDIR%%/lisp/mew/mew-header.el
+%%EMACS_PKGDIR%%/lisp/mew/mew-header.elc
+%%EMACS_PKGDIR%%/lisp/mew/mew-highlight.el
+%%EMACS_PKGDIR%%/lisp/mew/mew-highlight.elc
+%%EMACS_PKGDIR%%/lisp/mew/mew-lang-jp.el
+%%EMACS_PKGDIR%%/lisp/mew/mew-lang-jp.elc
+%%EMACS_PKGDIR%%/lisp/mew/mew-mark.el
+%%EMACS_PKGDIR%%/lisp/mew/mew-mark.elc
+%%EMACS_PKGDIR%%/lisp/mew/mew-message.el
+%%EMACS_PKGDIR%%/lisp/mew/mew-message.elc
+%%EMACS_PKGDIR%%/lisp/mew/mew-mime.el
+%%EMACS_PKGDIR%%/lisp/mew/mew-mime.elc
+%%EMACS_PKGDIR%%/lisp/mew/mew-minibuf.el
+%%EMACS_PKGDIR%%/lisp/mew/mew-minibuf.elc
+%%EMACS_PKGDIR%%/lisp/mew/mew-mule.el
+%%EMACS_PKGDIR%%/lisp/mew/mew-mule.elc
+%%EMACS_PKGDIR%%/lisp/mew/mew-mule0.el
+%%EMACS_PKGDIR%%/lisp/mew/mew-mule2.el
+%%EMACS_PKGDIR%%/lisp/mew/mew-mule3.el
+%%EMACS_PKGDIR%%/lisp/mew/mew-os2.el
+%%EMACS_PKGDIR%%/lisp/mew/mew-os2.elc
+%%EMACS_PKGDIR%%/lisp/mew/mew-pgp.el
+%%EMACS_PKGDIR%%/lisp/mew/mew-pgp.elc
+%%EMACS_PKGDIR%%/lisp/mew/mew-pick.el
+%%EMACS_PKGDIR%%/lisp/mew/mew-pick.elc
+%%EMACS_PKGDIR%%/lisp/mew/mew-refile.el
+%%EMACS_PKGDIR%%/lisp/mew/mew-refile.elc
+%%EMACS_PKGDIR%%/lisp/mew/mew-scan.el
+%%EMACS_PKGDIR%%/lisp/mew/mew-scan.elc
+%%EMACS_PKGDIR%%/lisp/mew/mew-sort.el
+%%EMACS_PKGDIR%%/lisp/mew/mew-sort.elc
+%%EMACS_PKGDIR%%/lisp/mew/mew-summary.el
+%%EMACS_PKGDIR%%/lisp/mew/mew-summary.elc
+%%EMACS_PKGDIR%%/lisp/mew/mew-syntax.el
+%%EMACS_PKGDIR%%/lisp/mew/mew-syntax.elc
+%%EMACS_PKGDIR%%/lisp/mew/mew-temacs.el
+%%EMACS_PKGDIR%%/lisp/mew/mew-temacs.elc
+%%EMACS_PKGDIR%%/lisp/mew/mew-unix.el
+%%EMACS_PKGDIR%%/lisp/mew/mew-unix.elc
+%%EMACS_PKGDIR%%/lisp/mew/mew-vars.el
+%%EMACS_PKGDIR%%/lisp/mew/mew-vars.elc
+%%EMACS_PKGDIR%%/lisp/mew/mew-virtual.el
+%%EMACS_PKGDIR%%/lisp/mew/mew-virtual.elc
+%%EMACS_PKGDIR%%/lisp/mew/mew-win32.el
+%%EMACS_PKGDIR%%/lisp/mew/mew-win32.elc
+%%EMACS_PKGDIR%%/lisp/mew/mew-xemacs.el
+%%EMACS_PKGDIR%%/lisp/mew/mew-xemacs.elc
+%%EMACS_PKGDIR%%/lisp/mew/mew.el
+%%EMACS_PKGDIR%%/lisp/mew/mew.elc
 %%EMACS_PKGDIR%%/man/mew/mew.texi
 %%EMACS_PKGDIR%%/pkginfo/MANIFEST.mew
 share/doc/mew/00changes
@@ -125,8 +137,6 @@
 share/doc/mew/00readme
 share/doc/mew/contrib/00readme
 share/doc/mew/contrib/00readme-namazu.jis
-share/doc/mew/contrib/bbdb-ml-ext.el
-share/doc/mew/contrib/bbdb-ml.el
 share/doc/mew/contrib/im+.el
 share/doc/mew/contrib/im+.readme.jis
 share/doc/mew/contrib/imget.sh
@@ -164,10 +174,8 @@
 @unexec rmdir %D/%%EMACS_PKGDIR%%/pkginfo 2>/dev/null || true
 @dirrm %%EMACS_PKGDIR%%/man/mew
 @unexec rmdir %D/%%EMACS_PKGDIR%%/man 2>/dev/null || true
-@dirrm %%EMACS_LISPDIR%%/mew
-@unexec rmdir %D/%%EMACS_LISPDIR%% 2>/dev/null || true
+@dirrm %%EMACS_PKGDIR%%/lisp/mew
+@unexec rmdir %D/%%EMACS_PKGDIR%%/lisp 2>/dev/null || true
 @unexec rmdir %D/%%EMACS_PKGDIR%%/info 2>/dev/null || true
-@dirrm %%EMACS_ETCDIR%%/mew/etc
-@dirrm %%EMACS_ETCDIR%%/mew
-@unexec rmdir %D/%%EMACS_ETCDIR%% 2>/dev/null || true
-@unexec rmdir %D/%%EMACS_PKGDIR%% 2>/dev/null || true
+@dirrm %%EMACS_PKGDIR%%/etc/mew
+@unexec rmdir %D/%%EMACS_PKGDIR%%/etc 2>/dev/null || true

>Release-Note:
>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?200003041130.UAA36096>