Update xmms-dflowers to 1.2.

Now this package actually works for me.

Changes:
	now uses a default themedirectory
	added menus, movearoundhanling
	some gtkwidget cleanup
	graphcolor and graphbackground now comes from skin
	added miniicon (for taskbar etc)
	NOTE! the old skinns should be replaced with the new ones, if using them

o set USE_BUILDLINK_ONLY
o use $(XMMS_CONFIG)

Note:

At least revision 1.3 of pkgsrc/audio/xmms/buildlink.mk is required to build
this package.

4 files changed, 48 insertions, 33 deletions

diff --git a/audio/xmms-dflowers/Makefile b/audio/xmms-dflowers/Makefile
index 25ab2f06b54..f4a71475cad 100644
--- a/audio/xmms-dflowers/Makefile
+++ b/audio/xmms-dflowers/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2001/08/16 03:34:22 zuntum Exp $
+# $NetBSD: Makefile,v 1.6 2001/08/16 04:30:11 zuntum Exp $
 #
 
-DISTNAME=	dflowers_v1.0
-PKGNAME=	xmms-dflowers-1.0
+DISTNAME=	dflowers-1.2
+PKGNAME=	xmms-${DISTNAME}
 CATEGORIES=	audio
 MASTER_SITES=	http://hem.passagen.se/joakime/
 
@@ -10,13 +10,13 @@ MAINTAINER=	hubertf@netbsd.org
 HOMEPAGE=	http://hem.passagen.se/joakime/linuxapp.html
 COMMENT=	XMMS plugin for dual flower scope
 
-USE_X11=	yes
-USE_LIBTOOL=	yes
+USE_BULIDLINK_ONLY=	YES
+USE_X11=		YES
+USE_LIBTOOL=		YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
-MAKE_ENV+=	GTK_CONFIG=${BUILDLINK_CONFIG_WRAPPER.gtk}
 
-pre-build:
-		cd ${WRKSRC} ; ${MAKE} clean
+MAKE_ENV+=	GTK_CONFIG=${BUILDLINK_CONFIG_WRAPPER.gtk}
+MAKE_ENV+=	XMMS_CONFIG=${BUILDLINK_CONFIG_WRAPPER.xmms}
 
 .include "../../audio/xmms/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/xmms-dflowers/distinfo b/audio/xmms-dflowers/distinfo
index 80abbaeacb9..10714679e71 100644
--- a/audio/xmms-dflowers/distinfo
+++ b/audio/xmms-dflowers/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2001/08/16 03:20:45 hubertf Exp $
+$NetBSD: distinfo,v 1.3 2001/08/16 04:30:12 zuntum Exp $
 
-SHA1 (dflowers_v1.0.tar.gz) = b8ce00065d177923bf52a3f3f418db09afd0daaa
-Size (dflowers_v1.0.tar.gz) = 30468 bytes
-SHA1 (patch-aa) = ca39aba8c539e4c23413a5dacb0b4c69d7a6dd8d
+SHA1 (dflowers-1.2.tar.gz) = 5f7b518652a6df3677fdeaffa5014ad0171dd426
+Size (dflowers-1.2.tar.gz) = 47953 bytes
+SHA1 (patch-aa) = f18cc78c739bbb9be981b935093280412b4af85b
diff --git a/audio/xmms-dflowers/patches/patch-aa b/audio/xmms-dflowers/patches/patch-aa
index 3e49438ab2d..696b81def44 100644
--- a/audio/xmms-dflowers/patches/patch-aa
+++ b/audio/xmms-dflowers/patches/patch-aa
@@ -1,26 +1,28 @@
-$NetBSD: patch-aa,v 1.2 2001/08/16 03:20:45 hubertf Exp $
+$NetBSD: patch-aa,v 1.3 2001/08/16 04:30:12 zuntum Exp $
 
---- Makefile.orig	Thu Dec 30 01:40:03 1999
+--- Makefile.orig	Sat Jun  9 23:37:36 2001
 +++ Makefile
-@@ -1,25 +1,28 @@
+@@ -1,35 +1,36 @@
  # Change paths if necessary
  
 -CC = gcc
 -OPT = -m486 -O2
-+#CC = gcc
-+#OPT = -m486 -O2
  #OPT = -mpentium -O6
  #OPT = -mcpu=k6 -march=k6 -O6
 -CONF= -DNO_WIN_DECORATIONS
 -CFLAGS = $(OPT) -Wall -fPIC `gtk-config --cflags gthread`
--LFLAGS = -shared -fPIC -L/usr/local/lib -ldl
+-LFLAGS = -shared -fPIC -L/usr/local/lib
 -OBJ = dflowers.o
--PREFIX = `which xmms | rev | cut -c10- | rev`
-+#CONF= -DNO_WIN_DECORATIONS
+-INSTALL-DIR=`xmms-config --visualization-plugin-dir`
+-XMMS_DATADIR=`xmms-config --data-dir`
 +CFLAGS+= $(OPT) -Wall -fPIC `${GTK_CONFIG} --cflags gthread`
-+#LFLAGS = -shared -fPIC -L/usr/local/lib -ldl
 +OBJ = dflowers.lo
-+VPREFIX = `xmms-config --visualization-plugin-dir`
++INSTALL-DIR=`$(XMMS_CONFIG) --visualization-plugin-dir`
++XMMS_DATADIR=`$(XMMS_CONFIG) --data-dir`
+ #INSTALL-DIR=$(HOME)/.xmms/Plugins
+ #XMMS_DATADIR=$(HOME)/.xmms
+ THEME_SUBDIR=dflowers_themes
+ XMMS_DATADIR_FLAGS=-DTHEMEDIR=\"$(XMMS_DATADIR)/$(THEME_SUBDIR)/\"
  
 -all: libdflowers.so
 +.SUFFIXES: .c .lo
@@ -28,21 +30,29 @@ $NetBSD: patch-aa,v 1.2 2001/08/16 03:20:45 hubertf Exp $
 -libdflowers.so: $(OBJ)
 -	$(CC) -o libdflowers.so $(OBJ) $(LFLAGS)
 +all: libdflowers.la
- 
--.c.o:
--	$(CC) $(CFLAGS) $(CONF) -c $< 
++
 +libdflowers.la: $(OBJ)
-+	${LIBTOOL} --mode=link $(CC) -o libdflowers.la -module -avoid-version $(OBJ) $(LFLAGS) -rpath ${VPREFIX}
++	${LIBTOOL} --mode=link $(CC) -o libdflowers.la -module -avoid-version $(OBJ) $(LFLAGS) -rpath ${INSTALL-DIR}
 +
 +.c.lo:
-+	${LIBTOOL} $(CC) $(CFLAGS) $(CONF) -c $< 
++	${LIBTOOL} $(CC) $(CFLAGS) $(CONF) $(XMMS_DATADIR_FLAGS) -c $< 
+ 
+-.c.o:
+-	$(CC) $(CFLAGS) $(XMMS_DATADIR_FLAGS) -c $< 
  
  clean:
 -	rm -f *.o core *.so* 
 +	rm -f *.o core *.so*  *.la *.so *.lo
 +	rm -fr .libs
  
--install: libdflowers.so
--	install libdflowers.so $(PREFIX)/lib/xmms/Visualization 
+ distclean:
+ 	rm -f *.o core *~
+ 
+-install:
+-	install libdflowers.so $(INSTALL-DIR)
 +install: libdflowers.la
-+	${LIBTOOL} install libdflowers.la $(VPREFIX)
++	${LIBTOOL} install libdflowers.la $(INSTALL-DIR)
+ 	mkdir -p $(XMMS_DATADIR)/$(THEME_SUBDIR)
+-	install bg_*.xpm $(XMMS_DATADIR)/$(THEME_SUBDIR)
++	$(BSD_INSTALL_DATA) bg_*.xpm $(XMMS_DATADIR)/$(THEME_SUBDIR)
++
diff --git a/audio/xmms-dflowers/pkg/PLIST b/audio/xmms-dflowers/pkg/PLIST
index 7e813509df5..611ec109e3f 100644
--- a/audio/xmms-dflowers/pkg/PLIST
+++ b/audio/xmms-dflowers/pkg/PLIST
@@ -1,4 +1,9 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2001/08/16 01:35:13 hubertf Exp $
-lib/xmms/Visualization/libdflowers.so
-lib/xmms/Visualization/libdflowers.la
+@comment $NetBSD: PLIST,v 1.2 2001/08/16 04:30:13 zuntum Exp $
 lib/xmms/Visualization/libdflowers.a
+lib/xmms/Visualization/libdflowers.la
+lib/xmms/Visualization/libdflowers.so
+share/xmms/dflowers_themes/bg_blueheart.xpm
+share/xmms/dflowers_themes/bg_def.xpm
+@dirrm share/xmms/dflowers_themes
+@dirrm share/xmms
+@dirrm lib/xmms/Visualization