From nobody@FreeBSD.org  Wed Jun 17 10:29:38 2009
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0EDDF1065672
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 17 Jun 2009 10:29:38 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id D5E7A8FC17
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 17 Jun 2009 10:29:37 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.3/8.14.3) with ESMTP id n5HATbqo051334
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 17 Jun 2009 10:29:37 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.3/8.14.3/Submit) id n5HATbFx051333;
	Wed, 17 Jun 2009 10:29:37 GMT
	(envelope-from nobody)
Message-Id: <200906171029.n5HATbFx051333@www.freebsd.org>
Date: Wed, 17 Jun 2009 10:29:37 GMT
From: Yuri Pankov <yuri.pankov@gmail.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [PATCH]: bsd.port.mk: move pkg_install commands detection to bsd.commands.mk
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         135663
>Category:       ports
>Synopsis:       [PATCH]: bsd.port.mk: move pkg_install commands detection to bsd.commands.mk
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    portmgr
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jun 17 10:30:00 UTC 2009
>Closed-Date:    Mon Aug 03 15:37:21 UTC 2009
>Last-Modified:  Mon Aug  3 15:40:00 UTC 2009
>Originator:     Yuri Pankov
>Release:        7.2-RELEASE
>Organization:
>Environment:
>Description:
Move pkg_install commands definitions to bsd.commands.mk.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: bsd.commands.mk
===================================================================
RCS file: /home/ncvs/ports/Mk/bsd.commands.mk,v
retrieving revision 1.3
diff -u -r1.3 bsd.commands.mk
--- bsd.commands.mk	14 Apr 2008 16:46:41 -0000	1.3
+++ bsd.commands.mk	17 Jun 2009 09:47:17 -0000
@@ -113,4 +113,18 @@
 # Used to print all the '===>' style prompts - override this to turn them off.
 ECHO_MSG?=	${ECHO_CMD}
 
+.if exists(${LOCALBASE}/sbin/pkg_info)
+PKG_CMD?=	${LOCALBASE}/sbin/pkg_create
+PKG_ADD?=	${LOCALBASE}/sbin/pkg_add
+PKG_DELETE?=	${LOCALBASE}/sbin/pkg_delete
+PKG_INFO?=	${LOCALBASE}/sbin/pkg_info
+PKG_VERSION?=	${LOCALBASE}/sbin/pkg_version
+.else
+PKG_CMD?=	/usr/sbin/pkg_create
+PKG_ADD?=	/usr/sbin/pkg_add
+PKG_DELETE?=	/usr/sbin/pkg_delete
+PKG_INFO?=	/usr/sbin/pkg_info
+PKG_VERSION?=	/usr/sbin/pkg_version
+.endif
+
 .endif
Index: bsd.port.mk
===================================================================
RCS file: /home/ncvs/ports/Mk/bsd.port.mk,v
retrieving revision 1.623
diff -u -r1.623 bsd.port.mk
--- bsd.port.mk	11 Jun 2009 09:09:29 -0000	1.623
+++ bsd.port.mk	17 Jun 2009 09:47:18 -0000
@@ -2373,20 +2373,6 @@
 PKGORIGIN?=		${PKGCATEGORY}/${PORTDIRNAME}
 
 
-.if exists(${LOCALBASE}/sbin/pkg_info)
-PKG_CMD?=		${LOCALBASE}/sbin/pkg_create
-PKG_ADD?=		${LOCALBASE}/sbin/pkg_add
-PKG_DELETE?=	${LOCALBASE}/sbin/pkg_delete
-PKG_INFO?=		${LOCALBASE}/sbin/pkg_info
-PKG_VERSION?=		${LOCALBASE}/sbin/pkg_version
-.else
-PKG_CMD?=		/usr/sbin/pkg_create
-PKG_ADD?=		/usr/sbin/pkg_add
-PKG_DELETE?=	/usr/sbin/pkg_delete
-PKG_INFO?=		/usr/sbin/pkg_info
-PKG_VERSION?=		/usr/sbin/pkg_version
-.endif
-
 .if !defined(PKG_ARGS)
 PKG_ARGS=		-v -c -${COMMENT:Q} -d ${DESCR} -f ${TMPPLIST} -p ${PREFIX} -P "`cd ${.CURDIR} && ${MAKE} actual-package-depends | ${GREP} -v -E ${PKG_IGNORE_DEPENDS} | ${SORT} -u -t : -k 2`" ${EXTRA_PKG_ARGS} $${_LATE_PKG_ARGS}
 .if !defined(NO_MTREE)


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->portmgr 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Wed Jun 17 10:30:11 UTC 2009 
Responsible-Changed-Why:  
bsd.port.mk is portmgr territory (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=135663 
State-Changed-From-To: open->closed 
State-Changed-By: miwi 
State-Changed-When: Mon Aug 3 15:37:21 UTC 2009 
State-Changed-Why:  
Committed. Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/135663: commit references a PR
Date: Mon,  3 Aug 2009 15:37:07 +0000 (UTC)

 miwi        2009-08-03 15:36:58 UTC
 
   FreeBSD ports repository
 
   Modified files:
     Mk                   bsd.commands.mk bsd.port.mk 
   Log:
     - Move pkg_install commands detection to bsd.commands.mk
       PR:         135663
       Submitted:  Yuri Pankov <yuri.pankov@gmail.com>
     - Add default FLEX command to bsd.commands.mk
       PR:         137026
       Submitted:  gahr@
   
   Tested by:      pointyhat exp-build run
   
   Revision  Changes    Path
   1.4       +16 -1     ports/Mk/bsd.commands.mk
   1.625     +1 -15     ports/Mk/bsd.port.mk
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
