From owner-svn-ports-head@FreeBSD.ORG Fri Aug 8 14:39:25 2014 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 ESMTPS id 537D8B50 for ; Fri, 8 Aug 2014 14:39:25 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 285CB2A76 for ; Fri, 8 Aug 2014 14:39:25 +0000 (UTC) Received: from adamw (uid 959) (envelope-from adamw@FreeBSD.org) id 2c64 by svn.freebsd.org (DragonFly Mail Agent v0.9+); Fri, 08 Aug 2014 14:39:24 +0000 From: Adam Weinberger Date: Fri, 8 Aug 2014 14:39:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r364364 - head/audio/muse X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <53e4e11c.2c64.617ee8af@svn.freebsd.org> X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18 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, 08 Aug 2014 14:39:25 -0000 Author: adamw Date: Fri Aug 8 14:39:24 2014 New Revision: 364364 URL: http://svnweb.freebsd.org/changeset/ports/364364 QAT: https://qat.redports.org/buildarchive/r364364/ Log: Fix MASTER_SITE and use OPTIONS helpers. Modified: head/audio/muse/Makefile Modified: head/audio/muse/Makefile ============================================================================== --- head/audio/muse/Makefile Fri Aug 8 14:09:13 2014 (r364363) +++ head/audio/muse/Makefile Fri Aug 8 14:39:24 2014 (r364364) @@ -5,7 +5,7 @@ PORTNAME= MuSE PORTVERSION= 0.9.2 PORTREVISION= 14 CATEGORIES= audio -MASTER_SITES= http://files.dyne.org/muse/releases/ +MASTER_SITES= http://files.dyne.org/.xsend.php?file=muse/releases/ MAINTAINER= ports@FreeBSD.org COMMENT= Multiple Streaming Engine @@ -31,23 +31,15 @@ PLIST_FILES= bin/muse man/man1/muse.1.gz PLIST_FILES+= share/locale/${lang}/LC_MESSAGES/muse.mo .endfor -.include +X11_USE= GNOME=gtk20 +X11_CONFIGURE_OFF= --without-x --with-rubik -.if ${PORT_OPTIONS:MX11} -USE_GNOME+= gtk20 -.else -CONFIGURE_ARGS+=--without-x --with-rubik -.endif +LAME_LIB_DEPENDS= libmp3lame.so:${PORTSDIR}/audio/lame +LAME_CONFIGURE_ENV= ac_cv_header_lame_lame_h=no -.if ${PORT_OPTIONS:MLAME} -LIB_DEPENDS+= libmp3lame.so:${PORTSDIR}/audio/lame -.else -CONFIGURE_ENV+= ac_cv_header_lame_lame_h=no -.endif +SNDFILE_LIB_DEPENDS= libsndfile.so:${PORTSDIR}/audio/libsndfile -.if ${PORT_OPTIONS:MSNDFILE} -LIB_DEPENDS+= libsndfile.so:${PORTSDIR}/audio/libsndfile -.endif +.include post-patch: @${REINPLACE_CMD} -e 's|machine/soundcard.h|sys/soundcard.h|' \ @@ -58,9 +50,7 @@ post-patch: .endif post-install: -.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} -.endif .include