Hi guys!
The diff below drops gettext from MODULES for some simple cases in audio
category. No extra bits to make a review easier.
OKs? Comments?
Index: gtkpod/Makefile
===================================================================
RCS file: /cvs/ports/audio/gtkpod/Makefile,v
retrieving revision 1.50
diff -u -r1.50 Makefile
--- gtkpod/Makefile 23 Oct 2017 17:10:37 -0000 1.50
+++ gtkpod/Makefile 16 Nov 2017 15:21:00 -0000
@@ -2,7 +2,7 @@
COMMENT= GTK+2 program to synchronize an Apple iPod
DISTNAME= gtkpod-1.0.0
-REVISION= 6
+REVISION= 7
CATEGORIES= audio x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gtkpod/}
@@ -12,11 +12,11 @@
PERMIT_PACKAGE_CDROM= Yes
WANTLIB += X11 Xcursor Xext Xfixes Xi Xinerama Xrandr Xrender
-WANTLIB += Xcomposite Xdamage c cairo expat fontconfig freetype m pthread
-WANTLIB += xcb z xml2 png glib-2.0 gmodule-2.0 gobject-2.0
-WANTLIB += gthread-2.0 pango-1.0 pangoft2-1.0 pangocairo-1.0 atk-1.0 pixman-1
+WANTLIB += Xcomposite Xdamage c cairo fontconfig freetype m pthread
+WANTLIB += z xml2 glib-2.0 gmodule-2.0 gobject-2.0 intl
+WANTLIB += gthread-2.0 pango-1.0 pangoft2-1.0 pangocairo-1.0 atk-1.0
WANTLIB += gio-2.0 id3tag gpod gdk-x11-2.0 gdk_pixbuf-2.0 gtk-x11-2.0 curl
-WANTLIB += glade-2.0 xcb-render GL xcb-shm FLAC ogg vorbis vorbisfile
+WANTLIB += glade-2.0 FLAC ogg vorbis vorbisfile
USE_GMAKE= Yes
@@ -33,7 +33,7 @@
devel/libglade2 \
net/curl
-MODULES= devel/gettext textproc/intltool
+MODULES= textproc/intltool
CONFIGURE_STYLE=gnu
CONFIGURE_ARGS+= --with-curl \
Index: pavucontrol/Makefile
===================================================================
RCS file: /cvs/ports/audio/pavucontrol/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- pavucontrol/Makefile 27 Jul 2017 09:34:37 -0000 1.9
+++ pavucontrol/Makefile 16 Nov 2017 15:21:00 -0000
@@ -9,13 +9,12 @@
HOMEPAGE = http://freedesktop.org/software/pulseaudio/pavucontrol/
MASTER_SITES = http://freedesktop.org/software/pulseaudio/pavucontrol/
CATEGORIES = audio
-REVISION = 1
+REVISION = 2
# GPLv2+
PERMIT_PACKAGE_CDROM = Yes
-MODULES = devel/gettext \
- textproc/intltool
+MODULES = textproc/intltool
# c++11
COMPILER = gcc
@@ -52,7 +51,7 @@
WANTLIB += X11 atk-1.0 atkmm-1.6 c cairo cairomm-1.0
WANTLIB += canberra gdk_pixbuf-2.0
WANTLIB += gio-2.0 giomm-2.4 glib-2.0 glibmm-2.4 gobject-2.0
-WANTLIB += m pango-1.0 pangocairo-1.0 pangomm-1.4
+WANTLIB += intl m pango-1.0 pangocairo-1.0 pangomm-1.4
WANTLIB += pthread pulse pulse-mainloop-glib sigc-2.0
WANTLIB += ${COMPILER_LIBCXX}
Index: pms/Makefile
===================================================================
RCS file: /cvs/ports/audio/pms/Makefile,v
retrieving revision 1.17
diff -u -r1.17 Makefile
--- pms/Makefile 26 Jul 2017 22:45:15 -0000 1.17
+++ pms/Makefile 16 Nov 2017 15:21:00 -0000
@@ -12,12 +12,11 @@
# GPLv3
PERMIT_PACKAGE_CDROM= Yes
-WANTLIB += c glib-2.0 m ncursesw pthread ${COMPILER_LIBCXX}
+WANTLIB += c glib-2.0 intl m ncursesw pthread ${COMPILER_LIBCXX}
LIB_DEPENDS= devel/glib2
-MODULES= devel/gettext \
- textproc/intltool
+MODULES= textproc/intltool
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pms/}
Index: potamus/Makefile
===================================================================
RCS file: /cvs/ports/audio/potamus/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- potamus/Makefile 25 Aug 2015 13:18:24 -0000 1.5
+++ potamus/Makefile 16 Nov 2017 15:21:00 -0000
@@ -3,7 +3,7 @@
COMMENT = lightweight audio player with a simple interface
DISTNAME = potamus-16
CATEGORIES = audio x11
-REVISION = 1
+REVISION = 2
HOMEPAGE = http://offog.org/code/potamus/
@@ -14,13 +14,11 @@
WANTLIB += Xinerama Xrandr Xrender ao atk-1.0 audiofile avcodec
WANTLIB += avformat avutil c cairo fontconfig freetype gdk-x11-2.0
WANTLIB += gdk_pixbuf-2.0 gio-2.0 glade-2.0 glib-2.0 gobject-2.0
-WANTLIB += gthread-2.0 gtk-x11-2.0 m mad modplug opusfile pango-1.0
+WANTLIB += gthread-2.0 gtk-x11-2.0 intl m mad modplug opusfile pango-1.0
WANTLIB += pangocairo-1.0 pangoft2-1.0 pthread samplerate vorbisfile
WANTLIB += xml2 z
MASTER_SITES = http://offog.org/files/
-
-MODULES = devel/gettext
LIB_DEPENDS = audio/libao \
audio/libmad \
Index: scmpc/Makefile
===================================================================
RCS file: /cvs/ports/audio/scmpc/Makefile,v
retrieving revision 1.23
diff -u -r1.23 Makefile
--- scmpc/Makefile 8 Jul 2017 07:02:57 -0000 1.23
+++ scmpc/Makefile 16 Nov 2017 15:21:00 -0000
@@ -3,18 +3,16 @@
COMMENT= client for MPD to submit tracks to Last.fm
CATEGORIES= audio
DISTNAME= scmpc-0.4.1
-REVISION= 0
+REVISION= 1
HOMEPAGE= http://cmende.github.io/scmpc/
# GPLv2
PERMIT_PACKAGE_CDROM= Yes
-WANTLIB += c confuse curl glib-2.0 mpdclient pthread
+WANTLIB += c confuse curl glib-2.0 iconv intl mpdclient
MASTER_SITES= https://bitbucket.org/cmende/scmpc/downloads/
-
-MODULES+= devel/gettext
CONFIGURE_STYLE= gnu
Index: solfege/Makefile
===================================================================
RCS file: /cvs/ports/audio/solfege/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- solfege/Makefile 25 Aug 2015 13:18:25 -0000 1.6
+++ solfege/Makefile 16 Nov 2017 15:21:00 -0000
@@ -4,7 +4,7 @@
DISTNAME = solfege-3.22.2
CATEGORIES = audio x11
BROKEN-hppa = SIGILL when running lilypond
-REVISION = 0
+REVISION = 1
HOMEPAGE = http://www.solfege.org/
@@ -13,10 +13,10 @@
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=solfege/}
-MODULES = devel/gettext \
- lang/python
+MODULES = lang/python
-BUILD_DEPENDS = print/lilypond,-main \
+BUILD_DEPENDS = devel/gettext-tools \
+ print/lilypond,-main \
sysutils/coreutils \
x11/py-gtk2
Index: soundtracker/Makefile
===================================================================
RCS file: /cvs/ports/audio/soundtracker/Makefile,v
retrieving revision 1.30
diff -u -r1.30 Makefile
--- soundtracker/Makefile 23 Oct 2017 17:10:37 -0000 1.30
+++ soundtracker/Makefile 16 Nov 2017 15:21:00 -0000
@@ -5,7 +5,7 @@
V= 0.6.8
DISTNAME= soundtracker_$V.gtk2_17092006_1613
PKGNAME= soundtracker-$V
-REVISION= 6
+REVISION= 7
CATEGORIES= audio
HOMEPAGE= http://www.shaltev.org/programming.html
@@ -19,18 +19,15 @@
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 += bonobo-2 bonobo-activation bonoboui-2 c cairo
WANTLIB += fontconfig freetype gconf-2 gdk-x11-2.0 gdk_pixbuf-2.0
WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gnome-2 gnomecanvas-2
WANTLIB += gnomeui-2 gnomevfs-2 gobject-2.0 gthread-2.0 gtk-x11-2.0
-WANTLIB += m pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1 png
-WANTLIB += popt pthread sndfile sndio xcb xcb-render
-WANTLIB += xcb-shm z
+WANTLIB += intl m pango-1.0 pangocairo-1.0 pangoft2-1.0
+WANTLIB += popt pthread sndfile sndio z
LIB_DEPENDS= audio/libsndfile \
x11/gnome/libgnomeui
-
-MODULES= devel/gettext
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS= --disable-alsa \
Index: streamripper/Makefile
===================================================================
RCS file: /cvs/ports/audio/streamripper/Makefile,v
retrieving revision 1.26
diff -u -r1.26 Makefile
--- streamripper/Makefile 24 Jan 2015 11:07:57 -0000 1.26
+++ streamripper/Makefile 16 Nov 2017 15:21:00 -0000
@@ -3,19 +3,17 @@
COMMENT= rip shoutcast streams to local mp3s
DISTNAME= streamripper-1.64.6
-REVISION= 1
+REVISION= 2
CATEGORIES= audio
HOMEPAGE= http://streamripper.sourceforge.net/
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=streamripper/}
-MODULES= devel/gettext
-
# GPLv2
PERMIT_PACKAGE_CDROM= Yes
-WANTLIB += c glib-2.0 iberty m mad>=2 ogg>=5.2 pthread vorbis>=3.0
+WANTLIB += c glib-2.0 iberty iconv intl m mad>=2 ogg>=5.2 pthread vorbis>=3.0
LIB_DEPENDS= audio/libmad \
audio/libogg \
Index: tremor-tools/Makefile
===================================================================
RCS file: /cvs/ports/audio/tremor-tools/Makefile,v
retrieving revision 1.22
diff -u -r1.22 Makefile
--- tremor-tools/Makefile 4 Nov 2016 11:35:18 -0000 1.22
+++ tremor-tools/Makefile 16 Nov 2017 15:21:00 -0000
@@ -3,7 +3,7 @@
COMMENT= integer-only ogg vorbis command-line player
DISTNAME= vorbis-tools-1.0
PKGNAME= ${DISTNAME:S/vorbis/tremor/}
-REVISION= 7
+REVISION= 8
CATEGORIES= audio
MASTER_SITES= http://www.vorbis.com/files/1.0/unix/
@@ -17,12 +17,11 @@
LIB_DEPENDS= audio/libao \
audio/libogg \
audio/tremor \
+ devel/gettext \
net/curl
-MODULES= devel/gettext
-
WANTLIB= ao>=3 c curl>=2 crypto ogg>=5 nghttp2 \
- pthread ssl vorbisidec>=1 z
+ iconv intl pthread ssl vorbisidec>=1 z
CONFIGURE_STYLE=gnu
CONFIGURE_ARGS+=--disable-vorbistest
Index: xmms2/Makefile
===================================================================
RCS file: /cvs/ports/audio/xmms2/Makefile,v
retrieving revision 1.44
diff -u -r1.44 Makefile
--- xmms2/Makefile 26 Jul 2017 22:45:16 -0000 1.44
+++ xmms2/Makefile 16 Nov 2017 15:21:01 -0000
@@ -6,7 +6,7 @@
V = 0.8
DISTNAME = xmms2-${V}DrO_o
PKGNAME = xmms2-${V}
-REVISION = 7
+REVISION = 8
SHARED_LIBS += xmmsclient++ 2.0 # 4.0.0
SHARED_LIBS += xmmsclient++-glib 1.0 # 1.0.0
@@ -24,7 +24,7 @@
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 += gthread-2.0 jack m mad ncurses ogg pcre perl pthread readline
+WANTLIB += gthread-2.0 intl jack m mad ncurses ogg pcre perl pthread readline
WANTLIB += sndfile speex sqlite3 ${COMPILER_LIBCXX} vorbis vorbisfile
WANTLIB += vorbisidec vpx x264 xml2 opus swresample x265 ${MODPY_WANTLIB}
@@ -33,7 +33,6 @@
EXTRACT_SUFX = .tar.bz2
MODULES = lang/python \
- devel/gettext \
perl
NO_TEST = Yes