From owner-svn-ports-all@freebsd.org Thu May 17 09:10:38 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4576FEE1B43; Thu, 17 May 2018 09:10:38 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id EE54A74E2C; Thu, 17 May 2018 09:10:37 +0000 (UTC) (envelope-from tobik@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CE17427168; Thu, 17 May 2018 09:10:37 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4H9AbaB001540; Thu, 17 May 2018 09:10:37 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4H9AbtT001538; Thu, 17 May 2018 09:10:37 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201805170910.w4H9AbtT001538@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Thu, 17 May 2018 09:10:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r470210 - head/games/imaze X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: head/games/imaze X-SVN-Commit-Revision: 470210 X-SVN-Commit-Repository: ports 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.26 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: Thu, 17 May 2018 09:10:38 -0000 Author: tobik Date: Thu May 17 09:10:37 2018 New Revision: 470210 URL: https://svnweb.freebsd.org/changeset/ports/470210 Log: games/imaze: Fix conflict with devel/ninja Both ports install bin/ninja; install imaze's ninja as bin/imazeninja instead. While here - add DOCS option and install README into DOCSDIR - remove ${ECHO_MSG} from do-install that nobody will ever see - simplify do-install PR: 228311 Submitted by: tigersharke@gmail.com Modified: head/games/imaze/Makefile head/games/imaze/pkg-plist Modified: head/games/imaze/Makefile ============================================================================== --- head/games/imaze/Makefile Thu May 17 09:04:09 2018 (r470209) +++ head/games/imaze/Makefile Thu May 17 09:10:37 2018 (r470210) @@ -3,7 +3,7 @@ PORTNAME= imaze PORTVERSION= 1.4 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= games MASTER_SITES= http://www.sourcefiles.org/Games/Arcade/ PKGNAMESUFFIX= -${TOOLKIT} @@ -23,7 +23,7 @@ MAKE_ENV= SOUNDDIR="${DATADIR}/sounds" BUILD_WRKSRC= ${WRKSRC}/source CONFIGURE_WRKSRC= ${WRKSRC}/source -OPTIONS_DEFINE= AUDIO JOYSTICK +OPTIONS_DEFINE= AUDIO DOCS JOYSTICK OPTIONS_SINGLE= GUI OPTIONS_SINGLE_GUI= ATHENA MOTIF XVIEW OPTIONS_DEFAULT= ATHENA AUDIO JOYSTICK @@ -41,17 +41,27 @@ MOTIF_VARS= MOTIFLIB="-L${LOCALBASE}/lib -lXm -lXt" TO XVIEW_LIB_DEPENDS= libxview.so:x11-toolkits/xview XVIEW_VARS= TOOLKIT=xview +post-patch: + @${REINPLACE_CMD} 's@ninja@imazeninja@g' ${WRKSRC}/man6/*.6 + do-install: -.for i in genlab imaze imazesrv imazestat ninja xlabed - (cd ${WRKSRC}/source && ${INSTALL_PROGRAM} ${i} ${STAGEDIR}${PREFIX}/bin) -.endfor - (cd ${WRKSRC}/man6 && ${INSTALL_MAN} *.6 ${STAGEDIR}${MAN6PREFIX}/man/man6) - @${MKDIR} ${STAGEDIR}${DATADIR} - (cd ${WRKSRC} && ${INSTALL_DATA} README ${STAGEDIR}${DATADIR}) + cd ${WRKSRC}/source && ${INSTALL_PROGRAM} \ + genlab imaze imazesrv imazestat xlabed \ + ${STAGEDIR}${PREFIX}/bin +# Install ninja as imazeninja to resolve conflict with devel/ninja + ${INSTALL_PROGRAM} ${WRKSRC}/source/ninja ${STAGEDIR}${PREFIX}/bin/imazeninja + cd ${WRKSRC}/man6 && ${INSTALL_MAN} \ + genlab.6 imaze.6 imazesrv.6 imazestat.6 xlabed.6 \ + ${STAGEDIR}${MAN6PREFIX}/man/man6 + ${INSTALL_MAN} ${WRKSRC}/man6/ninja.6 \ + ${STAGEDIR}${MAN6PREFIX}/man/man6/imazeninja.6 @${MKDIR} ${STAGEDIR}${DATADIR}/labs - (cd ${WRKSRC}/labs && ${INSTALL_DATA} *.lab ${STAGEDIR}${DATADIR}/labs) + ${INSTALL_DATA} ${WRKSRC}/labs/*.lab ${STAGEDIR}${DATADIR}/labs @${MKDIR} ${STAGEDIR}${DATADIR}/sounds - (cd ${WRKSRC}/sounds && ${INSTALL_DATA} *.au ${STAGEDIR}${DATADIR}/sounds) - @${ECHO_MSG} "Please read the file \"${DATADIR}/README\"." + ${INSTALL_DATA} ${WRKSRC}/sounds/*.au ${STAGEDIR}${DATADIR}/sounds + +post-install-DOCS-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} .include Modified: head/games/imaze/pkg-plist ============================================================================== --- head/games/imaze/pkg-plist Thu May 17 09:04:09 2018 (r470209) +++ head/games/imaze/pkg-plist Thu May 17 09:10:37 2018 (r470210) @@ -1,14 +1,14 @@ -bin/imaze -bin/ninja bin/genlab +bin/imaze +bin/imazeninja bin/imazesrv bin/imazestat bin/xlabed man/man6/genlab.6.gz man/man6/imaze.6.gz +man/man6/imazeninja.6.gz man/man6/imazesrv.6.gz man/man6/imazestat.6.gz -man/man6/ninja.6.gz man/man6/xlabed.6.gz %%DATADIR%%/labs/10x10.lab %%DATADIR%%/labs/12x12.lab @@ -29,4 +29,4 @@ man/man6/xlabed.6.gz %%DATADIR%%/sounds/pause.au %%DATADIR%%/sounds/shoot.au %%DATADIR%%/sounds/title.au -%%DATADIR%%/README +%%DOCSDIR%%/README