CVS commit: pkgsrc

["Roland Illig" <rillig%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rillig
Date:           Fri Jun  5 17:05:22 UTC 2020

Modified Files:
        pkgsrc/doc/guide/files: build.xml
        pkgsrc/mk: bsd.pkg.subdir.mk

Log Message:
mk, doc: remove obsolete bulk-install and bulk-package targets


To generate a diff of this commit:
cvs rdiff -u -r1.82 -r1.83 pkgsrc/doc/guide/files/build.xml
cvs rdiff -u -r1.70 -r1.71 pkgsrc/mk/bsd.pkg.subdir.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/doc/guide/files/build.xml
diff -u pkgsrc/doc/guide/files/build.xml:1.82 pkgsrc/doc/guide/files/build.xml:1.83
--- pkgsrc/doc/guide/files/build.xml:1.82       Tue Jun  2 06:10:09 2020
+++ pkgsrc/doc/guide/files/build.xml    Fri Jun  5 17:05:22 2020
@@ -1,4 +1,4 @@
-<!-- $NetBSD: build.xml,v 1.82 2020/06/02 06:10:09 rillig Exp $ -->
+<!-- $NetBSD: build.xml,v 1.83 2020/06/05 17:05:22 rillig Exp $ -->
 
 <chapter id="build">
   <title>The build process</title>
@@ -1217,57 +1217,6 @@ ${FETCH_CMD} ${FETCH_BEFORE_ARGS} ${site
          information on this target.</para>
        </listitem>
       </varlistentry>
-
-      <varlistentry>
-       <!-- TODO: old bulk build? --> 
-       <term>bulk-package</term>
-
-       <listitem>
-         <para>Used to do bulk builds. If an appropriate binary
-         package already exists, no action is taken. If not, this
-         target will compile, install and package it (and its
-         depends, if <varname>PKG_DEPENDS</varname> is set
-         properly. See <xref linkend="bulk"/>).
-         After creating the binary package, the sources, the
-         just-installed package and its required packages are
-         removed, preserving free disk space.</para>
-
-         <para><emphasis>Beware that this target may deinstall
-         all packages installed on a system!</emphasis></para>
-       </listitem>
-      </varlistentry>
-
-      <varlistentry>
-       <term>bulk-install</term>
-
-       <listitem>
-         <para>Used during bulk-installs to install required
-         packages. If an up-to-date binary package is available,
-         it will be installed via &man.pkg.add.1;. If not,
-         <command>make bulk-package</command> will be executed,
-         but the installed binary won't be removed.</para>
-
-         <para>A binary package is considered
-         <quote>up-to-date</quote> to be installed via
-         &man.pkg.add.1; if:</para>
-
-         <itemizedlist>
-           <listitem>
-             <para>None of the package's files
-             (<filename>Makefile</filename>, ...) were modified
-             since it was built.</para>
-           </listitem>
-
-           <listitem>
-             <para>None of the package's required (binary)
-             packages were modified since it was built.</para>
-           </listitem>
-         </itemizedlist>
-
-         <para><emphasis>Beware that this target may deinstall
-         all packages installed on a system!</emphasis></para>
-       </listitem>
-      </varlistentry>
     </variablelist>
   </sect1>
 </chapter>

Index: pkgsrc/mk/bsd.pkg.subdir.mk
diff -u pkgsrc/mk/bsd.pkg.subdir.mk:1.70 pkgsrc/mk/bsd.pkg.subdir.mk:1.71
--- pkgsrc/mk/bsd.pkg.subdir.mk:1.70    Tue Oct 14 22:35:19 2008
+++ pkgsrc/mk/bsd.pkg.subdir.mk Fri Jun  5 17:05:22 2020
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.subdir.mk,v 1.70 2008/10/14 22:35:19 joerg Exp $
+#      $NetBSD: bsd.pkg.subdir.mk,v 1.71 2020/06/05 17:05:22 rillig Exp $
 #      Derived from: FreeBSD Id: bsd.port.subdir.mk,v 1.19 1997/03/09 23:10:56 wosch Exp
 #      from: @(#)bsd.subdir.mk 5.9 (Berkeley) 2/1/91
 #
@@ -23,7 +23,7 @@
 #      afterinstall, all, beforeinstall, build, checksum, clean,
 #      configure, deinstall, depend, describe, extract, fetch, fetch-list,
 #      install, package, readmes, realinstall, reinstall, tags,
-#      mirror-distfiles, bulk-install, bulk-package, ${PKG_MISC_TARGETS}
+#      mirror-distfiles, ${PKG_MISC_TARGETS}
 #
 
 .include "misc/common.mk"
@@ -69,7 +69,7 @@ _SUBDIRUSE: .USE
                cleandir distclean depend describe reinstall tags checksum \
                makedistinfo makepatchsum makesum mirror-distfiles deinstall \
                show-downlevel show-pkgsrc-dir show-var show-vars \
-               bulk-install bulk-package fetch-list-one-pkg \
+               fetch-list-one-pkg \
                fetch-list-recursive update clean-update lint \
                check-vulnerable pbulk-index \
                ${PKG_MISC_TARGETS}