Changes 8.6.2:

This is a bug-fix release.

9 files changed, 92 insertions, 68 deletions

diff --git a/x11/tk/Makefile b/x11/tk/Makefile
index 126c9a86cb7..b48583d887d 100644
--- a/x11/tk/Makefile
+++ b/x11/tk/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.81 2014/10/09 14:07:15 wiz Exp $
+# $NetBSD: Makefile,v 1.82 2014/10/31 21:11:18 adam Exp $
 
 DISTNAME=	tk${TK_VERSION}-src
 PKGNAME=	tk-${TK_VERSION}
-PKGREVISION=	2
 CATEGORIES=	x11 lang
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=tcl/}
 
@@ -46,7 +45,5 @@ PLIST_SUBST+=		SONUM=${TK_SONUM}
 PLIST_SUBST+=		BASEVER=${TK_BASEVER}
 
 .include "../../lang/tcl/buildlink3.mk"
-.include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/libXext/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/tk/Makefile.version b/x11/tk/Makefile.version
index 4be6e42766d..ef512faaccd 100644
--- a/x11/tk/Makefile.version
+++ b/x11/tk/Makefile.version
@@ -1,5 +1,10 @@
-# $NetBSD: Makefile.version,v 1.13 2014/01/11 14:41:05 adam Exp $
+# $NetBSD: Makefile.version,v 1.14 2014/10/31 21:11:18 adam Exp $
+# used by cad/xcircuit/Makefile
+# used by devel/tcl-tclcl/Makefile
+# used by lang/tcl/Makefile
+# used by lang/tcl-otcl/Makefile
+# used by x11/tk/Makefile
 
 TK_SONUM=	86
 TK_BASEVER=	8.6
-TK_VERSION=	8.6.1
+TK_VERSION=	8.6.2
diff --git a/x11/tk/PLIST b/x11/tk/PLIST
index f5070d80e36..04bf0f88679 100644
--- a/x11/tk/PLIST
+++ b/x11/tk/PLIST
@@ -1,6 +1,15 @@
-@comment $NetBSD: PLIST,v 1.13 2014/01/11 14:41:05 adam Exp $
+@comment $NetBSD: PLIST,v 1.14 2014/10/31 21:11:18 adam Exp $
 bin/wish
 bin/wish${BASEVER}
+${PLIST.aqua}include/X11/X.h
+${PLIST.aqua}include/X11/Xatom.h
+${PLIST.aqua}include/X11/Xfuncproto.h
+${PLIST.aqua}include/X11/Xlib.h
+${PLIST.aqua}include/X11/Xutil.h
+${PLIST.aqua}include/X11/cursorfont.h
+${PLIST.aqua}include/X11/keysym.h
+${PLIST.aqua}include/X11/keysymdef.h
+${PLIST.aqua}include/X11/xbytes.h
 include/tk.h
 include/tk/generic/default.h
 include/tk/generic/ks_names.h
@@ -37,6 +46,8 @@ include/tkIntDecls.h
 include/tkIntPlatDecls.h
 include/tkIntXlibDecls.h
 include/tkPlatDecls.h
+${PLIST.aqua}lib/Tk.icns
+${PLIST.aqua}lib/Tk.tiff
 lib/libtk${SONUM}.a
 lib/libtk${SONUM}.so
 lib/libtk${SONUM}.so.1.0
diff --git a/x11/tk/distinfo b/x11/tk/distinfo
index 8c85078ed13..5e4743096b0 100644
--- a/x11/tk/distinfo
+++ b/x11/tk/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.42 2014/01/11 14:41:05 adam Exp $
+$NetBSD: distinfo,v 1.43 2014/10/31 21:11:18 adam Exp $
 
-SHA1 (tk8.6.1-src.tar.gz) = ecfcc20833c04d6890b14a7920a04d16f2123a51
-RMD160 (tk8.6.1-src.tar.gz) = 9176fd2c5e7d36c84141333939e85614d3ba2e11
-Size (tk8.6.1-src.tar.gz) = 4244010 bytes
-SHA1 (patch-macosx_tkMacOSXDraw.c) = 3b45060592b5805b57dcd55234dcd9eaca22c3e0
-SHA1 (patch-unix_Makefile.in) = d4309930f0c62f4712098586d1b763ffea8abbc5
-SHA1 (patch-unix_configure) = 1cc4f07dba9ab1052aa0604fb5e45892de86888e
+SHA1 (tk8.6.2-src.tar.gz) = 138920fb55933a715f0b0ace576120734f771b80
+RMD160 (tk8.6.2-src.tar.gz) = c9d4f9eee66249e3a140b7af586f0d14a1e4d2dd
+Size (tk8.6.2-src.tar.gz) = 4246617 bytes
+SHA1 (patch-macosx_tkMacOSXInit.c) = 255322526a96a9e6cc25e91db9b1754ee6fedbb4
+SHA1 (patch-unix_Makefile.in) = 553800ef42c328618980962c6b78d478ab4d2e2b
+SHA1 (patch-unix_configure) = 97139ed28a2cb8528da5c53cfcbc8f8fb43670f6
diff --git a/x11/tk/options.mk b/x11/tk/options.mk
index f9d011319b0..8a9b97c213f 100644
--- a/x11/tk/options.mk
+++ b/x11/tk/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2013/05/31 20:15:32 adam Exp $
+# $NetBSD: options.mk,v 1.4 2014/10/31 21:11:18 adam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.tk
 PKG_SUPPORTED_OPTIONS=	threads debug xft2
@@ -6,12 +6,26 @@ PKG_SUGGESTED_OPTIONS=	threads
 
 .include "../../mk/bsd.prefs.mk"
 
+PLIST_VARS+=	aqua
+
 .if ${OPSYS} != "Darwin"
 PKG_SUGGESTED_OPTIONS+=	xft2
+.else
+PKG_SUPPORTED_OPTIONS+=	aqua
 .endif
 
 .include "../../mk/bsd.options.mk"
 
+# IMPORTANT: This option should be enabled on a system without X11.
+# Otherwise some X11 headers are installed and will break X11 compatibility.
+.if !empty(PKG_OPTIONS:Maqua)
+CONFIGURE_ARGS+=	--enable-aqua
+PLIST.aqua=		yes
+.else
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
+.endif
+
 .if !empty(PKG_OPTIONS:Mdebug)
 CONFIGURE_ARGS+=	--enable-symbols
 .endif
diff --git a/x11/tk/patches/patch-macosx_tkMacOSXDraw.c b/x11/tk/patches/patch-macosx_tkMacOSXDraw.c
deleted file mode 100644
index e36d6b41b79..00000000000
--- a/x11/tk/patches/patch-macosx_tkMacOSXDraw.c
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-macosx_tkMacOSXDraw.c,v 1.3 2014/01/11 14:41:06 adam Exp $
-
-Fix OS X screen refresh problem.
-
---- macosx/tkMacOSXDraw.c.orig	2014-01-11 12:56:24.000000000 +0000
-+++ macosx/tkMacOSXDraw.c
-@@ -1690,6 +1690,7 @@ TkMacOSXRestoreDrawingContext(
- {
-     if (dcPtr->context) {
- 	CGContextSynchronize(dcPtr->context);
-+	[[dcPtr->view window] setViewsNeedDisplay:YES];
- 	[[dcPtr->view window] enableFlushWindow];
- 	if (dcPtr->focusLocked) {
- 	    [dcPtr->view unlockFocus];
diff --git a/x11/tk/patches/patch-macosx_tkMacOSXInit.c b/x11/tk/patches/patch-macosx_tkMacOSXInit.c
new file mode 100644
index 00000000000..ab0822b81ee
--- /dev/null
+++ b/x11/tk/patches/patch-macosx_tkMacOSXInit.c
@@ -0,0 +1,20 @@
+$NetBSD: patch-macosx_tkMacOSXInit.c,v 1.1 2014/10/31 21:11:18 adam Exp $
+
+Fix for Mac crash on Yosemite because of changes in version checking,
+see Tk Source Code Check-in [e49c25c711].
+
+--- macosx/tkMacOSXInit.c.orig	2014-10-31 20:34:20.000000000 +0000
++++ macosx/tkMacOSXInit.c
+@@ -236,7 +236,11 @@ TkpInit(
+ 	if (!uname(&name)) {
+ 	    tkMacOSXMacOSXVersion = (strtod(name.release, NULL) + 96) * 10;
+ 	}
+-	if (tkMacOSXMacOSXVersion &&
++	/*Check for new versioning scheme on Yosemite (10.10) and later.*/
++	if (MAC_OS_X_VERSION_MIN_REQUIRED > 100000) {
++		tkMacOSXMacOSXVersion = MAC_OS_X_VERSION_MIN_REQUIRED/100;
++	}
++	if (tkMacOSXMacOSXVersion && MAC_OS_X_VERSION_MIN_REQUIRED < 100000 &&
+ 		tkMacOSXMacOSXVersion/10 < MAC_OS_X_VERSION_MIN_REQUIRED/10) {
+ 	    Tcl_Panic("Mac OS X 10.%d or later required !",
+ 		    (MAC_OS_X_VERSION_MIN_REQUIRED/10)-100);
diff --git a/x11/tk/patches/patch-unix_Makefile.in b/x11/tk/patches/patch-unix_Makefile.in
index 65ff27afcb5..26ad28015ea 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.5 2014/01/11 14:41:06 adam Exp $
+$NetBSD: patch-unix_Makefile.in,v 1.6 2014/10/31 21:11:18 adam Exp $
 
---- unix/Makefile.in.orig	2013-09-17 12:25:13.000000000 +0000
+--- unix/Makefile.in.orig	2014-08-27 16:23:13.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.5 2014/01/11 14:41:06 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 +568,9 @@ PRIVATE_HDRS = $(GENERIC_DIR)/tkInt.h $(
+@@ -562,6 +567,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.5 2014/01/11 14:41:06 adam Exp $
  SHELL_ENV = \
  	@LD_LIBRARY_PATH_VAR@="`pwd`:${TCL_BIN_DIR}:$${@LD_LIBRARY_PATH_VAR@}"; \
  	export @LD_LIBRARY_PATH_VAR@; \
-@@ -585,6 +594,11 @@ ${LIB_FILE}: ${OBJS} ${STUB_LIB_FILE} @L
+@@ -585,6 +593,11 @@ ${LIB_FILE}: ${STUB_LIB_FILE} @LIB_RSRC_
  	rm -f $@
  	@MAKE_LIB@
  
@@ -74,18 +74,18 @@ $NetBSD: patch-unix_Makefile.in,v 1.5 2014/01/11 14:41:06 adam Exp $
 +	$(RANLIB) $@
 +
  ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
- 	rm -f $@
- 	@MAKE_STUB_LIB@
-@@ -713,7 +727,7 @@ install-strip:
+ 	@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).
  
--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_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 +757,13 @@ install-binaries: $(TK_LIB_FILE) $(TK_ST
+@@ -743,7 +756,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.5 2014/01/11 14:41:06 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 +772,7 @@ install-binaries: $(TK_LIB_FILE) $(TK_ST
+@@ -752,6 +771,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.5 2014/01/11 14:41:06 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 +880,7 @@ install-doc:
+@@ -859,7 +879,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.5 2014/01/11 14:41:06 adam Exp $
  	    do \
  	    if [ -n "$$i" -a ! -d "$$i" ] ; then \
  		echo "Making directory $$i"; \
-@@ -868,9 +889,12 @@ install-headers:
+@@ -868,9 +888,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 ce7cea0bf75..a3b3a786026 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.8 2014/01/11 14:41:06 adam Exp $
+$NetBSD: patch-unix_configure,v 1.9 2014/10/31 21:11:18 adam Exp $
 
---- unix/configure.orig	2013-09-17 12:25:13.000000000 +0000
+--- unix/configure.orig	2014-08-27 16:23:13.000000000 +0000
 +++ unix/configure
-@@ -4617,10 +4617,10 @@ fi
+@@ -4543,10 +4543,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.8 2014/01/11 14:41:06 adam Exp $
      CFLAGS_DEBUG=-g
      if test "$GCC" = yes; then
  
-@@ -5576,7 +5576,7 @@ fi
+@@ -5508,7 +5508,7 @@ fi
  	    CC_SEARCH_FLAGS=""
  	    LD_SEARCH_FLAGS=""
  	    ;;
@@ -24,7 +24,7 @@ $NetBSD: patch-unix_configure,v 1.8 2014/01/11 14:41:06 adam Exp $
  	    arch=`arch -s`
  	    case "$arch" in
  	    vax)
-@@ -5598,7 +5598,7 @@ fi
+@@ -5530,7 +5530,7 @@ fi
  fi
  
  		LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
@@ -33,7 +33,7 @@ $NetBSD: patch-unix_configure,v 1.8 2014/01/11 14:41:06 adam Exp $
  		LDFLAGS="-Wl,-export-dynamic"
  		;;
  	    esac
-@@ -5633,7 +5633,7 @@ fi
+@@ -5565,7 +5565,7 @@ fi
  	    SHLIB_SUFFIX=".so"
  	    DL_OBJS="tclLoadDl.o"
  	    DL_LIBS=""
@@ -42,7 +42,7 @@ $NetBSD: patch-unix_configure,v 1.8 2014/01/11 14:41:06 adam Exp $
  	    if test $doRpath = yes; then
  
  		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
-@@ -5650,7 +5650,7 @@ fi
+@@ -5582,7 +5582,7 @@ fi
  fi
  
  	    ;;
@@ -51,16 +51,7 @@ $NetBSD: patch-unix_configure,v 1.8 2014/01/11 14:41:06 adam Exp $
  	    # This configuration from FreeBSD Ports.
  	    SHLIB_CFLAGS="-fPIC"
  	    SHLIB_LD="${CC} -shared"
-@@ -5676,7 +5676,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-*)
-@@ -6855,7 +6855,7 @@ fi
+@@ -6791,7 +6791,7 @@ fi
  	    BSD/OS*) ;;
  	    CYGWIN_*|MINGW32_*) ;;
  	    IRIX*) ;;
@@ -69,7 +60,7 @@ $NetBSD: patch-unix_configure,v 1.8 2014/01/11 14:41:06 adam Exp $
  	    Darwin-*) ;;
  	    SCO_SV-3.2*) ;;
  	    *) SHLIB_CFLAGS="-fPIC" ;;
-@@ -6876,12 +6876,12 @@ fi
+@@ -6812,12 +6812,12 @@ fi
  
      if test "$SHARED_LIB_SUFFIX" = ""; then
  
@@ -84,7 +75,7 @@ $NetBSD: patch-unix_configure,v 1.8 2014/01/11 14:41:06 adam Exp $
  fi
  
      DLL_INSTALL_DIR="\$(LIB_INSTALL_DIR)"
-@@ -6897,7 +6897,11 @@ fi
+@@ -6833,7 +6833,11 @@ fi
  
  else
  
@@ -97,7 +88,7 @@ $NetBSD: patch-unix_configure,v 1.8 2014/01/11 14:41:06 adam Exp $
  
  fi
  
-@@ -6931,7 +6935,7 @@ fi
+@@ -6867,7 +6871,7 @@ fi
  else
  
          MAKE_STUB_LIB='${STLIB_LD} $@ ${STUB_LIB_OBJS} ; ${RANLIB} $@'
@@ -106,7 +97,7 @@ $NetBSD: patch-unix_configure,v 1.8 2014/01/11 14:41:06 adam Exp $
  
  fi
  
-@@ -10066,7 +10070,7 @@ echo $ECHO_N "checking for X11 libraries
+@@ -10002,7 +10006,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
@@ -115,7 +106,7 @@ $NetBSD: patch-unix_configure,v 1.8 2014/01/11 14:41:06 adam Exp $
  		x_libraries="$i"
  		break
  	    fi
-@@ -10075,7 +10079,7 @@ echo "${ECHO_T}$i" >&6
+@@ -10011,7 +10015,7 @@ echo "${ECHO_T}$i" >&6
  	if test "$x_libraries" = ""; then
  	    XLIBSW=-lX11
  	else
@@ -124,7 +115,7 @@ $NetBSD: patch-unix_configure,v 1.8 2014/01/11 14:41:06 adam Exp $
  	fi
      fi
      if test "$XLIBSW" = nope ; then
-@@ -10171,11 +10175,6 @@ fi
+@@ -10107,11 +10111,6 @@ fi
  #	   be replaced by spaces.
  #--------------------------------------------------------------------
  
@@ -136,7 +127,7 @@ $NetBSD: patch-unix_configure,v 1.8 2014/01/11 14:41:06 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
-@@ -11333,14 +11332,10 @@ else
+@@ -11347,14 +11346,10 @@ else
  	TK_LIB_FLAG="-ltk`echo ${TK_VERSION} | tr -d .`"
  	TK_BUILD_LIB_SPEC="-L\$(TOP_DIR)/win ${TK_LIB_FLAG}"
      else
@@ -152,7 +143,7 @@ $NetBSD: patch-unix_configure,v 1.8 2014/01/11 14:41:06 adam Exp $
  fi
  
  #--------------------------------------------------------------------
-@@ -11352,11 +11347,7 @@ fi
+@@ -11366,11 +11361,7 @@ fi
  eval "TK_STUB_LIB_FILE=libtkstub${TK_UNSHARED_LIB_SUFFIX}"
  eval "TK_STUB_LIB_DIR=${libdir}"
  
@@ -165,7 +156,7 @@ $NetBSD: patch-unix_configure,v 1.8 2014/01/11 14:41:06 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}"
-@@ -12177,6 +12168,7 @@ s,@APP_RSRC_FILE@,$APP_RSRC_FILE,;t t
+@@ -12191,6 +12182,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