From owner-svn-ports-all@freebsd.org  Mon Jun  6 09:03:54 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 AC605B6DD53;
 Mon,  6 Jun 2016 09:03:54 +0000 (UTC)
 (envelope-from amdmi3@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 7E89C1C98;
 Mon,  6 Jun 2016 09:03:54 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u5693rG2046532;
 Mon, 6 Jun 2016 09:03:53 GMT (envelope-from amdmi3@FreeBSD.org)
Received: (from amdmi3@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u5693rmK046531;
 Mon, 6 Jun 2016 09:03:53 GMT (envelope-from amdmi3@FreeBSD.org)
Message-Id: <201606060903.u5693rmK046531@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: Mon, 6 Jun 2016 09:03:53 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r416446 - head/games/bugsquish
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.22
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: Mon, 06 Jun 2016 09:03:54 -0000

Author: amdmi3
Date: Mon Jun  6 09:03:53 2016
New Revision: 416446
URL: https://svnweb.freebsd.org/changeset/ports/416446

Log:
  - Switch to options helpers

Modified:
  head/games/bugsquish/Makefile

Modified: head/games/bugsquish/Makefile
==============================================================================
--- head/games/bugsquish/Makefile	Mon Jun  6 07:57:32 2016	(r416445)
+++ head/games/bugsquish/Makefile	Mon Jun  6 09:03:53 2016	(r416446)
@@ -22,16 +22,17 @@ USES=		gmake
 USE_SDL=	image mixer sdl
 
 PORTDOCS=	AUTHORS.txt CHANGES.txt README.txt
-OPTIONS_DEFINE=	DOCS
 
 DESKTOP_ENTRIES="Bug Squish" "" "${PORTNAME}" \
 		"${PORTNAME}" "Game;ArcadeGame;" ""
 
+OPTIONS_DEFINE=	DOCS
+
 post-extract:
 	${TAR} xfjp ${_DISTDIR}/${PORTNAME}_music${EXTRACT_SUFX} -C \
 		${WRKSRC}/data/music/
 	@cd ${WRKSRC}/data/music ; ${RM} -f *.mod
-	@${FIND} ${WRKDIR} -name .xvpics | ${XARGS} ${RM} -fr
+	@${FIND} ${WRKDIR} -name .xvpics -print0 | ${XARGS} -0 ${RM} -fr
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/share/bugsquish/|${DATADIR}/| ; \
@@ -44,14 +45,11 @@ post-patch:
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
-
-.  for d in embedded images music sounds
-	@(cd ${WRKSRC}/data && ${COPYTREE_SHARE} ${d} ${STAGEDIR}${DATADIR})
-.  endfor
-
+	@(cd ${WRKSRC}/data && ${COPYTREE_SHARE} "embedded images music sounds" ${STAGEDIR}${DATADIR})
 	${LN} -sf ${PREFIX}/share/bugsquish/images/icon.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png
 
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}