ports/51385: Confusing message when installing newer version of existing port

[Dmitry Sivachenko]

>Number:         51385
>Category:       ports
>Synopsis:       Confusing message when installing newer version of existing port
>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:   Thu Apr 24 09:40:22 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Dmitry Sivachenko
>Release:        FreeBSD 4.8-STABLE i386
>Organization:
>Environment:
System: FreeBSD tear.demos.su 4.8-STABLE FreeBSD 4.8-STABLE #0: Thu Apr 24 14:50:39 MSD 2003 mitya at tear.demos.su:/usr/home/mitya/sys/compile/TEAR i386


	
>Description:

Imagine you have some version of a port installed (say, bison-1.75).
Try to install newer version of bison (say, 1.875) from ports.

The following message is displayed:
===>  Installing for bison-1.875
===>  bison-1.875 is already installed - perhaps an older version?
============^^^^^
      If so, you may wish to ``make deinstall'' and install
      this port again by ``make reinstall'' to upgrade it properly.
      If you really wish to overwrite the old port of bison-1.875
============================================================^^^^^
      without deleting it first, set the variable "FORCE_PKG_REGISTER"
      in your environment or the "make install" command line.

This message incorrectly states I have bison-1.875 installed.
>How-To-Repeat:
	
>Fix:


--- bsd.port.mk.orig	Thu Apr 24 20:28:45 2003
+++ bsd.port.mk	Thu Apr 24 20:29:26 2003
@@ -2877,10 +2877,10 @@
 .if !defined(NO_PKG_REGISTER) && !defined(FORCE_PKG_REGISTER)
 	@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} "===>  ${PKGORIGIN} 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."; \
-		${ECHO_CMD} "      If you really wish to overwrite the old port of ${PKGNAME}"; \
+		${ECHO_CMD} "      If you really wish to overwrite the old port of ${PKGORIGIN}"; \
 		${ECHO_CMD} "      without deleting it first, set the variable \"FORCE_PKG_REGISTER\""; \
 		${ECHO_CMD} "      in your environment or the \"make install\" command line."; \
 		exit 1; \

>Release-Note:
>Audit-Trail:
>Unformatted: