Upgrade repo-copy of tk82->tk83 to tk8.3.b1

7 files changed, 55 insertions, 46 deletions

diff --git a/x11-toolkits/Makefile b/x11-toolkits/Makefile
index 926698550c21..82ccd7d3af29 100644
--- a/x11-toolkits/Makefile
+++ b/x11-toolkits/Makefile
@@ -38,6 +38,7 @@
     SUBDIR += tk42
     SUBDIR += tk80
     SUBDIR += tk82
+    SUBDIR += tk83
     SUBDIR += tkstep80
     SUBDIR += v
     SUBDIR += wxgtk
diff --git a/x11-toolkits/tk83/Makefile b/x11-toolkits/tk83/Makefile
index 3737698b9dfc..6ed6626fb576 100644
--- a/x11-toolkits/tk83/Makefile
+++ b/x11-toolkits/tk83/Makefile
@@ -1,28 +1,29 @@
 # New ports collection makefile for:	tk
-# Version required:	8.2.3
+# Version required:	8.3.b1
 # Date created:		19 August 1997
 # Whom:			jkh
 #
 # $FreeBSD$
 #
 
-DISTNAME=	tk8.2.3
-PKGNAME=	tk-8.2.3
-CATEGORIES=	x11-toolkits tk82
-MASTER_SITES=	ftp://ftp.scriptics.com/pub/tcl/tcl8_2/
+DISTNAME=	tk8.3b1
+PKGNAME=	tk-8.3.b1
+CATEGORIES=	x11-toolkits #tk83
+MASTER_SITES=	ftp://ftp.scriptics.com/pub/tcl/tcl8_3/
 
 MAINTAINER=	jseger@FreeBSD.org
 
-LIB_DEPENDS=	tcl82.1:${PORTSDIR}/lang/tcl82
+LIB_DEPENDS=	tcl83.1:${PORTSDIR}/lang/tcl83
 
 USE_XLIB=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}/unix
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--enable-shared --with-tcl=${PREFIX}/lib/tcl8.2
-CONFIGURE_ENV=  PORTSDIR=${PORTSDIR} TK_LIB_FILE=libtk82.so.1
+CONFIGURE_ARGS=	--enable-shared --with-tcl=${PREFIX}/lib/tcl8.3
+CONFIGURE_ENV=  PORTSDIR=${PORTSDIR} TK_LIB_FILE=libtk83.so.1
+MAKE_ENV=	SHORT_TK_VER=83
 PKGINSTALL=     ${PKGDIR}/INSTALL.wish
 
-PLIST_SUB=	TK_VER=8.2 SHORT_TK_VER=82
+PLIST_SUB=	TK_VER=8.3 SHORT_TK_VER=83
 
 MANCOMPRESSED=	no
 
@@ -49,6 +50,7 @@ MANN=	bell.n bind.n bindtags.n bitmap.n button.n canvas.n checkbutton.n \
 	pack-old.n pack.n palette.n photo.n place.n popup.n radiobutton.n \
 	raise.n scale.n scrollbar.n selection.n send.n text.n tk.n tkerror.n \
 	tkvars.n tkwait.n toplevel.n winfo.n wm.n
+
 # MLINKS generated via  awk '/ln/ {print "\t" $2,$3,"\\"}' unix/mkLinks
 MLINKS=	3DBorder.3 Tk_Alloc3DBorderFromObj.3 \
 	3DBorder.3 Tk_Get3DBorder.3 \
@@ -91,6 +93,7 @@ MLINKS=	3DBorder.3 Tk_Alloc3DBorderFromObj.3 \
 	Clipboard.3 Tk_ClipboardAppend.3 \
 	ClrSelect.3 Tk_ClearSelection.3 \
 	ConfigWidg.3 Tk_ConfigureWidget.3 \
+	ConfigWidg.3 Tk_Offset.3 \
 	ConfigWidg.3 Tk_ConfigureInfo.3 \
 	ConfigWidg.3 Tk_ConfigureValue.3 \
 	ConfigWidg.3 Tk_FreeOptions.3 \
@@ -171,6 +174,7 @@ MLINKS=	3DBorder.3 Tk_Alloc3DBorderFromObj.3 \
 	GetCursor.3 Tk_NameOfCursor.3 \
 	GetCursor.3 Tk_FreeCursorFromObj.3 \
 	GetCursor.3 Tk_FreeCursor.3 \
+	GetDash.3 Tk_GetDash.3 \
 	GetFont.3 Tk_AllocFontFromObj.3 \
 	GetFont.3 Tk_GetFont.3 \
 	GetFont.3 Tk_GetFontFromObj.3 \
@@ -245,7 +249,6 @@ MLINKS=	3DBorder.3 Tk_Alloc3DBorderFromObj.3 \
 	SetOptions.3 Tk_GetOptionValue.3 \
 	SetOptions.3 Tk_GetOptionInfo.3 \
 	SetOptions.3 Tk_FreeConfigOptions.3 \
-	SetOptions.3 Tk_Offset.3 \
 	SetVisual.3 Tk_SetWindowVisual.3 \
 	StrictMotif.3 Tk_StrictMotif.3 \
 	TextLayout.3 Tk_ComputeTextLayout.3 \
@@ -257,6 +260,7 @@ MLINKS=	3DBorder.3 Tk_Alloc3DBorderFromObj.3 \
 	TextLayout.3 Tk_DistanceToTextLayout.3 \
 	TextLayout.3 Tk_IntersectTextLayout.3 \
 	TextLayout.3 Tk_TextLayoutToPostscript.3 \
+	TkInitStubs.3 Tk_InitStubs.3 \
 	WindowId.3 Tk_WindowId.3 \
 	WindowId.3 Tk_Parent.3 \
 	WindowId.3 Tk_Display.3 \
diff --git a/x11-toolkits/tk83/distinfo b/x11-toolkits/tk83/distinfo
index 9738fef8494e..6a86c1ffffe4 100644
--- a/x11-toolkits/tk83/distinfo
+++ b/x11-toolkits/tk83/distinfo
@@ -1 +1 @@
-MD5 (tk8.2.3.tar.gz) = 7ff4bc6ec36dc901e5a2e09029458308
+MD5 (tk8.3b1.tar.gz) = 5c39764905e656836ca85af04c68cf23
diff --git a/x11-toolkits/tk83/files/patch-ab b/x11-toolkits/tk83/files/patch-ab
index 3c9fb1cf6c6c..5d6c0ba1c8d8 100644
--- a/x11-toolkits/tk83/files/patch-ab
+++ b/x11-toolkits/tk83/files/patch-ab
@@ -25,7 +25,7 @@
  # configure script.
  LIBS = @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -lc
 -WISH_LIBS = $(TCL_LIB_SPEC) @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -lc
-+WISH_LIBS = -L${PREFIX}/lib -ltcl82 @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -lc
++WISH_LIBS = -L${PREFIX}/lib -ltcl${SHORT_TK_VER} @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -lc
  
  # The symbol below provides support for dynamic loading and shared
  # libraries.  See configure.in for a description of what it means.
@@ -33,13 +33,13 @@
  ${TK_LIB_FILE}: ${OBJS}
  	rm -f ${TK_LIB_FILE}
  	@MAKE_LIB@
-+	ln -sf @TK_LIB_FILE@ libtk82.so
++	ln -sf @TK_LIB_FILE@ libtk${SHORT_TK_VER}.so
  	$(RANLIB) ${TK_LIB_FILE}
  
-+libtk82.a: ${OBJS}
-+	rm -f libtk82.a
-+	ar cr libtk82.a ${OBJS}
-+	$(RANLIB) libtk82.a
++libtk${SHORT_TK_VER}.a: ${OBJS}
++	rm -f libtk${SHORT_TK_VER}.a
++	ar cr libtk${SHORT_TK_VER}.a ${OBJS}
++	$(RANLIB) libtk${SHORT_TK_VER}.a
 +
  ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
  	rm -f ${STUB_LIB_FILE}
@@ -49,7 +49,7 @@
  # possible (e.g. if installing as root).
  
 -install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $(TK_BUILD_EXP_FILE) wish
-+install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $(TK_BUILD_EXP_FILE) libtk82.a wish
++install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $(TK_BUILD_EXP_FILE) libtk${SHORT_TK_VER}.a wish
  	@for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) ; \
  	    do \
  	    if [ ! -d $$i ] ; then \
@@ -57,13 +57,13 @@
  	chmod +x $(UNIX_DIR)/install-sh
  	chmod +x $(UNIX_DIR)/mkLinks
  	@$(INSTALL_DATA) $(TK_LIB_FILE) $(LIB_INSTALL_DIR)/$(TK_LIB_FILE)
-+	@ln -sf $(LIB_INSTALL_DIR)/$(TK_LIB_FILE) $(LIB_INSTALL_DIR)/libtk82.so
++	@ln -sf $(LIB_INSTALL_DIR)/$(TK_LIB_FILE) $(LIB_INSTALL_DIR)/libtk${SHORT_TK_VER}.so
  	@(cd $(LIB_INSTALL_DIR); $(RANLIB) $(TK_LIB_FILE))
  	@chmod 555 $(LIB_INSTALL_DIR)/$(TK_LIB_FILE)
-+	@echo "Installing libtk82.a"
-+	@$(INSTALL_DATA) libtk82.a $(LIB_INSTALL_DIR)/libtk82.a
-+	@(cd $(LIB_INSTALL_DIR); $(RANLIB) libtk82.a)
-+	@chmod 555 $(LIB_INSTALL_DIR)/libtk82.a
++	@echo "Installing libtk${SHORT_TK_VER}.a"
++	@$(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"
  	@$(INSTALL_PROGRAM) wish $(BIN_INSTALL_DIR)/wish$(VERSION)
  	@echo "Installing tkConfig.sh"
diff --git a/x11-toolkits/tk84/Makefile b/x11-toolkits/tk84/Makefile
index 3737698b9dfc..6ed6626fb576 100644
--- a/x11-toolkits/tk84/Makefile
+++ b/x11-toolkits/tk84/Makefile
@@ -1,28 +1,29 @@
 # New ports collection makefile for:	tk
-# Version required:	8.2.3
+# Version required:	8.3.b1
 # Date created:		19 August 1997
 # Whom:			jkh
 #
 # $FreeBSD$
 #
 
-DISTNAME=	tk8.2.3
-PKGNAME=	tk-8.2.3
-CATEGORIES=	x11-toolkits tk82
-MASTER_SITES=	ftp://ftp.scriptics.com/pub/tcl/tcl8_2/
+DISTNAME=	tk8.3b1
+PKGNAME=	tk-8.3.b1
+CATEGORIES=	x11-toolkits #tk83
+MASTER_SITES=	ftp://ftp.scriptics.com/pub/tcl/tcl8_3/
 
 MAINTAINER=	jseger@FreeBSD.org
 
-LIB_DEPENDS=	tcl82.1:${PORTSDIR}/lang/tcl82
+LIB_DEPENDS=	tcl83.1:${PORTSDIR}/lang/tcl83
 
 USE_XLIB=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}/unix
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--enable-shared --with-tcl=${PREFIX}/lib/tcl8.2
-CONFIGURE_ENV=  PORTSDIR=${PORTSDIR} TK_LIB_FILE=libtk82.so.1
+CONFIGURE_ARGS=	--enable-shared --with-tcl=${PREFIX}/lib/tcl8.3
+CONFIGURE_ENV=  PORTSDIR=${PORTSDIR} TK_LIB_FILE=libtk83.so.1
+MAKE_ENV=	SHORT_TK_VER=83
 PKGINSTALL=     ${PKGDIR}/INSTALL.wish
 
-PLIST_SUB=	TK_VER=8.2 SHORT_TK_VER=82
+PLIST_SUB=	TK_VER=8.3 SHORT_TK_VER=83
 
 MANCOMPRESSED=	no
 
@@ -49,6 +50,7 @@ MANN=	bell.n bind.n bindtags.n bitmap.n button.n canvas.n checkbutton.n \
 	pack-old.n pack.n palette.n photo.n place.n popup.n radiobutton.n \
 	raise.n scale.n scrollbar.n selection.n send.n text.n tk.n tkerror.n \
 	tkvars.n tkwait.n toplevel.n winfo.n wm.n
+
 # MLINKS generated via  awk '/ln/ {print "\t" $2,$3,"\\"}' unix/mkLinks
 MLINKS=	3DBorder.3 Tk_Alloc3DBorderFromObj.3 \
 	3DBorder.3 Tk_Get3DBorder.3 \
@@ -91,6 +93,7 @@ MLINKS=	3DBorder.3 Tk_Alloc3DBorderFromObj.3 \
 	Clipboard.3 Tk_ClipboardAppend.3 \
 	ClrSelect.3 Tk_ClearSelection.3 \
 	ConfigWidg.3 Tk_ConfigureWidget.3 \
+	ConfigWidg.3 Tk_Offset.3 \
 	ConfigWidg.3 Tk_ConfigureInfo.3 \
 	ConfigWidg.3 Tk_ConfigureValue.3 \
 	ConfigWidg.3 Tk_FreeOptions.3 \
@@ -171,6 +174,7 @@ MLINKS=	3DBorder.3 Tk_Alloc3DBorderFromObj.3 \
 	GetCursor.3 Tk_NameOfCursor.3 \
 	GetCursor.3 Tk_FreeCursorFromObj.3 \
 	GetCursor.3 Tk_FreeCursor.3 \
+	GetDash.3 Tk_GetDash.3 \
 	GetFont.3 Tk_AllocFontFromObj.3 \
 	GetFont.3 Tk_GetFont.3 \
 	GetFont.3 Tk_GetFontFromObj.3 \
@@ -245,7 +249,6 @@ MLINKS=	3DBorder.3 Tk_Alloc3DBorderFromObj.3 \
 	SetOptions.3 Tk_GetOptionValue.3 \
 	SetOptions.3 Tk_GetOptionInfo.3 \
 	SetOptions.3 Tk_FreeConfigOptions.3 \
-	SetOptions.3 Tk_Offset.3 \
 	SetVisual.3 Tk_SetWindowVisual.3 \
 	StrictMotif.3 Tk_StrictMotif.3 \
 	TextLayout.3 Tk_ComputeTextLayout.3 \
@@ -257,6 +260,7 @@ MLINKS=	3DBorder.3 Tk_Alloc3DBorderFromObj.3 \
 	TextLayout.3 Tk_DistanceToTextLayout.3 \
 	TextLayout.3 Tk_IntersectTextLayout.3 \
 	TextLayout.3 Tk_TextLayoutToPostscript.3 \
+	TkInitStubs.3 Tk_InitStubs.3 \
 	WindowId.3 Tk_WindowId.3 \
 	WindowId.3 Tk_Parent.3 \
 	WindowId.3 Tk_Display.3 \
diff --git a/x11-toolkits/tk84/distinfo b/x11-toolkits/tk84/distinfo
index 9738fef8494e..6a86c1ffffe4 100644
--- a/x11-toolkits/tk84/distinfo
+++ b/x11-toolkits/tk84/distinfo
@@ -1 +1 @@
-MD5 (tk8.2.3.tar.gz) = 7ff4bc6ec36dc901e5a2e09029458308
+MD5 (tk8.3b1.tar.gz) = 5c39764905e656836ca85af04c68cf23
diff --git a/x11-toolkits/tk84/files/patch-ab b/x11-toolkits/tk84/files/patch-ab
index 3c9fb1cf6c6c..5d6c0ba1c8d8 100644
--- a/x11-toolkits/tk84/files/patch-ab
+++ b/x11-toolkits/tk84/files/patch-ab
@@ -25,7 +25,7 @@
  # configure script.
  LIBS = @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -lc
 -WISH_LIBS = $(TCL_LIB_SPEC) @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -lc
-+WISH_LIBS = -L${PREFIX}/lib -ltcl82 @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -lc
++WISH_LIBS = -L${PREFIX}/lib -ltcl${SHORT_TK_VER} @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -lc
  
  # The symbol below provides support for dynamic loading and shared
  # libraries.  See configure.in for a description of what it means.
@@ -33,13 +33,13 @@
  ${TK_LIB_FILE}: ${OBJS}
  	rm -f ${TK_LIB_FILE}
  	@MAKE_LIB@
-+	ln -sf @TK_LIB_FILE@ libtk82.so
++	ln -sf @TK_LIB_FILE@ libtk${SHORT_TK_VER}.so
  	$(RANLIB) ${TK_LIB_FILE}
  
-+libtk82.a: ${OBJS}
-+	rm -f libtk82.a
-+	ar cr libtk82.a ${OBJS}
-+	$(RANLIB) libtk82.a
++libtk${SHORT_TK_VER}.a: ${OBJS}
++	rm -f libtk${SHORT_TK_VER}.a
++	ar cr libtk${SHORT_TK_VER}.a ${OBJS}
++	$(RANLIB) libtk${SHORT_TK_VER}.a
 +
  ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
  	rm -f ${STUB_LIB_FILE}
@@ -49,7 +49,7 @@
  # possible (e.g. if installing as root).
  
 -install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $(TK_BUILD_EXP_FILE) wish
-+install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $(TK_BUILD_EXP_FILE) libtk82.a wish
++install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $(TK_BUILD_EXP_FILE) libtk${SHORT_TK_VER}.a wish
  	@for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) ; \
  	    do \
  	    if [ ! -d $$i ] ; then \
@@ -57,13 +57,13 @@
  	chmod +x $(UNIX_DIR)/install-sh
  	chmod +x $(UNIX_DIR)/mkLinks
  	@$(INSTALL_DATA) $(TK_LIB_FILE) $(LIB_INSTALL_DIR)/$(TK_LIB_FILE)
-+	@ln -sf $(LIB_INSTALL_DIR)/$(TK_LIB_FILE) $(LIB_INSTALL_DIR)/libtk82.so
++	@ln -sf $(LIB_INSTALL_DIR)/$(TK_LIB_FILE) $(LIB_INSTALL_DIR)/libtk${SHORT_TK_VER}.so
  	@(cd $(LIB_INSTALL_DIR); $(RANLIB) $(TK_LIB_FILE))
  	@chmod 555 $(LIB_INSTALL_DIR)/$(TK_LIB_FILE)
-+	@echo "Installing libtk82.a"
-+	@$(INSTALL_DATA) libtk82.a $(LIB_INSTALL_DIR)/libtk82.a
-+	@(cd $(LIB_INSTALL_DIR); $(RANLIB) libtk82.a)
-+	@chmod 555 $(LIB_INSTALL_DIR)/libtk82.a
++	@echo "Installing libtk${SHORT_TK_VER}.a"
++	@$(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"
  	@$(INSTALL_PROGRAM) wish $(BIN_INSTALL_DIR)/wish$(VERSION)
  	@echo "Installing tkConfig.sh"