Changes 8.5.15:

Bug-fix release.

7 files changed, 49 insertions, 94 deletions

diff --git a/x11/tk/Makefile b/x11/tk/Makefile
index 38f02d8915c..cba2da0f955 100644
--- a/x11/tk/Makefile
+++ b/x11/tk/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.75 2013/10/25 10:21:57 jperkin Exp $
+# $NetBSD: Makefile,v 1.76 2013/11/02 20:22:02 adam Exp $
 
 DISTNAME=	tk${TK_VERSION}-src
 PKGNAME=	tk-${TK_VERSION}
-PKGREVISION=	4
 CATEGORIES=	x11 lang
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=tcl/}
 
@@ -45,6 +44,7 @@ PLIST_SUBST+=		BASEVER=${TK_BASEVER}
 
 .include "../../mk/bsd.prefs.mk"
 
+PLIST_SRC=		PLIST
 .if ${OPSYS} == "Darwin" && ${X11_TYPE} == "native"
 CONFIGURE_ARGS+=	--enable-aqua
 PLIST_SRC+=		PLIST.aqua
diff --git a/x11/tk/Makefile.version b/x11/tk/Makefile.version
index e72413d6dac..f9f4dbeba35 100644
--- a/x11/tk/Makefile.version
+++ b/x11/tk/Makefile.version
@@ -1,5 +1,5 @@
-# $NetBSD: Makefile.version,v 1.11 2013/05/31 20:15:32 adam Exp $
+# $NetBSD: Makefile.version,v 1.12 2013/11/02 20:22:02 adam Exp $
 
 TK_SONUM=	85
 TK_BASEVER=	8.5
-TK_VERSION=	8.5.14
+TK_VERSION=	8.5.15
diff --git a/x11/tk/distinfo b/x11/tk/distinfo
index e8808b329f8..e230dafb1cf 100644
--- a/x11/tk/distinfo
+++ b/x11/tk/distinfo
@@ -1,9 +1,7 @@
-$NetBSD: distinfo,v 1.40 2013/05/31 20:15:32 adam Exp $
+$NetBSD: distinfo,v 1.41 2013/11/02 20:22:02 adam Exp $
 
-SHA1 (tk8.5.14-src.tar.gz) = 4d0f8775746f0c780172e1e4f1fb7d78363a4b28
-RMD160 (tk8.5.14-src.tar.gz) = 8c10ae4ff0f01c1ee955b0d9664917fc06f2e192
-Size (tk8.5.14-src.tar.gz) = 4093990 bytes
-SHA1 (patch-macosx_tkMacOSXClipboard.c) = ac5a5de7c0e4259a347fcb7449d304e6edb91343
-SHA1 (patch-macosx_tkMacOSXDraw.c) = b241b7d70436340a5b55b7568da994465f45d2f8
-SHA1 (patch-unix_Makefile.in) = 6acc76bce0ecf813abf0905da19ae0d669a2e7db
-SHA1 (patch-unix_configure) = 4e7fe48d2aba0a645bb5947e920d9615c4339b9c
+SHA1 (tk8.5.15-src.tar.gz) = 11c9e4d94719184a62b6beb19d37e3391b376619
+RMD160 (tk8.5.15-src.tar.gz) = 6f642a13389d02a0a0179a8e156376e31304466d
+Size (tk8.5.15-src.tar.gz) = 4086650 bytes
+SHA1 (patch-unix_Makefile.in) = b428cd131efd9ece3bf6a4a17c829f383f79b835
+SHA1 (patch-unix_configure) = 0bfbb99b11fb8634c5cccb739854775a088dc600
diff --git a/x11/tk/patches/patch-macosx_tkMacOSXClipboard.c b/x11/tk/patches/patch-macosx_tkMacOSXClipboard.c
deleted file mode 100644
index c5ceab5035f..00000000000
--- a/x11/tk/patches/patch-macosx_tkMacOSXClipboard.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-macosx_tkMacOSXClipboard.c,v 1.1 2012/11/24 21:38:50 adam Exp $
-
-Void function should not return any values.
-
---- macosx/tkMacOSXClipboard.c.orig	2012-11-24 20:54:23.000000000 +0000
-+++ macosx/tkMacOSXClipboard.c
-@@ -194,7 +194,7 @@ TkMacOSXSelDeadWindow(
-     if (winPtr && winPtr == (TkWindow *)clipboardOwner) {
- 	clipboardOwner = NULL;
-     }
--    return Success;
-+    return;
- }
- 
- /*
diff --git a/x11/tk/patches/patch-macosx_tkMacOSXDraw.c b/x11/tk/patches/patch-macosx_tkMacOSXDraw.c
deleted file mode 100644
index 5a3b29cdd14..00000000000
--- a/x11/tk/patches/patch-macosx_tkMacOSXDraw.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-macosx_tkMacOSXDraw.c,v 1.1 2012/11/24 21:38:50 adam Exp $
-
-Void function should not return any values.
-
---- macosx/tkMacOSXDraw.c.orig	2012-11-24 20:55:20.000000000 +0000
-+++ macosx/tkMacOSXDraw.c
-@@ -744,7 +744,7 @@ DrawCGImage(
-     } else {
- 	TkMacOSXDbgMsg("Drawing of empty CGImage requested");
-     }
--    return Success;
-+    return;
- }
- 
- /*
diff --git a/x11/tk/patches/patch-unix_Makefile.in b/x11/tk/patches/patch-unix_Makefile.in
index 839c7bcfe6a..d0c12596504 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.3 2013/05/31 20:15:32 adam Exp $
+$NetBSD: patch-unix_Makefile.in,v 1.4 2013/11/02 20:22:02 adam Exp $
 
---- unix/Makefile.in.orig	2013-04-01 18:36:49.000000000 +0000
+--- unix/Makefile.in.orig	2013-09-16 16:45:24.000000000 +0000
 +++ unix/Makefile.in
 @@ -13,6 +13,7 @@ MAJOR_VERSION		= @TK_MAJOR_VERSION@
  MINOR_VERSION		= @TK_MINOR_VERSION@
@@ -85,7 +85,7 @@ $NetBSD: patch-unix_Makefile.in,v 1.3 2013/05/31 20:15:32 adam Exp $
  	@for i in "$(LIB_INSTALL_DIR)" "$(BIN_INSTALL_DIR)" \
  	    "$(PKG_INSTALL_DIR)" "$(CONFIG_INSTALL_DIR)" ; \
  	    do \
-@@ -715,13 +729,20 @@ install-binaries: $(TK_LIB_FILE) $(TK_ST
+@@ -715,7 +729,13 @@ install-binaries: $(TK_LIB_FILE) $(TK_ST
  	    fi
  	@echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/"
  	@@INSTALL_LIB@
@@ -100,6 +100,7 @@ $NetBSD: patch-unix_Makefile.in,v 1.3 2013/05/31 20:15:32 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";\
+@@ -724,6 +744,7 @@ install-binaries: $(TK_LIB_FILE) $(TK_ST
  	fi
  	@echo "Installing ${WISH_EXE} as $(BIN_INSTALL_DIR)/wish$(VERSION)${EXE_SUFFIX}"
  	@$(INSTALL_PROGRAM) ${WISH_EXE} "$(BIN_INSTALL_DIR)/wish$(VERSION)${EXE_SUFFIX}"
@@ -107,7 +108,7 @@ $NetBSD: patch-unix_Makefile.in,v 1.3 2013/05/31 20:15:32 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 \
-@@ -826,7 +847,7 @@ install-doc:
+@@ -828,7 +849,7 @@ install-doc:
  install-headers:
  	@if test "$(@TK_WINDOWINGSYSTEM@_XLIB_HDRS)" != ""; then \
  	    XLIB_INCLUDE_INSTALL_DIR="$(INCLUDE_INSTALL_DIR)"/X11; fi; \
@@ -116,7 +117,7 @@ $NetBSD: patch-unix_Makefile.in,v 1.3 2013/05/31 20:15:32 adam Exp $
  	    do \
  	    if [ -n "$$i" -a ! -d "$$i" ] ; then \
  		echo "Making directory $$i"; \
-@@ -835,9 +856,12 @@ install-headers:
+@@ -837,9 +858,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 af7ff51504a..ac943b955f1 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.6 2013/05/31 20:15:32 adam Exp $
+$NetBSD: patch-unix_configure,v 1.7 2013/11/02 20:22:02 adam Exp $
 
---- unix/configure.orig	2013-04-01 18:36:49.000000000 +0000
+--- unix/configure.orig	2013-09-16 16:45:24.000000000 +0000
 +++ unix/configure
-@@ -4843,10 +4843,10 @@ fi
+@@ -4844,10 +4844,10 @@ fi
      # LDFLAGS_ARCH so they eventually end up in LDFLAGS even if [load]
      # is disabled by the user. [Bug 1016796]
      LDFLAGS_ARCH=""
@@ -15,25 +15,25 @@ $NetBSD: patch-unix_configure,v 1.6 2013/05/31 20:15:32 adam Exp $
      CFLAGS_DEBUG=-g
      CFLAGS_OPTIMIZE=-O
      if test "$GCC" = yes; then
-@@ -5822,7 +5822,7 @@ fi
- 	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
- 	    TCL_LIB_VERSIONS_OK=nodots
+@@ -5766,7 +5766,7 @@ fi
+ 	    CC_SEARCH_FLAGS=""
+ 	    LD_SEARCH_FLAGS=""
  	    ;;
 -	OpenBSD-*)
 +	OpenBSD-*|MirBSD-*)
  	    arch=`arch -s`
  	    case "$arch" in
- 	    m88k|vax)
-@@ -5843,7 +5843,7 @@ fi
+ 	    vax)
+@@ -5788,7 +5788,7 @@ fi
  fi
  
  		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
- 	    case "$arch" in
-@@ -5915,7 +5915,7 @@ fi
+@@ -5823,7 +5823,7 @@ fi
  	    SHLIB_SUFFIX=".so"
  	    DL_OBJS="tclLoadDl.o"
  	    DL_LIBS=""
@@ -42,34 +42,25 @@ $NetBSD: patch-unix_configure,v 1.6 2013/05/31 20:15:32 adam Exp $
  	    if test $doRpath = yes; then
  
  		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
-@@ -5930,21 +5930,15 @@ fi
- 	    	LDFLAGS="$LDFLAGS -pthread"
+@@ -5839,16 +5839,11 @@ 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
+ 	    	UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
+ 	    	SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so'
+ 	    	TCL_LIB_VERSIONS_OK=nodots
 -		;;
 -	    esac
-+	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
-+	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so'
-+	    TCL_LIB_VERSIONS_OK=nodots
  	    ;;
 -	FreeBSD-*)
 +	FreeBSD-*|DragonFly-*)
  	    # This configuration from FreeBSD Ports.
  	    SHLIB_CFLAGS="-fPIC"
  	    SHLIB_LD="${CC} -shared"
--	    TCL_SHLIB_LD_EXTRAS="-soname \$@"
-+	    TCL_SHLIB_LD_EXTRAS="-Wl,-soname \$@"
- 	    SHLIB_SUFFIX=".so"
- 	    DL_OBJS="tclLoadDl.o"
- 	    DL_LIBS=""
-@@ -5966,7 +5960,7 @@ fi
+@@ -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'
@@ -78,7 +69,7 @@ $NetBSD: patch-unix_configure,v 1.6 2013/05/31 20:15:32 adam Exp $
  	    TCL_LIB_VERSIONS_OK=nodots
  	    ;;
  	Darwin-*)
-@@ -7144,7 +7138,7 @@ fi
+@@ -7052,7 +7047,7 @@ fi
  	    BSD/OS*) ;;
  	    CYGWIN_*|MINGW32_*) ;;
  	    IRIX*) ;;
@@ -87,7 +78,7 @@ $NetBSD: patch-unix_configure,v 1.6 2013/05/31 20:15:32 adam Exp $
  	    Darwin-*) ;;
  	    SCO_SV-3.2*) ;;
  	    *) SHLIB_CFLAGS="-fPIC" ;;
-@@ -7154,12 +7148,12 @@ fi
+@@ -7062,12 +7057,12 @@ fi
  
      if test "$SHARED_LIB_SUFFIX" = ""; then
  
@@ -102,7 +93,7 @@ $NetBSD: patch-unix_configure,v 1.6 2013/05/31 20:15:32 adam Exp $
  fi
  
      DLL_INSTALL_DIR="\$(LIB_INSTALL_DIR)"
-@@ -7175,7 +7169,11 @@ fi
+@@ -7083,7 +7078,11 @@ fi
  
  else
  
@@ -115,7 +106,7 @@ $NetBSD: patch-unix_configure,v 1.6 2013/05/31 20:15:32 adam Exp $
  
  fi
  
-@@ -7209,7 +7207,7 @@ fi
+@@ -7117,7 +7116,7 @@ fi
  else
  
          MAKE_STUB_LIB='${STLIB_LD} $@ ${STUB_LIB_OBJS} ; ${RANLIB} $@'
@@ -124,7 +115,7 @@ $NetBSD: patch-unix_configure,v 1.6 2013/05/31 20:15:32 adam Exp $
  
  fi
  
-@@ -10343,7 +10341,7 @@ echo $ECHO_N "checking for X11 libraries
+@@ -10252,7 +10251,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
@@ -133,7 +124,7 @@ $NetBSD: patch-unix_configure,v 1.6 2013/05/31 20:15:32 adam Exp $
  		x_libraries="$i"
  		break
  	    fi
-@@ -10352,7 +10350,7 @@ echo "${ECHO_T}$i" >&6
+@@ -10261,7 +10260,7 @@ echo "${ECHO_T}$i" >&6
  	if test "$x_libraries" = ""; then
  	    XLIBSW=-lX11
  	else
@@ -142,28 +133,23 @@ $NetBSD: patch-unix_configure,v 1.6 2013/05/31 20:15:32 adam Exp $
  	fi
      fi
      if test "$XLIBSW" = nope ; then
-@@ -11531,18 +11529,14 @@ else
-     fi
-     # libdir must be a fully qualified path and not ${exec_prefix}/lib
-     eval libdir="$libdir"
--    if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
--        TK_LIB_FLAG="-ltk${TK_VERSION}"
--    else
--        TK_LIB_FLAG="-ltk`echo ${TK_VERSION} | tr -d .`"
--    fi
-+    TK_LIB_FLAG="-ltk`echo ${TK_VERSION} | tr -d .`"
-     TK_BUILD_LIB_SPEC="-L`pwd | sed -e 's/ /\\\\ /g'` ${TK_LIB_FLAG}"
-     if test "${ac_cv_cygwin}" = "yes" -a "$SHARED_BUILD" = "1"; then
- 	WISH_BUILD_LIB_SPEC="-L\$(TOP_DIR)/win -ltk${TK_MAJOR_VERSION}${TK_MINOR_VERSION} \${TCL_LIB_SPEC}"
+@@ -11446,14 +11445,10 @@ else
+ 	TK_LIB_FLAG="-ltk`echo ${TK_VERSION} | tr -d .`"
+ 	TK_BUILD_LIB_SPEC="-L\$(TOP_DIR)/win ${TK_LIB_FLAG}"
      else
- 	WISH_BUILD_LIB_SPEC="-L`pwd | sed -e 's/ /\\\\ /g'` ${TK_LIB_FLAG} \${WISH_LIBS}"
+-	if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
+-	    TK_LIB_FLAG="-ltk${TK_VERSION}"
+-	else
+ 	    TK_LIB_FLAG="-ltk`echo ${TK_VERSION} | tr -d .`"
+-	fi
+ 	TK_BUILD_LIB_SPEC="-L`pwd | sed -e 's/ /\\\\ /g'` ${TK_LIB_FLAG}"
      fi
 -    TK_LIB_SPEC="-L${libdir} ${TK_LIB_FLAG}"
 +    TK_LIB_SPEC="-L${libdir} ${COMPILER_RPATH_FLAG}${libdir} ${TK_LIB_FLAG}"
  fi
  
  #--------------------------------------------------------------------
-@@ -11554,11 +11548,7 @@ fi
+@@ -11465,11 +11460,7 @@ fi
  eval "TK_STUB_LIB_FILE=libtkstub${TK_UNSHARED_LIB_SUFFIX}"
  eval "TK_STUB_LIB_DIR=${libdir}"
  
@@ -176,7 +162,7 @@ $NetBSD: patch-unix_configure,v 1.6 2013/05/31 20:15:32 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}"
-@@ -12378,6 +12368,7 @@ s,@APP_RSRC_FILE@,$APP_RSRC_FILE,;t t
+@@ -12290,6 +12281,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