From owner-freebsd-ports@FreeBSD.ORG  Sun Jul  3 11:20:47 2005
Return-Path: <owner-freebsd-ports@FreeBSD.ORG>
X-Original-To: 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 5896C16A41C
	for <freebsd-ports@freebsd.org>; Sun,  3 Jul 2005 11:20:47 +0000 (GMT)
	(envelope-from barner@gmx.de)
Received: from mail.gmx.net (mail.gmx.de [213.165.64.20])
	by mx1.FreeBSD.org (Postfix) with SMTP id B3AEB43D4C
	for <freebsd-ports@freebsd.org>; Sun,  3 Jul 2005 11:20:46 +0000 (GMT)
	(envelope-from barner@gmx.de)
Received: (qmail invoked by alias); 03 Jul 2005 11:20:45 -0000
Received: from unknown (EHLO zi025.glhnet.mhn.de) [129.187.19.157]
	by mail.gmx.net (mp021) with SMTP; 03 Jul 2005 13:20:45 +0200
X-Authenticated: #147403
Received: by zi025.glhnet.mhn.de (Postfix, from userid 1000)
	id 9916BC2C2; Sun,  3 Jul 2005 13:22:34 +0200 (CEST)
Date: Sun, 3 Jul 2005 13:22:34 +0200
From: Simon Barner <barner@FreeBSD.org>
To: Steve Friedrich <freeBSD@InsightBB.com>
Message-ID: <20050703112234.GE913@zi025.glhnet.mhn.de>
References: <200507030412.11449.lofi@freebsd.org>
	<20050703055803.6D2B143D49@mx1.FreeBSD.org>
Mime-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature"; boundary="qxfKREH7IwbezJ+T"
Content-Disposition: inline
In-Reply-To: <20050703055803.6D2B143D49@mx1.FreeBSD.org>
User-Agent: Mutt/1.5.9i
X-Y-GMX-Trusted: 0
Cc: Michael Nottebrock <lofi@freebsd.org>,
	"freebsd-ports@freebsd.org" <freebsd-ports@freebsd.org>
Subject: Re: Anybody else have an xscreensaver build break?
X-BeenThere: freebsd-ports@freebsd.org
X-Mailman-Version: 2.1.5
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: Sun, 03 Jul 2005 11:20:47 -0000


--qxfKREH7IwbezJ+T
Content-Type: multipart/mixed; boundary="KJY2Ze80yH5MUxol"
Content-Disposition: inline


--KJY2Ze80yH5MUxol
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Steve Friedrich wrote:
> Actually, I found several errors that mostly had to do with declaring
> variables after code.  In C++, this is legal, in C it's not.
>=20
> I could send you the antmaze.c I patched.  I have no idea how to create
> the diff you guys usually use...

man diff :-)

More seriously:

1. Make a copy of the file to edit: cp file.c file.c.orig
2. Make changes to file.c
3. cd ${WRKSRC}, i.e. work/xscreensaver-x.y in your case
4. patch -u path/to/file.c.orig path/to/file.c > patch-path_to_file.c

/usr/ports/Tools/update-patches seems to do similar things, although I
use my own script (to be executed in ${WRKSRC} (see attachment).

Simon

--KJY2Ze80yH5MUxol
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="genpatch.pl"

#!/usr/bin/perl -w

use strict;

my $origfile;
my $file;
my $patch;
my @files = `find . -name "*.orig"`;

foreach $origfile (@files) {
	chomp ($origfile);
	$origfile =~ s/^\.\///;
	$file = $origfile;
	$file =~ s/\.orig$//;
	$patch = $file;
	$patch =~ s/\//_/g;
	$patch = "patch-" . $patch;
	system ("diff -u $origfile $file > $patch\n");
}

--KJY2Ze80yH5MUxol--

--qxfKREH7IwbezJ+T
Content-Type: application/pgp-signature
Content-Disposition: inline

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

iD8DBQFCx8p6Ckn+/eutqCoRAumUAKDFPo6EVRSzoV554HlscrxR4vKI0wCfd0G0
Fejw+h6irWLO9A8hpfKoDf8=
=RVjR
-----END PGP SIGNATURE-----

--qxfKREH7IwbezJ+T--