itk3: Remove conflict with itk 4.x

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

Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Sat Oct 22 00:15:31 2016 +0200
Changeset:	208ad730107d98a3153c2b4a4a396ca36105d252

Modified Files:
	tk-itk3/Makefile
	tk-itk3/PLIST
	tk-itk3/distinfo
Added Files:
	tk-itk3/patches/patch-configure

Log Message:
itk3: Remove conflict with itk 4.x

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

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

diffstat:
 tk-itk3/Makefile                |  9 ++++++++-
 tk-itk3/PLIST                   | 16 +++++++--------
 tk-itk3/distinfo                |  1 +
 tk-itk3/patches/patch-configure | 45 +++++++++++++++++++++++++++++++++++++++++
 4 files changed, 62 insertions(+), 9 deletions(-)

diffs:
diff --git a/tk-itk3/Makefile b/tk-itk3/Makefile
index 16ffef7..9e458c5 100644
--- a/tk-itk3/Makefile
+++ b/tk-itk3/Makefile
@@ -15,11 +15,18 @@ 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-itcl3}/lib
-
+CONFIGURE_ARGS+=	--includedir=${PREFIX}/include/itk3
 USE_TOOLS+=		grep
 
 WRKSRC=		${WRKDIR}/${DISTNAME:R}
 
+# Remove conflict with itk 4.x
+post-install:
+.for file in Archetype.n Toplevel.n Widget.n itk.n itkvars.n usual.n
+	${RUN} cd ${DESTDIR}${PREFIX}/${PKGMANDIR}/mann/ && \
+		${MV} ${file} itk3-${file}
+.endfor
+
 .include "../../wip/tcl-itcl3/buildlink3.mk"
 .include "../../lang/tcl/buildlink3.mk"
 .include "../../x11/tk/buildlink3.mk"
diff --git a/tk-itk3/PLIST b/tk-itk3/PLIST
index 023f8e4..d7ece3d 100644
--- a/tk-itk3/PLIST
+++ b/tk-itk3/PLIST
@@ -1,6 +1,6 @@
 @comment $NetBSD$
-include/itk.h
-include/itkDecls.h
+include/itk3/itk.h
+include/itk3/itkDecls.h
 lib/itk3.4/Archetype.itk
 lib/itk3.4/Toplevel.itk
 lib/itk3.4/Widget.itk
@@ -8,10 +8,10 @@ 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
+man/mann/itk3-Archetype.n
+man/mann/itk3-Toplevel.n
+man/mann/itk3-Widget.n
+man/mann/itk3-itk.n
+man/mann/itk3-itkvars.n
+man/mann/itk3-usual.n
 @pkgdir bin
diff --git a/tk-itk3/distinfo b/tk-itk3/distinfo
index 7b27219..8dbe5c9 100644
--- a/tk-itk3/distinfo
+++ b/tk-itk3/distinfo
@@ -4,4 +4,5 @@ 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-configure) = 9022942cb6ad02658f9163dd3014fb5f8ddd5fbf
 SHA1 (patch-generic_itk.h) = 2977eab8946c084abee5c63ca8a29e9ebc53ef18
diff --git a/tk-itk3/patches/patch-configure b/tk-itk3/patches/patch-configure
new file mode 100644
index 0000000..734414a
--- /dev/null
+++ b/tk-itk3/patches/patch-configure
@@ -0,0 +1,45 @@
+$NetBSD$
+
+--- configure.orig	2016-02-16 19:45:14.000000000 +0000
++++ configure
+@@ -3370,7 +3370,7 @@ $as_echo "could not find ${TCL_BIN_DIR}/
+ 		    done
+ 		fi
+ 		if test -f "${TCL_BIN_DIR}/${TCL_STUB_LIB_FILE}"; then
+-		    TCL_STUB_LIB_SPEC="-L`echo "${TCL_BIN_DIR}"  | sed -e 's/ /\\\\ /g'` ${TCL_STUB_LIB_FLAG}"
++		    TCL_STUB_LIB_SPEC="-L`echo "${TCL_BIN_DIR}"  | sed -e 's/ /\\\\ /g'` ${COMPILER_RPATH_FLAG}`echo "${TCL_BIN_DIR}"  | sed -e 's/ /\\\\ /g'` ${TCL_STUB_LIB_FLAG}"
+ 		    TCL_STUB_LIB_PATH="${TCL_BIN_DIR}/${TCL_STUB_LIB_FILE}"
+ 		fi
+ 		;;
+@@ -3680,7 +3680,7 @@ $as_echo "could not find ${TK_BIN_DIR}/t
+ 		    done
+ 		fi
+ 		if test -f "${TK_BIN_DIR}/${TK_STUB_LIB_FILE}"; then
+-		    TK_STUB_LIB_SPEC="-L` echo "${TK_BIN_DIR}"  | sed -e 's/ /\\\\ /g'` ${TK_STUB_LIB_FLAG}"
++		    TK_STUB_LIB_SPEC="-L` echo "${TK_BIN_DIR}"  | sed -e 's/ /\\\\ /g'` ${COMPILER_RPATH_FLAG}` echo "${TK_BIN_DIR}"  | sed -e 's/ /\\\\ /g'` ${TK_STUB_LIB_FLAG}"
+ 		    TK_STUB_LIB_PATH="${TK_BIN_DIR}/${TK_STUB_LIB_FILE}"
+ 		fi
+ 		;;
+@@ -6597,7 +6597,7 @@ $as_echo_n "checking for X11 libraries..
+ 	    if test -r $i/libX11.a -o -r $i/libX11.so -o -r $i/libX11.sl -o -r $i/libX11.dylib; then
+ 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $i" >&5
+ $as_echo "$i" >&6; }
+-		XLIBSW="-L$i -lX11"
++		XLIBSW="-L$i ${COMPILER_RPATH_FLAG}$i -lX11"
+ 		x_libraries="$i"
+ 		break
+ 	    fi
+@@ -6606,7 +6606,7 @@ $as_echo "$i" >&6; }
+ 	if test "$x_libraries" = ""; then
+ 	    XLIBSW=-lX11
+ 	else
+-	    XLIBSW="-L$x_libraries -lX11"
++	    XLIBSW="-L$x_libraries ${COMPILER_RPATH_FLAG}$x_libraries -lX11"
+ 	fi
+     fi
+     if test "$XLIBSW" = nope ; then
+@@ -10659,4 +10659,3 @@ if test -n "$ac_unrecognized_opts" && te
+   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+ $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+ fi
+-