pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc
Module Name: pkgsrc
Committed By: adam
Date: Fri Aug 25 11:05:33 UTC 2017
Modified Files:
pkgsrc/lang/tcl: Makefile Makefile.version PLIST distinfo
pkgsrc/lang/tcl/patches: patch-unix_Makefile.in patch-unix_configure
pkgsrc/x11/tk: Makefile.version distinfo
pkgsrc/x11/tk/patches: patch-unix_Makefile.in patch-unix_configure
Added Files:
pkgsrc/lang/tcl/patches: patch-pkgs_itcl4.1.0_configure
patch-pkgs_sqlite3.20.0_Makefile.in
patch-pkgs_sqlite3.20.0_configure patch-pkgs_tdbc1.0.5_configure
patch-pkgs_tdbcmysql1.0.5_configure
patch-pkgs_tdbcodbc1.0.5_configure
patch-pkgs_tdbcpostgres1.0.5_configure
patch-pkgs_thread2.8.1_configure
Removed Files:
pkgsrc/lang/tcl/patches: patch-pkgs_itcl4.0.5_configure
patch-pkgs_sqlite3.13.0_Makefile.in
patch-pkgs_sqlite3.13.0_configure patch-pkgs_tdbc1.0.4_configure
patch-pkgs_tdbcmysql1.0.4_configure
patch-pkgs_tdbcodbc1.0.4_configure
patch-pkgs_tdbcpostgres1.0.4_configure
patch-pkgs_thread2.8.0_configure
Log Message:
Changes 8.6.7:
Bug fixes.
To generate a diff of this commit:
cvs rdiff -u -r1.96 -r1.97 pkgsrc/lang/tcl/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/lang/tcl/Makefile.version
cvs rdiff -u -r1.22 -r1.23 pkgsrc/lang/tcl/PLIST
cvs rdiff -u -r1.73 -r1.74 pkgsrc/lang/tcl/distinfo
cvs rdiff -u -r1.4 -r0 pkgsrc/lang/tcl/patches/patch-pkgs_itcl4.0.5_configure
cvs rdiff -u -r0 -r1.1 pkgsrc/lang/tcl/patches/patch-pkgs_itcl4.1.0_configure \
pkgsrc/lang/tcl/patches/patch-pkgs_sqlite3.20.0_Makefile.in \
pkgsrc/lang/tcl/patches/patch-pkgs_sqlite3.20.0_configure \
pkgsrc/lang/tcl/patches/patch-pkgs_tdbc1.0.5_configure \
pkgsrc/lang/tcl/patches/patch-pkgs_tdbcmysql1.0.5_configure \
pkgsrc/lang/tcl/patches/patch-pkgs_tdbcodbc1.0.5_configure \
pkgsrc/lang/tcl/patches/patch-pkgs_tdbcpostgres1.0.5_configure \
pkgsrc/lang/tcl/patches/patch-pkgs_thread2.8.1_configure
cvs rdiff -u -r1.1 -r0 \
pkgsrc/lang/tcl/patches/patch-pkgs_sqlite3.13.0_Makefile.in
cvs rdiff -u -r1.3 -r0 \
pkgsrc/lang/tcl/patches/patch-pkgs_sqlite3.13.0_configure \
pkgsrc/lang/tcl/patches/patch-pkgs_tdbc1.0.4_configure \
pkgsrc/lang/tcl/patches/patch-pkgs_tdbcmysql1.0.4_configure \
pkgsrc/lang/tcl/patches/patch-pkgs_tdbcodbc1.0.4_configure \
pkgsrc/lang/tcl/patches/patch-pkgs_tdbcpostgres1.0.4_configure \
pkgsrc/lang/tcl/patches/patch-pkgs_thread2.8.0_configure
cvs rdiff -u -r1.12 -r1.13 pkgsrc/lang/tcl/patches/patch-unix_Makefile.in
cvs rdiff -u -r1.9 -r1.10 pkgsrc/lang/tcl/patches/patch-unix_configure
cvs rdiff -u -r1.18 -r1.19 pkgsrc/x11/tk/Makefile.version
cvs rdiff -u -r1.49 -r1.50 pkgsrc/x11/tk/distinfo
cvs rdiff -u -r1.7 -r1.8 pkgsrc/x11/tk/patches/patch-unix_Makefile.in
cvs rdiff -u -r1.11 -r1.12 pkgsrc/x11/tk/patches/patch-unix_configure
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/lang/tcl/Makefile
diff -u pkgsrc/lang/tcl/Makefile:1.96 pkgsrc/lang/tcl/Makefile:1.97
--- pkgsrc/lang/tcl/Makefile:1.96 Sat Jul 22 23:40:07 2017
+++ pkgsrc/lang/tcl/Makefile Fri Aug 25 11:05:33 2017
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.96 2017/07/22 23:40:07 dsainty Exp $
+# $NetBSD: Makefile,v 1.97 2017/08/25 11:05:33 adam Exp $
DISTNAME= tcl${TCL_VERSION}-src
PKGNAME= tcl-${TCL_VERSION}
-PKGREVISION= 2
CATEGORIES= lang
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tcl/}
@@ -47,12 +46,14 @@ SUBST_SED.tcl-config+= -e "s|${WRKSRC}|$
PLIST_SUBST+= SONUM=${TCL_SONUM}
PLIST_SUBST+= BASEVER=${TCL_BASEVER}
PLIST_SUBST+= ITCL_VERSION=${ITCL_VERSION}
+PLIST_SUBST+= SQLITE3_VERSION=${SQLITE3_VERSION}
PLIST_SUBST+= TDBC_VERSION=${TDBC_VERSION}
+PLIST_SUBST+= THREAD_VERSION=${THREAD_VERSION}
CONFIGURE_ARGS+= --with-system-sqlite
SUBST_CLASSES+= sqllink
SUBST_STAGE.sqllink= pre-configure
-SUBST_FILES.sqllink= pkgs/sqlite3.13.0/configure
+SUBST_FILES.sqllink= pkgs/sqlite${SQLITE3_VERSION}/configure
SUBST_SED.sqllink= -e "/LIBS=/s|-lsqlite3|-L${BUILDLINK_PREFIX.sqlite3}/lib ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.sqlite3}/lib -lsqlite3|g"
# install-sh requires $SHELL is an extremely close match to /bin/sh
@@ -61,17 +62,17 @@ MAKE_ENV+= SHELL=${SH:Q}
.if ${OPSYS} == "Darwin"
post-build:
. for lib in itcl${ITCL_VERSION}/libitcl${ITCL_VERSION}.dylib \
- sqlite3.13.0/libsqlite3.13.0.dylib \
+ sqlite${SQLITE3_VERSION}/libsqlite${SQLITE3_VERSION}.dylib \
tdbc${TDBC_VERSION}/libtdbc${TDBC_VERSION}.dylib \
tdbcmysql${TDBC_VERSION}/libtdbcmysql${TDBC_VERSION}.dylib \
tdbcodbc${TDBC_VERSION}/libtdbcodbc${TDBC_VERSION}.dylib \
tdbcpostgres${TDBC_VERSION}/libtdbcpostgres${TDBC_VERSION}.dylib \
- thread2.8.0/libthread2.8.0.dylib
+ thread${THREAD_VERSION}/libthread${THREAD_VERSION}.dylib
install_name_tool -id ${PREFIX}/lib/${lib} ${WRKSRC}/unix/pkgs/${lib}
. endfor
.endif
-BUILDLINK_API_DEPENDS.sqlite3+= sqlite3>=3.13.0
+BUILDLINK_API_DEPENDS.sqlite3+= sqlite3>=${SQLITE3_VERSION}
.include "../../databases/sqlite3/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/lang/tcl/Makefile.version
diff -u pkgsrc/lang/tcl/Makefile.version:1.21 pkgsrc/lang/tcl/Makefile.version:1.22
--- pkgsrc/lang/tcl/Makefile.version:1.21 Fri Oct 21 11:45:44 2016
+++ pkgsrc/lang/tcl/Makefile.version Fri Aug 25 11:05:33 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.version,v 1.21 2016/10/21 11:45:44 kamil Exp $
+# $NetBSD: Makefile.version,v 1.22 2017/08/25 11:05:33 adam Exp $
# used by cad/xcircuit/Makefile
# used by devel/tcl-tclcl/Makefile
# used by lang/tcl/Makefile
@@ -7,8 +7,10 @@
TCL_SONUM= 86
TCL_BASEVER= 8.6
-TCL_VERSION= 8.6.6
+TCL_VERSION= 8.6.7
# Update bundled versions in lang/tcl/buildlink3.mk
-ITCL_VERSION= 4.0.5
-TDBC_VERSION= 1.0.4
+ITCL_VERSION= 4.1.0
+SQLITE3_VERSION=3.20.0
+TDBC_VERSION= 1.0.5
+THREAD_VERSION= 2.8.1
Index: pkgsrc/lang/tcl/PLIST
diff -u pkgsrc/lang/tcl/PLIST:1.22 pkgsrc/lang/tcl/PLIST:1.23
--- pkgsrc/lang/tcl/PLIST:1.22 Fri Oct 21 11:45:44 2016
+++ pkgsrc/lang/tcl/PLIST Fri Aug 25 11:05:33 2017
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.22 2016/10/21 11:45:44 kamil Exp $
+@comment $NetBSD: PLIST,v 1.23 2017/08/25 11:05:33 adam Exp $
bin/sqlite3_analyzer
bin/tclsh
bin/tclsh${BASEVER}
@@ -64,8 +64,8 @@ lib/libtcl${SONUM}.so
lib/libtcl${SONUM}.so.1.0
lib/libtclstub${SONUM}.a
lib/pkgconfig/tcl.pc
-lib/sqlite3.13.0/libsqlite3.13.0.so
-lib/sqlite3.13.0/pkgIndex.tcl
+lib/sqlite${SQLITE3_VERSION}/libsqlite${SQLITE3_VERSION}.so
+lib/sqlite${SQLITE3_VERSION}/pkgIndex.tcl
lib/tcl${BASEVER}/auto.tcl
lib/tcl${BASEVER}/clock.tcl
lib/tcl${BASEVER}/encoding/ascii.enc
@@ -298,9 +298,9 @@ lib/tcl${BASEVER}/tm.tcl
lib/tcl${BASEVER}/word.tcl
lib/tcl8/8.4/platform-1.0.14.tm
lib/tcl8/8.4/platform/shell-1.1.4.tm
-lib/tcl8/8.5/msgcat-1.6.0.tm
-lib/tcl8/8.5/tcltest-2.4.0.tm
-lib/tcl8/8.6/http-2.8.9.tm
+lib/tcl8/8.5/msgcat-1.6.1.tm
+lib/tcl8/8.5/tcltest-2.4.1.tm
+lib/tcl8/8.6/http-2.8.11.tm
lib/tcl8/8.6/tdbc/sqlite3-${TDBC_VERSION}.tm
lib/tclConfig.sh
lib/tclooConfig.sh
@@ -318,9 +318,9 @@ lib/tdbcodbc${TDBC_VERSION}/tdbcodbc.tcl
lib/tdbcpostgres${TDBC_VERSION}/libtdbcpostgres${TDBC_VERSION}.so
lib/tdbcpostgres${TDBC_VERSION}/pkgIndex.tcl
lib/tdbcpostgres${TDBC_VERSION}/tdbcpostgres.tcl
-lib/thread2.8.0/libthread2.8.0.so
-lib/thread2.8.0/pkgIndex.tcl
-lib/thread2.8.0/ttrace.tcl
+lib/thread${THREAD_VERSION}/libthread${THREAD_VERSION}.so
+lib/thread${THREAD_VERSION}/pkgIndex.tcl
+lib/thread${THREAD_VERSION}/ttrace.tcl
man/man1/tclsh.1
man/man3/TCL_MEM_DEBUG.3
man/man3/Tcl_Access.3
@@ -1136,6 +1136,7 @@ man/mann/tdbc_connection.n
man/mann/tdbc_mapSqlState.n
man/mann/tdbc_mysql.n
man/mann/tdbc_odbc.n
+man/mann/tdbc_postgres.n
man/mann/tdbc_resultset.n
man/mann/tdbc_sqlite3.n
man/mann/tdbc_statement.n
Index: pkgsrc/lang/tcl/distinfo
diff -u pkgsrc/lang/tcl/distinfo:1.73 pkgsrc/lang/tcl/distinfo:1.74
--- pkgsrc/lang/tcl/distinfo:1.73 Thu Jul 20 10:23:35 2017
+++ pkgsrc/lang/tcl/distinfo Fri Aug 25 11:05:33 2017
@@ -1,24 +1,24 @@
-$NetBSD: distinfo,v 1.73 2017/07/20 10:23:35 jperkin Exp $
+$NetBSD: distinfo,v 1.74 2017/08/25 11:05:33 adam Exp $
-SHA1 (tcl8.6.6-src.tar.gz) = 169dd1589cad62c9fac4257c113db245da502cd0
-RMD160 (tcl8.6.6-src.tar.gz) = 2386a69eb841f8af51c1b124f68e0b812a225cca
-SHA512 (tcl8.6.6-src.tar.gz) = b8e707470655ceef2ef385b8a2e617c1c0ebced577732d1f5e818cd7295ca25da491b6024047cae2aff754d27e00d646f830c2049b96f306ac96bc69b02da7b0
-Size (tcl8.6.6-src.tar.gz) = 9553805 bytes
+SHA1 (tcl8.6.7-src.tar.gz) = 68934c6ecf827348085e0f06c7396b31fb539d83
+RMD160 (tcl8.6.7-src.tar.gz) = 5f114bbd95c7208f929fe9ddb3432636d376844c
+SHA512 (tcl8.6.7-src.tar.gz) = 67f6a4266dbaf5858508a8533e0334f5a76ffc6372cf321922fd032fe34f74df0368f9a3059a885e29bb0f4f7f99c78d91b8fc3700d4fa7a7f1653b436c3a154
+Size (tcl8.6.7-src.tar.gz) = 9687799 bytes
SHA1 (patch-generic_tclInt.h) = fde6a5458a138b6d61fdbab1269b1c5111a28b22
SHA1 (patch-generic_tclPort.h) = 36ff05b22591d588952e55d0f13c2ef52e371d1e
SHA1 (patch-generic_tclPosixStr.c) = 68da211865282fe7124cad71381658f8dfb986d6
-SHA1 (patch-pkgs_itcl4.0.5_configure) = 659d90c050ae3f3792d0a809f2af7c13d2a5a333
-SHA1 (patch-pkgs_sqlite3.13.0_Makefile.in) = 1205936335cda5d413c24da33608a9bbec6a65a9
-SHA1 (patch-pkgs_sqlite3.13.0_configure) = 7f7ca86055256eea1a6d3211653f18667f72a21b
-SHA1 (patch-pkgs_tdbc1.0.4_configure) = 9796693e8ec08ad226db635d94127fd6a6d9af17
-SHA1 (patch-pkgs_tdbcmysql1.0.4_configure) = 2a1304b0d7a9659796883209742f353b2d4d26c8
-SHA1 (patch-pkgs_tdbcodbc1.0.4_configure) = 29aa1914b757cfd4b5e87ba38d23e3cbe40ba2fe
-SHA1 (patch-pkgs_tdbcpostgres1.0.4_configure) = 498cd28bdb53b4e9f1a25d8227bb47576ce4ccfe
-SHA1 (patch-pkgs_thread2.8.0_configure) = 2d130ac4a5cbebeb3a3aae41b8e9827d9bd57f45
+SHA1 (patch-pkgs_itcl4.1.0_configure) = 98339559decd7ebc8fe17b5d68a325caca7eda4f
+SHA1 (patch-pkgs_sqlite3.20.0_Makefile.in) = fae382e994aa4d64f7a378a79052f0ab0fe31ad5
+SHA1 (patch-pkgs_sqlite3.20.0_configure) = 89558eb615ecb8bc77a93daf3aec008eef7c108a
+SHA1 (patch-pkgs_tdbc1.0.5_configure) = 56c18f7db759b55395c9afb93ce35d0ebf249f59
+SHA1 (patch-pkgs_tdbcmysql1.0.5_configure) = d2378b6f84549436bc754f3de3662546a4e481fb
+SHA1 (patch-pkgs_tdbcodbc1.0.5_configure) = c823f391169f2169d9336d31623e0342ac81ba44
+SHA1 (patch-pkgs_tdbcpostgres1.0.5_configure) = 77a0310fb607f08617b04494056cab614d504d7c
+SHA1 (patch-pkgs_thread2.8.1_configure) = 6989cf8c8aca8b1ff4a25226449e1dbfed47c298
SHA1 (patch-tests_load.test) = 438695ab76e01646e49aadc01c44344a5495eabb
SHA1 (patch-tests_pkgMkIndex.test) = 70d1042c1f4743052c5fa191fa7c4732a08e28a2
-SHA1 (patch-unix_Makefile.in) = 218666b8a2a49dd1c8814abb165136363ceedbc2
-SHA1 (patch-unix_configure) = 497eebc6dfa614647a400c94847f5fdb82d6e361
+SHA1 (patch-unix_Makefile.in) = 883559e3292ad984a145d0686ae98d73064d2961
+SHA1 (patch-unix_configure) = 16d5030085a66b69e61ab3d55e1fd97e9a8c1836
SHA1 (patch-unix_tclConfig.sh.in) = 341ac4f1bbfb29551dea87ade98b3b7b59652a31
SHA1 (patch-unix_tclUnixCompat.c) = 7ffa40a1a56345f5b86cd896e8e3b0d5748d8c5e
SHA1 (patch-unix_tclUnixFCmd.c) = e715d9419a36a8414355252bb3da0ef48b07fe4f
Index: pkgsrc/lang/tcl/patches/patch-unix_Makefile.in
diff -u pkgsrc/lang/tcl/patches/patch-unix_Makefile.in:1.12 pkgsrc/lang/tcl/patches/patch-unix_Makefile.in:1.13
--- pkgsrc/lang/tcl/patches/patch-unix_Makefile.in:1.12 Thu Jul 20 10:23:35 2017
+++ pkgsrc/lang/tcl/patches/patch-unix_Makefile.in Fri Aug 25 11:05:33 2017
@@ -1,4 +1,4 @@
-$NetBSD: patch-unix_Makefile.in,v 1.12 2017/07/20 10:23:35 jperkin Exp $
+$NetBSD: patch-unix_Makefile.in,v 1.13 2017/08/25 11:05:33 adam Exp $
Honour LDFLAGS.
@@ -83,9 +83,9 @@ Honour LDFLAGS.
@@INSTALL_LIB@
- @chmod 555 "$(DLL_INSTALL_DIR)/$(LIB_FILE)"
+ @cd "$(DLL_INSTALL_DIR)" && if test "$(SHLIB_SUFFIX)" = ".dylib"; then \
-+ ln -sf libtcl$(MAJOR_VERSION)$(MINOR_VERSION).$(SHLIB_VERSION)$(SHLIB_SUFFIX) $(LIB_FILE) ; \
++ ln -sf libtcl$(MAJOR_VERSION)$(MINOR_VERSION)$(SHLIB_VERSION)$(SHLIB_SUFFIX) $(LIB_FILE) ; \
+ else \
-+ ln -sf libtcl$(MAJOR_VERSION)$(MINOR_VERSION)$(SHLIB_SUFFIX).$(SHLIB_VERSION) $(LIB_FILE) ; \
++ ln -sf libtcl$(MAJOR_VERSION)$(MINOR_VERSION)$(SHLIB_SUFFIX)$(SHLIB_VERSION) $(LIB_FILE) ; \
+ fi
+ @echo "Installing ${TCL_LIB_A_FILE} to $(DLL_INSTALL_DIR)/"
+ @$(INSTALL_DATA) ${TCL_LIB_A_FILE} $(DLL_INSTALL_DIR)/${TCL_LIB_A_FILE}
@@ -106,8 +106,8 @@ Honour LDFLAGS.
echo "Making directory $(SCRIPT_INSTALL_DIR)/$$i"; \
@@ -842,6 +858,8 @@ install-libraries: libraries
done;
- @echo "Installing package http 2.8.9 as a Tcl Module";
- @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.6/http-2.8.9.tm;
+ @echo "Installing package http 2.8.11 as a Tcl Module";
+ @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.6/http-2.8.11.tm;
+ @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/http/http.tcl;
+ @$(INSTALL_DATA) $(TOP_DIR)/library/http/pkgIndex.tcl "$(SCRIPT_INSTALL_DIR)"/http/pkgIndex.tcl;
@echo "Installing package opt0.4 files to $(SCRIPT_INSTALL_DIR)/opt0.4/";
@@ -115,12 +115,12 @@ Honour LDFLAGS.
do \
@@ -849,13 +867,21 @@ install-libraries: libraries
done;
- @echo "Installing package msgcat 1.6.0 as a Tcl Module";
- @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/msgcat-1.6.0.tm;
+ @echo "Installing package msgcat 1.6.1 as a Tcl Module";
+ @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/msgcat-1.6.1.tm;
+ @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/msgcat1.6/msgcat.tcl;
+ @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/pkgIndex.tcl "$(SCRIPT_INSTALL_DIR)"/msgcat1.6/pkgIndex.tcl;
- @echo "Installing package tcltest 2.4.0 as a Tcl Module";
- @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/tcltest-2.4.0.tm;
+ @echo "Installing package tcltest 2.4.1 as a Tcl Module";
+ @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/tcltest-2.4.1.tm;
+ @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/tcltest2.4/tcltest.tcl;
+ @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/pkgIndex.tcl "$(SCRIPT_INSTALL_DIR)"/tcltest2.4/pkgIndex.tcl;
Index: pkgsrc/lang/tcl/patches/patch-unix_configure
diff -u pkgsrc/lang/tcl/patches/patch-unix_configure:1.9 pkgsrc/lang/tcl/patches/patch-unix_configure:1.10
--- pkgsrc/lang/tcl/patches/patch-unix_configure:1.9 Sun Mar 6 11:47:49 2016
+++ pkgsrc/lang/tcl/patches/patch-unix_configure Fri Aug 25 11:05:33 2017
@@ -1,8 +1,8 @@
-$NetBSD: patch-unix_configure,v 1.9 2016/03/06 11:47:49 adam Exp $
+$NetBSD: patch-unix_configure,v 1.10 2017/08/25 11:05:33 adam Exp $
---- unix/configure.orig 2016-03-01 01:59:35.000000000 +0000
+--- unix/configure.orig 2017-08-09 14:45:58.000000000 +0000
+++ unix/configure
-@@ -6837,12 +6837,12 @@ fi
+@@ -6839,12 +6839,12 @@ fi
LD_SEARCH_FLAGS=""
;;
BSD/OS-4.*)
@@ -17,7 +17,7 @@ $NetBSD: patch-unix_configure,v 1.9 2016
CC_SEARCH_FLAGS=""
LD_SEARCH_FLAGS=""
;;
-@@ -7513,7 +7513,7 @@ fi
+@@ -7515,7 +7515,7 @@ fi
CC_SEARCH_FLAGS=""
LD_SEARCH_FLAGS=""
;;
@@ -25,17 +25,17 @@ $NetBSD: patch-unix_configure,v 1.9 2016
+ OpenBSD-*|MirBSD-*)
arch=`arch -s`
case "$arch" in
- vax)
-@@ -7543,7 +7543,7 @@ fi
+ alpha|sparc64)
+@@ -7536,7 +7536,7 @@ fi
- LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.${SHLIB_VERSION}'
-- LDFLAGS="-Wl,-export-dynamic"
-+ LDFLAGS="-Wl,--export-dynamic"
- ;;
- esac
- case "$arch" in
-@@ -7577,7 +7577,7 @@ fi
+ LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so${SHLIB_VERSION}'
+- LDFLAGS="-Wl,-export-dynamic"
++ LDFLAGS="-Wl,--export-dynamic"
+ CFLAGS_OPTIMIZE="-O2"
+ if test "${TCL_THREADS}" = "1"; then
+
+@@ -7558,7 +7558,7 @@ fi
SHLIB_SUFFIX=".so"
DL_OBJS="tclLoadDl.o"
DL_LIBS=""
@@ -44,7 +44,7 @@ $NetBSD: patch-unix_configure,v 1.9 2016
if test $doRpath = yes; then
CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
-@@ -7594,7 +7594,7 @@ fi
+@@ -7575,7 +7575,7 @@ fi
fi
;;
@@ -53,7 +53,7 @@ $NetBSD: patch-unix_configure,v 1.9 2016
# This configuration from FreeBSD Ports.
SHLIB_CFLAGS="-fPIC"
SHLIB_LD="${CC} -shared"
-@@ -7628,7 +7628,6 @@ fi
+@@ -7609,7 +7609,6 @@ fi
esac
;;
Darwin-*)
@@ -61,7 +61,7 @@ $NetBSD: patch-unix_configure,v 1.9 2016
SHLIB_CFLAGS="-fno-common"
# To avoid discrepancies between what headers configure sees during
# preprocessing tests and compiling tests, move any -isysroot and
-@@ -8802,7 +8801,7 @@ fi
+@@ -8783,7 +8782,7 @@ fi
BSD/OS*) ;;
CYGWIN_*|MINGW32_*) ;;
IRIX*) ;;
@@ -70,20 +70,20 @@ $NetBSD: patch-unix_configure,v 1.9 2016
Darwin-*) ;;
SCO_SV-3.2*) ;;
*) SHLIB_CFLAGS="-fPIC" ;;
-@@ -8844,7 +8843,11 @@ fi
+@@ -8825,7 +8824,11 @@ fi
else
- INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)/$(LIB_FILE)"'
+ if test "${SHLIB_SUFFIX}" = ".dylib" ; then
-+ INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)/libtcl$(MAJOR_VERSION)$(MINOR_VERSION).$(SHLIB_VERSION)$(SHLIB_SUFFIX)"'
++ INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)/libtcl$(MAJOR_VERSION)$(MINOR_VERSION)$(SHLIB_VERSION)$(SHLIB_SUFFIX)"'
+ else
-+ INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)/$(LIB_FILE).$(SHLIB_VERSION)"'
++ INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)/$(LIB_FILE)$(SHLIB_VERSION)"'
+ fi
fi
-@@ -8879,7 +8882,7 @@ else
+@@ -8860,7 +8863,7 @@ else
fi
@@ -92,7 +92,7 @@ $NetBSD: patch-unix_configure,v 1.9 2016
# Define TCL_LIBS now that we know what DL_LIBS is.
# The trick here is that we don't want to change the value of TCL_LIBS if
-@@ -18910,9 +18913,9 @@ fi
+@@ -18891,9 +18894,9 @@ fi
# building libtcl as a shared library instead of a static library.
#--------------------------------------------------------------------
@@ -105,7 +105,7 @@ $NetBSD: patch-unix_configure,v 1.9 2016
# tclConfig.sh needs a version of the _LIB_SUFFIX that has been eval'ed
# since on some platforms TCL_LIB_FILE contains shell escapes.
-@@ -19025,13 +19028,10 @@ else
+@@ -19006,13 +19009,10 @@ else
eval libdir="$libdir"
# default install directory for bundled packages
PACKAGE_DIR="$libdir"
@@ -122,7 +122,7 @@ $NetBSD: patch-unix_configure,v 1.9 2016
fi
VERSION='${VERSION}'
eval "CFG_TCL_SHARED_LIB_SUFFIX=${TCL_SHARED_LIB_SUFFIX}"
-@@ -19050,12 +19050,11 @@ if test "$FRAMEWORK_BUILD" = "1" ; then
+@@ -19031,12 +19031,11 @@ if test "$FRAMEWORK_BUILD" = "1" ; then
TCL_PACKAGE_PATH="~/Library/Tcl /Library/Tcl /System/Library/Tcl ~/Library/Frameworks /Library/Frameworks /System/Library/Frameworks"
test -z "$TCL_MODULE_PATH" && \
TCL_MODULE_PATH="~/Library/Tcl /Library/Tcl /System/Library/Tcl"
@@ -137,7 +137,7 @@ $NetBSD: patch-unix_configure,v 1.9 2016
#--------------------------------------------------------------------
# The statements below define various symbols relating to Tcl
# stub support.
-@@ -19068,12 +19067,7 @@ eval "TCL_STUB_LIB_FILE=libtclstub${TCL_
+@@ -19049,12 +19048,7 @@ eval "TCL_STUB_LIB_FILE=libtclstub${TCL_
eval "TCL_STUB_LIB_FILE=\"${TCL_STUB_LIB_FILE}\""
eval "TCL_STUB_LIB_DIR=${libdir}"
@@ -151,7 +151,7 @@ $NetBSD: patch-unix_configure,v 1.9 2016
TCL_BUILD_STUB_LIB_SPEC="-L`pwd | sed -e 's/ /\\\\ /g'` ${TCL_STUB_LIB_FLAG}"
TCL_STUB_LIB_SPEC="-L${TCL_STUB_LIB_DIR} ${TCL_STUB_LIB_FLAG}"
TCL_BUILD_STUB_LIB_PATH="`pwd`/${TCL_STUB_LIB_FILE}"
-@@ -19227,34 +19221,15 @@ fi
+@@ -19208,34 +19202,15 @@ fi
# Transform confdefs.h into DEFS.
# Protect against shell expansion while executing Makefile rules.
# Protect against Makefile macro expansion.
@@ -195,7 +195,7 @@ $NetBSD: patch-unix_configure,v 1.9 2016
-@@ -19882,6 +19857,7 @@ s,@EXTRA_BUILD_HTML@,$EXTRA_BUILD_HTML,;
+@@ -19863,6 +19838,7 @@ s,@EXTRA_BUILD_HTML@,$EXTRA_BUILD_HTML,;
s,@EXTRA_TCLSH_LIBS@,$EXTRA_TCLSH_LIBS,;t t
s,@DLTEST_LD@,$DLTEST_LD,;t t
s,@DLTEST_SUFFIX@,$DLTEST_SUFFIX,;t t
Index: pkgsrc/x11/tk/Makefile.version
diff -u pkgsrc/x11/tk/Makefile.version:1.18 pkgsrc/x11/tk/Makefile.version:1.19
--- pkgsrc/x11/tk/Makefile.version:1.18 Sat Sep 3 11:58:02 2016
+++ pkgsrc/x11/tk/Makefile.version Fri Aug 25 11:05:33 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.version,v 1.18 2016/09/03 11:58:02 adam Exp $
+# $NetBSD: Makefile.version,v 1.19 2017/08/25 11:05:33 adam Exp $
# used by cad/xcircuit/Makefile
# used by devel/tcl-tclcl/Makefile
# used by lang/tcl/Makefile
@@ -7,4 +7,4 @@
TK_SONUM= 86
TK_BASEVER= 8.6
-TK_VERSION= 8.6.6
+TK_VERSION= 8.6.7
Index: pkgsrc/x11/tk/distinfo
diff -u pkgsrc/x11/tk/distinfo:1.49 pkgsrc/x11/tk/distinfo:1.50
--- pkgsrc/x11/tk/distinfo:1.49 Sun Jul 16 11:42:59 2017
+++ pkgsrc/x11/tk/distinfo Fri Aug 25 11:05:33 2017
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.49 2017/07/16 11:42:59 wiz Exp $
+$NetBSD: distinfo,v 1.50 2017/08/25 11:05:33 adam Exp $
-SHA1 (tk8.6.6-src.tar.gz) = 34d546496c05014349cf5edad6696c125ad4f9ea
-RMD160 (tk8.6.6-src.tar.gz) = 619c250050bf8216855ea1c646207d1d147a95b8
-SHA512 (tk8.6.6-src.tar.gz) = 223c72ab5a6f6040928c56843598b878efafab44ed4152a38e68aa2800f2c181adc50a8bf23279b7d446493eec43854920e8b649b6a34ecdf31ecc07ccc74044
-Size (tk8.6.6-src.tar.gz) = 4273737 bytes
-SHA1 (patch-unix_Makefile.in) = bfb693af19ace5386a73cebdfe09c92a356e14ea
-SHA1 (patch-unix_configure) = b29c9507b8551d3a6478c28bab38a04df8b806ac
+SHA1 (tk8.6.7-src.tar.gz) = eb58b4523f376fdf8b1f4439a958227ada52e2c8
+RMD160 (tk8.6.7-src.tar.gz) = 647f3f69c625e7b879862195131eb42135e6feb6
+SHA512 (tk8.6.7-src.tar.gz) = adf35991b20878d18a6940cb3d24d821586828537edf6d20f9223f2989d317adbcbb5360f3226014d96fe44e7ec06cfdf434309438c90a09878345b7106c7dd9
+Size (tk8.6.7-src.tar.gz) = 4282972 bytes
+SHA1 (patch-unix_Makefile.in) = a94df921cf947918674c6ef26897fc702fd0c9e4
+SHA1 (patch-unix_configure) = ddb550c4226425e1fcaa1fd2e3de5613a0b3c55c
Index: pkgsrc/x11/tk/patches/patch-unix_Makefile.in
diff -u pkgsrc/x11/tk/patches/patch-unix_Makefile.in:1.7 pkgsrc/x11/tk/patches/patch-unix_Makefile.in:1.8
--- pkgsrc/x11/tk/patches/patch-unix_Makefile.in:1.7 Sun Mar 6 11:47:49 2016
+++ pkgsrc/x11/tk/patches/patch-unix_Makefile.in Fri Aug 25 11:05:33 2017
@@ -1,4 +1,4 @@
-$NetBSD: patch-unix_Makefile.in,v 1.7 2016/03/06 11:47:49 adam Exp $
+$NetBSD: patch-unix_Makefile.in,v 1.8 2017/08/25 11:05:33 adam Exp $
--- unix/Makefile.in.orig 2016-02-29 19:13:21.000000000 +0000
+++ unix/Makefile.in
@@ -91,9 +91,9 @@ $NetBSD: patch-unix_Makefile.in,v 1.7 20
@@INSTALL_LIB@
- @chmod 555 "$(DLL_INSTALL_DIR)/$(LIB_FILE)"
+ @cd "$(DLL_INSTALL_DIR)" && if test "$(SHLIB_SUFFIX)" = ".dylib"; then \
-+ ln -sf libtk$(MAJOR_VERSION)$(MINOR_VERSION).$(SHLIB_VERSION)$(SHLIB_SUFFIX) $(LIB_FILE) ; \
++ ln -sf libtk$(MAJOR_VERSION)$(MINOR_VERSION)$(SHLIB_VERSION)$(SHLIB_SUFFIX) $(LIB_FILE) ; \
+ else \
-+ ln -sf libtk$(MAJOR_VERSION)$(MINOR_VERSION)$(SHLIB_SUFFIX).$(SHLIB_VERSION) $(LIB_FILE) ; \
++ ln -sf libtk$(MAJOR_VERSION)$(MINOR_VERSION)$(SHLIB_SUFFIX)$(SHLIB_VERSION) $(LIB_FILE) ; \
+ fi
+ @echo "Installing ${TK_LIB_A_FILE} to $(DLL_INSTALL_DIR)/"
+ @$(INSTALL_DATA) ${TK_LIB_A_FILE} $(DLL_INSTALL_DIR)/${TK_LIB_A_FILE}
Index: pkgsrc/x11/tk/patches/patch-unix_configure
diff -u pkgsrc/x11/tk/patches/patch-unix_configure:1.11 pkgsrc/x11/tk/patches/patch-unix_configure:1.12
--- pkgsrc/x11/tk/patches/patch-unix_configure:1.11 Sun Jul 16 11:42:59 2017
+++ pkgsrc/x11/tk/patches/patch-unix_configure Fri Aug 25 11:05:33 2017
@@ -1,12 +1,12 @@
-$NetBSD: patch-unix_configure,v 1.11 2017/07/16 11:42:59 wiz Exp $
+$NetBSD: patch-unix_configure,v 1.12 2017/08/25 11:05:33 adam Exp $
Support MirBSD, DragonFly.
Honor LDFLAGS.
Standardize file names.
---- unix/configure.orig 2016-07-26 14:07:50.000000000 +0000
+--- unix/configure.orig 2017-08-09 14:46:03.000000000 +0000
+++ unix/configure
-@@ -4388,10 +4388,10 @@ fi
+@@ -4389,10 +4389,10 @@ fi
# LDFLAGS_ARCH so they eventually end up in LDFLAGS even if [load]
# is disabled by the user. [Bug 1016796]
LDFLAGS_ARCH=""
@@ -19,7 +19,7 @@ Standardize file names.
CFLAGS_DEBUG=-g
if test "$GCC" = yes; then
-@@ -5352,7 +5352,7 @@ fi
+@@ -5355,7 +5355,7 @@ fi
CC_SEARCH_FLAGS=""
LD_SEARCH_FLAGS=""
;;
@@ -27,17 +27,17 @@ Standardize file names.
+ OpenBSD-*|MirBSD-*)
arch=`arch -s`
case "$arch" in
- vax)
-@@ -5381,7 +5381,7 @@ fi
- fi
+ alpha|sparc64)
+@@ -5376,7 +5376,7 @@ fi
+
+ LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so${SHLIB_VERSION}'
+- LDFLAGS="-Wl,-export-dynamic"
++ LDFLAGS="-Wl,--export-dynamic"
+ CFLAGS_OPTIMIZE="-O2"
+ if test "${TCL_THREADS}" = "1"; then
- LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
-- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.${SHLIB_VERSION}'
-+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so'
- LDFLAGS="-Wl,-export-dynamic"
- ;;
- esac
-@@ -5412,11 +5412,10 @@ fi
+@@ -5394,11 +5394,10 @@ fi
NetBSD-*)
# NetBSD has ELF and can use 'cc -shared' to build shared libs
SHLIB_CFLAGS="-fPIC"
@@ -50,7 +50,7 @@ Standardize file names.
if test $doRpath = yes; then
CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
-@@ -5433,7 +5432,7 @@ fi
+@@ -5415,7 +5414,7 @@ fi
fi
;;
@@ -59,7 +59,7 @@ Standardize file names.
# This configuration from FreeBSD Ports.
SHLIB_CFLAGS="-fPIC"
SHLIB_LD="${CC} -shared"
-@@ -6641,7 +6640,7 @@ fi
+@@ -6623,7 +6622,7 @@ fi
BSD/OS*) ;;
CYGWIN_*|MINGW32_*) ;;
IRIX*) ;;
@@ -68,7 +68,7 @@ Standardize file names.
Darwin-*) ;;
SCO_SV-3.2*) ;;
*) SHLIB_CFLAGS="-fPIC" ;;
-@@ -6662,12 +6661,12 @@ fi
+@@ -6644,12 +6643,12 @@ fi
if test "$SHARED_LIB_SUFFIX" = ""; then
@@ -83,20 +83,20 @@ Standardize file names.
fi
DLL_INSTALL_DIR="\$(LIB_INSTALL_DIR)"
-@@ -6683,7 +6682,11 @@ fi
+@@ -6665,7 +6664,11 @@ fi
else
- INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)/$(LIB_FILE)"'
+ if test "${SHLIB_SUFFIX}" = ".dylib" ; then
-+ INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)/libtk$(MAJOR_VERSION)$(MINOR_VERSION).$(SHLIB_VERSION)$(SHLIB_SUFFIX)"'
++ INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)/libtk$(MAJOR_VERSION)$(MINOR_VERSION)$(SHLIB_VERSION)$(SHLIB_SUFFIX)"'
+ else
-+ INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)/$(LIB_FILE).$(SHLIB_VERSION)"'
++ INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)/$(LIB_FILE)$(SHLIB_VERSION)"'
+ fi
fi
-@@ -6718,7 +6721,7 @@ else
+@@ -6700,7 +6703,7 @@ else
fi
@@ -105,7 +105,7 @@ Standardize file names.
# Define TCL_LIBS now that we know what DL_LIBS is.
# The trick here is that we don't want to change the value of TCL_LIBS if
-@@ -9850,7 +9853,7 @@ echo $ECHO_N "checking for X11 libraries
+@@ -9832,7 +9835,7 @@ echo $ECHO_N "checking for X11 libraries
if test -r $i/libX11.a -o -r $i/libX11.so -o -r $i/libX11.sl -o -r $i/libX11.dylib; then
echo "$as_me:$LINENO: result: $i" >&5
echo "${ECHO_T}$i" >&6
@@ -114,7 +114,7 @@ Standardize file names.
x_libraries="$i"
break
fi
-@@ -9859,7 +9862,7 @@ echo "${ECHO_T}$i" >&6
+@@ -9841,7 +9844,7 @@ echo "${ECHO_T}$i" >&6
if test "$x_libraries" = ""; then
XLIBSW=-lX11
else
@@ -123,7 +123,7 @@ Standardize file names.
fi
fi
if test "$XLIBSW" = nope ; then
-@@ -9955,11 +9958,6 @@ fi
+@@ -9937,11 +9940,6 @@ fi
# be replaced by spaces.
#--------------------------------------------------------------------
@@ -135,7 +135,7 @@ Standardize file names.
if test "${TCL_LD_SEARCH_FLAGS}" = '-L${LIB_RUNTIME_DIR}'; then
LIB_RUNTIME_DIR=`echo ${LIB_RUNTIME_DIR} |sed -e 's/:/ -L/g'`
fi
-@@ -11195,14 +11193,10 @@ else
+@@ -11177,14 +11175,10 @@ else
TK_LIB_FLAG="-ltk`echo ${TK_VERSION} | tr -d .`"
TK_BUILD_LIB_SPEC="-L\$(TOP_DIR)/win ${TK_LIB_FLAG}"
else
@@ -151,7 +151,7 @@ Standardize file names.
fi
#--------------------------------------------------------------------
-@@ -11214,11 +11208,7 @@ fi
+@@ -11196,11 +11190,7 @@ fi
eval "TK_STUB_LIB_FILE=libtkstub${TK_UNSHARED_LIB_SUFFIX}"
eval "TK_STUB_LIB_DIR=${libdir}"
@@ -164,7 +164,7 @@ Standardize file names.
TK_BUILD_STUB_LIB_SPEC="-L`pwd | sed -e 's/ /\\\\ /g'` ${TK_STUB_LIB_FLAG}"
TK_STUB_LIB_SPEC="-L${TK_STUB_LIB_DIR} ${TK_STUB_LIB_FLAG}"
-@@ -12039,6 +12031,7 @@ s,@APP_RSRC_FILE@,$APP_RSRC_FILE,;t t
+@@ -12021,6 +12011,7 @@ s,@APP_RSRC_FILE@,$APP_RSRC_FILE,;t t
s,@REZ@,$REZ,;t t
s,@REZ_FLAGS@,$REZ_FLAGS,;t t
s,@LTLIBOBJS@,$LTLIBOBJS,;t t
Added files:
Index: pkgsrc/lang/tcl/patches/patch-pkgs_itcl4.1.0_configure
diff -u /dev/null pkgsrc/lang/tcl/patches/patch-pkgs_itcl4.1.0_configure:1.1
--- /dev/null Fri Aug 25 11:05:33 2017
+++ pkgsrc/lang/tcl/patches/patch-pkgs_itcl4.1.0_configure Fri Aug 25 11:05:33 2017
@@ -0,0 +1,63 @@
+$NetBSD: patch-pkgs_itcl4.1.0_configure,v 1.1 2017/08/25 11:05:33 adam Exp $
+
+Add support for DragonFly.
+
+Honor LDFLAGS on NetBSD.
+https://core.tcl.tk/tcl/tktview/fed5069f8a8e59e97af0a784b534919f5b789b1e
+
+--- pkgs/itcl4.1.0/configure.orig 2016-07-12 15:29:40.000000000 +0000
++++ pkgs/itcl4.1.0/configure
+@@ -7443,8 +7443,7 @@ fi
+ CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
+ fi
+ LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
+- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so${SHLIB_VERSION}'
+- LDFLAGS="-Wl,-export-dynamic"
++ LDFLAGS="-Wl,--export-dynamic"
+ ;;
+ esac
+ case "$arch" in
+@@ -7464,13 +7463,11 @@ fi
+
+ fi
+ # OpenBSD doesn't do version numbers with dots.
+- UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
+- TCL_LIB_VERSIONS_OK=nodots
+ ;;
+ NetBSD-*)
+ # NetBSD has ELF and can use 'cc -shared' to build shared libs
+ SHLIB_CFLAGS="-fPIC"
+- SHLIB_LD='${CC} -shared ${SHLIB_CFLAGS}'
++ SHLIB_LD='${CC} -shared ${SHLIB_CFLAGS} ${LDFLAGS_DEFAULT}'
+ SHLIB_SUFFIX=".so"
+ LDFLAGS="$LDFLAGS -export-dynamic"
+ if test $doRpath = yes; then :
+@@ -7487,7 +7484,7 @@ fi
+
+ fi
+ ;;
+- FreeBSD-*)
++ FreeBSD-*|DragonFly-*)
+ # This configuration from FreeBSD Ports.
+ SHLIB_CFLAGS="-fPIC"
+ SHLIB_LD="${CC} -shared"
+@@ -7509,10 +7506,6 @@ fi
+ case $system in
+ FreeBSD-3.*)
+ # Version numbers are dot-stripped by system policy.
+- TCL_TRIM_DOTS=`echo ${PACKAGE_VERSION} | tr -d .`
+- UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
+- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1'
+- TCL_LIB_VERSIONS_OK=nodots
+ ;;
+ esac
+ ;;
+@@ -8123,7 +8116,7 @@ fi
+ BSD/OS*) ;;
+ CYGWIN_*|MINGW32_*) ;;
+ IRIX*) ;;
+- NetBSD-*|FreeBSD-*|OpenBSD-*) ;;
++ NetBSD-*|FreeBSD-*|OpenBSD-*|DragonFly-*) ;;
+ Darwin-*) ;;
+ SCO_SV-3.2*) ;;
+ windows) ;;
Index: pkgsrc/lang/tcl/patches/patch-pkgs_sqlite3.20.0_Makefile.in
diff -u /dev/null pkgsrc/lang/tcl/patches/patch-pkgs_sqlite3.20.0_Makefile.in:1.1
--- /dev/null Fri Aug 25 11:05:33 2017
+++ pkgsrc/lang/tcl/patches/patch-pkgs_sqlite3.20.0_Makefile.in Fri Aug 25 11:05:33 2017
@@ -0,0 +1,15 @@
+$NetBSD: patch-pkgs_sqlite3.20.0_Makefile.in,v 1.1 2017/08/25 11:05:33 adam Exp $
+
+Fix building with system sqlite3.
+
+--- pkgs/sqlite3.20.0/Makefile.in.orig 2016-01-07 15:38:22.000000000 +0000
++++ pkgs/sqlite3.20.0/Makefile.in
+@@ -150,7 +150,7 @@ SHARED_BUILD = @SHARED_BUILD@
+ INCLUDES = @PKG_INCLUDES@ @TCL_INCLUDES@ -I$(srcdir)/..
+ #INCLUDES = @PKG_INCLUDES@ @TCL_INCLUDES@ @TK_INCLUDES@ @TK_XINCLUDES@
+
+-PKG_CFLAGS = @PKG_CFLAGS@ -DSQLITE_API=MODULE_SCOPE -DSQLITE_EXTERN=
++PKG_CFLAGS = @PKG_CFLAGS@
+
+ # TCL_DEFS is not strictly need here, but if you remove it, then you
+ # must make sure that configure.in checks for the necessary components
Index: pkgsrc/lang/tcl/patches/patch-pkgs_sqlite3.20.0_configure
diff -u /dev/null pkgsrc/lang/tcl/patches/patch-pkgs_sqlite3.20.0_configure:1.1
--- /dev/null Fri Aug 25 11:05:33 2017
+++ pkgsrc/lang/tcl/patches/patch-pkgs_sqlite3.20.0_configure Fri Aug 25 11:05:33 2017
@@ -0,0 +1,62 @@
+$NetBSD: patch-pkgs_sqlite3.20.0_configure,v 1.1 2017/08/25 11:05:33 adam Exp $
+
+Add support for DragonFly.
+
+Honor LDFLAGS on NetBSD.
+https://core.tcl.tk/tcl/tktview/fed5069f8a8e59e97af0a784b534919f5b789b1e
+
+--- pkgs/sqlite3.20.0/configure.orig 2017-08-04 11:57:41.000000000 +0000
++++ pkgs/sqlite3.20.0/configure
+@@ -7409,7 +7409,7 @@ fi
+ fi
+ LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so${SHLIB_VERSION}'
+- LDFLAGS="-Wl,-export-dynamic"
++ LDFLAGS="-Wl,--export-dynamic"
+ CFLAGS_OPTIMIZE="-O2"
+ if test "${TCL_THREADS}" = "1"; then :
+
+@@ -7420,13 +7420,11 @@ fi
+
+ fi
+ # OpenBSD doesn't do version numbers with dots.
+- UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
+- TCL_LIB_VERSIONS_OK=nodots
+ ;;
+ NetBSD-*)
+ # NetBSD has ELF and can use 'cc -shared' to build shared libs
+ SHLIB_CFLAGS="-fPIC"
+- SHLIB_LD='${CC} -shared ${SHLIB_CFLAGS}'
++ SHLIB_LD='${CC} -shared ${SHLIB_CFLAGS} ${LDFLAGS_DEFAULT}'
+ SHLIB_SUFFIX=".so"
+ LDFLAGS="$LDFLAGS -export-dynamic"
+ if test $doRpath = yes; then :
+@@ -7443,7 +7441,7 @@ fi
+
+ fi
+ ;;
+- FreeBSD-*)
++ FreeBSD-*|DragonFly-*)
+ # This configuration from FreeBSD Ports.
+ SHLIB_CFLAGS="-fPIC"
+ SHLIB_LD="${CC} -shared"
+@@ -7465,10 +7463,6 @@ fi
+ case $system in
+ FreeBSD-3.*)
+ # Version numbers are dot-stripped by system policy.
+- TCL_TRIM_DOTS=`echo ${PACKAGE_VERSION} | tr -d .`
+- UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
+- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1'
+- TCL_LIB_VERSIONS_OK=nodots
+ ;;
+ esac
+ ;;
+@@ -8079,7 +8073,7 @@ fi
+ BSD/OS*) ;;
+ CYGWIN_*|MINGW32_*) ;;
+ IRIX*) ;;
+- NetBSD-*|FreeBSD-*|OpenBSD-*) ;;
++ NetBSD-*|FreeBSD-*|OpenBSD-*|DragonFly-*) ;;
+ Darwin-*) ;;
+ SCO_SV-3.2*) ;;
+ windows) ;;
Index: pkgsrc/lang/tcl/patches/patch-pkgs_tdbc1.0.5_configure
diff -u /dev/null pkgsrc/lang/tcl/patches/patch-pkgs_tdbc1.0.5_configure:1.1
--- /dev/null Fri Aug 25 11:05:33 2017
+++ pkgsrc/lang/tcl/patches/patch-pkgs_tdbc1.0.5_configure Fri Aug 25 11:05:33 2017
@@ -0,0 +1,63 @@
+$NetBSD: patch-pkgs_tdbc1.0.5_configure,v 1.1 2017/08/25 11:05:33 adam Exp $
+
+Add support for DragonFly.
+
+Honor LDFLAGS on NetBSD.
+https://core.tcl.tk/tcl/tktview/fed5069f8a8e59e97af0a784b534919f5b789b1e
+
+--- pkgs/tdbc1.0.5/configure.orig 2017-05-04 18:55:32.000000000 +0000
++++ pkgs/tdbc1.0.5/configure
+@@ -7559,8 +7559,7 @@ fi
+ CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
+ fi
+ LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
+- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so${SHLIB_VERSION}'
+- LDFLAGS="-Wl,-export-dynamic"
++ LDFLAGS="-Wl,--export-dynamic"
+ ;;
+ esac
+ case "$arch" in
+@@ -7580,13 +7579,11 @@ fi
+
+ fi
+ # OpenBSD doesn't do version numbers with dots.
+- UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
+- TCL_LIB_VERSIONS_OK=nodots
+ ;;
+ NetBSD-*)
+ # NetBSD has ELF and can use 'cc -shared' to build shared libs
+ SHLIB_CFLAGS="-fPIC"
+- SHLIB_LD='${CC} -shared ${SHLIB_CFLAGS}'
++ SHLIB_LD='${CC} -shared ${SHLIB_CFLAGS} ${LDFLAGS_DEFAULT}'
+ SHLIB_SUFFIX=".so"
+ LDFLAGS="$LDFLAGS -export-dynamic"
+ if test $doRpath = yes; then :
+@@ -7603,7 +7600,7 @@ fi
+
+ fi
+ ;;
+- FreeBSD-*)
++ FreeBSD-*|DragonFly-*)
+ # This configuration from FreeBSD Ports.
+ SHLIB_CFLAGS="-fPIC"
+ SHLIB_LD="${CC} -shared"
+@@ -7625,10 +7622,6 @@ fi
+ case $system in
+ FreeBSD-3.*)
+ # Version numbers are dot-stripped by system policy.
+- TCL_TRIM_DOTS=`echo ${PACKAGE_VERSION} | tr -d .`
+- UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
+- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1'
+- TCL_LIB_VERSIONS_OK=nodots
+ ;;
+ esac
+ ;;
+@@ -8239,7 +8232,7 @@ fi
+ BSD/OS*) ;;
+ CYGWIN_*|MINGW32_*) ;;
+ IRIX*) ;;
+- NetBSD-*|FreeBSD-*|OpenBSD-*) ;;
++ NetBSD-*|FreeBSD-*|OpenBSD-*|DragonFly-*) ;;
+ Darwin-*) ;;
+ SCO_SV-3.2*) ;;
+ windows) ;;
Index: pkgsrc/lang/tcl/patches/patch-pkgs_tdbcmysql1.0.5_configure
diff -u /dev/null pkgsrc/lang/tcl/patches/patch-pkgs_tdbcmysql1.0.5_configure:1.1
--- /dev/null Fri Aug 25 11:05:33 2017
+++ pkgsrc/lang/tcl/patches/patch-pkgs_tdbcmysql1.0.5_configure Fri Aug 25 11:05:33 2017
@@ -0,0 +1,62 @@
+$NetBSD: patch-pkgs_tdbcmysql1.0.5_configure,v 1.1 2017/08/25 11:05:33 adam Exp $
+
+Add support for DragonFly.
+
+Honor LDFLAGS on NetBSD.
+https://core.tcl.tk/tcl/tktview/fed5069f8a8e59e97af0a784b534919f5b789b1e
+
+--- pkgs/tdbcmysql1.0.5/configure.orig 2017-07-28 18:41:39.000000000 +0000
++++ pkgs/tdbcmysql1.0.5/configure
+@@ -7901,7 +7901,7 @@ fi
+ fi
+ LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so${SHLIB_VERSION}'
+- LDFLAGS="-Wl,-export-dynamic"
++ LDFLAGS="-Wl,--export-dynamic"
+ CFLAGS_OPTIMIZE="-O2"
+ if test "${TCL_THREADS}" = "1"; then :
+
+@@ -7912,13 +7912,11 @@ fi
+
+ fi
+ # OpenBSD doesn't do version numbers with dots.
+- UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
+- TCL_LIB_VERSIONS_OK=nodots
+ ;;
+ NetBSD-*)
+ # NetBSD has ELF and can use 'cc -shared' to build shared libs
+ SHLIB_CFLAGS="-fPIC"
+- SHLIB_LD='${CC} -shared ${SHLIB_CFLAGS}'
++ SHLIB_LD='${CC} -shared ${SHLIB_CFLAGS} ${LDFLAGS_DEFAULT}'
+ SHLIB_SUFFIX=".so"
+ LDFLAGS="$LDFLAGS -export-dynamic"
+ if test $doRpath = yes; then :
+@@ -7935,7 +7933,7 @@ fi
+
+ fi
+ ;;
+- FreeBSD-*)
++ FreeBSD-*|DragonFly-*)
+ # This configuration from FreeBSD Ports.
+ SHLIB_CFLAGS="-fPIC"
+ SHLIB_LD="${CC} -shared"
+@@ -7957,10 +7955,6 @@ fi
+ case $system in
+ FreeBSD-3.*)
+ # Version numbers are dot-stripped by system policy.
+- TCL_TRIM_DOTS=`echo ${PACKAGE_VERSION} | tr -d .`
+- UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
+- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1'
+- TCL_LIB_VERSIONS_OK=nodots
+ ;;
+ esac
+ ;;
+@@ -8571,7 +8565,7 @@ fi
+ BSD/OS*) ;;
+ CYGWIN_*|MINGW32_*) ;;
+ IRIX*) ;;
+- NetBSD-*|FreeBSD-*|OpenBSD-*) ;;
++ NetBSD-*|FreeBSD-*|OpenBSD-*|DragonFly-*) ;;
+ Darwin-*) ;;
+ SCO_SV-3.2*) ;;
+ windows) ;;
Index: pkgsrc/lang/tcl/patches/patch-pkgs_tdbcodbc1.0.5_configure
diff -u /dev/null pkgsrc/lang/tcl/patches/patch-pkgs_tdbcodbc1.0.5_configure:1.1
--- /dev/null Fri Aug 25 11:05:33 2017
+++ pkgsrc/lang/tcl/patches/patch-pkgs_tdbcodbc1.0.5_configure Fri Aug 25 11:05:33 2017
@@ -0,0 +1,62 @@
+$NetBSD: patch-pkgs_tdbcodbc1.0.5_configure,v 1.1 2017/08/25 11:05:33 adam Exp $
+
+Add support for DragonFly.
+
+Honor LDFLAGS on NetBSD.
+https://core.tcl.tk/tcl/tktview/fed5069f8a8e59e97af0a784b534919f5b789b1e
+
+--- pkgs/tdbcodbc1.0.5/configure.orig 2017-07-28 18:41:55.000000000 +0000
++++ pkgs/tdbcodbc1.0.5/configure
+@@ -7911,7 +7911,7 @@ fi
+ fi
+ LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so${SHLIB_VERSION}'
+- LDFLAGS="-Wl,-export-dynamic"
++ LDFLAGS="-Wl,--export-dynamic"
+ CFLAGS_OPTIMIZE="-O2"
+ if test "${TCL_THREADS}" = "1"; then :
+
+@@ -7922,13 +7922,11 @@ fi
+
+ fi
+ # OpenBSD doesn't do version numbers with dots.
+- UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
+- TCL_LIB_VERSIONS_OK=nodots
+ ;;
+ NetBSD-*)
+ # NetBSD has ELF and can use 'cc -shared' to build shared libs
+ SHLIB_CFLAGS="-fPIC"
+- SHLIB_LD='${CC} -shared ${SHLIB_CFLAGS}'
++ SHLIB_LD='${CC} -shared ${SHLIB_CFLAGS} ${LDFLAGS_DEFAULT}'
+ SHLIB_SUFFIX=".so"
+ LDFLAGS="$LDFLAGS -export-dynamic"
+ if test $doRpath = yes; then :
+@@ -7945,7 +7943,7 @@ fi
+
+ fi
+ ;;
+- FreeBSD-*)
++ FreeBSD-*|DragonFly-*)
+ # This configuration from FreeBSD Ports.
+ SHLIB_CFLAGS="-fPIC"
+ SHLIB_LD="${CC} -shared"
+@@ -7967,10 +7965,6 @@ fi
+ case $system in
+ FreeBSD-3.*)
+ # Version numbers are dot-stripped by system policy.
+- TCL_TRIM_DOTS=`echo ${PACKAGE_VERSION} | tr -d .`
+- UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
+- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1'
+- TCL_LIB_VERSIONS_OK=nodots
+ ;;
+ esac
+ ;;
+@@ -8581,7 +8575,7 @@ fi
+ BSD/OS*) ;;
+ CYGWIN_*|MINGW32_*) ;;
+ IRIX*) ;;
+- NetBSD-*|FreeBSD-*|OpenBSD-*) ;;
++ NetBSD-*|FreeBSD-*|OpenBSD-*|DragonFly-*) ;;
+ Darwin-*) ;;
+ SCO_SV-3.2*) ;;
+ windows) ;;
Index: pkgsrc/lang/tcl/patches/patch-pkgs_tdbcpostgres1.0.5_configure
diff -u /dev/null pkgsrc/lang/tcl/patches/patch-pkgs_tdbcpostgres1.0.5_configure:1.1
--- /dev/null Fri Aug 25 11:05:33 2017
+++ pkgsrc/lang/tcl/patches/patch-pkgs_tdbcpostgres1.0.5_configure Fri Aug 25 11:05:33 2017
@@ -0,0 +1,62 @@
+$NetBSD: patch-pkgs_tdbcpostgres1.0.5_configure,v 1.1 2017/08/25 11:05:33 adam Exp $
+
+Add support for DragonFly.
+
+Honor LDFLAGS on NetBSD.
+https://core.tcl.tk/tcl/tktview/fed5069f8a8e59e97af0a784b534919f5b789b1e
+
+--- pkgs/tdbcpostgres1.0.5/configure.orig 2017-08-09 14:45:57.000000000 +0000
++++ pkgs/tdbcpostgres1.0.5/configure
+@@ -7901,7 +7901,7 @@ fi
+ fi
+ LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so${SHLIB_VERSION}'
+- LDFLAGS="-Wl,-export-dynamic"
++ LDFLAGS="-Wl,--export-dynamic"
+ CFLAGS_OPTIMIZE="-O2"
+ if test "${TCL_THREADS}" = "1"; then :
+
+@@ -7912,13 +7912,11 @@ fi
+
+ fi
+ # OpenBSD doesn't do version numbers with dots.
+- UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
+- TCL_LIB_VERSIONS_OK=nodots
+ ;;
+ NetBSD-*)
+ # NetBSD has ELF and can use 'cc -shared' to build shared libs
+ SHLIB_CFLAGS="-fPIC"
+- SHLIB_LD='${CC} -shared ${SHLIB_CFLAGS}'
++ SHLIB_LD='${CC} -shared ${SHLIB_CFLAGS} ${LDFLAGS_DEFAULT}'
+ SHLIB_SUFFIX=".so"
+ LDFLAGS="$LDFLAGS -export-dynamic"
+ if test $doRpath = yes; then :
+@@ -7935,7 +7933,7 @@ fi
+
+ fi
+ ;;
+- FreeBSD-*)
++ FreeBSD-*|DragonFly-*)
+ # This configuration from FreeBSD Ports.
+ SHLIB_CFLAGS="-fPIC"
+ SHLIB_LD="${CC} -shared"
+@@ -7957,10 +7955,6 @@ fi
+ case $system in
+ FreeBSD-3.*)
+ # Version numbers are dot-stripped by system policy.
+- TCL_TRIM_DOTS=`echo ${PACKAGE_VERSION} | tr -d .`
+- UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
+- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1'
+- TCL_LIB_VERSIONS_OK=nodots
+ ;;
+ esac
+ ;;
+@@ -8571,7 +8565,7 @@ fi
+ BSD/OS*) ;;
+ CYGWIN_*|MINGW32_*) ;;
+ IRIX*) ;;
+- NetBSD-*|FreeBSD-*|OpenBSD-*) ;;
++ NetBSD-*|FreeBSD-*|OpenBSD-*|DragonFly-*) ;;
+ Darwin-*) ;;
+ SCO_SV-3.2*) ;;
+ windows) ;;
Index: pkgsrc/lang/tcl/patches/patch-pkgs_thread2.8.1_configure
diff -u /dev/null pkgsrc/lang/tcl/patches/patch-pkgs_thread2.8.1_configure:1.1
--- /dev/null Fri Aug 25 11:05:33 2017
+++ pkgsrc/lang/tcl/patches/patch-pkgs_thread2.8.1_configure Fri Aug 25 11:05:33 2017
@@ -0,0 +1,62 @@
+$NetBSD: patch-pkgs_thread2.8.1_configure,v 1.1 2017/08/25 11:05:33 adam Exp $
+
+Add support for DragonFly.
+
+Honor LDFLAGS on NetBSD.
+https://core.tcl.tk/tcl/tktview/fed5069f8a8e59e97af0a784b534919f5b789b1e
+
+--- pkgs/thread2.8.1/configure.orig 2017-05-23 13:17:07.000000000 +0000
++++ pkgs/thread2.8.1/configure
+@@ -7514,7 +7514,7 @@ fi
+ fi
+ LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so${SHLIB_VERSION}'
+- LDFLAGS="-Wl,-export-dynamic"
++ LDFLAGS="-Wl,--export-dynamic"
+ CFLAGS_OPTIMIZE="-O2"
+ if test "${TCL_THREADS}" = "1"; then :
+
+@@ -7525,13 +7525,11 @@ fi
+
+ fi
+ # OpenBSD doesn't do version numbers with dots.
+- UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
+- TCL_LIB_VERSIONS_OK=nodots
+ ;;
+ NetBSD-*)
+ # NetBSD has ELF and can use 'cc -shared' to build shared libs
+ SHLIB_CFLAGS="-fPIC"
+- SHLIB_LD='${CC} -shared ${SHLIB_CFLAGS}'
++ SHLIB_LD='${CC} -shared ${SHLIB_CFLAGS} ${LDFLAGS_DEFAULT}'
+ SHLIB_SUFFIX=".so"
+ LDFLAGS="$LDFLAGS -export-dynamic"
+ if test $doRpath = yes; then :
+@@ -7548,7 +7546,7 @@ fi
+
+ fi
+ ;;
+- FreeBSD-*)
++ FreeBSD-*|DragonFly-*)
+ # This configuration from FreeBSD Ports.
+ SHLIB_CFLAGS="-fPIC"
+ SHLIB_LD="${CC} -shared"
+@@ -7570,10 +7568,6 @@ fi
+ case $system in
+ FreeBSD-3.*)
+ # Version numbers are dot-stripped by system policy.
+- TCL_TRIM_DOTS=`echo ${PACKAGE_VERSION} | tr -d .`
+- UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
+- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1'
+- TCL_LIB_VERSIONS_OK=nodots
+ ;;
+ esac
+ ;;
+@@ -8184,7 +8178,7 @@ fi
+ BSD/OS*) ;;
+ CYGWIN_*|MINGW32_*) ;;
+ IRIX*) ;;
+- NetBSD-*|FreeBSD-*|OpenBSD-*) ;;
++ NetBSD-*|FreeBSD-*|OpenBSD-*|DragonFly-*) ;;
+ Darwin-*) ;;
+ SCO_SV-3.2*) ;;
+ windows) ;;
Home |
Main Index |
Thread Index |
Old Index