From owner-p4-projects@FreeBSD.ORG Fri Dec 31 21:14:00 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3954D1065674; Fri, 31 Dec 2010 21:14:00 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EF7B5106564A for ; Fri, 31 Dec 2010 21:13:59 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id DB5328FC14 for ; Fri, 31 Dec 2010 21:13:59 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id oBVLDx0S039370 for ; Fri, 31 Dec 2010 21:13:59 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id oBVLDxoI039367 for perforce@freebsd.org; Fri, 31 Dec 2010 21:13:59 GMT (envelope-from rene@FreeBSD.org) Date: Fri, 31 Dec 2010 21:13:59 GMT Message-Id: <201012312113.oBVLDxoI039367@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 187360 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 31 Dec 2010 21:14:00 -0000 http://p4web.freebsd.org/@@187360?ac=10 Change 187360 by rene@rene_acer on 2010/12/31 21:13:25 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#82 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#25 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml#16 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/disks/chapter.sgml#17 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/preface/preface.sgml#8 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#97 integrate .. //depot/projects/docproj_nl/share/pgpkeys/ache.key#2 integrate .. //depot/projects/docproj_nl/www/en/cgi/cgi-style.pl#6 integrate .. //depot/projects/docproj_nl/www/en/cgi/man.cgi#20 integrate .. //depot/projects/docproj_nl/www/en/cgi/ports.cgi#5 integrate .. //depot/projects/docproj_nl/www/en/internal/machines.sgml#7 integrate .. //depot/projects/docproj_nl/www/en/projects/newbies.sgml#3 integrate .. //depot/projects/docproj_nl/www/en/releases/7.4R/schedule.sgml#2 integrate .. //depot/projects/docproj_nl/www/en/releases/8.2R/schedule.sgml#2 integrate .. //depot/projects/docproj_nl/www/en/releng/index.sgml#39 integrate .. //depot/projects/docproj_nl/www/en/where.sgml#9 integrate .. //depot/projects/docproj_nl/www/nl/where.sgml#21 integrate .. //depot/projects/docproj_nl/www/share/sgml/commercial.consult.xml#27 integrate .. //depot/projects/docproj_nl/www/share/sgml/events.xml#36 integrate .. //depot/projects/docproj_nl/www/share/sgml/header.ent#7 integrate .. //depot/projects/docproj_nl/www/share/sgml/news.xml#97 integrate .. //depot/projects/docproj_nl/www/share/sgml/release.ent#30 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#82 (text+ko) ==== @@ -1,4 +1,4 @@ - + @@ -3037,31 +3037,33 @@ As a part of the &os; development lifecycle, it happens from time to time that files and their contents become obsolete. This may be - because their functionality is implemented elsewhere or is removed from - the system entirely. This includes old files, libraries and - directories, which should be removed when updating the system. The - benefit for the user is that the system is not cluttered with old files - which take up unnecessary space on the storage (and backup) medium. The - files, directories, and libraries that are considered obsolete are listed - in /usr/src/ObsoleteFiles.inc. The following + because their functionality is implemented elsewhere, the version number + of the library has changed or it was removed from the system entirely. + This includes old files, libraries and directories, which should + be removed when updating the system. The benefit for the user is that + the system is not cluttered with old files which take up unnecessary + space on the storage (and backup) medium. Additionally, if the old + library had a security or stability issue, you should update to the + newer library to keep your system safe and prevent crashes caused by + the old library implementation. The files, directories, and libraries + that are considered obsolete are listed in + /usr/src/ObsoleteFiles.inc. The following instructions will help you removing these obsolete files during the system upgrade process. We assume you are following the steps outlined in . After the make - installworld command completed - successfully, you should check for obsolete files and libraries as - follows: + installworld and the subsequent + mergemaster commands have finished successfully, you + should check for obsolete files and libraries as follows: &prompt.root; cd /usr/src -&prompt.root; make check-old -&prompt.root; make check-old-libs +&prompt.root; make check-old If any obsolete files are found, they can be deleted using the following commands: - &prompt.root; make delete-old -&prompt.root; make delete-old-libs + &prompt.root; make delete-old See /usr/src/Makefile @@ -3070,23 +3072,29 @@ A prompt is displayed before deleting each obsolete file. You can skip the prompt and let the system remove these files automatically by - setting the BATCH_DELETE_OLD_FILES environment - variable to yes. You can also achieve the same goal - by piping these commands through yes like this: + using the BATCH_DELETE_OLD_FILES make-variable as + follows: + + &prompt.root; make -DBATCH_DELETE_OLD_FILES delete-old + + You can also achieve the same goal by piping these commands through + yes like this: - &prompt.root; yes|make delete-old -&prompt.root; yes|make delete-old-libs + &prompt.root; yes|make delete-old Warning Deleting obsolete files will break applications that still - depend on those obsolete files. + depend on those obsolete files. This is especially true for old + libraries. In most cases, you need to recompile the programs, ports, + or libraries that used the old library before make + delete-old-libs is executed. Utilities for checking shared library dependencies are available from - the Ports Collection - in sysutils/libchk - or sysutils/bsdadminscripts. + the Ports Collection in sysutils/libchk or sysutils/bsdadminscripts. Obsolete shared libraries can conflict with newer libraries, causing messages like these: @@ -3103,8 +3111,13 @@ /usr/local/lib/libXext.so was installed by package libXext-1.1.1,1 Then deinstall, rebuild and reinstall the port. The ports-mgmt/portmaster utility can be used to - automate this process. + role="package">ports-mgmt/portmaster and ports-mgmt/portupgrade utilities can be used to + automate this process. After you've made sure that all ports are rebuilt + and do not use the old libraries anymore, you can delete them using the + following command: + + &prompt.root; make delete-old-libs ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml#16 (text+ko) ==== @@ -1,6 +1,6 @@ @@ -202,7 +202,7 @@ Firefox and &java; Plugin - In this section and in the next one, we assume you have + In this section and in the next two sections, we assume you have already installed Firefox. Currently, the &java; plugin does not work with ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/disks/chapter.sgml#17 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -427,7 +427,7 @@ identifying the correct jumper. Next, consider how to attach them as part of the file - system. You should research both &man.vinum.8; () and &man.ccd.4;. In this particular configuration, &man.ccd.4; was chosen. @@ -585,11 +585,11 @@ from the block device interface and maps data in ways which result in an increase in flexibility, performance and reliability compared to the traditional slice view of disk - storage. &man.vinum.8; implements the RAID-0, RAID-1 and + storage. &man.vinum.4; implements the RAID-0, RAID-1 and RAID-5 models, both individually and in combination. See for more - information about &man.vinum.8;. + information about &man.vinum.4;. ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/preface/preface.sgml#8 (text+ko) ==== @@ -1,5 +1,5 @@ @@ -8,8 +8,8 @@ Intended Audience - The FreeBSD newcomer will find that the first section of this - book guides the user through the FreeBSD installation process and + The &os; newcomer will find that the first section of this + book guides the user through the &os; installation process and gently introduces the concepts and conventions that underpin &unix;. Working through this section requires little more than the desire to explore, and the ability to take on board new concepts as they @@ -17,7 +17,7 @@ Once you have traveled this far, the second, far larger, section of the Handbook is a comprehensive reference to all manner - of topics of interest to FreeBSD system administrators. Some of + of topics of interest to &os; system administrators. Some of these chapters may recommend that you do some prior reading, and this is noted in the synopsis at the beginning of each chapter. @@ -63,7 +63,7 @@ Second Edition (2004) The third edition was the culmination of over two years of - work by the dedicated members of the FreeBSD Documentation + work by the dedicated members of the &os; Documentation Project. The printed edition grew to such a size that it was necessary to publish as two separate volumes. The following are the major changes in this new edition: @@ -86,7 +86,7 @@ , Mandatory Access Control (MAC), is a new chapter with this edition. It explains what MAC is - and how this mechanism can be used to secure a FreeBSD + and how this mechanism can be used to secure a &os; system. @@ -129,7 +129,7 @@ , Advanced Networking, has been expanded with new information about - using &bluetooth; devices with FreeBSD, setting up wireless + using &bluetooth; devices with &os;, setting up wireless networks, and Asynchronous Transfer Mode (ATM) networking. @@ -150,7 +150,7 @@ First Edition (2001) The second edition was the culmination of over two years of - work by the dedicated members of the FreeBSD Documentation + work by the dedicated members of the &os; Documentation Project. The following were the major changes in this edition: @@ -174,7 +174,7 @@ Appendices. - (Installing FreeBSD) was completely + (Installing &os;) was completely rewritten with many screenshots to make it much easier for new users to grasp the text. @@ -194,7 +194,7 @@ technologies such as KDE and GNOME on &xfree86; 4.X. - (The FreeBSD Booting Process) has been + (The &os; Booting Process) has been expanded. @@ -206,7 +206,7 @@ (Serial Communications) has been completely - reorganized and updated for FreeBSD 4.X/5.X. + reorganized and updated for &os; 4.X/5.X. (PPP and SLIP) has been substantially @@ -246,11 +246,11 @@ This book is split into five logically distinct sections. The first section, Getting Started, covers - the installation and basic usage of FreeBSD. It is expected that + the installation and basic usage of &os;. It is expected that the reader will follow these chapters in sequence, possibly skipping chapters covering familiar topics. The second section, Common Tasks, covers some frequently used - features of FreeBSD. This section, and all subsequent sections, + features of &os;. This section, and all subsequent sections, can be read out of order. Each chapter begins with a succinct synopsis that describes what the chapter covers and what the reader is expected @@ -269,8 +269,8 @@ , Introduction - Introduces FreeBSD to a new user. It describes the - history of the FreeBSD Project, its goals and development model. + Introduces &os; to a new user. It describes the + history of the &os; Project, its goals and development model. @@ -285,7 +285,7 @@ , &unix; Basics Covers the basic commands and functionality of the - FreeBSD operating system. If you are familiar with &linux; or + &os; operating system. If you are familiar with &linux; or another flavor of &unix; then you can probably skip this chapter. @@ -294,7 +294,7 @@ , Installing Applications Covers the installation of third-party software with - both FreeBSD's innovative Ports Collection and standard + both &os;'s innovative Ports Collection and standard binary packages. @@ -302,7 +302,7 @@ , The X Window System Describes the X Window System in general and using - X11 on FreeBSD in particular. Also describes common + X11 on &os; in particular. Also describes common desktop environments such as KDE and GNOME. @@ -314,7 +314,7 @@ Lists some common desktop applications, such as web browsers and productivity suites, and describes how to install them on - FreeBSD. + &os;. @@ -325,7 +325,7 @@ - , Configuring the FreeBSD + , Configuring the &os; Kernel Explains why you might need to configure a new kernel @@ -336,7 +336,7 @@ , Printing - Describes managing printers on FreeBSD, including + Describes managing printers on &os;, including information about banner pages, printer accounting, and initial setup. @@ -344,9 +344,9 @@ , &linux; Binary Compatibility - Describes the &linux; compatibility features of FreeBSD. + Describes the &linux; compatibility features of &os;. Also provides detailed installation instructions for many - popular &linux; applications such as &oracle;, &sap.r3;, and + popular &linux; applications such as &oracle; and &mathematica;. @@ -357,15 +357,15 @@ , Configuration and Tuning Describes the parameters available for system - administrators to tune a FreeBSD system for optimum + administrators to tune a &os; system for optimum performance. Also describes the various configuration files - used in FreeBSD and where to find them. + used in &os; and where to find them. , Booting Process - Describes the FreeBSD boot process and explains + Describes the &os; boot process and explains how to control this process with configuration options. @@ -382,7 +382,7 @@ , Security Describes many different tools available to help keep your - FreeBSD system secure, including Kerberos, IPsec and OpenSSH. + &os; system secure, including Kerberos, IPsec and OpenSSH. @@ -396,7 +396,7 @@ , Mandatory Access Control Explains what Mandatory Access Control (MAC) is and how this - mechanism can be used to secure a FreeBSD system. + mechanism can be used to secure a &os; system. @@ -411,7 +411,7 @@ , Storage Describes how to manage storage media and filesystems - with FreeBSD. This includes physical disks, RAID arrays, + with &os;. This includes physical disks, RAID arrays, optical and tape media, memory-backed disks, and network filesystems. @@ -419,7 +419,7 @@ , GEOM - Describes what the GEOM framework in FreeBSD is and how + Describes what the GEOM framework in &os; is and how to configure various supported RAID levels. @@ -448,7 +448,7 @@ , Localization - Describes how to use FreeBSD in languages other than + Describes how to use &os; in languages other than English. Covers both system and application level localization. @@ -456,8 +456,8 @@ , Updating and Upgrading &os; - Explains the differences between FreeBSD-STABLE, - FreeBSD-CURRENT, and FreeBSD releases. Describes which users + Explains the differences between &os;-STABLE, + &os;-CURRENT, and &os; releases. Describes which users would benefit from tracking a development system and outlines that process. Covers the methods users may take to update their system to the latest security release. @@ -478,14 +478,14 @@ , Serial Communications Explains how to connect terminals and modems to your - FreeBSD system for both dial in and dial out connections. + &os; system for both dial in and dial out connections. , PPP and SLIP Describes how to use PPP, SLIP, or PPP over Ethernet to - connect to remote systems with FreeBSD. + connect to remote systems with &os;. @@ -501,7 +501,7 @@ , Network Servers Provides detailed instructions and example configuration - files to set up your FreeBSD machine as a network filesystem + files to set up your &os; machine as a network filesystem server, domain name server, network information system server, or time synchronization server. @@ -511,7 +511,7 @@ Explains the philosophy behind software-based firewalls and provides detailed information about the configuration of the - different firewalls available for FreeBSD. + different firewalls available for &os;. @@ -527,11 +527,11 @@ - , Obtaining FreeBSD + , Obtaining &os; - Lists different sources for obtaining FreeBSD media on CDROM + Lists different sources for obtaining &os; media on CDROM or DVD as well as different sites on the Internet that allow - you to download and install FreeBSD. + you to download and install &os;. @@ -546,15 +546,15 @@ , Resources on the Internet - Describes the many forums available for FreeBSD users to + Describes the many forums available for &os; users to post questions and engage in technical conversations about - FreeBSD. + &os;. , PGP Keys - Lists the PGP fingerprints of several FreeBSD Developers. + Lists the PGP fingerprints of several &os; Developers. @@ -646,7 +646,7 @@ E:\> tools\fdimage floppies\kern.flp A: Examples starting with &prompt.root; indicate a command that - must be invoked as the superuser in FreeBSD. You can login as + must be invoked as the superuser in &os;. You can login as root to type the command, or login as your normal account and use &man.su.1; to gain superuser privileges. @@ -672,7 +672,7 @@ document by paying authors to work on it full-time, paying for publication, etc. In particular, BSDi (subsequently acquired by Wind River Systems) - paid members of the FreeBSD Documentation Project to work on + paid members of the &os; Documentation Project to work on improving this book full time leading up to the publication of the first printed edition in March 2000 (ISBN 1-57176-241-8). Wind River Systems then paid several additional authors to make a @@ -680,7 +680,7 @@ additional chapters to the text. This work culminated in the publication of the second printed edition in November 2001 (ISBN 1-57176-303-1). In 2003-2004, FreeBSD Mall, Inc, paid + url="http://www.freebsdmall.com">&os; Mall, Inc, paid several contributors to improve the Handbook in preparation for the third printed edition. ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#97 (text+ko) ==== @@ -1,7 +1,7 @@ :set tabstop=4 once the file has been loaded. + + + Looking for something easy to start with? Take a look at the + list of + requested ports and see if you can work on one (or more). + @@ -3292,9 +3298,9 @@ The COMMENT variable should immediately follow the MAINTAINER variable in the Makefile. - Please try to keep the COMMENT line less than 70 - characters, as it is displayed to users as a one-line - summary of the port. + Please try to keep the COMMENT line less than 60 + characters, as this line will be used by the &man.pkg.info.1; + utility to display a one-line summary of the port. @@ -4163,22 +4169,15 @@ - <makevar>CONFLICTS</makevar> + Conflict handling - If your package cannot coexist with other packages - (because of file conflicts, runtime incompatibility, etc.), - list the other package names in the CONFLICTS - variable. You can use shell globs like * and - ? here. Packages names should be - enumerated the same way they appear in - /var/db/pkg. Please make sure that - CONFLICTS does not match this port's - package itself, or else forcing its installation with - FORCE_PKG_REGISTER will no longer work. - + There are tree different variables to register a conflict + between packages and ports: CONFLICTS, + CONFLICTS_INSTALL and + CONFLICTS_BUILD. - CONFLICTS automatically sets + The conflict variables automatically set the variable IGNORE, which is more fully documented in . @@ -4187,6 +4186,53 @@ retain the CONFLICTS entries in those other ports for a few months to cater for users who only update once in a while. + + + <makevar>CONFLICTS_INSTALL</makevar> + + If your package cannot coexist with other packages + (because of file conflicts, runtime incompatibilities, etc.), + list the other package names in the + CONFLICTS_INSTALL variable. You can use shell + globs like * and ? here. + Packages names should be enumerated the same way they appear in + /var/db/pkg. Please make sure that + CONFLICTS_INSTALL does not match this port's + package itself. Otherwise enforcing its installation with + FORCE_PKG_REGISTER will no longer work. + The CONFLICTS_INSTALL check is done after the build stage and + prior to the install stage. + + + + <makevar>CONFLICTS_BUILD</makevar> + + If your port cannot be built if a certain port is already + installed, list the other port names in the + CONFLICTS_BUILD variable. You can use shell + globs like * and ? here. + Packages names should be enumerated the same way they appear in + /var/db/pkg. The CONFLICTS_BUILD check is + done prior to the build stage. Build conflicts are not recorded + in the resulting package. + + + + <makevar>CONFLICTS</makevar> + + If your port cannot be built if a certain port is already + installed and the resulting package cannot coexist with the + other package, list the other package name in the + CONFLICTS variable. You can use shell + globs like * and ? here. + Packages names should be enumerated the same way they appear in + /var/db/pkg. Please make sure that + CONFLICTS_INSTALL does not match this port's + package itself. Otherwise enforcing its installation with + FORCE_PKG_REGISTER will no longer work. + The CONFLICTS check is done prior to the build stage and prior to + the install stage. + @@ -12948,6 +12994,18 @@ + 704000 + December 22, 2010 + 7.4-RELEASE + + + + 704100 + December 22, 2010 + 7.4-STABLE after 7.4-RELEASE. + + + 800000 October 11, 2007 8.0-CURRENT. Separating wide and single byte @@ -13730,6 +13788,16 @@ pl_siginfo for ptrace(PT_LWPINFO) . + 802000 + December 22, 2010 + 8.2-RELEASE + + + 802500 + December 22, 2010 + 8.2-STABLE after 8.2-RELEASE. + + 900000 August 22, 2009 9.0-CURRENT. ==== //depot/projects/docproj_nl/share/pgpkeys/ache.key#2 (text+ko) ==== @@ -1,4 +1,4 @@ - + @@ -11,7 +11,7 @@ ]]> >> TRUNCATED FOR MAIL (1000 lines) <<<