diff options
| author | rillig <rillig> | 2007-01-05 17:54:02 +0000 |
|---|---|---|
| committer | rillig <rillig> | 2007-01-05 17:54:02 +0000 |
| commit | d240ca8bc206d4cd01dca71180ac07de4f096ee2 (patch) | |
| tree | 4465367cb6d610ee570abd33f03172d79e08b249 | |
| parent | e3f8ffd7dcc88b16280746e9ca2cbdd6b3e9a2a2 (diff) | |
| download | pkgsrc-d240ca8bc206d4cd01dca71180ac07de4f096ee2.tar.gz | |
Since 2003, the package tools don't need their own environment variable,
since there is the -K option.
| -rw-r--r-- | mk/flavor/pkg/flavor-vars.mk | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/mk/flavor/pkg/flavor-vars.mk b/mk/flavor/pkg/flavor-vars.mk index b351282b82e..a293620b9d4 100644 --- a/mk/flavor/pkg/flavor-vars.mk +++ b/mk/flavor/pkg/flavor-vars.mk @@ -1,4 +1,4 @@ -# $NetBSD: flavor-vars.mk,v 1.2 2006/10/06 14:51:36 joerg Exp $ +# $NetBSD: flavor-vars.mk,v 1.3 2007/01/05 17:54:02 rillig Exp $ # # This Makefile fragment is included indirectly by bsd.prefs.mk and # defines some variables which must be defined earlier than where @@ -43,13 +43,7 @@ MAKEFLAGS+= PKGTOOLS_VERSION=${PKGTOOLS_VERSION} # The binary pkg_install tools all need to consistently to refer to the # correct package database directory. # -.if ${PKGTOOLS_VERSION} < 20030823 -PKGTOOLS_ENV?= PKG_DBDIR=${_PKG_DBDIR} -PKGTOOLS_ARGS?= # empty -.else -PKGTOOLS_ENV?= # empty PKGTOOLS_ARGS?= -K ${_PKG_DBDIR} -.endif # Views are rooted in ${LOCALBASE}, all packages are depoted in # ${DEPOTBASE}, and the package database directory for the default view @@ -57,12 +51,12 @@ PKGTOOLS_ARGS?= -K ${_PKG_DBDIR} # PKG_VIEW_ARGS?= -W ${LOCALBASE} -d ${DEPOTBASE} -k ${PKG_DBDIR} -PKG_ADD?= ${SETENV} ${PKGTOOLS_ENV} ${PKG_ADD_CMD} ${PKGTOOLS_ARGS} -PKG_ADMIN?= ${SETENV} ${PKGTOOLS_ENV} ${PKG_ADMIN_CMD} ${PKGTOOLS_ARGS} -PKG_CREATE?= ${SETENV} ${PKGTOOLS_ENV} ${PKG_CREATE_CMD} ${PKGTOOLS_ARGS} -PKG_DELETE?= ${SETENV} ${PKGTOOLS_ENV} ${PKG_DELETE_CMD} ${PKGTOOLS_ARGS} -PKG_INFO?= ${SETENV} ${PKGTOOLS_ENV} ${PKG_INFO_CMD} ${PKGTOOLS_ARGS} -PKG_VIEW?= ${SETENV} ${PKGTOOLS_ENV} ${PKG_VIEW_CMD} ${PKG_VIEW_ARGS} +PKG_ADD?= ${PKG_ADD_CMD} ${PKGTOOLS_ARGS} +PKG_ADMIN?= ${PKG_ADMIN_CMD} ${PKGTOOLS_ARGS} +PKG_CREATE?= ${PKG_CREATE_CMD} ${PKGTOOLS_ARGS} +PKG_DELETE?= ${PKG_DELETE_CMD} ${PKGTOOLS_ARGS} +PKG_INFO?= ${PKG_INFO_CMD} ${PKGTOOLS_ARGS} +PKG_VIEW?= ${PKG_VIEW_CMD} ${PKG_VIEW_ARGS} LINKFARM?= ${LINKFARM_CMD} # "${_PKG_BEST_EXISTS} pkgpattern" prints out the name of the installed |