Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 9 Jul 2006 21:39:49 GMT
From:      Gabor Kovesdan <gabor@FreeBSD.org>
To:        Perforce Change Reviews <perforce@FreeBSD.org>
Subject:   PERFORCE change 101167 for review
Message-ID:  <200607092139.k69Ldnfh064771@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=101167

Change 101167 by gabor@gabor_spitfire on 2006/07/09 21:39:24

	IFC

Affected files ...

.. //depot/projects/soc2006/gabor_ports/KNOBS#3 integrate
.. //depot/projects/soc2006/gabor_ports/MOVED#5 integrate
.. //depot/projects/soc2006/gabor_ports/Mk/bsd.port.mk#16 integrate
.. //depot/projects/soc2006/gabor_ports/Mk/bsd.scons.mk#3 integrate
.. //depot/projects/soc2006/gabor_ports/Mk/bsd.sites.mk#4 integrate
.. //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/dopackagestats#3 integrate
.. //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/processonelog#3 integrate
.. //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/showrunning#1 branch
.. //depot/projects/soc2006/gabor_ports/UPDATING#5 integrate

Differences ...

==== //depot/projects/soc2006/gabor_ports/KNOBS#3 (text+ko) ====

@@ -1,7 +1,7 @@
 #
 # KNOBS - A list of popular knobs and descriptions
 #
-# $FreeBSD: ports/KNOBS,v 1.12 2006/06/23 14:14:49 skv Exp $
+# $FreeBSD: ports/KNOBS,v 1.13 2006/07/05 15:18:35 skv Exp $
 #
 # Rules to adding knobs:
 #
@@ -52,6 +52,7 @@
 IMAGEMAGICK		ImageMagick graphics support
 IMAP			Adds support for IMAP mail protocol
 IPV6			IPv6 internet support
+ISPELL			Use textproc/ispell for spell checking
 JAVA			Adds support for Java
 KDE			Adds KDE support
 LAME			LAME MP3 audio encoder support

==== //depot/projects/soc2006/gabor_ports/MOVED#5 (text+ko) ====

@@ -1,7 +1,7 @@
 #
 # MOVED - a list of (recently) moved or removed ports
 #
-# $FreeBSD: ports/MOVED,v 1.1086 2006/07/04 14:04:27 vd Exp $
+# $FreeBSD: ports/MOVED,v 1.1092 2006/07/09 21:24:25 itetcu Exp $
 #
 # Each entry consists of a single line containing the following four
 # fields in the order named, separated with the pipe (`|') character:
@@ -2402,3 +2402,11 @@
 security/p5-Crypt-OpenPGP||2006-07-04|Has expired: Crypt-OpenPGP was abandoned in 2002, use security/gnupg instead
 textproc/sed_inplace||2006-07-04|Has expired: This port is not required anymore
 textproc/xml4j||2006-07-04|Has expired: it has been replaced by textproc/xerces-j 8 years ago
+www/sitemapgen|www/google-sitemapgen|2006-07-05|Duplicate port
+security/gnutls-devel||2006-07-06|Development version is not active so far
+www/otrs|devel/otrs|2006-07-07|Duplicate port
+math/UFsparse|math/ufsparse|2006-07-09|port name should not have capital letters
+sysutils/lineak_defaultplugin|sysutils/lineak-defaultplugin|2006-07-09|port name changed to match upstream
+sysutils/lineak_kdeplugins|sysutils/lineak-kdeplugins|2006-07-09|port name changed to match upstream
+sysutils/lineak_xosdplugin|sysutils/lineak-xosdplugin|2006-07-09|port name changed to match upstream
+japanese/phpgroupware||2006-04-10|removed at mainter request (because broken and vulnerabilities)

==== //depot/projects/soc2006/gabor_ports/Mk/bsd.port.mk#16 (text+ko) ====

@@ -1,7 +1,7 @@
 #-*- mode: makefile; tab-width: 4; -*-
 # ex:ts=4
 #
-# $FreeBSD: ports/Mk/bsd.port.mk,v 1.536 2006/07/05 02:18:08 linimon Exp $
+# $FreeBSD: ports/Mk/bsd.port.mk,v 1.537 2006/07/06 17:56:45 linimon Exp $
 #	$NetBSD: $
 #
 #	bsd.port.mk - 940820 Jordan K. Hubbard.
@@ -384,9 +384,9 @@
 # USE_OPENSSL	- If set, this port relies on the OpenSSL package.
 ##
 # USE_OPENLDAP	- If set, this port uses the OpenLDAP libraries.
-#				  Implies: WANT_OPENLDAP_VER?=22
+#				  Implies: WANT_OPENLDAP_VER?=23
 # WANT_OPENLDAP_VER
-#				- Legal values are: 21, 22, 23
+#				- Legal values are: 22, 23, 24
 #				  If set to an unkown value, the port is marked BROKEN.
 # WANT_OPENLDAP_SASL
 #				- If set, the system should use OpenLDAP libraries

==== //depot/projects/soc2006/gabor_ports/Mk/bsd.scons.mk#3 (text+ko) ====

@@ -1,7 +1,7 @@
 #-*- mode: Makefile; tab-width: 4; -*-
 # ex:ts=4
 #
-# $FreeBSD: ports/Mk/bsd.scons.mk,v 1.1 2006/07/05 02:11:20 linimon Exp $
+# $FreeBSD: ports/Mk/bsd.scons.mk,v 1.3 2006/07/05 19:53:27 linimon Exp $
 #
 # bsd.scons.mk - Python-based SCons build system interface.
 # Author: Alexander Botero-Lowry <alex@foxybanana.com>
@@ -9,7 +9,7 @@
 # Please view me with 4 column tabs!
 
 # Please make sure all changes to this file are passed through the maintainer.
-SCONS_MAINTAINER=	alex@foxybanana.com> 
+SCONS_MAINTAINER=	alex@foxybanana.com
 
 #
 # SCONS_BIN is the location where the scons port installs the scons
@@ -20,14 +20,14 @@
 SCONS_BIN=	${LOCALBASE}/bin/scons
 SCONS_PORT=	${PORTSDIR}/devel/scons
 
-# 
+#
 # CCFLAGS is the scons equivalent of CFLAGS. So we should bring in our
 # FreeBSD CFLAGS.
 #
 # LINKFLAGS is equivalent to LDFLAGS in make speak, so we bring in the
 # FreeBSD default LDFLAGS.
 #
-# Some scons projects may honor PKGCONFIGDIR, which tells them where to 
+# Some scons projects may honor PKGCONFIGDIR, which tells them where to
 # look for, and install, pkgconfig files.
 #
 CCFLAGS?=	${CFLAGS}
@@ -38,15 +38,15 @@
 CXXFLAGS+=	-I${LOCALBASE}/include
 LINKFLAGS+=	-L${LOCALBASE}/lib
 
-# 
+#
 # SCONS_ENV is where we pass all the stuff that should be the
 # same for any scons port to scons. Things like CCFLAGS, and LINKFLAGS
 # go here.
 #
-# SCONS_ARG is where you pass port specific scons flags to the scons 
+# SCONS_ARG is where you pass port specific scons flags to the scons
 # enviornment.
 #
-# SCONS_BUILDENV is where you pass variables you want to be in the 
+# SCONS_BUILDENV is where you pass variables you want to be in the
 # System Enviornment instead of the SCons Enviornment.
 #
 # SCONS_TARGET is the same as MAKE_TARGET it is passed as the last
@@ -55,20 +55,20 @@
 SCONS_ENV?=	CCFLAGS="${CCFLAGS}" CXXFLAGS="${CXXFLAGS}" \
 		LINKFLAGS="${LINKFLAGS}" PKGCONFIGDIR="${PKGCONFIGDIR}" \
 		PREFIX="${DESTDIR}${PREFIX}" CC="${CC}" CXX="${CXX}"
-SCONS_ARGS?=	
-SCONS_BUILDENV?=	
+SCONS_ARGS?=
+SCONS_BUILDENV?=
 SCONS_TARGET?=
 
 #
-# SCONS_INSTALL_TARGET is the default target to be used when 
+# SCONS_INSTALL_TARGET is the default target to be used when
 # installing a port using scons.
 #
 SCONS_INSTALL_TARGET?=	${INSTALL_TARGET}
 
-# 
+#
 # Make sure we depend on scons
 #
-BUILD_DEPENDS+= ${SCONS_BIN}:${SCONS_PORT}
+BUILD_DEPENDS+=	${SCONS_BIN}:${SCONS_PORT}
 
 .if !target(do-build)
 do-build:

==== //depot/projects/soc2006/gabor_ports/Mk/bsd.sites.mk#4 (text+ko) ====

@@ -20,7 +20,7 @@
 #
 # Note: all entries should terminate with a slash.
 #
-# $FreeBSD: ports/Mk/bsd.sites.mk,v 1.373 2006/07/02 15:27:49 arved Exp $
+# $FreeBSD: ports/Mk/bsd.sites.mk,v 1.374 2006/07/06 23:56:12 bsam Exp $
 #
 
 # Where to put distfiles that don't have any other master site
@@ -211,7 +211,6 @@
 
 .if !defined(IGNORE_MASTER_SITE_FEDORA_LINUX)
 MASTER_SITE_FEDORA_LINUX+= \
-	ftp://limestone.uoregon.edu/fedora/%SUBDIR%/ \
 	http://mirrors.kernel.org/fedora/core/%SUBDIR%/ \
 	ftp://mirrors.kernel.org/fedora/core/%SUBDIR%/ \
 	http://mirror.web-ster.com/fedora/core/%SUBDIR%/ \

==== //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/dopackagestats#3 (text+ko) ====

@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD#
+# $FreeBSD: ports/Tools/portbuild/scripts/dopackagestats,v 1.10 2006/07/08 04:09:42 linimon Exp $
 #
 # create HTML showing numbers of packages vs errors.  Run this in a directory
 # accessible to the web server.
@@ -12,60 +12,75 @@
 OUTFILE=packagestats.html
 TMPFILE=.${OUTFILE}
 
-echo "<html>" > ${TMPFILE}
-echo "<head>" >> ${TMPFILE}
-echo "<title>FreeBSD package building statistics</title>" >> ${TMPFILE}
-echo "</head>" >> ${TMPFILE}
+# stylesheet seems like overkill for something this simple
+TABLEBGCOLOR="#F0F0F0"
+THCOLOR="#E0E0FF"
+TDCOLOR_DONE="lightgreen"
+TDCOLOR_NOT_DONE="lightyellow"
+
+# subroutines
 
-echo "<body>" >> ${TMPFILE}
-echo "<h1>FreeBSD package building statistics</h1>" >> ${TMPFILE}
-echo "<p>as of `date`</p>" >> ${TMPFILE}
+write_header () {
+  echo "<html>" > ${TMPFILE}
+  echo "<head>" >> ${TMPFILE}
+  echo "<title>FreeBSD package building statistics</title>" >> ${TMPFILE}
+  echo "</head>" >> ${TMPFILE}
 
-for arch in ${SUPPORTED_ARCHS}; do
+  echo "<body>" >> ${TMPFILE}
+  echo "<h1>FreeBSD package building statistics</h1>" >> ${TMPFILE}
+  echo "<p>as of `date`</p>" >> ${TMPFILE}
+}
 
-  # begin table
-  echo "<table border='1' cellpadding='4' bgcolor='#F2F2F2'>" >> ${TMPFILE}
+write_table_begin () {
+  echo "<table border='1' cellpadding='4' cellspacing='1' bgcolor='$TABLEBGCOLOR'>" >> ${TMPFILE}
   echo "<tr>" >> ${TMPFILE}
-  echo "<td align='left' width='80'>&nbsp;</td>" >> ${TMPFILE}
-  echo "<th align='left'>INDEX</th>" >> ${TMPFILE}
-  echo "<th align='left'>packages</th>" >> ${TMPFILE}
-  echo "<th align='left'>errors</th>" >> ${TMPFILE}
-  echo "<th align='left'>skipped</th>" >> ${TMPFILE}
-  echo "<th align='left'>missing</th>" >> ${TMPFILE}
-  echo "<th align='left'>done?</th>" >> ${TMPFILE}
+  echo "<td align='left' width='80' bgcolor='$TABLEBGCOLOR'>&nbsp;</td>" >> ${TMPFILE}
+  echo "<th width='60' bgcolor='$THCOLOR'>as of</th>" >> ${TMPFILE}
+  echo "<th bgcolor='$THCOLOR'>INDEX</th>" >> ${TMPFILE}
+  echo "<th bgcolor='$THCOLOR'>packages</th>" >> ${TMPFILE}
+  echo "<th bgcolor='$THCOLOR'>errors</th>" >> ${TMPFILE}
+  echo "<th bgcolor='$THCOLOR'>skipped</th>" >> ${TMPFILE}
+  echo "<th bgcolor='$THCOLOR'>missing</th>" >> ${TMPFILE}
+  echo "<th bgcolor='$THCOLOR'>done?</th>" >> ${TMPFILE}
   echo "</tr>" >> ${TMPFILE}
+}
 
-  # begin row
-  branches=`ls ${ROOT_DIRECTORY}/${arch} | grep '^[1-9]$' | sort`
-  for branch in ${branches}; do
+write_row () {
+    # first, gather data
 
-    directory=${ROOT_DIRECTORY}/${arch}/${branch}
+    arch=$1
+    build=$2
+    directory=${ROOT_DIRECTORY}/${arch}/${build}
+    branch=`echo $build | sed -e "s/-exp//"`
     if [ "$branch" = "4" ]; then
       indexfile=$directory/ports/INDEX
     else
       indexfile=$directory/ports/INDEX-$branch
     fi
 
-    echo "<tr>" >> ${TMPFILE}
+    # column: datestamp of latest log
+    latest="&nbsp;"
+    if [ -d $directory/logs ]; then
+      #latest="$(cd $directory/logs; ls -rtTl | grep '\.log' | tail -1 | awk '{printf("%s %s %s %s\n",$6,$7,$8,$9)}')"
+      latest="$(cd $directory/logs; ls -rtTl | grep '\.log' | tail -1 | awk '{printf("%s %s\n",$6,$7)}')"
+      if [ "$latest" ]; then
+        #latest="$latest `date '+%Z'`"
+      else
+        latest="&nbsp;"
+      fi
+    fi
 
-    # column: ARCH
-    echo "<th align='left'>$arch-$branch</th>" >> ${TMPFILE}
-
     # column: INDEX count
     n_index=0
     if [ -f $indexfile ]; then
       n_index=`cat $indexfile | wc -l`
     fi
-    echo "<td align='right'>$n_index</td>" >> ${TMPFILE}
 
     # column: package count
     n_packages=0
     if [ -d $directory/packages/All ]; then
       n_packages=`find $directory/packages/All -name \*.tbz -o -name \*.tgz |wc -l`
     fi
-    echo "<td align='right'>" >> ${TMPFILE}
-    echo "<a href='http://pointyhat.freebsd.org/errorlogs/$arch-$branch-latest-logs'>" >> ${TMPFILE}
-    echo "$n_packages</a></td>" >> ${TMPFILE}
 
     # column: error count
     n_errors=0
@@ -74,16 +89,12 @@
       #n_errors=`find $directory/errors -name \*.log -o -name \*.log.bz2 |wc -l`
       n_errors=`ls $directory/errors | grep '.log' | wc -l`
     fi
-    echo "<td align='right'>" >> ${TMPFILE}
-    echo "<a href='http://pointyhat.freebsd.org/errorlogs/$arch-$branch-latest'>" >> ${TMPFILE}
-    echo "$n_errors</a></td>" >> ${TMPFILE}
 
     # column: duds count
     n_duds=0
     if [ -f $directory/duds ]; then
       n_duds=`cat $directory/duds | wc -l`
     fi
-    echo "<td align='right'>$n_duds</td>" >> ${TMPFILE}
 
     # column: missing count
     if [ $n_index -ne 0 ]; then
@@ -91,7 +102,6 @@
     else  # index currently being rebuilt
       n_missing=0
     fi
-    echo "<td align='right'>$n_missing</td>" >> ${TMPFILE}
 
     # column: done flag
     done_flag="N"
@@ -100,28 +110,87 @@
         done_flag="Y"
       fi
     fi
-    echo "<td align='right'>$done_flag</td>" >> ${TMPFILE}
+
+    # decorate the row to make everything less "gray"
+    if [ "$done_flag" = "Y" ]; then
+      cellcolor=$TDCOLOR_DONE
+    else
+      cellcolor=$TDCOLOR_NOT_DONE
+    fi
 
+    # now write the row
+    echo "<tr>" >> ${TMPFILE}
+    echo "<th align='left' bgcolor='$THCOLOR'>$arch-$build</th>" >> ${TMPFILE}
+    echo "<td align='left' bgcolor='$cellcolor'>$latest</td>" >> ${TMPFILE}
+    echo "<td align='right' bgcolor='$cellcolor'>$n_index</td>" >> ${TMPFILE}
+    echo "<td align='right' bgcolor='$cellcolor'>" >> ${TMPFILE}
+    echo "<a href='http://pointyhat.freebsd.org/errorlogs/$arch-$build-latest-logs'>" >> ${TMPFILE}
+    echo "$n_packages</a></td>" >> ${TMPFILE}
+    echo "<td align='right' bgcolor='$cellcolor'>" >> ${TMPFILE}
+    echo "<a href='http://pointyhat.freebsd.org/errorlogs/$arch-$build-latest'>" >> ${TMPFILE}
+    echo "$n_errors</a></td>" >> ${TMPFILE}
+    echo "<td align='right' bgcolor='$cellcolor'>$n_duds</td>" >> ${TMPFILE}
+    echo "<td align='right' bgcolor='$cellcolor'>$n_missing</td>" >> ${TMPFILE}
+    echo "<td align='center' bgcolor='$cellcolor'>$done_flag</td>" >> ${TMPFILE}
     echo "</tr>" >> ${TMPFILE}
+}
 
-  done
-
+write_table_end () {
   echo "</table>" >> ${TMPFILE}
   echo "<br>" >> ${TMPFILE}
+}
 
+write_footer () {
+  echo "<p>explanation of columns:</p>" >> ${TMPFILE}
+  echo "<ul>" >> ${TMPFILE}
+  echo "<li><b>as of</b> is the date of the latest logfile.</li>" >> ${TMPFILE}
+  echo "<li><b>INDEX</b> is number of ports in the INDEX file built from the latest cvs checkout.</li>" >> ${TMPFILE}
+  echo "<li><b>packages</b> is number of packages successfully built.</li>" >> ${TMPFILE}
+  echo "<li><b>errors</b> is number of packages that failed.</li>" >> ${TMPFILE}
+  echo "<li><b>skipped</b> is number of packages that were skipped due to NO_PACKAGE, IGNORE, BROKEN, FORBIDDEN, and so forth (\"duds\" file).</li>" >> ${TMPFILE}
+  echo "<li><b>missing</b> is the INDEX column minus the others.  These are packages that have not been built for one reason or another.</li>" >> ${TMPFILE}
+  echo "<li><b>done</b> is whether that run terminated normally or not.</li>" >> ${TMPFILE}
+  echo "</ul>" >> ${TMPFILE}
+
+  echo "</body>" >> ${TMPFILE}
+  echo "</html>" >> ${TMPFILE}
+}
+
+# main
+
+write_header
+
+# display all the mainstream builds first
+for arch in ${SUPPORTED_ARCHS}; do
+
+  builds=`ls ${ROOT_DIRECTORY}/${arch} | grep '^[1-9]$' | sort`
+  if [ ! -z "$builds" ]; then
+    write_table_begin
+
+      for build in ${builds}; do
+        write_row ${arch} ${build}
+      done
+
+    write_table_end
+  fi
 done
 
-echo "<p>explanation of columns:</p>" >> ${TMPFILE}
-echo "<ul>" >> ${TMPFILE}
-echo "<li><b>INDEX</b> is number of ports in the INDEX file built from the latest cvs checkout.</li>" >> ${TMPFILE}
-echo "<li><b>packages</b> is number of packages successfully built.</li>" >> ${TMPFILE}
-echo "<li><b>errors</b> is number of packages that failed.</li>" >> ${TMPFILE}
-echo "<li><b>skipped</b> is number of packages that were skipped due to NO_PACKAGE, IGNORE, BROKEN, FORBIDDEN, and so forth (\"duds\" file).</li>" >> ${TMPFILE}
-echo "<li><b>missing</b> is the INDEX column minus the others.  These are packages that have not been built for one reason or another.</li>" >> ${TMPFILE}
-echo "<li><b>done</b> is whether that run terminated normally or not.</li>" >> ${TMPFILE}
-echo "</ul>" >> ${TMPFILE}
+# then display all -exp builds (probably only of interest to portmgr;
+#   would break up the logical flow of the above)
+for arch in ${SUPPORTED_ARCHS}; do
+
+  builds=`ls ${ROOT_DIRECTORY}/${arch} | grep '^[1-9]-exp$' | sort`
+  if [ ! -z "$builds" ]; then
+    write_table_begin
+
+      for build in ${builds}; do
+        write_row ${arch} ${build}
+      done
+
+    write_table_end
+  fi
+done
 
-echo "</body>" >> ${TMPFILE}
-echo "</html>" >> ${TMPFILE}
+write_footer
 
 mv -f ${TMPFILE} ${OUTFILE}

==== //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/processonelog#3 (text+ko) ====

@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD: ports/Tools/portbuild/scripts/processonelog,v 1.6 2006/06/24 19:51:53 linimon Exp $
+# $FreeBSD: ports/Tools/portbuild/scripts/processonelog,v 1.8 2006/07/08 21:38:55 linimon Exp $
 #
 # Read a single errorlogfile and output a line of the format
 #    $filename|$portname|$affected|$logsize|$dir|$maintainer|\
@@ -90,7 +90,7 @@
   reason="runaway_process"; tag="runaway"
 elif grep -q "pnohang: killing make package" $1; then
   reason="runaway_process"; tag="runaway"
-elif grep -qE "pkg_add: (can't find enough temporary space|projected size of .* exceeds available free space)" $1; then
+elif grep -qE "pkg_add:.*(can't find enough temporary space|projected size of .* exceeds available free space)" $1; then
   reason="disk_full"; tag="df"
 elif grep -qE '(parse error|too (many|few) arguments to|argument.*doesn.*prototype|incompatible type for argument|conflicting types for|undeclared \(first use (in |)this function\)|incorrect number of parameters|has incomplete type and cannot be initialized|error: storage size.* isn.t known)' $1; then
   reason="compiler_error"; tag="cc"
@@ -240,8 +240,6 @@
   reason="perl"; tag="perl"
 elif grep -q 'BEGIN failed--compilation aborted at ..Makefile.PL line' $1; then
   reason="perl5"; tag="perl5"
-elif grep -q "Syntax error: .(. unexpected (expecting .fi.)" $1; then
-  reason="portcomment"; tag="portcomment"
 elif grep -q "Abort trap" $1; then
   reason="process_failed"; tag="process"
 elif grep -q "Bus error" $1; then

==== //depot/projects/soc2006/gabor_ports/UPDATING#5 (text+ko) ====

@@ -6,6 +6,23 @@
 time you update your ports collection, before attempting any port
 upgrades.
 
+20060707:
+  AFFECTS: users of www/lifetype
+  AUTHOR: clsung@FreeBSD.org
+
+  The default install location has changed from
+  ${PREFIX}/www/data/lifetype to ${PREFIX}/www/lifetype.
+
+20060706:
+  AFFECTS: users of security/gnutls and any port that depends on it
+  AUTHOR: novel@FreeBSD.org
+
+  gnutls has been updated to 1.4.0 and all shared libraries' versions
+  have been bumped. So you need to rebuild all applications that
+  depend on gnutls. Do something like:
+
+        portupgrade -rf gnutls
+
 20060703:
   AFFECTS: users of audio/amarok
   AUTHOR: mich@FreeBSD.org
@@ -19,27 +36,29 @@
   AFFECTS: users of sysutils/portupgrade
   AUTHOR: sem@FreeBSD.org
 
-  Because of portupgrade had a bug with detecting of Berkley DB version 2+,
-  and a default database now set to use this version you can get portupgrade
-  don't work with old databases. A quick fix is removing the databases:
-  `rm /var/db/pkg/pkgdb.db /usr/ports/INDEX*.db'. portupgrade will recreate
-  them automaticaly. It's absolutely no harm.
+  Because portupgrade had a problem with detecting Berkley DB version 2
+  or newer, and the default database format is now set to use these
+  versions, you can end up with a portupgrade that does not work with
+  older databases. A quick fix is to remove the databases, type:
+  'rm /var/db/pkg/pkgdb.db /usr/ports/INDEX*.db'.
+  portupgrade will recreate them automaticaly. It does absolutely no harm.
 
-  If you don't want remove the databases you should detect what database
-  type do you use, and set port options accordly. Follow the instructions:
+  If you do not want remove the databases, you should detect what database
+  type do you use, and set the port options for portupgrade accordingly.
+  Follow these instructions:
 
-  - run `pkgdb -fu' *before* upgrading and take a look on the output.
+  - run 'pkgdb -fu' *before* upgrading and take a look on the output.
     You can see database format there as: format:XXX, where XXX is your
     current database format.
   - Go to portupgrade port directory and configure the port with 
-    `make config' command. If you have bdb_* format then turn on BDB4 option,
-    if you have bdb1_* format then turn off BDB4 and turn on BDB1 option.
-    If you have dbd_hash format then turn off all option.
+    `make config' command. If you have bdb_* format, then turn on the BDB4
+    option.  If you have bdb1_* format, then turn off BDB4 and turn on
+    the BDB1 option.  If you have dbd_hash format, then turn off all options.
   - Upgrade portupgrade.
   
   Note: if you change database format with changing port options,
-  you should remove ruby-bdb* port that you don't need anymore or to hard
-  code database format in your pkgtools.conf.
+  you should remove the ruby-bdb* port that you don't need anymore.
+  Alternatively, you can hard code database format in your pkgtools.conf.
 
 20060702:
   AFFECTS: users of multimedia/handbrake
@@ -3770,4 +3789,4 @@
   2) Update all p5-* modules.
 	portupgrade -f p5-\*
 
-$FreeBSD: ports/UPDATING,v 1.356 2006/07/04 00:48:39 lioux Exp $
+$FreeBSD: ports/UPDATING,v 1.359 2006/07/08 02:28:49 clsung Exp $



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200607092139.k69Ldnfh064771>