Wed Jul 29 15:23:11 2015 UTC ()
Ensure we can find pkgsrc-installed sqlite3.


(jperkin)
diff -r1.81 -r1.82 pkgsrc/lang/tcl/Makefile
cvs diff -r1.81 -r1.82 pkgsrc/lang/tcl/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/tcl/Makefile 2015/07/22 04:54:23 1.81
+++ pkgsrc/lang/tcl/Makefile 2015/07/29 15:23:11 1.82
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.81 2015/07/22 04:54:23 dholland Exp $ 1# $NetBSD: Makefile,v 1.82 2015/07/29 15:23:11 jperkin Exp $
2 2
3DISTNAME= tcl${TCL_VERSION}-src 3DISTNAME= tcl${TCL_VERSION}-src
4PKGNAME= tcl-${TCL_VERSION} 4PKGNAME= tcl-${TCL_VERSION}
5PKGREVISION= 3 5PKGREVISION= 3
6CATEGORIES= lang 6CATEGORIES= lang
7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tcl/} 7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tcl/}
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.tcl.tk/ 10HOMEPAGE= http://www.tcl.tk/
11COMMENT= Tool Command Language, a dynamic language 11COMMENT= Tool Command Language, a dynamic language
12LICENSE= 2-clause-bsd 12LICENSE= 2-clause-bsd
13 13
14.include "../../lang/tcl/Makefile.version" 14.include "../../lang/tcl/Makefile.version"
@@ -40,18 +40,22 @@ CONFIGURE_ARGS+= --enable-64bit @@ -40,18 +40,22 @@ CONFIGURE_ARGS+= --enable-64bit
40CONFIGURE_ARGS+= ac_cv_func_gethostbyname_r=no 40CONFIGURE_ARGS+= ac_cv_func_gethostbyname_r=no
41.endif 41.endif
42 42
43SUBST_CLASSES+= tcl-config 43SUBST_CLASSES+= tcl-config
44SUBST_STAGE.tcl-config= post-build 44SUBST_STAGE.tcl-config= post-build
45SUBST_FILES.tcl-config= unix/tclConfig.sh 45SUBST_FILES.tcl-config= unix/tclConfig.sh
46SUBST_SED.tcl-config+= -e "s|${WRKSRC}/unix|${PREFIX}/lib|" 46SUBST_SED.tcl-config+= -e "s|${WRKSRC}/unix|${PREFIX}/lib|"
47SUBST_SED.tcl-config+= -e "s|${WRKSRC}|${PREFIX}/include/tcl|" 47SUBST_SED.tcl-config+= -e "s|${WRKSRC}|${PREFIX}/include/tcl|"
48 48
49PLIST_SUBST+= SONUM=${TCL_SONUM} 49PLIST_SUBST+= SONUM=${TCL_SONUM}
50PLIST_SUBST+= BASEVER=${TCL_BASEVER} 50PLIST_SUBST+= BASEVER=${TCL_BASEVER}
51 51
52CONFIGURE_ARGS+= --with-system-sqlite 52CONFIGURE_ARGS+= --with-system-sqlite
 53SUBST_CLASSES+= sqllink
 54SUBST_STAGE.sqllink= pre-configure
 55SUBST_FILES.sqllink= pkgs/sqlite3.8.8.3/configure
 56SUBST_SED.sqllink= -e "/LIBS=/s,-lsqlite3,-L${BUILDLINK_PREFIX.sqlite3}/lib -lsqlite3,g"
53 57
54BUILDLINK_API_DEPENDS.sqlite3+= sqlite3>=3.8.3 58BUILDLINK_API_DEPENDS.sqlite3+= sqlite3>=3.8.3
55.include "../../databases/sqlite3/buildlink3.mk" 59.include "../../databases/sqlite3/buildlink3.mk"
56.include "../../devel/zlib/buildlink3.mk" 60.include "../../devel/zlib/buildlink3.mk"
57.include "../../mk/bsd.pkg.mk" 61.include "../../mk/bsd.pkg.mk"