From owner-svn-ports-all@freebsd.org  Thu Sep 24 22:26:04 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 9ACAFA07EC5;
 Thu, 24 Sep 2015 22:26:04 +0000 (UTC)
 (envelope-from bapt@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 8B810117D;
 Thu, 24 Sep 2015 22:26:04 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t8OMQ4P5075270;
 Thu, 24 Sep 2015 22:26:04 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8OMQ4eW075268;
 Thu, 24 Sep 2015 22:26:04 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201509242226.t8OMQ4eW075268@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bapt set sender to
 bapt@FreeBSD.org using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Thu, 24 Sep 2015 22:26:04 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r397776 - head/games/xboing
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, 24 Sep 2015 22:26:04 -0000

Author: bapt
Date: Thu Sep 24 22:26:03 2015
New Revision: 397776
URL: https://svnweb.freebsd.org/changeset/ports/397776

Log:
  Simplify a bit the plist
  Use options helpers

Modified:
  head/games/xboing/Makefile
  head/games/xboing/pkg-plist

Modified: head/games/xboing/Makefile
==============================================================================
--- head/games/xboing/Makefile	Thu Sep 24 22:19:58 2015	(r397775)
+++ head/games/xboing/Makefile	Thu Sep 24 22:26:03 2015	(r397776)
@@ -21,11 +21,7 @@ OPTIONS_DEFINE=SOUND
 OPTIONS_DEFAULT=SOUND
 OPTIONS_SUB=yes
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MSOUND}
-MAKE_ENV+=	WITHOUT_AUDIO=True
-.endif
+SOUND_MAKE_ENV=	WITHOUT_AUDIO=True
 
 post-install:
 	${RM} ${STAGEDIR}${PREFIX}/lib/X11/xboing/.xboing.scr

Modified: head/games/xboing/pkg-plist
==============================================================================
--- head/games/xboing/pkg-plist	Thu Sep 24 22:19:58 2015	(r397775)
+++ head/games/xboing/pkg-plist	Thu Sep 24 22:26:03 2015	(r397776)
@@ -1,4 +1,4 @@
-bin/xboing
+@(root,games,2755) bin/xboing
 lib/X11/xboing/levels/demo.data
 lib/X11/xboing/levels/editor.data
 lib/X11/xboing/levels/level01.data
@@ -130,14 +130,8 @@ man/man1/xboing.1.gz
 %%SOUND%%lib/X11/xboing/sounds/wzzz2.au
 %%SOUND%%lib/X11/xboing/sounds/youagod.au
 lib/X11/xboing/problems.doc
-@exec chown root:games %D/bin/xboing
-@exec chmod 2755 %D/bin/xboing
 @exec touch %D/lib/X11/xboing/.xboing.scr
-@exec chown root:games %D/lib/X11/xboing
-@exec chmod 775 %D/lib/X11/xboing
 @exec chown root:games %D/lib/X11/xboing/.xboing.scr
 @exec chmod 664 %D/lib/X11/xboing/.xboing.scr
 @unexec if test ! -s %D/lib/X11/xboing/.xboing.scr ; then rm -f %D/lib/X11/xboing/.xboing.scr ; fi
-%%SOUND%%@dirrm lib/X11/xboing/sounds
-@dirrm lib/X11/xboing/levels
-@dirrm lib/X11/xboing
+@dir(root,games,775) lib/X11/xboing