[pkgsrc/trunk]: pkgsrc/graphics/vcg Don't patch a file originating in FILESDI...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e2c1ac681da5
branches:  trunk
changeset: 511326:e2c1ac681da5
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Wed Apr 12 22:44:27 2006 +0000

description:
Don't patch a file originating in FILESDIR, change it directly.

diffstat:

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

diffs (87 lines):

diff -r 5e8f9cd8f5f8 -r e2c1ac681da5 graphics/vcg/files/tMakefile
--- a/graphics/vcg/files/tMakefile      Wed Apr 12 22:36:34 2006 +0000
+++ b/graphics/vcg/files/tMakefile      Wed Apr 12 22:44:27 2006 +0000
@@ -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 @@
 # 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
diff -r 5e8f9cd8f5f8 -r e2c1ac681da5 graphics/vcg/patches/patch-aq
--- a/graphics/vcg/patches/patch-aq     Wed Apr 12 22:36:34 2006 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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
-