Hi,
since the update of coccinella could make use of it, I updated
devel/itcl to 3.4, so that it builds and is usable against tcl-8.5.8.
Also updated x11/itk since its the only port depending on itcl.
However, with itcl and tcl-8.5.8, there is one regression failing, but
itk regressions are all fine.
I only tested the use of itcl in coccinella, its needed there to get
some games running, and so far it seems to work fine.
The mail to the actual maintainer listed in the makefiles timed out: no
route to the mail host.
If there is no response from the maintainer, I'd also take
maintainership of those two ports.
compiled and ran the regression tests for itcl on i386, sparc, sparc64,
and mips64, for itk on the same but sparc.
Please check and commit if its fine, otherwise in case of problems
please report back.
cheers,
Sebastian
? itcl-update.patch
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/itcl/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- Makefile 11 Mar 2009 21:26:03 -0000 1.5
+++ Makefile 6 Jun 2010 11:38:40 -0000
@@ -2,10 +2,10 @@
COMMENT= object-oriented extensions to Tcl
-VERSION= 3.3
-DISTNAME= itcl${VERSION}
-PKGNAME= itcl-${VERSION}p2
-SHARED_LIBS= itcl33 0.0
+VERSION= 3.4
+DISTNAME= itcl${VERSION}b1
+PKGNAME= itcl-${VERSION}
+SHARED_LIBS= itcl34 0.0
CATEGORIES= devel
@@ -22,13 +22,16 @@
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=incrtcl/}
MODULES= lang/tcl
-MODTCL_VERSION= 8.4
+
+MODTCL_VERSION= 8.5
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 +41,13 @@
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>
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/itcl/distinfo,v
retrieving revision 1.2
diff -u -r1.2 distinfo
--- distinfo 5 Apr 2007 15:37:54 -0000 1.2
+++ distinfo 6 Jun 2010 11:38:40 -0000
@@ -1,5 +1,5 @@
-MD5 (itcl3.3.tar.gz) = 2Viz0cUvpTNrWqzBJRtc4w==
-RMD160 (itcl3.3.tar.gz) = zZ/u14k4rdOo+RY7xSqa/0n+d3M=
-SHA1 (itcl3.3.tar.gz) = YhBCD1RNlEdH8zNihGhnjhIJ/Xo=
-SHA256 (itcl3.3.tar.gz) = eCm16jnQ7Q7qQ6BxzTnnR3ND1Z4dLqnIEPpT4lf8tVw=
-SIZE (itcl3.3.tar.gz) = 306364
+MD5 (itcl3.4b1.tar.gz) = 5Ml3UMCKtH6WC5GRH90BMg==
+RMD160 (itcl3.4b1.tar.gz) = gMBU734V/99NMWOEuhFfvI79wCE=
+SHA1 (itcl3.4b1.tar.gz) = jhuj7C85iVmFUJksor/rW8KXbMQ=
+SHA256 (itcl3.4b1.tar.gz) = 3Jn89sALAHdNv7lMzEN+o+YxWhmGRbbSrPisuo/bRgg=
+SIZE (itcl3.4b1.tar.gz) = 306342
Index: patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/devel/itcl/patches/patch-Makefile_in,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-Makefile_in
--- patches/patch-Makefile_in 25 Oct 2006 14:24:03 -0000 1.1.1.1
+++ patches/patch-Makefile_in 6 Jun 2010 11:38:40 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-Makefile_in,v 1.1.1.1 2006/10/25 14:24:03 steven Exp $
---- Makefile.in.orig Fri Mar 25 23:58:48 2005
-+++ Makefile.in Wed Oct 25 16:22:20 2006
+--- Makefile.in.orig Mon Dec 15 21:02:58 2008
++++ Makefile.in Sun Jun 6 12:36:40 2010
@@ -77,7 +77,7 @@ DESTDIR =
PKG_DIR = $(PACKAGE_NAME)$(PACKAGE_VERSION)
@@ -10,7 +10,7 @@
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 \
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/devel/itcl/patches/patch-configure,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-configure
--- patches/patch-configure 25 Oct 2006 14:24:03 -0000 1.1.1.1
+++ patches/patch-configure 6 Jun 2010 11:38:40 -0000
@@ -1,21 +1,16 @@
$OpenBSD: patch-configure,v 1.1.1.1 2006/10/25 14:24:03 steven Exp $
---- configure.orig Fri Mar 25 20:37:41 2005
-+++ configure Wed Oct 25 16:24:20 2006
-@@ -8034,11 +8034,11 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&
- $EGREP "yes" >/dev/null 2>&1; then
- echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
-- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1.0'
-+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.${LIBitcl33_VERSION}'
- else
- echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6
-- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1.0'
-+ 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
+--- configure.orig Fri May 25 00:15:40 2007
++++ configure Sun Jun 6 12:37:28 2010
+@@ -7729,7 +7729,7 @@ echo "${ECHO_T}$tcl_cv_ld_elf" >&6
+ DL_LIBS=""
+ CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
+ LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
+- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1.0'
++ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.${LIBitcl34_VERSION}'
+ echo "$as_me:$LINENO: checking for ELF" >&5
+ echo $ECHO_N "checking for ELF... $ECHO_C" >&6
+ if test "${tcl_cv_ld_elf+set}" = set; then
+@@ -9477,7 +9477,7 @@ echo "${ECHO_T}${TCLSH_PROG}" >&6
#--------------------------------------------------------------------
# pkglibdir must be a fully qualified path and (not ${exec_prefix}/lib)
Index: pkg/PFRAG.shared
===================================================================
RCS file: /cvs/ports/devel/itcl/pkg/PFRAG.shared,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 PFRAG.shared
--- pkg/PFRAG.shared 25 Oct 2006 14:24:03 -0000 1.1.1.1
+++ pkg/PFRAG.shared 6 Jun 2010 11:38:40 -0000
@@ -1,2 +1,2 @@
@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2006/10/25 14:24:03 steven Exp $
-...@lib lib/libitcl33.so.${LIBitcl33_VERSION}
+...@lib lib/libitcl34.so.${LIBitcl34_VERSION}
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/itcl/pkg/PLIST,v
retrieving revision 1.2
diff -u -r1.2 PLIST
--- pkg/PLIST 28 Oct 2006 17:52:18 -0000 1.2
+++ pkg/PLIST 6 Jun 2010 11:38:40 -0000
@@ -9,7 +9,7 @@
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
? itk-update.patch
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/itk/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- Makefile 13 Mar 2009 12:59:47 -0000 1.4
+++ Makefile 6 Jun 2010 11:48:20 -0000
@@ -4,7 +4,7 @@
VERSION= 3.3
DISTNAME= itk${VERSION}
-PKGNAME= itk-${VERSION}p1
+PKGNAME= itk-${VERSION}p2
SHARED_LIBS= itk33 0.0
CATEGORIES= x11 devel
@@ -25,13 +25,11 @@
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=incrtcl/}
LIB_DEPENDS= ${MODTK_LIB_DEPENDS} \
- itcl33::devel/itcl
+ itcl34::devel/itcl
RUN_DEPENDS= ${MODTK_RUN_DEPENDS} \
::devel/itcl
-MODTCL_VERSION= 8.4
-MODTK_VERSION= 8.4
-ITCL_VERSION= 3.3
+ITCL_VERSION= 3.4
SUBST_VARS= VERSION
