- Add LICENSE.

- Remove %%PORTDOCS%% in pkg-plist and use PORTDOCS in Makefile instead.
- Fix a wrong pathname in pkg-message.
- Use {opt}_* variables instead of ".if ${PORT_OPTIONS:Mfoo}".
- Remove patch-Makefile.in because it is no longer needed.

Approved by:	hiroto.kagotani@gmail.com (maintainer)

4 files changed, 17 insertions, 66 deletions

diff --git a/mail/mew/Makefile b/mail/mew/Makefile
index fbd08c02ab29..7cf61a9046db 100644
--- a/mail/mew/Makefile
+++ b/mail/mew/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	mew
 PORTVERSION=	6.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail elisp
 MASTER_SITES=	http://www.mew.org/Release/
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
@@ -11,12 +11,14 @@ PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 MAINTAINER=	hiroto.kagotani@gmail.com
 COMMENT=	Messaging in the Emacs World for emacs
 
+LICENSE=	BSD3CLAUSE
+LICENSE_FILE=	${WRKSRC}/00copyright
+
 OPTIONS_DEFINE=	DATABASE DOCS STUNNEL
 OPTIONS_DEFAULT=STUNNEL
 DATABASE_DESC=	Support database feature (with Ruby & Sqlite3)
-STUNNEL_DESC=	Support SSL feature using stunnel
-
 DATABASE_RUN_DEPENDS=	rubygem-sqlite3>=0:${PORTSDIR}/databases/rubygem-sqlite3
+STUNNEL_DESC=	Support SSL feature using stunnel
 STUNNEL_RUN_DEPENDS=	stunnel>=0:${PORTSDIR}/security/stunnel
 
 # emacs port setup
@@ -26,29 +28,26 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-elispdir=${LOCALBASE}/${EMACS_SITE_LISPDIR}/mew \
 		--with-etcdir=${LOCALBASE}/${EMACS_SITE_LISPDIR}/mew/etc
 
-.include <bsd.port.options.mk>
-
 # target name for make build and install
 ALL_TARGET=	all info
 INSTALL_TARGET=	install
-.if ${PORT_OPTIONS:MDOCS}
-ALL_TARGET+=	jinfo
-INSTALL_TARGET+=install-jinfo
-.endif
-
 INFO=		mew
-.if ${PORT_OPTIONS:MDOCS}
-INFO+=		mew.ja
-.endif
+DOCS_ALL_TARGET=	jinfo
+DOCS_INSTALL_TARGET=	install-jinfo
+DOCS_INFO=	mew.ja
+PORTDOCS=	00api 00changes.0 00changes.1 00changes.2 00changes.3 \
+		00changes.4.1 00changes.4.2 00changes.5.1 00changes.5.2 \
+		00changes.6.1 00changes.6.2 00changes.6.3 00changes.6.4 \
+		00changes.6.5 00changes.6.6 \
+		00diff 00readme dot.emacs dot.mew dot.theme
+
+.include <bsd.port.options.mk>
 
 post-install:
 	@${RM} -f ${STAGEDIR}${PREFIX}/${INFO_PATH}/*.info.~1~
 .if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	(cd ${WRKSRC} ; \
-		${INSTALL_DATA} 00* dot.* ${STAGEDIR}${DOCSDIR}/ ; \
-		)
-	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/mail/mew/files/patch-Makefile.in b/mail/mew/files/patch-Makefile.in
deleted file mode 100644
index 6af6efa108d4..000000000000
--- a/mail/mew/files/patch-Makefile.in
+++ /dev/null
@@ -1,24 +0,0 @@
---- ./Makefile.in.orig	2012-04-16 12:18:13.000000000 +0900
-+++ ./Makefile.in	2014-04-14 20:03:59.000000000 +0900
-@@ -35,8 +35,8 @@
- ## A directory where mew*.el[c] will be installed.
- ##
- 
--elispdir = @elispdir@
--#elispdir = $(prefix)/share/emacs/site-lisp/mew
-+#elispdir = @elispdir@
-+elispdir = $(prefix)/share/emacs/site-lisp/mew
- #elispdir  = $(prefix)/lib/xemacs/site-lisp
- #elispdir = $(prefix)/lib/emacs
- 
-@@ -44,8 +44,8 @@
- ## A directory where etc file will be installed.
- ##
- 
--etcdir = @etcdir@
--#etcdir = $(prefix)/share/emacs/site-lisp/mew/etc
-+#etcdir = @etcdir@
-+etcdir = $(prefix)/share/emacs/site-lisp/mew/etc
- #etcdir = $(prefix)/lib/xemacs/etc/Mew
- 
- ################################################################
diff --git a/mail/mew/files/pkg-message.in b/mail/mew/files/pkg-message.in
index c4f6e754fb2f..956a2c6f0190 100644
--- a/mail/mew/files/pkg-message.in
+++ b/mail/mew/files/pkg-message.in
@@ -10,6 +10,6 @@ You may want to add following lines to your ~/.emacs and/or ~/.mew.el.
     (setq mew-prog-pgpkey      "fetch")
     (setq mew-prog-pgpkey-arg  '("-q" "-o" "-"))
 
-Please consult sample files %%DOCSDIR%%/mew.dot.{emacs,mew}.
+Please consult sample files %%DOCSDIR%%/dot.{emacs,mew}.
 See also %%DOCSDIR%%/00diff for the changes from previous versions.
 *************************************************************************
diff --git a/mail/mew/pkg-plist b/mail/mew/pkg-plist
index 0652d954fa87..48a594a7b43d 100644
--- a/mail/mew/pkg-plist
+++ b/mail/mew/pkg-plist
@@ -7,8 +7,6 @@ bin/mewencode
 bin/mewest
 bin/mewl
 bin/smew
-@comment info/mew.info
-@comment %%PORTDOCS%%info/mew.ja.info
 man/man1/cmew.1.gz
 man/man1/incm.1.gz
 man/man1/mew-pinentry.1.gz
@@ -18,28 +16,6 @@ man/man1/mewencode.1.gz
 man/man1/mewest.1.gz
 man/man1/mewl.1.gz
 man/man1/smew.1.gz
-%%PORTDOCS%%%%DOCSDIR%%/00api
-%%PORTDOCS%%%%DOCSDIR%%/00changes.0
-%%PORTDOCS%%%%DOCSDIR%%/00changes.1
-%%PORTDOCS%%%%DOCSDIR%%/00changes.2
-%%PORTDOCS%%%%DOCSDIR%%/00changes.3
-%%PORTDOCS%%%%DOCSDIR%%/00changes.4.1
-%%PORTDOCS%%%%DOCSDIR%%/00changes.4.2
-%%PORTDOCS%%%%DOCSDIR%%/00changes.5.1
-%%PORTDOCS%%%%DOCSDIR%%/00changes.5.2
-%%PORTDOCS%%%%DOCSDIR%%/00changes.6.1
-%%PORTDOCS%%%%DOCSDIR%%/00changes.6.2
-%%PORTDOCS%%%%DOCSDIR%%/00changes.6.3
-%%PORTDOCS%%%%DOCSDIR%%/00changes.6.4
-%%PORTDOCS%%%%DOCSDIR%%/00changes.6.5
-%%PORTDOCS%%%%DOCSDIR%%/00changes.6.6
-%%PORTDOCS%%%%DOCSDIR%%/00copyright
-%%PORTDOCS%%%%DOCSDIR%%/00copyright.ja
-%%PORTDOCS%%%%DOCSDIR%%/00diff
-%%PORTDOCS%%%%DOCSDIR%%/00readme
-%%PORTDOCS%%%%DOCSDIR%%/dot.emacs
-%%PORTDOCS%%%%DOCSDIR%%/dot.mew
-%%PORTDOCS%%%%DOCSDIR%%/dot.theme
 %%EMACS_SITE_LISPDIR%%/mew/etc/Mew.img
 %%EMACS_SITE_LISPDIR%%/mew/etc/Mew.png
 %%EMACS_SITE_LISPDIR%%/mew/etc/Mew.xbm