Sun Sep 6 09:49:40 2015 UTC ()
Improve -r1.82: insert -R as well as -L into LIBS. PR 50170.


(dholland)
diff -r1.83 -r1.84 pkgsrc/lang/tcl/Makefile
cvs diff -r1.83 -r1.84 pkgsrc/lang/tcl/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/tcl/Makefile 2015/08/29 19:35:55 1.83
+++ pkgsrc/lang/tcl/Makefile 2015/09/06 09:49:40 1.84
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.83 2015/08/29 19:35:55 jperkin Exp $ 1# $NetBSD: Makefile,v 1.84 2015/09/06 09:49:40 dholland Exp $
2 2
3DISTNAME= tcl${TCL_VERSION}-src 3DISTNAME= tcl${TCL_VERSION}-src
4PKGNAME= tcl-${TCL_VERSION} 4PKGNAME= tcl-${TCL_VERSION}
5PKGREVISION= 4 5PKGREVISION= 4
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"
@@ -43,27 +43,27 @@ CONFIGURE_ARGS+= ac_cv_func_gethostbynam @@ -43,27 +43,27 @@ CONFIGURE_ARGS+= ac_cv_func_gethostbynam
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 53SUBST_CLASSES+= sqllink
54SUBST_STAGE.sqllink= pre-configure 54SUBST_STAGE.sqllink= pre-configure
55SUBST_FILES.sqllink= pkgs/sqlite3.8.8.3/configure 55SUBST_FILES.sqllink= pkgs/sqlite3.8.8.3/configure
56SUBST_SED.sqllink= -e "/LIBS=/s,-lsqlite3,-L${BUILDLINK_PREFIX.sqlite3}/lib -lsqlite3,g" 56SUBST_SED.sqllink= -e "/LIBS=/s,-lsqlite3,-L${BUILDLINK_PREFIX.sqlite3}/lib -R${BUILDLINK_PREFIX.sqlite3}/lib -lsqlite3,g"
57 57
58.if ${OPSYS} == "Darwin" 58.if ${OPSYS} == "Darwin"
59post-build: 59post-build:
60. for lib in tdbcmysql1.0.3/libtdbcmysql1.0.3.dylib \ 60. for lib in tdbcmysql1.0.3/libtdbcmysql1.0.3.dylib \
61 tdbcpostgres1.0.3/libtdbcpostgres1.0.3.dylib 61 tdbcpostgres1.0.3/libtdbcpostgres1.0.3.dylib
62 install_name_tool -id ${PREFIX}/lib/${lib} ${WRKSRC}/unix/pkgs/${lib} 62 install_name_tool -id ${PREFIX}/lib/${lib} ${WRKSRC}/unix/pkgs/${lib}
63. endfor 63. endfor
64.endif 64.endif
65 65
66BUILDLINK_API_DEPENDS.sqlite3+= sqlite3>=3.8.3 66BUILDLINK_API_DEPENDS.sqlite3+= sqlite3>=3.8.3
67.include "../../databases/sqlite3/buildlink3.mk" 67.include "../../databases/sqlite3/buildlink3.mk"
68.include "../../devel/zlib/buildlink3.mk" 68.include "../../devel/zlib/buildlink3.mk"
69.include "../../mk/bsd.pkg.mk" 69.include "../../mk/bsd.pkg.mk"