Tue Aug 21 21:45:29 2012 UTC ()
lang/tcl-otlc: Add tcl/tk 8.5 support

Pass the tlc/tk versions to the configure script after including their
Makefile.version files.  Unfortunately, while the build gets further,
it breaks later due to incompatiblity with version 8.5.


(marino)
diff -r1.21 -r1.22 pkgsrc/lang/tcl-otcl/Makefile
cvs diff -r1.21 -r1.22 pkgsrc/lang/tcl-otcl/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/tcl-otcl/Makefile 2009/02/17 19:49:57 1.21
+++ pkgsrc/lang/tcl-otcl/Makefile 2012/08/21 21:45:29 1.22
@@ -1,34 +1,40 @@ @@ -1,34 +1,40 @@
1# $NetBSD: Makefile,v 1.21 2009/02/17 19:49:57 joerg Exp $ 1# $NetBSD: Makefile,v 1.22 2012/08/21 21:45:29 marino Exp $
2 2
3DISTNAME= otcl-src-1.13 3DISTNAME= otcl-src-1.13
4PKGNAME= tcl-${DISTNAME:S/-src//} 4PKGNAME= tcl-${DISTNAME:S/-src//}
 5PKGREVISION= 1
5CATEGORIES= lang 6CATEGORIES= lang
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=otcl-tclcl/} 7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=otcl-tclcl/}
7 8
8MAINTAINER= minskim@NetBSD.org 9MAINTAINER= minskim@NetBSD.org
9HOMEPAGE= http://otcl-tclcl.sourceforge.net/otcl/ 10HOMEPAGE= http://otcl-tclcl.sourceforge.net/otcl/
10COMMENT= MIT Object Tcl 11COMMENT= MIT Object Tcl
11 12
12PKG_INSTALLATION_TYPES= overwrite pkgviews 13PKG_INSTALLATION_TYPES= overwrite pkgviews
13PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
14 15
15GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes
16USE_LIBTOOL= yes 17USE_LIBTOOL= yes
17WRKSRC= ${WRKDIR}/${DISTNAME:S/-src//} 18WRKSRC= ${WRKDIR}/${DISTNAME:S/-src//}
18 19
 20.include "../../lang/tcl/Makefile.version"
 21.include "../../x11/tk/Makefile.version"
 22
19CONFIGURE_ARGS+= V_LIBS="`${CONFIG_SHELL} -c '. ${TCLCONFIG_SH}; ${ECHO} $$TCL_LIBS'`" 23CONFIGURE_ARGS+= V_LIBS="`${CONFIG_SHELL} -c '. ${TCLCONFIG_SH}; ${ECHO} $$TCL_LIBS'`"
20CONFIGURE_ARGS+= --with-tcl=${BUILDLINK_PREFIX.tcl} 24CONFIGURE_ARGS+= --with-tcl=${BUILDLINK_PREFIX.tcl}
21CONFIGURE_ARGS+= --with-tk=${BUILDLINK_PREFIX.tk} 25CONFIGURE_ARGS+= --with-tk=${BUILDLINK_PREFIX.tk}
 26CONFIGURE_ARGS+= --with-tcl-ver=${TCL_VERSION}
 27CONFIGURE_ARGS+= --with-tk-ver=${TK_VERSION}
22 28
23CPPFLAGS+= -I${BUILDLINK_PREFIX.tcl}/include/tcl/generic 29CPPFLAGS+= -I${BUILDLINK_PREFIX.tcl}/include/tcl/generic
24 30
25DOCS= autoload.html capi.html class.html object.html \ 31DOCS= autoload.html capi.html class.html object.html \
26 tutorial.html otcl-paper.ps.gz 32 tutorial.html otcl-paper.ps.gz
27DOCDIR= ${PREFIX}/share/doc/tcl/otcl 33DOCDIR= ${PREFIX}/share/doc/tcl/otcl
28 34
29INSTALLATION_DIRS= bin include lib ${DOCDIR} 35INSTALLATION_DIRS= bin include lib ${DOCDIR}
30 36
31BUILDLINK_DEPMETHOD.libXt?= build 37BUILDLINK_DEPMETHOD.libXt?= build
32 38
33.include "../../lang/tcl/buildlink3.mk" 39.include "../../lang/tcl/buildlink3.mk"
34.include "../../x11/tk/buildlink3.mk" 40.include "../../x11/tk/buildlink3.mk"