From owner-freebsd-ports@FreeBSD.ORG  Fri Jul 18 21:16:53 2003
Return-Path: <owner-freebsd-ports@FreeBSD.ORG>
Delivered-To: freebsd-ports@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 6C7DA37B401; Fri, 18 Jul 2003 21:16:53 -0700 (PDT)
Received: from mailout.informatik.tu-muenchen.de
	(mailout.informatik.tu-muenchen.de [131.159.0.5])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id C892243F3F; Fri, 18 Jul 2003 21:16:52 -0700 (PDT)
	(envelope-from barner@in.tum.de)
Received: by zi025.glhnet.mhn.de (Postfix, from userid 1000)
	id 9D76138792; Sat, 19 Jul 2003 06:16:51 +0200 (CEST)
Date: Sat, 19 Jul 2003 06:16:51 +0200
From: Simon Barner <barner@in.tum.de>
To: Kris Kennaway <kris@obsecurity.org>
Message-ID: <20030719041651.GI467@zi025.glhnet.mhn.de>
References: <20030718025200.GA36893@rot13.obsecurity.org>
Mime-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature"; boundary="QRtLtq+kfJNLc57H"
Content-Disposition: inline
In-Reply-To: <20030718025200.GA36893@rot13.obsecurity.org>
User-Agent: Mutt/1.5.4i
X-Virus-Scanned: by amavisd-new at informatik.tu-muenchen.de
cc: ports@FreeBSD.org
cc: current@FreeBSD.org
Subject: Re: Fixing gcc 3.3 compile failures -- fix for x11/imwheel
X-BeenThere: freebsd-ports@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: Porting software to FreeBSD <freebsd-ports.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports>,
	<mailto:freebsd-ports-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-ports>
List-Post: <mailto:freebsd-ports@freebsd.org>
List-Help: <mailto:freebsd-ports-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports>,
	<mailto:freebsd-ports-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 19 Jul 2003 04:16:53 -0000


--QRtLtq+kfJNLc57H
Content-Type: multipart/mixed; boundary="o99acAvKqrTZeiCU"
Content-Disposition: inline


--o99acAvKqrTZeiCU
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

The attached patch includes the existing patch file patch-ab, which is
obsolete now.

--o99acAvKqrTZeiCU
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="patch-util.c"
Content-Transfer-Encoding: quoted-printable

--- util.c.orig	Tue Oct 31 13:06:05 2000
+++ util.c	Sat Jul 19 05:45:59 2003
@@ -330,11 +330,11 @@
 		fclose(f);
 		if(pid>0 && useFifo)
 		{
-			fprintf(stderr,"\
-ERROR: imwheel is already running or there is a stale pid file
-  check on processes listed below.
-  run with -k to kill running imwheels.
-  remove pid file %s.
+			fprintf(stderr,"\n\
+ERROR: imwheel is already running or there is a stale pid file\n\
+  check on processes listed below.\n\
+  run with -k to kill running imwheels.\n\
+  remove pid file %s.\n\
   or run with -p to avoid the pid file altogether.\n",PIDFILE);
 			if((f=3Dfopen(PIDFILE,"r")))
 			{
@@ -710,7 +710,7 @@
=20
 struct WinAction *getRC()
 {
-	char fname[2][1024]=3D{"","/etc/imwheelrc"}, line[1024], *p, *q, winid[10=
24];
+	char fname[2][1024]=3D{"","/usr/X11R6/etc/imwheelrc"}, line[1024], *p, *q=
, winid[1024];
 	int fi,i;
 	struct WinAction *newwa=3DNULL;
 	FILE *f=3DNULL;

--o99acAvKqrTZeiCU--

--QRtLtq+kfJNLc57H
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: Digital signature
Content-Disposition: inline

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.2 (FreeBSD)

iD8DBQE/GMYzCkn+/eutqCoRAnZXAJwI2eEjgiuvOpNOi4vJSgK20p8KmwCg+cIH
ANXdm2/J/oB0AjKvae2dfQA=
=+a8A
-----END PGP SIGNATURE-----

--QRtLtq+kfJNLc57H--