From 5ec5f35d2f3d84cf868ae3bc0555d23d6cd43888 Mon Sep 17 00:00:00 2001
From: joerg <joerg>
Date: Wed, 12 Apr 2006 22:44:27 +0000
Subject: Don't patch a file originating in FILESDIR, change it directly.

---
 graphics/vcg/files/tMakefile  | 10 +++++-----
 graphics/vcg/patches/patch-aq | 38 --------------------------------------
 2 files changed, 5 insertions(+), 43 deletions(-)
 delete mode 100644 graphics/vcg/patches/patch-aq

(limited to 'graphics/vcg')

diff --git a/graphics/vcg/files/tMakefile b/graphics/vcg/files/tMakefile
index 71351227abf..400c52eb6c7 100644
--- a/graphics/vcg/files/tMakefile
+++ b/graphics/vcg/files/tMakefile
@@ -17,7 +17,7 @@
 # /*                                                                    */
 # /*--------------------------------------------------------------------*/
 #
-# $NetBSD: tMakefile,v 1.3 1999/06/13 13:06:08 sakamoto Exp $
+# $NetBSD: tMakefile,v 1.4 2006/04/12 22:44:27 joerg Exp $
 # FreeBSD Id: tMakefile,v 1.1.1.1 1995/02/19 09:25:45 hsu Exp $
 #
 # FreeBSD Log: tMakefile,v $
@@ -39,12 +39,12 @@ SHELL = /bin/sh
 # where the binaries go
 # BINDIR = /usr/local/bin/
 # BINDIR = /RW/esprit/users/sander/PUBLIC/CMD/
-BINDIR = /usr/X11R6/bin
+BINDIR = ${PREFIX}/bin
 
 # where the manual pages go
 # MANDIR = /usr/local/man/manl/
 # MANDIR = /RW/esprit/users/sander/PUBLIC/MAN/
-MANDIR = /usr/X11R6/man/manl
+MANDIR = ${PREFIX}/man/manl
 
 # what the manual extension is
 MANEXT = l
@@ -105,7 +105,7 @@ CLINKFLAGS = -o
 # then please use
 # INCLUDES = -I/usr/local/X11/include/
 # INCLUDES = -I/RW/esprit/X11R5/include/
-INCLUDES = -I/usr/X11R6/include/
+INCLUDES = -I${X11BASE}/include/
 
 # Library directories
 # For Sunview, this should be enough, because on Suns, Sunview
@@ -118,7 +118,7 @@ INCLUDES = -I/usr/X11R6/include/
 # then please use
 # LIBPATH = -L/usr/local/X11/lib/
 # LIBPATH = -L/RW/esprit/X11R5/lib/
-LIBPATH = -L/usr/X11R6/lib/
+LIBPATH = -L${X11BASE}/lib/
 
 # Libraries
 # Libraries for SunView
diff --git a/graphics/vcg/patches/patch-aq b/graphics/vcg/patches/patch-aq
deleted file mode 100644
index e48a271c462..00000000000
--- a/graphics/vcg/patches/patch-aq
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-aq,v 1.1 2000/09/21 08:49:49 sakamoto Exp $
-
---- preconf/X11ccNetBSD/tMakefile.orig	Thu Sep 21 06:28:06 2000
-+++ preconf/X11ccNetBSD/tMakefile	Thu Sep 21 06:30:31 2000
-@@ -39,12 +39,12 @@
- # where the binaries go
- # BINDIR = /usr/local/bin/
- # BINDIR = /RW/esprit/users/sander/PUBLIC/CMD/
--BINDIR = /usr/X11R6/bin
-+BINDIR = ${PREFIX}/bin
- 
- # where the manual pages go
- # MANDIR = /usr/local/man/manl/
- # MANDIR = /RW/esprit/users/sander/PUBLIC/MAN/
--MANDIR = /usr/X11R6/man/manl
-+MANDIR = ${PREFIX}/man/manl
- 
- # what the manual extension is
- MANEXT = l
-@@ -105,7 +105,7 @@
- # then please use
- # INCLUDES = -I/usr/local/X11/include/
- # INCLUDES = -I/RW/esprit/X11R5/include/
--INCLUDES = -I/usr/X11R6/include/
-+INCLUDES = -I${X11BASE}/include/
- 
- # Library directories
- # For Sunview, this should be enough, because on Suns, Sunview
-@@ -118,7 +118,7 @@
- # then please use
- # LIBPATH = -L/usr/local/X11/lib/
- # LIBPATH = -L/RW/esprit/X11R5/lib/
--LIBPATH = -L/usr/X11R6/lib/
-+LIBPATH = -L${X11BASE}/lib/
- 
- # Libraries
- # Libraries for SunView
-
-- 
cgit v1.2.3