x11/tk: Upgrade from version 8.4.18 to 8.5.12

Highlights of Tk 8.5 * New modern theming engine: New and complementary widgets that make use of platform-specific theming on Mac OS X and Windows to better fit in with those environments, and feature an improved look and feel under X11. * New widgets: Part of the themed widget set, Tk now has core notebook, combobox, treeview and progressbar widgets. * text widget: Smooth scrolling, widget peering, and improved procedures for counting and replacing text. * Font rendering: Now uses anti-aliased text under X11, and a more modern text engine (ATSUI) on Mac OS X. * Additional improvements: Window transparency, new fullscreen option for windows, enhancements to specific widgets and window layout, and more. There is of course much, much more. See [8.5 Changes](http://wiki.tcl.tk/10630) on the wiki for a complete list of new features.
author: marino <marino@pkgsrc.org> 2012-08-21 21:32:34 +0000
committer: marino <marino@pkgsrc.org> 2012-08-21 21:32:34 +0000
commit: 590f742ecddcf7d52cb13d4abe3e13af05747b55 (patch)
tree: d939eb2f686ee05c7dac76d241305d25f13adf37 /x11/tk
parent: 5ff2dd799087bf20a2635167e201798deaab6261 (diff)
download: pkgsrc-590f742ecddcf7d52cb13d4abe3e13af05747b55.tar.gz
13 files changed, 482 insertions, 609 deletions
diff --git a/x11/tk/DESCR b/x11/tk/DESCR
index b608409a82c..71ea569970a 100644
--- a/x11/tk/DESCR
+++ b/x11/tk/DESCR
@@ -1,6 +1,6 @@
 This package contains the binary release of Tk, a GUI toolkit for Tcl.
 
-The best way to get started with Tcl is to read ``Tcl and the Tk
-Toolkit'' by John K. Ousterhout, Addison-Wesley, ISBN 0-201-63337-X
-or ``Practical Programming in Tcl and Tk'' by Brent B. Welch,
-Prentice Hall PTR, ISBN 0-13-616830-X.
+The best way to get started with Tcl is to read ``Practical Programming in
+TCL and Tk, 4th Edition'' by Brent Welch and Ken Jones, Prentice Hall PTR,
+ISBN 0-13-038560-3.  There's also the collectible ``Tcl and the Tk
+Toolkit'' by John K. Ousterhout, Addison-Wesley, ISBN 0-20-163337-X.
diff --git a/x11/tk/Makefile b/x11/tk/Makefile
index b6c284f758a..83056795b8d 100644
--- a/x11/tk/Makefile
+++ b/x11/tk/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.65 2011/11/13 13:55:59 shattered Exp $
+# $NetBSD: Makefile,v 1.66 2012/08/21 21:32:34 marino Exp $
 
 DISTNAME=	tk${TK_VERSION}-src
 PKGNAME=	tk-${TK_VERSION}
-PKGREVISION=	2
 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"
 
@@ -17,18 +17,14 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 WRKSRC=			${WRKDIR}/tk${TK_VERSION}
 
-USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_DIRS=		unix
 BUILD_DIRS=		${CONFIGURE_DIRS}
 CONFIGURE_ARGS+=	--with-tcl=${BUILDLINK_PREFIX.tcl}/lib
 CONFIGURE_ARGS+=	--enable-threads
 CONFIGURE_ENV+=		LIB_RUNTIME_DIR=${PREFIX}/lib
-MAKE_ENV+=		TOUCH=${TOUCH:Q}
 PTHREAD_OPTS+=		require
 
-PRIVILEGED_STAGES+=	clean
-
 TEST_TARGET=		test
 
 .include "../../lang/tcl/buildlink3.mk"
@@ -41,41 +37,11 @@ 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|"
 
-INSTALLATION_DIRS+=	include/tk
-INSTALLATION_DIRS+=	include/tk/generic
-INSTALLATION_DIRS+=	include/tk/unix
+PLIST_SUBST+=		SONUM=${TK_SONUM}
+PLIST_SUBST+=		BASEVER=${TK_BASEVER}
 
-DESTDIRPREFIX=		${DESTDIR}${PREFIX}
 
-post-install:
-	rm -f ${DESTDIRPREFIX:Q}/bin/wish
-	ln -s wish8.4 ${DESTDIRPREFIX:Q}/bin/wish
-	${INSTALL_DATA} ${WRKSRC}/generic/default.h ${DESTDIRPREFIX:Q}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/generic/ks_names.h ${DESTDIRPREFIX:Q}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/generic/tk.h ${DESTDIRPREFIX:Q}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/generic/tk3d.h ${DESTDIRPREFIX:Q}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/generic/tkButton.h ${DESTDIRPREFIX:Q}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/generic/tkCanvas.h ${DESTDIRPREFIX:Q}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/generic/tkColor.h ${DESTDIRPREFIX:Q}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/generic/tkDecls.h ${DESTDIRPREFIX:Q}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/generic/tkFileFilter.h ${DESTDIRPREFIX:Q}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/generic/tkFont.h ${DESTDIRPREFIX:Q}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/generic/tkInitScript.h ${DESTDIRPREFIX:Q}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/generic/tkInt.h ${DESTDIRPREFIX:Q}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/generic/tkIntDecls.h ${DESTDIRPREFIX:Q}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/generic/tkIntPlatDecls.h ${DESTDIRPREFIX:Q}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/generic/tkIntXlibDecls.h ${DESTDIRPREFIX:Q}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/generic/tkMenu.h ${DESTDIRPREFIX:Q}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/generic/tkMenubutton.h ${DESTDIRPREFIX:Q}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/generic/tkPlatDecls.h ${DESTDIRPREFIX:Q}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/generic/tkPort.h ${DESTDIRPREFIX:Q}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/generic/tkScale.h ${DESTDIRPREFIX:Q}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/generic/tkScrollbar.h ${DESTDIRPREFIX:Q}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/generic/tkSelect.h ${DESTDIRPREFIX:Q}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/generic/tkText.h ${DESTDIRPREFIX:Q}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/generic/tkUndo.h ${DESTDIRPREFIX:Q}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/unix/tkUnixDefault.h ${DESTDIRPREFIX:Q}/include/tk/unix
-	${INSTALL_DATA} ${WRKSRC}/unix/tkUnixInt.h ${DESTDIRPREFIX:Q}/include/tk/unix
-	${INSTALL_DATA} ${WRKSRC}/unix/tkUnixPort.h ${DESTDIRPREFIX:Q}/include/tk/unix
+#post-install:
+#	ln -s wish${TK_BASEVER} ${DESTDIRPREFIX:Q}/bin/wish
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/tk/Makefile.version b/x11/tk/Makefile.version
index 934dd506bbb..293f45e831b 100644
--- a/x11/tk/Makefile.version
+++ b/x11/tk/Makefile.version
@@ -1,3 +1,5 @@
-# $NetBSD: Makefile.version,v 1.8 2008/04/07 15:14:09 bjs Exp $
+# $NetBSD: Makefile.version,v 1.9 2012/08/21 21:32:34 marino Exp $
 
-TK_VERSION=	8.4.18
+TK_SONUM=	85
+TK_BASEVER=	8.5
+TK_VERSION=	8.5.12
diff --git a/x11/tk/PLIST b/x11/tk/PLIST
index ef622147e98..a58f380e737 100644
--- a/x11/tk/PLIST
+++ b/x11/tk/PLIST
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.11 2009/06/14 18:25:07 joerg Exp $
+@comment $NetBSD: PLIST,v 1.12 2012/08/21 21:32:34 marino Exp $
 bin/wish
-bin/wish8.4
+bin/wish${BASEVER}
 include/tk.h
 include/tk/generic/default.h
 include/tk/generic/ks_names.h
@@ -10,9 +10,9 @@ include/tk/generic/tkButton.h
 include/tk/generic/tkCanvas.h
 include/tk/generic/tkColor.h
 include/tk/generic/tkDecls.h
+include/tk/generic/tkEntry.h
 include/tk/generic/tkFileFilter.h
 include/tk/generic/tkFont.h
-include/tk/generic/tkInitScript.h
 include/tk/generic/tkInt.h
 include/tk/generic/tkIntDecls.h
 include/tk/generic/tkIntPlatDecls.h
@@ -30,132 +30,180 @@ include/tk/unix/tkUnixDefault.h
 include/tk/unix/tkUnixInt.h
 include/tk/unix/tkUnixPort.h
 include/tkDecls.h
+include/tkInt.h
+include/tkIntDecls.h
+include/tkIntPlatDecls.h
+include/tkIntXlibDecls.h
 include/tkPlatDecls.h
-lib/libtk84.la
-lib/libtkstub84.a
-lib/tk8.4/bgerror.tcl
-lib/tk8.4/button.tcl
-lib/tk8.4/choosedir.tcl
-lib/tk8.4/clrpick.tcl
-lib/tk8.4/comdlg.tcl
-lib/tk8.4/console.tcl
-lib/tk8.4/demos/README
-lib/tk8.4/demos/arrow.tcl
-lib/tk8.4/demos/bind.tcl
-lib/tk8.4/demos/bitmap.tcl
-lib/tk8.4/demos/browse
-lib/tk8.4/demos/button.tcl
-lib/tk8.4/demos/check.tcl
-lib/tk8.4/demos/clrpick.tcl
-lib/tk8.4/demos/colors.tcl
-lib/tk8.4/demos/cscroll.tcl
-lib/tk8.4/demos/ctext.tcl
-lib/tk8.4/demos/dialog1.tcl
-lib/tk8.4/demos/dialog2.tcl
-lib/tk8.4/demos/entry1.tcl
-lib/tk8.4/demos/entry2.tcl
-lib/tk8.4/demos/entry3.tcl
-lib/tk8.4/demos/filebox.tcl
-lib/tk8.4/demos/floor.tcl
-lib/tk8.4/demos/form.tcl
-lib/tk8.4/demos/hello
-lib/tk8.4/demos/hscale.tcl
-lib/tk8.4/demos/icon.tcl
-lib/tk8.4/demos/image1.tcl
-lib/tk8.4/demos/image2.tcl
-lib/tk8.4/demos/images/earth.gif
-lib/tk8.4/demos/images/earthris.gif
-lib/tk8.4/demos/images/face.bmp
-lib/tk8.4/demos/images/flagdown.bmp
-lib/tk8.4/demos/images/flagup.bmp
-lib/tk8.4/demos/images/gray25.bmp
-lib/tk8.4/demos/images/letters.bmp
-lib/tk8.4/demos/images/noletter.bmp
-lib/tk8.4/demos/images/pattern.bmp
-lib/tk8.4/demos/images/tcllogo.gif
-lib/tk8.4/demos/images/teapot.ppm
-lib/tk8.4/demos/items.tcl
-lib/tk8.4/demos/ixset
-lib/tk8.4/demos/label.tcl
-lib/tk8.4/demos/labelframe.tcl
-lib/tk8.4/demos/license.terms
-lib/tk8.4/demos/menu.tcl
-lib/tk8.4/demos/menubu.tcl
-lib/tk8.4/demos/msgbox.tcl
-lib/tk8.4/demos/paned1.tcl
-lib/tk8.4/demos/paned2.tcl
-lib/tk8.4/demos/plot.tcl
-lib/tk8.4/demos/puzzle.tcl
-lib/tk8.4/demos/radio.tcl
-lib/tk8.4/demos/rmt
-lib/tk8.4/demos/rolodex
-lib/tk8.4/demos/ruler.tcl
-lib/tk8.4/demos/sayings.tcl
-lib/tk8.4/demos/search.tcl
-lib/tk8.4/demos/spin.tcl
-lib/tk8.4/demos/square
-lib/tk8.4/demos/states.tcl
-lib/tk8.4/demos/style.tcl
-lib/tk8.4/demos/tclIndex
-lib/tk8.4/demos/tcolor
-lib/tk8.4/demos/text.tcl
-lib/tk8.4/demos/timer
-lib/tk8.4/demos/twind.tcl
-lib/tk8.4/demos/unicodeout.tcl
-lib/tk8.4/demos/vscale.tcl
-lib/tk8.4/demos/widget
-lib/tk8.4/dialog.tcl
-lib/tk8.4/entry.tcl
-lib/tk8.4/focus.tcl
-lib/tk8.4/images/README
-lib/tk8.4/images/logo.eps
-lib/tk8.4/images/logo100.gif
-lib/tk8.4/images/logo64.gif
-lib/tk8.4/images/logoLarge.gif
-lib/tk8.4/images/logoMed.gif
-lib/tk8.4/images/pwrdLogo.eps
-lib/tk8.4/images/pwrdLogo100.gif
-lib/tk8.4/images/pwrdLogo150.gif
-lib/tk8.4/images/pwrdLogo175.gif
-lib/tk8.4/images/pwrdLogo200.gif
-lib/tk8.4/images/pwrdLogo75.gif
-lib/tk8.4/images/tai-ku.gif
-lib/tk8.4/listbox.tcl
-lib/tk8.4/menu.tcl
-lib/tk8.4/mkpsenc.tcl
-lib/tk8.4/msgbox.tcl
-lib/tk8.4/msgs/cs.msg
-lib/tk8.4/msgs/de.msg
-lib/tk8.4/msgs/el.msg
-lib/tk8.4/msgs/en.msg
-lib/tk8.4/msgs/en_gb.msg
-lib/tk8.4/msgs/eo.msg
-lib/tk8.4/msgs/es.msg
-lib/tk8.4/msgs/fr.msg
-lib/tk8.4/msgs/hu.msg
-lib/tk8.4/msgs/it.msg
-lib/tk8.4/msgs/nl.msg
-lib/tk8.4/msgs/pl.msg
-lib/tk8.4/msgs/pt.msg
-lib/tk8.4/msgs/ru.msg
-lib/tk8.4/obsolete.tcl
-lib/tk8.4/optMenu.tcl
-lib/tk8.4/palette.tcl
-lib/tk8.4/panedwindow.tcl
-lib/tk8.4/pkgIndex.tcl
-lib/tk8.4/prolog.ps
-lib/tk8.4/safetk.tcl
-lib/tk8.4/scale.tcl
-lib/tk8.4/scrlbar.tcl
-lib/tk8.4/spinbox.tcl
-lib/tk8.4/tclIndex
-lib/tk8.4/tearoff.tcl
-lib/tk8.4/text.tcl
-lib/tk8.4/tk.tcl
-lib/tk8.4/tkAppInit.c
-lib/tk8.4/tkfbox.tcl
-lib/tk8.4/unsupported.tcl
-lib/tk8.4/xmfbox.tcl
+lib/libtk${SONUM}.a
+lib/libtk${SONUM}.so
+lib/libtk${SONUM}.so.1.0
+lib/libtkstub${SONUM}.a
+lib/tk${BASEVER}/bgerror.tcl
+lib/tk${BASEVER}/button.tcl
+lib/tk${BASEVER}/choosedir.tcl
+lib/tk${BASEVER}/clrpick.tcl
+lib/tk${BASEVER}/comdlg.tcl
+lib/tk${BASEVER}/console.tcl
+lib/tk${BASEVER}/demos/README
+lib/tk${BASEVER}/demos/anilabel.tcl
+lib/tk${BASEVER}/demos/aniwave.tcl
+lib/tk${BASEVER}/demos/arrow.tcl
+lib/tk${BASEVER}/demos/bind.tcl
+lib/tk${BASEVER}/demos/bitmap.tcl
+lib/tk${BASEVER}/demos/browse
+lib/tk${BASEVER}/demos/button.tcl
+lib/tk${BASEVER}/demos/check.tcl
+lib/tk${BASEVER}/demos/clrpick.tcl
+lib/tk${BASEVER}/demos/colors.tcl
+lib/tk${BASEVER}/demos/combo.tcl
+lib/tk${BASEVER}/demos/cscroll.tcl
+lib/tk${BASEVER}/demos/ctext.tcl
+lib/tk${BASEVER}/demos/dialog1.tcl
+lib/tk${BASEVER}/demos/dialog2.tcl
+lib/tk${BASEVER}/demos/en.msg
+lib/tk${BASEVER}/demos/entry1.tcl
+lib/tk${BASEVER}/demos/entry2.tcl
+lib/tk${BASEVER}/demos/entry3.tcl
+lib/tk${BASEVER}/demos/filebox.tcl
+lib/tk${BASEVER}/demos/floor.tcl
+lib/tk${BASEVER}/demos/form.tcl
+lib/tk${BASEVER}/demos/goldberg.tcl
+lib/tk${BASEVER}/demos/hello
+lib/tk${BASEVER}/demos/hscale.tcl
+lib/tk${BASEVER}/demos/icon.tcl
+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
+lib/tk${BASEVER}/demos/images/letters.xbm
+lib/tk${BASEVER}/demos/images/noletter.xbm
+lib/tk${BASEVER}/demos/images/pattern.xbm
+lib/tk${BASEVER}/demos/images/tcllogo.gif
+lib/tk${BASEVER}/demos/images/teapot.ppm
+lib/tk${BASEVER}/demos/items.tcl
+lib/tk${BASEVER}/demos/ixset
+lib/tk${BASEVER}/demos/knightstour.tcl
+lib/tk${BASEVER}/demos/label.tcl
+lib/tk${BASEVER}/demos/labelframe.tcl
+lib/tk${BASEVER}/demos/license.terms
+lib/tk${BASEVER}/demos/mclist.tcl
+lib/tk${BASEVER}/demos/menu.tcl
+lib/tk${BASEVER}/demos/menubu.tcl
+lib/tk${BASEVER}/demos/msgbox.tcl
+lib/tk${BASEVER}/demos/nl.msg
+lib/tk${BASEVER}/demos/paned1.tcl
+lib/tk${BASEVER}/demos/paned2.tcl
+lib/tk${BASEVER}/demos/pendulum.tcl
+lib/tk${BASEVER}/demos/plot.tcl
+lib/tk${BASEVER}/demos/puzzle.tcl
+lib/tk${BASEVER}/demos/radio.tcl
+lib/tk${BASEVER}/demos/rmt
+lib/tk${BASEVER}/demos/rolodex
+lib/tk${BASEVER}/demos/ruler.tcl
+lib/tk${BASEVER}/demos/sayings.tcl
+lib/tk${BASEVER}/demos/search.tcl
+lib/tk${BASEVER}/demos/spin.tcl
+lib/tk${BASEVER}/demos/states.tcl
+lib/tk${BASEVER}/demos/style.tcl
+lib/tk${BASEVER}/demos/tclIndex
+lib/tk${BASEVER}/demos/tcolor
+lib/tk${BASEVER}/demos/text.tcl
+lib/tk${BASEVER}/demos/textpeer.tcl
+lib/tk${BASEVER}/demos/timer
+lib/tk${BASEVER}/demos/toolbar.tcl
+lib/tk${BASEVER}/demos/tree.tcl
+lib/tk${BASEVER}/demos/ttkbut.tcl
+lib/tk${BASEVER}/demos/ttkmenu.tcl
+lib/tk${BASEVER}/demos/ttknote.tcl
+lib/tk${BASEVER}/demos/ttkpane.tcl
+lib/tk${BASEVER}/demos/ttkprogress.tcl
+lib/tk${BASEVER}/demos/ttkscale.tcl
+lib/tk${BASEVER}/demos/twind.tcl
+lib/tk${BASEVER}/demos/unicodeout.tcl
+lib/tk${BASEVER}/demos/vscale.tcl
+lib/tk${BASEVER}/demos/widget
+lib/tk${BASEVER}/dialog.tcl
+lib/tk${BASEVER}/entry.tcl
+lib/tk${BASEVER}/focus.tcl
+lib/tk${BASEVER}/images/README
+lib/tk${BASEVER}/images/logo.eps
+lib/tk${BASEVER}/images/logo100.gif
+lib/tk${BASEVER}/images/logo64.gif
+lib/tk${BASEVER}/images/logoLarge.gif
+lib/tk${BASEVER}/images/logoMed.gif
+lib/tk${BASEVER}/images/pwrdLogo.eps
+lib/tk${BASEVER}/images/pwrdLogo100.gif
+lib/tk${BASEVER}/images/pwrdLogo150.gif
+lib/tk${BASEVER}/images/pwrdLogo175.gif
+lib/tk${BASEVER}/images/pwrdLogo200.gif
+lib/tk${BASEVER}/images/pwrdLogo75.gif
+lib/tk${BASEVER}/images/tai-ku.gif
+lib/tk${BASEVER}/listbox.tcl
+lib/tk${BASEVER}/menu.tcl
+lib/tk${BASEVER}/mkpsenc.tcl
+lib/tk${BASEVER}/msgbox.tcl
+lib/tk${BASEVER}/msgs/cs.msg
+lib/tk${BASEVER}/msgs/da.msg
+lib/tk${BASEVER}/msgs/de.msg
+lib/tk${BASEVER}/msgs/el.msg
+lib/tk${BASEVER}/msgs/en.msg
+lib/tk${BASEVER}/msgs/en_gb.msg
+lib/tk${BASEVER}/msgs/eo.msg
+lib/tk${BASEVER}/msgs/es.msg
+lib/tk${BASEVER}/msgs/fr.msg
+lib/tk${BASEVER}/msgs/hu.msg
+lib/tk${BASEVER}/msgs/it.msg
+lib/tk${BASEVER}/msgs/nl.msg
+lib/tk${BASEVER}/msgs/pl.msg
+lib/tk${BASEVER}/msgs/pt.msg
+lib/tk${BASEVER}/msgs/ru.msg
+lib/tk${BASEVER}/msgs/sv.msg
+lib/tk${BASEVER}/obsolete.tcl
+lib/tk${BASEVER}/optMenu.tcl
+lib/tk${BASEVER}/palette.tcl
+lib/tk${BASEVER}/panedwindow.tcl
+lib/tk${BASEVER}/pkgIndex.tcl
+lib/tk${BASEVER}/safetk.tcl
+lib/tk${BASEVER}/scale.tcl
+lib/tk${BASEVER}/scrlbar.tcl
+lib/tk${BASEVER}/spinbox.tcl
+lib/tk${BASEVER}/tclIndex
+lib/tk${BASEVER}/tearoff.tcl
+lib/tk${BASEVER}/text.tcl
+lib/tk${BASEVER}/tk.tcl
+lib/tk${BASEVER}/tkAppInit.c
+lib/tk${BASEVER}/tkfbox.tcl
+lib/tk${BASEVER}/ttk/altTheme.tcl
+lib/tk${BASEVER}/ttk/aquaTheme.tcl
+lib/tk${BASEVER}/ttk/button.tcl
+lib/tk${BASEVER}/ttk/clamTheme.tcl
+lib/tk${BASEVER}/ttk/classicTheme.tcl
+lib/tk${BASEVER}/ttk/combobox.tcl
+lib/tk${BASEVER}/ttk/cursors.tcl
+lib/tk${BASEVER}/ttk/defaults.tcl
+lib/tk${BASEVER}/ttk/entry.tcl
+lib/tk${BASEVER}/ttk/fonts.tcl
+lib/tk${BASEVER}/ttk/menubutton.tcl
+lib/tk${BASEVER}/ttk/notebook.tcl
+lib/tk${BASEVER}/ttk/panedwindow.tcl
+lib/tk${BASEVER}/ttk/progress.tcl
+lib/tk${BASEVER}/ttk/scale.tcl
+lib/tk${BASEVER}/ttk/scrollbar.tcl
+lib/tk${BASEVER}/ttk/sizegrip.tcl
+lib/tk${BASEVER}/ttk/spinbox.tcl
+lib/tk${BASEVER}/ttk/treeview.tcl
+lib/tk${BASEVER}/ttk/ttk.tcl
+lib/tk${BASEVER}/ttk/utils.tcl
+lib/tk${BASEVER}/ttk/vistaTheme.tcl
+lib/tk${BASEVER}/ttk/winTheme.tcl
+lib/tk${BASEVER}/ttk/xpTheme.tcl
+lib/tk${BASEVER}/unsupported.tcl
+lib/tk${BASEVER}/xmfbox.tcl
 lib/tkConfig.sh
 man/man1/wish.1
 man/man3/Tk_3DBorderColor.3
@@ -305,6 +353,7 @@ man/man3/Tk_GetScrollInfo.3
 man/man3/Tk_GetScrollInfoObj.3
 man/man3/Tk_GetSelection.3
 man/man3/Tk_GetUid.3
+man/man3/Tk_GetUserInactiveTime.3
 man/man3/Tk_GetVRootGeometry.3
 man/man3/Tk_GetVisual.3
 man/man3/Tk_Grab.3
@@ -314,6 +363,7 @@ man/man3/Tk_Height.3
 man/man3/Tk_IdToWindow.3
 man/man3/Tk_ImageChanged.3
 man/man3/Tk_Init.3
+man/man3/Tk_InitConsoleChannels.3
 man/man3/Tk_InitImageArgs.3
 man/man3/Tk_InitOptions.3
 man/man3/Tk_InitStubs.3
@@ -322,6 +372,7 @@ man/man3/Tk_InternalBorderBottom.3
 man/man3/Tk_InternalBorderLeft.3
 man/man3/Tk_InternalBorderRight.3
 man/man3/Tk_InternalBorderTop.3
+man/man3/Tk_Interp.3
 man/man3/Tk_IntersectTextLayout.3
 man/man3/Tk_IsContainer.3
 man/man3/Tk_IsEmbedded.3
@@ -367,10 +418,12 @@ man/man3/Tk_PhotoPutZoomedBlock.3
 man/man3/Tk_PhotoSetSize.3
 man/man3/Tk_PointToChar.3
 man/man3/Tk_PostscriptFontName.3
+man/man3/Tk_PreserveColormap.3
 man/man3/Tk_QueueWindowEvent.3
 man/man3/Tk_RedrawImage.3
 man/man3/Tk_ReqHeight.3
 man/man3/Tk_ReqWidth.3
+man/man3/Tk_ResetUserInactiveTime.3
 man/man3/Tk_ResizeWindow.3
 man/man3/Tk_RestackWindow.3
 man/man3/Tk_RestoreSavedOptions.3
@@ -413,6 +466,24 @@ man/man3/Tk_Width.3
 man/man3/Tk_WindowId.3
 man/man3/Tk_X.3
 man/man3/Tk_Y.3
+man/man3/Ttk_AddPadding.3
+man/man3/Ttk_BoxContains.3
+man/man3/Ttk_CreateTheme.3
+man/man3/Ttk_ExpandBox.3
+man/man3/Ttk_GetBorderFromObj.3
+man/man3/Ttk_GetCurrentTheme.3
+man/man3/Ttk_GetDefaultTheme.3
+man/man3/Ttk_GetPaddingFromObj.3
+man/man3/Ttk_GetStickyFromObj.3
+man/man3/Ttk_GetTheme.3
+man/man3/Ttk_MakeBox.3
+man/man3/Ttk_MakePadding.3
+man/man3/Ttk_PackBox.3
+man/man3/Ttk_PadBox.3
+man/man3/Ttk_PlaceBox.3
+man/man3/Ttk_RelievePadding.3
+man/man3/Ttk_StickBox.3
+man/man3/Ttk_UniformPadding.3
 man/mann/bell.n
 man/mann/bind.n
 man/mann/bindtags.n
@@ -481,5 +552,28 @@ man/mann/tkerror.n
 man/mann/tkvars.n
 man/mann/tkwait.n
 man/mann/toplevel.n
+man/mann/ttk::button.n
+man/mann/ttk::checkbutton.n
+man/mann/ttk::combobox.n
+man/mann/ttk::entry.n
+man/mann/ttk::frame.n
+man/mann/ttk::intro.n
+man/mann/ttk::label.n
+man/mann/ttk::labelframe.n
+man/mann/ttk::menubutton.n
+man/mann/ttk::notebook.n
+man/mann/ttk::panedwindow.n
+man/mann/ttk::progressbar.n
+man/mann/ttk::radiobutton.n
+man/mann/ttk::scale.n
+man/mann/ttk::scrollbar.n
+man/mann/ttk::separator.n
+man/mann/ttk::sizegrip.n
+man/mann/ttk::spinbox.n
+man/mann/ttk::style.n
+man/mann/ttk::treeview.n
+man/mann/ttk::widget.n
+man/mann/ttk_image.n
+man/mann/ttk_vsapi.n
 man/mann/winfo.n
 man/mann/wm.n
diff --git a/x11/tk/buildlink3.mk b/x11/tk/buildlink3.mk
index 17a438ae57c..c4e13b690ed 100644
--- a/x11/tk/buildlink3.mk
+++ b/x11/tk/buildlink3.mk
@@ -1,21 +1,21 @@
-# $NetBSD: buildlink3.mk,v 1.26 2012/03/21 15:32:28 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.27 2012/08/21 21:32:34 marino Exp $
 
 BUILDLINK_TREE+=	tk
 
 .if !defined(TK_BUILDLINK3_MK)
 TK_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.tk+=	tk>=8.4.12nb1
-BUILDLINK_ABI_DEPENDS.tk+=	tk>=8.4.12nb1
+BUILDLINK_API_DEPENDS.tk+=	tk>=8.5.7
+BUILDLINK_ABI_DEPENDS.tk+=	tk>=8.5.7
 BUILDLINK_PKGSRCDIR.tk?=	../../x11/tk
 
 BUILDLINK_FILES.tk+=	bin/wish*
 #
-# Make "-ltk" and "-ltk8.4" resolve into "-ltk84", so that we don't
+# Make "-ltk" and "-ltk8.5" resolve into "-ltk85", so that we don't
 # need to patch so many Makefiles.
 #
-BUILDLINK_TRANSFORM+=	l:tk:tk84
-BUILDLINK_TRANSFORM+=	l:tk8.4:tk84
+BUILDLINK_TRANSFORM+=	l:tk:tk85
+BUILDLINK_TRANSFORM+=	l:tk8.5:tk85
 
 TKCONFIG_SH?=	${BUILDLINK_PREFIX.tk}/lib/tkConfig.sh
 
diff --git a/x11/tk/distinfo b/x11/tk/distinfo
index 82863918e7b..03882772e71 100644
--- a/x11/tk/distinfo
+++ b/x11/tk/distinfo
@@ -1,10 +1,7 @@
-$NetBSD: distinfo,v 1.34 2008/08/06 04:09:12 dsainty Exp $
+$NetBSD: distinfo,v 1.35 2012/08/21 21:32:34 marino Exp $
 
-SHA1 (tk8.4.18-src.tar.gz) = c1032f3cacd40406065fc1f46ecd217f50329273
-RMD160 (tk8.4.18-src.tar.gz) = 9c01ba85575a230231793a9885457c98046e41bb
-Size (tk8.4.18-src.tar.gz) = 3363853 bytes
-SHA1 (patch-aa) = b729957a24ce2fb6f972bbb19af27bd7d41f1846
-SHA1 (patch-ab) = a5b2a508a114b5f4d033251231b396ed68f22995
-SHA1 (patch-ac) = 5ded83db659d8918710b4b96126d20bed9ce11b8
-SHA1 (patch-ad) = 14ad16e840a825e987721f23c6308c4a011dbe01
-SHA1 (patch-ae) = 7901a53b8f2742898f837d4587be03ef66912af4
+SHA1 (tk8.5.12-src.tar.gz) = 292a01a39e9378d2455e4492f39500baeb6b63db
+RMD160 (tk8.5.12-src.tar.gz) = fc864df9f1e1ebd4b4375cc46572834095e77372
+Size (tk8.5.12-src.tar.gz) = 3826062 bytes
+SHA1 (patch-unix_Makefile.in) = 0e1f8a8c20c426a042ab1c061cc6031283abe1d5
+SHA1 (patch-unix_configure) = 1ffe2b4d08b06dd6b67aaaeab412c10b067b4b3f
diff --git a/x11/tk/patches/patch-aa b/x11/tk/patches/patch-aa
deleted file mode 100644
index 626f015c1e3..00000000000
--- a/x11/tk/patches/patch-aa
+++ /dev/null
@@ -1,107 +0,0 @@
-$NetBSD: patch-aa,v 1.19 2007/10/13 11:41:33 adam Exp $
-
---- unix/Makefile.in.orig	2007-09-21 19:04:18.000000000 +0200
-+++ unix/Makefile.in
-@@ -94,7 +94,7 @@ HTML_INSTALL_DIR	= $(INSTALL_ROOT)$(HTML
- # The directory containing the Tcl sources and headers appropriate
- # for this version of Tk ("srcdir" will be replaced or has already
- # been replaced by the configure script):
--TCL_GENERIC_DIR		= @TCL_SRC_DIR@/generic
-+TCL_GENERIC_DIR		= $(TCL_BIN_DIR)/../include/tcl/generic
- 
- # The directory containing the Tcl library archive file appropriate
- # for this version of Tk:
-@@ -210,8 +210,8 @@ TCL_EXE			= @TCLSH_PROG@
- INSTALL_STRIP_PROGRAM   = -s
- INSTALL_STRIP_LIBRARY   = -S -S
- 
--INSTALL			= @srcdir@/install-sh -c
--INSTALL_PROGRAM		= ${INSTALL}
-+INSTALL			= ${LIBTOOL} --mode=install @srcdir@/install-sh -c
-+INSTALL_PROGRAM		= ${INSTALL} -s
- INSTALL_LIBRARY		= ${INSTALL}
- INSTALL_DATA		= ${INSTALL} -m 644
- 
-@@ -234,6 +234,7 @@ TK_STUB_LIB_FLAG	= @TK_STUB_LIB_FLAG@
- #TK_STUB_LIB_FLAG	= -ltkstub
- 
- TK_LIB_FILE		= @TK_LIB_FILE@
-+TK_LA_FILE		= ${TK_LIB_FILE:@SHLIB_SUFFIX@=.la}
- #TK_LIB_FILE		= libtk.a
- 
- # Generic lib name used in rules that apply to tcl and tk
-@@ -263,7 +264,7 @@ WISH_LIBS = $(TCL_LIB_SPEC) @LIBS@ $(X11
- # these definitions by hand.
- 
- STLIB_LD		= @STLIB_LD@
--SHLIB_LD		= @SHLIB_LD@
-+SHLIB_LD		= ${LIBTOOL} --mode=link @CC@ -rpath ${PREFIX}/lib
- SHLIB_LD_LIBS		= @SHLIB_LD_LIBS@
- TK_SHLIB_LD_EXTRAS	= @TK_SHLIB_LD_EXTRAS@
- 
-@@ -310,7 +311,8 @@ XLIB_DIR		= $(TOP_DIR)/xlib
- # should be compressed and linked with softlinks
- MAN_FLAGS               = @MAN_FLAGS@
- 
--CC			= @CC@
-+CC			= ${LIBTOOL} --mode=compile @CC@
-+LD			= ${LIBTOOL} --mode=link @CC@ -Wl,-R${PREFIX}/lib -Wl,-R${X11BASE}/lib
- 
- CC_SWITCHES_NO_STUBS = ${CFLAGS} ${CFLAGS_WARNING} ${SHLIB_CFLAGS} \
- -I${UNIX_DIR} -I${GENERIC_DIR} -I${BMAP_DIR} -I${TCL_GENERIC_DIR} \
-@@ -482,7 +484,7 @@ DEMOPROGS = browse hello ixset rmt rolod
- 
- all: binaries libraries doc
- 
--binaries: ${LIB_FILE} ${STUB_LIB_FILE} wish
-+binaries: ${TK_LA_FILE} ${STUB_LIB_FILE} wish
- 
- libraries:
- 
-@@ -494,7 +496,7 @@ doc: $(TOP_DIR)/doc/man.macros
- 
- # The following target is configured by autoconf to generate either
- # a shared library or non-shared library for Tk.
--${LIB_FILE}: ${OBJS} ${STUB_LIB_FILE} @LIB_RSRC_FILE@
-+${TK_LA_FILE}: ${OBJS} ${STUB_LIB_FILE} @LIB_RSRC_FILE@
- 	rm -f $@
- 	@MAKE_LIB@
- 
-@@ -523,8 +525,8 @@ tkLibObjs:
- objs: ${OBJS}
- 
- 
--wish: $(WISH_OBJS) $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) @APP_RSRC_FILE@
--	${CC} ${CFLAGS} ${LDFLAGS} $(WISH_OBJS) @TK_BUILD_LIB_SPEC@ \
-+wish: $(WISH_OBJS) $(TK_LA_FILE) $(TK_STUB_LIB_FILE) @APP_RSRC_FILE@
-+	${LD} ${CFLAGS} ${LDFLAGS} $(WISH_OBJS) @TK_BUILD_LIB_SPEC@ \
- 		$(WISH_LIBS) $(CC_SEARCH_FLAGS) -o wish
- 
- # Resetting the LIB_RUNTIME_DIR below is required so that
-@@ -537,7 +539,7 @@ tktest: $(TKTEST_OBJS) $(TK_LIB_FILE)
- 	$(MAKE) tktest-real LIB_RUNTIME_DIR=`pwd`:$(TCL_BIN_DIR)
- 
- tktest-real:
--	${CC} ${CFLAGS} ${LDFLAGS} $(TKTEST_OBJS) @TK_BUILD_LIB_SPEC@ \
-+	${LD} ${CFLAGS} ${LDFLAGS} $(TKTEST_OBJS) @TK_BUILD_LIB_SPEC@ \
- 		$(WISH_LIBS) $(CC_SEARCH_FLAGS) -o tktest
- 
- # FIXME: This xttest rule seems to be broken in a number of ways.
-@@ -545,7 +547,7 @@ tktest-real:
- # lib location logic from tktest, and it is not clear where this
- # test.o object file comes from.
- xttest: test.o tkTest.o tkSquare.o $(TK_LIB_FILE)
--	${CC} ${CFLAGS} ${LDFLAGS} test.o tkTest.o tkSquare.o \
-+	${LD} ${CFLAGS} ${LDFLAGS} test.o tkTest.o tkSquare.o \
- 		@TK_BUILD_LIB_SPEC@ \
- 		$(WISH_LIBS) $(LD_SEARCH_FLAGS) -lXt -o xttest
- 
-@@ -615,7 +617,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) $(TK_BUILD_EXP_FILE) wish
-+install-binaries: $(TK_LA_FILE) $(TK_STUB_LIB_FILE) $(TK_BUILD_EXP_FILE) wish
- 	@for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) $(PKG_INSTALL_DIR); \
- 	    do \
- 		if [ ! -d $$i ] ; then \
diff --git a/x11/tk/patches/patch-ab b/x11/tk/patches/patch-ab
deleted file mode 100644
index 586a12d98b9..00000000000
--- a/x11/tk/patches/patch-ab
+++ /dev/null
@@ -1,139 +0,0 @@
-$NetBSD: patch-ab,v 1.29 2008/07/20 23:35:20 dbj Exp $
-
---- unix/configure.orig	2007-09-21 19:04:18.000000000 +0200
-+++ unix/configure
-@@ -2062,12 +2062,13 @@ fi
-     # Step 3: set configuration options based on system name and version.
- 
-     do64bit_ok=no
-+    RPATH_FLAG=""
-     LDFLAGS_ORIG="$LDFLAGS"
-     TCL_EXPORT_FILE_SUFFIX=""
-     UNSHARED_LIB_SUFFIX=""
-     TCL_TRIM_DOTS='`echo ${VERSION} | tr -d .`'
-     ECHO_VERSION='`echo ${VERSION}`'
--    TCL_LIB_VERSIONS_OK=ok
-+    TCL_LIB_VERSIONS_OK=nodots
-     CFLAGS_DEBUG=-g
-     CFLAGS_OPTIMIZE=-O
-     if test "$GCC" = "yes" ; then
-@@ -2794,7 +2795,6 @@ if eval "test \"`echo '$ac_cv_header_'$a
-   
- 		# NetBSD/SPARC needs -fPIC, -fpic will not do.
- 		SHLIB_CFLAGS="-fPIC"
--		SHLIB_LD="ld -Bshareable -x"
- 		SHLIB_LD_LIBS='${LIBS}'
- 		SHLIB_SUFFIX=".so"
- 		DL_OBJS="tclLoadDl.o"
-@@ -2829,6 +2829,9 @@ rm -f conftest*
- fi
- 
- echo "$ac_t""$tcl_cv_ld_elf" 1>&6
-+		SHLIB_LD='${TCL_CC} -shared -Wl,-x'
-+		RPATH_FLAG='-Wl,-R'
-+		LD_SEARCH_FLAGS='-Wl,-R${LIB_RUNTIME_DIR}'
- 		if test $tcl_cv_ld_elf = yes; then
- 		    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
- 		else
-@@ -2926,12 +2929,13 @@ echo "$ac_t""$tcl_cv_ld_elf" 1>&6
- 	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
- 	    TCL_LIB_VERSIONS_OK=nodots
- 	    ;;
--	FreeBSD-*)
-+	FreeBSD-*|DragonFly-*)
- 	    # FreeBSD 3.* and greater have ELF.
- 	    SHLIB_CFLAGS="-fPIC"
- 	    SHLIB_LD="ld -Bshareable -x"
- 	    SHLIB_LD_LIBS='${LIBS}'
- 	    SHLIB_SUFFIX=".so"
-+	    RPATH_FLAG='-Wl,-R'
- 	    DL_OBJS="tclLoadDl.o"
- 	    DL_LIBS=""
- 	    LDFLAGS="$LDFLAGS -export-dynamic"
-@@ -3768,7 +3772,7 @@ fi
- 		    ;;
- 		IRIX*)
- 		    ;;
--		NetBSD-*|FreeBSD-*|OpenBSD-*)
-+		NetBSD-*|FreeBSD-*|OpenBSD-*|DragonFly-*)
- 		    ;;
- 		Darwin-*)
- 		    ;;
-@@ -3786,16 +3790,16 @@ fi
-     fi
- 
-     if test "$SHARED_LIB_SUFFIX" = "" ; then
--	SHARED_LIB_SUFFIX='${VERSION}\$\{DBGX\}${SHLIB_SUFFIX}'
-+	SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}${SHLIB_SUFFIX}'
-     fi
-     if test "$UNSHARED_LIB_SUFFIX" = "" ; then
--	UNSHARED_LIB_SUFFIX='${VERSION}\$\{DBGX\}.a'
-+	UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
-     fi
- 
-     if test "${SHARED_BUILD}" = "1" && test "${SHLIB_SUFFIX}" != "" ; then
-         LIB_SUFFIX=${SHARED_LIB_SUFFIX}
--        MAKE_LIB='${SHLIB_LD} -o $@ ${OBJS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS}'
--        INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) $(LIB_INSTALL_DIR)/$(LIB_FILE)'
-+        MAKE_LIB='${SHLIB_LD} -o $@ ${OBJS:.o=.lo} ${LDFLAGS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS} -version-info 1:0'
-+        INSTALL_LIB='$(INSTALL_LIBRARY) $(TK_LA_FILE) $(LIB_INSTALL_DIR)/$(LIB_FILE)'
-     else
-         LIB_SUFFIX=${UNSHARED_LIB_SUFFIX}
- 
-@@ -5346,7 +5350,11 @@ echo "configure:5344: checking for X11 l
- 	for i in $dirs ; do
- 	    if test -r $i/libX11.a -o -r $i/libX11.so -o -r $i/libX11.sl; then
- 		echo "$ac_t""$i" 1>&6
--		XLIBSW="-L$i -lX11"
-+		if test "${RPATH_FLAG}" != ""; then
-+		    XLIBSW="-L$i ${RPATH_FLAG}$i -lX11"
-+		else
-+		    XLIBSW="-L$i -lX11"
-+		fi
- 		x_libraries="$i"
- 		break
- 	    fi
-@@ -5355,7 +5363,11 @@ echo "configure:5344: checking for X11 l
- 	if test "$x_libraries" = ""; then
- 	    XLIBSW=-lX11
- 	else
--	    XLIBSW="-L$x_libraries -lX11"
-+	    if test "${RPATH_FLAG}" != ""; then
-+		XLIBSW="-L$x_libraries ${RPATH_FLAG}$x_libraries -lX11"
-+	    else
-+		XLIBSW="-L$x_libraries -lX11"
-+	    fi
- 	fi
-     fi
-     if test "$XLIBSW" = nope ; then
-@@ -5427,6 +5439,10 @@ if test "x${x_libraries}" != "x"; then
- fi
- if test "${TCL_LD_SEARCH_FLAGS}" = '-L${LIB_RUNTIME_DIR}'; then
-     LIB_RUNTIME_DIR=`echo ${LIB_RUNTIME_DIR} |sed -e 's/:/ -L/g'`
-+elif test "${TCL_LD_SEARCH_FLAGS}" = '-R${LIB_RUNTIME_DIR}'; then
-+    LIB_RUNTIME_DIR=`echo ${LIB_RUNTIME_DIR} |sed -e 's/:/ -R/g'`
-+elif test "${TCL_LD_SEARCH_FLAGS}" = '-Wl,-R${LIB_RUNTIME_DIR}'; then
-+    LIB_RUNTIME_DIR=`echo ${LIB_RUNTIME_DIR} |sed -e 's/:/ -Wl,-R/g'`
- fi
- 
- # The statement below is very tricky!  It actually *evaluates* the
-@@ -5965,11 +5981,18 @@ else
-     if test "$SHARED_BUILD" = "0" || test "$TCL_NEEDS_EXP_FILE" = "0"; then
-         if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
-             eval TK_LIB_FLAG="-ltk${VERSION}\${TK_DBGX}"
-+	    eval TK_BUILD_LIB_SPEC="libtk${VERSION}\${TK_DBGX}.la"
-         else
-             eval TK_LIB_FLAG="-ltk`echo ${VERSION} | tr -d .`\${TK_DBGX}"
-+	    eval TK_BUILD_LIB_SPEC="libtk`echo ${VERSION} | tr -d .`\${TK_DBGX}.la"
-         fi
--        TK_BUILD_LIB_SPEC="-L`pwd` ${TK_LIB_FLAG}"
-         TK_LIB_SPEC="-L${libdir} ${TK_LIB_FLAG}"
-+	if test "${RPATH_FLAG}" != ""; then
-+	    TK_LIB_SPEC_RPATH="${RPATH_FLAG}${exec_prefix}/lib"
-+	else
-+	    TK_LIB_SPEC_RPATH=""
-+	fi
-+	TK_LIB_SPEC="-L${exec_prefix}/lib ${TK_LIB_SPEC_RPATH} ${TK_LIB_FLAG}"
-     else
-         TK_BUILD_EXP_FILE="lib.exp"
-         eval "TK_EXP_FILE=libtk${TCL_EXPORT_FILE_SUFFIX}"
diff --git a/x11/tk/patches/patch-ac b/x11/tk/patches/patch-ac
deleted file mode 100644
index 95f080675af..00000000000
--- a/x11/tk/patches/patch-ac
+++ /dev/null
@@ -1,116 +0,0 @@
-$NetBSD: patch-ac,v 1.19 2008/07/20 23:35:20 dbj Exp $
-
---- unix/tcl.m4.orig	2007-09-21 10:04:18.000000000 -0700
-+++ unix/tcl.m4	2008-04-16 15:30:21.000000000 -0700
-@@ -1033,6 +1033,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
-     # Step 3: set configuration options based on system name and version.
- 
-     do64bit_ok=no
-+    TCL_LIB_SPEC_RPATH=""
-     LDFLAGS_ORIG="$LDFLAGS"
-     TCL_EXPORT_FILE_SUFFIX=""
-     UNSHARED_LIB_SUFFIX=""
-@@ -1284,6 +1285,9 @@ dnl AC_CHECK_TOOL(AR, ar)
- 	    DL_LIBS=""
- 	    CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
- 	    LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
-+	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
-+	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
-+	    TCL_LIB_VERSIONS_OK=nodots
- 	    ;;
- 	IRIX-6.*)
- 	    SHLIB_CFLAGS=""
-@@ -1309,6 +1313,9 @@ dnl AC_CHECK_TOOL(AR, ar)
- 		esac
- 		LDFLAGS="$LDFLAGS -n32"
- 	    fi
-+	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
-+	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
-+	    TCL_LIB_VERSIONS_OK=nodots
- 	    ;;
- 	IRIX64-6.*)
- 	    SHLIB_CFLAGS=""
-@@ -1332,6 +1339,9 @@ dnl AC_CHECK_TOOL(AR, ar)
- 	            LDFLAGS="$LDFLAGS -64"
- 	        fi
- 	    fi
-+	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
-+	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
-+	    TCL_LIB_VERSIONS_OK=nodots
- 	    ;;
- 	Linux*)
- 	    SHLIB_CFLAGS="-fPIC"
-@@ -1388,6 +1398,9 @@ dnl AC_CHECK_TOOL(AR, ar)
- 	    # XIM peeking works under XFree86.
- 	    AC_DEFINE(PEEK_XCLOSEIM)
- 
-+	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
-+	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
-+	    TCL_LIB_VERSIONS_OK=nodots
- 	    ;;
- 	GNU*)
- 	    SHLIB_CFLAGS="-fPIC"
-@@ -1447,23 +1460,27 @@ dnl AC_CHECK_TOOL(AR, ar)
- 	    LD_SEARCH_FLAGS=""
- 	    ;;
- 	NetBSD-*|FreeBSD-[[1-2]].*)
-+	    if test "X${COMPILER_OPTIMIZATION_BUG}" = "XYES"; then
-+		CFLAGS_OPTIMIZE=-O0
-+	    fi
- 	    # Not available on all versions:  check for include file.
- 	    AC_CHECK_HEADER(dlfcn.h, [
- 		# NetBSD/SPARC needs -fPIC, -fpic will not do.
- 		SHLIB_CFLAGS="-fPIC"
--		SHLIB_LD="ld -Bshareable -x"
- 		SHLIB_LD_LIBS='${LIBS}'
- 		SHLIB_SUFFIX=".so"
- 		DL_OBJS="tclLoadDl.o"
- 		DL_LIBS=""
- 		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
--		LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
- 		AC_CACHE_CHECK([for ELF], tcl_cv_ld_elf, [
- 		    AC_EGREP_CPP(yes, [
- #ifdef __ELF__
- 	yes
- #endif
- 		    ], tcl_cv_ld_elf=yes, tcl_cv_ld_elf=no)])
-+		SHLIB_LD='${TCL_CC} -shared -Wl,-x'
-+		LD_SEARCH_FLAGS='-Wl,-R${LIB_RUNTIME_DIR}'
-+		TCL_LIB_SPEC_RPATH="-Wl,-R${exec_prefix}/lib"
- 		if test $tcl_cv_ld_elf = yes; then
- 		    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
- 		else
-@@ -1933,6 +1950,9 @@ dnl AC_CHECK_TOOL(AR, ar)
- 		CC_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}'
- 		LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}'
- 	    fi
-+	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
-+	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
-+	    TCL_LIB_VERSIONS_OK=nodots
- 	    ;;
- 	ULTRIX-4.*)
- 	    SHLIB_CFLAGS="-G 0"
-@@ -2117,8 +2137,8 @@ dnl # preprocessing tests use only CPPFL
- 
-     if test "${SHARED_BUILD}" = "1" && test "${SHLIB_SUFFIX}" != "" ; then
-         LIB_SUFFIX=${SHARED_LIB_SUFFIX}
--        MAKE_LIB='${SHLIB_LD} -o [$]@ ${OBJS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS}'
--        INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) $(LIB_INSTALL_DIR)/$(LIB_FILE)'
-+        MAKE_LIB='${SHLIB_LD} -o ${@:C/\.so.*/.la/} ${OBJS:.o=.lo} ${LDFLAGS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS} -version-info 1:0'
-+        INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE:C/\.so.*/.la/) $(LIB_INSTALL_DIR)/$(LIB_FILE)'
-     else
-         LIB_SUFFIX=${UNSHARED_LIB_SUFFIX}
- 
-@@ -2148,10 +2168,10 @@ dnl        esac
- 
-     # Stub lib does not depend on shared/static configuration
-     if test "$RANLIB" = "" ; then
--        MAKE_STUB_LIB='${STLIB_LD} [$]@ ${STUB_LIB_OBJS}'
-+        MAKE_STUB_LIB='${STLIB_LD} -o [$]@ ${STUB_LIB_OBJS}'
-         INSTALL_STUB_LIB='$(INSTALL_LIBRARY) $(STUB_LIB_FILE) $(LIB_INSTALL_DIR)/$(STUB_LIB_FILE)'
-     else
--        MAKE_STUB_LIB='${STLIB_LD} [$]@ ${STUB_LIB_OBJS} ; ${RANLIB} [$]@'
-+        MAKE_STUB_LIB='${STLIB_LD} -o [$]@ ${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))'
-     fi
- 
diff --git a/x11/tk/patches/patch-ad b/x11/tk/patches/patch-ad
deleted file mode 100644
index 82576e22f50..00000000000
--- a/x11/tk/patches/patch-ad
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-ad,v 1.12 2007/10/13 11:41:34 adam Exp $
-
---- unix/configure.in.orig	2007-09-21 19:04:18.000000000 +0200
-+++ unix/configure.in
-@@ -301,6 +301,10 @@ if test "x${x_libraries}" != "x"; then
- fi
- if test "${TCL_LD_SEARCH_FLAGS}" = '-L${LIB_RUNTIME_DIR}'; then
-     LIB_RUNTIME_DIR=`echo ${LIB_RUNTIME_DIR} |sed -e 's/:/ -L/g'`
-+elif test "${TCL_LD_SEARCH_FLAGS}" = '-R${LIB_RUNTIME_DIR}'; then
-+    LIB_RUNTIME_DIR=`echo ${LIB_RUNTIME_DIR} |sed -e 's/:/ -R/g'`
-+elif test "${TCL_LD_SEARCH_FLAGS}" = '-Wl,-R${LIB_RUNTIME_DIR}'; then
-+    LIB_RUNTIME_DIR=`echo ${LIB_RUNTIME_DIR} |sed -e 's/:/ -Wl,-R/g'`
- fi
- 
- # The statement below is very tricky!  It actually *evaluates* the
-@@ -480,11 +484,18 @@ else
-     if test "$SHARED_BUILD" = "0" || test "$TCL_NEEDS_EXP_FILE" = "0"; then
-         if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
-             eval TK_LIB_FLAG="-ltk${VERSION}\${TK_DBGX}"
-+	    eval TK_BUILD_LIB_SPEC="libtk${VERSION}\${TK_DBGX}.la"
-         else
-             eval TK_LIB_FLAG="-ltk`echo ${VERSION} | tr -d .`\${TK_DBGX}"
-+	    eval TK_BUILD_LIB_SPEC="libtk`echo ${VERSION} | tr -d .`\${TK_DBGX}.la"
-         fi
--        TK_BUILD_LIB_SPEC="-L`pwd` ${TK_LIB_FLAG}"
-         TK_LIB_SPEC="-L${libdir} ${TK_LIB_FLAG}"
-+	if test "${RPATH_FLAG}" != ""; then
-+	    TK_LIB_SPEC_RPATH="${RPATH_FLAG}${exec_prefix}/lib"
-+	else
-+	    TK_LIB_SPEC_RPATH=""
-+	fi
-+	TK_LIB_SPEC="-L${exec_prefix}/lib ${TK_LIB_SPEC_RPATH} ${TK_LIB_FLAG}"
-     else
-         TK_BUILD_EXP_FILE="lib.exp"
-         eval "TK_EXP_FILE=libtk${TCL_EXPORT_FILE_SUFFIX}"
diff --git a/x11/tk/patches/patch-ae b/x11/tk/patches/patch-ae
deleted file mode 100644
index 9c87115131a..00000000000
--- a/x11/tk/patches/patch-ae
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ae,v 1.4 2008/08/06 04:09:12 dsainty Exp $
-
-Tk uses X event numbers to index this array, as well as adding a few of its
-own, starting with "VirtualEvent" (Which is correctly set to LASTEvent,
-defined in include/X11/X.h).  In xproto-7.0.13, a new event "GenericEvent" was
-added - making the array broken for all of Tk's internal events.
-
-A cleaner fix, but a much bigger patch, is listed in the Tk bug tracker:
-
-http://sourceforge.net/tracker/index.php?func=detail&aid=2010422&group_id=12997&atid=112997
-
---- generic/tkBind.c.orig	2008-08-06 15:19:07.000000000 +1200
-+++ generic/tkBind.c	2008-08-06 15:21:30.000000000 +1200
-@@ -586,6 +586,9 @@
-    /* ColormapNotify */		COLORMAP,
-    /* ClientMessage */		0,
-    /* MappingNotify */		0,
-+#ifdef GenericEvent
-+   /* GenericEvent */		0, /* Introduced in xproto-7.0.13 */
-+#endif 
-    /* VirtualEvent */		VIRTUAL,
-    /* Activate */		ACTIVATE,	    
-    /* Deactivate */		ACTIVATE,
diff --git a/x11/tk/patches/patch-unix_Makefile.in b/x11/tk/patches/patch-unix_Makefile.in
new file mode 100644
index 00000000000..2699ebebfe5
--- /dev/null
+++ b/x11/tk/patches/patch-unix_Makefile.in
@@ -0,0 +1,120 @@
+$NetBSD: patch-unix_Makefile.in,v 1.1 2012/08/21 21:32:34 marino Exp $
+
+--- unix/Makefile.in.orig	2012-07-25 16:45:53.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@
+ 
+ #----------------------------------------------------------------
+ # 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
+ # The directory containing the Tcl sources and headers appropriate
+ # for this version of Tk ("srcdir" will be replaced or has already
+ # been replaced by the configure script):
+-TCL_GENERIC_DIR		= @TCL_SRC_DIR@/generic
++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@
+ #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 $(
+ 
+ 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
+ 	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:
+ # 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
+ 	    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)" && ln -sf $(LIB_FILE)$(SHLIB_VERSION) $(LIB_FILE)
++	@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)";\
+ 	    chmod 555 "$(DLL_INSTALL_DIR)/tk${MAJOR_VERSION}${MINOR_VERSION}.dll";\
+ 	fi
+ 	@echo "Installing ${WISH_EXE} as $(BIN_INSTALL_DIR)/wish$(VERSION)@EXEEXT@"
+ 	@$(INSTALL_PROGRAM) ${WISH_EXE} "$(BIN_INSTALL_DIR)/wish$(VERSION)@EXEEXT@"
++	@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
+ 	@if test "$(@TK_WINDOWINGSYSTEM@_XLIB_HDRS)" != ""; then \
+ 	    XLIB_INCLUDE_INSTALL_DIR="$(INCLUDE_INSTALL_DIR)/X11"; fi; \
+ 	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
+ 	    chmod +x $(SRC_DIR)/install-sh; \
+ 	    fi
+ 	@echo "Installing header files";
+-	@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 \
diff --git a/x11/tk/patches/patch-unix_configure b/x11/tk/patches/patch-unix_configure
new file mode 100644
index 00000000000..a98f50a328b
--- /dev/null
+++ b/x11/tk/patches/patch-unix_configure
@@ -0,0 +1,114 @@
+$NetBSD: patch-unix_configure,v 1.1 2012/08/21 21:32:34 marino Exp $
+
+--- unix/configure.orig	2012-07-25 16:45:53.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
+     if test "$GCC" = yes; then
+@@ -5930,7 +5930,7 @@ fi
+ 	    SHLIB_SUFFIX=".so"
+ 	    DL_OBJS="tclLoadDl.o"
+ 	    DL_LIBS=""
+-	    LDFLAGS="$LDFLAGS -export-dynamic"
++	    LDFLAGS=""
+ 	    if test $doRpath = yes; then
+ 
+ 		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
+@@ -5945,21 +5945,15 @@ fi
+ 	    	LDFLAGS="$LDFLAGS -pthread"
+ 
+ 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
++	    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=""
+@@ -5981,7 +5975,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-*)
+@@ -7190,7 +7184,7 @@ 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)"'
+ 
+ fi
+ 
+@@ -7224,7 +7218,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
+ 
+@@ -11383,11 +11377,7 @@ _ACEOF
+ else
+     # 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}"
+@@ -11422,11 +11412,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
+ 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
author	marino <marino@pkgsrc.org>	2012-08-21 21:32:34 +0000
committer	marino <marino@pkgsrc.org>	2012-08-21 21:32:34 +0000
commit	590f742ecddcf7d52cb13d4abe3e13af05747b55 (patch)
tree	d939eb2f686ee05c7dac76d241305d25f13adf37 /x11/tk
parent	5ff2dd799087bf20a2635167e201798deaab6261 (diff)
download	pkgsrc-590f742ecddcf7d52cb13d4abe3e13af05747b55.tar.gz