5 files changed, 97 insertions, 14 deletions

diff --git a/audio/gqmpeg/Makefile b/audio/gqmpeg/Makefile
index efdd65e8f27a..064e1c5a2829 100644
--- a/audio/gqmpeg/Makefile
+++ b/audio/gqmpeg/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	gqmpeg
-# Version required:	0.4.6
+# Version required:	0.5.1
 # Date Created:		28 Oct 1998
 # Whom:			Vanilla Pooh Shu <vanilla@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.10 1999/02/02 17:07:22 vanilla Exp $
+# $Id: Makefile,v 1.11 1999/03/15 18:30:04 nectar Exp $
 #
 
-DISTNAME=	gqmpeg-0.4.6
+DISTNAME=	gqmpeg-0.5.1
 CATEGORIES=	audio
 MASTER_SITES=	http://www.geocities.com/SiliconValley/Haven/5235/
 EXTRACT_SUFX=	.src.tgz
@@ -19,6 +19,9 @@ LIB_DEPENDS=	Imlib.3:${PORTSDIR}/graphics/imlib
 USE_X_PREFIX=	yes
 ALL_TARGET=	gqmpeg
 
+BINGRP=		kmem
+BINMODE=	2555
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/gqmpeg ${PREFIX}/bin
 
diff --git a/audio/gqmpeg/distinfo b/audio/gqmpeg/distinfo
index e9509909f172..1e8b6578f40f 100644
--- a/audio/gqmpeg/distinfo
+++ b/audio/gqmpeg/distinfo
@@ -1 +1 @@
-MD5 (gqmpeg-0.4.6.src.tgz) = 17233ea8f197d0227fa67e15e1d8b1c1
+MD5 (gqmpeg-0.5.1.src.tgz) = 9649e5366da9298df19c216791fb9b14
diff --git a/audio/gqmpeg/files/patch-aa b/audio/gqmpeg/files/patch-aa
index 63b0210faf94..4e9b9b08dae7 100644
--- a/audio/gqmpeg/files/patch-aa
+++ b/audio/gqmpeg/files/patch-aa
@@ -1,17 +1,21 @@
---- Makefile.orig	Fri Jan 22 07:37:38 1999
-+++ Makefile	Sun Jan 24 03:15:04 1999
-@@ -1,11 +1,8 @@
--
+--- Makefile.orig	Sat Mar 27 21:38:09 1999
++++ Makefile	Tue Mar 30 01:48:05 1999
+@@ -1,13 +1,11 @@
+ 
 -PREFIX=/usr/local
 -
 -GTK_INCLUDE = `gtk-config --cflags`
 -GTK_LIB = `gtk-config --libs`
-+GTK_INCLUDE = `gtk11d-config --cflags`
-+GTK_LIB = `gtk11d-config --libs`
++GTK_INCLUDE = `gtk12-config --cflags`
++GTK_LIB = `gtk12-config --libs`
  IMLIB_INCLUDE = `imlib-config --cflags-gdk`
  IMLIB_LIB = `imlib-config --libs-gdk`
 -CFLAGS = $(GTK_INCLUDE) $(IMLIB_INCLUDE)
+-LDFLAGS = $(GTK_LIB) $(IMLIB_LIB)
+-CC = gcc -Wall $(CFLAGS)
 +CFLAGS += $(GTK_INCLUDE) $(IMLIB_INCLUDE)
- LDFLAGS = $(GTK_LIB) $(IMLIB_LIB)
- CC = gcc -Wall $(CFLAGS) $(SHAPED_HACK)
++LDFLAGS = $(GTK_LIB) $(IMLIB_LIB) -lkvm
++CC += -Wall $(CFLAGS)
+ 
+ GNOME_PREFIX = `gnome-config --prefix`
  
diff --git a/audio/gqmpeg/files/patch-ab b/audio/gqmpeg/files/patch-ab
new file mode 100644
index 000000000000..9a8d2a1fd11d
--- /dev/null
+++ b/audio/gqmpeg/files/patch-ab
@@ -0,0 +1,75 @@
+--- main.c.orig	Tue Mar 30 01:40:15 1999
++++ main.c	Tue Mar 30 01:47:25 1999
+@@ -15,6 +15,27 @@
+ #include <gdk/gdkx.h>
+ #include <X11/Xlib.h>
+ 
++#ifdef __FreeBSD__
++#include <kvm.h>
++#include <fcntl.h>
++#include <sys/user.h>
++#include <sys/proc.h>
++#include <sys/param.h>
++#include <sys/sysctl.h>
++
++#ifdef FSCALE
++#define FIXED_PCTCPU FSCALE
++#endif
++
++#ifdef FIXED_PCTCPU
++typedef long pctcpu;
++#define pctdouble(p) ((double)(p) / FIXED_PCTCPU)
++#else
++typedef double pctcpu;
++#define pctdouble(p) (p)
++#endif
++#endif
++
+ static gint fast_advance = FALSE;
+ static gint advance_max_frame;
+ static gint advance_max_sec;
+@@ -99,6 +120,36 @@
+ #define HZ 100 /* for FreeBSD? */
+ #endif
+ 
++#ifdef __FreeBSD__
++static gfloat check_child_cpu_usage(int childs_pid)
++{
++        static gfloat percent_of_cpu = 0.0;
++
++        static kvm_t *kd;
++        kd = kvm_open(NULL, NULL, NULL, O_RDONLY, "kvm_open");
++        if (kd == NULL) return percent_of_cpu;
++
++        {
++        static struct kinfo_proc *ki;
++        static int nproc;
++        ki = kvm_getprocs(kd, KERN_PROC_PID, childs_pid, &nproc);
++        if (nproc != 1) {
++                percent_of_cpu = 0.0;
++        } else {
++                percent_of_cpu = 100.0 * pctdouble(ki->kp_proc.p_pctcpu);
++        }
++        }
++
++        kvm_close(kd);
++
++        if (percent_of_cpu > 99.0) {
++                percent_of_cpu = 99;
++       }
++
++        return percent_of_cpu;
++}
++
++#else
+ static gfloat check_child_cpu_usage(int childs_pid)
+ {
+ /* needed for SGI IRIX 5.3 and 6.5 */
+@@ -197,6 +248,7 @@
+ 
+ 	return percent_of_cpu;
+ }
++#endif
+ 
+ void set_song_info(gint n)
+ {
diff --git a/audio/gqmpeg/pkg-descr b/audio/gqmpeg/pkg-descr
index 833e3f020968..c5afefc6c79e 100644
--- a/audio/gqmpeg/pkg-descr
+++ b/audio/gqmpeg/pkg-descr
@@ -1,6 +1,7 @@
-Another gtk-base graphic file viewer.
+A GTK-based mp3 front-end.
+Uses mpg123 for decoding and supports winamp themes..
 
-author's homepage: http://www.geocities.com/SiliconValley/Haven/5235/
+Author's homepage: http://www.geocities.com/SiliconValley/Haven/5235/
 
 -Vanilla
 vanilla@FreeBSD.ORG