5 files changed, 83 insertions, 43 deletions

diff --git a/x11-toolkits/tk86/Makefile b/x11-toolkits/tk86/Makefile
index 09262b3474d4..9075888f55b5 100644
--- a/x11-toolkits/tk86/Makefile
+++ b/x11-toolkits/tk86/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	tk
-PORTVERSION=	8.5.a.5
-PORTREVISION=	5
+PORTVERSION=	8.5.a.6
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	tcl
@@ -36,7 +35,8 @@ SUB_FILES=	pkgIndex.tcl
 .if !defined(BUILDING_TK_THREADS)
 USE_TCL=	${SHORT_TK_VER}
 
-OPTIONS=	TK85_MAN "Install tk 8.5 manpages" off
+OPTIONS=	TK85_MAN "Install tk 8.5 manpages" off \
+		XFT "Use Xft fonts" on
 .else
 USE_TK=		${SHORT_TK_VER}
 PLIST=		${PKGDIR}/pkg-plist.threads
@@ -48,6 +48,13 @@ SUB_LIST+=	THREADS_SUFFIX="${THREADS_SUFFIX}"
 
 .include <bsd.port.pre.mk>
 
+.if !defined(WITHOUT_XFT)
+CONFIGURE_ARGS+=	--enable-xft
+LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/libXft
+.else
+CONFIGURE_ARGS+=	--disable-xft
+.endif
+
 .if defined(BUILDING_TK_THREADS)
 CONFIGURE_ARGS+=	--enable-threads --with-tcl=${LOCALBASE}/lib/tcl${TK_VER}${THREADS_SUFFIX}
 CONFIGURE_ENV+=		PTHREAD_LIBS="${PTHREAD_LIBS}" PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
@@ -60,7 +67,7 @@ CONFIGURE_ARGS+=	--disable-threads --with-tcl=${LOCALBASE}/lib/tcl${TK_VER} \
 
 SUB_LIST+=		TK_PROVIDE=""
 
-.if defined(NO_INSTALL_MANPAGES) || !defined(WITH_TK84_MAN)
+.if defined(NO_INSTALL_MANPAGES) || !defined(WITH_TK85_MAN)
 
 PLIST_SUB+=	INSTMAN='@comment '
 
@@ -85,7 +92,8 @@ MAN3=	3DBorder.3 AddOption.3 BindTable.3 CanvPsY.3 CanvTkwin.3 \
 	Name.3 NameOfImg.3 OwnSelect.3 ParseArgv.3 QWinEvent.3 Restack.3 \
 	RestrictEv.3 SetAppName.3 SetCaret.3 SetClass.3 SetClassProcs.3 \
 	SetGrid.3 SetOptions.3 SetVisual.3 StrictMotif.3 TextLayout.3 \
-	Tk_Init.3 Tk_Main.3 TkInitStubs.3 WindowId.3
+	Tk_Init.3 Tk_Main.3 TkInitStubs.3 WindowId.3 ttk_Geometry.3 \
+	ttk_Theme.3
 
 MANN=	bell.n bind.n bindtags.n bitmap.n button.n canvas.n checkbutton.n \
 	chooseColor.n chooseDirectory.n clipboard.n colors.n console.n \
@@ -95,7 +103,12 @@ MANN=	bell.n bind.n bindtags.n bitmap.n button.n canvas.n checkbutton.n \
 	message.n messageBox.n option.n optionMenu.n options.n pack-old.n \
 	pack.n panedwindow.n palette.n photo.n place.n popup.n radiobutton.n \
 	raise.n scale.n scrollbar.n selection.n send.n spinbox.n text.n tk.n \
-	tkerror.n tkvars.n tkwait.n toplevel.n winfo.n wm.n
+	tkerror.n tkvars.n tkwait.n toplevel.n winfo.n wm.n \
+	ttk_button.n ttk_checkbutton.n ttk_combobox.n ttk_entry.n ttk_frame.n \
+	ttk_image.n ttk_intro.n ttk_label.n ttk_labelframe.n ttk_menubutton.n \
+	ttk_notebook.n ttk_panedwindow.n ttk_progressbar.n ttk_radiobutton.n \
+	ttk_scrollbar.n ttk_separator.n ttk_sizegrip.n ttk_style.n \
+	ttk_treeview.n ttk_widget.n
 
 # MLINKS generated via  awk '/ln/ {print "\t" $2,$3,"\\"}' unix/mkLinks
 MLINKS=	3DBorder.3 Tk_Alloc3DBorderFromObj.3 \
@@ -408,6 +421,7 @@ post-configure:
 	${REINPLACE_CMD} \
 		-e 's|${WRKDIRPREFIX}${.CURDIR}|$${WRKDIRPREFIX}${TKBASE}|' \
 		${WRKSRC}/tkConfig.sh
+	${REINPLACE_CMD} -e 's|-Wl,--rpath -Wl,/usr/local/lib||g' ${WRKSRC}/Makefile
 
 .if defined(BUILDING_TK_THREADS)
 do-install:
diff --git a/x11-toolkits/tk86/distinfo b/x11-toolkits/tk86/distinfo
index a65b5f8d0ce6..af3d25bb0993 100644
--- a/x11-toolkits/tk86/distinfo
+++ b/x11-toolkits/tk86/distinfo
@@ -1,3 +1,3 @@
-MD5 (tk8.5a5-src.tar.gz) = c46f923384b18c2b5ff9dc931df9a47c
-SHA256 (tk8.5a5-src.tar.gz) = bd71a3799f2c1d149afb9bee6ebbcbae901462e86d0ed064bceab7de0fba4233
-SIZE (tk8.5a5-src.tar.gz) = 3262112
+MD5 (tk8.5a6-src.tar.gz) = 3903199e8c5ee921f747a5d59174ed68
+SHA256 (tk8.5a6-src.tar.gz) = 67f5022f31d7a8adea7d150caa5c7de56ea0051e287f67fcb15b82f7fd5b8fd6
+SIZE (tk8.5a6-src.tar.gz) = 3682249
diff --git a/x11-toolkits/tk86/files/patch-unix::Makefile.in b/x11-toolkits/tk86/files/patch-unix::Makefile.in
index f603f71bf0e6..c0dc5d89ca83 100644
--- a/x11-toolkits/tk86/files/patch-unix::Makefile.in
+++ b/x11-toolkits/tk86/files/patch-unix::Makefile.in
@@ -1,5 +1,5 @@
---- Makefile.in.orig	Mon Oct 23 15:45:33 2006
-+++ Makefile.in	Mon Mar 12 18:32:29 2007
+--- Makefile.in.orig	Thu Apr 26 23:02:27 2007
++++ Makefile.in	Sun Apr 29 22:30:54 2007
 @@ -64,6 +64,8 @@
  
  # Directory in which to install the include file tk.h:
@@ -36,7 +36,7 @@
  
  # Additional search flags needed to find the various shared libraries
  # at run-time.  The first symbol is for use when creating a binary
-@@ -489,6 +491,8 @@
+@@ -542,6 +544,8 @@
  	default.h ks_names.h tkPatch.h tk.h tkButton.h tkCanvas.h tkInt.h  \
  	tkPort.h tkScrollbar.h tkText.h
  
@@ -44,8 +44,8 @@
 +
  DEMOPROGS = browse hello ixset rmt rolodex square tcolor timer widget
  
- all: binaries libraries doc
-@@ -508,6 +512,12 @@
+ SHELL_ENV = \
+@@ -567,6 +571,12 @@
  ${LIB_FILE}: ${OBJS} ${STUB_LIB_FILE} @LIB_RSRC_FILE@
  	rm -f $@
  	@MAKE_LIB@
@@ -58,7 +58,7 @@
  
  ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
  	rm -f $@
-@@ -613,7 +623,7 @@
+@@ -666,7 +676,7 @@
  	gdb ./wish --command=gdb.run
  	rm gdb.run
  
@@ -67,7 +67,7 @@
  
  install: $(INSTALL_TARGETS)
  
-@@ -626,7 +636,8 @@
+@@ -679,7 +689,8 @@
  # some ranlibs write to current directory, and this might not always be
  # possible (e.g. if installing as root).
  
@@ -77,7 +77,7 @@
  	@for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) $(PKG_INSTALL_DIR); \
  	    do \
  	    if [ ! -d $$i ] ; then \
-@@ -659,10 +670,15 @@
+@@ -712,10 +723,15 @@
  	    $(INSTALL_DATA) $(TK_BUILD_EXP_FILE) \
  			$(LIB_INSTALL_DIR)/$(TK_EXP_FILE); \
  	    fi
@@ -95,15 +95,15 @@
  	@if test "$(STUB_LIB_FILE)" != "" ; then \
  	    echo "Installing $(STUB_LIB_FILE) to $(LIB_INSTALL_DIR)/"; \
  	    @INSTALL_STUB_LIB@ ; \
-@@ -673,6 +689,7 @@
+@@ -726,6 +742,7 @@
  	@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)/msgs $(SCRIPT_INSTALL_DIR)/ttk; \
  	    do \
-@@ -687,11 +704,14 @@
+@@ -740,11 +757,14 @@
  	    chmod +x $(SRC_DIR)/install-sh; \
  	    fi
  	@echo "Installing header files";
@@ -122,30 +122,28 @@
  	@list='$(@TK_WINDOWINGSYSTEM@_XLIB_HDRS)'; for i in $$list ; \
  	    do \
  	    $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR)/X11; \
-@@ -762,20 +782,13 @@
+@@ -822,20 +842,21 @@
  		else true; \
  		fi; \
  	    done;
--	@echo "Installing and cross-linking top-level (.1) docs";
--	@for i in $(TOP_DIR)/doc/*.1; do \
++
+ 	@echo "Installing and cross-linking top-level (.1) docs";
+ 	@for i in $(TOP_DIR)/doc/*.1; do \
 -	    $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i $(MAN1_INSTALL_DIR); \
--	done
--
--	@echo "Installing and cross-linking C API (.3) docs";
--	@for i in $(TOP_DIR)/doc/*.3; do \
++	    ${BSD_INSTALL_MAN} $$i $(MAN1_INSTALL_DIR); \
+ 	done
+ 
+ 	@echo "Installing and cross-linking C API (.3) docs";
+ 	@for i in $(TOP_DIR)/doc/*.3; do \
 -	    $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i $(MAN3_INSTALL_DIR); \
--	done
++	    ${BSD_INSTALL_MAN} $$i $(MAN3_INSTALL_DIR); \
+ 	done
  
--	@echo "Installing and cross-linking command (.n) docs";
--	@for i in $(TOP_DIR)/doc/*.n; do \
+ 	@echo "Installing and cross-linking command (.n) docs";
+ 	@for i in $(TOP_DIR)/doc/*.n; do \
+ 	    if [ "ttk_dialog.n" = `basename $$i` ] ; then continue ; fi ; \
 -	    $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i $(MANN_INSTALL_DIR); \
--	done
-+	@echo "Installing top-level (.1) docs";
-+	${BSD_INSTALL_MAN} $(TOP_DIR)/doc/*.1 $(MAN1_INSTALL_DIR)
-+	@echo "Installing C API (.3) docs";
-+	${BSD_INSTALL_MAN} $(TOP_DIR)/doc/*.3 $(MAN3_INSTALL_DIR)
-+	@echo "Installing command (.n) docs";
-+	${BSD_INSTALL_MAN} $(TOP_DIR)/doc/*.n $(MANN_INSTALL_DIR)
++	    ${BSD_INSTALL_MAN} $$i $(MANN_INSTALL_DIR); \
+ 	done
  
  # Optional target to install private headers
- install-private-headers: libraries
diff --git a/x11-toolkits/tk86/files/patch-unix::configure b/x11-toolkits/tk86/files/patch-unix::configure
index b63f23a7dbe1..c110a26b28b5 100644
--- a/x11-toolkits/tk86/files/patch-unix::configure
+++ b/x11-toolkits/tk86/files/patch-unix::configure
@@ -1,6 +1,6 @@
---- configure.orig	Mon Oct 23 15:45:33 2006
-+++ configure	Tue Jan 30 11:19:37 2007
-@@ -3530,6 +3530,7 @@
+--- configure.orig	Thu Apr 26 23:02:27 2007
++++ configure	Mon Apr 30 10:30:24 2007
+@@ -3535,6 +3535,7 @@
  # Threads support - this auto-enables if Tcl was compiled threaded
  #------------------------------------------------------------------------
  
@@ -8,7 +8,7 @@
  
      # Check whether --enable-threads or --disable-threads was given.
  if test "${enable_threads+set}" = set; then
-@@ -5447,25 +5448,26 @@
+@@ -5697,25 +5698,26 @@
  	FreeBSD-*)
  	    # FreeBSD 3.* and greater have ELF.
  	    SHLIB_CFLAGS="-fPIC"
diff --git a/x11-toolkits/tk86/pkg-plist b/x11-toolkits/tk86/pkg-plist
index 65f9d0476336..bb4270ab851d 100644
--- a/x11-toolkits/tk86/pkg-plist
+++ b/x11-toolkits/tk86/pkg-plist
@@ -108,6 +108,9 @@ lib/tk%%TK_VER%%/demos/tclIndex
 lib/tk%%TK_VER%%/demos/tcolor
 lib/tk%%TK_VER%%/demos/text.tcl
 lib/tk%%TK_VER%%/demos/timer
+lib/tk%%TK_VER%%/demos/ttk_demo.tcl
+lib/tk%%TK_VER%%/demos/ttk_iconlib.tcl
+lib/tk%%TK_VER%%/demos/ttk_repeater.tcl
 lib/tk%%TK_VER%%/demos/twind.tcl
 lib/tk%%TK_VER%%/demos/unicodeout.tcl
 lib/tk%%TK_VER%%/demos/vscale.tcl
@@ -139,7 +142,6 @@ lib/tk%%TK_VER%%/msgs/en.msg
 lib/tk%%TK_VER%%/msgs/en_gb.msg
 lib/tk%%TK_VER%%/msgs/eo.msg
 lib/tk%%TK_VER%%/msgs/es.msg
-lib/tk%%TK_VER%%/msgs/es_ES.msg
 lib/tk%%TK_VER%%/msgs/fr.msg
 lib/tk%%TK_VER%%/msgs/it.msg
 lib/tk%%TK_VER%%/msgs/nl.msg
@@ -164,10 +166,36 @@ lib/tk%%TK_VER%%/tk.tcl
 lib/tk%%TK_VER%%/tkAppInit.c
 lib/tk%%TK_VER%%/tkConfig.sh
 lib/tk%%TK_VER%%/tkfbox.tcl
+lib/tk%%TK_VER%%/ttk/altTheme.tcl
+lib/tk%%TK_VER%%/ttk/aquaTheme.tcl
+lib/tk%%TK_VER%%/ttk/button.tcl
+lib/tk%%TK_VER%%/ttk/clamTheme.tcl
+lib/tk%%TK_VER%%/ttk/classicTheme.tcl
+lib/tk%%TK_VER%%/ttk/combobox.tcl
+lib/tk%%TK_VER%%/ttk/cursors.tcl
+lib/tk%%TK_VER%%/ttk/defaults.tcl
+lib/tk%%TK_VER%%/ttk/dialog.tcl
+lib/tk%%TK_VER%%/ttk/entry.tcl
+lib/tk%%TK_VER%%/ttk/fonts.tcl
+lib/tk%%TK_VER%%/ttk/icons.tcl
+lib/tk%%TK_VER%%/ttk/keynav.tcl
+lib/tk%%TK_VER%%/ttk/menubutton.tcl
+lib/tk%%TK_VER%%/ttk/notebook.tcl
+lib/tk%%TK_VER%%/ttk/panedwindow.tcl
+lib/tk%%TK_VER%%/ttk/progress.tcl
+lib/tk%%TK_VER%%/ttk/scale.tcl
+lib/tk%%TK_VER%%/ttk/scrollbar.tcl
+lib/tk%%TK_VER%%/ttk/sizegrip.tcl
+lib/tk%%TK_VER%%/ttk/treeview.tcl
+lib/tk%%TK_VER%%/ttk/ttk.tcl
+lib/tk%%TK_VER%%/ttk/utils.tcl
+lib/tk%%TK_VER%%/ttk/winTheme.tcl
+lib/tk%%TK_VER%%/ttk/xpTheme.tcl
 lib/tk%%TK_VER%%/unsupported.tcl
 lib/tk%%TK_VER%%/xmfbox.tcl
 %%INSTMAN%%%%DATADIR%%/man.macros
 %%INSTMAN%%@dirrm %%DATADIR%%
+@dirrm lib/tk%%TK_VER%%/ttk
 @dirrm lib/tk%%TK_VER%%/demos/images
 @dirrm lib/tk%%TK_VER%%/demos
 @dirrm lib/tk%%TK_VER%%/images