From 18ee25cc2dc0e40bfdc9bb575d7748f20b7304b2 Mon Sep 17 00:00:00 2001 From: Ganael LAPLANCHE Date: Tue, 5 Nov 2013 08:16:11 +0000 Subject: [PATCH] - Fix build when audio/portaudio is installed along with audio/portaudio2 - Enable staging - Use new LIB_DEPENDS format - Update USES --- audio/gnaural/Makefile | 12 ++++-------- audio/gnaural/files/patch-configure | 11 +++++++++++ audio/gnaural/pkg-plist | 2 -- 3 files changed, 15 insertions(+), 10 deletions(-) create mode 100644 audio/gnaural/files/patch-configure diff --git a/audio/gnaural/Makefile b/audio/gnaural/Makefile index ce1e839eb6c5..6cefe45ed2bf 100644 --- a/audio/gnaural/Makefile +++ b/audio/gnaural/Makefile @@ -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 diff --git a/audio/gnaural/files/patch-configure b/audio/gnaural/files/patch-configure new file mode 100644 index 000000000000..34ae4d62f1b1 --- /dev/null +++ b/audio/gnaural/files/patch-configure @@ -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" + + + diff --git a/audio/gnaural/pkg-plist b/audio/gnaural/pkg-plist index de3e5143aa93..cc5e8755d6cc 100644 --- a/audio/gnaural/pkg-plist +++ b/audio/gnaural/pkg-plist @@ -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