 @@ -1,16 +1,16 @@
-$NetBSD: patch-unix_Makefile.in,v 1.2 2012/08/23 16:14:43 adam Exp $
+$NetBSD: patch-unix_Makefile.in,v 1.3 2012/11/24 21:38:49 adam Exp $
---- unix/Makefile.in.orig	2012-07-25 16:45:05.000000000 +0000
+--- unix/Makefile.in.orig	2012-11-09 15:14:39.000000000 +0000
 +++ unix/Makefile.in
 @@ -8,6 +8,7 @@ VERSION 		= @TCL_VERSION@
  MAJOR_VERSION		= @TCL_MAJOR_VERSION@
  MINOR_VERSION		= @TCL_MINOR_VERSION@
  PATCH_LEVEL		= @TCL_PATCH_LEVEL@
 +SHLIB_VERSION		= @SHLIB_VERSION@
  #--------------------------------------------------------------------------
  # Things you can change to personalize the Makefile for your own site (you can
 @@ -54,6 +55,8 @@ SCRIPT_INSTALL_DIR	= $(INSTALL_ROOT)$(TC
  # Directory in which to install the include file tcl.h:
  INCLUDE_INSTALL_DIR	= $(INSTALL_ROOT)$(includedir)
 @@ -18,133 +18,133 @@ $NetBSD: patch-unix_Makefile.in,v 1.2 20
 +GENERIC_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/tcl/generic
  # Path to the private tcl header dir:
  PRIVATE_INCLUDE_DIR	= @PRIVATE_INCLUDE_DIR@
 @@ -100,7 +103,7 @@ CFLAGS_OPTIMIZE		= @CFLAGS_OPTIMIZE@
  #CFLAGS			= $(CFLAGS_DEBUG)
  #CFLAGS			= $(CFLAGS_OPTIMIZE)
  #CFLAGS			= $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE)
 -CFLAGS			= @CFLAGS_DEFAULT@ @CFLAGS@
 +CFLAGS			+= @CFLAGS_DEFAULT@ @CFLAGS@
  # Flags to pass to the linker
  LDFLAGS_DEBUG		= @LDFLAGS_DEBUG@
-@@ -193,6 +196,7 @@ BUILD_DLTEST		= @BUILD_DLTEST@
+@@ -194,6 +197,7 @@ BUILD_DLTEST		= @BUILD_DLTEST@
  #BUILD_DLTEST		=
  TCL_LIB_FILE		= @TCL_LIB_FILE@
 +TCL_LIB_A_FILE		= ${TCL_LIB_FILE:@SHLIB_SUFFIX@=.a}
  #TCL_LIB_FILE		= libtcl.a
  # Generic lib name used in rules that apply to tcl and tk
-@@ -541,7 +545,7 @@ SRCS = $(GENERIC_SRCS) $(TOMMATH_SRCS) $
+@@ -542,7 +546,7 @@ SRCS = $(GENERIC_SRCS) $(TOMMATH_SRCS) $
  all: binaries libraries doc
 -binaries: ${LIB_FILE} $(STUB_LIB_FILE) ${TCL_EXE}
 +binaries: ${LIB_FILE} $(STUB_LIB_FILE) ${TCL_EXE} ${TCL_LIB_A_FILE}
  libraries:
-@@ -557,6 +561,11 @@ ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
+@@ -558,6 +562,11 @@ ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
  	rm -f $@
  	@MAKE_STUB_LIB@
 +${TCL_LIB_A_FILE}: ${OBJS}
 +	rm -rf $@
 +	ar cr $@ ${OBJS}
 +	$(RANLIB) $@
++
  # Make target which outputs the list of the .o contained in the Tcl lib useful
  # to build a single big shared library containing Tcl and other extensions.
  # Used for the Tcl Plugin.  -- dl
-@@ -722,9 +731,16 @@ install-binaries: binaries
+@@ -719,9 +728,16 @@ install-binaries: binaries
- 	    fi
+ 	    done;
  	@echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/"
  	@@INSTALL_LIB@
 -	@chmod 555 "$(DLL_INSTALL_DIR)"/$(LIB_FILE)
 +	@cd "$(DLL_INSTALL_DIR)" && if test "$(SHLIB_SUFFIX)" = ".dylib"; then \
 +		ln -sf libtcl$(MAJOR_VERSION)$(MINOR_VERSION).$(SHLIB_VERSION)$(SHLIB_SUFFIX) $(LIB_FILE) ; \
 +	else \
 +		ln -sf libtcl$(MAJOR_VERSION)$(MINOR_VERSION)$(SHLIB_SUFFIX).$(SHLIB_VERSION) $(LIB_FILE) ; \
 +	fi
 +	@echo "Installing ${TCL_LIB_A_FILE} to $(DLL_INSTALL_DIR)/"
 +	@$(INSTALL_DATA) ${TCL_LIB_A_FILE} $(DLL_INSTALL_DIR)/${TCL_LIB_A_FILE}
  	@echo "Installing ${TCL_EXE} as $(BIN_INSTALL_DIR)/tclsh$(VERSION)@EXEEXT@"
  	@$(INSTALL_PROGRAM) ${TCL_EXE} "$(BIN_INSTALL_DIR)"/tclsh$(VERSION)@EXEEXT@
 +	@cd "$(BIN_INSTALL_DIR)" && ln -sf tclsh$(VERSION)@EXEEXT@ tclsh
  	@echo "Installing tclConfig.sh to $(CONFIG_INSTALL_DIR)/"
  	@$(INSTALL_DATA) tclConfig.sh "$(CONFIG_INSTALL_DIR)"/tclConfig.sh
  	@if test "$(STUB_LIB_FILE)" != "" ; then \
-@@ -734,7 +750,8 @@ install-binaries: binaries
+@@ -731,7 +747,8 @@ install-binaries: binaries
  	@EXTRA_INSTALL_BINARIES@
  install-libraries: libraries $(INSTALL_TZDATA) install-msgs
 -	@for i in "$(INCLUDE_INSTALL_DIR)" "$(SCRIPT_INSTALL_DIR)"; \
 +	@for i in "$(INCLUDE_INSTALL_DIR)" "$(SCRIPT_INSTALL_DIR)" \
 +		"$(GENERIC_INCLUDE_INSTALL_DIR)" "$(UNIX_INCLUDE_INSTALL_DIR)"; \
  	    do \
  	    if [ ! -d "$$i" ] ; then \
  		echo "Making directory $$i"; \
-@@ -743,7 +760,7 @@ install-libraries: libraries $(INSTALL_T
+@@ -739,7 +756,7 @@ install-libraries: libraries $(INSTALL_T
  		else true; \
  		fi; \
  	    done;
 -	@for i in opt0.4 http1.0 encoding ../tcl8 ../tcl8/8.4  ../tcl8/8.4/platform ../tcl8/8.5; \
 +	@for i in opt0.4 http1.0 encoding; \
  	    do \
  	    if [ ! -d "$(SCRIPT_INSTALL_DIR)"/$$i ] ; then \
  		echo "Making directory $(SCRIPT_INSTALL_DIR)/$$i"; \
-@@ -756,12 +773,17 @@ install-libraries: libraries $(INSTALL_T
+@@ -748,12 +765,17 @@ install-libraries: libraries $(INSTALL_T
- 	    chmod +x $(SRC_DIR)/../unix/install-sh; \
+ 		fi; \
- 	    fi
+ 	    done;
- 	@echo "Installing header files";
+ 	@echo "Installing header files to $(INCLUDE_INSTALL_DIR)/";
 -	@for i in $(GENERIC_DIR)/tcl.h $(GENERIC_DIR)/tclDecls.h \
 -		$(GENERIC_DIR)/tclPlatDecls.h \
 -		$(GENERIC_DIR)/tclTomMath.h \
 -		$(GENERIC_DIR)/tclTomMathDecls.h ; \
 +	@for i in $(GENERIC_DIR)/*.h ; \
 +	    do \
 +	    $(INSTALL_DATA) $$i "$(GENERIC_INCLUDE_INSTALL_DIR)"; \
 +	    done;
 +	@for i in $(UNIX_DIR)/*.h ; \
 +	    do \
 +	    $(INSTALL_DATA) $$i "$(UNIX_INCLUDE_INSTALL_DIR)"; \
 +	    done;
 +	@for i in tcl.h tclDecls.h tclPlatDecls.h ; \
  	    do \
 -	    $(INSTALL_DATA) $$i "$(INCLUDE_INSTALL_DIR)"; \
 +	    cd "$(INCLUDE_INSTALL_DIR)" && ln -sf tcl/generic/$$i $$i; \
  	    done;
- 	@echo "Installing library files to $(SCRIPT_INSTALL_DIR)";
+ 	@echo "Installing library files to $(SCRIPT_INSTALL_DIR)/";
  	@for i in $(TOP_DIR)/library/*.tcl $(TOP_DIR)/library/tclIndex \
-@@ -774,22 +796,24 @@ install-libraries: libraries $(INSTALL_T
+@@ -766,22 +788,24 @@ install-libraries: libraries $(INSTALL_T
  	    do \
  	    $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/http1.0; \
  	    done;
--	@echo "Installing package http 2.7.9 as a Tcl Module";
+-	@echo "Installing package http 2.7.10 as a Tcl Module";
--	@$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/http-2.7.9.tm;
+-	@$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/http-2.7.10.tm;
- 	@echo "Installing library opt0.4 directory";
+ 	@echo "Installing package opt0.4 files to $(SCRIPT_INSTALL_DIR)/opt0.4/";
  	@for i in $(TOP_DIR)/library/opt/*.tcl ; \
  	    do \
  	    $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/opt0.4; \
  	    done;
- 	@echo "Installing package msgcat 1.4.5 as a Tcl Module";
+ 	@echo "Installing package msgcat 1.5.0 as a Tcl Module";
--	@$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/msgcat-1.4.5.tm;
+-	@$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/msgcat-1.5.0.tm;
 +	@$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/msgcat1.4/msgcat.tcl;
 +	@$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/pkgIndex.tcl "$(SCRIPT_INSTALL_DIR)"/msgcat1.4/pkgIndex.tcl;
  	@echo "Installing package tcltest 2.3.4 as a Tcl Module";
 -	@$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/tcltest-2.3.4.tm;
 +	@$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/tcltest2.3/tcltest.tcl;
 +	@$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/pkgIndex.tcl "$(SCRIPT_INSTALL_DIR)"/tcltest2.3/pkgIndex.tcl;
  	@echo "Installing package platform 1.0.10 as a Tcl Module";
 -	@$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/platform-1.0.10.tm;
 +	@$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(SCRIPT_INSTALL_DIR)"/platform1.0/platform.tcl;
 +	@$(INSTALL_DATA) $(TOP_DIR)/library/platform/pkgIndex.tcl "$(SCRIPT_INSTALL_DIR)"/platform1.0/pkgIndex.tcl;
  	@echo "Installing package platform::shell 1.1.4 as a Tcl Module";
 -	@$(INSTALL_DATA) $(TOP_DIR)/library/platform/shell.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/platform/shell-1.1.4.tm;
 +	@$(INSTALL_DATA) $(TOP_DIR)/library/platform/shell.tcl "$(SCRIPT_INSTALL_DIR)"/shell1.1/shell.tcl
 +	@$(INSTALL_DATA) $(TOP_DIR)/library/platform/pkgIndex.tcl "$(SCRIPT_INSTALL_DIR)"/shell1.1/pkgIndex.tcl
- 	@echo "Installing library encoding directory";
+ 	@echo "Installing encoding files to $(SCRIPT_INSTALL_DIR)/encoding/";
  	@for i in $(TOP_DIR)/library/encoding/*.enc ; do \

 @@ -1,44 +1,56 @@
-# $NetBSD: Makefile,v 1.68 2012/10/29 05:06:53 asau Exp $
+# $NetBSD: Makefile,v 1.69 2012/11/24 21:38:50 adam Exp $
 DISTNAME=	tk${TK_VERSION}-src
 PKGNAME=	tk-${TK_VERSION}
 PKGREVISION=	1
 CATEGORIES=	x11 lang
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=tcl/}
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.tcl.tk/
 COMMENT=	Graphical toolkit for TCL
 LICENSE=	2-clause-bsd
 .include "../../x11/tk/Makefile.version"
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 WRKSRC=			${WRKDIR}/tk${TK_VERSION}
 GNU_CONFIGURE=		yes
 CONFIGURE_DIRS=		unix
 BUILD_DIRS=		${CONFIGURE_DIRS}
 CONFIGURE_ARGS+=	--with-tcl=${BUILDLINK_PREFIX.tcl}/lib
-CONFIGURE_ARGS+=	--x-includes=${X11BASE:Q}/include
+CONFIGURE_ARGS+=	--x-includes=${X11BASE}/include
-CONFIGURE_ARGS+=	--x-libraries=${X11BASE:Q}/lib${LIBABISUFFIX:Q}
+CONFIGURE_ARGS+=	--x-libraries=${X11BASE}/lib${LIBABISUFFIX:Q}
 CONFIGURE_ENV+=		LIB_RUNTIME_DIR=${PREFIX}/lib
 PTHREAD_OPTS+=		require
 TEST_TARGET=		test
 .if defined(ABI) && ${ABI} == "64"
 CONFIGURE_ARGS+=	--enable-64bit
 .endif
 .include "options.mk"
 SUBST_CLASSES+=		tk-config
 SUBST_STAGE.tk-config=	post-build
 SUBST_FILES.tk-config=	unix/tkConfig.sh
 SUBST_SED.tk-config+=	-e "s|${WRKSRC}/unix|${PREFIX}/lib|"
 SUBST_SED.tk-config+=	-e "s|${WRKSRC}|${PREFIX}/include/tk|"
 PLIST_SUBST+=		SONUM=${TK_SONUM}
 PLIST_SUBST+=		BASEVER=${TK_BASEVER}
-.include "../../lang/tcl/buildlink3.mk"
+.include "../../mk/bsd.prefs.mk"
 .if ${OPSYS} == "Darwin"
 CONFIGURE_ARGS+=	--enable-aqua
 .else
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .endif
 .include "../../lang/tcl/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

 @@ -1,22 +1,22 @@
-$NetBSD: patch-unix_Makefile.in,v 1.1 2012/08/21 21:32:34 marino Exp $
+$NetBSD: patch-unix_Makefile.in,v 1.2 2012/11/24 21:38:50 adam Exp $
---- unix/Makefile.in.orig	2012-07-25 16:45:53.000000000 +0000
+--- unix/Makefile.in.orig	2012-11-09 15:15:03.000000000 +0000
 +++ unix/Makefile.in
 @@ -14,6 +14,7 @@ MAJOR_VERSION		= @TK_MAJOR_VERSION@
  MINOR_VERSION		= @TK_MINOR_VERSION@
  PATCH_LEVEL		= @TK_PATCH_LEVEL@
  LOCALES			= @LOCALES@
-+SHLIB_VERSION		= .@SHLIB_VERSION@
++SHLIB_VERSION		= @SHLIB_VERSION@
  #----------------------------------------------------------------
  # Things you can change to personalize the Makefile for your own
 @@ -64,6 +65,8 @@ SCRIPT_INSTALL_DIR	= $(INSTALL_ROOT)$(TK
  # Directory in which to install the include file tk.h:
  INCLUDE_INSTALL_DIR	= $(INSTALL_ROOT)$(includedir)
 +UNIX_INCLUDE_INSTALL_DIR    = $(DESTDIR)$(prefix)/include/tk/unix
 +GENERIC_INCLUDE_INSTALL_DIR = $(DESTDIR)$(prefix)/include/tk/generic
  # Path to the private tk header dir:
  PRIVATE_INCLUDE_DIR	= @PRIVATE_INCLUDE_DIR@
 @@ -100,7 +103,7 @@ DEMO_INSTALL_DIR	= $(INSTALL_ROOT)$(TK_L
 @@ -27,94 +27,107 @@ $NetBSD: patch-unix_Makefile.in,v 1.1 20
 +TCL_GENERIC_DIR		= $(TCL_BIN_DIR)/../include/tcl/generic
  # The directory containing the platform specific Tcl sources and headers
  # appropriate for this version of Tk:
 @@ -137,7 +140,7 @@ CFLAGS_OPTIMIZE		= @CFLAGS_OPTIMIZE@
  #CFLAGS			= $(CFLAGS_DEBUG)
  #CFLAGS			= $(CFLAGS_OPTIMIZE)
  #CFLAGS			= $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE)
 -CFLAGS			= @CFLAGS_DEFAULT@ @CFLAGS@
 +CFLAGS			+= @CFLAGS_DEFAULT@ @CFLAGS@
  # Flags to pass to the linker
  LDFLAGS_DEBUG		= @LDFLAGS_DEBUG@
-@@ -243,6 +246,7 @@ TK_STUB_LIB_FLAG	= @TK_STUB_LIB_FLAG@
+@@ -245,6 +248,7 @@ TK_STUB_LIB_FLAG	= @TK_STUB_LIB_FLAG@
  #TK_STUB_LIB_FLAG	= -ltkstub
  TK_LIB_FILE		= @TK_LIB_FILE@
 +TK_LIB_A_FILE		= ${TK_LIB_FILE:@SHLIB_SUFFIX@=.a}
  #TK_LIB_FILE		= libtk.a
  # Generic lib name used in rules that apply to tcl and tk
-@@ -557,6 +561,9 @@ PRIVATE_HDRS = $(GENERIC_DIR)/tkInt.h $(
+@@ -276,6 +280,8 @@ SHLIB_LD		= @SHLIB_LD@
  SHLIB_LD_LIBS		= @SHLIB_LD_LIBS@
  TK_SHLIB_LD_EXTRAS	= @TK_SHLIB_LD_EXTRAS@
 +SHLIB_SUFFIX		= @SHLIB_SUFFIX@
++
  # 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.
@@ -546,6 +552,9 @@ PRIVATE_HDRS = $(GENERIC_DIR)/tkInt.h $(
  DEMOPROGS = browse hello ixset rmt rolodex square tcolor timer widget
 +INSTALL_HDRS = tk.h tkInt.h  tkDecls.h tkIntDecls.h tkPlatDecls.h \
 +	       tkIntPlatDecls.h tkIntXlibDecls.h
++
  SHELL_ENV = \
  	@LD_LIBRARY_PATH_VAR@="`pwd`:${TCL_BIN_DIR}:$${@LD_LIBRARY_PATH_VAR@}"; \
  	export @LD_LIBRARY_PATH_VAR@; \
-@@ -581,6 +588,11 @@ ${LIB_FILE}: ${OBJS} ${STUB_LIB_FILE} @L
+@@ -569,6 +578,11 @@ ${LIB_FILE}: ${OBJS} ${STUB_LIB_FILE} @L
  	rm -f $@
  	@MAKE_LIB@
 +${TK_LIB_A_FILE}: ${OBJS}
 +	rm -f $@
 +	ar cr $@ ${OBJS}
 +	$(RANLIB) $@
++
  ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
  	rm -f $@
  	@MAKE_STUB_LIB@
-@@ -703,7 +715,7 @@ install-strip:
+@@ -686,7 +700,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}
  	@for i in "$(LIB_INSTALL_DIR)" "$(BIN_INSTALL_DIR)" \
  	    "$(PKG_INSTALL_DIR)" "$(CONFIG_INSTALL_DIR)" ; \
  	    do \
-@@ -737,13 +749,17 @@ install-binaries: $(TK_LIB_FILE) $(TK_ST
+@@ -716,13 +730,20 @@ install-binaries: $(TK_LIB_FILE) $(TK_ST
  	    fi
  	@echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/"
  	@@INSTALL_LIB@
 -	@chmod 555 "$(DLL_INSTALL_DIR)/$(LIB_FILE)"
-+	@chmod 555 "$(DLL_INSTALL_DIR)/$(LIB_FILE)$(SHLIB_VERSION)"
++	@cd "$(DLL_INSTALL_DIR)" && if test "$(SHLIB_SUFFIX)" = ".dylib"; then \
-+	@cd "$(DLL_INSTALL_DIR)" && ln -sf $(LIB_FILE)$(SHLIB_VERSION) $(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) ; \
 +	fi
 +	@echo "Installing ${TK_LIB_A_FILE} to $(DLL_INSTALL_DIR)/"
 +	@$(INSTALL_DATA) ${TK_LIB_A_FILE} $(DLL_INSTALL_DIR)/${TK_LIB_A_FILE}
  	@if test -f "tk${MAJOR_VERSION}${MINOR_VERSION}.dll"; then \
- 	    $(INSTALL_LIBRARY) "${TOP_DIR}/win/tk${MAJOR_VERSION}${MINOR_VERSION}.dll" "$(DLL_INSTALL_DIR)";\
+ 	    $(INSTALL_LIBRARY) "tk${MAJOR_VERSION}${MINOR_VERSION}.dll" "$(DLL_INSTALL_DIR)";\
  	    chmod 555 "$(DLL_INSTALL_DIR)/tk${MAJOR_VERSION}${MINOR_VERSION}.dll";\
  	fi
- 	@echo "Installing ${WISH_EXE} as $(BIN_INSTALL_DIR)/wish$(VERSION)@EXEEXT@"
+ 	@echo "Installing ${WISH_EXE} as $(BIN_INSTALL_DIR)/wish$(VERSION)${EXE_SUFFIX}"
- 	@$(INSTALL_PROGRAM) ${WISH_EXE} "$(BIN_INSTALL_DIR)/wish$(VERSION)@EXEEXT@"
+ 	@$(INSTALL_PROGRAM) ${WISH_EXE} "$(BIN_INSTALL_DIR)/wish$(VERSION)${EXE_SUFFIX}"
 +	@cd "$(BIN_INSTALL_DIR)" && ln -sf wish$(VERSION)@EXEEXT@ wish
  	@echo "Installing tkConfig.sh to $(CONFIG_INSTALL_DIR)/"
  	@$(INSTALL_DATA) tkConfig.sh "$(CONFIG_INSTALL_DIR)/tkConfig.sh"
  	@if test "$(STUB_LIB_FILE)" != "" ; then \
-@@ -756,6 +772,7 @@ install-libraries: libraries
+@@ -827,7 +848,7 @@ install-doc:
  install-headers:
  	@if test "$(@TK_WINDOWINGSYSTEM@_XLIB_HDRS)" != ""; then \
- 	    XLIB_INCLUDE_INSTALL_DIR="$(INCLUDE_INSTALL_DIR)/X11"; fi; \
+ 	    XLIB_INCLUDE_INSTALL_DIR="$(INCLUDE_INSTALL_DIR)"/X11; fi; \
- 	for i in "$(INCLUDE_INSTALL_DIR)" "$${XLIB_INCLUDE_INSTALL_DIR}" \
+-	for i in "$(INCLUDE_INSTALL_DIR)" "$${XLIB_INCLUDE_INSTALL_DIR}"; \
-+		"$(GENERIC_INCLUDE_INSTALL_DIR)" "$(UNIX_INCLUDE_INSTALL_DIR)" \
++	for i in "$(INCLUDE_INSTALL_DIR)" "$${XLIB_INCLUDE_INSTALL_DIR}" "$(GENERIC_INCLUDE_INSTALL_DIR)" "$(UNIX_INCLUDE_INSTALL_DIR)"; \
  		"$(SCRIPT_INSTALL_DIR)" "$(SCRIPT_INSTALL_DIR)/images" \
  		"$(SCRIPT_INSTALL_DIR)/msgs" "$(SCRIPT_INSTALL_DIR)/ttk"; \
  	    do \
-@@ -770,9 +787,12 @@ install-libraries: libraries
+ 	    if [ -n "$$i" -a ! -d "$$i" ] ; then \
- 	    chmod +x $(SRC_DIR)/install-sh; \
+ 		echo "Making directory $$i"; \
- 	    fi
+@@ -836,9 +857,12 @@ install-headers:
- 	@echo "Installing header files";
+ 		fi; \
  	    done;
  	@echo "Installing header files to $(INCLUDE_INSTALL_DIR)/";
 -	@for i in $(PUBLIC_HDRS); \
 +	$(INSTALL_DATA) $(GENERIC_DIR)/*.h "$(GENERIC_INCLUDE_INSTALL_DIR)"/
 +	$(INSTALL_DATA) $(UNIX_DIR)/*.h "$(UNIX_INCLUDE_INSTALL_DIR)"/
 +	@for i in $(INSTALL_HDRS); \
  	    do \
 -	    $(INSTALL_DATA) $$i "$(INCLUDE_INSTALL_DIR)"; \
 +	    j=`basename $$i` ; \
 +	    cd "$(INCLUDE_INSTALL_DIR)" && ln -sf tk/generic/$$j $$j ; \
  	    done;
  	@list='$(@TK_WINDOWINGSYSTEM@_XLIB_HDRS)'; for i in $$list ; \
  	    do \

 @@ -1,16 +1,16 @@
-$NetBSD: patch-unix_configure,v 1.4 2012/08/29 11:55:06 dsainty Exp $
+$NetBSD: patch-unix_configure,v 1.5 2012/11/24 21:38:50 adam Exp $
---- unix/configure.orig	2012-07-25 16:45:53.000000000 +0000
+--- unix/configure.orig	2012-11-09 15:15:03.000000000 +0000
 +++ unix/configure
 @@ -4843,10 +4843,10 @@ fi
      # LDFLAGS_ARCH so they eventually end up in LDFLAGS even if [load]
      # is disabled by the user. [Bug 1016796]
      LDFLAGS_ARCH=""
 -    UNSHARED_LIB_SUFFIX=""
      TCL_TRIM_DOTS='`echo ${VERSION} | tr -d .`'
      ECHO_VERSION='`echo ${VERSION}`'
 -    TCL_LIB_VERSIONS_OK=ok
 +    TCL_LIB_VERSIONS_OK=nodots
 +    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
      CFLAGS_DEBUG=-g
      CFLAGS_OPTIMIZE=-O
 @@ -77,106 +77,110 @@ $NetBSD: patch-unix_configure,v 1.4 2012
 +	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so'
  	    TCL_LIB_VERSIONS_OK=nodots
  	    ;;
  	Darwin-*)
 @@ -7159,7 +7153,7 @@ fi
  	    BSD/OS*) ;;
  	    CYGWIN_*|MINGW32_*) ;;
  	    IRIX*) ;;
 -	    NetBSD-*|FreeBSD-*|OpenBSD-*) ;;
 +	    NetBSD-*|FreeBSD-*|OpenBSD-*|MirBSD-*) ;;
  	    Darwin-*) ;;
  	    SCO_SV-3.2*) ;;
  	    *) SHLIB_CFLAGS="-fPIC" ;;
-@@ -7169,12 +7163,12 @@
+@@ -7169,12 +7163,12 @@ fi
      if test "$SHARED_LIB_SUFFIX" = ""; then
 -	SHARED_LIB_SUFFIX='${VERSION}${SHLIB_SUFFIX}'
 +	SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}${SHLIB_SUFFIX}'
  fi
      if test "$UNSHARED_LIB_SUFFIX" = ""; then
 -	UNSHARED_LIB_SUFFIX='${VERSION}.a'
 +	UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
  fi
      DLL_INSTALL_DIR="\$(LIB_INSTALL_DIR)"
-@@ -7190,7 +7184,7 @@ fi
+@@ -7190,7 +7184,11 @@ fi
  else
 -            INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)/$(LIB_FILE)"'
-+            INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)/$(LIB_FILE)$(SHLIB_VERSION)"'
++       if test "${SHLIB_SUFFIX}" = ".dylib" ; then
 +            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)"'
 +        fi
  fi
-@@ -7224,7 +7218,7 @@ fi
+@@ -7224,7 +7222,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))'
  fi
-@@ -10358,7 +10352,7 @@ echo $ECHO_N "checking for X11 libraries
+@@ -10358,7 +10356,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
 -		XLIBSW="-L$i -lX11"
 +		XLIBSW="-L$i ${COMPILER_RPATH_FLAG}$i -lX11"
  		x_libraries="$i"
  		break
  	    fi
-@@ -10367,7 +10361,7 @@ echo "${ECHO_T}$i" >&6
+@@ -10367,7 +10365,7 @@ echo "${ECHO_T}$i" >&6
  	if test "$x_libraries" = ""; then
  	    XLIBSW=-lX11
  	else
 -	    XLIBSW="-L$x_libraries -lX11"
 +	    XLIBSW="-L$x_libraries ${COMPILER_RPATH_FLAG}$x_libraries -lX11"
  	fi
      fi
      if test "$XLIBSW" = nope ; then
-@@ -11383,18 +11377,14 @@ _ACEOF
+@@ -11386,18 +11384,14 @@ else
- 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
+     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}"
      else
  	WISH_BUILD_LIB_SPEC="-L`pwd | sed -e 's/ /\\\\ /g'` ${TK_LIB_FLAG} \${WISH_LIBS}"
      fi
 -    TK_LIB_SPEC="-L${libdir} ${TK_LIB_FLAG}"
 +    TK_LIB_SPEC="-L${libdir} ${COMPILER_RPATH_FLAG}${libdir} ${TK_LIB_FLAG}"
  fi
- # Support for building the Aqua resource files
+ #--------------------------------------------------------------------
-@@ -11422,11 +11412,7 @@ fi
+@@ -11409,11 +11403,7 @@ fi
  eval "TK_STUB_LIB_FILE=libtkstub${TK_UNSHARED_LIB_SUFFIX}"
  eval "TK_STUB_LIB_DIR=${libdir}"
 -if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
 -    TK_STUB_LIB_FLAG="-ltkstub${TK_VERSION}"
 -else
 -    TK_STUB_LIB_FLAG="-ltkstub`echo ${TK_VERSION} | tr -d .`"
 -fi
 +TK_STUB_LIB_FLAG="-ltkstub`echo ${TK_VERSION} | tr -d .`"
  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}"
-@@ -12246,6 +12232,7 @@ s,@APP_RSRC_FILE@,$APP_RSRC_FILE,;t t
+@@ -12233,6 +12223,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
 +s,@SHLIB_VERSION@,$SHLIB_VERSION,;t t
  CEOF
  _ACEOF

 @@ -1,5 +1,5 @@
-# $NetBSD: Makefile.version,v 1.9 2012/08/21 21:31:47 marino Exp $
+# $NetBSD: Makefile.version,v 1.10 2012/11/24 21:38:49 adam Exp $
 TCL_SONUM=	85
 TCL_BASEVER=	8.5
-TCL_VERSION=	8.5.12
+TCL_VERSION=	8.5.13

 @@ -1,16 +1,16 @@
-$NetBSD: distinfo,v 1.52 2012/11/08 08:50:02 he Exp $
+$NetBSD: distinfo,v 1.53 2012/11/24 21:38:49 adam Exp $
-SHA1 (tcl8.5.12-src.tar.gz) = 0ea293d27b1368cb5865e552ece348d02ff55adc
+SHA1 (tcl8.5.13-src.tar.gz) = 65b677dc699426233b926edfa9e304d456da7cad
-RMD160 (tcl8.5.12-src.tar.gz) = ada42e22f7b12413c88d9ec7dbd3789926f362d2
+RMD160 (tcl8.5.13-src.tar.gz) = 20cfb8adebd77a6d037f67a9af7e88d80032b3c2
-Size (tcl8.5.12-src.tar.gz) = 4501505 bytes
+Size (tcl8.5.13-src.tar.gz) = 4513204 bytes
 SHA1 (patch-generic_tclInt.h) = 13289d8fcf5021898b06a9608bc05fc968a1ba5c
 SHA1 (patch-generic_tclPort.h) = cd44f24c79048a70e2c4929aa1499ee336602ba5
 SHA1 (patch-generic_tclPosixStr.c) = 8c252a4f3d8898fb48544d15123d6a8ddc3172f0
 SHA1 (patch-tests_load.test) = 438695ab76e01646e49aadc01c44344a5495eabb
 SHA1 (patch-tests_pkgMkIndex.test) = 70d1042c1f4743052c5fa191fa7c4732a08e28a2
-SHA1 (patch-unix_Makefile.in) = 5ccd853f45b66a0638a8625f4b8066955787c20a
+SHA1 (patch-unix_Makefile.in) = d8828e3818a141a006b4fbdaeea43b350d62f014
 SHA1 (patch-unix_configure) = 2e1e6d2020e68b91b94c0b05cb1d349126989adc
 SHA1 (patch-unix_tclConfig.sh.in) = 5a32d8e97240d14f3a03e205637fe3bf8307d868
 SHA1 (patch-unix_tclUnixFCmd.c) = a56a12b8a0068e914d10336076347ca2b0ba9ac7
 SHA1 (patch-unix_tclUnixInit.c) = 4cbddb3e1a9ed4bbbf2d8de0df1a9032fc5b2629
 SHA1 (patch-unix_tclUnixPort.h) = 2965dd6ef6560e0a6385c6cb286754f63c98c827

 @@ -1,5 +1,5 @@
-# $NetBSD: Makefile.version,v 1.9 2012/08/21 21:32:34 marino Exp $
+# $NetBSD: Makefile.version,v 1.10 2012/11/24 21:38:50 adam Exp $
 TK_SONUM=	85
 TK_BASEVER=	8.5
-TK_VERSION=	8.5.12
+TK_VERSION=	8.5.13

 @@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.38 2012/08/29 11:55:06 dsainty Exp $
+$NetBSD: distinfo,v 1.39 2012/11/24 21:38:50 adam Exp $
-SHA1 (tk8.5.12-src.tar.gz) = 292a01a39e9378d2455e4492f39500baeb6b63db
+SHA1 (tk8.5.13-src.tar.gz) = a7dc1a979201376d7e7d48ec9280839ebb52a09f
-RMD160 (tk8.5.12-src.tar.gz) = fc864df9f1e1ebd4b4375cc46572834095e77372
+RMD160 (tk8.5.13-src.tar.gz) = f832c61d5006f9ddef93a63db9789d158b1d6202
-Size (tk8.5.12-src.tar.gz) = 3826062 bytes
+Size (tk8.5.13-src.tar.gz) = 4086092 bytes
-SHA1 (patch-unix_Makefile.in) = 0e1f8a8c20c426a042ab1c061cc6031283abe1d5
+SHA1 (patch-macosx_tkMacOSXClipboard.c) = ac5a5de7c0e4259a347fcb7449d304e6edb91343
-SHA1 (patch-unix_configure) = fe8cbd693bbbd891e82e27f80d2f180a6af71629
+SHA1 (patch-macosx_tkMacOSXDraw.c) = b241b7d70436340a5b55b7568da994465f45d2f8
 SHA1 (patch-unix_Makefile.in) = f3b1ee8ae65b1ee341ffc21aab2d7d37ffe26198
 SHA1 (patch-unix_configure) = 459a2688731fd86c4b88fb90aa2401949ff5b74f

 @@ -1,21 +1,19 @@
-# $NetBSD: interpreter.mk,v 1.1 2012/08/31 11:16:12 he Exp $
+# $NetBSD: interpreter.mk,v 1.2 2012/11/24 21:38:50 adam Exp $
+#
 # Package-settable variables:
+#
 # REPLACE_WISH
 #	THe list of files whose interpreter will be corrected.
+#
 # See also:
 #	replace-interpreter
 .if !defined(TK_INTERPRETER_MK)
-TK_INTERPRETER_MK=  # defined
+TK_INTERPRETER_MK=	# defined
 REPLACE_INTERPRETER+=	wish
 REPLACE.wish.old=	.*/wish
 REPLACE.wish.new=	${LOCALBASE}/bin/wish
 REPLACE_FILES.wish=	${REPLACE_WISH}
 .endif

 @@ -1,35 +1,34 @@
-# $NetBSD: Makefile,v 1.70 2012/11/07 14:30:48 he Exp $
+# $NetBSD: Makefile,v 1.71 2012/11/24 21:38:49 adam Exp $
 DISTNAME=	tcl${TCL_VERSION}-src
 PKGNAME=	tcl-${TCL_VERSION}
 PKGREVISION=	2
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=tcl/}
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.tcl.tk/
 COMMENT=	Tool Command Language, a dynamic language
 LICENSE=	2-clause-bsd
 .include "../../lang/tcl/Makefile.version"
 WRKSRC=			${WRKDIR}/tcl${TCL_VERSION}
 GNU_CONFIGURE=		yes
 CONFIGURE_DIRS=		unix
 BUILD_DIRS=		${CONFIGURE_DIRS}
-CONFIGURE_ARGS+=	--prefix=${PREFIX:Q}
+CONFIGURE_ARGS+=	--prefix=${PREFIX}
 INSTALL_TARGET=		install
 # The test target gives better results when not run as root.
 TEST_TARGET=		test
 .include "options.mk"
 # This is needed for SGI and maybe sun (according to tcl developers)
 .if defined(ABI) && ${ABI} == "64"
 CONFIGURE_ARGS+=	--enable-64bit
 .endif
 SUBST_CLASSES+=		tcl-config