From owner-svn-ports-head@freebsd.org Mon Dec 18 11:43:56 2017 Return-Path: Delivered-To: svn-ports-head@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 9DC39E84618; Mon, 18 Dec 2017 11:43:56 +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 7471E767A6; Mon, 18 Dec 2017 11:43:56 +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 vBIBhtOA067687; Mon, 18 Dec 2017 11:43:55 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBIBhtkA067685; Mon, 18 Dec 2017 11:43:55 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201712181143.vBIBhtkA067685@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Mon, 18 Dec 2017 11:43:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r456622 - head/games/odamex X-SVN-Group: ports-head X-SVN-Commit-Author: amdmi3 X-SVN-Commit-Paths: head/games/odamex X-SVN-Commit-Revision: 456622 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Dec 2017 11:43:56 -0000 Author: amdmi3 Date: Mon Dec 18 11:43:55 2017 New Revision: 456622 URL: https://svnweb.freebsd.org/changeset/ports/456622 Log: - Fix LICENSE - Switch to options helpers - Don't install LICENSE with docs Modified: head/games/odamex/Makefile head/games/odamex/pkg-plist Modified: head/games/odamex/Makefile ============================================================================== --- head/games/odamex/Makefile Mon Dec 18 11:23:13 2017 (r456621) +++ head/games/odamex/Makefile Mon Dec 18 11:43:55 2017 (r456622) @@ -11,7 +11,7 @@ DISTNAME= odamex-src-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Client/server multiplayer engine for Doom -LICENSE= GPLv2 +LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/LICENSE USE_SDL= sdl mixer @@ -28,8 +28,6 @@ LAUNCHER_USE= WX=3.0 LAUNCHER_CMAKE_ON= -DODALAUNCH_TARGET=on -DNO_AG-ODALAUNCH_TARGET=off -DwxWidgets_CONFIG_EXECUTABLE=${PREFIX}/bin/wxgtk2u-3.0-config LAUNCHER_CMAKE_OFF= -DODALAUNCH_TARGET=off -.include - post-patch: @${REINPLACE_CMD} -e 's|%%DMDIR%%|${DMDIR}|; \ s|%%DATADIR%%|${DATADIR}|' \ @@ -45,26 +43,23 @@ post-patch: do-install: ${INSTALL_PROGRAM} ${WRKSRC}/client/odamex ${STAGEDIR}${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/server/odasrv ${STAGEDIR}${PREFIX}/bin -.if ${PORT_OPTIONS:MLAUNCHER} - ${INSTALL_PROGRAM} ${WRKSRC}/odalaunch/odalaunch ${STAGEDIR}${PREFIX}/bin -.endif @${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/odamex.wad ${STAGEDIR}${DATADIR} - @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/LICENSE ${STAGEDIR}${DOCSDIR} .for f in odamex odasrv ${INSTALL_DATA} ${WRKSRC}/media/icon_${f}_*.png ${STAGEDIR}${PREFIX}/share/pixmaps .endfor -.if ${PORT_OPTIONS:MLAUNCHER} - ${INSTALL_DATA} ${WRKSRC}/media/icon_odalaunch_*.png ${STAGEDIR}${PREFIX}/share/pixmaps -.endif .for f in odamex odasrv ${INSTALL_DATA} ${WRKSRC}/installer/arch/${f}.desktop ${STAGEDIR}${PREFIX}/share/applications .endfor -.if ${PORT_OPTIONS:MLAUNCHER} + +do-install-DOCS-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} + +do-install-LAUNCHER-on: + ${INSTALL_PROGRAM} ${WRKSRC}/odalaunch/odalaunch ${STAGEDIR}${PREFIX}/bin + ${INSTALL_DATA} ${WRKSRC}/media/icon_odalaunch_*.png ${STAGEDIR}${PREFIX}/share/pixmaps ${INSTALL_DATA} ${WRKSRC}/installer/arch/odalaunch.desktop ${STAGEDIR}${PREFIX}/share/applications -.endif .include "${.CURDIR}/../doom-data/Makefile.include" Modified: head/games/odamex/pkg-plist ============================================================================== --- head/games/odamex/pkg-plist Mon Dec 18 11:23:13 2017 (r456621) +++ head/games/odamex/pkg-plist Mon Dec 18 11:43:55 2017 (r456622) @@ -17,5 +17,4 @@ share/pixmaps/icon_odasrv_256.png share/pixmaps/icon_odasrv_512.png share/pixmaps/icon_odasrv_96.png %%DATADIR%%/odamex.wad -%%PORTDOCS%%%%DOCSDIR%%/LICENSE %%PORTDOCS%%%%DOCSDIR%%/README