From owner-p4-projects@FreeBSD.ORG Wed Aug 9 23:39:21 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1F74416A4E0; Wed, 9 Aug 2006 23:39:21 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D7BB216A4DE for ; Wed, 9 Aug 2006 23:39:20 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A413543D49 for ; Wed, 9 Aug 2006 23:39:20 +0000 (GMT) (envelope-from gabor@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k79NdKHY020730 for ; Wed, 9 Aug 2006 23:39:20 GMT (envelope-from gabor@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k79NdKti020727 for perforce@freebsd.org; Wed, 9 Aug 2006 23:39:20 GMT (envelope-from gabor@FreeBSD.org) Date: Wed, 9 Aug 2006 23:39:20 GMT Message-Id: <200608092339.k79NdKti020727@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@FreeBSD.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 103537 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Aug 2006 23:39:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=103537 Change 103537 by gabor@gabor_server on 2006/08/09 23:39:14 Set PKGINSTALLVER sorrectly. PKG_INFO is already chrooted if DESTDIR is set. Submitted by: John E. Hein Affected files ... .. //depot/projects/soc2006/gabor_ports/Mk/bsd.port.mk#76 edit Differences ... ==== //depot/projects/soc2006/gabor_ports/Mk/bsd.port.mk#76 (text+ko) ==== @@ -2342,7 +2342,7 @@ # Does the pkg_create tool support conflict checking? # XXX Slow? .if !defined(PKGINSTALLVER) -PKGINSTALLVER!= ${CHROOT} ${DESTDIR} ${PKG_INFO} -P 2>/dev/null | ${SED} -e 's/.*: //' +PKGINSTALLVER!= ${PKG_INFO} -P 2>/dev/null | ${SED} -e 's/.*: //' .endif .if ${PKGINSTALLVER} < 20030417 DISABLE_CONFLICTS= YES