- Update to 1.5.2

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@6414 df743ca5-7f9a-e211-a948-0013205c9059

4 files changed, 11 insertions, 40 deletions

diff --git a/multimedia/totem/Makefile b/multimedia/totem/Makefile
index 1c863493c..9ef9c5381 100644
--- a/multimedia/totem/Makefile
+++ b/multimedia/totem/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	totem
-PORTVERSION=	1.5.1
+PORTVERSION=	1.5.2
 CATEGORIES=	multimedia gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -27,6 +27,7 @@ USE_GNOME=	gnomeprefix intlhack gnomehack gnomedesktop desktopfileutils \
 		nautiluscdburner ltverhack
 GNOME_DESKTOP_VERSION=2
 WANT_GSTREAMER=	yes
+INSTALLS_ICONS=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool:15
 INSTALLS_SHLIB=	yes
@@ -48,7 +49,7 @@ CONFLICTS?=	totem-gstreamer-[0-9]*
 
 .if defined(WITH_MOZILLA_PLUGIN)
 USE_GECKO=	firefox mozilla seamonkey xulrunner<->firefox firefox-devel<->firefox
-.include "${.CURDIR}/../../www/mozilla/bsd.gecko.mk"
+.include "${PORTSDIR}/www/mozilla/bsd.gecko.mk"
 PLIST_SUB+=	MOZILLA=""
 CONFIGURE_ARGS+=--with-mozilla=${GECKO}
 .else
@@ -58,7 +59,7 @@ CONFIGURE_ARGS+=--disable-mozilla
 
 .if defined(WITH_GSTREAMER)
 CONFIGURE_ARGS+=--enable-gstreamer=yes
-USE_GSTREAMER+=	gnomevfs core gconf hal
+USE_GSTREAMER+=	gnomevfs core gconf hal good
 WITHOUT_DVDNAV=	yes
 PLIST_SUB+=	GSTREAMER=""
 .else
diff --git a/multimedia/totem/distinfo b/multimedia/totem/distinfo
index 6b9297f36..f9c0ce701 100644
--- a/multimedia/totem/distinfo
+++ b/multimedia/totem/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/totem-1.5.1.tar.bz2) = a3fbceb3648dfe97e5de4479b9bb12cc
-SHA256 (gnome2/totem-1.5.1.tar.bz2) = 1562ecf588bd9930c8ccab3270b4821500d3350ec1d47add5b9ecf998ee85bca
-SIZE (gnome2/totem-1.5.1.tar.bz2) = 1696697
+MD5 (gnome2/totem-1.5.2.tar.bz2) = 72bbc885374c6322c0a7106e96dc75c4
+SHA256 (gnome2/totem-1.5.2.tar.bz2) = 56481e40fc2f36705930e1abd99ef917fb9b6a15bbdac7fc1265ca7939e76a0d
+SIZE (gnome2/totem-1.5.2.tar.bz2) = 1670964
diff --git a/multimedia/totem/files/patch-src_totem-disk.c b/multimedia/totem/files/patch-src_totem-disk.c
deleted file mode 100644
index 9d6c22837..000000000
--- a/multimedia/totem/files/patch-src_totem-disk.c
+++ /dev/null
@@ -1,32 +0,0 @@
---- src/plparse/totem-disc.c.orig	Wed May 17 11:23:33 2006
-+++ src/plparse/totem-disc.c	Wed May 17 11:24:00 2006
-@@ -43,7 +43,29 @@
- #include <glib/gi18n.h>
- #include <libgnomevfs/gnome-vfs.h>
- 
-+#ifdef __FreeBSD__
-+#include <sys/cdio.h>
-+#include <sys/disklabel.h>
-+
-+#define CDROM_DRIVE_STATUS      0x5326
-+#define CDROM_DISC_STATUS       0x5327
-+#define CDS_AUDIO               100
-+#define CDS_MIXED               105
-+#define CDS_DATA_1              101
-+#define CDS_DATA_2              102
-+#define CDS_NO_INFO             0       /* if not implemented */
-+#define CDS_NO_DISC             1
-+#define CDS_TRAY_OPEN           2
-+#define CDS_DRIVE_NOT_READY     3
-+#define CDS_DISC_OK             4
-+#define CDS_XA_2_1              103
-+#define CDS_XA_2_2              104
-+#define CDC_DVD                 0x8000
-+#define ENOMEDIUM ENODEV
-+#define CDROM_GET_CAPABILITY CDIOCCLRDEBUG
-+#else
- #include <linux/cdrom.h>
-+#endif
- 
- #include "totem-disc.h"
- 
diff --git a/multimedia/totem/pkg-plist b/multimedia/totem/pkg-plist
index 63d3fb795..d7a9f1fcd 100644
--- a/multimedia/totem/pkg-plist
+++ b/multimedia/totem/pkg-plist
@@ -82,12 +82,10 @@ share/gnome/omf/totem/totem-es.omf
 share/gnome/omf/totem/totem-fr.omf
 share/gnome/omf/totem/totem-ru.omf
 share/gnome/omf/totem/totem-uk.omf
-share/gnome/pixmaps/media-player-48.png
 share/gnome/pixmaps/vanity.png
 share/gnome/totem/filmholes-big-left.png
 share/gnome/totem/filmholes-big-right.png
 share/gnome/totem/filmholes.png
-share/gnome/totem/media-player-48.png
 share/gnome/totem/mozilla-viewer.glade
 share/gnome/totem/playlist-playing.png
 share/gnome/totem/playlist.glade
@@ -107,6 +105,7 @@ share/gnome/totem/totem_logo.png
 share/gnome/totem/uri.glade
 share/gnome/totem/vanity.glade
 share/gnome/totem/vanity.png
+share/icons/hicolor/48x48/apps/media-player-48.png
 share/locale/am/LC_MESSAGES/totem.mo
 share/locale/ar/LC_MESSAGES/totem.mo
 share/locale/az/LC_MESSAGES/totem.mo
@@ -144,6 +143,7 @@ share/locale/ku/LC_MESSAGES/totem.mo
 share/locale/lt/LC_MESSAGES/totem.mo
 share/locale/lv/LC_MESSAGES/totem.mo
 share/locale/ka/LC_MESSAGES/totem.mo
+share/locale/mg/LC_MESSAGES/totem.mo
 share/locale/mk/LC_MESSAGES/totem.mo
 share/locale/ml/LC_MESSAGES/totem.mo
 share/locale/ms/LC_MESSAGES/totem.mo
@@ -176,6 +176,8 @@ share/locale/zh_HK/LC_MESSAGES/totem.mo
 share/locale/zh_TW/LC_MESSAGES/totem.mo
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
+@dirrmtry share/locale/mg/LC_MESSAGES
+@dirrmtry share/locale/mg
 @dirrm share/gnome/totem
 @dirrm share/gnome/omf/totem
 @dirrm share/gnome/help/totem/uk/figures