From owner-svn-ports-all@FreeBSD.ORG Mon Dec 29 01:15:53 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2E6BBE8D; Mon, 29 Dec 2014 01:15:53 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 011A1198B; Mon, 29 Dec 2014 01:15:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBT1FqDf095903; Mon, 29 Dec 2014 01:15:52 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBT1Fq82095902; Mon, 29 Dec 2014 01:15:52 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201412290115.sBT1Fq82095902@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Mon, 29 Dec 2014 01:15:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r375764 - head/games/eduke32 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 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, 29 Dec 2014 01:15:53 -0000 Author: amdmi3 Date: Mon Dec 29 01:15:51 2014 New Revision: 375764 URL: https://svnweb.freebsd.org/changeset/ports/375764 QAT: https://qat.redports.org/buildarchive/r375764/ Log: - Simplify plist handling - Use new options features and improve options grouping logic Deleted: head/games/eduke32/pkg-plist Modified: head/games/eduke32/Makefile Modified: head/games/eduke32/Makefile ============================================================================== --- head/games/eduke32/Makefile Mon Dec 29 01:15:34 2014 (r375763) +++ head/games/eduke32/Makefile Mon Dec 29 01:15:51 2014 (r375764) @@ -26,37 +26,32 @@ USE_SDL= mixer sdl WRKSRC= ${WRKDIR}/${PORTNAME}_${PORTVERSION}-${SVNREVISION} SVNREVISION= 1923 -OPTIONS_DEFINE= MIDI TIMIDITYPLUS VORBIS -MIDI_DESC= Original MIDI music support -TIMIDITYPLUS_DESC= Use Timidity++ instead of Timidity - -OPTIONS_DEFAULT= MIDI VORBIS +PLIST_FILES= bin/eduke32 bin/mapster32 +PORTDOCS= * +PORTEXAMPLES= * + +BROKEN_sparc64= Does not compile on sparc64 + +OPTIONS_DEFINE= VORBIS +OPTIONS_RADIO= MIDI +OPTIONS_RADIO_MIDI= TIMIDITY TIMIDITYPLUS +OPTIONS_DEFAULT=TIMIDITY VORBIS + +MIDI_DESC= MIDI music support +TIMIDITY_DESC= Use Timidity for music support +TIMIDITY_RUN_DEPENDS= timidity:${PORTSDIR}/audio/timidity +TIMIDITYPLUS_DESC= Use Timidity++ for music support +TIMIDITYPLUS_RUN_DEPENDS= timidity:${PORTSDIR}/audio/timidity++ +VORBIS_LIB_DEPENDS= libvorbis.so:${PORTSDIR}/audio/libvorbis .include "${.CURDIR}/../duke3d-data/Makefile.include" -.include .include .if ${ARCH} == "i386" BUILD_DEPENDS+= nasm:${PORTSDIR}/devel/nasm .endif -.if ${ARCH} == "sparc64" -BROKEN= Does not compile on sparc64 -.endif - -.if ${PORT_OPTIONS:MMIDI} -.if ${PORT_OPTIONS:MTIMIDITYPLUS} -RUN_DEPENDS+= timidity:${PORTSDIR}/audio/timidity++ -.else -RUN_DEPENDS+= timidity:${PORTSDIR}/audio/timidity -.endif -.endif - -.if ${PORT_OPTIONS:MVORBIS} -LIB_DEPENDS+= libvorbis.so:${PORTSDIR}/audio/libvorbis -.endif - post-patch: .if ! ${PORT_OPTIONS:MVORBIS} @${REINPLACE_CMD} '/+= -lvorbis/d' ${WRKSRC}/Makefile