From owner-p4-projects@FreeBSD.ORG Sat Dec 3 12:01:27 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 07ED61065678; Sat, 3 Dec 2011 12:01:27 +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 BE079106566B for ; Sat, 3 Dec 2011 12:01:26 +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 AAAC78FC1E for ; Sat, 3 Dec 2011 12:01:26 +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 pB3C1QLY004878 for ; Sat, 3 Dec 2011 12:01:26 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id pB3C1QD7004871 for perforce@freebsd.org; Sat, 3 Dec 2011 12:01:26 GMT (envelope-from rene@FreeBSD.org) Date: Sat, 3 Dec 2011 12:01:26 GMT Message-Id: <201112031201.pB3C1QD7004871@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 202541 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: Sat, 03 Dec 2011 12:01:27 -0000 http://p4web.freebsd.org/@@202541?ac=10 Change 202541 by rene@rene_acer on 2011/12/03 12:01:06 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributing-ports/article.sgml#5 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#113 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.develalumni.sgml#10 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/fdp-primer/the-website/chapter.sgml#5 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/virtualization/chapter.sgml#11 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#115 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/desktop/chapter.sgml#47 integrate .. //depot/projects/docproj_nl/www/en/platforms/sparc.sgml#8 integrate .. //depot/projects/docproj_nl/www/en/projects/newbies.sgml#6 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributing-ports/article.sgml#5 (text+ko) ==== @@ -7,7 +7,7 @@ Contributing to the FreeBSD Ports Collection - $FreeBSD: doc/en_US.ISO8859-1/articles/contributing-ports/article.sgml,v 1.7 2011/09/28 20:01:35 blackend Exp $ + $FreeBSD: doc/en_US.ISO8859-1/articles/contributing-ports/article.sgml,v 1.9 2011/11/28 15:43:34 ryusuke Exp $ Abstract @@ -130,7 +130,7 @@ You can find out whether or not a port has dependencies or slave ports by looking at a master index of ports called INDEX. (The name of the file varies - by release of &os;; for instance, INDEX-6.) + by release of &os;; for instance, INDEX-8.) Some ports have conditional dependencies that are not included in a default INDEX build. We expect you to be able to recognize such ports by looking through @@ -356,7 +356,8 @@ case, at the very least, the dependent ports will need to get a PORTREVISION bump so that they will automatically be upgraded by - automated tools such as &man.portupgrade.1;. + automated tools such as portmaster + or &man.portupgrade.1;. @@ -418,8 +419,8 @@ &os; only guarantees that the Ports Collection works on the -STABLE branches. You should be - running 5-STABLE or - 6-STABLE, preferably the latter. In + running 7-STABLE or + 8-STABLE, preferably the latter. In theory, you should be able to get by with running the latest release of each stable branch (since the ABIs are not supposed to change) but if you can run the branch, that is @@ -428,17 +429,16 @@ Since the majority of &os; installations run on PC-compatible machines (what is termed the i386 architecture), we expect you to keep the port working on that - architecture. However, as more and more people start using - the amd64 architecture running native, it is - going to be more and more important to make sure that ports run - there as well. It is completely fair to ask for help if you + architecture. We prefer that ports also work on + the amd64 architecture running native. + It is completely fair to ask for help if you do not have one of these machines. The usual failure modes for non-i386 machines are that the original programmers assumed that, for - instance, pointers are ints, or that the - relatively lax gcc 2.95 compiler + instance, pointers are ints, or that a + relatively lax older gcc compiler was being used. More and more, application authors are reworking their code to remove these assumptions — but if the author is not actively maintaining their code, @@ -568,6 +568,10 @@ 14 days, but please try not to take that long. Try to respond as soon as possible, even if it is just to say you need some more time before you can work on the PR. + + If you have not responded after 14 days, any committer may + commit from a PR that you have not responded to via a + maintainer-timeout. @@ -685,7 +689,7 @@ In these cases your main obligation is to respond in a - timely manner. The timeout for non-responsive maintainers is + timely manner. Again, the timeout for non-responsive maintainers is 14 days. After this period changes may be committed unapproved. They have taken the trouble to do this for you; so please try to at least respond promptly. Then review, ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#113 (text+ko) ==== @@ -1,4 +1,4 @@ - + + &a.jacula; (2010 - 2011) @@ -125,7 +125,7 @@ - &a.nik; (2003 - 2009) + &a.nik; (1998 - 2009) ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/fdp-primer/the-website/chapter.sgml#5 (text+ko) ==== @@ -27,7 +27,7 @@ ANY WAY OUT OF THE USE OF THIS DOCUMENTATION, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/the-website/chapter.sgml,v 1.27 2009/01/21 23:46:32 pgj Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/the-website/chapter.sgml,v 1.28 2011/11/27 16:37:30 manolis Exp $ --> @@ -287,7 +287,10 @@ Run the &man.make.1; install target, setting the DESTDIR variable to the name of the - directory you want to install the files to. + directory you want to install the files to. The actual files are + installed under $DESTDIR/data + which should be configured as your web server's document + root. &prompt.root; env DESTDIR=/usr/local/www make install ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/virtualization/chapter.sgml#11 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -969,6 +969,117 @@ + + + &virtualbox; Guest Additions on a &os; Guest + + The &virtualbox; guest additions + provide support for: + + + + Clipboard sharing + + + + Mouse pointer integration + + + + Host time synchronization + + + + Window scaling + + + + Seamless mode + + + + + The following commands are run in the &os; guest. + + + First, install the emulators/virtualbox-ose-additions + package in the &os; guest. + + &prompt.root; cd /usr/ports/emulators/virtualbox-ose-additions && make install clean + + Add these lines to /etc/rc.conf: + + vboxguest_enable="YES" +vboxservice_enable="YES" + + If &man.ntpd.8; or &man.ntpdate.8; will be used, host time + synchronization should be disabled: + + vboxservice_flags="--disable-timesync" + + The vboxvideo_drv should be recognized by + Xorg -configure. If not, modify + xorg.conf for the + &virtualbox; video card: + + Section "Device" + ### Available Driver options are:- + ### Values: <i>: integer, <f>: float, <bool>: "True"/"False", + ### <string>: "String", <freq>: "<f> Hz/kHz/MHz" + ### [arg]: arg optional + Identifier "Card0" + Driver "vboxvideo" + VendorName "InnoTek Systemberatung GmbH" + BoardName "VirtualBox Graphics Adapter" + BusID "PCI:0:2:0" +EndSection + + To use vboxmouse_drv, adjust the mouse + section in your xorg.conf: + + Section "InputDevice" + Identifier "Mouse0" + Driver "vboxmouse" +EndSection + + HAL users should create this file at + /usr/local/etc/hal/fdi/policy/90-vboxguest.fdi + or copy it from /usr/local/share/hal/fdi/policy/10osvendor/90-vboxguest.fdi: + + <?xml version="1.0" encoding="UTF-8"?> +<!-- +# Sun VirtualBox +# Hal driver description for the vboxmouse driver +# $Id: 90-vboxguest.fdi 21412 2009-07-08 21:18:57z vboxsync $ + + Copyright (C) 2008-2009 Sun Microsystems, Inc. + + This file is part of VirtualBox Open Source Edition (OSE, as + available from http://www.virtualbox.org. This file is free software; + you can redistribute it and/or modify it under the terms of the GNU + General Public License (GPL) as published by the Free Software + Foundation, in version 2 as it comes in the "COPYING" file of the + VirtualBox OSE distribution. VirtualBox OSE is distributed in the + hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. + + Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa + Clara, CA 95054 USA or visit http://www.sun.com if you need + additional information or have any questions. +--> +<deviceinfo version="0.2"> + <device> + <match key="info.subsystem" string="pci"> + <match key="info.product" string="VirtualBox guest Service"> + <append key="info.capabilities" type="strlist">input</append> + <append key="info.capabilities" type="strlist">input.mouse</append> + <merge key="input.x11_driver" type="string">vboxmouse</merge> + <merge key="input.device" type="string">/dev/vboxguest</merge> + </match> + </match> + </device> +</deviceinfo> + @@ -1000,8 +1111,10 @@ Installing &virtualbox; &virtualbox; is available as a &os; port - in emulators/virtualbox-ose, and - may be installed using the following commands: + in emulators/virtualbox-ose. + As &virtualbox; is very actively developed, make sure your ports + tree is up to date before installing. Install using these + commands: &prompt.root; cd /usr/ports/emulators/virtualbox-ose &prompt.root; make install clean @@ -1028,37 +1141,14 @@ vboxdrv_load="YES" - Versions of &virtualbox; prior to 3.1.2 - require the proc file system - to be mounted. This is not needed in recent versions, which utilize - the functions provided by the &man.sysctl.3; library. + To use the kernel modules that allow bridged or host-only + networking, add the following to /etc/rc.conf + and reboot the computer: - When using an older version of the port, follow the instructions - below to make sure proc is - mounted properly: - - &prompt.root; mount -t procfs proc /proc + vboxnet_enable="YES" - To allow this setting to persist reboots, the following line - is needed in /etc/fstab: - - proc /proc procfs rw 0 0 - - - If an error message similar to the following is observed - when &virtualbox; is run from - the terminal: - - VirtualBox: supR3HardenedExecDir: couldn't read "", errno=2 cchLink=-1 - - The most likely culprit will be the proc file system. Please use the - mount command to check whether it is mounted - properly. - - The vboxusers group is created during - the installation of &virtualbox;. + installation of &virtualbox;. All users that need access to &virtualbox; will have to be added as members of this group. The pw command may be used to add new @@ -1066,8 +1156,23 @@ &prompt.root; pw groupmod vboxusers -m yourusername + The default permissions for /dev/vboxnetctl are restrictive and + need to be changed for bridged networking. + + To test it temporarily: + + &prompt.root; chown root:vboxusers /dev/vboxnetctl +&prompt.root; chmod 0660 /dev/vboxnetctl + + To make the permissions change permanent, add these + lines to /etc/devfs.conf: + + own vboxnetctl root:vboxusers +perm vboxnetctl 0660 + To launch &virtualbox;, either select - the Sun VirtualBox item from your + the Sun VirtualBox item from the graphic environment's menu, or type the following in a terminal: @@ -1081,6 +1186,71 @@ visit the relevant page in the &os; wiki, at . + + + &virtualbox; USB Support + + + These steps require VirtualBox 4.0.0 or later. + + + In order to be able to read and write to USB devices, users + need to be members of the operator group: + + &prompt.root; pw groupmod operator -m jerry + + Then, add the following to /etc/devfs.rules + (create it if it does not exist yet): + + [system=10] +add path 'usb/*' mode 0660 group operator + + To load these new rules, add the following to + /etc/rc.conf: + + devfs_system_ruleset="system" + + Then, restart devfs: + + &prompt.root; /etc/rc.d/devfs restart + + USB can now be enabled in the guest operating system. + USB devices should be visible in the &virtualbox; preferences. + + + + &virtualbox; Host DVD/CD Access + + The atapicam kernel module needs to be loaded + by adding the following line to + /boot/loader.conf: + + atapicam_load="YES" + + HAL needs to run for + &virtualbox; DVD/CD functions to work, + so enable it in /etc/rc.conf and start it + (if it is not already running): + + hald_enable="YES" + + &prompt.root; /usr/local/etc/rc.d/hald start + + In order for users to be able to use + &virtualbox; DVD/CD functions, they need + access to /dev/xpt0, + /dev/cdN, + and /dev/passN. + Add the following lines to + /etc/devfs.conf: + + perm cd0 0600 +perm xpt0 0660 +perm pass0 0660 + + @@ -8772,7 +8771,8 @@ down cleanly when the system shuts down. If the script is not starting a persistent service this is not necessary. - The "=" style of default variable assignment + For optional configuration elements + the "=" style of default variable assignment is preferable to the ":=" style here, since the former sets a default value only if the variable is unset, and the latter sets one if the variable is unset @@ -8799,13 +8799,119 @@ whether to stop the service on deinstall or not. Also note this affects upgrades, too. - Line like this goes to the pkg-plist: + A line like this goes in the pkg-plist: @stopdaemon doormand The argument must match the content of USE_RC_SUBR variable. + + + Pre-Commit Checklist + + Before contributing a port with an rc.d + script, and more importantly, before commiting one; please consult + the following checklist to be sure that it is ready. + + + + If this is a new file, does it have .sh + in the file name? If so that should be changed to just + file.in since new rc.d + files may not end with that extension. + + + + Does the file have a + $FreeBSD$ tag? + + + + Do the name of the file (minus .in), + the PROVIDE line, and $name all match? The file name + matching PROVIDE makes debugging easier, especially for + &man.rcorder.8; issues. Matching the file name and + $name makes figuring out what variables in + rc.conf[.local] are relevant easier as well. The latter is + also what you might call "policy" for all new + scripts, including in the base. + + + + Is the REQUIRE line set to LOGIN? This is mandatory for + scripts that run as a non-root user. If it runs as root, is + there a good reason for it to run prior to LOGIN? If not, it + should run there so that we can loosely group local scripts + to a point in &man.rcorder.8; after most everything in the + base is already running. + + + + Does the script start a persistent service? If so, it + should have KEYWORD: shutdown. + + + + Make sure there is no KEYWORD: FreeBSD present. This has + not been necessary or desirable for years. It is also an + indication that the new script was copy/pasted from an old + script, so extra caution should be given to the review. + + + + Does the script use an interpreted language (perl, python, + ruby, etc.)? If so, is command_interpreter set appropriately? + If not, it is likely that + &man.service.8; script stop + will not work properly. + + + + Are all examples of /usr/local subbed out for %%PREFIX%%? + + + + Do the default variable assignments come after + load_rc_config? + + + + Are there default assignments to empty strings? + They should be removed, but double-check that the option is + documented in the comments at the top of the file. + + + + Are things that are set in variables actually used in + the script? + + + + Are options listed in the default _flags things that are + actually mandatory? If so, they should be in command_args. + The -d option is a red flag (pardon the pun) here, since it's + usually the option to "daemonize" the process, and + therefore is actually mandatory. + + + + The _flags variable should never be included in command_args + (and vice versa, although that error is less common). + + + + Does the script execute any code unconditionally? This + is frowned on. Usually these things can/should be dealt with + through a start_precmd. + + + + All boolean tests should utilize the checkyesno function. + No hand-rolled tests for [Yy][Ee][Ss], etc. + + + ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/desktop/chapter.sgml#47 (text+ko) ==== @@ -1,7 +1,7 @@