Update to version 2.1.14. This is the GKrellM-2 port of the xmms plugin.

4 files changed, 34 insertions, 46 deletions

diff --git a/audio/gkrellm-xmms/Makefile b/audio/gkrellm-xmms/Makefile
index 7fe02cf44ec..3347d5b0d4e 100644
--- a/audio/gkrellm-xmms/Makefile
+++ b/audio/gkrellm-xmms/Makefile
@@ -1,21 +1,24 @@
-# $NetBSD: Makefile,v 1.11 2004/01/20 12:07:42 agc Exp $
+# $NetBSD: Makefile,v 1.12 2004/02/24 22:46:34 cube Exp $
+#
 
-DISTNAME=	gkrellmms-0.5.6
-PKGNAME=	gkrellm-xmms-0.5.6
-PKGREVISION=	3
+DISTNAME=	gkrellmms-2.1.14
+PKGNAME=	${DISTNAME:S/mms/m-xmms/}
 CATEGORIES=	audio
 MASTER_SITES=	http://gkrellm.luon.net/files/
 
-MAINTAINER=	damon@NetBSD.org
+MAINTAINER=	cube@NetBSD.org
 HOMEPAGE=	http://gkrellm.luon.net/gkrellmms.phtml
-COMMENT=	gkrellm xmms plugin
+COMMENT=	GKrellM2 plugin to remotely control XMMS
 
-WRKSRC=		${WRKDIR}/gkrellmms
-USE_BUILDLINK2=	YES
+WRKSRC=			${WRKDIR}/gkrellmms
+USE_BUILDLINK2=		YES
+USE_GNU_TOOLS+=		make
+USE_PKGLOCALEDIR=	YES
+BUILD_USES_MSGFMT=	YES
 
-pre-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/lib/gkrellm/plugins
+MAKE_ENV+=	LOCALEDIR=${PREFIX}/${PKGLOCALEDIR}/locale \
+		enable_nls=1
 
-.include "../../audio/xmms/buildlink2.mk"
 .include "../../sysutils/gkrellm/buildlink2.mk"
+.include "../../audio/xmms/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/gkrellm-xmms/PLIST b/audio/gkrellm-xmms/PLIST
index 8a0a5205f97..197554948aa 100644
--- a/audio/gkrellm-xmms/PLIST
+++ b/audio/gkrellm-xmms/PLIST
@@ -1,2 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:16:35 zuntum Exp $
-lib/gkrellm/plugins/gkrellmms.so
+@comment $NetBSD: PLIST,v 1.2 2004/02/24 22:46:34 cube Exp $
+lib/gkrellm2/plugins/gkrellmms.so
+${PKGLOCALEDIR}/locale/da/LC_MESSAGES/gkrellmms.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/gkrellmms.mo
+${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/gkrellmms.mo
+${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/gkrellmms.mo
diff --git a/audio/gkrellm-xmms/distinfo b/audio/gkrellm-xmms/distinfo
index 1afad49a69c..6e47671fa76 100644
--- a/audio/gkrellm-xmms/distinfo
+++ b/audio/gkrellm-xmms/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2002/06/11 19:23:39 wiz Exp $
+$NetBSD: distinfo,v 1.3 2004/02/24 22:46:34 cube Exp $
 
-SHA1 (gkrellmms-0.5.6.tar.gz) = a657f47c5e8f5a874c0ad0b91e238147065593bc
-Size (gkrellmms-0.5.6.tar.gz) = 27249 bytes
-SHA1 (patch-aa) = f0b0c9266046bcea9b97fd9ae57f41b595d1eb11
+SHA1 (gkrellmms-2.1.14.tar.gz) = 0dde0a65a861aa92566f96ca93fa504e460c6f15
+Size (gkrellmms-2.1.14.tar.gz) = 45043 bytes
+SHA1 (patch-aa) = 27f8e60da4cbdb31cdb78fc2508565aa17eec430
diff --git a/audio/gkrellm-xmms/patches/patch-aa b/audio/gkrellm-xmms/patches/patch-aa
index d2f60ca1aae..a808eb29d60 100644
--- a/audio/gkrellm-xmms/patches/patch-aa
+++ b/audio/gkrellm-xmms/patches/patch-aa
@@ -1,32 +1,13 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/10/30 13:22:05 damon Exp $
+$NetBSD: patch-aa,v 1.2 2004/02/24 22:46:34 cube Exp $
 
---- Makefile.orig	Sat Jan 20 15:28:38 2001
+--- Makefile.orig	2003-03-19 12:12:30.000000000 +0100
 +++ Makefile
-@@ -10,14 +10,16 @@
- XMMS_INCLUDE = `xmms-config --cflags`
- XMMS_LIB = `xmms-config --libs`
- 
--FLAGS = -O2 -Wall -fPIC $(GTK_INCLUDE) $(IMLIB_INCLUDE) $(XMMS_INCLUDE)
-+CFLAGS += -fPIC $(GTK_INCLUDE) $(IMLIB_INCLUDE) $(XMMS_INCLUDE)
+@@ -9,7 +9,7 @@ IMLIB_INCLUDE ?= 
+ IMLIB_LIB ?= 
+ XMMS_INCLUDE ?= `xmms-config --cflags`
+ XMMS_LIB ?= `xmms-config --libs`
+-PLUGIN_DIR ?= /usr/local/lib/gkrellm2/plugins
++PLUGIN_DIR ?= $(PREFIX)/lib/gkrellm2/plugins
+ 
+ FLAGS = -O2 -Wall -fPIC $(GTK_INCLUDE) $(IMLIB_INCLUDE) $(XMMS_INCLUDE)
  LIBS = $(GTK_LIB) $(IMLIB_LIB) $(XMMS_LIB)
- LFLAGS = -shared -lpthread
- 
--CC = gcc $(CFLAGS) $(FLAGS)
-+CC = gcc $(CFLAGS)
- 
- OBJS = gkrellmms.o options.o playlist.o
- 
-+all:	$(BIN_FILENAME).so
-+
- $(BIN_FILENAME).so: $(OBJS)
- 	$(CC) $(OBJS) -o $(BIN_FILENAME).so $(LFLAGS) $(LIBS)
- 
-@@ -25,7 +27,7 @@
- 	rm -f *.o core *.so* *.bak *~
- 
- install: 
--	install -c -s -m 755 $(BIN_FILENAME).so /usr/share/gkrellm/plugins
-+	install -c -s -m 644 $(BIN_FILENAME).so ${PREFIX}/lib/gkrellm/plugins
- 
- gkrellmms.c.o: gkrellmms.c
- options.c.o: options.c