From owner-svn-ports-head@FreeBSD.ORG Fri Sep 27 10:02:04 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 31F79FC1; Fri, 27 Sep 2013 10:02:04 +0000 (UTC) (envelope-from lme@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 0F1A72022; Fri, 27 Sep 2013 10:02:04 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8RA23vD089443; Fri, 27 Sep 2013 10:02:03 GMT (envelope-from lme@svn.freebsd.org) Received: (from lme@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8RA23Z9089433; Fri, 27 Sep 2013 10:02:03 GMT (envelope-from lme@svn.freebsd.org) Message-Id: <201309271002.r8RA23Z9089433@svn.freebsd.org> From: Lars Engels Date: Fri, 27 Sep 2013 10:02:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r328448 - head/games/scummvm X-SVN-Group: ports-head 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.14 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: Fri, 27 Sep 2013 10:02:04 -0000 Author: lme Date: Fri Sep 27 10:02:03 2013 New Revision: 328448 URL: http://svnweb.freebsd.org/changeset/ports/328448 Log: Re-work the port a bit: - Don't install files manually but use upstream's installation logic - Install upstream's desktop file - Add a new OPTION for PNG support and enable it by default and disable it explicitly if it's not selected - Use new LIB_DEPENDS format - Use USES= gmake - Support staging Added: head/games/scummvm/pkg-plist (contents, props changed) Modified: head/games/scummvm/Makefile Modified: head/games/scummvm/Makefile ============================================================================== --- head/games/scummvm/Makefile Fri Sep 27 09:35:29 2013 (r328447) +++ head/games/scummvm/Makefile Fri Sep 27 10:02:03 2013 (r328448) @@ -11,13 +11,11 @@ MAINTAINER= lme@FreeBSD.org COMMENT= Interpreter for several adventure games USE_BZIP2= yes -USE_GMAKE= yes +USES= gmake HAS_CONFIGURE= yes USE_SDL= sdl - -CONFIGURE_ARGS= --prefix=${PREFIX} \ - --with-sdl-prefix=${LOCALBASE} \ +CONFIGURE_ARGS= --with-sdl-prefix=${LOCALBASE} \ --disable-alsa \ --with-zlib-prefix=/usr \ --disable-debug \ @@ -25,38 +23,11 @@ CONFIGURE_ARGS= --prefix=${PREFIX} \ --disable-tremor LDFLAGS+= ${PTHREAD_LIBS} -OPTIONS_DEFINE= VORBIS MP3 FLAC FLUIDSYNTH MT32EMU +OPTIONS_DEFINE= VORBIS MP3 PNG FLAC FLUIDSYNTH MT32EMU FLUIDSYNTH_DESC= FluidSynth MIDI synthesizer MT32EMU_DESC= MT-32 emulator -OPTIONS_DEFAULT= VORBIS MP3 MT32EMU - -MAN6= scummvm.6 +OPTIONS_DEFAULT= VORBIS MP3 PNG MT32EMU -PORTDOCS= AUTHORS NEWS README TODO COPYRIGHT -ENGINEDATA= drascula.dat \ - hugo.dat \ - kyra.dat \ - lure.dat \ - queen.tbl \ - sky.cpt \ - teenagent.dat \ - toon.dat - -DESKTOP_ENTRIES="ScummVM" \ - "ScummVM - Run classic adventure games" \ - "${DATADIR}/scummvm.svg" \ - "scummvm" \ - "Game;AdventureGame;" \ - false - -PLIST_FILES= bin/scummvm \ - %%DATADIR%%/scummvm.svg \ - %%DATADIR%%/scummmodern.zip \ - %%DATADIR%%/translations.dat \ - $(ENGINEDATA:S/^/%%DATADIR%%\//) -PLIST_DIRS= %%DATADIR%% - -NO_STAGE= yes .include .if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64" @@ -64,8 +35,8 @@ BROKEN= Does not compile on ia64, power .endif .if ${PORT_OPTIONS:MVORBIS} -LIB_DEPENDS+= ogg:${PORTSDIR}/audio/libogg \ - vorbis:${PORTSDIR}/audio/libvorbis +LIB_DEPENDS+= libogg.so:${PORTSDIR}/audio/libogg \ + libvorbis.so:${PORTSDIR}/audio/libvorbis CONFIGURE_ARGS+=--with-ogg-prefix=${LOCALBASE} \ --with-vorbis-prefix=${LOCALBASE} .else @@ -73,21 +44,28 @@ CONFIGURE_ARGS+=--disable-vorbis .endif .if ${PORT_OPTIONS:MMP3} -LIB_DEPENDS+= mad:${PORTSDIR}/audio/libmad +LIB_DEPENDS+= libmad.so:${PORTSDIR}/audio/libmad CONFIGURE_ARGS+=--with-mad-prefix=${LOCALBASE} .else CONFIGURE_ARGS+=--disable-mad .endif +.if ${PORT_OPTIONS:MPNG} +LIB_DEPENDS+= libpng.so:${PORTSDIR}/graphics/png +CONFIGURE_ARGS+=--with-png-prefix=${LOCALBASE} +.else +CONFIGURE_ARGS+=--disable-png +.endif + .if ${PORT_OPTIONS:MFLAC} -LIB_DEPENDS+= FLAC:${PORTSDIR}/audio/flac +LIB_DEPENDS+= libFLAC.so:${PORTSDIR}/audio/flac CONFIGURE_ARGS+=--with-flac-prefix=${LOCALBASE} .else CONFIGURE_ARGS+=--disable-flac .endif .if ${PORT_OPTIONS:MFLUIDSYNTH} -LIB_DEPENDS+= fluidsynth:${PORTSDIR}/audio/fluidsynth +LIB_DEPENDS+= libfluidsynth.so:${PORTSDIR}/audio/fluidsynth CONFIGURE_ARGS+=--with-fluidsynth-prefix=${LOCALBASE} .else CONFIGURE_ARGS+=--disable-fluidsynth @@ -97,21 +75,8 @@ CONFIGURE_ARGS+=--disable-fluidsynth CONFIGURE_ARGS+=--disable-mt32emu .endif -do-install: - @${INSTALL_PROGRAM} ${WRKSRC}/scummvm ${PREFIX}/bin - @${INSTALL_MAN} ${WRKSRC}/dists/scummvm.6 ${MAN6PREFIX}/man/man6 - @${MKDIR} ${DATADIR} - @${INSTALL_DATA} ${WRKSRC}/icons/scummvm.svg ${DATADIR} - @${INSTALL_DATA} ${WRKSRC}/gui/themes/scummmodern.zip ${DATADIR} - @${INSTALL_DATA} ${WRKSRC}/gui/themes/translations.dat ${DATADIR} -.for i in ${ENGINEDATA} - @${INSTALL_DATA} ${WRKSRC}/dists/engine-data/${i} ${DATADIR} -.endfor -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} -.for i in ${PORTDOCS} - @${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR} -.endfor -.endif +post-install: + ${MKDIR} ${STAGEDIR}${DESKTOPDIR} + ${INSTALL_DATA} ${WRKSRC}/dists/${PORTNAME}.desktop ${STAGEDIR}${DESKTOPDIR}/ .include Added: head/games/scummvm/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/scummvm/pkg-plist Fri Sep 27 10:02:03 2013 (r328448) @@ -0,0 +1,29 @@ +bin/scummvm +share/applications/scummvm.desktop +%%PORTDOCS%%%%DOCSDIR%%/AUTHORS +%%PORTDOCS%%%%DOCSDIR%%/COPYING +%%PORTDOCS%%%%DOCSDIR%%/COPYING.BSD +%%PORTDOCS%%%%DOCSDIR%%/COPYING.FREEFONT +%%PORTDOCS%%%%DOCSDIR%%/COPYING.LGPL +%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT +%%PORTDOCS%%%%DOCSDIR%%/NEWS +%%PORTDOCS%%%%DOCSDIR%%/README +share/man/man6/scummvm.6 +share/pixmaps/scummvm.xpm +%%DATADIR%%/drascula.dat +%%DATADIR%%/hugo.dat +%%DATADIR%%/kyra.dat +%%DATADIR%%/lure.dat +%%DATADIR%%/pred.dic +%%DATADIR%%/queen.tbl +%%DATADIR%%/scummclassic.zip +%%DATADIR%%/scummmodern.zip +%%DATADIR%%/sky.cpt +%%DATADIR%%/teenagent.dat +%%DATADIR%%/toon.dat +%%DATADIR%%/translations.dat +@dirrmtry %%DATADIR%% +@dirrmtry share/man/man6 +@dirrmtry share/man +%%PORTDOCS%%@dirrmtry %%DOCSDIR%% +@dirrmtry share/applications