>Number:         35637
>Category:       pkg
>Synopsis:       maintainer update wm/ctwm to 3.8a
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Fri Feb 16 12:25:00 +0000 2007
>Originator:     Rhialto
>Release:        NetBSD 3.0
>Organization:
	
>Environment:
	
	
System: NetBSD radl.falu.nl 3.0 NetBSD 3.0 (Radls Doordringend Onjuiste Akkoord) #1: Thu Sep 14 02:39:33 CEST 2006 root@radl.falu.nl:/usr/src/sys/arch/amd64/compile/RADL amd64
Architecture: x86_64
Machine: amd64
>Description:
	ctwm-3.8a has been released.
>How-To-Repeat:
>Fix:

Remove patches/patch-aa.

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/wm/ctwm/Makefile,v
retrieving revision 1.20
diff -u -r1.20 Makefile
--- Makefile	27 Dec 2006 13:37:40 -0000	1.20
+++ Makefile	16 Feb 2007 12:22:29 -0000
@@ -1,8 +1,7 @@
 # $NetBSD: Makefile,v 1.20 2006/12/27 13:37:40 joerg Exp $
 #
 
-DISTNAME=	ctwm-3.7
-PKGREVISION=	3
+DISTNAME=	ctwm-3.8a
 CATEGORIES=	x11 wm
 MASTER_SITES=	http://ctwm.free.lp.se/dist/
 
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/wm/ctwm/distinfo,v
retrieving revision 1.12
diff -u -r1.12 distinfo
--- distinfo	15 Dec 2006 18:30:15 -0000	1.12
+++ distinfo	16 Feb 2007 12:22:29 -0000
@@ -1,7 +1,6 @@
 $NetBSD: distinfo,v 1.12 2006/12/15 18:30:15 jdc Exp $
 
-SHA1 (ctwm-3.7.tar.gz) = 6140e82ec23499146eaab5bf3bd592f92e95683e
-RMD160 (ctwm-3.7.tar.gz) = 9809df2555b3eb2bf0c46c041df8c1c089b67255
-Size (ctwm-3.7.tar.gz) = 1139461 bytes
-SHA1 (patch-aa) = aae47d907fea9d7e5164c5bac7cccc111e18b797
-SHA1 (patch-ac) = 8ccf1e319c0cbe1f2cc8cb941ffc7f8b45814118
+SHA1 (ctwm-3.8a.tar.gz) = c3a31d669bef7dd5ec78d89950c0e575d6c51c77
+RMD160 (ctwm-3.8a.tar.gz) = cc1c3c862c3cfb1d66593d9a95d28ec0bbbbaf3c
+Size (ctwm-3.8a.tar.gz) = 738226 bytes
+SHA1 (patch-ac) = bb4cbcb8e4a68d1f2844aa16e85918aa5368a869
Index: patches/patch-ac
===================================================================
RCS file: /cvsroot/pkgsrc/wm/ctwm/patches/patch-ac,v
retrieving revision 1.2
diff -u -r1.2 patch-ac
--- patches/patch-ac	13 Oct 2005 20:20:55 -0000	1.2
+++ patches/patch-ac	16 Feb 2007 12:22:29 -0000
@@ -1,13 +1,17 @@
 $NetBSD: patch-ac,v 1.2 2005/10/13 20:20:55 rillig Exp $
 
---- parse.c.dist	Tue Dec 11 16:38:52 2001
-+++ parse.c	Sat Mar  8 13:34:59 2003
-@@ -2097,7 +2097,7 @@
+--- parse.c.orig	2007-02-16 12:37:42.000000000 +0100
++++ parse.c	2007-02-16 12:37:58.000000000 +0100
+@@ -2128,11 +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);
+-                execlp("m4", "m4",
+-#if !defined(__NetBSD__)
+-			"-s",
+-#endif
+-			tmp_file, "-", NULL);
 +                execlp(PATH_TO_M4, "m4", "-s", tmp_file, "-", NULL);
+ 
                  /* If we get here we are screwed... */
                  perror("Can't execlp() m4");
-                 exit(124);


-Olaf.
-- 
___ Olaf 'Rhialto' Seibert      -- You author it, and I'll reader it.
\X/ rhialto/at/xs4all.nl        -- Cetero censeo "authored" delendum esse.

>Unformatted: