From jhanna@h24-81-10-24.vc.shawcable.net  Mon Mar  8 11:54:43 2004
Return-Path: <jhanna@h24-81-10-24.vc.shawcable.net>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id A6BFF16A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Mon,  8 Mar 2004 11:54:43 -0800 (PST)
Received: from h24-81-10-24.vc.shawcable.net (h24-81-10-24.vc.shawcable.net [24.81.10.24])
	by mx1.FreeBSD.org (Postfix) with ESMTP id EBB0D43D3F
	for <FreeBSD-gnats-submit@freebsd.org>; Mon,  8 Mar 2004 11:54:42 -0800 (PST)
	(envelope-from jhanna@h24-81-10-24.vc.shawcable.net)
Received: from h24-81-10-24.vc.shawcable.net (localhost [127.0.0.1])
	by h24-81-10-24.vc.shawcable.net (8.12.11/8.12.10) with ESMTP id i28JsgIr083095
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 8 Mar 2004 11:54:42 -0800 (PST)
	(envelope-from jhanna@h24-81-10-24.vc.shawcable.net)
Received: (from jhanna@localhost)
	by h24-81-10-24.vc.shawcable.net (8.12.11/8.12.10/Submit) id i28JsfWG083094;
	Mon, 8 Mar 2004 11:54:41 -0800 (PST)
	(envelope-from jhanna)
Message-Id: <200403081954.i28JsfWG083094@h24-81-10-24.vc.shawcable.net>
Date: Mon, 8 Mar 2004 11:54:41 -0800 (PST)
From: Jonathan Hanna <jhanna@h24-81-10-24.vc.shawcable.net>
Reply-To: Jonathan Hanna <jhanna@shaw.ca>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: fix for change in spin tarball
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         63940
>Category:       ports
>Synopsis:       fix for change in spin tarball
>Confidential:   no
>Severity:       serious
>Priority:       low
>Responsible:    trevor
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Mar 08 12:00:38 PST 2004
>Closed-Date:    Tue Mar 09 14:52:25 PST 2004
>Last-Modified:  Tue Mar 09 14:52:25 PST 2004
>Originator:     Jonathan Hanna
>Release:        FreeBSD 4.9-STABLE i386
>Organization:
>Environment:
System: FreeBSD cub.pangolin-systems.com 4.9-STABLE FreeBSD 4.9-STABLE #0: Tue Mar 2 23:03:59 PST 2004 jhanna@cub.pangolin-systems.com:/usr/obj/usr/src/sys/CUB.debug i386

>Description:

The xspin now distributed whith spin 4.1.2 has changed a bit,
though the spin version has not changed. The xspin in the
tarball has also aquired <cr><lf> line endings.

>How-To-Repeat:

>Fix:

diff -urNP spin.orig/Makefile spin/Makefile
--- spin.orig/Makefile	Mon Feb 23 14:34:47 2004
+++ spin/Makefile	Mon Mar  8 11:45:21 2004
@@ -39,6 +39,10 @@
 post-extract:
 	@cd ${WRKDIR}/Test && ${SH} ${WRKDIR}/Test/examples
 
+pre-patch:
+	${TR} -d '\015' < ${WRKDIR}/Xspin4.1/xspin412.tcl > ${WRKDIR}/Xspin4.1/xspin412.tcl.tmp
+	${MV} -f ${WRKDIR}/Xspin4.1/xspin412.tcl.tmp ${WRKDIR}/Xspin4.1/xspin412.tcl
+
 post-patch:
 	@WISH=`(cd ${LOCALBASE}/bin ; ${LS} wish8* ) | tail -1` ; \
 	if [ -z "$$WISH" ] ; then WISH=wish8.0 ; fi ; \
diff -urNP spin.orig/distinfo spin/distinfo
--- spin.orig/distinfo	Mon Feb 23 14:34:47 2004
+++ spin/distinfo	Mon Mar  8 11:26:06 2004
@@ -1,2 +1,2 @@
-MD5 (spin/spin412.tar.gz) = 6cbc680c4e441611e31b052201f13848
-SIZE (spin/spin412.tar.gz) = 321465
+MD5 (spin/spin412.tar.gz) = 0c25485f37ef44d01328833b293734a2
+SIZE (spin/spin412.tar.gz) = 322223
diff -urNP spin.orig/files/patch-xspin spin/files/patch-xspin
--- spin.orig/files/patch-xspin	Mon Feb 23 14:34:47 2004
+++ spin/files/patch-xspin	Mon Mar  8 11:45:48 2004
@@ -1,29 +1,11 @@
---- ../Xspin4.1/xspin412.tcl.orig	Mon Feb 23 12:57:50 2004
-+++ ../Xspin4.1/xspin412.tcl	Mon Feb 23 12:59:00 2004
-@@ -1,25 +1,4 @@
+--- ../Xspin4.1/xspin412.tcl.orig	Mon Mar  8 11:27:07 2004
++++ ../Xspin4.1/xspin412.tcl	Mon Mar  8 11:31:09 2004
+@@ -1,6 +1,6 @@
 -#!/bin/sh
--# the next line restarts using wish \
--exec wish c:/cygwin/bin/xspin -- $*
--
--# make sure this is where (a copy of) this script is stored
--#
--
--# cd	;# enable this line to cd to you home directory by default
--
--# on PCs:
--# adjust the first argument to wish above with the name and
--# location of this file on your system, if different.
--#
--# Cygwin:
--# if you use cygwin, do not refer to the file as /usr/bin/xspin
--# /usr/bin is a symbolic link to /bin, which really
--# lives in c:/cygwin, hence the contortions above
--#
--# on Unix/Linux/Solaris systems
--# replace the first line with something like
--#	#!/usr/bin/wish -f
--# using the pathname for the wish executable on your system
 +#!%%LOCALBASE%%/bin/%%WISH%% -f
+ # the next line restarts using wish \
+-exec wish c:/cygwin/bin/xspin -- $*
++# exec wish c:/cygwin/bin/xspin -- $*
+ 
+ # cd	;# enable to cd to home directory by default
  
- #======================================================================#
- # Tcl/Tk Spin Controller, written by Gerard J. Holzmann, 1995-2004.    #
>Release-Note:
>Audit-Trail:

From: Kirill Ponomarew <krion@FreeBSD.org>
To: Jonathan Hanna <jhanna@shaw.ca>
Cc: FreeBSD-gnats-submit@FreeBSD.org
Subject: Re: ports/63940: fix for change in spin tarball
Date: Mon, 8 Mar 2004 21:06:30 +0100

 --0vzXIDBeUiKkjNJl
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 Content-Transfer-Encoding: quoted-printable
 
 Hi,
 
 On Mon, Mar 08, 2004 at 11:54:41AM -0800, Jonathan Hanna wrote:
 =20
 > The xspin now distributed whith spin 4.1.2 has changed a bit,
 > though the spin version has not changed. The xspin in the
 > tarball has also aquired <cr><lf> line endings.
 
 It would be great to know what exactly was changed in tarball.
 Do you know it ?
 
 -Kirill
 
 --0vzXIDBeUiKkjNJl
 Content-Type: application/pgp-signature
 Content-Disposition: inline
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.4 (FreeBSD)
 
 iD8DBQFATNJGQC1G6a60JuURAlQdAJ9TmhNyWuVF4KcuL/ktiFU2RwKfCACgrkOY
 9PymDOlkp1IAWgIp3VQwKWk=
 =Yfwa
 -----END PGP SIGNATURE-----
 
 --0vzXIDBeUiKkjNJl--
State-Changed-From-To: open->closed 
State-Changed-By: trevor 
State-Changed-When: Tue Mar 9 14:50:59 PST 2004 
State-Changed-Why:  
committed--thank you, Jonathan 


Responsible-Changed-From-To: freebsd-ports-bugs->trevor 
Responsible-Changed-By: trevor 
Responsible-Changed-When: Tue Mar 9 14:50:59 PST 2004 
Responsible-Changed-Why:  
was handled by me 

http://www.freebsd.org/cgi/query-pr.cgi?pr=63940 
>Unformatted:
