update to 1.0.2

changes: bugfixes, minor UI improvements

4 files changed, 34 insertions, 31 deletions

diff --git a/multimedia/totem/Makefile.common b/multimedia/totem/Makefile.common
index 9e3ed4615c9..2b474460bda 100644
--- a/multimedia/totem/Makefile.common
+++ b/multimedia/totem/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.2 2005/04/11 21:46:43 tv Exp $
+# $NetBSD: Makefile.common,v 1.3 2005/05/02 16:21:21 drochner Exp $
 #
 
-DISTNAME=	totem-1.0
+DISTNAME=	totem-1.0.2
 CATEGORIES=	multimedia gnome
 MASTER_SITES=	http://www.hadess.net/files/software/totem/
 
diff --git a/multimedia/totem/PLIST b/multimedia/totem/PLIST
index e288ac75897..6f9b118ffd0 100644
--- a/multimedia/totem/PLIST
+++ b/multimedia/totem/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/03/22 16:37:32 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.2 2005/05/02 16:21:21 drochner Exp $
 bin/totem
 bin/totem-video-thumbnailer
 include/totem/1/plparser/totem-disc.h
@@ -8,6 +8,7 @@ lib/libtotem-plparser.la
 lib/nautilus/extensions-1.0/libtotem-properties-page.la
 lib/pkgconfig/totem-plparser.pc
 man/man1/totem.1
+man/man1/totem-video-thumbnailer.1
 share/applications/totem.desktop
 share/gconf/schemas/totem-handlers.schemas
 share/gconf/schemas/totem-video-thumbnail.schemas
@@ -90,6 +91,7 @@ ${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/totem.mo
 ${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/totem.mo
 ${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/totem.mo
 ${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/totem.mo
+${PKGLOCALEDIR}/locale/rw/LC_MESSAGES/totem.mo
 ${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/totem.mo
 ${PKGLOCALEDIR}/locale/sq/LC_MESSAGES/totem.mo
 ${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/totem.mo
@@ -100,6 +102,7 @@ ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/totem.mo
 ${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/totem.mo
 ${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/totem.mo
 ${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/totem.mo
+${PKGLOCALEDIR}/locale/xh/LC_MESSAGES/totem.mo
 ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/totem.mo
 ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/totem.mo
 share/omf/totem/totem-C.omf
diff --git a/multimedia/totem/distinfo b/multimedia/totem/distinfo
index 99ffb3be93d..62b80cd1454 100644
--- a/multimedia/totem/distinfo
+++ b/multimedia/totem/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2005/03/22 16:37:32 jmmv Exp $
+$NetBSD: distinfo,v 1.2 2005/05/02 16:21:21 drochner Exp $
 
-SHA1 (totem-1.0.tar.gz) = 7103b6af04b0e7bfae56b88ec28d5835d4758d22
-RMD160 (totem-1.0.tar.gz) = 7967eb96e20d09ed38474c4f36f8773081cd5238
-Size (totem-1.0.tar.gz) = 2011307 bytes
-SHA1 (patch-aa) = ff7b15fdfd4401dd22162fff1d930a6c851ca121
+SHA1 (totem-1.0.2.tar.gz) = 28ae66fe187dc428f4f413b8d79a937d3f22b049
+RMD160 (totem-1.0.2.tar.gz) = 719d7beabe764a8d3ef60d83bfbebb045364867c
+Size (totem-1.0.2.tar.gz) = 2039980 bytes
+SHA1 (patch-aa) = c71556c9ef50f191d74f9e33a1a9004acf8a79a1
 SHA1 (patch-ab) = 87349c909d689885070fd3d669cfef78898be24a
diff --git a/multimedia/totem/patches/patch-aa b/multimedia/totem/patches/patch-aa
index 55eb7d825dc..5a5182a6972 100644
--- a/multimedia/totem/patches/patch-aa
+++ b/multimedia/totem/patches/patch-aa
@@ -1,11 +1,8 @@
-$NetBSD: patch-aa,v 1.1.1.1 2005/03/22 16:37:32 jmmv Exp $
+$NetBSD: patch-aa,v 1.2 2005/05/02 16:21:21 drochner Exp $
 
-Based on patch from FreeBSD:
-http://www.freebsd.org/cgi/cvsweb.cgi/ports/multimedia/totem/files/patch-src_totem-disk.c
-
---- src/totem-disc.c.orig	2005-03-21 09:37:06.000000000 +0100
+--- src/totem-disc.c.orig	2005-03-13 14:37:57.000000000 +0100
 +++ src/totem-disc.c
-@@ -34,12 +34,35 @@
+@@ -34,7 +34,6 @@
  #include <stdio.h>
  #include <stdlib.h>
  #include <errno.h>
@@ -13,32 +10,35 @@ http://www.freebsd.org/cgi/cvsweb.cgi/ports/multimedia/totem/files/patch-src_tot
  #include <string.h>
  
  #include <sys/ioctl.h>
- #include <sys/stat.h>
+@@ -44,7 +43,31 @@
+ #include <glib/gi18n.h>
+ #include <libgnomevfs/gnome-vfs.h>
+ 
 +#if defined(__linux__)
  #include <linux/cdrom.h>
 +#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
 +#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 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
 +#error "No support to access the CD in this platform."
 +#endif
  
- #include <glib.h>
- #include <glib/gi18n.h>
+ #include "totem-disc.h"
+