diff options
| author | joerg <joerg@pkgsrc.org> | 2008-06-22 22:08:05 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2008-06-22 22:08:05 +0000 |
| commit | 9c974a83aea73f74712fb1609954bbb04d74d206 (patch) | |
| tree | 9e196a5ff04016f10b2a7c5774ab1331ce5da47c | |
| parent | 8f45797884435b8d1717667f92fcfe3447be0832 (diff) | |
| download | pkgsrc-9c974a83aea73f74712fb1609954bbb04d74d206.tar.gz | |
Don't use the existance of pkg_add as trigger to override
PKG_ADD and friends, but that the build passed the barrier.
Posted to tech-pkg@ without negative feedback.
| -rw-r--r-- | pkgtools/pkg_install/Makefile | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/pkgtools/pkg_install/Makefile b/pkgtools/pkg_install/Makefile index 2e307e890db..6c0a6ade296 100644 --- a/pkgtools/pkg_install/Makefile +++ b/pkgtools/pkg_install/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.155 2008/06/19 18:36:51 joerg Exp $ +# $NetBSD: Makefile,v 1.156 2008/06/22 22:08:05 joerg Exp $ # Notes to package maintainers: # @@ -52,9 +52,14 @@ CHECK_PERMS= no # # We also use the newly built pkg_{add,create,delete} since upgrading # from an older pkg_install might required features of the new program. +# Note that the definitions are only overriden for the phases that are +# supposed to use them. pkg_admin pmatch might be used when looking for +# dependencies. If that is ever changed in a incompatible way, this has to +# be rethought. # USE_NATIVE_GCC= yes -.if exists(${WRKSRC}/add/pkg_add) + +.if defined(_PKGSRC_BARRIER) PKG_ADD_CMD= ${WRKSRC}/add/pkg_add PKG_CREATE_CMD= ${WRKSRC}/create/pkg_create PKG_DELETE_CMD= ${WRKSRC}/delete/pkg_delete |