tk-itk: Cleanup

[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 23:28:04 2016 +0200
Changeset:	d6f3f4ba8322b64071a0b3d1fe35acc308de1bb2

Modified Files:
	tk-itk/Makefile
	tk-itk/buildlink3.mk

Log Message:
tk-itk: Cleanup

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

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

diffstat:
 tk-itk/Makefile      | 13 +++++--------
 tk-itk/buildlink3.mk | 20 +++++++++-----------
 2 files changed, 14 insertions(+), 19 deletions(-)

diffs:
diff --git a/tk-itk/Makefile b/tk-itk/Makefile
index 435cc11..16ffef7 100644
--- a/tk-itk/Makefile
+++ b/tk-itk/Makefile
@@ -2,28 +2,25 @@
 #
 
 DISTNAME=	itk3.4.2
-PKGNAME=	tk-${DISTNAME:S/k/k-/}
+PKGNAME=	tk-${DISTNAME:S/itk/itk3-/}
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=incrtcl/}
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	http://incrtcl.sourceforge.net/
-COMMENT=	Framework for building mega-widgets using [incr Tcl]
-LICENSE=	2-clause-bsd # ?
+COMMENT=	Framework for building mega-widgets for Tcl/Tk
+LICENSE=	mit # Standard ML of New Jersey Variant
 
 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
+CONFIGURE_ARGS+=	--with-itcl=${BUILDLINK_PREFIX.tcl-itcl3}/lib
 
 USE_TOOLS+=		grep
 
 WRKSRC=		${WRKDIR}/${DISTNAME:R}
 
-.include "../../wip/tcl-itcl/buildlink3.mk"
-.include "../../x11/libXt/buildlink3.mk"
-.include "../../x11/libX11/buildlink3.mk"
-.include "../../mk/dlopen.buildlink3.mk"
+.include "../../wip/tcl-itcl3/buildlink3.mk"
 .include "../../lang/tcl/buildlink3.mk"
 .include "../../x11/tk/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/tk-itk/buildlink3.mk b/tk-itk/buildlink3.mk
index e353432..d0512b0 100644
--- a/tk-itk/buildlink3.mk
+++ b/tk-itk/buildlink3.mk
@@ -1,18 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.4 2013/01/07 13:30:24 thomasklausner Exp $
+# $NetBSD$
 
-BUILDLINK_TREE+=	tk-itk
+BUILDLINK_TREE+=	tk-itk3
 
-.if !defined(TK_ITK_BUILDLINK3_MK)
-TK_ITK_BUILDLINK3_MK:=
+.if !defined(TK_ITK3_BUILDLINK3_MK)
+TK_ITK3_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.tk-itk+=	tk-itk>=3.3
-BUILDLINK_PKGSRCDIR.tk-itk?=	../../wip/tk-itk
+BUILDLINK_API_DEPENDS.tk-itk3+=	tk-itk3>=3.4.2
+BUILDLINK_PKGSRCDIR.tk-itk3?=	../../wip/tk-itk
 
-.include "../../x11/libXt/buildlink3.mk"
-.include "../../x11/libX11/buildlink3.mk"
-.include "../../lang/tcl-itcl/buildlink3.mk"
+.include "../../wip/tcl-itcl3/buildlink3.mk"
 .include "../../lang/tcl/buildlink3.mk"
 .include "../../x11/tk/buildlink3.mk"
-.endif	# TK_ITK_BUILDLINK3_MK
+.endif	# TK_ITK3_BUILDLINK3_MK
 
-BUILDLINK_TREE+=	-tk-itk
+BUILDLINK_TREE+=	-tk-itk3