From owner-p4-projects@FreeBSD.ORG Wed Nov 1 06:52:07 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7A0BA16A4D1; Wed, 1 Nov 2006 06:52:07 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E768D16A416 for ; Wed, 1 Nov 2006 06:52:06 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9F31A43D5C for ; Wed, 1 Nov 2006 06:51:46 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA16pk8j035740 for ; Wed, 1 Nov 2006 06:51:46 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA16phbi035737 for perforce@freebsd.org; Wed, 1 Nov 2006 06:51:43 GMT (envelope-from jb@freebsd.org) Date: Wed, 1 Nov 2006 06:51:43 GMT Message-Id: <200611010651.kA16phbi035737@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 108890 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Nov 2006 06:52:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=108890 Change 108890 by jb@jb_freebsd8 on 2006/11/01 06:51:06 IFC Affected files ... .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#30 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#30 integrate .. //depot/projects/dtrace/doc/ru_RU.KOI8-R/articles/committers-guide/article.sgml#5 integrate .. //depot/projects/dtrace/ports/LEGAL#12 integrate .. //depot/projects/dtrace/ports/MOVED#27 integrate .. //depot/projects/dtrace/ports/Mk/bsd.gnome.mk#7 integrate .. //depot/projects/dtrace/ports/Mk/bsd.gnustep.mk#5 integrate .. //depot/projects/dtrace/ports/Mk/bsd.sdl.mk#5 integrate .. //depot/projects/dtrace/ports/UIDs#6 integrate .. //depot/projects/dtrace/ports/UPDATING#20 integrate .. //depot/projects/dtrace/src/ObsoleteFiles.inc#14 integrate .. //depot/projects/dtrace/src/bin/rm/rm.1#4 integrate .. //depot/projects/dtrace/src/bin/rm/rm.c#6 integrate .. //depot/projects/dtrace/src/contrib/bsnmp/snmp_mibII/mibII.c#4 integrate .. //depot/projects/dtrace/src/contrib/bsnmp/snmpd/action.c#4 integrate .. //depot/projects/dtrace/src/contrib/bsnmp/snmpd/tree.def#4 integrate .. //depot/projects/dtrace/src/contrib/pf/man/pf.conf.5#4 integrate .. //depot/projects/dtrace/src/etc/mtree/BSD.include.dist#7 integrate .. //depot/projects/dtrace/src/etc/snmpd.config#4 integrate .. //depot/projects/dtrace/src/games/fortune/datfiles/fortunes#15 integrate .. //depot/projects/dtrace/src/include/Makefile#7 integrate .. //depot/projects/dtrace/src/lib/libufs/Makefile#4 integrate .. //depot/projects/dtrace/src/lib/libufs/cgread.3#4 integrate .. //depot/projects/dtrace/src/lib/libufs/cgroup.c#4 integrate .. //depot/projects/dtrace/src/lib/libufs/libufs.3#4 integrate .. //depot/projects/dtrace/src/lib/libufs/libufs.h#4 integrate .. //depot/projects/dtrace/src/sbin/dumpfs/dumpfs.c#4 integrate .. //depot/projects/dtrace/src/sbin/dumpon/dumpon.c#5 integrate .. //depot/projects/dtrace/src/sbin/fsck_ffs/Makefile#4 integrate .. //depot/projects/dtrace/src/sbin/fsck_ffs/fsck.h#4 integrate .. //depot/projects/dtrace/src/sbin/fsck_ffs/fsutil.c#4 integrate .. //depot/projects/dtrace/src/sbin/fsck_ffs/gjournal.c#1 branch .. //depot/projects/dtrace/src/sbin/fsck_ffs/inode.c#4 integrate .. //depot/projects/dtrace/src/sbin/fsck_ffs/main.c#4 integrate .. //depot/projects/dtrace/src/sbin/fsck_ffs/pass5.c#4 integrate .. //depot/projects/dtrace/src/sbin/fsck_ffs/setup.c#4 integrate .. //depot/projects/dtrace/src/sbin/fsdb/fsdb.c#6 integrate .. //depot/projects/dtrace/src/sbin/fsdb/fsdb.h#5 integrate .. //depot/projects/dtrace/src/sbin/geom/class/Makefile#5 integrate .. //depot/projects/dtrace/src/sbin/geom/class/journal/Makefile#1 branch .. //depot/projects/dtrace/src/sbin/geom/class/journal/geom_journal.c#1 branch .. //depot/projects/dtrace/src/sbin/geom/class/journal/geom_journal.h#1 branch .. //depot/projects/dtrace/src/sbin/geom/class/journal/geom_journal_ufs.c#1 branch .. //depot/projects/dtrace/src/sbin/ggate/shared/ggate.c#4 integrate .. //depot/projects/dtrace/src/sbin/growfs/debug.c#4 integrate .. //depot/projects/dtrace/src/sbin/mount/mount.c#8 integrate .. //depot/projects/dtrace/src/sbin/newfs/mkfs.c#5 integrate .. //depot/projects/dtrace/src/sbin/newfs/newfs.8#4 integrate .. //depot/projects/dtrace/src/sbin/newfs/newfs.c#4 integrate .. //depot/projects/dtrace/src/sbin/newfs/newfs.h#4 integrate .. //depot/projects/dtrace/src/sbin/tunefs/tunefs.8#4 integrate .. //depot/projects/dtrace/src/sbin/tunefs/tunefs.c#4 integrate .. //depot/projects/dtrace/src/share/man/man4/ddb.4#10 integrate .. //depot/projects/dtrace/src/share/man/man4/fdc.4#5 integrate .. //depot/projects/dtrace/src/share/man/man5/fs.5#4 integrate .. //depot/projects/dtrace/src/share/man/man9/disk.9#4 integrate .. //depot/projects/dtrace/src/share/snmp/mibs/FREEBSD-MIB.txt#4 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/genassym.c#4 integrate .. //depot/projects/dtrace/src/sys/amd64/linux32/linux32_sysvec.c#8 integrate .. //depot/projects/dtrace/src/sys/arm/arm/elf_trampoline.c#8 integrate .. //depot/projects/dtrace/src/sys/arm/arm/genassym.c#4 integrate .. //depot/projects/dtrace/src/sys/cam/scsi/scsi_da.c#8 integrate .. //depot/projects/dtrace/src/sys/cam/scsi/scsi_low.c#4 integrate .. //depot/projects/dtrace/src/sys/conf/NOTES#23 integrate .. //depot/projects/dtrace/src/sys/conf/files#35 integrate .. //depot/projects/dtrace/src/sys/conf/options#22 integrate .. //depot/projects/dtrace/src/sys/dev/aac/aac_cam.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/acpi_support/acpi_aiboost.c#1 branch .. //depot/projects/dtrace/src/sys/dev/acpi_support/acpi_sony.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/advansys/advansys.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/advansys/advlib.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/advansys/adwcam.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/aha/aha.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/ahb/ahb.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/aic/aic.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/amd/amd.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/amr/amr.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/amr/amr_cam.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/amr/amr_disk.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/arcmsr/arcmsr.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/asr/asr.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/ata/ata-disk.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/ata/ata-raid.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/ata/atapi-cam.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/bce/if_bce.c#12 integrate .. //depot/projects/dtrace/src/sys/dev/ciss/ciss.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/dc/if_dc.c#8 integrate .. //depot/projects/dtrace/src/sys/dev/dpt/dpt_scsi.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/esp/ncr53c9x.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/firewire/sbp.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/iir/iir.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/isp/isp_freebsd.c#10 integrate .. //depot/projects/dtrace/src/sys/dev/mly/mly.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/mpt/mpt_cam.c#16 integrate .. //depot/projects/dtrace/src/sys/dev/pci/pci.c#10 integrate .. //depot/projects/dtrace/src/sys/dev/pci/pci_pci.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/pci/pcivar.h#6 integrate .. //depot/projects/dtrace/src/sys/dev/trm/trm.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/twa/tw_osl_cam.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/usb/ubsa.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/usb/umass.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/usb/usbdevs#9 integrate .. //depot/projects/dtrace/src/sys/geom/concat/g_concat.c#4 integrate .. //depot/projects/dtrace/src/sys/geom/eli/g_eli.c#9 integrate .. //depot/projects/dtrace/src/sys/geom/geom.h#7 integrate .. //depot/projects/dtrace/src/sys/geom/geom_disk.c#5 integrate .. //depot/projects/dtrace/src/sys/geom/geom_disk.h#4 integrate .. //depot/projects/dtrace/src/sys/geom/geom_io.c#4 integrate .. //depot/projects/dtrace/src/sys/geom/geom_slice.c#5 integrate .. //depot/projects/dtrace/src/sys/geom/journal/g_journal.c#1 branch .. //depot/projects/dtrace/src/sys/geom/journal/g_journal.h#1 branch .. //depot/projects/dtrace/src/sys/geom/journal/g_journal_ufs.c#1 branch .. //depot/projects/dtrace/src/sys/geom/mirror/g_mirror.c#12 integrate .. //depot/projects/dtrace/src/sys/geom/raid3/g_raid3.c#16 integrate .. //depot/projects/dtrace/src/sys/geom/stripe/g_stripe.c#4 integrate .. //depot/projects/dtrace/src/sys/i386/conf/NOTES#11 integrate .. //depot/projects/dtrace/src/sys/i386/i386/genassym.c#5 integrate .. //depot/projects/dtrace/src/sys/ia64/ia64/genassym.c#4 integrate .. //depot/projects/dtrace/src/sys/kern/subr_disk.c#4 integrate .. //depot/projects/dtrace/src/sys/kern/subr_prf.c#8 integrate .. //depot/projects/dtrace/src/sys/kern/tty_cons.c#6 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_subr.c#15 integrate .. //depot/projects/dtrace/src/sys/modules/acpi/Makefile#5 integrate .. //depot/projects/dtrace/src/sys/modules/acpi/acpi_aiboost/Makefile#1 branch .. //depot/projects/dtrace/src/sys/modules/geom/Makefile#5 integrate .. //depot/projects/dtrace/src/sys/modules/geom/geom_journal/Makefile#1 branch .. //depot/projects/dtrace/src/sys/modules/ufs/Makefile#4 integrate .. //depot/projects/dtrace/src/sys/nfsclient/nfs_socket.c#9 integrate .. //depot/projects/dtrace/src/sys/pci/ncr.c#6 integrate .. //depot/projects/dtrace/src/sys/powerpc/powerpc/genassym.c#4 integrate .. //depot/projects/dtrace/src/sys/sparc64/include/endian.h#4 integrate .. //depot/projects/dtrace/src/sys/sparc64/sparc64/genassym.c#7 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/endian.h#5 integrate .. //depot/projects/dtrace/src/sys/sys/bio.h#4 integrate .. //depot/projects/dtrace/src/sys/sys/cons.h#5 integrate .. //depot/projects/dtrace/src/sys/sys/mac_policy.h#8 integrate .. //depot/projects/dtrace/src/sys/sys/mount.h#7 integrate .. //depot/projects/dtrace/src/sys/sys/pcpu.h#11 integrate .. //depot/projects/dtrace/src/sys/sys/vnode.h#5 integrate .. //depot/projects/dtrace/src/sys/ufs/ffs/ffs_extern.h#4 integrate .. //depot/projects/dtrace/src/sys/ufs/ffs/ffs_vfsops.c#12 integrate .. //depot/projects/dtrace/src/sys/ufs/ffs/fs.h#5 integrate .. //depot/projects/dtrace/src/sys/ufs/ufs/gjournal.h#1 branch .. //depot/projects/dtrace/src/sys/ufs/ufs/ufs_gjournal.c#1 branch .. //depot/projects/dtrace/src/sys/ufs/ufs/ufs_inode.c#5 integrate .. //depot/projects/dtrace/src/sys/ufs/ufs/ufs_vnops.c#8 integrate .. //depot/projects/dtrace/src/tools/tools/find-sb/mini_ufs.h#3 integrate .. //depot/projects/dtrace/src/tools/tools/tinybsd/README#3 integrate .. //depot/projects/dtrace/src/tools/tools/tinybsd/conf/bridge/tinybsd.localfiles#1 branch .. //depot/projects/dtrace/src/tools/tools/tinybsd/conf/default/tinybsd.localfiles#1 branch .. //depot/projects/dtrace/src/tools/tools/tinybsd/conf/firewall/tinybsd.localfiles#1 branch .. //depot/projects/dtrace/src/tools/tools/tinybsd/conf/minimal/tinybsd.localfiles#1 branch .. //depot/projects/dtrace/src/tools/tools/tinybsd/conf/vpn/tinybsd.localfiles#1 branch .. //depot/projects/dtrace/src/tools/tools/tinybsd/conf/wireless/tinybsd.localfiles#1 branch .. //depot/projects/dtrace/src/tools/tools/tinybsd/conf/wrap/tinybsd.localfiles#1 branch .. //depot/projects/dtrace/src/tools/tools/tinybsd/tinybsd#5 integrate .. //depot/projects/dtrace/src/usr.sbin/bluetooth/bthidcontrol/bthidcontrol.8#4 integrate .. //depot/projects/dtrace/src/usr.sbin/bluetooth/bthidcontrol/bthidcontrol.c#4 integrate .. //depot/projects/dtrace/src/usr.sbin/bluetooth/bthidcontrol/hid.c#4 integrate .. //depot/projects/dtrace/src/usr.sbin/bsnmpd/bsnmpd/Makefile#5 integrate .. //depot/projects/dtrace/www/en/releases/6.2R/approvals.sgml#4 integrate .. //depot/projects/dtrace/www/en/releases/6.2R/schedule.sgml#9 integrate .. //depot/projects/dtrace/www/en/releases/6.2R/todo.sgml#4 integrate .. //depot/projects/dtrace/www/en/releng/index.sgml#15 integrate .. //depot/projects/dtrace/www/share/sgml/news.xml#8 integrate .. //depot/projects/dtrace/www/share/sgml/release.ent#6 integrate .. //depot/projects/dtrace/www/share/sgml/usergroups.xml#11 integrate .. //depot/projects/dtrace/www/zh_CN/index.xsl#5 integrate Differences ... ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#30 (text+ko) ==== @@ -1,4 +1,4 @@ - + @@ -7188,6 +7188,25 @@ after a &man.pkg.add.1; or to display licensing information. + When some lines about the build-time knobs or warnings + have to be displayed, use ECHO_MSG. The + pkg-message file is only for + post-installation steps. Likewise, the distinction between + ECHO_MSG and ECHO_CMD + should be kept in mind. The former is for printing + informational text to the screen, while the latter is for + command pipelining. + + A good example for both can be found in + shells/bash2/Makefile: + + update-etc-shells: + @${ECHO_MSG} "updating /etc/shells" + @${CP} /etc/shells /etc/shells.bak + @( ${GREP} -v ${PREFIX}/bin/bash /etc/shells.bak; \ + ${ECHO_CMD} ${PREFIX}/bin/bash) >/etc/shells + @${RM} /etc/shells.bak + The pkg-message file does not need to be added to pkg-plist. Also, it will not get ==== //depot/projects/dtrace/doc/ru_RU.KOI8-R/articles/committers-guide/article.sgml#5 (text+ko) ==== @@ -2,7 +2,7 @@ @@ -26,7 +26,7 @@ - $FreeBSD: doc/ru_RU.KOI8-R/articles/committers-guide/article.sgml,v 1.16 2006/06/18 10:01:57 marck Exp $ + $FreeBSD: doc/ru_RU.KOI8-R/articles/committers-guide/article.sgml,v 1.17 2006/10/31 08:56:10 marck Exp $ 1999 @@ -343,6 +343,7 @@ Теперь все операции с CVS могут выполняться на локальной машине, а для внесения изменений в официальное дерево CVS следует использовать + команду Xcvs commit. Если вам нужно добавить в проект что-либо совершенно новое (например, исходные тексты сторонних разработчиков), нужно использовать команду cvs import; обратитесь к странице справочника по ==== //depot/projects/dtrace/ports/LEGAL#12 (text+ko) ==== @@ -1,5 +1,5 @@ # Creator: Jordan Hubbard -# $FreeBSD: ports/LEGAL,v 1.507 2006/10/10 06:01:49 ale Exp $ +# $FreeBSD: ports/LEGAL,v 1.508 2006/10/31 14:13:16 vd Exp $ ********************************************************************** *** NOTE TO COMMITTERS *** @@ -378,8 +378,6 @@ libots-*.alpha.rpm lang/compaq-cc Distribution not allowed libSDLx11.so.tar.gz multimedia/mtv No redistribution LimeWireOther.zip net-p2p/limewire No redistribution allowed -linunace* archivers/linux-unace Distribution is permitted within the - original package only Linux-ACU-Driver-v* sysutils/linux-acu Redistribution not allowed rpm/i386/fedora/4/gtk2-* x11-toolkits/linux-gtk2 LGPL binary, no source linuxq3ademo-* games/linux-quake3-demo Restrictive license by Loki Software ==== //depot/projects/dtrace/ports/MOVED#27 (text+ko) ==== @@ -1,7 +1,7 @@ # # MOVED - a list of (recently) moved or removed ports # -# $FreeBSD: ports/MOVED,v 1.1168 2006/10/21 03:02:07 kris Exp $ +# $FreeBSD: ports/MOVED,v 1.1170 2006/10/31 21:39:53 edwin Exp $ # # Each entry consists of a single line containing the following four # fields in the order named, separated with the pipe (`|') character: @@ -2490,3 +2490,10 @@ emulators/linux_base-suse-9.1||2006-10-20|Port expired and was removed emulators/linux_base-suse-9.2||2006-10-20|Port expired and was removed emulators/linux_base-suse-9.3||2006-10-20|Port expired and was removed +archivers/linux-unace||2006-10-31|Has expired: security issues +audio/gdesklets-cornerxmms||2006-10-31|Has expired: dead project and not fetchable any more +deskutils/gdesklets-sensor-displayconstraints||2006-10-31|Has expired: dead project and not fetchable any more +devel/sdl_ldbad||2006-10-31|Has expired: incorrect pkg-plist and doesn't required anymore +lang/pdss||2006-10-31|Has expired: fails to compile on recent FreeBSD versions +multimedia/slideshow||2006-10-31|Has expired: dead project and doesn't work with recent sdl +dns/queryperf|dns/dnsperf|2006-11-01|Project was improved and renamed ==== //depot/projects/dtrace/ports/Mk/bsd.gnome.mk#7 (text+ko) ==== @@ -1,7 +1,7 @@ #-*- mode: Fundamental; tab-width: 4; -*- # ex:ts=4 # -# $FreeBSD: ports/Mk/bsd.gnome.mk,v 1.135 2006/10/15 03:42:39 marcus Exp $ +# $FreeBSD: ports/Mk/bsd.gnome.mk,v 1.136 2006/10/31 09:11:23 jylefort Exp $ # $NetBSD: $ # $MCom: ports/Mk/bsd.gnome.mk,v 1.401 2006/08/05 05:25:55 marcus Exp $ # @@ -728,6 +728,12 @@ . endif .endif +.if defined(USE_GNOME_SUBR) +GNOME_SUBR= ${LOCALBASE}/etc/gnome.subr +RUN_DEPENDS+= ${GNOME_SUBR}:${PORTSDIR}/sysutils/gnome_subr +SUB_LIST+= GNOME_SUBR=${GNOME_SUBR} +.endif + .if ${MAINTAINER}=="gnome@FreeBSD.org" CONFIGURE_FAIL_MESSAGE= "Please run the gnomelogalyzer, available from \"http://www.freebsd.org/gnome/gnomelogalyzer.sh\", which will diagnose the problem and suggest a solution. If - and only if - the gnomelogalyzer cannot solve the problem, report the build failure to the FreeBSD GNOME team at ${MAINTAINER}, and attach (a) \"${CONFIGURE_WRKSRC}/${CONFIGURE_LOG}\", (b) the output of the failed make command, and (c) the gnomelogalyzer output. Also, it might be a good idea to provide an overview of all packages installed on your system (i.e. an \`ls ${PKG_DBDIR}\`). Put your attachment up on any website, copy-and-paste into http://freebsd-gnome.pastebin.com, or use send-pr(1) with the attachment. Try to avoid sending any attachments to the mailing list (${MAINTAINER}), because attachments sent to FreeBSD mailing lists are usually discarded by the mailing list software." .endif ==== //depot/projects/dtrace/ports/Mk/bsd.gnustep.mk#5 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: ports/Mk/bsd.gnustep.mk,v 1.31 2006/10/05 17:27:31 dinoex Exp $ +# $FreeBSD: ports/Mk/bsd.gnustep.mk,v 1.32 2006/10/31 05:27:21 dinoex Exp $ # # This file contains some variable definitions that are supposed to # make your life easier when dealing with ports related to the GNUstep. @@ -63,16 +63,24 @@ # USE_GNUSTEP_INSTALL=yes # call install target with GNUstep.sh sourced in the current shell # +# USE_GNUSTEP_MAKE_DIRS= App Tools +# call build and install target in each of the given dirs. +# # USE_GNUSTEP_MAKE=yes # require GNUstep.sh for build and install # -# USE_GNUSTEP_SYSTEM_LIBS= Renaissance:x11-toolkits/renaissance +# USE_GNUSTEP_SYSTEM_LIBS+= Renaissance:x11-toolkits/renaissance # depends on a shared lib in System directrory # -# USE_GNUSTEP_LOCAL_LIBS= pantomime:mail/pantomime +# USE_GNUSTEP_LOCAL_LIBS+= pantomime:mail/pantomime # depends on a shared lib in Local directrory # - +# USE_GNUSTEP_SYSTEM_APPS+= ProjectCenter:devel/projectcenter.app +# depends on Application installed in System directrory at runtime +# +# USE_GNUSTEP_LOCAL_APPS+= Ink:misc/gnustep-examples +# depends on Application installed in Local directrory at runtime +# # --------------------------------------------------------------------------- .if !defined(_POSTMKINCLUDED) @@ -250,7 +258,7 @@ .endif # --------------------------------------------------------------------------- -# source system liibs +# source system libs # .if defined(USE_GNUSTEP_SYSTEM_LIBS) .for _GNUSTEP_DEP in ${USE_GNUSTEP_SYSTEM_LIBS} @@ -260,9 +268,8 @@ .endif # --------------------------------------------------------------------------- -# source local liibs +# source local libs # -:C/[.][0-9]*$//1 .if defined(USE_GNUSTEP_LOCAL_LIBS) .for _GNUSTEP_DEP in ${USE_GNUSTEP_LOCAL_LIBS} BUILD_DEPENDS+= ${LOCALLIBDIR}/lib${_GNUSTEP_DEP:C/:.*//}.so:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://} @@ -271,6 +278,24 @@ .endif # --------------------------------------------------------------------------- +# source system apps +# +.if defined(USE_GNUSTEP_SYSTEM_APPS) +.for _GNUSTEP_DEP in ${USE_GNUSTEP_SYSTEM_APPS} +RUN_DEPENDS+= ${SYSTEMDIR}/Applications/${_GNUSTEP_DEP:C/:.*//}.app/${_GNUSTEP_DEP:C/:.*//}:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://} +.endfor +.endif + +# --------------------------------------------------------------------------- +# source local apps +# +.if defined(USE_GNUSTEP_LOCAL_APPS) +.for _GNUSTEP_DEP in ${USE_GNUSTEP_LOCAL_APPS} +RUN_DEPENDS+= ${GNUSTEP_PREFIX}/Local/Applications/${_GNUSTEP_DEP:C/:.*//}.app/${_GNUSTEP_DEP:C/:.*//}:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://} +.endfor +.endif + +# --------------------------------------------------------------------------- # source GNUstep.sh # .if defined(USE_GNUSTEP_CONFIGURE) @@ -298,8 +323,15 @@ # .if defined(USE_GNUSTEP_BUILD) do-build: +.if defined(USE_GNUSTEP_MAKE_DIRS) +.for i in ${USE_GNUSTEP_MAKE_DIRS} + @(cd ${WRKSRC}/${i}; . ${SYSMAKEDIR}/GNUstep.sh; \ + ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${ALL_TARGET}) +.endfor +.else @(cd ${WRKSRC}; . ${SYSMAKEDIR}/GNUstep.sh; \ ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${ALL_TARGET}) +.endif .endif @@ -308,8 +340,15 @@ # .if defined(USE_GNUSTEP_INSTALL) do-install: +.if defined(USE_GNUSTEP_MAKE_DIRS) +.for i in ${USE_GNUSTEP_MAKE_DIRS} + @(cd ${WRKSRC}/${i}; . ${SYSMAKEDIR}/GNUstep.sh; \ + ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${INSTALL_TARGET}) +.endfor +.else @(cd ${WRKSRC}; . ${SYSMAKEDIR}/GNUstep.sh; \ ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${INSTALL_TARGET}) +.endif .if defined(PARALLEL_PACKAGE_BUILD) || defined(BATCH) || defined(CLEAN_ROOT) rm -rf /root/GNUstep .endif ==== //depot/projects/dtrace/ports/Mk/bsd.sdl.mk#5 (text+ko) ==== @@ -29,7 +29,7 @@ # # -# $FreeBSD: ports/Mk/bsd.sdl.mk,v 1.11 2006/09/20 11:20:32 stas Exp $ +# $FreeBSD: ports/Mk/bsd.sdl.mk,v 1.12 2006/10/31 21:37:05 edwin Exp $ # SDL_Include_MAINTAINER= edwin@FreeBSD.org @@ -37,7 +37,7 @@ # # These are the current supported SDL modules # -_USE_SDL_ALL= gfx gui image mixer mm net sdl sound ttf +_USE_SDL_ALL= gfx gui image mixer mm net pango sdl sound ttf # # Variables used to determine what is needed: @@ -74,6 +74,11 @@ _SUBDIR_net= net _REQUIRES_net= sdl +_VERSION_pango= 2 +_SUBDIR_pango= x11-toolkits +_LIB_pango= SDL_Pango +_REQUIRES_pango=sdl + _VERSION_sdl= 11 _SUBDIR_sdl= devel _LIB_sdl= SDL ==== //depot/projects/dtrace/ports/UIDs#6 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: ports/UIDs,v 1.13 2006/09/04 11:59:22 ru Exp $ +$FreeBSD: ports/UIDs,v 1.14 2006/10/31 02:43:54 marcus Exp $ # Please keep this file sorted by UID! bind:*:53:53:Bind Sandbox:/:/sbin/nologin majordom:*:54:54:Majordomo Pseudo User:/usr/local/majordomo:/nonexistent @@ -92,6 +92,7 @@ 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 bnetd:*:700:700:Bnetd user:/nonexistent:/sbin/nologin bopm:*:717:717:Blitzed Open Proxy Monitor:/nonexistent:/bin/sh openxpki:*:777:777:OpenXPKI Owner:/nonexistent:/usr/sbin/nologin ==== //depot/projects/dtrace/ports/UPDATING#20 (text+ko) ==== @@ -6,6 +6,29 @@ time you update your ports collection, before attempting any port upgrades. +20061031: + AFFECTS: Users of math/rkward + AUTHOR: thierry@FreeBSD.org + + The way some information such as descriptive labels is stored in the + R workspace was changed in RKWard 0.4.0. + While the data itself can still be loaded, labels will not be + available from workspaces created with an earlier version of RKWard. + To convert the old labels to the new format, run + rk.convert.pre040 () + in the RKWard R console after loading the workspace in question. + +20061031: + AFFECTS: Users of news/inn-current or news/inn-stable + AUTHOR: shaun@FreeBSD.org + + The stable and current ports of inn have been updated. They suffered + from the same problem previously documented and fixed in news/inn. + When upgrading either of the two mentioned ports, users are advised + to move inn's database directory (/usr/local/news/db) out of the way + prior to _deinstallation_ in order to save its contents from being + erased. + 20061014: AFFECTS: All GTK+2 and GNOME users AUTHOR: gnome@FreeBSD.org @@ -4286,4 +4309,4 @@ 2) Update all p5-* modules. portupgrade -f p5-\* -$FreeBSD: ports/UPDATING,v 1.415 2006/10/20 02:18:17 mezz Exp $ +$FreeBSD: ports/UPDATING,v 1.417 2006/10/31 22:04:07 thierry Exp $ ==== //depot/projects/dtrace/src/ObsoleteFiles.inc#14 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.56 2006/10/21 14:19:52 ru Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.57 2006/10/31 21:05:35 jmg Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -628,7 +628,9 @@ OLD_FILES+=usr/lib/libpam_ssh_p.a OLD_FILES+=usr/bin/help OLD_FILES+=usr/bin/sccs +.if ${TARGET_ARCH} != "i386" OLD_FILES+=usr/bin/gdbserver +.endif OLD_FILES+=usr/bin/ssh-keysign OLD_FILES+=usr/sbin/gifconfig OLD_FILES+=usr/sbin/prefix ==== //depot/projects/dtrace/src/bin/rm/rm.1#4 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)rm.1 8.5 (Berkeley) 12/5/94 -.\" $FreeBSD: src/bin/rm/rm.1,v 1.39 2005/11/17 12:15:23 ru Exp $ +.\" $FreeBSD: src/bin/rm/rm.1,v 1.41 2006/10/31 02:22:36 delphij Exp $ .\" -.Dd September 29, 2005 +.Dd October 30, 2006 .Dt RM 1 .Os .Sh NAME @@ -88,6 +88,10 @@ Overwrite regular files before deleting them. Files are overwritten three times, first with the byte pattern 0xff, then 0x00, and then 0xff again, before they are deleted. +Files with multiple links will not be overwritten nor deleted unless +.Fl f +is specified, a warning is generated instead. +.Pp Specifying this flag for a read only file will cause .Nm to generate an error message and exit. @@ -168,6 +172,12 @@ For example: .Dl rm /home/user/-filename .Dl rm ./-filename +.Pp +When +.Fl P +is specified with +.Fl f +the file will be overwritten and removed even if it has hard links. .Sh COMPATIBILITY The .Nm ==== //depot/projects/dtrace/src/bin/rm/rm.c#6 (text+ko) ==== @@ -39,7 +39,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/rm/rm.c,v 1.56 2006/10/18 13:16:06 maxim Exp $"); +__FBSDID("$FreeBSD: src/bin/rm/rm.c,v 1.58 2006/10/31 02:22:36 delphij Exp $"); #include #include @@ -400,6 +400,11 @@ } if (!S_ISREG(sbp->st_mode)) return (1); + if (sbp->st_nlink > 1 && !fflag) { + warnx("%s (inode %u): not overwritten due to multiple links", + file, sbp->st_ino); + return (0); + } if ((fd = open(file, O_WRONLY, 0)) == -1) goto err; if (fstatfs(fd, &fsb) == -1) ==== //depot/projects/dtrace/src/contrib/bsnmp/snmp_mibII/mibII.c#4 (text+ko) ==== @@ -26,12 +26,13 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Begemot: bsnmp/snmp_mibII/mibII.c,v 1.24 2006/02/14 09:04:18 brandt_h Exp $ + * $Begemot: mibII.c 516 2006-10-27 15:54:02Z brandt_h $ * * Implementation of the standard interfaces and ip MIB. */ #include "mibII.h" #include "mibII_oid.h" +#include #include @@ -376,16 +377,16 @@ u_int ticks; if ((ticks = mibif_force_hc_update_interval) == 0) { - if (mibif_maxspeed <= 10000000) { + if (mibif_maxspeed <= IF_Mbps(10)) { /* at 10Mbps overflow needs 3436 seconds */ ticks = 3000 * 100; /* 50 minutes */ - } else if (mibif_maxspeed <= 100000000) { + } else if (mibif_maxspeed <= IF_Mbps(100)) { /* at 100Mbps overflow needs 343 seconds */ ticks = 300 * 100; /* 5 minutes */ - } else if (mibif_maxspeed < 650000000) { + } else if (mibif_maxspeed < IF_Mbps(622)) { /* at 622Mbps overflow needs 53 seconds */ ticks = 40 * 100; /* 40 seconds */ - } else if (mibif_maxspeed <= 1000000000) { + } else if (mibif_maxspeed <= IF_Mbps(1000)) { /* at 1Gbps overflow needs 34 seconds */ ticks = 20 * 100; /* 20 seconds */ } else { ==== //depot/projects/dtrace/src/contrib/bsnmp/snmpd/action.c#4 (text+ko) ==== @@ -2,6 +2,9 @@ * Copyright (c) 2001-2003 * Fraunhofer Institute for Open Communication Systems (FhG Fokus). * All rights reserved. + * Copyright (c) 2004-2006 + * Hartmut Brandt. + * All rights reserved. * * Author: Harti Brandt * @@ -26,13 +29,14 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Begemot: bsnmp/snmpd/action.c,v 1.58 2004/08/06 08:47:09 brandt Exp $ + * $Begemot: action.c 517 2006-10-31 08:52:04Z brandt_h $ * * Variable access for SNMPd */ #include #include #include +#include #include #include #include @@ -48,6 +52,11 @@ static const struct asn_oid oid_begemotSnmpdModuleTable = OIDX_begemotSnmpdModuleTable; +#ifdef __FreeBSD__ +static const struct asn_oid + oid_freeBSDVersion = OIDX_freeBSDVersion; +#endif + /* * Get a string value from the KERN sysctl subtree. */ @@ -100,39 +109,57 @@ int init_actvals(void) { - char *v[4]; - u_int i; + struct utsname uts; + char *hostid; size_t len; +#ifdef __FreeBSD__ + char *rel, *p, *end; + u_long num; +#endif - if ((systemg.name = act_getkernstring(KERN_HOSTNAME)) == NULL) + if (uname(&uts) == -1) + return (-1); + + if ((systemg.name = strdup(uts.nodename)) == NULL) + return (-1); + + if ((hostid = act_getkernint(KERN_HOSTID)) == NULL) return (-1); - for (i = 0; i < 4; i++) - v[1] = NULL; + len = strlen(uts.nodename) + 1; + len += strlen(hostid) + 1; + len += strlen(uts.sysname) + 1; + len += strlen(uts.release) + 1; - if ((v[0] = act_getkernstring(KERN_HOSTNAME)) == NULL) - goto err; - if ((v[1] = act_getkernint(KERN_HOSTID)) == NULL) - goto err; - if ((v[2] = act_getkernstring(KERN_OSTYPE)) == NULL) - goto err; - if ((v[3] = act_getkernstring(KERN_OSRELEASE)) == NULL) - goto err; + if ((systemg.descr = malloc(len)) == NULL) { + free(hostid); + return (-1); + } + sprintf(systemg.descr, "%s %s %s %s", uts.nodename, hostid, uts.sysname, + uts.release); - for (i = 0, len = 0; i < 4; i++) - len += strlen(v[i]) + 1; +#ifdef __FreeBSD__ + /* + * Construct a FreeBSD oid + */ + systemg.object_id = oid_freeBSDVersion; + rel = uts.release; + while ((p = strsep(&rel, ".")) != NULL && + systemg.object_id.len < ASN_MAXOIDLEN) { + systemg.object_id.subs[systemg.object_id.len] = 0; + if (*p != '\0') { + num = strtoul(p, &end, 10); + if (end == p) + break; + systemg.object_id.subs[systemg.object_id.len] = num; + } + systemg.object_id.len++; + } +#endif - if ((systemg.descr = malloc(len)) == NULL) - goto err; - sprintf(systemg.descr, "%s %s %s %s", v[0], v[1], v[2], v[3]); + free(hostid); return (0); - - err: - for (i = 0; i < 4; i++) - if (v[i] != NULL) - free(v[i]); - return (-1); } ==== //depot/projects/dtrace/src/contrib/bsnmp/snmpd/tree.def#4 (text+ko) ==== @@ -26,7 +26,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $Begemot: bsnmp/snmpd/tree.def,v 1.38 2004/08/06 08:47:17 brandt Exp $ +# $Begemot: tree.def 517 2006-10-31 08:52:04Z brandt_h $ # # System group and private Begemot SNMPd MIB. # @@ -64,11 +64,19 @@ (32 snmpProxyDrops COUNTER op_snmp GET) ) )) + + (4 private + (1 enterprises +# +# FreeBSD stuff # + (2238 freeBSD + (4 freeBSDVersion) + ) + +# # Private Begemot Stuff # - (4 private - (1 enterprises (12325 fokus (1 begemot ==== //depot/projects/dtrace/src/contrib/pf/man/pf.conf.5#4 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" $FreeBSD: src/contrib/pf/man/pf.conf.5,v 1.9 2005/09/28 08:11:15 mlaier Exp $ +.\" $FreeBSD: src/contrib/pf/man/pf.conf.5,v 1.10 2006/10/30 15:15:37 mlaier Exp $ .\" $OpenBSD: pf.conf.5,v 1.292 2004/02/24 05:44:48 mcbride Exp $ .\" .\" Copyright (c) 2002, Daniel Hartmeier @@ -28,7 +28,7 @@ .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd February 7, 2005 +.Dd October 30, 2006 .Dt PF.CONF 5 .Os .Sh NAME @@ -2851,6 +2851,12 @@ for the moment. This workaround will still produce the LOR, but Giant will protect from the deadlock. +.Pp +Route labels are not supported by the +.Fx +.Xr route 4 +system. +Rules with a route label do not match any traffic. .Sh SEE ALSO .Xr altq 4 , .Xr icmp 4 , ==== //depot/projects/dtrace/src/etc/mtree/BSD.include.dist#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.109 2006/10/06 08:27:07 ru Exp $ +# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.110 2006/10/31 22:22:29 pjd Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -108,6 +108,8 @@ .. gate .. + journal + .. label .. mirror ==== //depot/projects/dtrace/src/etc/snmpd.config#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/snmpd.config,v 1.6 2006/02/27 16:31:01 harti Exp $ +# $FreeBSD: src/etc/snmpd.config,v 1.7 2006/10/31 10:23:28 harti Exp $ # # Example configuration file for bsnmpd(1). # @@ -6,7 +6,6 @@ # # Set some common variables # -host := foobar location := "Room 200" contact := "sysmeister@example.com" system := 1 # FreeBSD @@ -43,8 +42,7 @@ begemotSnmpdCommunityDisable = 1 # open standard SNMP ports -begemotSnmpdPortStatus.[$(host)].161 = 1 -begemotSnmpdPortStatus.127.0.0.1.161 = 1 +begemotSnmpdPortStatus.0.0.0.0.161 = 1 # open a unix domain socket begemotSnmpdLocalPortStatus."/var/run/snmpd.sock" = 1 ==== //depot/projects/dtrace/src/games/fortune/datfiles/fortunes#15 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.229 2006/10/23 13:25:17 phk Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.230 2006/10/30 12:01:57 keramida Exp $ % ======================================================================= @@ -22147,7 +22147,7 @@ There are not stars enough in heaven. % Here at the Phone Company, we serve all kinds of people; -from President's and Kings to the scum of the earth... +from Presidents and Kings to the scum of the earth... % Here comes the orator, with his flood of words and his drop of reason. % ==== //depot/projects/dtrace/src/include/Makefile#7 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 1/4/94 -# $FreeBSD: src/include/Makefile,v 1.264 2006/10/06 08:27:06 ru Exp $ +# $FreeBSD: src/include/Makefile,v 1.265 2006/10/31 22:22:29 pjd 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/cache 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/journal 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/lib/libufs/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libufs/Makefile,v 1.13 2005/09/26 06:23:43 keramida Exp $ +# $FreeBSD: src/lib/libufs/Makefile,v 1.14 2006/10/31 21:21:48 pjd Exp $ LIB= ufs SHLIBDIR?= /lib @@ -9,6 +9,7 @@ MAN= bread.3 cgread.3 libufs.3 sbread.3 ufs_disk_close.3 MLINKS+= bread.3 bwrite.3 MLINKS+= cgread.3 cgread1.3 +MLINKS+= cgread.3 cgwrite1.3 MLINKS+= sbread.3 sbwrite.3 MLINKS+= ufs_disk_close.3 ufs_disk_fillout.3 MLINKS+= ufs_disk_close.3 ufs_disk_fillout_blank.3 ==== //depot/projects/dtrace/src/lib/libufs/cgread.3#4 (text+ko) ==== @@ -4,17 +4,18 @@ .\" Manual page for libufs functions: .\" cgread(3) >>> TRUNCATED FOR MAIL (1000 lines) <<<