Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 13 Jul 2006 14:08:45 GMT
From:      Gabor Kovesdan <gabor@FreeBSD.org>
To:        Perforce Change Reviews <perforce@FreeBSD.org>
Subject:   PERFORCE change 101468 for review
Message-ID:  <200607131408.k6DE8jVO026746@repoman.freebsd.org>

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

Change 101468 by gabor@gabor_spitfire on 2006/07/13 14:08:24

	IFC

Affected files ...

.. //depot/projects/soc2006/gabor_ports/MOVED#6 integrate
.. //depot/projects/soc2006/gabor_ports/Mk/bsd.linux-rpm.mk#2 integrate
.. //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/dopackagestats#4 integrate
.. //depot/projects/soc2006/gabor_ports/UPDATING#6 integrate

Differences ...

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

@@ -1,7 +1,7 @@
 #
 # MOVED - a list of (recently) moved or removed ports
 #
-# $FreeBSD: ports/MOVED,v 1.1092 2006/07/09 21:24:25 itetcu Exp $
+# $FreeBSD: ports/MOVED,v 1.1094 2006/07/12 14:15:55 rafan Exp $
 #
 # Each entry consists of a single line containing the following four
 # fields in the order named, separated with the pipe (`|') character:
@@ -2228,7 +2228,6 @@
 mail/rmoldmail||2006-04-07|Has expired: mastersite disappeared, no longer maintained by author
 mail/ruby-mime-types||2006-04-07|Has expired: mastersite disappeared, no longer maintained by author
 devel/wftk||2006-04-07|master site disappeared
-textproc/p5-JSON-Syck|textproc/p5-YAML-Syck|2006-04-07|The textproc/p5-YAML-Syck port now includes JSON functionality
 www/linux-flashplugin||2006-04-08|Removed due to license problem
 net/nic||2006-04-08|Deprecated for a long time
 www/flashpluginwrapper||2006-04-08|Removed as it depends on linux-flashplugin
@@ -2410,3 +2409,5 @@
 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)
+www/p5-Catalyst|www/p5-Catalyst-Runtime|2006-07-10|follow CPAN split of package
+textproc/p5-JSON-Syck|textproc/p5-YAML-Syck|2006-07-12|The textproc/p5-YAML-Syck port now includes JSON functionality

==== //depot/projects/soc2006/gabor_ports/Mk/bsd.linux-rpm.mk#2 (text+ko) ====

@@ -1,7 +1,7 @@
 #-*- mode: Makefile; tab-width: 4; -*-
 # ex:ts=4
 #
-# $FreeBSD: ports/Mk/bsd.linux-rpm.mk,v 1.7 2006/06/07 18:47:40 netchild Exp $
+# $FreeBSD: ports/Mk/bsd.linux-rpm.mk,v 1.8 2006/07/13 12:35:12 bsam Exp $
 #
 
 # Variables:
@@ -105,14 +105,14 @@
 
 .  if defined(AUTOMATIC_PLIST)
 
-.    if ${USE_LINUX} == "8" || ${USE_LINUX:L} == "yes"
-_LINUX_BASE_SUFFIX=		8
+.    if ${USE_LINUX} == "fc4" || ${USE_LINUX:L} == "yes"
+_LINUX_BASE_SUFFIX=		fc4
 .    elif ${USE_LINUX} == "debian"
 _LINUX_BASE_SUFFIX=		debian
 .    elif ${USE_LINUX} == "fc3"
 _LINUX_BASE_SUFFIX=		fc3
-.    elif ${USE_LINUX} == "fc4"
-_LINUX_BASE_SUFFIX=		fc4
+.    elif ${USE_LINUX} == "8"
+_LINUX_BASE_SUFFIX=		8
 .    else
 # other linux_base ports do not provide a pkg-plist file
 IGNORE=					uses AUTOMATIC_PLIST with an unsupported USE_LINUX, \"${USE_LINUX}\". Supported values are \"yes\", \"8\", \"debian\", \"fc3\" and \"fc4\"

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

@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD: ports/Tools/portbuild/scripts/dopackagestats,v 1.10 2006/07/08 04:09:42 linimon Exp $
+# $FreeBSD: ports/Tools/portbuild/scripts/dopackagestats,v 1.11 2006/07/13 03:52:28 linimon Exp $
 #
 # create HTML showing numbers of packages vs errors.  Run this in a directory
 # accessible to the web server.
@@ -9,7 +9,7 @@
 SUPPORTED_ARCHS="amd64 i386 ia64 sparc64"
 ROOT_DIRECTORY=/var/portbuild
 
-OUTFILE=packagestats.html
+OUTFILE=`basename $0 | sed -e "s/^do//"`".html"
 TMPFILE=.${OUTFILE}
 
 # stylesheet seems like overkill for something this simple
@@ -35,7 +35,8 @@
   echo "<table border='1' cellpadding='4' cellspacing='1' bgcolor='$TABLEBGCOLOR'>" >> ${TMPFILE}
   echo "<tr>" >> ${TMPFILE}
   echo "<td align='left' width='80' bgcolor='$TABLEBGCOLOR'>&nbsp;</td>" >> ${TMPFILE}
-  echo "<th width='60' bgcolor='$THCOLOR'>as of</th>" >> ${TMPFILE}
+  echo "<th width='60' bgcolor='$THCOLOR'>cvs date</th>" >> ${TMPFILE}
+  echo "<th width='60' bgcolor='$THCOLOR'>latest log</th>" >> ${TMPFILE}
   echo "<th bgcolor='$THCOLOR'>INDEX</th>" >> ${TMPFILE}
   echo "<th bgcolor='$THCOLOR'>packages</th>" >> ${TMPFILE}
   echo "<th bgcolor='$THCOLOR'>errors</th>" >> ${TMPFILE}
@@ -58,6 +59,15 @@
       indexfile=$directory/ports/INDEX-$branch
     fi
 
+    # column: date of CVS checkout
+    cvsdone="&nbsp;"
+    if [ -f $directory/cvsdone ]; then
+      cvsdone="$(cat $directory/cvsdone | awk '{printf("%s %s\n",$2,$3)}')"
+      if [ -z "$cvsdone" ]; then
+        cvsdone="&nbsp;"
+      fi
+    fi
+
     # column: datestamp of latest log
     latest="&nbsp;"
     if [ -d $directory/logs ]; then
@@ -121,6 +131,7 @@
     # now write the row
     echo "<tr>" >> ${TMPFILE}
     echo "<th align='left' bgcolor='$THCOLOR'>$arch-$build</th>" >> ${TMPFILE}
+    echo "<td align='left' bgcolor='$cellcolor'>$cvsdone</td>" >> ${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}
@@ -143,7 +154,8 @@
 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>latest log</b> is the date of the latest logfile.</li>" >> ${TMPFILE}
+  echo "<li><b>cvs date</b> is the date of the latest CVS checkout done by the script.  It may be inaccurate if a manual checkout was done later.</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}
@@ -152,6 +164,11 @@
   echo "<li><b>done</b> is whether that run terminated normally or not.</li>" >> ${TMPFILE}
   echo "</ul>" >> ${TMPFILE}
 
+  echo "<p>notes:</p>" >> ${TMPFILE}
+  echo "<ul>" >> ${TMPFILE}
+  echo "<li>on the -exp builds, editors/openoffice.org* are skipped to save time.</li>" >> ${TMPFILE}
+  echo "</ul>" >> ${TMPFILE}
+
   echo "</body>" >> ${TMPFILE}
   echo "</html>" >> ${TMPFILE}
 }

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

@@ -6,6 +6,33 @@
 time you update your ports collection, before attempting any port
 upgrades.
 
+20060713:
+  AFFECTS: users of x11-fonts/terminus-font
+  AUTHOR: garga@FreeBSD.org
+
+  Since version 4.20, terminus-font changed place to install fonts to
+  ${PREFIX}/lib/X11/fonts/terminus-font, please, add this new path to your
+  font paths.
+
+20060711:
+  AFFECTS: users of net/samba3
+  AUTHOR: timur@gnu.org
+
+  Starting from version 3.0.23 Samba no longer supports experimental
+  SQL and XML passdb backends. If you need this functionality, please
+  visit http://pdbsql.sourceforge.net/ (port is coming soon).
+
+  The default mapping entries for groups such as "Domain Admins" are
+  no longer created when using an smbpasswd file or a tdbsam passdb
+  backend. Use 'net groupmap add' rather than 'net groupmap modify' 
+  to set these entries.
+
+  A substring matching rule has been added to the sambaSID attribute
+  definition. For OpenLDAP servers, this will require the addition
+  of 'index sambaSID sub' to the slapd.conf configuration file. It
+  will be necessary to run slapindex after making this change. There
+  has been no change to actual data storage schema.
+
 20060707:
   AFFECTS: users of www/lifetype
   AUTHOR: clsung@FreeBSD.org
@@ -3789,4 +3816,4 @@
   2) Update all p5-* modules.
 	portupgrade -f p5-\*
 
-$FreeBSD: ports/UPDATING,v 1.359 2006/07/08 02:28:49 clsung Exp $
+$FreeBSD: ports/UPDATING,v 1.361 2006/07/13 12:03:50 garga Exp $



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