From owner-freebsd-ports@FreeBSD.ORG Mon Jul 14 07:55:39 2003 Return-Path: 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 3CC4537B401 for ; Mon, 14 Jul 2003 07:55:39 -0700 (PDT) Received: from basement.kutulu.org (pcp03610121pcs.longhl01.md.comcast.net [68.49.239.235]) by mx1.FreeBSD.org (Postfix) with ESMTP id 77AE043F3F for ; Mon, 14 Jul 2003 07:55:36 -0700 (PDT) (envelope-from kutulu@kutulu.org) Received: by basement.kutulu.org (Postfix, from userid 1001) id CB748A9A9; Mon, 14 Jul 2003 10:55:45 -0400 (EDT) Date: Mon, 14 Jul 2003 10:55:45 -0400 From: Michael Edenfield To: Daryl Chance Message-ID: <20030714145545.GA46755@basement.kutulu.org> Mail-Followup-To: Daryl Chance , Tim Kellers , ports@freebsd.org References: <20030714100030.E26064@mts-128.wallnet.com> <20030714144516.74977.qmail@web9606.mail.yahoo.com> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="Nq2Wo0NMKNjxTN9z" Content-Disposition: inline In-Reply-To: <20030714144516.74977.qmail@web9606.mail.yahoo.com> X-Mailer: Mutt http://www.mutt.org/ X-Accept-Language: en X-PGP-Key: http://www.kutulu.org/pgp/kutulu.asc X-PGP-Fingerprint: 1CE0 3C31 7013 D529 406D 37DC 09CC CD84 A46C 878F User-Agent: Mutt/1.5.4i cc: ports@freebsd.org cc: Tim Kellers Subject: Re: portupgrade/make install problem. X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jul 2003 14:55:39 -0000 --Nq2Wo0NMKNjxTN9z Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable * Daryl Chance [030714 10:47]: > Thanks. I just saw the posts in the archive, but not > a patch like Mr Edenfield posted. I would like to > propose a patch of my own. Yours looks like it would > work well, but it negates the FORCE_PKG_REGISTER env > and NO_PKG_REGISTER env (If I follow the code > correctly). My patch just modifies the pkg_info > command to only add -O if the OSVERSION >=3D 470000.=20 > It's not tested since I don't know the language syntax > for whever code that is :). So please, feel free to > fix it. The problem is, that without the -O the entire check fails. The -O=20 parameter to pkg_info takes a port origin (basically, the relative=20 directory from /usr/ports of the port) and returns a list of packages=20 that were originally installed from there. Without -O,=20 =20 pkg_info -q just returns an error that it couldn't find the package. I did the patch in a hurry, and don't have anything before 4.8 to test=20 on, but the logic seemed good to me. We don't want to do this check=20 if either FORCE_PKG_REGISTER or NO_PKG_REGISTER are defined, and can't=20 if OSVERSION is not at least 470000. I'll try to find a machine to=20 drop 4.6 on and test today, unless someone beats me to it. --Mike --Nq2Wo0NMKNjxTN9z Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.2 (FreeBSD) iD8DBQE/EsRwCczNhKRsh48RAtbHAJ4pU87duN2hRAzpH5kw/5L0UROiGwCfdgkf 3kcN1V0cZ3Vq3xhjX69n7k0= =aZDF -----END PGP SIGNATURE----- --Nq2Wo0NMKNjxTN9z--