5 files changed, 37 insertions, 49 deletions

diff --git a/x11-toolkits/tk86/Makefile b/x11-toolkits/tk86/Makefile
index f48fac5760e8..b3629db58ffe 100644
--- a/x11-toolkits/tk86/Makefile
+++ b/x11-toolkits/tk86/Makefile
@@ -6,13 +6,12 @@
 #
 
 PORTNAME=	tk
-PORTVERSION=	8.5.a.6
-PORTREVISION=	4
+PORTVERSION=	8.5.b.1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	tcl
 PKGNAMESUFFIX?=	${THREADS_SUFFIX}
-DISTNAME=	${PORTNAME}${PORTVERSION:S/.a./a/}-src
+DISTNAME=	${PORTNAME}${PORTVERSION:S/.b./b/}-src
 
 MAINTAINER=	mm@FreeBSD.org
 COMMENT=	Graphical toolkit for TCL
@@ -20,7 +19,7 @@ COMMENT=	Graphical toolkit for TCL
 LATEST_LINK?=	tk85
 USE_XORG=	x11
 USE_LDCONFIG=	yes
-WRKSRC=		${WRKDIR}/${PORTNAME}${PORTVERSION:S/.a./a/}/unix
+WRKSRC=		${WRKDIR}/${DISTNAME:S/-src//}/unix
 GNU_CONFIGURE=	yes
 TK_VER=		8.5
 SHORT_TK_VER=	85
diff --git a/x11-toolkits/tk86/distinfo b/x11-toolkits/tk86/distinfo
index af3d25bb0993..fe0d08101fa1 100644
--- a/x11-toolkits/tk86/distinfo
+++ b/x11-toolkits/tk86/distinfo
@@ -1,3 +1,3 @@
-MD5 (tk8.5a6-src.tar.gz) = 3903199e8c5ee921f747a5d59174ed68
-SHA256 (tk8.5a6-src.tar.gz) = 67f5022f31d7a8adea7d150caa5c7de56ea0051e287f67fcb15b82f7fd5b8fd6
-SIZE (tk8.5a6-src.tar.gz) = 3682249
+MD5 (tk8.5b1-src.tar.gz) = 49430237b7d938a8cd2a761b3ccfe1b6
+SHA256 (tk8.5b1-src.tar.gz) = 7401f2fdb08d3f1ad0b2fb429d3f3e0d91930c8f61f694585e954b7d2b26b7c8
+SIZE (tk8.5b1-src.tar.gz) = 3701685
diff --git a/x11-toolkits/tk86/files/patch-unix::Makefile.in b/x11-toolkits/tk86/files/patch-unix::Makefile.in
index c0dc5d89ca83..41cb203401c0 100644
--- a/x11-toolkits/tk86/files/patch-unix::Makefile.in
+++ b/x11-toolkits/tk86/files/patch-unix::Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig	Thu Apr 26 23:02:27 2007
-+++ Makefile.in	Sun Apr 29 22:30:54 2007
-@@ -64,6 +64,8 @@
+--- Makefile.in.orig	2007-09-24 18:09:13.000000000 +0200
++++ Makefile.in	2007-09-27 20:55:50.000000000 +0200
+@@ -65,6 +65,8 @@
  
  # Directory in which to install the include file tk.h:
  INCLUDE_INSTALL_DIR	= $(INSTALL_ROOT)$(includedir)
@@ -9,7 +9,7 @@
  
  # Path to the private tk header dir:
  PRIVATE_INCLUDE_DIR	= @PRIVATE_INCLUDE_DIR@
-@@ -94,7 +96,7 @@
+@@ -95,7 +97,7 @@
  # 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):
@@ -18,7 +18,16 @@
  
  # The directory containing the platform specific Tcl sources and headers
  # appropriate for this version of Tk:
-@@ -131,7 +133,7 @@
+@@ -109,7 +111,7 @@
+ TCL_LIB_FLAG		= @TCL_LIB_FLAG@
+ 
+ # Flag, 1: we're building a shared lib, 0 we're not
+-TK_SHARED_BUILD		= @TK_SHARED_BUILD@
++TK_SHARED_BUILD		= #@TK_SHARED_BUILD@
+ 
+ # Subdirectory of $(libdir) containing the pkgIndex.tcl file for loadable Tk
+ TK_PKG_DIR		= @TK_PKG_DIR@
+@@ -132,7 +134,7 @@
  #CFLAGS			= $(CFLAGS_DEBUG)
  #CFLAGS			= $(CFLAGS_OPTIMIZE)
  #CFLAGS			= $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE)
@@ -27,7 +36,7 @@
  
  # Flags to pass to the linker
  LDFLAGS_DEBUG		= @LDFLAGS_DEBUG@
-@@ -266,7 +268,7 @@
+@@ -267,7 +269,7 @@
  STLIB_LD		= @STLIB_LD@
  SHLIB_LD		= @SHLIB_LD@
  SHLIB_LD_LIBS		= @SHLIB_LD_LIBS@
@@ -36,16 +45,16 @@
  
  # Additional search flags needed to find the various shared libraries
  # at run-time.  The first symbol is for use when creating a binary
-@@ -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
+@@ -552,6 +554,8 @@
+ 	$(GENERIC_DIR)/tkIntPlatDecls.h $(GENERIC_DIR)/tkPort.h \
+ 	$(TTK_HDRS) $(@TK_WINDOWINGSYSTEM@_PRIVATE_HDRS)
  
 +INSTALL_HDRS = tk.h tkDecls.h tkInt.h tkIntXlibDecls.h
 +
  DEMOPROGS = browse hello ixset rmt rolodex square tcolor timer widget
  
  SHELL_ENV = \
-@@ -567,6 +571,12 @@
+@@ -577,6 +581,12 @@
  ${LIB_FILE}: ${OBJS} ${STUB_LIB_FILE} @LIB_RSRC_FILE@
  	rm -f $@
  	@MAKE_LIB@
@@ -58,7 +67,7 @@
  
  ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
  	rm -f $@
-@@ -666,7 +676,7 @@
+@@ -676,7 +686,7 @@
  	gdb ./wish --command=gdb.run
  	rm gdb.run
  
@@ -67,7 +76,7 @@
  
  install: $(INSTALL_TARGETS)
  
-@@ -679,7 +689,8 @@
+@@ -689,7 +699,8 @@
  # some ranlibs write to current directory, and this might not always be
  # possible (e.g. if installing as root).
  
@@ -77,7 +86,7 @@
  	@for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) $(PKG_INSTALL_DIR); \
  	    do \
  	    if [ ! -d $$i ] ; then \
-@@ -712,10 +723,15 @@
+@@ -721,10 +732,15 @@
  	    $(INSTALL_DATA) $(TK_BUILD_EXP_FILE) \
  			$(LIB_INSTALL_DIR)/$(TK_EXP_FILE); \
  	    fi
@@ -95,7 +104,7 @@
  	@if test "$(STUB_LIB_FILE)" != "" ; then \
  	    echo "Installing $(STUB_LIB_FILE) to $(LIB_INSTALL_DIR)/"; \
  	    @INSTALL_STUB_LIB@ ; \
-@@ -726,6 +742,7 @@
+@@ -735,6 +751,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} \
@@ -103,12 +112,11 @@
  		$(SCRIPT_INSTALL_DIR) $(SCRIPT_INSTALL_DIR)/images \
  		$(SCRIPT_INSTALL_DIR)/msgs $(SCRIPT_INSTALL_DIR)/ttk; \
  	    do \
-@@ -740,11 +757,14 @@
+@@ -749,10 +766,14 @@
  	    chmod +x $(SRC_DIR)/install-sh; \
  	    fi
  	@echo "Installing header files";
--	@for i in $(GENERIC_DIR)/tk.h $(GENERIC_DIR)/tkDecls.h \
--		$(GENERIC_DIR)/tkPlatDecls.h $(@TK_WINDOWINGSYSTEM@_HDRS) ; \
+-	@for i in $(PUBLIC_HDRS); \
 +	${BSD_INSTALL_DATA} $(GENERIC_DIR)/*.h $(GENERIC_INCLUDE_INSTALL_DIR)/
 +	${BSD_INSTALL_DATA} $(UNIX_DIR)/*.h $(UNIX_INCLUDE_INSTALL_DIR)/
 +	@for i in $(INSTALL_HDRS) ; \
@@ -122,11 +130,8 @@
  	@list='$(@TK_WINDOWINGSYSTEM@_XLIB_HDRS)'; for i in $$list ; \
  	    do \
  	    $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR)/X11; \
-@@ -822,20 +842,21 @@
- 		else true; \
- 		fi; \
+@@ -832,17 +853,17 @@
  	    done;
-+
  	@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); \
@@ -141,7 +146,6 @@
  
  	@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); \
 +	    ${BSD_INSTALL_MAN} $$i $(MANN_INSTALL_DIR); \
  	done
diff --git a/x11-toolkits/tk86/files/patch-unix::configure b/x11-toolkits/tk86/files/patch-unix::configure
index 4cfd9b3f72c7..ea2ea6bed575 100644
--- a/x11-toolkits/tk86/files/patch-unix::configure
+++ b/x11-toolkits/tk86/files/patch-unix::configure
@@ -1,5 +1,5 @@
---- configure.orig	Thu Apr 26 23:02:27 2007
-+++ configure	Mon Apr 30 10:30:24 2007
+--- configure.orig	2007-09-24 18:09:13.000000000 +0200
++++ configure	2007-09-27 20:50:38.000000000 +0200
 @@ -3535,6 +3535,7 @@
  # Threads support - this auto-enables if Tcl was compiled threaded
  #------------------------------------------------------------------------
@@ -8,24 +8,16 @@
  
      # Check whether --enable-threads or --disable-threads was given.
  if test "${enable_threads+set}" = set; then
-@@ -5697,25 +5698,26 @@
- 	FreeBSD-*)
- 	    # FreeBSD 3.* and greater have ELF.
- 	    SHLIB_CFLAGS="-fPIC"
--	    SHLIB_LD="ld -Bshareable -x"
-+	    TCL_SHLIB_LD_EXTRAS="-soname \$@"
-+	    SHLIB_LD="${CC} -shared"
- 	    SHLIB_LD_LIBS='${LIBS}'
+@@ -5694,20 +5695,20 @@
  	    SHLIB_SUFFIX=".so"
  	    DL_OBJS="tclLoadDl.o"
  	    DL_LIBS=""
 -	    LDFLAGS="$LDFLAGS -export-dynamic"
 +	    LDFLAGS=""
  	    CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
- 	    LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
+ 	    LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
  	    if test "${TCL_THREADS}" = "1" ; then
--		# The -pthread needs to go in the CFLAGS, not LIBS
-+		# The -pthread needs to go in the LDFLAGS, not LIBS
+ 		# The -pthread needs to go in the CFLAGS, not LIBS
  		LIBS=`echo $LIBS | sed s/-pthread//`
 -		CFLAGS="$CFLAGS -pthread"
 -	    	LDFLAGS="$LDFLAGS -pthread"
diff --git a/x11-toolkits/tk86/pkg-plist b/x11-toolkits/tk86/pkg-plist
index bb4270ab851d..10e049ca7489 100644
--- a/x11-toolkits/tk86/pkg-plist
+++ b/x11-toolkits/tk86/pkg-plist
@@ -10,7 +10,6 @@ include/tk%%TK_VER%%/generic/tkDecls.h
 include/tk%%TK_VER%%/generic/tkEntry.h
 include/tk%%TK_VER%%/generic/tkFileFilter.h
 include/tk%%TK_VER%%/generic/tkFont.h
-include/tk%%TK_VER%%/generic/tkInitScript.h
 include/tk%%TK_VER%%/generic/tkInt.h
 include/tk%%TK_VER%%/generic/tkIntDecls.h
 include/tk%%TK_VER%%/generic/tkIntPlatDecls.h
@@ -108,9 +107,6 @@ 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
@@ -174,11 +170,8 @@ 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