Fix the following rough edges:

- Fix MASTER_SITES.
- Remove redundant DOCSDIR and CONFIGURE_TARGET.
- Use EMACS_LIBDIR for non-lisp files for consistency.
- Use --with-elispdir for EMACS_SITE_LISPDIR.
- Separate the Japanese info files by using NOPORTDOCS.
- The mew-icon-directory variable is set automatically
  even in XEmacs now.

Approved by:	Hiroto Kagotani (maintainer)
PR:		ports/107438

3 files changed, 89 insertions, 56 deletions

diff --git a/mail/mew/Makefile b/mail/mew/Makefile
index da0e86342bd3..f24a32ed491d 100644
--- a/mail/mew/Makefile
+++ b/mail/mew/Makefile
@@ -8,44 +8,52 @@
 
 PORTNAME=	mew
 PORTVERSION=	5.1
+PORTREVISION=	1
 CATEGORIES=	mail elisp
-MASTER_SITES=	http://www.Mew.org/Release/ \
-		${MASTER_SITE_PORTS_JP}
+MASTER_SITES=	http://www.Mew.org/Release/
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 
 MAINTAINER?=	hiroto.kagotani@gmail.com
 COMMENT?=	Messaging in the Emacs World for emacs
 
-# document install directory by install-doc target
-DOCSDIR=	share/doc/${PORTNAME}
-
 # emacs port setup
 USE_EMACS=	yes
 EMACS_PORT_NAME?=	emacs21
 
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-MAKE_ARGS+=	EMACS_SITE_LISPDIR=${EMACS_SITE_LISPDIR}
+CONFIGURE_ARGS=	--with-elispdir=${LOCALBASE}/${EMACS_SITE_LISPDIR}/mew \
+		--with-etcdir=${LOCALBASE}/${EMACS_LIBDIR}/etc/mew
 
 # target name for make build and install
-ALL_TARGET?=	all info jinfo
-INSTALL_TARGET?=	install install-jinfo
+ALL_TARGET=	all info
+INSTALL_TARGET=	install
+.if !defined(NOPORTDOCS)
+ALL_TARGET+=	jinfo
+INSTALL_TARGET+=install-jinfo
+.endif
 
 # manuals
 MAN1=		mewcat.1 mewdecode.1 mewencode.1 mewl.1 incm.1
-INFO=		mew mew.jis
+INFO=		mew
+.if !defined(NOPORTDOCS)
+INFO+=		mew.jis
+.endif
+
+pre-build:
+	${REINPLACE_CMD} -e \
+		's,%%MEWICONDIR%%,${LOCALBASE}/${EMACS_LIBDIR}/etc/mew,' \
+		${WRKSRC}/mew-key.el
 
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/${DOCSDIR}
+	${MKDIR} ${DOCSDIR}
 	(cd ${WRKSRC} ; \
-		${INSTALL_DATA} 00* mew.dot.* ${PREFIX}/${DOCSDIR}/ ; \
+		${INSTALL_DATA} 00* mew.dot.* ${DOCSDIR}/ ; \
 		for dir in contrib; do \
-			${CP} -R $${dir} ${PREFIX}/${DOCSDIR}/ ; \
+			${CP} -R $${dir} ${DOCSDIR}/ ; \
 		done)
-	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/${DOCSDIR}
+	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR}
 .endif
-
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/mail/mew/files/patch-mew-key.el b/mail/mew/files/patch-mew-key.el
new file mode 100644
index 000000000000..2b1dfff1677e
--- /dev/null
+++ b/mail/mew/files/patch-mew-key.el
@@ -0,0 +1,23 @@
+--- mew-key.el.orig	Wed Jul 12 18:22:49 2006
++++ mew-key.el	Thu Jan  4 20:14:11 2007
+@@ -609,13 +609,16 @@
+ ;;;
+ 
+ (defun mew-which-mew-etc ()
+-  (let ((file "mew.el")
+-	(path load-path))
++  (let ((file1 "mew.el")
++        (file2 "Mew.png")
++	(path (list "%%MEWICONDIR%%" load-path)))
+     (catch 'loop
+       (while path
+-	(if (file-exists-p (expand-file-name file (car path)))
++	(if (file-exists-p (expand-file-name file1 (car path)))
+ 	    (throw 'loop (expand-file-name "etc" (car path)))
+-	  (setq path (cdr path)))))))
++        (if (file-exists-p (expand-file-name file2 (car path)))
++	    (throw 'loop (expand-file-name (car path)))
++	  (setq path (cdr path))))))))
+ 
+ (defvar mew-icon-directory (mew-which-mew-etc))
+ 
diff --git a/mail/mew/pkg-plist b/mail/mew/pkg-plist
index 1eda8ac8eb39..39b4ad28de14 100644
--- a/mail/mew/pkg-plist
+++ b/mail/mew/pkg-plist
@@ -1,3 +1,4 @@
+@comment $FreeBSD$
 bin/incm
 bin/mewcat
 bin/mewdecode
@@ -28,45 +29,45 @@ bin/mewl
 %%PORTDOCS%%%%DOCSDIR%%/contrib/mew-nmz-fixer.el
 %%PORTDOCS%%%%DOCSDIR%%/contrib/mew-refile-view.el
 %%PORTDOCS%%%%DOCSDIR%%/contrib/mew-toolbar-frame.el
-%%EMACS_SITE_LISPDIR%%/mew/etc/Mew.img
-%%EMACS_SITE_LISPDIR%%/mew/etc/Mew.png
-%%EMACS_SITE_LISPDIR%%/mew/etc/Mew.xbm
-%%EMACS_SITE_LISPDIR%%/mew/etc/Mew.xpm
-%%EMACS_SITE_LISPDIR%%/mew/etc/etc/COLOR
-%%EMACS_SITE_LISPDIR%%/mew/etc/etc/mew-Plain.xpm
-%%EMACS_SITE_LISPDIR%%/mew/etc/etc/mew-curr.xpm
-%%EMACS_SITE_LISPDIR%%/mew/etc/etc/mew-folder.xpm
-%%EMACS_SITE_LISPDIR%%/mew/etc/etc/mew-inc2.xpm
-%%EMACS_SITE_LISPDIR%%/mew/etc/etc/mew-kill.xpm
-%%EMACS_SITE_LISPDIR%%/mew/etc/mew-Audio.xpm
-%%EMACS_SITE_LISPDIR%%/mew/etc/mew-Blank.xpm
-%%EMACS_SITE_LISPDIR%%/mew/etc/mew-External.xpm
-%%EMACS_SITE_LISPDIR%%/mew/etc/mew-Folder.xpm
-%%EMACS_SITE_LISPDIR%%/mew/etc/mew-Image.xpm
-%%EMACS_SITE_LISPDIR%%/mew/etc/mew-Octet-Stream.xpm
-%%EMACS_SITE_LISPDIR%%/mew/etc/mew-Postscript.xpm
-%%EMACS_SITE_LISPDIR%%/mew/etc/mew-Rfc822.xpm
-%%EMACS_SITE_LISPDIR%%/mew/etc/mew-Text.xpm
-%%EMACS_SITE_LISPDIR%%/mew/etc/mew-Unknown.xpm
-%%EMACS_SITE_LISPDIR%%/mew/etc/mew-Video.xpm
-%%EMACS_SITE_LISPDIR%%/mew/etc/mew-attach.xpm
-%%EMACS_SITE_LISPDIR%%/mew/etc/mew-cite.xpm
-%%EMACS_SITE_LISPDIR%%/mew/etc/mew-forward.xpm
-%%EMACS_SITE_LISPDIR%%/mew/etc/mew-inc.xpm
-%%EMACS_SITE_LISPDIR%%/mew/etc/mew-lock.xpm
-%%EMACS_SITE_LISPDIR%%/mew/etc/mew-next.xpm
-%%EMACS_SITE_LISPDIR%%/mew/etc/mew-pgp-enc.xpm
-%%EMACS_SITE_LISPDIR%%/mew/etc/mew-pgp-sigenc.xpm
-%%EMACS_SITE_LISPDIR%%/mew/etc/mew-pgp-sign.xpm
-%%EMACS_SITE_LISPDIR%%/mew/etc/mew-prev.xpm
-%%EMACS_SITE_LISPDIR%%/mew/etc/mew-queue.xpm
-%%EMACS_SITE_LISPDIR%%/mew/etc/mew-refile.xpm
-%%EMACS_SITE_LISPDIR%%/mew/etc/mew-reply.xpm
-%%EMACS_SITE_LISPDIR%%/mew/etc/mew-send.xpm
-%%EMACS_SITE_LISPDIR%%/mew/etc/mew-sep.xpm
-%%EMACS_SITE_LISPDIR%%/mew/etc/mew-show.xpm
-%%EMACS_SITE_LISPDIR%%/mew/etc/mew-write.xpm
-%%EMACS_SITE_LISPDIR%%/mew/etc/mew-yank.xpm
+%%EMACS_LIBDIR%%/etc/mew/Mew.img
+%%EMACS_LIBDIR%%/etc/mew/Mew.png
+%%EMACS_LIBDIR%%/etc/mew/Mew.xbm
+%%EMACS_LIBDIR%%/etc/mew/Mew.xpm
+%%EMACS_LIBDIR%%/etc/mew/etc/COLOR
+%%EMACS_LIBDIR%%/etc/mew/etc/mew-Plain.xpm
+%%EMACS_LIBDIR%%/etc/mew/etc/mew-curr.xpm
+%%EMACS_LIBDIR%%/etc/mew/etc/mew-folder.xpm
+%%EMACS_LIBDIR%%/etc/mew/etc/mew-inc2.xpm
+%%EMACS_LIBDIR%%/etc/mew/etc/mew-kill.xpm
+%%EMACS_LIBDIR%%/etc/mew/mew-Audio.xpm
+%%EMACS_LIBDIR%%/etc/mew/mew-Blank.xpm
+%%EMACS_LIBDIR%%/etc/mew/mew-External.xpm
+%%EMACS_LIBDIR%%/etc/mew/mew-Folder.xpm
+%%EMACS_LIBDIR%%/etc/mew/mew-Image.xpm
+%%EMACS_LIBDIR%%/etc/mew/mew-Octet-Stream.xpm
+%%EMACS_LIBDIR%%/etc/mew/mew-Postscript.xpm
+%%EMACS_LIBDIR%%/etc/mew/mew-Rfc822.xpm
+%%EMACS_LIBDIR%%/etc/mew/mew-Text.xpm
+%%EMACS_LIBDIR%%/etc/mew/mew-Unknown.xpm
+%%EMACS_LIBDIR%%/etc/mew/mew-Video.xpm
+%%EMACS_LIBDIR%%/etc/mew/mew-attach.xpm
+%%EMACS_LIBDIR%%/etc/mew/mew-cite.xpm
+%%EMACS_LIBDIR%%/etc/mew/mew-forward.xpm
+%%EMACS_LIBDIR%%/etc/mew/mew-inc.xpm
+%%EMACS_LIBDIR%%/etc/mew/mew-lock.xpm
+%%EMACS_LIBDIR%%/etc/mew/mew-next.xpm
+%%EMACS_LIBDIR%%/etc/mew/mew-pgp-enc.xpm
+%%EMACS_LIBDIR%%/etc/mew/mew-pgp-sigenc.xpm
+%%EMACS_LIBDIR%%/etc/mew/mew-pgp-sign.xpm
+%%EMACS_LIBDIR%%/etc/mew/mew-prev.xpm
+%%EMACS_LIBDIR%%/etc/mew/mew-queue.xpm
+%%EMACS_LIBDIR%%/etc/mew/mew-refile.xpm
+%%EMACS_LIBDIR%%/etc/mew/mew-reply.xpm
+%%EMACS_LIBDIR%%/etc/mew/mew-send.xpm
+%%EMACS_LIBDIR%%/etc/mew/mew-sep.xpm
+%%EMACS_LIBDIR%%/etc/mew/mew-show.xpm
+%%EMACS_LIBDIR%%/etc/mew/mew-write.xpm
+%%EMACS_LIBDIR%%/etc/mew/mew-yank.xpm
 %%EMACS_SITE_LISPDIR%%/mew/mew-addrbook.el
 %%EMACS_SITE_LISPDIR%%/mew/mew-addrbook.elc
 %%EMACS_SITE_LISPDIR%%/mew/mew-attach.el
@@ -207,8 +208,9 @@ bin/mewl
 %%EMACS_SITE_LISPDIR%%/mew/mew-xemacs.elc
 %%EMACS_SITE_LISPDIR%%/mew/mew.el
 %%EMACS_SITE_LISPDIR%%/mew/mew.elc
-@dirrm %%EMACS_SITE_LISPDIR%%/mew/etc/etc
-@dirrm %%EMACS_SITE_LISPDIR%%/mew/etc
+@dirrm %%EMACS_LIBDIR%%/etc/mew/etc
+@dirrm %%EMACS_LIBDIR%%/etc/mew
+@dirrmtry %%EMACS_LIBDIR%%/etc
 @dirrm %%EMACS_SITE_LISPDIR%%/mew
 @dirrmtry %%EMACS_SITE_LISPDIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/contrib