From owner-svn-ports-all@freebsd.org  Thu Jan  7 16:57:23 2016
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 550AFA66781;
 Thu,  7 Jan 2016 16:57:23 +0000 (UTC)
 (envelope-from pawel@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 0A6F21EDB;
 Thu,  7 Jan 2016 16:57:22 +0000 (UTC)
 (envelope-from pawel@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u07GvMRq067013;
 Thu, 7 Jan 2016 16:57:22 GMT (envelope-from pawel@FreeBSD.org)
Received: (from pawel@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u07GvMdJ067011;
 Thu, 7 Jan 2016 16:57:22 GMT (envelope-from pawel@FreeBSD.org)
Message-Id: <201601071657.u07GvMdJ067011@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: pawel set sender to
 pawel@FreeBSD.org using -f
From: Pawel Pekala <pawel@FreeBSD.org>
Date: Thu, 7 Jan 2016 16:57:22 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r405475 - head/mail/wanderlust
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 07 Jan 2016 16:57:23 -0000

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@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
-@dirrm %%WL_LISPDIR%%
-%%PORTDOCS%%@dirrm share/doc/ja/wanderlust
-%%PORTDOCS%%@dirrm share/doc/wanderlust
-@dirrm %%WL_ICONDIR%%
-@dirrm %%EMACS_LIBDIR_WITH_VER%%/etc/wl
-@dirrm share/examples/wanderlust/en
-@dirrm share/examples/wanderlust/ja
-@dirrm share/examples/wanderlust
-@dirrm share/wanderlust