From 0f7d483f48e3b1f5477f50c4915c5f7e7ecca85b Mon Sep 17 00:00:00 2001 From: Dmitry Marakasov Date: Mon, 4 Aug 2014 15:46:12 +0000 Subject: [PATCH] - Switch audio/musepack to USES=libtool, drop .la files - Bump dependent ports as .so version has changed - Fix audio/abcde by requiring python - Fix audio/moc plist with MUSEPACK enabled Approved by: portmgr blanket --- audio/abcde/Makefile | 4 +++- audio/aqualung/Makefile | 2 +- audio/cmus/Makefile | 1 + audio/moc/Makefile | 4 ++-- audio/musepack/Makefile | 6 ++++-- audio/musepack/pkg-plist | 4 ++-- audio/musicpd/Makefile | 2 +- audio/pacpl/Makefile | 2 +- audio/soundkonverter/Makefile | 2 +- audio/xmms2/Makefile | 2 +- multimedia/gmerlin-avdecoder/Makefile | 2 +- multimedia/qmmp/Makefile | 1 + multimedia/quodlibet/Makefile | 2 +- multimedia/vlc/Makefile | 2 +- sysutils/k3b-kde4/Makefile | 2 +- 15 files changed, 22 insertions(+), 16 deletions(-) diff --git a/audio/abcde/Makefile b/audio/abcde/Makefile index a9bcafafd571..e9a608ca9495 100644 --- a/audio/abcde/Makefile +++ b/audio/abcde/Makefile @@ -3,7 +3,7 @@ PORTNAME= abcde PORTVERSION= 2.5.4 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= audio MASTER_SITES= GOOGLE_CODE @@ -21,6 +21,8 @@ RUN_DEPENDS= cd-discid:${PORTSDIR}/audio/cd-discid \ NO_BUILD= yes +USE_PYTHON_RUN= yes + OPTIONS_DEFINE= CDDA2WAV DAGRAB EJECT FLAC MPP NORMALIZE REPLAYGAIN SPEEX EJECT_DESC?= Enable auto-eject support diff --git a/audio/aqualung/Makefile b/audio/aqualung/Makefile index 0f4bca7b81c9..c332b10b23f9 100644 --- a/audio/aqualung/Makefile +++ b/audio/aqualung/Makefile @@ -3,7 +3,7 @@ PORTNAME= aqualung DISTVERSION= 0.9beta11 -PORTREVISION= 19 +PORTREVISION= 20 CATEGORIES= audio MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${DISTVERSION} \ http://wickedmachine.net/mirror/ diff --git a/audio/cmus/Makefile b/audio/cmus/Makefile index 50325af75fce..24c4a821efb6 100644 --- a/audio/cmus/Makefile +++ b/audio/cmus/Makefile @@ -3,6 +3,7 @@ PORTNAME= cmus PORTVERSION= 2.5.1 +PORTREVISION= 1 CATEGORIES= audio MAINTAINER= h.skuhra@gmail.com diff --git a/audio/moc/Makefile b/audio/moc/Makefile index 613afc2965b1..b2a25f309a8b 100644 --- a/audio/moc/Makefile +++ b/audio/moc/Makefile @@ -3,7 +3,7 @@ PORTNAME= moc PORTVERSION= 2.4.4 -PORTREVISION= 14 +PORTREVISION= 15 CATEGORIES= audio MASTER_SITES= ftp://ftp.daper.net/pub/soft/moc/stable/ @@ -33,7 +33,7 @@ MP3_CONFIGURE_OFF= --without-mp3 MUSEPACK_LIB_DEPENDS= libmpcdec.so:${PORTSDIR}/audio/musepack \ libtag_c.so:${PORTSDIR}/audio/taglib -MUSE_PACK_PLIST_FILES= lib/moc/decoder_plugins/libmusepack_decoder.a \ +MUSEPACK_PLIST_FILES= lib/moc/decoder_plugins/libmusepack_decoder.a \ lib/moc/decoder_plugins/libmusepack_decoder.so MUSEPACK_CONFIGURE_OFF= --without-musepack diff --git a/audio/musepack/Makefile b/audio/musepack/Makefile index abccb7ad4dd0..7f2af35f228c 100644 --- a/audio/musepack/Makefile +++ b/audio/musepack/Makefile @@ -3,7 +3,7 @@ PORTNAME= musepack PORTVERSION= 2009.03.01 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio MASTER_SITES= http://files.musepack.net/source/ DISTNAME= ${PORTNAME}_src_r435 @@ -11,8 +11,10 @@ DISTNAME= ${PORTNAME}_src_r435 MAINTAINER= shoesoft@gmx.net COMMENT= Decoder, encoder, and replaygain for musepack (mpc) +USES= libtool USE_LDCONFIG= yes -USE_AUTOTOOLS= aclocal autoheader libtoolize automake autoconf libtool +USE_AUTOTOOLS= aclocal autoheader libtoolize automake autoconf +GNU_CONFIGURE= yes ACLOCAL_ARGS= -I. -I ${LOCALBASE}/share/aclocal AUTOMAKE_ARGS= --add-missing diff --git a/audio/musepack/pkg-plist b/audio/musepack/pkg-plist index 40b283c3a4b9..6288b8219f9e 100644 --- a/audio/musepack/pkg-plist +++ b/audio/musepack/pkg-plist @@ -11,7 +11,7 @@ include/mpc/mpcmath.h include/mpc/reader.h include/mpc/streaminfo.h lib/libmpcdec.a -lib/libmpcdec.la lib/libmpcdec.so -lib/libmpcdec.so.7 +lib/libmpcdec.so.6 +lib/libmpcdec.so.6.1.0 @dirrm include/mpc diff --git a/audio/musicpd/Makefile b/audio/musicpd/Makefile index 940f8882b366..a29167515975 100644 --- a/audio/musicpd/Makefile +++ b/audio/musicpd/Makefile @@ -2,7 +2,7 @@ PORTNAME= musicpd PORTVERSION= 0.18.11 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio ipv6 MASTER_SITES= http://www.musicpd.org/download/mpd/${PORTVERSION:R}/ DISTNAME= mpd-${PORTVERSION} diff --git a/audio/pacpl/Makefile b/audio/pacpl/Makefile index 4e0b287ca4d6..2f354c82b07b 100644 --- a/audio/pacpl/Makefile +++ b/audio/pacpl/Makefile @@ -3,7 +3,7 @@ PORTNAME= pacpl PORTVERSION= 5.0.1 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= audio MASTER_SITES= SF diff --git a/audio/soundkonverter/Makefile b/audio/soundkonverter/Makefile index 92a7aaf1cf21..4aca3225b319 100644 --- a/audio/soundkonverter/Makefile +++ b/audio/soundkonverter/Makefile @@ -3,7 +3,7 @@ PORTNAME= soundkonverter DISTVERSION= 2.1.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio kde MASTER_SITES= GH LOCAL/dbn/${PORTNAME} diff --git a/audio/xmms2/Makefile b/audio/xmms2/Makefile index c140bfa3d821..b202d470f134 100644 --- a/audio/xmms2/Makefile +++ b/audio/xmms2/Makefile @@ -4,7 +4,7 @@ PORTNAME?= xmms2 PORTVERSION= 0.8 DISTVERSIONSUFFIX=DrO_o -PORTREVISION?= 8 +PORTREVISION?= 9 CATEGORIES?= audio MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20${DISTVERSIONSUFFIX} diff --git a/multimedia/gmerlin-avdecoder/Makefile b/multimedia/gmerlin-avdecoder/Makefile index 3e9ca536774e..261f4fb5520c 100644 --- a/multimedia/gmerlin-avdecoder/Makefile +++ b/multimedia/gmerlin-avdecoder/Makefile @@ -3,7 +3,7 @@ PORTNAME= gmerlin-avdecoder PORTVERSION= 1.2.0 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= multimedia MASTER_SITES= SF/gmerlin/${PORTNAME}/${PORTVERSION} diff --git a/multimedia/qmmp/Makefile b/multimedia/qmmp/Makefile index 7d82754bfaae..36846b48eef2 100644 --- a/multimedia/qmmp/Makefile +++ b/multimedia/qmmp/Makefile @@ -2,6 +2,7 @@ PORTNAME= qmmp PORTVERSION= 0.8.0 +PORTREVISION= 1 CATEGORIES= multimedia MASTER_SITES= http://qmmp.ylsoftware.com/files/ diff --git a/multimedia/quodlibet/Makefile b/multimedia/quodlibet/Makefile index 7c81878359f8..c89db4db1a18 100644 --- a/multimedia/quodlibet/Makefile +++ b/multimedia/quodlibet/Makefile @@ -3,7 +3,7 @@ PORTNAME= quodlibet PORTVERSION= 2.6.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia audio python gnome MASTER_SITES= http://bitbucket.org/lazka/${PORTNAME}-files/raw/default/releases/ diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile index cf51253f9709..7a9c3156ca6b 100644 --- a/multimedia/vlc/Makefile +++ b/multimedia/vlc/Makefile @@ -3,7 +3,7 @@ PORTNAME= vlc DISTVERSION= 2.1.5 -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 4 CATEGORIES= multimedia audio ipv6 net www MASTER_SITES= http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION:S/a$//}/ \ diff --git a/sysutils/k3b-kde4/Makefile b/sysutils/k3b-kde4/Makefile index 99b2d733d9a9..3798f43b9c93 100644 --- a/sysutils/k3b-kde4/Makefile +++ b/sysutils/k3b-kde4/Makefile @@ -3,7 +3,7 @@ PORTNAME= k3b PORTVERSION= 2.0.2 -PORTREVISION= 17 +PORTREVISION= 18 CATEGORIES= sysutils multimedia kde MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}