From owner-svn-ports-all@freebsd.org Fri Dec 18 16:46:07 2015 Return-Path: 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 00381A4CE28; Fri, 18 Dec 2015 16:46:07 +0000 (UTC) (envelope-from mat@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 9DDF819DA; Fri, 18 Dec 2015 16:46:06 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBIGk5r7049875; Fri, 18 Dec 2015 16:46:05 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBIGk5of049871; Fri, 18 Dec 2015 16:46:05 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201512181646.tBIGk5of049871@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Fri, 18 Dec 2015 16:46:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r403979 - in head/games/trackballs: . files 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Dec 2015 16:46:07 -0000 Author: mat Date: Fri Dec 18 16:46:05 2015 New Revision: 403979 URL: https://svnweb.freebsd.org/changeset/ports/403979 Log: Fix build as a user. Use options helpers. Sponsored by: Absolight Added: head/games/trackballs/files/patch-share_Makefile.in (contents, props changed) Modified: head/games/trackballs/Makefile head/games/trackballs/pkg-plist Modified: head/games/trackballs/Makefile ============================================================================== --- head/games/trackballs/Makefile Fri Dec 18 16:46:00 2015 (r403978) +++ head/games/trackballs/Makefile Fri Dec 18 16:46:05 2015 (r403979) @@ -35,16 +35,14 @@ MUSIC_DESC= Install additional music NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls -.include - post-patch: @${REINPLACE_CMD} -e 's|install -D|$$(INSTALL)|' \ ${WRKSRC}/share/Makefile.in -post-install: -.if ${PORT_OPTIONS:MMUSIC} +post-install-MUSIC-on: ${INSTALL_DATA} ${WRKDIR}/trackballs-music/*.ogg ${STAGEDIR}${DATADIR}/music/ -.endif + +post-install: ${INSTALL_DATA} ${WRKSRC}/share/icons/${PORTNAME}-48x48.png ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png .include Added: head/games/trackballs/files/patch-share_Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/trackballs/files/patch-share_Makefile.in Fri Dec 18 16:46:05 2015 (r403979) @@ -0,0 +1,11 @@ +--- share/Makefile.in.orig 2015-12-18 16:12:01 UTC ++++ share/Makefile.in +@@ -567,7 +567,7 @@ uninstall-man: uninstall-man6 + + + install-pkgdataDATA: +- -install -D -m664 -g games highScores $(DESTDIR)@with_highscores@ ++ -install -D highScores $(DESTDIR)@with_highscores@ + -chgrp -R games $(DESTDIR)$(pkgdatadir)/levels + chmod -R g+r $(DESTDIR)$(pkgdatadir)/levels + # Tell versions [3.59,3.63) of GNU make to not export all variables. Modified: head/games/trackballs/pkg-plist ============================================================================== --- head/games/trackballs/pkg-plist Fri Dec 18 16:46:00 2015 (r403978) +++ head/games/trackballs/pkg-plist Fri Dec 18 16:46:05 2015 (r403979) @@ -15,7 +15,7 @@ share/pixmaps/trackballs.png %%DATADIR%%/customizing.html %%DATADIR%%/examples.html %%DATADIR%%/fonts/menuFont.ttf -%%DATADIR%%/highScores +@(,games,664) %%DATADIR%%/highScores %%DATADIR%%/images/acid.png %%DATADIR%%/images/difficulty0.png %%DATADIR%%/images/difficulty0High.png