On Monday 07 June 2010 11:02:07 am Stuart Henderson wrote:
> On 2010/06/06 14:21, Sebastian Reitenbach wrote:
> > RCS file: /cvs/ports/devel/itcl/Makefile,v
> > +VERSION= 3.4
> > +DISTNAME= itcl${VERSION}b1
> > +PKGNAME= itcl-${VERSION}
> > +SHARED_LIBS= itcl34 0.0
>
> looks to me like the version number is 3.4b1, so I think that should
> end up in PKGNAME.
>
> > -MODTCL_VERSION= 8.4
> > +MODTCL_VERSION= 8.5
>
> that can be zapped, 8.5 is the default.
>
> I'm also wondering why not go to the latest version of itcl rather than
> this old one (in particular there's a comment at http://wiki.tcl.tk/62
> "Actually, itcl-ng (aka incr tcl 4.0) is required with Tcl 8.5 and
> later.")
>
> also: this breaks iwidgets. diff included and tested with WordGenerator.
>
> side-note: if you send diffs for multiple ports, please do the diff
> in a parent directory so we don't need to chop the diff up by hand
> before applying it.
>
tested on my sparc64 box, works fine. I just changed one little thing: The
version number of itcl which is set in the configure.in for iwidgets from 3.2
to 3.4. WordGenerator still works with it.
Sebastian
Index: devel/itcl/Makefile
===================================================================
RCS file: /cvs/ports/devel/itcl/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- devel/itcl/Makefile 11 Mar 2009 21:26:03 -0000 1.5
+++ devel/itcl/Makefile 7 Jun 2010 13:56:27 -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}b1
+SHARED_LIBS= itcl34 0.0
CATEGORIES= devel
@@ -22,13 +22,14 @@
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_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: devel/itcl/distinfo
===================================================================
RCS file: /cvs/ports/devel/itcl/distinfo,v
retrieving revision 1.2
diff -u -r1.2 distinfo
--- devel/itcl/distinfo 5 Apr 2007 15:37:54 -0000 1.2
+++ devel/itcl/distinfo 7 Jun 2010 13:56:27 -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: devel/itcl/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
--- devel/itcl/patches/patch-Makefile_in 25 Oct 2006 14:24:03 -0000 1.1.1.1
+++ devel/itcl/patches/patch-Makefile_in 7 Jun 2010 13:56:27 -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: devel/itcl/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
--- devel/itcl/patches/patch-configure 25 Oct 2006 14:24:03 -0000 1.1.1.1
+++ devel/itcl/patches/patch-configure 7 Jun 2010 13:56:27 -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: devel/itcl/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
--- devel/itcl/pkg/PFRAG.shared 25 Oct 2006 14:24:03 -0000 1.1.1.1
+++ devel/itcl/pkg/PFRAG.shared 7 Jun 2010 13:56:27 -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: devel/itcl/pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/itcl/pkg/PLIST,v
retrieving revision 1.2
diff -u -r1.2 PLIST
--- devel/itcl/pkg/PLIST 28 Oct 2006 17:52:18 -0000 1.2
+++ devel/itcl/pkg/PLIST 7 Jun 2010 13:56:27 -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
Index: x11/itk/Makefile
===================================================================
RCS file: /cvs/ports/x11/itk/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- x11/itk/Makefile 13 Mar 2009 12:59:47 -0000 1.4
+++ x11/itk/Makefile 7 Jun 2010 13:56:27 -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
Index: x11/iwidgets/Makefile
===================================================================
RCS file: /cvs/ports/x11/iwidgets/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- x11/iwidgets/Makefile 13 Mar 2009 14:11:02 -0000 1.3
+++ x11/iwidgets/Makefile 7 Jun 2010 13:56:27 -0000
@@ -25,24 +25,22 @@
MODULES= x11/tk
BUILD_DEPENDS= ${MODTK_RUN_DEPENDS}
RUN_DEPENDS= ${BUILD_DEPENDS} \
- ::x11/itk
+ :itcl->=3.4,<3.5:devel/itcl \
+ :itk->=3.3,<3.4:x11/itk
REGRESS_DEPENDS=${RUN_DEPENDS}
# This regression test wants an X11 display
REGRESS_IS_INTERACTIVE= Yes
NO_BUILD= Yes
-MODTCL_VERSION= 8.4
-MODTK_VERSION= 8.4
-ITK_VERSION= 3.3
-ITCL_VERSION= 3.3
-
-CONFIGURE_STYLE=gnu dest
+AUTOCONF_VERSION=2.13
+CONFIGURE_STYLE=autoconf dest
CONFIGURE_ARGS= --with-tcl=${MODTCL_LIBDIR} \
- --with-tk=${MODTK_LIBDIR}
+ --with-tk=${MODTK_LIBDIR} \
+ --with-itcl=${LOCALBASE}/itcl3.4
-CONFIGURE_ENV= ITCL_VERSION=${ITCL_VERSION}
+CONFIGURE_ENV= ITCL_VERSION=3.4
pre-configure:
@perl -pi -e 's,^\.HS,\.TH,' ${WRKBUILD}/doc/*.n
Index: x11/iwidgets/patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/x11/iwidgets/patches/patch-Makefile_in,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-Makefile_in
--- x11/iwidgets/patches/patch-Makefile_in 28 Oct 2006 20:38:25 -0000 1.1.1.1
+++ x11/iwidgets/patches/patch-Makefile_in 7 Jun 2010 13:56:27 -0000
@@ -1,7 +1,15 @@
$OpenBSD: patch-Makefile_in,v 1.1.1.1 2006/10/28 20:38:25 steven Exp $
---- Makefile.in.orig Tue Sep 10 23:27:21 2002
-+++ Makefile.in Sat Oct 28 22:16:08 2006
-@@ -39,7 +39,8 @@ bindir = @bindir@
+--- Makefile.in.orig Tue Sep 10 22:27:21 2002
++++ Makefile.in Mon Jun 7 09:45:14 2010
+@@ -10,6 +10,7 @@
+ # Current [incr Widgets] version; used in various names.
+
+ ITCL_VERSION = @ITCL_VERSION@
++ITK_VERSION = @ITK_VERSION@
+ IWIDGETS_VERSION = @VERSION@
+
+ #----------------------------------------------------------------
+@@ -39,7 +40,8 @@ bindir = @bindir@
INSTALL_ROOT =
# Path name to use when installing library scripts:
@@ -11,7 +19,7 @@
# Directory in which to install the archive libtcl.a:
LIB_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/lib
-@@ -78,11 +79,11 @@ SHELL = /bin/sh
+@@ -78,11 +80,11 @@ SHELL = /bin/sh
# modify any of this stuff by hand.
#----------------------------------------------------------------
@@ -25,7 +33,7 @@
RANLIB = @RANLIB@
LN_S = ln -s
TOP_DIR = $(srcdir)
-@@ -120,8 +121,6 @@ test:
+@@ -120,8 +122,6 @@ test:
install-libraries:
@$(MKINSTALLDIRS) $(SCRIPT_INSTALL_DIR) $(LIB_INSTALL_DIR)
@@ -34,7 +42,7 @@
@$(MKINSTALLDIRS) $(SCRIPT_INSTALL_DIR)/scripts
@echo "Installing source files from $(GENERIC_DIR) into $(SCRIPT_INSTALL_DIR)"
@for i in $(GENERIC_DIR)/*.itk $(GENERIC_DIR)/*.itcl $(GENERIC_DIR)/tclIndex $(GENERIC_DIR)/*.gif ; \
-@@ -135,26 +134,26 @@ install-libraries:
+@@ -135,26 +135,26 @@ install-libraries:
done;
install-demos:
Index: x11/iwidgets/patches/patch-configure
===================================================================
RCS file: /cvs/ports/x11/iwidgets/patches/patch-configure,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-configure
--- x11/iwidgets/patches/patch-configure 28 Oct 2006 20:38:25 -0000 1.1.1.1
+++ x11/iwidgets/patches/patch-configure 7 Jun 2010 13:56:27 -0000
@@ -1,25 +0,0 @@
-$OpenBSD: patch-configure,v 1.1.1.1 2006/10/28 20:38:25 steven Exp $
---- configure.orig Thu Nov 29 21:51:34 2001
-+++ configure Sat Oct 28 22:10:20 2006
-@@ -529,7 +529,7 @@ fi
-
- # RCS: $Id: patch-configure,v 1.1.1.1 2006/10/28 20:38:25 steven Exp $
-
--ITCL_VERSION=3.2
-+#ITCL_VERSION=3.2
-
-
- PACKAGE=iwidgets
-@@ -817,9 +817,9 @@ if test -r $itcl_search/itcl/library/itc
- fi
- fi
-
--if test -z "$ITCL_LIB_DIR"; then
-- { echo "configure: error: Can't find Itcl source. Use --with-itcl to specify the the toplevel incr Tcl directory on your system. (This directory should contain itcl/library/itcl.tcl, itk/library/itk.tcl, and config/mkinstalldirs.)" 1>&2; exit 1; }
--fi
-+#if test -z "$ITCL_LIB_DIR"; then
-+# { echo "configure: error: Can't find Itcl source. Use --with-itcl to specify the the toplevel incr Tcl directory on your system. (This directory should contain itcl/library/itcl.tcl, itk/library/itk.tcl, and config/mkinstalldirs.)" 1>&2; exit 1; }
-+#fi
-
-
- #--------------------------------------------------------------------
Index: x11/iwidgets/patches/patch-configure_in
===================================================================
RCS file: x11/iwidgets/patches/patch-configure_in
diff -N x11/iwidgets/patches/patch-configure_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ x11/iwidgets/patches/patch-configure_in 7 Jun 2010 13:56:27 -0000
@@ -0,0 +1,28 @@
+$OpenBSD$
+--- configure.in.orig Thu Nov 29 21:51:34 2001
++++ configure.in Mon Jun 7 15:26:46 2010
+@@ -5,8 +5,10 @@ dnl installation to configure the system for the local
+ AC_INIT(generic/buttonbox.itk)
+ # RCS: $Id: configure.in,v 1.9 2001/11/29 20:51:34 smithc Exp $
+
+-ITCL_VERSION=3.2
++ITCL_VERSION=3.4
++ITK_VERSION=3.3
+ AC_SUBST(ITCL_VERSION)
++AC_SUBST(ITK_VERSION)
+
+ PACKAGE=iwidgets
+ MAJOR_VERSION=4
+@@ -72,9 +74,9 @@ if test -r $itcl_search/itcl/library/itcl.tcl; then
+ fi
+ fi
+
+-if test -z "$ITCL_LIB_DIR"; then
+- AC_MSG_ERROR(Can't find Itcl source. Use --with-itcl to specify the the toplevel [incr Tcl] directory on your system. (This directory should contain itcl/library/itcl.tcl, itk/library/itk.tcl, and config/mkinstalldirs.))
+-fi
++dnl if test -z "$ITCL_LIB_DIR"; then
++dnl AC_MSG_ERROR(Can't find Itcl source. Use --with-itcl to specify the the toplevel [incr Tcl] directory on your system. (This directory should contain itcl/library/itcl.tcl, itk/library/itk.tcl, and config/mkinstalldirs.))
++dnl fi
+
+
+ #--------------------------------------------------------------------
Index: x11/iwidgets/patches/patch-iwidgets_tcl_in
===================================================================
RCS file: x11/iwidgets/patches/patch-iwidgets_tcl_in
diff -N x11/iwidgets/patches/patch-iwidgets_tcl_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ x11/iwidgets/patches/patch-iwidgets_tcl_in 7 Jun 2010 13:56:27 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- iwidgets.tcl.in.orig Mon Jun 7 09:44:35 2010
++++ iwidgets.tcl.in Mon Jun 7 09:44:47 2010
+@@ -16,7 +16,7 @@
+ package require Tcl 8.0
+ package require Tk 8.0
+ package require Itcl @ITCL_VERSION@
+-package require Itk @ITCL_VERSION@
++package require Itk @ITK_VERSION@
+
+ namespace eval ::iwidgets {
+ namespace export *
