aboutsummaryrefslogtreecommitdiffstats
path: root/audio
diff options
context:
space:
mode:
authormarcus <marcus@FreeBSD.org>2006-10-14 16:54:54 +0800
committermarcus <marcus@FreeBSD.org>2006-10-14 16:54:54 +0800
commit0deb7538cc6a5ae90f4e3e4bdbfe6d0ab974aed8 (patch)
tree17937489af4c767844fc63b684ae3e7b31948812 /audio
parente959473966b963953d63d5f00fae8751f2decf0f (diff)
downloadfreebsd-ports-gnome-0deb7538cc6a5ae90f4e3e4bdbfe6d0ab974aed8.tar.gz
freebsd-ports-gnome-0deb7538cc6a5ae90f4e3e4bdbfe6d0ab974aed8.tar.zst
freebsd-ports-gnome-0deb7538cc6a5ae90f4e3e4bdbfe6d0ab974aed8.zip
Chase the GNOME X11BASE to LOCALBASE move, and fix the build with the
new freetype2 where needed. Submitted by: mezz, ahze, pav, and many others Approved by: portmgr (implicit, kris)
Diffstat (limited to 'audio')
-rw-r--r--audio/beast/Makefile4
-rw-r--r--audio/beast/pkg-plist14
-rw-r--r--audio/cantus/Makefile4
-rw-r--r--audio/cantus/pkg-plist3
-rw-r--r--audio/cantus_3/Makefile4
-rw-r--r--audio/cantus_3/pkg-plist2
-rw-r--r--audio/easytag-devel/Makefile3
-rw-r--r--audio/easytag-devel/pkg-plist10
-rw-r--r--audio/extace/Makefile4
-rw-r--r--audio/gai-album/Makefile4
-rw-r--r--audio/gai-visual-audio/pkg-plist3
-rw-r--r--audio/gaim-festival/Makefile5
-rw-r--r--audio/gdesklets-cornerxmms/Makefile4
-rw-r--r--audio/gdesklets-xmms/Makefile4
-rw-r--r--audio/glame/Makefile4
-rw-r--r--audio/gnomoradio/Makefile4
-rw-r--r--audio/gnomoradio/pkg-plist1
-rw-r--r--audio/gnowavcut/Makefile4
-rw-r--r--audio/goobox/Makefile6
-rw-r--r--audio/goobox/pkg-plist22
-rw-r--r--audio/gqradio/Makefile4
-rw-r--r--audio/grip/Makefile4
-rw-r--r--audio/grip/pkg-plist14
-rw-r--r--audio/gspeakers/Makefile4
-rw-r--r--audio/jamboree/Makefile6
-rw-r--r--audio/jamboree/pkg-plist12
-rw-r--r--audio/lindele/Makefile4
-rw-r--r--audio/liteamp/Makefile4
-rw-r--r--audio/liteamp/pkg-plist2
-rw-r--r--audio/marlin/Makefile6
-rw-r--r--audio/marlin/pkg-plist18
-rw-r--r--audio/muine/Makefile3
-rw-r--r--audio/musicbox-tag-editor/Makefile4
-rw-r--r--audio/paman/Makefile4
-rw-r--r--audio/rhythmbox-devel/Makefile39
-rw-r--r--audio/rhythmbox-devel/distinfo6
-rw-r--r--audio/rhythmbox-devel/pkg-plist113
-rw-r--r--audio/rhythmbox/Makefile39
-rw-r--r--audio/rhythmbox/distinfo6
-rw-r--r--audio/rhythmbox/pkg-plist113
-rw-r--r--audio/streamtuner/Makefile6
-rw-r--r--audio/streamtuner/pkg-plist2
-rw-r--r--audio/sweep/Makefile1
-rw-r--r--audio/sweep/pkg-plist6
-rw-r--r--audio/tagtool/Makefile8
-rw-r--r--audio/tagtool/pkg-plist6
-rw-r--r--audio/terminatorx/Makefile6
-rw-r--r--audio/terminatorx/files/patch-src::main.cc2
-rw-r--r--audio/xfce4-mixer/Makefile3
-rw-r--r--audio/xfce4-mixer/pkg-plist38
50 files changed, 430 insertions, 162 deletions
diff --git a/audio/beast/Makefile b/audio/beast/Makefile
index 213d420c6e83..d22569949142 100644
--- a/audio/beast/Makefile
+++ b/audio/beast/Makefile
@@ -7,7 +7,7 @@
PORTNAME= beast
PORTVERSION= 0.6.6
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= audio
MASTER_SITES= ftp://beast.gtk.org/pub/beast/v0.6/ \
http://beast.gtk.org/beast-ftp/v0.6/
@@ -19,7 +19,7 @@ LIB_DEPENDS= vorbisfile:${PORTSDIR}/audio/libvorbis \
mad:${PORTSDIR}/audio/libmad \
guile:${PORTSDIR}/lang/guile
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GMAKE= yes
USE_GNOME= gnomehack gnomeprefix intlhack libgnomecanvas
GNU_CONFIGURE= yes
diff --git a/audio/beast/pkg-plist b/audio/beast/pkg-plist
index 696f909eb950..ab736b4e986f 100644
--- a/audio/beast/pkg-plist
+++ b/audio/beast/pkg-plist
@@ -303,7 +303,17 @@ share/mime/packages/beast.xml
@dirrm share/gnome/bse/v0.6.6/scripts
@dirrm share/gnome/bse/v0.6.6
@dirrm share/gnome/bse
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
diff --git a/audio/cantus/Makefile b/audio/cantus/Makefile
index 7c1ba3a57d80..f7157e6f44c8 100644
--- a/audio/cantus/Makefile
+++ b/audio/cantus/Makefile
@@ -7,7 +7,7 @@
PORTNAME= cantus
PORTVERSION= 1.07
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= audio
MASTER_SITES= http://web222.mis02.de/releases/cantus/
DISTNAME= ${PORTNAME}-${PORTVERSION}-1
@@ -17,7 +17,7 @@ COMMENT= Tool for tagging and renaming MP3 and OGG/Vorbis files
USE_GMAKE= yes
GNU_CONFIGURE= yes
-USE_GNOME= gnomelibs gnomehack
+USE_GNOME= gnomelibs gnomehack gnomehier
WRKSRC= ${WRKDIR}/${DISTNAME:S/-1$//}
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/audio/cantus/pkg-plist b/audio/cantus/pkg-plist
index 6d416d64b759..4c2ba75104d6 100644
--- a/audio/cantus/pkg-plist
+++ b/audio/cantus/pkg-plist
@@ -23,8 +23,5 @@ share/pixmaps/cantus/addrecursive.xpm
share/gnome/apps/Applications/cantus.desktop
@dirrm share/pixmaps/cantus
@dirrmtry share/pixmaps
-@dirrmtry share/gnome/apps/Applications
-@dirrmtry share/gnome/apps
-@dirrmtry share/gnome
@dirrm doc/Cantus
@dirrm doc
diff --git a/audio/cantus_3/Makefile b/audio/cantus_3/Makefile
index d6efb22d39cb..296c0330491a 100644
--- a/audio/cantus_3/Makefile
+++ b/audio/cantus_3/Makefile
@@ -7,7 +7,7 @@
PORTNAME= cantus_3
PORTVERSION= 3.0.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= audio
MASTER_SITES= ftp://ftp.gascom.ru/pub/asa/ \
http://web222.mis02.de/releases/cantus_3/
@@ -24,7 +24,7 @@ LIB_DEPENDS= gtkmm-2.0.6:${PORTSDIR}/x11-toolkits/gtkmm20 \
USE_GMAKE= yes
USE_GNOME= gnomehack gnomeprefix libglade2
-USE_X_PREFIX= yes
+USE_XLIB= yes
.include <bsd.port.pre.mk>
diff --git a/audio/cantus_3/pkg-plist b/audio/cantus_3/pkg-plist
index 4e47af908f52..08dc71f8ccdb 100644
--- a/audio/cantus_3/pkg-plist
+++ b/audio/cantus_3/pkg-plist
@@ -21,3 +21,5 @@ share/locale/pl/LC_MESSAGES/cantus_3.mo
@dirrm share/gnome/help/cantus_3/
@dirrm share/doc/cantus_3
@dirrm lib/cantus_3/
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
diff --git a/audio/easytag-devel/Makefile b/audio/easytag-devel/Makefile
index a1284f7a8ab3..fe10fe0c45be 100644
--- a/audio/easytag-devel/Makefile
+++ b/audio/easytag-devel/Makefile
@@ -7,6 +7,7 @@
PORTNAME= easytag
PORTVERSION= 1.99.12
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -24,7 +25,7 @@ MAN1= easytag.1
CONFLICTS= easytag-[0-9]*
USE_BZIP2= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GETTEXT= yes
USE_GNOME= gnomehack gnomeprefix gtk20 desktopfileutils
GNU_CONFIGURE= yes
diff --git a/audio/easytag-devel/pkg-plist b/audio/easytag-devel/pkg-plist
index d747a6cfc540..62f44284c78c 100644
--- a/audio/easytag-devel/pkg-plist
+++ b/audio/easytag-devel/pkg-plist
@@ -23,3 +23,13 @@ share/locale/uk/LC_MESSAGES/easytag.mo
@dirrm share/gnome/easytag
@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
diff --git a/audio/extace/Makefile b/audio/extace/Makefile
index f36d1ec79ca0..ed48f88b4a42 100644
--- a/audio/extace/Makefile
+++ b/audio/extace/Makefile
@@ -7,7 +7,7 @@
PORTNAME= extace
PORTVERSION= 1.9.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -17,7 +17,7 @@ COMMENT= An Audio Visualization plugin for the X Window System
LIB_DEPENDS= fftw3.4:${PORTSDIR}/math/fftw3
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GNOME= esound imlib gnomehack gnometarget gnomeprefix
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/audio/gai-album/Makefile b/audio/gai-album/Makefile
index c62b5afa75a4..a9d8fdbc2e74 100644
--- a/audio/gai-album/Makefile
+++ b/audio/gai-album/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gai-album
PORTVERSION= 0.7
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= gai
@@ -19,7 +19,7 @@ LIB_DEPENDS= gai:${PORTSDIR}/x11-toolkits/gai \
xmms:${PORTSDIR}/multimedia/xmms
GNU_CONFIGURE= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_BZIP2= yes
USE_GNOME= gnomehack gnomeprefix
diff --git a/audio/gai-visual-audio/pkg-plist b/audio/gai-visual-audio/pkg-plist
index 2208232bf6ae..d0a51e6a551d 100644
--- a/audio/gai-visual-audio/pkg-plist
+++ b/audio/gai-visual-audio/pkg-plist
@@ -2,5 +2,6 @@ bin/gai-va
libdata/bonobo/servers/GNOME_gai-vaApplet.server
share/gnome/pixmaps/gai-va-icon.png
share/gnome/pixmaps/gai-va/va.png
-lib/xmms/Visualization/spec_plugin.so
@dirrm share/gnome/pixmaps/gai-va
+@cwd %%X11BASE%%
+lib/xmms/Visualization/spec_plugin.so
diff --git a/audio/gaim-festival/Makefile b/audio/gaim-festival/Makefile
index 237c54fa2af5..6ec7c02c41bf 100644
--- a/audio/gaim-festival/Makefile
+++ b/audio/gaim-festival/Makefile
@@ -3,11 +3,11 @@
# Whom: Bruce M Simpson <bms@FreeBSD.org>
#
# $FreeBSD$
-#
+# $MCom: ports/audio/gaim-festival/Makefile,v 1.1 2006/10/04 22:31:17 ahze Exp $
PORTNAME= festival
PORTVERSION= 1.0
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= festival-gaim
@@ -23,7 +23,6 @@ RUN_DEPENDS= festival:${PORTSDIR}/audio/festival \
USE_GNOME= gtk20
USE_GMAKE= yes
-USE_X_PREFIX= yes
USE_AUTOTOOLS= libtool:15:env
MAKE_ENV= LOCALBASE=${LOCALBASE}
diff --git a/audio/gdesklets-cornerxmms/Makefile b/audio/gdesklets-cornerxmms/Makefile
index b87df4b472d1..b55ce531d904 100644
--- a/audio/gdesklets-cornerxmms/Makefile
+++ b/audio/gdesklets-cornerxmms/Makefile
@@ -7,7 +7,7 @@
PORTNAME= cornerxmms
PORTVERSION= 0.1.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio gnome
MASTER_SITES= http://gdesklets.gnomedesktop.org/files/
PKGNAMEPREFIX= gdesklets-
@@ -23,7 +23,7 @@ RUN_DEPENDS= gdesklets:${PORTSDIR}/deskutils/gdesklets \
${PYTHON_SITELIBDIR}/xmms/__init__.py:${PORTSDIR}/audio/py-xmms
USE_PYTHON= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
NAME= CornerXMMS
DATADIR= ${PREFIX}/share/gnome
diff --git a/audio/gdesklets-xmms/Makefile b/audio/gdesklets-xmms/Makefile
index 91a37da7dec3..75d087fc58e6 100644
--- a/audio/gdesklets-xmms/Makefile
+++ b/audio/gdesklets-xmms/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xmms
PORTVERSION= 2
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= audio gnome
MASTER_SITES= http://gdesklets.zencomputer.ca/
PKGNAMEPREFIX= gdesklets-
@@ -22,7 +22,7 @@ DEPRECATED= Disappeared from the internet
EXPIRATION_DATE=2006-12-07
USE_PYTHON= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
NAME= XMMS
WRKSRC= ${WRKDIR}/${NAME}
diff --git a/audio/glame/Makefile b/audio/glame/Makefile
index d8395c4bd7d0..5ffba4fd727c 100644
--- a/audio/glame/Makefile
+++ b/audio/glame/Makefile
@@ -7,7 +7,7 @@
PORTNAME= glame
PORTVERSION= 2.0.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -21,7 +21,7 @@ LIB_DEPENDS= mp3lame.0:${PORTSDIR}/audio/lame \
vorbis.3:${PORTSDIR}/audio/libvorbis \
guile.15:${PORTSDIR}/lang/guile
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GNOME= gnomehack gnomeprefix gnometarget libgnomeui
USE_GCC= 3.4
USE_GETTEXT= yes
diff --git a/audio/gnomoradio/Makefile b/audio/gnomoradio/Makefile
index c26bf55fa1fe..10dc4b399c0a 100644
--- a/audio/gnomoradio/Makefile
+++ b/audio/gnomoradio/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnomoradio
PORTVERSION= 0.15.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= audio net
MASTER_SITES= ${MASTER_SITE_SAVANNAH}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -22,7 +22,7 @@ LIB_DEPENDS= sigc-2.0:${PORTSDIR}/devel/libsigc++20 \
vorbis:${PORTSDIR}/audio/libvorbis \
ao:${PORTSDIR}/audio/libao
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GCC= 3.4+
USE_GNOME= gnomehack gnomeprefix
INSTALLS_SHLIB= yes
diff --git a/audio/gnomoradio/pkg-plist b/audio/gnomoradio/pkg-plist
index c8af2c511080..80747b209dd5 100644
--- a/audio/gnomoradio/pkg-plist
+++ b/audio/gnomoradio/pkg-plist
@@ -47,4 +47,3 @@ share/gnome/pixmaps/gnomoradio/gnomoradio-heart.png
@dirrm include/rainbow
@dirrm include/roboradio
@dirrm share/gnome/pixmaps/gnomoradio
-@dirrmtry sbin
diff --git a/audio/gnowavcut/Makefile b/audio/gnowavcut/Makefile
index 3c75dee63ad5..fca5c5d3897f 100644
--- a/audio/gnowavcut/Makefile
+++ b/audio/gnowavcut/Makefile
@@ -7,14 +7,14 @@
PORTNAME= gnowavcut
PORTVERSION= 0.0.8
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= audio gnome
MASTER_SITES= http://gnowavcut.good-day.net/src/
MAINTAINER= spcoltri@omcl.org
COMMENT= A GNOME/GTK+ based RIFF PCM Wave file splitter
-USE_X_PREFIX= yes
+USE_XLIB= yes
GNU_CONFIGURE= yes
USE_GNOME= gnomehack gnomeprefix gnomelibs
diff --git a/audio/goobox/Makefile b/audio/goobox/Makefile
index a737305b45ce..85263055f0a3 100644
--- a/audio/goobox/Makefile
+++ b/audio/goobox/Makefile
@@ -3,12 +3,12 @@
# Whom: Alexander Nedotsukov <bland@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/audio/goobox/Makefile,v 1.15 2006/04/13 07:52:30 bland Exp $
+# $MCom: ports/audio/goobox/Makefile,v 1.17 2006/07/25 06:20:43 mezz Exp $
#
PORTNAME= goobox
PORTVERSION= 0.9.93
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= audio gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -19,7 +19,7 @@ COMMENT= CD player and ripper for GNOME Desktop environment
RUN_DEPENDS= cddb-slave2-properties:${PORTSDIR}/audio/gnome-media
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GETTEXT= yes
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/audio/goobox/pkg-plist b/audio/goobox/pkg-plist
index a49a45045d1f..a006a0d2afce 100644
--- a/audio/goobox/pkg-plist
+++ b/audio/goobox/pkg-plist
@@ -44,3 +44,25 @@ share/locale/zh_TW/LC_MESSAGES/goobox.mo
@dirrm share/gnome/help/goobox
@dirrm share/gnome/goobox/glade
@dirrm share/gnome/goobox
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/no/LC_MESSAGES
+@dirrmtry share/locale/no
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
diff --git a/audio/gqradio/Makefile b/audio/gqradio/Makefile
index 91747a62b53d..85f9047e93ec 100644
--- a/audio/gqradio/Makefile
+++ b/audio/gqradio/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gqradio
PORTVERSION= 1.9.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=gqmpeg
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=gqmpeg
MAINTAINER= stefan.jahn@nemesis-sektor.de
COMMENT= GTK2 based FM tuner
-USE_X_PREFIX= yes
+USE_XLIB= yes
GNU_CONFIGURE= yes
USE_GNOME= gtk20 gnomehack gnomeprefix
diff --git a/audio/grip/Makefile b/audio/grip/Makefile
index 63065c8b67c2..7f6b7c578dcd 100644
--- a/audio/grip/Makefile
+++ b/audio/grip/Makefile
@@ -7,7 +7,7 @@
PORTNAME= grip
PORTVERSION= 3.2.0
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -19,7 +19,7 @@ LIB_DEPENDS= id3-3.8.3:${PORTSDIR}/audio/id3lib \
curl.3:${PORTSDIR}/ftp/curl
PATCH_DEPENDS= iconv:${PORTSDIR}/converters/libiconv
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GNOME= gnomehack gnomeprefix gnometarget libgnomeui vte
USE_GMAKE= yes
USE_GETTEXT= yes
diff --git a/audio/grip/pkg-plist b/audio/grip/pkg-plist
index 3f0e1ce4d3d8..d79a9f8ef3f8 100644
--- a/audio/grip/pkg-plist
+++ b/audio/grip/pkg-plist
@@ -63,7 +63,17 @@ share/locale/ru/LC_MESSAGES/grip-2.2.mo
share/locale/zh_CN/LC_MESSAGES/grip-2.2.mo
share/locale/zh_HK/LC_MESSAGES/grip-2.2.mo
share/locale/zh_TW/LC_MESSAGES/grip-2.2.mo
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
@dirrm share/gnome/help/grip/C
@dirrm share/gnome/help/grip
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
diff --git a/audio/gspeakers/Makefile b/audio/gspeakers/Makefile
index 095841c30d6b..a4a27a7b9101 100644
--- a/audio/gspeakers/Makefile
+++ b/audio/gspeakers/Makefile
@@ -6,7 +6,7 @@
PORTNAME= gspeakers
PORTVERSION= 0.11
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -16,7 +16,7 @@ COMMENT= Gnome-based loudspeaker design program
LIB_DEPENDS= gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GCC= 3.4
USE_GNOME= gnomeprefix gnometarget libxml2
USE_GMAKE= yes
diff --git a/audio/jamboree/Makefile b/audio/jamboree/Makefile
index cf3714c98175..5e3e1cf69e54 100644
--- a/audio/jamboree/Makefile
+++ b/audio/jamboree/Makefile
@@ -7,7 +7,7 @@
PORTNAME= jamboree
PORTVERSION= 0.5
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= audio gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION}
@@ -18,14 +18,14 @@ COMMENT= A simple GNOME music player
LIB_DEPENDS= gdbm.3:${PORTSDIR}/databases/gdbm
USE_BZIP2= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GNOME= gnomeprefix intlhack gnomehack libgnomeui libglade2
USE_GSTREAMER80= vorbis mad gconf
GNU_CONFIGURE= yes
USE_GMAKE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
- GST_INSPECT="${X11BASE}/bin/gst-inspect-0.8"
+ GST_INSPECT="${LOCALBASE}/bin/gst-inspect-0.8"
GCONF_SCHEMAS= jamboree.schemas
post-patch:
diff --git a/audio/jamboree/pkg-plist b/audio/jamboree/pkg-plist
index 3c3f01bcf2c6..650e57727f39 100644
--- a/audio/jamboree/pkg-plist
+++ b/audio/jamboree/pkg-plist
@@ -38,3 +38,15 @@ share/locale/sr/LC_MESSAGES/jamboree.mo
share/locale/sr@Latn/LC_MESSAGES/jamboree.mo
share/locale/sv/LC_MESSAGES/jamboree.mo
@dirrm share/gnome/jamboree
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/no/LC_MESSAGES
+@dirrmtry share/locale/no
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
diff --git a/audio/lindele/Makefile b/audio/lindele/Makefile
index 28441e7be43c..1583d23e465f 100644
--- a/audio/lindele/Makefile
+++ b/audio/lindele/Makefile
@@ -7,7 +7,7 @@
PORTNAME= lindele
PORTVERSION= 0.1.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= audio
MASTER_SITES= http://download.gna.org/${PORTNAME}/
@@ -18,7 +18,7 @@ RUN_DEPENDS= musicbox-tag-editor:${PORTSDIR}/audio/musicbox-tag-editor
LIB_DEPENDS= vorbis:${PORTSDIR}/audio/libvorbis \
tag:${PORTSDIR}/audio/taglib
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GNOME= gnomehack gnomeprefix libgnomeui
USE_GSTREAMER80= gconf
GNU_CONFIGURE= yes
diff --git a/audio/liteamp/Makefile b/audio/liteamp/Makefile
index 237809f8604e..69e9d71458bf 100644
--- a/audio/liteamp/Makefile
+++ b/audio/liteamp/Makefile
@@ -6,7 +6,7 @@
PORTNAME= liteamp
PORTVERSION= 0.2.3.2
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= audio gnome
MASTER_SITES= http://kldp.net/frs/download.php/547/
@@ -17,7 +17,7 @@ LIB_DEPENDS= ao.3:${PORTSDIR}/audio/libao \
mad.2:${PORTSDIR}/audio/mad \
vorbisfile.4:${PORTSDIR}/audio/libvorbis
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GMAKE= yes
USE_GNOME= gnomehack libgnomeui gnomeprefix
.ifndef WITHOUT_NLS
diff --git a/audio/liteamp/pkg-plist b/audio/liteamp/pkg-plist
index 613d7b7761b0..7faf25930cb9 100644
--- a/audio/liteamp/pkg-plist
+++ b/audio/liteamp/pkg-plist
@@ -29,3 +29,5 @@ share/gnome/pixmaps/liteamp/vol_mute.png
share/gnome/pixmaps/liteamp/vol_up.png
share/gnome/applications/liteamp.desktop
@dirrm share/gnome/pixmaps/liteamp
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
diff --git a/audio/marlin/Makefile b/audio/marlin/Makefile
index bafd9cdcdcb1..f7a94fe8070f 100644
--- a/audio/marlin/Makefile
+++ b/audio/marlin/Makefile
@@ -6,7 +6,7 @@
PORTNAME= marlin
PORTVERSION= 0.9
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -17,7 +17,9 @@ COMMENT= Sample editor for GNOME 2 using Gstreamer backend
LIB_DEPENDS= musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz \
uuid.1:${PORTSDIR}/misc/e2fsprogs-libuuid
-USE_X_PREFIX= yes
+BROKEN= does not build with new nautilus-cd-burner
+
+USE_XLIB= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack gnometarget intlhack libgnomeui nautiluscdburner
USE_GSTREAMER80= flac gconf mad vorbis
diff --git a/audio/marlin/pkg-plist b/audio/marlin/pkg-plist
index 086b159bb394..b5e9fbd59d56 100644
--- a/audio/marlin/pkg-plist
+++ b/audio/marlin/pkg-plist
@@ -114,3 +114,21 @@ share/locale/zh_CN/LC_MESSAGES/marlin.mo
@dirrm share/gnome/help/marlin/C
@dirrm share/gnome/help/marlin
@dirrm include/libmarlin
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/no/LC_MESSAGES
+@dirrmtry share/locale/no
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
diff --git a/audio/muine/Makefile b/audio/muine/Makefile
index cccddf4ef1aa..358073d66ab1 100644
--- a/audio/muine/Makefile
+++ b/audio/muine/Makefile
@@ -8,6 +8,7 @@
PORTNAME= muine
PORTVERSION= 0.8.5
+PORTREVISION= 2
CATEGORIES= audio gnome
MASTER_SITES= http://muine-player.org/releases/
@@ -26,7 +27,7 @@ RUN_DEPENDS= gapi2-fixup:${PORTSDIR}/x11-toolkits/gtk-sharp20 \
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack intltool libgnomeui
-USE_X_PREFIX= yes
+USE_XLIB= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/audio/musicbox-tag-editor/Makefile b/audio/musicbox-tag-editor/Makefile
index 0a24e05efdaa..b28ec8eb0a0d 100644
--- a/audio/musicbox-tag-editor/Makefile
+++ b/audio/musicbox-tag-editor/Makefile
@@ -7,7 +7,7 @@
PORTNAME= musicbox-tag-editor
PORTVERSION= 0.2.3
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= musicbox
@@ -18,7 +18,7 @@ COMMENT= A simple GTK+ audio tag editor
LIB_DEPENDS= tag:${PORTSDIR}/audio/taglib
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GNOME= gnomehack gnomeprefix libglade2
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/audio/paman/Makefile b/audio/paman/Makefile
index c40bb9b23d42..e379c0446fa7 100644
--- a/audio/paman/Makefile
+++ b/audio/paman/Makefile
@@ -7,7 +7,7 @@
PORTNAME= paman
PORTVERSION= 0.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio
MASTER_SITES= http://0pointer.de/lennart/projects/paman/
@@ -20,7 +20,7 @@ LIB_DEPENDS= glademm-2.4.1:${PORTSDIR}/devel/libglademm24 \
USE_GCC= 3.4
GNU_CONFIGURE= yes
USE_GNOME= gnomeprefix gnomehack
-USE_X_PREFIX= yes
+USE_XLIB= yes
CONFIGURE_ARGS= --disable-lynx
CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" \
LDFLAGS="${PTHREAD_LIBS}"
diff --git a/audio/rhythmbox-devel/Makefile b/audio/rhythmbox-devel/Makefile
index af90b8131666..d7c190516e21 100644
--- a/audio/rhythmbox-devel/Makefile
+++ b/audio/rhythmbox-devel/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/audio/rhythmbox/Makefile,v 1.54 2006/04/25 17:52:32 marcus Exp $
+# $MCom: ports/audio/rhythmbox/Makefile,v 1.67 2006/10/12 19:04:47 marcus Exp $
#
PORTNAME= rhythmbox
-PORTVERSION= 0.9.5
+PORTVERSION= 0.9.6
PORTREVISION= 1
CATEGORIES= audio gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
@@ -15,18 +15,18 @@ MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.9
DIST_SUBDIR= gnome2
MAINTAINER= marcus@FreeBSD.org
-COMMENT= Audio player for the Gnome 2 desktop environment
+COMMENT= Audio player for the GNOME 2 desktop environment
LIB_DEPENDS= musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz \
id3tag.0:${PORTSDIR}/audio/libid3tag \
- totem-plparser.2:${PORTSDIR}/multimedia/totem-gstreamer \
- dbus-1.2:${PORTSDIR}/devel/dbus \
+ totem-plparser.1:${PORTSDIR}/multimedia/totem-gstreamer \
+ dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
sexy.2:${PORTSDIR}/x11-toolkits/libsexy \
soup-2.2.8:${PORTSDIR}/devel/libsoup \
gnome-media-profiles.0:${PORTSDIR}/audio/gnome-media
USE_BZIP2= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GETTEXT= yes
INSTALLS_OMF= yes
USE_GMAKE= yes
@@ -42,11 +42,12 @@ CONFIGURE_ENV= LIBS="-lm" \
GCONF_SCHEMAS= rhythmbox.schemas
-OPTIONS= IPOD "Enable iPod support" off \
- DAAP "Enable iTunes music sharing" off \
+OPTIONS= DAAP "Enable iTunes music sharing" off \
+ IPOD "Enable iPod support" on \
FAAD "Enable FAAD decoder support" off \
NOTIFY "Enable libnotify support" on \
- VORBIS "Enable Ogg/Vorbis support" on
+ VORBIS "Enable Ogg/Vorbis support" on \
+ GDA "Enable GDA database storage" off
.include <bsd.port.pre.mk>
@@ -54,10 +55,6 @@ OPTIONS= IPOD "Enable iPod support" off \
BROKEN= Does not build on 4.X
.endif
-.ifdef (WITH_IPOD)
-CONFIGURE_ARGS+= --enable-ipod
-.endif
-
.if !defined(WITHOUT_VORBIS)
USE_GSTREAMER+= vorbis
.else
@@ -68,6 +65,13 @@ CONFIGURE_ARGS+= --disable-vorbis --disable-vorbistest
USE_GSTREAMER+= faad
.endif
+.if defined(WITH_GDA)
+USE_GNOME+= libgda2
+CONFIGURE_ARGS+=--with-database=libgda
+.else
+CONFIGURE_ARGS+=--with-database=tree
+.endif
+
.if defined(WITH_DAAP)
CONFIGURE_ARGS+= --enable-daap --with-mdns=avahi
LIB_DEPENDS+= avahi-client:${PORTSDIR}/net/avahi
@@ -95,4 +99,13 @@ CONFIGURE_ARGS+=--disable-python
PLIST_SUB+= PYTHON="@comment "
.endif
+.if !defined(WITHOUT_IPOD)
+LIB_DEPENDS+= gpod.400:${PORTSDIR}/audio/libgpod
+CONFIGURE_ARGS+=--with-ipod
+PLIST_SUB+= IPOD=""
+.else
+CONFIGURE_ARGS+=--without-ipod
+PLIST_SUB+= IPOD="@comment "
+.endif
+
.include <bsd.port.post.mk>
diff --git a/audio/rhythmbox-devel/distinfo b/audio/rhythmbox-devel/distinfo
index 8b33c6d1a079..f05070cb9377 100644
--- a/audio/rhythmbox-devel/distinfo
+++ b/audio/rhythmbox-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/rhythmbox-0.9.5.tar.bz2) = ff55e1db114321b7bdd6e21df1879367
-SHA256 (gnome2/rhythmbox-0.9.5.tar.bz2) = 63607430da44df029b9b82d43cea887b0217c2e058432be65e5a3b5fa8baba43
-SIZE (gnome2/rhythmbox-0.9.5.tar.bz2) = 2429543
+MD5 (gnome2/rhythmbox-0.9.6.tar.bz2) = 805459eafd670b18c663ba478ad2ebd4
+SHA256 (gnome2/rhythmbox-0.9.6.tar.bz2) = fe73b49d9008a9b487c93b5d4d99aa34350b87fde2c0978a6f126fdef3126973
+SIZE (gnome2/rhythmbox-0.9.6.tar.bz2) = 3129839
diff --git a/audio/rhythmbox-devel/pkg-plist b/audio/rhythmbox-devel/pkg-plist
index 6a4564ee7f35..a3f756509f1b 100644
--- a/audio/rhythmbox-devel/pkg-plist
+++ b/audio/rhythmbox-devel/pkg-plist
@@ -1,37 +1,55 @@
bin/rhythmbox
bin/rhythmbox-client
-%%PYTHON%%lib/rhythmbox/plugins/Loader.py
-%%PYTHON%%lib/rhythmbox/plugins/Loader.pyc
-%%PYTHON%%lib/rhythmbox/plugins/Loader.pyo
-%%PYTHON%%lib/rhythmbox/plugins/artdisplay.rb-plugin
%%PYTHON%%lib/rhythmbox/plugins/artdisplay/AmazonCoverArtSearch.py
%%PYTHON%%lib/rhythmbox/plugins/artdisplay/AmazonCoverArtSearch.pyc
%%PYTHON%%lib/rhythmbox/plugins/artdisplay/AmazonCoverArtSearch.pyo
%%PYTHON%%lib/rhythmbox/plugins/artdisplay/CoverArtDatabase.py
%%PYTHON%%lib/rhythmbox/plugins/artdisplay/CoverArtDatabase.pyc
%%PYTHON%%lib/rhythmbox/plugins/artdisplay/CoverArtDatabase.pyo
-%%PYTHON%%lib/rhythmbox/plugins/artdisplay/Loader.py
-%%PYTHON%%lib/rhythmbox/plugins/artdisplay/Loader.pyc
-%%PYTHON%%lib/rhythmbox/plugins/artdisplay/Loader.pyo
+%%PYTHON%%lib/rhythmbox/plugins/artdisplay/LocalCoverArtSearch.py
+%%PYTHON%%lib/rhythmbox/plugins/artdisplay/LocalCoverArtSearch.pyc
+%%PYTHON%%lib/rhythmbox/plugins/artdisplay/LocalCoverArtSearch.pyo
+%%PYTHON%%lib/rhythmbox/plugins/artdisplay/artdisplay.rb-plugin
%%PYTHON%%lib/rhythmbox/plugins/artdisplay/__init__.py
%%PYTHON%%lib/rhythmbox/plugins/artdisplay/__init__.pyc
%%PYTHON%%lib/rhythmbox/plugins/artdisplay/__init__.pyo
-lib/rhythmbox/plugins/audioscrobbler.rb-plugin
-lib/rhythmbox/plugins/generic-player.rb-plugin
-lib/rhythmbox/plugins/libaudioscrobbler.a
-lib/rhythmbox/plugins/libaudioscrobbler.la
-lib/rhythmbox/plugins/libaudioscrobbler.so
-lib/rhythmbox/plugins/libgeneric-player.a
-lib/rhythmbox/plugins/libgeneric-player.la
-lib/rhythmbox/plugins/libgeneric-player.so
-%%PYTHON%%lib/rhythmbox/plugins/lyrics.py
-%%PYTHON%%lib/rhythmbox/plugins/lyrics.pyc
-%%PYTHON%%lib/rhythmbox/plugins/lyrics.pyo
-%%PYTHON%%lib/rhythmbox/plugins/lyrics.rb-plugin
-%%PYTHON%%lib/rhythmbox/plugins/pythonconsole.py
-%%PYTHON%%lib/rhythmbox/plugins/pythonconsole.pyc
-%%PYTHON%%lib/rhythmbox/plugins/pythonconsole.pyo
-%%PYTHON%%lib/rhythmbox/plugins/pythonconsole.rb-plugin
+lib/rhythmbox/plugins/audiocd.rb-plugin
+lib/rhythmbox/plugins/audioscrobbler/audioscrobbler.rb-plugin
+lib/rhythmbox/plugins/audioscrobbler/libaudioscrobbler.a
+lib/rhythmbox/plugins/audioscrobbler/libaudioscrobbler.la
+lib/rhythmbox/plugins/audioscrobbler/libaudioscrobbler.so
+lib/rhythmbox/plugins/cd-recorder/cd-recorder.rb-plugin
+lib/rhythmbox/plugins/cd-recorder/libcd-recorder.a
+lib/rhythmbox/plugins/cd-recorder/libcd-recorder.la
+lib/rhythmbox/plugins/cd-recorder/libcd-recorder.so
+lib/rhythmbox/plugins/generic-player/generic-player.rb-plugin
+lib/rhythmbox/plugins/generic-player/libgeneric-player.a
+lib/rhythmbox/plugins/generic-player/libgeneric-player.la
+lib/rhythmbox/plugins/generic-player/libgeneric-player.so
+%%IPOD%%lib/rhythmbox/plugins/ipod/ipod.rb-plugin
+%%IPOD%%lib/rhythmbox/plugins/ipod/libipod.a
+%%IPOD%%lib/rhythmbox/plugins/ipod/libipod.la
+%%IPOD%%lib/rhythmbox/plugins/ipod/libipod.so
+lib/rhythmbox/plugins/libaudiocd.a
+lib/rhythmbox/plugins/libaudiocd.la
+lib/rhythmbox/plugins/libaudiocd.so
+%%PYTHON%%lib/rhythmbox/plugins/lyrics/lyrics.py
+%%PYTHON%%lib/rhythmbox/plugins/lyrics/lyrics.pyc
+%%PYTHON%%lib/rhythmbox/plugins/lyrics/lyrics.pyo
+%%PYTHON%%lib/rhythmbox/plugins/lyrics/lyrics.rb-plugin
+%%PYTHON%%lib/rhythmbox/plugins/python-console/pythonconsole.py
+%%PYTHON%%lib/rhythmbox/plugins/python-console/pythonconsole.pyc
+%%PYTHON%%lib/rhythmbox/plugins/python-console/pythonconsole.pyo
+%%PYTHON%%lib/rhythmbox/plugins/python-console/pythonconsole.rb-plugin
+%%PYTHON%%lib/rhythmbox/plugins/rb/Coroutine.py
+%%PYTHON%%lib/rhythmbox/plugins/rb/Coroutine.pyc
+%%PYTHON%%lib/rhythmbox/plugins/rb/Coroutine.pyo
+%%PYTHON%%lib/rhythmbox/plugins/rb/Loader.py
+%%PYTHON%%lib/rhythmbox/plugins/rb/Loader.pyc
+%%PYTHON%%lib/rhythmbox/plugins/rb/Loader.pyo
+%%PYTHON%%lib/rhythmbox/plugins/rb/__init__.py
+%%PYTHON%%lib/rhythmbox/plugins/rb/__init__.pyc
+%%PYTHON%%lib/rhythmbox/plugins/rb/__init__.pyo
libexec/rhythmbox-metadata
share/dbus-1/services/org.gnome.Rhythmbox.service
%%DOCSDIR%%/ch01.html
@@ -110,7 +128,6 @@ share/dbus-1/services/org.gnome.Rhythmbox.service
%%DOCSDIR%%/right.png
%%DOCSDIR%%/style.css
%%DOCSDIR%%/up.png
-share/gnome/application-registry/rhythmbox.applications
share/gnome/applications/rhythmbox.desktop
share/gnome/help/rhythmbox/C/fdl-appendix.xml
share/gnome/help/rhythmbox/C/figures/rb-iradio-main.png
@@ -198,7 +215,6 @@ share/gnome/help/rhythmbox/zh_CN/figures/rb-volume-changer.png
share/gnome/help/rhythmbox/zh_CN/figures/rb-window-small.png
share/gnome/help/rhythmbox/zh_CN/figures/rb-window.png
share/gnome/help/rhythmbox/zh_CN/rhythmbox.xml
-share/gnome/mime-info/rhythmbox.keys
share/gnome/omf/rhythmbox/rhythmbox-C.omf
share/gnome/omf/rhythmbox/rhythmbox-es.omf
share/gnome/omf/rhythmbox/rhythmbox-fr.omf
@@ -292,8 +308,6 @@ share/locale/vi/LC_MESSAGES/rhythmbox.mo
share/locale/zh_CN/LC_MESSAGES/rhythmbox.mo
share/locale/zh_HK/LC_MESSAGES/rhythmbox.mo
share/locale/zh_TW/LC_MESSAGES/rhythmbox.mo
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
@dirrm share/gnome/rhythmbox/glade
@dirrm share/gnome/rhythmbox/art
@dirrm share/gnome/rhythmbox
@@ -312,6 +326,49 @@ share/locale/zh_TW/LC_MESSAGES/rhythmbox.mo
@dirrm share/gnome/help/rhythmbox/C
@dirrm share/gnome/help/rhythmbox
@dirrm %%DOCSDIR%%
-@dirrm lib/rhythmbox/plugins/artdisplay
+%%PYTHON%%@dirrm lib/rhythmbox/plugins/rb
+%%PYTHON%%@dirrm lib/rhythmbox/plugins/python-console
+%%PYTHON%%@dirrm lib/rhythmbox/plugins/lyrics
+%%IPOD%%@dirrm lib/rhythmbox/plugins/ipod
+@dirrm lib/rhythmbox/plugins/generic-player
+@dirrm lib/rhythmbox/plugins/cd-recorder
+@dirrm lib/rhythmbox/plugins/audioscrobbler
+%%PYTHON%%@dirrm lib/rhythmbox/plugins/artdisplay
@dirrm lib/rhythmbox/plugins
@dirrm lib/rhythmbox
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile
index af90b8131666..d7c190516e21 100644
--- a/audio/rhythmbox/Makefile
+++ b/audio/rhythmbox/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/audio/rhythmbox/Makefile,v 1.54 2006/04/25 17:52:32 marcus Exp $
+# $MCom: ports/audio/rhythmbox/Makefile,v 1.67 2006/10/12 19:04:47 marcus Exp $
#
PORTNAME= rhythmbox
-PORTVERSION= 0.9.5
+PORTVERSION= 0.9.6
PORTREVISION= 1
CATEGORIES= audio gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
@@ -15,18 +15,18 @@ MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.9
DIST_SUBDIR= gnome2
MAINTAINER= marcus@FreeBSD.org
-COMMENT= Audio player for the Gnome 2 desktop environment
+COMMENT= Audio player for the GNOME 2 desktop environment
LIB_DEPENDS= musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz \
id3tag.0:${PORTSDIR}/audio/libid3tag \
- totem-plparser.2:${PORTSDIR}/multimedia/totem-gstreamer \
- dbus-1.2:${PORTSDIR}/devel/dbus \
+ totem-plparser.1:${PORTSDIR}/multimedia/totem-gstreamer \
+ dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
sexy.2:${PORTSDIR}/x11-toolkits/libsexy \
soup-2.2.8:${PORTSDIR}/devel/libsoup \
gnome-media-profiles.0:${PORTSDIR}/audio/gnome-media
USE_BZIP2= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GETTEXT= yes
INSTALLS_OMF= yes
USE_GMAKE= yes
@@ -42,11 +42,12 @@ CONFIGURE_ENV= LIBS="-lm" \
GCONF_SCHEMAS= rhythmbox.schemas
-OPTIONS= IPOD "Enable iPod support" off \
- DAAP "Enable iTunes music sharing" off \
+OPTIONS= DAAP "Enable iTunes music sharing" off \
+ IPOD "Enable iPod support" on \
FAAD "Enable FAAD decoder support" off \
NOTIFY "Enable libnotify support" on \
- VORBIS "Enable Ogg/Vorbis support" on
+ VORBIS "Enable Ogg/Vorbis support" on \
+ GDA "Enable GDA database storage" off
.include <bsd.port.pre.mk>
@@ -54,10 +55,6 @@ OPTIONS= IPOD "Enable iPod support" off \
BROKEN= Does not build on 4.X
.endif
-.ifdef (WITH_IPOD)
-CONFIGURE_ARGS+= --enable-ipod
-.endif
-
.if !defined(WITHOUT_VORBIS)
USE_GSTREAMER+= vorbis
.else
@@ -68,6 +65,13 @@ CONFIGURE_ARGS+= --disable-vorbis --disable-vorbistest
USE_GSTREAMER+= faad
.endif
+.if defined(WITH_GDA)
+USE_GNOME+= libgda2
+CONFIGURE_ARGS+=--with-database=libgda
+.else
+CONFIGURE_ARGS+=--with-database=tree
+.endif
+
.if defined(WITH_DAAP)
CONFIGURE_ARGS+= --enable-daap --with-mdns=avahi
LIB_DEPENDS+= avahi-client:${PORTSDIR}/net/avahi
@@ -95,4 +99,13 @@ CONFIGURE_ARGS+=--disable-python
PLIST_SUB+= PYTHON="@comment "
.endif
+.if !defined(WITHOUT_IPOD)
+LIB_DEPENDS+= gpod.400:${PORTSDIR}/audio/libgpod
+CONFIGURE_ARGS+=--with-ipod
+PLIST_SUB+= IPOD=""
+.else
+CONFIGURE_ARGS+=--without-ipod
+PLIST_SUB+= IPOD="@comment "
+.endif
+
.include <bsd.port.post.mk>
diff --git a/audio/rhythmbox/distinfo b/audio/rhythmbox/distinfo
index 8b33c6d1a079..f05070cb9377 100644
--- a/audio/rhythmbox/distinfo
+++ b/audio/rhythmbox/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/rhythmbox-0.9.5.tar.bz2) = ff55e1db114321b7bdd6e21df1879367
-SHA256 (gnome2/rhythmbox-0.9.5.tar.bz2) = 63607430da44df029b9b82d43cea887b0217c2e058432be65e5a3b5fa8baba43
-SIZE (gnome2/rhythmbox-0.9.5.tar.bz2) = 2429543
+MD5 (gnome2/rhythmbox-0.9.6.tar.bz2) = 805459eafd670b18c663ba478ad2ebd4
+SHA256 (gnome2/rhythmbox-0.9.6.tar.bz2) = fe73b49d9008a9b487c93b5d4d99aa34350b87fde2c0978a6f126fdef3126973
+SIZE (gnome2/rhythmbox-0.9.6.tar.bz2) = 3129839
diff --git a/audio/rhythmbox/pkg-plist b/audio/rhythmbox/pkg-plist
index 6a4564ee7f35..a3f756509f1b 100644
--- a/audio/rhythmbox/pkg-plist
+++ b/audio/rhythmbox/pkg-plist
@@ -1,37 +1,55 @@
bin/rhythmbox
bin/rhythmbox-client
-%%PYTHON%%lib/rhythmbox/plugins/Loader.py
-%%PYTHON%%lib/rhythmbox/plugins/Loader.pyc
-%%PYTHON%%lib/rhythmbox/plugins/Loader.pyo
-%%PYTHON%%lib/rhythmbox/plugins/artdisplay.rb-plugin
%%PYTHON%%lib/rhythmbox/plugins/artdisplay/AmazonCoverArtSearch.py
%%PYTHON%%lib/rhythmbox/plugins/artdisplay/AmazonCoverArtSearch.pyc
%%PYTHON%%lib/rhythmbox/plugins/artdisplay/AmazonCoverArtSearch.pyo
%%PYTHON%%lib/rhythmbox/plugins/artdisplay/CoverArtDatabase.py
%%PYTHON%%lib/rhythmbox/plugins/artdisplay/CoverArtDatabase.pyc
%%PYTHON%%lib/rhythmbox/plugins/artdisplay/CoverArtDatabase.pyo
-%%PYTHON%%lib/rhythmbox/plugins/artdisplay/Loader.py
-%%PYTHON%%lib/rhythmbox/plugins/artdisplay/Loader.pyc
-%%PYTHON%%lib/rhythmbox/plugins/artdisplay/Loader.pyo
+%%PYTHON%%lib/rhythmbox/plugins/artdisplay/LocalCoverArtSearch.py
+%%PYTHON%%lib/rhythmbox/plugins/artdisplay/LocalCoverArtSearch.pyc
+%%PYTHON%%lib/rhythmbox/plugins/artdisplay/LocalCoverArtSearch.pyo
+%%PYTHON%%lib/rhythmbox/plugins/artdisplay/artdisplay.rb-plugin
%%PYTHON%%lib/rhythmbox/plugins/artdisplay/__init__.py
%%PYTHON%%lib/rhythmbox/plugins/artdisplay/__init__.pyc
%%PYTHON%%lib/rhythmbox/plugins/artdisplay/__init__.pyo
-lib/rhythmbox/plugins/audioscrobbler.rb-plugin
-lib/rhythmbox/plugins/generic-player.rb-plugin
-lib/rhythmbox/plugins/libaudioscrobbler.a
-lib/rhythmbox/plugins/libaudioscrobbler.la
-lib/rhythmbox/plugins/libaudioscrobbler.so
-lib/rhythmbox/plugins/libgeneric-player.a
-lib/rhythmbox/plugins/libgeneric-player.la
-lib/rhythmbox/plugins/libgeneric-player.so
-%%PYTHON%%lib/rhythmbox/plugins/lyrics.py
-%%PYTHON%%lib/rhythmbox/plugins/lyrics.pyc
-%%PYTHON%%lib/rhythmbox/plugins/lyrics.pyo
-%%PYTHON%%lib/rhythmbox/plugins/lyrics.rb-plugin
-%%PYTHON%%lib/rhythmbox/plugins/pythonconsole.py
-%%PYTHON%%lib/rhythmbox/plugins/pythonconsole.pyc
-%%PYTHON%%lib/rhythmbox/plugins/pythonconsole.pyo
-%%PYTHON%%lib/rhythmbox/plugins/pythonconsole.rb-plugin
+lib/rhythmbox/plugins/audiocd.rb-plugin
+lib/rhythmbox/plugins/audioscrobbler/audioscrobbler.rb-plugin
+lib/rhythmbox/plugins/audioscrobbler/libaudioscrobbler.a
+lib/rhythmbox/plugins/audioscrobbler/libaudioscrobbler.la
+lib/rhythmbox/plugins/audioscrobbler/libaudioscrobbler.so
+lib/rhythmbox/plugins/cd-recorder/cd-recorder.rb-plugin
+lib/rhythmbox/plugins/cd-recorder/libcd-recorder.a
+lib/rhythmbox/plugins/cd-recorder/libcd-recorder.la
+lib/rhythmbox/plugins/cd-recorder/libcd-recorder.so
+lib/rhythmbox/plugins/generic-player/generic-player.rb-plugin
+lib/rhythmbox/plugins/generic-player/libgeneric-player.a
+lib/rhythmbox/plugins/generic-player/libgeneric-player.la
+lib/rhythmbox/plugins/generic-player/libgeneric-player.so
+%%IPOD%%lib/rhythmbox/plugins/ipod/ipod.rb-plugin
+%%IPOD%%lib/rhythmbox/plugins/ipod/libipod.a
+%%IPOD%%lib/rhythmbox/plugins/ipod/libipod.la
+%%IPOD%%lib/rhythmbox/plugins/ipod/libipod.so
+lib/rhythmbox/plugins/libaudiocd.a
+lib/rhythmbox/plugins/libaudiocd.la
+lib/rhythmbox/plugins/libaudiocd.so
+%%PYTHON%%lib/rhythmbox/plugins/lyrics/lyrics.py
+%%PYTHON%%lib/rhythmbox/plugins/lyrics/lyrics.pyc
+%%PYTHON%%lib/rhythmbox/plugins/lyrics/lyrics.pyo
+%%PYTHON%%lib/rhythmbox/plugins/lyrics/lyrics.rb-plugin
+%%PYTHON%%lib/rhythmbox/plugins/python-console/pythonconsole.py
+%%PYTHON%%lib/rhythmbox/plugins/python-console/pythonconsole.pyc
+%%PYTHON%%lib/rhythmbox/plugins/python-console/pythonconsole.pyo
+%%PYTHON%%lib/rhythmbox/plugins/python-console/pythonconsole.rb-plugin
+%%PYTHON%%lib/rhythmbox/plugins/rb/Coroutine.py
+%%PYTHON%%lib/rhythmbox/plugins/rb/Coroutine.pyc
+%%PYTHON%%lib/rhythmbox/plugins/rb/Coroutine.pyo
+%%PYTHON%%lib/rhythmbox/plugins/rb/Loader.py
+%%PYTHON%%lib/rhythmbox/plugins/rb/Loader.pyc
+%%PYTHON%%lib/rhythmbox/plugins/rb/Loader.pyo
+%%PYTHON%%lib/rhythmbox/plugins/rb/__init__.py
+%%PYTHON%%lib/rhythmbox/plugins/rb/__init__.pyc
+%%PYTHON%%lib/rhythmbox/plugins/rb/__init__.pyo
libexec/rhythmbox-metadata
share/dbus-1/services/org.gnome.Rhythmbox.service
%%DOCSDIR%%/ch01.html
@@ -110,7 +128,6 @@ share/dbus-1/services/org.gnome.Rhythmbox.service
%%DOCSDIR%%/right.png
%%DOCSDIR%%/style.css
%%DOCSDIR%%/up.png
-share/gnome/application-registry/rhythmbox.applications
share/gnome/applications/rhythmbox.desktop
share/gnome/help/rhythmbox/C/fdl-appendix.xml
share/gnome/help/rhythmbox/C/figures/rb-iradio-main.png
@@ -198,7 +215,6 @@ share/gnome/help/rhythmbox/zh_CN/figures/rb-volume-changer.png
share/gnome/help/rhythmbox/zh_CN/figures/rb-window-small.png
share/gnome/help/rhythmbox/zh_CN/figures/rb-window.png
share/gnome/help/rhythmbox/zh_CN/rhythmbox.xml
-share/gnome/mime-info/rhythmbox.keys
share/gnome/omf/rhythmbox/rhythmbox-C.omf
share/gnome/omf/rhythmbox/rhythmbox-es.omf
share/gnome/omf/rhythmbox/rhythmbox-fr.omf
@@ -292,8 +308,6 @@ share/locale/vi/LC_MESSAGES/rhythmbox.mo
share/locale/zh_CN/LC_MESSAGES/rhythmbox.mo
share/locale/zh_HK/LC_MESSAGES/rhythmbox.mo
share/locale/zh_TW/LC_MESSAGES/rhythmbox.mo
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
@dirrm share/gnome/rhythmbox/glade
@dirrm share/gnome/rhythmbox/art
@dirrm share/gnome/rhythmbox
@@ -312,6 +326,49 @@ share/locale/zh_TW/LC_MESSAGES/rhythmbox.mo
@dirrm share/gnome/help/rhythmbox/C
@dirrm share/gnome/help/rhythmbox
@dirrm %%DOCSDIR%%
-@dirrm lib/rhythmbox/plugins/artdisplay
+%%PYTHON%%@dirrm lib/rhythmbox/plugins/rb
+%%PYTHON%%@dirrm lib/rhythmbox/plugins/python-console
+%%PYTHON%%@dirrm lib/rhythmbox/plugins/lyrics
+%%IPOD%%@dirrm lib/rhythmbox/plugins/ipod
+@dirrm lib/rhythmbox/plugins/generic-player
+@dirrm lib/rhythmbox/plugins/cd-recorder
+@dirrm lib/rhythmbox/plugins/audioscrobbler
+%%PYTHON%%@dirrm lib/rhythmbox/plugins/artdisplay
@dirrm lib/rhythmbox/plugins
@dirrm lib/rhythmbox
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
diff --git a/audio/streamtuner/Makefile b/audio/streamtuner/Makefile
index 51099e273ab0..4f3e990a018c 100644
--- a/audio/streamtuner/Makefile
+++ b/audio/streamtuner/Makefile
@@ -7,7 +7,7 @@
PORTNAME= streamtuner
PORTVERSION= 0.99.99
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= audio www
MASTER_SITES= ${MASTER_SITE_SAVANNAH}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -17,9 +17,9 @@ COMMENT= A GTK+ stream directory browser
BUILD_DEPENDS= scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl
-RUN_DEPENDS= ${X11BASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme
+RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GNOME= gtk20 gnomehack gnomeprefix
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/audio/streamtuner/pkg-plist b/audio/streamtuner/pkg-plist
index 49b9461ba2df..421ec793b11e 100644
--- a/audio/streamtuner/pkg-plist
+++ b/audio/streamtuner/pkg-plist
@@ -108,3 +108,5 @@ share/locale/pt/LC_MESSAGES/streamtuner.mo
%%PYTHON%%@dirrm share/gnome/streamtuner/python/scripts
%%PYTHON%%@dirrm share/gnome/streamtuner/python
@dirrm share/gnome/streamtuner
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
diff --git a/audio/sweep/Makefile b/audio/sweep/Makefile
index d2f7b3bd5f12..063187d2fb3e 100644
--- a/audio/sweep/Makefile
+++ b/audio/sweep/Makefile
@@ -7,6 +7,7 @@
PORTNAME= sweep
PORTVERSION= 0.9.1
+PORTREVISION= 1
CATEGORIES= audio gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/audio/sweep/pkg-plist b/audio/sweep/pkg-plist
index d722fd84f35e..d6afb21593c3 100644
--- a/audio/sweep/pkg-plist
+++ b/audio/sweep/pkg-plist
@@ -44,3 +44,9 @@ share/locale/ru/LC_MESSAGES/sweep.mo
@dirrm include/sweep
@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/en_AU/LC_MESSAGES
+@dirrmtry share/locale/en_AU
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
diff --git a/audio/tagtool/Makefile b/audio/tagtool/Makefile
index 7fd47bfda7c5..10e5abfac6e5 100644
--- a/audio/tagtool/Makefile
+++ b/audio/tagtool/Makefile
@@ -3,11 +3,11 @@
# Whom: Anthony Ginepro <anthony.ginepro@laposte.net>
#
# $FreeBSD$
-#
+# $MCom: ports/audio/tagtool/Makefile,v 1.1 2006/09/30 01:15:37 ahze Exp $
PORTNAME= tagtool
PORTVERSION= 0.12.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -18,8 +18,8 @@ COMMENT= A GNOME MP3/Ogg file tagger
LIB_DEPENDS= id3-3.8.3:${PORTSDIR}/audio/id3lib \
vorbis.3:${PORTSDIR}/audio/libvorbis
-USE_X_PREFIX= yes
-
+USE_XLIB= yes
+USE_GETTEXT= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_GNOME= gnomehack intlhack libglade2 gnomehier
diff --git a/audio/tagtool/pkg-plist b/audio/tagtool/pkg-plist
index 40c77579c65a..57ef492d3f76 100644
--- a/audio/tagtool/pkg-plist
+++ b/audio/tagtool/pkg-plist
@@ -32,3 +32,9 @@ share/locale/ua/LC_MESSAGES/tagtool.mo
@dirrm %%DATADIR%%
@unexec /bin/rmdir %D/share/locale/ua/LC_MESSAGES 2>/dev/null || /usr/bin/true
@unexec /bin/rmdir %D/share/locale/ua 2>/dev/null || /usr/bin/true
+@dirrmtry share/locale/ua/LC_MESSAGES
+@dirrmtry share/locale/ua
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
diff --git a/audio/terminatorx/Makefile b/audio/terminatorx/Makefile
index ed9fd90fa05e..951eb49237cc 100644
--- a/audio/terminatorx/Makefile
+++ b/audio/terminatorx/Makefile
@@ -6,7 +6,7 @@
PORTNAME= terminatorx
PORTVERSION= 3.82
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= audio
MASTER_SITES= http://terminatorx.org/dist/
DISTNAME= terminatorX-${PORTVERSION}
@@ -21,7 +21,7 @@ LIB_DEPENDS= audiofile.0:${PORTSDIR}/audio/libaudiofile \
jack.0:${PORTSDIR}/audio/jack
USE_BZIP2= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
INSTALLS_OMF= yes
USE_GNOME= gnomehack gnomeprefix gnometarget gtk20 libxml2
USE_GMAKE= yes
@@ -72,8 +72,6 @@ post-patch:
's|malloc\.h|stdlib.h|g'
@${GREP} -lR "%%LOCALBASE%%" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e \
's|%%LOCALBASE%%|${LOCALBASE}|g'
- @${GREP} -lR "%%X11BASE%%" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e \
- 's|%%X11BASE%%|${LOCALBASE}|g'
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/src/terminatorX ${PREFIX}/bin
diff --git a/audio/terminatorx/files/patch-src::main.cc b/audio/terminatorx/files/patch-src::main.cc
index 834b59e3ad6f..4b8a777e90f5 100644
--- a/audio/terminatorx/files/patch-src::main.cc
+++ b/audio/terminatorx/files/patch-src::main.cc
@@ -5,7 +5,7 @@
*/
-#define TX_GTKRC "/usr/share/themes/terminatorX/gtk/gtkrc"
-+#define TX_GTKRC "%%X11BASE%%/share/themes/terminatorX/gtk/gtkrc"
++#define TX_GTKRC "%%LOCALBASE%%/share/themes/terminatorX/gtk/gtkrc"
#define BENCH_CYCLES 100000
diff --git a/audio/xfce4-mixer/Makefile b/audio/xfce4-mixer/Makefile
index 9be39bf1e8cd..09341bbed873 100644
--- a/audio/xfce4-mixer/Makefile
+++ b/audio/xfce4-mixer/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-mixer
PORTVERSION= 4.2.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio xfce
MASTER_SITES= http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
http://www.ca-us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
@@ -30,7 +30,6 @@ RUN_DEPENDS= xfce-mcs-manager:${PORTSDIR}/sysutils/xfce4-mcs-manager \
USE_GETTEXT= yes
USE_GNOME= gtk20
-USE_X_PREFIX= yes
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
diff --git a/audio/xfce4-mixer/pkg-plist b/audio/xfce4-mixer/pkg-plist
index c5d75cc62155..b68db9eadb9a 100644
--- a/audio/xfce4-mixer/pkg-plist
+++ b/audio/xfce4-mixer/pkg-plist
@@ -60,9 +60,39 @@ share/locale/zh_TW/LC_MESSAGES/xfce4-mixer.mo
@dirrmtry lib/xfce4/mcs-plugins
@dirrmtry lib/xfce4/panel-plugins
@dirrmtry lib/xfce4
-@dirrmtry share/locale/bn_IN/LC_MESSAGES
-@dirrmtry share/locale/bn_IN
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
@dirrmtry share/locale/nb_NO/LC_MESSAGES
@dirrmtry share/locale/nb_NO
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/hy/LC_MESSAGES
+@dirrmtry share/locale/hy
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be