pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/bootstrap Use the pkgtools/pkgmanpages package instead...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/add44a27f141
branches:  trunk
changeset: 516140:add44a27f141
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Fri Jul 14 22:17:09 2006 +0000

description:
Use the pkgtools/pkgmanpages package instead of keeping our own copy of
the packages.7 man/catman page.

diffstat:

 bootstrap/bootstrap           |   10 +-
 bootstrap/files/packages.cat7 |  773 ------------------------------------------
 bootstrap/mkbootstrapkit      |    3 +-
 3 files changed, 7 insertions(+), 779 deletions(-)

diffs (truncated from 829 to 300 lines):

diff -r 23eb9dc237ea -r add44a27f141 bootstrap/bootstrap
--- a/bootstrap/bootstrap       Fri Jul 14 22:13:19 2006 +0000
+++ b/bootstrap/bootstrap       Fri Jul 14 22:17:09 2006 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# $NetBSD: bootstrap,v 1.64 2006/07/14 21:41:42 jlam Exp $
+# $NetBSD: bootstrap,v 1.65 2006/07/14 22:17:09 jlam Exp $
 #
 #
 # Copyright (c) 2001-2002 Alistair G. Crooks.  All rights reserved.
@@ -817,10 +817,6 @@
 copy_src ../pkgtools/pkg_install/files pkg_install
 run_cmd "(cd $wrkdir/pkg_install; env $BSTRAP_ENV CPPFLAGS='$CPPFLAGS -I../libnbcompat -I../../libnbcompat' LDFLAGS='$LDFLAGS -L../libnbcompat -L../../libnbcompat' LIBS='-lnbcompat' $shprog 
./configure -C --prefix=$prefix --sysconfdir=$sysconfdir --with-pkgdbdir=$pkgdbdir --mandir=$mandir && $bmake && $bmake install)"
 
-# all's ready, install the man page
-echo_msg "Installing packages(7) man page"
-run_cmd "$shprog $wrkdir/install-sh -c -m 444 files/packages.cat7 $mandir/cat7/packages.0"
-
 # opsys specific fiddling
 opsys_finish
 
@@ -846,6 +842,10 @@
 esac
 run_cmd "(cd ../pkgtools/pkg_install && $bmake MAKECONF=${MKCONF_EXAMPLE} bootstrap-register)"
 
+# Install the man page.
+echo_msg "Installing packages(7) man page"
+run_cmd "(cd ../pkgtools/pkgmanpages && $bmake MAKECONF=${MKCONF_EXAMPLE} install)"
+
 echo ""
 echo "Please remember to add $prefix/bin to your PATH environment variable"
 echo "and $prefix/man to your MANPATH environment variable, if necessary."
diff -r 23eb9dc237ea -r add44a27f141 bootstrap/files/packages.cat7
--- a/bootstrap/files/packages.cat7     Fri Jul 14 22:13:19 2006 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,773 +0,0 @@
-PACKAGES(7)         NetBSD Miscellaneous Information Manual        PACKAGES(7)
-
-NNAAMMEE
-     ppaacckkaaggeess - NetBSD user package variables
-
-DDEESSCCRRIIPPTTIIOONN
-     This manual page describes the variables that users of the NetBSD pack-
-     ages system can set to alter the configuration of the package system, and
-     individual packages.
-
-CCOOMMMMOONN VVAARRIIAABBLLEESS
-     This section documents variables that typically apply to all packages.
-     Many of these may be set in mk.conf(5).
-
-           ARCH       The architecture, as returned by ``uname -m''.  See
-                      uname(1).
-
-           OPSYS      The operating system name, as returned by ``uname -s''.
-
-           LOCALBASE  Where non-X11 based packages will be installed.  The
-                      default is _/_u_s_r_/_p_k_g.
-
-           CROSSBASE  Where ``cross'' category packages will be installed.
-                      The default is _$_{_L_O_C_A_L_B_A_S_E_}_/_c_r_o_s_s.
-
-           X11BASE    Where X11 is installed on the system, and where ``X11''
-                      category packages will be installed.  The default is
-                      _/_u_s_r_/_X_1_1_R_6.
-
-           DISTDIR    Where to get gzip'd, tar-balled copies of original
-                      sources.  The default is _$_{_P_K_G_S_R_C_D_I_R_}_/_d_i_s_t_f_i_l_e_s.
-
-           MASTER_SITE_BACKUP
-                      Backup location(s) for distribution files and patch
-                      files if not found locally and ${MAS-
-                      TER_SITES}/${PATCH_SITES}.  The defaults are
-                      
_f_t_p_:_/_/_f_t_p_._N_e_t_B_S_D_._o_r_g_/_p_u_b_/_N_e_t_B_S_D_/_p_a_c_k_a_g_e_s_/_d_i_s_t_f_i_l_e_s_/_$_{_D_I_S_T___S_U_B_D_I_R_}_/
-                      and
-                      
_f_t_p_:_/_/_f_t_p_._f_r_e_e_b_s_d_._o_r_g_/_p_u_b_/_F_r_e_e_B_S_D_/_d_i_s_t_f_i_l_e_s_/_$_{_D_I_S_T___S_U_B_D_I_R_}_/.
-
-           MASTER_SITE_OVERRIDE
-                      If set, override the MASTER_SITES setting with this
-                      value.
-
-           PACKAGES   A top level directory where all packages go (rather than
-                      going locally to each package).  The default is
-                      _$_{_P_K_G_S_R_C_D_I_R_}_/_p_a_c_k_a_g_e_s.
-
-           GMAKE      Set to path of GNU make if not in $PATH (default:
-                      gmake).
-
-           PKG_FC     Set to the path of the desired Fortran compiler
-                      (default: f2c-f77).
-
-           XMKMF      Set to path of ``xmkmf'' if not in $PATH (default: xmkmf
-                      -a).
-
-           WRKOBJDIR  A top level directory where, if defined, the separate
-                      working directories will get created, and symbolically
-                      linked to from _$_{_W_R_K_D_I_R_} (see below).  This is useful
-                      for building packages on several architectures, then
-                      _$_{_P_K_G_S_R_C_D_I_R_} can be NFS-mounted while _$_{_W_R_K_O_B_J_D_I_R_} is
-                      local to every arch.  (It should be noted that
-                      _$_{_P_K_G_S_R_C_D_I_R_} should not be set by the user - it is an
-                      internal definition which refers to the root of the
-                      pkgsrc tree.  It is possible to have many pkgsrc tree
-                      instances.)
-
-           PKG_DEVELOPER
-                      Run some sanity checks that package developers want:
-
-                      ++oo   make sure patches apply with zero fuzz
-
-                      ++oo   run check-shlibs to see that all binaries will find
-                          their shared libs.
-
-           USE_GLX    Says that if Mesa is requested, a package should prefer-
-                      ably use a GLX (hardware-accelerated) version of the
-                      Mesa library.
-
-           BINPKG_SITES
-                      List of sites carrying binary pkgs.
-
-           LOCALPATCHES
-                      Directory for local patches that aren't part of pkgsrc.
-                      See _p_k_g_s_r_c_/_d_o_c_/_p_k_g_s_r_c_._t_x_t for more information.  ``rel''
-                      and ``arch'' are replaced with OS release ( ``1.5'',
-                      etc.) and architecture ( ``mipsel'', etc.).
-
-           PKGMAKECONF
-                      Location of the _m_k_._c_o_n_f file used by a package's BSD-
-                      style Makefile.  If this is not set, MAKECONF is set to
-                      _/_d_e_v_/_n_u_l_l to avoid picking up settings used by builds in
-                      _/_u_s_r_/_s_r_c.
-
-PPAACCKKAAGGEE SSPPEECCIIFFIICC VVAARRIIAABBLLEESS
-     This section documents variables that typically apply to an individual
-     package.  Non-Boolean variables without defaults are *mandatory*.
-
-           ONLY_FOR_PLATFORM
-                     If set, it lists the values of OS triples (OS-version-
-                     platform) that the package will build under.  It can be a
-                     glob-style wildcard.
-
-           NOT_FOR_PLATFORM
-                     If set, it lists the values of OS triples (OS-version-
-                     platform) that the package will not build under.  It can
-                     be a glob-style wildcard.
-
-           MAINTAINER
-                     The e-mail address of the contact person for this pack-
-                     age.  The person who feels responsible for this package,
-                     and who is most likely to look at problems or questions
-                     regarding this package which have been reported with
-                     send-pr(1).  The right person to contact before making
-                     major changes to the package.  The default is tech-
-                     pkg%NetBSD.org@localhost.
-
-           CATEGORIES
-                     A list of descriptive categories into which this package
-                     falls.
-
-           COMMENT   A one-line description of the package (should not include
-                     the package name).
-
-           MASTER_SITES
-                     Primary location(s) for distribution files if not found
-                     locally.
-
-           PATCH_SITES
-                     Primary location(s) for distribution patch files (see
-                     PATCHFILES below) if not found locally.
-
-           PKG_DEBUG_LEVEL
-                     The level of debugging output which is displayed whilst
-                     making and installing the package.  The default value for
-                     this is 0, which will not display the commands as they
-                     are executed (normal, default, quiet operation); the
-                     value 1 will display all shell commands before their
-                     invocation, and the value 2 will display both the shell
-                     commands before their invocation, and their actual execu-
-                     tion progress with sseett --xx will be displayed.
-
-           WRKDIR    A temporary working directory that gets *clobbered* on
-                     clean.  The default is _$_{_._C_U_R_D_I_R_}_/_w_o_r_k or
-                     _$_{_._C_U_R_D_I_R_}_/_w_o_r_k_._$_{_M_A_C_H_I_N_E___A_R_C_H_} if OBJMACHINE is set.
-
-           WRKSRC    A subdirectory of ${WRKDIR} where the distribution actu-
-                     ally unpacks to.  The default is _$_{_W_R_K_D_I_R_}_/_$_{_D_I_S_T_N_A_M_E_}.
-                     The value of WRKSRC should be set explicitly if the pack-
-                     age does not follow standard conventions and include the
-                     package's name as a subdirectory.  Please note that the
-                     old NO_WRKSUBDIR definition has been deprecated and
-                     should not be used.
-
-           DISTNAME  Name of package or distribution.
-
-           DISTFILES
-                     Name(s) of archive file(s) containing distribution.  The
-                     default is _$_{_D_I_S_T_N_A_M_E_}_$_{_E_X_T_R_A_C_T___S_U_F_X_}.
-
-           PATCHFILES
-                     Name(s) of additional files that contain distribution
-                     patches.  There is no default.  Make will look for them
-                     at PATCH_SITES (see above).  They will automatically be
-                     uncompressed before patching if the names end with
-                     ``.gz'' or ``.Z''.
-
-           DIST_SUBDIR
-                     Suffix to _$_{_D_I_S_T_D_I_R_}.  If set, all _$_{_D_I_S_T_F_I_L_E_S_} and
-                     _$_{_P_A_T_C_H_F_I_L_E_S_} will be put in this subdirectory of
-                     _$_{_D_I_S_T_D_I_R_}_.
-
-           ALLFILES  All of _$_{_D_I_S_T_F_I_L_E_S_} and _$_{_P_A_T_C_H_F_I_L_E_S_}.
-
-           IGNOREFILES
-                     If some of the _$_{_A_L_L_F_I_L_E_S_} are not checksum-able, set
-                     this variable to their names.
-
-           PKGNAME   Name of the package file to create if the _$_{_D_I_S_T_N_A_M_E_}
-                     isn't really relevant for the package.  The default is
-                     _$_{_D_I_S_T_N_A_M_E_}.
-
-           SVR4_PKGNAME
-                     Name of the package file to create if the _$_{_P_K_G_N_A_M_E_}
-                     isn't unique enough on a SVR4 system.  The default is
-                     _$_{_P_K_G_N_A_M_E_} which may be shortened when you use gensolpkg.
-                     Only add SVR4_PKGNAME if _$_{_P_K_G_N_A_M_E_} does not produce an
-                     unique package name on a SVR4 system.  The length of
-                     SVR4_PKGNAME is limited to 5 characters.
-
-           PKGREVISION
-                     This number indicates the package's revision within the
-                     NetBSD Packages Collection (pkgsrc).  If set, this will
-                     be attached to the PKGNAME variable separated by a
-                     ``nb''.
-
-           EXTRACT_ONLY
-                     If defined, a subset of _$_{_D_I_S_T_F_I_L_E_S_} you want to actually
-                     extract.
-
-           PATCHDIR  A directory containing any additional patches you made to
-                     package this software.  The default is
-                     _$_{_._C_U_R_D_I_R_}_/_p_a_t_c_h_e_s.
-
-           SCRIPTDIR
-                     A directory containing any auxiliary scripts.  The
-                     default is _$_{_._C_U_R_D_I_R_}_/_s_c_r_i_p_t_s.
-
-           FILESDIR  A directory containing any miscellaneous additional
-                     files.  The default is _$_{_._C_U_R_D_I_R_}_/_f_i_l_e_s.
-
-           PKGDIR    A direction containing any package creation files.  The
-                     default is _$_{_._C_U_R_D_I_R_}_/_p_k_g.
-
-           PKG_DBDIR
-                     Where package installation is recorded.  The default is
-                     _/_v_a_r_/_d_b_/_p_k_g.
-
-           FORCE_PKG_REGISTER
-                     If set, it will overwrite any existing package registra-
-                     tion information in _$_{_P_K_G___D_B_D_I_R_}_/_$_{_P_K_G_N_A_M_E_}.
-
-           NO_MTREE  If set, will not invoke mtree from _b_s_d_._p_k_g_._m_k from the
-                     ``install'' target.
-
-           MTREE_FILE
-                     The name of the mtree file.  The default is
-                     _/_e_t_c_/_m_t_r_e_e_/_B_S_D_._x_1_1_._d_i_s_t if USE_IMAKE or USE_X11BASE is
-                     set, or _/_e_t_c_/_m_t_r_e_e_/_B_S_D_._p_k_g_._d_i_s_t otherwise.
-
-           USE_X11   Instructs the package system that the package will use
-                     headers and libraries from X11BASE and so a check must be
-                     made that these are available.  If they are not, an
-                     IGNORE message will be displayed, and the package will
-                     not be built.
-
-           PLIST_SRC
-                     Which file(s) to use to build _$_{_P_L_I_S_T_}.  Default is
-                     _$_{_P_K_G_D_I_R_}_/_P_L_I_S_T.
-
-           PLIST_SUBST
-                     Patterns that get automatically expanded during the PLIST
-                     creation.  Takes arguments of the form VARNAME =
-                     ``value'' and subsequently replaces every occurrence of
-                     ${VARNAME} with value.
-
-           INSTALL_FILE
-                     The name of a script which will be invoked when
-                     installing binary packages.  If there is a file called
-                     _$_{_P_K_G_D_I_R_}_/_I_N_S_T_A_L_L, that file will be used.
-
-           DEINSTALL_FILE
-                     The name of a script which will be invoked when de-
-                     installing binary packages.  If there is a file called
-                     _$_{_P_K_G_D_I_R_}_/_D_E_I_N_S_T_A_L_L, that file will be used.
-
-           MESSAGE   The name of a file which will be displayed during the
-                     installation of a package.  No substitution according to
-                     MESSAGE_SUBST takes place.  Overrides MESSAGE_SRC.
-                     Should not be used.
-
-           MESSAGE_SRC



Home | Main Index | Thread Index | Old Index