PERFORCE change 107403 for review
John Birrell
jb at FreeBSD.org
Sat Oct 7 01:47:08 PDT 2006
http://perforce.freebsd.org/chv.cgi?CH=107403
Change 107403 by jb at jb_freebsd7 on 2006/10/07 08:46:55
IFC
Affected files ...
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/eresources/chapter.sgml#3 integrate
.. //depot/projects/dtrace/ports/Mk/bsd.openssl.mk#3 integrate
.. //depot/projects/dtrace/src/bin/cp/utils.c#4 integrate
.. //depot/projects/dtrace/src/crypto/openssh/config.h#5 integrate
.. //depot/projects/dtrace/src/etc/defaults/rc.conf#16 integrate
.. //depot/projects/dtrace/src/etc/mtree/BSD.include.dist#5 integrate
.. //depot/projects/dtrace/src/etc/rc.d/mixer#3 integrate
.. //depot/projects/dtrace/src/include/Makefile#5 integrate
.. //depot/projects/dtrace/src/sbin/geom/class/Makefile#3 integrate
.. //depot/projects/dtrace/src/sbin/geom/class/cache/Makefile#1 branch
.. //depot/projects/dtrace/src/sbin/geom/class/cache/geom_cache.c#1 branch
.. //depot/projects/dtrace/src/share/man/man5/rc.conf.5#12 integrate
.. //depot/projects/dtrace/src/share/mk/sys.mk#5 integrate
.. //depot/projects/dtrace/src/usr.bin/calendar/calendars/calendar.australia#3 integrate
.. //depot/projects/dtrace/www/share/mk/doc.xml.mk#5 integrate
Differences ...
==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/eresources/chapter.sgml#3 (text+ko) ====
@@ -1,7 +1,7 @@
<!--
The FreeBSD Documentation Project
- $FreeBSD: doc/en_US.ISO8859-1/books/handbook/eresources/chapter.sgml,v 1.177 2006/06/26 01:38:45 linimon Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/books/handbook/eresources/chapter.sgml,v 1.178 2006/10/07 07:22:28 chinsan Exp $
-->
<appendix id="eresources">
@@ -1579,6 +1579,11 @@
<para><ulink
url="news:it.comp.os.freebsd">it.comp.os.freebsd</ulink> (Italian)</para>
</listitem>
+
+ <listitem>
+ <para><ulink
+ url="news:tw.bbs.comp.386bsd">tw.bbs.comp.386bsd</ulink> (Traditional Chinese)</para>
+ </listitem>
</itemizedlist>
</sect2>
==== //depot/projects/dtrace/ports/Mk/bsd.openssl.mk#3 (text+ko) ====
@@ -2,18 +2,18 @@
# Date created: 31 May 2002
# Whom: dinoex
#
-# $FreeBSD: ports/Mk/bsd.openssl.mk,v 1.31 2006/08/04 12:34:41 erwin Exp $
+# $FreeBSD: ports/Mk/bsd.openssl.mk,v 1.32 2006/10/07 08:15:48 dinoex Exp $
#
# Use of 'USE_OPENSSL=yes' includes this Makefile after bsd.ports.pre.mk
#
# the user/port can now set this options in the makefiles.
#
# WITH_OPENSSL_BASE=yes - Use the version in the base system.
-# WITH_OPENSSL_PORT=yes - Use the port, even if base if up to date
+# WITH_OPENSSL_PORT=yes - Use the port, even if base is up to date
# WITH_OPENSSL_BETA=yes - Use a snapshot of recent openssl
# WITH_OPENSSL_STABLE=yes - Use an older openssl version
#
-# USE_OPENSSL_RPATH=yes - pass RFLAGS options in CFLAGS,
+# USE_OPENSSL_RPATH=yes - Pass RFLAGS options in CFLAGS,
# needed for ports who don't use LDFLAGS
#
# Overrideable defaults:
@@ -118,6 +118,19 @@
OPENSSL_SHLIBVER?= 3
.endif
.else
+.if !defined(OPENSSL_PORT) && \
+ exists(${LOCALBASE}/lib/libcrypto.so)
+# find installed port and use it for dependency
+PKG_DBDIR?= ${DESTDIR}/var/db/pkg
+OPENSSL_INSTALLED!= grep -l -r "libssl.so." "${PKG_DBDIR}" | \
+ while read contents; do \
+ sslprefix=`grep "^@cwd " "$${contents}" | ${HEAD} -n 1`; \
+ if test "$${sslprefix}" = "@cwd ${LOCALBASE_REL}" ; then \
+ echo "$${contents}"; break; fi; done
+OPENSSL_PORT!= grep "^@comment ORIGIN:" "${OPENSSL_INSTALLED}" | ${CUT} -d : -f 2
+OPENSSL_SHLIBFILE!= grep "^lib/libssl.so." "${OPENSSL_INSTALLED}"
+OPENSSL_SHLIBVER?= ${OPENSSL_SHLIBFILE:E}
+.endif
OPENSSL_PORT?= security/openssl
.if ( ${OSVERSION} >= 600100 )
OPENSSL_SHLIBVER?= 5
==== //depot/projects/dtrace/src/bin/cp/utils.c#4 (text+ko) ====
@@ -33,7 +33,7 @@
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.49 2006/08/25 09:58:13 ru Exp $");
+__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.50 2006/10/06 08:30:33 maxim Exp $");
#include <sys/types.h>
#include <sys/acl.h>
@@ -64,7 +64,7 @@
int ch, checkch, from_fd = 0, rcount, rval, to_fd = 0;
ssize_t wcount;
size_t wresid;
- size_t wtotal;
+ off_t wtotal;
char *bufp;
#ifdef VM_AND_BUFFER_CACHE_SYNCHRONIZED
char *p;
==== //depot/projects/dtrace/src/crypto/openssh/config.h#5 (text+ko) ====
@@ -1314,7 +1314,7 @@
/* #undef WORDS_BIGENDIAN */
/* Define if xauth is found in your path */
-#define XAUTH_PATH "/usr/X11R6/bin/xauth"
+/* #undef XAUTH_PATH */
/* Number of bits in a file offset, on hosts where this is settable. */
/* #undef _FILE_OFFSET_BITS */
==== //depot/projects/dtrace/src/etc/defaults/rc.conf#16 (text+ko) ====
@@ -15,7 +15,7 @@
# For a more detailed explanation of all the rc.conf variables, please
# refer to the rc.conf(5) manual page.
#
-# $FreeBSD: src/etc/defaults/rc.conf,v 1.297 2006/09/29 15:45:09 bms Exp $
+# $FreeBSD: src/etc/defaults/rc.conf,v 1.298 2006/10/06 23:22:12 flz Exp $
##############################################################
### Important initial Boot-time options ####################
@@ -535,6 +535,7 @@
# ruleset file.
newsyslog_enable="YES" # Run newsyslog at startup.
newsyslog_flags="-CN" # Newsyslog flags to create marked files
+mixer_enable="YES" # Run the sound mixer.
##############################################################
### Jail Configuration #######################################
==== //depot/projects/dtrace/src/etc/mtree/BSD.include.dist#5 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.108 2006/09/07 18:24:24 emax Exp $
+# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.109 2006/10/06 08:27:07 ru Exp $
#
# Please see the file src/etc/mtree/README before making changes to this file.
#
@@ -100,6 +100,8 @@
..
..
geom
+ cache
+ ..
concat
..
eli
==== //depot/projects/dtrace/src/etc/rc.d/mixer#3 (text+ko) ====
@@ -24,7 +24,7 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD: src/etc/rc.d/mixer,v 1.6 2005/12/10 19:49:03 dougb Exp $
+# $FreeBSD: src/etc/rc.d/mixer,v 1.7 2006/10/06 23:22:13 flz Exp $
#
# PROVIDE: mixer
@@ -34,6 +34,7 @@
. /etc/rc.subr
name="mixer"
+rcvar="mixer_enable"
stop_cmd="mixer_stop"
start_cmd="mixer_start"
reload_cmd="mixer_start"
==== //depot/projects/dtrace/src/include/Makefile#5 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.2 (Berkeley) 1/4/94
-# $FreeBSD: src/include/Makefile,v 1.263 2006/09/07 18:24:24 emax Exp $
+# $FreeBSD: src/include/Makefile,v 1.264 2006/10/06 08:27:06 ru Exp $
#
# Doing a "make install" builds /usr/include.
@@ -45,8 +45,8 @@
fs/devfs fs/fdescfs fs/fifofs fs/msdosfs fs/ntfs fs/nullfs \
${_fs_nwfs} fs/portalfs fs/procfs fs/smbfs fs/udf fs/umapfs \
fs/unionfs \
- geom/concat geom/eli geom/gate geom/label geom/mirror geom/nop \
- geom/raid3 geom/shsec geom/stripe \
+ geom/cache geom/concat geom/eli geom/gate geom/label geom/mirror \
+ geom/nop geom/raid3 geom/shsec geom/stripe \
isofs/cd9660 \
netatm/ipatm netatm/sigpvc netatm/spans netatm/uni \
netgraph/atm netgraph/netflow \
==== //depot/projects/dtrace/src/sbin/geom/class/Makefile#3 (text+ko) ====
@@ -1,8 +1,9 @@
-# $FreeBSD: src/sbin/geom/class/Makefile,v 1.11 2006/03/17 18:54:30 ru Exp $
+# $FreeBSD: src/sbin/geom/class/Makefile,v 1.12 2006/10/06 08:27:06 ru Exp $
.include <bsd.own.mk>
-SUBDIR= concat
+SUBDIR= cache
+SUBDIR+=concat
.if ${MK_OPENSSL} != "no"
SUBDIR+=eli
.endif
==== //depot/projects/dtrace/src/share/man/man5/rc.conf.5#12 (text+ko) ====
@@ -22,9 +22,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.307 2006/09/29 15:45:10 bms Exp $
+.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.308 2006/10/06 23:22:13 flz Exp $
.\"
-.Dd September 29, 2006
+.Dd October 6, 2006
.Dt RC.CONF 5
.Os
.Sh NAME
@@ -3612,6 +3612,11 @@
autobridge_interfaces="bridge0"
autobridge_bridge0="tap* dc0 vlan[345]"
.Ed
+.It mixer_enable
+.Pq Vt bool
+If set to
+.Dq Li YES ,
+enable support for sound mixer.
.El
.Sh FILES
.Bl -tag -width ".Pa /etc/defaults/rc.conf" -compact
@@ -3668,6 +3673,7 @@
.Xr lpd 8 ,
.Xr mdconfig 8 ,
.Xr mdmfs 8 ,
+.Xr mixer 8,
.Xr mountd 8 ,
.Xr moused 8 ,
.Xr mrouted 8 ,
==== //depot/projects/dtrace/src/share/mk/sys.mk#5 (text+ko) ====
@@ -1,5 +1,5 @@
# from: @(#)sys.mk 8.2 (Berkeley) 3/21/94
-# $FreeBSD: src/share/mk/sys.mk,v 1.87 2005/09/28 08:17:30 ru Exp $
+# $FreeBSD: src/share/mk/sys.mk,v 1.88 2006/10/06 23:32:23 lesi Exp $
unix ?= We run FreeBSD, not UNIX.
.FreeBSD ?= true
@@ -19,8 +19,6 @@
.SUFFIXES: .out .a .ln .o .c .cc .cpp .cxx .C .m .F .f .e .r .y .l .S .asm .s .cl .p .h .sh
.endif
-X11BASE ?= /usr/X11R6
-
AR ?= ar
.if defined(%POSIX)
ARFLAGS ?= -rv
==== //depot/projects/dtrace/src/usr.bin/calendar/calendars/calendar.australia#3 (text+ko) ====
@@ -1,7 +1,7 @@
/*
* Australian holidays
*
- * $FreeBSD: src/usr.bin/calendar/calendars/calendar.australia,v 1.6 2004/11/21 23:05:06 grog Exp $
+ * $FreeBSD: src/usr.bin/calendar/calendars/calendar.australia,v 1.7 2006/10/06 23:20:01 flz Exp $
*/
#ifndef _calendar_australia_
@@ -55,4 +55,4 @@
5/MonFirst Labour Day (Qld)
Aug 14 RNA Show Day (Brisbane metro)
-#endif+#endif
==== //depot/projects/dtrace/www/share/mk/doc.xml.mk#5 (text+ko) ====
@@ -1,5 +1,5 @@
# doc.xml.mk
-# $FreeBSD: www/share/mk/doc.xml.mk,v 1.10 2006/09/22 21:05:03 hrs Exp $
+# $FreeBSD: www/share/mk/doc.xml.mk,v 1.11 2006/10/07 04:05:33 trhodes Exp $
XML_CATALOG_FILES= file://${.OBJDIR}/catalog-cwd.xml \
file://${DOC_PREFIX}/${LANGCODE}/share/sgml/catalog.xml \
@@ -57,6 +57,7 @@
DEPENDSET.DEFAULT+= wwwstd
+.if !defined(WEB_ONLY)
# DEPENDSET: transtable ......................................................
_DEPENDSET.transtable= ${XML_TRANSTABLE} ${XSL_TRANSTABLE} \
${XSL_TRANSTABLE_MASTER} ${XSL_TRANSTABLE_COMMON}
@@ -116,6 +117,7 @@
CLEANFILES+= ${XML_MIRRORS}.sort
CLEANFILES+= ${XML_MIRRORS}.sort.tmp
.endif
+.endif # !defined(WEB_ONLY)
# DEPENDSET: usergroups ......................................................
_DEPENDSET.usergroups= ${XML_USERGROUPS} ${XML_USERGROUPS_LOCAL} \
More information about the p4-projects
mailing list