Date: Wed, 17 Jun 2009 10:29:37 GMT From: Yuri Pankov <yuri.pankov@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/135663: [PATCH]: bsd.port.mk: move pkg_install commands detection to bsd.commands.mk Message-ID: <200906171029.n5HATbFx051333@www.freebsd.org> Resent-Message-ID: <200906171030.n5HAU1CD045262@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Wed Jun 17 10:30:00 UTC 2009
>Closed-Date:
>Last-Modified:
>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:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200906171029.n5HATbFx051333>