diff options
162 files changed, 403 insertions, 2077 deletions
@@ -6467,3 +6467,12 @@ deskutils/horde3-nag||2014-08-20|Has expired: EOL in April 2012 devel/horde3-whups||2014-08-20|Has expired: EOL in April 2012 mail/horde3-imp||2014-08-20|Has expired: EOL in April 2012 www/horde3-base||2014-08-20|Has expired: EOL in April 2012 +databases/db4|databases/db48|2014-08-15|Superseded by databases/db48 +databases/db41|databases/db48|2014-08-15|Superseded by databases/db48 +databases/db41-nocrypto|databases/db48|2014-08-15|Superseded by databases/db48 +databases/db42|databases/db48|2014-08-15|Superseded by databases/db48 +databases/db42-nocrypto|databases/db48|2014-08-15|Superseded by databases/db48 +databases/db43|databases/db48|2014-08-15|Superseded by databases/db48 +databases/db44|databases/db48|2014-08-15|Superseded by databases/db48 +databases/db46|databases/db48|2014-08-15|Superseded by databases/db48 +databases/db47|databases/db48|2014-08-15|Superseded by databases/db48 diff --git a/Mk/bsd.database.mk b/Mk/bsd.database.mk index adc709de538d..b593bc2ee4d6 100644 --- a/Mk/bsd.database.mk +++ b/Mk/bsd.database.mk @@ -50,11 +50,13 @@ Database_Include_MAINTAINER= ports@FreeBSD.org # PGSQL_VER # - Detected PostgreSQL version. ## -# USE_BDB - Add Berkeley DB library dependency. +# USE_BDB - Add Berkeley DB library dependency. # If no version is given (by the maintainer via the port or # by the user via defined variable), try to find the # currently installed version. Fall back to default if -# necessary (db41+). +# necessary (db5 if compatible). +# This adds a "debug-bdb" make target which will dump the +# related data. # INVALID_BDB_VER # - This variable can be defined when the port does not # support one or more versions of Berkeley DB. @@ -68,6 +70,14 @@ Database_Include_MAINTAINER= ports@FreeBSD.org # version. # WITH_BDB_HIGHEST # - Use the highest installed version of Berkeley DB. +# WITH_BDB6_PERMITTED +# - If defined, BerkeleyDB 6 is added to the +# default version set, making it eligible even +# if not already installed. This is due to its +# stricter Affero GNU Public License. +# +# These variables will then be filled in by this .mk file: +# # BDB_LIB_NAME # - This variable is automatically set to the name of the # Berkeley DB library (default: db41). @@ -290,195 +300,181 @@ LDFLAGS+= -L${LOCALBASE}/lib .endif # USE_PGSQL .if defined(USE_BDB) +# TODO: avoid malformed conditional with invalid USE_BDB/WITH_BDB_VER +# check if + works properly from test builds 01h12m23s -_DB_PORTS= 40 41 42 43 44 46 47 48 5 6 40+ 41+ 42+ 43+ 44+ 46+ 47+ 48+ 5+ 6+ -# Dependence lines for different db versions -db40_DEPENDS= libdb4.so:${PORTSDIR}/databases/db4 -db41_DEPENDS= libdb41.so:${PORTSDIR}/databases/db41 -db42_DEPENDS= libdb-4.2.so:${PORTSDIR}/databases/db42 -db43_DEPENDS= libdb-4.3.so:${PORTSDIR}/databases/db43 -db44_DEPENDS= libdb-4.4.so:${PORTSDIR}/databases/db44 -db46_DEPENDS= libdb-4.6.so:${PORTSDIR}/databases/db46 -db47_DEPENDS= libdb-4.7.so:${PORTSDIR}/databases/db47 +_USE_BDB_save:=${USE_BDB} +_WITH_BDB_VER_save:=${WITH_BDB_VER} + +_DB_PORTS= 48 5 6 +_DB_DEFAULTS= 48 5 # does not include 6 due to different licensing +# but user can re-add it through WITH_BDB6_PERMITTED +. if defined(WITH_BDB6_PERMITTED) +_DB_DEFAULTS+= 6 +. endif + +# Dependency lines for different db versions db48_DEPENDS= libdb-4.8.so:${PORTSDIR}/databases/db48 db5_DEPENDS= libdb-5.3.so:${PORTSDIR}/databases/db5 db6_DEPENDS= libdb-6.1.so:${PORTSDIR}/databases/db6 # Detect db versions by finding some files -db40_FIND= ${LOCALBASE}/include/db4/db.h -db41_FIND= ${LOCALBASE}/include/db41/db.h -db42_FIND= ${LOCALBASE}/include/db42/db.h -db43_FIND= ${LOCALBASE}/include/db43/db.h -db44_FIND= ${LOCALBASE}/include/db44/db.h -db46_FIND= ${LOCALBASE}/include/db46/db.h -db47_FIND= ${LOCALBASE}/include/db47/db.h db48_FIND= ${LOCALBASE}/include/db48/db.h db5_FIND= ${LOCALBASE}/include/db5/db.h db6_FIND= ${LOCALBASE}/include/db6/db.h -# For specifying [40, 41, ..]+ -_DB_40P= 40 ${_DB_41P} -_DB_41P= 41 ${_DB_42P} -_DB_42P= 42 ${_DB_43P} -_DB_43P= 43 ${_DB_44P} -_DB_44P= 44 ${_DB_46P} -_DB_46P= 46 ${_DB_47P} -_DB_47P= 47 ${_DB_48P} -_DB_48P= 48 ${_DB_5P} -_DB_5P= 5 ${_DB_6P} -_DB_6P= 6 - # Override the global WITH_BDB_VER with the # port specific <UNIQUENAME>_WITH_BDB_VER .if defined(${UNIQUENAME:tu:S,-,_,}_WITH_BDB_VER) WITH_BDB_VER= ${${UNIQUENAME:tu:S,-,_,}_WITH_BDB_VER} .endif +# Override USE_BDB with global WITH_BDB_VER .if defined(WITH_BDB_VER) -. if ${WITH_BDB_VER} == 4 -USE_BDB= 40 -. elif ${WITH_BDB_VER} != 1 +. if ${WITH_BDB_VER} != 1 USE_BDB= ${WITH_BDB_VER} . endif .endif -_WANT_BDB_VER= ${USE_BDB} -# Assume the default bdb version as 41 -.if ${USE_BDB:tl} == "yes" -_WANT_BDB_VER= 41+ +# Override USE_BDB with maintainer's WANT_BDB_VER +.if defined(WANT_BDB_VER) +USE_BDB= ${WANT_BDB_VER} .endif -# Detect bdb version -_BDB_VER= no -_BDB_IGNORE= no +# Compatiblity hack: +# upgrade older plussed versions to 48+ +_BDB_OLDPLUSVERS=4+ 40+ 41+ 42+ 43+ 44+ 45+ 46+ 47+ +.for i in ${USE_BDB} +. if ${_BDB_OLDPLUSVERS:M${i}} +USE_BDB:= 48+ +. endif +.endfor -# Override the user defined WITH_BDB_VER with the WANT_BDB_VER -.if defined(WANT_BDB_VER) -.for bdb in ${_DB_PORTS} -.if ${WANT_BDB_VER} == "${bdb}" && ${_BDB_VER} == "no" -_BDB_VER= ${WANT_BDB_VER} +.if ${USE_BDB} == yes +USE_BDB:= 48+ .endif -.endfor -USE_BDB= ${WANT_BDB_VER} -.else + +# 1. detect installed versions +_INST_BDB_VER= .for bdb in ${_DB_PORTS} -.if ${_WANT_BDB_VER} == "${bdb}" && ${_BDB_VER} == "no" -_MATCHED_DB_VER:= ${bdb:S/+//} -. if ${_MATCHED_DB_VER} == "${bdb}" -# USE_BDB is exactly specified -_BDB_VER= ${bdb} +. if exists(${db${bdb}_FIND}) +_INST_BDB_VER+=${bdb} +. endif +.endfor + +# 2. parse supported versions: +# 2a. build list from USE_BDB +_SUPP_BDB_VER= +_USE_BDB:=${USE_BDB:C,\+$,,:C/(.)(.)$/\1.\2/} +.if !empty(USE_BDB:M*+) +. for bdb in ${_DB_PORTS:C/(.)(.)$/\1.\2/} +. if ${_USE_BDB} <= ${bdb} +_SUPP_BDB_VER+=${bdb:C/\.//} +. endif +. endfor .else -# USE_BDB is specified as VER+ -. for dbx in ${_DB_${_MATCHED_DB_VER}P} -. if exists(${db${dbx}_FIND}) -_BRKDB= no -# Skip versions we are incompatible with -. if defined(INVALID_BDB_VER) -_CHK_BDB:= ${dbx} -. for BRKDB in ${INVALID_BDB_VER} -. if ${_CHK_BDB} == "${BRKDB}" -_BRKDB= yes -. endif -. endfor -. endif -. if ${_BRKDB} == no -. if defined(WITH_BDB_HIGHEST) -# Use the highest version of Berkeley DB found -_BDB_VER= ${dbx} -. elif ${_BDB_VER} == no -# Use the first Berkeley DB found -_BDB_VER= ${dbx} -. endif -. endif -. endif -. endfor -. if ${_BDB_VER} == "no" -# No existing db4 version is detected in system -_BDB_VER= ${_MATCHED_DB_VER} +_SUPP_BDB_VER=${USE_BDB} +.endif +# 2b. expand INVALID_BDB_VER if given with "+": +.if !empty(INVALID_BDB_VER:M*+) +_INV_BDB:=${INVALID_BDB_VER:C,\+$,,:C/(.)(.)$/\1.\2/} +_INV_BDB_VER:= +. for bdb in ${_DB_PORTS:C/(.)(.)$/\1.\2/} +. if ${_INV_BDB} <= ${bdb} +_INV_BDB_VER+=${bdb:C/\.//} . endif -. endif +. endfor +.else +_INV_BDB_VER:=${INVALID_BDB_VER} .endif +# 2c. strip versions from INVALID_BDB_VER out of _SUPP_BDB_VER +.for unsupp in ${_INV_BDB_VER} +_SUPP_BDB_VER:=${_SUPP_BDB_VER:N${unsupp}} .endfor + +# 3a. calculate intersection in _INST_BDB_VER to see if there +# is a usable installed version +.for i in ${_INST_BDB_VER} +. if empty(_SUPP_BDB_VER:M${i}) +_INST_BDB_VER:= ${_INST_BDB_VER:N${i}} +. endif +.endfor +_ELIGIBLE_BDB_VER:=${_INST_BDB_VER} + +# 3b. if there is no usable version installed, check defaults +.if empty(_INST_BDB_VER) +_DFLT_BDB_VER:=${_DB_DEFAULTS} +# make sure we use a reasonable version for package builds +_WITH_BDB_HIGHEST=yes +. for i in ${_DFLT_BDB_VER} +. if empty(_SUPP_BDB_VER:M${i}) +_DFLT_BDB_VER:= ${_DFLT_BDB_VER:N${i}} +. endif +. endfor +_ELIGIBLE_BDB_VER:=${_DFLT_BDB_VER} .endif -# USE_BDB is specified incorrectly, so mark this as IGNORE -.if ${_BDB_VER} == "no" -IGNORE= cannot install: unknown Berkeley DB version: ${USE_BDB} -.else -# Now check if we can use it -. if defined(INVALID_BDB_VER) -. for VER in ${INVALID_BDB_VER} -_CHK_PLUS:= ${VER:S/+//} -# INVALID_BDB_VER is specified as VER+ -. if ${_CHK_PLUS} != "${VER}" -. if ${_BDB_VER} == "${_CHK_PLUS}" -_BDB_IGNORE= yes -. else -. for VER_P in ${_DB_${_CHK_PLUS}P} -. if ${_BDB_VER} == "${VER_P}" -_BDB_IGNORE= yes -. endif -. endfor -. endif -. elif ${_BDB_VER} == "${VER}" -_BDB_IGNORE= yes -. endif -. endfor +# 4. elect a version +_BDB_VER= +.for i in ${_ELIGIBLE_BDB_VER} +. if !empty(WITH_BDB_HIGHEST) || !empty(_WITH_BDB_HIGHEST) || empty(${_BDB_VER}) +_BDB_VER:=${i} . endif -. if ${_BDB_IGNORE} == "yes" -IGNORE= cannot install: does not work with Berkeley DB version ${_BDB_VER} (${INVALID_BDB_VER} not supported) -. else -# Now add the dependency on Berkeley DB ${_BDB_VER) version -# This is for ports that want to link Berkeley DB statically, such -# as devel/subversion, if the corresponding option is active: -.if defined(BDB_BUILD_DEPENDS) -BUILD_DEPENDS+= ${db${_BDB_VER}_FIND}:${db${_BDB_VER}_DEPENDS:C/^libdb.*://} +.endfor + +# 5. catch errors or set variables +.if empty(_BDB_VER) +IGNORE= cannot install: no eligible BerkeleyDB version. Requested: ${USE_BDB}, incompatible: ${_INV_BDB_VER}. Try: make debug-bdb .else +. if defined(BDB_BUILD_DEPENDS) +BUILD_DEPENDS+= ${db${_BDB_VER}_FIND}:${db${_BDB_VER}_DEPENDS:C/^libdb.*://} +. else LIB_DEPENDS+= ${db${_BDB_VER}_DEPENDS} -.endif -. if ${_BDB_VER} == 40 -BDB_LIB_NAME= db4 -BDB_LIB_CXX_NAME= db4_cxx -BDB_INCLUDE_DIR= ${LOCALBASE}/include/db4 -. elif ${_BDB_VER} == 42 -BDB_LIB_NAME= db-4.2 -BDB_LIB_CXX_NAME= db_cxx-4.2 -BDB_LIB_DIR= ${LOCALBASE}/lib/db42 -. elif ${_BDB_VER} == 43 -BDB_LIB_NAME= db-4.3 -BDB_LIB_CXX_NAME= db_cxx-4.3 -BDB_LIB_DIR= ${LOCALBASE}/lib/db43 -. elif ${_BDB_VER} == 44 -BDB_LIB_NAME= db-4.4 -BDB_LIB_CXX_NAME= db_cxx-4.4 -BDB_LIB_DIR= ${LOCALBASE}/lib/db44 -. elif ${_BDB_VER} == 46 -BDB_LIB_NAME= db-4.6 -BDB_LIB_CXX_NAME= db_cxx-4.6 -BDB_LIB_DIR= ${LOCALBASE}/lib/db46 -. elif ${_BDB_VER} == 47 -BDB_LIB_NAME= db-4.7 -BDB_LIB_CXX_NAME= db_cxx-4.7 -BDB_LIB_DIR= ${LOCALBASE}/lib/db47 -. elif ${_BDB_VER} == 48 +. endif +. if ${_BDB_VER} == 48 BDB_LIB_NAME= db-4.8 BDB_LIB_CXX_NAME= db_cxx-4.8 BDB_LIB_DIR= ${LOCALBASE}/lib/db48 -. elif ${_BDB_VER} == 5 +. elif ${_BDB_VER} == 5 BDB_LIB_NAME= db-5.3 BDB_LIB_CXX_NAME= db_cxx-5.3 BDB_LIB_DIR= ${LOCALBASE}/lib/db5 -. elif ${_BDB_VER} == 6 +. elif ${_BDB_VER} == 6 BDB_LIB_NAME= db-6.1 BDB_LIB_CXX_NAME= db_cxx-6.1 BDB_LIB_DIR= ${LOCALBASE}/lib/db6 -. endif +. endif BDB_LIB_NAME?= db${_BDB_VER} BDB_LIB_CXX_NAME?= db${_BDB_VER}_cxx BDB_INCLUDE_DIR?= ${LOCALBASE}/include/db${_BDB_VER} BDB_LIB_DIR?= ${LOCALBASE}/lib -. endif -BDB_VER= ${_BDB_VER} .endif +BDB_VER= ${_BDB_VER} + +debug-bdb: + @${ECHO_CMD} "--INPUTS----------------------------------------------------" + @${ECHO_CMD} "${UNIQUENAME:tu:S,-,_,}_WITH_BDB_VER: ${${UNIQUENAME:tu:S,-,_,}_WITH_BDB_VER}" + @${ECHO_CMD} "WITH_BDB_VER: ${_WITH_BDB_VER_save}" + @${ECHO_CMD} "WANT_BDB_VER: ${WANT_BDB_VER}" + @${ECHO_CMD} "BDB_BUILD_DEPENDS: ${BDB_BUILD_DEPENDS}" + @${ECHO_CMD} "USE_BDB (original): ${_USE_BDB_save}" + @${ECHO_CMD} "WITH_BDB_HIGHEST (original): ${WITH_BDB_HIGHEST}" + @${ECHO_CMD} "--PROCESSING------------------------------------------------" + @${ECHO_CMD} "supported versions: ${_SUPP_BDB_VER}" + @${ECHO_CMD} "invalid versions: ${_INV_BDB_VER}" + @${ECHO_CMD} "installed versions: ${_INST_BDB_VER}" + @${ECHO_CMD} "eligible versions: ${_ELIGIBLE_BDB_VER}" + @${ECHO_CMD} "USE_BDB (effective): ${USE_BDB}" + @${ECHO_CMD} "WITH_BDB_HIGHEST (override): ${_WITH_BDB_HIGHEST}" + @${ECHO_CMD} "--OUTPUTS---------------------------------------------------" + @${ECHO_CMD} "IGNORE=${IGNORE}" + @${ECHO_CMD} "BDB_VER=${BDB_VER}" + @${ECHO_CMD} "BDB_INCLUDE_DIR=${BDB_INCLUDE_DIR}" + @${ECHO_CMD} "BDB_LIB_NAME=${BDB_LIB_NAME}" + @${ECHO_CMD} "BDB_LIB_CXX_NAME=${BDB_LIB_CXX_NAME}" + @${ECHO_CMD} "BDB_LIB_DIR=${BDB_LIB_DIR}" + @${ECHO_CMD} "BUILD_DEPENDS=${BUILD_DEPENDS:M*/databases/db*}" + @${ECHO_CMD} "LIB_DEPENDS=${LIB_DEPENDS:M*/databases/db*}" + @${ECHO_CMD} "------------------------------------------------------------" # Obsolete variables - ports can define these to want users about # variables that may be in /etc/make.conf but that are no longer @@ -5,6 +5,34 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20140821: + AFFECTS: users of databases/db4, databases/db4[1-7]* + AUTHOR: mandree@FreeBSD.org + + HEADS UP: for some applications that store their data in Berkeley DB + databases, you may have to export the data before the upgrade and + reload it afterwards. Detailed instructions are at + <https://wiki.freebsd.org/Ports/BerkeleyDBCleanup>. + + The older databases/db4* ports providing versions 4.0 to 4.7 + inclusively have been removed, and 4.8 has been deprecated. + The default Berkeley DB version is now 5.3. + (6.x has a different license, but will be eligible as default on + systems that build ports from source and have db6 installed.) + All enabled and working ports have been changed such that they use + Berkeley DB 4.8 or newer, and an -exp run has been made. + + After you have performed the first steps from the Wiki documentation, + and have arrived at a step that reads "build all applications", then + type as privileged user and without the hash sign: + + # Tools/scripts/BDB-upgrade-helper.sh + + The helper script requires that ports-mgmt/portmaster or + .../portupgrade is installed, will try to upgrade your applications + with either of these tools (portmaster preferred), and if that succeeds, + it will attempt to delete the packages if confirmed interactively. + 20140815: AFFECTS: users of graphics/ilmbase and graphics/OpenEXR AUTHOR: mandree@FreeBSD.org @@ -17,7 +45,7 @@ you update your ports collection, before attempting any port upgrades. or # portupgrade -fr graphics/ilmbase graphics/OpenEXR - The PORTREVISIONS of all 500+ ports that require ilmbase/OpenEXR + The PORTREVISIONS of all ports that require ilmbase and/or OpenEXR have been bumped. 20140810: diff --git a/archivers/rpm4/Makefile b/archivers/rpm4/Makefile index 25a2187136bf..db87d145dee0 100644 --- a/archivers/rpm4/Makefile +++ b/archivers/rpm4/Makefile @@ -3,7 +3,7 @@ PORTNAME= rpm PORTVERSION= 4.11.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= archivers MASTER_SITES= http://rpm.org/releases/rpm-${PORTVERSION:R}.x/ \ ftp://ftp.mirrorservice.org/sites/ftp.rpm.org/pub/rpm/dist/rpm-${PORTVERSION:E}.x/ diff --git a/archivers/rpm5/Makefile b/archivers/rpm5/Makefile index 67a894fa08e0..9c58f66f5e25 100644 --- a/archivers/rpm5/Makefile +++ b/archivers/rpm5/Makefile @@ -3,7 +3,7 @@ PORTNAME= rpm PORTVERSION= 5.2.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= archivers MASTER_SITES= http://rpm5.org/files/rpm/rpm-${PORTVERSION:R}/ PKGNAMESUFFIX= 5 diff --git a/chinese/libpinyin/Makefile b/chinese/libpinyin/Makefile index 0b18d2448b31..dda787eab2e4 100644 --- a/chinese/libpinyin/Makefile +++ b/chinese/libpinyin/Makefile @@ -3,7 +3,7 @@ PORTNAME= libpinyin PORTVERSION= 0.7.91 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= chinese textproc MASTER_SITES= SF/${PORTNAME}/${PORTNAME} diff --git a/chinese/libtabe/Makefile b/chinese/libtabe/Makefile index e6489aee0425..03ebd819298c 100644 --- a/chinese/libtabe/Makefile +++ b/chinese/libtabe/Makefile @@ -3,7 +3,7 @@ PORTNAME= libtabe PORTVERSION= 0.2.6 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= chinese MASTER_SITES= ftp://cle.linux.org.tw/pub/xcin/cvs/ diff --git a/chinese/mutt/Makefile b/chinese/mutt/Makefile index b743f714190d..f841d02522cb 100644 --- a/chinese/mutt/Makefile +++ b/chinese/mutt/Makefile @@ -1,7 +1,7 @@ # Created by: David O'Brien (obrien@NUXI.com) # $FreeBSD$ -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= chinese MASTERDIR= ${.CURDIR}/../../mail/mutt diff --git a/chinese/p5-Lingua-ZH-TaBE/Makefile b/chinese/p5-Lingua-ZH-TaBE/Makefile index bd2d21721458..ccab503ad257 100644 --- a/chinese/p5-Lingua-ZH-TaBE/Makefile +++ b/chinese/p5-Lingua-ZH-TaBE/Makefile @@ -3,7 +3,7 @@ PORTNAME= Lingua-ZH-TaBE PORTVERSION= 0.07 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= chinese perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/chinese/xsim/Makefile b/chinese/xsim/Makefile index 5fe489d38439..5a69c7080501 100644 --- a/chinese/xsim/Makefile +++ b/chinese/xsim/Makefile @@ -3,7 +3,7 @@ PORTNAME= xsim PORTVERSION= 0.3.9.4 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= chinese MASTER_SITES= SF/${PORTNAME}/stable/${PORTNAME}-${PORTVERSION} DISTFILES= ${PORTNAME}-${PORTVERSION}.tar.gz \ diff --git a/comms/trustedqsl/Makefile b/comms/trustedqsl/Makefile index fd1ac216ab29..6cd9f488bd64 100644 --- a/comms/trustedqsl/Makefile +++ b/comms/trustedqsl/Makefile @@ -14,8 +14,9 @@ LICENSE_NAME= American Radio Relay League, Inc. All rights reserved. LICENSE_FILE= ${WRKSRC}/LICENSE.txt LICENSE_PERMS= dist-mirror pkg-mirror auto-accept -LIB_DEPENDS= libdb-5.so:${PORTSDIR}/databases/db5 \ - libcurl.so:${PORTSDIR}/ftp/curl +LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl + +USE_BDB= 5+ PKGMESSAGE= ${WRKDIR}/pkg-message diff --git a/comms/xastir/Makefile b/comms/xastir/Makefile index 3d190815ca28..2775ab8c3b01 100644 --- a/comms/xastir/Makefile +++ b/comms/xastir/Makefile @@ -3,7 +3,7 @@ PORTNAME= xastir PORTVERSION= 2.0.4 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= comms hamradio MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-stable/${PORTNAME}-${PORTVERSION} diff --git a/databases/Makefile b/databases/Makefile index 8fadc875fcb7..22a271433c98 100644 --- a/databases/Makefile +++ b/databases/Makefile @@ -39,15 +39,6 @@ SUBDIR += dalmp SUBDIR += datamodeler SUBDIR += db - SUBDIR += db4 - SUBDIR += db41 - SUBDIR += db41-nocrypto - SUBDIR += db42 - SUBDIR += db42-nocrypto - SUBDIR += db43 - SUBDIR += db44 - SUBDIR += db46 - SUBDIR += db47 SUBDIR += db48 SUBDIR += db4o-mono SUBDIR += db5 diff --git a/databases/db4/Makefile b/databases/db4/Makefile deleted file mode 100644 index 8aa271e50854..000000000000 --- a/databases/db4/Makefile +++ /dev/null @@ -1,48 +0,0 @@ -# Created by: Sergey Osokin aka oZZ <ozz@FreeBSD.org.ru> -# $FreeBSD$ - -PORTNAME= db4 -PORTVERSION= 4.0.14 -PORTREVISION= 1 -PORTEPOCH= 1 -CATEGORIES= databases -MASTER_SITES= http://download.oracle.com/berkeley-db/ -DISTNAME= db-${PORTVERSION} -DIST_SUBDIR= bdb - -DEPRECATED= Please use databases/db5 or db6 for new installs. - -MAINTAINER= ports@FreeBSD.org -COMMENT= The Berkeley DB package, revision 4 - -WRKSRC= ${WRKDIR}/${DISTNAME}/build_unix - -GNU_CONFIGURE= yes -CONFIGURE_SCRIPT= ../dist/configure -CONFIGURE_ARGS= --enable-compat185 --enable-dump185 \ - --enable-cxx --enable-dynamic \ - --includedir=${PREFIX}/include/db4 -USE_LDCONFIG= yes - -OPTIONS_DEFINE= DOCS - -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MDOCS} -INSTALL_TARGET= install install_docs -PORTDOCS= * -.endif - -# the db install_docs target installs an empty directory, kill it -NO_STAGE= yes -# (it's not packaged and it's not needed): -.if ${PORT_OPTIONS:MDOCS} -post-install: - @${RMDIR} ${PREFIX}/share/doc/db4/ref/splash -.endif - -post-patch: - @${REINPLACE_CMD} -Ee \ - 's|-l?pthread|${PTHREAD_LIBS}|g' ${WRKSRC}/${CONFIGURE_SCRIPT} - -.include <bsd.port.mk> diff --git a/databases/db4/distinfo b/databases/db4/distinfo deleted file mode 100644 index 30688206fd4d..000000000000 --- a/databases/db4/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (bdb/db-4.0.14.tar.gz) = a7d983d88b7ba43cfd9a39bfcb0f3f489b15e4b113452e94b7c4bbca0225b7f5 -SIZE (bdb/db-4.0.14.tar.gz) = 2701799 diff --git a/databases/db4/files/patch-dist__Makefile.in b/databases/db4/files/patch-dist__Makefile.in deleted file mode 100644 index cf1f67e21a73..000000000000 --- a/databases/db4/files/patch-dist__Makefile.in +++ /dev/null @@ -1,144 +0,0 @@ ---- ../dist/Makefile.in.orig Sat Nov 10 07:48:45 2001 -+++ ../dist/Makefile.in Sat Nov 9 17:36:00 2002 -@@ -11,7 +11,7 @@ - bindir= @bindir@ - includedir=@includedir@ - libdir= @libdir@ --docdir= $(prefix)/docs -+docdir= $(prefix)/share/doc/db4 - - dmode= 755 - emode= 555 -@@ -45,6 +45,7 @@ - SOLINK= @MAKEFILE_SOLINK@ - SOFLAGS= @SOFLAGS@ - SOMAJOR= @DB_VERSION_MAJOR@ -+SOMINOR= @DB_VERSION_MINOR@ - SOVERSION= @DB_VERSION_MAJOR@.@DB_VERSION_MINOR@ - - ################################################## -@@ -60,13 +61,13 @@ - LIBS= @LIBS@ - LIBSO_LIBS= @LIBSO_LIBS@ - --libdb= libdb.a --libso_base= libdb --libso= $(libso_base)-$(SOVERSION).@SOSUFFIX@ --libso_static= $(libso_base)-$(SOVERSION).a --libso_target= $(libso_base)-$(SOVERSION).la -+libdb= libdb4.a -+libso_base= libdb4 -+libso= $(libso_base).@SOSUFFIX@ -+libso_static= $(libso_base).a -+libso_target= $(libso_base).la - libso_default= $(libso_base).@SOSUFFIX@ --libso_major= $(libso_base)-$(SOMAJOR).@SOSUFFIX@ -+libso_major= $(libso_base).@SOSUFFIX@.$(SOMINOR) - - ################################################## - # C++ API. -@@ -79,13 +80,13 @@ - XSOLINK= @MAKEFILE_XSOLINK@ - LIBXSO_LIBS= @LIBXSO_LIBS@ - --libcxx= libdb_cxx.a --libxso_base= libdb_cxx --libxso= $(libxso_base)-$(SOVERSION).@SOSUFFIX@ --libxso_static= $(libxso_base)-$(SOVERSION).a --libxso_target= $(libxso_base)-$(SOVERSION).la -+libcxx= libdb4_cxx.a -+libxso_base= libdb4_cxx -+libxso= $(libxso_base).@SOSUFFIX@ -+libxso_static= $(libxso_base).a -+libxso_target= $(libxso_base).la - libxso_default= $(libxso_base).@SOSUFFIX@ --libxso_major= $(libxso_base)-$(SOMAJOR).@SOSUFFIX@ -+libxso_major= $(libxso_base).@SOSUFFIX@.$(SOMINOR) - - ################################################## - # Java API. -@@ -235,8 +236,8 @@ - db_server_proc@o@ db_server_svc@o@ db_server_util@o@ gen_db_server@o@ - - UTIL_PROGS=\ -- @ADDITIONAL_PROGS@ db_archive db_checkpoint db_deadlock \ -- db_dump db_load db_printlog db_recover db_stat db_upgrade db_verify -+ @ADDITIONAL_PROGS@ db4_archive db4_checkpoint db4_deadlock \ -+ db4_dump db4_load db4_printlog db4_recover db4_stat db4_upgrade db4_verify - - ################################################## - # List of files installed into the library directory. -@@ -330,53 +331,53 @@ - $(RPC_SRV_OBJS) util_log@o@ $(DEF_LIB) $(LIBS) - $(POSTLINK) $@ - --db_archive: db_archive@o@ util_sig@o@ $(DEF_LIB) -+db4_archive: db_archive@o@ util_sig@o@ $(DEF_LIB) - $(CCLINK) -o $@ $(LDFLAGS) \ - db_archive@o@ util_sig@o@ $(DEF_LIB) $(LIBS) - $(POSTLINK) $@ - --db_checkpoint: db_checkpoint@o@ util_log@o@ util_sig@o@ $(DEF_LIB) -+db4_checkpoint: db_checkpoint@o@ util_log@o@ util_sig@o@ $(DEF_LIB) - $(CCLINK) -o $@ $(LDFLAGS) \ - db_checkpoint@o@ util_log@o@ util_sig@o@ $(DEF_LIB) $(LIBS) - $(POSTLINK) $@ - --db_deadlock: db_deadlock@o@ util_log@o@ util_sig@o@ $(DEF_LIB) -+db4_deadlock: db_deadlock@o@ util_log@o@ util_sig@o@ $(DEF_LIB) - $(CCLINK) -o $@ $(LDFLAGS) \ - db_deadlock@o@ util_log@o@ util_sig@o@ $(DEF_LIB) $(LIBS) - $(POSTLINK) $@ - --db_dump: db_dump@o@ util_sig@o@ $(DEF_LIB) -+db4_dump: db_dump@o@ util_sig@o@ $(DEF_LIB) - $(CCLINK) -o $@ $(LDFLAGS) db_dump@o@ util_sig@o@ $(DEF_LIB) $(LIBS) - $(POSTLINK) $@ - --db_dump185: db_dump185@o@ @LIBOBJS@ -+db4_dump185: db_dump185@o@ @LIBOBJS@ - $(CCLINK) -o $@ $(LDFLAGS) db_dump185@o@ @LIBOBJS@ $(DB185LIB) - $(POSTLINK) $@ - --db_load: db_load@o@ util_sig@o@ $(DEF_LIB) -+db4_load: db_load@o@ util_sig@o@ $(DEF_LIB) - $(CCLINK) -o $@ $(LDFLAGS) db_load@o@ util_sig@o@ $(DEF_LIB) $(LIBS) - $(POSTLINK) $@ - --db_printlog: db_printlog@o@ util_sig@o@ $(DEF_LIB) -+db4_printlog: db_printlog@o@ util_sig@o@ $(DEF_LIB) - $(CCLINK) -o $@ $(LDFLAGS) \ - db_printlog@o@ util_sig@o@ $(DEF_LIB) $(LIBS) - $(POSTLINK) $@ - --db_recover: db_recover@o@ util_sig@o@ $(DEF_LIB) -+db4_recover: db_recover@o@ util_sig@o@ $(DEF_LIB) - $(CCLINK) -o $@ $(LDFLAGS) \ - db_recover@o@ util_sig@o@ $(DEF_LIB) $(LIBS) - $(POSTLINK) $@ - --db_stat: db_stat@o@ util_sig@o@ $(DEF_LIB) -+db4_stat: db_stat@o@ util_sig@o@ $(DEF_LIB) - $(CCLINK) -o $@ $(LDFLAGS) db_stat@o@ util_sig@o@ $(DEF_LIB) $(LIBS) - $(POSTLINK) $@ - --db_upgrade: db_upgrade@o@ util_sig@o@ $(DEF_LIB) -+db4_upgrade: db_upgrade@o@ util_sig@o@ $(DEF_LIB) - $(CCLINK) -o $@ $(LDFLAGS) \ - db_upgrade@o@ util_sig@o@ $(DEF_LIB) $(LIBS) - $(POSTLINK) $@ - --db_verify: db_verify@o@ util_sig@o@ $(DEF_LIB) -+db4_verify: db_verify@o@ util_sig@o@ $(DEF_LIB) - $(CCLINK) -o $@ $(LDFLAGS) \ - db_verify@o@ util_sig@o@ $(DEF_LIB) $(LIBS) - $(POSTLINK) $@ -@@ -385,7 +386,7 @@ - # Library and standard utilities install. - ################################################## - library_install: install_setup --library_install: install_include install_lib install_utilities install_docs -+library_install: install_include install_lib install_utilities - - uninstall: uninstall_include uninstall_lib uninstall_utilities uninstall_docs - diff --git a/databases/db4/files/patch-dist__configure b/databases/db4/files/patch-dist__configure deleted file mode 100644 index 4f2ed615df05..000000000000 --- a/databases/db4/files/patch-dist__configure +++ /dev/null @@ -1,24 +0,0 @@ ---- ../dist/configure.orig Wed Dec 5 13:14:02 2001 -+++ ../dist/configure Wed Dec 5 13:24:01 2001 -@@ -8794,10 +8794,10 @@ - INSTALLER="\$(LIBTOOL) --mode=install cp" - - MAKEFILE_CC="\$(LIBTOOL) --mode=compile ${MAKEFILE_CC}" --MAKEFILE_SOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK} -avoid-version" -+MAKEFILE_SOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK} -version-info ${DB_VERSION_MINOR}" - MAKEFILE_CCLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK}" - MAKEFILE_CXX="\$(LIBTOOL) --mode=compile ${MAKEFILE_CXX}" --MAKEFILE_XSOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK} -avoid-version" -+MAKEFILE_XSOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK} -version-info ${DB_VERSION_MINOR}" - MAKEFILE_CXXLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK}" - - # Configure for shared libraries, static libraries, or both. If both are -@@ -9511,7 +9511,7 @@ - - # Optional utilities. - if test "$db_cv_dump185" = "yes"; then -- ADDITIONAL_PROGS="db_dump185 $ADDITIONAL_PROGS" -+ ADDITIONAL_PROGS="db4_dump185 $ADDITIONAL_PROGS" - fi - - # Checks for system/compiler characteristics. diff --git a/databases/db4/files/patch-dist__ltmain.sh b/databases/db4/files/patch-dist__ltmain.sh deleted file mode 100644 index 7ba6dbdfd3fe..000000000000 --- a/databases/db4/files/patch-dist__ltmain.sh +++ /dev/null @@ -1,32 +0,0 @@ ---- ../dist/ltmain.sh.orig Sat Nov 17 01:15:01 2001 -+++ ../dist/ltmain.sh Sat Nov 9 17:08:02 2002 -@@ -1043,14 +1043,14 @@ - # These systems don't actually have a C library (as such) - test "X$arg" = "X-lc" && continue - ;; -- *-*-openbsd*) -+ *-*-openbsd* | *-*-freebsd*) - # Do not include libc due to us having libc/libc_r. - test "X$arg" = "X-lc" && continue - ;; - esac - elif test "X$arg" = "X-lc_r"; then - case $host in -- *-*-openbsd*) -+ *-*-openbsd* | *-*-freebsd*) - # Do not include libc_r directly, use -pthread flag. - continue - ;; -@@ -4217,10 +4217,12 @@ - fi - - # Install the pseudo-library for information purposes. -+ if /usr/bin/false; then - name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - instname="$dir/$name"i - $show "$install_prog $instname $destdir/$name" - $run eval "$install_prog $instname $destdir/$name" || exit $? -+ fi - - # Maybe install the static library, too. - test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" diff --git a/databases/db4/files/patch-objformat b/databases/db4/files/patch-objformat deleted file mode 100644 index 2aa1daaaa21b..000000000000 --- a/databases/db4/files/patch-objformat +++ /dev/null @@ -1,11 +0,0 @@ ---- ../dist/configure.foo Sun Feb 4 14:10:01 2007 -+++ ../dist/configure Sun Feb 4 14:11:26 2007 -@@ -7002,7 +7002,7 @@ - ;; - - freebsd*) -- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` - version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) diff --git a/databases/db4/pkg-descr b/databases/db4/pkg-descr deleted file mode 100644 index 2ba215b28cdc..000000000000 --- a/databases/db4/pkg-descr +++ /dev/null @@ -1,10 +0,0 @@ -Version 4 of the Berkeley DB library. This version uses an underlying -database format incompatible with revision 1 and a different standard API. -Utilities are included in the distribution to convert v1.85 databases to v4 -databases, and a backwards compatible API is provided to maintain -compatibility with programs using the v1.85 interface. - -For details on compatibility with other DB versions, see: -http://www.sleepycat.com/download/patchlogs.shtml - -WWW: http://www.oracle.com/us/products/database/berkeley-db/db/ diff --git a/databases/db4/pkg-plist b/databases/db4/pkg-plist deleted file mode 100644 index e9a13d342d71..000000000000 --- a/databases/db4/pkg-plist +++ /dev/null @@ -1,23 +0,0 @@ -bin/db4_archive -bin/db4_checkpoint -bin/db4_deadlock -bin/db4_dump -bin/db4_dump185 -bin/db4_load -bin/db4_printlog -bin/db4_recover -bin/db4_stat -bin/db4_upgrade -bin/db4_verify -include/db4/cxx_common.h -include/db4/cxx_except.h -include/db4/db.h -include/db4/db_185.h -include/db4/db_cxx.h -lib/libdb4.a -lib/libdb4.so -lib/libdb4.so.0 -lib/libdb4_cxx.a -lib/libdb4_cxx.so -lib/libdb4_cxx.so.0 -@dirrm include/db4 diff --git a/databases/db41-nocrypto/Makefile b/databases/db41-nocrypto/Makefile deleted file mode 100644 index 9b343662213c..000000000000 --- a/databases/db41-nocrypto/Makefile +++ /dev/null @@ -1,12 +0,0 @@ -# Created by: Matthias Andree <matthias.andree@gmx.de> -# $FreeBSD$ - -PKGNAMESUFFIX= -nocrypto -DISTNAME= db-${PORTVERSION}.NC - -MASTERDIR= ${.CURDIR}/../db41 -DISTINFO_FILE= ${.CURDIR}/distinfo - -CONFLICTS= db41-4* - -.include "${MASTERDIR}/Makefile" diff --git a/databases/db41-nocrypto/distinfo b/databases/db41-nocrypto/distinfo deleted file mode 100644 index 42f994c99c84..000000000000 --- a/databases/db41-nocrypto/distinfo +++ /dev/null @@ -1,4 +0,0 @@ -SHA256 (bdb/db-4.1.25.NC.tar.gz) = 35a304a98af6d9f6a7443c58fc72e877293d5fb95e326b08a5470dc4f4542337 -SIZE (bdb/db-4.1.25.NC.tar.gz) = 2892289 -SHA256 (bdb/patch.4.1.25.2) = 391e652b0b6a1e2410a8e4b8d7e0ed0d53c9af549a29754e04532f390bee8f5d -SIZE (bdb/patch.4.1.25.2) = 18100 diff --git a/databases/db41/Makefile b/databases/db41/Makefile deleted file mode 100644 index 81ebece7872e..000000000000 --- a/databases/db41/Makefile +++ /dev/null @@ -1,51 +0,0 @@ -# Created by: Matthias Andree <matthias.andree@gmx.de> -# $FreeBSD$ - -PORTNAME= db41 -PORTVERSION= 4.1.25 -PORTREVISION= 4 -CATEGORIES= databases -MASTER_SITES= http://download.oracle.com/berkeley-db/ -PKGNAMESUFFIX?= -DISTNAME?= db-${PORTVERSION} -DIST_SUBDIR= bdb - -PATCH_SITES= http://download.oracle.com/berkeley-db/patches/db/${PORTVERSION}/ -PATCHFILES= patch.${PORTVERSION}.2 -PATCH_DIST_STRIP= -d ${WRKDIR}/${DISTNAME} - -MAINTAINER= mandree@FreeBSD.org -COMMENT= The Berkeley DB package, revision 4.1 - -CONFLICTS?= db41-nocrypto-4* - -DEPRECATED= Please use databases/db5 or db6 for new installs. - -WRKSRC= ${WRKDIR}/${DISTNAME}/build_unix - -USES= desthack -GNU_CONFIGURE= yes -CONFIGURE_SCRIPT= ../dist/configure -CONFIGURE_ARGS= --enable-compat185 --enable-dump185 \ - --enable-cxx --enable-dynamic \ - --includedir=${STAGEDIR}${PREFIX}/include/db41 -USE_LDCONFIG= yes - -OPTIONS_DEFINE= DOCS - -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MDOCS} -INSTALL_TARGET= install install_docs -PORTDOCS= * -.endif - -.if ${ARCH} == amd64 -CONFIGURE_ARGS+= --with-mutex=x86/gcc-assembly -.endif - -post-patch: - @${REINPLACE_CMD} -Ee \ - 's|-l?pthread|${PTHREAD_LIBS}|g' ${WRKSRC}/${CONFIGURE_SCRIPT} - -.include <bsd.port.mk> diff --git a/databases/db41/distinfo b/databases/db41/distinfo deleted file mode 100644 index 66f3f6efd4ab..000000000000 --- a/databases/db41/distinfo +++ /dev/null @@ -1,4 +0,0 @@ -SHA256 (bdb/db-4.1.25.tar.gz) = 0d0644039b24f8eb823d0492f86bb8cd61fde36adbf85c52f4141fcbce05d9f3 -SIZE (bdb/db-4.1.25.tar.gz) = 2901161 -SHA256 (bdb/patch.4.1.25.2) = 391e652b0b6a1e2410a8e4b8d7e0ed0d53c9af549a29754e04532f390bee8f5d -SIZE (bdb/patch.4.1.25.2) = 18100 diff --git a/databases/db41/files/patch-dist__Makefile.in b/databases/db41/files/patch-dist__Makefile.in deleted file mode 100644 index 9809860f6b47..000000000000 --- a/databases/db41/files/patch-dist__Makefile.in +++ /dev/null @@ -1,144 +0,0 @@ ---- ../dist/Makefile.in.orig Sat Aug 31 03:11:56 2002 -+++ ../dist/Makefile.in Sat Dec 28 01:15:46 2002 -@@ -11,7 +11,7 @@ - bindir= @bindir@ - includedir=@includedir@ - libdir= @libdir@ --docdir= $(prefix)/docs -+docdir= $(prefix)/share/doc/db41 - - dmode= 755 - emode= 555 -@@ -45,6 +45,7 @@ - SOLINK= @MAKEFILE_SOLINK@ - SOFLAGS= @SOFLAGS@ - SOMAJOR= @DB_VERSION_MAJOR@ -+SOMINOR= @DB_VERSION_MINOR@ - SOVERSION= @DB_VERSION_MAJOR@.@DB_VERSION_MINOR@ - - ################################################## -@@ -59,13 +60,13 @@ - LIBS= @LIBS@ - LIBSO_LIBS= @LIBSO_LIBS@ - --libdb= libdb.a --libso_base= libdb --libso= $(libso_base)-$(SOVERSION).@SOSUFFIX@ --libso_static= $(libso_base)-$(SOVERSION).a --libso_target= $(libso_base)-$(SOVERSION).la -+libdb= libdb41.a -+libso_base= libdb41 -+libso= $(libso_base).@SOSUFFIX@ -+libso_static= $(libso_base).a -+libso_target= $(libso_base).la - libso_default= $(libso_base).@SOSUFFIX@ --libso_major= $(libso_base)-$(SOMAJOR).@SOSUFFIX@ -+libso_major= $(libso_base).@SOSUFFIX@.$(SOMINOR) - - ################################################## - # C++ API. -@@ -78,13 +79,13 @@ - XSOLINK= @MAKEFILE_XSOLINK@ - LIBXSO_LIBS= @LIBXSO_LIBS@ - --libcxx= libdb_cxx.a --libxso_base= libdb_cxx --libxso= $(libxso_base)-$(SOVERSION).@SOSUFFIX@ --libxso_static= $(libxso_base)-$(SOVERSION).a --libxso_target= $(libxso_base)-$(SOVERSION).la -+libcxx= libdb41_cxx.a -+libxso_base= libdb41_cxx -+libxso= $(libxso_base).@SOSUFFIX@ -+libxso_static= $(libxso_base).a -+libxso_target= $(libxso_base).la - libxso_default= $(libxso_base).@SOSUFFIX@ --libxso_major= $(libxso_base)-$(SOMAJOR).@SOSUFFIX@ -+libxso_major= $(libxso_base).@SOSUFFIX@.$(SOMINOR) - - ################################################## - # Java API. -@@ -364,8 +365,8 @@ - - UTIL_PROGS=\ - @ADDITIONAL_PROGS@ \ -- db_archive db_checkpoint db_deadlock \ -- db_dump db_load db_printlog db_recover db_stat db_upgrade db_verify -+ db41_archive db41_checkpoint db41_deadlock \ -+ db41_dump db41_load db41_printlog db41_recover db41_stat db41_upgrade db41_verify - - ################################################## - # List of files installed into the library directory. -@@ -481,53 +482,53 @@ - echo >> $@ exec java com.sleepycat.db.rpcserver.DbServer \$$@ - chmod +x $@ - --db_archive: db_archive@o@ util_sig@o@ $(DEF_LIB) -+db41_archive: db_archive@o@ util_sig@o@ $(DEF_LIB) - $(CCLINK) -o $@ $(LDFLAGS) \ - db_archive@o@ util_sig@o@ $(DEF_LIB) $(LIBS) - $(POSTLINK) $@ - --db_checkpoint: db_checkpoint@o@ util_log@o@ util_sig@o@ $(DEF_LIB) -+db41_checkpoint: db_checkpoint@o@ util_log@o@ util_sig@o@ $(DEF_LIB) - $(CCLINK) -o $@ $(LDFLAGS) \ - db_checkpoint@o@ util_log@o@ util_sig@o@ $(DEF_LIB) $(LIBS) - $(POSTLINK) $@ - --db_deadlock: db_deadlock@o@ util_log@o@ util_sig@o@ $(DEF_LIB) -+db41_deadlock: db_deadlock@o@ util_log@o@ util_sig@o@ $(DEF_LIB) - $(CCLINK) -o $@ $(LDFLAGS) \ - db_deadlock@o@ util_log@o@ util_sig@o@ $(DEF_LIB) $(LIBS) - $(POSTLINK) $@ - --db_dump: db_dump@o@ util_cache@o@ util_sig@o@ $(DEF_LIB) -+db41_dump: db_dump@o@ util_cache@o@ util_sig@o@ $(DEF_LIB) - $(CCLINK) -o $@ $(LDFLAGS) db_dump@o@ util_cache@o@ util_sig@o@ $(DEF_LIB) $(LIBS) - $(POSTLINK) $@ - --db_dump185: db_dump185@o@ @LTLIBOBJS@ -+db41_dump185: db_dump185@o@ @LTLIBOBJS@ - $(CCLINK) -o $@ $(LDFLAGS) db_dump185@o@ @LTLIBOBJS@ $(DB185LIB) - $(POSTLINK) $@ - --db_load: db_load@o@ util_cache@o@ util_sig@o@ $(DEF_LIB) -+db41_load: db_load@o@ util_cache@o@ util_sig@o@ $(DEF_LIB) - $(CCLINK) -o $@ $(LDFLAGS) db_load@o@ util_cache@o@ util_sig@o@ $(DEF_LIB) $(LIBS) - $(POSTLINK) $@ - --db_printlog: db_printlog@o@ util_sig@o@ $(DEF_LIB) -+db41_printlog: db_printlog@o@ util_sig@o@ $(DEF_LIB) - $(CCLINK) -o $@ $(LDFLAGS) \ - db_printlog@o@ util_sig@o@ $(DEF_LIB) $(LIBS) - $(POSTLINK) $@ - --db_recover: db_recover@o@ util_sig@o@ $(DEF_LIB) -+db41_recover: db_recover@o@ util_sig@o@ $(DEF_LIB) - $(CCLINK) -o $@ $(LDFLAGS) \ - db_recover@o@ util_sig@o@ $(DEF_LIB) $(LIBS) - $(POSTLINK) $@ - --db_stat: db_stat@o@ util_cache@o@ util_sig@o@ $(DEF_LIB) -+db41_stat: db_stat@o@ util_cache@o@ util_sig@o@ $(DEF_LIB) - $(CCLINK) -o $@ $(LDFLAGS) db_stat@o@ util_cache@o@ util_sig@o@ $(DEF_LIB) $(LIBS) - $(POSTLINK) $@ - --db_upgrade: db_upgrade@o@ util_sig@o@ $(DEF_LIB) -+db41_upgrade: db_upgrade@o@ util_sig@o@ $(DEF_LIB) - $(CCLINK) -o $@ $(LDFLAGS) \ - db_upgrade@o@ util_sig@o@ $(DEF_LIB) $(LIBS) - $(POSTLINK) $@ - --db_verify: db_verify@o@ util_cache@o@ util_sig@o@ $(DEF_LIB) -+db41_verify: db_verify@o@ util_cache@o@ util_sig@o@ $(DEF_LIB) - $(CCLINK) -o $@ $(LDFLAGS) \ - db_verify@o@ util_cache@o@ util_sig@o@ $(DEF_LIB) $(LIBS) - $(POSTLINK) $@ -@@ -536,7 +537,7 @@ - # Library and standard utilities install. - ################################################## - library_install: install_setup --library_install: install_include install_lib install_utilities install_docs -+library_install: install_include install_lib install_utilities - - uninstall: uninstall_include uninstall_lib uninstall_utilities uninstall_docs - diff --git a/databases/db41/files/patch-dist__configure b/databases/db41/files/patch-dist__configure deleted file mode 100644 index f6f65d26177e..000000000000 --- a/databases/db41/files/patch-dist__configure +++ /dev/null @@ -1,24 +0,0 @@ ---- ../dist/configure.orig Wed Dec 5 13:14:02 2001 -+++ ../dist/configure Wed Dec 5 13:24:01 2001 -@@ -8794,10 +8794,10 @@ - INSTALLER="\$(LIBTOOL) --mode=install cp" - - MAKEFILE_CC="\$(LIBTOOL) --mode=compile ${MAKEFILE_CC}" --MAKEFILE_SOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK} -avoid-version" -+MAKEFILE_SOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK} -version-info ${DB_VERSION_MINOR}" - MAKEFILE_CCLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK}" - MAKEFILE_CXX="\$(LIBTOOL) --mode=compile ${MAKEFILE_CXX}" --MAKEFILE_XSOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK} -avoid-version" -+MAKEFILE_XSOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK} -version-info ${DB_VERSION_MINOR}" - MAKEFILE_CXXLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK}" - - # Configure for shared libraries, static libraries, or both. If both are -@@ -9511,7 +9511,7 @@ - - # Optional utilities. - if test "$db_cv_dump185" = "yes"; then -- ADDITIONAL_PROGS="db_dump185 $ADDITIONAL_PROGS" -+ ADDITIONAL_PROGS="db41_dump185 $ADDITIONAL_PROGS" - fi - - # Checks for system/compiler characteristics. diff --git a/databases/db41/files/patch-dist__ltmain.sh b/databases/db41/files/patch-dist__ltmain.sh deleted file mode 100644 index 7ba6dbdfd3fe..000000000000 --- a/databases/db41/files/patch-dist__ltmain.sh +++ /dev/null @@ -1,32 +0,0 @@ ---- ../dist/ltmain.sh.orig Sat Nov 17 01:15:01 2001 -+++ ../dist/ltmain.sh Sat Nov 9 17:08:02 2002 -@@ -1043,14 +1043,14 @@ - # These systems don't actually have a C library (as such) - test "X$arg" = "X-lc" && continue - ;; -- *-*-openbsd*) -+ *-*-openbsd* | *-*-freebsd*) - # Do not include libc due to us having libc/libc_r. - test "X$arg" = "X-lc" && continue - ;; - esac - elif test "X$arg" = "X-lc_r"; then - case $host in -- *-*-openbsd*) -+ *-*-openbsd* | *-*-freebsd*) - # Do not include libc_r directly, use -pthread flag. - continue - ;; -@@ -4217,10 +4217,12 @@ - fi - - # Install the pseudo-library for information purposes. -+ if /usr/bin/false; then - name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - instname="$dir/$name"i - $show "$install_prog $instname $destdir/$name" - $run eval "$install_prog $instname $destdir/$name" || exit $? -+ fi - - # Maybe install the static library, too. - test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" diff --git a/databases/db41/files/patch-objformat b/databases/db41/files/patch-objformat deleted file mode 100644 index 2aa1daaaa21b..000000000000 --- a/databases/db41/files/patch-objformat +++ /dev/null @@ -1,11 +0,0 @@ ---- ../dist/configure.foo Sun Feb 4 14:10:01 2007 -+++ ../dist/configure Sun Feb 4 14:11:26 2007 -@@ -7002,7 +7002,7 @@ - ;; - - freebsd*) -- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` - version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) diff --git a/databases/db41/files/patch-upstream.4.1.25.1 b/databases/db41/files/patch-upstream.4.1.25.1 deleted file mode 100644 index 801e3350319d..000000000000 --- a/databases/db41/files/patch-upstream.4.1.25.1 +++ /dev/null @@ -1,20 +0,0 @@ -*** ../fileops/fop_util.c 8 Jan 2003 05:01:56 -0000 1.57 ---- ../fileops/fop_util.c 12 Jan 2003 19:44:29 -0000 1.58 -*************** -*** 40,46 **** - u_int32_t __lockval; \ - \ - if (LOCKING_ON((ENV))) { \ -! __lockval = 0; \ - __dbt.data = &__lockval; \ - __dbt.size = sizeof(__lockval); \ - if ((ret = (ENV)->lock_get((ENV), (ID), \ ---- 40,46 ---- - u_int32_t __lockval; \ - \ - if (LOCKING_ON((ENV))) { \ -! __lockval = 1; \ - __dbt.data = &__lockval; \ - __dbt.size = sizeof(__lockval); \ - if ((ret = (ENV)->lock_get((ENV), (ID), \ - diff --git a/databases/db41/files/patch-upstream.4.1.25.3 b/databases/db41/files/patch-upstream.4.1.25.3 deleted file mode 100644 index f31ebfdf1fb5..000000000000 --- a/databases/db41/files/patch-upstream.4.1.25.3 +++ /dev/null @@ -1,50 +0,0 @@ -*** ../mp/mp_fget.c.orig 2002-08-07 08:23:01.000000000 -0700 ---- ../mp/mp_fget.c 2006-05-30 20:32:20.000000000 -0700 -*************** -*** 506,513 **** - */ - if (state != SECOND_MISS && bhp->ref == 1) { - bhp->priority = UINT32_T_MAX; -! SH_TAILQ_REMOVE(&hp->hash_bucket, bhp, hq, __bh); -! SH_TAILQ_INSERT_TAIL(&hp->hash_bucket, bhp, hq); - hp->hash_priority = - SH_TAILQ_FIRST(&hp->hash_bucket, __bh)->priority; - } ---- 506,517 ---- - */ - if (state != SECOND_MISS && bhp->ref == 1) { - bhp->priority = UINT32_T_MAX; -! /* Move the buffer if there are others in the bucket. */ -! if (SH_TAILQ_FIRST(&hp->hash_bucket, __bh) != bhp -! || SH_TAILQ_NEXT(bhp, hq, __bh) != NULL) { -! SH_TAILQ_REMOVE(&hp->hash_bucket, bhp, hq, __bh); -! SH_TAILQ_INSERT_TAIL(&hp->hash_bucket, bhp, hq); -! } - hp->hash_priority = - SH_TAILQ_FIRST(&hp->hash_bucket, __bh)->priority; - } -*** ../mp/mp_fput.c.orig 2002-08-13 06:26:41.000000000 -0700 ---- ../mp/mp_fput.c 2006-05-30 20:55:11.000000000 -0700 -*************** -*** 166,171 **** ---- 166,176 ---- - * to the correct position in the list. - */ - argbhp = bhp; -+ /* Move the buffer if there are others in the bucket. */ -+ if (SH_TAILQ_FIRST(&hp->hash_bucket, __bh) == bhp -+ && SH_TAILQ_NEXT(bhp, hq, __bh) != NULL) -+ goto done; -+ - SH_TAILQ_REMOVE(&hp->hash_bucket, argbhp, hq, __bh); - - prev = NULL; -*************** -*** 178,183 **** ---- 183,189 ---- - else - SH_TAILQ_INSERT_AFTER(&hp->hash_bucket, prev, argbhp, hq, __bh); - -+ done: - /* Reset the hash bucket's priority. */ - hp->hash_priority = SH_TAILQ_FIRST(&hp->hash_bucket, __bh)->priority; diff --git a/databases/db41/pkg-descr b/databases/db41/pkg-descr deleted file mode 100644 index c37f1604f9e6..000000000000 --- a/databases/db41/pkg-descr +++ /dev/null @@ -1,10 +0,0 @@ -Version 4.1 of the Berkeley DB library. This version uses an underlying -database format incompatible with revision 1 and a different standard API. -Utilities are included in the distribution to convert v1.85 databases to v4.1 -databases, and a backwards compatible API is provided to maintain -compatibility with programs using the v1.85 interface. - -For details on compatibility with other DB versions, see: -http://www.sleepycat.com/download/patchlogs.shtml - -WWW: http://www.oracle.com/us/products/database/berkeley-db/db/ diff --git a/databases/db41/pkg-plist b/databases/db41/pkg-plist deleted file mode 100644 index 25027e1d611b..000000000000 --- a/databases/db41/pkg-plist +++ /dev/null @@ -1,23 +0,0 @@ -bin/db41_archive -bin/db41_checkpoint -bin/db41_deadlock -bin/db41_dump -bin/db41_dump185 -bin/db41_load -bin/db41_printlog -bin/db41_recover -bin/db41_stat -bin/db41_upgrade -bin/db41_verify -include/db41/cxx_common.h -include/db41/cxx_except.h -include/db41/db.h -include/db41/db_185.h -include/db41/db_cxx.h -lib/libdb41.a -lib/libdb41.so -lib/libdb41.so.1 -lib/libdb41_cxx.a -lib/libdb41_cxx.so -lib/libdb41_cxx.so.1 -@dirrm include/db41 diff --git a/databases/db42-nocrypto/Makefile b/databases/db42-nocrypto/Makefile deleted file mode 100644 index d32907ff5a7d..000000000000 --- a/databases/db42-nocrypto/Makefile +++ /dev/null @@ -1,14 +0,0 @@ -# Created by: matthias.andree@gmx.de -# $FreeBSD$ - -PKGNAMESUFFIX= -nocrypto -DISTNAME= db-${PORTVERSION}.NC - -MAINTAINER= mandree@FreeBSD.org - -MASTERDIR= ${.CURDIR}/../db42 -DISTINFO_FILE= ${.CURDIR}/distinfo - -CONFLICTS= db42-4* - -.include "${MASTERDIR}/Makefile" diff --git a/databases/db42-nocrypto/distinfo b/databases/db42-nocrypto/distinfo deleted file mode 100644 index 2c3b0153f8ab..000000000000 --- a/databases/db42-nocrypto/distinfo +++ /dev/null @@ -1,12 +0,0 @@ -SHA256 (bdb/db-4.2.52.NC.tar.gz) = 46ba780a698fc981dcdd20a213e939d9b50ca76743c802dfe6fa4e9b7174e54a -SIZE (bdb/db-4.2.52.NC.tar.gz) = 3879486 -SHA256 (bdb/patch.4.2.52.1) = 98b7580916459ee931b9c7e06dcb9da980732672fe0811714933f366ad97dfa5 -SIZE (bdb/patch.4.2.52.1) = 988 -SHA256 (bdb/patch.4.2.52.2) = c9b132bcc8f1c12e03baaf47abd3801f2adf24ffbd56f35a27617fec12654f32 -SIZE (bdb/patch.4.2.52.2) = 1433 -SHA256 (bdb/patch.4.2.52.3) = ca5245d2e1c7a40df5ec57cbabee8bf0106292c69a37eb0ca275d1aa59061907 -SIZE (bdb/patch.4.2.52.3) = 8672 -SHA256 (bdb/patch.4.2.52.4) = c15c82071c02ce1a10024c572e2e9fd72006089007141a01fdd37b889411b973 -SIZE (bdb/patch.4.2.52.4) = 1311 -SHA256 (bdb/patch.4.2.52.5) = 242f1a9c3efdd61a2b738c12617175849dbc73df6a2bf7cff61c814b13905e06 -SIZE (bdb/patch.4.2.52.5) = 839 diff --git a/databases/db42/Makefile b/databases/db42/Makefile deleted file mode 100644 index 18c74d7c0dba..000000000000 --- a/databases/db42/Makefile +++ /dev/null @@ -1,32 +0,0 @@ -# Created by: Matthias Andree <matthias.andree@gmx.de> -# $FreeBSD$ - -PORTNAME= db42 -PORTVERSION= 4.2.52 -PORTREVISION= 5 -CATEGORIES= databases -PKGNAMESUFFIX?= - -PATCHFILES= patch.${PORTVERSION}.1 patch.${PORTVERSION}.2 \ - patch.${PORTVERSION}.3 patch.${PORTVERSION}.4 \ - patch.${PORTVERSION}.5 - -MAINTAINER= mandree@FreeBSD.org -COMMENT= The Berkeley DB package, revision 4.2 - -DEPRECATED= Please use databases/db5 or db6 for new installs. - -CONFLICTS?= db42-nocrypto-4* - -MASTERDIR?= ${.CURDIR} - -SLAVE_PORT= no - -.include <${MASTERDIR}/Makefile.db> -.include <bsd.port.pre.mk> - -.if ${ARCH} == amd64 -CONFIGURE_ARGS+= --with-mutex=x86/gcc-assembly -.endif - -.include <bsd.port.post.mk> diff --git a/databases/db42/Makefile.db b/databases/db42/Makefile.db deleted file mode 100644 index 59c7b94f0a4b..000000000000 --- a/databases/db42/Makefile.db +++ /dev/null @@ -1,44 +0,0 @@ -# $FreeBSD$ - -MASTER_SITES= http://download.oracle.com/berkeley-db/ -DISTNAME?= db-${PORTVERSION} -DIST_SUBDIR= bdb - -PATCH_SITES= http://download.oracle.com/berkeley-db/patches/db/${PORTVERSION}/ -PATCH_DIST_STRIP= -d ${WRKDIR}/${DISTNAME} - -WRKSRC= ${WRKDIR}/${DISTNAME}/build_unix - -USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool -CONFIGURE_SCRIPT= ../dist/configure -LIBTOOLFILES= ${CONFIGURE_SCRIPT} -BDBVER= ${PORTVERSION:R} -BDBMINOR= ${BDBVER:E:S/^\.//} -BDBDIR= BerkeleyDB.${BDBVER} -CONFIGURE_ARGS= --enable-compat185 --enable-dump185 \ - --enable-cxx --enable-dynamic \ - --enable-rpc \ - --with-uniquename \ - --includedir=${PREFIX}/include/${PORTNAME} \ - --libdir=${PREFIX}/lib/${PORTNAME} \ - --bindir=${PREFIX}/bin/${PORTNAME} -INSTALL_TARGET= install_include install_lib install_utilities -INSTALL_TARGET+= install_docs docdir=${DOCSDIR} - -PORTDOCS= * - -pre-patch: - ${REINPLACE_CMD} -Ee 's|-l?pthread|${PTHREAD_LIBS}|g; s,/usr/bin/objformat \|\| echo aout,/usr/bin/objformat || echo elf,' ${WRKSRC}/${CONFIGURE_SCRIPT} - -pre-configure: - ${CHMOD} u+w ${WRKSRC}/../dist/configure - -post-install: -.for i in libdb libdb_cxx - ${LN} -s -f ${PORTNAME}/${i}-${BDBVER}.so.${BDBMINOR} ${STAGEDIR}${PREFIX}/lib - ${LN} -s -f ${i}-${BDBVER}.so.${BDBMINOR} ${STAGEDIR}${PREFIX}/lib/${i}-${BDBVER}.so -.endfor - @${RMDIR} ${STAGEDIR}${DOCSDIR}/ref/splash 2>/dev/null || : - cd ${STAGEDIR}${PREFIX}/bin/${PORTNAME} ; \ - for i in * ; do ${LN} -s -f ${PORTNAME}/$$i ../$$i-${BDBVER} ; done diff --git a/databases/db42/distinfo b/databases/db42/distinfo deleted file mode 100644 index da19aa6d2e82..000000000000 --- a/databases/db42/distinfo +++ /dev/null @@ -1,12 +0,0 @@ -SHA256 (bdb/db-4.2.52.tar.gz) = f4bddd8d1b4cde0daf5e13e3493ed62a25b736b0bf258e1d929e47bc6a82a28c -SIZE (bdb/db-4.2.52.tar.gz) = 3919271 -SHA256 (bdb/patch.4.2.52.1) = 98b7580916459ee931b9c7e06dcb9da980732672fe0811714933f366ad97dfa5 -SIZE (bdb/patch.4.2.52.1) = 988 -SHA256 (bdb/patch.4.2.52.2) = c9b132bcc8f1c12e03baaf47abd3801f2adf24ffbd56f35a27617fec12654f32 -SIZE (bdb/patch.4.2.52.2) = 1433 -SHA256 (bdb/patch.4.2.52.3) = ca5245d2e1c7a40df5ec57cbabee8bf0106292c69a37eb0ca275d1aa59061907 -SIZE (bdb/patch.4.2.52.3) = 8672 -SHA256 (bdb/patch.4.2.52.4) = c15c82071c02ce1a10024c572e2e9fd72006089007141a01fdd37b889411b973 -SIZE (bdb/patch.4.2.52.4) = 1311 -SHA256 (bdb/patch.4.2.52.5) = 242f1a9c3efdd61a2b738c12617175849dbc73df6a2bf7cff61c814b13905e06 -SIZE (bdb/patch.4.2.52.5) = 839 diff --git a/databases/db42/files/patch-dist__configure b/databases/db42/files/patch-dist__configure deleted file mode 100644 index f5fd795067be..000000000000 --- a/databases/db42/files/patch-dist__configure +++ /dev/null @@ -1,15 +0,0 @@ ---- ../dist/configure.orig Wed Dec 5 13:14:02 2001 -+++ ../dist/configure Wed Dec 5 13:24:01 2001 -@@ -8794,10 +8794,10 @@ - INSTALLER="\$(LIBTOOL) --mode=install cp" - - MAKEFILE_CC="\$(LIBTOOL) --mode=compile ${MAKEFILE_CC}" --MAKEFILE_SOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK} -avoid-version" -+MAKEFILE_SOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK} -version-info ${DB_VERSION_MINOR}" - MAKEFILE_CCLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK}" - MAKEFILE_CXX="\$(LIBTOOL) --mode=compile ${MAKEFILE_CXX}" --MAKEFILE_XSOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK} -avoid-version" -+MAKEFILE_XSOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK} -version-info ${DB_VERSION_MINOR}" - MAKEFILE_CXXLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK}" - - # Configure for shared libraries, static libraries, or both. If both are diff --git a/databases/db42/pkg-descr b/databases/db42/pkg-descr deleted file mode 100644 index 17fd91e7493a..000000000000 --- a/databases/db42/pkg-descr +++ /dev/null @@ -1,14 +0,0 @@ -Version 4.2 of the Berkeley Data Base library which offers (key/value) storage -with optional concurrent access or transactions interface. - -Utilities are included in the distribution to convert v1.85 databases to v4.2 -databases, and a backwards compatible API is provided to maintain -compatibility with programs using the v1.85 interface. - -Note that this port has a different layout than the 3.3, 4.0 and 4.1 ports, -it does not rename libraries. - -For details on compatibility with other DB versions, see: -http://www.sleepycat.com/download/patchlogs.shtml - -WWW: http://www.oracle.com/us/products/database/berkeley-db/db/ diff --git a/databases/db42/pkg-plist b/databases/db42/pkg-plist deleted file mode 100644 index d52927a1e023..000000000000 --- a/databases/db42/pkg-plist +++ /dev/null @@ -1,48 +0,0 @@ -bin/db42/berkeley_db_svc -bin/db42/db_archive -bin/db42/db_checkpoint -bin/db42/db_deadlock -bin/db42/db_dump -bin/db42/db_dump185 -bin/db42/db_load -bin/db42/db_printlog -bin/db42/db_recover -bin/db42/db_stat -bin/db42/db_upgrade -bin/db42/db_verify -bin/berkeley_db_svc-4.2 -bin/db_archive-4.2 -bin/db_checkpoint-4.2 -bin/db_deadlock-4.2 -bin/db_dump-4.2 -bin/db_dump185-4.2 -bin/db_load-4.2 -bin/db_printlog-4.2 -bin/db_recover-4.2 -bin/db_stat-4.2 -bin/db_upgrade-4.2 -bin/db_verify-4.2 -include/db42/db.h -include/db42/db_185.h -include/db42/db_cxx.h -lib/db42/libdb-4.2.a -lib/db42/libdb-4.2.la -lib/db42/libdb-4.2.so -lib/db42/libdb-4.2.so.2 -lib/db42/libdb-4.so -lib/db42/libdb.a -lib/db42/libdb.so -lib/db42/libdb_cxx-4.2.a -lib/db42/libdb_cxx-4.2.la -lib/db42/libdb_cxx-4.2.so -lib/db42/libdb_cxx-4.2.so.2 -lib/db42/libdb_cxx-4.so -lib/db42/libdb_cxx.a -lib/db42/libdb_cxx.so -lib/libdb-4.2.so -lib/libdb-4.2.so.2 -lib/libdb_cxx-4.2.so -lib/libdb_cxx-4.2.so.2 -@dirrm lib/db42 -@dirrm include/db42 -@dirrm bin/db42 diff --git a/databases/db43/Makefile b/databases/db43/Makefile deleted file mode 100644 index bc01d82c0331..000000000000 --- a/databases/db43/Makefile +++ /dev/null @@ -1,66 +0,0 @@ -# Created by: Matthias Andree <matthias.andree@gmx.de> -# $FreeBSD$ - -PORTNAME= db43 -PORTVERSION= 4.3.29 -PORTREVISION= 1 -CATEGORIES= databases -MASTER_SITES= http://download.oracle.com/berkeley-db/ -DISTNAME= db-${PORTVERSION} -DIST_SUBDIR= bdb - -MAINTAINER= mandree@FreeBSD.org -COMMENT= The Berkeley DB package, revision 4.3 - -WRKSRC= ${WRKDIR}/${DISTNAME}/build_unix - -DEPRECATED= Please use databases/db5 or db6 for new installs. - -USE_LDCONFIG= yes -GNU_CONFIGURE= yes -CONFIGURE_SCRIPT= ../dist/configure -LIBTOOLFILES= ${CONFIGURE_SCRIPT} -BDBVER= ${PORTVERSION:R} -BDBMINOR= ${BDBVER:E:S/^\.//} -BDBDIR= BerkeleyDB.${BDBVER} -CONFIGURE_ARGS= --enable-compat185 --enable-dump185 \ - --enable-cxx --enable-dynamic \ - --enable-rpc \ - --includedir=${PREFIX}/include/${PORTNAME} \ - --libdir=${PREFIX}/lib/${PORTNAME} \ - --bindir=${PREFIX}/bin/${PORTNAME} -INSTALL_TARGET= install_include install_lib install_utilities - -INSTALL_TARGET+= install_docs docdir=${DOCSDIR} -PORTDOCS= * - -OPTIONS_DEFINE= DOCS - -.include <bsd.port.options.mk> - -pre-patch: - ${REINPLACE_CMD} -Ee 's|-l?pthread|${PTHREAD_LIBS}|g; s,/usr/bin/objformat \|\| echo aout,/usr/bin/objformat || echo elf,' ${WRKSRC}/${CONFIGURE_SCRIPT} - -pre-configure: - ${CHMOD} u+w ${WRKSRC}/../dist/configure - -post-configure: - ${REINPLACE_CMD} -e '/^extern void db_rpc_serverprog/ d;' ${WRKSRC}/db_server.h - -post-install: -.for i in libdb libdb_cxx - ${LN} -s -f ${PORTNAME}/${i}-${BDBVER}.so.0 ${STAGEDIR}${PREFIX}/lib - ${LN} -s -f ${i}-${BDBVER}.so.0 ${STAGEDIR}${PREFIX}/lib/${i}-${BDBVER}.so -.endfor -.if ${PORT_OPTIONS:MDOCS} - @${RMDIR} ${DOCSDIR}/ref/splash 2>/dev/null || : -.endif - cd ${STAGEDIR}${PREFIX}/bin/${PORTNAME} ; \ - for i in * ; do ${LN} -s -f ${PORTNAME}/$$i ../$$i-${BDBVER} ; done -.include <bsd.port.pre.mk> - -.if ${ARCH} == amd64 -CONFIGURE_ARGS+= --with-mutex=x86/gcc-assembly -.endif - -.include <bsd.port.post.mk> diff --git a/databases/db43/distinfo b/databases/db43/distinfo deleted file mode 100644 index 0fb30e66976d..000000000000 --- a/databases/db43/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (bdb/db-4.3.29.tar.gz) = a1fa714482f25a67a19490303a0164326ac63bd7653ae3f4664c2536b14f3337 -SIZE (bdb/db-4.3.29.tar.gz) = 5942547 diff --git a/databases/db43/files/patch-dist__configure b/databases/db43/files/patch-dist__configure deleted file mode 100644 index 2dac99fc909d..000000000000 --- a/databases/db43/files/patch-dist__configure +++ /dev/null @@ -1,13 +0,0 @@ ---- ../dist/configure.orig Wed Dec 5 13:14:02 2001 -+++ ../dist/configure Wed Dec 5 13:24:01 2001 -@@ -20867,8 +20867,8 @@ - - MAKEFILE_CC="\$(LIBTOOL) --mode=compile ${MAKEFILE_CC}" --MAKEFILE_SOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK} -avoid-version" -+MAKEFILE_SOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK} -version-info 0:0:0" - MAKEFILE_CCLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK}" - MAKEFILE_CXX="\$(LIBTOOL) --mode=compile ${MAKEFILE_CXX}" --MAKEFILE_XSOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK} -avoid-version" -+MAKEFILE_XSOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK} -version-info 0:0:0" - MAKEFILE_CXXLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK}" - diff --git a/databases/db43/files/patch-upstream.4.3.29.1 b/databases/db43/files/patch-upstream.4.3.29.1 deleted file mode 100644 index 2bec8e0200bb..000000000000 --- a/databases/db43/files/patch-upstream.4.3.29.1 +++ /dev/null @@ -1,24 +0,0 @@ -*** ../mp/mp_fget.c.orig 2006-05-30 20:44:11.000000000 -0700 ---- ../mp/mp_fget.c 2006-05-30 20:44:22.000000000 -0700 -*************** -*** 577,584 **** - */ - if (state != SECOND_MISS && bhp->ref == 1) { - bhp->priority = UINT32_MAX; -! SH_TAILQ_REMOVE(&hp->hash_bucket, bhp, hq, __bh); -! SH_TAILQ_INSERT_TAIL(&hp->hash_bucket, bhp, hq); - hp->hash_priority = - SH_TAILQ_FIRST(&hp->hash_bucket, __bh)->priority; - } ---- 577,587 ---- - */ - if (state != SECOND_MISS && bhp->ref == 1) { - bhp->priority = UINT32_MAX; -! if (SH_TAILQ_FIRST(&hp->hash_bucket, __bh) != -! SH_TAILQ_LAST(&hp->hash_bucket, hq, __bh)) { -! SH_TAILQ_REMOVE(&hp->hash_bucket, bhp, hq, __bh); -! SH_TAILQ_INSERT_TAIL(&hp->hash_bucket, bhp, hq); -! } - hp->hash_priority = - SH_TAILQ_FIRST(&hp->hash_bucket, __bh)->priority; - } diff --git a/databases/db43/pkg-descr b/databases/db43/pkg-descr deleted file mode 100644 index 66b08222b8aa..000000000000 --- a/databases/db43/pkg-descr +++ /dev/null @@ -1,11 +0,0 @@ -Version 4.3 of the Berkeley Data Base library which offers (key/value) storage -with optional concurrent access or transactions interface. - -Utilities are included in the distribution to convert v1.85 databases to v4.3 -databases, and a backwards compatible API is provided to maintain -compatibility with programs using the v1.85 interface. - -For details on compatibility with other DB versions, see: -http://www.sleepycat.com/download/patchlogs.shtml - -WWW: http://www.oracle.com/us/products/database/berkeley-db/db/ diff --git a/databases/db43/pkg-plist b/databases/db43/pkg-plist deleted file mode 100644 index 8d51f88a0b49..000000000000 --- a/databases/db43/pkg-plist +++ /dev/null @@ -1,48 +0,0 @@ -bin/db43/berkeley_db_svc -bin/db43/db_archive -bin/db43/db_checkpoint -bin/db43/db_deadlock -bin/db43/db_dump -bin/db43/db_dump185 -bin/db43/db_load -bin/db43/db_printlog -bin/db43/db_recover -bin/db43/db_stat -bin/db43/db_upgrade -bin/db43/db_verify -bin/berkeley_db_svc-4.3 -bin/db_archive-4.3 -bin/db_checkpoint-4.3 -bin/db_deadlock-4.3 -bin/db_dump-4.3 -bin/db_dump185-4.3 -bin/db_load-4.3 -bin/db_printlog-4.3 -bin/db_recover-4.3 -bin/db_stat-4.3 -bin/db_upgrade-4.3 -bin/db_verify-4.3 -include/db43/db.h -include/db43/db_185.h -include/db43/db_cxx.h -lib/db43/libdb-4.3.a -lib/db43/libdb-4.3.la -lib/db43/libdb-4.3.so -lib/db43/libdb-4.3.so.0 -lib/db43/libdb-4.so -lib/db43/libdb.a -lib/db43/libdb.so -lib/db43/libdb_cxx-4.3.a -lib/db43/libdb_cxx-4.3.la -lib/db43/libdb_cxx-4.3.so -lib/db43/libdb_cxx-4.3.so.0 -lib/db43/libdb_cxx-4.so -lib/db43/libdb_cxx.a -lib/db43/libdb_cxx.so -lib/libdb-4.3.so -lib/libdb-4.3.so.0 -lib/libdb_cxx-4.3.so -lib/libdb_cxx-4.3.so.0 -@dirrm lib/db43 -@dirrm include/db43 -@dirrm bin/db43 diff --git a/databases/db44/Makefile b/databases/db44/Makefile deleted file mode 100644 index 39903bccda03..000000000000 --- a/databases/db44/Makefile +++ /dev/null @@ -1,62 +0,0 @@ -# Created by: Matthias Andree <matthias.andree@gmx.de> -# $FreeBSD$ - -PORTNAME= db44 -PORTVERSION= 4.4.20.4 -CATEGORIES= databases -MASTER_SITES= http://download.oracle.com/berkeley-db/ -PKGNAMESUFFIX?= -DISTNAME= db-4.4.20 -DIST_SUBDIR= bdb - -MAINTAINER= ports@FreeBSD.org -COMMENT= The Berkeley DB package, revision 4.4 - -WRKSRC= ${WRKDIR}/${DISTNAME}/build_unix - -DEPRECATED= Please use databases/db5 or db6 for new installs. - -USE_LDCONFIG= yes -GNU_CONFIGURE= yes -DEBUG_FLAGS= -g -O1 # need -O1 for inline assembly -CONFIGURE_SCRIPT= ../dist/configure -LIBTOOLFILES= ${CONFIGURE_SCRIPT} -BDBVER= ${PORTVERSION:R:R} -CONFIGURE_ARGS= --enable-compat185 --enable-dump185 \ - --enable-cxx --enable-dynamic \ - --enable-rpc \ - --includedir=${PREFIX}/include/${PORTNAME} \ - --libdir=${PREFIX}/lib/${PORTNAME} \ - --bindir=${PREFIX}/bin/${PORTNAME} -INSTALL_TARGET= install_include install_lib install_utilities - -OPTIONS_DEFINE= DOCS - -DOCS_INSTALL_TARGET= install_docs docdir=${DOCSDIR} -PORTDOCS= * - -NO_STAGE= yes - -.include <bsd.port.options.mk> - -pre-patch: - @${REINPLACE_CMD} -Ee 's|-l?pthread|${PTHREAD_LIBS}|g' ${WRKSRC}/${CONFIGURE_SCRIPT} - -pre-configure: - @${CHMOD} u+w ${WRKSRC}/../dist/configure - -post-configure: - @${REINPLACE_CMD} -e '/^extern void db_rpc_serverprog/ d;' ${WRKSRC}/db_server.h - -post-install: -.for i in libdb libdb_cxx - ${LN} -s -f ${PORTNAME}/${i}-${BDBVER}.so.0 ${PREFIX}/lib - ${LN} -s -f ${i}-${BDBVER}.so.0 ${PREFIX}/lib/${i}-${BDBVER}.so -.endfor -.if ${PORT_OPTIONS:MDOCS} - @${RMDIR} ${DOCSDIR}/ref/splash 2>/dev/null || : -.endif - cd ${PREFIX}/bin/${PORTNAME} ; \ - for i in * ; do ${LN} -s -f ${PORTNAME}/$$i ../$$i-${BDBVER} ; done - -.include <bsd.port.mk> diff --git a/databases/db44/distinfo b/databases/db44/distinfo deleted file mode 100644 index 5741c6d90d1e..000000000000 --- a/databases/db44/distinfo +++ /dev/null @@ -1,10 +0,0 @@ -SHA256 (bdb/db-4.4.20.tar.gz) = 298ab78801f7502016aa2db033b65fab46f323533bdc08610d3dabd910d63b79 -SIZE (bdb/db-4.4.20.tar.gz) = 7952742 -SHA256 (bdb/patch.4.4.20.1) = 4eeb18450b88703282251c386405bf7c9efa053a42d1dda97603ee8039ee5869 -SIZE (bdb/patch.4.4.20.1) = 867 -SHA256 (bdb/patch.4.4.20.2) = 45949e288482736bbc27bd62c854a99fad4b3e55103897eafd62bce1d5629bbc -SIZE (bdb/patch.4.4.20.2) = 721 -SHA256 (bdb/patch.4.4.20.3) = ae54bb752a31655a1a945f12900b740fad397c3e2ddab792ecfd4660d3e6e236 -SIZE (bdb/patch.4.4.20.3) = 1366 -SHA256 (bdb/patch.4.4.20.4) = 7018f74e5184451809f6864172132472e91d95e2bec97ce6124afb67f0d65e59 -SIZE (bdb/patch.4.4.20.4) = 837 diff --git a/databases/db44/files/patch-dist__configure b/databases/db44/files/patch-dist__configure deleted file mode 100644 index 5aceb834b77d..000000000000 --- a/databases/db44/files/patch-dist__configure +++ /dev/null @@ -1,13 +0,0 @@ ---- ../dist/configure.orig Wed Dec 5 13:14:02 2001 -+++ ../dist/configure Wed Dec 5 13:24:01 2001 -@@ -21657,8 +21657,8 @@ - - MAKEFILE_CC="\$(LIBTOOL) --mode=compile ${MAKEFILE_CC}" --MAKEFILE_SOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK} -avoid-version" -+MAKEFILE_SOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK} -version-info 0:0:0" - MAKEFILE_CCLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK}" - MAKEFILE_CXX="\$(LIBTOOL) --mode=compile ${MAKEFILE_CXX}" --MAKEFILE_XSOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK} -avoid-version" -+MAKEFILE_XSOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK} -version-info 0:0:0" - MAKEFILE_CXXLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK}" - diff --git a/databases/db44/files/patch-upstream.4.4.20.1 b/databases/db44/files/patch-upstream.4.4.20.1 deleted file mode 100644 index bd7334747039..000000000000 --- a/databases/db44/files/patch-upstream.4.4.20.1 +++ /dev/null @@ -1,27 +0,0 @@ -*** ../qam/qam_files.c.orig 2005-10-20 11:57:12.000000000 -0700 ---- ../qam/qam_files.c 2006-01-27 13:38:38.000000000 -0800 -*************** -*** 411,416 **** ---- 411,422 ---- - DB_APP_DATA, buf, 0, NULL, &real_name)) != 0) - goto err; - #endif -+ -+ mpf = array->mpfarray[offset].mpf; -+ /* This extent my already be marked for delete and closed. */ -+ if (mpf == NULL) -+ goto err; -+ - /* - * The log must be flushed before the file is deleted. We depend on - * the log record of the last delete to recreate the file if we crash. -*************** -*** 418,424 **** - if (LOGGING_ON(dbenv) && (ret = __log_flush(dbenv, NULL)) != 0) - goto err; - -- mpf = array->mpfarray[offset].mpf; - (void)__memp_set_flags(mpf, DB_MPOOL_UNLINK, 1); - /* Someone could be real slow, let them close it down. */ - if (array->mpfarray[offset].pinref != 0) ---- 424,429 ---- diff --git a/databases/db44/files/patch-upstream.4.4.20.2 b/databases/db44/files/patch-upstream.4.4.20.2 deleted file mode 100644 index dbcd69962bda..000000000000 --- a/databases/db44/files/patch-upstream.4.4.20.2 +++ /dev/null @@ -1,29 +0,0 @@ -*** ../txn/txn.c.orig Tue Nov 1 06:50:03 2005 ---- ../txn/txn.c Tue Jan 31 15:05:13 2006 -*************** -*** 1049,1060 **** ---- 1049,1062 ---- - return (ret); - memcpy(txn->name, name, len); - -+ TXN_SYSTEM_LOCK(dbenv); - if (td->name != INVALID_ROFF) { - __db_shalloc_free( - &mgr->reginfo, R_ADDR(&mgr->reginfo, td->name)); - td->name = INVALID_ROFF; - } - if ((ret = __db_shalloc(&mgr->reginfo, len, 0, &p)) != 0) { -+ TXN_SYSTEM_UNLOCK(dbenv); - __db_err(dbenv, - "Unable to allocate memory for transaction name"); - -*************** -*** 1063,1068 **** ---- 1065,1071 ---- - - return (ret); - } -+ TXN_SYSTEM_UNLOCK(dbenv); - td->name = R_OFFSET(&mgr->reginfo, p); - memcpy(p, name, len); - diff --git a/databases/db44/files/patch-upstream.4.4.20.3 b/databases/db44/files/patch-upstream.4.4.20.3 deleted file mode 100644 index d859c42a44c1..000000000000 --- a/databases/db44/files/patch-upstream.4.4.20.3 +++ /dev/null @@ -1,49 +0,0 @@ -*** ../db/db_cam.c.orig 2006-01-11 03:19:21.000000000 +1100 ---- ../db/db_cam.c 2006-03-01 13:59:01.000000000 +1100 -*************** -*** 579,589 **** - flags == DB_NEXT || flags == DB_NEXT_DUP || flags == DB_PREV)) { - if (tmp_rmw && (ret = dbc_arg->c_am_writelock(dbc_arg)) != 0) - return (ret); -! if ((ret = __db_c_idup(cp->opd, &opd, DB_POSITION)) != 0) - return (ret); - -! switch (ret = -! opd->c_am_get(opd, key, data, flags, NULL)) { - case 0: - goto done; - case DB_NOTFOUND: ---- 579,590 ---- - flags == DB_NEXT || flags == DB_NEXT_DUP || flags == DB_PREV)) { - if (tmp_rmw && (ret = dbc_arg->c_am_writelock(dbc_arg)) != 0) - return (ret); -! if (F_ISSET(dbc_arg, DBC_TRANSIENT)) -! opd = cp->opd; -! else if ((ret = __db_c_idup(cp->opd, &opd, DB_POSITION)) != 0) - return (ret); - -! switch (ret = opd->c_am_get(opd, key, data, flags, NULL)) { - case 0: - goto done; - case DB_NOTFOUND: -*************** -*** 596,607 **** ---- 597,614 ---- - if ((ret = __db_c_close(opd)) != 0) - goto err; - opd = NULL; -+ if (F_ISSET(dbc_arg, DBC_TRANSIENT)) -+ cp->opd = NULL; - break; - } - goto err; - default: - goto err; - } -+ } else if (cp->opd != NULL && F_ISSET(dbc_arg, DBC_TRANSIENT)) { -+ if ((ret = __db_c_close(cp->opd)) != 0) -+ goto err; -+ cp->opd = NULL; - } - - /* diff --git a/databases/db44/files/patch-upstream.4.4.20.4 b/databases/db44/files/patch-upstream.4.4.20.4 deleted file mode 100644 index d6ee29d12d6a..000000000000 --- a/databases/db44/files/patch-upstream.4.4.20.4 +++ /dev/null @@ -1,24 +0,0 @@ -*** ../mp/mp_fget.c.orig 2005-10-12 10:53:36.000000000 -0700 ---- ../mp/mp_fget.c 2006-05-30 20:48:10.000000000 -0700 -*************** -*** 587,594 **** - */ - if (state != SECOND_MISS && bhp->ref == 1) { - bhp->priority = UINT32_MAX; -! SH_TAILQ_REMOVE(&hp->hash_bucket, bhp, hq, __bh); -! SH_TAILQ_INSERT_TAIL(&hp->hash_bucket, bhp, hq); - hp->hash_priority = - SH_TAILQ_FIRSTP(&hp->hash_bucket, __bh)->priority; - } ---- 587,597 ---- - */ - if (state != SECOND_MISS && bhp->ref == 1) { - bhp->priority = UINT32_MAX; -! if (SH_TAILQ_FIRST(&hp->hash_bucket, __bh) != -! SH_TAILQ_LAST(&hp->hash_bucket, hq, __bh)) { -! SH_TAILQ_REMOVE(&hp->hash_bucket, bhp, hq, __bh); -! SH_TAILQ_INSERT_TAIL(&hp->hash_bucket, bhp, hq); -! } - hp->hash_priority = - SH_TAILQ_FIRSTP(&hp->hash_bucket, __bh)->priority; - } diff --git a/databases/db44/pkg-descr b/databases/db44/pkg-descr deleted file mode 100644 index d16e0ce757c6..000000000000 --- a/databases/db44/pkg-descr +++ /dev/null @@ -1,13 +0,0 @@ -Version 4.4 of the Berkeley Data Base library which offers (key/value) storage -with optional concurrent access or transactions interface. - -This port will install the AES (American Encryption Standard) enabled version. - -Utilities are included in the distribution to convert v1.85 databases to v4.4 -databases, and a backwards compatible API is provided to maintain compatibility -with programs using the v1.85 interface. - -For details on compatibility with other DB versions, see: -http://dev.sleepycat.com/downloads/releasehistorybdb.html - -WWW: http://www.oracle.com/us/products/database/berkeley-db/db/ diff --git a/databases/db44/pkg-plist b/databases/db44/pkg-plist deleted file mode 100644 index 554ddbac3237..000000000000 --- a/databases/db44/pkg-plist +++ /dev/null @@ -1,50 +0,0 @@ -bin/db44/berkeley_db_svc -bin/db44/db_archive -bin/db44/db_checkpoint -bin/db44/db_deadlock -bin/db44/db_dump -bin/db44/db_dump185 -bin/db44/db_hotbackup -bin/db44/db_load -bin/db44/db_printlog -bin/db44/db_recover -bin/db44/db_stat -bin/db44/db_upgrade -bin/db44/db_verify -bin/berkeley_db_svc-4.4 -bin/db_archive-4.4 -bin/db_checkpoint-4.4 -bin/db_deadlock-4.4 -bin/db_dump-4.4 -bin/db_dump185-4.4 -bin/db_hotbackup-4.4 -bin/db_load-4.4 -bin/db_printlog-4.4 -bin/db_recover-4.4 -bin/db_stat-4.4 -bin/db_upgrade-4.4 -bin/db_verify-4.4 -include/db44/db.h -include/db44/db_185.h -include/db44/db_cxx.h -lib/db44/libdb-4.4.a -lib/db44/libdb-4.4.la -lib/db44/libdb-4.4.so -lib/db44/libdb-4.4.so.0 -lib/db44/libdb-4.so -lib/db44/libdb.a -lib/db44/libdb.so -lib/db44/libdb_cxx-4.4.a -lib/db44/libdb_cxx-4.4.la -lib/db44/libdb_cxx-4.4.so -lib/db44/libdb_cxx-4.4.so.0 -lib/db44/libdb_cxx-4.so -lib/db44/libdb_cxx.a -lib/db44/libdb_cxx.so -lib/libdb-4.4.so -lib/libdb-4.4.so.0 -lib/libdb_cxx-4.4.so -lib/libdb_cxx-4.4.so.0 -@dirrm lib/db44 -@dirrm include/db44 -@dirrm bin/db44 diff --git a/databases/db46/Makefile b/databases/db46/Makefile deleted file mode 100644 index 433f1b53b7d9..000000000000 --- a/databases/db46/Makefile +++ /dev/null @@ -1,61 +0,0 @@ -# Created by: Gea-Suan Lin <gslin@gslin.org> -# $FreeBSD$ - -PORTNAME= db46 -PORTVERSION= 4.6.21.4 -CATEGORIES= databases -MASTER_SITES= http://download.oracle.com/berkeley-db/ \ -PKGNAMEPREFIX?= -DISTNAME= db-${PORTVERSION:R} -DIST_SUBDIR= bdb - -PATCH_SITES= http://download.oracle.com/berkeley-db/patches/db/${PORTVERSION:R}/ -PATCHFILES= patch.4.6.21.1 patch.4.6.21.2 patch.4.6.21.3 patch.4.6.21.4 -PATCH_DIST_STRIP= -d .. -l -# * patch.4.6.21.1: ----------------------------------------------------------- -# Fixes a race condition between checkpoint and DB->close which can result in -# the checkpoint thread self-deadlocking. [#15692] -# * 4.6.21.2: ----------------------------------------------------------------- -# Fixes the potential for the wrong number of mutexes to be allocated. This -# issue could cause applications with multiple cache regions to see undefined -# behavior in rare cases under load. [#16178] -# * 4.6.21.3: ----------------------------------------------------------------- -# Replication clients should be able to open a sequence. [#16406] -# * 4.6.21.4: ----------------------------------------------------------------- -# Fixes a bug which could lead to slow performance of internal init under -# Replication Manager, as evidenced by "queue limit exceeded" messages in -# verbose replication diagnostic output. [#15788] - -# I allow matthias.andree@gmx.de and all freebsd committer to do changes -# to this package. - -MAINTAINER= mandree@FreeBSD.org -COMMENT= The Berkeley DB package, revision 4.6 - -DEPRECATED= Please use databases/db5 or db6 for new installs. - -BDBVER= ${PORTVERSION:R:R} -CONFIGURE_ARGS= --enable-compat185 --enable-dump185 --enable-cxx \ - --enable-dynamic --enable-rpc --enable-pthread_api \ - --includedir=${PREFIX}/include/${PORTNAME} \ - --libdir=${PREFIX}/lib/${PORTNAME} \ - --bindir=${PREFIX}/bin/${PORTNAME} -CONFIGURE_SCRIPT= ../dist/configure -GNU_CONFIGURE= yes -INSTALL_TARGET= install_include install_lib install_utilities -LIBTOOLFILES= ${CONFIGURE_SCRIPT} -WRKSRC= ${WRKDIR}/${DISTNAME}/build_unix -USE_LDCONFIG= yes - -INSTALL_TARGET+= install_docs docdir=${DOCSDIR} -PORTDOCS= * - -post-install: -.for i in libdb libdb_cxx - ${LN} -s -f ${PORTNAME}/${i}-${BDBVER}.so.0 ${STAGEDIR}${PREFIX}/lib - ${LN} -s -f ${i}-${BDBVER}.so.0 ${STAGEDIR}${PREFIX}/lib/${i}-${BDBVER}.so -.endfor - cd ${STAGEDIR}${PREFIX}/bin/${PORTNAME} ; \ - for i in * ; do ${LN} -s -f ${PORTNAME}/$$i ../$$i-${BDBVER} ; done - -.include <bsd.port.mk> diff --git a/databases/db46/distinfo b/databases/db46/distinfo deleted file mode 100644 index 63b747c2155b..000000000000 --- a/databases/db46/distinfo +++ /dev/null @@ -1,10 +0,0 @@ -SHA256 (bdb/db-4.6.21.tar.gz) = 53ea9c9f03746a0aa415e6706e9c6da18ca18148f20ad1465b182411a7985e21 -SIZE (bdb/db-4.6.21.tar.gz) = 11881885 -SHA256 (bdb/patch.4.6.21.1) = d28c0723c465a2cf3ff2ddc5ed3c643b40c955c4e64d56580961f2fd799cbb53 -SIZE (bdb/patch.4.6.21.1) = 2475 -SHA256 (bdb/patch.4.6.21.2) = 9496a6cad44377ad1fab8c617f17c6f541e3423814663bfa81c3abb4001622d9 -SIZE (bdb/patch.4.6.21.2) = 892 -SHA256 (bdb/patch.4.6.21.3) = ad6951ec702e3d6cd539ba86d51b3b0436da43b17814c197c2d277fa5e1cb620 -SIZE (bdb/patch.4.6.21.3) = 1911 -SHA256 (bdb/patch.4.6.21.4) = 98bb4499dc7408c27a8a855330972a69abd3b29d0ff3820d6e1da790593a5bb7 -SIZE (bdb/patch.4.6.21.4) = 41501 diff --git a/databases/db46/files/patch-dist__configure b/databases/db46/files/patch-dist__configure deleted file mode 100644 index 2dac99fc909d..000000000000 --- a/databases/db46/files/patch-dist__configure +++ /dev/null @@ -1,13 +0,0 @@ ---- ../dist/configure.orig Wed Dec 5 13:14:02 2001 -+++ ../dist/configure Wed Dec 5 13:24:01 2001 -@@ -20867,8 +20867,8 @@ - - MAKEFILE_CC="\$(LIBTOOL) --mode=compile ${MAKEFILE_CC}" --MAKEFILE_SOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK} -avoid-version" -+MAKEFILE_SOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK} -version-info 0:0:0" - MAKEFILE_CCLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK}" - MAKEFILE_CXX="\$(LIBTOOL) --mode=compile ${MAKEFILE_CXX}" --MAKEFILE_XSOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK} -avoid-version" -+MAKEFILE_XSOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK} -version-info 0:0:0" - MAKEFILE_CXXLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK}" - diff --git a/databases/db46/pkg-descr b/databases/db46/pkg-descr deleted file mode 100644 index 171a54c0e062..000000000000 --- a/databases/db46/pkg-descr +++ /dev/null @@ -1,11 +0,0 @@ -Oracle Berkeley DB is a family of open source embeddable databases -that allows developers to incorporate within their applications a -fast, scalable, transactional database engine with industrial grade -reliability and availability. As a result, customers and end-users -will experience an application that simply works, reliably manages -data, can scale under extreme load, but requires no ongoing database -administration. As a developer, you can focus on your application and -be confident that Oracle Berkeley DB will manage your persistence -needs. - -WWW: http://www.oracle.com/us/products/database/berkeley-db/db/ diff --git a/databases/db46/pkg-plist b/databases/db46/pkg-plist deleted file mode 100644 index 53fa09119263..000000000000 --- a/databases/db46/pkg-plist +++ /dev/null @@ -1,52 +0,0 @@ -bin/berkeley_db_svc-4.6 -bin/db46/berkeley_db_svc -bin/db46/db_archive -bin/db46/db_checkpoint -bin/db46/db_codegen -bin/db46/db_deadlock -bin/db46/db_dump -bin/db46/db_dump185 -bin/db46/db_hotbackup -bin/db46/db_load -bin/db46/db_printlog -bin/db46/db_recover -bin/db46/db_stat -bin/db46/db_upgrade -bin/db46/db_verify -bin/db_archive-4.6 -bin/db_checkpoint-4.6 -bin/db_codegen-4.6 -bin/db_deadlock-4.6 -bin/db_dump-4.6 -bin/db_dump185-4.6 -bin/db_hotbackup-4.6 -bin/db_load-4.6 -bin/db_printlog-4.6 -bin/db_recover-4.6 -bin/db_stat-4.6 -bin/db_upgrade-4.6 -bin/db_verify-4.6 -include/db46/db.h -include/db46/db_185.h -include/db46/db_cxx.h -lib/db46/libdb-4.6.a -lib/db46/libdb-4.6.la -lib/db46/libdb-4.6.so -lib/db46/libdb-4.6.so.0 -lib/db46/libdb-4.so -lib/db46/libdb.a -lib/db46/libdb.so -lib/db46/libdb_cxx-4.6.a -lib/db46/libdb_cxx-4.6.la -lib/db46/libdb_cxx-4.6.so -lib/db46/libdb_cxx-4.6.so.0 -lib/db46/libdb_cxx-4.so -lib/db46/libdb_cxx.a -lib/db46/libdb_cxx.so -lib/libdb-4.6.so -lib/libdb-4.6.so.0 -lib/libdb_cxx-4.6.so -lib/libdb_cxx-4.6.so.0 -@dirrmtry lib/db46 -@dirrmtry include/db46 -@dirrmtry bin/db46 diff --git a/databases/db47/Makefile b/databases/db47/Makefile deleted file mode 100644 index 2b8e7948bc15..000000000000 --- a/databases/db47/Makefile +++ /dev/null @@ -1,59 +0,0 @@ -# Created by: Gea-Suan Lin <gslin@gslin.org> -# $FreeBSD$ - -PORTNAME= db47 -PORTVERSION= 4.7.25.4 -CATEGORIES= databases -MASTER_SITES= http://download.oracle.com/berkeley-db/ -PKGNAMEPREFIX?= -DISTNAME= db-${PORTVERSION:R} -DIST_SUBDIR= bdb - -PATCH_SITES= http://download.oracle.com/berkeley-db/patches/db/${PORTVERSION:R}/ -PATCHFILES= patch.4.7.25.1 patch.4.7.25.2 patch.4.7.25.3 -PATCH_DIST_STRIP= -d .. --ignore-whitespace -# * patch.4.7.25.1: ----------------------------------------------------------- -# # [#16406] Replication clients should be able to open a sequence. -# * patch.4.7.25.2: ----------------------------------------------------------- -# # [#16415] DB_ENV->lock_get may self deadlock if user defined locks -# are used and there is only one lock partition defined. -# * patch.4.7.25.3: ----------------------------------------------------------- -# # [#16541] Fix for dd segfaults. -# * patch.4.7.25.4: ----------------------------------------------------------- -# # [#16299] Fix a bug which could cause a SEGV in __repmgr_available_site if a -# site becomes master after winning an election but is still -# processing client messages. - -# I allow matthias.andree@gmx.de and all freebsd committer to do changes -# to this package. - -MAINTAINER= mandree@FreeBSD.org -COMMENT= The Berkeley DB package, revision 4.7 - -DEPRECATED= Please use databases/db5 or db6 for new installs. - -BDBVER= ${PORTVERSION:R:R} -CONFIGURE_ARGS= --enable-compat185 --enable-dump185 --enable-cxx \ - --enable-dynamic --enable-rpc --enable-pthread_api \ - --includedir=${PREFIX}/include/${PORTNAME} \ - --libdir=${PREFIX}/lib/${PORTNAME} \ - --bindir=${PREFIX}/bin/${PORTNAME} -CONFIGURE_SCRIPT= ../dist/configure -GNU_CONFIGURE= yes -INSTALL_TARGET= install_include install_lib install_utilities -LIBTOOLFILES= ${CONFIGURE_SCRIPT} -WRKSRC= ${WRKDIR}/${DISTNAME}/build_unix -USE_LDCONFIG= yes - -INSTALL_TARGET+= install_docs docdir=${DOCSDIR} -PORTDOCS= * - -post-install: -.for i in libdb libdb_cxx - ${LN} -s -f ${PORTNAME}/${i}-${BDBVER}.so.0 ${STAGEDIR}${PREFIX}/lib - ${LN} -s -f ${i}-${BDBVER}.so.0 ${STAGEDIR}${PREFIX}/lib/${i}-${BDBVER}.so -.endfor - cd ${STAGEDIR}${PREFIX}/bin/${PORTNAME} ; \ - for i in * ; do ${LN} -s -f ${PORTNAME}/$$i ../$$i-${BDBVER} ; done - -.include <bsd.port.mk> diff --git a/databases/db47/distinfo b/databases/db47/distinfo deleted file mode 100644 index d2842f86e410..000000000000 --- a/databases/db47/distinfo +++ /dev/null @@ -1,8 +0,0 @@ -SHA256 (bdb/db-4.7.25.tar.gz) = f14fd96dd38915a1d63dcb94a63fbb8092334ceba6b5060760427096f631263e -SIZE (bdb/db-4.7.25.tar.gz) = 13124129 -SHA256 (bdb/patch.4.7.25.1) = e91590af872705efc34414afb702abc630a75c55ba61570dca2216c783e0a83a -SIZE (bdb/patch.4.7.25.1) = 2072 -SHA256 (bdb/patch.4.7.25.2) = 05d6cde0ab1bfdb80394a7a88ff7233d0407f0b09103b0dd3791ebfccbbcca31 -SIZE (bdb/patch.4.7.25.2) = 2210 -SHA256 (bdb/patch.4.7.25.3) = e5393cbfc8538cc21cc939d26ceca3e5782b4a4259a644884d91790e18ed39f3 -SIZE (bdb/patch.4.7.25.3) = 8442 diff --git a/databases/db47/files/patch-dist__configure b/databases/db47/files/patch-dist__configure deleted file mode 100644 index 2dac99fc909d..000000000000 --- a/databases/db47/files/patch-dist__configure +++ /dev/null @@ -1,13 +0,0 @@ ---- ../dist/configure.orig Wed Dec 5 13:14:02 2001 -+++ ../dist/configure Wed Dec 5 13:24:01 2001 -@@ -20867,8 +20867,8 @@ - - MAKEFILE_CC="\$(LIBTOOL) --mode=compile ${MAKEFILE_CC}" --MAKEFILE_SOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK} -avoid-version" -+MAKEFILE_SOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK} -version-info 0:0:0" - MAKEFILE_CCLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK}" - MAKEFILE_CXX="\$(LIBTOOL) --mode=compile ${MAKEFILE_CXX}" --MAKEFILE_XSOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK} -avoid-version" -+MAKEFILE_XSOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK} -version-info 0:0:0" - MAKEFILE_CXXLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK}" - diff --git a/databases/db47/files/patch.4.7.25.4 b/databases/db47/files/patch.4.7.25.4 deleted file mode 100644 index d5568a472a72..000000000000 --- a/databases/db47/files/patch.4.7.25.4 +++ /dev/null @@ -1,183 +0,0 @@ -*** dbinc/repmgr.h.orig 2009-05-04 10:33:55.000000000 -0400 ---- dbinc/repmgr.h 2009-05-04 10:27:26.000000000 -0400 -*************** -*** 374,379 **** ---- 374,380 ---- - #define SITE_FROM_EID(eid) (&db_rep->sites[eid]) - #define EID_FROM_SITE(s) ((int)((s) - (&db_rep->sites[0]))) - #define IS_VALID_EID(e) ((e) >= 0) -+ #define IS_KNOWN_REMOTE_SITE(e) ((e) >= 0 && ((u_int)(e)) < db_rep->site_cnt) - #define SELF_EID INT_MAX - - #define IS_PEER_POLICY(p) ((p) == DB_REPMGR_ACKS_ALL_PEERS || \ -*** cvotn/rep/rep_elect.c.orig 2009-05-04 10:35:50.000000000 -0400 ---- cvotn/rep/rep_elect.c 2009-05-04 10:31:24.000000000 -0400 -*************** -*** 33,39 **** - static int __rep_fire_elected __P((ENV *, REP *, u_int32_t)); - static void __rep_elect_master __P((ENV *, REP *)); - static int __rep_tally __P((ENV *, REP *, int, u_int32_t *, u_int32_t, roff_t)); -! static int __rep_wait __P((ENV *, db_timeout_t *, int *, int, u_int32_t)); - - /* - * __rep_elect -- ---- 33,39 ---- - static int __rep_fire_elected __P((ENV *, REP *, u_int32_t)); - static void __rep_elect_master __P((ENV *, REP *)); - static int __rep_tally __P((ENV *, REP *, int, u_int32_t *, u_int32_t, roff_t)); -! static int __rep_wait __P((ENV *, db_timeout_t *, int, u_int32_t)); - - /* - * __rep_elect -- -*************** -*** 55,61 **** - ENV *env; - LOG *lp; - REP *rep; -! int done, eid, elected, full_elect, locked, in_progress, need_req; - int ret, send_vote, t_ret; - u_int32_t ack, ctlflags, egen, nsites, orig_tally, priority, realpri; - u_int32_t tiebreaker; ---- 55,61 ---- - ENV *env; - LOG *lp; - REP *rep; -! int done, elected, full_elect, locked, in_progress, need_req; - int ret, send_vote, t_ret; - u_int32_t ack, ctlflags, egen, nsites, orig_tally, priority, realpri; - u_int32_t tiebreaker; -*************** -*** 181,188 **** - REP_SYSTEM_UNLOCK(env); - (void)__rep_send_message(env, DB_EID_BROADCAST, - REP_MASTER_REQ, NULL, NULL, 0, 0); -! ret = __rep_wait(env, &to, &eid, -! 0, REP_F_EPHASE0); - REP_SYSTEM_LOCK(env); - F_CLR(rep, REP_F_EPHASE0); - switch (ret) { ---- 181,187 ---- - REP_SYSTEM_UNLOCK(env); - (void)__rep_send_message(env, DB_EID_BROADCAST, - REP_MASTER_REQ, NULL, NULL, 0, 0); -! ret = __rep_wait(env, &to, 0, REP_F_EPHASE0); - REP_SYSTEM_LOCK(env); - F_CLR(rep, REP_F_EPHASE0); - switch (ret) { -*************** -*** 286,296 **** - REP_SYSTEM_LOCK(env); - goto vote; - } -! ret = __rep_wait(env, &to, &eid, full_elect, REP_F_EPHASE1); - switch (ret) { - case 0: - /* Check if election complete or phase complete. */ -! if (eid != DB_EID_INVALID && !IN_ELECTION(rep)) { - RPRINT(env, DB_VERB_REP_ELECT, - (env, "Ended election phase 1")); - goto edone; ---- 285,295 ---- - REP_SYSTEM_LOCK(env); - goto vote; - } -! ret = __rep_wait(env, &to, full_elect, REP_F_EPHASE1); - switch (ret) { - case 0: - /* Check if election complete or phase complete. */ -! if (!IN_ELECTION(rep)) { - RPRINT(env, DB_VERB_REP_ELECT, - (env, "Ended election phase 1")); - goto edone; -*************** -*** 398,412 **** - REP_SYSTEM_LOCK(env); - goto i_won; - } -! ret = __rep_wait(env, &to, &eid, full_elect, REP_F_EPHASE2); - RPRINT(env, DB_VERB_REP_ELECT, - (env, "Ended election phase 2 %d", ret)); - switch (ret) { - case 0: -! if (eid != DB_EID_INVALID) -! goto edone; -! ret = DB_REP_UNAVAIL; -! break; - case DB_REP_EGENCHG: - if (to > timeout) - to = timeout; ---- 397,408 ---- - REP_SYSTEM_LOCK(env); - goto i_won; - } -! ret = __rep_wait(env, &to, full_elect, REP_F_EPHASE2); - RPRINT(env, DB_VERB_REP_ELECT, - (env, "Ended election phase 2 %d", ret)); - switch (ret) { - case 0: -! goto edone; - case DB_REP_EGENCHG: - if (to > timeout) - to = timeout; -*************** -*** 1050,1062 **** - ENV *env; - REP *rep; - { -- /* -- * We often come through here twice, sometimes even more. We mustn't -- * let the redundant calls affect stats counting. But rep_elect relies -- * on this first part for setting eidp. -- */ -- rep->master_id = rep->eid; -- - if (F_ISSET(rep, REP_F_MASTERELECT | REP_F_MASTER)) { - /* We've been through here already; avoid double counting. */ - return; ---- 1046,1051 ---- -*************** -*** 1093,1102 **** - (timeout > 5000000) ? 500000 : ((timeout >= 10) ? timeout / 10 : 1); - - static int -! __rep_wait(env, timeoutp, eidp, full_elect, flags) - ENV *env; - db_timeout_t *timeoutp; -! int *eidp, full_elect; - u_int32_t flags; - { - DB_REP *db_rep; ---- 1082,1091 ---- - (timeout > 5000000) ? 500000 : ((timeout >= 10) ? timeout / 10 : 1); - - static int -! __rep_wait(env, timeoutp, full_elect, flags) - ENV *env; - db_timeout_t *timeoutp; -! int full_elect; - u_int32_t flags; - { - DB_REP *db_rep; -*************** -*** 1174,1180 **** - F_CLR(rep, REP_F_EGENUPDATE); - ret = DB_REP_EGENCHG; - } else if (phase_over) { -- *eidp = rep->master_id; - done = 1; - ret = 0; - } ---- 1163,1168 ---- -*** cvotn/repmgr/repmgr_net.c.orig 2009-05-04 10:34:46.000000000 -0400 ---- cvotn/repmgr/repmgr_net.c 2009-05-04 10:27:26.000000000 -0400 -*************** -*** 100,105 **** ---- 100,107 ---- - control, rec, &nsites_sent, &npeers_sent)) != 0) - goto out; - } else { -+ DB_ASSERT(env, IS_KNOWN_REMOTE_SITE(eid)); -+ - /* - * If this is a request that can be sent anywhere, then see if - * we can send it to our peer (to save load on the master), but diff --git a/databases/db47/pkg-descr b/databases/db47/pkg-descr deleted file mode 100644 index 171a54c0e062..000000000000 --- a/databases/db47/pkg-descr +++ /dev/null @@ -1,11 +0,0 @@ -Oracle Berkeley DB is a family of open source embeddable databases -that allows developers to incorporate within their applications a -fast, scalable, transactional database engine with industrial grade -reliability and availability. As a result, customers and end-users -will experience an application that simply works, reliably manages -data, can scale under extreme load, but requires no ongoing database -administration. As a developer, you can focus on your application and -be confident that Oracle Berkeley DB will manage your persistence -needs. - -WWW: http://www.oracle.com/us/products/database/berkeley-db/db/ diff --git a/databases/db47/pkg-plist b/databases/db47/pkg-plist deleted file mode 100644 index 22a7a9ccbc4d..000000000000 --- a/databases/db47/pkg-plist +++ /dev/null @@ -1,52 +0,0 @@ -bin/berkeley_db_svc-4.7 -bin/db47/berkeley_db_svc -bin/db47/db_archive -bin/db47/db_checkpoint -bin/db47/db_codegen -bin/db47/db_deadlock -bin/db47/db_dump -bin/db47/db_dump185 -bin/db47/db_hotbackup -bin/db47/db_load -bin/db47/db_printlog -bin/db47/db_recover -bin/db47/db_stat -bin/db47/db_upgrade -bin/db47/db_verify -bin/db_archive-4.7 -bin/db_checkpoint-4.7 -bin/db_codegen-4.7 -bin/db_deadlock-4.7 -bin/db_dump-4.7 -bin/db_dump185-4.7 -bin/db_hotbackup-4.7 -bin/db_load-4.7 -bin/db_printlog-4.7 -bin/db_recover-4.7 -bin/db_stat-4.7 -bin/db_upgrade-4.7 -bin/db_verify-4.7 -include/db47/db.h -include/db47/db_185.h -include/db47/db_cxx.h -lib/db47/libdb-4.7.a -lib/db47/libdb-4.7.la -lib/db47/libdb-4.7.so -lib/db47/libdb-4.7.so.0 -lib/db47/libdb-4.so -lib/db47/libdb.a -lib/db47/libdb.so -lib/db47/libdb_cxx-4.7.a -lib/db47/libdb_cxx-4.7.la -lib/db47/libdb_cxx-4.7.so -lib/db47/libdb_cxx-4.7.so.0 -lib/db47/libdb_cxx-4.so -lib/db47/libdb_cxx.a -lib/db47/libdb_cxx.so -lib/libdb-4.7.so -lib/libdb-4.7.so.0 -lib/libdb_cxx-4.7.so -lib/libdb_cxx-4.7.so.0 -@dirrmtry lib/db47 -@dirrmtry include/db47 -@dirrmtry bin/db47 diff --git a/databases/db48/Makefile b/databases/db48/Makefile index 9603985f2492..f4304e02b723 100644 --- a/databases/db48/Makefile +++ b/databases/db48/Makefile @@ -15,6 +15,9 @@ MAINTAINER= mandree@FreeBSD.org # my permission. COMMENT= The Berkeley DB package, revision 4.8 +DEPRECATED= Please move to db5 or db6. +EXPIRATION_DATE= 2014-11-30 + LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKDIR}/${DISTNAME}/LICENSE diff --git a/databases/dbtool/Makefile b/databases/dbtool/Makefile index 097f47eecf80..780708267f04 100644 --- a/databases/dbtool/Makefile +++ b/databases/dbtool/Makefile @@ -14,11 +14,6 @@ LIB_DEPENDS= libpcre.so:${PORTSDIR}/devel/pcre OPTIONS_DEFINE= BDB EXAMPLES -BDB_LIB_DEPENDS= libdb3.so:${PORTSDIR}/databases/db3 -BDB_CPPFLAGS= -I${LOCALBASE}/include/db3 -BDB_CONFIGURE_ON= --with-berkeley -BDB_LIB_DEPENDS_OFF= libgdbm.so:${PORTSDIR}/databases/gdbm - EXAMPLES_RUN_DEPENDS= bash:${PORTSDIR}/shells/bash LICENSE= GPLv2 @@ -35,17 +30,27 @@ UB2PFX= samples/locate/locate samples/locate/updatedb .include <bsd.port.options.mk> +.if ${PORT_OPTIONS:MBDB} +USE_BDB= 48+ +CPPFLAGS+= -I${BDB_INCLUDE_DIR} +LIBS+= -L${BDB_LIB_DIR} -l${BDB_LIB_NAME} +CONFIGURE_ARGS+= --with-berkeley +.else +LIB_DEPENDS+= libgdbm.so:${PORTSDIR}/databases/gdbm +CONFIGURE_ARGS+= --without-berkeley +.endif + post-patch: + ${REINPLACE_CMD} -e 's,==,=,g' ${WRKSRC}/configure .for file in dbtool.cc engine.cc engine.h - @${REINPLACE_CMD} -e "s,stdin,input,g" ${WRKSRC}/${file} + ${REINPLACE_CMD} -e "s,stdin,input,g" ${WRKSRC}/${file} .endfor - @${REINPLACE_CMD} -e "s,==,=,g" ${WRKSRC}/configure .if ${PORT_OPTIONS:MEXAMPLES} .for file in ${SH2BASH} - @${REINPLACE_CMD} -e "s|/bin/sh|${LOCALBASE}/bin/bash|" ${WRKSRC}/${file} + ${REINPLACE_CMD} -e "s|/bin/sh|${LOCALBASE}/bin/bash|" ${WRKSRC}/${file} .endfor .for file in ${UB2PFX} - @${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/${file} + ${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/${file} @${RM} ${WRKSRC}/${file}.orig @${RM} ${WRKSRC}/${file}~ .endfor @@ -53,6 +58,6 @@ post-patch: post-install: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} - @${CP} -Rp ${WRKSRC}/samples/* ${STAGEDIR}${EXAMPLESDIR} + ${CP} -Rp ${WRKSRC}/samples/* ${STAGEDIR}${EXAMPLESDIR} .include <bsd.port.mk> diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile index 20cc08575660..7ed0544d1a90 100644 --- a/databases/evolution-data-server/Makefile +++ b/databases/evolution-data-server/Makefile @@ -4,7 +4,7 @@ PORTNAME= evolution-data-server PORTVERSION= 2.32.1 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= databases gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/databases/fortytwo-bdb/Makefile b/databases/fortytwo-bdb/Makefile index 2829cdf3fdd0..aa03f347e16d 100644 --- a/databases/fortytwo-bdb/Makefile +++ b/databases/fortytwo-bdb/Makefile @@ -2,7 +2,7 @@ PORTNAME= bdb PORTVERSION= 0.2.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= databases gnustep MASTER_SITES= SF/fortytwo/Berkeley%20DB%20Wrapper%20%28BDB%29/${PORTVERSION} PKGNAMEPREFIX= fortytwo- @@ -21,7 +21,7 @@ USE_GNUSTEP_INSTALL= yes USE_GNUSTEP_LOCAL_LIBS+= Encore:${ENCORE_PORT} DEFAULT_LIBVERSION= 0.1 USE_GNUSTEP_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES} -USE_BDB= 43 +USE_BDB= 43+ WRKSRC= ${WRKDIR}/BDB-${PORTVERSION} DOCSDIR= ${GNUSTEP_PREFIX}/Local/Library/Documentation/BDB diff --git a/databases/libgda4-bdb/Makefile b/databases/libgda4-bdb/Makefile index 3d3d338855d5..14cb2ec2ca3f 100644 --- a/databases/libgda4-bdb/Makefile +++ b/databases/libgda4-bdb/Makefile @@ -1,7 +1,7 @@ # Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases gnome PKGNAMESUFFIX= 4-bdb diff --git a/databases/libgda4/Makefile b/databases/libgda4/Makefile index a0fb529993b9..56e32b5a45be 100644 --- a/databases/libgda4/Makefile +++ b/databases/libgda4/Makefile @@ -4,7 +4,7 @@ PORTNAME= libgda PORTVERSION= 4.2.12 -PORTREVISION?= 4 +PORTREVISION?= 5 CATEGORIES= databases gnome MASTER_SITES= GNOME PKGNAMESUFFIX?= 4 diff --git a/databases/libgda5/Makefile b/databases/libgda5/Makefile index 044cd51b20b6..4d1407a5ecb1 100644 --- a/databases/libgda5/Makefile +++ b/databases/libgda5/Makefile @@ -4,7 +4,7 @@ PORTNAME= libgda PORTVERSION?= 5.0.3 -PORTREVISION?= 2 +PORTREVISION?= 3 CATEGORIES= databases gnome MASTER_SITES= GNOME PKGNAMESUFFIX?= 5 diff --git a/databases/memcachedb/Makefile b/databases/memcachedb/Makefile index b2551db49753..8c96766a4d62 100644 --- a/databases/memcachedb/Makefile +++ b/databases/memcachedb/Makefile @@ -3,7 +3,7 @@ PORTNAME= memcachedb PORTVERSION= 1.2.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} diff --git a/databases/memcacheq/Makefile b/databases/memcacheq/Makefile index caea80a3fd27..53c1ba189e38 100644 --- a/databases/memcacheq/Makefile +++ b/databases/memcacheq/Makefile @@ -3,7 +3,7 @@ PORTNAME= memcacheq PORTVERSION= 0.2.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} \ ${MASTER_SITE_GENTOO} diff --git a/databases/p5-BDB/Makefile b/databases/p5-BDB/Makefile index 8d1b100cca72..2160747d2bce 100644 --- a/databases/p5-BDB/Makefile +++ b/databases/p5-BDB/Makefile @@ -3,6 +3,7 @@ PORTNAME= BDB PORTVERSION= 1.90 +PORTREVISION= 1 CATEGORIES= databases perl5 MASTER_SITES= CPAN MASTER_SITE_SUBDIR= CPAN:MLEHMANN diff --git a/databases/p5-BerkeleyDB/Makefile b/databases/p5-BerkeleyDB/Makefile index 185d11e2e869..baea1be2257a 100644 --- a/databases/p5-BerkeleyDB/Makefile +++ b/databases/p5-BerkeleyDB/Makefile @@ -3,6 +3,7 @@ PORTNAME= BerkeleyDB PORTVERSION= 0.54 +PORTREVISION= 1 CATEGORIES= databases perl5 MASTER_SITES= CPAN MASTER_SITE_SUBDIR= CPAN:PMQS diff --git a/databases/py-bsddb/Makefile b/databases/py-bsddb/Makefile index 4345030045ba..a20fa907071d 100644 --- a/databases/py-bsddb/Makefile +++ b/databases/py-bsddb/Makefile @@ -3,7 +3,7 @@ PORTNAME= bsddb PORTVERSION= ${PYTHON_PORTVERSION} -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= databases python MASTER_SITES= PYTHON MASTER_SITE_SUBDIR= ftp/python/${PORTVERSION} diff --git a/databases/py-bsddb3/Makefile b/databases/py-bsddb3/Makefile index 7f216af9c634..42241069ba00 100644 --- a/databases/py-bsddb3/Makefile +++ b/databases/py-bsddb3/Makefile @@ -3,6 +3,7 @@ PORTNAME= bsddb3 PORTVERSION= 6.0.1 +PORTREVISION= 1 CATEGORIES= databases python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/databases/rdfdb/Makefile b/databases/rdfdb/Makefile index b0fc73a44fe2..bf8da50dcd1a 100644 --- a/databases/rdfdb/Makefile +++ b/databases/rdfdb/Makefile @@ -3,7 +3,7 @@ PORTNAME= rdfdb PORTVERSION= 0.46 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= databases MASTER_SITES= http://www.guha.com/ DISTNAME= rdfdb_src diff --git a/databases/ruby-bdb/Makefile b/databases/ruby-bdb/Makefile index ebe056c01850..88c4a0dd541a 100644 --- a/databases/ruby-bdb/Makefile +++ b/databases/ruby-bdb/Makefile @@ -3,7 +3,7 @@ PORTNAME= bdb PORTVERSION= 0.6.6 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= databases ruby MASTER_SITES= ftp://ftp.idaemons.org/pub/distfiles/ruby/ \ http://idaemons.org/distfiles/ruby/ \ diff --git a/deskutils/orage/Makefile b/deskutils/orage/Makefile index 1758b9f61da1..95c7b43dfd0a 100644 --- a/deskutils/orage/Makefile +++ b/deskutils/orage/Makefile @@ -3,7 +3,7 @@ PORTNAME= orage PORTVERSION= 4.10.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= deskutils xfce MASTER_SITES= ${MASTER_SITE_XFCE} MASTER_SITE_SUBDIR=src/apps/${PORTNAME}/${PORTVERSION:R} diff --git a/devel/apr1/Makefile b/devel/apr1/Makefile index fd6f6903df1f..c170cc29b621 100644 --- a/devel/apr1/Makefile +++ b/devel/apr1/Makefile @@ -3,7 +3,7 @@ PORTNAME= apr PORTVERSION= ${APR_VERSION}.${APU_VERSION} -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_APACHE} MASTER_SITE_SUBDIR= apr diff --git a/devel/ice/Makefile b/devel/ice/Makefile index cfa1ef6a4139..01190198465b 100644 --- a/devel/ice/Makefile +++ b/devel/ice/Makefile @@ -3,6 +3,7 @@ PORTNAME= Ice PORTVERSION= 3.5.1 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= http://download.zeroc.com/Ice/3.5/ diff --git a/devel/libqxt/Makefile b/devel/libqxt/Makefile index 5378a4735546..3b68957a5eda 100644 --- a/devel/libqxt/Makefile +++ b/devel/libqxt/Makefile @@ -3,6 +3,7 @@ PORTNAME= libqxt PORTVERSION= 0.6.2 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= http://dev.libqxt.org/libqxt/get/ DISTNAME= v${PORTVERSION} diff --git a/devel/subversion16/Makefile.common b/devel/subversion16/Makefile.common index f9ff1db5ba71..407980147805 100644 --- a/devel/subversion16/Makefile.common +++ b/devel/subversion16/Makefile.common @@ -3,7 +3,7 @@ PORTNAME= subversion PORTVERSION= #please edit Makefile.inc for PORTVERSION, so ../svnmerge can stay in sync. -PORTREVISION?= 6 +PORTREVISION?= 7 CATEGORIES+= devel PKGNAMESUFFIX= 16 MASTER_SITES= http://subversion.tigris.org/downloads/ diff --git a/dns/dnshistory/Makefile b/dns/dnshistory/Makefile index d63ef482e668..62268c6fba53 100644 --- a/dns/dnshistory/Makefile +++ b/dns/dnshistory/Makefile @@ -3,6 +3,7 @@ PORTNAME= dnshistory PORTVERSION= 1.3 +PORTREVISION= 1 CATEGORIES= dns MASTER_SITES= http://www.stedee.id.au/files/ diff --git a/dns/fastresolve/Makefile b/dns/fastresolve/Makefile index 6b081666ba00..74951f14b4b5 100644 --- a/dns/fastresolve/Makefile +++ b/dns/fastresolve/Makefile @@ -3,7 +3,7 @@ PORTNAME= fastresolve PORTVERSION= 2.10 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= dns MASTER_SITES= http://www.djmnet.org/sw/dist/ diff --git a/editors/nvi-devel/Makefile b/editors/nvi-devel/Makefile index d283085f7fc7..3be2c7d55dff 100644 --- a/editors/nvi-devel/Makefile +++ b/editors/nvi-devel/Makefile @@ -3,7 +3,7 @@ PORTNAME= nvi PORTVERSION= 1.81.6 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= editors MASTER_SITES= http://garage.linux.student.kuleuven.be/~skimo/nvi/devel/ \ http://www.kotnet.org/~skimo/nvi/devel/ diff --git a/editors/poedit/Makefile b/editors/poedit/Makefile index 2089156da5cd..c7b1e2c6075f 100644 --- a/editors/poedit/Makefile +++ b/editors/poedit/Makefile @@ -4,7 +4,7 @@ PORTNAME= poedit PORTVERSION= 1.4.6.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= editors MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/1.4.6/ diff --git a/graphics/fortytwo/Makefile b/graphics/fortytwo/Makefile index 07a5eb45c682..ac9e0ea14ac8 100644 --- a/graphics/fortytwo/Makefile +++ b/graphics/fortytwo/Makefile @@ -2,7 +2,7 @@ PORTNAME= fortytwo PORTVERSION= 0.2.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics gnustep MASTER_SITES= SF/${PORTNAME}/FT%20%2842%29/${PORTVERSION} DISTFILES= FT-${PORTVERSION}-src.tgz \ diff --git a/japanese/mutt-devel/Makefile b/japanese/mutt-devel/Makefile index 44fd0e025de3..cc5cd1c876dc 100644 --- a/japanese/mutt-devel/Makefile +++ b/japanese/mutt-devel/Makefile @@ -6,7 +6,7 @@ PORTNAME= mutt PORTVERSION= ${VERSION}.j${JP_VERSION} -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= japanese mail MASTER_SITES= ftp://ftp.mutt.org/mutt/devel/:body \ ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/devel/:body \ diff --git a/lang/gnu-cobol/Makefile b/lang/gnu-cobol/Makefile index c09cfe5cb9d4..3aac3257f0fe 100644 --- a/lang/gnu-cobol/Makefile +++ b/lang/gnu-cobol/Makefile @@ -3,6 +3,7 @@ PORTNAME= gnu-cobol PORTVERSION= 1.1 +PORTREVISION= 1 CATEGORIES= lang MASTER_SITES= GNU/gnucobol diff --git a/lang/php5/Makefile b/lang/php5/Makefile index 4761e71a1258..e3777a5ab13b 100644 --- a/lang/php5/Makefile +++ b/lang/php5/Makefile @@ -3,7 +3,7 @@ PORTNAME= php5 PORTVERSION= 5.4.31 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES?= lang devel www MASTER_SITES= ${MASTER_SITE_PHP} MASTER_SITE_SUBDIR= distributions diff --git a/lang/php53/Makefile b/lang/php53/Makefile index ab6d32bf6d8f..eb9a135ecc96 100644 --- a/lang/php53/Makefile +++ b/lang/php53/Makefile @@ -3,7 +3,7 @@ PORTNAME= php53 PORTVERSION= 5.3.29 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES?= lang devel www MASTER_SITES= ${MASTER_SITE_PHP} MASTER_SITE_SUBDIR= distributions diff --git a/lang/php55/Makefile b/lang/php55/Makefile index 8b7a65fa5aa6..1608096c2d63 100644 --- a/lang/php55/Makefile +++ b/lang/php55/Makefile @@ -3,7 +3,7 @@ PORTNAME= php55 PORTVERSION= 5.5.15 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES?= lang devel www MASTER_SITES= ${MASTER_SITE_PHP} MASTER_SITE_SUBDIR= distributions diff --git a/mail/avenger/Makefile b/mail/avenger/Makefile index 27c043fae492..5e8283611559 100644 --- a/mail/avenger/Makefile +++ b/mail/avenger/Makefile @@ -3,6 +3,7 @@ PORTNAME= avenger PORTVERSION= 0.8.4 +PORTREVISION= 1 CATEGORIES= mail MASTER_SITES= http://www.mailavenger.org/dist/ diff --git a/mail/bmf/Makefile b/mail/bmf/Makefile index 2aa554a51722..193f848899a6 100644 --- a/mail/bmf/Makefile +++ b/mail/bmf/Makefile @@ -3,7 +3,7 @@ PORTNAME= bmf PORTVERSION= 0.9.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= mail MASTER_SITES= SF diff --git a/mail/bogofilter/Makefile b/mail/bogofilter/Makefile index b0568d6da368..477126552a2c 100644 --- a/mail/bogofilter/Makefile +++ b/mail/bogofilter/Makefile @@ -3,7 +3,7 @@ PORTNAME= bogofilter PORTVERSION= 1.2.4 -PORTREVISION?= 3 +PORTREVISION?= 4 CATEGORIES?= mail MASTER_SITES= SF/bogofilter/bogofilter-current/bogofilter-${PORTVERSION} diff --git a/mail/cyrus-imapd23/Makefile b/mail/cyrus-imapd23/Makefile index 57eb10a528f6..fccc726521c8 100644 --- a/mail/cyrus-imapd23/Makefile +++ b/mail/cyrus-imapd23/Makefile @@ -2,7 +2,7 @@ PORTNAME= cyrus-imapd PORTVERSION= 2.3.18 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.cyrusimap.org/cyrus-imapd/ PKGNAMESUFFIX= 23 diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile index 2c990a3c6510..2f552c2ed177 100644 --- a/mail/cyrus-imapd24/Makefile +++ b/mail/cyrus-imapd24/Makefile @@ -2,7 +2,7 @@ PORTNAME= cyrus-imapd PORTVERSION= 2.4.17 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.cyrusimap.org/cyrus-imapd/ \ http://cyrusimap.org/releases/ diff --git a/mail/dk-milter/Makefile b/mail/dk-milter/Makefile index 44352402712d..dd931eaa794b 100644 --- a/mail/dk-milter/Makefile +++ b/mail/dk-milter/Makefile @@ -3,6 +3,7 @@ PORTNAME= dk-milter PORTVERSION= 1.0.2 +PORTREVISION= 1 CATEGORIES= mail MASTER_SITES= SF/${PORTNAME}/DomainKeys%20Milter/${PORTVERSION} diff --git a/mail/drac/Makefile b/mail/drac/Makefile index 48f2d88fb3fb..8555e84381b9 100644 --- a/mail/drac/Makefile +++ b/mail/drac/Makefile @@ -3,7 +3,7 @@ PORTNAME= drac PORTVERSION= 1.12 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= mail MASTER_SITES= ftp://ftp.cc.umanitoba.ca/src/ \ http://atreides.freenix.no/~anders/ \ diff --git a/mail/evolution-exchange/Makefile b/mail/evolution-exchange/Makefile index 5b84192505bb..2dc4c8c6c5d0 100644 --- a/mail/evolution-exchange/Makefile +++ b/mail/evolution-exchange/Makefile @@ -4,7 +4,7 @@ PORTNAME= evolution-exchange PORTVERSION= 2.32.1 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= mail gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/mail/greyfix/Makefile b/mail/greyfix/Makefile index e2257b4f08f0..7ef75807426d 100644 --- a/mail/greyfix/Makefile +++ b/mail/greyfix/Makefile @@ -3,6 +3,7 @@ PORTNAME= greyfix PORTVERSION= 0.4.0 +PORTREVISION= 1 CATEGORIES= mail MASTER_SITES= http://www.kim-minh.com/pub/greyfix/ \ http://stereochro.me/distfiles/ diff --git a/mail/isync/Makefile b/mail/isync/Makefile index a2bb1c3172de..b2bfc8542577 100644 --- a/mail/isync/Makefile +++ b/mail/isync/Makefile @@ -3,6 +3,7 @@ PORTNAME= isync PORTVERSION= 1.1.1 +PORTREVISION= 1 CATEGORIES= mail MASTER_SITES= SF diff --git a/mail/meta1/Makefile b/mail/meta1/Makefile index 7dc937794dac..1be7f1eeb9a4 100644 --- a/mail/meta1/Makefile +++ b/mail/meta1/Makefile @@ -2,6 +2,7 @@ PORTNAME= meta1 PORTVERSION= 1.0.0b.0.0 +PORTREVISION= 1 DISTVERSION= 1.0.Beta0.0 CATEGORIES= mail ipv6 MASTER_SITES= http://www.MeTA1.org/download/.beta/proto/ diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile index cd799ba385a4..e0b483e5a5a7 100644 --- a/mail/mutt/Makefile +++ b/mail/mutt/Makefile @@ -3,7 +3,7 @@ PORTNAME= mutt PORTVERSION= 1.5.23 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES+= mail ipv6 MASTER_SITES= ftp://ftp.mutt.org/mutt/ \ ftp://ftp.mutt.org/mutt/devel/ \ diff --git a/mail/opendkim/Makefile b/mail/opendkim/Makefile index 5b5a51b79c7f..03352f482293 100644 --- a/mail/opendkim/Makefile +++ b/mail/opendkim/Makefile @@ -3,7 +3,7 @@ PORTNAME= opendkim PORTVERSION= 2.9.2 -PORTREVISION= 3 +1P1O1R1T1R1E1V1I1S1I1O1N1=1 1 131 CATEGORIES= mail security MASTER_SITES= SF MASTER_SITE_SUBDIR= ${PORTNAME} \ diff --git a/mail/perdition/Makefile b/mail/perdition/Makefile index 99495ee4789d..9536ea4b7f3f 100644 --- a/mail/perdition/Makefile +++ b/mail/perdition/Makefile @@ -3,7 +3,7 @@ PORTNAME= perdition PORTVERSION= 1.18 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= mail net security MASTER_SITES= http://horms.net/projects/perdition/download/${PORTVERSION}/ diff --git a/mail/popular/Makefile b/mail/popular/Makefile index f5731737fcbc..5e7567b64920 100644 --- a/mail/popular/Makefile +++ b/mail/popular/Makefile @@ -3,7 +3,7 @@ PORTNAME= popular PORTVERSION= 1.5.5 -PORTREVISION= 4 +PORTREVISION= 6 CATEGORIES= mail MASTER_SITES= http://www.remote.org/jochen/mail/popular/download/ @@ -25,19 +25,6 @@ LIBS+= -L${LOCALBASE}/lib USE_RC_SUBR= pcheckd pproxy pserv 0ringd -OPTIONS_DEFINE= DB4 -OPTIONS_DEFAULT= DB4 -OPTIONS_SUB= yes - -DB4_DESC= Build db4 pdm module -DB4_LIB_DEPENDS= libdb4.so:${PORTSDIR}/databases/db4 - -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MDB4} -PDM_MODULES+= db4 -.endif - post-install: @${MKDIR} ${STAGEDIR}${ETCDIR} ${INSTALL_DATA} ${WRKSRC}/conf/pproxy.rc ${STAGEDIR}${ETCDIR}/pproxy.rc.sample diff --git a/mail/popular/pkg-plist b/mail/popular/pkg-plist index 152637add057..f046d8795209 100644 --- a/mail/popular/pkg-plist +++ b/mail/popular/pkg-plist @@ -29,9 +29,9 @@ lib/popular/libpdm_any.so lib/popular/libpdm_master-1.5.5.so lib/popular/libpdm_master.a lib/popular/libpdm_master.so -%%DB4%%lib/popular/libpdm_db4-1.5.5.so -%%DB4%%lib/popular/libpdm_db4.a -%%DB4%%lib/popular/libpdm_db4.so +@comment %%DB4%%lib/popular/libpdm_db4-1.5.5.so +@comment %%DB4%%lib/popular/libpdm_db4.a +@comment %%DB4%%lib/popular/libpdm_db4.so man/man1/pcheck.1.gz man/man1/pcontrol.1.gz man/man1/pdeliver.1.gz diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile index 887fb1777743..32a59e9f38a6 100644 --- a/mail/postfix-current/Makefile +++ b/mail/postfix-current/Makefile @@ -3,7 +3,7 @@ PORTNAME= postfix DISTVERSION= 2.12-20140709 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 4 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/ \ diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile index f0d3aef8db96..48f5d4093a06 100644 --- a/mail/postfix/Makefile +++ b/mail/postfix/Makefile @@ -3,7 +3,7 @@ PORTNAME= postfix PORTVERSION= 2.11.1 -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 1 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \ diff --git a/mail/postfix210/Makefile b/mail/postfix210/Makefile index 97d089db0f70..ccdf3acdcd5b 100644 --- a/mail/postfix210/Makefile +++ b/mail/postfix210/Makefile @@ -3,7 +3,7 @@ PORTNAME= postfix PORTVERSION= 2.10.3 -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 1 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \ diff --git a/mail/postfix28/Makefile b/mail/postfix28/Makefile index b7b933758810..5b9b70902739 100644 --- a/mail/postfix28/Makefile +++ b/mail/postfix28/Makefile @@ -3,7 +3,7 @@ PORTNAME= postfix PORTVERSION= 2.8.17 -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 1 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \ diff --git a/mail/postfix29/Makefile b/mail/postfix29/Makefile index cc483c0d92f2..7f8a9caf41f4 100644 --- a/mail/postfix29/Makefile +++ b/mail/postfix29/Makefile @@ -3,7 +3,7 @@ PORTNAME= postfix PORTVERSION= 2.9.9 -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 1 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \ diff --git a/mail/spamprobe/Makefile b/mail/spamprobe/Makefile index 056fd6a52360..9297123596e7 100644 --- a/mail/spamprobe/Makefile +++ b/mail/spamprobe/Makefile @@ -3,7 +3,7 @@ PORTNAME= spamprobe PORTVERSION= 1.4d -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= mail MASTER_SITES= SF diff --git a/mail/spmfilter/Makefile b/mail/spmfilter/Makefile index 64eef91c451a..4e19dc39de07 100644 --- a/mail/spmfilter/Makefile +++ b/mail/spmfilter/Makefile @@ -2,7 +2,7 @@ PORTNAME= spmfilter PORTVERSION= 0.6.7 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= mail MASTER_SITES= http://www.${PORTNAME}.org/files/ diff --git a/mail/vacation/Makefile b/mail/vacation/Makefile index e7cf29473913..463356fdd9b3 100644 --- a/mail/vacation/Makefile +++ b/mail/vacation/Makefile @@ -3,7 +3,7 @@ PORTNAME= vacation PORTVERSION= 3.3.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail MASTER_SITES= ${MASTER_SITE_DEBIAN} MASTER_SITE_SUBDIR= pool/main/v/vacation/ diff --git a/misc/hotkeys/Makefile b/misc/hotkeys/Makefile index 98708b6600aa..5bece0ce46bb 100644 --- a/misc/hotkeys/Makefile +++ b/misc/hotkeys/Makefile @@ -3,7 +3,7 @@ PORTNAME= hotkeys PORTVERSION= 0.5.7.1 -PORTREVISION= 15 +PORTREVISION= 16 CATEGORIES= misc MASTER_SITES= http://ypwong.org/hotkeys/${PORTVERSION}/ DISTNAME= hotkeys_${PORTVERSION} diff --git a/misc/libhome/Makefile b/misc/libhome/Makefile index 9d9b889c7225..2c294f405ac6 100644 --- a/misc/libhome/Makefile +++ b/misc/libhome/Makefile @@ -3,7 +3,7 @@ PORTNAME= libhome PORTVERSION= 0.10.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= misc MASTER_SITES= ftp://ftp.oav.net/pll/ SF/pll/${PORTNAME}/${PORTVERSION} diff --git a/net-p2p/bitcoin/Makefile b/net-p2p/bitcoin/Makefile index becb9f34cdac..bf9f4ffb5b86 100644 --- a/net-p2p/bitcoin/Makefile +++ b/net-p2p/bitcoin/Makefile @@ -3,6 +3,7 @@ PORTNAME= bitcoin PORTVERSION= 0.9.2 +PORTREVISION= 1 CATEGORIES= net-p2p finance MASTER_SITES= http://vps.robbak.com/distfiles/ \ ${MASTER_SITE_LOCAL} \ diff --git a/net-p2p/cdonkey/Makefile b/net-p2p/cdonkey/Makefile index 8eb45cb0a288..bbedf12b2b4a 100644 --- a/net-p2p/cdonkey/Makefile +++ b/net-p2p/cdonkey/Makefile @@ -3,7 +3,7 @@ PORTNAME= cdonkey PORTVERSION= 0.9.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net-p2p MASTER_SITES= http://www.sourcefiles.org/Internet/File_Sharing/Edonkey/ DISTNAME= cDonkey-${PORTVERSION} diff --git a/net-p2p/digitalcoin/Makefile b/net-p2p/digitalcoin/Makefile index 7e369ae6e09d..eb4617d0cc35 100644 --- a/net-p2p/digitalcoin/Makefile +++ b/net-p2p/digitalcoin/Makefile @@ -3,7 +3,7 @@ PORTNAME= digitalcoin PORTVERSION= 1.0.0.0b -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-p2p MAINTAINER= myst3r10n@rocketmail.com diff --git a/net-p2p/dogecoin/Makefile b/net-p2p/dogecoin/Makefile index 6371730c4125..44da24c40bd3 100644 --- a/net-p2p/dogecoin/Makefile +++ b/net-p2p/dogecoin/Makefile @@ -3,7 +3,7 @@ PORTNAME= dogecoin PORTVERSION= 1.5.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net-p2p finance MAINTAINER= swills@FreeBSD.org diff --git a/net-p2p/jigdo/Makefile b/net-p2p/jigdo/Makefile index c2f3ccbd413e..20c96cf71346 100644 --- a/net-p2p/jigdo/Makefile +++ b/net-p2p/jigdo/Makefile @@ -3,7 +3,7 @@ PORTNAME= jigdo PORTVERSION= 0.7.3 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= net-p2p MASTER_SITES= http://atterer.org/sites/atterer/files/2009-08/${PORTNAME}/ @@ -15,7 +15,6 @@ RUN_DEPENDS= ${LOCALBASE}/bin/wget:${PORTSDIR}/ftp/wget USES= gmake tar:bzip2 USE_SUBMAKE= yes GNU_CONFIGURE= yes -WITH_BDB_VER?= 43 CPPFLAGS+= -I${LOCALBASE}/include @@ -35,7 +34,7 @@ BDB_CONFIGURE_ON= --with-libdb=-l${BDB_LIB_CXX_NAME} BDB_CONFIGURE_OFF= --without-libdb BDB_CPPFLAGS= -I${BDB_INCLUDE_DIR} BDB_LIBS= -L${BDB_LIB_DIR} -BDB_USE= BDB=${WITH_BDB_VER} +BDB_USE= BDB=48+ NLS_CONFIGURE_ENABLE= nls NLS_USES= gettext diff --git a/net-p2p/litecoin/Makefile b/net-p2p/litecoin/Makefile index 5d43c6459059..98ae27da95ad 100644 --- a/net-p2p/litecoin/Makefile +++ b/net-p2p/litecoin/Makefile @@ -3,6 +3,7 @@ PORTNAME= litecoin PORTVERSION= 0.8.6.2 +PORTREVISION= 1 CATEGORIES= net-p2p finance MASTER_SITES= LOCAL/swills \ GH diff --git a/net-p2p/namecoin/Makefile b/net-p2p/namecoin/Makefile index d990ce8f20cf..6f25ca30ebcd 100644 --- a/net-p2p/namecoin/Makefile +++ b/net-p2p/namecoin/Makefile @@ -3,6 +3,7 @@ PORTNAME= namecoin PORTVERSION= Q.3.72 +PORTREVISION= 1 CATEGORIES= net-p2p dns MASTER_SITES= GH diff --git a/net-p2p/solidcoin/Makefile b/net-p2p/solidcoin/Makefile index 71ef78548929..1f7cac8bb4d8 100644 --- a/net-p2p/solidcoin/Makefile +++ b/net-p2p/solidcoin/Makefile @@ -3,7 +3,7 @@ PORTNAME= solidcoin PORTVERSION= 2.041 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= net-p2p finance MASTER_SITES= http://downloads.solidcoin.info/ \ http://dl.dropbox.com/u/47582909/ diff --git a/net-p2p/twister/Makefile b/net-p2p/twister/Makefile index 6dfc5bedde26..503245dffed8 100644 --- a/net-p2p/twister/Makefile +++ b/net-p2p/twister/Makefile @@ -3,6 +3,7 @@ PORTNAME= twister-core PORTVERSION= 0.140815 +PORTREVISION= 1 CATEGORIES= net-p2p MAINTAINER= thierry@FreeBSD.org diff --git a/net/freeswitch-core-devel/Makefile b/net/freeswitch-core-devel/Makefile index fb84047c9473..19a7c1ff414f 100644 --- a/net/freeswitch-core-devel/Makefile +++ b/net/freeswitch-core-devel/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= freeswitch -PORTREVISION= 2 +PORTREVISION= 3 DISTVERSION= 1.2.3 CATEGORIES= net MASTER_SITES= http://files.freeswitch.org/ \ diff --git a/net/netatalk/Makefile b/net/netatalk/Makefile index 430c9a860cfa..baf85818dddd 100644 --- a/net/netatalk/Makefile +++ b/net/netatalk/Makefile @@ -3,7 +3,7 @@ PORTNAME= netatalk PORTVERSION= 2.2.5 -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 1 CATEGORIES= net print MASTER_SITES= SF diff --git a/net/netatalk3/Makefile b/net/netatalk3/Makefile index 14b07939f93a..6adb61baa49b 100644 --- a/net/netatalk3/Makefile +++ b/net/netatalk3/Makefile @@ -3,7 +3,7 @@ PORTNAME= netatalk PORTVERSION= 3.1.3 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= net MASTER_SITES= SF diff --git a/net/openldap24-server/Makefile b/net/openldap24-server/Makefile index 13499cabc4fa..b5214523c8d7 100644 --- a/net/openldap24-server/Makefile +++ b/net/openldap24-server/Makefile @@ -3,7 +3,7 @@ PORTNAME= openldap DISTVERSION= 2.4.39 -PORTREVISION= ${OPENLDAP_PORTREVISION} +1P1O1R1T1R1E1V1I1S1I1O1N1=1 1 1$1{1O1P1E1N1L1D1A1P1_1P1O1R1T1R1E1V1I1S1I1O1N1}1 CATEGORIES= net databases MASTER_SITES= ftp://ftp.OpenLDAP.org/pub/OpenLDAP/%SUBDIR%/ \ ftp://gd.tuwien.ac.at/infosys/network/OpenLDAP/%SUBDIR%/ \ @@ -351,26 +351,12 @@ PLIST_SUB+= BACK_BDB="@comment " \ BACK_HDB="@comment " .else -WITH_BDB_VER?= 46 -USE_BDB= 44+ +USE_BDB= 48+ -# XXX Can BDB 5.x use XY instead of X as version? -.if ${WITH_BDB_VER} >= 43 || ${WITH_BDB_VER} == 5 || ${WITH_BDB_VER} == 6 CONFIGURE_ARGS+= --enable-bdb=${BACKEND_ENABLE} \ --enable-hdb=${BACKEND_ENABLE} PLIST_SUB+= BACK_BDB=${BACKEND_PLIST} \ BACK_HDB=${BACKEND_PLIST} -.elif ${WITH_BDB_VER} >= 4 -CONFIGURE_ARGS+= --disable-bdb \ - --enable-hdb=${BACKEND_ENABLE} -PLIST_SUB+= BACK_BDB="@comment " \ - BACK_HDB=${BACKEND_PLIST} -.elif ${WITH_BDB_VER} == 3 -CONFIGURE_ARGS+= --disable-bdb \ - --disable-hdb -PLIST_SUB+= BACK_BDB="@comment " \ - BACK_HDB="@comment " -.endif CPPFLAGS+= -I${BDB_INCLUDE_DIR} LDFLAGS+= -L${BDB_LIB_DIR} diff --git a/news/inn/Makefile b/news/inn/Makefile index 0c42a577cae8..9d3261bd93d0 100644 --- a/news/inn/Makefile +++ b/news/inn/Makefile @@ -3,7 +3,7 @@ PORTNAME?= inn PORTVERSION?= 2.5.3 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= news ipv6 # Master distribution broken MASTER_SITES?= ${MASTER_SITE_ISC} diff --git a/print/panda/Makefile b/print/panda/Makefile index 875ed8f32343..b544f1eb4c57 100644 --- a/print/panda/Makefile +++ b/print/panda/Makefile @@ -3,7 +3,7 @@ PORTNAME= panda PORTVERSION= 0.5.4 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= print MASTER_SITES= SF \ SAVANNAH \ diff --git a/science/gramps/Makefile b/science/gramps/Makefile index 6ed91bb6894c..34ac26b312c8 100644 --- a/science/gramps/Makefile +++ b/science/gramps/Makefile @@ -3,6 +3,7 @@ PORTNAME= gramps PORTVERSION= 3.4.8 +PORTREVISION= 1 CATEGORIES= science gnome python MASTER_SITES= SF/${PORTNAME}/Stable/${PORTVERSION} diff --git a/security/heimdal/Makefile b/security/heimdal/Makefile index 609858b89623..d7b5672c2629 100644 --- a/security/heimdal/Makefile +++ b/security/heimdal/Makefile @@ -3,7 +3,7 @@ PORTNAME= heimdal PORTVERSION= 1.5.2 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= security ipv6 MASTER_SITES= http://www.h5l.org/dist/src/ \ http://ftp.pdc.kth.se/pub/heimdal/src/ \ diff --git a/security/pam_abl/Makefile b/security/pam_abl/Makefile index 197d9b10e78c..adc391bd9084 100644 --- a/security/pam_abl/Makefile +++ b/security/pam_abl/Makefile @@ -3,6 +3,7 @@ PORTNAME= pam_abl PORTVERSION= 0.2.3 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= SF/pam-abl/pam-abl/${PORTVERSION} diff --git a/security/pks/Makefile b/security/pks/Makefile index 1feb28707c96..6e712e1c3a2f 100644 --- a/security/pks/Makefile +++ b/security/pks/Makefile @@ -3,6 +3,7 @@ PORTNAME= pks PORTVERSION= 0.9.6.20040312 +1P1O1R1T1R1E1V1I1S1I1O1N1=1 1 121 CATEGORIES= security www MASTER_SITES= http://pks.sourceforge.net/:sf ${MASTER_SITE_LOCAL}:local MASTER_SITE_SUBDIR= .:sf mandree:local @@ -11,17 +12,16 @@ DISTFILES= pks-current.tgz:sf,local MAINTAINER= tphilipp@potion-studios.com COMMENT= PGP Public Key Server -LICENSE= BSD4CLAUSE +LICENSE= BSD4CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE WRKSRC= ${WRKDIR}/${PORTNAME} USE_GCC= any -USE_BDB= yes -WANT_BDB_VER= 41 # pks dumps core with 42 and doesn't build with 43+ +USE_BDB= 48+ -OPTIONS_DEFINE= DOCS -PORTDOCS= pks_help.* README EMAIL +OPTIONS_DEFINE= DOCS +PORTDOCS= pks_help.* README EMAIL GNU_CONFIGURE= yes USE_AUTOTOOLS= autoconf CONFIGURE_ARGS= --datadir=${PREFIX}/share/pks --localstatedir=/var/pks \ @@ -31,10 +31,11 @@ MAKE_ENV+= SUBDIRS= LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ENV= DBLIB="-L${BDB_LIB_DIR} -l${BDB_LIB_NAME}" DBINC=-I${BDB_INCLUDE_DIR} DBHDR=db.h - SUB_FILES= pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message +PLIST_SUB+= RESETPREFIX=${PREFIX} + USE_RC_SUBR= pksd .include <bsd.port.options.mk> diff --git a/security/pks/files/patch-configure.in b/security/pks/files/patch-configure.in index 466af4727cc4..39a93721326d 100644 --- a/security/pks/files/patch-configure.in +++ b/security/pks/files/patch-configure.in @@ -1,5 +1,5 @@ ---- ./configure.in.orig 2011-03-21 20:49:39.000000000 +0100 -+++ ./configure.in 2011-03-21 20:50:42.000000000 +0100 +--- ./configure.in.orig 2004-01-18 00:19:56.000000000 +0100 ++++ ./configure.in 2014-08-15 18:32:37.000000000 +0200 @@ -74,126 +74,6 @@ # Checks for libraries. dnl Checks for Berkeley DB diff --git a/security/pks/files/patch-kd_generic.c b/security/pks/files/patch-kd_generic.c new file mode 100644 index 000000000000..fe385b4af2c9 --- /dev/null +++ b/security/pks/files/patch-kd_generic.c @@ -0,0 +1,26 @@ +--- ./kd_generic.c.orig 2003-08-04 21:57:27.000000000 +0200 ++++ ./kd_generic.c 2014-08-15 18:41:14.000000000 +0200 +@@ -325,13 +325,13 @@ + /* create/open/close/sync */ + + static int +-kd_worddata_compare (DB * db, const DBT * a, const DBT * b) ++kd_worddata_compare (DB * db, const DBT * a, const DBT * b, size_t *locp) + { + return (memcmp (b->data, a->data, 12)); + } + + static void +-kd_errcall (const char *db_errpfx, char *buffer) ++kd_errcall (const DB_ENV *dbenv, const char *db_errpfx, const char *buffer) + { + log_error (db_errpfx ? db_errpfx : "db_errcall", buffer); + } +@@ -396,7 +396,6 @@ + if (oflags & KD_OPEN_RECOVER) + { + appflags |= DB_INIT_LOG | DB_RECOVER | DB_CREATE; +- dbenv->set_verbose (dbenv, DB_VERB_CHKPOINT, 1); + dbenv->set_verbose (dbenv, DB_VERB_WAITSFOR, 1); + dbenv->set_verbose (dbenv, DB_VERB_DEADLOCK, 1); + dbenv->set_verbose (dbenv, DB_VERB_RECOVERY, 1); diff --git a/security/pks/files/patch-kd_search.c b/security/pks/files/patch-kd_search.c new file mode 100644 index 000000000000..e5e70ad79352 --- /dev/null +++ b/security/pks/files/patch-kd_search.c @@ -0,0 +1,13 @@ +--- ./kd_search.c.orig 2003-08-04 21:57:34.000000000 +0200 ++++ ./kd_search.c 2014-08-15 18:37:29.000000000 +0200 +@@ -1058,8 +1058,8 @@ + if (we->len > sizeof (word)) + { + s->err->fatal = 0; +- sprintf (s->err->buf, "search word is greater than %d characters", +- sizeof (word)); ++ sprintf (s->err->buf, "search word is greater than %lu characters", ++ (unsigned long)sizeof (word)); + return (0); + } + diff --git a/security/pks/files/patch-mkpksdconf.in b/security/pks/files/patch-mkpksdconf.in index b48a3d74e9e5..bab902712ba5 100644 --- a/security/pks/files/patch-mkpksdconf.in +++ b/security/pks/files/patch-mkpksdconf.in @@ -1,5 +1,5 @@ ---- ./mkpksdconf.in.orig 2014-01-22 15:36:39.574285045 -0500 -+++ ./mkpksdconf.in 2014-01-22 15:37:49.289280305 -0500 +--- ./mkpksdconf.in.orig 2003-02-28 18:27:20.000000000 +0100 ++++ ./mkpksdconf.in 2014-08-15 18:32:37.000000000 +0200 @@ -44,7 +44,7 @@ cat << EOF diff --git a/security/pks/pkg-descr b/security/pks/pkg-descr index c5fc42c8e2d6..688a67eb4482 100644 --- a/security/pks/pkg-descr +++ b/security/pks/pkg-descr @@ -1,4 +1,4 @@ This program implements a standard PGP Key Server, which can be assumed to be in addition to the public key server at MIT. -WWW: http://www.mit.edu/people/marc/pks/ +WWW: http://www.mit.edu/people/marc/pks/ diff --git a/security/pks/pkg-plist b/security/pks/pkg-plist index 699bccfbf3b7..50f21383b4e2 100644 --- a/security/pks/pkg-plist +++ b/security/pks/pkg-plist @@ -17,7 +17,9 @@ man/man8/pks-queue-run.sh.8.gz man/man8/pksclient.8.gz man/man8/pksd.8.gz man/man8/pksdctl.8.gz -/var/pks/index.html +@cwd / +var/pks/index.html +@cwd %%RESETPREFIX%% @unexec rmdir "/var/pks/db" >/dev/null 2>&1 || : @unexec rmdir "/var/pks/incoming" >/dev/null 2>&1 || : @unexec rmdir "/var/pks" >/dev/null 2>&1 || : diff --git a/security/sks/Makefile b/security/sks/Makefile index fc800efb5a3b..dcc311678eae 100644 --- a/security/sks/Makefile +++ b/security/sks/Makefile @@ -2,6 +2,7 @@ PORTNAME= sks PORTVERSION= 1.1.5 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= http://cdn.bitbucket.org/skskeyserver/sks-keyserver/downloads/ diff --git a/sysutils/apt/Makefile b/sysutils/apt/Makefile index 09b51eb0dd33..ab5ed2d49d37 100644 --- a/sysutils/apt/Makefile +++ b/sysutils/apt/Makefile @@ -3,7 +3,7 @@ PORTNAME= apt PORTVERSION= 0.6.46.4.1 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_DEBIAN_POOL} DISTNAME= apt_0.6.46.4-0.1 diff --git a/sysutils/cfengine22/Makefile b/sysutils/cfengine22/Makefile index 8dfabf546a13..1264348796e8 100644 --- a/sysutils/cfengine22/Makefile +++ b/sysutils/cfengine22/Makefile @@ -3,7 +3,7 @@ PORTNAME= cfengine PORTVERSION= 2.2.10 -PORTREVISION= 1 +PORTREVISION= 3 CATEGORIES= sysutils MASTER_SITES= https://s3.amazonaws.com/cfengine.package-repos/tarballs/ PKGNAMESUFFIX= 22 @@ -21,8 +21,7 @@ USE_RC_SUBR= cfexecd cfservd USES= libtool makeinfo shebangfix SHEBANG_FILES= contrib/cfdoc -WITH_BDB_VER?= 46 -USE_BDB= yes +USE_BDB= 48+ USE_OPENSSL= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-docs \ diff --git a/sysutils/cfengine22/pkg-plist b/sysutils/cfengine22/pkg-plist index 62b4212821d5..f0950605615c 100644 --- a/sysutils/cfengine22/pkg-plist +++ b/sysutils/cfengine22/pkg-plist @@ -52,6 +52,5 @@ man/man8/cfshow.8.gz %%PORTDOCS%%%%DOCSDIR%%/TODO %%PORTDOCS%%%%DOCSDIR%%/INSTALL %%PORTDOCS%%%%DOCSDIR%%/NEWS -%%PORTDOCS%%@dirrm %%DOCSDIR%%/html %%PORTDOCS%%@dirrm %%DOCSDIR%% %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%% diff --git a/sysutils/cfengine32/Makefile b/sysutils/cfengine32/Makefile index dee2ed413f9c..6a7ad85efc61 100644 --- a/sysutils/cfengine32/Makefile +++ b/sysutils/cfengine32/Makefile @@ -3,7 +3,7 @@ PORTNAME= cfengine PORTVERSION= 3.2.3 -PORTREVISION= 4 +PORTREVISION= 5 PORTEPOCH= 1 CATEGORIES= sysutils MASTER_SITES= https://s3.amazonaws.com/cfengine.package-repos/tarballs/ @@ -14,7 +14,7 @@ MAINTAINER= cy@FreeBSD.org COMMENT= Systems administration tool for networks LATEST_LINK= cfengine32 -FETCH_BEFORE_ARGS= -o ${DISTDIR}/${DISTFILES} +FETCH_BEFORE_ARGS= -o ${DISTDIR}/${DISTFILES} CONFLICTS= cfengine-[2]* cfengine-3.[345]* cfengine-devel-* @@ -23,8 +23,7 @@ USE_RC_SUBR= cf-execd cf-serverd LIB_DEPENDS= libpcre.so:${PORTSDIR}/devel/pcre USES= libtool -WITH_BDB_VER?= 47 -USE_BDB= yes +USE_BDB= 48+ USE_OPENSSL= yes GNU_CONFIGURE= yes # EXAMPLESDIR= ${PREFIX}/share/examples/cfengine3 diff --git a/sysutils/cfengine32/files/patch-configure b/sysutils/cfengine32/files/patch-configure new file mode 100644 index 000000000000..4ab465da6951 --- /dev/null +++ b/sysutils/cfengine32/files/patch-configure @@ -0,0 +1,47 @@ +--- ./configure.orig 2011-10-25 17:29:46.000000000 +0200 ++++ ./configure 2014-08-15 17:35:24.000000000 +0200 +@@ -14035,16 +14035,8 @@ + as_fn_error $? "This release of cfengine requires a version of BerkeleyDB 4.4 or later" "$LINENO" 5 + else + if test "x$BERKELEYDB_DIR" = "xdefault" ; then +- for v in BerkeleyDB.4.2 BerkeleyDB.4.3 BerkeleyDB.4.4 BerkeleyDB.4.5 BerkeleyDB.4.6 BerkeleyDB.4.7 BerkeleyDB.4.8; do +- for d in $prefix /opt /usr/local /usr/pkg /usr; do +- test -d "$d/$v" && BERKELEYDB_DIR="$d/$v" +- done +- done +- fi +- +- if test "x$BERKELEYDB_DIR" = "xdefault" ; then + for d in $prefix /opt /usr/local /usr; do +- for v in db-4 db4 db3 db db40 db41 db42 db43 db44 db45 db46 db47 db48 db50 db51; do ++ for v in db48 db5 db6; do + + if test -f "$d/include/$v/db.h" ; then + echo "Found header in $d/include/$v " +@@ -14083,7 +14075,7 @@ + return 0; + } + _ACEOF +-for ac_lib in '' db-4 db4 db-4.8 db-4.7 db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0; do ++for ac_lib in '' db-6 db-5 db-4.8 ; do + if test -z "$ac_lib"; then + ac_res="none required" + else +@@ -14167,7 +14159,7 @@ + elif test -d "$BERKELEYDB_DIR"; then + + BERKELEYDB_CFLAGS="-I$BERKELEYDB_DIR/include" +- for v in . db48 db47 db46 db45 db44 db43 db42 db41 db40 db4 db33 db32 db3 db; do ++ for v in . db6 db5 db48 ; do + if test -f "$BERKELEYDB_DIR/include/$v/db.h"; then + BERKELEYDB_INCLUDEDIR="$BERKELEYDB_DIR/include/$v" + BERKELEYDB_CFLAGS="-I$BERKELEYDB_INCLUDEDIR" +@@ -14177,7 +14169,7 @@ + + if test -f "$BERKELEYDB_INCLUDEDIR/db.h"; then + BERKELEYDB_LIBS="-ldb" +- for v in db-4.8 db48 db-4.7 db4.7 db47 db-4.6 db4.6 db46 db-4.5 db4.5 db45 db-4.4 db4.4 db44; do ++ for v in db-6 db-5 db-4.8 ; do + if test -f "$BERKELEYDB_DIR/lib/lib$v.so"; then + BERKELEYDB_LIBS="-l$v" + break diff --git a/textproc/p5-RDFStore/Makefile b/textproc/p5-RDFStore/Makefile index c342373fcda1..93a9cf3c62db 100644 --- a/textproc/p5-RDFStore/Makefile +++ b/textproc/p5-RDFStore/Makefile @@ -3,7 +3,7 @@ PORTNAME= RDFStore PORTVERSION= 0.51 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc perl5 MASTER_SITES= CPAN MASTER_SITE_SUBDIR= CPAN:AREGGIORI diff --git a/textproc/rast/Makefile b/textproc/rast/Makefile index 7033281b02f7..7ac85327d0dc 100644 --- a/textproc/rast/Makefile +++ b/textproc/rast/Makefile @@ -2,7 +2,7 @@ PORTNAME= rast PORTVERSION= 0.3.1 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= textproc MASTER_SITES= http://projects.netlab.jp/rast/archives/ \ http://dist.bsdlab.org/ diff --git a/textproc/redland/Makefile b/textproc/redland/Makefile index b0b1f3892ff3..09cdf3c1d02b 100644 --- a/textproc/redland/Makefile +++ b/textproc/redland/Makefile @@ -3,7 +3,7 @@ PORTNAME= redland PORTVERSION= 1.0.17 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= textproc MASTER_SITES= http://download.librdf.org/source/ diff --git a/www/c-icap/Makefile b/www/c-icap/Makefile index 2de4a3806e5d..f1a33bbba24c 100644 --- a/www/c-icap/Makefile +++ b/www/c-icap/Makefile @@ -3,7 +3,7 @@ PORTNAME= c-icap PORTVERSION= 0.3.3 -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 2 CATEGORIES= www MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/0.3.x/ diff --git a/www/crawl/Makefile b/www/crawl/Makefile index ebd91fc86269..15362be32572 100644 --- a/www/crawl/Makefile +++ b/www/crawl/Makefile @@ -3,7 +3,7 @@ PORTNAME= crawl PORTVERSION= 0.4 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= www MASTER_SITES= http://www.monkey.org/~provos/ diff --git a/www/oops/Makefile b/www/oops/Makefile index cf6561267d3e..a851952ddd35 100644 --- a/www/oops/Makefile +++ b/www/oops/Makefile @@ -59,27 +59,27 @@ PGSQL_DESC= PostgreSQL auth support .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MGIGABASE} -LIB_DEPENDS+= libgigabase_r.so:${PORTSDIR}/databases/gigabase +LIB_DEPENDS+= libgigabase_r.so:${PORTSDIR}/databases/gigabase CONFIGURE_ARGS+= --without-DB .endif .if ${PORT_OPTIONS:MDB4} -LIB_DEPENDS+= libdb4.so:${PORTSDIR}/databases/db4 +USE_BDB= db48+ CONFIGURE_ARGS+= --without-GB .endif .if ${PORT_OPTIONS:MMYSQL} -USE_MYSQL= YES +USE_MYSQL= YES CONFIGURE_ARGS+= --with-MYSQL=${PREFIX} .endif .if ${PORT_OPTIONS:MPGSQL} -USE_PGSQL= YES +USE_PGSQL= YES CONFIGURE_ARGS+= --with-PGSQL=${PREFIX}/pgsql .endif .if ${PORT_OPTIONS:MPCRE} -LIB_DEPENDS+= libpcre.so:${PORTSDIR}/devel/pcre +LIB_DEPENDS+= libpcre.so:${PORTSDIR}/devel/pcre CONFIGURE_ARGS+= --with-regexp=pcre .endif diff --git a/www/squidguard/Makefile b/www/squidguard/Makefile index 93886007f093..ecae3a5f2273 100644 --- a/www/squidguard/Makefile +++ b/www/squidguard/Makefile @@ -2,7 +2,7 @@ PORTNAME= squidGuard PORTVERSION= 1.4 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= www MASTER_SITES= http://www.squidguard.org/Downloads/:a \ http://www.squidguard.org/Downloads/Contrib/:b diff --git a/www/webalizer/Makefile b/www/webalizer/Makefile index 6b8d1c8ad04b..c3681afa0d75 100644 --- a/www/webalizer/Makefile +++ b/www/webalizer/Makefile @@ -2,7 +2,7 @@ PORTNAME= webalizer PORTVERSION= 2.23.8 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES+= www MASTER_SITES= ftp://ftp.mrunix.net/pub/webalizer/:main \ MASTER_SITES= ftp://ftp.mrunix.net/pub/webalizer/geodb/:geodb \ |