pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

tcl-itcl: Remove conflict with itcl4 bundled into TCL



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

Modified Files:
	tcl-itcl/Makefile
	tcl-itcl/PLIST
	tcl-itcl/buildlink3.mk

Log Message:
tcl-itcl: Remove conflict with itcl4 bundled into TCL

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

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

diffstat:
 tcl-itcl/Makefile      |  8 ++++++++
 tcl-itcl/PLIST         | 32 ++++++++++++++++----------------
 tcl-itcl/buildlink3.mk |  2 ++
 3 files changed, 26 insertions(+), 16 deletions(-)

diffs:
diff --git a/tcl-itcl/Makefile b/tcl-itcl/Makefile
index d6795eb..15761d4 100644
--- a/tcl-itcl/Makefile
+++ b/tcl-itcl/Makefile
@@ -14,8 +14,16 @@ 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+=	--includedir=${PREFIX}/include/itcl3
 USE_TOOLS+=		grep
 
+post-install:
+.for file in body.n class.n code.n configbody.n delete.n ensemble.n find.n \
+	is.n itcl.n itclvars.n local.n scope.n
+	${RUN} cd ${DESTDIR}${PREFIX}/man/mann/ && \
+		${MV} ${file} itcl3-${file}
+.endfor
+
 .include "../../x11/libXt/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../mk/dlopen.buildlink3.mk"
diff --git a/tcl-itcl/PLIST b/tcl-itcl/PLIST
index 23a8cce..025dc8e 100644
--- a/tcl-itcl/PLIST
+++ b/tcl-itcl/PLIST
@@ -1,23 +1,23 @@
 @comment $NetBSD$
-include/itcl.h
-include/itclDecls.h
-include/itclInt.h
-include/itclIntDecls.h
+include/itcl3/itcl.h
+include/itcl3/itclDecls.h
+include/itcl3/itclInt.h
+include/itcl3/itclIntDecls.h
 lib/itcl3.4/itcl.tcl
 lib/itcl3.4/libitcl3.4.so
 lib/itcl3.4/libitclstub3.4.a
 lib/itcl3.4/pkgIndex.tcl
 lib/itclConfig.sh
-man/mann/body.n
-man/mann/class.n
-man/mann/code.n
-man/mann/configbody.n
-man/mann/delete.n
-man/mann/ensemble.n
-man/mann/find.n
-man/mann/is.n
-man/mann/itcl.n
-man/mann/itclvars.n
-man/mann/local.n
-man/mann/scope.n
+man/mann/itcl3-body.n
+man/mann/itcl3-class.n
+man/mann/itcl3-code.n
+man/mann/itcl3-configbody.n
+man/mann/itcl3-delete.n
+man/mann/itcl3-ensemble.n
+man/mann/itcl3-find.n
+man/mann/itcl3-is.n
+man/mann/itcl3-itcl.n
+man/mann/itcl3-itclvars.n
+man/mann/itcl3-local.n
+man/mann/itcl3-scope.n
 @pkgdir bin
diff --git a/tcl-itcl/buildlink3.mk b/tcl-itcl/buildlink3.mk
index 63cfb7b..87d569e 100644
--- a/tcl-itcl/buildlink3.mk
+++ b/tcl-itcl/buildlink3.mk
@@ -8,6 +8,8 @@ TCL_ITCL_BUILDLINK3_MK:=
 BUILDLINK_API_DEPENDS.tcl-itcl+=	tcl-itcl>=itcl3.4.3
 BUILDLINK_PKGSRCDIR.tcl-itcl?=	../../wip/tcl-itcl
 
+ITCL3_VERSION=	3.4.3
+
 .include "../../x11/libXt/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../lang/tcl/buildlink3.mk"


Home | Main Index | Thread Index | Old Index