svn commit: r388270 - in head/devel/tcllib: . files

[Mikhail Teterin]

Author: mi
Date: Mon Jun  1 19:49:19 2015
New Revision: 388270
URL: https://svnweb.freebsd.org/changeset/ports/388270

Log:
  Upstream is having difficulties connecting their Fossil-repository
  to GitHub and the version currently offered by GH for download is
  missing a lot of files, which were included before.
  
  Go back to the distfile used 4 days ago -- hosted privately for the
  time being. The filename is deliberately preserved so people and
  mirrors, which already have the correct version, would not have to
  re-download.

Modified:
  head/devel/tcllib/Makefile
  head/devel/tcllib/distinfo
  head/devel/tcllib/files/patch-jpeg

Modified: head/devel/tcllib/Makefile
==============================================================================
--- head/devel/tcllib/Makefile	Mon Jun  1 19:38:14 2015	(r388269)
+++ head/devel/tcllib/Makefile	Mon Jun  1 19:49:19 2015	(r388270)
@@ -2,10 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	tcllib
-DISTVERSIONPREFIX=	${PORTNAME}_
 DISTVERSION=	1_17
 PORTREVISION=	1
 CATEGORIES=	devel tcl
+MASTER_SITES=	http://aldan.algebra.com/~mi/port-stuff/
+DISTFILES=	tcltk-tcllib-${PORTVERSION}-tcllib_${DISTVERSION}_GH0.tar.gz
 
 MAINTAINER=	tcltk at FreeBSD.org
 COMMENT=	Collection of utility modules for Tcl
@@ -19,9 +20,7 @@ BUILD_DEPENDS=	critcl:${PORTSDIR}/devel/
 
 OPTIONS_DEFINE=	DOCS MANPAGES
 
-USE_GITHUB=	yes
-GH_ACCOUNT=	tcltk
-
+WRKSRC=		${WRKDIR}/tcllib-tcllib_${DISTVERSION}
 USES+=		tcl
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	ac_cv_path_tclsh="${TCLSH}"

Modified: head/devel/tcllib/distinfo
==============================================================================
--- head/devel/tcllib/distinfo	Mon Jun  1 19:38:14 2015	(r388269)
+++ head/devel/tcllib/distinfo	Mon Jun  1 19:49:19 2015	(r388270)
@@ -1,2 +1,2 @@
-SHA256 (tcltk-tcllib-tcllib_1_17_GH0.tar.gz) = 1ff06cb50002bf98174e8d4d1127710251a0e2aa4bb615f66a1dad263a901971
-SIZE (tcltk-tcllib-tcllib_1_17_GH0.tar.gz) = 7686336
+SHA256 (tcltk-tcllib-1.17-tcllib_1_17_GH0.tar.gz) = cbfbad79314e752f63b78227a2a33e91fba1ebcabe3b69fa8d1ee6b235125043
+SIZE (tcltk-tcllib-1.17-tcllib_1_17_GH0.tar.gz) = 8284201

Modified: head/devel/tcllib/files/patch-jpeg
==============================================================================
--- head/devel/tcllib/files/patch-jpeg	Mon Jun  1 19:38:14 2015	(r388269)
+++ head/devel/tcllib/files/patch-jpeg	Mon Jun  1 19:49:19 2015	(r388270)
@@ -1,12 +1,9 @@
---- modules/jpeg/jpeg.tcl	2014-02-11 14:04:18.000000000 -0500
-+++ modules/jpeg/jpeg.tcl	2014-12-09 00:28:21.000000000 -0500
-@@ -364,5 +364,8 @@
-     set fh [openJFIF $file]
-     set r [catch {getExifFromChannel $fh $type} err]
--    close $fh
-+    if {$err != ""} {
-+	# If err is empty, the file is closed already
-+	close $fh
-+    }
-     return -code $r $err
- }
+--- modules/jpeg/jpeg.tcl	2015-04-30 04:21:20 UTC
++++ modules/jpeg/jpeg.tcl
+@@ -402,5 +402,5 @@ proc ::jpeg::getExifFromChannel {chan {t
+             # offset of next exif block (for thumbnail)
+             _scan $byteOrder [read $chan 4] i next
+-            if {$next <= 0} { close $chan ; return }
++            if {$next <= 0} { return }
+             # but its relative to start
+             seek $chan [expr {$start + $next}] start