pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/x11/tk85



Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Nov 28 16:11:37 UTC 2016

Modified Files:
        pkgsrc/x11/tk85: Makefile Makefile.version PLIST distinfo
        pkgsrc/x11/tk85/patches: patch-unix_Makefile.in patch-unix_configure

Log Message:
Updated tk to 8.5.19.

8.5.19

Changes to Tk

Commands

Expanded Syntax / New Options

panedwindow -proxybackground color -proxyborderwidth size -proxyrelief value
    TIP 437

8.5.18

Changed Tk behavior

    Debut of Tk Cocoa 2.0 .
    New binding substitution %M [TIP #433]

8.5.17

Changed Tk behavior

    Several improvements in Cocoa Tk.
    Event handling changes for browser plugins.

8.5.16

Changed Tk behavior

    Improved Retina display support
    Full PPM file write support with max 65535


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/x11/tk85/Makefile pkgsrc/x11/tk85/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/x11/tk85/Makefile.version \
    pkgsrc/x11/tk85/PLIST
cvs rdiff -u -r1.1 -r1.2 pkgsrc/x11/tk85/patches/patch-unix_Makefile.in \
    pkgsrc/x11/tk85/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/x11/tk85/Makefile
diff -u pkgsrc/x11/tk85/Makefile:1.2 pkgsrc/x11/tk85/Makefile:1.3
--- pkgsrc/x11/tk85/Makefile:1.2        Thu Oct  9 14:07:16 2014
+++ pkgsrc/x11/tk85/Makefile    Mon Nov 28 16:11:37 2016
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2014/10/09 14:07:16 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2016/11/28 16:11:37 wiz Exp $
 
 DISTNAME=      tk${TK_VERSION}-src
 PKGNAME=       tk-${TK_VERSION}
-PKGREVISION=   1
 CATEGORIES=    x11 lang
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=tcl/}
 
Index: pkgsrc/x11/tk85/distinfo
diff -u pkgsrc/x11/tk85/distinfo:1.2 pkgsrc/x11/tk85/distinfo:1.3
--- pkgsrc/x11/tk85/distinfo:1.2        Wed Nov  4 03:28:55 2015
+++ pkgsrc/x11/tk85/distinfo    Mon Nov 28 16:11:37 2016
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.2 2015/11/04 03:28:55 agc Exp $
+$NetBSD: distinfo,v 1.3 2016/11/28 16:11:37 wiz Exp $
 
-SHA1 (tk8.5.15-src.tar.gz) = 11c9e4d94719184a62b6beb19d37e3391b376619
-RMD160 (tk8.5.15-src.tar.gz) = 6f642a13389d02a0a0179a8e156376e31304466d
-SHA512 (tk8.5.15-src.tar.gz) = 9c8c42135b918f551e3e5ce479f2c8583749d34db5985a21e583c8f0aa2637eaa4ae0f47ce7b395f72ec929edd758c53326c96a23dac5f70a6f86eb63584dca5
-Size (tk8.5.15-src.tar.gz) = 4086650 bytes
-SHA1 (patch-unix_Makefile.in) = bd42e944583ae084b61ff54884c255c9236f7c8b
-SHA1 (patch-unix_configure) = 8d1f5809cd669438dafad064f95c810242452965
+SHA1 (tk8.5.19-src.tar.gz) = ca828226ffa10f9650a5de7c4624cb6d3591b392
+RMD160 (tk8.5.19-src.tar.gz) = 9893ed1a070135e84b7a6f646ecd46e4be3ab241
+SHA512 (tk8.5.19-src.tar.gz) = cf01338ed0189624faf6d71b503d8593365d59853c8588fc15fae1c22027cf8a4d9b77b47f10bf2719cd4ba7dad2c98f2966dc4ec674cd04975af4aeea0718b1
+Size (tk8.5.19-src.tar.gz) = 4116241 bytes
+SHA1 (patch-unix_Makefile.in) = 43607e69154800cafd0398b3d0e7494a6634acfa
+SHA1 (patch-unix_configure) = 9f21c8395d28009c1f8d9b8bc4b3ce5411a47e44

Index: pkgsrc/x11/tk85/Makefile.version
diff -u pkgsrc/x11/tk85/Makefile.version:1.1 pkgsrc/x11/tk85/Makefile.version:1.2
--- pkgsrc/x11/tk85/Makefile.version:1.1        Mon Mar 10 14:22:01 2014
+++ pkgsrc/x11/tk85/Makefile.version    Mon Nov 28 16:11:37 2016
@@ -1,5 +1,5 @@
-# $NetBSD: Makefile.version,v 1.1 2014/03/10 14:22:01 taca Exp $
+# $NetBSD: Makefile.version,v 1.2 2016/11/28 16:11:37 wiz Exp $
 
 TK_SONUM=      85
 TK_BASEVER=    8.5
-TK_VERSION=    8.5.15
+TK_VERSION=    8.5.19
Index: pkgsrc/x11/tk85/PLIST
diff -u pkgsrc/x11/tk85/PLIST:1.1 pkgsrc/x11/tk85/PLIST:1.2
--- pkgsrc/x11/tk85/PLIST:1.1   Mon Mar 10 14:22:01 2014
+++ pkgsrc/x11/tk85/PLIST       Mon Nov 28 16:11:37 2016
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2014/03/10 14:22:01 taca Exp $
+@comment $NetBSD: PLIST,v 1.2 2016/11/28 16:11:37 wiz Exp $
 bin/wish
 bin/wish${BASEVER}
 include/tk.h
@@ -39,6 +39,7 @@ lib/libtk${SONUM}.a
 lib/libtk${SONUM}.so
 lib/libtk${SONUM}.so.1.0
 lib/libtkstub${SONUM}.a
+lib/pkgconfig/tk.pc
 lib/tk${BASEVER}/bgerror.tcl
 lib/tk${BASEVER}/button.tcl
 lib/tk${BASEVER}/choosedir.tcl
@@ -529,6 +530,7 @@ man/mann/send.n
 man/mann/spinbox.n
 man/mann/text.n
 man/mann/tk.n
+man/mann/tk::mac.n
 man/mann/tk_bindForTraversal.n
 man/mann/tk_bisque.n
 man/mann/tk_chooseColor.n

Index: pkgsrc/x11/tk85/patches/patch-unix_Makefile.in
diff -u pkgsrc/x11/tk85/patches/patch-unix_Makefile.in:1.1 pkgsrc/x11/tk85/patches/patch-unix_Makefile.in:1.2
--- pkgsrc/x11/tk85/patches/patch-unix_Makefile.in:1.1  Mon Mar 10 14:22:01 2014
+++ pkgsrc/x11/tk85/patches/patch-unix_Makefile.in      Mon Nov 28 16:11:37 2016
@@ -1,8 +1,8 @@
-$NetBSD: patch-unix_Makefile.in,v 1.1 2014/03/10 14:22:01 taca Exp $
+$NetBSD: patch-unix_Makefile.in,v 1.2 2016/11/28 16:11:37 wiz Exp $
 
 Shared library handling on pkgsrc.
 
---- unix/Makefile.in.orig      2013-09-16 16:45:24.000000000 +0000
+--- unix/Makefile.in.orig      2016-02-09 15:50:02.000000000 +0000
 +++ unix/Makefile.in
 @@ -13,6 +13,7 @@ MAJOR_VERSION                = @TK_MAJOR_VERSION@
  MINOR_VERSION         = @TK_MINOR_VERSION@
@@ -66,7 +66,7 @@ Shared library handling on pkgsrc.
  SHELL_ENV = \
        @LD_LIBRARY_PATH_VAR@="`pwd`:${TCL_BIN_DIR}:$${@LD_LIBRARY_PATH_VAR@}"; \
        export @LD_LIBRARY_PATH_VAR@; \
-@@ -568,6 +577,11 @@ ${LIB_FILE}: ${OBJS} ${STUB_LIB_FILE} @L
+@@ -568,6 +577,11 @@ ${LIB_FILE}: ${STUB_LIB_FILE} @LIB_RSRC_
        rm -f $@
        @MAKE_LIB@
  
@@ -76,18 +76,18 @@ Shared library handling on pkgsrc.
 +      $(RANLIB) $@
 +
  ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
-       rm -f $@
-       @MAKE_STUB_LIB@
+       @if test "x${LIB_FILE}" = "xlibtk${MAJOR_VERSION}.${MINOR_VERSION}.dll"; then \
+           (cd ${TOP_DIR}/win; ${MAKE} tk${MAJOR_VERSION}${MINOR_VERSION}.dll); \
 @@ -685,7 +699,7 @@ install-strip:
  # some ranlibs write to current directory, and this might not always be
  # possible (e.g. if installing as root).
  
--install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) ${WISH_EXE}
-+install-binaries: $(TK_LIB_FILE) $(TK_LIB_A_FILE) $(TK_STUB_LIB_FILE) ${WISH_EXE} ${TK_LIB_A_FILE}
+-install-binaries: $(TK_STUB_LIB_FILE) $(TK_LIB_FILE) ${WISH_EXE}
++install-binaries: $(TK_STUB_LIB_FILE) $(TK_LIB_A_FILE) $(TK_LIB_FILE) ${WISH_EXE}
        @for i in "$(LIB_INSTALL_DIR)" "$(BIN_INSTALL_DIR)" \
            "$(PKG_INSTALL_DIR)" "$(CONFIG_INSTALL_DIR)" ; \
            do \
-@@ -715,7 +729,13 @@ install-binaries: $(TK_LIB_FILE) $(TK_ST
+@@ -715,7 +729,13 @@ install-binaries: $(TK_STUB_LIB_FILE) $(
            fi
        @echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/"
        @@INSTALL_LIB@
@@ -102,7 +102,7 @@ Shared library handling on pkgsrc.
        @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";\
-@@ -724,6 +744,7 @@ install-binaries: $(TK_LIB_FILE) $(TK_ST
+@@ -724,6 +744,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}"
@@ -110,7 +110,7 @@ Shared library handling on pkgsrc.
        @echo "Installing tkConfig.sh to $(CONFIG_INSTALL_DIR)/"
        @$(INSTALL_DATA) tkConfig.sh "$(CONFIG_INSTALL_DIR)/tkConfig.sh"
        @if test "$(STUB_LIB_FILE)" != "" ; then \
-@@ -828,7 +849,7 @@ install-doc:
+@@ -831,7 +852,7 @@ install-doc:
  install-headers:
        @if test "$(@TK_WINDOWINGSYSTEM@_XLIB_HDRS)" != ""; then \
            XLIB_INCLUDE_INSTALL_DIR="$(INCLUDE_INSTALL_DIR)"/X11; fi; \
@@ -119,7 +119,7 @@ Shared library handling on pkgsrc.
            do \
            if [ -n "$$i" -a ! -d "$$i" ] ; then \
                echo "Making directory $$i"; \
-@@ -837,9 +858,12 @@ install-headers:
+@@ -840,9 +861,12 @@ install-headers:
                fi; \
            done;
        @echo "Installing header files to $(INCLUDE_INSTALL_DIR)/";
Index: pkgsrc/x11/tk85/patches/patch-unix_configure
diff -u pkgsrc/x11/tk85/patches/patch-unix_configure:1.1 pkgsrc/x11/tk85/patches/patch-unix_configure:1.2
--- pkgsrc/x11/tk85/patches/patch-unix_configure:1.1    Mon Mar 10 14:22:01 2014
+++ pkgsrc/x11/tk85/patches/patch-unix_configure        Mon Nov 28 16:11:37 2016
@@ -1,8 +1,8 @@
-$NetBSD: patch-unix_configure,v 1.1 2014/03/10 14:22:01 taca Exp $
+$NetBSD: patch-unix_configure,v 1.2 2016/11/28 16:11:37 wiz Exp $
 
 Shared library handling on pkgsrc and add support for OpenBSD and MirBSD.
 
---- unix/configure.orig        2013-09-16 16:45:24.000000000 +0000
+--- unix/configure.orig        2016-02-09 15:50:02.000000000 +0000
 +++ unix/configure
 @@ -4844,10 +4844,10 @@ fi
      # LDFLAGS_ARCH so they eventually end up in LDFLAGS even if [load]
@@ -17,7 +17,7 @@ Shared library handling on pkgsrc and ad
      CFLAGS_DEBUG=-g
      CFLAGS_OPTIMIZE=-O
      if test "$GCC" = yes; then
-@@ -5766,7 +5766,7 @@ fi
+@@ -5771,7 +5771,7 @@ fi
            CC_SEARCH_FLAGS=""
            LD_SEARCH_FLAGS=""
            ;;
@@ -26,7 +26,7 @@ Shared library handling on pkgsrc and ad
            arch=`arch -s`
            case "$arch" in
            vax)
-@@ -5788,7 +5788,7 @@ fi
+@@ -5800,7 +5800,7 @@ fi
  fi
  
                LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
@@ -35,7 +35,7 @@ Shared library handling on pkgsrc and ad
                LDFLAGS="-Wl,-export-dynamic"
                ;;
            esac
-@@ -5823,7 +5823,7 @@ fi
+@@ -5835,7 +5835,7 @@ fi
            SHLIB_SUFFIX=".so"
            DL_OBJS="tclLoadDl.o"
            DL_LIBS=""
@@ -44,34 +44,16 @@ Shared library handling on pkgsrc and ad
            if test $doRpath = yes; then
  
                CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
-@@ -5839,16 +5839,11 @@ fi
- 
+@@ -5852,7 +5852,7 @@ fi
  fi
  
--          case $system in
--          FreeBSD-3.*)
--              # FreeBSD-3 doesn't handle version numbers with dots.
-               UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
-               SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so'
-               TCL_LIB_VERSIONS_OK=nodots
--              ;;
--          esac
            ;;
 -      FreeBSD-*)
 +      FreeBSD-*|DragonFly-*)
            # This configuration from FreeBSD Ports.
            SHLIB_CFLAGS="-fPIC"
            SHLIB_LD="${CC} -shared"
-@@ -5874,7 +5869,7 @@ fi
-           # Version numbers are dot-stripped by system policy.
-           TCL_TRIM_DOTS=`echo ${VERSION} | tr -d .`
-           UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
--          SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1'
-+          SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so'
-           TCL_LIB_VERSIONS_OK=nodots
-           ;;
-       Darwin-*)
-@@ -7052,7 +7047,7 @@ fi
+@@ -7060,7 +7060,7 @@ fi
            BSD/OS*) ;;
            CYGWIN_*|MINGW32_*) ;;
            IRIX*) ;;
@@ -80,7 +62,7 @@ Shared library handling on pkgsrc and ad
            Darwin-*) ;;
            SCO_SV-3.2*) ;;
            *) SHLIB_CFLAGS="-fPIC" ;;
-@@ -7062,12 +7057,12 @@ fi
+@@ -7070,12 +7070,12 @@ fi
  
      if test "$SHARED_LIB_SUFFIX" = ""; then
  
@@ -95,7 +77,7 @@ Shared library handling on pkgsrc and ad
  fi
  
      DLL_INSTALL_DIR="\$(LIB_INSTALL_DIR)"
-@@ -7083,7 +7078,11 @@ fi
+@@ -7091,7 +7091,11 @@ fi
  
  else
  
@@ -108,7 +90,7 @@ Shared library handling on pkgsrc and ad
  
  fi
  
-@@ -7117,7 +7116,7 @@ fi
+@@ -7125,7 +7129,7 @@ fi
  else
  
          MAKE_STUB_LIB='${STLIB_LD} $@ ${STUB_LIB_OBJS} ; ${RANLIB} $@'
@@ -117,7 +99,7 @@ Shared library handling on pkgsrc and ad
  
  fi
  
-@@ -10252,7 +10251,7 @@ echo $ECHO_N "checking for X11 libraries
+@@ -10260,7 +10264,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
@@ -126,7 +108,7 @@ Shared library handling on pkgsrc and ad
                x_libraries="$i"
                break
            fi
-@@ -10261,7 +10260,7 @@ echo "${ECHO_T}$i" >&6
+@@ -10269,7 +10273,7 @@ echo "${ECHO_T}$i" >&6
        if test "$x_libraries" = ""; then
            XLIBSW=-lX11
        else
@@ -135,7 +117,7 @@ Shared library handling on pkgsrc and ad
        fi
      fi
      if test "$XLIBSW" = nope ; then
-@@ -11446,14 +11445,10 @@ else
+@@ -11532,14 +11536,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 +133,7 @@ Shared library handling on pkgsrc and ad
  fi
  
  #--------------------------------------------------------------------
-@@ -11465,11 +11460,7 @@ fi
+@@ -11551,11 +11551,7 @@ fi
  eval "TK_STUB_LIB_FILE=libtkstub${TK_UNSHARED_LIB_SUFFIX}"
  eval "TK_STUB_LIB_DIR=${libdir}"
  
@@ -164,7 +146,7 @@ Shared library handling on pkgsrc and ad
  
  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}"
-@@ -12290,6 +12281,7 @@ s,@APP_RSRC_FILE@,$APP_RSRC_FILE,;t t
+@@ -12376,6 +12372,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



Home | Main Index | Thread Index | Old Index