Hi,
attached patch updates itcl to the latest release 3.4.1. All regression tests
pass for me, and cocinella also seems to be happy with it.
is it OK to update?
Sebastian
? itcl-3.4.1.diff
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/itcl/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- Makefile 5 Jan 2011 18:55:31 -0000 1.9
+++ Makefile 27 Oct 2011 06:27:24 -0000
@@ -2,10 +2,10 @@
COMMENT= object-oriented extensions to Tcl
-REVISION = 0
-VERSION= 3.4
-DISTNAME= itcl${VERSION}b1
-PKGNAME= itcl-${VERSION}b1
+VERSION = 3.4.1
+EPOCH = 0
+DISTNAME = itcl${VERSION}
+PKGNAME = itcl-${VERSION}
SHARED_LIBS= itcl34 0.0
CATEGORIES= devel
@@ -41,7 +41,7 @@
CONFIGURE_ENV= CPPFLAGS="-I${MODTCL_INCDIR}/generic \
-I${MODTCL_INCDIR}/unix -I${MODTCL_INCDIR}" \
- LIBitcl34_VERSION=${LIBitcl34_VERSION}
+ SHLIB_VERSION=${LIBitcl34_VERSION}
FAKE_FLAGS = libdir=${MODTCL_TCLDIR}/itcl
pre-configure:
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/itcl/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- distinfo 7 Jun 2010 14:39:46 -0000 1.3
+++ distinfo 27 Oct 2011 06:27:24 -0000
@@ -1,5 +1,5 @@
-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
+MD5 (itcl3.4.1.tar.gz) = 58mOD2nfGmdQc93TNE8Lfw==
+RMD160 (itcl3.4.1.tar.gz) = oyk9jnvu7ozTCKfFbt98eQo3TvQ=
+SHA1 (itcl3.4.1.tar.gz) = t5E3TY/kxbMdb0V5NiJJmp0I0+E=
+SHA256 (itcl3.4.1.tar.gz) = UzCDLOctqXYQSXpY7KkEKH0P+R+ex0Gk5IENW5M8hWg=
+SIZE (itcl3.4.1.tar.gz) = 263316
Index: patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/devel/itcl/patches/patch-Makefile_in,v
retrieving revision 1.3
diff -u -r1.3 patch-Makefile_in
--- patches/patch-Makefile_in 5 Jan 2011 18:55:31 -0000 1.3
+++ patches/patch-Makefile_in 27 Oct 2011 06:27:24 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_in,v 1.3 2011/01/05 18:55:31 sebastia Exp $
---- Makefile.in.orig Mon Dec 15 21:02:58 2008
-+++ Makefile.in Sun Jun 6 12:36:40 2010
-@@ -77,7 +77,7 @@ DESTDIR =
+--- Makefile.in.orig Fri Jul 15 20:30:52 2011
++++ Makefile.in Sun Oct 9 19:00:41 2011
+@@ -75,7 +75,7 @@ DESTDIR =
PKG_DIR = $(PACKAGE_NAME)$(PACKAGE_VERSION)
pkgdatadir = $(datadir)/$(PKG_DIR)
@@ -10,8 +10,8 @@
pkgincludedir = $(includedir)/$(PKG_DIR)
top_builddir = .
-@@ -342,12 +342,12 @@ install-lib-binaries:
- @mkdir -p $(DESTDIR)$(pkglibdir)
+@@ -350,12 +350,12 @@ install-lib-binaries:
+ @$(INSTALL_DATA_DIR) $(DESTDIR)$(pkglibdir)
@list='$(lib_BINARIES)'; for p in $$list; do \
if test -f $$p; then \
- echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p"; \
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/devel/itcl/patches/patch-configure,v
retrieving revision 1.3
diff -u -r1.3 patch-configure
--- patches/patch-configure 5 Jan 2011 18:55:31 -0000 1.3
+++ patches/patch-configure 27 Oct 2011 06:27:24 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.3 2011/01/05 18:55:31 sebastia Exp $
---- configure.orig Fri May 25 00:15:40 2007
-+++ configure Thu Dec 23 14:42:37 2010
-@@ -6340,7 +6340,7 @@ fi
+--- configure.orig Fri Jul 15 20:30:52 2011
++++ configure Sun Oct 9 19:12:57 2011
+@@ -6434,7 +6434,7 @@ echo "${ECHO_T}${ac_cv_c_tclh}" >&6
echo "$as_me:$LINENO: checking for Tcl private include files" >&5
echo $ECHO_N "checking for Tcl private include files... $ECHO_C" >&6
@@ -9,43 +9,33 @@
+ TCL_SRC_DIR=${LOCALBASE}/include/tcl8.5
TCL_SRC_DIR_NATIVE=`${CYGPATH} ${TCL_SRC_DIR}`
TCL_TOP_DIR_NATIVE=\"${TCL_SRC_DIR_NATIVE}\"
- TCL_GENERIC_DIR_NATIVE=\"${TCL_SRC_DIR_NATIVE}/generic\"
-@@ -6369,7 +6369,7 @@ echo $ECHO_N "checking for Tcl private include files..
- ;;
- esac
- else
-- if test ! -f "${TCL_SRC_DIR}/generic/tclInt.h" ; then
-+ if test ! -f "${TCL_SRC_DIR}/tclInt.h" ; then
- { { echo "$as_me:$LINENO: error: Cannot find private header tclInt.h in ${TCL_SRC_DIR}" >&5
+
+@@ -6474,7 +6474,7 @@ echo $ECHO_N "checking for Tcl private include files..
+ esac
+ result="Using ${TCL_INCLUDES}"
+ else
+- if test ! -f "${TCL_SRC_DIR}/generic/tclInt.h" ; then
++ if test ! -f "${TCL_SRC_DIR}/tclInt.h" ; then
+ { { echo "$as_me:$LINENO: error: Cannot find private header tclInt.h in ${TCL_SRC_DIR}" >&5
echo "$as_me: error: Cannot find private header tclInt.h in ${TCL_SRC_DIR}" >&2;}
{ (exit 1); exit 1; }; }
-@@ -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)
--eval pkglibdir="${libdir}/${PACKAGE_NAME}${PACKAGE_VERSION}"
-+eval pkglibdir="${libdir}/${PACKAGE_NAME}"
- if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
- eval itcl_LIB_FLAG="-litcl${PACKAGE_VERSION}${DBGX}"
- eval itcl_STUB_LIB_FLAG="-litclstub${PACKAGE_VERSION}${DBGX}"
-@@ -9489,9 +9489,9 @@ itcl_BUILD_LIB_SPEC="-L`pwd` ${itcl_LIB_FLAG}"
- itcl_LIB_SPEC="-L${pkglibdir} ${itcl_LIB_FLAG}"
+@@ -9841,6 +9841,7 @@ echo "${ECHO_T}${TCLSH_PROG}" >&6
- itcl_BUILD_STUB_LIB_SPEC="-L`pwd` ${itcl_STUB_LIB_FLAG}"
--itcl_STUB_LIB_SPEC="-L${pkglibdir} ${itcl_STUB_LIB_FLAG}"
-+itcl_STUB_LIB_SPEC="-L${pkglibdir}/../../ ${itcl_STUB_LIB_FLAG}"
- itcl_BUILD_STUB_LIB_PATH="`pwd`/${itcl_STUB_LIB_FILE}"
--itcl_STUB_LIB_PATH="${pkglibdir}/${itcl_STUB_LIB_FILE}"
-+itcl_STUB_LIB_PATH="${pkglibdir}/../../${itcl_STUB_LIB_FILE}"
+ # pkglibdir must be a fully qualified path and (not ${exec_prefix}/lib)
+ eval pkglibdir="${libdir}/itcl${PACKAGE_VERSION}"
++ eval pkglibdir="${libdir}/itcl"
+ if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
+ eval itcl_LIB_FLAG="-litcl${PACKAGE_VERSION}${DBGX}"
+ eval itcl_STUB_LIB_FLAG="-litclstub${PACKAGE_VERSION}${DBGX}"
+@@ -9851,9 +9852,9 @@ echo "${ECHO_T}${TCLSH_PROG}" >&6
+ itcl_BUILD_LIB_SPEC="-L`pwd` ${itcl_LIB_FLAG}"
+ itcl_LIB_SPEC="-L${pkglibdir} ${itcl_LIB_FLAG}"
+ itcl_BUILD_STUB_LIB_SPEC="-L`pwd` ${itcl_STUB_LIB_FLAG}"
+- itcl_STUB_LIB_SPEC="-L${pkglibdir} ${itcl_STUB_LIB_FLAG}"
++ itcl_STUB_LIB_SPEC="-L${pkglibdir}/../../ ${itcl_STUB_LIB_FLAG}"
+ itcl_BUILD_STUB_LIB_PATH="`pwd`/${PKG_STUB_LIB_FILE}"
+- itcl_STUB_LIB_PATH="${pkglibdir}/${PKG_STUB_LIB_FILE}"
++ itcl_STUB_LIB_PATH="${pkglibdir}/../../${PKG_STUB_LIB_FILE}"
Index: patches/patch-generic_itcl_cmds_c
===================================================================
RCS file: /cvs/ports/devel/itcl/patches/patch-generic_itcl_cmds_c,v
retrieving revision 1.3
diff -u -r1.3 patch-generic_itcl_cmds_c
--- patches/patch-generic_itcl_cmds_c 5 Jan 2011 18:55:31 -0000 1.3
+++ patches/patch-generic_itcl_cmds_c 27 Oct 2011 06:27:24 -0000
@@ -2,9 +2,9 @@
On OpenBSD we only have one version installed.
---- generic/itcl_cmds.c.orig Sun Dec 12 12:25:58 2010
-+++ generic/itcl_cmds.c Sun Dec 12 12:26:47 2010
-@@ -62,7 +62,7 @@ namespace eval ::itcl {\n\
+--- generic/itcl_cmds.c.orig Fri Jul 15 20:30:52 2011
++++ generic/itcl_cmds.c Sun Oct 9 19:00:41 2011
+@@ -60,7 +60,7 @@ namespace eval ::itcl {\n\
if {[info exists env(ITCL_LIBRARY)]} {\n\
lappend dirs $env(ITCL_LIBRARY)\n\
}\n\
Index: patches/patch-pkgIndex_tcl_in
===================================================================
RCS file: /cvs/ports/devel/itcl/patches/patch-pkgIndex_tcl_in,v
retrieving revision 1.2
diff -u -r1.2 patch-pkgIndex_tcl_in
--- patches/patch-pkgIndex_tcl_in 5 Jan 2011 18:55:31 -0000 1.2
+++ patches/patch-pkgIndex_tcl_in 27 Oct 2011 06:27:24 -0000
@@ -1,7 +1,8 @@
---- pkgIndex.tcl.in.orig Thu Jul 20 18:25:18 2006
-+++ pkgIndex.tcl.in Thu Jul 20 18:25:28 2006
-@@ -1,3 +1,3 @@
+--- pkgIndex.tcl.in.orig Fri Jul 15 18:34:43 2011
++++ pkgIndex.tcl.in Sun Oct 9 19:00:41 2011
+@@ -1,4 +1,4 @@
# Tcl package index file, version 1.0
--package ifneeded Itcl @PACKAGE_VERSION@ [list load [file join $dir "@PKG_LIB_FILE@"] Itcl]
+-if {![package vsatisfies [package present Tcl] @TCL_VERSION@]} {return}
+package ifneeded Itcl @PACKAGE_VERSION@ [list load [file join $dir ../.. "@PKG_LIB_FILE@"] Itcl]
+ package ifneeded Itcl @PACKAGE_VERSION@ [list load [file join $dir "@PKG_LIB_FILE@"] Itcl]
