TclX seems abandoned by its original authors, but the maintainers

of TclPro made TclX-8.3 available last year. There is not a whole
lot of changes, and most of them deal with the Windows parts of the
thing, but here is the upgrade 8.3 anyway. Please, test...

I think, it is time to repocopy tclX82 into tclX and get rid of
tclX75, tclX80, and tclX82...

12 files changed, 38 insertions, 54 deletions

diff --git a/lang/tclX/Makefile b/lang/tclX/Makefile
index fa6afb80a388..c98b4823b42a 100644
--- a/lang/tclX/Makefile
+++ b/lang/tclX/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	tclX
-PORTVERSION=	8.2.0
-PORTREVISION=	2
+PORTVERSION=	8.3
 CATEGORIES=	lang tcl${TCL_DVER} tk${TCL_DVER}
-MASTER_SITES=	http://www.neosoft.com/tcl/ftparchive/TclX/
-DISTNAME=	tclX8.2.0
+MASTER_SITES=	ftp://tcl.activestate.com/pub/tcl/tclx/
+DISTNAME=	tclx${PORTVERSION}
 
 MAINTAINER=	mi@aldan.algebra.com
 
@@ -28,9 +27,10 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/unix
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS= --enable-shared \
+		--with-help=Help \
 		--with-tcl="${LOCALBASE}/lib/tcl${TCL_VER}" \
 		--with-tk="${LOCALBASE}/lib/tk${TCL_VER}"
-PLIST_SUB=	TCLX_LONG_VER=8.2 TCLX_SHORT_VER=82
+PLIST_SUB=	TCLX_LONG_VER=8.3 TCLX_SHORT_VER=83
 
 .ifdef WITHOUT_X11
 CONFIGURE_ARGS+=--enable-tk=NO
@@ -53,11 +53,11 @@ MAN3=   CmdWrite.3 Handles.3 Keylist.3 ObjCmdWrite.3 TclXInit.3 \
 MANN=	Memory.n TclX.n Tcl_DisplayMemory.n Tcl_InitMemory.n \
 	Tcl_ValidateAllMemory.n ckalloc.n ckfree.n memory.n
 
-post-build:
-	cd ${WRKSRC}/../tcl/unix && ${MAKE} buildhelp
-.ifndef WITHOUT_X11
-	cd ${WRKSRC}/../tk/unix && ${MAKE} buildhelp
-.endif
+#post-build:
+#	cd ${WRKSRC}/../tcl/unix && ${MAKE} buildhelp
+#.ifndef WITHOUT_X11
+#	cd ${WRKSRC}/../tk/unix && ${MAKE} buildhelp
+#.endif
 
 
 .include <bsd.port.pre.mk>
diff --git a/lang/tclX/distinfo b/lang/tclX/distinfo
index 5f4897102217..d4babed564a9 100644
--- a/lang/tclX/distinfo
+++ b/lang/tclX/distinfo
@@ -1 +1 @@
-MD5 (tclX8.2.0.tar.gz) = dc2b6dbafebc765154570b143c585670
+MD5 (tclx8.3.tar.gz) = deb98c29eb8fc1b43cc60198105ce24b
diff --git a/lang/tclX/files/patch-ab b/lang/tclX/files/patch-ab
index a06c14156d7e..886e9ac2b1a6 100644
--- a/lang/tclX/files/patch-ab
+++ b/lang/tclX/files/patch-ab
@@ -37,11 +37,6 @@
  	    ${HELP_DIR} Tcl.brf
  	${RUNTCL} -c "buildhelp ${HELP_DIR} TclX.brf ${TCLX_DOC_DIR}/TclX.n"
  
-@@ -322,3 +323,3 @@
- 
--install-misc: buildhelp
-+install-misc:
- 	${INSTCOPY} ${TCLX_GENERIC_DIR}/tclExtend.h \
 @@ -338,9 +339,11 @@
  	    ${INSTCOPY} ${TCLX_STLIB_NAME} ${INSTALL_ROOT}${TCLX_INST_LIB}; \
  	    ${RANLIB} ${INSTALL_ROOT}${TCLX_INST_LIB}/${TCLX_STLIB_NAME}; \
diff --git a/lang/tclX/files/patch-ac b/lang/tclX/files/patch-ac
index c70c6c116fc9..0867456df65e 100644
--- a/lang/tclX/files/patch-ac
+++ b/lang/tclX/files/patch-ac
@@ -25,9 +25,6 @@
  	    ${HELP_DIR} Tk.brf
  
  #------------------------------------------------------------------------------
-@@ -215 +215 @@
--install-misc: buildhelp
-+install-misc:
 @@ -227,9 +228,11 @@
  	    ${INSTCOPY} ${TKX_STLIB_NAME} ${INSTALL_ROOT}${TKX_INST_LIB}; \
  	    ${RANLIB} ${INSTALL_ROOT}${TKX_INST_LIB}/${TKX_STLIB_NAME}; \
diff --git a/lang/tclX/files/patch-ad b/lang/tclX/files/patch-ad
index 40fda9da67b1..69011c45858b 100644
--- a/lang/tclX/files/patch-ad
+++ b/lang/tclX/files/patch-ad
@@ -5,8 +5,8 @@
  # Programs and options used by build
  #
 -CC           = @CC@
--CFLAGS       = @CFLAGS@ @TCL_EXTRA_CFLAGS@
-+CFLAGS      += @TCL_EXTRA_CFLAGS@
+-CFLAGS       = @CFLAGS@ @TCL_CFLAGS_WARNING@ @TCL_EXTRA_CFLAGS@
++CFLAGS      += @TCL_CFLAGS_WARNING@ @TCL_EXTRA_CFLAGS@
  SYSCFLAGS    = @SYSCFLAGS@
  RANLIB       = @RANLIB@
  AR           = ar
diff --git a/lang/tclX/files/patch-ae b/lang/tclX/files/patch-ae
index 9c4212085f60..77a2d2654139 100644
--- a/lang/tclX/files/patch-ae
+++ b/lang/tclX/files/patch-ae
@@ -1,13 +1,13 @@
 --- configure.orig	Sun Feb  6 18:54:02 2000
 +++ configure	Thu Jul 13 14:29:54 2000
-@@ -2009,8 +2009,11 @@
+@@ -2088,8 +2088,11 @@
  	    ;;
  	FreeBSD-*)
  	    # FreeBSD 3.* and greater have ELF.
 +	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
 +	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
 +	    TCL_LIB_VERSIONS_OK=nodots
--	    SHLIB_CFLAGS="-fpic"
+-	    SHLIB_CFLAGS="-fPIC"
 +	    SHLIB_CFLAGS="-fPIC -DPIC"
 	    SHLIB_LD="ld -Bshareable -x"
  	    SHLIB_LD_LIBS=""
@@ -20,16 +20,16 @@
 -eval "TCLX_STLIB_NAME=libtclx${UNSHARED_LIB_SUFFIX}"
 -eval "TCLX_SHLIB_NAME=libtclx${SHARED_LIB_SUFFIX}"
 -eval "TCLX_SHLIB_NAME=${TCLX_SHLIB_NAME}"
-+TCLX_STLIB_NAME=libtclx82.a
-+TCLX_SHLIB_NAME=libtclx82.so.1
++TCLX_STLIB_NAME=libtclx83.a
++TCLX_SHLIB_NAME=libtclx83.so.1
  
  DBGX=${TKX_DBGX}
  VERSION=$TKX_VERSION
 -eval "TKX_STLIB_NAME=libtkx${UNSHARED_LIB_SUFFIX}"
 -eval "TKX_SHLIB_NAME=libtkx${SHARED_LIB_SUFFIX}"
 -eval "TKX_SHLIB_NAME=${TKX_SHLIB_NAME}"
-+TKX_STLIB_NAME=libtkx82.a
-+TKX_SHLIB_NAME=libtkx82.so.1
++TKX_STLIB_NAME=libtkx83.a
++TKX_SHLIB_NAME=libtkx83.so.1
  
  #
  # Determine suffix to use for the object files for the shared library.
diff --git a/lang/tclX82/Makefile b/lang/tclX82/Makefile
index fa6afb80a388..c98b4823b42a 100644
--- a/lang/tclX82/Makefile
+++ b/lang/tclX82/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	tclX
-PORTVERSION=	8.2.0
-PORTREVISION=	2
+PORTVERSION=	8.3
 CATEGORIES=	lang tcl${TCL_DVER} tk${TCL_DVER}
-MASTER_SITES=	http://www.neosoft.com/tcl/ftparchive/TclX/
-DISTNAME=	tclX8.2.0
+MASTER_SITES=	ftp://tcl.activestate.com/pub/tcl/tclx/
+DISTNAME=	tclx${PORTVERSION}
 
 MAINTAINER=	mi@aldan.algebra.com
 
@@ -28,9 +27,10 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/unix
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS= --enable-shared \
+		--with-help=Help \
 		--with-tcl="${LOCALBASE}/lib/tcl${TCL_VER}" \
 		--with-tk="${LOCALBASE}/lib/tk${TCL_VER}"
-PLIST_SUB=	TCLX_LONG_VER=8.2 TCLX_SHORT_VER=82
+PLIST_SUB=	TCLX_LONG_VER=8.3 TCLX_SHORT_VER=83
 
 .ifdef WITHOUT_X11
 CONFIGURE_ARGS+=--enable-tk=NO
@@ -53,11 +53,11 @@ MAN3=   CmdWrite.3 Handles.3 Keylist.3 ObjCmdWrite.3 TclXInit.3 \
 MANN=	Memory.n TclX.n Tcl_DisplayMemory.n Tcl_InitMemory.n \
 	Tcl_ValidateAllMemory.n ckalloc.n ckfree.n memory.n
 
-post-build:
-	cd ${WRKSRC}/../tcl/unix && ${MAKE} buildhelp
-.ifndef WITHOUT_X11
-	cd ${WRKSRC}/../tk/unix && ${MAKE} buildhelp
-.endif
+#post-build:
+#	cd ${WRKSRC}/../tcl/unix && ${MAKE} buildhelp
+#.ifndef WITHOUT_X11
+#	cd ${WRKSRC}/../tk/unix && ${MAKE} buildhelp
+#.endif
 
 
 .include <bsd.port.pre.mk>
diff --git a/lang/tclX82/distinfo b/lang/tclX82/distinfo
index 5f4897102217..d4babed564a9 100644
--- a/lang/tclX82/distinfo
+++ b/lang/tclX82/distinfo
@@ -1 +1 @@
-MD5 (tclX8.2.0.tar.gz) = dc2b6dbafebc765154570b143c585670
+MD5 (tclx8.3.tar.gz) = deb98c29eb8fc1b43cc60198105ce24b
diff --git a/lang/tclX82/files/patch-ab b/lang/tclX82/files/patch-ab
index a06c14156d7e..886e9ac2b1a6 100644
--- a/lang/tclX82/files/patch-ab
+++ b/lang/tclX82/files/patch-ab
@@ -37,11 +37,6 @@
  	    ${HELP_DIR} Tcl.brf
  	${RUNTCL} -c "buildhelp ${HELP_DIR} TclX.brf ${TCLX_DOC_DIR}/TclX.n"
  
-@@ -322,3 +323,3 @@
- 
--install-misc: buildhelp
-+install-misc:
- 	${INSTCOPY} ${TCLX_GENERIC_DIR}/tclExtend.h \
 @@ -338,9 +339,11 @@
  	    ${INSTCOPY} ${TCLX_STLIB_NAME} ${INSTALL_ROOT}${TCLX_INST_LIB}; \
  	    ${RANLIB} ${INSTALL_ROOT}${TCLX_INST_LIB}/${TCLX_STLIB_NAME}; \
diff --git a/lang/tclX82/files/patch-ac b/lang/tclX82/files/patch-ac
index c70c6c116fc9..0867456df65e 100644
--- a/lang/tclX82/files/patch-ac
+++ b/lang/tclX82/files/patch-ac
@@ -25,9 +25,6 @@
  	    ${HELP_DIR} Tk.brf
  
  #------------------------------------------------------------------------------
-@@ -215 +215 @@
--install-misc: buildhelp
-+install-misc:
 @@ -227,9 +228,11 @@
  	    ${INSTCOPY} ${TKX_STLIB_NAME} ${INSTALL_ROOT}${TKX_INST_LIB}; \
  	    ${RANLIB} ${INSTALL_ROOT}${TKX_INST_LIB}/${TKX_STLIB_NAME}; \
diff --git a/lang/tclX82/files/patch-ad b/lang/tclX82/files/patch-ad
index 40fda9da67b1..69011c45858b 100644
--- a/lang/tclX82/files/patch-ad
+++ b/lang/tclX82/files/patch-ad
@@ -5,8 +5,8 @@
  # Programs and options used by build
  #
 -CC           = @CC@
--CFLAGS       = @CFLAGS@ @TCL_EXTRA_CFLAGS@
-+CFLAGS      += @TCL_EXTRA_CFLAGS@
+-CFLAGS       = @CFLAGS@ @TCL_CFLAGS_WARNING@ @TCL_EXTRA_CFLAGS@
++CFLAGS      += @TCL_CFLAGS_WARNING@ @TCL_EXTRA_CFLAGS@
  SYSCFLAGS    = @SYSCFLAGS@
  RANLIB       = @RANLIB@
  AR           = ar
diff --git a/lang/tclX82/files/patch-ae b/lang/tclX82/files/patch-ae
index 9c4212085f60..77a2d2654139 100644
--- a/lang/tclX82/files/patch-ae
+++ b/lang/tclX82/files/patch-ae
@@ -1,13 +1,13 @@
 --- configure.orig	Sun Feb  6 18:54:02 2000
 +++ configure	Thu Jul 13 14:29:54 2000
-@@ -2009,8 +2009,11 @@
+@@ -2088,8 +2088,11 @@
  	    ;;
  	FreeBSD-*)
  	    # FreeBSD 3.* and greater have ELF.
 +	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
 +	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
 +	    TCL_LIB_VERSIONS_OK=nodots
--	    SHLIB_CFLAGS="-fpic"
+-	    SHLIB_CFLAGS="-fPIC"
 +	    SHLIB_CFLAGS="-fPIC -DPIC"
 	    SHLIB_LD="ld -Bshareable -x"
  	    SHLIB_LD_LIBS=""
@@ -20,16 +20,16 @@
 -eval "TCLX_STLIB_NAME=libtclx${UNSHARED_LIB_SUFFIX}"
 -eval "TCLX_SHLIB_NAME=libtclx${SHARED_LIB_SUFFIX}"
 -eval "TCLX_SHLIB_NAME=${TCLX_SHLIB_NAME}"
-+TCLX_STLIB_NAME=libtclx82.a
-+TCLX_SHLIB_NAME=libtclx82.so.1
++TCLX_STLIB_NAME=libtclx83.a
++TCLX_SHLIB_NAME=libtclx83.so.1
  
  DBGX=${TKX_DBGX}
  VERSION=$TKX_VERSION
 -eval "TKX_STLIB_NAME=libtkx${UNSHARED_LIB_SUFFIX}"
 -eval "TKX_SHLIB_NAME=libtkx${SHARED_LIB_SUFFIX}"
 -eval "TKX_SHLIB_NAME=${TKX_SHLIB_NAME}"
-+TKX_STLIB_NAME=libtkx82.a
-+TKX_SHLIB_NAME=libtkx82.so.1
++TKX_STLIB_NAME=libtkx83.a
++TKX_SHLIB_NAME=libtkx83.so.1
  
  #
  # Determine suffix to use for the object files for the shared library.