svn commit: r405475 - head/mail/wanderlust

[Pawel Pekala]

Author: pawel
Date: Thu Jan  7 16:57:21 2016
New Revision: 405475
URL: https://svnweb.freebsd.org/changeset/ports/405475

Log:
  - Remove deprecated @dirrm's from pkg-plist
  - Add NO_ARCH
  - DOCS is default, no need to set it
  - Use options helper
  
  PR:		205847
  Submitted by:	myself
  Approved by:	maintainer

Modified:
  head/mail/wanderlust/Makefile
  head/mail/wanderlust/pkg-plist.emacs

Modified: head/mail/wanderlust/Makefile
==============================================================================
--- head/mail/wanderlust/Makefile	Thu Jan  7 16:55:35 2016	(r405474)
+++ head/mail/wanderlust/Makefile	Thu Jan  7 16:57:21 2016	(r405475)
@@ -14,11 +14,11 @@ MAINTAINER=	nobutaka at FreeBSD.org
 COMMENT?=	Yet another message interface on Emacsen
 
 USE_EMACS=	yes
+NO_ARCH=	yes
 
 CONFLICTS=	wanderlust-*-2.15.*
 
 OPTIONS_DEFINE=	DOCS
-OPTIONS_DEFAULT=DOCS
 
 .include <bsd.port.pre.mk>
 .include <bsd.port.options.mk>
@@ -109,9 +109,6 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/elmo/elmo-shimbun.el ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/wl
 .endif
 .endif
-.if ${PORT_OPTIONS:MDOCS}
-	${MAKE} install-docs
-.endif
 	${MAKE} install-samples
 	${MAKE} install-utils
 .if defined(EMACS_PACKAGESDIR)
@@ -119,7 +116,7 @@ post-install:
 .endif
 
 # local targets
-install-docs:
+post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${PORTDOCDIR}
 	${MKDIR} ${STAGEDIR}${PREFIX}/${PORTDOCDIR_JA}
 .for i in ${DOCS}

Modified: head/mail/wanderlust/pkg-plist.emacs
==============================================================================
--- head/mail/wanderlust/pkg-plist.emacs	Thu Jan  7 16:55:35 2016	(r405474)
+++ head/mail/wanderlust/pkg-plist.emacs	Thu Jan  7 16:57:21 2016	(r405475)
@@ -248,12 +248,3 @@ share/examples/wanderlust/ja/dot.address
 share/examples/wanderlust/ja/dot.folders
 share/examples/wanderlust/ja/dot.wl
 share/wanderlust/ja.Emacs
- at dirrm %%WL_LISPDIR%%
-%%PORTDOCS%%@dirrm share/doc/ja/wanderlust
-%%PORTDOCS%%@dirrm share/doc/wanderlust
- at dirrm %%WL_ICONDIR%%
- at dirrm %%EMACS_LIBDIR_WITH_VER%%/etc/wl
- at dirrm share/examples/wanderlust/en
- at dirrm share/examples/wanderlust/ja
- at dirrm share/examples/wanderlust
- at dirrm share/wanderlust