ports/109890: [MAINTAINER] Update x11-wm/ctwm

[Matthew D. Fuller]

>Number:         109890
>Category:       ports
>Synopsis:       [MAINTAINER] Update x11-wm/ctwm
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Mar 05 01:20:03 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Matthew D. Fuller
>Release:        FreeBSD 7.0-CURRENT i386
>Organization:
>Environment:
System: FreeBSD mortis.sighup.org 7.0-CURRENT FreeBSD 7.0-CURRENT #1: Sat Feb 10 21:32:03 CST 2007 root at mortis:/usr/obj/usr/src/sys/MORTIS i386


	
>Description:
	Upgrade x11-wm/ctwm to 3.8a.

>How-To-Repeat:
	
>Fix:

Index: Makefile
===================================================================
RCS file: /usr/cvs/ports/x11-wm/ctwm/Makefile,v
retrieving revision 1.41
diff -u -r1.41 Makefile
--- Makefile	7 Feb 2007 19:13:39 -0000	1.41
+++ Makefile	5 Mar 2007 00:22:11 -0000
@@ -6,15 +6,11 @@
 #
 
 PORTNAME=	ctwm
-PORTVERSION=	3.7
-PORTREVISION=	1
+PORTVERSION=	3.8a
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://ctwm.free.lp.se/dist/ \
 		http://www.centralmiss.com/~matt/distfiles/
 
-PATCH_SITES=	http://tigerdyr.wheel.dk/ctwm-archive/att-1656/
-PATCHFILES=	01-diff
-
 MAINTAINER=	fullermd at over-yonder.net
 COMMENT=	An extension to twm, with support for multiple virtual screens, etc
 
Index: distinfo
===================================================================
RCS file: /usr/cvs/ports/x11-wm/ctwm/distinfo,v
retrieving revision 1.14
diff -u -r1.14 distinfo
--- distinfo	8 Jan 2007 19:30:52 -0000	1.14
+++ distinfo	5 Mar 2007 00:22:43 -0000
@@ -1,6 +1,3 @@
-MD5 (ctwm-3.7.tar.gz) = 7276cb0a7d44df98de8e620ba5ae39fa
-SHA256 (ctwm-3.7.tar.gz) = fa16dbaef6992cdbcdbe05a9dc12c2c16910f5e51a2df54607aeb74f9b4a5171
-SIZE (ctwm-3.7.tar.gz) = 1139461
-MD5 (01-diff) = 0290a49e4acb8c80337cdabae70d1e50
-SHA256 (01-diff) = 2272eafc5c35afaf00a1b988c394db5c56d7893460d4fc3be71e26905f2b2045
-SIZE (01-diff) = 4097
+MD5 (ctwm-3.8a.tar.gz) = ceaf40ef0f1bda3cc8b7c91144d92123
+SHA256 (ctwm-3.8a.tar.gz) = 39322cc6b0d12dc286af0944f9a10d3a099a5f04c5d9c47b75742cdf65dbd4a4
+SIZE (ctwm-3.8a.tar.gz) = 738226
Index: files/patch-ab
===================================================================
RCS file: /usr/cvs/ports/x11-wm/ctwm/files/patch-ab,v
retrieving revision 1.2
diff -u -r1.2 patch-ab
--- files/patch-ab	20 Jul 2005 08:39:52 -0000	1.2
+++ files/patch-ab	5 Mar 2007 00:40:11 -0000
@@ -1,13 +1,13 @@
-$FreeBSD: ports/x11-wm/ctwm/files/patch-ab,v 1.2 2005/07/20 08:39:52 pav Exp $
+$FreeBSD$
 
---- parse.c.orig	Thu May  5 08:24:55 2005
-+++ parse.c	Mon May  9 19:26:43 2005
-@@ -2126,7 +2126,7 @@
+--- parse.c.orig	Fri Feb 16 03:24:27 2007
++++ parse.c	Sun Mar  4 18:36:18 2007
+@@ -2128,7 +2128,7 @@
                  dup2(fids[1], 1);       /* stdout = pipe to parent */
                  /* get_defs("m4", dpy, display_name) */
                  tmp_file = m4_defs(dpy, display_name);
--                execlp("m4", "m4", "-s", tmp_file, "-", NULL);
-+                execl(M4PROG, M4PROGNAME, "-s", tmp_file, "-", NULL);
-                 /* If we get here we are screwed... */
-                 perror("Can't execlp() m4");
-                 exit(124);
+-                execlp("m4", "m4",
++                execlp(M4PROG, M4PROGNAME,
+ #if !defined(__NetBSD__)
+ 			"-s",
+ #endif
>Release-Note:
>Audit-Trail:
>Unformatted: