From owner-freebsd-ports-bugs Mon Feb 24 13: 0:14 2003 Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B6BDA37B401 for ; Mon, 24 Feb 2003 13:00:12 -0800 (PST) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id A969243FB1 for ; Mon, 24 Feb 2003 13:00:11 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id h1OL0BNS026445 for ; Mon, 24 Feb 2003 13:00:11 -0800 (PST) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id h1OL0Bni026444; Mon, 24 Feb 2003 13:00:11 -0800 (PST) Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4465E37B405 for ; Mon, 24 Feb 2003 12:56:26 -0800 (PST) Received: from hueymiccailhuitl.mtu.ru (hueytecuilhuitl.mtu.ru [195.34.32.123]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9B94B43FD7 for ; Mon, 24 Feb 2003 12:56:22 -0800 (PST) (envelope-from sem@ciam.ru) Received: from sem-home.ciam.ru (ppp136-206.dialup.mtu-net.ru [62.118.136.206]) by hueymiccailhuitl.mtu.ru (Postfix) with ESMTP id 19CC8F9449; Mon, 24 Feb 2003 23:56:01 +0300 (MSK) (envelope-from sem@ciam.ru) Received: from sem by sem-home.ciam.ru with local (Exim 4.12) id 18nPe1-000CL9-00; Mon, 24 Feb 2003 23:56:13 +0300 Message-Id: Date: Mon, 24 Feb 2003 23:56:13 +0300 From: Sergey Matveychuk Reply-To: Sergey Matveychuk To: FreeBSD-gnats-submit@FreeBSD.org Cc: kris@obsecurity.org X-Send-Pr-Version: 3.113 Subject: ports/48646: check-already-installed port by origin Sender: owner-freebsd-ports-bugs@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 48646 >Category: ports >Synopsis: check-already-installed port by origin >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Feb 24 13:00:10 PST 2003 >Closed-Date: >Last-Modified: >Originator: Sergey Matveychuk >Release: FreeBSD 5.0-RELEASE-p2 i386 >Organization: >Environment: System: FreeBSD sem-home.ciam.ru 5.0-RELEASE-p2 FreeBSD 5.0-RELEASE-p2 #0: Mon Feb 24 22:03:00 MSK 2003 root@sem-home.ciam.ru:/usr/src/sys/i386/compile/SEM-HOME i386 >Description: pkg_add(1) checks already installed packages by origin. Why port install system don't do it? So we can install a few version of a port. It's bad. This small patch fix it. >How-To-Repeat: >Fix: --- bsd.port.mk.1_440 Mon Feb 17 02:23:01 2003 +++ bsd.port.mk Mon Feb 24 23:36:08 2003 @@ -2718,7 +2726,8 @@ .if !target(check-already-installed) check-already-installed: .if !defined(NO_PKG_REGISTER) && !defined(FORCE_PKG_REGISTER) - @if [ -d ${PKG_DBDIR}/${PKGNAME} ]; then \ + @if [ -d ${PKG_DBDIR}/${PKGNAME} -o \ + "x`${PKG_INFO} -q -O ${PKGORIGIN}`" != "x" ]; then \ ${ECHO_CMD} "===> ${PKGNAME} is already installed - perhaps an older version?"; \ ${ECHO_CMD} " If so, you may wish to \`\`make deinstall'' and install"; \ ${ECHO_CMD} " this port again by \`\`make reinstall'' to upgrade it properly."; \ >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports-bugs" in the body of the message