diff options
author | adam <adam@pkgsrc.org> | 2016-03-06 11:47:49 +0000 |
---|---|---|
committer | adam <adam@pkgsrc.org> | 2016-03-06 11:47:49 +0000 |
commit | d6f6ecbcf3dcc406599fbaf1908300d5fd8c8533 (patch) | |
tree | 3d24ce798b15797ebc932720a5bb7f32bf80e917 /x11/tk | |
parent | 9d08802609025a755b00917ffc2cf90206c49cd5 (diff) | |
download | pkgsrc-d6f6ecbcf3dcc406599fbaf1908300d5fd8c8533.tar.gz |
Changes 8.6.5:
Bug fixes.
Diffstat (limited to 'x11/tk')
-rw-r--r-- | x11/tk/Makefile.version | 4 | ||||
-rw-r--r-- | x11/tk/PLIST | 5 | ||||
-rw-r--r-- | x11/tk/distinfo | 14 | ||||
-rw-r--r-- | x11/tk/patches/patch-unix_Makefile.in | 22 | ||||
-rw-r--r-- | x11/tk/patches/patch-unix_configure | 44 |
5 files changed, 44 insertions, 45 deletions
diff --git a/x11/tk/Makefile.version b/x11/tk/Makefile.version index 5b73d381e47..8ca159ed16b 100644 --- a/x11/tk/Makefile.version +++ b/x11/tk/Makefile.version @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.version,v 1.16 2015/05/21 10:38:00 adam Exp $ +# $NetBSD: Makefile.version,v 1.17 2016/03/06 11:47:49 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.4 +TK_VERSION= 8.6.5 diff --git a/x11/tk/PLIST b/x11/tk/PLIST index 04bf0f88679..e06ab70b53e 100644 --- a/x11/tk/PLIST +++ b/x11/tk/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.14 2014/10/31 21:11:18 adam Exp $ +@comment $NetBSD: PLIST,v 1.15 2016/03/06 11:47:49 adam Exp $ bin/wish bin/wish${BASEVER} ${PLIST.aqua}include/X11/X.h @@ -91,6 +91,7 @@ lib/tk${BASEVER}/demos/image1.tcl lib/tk${BASEVER}/demos/image2.tcl lib/tk${BASEVER}/demos/images/earth.gif lib/tk${BASEVER}/demos/images/earthris.gif +lib/tk${BASEVER}/demos/images/face.xbm lib/tk${BASEVER}/demos/images/flagdown.xbm lib/tk${BASEVER}/demos/images/flagup.xbm lib/tk${BASEVER}/demos/images/gray25.xbm @@ -149,8 +150,6 @@ lib/tk${BASEVER}/fontchooser.tcl lib/tk${BASEVER}/iconlist.tcl lib/tk${BASEVER}/icons.tcl lib/tk${BASEVER}/images/README -lib/tk${BASEVER}/images/lamp.png -lib/tk${BASEVER}/images/lamp.svg lib/tk${BASEVER}/images/logo.eps lib/tk${BASEVER}/images/logo100.gif lib/tk${BASEVER}/images/logo64.gif diff --git a/x11/tk/distinfo b/x11/tk/distinfo index 6e788a8b940..f6c9885ba9a 100644 --- a/x11/tk/distinfo +++ b/x11/tk/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.46 2015/11/04 03:28:55 agc Exp $ +$NetBSD: distinfo,v 1.47 2016/03/06 11:47:49 adam Exp $ -SHA1 (tk8.6.4-src.tar.gz) = ad24c59ac2e7453d1ed2bad0d7d18a01eabc5226 -RMD160 (tk8.6.4-src.tar.gz) = 83ee22124e6afffba535ac45e60b3f815a7aac9e -SHA512 (tk8.6.4-src.tar.gz) = d0a1d1fd0938af4a9e532aa1bd4488647cff05f98e9e09b5fa16b773364a5d61030b7975541c688c7e0afc0bde60d49ce50a24d842549bab1622a0255e267909 -Size (tk8.6.4-src.tar.gz) = 4266426 bytes -SHA1 (patch-unix_Makefile.in) = 553800ef42c328618980962c6b78d478ab4d2e2b -SHA1 (patch-unix_configure) = 97139ed28a2cb8528da5c53cfcbc8f8fb43670f6 +SHA1 (tk8.6.5-src.tar.gz) = e63f9e46cfd4ea37799554b003958b54b51dc347 +RMD160 (tk8.6.5-src.tar.gz) = dc34fe23e2aa018dfe70d082d99793a48b37aa84 +SHA512 (tk8.6.5-src.tar.gz) = 9acf2ef993a566a7cdd1efe21dc896b09125c65d86df53ab5a78542b21d3f031e9f9d72b81738705636c268b5ce72934c483eb087d5c0114f913c9075db9a3b1 +Size (tk8.6.5-src.tar.gz) = 4417393 bytes +SHA1 (patch-unix_Makefile.in) = bfb693af19ace5386a73cebdfe09c92a356e14ea +SHA1 (patch-unix_configure) = 05d47c85f889d53f326c7a64223e435411744771 diff --git a/x11/tk/patches/patch-unix_Makefile.in b/x11/tk/patches/patch-unix_Makefile.in index 26ad28015ea..0bfbc53072c 100644 --- a/x11/tk/patches/patch-unix_Makefile.in +++ b/x11/tk/patches/patch-unix_Makefile.in @@ -1,6 +1,6 @@ -$NetBSD: patch-unix_Makefile.in,v 1.6 2014/10/31 21:11:18 adam Exp $ +$NetBSD: patch-unix_Makefile.in,v 1.7 2016/03/06 11:47:49 adam Exp $ ---- unix/Makefile.in.orig 2014-08-27 16:23:13.000000000 +0000 +--- unix/Makefile.in.orig 2016-02-29 19:13:21.000000000 +0000 +++ unix/Makefile.in @@ -14,6 +14,7 @@ MAJOR_VERSION = @TK_MAJOR_VERSION@ MINOR_VERSION = @TK_MINOR_VERSION@ @@ -54,7 +54,7 @@ $NetBSD: patch-unix_Makefile.in,v 1.6 2014/10/31 21:11:18 adam Exp $ # Additional search flags needed to find the various shared libraries # at run-time. The first symbol is for use when creating a binary # with cc, and the second is for use when running ld directly. -@@ -562,6 +567,9 @@ PRIVATE_HDRS = $(GENERIC_DIR)/tkInt.h $( +@@ -562,6 +568,9 @@ PRIVATE_HDRS = $(GENERIC_DIR)/tkInt.h $( DEMOPROGS = browse hello ixset rmt rolodex square tcolor timer widget @@ -64,7 +64,7 @@ $NetBSD: patch-unix_Makefile.in,v 1.6 2014/10/31 21:11:18 adam Exp $ SHELL_ENV = \ @LD_LIBRARY_PATH_VAR@="`pwd`:${TCL_BIN_DIR}:$${@LD_LIBRARY_PATH_VAR@}"; \ export @LD_LIBRARY_PATH_VAR@; \ -@@ -585,6 +593,11 @@ ${LIB_FILE}: ${STUB_LIB_FILE} @LIB_RSRC_ +@@ -585,6 +594,11 @@ ${LIB_FILE}: ${STUB_LIB_FILE} @LIB_RSRC_ rm -f $@ @MAKE_LIB@ @@ -76,16 +76,16 @@ $NetBSD: patch-unix_Makefile.in,v 1.6 2014/10/31 21:11:18 adam Exp $ ${STUB_LIB_FILE}: ${STUB_LIB_OBJS} @if test "x${LIB_FILE}" = "xlibtk${MAJOR_VERSION}.${MINOR_VERSION}.dll"; then \ (cd ${TOP_DIR}/win; ${MAKE} tk${MAJOR_VERSION}${MINOR_VERSION}.dll); \ -@@ -713,7 +726,7 @@ install-strip: - # some ranlibs write to current directory, and this might not always be - # possible (e.g. if installing as root). +@@ -709,7 +723,7 @@ install-strip: + INSTALL_PROGRAM="$(INSTALL_PROGRAM) ${INSTALL_STRIP_PROGRAM}" \ + INSTALL_LIBRARY="$(INSTALL_LIBRARY) ${INSTALL_STRIP_LIBRARY}" -install-binaries: $(TK_STUB_LIB_FILE) $(TK_LIB_FILE) ${WISH_EXE} +install-binaries: $(TK_STUB_LIB_FILE) $(TK_LIB_FILE) $(TK_LIB_A_FILE) ${WISH_EXE} ${TK_LIB_A_FILE} @for i in "$(LIB_INSTALL_DIR)" "$(BIN_INSTALL_DIR)" \ "$(PKG_INSTALL_DIR)" "$(CONFIG_INSTALL_DIR)" ; \ do \ -@@ -743,7 +756,13 @@ install-binaries: $(TK_STUB_LIB_FILE) $( +@@ -739,7 +753,13 @@ install-binaries: $(TK_STUB_LIB_FILE) $( fi @echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/" @@INSTALL_LIB@ @@ -100,7 +100,7 @@ $NetBSD: patch-unix_Makefile.in,v 1.6 2014/10/31 21:11:18 adam Exp $ @if test -f "tk${MAJOR_VERSION}${MINOR_VERSION}.dll"; then \ $(INSTALL_LIBRARY) "tk${MAJOR_VERSION}${MINOR_VERSION}.dll" "$(DLL_INSTALL_DIR)";\ chmod 555 "$(DLL_INSTALL_DIR)/tk${MAJOR_VERSION}${MINOR_VERSION}.dll";\ -@@ -752,6 +771,7 @@ install-binaries: $(TK_STUB_LIB_FILE) $( +@@ -748,6 +768,7 @@ install-binaries: $(TK_STUB_LIB_FILE) $( fi @echo "Installing ${WISH_EXE} as $(BIN_INSTALL_DIR)/wish$(VERSION)${EXE_SUFFIX}" @$(INSTALL_PROGRAM) ${WISH_EXE} "$(BIN_INSTALL_DIR)/wish$(VERSION)${EXE_SUFFIX}" @@ -108,7 +108,7 @@ $NetBSD: patch-unix_Makefile.in,v 1.6 2014/10/31 21:11:18 adam Exp $ @echo "Installing tkConfig.sh to $(CONFIG_INSTALL_DIR)/" @$(INSTALL_DATA) tkConfig.sh "$(CONFIG_INSTALL_DIR)/tkConfig.sh" @if test "$(STUB_LIB_FILE)" != "" ; then \ -@@ -859,7 +879,7 @@ install-doc: +@@ -855,7 +876,7 @@ install-doc: install-headers: @if test "$(@TK_WINDOWINGSYSTEM@_XLIB_HDRS)" != ""; then \ XLIB_INCLUDE_INSTALL_DIR="$(INCLUDE_INSTALL_DIR)"/X11; fi; \ @@ -117,7 +117,7 @@ $NetBSD: patch-unix_Makefile.in,v 1.6 2014/10/31 21:11:18 adam Exp $ do \ if [ -n "$$i" -a ! -d "$$i" ] ; then \ echo "Making directory $$i"; \ -@@ -868,9 +888,12 @@ install-headers: +@@ -864,9 +885,12 @@ install-headers: fi; \ done; @echo "Installing header files to $(INCLUDE_INSTALL_DIR)/"; diff --git a/x11/tk/patches/patch-unix_configure b/x11/tk/patches/patch-unix_configure index a3b3a786026..aa5ab4b81b3 100644 --- a/x11/tk/patches/patch-unix_configure +++ b/x11/tk/patches/patch-unix_configure @@ -1,8 +1,8 @@ -$NetBSD: patch-unix_configure,v 1.9 2014/10/31 21:11:18 adam Exp $ +$NetBSD: patch-unix_configure,v 1.10 2016/03/06 11:47:49 adam Exp $ ---- unix/configure.orig 2014-08-27 16:23:13.000000000 +0000 +--- unix/configure.orig 2016-02-29 19:13:21.000000000 +0000 +++ unix/configure -@@ -4543,10 +4543,10 @@ fi +@@ -4388,10 +4388,10 @@ fi # LDFLAGS_ARCH so they eventually end up in LDFLAGS even if [load] # is disabled by the user. [Bug 1016796] LDFLAGS_ARCH="" @@ -15,7 +15,7 @@ $NetBSD: patch-unix_configure,v 1.9 2014/10/31 21:11:18 adam Exp $ CFLAGS_DEBUG=-g if test "$GCC" = yes; then -@@ -5508,7 +5508,7 @@ fi +@@ -5352,7 +5352,7 @@ fi CC_SEARCH_FLAGS="" LD_SEARCH_FLAGS="" ;; @@ -24,7 +24,7 @@ $NetBSD: patch-unix_configure,v 1.9 2014/10/31 21:11:18 adam Exp $ arch=`arch -s` case "$arch" in vax) -@@ -5530,7 +5530,7 @@ fi +@@ -5381,7 +5381,7 @@ fi fi LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} @@ -33,7 +33,7 @@ $NetBSD: patch-unix_configure,v 1.9 2014/10/31 21:11:18 adam Exp $ LDFLAGS="-Wl,-export-dynamic" ;; esac -@@ -5565,7 +5565,7 @@ fi +@@ -5416,7 +5416,7 @@ fi SHLIB_SUFFIX=".so" DL_OBJS="tclLoadDl.o" DL_LIBS="" @@ -42,7 +42,7 @@ $NetBSD: patch-unix_configure,v 1.9 2014/10/31 21:11:18 adam Exp $ if test $doRpath = yes; then CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' -@@ -5582,7 +5582,7 @@ fi +@@ -5433,7 +5433,7 @@ fi fi ;; @@ -51,7 +51,7 @@ $NetBSD: patch-unix_configure,v 1.9 2014/10/31 21:11:18 adam Exp $ # This configuration from FreeBSD Ports. SHLIB_CFLAGS="-fPIC" SHLIB_LD="${CC} -shared" -@@ -6791,7 +6791,7 @@ fi +@@ -6641,7 +6641,7 @@ fi BSD/OS*) ;; CYGWIN_*|MINGW32_*) ;; IRIX*) ;; @@ -60,7 +60,7 @@ $NetBSD: patch-unix_configure,v 1.9 2014/10/31 21:11:18 adam Exp $ Darwin-*) ;; SCO_SV-3.2*) ;; *) SHLIB_CFLAGS="-fPIC" ;; -@@ -6812,12 +6812,12 @@ fi +@@ -6662,12 +6662,12 @@ fi if test "$SHARED_LIB_SUFFIX" = ""; then @@ -75,7 +75,7 @@ $NetBSD: patch-unix_configure,v 1.9 2014/10/31 21:11:18 adam Exp $ fi DLL_INSTALL_DIR="\$(LIB_INSTALL_DIR)" -@@ -6833,7 +6833,11 @@ fi +@@ -6683,7 +6683,11 @@ fi else @@ -88,16 +88,16 @@ $NetBSD: patch-unix_configure,v 1.9 2014/10/31 21:11:18 adam Exp $ fi -@@ -6867,7 +6871,7 @@ fi - else - - MAKE_STUB_LIB='${STLIB_LD} $@ ${STUB_LIB_OBJS} ; ${RANLIB} $@' -- INSTALL_STUB_LIB='$(INSTALL_LIBRARY) $(STUB_LIB_FILE) "$(LIB_INSTALL_DIR)/$(STUB_LIB_FILE)" ; (cd "$(LIB_INSTALL_DIR)" ; $(RANLIB) $(STUB_LIB_FILE))' -+ INSTALL_STUB_LIB='$(INSTALL_DATA) $(STUB_LIB_FILE) "$(LIB_INSTALL_DIR)/$(STUB_LIB_FILE)" ; (cd "$(LIB_INSTALL_DIR)" ; $(RANLIB) $(STUB_LIB_FILE))' +@@ -6718,7 +6722,7 @@ else fi -@@ -10002,7 +10006,7 @@ echo $ECHO_N "checking for X11 libraries +- INSTALL_STUB_LIB='$(INSTALL_LIBRARY) $(STUB_LIB_FILE) "$(LIB_INSTALL_DIR)/$(STUB_LIB_FILE)"' ++ INSTALL_STUB_LIB='$(INSTALL_DATA) $(STUB_LIB_FILE) "$(LIB_INSTALL_DIR)/$(STUB_LIB_FILE)"' + + # 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 +9854,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 @@ -106,7 +106,7 @@ $NetBSD: patch-unix_configure,v 1.9 2014/10/31 21:11:18 adam Exp $ x_libraries="$i" break fi -@@ -10011,7 +10015,7 @@ echo "${ECHO_T}$i" >&6 +@@ -9859,7 +9863,7 @@ echo "${ECHO_T}$i" >&6 if test "$x_libraries" = ""; then XLIBSW=-lX11 else @@ -115,7 +115,7 @@ $NetBSD: patch-unix_configure,v 1.9 2014/10/31 21:11:18 adam Exp $ fi fi if test "$XLIBSW" = nope ; then -@@ -10107,11 +10111,6 @@ fi +@@ -9955,11 +9959,6 @@ fi # be replaced by spaces. #-------------------------------------------------------------------- @@ -127,7 +127,7 @@ $NetBSD: patch-unix_configure,v 1.9 2014/10/31 21:11:18 adam Exp $ if test "${TCL_LD_SEARCH_FLAGS}" = '-L${LIB_RUNTIME_DIR}'; then LIB_RUNTIME_DIR=`echo ${LIB_RUNTIME_DIR} |sed -e 's/:/ -L/g'` fi -@@ -11347,14 +11346,10 @@ else +@@ -11195,14 +11194,10 @@ else TK_LIB_FLAG="-ltk`echo ${TK_VERSION} | tr -d .`" TK_BUILD_LIB_SPEC="-L\$(TOP_DIR)/win ${TK_LIB_FLAG}" else @@ -143,7 +143,7 @@ $NetBSD: patch-unix_configure,v 1.9 2014/10/31 21:11:18 adam Exp $ fi #-------------------------------------------------------------------- -@@ -11366,11 +11361,7 @@ fi +@@ -11214,11 +11209,7 @@ fi eval "TK_STUB_LIB_FILE=libtkstub${TK_UNSHARED_LIB_SUFFIX}" eval "TK_STUB_LIB_DIR=${libdir}" @@ -156,7 +156,7 @@ $NetBSD: patch-unix_configure,v 1.9 2014/10/31 21:11:18 adam Exp $ 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}" -@@ -12191,6 +12182,7 @@ s,@APP_RSRC_FILE@,$APP_RSRC_FILE,;t t +@@ -12039,6 +12030,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 |