View | Details | Raw Unified | Return to bug 192690 | Differences between
and this patch

Collapse All | Expand All

(-)MOVED (+9 lines)
Lines 6419-6421 Link Here
6419
korean/unzip|archivers/unzip|2014-08-15|Merged with archivers/unzip as a new non-default option
6419
korean/unzip|archivers/unzip|2014-08-15|Merged with archivers/unzip as a new non-default option
6420
russian/unzip|archivers/unzip|2014-08-15|Merged with archivers/unzip as a new non-default option
6420
russian/unzip|archivers/unzip|2014-08-15|Merged with archivers/unzip as a new non-default option
6421
mail/sendmail-sasl|mail/sendmail|2014-08-15|Removed: Use mail/sendmail instead
6421
mail/sendmail-sasl|mail/sendmail|2014-08-15|Removed: Use mail/sendmail instead
6422
databases/db4|databases/db48|2014-08-15|Superseded by databases/db48
6423
databases/db41|databases/db48|2014-08-15|Superseded by databases/db48
6424
databases/db41-nocrypto|databases/db48|2014-08-15|Superseded by databases/db48
6425
databases/db42|databases/db48|2014-08-15|Superseded by databases/db48
6426
databases/db42-nocrypto|databases/db48|2014-08-15|Superseded by databases/db48
6427
databases/db43|databases/db48|2014-08-15|Superseded by databases/db48
6428
databases/db44|databases/db48|2014-08-15|Superseded by databases/db48
6429
databases/db46|databases/db48|2014-08-15|Superseded by databases/db48
6430
databases/db47|databases/db48|2014-08-15|Superseded by databases/db48
(-)Mk/bsd.database.mk (-143 / +139 lines)
Lines 50-60 Link Here
50
# PGSQL_VER
50
# PGSQL_VER
51
#			- Detected PostgreSQL version.
51
#			- Detected PostgreSQL version.
52
##
52
##
53
# USE_BDB		- Add Berkeley DB library dependency.
53
# USE_BDB	- Add Berkeley DB library dependency.
54
#			  If no version is given (by the maintainer via the port or
54
#			  If no version is given (by the maintainer via the port or
55
#			  by the user via defined variable), try to find the
55
#			  by the user via defined variable), try to find the
56
#			  currently installed version.  Fall back to default if
56
#			  currently installed version.  Fall back to default if
57
#			  necessary (db41+).
57
#			  necessary (db5 if compatible).
58
#			  This adds a "debug-bdb" make target which will dump the
59
#			  related data.
58
# INVALID_BDB_VER
60
# INVALID_BDB_VER
59
#			- This variable can be defined when the port does not
61
#			- This variable can be defined when the port does not
60
#			  support one or more versions of Berkeley DB.
62
#			  support one or more versions of Berkeley DB.
Lines 68-73 Link Here
68
#			  version.
70
#			  version.
69
# WITH_BDB_HIGHEST
71
# WITH_BDB_HIGHEST
70
#			- Use the highest installed version of Berkeley DB.
72
#			- Use the highest installed version of Berkeley DB.
73
# WITH_BDB6_PERMITTED
74
# 			- If defined, BerkeleyDB 6 is added to the
75
# 			  default version set, making it eligible even
76
# 			  if not already installed. This is due to its
77
# 			  stricter Affero GNU Public License.
78
#
79
# These variables will then be filled in by this .mk file:
80
#
71
# BDB_LIB_NAME
81
# BDB_LIB_NAME
72
#			- This variable is automatically set to the name of the
82
#			- This variable is automatically set to the name of the
73
#			  Berkeley DB library (default: db41).
83
#			  Berkeley DB library (default: db41).
Lines 290-332 Link Here
290
.endif # USE_PGSQL
300
.endif # USE_PGSQL
291
301
292
.if defined(USE_BDB)
302
.if defined(USE_BDB)
303
# TODO: avoid malformed conditional with invalid USE_BDB/WITH_BDB_VER
304
# check if + works properly from test builds 01h12m23s
293
305
294
_DB_PORTS=	40 41 42 43 44 46 47 48 5 6 40+ 41+ 42+ 43+ 44+ 46+ 47+ 48+ 5+ 6+
306
_USE_BDB_save:=${USE_BDB}
295
# Dependence lines for different db versions
307
_WITH_BDB_VER_save:=${WITH_BDB_VER}
296
db40_DEPENDS=	libdb4.so:${PORTSDIR}/databases/db4
308
297
db41_DEPENDS=	libdb41.so:${PORTSDIR}/databases/db41
309
_DB_PORTS=		48 5 6
298
db42_DEPENDS=	libdb-4.2.so:${PORTSDIR}/databases/db42
310
_DB_DEFAULTS=	48 5	# does not include 6 due to different licensing
299
db43_DEPENDS=	libdb-4.3.so:${PORTSDIR}/databases/db43
311
#	but user can re-add it through WITH_BDB6_PERMITTED
300
db44_DEPENDS=	libdb-4.4.so:${PORTSDIR}/databases/db44
312
. if defined(WITH_BDB6_PERMITTED)
301
db46_DEPENDS=	libdb-4.6.so:${PORTSDIR}/databases/db46
313
_DB_DEFAULTS+=	6
302
db47_DEPENDS=	libdb-4.7.so:${PORTSDIR}/databases/db47
314
. endif
315
316
# Dependency lines for different db versions
303
db48_DEPENDS=	libdb-4.8.so:${PORTSDIR}/databases/db48
317
db48_DEPENDS=	libdb-4.8.so:${PORTSDIR}/databases/db48
304
db5_DEPENDS=	libdb-5.3.so:${PORTSDIR}/databases/db5
318
db5_DEPENDS=	libdb-5.3.so:${PORTSDIR}/databases/db5
305
db6_DEPENDS=	libdb-6.1.so:${PORTSDIR}/databases/db6
319
db6_DEPENDS=	libdb-6.1.so:${PORTSDIR}/databases/db6
306
# Detect db versions by finding some files
320
# Detect db versions by finding some files
307
db40_FIND=	${LOCALBASE}/include/db4/db.h
308
db41_FIND=	${LOCALBASE}/include/db41/db.h
309
db42_FIND=	${LOCALBASE}/include/db42/db.h
310
db43_FIND=	${LOCALBASE}/include/db43/db.h
311
db44_FIND=	${LOCALBASE}/include/db44/db.h
312
db46_FIND=	${LOCALBASE}/include/db46/db.h
313
db47_FIND=	${LOCALBASE}/include/db47/db.h
314
db48_FIND=	${LOCALBASE}/include/db48/db.h
321
db48_FIND=	${LOCALBASE}/include/db48/db.h
315
db5_FIND=	${LOCALBASE}/include/db5/db.h
322
db5_FIND=	${LOCALBASE}/include/db5/db.h
316
db6_FIND=	${LOCALBASE}/include/db6/db.h
323
db6_FIND=	${LOCALBASE}/include/db6/db.h
317
324
318
# For specifying [40, 41, ..]+
319
_DB_40P=	40 ${_DB_41P}
320
_DB_41P=	41 ${_DB_42P}
321
_DB_42P=	42 ${_DB_43P}
322
_DB_43P=	43 ${_DB_44P}
323
_DB_44P=	44 ${_DB_46P}
324
_DB_46P=	46 ${_DB_47P}
325
_DB_47P=	47 ${_DB_48P}
326
_DB_48P=	48 ${_DB_5P}
327
_DB_5P=		5 ${_DB_6P}
328
_DB_6P=		6
329
330
# Override the global WITH_BDB_VER with the
325
# Override the global WITH_BDB_VER with the
331
# port specific <UNIQUENAME>_WITH_BDB_VER
326
# port specific <UNIQUENAME>_WITH_BDB_VER
332
.if defined(${UNIQUENAME:tu:S,-,_,}_WITH_BDB_VER)
327
.if defined(${UNIQUENAME:tu:S,-,_,}_WITH_BDB_VER)
Lines 333-485 Link Here
333
WITH_BDB_VER=	${${UNIQUENAME:tu:S,-,_,}_WITH_BDB_VER}
328
WITH_BDB_VER=	${${UNIQUENAME:tu:S,-,_,}_WITH_BDB_VER}
334
.endif
329
.endif
335
330
331
# Override USE_BDB with global WITH_BDB_VER
336
.if defined(WITH_BDB_VER)
332
.if defined(WITH_BDB_VER)
337
. if ${WITH_BDB_VER} == 4
333
. if ${WITH_BDB_VER} != 1
338
USE_BDB=	40
339
. elif ${WITH_BDB_VER} != 1
340
USE_BDB=	${WITH_BDB_VER}
334
USE_BDB=	${WITH_BDB_VER}
341
. endif
335
. endif
342
.endif
336
.endif
343
_WANT_BDB_VER=	${USE_BDB}
344
337
345
# Assume the default bdb version as 41
338
# Override USE_BDB with maintainer's WANT_BDB_VER
346
.if ${USE_BDB:tl} == "yes"
339
.if defined(WANT_BDB_VER)
347
_WANT_BDB_VER=	41+
340
USE_BDB=	${WANT_BDB_VER}
348
.endif
341
.endif
349
342
350
# Detect bdb version
343
# Compatiblity hack:
351
_BDB_VER=	no
344
# upgrade older plussed versions to 48+
352
_BDB_IGNORE=	no
345
_BDB_OLDPLUSVERS=4+ 40+ 41+ 42+ 43+ 44+ 45+ 46+ 47+
346
.for i in ${USE_BDB}
347
. if ${_BDB_OLDPLUSVERS:M${i}}
348
USE_BDB:=	48+
349
. endif
350
.endfor
353
351
354
# Override the user defined WITH_BDB_VER with the WANT_BDB_VER
352
.if ${USE_BDB} == yes
355
.if defined(WANT_BDB_VER)
353
USE_BDB:=	48+
354
.endif
355
356
# 1. detect installed versions
357
_INST_BDB_VER=
356
.for bdb in ${_DB_PORTS}
358
.for bdb in ${_DB_PORTS}
357
.if ${WANT_BDB_VER} == "${bdb}" && ${_BDB_VER} == "no"
359
. if exists(${db${bdb}_FIND})
358
_BDB_VER=	${WANT_BDB_VER}
360
_INST_BDB_VER+=${bdb}
359
.endif
361
. endif
360
.endfor
362
.endfor
361
USE_BDB=	${WANT_BDB_VER}
363
364
# 2. parse supported versions:
365
# 2a. build list from USE_BDB
366
_SUPP_BDB_VER=
367
_USE_BDB:=${USE_BDB:C,\+$,,:C/(.)(.)$/\1.\2/}
368
.if !empty(USE_BDB:M*+)
369
. for bdb in ${_DB_PORTS:C/(.)(.)$/\1.\2/}
370
.  if ${_USE_BDB} <= ${bdb}
371
_SUPP_BDB_VER+=${bdb:C/\.//}
372
.  endif
373
. endfor
362
.else
374
.else
363
.for bdb in ${_DB_PORTS}
375
_SUPP_BDB_VER=${USE_BDB}
364
.if ${_WANT_BDB_VER} == "${bdb}" && ${_BDB_VER} == "no"
376
.endif
365
_MATCHED_DB_VER:=	${bdb:S/+//}
377
# 2b. expand INVALID_BDB_VER if given with "+":
366
. if ${_MATCHED_DB_VER} == "${bdb}"
378
.if !empty(INVALID_BDB_VER:M*+)
367
# USE_BDB is exactly specified
379
_INV_BDB:=${INVALID_BDB_VER:C,\+$,,:C/(.)(.)$/\1.\2/}
368
_BDB_VER=	${bdb}
380
_INV_BDB_VER:=
381
. for bdb in ${_DB_PORTS:C/(.)(.)$/\1.\2/}
382
.  if ${_INV_BDB} <= ${bdb}
383
_INV_BDB_VER+=${bdb:C/\.//}
384
.  endif
385
. endfor
369
.else
386
.else
370
# USE_BDB is specified as VER+
387
_INV_BDB_VER:=${INVALID_BDB_VER}
371
.  for dbx in ${_DB_${_MATCHED_DB_VER}P}
372
.   if exists(${db${dbx}_FIND})
373
_BRKDB=	no
374
# Skip versions we are incompatible with
375
.    if defined(INVALID_BDB_VER)
376
_CHK_BDB:=	${dbx}
377
.     for BRKDB in ${INVALID_BDB_VER}
378
.      if ${_CHK_BDB} == "${BRKDB}"
379
_BRKDB= yes
380
.      endif
381
.     endfor
382
.    endif
383
.    if ${_BRKDB} == no
384
.     if defined(WITH_BDB_HIGHEST)
385
# Use the highest version of Berkeley DB found
386
_BDB_VER=	${dbx}
387
.     elif ${_BDB_VER} == no
388
# Use the first Berkeley DB found
389
_BDB_VER=	${dbx}
390
.     endif
391
.    endif
392
.   endif
393
.  endfor
394
.  if ${_BDB_VER} == "no"
395
# No existing db4 version is detected in system
396
_BDB_VER=	${_MATCHED_DB_VER}
397
.  endif
398
. endif
399
.endif
388
.endif
389
# 2c. strip versions from INVALID_BDB_VER out of _SUPP_BDB_VER
390
.for unsupp in ${_INV_BDB_VER}
391
_SUPP_BDB_VER:=${_SUPP_BDB_VER:N${unsupp}}
400
.endfor
392
.endfor
393
394
# 3a. calculate intersection in _INST_BDB_VER to see if there
395
# is a usable installed version
396
.for i in ${_INST_BDB_VER}
397
. if empty(_SUPP_BDB_VER:M${i})
398
_INST_BDB_VER:=	${_INST_BDB_VER:N${i}}
399
. endif
400
.endfor
401
_ELIGIBLE_BDB_VER:=${_INST_BDB_VER}
402
403
# 3b. if there is no usable version installed, check defaults
404
.if empty(_INST_BDB_VER)
405
_DFLT_BDB_VER:=${_DB_DEFAULTS}
406
# make sure we use a reasonable version for package builds
407
_WITH_BDB_HIGHEST=yes
408
. for i in ${_DFLT_BDB_VER}
409
.  if empty(_SUPP_BDB_VER:M${i})
410
_DFLT_BDB_VER:=	${_DFLT_BDB_VER:N${i}}
411
.  endif
412
. endfor
413
_ELIGIBLE_BDB_VER:=${_DFLT_BDB_VER}
401
.endif
414
.endif
402
415
403
# USE_BDB is specified incorrectly, so mark this as IGNORE
416
# 4. elect a version
404
.if ${_BDB_VER} == "no"
417
_BDB_VER=
405
IGNORE=		cannot install: unknown Berkeley DB version: ${USE_BDB}
418
.for i in ${_ELIGIBLE_BDB_VER}
419
. if !empty(WITH_BDB_HIGHEST) || !empty(_WITH_BDB_HIGHEST) || empty(${_BDB_VER})
420
_BDB_VER:=${i}
421
. endif
422
.endfor
423
424
# 5. catch errors or set variables
425
.if empty(_BDB_VER)
426
IGNORE=		cannot install: no eligible BerkeleyDB version. Requested: ${USE_BDB}, incompatible: ${_INV_BDB_VER}. Try: make debug-bdb
406
.else
427
.else
407
# Now check if we can use it
428
. if defined(BDB_BUILD_DEPENDS)
408
. if defined(INVALID_BDB_VER)
429
BUILD_DEPENDS+=	${db${_BDB_VER}_FIND}:${db${_BDB_VER}_DEPENDS:C/^libdb.*://}
409
.  for VER in ${INVALID_BDB_VER}
410
_CHK_PLUS:=	${VER:S/+//}
411
# INVALID_BDB_VER is specified as VER+
412
.   if ${_CHK_PLUS}  != "${VER}"
413
.    if ${_BDB_VER} == "${_CHK_PLUS}"
414
_BDB_IGNORE=	yes
415
.    else
416
.     for VER_P in ${_DB_${_CHK_PLUS}P}
417
.      if ${_BDB_VER} == "${VER_P}"
418
_BDB_IGNORE=	yes
419
.      endif
420
.     endfor
421
.    endif
422
.   elif ${_BDB_VER} == "${VER}"
423
_BDB_IGNORE=	yes
424
.   endif
425
.  endfor
426
. endif
427
. if ${_BDB_IGNORE} == "yes"
428
IGNORE=		cannot install: does not work with Berkeley DB version ${_BDB_VER} (${INVALID_BDB_VER} not supported)
429
. else
430
. else
430
# Now add the dependency on Berkeley DB ${_BDB_VER) version
431
# This is for ports that want to link Berkeley DB statically, such
432
# as devel/subversion, if the corresponding option is active:
433
.if defined(BDB_BUILD_DEPENDS)
434
BUILD_DEPENDS+=	${db${_BDB_VER}_FIND}:${db${_BDB_VER}_DEPENDS:C/^libdb.*://}
435
.else
436
LIB_DEPENDS+=	${db${_BDB_VER}_DEPENDS}
431
LIB_DEPENDS+=	${db${_BDB_VER}_DEPENDS}
437
.endif
432
. endif
438
.  if ${_BDB_VER} == 40
433
. if ${_BDB_VER} == 48
439
BDB_LIB_NAME=		db4
440
BDB_LIB_CXX_NAME=	db4_cxx
441
BDB_INCLUDE_DIR=	${LOCALBASE}/include/db4
442
.  elif ${_BDB_VER} == 42
443
BDB_LIB_NAME=		db-4.2
444
BDB_LIB_CXX_NAME=	db_cxx-4.2
445
BDB_LIB_DIR=		${LOCALBASE}/lib/db42
446
.  elif ${_BDB_VER} == 43
447
BDB_LIB_NAME=		db-4.3
448
BDB_LIB_CXX_NAME=	db_cxx-4.3
449
BDB_LIB_DIR=		${LOCALBASE}/lib/db43
450
.  elif ${_BDB_VER} == 44
451
BDB_LIB_NAME=		db-4.4
452
BDB_LIB_CXX_NAME=	db_cxx-4.4
453
BDB_LIB_DIR=		${LOCALBASE}/lib/db44
454
.  elif ${_BDB_VER} == 46
455
BDB_LIB_NAME=		db-4.6
456
BDB_LIB_CXX_NAME=	db_cxx-4.6
457
BDB_LIB_DIR=		${LOCALBASE}/lib/db46
458
.  elif ${_BDB_VER} == 47
459
BDB_LIB_NAME=		db-4.7
460
BDB_LIB_CXX_NAME=	db_cxx-4.7
461
BDB_LIB_DIR=		${LOCALBASE}/lib/db47
462
.  elif ${_BDB_VER} == 48
463
BDB_LIB_NAME=		db-4.8
434
BDB_LIB_NAME=		db-4.8
464
BDB_LIB_CXX_NAME=	db_cxx-4.8
435
BDB_LIB_CXX_NAME=	db_cxx-4.8
465
BDB_LIB_DIR=		${LOCALBASE}/lib/db48
436
BDB_LIB_DIR=		${LOCALBASE}/lib/db48
466
.  elif ${_BDB_VER} == 5
437
. elif ${_BDB_VER} == 5
467
BDB_LIB_NAME=		db-5.3
438
BDB_LIB_NAME=		db-5.3
468
BDB_LIB_CXX_NAME=	db_cxx-5.3
439
BDB_LIB_CXX_NAME=	db_cxx-5.3
469
BDB_LIB_DIR=		${LOCALBASE}/lib/db5
440
BDB_LIB_DIR=		${LOCALBASE}/lib/db5
470
.  elif ${_BDB_VER} == 6
441
. elif ${_BDB_VER} == 6
471
BDB_LIB_NAME=		db-6.1
442
BDB_LIB_NAME=		db-6.1
472
BDB_LIB_CXX_NAME=	db_cxx-6.1
443
BDB_LIB_CXX_NAME=	db_cxx-6.1
473
BDB_LIB_DIR=		${LOCALBASE}/lib/db6
444
BDB_LIB_DIR=		${LOCALBASE}/lib/db6
474
.  endif
445
. endif
475
BDB_LIB_NAME?=		db${_BDB_VER}
446
BDB_LIB_NAME?=		db${_BDB_VER}
476
BDB_LIB_CXX_NAME?=	db${_BDB_VER}_cxx
447
BDB_LIB_CXX_NAME?=	db${_BDB_VER}_cxx
477
BDB_INCLUDE_DIR?=	${LOCALBASE}/include/db${_BDB_VER}
448
BDB_INCLUDE_DIR?=	${LOCALBASE}/include/db${_BDB_VER}
478
BDB_LIB_DIR?=		${LOCALBASE}/lib
449
BDB_LIB_DIR?=		${LOCALBASE}/lib
479
. endif
450
.endif
480
BDB_VER=	${_BDB_VER}
451
BDB_VER=	${_BDB_VER}
481
.endif
482
452
453
debug-bdb:
454
	@${ECHO_CMD} "--INPUTS----------------------------------------------------"
455
	@${ECHO_CMD} "${UNIQUENAME:tu:S,-,_,}_WITH_BDB_VER: ${${UNIQUENAME:tu:S,-,_,}_WITH_BDB_VER}"
456
	@${ECHO_CMD} "WITH_BDB_VER: ${_WITH_BDB_VER_save}"
457
	@${ECHO_CMD} "WANT_BDB_VER: ${WANT_BDB_VER}"
458
	@${ECHO_CMD} "BDB_BUILD_DEPENDS: ${BDB_BUILD_DEPENDS}"
459
	@${ECHO_CMD} "USE_BDB (original): ${_USE_BDB_save}"
460
	@${ECHO_CMD} "WITH_BDB_HIGHEST (original): ${WITH_BDB_HIGHEST}"
461
	@${ECHO_CMD} "--PROCESSING------------------------------------------------"
462
	@${ECHO_CMD} "supported versions: ${_SUPP_BDB_VER}"
463
	@${ECHO_CMD} "invalid versions: ${_INV_BDB_VER}"
464
	@${ECHO_CMD} "installed versions: ${_INST_BDB_VER}"
465
	@${ECHO_CMD} "eligible versions: ${_ELIGIBLE_BDB_VER}"
466
	@${ECHO_CMD} "USE_BDB (effective): ${USE_BDB}"
467
	@${ECHO_CMD} "WITH_BDB_HIGHEST (override): ${_WITH_BDB_HIGHEST}"
468
	@${ECHO_CMD} "--OUTPUTS---------------------------------------------------"
469
	@${ECHO_CMD} "IGNORE=${IGNORE}"
470
	@${ECHO_CMD} "BDB_VER=${BDB_VER}"
471
	@${ECHO_CMD} "BDB_INCLUDE_DIR=${BDB_INCLUDE_DIR}"
472
	@${ECHO_CMD} "BDB_LIB_NAME=${BDB_LIB_NAME}"
473
	@${ECHO_CMD} "BDB_LIB_CXX_NAME=${BDB_LIB_CXX_NAME}"
474
	@${ECHO_CMD} "BDB_LIB_DIR=${BDB_LIB_DIR}"
475
	@${ECHO_CMD} "BUILD_DEPENDS=${BUILD_DEPENDS:M*/databases/db*}"
476
	@${ECHO_CMD} "LIB_DEPENDS=${LIB_DEPENDS:M*/databases/db*}"
477
	@${ECHO_CMD} "------------------------------------------------------------"
478
483
# Obsolete variables - ports can define these to want users about
479
# Obsolete variables - ports can define these to want users about
484
# variables that may be in /etc/make.conf but that are no longer
480
# variables that may be in /etc/make.conf but that are no longer
485
# effective:
481
# effective:
(-)databases/Makefile (-10 lines)
Lines 38-53 Link Here
38
    SUBDIR += cyrus-imspd
38
    SUBDIR += cyrus-imspd
39
    SUBDIR += dalmp
39
    SUBDIR += dalmp
40
    SUBDIR += datamodeler
40
    SUBDIR += datamodeler
41
    SUBDIR += db
42
    SUBDIR += db4
43
    SUBDIR += db41
44
    SUBDIR += db41-nocrypto
45
    SUBDIR += db42
46
    SUBDIR += db42-nocrypto
47
    SUBDIR += db43
48
    SUBDIR += db44
49
    SUBDIR += db46
50
    SUBDIR += db47
51
    SUBDIR += db48
41
    SUBDIR += db48
52
    SUBDIR += db4o-mono
42
    SUBDIR += db4o-mono
53
    SUBDIR += db5
43
    SUBDIR += db5
(-)databases/db4/Makefile (-48 lines)
Lines 1-48 Link Here
1
# Created by: Sergey Osokin aka oZZ <ozz@FreeBSD.org.ru>
2
# $FreeBSD$
3
4
PORTNAME=	db4
5
PORTVERSION=	4.0.14
6
PORTREVISION=	1
7
PORTEPOCH=	1
8
CATEGORIES=	databases
9
MASTER_SITES=	http://download.oracle.com/berkeley-db/ 
10
DISTNAME=	db-${PORTVERSION}
11
DIST_SUBDIR=	bdb
12
13
DEPRECATED=	Please use databases/db5 or db6 for new installs.
14
15
MAINTAINER= ports@FreeBSD.org
16
COMMENT=	The Berkeley DB package, revision 4
17
18
WRKSRC=		${WRKDIR}/${DISTNAME}/build_unix
19
20
GNU_CONFIGURE=	yes
21
CONFIGURE_SCRIPT=	../dist/configure
22
CONFIGURE_ARGS=	--enable-compat185 --enable-dump185 \
23
		--enable-cxx --enable-dynamic \
24
		--includedir=${PREFIX}/include/db4
25
USE_LDCONFIG=	yes
26
27
OPTIONS_DEFINE=	DOCS
28
29
.include <bsd.port.options.mk>
30
31
.if ${PORT_OPTIONS:MDOCS}
32
INSTALL_TARGET=	install install_docs
33
PORTDOCS=	*
34
.endif
35
36
# the db install_docs target installs an empty directory, kill it
37
NO_STAGE=	yes
38
# (it's not packaged and it's not needed):
39
.if ${PORT_OPTIONS:MDOCS}
40
post-install:
41
	@${RMDIR} ${PREFIX}/share/doc/db4/ref/splash
42
.endif
43
44
post-patch:
45
	@${REINPLACE_CMD} -Ee \
46
		's|-l?pthread|${PTHREAD_LIBS}|g' ${WRKSRC}/${CONFIGURE_SCRIPT}
47
48
.include <bsd.port.mk>
(-)databases/db4/distinfo (-2 lines)
Lines 1-2 Link Here
1
SHA256 (bdb/db-4.0.14.tar.gz) = a7d983d88b7ba43cfd9a39bfcb0f3f489b15e4b113452e94b7c4bbca0225b7f5
2
SIZE (bdb/db-4.0.14.tar.gz) = 2701799
(-)databases/db4/files/patch-dist__Makefile.in (-144 lines)
Lines 1-144 Link Here
1
--- ../dist/Makefile.in.orig	Sat Nov 10 07:48:45 2001
2
+++ ../dist/Makefile.in	Sat Nov  9 17:36:00 2002
3
@@ -11,7 +11,7 @@
4
 bindir=	@bindir@
5
 includedir=@includedir@
6
 libdir=	@libdir@
7
-docdir=	$(prefix)/docs
8
+docdir=	$(prefix)/share/doc/db4
9
 
10
 dmode=	755
11
 emode=	555
12
@@ -45,6 +45,7 @@
13
 SOLINK=		@MAKEFILE_SOLINK@
14
 SOFLAGS=	@SOFLAGS@
15
 SOMAJOR=	@DB_VERSION_MAJOR@
16
+SOMINOR=	@DB_VERSION_MINOR@
17
 SOVERSION=	@DB_VERSION_MAJOR@.@DB_VERSION_MINOR@
18
 
19
 ##################################################
20
@@ -60,13 +61,13 @@
21
 LIBS=		@LIBS@
22
 LIBSO_LIBS=	@LIBSO_LIBS@
23
 
24
-libdb=		libdb.a
25
-libso_base=	libdb
26
-libso=		$(libso_base)-$(SOVERSION).@SOSUFFIX@
27
-libso_static=	$(libso_base)-$(SOVERSION).a
28
-libso_target=	$(libso_base)-$(SOVERSION).la
29
+libdb=		libdb4.a
30
+libso_base=	libdb4
31
+libso=		$(libso_base).@SOSUFFIX@
32
+libso_static=	$(libso_base).a
33
+libso_target=	$(libso_base).la
34
 libso_default=	$(libso_base).@SOSUFFIX@
35
-libso_major=	$(libso_base)-$(SOMAJOR).@SOSUFFIX@
36
+libso_major=	$(libso_base).@SOSUFFIX@.$(SOMINOR)
37
 
38
 ##################################################
39
 # C++ API.
40
@@ -79,13 +80,13 @@
41
 XSOLINK=	@MAKEFILE_XSOLINK@
42
 LIBXSO_LIBS=	@LIBXSO_LIBS@
43
 
44
-libcxx=		libdb_cxx.a
45
-libxso_base=	libdb_cxx
46
-libxso=		$(libxso_base)-$(SOVERSION).@SOSUFFIX@
47
-libxso_static=	$(libxso_base)-$(SOVERSION).a
48
-libxso_target=	$(libxso_base)-$(SOVERSION).la
49
+libcxx=		libdb4_cxx.a
50
+libxso_base=	libdb4_cxx
51
+libxso=		$(libxso_base).@SOSUFFIX@
52
+libxso_static=	$(libxso_base).a
53
+libxso_target=	$(libxso_base).la
54
 libxso_default=	$(libxso_base).@SOSUFFIX@
55
-libxso_major=	$(libxso_base)-$(SOMAJOR).@SOSUFFIX@
56
+libxso_major=	$(libxso_base).@SOSUFFIX@.$(SOMINOR)
57
 
58
 ##################################################
59
 # Java API.
60
@@ -235,8 +236,8 @@
61
 	db_server_proc@o@ db_server_svc@o@ db_server_util@o@ gen_db_server@o@
62
 
63
 UTIL_PROGS=\
64
-	@ADDITIONAL_PROGS@ db_archive db_checkpoint db_deadlock \
65
-	db_dump db_load db_printlog db_recover db_stat db_upgrade db_verify
66
+	@ADDITIONAL_PROGS@ db4_archive db4_checkpoint db4_deadlock \
67
+	db4_dump db4_load db4_printlog db4_recover db4_stat db4_upgrade db4_verify
68
 
69
 ##################################################
70
 # List of files installed into the library directory.
71
@@ -330,53 +331,53 @@
72
 	    $(RPC_SRV_OBJS) util_log@o@ $(DEF_LIB) $(LIBS)
73
 	$(POSTLINK) $@
74
 
75
-db_archive: db_archive@o@ util_sig@o@ $(DEF_LIB)
76
+db4_archive: db_archive@o@ util_sig@o@ $(DEF_LIB)
77
 	$(CCLINK) -o $@ $(LDFLAGS) \
78
 	    db_archive@o@ util_sig@o@ $(DEF_LIB) $(LIBS)
79
 	$(POSTLINK) $@
80
 
81
-db_checkpoint: db_checkpoint@o@ util_log@o@ util_sig@o@ $(DEF_LIB)
82
+db4_checkpoint: db_checkpoint@o@ util_log@o@ util_sig@o@ $(DEF_LIB)
83
 	$(CCLINK) -o $@ $(LDFLAGS) \
84
 	    db_checkpoint@o@ util_log@o@ util_sig@o@ $(DEF_LIB) $(LIBS)
85
 	$(POSTLINK) $@
86
 
87
-db_deadlock: db_deadlock@o@ util_log@o@ util_sig@o@ $(DEF_LIB)
88
+db4_deadlock: db_deadlock@o@ util_log@o@ util_sig@o@ $(DEF_LIB)
89
 	$(CCLINK) -o $@ $(LDFLAGS) \
90
 	    db_deadlock@o@ util_log@o@ util_sig@o@ $(DEF_LIB) $(LIBS)
91
 	$(POSTLINK) $@
92
 
93
-db_dump: db_dump@o@ util_sig@o@ $(DEF_LIB)
94
+db4_dump: db_dump@o@ util_sig@o@ $(DEF_LIB)
95
 	$(CCLINK) -o $@ $(LDFLAGS) db_dump@o@ util_sig@o@ $(DEF_LIB) $(LIBS)
96
 	$(POSTLINK) $@
97
 
98
-db_dump185: db_dump185@o@ @LIBOBJS@
99
+db4_dump185: db_dump185@o@ @LIBOBJS@
100
 	$(CCLINK) -o $@ $(LDFLAGS) db_dump185@o@ @LIBOBJS@ $(DB185LIB)
101
 	$(POSTLINK) $@
102
 
103
-db_load: db_load@o@ util_sig@o@ $(DEF_LIB)
104
+db4_load: db_load@o@ util_sig@o@ $(DEF_LIB)
105
 	$(CCLINK) -o $@ $(LDFLAGS) db_load@o@ util_sig@o@ $(DEF_LIB) $(LIBS)
106
 	$(POSTLINK) $@
107
 
108
-db_printlog: db_printlog@o@ util_sig@o@ $(DEF_LIB)
109
+db4_printlog: db_printlog@o@ util_sig@o@ $(DEF_LIB)
110
 	$(CCLINK) -o $@ $(LDFLAGS) \
111
 	    db_printlog@o@ util_sig@o@ $(DEF_LIB) $(LIBS)
112
 	$(POSTLINK) $@
113
 
114
-db_recover: db_recover@o@ util_sig@o@ $(DEF_LIB)
115
+db4_recover: db_recover@o@ util_sig@o@ $(DEF_LIB)
116
 	$(CCLINK) -o $@ $(LDFLAGS) \
117
 	    db_recover@o@ util_sig@o@ $(DEF_LIB) $(LIBS)
118
 	$(POSTLINK) $@
119
 
120
-db_stat: db_stat@o@ util_sig@o@ $(DEF_LIB)
121
+db4_stat: db_stat@o@ util_sig@o@ $(DEF_LIB)
122
 	$(CCLINK) -o $@ $(LDFLAGS) db_stat@o@ util_sig@o@ $(DEF_LIB) $(LIBS)
123
 	$(POSTLINK) $@
124
 
125
-db_upgrade: db_upgrade@o@ util_sig@o@ $(DEF_LIB)
126
+db4_upgrade: db_upgrade@o@ util_sig@o@ $(DEF_LIB)
127
 	$(CCLINK) -o $@ $(LDFLAGS) \
128
 	    db_upgrade@o@ util_sig@o@ $(DEF_LIB) $(LIBS)
129
 	$(POSTLINK) $@
130
 
131
-db_verify: db_verify@o@ util_sig@o@ $(DEF_LIB)
132
+db4_verify: db_verify@o@ util_sig@o@ $(DEF_LIB)
133
 	$(CCLINK) -o $@ $(LDFLAGS) \
134
 	    db_verify@o@ util_sig@o@ $(DEF_LIB) $(LIBS)
135
 	$(POSTLINK) $@
136
@@ -385,7 +386,7 @@
137
 # Library and standard utilities install.
138
 ##################################################
139
 library_install: install_setup
140
-library_install: install_include install_lib install_utilities install_docs
141
+library_install: install_include install_lib install_utilities
142
 
143
 uninstall: uninstall_include uninstall_lib uninstall_utilities uninstall_docs
144
 
(-)databases/db4/files/patch-dist__configure (-24 lines)
Lines 1-24 Link Here
1
--- ../dist/configure.orig	Wed Dec  5 13:14:02 2001
2
+++ ../dist/configure	Wed Dec  5 13:24:01 2001
3
@@ -8794,10 +8794,10 @@
4
 INSTALLER="\$(LIBTOOL) --mode=install cp"
5
 
6
 MAKEFILE_CC="\$(LIBTOOL) --mode=compile ${MAKEFILE_CC}"
7
-MAKEFILE_SOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK} -avoid-version"
8
+MAKEFILE_SOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK} -version-info ${DB_VERSION_MINOR}"
9
 MAKEFILE_CCLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK}"
10
 MAKEFILE_CXX="\$(LIBTOOL) --mode=compile ${MAKEFILE_CXX}"
11
-MAKEFILE_XSOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK} -avoid-version"
12
+MAKEFILE_XSOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK} -version-info ${DB_VERSION_MINOR}"
13
 MAKEFILE_CXXLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK}"
14
 
15
 # Configure for shared libraries, static libraries, or both.  If both are
16
@@ -9511,7 +9511,7 @@
17
 
18
 # Optional utilities.
19
 if test "$db_cv_dump185" = "yes"; then
20
-	ADDITIONAL_PROGS="db_dump185 $ADDITIONAL_PROGS"
21
+	ADDITIONAL_PROGS="db4_dump185 $ADDITIONAL_PROGS"
22
 fi
23
 
24
 # Checks for system/compiler characteristics.
(-)databases/db4/files/patch-dist__ltmain.sh (-32 lines)
Lines 1-32 Link Here
1
--- ../dist/ltmain.sh.orig	Sat Nov 17 01:15:01 2001
2
+++ ../dist/ltmain.sh	Sat Nov  9 17:08:02 2002
3
@@ -1043,14 +1043,14 @@
4
 	    # These systems don't actually have a C library (as such)
5
 	    test "X$arg" = "X-lc" && continue
6
 	    ;;
7
-	  *-*-openbsd*)
8
+	  *-*-openbsd* | *-*-freebsd*)
9
 	    # Do not include libc due to us having libc/libc_r.
10
 	    test "X$arg" = "X-lc" && continue
11
 	    ;;
12
 	  esac
13
 	 elif test "X$arg" = "X-lc_r"; then
14
 	  case $host in
15
-	  *-*-openbsd*)
16
+	  *-*-openbsd* | *-*-freebsd*)
17
 	    # Do not include libc_r directly, use -pthread flag.
18
 	    continue
19
 	    ;;
20
@@ -4217,10 +4217,12 @@
21
 	fi
22
 
23
 	# Install the pseudo-library for information purposes.
24
+	if /usr/bin/false; then
25
 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
26
 	instname="$dir/$name"i
27
 	$show "$install_prog $instname $destdir/$name"
28
 	$run eval "$install_prog $instname $destdir/$name" || exit $?
29
+	fi
30
 
31
 	# Maybe install the static library, too.
32
 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
(-)databases/db4/files/patch-objformat (-11 lines)
Lines 1-11 Link Here
1
--- ../dist/configure.foo	Sun Feb  4 14:10:01 2007
2
+++ ../dist/configure	Sun Feb  4 14:11:26 2007
3
@@ -7002,7 +7002,7 @@
4
   ;;
5
 
6
 freebsd*)
7
-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
8
+  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
9
   version_type=freebsd-$objformat
10
   case $version_type in
11
     freebsd-elf*)
(-)databases/db4/pkg-descr (-10 lines)
Lines 1-10 Link Here
1
Version 4 of the Berkeley DB library. This version uses an underlying
2
database format incompatible with revision 1 and a different standard API.
3
Utilities are included in the distribution to convert v1.85 databases to v4
4
databases, and a backwards compatible API is provided to maintain
5
compatibility with programs using the v1.85 interface.
6
7
For details on compatibility with other DB versions, see:
8
http://www.sleepycat.com/download/patchlogs.shtml
9
10
WWW:	http://www.oracle.com/us/products/database/berkeley-db/db/
(-)databases/db4/pkg-plist (-23 lines)
Lines 1-23 Link Here
1
bin/db4_archive
2
bin/db4_checkpoint
3
bin/db4_deadlock
4
bin/db4_dump
5
bin/db4_dump185
6
bin/db4_load
7
bin/db4_printlog
8
bin/db4_recover
9
bin/db4_stat
10
bin/db4_upgrade
11
bin/db4_verify
12
include/db4/cxx_common.h
13
include/db4/cxx_except.h
14
include/db4/db.h
15
include/db4/db_185.h
16
include/db4/db_cxx.h
17
lib/libdb4.a
18
lib/libdb4.so
19
lib/libdb4.so.0
20
lib/libdb4_cxx.a
21
lib/libdb4_cxx.so
22
lib/libdb4_cxx.so.0
23
@dirrm include/db4
(-)databases/db41/Makefile (-51 lines)
Lines 1-51 Link Here
1
# Created by: Matthias Andree <matthias.andree@gmx.de>
2
# $FreeBSD$
3
4
PORTNAME=	db41
5
PORTVERSION=	4.1.25
6
PORTREVISION=	4
7
CATEGORIES=	databases
8
MASTER_SITES=	http://download.oracle.com/berkeley-db/
9
PKGNAMESUFFIX?=
10
DISTNAME?=	db-${PORTVERSION}
11
DIST_SUBDIR=	bdb
12
13
PATCH_SITES=	http://download.oracle.com/berkeley-db/patches/db/${PORTVERSION}/
14
PATCHFILES=	patch.${PORTVERSION}.2
15
PATCH_DIST_STRIP=	-d ${WRKDIR}/${DISTNAME}
16
17
MAINTAINER=	mandree@FreeBSD.org
18
COMMENT=	The Berkeley DB package, revision 4.1
19
20
CONFLICTS?=	db41-nocrypto-4*
21
22
DEPRECATED=	Please use databases/db5 or db6 for new installs.
23
24
WRKSRC=		${WRKDIR}/${DISTNAME}/build_unix
25
26
USES=		desthack
27
GNU_CONFIGURE=	yes
28
CONFIGURE_SCRIPT=	../dist/configure
29
CONFIGURE_ARGS=	--enable-compat185 --enable-dump185 \
30
		--enable-cxx --enable-dynamic \
31
		--includedir=${STAGEDIR}${PREFIX}/include/db41
32
USE_LDCONFIG=	yes
33
34
OPTIONS_DEFINE=	DOCS
35
36
.include <bsd.port.options.mk>
37
38
.if ${PORT_OPTIONS:MDOCS}
39
INSTALL_TARGET=	install install_docs
40
PORTDOCS=	*
41
.endif
42
43
.if ${ARCH} == amd64
44
CONFIGURE_ARGS+=	--with-mutex=x86/gcc-assembly
45
.endif
46
47
post-patch:
48
	@${REINPLACE_CMD} -Ee \
49
		's|-l?pthread|${PTHREAD_LIBS}|g' ${WRKSRC}/${CONFIGURE_SCRIPT}
50
51
.include <bsd.port.mk>
(-)databases/db41/distinfo (-4 lines)
Lines 1-4 Link Here
1
SHA256 (bdb/db-4.1.25.tar.gz) = 0d0644039b24f8eb823d0492f86bb8cd61fde36adbf85c52f4141fcbce05d9f3
2
SIZE (bdb/db-4.1.25.tar.gz) = 2901161
3
SHA256 (bdb/patch.4.1.25.2) = 391e652b0b6a1e2410a8e4b8d7e0ed0d53c9af549a29754e04532f390bee8f5d
4
SIZE (bdb/patch.4.1.25.2) = 18100
(-)databases/db41/files/patch-dist__Makefile.in (-144 lines)
Lines 1-144 Link Here
1
--- ../dist/Makefile.in.orig	Sat Aug 31 03:11:56 2002
2
+++ ../dist/Makefile.in	Sat Dec 28 01:15:46 2002
3
@@ -11,7 +11,7 @@
4
 bindir=	@bindir@
5
 includedir=@includedir@
6
 libdir=	@libdir@
7
-docdir=	$(prefix)/docs
8
+docdir=	$(prefix)/share/doc/db41
9
 
10
 dmode=	755
11
 emode=	555
12
@@ -45,6 +45,7 @@
13
 SOLINK=		@MAKEFILE_SOLINK@
14
 SOFLAGS=	@SOFLAGS@
15
 SOMAJOR=	@DB_VERSION_MAJOR@
16
+SOMINOR=	@DB_VERSION_MINOR@
17
 SOVERSION=	@DB_VERSION_MAJOR@.@DB_VERSION_MINOR@
18
 
19
 ##################################################
20
@@ -59,13 +60,13 @@
21
 LIBS=		@LIBS@
22
 LIBSO_LIBS=	@LIBSO_LIBS@
23
 
24
-libdb=		libdb.a
25
-libso_base=	libdb
26
-libso=		$(libso_base)-$(SOVERSION).@SOSUFFIX@
27
-libso_static=	$(libso_base)-$(SOVERSION).a
28
-libso_target=	$(libso_base)-$(SOVERSION).la
29
+libdb=		libdb41.a
30
+libso_base=	libdb41
31
+libso=		$(libso_base).@SOSUFFIX@
32
+libso_static=	$(libso_base).a
33
+libso_target=	$(libso_base).la
34
 libso_default=	$(libso_base).@SOSUFFIX@
35
-libso_major=	$(libso_base)-$(SOMAJOR).@SOSUFFIX@
36
+libso_major=	$(libso_base).@SOSUFFIX@.$(SOMINOR)
37
 
38
 ##################################################
39
 # C++ API.
40
@@ -78,13 +79,13 @@
41
 XSOLINK=	@MAKEFILE_XSOLINK@
42
 LIBXSO_LIBS=	@LIBXSO_LIBS@
43
 
44
-libcxx=		libdb_cxx.a
45
-libxso_base=	libdb_cxx
46
-libxso=		$(libxso_base)-$(SOVERSION).@SOSUFFIX@
47
-libxso_static=	$(libxso_base)-$(SOVERSION).a
48
-libxso_target=	$(libxso_base)-$(SOVERSION).la
49
+libcxx=		libdb41_cxx.a
50
+libxso_base=	libdb41_cxx
51
+libxso=		$(libxso_base).@SOSUFFIX@
52
+libxso_static=	$(libxso_base).a
53
+libxso_target=	$(libxso_base).la
54
 libxso_default=	$(libxso_base).@SOSUFFIX@
55
-libxso_major=	$(libxso_base)-$(SOMAJOR).@SOSUFFIX@
56
+libxso_major=	$(libxso_base).@SOSUFFIX@.$(SOMINOR)
57
 
58
 ##################################################
59
 # Java API.
60
@@ -364,8 +365,8 @@
61
 
62
 UTIL_PROGS=\
63
 	@ADDITIONAL_PROGS@ \
64
-	db_archive db_checkpoint db_deadlock \
65
-	db_dump db_load db_printlog db_recover db_stat db_upgrade db_verify
66
+	db41_archive db41_checkpoint db41_deadlock \
67
+	db41_dump db41_load db41_printlog db41_recover db41_stat db41_upgrade db41_verify
68
 
69
 ##################################################
70
 # List of files installed into the library directory.
71
@@ -481,53 +482,53 @@
72
 	echo >> $@ exec java com.sleepycat.db.rpcserver.DbServer \$$@
73
 	chmod +x $@
74
 
75
-db_archive: db_archive@o@ util_sig@o@ $(DEF_LIB)
76
+db41_archive: db_archive@o@ util_sig@o@ $(DEF_LIB)
77
 	$(CCLINK) -o $@ $(LDFLAGS) \
78
 	    db_archive@o@ util_sig@o@ $(DEF_LIB) $(LIBS)
79
 	$(POSTLINK) $@
80
 
81
-db_checkpoint: db_checkpoint@o@ util_log@o@ util_sig@o@ $(DEF_LIB)
82
+db41_checkpoint: db_checkpoint@o@ util_log@o@ util_sig@o@ $(DEF_LIB)
83
 	$(CCLINK) -o $@ $(LDFLAGS) \
84
 	    db_checkpoint@o@ util_log@o@ util_sig@o@ $(DEF_LIB) $(LIBS)
85
 	$(POSTLINK) $@
86
 
87
-db_deadlock: db_deadlock@o@ util_log@o@ util_sig@o@ $(DEF_LIB)
88
+db41_deadlock: db_deadlock@o@ util_log@o@ util_sig@o@ $(DEF_LIB)
89
 	$(CCLINK) -o $@ $(LDFLAGS) \
90
 	    db_deadlock@o@ util_log@o@ util_sig@o@ $(DEF_LIB) $(LIBS)
91
 	$(POSTLINK) $@
92
 
93
-db_dump: db_dump@o@ util_cache@o@ util_sig@o@ $(DEF_LIB)
94
+db41_dump: db_dump@o@ util_cache@o@ util_sig@o@ $(DEF_LIB)
95
 	$(CCLINK) -o $@ $(LDFLAGS) db_dump@o@ util_cache@o@ util_sig@o@ $(DEF_LIB) $(LIBS)
96
 	$(POSTLINK) $@
97
 
98
-db_dump185: db_dump185@o@ @LTLIBOBJS@
99
+db41_dump185: db_dump185@o@ @LTLIBOBJS@
100
 	$(CCLINK) -o $@ $(LDFLAGS) db_dump185@o@ @LTLIBOBJS@ $(DB185LIB)
101
 	$(POSTLINK) $@
102
 
103
-db_load: db_load@o@ util_cache@o@ util_sig@o@ $(DEF_LIB)
104
+db41_load: db_load@o@ util_cache@o@ util_sig@o@ $(DEF_LIB)
105
 	$(CCLINK) -o $@ $(LDFLAGS) db_load@o@ util_cache@o@ util_sig@o@ $(DEF_LIB) $(LIBS)
106
 	$(POSTLINK) $@
107
 
108
-db_printlog: db_printlog@o@ util_sig@o@ $(DEF_LIB)
109
+db41_printlog: db_printlog@o@ util_sig@o@ $(DEF_LIB)
110
 	$(CCLINK) -o $@ $(LDFLAGS) \
111
 	    db_printlog@o@ util_sig@o@ $(DEF_LIB) $(LIBS)
112
 	$(POSTLINK) $@
113
 
114
-db_recover: db_recover@o@ util_sig@o@ $(DEF_LIB)
115
+db41_recover: db_recover@o@ util_sig@o@ $(DEF_LIB)
116
 	$(CCLINK) -o $@ $(LDFLAGS) \
117
 	    db_recover@o@ util_sig@o@ $(DEF_LIB) $(LIBS)
118
 	$(POSTLINK) $@
119
 
120
-db_stat: db_stat@o@ util_cache@o@ util_sig@o@ $(DEF_LIB)
121
+db41_stat: db_stat@o@ util_cache@o@ util_sig@o@ $(DEF_LIB)
122
 	$(CCLINK) -o $@ $(LDFLAGS) db_stat@o@ util_cache@o@ util_sig@o@ $(DEF_LIB) $(LIBS)
123
 	$(POSTLINK) $@
124
 
125
-db_upgrade: db_upgrade@o@ util_sig@o@ $(DEF_LIB)
126
+db41_upgrade: db_upgrade@o@ util_sig@o@ $(DEF_LIB)
127
 	$(CCLINK) -o $@ $(LDFLAGS) \
128
 	    db_upgrade@o@ util_sig@o@ $(DEF_LIB) $(LIBS)
129
 	$(POSTLINK) $@
130
 
131
-db_verify: db_verify@o@ util_cache@o@ util_sig@o@ $(DEF_LIB)
132
+db41_verify: db_verify@o@ util_cache@o@ util_sig@o@ $(DEF_LIB)
133
 	$(CCLINK) -o $@ $(LDFLAGS) \
134
 	    db_verify@o@ util_cache@o@ util_sig@o@ $(DEF_LIB) $(LIBS)
135
 	$(POSTLINK) $@
136
@@ -536,7 +537,7 @@
137
 # Library and standard utilities install.
138
 ##################################################
139
 library_install: install_setup
140
-library_install: install_include install_lib install_utilities install_docs
141
+library_install: install_include install_lib install_utilities
142
 
143
 uninstall: uninstall_include uninstall_lib uninstall_utilities uninstall_docs
144
 
(-)databases/db41/files/patch-dist__configure (-24 lines)
Lines 1-24 Link Here
1
--- ../dist/configure.orig	Wed Dec  5 13:14:02 2001
2
+++ ../dist/configure	Wed Dec  5 13:24:01 2001
3
@@ -8794,10 +8794,10 @@
4
 INSTALLER="\$(LIBTOOL) --mode=install cp"
5
 
6
 MAKEFILE_CC="\$(LIBTOOL) --mode=compile ${MAKEFILE_CC}"
7
-MAKEFILE_SOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK} -avoid-version"
8
+MAKEFILE_SOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK} -version-info ${DB_VERSION_MINOR}"
9
 MAKEFILE_CCLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK}"
10
 MAKEFILE_CXX="\$(LIBTOOL) --mode=compile ${MAKEFILE_CXX}"
11
-MAKEFILE_XSOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK} -avoid-version"
12
+MAKEFILE_XSOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK} -version-info ${DB_VERSION_MINOR}"
13
 MAKEFILE_CXXLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK}"
14
 
15
 # Configure for shared libraries, static libraries, or both.  If both are
16
@@ -9511,7 +9511,7 @@
17
 
18
 # Optional utilities.
19
 if test "$db_cv_dump185" = "yes"; then
20
-	ADDITIONAL_PROGS="db_dump185 $ADDITIONAL_PROGS"
21
+	ADDITIONAL_PROGS="db41_dump185 $ADDITIONAL_PROGS"
22
 fi
23
 
24
 # Checks for system/compiler characteristics.
(-)databases/db41/files/patch-dist__ltmain.sh (-32 lines)
Lines 1-32 Link Here
1
--- ../dist/ltmain.sh.orig	Sat Nov 17 01:15:01 2001
2
+++ ../dist/ltmain.sh	Sat Nov  9 17:08:02 2002
3
@@ -1043,14 +1043,14 @@
4
 	    # These systems don't actually have a C library (as such)
5
 	    test "X$arg" = "X-lc" && continue
6
 	    ;;
7
-	  *-*-openbsd*)
8
+	  *-*-openbsd* | *-*-freebsd*)
9
 	    # Do not include libc due to us having libc/libc_r.
10
 	    test "X$arg" = "X-lc" && continue
11
 	    ;;
12
 	  esac
13
 	 elif test "X$arg" = "X-lc_r"; then
14
 	  case $host in
15
-	  *-*-openbsd*)
16
+	  *-*-openbsd* | *-*-freebsd*)
17
 	    # Do not include libc_r directly, use -pthread flag.
18
 	    continue
19
 	    ;;
20
@@ -4217,10 +4217,12 @@
21
 	fi
22
 
23
 	# Install the pseudo-library for information purposes.
24
+	if /usr/bin/false; then
25
 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
26
 	instname="$dir/$name"i
27
 	$show "$install_prog $instname $destdir/$name"
28
 	$run eval "$install_prog $instname $destdir/$name" || exit $?
29
+	fi
30
 
31
 	# Maybe install the static library, too.
32
 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
(-)databases/db41/files/patch-objformat (-11 lines)
Lines 1-11 Link Here
1
--- ../dist/configure.foo	Sun Feb  4 14:10:01 2007
2
+++ ../dist/configure	Sun Feb  4 14:11:26 2007
3
@@ -7002,7 +7002,7 @@
4
   ;;
5
 
6
 freebsd*)
7
-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
8
+  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
9
   version_type=freebsd-$objformat
10
   case $version_type in
11
     freebsd-elf*)
(-)databases/db41/files/patch-upstream.4.1.25.1 (-20 lines)
Lines 1-20 Link Here
1
*** ../fileops/fop_util.c	8 Jan 2003 05:01:56 -0000	1.57
2
--- ../fileops/fop_util.c	12 Jan 2003 19:44:29 -0000	1.58
3
***************
4
*** 40,46 ****
5
  	u_int32_t __lockval;						\
6
  									\
7
  	if (LOCKING_ON((ENV))) {					\
8
! 		__lockval = 0;						\
9
  		__dbt.data = &__lockval;				\
10
  		__dbt.size = sizeof(__lockval);				\
11
  		if ((ret = (ENV)->lock_get((ENV), (ID),			\
12
--- 40,46 ----
13
  	u_int32_t __lockval;						\
14
  									\
15
  	if (LOCKING_ON((ENV))) {					\
16
! 		__lockval = 1;						\
17
  		__dbt.data = &__lockval;				\
18
  		__dbt.size = sizeof(__lockval);				\
19
  		if ((ret = (ENV)->lock_get((ENV), (ID),			\
20
(-)databases/db41/files/patch-upstream.4.1.25.3 (-50 lines)
Lines 1-50 Link Here
1
*** ../mp/mp_fget.c.orig	2002-08-07 08:23:01.000000000 -0700
2
--- ../mp/mp_fget.c	2006-05-30 20:32:20.000000000 -0700
3
***************
4
*** 506,513 ****
5
  	 */
6
  	if (state != SECOND_MISS && bhp->ref == 1) {
7
  		bhp->priority = UINT32_T_MAX;
8
! 		SH_TAILQ_REMOVE(&hp->hash_bucket, bhp, hq, __bh);
9
! 		SH_TAILQ_INSERT_TAIL(&hp->hash_bucket, bhp, hq);
10
  		hp->hash_priority =
11
  		    SH_TAILQ_FIRST(&hp->hash_bucket, __bh)->priority;
12
  	}
13
--- 506,517 ----
14
  	 */
15
  	if (state != SECOND_MISS && bhp->ref == 1) {
16
  		bhp->priority = UINT32_T_MAX;
17
! 		/* Move the buffer if there are others in the bucket. */
18
! 		if (SH_TAILQ_FIRST(&hp->hash_bucket, __bh) != bhp
19
! 		    || SH_TAILQ_NEXT(bhp, hq, __bh) != NULL) {
20
! 			SH_TAILQ_REMOVE(&hp->hash_bucket, bhp, hq, __bh);
21
! 			SH_TAILQ_INSERT_TAIL(&hp->hash_bucket, bhp, hq);
22
! 		}
23
  		hp->hash_priority =
24
  		    SH_TAILQ_FIRST(&hp->hash_bucket, __bh)->priority;
25
  	}
26
*** ../mp/mp_fput.c.orig	2002-08-13 06:26:41.000000000 -0700
27
--- ../mp/mp_fput.c	2006-05-30 20:55:11.000000000 -0700
28
***************
29
*** 166,171 ****
30
--- 166,176 ----
31
  	 * to the correct position in the list.
32
  	 */
33
  	argbhp = bhp;
34
+ 	/* Move the buffer if there are others in the bucket. */
35
+ 	if (SH_TAILQ_FIRST(&hp->hash_bucket, __bh) == bhp
36
+ 	    && SH_TAILQ_NEXT(bhp, hq, __bh) != NULL)
37
+ 	    	goto done;
38
+ 
39
  	SH_TAILQ_REMOVE(&hp->hash_bucket, argbhp, hq, __bh);
40
  
41
  	prev = NULL;
42
***************
43
*** 178,183 ****
44
--- 183,189 ----
45
  	else
46
  		SH_TAILQ_INSERT_AFTER(&hp->hash_bucket, prev, argbhp, hq, __bh);
47
  
48
+ done:
49
  	/* Reset the hash bucket's priority. */
50
  	hp->hash_priority = SH_TAILQ_FIRST(&hp->hash_bucket, __bh)->priority;
(-)databases/db41/pkg-descr (-10 lines)
Lines 1-10 Link Here
1
Version 4.1 of the Berkeley DB library. This version uses an underlying
2
database format incompatible with revision 1 and a different standard API.
3
Utilities are included in the distribution to convert v1.85 databases to v4.1
4
databases, and a backwards compatible API is provided to maintain
5
compatibility with programs using the v1.85 interface.
6
7
For details on compatibility with other DB versions, see:
8
http://www.sleepycat.com/download/patchlogs.shtml
9
10
WWW: http://www.oracle.com/us/products/database/berkeley-db/db/
(-)databases/db41/pkg-plist (-23 lines)
Lines 1-23 Link Here
1
bin/db41_archive
2
bin/db41_checkpoint
3
bin/db41_deadlock
4
bin/db41_dump
5
bin/db41_dump185
6
bin/db41_load
7
bin/db41_printlog
8
bin/db41_recover
9
bin/db41_stat
10
bin/db41_upgrade
11
bin/db41_verify
12
include/db41/cxx_common.h
13
include/db41/cxx_except.h
14
include/db41/db.h
15
include/db41/db_185.h
16
include/db41/db_cxx.h
17
lib/libdb41.a
18
lib/libdb41.so
19
lib/libdb41.so.1
20
lib/libdb41_cxx.a
21
lib/libdb41_cxx.so
22
lib/libdb41_cxx.so.1
23
@dirrm include/db41
(-)databases/db41-nocrypto/Makefile (-12 lines)
Lines 1-12 Link Here
1
# Created by: Matthias Andree <matthias.andree@gmx.de>
2
# $FreeBSD$
3
4
PKGNAMESUFFIX=	-nocrypto
5
DISTNAME=	db-${PORTVERSION}.NC
6
7
MASTERDIR=	${.CURDIR}/../db41
8
DISTINFO_FILE=	${.CURDIR}/distinfo
9
10
CONFLICTS=	db41-4*
11
12
.include "${MASTERDIR}/Makefile"
(-)databases/db41-nocrypto/distinfo (-4 lines)
Lines 1-4 Link Here
1
SHA256 (bdb/db-4.1.25.NC.tar.gz) = 35a304a98af6d9f6a7443c58fc72e877293d5fb95e326b08a5470dc4f4542337
2
SIZE (bdb/db-4.1.25.NC.tar.gz) = 2892289
3
SHA256 (bdb/patch.4.1.25.2) = 391e652b0b6a1e2410a8e4b8d7e0ed0d53c9af549a29754e04532f390bee8f5d
4
SIZE (bdb/patch.4.1.25.2) = 18100
(-)databases/db42/Makefile (-32 lines)
Lines 1-32 Link Here
1
# Created by: Matthias Andree <matthias.andree@gmx.de>
2
# $FreeBSD$
3
4
PORTNAME=	db42
5
PORTVERSION=	4.2.52
6
PORTREVISION=	5
7
CATEGORIES=	databases
8
PKGNAMESUFFIX?=
9
10
PATCHFILES=	patch.${PORTVERSION}.1  patch.${PORTVERSION}.2 \
11
		patch.${PORTVERSION}.3  patch.${PORTVERSION}.4 \
12
		patch.${PORTVERSION}.5
13
14
MAINTAINER=	mandree@FreeBSD.org
15
COMMENT=	The Berkeley DB package, revision 4.2
16
17
DEPRECATED=	Please use databases/db5 or db6 for new installs.
18
19
CONFLICTS?=	db42-nocrypto-4*
20
21
MASTERDIR?=	${.CURDIR}
22
23
SLAVE_PORT=	no
24
25
.include <${MASTERDIR}/Makefile.db>
26
.include <bsd.port.pre.mk>
27
28
.if ${ARCH} == amd64
29
CONFIGURE_ARGS+=	--with-mutex=x86/gcc-assembly
30
.endif
31
32
.include <bsd.port.post.mk>
(-)databases/db42/Makefile.db (-44 lines)
Lines 1-44 Link Here
1
# $FreeBSD$
2
3
MASTER_SITES=	http://download.oracle.com/berkeley-db/
4
DISTNAME?=	db-${PORTVERSION}
5
DIST_SUBDIR=	bdb
6
7
PATCH_SITES=	http://download.oracle.com/berkeley-db/patches/db/${PORTVERSION}/
8
PATCH_DIST_STRIP=	-d ${WRKDIR}/${DISTNAME}
9
10
WRKSRC=		${WRKDIR}/${DISTNAME}/build_unix
11
12
USE_LDCONFIG=		yes
13
USE_AUTOTOOLS=		libtool
14
CONFIGURE_SCRIPT=	../dist/configure
15
LIBTOOLFILES=		${CONFIGURE_SCRIPT}
16
BDBVER=			${PORTVERSION:R}
17
BDBMINOR=		${BDBVER:E:S/^\.//}
18
BDBDIR=			BerkeleyDB.${BDBVER}
19
CONFIGURE_ARGS=		--enable-compat185 --enable-dump185 \
20
			--enable-cxx --enable-dynamic \
21
			--enable-rpc \
22
			--with-uniquename \
23
			--includedir=${PREFIX}/include/${PORTNAME} \
24
			--libdir=${PREFIX}/lib/${PORTNAME} \
25
			--bindir=${PREFIX}/bin/${PORTNAME}
26
INSTALL_TARGET=		install_include install_lib install_utilities
27
INSTALL_TARGET+=	install_docs docdir=${DOCSDIR}
28
29
PORTDOCS=	*
30
31
pre-patch:
32
	${REINPLACE_CMD} -Ee 's|-l?pthread|${PTHREAD_LIBS}|g; s,/usr/bin/objformat \|\| echo aout,/usr/bin/objformat || echo elf,' ${WRKSRC}/${CONFIGURE_SCRIPT}
33
34
pre-configure:
35
	${CHMOD} u+w ${WRKSRC}/../dist/configure
36
37
post-install:
38
.for i in libdb libdb_cxx
39
	${LN} -s -f ${PORTNAME}/${i}-${BDBVER}.so.${BDBMINOR} ${STAGEDIR}${PREFIX}/lib
40
	${LN} -s -f ${i}-${BDBVER}.so.${BDBMINOR} ${STAGEDIR}${PREFIX}/lib/${i}-${BDBVER}.so
41
.endfor
42
	@${RMDIR} ${STAGEDIR}${DOCSDIR}/ref/splash 2>/dev/null || :
43
	cd ${STAGEDIR}${PREFIX}/bin/${PORTNAME} ; \
44
	for i in * ; do ${LN} -s -f ${PORTNAME}/$$i ../$$i-${BDBVER} ; done
(-)databases/db42/distinfo (-12 lines)
Lines 1-12 Link Here
1
SHA256 (bdb/db-4.2.52.tar.gz) = f4bddd8d1b4cde0daf5e13e3493ed62a25b736b0bf258e1d929e47bc6a82a28c
2
SIZE (bdb/db-4.2.52.tar.gz) = 3919271
3
SHA256 (bdb/patch.4.2.52.1) = 98b7580916459ee931b9c7e06dcb9da980732672fe0811714933f366ad97dfa5
4
SIZE (bdb/patch.4.2.52.1) = 988
5
SHA256 (bdb/patch.4.2.52.2) = c9b132bcc8f1c12e03baaf47abd3801f2adf24ffbd56f35a27617fec12654f32
6
SIZE (bdb/patch.4.2.52.2) = 1433
7
SHA256 (bdb/patch.4.2.52.3) = ca5245d2e1c7a40df5ec57cbabee8bf0106292c69a37eb0ca275d1aa59061907
8
SIZE (bdb/patch.4.2.52.3) = 8672
9
SHA256 (bdb/patch.4.2.52.4) = c15c82071c02ce1a10024c572e2e9fd72006089007141a01fdd37b889411b973
10
SIZE (bdb/patch.4.2.52.4) = 1311
11
SHA256 (bdb/patch.4.2.52.5) = 242f1a9c3efdd61a2b738c12617175849dbc73df6a2bf7cff61c814b13905e06
12
SIZE (bdb/patch.4.2.52.5) = 839
(-)databases/db42/files/patch-dist__configure (-15 lines)
Lines 1-15 Link Here
1
--- ../dist/configure.orig	Wed Dec  5 13:14:02 2001
2
+++ ../dist/configure	Wed Dec  5 13:24:01 2001
3
@@ -8794,10 +8794,10 @@
4
 INSTALLER="\$(LIBTOOL) --mode=install cp"
5
 
6
 MAKEFILE_CC="\$(LIBTOOL) --mode=compile ${MAKEFILE_CC}"
7
-MAKEFILE_SOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK} -avoid-version"
8
+MAKEFILE_SOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK} -version-info ${DB_VERSION_MINOR}"
9
 MAKEFILE_CCLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK}"
10
 MAKEFILE_CXX="\$(LIBTOOL) --mode=compile ${MAKEFILE_CXX}"
11
-MAKEFILE_XSOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK} -avoid-version"
12
+MAKEFILE_XSOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK} -version-info ${DB_VERSION_MINOR}"
13
 MAKEFILE_CXXLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK}"
14
 
15
 # Configure for shared libraries, static libraries, or both.  If both are
(-)databases/db42/pkg-descr (-14 lines)
Lines 1-14 Link Here
1
Version 4.2 of the Berkeley Data Base library which offers (key/value) storage
2
with optional concurrent access or transactions interface.
3
4
Utilities are included in the distribution to convert v1.85 databases to v4.2
5
databases, and a backwards compatible API is provided to maintain
6
compatibility with programs using the v1.85 interface.
7
8
Note that this port has a different layout than the 3.3, 4.0 and 4.1 ports,
9
it does not rename libraries.
10
11
For details on compatibility with other DB versions, see:
12
http://www.sleepycat.com/download/patchlogs.shtml
13
14
WWW:	http://www.oracle.com/us/products/database/berkeley-db/db/
(-)databases/db42/pkg-plist (-48 lines)
Lines 1-48 Link Here
1
bin/db42/berkeley_db_svc
2
bin/db42/db_archive
3
bin/db42/db_checkpoint
4
bin/db42/db_deadlock
5
bin/db42/db_dump
6
bin/db42/db_dump185
7
bin/db42/db_load
8
bin/db42/db_printlog
9
bin/db42/db_recover
10
bin/db42/db_stat
11
bin/db42/db_upgrade
12
bin/db42/db_verify
13
bin/berkeley_db_svc-4.2
14
bin/db_archive-4.2
15
bin/db_checkpoint-4.2
16
bin/db_deadlock-4.2
17
bin/db_dump-4.2
18
bin/db_dump185-4.2
19
bin/db_load-4.2
20
bin/db_printlog-4.2
21
bin/db_recover-4.2
22
bin/db_stat-4.2
23
bin/db_upgrade-4.2
24
bin/db_verify-4.2
25
include/db42/db.h
26
include/db42/db_185.h
27
include/db42/db_cxx.h
28
lib/db42/libdb-4.2.a
29
lib/db42/libdb-4.2.la
30
lib/db42/libdb-4.2.so
31
lib/db42/libdb-4.2.so.2
32
lib/db42/libdb-4.so
33
lib/db42/libdb.a
34
lib/db42/libdb.so
35
lib/db42/libdb_cxx-4.2.a
36
lib/db42/libdb_cxx-4.2.la
37
lib/db42/libdb_cxx-4.2.so
38
lib/db42/libdb_cxx-4.2.so.2
39
lib/db42/libdb_cxx-4.so
40
lib/db42/libdb_cxx.a
41
lib/db42/libdb_cxx.so
42
lib/libdb-4.2.so
43
lib/libdb-4.2.so.2
44
lib/libdb_cxx-4.2.so
45
lib/libdb_cxx-4.2.so.2
46
@dirrm lib/db42
47
@dirrm include/db42
48
@dirrm bin/db42
(-)databases/db42-nocrypto/Makefile (-14 lines)
Lines 1-14 Link Here
1
# Created by: matthias.andree@gmx.de
2
# $FreeBSD$
3
4
PKGNAMESUFFIX=	-nocrypto
5
DISTNAME=	db-${PORTVERSION}.NC
6
7
MAINTAINER=	mandree@FreeBSD.org
8
9
MASTERDIR=	${.CURDIR}/../db42
10
DISTINFO_FILE=	${.CURDIR}/distinfo
11
12
CONFLICTS=	db42-4*
13
14
.include "${MASTERDIR}/Makefile"
(-)databases/db42-nocrypto/distinfo (-12 lines)
Lines 1-12 Link Here
1
SHA256 (bdb/db-4.2.52.NC.tar.gz) = 46ba780a698fc981dcdd20a213e939d9b50ca76743c802dfe6fa4e9b7174e54a
2
SIZE (bdb/db-4.2.52.NC.tar.gz) = 3879486
3
SHA256 (bdb/patch.4.2.52.1) = 98b7580916459ee931b9c7e06dcb9da980732672fe0811714933f366ad97dfa5
4
SIZE (bdb/patch.4.2.52.1) = 988
5
SHA256 (bdb/patch.4.2.52.2) = c9b132bcc8f1c12e03baaf47abd3801f2adf24ffbd56f35a27617fec12654f32
6
SIZE (bdb/patch.4.2.52.2) = 1433
7
SHA256 (bdb/patch.4.2.52.3) = ca5245d2e1c7a40df5ec57cbabee8bf0106292c69a37eb0ca275d1aa59061907
8
SIZE (bdb/patch.4.2.52.3) = 8672
9
SHA256 (bdb/patch.4.2.52.4) = c15c82071c02ce1a10024c572e2e9fd72006089007141a01fdd37b889411b973
10
SIZE (bdb/patch.4.2.52.4) = 1311
11
SHA256 (bdb/patch.4.2.52.5) = 242f1a9c3efdd61a2b738c12617175849dbc73df6a2bf7cff61c814b13905e06
12
SIZE (bdb/patch.4.2.52.5) = 839
(-)databases/db43/Makefile (-66 lines)
Lines 1-66 Link Here
1
# Created by: Matthias Andree <matthias.andree@gmx.de>
2
# $FreeBSD$
3
4
PORTNAME=	db43
5
PORTVERSION=	4.3.29
6
PORTREVISION=	1
7
CATEGORIES=	databases
8
MASTER_SITES=	http://download.oracle.com/berkeley-db/ 
9
DISTNAME=	db-${PORTVERSION}
10
DIST_SUBDIR=	bdb
11
12
MAINTAINER=	mandree@FreeBSD.org
13
COMMENT=	The Berkeley DB package, revision 4.3
14
15
WRKSRC=		${WRKDIR}/${DISTNAME}/build_unix
16
17
DEPRECATED=	Please use databases/db5 or db6 for new installs.
18
19
USE_LDCONFIG=		yes
20
GNU_CONFIGURE=	yes
21
CONFIGURE_SCRIPT=	../dist/configure
22
LIBTOOLFILES=		${CONFIGURE_SCRIPT}
23
BDBVER=			${PORTVERSION:R}
24
BDBMINOR=		${BDBVER:E:S/^\.//}
25
BDBDIR=			BerkeleyDB.${BDBVER}
26
CONFIGURE_ARGS=		--enable-compat185 --enable-dump185 \
27
			--enable-cxx --enable-dynamic \
28
			--enable-rpc \
29
			--includedir=${PREFIX}/include/${PORTNAME} \
30
			--libdir=${PREFIX}/lib/${PORTNAME} \
31
			--bindir=${PREFIX}/bin/${PORTNAME}
32
INSTALL_TARGET=		install_include install_lib install_utilities
33
34
INSTALL_TARGET+=	install_docs docdir=${DOCSDIR}
35
PORTDOCS=		*
36
37
OPTIONS_DEFINE=	DOCS
38
39
.include <bsd.port.options.mk>
40
41
pre-patch:
42
	${REINPLACE_CMD} -Ee 's|-l?pthread|${PTHREAD_LIBS}|g; s,/usr/bin/objformat \|\| echo aout,/usr/bin/objformat || echo elf,' ${WRKSRC}/${CONFIGURE_SCRIPT}
43
44
pre-configure:
45
	${CHMOD} u+w ${WRKSRC}/../dist/configure
46
47
post-configure:
48
	${REINPLACE_CMD} -e '/^extern  void db_rpc_serverprog/ d;' ${WRKSRC}/db_server.h
49
50
post-install:
51
.for i in libdb libdb_cxx
52
	${LN} -s -f ${PORTNAME}/${i}-${BDBVER}.so.0 ${STAGEDIR}${PREFIX}/lib
53
	${LN} -s -f ${i}-${BDBVER}.so.0 ${STAGEDIR}${PREFIX}/lib/${i}-${BDBVER}.so
54
.endfor
55
.if ${PORT_OPTIONS:MDOCS}
56
	@${RMDIR} ${DOCSDIR}/ref/splash 2>/dev/null || :
57
.endif
58
	cd ${STAGEDIR}${PREFIX}/bin/${PORTNAME} ; \
59
	for i in * ; do ${LN} -s -f ${PORTNAME}/$$i ../$$i-${BDBVER} ; done
60
.include <bsd.port.pre.mk>
61
62
.if ${ARCH} == amd64
63
CONFIGURE_ARGS+=	--with-mutex=x86/gcc-assembly
64
.endif
65
66
.include <bsd.port.post.mk>
(-)databases/db43/distinfo (-2 lines)
Lines 1-2 Link Here
1
SHA256 (bdb/db-4.3.29.tar.gz) = a1fa714482f25a67a19490303a0164326ac63bd7653ae3f4664c2536b14f3337
2
SIZE (bdb/db-4.3.29.tar.gz) = 5942547
(-)databases/db43/files/patch-dist__configure (-13 lines)
Lines 1-13 Link Here
1
--- ../dist/configure.orig	Wed Dec  5 13:14:02 2001
2
+++ ../dist/configure	Wed Dec  5 13:24:01 2001
3
@@ -20867,8 +20867,8 @@
4
 
5
 MAKEFILE_CC="\$(LIBTOOL) --mode=compile ${MAKEFILE_CC}"
6
-MAKEFILE_SOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK} -avoid-version"
7
+MAKEFILE_SOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK} -version-info 0:0:0"
8
 MAKEFILE_CCLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK}"
9
 MAKEFILE_CXX="\$(LIBTOOL) --mode=compile ${MAKEFILE_CXX}"
10
-MAKEFILE_XSOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK} -avoid-version"
11
+MAKEFILE_XSOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK} -version-info 0:0:0"
12
 MAKEFILE_CXXLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK}"
13
 
(-)databases/db43/files/patch-upstream.4.3.29.1 (-24 lines)
Lines 1-24 Link Here
1
*** ../mp/mp_fget.c.orig	2006-05-30 20:44:11.000000000 -0700
2
--- ../mp/mp_fget.c	2006-05-30 20:44:22.000000000 -0700
3
***************
4
*** 577,584 ****
5
  	 */
6
  	if (state != SECOND_MISS && bhp->ref == 1) {
7
  		bhp->priority = UINT32_MAX;
8
! 		SH_TAILQ_REMOVE(&hp->hash_bucket, bhp, hq, __bh);
9
! 		SH_TAILQ_INSERT_TAIL(&hp->hash_bucket, bhp, hq);
10
  		hp->hash_priority =
11
  		    SH_TAILQ_FIRST(&hp->hash_bucket, __bh)->priority;
12
  	}
13
--- 577,587 ----
14
  	 */
15
  	if (state != SECOND_MISS && bhp->ref == 1) {
16
  		bhp->priority = UINT32_MAX;
17
! 		if (SH_TAILQ_FIRST(&hp->hash_bucket, __bh) !=
18
! 		     SH_TAILQ_LAST(&hp->hash_bucket, hq, __bh)) {
19
! 			SH_TAILQ_REMOVE(&hp->hash_bucket, bhp, hq, __bh);
20
! 			SH_TAILQ_INSERT_TAIL(&hp->hash_bucket, bhp, hq);
21
! 		}
22
  		hp->hash_priority =
23
  		    SH_TAILQ_FIRST(&hp->hash_bucket, __bh)->priority;
24
  	}
(-)databases/db43/pkg-descr (-11 lines)
Lines 1-11 Link Here
1
Version 4.3 of the Berkeley Data Base library which offers (key/value) storage
2
with optional concurrent access or transactions interface.
3
4
Utilities are included in the distribution to convert v1.85 databases to v4.3
5
databases, and a backwards compatible API is provided to maintain
6
compatibility with programs using the v1.85 interface.
7
8
For details on compatibility with other DB versions, see:
9
http://www.sleepycat.com/download/patchlogs.shtml
10
11
WWW:	http://www.oracle.com/us/products/database/berkeley-db/db/
(-)databases/db43/pkg-plist (-48 lines)
Lines 1-48 Link Here
1
bin/db43/berkeley_db_svc
2
bin/db43/db_archive
3
bin/db43/db_checkpoint
4
bin/db43/db_deadlock
5
bin/db43/db_dump
6
bin/db43/db_dump185
7
bin/db43/db_load
8
bin/db43/db_printlog
9
bin/db43/db_recover
10
bin/db43/db_stat
11
bin/db43/db_upgrade
12
bin/db43/db_verify
13
bin/berkeley_db_svc-4.3
14
bin/db_archive-4.3
15
bin/db_checkpoint-4.3
16
bin/db_deadlock-4.3
17
bin/db_dump-4.3
18
bin/db_dump185-4.3
19
bin/db_load-4.3
20
bin/db_printlog-4.3
21
bin/db_recover-4.3
22
bin/db_stat-4.3
23
bin/db_upgrade-4.3
24
bin/db_verify-4.3
25
include/db43/db.h
26
include/db43/db_185.h
27
include/db43/db_cxx.h
28
lib/db43/libdb-4.3.a
29
lib/db43/libdb-4.3.la
30
lib/db43/libdb-4.3.so
31
lib/db43/libdb-4.3.so.0
32
lib/db43/libdb-4.so
33
lib/db43/libdb.a
34
lib/db43/libdb.so
35
lib/db43/libdb_cxx-4.3.a
36
lib/db43/libdb_cxx-4.3.la
37
lib/db43/libdb_cxx-4.3.so
38
lib/db43/libdb_cxx-4.3.so.0
39
lib/db43/libdb_cxx-4.so
40
lib/db43/libdb_cxx.a
41
lib/db43/libdb_cxx.so
42
lib/libdb-4.3.so
43
lib/libdb-4.3.so.0
44
lib/libdb_cxx-4.3.so
45
lib/libdb_cxx-4.3.so.0
46
@dirrm lib/db43
47
@dirrm include/db43
48
@dirrm bin/db43
(-)databases/db44/Makefile (-62 lines)
Lines 1-62 Link Here
1
# Created by: Matthias Andree <matthias.andree@gmx.de>
2
# $FreeBSD$
3
4
PORTNAME=	db44
5
PORTVERSION=	4.4.20.4
6
CATEGORIES=	databases
7
MASTER_SITES=	http://download.oracle.com/berkeley-db/ 
8
PKGNAMESUFFIX?=
9
DISTNAME=	db-4.4.20
10
DIST_SUBDIR=	bdb
11
12
MAINTAINER= ports@FreeBSD.org
13
COMMENT=	The Berkeley DB package, revision 4.4
14
15
WRKSRC=		${WRKDIR}/${DISTNAME}/build_unix
16
17
DEPRECATED=	Please use databases/db5 or db6 for new installs.
18
19
USE_LDCONFIG=		yes
20
GNU_CONFIGURE=		yes
21
DEBUG_FLAGS=		-g -O1	# need -O1 for inline assembly
22
CONFIGURE_SCRIPT=	../dist/configure
23
LIBTOOLFILES=		${CONFIGURE_SCRIPT}
24
BDBVER=			${PORTVERSION:R:R}
25
CONFIGURE_ARGS=		--enable-compat185 --enable-dump185 \
26
			--enable-cxx --enable-dynamic \
27
			--enable-rpc \
28
			--includedir=${PREFIX}/include/${PORTNAME} \
29
			--libdir=${PREFIX}/lib/${PORTNAME} \
30
			--bindir=${PREFIX}/bin/${PORTNAME}
31
INSTALL_TARGET=		install_include install_lib install_utilities
32
33
OPTIONS_DEFINE=	DOCS
34
35
DOCS_INSTALL_TARGET=	install_docs docdir=${DOCSDIR}
36
PORTDOCS=		*
37
38
NO_STAGE=	yes
39
40
.include <bsd.port.options.mk>
41
42
pre-patch:
43
	@${REINPLACE_CMD} -Ee 's|-l?pthread|${PTHREAD_LIBS}|g' ${WRKSRC}/${CONFIGURE_SCRIPT}
44
45
pre-configure:
46
	@${CHMOD} u+w ${WRKSRC}/../dist/configure
47
48
post-configure:
49
	@${REINPLACE_CMD} -e '/^extern  void db_rpc_serverprog/ d;' ${WRKSRC}/db_server.h
50
51
post-install:
52
.for i in libdb libdb_cxx
53
	${LN} -s -f ${PORTNAME}/${i}-${BDBVER}.so.0 ${PREFIX}/lib
54
	${LN} -s -f ${i}-${BDBVER}.so.0 ${PREFIX}/lib/${i}-${BDBVER}.so
55
.endfor
56
.if ${PORT_OPTIONS:MDOCS}
57
	@${RMDIR} ${DOCSDIR}/ref/splash 2>/dev/null || :
58
.endif
59
	cd ${PREFIX}/bin/${PORTNAME} ; \
60
	for i in * ; do ${LN} -s -f ${PORTNAME}/$$i ../$$i-${BDBVER} ; done
61
62
.include <bsd.port.mk>
(-)databases/db44/distinfo (-10 lines)
Lines 1-10 Link Here
1
SHA256 (bdb/db-4.4.20.tar.gz) = 298ab78801f7502016aa2db033b65fab46f323533bdc08610d3dabd910d63b79
2
SIZE (bdb/db-4.4.20.tar.gz) = 7952742
3
SHA256 (bdb/patch.4.4.20.1) = 4eeb18450b88703282251c386405bf7c9efa053a42d1dda97603ee8039ee5869
4
SIZE (bdb/patch.4.4.20.1) = 867
5
SHA256 (bdb/patch.4.4.20.2) = 45949e288482736bbc27bd62c854a99fad4b3e55103897eafd62bce1d5629bbc
6
SIZE (bdb/patch.4.4.20.2) = 721
7
SHA256 (bdb/patch.4.4.20.3) = ae54bb752a31655a1a945f12900b740fad397c3e2ddab792ecfd4660d3e6e236
8
SIZE (bdb/patch.4.4.20.3) = 1366
9
SHA256 (bdb/patch.4.4.20.4) = 7018f74e5184451809f6864172132472e91d95e2bec97ce6124afb67f0d65e59
10
SIZE (bdb/patch.4.4.20.4) = 837
(-)databases/db44/files/patch-dist__configure (-13 lines)
Lines 1-13 Link Here
1
--- ../dist/configure.orig	Wed Dec  5 13:14:02 2001
2
+++ ../dist/configure	Wed Dec  5 13:24:01 2001
3
@@ -21657,8 +21657,8 @@
4
 
5
 MAKEFILE_CC="\$(LIBTOOL) --mode=compile ${MAKEFILE_CC}"
6
-MAKEFILE_SOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK} -avoid-version"
7
+MAKEFILE_SOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK} -version-info 0:0:0"
8
 MAKEFILE_CCLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK}"
9
 MAKEFILE_CXX="\$(LIBTOOL) --mode=compile ${MAKEFILE_CXX}"
10
-MAKEFILE_XSOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK} -avoid-version"
11
+MAKEFILE_XSOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK} -version-info 0:0:0"
12
 MAKEFILE_CXXLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK}"
13
 
(-)databases/db44/files/patch-upstream.4.4.20.1 (-27 lines)
Lines 1-27 Link Here
1
*** ../qam/qam_files.c.orig	2005-10-20 11:57:12.000000000 -0700
2
--- ../qam/qam_files.c	2006-01-27 13:38:38.000000000 -0800
3
***************
4
*** 411,416 ****
5
--- 411,422 ----
6
  	    DB_APP_DATA, buf, 0, NULL, &real_name)) != 0)
7
  		goto err;
8
  #endif
9
+ 
10
+ 	mpf = array->mpfarray[offset].mpf;
11
+ 	/* This extent my already be marked for delete and closed. */
12
+ 	if (mpf == NULL)
13
+ 		goto err;
14
+ 
15
  	/*
16
  	 * The log must be flushed before the file is deleted.  We depend on
17
  	 * the log record of the last delete to recreate the file if we crash.
18
***************
19
*** 418,424 ****
20
  	if (LOGGING_ON(dbenv) && (ret = __log_flush(dbenv, NULL)) != 0)
21
  		goto err;
22
  
23
- 	mpf = array->mpfarray[offset].mpf;
24
  	(void)__memp_set_flags(mpf, DB_MPOOL_UNLINK, 1);
25
  	/* Someone could be real slow, let them close it down. */
26
  	if (array->mpfarray[offset].pinref != 0)
27
--- 424,429 ----
(-)databases/db44/files/patch-upstream.4.4.20.2 (-29 lines)
Lines 1-29 Link Here
1
*** ../txn/txn.c.orig	Tue Nov  1 06:50:03 2005
2
--- ../txn/txn.c	Tue Jan 31 15:05:13 2006
3
***************
4
*** 1049,1060 ****
5
--- 1049,1062 ----
6
  		return (ret);
7
  	memcpy(txn->name, name, len);
8
  
9
+ 	TXN_SYSTEM_LOCK(dbenv);
10
  	if (td->name != INVALID_ROFF) {
11
  		__db_shalloc_free(
12
  		    &mgr->reginfo, R_ADDR(&mgr->reginfo, td->name));
13
  		td->name = INVALID_ROFF;
14
  	}
15
  	if ((ret = __db_shalloc(&mgr->reginfo, len, 0, &p)) != 0) {
16
+ 		TXN_SYSTEM_UNLOCK(dbenv);
17
  		__db_err(dbenv,
18
  		    "Unable to allocate memory for transaction name");
19
  
20
***************
21
*** 1063,1068 ****
22
--- 1065,1071 ----
23
  
24
  		return (ret);
25
  	}
26
+ 	TXN_SYSTEM_UNLOCK(dbenv);
27
  	td->name = R_OFFSET(&mgr->reginfo, p);
28
  	memcpy(p, name, len);
29
  
(-)databases/db44/files/patch-upstream.4.4.20.3 (-49 lines)
Lines 1-49 Link Here
1
*** ../db/db_cam.c.orig	2006-01-11 03:19:21.000000000 +1100
2
--- ../db/db_cam.c	2006-03-01 13:59:01.000000000 +1100
3
***************
4
*** 579,589 ****
5
  	    flags == DB_NEXT || flags == DB_NEXT_DUP || flags == DB_PREV)) {
6
  		if (tmp_rmw && (ret = dbc_arg->c_am_writelock(dbc_arg)) != 0)
7
  			return (ret);
8
! 		if ((ret = __db_c_idup(cp->opd, &opd, DB_POSITION)) != 0)
9
  			return (ret);
10
  
11
! 		switch (ret =
12
! 		    opd->c_am_get(opd, key, data, flags, NULL)) {
13
  		case 0:
14
  			goto done;
15
  		case DB_NOTFOUND:
16
--- 579,590 ----
17
  	    flags == DB_NEXT || flags == DB_NEXT_DUP || flags == DB_PREV)) {
18
  		if (tmp_rmw && (ret = dbc_arg->c_am_writelock(dbc_arg)) != 0)
19
  			return (ret);
20
! 		if (F_ISSET(dbc_arg, DBC_TRANSIENT))
21
! 			opd = cp->opd;
22
! 		else if ((ret = __db_c_idup(cp->opd, &opd, DB_POSITION)) != 0)
23
  			return (ret);
24
  
25
! 		switch (ret = opd->c_am_get(opd, key, data, flags, NULL)) {
26
  		case 0:
27
  			goto done;
28
  		case DB_NOTFOUND:
29
***************
30
*** 596,607 ****
31
--- 597,614 ----
32
  				if ((ret = __db_c_close(opd)) != 0)
33
  					goto err;
34
  				opd = NULL;
35
+ 				if (F_ISSET(dbc_arg, DBC_TRANSIENT))
36
+ 					cp->opd = NULL;
37
  				break;
38
  			}
39
  			goto err;
40
  		default:
41
  			goto err;
42
  		}
43
+ 	} else if (cp->opd != NULL && F_ISSET(dbc_arg, DBC_TRANSIENT)) {
44
+ 		if ((ret = __db_c_close(cp->opd)) != 0)
45
+ 			goto err;
46
+ 		cp->opd = NULL;
47
  	}
48
  
49
  	/*
(-)databases/db44/files/patch-upstream.4.4.20.4 (-24 lines)
Lines 1-24 Link Here
1
*** ../mp/mp_fget.c.orig	2005-10-12 10:53:36.000000000 -0700
2
--- ../mp/mp_fget.c	2006-05-30 20:48:10.000000000 -0700
3
***************
4
*** 587,594 ****
5
  	 */
6
  	if (state != SECOND_MISS && bhp->ref == 1) {
7
  		bhp->priority = UINT32_MAX;
8
! 		SH_TAILQ_REMOVE(&hp->hash_bucket, bhp, hq, __bh);
9
! 		SH_TAILQ_INSERT_TAIL(&hp->hash_bucket, bhp, hq);
10
  		hp->hash_priority =
11
  		    SH_TAILQ_FIRSTP(&hp->hash_bucket, __bh)->priority;
12
  	}
13
--- 587,597 ----
14
  	 */
15
  	if (state != SECOND_MISS && bhp->ref == 1) {
16
  		bhp->priority = UINT32_MAX;
17
! 		if (SH_TAILQ_FIRST(&hp->hash_bucket, __bh) !=
18
! 		     SH_TAILQ_LAST(&hp->hash_bucket, hq, __bh)) {
19
! 			SH_TAILQ_REMOVE(&hp->hash_bucket, bhp, hq, __bh);
20
! 			SH_TAILQ_INSERT_TAIL(&hp->hash_bucket, bhp, hq);
21
! 		}
22
  		hp->hash_priority =
23
  		    SH_TAILQ_FIRSTP(&hp->hash_bucket, __bh)->priority;
24
  	}
(-)databases/db44/pkg-descr (-13 lines)
Lines 1-13 Link Here
1
Version 4.4 of the Berkeley Data Base library which offers (key/value) storage
2
with optional concurrent access or transactions interface.
3
4
This port will install the AES (American Encryption Standard) enabled version.
5
6
Utilities are included in the distribution to convert v1.85 databases to v4.4
7
databases, and a backwards compatible API is provided to maintain compatibility
8
with programs using the v1.85 interface.
9
10
For details on compatibility with other DB versions, see:
11
http://dev.sleepycat.com/downloads/releasehistorybdb.html
12
13
WWW:	http://www.oracle.com/us/products/database/berkeley-db/db/
(-)databases/db44/pkg-plist (-50 lines)
Lines 1-50 Link Here
1
bin/db44/berkeley_db_svc
2
bin/db44/db_archive
3
bin/db44/db_checkpoint
4
bin/db44/db_deadlock
5
bin/db44/db_dump
6
bin/db44/db_dump185
7
bin/db44/db_hotbackup
8
bin/db44/db_load
9
bin/db44/db_printlog
10
bin/db44/db_recover
11
bin/db44/db_stat
12
bin/db44/db_upgrade
13
bin/db44/db_verify
14
bin/berkeley_db_svc-4.4
15
bin/db_archive-4.4
16
bin/db_checkpoint-4.4
17
bin/db_deadlock-4.4
18
bin/db_dump-4.4
19
bin/db_dump185-4.4
20
bin/db_hotbackup-4.4
21
bin/db_load-4.4
22
bin/db_printlog-4.4
23
bin/db_recover-4.4
24
bin/db_stat-4.4
25
bin/db_upgrade-4.4
26
bin/db_verify-4.4
27
include/db44/db.h
28
include/db44/db_185.h
29
include/db44/db_cxx.h
30
lib/db44/libdb-4.4.a
31
lib/db44/libdb-4.4.la
32
lib/db44/libdb-4.4.so
33
lib/db44/libdb-4.4.so.0
34
lib/db44/libdb-4.so
35
lib/db44/libdb.a
36
lib/db44/libdb.so
37
lib/db44/libdb_cxx-4.4.a
38
lib/db44/libdb_cxx-4.4.la
39
lib/db44/libdb_cxx-4.4.so
40
lib/db44/libdb_cxx-4.4.so.0
41
lib/db44/libdb_cxx-4.so
42
lib/db44/libdb_cxx.a
43
lib/db44/libdb_cxx.so
44
lib/libdb-4.4.so
45
lib/libdb-4.4.so.0
46
lib/libdb_cxx-4.4.so
47
lib/libdb_cxx-4.4.so.0
48
@dirrm lib/db44
49
@dirrm include/db44
50
@dirrm bin/db44
(-)databases/db46/Makefile (-61 lines)
Lines 1-61 Link Here
1
# Created by: Gea-Suan Lin <gslin@gslin.org>
2
# $FreeBSD$
3
4
PORTNAME=	db46
5
PORTVERSION=	4.6.21.4
6
CATEGORIES=	databases
7
MASTER_SITES=	http://download.oracle.com/berkeley-db/ \
8
PKGNAMEPREFIX?=
9
DISTNAME=	db-${PORTVERSION:R}
10
DIST_SUBDIR=	bdb
11
12
PATCH_SITES=	http://download.oracle.com/berkeley-db/patches/db/${PORTVERSION:R}/
13
PATCHFILES=	patch.4.6.21.1 patch.4.6.21.2 patch.4.6.21.3 patch.4.6.21.4
14
PATCH_DIST_STRIP=	-d .. -l
15
# * patch.4.6.21.1: -----------------------------------------------------------
16
# Fixes a race condition between checkpoint and DB->close which can result in
17
# the checkpoint thread self-deadlocking. [#15692]
18
# * 4.6.21.2: -----------------------------------------------------------------
19
# Fixes the potential for the wrong number of mutexes to be allocated. This
20
# issue could cause applications with multiple cache regions to see undefined
21
# behavior in rare cases under load. [#16178]
22
# * 4.6.21.3: -----------------------------------------------------------------
23
# Replication clients should be able to open a sequence. [#16406]
24
# * 4.6.21.4: -----------------------------------------------------------------
25
# Fixes a bug which could lead to slow performance of internal init under
26
# Replication Manager, as evidenced by "queue limit exceeded" messages in
27
# verbose replication diagnostic output. [#15788]
28
29
# I allow matthias.andree@gmx.de and all freebsd committer to do changes
30
# to this package.
31
32
MAINTAINER=	mandree@FreeBSD.org
33
COMMENT=	The Berkeley DB package, revision 4.6
34
35
DEPRECATED=	Please use databases/db5 or db6 for new installs.
36
37
BDBVER=		${PORTVERSION:R:R}
38
CONFIGURE_ARGS=	--enable-compat185 --enable-dump185 --enable-cxx \
39
		--enable-dynamic --enable-rpc --enable-pthread_api \
40
		--includedir=${PREFIX}/include/${PORTNAME} \
41
		--libdir=${PREFIX}/lib/${PORTNAME} \
42
		--bindir=${PREFIX}/bin/${PORTNAME}
43
CONFIGURE_SCRIPT=	../dist/configure
44
GNU_CONFIGURE=	yes
45
INSTALL_TARGET=	install_include install_lib install_utilities
46
LIBTOOLFILES=	${CONFIGURE_SCRIPT}
47
WRKSRC=		${WRKDIR}/${DISTNAME}/build_unix
48
USE_LDCONFIG=	yes
49
50
INSTALL_TARGET+=	install_docs docdir=${DOCSDIR}
51
PORTDOCS=	*
52
53
post-install:
54
.for i in libdb libdb_cxx
55
	${LN} -s -f ${PORTNAME}/${i}-${BDBVER}.so.0 ${STAGEDIR}${PREFIX}/lib
56
	${LN} -s -f ${i}-${BDBVER}.so.0 ${STAGEDIR}${PREFIX}/lib/${i}-${BDBVER}.so
57
.endfor
58
	cd ${STAGEDIR}${PREFIX}/bin/${PORTNAME} ; \
59
	for i in * ; do ${LN} -s -f ${PORTNAME}/$$i ../$$i-${BDBVER} ; done
60
61
.include <bsd.port.mk>
(-)databases/db46/distinfo (-10 lines)
Lines 1-10 Link Here
1
SHA256 (bdb/db-4.6.21.tar.gz) = 53ea9c9f03746a0aa415e6706e9c6da18ca18148f20ad1465b182411a7985e21
2
SIZE (bdb/db-4.6.21.tar.gz) = 11881885
3
SHA256 (bdb/patch.4.6.21.1) = d28c0723c465a2cf3ff2ddc5ed3c643b40c955c4e64d56580961f2fd799cbb53
4
SIZE (bdb/patch.4.6.21.1) = 2475
5
SHA256 (bdb/patch.4.6.21.2) = 9496a6cad44377ad1fab8c617f17c6f541e3423814663bfa81c3abb4001622d9
6
SIZE (bdb/patch.4.6.21.2) = 892
7
SHA256 (bdb/patch.4.6.21.3) = ad6951ec702e3d6cd539ba86d51b3b0436da43b17814c197c2d277fa5e1cb620
8
SIZE (bdb/patch.4.6.21.3) = 1911
9
SHA256 (bdb/patch.4.6.21.4) = 98bb4499dc7408c27a8a855330972a69abd3b29d0ff3820d6e1da790593a5bb7
10
SIZE (bdb/patch.4.6.21.4) = 41501
(-)databases/db46/files/patch-dist__configure (-13 lines)
Lines 1-13 Link Here
1
--- ../dist/configure.orig	Wed Dec  5 13:14:02 2001
2
+++ ../dist/configure	Wed Dec  5 13:24:01 2001
3
@@ -20867,8 +20867,8 @@
4
 
5
 MAKEFILE_CC="\$(LIBTOOL) --mode=compile ${MAKEFILE_CC}"
6
-MAKEFILE_SOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK} -avoid-version"
7
+MAKEFILE_SOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK} -version-info 0:0:0"
8
 MAKEFILE_CCLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK}"
9
 MAKEFILE_CXX="\$(LIBTOOL) --mode=compile ${MAKEFILE_CXX}"
10
-MAKEFILE_XSOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK} -avoid-version"
11
+MAKEFILE_XSOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK} -version-info 0:0:0"
12
 MAKEFILE_CXXLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK}"
13
 
(-)databases/db46/pkg-descr (-11 lines)
Lines 1-11 Link Here
1
Oracle Berkeley DB is a family of open source embeddable databases
2
that allows developers to incorporate within their applications a
3
fast, scalable, transactional database engine with industrial grade
4
reliability and availability. As a result, customers and end-users
5
will experience an application that simply works, reliably manages
6
data, can scale under extreme load, but requires no ongoing database
7
administration. As a developer, you can focus on your application and
8
be confident that Oracle Berkeley DB will manage your persistence
9
needs.
10
11
WWW:	http://www.oracle.com/us/products/database/berkeley-db/db/
(-)databases/db46/pkg-plist (-52 lines)
Lines 1-52 Link Here
1
bin/berkeley_db_svc-4.6
2
bin/db46/berkeley_db_svc
3
bin/db46/db_archive
4
bin/db46/db_checkpoint
5
bin/db46/db_codegen
6
bin/db46/db_deadlock
7
bin/db46/db_dump
8
bin/db46/db_dump185
9
bin/db46/db_hotbackup
10
bin/db46/db_load
11
bin/db46/db_printlog
12
bin/db46/db_recover
13
bin/db46/db_stat
14
bin/db46/db_upgrade
15
bin/db46/db_verify
16
bin/db_archive-4.6
17
bin/db_checkpoint-4.6
18
bin/db_codegen-4.6
19
bin/db_deadlock-4.6
20
bin/db_dump-4.6
21
bin/db_dump185-4.6
22
bin/db_hotbackup-4.6
23
bin/db_load-4.6
24
bin/db_printlog-4.6
25
bin/db_recover-4.6
26
bin/db_stat-4.6
27
bin/db_upgrade-4.6
28
bin/db_verify-4.6
29
include/db46/db.h
30
include/db46/db_185.h
31
include/db46/db_cxx.h
32
lib/db46/libdb-4.6.a
33
lib/db46/libdb-4.6.la
34
lib/db46/libdb-4.6.so
35
lib/db46/libdb-4.6.so.0
36
lib/db46/libdb-4.so
37
lib/db46/libdb.a
38
lib/db46/libdb.so
39
lib/db46/libdb_cxx-4.6.a
40
lib/db46/libdb_cxx-4.6.la
41
lib/db46/libdb_cxx-4.6.so
42
lib/db46/libdb_cxx-4.6.so.0
43
lib/db46/libdb_cxx-4.so
44
lib/db46/libdb_cxx.a
45
lib/db46/libdb_cxx.so
46
lib/libdb-4.6.so
47
lib/libdb-4.6.so.0
48
lib/libdb_cxx-4.6.so
49
lib/libdb_cxx-4.6.so.0
50
@dirrmtry lib/db46
51
@dirrmtry include/db46
52
@dirrmtry bin/db46
(-)databases/db47/Makefile (-59 lines)
Lines 1-59 Link Here
1
# Created by: Gea-Suan Lin <gslin@gslin.org>
2
# $FreeBSD$
3
4
PORTNAME=	db47
5
PORTVERSION=	4.7.25.4
6
CATEGORIES=	databases
7
MASTER_SITES=	http://download.oracle.com/berkeley-db/ 
8
PKGNAMEPREFIX?=
9
DISTNAME=	db-${PORTVERSION:R}
10
DIST_SUBDIR=	bdb
11
12
PATCH_SITES=	http://download.oracle.com/berkeley-db/patches/db/${PORTVERSION:R}/
13
PATCHFILES=	patch.4.7.25.1 patch.4.7.25.2 patch.4.7.25.3
14
PATCH_DIST_STRIP=	-d .. --ignore-whitespace
15
# * patch.4.7.25.1: -----------------------------------------------------------
16
# # [#16406] Replication clients should be able to open a sequence.
17
# * patch.4.7.25.2: -----------------------------------------------------------
18
# # [#16415] DB_ENV->lock_get may self deadlock if user defined locks
19
#	     are used and there is only one lock partition defined.
20
# * patch.4.7.25.3: -----------------------------------------------------------
21
# # [#16541] Fix for dd segfaults.
22
# * patch.4.7.25.4: -----------------------------------------------------------
23
# # [#16299] Fix a bug which could cause a SEGV in __repmgr_available_site if a
24
#            site becomes master after winning an election but is still
25
#            processing client messages.
26
27
# I allow matthias.andree@gmx.de and all freebsd committer to do changes
28
# to this package.
29
30
MAINTAINER=	mandree@FreeBSD.org
31
COMMENT=	The Berkeley DB package, revision 4.7
32
33
DEPRECATED=	Please use databases/db5 or db6 for new installs.
34
35
BDBVER=		${PORTVERSION:R:R}
36
CONFIGURE_ARGS=	--enable-compat185 --enable-dump185 --enable-cxx \
37
		--enable-dynamic --enable-rpc --enable-pthread_api \
38
		--includedir=${PREFIX}/include/${PORTNAME} \
39
		--libdir=${PREFIX}/lib/${PORTNAME} \
40
		--bindir=${PREFIX}/bin/${PORTNAME}
41
CONFIGURE_SCRIPT=	../dist/configure
42
GNU_CONFIGURE=	yes
43
INSTALL_TARGET=	install_include install_lib install_utilities
44
LIBTOOLFILES=	${CONFIGURE_SCRIPT}
45
WRKSRC=		${WRKDIR}/${DISTNAME}/build_unix
46
USE_LDCONFIG=	yes
47
48
INSTALL_TARGET+=	install_docs docdir=${DOCSDIR}
49
PORTDOCS=	*
50
51
post-install:
52
.for i in libdb libdb_cxx
53
	${LN} -s -f ${PORTNAME}/${i}-${BDBVER}.so.0 ${STAGEDIR}${PREFIX}/lib
54
	${LN} -s -f ${i}-${BDBVER}.so.0  ${STAGEDIR}${PREFIX}/lib/${i}-${BDBVER}.so
55
.endfor
56
	cd  ${STAGEDIR}${PREFIX}/bin/${PORTNAME} ; \
57
	for i in * ; do ${LN} -s -f ${PORTNAME}/$$i ../$$i-${BDBVER} ; done
58
59
.include <bsd.port.mk>
(-)databases/db47/distinfo (-8 lines)
Lines 1-8 Link Here
1
SHA256 (bdb/db-4.7.25.tar.gz) = f14fd96dd38915a1d63dcb94a63fbb8092334ceba6b5060760427096f631263e
2
SIZE (bdb/db-4.7.25.tar.gz) = 13124129
3
SHA256 (bdb/patch.4.7.25.1) = e91590af872705efc34414afb702abc630a75c55ba61570dca2216c783e0a83a
4
SIZE (bdb/patch.4.7.25.1) = 2072
5
SHA256 (bdb/patch.4.7.25.2) = 05d6cde0ab1bfdb80394a7a88ff7233d0407f0b09103b0dd3791ebfccbbcca31
6
SIZE (bdb/patch.4.7.25.2) = 2210
7
SHA256 (bdb/patch.4.7.25.3) = e5393cbfc8538cc21cc939d26ceca3e5782b4a4259a644884d91790e18ed39f3
8
SIZE (bdb/patch.4.7.25.3) = 8442
(-)databases/db47/files/patch-dist__configure (-13 lines)
Lines 1-13 Link Here
1
--- ../dist/configure.orig	Wed Dec  5 13:14:02 2001
2
+++ ../dist/configure	Wed Dec  5 13:24:01 2001
3
@@ -20867,8 +20867,8 @@
4
 
5
 MAKEFILE_CC="\$(LIBTOOL) --mode=compile ${MAKEFILE_CC}"
6
-MAKEFILE_SOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK} -avoid-version"
7
+MAKEFILE_SOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK} -version-info 0:0:0"
8
 MAKEFILE_CCLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK}"
9
 MAKEFILE_CXX="\$(LIBTOOL) --mode=compile ${MAKEFILE_CXX}"
10
-MAKEFILE_XSOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK} -avoid-version"
11
+MAKEFILE_XSOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK} -version-info 0:0:0"
12
 MAKEFILE_CXXLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK}"
13
 
(-)databases/db47/files/patch.4.7.25.4 (-183 lines)
Lines 1-183 Link Here
1
*** dbinc/repmgr.h.orig	2009-05-04 10:33:55.000000000 -0400
2
--- dbinc/repmgr.h	2009-05-04 10:27:26.000000000 -0400
3
***************
4
*** 374,379 ****
5
--- 374,380 ----
6
  #define	SITE_FROM_EID(eid)	(&db_rep->sites[eid])
7
  #define	EID_FROM_SITE(s)	((int)((s) - (&db_rep->sites[0])))
8
  #define	IS_VALID_EID(e)		((e) >= 0)
9
+ #define	IS_KNOWN_REMOTE_SITE(e)	((e) >= 0 && ((u_int)(e)) < db_rep->site_cnt)
10
  #define	SELF_EID		INT_MAX
11
  
12
  #define	IS_PEER_POLICY(p) ((p) == DB_REPMGR_ACKS_ALL_PEERS ||		\
13
*** cvotn/rep/rep_elect.c.orig	2009-05-04 10:35:50.000000000 -0400
14
--- cvotn/rep/rep_elect.c	2009-05-04 10:31:24.000000000 -0400
15
***************
16
*** 33,39 ****
17
  static int __rep_fire_elected __P((ENV *, REP *, u_int32_t));
18
  static void __rep_elect_master __P((ENV *, REP *));
19
  static int __rep_tally __P((ENV *, REP *, int, u_int32_t *, u_int32_t, roff_t));
20
! static int __rep_wait __P((ENV *, db_timeout_t *, int *, int, u_int32_t));
21
  
22
  /*
23
   * __rep_elect --
24
--- 33,39 ----
25
  static int __rep_fire_elected __P((ENV *, REP *, u_int32_t));
26
  static void __rep_elect_master __P((ENV *, REP *));
27
  static int __rep_tally __P((ENV *, REP *, int, u_int32_t *, u_int32_t, roff_t));
28
! static int __rep_wait __P((ENV *, db_timeout_t *, int, u_int32_t));
29
  
30
  /*
31
   * __rep_elect --
32
***************
33
*** 55,61 ****
34
  	ENV *env;
35
  	LOG *lp;
36
  	REP *rep;
37
! 	int done, eid, elected, full_elect, locked, in_progress, need_req;
38
  	int ret, send_vote, t_ret;
39
  	u_int32_t ack, ctlflags, egen, nsites, orig_tally, priority, realpri;
40
  	u_int32_t tiebreaker;
41
--- 55,61 ----
42
  	ENV *env;
43
  	LOG *lp;
44
  	REP *rep;
45
! 	int done, elected, full_elect, locked, in_progress, need_req;
46
  	int ret, send_vote, t_ret;
47
  	u_int32_t ack, ctlflags, egen, nsites, orig_tally, priority, realpri;
48
  	u_int32_t tiebreaker;
49
***************
50
*** 181,188 ****
51
  			REP_SYSTEM_UNLOCK(env);
52
  			(void)__rep_send_message(env, DB_EID_BROADCAST,
53
  			    REP_MASTER_REQ, NULL, NULL, 0, 0);
54
! 			ret = __rep_wait(env, &to, &eid,
55
! 			    0, REP_F_EPHASE0);
56
  			REP_SYSTEM_LOCK(env);
57
  			F_CLR(rep, REP_F_EPHASE0);
58
  			switch (ret) {
59
--- 181,187 ----
60
  			REP_SYSTEM_UNLOCK(env);
61
  			(void)__rep_send_message(env, DB_EID_BROADCAST,
62
  			    REP_MASTER_REQ, NULL, NULL, 0, 0);
63
! 			ret = __rep_wait(env, &to, 0, REP_F_EPHASE0);
64
  			REP_SYSTEM_LOCK(env);
65
  			F_CLR(rep, REP_F_EPHASE0);
66
  			switch (ret) {
67
***************
68
*** 286,296 ****
69
  		REP_SYSTEM_LOCK(env);
70
  		goto vote;
71
  	}
72
! 	ret = __rep_wait(env, &to, &eid, full_elect, REP_F_EPHASE1);
73
  	switch (ret) {
74
  		case 0:
75
  			/* Check if election complete or phase complete. */
76
! 			if (eid != DB_EID_INVALID && !IN_ELECTION(rep)) {
77
  				RPRINT(env, DB_VERB_REP_ELECT,
78
  				    (env, "Ended election phase 1"));
79
  				goto edone;
80
--- 285,295 ----
81
  		REP_SYSTEM_LOCK(env);
82
  		goto vote;
83
  	}
84
! 	ret = __rep_wait(env, &to, full_elect, REP_F_EPHASE1);
85
  	switch (ret) {
86
  		case 0:
87
  			/* Check if election complete or phase complete. */
88
! 			if (!IN_ELECTION(rep)) {
89
  				RPRINT(env, DB_VERB_REP_ELECT,
90
  				    (env, "Ended election phase 1"));
91
  				goto edone;
92
***************
93
*** 398,412 ****
94
  		REP_SYSTEM_LOCK(env);
95
  		goto i_won;
96
  	}
97
! 	ret = __rep_wait(env, &to, &eid, full_elect, REP_F_EPHASE2);
98
  	RPRINT(env, DB_VERB_REP_ELECT,
99
  	    (env, "Ended election phase 2 %d", ret));
100
  	switch (ret) {
101
  		case 0:
102
! 			if (eid != DB_EID_INVALID)
103
! 				goto edone;
104
! 			ret = DB_REP_UNAVAIL;
105
! 			break;
106
  		case DB_REP_EGENCHG:
107
  			if (to > timeout)
108
  				to = timeout;
109
--- 397,408 ----
110
  		REP_SYSTEM_LOCK(env);
111
  		goto i_won;
112
  	}
113
! 	ret = __rep_wait(env, &to, full_elect, REP_F_EPHASE2);
114
  	RPRINT(env, DB_VERB_REP_ELECT,
115
  	    (env, "Ended election phase 2 %d", ret));
116
  	switch (ret) {
117
  		case 0:
118
! 			goto edone;
119
  		case DB_REP_EGENCHG:
120
  			if (to > timeout)
121
  				to = timeout;
122
***************
123
*** 1050,1062 ****
124
  	ENV *env;
125
  	REP *rep;
126
  {
127
- 	/*
128
- 	 * We often come through here twice, sometimes even more.  We mustn't
129
- 	 * let the redundant calls affect stats counting.  But rep_elect relies
130
- 	 * on this first part for setting eidp.
131
- 	 */
132
- 	rep->master_id = rep->eid;
133
- 
134
  	if (F_ISSET(rep, REP_F_MASTERELECT | REP_F_MASTER)) {
135
  		/* We've been through here already; avoid double counting. */
136
  		return;
137
--- 1046,1051 ----
138
***************
139
*** 1093,1102 ****
140
  	(timeout > 5000000) ? 500000 : ((timeout >= 10) ? timeout / 10 : 1);
141
  
142
  static int
143
! __rep_wait(env, timeoutp, eidp, full_elect, flags)
144
  	ENV *env;
145
  	db_timeout_t *timeoutp;
146
! 	int *eidp, full_elect;
147
  	u_int32_t flags;
148
  {
149
  	DB_REP *db_rep;
150
--- 1082,1091 ----
151
  	(timeout > 5000000) ? 500000 : ((timeout >= 10) ? timeout / 10 : 1);
152
  
153
  static int
154
! __rep_wait(env, timeoutp, full_elect, flags)
155
  	ENV *env;
156
  	db_timeout_t *timeoutp;
157
! 	int full_elect;
158
  	u_int32_t flags;
159
  {
160
  	DB_REP *db_rep;
161
***************
162
*** 1174,1180 ****
163
  			F_CLR(rep, REP_F_EGENUPDATE);
164
  			ret = DB_REP_EGENCHG;
165
  		} else if (phase_over) {
166
- 			*eidp = rep->master_id;
167
  			done = 1;
168
  			ret = 0;
169
  		}
170
--- 1163,1168 ----
171
*** cvotn/repmgr/repmgr_net.c.orig	2009-05-04 10:34:46.000000000 -0400
172
--- cvotn/repmgr/repmgr_net.c	2009-05-04 10:27:26.000000000 -0400
173
***************
174
*** 100,105 ****
175
--- 100,107 ----
176
  		    control, rec, &nsites_sent, &npeers_sent)) != 0)
177
  			goto out;
178
  	} else {
179
+ 		DB_ASSERT(env, IS_KNOWN_REMOTE_SITE(eid));
180
+ 
181
  		/*
182
  		 * If this is a request that can be sent anywhere, then see if
183
  		 * we can send it to our peer (to save load on the master), but
(-)databases/db47/pkg-descr (-11 lines)
Lines 1-11 Link Here
1
Oracle Berkeley DB is a family of open source embeddable databases
2
that allows developers to incorporate within their applications a
3
fast, scalable, transactional database engine with industrial grade
4
reliability and availability. As a result, customers and end-users
5
will experience an application that simply works, reliably manages
6
data, can scale under extreme load, but requires no ongoing database
7
administration. As a developer, you can focus on your application and
8
be confident that Oracle Berkeley DB will manage your persistence
9
needs.
10
11
WWW:	http://www.oracle.com/us/products/database/berkeley-db/db/
(-)databases/db47/pkg-plist (-52 lines)
Lines 1-52 Link Here
1
bin/berkeley_db_svc-4.7
2
bin/db47/berkeley_db_svc
3
bin/db47/db_archive
4
bin/db47/db_checkpoint
5
bin/db47/db_codegen
6
bin/db47/db_deadlock
7
bin/db47/db_dump
8
bin/db47/db_dump185
9
bin/db47/db_hotbackup
10
bin/db47/db_load
11
bin/db47/db_printlog
12
bin/db47/db_recover
13
bin/db47/db_stat
14
bin/db47/db_upgrade
15
bin/db47/db_verify
16
bin/db_archive-4.7
17
bin/db_checkpoint-4.7
18
bin/db_codegen-4.7
19
bin/db_deadlock-4.7
20
bin/db_dump-4.7
21
bin/db_dump185-4.7
22
bin/db_hotbackup-4.7
23
bin/db_load-4.7
24
bin/db_printlog-4.7
25
bin/db_recover-4.7
26
bin/db_stat-4.7
27
bin/db_upgrade-4.7
28
bin/db_verify-4.7
29
include/db47/db.h
30
include/db47/db_185.h
31
include/db47/db_cxx.h
32
lib/db47/libdb-4.7.a
33
lib/db47/libdb-4.7.la
34
lib/db47/libdb-4.7.so
35
lib/db47/libdb-4.7.so.0
36
lib/db47/libdb-4.so
37
lib/db47/libdb.a
38
lib/db47/libdb.so
39
lib/db47/libdb_cxx-4.7.a
40
lib/db47/libdb_cxx-4.7.la
41
lib/db47/libdb_cxx-4.7.so
42
lib/db47/libdb_cxx-4.7.so.0
43
lib/db47/libdb_cxx-4.so
44
lib/db47/libdb_cxx.a
45
lib/db47/libdb_cxx.so
46
lib/libdb-4.7.so
47
lib/libdb-4.7.so.0
48
lib/libdb_cxx-4.7.so
49
lib/libdb_cxx-4.7.so.0
50
@dirrmtry lib/db47
51
@dirrmtry include/db47
52
@dirrmtry bin/db47
(-)databases/fortytwo-bdb/Makefile (-1 / +1 lines)
Lines 21-27 Link Here
21
USE_GNUSTEP_LOCAL_LIBS+=	Encore:${ENCORE_PORT}
21
USE_GNUSTEP_LOCAL_LIBS+=	Encore:${ENCORE_PORT}
22
DEFAULT_LIBVERSION=	0.1
22
DEFAULT_LIBVERSION=	0.1
23
USE_GNUSTEP_LDCONFIG=	${GNUSTEP_LOCAL_LIBRARIES}
23
USE_GNUSTEP_LDCONFIG=	${GNUSTEP_LOCAL_LIBRARIES}
24
USE_BDB=	43
24
USE_BDB=	43+
25
25
26
WRKSRC=		${WRKDIR}/BDB-${PORTVERSION}
26
WRKSRC=		${WRKDIR}/BDB-${PORTVERSION}
27
DOCSDIR=	${GNUSTEP_PREFIX}/Local/Library/Documentation/BDB
27
DOCSDIR=	${GNUSTEP_PREFIX}/Local/Library/Documentation/BDB
(-)mail/popular/Makefile (-14 / +1 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	popular
4
PORTNAME=	popular
5
PORTVERSION=	1.5.5
5
PORTVERSION=	1.5.5
6
PORTREVISION=	4
6
PORTREVISION=	5
7
CATEGORIES=	mail
7
CATEGORIES=	mail
8
MASTER_SITES=	http://www.remote.org/jochen/mail/popular/download/
8
MASTER_SITES=	http://www.remote.org/jochen/mail/popular/download/
9
9
Lines 25-43 Link Here
25
25
26
USE_RC_SUBR=	pcheckd pproxy pserv 0ringd
26
USE_RC_SUBR=	pcheckd pproxy pserv 0ringd
27
27
28
OPTIONS_DEFINE=	DB4
29
OPTIONS_DEFAULT=	DB4
30
OPTIONS_SUB=	yes
31
32
DB4_DESC=	Build db4 pdm module
33
DB4_LIB_DEPENDS=	libdb4.so:${PORTSDIR}/databases/db4
34
35
.include <bsd.port.options.mk>
36
37
.if ${PORT_OPTIONS:MDB4}
38
PDM_MODULES+=	db4
39
.endif
40
41
post-install:
28
post-install:
42
	@${MKDIR} ${STAGEDIR}${ETCDIR}
29
	@${MKDIR} ${STAGEDIR}${ETCDIR}
43
	${INSTALL_DATA} ${WRKSRC}/conf/pproxy.rc ${STAGEDIR}${ETCDIR}/pproxy.rc.sample
30
	${INSTALL_DATA} ${WRKSRC}/conf/pproxy.rc ${STAGEDIR}${ETCDIR}/pproxy.rc.sample
(-)mail/popular/pkg-plist (-3 / +3 lines)
Lines 29-37 Link Here
29
lib/popular/libpdm_master-1.5.5.so
29
lib/popular/libpdm_master-1.5.5.so
30
lib/popular/libpdm_master.a
30
lib/popular/libpdm_master.a
31
lib/popular/libpdm_master.so
31
lib/popular/libpdm_master.so
32
%%DB4%%lib/popular/libpdm_db4-1.5.5.so
32
@comment %%DB4%%lib/popular/libpdm_db4-1.5.5.so
33
%%DB4%%lib/popular/libpdm_db4.a
33
@comment %%DB4%%lib/popular/libpdm_db4.a
34
%%DB4%%lib/popular/libpdm_db4.so
34
@comment %%DB4%%lib/popular/libpdm_db4.so
35
man/man1/pcheck.1.gz
35
man/man1/pcheck.1.gz
36
man/man1/pcontrol.1.gz
36
man/man1/pcontrol.1.gz
37
man/man1/pdeliver.1.gz
37
man/man1/pdeliver.1.gz
(-)net/openldap24-server/Makefile (-15 / +1 lines)
Lines 351-376 Link Here
351
			BACK_HDB="@comment "
351
			BACK_HDB="@comment "
352
.else
352
.else
353
353
354
WITH_BDB_VER?=		46
354
USE_BDB=		48+
355
USE_BDB=		44+
356
355
357
# XXX Can BDB 5.x use XY instead of X as version?
358
.if ${WITH_BDB_VER} >= 43 || ${WITH_BDB_VER} == 5 || ${WITH_BDB_VER} == 6
359
CONFIGURE_ARGS+=	--enable-bdb=${BACKEND_ENABLE} \
356
CONFIGURE_ARGS+=	--enable-bdb=${BACKEND_ENABLE} \
360
			--enable-hdb=${BACKEND_ENABLE}
357
			--enable-hdb=${BACKEND_ENABLE}
361
PLIST_SUB+=		BACK_BDB=${BACKEND_PLIST} \
358
PLIST_SUB+=		BACK_BDB=${BACKEND_PLIST} \
362
			BACK_HDB=${BACKEND_PLIST}
359
			BACK_HDB=${BACKEND_PLIST}
363
.elif ${WITH_BDB_VER} >= 4
364
CONFIGURE_ARGS+=	--disable-bdb \
365
			--enable-hdb=${BACKEND_ENABLE}
366
PLIST_SUB+=		BACK_BDB="@comment " \
367
			BACK_HDB=${BACKEND_PLIST}
368
.elif ${WITH_BDB_VER} == 3
369
CONFIGURE_ARGS+=	--disable-bdb \
370
			--disable-hdb
371
PLIST_SUB+=		BACK_BDB="@comment " \
372
			BACK_HDB="@comment "
373
.endif
374
360
375
CPPFLAGS+=		-I${BDB_INCLUDE_DIR}
361
CPPFLAGS+=		-I${BDB_INCLUDE_DIR}
376
LDFLAGS+=		-L${BDB_LIB_DIR}
362
LDFLAGS+=		-L${BDB_LIB_DIR}
(-)net-p2p/jigdo/Makefile (-2 / +1 lines)
Lines 15-21 Link Here
15
USES=		gmake tar:bzip2
15
USES=		gmake tar:bzip2
16
USE_SUBMAKE=	yes
16
USE_SUBMAKE=	yes
17
GNU_CONFIGURE=	yes
17
GNU_CONFIGURE=	yes
18
WITH_BDB_VER?=	43
19
18
20
CPPFLAGS+=	-I${LOCALBASE}/include
19
CPPFLAGS+=	-I${LOCALBASE}/include
21
20
Lines 35-41 Link Here
35
BDB_CONFIGURE_OFF=	--without-libdb
34
BDB_CONFIGURE_OFF=	--without-libdb
36
BDB_CPPFLAGS=		-I${BDB_INCLUDE_DIR}
35
BDB_CPPFLAGS=		-I${BDB_INCLUDE_DIR}
37
BDB_LIBS=		-L${BDB_LIB_DIR}
36
BDB_LIBS=		-L${BDB_LIB_DIR}
38
BDB_USE=		BDB=${WITH_BDB_VER}
37
BDB_USE=		BDB=48+
39
38
40
NLS_CONFIGURE_ENABLE=	nls
39
NLS_CONFIGURE_ENABLE=	nls
41
NLS_USES=		gettext
40
NLS_USES=		gettext
(-)security/pks/Makefile (-6 / +7 lines)
Lines 3-8 Link Here
3
3
4
PORTNAME=		pks
4
PORTNAME=		pks
5
PORTVERSION=		0.9.6.20040312
5
PORTVERSION=		0.9.6.20040312
6
PORTREVISION=		1
6
CATEGORIES=		security www
7
CATEGORIES=		security www
7
MASTER_SITES=		http://pks.sourceforge.net/:sf ${MASTER_SITE_LOCAL}:local
8
MASTER_SITES=		http://pks.sourceforge.net/:sf ${MASTER_SITE_LOCAL}:local
8
MASTER_SITE_SUBDIR=	.:sf mandree:local
9
MASTER_SITE_SUBDIR=	.:sf mandree:local
Lines 11-27 Link Here
11
MAINTAINER=	tphilipp@potion-studios.com
12
MAINTAINER=	tphilipp@potion-studios.com
12
COMMENT=	PGP Public Key Server
13
COMMENT=	PGP Public Key Server
13
14
14
LICENSE=        BSD4CLAUSE
15
LICENSE=	BSD4CLAUSE
15
LICENSE_FILE=	${WRKSRC}/LICENSE
16
LICENSE_FILE=	${WRKSRC}/LICENSE
16
17
17
WRKSRC=		${WRKDIR}/${PORTNAME}
18
WRKSRC=		${WRKDIR}/${PORTNAME}
18
19
19
USE_GCC=	any
20
USE_GCC=	any
20
USE_BDB=	yes
21
USE_BDB=	48+
21
WANT_BDB_VER=	41 # pks dumps core with 42 and doesn't build with 43+
22
22
23
OPTIONS_DEFINE= DOCS
23
OPTIONS_DEFINE=	DOCS
24
PORTDOCS=       pks_help.* README EMAIL
24
PORTDOCS=	pks_help.* README EMAIL
25
GNU_CONFIGURE=	yes
25
GNU_CONFIGURE=	yes
26
USE_AUTOTOOLS=	autoconf
26
USE_AUTOTOOLS=	autoconf
27
CONFIGURE_ARGS=	--datadir=${PREFIX}/share/pks --localstatedir=/var/pks \
27
CONFIGURE_ARGS=	--datadir=${PREFIX}/share/pks --localstatedir=/var/pks \
Lines 31-40 Link Here
31
LDFLAGS+=	-L${LOCALBASE}/lib
31
LDFLAGS+=	-L${LOCALBASE}/lib
32
CONFIGURE_ENV=	DBLIB="-L${BDB_LIB_DIR} -l${BDB_LIB_NAME}" DBINC=-I${BDB_INCLUDE_DIR} DBHDR=db.h
32
CONFIGURE_ENV=	DBLIB="-L${BDB_LIB_DIR} -l${BDB_LIB_NAME}" DBINC=-I${BDB_INCLUDE_DIR} DBHDR=db.h
33
33
34
35
SUB_FILES=	pkg-message
34
SUB_FILES=	pkg-message
36
PKGMESSAGE=	${WRKDIR}/pkg-message
35
PKGMESSAGE=	${WRKDIR}/pkg-message
37
36
37
PLIST_SUB+=	RESETPREFIX=${PREFIX}
38
38
USE_RC_SUBR=	pksd
39
USE_RC_SUBR=	pksd
39
40
40
.include <bsd.port.options.mk>
41
.include <bsd.port.options.mk>
(-)security/pks/files/patch-configure.in (-2 / +2 lines)
Lines 1-5 Link Here
1
--- ./configure.in.orig	2011-03-21 20:49:39.000000000 +0100
1
--- ./configure.in.orig	2004-01-18 00:19:56.000000000 +0100
2
+++ ./configure.in	2011-03-21 20:50:42.000000000 +0100
2
+++ ./configure.in	2014-08-15 18:32:37.000000000 +0200
3
@@ -74,126 +74,6 @@
3
@@ -74,126 +74,6 @@
4
 # Checks for libraries.
4
 # Checks for libraries.
5
 dnl Checks for Berkeley DB
5
 dnl Checks for Berkeley DB
(-)security/pks/files/patch-mkpksdconf.in (-2 / +2 lines)
Lines 1-5 Link Here
1
--- ./mkpksdconf.in.orig	2014-01-22 15:36:39.574285045 -0500
1
--- ./mkpksdconf.in.orig	2003-02-28 18:27:20.000000000 +0100
2
+++ ./mkpksdconf.in	2014-01-22 15:37:49.289280305 -0500
2
+++ ./mkpksdconf.in	2014-08-15 18:32:37.000000000 +0200
3
@@ -44,7 +44,7 @@
3
@@ -44,7 +44,7 @@
4
 
4
 
5
 cat << EOF
5
 cat << EOF
(-)security/pks/pkg-descr (-1 / +1 lines)
Lines 1-4 Link Here
1
This program implements a standard PGP Key Server, which can be assumed 
1
This program implements a standard PGP Key Server, which can be assumed 
2
to be in addition to the public key server at MIT.
2
to be in addition to the public key server at MIT.
3
3
4
WWW:	http://www.mit.edu/people/marc/pks/
4
WWW: http://www.mit.edu/people/marc/pks/
(-)security/pks/pkg-plist (-1 / +3 lines)
Lines 17-23 Link Here
17
man/man8/pksclient.8.gz
17
man/man8/pksclient.8.gz
18
man/man8/pksd.8.gz
18
man/man8/pksd.8.gz
19
man/man8/pksdctl.8.gz
19
man/man8/pksdctl.8.gz
20
/var/pks/index.html
20
@cwd /
21
var/pks/index.html
22
@cwd %%RESETPREFIX%%
21
@unexec rmdir "/var/pks/db" >/dev/null 2>&1 || :
23
@unexec rmdir "/var/pks/db" >/dev/null 2>&1 || :
22
@unexec rmdir "/var/pks/incoming" >/dev/null 2>&1 || :
24
@unexec rmdir "/var/pks/incoming" >/dev/null 2>&1 || :
23
@unexec rmdir "/var/pks" >/dev/null 2>&1 || :
25
@unexec rmdir "/var/pks" >/dev/null 2>&1 || :
(-)sysutils/cfengine22/Makefile (-3 / +2 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	cfengine
4
PORTNAME=	cfengine
5
PORTVERSION=	2.2.10
5
PORTVERSION=	2.2.10
6
PORTREVISION=	1
6
PORTREVISION=	2
7
CATEGORIES=	sysutils
7
CATEGORIES=	sysutils
8
MASTER_SITES=	https://s3.amazonaws.com/cfengine.package-repos/tarballs/
8
MASTER_SITES=	https://s3.amazonaws.com/cfengine.package-repos/tarballs/
9
PKGNAMESUFFIX=	22
9
PKGNAMESUFFIX=	22
Lines 21-28 Link Here
21
USES=		libtool makeinfo shebangfix
21
USES=		libtool makeinfo shebangfix
22
SHEBANG_FILES=	contrib/cfdoc
22
SHEBANG_FILES=	contrib/cfdoc
23
23
24
WITH_BDB_VER?=	46
24
USE_BDB=	48+
25
USE_BDB=	yes
26
USE_OPENSSL=	yes
25
USE_OPENSSL=	yes
27
GNU_CONFIGURE=	yes
26
GNU_CONFIGURE=	yes
28
CONFIGURE_ARGS=	--with-docs \
27
CONFIGURE_ARGS=	--with-docs \
(-)sysutils/cfengine22/pkg-plist (-1 lines)
Lines 52-57 Link Here
52
%%PORTDOCS%%%%DOCSDIR%%/TODO
52
%%PORTDOCS%%%%DOCSDIR%%/TODO
53
%%PORTDOCS%%%%DOCSDIR%%/INSTALL
53
%%PORTDOCS%%%%DOCSDIR%%/INSTALL
54
%%PORTDOCS%%%%DOCSDIR%%/NEWS
54
%%PORTDOCS%%%%DOCSDIR%%/NEWS
55
%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
56
%%PORTDOCS%%@dirrm %%DOCSDIR%%
55
%%PORTDOCS%%@dirrm %%DOCSDIR%%
57
%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
56
%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
(-)sysutils/cfengine32/Makefile (-3 / +2 lines)
Lines 14-20 Link Here
14
COMMENT=	Systems administration tool for networks
14
COMMENT=	Systems administration tool for networks
15
15
16
LATEST_LINK=	cfengine32
16
LATEST_LINK=	cfengine32
17
FETCH_BEFORE_ARGS=   -o ${DISTDIR}/${DISTFILES}
17
FETCH_BEFORE_ARGS=	-o ${DISTDIR}/${DISTFILES}
18
18
19
CONFLICTS=	cfengine-[2]* cfengine-3.[345]* cfengine-devel-*
19
CONFLICTS=	cfengine-[2]* cfengine-3.[345]* cfengine-devel-*
20
20
Lines 23-30 Link Here
23
LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
23
LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
24
24
25
USES=		libtool
25
USES=		libtool
26
WITH_BDB_VER?=	47
26
USE_BDB=	48+
27
USE_BDB=	yes
28
USE_OPENSSL=	yes
27
USE_OPENSSL=	yes
29
GNU_CONFIGURE=	yes
28
GNU_CONFIGURE=	yes
30
# EXAMPLESDIR=	${PREFIX}/share/examples/cfengine3
29
# EXAMPLESDIR=	${PREFIX}/share/examples/cfengine3

Return to bug 192690