diff options
| author | jlam <jlam> | 2002-10-08 13:09:51 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2002-10-08 13:09:51 +0000 |
| commit | 9b9cebc7c30ca2b6686232871bdb39c1331b3c64 (patch) | |
| tree | 5340a7323e2f8e7f77eaede38bb11d5f13da474e /graphics/fxtv/patches | |
| parent | 91c4a975e3cc72cf611adccf0c920613e42e48f5 (diff) | |
| download | pkgsrc-9b9cebc7c30ca2b6686232871bdb39c1331b3c64.tar.gz | |
buildlink1 -> buildlink2 and make this work with audio/oss.
Diffstat (limited to 'graphics/fxtv/patches')
| -rw-r--r-- | graphics/fxtv/patches/patch-aa | 28 | ||||
| -rw-r--r-- | graphics/fxtv/patches/patch-ad | 13 | ||||
| -rw-r--r-- | graphics/fxtv/patches/patch-ae | 13 |
3 files changed, 13 insertions, 41 deletions
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 |