[pkgsrc/trunk]: pkgsrc/x11/tk-Tix Don't use ../ in patch paths as GNU patch d...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d3266e3dda5b
branches:  trunk
changeset: 590080:d3266e3dda5b
user:      dholland <dholland%pkgsrc.org@localhost>
date:      Sat Jul 02 18:06:50 2011 +0000

description:
Don't use ../ in patch paths as GNU patch doesn't like it.

diffstat:

 x11/tk-Tix/Makefile         |   5 +++--
 x11/tk-Tix/distinfo         |  10 +++++-----
 x11/tk-Tix/patches/patch-aa |   6 +++---
 x11/tk-Tix/patches/patch-ab |   6 +++---
 x11/tk-Tix/patches/patch-ac |   6 +++---
 x11/tk-Tix/patches/patch-ad |   8 +++++---
 6 files changed, 22 insertions(+), 19 deletions(-)

diffs (95 lines):

diff -r 5dc3d104ef90 -r d3266e3dda5b x11/tk-Tix/Makefile
--- a/x11/tk-Tix/Makefile       Sat Jul 02 17:58:19 2011 +0000
+++ b/x11/tk-Tix/Makefile       Sat Jul 02 18:06:50 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2009/07/07 18:22:02 joerg Exp $
+# $NetBSD: Makefile,v 1.16 2011/07/02 18:06:50 dholland Exp $
 #
 
 DISTNAME=      tix8.2.0b1
@@ -15,7 +15,8 @@
 
 MAKE_JOBS_SAFE=                no
 
-WRKSRC=                        ${WRKDIR}/tix8.2.0/unix
+WRKSRC=                        ${WRKDIR}/tix8.2.0
+CONFIGURE_DIRS=                unix    # also sets BUILD_DIRS
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --enable-shared --with-tcl=${BUILDLINK_PREFIX.tcl}/lib \
                        --with-tk=${BUILDLINK_PREFIX.tk}/lib \
diff -r 5dc3d104ef90 -r d3266e3dda5b x11/tk-Tix/distinfo
--- a/x11/tk-Tix/distinfo       Sat Jul 02 17:58:19 2011 +0000
+++ b/x11/tk-Tix/distinfo       Sat Jul 02 18:06:50 2011 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.4 2005/12/12 15:49:47 joerg Exp $
+$NetBSD: distinfo,v 1.5 2011/07/02 18:06:50 dholland Exp $
 
 SHA1 (tix8.2.0b1.tar.gz) = c9114e56c41fc492532639127439d6f267c51402
 RMD160 (tix8.2.0b1.tar.gz) = 1a80662812ce2b97f7d052f77556de6782f5ee47
 Size (tix8.2.0b1.tar.gz) = 1374621 bytes
-SHA1 (patch-aa) = b9c15d3435d289a3469e4c1bc261df99e1a2bf2e
-SHA1 (patch-ab) = 2a46093df4d19c481d58b2a9b8945430d547a12c
-SHA1 (patch-ac) = 9702cf3635c04ce066f5d910d5a5b6ad1d87d96b
-SHA1 (patch-ad) = 305265a7d64f0cb114d3587fed5c2abae4b467c5
+SHA1 (patch-aa) = 17d4ec2bb37bcf82232eb40da7f363f657f1b2ea
+SHA1 (patch-ab) = 2c72d8a56ad43baf96c67cb77f6a27f494dee1d8
+SHA1 (patch-ac) = 77fac58485f6ee6e1b52d113bcdbba6063ab1541
+SHA1 (patch-ad) = dfe65e061ce0960e7021a5ce46b4beb3fece5d93
diff -r 5dc3d104ef90 -r d3266e3dda5b x11/tk-Tix/patches/patch-aa
--- a/x11/tk-Tix/patches/patch-aa       Sat Jul 02 17:58:19 2011 +0000
+++ b/x11/tk-Tix/patches/patch-aa       Sat Jul 02 18:06:50 2011 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.2 2002/08/25 21:52:47 jlam Exp $
+$NetBSD: patch-aa,v 1.3 2011/07/02 18:06:50 dholland Exp $
 
---- Makefile.in.orig   Thu Jan 11 02:43:46 2001
-+++ Makefile.in
+--- unix/Makefile.in.orig      Thu Jan 11 02:43:46 2001
++++ unix/Makefile.in
 @@ -217,6 +217,7 @@
  STLIB_LD = @STLIB_LD@
  
diff -r 5dc3d104ef90 -r d3266e3dda5b x11/tk-Tix/patches/patch-ab
--- a/x11/tk-Tix/patches/patch-ab       Sat Jul 02 17:58:19 2011 +0000
+++ b/x11/tk-Tix/patches/patch-ab       Sat Jul 02 18:06:50 2011 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/04/15 08:19:02 he Exp $
+$NetBSD: patch-ab,v 1.2 2011/07/02 18:06:50 dholland Exp $
 
---- configure.in.orig  Mon Jan  8 07:15:48 2001
-+++ configure.in
+--- unix/configure.in.orig     Mon Jan  8 07:15:48 2001
++++ unix/configure.in
 @@ -118,6 +118,7 @@
  AC_SUBST(TK_STUB_LIB_SPEC)
  
diff -r 5dc3d104ef90 -r d3266e3dda5b x11/tk-Tix/patches/patch-ac
--- a/x11/tk-Tix/patches/patch-ac       Sat Jul 02 17:58:19 2011 +0000
+++ b/x11/tk-Tix/patches/patch-ac       Sat Jul 02 18:06:50 2011 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.1.1.1 2002/04/15 08:19:02 he Exp $
+$NetBSD: patch-ac,v 1.2 2011/07/02 18:06:50 dholland Exp $
 
---- configure.orig     Mon Jan  8 07:15:48 2001
-+++ configure
+--- unix/configure.orig        Mon Jan  8 07:15:48 2001
++++ unix/configure
 @@ -27,6 +27,8 @@
    --enable-shared         build and link with shared libraries [--enable-shared]"
  ac_help="$ac_help
diff -r 5dc3d104ef90 -r d3266e3dda5b x11/tk-Tix/patches/patch-ad
--- a/x11/tk-Tix/patches/patch-ad       Sat Jul 02 17:58:19 2011 +0000
+++ b/x11/tk-Tix/patches/patch-ad       Sat Jul 02 18:06:50 2011 +0000
@@ -1,7 +1,9 @@
-$NetBSD: patch-ad,v 1.1 2005/12/12 15:49:47 joerg Exp $
+$NetBSD: patch-ad,v 1.2 2011/07/02 18:06:50 dholland Exp $
 
---- ../generic/tixAppInit.c.orig       2005-12-12 15:40:13.000000000 +0000
-+++ ../generic/tixAppInit.c
+Dragonfly support.
+
+--- generic/tixAppInit.c.orig  2005-12-12 15:40:13.000000000 +0000
++++ generic/tixAppInit.c
 @@ -31,7 +31,7 @@
  #undef WIN32_LEAN_AND_MEAN
  #endif