1 files changed, 28 insertions, 18 deletions
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)
++