From owner-svn-ports-all@FreeBSD.ORG Thu Dec 6 22:57:31 2012 Return-Path: Delivered-To: svn-ports-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 0A3D6F03; Thu, 6 Dec 2012 22:57:31 +0000 (UTC) (envelope-from nox@jelal.kn-bremen.de) Received: from smtp.kn-bremen.de (gelbbaer.kn-bremen.de [78.46.108.116]) by mx1.freebsd.org (Postfix) with ESMTP id A346E8FC14; Thu, 6 Dec 2012 22:57:30 +0000 (UTC) Received: by smtp.kn-bremen.de (Postfix, from userid 10) id B14781E00079; Thu, 6 Dec 2012 23:57:23 +0100 (CET) Received: from triton8.kn-bremen.de (noident@localhost [127.0.0.1]) by triton8.kn-bremen.de (8.14.4/8.14.4) with ESMTP id qB6MtHCw012675; Thu, 6 Dec 2012 23:55:17 +0100 (CET) (envelope-from nox@triton8.kn-bremen.de) Received: (from nox@localhost) by triton8.kn-bremen.de (8.14.4/8.14.3/Submit) id qB6MtHSB012674; Thu, 6 Dec 2012 23:55:17 +0100 (CET) (envelope-from nox) From: Juergen Lock Date: Thu, 6 Dec 2012 23:55:17 +0100 To: Boris Samorodov Subject: Re: svn commit: r308098 - head/audio/linux-f10-alsa-lib Message-ID: <20121206225517.GA12093@triton8.kn-bremen.de> References: <201212021128.qB2BSesC054251@svn.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201212021128.qB2BSesC054251@svn.freebsd.org> User-Agent: Mutt/1.5.21 (2010-09-15) Cc: svn-ports-head@FreeBSD.org, Juan =?iso-8859-1?Q?Ram=F3n?= Molina Menor , svn-ports-all@FreeBSD.org, Jan Beich , ports-committers@FreeBSD.org X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 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: Thu, 06 Dec 2012 22:57:31 -0000 On Sun, Dec 02, 2012 at 11:28:40AM +0000, Boris Samorodov wrote: > Author: bsam > Date: Sun Dec 2 11:28:40 2012 > New Revision: 308098 > URL: http://svnweb.freebsd.org/changeset/ports/308098 > > Log: > . create a link from native asound configuration file at LINUXBASE/etc; [1] > . bump PORTREVISION; > . trim headers to two line style; > . remove the article from COMMENT. > > PR: ports/169896 [1] > Submitted by: Jan Beich [1] > Feature safe: yes > > Modified: > head/audio/linux-f10-alsa-lib/Makefile > > Modified: head/audio/linux-f10-alsa-lib/Makefile > ============================================================================== > --- head/audio/linux-f10-alsa-lib/Makefile Sun Dec 2 10:58:49 2012 (r308097) > +++ head/audio/linux-f10-alsa-lib/Makefile Sun Dec 2 11:28:40 2012 (r308098) > @@ -1,20 +1,16 @@ > -# New ports collection makefile for: audio/linux-f10-alsa-lib > -# Date created: 2009-05-03 > -# Whom: bsam > -# > # $FreeBSD$ > -# > +# Created by: Boris Samorodov > > PORTNAME= alsa-lib > PORTVERSION= 1.0.21 > -PORTREVISION= 1 > +PORTREVISION= 2 > CATEGORIES= audio linux > MASTER_SITES= CRITICAL/rpm/${LINUX_RPM_ARCH}/fedora/${LINUX_DIST_VER} > PKGNAMEPREFIX= linux-f10- > DISTNAME= ${PORTNAME}-${PORTVERSION}-${RPMVERSION} > > MAINTAINER= emulation@FreeBSD.org > -COMMENT= The Advanced Linux Sound Architecture libraries (Linux Fedora 10) > +COMMENT= Advanced Linux Sound Architecture libraries (Linux Fedora 10) > > CONFLICTS= linux-alsa-lib-[0-9]* linux-f8-alsa-lib-[0-9]* > > @@ -25,4 +21,11 @@ RPMVERSION= 2.fc10 > BRANDELF_FILES= usr/bin/aserver > USE_LDCONFIG= yes > > +# We will use some other configuration file, so delete a linux one > +post-extract: > + @${RM} -r ${WRKSRC}/etc > + > +post-install: > + @${LN} -s ${LOCALBASE}/etc/asound.conf ${PREFIX}/etc/asound.conf > + > .include This breaks at least installation of audio/linux-f10-alsa-plugins-oss when audio/alsa-lib isn't installed (because the former tries to write into asound.conf that then fails with ENOENT), and I guess it will fail at runtime then too. The obvious idea for a fix is to add audio/alsa-lib as a dependency, but probably the resulting config file mess when linux-f10-alsa-plugins-oss is installed should be untangled too (and the fix tested with things like skype that often needs an extra oss device for the mic.) Juergen