Changes:

     - Added --geometry command line option.
     - Updated French translation.
     - Playlist now scrolls with drag and drop.
     - Adding directory contents to a playlist now sorts the contents first.
     * Fixed ogg filenames with spaces.
     * Made the M3U file reading actually work.
     * Minor other fixes.

Close pkg/15435

4 files changed, 8 insertions, 63 deletions

diff --git a/audio/gqmpeg/Makefile b/audio/gqmpeg/Makefile
index d2e6a2d380f..0cbdb9d71c3 100644
--- a/audio/gqmpeg/Makefile
+++ b/audio/gqmpeg/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.50 2002/01/14 20:48:52 hubertf Exp $
+# $NetBSD: Makefile,v 1.51 2002/02/04 17:04:10 rxg Exp $
 # FreeBSD Id: Makefile,v 1.6 1998/12/28 01:02:05 vanilla Exp
 
-DISTNAME=		gqmpeg-0.12.0
+DISTNAME=		gqmpeg-0.12.1
 CATEGORIES=		audio
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=gqmpeg/}
 
@@ -18,15 +18,15 @@ DEPENDS+=              xmp>=2.0.2:../../audio/xmp
 USE_BUILDLINK_ONLY=	YES
 USE_X11BASE=		YES
 GNU_CONFIGURE=		YES
-CONFIGURE_ARGS+=	--without-included-gettext
+CONFIGURE_ARGS+=	--without-included-gettext \
+			--datadir=${PREFIX}/${PKGLOCALEDIR}
 .if !defined(GQMPEG_NO_JAPANESE)
 CONFIGURE_ARGS+=	--enable-japanese
 .endif
 .if !defined(GQMPEG_NO_RUSSIAN)
 CONFIGURE_ARGS+=	--enable-russian
 .endif
-CONFIGURE_ENV+=		PKGLOCALEDIR="${PKGLOCALEDIR}" \
-			GNOME_DATADIR=${PREFIX}/share
+CONFIGURE_ENV+=		GNOME_DATADIR=${PREFIX}/share
 
 # in case gnome isn't installed, we need to create the directories
 pre-install:
diff --git a/audio/gqmpeg/distinfo b/audio/gqmpeg/distinfo
index f44d6075f42..192af008472 100644
--- a/audio/gqmpeg/distinfo
+++ b/audio/gqmpeg/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.9 2002/01/16 07:59:53 lukem Exp $
+$NetBSD: distinfo,v 1.10 2002/02/04 17:04:10 rxg Exp $
 
-SHA1 (gqmpeg-0.12.0.tar.gz) = 8c0d2e2db625177601d41bc5c31c8742f42bcd40
-Size (gqmpeg-0.12.0.tar.gz) = 593347 bytes
+SHA1 (gqmpeg-0.12.1.tar.gz) = 569c56562b37124ee6d82dc3d7cfcdf59463a6c5
+Size (gqmpeg-0.12.1.tar.gz) = 627819 bytes
 SHA1 (patch-aa) = c006f7a0490bced6a80e30e3aced606fc6eef5ab
-SHA1 (patch-ab) = 6ee86ae0d15a393d44d659e08c316cb9a05c4041
-SHA1 (patch-ac) = 21675e386aa714e520570673b74bad8f89fda1ba
diff --git a/audio/gqmpeg/patches/patch-ab b/audio/gqmpeg/patches/patch-ab
deleted file mode 100644
index 73a0a6bafda..00000000000
--- a/audio/gqmpeg/patches/patch-ab
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ab,v 1.18 2002/01/14 20:48:53 hubertf Exp $
-
---- configure.orig	Thu Jan  3 21:40:19 2002
-+++ configure
-@@ -2290,7 +2290,6 @@
-   FALSE_FALSE=
- fi
- 
--localedir='${prefix}/share/locale'
- 
- 
- ALL_LINGUAS="cs de fr ja pt_BR zh_TW"
-@@ -4121,6 +4120,9 @@
- 	< $srcdir/po/POTFILES.in > po/POTFILES
-   
- 
-+
-+DATADIRNAME="${PKGLOCALEDIR}"
-+localedir='${prefix}/${DATADIRNAME}/locale'
- 
- 
- 
diff --git a/audio/gqmpeg/patches/patch-ac b/audio/gqmpeg/patches/patch-ac
deleted file mode 100644
index afbbbe60c20..00000000000
--- a/audio/gqmpeg/patches/patch-ac
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ac,v 1.6 2002/01/16 07:59:54 lukem Exp $
-
---- src/io_ogg123.c.orig	Thu Jan  3 19:46:03 2002
-+++ src/io_ogg123.c
-@@ -105,7 +105,7 @@
- 
- 	if (!ogg123_info_found) return NULL;
- 
--	command = g_strdup_printf("%s %s", OGG123_BINARY_INFO, path);
-+	command = g_strdup_printf("%s '%s'", OGG123_BINARY_INFO, path);
- 	f = popen(command, "r");
- 	if (!f)
- 		{
-@@ -183,7 +183,7 @@
- 
- 	if (!ogg123_comment_found) return NULL;
- 
--	command = g_strdup_printf("%s -l %s", OGG123_BINARY_COMMENT, path);
-+	command = g_strdup_printf("%s -l '%s'", OGG123_BINARY_COMMENT, path);
- 	f = popen(command, "r");
- 	if (!f)
- 		{
-@@ -259,7 +259,7 @@
- 	if (!ogg123_comment_found) return TRUE;
- 	if (!path) return FALSE;
- 
--	command = g_strdup_printf("%s -w %s", OGG123_BINARY_COMMENT, path);
-+	command = g_strdup_printf("%s -w '%s'", OGG123_BINARY_COMMENT, path);
- 
- 	work = comments;
- 	while (work && work->next)