summaryrefslogtreecommitdiff
path: root/graphics/fxtv
diff options
context:
space:
mode:
authorveego <veego@pkgsrc.org>2000-08-23 21:27:58 +0000
committerveego <veego@pkgsrc.org>2000-08-23 21:27:58 +0000
commit2c342625345174b9c80797a75267f02940096ed5 (patch)
tree2e694343dd114b7e47f8ca39d8052829c11e9c11 /graphics/fxtv
parent7ecb761a8a8431407048339d3148ad786029cbe1 (diff)
downloadpkgsrc-2c342625345174b9c80797a75267f02940096ed5.tar.gz
Change a few X11BASE to X11PREFIX so it works with xpkgwedge.
Diffstat (limited to 'graphics/fxtv')
-rw-r--r--graphics/fxtv/Makefile4
-rw-r--r--graphics/fxtv/files/patch-sum4
-rw-r--r--graphics/fxtv/patches/patch-aa41
3 files changed, 43 insertions, 6 deletions
diff --git a/graphics/fxtv/Makefile b/graphics/fxtv/Makefile
index 54ef6483f20..852fbabb49b 100644
--- a/graphics/fxtv/Makefile
+++ b/graphics/fxtv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2000/08/16 17:21:25 tron Exp $
+# $NetBSD: Makefile,v 1.9 2000/08/23 21:27:58 veego Exp $
DISTNAME= fxtv-1.02
CATEGORIES= graphics
@@ -20,6 +20,8 @@ USE_X11BASE= yes
.include "../../mk/bsd.prefs.mk"
+MAKE_ENV+= X11PREFIX=${X11PREFIX}
+
XAW_TYPE?= 3d
# The purpose of this check is to make sure that there is a "Xaw3d"
diff --git a/graphics/fxtv/files/patch-sum b/graphics/fxtv/files/patch-sum
index b741a17b705..6f7020a5179 100644
--- a/graphics/fxtv/files/patch-sum
+++ b/graphics/fxtv/files/patch-sum
@@ -1,6 +1,6 @@
-$NetBSD: patch-sum,v 1.2 2000/05/09 22:07:16 tron Exp $
+$NetBSD: patch-sum,v 1.3 2000/08/23 21:27:59 veego Exp $
-MD5 (patch-aa) = c3f539cf4a63a9aab2a7179668d13a9e
+MD5 (patch-aa) = b6244cec2cc1f4dc60ab2bbc5428322d
MD5 (patch-ab) = 344e3f1b8655461063e2c3a4aafdd01b
MD5 (patch-ac) = 6f73993eaa9e760d9a196c27a448fa46
MD5 (patch-ad) = 2c311f3dfb54afc9bda39cea94af6928
diff --git a/graphics/fxtv/patches/patch-aa b/graphics/fxtv/patches/patch-aa
index bd91ee48c03..423d83ccf00 100644
--- a/graphics/fxtv/patches/patch-aa
+++ b/graphics/fxtv/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/05/07 20:34:13 tron Exp $
+$NetBSD: patch-aa,v 1.2 2000/08/23 21:27:59 veego Exp $
---- Makefile.orig Fri Nov 5 01:43:51 1999
-+++ Makefile Sun May 7 22:30:05 2000
+--- Makefile Fri Nov 5 01:43:51 1999
++++ Makefile Wed Aug 23 23:10:41 2000
@@ -3,7 +3,6 @@
#
@@ -21,3 +21,38 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/05/07 20:34:13 tron Exp $
override SHELL = /bin/sh
#
+@@ -53,7 +52,7 @@
+ override CFLAGS += -DHAVE_XFREE86
+ endif
+
+-override CFLAGS += $(C_WARN_FLAG) -DX11BASE=\"$(X11BASE)\"
++override CFLAGS += $(C_WARN_FLAG) -DX11BASE=\"$(X11PREFIX)\"
+
+ ifeq ($(OS), linux)
+ override CFLAGS = $(CFLAGS) -DOLD_TUNER_IFACE
+@@ -74,7 +73,7 @@
+ override LDFLAGS := -g $(LDFLAGS)
+ endif
+
+-override FXTV_LIBDIR = $(X11BASE)/lib/X11/fxtv
++override FXTV_LIBDIR = $(X11PREFIX)/lib/X11/fxtv
+
+ override CSRC = $(wildcard *.c)
+ override PIXMAPS = $(wildcard bitmaps/*.x?m)
+@@ -102,11 +101,11 @@
+ mkdir -p $(FXTV_LIBDIR)/bitmaps
+ install -c -m 444 -o root $(PIXMAPS) $(FXTV_LIBDIR)/bitmaps
+ install -c -m 444 -o root README $(FXTV_LIBDIR)
+- mkdir -p $(X11BASE)/lib/X11/app-defaults
+- install -c -m 444 -o root Fxtv $(X11BASE)/lib/X11/app-defaults
+- mkdir -p $(X11BASE)/bin
+- install -c -m 444 -o root fxtv.1 $(X11BASE)/man/man1/fxtv.1
+- install -c -m 555 -o root fxtv $(X11BASE)/bin
++ mkdir -p $(X11PREFIX)/lib/X11/app-defaults
++ install -c -m 444 -o root Fxtv $(X11PREFIX)/lib/X11/app-defaults
++ mkdir -p $(X11PREFIX)/bin
++ install -c -m 444 -o root fxtv.1 $(X11PREFIX)/man/man1/fxtv.1
++ install -c -m 555 -o root fxtv $(X11PREFIX)/bin
+ install -c -m 555 -o root fxtv_cnvt.sh $(FXTV_LIBDIR)
+
+ clean: