On 01/25/13 05:19, Stuart Henderson wrote:
In cases where some port definitely uses functions from a library
itself (rather than being pulled in via a dependency) I find it's
helpful to have that showing up, clearly it doesn't matter for
the tools/infrastructure but I bet I'm not the only one who greps
INDEX when trying to identify which ports are most important to
test following some library update, if something is only in
WANTLIB it won't show up there.
I don't want to see some huge list of unnecessary LIB_DEPENDS
(and I explicitly don't want a LIB_DEPENDS if a port *only* uses
something via a library dependency for example the chain of deps
pulled in by glib) and while I don't feel too strongly about it,
this diff feels to me like it's going a bit far in removing
things for the sake of it, I was actually going to write a mail
about it but wanted to write more than just "don't do this" so
Brad beat me to it ;)
My usual method would be to look through configure output or
builds docs for dependencies declared by upstream and list
them in LIB_DEPENDS when I'm writing the Makefile.
So how about some compromise? This updated diff does the following:
For ports where all I did was remove some LIB_DEPENDS (audio/herrie,
audio/hydrogen, audio/sox, games/alephone/alephone, multimedia/k3b), I
reverted those changes. It has the added benefit of not needing to bump
REVISION on those ports, simplifying the diff (and yes, I tested all of
them to make sure all was ok).
I left the others, as I have OKs from the MAINTAINERS in most cases.
OK?
~Brian
Index: audio/audacious-plugins/Makefile
===================================================================
RCS file: /cvs/ports/audio/audacious-plugins/Makefile,v
retrieving revision 1.56
diff -u -p -r1.56 Makefile
--- audio/audacious-plugins/Makefile 14 Jan 2013 02:26:19 -0000 1.56
+++ audio/audacious-plugins/Makefile 25 Jan 2013 16:58:33 -0000
@@ -7,7 +7,7 @@ COMMENT = input and output plugins for
V = 3.3.3
DISTNAME = audacious-plugins-$V
-REVISION = 0
+REVISION = 1
CATEGORIES = audio multimedia
HOMEPAGE = http://audacious-media-player.org/
@@ -18,7 +18,7 @@ PERMIT_PACKAGE_FTP = Yes
PERMIT_DISTFILES_CDROM =Yes
PERMIT_DISTFILES_FTP = Yes
-WANTLIB += FLAC GL SDL X11 Xcomposite Xext Xrender atk-1.0 audcore
+WANTLIB += FLAC SDL X11 Xcomposite Xext Xrender atk-1.0 audcore
WANTLIB += audgui audtag avcodec avformat avutil cairo cairo-gobject
WANTLIB += cddb cdio cdio_cdda cue curl dbus-1 dbus-glib-1 expat
WANTLIB += faad fontconfig freetype gdk-3 gdk_pixbuf-2.0 gio-2.0
Index: audio/deadbeef/Makefile
===================================================================
RCS file: /cvs/ports/audio/deadbeef/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- audio/deadbeef/Makefile 3 Jan 2013 11:54:49 -0000 1.3
+++ audio/deadbeef/Makefile 25 Jan 2013 16:58:34 -0000
@@ -4,6 +4,7 @@ SHARED_ONLY = Yes
COMMENT = DeaDBeeF is an audio player
DISTNAME = deadbeef-0.5.6
+REVISION = 0
CATEGORIES = audio
HOMEPAGE = http://deadbeef.sourceforge.net/
@@ -14,7 +15,7 @@ PERMIT_PACKAGE_FTP = Yes
PERMIT_DISTFILES_CDROM =Yes
PERMIT_DISTFILES_FTP = Yes
-WANTLIB += FLAC GL ICE Imlib2 SM X11 Xcomposite Xcursor Xdamage
+WANTLIB += FLAC ICE Imlib2 SM X11 Xcomposite Xcursor Xdamage
WANTLIB += Xext Xfixes Xi Xinerama Xrandr Xrender atk-1.0 avcodec
WANTLIB += avformat avutil c cairo cddb cdio crypto curl dbus-1
WANTLIB += expat faad ffi fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0
@@ -22,8 +23,8 @@ WANTLIB += gio-2.0 glib-2.0 gmodule-2.0
WANTLIB += gtk-x11-2.0 harfbuzz icudata icule icuuc idn m mad
WANTLIB += mms mpcdec ogg pango-1.0 pangocairo-1.0 pangoft2-1.0
WANTLIB += pcre pixman-1 png pthread pthread-stubs sndfile sndio
-WANTLIB += ssl vorbis vorbisfile wavpack xcb xcb-render xcb-shm
-WANTLIB += z zip
+WANTLIB += ssl vorbis vorbisenc vorbisfile wavpack xcb xcb-render
+WANTLIB += xcb-shm z zip
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=deadbeef/}
EXTRACT_SUFX = .tar.bz2
Index: audio/jack/Makefile
===================================================================
RCS file: /cvs/ports/audio/jack/Makefile,v
retrieving revision 1.24
diff -u -p -r1.24 Makefile
--- audio/jack/Makefile 9 Dec 2012 07:29:57 -0000 1.24
+++ audio/jack/Makefile 25 Jan 2013 16:58:35 -0000
@@ -7,7 +7,7 @@ COMMENT = low latency sound server
V = 0.121.3
DISTNAME = jack-audio-connection-kit-${V}
PKGNAME = jack-${V}
-REVISION = 2
+REVISION = 3
CATEGORIES = audio
SHARED_LIBS += jack 0.0 # 0.28
@@ -22,7 +22,7 @@ PERMIT_DISTFILES_CDROM =Yes
PERMIT_DISTFILES_FTP = Yes
WANTLIB += c celt0>=1 m pthread readline samplerate sndfile
-WANTLIB += sndio termcap
+WANTLIB += sndio termcap FLAC ogg vorbis vorbisenc
MASTER_SITES = ${HOMEPAGE}downloads/
Index: audio/libsamplerate/Makefile
===================================================================
RCS file: /cvs/ports/audio/libsamplerate/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- audio/libsamplerate/Makefile 15 Nov 2010 00:22:47 -0000 1.15
+++ audio/libsamplerate/Makefile 25 Jan 2013 16:58:35 -0000
@@ -3,11 +3,12 @@
COMMENT= audio sample rate conversion library
DISTNAME= libsamplerate-0.1.7
-REVISION= 0
+REVISION= 1
SHARED_LIBS= samplerate 2.0 # .1.3
CATEGORIES= audio
HOMEPAGE= http://mega-nerd.com/SRC/
+MAINTAINER= Jan Stary <h...@stare.cz>
# GPLv2
PERMIT_PACKAGE_CDROM= Yes
@@ -17,7 +18,7 @@ PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= ${HOMEPAGE}
-WANTLIB= c m sndfile>=1
+WANTLIB= c m sndfile>=1 FLAC ogg vorbis vorbisenc
LIB_DEPENDS= audio/libsndfile
Index: audio/libsndfile/Makefile
===================================================================
RCS file: /cvs/ports/audio/libsndfile/Makefile,v
retrieving revision 1.22
diff -u -p -r1.22 Makefile
--- audio/libsndfile/Makefile 13 Jul 2011 22:24:05 -0000 1.22
+++ audio/libsndfile/Makefile 25 Jan 2013 16:58:35 -0000
@@ -3,8 +3,10 @@
COMMENT= library to handle various audio file formats
DISTNAME= libsndfile-1.0.25
+REVISION= 0
CATEGORIES= audio
HOMEPAGE= http://www.mega-nerd.com/libsndfile/
+MAINTAINER= Jan Stary <h...@stare.cz>
SHARED_LIBS += sndfile 3.3 # .1.25
# LGPLv2.1
@@ -15,17 +17,20 @@ PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= ${HOMEPAGE}files/
-WANTLIB= c m sndio
+WANTLIB= c m sndio FLAC ogg vorbis vorbisenc
USE_LIBTOOL= Yes
CONFIGURE_STYLE=gnu
CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
--disable-alsa \
- --disable-external-libs \
--disable-octave \
--disable-sqlite
MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/Cfg
USE_GROFF = Yes
+
+LIB_DEPENDS= audio/flac \
+ audio/libogg \
+ audio/libvorbis
FAKE_FLAGS= htmldocdir=${PREFIX}/share/doc/libsndfile
Index: audio/pulseaudio/Makefile
===================================================================
RCS file: /cvs/ports/audio/pulseaudio/Makefile,v
retrieving revision 1.41
diff -u -p -r1.41 Makefile
--- audio/pulseaudio/Makefile 14 Jan 2013 05:52:34 -0000 1.41
+++ audio/pulseaudio/Makefile 25 Jan 2013 16:58:36 -0000
@@ -21,7 +21,7 @@ COMMENT= cross-platform networked sound
VERSION= 3.0
DISTNAME= pulseaudio-${VERSION}
EXTRACT_SUFX= .tar.xz
-REVISION= 2
+REVISION= 3
SHARED_LIBS += pulse 2.0 # .15.3
SHARED_LIBS += pulse-simple 0.0 # .0.3
@@ -42,7 +42,7 @@ PERMIT_DISTFILES_FTP= Yes
WANTLIB += ICE SM X11 X11-xcb Xext Xi Xtst c crypto execinfo gdbm
WANTLIB += glib-2.0 json ltdl m pcre pthread sndfile sndio speexdsp
-WANTLIB += ssl xcb
+WANTLIB += ssl xcb FLAC ogg vorbis vorbisenc
MASTER_SITES= http://freedesktop.org/software/pulseaudio/releases/
TAR= ${LOCALBASE}/bin/gtar
Index: audio/soundtracker/Makefile
===================================================================
RCS file: /cvs/ports/audio/soundtracker/Makefile,v
retrieving revision 1.25
diff -u -p -r1.25 Makefile
--- audio/soundtracker/Makefile 12 Oct 2011 12:54:31 -0000 1.25
+++ audio/soundtracker/Makefile 25 Jan 2013 16:58:37 -0000
@@ -5,7 +5,7 @@ COMMENT= music tracking tool for X11
V= 0.6.8
DISTNAME= soundtracker_$V.gtk2_17092006_1613
PKGNAME= soundtracker-$V
-REVISION= 3
+REVISION= 4
CATEGORIES= audio
HOMEPAGE= http://www.shaltev.org/programming.html
@@ -20,7 +20,7 @@ PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= http://www.shaltev.org/data/
EXTRACT_SUFX= .tar.bz2
-WANTLIB += GL ICE ORBit-2 SM X11 Xcomposite Xcursor Xdamage Xext
+WANTLIB += ICE ORBit-2 SM X11 Xcomposite Xcursor Xdamage Xext
WANTLIB += Xfixes Xi Xinerama Xrandr Xrender art_lgpl_2 atk-1.0
WANTLIB += bonobo-2 bonobo-activation bonoboui-2 c cairo expat
WANTLIB += fontconfig freetype gconf-2 gdk-x11-2.0 gdk_pixbuf-2.0
Index: audio/speech-dispatcher/Makefile
===================================================================
RCS file: /cvs/ports/audio/speech-dispatcher/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- audio/speech-dispatcher/Makefile 1 Sep 2012 14:36:56 -0000 1.3
+++ audio/speech-dispatcher/Makefile 25 Jan 2013 16:58:37 -0000
@@ -3,7 +3,7 @@
COMMENT= common interface to speech synthesis
DISTNAME= speech-dispatcher-0.7.1
-REVISION= 0
+REVISION= 1
SHARED_LIBS += sdaudio 0.0 # 2.4
SHARED_LIBS += speechd 0.0 # 5.0
@@ -19,7 +19,8 @@ PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB += ao c dotconf-1.1 espeak glib-2.0 gmodule-2.0 gthread-2.0
-WANTLIB += m pcre portaudio pthread sndfile sndio stdc++
+WANTLIB += m pcre portaudio pthread sndfile sndio stdc++ FLAC ogg
+WANTLIB += vorbis vorbisenc
MASTER_SITES= http://devel.freebsoft.org/pub/projects/speechd/
Index: audio/twolame/Makefile
===================================================================
RCS file: /cvs/ports/audio/twolame/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- audio/twolame/Makefile 27 Dec 2011 09:44:15 -0000 1.1.1.1
+++ audio/twolame/Makefile 25 Jan 2013 16:58:37 -0000
@@ -3,6 +3,7 @@
COMMENT= optimised MPEG Audio Layer 2 (MP2) encoder
DISTNAME= twolame-0.3.13
+REVISION= 0
SHARED_LIBS += twolame 0.0 # 0.0
CATEGORIES= audio
@@ -17,7 +18,7 @@ PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=twolame/}
-WANTLIB= c m sndfile
+WANTLIB= c m sndfile FLAC ogg vorbis vorbisenc
LIB_DEPENDS= audio/libsndfile
Index: audio/xmms2/Makefile
===================================================================
RCS file: /cvs/ports/audio/xmms2/Makefile,v
retrieving revision 1.29
diff -u -p -r1.29 Makefile
--- audio/xmms2/Makefile 1 Sep 2012 14:36:56 -0000 1.29
+++ audio/xmms2/Makefile 25 Jan 2013 16:58:38 -0000
@@ -6,7 +6,7 @@ BROKEN-sparc64 = waf build goes into an
V = 0.8
DISTNAME = xmms2-${V}DrO_o
PKGNAME = xmms2-${V}
-REVISION= 0
+REVISION = 1
SHARED_LIBS += xmmsclient++ 2.0 # 4.0.0
SHARED_LIBS += xmmsclient++-glib 1.0 # 1.0.0
@@ -27,10 +27,10 @@ PERMIT_DISTFILES_FTP = Yes
WANTLIB += FLAC ao avahi-client avahi-common avahi-glib avcodec
WANTLIB += avutil c curl gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0
-WANTLIB += gsm gthread-2.0 jack m mad mp3lame ncurses ogg orc-0.4
+WANTLIB += gthread-2.0 jack m mad ncurses ogg orc-0.4
WANTLIB += pcre pthread readline schroedinger-1.0 sndfile speex
-WANTLIB += sqlite3 stdc++ theoradec theoraenc vorbis vorbisenc
-WANTLIB += vorbisfile vorbisidec vpx x264 xml2 xvidcore z
+WANTLIB += sqlite3 stdc++ theoradec theoraenc vorbis
+WANTLIB += vorbisfile vorbisidec vpx x264 xml2
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=xmms2/}
@@ -51,7 +51,6 @@ LIB_DEPENDS = devel/glib2 \
audio/libao \
audio/jack \
textproc/libxml \
- audio/flac \
net/curl \
audio/libmad \
net/avahi \
Index: emulators/mednafen/Makefile
===================================================================
RCS file: /cvs/ports/emulators/mednafen/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- emulators/mednafen/Makefile 23 Jan 2013 21:36:06 -0000 1.7
+++ emulators/mednafen/Makefile 25 Jan 2013 16:59:52 -0000
@@ -5,6 +5,7 @@ COMMENT = emulates numerous game console
V = 0.9.28
DISTNAME = mednafen-${V}-wip
PKGNAME = mednafen-${V}
+REVISION = 0
CATEGORIES = emulators games
HOMEPAGE = http://mednafen.sourceforge.net/
@@ -23,6 +24,7 @@ EXTRACT_SUFX = .tar.bz2
MODULES = devel/gettext
WANTLIB += SDL c cdio m pthread sndfile sndio stdc++ usbhid z
+WANTLIB += FLAC ogg vorbis vorbisenc
USE_GMAKE = Yes
Index: lang/io/Makefile
===================================================================
RCS file: /cvs/ports/lang/io/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- lang/io/Makefile 17 Dec 2012 23:55:28 -0000 1.1.1.1
+++ lang/io/Makefile 25 Jan 2013 17:00:10 -0000
@@ -7,6 +7,7 @@ COMMENT = embeddable prototype-based la
DISTNAME = stevedekorte-io-2011.09.12-106-g02f9800
PKGNAME = io-20110905
+REVISION = 0
CATEGORIES = lang
@@ -27,7 +28,7 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
-WANTLIB += GL X11 Xext Xrender atk-1.0 c cairo clutter-1.0 curses e2fs-uuid
+WANTLIB += X11 Xext Xrender atk-1.0 c cairo clutter-1.0 curses e2fs-uuid
WANTLIB += edit event_core event_extra expat fontconfig freetype
WANTLIB += glib-2.0 gmp gobject-2.0 iconv intl jpeg lzo2 m memcached
WANTLIB += mysqlclient ogg pango-1.0 pcre pcreposix pixman-1 png
@@ -36,9 +37,7 @@ WANTLIB += sqlite3 theora tiff vorbis xc
WANTLIB += yajl z
LIB_DEPENDS = archivers/lzo2 \
- audio/libogg \
audio/libsndfile \
- audio/libvorbis \
mysql-client-*:databases/mysql,-main \
databases/qdbm \
devel/atk \
Index: multimedia/gstreamer-0.10/plugins-bad/Makefile
===================================================================
RCS file: /cvs/ports/multimedia/gstreamer-0.10/plugins-bad/Makefile,v
retrieving revision 1.75
diff -u -p -r1.75 Makefile
--- multimedia/gstreamer-0.10/plugins-bad/Makefile 12 Nov 2012 13:38:37
-0000 1.75
+++ multimedia/gstreamer-0.10/plugins-bad/Makefile 25 Jan 2013 17:00:26
-0000
@@ -12,7 +12,7 @@ PKGNAME-main= gstreamer-plugins-bad-${V
PKGNAME-neon= gstreamer-neon-${V}
PKGNAME-mjpeg= gstreamer-mjpeg-${V}
-REVISION-main= 9
+REVISION-main= 10
REVISION-mjpeg= 4
REVISION-neon= 3
@@ -32,17 +32,18 @@ WANTLIB += glib-2.0 gmodule-2.0 gobject-
WANTLIB += pthread z m pcre gstreamer-0.10 ffi
WANTLIB-main += ${WANTLIB}
-WANTLIB-main += BPM GL SDL SoundTouch X11 Xau Xdamage Xdmcp Xext Xfixes
-WANTLIB-main += Xrender Xxf86vm ass bz2 cairo cdaudio croco-0.6 crypto
-WANTLIB-main += curl dca drm dvdnav dvdread enca expat fontconfig freetype
+WANTLIB-main += BPM SDL SoundTouch X11 Xau Xdmcp Xext Xrender FLAC
+WANTLIB-main += ass bz2 cairo cdaudio croco-0.6 crypto
+WANTLIB-main += curl dca dvdnav dvdread enca expat fontconfig freetype
WANTLIB-main += fribidi gdk_pixbuf-2.0 gio-2.0 gsm gstapp-0.10 gstaudio-0.10
WANTLIB-main += gstbase-0.10 gstcontroller-0.10 gstfft-0.10 gstinterfaces-0.10
WANTLIB-main += gstpbutils-0.10 gstriff-0.10 gstrtp-0.10 gstsdp-0.10
WANTLIB-main += gsttag-0.10 gstvideo-0.10 idn jasper jpeg lrdf mms
-WANTLIB-main += mpcdec orc-0.4 pango-1.0 pangocairo-1.0 pangoft2-1.0
+WANTLIB-main += mpcdec orc-0.4 ogg pango-1.0 pangocairo-1.0 pangoft2-1.0
WANTLIB-main += pixman-1 png pthread-stubs raptor2 rsvg-2 schroedinger-1.0
WANTLIB-main += sndfile sndio spandsp ssl stdc++ tiff usbhid vpx xcb
-WANTLIB-main += xcb-render xcb-shm xslt
+WANTLIB-main += xcb-render xcb-shm xslt harfbuzz icudata icule icuuc vorbis
+WANTLIB-main += vorbisenc yajl
WANTLIB-neon += ${WANTLIB}
WANTLIB-neon += asn1 crypto expat gssapi gstbase-0.10 krb5 neon proxy
