diff options
author | adam <adam@pkgsrc.org> | 2017-08-25 11:05:33 +0000 |
---|---|---|
committer | adam <adam@pkgsrc.org> | 2017-08-25 11:05:33 +0000 |
commit | 3013a34d8027755e89aa148ff40fe22253e1f0e7 (patch) | |
tree | f55185a750596e61d892ab1d74460888b3a4706f /x11/tk | |
parent | f885011bf758cd11007291f5695725d4bdf49361 (diff) | |
download | pkgsrc-3013a34d8027755e89aa148ff40fe22253e1f0e7.tar.gz |
Changes 8.6.7:
Bug fixes.
Diffstat (limited to 'x11/tk')
-rw-r--r-- | x11/tk/Makefile.version | 4 | ||||
-rw-r--r-- | x11/tk/distinfo | 14 | ||||
-rw-r--r-- | x11/tk/patches/patch-unix_Makefile.in | 6 | ||||
-rw-r--r-- | x11/tk/patches/patch-unix_configure | 54 |
4 files changed, 39 insertions, 39 deletions
diff --git a/x11/tk/Makefile.version b/x11/tk/Makefile.version index 86b825734d4..2ea4aa9b5a2 100644 --- a/x11/tk/Makefile.version +++ b/x11/tk/Makefile.version @@ -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 diff --git a/x11/tk/distinfo b/x11/tk/distinfo index 1eaff1a1703..2416c004bc2 100644 --- a/x11/tk/distinfo +++ b/x11/tk/distinfo @@ -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 diff --git a/x11/tk/patches/patch-unix_Makefile.in b/x11/tk/patches/patch-unix_Makefile.in index 0bfbc53072c..90d9f9019e4 100644 --- a/x11/tk/patches/patch-unix_Makefile.in +++ b/x11/tk/patches/patch-unix_Makefile.in @@ -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 2016/03/06 11:47:49 adam Exp $ @@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} diff --git a/x11/tk/patches/patch-unix_configure b/x11/tk/patches/patch-unix_configure index d9ec180197f..d63e629c3be 100644 --- a/x11/tk/patches/patch-unix_configure +++ b/x11/tk/patches/patch-unix_configure @@ -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 |