Attachment #237252 for bug #261523




#			  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.
# <BDB_UNIQUENAME>_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:
#

_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

# 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

# 1. parse supported versions and build list from _bdb_ARGS
# 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
_SUPP_BDB_VER=
__bdb_ARGS:=${_bdb_ARGS:C,\+$,,}
.  if !empty(_bdb_ARGS:M*+)

.  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}

# 2. check defaults
_DFLT_BDB_VER:=${_DB_PORTS}
_DFLT_BDB_VER:=${_DB_DEFAULTS}
# 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})
_DFLT_BDB_VER:=	${_DFLT_BDB_VER:N${i}}
.    endif
.  endfor
_ELIGIBLE_BDB_VER:=${_DFLT_BDB_VER}
.  endif

# 3. elect a version
_BDB_VER=
.  for i in ${_ELIGIBLE_BDB_VER}
.    if !empty(WITH_BDB_HIGHEST) || !empty(_WITH_BDB_HIGHEST) || empty(${_BDB_VER})

.    endif
.  endfor

# 4. catch errors or set variables
.  if empty(_BDB_VER)
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.*://}

	@${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}"

Lines 34-40 ${_l:tu}_DEFAULT= ${lang:C/.*=//g} Link Here

(-)b/Mk/bsd.default-versions.mk (-1 / +1 lines)
34	# Possible values: 2.4	34	# Possible values: 2.4
35	APACHE_DEFAULT?= 2.4	35	APACHE_DEFAULT?= 2.4
36	# Possible values: 5, 18	36	# Possible values: 5, 18
37	BDB_DEFAULT?= 5	37	BDB_DEFAULT?= 18
38	# Possible values: 2, 3	38	# Possible values: 2, 3
39	COROSYNC_DEFAULT?= 2	39	COROSYNC_DEFAULT?= 2
40	# Possible_values: full canna nox devel_full devel_nox	40	# Possible_values: full canna nox devel_full devel_nox

Lines 156-161 you update your ports collection, before attempting any port upgrades. Link Here

(-)b/UPDATING (+9 lines)
156	With portmaster or portupgrade (replace the command accordingly):	156	With portmaster or portupgrade (replace the command accordingly):
157	portmaster -o archivers/py-borgbackup11 archivers/py-borgbackup	157	portmaster -o archivers/py-borgbackup11 archivers/py-borgbackup
158		158
		159	20220904:
		160	AFFECTS: users of ports depending on berkeley db
		161	AUTHOR: yasu@FreeBSD.org
		162
		163	Default version of berkeley db has changed from 5 to 18. If you
		164	either install package by using ports tree or build binary package
		165	by yourself, you can keep db5 as default by adding
		166	'DEFAULT_VERSIONS+=bdb=5' in /etc/make.conf.
		167
159	20220901:	168	20220901:
160	AFFECTS: users of mail/rainloop-community	169	AFFECTS: users of mail/rainloop-community
161	AUTHOR: yasu@FreeBSD.org	170	AUTHOR: yasu@FreeBSD.org

Lines 1-6 Link Here

(-)b/archivers/rpm4/Makefile (-1 / +1 lines)
1	PORTNAME= rpm	1	PORTNAME= rpm
2	PORTVERSION= 4.17.0	2	PORTVERSION= 4.17.0
3	PORTREVISION= 2	3	PORTREVISION= 3
4	CATEGORIES= archivers	4	CATEGORIES= archivers
5	MASTER_SITES= http://ftp.rpm.org/releases/rpm-4.17.x/	5	MASTER_SITES= http://ftp.rpm.org/releases/rpm-4.17.x/
6	PKGNAMESUFFIX= 4	6	PKGNAMESUFFIX= 4

Lines 1-6 Link Here

(-)b/audio/moc/Makefile (-1 / +1 lines)
1	PORTNAME= moc	1	PORTNAME= moc
2	PORTVERSION= 2.5.2	2	PORTVERSION= 2.5.2
3	PORTREVISION= 9	3	PORTREVISION= 10
4	CATEGORIES= audio	4	CATEGORIES= audio
5	MASTER_SITES= http://ftp.daper.net/pub/soft/moc/stable/	5	MASTER_SITES= http://ftp.daper.net/pub/soft/moc/stable/
6		6

Lines 1-5 Link Here

(-)b/chinese/libpinyin/Makefile (+1 lines)
1	PORTNAME= libpinyin	1	PORTNAME= libpinyin
2	PORTVERSION= 2.6.2	2	PORTVERSION= 2.6.2
		3	PORTREVISION= 1
3	CATEGORIES= chinese textproc	4	CATEGORIES= chinese textproc
4	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}	5	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}
5		6

Lines 1-6 Link Here

(-)b/chinese/libtabe/Makefile (-1 / +1 lines)
1	PORTNAME= libtabe	1	PORTNAME= libtabe
2	PORTVERSION= 0.2.6	2	PORTVERSION= 0.2.6
3	PORTREVISION= 8	3	PORTREVISION= 9
4	CATEGORIES= chinese	4	CATEGORIES= chinese
5	MASTER_SITES= http://old-releases.ubuntu.com/ubuntu/pool/universe/libt/libtabe/	5	MASTER_SITES= http://old-releases.ubuntu.com/ubuntu/pool/universe/libt/libtabe/
6	DISTNAME= libtabe_${PORTVERSION}.orig	6	DISTNAME= libtabe_${PORTVERSION}.orig

Lines 1-6 Link Here

(-)b/chinese/p5-Lingua-ZH-TaBE/Makefile (-1 / +1 lines)
1	PORTNAME= Lingua-ZH-TaBE	1	PORTNAME= Lingua-ZH-TaBE
2	PORTVERSION= 0.07	2	PORTVERSION= 0.07
3	PORTREVISION= 5	3	PORTREVISION= 6
4	CATEGORIES= chinese perl5	4	CATEGORIES= chinese perl5
5	MASTER_SITES= CPAN	5	MASTER_SITES= CPAN
6	PKGNAMEPREFIX= p5-	6	PKGNAMEPREFIX= p5-

Lines 1-5 Link Here

(-)b/comms/trustedqsl/Makefile (+1 lines)
1	PORTNAME= trustedqsl	1	PORTNAME= trustedqsl
2	DISTVERSION= 2.6.3	2	DISTVERSION= 2.6.3
		3	PORTREVISION= 1
3	#PORTREVISION= 1	4	#PORTREVISION= 1
4	CATEGORIES= comms hamradio	5	CATEGORIES= comms hamradio
5	MASTER_SITES= http://www.arrl.org/files/file/LoTW%20Instructions/ \	6	MASTER_SITES= http://www.arrl.org/files/file/LoTW%20Instructions/ \

Lines 1-7 Link Here

(-)b/comms/xastir/Makefile (-1 / +1 lines)
1	PORTNAME= xastir	1	PORTNAME= xastir
2	DISTVERSIONPREFIX= Release-	2	DISTVERSIONPREFIX= Release-
3	DISTVERSION= 2.1.8	3	DISTVERSION= 2.1.8
4	PORTREVISION= 3	4	PORTREVISION= 4
5	CATEGORIES= comms hamradio	5	CATEGORIES= comms hamradio
6		6
7	MAINTAINER= carl@stagecraft.cx	7	MAINTAINER= carl@stagecraft.cx

Lines 1-6 Link Here

(-)b/databases/dbtool/Makefile (-1 / +1 lines)
1	PORTNAME= dbtool	1	PORTNAME= dbtool
2	PORTVERSION= 1.9.1	2	PORTVERSION= 1.9.1
3	PORTREVISION= 1	3	PORTREVISION= 2
4	CATEGORIES= databases	4	CATEGORIES= databases
5	MASTER_SITES= http://www.daemon.de/idisk/Apps/dbtool/	5	MASTER_SITES= http://www.daemon.de/idisk/Apps/dbtool/
6		6

Lines 1-5 Link Here

(-)b/databases/evolution-data-server/Makefile (+1 lines)
1	PORTNAME= evolution-data-server	1	PORTNAME= evolution-data-server
2	DISTVERSION= 3.44.4	2	DISTVERSION= 3.44.4
		3	PORTREVISION= 1
3	CATEGORIES= databases gnome	4	CATEGORIES= databases gnome
4	MASTER_SITES= GNOME	5	MASTER_SITES= GNOME
5	DIST_SUBDIR= gnome	6	DIST_SUBDIR= gnome

Lines 1-6 Link Here

(-)b/databases/fortytwo-bdb/Makefile (-1 / +1 lines)
1	PORTNAME= bdb	1	PORTNAME= bdb
2	PORTVERSION= 0.2.1	2	PORTVERSION= 0.2.1
3	PORTREVISION= 11	3	PORTREVISION= 12
4	CATEGORIES= databases gnustep	4	CATEGORIES= databases gnustep
5	MASTER_SITES= SF/fortytwo/Berkeley%20DB%20Wrapper%20%28BDB%29/${PORTVERSION}	5	MASTER_SITES= SF/fortytwo/Berkeley%20DB%20Wrapper%20%28BDB%29/${PORTVERSION}
6	PKGNAMEPREFIX= fortytwo-	6	PKGNAMEPREFIX= fortytwo-

Lines 1-6 Link Here

(-)b/databases/libgda5/Makefile (-1 / +1 lines)
1	PORTNAME= libgda	1	PORTNAME= libgda
2	DISTVERSION?= 5.2.10	2	DISTVERSION?= 5.2.10
3	PORTREVISION= 2	3	PORTREVISION= 3
4	CATEGORIES= databases gnome	4	CATEGORIES= databases gnome
5	MASTER_SITES= GNOME	5	MASTER_SITES= GNOME
6	PKGNAMESUFFIX?= 5	6	PKGNAMESUFFIX?= 5

Lines 1-5 Link Here

(-)b/databases/p5-BDB/Makefile (+1 lines)
1	PORTNAME= BDB	1	PORTNAME= BDB
2	PORTVERSION= 1.92	2	PORTVERSION= 1.92
		3	PORTREVISION= 1
3	CATEGORIES= databases perl5	4	CATEGORIES= databases perl5
4	MASTER_SITES= CPAN	5	MASTER_SITES= CPAN
5	MASTER_SITE_SUBDIR= CPAN:MLEHMANN	6	MASTER_SITE_SUBDIR= CPAN:MLEHMANN

Lines 1-5 Link Here

(-)b/databases/p5-BerkeleyDB/Makefile (+1 lines)
1	PORTNAME= BerkeleyDB	1	PORTNAME= BerkeleyDB
2	PORTVERSION= 0.65	2	PORTVERSION= 0.65
		3	PORTREVISION= 1
3	CATEGORIES= databases perl5	4	CATEGORIES= databases perl5
4	MASTER_SITES= CPAN	5	MASTER_SITES= CPAN
5	PKGNAMEPREFIX= p5-	6	PKGNAMEPREFIX= p5-

Lines 1-5 Link Here

(-)b/databases/py-berkeleydb/Makefile (+1 lines)
1	PORTNAME= berkeleydb	1	PORTNAME= berkeleydb
2	PORTVERSION= 18.1.5	2	PORTVERSION= 18.1.5
		3	PORTREVISION= 1
3	CATEGORIES= databases python	4	CATEGORIES= databases python
4	MASTER_SITES= CHEESESHOP	5	MASTER_SITES= CHEESESHOP
5	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	6	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}

Lines 1-6 Link Here

(-)b/databases/ruby-bdb/Makefile (-1 / +1 lines)
1	PORTNAME= bdb	1	PORTNAME= bdb
2	PORTVERSION= 0.6.6	2	PORTVERSION= 0.6.6
3	PORTREVISION= 8	3	PORTREVISION= 9
4	CATEGORIES= databases ruby	4	CATEGORIES= databases ruby
5	MASTER_SITES= ftp://ftp.idaemons.org/pub/distfiles/ruby/ \	5	MASTER_SITES= ftp://ftp.idaemons.org/pub/distfiles/ruby/ \
6	http://idaemons.org/distfiles/ruby/ \	6	http://idaemons.org/distfiles/ruby/ \

Lines 1-5 Link Here

(-)b/databases/rubygem-dbm/Makefile (+1 lines)
1	PORTNAME= dbm	1	PORTNAME= dbm
2	PORTVERSION= 1.1.0	2	PORTVERSION= 1.1.0
		3	PORTREVISION= 1
3	CATEGORIES= databases rubygems	4	CATEGORIES= databases rubygems
4	MASTER_SITES= RG	5	MASTER_SITES= RG
5		6

Lines 1-6 Link Here

(-)b/devel/apr1/Makefile (-1 / +1 lines)
1	PORTNAME= apr	1	PORTNAME= apr
2	PORTVERSION= ${APR_VERSION}.${APU_VERSION}	2	PORTVERSION= ${APR_VERSION}.${APU_VERSION}
3	PORTREVISION= 2	3	PORTREVISION= 3
4	CATEGORIES= devel	4	CATEGORIES= devel
5	MASTER_SITES= APACHE/apr	5	MASTER_SITES= APACHE/apr
6	DISTFILES= apr-${APR_VERSION}.tar.gz \	6	DISTFILES= apr-${APR_VERSION}.tar.gz \

Lines 1-6 Link Here

(-)b/devel/ice/Makefile (-1 / +1 lines)
1	PORTNAME= Ice	1	PORTNAME= Ice
2	PORTVERSION= 3.6.5	2	PORTVERSION= 3.6.5
3	PORTREVISION= 1	3	PORTREVISION= 2
4	DISTVERSIONPREFIX= v	4	DISTVERSIONPREFIX= v
5	CATEGORIES= devel	5	CATEGORIES= devel
6		6

Lines 1-6 Link Here

(-)b/devel/kdesvn/Makefile (-1 / +1 lines)
1	PORTNAME= kdesvn	1	PORTNAME= kdesvn
2	DISTVERSION= 2.1.0	2	DISTVERSION= 2.1.0
3	PORTREVISION= 3	3	PORTREVISION= 4
4	CATEGORIES= devel kde	4	CATEGORIES= devel kde
5	MASTER_SITES= KDE/stable/${PORTNAME}/${DISTVERSION}/	5	MASTER_SITES= KDE/stable/${PORTNAME}/${DISTVERSION}/
6		6

Lines 1-6 Link Here

(-)b/devel/librcc/Makefile (-1 / +1 lines)
1	PORTNAME= librcc	1	PORTNAME= librcc
2	PORTVERSION= 0.2.12	2	PORTVERSION= 0.2.12
3	PORTREVISION= 13	3	PORTREVISION= 14
4	CATEGORIES= devel	4	CATEGORIES= devel
5	MASTER_SITES= http://dside.dyndns.org/files/rusxmms/ \	5	MASTER_SITES= http://dside.dyndns.org/files/rusxmms/ \
6	LOCAL/fluffy	6	LOCAL/fluffy

Lines 1-5 Link Here

(-)b/devel/rsvndump/Makefile (+1 lines)
1	PORTNAME= rsvndump	1	PORTNAME= rsvndump
2	PORTVERSION= 0.6.1	2	PORTVERSION= 0.6.1
		3	PORTREVISION= 1
3	CATEGORIES= devel	4	CATEGORIES= devel
4	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}	5	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
5		6

Lines 2-8 Link Here

(-)b/dns/bind916/Makefile (-1 / +1 lines)
2		2
3	PORTNAME= bind	3	PORTNAME= bind
4	PORTVERSION= ${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc/.rc/}	4	PORTVERSION= ${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc/.rc/}
5	PORTREVISION= 1	5	PORTREVISION= 2
6	CATEGORIES= dns net	6	CATEGORIES= dns net
7	MASTER_SITES= ISC/bind9/${ISCVERSION}	7	MASTER_SITES= ISC/bind9/${ISCVERSION}
8	PKGNAMESUFFIX= 916	8	PKGNAMESUFFIX= 916

Lines 1-6 Link Here

(-)b/dns/dnshistory/Makefile (-1 / +1 lines)
1	PORTNAME= dnshistory	1	PORTNAME= dnshistory
2	PORTVERSION= 1.3	2	PORTVERSION= 1.3
3	PORTREVISION= 2	3	PORTREVISION= 3
4	CATEGORIES= dns	4	CATEGORIES= dns
5	MASTER_SITES= http://www.stedee.id.au/files/ \	5	MASTER_SITES= http://www.stedee.id.au/files/ \
6	http://launchpad.net/${PORTNAME}/${PORTVERSION}/${PORTVERSION}/+download/	6	http://launchpad.net/${PORTNAME}/${PORTVERSION}/${PORTVERSION}/+download/

Lines 1-6 Link Here

(-)b/dns/fastresolve/Makefile (-1 / +1 lines)
1	PORTNAME= fastresolve	1	PORTNAME= fastresolve
2	PORTVERSION= 2.10	2	PORTVERSION= 2.10
3	PORTREVISION= 6	3	PORTREVISION= 7
4	CATEGORIES= dns	4	CATEGORIES= dns
5	MASTER_SITES= https://BSDforge.com/projects/source/dns/fastresolve/	5	MASTER_SITES= https://BSDforge.com/projects/source/dns/fastresolve/
6		6

Lines 1-5 Link Here

(-)b/editors/nvi2/Makefile (+1 lines)
1	PORTNAME= nvi2	1	PORTNAME= nvi2
2	PORTVERSION= 2.2.0	2	PORTVERSION= 2.2.0
		3	PORTREVISION= 1
3	DISTVERSIONPREFIX= v	4	DISTVERSIONPREFIX= v
4	CATEGORIES= editors	5	CATEGORIES= editors
5		6

Lines 1-6 Link Here

(-)b/editors/poedit/Makefile (-1 / +1 lines)
1	PORTNAME= poedit	1	PORTNAME= poedit
2	PORTVERSION= 3.0.1	2	PORTVERSION= 3.0.1
3	PORTREVISION= 3	3	PORTREVISION= 4
4	CATEGORIES= editors	4	CATEGORIES= editors
5	MASTER_SITES= https://github.com/vslavik/${PORTNAME}/releases/download/v${PORTVERSION}-oss/	5	MASTER_SITES= https://github.com/vslavik/${PORTNAME}/releases/download/v${PORTVERSION}-oss/
6		6

Lines 1-6 Link Here

(-)b/graphics/fortytwo/Makefile (-1 / +1 lines)
1	PORTNAME= fortytwo	1	PORTNAME= fortytwo
2	PORTVERSION= 0.2.0	2	PORTVERSION= 0.2.0
3	PORTREVISION= 12	3	PORTREVISION= 13
4	CATEGORIES= graphics gnustep	4	CATEGORIES= graphics gnustep
5	MASTER_SITES= SF/${PORTNAME}/FT%20%2842%29/${PORTVERSION}	5	MASTER_SITES= SF/${PORTNAME}/FT%20%2842%29/${PORTVERSION}
6	DISTFILES= FT-${PORTVERSION}-src.tgz \	6	DISTFILES= FT-${PORTVERSION}-src.tgz \

Lines 3-9 Link Here

(-)b/japanese/mutt-devel/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= mutt	4	PORTNAME= mutt
5	PORTVERSION= ${VERSION}.j${JP_VERSION}	5	PORTVERSION= ${VERSION}.j${JP_VERSION}
6	PORTREVISION= 10	6	PORTREVISION= 11
7	CATEGORIES= japanese mail	7	CATEGORIES= japanese mail
8	MASTER_SITES= ftp://ftp.mutt.org/mutt/devel/:body \	8	MASTER_SITES= ftp://ftp.mutt.org/mutt/devel/:body \
9	ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/devel/:body \	9	ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/devel/:body \

Lines 1-6 Link Here

(-)b/lang/clisp/Makefile (-1 / +1 lines)
1	PORTNAME= clisp	1	PORTNAME= clisp
2	PORTVERSION= 2.49.93+	2	PORTVERSION= 2.49.93+
3	PORTREVISION= 4	3	PORTREVISION= 5
4	CATEGORIES= lang lisp	4	CATEGORIES= lang lisp
5		5
6	MAINTAINER= kiri@TrueFC.org	6	MAINTAINER= kiri@TrueFC.org

Lines 1-6 Link Here

(-)b/lang/gnu-cobol/Makefile (-1 / +1 lines)
1	PORTNAME= gnucobol	1	PORTNAME= gnucobol
2	PORTVERSION= 3.1.2	2	PORTVERSION= 3.1.2
3	PORTREVISION= 1	3	PORTREVISION= 2
4	CATEGORIES= lang	4	CATEGORIES= lang
5	MASTER_SITES= GNU/gnucobol	5	MASTER_SITES= GNU/gnucobol
6		6

Lines 1-6 Link Here

(-)b/lang/php81/Makefile (-1 / +1 lines)
1	PORTNAME= php81	1	PORTNAME= php81
2	DISTVERSION= 8.1.11	2	DISTVERSION= 8.1.11
3	PORTREVISION?= 0	3	PORTREVISION?= 1
4	CATEGORIES?= lang devel www	4	CATEGORIES?= lang devel www
5	MASTER_SITES= PHP/distributions	5	MASTER_SITES= PHP/distributions
6	DISTNAME= php-${DISTVERSION}	6	DISTNAME= php-${DISTVERSION}

Lines 1-6 Link Here

(-)b/lang/php82/Makefile (-1 / +1 lines)
1	PORTNAME= php82	1	PORTNAME= php82
2	DISTVERSION= 8.2.0RC2	2	DISTVERSION= 8.2.0RC2
3	PORTREVISION?= 0	3	PORTREVISION?= 1
4	CATEGORIES?= lang devel www	4	CATEGORIES?= lang devel www
5	MASTER_SITES= https://downloads.php.net/~sergey/	5	MASTER_SITES= https://downloads.php.net/~sergey/
6	DISTNAME= php-${DISTVERSION}	6	DISTNAME= php-${DISTVERSION}

Lines 1-5 Link Here

(-)b/mail/avenger/Makefile (+1 lines)
1	PORTNAME= avenger	1	PORTNAME= avenger
2	PORTVERSION= 0.8.5	2	PORTVERSION= 0.8.5
		3	PORTREVISION= 1
3	CATEGORIES= mail	4	CATEGORIES= mail
4	MASTER_SITES= http://www.mailavenger.org/dist/	5	MASTER_SITES= http://www.mailavenger.org/dist/
5		6

Lines 1-5 Link Here

(-)b/mail/bmf/Makefile (+1 lines)
1	PORTNAME= bmf	1	PORTNAME= bmf
2	PORTVERSION= 0.9.4	2	PORTVERSION= 0.9.4
		3	PORTREVISION= 1
3	PORTEPOCH= 1	4	PORTEPOCH= 1
4	CATEGORIES= mail	5	CATEGORIES= mail
5	MASTER_SITES= SF	6	MASTER_SITES= SF

Lines 1-6 Link Here

(-)b/mail/bogofilter-bdb/Makefile (-1 / +1 lines)
1	PORTNAME= bogofilter	1	PORTNAME= bogofilter
2	DISTVERSION= 1.2.5	2	DISTVERSION= 1.2.5
3	PORTREVISION?= 3	3	PORTREVISION?= 4
4	CATEGORIES?= mail	4	CATEGORIES?= mail
5	MASTER_SITES= SF/bogofilter/bogofilter-stable/	5	MASTER_SITES= SF/bogofilter/bogofilter-stable/
6	PKGNAMESUFFIX?= -bdb	6	PKGNAMESUFFIX?= -bdb

Lines 1-6 Link Here

(-)b/mail/cyrus-imapd23/Makefile (-1 / +1 lines)
1	PORTNAME= cyrus-imapd	1	PORTNAME= cyrus-imapd
2	PORTVERSION= 2.3.20	2	PORTVERSION= 2.3.20
3	PORTREVISION= 2	3	PORTREVISION= 3
4	CATEGORIES= mail	4	CATEGORIES= mail
5	MASTER_SITES= https://github.com/cyrusimap/cyrus-imapd/releases/download/${PORTNAME}-${PORTVERSION}/	5	MASTER_SITES= https://github.com/cyrusimap/cyrus-imapd/releases/download/${PORTNAME}-${PORTVERSION}/
6	PKGNAMESUFFIX= 23	6	PKGNAMESUFFIX= 23

Lines 1-6 Link Here

(-)b/mail/cyrus-imapd24/Makefile (-1 / +1 lines)
1	PORTNAME= cyrus-imapd	1	PORTNAME= cyrus-imapd
2	PORTVERSION= 2.4.22	2	PORTVERSION= 2.4.22
3	PORTREVISION= 0	3	PORTREVISION= 1
4	CATEGORIES= mail	4	CATEGORIES= mail
5	MASTER_SITES= https://github.com/cyrusimap/cyrus-imapd/releases/download/${PORTNAME}-${PORTVERSION}/	5	MASTER_SITES= https://github.com/cyrusimap/cyrus-imapd/releases/download/${PORTNAME}-${PORTVERSION}/
6	PKGNAMESUFFIX= 24	6	PKGNAMESUFFIX= 24

Lines 1-6 Link Here

(-)b/mail/cyrus-imapd25/Makefile (-1 / +1 lines)
1	PORTNAME= cyrus-imapd	1	PORTNAME= cyrus-imapd
2	PORTVERSION= 2.5.17	2	PORTVERSION= 2.5.17
3	PORTREVISION= 1	3	PORTREVISION= 2
4	CATEGORIES= mail	4	CATEGORIES= mail
5	MASTER_SITES= https://github.com/cyrusimap/cyrus-imapd/releases/download/${PORTNAME}-${PORTVERSION}/	5	MASTER_SITES= https://github.com/cyrusimap/cyrus-imapd/releases/download/${PORTNAME}-${PORTVERSION}/
6	PKGNAMESUFFIX= 25	6	PKGNAMESUFFIX= 25

Lines 1-6 Link Here

(-)b/mail/dk-milter/Makefile (-1 / +1 lines)
1	PORTNAME= dk-milter	1	PORTNAME= dk-milter
2	PORTVERSION= 1.0.2	2	PORTVERSION= 1.0.2
3	PORTREVISION= 6	3	PORTREVISION= 7
4	CATEGORIES= mail	4	CATEGORIES= mail
5	MASTER_SITES= SF/${PORTNAME}/DomainKeys%20Milter/${PORTVERSION}	5	MASTER_SITES= SF/${PORTNAME}/DomainKeys%20Milter/${PORTVERSION}
6		6




PORTNAME=	exim
PORTVERSION?=	${EXIM_VERSION}
PORTREVISION?=	6
CATEGORIES=	mail
MASTER_SITES=	EXIM:exim
MASTER_SITE_SUBDIR=	/exim4/:exim \

OPTIONS_SUB=	yes

AUTH_SASL_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
BDB_USES=	bdb:5
DMARC_LIB_DEPENDS=	libopendmarc.so:mail/opendmarc
EMBEDDED_PERL_USE=	perl5=run,build
EXIMON_USES=	xorg

.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

Lines 1-6 Link Here

(-)b/mail/greyfix/Makefile (-1 / +1 lines)
1	PORTNAME= greyfix	1	PORTNAME= greyfix
2	PORTVERSION= 0.4.0	2	PORTVERSION= 0.4.0
3	PORTREVISION= 1	3	PORTREVISION= 2
4	CATEGORIES= mail	4	CATEGORIES= mail
5	MASTER_SITES= http://www.kim-minh.com/pub/greyfix/ \	5	MASTER_SITES= http://www.kim-minh.com/pub/greyfix/ \
6	http://stereochro.me/distfiles/	6	http://stereochro.me/distfiles/

Lines 1-5 Link Here

(-)b/mail/isync/Makefile (+1 lines)
1	PORTNAME= isync	1	PORTNAME= isync
2	PORTVERSION= 1.4.4	2	PORTVERSION= 1.4.4
		3	PORTREVISION= 1
3	CATEGORIES= mail	4	CATEGORIES= mail
4	MASTER_SITES= SF	5	MASTER_SITES= SF
5		6

Lines 1-5 Link Here

(-)b/mail/mailfromd/Makefile (+1 lines)
1	PORTNAME= mailfromd	1	PORTNAME= mailfromd
2	PORTVERSION= 8.14	2	PORTVERSION= 8.14
		3	PORTREVISION= 1
3	CATEGORIES= mail	4	CATEGORIES= mail
4	MASTER_SITES= http://download.gnu.org.ua/pub/release/${PORTNAME}/ \	5	MASTER_SITES= http://download.gnu.org.ua/pub/release/${PORTNAME}/ \
5	http://download.gnu.org.ua/pub/alpha/${PORTNAME}/	6	http://download.gnu.org.ua/pub/alpha/${PORTNAME}/

Lines 1-6 Link Here

(-)b/mail/mailutils/Makefile (-1 / +1 lines)
1	PORTNAME= mailutils	1	PORTNAME= mailutils
2	PORTVERSION= 3.15	2	PORTVERSION= 3.15
3	PORTREVISION= 1	3	PORTREVISION= 2
4	CATEGORIES= mail	4	CATEGORIES= mail
5	MASTER_SITES= GNU GNU_ALPHA	5	MASTER_SITES= GNU GNU_ALPHA
6		6

Lines 1-5 Link Here

(-)b/mail/mutt/Makefile (+1 lines)
1	PORTNAME= mutt	1	PORTNAME= mutt
2	DISTVERSION= 2.2.7	2	DISTVERSION= 2.2.7
		3	PORTREVISION= 1
3	CATEGORIES+= mail	4	CATEGORIES+= mail
4	MASTER_SITES= ftp://ftp.mutt.org/pub/mutt/ \	5	MASTER_SITES= ftp://ftp.mutt.org/pub/mutt/ \
5	https://bitbucket.org/mutt/mutt/downloads/ \	6	https://bitbucket.org/mutt/mutt/downloads/ \

Lines 1-5 Link Here

(-)b/mail/neomutt/Makefile (+1 lines)
1	PORTNAME= neomutt	1	PORTNAME= neomutt
2	PORTVERSION= 20220429	2	PORTVERSION= 20220429
		3	PORTREVISION= 1
3	CATEGORIES= mail	4	CATEGORIES= mail
4		5
5	MAINTAINER= bapt@FreeBSD.org	6	MAINTAINER= bapt@FreeBSD.org

Lines 1-6 Link Here

(-)b/mail/opendkim/Makefile (-1 / +1 lines)
1	PORTNAME= opendkim	1	PORTNAME= opendkim
2	PORTVERSION= 2.10.3	2	PORTVERSION= 2.10.3
3	PORTREVISION= 16	3	PORTREVISION= 17
4	CATEGORIES= mail security	4	CATEGORIES= mail security
5	MASTER_SITES= SF/${PORTNAME} \	5	MASTER_SITES= SF/${PORTNAME} \
6	SF/${PORTNAME}/Previous%20Releases \	6	SF/${PORTNAME}/Previous%20Releases \

Lines 1-6 Link Here

(-)b/mail/perdition/Makefile (-1 / +1 lines)
1	PORTNAME= perdition	1	PORTNAME= perdition
2	PORTVERSION= 2.2	2	PORTVERSION= 2.2
3	PORTREVISION= 1	3	PORTREVISION= 2
4	CATEGORIES= mail net security	4	CATEGORIES= mail net security
5	MASTER_SITES= http://horms.net/projects/perdition/download/${PORTVERSION}/	5	MASTER_SITES= http://horms.net/projects/perdition/download/${PORTVERSION}/
6		6

Lines 1-5 Link Here

(-)b/mail/postfix-current/Makefile (+1 lines)
1	PORTNAME= postfix	1	PORTNAME= postfix
2	DISTVERSION= 3.8-20221007	2	DISTVERSION= 3.8-20221007
		3	PORTREVISION?= 1
3	PORTEPOCH= 6	4	PORTEPOCH= 6
4	CATEGORIES= mail	5	CATEGORIES= mail
5	MASTER_SITES= http://ftp.porcupine.org/mirrors/postfix-release/ \	6	MASTER_SITES= http://ftp.porcupine.org/mirrors/postfix-release/ \

Lines 1-6 Link Here

(-)b/mail/postfix/Makefile (-1 / +1 lines)
1	PORTNAME= postfix	1	PORTNAME= postfix
2	DISTVERSION= 3.7.3	2	DISTVERSION= 3.7.3
3	PORTREVISION?= 0	3	PORTREVISION?= 1
4	PORTEPOCH= 1	4	PORTEPOCH= 1
5	CATEGORIES= mail	5	CATEGORIES= mail
6	MASTER_SITES= http://ftp.porcupine.org/mirrors/postfix-release/ \	6	MASTER_SITES= http://ftp.porcupine.org/mirrors/postfix-release/ \

Lines 1-6 Link Here

(-)b/mail/sendmail-devel/Makefile (-1 / +1 lines)
1	PORTNAME= sendmail	1	PORTNAME= sendmail
2	PORTVERSION= 8.17.1.20	2	PORTVERSION= 8.17.1.20
3	PORTREVISION= 0	3	PORTREVISION= 1
4	CATEGORIES= mail	4	CATEGORIES= mail
5	MASTER_SITES= ftp://ftp.sendmail.org/pub/sendmail/snapshots/	5	MASTER_SITES= ftp://ftp.sendmail.org/pub/sendmail/snapshots/
6	PKGNAMESUFFIX?= -devel${PKGNAMESUFFIX2}	6	PKGNAMESUFFIX?= -devel${PKGNAMESUFFIX2}

Lines 1-6 Link Here

(-)b/mail/sendmail/Makefile (-1 / +1 lines)
1	PORTNAME= sendmail	1	PORTNAME= sendmail
2	PORTVERSION= 8.17.1	2	PORTVERSION= 8.17.1
3	PORTREVISION= 5	3	PORTREVISION= 6
4	CATEGORIES= mail	4	CATEGORIES= mail
5	MASTER_SITES= ftp://ftp.sendmail.org/pub/sendmail/	5	MASTER_SITES= ftp://ftp.sendmail.org/pub/sendmail/
6	DISTNAME= ${PORTNAME}.${PORTVERSION}	6	DISTNAME= ${PORTNAME}.${PORTVERSION}

Lines 1-6 Link Here

(-)b/mail/spamprobe/Makefile (-1 / +1 lines)
1	PORTNAME= spamprobe	1	PORTNAME= spamprobe
2	PORTVERSION= 1.4d	2	PORTVERSION= 1.4d
3	PORTREVISION= 19	3	PORTREVISION= 20
4	CATEGORIES= mail	4	CATEGORIES= mail
5	MASTER_SITES= SF	5	MASTER_SITES= SF
6		6

Lines 1-6 Link Here

(-)b/mail/spmfilter/Makefile (-1 / +1 lines)
1	PORTNAME= spmfilter	1	PORTNAME= spmfilter
2	PORTVERSION= 0.6.7	2	PORTVERSION= 0.6.7
3	PORTREVISION= 6	3	PORTREVISION= 7
4	CATEGORIES= mail	4	CATEGORIES= mail
5	MASTER_SITES= http://www.${PORTNAME}.org/files/	5	MASTER_SITES= http://www.${PORTNAME}.org/files/
6		6

Lines 1-5 Link Here

(-)b/mail/vacation/Makefile (+1 lines)
1	PORTNAME= vacation	1	PORTNAME= vacation
2	PORTVERSION= 3.3.3	2	PORTVERSION= 3.3.3
		3	PORTREVISION= 1
3	CATEGORIES= mail	4	CATEGORIES= mail
4	MASTER_SITES= DEBIAN	5	MASTER_SITES= DEBIAN
5	DISTNAME= ${PORTNAME}_${PORTVERSION}	6	DISTNAME= ${PORTNAME}_${PORTVERSION}

Lines 1-6 Link Here

(-)b/misc/hotkeys/Makefile (-1 / +1 lines)
1	PORTNAME= hotkeys	1	PORTNAME= hotkeys
2	PORTVERSION= 0.5.7.1	2	PORTVERSION= 0.5.7.1
3	PORTREVISION= 20	3	PORTREVISION= 21
4	CATEGORIES= misc	4	CATEGORIES= misc
5	MASTER_SITES= https://BSDforge.com/projects/source/misc/hotkeys/${PORTVERSION}/	5	MASTER_SITES= https://BSDforge.com/projects/source/misc/hotkeys/${PORTVERSION}/
6	DISTNAME= hotkeys_${PORTVERSION}	6	DISTNAME= hotkeys_${PORTVERSION}

Lines 1-6 Link Here

(-)b/net-im/jabberd/Makefile (-1 / +1 lines)
1	PORTNAME= jabberd	1	PORTNAME= jabberd
2	PORTVERSION= 2.7.0	2	PORTVERSION= 2.7.0
3	PORTREVISION= 5	3	PORTREVISION= 6
4	CATEGORIES= net-im	4	CATEGORIES= net-im
5	MASTER_SITES= https://github.com/jabberd2/jabberd2/releases/download/${PORTNAME}-${DISTVERSION}/ \	5	MASTER_SITES= https://github.com/jabberd2/jabberd2/releases/download/${PORTNAME}-${DISTVERSION}/ \
6	LOCAL/matthew/${PORTNAME}	6	LOCAL/matthew/${PORTNAME}

Lines 1-6 Link Here

(-)b/net-p2p/bitcoin/Makefile (-1 / +1 lines)
1	PORTNAME= bitcoin	1	PORTNAME= bitcoin
2	PORTVERSION= 23.0	2	PORTVERSION= 23.0
3	PORTREVISION?= 3	3	PORTREVISION?= 4
4	CATEGORIES= net-p2p finance	4	CATEGORIES= net-p2p finance
5	MASTER_SITES= https://bitcoincore.org/bin/bitcoin-core-${PORTVERSION}/ \	5	MASTER_SITES= https://bitcoincore.org/bin/bitcoin-core-${PORTVERSION}/ \
6	LOCAL/swills:icon	6	LOCAL/swills:icon

Lines 1-6 Link Here

(-)b/net-p2p/jigdo/Makefile (-1 / +1 lines)
1	PORTNAME= jigdo	1	PORTNAME= jigdo
2	PORTVERSION= 0.7.3	2	PORTVERSION= 0.7.3
3	PORTREVISION= 8	3	PORTREVISION= 10
4	CATEGORIES= net-p2p	4	CATEGORIES= net-p2p
5	MASTER_SITES= http://atterer.org/sites/atterer/files/2009-08/${PORTNAME}/	5	MASTER_SITES= http://atterer.org/sites/atterer/files/2009-08/${PORTNAME}/
6		6

Lines 1-7 Link Here

(-)b/net-p2p/litecoin/Makefile (-1 / +1 lines)
1	PORTNAME= litecoin	1	PORTNAME= litecoin
2	DISTVERSIONPREFIX= v	2	DISTVERSIONPREFIX= v
3	DISTVERSION= 0.21.2.1	3	DISTVERSION= 0.21.2.1
4	PORTREVISION= 2	4	PORTREVISION= 3
5	CATEGORIES= net-p2p finance	5	CATEGORIES= net-p2p finance
6		6
7	MAINTAINER= hsw@bitmark.com	7	MAINTAINER= hsw@bitmark.com

Lines 1-7 Link Here

(-)b/net-p2p/namecoin/Makefile (-1 / +1 lines)
1	PORTNAME= namecoin	1	PORTNAME= namecoin
2	PORTVERSION= 0.21.0.1	2	PORTVERSION= 0.21.0.1
3	DISTVERSIONPREFIX= nc	3	DISTVERSIONPREFIX= nc
4	PORTREVISION= 6	4	PORTREVISION= 7
5	PORTEPOCH= 1	5	PORTEPOCH= 1
6	CATEGORIES= net-p2p dns	6	CATEGORIES= net-p2p dns
7		7

Lines 1-7 Link Here

(-)b/net-p2p/qtum/Makefile (-1 / +1 lines)
1	PORTNAME= qtum	1	PORTNAME= qtum
2	PORTVERSION= 0.20.3	2	PORTVERSION= 0.20.3
3	DISTVERSIONPREFIX= mainnet-fastlane-v	3	DISTVERSIONPREFIX= mainnet-fastlane-v
4	PORTREVISION= 4	4	PORTREVISION= 5
5	CATEGORIES= net-p2p finance	5	CATEGORIES= net-p2p finance
6		6
7	MAINTAINER= ports@FreeBSD.org	7	MAINTAINER= ports@FreeBSD.org

Lines 1-7 Link Here

(-)b/net-p2p/zetacoin/Makefile (-1 / +1 lines)
1	PORTNAME= zetacoin	1	PORTNAME= zetacoin
2	PORTVERSION= 0.13.2.1	2	PORTVERSION= 0.13.2.1
3	DISTVERSIONPREFIX= v	3	DISTVERSIONPREFIX= v
4	PORTREVISION= 9	4	PORTREVISION= 10
5	CATEGORIES= net-p2p finance	5	CATEGORIES= net-p2p finance
6		6
7	MAINTAINER= daniel@morante.net	7	MAINTAINER= daniel@morante.net

Lines 1-6 Link Here

(-)b/net/netatalk3/Makefile (-1 / +1 lines)
1	PORTNAME= netatalk	1	PORTNAME= netatalk
2	PORTVERSION= 3.1.13	2	PORTVERSION= 3.1.13
3	PORTREVISION= 3	3	PORTREVISION= 4
4	PORTEPOCH= 1	4	PORTEPOCH= 1
5	CATEGORIES= net	5	CATEGORIES= net
6	MASTER_SITES= SF	6	MASTER_SITES= SF

Lines 48-55 WANT_OPENLDAP_VER?= 24 Link Here

(-)b/net/openldap24-server/Makefile (-2 / +2 lines)
48	BROKEN= incompatible OpenLDAP version: ${WANT_OPENLDAP_VER}	48	BROKEN= incompatible OpenLDAP version: ${WANT_OPENLDAP_VER}
49	.endif	49	.endif
50		50
51	PORTREVISION_CLIENT= 4	51	PORTREVISION_CLIENT= 5
52	PORTREVISION_SERVER= 9	52	PORTREVISION_SERVER= 10
53	OPENLDAP_SHLIB_MAJOR= 2	53	OPENLDAP_SHLIB_MAJOR= 2
54	OPENLDAP_SHLIB_MINOR= 11.7	54	OPENLDAP_SHLIB_MINOR= 11.7
55	OPENLDAP_MAJOR= ${DISTVERSION:R}	55	OPENLDAP_MAJOR= ${DISTVERSION:R}

Lines 1-6 Link Here

(-)b/news/inn/Makefile (-1 / +1 lines)
1	PORTNAME?= inn	1	PORTNAME?= inn
2	PORTVERSION?= 2.7.0	2	PORTVERSION?= 2.7.0
3	PORTREVISION?= 1	3	PORTREVISION?= 2
4	CATEGORIES= news	4	CATEGORIES= news
5	MASTER_SITES= ISC	5	MASTER_SITES= ISC
6	MASTER_SITE_SUBDIR?= ${PORTNAME}	6	MASTER_SITE_SUBDIR?= ${PORTNAME}

Lines 1-6 Link Here

(-)b/print/panda/Makefile (-1 / +1 lines)
1	PORTNAME= panda	1	PORTNAME= panda
2	PORTVERSION= 0.5.4	2	PORTVERSION= 0.5.4
3	PORTREVISION= 10	3	PORTREVISION= 11
4	CATEGORIES= print	4	CATEGORIES= print
5	MASTER_SITES= SF \	5	MASTER_SITES= SF \
6	SAVANNAH \	6	SAVANNAH \

Lines 1-3 Link Here

(-)b/security/cyrus-sasl2-saslauthd/Makefile (+1 lines)
		1	PORTREVISION= 1
1	PKGNAMESUFFIX= -saslauthd	2	PKGNAMESUFFIX= -saslauthd
2		3
3	COMMENT= SASL authentication server for cyrus-sasl2	4	COMMENT= SASL authentication server for cyrus-sasl2

Lines 1-3 Link Here

(-)b/security/cyrus-sasl2/Makefile (+1 lines)
		1	PORTREVISION= 1
1	COMMENT= RFC 2222 SASL (Simple Authentication and Security Layer)	2	COMMENT= RFC 2222 SASL (Simple Authentication and Security Layer)
2	WWW= https://www.cyrusimap.org/sasl/	3	WWW= https://www.cyrusimap.org/sasl/
3		4

Lines 1-6 Link Here

(-)b/security/heimdal/Makefile (-1 / +1 lines)
1	PORTNAME= heimdal	1	PORTNAME= heimdal
2	PORTVERSION= 7.7.0	2	PORTVERSION= 7.7.0
3	PORTREVISION= 1	3	PORTREVISION= 2
4	CATEGORIES= security	4	CATEGORIES= security
5	MASTER_SITES= https://github.com/heimdal/heimdal/releases/download/${DISTNAME}/	5	MASTER_SITES= https://github.com/heimdal/heimdal/releases/download/${DISTNAME}/
6		6

Lines 1-6 Link Here

(-)b/security/pks/Makefile (-1 / +1 lines)
1	PORTNAME= pks	1	PORTNAME= pks
2	PORTVERSION= 0.9.6.20040312	2	PORTVERSION= 0.9.6.20040312
3	PORTREVISION= 10	3	PORTREVISION= 11
4	CATEGORIES= security www	4	CATEGORIES= security www
5	MASTER_SITES= http://pks.sourceforge.net/ LOCAL/mandree	5	MASTER_SITES= http://pks.sourceforge.net/ LOCAL/mandree
6	DISTFILES= pks-current.tgz	6	DISTFILES= pks-current.tgz

Lines 1-6 Link Here

(-)b/security/shibboleth-sp/Makefile (-1 / +1 lines)
1	PORTNAME= shibboleth-sp	1	PORTNAME= shibboleth-sp
2	PORTVERSION= 3.3.0	2	PORTVERSION= 3.3.0
3	PORTREVISION= 2	3	PORTREVISION= 3
4	CATEGORIES= security www	4	CATEGORIES= security www
5	MASTER_SITES= http://shibboleth.net/downloads/service-provider/${PORTVERSION}/	5	MASTER_SITES= http://shibboleth.net/downloads/service-provider/${PORTVERSION}/
6		6

Lines 1-5 Link Here

(-)b/security/sks/Makefile (+1 lines)
1	PORTNAME= sks	1	PORTNAME= sks
2	PORTVERSION= 1.1.6	2	PORTVERSION= 1.1.6
		3	PORTREVISION= 1
3	CATEGORIES= security	4	CATEGORIES= security
4	MASTER_SITES= http://bitbucket.org/skskeyserver/sks-keyserver/downloads/	5	MASTER_SITES= http://bitbucket.org/skskeyserver/sks-keyserver/downloads/
5		6

Lines 1-5 Link Here

(-)b/security/webfwlog/Makefile (+1 lines)
1	PORTNAME= webfwlog	1	PORTNAME= webfwlog
2	PORTVERSION= 1.1.1	2	PORTVERSION= 1.1.1
		3	PORTREVISION= 1
3	CATEGORIES= security	4	CATEGORIES= security
4	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/ \	5	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/ \
5	http://devel.webfwlog.net/download/v1.1.x/	6	http://devel.webfwlog.net/download/v1.1.x/

Lines 1-5 Link Here

(-)b/sysutils/ftwin/Makefile (+1 lines)
1	PORTNAME= ftwin	1	PORTNAME= ftwin
2	PORTVERSION= 0.8.10	2	PORTVERSION= 0.8.10
		3	PORTREVISION= 1
3	CATEGORIES= sysutils	4	CATEGORIES= sysutils
4		5
5	MAINTAINER= shoesoft@gmx.net	6	MAINTAINER= shoesoft@gmx.net

Lines 1-6 Link Here

(-)b/textproc/p5-RDFStore/Makefile (-1 / +1 lines)
1	PORTNAME= RDFStore	1	PORTNAME= RDFStore
2	PORTVERSION= 0.51	2	PORTVERSION= 0.51
3	PORTREVISION= 3	3	PORTREVISION= 4
4	CATEGORIES= textproc perl5	4	CATEGORIES= textproc perl5
5	MASTER_SITES= CPAN	5	MASTER_SITES= CPAN
6	MASTER_SITE_SUBDIR= CPAN:AREGGIORI	6	MASTER_SITE_SUBDIR= CPAN:AREGGIORI

Lines 1-6 Link Here

(-)b/textproc/redland/Makefile (-1 / +1 lines)
1	PORTNAME= redland	1	PORTNAME= redland
2	PORTVERSION= 1.0.17	2	PORTVERSION= 1.0.17
3	PORTREVISION= 4	3	PORTREVISION= 5
4	CATEGORIES= textproc	4	CATEGORIES= textproc
5	MASTER_SITES= http://download.librdf.org/source/	5	MASTER_SITES= http://download.librdf.org/source/
6		6

Lines 1-5 Link Here

(-)b/www/c-icap/Makefile (+1 lines)
1	PORTNAME= c-icap	1	PORTNAME= c-icap
2	PORTVERSION= 0.5.10	2	PORTVERSION= 0.5.10
		3	PORTREVISION= 1
3	PORTEPOCH= 2	4	PORTEPOCH= 2
4	CATEGORIES= www	5	CATEGORIES= www
5	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/0.5.x/	6	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/0.5.x/

Lines 1-6 Link Here

(-)b/www/crawl/Makefile (-1 / +1 lines)
1	PORTNAME= crawl	1	PORTNAME= crawl
2	PORTVERSION= 0.4	2	PORTVERSION= 0.4
3	PORTREVISION= 14	3	PORTREVISION= 15
4	CATEGORIES= www	4	CATEGORIES= www
5	MASTER_SITES= http://www.monkey.org/~provos/	5	MASTER_SITES= http://www.monkey.org/~provos/
6		6

Lines 1-5 Link Here

(-)b/www/httest/Makefile (+1 lines)
1	PORTNAME= httest	1	PORTNAME= httest
2	PORTVERSION= 2.4.24	2	PORTVERSION= 2.4.24
		3	PORTREVISION= 1
3	CATEGORIES= www	4	CATEGORIES= www
4	MASTER_SITES= SF/htt/htt${PORTVERSION:R}/${PORTNAME}-${PORTVERSION}	5	MASTER_SITES= SF/htt/htt${PORTVERSION:R}/${PORTNAME}-${PORTVERSION}
5		6

Lines 1-7 Link Here

(-)b/www/mod_security/Makefile (-1 / +1 lines)
1	PORTNAME= mod_security	1	PORTNAME= mod_security
2	DISTVERSIONPREFIX= v	2	DISTVERSIONPREFIX= v
3	PORTVERSION= 2.9.5	3	PORTVERSION= 2.9.5
4	PORTREVISION= 2	4	PORTREVISION= 3
5	CATEGORIES= www security	5	CATEGORIES= www security
6	MASTER_SITES= https://github.com/SpiderLabs/ModSecurity/releases/download/v${PORTVERSION}/	6	MASTER_SITES= https://github.com/SpiderLabs/ModSecurity/releases/download/v${PORTVERSION}/
7	PKGNAMEPREFIX= ${APACHE_PKGNAMEPREFIX}	7	PKGNAMEPREFIX= ${APACHE_PKGNAMEPREFIX}

Lines 1-6 Link Here

(-)b/www/squidguard/Makefile (-1 / +1 lines)
1	PORTNAME= squidGuard	1	PORTNAME= squidGuard
2	PORTVERSION= 1.4	2	PORTVERSION= 1.4
3	PORTREVISION= 15	3	PORTREVISION= 16
4	CATEGORIES= www	4	CATEGORIES= www
5	MASTER_SITES= LOCAL/garga/squidguard/	5	MASTER_SITES= LOCAL/garga/squidguard/
6	DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \	6	DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \

Lines 1-6 Link Here

(-)b/www/webalizer/Makefile (-2 / +1 lines)
1	PORTNAME= webalizer	1	PORTNAME= webalizer
2	PORTVERSION= 2.23.8	2	PORTVERSION= 2.23.8
3	PORTREVISION= 14	3	PORTREVISION= 15
4	CATEGORIES+= www	4	CATEGORIES+= www
5	MASTER_SITES= ftp://ftp.mrunix.net/pub/webalizer/:main \	5	MASTER_SITES= ftp://ftp.mrunix.net/pub/webalizer/:main \
6	ftp://ftp.dinoex.de/pub/FreeBSD/distfiles/:main \	6	ftp://ftp.dinoex.de/pub/FreeBSD/distfiles/:main \
7	-

Return to bug 261523

Lines 8-26 Link Here

(-)b/Mk/Uses/bdb.mk (-77 / +10 lines)
8	# necessary (db5 if compatible).	8	# necessary (db5 if compatible).
9	# This adds a "debug-bdb" make target which will dump the	9	# This adds a "debug-bdb" make target which will dump the
10	# related data.	10	# related data.
11	# INVALID_BDB_VER
12	# - This variable can be defined when the port does not
13	# support one or more versions of Berkeley DB.
14	# <BDB_UNIQUENAME>_WITH_BDB_VER	11	# <BDB_UNIQUENAME>_WITH_BDB_VER
15	# - User defined port specific variable to set Berkeley DB	12	# - User defined port specific variable to set Berkeley DB
16	# version.	13	# version.
17	# WITH_BDB_HIGHEST	14	# WITH_BDB_HIGHEST
18	# - Use the highest installed version of Berkeley DB.	15	# - Use the highest installed version of Berkeley DB.
19	# WITH_BDB6_PERMITTED
20	# - If defined, BerkeleyDB 6 is added to the
21	# default version set, making it eligible even
22	# if not already installed. This is due to its
23	# stricter Affero GNU Public License.
24	#	16	#
25	# These variables will then be filled in by this .mk file:	17	# These variables will then be filled in by this .mk file:
26	#	18	#
Lines 58-71 BDB_UNIQUENAME?= ${PKGNAMEPREFIX}${PORTNAME} Link Here
58	_BDB_DEFAULT_save:=${BDB_DEFAULT}	50	_BDB_DEFAULT_save:=${BDB_DEFAULT}
59		51
60	_DB_PORTS= 5 18	52	_DB_PORTS= 5 18
61	_DB_DEFAULTS= 5
62	#
63	# Since 2020-12-02, this name is not fitting too much but
64	# retained for now for compatibility. The name of this variable
65	# is subject to change especially once db6 were removed.
66	. if defined(WITH_BDB6_PERMITTED) \|\| ${_bdb_ARGS} == 18
67	_DB_DEFAULTS+= 18
68	. endif
69		53
70	# Dependency lines for different db versions	54	# Dependency lines for different db versions
71	db5_DEPENDS= libdb-5.3.so:databases/db5	55	db5_DEPENDS= libdb-5.3.so:databases/db5
Lines 83-114 BDB_DEFAULT= ${${BDB_UNIQUENAME:tu:S,-,_,}_WITH_BDB_VER} Link Here
83	# Override _bdb_ARGS with global BDB_DEFAULT if the maintainer did not	67	# Override _bdb_ARGS with global BDB_DEFAULT if the maintainer did not
84	# ask for a more specific version.	68	# ask for a more specific version.
85	. if ${_bdb_ARGS} == yes	69	. if ${_bdb_ARGS} == yes
86	. if ${BDB_DEFAULT} != 1
87	_bdb_ARGS= ${BDB_DEFAULT}	70	_bdb_ARGS= ${BDB_DEFAULT}
88	. else
89	_bdb_ARGS:= 5+
90	. endif
91	. endif	71	. endif
92		72
93	# Compatiblity hack:	73	# 1. parse supported versions and build list from _bdb_ARGS
94	# upgrade older plussed versions to 5+
95	_BDB_OLDPLUSVERS=4+ 40+ 41+ 42+ 43+ 44+ 45+ 46+ 47+ 48+
96	. for i in ${_bdb_ARGS}
97	. if ${_BDB_OLDPLUSVERS:M${i}}
98	_bdb_ARGS:= 5+
99	. endif
100	. endfor
101
102	# 1. detect installed versions
103	_INST_BDB_VER=
104	. for bdb in ${_DB_PORTS}
105	. if exists(${db${bdb}_FIND})
106	_INST_BDB_VER+=${bdb}
107	. endif
108	. endfor
109
110	# 2. parse supported versions:
111	# 2a. build list from _bdb_ARGS
112	_SUPP_BDB_VER=	74	_SUPP_BDB_VER=
113	__bdb_ARGS:=${_bdb_ARGS:C,\+$,,}	75	__bdb_ARGS:=${_bdb_ARGS:C,\+$,,}
114	. if !empty(_bdb_ARGS:M*+)	76	. if !empty(_bdb_ARGS:M*+)
Lines 120-165 _SUPP_BDB_VER+=${bdb:C/\.//} Link Here
120	. else	82	. else
121	_SUPP_BDB_VER=${_bdb_ARGS}	83	_SUPP_BDB_VER=${_bdb_ARGS}
122	. endif	84	. endif
123	# 2b. expand INVALID_BDB_VER if given with "+":
124	. if !empty(INVALID_BDB_VER:M*+)
125	_INV_BDB:=${INVALID_BDB_VER:C,\+$,,}
126	_INV_BDB_VER:=
127	. for bdb in ${_DB_PORTS}
128	. if ${_INV_BDB} <= ${bdb}
129	_INV_BDB_VER+=${bdb:C/\.//}
130	. endif
131	. endfor
132	. else
133	_INV_BDB_VER:=${INVALID_BDB_VER}
134	. endif
135	# 2c. strip versions from INVALID_BDB_VER out of _SUPP_BDB_VER
136	. for unsupp in ${_INV_BDB_VER}
137	_SUPP_BDB_VER:=${_SUPP_BDB_VER:N${unsupp}}
138	. endfor
139
140	# 3a. calculate intersection in _INST_BDB_VER to see if there
141	# is a usable installed version
142	. for i in ${_INST_BDB_VER}
143	. if empty(_SUPP_BDB_VER:M${i})
144	_INST_BDB_VER:= ${_INST_BDB_VER:N${i}}
145	. endif
146	. endfor
147	_ELIGIBLE_BDB_VER:=${_INST_BDB_VER}
148		85
149	# 3b. if there is no usable version installed, check defaults	86	# 2. check defaults
150	. if empty(_INST_BDB_VER)	87	_DFLT_BDB_VER:=${_DB_PORTS}
151	_DFLT_BDB_VER:=${_DB_DEFAULTS}
152	# make sure we use a reasonable version for package builds	88	# make sure we use a reasonable version for package builds
153	_WITH_BDB_HIGHEST=yes	89	_WITH_BDB_HIGHEST=yes
154	. for i in ${_DFLT_BDB_VER}	90	. for i in ${_DFLT_BDB_VER}
155	. if empty(_SUPP_BDB_VER:M${i})	91	. if empty(_SUPP_BDB_VER:M${i})
156	_DFLT_BDB_VER:= ${_DFLT_BDB_VER:N${i}}	92	_DFLT_BDB_VER:= ${_DFLT_BDB_VER:N${i}}
157	. endif	93	. endif
158	. endfor	94	. endfor
159	_ELIGIBLE_BDB_VER:=${_DFLT_BDB_VER}	95	_ELIGIBLE_BDB_VER:=${_DFLT_BDB_VER}
160	. endif
161		96
162	# 4. elect a version	97	# 3. elect a version
163	_BDB_VER=	98	_BDB_VER=
164	. for i in ${_ELIGIBLE_BDB_VER}	99	. for i in ${_ELIGIBLE_BDB_VER}
165	. if !empty(WITH_BDB_HIGHEST) \|\| !empty(_WITH_BDB_HIGHEST) \|\| empty(${_BDB_VER})	100	. if !empty(WITH_BDB_HIGHEST) \|\| !empty(_WITH_BDB_HIGHEST) \|\| empty(${_BDB_VER})
Lines 167-175 _BDB_VER:=${i} Link Here
167	. endif	102	. endif
168	. endfor	103	. endfor
169		104
170	# 5. catch errors or set variables	105	# 4. catch errors or set variables
171	. if empty(_BDB_VER)	106	. if empty(_BDB_VER)
172	IGNORE= cannot install: no eligible BerkeleyDB version. Requested: ${_bdb_ARGS}, incompatible: ${_INV_BDB_VER}. Try: make debug-bdb	107	IGNORE= cannot install: no eligible BerkeleyDB version. Requested: ${_bdb_ARGS}. Try: make debug-bdb
173	. else	108	. else
174	. if defined(BDB_BUILD_DEPENDS)	109	. if defined(BDB_BUILD_DEPENDS)
175	BUILD_DEPENDS+= ${db${_BDB_VER}_FIND}:${db${_BDB_VER}_DEPENDS:C/^libdb.*://}	110	BUILD_DEPENDS+= ${db${_BDB_VER}_FIND}:${db${_BDB_VER}_DEPENDS:C/^libdb.*://}
Lines 201-208 debug-bdb: Link Here
201	@${ECHO_CMD} "WITH_BDB_HIGHEST (original): ${WITH_BDB_HIGHEST}"	136	@${ECHO_CMD} "WITH_BDB_HIGHEST (original): ${WITH_BDB_HIGHEST}"
202	@${ECHO_CMD} "--PROCESSING------------------------------------------------"	137	@${ECHO_CMD} "--PROCESSING------------------------------------------------"
203	@${ECHO_CMD} "supported versions: ${_SUPP_BDB_VER}"	138	@${ECHO_CMD} "supported versions: ${_SUPP_BDB_VER}"
204	@${ECHO_CMD} "invalid versions: ${_INV_BDB_VER}"
205	@${ECHO_CMD} "installed versions: ${_INST_BDB_VER}"
206	@${ECHO_CMD} "eligible versions: ${_ELIGIBLE_BDB_VER}"	139	@${ECHO_CMD} "eligible versions: ${_ELIGIBLE_BDB_VER}"
207	@${ECHO_CMD} "bdb_ARGS (effective): ${_bdb_ARGS}"	140	@${ECHO_CMD} "bdb_ARGS (effective): ${_bdb_ARGS}"
208	@${ECHO_CMD} "WITH_BDB_HIGHEST (override): ${_WITH_BDB_HIGHEST}"	141	@${ECHO_CMD} "WITH_BDB_HIGHEST (override): ${_WITH_BDB_HIGHEST}"

Lines 1-6 Link Here

(-)b/mail/exim/Makefile (-3 / +2 lines)
1	PORTNAME= exim	1	PORTNAME= exim
2	PORTVERSION?= ${EXIM_VERSION}	2	PORTVERSION?= ${EXIM_VERSION}
3	PORTREVISION?= 5	3	PORTREVISION?= 6
4	CATEGORIES= mail	4	CATEGORIES= mail
5	MASTER_SITES= EXIM:exim	5	MASTER_SITES= EXIM:exim
6	MASTER_SITE_SUBDIR= /exim4/:exim \	6	MASTER_SITE_SUBDIR= /exim4/:exim \
Lines 44-50 MAKE_JOBS_UNSAFE= yes Link Here
44	OPTIONS_SUB= yes	44	OPTIONS_SUB= yes
45		45
46	AUTH_SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2	46	AUTH_SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2
47	BDB_USES= bdb	47	BDB_USES= bdb:5
48	DMARC_LIB_DEPENDS= libopendmarc.so:mail/opendmarc	48	DMARC_LIB_DEPENDS= libopendmarc.so:mail/opendmarc
49	EMBEDDED_PERL_USE= perl5=run,build	49	EMBEDDED_PERL_USE= perl5=run,build
50	EXIMON_USES= xorg	50	EXIMON_USES= xorg
Lines 337-343 SEDLIST+= -e 's,XX_LDAP_[^ ]*_XX,,' \ Link Here
337	.endif	337	.endif
338		338
339	.if ${PORT_OPTIONS:MBDB}	339	.if ${PORT_OPTIONS:MBDB}
340	INVALID_BDB_VER= 2 3 6 18
341	DB_LIBS= -L${BDB_LIB_DIR} -l${BDB_LIB_NAME}	340	DB_LIBS= -L${BDB_LIB_DIR} -l${BDB_LIB_NAME}
342	DB_INCLUDES= -I${BDB_INCLUDE_DIR}	341	DB_INCLUDES= -I${BDB_INCLUDE_DIR}
343	.else	342	.else