From sem@ciam.ru  Mon Feb 24 12:56:26 2003
Return-Path: <sem@ciam.ru>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 4465E37B405
	for <FreeBSD-gnats-submit@freebsd.org>; 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 <FreeBSD-gnats-submit@freebsd.org>; 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: <E18nPe1-000CL9-00@sem-home.ciam.ru>
Date: Mon, 24 Feb 2003 23:56:13 +0300
From: Sergey Matveychuk <sem@ciam.ru>
Reply-To: Sergey Matveychuk <sem@ciam.ru>
To: FreeBSD-gnats-submit@freebsd.org
Cc: kris@obsecurity.org
Subject: check-already-installed port by origin
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         48646
>Category:       ports
>Synopsis:       check-already-installed port by origin
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    portmgr
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Feb 24 13:00:10 PST 2003
>Closed-Date:    Thu Apr 17 03:29:49 PDT 2003
>Last-Modified:  Thu Apr 17 03:29:49 PDT 2003
>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:

From: Sergey Matveychuk <sem@ciam.ru>
To: freebsd-gnats-submit@FreeBSD.org, sem@ciam.ru
Cc:  
Subject: Re: ports/48646: check-already-installed port by origin
Date: Wed, 26 Feb 2003 15:28:33 +0300

 This is a multi-part message in MIME format.
 --------------040409060505030307060009
 Content-Type: text/plain; charset=us-ascii; format=flowed
 Content-Transfer-Encoding: 7bit
 
 I'v found out pkg_info doesn't support -O switch in 4.x.
 Here is a new patch. (Just ignore stderr).
 
 --------------040409060505030307060009
 Content-Type: text/plain;
  name="check-origin.patch"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline;
  filename="check-origin.patch"
 
 --- bsd.port.mk.1_440	Mon Feb 17 02:23:01 2003
 +++ bsd.port.mk	Wed Feb 26 15:20:01 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} 2> /dev/null`" != "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."; \
 
 --------------040409060505030307060009--
 
Responsible-Changed-From-To: freebsd-ports-bugs->portmgr 
Responsible-Changed-By: arved 
Responsible-Changed-When: Fri Feb 28 13:13:27 PST 2003 
Responsible-Changed-Why:  
Over to Maintainers 

http://www.freebsd.org/cgi/query-pr.cgi?pr=48646 

From: Sergey Matveychuk <sem@ciam.ru>
To: freebsd-gnats-submit@FreeBSD.org, sem@ciam.ru
Cc:  
Subject: Re: ports/48646: check-already-installed port by origin
Date: Sat, 08 Mar 2003 00:53:35 +0300

 Please look at PR/49017 where I used ORIGIN for deinstalling port.
 
State-Changed-From-To: open->analyzed 
State-Changed-By: kris 
State-Changed-When: Sat Apr 12 19:17:53 PDT 2003 
State-Changed-Why:  
Currently being tested on bento for commit 

http://www.freebsd.org/cgi/query-pr.cgi?pr=48646 
State-Changed-From-To: analyzed->closed 
State-Changed-By: kris 
State-Changed-When: Thu Apr 17 03:29:40 PDT 2003 
State-Changed-Why:  
Patch committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=48646 
>Unformatted:
