From b36ef9f0c7bc41785af289147c915d3d19fb3812 Mon Sep 17 00:00:00 2001 From: minskim Date: Mon, 3 May 2004 23:18:21 +0000 Subject: Use ossaudio.buildlink3.mk to be OS-independent. --- audio/mixer.app/Makefile | 3 ++- audio/mixer.app/distinfo | 4 ++-- audio/mixer.app/patches/patch-aa | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) (limited to 'audio') diff --git a/audio/mixer.app/Makefile b/audio/mixer.app/Makefile index a7d3a7f1cb4..e9c708c3484 100644 --- a/audio/mixer.app/Makefile +++ b/audio/mixer.app/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2004/05/03 23:12:27 minskim Exp $ +# $NetBSD: Makefile,v 1.7 2004/05/03 23:18:21 minskim Exp $ # DISTNAME= Mixer.app-1.8.0 @@ -25,4 +25,5 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/Mixer.app .include "../../graphics/xpm/buildlink3.mk" +.include "../../mk/ossaudio.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/mixer.app/distinfo b/audio/mixer.app/distinfo index 2c95412a462..d346a87cf43 100644 --- a/audio/mixer.app/distinfo +++ b/audio/mixer.app/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.5 2004/05/03 23:10:04 minskim Exp $ +$NetBSD: distinfo,v 1.6 2004/05/03 23:18:21 minskim Exp $ SHA1 (Mixer.app-1.8.0.tar.gz) = 68b644e2b13fe4a89461cf28ab6aebbcaedc0552 Size (Mixer.app-1.8.0.tar.gz) = 37884 bytes -SHA1 (patch-aa) = d46c2e76c5a2801bc7be7208088000d5e0a4fc5e +SHA1 (patch-aa) = 4bbc4735d3d2075f2e890cdbd6ff48d70c8cc7a5 SHA1 (patch-ab) = 9ca9690364e4e42c64b227f58f913848d5f980a4 diff --git a/audio/mixer.app/patches/patch-aa b/audio/mixer.app/patches/patch-aa index 02e15417448..a377c0a5aec 100644 --- a/audio/mixer.app/patches/patch-aa +++ b/audio/mixer.app/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.3 2004/05/03 23:10:04 minskim Exp $ +$NetBSD: patch-aa,v 1.4 2004/05/03 23:18:21 minskim Exp $ --- Makefile.orig 2002-09-15 11:37:33.000000000 -0500 +++ Makefile @@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.3 2004/05/03 23:10:04 minskim Exp $ -LDFLAGS += -L/usr/X11R6/lib -lXpm -lXext -lX11 +#CXX=c++ +CXXFLAGS += -Wall -pedantic -fno-rtti -fno-exceptions -I${X11BASE}/include -+LDFLAGS += -Wl,-R${X11BASE}/lib -Wl,-R${X11PREFIX}/lib -L${X11BASE}/lib -lXpm -lXext -lX11 -lossaudio ++LDFLAGS += -Wl,-R${X11BASE}/lib -Wl,-R${X11PREFIX}/lib -L${X11BASE}/lib -lXpm -lXext -lX11 ${LIBOSSAUDIO} OBJECTS = Main.o Mixer.o Xpm.o -- cgit v1.2.3