From owner-p4-projects@FreeBSD.ORG Fri Jul 14 04:26:56 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5E8A916A4E6; Fri, 14 Jul 2006 04:26:56 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 357EC16A4DA for ; Fri, 14 Jul 2006 04:26:56 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2996C43D49 for ; Fri, 14 Jul 2006 04:26:55 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6E4QtUD022340 for ; Fri, 14 Jul 2006 04:26:55 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6E4QrEr022309 for perforce@freebsd.org; Fri, 14 Jul 2006 04:26:53 GMT (envelope-from jb@freebsd.org) Date: Fri, 14 Jul 2006 04:26:53 GMT Message-Id: <200607140426.k6E4QrEr022309@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 101503 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Jul 2006 04:26:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=101503 Change 101503 by jb@jb_freebsd2 on 2006/07/14 04:25:57 IFC Affected files ... .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#15 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#13 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.develalumni.sgml#9 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/config/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/share/pgpkeys/davidxu.key#1 branch .. //depot/projects/dtrace/doc/share/pgpkeys/pgpkeys-developers.sgml#9 integrate .. //depot/projects/dtrace/doc/share/pgpkeys/pgpkeys.ent#9 integrate .. //depot/projects/dtrace/doc/share/sgml/trademarks.ent#2 integrate .. //depot/projects/dtrace/ports/MOVED#5 integrate .. //depot/projects/dtrace/ports/Mk/bsd.linux-rpm.mk#2 integrate .. //depot/projects/dtrace/ports/Mk/bsd.scons.mk#3 integrate .. //depot/projects/dtrace/ports/Tools/portbuild/scripts/dopackagestats#3 integrate .. //depot/projects/dtrace/ports/Tools/scripts/addport#3 integrate .. //depot/projects/dtrace/ports/UPDATING#5 integrate .. //depot/projects/dtrace/src/etc/rc.d/mountcritlocal#3 integrate .. //depot/projects/dtrace/src/etc/rc.d/mountlate#1 branch .. //depot/projects/dtrace/src/lib/libthr/thread/thr_attr.c#4 integrate .. //depot/projects/dtrace/src/lib/libthr/thread/thr_create.c#3 integrate .. //depot/projects/dtrace/src/lib/libthr/thread/thr_getschedparam.c#4 integrate .. //depot/projects/dtrace/src/lib/libthr/thread/thr_init.c#4 integrate .. //depot/projects/dtrace/src/lib/libthr/thread/thr_private.h#5 integrate .. //depot/projects/dtrace/src/lib/libthr/thread/thr_setprio.c#3 integrate .. //depot/projects/dtrace/src/lib/libthr/thread/thr_setschedparam.c#4 integrate .. //depot/projects/dtrace/src/lib/libutil/kld.3#2 integrate .. //depot/projects/dtrace/src/sbin/mount/mount.8#4 integrate .. //depot/projects/dtrace/src/sbin/mount/mount.c#5 integrate .. //depot/projects/dtrace/src/share/man/man4/ipw.4#3 integrate .. //depot/projects/dtrace/src/share/man/man4/iwi.4#3 integrate .. //depot/projects/dtrace/src/share/man/man7/security.7#4 integrate .. //depot/projects/dtrace/src/share/man/man9/Makefile#5 integrate .. //depot/projects/dtrace/src/share/man/man9/sx.9#4 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/db_trace.c#3 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/intr_machdep.c#3 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/local_apic.c#3 integrate .. //depot/projects/dtrace/src/sys/amd64/include/specialreg.h#5 integrate .. //depot/projects/dtrace/src/sys/arm/arm/db_trace.c#3 integrate .. //depot/projects/dtrace/src/sys/arm/arm/gdb_machdep.c#1 branch .. //depot/projects/dtrace/src/sys/arm/include/gdb_machdep.h#1 branch .. //depot/projects/dtrace/src/sys/compat/freebsd32/syscalls.master#3 integrate .. //depot/projects/dtrace/src/sys/conf/files.arm#3 integrate .. //depot/projects/dtrace/src/sys/crypto/via/padlock.c#6 integrate .. //depot/projects/dtrace/src/sys/ddb/db_command.c#4 integrate .. //depot/projects/dtrace/src/sys/ddb/db_output.c#3 integrate .. //depot/projects/dtrace/src/sys/ddb/db_output.h#3 integrate .. //depot/projects/dtrace/src/sys/ddb/db_ps.c#6 integrate .. //depot/projects/dtrace/src/sys/ddb/db_thread.c#4 integrate .. //depot/projects/dtrace/src/sys/ddb/ddb.h#4 integrate .. //depot/projects/dtrace/src/sys/dev/bce/if_bce.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/mpt/mpt.c#8 integrate .. //depot/projects/dtrace/src/sys/dev/mpt/mpt.h#10 integrate .. //depot/projects/dtrace/src/sys/dev/mpt/mpt_cam.c#10 integrate .. //depot/projects/dtrace/src/sys/dev/mpt/mpt_debug.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/mpt/mpt_pci.c#9 integrate .. //depot/projects/dtrace/src/sys/dev/pci/pci.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/random/probe.c#3 integrate .. //depot/projects/dtrace/src/sys/fs/devfs/devfs_vnops.c#4 integrate .. //depot/projects/dtrace/src/sys/geom/geom.h#4 integrate .. //depot/projects/dtrace/src/sys/geom/mirror/g_mirror_ctl.c#4 integrate .. //depot/projects/dtrace/src/sys/geom/raid3/g_raid3_ctl.c#5 integrate .. //depot/projects/dtrace/src/sys/i386/i386/db_trace.c#3 integrate .. //depot/projects/dtrace/src/sys/i386/i386/identcpu.c#5 integrate .. //depot/projects/dtrace/src/sys/i386/i386/initcpu.c#3 integrate .. //depot/projects/dtrace/src/sys/i386/i386/intr_machdep.c#3 integrate .. //depot/projects/dtrace/src/sys/i386/i386/local_apic.c#4 integrate .. //depot/projects/dtrace/src/sys/i386/i386/machdep.c#5 integrate .. //depot/projects/dtrace/src/sys/i386/include/md_var.h#4 integrate .. //depot/projects/dtrace/src/sys/i386/include/specialreg.h#5 integrate .. //depot/projects/dtrace/src/sys/ia64/ia64/db_machdep.c#3 integrate .. //depot/projects/dtrace/src/sys/kern/init_sysent.c#7 integrate .. //depot/projects/dtrace/src/sys/kern/kern_intr.c#5 integrate .. //depot/projects/dtrace/src/sys/kern/kern_ktr.c#3 integrate .. //depot/projects/dtrace/src/sys/kern/kern_thr.c#6 integrate .. //depot/projects/dtrace/src/sys/kern/subr_prf.c#3 integrate .. //depot/projects/dtrace/src/sys/kern/subr_turnstile.c#5 integrate .. //depot/projects/dtrace/src/sys/kern/syscalls.c#6 integrate .. //depot/projects/dtrace/src/sys/kern/syscalls.master#6 integrate .. //depot/projects/dtrace/src/sys/kern/sysv_sem.c#4 integrate .. //depot/projects/dtrace/src/sys/nfs4client/nfs4_vnops.c#3 integrate .. //depot/projects/dtrace/src/sys/pc98/pc98/machdep.c#6 integrate .. //depot/projects/dtrace/src/sys/posix4/p1003_1b.c#5 integrate .. //depot/projects/dtrace/src/sys/powerpc/powerpc/db_trace.c#3 integrate .. //depot/projects/dtrace/src/sys/sparc64/sparc64/db_trace.c#3 integrate .. //depot/projects/dtrace/src/sys/sys/syscall.h#6 integrate .. //depot/projects/dtrace/src/sys/sys/syscall.mk#6 integrate .. //depot/projects/dtrace/src/sys/sys/sysproto.h#6 integrate .. //depot/projects/dtrace/src/sys/sys/thr.h#4 integrate .. //depot/projects/dtrace/src/tools/tools/nanobsd/nanobsd.sh#3 integrate .. //depot/projects/dtrace/src/usr.bin/kdump/kdump.c#5 integrate .. //depot/projects/dtrace/src/usr.bin/kdump/mksubr#2 integrate .. //depot/projects/dtrace/www/en/advocacy/myths.sgml#2 integrate .. //depot/projects/dtrace/www/en/donations/wantlist.sgml#7 integrate .. //depot/projects/dtrace/www/en/news/news.xml#14 integrate .. //depot/projects/dtrace/www/en/projects/Makefile#3 integrate .. //depot/projects/dtrace/www/en/projects/gnats4/Makefile#2 delete .. //depot/projects/dtrace/www/en/projects/gnats4/index.sgml#2 delete .. //depot/projects/dtrace/www/en/projects/gnats4/style.css#2 delete .. //depot/projects/dtrace/www/en/projects/nanobsd/Makefile#2 delete .. //depot/projects/dtrace/www/en/projects/nanobsd/index.sgml#2 delete .. //depot/projects/dtrace/www/en/projects/nanobsd/style.css#2 delete .. //depot/projects/dtrace/www/en/projects/projects.sgml#5 integrate .. //depot/projects/dtrace/www/share/sgml/advisories.xml#5 integrate .. //depot/projects/dtrace/www/zh_CN/Makefile#2 integrate .. //depot/projects/dtrace/www/zh_CN/news/news-rdf.xsl#2 integrate .. //depot/projects/dtrace/www/zh_CN/news/news.xml#2 integrate .. //depot/projects/dtrace/www/zh_CN/news/press.xml#2 integrate .. //depot/projects/dtrace/www/zh_TW/Makefile#2 integrate Differences ... ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#15 (text+ko) ==== @@ -1,4 +1,4 @@ - + + + + &a.tmm; (2001 - 2006) + + + &a.hanai; (1997 - 2006) ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/config/chapter.sgml#3 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -690,7 +690,7 @@ - Using rc under &os; 5.X and newer + Using rc under &os; In 2002 &os; integrated the NetBSD rc.d system for system initialization. @@ -2022,8 +2022,8 @@ require many thousands of file descriptors, depending on the kind and number of services running concurrently. - kern.maxfile's default value is - dictated by the option in your + In older FreeBSD releases, kern.maxfile's default + value is derived from the option in your kernel configuration file. kern.maxfiles grows proportionally to the value of . When compiling a custom kernel, it is a good idea to set this kernel @@ -2033,7 +2033,24 @@ connected at once, the resources needed may be similar to a high-scale web server. - The system will auto-tune + As of FreeBSD 4.5, kern.maxusers is + automatically sized at boot based on the amount of memory available + in the system, and may be determined at run-time by inspecting the + value of the read-only kern.maxusers sysctl. + Some sites will require larger or smaller values of + kern.maxusers and may set it as a loader tunable; + values of 64, 128, and 256 are not uncommon. We do not recommend + going above 256 unless you need a huge number of file descriptors; + many of the tunable values set to their defaults by + kern.maxusers may be individually overridden at + boot-time or run-time in /boot/loader.conf (see + the &man.loader.conf.5; man page or the + /boot/defaults/loader.conf file for some hints) + or as described elsewhere in this document. Systems older than + FreeBSD 4.4 must set this value via the kernel &man.config.8; + option instead. + + In older releases, the system will auto-tune maxusers for you if you explicitly set it to 0 The auto-tuning algorithm sets ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml#2 (text+ko) ==== @@ -1,6 +1,6 @@ @@ -228,59 +228,67 @@ &prompt.user; mozilla -mail + + Firefox + + Firefox + + + Firefox is the next-generation + browser based on the Mozilla + codebase. Mozilla is a complete + suite of applications, such as a browser, a mail client, a chat + client and much more. Firefox is + just a browser, which makes it smaller and faster. + + Install the package by typing: + + &prompt.root; pkg_add -r firefox + + You can also use the Ports Collection if you + prefer to compile from source code: + + &prompt.root; cd /usr/ports/www/firefox +&prompt.root; make install clean + + - - - - Tom - Rhodes - Contributed by - - - + Firefox, Mozilla and &java; plugin + + + In this section and in the next one, we assume you + already installed Firefox or + Mozilla. + - Mozilla and &java; plugin - - Installing Mozilla is simple, but - unfortunately installing Mozilla with - support for add-ons like &java; and - ¯omedia; &flash; - consumes both time and disk - space. + The &os; Foundation has a license with Sun Microsystems to + distribute &os; binaries for the Java Runtime Environment + (&jre;) and Java Development Kit (&jdk;). Binary packages for + &os; are available on the &os; + Foundation web site. - The first thing is to download the files which will be used - with Mozilla. Take your current web - browser up to - and - create an account on their website. Remember to save the username - and password from here as it may be needed in the future. Download - the jdk-1_5_0-bin-scsl.zip (JDK 5.0 - SCSL Binaries) and jdk-1_5_0-src-scsl.zip (JDK 5.0 - SCSL Source) files and place them in - /usr/ports/distfiles as the port will not - fetch them automatically. This is due to license restrictions. While - we are here, download the java environment from - . - The filename is j2sdk-1_4_2_08-linux-i586.bin. - Like before, this file must be placed into - /usr/ports/distfiles. Download a copy - of the java patchkit from - - and place it - into /usr/ports/distfiles. Finally, install the - java/jdk15 port - with the standard make install clean. + To add &java; support to + Firefox or + Mozilla, you have to install, at + first, the java/javavmwrapper port. Then, + download the Diablo &jre; package + from , + and install it with &man.pkg.add.1;. - Start Mozilla and access the - About Plug-ins option from the - Help menu. &java; + Start your browser, enter + about:plugins in the location bar and press + Enter. A page regarding installed plugins + will be displayed, the &java; plugin should be listed there now. - Mozilla and ¯omedia; &flash; plugin + Firefox, Mozilla and ¯omedia; &flash; plugin ¯omedia; &flash; plugin is not available for &os;. However, a software layer (wrapper) for running the Linux version of the plugin @@ -296,16 +304,38 @@ /usr/local/share/examples/linuxpluginwrapper/ directory. - Install the www/mozilla port, - if Mozilla is not already installed. + The next step is to install the www/linux-flashplugin7 port. Once + the plugin is installed, start your browser, enter + about:plugins in the location bar and press + Enter. + A list should appear with all the currently + available plugins. + + If the &flash; plugin is not listed, this is, most of time, + caused by a missing symlink. As root, + run the following commands: + + &prompt.root; ln -s /usr/X11R6/lib/linux-flashplugin7/libflashplayer.so \ + /usr/X11R6/lib/browser_plugins/ +&prompt.root; ln -s /usr/X11R6/lib/linux-flashplugin7/flashplayer.xpt \ + /usr/X11R6/lib/browser_plugins/ - Now just start Mozilla with: + If you restart your browser the plugin should now appears + in the previously mentioned list. Your browser may also crash + when playing some &flash; animations, in this case a patch + can help you: - &prompt.user; mozilla & + &prompt.root; cd /usr/src +&prompt.root; fetch http://people.FreeBSD.org/~nork/rtld_dlsym_hack.diff +&prompt.root; patch < rtld_dlsym_hack.diff +&prompt.root; cd libexec/rtld-elf/ +&prompt.root; make clean +&prompt.root; make obj +&prompt.root; make depend +&prompt.root; make && make install - And access the About Plug-ins option from the - Help menu. A list should appear with all the currently - available plugins. + Then reboot your machine. The linuxpluginwrapper only works on @@ -354,29 +384,6 @@ - Firefox - - Firefox - - - Firefox is the next-generation - browser based on the Mozilla - codebase. Mozilla is a complete - suite of applications, such as a browser, a mail client, a chat - client and much more. Firefox is - just a browser, which makes it smaller and faster. - - Install the package by typing: - - &prompt.root; pkg_add -r firefox - - You can also use the Ports Collection if you - prefer to compile from source code: - - &prompt.root; cd /usr/ports/www/firefox -&prompt.root; make install clean - - Konqueror Konqueror ==== //depot/projects/dtrace/doc/share/pgpkeys/pgpkeys-developers.sgml#9 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -1048,3 +1048,9 @@ &a.phantom; &pgpkey.phantom; + + + &a.davidxu; + &pgpkey.davidxu; + + ==== //depot/projects/dtrace/doc/share/pgpkeys/pgpkeys.ent#9 (text+ko) ==== @@ -1,5 +1,5 @@ - + @@ -50,6 +50,7 @@ + ==== //depot/projects/dtrace/doc/share/sgml/trademarks.ent#2 (text+ko) ==== @@ -8,7 +8,7 @@ Please keep this file sorted. - $FreeBSD: doc/share/sgml/trademarks.ent,v 1.30 2005/09/11 07:43:18 yar Exp $ + $FreeBSD: doc/share/sgml/trademarks.ent,v 1.31 2006/07/13 09:44:21 blackend Exp $ --> 3Com and HomeConnect are registered @@ -305,6 +305,7 @@ Java Virtual Machine"> JavaServer Pages"> JDK"> +JRE"> JSP"> JVM"> Netra"> ==== //depot/projects/dtrace/ports/MOVED#5 (text+ko) ==== @@ -1,7 +1,7 @@ # # MOVED - a list of (recently) moved or removed ports # -# $FreeBSD: ports/MOVED,v 1.1093 2006/07/11 17:52:45 lbr 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 @@ -2411,3 +2410,4 @@ 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/dtrace/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/dtrace/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.3 2006/07/05 19:53:27 linimon Exp $ +# $FreeBSD: ports/Mk/bsd.scons.mk,v 1.4 2006/07/13 22:10:39 alepulver Exp $ # # bsd.scons.mk - Python-based SCons build system interface. # Author: Alexander Botero-Lowry @@ -30,14 +30,16 @@ # Some scons projects may honor PKGCONFIGDIR, which tells them where to # look for, and install, pkgconfig files. # +# LIBPATH is the search path for libraries. Bring in some safe defaults. +# +# CPPPATH is the search path for includes, Again, bring in some safe defaults. +# CCFLAGS?= ${CFLAGS} LINKFLAGS?= ${LDFLAGS} PKGCONFIGDIR?= ${LOCALBASE}/libdata/pkgconfig +LIBPATH= ${LOCALBASE}/lib ${X11BASE}/lib +CPPPATH= ${LOCALBASE}/include ${X11BASE}/include -CCFLAGS+= -I${LOCALBASE}/include -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 @@ -53,8 +55,9 @@ # argument to scons. # SCONS_ENV?= CCFLAGS="${CCFLAGS}" CXXFLAGS="${CXXFLAGS}" \ - LINKFLAGS="${LINKFLAGS}" PKGCONFIGDIR="${PKGCONFIGDIR}" \ - PREFIX="${PREFIX}" CC="${CC}" CXX="${CXX}" + LINKFLAGS="${LINKFLAGS}" PKGCONFIGDIR="${PKGCONFIGDIR}" \ + CPPPATH="${CPPPATH}" LIBPATH="${LIBPATH}" PREFIX="${PREFIX}" \ + CC="${CC}" CXX="${CXX}" SCONS_ARGS?= SCONS_BUILDENV?= SCONS_TARGET?= ==== //depot/projects/dtrace/ports/Tools/portbuild/scripts/dopackagestats#3 (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 "" >> ${TMPFILE} echo "" >> ${TMPFILE} echo "" >> ${TMPFILE} - echo "" >> ${TMPFILE} + echo "" >> ${TMPFILE} + echo "" >> ${TMPFILE} echo "" >> ${TMPFILE} echo "" >> ${TMPFILE} echo "" >> ${TMPFILE} @@ -58,6 +59,15 @@ indexfile=$directory/ports/INDEX-$branch fi + # column: date of CVS checkout + cvsdone=" " + if [ -f $directory/cvsdone ]; then + cvsdone="$(cat $directory/cvsdone | awk '{printf("%s %s\n",$2,$3)}')" + if [ -z "$cvsdone" ]; then + cvsdone=" " + fi + fi + # column: datestamp of latest log latest=" " if [ -d $directory/logs ]; then @@ -121,6 +131,7 @@ # now write the row echo "" >> ${TMPFILE} echo "" >> ${TMPFILE} + echo "" >> ${TMPFILE} echo "" >> ${TMPFILE} echo "" >> ${TMPFILE} echo "
 as ofcvs datelatest logINDEXpackageserrors
$arch-$build$cvsdone$latest$n_index" >> ${TMPFILE} @@ -143,7 +154,8 @@ write_footer () { echo "

explanation of columns:

" >> ${TMPFILE} echo "
    " >> ${TMPFILE} - echo "
  • as of is the date of the latest logfile.
    • " >> ${TMPFILE} + echo "
  • latest log is the date of the latest logfile.
    • " >> ${TMPFILE} + echo "
  • cvs date is the date of the latest CVS checkout done by the script. It may be inaccurate if a manual checkout was done later.
    • " >> ${TMPFILE} echo "
  • INDEX is number of ports in the INDEX file built from the latest cvs checkout.
    • " >> ${TMPFILE} echo "
  • packages is number of packages successfully built.
    • " >> ${TMPFILE} echo "
  • errors is number of packages that failed.
    • " >> ${TMPFILE} @@ -152,6 +164,11 @@ echo "
  • done is whether that run terminated normally or not.
    • " >> ${TMPFILE} echo "
" >> ${TMPFILE} + echo "

notes:

" >> ${TMPFILE} + echo "
    " >> ${TMPFILE} + echo "
  • on the -exp builds, editors/openoffice.org* are skipped to save time.
    • " >> ${TMPFILE} + echo "
" >> ${TMPFILE} + echo "" >> ${TMPFILE} echo "" >> ${TMPFILE} } ==== //depot/projects/dtrace/ports/Tools/scripts/addport#3 (text+ko) ==== @@ -32,7 +32,7 @@ # # Id: addport,v 1.2 2000/04/02 06:21:13 will Exp (original shell script) # Id: addport,v 1.5 2000/04/22 22:19:43 mharo Exp (perl conversion) -# $FreeBSD: ports/Tools/scripts/addport,v 1.49 2006/07/04 23:12:10 garga Exp $ +# $FreeBSD: ports/Tools/scripts/addport,v 1.50 2006/07/14 01:49:35 shaun Exp $ # # MAINTAINER= garga@FreeBSD.org # @@ -57,12 +57,13 @@ my %opts; -getopts('ac:d:fgh:il:L:M:mns:tu:', \%opts); +getopts('abc:d:fgh:il:L:M:mns:tu:', \%opts); my $autofill_l = $opts{'l'}; my $autofill_L = $opts{'L'}; my $autofill = ($autofill_l ? $autofill_l : $autofill_L); my $c = $opts{'c'} if ($opts{'c'} ne ""); +my $binfiles = $opts{'b'}; my $nomodules = $opts{'g'}; my $distdir = $opts{'s'} if ($opts{'s'} ne ""); my $dir = $opts{'d'}; @@ -321,7 +322,23 @@ chdir $category or err(1,"$category"); system("$cp -PRp $thisdir ."); system("$cvs $n add `find $portname -type d | grep -v CVS`") && errx(1, "cvs add for dirs failed, aborting."); - system("$cvs $n add `find $portname -type f | grep -v CVS`") && errx(1, "cvs add for files failed, aborting."); + + my $gotfiles = 0; + if ($binfiles) { + if (-d "$portname/files") { + my (@pf, $fd); + opendir($fd, "$portname/files") and + @pf = grep { /^.*patch-.*$/ } readdir($fd); + $gotfiles = ++$#pf; + } + } + + if ($binfiles && $gotfiles > 0) { + system("$cvs $n add `find $portname -type f | grep -v CVS | grep -v '^$portname/files/.*patch-.*'`") && errx(1, "cvs add for files failed, aborting."); + system("$cvs $n add -ko `find $portname -type f | grep -v CVS | grep '^$portname/files/.*patch-.*'`") && errx(1, "cvs add for files failed, aborting."); + } else { + system("$cvs $n add `find $portname -type f | grep -v CVS`") && errx(1, "cvs add for files failed, aborting."); + } # figure out where the port name belongs in category Makefile my @ports = &lsports; @@ -417,7 +434,7 @@ SYNOPSIS $0 [-c commitfile] [-h host] [-l PR number] [-s distdir] [-u user] - [-afgimnt] -d directory + [-abfgimnt] -d directory Where "directory" contains the comma-delimited list of root directories of new ports that you wish to @@ -427,6 +444,8 @@ OPTIONS -a Perform checks on the port to make sure there are no problems. Recommended. + -b Add all patch-* files in \${FILESDIR} as binary + files (i.e. don't expand CVS tags) -c file Use file in place of normal log message. -f Do not fetch the distfile. -g Do not commit to CVSROOT/modules. ==== //depot/projects/dtrace/ports/UPDATING#5 (text+ko) ==== @@ -6,6 +6,14 @@ 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 @@ -3808,4 +3816,4 @@ 2) Update all p5-* modules. portupgrade -f p5-\* -$FreeBSD: ports/UPDATING,v 1.360 2006/07/12 00:16:31 kuriyama Exp $ +$FreeBSD: ports/UPDATING,v 1.361 2006/07/13 12:03:50 garga Exp $ ==== //depot/projects/dtrace/src/etc/rc.d/mountcritlocal#3 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: mountcritlocal,v 1.7 2002/04/29 12:29:53 lukem Exp $ -# $FreeBSD: src/etc/rc.d/mountcritlocal,v 1.12 2004/10/07 13:55:26 mtm Exp $ +# $FreeBSD: src/etc/rc.d/mountcritlocal,v 1.13 2006/07/12 16:05:51 des Exp $ # # PROVIDE: mountcritlocal @@ -27,6 +27,7 @@ esac # Mount everything except nfs filesystems. + echo -n 'Mounting local file systems:' mount_excludes='no' for i in ${netfs_types}; do fstype=${i%:*} @@ -34,6 +35,7 @@ done mount_excludes=${mount_excludes%,} mount -a -t ${mount_excludes} + echo '.' case $? in 0) ==== //depot/projects/dtrace/src/lib/libthr/thread/thr_attr.c#4 (text+ko) ==== @@ -93,7 +93,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libthr/thread/thr_attr.c,v 1.6 2006/04/27 08:18:23 davidxu Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_attr.c,v 1.7 2006/07/12 06:13:18 davidxu Exp $ */ #include "namespace.h" @@ -434,9 +434,17 @@ policy = (*attr)->sched_policy; - if (param->sched_priority < _thr_priorities[policy-1].pri_min || - param->sched_priority > _thr_priorities[policy-1].pri_max) + if (policy == SCHED_FIFO || policy == SCHED_RR) { + if (param->sched_priority < _thr_priorities[policy-1].pri_min || + param->sched_priority > _thr_priorities[policy-1].pri_max) return (ENOTSUP); + } else { + /* + * Ignore it for SCHED_OTHER now, patches for glib ports + * are wrongly using M:N thread library's internal macro + * THR_MIN_PRIORITY and THR_MAX_PRIORITY. + */ + } (*attr)->prio = param->sched_priority; ==== //depot/projects/dtrace/src/lib/libthr/thread/thr_create.c#3 (text+ko) ==== @@ -24,7 +24,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libthr/thread/thr_create.c,v 1.29 2006/04/04 02:57:49 davidxu Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_create.c,v 1.32 2006/07/13 22:45:19 davidxu Exp $ */ #include "namespace.h" @@ -50,6 +50,7 @@ { struct pthread *curthread, *new_thread; struct thr_param param; + struct thr_sched_param sched_param; int ret = 0, locked, create_suspended; sigset_t set, oset; @@ -78,10 +79,9 @@ new_thread->attr.flags |= PTHREAD_SCOPE_SYSTEM; else new_thread->attr.flags &= ~PTHREAD_SCOPE_SYSTEM; - /* - * scheduling policy and scheduling parameters will be - * inherited in following code. - */ + + new_thread->attr.prio = curthread->attr.prio; + new_thread->attr.sched_policy = curthread->attr.sched_policy; } if (_thr_scope_system > 0) @@ -105,30 +105,6 @@ new_thread->arg = arg; new_thread->cancelflags = PTHREAD_CANCEL_ENABLE | PTHREAD_CANCEL_DEFERRED; - /* - * Check if this thread is to inherit the scheduling - * attributes from its parent: - */ - if (new_thread->attr.sched_inherit == PTHREAD_INHERIT_SCHED) { - /* - * Copy the scheduling attributes. Lock the scheduling - * lock to get consistent scheduling parameters. - */ - THR_LOCK(curthread); - new_thread->base_priority = curthread->base_priority; - new_thread->attr.prio = curthread->base_priority; - new_thread->attr.sched_policy = curthread->attr.sched_policy; - THR_UNLOCK(curthread); - } else { - /* - * Use just the thread priority, leaving the - * other scheduling attributes as their - * default values: - */ - new_thread->base_priority = new_thread->attr.prio; - } - new_thread->active_priority = new_thread->base_priority; - /* Initialize the mutex queue: */ TAILQ_INIT(&new_thread->mutexq); @@ -166,6 +142,14 @@ param.flags = 0; if (new_thread->attr.flags & PTHREAD_SCOPE_SYSTEM) param.flags |= THR_SYSTEM_SCOPE; + if (new_thread->attr.sched_inherit == PTHREAD_INHERIT_SCHED) + param.sched_param = NULL; + else { + param.sched_param = &sched_param; + param.sched_param_size = sizeof(sched_param); + sched_param.policy = new_thread->attr.sched_policy; + sched_param.param.sched_priority = new_thread->attr.prio; + } /* Schedule the new thread. */ if (create_suspended) { @@ -177,6 +161,15 @@ ret = thr_new(¶m, sizeof(param)); + if (ret != 0) { + ret = errno; + /* + * Translate EPROCLIM into well-known POSIX code EAGAIN. + */ + if (ret == EPROCLIM) + ret = EAGAIN; + } + if (create_suspended) __sys_sigprocmask(SIG_SETMASK, &oset, NULL); @@ -196,7 +189,6 @@ _thr_ref_delete_unlocked(curthread, new_thread); THREAD_LIST_UNLOCK(curthread); (*thread) = 0; - ret = EAGAIN; } else if (locked) { _thr_report_creation(curthread, new_thread); THR_THREAD_UNLOCK(curthread, new_thread); ==== //depot/projects/dtrace/src/lib/libthr/thread/thr_getschedparam.c#4 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libthr/thread/thr_getschedparam.c,v 1.5 2006/04/27 08:18:23 davidxu Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_getschedparam.c,v 1.8 2006/07/13 22:45:19 davidxu Exp $ */ #include "namespace.h" @@ -46,32 +46,30 @@ struct sched_param *param) { struct pthread *curthread = _get_curthread(); - int ret, tmp; + int ret; + + if (policy == NULL || param == NULL) + return (EINVAL); - if ((param == NULL) || (policy == NULL)) - /* Return an invalid argument error: */ - ret = EINVAL; - else if (pthread == curthread) { + if (pthread == curthread) { /* * Avoid searching the thread list when it is the current * thread. */ - THR_THREAD_LOCK(curthread, curthread); - param->sched_priority = pthread->base_priority; - tmp = pthread->attr.sched_policy; - THR_THREAD_UNLOCK(curthread, curthread); - *policy = tmp; + THR_LOCK(curthread); + *policy = curthread->attr.sched_policy; + param->sched_priority = curthread->attr.prio; + THR_UNLOCK(curthread); ret = 0; } /* Find the thread in the list of active threads. */ else if ((ret = _thr_ref_add(curthread, pthread, /*include dead*/0)) == 0) { THR_THREAD_LOCK(curthread, pthread); - param->sched_priority = pthread->base_priority; - tmp = pthread->attr.sched_policy; + *policy = pthread->attr.sched_policy; + param->sched_priority = pthread->attr.prio; THR_THREAD_UNLOCK(curthread, pthread); _thr_ref_delete(curthread, pthread); - *policy = tmp; } return (ret); } ==== //depot/projects/dtrace/src/lib/libthr/thread/thr_init.c#4 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libthr/thread/thr_init.c,v 1.34 2006/04/27 08:18:23 davidxu Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_init.c,v 1.36 2006/07/13 22:45:19 davidxu Exp $ */ >>> TRUNCATED FOR MAIL (1000 lines) <<<