diff options
| -rwxr-xr-x | bootstrap/bootstrap | 10 | ||||
| -rwxr-xr-x | bootstrap/mkbootstrapkit | 3 | ||||
| -rw-r--r-- | doc/CHANGES-2006 | 3 | ||||
| -rw-r--r-- | net/tnftp/Makefile | 29 | ||||
| -rw-r--r-- | net/tnftp/Makefile.common | 27 | ||||
| -rw-r--r-- | pkgtools/Makefile | 3 | ||||
| -rw-r--r-- | pkgtools/tnftp/Makefile | 29 |
7 files changed, 72 insertions, 32 deletions
diff --git a/bootstrap/bootstrap b/bootstrap/bootstrap index d133f0b4088..e8159e279cc 100755 --- a/bootstrap/bootstrap +++ b/bootstrap/bootstrap @@ -1,6 +1,6 @@ #! /bin/sh -# $NetBSD: bootstrap,v 1.63 2006/07/14 19:40:26 jlam Exp $ +# $NetBSD: bootstrap,v 1.64 2006/07/14 21:41:42 jlam Exp $ # # # Copyright (c) 2001-2002 Alistair G. Crooks. All rights reserved. @@ -836,15 +836,15 @@ case "$need_sed" in yes) run_cmd "(cd ../textproc/nbsed && $bmake MAKECONF=${MKCONF_EXAMPLE} LIBNBCOMPAT_STYLE=inplace bootstrap-register)" ;; esac case "$need_ftp" in -yes) run_cmd "(cd ../net/tnftp&& $bmake MAKECONF=${MKCONF_EXAMPLE} LIBNBCOMPAT_STYLE=inplace PKG_OPTIONS= bootstrap-register)" ;; +yes) run_cmd "(cd ../pkgtools/tnftp && $bmake MAKECONF=${MKCONF_EXAMPLE} bootstrap-register)" ;; esac case "$need_mtree" in -yes) run_cmd "(cd ../pkgtools/mtree && $bmake MAKECONF=${MKCONF_EXAMPLE} LIBNBCOMPAT_STYLE=inplace bootstrap-register)" ;; +yes) run_cmd "(cd ../pkgtools/mtree && $bmake MAKECONF=${MKCONF_EXAMPLE} bootstrap-register)" ;; esac case "$need_pax" in -yes) run_cmd "(cd ../pkgtools/pax && $bmake MAKECONF=${MKCONF_EXAMPLE} LIBNBCOMPAT_STYLE=inplace bootstrap-register)" ;; +yes) run_cmd "(cd ../pkgtools/pax && $bmake MAKECONF=${MKCONF_EXAMPLE} bootstrap-register)" ;; esac -run_cmd "(cd ../pkgtools/pkg_install && $bmake MAKECONF=${MKCONF_EXAMPLE} LIBNBCOMPAT_STYLE=inplace bootstrap-register)" +run_cmd "(cd ../pkgtools/pkg_install && $bmake MAKECONF=${MKCONF_EXAMPLE} bootstrap-register)" echo "" echo "Please remember to add $prefix/bin to your PATH environment variable" diff --git a/bootstrap/mkbootstrapkit b/bootstrap/mkbootstrapkit index 054bc2b717a..7b05b7292d4 100755 --- a/bootstrap/mkbootstrapkit +++ b/bootstrap/mkbootstrapkit @@ -1,6 +1,6 @@ #! /bin/sh # -# $NetBSD: mkbootstrapkit,v 1.4 2006/07/14 19:40:26 jlam Exp $ +# $NetBSD: mkbootstrapkit,v 1.5 2006/07/14 21:41:42 jlam Exp $ # # Usage: mkbootstrapkit [kitdir] # @@ -31,6 +31,7 @@ for dir in \ pkgtools/mtree \ pkgtools/pax \ pkgtools/pkg_install \ + pkgtools/tnftp \ textproc/nbsed do echo "Copying $dir." diff --git a/doc/CHANGES-2006 b/doc/CHANGES-2006 index 14bfa4fc6c7..7a05944cdd4 100644 --- a/doc/CHANGES-2006 +++ b/doc/CHANGES-2006 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2006,v 1.726 2006/07/14 19:56:36 tron Exp $ +$NetBSD: CHANGES-2006,v 1.727 2006/07/14 21:41:42 jlam Exp $ Changes to the packages collection and infrastructure in 2006: @@ -3379,3 +3379,4 @@ Changes to the packages collection and infrastructure in 2006: Added pkgtools/pax version 20060202 [jlam 2006-07-14] Added sysutils/mtree version 20040722 [jlam 2006-07-14] Updated mail/mutt to 1.4.2.2 [tron 2006-07-14] + Added pkgtools/tnftp version 20050625 [jlam 2006-07-14] diff --git a/net/tnftp/Makefile b/net/tnftp/Makefile index 4f454c1f57b..17526a212f8 100644 --- a/net/tnftp/Makefile +++ b/net/tnftp/Makefile @@ -1,31 +1,12 @@ -# $NetBSD: Makefile,v 1.19 2006/07/14 16:24:29 jlam Exp $ -# +# $NetBSD: Makefile,v 1.20 2006/07/14 21:41:42 jlam Exp $ -DISTNAME= tnftp-20050625 -SVR4_PKGNAME= tnftp -CATEGORIES= net -MASTER_SITES= # empty -DISTFILES= # empty +.include "Makefile.common" -# distfile obtained from: ftp://ftp.NetBSD.org/pub/NetBSD/misc/tnftp +CATEGORIES= net -MAINTAINER= lukem@NetBSD.org -COMMENT= The enhanced FTP client in NetBSD - -GNU_CONFIGURE= YES - -CONFLICTS+= kth-krb4-[0-9]* -CONFLICTS+= lukemftp-[0-9]* - -NO_CHECKSUM= yes -NO_MTREE= yes +CONFLICTS+= kth-krb4-[0-9]* +CONFLICTS+= lukemftp-[0-9]* .include "options.mk" -OPSYSVARS+= MAKE_ENV -MAKE_ENV.SunOS+= CPPFLAGS="" - -do-extract: - @${CP} -R ${FILESDIR} ${WRKSRC} - .include "../../mk/bsd.pkg.mk" diff --git a/net/tnftp/Makefile.common b/net/tnftp/Makefile.common new file mode 100644 index 00000000000..3cb8176c28b --- /dev/null +++ b/net/tnftp/Makefile.common @@ -0,0 +1,27 @@ +# $NetBSD: Makefile.common,v 1.1 2006/07/14 21:41:42 jlam Exp $ + +DISTNAME= tnftp-20050625 +SVR4_PKGNAME= tnftp +MASTER_SITES= # empty +DISTFILES= # empty + +# distfile obtained from: ftp://ftp.NetBSD.org/pub/NetBSD/misc/tnftp + +MAINTAINER= lukem@NetBSD.org +COMMENT= The enhanced FTP client in NetBSD + +GNU_CONFIGURE= YES + +NO_CHECKSUM= yes +NO_MTREE= yes + +FILESDIR= ${.CURDIR}/../../net/tnftp/files +PKGDIR= ${.CURDIR}/../../net/tnftp + +OPSYSVARS+= MAKE_ENV +MAKE_ENV.SunOS+= CPPFLAGS="" + +.include "../../mk/bsd.prefs.mk" + +do-extract: + @${CP} -R ${FILESDIR} ${WRKSRC} 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} |