4 files changed, 11 insertions, 23 deletions

diff --git a/multimedia/totem-pl-parser/Makefile b/multimedia/totem-pl-parser/Makefile
index 2770853996f3..8a4c89f07e37 100644
--- a/multimedia/totem-pl-parser/Makefile
+++ b/multimedia/totem-pl-parser/Makefile
@@ -3,14 +3,14 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/multimedia/totem-pl-parser/Makefile,v 1.8 2008/03/10 15:04:41 ahze Exp $
+#   $MCom: ports/multimedia/totem-pl-parser/Makefile,v 1.19 2008/12/14 17:56:46 mezz Exp $
 #
 
 PORTNAME=	totem-pl-parser
-PORTVERSION=	2.22.3
-PORTREVISION=	2
+PORTVERSION=	2.24.3
 CATEGORIES=	multimedia gnome
 MASTER_SITES=	GNOME
+DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GObject-based library to parse a host of playlist formats
diff --git a/multimedia/totem-pl-parser/distinfo b/multimedia/totem-pl-parser/distinfo
index ae3396efb7ff..2c717afa7f51 100644
--- a/multimedia/totem-pl-parser/distinfo
+++ b/multimedia/totem-pl-parser/distinfo
@@ -1,3 +1,3 @@
-MD5 (totem-pl-parser-2.22.3.tar.bz2) = a00956f87fa8fcb1f6760dccea5e0f84
-SHA256 (totem-pl-parser-2.22.3.tar.bz2) = 360b08584f44710bbcb380dfec33ee9bdea351383cbf15a8da1c3041337b8767
-SIZE (totem-pl-parser-2.22.3.tar.bz2) = 831247
+MD5 (gnome2/totem-pl-parser-2.24.3.tar.bz2) = f63f3a7743b7ec5b1115d3866461ce30
+SHA256 (gnome2/totem-pl-parser-2.24.3.tar.bz2) = 27aeac92d03d006efde5c461148db3b983582dc66ad835bec5f6a12bbea39a4c
+SIZE (gnome2/totem-pl-parser-2.24.3.tar.bz2) = 620727
diff --git a/multimedia/totem-pl-parser/files/patch-lib_memmem.c b/multimedia/totem-pl-parser/files/patch-lib_memmem.c
deleted file mode 100644
index 8684ae9ceec8..000000000000
--- a/multimedia/totem-pl-parser/files/patch-lib_memmem.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- lib/memmem.c.orig	2008-02-07 07:24:38.000000000 -0500
-+++ lib/memmem.c	2008-02-24 15:13:50.000000000 -0500
-@@ -31,8 +31,10 @@
-  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-  * SUCH DAMAGE.
-  */
--#ifndef __sun
-+#if !defined(__sun) && !defined(__FreeBSD__)
- #include "bbs.h"
-+#endif
-+#ifndef __sun
- #include <sys/cdefs.h>
- #endif
- 
diff --git a/multimedia/totem-pl-parser/pkg-plist b/multimedia/totem-pl-parser/pkg-plist
index 5b430b2837be..37f9d0608852 100644
--- a/multimedia/totem-pl-parser/pkg-plist
+++ b/multimedia/totem-pl-parser/pkg-plist
@@ -6,11 +6,11 @@ include/totem-pl-parser/1/plparser/totem-pl-parser.h
 lib/libtotem-plparser-mini.a
 lib/libtotem-plparser-mini.la
 lib/libtotem-plparser-mini.so
-lib/libtotem-plparser-mini.so.10
+lib/libtotem-plparser-mini.so.12
 lib/libtotem-plparser.a
 lib/libtotem-plparser.la
 lib/libtotem-plparser.so
-lib/libtotem-plparser.so.10
+lib/libtotem-plparser.so.12
 libdata/pkgconfig/totem-plparser-mini.pc
 libdata/pkgconfig/totem-plparser.pc
 %%DOCSDIR%%/ch01.html
@@ -88,7 +88,7 @@ share/locale/sk/LC_MESSAGES/totem-pl-parser.mo
 share/locale/sl/LC_MESSAGES/totem-pl-parser.mo
 share/locale/sq/LC_MESSAGES/totem-pl-parser.mo
 share/locale/sr/LC_MESSAGES/totem-pl-parser.mo
-share/locale/sr@Latn/LC_MESSAGES/totem-pl-parser.mo
+share/locale/sr@latin/LC_MESSAGES/totem-pl-parser.mo
 share/locale/sv/LC_MESSAGES/totem-pl-parser.mo
 share/locale/ta/LC_MESSAGES/totem-pl-parser.mo
 share/locale/te/LC_MESSAGES/totem-pl-parser.mo
@@ -114,6 +114,8 @@ share/locale/zh_TW/LC_MESSAGES/totem-pl-parser.mo
 @dirrmtry share/locale/ug
 @dirrmtry share/locale/te/LC_MESSAGES
 @dirrmtry share/locale/te
+@dirrmtry share/locale/sr@latin/LC_MESSAGES
+@dirrmtry share/locale/sr@latin
 @dirrmtry share/locale/si/LC_MESSAGES
 @dirrmtry share/locale/si
 @dirrmtry share/locale/rw/LC_MESSAGES