Date: Mon, 30 Apr 2012 20:42:03 GMT From: Rene Ladan <rene@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 210425 for review Message-ID: <201204302042.q3UKg3rC025097@skunkworks.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/@@210425?ac=10 Change 210425 by rene@rene_acer on 2012/04/30 20:41:48 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#139 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/install/chapter.sgml#30 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#140 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/disks/chapter.sgml#41 integrate .. //depot/projects/docproj_nl/www/en/developers.sgml#76 integrate .. //depot/projects/docproj_nl/www/en/releng/Makefile#2 integrate .. //depot/projects/docproj_nl/www/en/releng/dst_info.sgml#2 delete .. //depot/projects/docproj_nl/www/en/releng/index.sgml#52 integrate .. //depot/projects/docproj_nl/www/nl/features.sgml#7 integrate .. //depot/projects/docproj_nl/www/nl/where.sgml#39 integrate .. //depot/projects/docproj_nl/www/share/sgml/news.xml#141 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#139 (text+ko) ==== @@ -1,4 +1,4 @@ -<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.1085 2012/04/27 18:42:34 pawel Exp $ --> +<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.1086 2012/04/30 19:01:02 lwhsu Exp $ --> <!-- NOTE TO COMMITTERS: Contributors lists are sorted in alphabetical order by first name. @@ -8307,6 +8307,11 @@ </listitem> <listitem> + <para>Po-Chien Lin + <email>linpc@cs.nctu.edu.tw</email></para> + </listitem> + + <listitem> <para>Pomegranate <email>daver@flag.blackened.net</email></para> </listitem> ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/install/chapter.sgml#30 (text+ko) ==== @@ -1,7 +1,7 @@ <!-- The FreeBSD Documentation Project - $FreeBSD: doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml,v 1.446 2012/03/17 04:53:52 eadler Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml,v 1.447 2012/04/30 16:25:16 ryusuke Exp $ --> <chapter id="install"> @@ -4621,9 +4621,10 @@ </row> <row> - <entry><filename><replaceable>version</replaceable>-RELEASE-<replaceable>arch</replaceable>-docs.iso</filename></entry> + <entry><filename>&os;-<replaceable>version</replaceable>-RELEASE-<replaceable>arch</replaceable>-docs.iso</filename></entry> - <entry>The &os; documentation.</entry> + <entry>The &os; documentation. This image is + not available for &os; 8.<replaceable>X</replaceable>.</entry> </row> <row> ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#140 (text+ko) ==== @@ -1,7 +1,7 @@ <!-- The FreeBSD Documentation Project - $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.1184 2012/04/28 12:36:12 ryusuke Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.1185 2012/04/29 13:38:13 eadler Exp $ --> <!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [ @@ -199,8 +199,7 @@ is also called the <quote>packing list</quote> because the package is generated by packing the files listed here. The pathnames are relative to the installation prefix (usually - <filename>/usr/local</filename> or - <filename>/usr/X11R6</filename>). If you are using the + <filename>/usr/local</filename>. If you are using the <makevar>MAN<replaceable>n</replaceable></makevar> variables (as you should be), do not list any manpages here. If the port creates directories during installation, make sure to @@ -596,7 +595,7 @@ <para>Get the original sources (normally) as a compressed tarball (<filename><replaceable>foo</replaceable>.tar.gz</filename> or - <filename><replaceable>foo</replaceable>.tar.Z</filename>) and + <filename><replaceable>foo</replaceable>.tar.bz2</filename>) and copy it into <makevar>DISTDIR</makevar>. Always use <emphasis>mainstream</emphasis> sources when and where you can.</para> @@ -857,10 +856,7 @@ <makevar>EXTRACT_AFTER_ARGS</makevar>, <makevar>EXTRACT_SUFX</makevar>, or <makevar>DISTFILES</makevar> variables, depending on how alien - a format your port's distribution file is. (The most common - case is <literal>EXTRACT_SUFX=.tar.Z</literal>, when the - tarball is condensed by regular <command>compress</command>, - not <command>gzip</command>.)</para> + a format your port's distribution file is.</para> <para>In the worst case, you can simply create your own <maketarget>do-extract</maketarget> target to override the @@ -2547,13 +2543,14 @@ <programlisting>DISTNAME= foo EXTRACT_SUFX= .tgz</programlisting> - <para>The <makevar>USE_BZIP2</makevar> and + <para>The <makevar>USE_BZIP2</makevar>, + <makevar>USE_XZ</makevar> and <makevar>USE_ZIP</makevar> variables automatically set <makevar>EXTRACT_SUFX</makevar> to - <literal>.tar.bz2</literal> or <literal>.zip</literal> as - necessary. If neither of these are set then - <makevar>EXTRACT_SUFX</makevar> defaults to - <literal>.tar.gz</literal>.</para> + <literal>.tar.bz2</literal>, <literal>.tar.xz</literal> + or <literal>.zip</literal> as necessary. If neither of + these are set then <makevar>EXTRACT_SUFX</makevar> + defaults to <literal>.tar.gz</literal>.</para> <note> <para>You never need to set both @@ -3526,7 +3523,7 @@ <para>The official search <envar>PATH</envar> used on the ports build cluster is</para> - <programlisting>/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/X11R6/bin</programlisting> + <programlisting>/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin</programlisting> </note> <para>The dependency is checked from within the @@ -5630,19 +5627,18 @@ are:</para> <para><literal>bigreqsproto compositeproto damageproto dmx - dmxproto evieproto fixesproto fontcacheproto fontenc - fontsproto fontutil glproto ice inputproto kbproto libfs - oldx printproto randrproto recordproto renderproto - resourceproto scrnsaverproto sm trapproto videoproto x11 - xau xaw xaw6 xaw7 xaw8 xbitmaps xcmiscproto xcomposite - xcursor xdamage xdmcp xevie xext xextproto - xf86bigfontproto xf86dgaproto xf86driproto xf86miscproto - xf86rushproto xf86vidmodeproto xfixes xfont xfontcache xft - xi xinerama xineramaproto xkbfile xkbui xmu xmuu - xorg-server xp xpm xprintapputil xprintutil xpr oto - xproxymngproto xrandr xrender xres xscrnsaver xt xtrans - xtrap xtst xv xvmc xxf86dga xxf86misc - xxf86vm</literal>.</para> + dmxproto dri2proto evieproto fixesproto fontcacheproto + fontenc fontsproto fontutil glproto ice inputproto kbproto + libfs oldx pciaccess pixman printproto randrproto + recordproto renderproto resourceproto scrnsaverproto sm + trapproto videoproto x11 xau xaw xaw6 xaw7 xbitmaps + xcmiscproto xcomposite xcursor xdamage xdmcp xevie xext + xextproto xf86bigfontproto xf86dgaproto xf86driproto + xf86miscproto xf86rushproto xf86vidmodeproto xfixes xfont + xfontcache xft xi xinerama xineramaproto xkbfile xkbui + xmu xmuu xorg-server xp xpm xprintapputil xprintutil + xproto xproxymngproto xrandr xrender xres xscrnsaver xt + xtrans xtrap xtst xv xvmc xxf86dga xxf86misc xxf86vm</literal>.</para> <para>Always up-to-date list can be found in <filename>/usr/ports/Mk/bsd.xorg.mk</filename>.</para> @@ -5662,7 +5658,7 @@ USE_GL= glu</programlisting> </example> - <para>Many ports define <makevar>USE_XLIB</makevar>, which + <para>Some ports define <makevar>USE_XLIB</makevar>, which makes the port depend on all the 50 or so libraries. This variable exists for backwards compatibility, as it predates modular X.Org, and should not be used on new ports.</para> @@ -5686,13 +5682,6 @@ </row> <row> - <entry><makevar>USE_X_PREFIX</makevar></entry> - <entry>Deprecated. Today it is equivalent to - <makevar>USE_XLIB</makevar> and can be replaced by - it freely.</entry> - </row> - - <row> <entry><makevar>XMKMF</makevar></entry> <entry>Set to the path of <command>xmkmf</command> if not in the <envar>PATH</envar>. Defaults to @@ -5847,8 +5836,8 @@ </itemizedlist> <para>Note that <makevar>MOTIFLIB</makevar> (usually) expands - to <literal>-L/usr/X11R6/lib -lXm</literal> or - <literal>/usr/X11R6/lib/libXm.a</literal>, so there is no + to <literal>-L/usr/local/lib -lXm</literal> or + <literal>/usr/local/lib/libXm.a</literal>, so there is no need to add <literal>-L</literal> or <literal>-l</literal> in front.</para> </sect2> @@ -7026,7 +7015,7 @@ <entry><makevar>DEFAULT_PHP_VER</makevar></entry> <entry>Selects which major version of PHP will be installed as a dependency when no PHP is installed - yet. Default is <literal>4</literal>. Possible + yet. Default is <literal>5</literal>. Possible values: <literal>4</literal>, <literal>5</literal></entry> </row> @@ -7164,9 +7153,9 @@ <entry><makevar>USE_PYTHON</makevar></entry> <entry>The port needs Python. Minimal required version can be specified with values such as - <literal>2.3+</literal>. Version ranges can also be + <literal>2.6+</literal>. Version ranges can also be specified, by separating two version numbers with a - dash, e.g.: <literal>2.1-2.3</literal></entry> + dash, e.g.: <literal>2.6-2.7</literal></entry> </row> <row> @@ -7243,7 +7232,7 @@ <row> <entry><makevar>USE_ZOPE</makevar></entry> <entry>Add dependency on Zope, a web application - platform. Change Python dependency to Python 2.3. + platform. Change Python dependency to Python 2.7. Set <makevar>ZOPEBASEDIR</makevar> containing a directory with Zope installation.</entry> </row> @@ -8928,6 +8917,14 @@ <literal> 90+</literal> will cause the port to depend on a minimum version of 9.0.</entry> </row> + + <row> + <entry><makevar>USE_SQLITE</makevar></entry> + <entry>If variable is set to <literal>yes</literal>, add + dependency on <filename + role="package">databases/sqlite3</filename> + port. The variable may also be set to values: 3, 2.</entry> + </row> </tbody> </tgroup> </table> @@ -9630,10 +9627,7 @@ <makevar>ECHO_MSG</makevar> and <makevar>ECHO_CMD</makevar> should be kept in mind. The former is for printing informational text to the screen, while the latter is for - command pipelining.</para> - - <para>A good example for both can be found in - <filename>shells/bash2/Makefile</filename>:</para> + command pipelining:</para> <programlisting>update-etc-shells: @${ECHO_MSG} "updating /etc/shells" @@ -15386,15 +15380,6 @@ </row> <row> - <entry><makevar>PORTOBJFORMAT</makevar></entry> - <entry>The object format of the system - (<literal>elf</literal> or <literal>aout</literal>; - note that for <quote>modern</quote> versions of - FreeBSD, <literal>aout</literal> is - deprecated.)</entry> - </row> - - <row> <entry><makevar>LOCALBASE</makevar></entry> <entry>The base of the <quote>local</quote> tree (e.g., <literal>/usr/local/</literal>)</entry> @@ -15412,8 +15397,7 @@ <note> <para>If you have to define the variables - <makevar>USE_IMAKE</makevar>, - <makevar>USE_X_PREFIX</makevar>, or + <makevar>USE_IMAKE</makevar> or <makevar>MASTERDIR</makevar>, do so before including <filename>bsd.port.pre.mk</filename>.</para> </note> @@ -15765,7 +15749,7 @@ <programlisting>ONLY_FOR_ARCHS= i386 amd64</programlisting> - <programlisting>NOT_FOR_ARCHS= alpha ia64 sparc64</programlisting> + <programlisting>NOT_FOR_ARCHS= ia64 sparc64</programlisting> <para>A custom <makevar>IGNORE</makevar> message can be set using <makevar>ONLY_FOR_ARCHS_REASON</makevar> and ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/disks/chapter.sgml#41 (text+ko) ==== @@ -1,7 +1,7 @@ <!-- The FreeBSD Dutch Documentation Project - $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/disks/chapter.sgml,v 1.26 2012/03/04 22:10:54 rene Exp $ + $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/disks/chapter.sgml,v 1.27 2012/04/29 12:45:32 rene Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/disks/chapter.sgml %SRCID% 1.316 ==== //depot/projects/docproj_nl/www/en/developers.sgml#76 (text+ko) ==== @@ -6,7 +6,7 @@ us to update author names, or the representation of those names (such as adding email addresses), by just editing a single file. -$FreeBSD: www/en/developers.sgml,v 1.319 2012/04/22 17:02:15 jlh Exp $ +$FreeBSD: www/en/developers.sgml,v 1.320 2012/04/30 17:34:57 issyl0 Exp $ --> @@ -255,6 +255,7 @@ <!ENTITY a.imp "Warner Losh"> <!ENTITY a.imura "R. Imura"> <!ENTITY a.issei "Issei Suzuki"> +<!ENTITY a.issyl0 "Isabell Long"> <!ENTITY a.itetcu "Ion-Mihai Tetcu"> <!ENTITY a.itojun "Jun-ichiro Itoh"> <!ENTITY a.ivoras "Ivan Voras"> ==== //depot/projects/docproj_nl/www/en/releng/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: www/en/releng/Makefile,v 1.3 2007/02/26 22:35:28 kensmith Exp $ +# $FreeBSD: www/en/releng/Makefile,v 1.4 2012/04/29 21:35:32 simon Exp $ .if exists(../Makefile.conf) .include "../Makefile.conf" @@ -7,6 +7,6 @@ .include "../Makefile.inc" .endif -DOCS?= index.sgml charter.sgml dst_info.sgml +DOCS?= index.sgml charter.sgml .include "${WEB_PREFIX}/share/mk/web.site.mk" ==== //depot/projects/docproj_nl/www/en/releng/index.sgml#52 (text+ko) ==== @@ -1,6 +1,6 @@ <!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [ <!ENTITY base CDATA ".."> -<!ENTITY date "$FreeBSD: www/en/releng/index.sgml,v 1.302 2012/04/27 14:04:53 bz Exp $"> +<!ENTITY date "$FreeBSD: www/en/releng/index.sgml,v 1.304 2012/04/29 15:34:15 eadler Exp $"> <!ENTITY email 're'> <!ENTITY title "Release Engineering Information"> <!ENTITY % navinclude.developers "INCLUDE"> @@ -20,8 +20,6 @@ engineering process.</p> <ul> - <li><a href="&base;/releng/dst_info.html">Information about 2007 - Daylight Savings Time</a></li> <li><a href="#schedule">Upcoming Release Schedule</a></li> <li><a href="#freeze">Code Freeze Status</a></li> <li><a href="&base;/releng/charter.html">Charter for the Release ==== //depot/projects/docproj_nl/www/nl/features.sgml#7 (text+ko) ==== @@ -1,5 +1,5 @@ <!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [ -<!ENTITY date "$FreeBSD$"> +<!ENTITY date "$FreeBSD: www/nl/features.sgml,v 1.2 2012/04/29 14:58:44 rene Exp $"> <!ENTITY title "Over &os;'s technologische voortgang"> <!ENTITY % navinclude.about "INCLUDE"> ]> ==== //depot/projects/docproj_nl/www/nl/where.sgml#39 (text+ko) ==== @@ -1,5 +1,5 @@ <!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [ -<!ENTITY date "$FreeBSD: www/nl/where.sgml,v 1.19 2012/02/20 22:51:20 rene Exp $"> +<!ENTITY date "$FreeBSD: www/nl/where.sgml,v 1.20 2012/04/29 14:58:44 rene Exp $"> <!ENTITY title "&os; verkrijgen"> <!ENTITY % navinclude.download "INCLUDE"> <!ENTITY url.rel "ftp://ftp.FreeBSD.org/pub/FreeBSD/releases">; ==== //depot/projects/docproj_nl/www/share/sgml/news.xml#141 (text+ko) ==== @@ -25,7 +25,7 @@ <news> <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0"> <cvs:keyword name="freebsd"> - $FreeBSD: www/share/sgml/news.xml,v 1.435 2012/04/22 17:47:05 jlh Exp $ + $FreeBSD: www/share/sgml/news.xml,v 1.436 2012/04/30 17:34:57 issyl0 Exp $ </cvs:keyword> </cvs:keywords> @@ -34,6 +34,15 @@ <month> <name>4</name> <day> + <name>26</name> + + <event> + <p>New committer: + <a href="mailto:issyl0@FreeBSD.org">Isabell Long</a> (doc/www)</p> + </event> + </day> + + <day> <name>22</name> <event>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201204302042.q3UKg3rC025097>