From owner-cvs-ports@FreeBSD.ORG Tue Aug 24 19:21:29 2004 Return-Path: Delivered-To: cvs-ports@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DBAF816A4CE; Tue, 24 Aug 2004 19:21:29 +0000 (GMT) Received: from toxic.magnesium.net (toxic.magnesium.net [207.154.84.15]) by mx1.FreeBSD.org (Postfix) with ESMTP id C5C3B43D1F; Tue, 24 Aug 2004 19:21:29 +0000 (GMT) (envelope-from adamw@magnesium.net) Received: by toxic.magnesium.net (Postfix, from userid 1252) id A2EBFDA88A; Tue, 24 Aug 2004 12:21:29 -0700 (PDT) Date: Tue, 24 Aug 2004 15:21:29 -0400 From: Adam Weinberger To: Norikatsu Shigemura Message-ID: <20040824192129.GK96458@toxic.magnesium.net> Mail-Followup-To: Adam Weinberger , Norikatsu Shigemura , ports-committers@FreeBSD.org, cvs-ports@FreeBSD.org, cvs-all@FreeBSD.org References: <200408240421.i7O4LxTi005920@repoman.freebsd.org> <20040825013033.56c9d8d2.nork@FreeBSD.org> <20040824164153.GJ96458@toxic.magnesium.net> <20040825022830.3dfa7546.nork@FreeBSD.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20040825022830.3dfa7546.nork@FreeBSD.org> X-Editor: Vim 6.2 http://www.vim.org X-Mailer: Mutt 1.5 http://www.mutt.org X-URL: http://www.vectors.cx X-ASL: 6/m/behind you User-Agent: Mutt/1.5.4i cc: cvs-ports@FreeBSD.org cc: cvs-all@FreeBSD.org cc: ports-committers@FreeBSD.org Subject: Re: cvs commit: ports/sysutils Makefile ports/sysutils/bpm Makefile distinfo pkg-descr pkg-plist X-BeenThere: cvs-ports@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Aug 2004 19:21:30 -0000 >> (08.24.2004 @ 1328 PST): Norikatsu Shigemura said, in 0.9K: << > On Tue, 24 Aug 2004 12:41:53 -0400 > Adam Weinberger wrote: > > >> end of "Re: cvs commit: ports/sysutils Makefile ports/sysutils/bpm Makefile distinfo pkg-descr pkg-plist" from Norikatsu Shigemura << > > I committed a few hours ago what hopefully fixes this problem. Please > > re-checkout the Makefile and let me know if it still doesn't build > > right. > > Thank you. > And I submit a following patch. But I contacted coredump on > current:-(. > > --- src/refresh.c.orig Tue Aug 24 11:40:08 2004 > +++ src/refresh.c Wed Aug 25 02:20:49 2004 > @@ -62,7 +62,11 @@ > __RCSID("$Id: refresh.c,v 1.32 2004/08/24 02:40:08 sethk Exp $"); > > /* XXX use libinstall/lib.h */ > +#if __FreeBSD_version >= 500036 > +#define INDEX_FN PORTS_BASE "/INDEX-5" > +#else > #define INDEX_FN PORTS_BASE "/INDEX" > +#endif > #define INDEX_MAXLN 4096 > #define DB_DIR "/var/db/pkg" > #define ITER_BYTES (128 * 1024) >> end of "Re: cvs commit: ports/sysutils Makefile ports/sysutils/bpm Makefile distinfo pkg-descr pkg-plist" from Norikatsu Shigemura << Good call. I've committed this patch. Thanks! # Adam -- Adam Weinberger adamw@magnesium.net || adamw@FreeBSD.org adamw@vectors.cx || adamw@gnome.org http://www.vectors.cx