From owner-svn-ports-head@FreeBSD.ORG Mon Jul 30 20:25:37 2012 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 6C068106566C; Mon, 30 Jul 2012 20:25:37 +0000 (UTC) (envelope-from lme@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 564AB8FC0A; Mon, 30 Jul 2012 20:25:37 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6UKPbNc039020; Mon, 30 Jul 2012 20:25:37 GMT (envelope-from lme@svn.freebsd.org) Received: (from lme@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6UKPbIx039017; Mon, 30 Jul 2012 20:25:37 GMT (envelope-from lme@svn.freebsd.org) Message-Id: <201207302025.q6UKPbIx039017@svn.freebsd.org> From: Lars Engels Date: Mon, 30 Jul 2012 20:25:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r301766 - head/games/scummvm X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.5 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, 30 Jul 2012 20:25:37 -0000 Author: lme Date: Mon Jul 30 20:25:36 2012 New Revision: 301766 URL: http://svn.freebsd.org/changeset/ports/301766 Log: - Update to 1.5.0 - Convert to new options framework - Remove ABI version numbers from LIB_DEPENDS PR: ports/170048 Submitted by: Alex Kozlov Approved by: maintainer (me) Modified: head/games/scummvm/Makefile (contents, props changed) head/games/scummvm/distinfo (contents, props changed) Modified: head/games/scummvm/Makefile ============================================================================== --- head/games/scummvm/Makefile Mon Jul 30 20:24:40 2012 (r301765) +++ head/games/scummvm/Makefile Mon Jul 30 20:25:36 2012 (r301766) @@ -6,8 +6,7 @@ # PORTNAME= scummvm -DISTVERSION= 1.4.1 -PORTREVISION= 3 +DISTVERSION= 1.5.0 CATEGORIES= games emulators MASTER_SITES= SF MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTNAME}/${DISTVERSION} @@ -31,11 +30,10 @@ CONFIGURE_ARGS= --prefix=${PREFIX} \ --disable-tremor LDFLAGS+= ${PTHREAD_LIBS} -OPTIONS= VORBIS "Enable Ogg Vorbis support" on \ - MP3 "Enable MP3 support" on \ - FLAC "Enable FLAC support" off \ - FLUIDSYNTH "Enable FluidSynth MIDI synthesizer" off \ - MT32EMU "Enable MT-32 emulator" on \ +OPTIONS_DEFINE= VORBIS MP3 FLAC FLUIDSYNTH MT32EMU +FLUIDSYNTH_DESC= FluidSynth MIDI synthesizer +MT32EMU_DESC= MT-32 emulator +OPTIONS_DEFAULT= VORBIS MP3 MT32EMU MAN6= scummvm.6 @@ -63,45 +61,45 @@ PLIST_FILES= bin/scummvm \ $(ENGINEDATA:S/^/%%DATADIR%%\/$$/) PLIST_DIRS= %%DATADIR%% -.include +.include -.if defined(WITH_VORBIS) +.if ${PORT_OPTIONS:MVORBIS} LIB_DEPENDS+= ogg:${PORTSDIR}/audio/libogg \ - vorbis.4:${PORTSDIR}/audio/libvorbis + vorbis:${PORTSDIR}/audio/libvorbis CONFIGURE_ARGS+=--with-ogg-prefix=${LOCALBASE} \ --with-vorbis-prefix=${LOCALBASE} .else CONFIGURE_ARGS+=--disable-vorbis .endif -.if defined(WITH_MP3) -LIB_DEPENDS+= mad.2:${PORTSDIR}/audio/libmad +.if ${PORT_OPTIONS:MMP3} +LIB_DEPENDS+= mad:${PORTSDIR}/audio/libmad CONFIGURE_ARGS+=--with-mad-prefix=${LOCALBASE} .else CONFIGURE_ARGS+=--disable-mad .endif -.if defined(WITH_FLAC) -LIB_DEPENDS+= FLAC.10:${PORTSDIR}/audio/flac +.if ${PORT_OPTIONS:MFLAC} +LIB_DEPENDS+= FLAC:${PORTSDIR}/audio/flac CONFIGURE_ARGS+=--with-flac-prefix=${LOCALBASE} .else CONFIGURE_ARGS+=--disable-flac .endif -.if defined(WITH_FLUIDSYNTH) -LIB_DEPENDS+= fluidsynth.1:${PORTSDIR}/audio/fluidsynth +.if ${PORT_OPTIONS:MFLUIDSYNTH} +LIB_DEPENDS+= fluidsynth:${PORTSDIR}/audio/fluidsynth CONFIGURE_ARGS+=--with-fluidsynth-prefix=${LOCALBASE} .else CONFIGURE_ARGS+=--disable-fluidsynth .endif -.if defined(WITHOUT_MT32EMU) +.if empty(PORT_OPTIONS:MMT32EMU) CONFIGURE_ARGS+=--disable-mt32emu .endif do-install: @${INSTALL_PROGRAM} ${WRKSRC}/scummvm ${PREFIX}/bin - @${INSTALL_MAN} ${WRKSRC}/dists/scummvm.6 ${PREFIX}/man/man6 + @${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} @@ -109,11 +107,11 @@ do-install: .for i in ${ENGINEDATA} @${INSTALL_DATA} ${WRKSRC}/dists/engine-data/${i} ${DATADIR} .endfor -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} .for i in ${PORTDOCS} @${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR} .endfor .endif -.include +.include Modified: head/games/scummvm/distinfo ============================================================================== --- head/games/scummvm/distinfo Mon Jul 30 20:24:40 2012 (r301765) +++ head/games/scummvm/distinfo Mon Jul 30 20:25:36 2012 (r301766) @@ -1,2 +1,2 @@ -SHA256 (scummvm-1.4.1.tar.bz2) = fa0a7f0d59524611be0c5b9be9ac7f8e7a72bab1826732e056f88332aa3139da -SIZE (scummvm-1.4.1.tar.bz2) = 15703475 +SHA256 (scummvm-1.5.0.tar.bz2) = 81831cd878a8daad2976f65c92139a2102233082c7d2770579d7e425b19cea2e +SIZE (scummvm-1.5.0.tar.bz2) = 17455085