use $GTK_CONFIG over gtk-config

12 files changed, 24 insertions, 20 deletions

diff --git a/audio/xmms-dflowers/Makefile b/audio/xmms-dflowers/Makefile
index 4caa72e4304..38b8b573046 100644
--- a/audio/xmms-dflowers/Makefile
+++ b/audio/xmms-dflowers/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/08/16 03:10:43 hubertf Exp $
+# $NetBSD: Makefile,v 1.4 2001/08/16 03:20:45 hubertf Exp $
 #
 
 DISTNAME=	dflowers_v1.0
@@ -15,6 +15,7 @@ DEPENDS+=	xmms>=1.2.5:../../audio/xmms
 USE_X11=	yes
 USE_LIBTOOL=	yes
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
+MAKE_ENV+=	GTK_CONFIG=${BUILDLINK_CONFIG_WRAPPER.gtk}
 
 pre-build:
 		cd ${WRKSRC} ; ${MAKE} clean
diff --git a/audio/xmms-dflowers/distinfo b/audio/xmms-dflowers/distinfo
index 1723aa52a33..80abbaeacb9 100644
--- a/audio/xmms-dflowers/distinfo
+++ b/audio/xmms-dflowers/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2001/08/16 01:35:13 hubertf Exp $
+$NetBSD: distinfo,v 1.2 2001/08/16 03:20:45 hubertf Exp $
 
 SHA1 (dflowers_v1.0.tar.gz) = b8ce00065d177923bf52a3f3f418db09afd0daaa
 Size (dflowers_v1.0.tar.gz) = 30468 bytes
-SHA1 (patch-aa) = 10cd5670f6b27621e52eaa6186644d6d09d71f5d
+SHA1 (patch-aa) = ca39aba8c539e4c23413a5dacb0b4c69d7a6dd8d
diff --git a/audio/xmms-dflowers/patches/patch-aa b/audio/xmms-dflowers/patches/patch-aa
index 72899a8d9d9..3e49438ab2d 100644
--- a/audio/xmms-dflowers/patches/patch-aa
+++ b/audio/xmms-dflowers/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/08/16 01:35:13 hubertf Exp $
+$NetBSD: patch-aa,v 1.2 2001/08/16 03:20:45 hubertf Exp $
 
 --- Makefile.orig	Thu Dec 30 01:40:03 1999
 +++ Makefile
@@ -17,7 +17,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/08/16 01:35:13 hubertf Exp $
 -OBJ = dflowers.o
 -PREFIX = `which xmms | rev | cut -c10- | rev`
 +#CONF= -DNO_WIN_DECORATIONS
-+CFLAGS+= $(OPT) -Wall -fPIC `gtk-config --cflags gthread`
++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`
diff --git a/audio/xmms-dscope/Makefile b/audio/xmms-dscope/Makefile
index 8df7b36c742..89c5dc7f4a8 100644
--- a/audio/xmms-dscope/Makefile
+++ b/audio/xmms-dscope/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/08/16 03:10:43 hubertf Exp $
+# $NetBSD: Makefile,v 1.4 2001/08/16 03:20:45 hubertf Exp $
 #
 
 DISTNAME=	dscope-1.2
@@ -12,6 +12,7 @@ COMMENT=	XMMS plugin for dual scope
 
 USE_X11=	yes
 USE_LIBTOOL=	yes
+MAKE_ENV+=	GTK_CONFIG=${BUILDLINK_CONFIG_WRAPPER.gtk}
 
 pre-build:
 		cd ${WRKSRC} ; ${MAKE} clean
diff --git a/audio/xmms-dscope/distinfo b/audio/xmms-dscope/distinfo
index becce9f80cb..7be7f34d563 100644
--- a/audio/xmms-dscope/distinfo
+++ b/audio/xmms-dscope/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2001/08/16 02:24:09 hubertf Exp $
+$NetBSD: distinfo,v 1.2 2001/08/16 03:20:45 hubertf Exp $
 
 SHA1 (dscope-1.2.tar.gz) = 5a4750c0a8170c1e2d263df1212262b3adad1210
 Size (dscope-1.2.tar.gz) = 34353 bytes
-SHA1 (patch-aa) = 5d58167310bc6b609388518d7026952a2d6ac9bc
+SHA1 (patch-aa) = bd20e420afa4bc5257afaa17f0b015fdd0e7b853
diff --git a/audio/xmms-dscope/patches/patch-aa b/audio/xmms-dscope/patches/patch-aa
index 722964279be..a966dab219c 100644
--- a/audio/xmms-dscope/patches/patch-aa
+++ b/audio/xmms-dscope/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/08/16 02:24:09 hubertf Exp $
+$NetBSD: patch-aa,v 1.2 2001/08/16 03:20:46 hubertf Exp $
 
 --- Makefile.orig	Sat Jan 20 15:18:28 2001
 +++ Makefile
@@ -14,7 +14,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/08/16 02:24:09 hubertf Exp $
 -CFLAGS = $(OPT) -Wall -fPIC `gtk-config --cflags gthread`
 -LFLAGS = -shared -fPIC -L/usr/local/lib
 -OBJ = dscope.o
-+CFLAGS+= $(OPT) -Wall -fPIC `gtk-config --cflags gthread`
++CFLAGS+= $(OPT) -Wall -fPIC `${GTK_CONFIG} --cflags gthread`
 +#LFLAGS = -shared -fPIC -L/usr/local/lib
 +OBJ = dscope.lo
  INSTALL-DIR=`xmms-config --visualization-plugin-dir`
diff --git a/audio/xmms-dspectogram/Makefile b/audio/xmms-dspectogram/Makefile
index bb49d6a7d29..3c819e18b7c 100644
--- a/audio/xmms-dspectogram/Makefile
+++ b/audio/xmms-dspectogram/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/08/16 03:10:43 hubertf Exp $
+# $NetBSD: Makefile,v 1.3 2001/08/16 03:20:46 hubertf Exp $
 #
 
 DISTNAME=	dspectogram-1.2
@@ -14,6 +14,7 @@ DEPENDS+=	xmms>=1.2.5:../../audio/xmms
 
 USE_X11=	yes
 USE_LIBTOOL=	yes
+MAKE_ENV+=	GTK_CONFIG=${BUILDLINK_CONFIG_WRAPPER.gtk}
 
 pre-build:
 		cd ${WRKSRC} ; ${MAKE} clean
diff --git a/audio/xmms-dspectogram/distinfo b/audio/xmms-dspectogram/distinfo
index da3a6119133..6016be419d1 100644
--- a/audio/xmms-dspectogram/distinfo
+++ b/audio/xmms-dspectogram/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2001/08/16 02:26:21 hubertf Exp $
+$NetBSD: distinfo,v 1.2 2001/08/16 03:20:46 hubertf Exp $
 
 SHA1 (dspectogram-1.2.tar.gz) = defad396e898efdaa597312629afc1b46bd7e9c9
 Size (dspectogram-1.2.tar.gz) = 40791 bytes
-SHA1 (patch-aa) = 8e7780bd3d3145264e9e154714020d857ce57fc8
+SHA1 (patch-aa) = f61a8b8e6243c1da1ef4da356cf7f2a25d7a1e92
diff --git a/audio/xmms-dspectogram/patches/patch-aa b/audio/xmms-dspectogram/patches/patch-aa
index 1aad57bd6b3..df40d94d6a7 100644
--- a/audio/xmms-dspectogram/patches/patch-aa
+++ b/audio/xmms-dspectogram/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/08/16 02:26:21 hubertf Exp $
+$NetBSD: patch-aa,v 1.2 2001/08/16 03:20:46 hubertf Exp $
 
 --- Makefile.orig	Sat Jan 20 15:20:49 2001
 +++ Makefile
@@ -14,7 +14,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/08/16 02:26:21 hubertf Exp $
 -CFLAGS = $(OPT) -Wall -fPIC `gtk-config --cflags gthread`
 -LFLAGS = -shared -fPIC -L/usr/local/lib
 -OBJ = dspectogram.o
-+CFLAGS+= $(OPT) -Wall -fPIC `gtk-config --cflags gthread`
++CFLAGS+= $(OPT) -Wall -fPIC `${GTK_CONFIG} --cflags gthread`
 +#LFLAGS = -shared -fPIC -L/usr/local/lib
 +OBJ = dspectogram.lo
  INSTALL-DIR=`xmms-config --visualization-plugin-dir`
diff --git a/audio/xmms-dspectralizer/Makefile b/audio/xmms-dspectralizer/Makefile
index ece0b01db39..aae249f32c1 100644
--- a/audio/xmms-dspectralizer/Makefile
+++ b/audio/xmms-dspectralizer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/08/16 03:10:44 hubertf Exp $
+# $NetBSD: Makefile,v 1.3 2001/08/16 03:20:46 hubertf Exp $
 #
 
 DISTNAME=	dspectral-1.2
@@ -14,6 +14,7 @@ DEPENDS+=	xmms>=1.2.5:../../audio/xmms
 
 USE_X11=	yes
 USE_LIBTOOL=	yes
+MAKE_ENV+=	GTK_CONFIG=${BUILDLINK_CONFIG_WRAPPER.gtk}
 
 pre-build:
 		cd ${WRKSRC} ; ${MAKE} clean
diff --git a/audio/xmms-dspectralizer/distinfo b/audio/xmms-dspectralizer/distinfo
index ddb9cbdf8f1..7a270fc6604 100644
--- a/audio/xmms-dspectralizer/distinfo
+++ b/audio/xmms-dspectralizer/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2001/08/16 02:26:52 hubertf Exp $
+$NetBSD: distinfo,v 1.2 2001/08/16 03:20:46 hubertf Exp $
 
 SHA1 (dspectral-1.2.tar.gz) = da32adcdcfef1cc2e32e4d5013623be64922c430
 Size (dspectral-1.2.tar.gz) = 41866 bytes
-SHA1 (patch-aa) = 06f081f6f1cfac8dad2912fe1dc9fba0428c90c0
+SHA1 (patch-aa) = 54f1c32a9d88a3f335b819cf563999221920a266
diff --git a/audio/xmms-dspectralizer/patches/patch-aa b/audio/xmms-dspectralizer/patches/patch-aa
index 78b9bd7bdce..f2863e3eb05 100644
--- a/audio/xmms-dspectralizer/patches/patch-aa
+++ b/audio/xmms-dspectralizer/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/08/16 02:26:52 hubertf Exp $
+$NetBSD: patch-aa,v 1.2 2001/08/16 03:20:47 hubertf Exp $
 
 --- Makefile.orig	Sat Jan 20 15:19:26 2001
 +++ Makefile
@@ -13,7 +13,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/08/16 02:26:52 hubertf Exp $
 -CFLAGS = $(OPT) -Wall -fPIC `gtk-config --cflags gthread`
 -LFLAGS = -shared -fPIC -L/usr/local/lib
 -OBJ = dspectral.o
-+CFLAGS+= $(OPT) -Wall -fPIC `gtk-config --cflags gthread`
++CFLAGS+= $(OPT) -Wall -fPIC `${GTK_CONFIG} --cflags gthread`
 +#LFLAGS = -shared -fPIC -L/usr/local/lib
 +OBJ = dspectral.lo
  INSTALL-DIR=`xmms-config --visualization-plugin-dir`