diff options
| author | joerg <joerg@pkgsrc.org> | 2008-02-26 13:38:57 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2008-02-26 13:38:57 +0000 |
| commit | 60733a045e55c77f00838be58592f29be683e8be (patch) | |
| tree | 152edc6a695a5ffc154c60e7a7f04607b548aba9 /pkgtools | |
| parent | 4c9687e51616e8bfdf40d69169d25c5f616b8be2 (diff) | |
| download | pkgsrc-60733a045e55c77f00838be58592f29be683e8be.tar.gz | |
Use pkg_add from new build, override *_CMD instead of the full commands.
Drop some no longer used overrides.
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/pkg_install/Makefile | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/pkgtools/pkg_install/Makefile b/pkgtools/pkg_install/Makefile index 06ca8a60628..65b78700fc1 100644 --- a/pkgtools/pkg_install/Makefile +++ b/pkgtools/pkg_install/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.146 2008/02/09 14:08:05 joerg Exp $ +# $NetBSD: Makefile,v 1.147 2008/02/26 13:38:57 joerg Exp $ # Notes to package maintainers: # @@ -47,12 +47,13 @@ CHECK_PERMS= no # compiler to avoid problems with depending on pkgsrc GCC for building # pkg_install. # -# We also use the newly built pkg_delete since upgrading from an older -# pkg_install might required features of the new program. +# We also use the newly built pkg_{add,create,delete} since upgrading +# from an older pkg_install might required features of the new program. # USE_NATIVE_GCC= yes -PKG_CREATE= ${WRKSRC}/create/pkg_create -PKG_DELETE= ${WRKSRC}/delete/pkg_delete +PKG_ADD_CMD= ${WRKSRC}/add/pkg_add +PKG_CREATE_CMD= ${WRKSRC}/create/pkg_create +PKG_DELETE_CMD= ${WRKSRC}/delete/pkg_delete CPPFLAGS+= -D_LARGEFILE_SOURCE -D_LARGE_FILES CPPFLAGS+= -D_FILE_OFFSET_BITS=64 @@ -63,8 +64,6 @@ MAKE_ENV+= MACHINE_ARCH=${MACHINE_ARCH:Q} MAKE_ENV+= OPSYS=${OPSYS:Q} PKG_DBDIR?= /var/db/pkg -PKG_INFO= ${PKG_INFO_CMD} -K ${PKG_DBDIR:Q} -PKG_ADMIN= ${PKG_ADMIN_CMD} -K ${PKG_DBDIR:Q} EGDIR= ${PREFIX}/share/examples/pkg_install PLIST_SUBST+= PKG_DBDIR=${PKG_DBDIR:Q} |