doc/pkgsrc.*: regen

1 files changed, 215 insertions, 219 deletions

diff --git a/doc/pkgsrc.txt b/doc/pkgsrc.txt
index 17f85088d1a..5dbb3d843b5 100644
--- a/doc/pkgsrc.txt
+++ b/doc/pkgsrc.txt
@@ -4358,14 +4358,10 @@ supported, e.g.
 PYTHON_VERSIONS_INCOMPATIBLE=       27
 
 If the packaged software is a Python module, include one of ../../lang/python/
-egg.mk, ../../lang/python/distutils.mk, or ../../lang/python/extension.mk.
+egg.mk or ../../lang/python/extension.mk.
 
-Most Python packages use either "distutils" or easy-setup/setuptools ("eggs").
-If the packaged software is using setuptools, you only need to include "../../
-lang/python/egg.mk". Otherwise, if the software uses "distutils", include "..
-/../lang/python/distutils.mk", so pkgsrc will use this framework. "distutils"
-uses a script called setup.py; if the "distutils" driver is not called
-setup.py, set the PYSETUP variable to the name of the script.
+Most Python packages use setuptools ("eggs"). If the packaged software is using
+setuptools, you only need to include "../../lang/python/egg.mk".
 
 Either way, the package directory should be called "py-software" and PKGNAME
 should be set to "${PYPKGPREFIX}-${DISTNAME}", e.g.
@@ -10062,218 +10058,218 @@ TEXLIVE_REV                          TEXLIVE_UNVERSIONED
 TEXMFSITE                            TEX_FORMATS
 TEX_HYPHEN_DAT                       TEX_HYPHEN_DEF
 TEX_TEXMF_DIRS                       THTTPD_LOG_FACILITY
-TINYDYN_USER                         TO
-TOOLS_ALIASES                        TOOLS_ALWAYS_WRAP
-TOOLS_ARGS                           TOOLS_BROKEN
-TOOLS_CMD                            TOOLS_CMDLINE_SED
-TOOLS_CREATE                         TOOLS_DIR
-TOOLS_FAIL                           TOOLS_GNU_MISSING
-TOOLS_LDCONFIG                       TOOLS_NOOP
-TOOLS_PATH                           TOOLS_SCRIPT
-TOOL_DEPENDS                         TTF_FONTDIR
-TTF_FONTS_DIR                        TYPE
-UAC_REQD_EXECS                       UCSPI_SSL_GROUP
-UCSPI_SSL_USER                       UNLIMIT_RESOURCES
-UNPRIVILEGED                         UNPRIVILEGED_GROUP
-UNPRIVILEGED_GROUPS                  UNPRIVILEGED_USER
-UNWRAP_FILES                         UNWRAP_PATTERNS
-UPDATE_GEMSPEC                       UPDATE_TARGET
-URI                                  USERGROUP_PHASE
-USERPPP_GROUP                        USER_SPECIFIC_PKGS
-USE_ABI_DEPENDS                      USE_APR
-USE_BSD_MAKEFILE                     USE_BUILTIN
-USE_CROSS_COMPILE                    USE_CURSES
-USE_CWRAPPERS                        USE_DB185
-USE_FEATURES                         USE_GAMESGROUP
-USE_GCC_RUNTIME                      USE_IMAKE
-USE_JAVA                             USE_JAVA2
-USE_LANGUAGES                        USE_LIBTOOL
-USE_NATIVE_GCC                       USE_NETBSD_REPO
-USE_PKGSRC_GCC                       USE_PKGSRC_GCC_RUNTIME
-USE_PKGTASKS                         USE_PKG_ADMIN_DIGEST
-USE_RUBY_EXTCONF                     USE_RUBY_INSTALL
-USE_RUBY_SETUP                       USE_RUBY_SETUP_PKG
-USE_TOOLS                            UUCP_GROUP
-UUCP_USER                            VARBASE
-VARNAME                              VIM_EXTRA_OPTS
-WARNING_MSG                          WCALC_CGIDIR
-WCALC_CGIPATH                        WCALC_HTMLDIR
-WCALC_HTMLPATH                       WDM_MANAGERS
-WRAPPER_CC                           WRAPPER_REORDER_CMDS
-WRKDIR                               WRKDIR_BASENAME
-WRKDIR_LOCKTYPE                      WRKLOG
-WRKOBJDIR                            WRKSRC
-X10_PORT                             X11
-X11BASE                              X11_PKGSRCDIR
-X11_TYPE                             X509_CERTIFICATE
-X509_KEY                             XAW_TYPE
-XLOCK_DEFAULT_MODE                   XMKMF
-XMKMF_FLAGS                          XXX
-XXXX                                 YES
-ZSH_STATIC                           __stdc__
-_vargroups                           accept
-acquire-localbase-lock               acquire-lock
-add                                  administrator
-alloca                               alternatives
-aslr                                 asprintf
-atlas                                autoconf
-automake                             autoreconf
-awk                                  bash
-big-endian                           bin-install
-bind                                 binpkg-list
-blas                                 bootstrap-depends
-broken                               broken_on_platform
-bsd                                  bsd.prog.mk
-build                                build-env
-buildlink-directories                buildlink-oss-soundcard-h
-c                                    c++
-ccache                               cce
-cdefs                                ceil
-changes                              changes-entry
-changes-entry-noupdate               check
-check-clean                          check-files
-check-files-clean                    check-vulnerable
-checksum                             checksum-phase
-clean                                clean-depends
-cleandir                             commit
-commit-changes-entry                 compact
-compiler                             conf
-config.guess                         config.sub
-configuration                        configure
-configure-env                        configure-help
-configure_args                       connect
-cos                                  cputime
-create-usergroup                     csh
-ctf                                  cvs
-debug                                declaration
-declare                              defined
-depend                               dependencies
-depends                              depends-checksum
-depends-fetch                        deps
-describe                             destdir
-disable                              distclean
-distinfo                             dl
-dlopen                               do-build
-do-buildlink                         do-clean
-do-configure                         do-configure-post-hook
-do-extract                           do-fetch
-do-install                           emul
-emul-distinfo                        emul-fetch
-emulation                            emulator
-enable                               endian
-endif                                enomem
-err                                  errx
-etc                                  exp
-extract-rpm                          fabs
-feature                              features
-fetch                                fetch-list
-follows                              forbids
-form                                 format
-fortify                              fortify_source
-fossil                               friend
-fts                                  fts_close
-fts_open                             fts_read
-fts_set                              gcc
-gethostbyaddr                        gethostbyname
-gethostbyname2                       getopt_long
-getprogname                          getservbyname
-getservbyport                        getservent
-gettext                              git
-github                               gitlab
-glob                                 gnu
-gnu_configure_strict                 go
-go-deps                              golang
-guess-license                        hashbang
-heimdal                              help
-hg                                   imake
-increment                            inet_aton
-interp                               interpreter
-intl                                 ip4
-ip6                                  ipv4
-ipv6                                 iso
-kerberos                             krb
-krb5                                 ksh
-lapack                               latex
-libintl_bindtextdomain               libintl_gettext
-libintl_textdomain                   libnbcompat
-libs                                 libtool
-licence                              license
-lintl                                little-endian
-lock                                 locking
-lvalue                               make
-makesum                              memory
-mercurial                            meta
-meta-package                         meta_package
-mit-krb5                             mk.conf
-mkl                                  mount
-mprotect                             mremap
-nb                                   nbcompat
-netlib                               obstack
-obstack_ptr_grow                     occurs
-only                                 openblas
-options                              options.mk
-order                                override
-override-intltool                    override-message-intltool
-package                              parallel
-path                                 pax
-paxctl                               pbulk-index
-pc                                   perl
-perl5                                perms
-php                                  pkg-build-options
-pkg-config                           pkg_build_options
-platform                             plist
-post-extract                         post-fetch
-post-wrapper                         pre-build-checks-hook
-pre-configure                        pre-configure-checks-hook
-pre-extract                          pre-fetch
-print-go-deps                        print-plist
-print-summary-data                   privileged-install-hook
-pypi                                 python
-r                                    readme-all
-recv                                 recvfrom
-regcomp                              release-localbase-lock
-release-lock                         relro
-rename                               reorder
-replace                              replace_interpreter
-reproducible                         resolv
-root                                 ruby
-send                                 sendfile
-sendto                               setenv
-setgid                               setprogname
-setuid                               sh
-shebang                              show
-show-all                             show-build-defs
-show-depends                         show-deps
-show-distfiles                       show-downlevel
-show-subdir-var                      show-tools
-show-var                             show-vars
-snprintf                             socket
-ssp                                  st_mode
-stage-install                        strcasestr
-strict                               strip
-strndup                              strnlen
-strsep                               subst
-substitutions                        subversion
-sun                                  sunpro
-sunwspro                             svn
-symlink                              test
-test-env                             tex
-texlive                              tmp
-tool                                 tools
-tools-libtool-m4-override            type
-ulimit                               undefined
-undo-replace                         unlimit
-unprivileged                         unprivileged-install-hook
-unstripped                           update
-upload                               upload-distfiles
-use_tools                            user
-utimes                               vasprintf
-verbose                              vsnprintf
-warn                                 warning
-warnings                             warnx
-wattr_off                            wattr_on
-work                                 wrapper
-wrkdir                                
+TINYDYN_USER                         TLSWRAPPER_CHROOT
+TO                                   TOOLS_ALIASES
+TOOLS_ALWAYS_WRAP                    TOOLS_ARGS
+TOOLS_BROKEN                         TOOLS_CMD
+TOOLS_CMDLINE_SED                    TOOLS_CREATE
+TOOLS_DIR                            TOOLS_FAIL
+TOOLS_GNU_MISSING                    TOOLS_LDCONFIG
+TOOLS_NOOP                           TOOLS_PATH
+TOOLS_SCRIPT                         TOOL_DEPENDS
+TTF_FONTDIR                          TTF_FONTS_DIR
+TYPE                                 UAC_REQD_EXECS
+UCSPI_SSL_GROUP                      UCSPI_SSL_USER
+UNLIMIT_RESOURCES                    UNPRIVILEGED
+UNPRIVILEGED_GROUP                   UNPRIVILEGED_GROUPS
+UNPRIVILEGED_USER                    UNWRAP_FILES
+UNWRAP_PATTERNS                      UPDATE_GEMSPEC
+UPDATE_TARGET                        URI
+USERGROUP_PHASE                      USERPPP_GROUP
+USER_SPECIFIC_PKGS                   USE_ABI_DEPENDS
+USE_APR                              USE_BSD_MAKEFILE
+USE_BUILTIN                          USE_CROSS_COMPILE
+USE_CURSES                           USE_CWRAPPERS
+USE_DB185                            USE_FEATURES
+USE_GAMESGROUP                       USE_GCC_RUNTIME
+USE_IMAKE                            USE_JAVA
+USE_JAVA2                            USE_LANGUAGES
+USE_LIBTOOL                          USE_NATIVE_GCC
+USE_NETBSD_REPO                      USE_PKGSRC_GCC
+USE_PKGSRC_GCC_RUNTIME               USE_PKGTASKS
+USE_PKG_ADMIN_DIGEST                 USE_RUBY_EXTCONF
+USE_RUBY_INSTALL                     USE_RUBY_SETUP
+USE_RUBY_SETUP_PKG                   USE_TOOLS
+UUCP_GROUP                           UUCP_USER
+VARBASE                              VARNAME
+VIM_EXTRA_OPTS                       WARNING_MSG
+WCALC_CGIDIR                         WCALC_CGIPATH
+WCALC_HTMLDIR                        WCALC_HTMLPATH
+WDM_MANAGERS                         WRAPPER_CC
+WRAPPER_REORDER_CMDS                 WRKDIR
+WRKDIR_BASENAME                      WRKDIR_LOCKTYPE
+WRKLOG                               WRKOBJDIR
+WRKSRC                               X10_PORT
+X11                                  X11BASE
+X11_PKGSRCDIR                        X11_TYPE
+X509_CERTIFICATE                     X509_KEY
+XAW_TYPE                             XLOCK_DEFAULT_MODE
+XMKMF                                XMKMF_FLAGS
+XXX                                  XXXX
+YES                                  ZSH_STATIC
+__stdc__                             _vargroups
+accept                               acquire-localbase-lock
+acquire-lock                         add
+administrator                        alloca
+alternatives                         aslr
+asprintf                             atlas
+autoconf                             automake
+autoreconf                           awk
+bash                                 big-endian
+bin-install                          bind
+binpkg-list                          blas
+bootstrap-depends                    broken
+broken_on_platform                   bsd
+bsd.prog.mk                          build
+build-env                            buildlink-directories
+buildlink-oss-soundcard-h            c
+c++                                  ccache
+cce                                  cdefs
+ceil                                 changes
+changes-entry                        changes-entry-noupdate
+check                                check-clean
+check-files                          check-files-clean
+check-vulnerable                     checksum
+checksum-phase                       clean
+clean-depends                        cleandir
+commit                               commit-changes-entry
+compact                              compiler
+conf                                 config.guess
+config.sub                           configuration
+configure                            configure-env
+configure-help                       configure_args
+connect                              cos
+cputime                              create-usergroup
+csh                                  ctf
+cvs                                  debug
+declaration                          declare
+defined                              depend
+dependencies                         depends
+depends-checksum                     depends-fetch
+deps                                 describe
+destdir                              disable
+distclean                            distinfo
+dl                                   dlopen
+do-build                             do-buildlink
+do-clean                             do-configure
+do-configure-post-hook               do-extract
+do-fetch                             do-install
+emul                                 emul-distinfo
+emul-fetch                           emulation
+emulator                             enable
+endian                               endif
+enomem                               err
+errx                                 etc
+exp                                  extract-rpm
+fabs                                 feature
+features                             fetch
+fetch-list                           follows
+forbids                              form
+format                               fortify
+fortify_source                       fossil
+friend                               fts
+fts_close                            fts_open
+fts_read                             fts_set
+gcc                                  gethostbyaddr
+gethostbyname                        gethostbyname2
+getopt_long                          getprogname
+getservbyname                        getservbyport
+getservent                           gettext
+git                                  github
+gitlab                               glob
+gnu                                  gnu_configure_strict
+go                                   go-deps
+golang                               guess-license
+hashbang                             heimdal
+help                                 hg
+imake                                increment
+inet_aton                            interp
+interpreter                          intl
+ip4                                  ip6
+ipv4                                 ipv6
+iso                                  kerberos
+krb                                  krb5
+ksh                                  lapack
+latex                                libintl_bindtextdomain
+libintl_gettext                      libintl_textdomain
+libnbcompat                          libs
+libtool                              licence
+license                              lintl
+little-endian                        lock
+locking                              lvalue
+make                                 makesum
+memory                               mercurial
+meta                                 meta-package
+meta_package                         mit-krb5
+mk.conf                              mkl
+mount                                mprotect
+mremap                               nb
+nbcompat                             netlib
+obstack                              obstack_ptr_grow
+occurs                               only
+openblas                             options
+options.mk                           order
+override                             override-intltool
+override-message-intltool            package
+parallel                             path
+pax                                  paxctl
+pbulk-index                          pc
+perl                                 perl5
+perms                                php
+pkg-build-options                    pkg-config
+pkg_build_options                    platform
+plist                                post-extract
+post-fetch                           post-wrapper
+pre-build-checks-hook                pre-configure
+pre-configure-checks-hook            pre-extract
+pre-fetch                            print-go-deps
+print-plist                          print-summary-data
+privileged-install-hook              pypi
+python                               r
+readme-all                           recv
+recvfrom                             regcomp
+release-localbase-lock               release-lock
+relro                                rename
+reorder                              replace
+replace_interpreter                  reproducible
+resolv                               root
+ruby                                 send
+sendfile                             sendto
+setenv                               setgid
+setprogname                          setuid
+sh                                   shebang
+show                                 show-all
+show-build-defs                      show-depends
+show-deps                            show-distfiles
+show-downlevel                       show-subdir-var
+show-tools                           show-var
+show-vars                            snprintf
+socket                               ssp
+st_mode                              stage-install
+strcasestr                           strict
+strip                                strndup
+strnlen                              strsep
+subst                                substitutions
+subversion                           sun
+sunpro                               sunwspro
+svn                                  symlink
+test                                 test-env
+tex                                  texlive
+tmp                                  tool
+tools                                tools-libtool-m4-override
+type                                 ulimit
+undefined                            undo-replace
+unlimit                              unprivileged
+unprivileged-install-hook            unstripped
+update                               upload
+upload-distfiles                     use_tools
+user                                 utimes
+vasprintf                            verbose
+vsnprintf                            warn
+warning                              warnings
+warnx                                wattr_off
+wattr_on                             work
+wrapper                              wrkdir
 
 Appendix F. Editing guidelines for the pkgsrc guide