From owner-svn-ports-all@FreeBSD.ORG Mon Feb 25 11:11:21 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id EA3B9D36; Mon, 25 Feb 2013 11:11:21 +0000 (UTC) (envelope-from makc@issp.ac.ru) Received: from mail.issp.ac.ru (mail.issp.ac.ru [77.236.34.3]) by mx1.freebsd.org (Postfix) with ESMTP id 621F7EC; Mon, 25 Feb 2013 11:11:21 +0000 (UTC) Received: from mercury.ph.man.ac.uk [130.88.75.175:47307] (HELO/EHLO mercury.ph.man.ac.uk, authenticated with PLAIN) by mail.issp.ac.ru with ESMTP/inet id r1PBBDg0063784 (using TLSv1/SSLv3, with cipher DHE-RSA-AES256-SHA (256 bits), verified NO) Mon, 25 Feb 2013 15:11:14 +0400 (MSK) From: Max Brazhnikov To: Guido Falsi Subject: Re: svn commit: r312882 - in head/games/odamex: . files Date: Mon, 25 Feb 2013 11:12:05 +0000 Message-ID: <3131991.CoBocWeH8C@mercury.ph.man.ac.uk> User-Agent: KMail/4.9.5 (FreeBSD/9.1-STABLE; KDE/4.9.5; amd64; ; ) In-Reply-To: <201302241720.r1OHKoW3018926@svn.freebsd.org> References: <201302241720.r1OHKoW3018926@svn.freebsd.org> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="UTF-8" Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 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: Mon, 25 Feb 2013 11:11:22 -0000 Hi, On Sun, 24 Feb 2013 17:20:50 +0000 (UTC)Sun Feb 24 17:20:49 2013 Guido Falsi wrote: > Author: madpilot > Date: Sun Feb 24 17:20:49 2013 > New Revision: 312882 > URL: http://svnweb.freebsd.org/changeset/ports/312882 > > Log: > - Update to 0.6.2 > - Remove unneeded option > - Trim Makefile headers > > PR: ports/174093 > Submitted by: Green Dog > > Added: > head/games/odamex/files/patch-CMakeLists.txt (contents, props changed) > head/games/odamex/files/patch-client-src-cl_download.cpp (contents, props changed) > head/games/odamex/files/patch-common-d_main.cpp (contents, props changed) > head/games/odamex/files/patch-odalaunch-CMakeLists.txt (contents, props changed) > head/games/odamex/files/patch-odalaunch-src-dlg_main.cpp (contents, props changed) > Deleted: > head/games/odamex/files/patch-Makefile > head/games/odamex/files/patch-client__src__d_main.cpp > head/games/odamex/files/patch-odalaunch__Makefile > head/games/odamex/files/patch-server__src__d_main.cpp > Modified: > head/games/odamex/Makefile (contents, props changed) > head/games/odamex/distinfo (contents, props changed) > head/games/odamex/pkg-plist (contents, props changed) > > Modified: head/games/odamex/Makefile > ============================================================================== > --- head/games/odamex/Makefile Sun Feb 24 17:09:12 2013 (r312881) > +++ head/games/odamex/Makefile Sun Feb 24 17:20:49 2013 (r312882) > @@ -1,12 +1,8 @@ > -# New ports collection makefile for: odamex > -# Date created: 2007-12-06 > -# Whom: alepulver > -# > +# Created by: alepulver > # $FreeBSD$ > -# > > PORTNAME= odamex > -PORTVERSION= 0.5.6 > +PORTVERSION= 0.6.2 > CATEGORIES= games > MASTER_SITES= SF/${PORTNAME}/Odamex/${PORTVERSION} > DISTNAME= odamex-src-${PORTVERSION} > @@ -15,43 +11,40 @@ MAINTAINER= ports@FreeBSD.org > COMMENT= The Standard in Online Multiplayer Doom > > USE_BZIP2= yes > -USE_GMAKE= yes > USE_SDL= sdl mixer > +USE_CMAKE= yes > +USE_DOS2UNIX= CMakeLists.txt odalaunch/CMakeLists.txt common/d_main.cpp > > -OPTIONS_DEFINE= LAUNCHER MIDI > +OPTIONS_DEFINE= LAUNCHER > > LAUNCHER_DESC= Enable GUI launcher program > -MIDI_DESC= Enable MIDI support (timidity) > > .include > > .if ${PORT_OPTIONS:MLAUNCHER} > USE_WX= 2.6+ > -MAKE_ENV+= WXRC_CMD="${WXRC_CMD}" WITH_LAUNCHER=yes > +CMAKE_ARGS+= -DODALAUNCH_TARGET=on -DNO_AG-ODALAUNCH_TARGET=off > PLIST_SUB+= LAUNCHER="" > .else > PLIST_SUB+= LAUNCHER="@comment " > -.endif > - > -.if ${PORT_OPTIONS:MMIDI} > -RUN_DEPENDS+= timidity:${PORTSDIR}/audio/timidity > +CMAKE_ARGS+= -DODALAUNCH_TARGET=off > .endif > > post-patch: > @${REINPLACE_CMD} -e 's|%%DMDIR%%|${DMDIR}|; \ > s|%%DATADIR%%|${DATADIR}|' \ > - ${WRKSRC}/client/src/d_main.cpp \ > - ${WRKSRC}/server/src/d_main.cpp > - > -.if ${PORT_OPTIONS:MLAUNCHER} > - @${REINPLACE_CMD} -e 's|\./odamex|odamex|' \ > - ${WRKSRC}/odalaunch/src/misc.cpp > -.endif > + ${WRKSRC}/common/d_main.cpp > + @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' \ > + ${WRKSRC}/odalaunch/src/dlg_main.cpp > + @${REINPLACE_CMD} -e 's|%%WX_VER%%|${WX_VERSION}|' \ > + -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ > + ${WRKSRC}/odalaunch/CMakeLists.txt > + @${REINPLACE_CMD} -e 's|-waddir /usr/share/doom||' \ > + ${WRKSRC}/installer/arch/odamex.desktop > > do-install: > -.for f in odamex odasrv > - ${INSTALL_PROGRAM} ${WRKSRC}/${f} ${PREFIX}/bin > -.endfor > + ${INSTALL_PROGRAM} ${WRKSRC}/client/odamex ${PREFIX}/bin > + ${INSTALL_PROGRAM} ${WRKSRC}/server/odasrv ${PREFIX}/bin > .if ${PORT_OPTIONS:MLAUNCHER} > ${INSTALL_PROGRAM} ${WRKSRC}/odalaunch/odalaunch ${PREFIX}/bin > .endif > @@ -60,6 +53,20 @@ do-install: > .if ${PORT_OPTIONS:MDOCS} > ${MKDIR} ${DOCSDIR} > ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} > + ${INSTALL_DATA} ${WRKSRC}/LICENSE ${DOCSDIR} > +.endif > +.for f in odamex odasrv > + ${INSTALL_DATA} ${WRKSRC}/media/icon_${f}_*.png ${PREFIX}/share/pixmaps > +.endfor > +.if ${PORT_OPTIONS:MLAUNCHER} > + ${INSTALL_DATA} ${WRKSRC}/media/icon_odalaunch_*.png ${PREFIX}/share/pixmaps > +.endif > + ${MKDIR} ${PREFIX}/share/applications > +.for f in odamex odasrv > + ${INSTALL_DATA} ${WRKSRC}/installer/arch/${f}.desktop ${PREFIX}/share/applications > +.endfor > +.if ${PORT_OPTIONS:MLAUNCHER} > + ${INSTALL_DATA} ${WRKSRC}/installer/arch/odalaunch.desktop ${PREFIX}/share/applications > .endif Is there a reason for using custom install target instead of relying on what comes with the project? Max