Upgrade to tk-8.3

5 files changed, 58 insertions, 73 deletions

diff --git a/x11-toolkits/tk83/Makefile b/x11-toolkits/tk83/Makefile
index 01f4c55c5eba..fe3a66653f04 100644
--- a/x11-toolkits/tk83/Makefile
+++ b/x11-toolkits/tk83/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	tk
-PORTVERSION= 	8.3.b1
-CATEGORIES=	x11-toolkits #tk83
+PORTVERSION= 	8.3.0
+CATEGORIES=	x11-toolkits tk83
 MASTER_SITES=	ftp://ftp.scriptics.com/pub/tcl/tcl8_3/
-DISTNAME=	${PORTNAME}8.3b1
+DISTNAME=	${PORTNAME}${PORTVERSION}
 
 MAINTAINER=	jseger@FreeBSD.org
 
@@ -33,8 +33,8 @@ MAN3=	3DBorder.3 BindTable.3 CanvPsY.3 CanvTkwin.3 CanvTxtInfo.3 \
 	CrtErrHdlr.3 CrtGenHdlr.3 CrtImgType.3 CrtItemType.3 CrtPhImgFmt.3 \
 	CrtSelHdlr.3 CrtWindow.3 DeleteImg.3 DrawFocHlt.3 EventHndlr.3 \
 	FindPhoto.3 FontId.3 FreeXId.3 GeomReq.3 GetAnchor.3 GetBitmap.3 \
-	GetCapStyl.3 GetClrmap.3 GetColor.3 GetCursor.3 GetFont.3 GetGC.3 \
-	GetImage.3 GetJoinStl.3 GetJustify.3 GetOption.3 GetPixels.3 \
+	GetCapStyl.3 GetClrmap.3 GetColor.3 GetCursor.3 GetDash.3 GetFont.3 \
+	GetGC.3 GetImage.3 GetJoinStl.3 GetJustify.3 GetOption.3 GetPixels.3 \
 	GetPixmap.3 GetRelief.3 GetRootCrd.3 GetScroll.3 GetSelect.3 GetUid.3 \
 	GetVRoot.3 GetVisual.3 HandleEvent.3 IdToWindow.3 ImgChanged.3 \
 	InternAtom.3 MainLoop.3 MainWin.3 MaintGeom.3 ManageGeom.3 \
@@ -43,8 +43,8 @@ MAN3=	3DBorder.3 BindTable.3 CanvPsY.3 CanvTkwin.3 CanvTxtInfo.3 \
 	SetClass.3 SetGrid.3 SetOptions.3 SetVisual.3 StrictMotif.3 \
 	TextLayout.3 Tk_Init.3 Tk_Main.3 TkInitStubs.3 WindowId.3
 MANN=	bell.n bind.n bindtags.n bitmap.n button.n canvas.n checkbutton.n \
-	chooseColor.n clipboard.n destroy.n dialog.n entry.n event.n \
-	focus.n focusNext.n font.n frame.n getOpenFile.n grab.n grid.n \
+	chooseColor.n chooseDirectory.n clipboard.n destroy.n dialog.n entry.n\
+	event.n focus.n focusNext.n font.n frame.n getOpenFile.n grab.n grid.n\
 	image.n label.n listbox.n loadTk.n lower.n menu.n menubar.n \
 	menubutton.n message.n messageBox.n option.n optionMenu.n options.n \
 	pack-old.n pack.n palette.n photo.n place.n popup.n radiobutton.n \
@@ -117,6 +117,7 @@ MLINKS=	3DBorder.3 Tk_Alloc3DBorderFromObj.3 \
 	CrtGenHdlr.3 Tk_DeleteGenericHandler.3 \
 	CrtImgType.3 Tk_CreateImageType.3 \
 	CrtImgType.3 Tk_GetImageMasterData.3 \
+	CrtImgType.3 Tk_InitImageArgs.3 \
 	CrtItemType.3 Tk_CreateItemType.3 \
 	CrtItemType.3 Tk_GetItemTypes.3 \
 	CrtPhImgFmt.3 Tk_CreatePhotoImageFormat.3 \
@@ -273,6 +274,8 @@ MLINKS=	3DBorder.3 Tk_Alloc3DBorderFromObj.3 \
 	WindowId.3 Tk_Height.3 \
 	WindowId.3 Tk_Changes.3 \
 	WindowId.3 Tk_Attributes.3 \
+	WindowId.3 Tk_IsContainer.3 \
+	WindowId.3 Tk_IsEmbedded.3 \
 	WindowId.3 Tk_IsMapped.3 \
 	WindowId.3 Tk_IsTopLevel.3 \
 	WindowId.3 Tk_ReqWidth.3 \
@@ -282,6 +285,7 @@ MLINKS=	3DBorder.3 Tk_Alloc3DBorderFromObj.3 \
 	WindowId.3 Tk_Depth.3 \
 	WindowId.3 Tk_Colormap.3 \
 	chooseColor.n tk_chooseColor.n \
+	chooseDirectory.n tk_chooseDirectory.n \
 	dialog.n tk_dialog.n \
 	focusNext.n tk_focusNext.n \
 	focusNext.n tk_focusPrev.n \
@@ -299,7 +303,6 @@ MLINKS=	3DBorder.3 Tk_Alloc3DBorderFromObj.3 \
 .include <bsd.port.pre.mk>
 
 post-install:
-	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 .if exists(${PKGINSTALL})
 	${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL}
 .endif
diff --git a/x11-toolkits/tk83/distinfo b/x11-toolkits/tk83/distinfo
index 6a86c1ffffe4..a07782888586 100644
--- a/x11-toolkits/tk83/distinfo
+++ b/x11-toolkits/tk83/distinfo
@@ -1 +1 @@
-MD5 (tk8.3b1.tar.gz) = 5c39764905e656836ca85af04c68cf23
+MD5 (tk8.3.0.tar.gz) = b98369476607536e8384940036890d5c
diff --git a/x11-toolkits/tk83/files/patch-aa b/x11-toolkits/tk83/files/patch-aa
index 53582dfa763b..726fe60a0da6 100644
--- a/x11-toolkits/tk83/files/patch-aa
+++ b/x11-toolkits/tk83/files/patch-aa
@@ -1,6 +1,6 @@
---- configure.orig	Wed Nov  3 21:38:44 1999
-+++ configure	Sun Nov 21 15:55:12 1999
-@@ -1756,7 +1756,7 @@
+--- configure.orig	Thu Feb 10 06:11:02 2000
++++ configure	Mon Apr 24 15:59:27 2000
+@@ -1763,7 +1763,7 @@
  	    LDFLAGS="-Wl,-Bexport"
  	    LD_SEARCH_FLAGS=""
  	    ;;
@@ -9,29 +9,15 @@
  	    # Not available on all versions:  check for include file.
  	    ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6
-@@ -1788,14 +1788,19 @@
-   echo "$ac_t""yes" 1>&6
-   
- 		SHLIB_CFLAGS="-fpic"
--		SHLIB_LD="ld -Bshareable -x"
- 		SHLIB_LD_LIBS=""
- 		SHLIB_SUFFIX=".so"
- 		DL_OBJS="tclLoadDl.o"
- 		DL_LIBS=""
- 		LDFLAGS=""
- 		LD_SEARCH_FLAGS=""
--		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0'
-+          if eval "test \"`echo ${PORTOBJFORMAT}`\" = elf" ; then
-+		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1'
-+		SHLIB_LD="ld -shared -x -soname \$@"
-+	  else
-+		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1.0'
-+		SHLIB_LD="ld -Bshareable -x"
-+	  fi
- 	    
- else
-   echo "$ac_t""no" 1>&6
-@@ -2266,6 +2271,7 @@
+@@ -1847,6 +1847,7 @@
+ 	    # FreeBSD doesn't handle version numbers with dots.
+ 
+ 	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
++	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1'
+ 	    TCL_LIB_VERSIONS_OK=nodots
+ 	    ;;
+ 	FreeBSD-*)
+@@ -2303,6 +2304,7 @@
  	echo "$ac_t""no" 1>&6
      fi
  
diff --git a/x11-toolkits/tk83/files/patch-ab b/x11-toolkits/tk83/files/patch-ab
index 5d6c0ba1c8d8..39fa0a3b2273 100644
--- a/x11-toolkits/tk83/files/patch-ab
+++ b/x11-toolkits/tk83/files/patch-ab
@@ -1,5 +1,5 @@
---- Makefile.in.orig	Fri Aug 13 18:06:14 1999
-+++ Makefile.in	Sat Sep  4 19:47:43 1999
+--- Makefile.in.orig	Thu Feb 10 06:11:01 2000
++++ Makefile.in	Mon Apr 24 16:10:36 2000
 @@ -56,7 +56,9 @@
  BIN_DIR =		$(exec_prefix)/bin
  
@@ -29,7 +29,7 @@
  
  # The symbol below provides support for dynamic loading and shared
  # libraries.  See configure.in for a description of what it means.
-@@ -356,8 +358,14 @@
+@@ -361,8 +363,14 @@
  ${TK_LIB_FILE}: ${OBJS}
  	rm -f ${TK_LIB_FILE}
  	@MAKE_LIB@
@@ -44,7 +44,7 @@
  ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
  	rm -f ${STUB_LIB_FILE}
  	@MAKE_STUB_LIB@
-@@ -418,7 +426,7 @@
+@@ -424,7 +432,7 @@
  # some ranlibs write to current directory, and this might not always be
  # possible (e.g. if installing as root).
  
@@ -53,9 +53,9 @@
  	@for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) ; \
  	    do \
  	    if [ ! -d $$i ] ; then \
-@@ -432,12 +440,18 @@
- 	chmod +x $(UNIX_DIR)/install-sh
- 	chmod +x $(UNIX_DIR)/mkLinks
+@@ -442,12 +450,18 @@
+ 	    fi
+ 	@echo "Installing $(TK_LIB_FILE) to $(LIB_INSTALL_DIR)/"
  	@$(INSTALL_DATA) $(TK_LIB_FILE) $(LIB_INSTALL_DIR)/$(TK_LIB_FILE)
 +	@ln -sf $(LIB_INSTALL_DIR)/$(TK_LIB_FILE) $(LIB_INSTALL_DIR)/libtk${SHORT_TK_VER}.so
  	@(cd $(LIB_INSTALL_DIR); $(RANLIB) $(TK_LIB_FILE))
@@ -64,16 +64,16 @@
 +	@$(INSTALL_DATA) libtk${SHORT_TK_VER}.a $(LIB_INSTALL_DIR)/libtk${SHORT_TK_VER}.a
 +	@(cd $(LIB_INSTALL_DIR); $(RANLIB) libtk${SHORT_TK_VER}.a)
 +	@chmod 555 $(LIB_INSTALL_DIR)/libtk${SHORT_TK_VER}.a
- 	@echo "Installing wish"
+ 	@echo "Installing wish as $(BIN_INSTALL_DIR)/wish$(VERSION)"
  	@$(INSTALL_PROGRAM) wish $(BIN_INSTALL_DIR)/wish$(VERSION)
- 	@echo "Installing tkConfig.sh"
+ 	@echo "Installing tkConfig.sh to $(LIB_INSTALL_DIR)/"
 -	@$(INSTALL_DATA) tkConfig.sh $(LIB_INSTALL_DIR)/tkConfig.sh
 +	@mkdir -p $(LIB_INSTALL_DIR)/tk$(VERSION)
 +	@$(INSTALL_DATA) tkConfig.sh $(LIB_INSTALL_DIR)/tk$(VERSION)/tkConfig.sh
  	@if test "$(TK_BUILD_EXP_FILE)" != ""; then \
- 	    echo "Installing $(TK_EXP_FILE)"; \
+ 	    echo "Installing $(TK_EXP_FILE) to $(LIB_INSTALL_DIR)/"; \
  	    $(INSTALL_DATA) $(TK_BUILD_EXP_FILE) \
-@@ -451,6 +465,7 @@
+@@ -461,6 +475,7 @@
  
  install-libraries:
  	@for i in $(INSTALL_ROOT)$(prefix)/lib $(INCLUDE_INSTALL_DIR) \
@@ -81,51 +81,46 @@
  		$(SCRIPT_INSTALL_DIR) $(SCRIPT_INSTALL_DIR)/images; \
  	    do \
  	    if [ ! -d $$i ] ; then \
-@@ -461,11 +476,19 @@
- 		fi; \
- 	    done;
- 	chmod +x $(UNIX_DIR)/install-sh
+@@ -474,10 +489,16 @@
+ 	    chmod +x $(UNIX_DIR)/install-sh; \
+ 	    fi
+ 	@echo "Installing header files";
 -	@for i in $(GENERIC_DIR)/tk.h $(GENERIC_DIR)/tkDecls.h ; \
-+	@echo "Installing headers"
 +	@for i in $(GENERIC_DIR)/*.h ; \
++	    do \
++	    $(INSTALL_DATA) $$i $(GENERIC_INCLUDE_INSTALL_DIR); \
++	    done;
++	@for i in $(UNIX_DIR)/*.h ; \
  	    do \
- 	    echo "Installing $$i"; \
 -	    $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR); \
-+	    $(INSTALL_DATA) $$i $(GENERIC_INCLUDE_INSTALL_DIR); \
++	    $(INSTALL_DATA) $$i $(UNIX_INCLUDE_INSTALL_DIR); \
  	    done;
-+	@for i in $(UNIX_DIR)/*.h ; \
-+	do \
-+	echo "Installing $$i"; \
-+	$(INSTALL_DATA) $$i $(UNIX_INCLUDE_INSTALL_DIR); \
-+	done ;
 +	@ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/tk.h $(INCLUDE_INSTALL_DIR)/tk.h
 +	@ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/tkDecls.h $(INCLUDE_INSTALL_DIR)/tkDecls.h
- 	for i in $(SRC_DIR)/library/*.tcl $(GENERIC_DIR)/prolog.ps \
+ 	@echo "Installing library files to $(SCRIPT_INSTALL_DIR)";
+ 	@for i in $(SRC_DIR)/library/*.tcl $(GENERIC_DIR)/prolog.ps \
  	        $(SRC_DIR)/library/tclIndex $(UNIX_DIR)/tkAppInit.c; \
- 	    do \
-@@ -530,16 +553,14 @@
- 		    $$i > $(MAN1_INSTALL_DIR)/$$i; \
+@@ -543,7 +564,6 @@
  	    chmod 444 $(MAN1_INSTALL_DIR)/$$i; \
  	    done;
--	$(UNIX_DIR)/mkLinks $(MAN1_INSTALL_DIR)
+ 	@echo "Cross-linking top-level (.1) docs";
+-	@$(UNIX_DIR)/mkLinks $(MAN1_INSTALL_DIR)
+ 	@echo "Installing C API (.3) docs";
  	@cd $(SRC_DIR)/doc; for i in *.3; \
  	    do \
- 	    echo "Installing doc/$$i"; \
--	    rm -f $(MAN3_INSTALL_DIR)/$$i; \
-+	    rm -f $(MAN3_INSTALL_DIR)/$$i ; \
- 	    sed -e '/man\.macros/r man.macros' -e '/man\.macros/d' \
- 		    $$i > $(MAN3_INSTALL_DIR)/$$i; \
+@@ -553,7 +573,6 @@
  	    chmod 444 $(MAN3_INSTALL_DIR)/$$i; \
  	    done;
--	$(UNIX_DIR)/mkLinks $(MAN3_INSTALL_DIR)
+ 	@echo "Cross-linking top-level (.3) docs";
+-	@$(UNIX_DIR)/mkLinks $(MAN3_INSTALL_DIR)
+ 	@echo "Installing command (.n) docs";
  	@cd $(SRC_DIR)/doc; for i in *.n; \
  	    do \
- 	    echo "Installing doc/$$i"; \
-@@ -548,7 +569,6 @@
- 		    $$i > $(MANN_INSTALL_DIR)/$$i; \
+@@ -563,7 +582,6 @@
  	    chmod 444 $(MANN_INSTALL_DIR)/$$i; \
  	    done;
--	$(UNIX_DIR)/mkLinks $(MANN_INSTALL_DIR)
+ 	@echo "Cross-linking command (.n) docs";
+-	@$(UNIX_DIR)/mkLinks $(MANN_INSTALL_DIR)
  
  Makefile: $(UNIX_DIR)/Makefile.in
  	$(SHELL) config.status
diff --git a/x11-toolkits/tk83/pkg-plist b/x11-toolkits/tk83/pkg-plist
index b5afedf961fd..46d9ae1aaf88 100644
--- a/x11-toolkits/tk83/pkg-plist
+++ b/x11-toolkits/tk83/pkg-plist
@@ -35,6 +35,7 @@ lib/libtkstub%%SHORT_TK_VER%%.a
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 lib/tk%%TK_VER%%/bgerror.tcl
 lib/tk%%TK_VER%%/button.tcl
+lib/tk%%TK_VER%%/choosedir.tcl
 lib/tk%%TK_VER%%/clrpick.tcl
 lib/tk%%TK_VER%%/comdlg.tcl
 lib/tk%%TK_VER%%/console.tcl