Re: fix devel/itcl

2012-05-01 Thread Sebastian Reitenbach
 
On Monday, April 30, 2012 21:10 CEST, Stuart Cassoff s...@bell.net wrote: 
 
 On 04/30/12 08:44, Sebastian Reitenbach wrote:
  Hi,
  
  it seems, the patch to the pkgIndex.tcl is b0rked. However, it went in 
  unnoticted, this way it is now,
  itcl is not working.
  
  Attached patch fixes it, OK?
 
 Ok from me, but how about this?
 No need to remove the Tcl version check.

Right. I thought that was initially removed to allow loading Itcl with tcl 8.4 
and 8.5.
But I tested and found that tcl 8.4, even without the version check, will not 
load
the Itcl library. So I left the version check in.

Thanks for pointing that out.

Sebastian

 
 Stu
 
 
 Index: patches/patch-pkgIndex_tcl_in
 ===
 RCS file: /cvs/ports/devel/itcl/patches/patch-pkgIndex_tcl_in,v
 retrieving revision 1.3
 diff -u -p -r1.3 patch-pkgIndex_tcl_in
 --- patches/patch-pkgIndex_tcl_in 30 Oct 2011 07:36:05 -  1.3
 +++ patches/patch-pkgIndex_tcl_in 30 Apr 2012 19:08:12 -
 @@ -1,8 +1,8 @@
  pkgIndex.tcl.in.orig Fri Jul 15 18:34:43 2011
 -+++ pkgIndex.tcl.in  Sun Oct  9 19:00:41 2011
 +--- pkgIndex.tcl.in.orig Mon Apr 30 15:02:45 2012
  pkgIndex.tcl.in  Mon Apr 30 15:04:49 2012
  @@ -1,4 +1,4 @@
   # Tcl package index file, version 1.0
 
 --if {![package vsatisfies [package present Tcl] @TCL_VERSION@]} {return}
 + 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]
 - package ifneeded Itcl @PACKAGE_VERSION@ [list load [file join $dir 
 @PKG_LIB_FILE@] Itcl]
 
 
 
 
 



fix devel/itcl

2012-04-30 Thread Sebastian Reitenbach
Hi,

it seems, the patch to the pkgIndex.tcl is b0rked. However, it went in 
unnoticted, this way it is now,
itcl is not working.

Attached patch fixes it, OK?

Index: Makefile
===
RCS file: /cvs/ports/devel/itcl/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- Makefile30 Oct 2011 07:36:05 -  1.10
+++ Makefile30 Apr 2012 12:41:46 -
@@ -3,6 +3,7 @@
 COMMENT=   object-oriented extensions to Tcl
 
 VERSION =  3.4.1
+REVISION = 0
 EPOCH =0
 DISTNAME = itcl${VERSION}
 PKGNAME =  itcl-${VERSION}
Index: patches/patch-pkgIndex_tcl_in
===
RCS file: /cvs/ports/devel/itcl/patches/patch-pkgIndex_tcl_in,v
retrieving revision 1.3
diff -u -r1.3 patch-pkgIndex_tcl_in
--- patches/patch-pkgIndex_tcl_in   30 Oct 2011 07:36:05 -  1.3
+++ patches/patch-pkgIndex_tcl_in   30 Apr 2012 12:41:46 -
@@ -1,8 +1,8 @@
 --- pkgIndex.tcl.in.orig   Fri Jul 15 18:34:43 2011
-+++ pkgIndex.tcl.inSun Oct  9 19:00:41 2011
-@@ -1,4 +1,4 @@
 pkgIndex.tcl.inMon Apr 30 14:39:29 2012
+@@ -1,4 +1,3 @@
  # Tcl package index file, version 1.0
  
 -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]
- package ifneeded Itcl @PACKAGE_VERSION@ [list load [file join $dir 
@PKG_LIB_FILE@] Itcl]



Re: fix devel/itcl

2012-04-30 Thread Stuart Cassoff
On 04/30/12 08:44, Sebastian Reitenbach wrote:
 Hi,
 
 it seems, the patch to the pkgIndex.tcl is b0rked. However, it went in 
 unnoticted, this way it is now,
 itcl is not working.
 
 Attached patch fixes it, OK?

Ok from me, but how about this?
No need to remove the Tcl version check.

Stu


Index: patches/patch-pkgIndex_tcl_in
===
RCS file: /cvs/ports/devel/itcl/patches/patch-pkgIndex_tcl_in,v
retrieving revision 1.3
diff -u -p -r1.3 patch-pkgIndex_tcl_in
--- patches/patch-pkgIndex_tcl_in   30 Oct 2011 07:36:05 -  1.3
+++ patches/patch-pkgIndex_tcl_in   30 Apr 2012 19:08:12 -
@@ -1,8 +1,8 @@
 pkgIndex.tcl.in.orig   Fri Jul 15 18:34:43 2011
-+++ pkgIndex.tcl.inSun Oct  9 19:00:41 2011
+--- pkgIndex.tcl.in.orig   Mon Apr 30 15:02:45 2012
 pkgIndex.tcl.inMon Apr 30 15:04:49 2012
 @@ -1,4 +1,4 @@
  # Tcl package index file, version 1.0

--if {![package vsatisfies [package present Tcl] @TCL_VERSION@]} {return}
+ 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]
- package ifneeded Itcl @PACKAGE_VERSION@ [list load [file join $dir 
@PKG_LIB_FILE@] Itcl]