From owner-freebsd-gnome@FreeBSD.ORG Tue Apr 20 08:46:38 2004 Return-Path: Delivered-To: freebsd-gnome@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EF40D16A4CE for ; Tue, 20 Apr 2004 08:46:37 -0700 (PDT) Received: from creme-brulee.marcuscom.com (rrcs-midsouth-24-172-16-118.biz.rr.com [24.172.16.118]) by mx1.FreeBSD.org (Postfix) with ESMTP id E5EB543D53 for ; Tue, 20 Apr 2004 08:46:36 -0700 (PDT) (envelope-from marcus@marcuscom.com) Received: from [10.2.1.4] (vpn-client-4.marcuscom.com [10.2.1.4]) i3KFjWxk091924; Tue, 20 Apr 2004 11:45:32 -0400 (EDT) (envelope-from marcus@marcuscom.com) From: Joe Marcus Clarke To: Diabolo In-Reply-To: <1082472036.1065.3.camel@debianito.inferno> References: <20040420044452.C26686@pukruppa.net> <1082436415.71059.30.camel@shumai.marcuscom.com> <1082472036.1065.3.camel@debianito.inferno> Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="=-aOQSVneAknPb82mQ4Njh" Organization: MarcusCom, Inc. Message-Id: <1082475997.837.19.camel@gyros> Mime-Version: 1.0 X-Mailer: Ximian Evolution 1.4.6 Date: Tue, 20 Apr 2004 11:46:37 -0400 X-Spam-Status: No, hits=-4.9 required=5.0 tests=BAYES_00 autolearn=ham version=2.63 X-Spam-Checker-Version: SpamAssassin 2.63 (2004-01-11) on creme-brulee.marcuscom.com cc: freebsd-gnome@freebsd.org Subject: Re: patch error: gconf-editor-2.6.1,1 X-BeenThere: freebsd-gnome@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: GNOME for FreeBSD -- porting and maintaining List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Apr 2004 15:46:38 -0000 --=-aOQSVneAknPb82mQ4Njh Content-Type: text/plain Content-Transfer-Encoding: quoted-printable On Tue, 2004-04-20 at 10:40, Diabolo wrote: > Hi, doesnt work joe: Yes it does. You need to remove the gconf-editor directory, then re-cvsup. It most certainly does work. Joe > # make install > =3D=3D=3D> Patching for gconf-editor-2.6.1,1 > =3D=3D=3D> Applying FreeBSD patches for gconf-editor-2.6.1,1 > Ignoring previously applied (or reversed) patch. > 1 out of 1 hunks ignored--saving rejects to intltool-merge.in.rej > >> Patch patch-intltool-merge.in failed to apply cleanly. > *** Error code 1 > # > Regards. > Diabolo.- >=20 > Stop in /usr/ports/sysutils/gconf-editor. > On Tue, 2004-04-20 at 01:46, Joe Marcus Clarke wrote: > > On Mon, 2004-04-19 at 22:49, Peter Ulrich Kruppa wrote: > > > Hi! > > >=20 > > > Portupgrade of gconf-editor fails with > >=20 > > Remove sysutils/gconf-editor, and re-cvsup. > >=20 > > Joe > >=20 > > >=20 > > > ---------------------------------------- > > > =3D=3D=3D> Patching for gconf-editor-2.6.1,1 > > > =3D=3D=3D> Applying FreeBSD patches for gconf-editor-2.6.1,1 > > > Ignoring previously applied (or reversed) patch. > > > 1 out of 1 hunks ignored--saving rejects to intltool-merge.in.rej > > > >> Patch patch-intltool-merge.in failed to apply cleanly. > > > *** Error code 1 > > >=20 > > > Stop in /usr/ports/sysutils/gconf-editor. > > > --------------------------------------- > > > on > > >=20 > > > FreeBSD pukruppa.net 5.2-CURRENT FreeBSD 5.2-CURRENT #0: Sun Apr > > > 18 12:50:28 CEST 2004 > > >=20 > > >=20 > > > Regards, > > >=20 > > > Uli. > > >=20 > > > +---------------------------+ > > > | Peter Ulrich Kruppa | > > > | Wuppertal | > > > | Germany | > > > +---------------------------+ > > > _______________________________________________ > > > freebsd-gnome@freebsd.org mailing list > > > http://lists.freebsd.org/mailman/listinfo/freebsd-gnome > > > To unsubscribe, send any mail to "freebsd-gnome-unsubscribe@freebsd.o= rg" >=20 > _______________________________________________ > freebsd-gnome@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/freebsd-gnome > To unsubscribe, send any mail to "freebsd-gnome-unsubscribe@freebsd.org" --=20 PGP Key : http://www.marcuscom.com/pgp.asc --=-aOQSVneAknPb82mQ4Njh Content-Type: application/pgp-signature; name=signature.asc Content-Description: This is a digitally signed message part -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.4 (FreeBSD) iD8DBQBAhUXdb2iPiv4Uz4cRAthWAJ9LlUkNKjk+uNprJiT0WAfyDrOpdgCgk3cH jxgKSlUIFPxP4g1laxJ4udM= =T9N1 -----END PGP SIGNATURE----- --=-aOQSVneAknPb82mQ4Njh--