14 files changed, 50 insertions, 134 deletions

diff --git a/audio/gqmpeg-devel/Makefile b/audio/gqmpeg-devel/Makefile
index e7f3135b9d5c..7bebe6bff4c6 100644
--- a/audio/gqmpeg-devel/Makefile
+++ b/audio/gqmpeg-devel/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	gqmpeg
-PORTVERSION=	0.6.3
+PORTVERSION=	0.8.1
 CATEGORIES=	audio
 MASTER_SITES=	http://www.netpedia.net/hosting/gqview/packages/ \
 		http://www.geocities.com/SiliconValley/Haven/5235/packages/
-EXTRACT_SUFX=	.src.tar.gz
 
 MAINTAINER=	nakai@FreeBSD.org
 
@@ -18,6 +17,8 @@ RUN_DEPENDS=	mpg123:${PORTSDIR}/audio/mpg123
 
 USE_X_PREFIX=	yes
 USE_IMLIB=	yes
-ALL_TARGET=	gqmpeg
+USE_LIBTOOL=	yes
+
+MAN1=		gqmpeg.1
 
 .include <bsd.port.mk>
diff --git a/audio/gqmpeg-devel/distinfo b/audio/gqmpeg-devel/distinfo
index 617e017cf600..963aab431e73 100644
--- a/audio/gqmpeg-devel/distinfo
+++ b/audio/gqmpeg-devel/distinfo
@@ -1 +1 @@
-MD5 (gqmpeg-0.6.3.src.tar.gz) = 01ec3ac587847b73e90326ea014cee22
+MD5 (gqmpeg-0.8.1.tar.gz) = 5f0b70274c828edac9342e1f05103dbd
diff --git a/audio/gqmpeg-devel/files/patch-aa b/audio/gqmpeg-devel/files/patch-aa
deleted file mode 100644
index ede87a7d5504..000000000000
--- a/audio/gqmpeg-devel/files/patch-aa
+++ /dev/null
@@ -1,34 +0,0 @@
---- Makefile.orig	Sat Jul  3 20:39:08 1999
-+++ Makefile	Thu Apr 13 03:59:10 2000
-@@ -1,8 +1,8 @@
- 
--PREFIX=/usr/local
-+PREFIX?=/usr/local
- 
--GTK_INCLUDE = `gtk-config --cflags`
--GTK_LIB = `gtk-config --libs`
-+#GTK_INCLUDE = `gtk-config --cflags`
-+#GTK_LIB = `gtk-config --libs`
- IMLIB_INCLUDE = `imlib-config --cflags-gdk`
- IMLIB_LIB = `imlib-config --libs-gdk`
- 
-@@ -15,7 +15,7 @@
- #for IRIX
- #LDFLAGS = $(GTK_LIB) $(IMLIB_LIB) -laudio
- 
--CC = gcc -Wall
-+CC ?= gcc -Wall
- 
- GNOME_PREFIX = `gnome-config --prefix`
- 
-@@ -119,8 +119,8 @@
- 	$(CC) $(OBJS) -o gqmpeg.static -static $(LDFLAGS)
- 
- install: gqmpeg
--	install -c gqmpeg $(PREFIX)/bin/gqmpeg
--	install -c plugin/gqmpeg-shoutcast-plugin.sh $(PREFIX)/bin/gqmpeg-shoutcast-plugin.sh
-+	${BSD_INSTALL_PROGRAM} gqmpeg $(PREFIX)/bin/gqmpeg
-+	${BSD_INSTALL_SCRIPT} plugin/gqmpeg-shoutcast-plugin.sh $(PREFIX)/bin/gqmpeg-shoutcast-plugin.sh
- 
- gnome-install: gqmpeg
- 	install -c gqmpeg $(PREFIX)/bin/gqmpeg
diff --git a/audio/gqmpeg-devel/files/patch-ab b/audio/gqmpeg-devel/files/patch-ab
deleted file mode 100644
index 9f9e259ad949..000000000000
--- a/audio/gqmpeg-devel/files/patch-ab
+++ /dev/null
@@ -1,18 +0,0 @@
---- main.c.orig	Mon Oct 11 10:45:08 1999
-+++ main.c	Mon Oct 11 10:46:19 1999
-@@ -11,6 +11,7 @@
- 
- #include "config.h"
- #include "gqmpeg.h"
-+#include "floatingpoint.h"
- 
- static gint update_timeout_id = -1;
- 
-@@ -693,6 +694,7 @@
- 	GList *list_buf = NULL;
- 	GList *playlist_buf = NULL;
- 
-+	fpsetmask(0);
- 	init_vars();
- 
- 	/* setup random seed for shuffle mode */
diff --git a/audio/gqmpeg-devel/files/patch-ac b/audio/gqmpeg-devel/files/patch-ac
deleted file mode 100644
index 047e6f240ef8..000000000000
--- a/audio/gqmpeg-devel/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- mixer.c.orig	Sun Jan 30 03:52:17 2000
-+++ mixer.c	Sun Jan 30 03:52:51 2000
-@@ -80,7 +80,7 @@
- 		}
- 
- 	t = ioctl(mf, SOUND_MIXER_READ_DEVMASK, &dev_mask);
--	t|= ioctl(mf, SOUND_MIXER_READ_RECMASK, &rec_mask);
-+	// t|= ioctl(mf, SOUND_MIXER_READ_RECMASK, &rec_mask);
- 	t|= ioctl(mf, SOUND_MIXER_READ_STEREODEVS, &stereo_mask);
- 	if (t!=0)
- 		{
diff --git a/audio/gqmpeg-devel/files/patch-ad b/audio/gqmpeg-devel/files/patch-ad
new file mode 100644
index 000000000000..f2e37223f825
--- /dev/null
+++ b/audio/gqmpeg-devel/files/patch-ad
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	Sun Dec 24 13:03:03 2000
++++ Makefile.in	Sun Dec 24 13:03:15 2000
+@@ -109,7 +109,7 @@
+ skindir = $(prefix)/share/gqmpeg/skins
+ skin_DATA = 
+ 
+-@HAVE_GNOME_TRUE@desktopdir = $(GNOME_DATADIR)/gnome/apps/Multimedia
++@HAVE_GNOME_TRUE@desktopdir = $(GNOME_DATADIR)/apps/Multimedia
+ @HAVE_GNOME_TRUE@desktop_DATA = gqmpeg.desktop
+ 
+ @HAVE_GNOME_TRUE@icondir = $(GNOME_DATADIR)/pixmaps
diff --git a/audio/gqmpeg-devel/pkg-plist b/audio/gqmpeg-devel/pkg-plist
index 5df621d0552d..a49b9fa2c490 100644
--- a/audio/gqmpeg-devel/pkg-plist
+++ b/audio/gqmpeg-devel/pkg-plist
@@ -1,2 +1,11 @@
 bin/gqmpeg
 bin/gqmpeg-shoutcast-plugin.sh
+share/gnome/apps/Multimedia/gqmpeg.desktop
+share/gnome/pixmaps/gqmpeg.png
+share/locale/cs/LC_MESSAGES/gqmpeg.mo
+share/locale/de/LC_MESSAGES/gqmpeg.mo
+share/locale/fr/LC_MESSAGES/gqmpeg.mo
+share/locale/ja/LC_MESSAGES/gqmpeg.mo
+share/locale/pt_BR/LC_MESSAGES/gqmpeg.mo
+@dirrm share/gqmpeg/skins
+@dirrm share/gqmpeg
diff --git a/audio/gqmpeg/Makefile b/audio/gqmpeg/Makefile
index e7f3135b9d5c..7bebe6bff4c6 100644
--- a/audio/gqmpeg/Makefile
+++ b/audio/gqmpeg/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	gqmpeg
-PORTVERSION=	0.6.3
+PORTVERSION=	0.8.1
 CATEGORIES=	audio
 MASTER_SITES=	http://www.netpedia.net/hosting/gqview/packages/ \
 		http://www.geocities.com/SiliconValley/Haven/5235/packages/
-EXTRACT_SUFX=	.src.tar.gz
 
 MAINTAINER=	nakai@FreeBSD.org
 
@@ -18,6 +17,8 @@ RUN_DEPENDS=	mpg123:${PORTSDIR}/audio/mpg123
 
 USE_X_PREFIX=	yes
 USE_IMLIB=	yes
-ALL_TARGET=	gqmpeg
+USE_LIBTOOL=	yes
+
+MAN1=		gqmpeg.1
 
 .include <bsd.port.mk>
diff --git a/audio/gqmpeg/distinfo b/audio/gqmpeg/distinfo
index 617e017cf600..963aab431e73 100644
--- a/audio/gqmpeg/distinfo
+++ b/audio/gqmpeg/distinfo
@@ -1 +1 @@
-MD5 (gqmpeg-0.6.3.src.tar.gz) = 01ec3ac587847b73e90326ea014cee22
+MD5 (gqmpeg-0.8.1.tar.gz) = 5f0b70274c828edac9342e1f05103dbd
diff --git a/audio/gqmpeg/files/patch-aa b/audio/gqmpeg/files/patch-aa
deleted file mode 100644
index ede87a7d5504..000000000000
--- a/audio/gqmpeg/files/patch-aa
+++ /dev/null
@@ -1,34 +0,0 @@
---- Makefile.orig	Sat Jul  3 20:39:08 1999
-+++ Makefile	Thu Apr 13 03:59:10 2000
-@@ -1,8 +1,8 @@
- 
--PREFIX=/usr/local
-+PREFIX?=/usr/local
- 
--GTK_INCLUDE = `gtk-config --cflags`
--GTK_LIB = `gtk-config --libs`
-+#GTK_INCLUDE = `gtk-config --cflags`
-+#GTK_LIB = `gtk-config --libs`
- IMLIB_INCLUDE = `imlib-config --cflags-gdk`
- IMLIB_LIB = `imlib-config --libs-gdk`
- 
-@@ -15,7 +15,7 @@
- #for IRIX
- #LDFLAGS = $(GTK_LIB) $(IMLIB_LIB) -laudio
- 
--CC = gcc -Wall
-+CC ?= gcc -Wall
- 
- GNOME_PREFIX = `gnome-config --prefix`
- 
-@@ -119,8 +119,8 @@
- 	$(CC) $(OBJS) -o gqmpeg.static -static $(LDFLAGS)
- 
- install: gqmpeg
--	install -c gqmpeg $(PREFIX)/bin/gqmpeg
--	install -c plugin/gqmpeg-shoutcast-plugin.sh $(PREFIX)/bin/gqmpeg-shoutcast-plugin.sh
-+	${BSD_INSTALL_PROGRAM} gqmpeg $(PREFIX)/bin/gqmpeg
-+	${BSD_INSTALL_SCRIPT} plugin/gqmpeg-shoutcast-plugin.sh $(PREFIX)/bin/gqmpeg-shoutcast-plugin.sh
- 
- gnome-install: gqmpeg
- 	install -c gqmpeg $(PREFIX)/bin/gqmpeg
diff --git a/audio/gqmpeg/files/patch-ab b/audio/gqmpeg/files/patch-ab
deleted file mode 100644
index 9f9e259ad949..000000000000
--- a/audio/gqmpeg/files/patch-ab
+++ /dev/null
@@ -1,18 +0,0 @@
---- main.c.orig	Mon Oct 11 10:45:08 1999
-+++ main.c	Mon Oct 11 10:46:19 1999
-@@ -11,6 +11,7 @@
- 
- #include "config.h"
- #include "gqmpeg.h"
-+#include "floatingpoint.h"
- 
- static gint update_timeout_id = -1;
- 
-@@ -693,6 +694,7 @@
- 	GList *list_buf = NULL;
- 	GList *playlist_buf = NULL;
- 
-+	fpsetmask(0);
- 	init_vars();
- 
- 	/* setup random seed for shuffle mode */
diff --git a/audio/gqmpeg/files/patch-ac b/audio/gqmpeg/files/patch-ac
deleted file mode 100644
index 047e6f240ef8..000000000000
--- a/audio/gqmpeg/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- mixer.c.orig	Sun Jan 30 03:52:17 2000
-+++ mixer.c	Sun Jan 30 03:52:51 2000
-@@ -80,7 +80,7 @@
- 		}
- 
- 	t = ioctl(mf, SOUND_MIXER_READ_DEVMASK, &dev_mask);
--	t|= ioctl(mf, SOUND_MIXER_READ_RECMASK, &rec_mask);
-+	// t|= ioctl(mf, SOUND_MIXER_READ_RECMASK, &rec_mask);
- 	t|= ioctl(mf, SOUND_MIXER_READ_STEREODEVS, &stereo_mask);
- 	if (t!=0)
- 		{
diff --git a/audio/gqmpeg/files/patch-ad b/audio/gqmpeg/files/patch-ad
new file mode 100644
index 000000000000..f2e37223f825
--- /dev/null
+++ b/audio/gqmpeg/files/patch-ad
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	Sun Dec 24 13:03:03 2000
++++ Makefile.in	Sun Dec 24 13:03:15 2000
+@@ -109,7 +109,7 @@
+ skindir = $(prefix)/share/gqmpeg/skins
+ skin_DATA = 
+ 
+-@HAVE_GNOME_TRUE@desktopdir = $(GNOME_DATADIR)/gnome/apps/Multimedia
++@HAVE_GNOME_TRUE@desktopdir = $(GNOME_DATADIR)/apps/Multimedia
+ @HAVE_GNOME_TRUE@desktop_DATA = gqmpeg.desktop
+ 
+ @HAVE_GNOME_TRUE@icondir = $(GNOME_DATADIR)/pixmaps
diff --git a/audio/gqmpeg/pkg-plist b/audio/gqmpeg/pkg-plist
index 5df621d0552d..a49b9fa2c490 100644
--- a/audio/gqmpeg/pkg-plist
+++ b/audio/gqmpeg/pkg-plist
@@ -1,2 +1,11 @@
 bin/gqmpeg
 bin/gqmpeg-shoutcast-plugin.sh
+share/gnome/apps/Multimedia/gqmpeg.desktop
+share/gnome/pixmaps/gqmpeg.png
+share/locale/cs/LC_MESSAGES/gqmpeg.mo
+share/locale/de/LC_MESSAGES/gqmpeg.mo
+share/locale/fr/LC_MESSAGES/gqmpeg.mo
+share/locale/ja/LC_MESSAGES/gqmpeg.mo
+share/locale/pt_BR/LC_MESSAGES/gqmpeg.mo
+@dirrm share/gqmpeg/skins
+@dirrm share/gqmpeg