From 3924125175bd0246ebc5f5cb84d121207c20abd3 Mon Sep 17 00:00:00 2001 From: jlam Date: Sat, 21 Sep 2002 00:46:56 +0000 Subject: buildlink1 -> buildlink2 --- audio/spiralloops/Makefile | 7 ++++--- audio/spiralloops/distinfo | 4 ++-- audio/spiralloops/patches/patch-aa | 6 +++--- 3 files changed, 9 insertions(+), 8 deletions(-) (limited to 'audio/spiralloops') diff --git a/audio/spiralloops/Makefile b/audio/spiralloops/Makefile index ee27f2075ef..7e0961002e8 100644 --- a/audio/spiralloops/Makefile +++ b/audio/spiralloops/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2002/06/12 00:07:34 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2002/09/21 00:54:39 jlam Exp $ # DISTNAME= SpiralLoops-2.0.0 @@ -15,12 +15,13 @@ ONLY_FOR_PLATFORM= *-*-alpha *-*-arc *-*-cobalt *-*-dreamcast \ *-*-hpcmips *-*-hpcsh *-*-i386 *-*-pc532 *-*-pmax \ *-*-vax +USE_BUILDLINK2= yes +USE_X11= yes USE_GMAKE= yes GNU_CONFIGURE= yes do-install: ${INSTALL_PROGRAM} ${WRKSRC}/SpiralLoops ${PREFIX}/bin -.include "../../x11/fltk/buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../x11/fltk/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/spiralloops/distinfo b/audio/spiralloops/distinfo index d0f65e5bfb5..9ec8e6fe8ab 100644 --- a/audio/spiralloops/distinfo +++ b/audio/spiralloops/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.2 2002/06/12 00:07:34 wiz Exp $ +$NetBSD: distinfo,v 1.3 2002/09/21 00:54:39 jlam Exp $ SHA1 (SpiralLoops-2.0.0.tar.gz) = 47d9caa17f20827abef7708bff212bb3fad58a72 Size (SpiralLoops-2.0.0.tar.gz) = 85458 bytes -SHA1 (patch-aa) = faae8e528ab46b7a83d53719fca07588e45407a2 +SHA1 (patch-aa) = e78de915a2d2480155aa01e2448a024a03ee6a01 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 a354f811037..a563963fc72 100644 --- a/audio/spiralloops/patches/patch-aa +++ b/audio/spiralloops/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.2 2002/06/12 00:07:35 wiz Exp $ +$NetBSD: patch-aa,v 1.3 2002/09/21 00:54:40 jlam Exp $ --- Makefile.in.orig Mon May 7 14:42:59 2001 +++ Makefile.in @@ -8,11 +8,11 @@ $NetBSD: patch-aa,v 1.2 2002/06/12 00:07:35 wiz Exp $ CXXFLAGS= -pipe -Wall -O3 -ffast-math -DNO_DEBUG -Wno-unused -INCPATH = -I/usr/X11R6/include -LINK = g++ -+INCPATH = -I${BUILDLINK_X11_DIR}/include -I${BUILDLINK_DIR}/include ++INCPATH = -I${X11BASE}/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${BUILDLINK_X11_DIR}/lib -L${BUILDLINK_DIR}/lib -lfltk -lGL -lXext -lX11 -lm -lossaudio ++LIBS = -L${X11BASE}/lib -lfltk -lGL -lXext -lX11 -lm -lossaudio MOC = moc UIC = TAR = tar -cf -- cgit v1.2.3