From owner-svn-ports-head@FreeBSD.ORG Tue Feb 26 10:43:38 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]) by hub.freebsd.org (Postfix) with ESMTP id 21E2551E; Tue, 26 Feb 2013 10:43:38 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 142D2AE9; Tue, 26 Feb 2013 10:43:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1QAhb0L072946; Tue, 26 Feb 2013 10:43:37 GMT (envelope-from danfe@svn.freebsd.org) Received: (from danfe@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1QAhbBH072944; Tue, 26 Feb 2013 10:43:37 GMT (envelope-from danfe@svn.freebsd.org) Message-Id: <201302261043.r1QAhbBH072944@svn.freebsd.org> From: Alexey Dokuchaev Date: Tue, 26 Feb 2013 10:43:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r312970 - head/audio/mixxx 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: Tue, 26 Feb 2013 10:43:38 -0000 Author: danfe Date: Tue Feb 26 10:43:36 2013 New Revision: 312970 URL: http://svnweb.freebsd.org/changeset/ports/312970 Log: - Remove shlib ABI versions from LIB_DEPENDS - Do not re-describe standard option knobs - Drop leading indefinite article from COMMENT - Cleanup Makefile and port description Modified: head/audio/mixxx/Makefile head/audio/mixxx/pkg-descr Modified: head/audio/mixxx/Makefile ============================================================================== --- head/audio/mixxx/Makefile Tue Feb 26 10:27:17 2013 (r312969) +++ head/audio/mixxx/Makefile Tue Feb 26 10:43:36 2013 (r312970) @@ -9,7 +9,7 @@ MASTER_SITES= http://moo.glines.org/mixx MASTER_SITE_SUBDIR= ${PORTNAME}-${PORTVERSION} MAINTAINER= ports@FreeBSD.org -COMMENT= A DJ mixing application +COMMENT= DJ mixing application LICENSE= GPLv2 # (or later) @@ -23,8 +23,6 @@ LIB_DEPENDS= FLAC:${PORTSDIR}/audio/flac RUN_DEPENDS= portaudio>=19:${PORTSDIR}/audio/portaudio2 OPTIONS_DEFINE= LAME SHOUTCAST FAAD WAVPACK DOCS -SHOUTCAST_DESC= Shoutcast Broadcasting -WAVPACK_DESC= WavPack audio support plugin WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} @@ -44,15 +42,15 @@ RUN_DEPENDS+= lame:${PORTSDIR}/audio/lam .endif .if ${PORT_OPTIONS:MSHOUTCAST} -LIB_DEPENDS+= shout.5:${PORTSDIR}/audio/libshout2 +LIB_DEPENDS+= shout:${PORTSDIR}/audio/libshout2 SCONS_ARGS+= shoutcast=1 .else SCONS_ARGS+= shoutcast=0 .endif .if ${PORT_OPTIONS:MFAAD} -LIB_DEPENDS+= faad.2:${PORTSDIR}/audio/faad \ - mp4v2.10:${PORTSDIR}/multimedia/mp4v2 +LIB_DEPENDS+= faad:${PORTSDIR}/audio/faad \ + mp4v2:${PORTSDIR}/multimedia/mp4v2 SCONS_ARGS+= faad=1 PLIST_SUB+= FAAD="" .else @@ -61,7 +59,7 @@ PLIST_SUB+= FAAD="@comment " .endif .if ${PORT_OPTIONS:MWAVPACK} -LIB_DEPENDS+= wavpack.2:${PORTSDIR}/audio/wavpack +LIB_DEPENDS+= wavpack:${PORTSDIR}/audio/wavpack SCONS_ARGS+= wv=1 PLIST_SUB+= WAVPACK="" .else @@ -70,23 +68,21 @@ PLIST_SUB+= WAVPACK="@comment " .endif post-patch: -.for FILE in build/depends.py src/soundsourceproxy.cpp src/recording/encodermp3.cpp - @${REINPLACE_CMD} -e \ - "s|%%LOCALBASE%%|${LOCALBASE}|g ; \ - s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/${FILE} +.for f in build/depends.py src/soundsourceproxy.cpp src/recording/encodermp3.cpp + @${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|g ; \ + s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/${f} .endfor - @${REINPLACE_CMD} -e \ - "/_get_bzr_/s|^|#| ; \ - /('install', docs)/d" ${WRKSRC}/src/SConscript - @${REINPLACE_CMD} -e \ - "s|^Exec=.*|Exec=mixxx|" ${WRKSRC}/src/mixxx.desktop + @${REINPLACE_CMD} -e "/_get_bzr_/s|^|#| ; /('install', docs)/d" \ + ${WRKSRC}/src/SConscript + @${REINPLACE_CMD} -e "s|^Exec=.*|Exec=mixxx|" \ + ${WRKSRC}/src/mixxx.desktop post-install: @${STRIP_CMD} ${PREFIX}/bin/mixxx .if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} -.for FILE in Mixxx-Manual.pdf README - ${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR} +.for f in Mixxx-Manual.pdf README + ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR} .endfor .endif Modified: head/audio/mixxx/pkg-descr ============================================================================== --- head/audio/mixxx/pkg-descr Tue Feb 26 10:27:17 2013 (r312969) +++ head/audio/mixxx/pkg-descr Tue Feb 26 10:43:36 2013 (r312970) @@ -1,6 +1,5 @@ -Mixxx is software for DJ'ing. You can use wave based audio files, Ogg -Vorbis and MP3 files as audio input. Mixxx can be controlled through -the GUI and with external controllers including MIDI devices, -joysticks and more. +Mixxx is software for DJ'ing. You can use wave based audio files, Ogg Vorbis +and MP3 files as audio input. Mixxx can be controlled through the GUI and +with external controllers including MIDI devices, joysticks, and more. WWW: http://www.mixxx.org/