From owner-svn-ports-head@FreeBSD.ORG Sat Dec 29 22:19:02 2012 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 27E246F8; Sat, 29 Dec 2012 22:19:02 +0000 (UTC) (envelope-from bapt@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 C0CAC8FC08; Sat, 29 Dec 2012 22:19:01 +0000 (UTC) Received: from svn.freebsd.org (svn.FreeBSD.org [8.8.178.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBTMJ19V060892; Sat, 29 Dec 2012 22:19:01 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBTMJ1M8060891; Sat, 29 Dec 2012 22:19:01 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201212292219.qBTMJ1M8060891@svn.freebsd.org> From: Baptiste Daroussin Date: Sat, 29 Dec 2012 22:19:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r309634 - head/audio/hydrogen 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: Sat, 29 Dec 2012 22:19:02 -0000 Author: bapt Date: Sat Dec 29 22:19:01 2012 New Revision: 309634 URL: http://svnweb.freebsd.org/changeset/ports/309634 Log: - Convert to new options framework - remove shlib numbers - trim headers PR: ports/173795 Submitted by: Chris Petrik Approved by: maintainer timeout (1 month) Modified: head/audio/hydrogen/Makefile Modified: head/audio/hydrogen/Makefile ============================================================================== --- head/audio/hydrogen/Makefile Sat Dec 29 22:06:04 2012 (r309633) +++ head/audio/hydrogen/Makefile Sat Dec 29 22:19:01 2012 (r309634) @@ -1,9 +1,5 @@ -# New ports collection makefile for: Hydrogen -# Date created: 23 Jun 2004 -# Whom: Jean-Yves Lefort -# +# Created by: Jean-Yves Lefort # $FreeBSD$ -# PORTNAME= hydrogen PORTVERSION= 0.9.5 @@ -13,24 +9,23 @@ MASTER_SITES= SF/${PORTNAME}/Hydrogen/${ MAINTAINER= devel@stasyan.com COMMENT= An advanced drum machine -LIB_DEPENDS+= sndfile:${PORTSDIR}/audio/libsndfile \ - tar.0:${PORTSDIR}/devel/libtar \ - lrdf.2:${PORTSDIR}/textproc/liblrdf - LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING +LIB_DEPENDS+= sndfile:${PORTSDIR}/audio/libsndfile \ + tar:${PORTSDIR}/devel/libtar \ + lrdf:${PORTSDIR}/textproc/liblrdf + BROKEN= does not install MAJORVERSION= 0.9.5 USE_QT4= corelib gui linguist_build moc_build network qt3support rcc_build sql uic_build xml USE_SCONS= yes -OPTIONS= JACK "JACK support" on \ - ALSA "ALSA support" off \ - PORTAUDIO "PortAudio support" off \ - LIBARCHIVE "LibArchive support" off \ - LASH "Lash support" off +OPTIONS_DEFINE= JACK ALSA PORTAUDIO LIBARCHIVE LASH +OPTIONS_DEFAULT= JACK + +LIBARCHIVE_DESC= LibArchive support post-patch: ${REINPLACE_CMD} -e "s|includes = \[\]|includes = \['-I${QT_INCDIR}/QtCore', '-I${QT_INCDIR}/QtXml', '-I${QT_INCDIR}/QtGui', '-I${QT_INCDIR}', '-I${QT_INCDIR}/Qt', '-I${LOCALBASE}/include'\]|g; s|ldflags = \[\]|ldflags = \['-L${QT_LIBDIR}','-L${LOCALBASE}/lib'\,'-lQtCore', '-lQtGui', '-lQtXml', '-lQtNetwork', '${PTHREAD_LIBS}']|g" ${WRKSRC}/Sconstruct @@ -38,7 +33,8 @@ post-patch: .include SCONS_ENV+= oss=1 -.if defined(WITH_JACK) + +.if ${PORT_OPTIONS:MJACK} LIB_DEPENDS+= jack:${PORTSDIR}/audio/jack CPPFLAGS+= ${PTHREAD_CFLAGS} LDFLAGS+= ${PTHREAD_LIBS} @@ -47,30 +43,30 @@ SCONS_ENV+= jack=1 SCONS_ENV+= jack=0 .endif -.if defined(WITH_PORTAUDIO) -LIB_DEPENDS+= portaudio.0:${PORTSDIR}/audio/portaudio +.if ${PORT_OPTIONS:MPORTAUDIO} +LIB_DEPENDS+= portaudio:${PORTSDIR}/audio/portaudio SCONS_ENV+= portaudio=1 .else SCONS_ENV+= portaudio=0 .endif -.if defined(WITH_LIBARCHIVE) +.if ${PORT_OPTIONS:MLIBARCHIVE} LIB_DEPENDS+= archive:${PORTSDIR}/archivers/libarchive SCONS_ENV+= libarchive=1 .else SCONS_ENV+= libarchive=0 .endif -.if defined(WITH_ALSA) -LIB_DEPENDS+= asound.2:${PORTSDIR}/audio/alsa-lib +.if ${PORT_OPTIONS:MALSA} +LIB_DEPENDS+= asound:${PORTSDIR}/audio/alsa-lib RUN_DEPENDS+= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:${PORTSDIR}/audio/alsa-plugins SCONS_ENV+= alsa=1 .else SCONS_ENV+= alsa=0 .endif -.if defined(WITH_LASH) -LIB_DEPENDS+= lash.2:${PORTSDIR}/audio/lash +.if ${PORT_OPTIONS:MLASH} +LIB_DEPENDS+= lash:${PORTSDIR}/audio/lash SCONS_ENV+= lash=1 .else SCONS_ENV+= lash=0