tk-itk: Build against tcl-itcl 3.x

[Kamil Rytarowski <n54%gmx.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Fri Oct 21 22:08:07 2016 +0200
Changeset:	5c2c6eb696482ce7a0d367b28139358f861104e5

Modified Files:
	tk-itk/Makefile
	tk-itk/PLIST
	tk-itk/distinfo
Added Files:
	tk-itk/patches/patch-generic_itk.h

Log Message:
tk-itk: Build against tcl-itcl 3.x

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=5c2c6eb696482ce7a0d367b28139358f861104e5

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 tk-itk/Makefile                    |  2 ++
 tk-itk/PLIST                       | 17 +++++++++--------
 tk-itk/distinfo                    |  1 +
 tk-itk/patches/patch-generic_itk.h | 13 +++++++++++++
 4 files changed, 25 insertions(+), 8 deletions(-)

diffs:
diff --git a/tk-itk/Makefile b/tk-itk/Makefile
index 21f076e..435cc11 100644
--- a/tk-itk/Makefile
+++ b/tk-itk/Makefile
@@ -14,6 +14,8 @@ LICENSE=	2-clause-bsd # ?
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--x-includes=${BUILDLINK_PREFIX.libX11}/include/X11
 CONFIGURE_ARGS+=	--x-libraries=${BUILDLINK_PREFIX.libX11}/lib
+CONFIGURE_ARGS+=	--with-itcl=${BUILDLINK_PREFIX.tcl}/lib
+
 USE_TOOLS+=		grep
 
 WRKSRC=		${WRKDIR}/${DISTNAME:R}
diff --git a/tk-itk/PLIST b/tk-itk/PLIST
index 3662343..023f8e4 100644
--- a/tk-itk/PLIST
+++ b/tk-itk/PLIST
@@ -1,16 +1,17 @@
-@comment $NetBSD: PLIST,v 1.1 2012/10/01 13:42:30 othyro Exp $
+@comment $NetBSD$
 include/itk.h
 include/itkDecls.h
-lib/itk${PKGVERSION}/Archetype.itk
-lib/itk${PKGVERSION}/Toplevel.itk
-lib/itk${PKGVERSION}/Widget.itk
-lib/itk${PKGVERSION}/itk.tcl
-lib/itk${PKGVERSION}/libitk33.so
-lib/itk${PKGVERSION}/pkgIndex.tcl
-lib/itk${PKGVERSION}/tclIndex
+lib/itk3.4/Archetype.itk
+lib/itk3.4/Toplevel.itk
+lib/itk3.4/Widget.itk
+lib/itk3.4/itk.tcl
+lib/itk3.4/libitk3.4.so
+lib/itk3.4/pkgIndex.tcl
+lib/itk3.4/tclIndex
 man/mann/Archetype.n
 man/mann/Toplevel.n
 man/mann/Widget.n
 man/mann/itk.n
 man/mann/itkvars.n
 man/mann/usual.n
+@pkgdir bin
diff --git a/tk-itk/distinfo b/tk-itk/distinfo
index 0a2511e..db398e9 100644
--- a/tk-itk/distinfo
+++ b/tk-itk/distinfo
@@ -4,3 +4,4 @@ SHA1 (itk3.4.2.tar.gz) = 56172df469e799102c4e18b5ae64c1976c4fcef2
 RMD160 (itk3.4.2.tar.gz) = 4c7f70a9c77b2390d41071777dfb47c0599da36e
 SHA512 (itk3.4.2.tar.gz) = 4906f4b28645edb6fc4a1350e8de228db06364bc1f401a638fa9ef478bef45af641ede3d50994d1f56686c8ec8f394cf6f97e40d6dade436e89d452d8e6e0445
 Size (itk3.4.2.tar.gz) = 185468 bytes
+SHA1 (patch-generic_itk.h) = a23c4ded93246ba768c08a7119ed5031f843c600
diff --git a/tk-itk/patches/patch-generic_itk.h b/tk-itk/patches/patch-generic_itk.h
new file mode 100644
index 0000000..ca577ab
--- /dev/null
+++ b/tk-itk/patches/patch-generic_itk.h
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- generic/itk.h.orig	2016-02-16 19:44:44.000000000 +0000
++++ generic/itk.h
+@@ -76,7 +76,7 @@
+ #ifndef RC_INVOKED
+ 
+ #include "tk.h"
+-#include "itclInt.h"
++#include "itcl3/itclInt.h"
+ 
+ #undef TCL_STORAGE_CLASS
+ #ifdef BUILD_itk