diff options
author | veego <veego@pkgsrc.org> | 2001-02-17 22:04:17 +0000 |
---|---|---|
committer | veego <veego@pkgsrc.org> | 2001-02-17 22:04:17 +0000 |
commit | 561669f4ccbb63c6db64078387579a4ed1472fe7 (patch) | |
tree | 636c0772248fbb09e372516634ccc1d871aeaaff /graphics/fxtv | |
parent | d2b9f2e4323e422379c68029a8659770bca3a179 (diff) | |
download | pkgsrc-561669f4ccbb63c6db64078387579a4ed1472fe7.tar.gz |
X11BASEINST needs the special handling on NetBSD and not X11BASE.
xpkgwedge works again.
Diffstat (limited to 'graphics/fxtv')
-rw-r--r-- | graphics/fxtv/files/patch-sum | 4 | ||||
-rw-r--r-- | graphics/fxtv/patches/patch-aa | 26 |
2 files changed, 24 insertions, 6 deletions
diff --git a/graphics/fxtv/files/patch-sum b/graphics/fxtv/files/patch-sum index 2678e53b065..8df65fcbb1f 100644 --- a/graphics/fxtv/files/patch-sum +++ b/graphics/fxtv/files/patch-sum @@ -1,5 +1,5 @@ -$NetBSD: patch-sum,v 1.6 2001/02/13 21:45:07 tron Exp $ +$NetBSD: patch-sum,v 1.7 2001/02/17 22:04:17 veego Exp $ -MD5 (patch-aa) = 7549ee363a0013d91d3c913581a026ef +MD5 (patch-aa) = 1f6d1571ccd5dc0e4719318f68b3a411 MD5 (patch-ab) = 5d22d3e8eb7fb13c85195e7f81a670e0 MD5 (patch-ac) = 5ec2ba94ef44c7a129fa1c1aa08ca836 diff --git a/graphics/fxtv/patches/patch-aa b/graphics/fxtv/patches/patch-aa index f186155bda7..6d39eb8b435 100644 --- a/graphics/fxtv/patches/patch-aa +++ b/graphics/fxtv/patches/patch-aa @@ -1,8 +1,26 @@ -$NetBSD: patch-aa,v 1.3 2001/02/13 21:45:07 tron Exp $ +$NetBSD: patch-aa,v 1.4 2001/02/17 22:04:17 veego Exp $ --- Makefile.orig Mon Feb 12 23:08:59 2001 -+++ Makefile Tue Feb 13 22:42:19 2001 -@@ -24,15 +24,6 @@ ++++ Makefile Sat Feb 17 22:47:49 2001 +@@ -4,13 +4,14 @@ + + HAVE_XFREE86 = YES + ++X11BASE ?= /usr/X11R6 ++ + ifneq ($(X11PREFIX),) # NetBSD +-X11BASE ?= $(X11PREFIX) ++X11BASEINST ?= $(X11PREFIX) + else +-X11BASE ?= /usr/X11R6 ++X11BASEINST ?= $(X11BASE) + endif + +-X11BASEINST ?= $(X11BASE) + LOCALBASE ?= /usr/local + DEBUG = NO + OS = $(shell uname -s) +@@ -24,15 +25,6 @@ override SHELL = /bin/sh # @@ -18,7 +36,7 @@ $NetBSD: patch-aa,v 1.3 2001/02/13 21:45:07 tron Exp $ # OpenBSD stuff # ifeq ($(OS),OpenBSD) -@@ -71,6 +62,15 @@ +@@ -71,6 +63,15 @@ endif override CFLAGS += $(C_WARN_FLAG) -DX11BASE=\"$(X11BASEINST)\" |