Date: Tue, 2 Oct 2007 00:27:11 GMT From: John Birrell <jb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 127076 for review Message-ID: <200710020027.l920RB09057142@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=127076 Change 127076 by jb@jb_freebsd1 on 2007/10/02 00:26:47 IFC Are we there yet? Homer? Affected files ... .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/portbuild/article.sgml#7 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#38 integrate .. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/share/sgml/catalog#2 integrate .. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/share/sgml/freebsd.dsl#2 integrate .. //depot/projects/dtrace/doc/share/pgpkeys/pgpkeys-developers.sgml#25 integrate .. //depot/projects/dtrace/ports/LEGAL#20 integrate .. //depot/projects/dtrace/ports/MOVED#41 integrate .. //depot/projects/dtrace/ports/Mk/bsd.perl.mk#3 integrate .. //depot/projects/dtrace/ports/Mk/bsd.php.mk#10 integrate .. //depot/projects/dtrace/ports/Mk/bsd.port.mk#11 integrate .. //depot/projects/dtrace/ports/Mk/bsd.wx.mk#6 integrate .. //depot/projects/dtrace/ports/UIDs#14 integrate .. //depot/projects/dtrace/ports/UPDATING#33 integrate .. //depot/projects/dtrace/src/Makefile.inc1#29 integrate .. //depot/projects/dtrace/src/ObsoleteFiles.inc#22 integrate .. //depot/projects/dtrace/src/UPDATING#16 integrate .. //depot/projects/dtrace/src/cddl/lib/Makefile#7 integrate .. //depot/projects/dtrace/src/cddl/sbin/zfs/Makefile#2 integrate .. //depot/projects/dtrace/src/cddl/sbin/zpool/Makefile#2 integrate .. //depot/projects/dtrace/src/cddl/usr.bin/Makefile#4 integrate .. //depot/projects/dtrace/src/cddl/usr.bin/ztest/Makefile#2 integrate .. //depot/projects/dtrace/src/cddl/usr.sbin/Makefile#3 integrate .. //depot/projects/dtrace/src/cddl/usr.sbin/zdb/Makefile#2 integrate .. //depot/projects/dtrace/src/include/Makefile#11 integrate .. //depot/projects/dtrace/src/lib/libc/Makefile#10 integrate .. //depot/projects/dtrace/src/lib/libpthread/Makefile#7 integrate .. //depot/projects/dtrace/src/lib/libthr/Makefile#10 integrate .. //depot/projects/dtrace/src/libexec/atrun/Makefile#5 integrate .. //depot/projects/dtrace/src/sbin/ggate/Makefile#7 integrate .. //depot/projects/dtrace/src/share/man/man4/pci.4#5 integrate .. //depot/projects/dtrace/src/share/man/man9/pci.9#4 integrate .. //depot/projects/dtrace/src/share/misc/committers-src.dot#3 integrate .. //depot/projects/dtrace/src/share/mk/bsd.libnames.mk#8 integrate .. //depot/projects/dtrace/src/share/mk/bsd.prog.mk#7 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/legacy.c#5 integrate .. //depot/projects/dtrace/src/sys/amd64/include/legacyvar.h#4 integrate .. //depot/projects/dtrace/src/sys/amd64/pci/pci_bus.c#7 integrate .. //depot/projects/dtrace/src/sys/arm/xscale/i80321/i80321_pci.c#8 integrate .. //depot/projects/dtrace/src/sys/arm/xscale/i8134x/i81342_pci.c#2 integrate .. //depot/projects/dtrace/src/sys/arm/xscale/ixp425/ixp425_pci.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/acpica/acpi_pci.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/acpica/acpi_pcib_acpi.c#7 integrate .. //depot/projects/dtrace/src/sys/dev/bge/if_bge.c#20 integrate .. //depot/projects/dtrace/src/sys/dev/cardbus/cardbus.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/pccbb/pccbb.c#10 integrate .. //depot/projects/dtrace/src/sys/dev/pccbb/pccbb_pci.c#8 integrate .. //depot/projects/dtrace/src/sys/dev/pccbb/pccbbvar.h#6 integrate .. //depot/projects/dtrace/src/sys/dev/pci/pci.c#18 integrate .. //depot/projects/dtrace/src/sys/dev/pci/pci_pci.c#10 integrate .. //depot/projects/dtrace/src/sys/dev/pci/pci_private.h#9 integrate .. //depot/projects/dtrace/src/sys/dev/pci/pci_user.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/pci/pcib_private.h#7 integrate .. //depot/projects/dtrace/src/sys/dev/pci/pcivar.h#10 integrate .. //depot/projects/dtrace/src/sys/i386/i386/legacy.c#5 integrate .. //depot/projects/dtrace/src/sys/i386/include/legacyvar.h#4 integrate .. //depot/projects/dtrace/src/sys/i386/pci/pci_bus.c#7 integrate .. //depot/projects/dtrace/src/sys/netinet/ip_fw2.c#19 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_asconf.c#5 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_constants.h#5 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_indata.c#7 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_input.c#8 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_output.c#7 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_output.h#4 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_pcb.c#9 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_timer.c#6 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_usrreq.c#8 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_var.h#4 integrate .. //depot/projects/dtrace/src/sys/netinet/sctputil.c#9 integrate .. //depot/projects/dtrace/src/sys/powerpc/powermac/grackle.c#5 integrate .. //depot/projects/dtrace/src/sys/powerpc/powermac/uninorth.c#6 integrate .. //depot/projects/dtrace/src/sys/sparc64/pci/apb.c#4 integrate .. //depot/projects/dtrace/src/sys/sparc64/pci/ofw_pcibus.c#8 integrate .. //depot/projects/dtrace/src/sys/sparc64/pci/psycho.c#7 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/hv_pci.c#7 integrate .. //depot/projects/dtrace/src/sys/sys/param.h#18 integrate .. //depot/projects/dtrace/src/sys/sys/pciio.h#4 integrate .. //depot/projects/dtrace/src/tools/build/make_check/Makefile#4 integrate .. //depot/projects/dtrace/src/tools/build/mk/OptionalObsoleteFiles.inc#8 integrate .. //depot/projects/dtrace/src/tools/make_libdeps.sh#6 integrate .. //depot/projects/dtrace/src/tools/tools/pciroms/pciroms.c#2 integrate .. //depot/projects/dtrace/src/usr.bin/Makefile#9 integrate .. //depot/projects/dtrace/src/usr.sbin/Makefile#18 integrate .. //depot/projects/dtrace/src/usr.sbin/bluetooth/bthidd/Makefile#5 integrate .. //depot/projects/dtrace/src/usr.sbin/config/Makefile#5 integrate .. //depot/projects/dtrace/src/usr.sbin/cron/cron/Makefile#5 integrate .. //depot/projects/dtrace/src/usr.sbin/ngctl/Makefile#7 integrate .. //depot/projects/dtrace/src/usr.sbin/pciconf/pciconf.8#5 integrate .. //depot/projects/dtrace/src/usr.sbin/pciconf/pciconf.c#5 integrate .. //depot/projects/dtrace/src/usr.sbin/pmcstat/Makefile#5 integrate .. //depot/projects/dtrace/www/en/donations/wantlist.sgml#23 integrate .. //depot/projects/dtrace/www/en/gnome/images/Makefile#7 integrate .. //depot/projects/dtrace/www/en/gnome/images/ss220-1-tn.png#1 branch .. //depot/projects/dtrace/www/en/gnome/images/ss220-1.png#1 branch .. //depot/projects/dtrace/www/en/gnome/images/ss220-2-tn.png#1 branch .. //depot/projects/dtrace/www/en/gnome/images/ss220-2.png#1 branch .. //depot/projects/dtrace/www/en/gnome/screenshots.sgml#8 integrate .. //depot/projects/dtrace/www/en/snapshots/index.sgml#16 integrate Differences ... ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/portbuild/article.sgml#7 (text+ko) ==== @@ -11,7 +11,7 @@ <corpauthor>The &os; Ports Management Team</corpauthor> </authorgroup> - <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/portbuild/article.sgml,v 1.21 2007/09/14 02:00:59 linimon Exp $</pubdate> + <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/portbuild/article.sgml,v 1.22 2007/10/01 05:55:01 linimon Exp $</pubdate> <copyright> <year>2003</year> @@ -640,6 +640,15 @@ <filename><replaceable>${arch}</replaceable>/<replaceable>${branch}</replaceable>/wrkdirs</filename>. </para> + <para>If you find that the system is looping trying to build the + same package over and over again, you may be able to fix the + problem by rebuilding the offending package by hand.</para> + + <para>If all the builds start failing with complaints that they + cannot load the dependent packages, check to see that + <application>httpd</application> is still running, and restart + it if not.</para> + <para>Keep an eye on &man.df.1; output. If the <filename>/var/portbuild</filename> file system becomes full then <trademark>Bad Things</trademark> happen. ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#38 (text+ko) ==== @@ -1,7 +1,7 @@ <!-- The FreeBSD Documentation Project - $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.872 2007/09/22 01:30:25 trhodes Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.874 2007/09/30 13:24:14 marius Exp $ --> <!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [ @@ -680,7 +680,7 @@ <command>autoconf</command> to regenerate <command>configure</command>, do not take the diffs of <command>configure</command> (it often grows to a few thousand - lines!); define <literal>USE_AUTOTOOLS=autoconf:253</literal> and take the + lines!); define <literal>USE_AUTOTOOLS=autoconf:261</literal> and take the diffs of <filename>configure.in</filename>.</para> <para>If you had to delete a file, then you can do it in the @@ -11560,6 +11560,11 @@ include/i4b.</entry> <entry>700052</entry> </row> + <row> + <entry>7.0-CURRENT after the addition of support for + PCI domains</entry> + <entry>700053</entry> + </row> </tbody> </tgroup> ==== //depot/projects/dtrace/doc/hu_HU.ISO8859-2/share/sgml/catalog#2 (text+ko) ==== @@ -4,7 +4,7 @@ -- ...................................................................... -- -- Hungarian specific ...................................................... -- - -- $FreeBSD: doc/hu_HU.ISO8859-2/share/sgml/catalog,v 1.1 2007/04/15 15:23:55 gabor Exp $ -- + -- $FreeBSD: doc/hu_HU.ISO8859-2/share/sgml/catalog,v 1.2 2007/10/01 13:37:44 gabor Exp $ -- PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//HU" "articles.ent" @@ -12,12 +12,15 @@ PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Books Entity Set//EN" "books.ent" -PUBLIC "-//FreeBSD//DOCUMENT DocBook Language Neutral Stylesheet//EN" +PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN" "freebsd.dsl" PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//HU" "freebsd.dsl" +PUBLIC "-//FreeBSD//DOCUMENT DocBook Language Neutral Stylesheet//HU" + "freebsd.dsl" + PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN" "l10n.ent" ==== //depot/projects/dtrace/doc/hu_HU.ISO8859-2/share/sgml/freebsd.dsl#2 (text+ko) ==== @@ -1,5 +1,5 @@ <!-- - $FreeBSD: doc/hu_HU.ISO8859-2/share/sgml/freebsd.dsl,v 1.1 2007/04/15 15:23:55 gabor Exp $ + $FreeBSD: doc/hu_HU.ISO8859-2/share/sgml/freebsd.dsl,v 1.2 2007/10/01 13:37:44 gabor Exp $ The FreeBSD Hungarian Documentation Project Translated by: Gabor Kovesdan <gabor@FreeBSD.org> Original revision: 1.20 @@ -8,7 +8,7 @@ <!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [ <!ENTITY freebsd.dsl PUBLIC "-//FreeBSD//DOCUMENT DocBook Language Neutral Stylesheet//EN" CDATA DSSSL> -<!ENTITY % freebsd.l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//HU"> +<!ENTITY % freebsd.l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"> %freebsd.l10n; <!ENTITY % output.html "IGNORE"> ==== //depot/projects/dtrace/doc/share/pgpkeys/pgpkeys-developers.sgml#25 (text+ko) ==== @@ -1,7 +1,7 @@ <!-- The FreeBSD Documentation Project - $FreeBSD: doc/share/pgpkeys/pgpkeys-developers.sgml,v 1.55 2007/09/28 15:42:39 kaiw Exp $ + $FreeBSD: doc/share/pgpkeys/pgpkeys-developers.sgml,v 1.56 2007/10/01 13:19:12 jkois Exp $ --> <sect2 id="pgpkey-ariff"> @@ -769,7 +769,7 @@ &pgpkey.sat; </sect2> - <sect2 id="pgpkey-rpaulo" + <sect2 id="pgpkey-rpaulo"> <title>&a.rpaulo;</title> &pgpkey.rpaulo; </sect2> ==== //depot/projects/dtrace/ports/LEGAL#20 (text+ko) ==== @@ -1,5 +1,5 @@ # Creator: Jordan Hubbard -# $FreeBSD: ports/LEGAL,v 1.551 2007/09/24 08:39:17 rafan Exp $ +# $FreeBSD: ports/LEGAL,v 1.552 2007/10/01 12:37:23 tabthorpe Exp $ ********************************************************************** *** NOTE TO COMMITTERS *** @@ -97,17 +97,9 @@ citrix_ica-* japanese/citrix_ica License prohibits redistribution citrix_ica-* net/citrix_ica License prohibits redistribution cfs-* security/cfs Crypto; export-controlled -clibpdf*.tar.gz print/clibpdf Needs a license to bundle with - other products code2000-*/CODE2000.ZIP x11-fonts/code2000 Only unmodified original package can be distributed collections*.zip java/collections See the license -clibpdf* print/clibpdf License required for bundling - with other products. Only - free for non-profit personal - use, and use by educational, - non-profit, and government - organizations contool-* sysutils/contool Do not incorporate the source code into a product which is subsequently sold ==== //depot/projects/dtrace/ports/MOVED#41 (text+ko) ==== @@ -1,7 +1,7 @@ # # MOVED - a list of (recently) moved or removed ports # -# $FreeBSD: ports/MOVED,v 1.1486 2007/09/27 20:23:44 tabthorpe Exp $ +# $FreeBSD: ports/MOVED,v 1.1489 2007/10/01 12:37:23 tabthorpe Exp $ # # Each entry consists of a single line containing the following four # fields in the order named, separated with the pipe (`|') character: @@ -3246,3 +3246,25 @@ print/ghostscript-afpl-nox11|print/ghostscript-gpl-nox11|2007-09-24|Replaced by print/ghostscript-gpl-nox11 misc/mango||2007-09-27|Has expired: Depends on broken package qextmdi lang/f2py||2007-09-27|Has expired: Replaced by py-numpy +games/halflifeserver||2007-09-29|Has expired: unfetchable +games/hlserver-admin||2007-09-29|Has expired: dependency of removed port games/halflifeserver +games/hlserver-cs||2007-09-29|Has expired: dependency of removed port games/halflifeserver +games/hlserver-dod||2007-09-29|Has expired: dependency of removed port games/halflifeserver +games/hlserver-esf||2007-09-29|Has expired: dependency of removed port games/halflifeserver +games/hlserver-existence||2007-09-29|Has expired: dependency of removed port games/halflifeserver +games/hlserver-fa||2007-09-29|Has expired: dependency of removed port games/halflifeserver +games/hlserver-flf||2007-09-29|Has expired: dependency of removed port games/halflifeserver +games/hlserver-glbwar||2007-09-29|Has expired: dependency of removed port games/halflifeserver +games/hlserver-heroes||2007-09-29|Has expired: dependency of removed port games/halflifeserver +games/hlserver-ns||2007-09-29|Has expired: dependency of removed port games/halflifeserver +games/hlserver-opfor||2007-09-29|Has expired: dependency of removed port games/halflifeserver +games/hlserver-psychostats||2007-09-29|Has expired: dependency of removed port games/halflifeserver +games/hlserver-si||2007-09-29|Has expired: dependency of removed port games/halflifeserver +games/hlserver-ts||2007-09-29|Has expired: dependency of removed port games/halflifeserver +games/hlserver-vs||2007-09-29|Has expired: dependency of removed port games/halflifeserver +games/hlserver-wasteland||2007-09-29|Has expired: dependency of removed port games/halflifeserver +games/hlserver-wizwars||2007-09-29|Has expired: dependency of removed port games/halflifeserver +devel/autoconf253|devel/autoconf261|2007-09-29|Autotools cleanup +devel/autoconf259|devel/autoconf261|2007-09-29|Autotools cleanup +print/clibpdf||2007-10-01|Has expired: distfile and homepage disappeared +print/ruby-clibpdf||2007-10-01|Has expired: required port print/clibpdf deprecated ==== //depot/projects/dtrace/ports/Mk/bsd.perl.mk#3 (text+ko) ==== @@ -1,7 +1,7 @@ #-*- mode: makefile; tab-width: 4; -*- # ex:ts=4 # -# $FreeBSD: ports/Mk/bsd.perl.mk,v 1.6 2007/09/26 00:36:44 linimon Exp $ +# $FreeBSD: ports/Mk/bsd.perl.mk,v 1.7 2007/09/29 03:46:06 linimon Exp $ # # bsd.perl.mk - Support for Perl-based ports. # @@ -213,7 +213,7 @@ # Disable AutoInstall from attempting to install from CPAN directly in # the case of missing dependencies. This causes the build to loop on # the build cluster asking for interactive input. -CONFIGURE_ENV+= "PERL_EXTUTILS_AUTOINSTALL=--skipdeps" +CONFIGURE_ENV+= PERL_EXTUTILS_AUTOINSTALL="--skipdeps" .if defined(BATCH) && !defined(IS_INTERACTIVE) CONFIGURE_ENV+= PERL_MM_USE_DEFAULT="YES" .endif # defined(BATCH) && !defined(IS_INTERACTIVE) ==== //depot/projects/dtrace/ports/Mk/bsd.php.mk#10 (text+ko) ==== @@ -7,7 +7,7 @@ # Please send all suggested changes to the maintainer instead of committing # them to CVS yourself. # -# $FreeBSD: ports/Mk/bsd.php.mk,v 1.42 2007/07/09 18:37:35 ale Exp $ +# $FreeBSD: ports/Mk/bsd.php.mk,v 1.43 2007/09/30 04:46:32 linimon Exp $ # # Adding 'USE_PHP=yes' to a port includes this Makefile after bsd.ports.pre.mk. # If the port requires a predefined set of PHP extensions, they can be @@ -148,7 +148,7 @@ .if defined(USE_PHPIZE) || defined(USE_PHPEXT) BUILD_DEPENDS+= phpize:${PHP_PORT} GNU_CONFIGURE= YES -USE_AUTOTOOLS+= autoconf:259:env +USE_AUTOTOOLS+= autoconf:261:env CONFIGURE_ARGS+=--with-php-config=${LOCALBASE}/bin/php-config configure-message: phpize-message do-phpize ==== //depot/projects/dtrace/ports/Mk/bsd.port.mk#11 (text+ko) ==== @@ -1,7 +1,7 @@ #-*- mode: makefile; tab-width: 4; -*- # ex:ts=4 # -# $FreeBSD: ports/Mk/bsd.port.mk,v 1.586 2007/09/24 08:39:17 rafan Exp $ +# $FreeBSD: ports/Mk/bsd.port.mk,v 1.587 2007/09/30 04:01:39 linimon Exp $ # $NetBSD: $ # # bsd.port.mk - 940820 Jordan K. Hubbard. @@ -4774,6 +4774,10 @@ .if !defined(NO_DEPENDS) @for i in `${ECHO_CMD} "${${deptype}_DEPENDS}"`; do \ prog=`${ECHO_CMD} $$i | ${SED} -e 's/:.*//'`; \ + if [ -z "$$prog" ]; then \ + ${ECHO_MSG} "Error: there is an empty port dependency in ${deptype}_DEPENDS."; \ + break; \ + fi; \ dir=`${ECHO_CMD} $$i | ${SED} -e 's/[^:]*://'`; \ if ${EXPR} "$$dir" : '.*:' > /dev/null; then \ target=`${ECHO_CMD} $$dir | ${SED} -e 's/.*://'`; \ ==== //depot/projects/dtrace/ports/Mk/bsd.wx.mk#6 (text+ko) ==== @@ -1,7 +1,7 @@ #-*- mode: makefile; tab-width: 4; -*- # ex:ts=4 # -# $FreeBSD: ports/Mk/bsd.wx.mk,v 1.10 2007/01/04 13:02:26 alepulver Exp $ +# $FreeBSD: ports/Mk/bsd.wx.mk,v 1.11 2007/09/29 17:54:38 alepulver Exp $ # # bsd.wx.mk - Support for wxWidgets based ports. # @@ -34,9 +34,9 @@ # The available components are: # wx - The wxWidgets library. # contrib - The wxWidgets contributed libraries. -# python - The wxWidgets API for Python (for 2.4-2.6). -# mozilla - WxMozilla (for 2.4). -# svg - WxSVG (for 2.6). +# python - The wxWidgets API for Python. +# mozilla - WxMozilla (only for 2.4). +# svg - WxSVG (only for 2.6). # The available dependency types are: # build - Requires component for building. # lib - Requires component for building and running. @@ -178,6 +178,9 @@ _WX_PORT_contrib_2.8= x11-toolkits/wxgtk28${_WX_UCL}-contrib _WX_LIB_contrib_2.8= wx_gtk2${_WX_UC}_fl-2.8 +_WX_PORT_python_2.8= x11-toolkits/py-wxPython28${_WX_UCL} +_WX_FILE_python_2.8= ${PYTHON_SITELIBDIR}/wx-2.8-gtk2${_WX_PYSUFX}/wx/__init__.py + # Set _WX_SHVER_comp_ver to 0 and _WX_FILE_comp_ver for libs appropiately. # Set _WX_DEPTYPE_comp_ver for "python" to "run", and others to "lib". ==== //depot/projects/dtrace/ports/UIDs#14 (text+ko) ==== @@ -1,26 +1,26 @@ -$FreeBSD: ports/UIDs,v 1.51 2007/09/09 07:09:21 edwin Exp $ +$FreeBSD: ports/UIDs,v 1.52 2007/09/30 07:19:48 edwin Exp $ # Please keep this file sorted by UID! smmsp:*:25:25:Sendmail Submission User:/var/spool/clientmqueue:/usr/sbin/nologin -bind:*:53:53:Bind Sandbox:/:/sbin/nologin +bind:*:53:53:Bind Sandbox:/:/usr/sbin/nologin majordom:*:54:54:Majordomo Pseudo User:/usr/local/majordomo:/nonexistent rdfdb:*:55:55:rdfDB Daemon:/var/db/rdfdb:/bin/sh -spamd:*:58:58:SpamAssassin user:/var/spool/spamd:/sbin/nologin +spamd:*:58:58:SpamAssassin user:/var/spool/spamd:/usr/sbin/nologin cyrus:*:60:60:the cyrus mail server:/nonexistent:/nonexistent gnats:*:61:1:GNATS database owner:/usr/local/share/gnats/gnats-db:/bin/sh proxy:*:62:62:Packet Filter pseudo-user:/nonexistent:/nonexistent uucp:*:66:66:UUCP pseudo-user:/var/spool/uucppublic:/usr/libexec/uucp/uucico xten:*:67:67:X-10 daemon:/usr/local/xten:/nonexistent -pop:*:68:6:Post Office Owner (popper):/nonexistent:/sbin/nologin +pop:*:68:6:Post Office Owner (popper):/nonexistent:/usr/sbin/nologin wnn:*:69:7:Wnn:/nonexistent:/nonexistent pgsql:*:70:70:PostgreSQL pseudo-user:/usr/local/pgsql:/bin/sh -oracle:*:71:71:Oracle:/usr/local/oracle7:/sbin/nologin +oracle:*:71:71:Oracle:/usr/local/oracle7:/usr/sbin/nologin ircd:*:72:72:IRC daemon:/nonexistent:/nonexistent ircservices:*:73:73:IRC services:/nonexistent:/nonexistent -simscan:*:74:74:Simscan User:/nonexistent:/sbin/nologin +simscan:*:74:74:Simscan User:/nonexistent:/usr/sbin/nologin ifmail:*:75:66:Ifmail user:/nonexistent:/nonexistent -hybserv:*:76:76:HybServ Daemon:/nonexistent:/sbin/nologin +hybserv:*:76:76:HybServ Daemon:/nonexistent:/usr/sbin/nologin virtuoso:*:79:79:Virtuoso Universal Server:/usr/local/virtuoso:/bin/sh -www:*:80:80:World Wide Web Owner:/nonexistent:/sbin/nologin +www:*:80:80:World Wide Web Owner:/nonexistent:/usr/sbin/nologin alias:*:81:81:QMail user:/var/qmail/alias:/nonexistent qmaild:*:82:81:QMail user:/var/qmail:/nonexistent qmaill:*:83:81:QMail user:/var/qmail:/nonexistent @@ -28,101 +28,101 @@ qmailq:*:85:82:QMail user:/var/qmail:/nonexistent qmailr:*:86:82:QMail user:/var/qmail:/nonexistent qmails:*:87:82:QMail user:/var/qmail:/nonexistent -mysql:*:88:88:MySQL Daemon:/var/db/mysql:/sbin/nologin +mysql:*:88:88:MySQL Daemon:/var/db/mysql:/usr/sbin/nologin vpopmail:*:89:89:VPop Mail User:/usr/local/vpopmail:/nonexistent firebird:*:90:90:Firebird Database Administrator:/var/db/firebird:/bin/sh -mailman:*:91:91:Mailman User:/usr/local/mailman:/sbin/nologin -gdm:*:92:92:GDM Sandbox:/:/sbin/nologin +mailman:*:91:91:Mailman User:/usr/local/mailman:/usr/sbin/nologin +gdm:*:92:92:GDM Sandbox:/:/usr/sbin/nologin jabber:*:93:93:Jabber Daemon:/nonexistent:/nonexistent -p4admin:*:94:94:Perforce admin:/usr/local/perforce:/sbin/nologin -interch:*:95:95:Interchange user:/usr/local/interchange:/sbin/nologin +p4admin:*:94:94:Perforce admin:/usr/local/perforce:/usr/sbin/nologin +interch:*:95:95:Interchange user:/usr/local/interchange:/usr/sbin/nologin squeuer:*:96:96:SQueuer Owner:/nonexistent:/bin/sh mud:*:97:97:MUD Owner:/nonexistent:/bin/sh msql:*:98:98:mSQL-2 pseudo-user:/var/db/msqldb:/bin/sh rscsi:*:99:99:Remote SCSI:/usr/local/rscsi:/usr/local/sbin/rscsi -squid:*:100:100:squid caching-proxy pseudo user:/usr/local/squid:/sbin/nologin -quagga:*:101:101:Quagga route daemon pseudo user:/usr/local/etc/quagga:/sbin/nologin -ganglia:*:102:102:Ganglia User:/nonexistent:/sbin/nologin -sgeadmin:*:103:103:Sun Grid Engine Admin:/nonexistent:/sbin/nologin -slimserv:*:104:104:Slim Devices SlimServer pseudo-user:/nonexistent:/sbin/nologin -dnetc:*:105:105:distributed.net client and proxy pseudo-user:/nonexistent:/sbin/nologin -clamav:*:106:106:Clamav Antivirus:/nonexistent:/sbin/nologin -cacti:*:107:107:Cacti Sandbox:/nonexistent:/sbin/nologin +squid:*:100:100:squid caching-proxy pseudo user:/usr/local/squid:/usr/sbin/nologin +quagga:*:101:101:Quagga route daemon pseudo user:/usr/local/etc/quagga:/usr/sbin/nologin +ganglia:*:102:102:Ganglia User:/nonexistent:/usr/sbin/nologin +sgeadmin:*:103:103:Sun Grid Engine Admin:/nonexistent:/usr/sbin/nologin +slimserv:*:104:104:Slim Devices SlimServer pseudo-user:/nonexistent:/usr/sbin/nologin +dnetc:*:105:105:distributed.net client and proxy pseudo-user:/nonexistent:/usr/sbin/nologin +clamav:*:106:106:Clamav Antivirus:/nonexistent:/usr/sbin/nologin +cacti:*:107:107:Cacti Sandbox:/nonexistent:/usr/sbin/nologin webkit:*:108:108:WebKit Default User:/usr/local/www/webkit:/bin/sh -quickml:*:109:109:quickml Server:/nonexistent:/sbin/nologin +quickml:*:109:109:quickml Server:/nonexistent:/usr/sbin/nologin vscan:*:110:110:Scanning Virus Account:/var/amavis:/bin/sh fido:*:111:111:Fido System:/usr/local/fido:/bin/sh -dcc:*:112:112:Distributed Checksum Clearinghouse:/nonexistent:/sbin/nologin -amavis:*:113:113:Amavis-stats Account:/nonexistent:/sbin/nologin -dhis:*:114:114:DHIS Daemon:/nonexistent:/sbin/nologin -_symon:*:115:115:Symon Account:/var/empty:/sbin/nologin -hplip:*:116:116:HPLIP Server:/nonexistent:/sbin/nologin -smokeping:*:117:117:SmokePing Daemon:/nonexistent:/sbin/nologin -ircproxyd:*:118:118:Night Light IRC Proxy:/nonexistent:/sbin/nologin +dcc:*:112:112:Distributed Checksum Clearinghouse:/nonexistent:/usr/sbin/nologin +amavis:*:113:113:Amavis-stats Account:/nonexistent:/usr/sbin/nologin +dhis:*:114:114:DHIS Daemon:/nonexistent:/usr/sbin/nologin +_symon:*:115:115:Symon Account:/var/empty:/usr/sbin/nologin +hplip:*:116:116:HPLIP Server:/nonexistent:/usr/sbin/nologin +smokeping:*:117:117:SmokePing Daemon:/nonexistent:/usr/sbin/nologin +ircproxyd:*:118:118:Night Light IRC Proxy:/nonexistent:/usr/sbin/nologin mythtv:*:119:119:MythTV pseudo-user:/home/mythtv:/bin/sh -pdns_recursor:*:120:120:pdns_recursor pseudo-user:/nonexistent:/sbin/nologin +pdns_recursor:*:120:120:pdns_recursor pseudo-user:/nonexistent:/usr/sbin/nologin otrs:*:121:121:OTRS Administrator:/usr/local/otrs:/bin/csh -zabbix:*:122:122:Zabbix NMS:/nonexistent:/sbin/nologin -_ntp:*:123:123:NTP Daemon:/var/empty:/sbin/nologin -fetchmail:*:124:124:Fetchmail mail-retrieval daemon:/nonexistent:/sbin/nologin -postfix:*:125:125:Postfix Mail System:/var/spool/postfix:/sbin/nologin -navcron:*:127:127:Network Administration Visualized:/usr/local/nav:/sbin/nologin -vchat:*:128:128:VChat Conferencing System:/nonexistent:/sbin/nologin -_bgpd:*:130:130:BGP Daemon:/var/empty:/sbin/nologin -_ospfd:*:131:131:OSPF Daemon:/var/empty:/sbin/nologin +zabbix:*:122:122:Zabbix NMS:/nonexistent:/usr/sbin/nologin +_ntp:*:123:123:NTP Daemon:/var/empty:/usr/sbin/nologin +fetchmail:*:124:124:Fetchmail mail-retrieval daemon:/nonexistent:/usr/sbin/nologin +postfix:*:125:125:Postfix Mail System:/var/spool/postfix:/usr/sbin/nologin +navcron:*:127:127:Network Administration Visualized:/usr/local/nav:/usr/sbin/nologin +vchat:*:128:128:VChat Conferencing System:/nonexistent:/usr/sbin/nologin +_bgpd:*:130:130:BGP Daemon:/var/empty:/usr/sbin/nologin +_ospfd:*:131:131:OSPF Daemon:/var/empty:/usr/sbin/nologin _spamd:*:132:132::0:0:Spam Daemon:/var/empty:/usr/sbin/nologin -dovecot:*:143:143:Dovecot User:/var/empty:/sbin/nologin -rbldns:*:153:153:rbldnsd pseudo-user:/nonexistent:/sbin/nologin -sfs:*:171:171:Self-Certifying File System:/nonexistent:/sbin/nologin +dovecot:*:143:143:Dovecot User:/var/empty:/usr/sbin/nologin +rbldns:*:153:153:rbldnsd pseudo-user:/nonexistent:/usr/sbin/nologin +sfs:*:171:171:Self-Certifying File System:/nonexistent:/usr/sbin/nologin agk:*:172:172:AquaGateKeeper:/nonexistent:/nonexistent -polipo:*:173:173:polipo web cache:/nonexistent:/sbin/nologin -flowtools:*:174:174:Flow-tools collector pseudo-user:/nonexistent:/sbin/nologin -nagios:*:181:181:Nagios pseudo-user:/var/spool/nagios:/sbin/nologin -moinmoin:*:192:192:MoinMoin User:/nonexistent:/sbin/nologin -cups:*:193:193:Cups Owner:/nonexistent:/sbin/nologin -sympa:*:200:200:Sympa Owner:/nonexistent:/sbin/nologin -privoxy:*:201:201:Privoxy proxy user:/nonexistent:/sbin/nologin -dspam:*:202:202:Dspam:/nonexistent:/sbin/nologin +polipo:*:173:173:polipo web cache:/nonexistent:/usr/sbin/nologin +flowtools:*:174:174:Flow-tools collector pseudo-user:/nonexistent:/usr/sbin/nologin +nagios:*:181:181:Nagios pseudo-user:/var/spool/nagios:/usr/sbin/nologin +moinmoin:*:192:192:MoinMoin User:/nonexistent:/usr/sbin/nologin +cups:*:193:193:Cups Owner:/nonexistent:/usr/sbin/nologin +sympa:*:200:200:Sympa Owner:/nonexistent:/usr/sbin/nologin +privoxy:*:201:201:Privoxy proxy user:/nonexistent:/usr/sbin/nologin +dspam:*:202:202:Dspam:/nonexistent:/usr/sbin/nologin shoutcast:*:210:210:Shoutcast sandbox:/nonexistent:/bin/sh bs:*:220:220:Big Sister:/usr/local/bigsister:/bin/sh -postgrey:*:225:225:Postgrey Owner:/nonexistent:/sbin/nologin -fcron:*:247:247:fcron pseudo-user:/nonexistent:/sbin/nologin +postgrey:*:225:225:Postgrey Owner:/nonexistent:/usr/sbin/nologin +fcron:*:247:247:fcron pseudo-user:/nonexistent:/usr/sbin/nologin _tor:*:256:256:Tor anonymising router:/var/db/tor:/bin/sh -_dns-proxy-tor:*:257:257:dns-proxy-tor user:/nonexistent:/sbin/nologin -_trans-proxy-tor:*:258:258:dns-proxy-tor user:/nonexistent:/sbin/nologin +_dns-proxy-tor:*:257:257:dns-proxy-tor user:/nonexistent:/usr/sbin/nologin +_trans-proxy-tor:*:258:258:dns-proxy-tor user:/nonexistent:/usr/sbin/nologin meta1s:*:260:260:MeTA1 SMTPS:/nonexistent:/usr/sbin/nologin meta1q:*:261:261:MeTA1 QMGR:/nonexistent:/usr/sbin/nologin meta1c:*:262:262:MeTA1 SMTPC:/nonexistent:/usr/sbin/nologin meta1m:*:263:263:MeTA1 misc:/nonexistent:/usr/sbin/nologin meta1:*:264:264: X other:/nonexistent:/usr/sbin/nologin -hacluster:*:275:275:Heartbeat cluster user:/nonexistent:/sbin/nologin -mrtg:*:279:279:MRTG daemon:/nonexistent:/sbin/nologin -prelude:*:281:281:Prelude user:/nonexistent:/sbin/nologin -_sphinx:*:312:312::0:0:Sphinxsearch Owner:/nonexistent:/sbin/nologin -dkfilter:*:325:325:DK Filter Owner:/nonexistent:/sbin/nologin -wildfire:*:340:340::0:0:Wildfire Daemon:/nonexistent:/sbin/nologin -stunnel:*:341:341::0:0:Stunnel Daemon:/nonexistent:/sbin/nologin -ldap:*:389:389:OpenLDAP Server:/nonexistent:/sbin/nologin +hacluster:*:275:275:Heartbeat cluster user:/nonexistent:/usr/sbin/nologin +mrtg:*:279:279:MRTG daemon:/nonexistent:/usr/sbin/nologin +prelude:*:281:281:Prelude user:/nonexistent:/usr/sbin/nologin +_sphinx:*:312:312::0:0:Sphinxsearch Owner:/nonexistent:/usr/sbin/nologin +dkfilter:*:325:325:DK Filter Owner:/nonexistent:/usr/sbin/nologin +wildfire:*:340:340::0:0:Wildfire Daemon:/nonexistent:/usr/sbin/nologin +stunnel:*:341:341::0:0:Stunnel Daemon:/nonexistent:/usr/sbin/nologin +ldap:*:389:389:OpenLDAP Server:/nonexistent:/usr/sbin/nologin tiarra:*:398:398:Tiarra IRC Proxy:/nonexistent:/usr/sbin/nologin -drweb:*:426:426:Dr.Web Mail Scanner:/nonexistent:/sbin/nologin -courier:*:465:465:Courier Mail Server:/nonexistent:/sbin/nologin +drweb:*:426:426:Dr.Web Mail Scanner:/nonexistent:/usr/sbin/nologin +courier:*:465:465:Courier Mail Server:/nonexistent:/usr/sbin/nologin _bbstored:*:505:505:BoxBackup Store Daemon:/nonexistent:/bin/sh nullmail:*:522:522:Nullmailer Mail System:/var/spool/nullmailer:/bin/sh -dkimproxy:*:525:525:DKIM Proxy Owner:/nonexistent:/sbin/nologin +dkimproxy:*:525:525:DKIM Proxy Owner:/nonexistent:/usr/sbin/nologin ejabberd:*:544:544:ejabberd pseudo user:/var/spool/ejabberd:/bin/sh -qtss:*:554:554:Darwin Streaming Server:/nonexistent:/sbin/nologin +qtss:*:554:554:Darwin Streaming Server:/nonexistent:/usr/sbin/nologin ircdru:*:555:555:Russian hybrid IRC server:/nonexistent:/bin/sh -messagebus:*:556:556:D-BUS Daemon User:/nonexistent:/sbin/nologin -avahi:*:558:558:Avahi Daemon User:/nonexistent:/sbin/nologin -tacacs:*:559:559:TACACS+ Daemon User:/nonexistent:/sbin/nologin -distcc:*:561:561:Distcc user:/nonexistent:/sbin/nologin -polkit:*:562:562:PolicyKit User:/nonexistent:/sbin/nologin -pulse:*:563:563:PulseAudio System User:/nonexistent:/sbin/nologin -_xsi:*:600:600:XMLSysInfo User:/nonexistent:/sbin/nologin -bnetd:*:700:700:Bnetd user:/nonexistent:/sbin/nologin +messagebus:*:556:556:D-BUS Daemon User:/nonexistent:/usr/sbin/nologin +avahi:*:558:558:Avahi Daemon User:/nonexistent:/usr/sbin/nologin +tacacs:*:559:559:TACACS+ Daemon User:/nonexistent:/usr/sbin/nologin +distcc:*:561:561:Distcc user:/nonexistent:/usr/sbin/nologin +polkit:*:562:562:PolicyKit User:/nonexistent:/usr/sbin/nologin +pulse:*:563:563:PulseAudio System User:/nonexistent:/usr/sbin/nologin +_xsi:*:600:600:XMLSysInfo User:/nonexistent:/usr/sbin/nologin +bnetd:*:700:700:Bnetd user:/nonexistent:/usr/sbin/nologin bopm:*:717:717:Blitzed Open Proxy Monitor:/nonexistent:/bin/sh openxpki:*:777:777:OpenXPKI Owner:/nonexistent:/usr/sbin/nologin netdisco:*:840:840:netdisco daemon:/nonexistent:/usr/sbin/nologin -bacula:*:910:910:Bacula Daemon:/var/db/bacula:/sbin/nologin -iserv:*:911:911:Iserv Daemon:/nonexistent:/sbin/nologin -_sj3:*:912:912:SJ3 Daemon:/nonexistent:/sbin/nologin +bacula:*:910:910:Bacula Daemon:/var/db/bacula:/usr/sbin/nologin +iserv:*:911:911:Iserv Daemon:/nonexistent:/usr/sbin/nologin +_sj3:*:912:912:SJ3 Daemon:/nonexistent:/usr/sbin/nologin ==== //depot/projects/dtrace/ports/UPDATING#33 (text+ko) ==== @@ -6,6 +6,17 @@ time you update your ports collection, before attempting any port upgrades. +20070930: + AFFECTS: everyone + AUTHOR: Mark Linimon <linimon@FreeBSD.org> + + The ports tree has been migrated to the latest version of autoconf, + 2.61. Versions 2.53 and 2.59 were declared obsolete and removed. + + m4 was also updated to 1.10, but this proved to be incompatible and + was rolled back to 1.9. If you are experiencing 'Makefile: not found' + errors, make sure you are not using 1.10. + 20070928: AFFECTS: users of irc/ratbox-services AUTHOR: Lewis <moggie@elasticmind.net> @@ -5693,4 +5704,4 @@ 2) Update all p5-* modules. portupgrade -f p5-\* -$FreeBSD: ports/UPDATING,v 1.550 2007/09/28 01:03:38 edwin Exp $ +$FreeBSD: ports/UPDATING,v 1.551 2007/10/01 04:33:00 linimon Exp $ ==== //depot/projects/dtrace/src/Makefile.inc1#29 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.584 2007/07/10 10:19:45 delphij Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.586 2007/10/01 18:24:46 ru Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -344,8 +344,7 @@ .endfor .for _dir in \ lib usr/bin usr/include usr/lib/compat/aout usr/libdata/ldscripts \ - usr/libexec usr/sbin usr/share/misc \ - usr/share/snmp/defs usr/share/snmp/mibs + usr/libexec usr/sbin usr/share/misc mkdir -p ${WORLDTMP}/${_dir} .endfor mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \ @@ -429,9 +428,7 @@ @echo ">>> stage 5.1: building 32 bit shim libraries" @echo "--------------------------------------------------------------" .for _dir in \ - lib lib32 usr/bin usr/include usr/lib32 usr/libdata/ldscripts \ - usr/libexec usr/sbin usr/share/misc \ - usr/share/snmp/defs usr/share/snmp/mibs + usr/include usr/lib32 usr/share/misc mkdir -p ${LIB32TMP}/${_dir} .endfor mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \ @@ -1048,12 +1045,20 @@ ${_lib_cddl} ${_lib_libgssapi} ${_lib_libipx} \ lib/libkiconv lib/libkvm lib/libmd \ lib/ncurses/ncurses lib/ncurses/ncursesw \ - lib/libopie lib/libpam lib/${DEFAULT_THREAD_LIB} \ + lib/libopie lib/libpam ${_default_thread_lib} \ lib/libradius lib/libsbuf lib/libtacplus lib/libutil \ ${_lib_libypclnt} lib/libz lib/msun \ ${_secure_lib_libcrypto} ${_secure_lib_libssh} \ ${_secure_lib_libssl} gnu/lib/libdwarf +.if ${MK_LIBTHR} != "no" && ${MK_LIBPTHREAD} != "no" +_default_thread_lib= lib/${DEFAULT_THREAD_LIB} +.elif ${MK_LIBTHR} != "no" +_default_thread_lib= lib/libthr +.elif ${MK_LIBPTHREAD} != "no" +_default_thread_lib= lib/libpthread +.endif + _generic_libs= ${_cddl_lib} gnu/lib ${_kerberos5_lib} lib ${_secure_lib} usr.bin/lex/lib lib/libopie__L lib/libtacplus__L: lib/libmd__L ==== //depot/projects/dtrace/src/ObsoleteFiles.inc#22 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.111 2007/09/14 03:07:22 jkoshy Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.112 2007/09/29 22:37:40 bushman Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,11 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20070930: rename of cached to nscd +OLD_FILES+=etc/rc.d/cached +OLD_FILES+=usr/sbin/cached +OLD_FILES+=usr/share/man/man5/cached.conf.5 +OLD_FILES+=usr/share/man/man8/cached.8 # 20070807: removal of PowerPC specific header file. .if ${TARGET_ARCH} == "powerpc" OLD_FILES+=usr/include/machine/interruptvar.h ==== //depot/projects/dtrace/src/UPDATING#16 (text+ko) ==== @@ -21,6 +21,13 @@ developers choose to disable these features on build machines to maximize performance. +20070930: + The PCI code has been made aware of PCI domains. This means that + the location strings as used by pciconf(8) etc are now in the + following format: pci<domain>:<bus>:<device>[:<function>]. It + also means that consumers of <sys/pciio.h> potentially need to + be recompiled; this includes the hal and xorg-server ports. + 20070928: The caching daemon (cached) was renamed to nscd. nscd.conf configuration file should be used instead of cached.conf and @@ -894,4 +901,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.504 2007/09/28 10:38:07 bushman Exp $ +$FreeBSD: src/UPDATING,v 1.505 2007/09/30 11:05:12 marius Exp $ ==== //depot/projects/dtrace/src/cddl/lib/Makefile#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/cddl/lib/Makefile,v 1.4 2007/06/08 12:35:45 pjd Exp $ +# $FreeBSD: src/cddl/lib/Makefile,v 1.5 2007/10/01 18:23:24 ru Exp $ .include <bsd.own.mk> @@ -11,7 +11,9 @@ .if ${MK_ZFS} != "no" _libzfs= libzfs +.if ${MK_LIBTHR} != "no" || ${MK_LIBPTHREAD} != "no" _libzpool= libzpool .endif +.endif .include <bsd.subdir.mk> ==== //depot/projects/dtrace/src/cddl/sbin/zfs/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/cddl/sbin/zfs/Makefile,v 1.2 2007/04/16 21:20:26 ru Exp $ +# $FreeBSD: src/cddl/sbin/zfs/Makefile,v 1.3 2007/10/01 18:17:23 ru Exp $ .PATH: ${.CURDIR}/../../../contrib/opensolaris/cmd/zfs @@ -19,7 +19,9 @@ CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys -DPADD= ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUUTIL} ${LIBZFS} -LDADD= -lgeom -lm -lnvpair -luutil -lzfs +DPADD= ${LIBZFS} ${LIBGEOM} ${LIBBSDXML} ${LIBSBUF} \ + ${LIBM} ${LIBNVPAIR} ${LIBUUTIL} ${LIBUTIL} +LDADD= -lzfs -lgeom -lbsdxml -lsbuf \ + -lm -lnvpair -luutil -lutil .include <bsd.prog.mk> ==== //depot/projects/dtrace/src/cddl/sbin/zpool/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/cddl/sbin/zpool/Makefile,v 1.2 2007/04/16 21:20:26 ru Exp $ +# $FreeBSD: src/cddl/sbin/zpool/Makefile,v 1.3 2007/10/01 18:17:23 ru Exp $ .PATH: ${.CURDIR}/../../../contrib/opensolaris/cmd/zpool @@ -19,7 +19,9 @@ CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys -DPADD= ${LIBAVL} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUUTIL} ${LIBZFS} -LDADD= -lavl -lgeom -lm -lnvpair -luutil -lzfs +DPADD= ${LIBAVL} ${LIBZFS} ${LIBGEOM} ${LIBBSDXML} ${LIBSBUF} \ + ${LIBM} ${LIBNVPAIR} ${LIBUUTIL} ${LIBUTIL} +LDADD= -lavl -lzfs -lgeom -lbsdxml -lsbuf \ + -lm -lnvpair -luutil -lutil .include <bsd.prog.mk> ==== //depot/projects/dtrace/src/cddl/usr.bin/Makefile#4 (text+ko) ==== @@ -1,11 +1,13 @@ -# $FreeBSD: src/cddl/usr.bin/Makefile,v 1.4 2007/06/08 12:35:45 pjd Exp $ +# $FreeBSD: src/cddl/usr.bin/Makefile,v 1.5 2007/10/01 18:23:24 ru Exp $ .include <bsd.own.mk> SUBDIR= ${_ztest} .if ${MK_ZFS} != "no" +.if ${MK_LIBTHR} != "no" || ${MK_LIBPTHREAD} != "no" _ztest= ztest .endif +.endif .include <bsd.subdir.mk> ==== //depot/projects/dtrace/src/cddl/usr.bin/ztest/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/cddl/usr.bin/ztest/Makefile,v 1.3 2007/04/17 15:52:37 pjd Exp $ +# $FreeBSD: src/cddl/usr.bin/ztest/Makefile,v 1.4 2007/10/01 18:17:23 ru Exp $ .PATH: ${.CURDIR}/../../../contrib/opensolaris/cmd/ztest @@ -15,7 +15,8 @@ CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/head CFLAGS+= -I${.CURDIR}/../../lib/libumem -DPADD= ${LIBAVL} ${LIBM} ${LIBNVPAIR} ${LIBPTHREAD} ${LIBUMEM} ${LIBZPOOL} -LDADD= -lavl -lm -lnvpair -lpthread -lumem -lzpool +DPADD= ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \ + ${LIBPTHREAD} ${LIBZ} ${LIBAVL} +LDADD= -lm -lnvpair -lumem -lzpool -lpthread -lz -lavl .include <bsd.prog.mk> ==== //depot/projects/dtrace/src/cddl/usr.sbin/Makefile#3 (text+ko) ==== @@ -1,11 +1,13 @@ -# $FreeBSD: src/cddl/usr.sbin/Makefile,v 1.4 2007/06/08 12:35:45 pjd Exp $ +# $FreeBSD: src/cddl/usr.sbin/Makefile,v 1.5 2007/10/01 18:23:24 ru Exp $ .include <bsd.own.mk> SUBDIR= ${_zdb} .if ${MK_ZFS} != "no" +.if ${MK_LIBTHR} != "no" || ${MK_LIBPTHREAD} != "no" _zdb= zdb .endif +.endif .include <bsd.subdir.mk> ==== //depot/projects/dtrace/src/cddl/usr.sbin/zdb/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/cddl/usr.sbin/zdb/Makefile,v 1.3 2007/04/17 15:52:37 pjd Exp $ +# $FreeBSD: src/cddl/usr.sbin/zdb/Makefile,v 1.4 2007/10/01 18:17:23 ru Exp $ .PATH: ${.CURDIR}/../../../contrib/opensolaris/cmd/zdb @@ -16,7 +16,8 @@ CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/head CFLAGS+= -I${.CURDIR}/../../lib/libumem -DPADD= ${LIBAVL} ${LIBM} ${LIBNVPAIR} ${LIBPTHREAD} ${LIBUMEM} ${LIBZPOOL} -LDADD= -lavl -lm -lnvpair -lpthread -lumem -lzpool +DPADD= ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \ + ${LIBPTHREAD} ${LIBZ} ${LIBAVL} +LDADD= -lm -lnvpair -lumem -lzpool -lpthread -lz -lavl .include <bsd.prog.mk> ==== //depot/projects/dtrace/src/include/Makefile#11 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 1/4/94 -# $FreeBSD: src/include/Makefile,v 1.275 2007/09/23 07:34:21 pjd Exp $ +# $FreeBSD: src/include/Makefile,v 1.276 2007/10/01 18:07:29 ru Exp $ # # Doing a "make install" builds /usr/include. @@ -45,11 +45,13 @@ LSUBDIRS= cam/scsi \ dev/acpica dev/an dev/bktr dev/firewire dev/hwpmc \ dev/ic dev/iicbus ${_dev_ieee488} dev/lmc dev/ofw \ - dev/pbio ${_dev_powermac_nvram} dev/ppbus dev/smbus dev/speaker dev/usb dev/utopia dev/vkbd dev/wi \ + dev/pbio ${_dev_powermac_nvram} dev/ppbus dev/smbus \ + dev/speaker dev/usb dev/utopia dev/vkbd dev/wi \ fs/devfs fs/fdescfs fs/fifofs fs/msdosfs fs/ntfs fs/nullfs \ ${_fs_nwfs} fs/portalfs fs/procfs fs/smbfs fs/udf fs/unionfs \ geom/cache geom/concat geom/eli geom/gate geom/journal geom/label \ - geom/mirror geom/nop geom/raid3 geom/shsec geom/stripe geom/virstor \ + geom/mirror geom/multipath geom/nop \ + geom/raid3 geom/shsec geom/stripe geom/virstor \ netgraph/atm netgraph/netflow \ security/audit \ security/mac_biba security/mac_bsdextended security/mac_lomac \ ==== //depot/projects/dtrace/src/lib/libc/Makefile#10 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 2/3/94 -# $FreeBSD: src/lib/libc/Makefile,v 1.72 2007/05/19 16:38:39 kan Exp $ +# $FreeBSD: src/lib/libc/Makefile,v 1.73 2007/10/01 18:15:10 ru Exp $ SHLIBDIR?= /lib @@ -23,6 +23,7 @@ # # Only link with static libgcc.a (no libgcc_eh.a). # +DPADD+= ${LIBGCC} LDFLAGS+= -nodefaultlibs LDADD+= -lgcc ==== //depot/projects/dtrace/src/lib/libpthread/Makefile#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libpthread/Makefile,v 1.63 2007/05/21 02:49:06 deischen Exp $ +# $FreeBSD: src/lib/libpthread/Makefile,v 1.64 2007/10/01 18:22:31 ru Exp $ # # All library objects contain FreeBSD revision strings by default; they may be # excluded as a space-saving measure. To produce a library that does @@ -10,7 +10,8 @@ .include <bsd.own.mk> -.if ${DEFAULT_THREAD_LIB} == "libpthread" && ${SHLIBDIR} == "/usr/lib" +.if (${DEFAULT_THREAD_LIB} == "libpthread" || ${MK_LIBTHR} == "no") && \ + ${SHLIBDIR} == "/usr/lib" SHLIBDIR= /lib .endif @@ -46,7 +47,7 @@ .include "${.CURDIR}/sys/Makefile.inc" .include "${.CURDIR}/thread/Makefile.inc" -.if ${DEFAULT_THREAD_LIB} == "libpthread" +.if ${DEFAULT_THREAD_LIB} == "libpthread" || ${MK_LIBTHR} == "no" SYMLINKS+=lib${LIB}.a ${LIBDIR}/libpthread.a .if !defined(NO_PIC) SYMLINKS+=lib${LIB}.so ${LIBDIR}/libpthread.so ==== //depot/projects/dtrace/src/lib/libthr/Makefile#10 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libthr/Makefile,v 1.26 2007/06/08 02:21:13 davidxu Exp $ +# $FreeBSD: src/lib/libthr/Makefile,v 1.27 2007/10/01 18:29:55 ru Exp $ # # All library objects contain FreeBSD revision strings by default; they may be # excluded as a space-saving measure. To produce a library that does @@ -10,7 +10,8 @@ .include <bsd.own.mk> -.if ${DEFAULT_THREAD_LIB} == "libthr" && ${SHLIBDIR} == "/usr/lib" +.if (${DEFAULT_THREAD_LIB} == "libthr" || ${MK_LIBPTHREAD} == "no") && \ + ${SHLIBDIR} == "/usr/lib" SHLIBDIR= /lib .endif @@ -43,7 +44,7 @@ .include "${.CURDIR}/sys/Makefile.inc" .include "${.CURDIR}/thread/Makefile.inc" -.if ${DEFAULT_THREAD_LIB} == "libthr" +.if ${DEFAULT_THREAD_LIB} == "libthr" || ${MK_LIBPTHREAD} == "no" SYMLINKS+=lib${LIB}.a ${LIBDIR}/libpthread.a .if !defined(NO_PIC) SYMLINKS+=lib${LIB}.so ${LIBDIR}/libpthread.so ==== //depot/projects/dtrace/src/libexec/atrun/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/libexec/atrun/Makefile,v 1.14 2007/06/15 12:02:16 yar Exp $ +# $FreeBSD: src/libexec/atrun/Makefile,v 1.15 2007/10/01 18:17:23 ru Exp $ MAINSRC=${.CURDIR}/../../usr.bin/at @@ -16,7 +16,7 @@ WFORMAT=0 DPADD= ${LIBPAM} ${LIBUTIL} -LDADD= -lpam -lutil +LDADD= ${MINUSLPAM} -lutil atrun.8: atrun.man @${ECHO} Making ${.TARGET:T} from ${.ALLSRC:T}; \ ==== //depot/projects/dtrace/src/sbin/ggate/Makefile#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sbin/ggate/Makefile,v 1.7 2006/11/26 14:36:33 ru Exp $ +# $FreeBSD: src/sbin/ggate/Makefile,v 1.8 2007/10/01 18:22:31 ru Exp $ >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200710020027.l920RB09057142>