Fix compilation on xpkgwedge machines. Closes pkg/17079.

6 files changed, 16 insertions, 16 deletions

diff --git a/audio/spiralloops/Makefile b/audio/spiralloops/Makefile
index f25222b6594..ee27f2075ef 100644
--- a/audio/spiralloops/Makefile
+++ b/audio/spiralloops/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/08/12 22:27:05 zuntum Exp $
+# $NetBSD: Makefile,v 1.2 2002/06/12 00:07:34 wiz Exp $
 #
 
 DISTNAME=		SpiralLoops-2.0.0
@@ -15,7 +15,6 @@ ONLY_FOR_PLATFORM=	*-*-alpha *-*-arc *-*-cobalt *-*-dreamcast \
 			*-*-hpcmips *-*-hpcsh *-*-i386 *-*-pc532 *-*-pmax \
 			*-*-vax
 
-USE_X11=		yes
 USE_GMAKE=		yes
 GNU_CONFIGURE=		yes
 
@@ -23,4 +22,5 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/SpiralLoops ${PREFIX}/bin
 
 .include "../../x11/fltk/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/spiralloops/distinfo b/audio/spiralloops/distinfo
index 6e6090868a3..d0f65e5bfb5 100644
--- a/audio/spiralloops/distinfo
+++ b/audio/spiralloops/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.1.1.1 2001/08/12 22:27:05 zuntum Exp $
+$NetBSD: distinfo,v 1.2 2002/06/12 00:07:34 wiz Exp $
 
 SHA1 (SpiralLoops-2.0.0.tar.gz) = 47d9caa17f20827abef7708bff212bb3fad58a72
 Size (SpiralLoops-2.0.0.tar.gz) = 85458 bytes
-SHA1 (patch-aa) = 611b2f7738d73a16665a5bf13714b8ebff73dafd
+SHA1 (patch-aa) = faae8e528ab46b7a83d53719fca07588e45407a2
 SHA1 (patch-ab) = 8d21e1615909f94c750f1cf3afbf46f7e0cfdb83
 SHA1 (patch-ac) = 4a1675489e169d8ce9090eeaabf8c30ceb047897
 SHA1 (patch-ad) = 09c1734e875335dae92afef7bbbd4fdc6821eb1f
diff --git a/audio/spiralloops/patches/patch-aa b/audio/spiralloops/patches/patch-aa
index dedc1e53ee6..a354f811037 100644
--- a/audio/spiralloops/patches/patch-aa
+++ b/audio/spiralloops/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/08/12 22:27:05 zuntum Exp $
+$NetBSD: patch-aa,v 1.2 2002/06/12 00:07:35 wiz Exp $
 
 --- Makefile.in.orig	Mon May  7 14:42:59 2001
 +++ Makefile.in
@@ -8,11 +8,11 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/08/12 22:27:05 zuntum Exp $
  CXXFLAGS=	-pipe -Wall -O3 -ffast-math -DNO_DEBUG -Wno-unused 
 -INCPATH	=	-I/usr/X11R6/include
 -LINK	=	g++
-+INCPATH	=	-I${X11BASE}/include
-+LINK	=	g++ -Wl,-R${X11BASE}/lib
++INCPATH	=	-I${BUILDLINK_X11_DIR}/include -I${BUILDLINK_DIR}/include
++LINK	=	g++ -Wl,-R${X11BASE}/lib -Wl,-R${X11PREFIX}/lib
  LFLAGS	=	
 -LIBS	=   -L/usr/X11R6/lib -lfltk -lGL -lXext -lX11 -lm -ldl
-+LIBS	=   -L${X11BASE}/lib -lfltk -lGL -lXext -lX11 -lm -lossaudio
++LIBS	=   -L${BUILDLINK_X11_DIR}/lib -L${BUILDLINK_DIR}/lib -lfltk -lGL -lXext -lX11 -lm -lossaudio
  MOC	=	moc
  UIC	=	
  TAR	=	tar -cf
diff --git a/audio/spiralsynth/Makefile b/audio/spiralsynth/Makefile
index 7628677ab29..2c3717b002a 100644
--- a/audio/spiralsynth/Makefile
+++ b/audio/spiralsynth/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/05/26 01:14:26 rh Exp $
+# $NetBSD: Makefile,v 1.2 2002/06/12 00:07:35 wiz Exp $
 #
 
 DISTNAME=		SpiralSynth-0.1.7
@@ -15,7 +15,6 @@ ONLY_FOR_PLATFORM=	*-*-alpha *-*-arc *-*-cobalt *-*-dreamcast \
 			*-*-hpcmips *-*-hpcsh *-*-i386 *-*-pc532 *-*-pmax \
 			*-*-vax
 
-USE_X11=		yes
 USE_GMAKE=		yes
 GNU_CONFIGURE=		yes
 
@@ -26,4 +25,5 @@ do-install:
 		${WRKSRC}/.Spiralrc ${PREFIX}/share/spiralsynth
 
 .include "../../x11/fltk/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/spiralsynth/distinfo b/audio/spiralsynth/distinfo
index f846346142f..fb2c4893df0 100644
--- a/audio/spiralsynth/distinfo
+++ b/audio/spiralsynth/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/05/26 01:14:26 rh Exp $
+$NetBSD: distinfo,v 1.2 2002/06/12 00:07:35 wiz Exp $
 
 SHA1 (SpiralSynth-0.1.7.tar.gz) = 8b66749b940c9dcfcd4a71c319ac233139014204
 Size (SpiralSynth-0.1.7.tar.gz) = 62393 bytes
-SHA1 (patch-aa) = 7e1ed487fd499c7c87e2b6fc9a770203cf142097
+SHA1 (patch-aa) = d54ff8dbdcad1fd65487b2db6eada7b7947141e1
 SHA1 (patch-ab) = eea5f0a97ccc796a176d48b2acfe61f6a455e51f
 SHA1 (patch-ad) = 207bc32f2991f99ba2e907a417d127f0073b3d24
diff --git a/audio/spiralsynth/patches/patch-aa b/audio/spiralsynth/patches/patch-aa
index 76b983163e5..9c6e0d877ec 100644
--- a/audio/spiralsynth/patches/patch-aa
+++ b/audio/spiralsynth/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/05/26 01:14:27 rh Exp $
+$NetBSD: patch-aa,v 1.2 2002/06/12 00:07:35 wiz Exp $
 
 --- Makefile.in.orig	Tue Aug 14 20:12:55 2001
 +++ Makefile.in
@@ -8,11 +8,11 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/05/26 01:14:27 rh Exp $
  CXXFLAGS=	-pipe -Wall -O3 -ffast-math -DNO_DEBUG -Wno-unused
 -INCPATH	=	-I/usr/X11R6/include
 -LINK	=	g++
-+INCPATH	=	-I${X11BASE}/include
-+LINK	=	g++ -Wl,-R${X11BASE}/lib
++INCPATH	=	-I${BUILDLINK_X11_DIR}/include -I${BUILDLINK_DIR}/include
++LINK	=	g++ -Wl,-R${X11BASE}/lib -Wl,-R${X11PREFIX}/lib
  LFLAGS	=	
 -LIBS	=   -L/usr/X11R6/lib -lfltk -lGL -lXext -lX11 -lm 
-+LIBS	=   -L${X11BASE}/lib -lfltk -lGL -lXext -lX11 -lm  -lossaudio
++LIBS	=   -L${BUILDLINK_X11_DIR}/lib -L${BUILDLINK_DIR}/lib -lfltk -lGL -lXext -lX11 -lm  -lossaudio
  MOC	=	moc
  
  TAR	=	tar -cf