From owner-svn-ports-all@FreeBSD.ORG Sun Oct 7 13:07:29 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id BD3371065670; Sun, 7 Oct 2012 13:07:29 +0000 (UTC) (envelope-from mva@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 9CB148FC12; Sun, 7 Oct 2012 13:07:29 +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 q97D7TXM003630; Sun, 7 Oct 2012 13:07:29 GMT (envelope-from mva@svn.freebsd.org) Received: (from mva@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q97D7TdO003625; Sun, 7 Oct 2012 13:07:29 GMT (envelope-from mva@svn.freebsd.org) Message-Id: <201210071307.q97D7TdO003625@svn.freebsd.org> From: Marcus von Appen Date: Sun, 7 Oct 2012 13:07:29 +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: r305470 - head/audio/sdl_sound X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.5 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: Sun, 07 Oct 2012 13:07:29 -0000 Author: mva Date: Sun Oct 7 13:07:29 2012 New Revision: 305470 URL: http://svn.freebsd.org/changeset/ports/305470 Log: - Convert to OptionsNG Submitted by: A.J. Kehoe IV (Nanoman) (via mail) Modified: head/audio/sdl_sound/Makefile (contents, props changed) Modified: head/audio/sdl_sound/Makefile ============================================================================== --- head/audio/sdl_sound/Makefile Sun Oct 7 12:56:59 2012 (r305469) +++ head/audio/sdl_sound/Makefile Sun Oct 7 13:07:29 2012 (r305470) @@ -22,69 +22,67 @@ USE_SDL= sdl CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -OPTIONS= FLAC "Enable FLAC decoding support" on \ - MIKMOD "Enable MOD decoding support using mikmod" on \ - MIDI "Enable software MIDI music" on \ - MODPLUG "Enable MOD decoding support using modplug" on \ - PHYSFS "Enable PhysicsFS support" on \ - SMPEG "Enable MP3 decoding support" on \ - SPEEX "Enable SPX decoding support" on \ - VORBIS "Enable Ogg Vorbis decoding support" on +OPTIONS_DEFINE= FLAC MIKMOD MIDI MODPLUG PHYSFS SMPEG SPEEX VORBIS +OPTIONS_DEFAULT= FLAC MIKMOD MIDI MODPLUG PHYSFS SMPEG SPEEX VORBIS + +MIDI_DESC= Software MIDI music +PHYSFS_DESC= PhysicsFS support +SMPEG_DESC= MP3 audio format .include -.if !defined(WITHOUT_FLAC) -LIB_DEPENDS+= FLAC.10:${PORTSDIR}/audio/flac +.if ${PORT_OPTIONS:MFLAC} +LIB_DEPENDS+= FLAC:${PORTSDIR}/audio/flac .else CONFIGURE_ARGS+=--disable-flac .endif -.if !defined(WITHOUT_MIKMOD) -LIB_DEPENDS+= mikmod.2:${PORTSDIR}/audio/libmikmod +.if ${PORT_OPTIONS:MMIKMOD} +LIB_DEPENDS+= mikmod:${PORTSDIR}/audio/libmikmod .else CONFIGURE_ARGS+=--disable-mikmod .endif -.if !defined(WITHOUT_MODPLUG) -LIB_DEPENDS+= modplug.1:${PORTSDIR}/audio/libmodplug +.if ${PORT_OPTIONS:MMODPLUG} +LIB_DEPENDS+= modplug:${PORTSDIR}/audio/libmodplug .else CONFIGURE_ARGS+=--disable-modplug .endif -.if !defined(WITHOUT_PHYSFS) -LIB_DEPENDS+= physfs.1:${PORTSDIR}/devel/physfs +.if ${PORT_OPTIONS:MPHYSFS} +LIB_DEPENDS+= physfs:${PORTSDIR}/devel/physfs .else CONFIGURE_ARGS+=--disable-physfs .endif -.if !defined(WITHOUT_SMPEG) -LIB_DEPENDS+= smpeg.1:${PORTSDIR}/multimedia/smpeg +.if ${PORT_OPTIONS:MSMPEG} +LIB_DEPENDS+= smpeg:${PORTSDIR}/multimedia/smpeg CONFIGURE_ARGS+=--disable-mpglib .else CONFIGURE_ARGS+=--disable-smpeg .endif -.if !defined(WITHOUT_SPEEX) -LIB_DEPENDS+= speex.1:${PORTSDIR}/audio/speex +.if ${PORT_OPTIONS:MSPEEX} +LIB_DEPENDS+= speex:${PORTSDIR}/audio/speex .else CONFIGURE_ARGS+=--disable-speex .endif -.if !defined(WITHOUT_MIDI) +.if ${PORT_OPTIONS:MMIDI} RUN_DEPENDS+= ${LOCALBASE}/lib/timidity/goemon.cfg:${PORTSDIR}/audio/timidity BUILD_DEPENDS+= ${LOCALBASE}/lib/timidity/goemon.cfg:${PORTSDIR}/audio/timidity .else CONFIGURE_ARGS+=--disable-midi .endif -.if !defined(WITHOUT_VORBIS) -LIB_DEPENDS+= vorbis.4:${PORTSDIR}/audio/libvorbis +.if ${PORT_OPTIONS:MVORBIS} +LIB_DEPENDS+= vorbis:${PORTSDIR}/audio/libvorbis .else CONFIGURE_ARGS+=--disable-ogg .endif -.if defined(WITHOUT_SMPEG) pre-everything:: +.if !${PORT_OPTIONS:MSMPEG} @${ECHO_CMD} @${ECHO_CMD} "WARNING: the built-in MP3 support is currently broken, consider enabling the SMPEG option to use that library instead." | ${FMT} @${ECHO_CMD}