Index: Mk/Uses/bdb.mk =================================================================== --- Mk/Uses/bdb.mk +++ Mk/Uses/bdb.mk @@ -8,19 +8,11 @@ # necessary (db5 if compatible). # This adds a "debug-bdb" make target which will dump the # related data. -# INVALID_BDB_VER -# - This variable can be defined when the port does not -# support one or more versions of Berkeley DB. # _WITH_BDB_VER # - User defined port specific variable to set Berkeley DB # version. # WITH_BDB_HIGHEST # - Use the highest installed version of Berkeley DB. -# WITH_BDB6_PERMITTED -# - If defined, BerkeleyDB 6 is added to the -# default version set, making it eligible even -# if not already installed. This is due to its -# stricter Affero GNU Public License. # # These variables will then be filled in by this .mk file: # @@ -58,14 +50,6 @@ _BDB_DEFAULT_save:=${BDB_DEFAULT} _DB_PORTS= 5 18 -_DB_DEFAULTS= 5 -# -# Since 2020-12-02, this name is not fitting too much but -# retained for now for compatibility. The name of this variable -# is subject to change especially once db6 were removed. -. if defined(WITH_BDB6_PERMITTED) || ${_bdb_ARGS} == 18 -_DB_DEFAULTS+= 18 -. endif # Dependency lines for different db versions db5_DEPENDS= libdb-5.3.so:databases/db5 @@ -83,32 +67,10 @@ # Override _bdb_ARGS with global BDB_DEFAULT if the maintainer did not # ask for a more specific version. . if ${_bdb_ARGS} == yes -. if ${BDB_DEFAULT} != 1 _bdb_ARGS= ${BDB_DEFAULT} -. else -_bdb_ARGS:= 5+ -. endif . endif -# Compatiblity hack: -# upgrade older plussed versions to 5+ -_BDB_OLDPLUSVERS=4+ 40+ 41+ 42+ 43+ 44+ 45+ 46+ 47+ 48+ -. for i in ${_bdb_ARGS} -. if ${_BDB_OLDPLUSVERS:M${i}} -_bdb_ARGS:= 5+ -. endif -. endfor - -# 1. detect installed versions -_INST_BDB_VER= -. for bdb in ${_DB_PORTS} -. if exists(${db${bdb}_FIND}) -_INST_BDB_VER+=${bdb} -. endif -. endfor - -# 2. parse supported versions: -# 2a. build list from _bdb_ARGS +# 1. parse supported versions and build list from _bdb_ARGS _SUPP_BDB_VER= __bdb_ARGS:=${_bdb_ARGS:C,\+$,,} . if !empty(_bdb_ARGS:M*+) @@ -120,46 +82,19 @@ . else _SUPP_BDB_VER=${_bdb_ARGS} . endif -# 2b. expand INVALID_BDB_VER if given with "+": -. if !empty(INVALID_BDB_VER:M*+) -_INV_BDB:=${INVALID_BDB_VER:C,\+$,,} -_INV_BDB_VER:= -. for bdb in ${_DB_PORTS} -. if ${_INV_BDB} <= ${bdb} -_INV_BDB_VER+=${bdb:C/\.//} -. endif -. endfor -. else -_INV_BDB_VER:=${INVALID_BDB_VER} -. endif -# 2c. strip versions from INVALID_BDB_VER out of _SUPP_BDB_VER -. for unsupp in ${_INV_BDB_VER} -_SUPP_BDB_VER:=${_SUPP_BDB_VER:N${unsupp}} -. endfor - -# 3a. calculate intersection in _INST_BDB_VER to see if there -# is a usable installed version -. for i in ${_INST_BDB_VER} -. if empty(_SUPP_BDB_VER:M${i}) -_INST_BDB_VER:= ${_INST_BDB_VER:N${i}} -. endif -. endfor -_ELIGIBLE_BDB_VER:=${_INST_BDB_VER} -# 3b. if there is no usable version installed, check defaults -. if empty(_INST_BDB_VER) -_DFLT_BDB_VER:=${_DB_DEFAULTS} +# 2. check defaults +_DFLT_BDB_VER:=${_DB_PORTS} # make sure we use a reasonable version for package builds _WITH_BDB_HIGHEST=yes -. for i in ${_DFLT_BDB_VER} -. if empty(_SUPP_BDB_VER:M${i}) +. for i in ${_DFLT_BDB_VER} +. if empty(_SUPP_BDB_VER:M${i}) _DFLT_BDB_VER:= ${_DFLT_BDB_VER:N${i}} -. endif -. endfor +. endif +. endfor _ELIGIBLE_BDB_VER:=${_DFLT_BDB_VER} -. endif -# 4. elect a version +# 3. elect a version _BDB_VER= . for i in ${_ELIGIBLE_BDB_VER} . if !empty(WITH_BDB_HIGHEST) || !empty(_WITH_BDB_HIGHEST) || empty(${_BDB_VER}) @@ -167,9 +102,9 @@ . endif . endfor -# 5. catch errors or set variables +# 4. catch errors or set variables . if empty(_BDB_VER) -IGNORE= cannot install: no eligible BerkeleyDB version. Requested: ${_bdb_ARGS}, incompatible: ${_INV_BDB_VER}. Try: make debug-bdb +IGNORE= cannot install: no eligible BerkeleyDB version. Requested: ${_bdb_ARGS}. Try: make debug-bdb . else . if defined(BDB_BUILD_DEPENDS) BUILD_DEPENDS+= ${db${_BDB_VER}_FIND}:${db${_BDB_VER}_DEPENDS:C/^libdb.*://} @@ -201,8 +136,6 @@ @${ECHO_CMD} "WITH_BDB_HIGHEST (original): ${WITH_BDB_HIGHEST}" @${ECHO_CMD} "--PROCESSING------------------------------------------------" @${ECHO_CMD} "supported versions: ${_SUPP_BDB_VER}" - @${ECHO_CMD} "invalid versions: ${_INV_BDB_VER}" - @${ECHO_CMD} "installed versions: ${_INST_BDB_VER}" @${ECHO_CMD} "eligible versions: ${_ELIGIBLE_BDB_VER}" @${ECHO_CMD} "bdb_ARGS (effective): ${_bdb_ARGS}" @${ECHO_CMD} "WITH_BDB_HIGHEST (override): ${_WITH_BDB_HIGHEST}" Index: Mk/bsd.default-versions.mk =================================================================== --- Mk/bsd.default-versions.mk +++ Mk/bsd.default-versions.mk @@ -34,7 +34,7 @@ # Possible values: 2.4 APACHE_DEFAULT?= 2.4 # Possible values: 5, 18 -BDB_DEFAULT?= 5 +BDB_DEFAULT?= 18 # Possible values: 2, 3 COROSYNC_DEFAULT?= 2 # Possible_values: full canna nox devel_full devel_nox Index: UPDATING =================================================================== --- UPDATING +++ UPDATING @@ -5,6 +5,15 @@ You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20220720: + AFFECTS: users of ports depending on berkeley db + AUTHOR: yasu@FreeBSD.org + + Default version of berkeley db has changed from 5 to 18. If you + either install package by using ports tree or build binary package + by yourself, you can keep db5 as default by adding + 'DEFAULT_VERSIONS+=bdb=5' in /etc/make.conf. + 20220711: AFFECTS: users of security/stunnel AUTHOR: zi@FreeBSD.org Index: archivers/rpm4/Makefile =================================================================== --- archivers/rpm4/Makefile +++ archivers/rpm4/Makefile @@ -1,6 +1,6 @@ PORTNAME= rpm PORTVERSION= 4.17.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= archivers MASTER_SITES= http://ftp.rpm.org/releases/rpm-4.17.x/ PKGNAMESUFFIX= 4 Index: audio/moc/Makefile =================================================================== --- audio/moc/Makefile +++ audio/moc/Makefile @@ -1,6 +1,6 @@ PORTNAME= moc PORTVERSION= 2.5.2 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= audio MASTER_SITES= http://ftp.daper.net/pub/soft/moc/stable/ Index: chinese/libpinyin/Makefile =================================================================== --- chinese/libpinyin/Makefile +++ chinese/libpinyin/Makefile @@ -1,5 +1,6 @@ PORTNAME= libpinyin PORTVERSION= 2.6.2 +PORTREVISION= 1 CATEGORIES= chinese textproc MASTER_SITES= SF/${PORTNAME}/${PORTNAME} Index: chinese/libtabe/Makefile =================================================================== --- chinese/libtabe/Makefile +++ chinese/libtabe/Makefile @@ -1,6 +1,6 @@ PORTNAME= libtabe PORTVERSION= 0.2.6 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= chinese MASTER_SITES= http://old-releases.ubuntu.com/ubuntu/pool/universe/libt/libtabe/ DISTNAME= libtabe_${PORTVERSION}.orig Index: chinese/p5-Lingua-ZH-TaBE/Makefile =================================================================== --- chinese/p5-Lingua-ZH-TaBE/Makefile +++ chinese/p5-Lingua-ZH-TaBE/Makefile @@ -1,6 +1,6 @@ PORTNAME= Lingua-ZH-TaBE PORTVERSION= 0.07 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= chinese perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- Index: comms/trustedqsl/Makefile =================================================================== --- comms/trustedqsl/Makefile +++ comms/trustedqsl/Makefile @@ -1,5 +1,6 @@ PORTNAME= trustedqsl DISTVERSION= 2.6.3 +PORTREVISION= 1 #PORTREVISION= 1 CATEGORIES= comms hamradio MASTER_SITES= http://www.arrl.org/files/file/LoTW%20Instructions/ \ Index: comms/xastir/Makefile =================================================================== --- comms/xastir/Makefile +++ comms/xastir/Makefile @@ -1,7 +1,7 @@ PORTNAME= xastir DISTVERSIONPREFIX= Release- DISTVERSION= 2.1.8 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= comms hamradio MAINTAINER= carl@stagecraft.cx Index: databases/dbtool/Makefile =================================================================== --- databases/dbtool/Makefile +++ databases/dbtool/Makefile @@ -1,6 +1,6 @@ PORTNAME= dbtool PORTVERSION= 1.9.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases MASTER_SITES= http://www.daemon.de/idisk/Apps/dbtool/ Index: databases/evolution-data-server/Makefile =================================================================== --- databases/evolution-data-server/Makefile +++ databases/evolution-data-server/Makefile @@ -1,5 +1,6 @@ PORTNAME= evolution-data-server DISTVERSION= 3.44.3 +PORTREVISION= 1 CATEGORIES= databases gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome Index: databases/fortytwo-bdb/Makefile =================================================================== --- databases/fortytwo-bdb/Makefile +++ databases/fortytwo-bdb/Makefile @@ -1,6 +1,6 @@ PORTNAME= bdb PORTVERSION= 0.2.1 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= databases gnustep MASTER_SITES= SF/fortytwo/Berkeley%20DB%20Wrapper%20%28BDB%29/${PORTVERSION} PKGNAMEPREFIX= fortytwo- Index: databases/libgda5/Makefile =================================================================== --- databases/libgda5/Makefile +++ databases/libgda5/Makefile @@ -1,6 +1,6 @@ PORTNAME= libgda DISTVERSION?= 5.2.10 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= databases gnome MASTER_SITES= GNOME PKGNAMESUFFIX?= 5 Index: databases/p5-BDB/Makefile =================================================================== --- databases/p5-BDB/Makefile +++ databases/p5-BDB/Makefile @@ -1,5 +1,6 @@ PORTNAME= BDB PORTVERSION= 1.92 +PORTREVISION= 1 CATEGORIES= databases perl5 MASTER_SITES= CPAN MASTER_SITE_SUBDIR= CPAN:MLEHMANN Index: databases/p5-BerkeleyDB/Makefile =================================================================== --- databases/p5-BerkeleyDB/Makefile +++ databases/p5-BerkeleyDB/Makefile @@ -1,5 +1,6 @@ PORTNAME= BerkeleyDB PORTVERSION= 0.65 +PORTREVISION= 1 CATEGORIES= databases perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- Index: databases/py-berkeleydb/Makefile =================================================================== --- databases/py-berkeleydb/Makefile +++ databases/py-berkeleydb/Makefile @@ -1,5 +1,6 @@ PORTNAME= berkeleydb PORTVERSION= 18.1.5 +PORTREVISION= 1 CATEGORIES= databases python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} Index: databases/py-bsddb3/Makefile =================================================================== --- databases/py-bsddb3/Makefile +++ databases/py-bsddb3/Makefile @@ -1,5 +1,6 @@ PORTNAME= bsddb3 PORTVERSION= 6.2.9 +PORTREVISION= 1 CATEGORIES= databases python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} Index: databases/ruby-bdb/Makefile =================================================================== --- databases/ruby-bdb/Makefile +++ databases/ruby-bdb/Makefile @@ -1,6 +1,6 @@ PORTNAME= bdb PORTVERSION= 0.6.6 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= databases ruby MASTER_SITES= ftp://ftp.idaemons.org/pub/distfiles/ruby/ \ http://idaemons.org/distfiles/ruby/ \ Index: databases/rubygem-dbm/Makefile =================================================================== --- databases/rubygem-dbm/Makefile +++ databases/rubygem-dbm/Makefile @@ -1,5 +1,6 @@ PORTNAME= dbm PORTVERSION= 1.1.0 +PORTREVISION= 1 CATEGORIES= databases rubygems MASTER_SITES= RG Index: devel/apr1/Makefile =================================================================== --- devel/apr1/Makefile +++ devel/apr1/Makefile @@ -1,6 +1,6 @@ PORTNAME= apr PORTVERSION= ${APR_VERSION}.${APU_VERSION} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel MASTER_SITES= APACHE/apr DISTFILES= apr-${APR_VERSION}.tar.gz \ Index: devel/ice/Makefile =================================================================== --- devel/ice/Makefile +++ devel/ice/Makefile @@ -1,6 +1,6 @@ PORTNAME= Ice PORTVERSION= 3.6.5 -PORTREVISION= 1 +PORTREVISION= 2 DISTVERSIONPREFIX= v CATEGORIES= devel Index: devel/kdesvn/Makefile =================================================================== --- devel/kdesvn/Makefile +++ devel/kdesvn/Makefile @@ -1,6 +1,6 @@ PORTNAME= kdesvn DISTVERSION= 2.1.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel kde MASTER_SITES= KDE/stable/${PORTNAME}/${DISTVERSION}/ Index: devel/librcc/Makefile =================================================================== --- devel/librcc/Makefile +++ devel/librcc/Makefile @@ -1,6 +1,6 @@ PORTNAME= librcc PORTVERSION= 0.2.12 -PORTREVISION= 13 +PORTREVISION= 14 CATEGORIES= devel MASTER_SITES= http://dside.dyndns.org/files/rusxmms/ \ LOCAL/fluffy Index: devel/rsvndump/Makefile =================================================================== --- devel/rsvndump/Makefile +++ devel/rsvndump/Makefile @@ -1,6 +1,6 @@ PORTNAME= rsvndump PORTVERSION= 0.6 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} Index: dns/bind916/Makefile =================================================================== --- dns/bind916/Makefile +++ dns/bind916/Makefile @@ -2,7 +2,7 @@ PORTNAME= bind PORTVERSION= ${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc/.rc/} -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= dns net MASTER_SITES= ISC/bind9/${ISCVERSION} PKGNAMESUFFIX= 916 Index: dns/dnshistory/Makefile =================================================================== --- dns/dnshistory/Makefile +++ dns/dnshistory/Makefile @@ -1,6 +1,6 @@ PORTNAME= dnshistory PORTVERSION= 1.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= dns MASTER_SITES= http://www.stedee.id.au/files/ \ http://launchpad.net/${PORTNAME}/${PORTVERSION}/${PORTVERSION}/+download/ Index: dns/fastresolve/Makefile =================================================================== --- dns/fastresolve/Makefile +++ dns/fastresolve/Makefile @@ -1,6 +1,6 @@ PORTNAME= fastresolve PORTVERSION= 2.10 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= dns MASTER_SITES= https://BSDforge.com/projects/source/dns/fastresolve/ Index: editors/nvi2/Makefile =================================================================== --- editors/nvi2/Makefile +++ editors/nvi2/Makefile @@ -1,5 +1,6 @@ PORTNAME= nvi2 PORTVERSION= 2.2.0 +PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= editors Index: editors/poedit/Makefile =================================================================== --- editors/poedit/Makefile +++ editors/poedit/Makefile @@ -1,6 +1,6 @@ PORTNAME= poedit PORTVERSION= 3.0.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= editors MASTER_SITES= https://github.com/vslavik/${PORTNAME}/releases/download/v${PORTVERSION}-oss/ Index: graphics/fortytwo/Makefile =================================================================== --- graphics/fortytwo/Makefile +++ graphics/fortytwo/Makefile @@ -1,6 +1,6 @@ PORTNAME= fortytwo PORTVERSION= 0.2.0 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= graphics gnustep MASTER_SITES= SF/${PORTNAME}/FT%20%2842%29/${PORTVERSION} DISTFILES= FT-${PORTVERSION}-src.tgz \ Index: japanese/mutt-devel/Makefile =================================================================== --- japanese/mutt-devel/Makefile +++ japanese/mutt-devel/Makefile @@ -3,7 +3,7 @@ PORTNAME= mutt PORTVERSION= ${VERSION}.j${JP_VERSION} -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= japanese mail MASTER_SITES= ftp://ftp.mutt.org/mutt/devel/:body \ ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/devel/:body \ Index: lang/clisp/Makefile =================================================================== --- lang/clisp/Makefile +++ lang/clisp/Makefile @@ -1,6 +1,6 @@ PORTNAME= clisp PORTVERSION= 2.49.93+ -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= lang lisp MAINTAINER= kiri@TrueFC.org Index: lang/gnu-cobol/Makefile =================================================================== --- lang/gnu-cobol/Makefile +++ lang/gnu-cobol/Makefile @@ -1,6 +1,6 @@ PORTNAME= gnucobol PORTVERSION= 3.1.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= lang MASTER_SITES= GNU/gnucobol Index: lang/php81/Makefile =================================================================== --- lang/php81/Makefile +++ lang/php81/Makefile @@ -1,6 +1,6 @@ PORTNAME= php81 DISTVERSION= 8.1.8 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES?= lang devel www MASTER_SITES= PHP/distributions DISTNAME= php-${DISTVERSION} Index: lang/php82/Makefile =================================================================== --- lang/php82/Makefile +++ lang/php82/Makefile @@ -1,6 +1,6 @@ PORTNAME= php82 DISTVERSION= 8.2.0alpha3 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES?= lang devel www MASTER_SITES= https://downloads.php.net/~sergey/ DISTNAME= php-${DISTVERSION} Index: mail/avenger/Makefile =================================================================== --- mail/avenger/Makefile +++ mail/avenger/Makefile @@ -1,5 +1,6 @@ PORTNAME= avenger PORTVERSION= 0.8.5 +PORTREVISION= 1 CATEGORIES= mail MASTER_SITES= http://www.mailavenger.org/dist/ Index: mail/bmf/Makefile =================================================================== --- mail/bmf/Makefile +++ mail/bmf/Makefile @@ -1,5 +1,6 @@ PORTNAME= bmf PORTVERSION= 0.9.4 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= mail MASTER_SITES= SF Index: mail/bogofilter-bdb/Makefile =================================================================== --- mail/bogofilter-bdb/Makefile +++ mail/bogofilter-bdb/Makefile @@ -1,6 +1,6 @@ PORTNAME= bogofilter DISTVERSION= 1.2.5 -PORTREVISION?= 3 +PORTREVISION?= 4 CATEGORIES?= mail MASTER_SITES= SF/bogofilter/bogofilter-stable/ PKGNAMESUFFIX?= -bdb Index: mail/cyrus-imapd23/Makefile =================================================================== --- mail/cyrus-imapd23/Makefile +++ mail/cyrus-imapd23/Makefile @@ -1,6 +1,6 @@ PORTNAME= cyrus-imapd PORTVERSION= 2.3.20 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= mail MASTER_SITES= https://github.com/cyrusimap/cyrus-imapd/releases/download/${PORTNAME}-${PORTVERSION}/ PKGNAMESUFFIX= 23 Index: mail/cyrus-imapd24/Makefile =================================================================== --- mail/cyrus-imapd24/Makefile +++ mail/cyrus-imapd24/Makefile @@ -1,6 +1,6 @@ PORTNAME= cyrus-imapd PORTVERSION= 2.4.22 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= mail MASTER_SITES= https://github.com/cyrusimap/cyrus-imapd/releases/download/${PORTNAME}-${PORTVERSION}/ PKGNAMESUFFIX= 24 Index: mail/cyrus-imapd25/Makefile =================================================================== --- mail/cyrus-imapd25/Makefile +++ mail/cyrus-imapd25/Makefile @@ -1,6 +1,6 @@ PORTNAME= cyrus-imapd PORTVERSION= 2.5.17 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail MASTER_SITES= https://github.com/cyrusimap/cyrus-imapd/releases/download/${PORTNAME}-${PORTVERSION}/ PKGNAMESUFFIX= 25 Index: mail/dk-milter/Makefile =================================================================== --- mail/dk-milter/Makefile +++ mail/dk-milter/Makefile @@ -1,6 +1,6 @@ PORTNAME= dk-milter PORTVERSION= 1.0.2 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= mail MASTER_SITES= SF/${PORTNAME}/DomainKeys%20Milter/${PORTVERSION} Index: mail/exim/Makefile =================================================================== --- mail/exim/Makefile +++ mail/exim/Makefile @@ -1,6 +1,6 @@ PORTNAME= exim PORTVERSION?= ${EXIM_VERSION} -PORTREVISION?= 5 +PORTREVISION?= 6 CATEGORIES= mail MASTER_SITES= EXIM:exim MASTER_SITE_SUBDIR= /exim4/:exim \ @@ -43,7 +43,7 @@ OPTIONS_SUB= yes AUTH_SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 -BDB_USES= bdb +BDB_USES= bdb:5 DMARC_LIB_DEPENDS= libopendmarc.so:mail/opendmarc EMBEDDED_PERL_USE= perl5=run,build EXIMON_USES= xorg @@ -336,7 +336,6 @@ .endif .if ${PORT_OPTIONS:MBDB} -INVALID_BDB_VER= 2 3 6 18 DB_LIBS= -L${BDB_LIB_DIR} -l${BDB_LIB_NAME} DB_INCLUDES= -I${BDB_INCLUDE_DIR} .else Index: mail/greyfix/Makefile =================================================================== --- mail/greyfix/Makefile +++ mail/greyfix/Makefile @@ -1,6 +1,6 @@ PORTNAME= greyfix PORTVERSION= 0.4.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail MASTER_SITES= http://www.kim-minh.com/pub/greyfix/ \ http://stereochro.me/distfiles/ Index: mail/isync/Makefile =================================================================== --- mail/isync/Makefile +++ mail/isync/Makefile @@ -1,5 +1,6 @@ PORTNAME= isync PORTVERSION= 1.4.4 +PORTREVISION= 1 CATEGORIES= mail MASTER_SITES= SF Index: mail/mailfromd/Makefile =================================================================== --- mail/mailfromd/Makefile +++ mail/mailfromd/Makefile @@ -1,5 +1,6 @@ PORTNAME= mailfromd PORTVERSION= 8.13 +PORTREVISION= 1 CATEGORIES= mail MASTER_SITES= http://download.gnu.org.ua/pub/release/${PORTNAME}/ \ http://download.gnu.org.ua/pub/alpha/${PORTNAME}/ Index: mail/mailutils/Makefile =================================================================== --- mail/mailutils/Makefile +++ mail/mailutils/Makefile @@ -1,5 +1,6 @@ PORTNAME= mailutils PORTVERSION= 3.15 +PORTREVISION= 1 CATEGORIES= mail MASTER_SITES= GNU GNU_ALPHA Index: mail/mutt/Makefile =================================================================== --- mail/mutt/Makefile +++ mail/mutt/Makefile @@ -1,6 +1,6 @@ PORTNAME= mutt DISTVERSION= 2.2.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES+= mail MASTER_SITES= ftp://ftp.mutt.org/pub/mutt/ \ https://bitbucket.org/mutt/mutt/downloads/ \ Index: mail/neomutt/Makefile =================================================================== --- mail/neomutt/Makefile +++ mail/neomutt/Makefile @@ -1,5 +1,6 @@ PORTNAME= neomutt PORTVERSION= 20220429 +PORTREVISION= 1 CATEGORIES= mail MAINTAINER= bapt@FreeBSD.org Index: mail/opendkim/Makefile =================================================================== --- mail/opendkim/Makefile +++ mail/opendkim/Makefile @@ -1,6 +1,6 @@ PORTNAME= opendkim PORTVERSION= 2.10.3 -PORTREVISION= 16 +PORTREVISION= 17 CATEGORIES= mail security MASTER_SITES= SF/${PORTNAME} \ SF/${PORTNAME}/Previous%20Releases \ Index: mail/perdition/Makefile =================================================================== --- mail/perdition/Makefile +++ mail/perdition/Makefile @@ -1,6 +1,6 @@ PORTNAME= perdition PORTVERSION= 2.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail net security MASTER_SITES= http://horms.net/projects/perdition/download/${PORTVERSION}/ Index: mail/postfix-current/Makefile =================================================================== --- mail/postfix-current/Makefile +++ mail/postfix-current/Makefile @@ -1,6 +1,6 @@ PORTNAME= postfix DISTVERSION= 3.8-20220325 -PORTREVISION?= 1 +PORTREVISION?= 2 PORTEPOCH= 6 CATEGORIES= mail MASTER_SITES= http://ftp.porcupine.org/mirrors/postfix-release/ \ Index: mail/postfix/Makefile =================================================================== --- mail/postfix/Makefile +++ mail/postfix/Makefile @@ -1,6 +1,6 @@ PORTNAME= postfix DISTVERSION= 3.7.2 -PORTREVISION?= 0 +PORTREVISION?= 1 PORTEPOCH= 1 CATEGORIES= mail MASTER_SITES= http://ftp.porcupine.org/mirrors/postfix-release/ \ Index: mail/sendmail-devel/Makefile =================================================================== --- mail/sendmail-devel/Makefile +++ mail/sendmail-devel/Makefile @@ -1,6 +1,6 @@ PORTNAME= sendmail PORTVERSION= 8.17.1.9 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= mail MASTER_SITES= ftp://ftp.sendmail.org/pub/sendmail/snapshots/ PKGNAMESUFFIX?= -devel${PKGNAMESUFFIX2} Index: mail/sendmail/Makefile =================================================================== --- mail/sendmail/Makefile +++ mail/sendmail/Makefile @@ -1,6 +1,6 @@ PORTNAME= sendmail PORTVERSION= 8.17.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= mail MASTER_SITES= ftp://ftp.sendmail.org/pub/sendmail/ DISTNAME= ${PORTNAME}.${PORTVERSION} Index: mail/spamprobe/Makefile =================================================================== --- mail/spamprobe/Makefile +++ mail/spamprobe/Makefile @@ -1,6 +1,6 @@ PORTNAME= spamprobe PORTVERSION= 1.4d -PORTREVISION= 19 +PORTREVISION= 20 CATEGORIES= mail MASTER_SITES= SF Index: mail/spmfilter/Makefile =================================================================== --- mail/spmfilter/Makefile +++ mail/spmfilter/Makefile @@ -1,6 +1,6 @@ PORTNAME= spmfilter PORTVERSION= 0.6.7 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= mail MASTER_SITES= http://www.${PORTNAME}.org/files/ Index: mail/vacation/Makefile =================================================================== --- mail/vacation/Makefile +++ mail/vacation/Makefile @@ -1,5 +1,6 @@ PORTNAME= vacation PORTVERSION= 3.3.3 +PORTREVISION= 1 CATEGORIES= mail MASTER_SITES= DEBIAN DISTNAME= ${PORTNAME}_${PORTVERSION} Index: misc/hotkeys/Makefile =================================================================== --- misc/hotkeys/Makefile +++ misc/hotkeys/Makefile @@ -1,6 +1,6 @@ PORTNAME= hotkeys PORTVERSION= 0.5.7.1 -PORTREVISION= 20 +PORTREVISION= 21 CATEGORIES= misc MASTER_SITES= https://BSDforge.com/projects/source/misc/hotkeys/${PORTVERSION}/ DISTNAME= hotkeys_${PORTVERSION} Index: net-im/jabberd/Makefile =================================================================== --- net-im/jabberd/Makefile +++ net-im/jabberd/Makefile @@ -1,6 +1,6 @@ PORTNAME= jabberd PORTVERSION= 2.7.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= net-im MASTER_SITES= https://github.com/jabberd2/jabberd2/releases/download/${PORTNAME}-${DISTVERSION}/ \ LOCAL/matthew/${PORTNAME} Index: net-p2p/bitcoin/Makefile =================================================================== --- net-p2p/bitcoin/Makefile +++ net-p2p/bitcoin/Makefile @@ -1,6 +1,6 @@ PORTNAME= bitcoin PORTVERSION= 23.0 -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES= net-p2p finance MASTER_SITES= https://bitcoincore.org/bin/bitcoin-core-${PORTVERSION}/ \ LOCAL/swills:icon Index: net-p2p/jigdo/Makefile =================================================================== --- net-p2p/jigdo/Makefile +++ net-p2p/jigdo/Makefile @@ -1,6 +1,6 @@ PORTNAME= jigdo PORTVERSION= 0.7.3 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= net-p2p MASTER_SITES= http://atterer.org/sites/atterer/files/2009-08/${PORTNAME}/ Index: net-p2p/litecoin/Makefile =================================================================== --- net-p2p/litecoin/Makefile +++ net-p2p/litecoin/Makefile @@ -1,6 +1,7 @@ PORTNAME= litecoin DISTVERSIONPREFIX= v DISTVERSION= 0.21.2 +PORTREVISION= 1 CATEGORIES= net-p2p finance MAINTAINER= hsw@bitmark.com Index: net-p2p/namecoin/Makefile =================================================================== --- net-p2p/namecoin/Makefile +++ net-p2p/namecoin/Makefile @@ -1,7 +1,7 @@ PORTNAME= namecoin PORTVERSION= 0.21.0.1 DISTVERSIONPREFIX= nc -PORTREVISION= 4 +PORTREVISION= 5 PORTEPOCH= 1 CATEGORIES= net-p2p dns Index: net-p2p/qtum/Makefile =================================================================== --- net-p2p/qtum/Makefile +++ net-p2p/qtum/Makefile @@ -1,7 +1,7 @@ PORTNAME= qtum PORTVERSION= 0.20.3 DISTVERSIONPREFIX= mainnet-fastlane-v -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net-p2p finance MAINTAINER= ports@FreeBSD.org Index: net-p2p/zetacoin/Makefile =================================================================== --- net-p2p/zetacoin/Makefile +++ net-p2p/zetacoin/Makefile @@ -1,7 +1,7 @@ PORTNAME= zetacoin PORTVERSION= 0.13.2.1 DISTVERSIONPREFIX= v -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= net-p2p finance MAINTAINER= daniel@morante.net Index: net/netatalk3/Makefile =================================================================== --- net/netatalk3/Makefile +++ net/netatalk3/Makefile @@ -1,6 +1,6 @@ PORTNAME= netatalk PORTVERSION= 3.1.13 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= net MASTER_SITES= SF Index: net/openldap24-server/Makefile =================================================================== --- net/openldap24-server/Makefile +++ net/openldap24-server/Makefile @@ -47,8 +47,8 @@ BROKEN= incompatible OpenLDAP version: ${WANT_OPENLDAP_VER} .endif -PORTREVISION_CLIENT= 4 -PORTREVISION_SERVER= 9 +PORTREVISION_CLIENT= 5 +PORTREVISION_SERVER= 10 OPENLDAP_SHLIB_MAJOR= 2 OPENLDAP_SHLIB_MINOR= 11.7 OPENLDAP_MAJOR= ${DISTVERSION:R} Index: news/inn/Makefile =================================================================== --- news/inn/Makefile +++ news/inn/Makefile @@ -1,6 +1,6 @@ PORTNAME?= inn PORTVERSION?= 2.6.5 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= news MASTER_SITES= ISC MASTER_SITE_SUBDIR?= ${PORTNAME} Index: print/panda/Makefile =================================================================== --- print/panda/Makefile +++ print/panda/Makefile @@ -1,6 +1,6 @@ PORTNAME= panda PORTVERSION= 0.5.4 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= print MASTER_SITES= SF \ SAVANNAH \ Index: security/cyrus-sasl2-saslauthd/Makefile =================================================================== --- security/cyrus-sasl2-saslauthd/Makefile +++ security/cyrus-sasl2-saslauthd/Makefile @@ -1,3 +1,4 @@ +PORTREVISION= 1 PKGNAMESUFFIX= -saslauthd COMMENT= SASL authentication server for cyrus-sasl2 Index: security/cyrus-sasl2/Makefile =================================================================== --- security/cyrus-sasl2/Makefile +++ security/cyrus-sasl2/Makefile @@ -1,3 +1,4 @@ +PORTREVISION= 1 COMMENT= RFC 2222 SASL (Simple Authentication and Security Layer) USES= cpe libtool:keepla pathfix perl5 Index: security/heimdal/Makefile =================================================================== --- security/heimdal/Makefile +++ security/heimdal/Makefile @@ -1,6 +1,6 @@ PORTNAME= heimdal PORTVERSION= 7.7.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security MASTER_SITES= https://github.com/heimdal/heimdal/releases/download/${DISTNAME}/ Index: security/pks/Makefile =================================================================== --- security/pks/Makefile +++ security/pks/Makefile @@ -1,6 +1,6 @@ PORTNAME= pks PORTVERSION= 0.9.6.20040312 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= security www MASTER_SITES= http://pks.sourceforge.net/ LOCAL/mandree DISTFILES= pks-current.tgz Index: security/shibboleth-sp/Makefile =================================================================== --- security/shibboleth-sp/Makefile +++ security/shibboleth-sp/Makefile @@ -1,6 +1,6 @@ PORTNAME= shibboleth-sp PORTVERSION= 3.3.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security www MASTER_SITES= http://shibboleth.net/downloads/service-provider/${PORTVERSION}/ Index: security/sks/Makefile =================================================================== --- security/sks/Makefile +++ security/sks/Makefile @@ -1,5 +1,6 @@ PORTNAME= sks PORTVERSION= 1.1.6 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= http://bitbucket.org/skskeyserver/sks-keyserver/downloads/ Index: security/webfwlog/Makefile =================================================================== --- security/webfwlog/Makefile +++ security/webfwlog/Makefile @@ -1,5 +1,6 @@ PORTNAME= webfwlog PORTVERSION= 1.1.1 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/ \ http://devel.webfwlog.net/download/v1.1.x/ Index: sysutils/ftwin/Makefile =================================================================== --- sysutils/ftwin/Makefile +++ sysutils/ftwin/Makefile @@ -1,5 +1,6 @@ PORTNAME= ftwin PORTVERSION= 0.8.10 +PORTREVISION= 1 CATEGORIES= sysutils MAINTAINER= shoesoft@gmx.net Index: textproc/p5-RDFStore/Makefile =================================================================== --- textproc/p5-RDFStore/Makefile +++ textproc/p5-RDFStore/Makefile @@ -1,6 +1,6 @@ PORTNAME= RDFStore PORTVERSION= 0.51 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= textproc perl5 MASTER_SITES= CPAN MASTER_SITE_SUBDIR= CPAN:AREGGIORI Index: textproc/redland/Makefile =================================================================== --- textproc/redland/Makefile +++ textproc/redland/Makefile @@ -1,6 +1,6 @@ PORTNAME= redland PORTVERSION= 1.0.17 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= textproc MASTER_SITES= http://download.librdf.org/source/ Index: www/c-icap/Makefile =================================================================== --- www/c-icap/Makefile +++ www/c-icap/Makefile @@ -1,5 +1,6 @@ PORTNAME= c-icap PORTVERSION= 0.5.10 +PORTREVISION= 1 PORTEPOCH= 2 CATEGORIES= www MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/0.5.x/ Index: www/crawl/Makefile =================================================================== --- www/crawl/Makefile +++ www/crawl/Makefile @@ -1,6 +1,6 @@ PORTNAME= crawl PORTVERSION= 0.4 -PORTREVISION= 14 +PORTREVISION= 15 CATEGORIES= www MASTER_SITES= http://www.monkey.org/~provos/ Index: www/httest/Makefile =================================================================== --- www/httest/Makefile +++ www/httest/Makefile @@ -1,5 +1,6 @@ PORTNAME= httest PORTVERSION= 2.4.24 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= SF/htt/htt${PORTVERSION:R}/${PORTNAME}-${PORTVERSION} Index: www/mod_security/Makefile =================================================================== --- www/mod_security/Makefile +++ www/mod_security/Makefile @@ -1,7 +1,7 @@ PORTNAME= mod_security DISTVERSIONPREFIX= v PORTVERSION= 2.9.5 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www security MASTER_SITES= https://github.com/SpiderLabs/ModSecurity/releases/download/v${PORTVERSION}/ PKGNAMEPREFIX= ${APACHE_PKGNAMEPREFIX} Index: www/squidguard/Makefile =================================================================== --- www/squidguard/Makefile +++ www/squidguard/Makefile @@ -1,6 +1,6 @@ PORTNAME= squidGuard PORTVERSION= 1.4 -PORTREVISION= 15 +PORTREVISION= 16 CATEGORIES= www MASTER_SITES= LOCAL/garga/squidguard/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ Index: www/webalizer/Makefile =================================================================== --- www/webalizer/Makefile +++ www/webalizer/Makefile @@ -1,6 +1,6 @@ PORTNAME= webalizer PORTVERSION= 2.23.8 -PORTREVISION= 14 +PORTREVISION= 15 CATEGORIES+= www MASTER_SITES= ftp://ftp.mrunix.net/pub/webalizer/:main \ ftp://ftp.dinoex.de/pub/FreeBSD/distfiles/:main \