pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc Create a separate pkgtools/tnftp package that is insta...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/8819256487a9
branches:  trunk
changeset: 516133:8819256487a9
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Fri Jul 14 21:41:42 2006 +0000

description:
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:

 bootstrap/bootstrap       |  10 +++++-----
 bootstrap/mkbootstrapkit  |   3 ++-
 doc/CHANGES-2006          |   3 ++-
 net/tnftp/Makefile        |  29 +++++------------------------
 net/tnftp/Makefile.common |  27 +++++++++++++++++++++++++++
 pkgtools/Makefile         |   3 ++-
 pkgtools/tnftp/Makefile   |  29 +++++++++++++++++++++++++++++
 7 files changed, 72 insertions(+), 32 deletions(-)

diffs (185 lines):

diff -r 8aabdccb9b63 -r 8819256487a9 bootstrap/bootstrap
--- a/bootstrap/bootstrap       Fri Jul 14 20:11:10 2006 +0000
+++ b/bootstrap/bootstrap       Fri Jul 14 21:41:42 2006 +0000
@@ -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 @@
 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 -r 8aabdccb9b63 -r 8819256487a9 bootstrap/mkbootstrapkit
--- a/bootstrap/mkbootstrapkit  Fri Jul 14 20:11:10 2006 +0000
+++ b/bootstrap/mkbootstrapkit  Fri Jul 14 21:41:42 2006 +0000
@@ -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 @@
        pkgtools/mtree \
        pkgtools/pax \
        pkgtools/pkg_install \
+       pkgtools/tnftp \
        textproc/nbsed
 do
        echo "Copying $dir."
diff -r 8aabdccb9b63 -r 8819256487a9 doc/CHANGES-2006
--- a/doc/CHANGES-2006  Fri Jul 14 20:11:10 2006 +0000
+++ b/doc/CHANGES-2006  Fri Jul 14 21:41:42 2006 +0000
@@ -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 @@
        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 -r 8aabdccb9b63 -r 8819256487a9 net/tnftp/Makefile
--- a/net/tnftp/Makefile        Fri Jul 14 20:11:10 2006 +0000
+++ b/net/tnftp/Makefile        Fri Jul 14 21:41:42 2006 +0000
@@ -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
-
-# distfile obtained from: ftp://ftp.NetBSD.org/pub/NetBSD/misc/tnftp
+.include "Makefile.common"
 
-MAINTAINER=            lukem%NetBSD.org@localhost
-COMMENT=               The enhanced FTP client in NetBSD
-
-GNU_CONFIGURE=         YES
+CATEGORIES=    net
 
-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 -r 8aabdccb9b63 -r 8819256487a9 net/tnftp/Makefile.common
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/tnftp/Makefile.common Fri Jul 14 21:41:42 2006 +0000
@@ -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@localhost
+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 -r 8aabdccb9b63 -r 8819256487a9 pkgtools/Makefile
--- a/pkgtools/Makefile Fri Jul 14 20:11:10 2006 +0000
+++ b/pkgtools/Makefile Fri Jul 14 21:41:42 2006 +0000
@@ -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+=       revbump
 SUBDIR+=       rpm2pkg
 SUBDIR+=       shlock
+#SUBDIR+=      tnftp
 SUBDIR+=       url2pkg
 SUBDIR+=       verifypc
 SUBDIR+=       x11-links
diff -r 8aabdccb9b63 -r 8819256487a9 pkgtools/tnftp/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/pkgtools/tnftp/Makefile   Fri Jul 14 21:41:42 2006 +0000
@@ -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}



Home | Main Index | Thread Index | Old Index