From owner-p4-projects@FreeBSD.ORG Mon Apr 30 20:42:04 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4CDC71065673; Mon, 30 Apr 2012 20:42:04 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 0F3AA106564A for ; Mon, 30 Apr 2012 20:42:04 +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 EA1098FC08 for ; Mon, 30 Apr 2012 20:42:03 +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 q3UKg3Zk025100 for ; Mon, 30 Apr 2012 20:42:03 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q3UKg3rC025097 for perforce@freebsd.org; Mon, 30 Apr 2012 20:42:03 GMT (envelope-from rene@FreeBSD.org) Date: Mon, 30 Apr 2012 20:42:03 GMT Message-Id: <201204302042.q3UKg3rC025097@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 210425 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: Mon, 30 Apr 2012 20:42:04 -0000 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 @@ - + @@ -4621,9 +4621,10 @@ - version-RELEASE-arch-docs.iso + &os;-version-RELEASE-arch-docs.iso - The &os; documentation. + The &os; documentation. This image is + not available for &os; 8.X. ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#140 (text+ko) ==== @@ -1,7 +1,7 @@ packing list because the package is generated by packing the files listed here. The pathnames are relative to the installation prefix (usually - /usr/local or - /usr/X11R6). If you are using the + /usr/local. If you are using the MANn 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 @@ Get the original sources (normally) as a compressed tarball (foo.tar.gz or - foo.tar.Z) and + foo.tar.bz2) and copy it into DISTDIR. Always use mainstream sources when and where you can. @@ -857,10 +856,7 @@ EXTRACT_AFTER_ARGS, EXTRACT_SUFX, or DISTFILES variables, depending on how alien - a format your port's distribution file is. (The most common - case is EXTRACT_SUFX=.tar.Z, when the - tarball is condensed by regular compress, - not gzip.) + a format your port's distribution file is. In the worst case, you can simply create your own do-extract target to override the @@ -2547,13 +2543,14 @@ DISTNAME= foo EXTRACT_SUFX= .tgz - The USE_BZIP2 and + The USE_BZIP2, + USE_XZ and USE_ZIP variables automatically set EXTRACT_SUFX to - .tar.bz2 or .zip as - necessary. If neither of these are set then - EXTRACT_SUFX defaults to - .tar.gz. + .tar.bz2, .tar.xz + or .zip as necessary. If neither of + these are set then EXTRACT_SUFX + defaults to .tar.gz. You never need to set both @@ -3526,7 +3523,7 @@ The official search PATH used on the ports build cluster is - /sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/X11R6/bin + /sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin The dependency is checked from within the @@ -5630,19 +5627,18 @@ are: 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. + 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. Always up-to-date list can be found in /usr/ports/Mk/bsd.xorg.mk. @@ -5662,7 +5658,7 @@ USE_GL= glu - Many ports define USE_XLIB, which + Some ports define USE_XLIB, 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. @@ -5686,13 +5682,6 @@ - USE_X_PREFIX - Deprecated. Today it is equivalent to - USE_XLIB and can be replaced by - it freely. - - - XMKMF Set to the path of xmkmf if not in the PATH. Defaults to @@ -5847,8 +5836,8 @@ Note that MOTIFLIB (usually) expands - to -L/usr/X11R6/lib -lXm or - /usr/X11R6/lib/libXm.a, so there is no + to -L/usr/local/lib -lXm or + /usr/local/lib/libXm.a, so there is no need to add -L or -l in front. @@ -7026,7 +7015,7 @@ DEFAULT_PHP_VER Selects which major version of PHP will be installed as a dependency when no PHP is installed - yet. Default is 4. Possible + yet. Default is 5. Possible values: 4, 5 @@ -7164,9 +7153,9 @@ USE_PYTHON The port needs Python. Minimal required version can be specified with values such as - 2.3+. Version ranges can also be + 2.6+. Version ranges can also be specified, by separating two version numbers with a - dash, e.g.: 2.1-2.3 + dash, e.g.: 2.6-2.7 @@ -7243,7 +7232,7 @@ USE_ZOPE Add dependency on Zope, a web application - platform. Change Python dependency to Python 2.3. + platform. Change Python dependency to Python 2.7. Set ZOPEBASEDIR containing a directory with Zope installation. @@ -8928,6 +8917,14 @@ 90+ will cause the port to depend on a minimum version of 9.0. + + + USE_SQLITE + If variable is set to yes, add + dependency on databases/sqlite3 + port. The variable may also be set to values: 3, 2. + @@ -9630,10 +9627,7 @@ ECHO_MSG and ECHO_CMD should be kept in mind. The former is for printing informational text to the screen, while the latter is for - command pipelining. - - A good example for both can be found in - shells/bash2/Makefile: + command pipelining: update-etc-shells: @${ECHO_MSG} "updating /etc/shells" @@ -15386,15 +15380,6 @@ - PORTOBJFORMAT - The object format of the system - (elf or aout; - note that for modern versions of - FreeBSD, aout is - deprecated.) - - - LOCALBASE The base of the local tree (e.g., /usr/local/) @@ -15412,8 +15397,7 @@ If you have to define the variables - USE_IMAKE, - USE_X_PREFIX, or + USE_IMAKE or MASTERDIR, do so before including bsd.port.pre.mk. @@ -15765,7 +15749,7 @@ ONLY_FOR_ARCHS= i386 amd64 - NOT_FOR_ARCHS= alpha ia64 sparc64 + NOT_FOR_ARCHS= ia64 sparc64 A custom IGNORE message can be set using ONLY_FOR_ARCHS_REASON and ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/disks/chapter.sgml#41 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -255,6 +255,7 @@ + ==== //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 @@ - + @@ -20,8 +20,6 @@ engineering process.