diff --git a/poudriere/poudriere.d/143x64-make.conf b/poudriere/poudriere.d/143x64-make.conf index c4380d9..048498b 100644 --- a/poudriere/poudriere.d/143x64-make.conf +++ b/poudriere/poudriere.d/143x64-make.conf @@ -131,9 +131,7 @@ OPTIONS_FILE_SET+=WEB OPTIONS_FILE_SET+=PYTHON .endif -.if ${.CURDIR:M*/www/awstats} -OPTIONS_FILE_SET+=GEOIPFREE -OPTIONS_FILE_SET+=DECODEUTFKEYS -OPTIONS_FILE_SET+=JSON +.if ${.CURDIR:M*/sysutils/nut} +OPTIONS_FILE_SET+=SNMP .endif diff --git a/poudriere/poudriere.d/143x64.list b/poudriere/poudriere.d/143x64.list index 991b1c7..05c4cfc 100644 --- a/poudriere/poudriere.d/143x64.list +++ b/poudriere/poudriere.d/143x64.list @@ -255,3 +255,4 @@ multimedia/zoneminder archivers/pbzip2 net-p2p/datum_gateway www/py-frappe-bench +sysutils/nut diff --git a/poudriere/poudriere.d/150x64-make.conf b/poudriere/poudriere.d/150x64-make.conf index ef4a321..fa3910a 100644 --- a/poudriere/poudriere.d/150x64-make.conf +++ b/poudriere/poudriere.d/150x64-make.conf @@ -131,9 +131,7 @@ OPTIONS_FILE_SET+=WEB OPTIONS_FILE_SET+=PYTHON .endif -.if ${.CURDIR:M*/www/awstats} -OPTIONS_FILE_SET+=GEOIPFREE -OPTIONS_FILE_SET+=DECODEUTFKEYS -OPTIONS_FILE_SET+=JSON +.if ${.CURDIR:M*/sysutils/nut} +OPTIONS_FILE_SET+=SNMP .endif diff --git a/poudriere/poudriere.d/150x64.list b/poudriere/poudriere.d/150x64.list index 1f45b1c..2dfa9fe 100644 --- a/poudriere/poudriere.d/150x64.list +++ b/poudriere/poudriere.d/150x64.list @@ -247,3 +247,4 @@ net-p2p/cpuminer # sysutils/goaccess net/tcptraceroute +sysutils/nut diff --git a/poudriere/poudriere.d/verisign13-make.conf b/poudriere/poudriere.d/verisign13-make.conf index 47b30a1..54a923b 100644 --- a/poudriere/poudriere.d/verisign13-make.conf +++ b/poudriere/poudriere.d/verisign13-make.conf @@ -1,5 +1,5 @@ WITH_PKGNG=YES -OPTIONS_UNSET+="NSL X11 DOCS GTK1 GTK2 GTK3 GUI QT4 QT5 COMPOSITE FONTCONFIGGLX XINERAMA XRANDR XVIDEO XVMC GNOME GNOMEKEYRING GNOMEVFS2 TCLTK TK EXAMPLES MAN MAN3 HELP DOXYGEN INFO TESTS TEST WAYLAND DEBUG" +OPTIONS_UNSET+="NSL X11 DOCS GTK1 GTK2 GTK3 GUI QT4 QT5 QT6 COMPOSITE FONTCONFIGGLX XINERAMA XRANDR XVIDEO XVMC GNOME GNOMEKEYRING GNOMEVFS2 TCLTK TK EXAMPLES MAN MAN3 HELP DOXYGEN INFO TESTS TEST WAYLAND DEBUG" KRB5_HOME=/usr/local # default, unnecessary KRB5_IMPL=mit WITH_GSSAPI="YES" @@ -11,8 +11,14 @@ ALLOW_UNSUPPORTED_SYSTEM="YES" ENABLE_VTY_GROUP=quaggavty # Support Quagga VALID_CATEGORIES+=local BUILD_ALL_PYTHON_FLAVORS=yes +MAKE_JOBS_UNSAFE=yes -DEFAULT_VERSIONS+= samba=4.20 perl5=5.38 +# Set default versions +DEFAULT_VERSIONS+= samba=4.22 perl5=5.38 sudo=sssd + +.if ${.CURDIR:M*/*/*gtk*} +OPTIONS_FILE_UNSET+=CUPS +.endif .if ${.CURDIR:M*/security/libssh} OPTIONS_FILE_UNSET+=GSSAPI_NONE @@ -21,6 +27,10 @@ OPTIONS_FILE_UNSET+=GSSAPI_HEIMDAL OPTIONS_FILE_SET+=GSSAPI_MIT .endif +.if ${.CURDIR:M*/*/*rust*} +OPTIONS_FILE_UNSET+=DOCS +.endif + .if ${.CURDIR:M*/security/sssd*} OPTIONS_FILE_SET+=SMB .endif @@ -44,8 +54,6 @@ OPTIONS_FILE_SET+=NLS OPTIONS_FILE_UNSET+=NOARGS_SHELL OPTIONS_FILE_UNSET+=OPIE OPTIONS_FILE_SET+=PAM -OPTIONS_FILE_SET+=SSSD2 -OPTIONS_FILE_UNSET+=SSSD_DEVEL OPTIONS_FILE_UNSET+=GSSAPI_BASE OPTIONS_FILE_UNSET+=GSSAPI_HEIMDAL OPTIONS_FILE_UNSET+=GSSAPI_MIT @@ -69,6 +77,7 @@ SAMBA4_BUNDLED_LDB=no .if ${.CURDIR:M*/java/openjdk*} OPTIONS_FILE_UNSET+=X11 OPTIONS_FILE_UNSET+=ALSA +OPTIONS_FILE_UNSET+=CUPS .endif .if ${.CURDIR:M*/devel/dbus} diff --git a/poudriere/poudriere.d/verisign13.list b/poudriere/poudriere.d/verisign13.list index d8b1747..eb1f7b6 100644 --- a/poudriere/poudriere.d/verisign13.list +++ b/poudriere/poudriere.d/verisign13.list @@ -1,29 +1,27 @@ +devel/ccache #net/libzmq4 -#et/py-netaddr +#net/py-netaddr #sysutils/lsof #shells/bash #shells/zsh #lang/python #lang/python3 -#lang/ruby30 -# XXX: fixx +#lang/ruby33 #security/sudo -#security/sudo@sssd #sysutils/cdrtools #sysutils/dvd+rw-tools -#.sysutils/dmidecode +#sysutils/dmidecode #shells/ksh93 #net/rsync #security/gnupg #ftp/wget -#misc/e2fsprogs-libuuid #sysutils/smartmontools #sysutils/bsdhwmon #sysutils/ipmitool #editors/vim #ftp/curl #textproc/augeas -#sysutils/puppet7 +#sysutils/puppet8 #security/ca_root_nss #sysutils/rubygem-facter #devel/gettext @@ -40,14 +38,12 @@ #textproc/libyaml #net-mgmt/monitoring-plugins #net-mgmt/nrpe -#net-mgmt/nrpe@monplugins #security/p5-Crypt-CBC #security/p5-Crypt-DES #security/p5-Digest-HMAC #security/p5-Digest-SHA1 #devel/p5-Event-Lib #net-mgmt/p5-Net-SNMP -#devel/pth #devel/ruby-gems #archivers/rubygem-bzip2-ruby #textproc/rubygem-ruby-augeas @@ -62,14 +58,11 @@ #www/p5-libwww #security/pam_ldap #devel/cmake -#devel/cmake-gui #devel/gccmakedep #devel/icmake #devel/git -##emulators/qemu -##emulators/qemu-devel -#java/openjdk8 -#java/openjdk11 +#emulators/qemu@nox11 +#emulators/qemu-devel #devel/py-Jinja2 #devel/py-prettytable #net/py-oauth @@ -80,37 +73,32 @@ #devel/py-argparse #www/py-requests #devel/py-six -#devel/py-boto +#www/py-boto3 #sysutils/gpart #net/cloud-init #filesystems/e2fsprogs +#filesystems/libblkid +#misc/libuuid #archivers/rpm4 #sysutils/ansible -#devel/subversion #net/quagga -##net/bird -##net/bird@ipv6 +#net/bird2 #net-mgmt/lldpd #net-mgmt/openlldp #devel/py-ipaddr #net/py-netifaces -#security/sssd security/sssd2 -#security/sssd2-klara #security/openssl #security/krb5 #security/cyrus-sasl2-gssapi #net/openldap26-client #devel/pkgconf -#net/svnup #security/pam_mkhomedir #security/openssh-portable -#security/openssh-portable@gssapi -#security/openssh-portable@hpn #www/apache24 #ports-mgmt/poudriere #ports-mgmt/poudriere-devel -#devel/binutils +devel/binutils #textproc/expat2 #devel/libvirt #sysutils/tmux @@ -118,7 +106,6 @@ security/sssd2 #sysutils/grub2-bhyve #devel/gdb #net/ladvd -#net-mgmt/cdpd #devel/autoconf #devel/automake #textproc/gnugrep @@ -130,7 +117,6 @@ security/sssd2 #net/xmlrpc-c #devel/patch #ports-mgmt/dialog4ports -#devel/py-pyyaml #benchmarks/bonnie #benchmarks/bonnie++ #benchmarks/iozone @@ -140,8 +126,6 @@ security/sssd2 #devel/rubygem-gettext-setup #sysutils/dtrace-toolkit #net-mgmt/nagios-check_hdd_health -#net-mgmt/nagios -#net-mgmt/nagios@monplugins #sysutils/ezjail #devel/py-pip #sysutils/iocage @@ -160,8 +144,6 @@ security/sssd2 #sysutils/cpu-microcode #net-mgmt/telegraf #sysutils/rsyslog8 -##security/bcrypt -#sysutils/x86info #textproc/py-toml #textproc/py-tomlkit #devel/git-lfs @@ -174,4 +156,11 @@ security/sssd2 #security/tpm2-tools #security/tpm2-abrmd #security/tpm-quote-tools - +##net/freeipa-client +#databases/openvoxdb8 +#sysutils/openvox-agent8 +##sysutils/openvox-server8 +#devel/libpciaccess +#devel/libpci +#lang/tcl86 +#textproc/jq