Subject: Re: pkgtools and PKG_TOOLS_PREFIX
To: None <tech-pkg@netbsd.org>
From: Johnny C. Lam <jlam@pkgsrc.org>
List: tech-pkg
Date: 07/10/2007 09:26:27
Joerg Sonnenberger wrote:
>
> Index: mtree/Makefile
> ===================================================================
> RCS file: /home/joerg/repo/netbsd/pkgsrc/pkgtools/mtree/Makefile,v
> retrieving revision 1.21
> diff -u -r1.21 Makefile
> --- mtree/Makefile 12 Apr 2007 14:36:40 -0000 1.21
> +++ mtree/Makefile 9 Jul 2007 22:40:25 -0000
> @@ -9,16 +9,5 @@
>
> NO_PKGTOOLS_REQD_CHECK= # defined
>
> -PKG_TOOLS_PREFIX= ${PKG_TOOLS_BIN:C|/[^/]?bin$||}
> -
> -# XXX This breaks for those who set their own LOCALBASE to "/usr" and also
> -# XXX set PKGMANDIR to be other than "share/man".
> -# XXX
> -.if !empty(PKG_TOOLS_PREFIX:M/usr)
> -PKGMANDIR= share/man
> -.endif
> -
> .include "../../pkgtools/libnbcompat/inplace.mk"
> .include "../../mk/bsd.pkg.mk"
> -
> -PREFIX:= ${PKG_TOOLS_PREFIX}
These (and similar) changes look fine. Please go ahead and commit them
along with the version bumps suggested by Adrian.
Cheers,
-- Johnny Lam <jlam@pkgsrc.org>