ports/78572: update devel/spin to 4.2.4

[Jonathan Hanna]

>Number:         78572
>Category:       ports
>Synopsis:       update devel/spin to 4.2.4
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Mar 08 04:30:03 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Jonathan Hanna
>Release:        FreeBSD 4.11-STABLE i386
>Organization:
>Environment:
>Description:
>How-To-Repeat:
>Fix:

diff -urPN spin.orig/Makefile spin/Makefile
--- spin.orig/Makefile	Tue Jan 11 08:49:42 2005
+++ spin/Makefile	Mon Mar  7 20:07:26 2005
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	spin
-PORTVERSION=	4.2.2
+PORTVERSION=	4.2.4
 CATEGORIES=	devel
 MASTER_SITES=	http://spinroot.com/spin/Src/
 DISTNAME=	spin${PORTVERSION:S/.//g}
@@ -17,6 +17,7 @@
 .if !defined(WITHOUT_XSPIN)
 RUN_DEPENDS=	wish8.4:${PORTSDIR}/x11-toolkits/tk84
 PLIST_SUB+=	XSPIN=""
+XSPIN_TCL	= ${WRKDIR}/Xspin4.2/xspin423.tcl
 .else
 PLIST_SUB+=	XSPIN="@comment "
 .endif
@@ -38,24 +39,26 @@
 post-extract:
 	@cd ${WRKDIR}/Test && ${SH} ${WRKDIR}/Test/examples
 
+.if !defined(WITHOUT_XSPIN)
 pre-patch:
-	${TR} -d '\015' < ${WRKDIR}/Xspin4.2/xspin422.tcl \
-		> ${WRKDIR}/Xspin4.2/xspin422.tcl.tmp
-	${MV} -f ${WRKDIR}/Xspin4.2/xspin422.tcl.tmp \
-		${WRKDIR}/Xspin4.2/xspin422.tcl
+	${TR} -d '\015' < ${XSPIN_TCL} > ${XSPIN_TCL}.tmp
+	${MV} -f ${XSPIN_TCL}.tmp ${XSPIN_TCL}
+.endif
 
+.if !defined(WITHOUT_XSPIN)
 post-patch:
 	@WISH=`(cd ${LOCALBASE}/bin ; ${LS} wish8* ) | tail -1` ; \
 	if [ -z "$$WISH" ] ; then WISH=wish8.0 ; fi ; \
 	${REINPLACE_CMD} \
 		-e "s|%%LOCALBASE%%|${LOCALBASE}|g;" \
-		-e "s|%%WISH%%|$$WISH|g" ${WRKDIR}/Xspin4.2/xspin422.tcl
+		-e "s|%%WISH%%|$$WISH|g" ${XSPIN_TCL}
+.endif
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/spin ${PREFIX}/bin
 .if !defined(WITHOUT_XSPIN)
 	${RM} -f ${PREFIX}/bin/xspin
-	${INSTALL_SCRIPT} ${WRKDIR}/Xspin4.2/xspin422.tcl ${PREFIX}/bin/xspin
+	${INSTALL_SCRIPT} ${XSPIN_TCL} ${PREFIX}/bin/xspin
 .endif
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}/Doc
diff -urPN spin.orig/distinfo spin/distinfo
--- spin.orig/distinfo	Tue Jan 11 08:49:42 2005
+++ spin/distinfo	Mon Mar  7 19:54:28 2005
@@ -1,2 +1,2 @@
-MD5 (spin/spin422.tar.gz) = 858e90506c2521a9714658983f22b6ef
-SIZE (spin/spin422.tar.gz) = 324452
+MD5 (spin/spin424.tar.gz) = efa453b21335ff372bca5a6ff9e9abdd
+SIZE (spin/spin424.tar.gz) = 325603
diff -urPN spin.orig/files/patch-xspin spin/files/patch-xspin
--- spin.orig/files/patch-xspin	Tue Jan 11 08:49:42 2005
+++ spin/files/patch-xspin	Mon Mar  7 20:06:36 2005
@@ -1,5 +1,5 @@
---- ../Xspin4.2/xspin422.tcl.orig	Mon Mar  8 11:27:07 2004
-+++ ../Xspin4.2/xspin422.tcl	Mon Mar  8 11:31:09 2004
+--- ../Xspin4.2/xspin423.tcl.orig	Mon Mar  8 11:27:07 2004
++++ ../Xspin4.2/xspin423.tcl	Mon Mar  8 11:31:09 2004
 @@ -1,6 +1,6 @@
 -#!/bin/sh
 +#!%%LOCALBASE%%/bin/%%WISH%% -f

>Release-Note:
>Audit-Trail:
>Unformatted: