Date: Thu, 21 Aug 2014 22:50:30 +0000 (UTC) From: Matthias Andree <mandree@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r365599 - in head: . Mk archivers/rpm4 archivers/rpm5 chinese/libpinyin chinese/libtabe chinese/mutt chinese/p5-Lingua-ZH-TaBE chinese/xsim comms/trustedqsl comms/xastir databases datab... Message-ID: <201408212250.s7LMoUlY037422@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mandree Date: Thu Aug 21 22:50:29 2014 New Revision: 365599 URL: http://svnweb.freebsd.org/changeset/ports/365599 QAT: https://qat.redports.org/buildarchive/r365599/ Log: Berkeley DB cleanup, remove versions 4.0 ... 4.7. - Mk/bsd.database.mk rewrite, new default to db5. - db6 is eligible by default only if installed on the system. - Bump PORTREVISION of all ports that directly depend on BerkeleyDB or where USE_BDB is found in the port's directory - Patch a few ports such that they will pick up or work with newer versions. - Add UPDATING entry - Drive-by format fix for pks - Drop BerkeleyDB option from mail/popular for now, requires more work. - Exp-run logs linked from the PR below. - Ports that do not build (IGNORE, BROKEN, etc.) have pro-forma changes for new Berkeley DB, but are untested. NOTE: please read UPDATING and the Wiki page before proceeding! Announcement: http://lists.freebsd.org/pipermail/freebsd-ports-announce/2014-August/000090.html Wiki reference: https://wiki.freebsd.org/Ports/BerkeleyDBCleanup PR: 192690 Approved by: portmgr (implicit, PORTREVISION bump on unstaged ports) Added: head/security/pks/files/patch-kd_generic.c (contents, props changed) head/security/pks/files/patch-kd_search.c (contents, props changed) head/sysutils/cfengine32/files/patch-configure (contents, props changed) Deleted: head/databases/db4/ head/databases/db41/ head/databases/db41-nocrypto/Makefile head/databases/db41-nocrypto/distinfo head/databases/db42/ head/databases/db42-nocrypto/Makefile head/databases/db42-nocrypto/distinfo head/databases/db43/ head/databases/db44/ head/databases/db46/ head/databases/db47/ Modified: head/MOVED head/Mk/bsd.database.mk head/UPDATING head/archivers/rpm4/Makefile head/archivers/rpm5/Makefile head/chinese/libpinyin/Makefile head/chinese/libtabe/Makefile head/chinese/mutt/Makefile head/chinese/p5-Lingua-ZH-TaBE/Makefile head/chinese/xsim/Makefile head/comms/trustedqsl/Makefile head/comms/xastir/Makefile head/databases/Makefile head/databases/db48/Makefile head/databases/dbtool/Makefile head/databases/evolution-data-server/Makefile head/databases/fortytwo-bdb/Makefile head/databases/libgda4-bdb/Makefile head/databases/libgda4/Makefile head/databases/libgda5/Makefile head/databases/memcachedb/Makefile head/databases/memcacheq/Makefile head/databases/p5-BDB/Makefile head/databases/p5-BerkeleyDB/Makefile head/databases/py-bsddb/Makefile head/databases/py-bsddb3/Makefile head/databases/rdfdb/Makefile head/databases/ruby-bdb/Makefile head/deskutils/orage/Makefile head/devel/apr1/Makefile head/devel/ice/Makefile head/devel/libqxt/Makefile head/devel/subversion16/Makefile.common head/dns/dnshistory/Makefile head/dns/fastresolve/Makefile head/editors/nvi-devel/Makefile head/editors/poedit/Makefile head/graphics/fortytwo/Makefile head/japanese/mutt-devel/Makefile head/lang/gnu-cobol/Makefile head/lang/php5/Makefile head/lang/php53/Makefile head/lang/php55/Makefile head/mail/avenger/Makefile head/mail/bmf/Makefile head/mail/bogofilter/Makefile head/mail/cyrus-imapd23/Makefile head/mail/cyrus-imapd24/Makefile head/mail/dk-milter/Makefile head/mail/drac/Makefile head/mail/evolution-exchange/Makefile head/mail/greyfix/Makefile head/mail/isync/Makefile head/mail/meta1/Makefile head/mail/mutt/Makefile head/mail/opendkim/Makefile head/mail/perdition/Makefile head/mail/popular/Makefile head/mail/popular/pkg-plist head/mail/postfix-current/Makefile head/mail/postfix/Makefile head/mail/postfix210/Makefile head/mail/postfix28/Makefile head/mail/postfix29/Makefile head/mail/spamprobe/Makefile head/mail/spmfilter/Makefile head/mail/vacation/Makefile head/misc/hotkeys/Makefile head/misc/libhome/Makefile head/net-p2p/bitcoin/Makefile head/net-p2p/cdonkey/Makefile head/net-p2p/digitalcoin/Makefile head/net-p2p/dogecoin/Makefile head/net-p2p/jigdo/Makefile head/net-p2p/litecoin/Makefile head/net-p2p/namecoin/Makefile head/net-p2p/solidcoin/Makefile head/net-p2p/twister/Makefile head/net/freeswitch-core-devel/Makefile head/net/netatalk/Makefile head/net/netatalk3/Makefile head/net/openldap24-server/Makefile head/news/inn/Makefile head/print/panda/Makefile head/science/gramps/Makefile head/security/heimdal/Makefile head/security/pam_abl/Makefile head/security/pks/Makefile head/security/pks/files/patch-configure.in head/security/pks/files/patch-mkpksdconf.in head/security/pks/pkg-descr head/security/pks/pkg-plist head/security/sks/Makefile head/sysutils/apt/Makefile head/sysutils/cfengine22/Makefile head/sysutils/cfengine22/pkg-plist head/sysutils/cfengine32/Makefile head/textproc/p5-RDFStore/Makefile head/textproc/rast/Makefile head/textproc/redland/Makefile head/www/c-icap/Makefile head/www/crawl/Makefile head/www/oops/Makefile head/www/squidguard/Makefile head/www/webalizer/Makefile Modified: head/MOVED ============================================================================== --- head/MOVED Thu Aug 21 22:40:35 2014 (r365598) +++ head/MOVED Thu Aug 21 22:50:29 2014 (r365599) @@ -6467,3 +6467,12 @@ deskutils/horde3-nag||2014-08-20|Has exp 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 Modified: head/Mk/bsd.database.mk ============================================================================== --- head/Mk/bsd.database.mk Thu Aug 21 22:40:35 2014 (r365598) +++ head/Mk/bsd.database.mk Thu Aug 21 22:50:29 2014 (r365599) @@ -50,11 +50,13 @@ Database_Include_MAINTAINER= ports@FreeB # 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@FreeB # 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 + +# 1. detect installed versions +_INST_BDB_VER= +.for bdb in ${_DB_PORTS} +. if exists(${db${bdb}_FIND}) +_INST_BDB_VER+=${bdb} +. endif .endfor -USE_BDB= ${WANT_BDB_VER} + +# 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 -.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} -.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 Modified: head/UPDATING ============================================================================== --- head/UPDATING Thu Aug 21 22:40:35 2014 (r365598) +++ head/UPDATING Thu Aug 21 22:50:29 2014 (r365599) @@ -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 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: Modified: head/archivers/rpm4/Makefile ============================================================================== --- head/archivers/rpm4/Makefile Thu Aug 21 22:40:35 2014 (r365598) +++ head/archivers/rpm4/Makefile Thu Aug 21 22:50:29 2014 (r365599) @@ -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/ Modified: head/archivers/rpm5/Makefile ============================================================================== --- head/archivers/rpm5/Makefile Thu Aug 21 22:40:35 2014 (r365598) +++ head/archivers/rpm5/Makefile Thu Aug 21 22:50:29 2014 (r365599) @@ -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 Modified: head/chinese/libpinyin/Makefile ============================================================================== --- head/chinese/libpinyin/Makefile Thu Aug 21 22:40:35 2014 (r365598) +++ head/chinese/libpinyin/Makefile Thu Aug 21 22:50:29 2014 (r365599) @@ -3,7 +3,7 @@ PORTNAME= libpinyin PORTVERSION= 0.7.91 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= chinese textproc MASTER_SITES= SF/${PORTNAME}/${PORTNAME} Modified: head/chinese/libtabe/Makefile ============================================================================== --- head/chinese/libtabe/Makefile Thu Aug 21 22:40:35 2014 (r365598) +++ head/chinese/libtabe/Makefile Thu Aug 21 22:50:29 2014 (r365599) @@ -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/ Modified: head/chinese/mutt/Makefile ============================================================================== --- head/chinese/mutt/Makefile Thu Aug 21 22:40:35 2014 (r365598) +++ head/chinese/mutt/Makefile Thu Aug 21 22:50:29 2014 (r365599) @@ -1,7 +1,7 @@ # Created by: David O'Brien (obrien@NUXI.com) # $FreeBSD$ -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= chinese MASTERDIR= ${.CURDIR}/../../mail/mutt Modified: head/chinese/p5-Lingua-ZH-TaBE/Makefile ============================================================================== --- head/chinese/p5-Lingua-ZH-TaBE/Makefile Thu Aug 21 22:40:35 2014 (r365598) +++ head/chinese/p5-Lingua-ZH-TaBE/Makefile Thu Aug 21 22:50:29 2014 (r365599) @@ -3,7 +3,7 @@ PORTNAME= Lingua-ZH-TaBE PORTVERSION= 0.07 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= chinese perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- Modified: head/chinese/xsim/Makefile ============================================================================== --- head/chinese/xsim/Makefile Thu Aug 21 22:40:35 2014 (r365598) +++ head/chinese/xsim/Makefile Thu Aug 21 22:50:29 2014 (r365599) @@ -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 \ Modified: head/comms/trustedqsl/Makefile ============================================================================== --- head/comms/trustedqsl/Makefile Thu Aug 21 22:40:35 2014 (r365598) +++ head/comms/trustedqsl/Makefile Thu Aug 21 22:50:29 2014 (r365599) @@ -14,8 +14,9 @@ LICENSE_NAME= American Radio Relay Leagu 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 Modified: head/comms/xastir/Makefile ============================================================================== --- head/comms/xastir/Makefile Thu Aug 21 22:40:35 2014 (r365598) +++ head/comms/xastir/Makefile Thu Aug 21 22:50:29 2014 (r365599) @@ -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} Modified: head/databases/Makefile ============================================================================== --- head/databases/Makefile Thu Aug 21 22:40:35 2014 (r365598) +++ head/databases/Makefile Thu Aug 21 22:50:29 2014 (r365599) @@ -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 Modified: head/databases/db48/Makefile ============================================================================== --- head/databases/db48/Makefile Thu Aug 21 22:40:35 2014 (r365598) +++ head/databases/db48/Makefile Thu Aug 21 22:50:29 2014 (r365599) @@ -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 Modified: head/databases/dbtool/Makefile ============================================================================== --- head/databases/dbtool/Makefile Thu Aug 21 22:40:35 2014 (r365598) +++ head/databases/dbtool/Makefile Thu Aug 21 22:50:29 2014 (r365599) @@ -14,11 +14,6 @@ LIB_DEPENDS= libpcre.so:${PORTSDIR}/deve 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/l .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> Modified: head/databases/evolution-data-server/Makefile ============================================================================== --- head/databases/evolution-data-server/Makefile Thu Aug 21 22:40:35 2014 (r365598) +++ head/databases/evolution-data-server/Makefile Thu Aug 21 22:50:29 2014 (r365599) @@ -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 Modified: head/databases/fortytwo-bdb/Makefile ============================================================================== --- head/databases/fortytwo-bdb/Makefile Thu Aug 21 22:40:35 2014 (r365598) +++ head/databases/fortytwo-bdb/Makefile Thu Aug 21 22:50:29 2014 (r365599) @@ -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 Modified: head/databases/libgda4-bdb/Makefile ============================================================================== --- head/databases/libgda4-bdb/Makefile Thu Aug 21 22:40:35 2014 (r365598) +++ head/databases/libgda4-bdb/Makefile Thu Aug 21 22:50:29 2014 (r365599) @@ -1,7 +1,7 @@ # Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases gnome PKGNAMESUFFIX= 4-bdb Modified: head/databases/libgda4/Makefile ============================================================================== --- head/databases/libgda4/Makefile Thu Aug 21 22:40:35 2014 (r365598) +++ head/databases/libgda4/Makefile Thu Aug 21 22:50:29 2014 (r365599) @@ -4,7 +4,7 @@ PORTNAME= libgda PORTVERSION= 4.2.12 -PORTREVISION?= 4 +PORTREVISION?= 5 CATEGORIES= databases gnome MASTER_SITES= GNOME PKGNAMESUFFIX?= 4 Modified: head/databases/libgda5/Makefile ============================================================================== --- head/databases/libgda5/Makefile Thu Aug 21 22:40:35 2014 (r365598) +++ head/databases/libgda5/Makefile Thu Aug 21 22:50:29 2014 (r365599) @@ -4,7 +4,7 @@ PORTNAME= libgda PORTVERSION?= 5.0.3 -PORTREVISION?= 2 +PORTREVISION?= 3 CATEGORIES= databases gnome MASTER_SITES= GNOME PKGNAMESUFFIX?= 5 Modified: head/databases/memcachedb/Makefile ============================================================================== --- head/databases/memcachedb/Makefile Thu Aug 21 22:40:35 2014 (r365598) +++ head/databases/memcachedb/Makefile Thu Aug 21 22:50:29 2014 (r365599) @@ -3,7 +3,7 @@ PORTNAME= memcachedb PORTVERSION= 1.2.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} Modified: head/databases/memcacheq/Makefile ============================================================================== --- head/databases/memcacheq/Makefile Thu Aug 21 22:40:35 2014 (r365598) +++ head/databases/memcacheq/Makefile Thu Aug 21 22:50:29 2014 (r365599) @@ -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} Modified: head/databases/p5-BDB/Makefile ============================================================================== --- head/databases/p5-BDB/Makefile Thu Aug 21 22:40:35 2014 (r365598) +++ head/databases/p5-BDB/Makefile Thu Aug 21 22:50:29 2014 (r365599) @@ -3,6 +3,7 @@ PORTNAME= BDB PORTVERSION= 1.90 +PORTREVISION= 1 CATEGORIES= databases perl5 MASTER_SITES= CPAN MASTER_SITE_SUBDIR= CPAN:MLEHMANN Modified: head/databases/p5-BerkeleyDB/Makefile ============================================================================== --- head/databases/p5-BerkeleyDB/Makefile Thu Aug 21 22:40:35 2014 (r365598) +++ head/databases/p5-BerkeleyDB/Makefile Thu Aug 21 22:50:29 2014 (r365599) @@ -3,6 +3,7 @@ PORTNAME= BerkeleyDB PORTVERSION= 0.54 +PORTREVISION= 1 CATEGORIES= databases perl5 MASTER_SITES= CPAN MASTER_SITE_SUBDIR= CPAN:PMQS Modified: head/databases/py-bsddb/Makefile ============================================================================== --- head/databases/py-bsddb/Makefile Thu Aug 21 22:40:35 2014 (r365598) +++ head/databases/py-bsddb/Makefile Thu Aug 21 22:50:29 2014 (r365599) @@ -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} Modified: head/databases/py-bsddb3/Makefile ============================================================================== --- head/databases/py-bsddb3/Makefile Thu Aug 21 22:40:35 2014 (r365598) +++ head/databases/py-bsddb3/Makefile Thu Aug 21 22:50:29 2014 (r365599) @@ -3,6 +3,7 @@ PORTNAME= bsddb3 PORTVERSION= 6.0.1 +PORTREVISION= 1 CATEGORIES= databases python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} Modified: head/databases/rdfdb/Makefile ============================================================================== --- head/databases/rdfdb/Makefile Thu Aug 21 22:40:35 2014 (r365598) +++ head/databases/rdfdb/Makefile Thu Aug 21 22:50:29 2014 (r365599) @@ -3,7 +3,7 @@ PORTNAME= rdfdb PORTVERSION= 0.46 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= databases MASTER_SITES= http://www.guha.com/ DISTNAME= rdfdb_src Modified: head/databases/ruby-bdb/Makefile ============================================================================== --- head/databases/ruby-bdb/Makefile Thu Aug 21 22:40:35 2014 (r365598) +++ head/databases/ruby-bdb/Makefile Thu Aug 21 22:50:29 2014 (r365599) @@ -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/ \ Modified: head/deskutils/orage/Makefile ============================================================================== --- head/deskutils/orage/Makefile Thu Aug 21 22:40:35 2014 (r365598) +++ head/deskutils/orage/Makefile Thu Aug 21 22:50:29 2014 (r365599) @@ -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} Modified: head/devel/apr1/Makefile ============================================================================== --- head/devel/apr1/Makefile Thu Aug 21 22:40:35 2014 (r365598) +++ head/devel/apr1/Makefile Thu Aug 21 22:50:29 2014 (r365599) @@ -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 Modified: head/devel/ice/Makefile ============================================================================== --- head/devel/ice/Makefile Thu Aug 21 22:40:35 2014 (r365598) +++ head/devel/ice/Makefile Thu Aug 21 22:50:29 2014 (r365599) @@ -3,6 +3,7 @@ PORTNAME= Ice PORTVERSION= 3.5.1 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= http://download.zeroc.com/Ice/3.5/ Modified: head/devel/libqxt/Makefile ============================================================================== --- head/devel/libqxt/Makefile Thu Aug 21 22:40:35 2014 (r365598) +++ head/devel/libqxt/Makefile Thu Aug 21 22:50:29 2014 (r365599) @@ -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} Modified: head/devel/subversion16/Makefile.common ============================================================================== --- head/devel/subversion16/Makefile.common Thu Aug 21 22:40:35 2014 (r365598) +++ head/devel/subversion16/Makefile.common Thu Aug 21 22:50:29 2014 (r365599) @@ -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/ Modified: head/dns/dnshistory/Makefile ============================================================================== --- head/dns/dnshistory/Makefile Thu Aug 21 22:40:35 2014 (r365598) +++ head/dns/dnshistory/Makefile Thu Aug 21 22:50:29 2014 (r365599) @@ -3,6 +3,7 @@ PORTNAME= dnshistory PORTVERSION= 1.3 +PORTREVISION= 1 CATEGORIES= dns MASTER_SITES= http://www.stedee.id.au/files/ Modified: head/dns/fastresolve/Makefile ============================================================================== --- head/dns/fastresolve/Makefile Thu Aug 21 22:40:35 2014 (r365598) +++ head/dns/fastresolve/Makefile Thu Aug 21 22:50:29 2014 (r365599) @@ -3,7 +3,7 @@ PORTNAME= fastresolve PORTVERSION= 2.10 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= dns MASTER_SITES= http://www.djmnet.org/sw/dist/ Modified: head/editors/nvi-devel/Makefile ============================================================================== --- head/editors/nvi-devel/Makefile Thu Aug 21 22:40:35 2014 (r365598) +++ head/editors/nvi-devel/Makefile Thu Aug 21 22:50:29 2014 (r365599) @@ -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/ Modified: head/editors/poedit/Makefile ============================================================================== --- head/editors/poedit/Makefile Thu Aug 21 22:40:35 2014 (r365598) +++ head/editors/poedit/Makefile Thu Aug 21 22:50:29 2014 (r365599) @@ -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/ Modified: head/graphics/fortytwo/Makefile ============================================================================== --- head/graphics/fortytwo/Makefile Thu Aug 21 22:40:35 2014 (r365598) +++ head/graphics/fortytwo/Makefile Thu Aug 21 22:50:29 2014 (r365599) @@ -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 \ Modified: head/japanese/mutt-devel/Makefile ============================================================================== --- head/japanese/mutt-devel/Makefile Thu Aug 21 22:40:35 2014 (r365598) +++ head/japanese/mutt-devel/Makefile Thu Aug 21 22:50:29 2014 (r365599) @@ -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 \ Modified: head/lang/gnu-cobol/Makefile ============================================================================== --- head/lang/gnu-cobol/Makefile Thu Aug 21 22:40:35 2014 (r365598) +++ head/lang/gnu-cobol/Makefile Thu Aug 21 22:50:29 2014 (r365599) @@ -3,6 +3,7 @@ PORTNAME= gnu-cobol PORTVERSION= 1.1 +PORTREVISION= 1 CATEGORIES= lang MASTER_SITES= GNU/gnucobol Modified: head/lang/php5/Makefile ============================================================================== --- head/lang/php5/Makefile Thu Aug 21 22:40:35 2014 (r365598) +++ head/lang/php5/Makefile Thu Aug 21 22:50:29 2014 (r365599) @@ -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 Modified: head/lang/php53/Makefile ============================================================================== --- head/lang/php53/Makefile Thu Aug 21 22:40:35 2014 (r365598) +++ head/lang/php53/Makefile Thu Aug 21 22:50:29 2014 (r365599) @@ -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 Modified: head/lang/php55/Makefile ============================================================================== --- head/lang/php55/Makefile Thu Aug 21 22:40:35 2014 (r365598) +++ head/lang/php55/Makefile Thu Aug 21 22:50:29 2014 (r365599) @@ -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 Modified: head/mail/avenger/Makefile ============================================================================== --- head/mail/avenger/Makefile Thu Aug 21 22:40:35 2014 (r365598) +++ head/mail/avenger/Makefile Thu Aug 21 22:50:29 2014 (r365599) @@ -3,6 +3,7 @@ PORTNAME= avenger PORTVERSION= 0.8.4 +PORTREVISION= 1 CATEGORIES= mail MASTER_SITES= http://www.mailavenger.org/dist/ Modified: head/mail/bmf/Makefile ============================================================================== --- head/mail/bmf/Makefile Thu Aug 21 22:40:35 2014 (r365598) +++ head/mail/bmf/Makefile Thu Aug 21 22:50:29 2014 (r365599) @@ -3,7 +3,7 @@ PORTNAME= bmf PORTVERSION= 0.9.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= mail MASTER_SITES= SF Modified: head/mail/bogofilter/Makefile ============================================================================== --- head/mail/bogofilter/Makefile Thu Aug 21 22:40:35 2014 (r365598) +++ head/mail/bogofilter/Makefile Thu Aug 21 22:50:29 2014 (r365599) @@ -3,7 +3,7 @@ PORTNAME= bogofilter PORTVERSION= 1.2.4 -PORTREVISION?= 3 +PORTREVISION?= 4 CATEGORIES?= mail MASTER_SITES= SF/bogofilter/bogofilter-current/bogofilter-${PORTVERSION} Modified: head/mail/cyrus-imapd23/Makefile ============================================================================== --- head/mail/cyrus-imapd23/Makefile Thu Aug 21 22:40:35 2014 (r365598) +++ head/mail/cyrus-imapd23/Makefile Thu Aug 21 22:50:29 2014 (r365599) @@ -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 Modified: head/mail/cyrus-imapd24/Makefile ============================================================================== --- head/mail/cyrus-imapd24/Makefile Thu Aug 21 22:40:35 2014 (r365598) +++ head/mail/cyrus-imapd24/Makefile Thu Aug 21 22:50:29 2014 (r365599) @@ -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/ Modified: head/mail/dk-milter/Makefile ============================================================================== --- head/mail/dk-milter/Makefile Thu Aug 21 22:40:35 2014 (r365598) +++ head/mail/dk-milter/Makefile Thu Aug 21 22:50:29 2014 (r365599) @@ -3,6 +3,7 @@ PORTNAME= dk-milter PORTVERSION= 1.0.2 +PORTREVISION= 1 CATEGORIES= mail MASTER_SITES= SF/${PORTNAME}/DomainKeys%20Milter/${PORTVERSION} Modified: head/mail/drac/Makefile ============================================================================== --- head/mail/drac/Makefile Thu Aug 21 22:40:35 2014 (r365598) +++ head/mail/drac/Makefile Thu Aug 21 22:50:29 2014 (r365599) @@ -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/ \ Modified: head/mail/evolution-exchange/Makefile ============================================================================== --- head/mail/evolution-exchange/Makefile Thu Aug 21 22:40:35 2014 (r365598) +++ head/mail/evolution-exchange/Makefile Thu Aug 21 22:50:29 2014 (r365599) @@ -4,7 +4,7 @@ PORTNAME= evolution-exchange PORTVERSION= 2.32.1 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= mail gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 Modified: head/mail/greyfix/Makefile ============================================================================== --- head/mail/greyfix/Makefile Thu Aug 21 22:40:35 2014 (r365598) *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201408212250.s7LMoUlY037422>