From owner-svn-ports-all@FreeBSD.ORG Tue Nov 5 08:16:12 2013 Return-Path: Delivered-To: svn-ports-all@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 952C4A06; Tue, 5 Nov 2013 08:16:12 +0000 (UTC) (envelope-from martymac@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 68A4E2489; Tue, 5 Nov 2013 08:16:12 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA58GCdF073690; Tue, 5 Nov 2013 08:16:12 GMT (envelope-from martymac@svn.freebsd.org) Received: (from martymac@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA58GBdq073684; Tue, 5 Nov 2013 08:16:11 GMT (envelope-from martymac@svn.freebsd.org) Message-Id: <201311050816.rA58GBdq073684@svn.freebsd.org> From: Ganael LAPLANCHE Date: Tue, 5 Nov 2013 08:16:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r332821 - in head/audio/gnaural: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: Tue, 05 Nov 2013 08:16:12 -0000 Author: martymac Date: Tue Nov 5 08:16:11 2013 New Revision: 332821 URL: http://svnweb.freebsd.org/changeset/ports/332821 Log: - Fix build when audio/portaudio is installed along with audio/portaudio2 - Enable staging - Use new LIB_DEPENDS format - Update USES Added: head/audio/gnaural/files/patch-configure (contents, props changed) Modified: head/audio/gnaural/Makefile head/audio/gnaural/pkg-plist (contents, props changed) Modified: head/audio/gnaural/Makefile ============================================================================== --- head/audio/gnaural/Makefile Tue Nov 5 08:13:58 2013 (r332820) +++ head/audio/gnaural/Makefile Tue Nov 5 08:16:11 2013 (r332821) @@ -13,16 +13,12 @@ COMMENT= Binaural beat generator LICENSE= GPLv2 LGPL21 LICENSE_COMB= multi -LIB_DEPENDS= portaudio.2:${PORTSDIR}/audio/portaudio2 \ - sndfile:${PORTSDIR}/audio/libsndfile +LIB_DEPENDS= libportaudio.so.2:${PORTSDIR}/audio/portaudio2 \ + libsndfile.so:${PORTSDIR}/audio/libsndfile GNU_CONFIGURE= yes -USES= pkgconfig -NO_STAGE= yes +USES= pkgconfig desktop-file-utils USE_CSTD= gnu89 -USE_GNOME= libglade2 desktopfileutils - -post-install: - -@update-desktop-database +USE_GNOME= libglade2 .include Added: head/audio/gnaural/files/patch-configure ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/gnaural/files/patch-configure Tue Nov 5 08:16:11 2013 (r332821) @@ -0,0 +1,11 @@ +--- configure.orig 2011-05-26 00:38:21.000000000 +0200 ++++ configure 2013-10-31 06:32:24.000000000 +0100 +@@ -7642,7 +7642,7 @@ + esac + + #do pkgconfig stuff: +-pkg_modules="gtk+-2.0 >= 2.0.0 gthread-2.0 sndfile >= 1.0.2 portaudio-2.0 >= 19" ++pkg_modules="portaudio-2.0 >= 19 gtk+-2.0 >= 2.0.0 gthread-2.0 sndfile >= 1.0.2" + + + Modified: head/audio/gnaural/pkg-plist ============================================================================== --- head/audio/gnaural/pkg-plist Tue Nov 5 08:13:58 2013 (r332820) +++ head/audio/gnaural/pkg-plist Tue Nov 5 08:16:11 2013 (r332821) @@ -4,5 +4,3 @@ share/applications/gnaural.desktop share/pixmaps/gnaural-icon.xpm share/pixmaps/gnaural-icon.png @dirrm %%DATADIR%% -@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true -@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true