diff options
| -rw-r--r-- | audio/rosegarden/Makefile | 8 | ||||
| -rw-r--r-- | audio/spiralloops/Makefile | 7 | ||||
| -rw-r--r-- | audio/spiralloops/distinfo | 4 | ||||
| -rw-r--r-- | audio/spiralloops/patches/patch-aa | 6 | ||||
| -rw-r--r-- | audio/spiralsynth/Makefile | 7 | ||||
| -rw-r--r-- | audio/spiralsynth/distinfo | 4 | ||||
| -rw-r--r-- | audio/spiralsynth/patches/patch-aa | 6 | ||||
| -rw-r--r-- | net/xrmftp/Makefile | 13 |
8 files changed, 28 insertions, 27 deletions
diff --git a/audio/rosegarden/Makefile b/audio/rosegarden/Makefile index 38920980081..efec67e456b 100644 --- a/audio/rosegarden/Makefile +++ b/audio/rosegarden/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2002/03/25 01:49:04 jmc Exp $ +# $NetBSD: Makefile,v 1.7 2002/09/21 00:49:43 jlam Exp $ DISTNAME= rosegarden-2.1pl3 PKGNAME= rosegarden-2.1.3 @@ -9,16 +9,14 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.all-day-breakfast.com/rosegarden/ COMMENT= notation editor & MIDI sequencer +USE_BUILDLINK2= YES GNU_CONFIGURE= YES USE_GMAKE= YES MAKE_ENV+= GCC=yes USE_X11BASE= YES -USE_BUILDLINK_ONLY= YES - post-extract: cd ${WRKSRC} && ${MV} Rosegarden Rosegarden.in -.include "../../lang/tcl/buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../lang/tcl/buildlink2.mk" .include "../../mk/bsd.pkg.mk" 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 diff --git a/audio/spiralsynth/Makefile b/audio/spiralsynth/Makefile index 2c3717b002a..c374934e5ec 100644 --- a/audio/spiralsynth/Makefile +++ b/audio/spiralsynth/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2002/06/12 00:07:35 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2002/09/21 00:56:03 jlam Exp $ # DISTNAME= SpiralSynth-0.1.7 @@ -15,6 +15,8 @@ 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 @@ -24,6 +26,5 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/.SpiralPatches.bank \ ${WRKSRC}/.Spiralrc ${PREFIX}/share/spiralsynth -.include "../../x11/fltk/buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../x11/fltk/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/spiralsynth/distinfo b/audio/spiralsynth/distinfo index fb2c4893df0..d88abe5891d 100644 --- a/audio/spiralsynth/distinfo +++ b/audio/spiralsynth/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.2 2002/06/12 00:07:35 wiz Exp $ +$NetBSD: distinfo,v 1.3 2002/09/21 00:56:03 jlam Exp $ SHA1 (SpiralSynth-0.1.7.tar.gz) = 8b66749b940c9dcfcd4a71c319ac233139014204 Size (SpiralSynth-0.1.7.tar.gz) = 62393 bytes -SHA1 (patch-aa) = d54ff8dbdcad1fd65487b2db6eada7b7947141e1 +SHA1 (patch-aa) = 808568dac9ddd3331434a6a78bc9778fed635d13 SHA1 (patch-ab) = eea5f0a97ccc796a176d48b2acfe61f6a455e51f SHA1 (patch-ad) = 207bc32f2991f99ba2e907a417d127f0073b3d24 diff --git a/audio/spiralsynth/patches/patch-aa b/audio/spiralsynth/patches/patch-aa index 9c6e0d877ec..50f8856de1f 100644 --- a/audio/spiralsynth/patches/patch-aa +++ b/audio/spiralsynth/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:56:03 jlam Exp $ --- Makefile.in.orig Tue Aug 14 20:12:55 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 -+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 TAR = tar -cf diff --git a/net/xrmftp/Makefile b/net/xrmftp/Makefile index d61ff649772..23ab8a7ba18 100644 --- a/net/xrmftp/Makefile +++ b/net/xrmftp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2002/04/21 11:07:04 rh Exp $ +# $NetBSD: Makefile,v 1.2 2002/09/21 00:46:56 jlam Exp $ DISTNAME= xrmftp-1.2.4 CATEGORIES= net @@ -9,14 +9,15 @@ MAINTAINER= rxg@netbsd.org HOMEPAGE= http://www.mat.uni.torun.pl/~rafmet/xrmftp/ COMMENT= FTP client for X Window System +USE_BUILDLINK2= yes USE_X11BASE= yes -WRKSRC= ${WRKDIR}/xrmftp-1.2.4.src +WRKSRC= ${WRKDIR}/${DISTNAME}.src do-install: ${INSTALL_PROGRAM} ${WRKSRC}/xrmftp ${PREFIX}/bin -.include "../../graphics/jpeg/buildlink.mk" -.include "../../graphics/xpm/buildlink.mk" -.include "../../x11/xforms/buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../graphics/jpeg/buildlink2.mk" +.include "../../graphics/xpm/buildlink2.mk" +.include "../../x11/xforms/buildlink2.mk" + .include "../../mk/bsd.pkg.mk" |