From owner-svn-ports-head@FreeBSD.ORG Fri Sep 13 00:32:18 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 7678637B; Fri, 13 Sep 2013 00:32:18 +0000 (UTC) (envelope-from mandree@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 4B4B52974; Fri, 13 Sep 2013 00:32:18 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8D0WIno038272; Fri, 13 Sep 2013 00:32:18 GMT (envelope-from mandree@svn.freebsd.org) Received: (from mandree@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8D0WIbx038271; Fri, 13 Sep 2013 00:32:18 GMT (envelope-from mandree@svn.freebsd.org) Message-Id: <201309130032.r8D0WIbx038271@svn.freebsd.org> From: Matthias Andree Date: Fri, 13 Sep 2013 00:32:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r327119 - head/audio/squash 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, 13 Sep 2013 00:32:18 -0000 Author: mandree Date: Fri Sep 13 00:32:17 2013 New Revision: 327119 URL: http://svnweb.freebsd.org/changeset/ports/327119 Log: Add CC=${CC} through MAKE_ARGS, to override hard-coded gcc by actual compiler. To fix FreeBSD 10-CURRENT fallout (untested on 10 because flac is broken due to libstdc++ removal; flac needs to be told to use libc++, 9.X Tinderbox has no complaints though). Drop library versions from LIB_DEPENDS. NOPORTDOCS -> PORT_OPTIONS. ${MKDIR} ${RUBY_SITELIBDIR} in installation to support "port test". Modified: head/audio/squash/Makefile Modified: head/audio/squash/Makefile ============================================================================== --- head/audio/squash/Makefile Thu Sep 12 23:46:20 2013 (r327118) +++ head/audio/squash/Makefile Fri Sep 13 00:32:17 2013 (r327119) @@ -12,17 +12,21 @@ MAINTAINER= mandree@FreeBSD.org COMMENT= Learning console-based MP3/OGG player LIB_DEPENDS+= FLAC:${PORTSDIR}/audio/flac \ - fftw.2:${PORTSDIR}/math/fftw \ - id3-3.8.3:${PORTSDIR}/audio/id3lib \ - mad.2:${PORTSDIR}/audio/mad \ - vorbis.4:${PORTSDIR}/audio/libvorbis \ - ao.4:${PORTSDIR}/audio/libao + fftw:${PORTSDIR}/math/fftw \ + id3:${PORTSDIR}/audio/id3lib \ + mad:${PORTSDIR}/audio/mad \ + vorbis:${PORTSDIR}/audio/libvorbis \ + ao:${PORTSDIR}/audio/libao RUN_DEPENDS= id3v2:${PORTSDIR}/audio/id3v2 USE_BZIP2= yes USES= gmake USE_RUBY= yes -.if !defined(NOPORTDOCS) +MAKE_ARGS= CC=${CC} + +.include + +.if ${PORT_OPTIONS:MDOCS} PORTDOCS= * .endif @@ -41,9 +45,10 @@ do-install: .for FILE in collect_info edit_tag export_music import_music joystick uncollect_info ${INSTALL_SCRIPT} ${WRKSRC}/extra/${FILE}.rb ${PREFIX}/bin .endfor + ${MKDIR} ${RUBY_SITELIBDIR} ${INSTALL_DATA} ${WRKSRC}/extra/musicdb_lib.rb ${RUBY_SITELIBDIR} ${INSTALL_DATA} ${WRKSRC}/extra/squash.conf ${PREFIX}/etc/squash.conf.dist -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} .for i in README doc/FEATURES doc/LOCKS doc/INSTALL doc/USERS_GUIDE ${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}