buildlink1 -> buildlink2 and make this work with audio/oss.

5 files changed, 29 insertions, 49 deletions

diff --git a/graphics/fxtv/Makefile b/graphics/fxtv/Makefile
index ad90d9e3e3f..d5d44fae860 100644
--- a/graphics/fxtv/Makefile
+++ b/graphics/fxtv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2002/05/14 00:43:35 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2002/10/08 13:09:51 jlam Exp $
 
 DISTNAME=	fxtv-1.03
 PKGREVISION=	1
@@ -13,6 +13,7 @@ COMMENT=	TV display application for Brooktree 848 compatible TV cards
 ONLY_FOR_PLATFORM=	NetBSD-1.[5-9]*-arm32 NetBSD-1.[5-9]*-atari \
 			NetBSD-1.[5-9]*-i386
 
+USE_BUILDLINK2=	YES
 USE_X11BASE=	YES
 USE_GMAKE=	YES
 XAW_TYPE?=	3d
@@ -31,7 +32,16 @@ XAW_TYPE=	3d
 post-extract:
 	@${RM} -f ${WRKSRC}/videolib/videolib.o
 
-.include "../../graphics/tiff/buildlink.mk"
-.include "../../graphics/xpm/buildlink.mk"
-.include "../../mk/xaw.buildlink.mk"
+post-patch:
+	cd ${WRKSRC}; for file in app_rsrc.h Fxtv; do			\
+		${SED}	-e "s,/dev/dsp,${DEVOSSAUDIO},g"		\
+			$${file} > $${file}.fixed;			\
+		${MV} -f $${file}.fixed $${file};			\
+	done
+
+.include "../../graphics/tiff/buildlink2.mk"
+.include "../../graphics/xpm/buildlink2.mk"
+.include "../../mk/xaw.buildlink2.mk"
+.include "../../mk/ossaudio.buildlink2.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/fxtv/distinfo b/graphics/fxtv/distinfo
index 80a6706ebd4..829d8f421cb 100644
--- a/graphics/fxtv/distinfo
+++ b/graphics/fxtv/distinfo
@@ -1,11 +1,9 @@
-$NetBSD: distinfo,v 1.4 2002/05/27 14:44:26 wiz Exp $
+$NetBSD: distinfo,v 1.5 2002/10/08 13:09:52 jlam Exp $
 
 SHA1 (fxtv-1.03.tgz) = 2ed9f2bee879a931c7f963a4ad7d07ef9cd297f9
 Size (fxtv-1.03.tgz) = 198669 bytes
-SHA1 (patch-aa) = 00463e17d9094d4d8fd7e67ced83d6429dc4a961
+SHA1 (patch-aa) = 57e48632d026f208aef2708e1397014f83207427
 SHA1 (patch-ab) = a62c497255063a88b7d240e902a45c85f59f84b0
 SHA1 (patch-ac) = 27a825287c17d1cc957fb89ba2f665c01f998c15
-SHA1 (patch-ad) = 283be930d67085accf3876924bb69068eed7b5a4
-SHA1 (patch-ae) = db041f1c2bdbfe2b3da95d0d798fc4eb4f63d633
 SHA1 (patch-af) = 50ab2d960955a8e97b6b56265195ec325b206cf9
 SHA1 (patch-ag) = 126e1fab604038460fd79cc3487b1b1e30497742
diff --git a/graphics/fxtv/patches/patch-aa b/graphics/fxtv/patches/patch-aa
index 6d39eb8b435..cf1cd0d99d9 100644
--- a/graphics/fxtv/patches/patch-aa
+++ b/graphics/fxtv/patches/patch-aa
@@ -1,26 +1,24 @@
-$NetBSD: patch-aa,v 1.4 2001/02/17 22:04:17 veego Exp $
+$NetBSD: patch-aa,v 1.5 2002/10/08 13:09:52 jlam Exp $
 
---- Makefile.orig	Mon Feb 12 23:08:59 2001
-+++ Makefile	Sat Feb 17 22:47:49 2001
-@@ -4,13 +4,14 @@
+--- Makefile.orig	Mon Feb 12 14:08:59 2001
++++ Makefile
+@@ -4,13 +4,10 @@
  
  HAVE_XFREE86 = YES
  
-+X11BASE      ?= /usr/X11R6
-+
- ifneq ($(X11PREFIX),)                      # NetBSD
+-ifneq ($(X11PREFIX),)                      # NetBSD
 -X11BASE      ?= $(X11PREFIX)
-+X11BASEINST  ?= $(X11PREFIX)
- else
--X11BASE      ?= /usr/X11R6
-+X11BASEINST  ?= $(X11BASE)
- endif
+-else
+ X11BASE      ?= /usr/X11R6
+-endif
++X11BASEINST  ?= $(PREFIX)
  
 -X11BASEINST  ?= $(X11BASE)
++PREFIX       ?= /usr/local
  LOCALBASE    ?= /usr/local
  DEBUG        = NO
  OS           = $(shell uname -s)
-@@ -24,15 +25,6 @@
+@@ -24,15 +21,6 @@ override LIBDIRS           = $(X11BASE)/
  override SHELL             = /bin/sh
  
  #
@@ -36,7 +34,7 @@ $NetBSD: patch-aa,v 1.4 2001/02/17 22:04:17 veego Exp $
  # OpenBSD stuff
  #
  ifeq ($(OS),OpenBSD)
-@@ -71,6 +63,15 @@
+@@ -71,6 +59,15 @@ override CFLAGS           += -DHAVE_XFRE
  endif
  
  override CFLAGS           += $(C_WARN_FLAG) -DX11BASE=\"$(X11BASEINST)\"
@@ -47,7 +45,7 @@ $NetBSD: patch-aa,v 1.4 2001/02/17 22:04:17 veego Exp $
 +ifeq ($(OS),NetBSD)
 +  override INC            += -I$(LOCALBASE)/include
 +  override LIBDIRS        += $(LOCALBASE)/lib
-+  override LD_INC         += -lossaudio -lz
++  override LD_INC         += $(LIBOSSAUDIO) -lz
 +endif
  
  ifeq ($(OS), linux)
diff --git a/graphics/fxtv/patches/patch-ad b/graphics/fxtv/patches/patch-ad
deleted file mode 100644
index 8a83185d553..00000000000
--- a/graphics/fxtv/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.4 2001/03/06 09:39:59 wiz Exp $
-
---- app_rsrc.h.orig	Mon Feb 12 22:17:53 2001
-+++ app_rsrc.h
-@@ -389,7 +389,7 @@
-         (XtPointer) True },
-     { RNdspDevice, RCaudioDevice, XtRString, sizeof(String),
-         XtOffsetOf(AppResources, dsp_device ), XtRImmediate,
--        "/dev/dsp"  },
-+        "/dev/audio"  },
-     { RNmixerDevice, RCaudioDevice, XtRString, sizeof(String),
-         XtOffsetOf(AppResources, mixer_device ), XtRImmediate,
-         "/dev/mixer"  },
diff --git a/graphics/fxtv/patches/patch-ae b/graphics/fxtv/patches/patch-ae
deleted file mode 100644
index 13abb1e6641..00000000000
--- a/graphics/fxtv/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.3 2001/03/06 09:39:59 wiz Exp $
-
---- Fxtv.orig	Mon Feb 12 22:07:05 2001
-+++ Fxtv
-@@ -57,7 +57,7 @@
- 
- ! Method to override audio device
- !Fxtv*doSound:          true
--!Fxtv*dspDevice:        /dev/dsp
-+!Fxtv*dspDevice:        /dev/audio
- !Fxtv*mixerDevice:      /dev/mixer
- !Fxtv*mixerChannel:     line
-                                         ! line, line1/2/3, cd, mic, video