update to 3.4b1, allowing this to work with Tcl 8.5.

From Sebastian Reitenbach with some changes by me & tested by Sebastian.
earlier version ok jasper@

(not moving to itcl 4.0 yet; other parts are needed first).

devel/itcl/Makefile

@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.5 2009/03/11 21:26:03 sthen Exp $
+# $OpenBSD: Makefile,v 1.6 2010/06/07 14:39:46 sthen Exp $
 
 COMMENT=	object-oriented extensions to Tcl
 
-VERSION=	3.3
+VERSION=	3.4
-DISTNAME=	itcl${VERSION}
+DISTNAME=	itcl${VERSION}b1
-PKGNAME=	itcl-${VERSION}p2
+PKGNAME=	itcl-${VERSION}b1
-SHARED_LIBS=	itcl33	0.0
+SHARED_LIBS=	itcl34	0.0
 
 CATEGORIES=	devel
 
@@ -22,13 +22,14 @@ PERMIT_DISTFILES_FTP=	Yes
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=incrtcl/}
 
 MODULES=	lang/tcl
-MODTCL_VERSION=	8.4
 
 RUN_DEPENDS=	${MODTCL_RUN_DEPENDS}
 BUILD_DEPENDS=	${MODTCL_BUILD_DEPENDS}
 
 SUBST_VARS=	VERSION
 
+WRKDIST=	${WRKDIR}/itcl${VERSION}
+
 CONFIGURE_STYLE=gnu
 
 CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
@@ -38,11 +39,13 @@ CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
 
 CONFIGURE_ENV=	CPPFLAGS="-I${MODTCL_INCDIR}/generic \
 		-I${MODTCL_INCDIR}/unix" \
-		LIBitcl33_VERSION=${LIBitcl33_VERSION}
+		LIBitcl34_VERSION=${LIBitcl34_VERSION}
+
+SUBST_VARS=VERSION
 
 do-regress:
 	@cd ${WRKSRC} && ${SETENV} ITCL_LIBRARY=${WRKSRC}/library \
 		${MODTCL_BIN} tests/all.tcl -load \
-		"load ./libitcl33.so.${LIBitcl33_VERSION}"
+		"load ./libitcl34.so.${LIBitcl34_VERSION}"
 
 .include <bsd.port.mk>

devel/itcl/distinfo

@@ -1,5 +1,5 @@
-MD5 (itcl3.3.tar.gz) = 2Viz0cUvpTNrWqzBJRtc4w==
+MD5 (itcl3.4b1.tar.gz) = 5Ml3UMCKtH6WC5GRH90BMg==
-RMD160 (itcl3.3.tar.gz) = zZ/u14k4rdOo+RY7xSqa/0n+d3M=
+RMD160 (itcl3.4b1.tar.gz) = gMBU734V/99NMWOEuhFfvI79wCE=
-SHA1 (itcl3.3.tar.gz) = YhBCD1RNlEdH8zNihGhnjhIJ/Xo=
+SHA1 (itcl3.4b1.tar.gz) = jhuj7C85iVmFUJksor/rW8KXbMQ=
-SHA256 (itcl3.3.tar.gz) = eCm16jnQ7Q7qQ6BxzTnnR3ND1Z4dLqnIEPpT4lf8tVw=
+SHA256 (itcl3.4b1.tar.gz) = 3Jn89sALAHdNv7lMzEN+o+YxWhmGRbbSrPisuo/bRgg=
-SIZE (itcl3.3.tar.gz) = 306364
+SIZE (itcl3.4b1.tar.gz) = 306342

devel/itcl/patches/patch-Makefile_in

@@ -1,6 +1,6 @@
-$OpenBSD: patch-Makefile_in,v 1.1.1.1 2006/10/25 14:24:03 steven Exp $
+$OpenBSD: patch-Makefile_in,v 1.2 2010/06/07 14:39:46 sthen Exp $
---- Makefile.in.orig	Fri Mar 25 23:58:48 2005
+--- Makefile.in.orig	Mon Dec 15 21:02:58 2008
-+++ Makefile.in	Wed Oct 25 16:22:20 2006
++++ Makefile.in	Sun Jun  6 12:36:40 2010
 @@ -77,7 +77,7 @@ DESTDIR		=
  
  PKG_DIR		= $(PACKAGE_NAME)$(PACKAGE_VERSION)
@@ -10,7 +10,7 @@ $OpenBSD: patch-Makefile_in,v 1.1.1.1 2006/10/25 14:24:03 steven Exp $
  pkgincludedir	= $(includedir)/$(PKG_DIR)
  
  top_builddir	= .
-@@ -341,12 +341,12 @@ install-lib-binaries:
+@@ -342,12 +342,12 @@ install-lib-binaries:
  	@mkdir -p $(DESTDIR)$(pkglibdir)
  	@list='$(lib_BINARIES)'; for p in $$list; do \
  	  if test -f $$p; then \

devel/itcl/patches/patch-configure

@@ -1,21 +1,16 @@
-$OpenBSD: patch-configure,v 1.1.1.1 2006/10/25 14:24:03 steven Exp $
+$OpenBSD: patch-configure,v 1.2 2010/06/07 14:39:46 sthen Exp $
---- configure.orig	Fri Mar 25 20:37:41 2005
+--- configure.orig	Fri May 25 00:15:40 2007
-+++ configure	Wed Oct 25 16:24:20 2006
++++ configure	Sun Jun  6 12:37:28 2010
-@@ -8034,11 +8034,11 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&
+@@ -7729,7 +7729,7 @@ echo "${ECHO_T}$tcl_cv_ld_elf" >&6
-   $EGREP "yes" >/dev/null 2>&1; then
+ 	    DL_LIBS=""
-   echo "$as_me:$LINENO: result: yes" >&5
+ 	    CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
- echo "${ECHO_T}yes" >&6
+ 	    LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
--		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1.0'
+-	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1.0'
-+		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.${LIBitcl33_VERSION}'
++	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.${LIBitcl34_VERSION}'
- else
+ 	    echo "$as_me:$LINENO: checking for ELF" >&5
-   echo "$as_me:$LINENO: result: no" >&5
+ echo $ECHO_N "checking for ELF... $ECHO_C" >&6
- echo "${ECHO_T}no" >&6
+ if test "${tcl_cv_ld_elf+set}" = set; then
--		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1.0'
+@@ -9477,7 +9477,7 @@ echo "${ECHO_T}${TCLSH_PROG}" >&6
-+		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.${LIBitcl33_VERSION}'
- 
- fi
- rm -f conftest*
-@@ -9474,7 +9474,7 @@ echo "$as_me: error: No tclsh found in P
  #--------------------------------------------------------------------
  
  # pkglibdir must be a fully qualified path and (not ${exec_prefix}/lib)

devel/itcl/pkg/PFRAG.shared

@@ -1,2 +1,2 @@
-@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2006/10/25 14:24:03 steven Exp $
+@comment $OpenBSD: PFRAG.shared,v 1.2 2010/06/07 14:39:46 sthen Exp $
-@lib lib/libitcl33.so.${LIBitcl33_VERSION}
+@lib lib/libitcl34.so.${LIBitcl34_VERSION}

devel/itcl/pkg/PLIST

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.2 2006/10/28 17:52:18 steven Exp $
+@comment $OpenBSD: PLIST,v 1.3 2010/06/07 14:39:46 sthen Exp $
 %%SHARED%%
 include/itcl${VERSION}/
 include/itcl${VERSION}/itcl.h
@@ -9,7 +9,7 @@ lib/itcl${VERSION}/
 lib/itcl${VERSION}/itcl.tcl
 lib/itcl${VERSION}/itclConfig.sh
 lib/itcl${VERSION}/pkgIndex.tcl
-lib/libitclstub33.a
+lib/libitclstub34.a
 @man man/mann/body.n
 @man man/mann/class.n
 @man man/mann/code.n