From cb994ffd3d7da484eefe73fa2b456a38bb7c06c6 Mon Sep 17 00:00:00 2001 From: cube Date: Tue, 24 Feb 2004 22:39:26 +0000 Subject: Update to version 2.1.9, from pkgsrc-wip. This is the GKrellM-2 version of the plugin volume. --- audio/gkrellm-volume/Makefile | 29 +++++++++------- audio/gkrellm-volume/PLIST | 9 +++-- audio/gkrellm-volume/distinfo | 9 +++-- audio/gkrellm-volume/patches/patch-aa | 65 ++++++++--------------------------- audio/gkrellm-volume/patches/patch-ab | 13 ------- 5 files changed, 42 insertions(+), 83 deletions(-) delete mode 100644 audio/gkrellm-volume/patches/patch-ab diff --git a/audio/gkrellm-volume/Makefile b/audio/gkrellm-volume/Makefile index 397c5739822..208ed6df291 100644 --- a/audio/gkrellm-volume/Makefile +++ b/audio/gkrellm-volume/Makefile @@ -1,21 +1,24 @@ -# $NetBSD: Makefile,v 1.10 2004/01/20 12:07:42 agc Exp $ +# $NetBSD: Makefile,v 1.11 2004/02/24 22:39:26 cube Exp $ -DISTNAME= volume-0.8 -PKGNAME= gkrellm-${DISTNAME} -PKGREVISION= 3 +DISTNAME= gkrellm-volume-2.1.9 +WRKSRC= ${WRKDIR}/gkrellm-volume CATEGORIES= audio MASTER_SITES= http://gkrellm.luon.net/files/ -MAINTAINER= jmmv@NetBSD.org +MAINTAINER= cube@NetBSD.org HOMEPAGE= http://gkrellm.luon.net/volume.phtml -COMMENT= gkrellm volume mixer plugin +COMMENT= Gkrellm2 volume mixer plugin -WRKSRC= ${WRKDIR}/volume -PTHREAD_OPTS= require -USE_BUILDLINK2= yes +BUILD_USES_MSGFMT= YES -.include "../../graphics/imlib/buildlink2.mk" -.include "../../sysutils/gkrellm/buildlink2.mk" -.include "../../x11/gtk/buildlink2.mk" -.include "../../mk/pthread.buildlink2.mk" +USE_BUILDLINK3= YES +USE_GNU_TOOLS+= make +USE_PKGLOCALEDIR= YES + +MAKE_ENV+= LOCALEDIR=${PREFIX}/${PKGLOCALEDIR}/locale \ + enable_nls=1 + +.include "../../sysutils/gkrellm/buildlink3.mk" +.include "../../x11/gtk2/buildlink3.mk" +.include "../../mk/ossaudio.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/gkrellm-volume/PLIST b/audio/gkrellm-volume/PLIST index 81b6e9573ad..87c5438432a 100644 --- a/audio/gkrellm-volume/PLIST +++ b/audio/gkrellm-volume/PLIST @@ -1,2 +1,7 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2002/06/11 22:39:42 wiz Exp $ -lib/gkrellm/plugins/volume.so +@comment $NetBSD: PLIST,v 1.2 2004/02/24 22:39:26 cube Exp $ +lib/gkrellm2/plugins/volume.so +${PKGLOCALEDIR}/locale/de/LC_MESSAGES/gkrellm-volume.mo +${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/gkrellm-volume.mo +${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/gkrellm-volume.mo +${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/gkrellm-volume.mo +${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/gkrellm-volume.mo diff --git a/audio/gkrellm-volume/distinfo b/audio/gkrellm-volume/distinfo index f7ffba2fa48..dda81682332 100644 --- a/audio/gkrellm-volume/distinfo +++ b/audio/gkrellm-volume/distinfo @@ -1,6 +1,5 @@ -$NetBSD: distinfo,v 1.2 2002/06/11 22:54:10 wiz Exp $ +$NetBSD: distinfo,v 1.3 2004/02/24 22:39:26 cube Exp $ -SHA1 (volume-0.8.tar.gz) = 7348c8fc41bdc6c236442748ef3c803851a151f8 -Size (volume-0.8.tar.gz) = 8395 bytes -SHA1 (patch-aa) = adf96e0bd1e2b65e85394c4c50ce1db587b73195 -SHA1 (patch-ab) = 9281f2e550134887bfbc99464ab79987f4a26183 +SHA1 (gkrellm-volume-2.1.9.tar.gz) = 7003c1ef3ebd141df9b15fa8e631e43d27dcca9b +Size (gkrellm-volume-2.1.9.tar.gz) = 37888 bytes +SHA1 (patch-aa) = 930ff02b776d77945c9fdef16c781fca64eedd4d diff --git a/audio/gkrellm-volume/patches/patch-aa b/audio/gkrellm-volume/patches/patch-aa index 755fa550dc7..5794d0dabb2 100644 --- a/audio/gkrellm-volume/patches/patch-aa +++ b/audio/gkrellm-volume/patches/patch-aa @@ -1,57 +1,22 @@ -$NetBSD: patch-aa,v 1.2 2002/06/11 22:54:11 wiz Exp $ +$NetBSD: patch-aa,v 1.3 2004/02/24 22:39:26 cube Exp $ ---- Makefile.orig Fri Jun 23 19:47:00 2000 +--- Makefile.orig 2003-01-18 20:59:09.000000000 +0100 +++ Makefile -@@ -1,27 +1,19 @@ - # Makefile for GKrellM volume plugin +@@ -2,14 +2,14 @@ --# Linux --GTK_CONFIG = gtk-config --SYSLIB = -lpthread -- --# FreeBSD --#GTK_CONFIG = gtk12-config --#SYSLIB = -- --PLUGIN_DIR = /usr/share/gkrellm/plugins -+PLUGIN_DIR = ${LOCALBASE}/lib/gkrellm/plugins - GKRELLM_INCLUDE = -I/usr/local/include + GTK_CONFIG = pkg-config gtk+-2.0 --GTK_INCLUDE = `$(GTK_CONFIG) --cflags` --GTK_LIB = `$(GTK_CONFIG) --libs` -+GTK_INCLUDE = `gtk-config --cflags` -+GTK_LIB = `gtk-config --libs` +-PLUGIN_DIR ?= /usr/local/lib/gkrellm2/plugins +-GKRELLM_INCLUDE = -I/usr/local/include ++PLUGIN_DIR ?= $(PREFIX)/lib/gkrellm2/plugins ++GKRELLM_INCLUDE = -I$(BUILDLINK_DIR)/include - IMLIB_INCLUDE = `imlib-config --cflags-gdk` - IMLIB_LIB = `imlib-config --libs-gdk` + GTK_CFLAGS = `$(GTK_CONFIG) --cflags` + GTK_LIB = `$(GTK_CONFIG) --libs` --FLAGS = -O2 -Wall -fPIC $(GTK_INCLUDE) $(IMLIB_INCLUDE) $(GKRELLM_INCLUDE) --LIBS = $(GTK_LIB) $(IMLIB_LIB) $(SYSLIB) --LFLAGS = -shared -+CFLAGS+= -O2 -Wall -fPIC $(GTK_INCLUDE) $(IMLIB_INCLUDE) $(GKRELLM_INCLUDE) -+LIBS+= $(GTK_LIB) $(IMLIB_LIB) $(SYSLIB) -+LFLAGS+= -shared -lpthread -lossaudio + FLAGS = -O2 -Wall -fPIC $(GTK_CFLAGS) $(GKRELLM_INCLUDE) +-LIBS = $(GTK_LIB) ++LIBS = $(GTK_LIB) $(LIBOSSAUDIO) + LFLAGS = -shared --CC = gcc $(CFLAGS) $(FLAGS) -+CC = gcc $(CFLAGS) - - INSTALL = install -c - INSTALL_PROGRAM = $(INSTALL) -s -@@ -30,9 +22,6 @@ - - all: volume.so - --freebsd: -- make GTK_CONFIG=gtk12-config SYSLIB=all -- - volume.so: $(OBJS) - $(CC) $(OBJS) -o volume.so $(LIBS) $(LFLAGS) - -@@ -40,6 +29,7 @@ - rm -f *.o core *.so* *.bak *~ - - install: -+ mkdir -p $(PLUGIN_DIR) - $(INSTALL_PROGRAM) volume.so $(PLUGIN_DIR) - - volume.c.o: volume.c + PACKAGE ?= gkrellm-volume diff --git a/audio/gkrellm-volume/patches/patch-ab b/audio/gkrellm-volume/patches/patch-ab deleted file mode 100644 index 6303f0f2edc..00000000000 --- a/audio/gkrellm-volume/patches/patch-ab +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ab,v 1.2 2002/06/11 22:54:11 wiz Exp $ - ---- volume.c.orig Wed Nov 22 21:35:42 2000 -+++ volume.c -@@ -19,6 +19,8 @@ - - #ifdef __FreeBSD__ - #include -+#elif __NetBSD__ -+#include - #else - #include - #endif -- cgit v1.2.3