diff options
| author | jlam <jlam@pkgsrc.org> | 2006-07-14 21:41:42 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2006-07-14 21:41:42 +0000 |
| commit | 0dc496ea58d2fefd0ba3c94c8711025867b358d5 (patch) | |
| tree | a119297d73e40b71606780428a0069dd545aaa3e /pkgtools | |
| parent | a9841d5a5e954c19132826b29dfc6c1a220c15c4 (diff) | |
| download | pkgsrc-0dc496ea58d2fefd0ba3c94c8711025867b358d5.tar.gz | |
Create a separate pkgtools/tnftp package that is installed as part of
the bootstrap process and which may be needed by pkg_install. This
is distinct from the net/tnftp package that is now a "normal" package.
Modify the bootstrap script to use pkgtools/tnftp instead, and clean up
some of the registration code.
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/Makefile | 3 | ||||
| -rw-r--r-- | pkgtools/tnftp/Makefile | 29 |
2 files changed, 31 insertions, 1 deletions
diff --git a/pkgtools/Makefile b/pkgtools/Makefile index be5735dec59..ed526baa5bc 100644 --- a/pkgtools/Makefile +++ b/pkgtools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.75 2006/07/14 19:54:47 jlam Exp $ +# $NetBSD: Makefile,v 1.76 2006/07/14 21:41:42 jlam Exp $ # COMMENT= Tools for use in the packages collection @@ -43,6 +43,7 @@ SUBDIR+= rdigest SUBDIR+= revbump SUBDIR+= rpm2pkg SUBDIR+= shlock +#SUBDIR+= tnftp SUBDIR+= url2pkg SUBDIR+= verifypc SUBDIR+= x11-links diff --git a/pkgtools/tnftp/Makefile b/pkgtools/tnftp/Makefile new file mode 100644 index 00000000000..8ab0fceddbf --- /dev/null +++ b/pkgtools/tnftp/Makefile @@ -0,0 +1,29 @@ +# $NetBSD: Makefile,v 1.1 2006/07/14 21:41:42 jlam Exp $ +# +# This version of tnftp installs into ${PKG_TOOLS_BIN}. +# + +.include "../../net/tnftp/Makefile.common" + +CATEGORIES= pkgtools + +NO_PKGTOOLS_REQD_CHECK= yes +PKG_PRESERVE= yes + +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 + +.if ${PKG_TOOLS_PREFIX} == ${LOCALBASE} +CONFLICTS+= kth-krb4-[0-9]* +CONFLICTS+= lukemftp-[0-9]* +.endif + +.include "../../mk/bsd.pkg.mk" + +PREFIX:= ${PKG_TOOLS_PREFIX} |