PERFORCE change 124067 for review

Christopher Davis loafier at FreeBSD.org
Wed Jul 25 06:08:29 UTC 2007 

http://perforce.freebsd.org/chv.cgi?CH=124067

Change 124067 by loafier at chrisdsoc on 2007/07/25 06:07:24

	Integrate

Affected files ...

.. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/portbuild/article.sgml#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/faq/book.sgml#3 integrate
.. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml#3 integrate
.. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/handbook/ports/chapter.sgml#3 integrate
.. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#3 integrate
.. //depot/projects/soc2007/loafier_busalloc/ports/CHANGES#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/ports/LEGAL#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/ports/MOVED#3 integrate
.. //depot/projects/soc2007/loafier_busalloc/ports/Mk/bsd.apache.mk#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/ports/Mk/bsd.gnome.mk#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/ports/Mk/bsd.port.mk#3 integrate
.. //depot/projects/soc2007/loafier_busalloc/ports/Mk/bsd.xorg.mk#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/ports/Tools/portbuild/scripts/dopackagestats#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/ports/UPDATING#3 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/contrib/openbsm/HISTORY#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/contrib/openbsm/README#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/contrib/openbsm/VERSION#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/contrib/openbsm/bin/audit/audit.8#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/contrib/openbsm/bin/audit/audit.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/contrib/openbsm/bin/auditd/audit_warn.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/contrib/openbsm/bin/auditd/auditd.8#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/contrib/openbsm/bin/auditd/auditd.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/contrib/openbsm/bin/auditd/auditd.h#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/contrib/openbsm/bin/auditreduce/auditreduce.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/contrib/openbsm/config/config.h#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/contrib/openbsm/configure#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/contrib/openbsm/configure.ac#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/contrib/openbsm/etc/audit_event#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/contrib/openbsm/libbsm/au_control.3#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/contrib/openbsm/libbsm/au_event.3#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/contrib/openbsm/libbsm/audit_submit.3#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/contrib/openbsm/libbsm/bsm_io.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/contrib/openbsm/libbsm/bsm_token.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/etc/mtree/BSD.usr.dist#3 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/lib/libarchive/archive_read_support_compression_program.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/lib/libc/net/sctp_sys_calls.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/lib/libc/stdlib/getenv.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/lib/libc/yp/yplib.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/lib/libpam/modules/pam_lastlog/pam_lastlog.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/lib/ncurses/config.mk#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/lib/ncurses/ncurses/Makefile#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/libexec/getty/ttys.5#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#3 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sbin/Makefile#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sbin/iscontrol/Makefile#1 branch
.. //depot/projects/soc2007/loafier_busalloc/src/sbin/iscontrol/auth_subr.c#1 branch
.. //depot/projects/soc2007/loafier_busalloc/src/sbin/iscontrol/config.c#1 branch
.. //depot/projects/soc2007/loafier_busalloc/src/sbin/iscontrol/fsm.c#1 branch
.. //depot/projects/soc2007/loafier_busalloc/src/sbin/iscontrol/iscontrol.8#1 branch
.. //depot/projects/soc2007/loafier_busalloc/src/sbin/iscontrol/iscontrol.c#1 branch
.. //depot/projects/soc2007/loafier_busalloc/src/sbin/iscontrol/iscontrol.h#1 branch
.. //depot/projects/soc2007/loafier_busalloc/src/sbin/iscontrol/iscsi.conf.5#1 branch
.. //depot/projects/soc2007/loafier_busalloc/src/sbin/iscontrol/login.c#1 branch
.. //depot/projects/soc2007/loafier_busalloc/src/sbin/iscontrol/misc.c#1 branch
.. //depot/projects/soc2007/loafier_busalloc/src/sbin/iscontrol/pdu.c#1 branch
.. //depot/projects/soc2007/loafier_busalloc/src/sbin/iscontrol/pdu.h#1 branch
.. //depot/projects/soc2007/loafier_busalloc/src/share/examples/kld/syscall/module/syscall.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/share/man/man4/Makefile#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/share/man/man4/iscsi_initiator.4#1 branch
.. //depot/projects/soc2007/loafier_busalloc/src/share/man/man4/udav.4#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/share/man/man4/usb.4#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/share/man/man7/ports.7#3 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/share/man/man8/rc.8#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/share/mk/version_gen.awk#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/amd64/isa/clock.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/bsm/audit.h#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/bsm/audit_internal.h#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/bsm/audit_kevents.h#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/bsm/audit_record.h#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/cam/scsi/scsi_cd.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/compat/ndis/subr_ntoskrnl.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/conf/NOTES#3 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/conf/files#3 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/conf/options#3 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/dev/acpica/acpi_hpet.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/dev/firewire/firewire.c#3 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/dev/firewire/firewirereg.h#3 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/dev/iscsi/initiator/isc_cam.c#1 branch
.. //depot/projects/soc2007/loafier_busalloc/src/sys/dev/iscsi/initiator/isc_sm.c#1 branch
.. //depot/projects/soc2007/loafier_busalloc/src/sys/dev/iscsi/initiator/isc_soc.c#1 branch
.. //depot/projects/soc2007/loafier_busalloc/src/sys/dev/iscsi/initiator/isc_subr.c#1 branch
.. //depot/projects/soc2007/loafier_busalloc/src/sys/dev/iscsi/initiator/iscsi.c#1 branch
.. //depot/projects/soc2007/loafier_busalloc/src/sys/dev/iscsi/initiator/iscsi.h#1 branch
.. //depot/projects/soc2007/loafier_busalloc/src/sys/dev/iscsi/initiator/iscsi_subr.c#1 branch
.. //depot/projects/soc2007/loafier_busalloc/src/sys/dev/iscsi/initiator/iscsivar.h#1 branch
.. //depot/projects/soc2007/loafier_busalloc/src/sys/dev/msk/if_msk.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/dev/nfe/if_nfe.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/dev/nfe/if_nfevar.h#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/dev/ral/rt2560.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/dev/ral/rt2661.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/dev/re/if_re.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/dev/sym/sym_hipd.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/dev/usb/if_udav.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/dev/usb/usb_quirks.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/dev/usb/usbdevs#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/fs/coda/coda_vfsops.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/fs/coda/coda_vnops.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/fs/msdosfs/msdosfs_fat.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/fs/msdosfs/msdosfs_vfsops.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/fs/msdosfs/msdosfs_vnops.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/fs/tmpfs/tmpfs_vfsops.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/i386/isa/clock.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/i386/linux/linux_machdep.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/ia64/ia64/clock.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/kern/kern_kse.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/kern/kern_rwlock.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/kern/kern_thread.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/kern/sched_ule.c#3 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/kern/subr_clock.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/kern/tty.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/modules/Makefile#3 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/modules/iscsi/Makefile#1 branch
.. //depot/projects/soc2007/loafier_busalloc/src/sys/modules/iscsi/initiator/Makefile#1 branch
.. //depot/projects/soc2007/loafier_busalloc/src/sys/net80211/ieee80211_scan_sta.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/netinet/icmp_var.h#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/netinet/ip_icmp.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/netinet/sctp_asconf.c#3 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/netinet/sctp_asconf.h#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/netinet/sctp_indata.c#3 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/netinet/sctp_input.c#3 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/netinet/sctp_os_bsd.h#3 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/netinet/sctp_output.c#3 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/netinet/sctp_pcb.c#3 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/netinet/sctp_pcb.h#3 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/netinet/sctp_structs.h#3 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/netinet/sctp_timer.c#3 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/netinet/sctp_usrreq.c#3 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/netinet/sctputil.c#3 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/netinet/sctputil.h#3 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/netinet6/sctp6_usrreq.c#3 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/netinet6/udp6_output.c#2 delete
.. //depot/projects/soc2007/loafier_busalloc/src/sys/netinet6/udp6_usrreq.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/netinet6/udp6_var.h#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/pc98/cbus/clock.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/pci/if_rl.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/pci/if_rlreg.h#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/security/mac_mls/mac_mls.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/sparc64/sparc64/eeprom.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/sparc64/sparc64/rtc.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/sys/proc.h#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/sys/rwlock.h#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/vm/vm_fault.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/tools/regression/environ/envctl.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/tools/regression/environ/envtest.t#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/tools/regression/environ/timings.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/usr.bin/locate/locate/locate.rc#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/usr.bin/su/su.1#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/usr.bin/tar/Makefile#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/usr.bin/tar/getdate.y#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/usr.bin/tar/read.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/usr.sbin/periodic/periodic.8#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/www/en/docs/Makefile#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/www/en/docs/man.sgml#2 delete
.. //depot/projects/soc2007/loafier_busalloc/www/en/internal/machines.sgml#3 integrate
.. //depot/projects/soc2007/loafier_busalloc/www/en/search/site.map#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/www/en/search/web.atoz#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/www/share/sgml/navibar.ent#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/www/zh_CN/includes.xsl#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/www/zh_CN/share/sgml/navibar.l10n.ent#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/www/zh_TW/share/sgml/navibar.l10n.ent#2 integrate

Differences ...

==== //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/portbuild/article.sgml#2 (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.17 2007/06/22 09:08:32 ceri Exp $</pubdate>
+    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/portbuild/article.sgml,v 1.19 2007/07/23 09:13:13 linimon Exp $</pubdate>
 
     <copyright>
       <year>2003</year>
@@ -809,42 +809,85 @@
       <command>cdrom.sh</command> before preparing
       the final package set for a release.</para>
 
-    <para>Packages can be copied to the staging area on
+    <para>The package subdirectories are named by whether they are for
+      <literal>release</literal>, <literal>stable</literal>, or
+      <literal>current</literal>.  Examples:</para>
+
+    <itemizedlist>
+      <listitem>
+	<para><literal>packages-6.1-release</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>packages-6.2-release</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>packages-6-stable</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>packages-7-current</literal></para>
+      </listitem>
+    </itemizedlist>
+
+    <note><para>Some of the directories on
+      <hostid>ftp-master</hostid> are, in fact, symlinks.  Examples:</para>
+
+      <itemizedlist>
+	<listitem>
+	  <para><literal>packages-stable</literal></para>
+	</listitem>
+
+	<listitem>
+	  <para><literal>packages-current</literal></para>
+	</listitem>
+      </itemizedlist>
+
+      <para> Be sure
+	you move the new packages directory over the
+	<emphasis>real</emphasis> destination directory, and not
+	one of the symlinks that points to it.</para>
+    </note>
+
+    <para>If you are doing a completely new package set (e.g. for
+      a new release), copy packages to the staging area on
       <hostid>ftp-master</hostid> with something like the following:</para>
 
     <screen>&prompt.root; <userinput>cd /var/portbuild/<replaceable>${arch}</replaceable>/<replaceable>${branch}</replaceable></userinput>
-&prompt.root; <userinput>tar cfv - packages/ | ssh portmgr at ftp-master tar xfC - w/ports/<replaceable>${arch}</replaceable>/tmp/<replaceable>${branch}</replaceable></userinput></screen>
+&prompt.root; <userinput>tar cfv - packages/ | ssh portmgr at ftp-master tar xfC - w/ports/<replaceable>${arch}</replaceable>/tmp/<replaceable>${subdir}</replaceable></userinput></screen>
 
     <para>Then log into <hostid>ftp-master</hostid>, verify that
       the package set was transferred successfully, remove the
       package set that the new package set is to replace (in
       <filename>~/w/ports/<replaceable>${arch}</replaceable></filename>),
-      and move the new set into place.</para>
+      and move the new set into place.  (<literal>w/</literal> is
+      merely a shortcut.)</para>
 
-    <note><para>Some of the directories on
-      <hostid>ftp-master</hostid> are, in fact, symlinks.  Be sure
-      you move the new packages directory over the
-      <emphasis>real</emphasis> destination directory, and not
-      one of the symlinks that points to it.</para></note>
-
     <para>For incremental builds, packages should be uploaded
       using <command>rsync</command> so we do not put too much
-      strain on the mirrors:</para>
-
-    <screen>&prompt.root; <userinput>rsync -n -r -v -l -t -p --delete packages/ portmgr at ftp-master:w/ports/<replaceable>${arch}</replaceable>/<replaceable>${branch}</replaceable>/ | tee log</userinput></screen>
+      strain on the mirrors.</para>
 
-    <para>Distfiles can be transferred via
-      <command>rsync</command>:</para>
-
-    <screen>&prompt.root; <userinput>cd /var/portbuild/<replaceable>${arch}</replaceable>/<replaceable>${branch}</replaceable></userinput>
-&prompt.root; <userinput>rsync -r -v -l -p -c -n distfiles/ portmgr at ftp-master:w/ports/distfiles/ | tee log</userinput></screen>
-
     <para><emphasis>ALWAYS</emphasis> use <literal>-n</literal>
       first with <command>rsync</command> and check the output
       to make sure it is sane.  If it looks good, re-run the
       <command>rsync</command> without the <literal>-n</literal>
       option.
     </para>
+
+    <para>Example <command>rsync</command> command for incremental
+      package upload:</para>
+
+    <screen>&prompt.root; <userinput>rsync -n -r -v -l -t -p --delete packages/ portmgr at ftp-master:w/ports/<replaceable>${arch}</replaceable>/<replaceable>${subdir}</replaceable>/ | tee log</userinput></screen>
+
+    <para>Distfiles can also be transferred via
+      <command>rsync</command>:</para>
+
+    <screen>&prompt.root; <userinput>cd /var/portbuild/<replaceable>${arch}</replaceable>/<replaceable>${branch}</replaceable></userinput>
+&prompt.root; <userinput>rsync -n -r -v -l -p -c -n distfiles/ portmgr at ftp-master:w/ports/distfiles/ | tee log</userinput></screen>
+
+    <para>Again, run the command without the <literal>-n</literal>
+      option after you have checked it.</para>
   </sect1>
 
   <sect1 id="expbuilds">

==== //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/faq/book.sgml#3 (text+ko) ====

@@ -10,7 +10,7 @@
 
     <corpauthor>The FreeBSD Documentation Project</corpauthor>
 
-    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/books/faq/book.sgml,v 1.802 2007/07/17 18:04:02 chinsan Exp $</pubdate>
+    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/books/faq/book.sgml,v 1.804 2007/07/23 16:49:01 chinsan Exp $</pubdate>
 
     <copyright>
       <year>1995</year>
@@ -4329,33 +4329,19 @@
             <itemizedlist>
               <listitem>
                 <para><ulink
-                  url="http://www.scc.nl/~marcel/howto-oracle.html">
-                  http://www.scc.nl/~marcel/howto-oracle.html</ulink></para>
+		  url="http://www.unixcities.com/oracle/index.html">
+		  http://www.unixcities.com/oracle/index.html</ulink></para>
               </listitem>
 
               <listitem>
                 <para><ulink
-                  url="http://www.lf.net/lf/pi/oracle/install-linux-oracle-on-freebsd">
+		  url="http://www.shadowcom.net/freebsd-oracle9i/">
+		  http://www.shadowcom.net/freebsd-oracle9i/</ulink></para>
 
-                  http://www.lf.net/lf/pi/oracle/install-linux-oracle-on-freebsd</ulink></para>
-
               </listitem>
             </itemizedlist>
         </answer>
       </qandaentry>
-
-      <qandaentry>
-        <question id="commercial-webbrowsers">
-          <para>Are there any commercial web browsers available for &os;?</para>
-        </question>
-
-        <answer>
-          <para>Yes.  Opera is a multi-platform web browser and is available for &os;.
-            See <ulink url="http://www.opera.com/">www.opera.com</ulink> for details.
-            A version of Opera, paid for by banner ads, is also available in ports.</para>
-        </answer>
-      </qandaentry>
-
     </qandaset>
   </chapter>
 

==== //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml#3 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml,v 1.360 2007/07/16 14:51:07 chinsan Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml,v 1.361 2007/07/19 20:20:12 blackend Exp $
 -->
 
 <chapter id="install">
@@ -4146,7 +4146,11 @@
 	    <para>Now you have to connect to that machine with
 	      &man.cu.1;:</para> 
 
-	    <screen>&prompt.root; <userinput>cu -l /dev/cuaa0</userinput></screen>
+	    <screen>&prompt.root; <userinput>cu -l /dev/cuad0</userinput></screen>
+
+	    <para>On &os;&nbsp;5.X, use
+	      <filename>/dev/cuaa0</filename> instead of
+	      <filename>/dev/cuad0</filename>.</para>
 	  </step>
       </procedure>
 

==== //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/handbook/ports/chapter.sgml#3 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/ports/chapter.sgml,v 1.266 2007/07/19 01:21:23 chinsan Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/ports/chapter.sgml,v 1.267 2007/07/20 12:00:25 chinsan Exp $
 -->
 
 <chapter id="ports">
@@ -1260,42 +1260,6 @@
 
 	<para>For further information see &man.portmanager.1;.</para>
       </sect3>
-
-      <sect3 id="bpkg">
-	<title>Upgrading Packages and Ports using Bpkg</title>
-
-	<indexterm>
-	  <primary>bpkg</primary>
-	</indexterm>
-
-	<para><application>Bpkg</application> is a simple yet powerful tool
-	  written in &man.sh.1; by Andy Kosela.  It was designed with the goal
-	  to provide one universal tool for packages/ports management.
-	  <application>Bpkg</application> can deal with binary packages
-	  and ports, making it real useful for people who use both.  It is 
-	  available from the <filename role="package">ports-mgmt/bpkg
-	  </filename> port:</para>
-
-	<screen>&prompt.root; <userinput>cd <filename role="directory">/usr/ports/ports-mgmt/bpkg</filename></userinput>
-&prompt.root; <userinput>make install clean</userinput></screen>
-
-	<para>All the installed ports can be upgraded with interactive
-	  mode using this simple command:</para>
-
-	<screen>&prompt.root; <userinput>bpkg -a</userinput></screen>
-
-	<para>All the installed ports can be upgraded with non-interactive
-	  mode using this simple command:</para>
-
-	<screen>&prompt.root; <userinput>bpkg -A</userinput></screen>
-
-	<para>You can also display most recently installed packages:</para>
-
-	<screen>&prompt.user; <userinput>bpkg -t | head</userinput></screen>
-
-	<para>For further information see 
-	  <application>Bpkg</application>'s manual page.</para>
-      </sect3>
     </sect2>
 
     <sect2 id="ports-disk-space">

==== //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#3 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.857 2007/07/16 21:42:32 lofi Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.860 2007/07/23 13:45:01 rafan Exp $
 -->
 
 <!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
@@ -4579,6 +4579,8 @@
 	  <literal>GNU_CONFIGURE=yes</literal>.  If you want to give extra
 	  arguments to the <command>configure</command> script (the default
 	  argument is <literal>--prefix=&dollar;{PREFIX}
+	  --infodir=&dollar;{PREFIX}/&dollar;{INFO_PATH}
+	  --mandir=&dollar;{MANPREFIX}/man
 	  &dollar;{CONFIGURE_TARGET}</literal>), set those
 	  extra arguments in <makevar>CONFIGURE_ARGS</makevar>.  Extra
 	  environment variables can be passed using

==== //depot/projects/soc2007/loafier_busalloc/ports/CHANGES#2 (text+ko) ====

@@ -10,6 +10,12 @@
 
 All ports committers are allowed to commit to this file.
 
+20070723:
+AUTHOR: rafan at FreeBSD.org
+
+  * The default CONFIGURE_ARGS when GNU_CONFIGURE is set now contains
+    --mandir and --infodir if configure script supports them.
+
 20070712:
 AUTHOR: maho at FreeBSD.org
 
@@ -1366,4 +1372,4 @@
 Contact Erwin Lansing if you have any questions about your use of
 this document.
 
-$FreeBSD: ports/CHANGES,v 1.74 2007/07/12 01:57:09 maho Exp $
+$FreeBSD: ports/CHANGES,v 1.75 2007/07/24 01:43:31 rafan Exp $

==== //depot/projects/soc2007/loafier_busalloc/ports/LEGAL#2 (text+ko) ====

@@ -1,5 +1,5 @@
 # Creator:  Jordan Hubbard
-# $FreeBSD: ports/LEGAL,v 1.542 2007/06/07 08:59:34 miwi Exp $
+# $FreeBSD: ports/LEGAL,v 1.543 2007/07/23 02:09:24 rafan Exp $
 
    **********************************************************************
    ***                      NOTE TO COMMITTERS                        ***
@@ -226,7 +226,7 @@
 						distribution without permission
 fp-freebsd-ws-*		security/f-prot		Free for personal use only
 freefem++-*		math/freefem++		No resale, not for commercial usage
-framework-*		security/metasploit-devel	May not be re-sold
+framework-*		security/metasploit	May not be re-sold
 freefonts-*		x11-fonts/freefonts	Some of the fonts are
 						shareware.  Some are freeware.
 						Permission must be obtained

==== //depot/projects/soc2007/loafier_busalloc/ports/MOVED#3 (text+ko) ====

@@ -1,7 +1,7 @@
 #
 # MOVED - a list of (recently) moved or removed ports
 #
-# $FreeBSD: ports/MOVED,v 1.1426 2007/07/16 17:04:58 nobutaka Exp $
+# $FreeBSD: ports/MOVED,v 1.1430 2007/07/23 13:52:04 danfe Exp $
 #
 # Each entry consists of a single line containing the following four
 # fields in the order named, separated with the pipe (`|') character:
@@ -3101,3 +3101,8 @@
 devel/libslang2-devel||2007-07-11|Non-devel port have newer version
 graphics/hpoj||2007-07-14|Expired: project discontinued, please switch to print/hplip
 net/jffnms|net-mgmt/jffnms|2007-07-14|move to net-mgmt/jffnms
+java/linux-blackdown-jdk13||2007-07-22|Expired: unfixed security vulnerability
+devel/rx||2007-07-22|Expired: has been decommissioned and is no longer developed
+security/metasploit-devel|security/metasploit|2007-07-23|move to security/metasploit
+x11/nvidia-driver-7184|x11/nvidia-driver-71xx|2007-07-23|moved to x11/nvidia-driver-71xx
+x11/nvidia-driver-9631|x11/nvidia-driver-96xx|2007-07-23|moved to x11/nvidia-driver-96xx

==== //depot/projects/soc2007/loafier_busalloc/ports/Mk/bsd.apache.mk#2 (text+ko) ====

@@ -1,7 +1,7 @@
 #-*- mode: makefile; tab-width: 4; -*-
 # ex:ts=4
 #
-# $FreeBSD: ports/Mk/bsd.apache.mk,v 1.14 2007/06/28 15:50:53 pav Exp $
+# $FreeBSD: ports/Mk/bsd.apache.mk,v 1.16 2007/07/22 12:43:00 clement Exp $
 #
 # bsd.apache.mk - Apache related macros.
 # Author: Clement Laforet <clement at FreeBSD.org>
@@ -15,8 +15,15 @@
 #		<version>: 1.3/13/2.0/20/2.1/2.2/1.3+/2.0+/2.1+/2.2+
 #		common*: common13, common20, common21 and common22
 #
+# Note: Setting USE_APACHE to "yes" is deprecated. It will set 
+# APACHE_PORT to www/apache13 and if WITH_APACHE2 (deprecated too)
+# is defined, APACHE_PORT will be set to www/apache20
 #
-#
+
+#.if !defined(_POSTMKINCLUDED) && !defined(Apache_Pre_Include)
+
+Apache_Pre_Include=		bsd.apache.mk
+
 .if defined(APACHE_COMPAT)
 USE_APACHE=yes
 .endif
@@ -303,13 +310,13 @@
 APACHEMODDIR=	libexec/apache2
 APACHEINCLUDEDIR=include/apache2
 APACHEETCDIR=	etc/apache2
-APACHE_PORT=	www/apache${APACHE_VERSION}
+APACHE_PORT?=	www/apache${APACHE_VERSION}
 .elif ${APACHE_VERSION} >= 21
 AP_BUILDEXT=	la
 APACHEMODDIR=	libexec/apache${APACHE_VERSION}
 APACHEINCLUDEDIR=include/apache${APACHE_VERSION}
 APACHEETCDIR=	etc/apache${APACHE_VERSION}
-APACHE_PORT=	www/apache${APACHE_VERSION}
+APACHE_PORT?=	www/apache${APACHE_VERSION}
 .else
 AP_BUILDEXT=	so
 APACHEMODDIR=	libexec/apache
@@ -346,6 +353,10 @@
 
 .endif
 
+#.endif #!defined(_POSTMKINCLUDED) && !defined(Apache_Pre_Include)
+#.if defined(_POSTMKINCLUDED) && !defined(Apache_Post_Include)
+Apache_Post_Include=                    bsd.apache.mk
+
 .if defined(AP_PORT_IS_SERVER)
 .if !target(print-closest-mirrors)
 print-closest-mirrors:
@@ -412,7 +423,6 @@
 do-install:
 	@${APXS} -i -A -n ${SHORTMODNAME} ${WRKSRC}/${MODULENAME}.${AP_BUILDEXT}
 .endif
-
 .endif
-
 .endif
+#.endif          # defined(_POSTMKINCLUDED) && !defined(Apache_Post_Include)

==== //depot/projects/soc2007/loafier_busalloc/ports/Mk/bsd.gnome.mk#2 (text+ko) ====

@@ -1,7 +1,7 @@
 #-*- mode: Fundamental; tab-width: 4; -*-
 # ex:ts=4
 #
-# $FreeBSD: ports/Mk/bsd.gnome.mk,v 1.141 2007/06/28 16:02:48 pav Exp $
+# $FreeBSD: ports/Mk/bsd.gnome.mk,v 1.142 2007/07/23 09:35:27 rafan Exp $
 #	$NetBSD: $
 #     $MCom: ports/Mk/bsd.gnome.mk,v 1.414 2007/03/13 01:24:54 marcus Exp $
 #
@@ -116,8 +116,7 @@
 			   --with-html-dir=${DESTDIR}${GNOME_HTML_DIR} \
 			   --with-help-dir=${TARGETDIR}/share/gnome/help \
 			   --disable-gtk-doc \
-			   --with-gconf-source=${GCONF_CONFIG_SOURCE} \
-			   --mandir=${PREFIX}/man
+			   --with-gconf-source=${GCONF_CONFIG_SOURCE}
 gnomeprefix_USE_GNOME_IMPL=gnomehier
 .if !defined(WITHOUT_HACK)
 gnomeprefix_PREFIX=${LOCALBASE}

==== //depot/projects/soc2007/loafier_busalloc/ports/Mk/bsd.port.mk#3 (text+ko) ====

@@ -1,7 +1,7 @@
 #-*- mode: makefile; tab-width: 4; -*-
 # ex:ts=4
 #
-# $FreeBSD: ports/Mk/bsd.port.mk,v 1.575 2007/07/16 10:12:03 lofi Exp $
+# $FreeBSD: ports/Mk/bsd.port.mk,v 1.576 2007/07/23 09:35:27 rafan Exp $
 #	$NetBSD: $
 #
 #	bsd.port.mk - 940820 Jordan K. Hubbard.
@@ -659,7 +659,8 @@
 # Set the following to specify all .info files your port installs.
 #
 # INFO			- A list of .info files (omitting the trailing ".info");
-#				  only one entry per document!
+#				  only one entry per document! These files are listed in
+#				  the path relative to ${INFO_PATH}.
 # INFO_PATH		- Path, where all .info files will be installed by your
 #				  port, relative to ${PREFIX}
 #				  Default: "share/info" if ${PREFIX} is equal to /usr
@@ -889,7 +890,8 @@
 #				  Default: ${ARCH}-portbld-freebsd${OSREL}
 # CONFIGURE_ARGS
 #				- Pass these args to configure if ${HAS_CONFIGURE} is set.
-#				  Default: "--prefix=${PREFIX} ${CONFIGURE_TARGET}" if
+#				  Default: "--prefix=${PREFIX} --infodir=${PREFIX}/${INFO_PATH}
+#				  --mandir=${MANPREFIX}/man ${CONFIGURE_TARGET}" if
 #				  GNU_CONFIGURE is set, "CC=${CC} CCFLAGS=${CFLAGS}
 #				  PREFIX=${PREFIX} INSTALLPRIVLIB=${PREFIX}/lib
 #				  INSTALLARCHLIB=${PREFIX}/lib" if PERL_CONFIGURE is set,
@@ -2977,9 +2979,18 @@
 .if !defined(CONFIGURE_MAX_CMD_LEN)
 CONFIGURE_MAX_CMD_LEN!=	${SYSCTL} -n kern.argmax
 .endif
-CONFIGURE_ARGS+=	--prefix=${PREFIX} ${CONFIGURE_TARGET}
+CONFIGURE_ARGS+=	--prefix=${PREFIX} $${_LATE_CONFIGURE_ARGS} ${CONFIGURE_TARGET}
 CONFIGURE_ENV+=		lt_cv_sys_max_cmd_len=${CONFIGURE_MAX_CMD_LEN}
 HAS_CONFIGURE=		yes
+
+SET_LATE_CONFIGURE_ARGS= \
+     _LATE_CONFIGURE_ARGS="" ; \
+	if [ ! -z "`./${CONFIGURE_SCRIPT} --help 2>&1 | ${GREP} -- '--mandir'`" ]; then \
+	    _LATE_CONFIGURE_ARGS="$${_LATE_CONFIGURE_ARGS} --mandir=${MANPREFIX}/man" ; \
+	fi ; \
+	if [ ! -z "`./${CONFIGURE_SCRIPT} --help 2>&1 | ${GREP} -- '--infodir'`" ]; then \
+	    _LATE_CONFIGURE_ARGS="$${_LATE_CONFIGURE_ARGS} --infodir=${PREFIX}/${INFO_PATH}/${INFO_SUBDIR}" ; \
+	fi ;
 .endif
 
 # Passed to most of script invocations
@@ -3109,6 +3120,20 @@
 INFO_PATH?=	info
 .endif
 
+.if defined(INFO)
+. for D in ${INFO:H}
+RD:=	${D}
+.  if ${RD} != "."
+.   if !defined(INFO_SUBDIR)
+INFO_SUBDIR:=	${RD}
+.   elif ${INFO_SUBDIR} != ${RD}
+BROKEN=		only one subdirectory in INFO is allowed
+.   endif
+.  endif
+.undef RD
+. endfor
+.endif
+
 DOCSDIR_REL?=	${DOCSDIR:S,^${TARGETDIR}/,,}
 EXAMPLESDIR_REL?=	${EXAMPLESDIR:S,^${TARGETDIR}/,,}
 DATADIR_REL?=	${DATADIR:S,^${TARGETDIR}/,,}
@@ -3723,6 +3748,7 @@
 .endif
 .if defined(HAS_CONFIGURE)
 	@(cd ${CONFIGURE_WRKSRC} && \
+	    ${SET_LATE_CONFIGURE_ARGS} \
 		if ! ${SETENV} CC="${CC}" CXX="${CXX}" \
 	    CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
 	    INSTALL="/usr/bin/install -c ${_BINOWNGRP}" \
@@ -5859,14 +5885,14 @@
 	@${LS} ${TARGETDIR}/${INFO_PATH}/$i.info* | ${SED} -e s:${TARGETDIR}/::g >> ${TMPPLIST}
 	@${ECHO_CMD} "@exec install-info --quiet %D/${INFO_PATH}/$i.info %D/${INFO_PATH}/dir" \
 		>> ${TMPPLIST}
-	@if [ "`${DIRNAME} $i`" != "." ]; then \
-		${ECHO_CMD} "@unexec ${RMDIR} %D/info/`${DIRNAME} $i` 2> /dev/null || true" >> ${TMPPLIST}; \
-	fi
 .endfor
+.if defined(INFO_SUBDIR)
+	@${ECHO_CMD} "@unexec ${RMDIR} %D/${INFO_PATH}/${INFO_SUBDIR} 2> /dev/null || true" >> ${TMPPLIST}
+.endif
 .if (${PREFIX} != "/usr")
 	@${ECHO_CMD} "@unexec if [ -f %D/${INFO_PATH}/dir ]; then if sed -e '1,/Menu:/d' %D/${INFO_PATH}/dir | grep -q '^[*] '; then true; else rm %D/${INFO_PATH}/dir; fi; fi" >> ${TMPPLIST}
 .if (${PREFIX} != ${LOCALBASE_REL} && ${PREFIX} != ${X11BASE_REL} && ${PREFIX} != ${LINUXBASE_REL})
-	@${ECHO_CMD} "@unexec rmdir %D/info 2> /dev/null || true" >> ${TMPPLIST}
+	@${ECHO_CMD} "@unexec rmdir %D/${INFO_PATH} 2>/dev/null || true" >> ${TMPPLIST}
 .endif
 .endif
 .endif

==== //depot/projects/soc2007/loafier_busalloc/ports/Mk/bsd.xorg.mk#2 (text+ko) ====

@@ -13,7 +13,7 @@
 #
 # !!! Here be dragons !!! (yeah, here as well...)
 #
-# $FreeBSD: ports/Mk/bsd.xorg.mk,v 1.1 2007/05/19 19:57:27 flz Exp $
+# $FreeBSD: ports/Mk/bsd.xorg.mk,v 1.2 2007/07/23 09:35:27 rafan Exp $
 #
 
 XORG_Include_MAINTAINER=		x11 at FreeBSD.org
@@ -42,8 +42,6 @@
 MASTER_SITES?=	${MASTER_SITE_XORG}
 MASTER_SITE_SUBDIR?=	individual/${XORG_CAT}
 
-CONFIGURE_ARGS+=	--mandir="${PREFIX}/man/"
-
 . if ${XORG_CAT} == "app"
 USE_GNOME+=	pkgconfig
 . endif

==== //depot/projects/soc2007/loafier_busalloc/ports/Tools/portbuild/scripts/dopackagestats#2 (text+ko) ====

@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD: ports/Tools/portbuild/scripts/dopackagestats,v 1.17 2007/03/23 05:49:49 linimon Exp $
+# $FreeBSD: ports/Tools/portbuild/scripts/dopackagestats,v 1.18 2007/07/22 04:36:49 linimon Exp $
 #
 # create HTML showing numbers of packages vs errors.  Run this in a directory
 # accessible to the web server.
@@ -228,7 +228,8 @@
 # display all the mainstream builds first
 for arch in ${SUPPORTED_ARCHS}; do
 
-  builds=`ls ${ROOT_DIRECTORY}/${arch} | grep '^[1-9]$' | sort`
+  # drop 4 as obsolete
+  builds=`ls ${ROOT_DIRECTORY}/${arch} | grep '^[5-9]$' | sort`
   if [ ! -z "$builds" ]; then
     write_table_begin
 

==== //depot/projects/soc2007/loafier_busalloc/ports/UPDATING#3 (text+ko) ====

@@ -6,9 +6,19 @@
 time you update your ports collection, before attempting any port
 upgrades.
 
+20070723:
+  AFFECTS: users of x11/nvidia-driver and slave ports
+  AUTHOR: danfe at FreeBSD.org
+
+  NVVERSION is no longer user settable variable, it's derived from
+  DISTVERSION from now on.  If you used nvidia-driver port with custom
+  NVVERSION, it's time to switch to corresponding legacy driver version
+  port.  They were renamed in order to stop hardcoding explicit version
+  numbers in their [directory] names.
+
 20070718:
   AFFECTS: users of devel/llvm
-  AUTHOR: brooks at freebsd.org
+  AUTHOR: brooks at FreeBSD.org
 
   The llvm bytecode and .ll formats have changed as have numerious
   internal APIs.  Existing users should consult the release notes.
@@ -51,7 +61,7 @@
 
 20070704:
   AFFECTS: users of x11/kdebase3
-  AUTHOR: kde at freebsd.org
+  AUTHOR: kde at FreeBSD.org
 
   The media kioslave now mounts all filesystems that support charset conversion
   with charset conversion turned on, set to the locale from the user's
@@ -539,7 +549,7 @@
 
 20070313:
   AFFECTS: users of x11/kdebase3
-  AUTHOR: kde at freebsd.org
+  AUTHOR: kde at FreeBSD.org
 
   The HAL option has been turned on by default and the fstabbackend
   patches which have kept the fstab backend for the media kioslave
@@ -671,7 +681,7 @@
 
 20070210:
   AFFECTS: users of x11/kdebase3
-  AUTHOR: kde at freebsd.org
+  AUTHOR: kde at FreeBSD.org
 
   The media kioslave now mounts cdrom/dvd volumes with local charset
   conversion (mount_cd9660 -C <charset>), which requires the cd9660_iconv
@@ -1044,7 +1054,7 @@
 
 20061109
   AFFECTS: users of milter-bogom, dk-milter, dkim-milter
-  AUTHOR: ache at freebsd.org
+  AUTHOR: ache at FreeBSD.org
 
   All 3 milters change their default user to "mailnull".
 
@@ -1349,7 +1359,7 @@
 
 20060902:
   AFFECTS: users of japanese/uim-anthy and japanese/uim-canna
-  AUTHOR: nobutaka at freebsd.org
+  AUTHOR: nobutaka at FreeBSD.org
 
   Input modes for uim-anthy and uim-canna are reorganized since version 1.2.0.
   Please re-configure the following keybindings with uim-pref.
@@ -1736,7 +1746,7 @@
 
 20060622:
   AFFECTS: users of www/dokuwiki
-  AUTHOR: miwi at freebsd.org
+  AUTHOR: miwi at FreeBSD.org
 
   The default install location has changed from
   ${PREFIX}/www/data/dokuwiki to ${PREFIX}/www/dokuwiki.
@@ -2177,7 +2187,7 @@
 
 20060330:
   AFFECTS: users of x11/kdebase3
-  AUTHOR: kde at freebsd.org
+  AUTHOR: kde at FreeBSD.org
 
   The genkdmconf.sh rc-script has been removed in favor of a kdm wrapper
   script, which now handles both launching kdm and automatically updating or
@@ -5436,4 +5446,4 @@
   2) Update all p5-* modules.
 	portupgrade -f p5-\*
 
-$FreeBSD: ports/UPDATING,v 1.527 2007/07/19 14:52:17 flz Exp $
+$FreeBSD: ports/UPDATING,v 1.529 2007/07/23 13:56:16 danfe Exp $

==== //depot/projects/soc2007/loafier_busalloc/src/contrib/openbsm/HISTORY#2 (text) ====

@@ -1,3 +1,14 @@
+OpenBSM 1.0 alpha 15
+
+- Fix bug when processing in_addr_ex tokens.
+- Restore the behavior of printing the string/text specified while
+  auditing arg32 tokens.
+- Synchronized audit event list to Solaris, picking up the *at(2) system call
+  definitions, now required for FreeBSD and Linux.  Added additional events
+  for *at(2) system calls not present in Solaris.
+- Bugs in auditreduce(8) fixed allowing partial date strings to be used in
+  filtering events.
+
 OpenBSM 1.0 alpha 14
 
 - Fix endian issues when processing IPv6 addresses for extended subject
@@ -284,4 +295,4 @@
   to support reloading of kernel event table.
 - Allow comments in /etc/security configuration files.
 
-$P4: //depot/projects/trustedbsd/openbsm/HISTORY#50 $
+$P4: //depot/projects/trustedbsd/openbsm/HISTORY#55 $

==== //depot/projects/soc2007/loafier_busalloc/src/contrib/openbsm/README#2 (text) ====

@@ -89,6 +89,7 @@
     Ruslan Ermilov
     Martin Voros
     Diego Giagio
+    Alex Samorukov
 
 In addition, Coverity, Inc.'s Prevent(tm) static analysis tool and Gimpel
 Software's FlexeLint tool were used to identify a number of bugs in the
@@ -110,4 +111,4 @@
 
     http://www.TrustedBSD.org/
 
-$P4: //depot/projects/trustedbsd/openbsm/README#23 $
+$P4: //depot/projects/trustedbsd/openbsm/README#24 $

==== //depot/projects/soc2007/loafier_busalloc/src/contrib/openbsm/VERSION#2 (text) ====

@@ -1,1 +1,1 @@
-OPENBSM_1_0_ALPHA_14
+OPENBSM_1_0_ALPHA_15

==== //depot/projects/soc2007/loafier_busalloc/src/contrib/openbsm/bin/audit/audit.8#2 (text) ====

@@ -1,8 +1,6 @@
 .\" Copyright (c) 2004 Apple Computer, Inc.
 .\" All rights reserved.
 .\"
-.\" @APPLE_BSD_LICENSE_HEADER_START@
-.\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
@@ -27,9 +25,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" @APPLE_BSD_LICENSE_HEADER_END@
-.\"
-.\" $P4: //depot/projects/trustedbsd/openbsm/bin/audit/audit.8#9 $
+.\" $P4: //depot/projects/trustedbsd/openbsm/bin/audit/audit.8#10 $
 .\"
 .Dd October 2, 2006
 .Dt AUDIT 8

==== //depot/projects/soc2007/loafier_busalloc/src/contrib/openbsm/bin/audit/audit.c#2 (text) ====

@@ -2,8 +2,6 @@
  * Copyright (c) 2005 Apple Computer, Inc.
  * All rights reserved.
  *
- * @APPLE_BSD_LICENSE_HEADER_START@
- *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -28,9 +26,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * @APPLE_BSD_LICENSE_HEADER_END@
- *
- * $P4: //depot/projects/trustedbsd/openbsm/bin/audit/audit.c#7 $
+ * $P4: //depot/projects/trustedbsd/openbsm/bin/audit/audit.c#8 $
  */
 /*
  * Program to trigger the audit daemon with a message that is either:

==== //depot/projects/soc2007/loafier_busalloc/src/contrib/openbsm/bin/auditd/audit_warn.c#2 (text) ====

@@ -2,8 +2,6 @@
  * Copyright (c) 2005 Apple Computer, Inc.
  * All rights reserved.
  *
- * @APPLE_BSD_LICENSE_HEADER_START@
- *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -28,9 +26,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * @APPLE_BSD_LICENSE_HEADER_END@
- *
- * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/audit_warn.c#7 $
+ * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/audit_warn.c#8 $
  */
 
 #include <sys/types.h>

==== //depot/projects/soc2007/loafier_busalloc/src/contrib/openbsm/bin/auditd/auditd.8#2 (text) ====

@@ -1,8 +1,6 @@
 .\" Copyright (c) 2004 Apple Computer, Inc.
 .\" All rights reserved.
 .\"
-.\" @APPLE_BSD_LICENSE_HEADER_START@
-.\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
@@ -27,9 +25,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" @APPLE_BSD_LICENSE_HEADER_END@
-.\"
-.\" $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.8#12 $
+.\" $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.8#13 $
 .\"
 .Dd October 2, 2006
 .Dt AUDITD 8

==== //depot/projects/soc2007/loafier_busalloc/src/contrib/openbsm/bin/auditd/auditd.c#2 (text) ====

@@ -2,8 +2,6 @@
  * Copyright (c) 2004 Apple Computer, Inc.
  * All rights reserved.
  *
- * @APPLE_BSD_LICENSE_HEADER_START@
- *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -28,9 +26,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * @APPLE_BSD_LICENSE_HEADER_END@
- *
- * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#25 $
+ * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#26 $
  */
 
 #include <sys/types.h>

==== //depot/projects/soc2007/loafier_busalloc/src/contrib/openbsm/bin/auditd/auditd.h#2 (text) ====

@@ -2,8 +2,6 @@
  * Copyright (c) 2005 Apple Computer, Inc.
  * All rights reserved.
  *
- * @APPLE_BSD_LICENSE_HEADER_START@
- *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -28,9 +26,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * @APPLE_BSD_LICENSE_HEADER_END@
- *
- * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.h#7 $

>>> TRUNCATED FOR MAIL (1000 lines) <<<

More information about the p4-projects mailing list