aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpawel <pawel@FreeBSD.org>2016-01-08 00:57:21 +0800
committerpawel <pawel@FreeBSD.org>2016-01-08 00:57:21 +0800
commite7467b52e999a4f1cb8b43343b65d5be95551b86 (patch)
treea647e60545289daec365f449cc8179f74c7ff2e1
parent9546d51ed7f5a9540a628888e15d24675c2cfb63 (diff)
downloadfreebsd-ports-gnome-e7467b52e999a4f1cb8b43343b65d5be95551b86.tar.gz
freebsd-ports-gnome-e7467b52e999a4f1cb8b43343b65d5be95551b86.tar.zst
freebsd-ports-gnome-e7467b52e999a4f1cb8b43343b65d5be95551b86.zip
- 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
-rw-r--r--mail/wanderlust/Makefile7
-rw-r--r--mail/wanderlust/pkg-plist.emacs9
2 files changed, 2 insertions, 14 deletions
diff --git a/mail/wanderlust/Makefile b/mail/wanderlust/Makefile
index 4514defa75ec..a16723140d1f 100644
--- a/mail/wanderlust/Makefile
+++ b/mail/wanderlust/Makefile
@@ -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}
diff --git a/mail/wanderlust/pkg-plist.emacs b/mail/wanderlust/pkg-plist.emacs
index 826562860eae..2a4edd2d8e04 100644
--- a/mail/wanderlust/pkg-plist.emacs
+++ b/mail/wanderlust/pkg-plist.emacs
@@ -248,12 +248,3 @@ share/examples/wanderlust/ja/dot.addresses
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