From owner-svn-ports-all@freebsd.org  Fri Sep  4 21:33:47 2015
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 21AE49CB777;
 Fri,  4 Sep 2015 21:33:47 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::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 0FDD1194E;
 Fri,  4 Sep 2015 21:33:47 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t84LXkSc068723;
 Fri, 4 Sep 2015 21:33:46 GMT (envelope-from amdmi3@FreeBSD.org)
Received: (from amdmi3@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t84LXkSx068720;
 Fri, 4 Sep 2015 21:33:46 GMT (envelope-from amdmi3@FreeBSD.org)
Message-Id: <201509042133.t84LXkSx068720@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to
 amdmi3@FreeBSD.org using -f
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Fri, 4 Sep 2015 21:33:46 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r396144 - head/x11-wm/fvwm-crystal
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: Fri, 04 Sep 2015 21:33:47 -0000

Author: amdmi3
Date: Fri Sep  4 21:33:46 2015
New Revision: 396144
URL: https://svnweb.freebsd.org/changeset/ports/396144

Log:
  - Add NO_ARCH
  - Switch to options helpers
  
  Approved by:	portmgr blanket

Modified:
  head/x11-wm/fvwm-crystal/Makefile

Modified: head/x11-wm/fvwm-crystal/Makefile
==============================================================================
--- head/x11-wm/fvwm-crystal/Makefile	Fri Sep  4 21:33:45 2015	(r396143)
+++ head/x11-wm/fvwm-crystal/Makefile	Fri Sep  4 21:33:46 2015	(r396144)
@@ -17,6 +17,8 @@ USES=		gettext gmake python shebangfix
 SHEBANG_FILES=	addons/* bin/* fvwm/scripts/speed_value
 MAKE_ENV=	prefix="${PREFIX}" addondir="${DOCSDIR}/addons"
 PORTDOCS=	*
+INSTALL_TARGET=	install
+NO_ARCH=	yes
 
 OPTIONS_DEFINE=	ROX IMAGEMAGICK XSCREENSAVER TRAYER SUDO HSETROOT CMUS DOCS
 OPTIONS_DEFAULT=	ROX IMAGEMAGICK XSCREENSAVER TRAYER SUDO HSETROOT
@@ -35,17 +37,12 @@ TRAYER_RUN_DEPENDS=	trayer:${PORTSDIR}/x
 SUDO_RUN_DEPENDS=	sudo:${PORTSDIR}/security/sudo
 SETROOT_RUN_DEPENDS=	hsetroot:${PORTSDIR}/graphics/hsetroot
 CMUS_RUN_DEPENDS=	cmus:${PORTSDIR}/audio/cmus
-
-.include <bsd.port.options.mk>
+DOCS_INSTALL_TARGET=	install-doc
 
 post-extract:
 	@cd ${WRKSRC} && ${FIND} . -depth -type d -name .svn \
 		-exec ${RM} -rf {} \;
 
-.if ${PORT_OPTIONS:MDOCS}
-INSTALL_TARGET=	install install-doc
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|cp -r -d|cp -r|; s|cp -d|cp|' \
 		${WRKSRC}/${MAKEFILE}