Date: Mon, 14 Nov 2005 23:35:09 GMT From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 86773 for review Message-ID: <200511142335.jAENZ9uM061403@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=86773 Change 86773 by peter@peter_daintree on 2005/11/14 23:34:56 IFC @86771 Affected files ... .. //depot/projects/hammer/Makefile.inc1#107 integrate .. //depot/projects/hammer/bin/ls/ls.1#23 integrate .. //depot/projects/hammer/contrib/tcpdump/print-tcp.c#5 integrate .. //depot/projects/hammer/etc/bluetooth/hosts#2 integrate .. //depot/projects/hammer/etc/bluetooth/protocols#2 integrate .. //depot/projects/hammer/etc/defaults/Makefile#5 integrate .. //depot/projects/hammer/etc/defaults/bluetooth.device.conf#1 branch .. //depot/projects/hammer/etc/devd.conf#23 integrate .. //depot/projects/hammer/etc/mtree/BSD.include.dist#37 integrate .. //depot/projects/hammer/etc/mtree/BSD.x11-4.dist#11 integrate .. //depot/projects/hammer/etc/rc.d/Makefile#42 integrate .. //depot/projects/hammer/etc/rc.d/bluetooth#1 branch .. //depot/projects/hammer/etc/rc.d/pf#11 integrate .. //depot/projects/hammer/games/morse/Makefile#2 integrate .. //depot/projects/hammer/games/morse/morse.c#7 integrate .. //depot/projects/hammer/include/Makefile#49 integrate .. //depot/projects/hammer/kerberos5/tools/asn1_compile/Makefile#3 integrate .. //depot/projects/hammer/lib/libarchive/Makefile#29 integrate .. //depot/projects/hammer/lib/libc/gen/_pthread_stubs.c#6 integrate .. //depot/projects/hammer/lib/libc/sys/Makefile.inc#17 integrate .. //depot/projects/hammer/lib/libc/sys/sigqueue.2#1 branch .. //depot/projects/hammer/lib/libc/sys/sigwait.2#3 integrate .. //depot/projects/hammer/lib/libc/sys/sigwaitinfo.2#1 branch .. //depot/projects/hammer/lib/libc/sys/timer_create.2#1 branch .. //depot/projects/hammer/lib/libc/sys/timer_delete.2#1 branch .. //depot/projects/hammer/lib/libc/sys/timer_settime.2#1 branch .. //depot/projects/hammer/lib/libc/sys/wait.2#6 integrate .. //depot/projects/hammer/lib/libform/Makefile#3 integrate .. //depot/projects/hammer/lib/libmagic/Makefile#7 integrate .. //depot/projects/hammer/lib/libmemstat/Makefile#3 integrate .. //depot/projects/hammer/lib/libmenu/Makefile#3 integrate .. //depot/projects/hammer/lib/libmp/Makefile#6 integrate .. //depot/projects/hammer/lib/libncp/Makefile#6 integrate .. //depot/projects/hammer/lib/libpanel/Makefile#3 integrate .. //depot/projects/hammer/lib/libradius/Makefile#10 integrate .. //depot/projects/hammer/lib/libsmb/Makefile#8 integrate .. //depot/projects/hammer/lib/msun/src/e_coshf.c#2 integrate .. //depot/projects/hammer/lib/msun/src/e_logf.c#2 integrate .. //depot/projects/hammer/lib/msun/src/e_sinhf.c#2 integrate .. //depot/projects/hammer/lib/msun/src/k_cosf.c#5 integrate .. //depot/projects/hammer/lib/msun/src/k_sinf.c#4 integrate .. //depot/projects/hammer/lib/msun/src/k_tanf.c#4 integrate .. //depot/projects/hammer/libexec/rtld-elf/rtld.c#31 integrate .. //depot/projects/hammer/sbin/devd/devd.cc#17 integrate .. //depot/projects/hammer/sbin/ldconfig/ldconfig.8#5 integrate .. //depot/projects/hammer/sbin/ldconfig/ldconfig.c#9 integrate .. //depot/projects/hammer/sbin/mdconfig/mdconfig.c#21 integrate .. //depot/projects/hammer/sbin/mount/Makefile#6 integrate .. //depot/projects/hammer/sbin/mount/extern.h#3 integrate .. //depot/projects/hammer/sbin/mount/getmntopts.c#7 integrate .. //depot/projects/hammer/sbin/mount/mntopts.h#9 integrate .. //depot/projects/hammer/sbin/mount/mount.c#19 integrate .. //depot/projects/hammer/sbin/mount/mount_fs.c#1 branch .. //depot/projects/hammer/sbin/mount/mount_ufs.c#6 integrate .. //depot/projects/hammer/sbin/mount_cd9660/Makefile#5 integrate .. //depot/projects/hammer/sbin/mount_cd9660/mount_cd9660.c#11 integrate .. //depot/projects/hammer/sbin/mount_msdosfs/Makefile#5 integrate .. //depot/projects/hammer/sbin/mount_msdosfs/mount_msdosfs.c#10 integrate .. //depot/projects/hammer/sbin/mount_reiserfs/Makefile#2 integrate .. //depot/projects/hammer/sbin/mount_reiserfs/mount_reiserfs.c#4 integrate .. //depot/projects/hammer/share/man/man4/Makefile#78 integrate .. //depot/projects/hammer/share/man/man4/ciss.4#10 integrate .. //depot/projects/hammer/share/man/man4/de.4#10 integrate .. //depot/projects/hammer/share/man/man4/joy.4#4 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/Makefile#32 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/linux.4#3 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/spkr.4#5 delete .. //depot/projects/hammer/share/man/man4/snd_ich.4#6 integrate .. //depot/projects/hammer/share/man/man4/spkr.4#1 branch .. //depot/projects/hammer/share/man/man5/rc.conf.5#64 integrate .. //depot/projects/hammer/share/man/man7/Makefile#7 integrate .. //depot/projects/hammer/share/man/man7/bsd.snmpmod.mk.7#1 branch .. //depot/projects/hammer/share/man/man8/rescue.8#2 integrate .. //depot/projects/hammer/share/mk/Makefile#7 integrate .. //depot/projects/hammer/share/mk/bsd.README#8 integrate .. //depot/projects/hammer/share/mk/bsd.snmpmod.mk#1 branch .. //depot/projects/hammer/sys/alpha/alpha/pmap.c#47 integrate .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#129 integrate .. //depot/projects/hammer/sys/amd64/conf/NOTES#87 integrate .. //depot/projects/hammer/sys/boot/forth/loader.conf#27 integrate .. //depot/projects/hammer/sys/compat/ndis/subr_ndis.c#37 integrate .. //depot/projects/hammer/sys/compat/ndis/subr_ntoskrnl.c#38 integrate .. //depot/projects/hammer/sys/conf/files.amd64#79 integrate .. //depot/projects/hammer/sys/conf/files.i386#66 integrate .. //depot/projects/hammer/sys/conf/files.pc98#49 integrate .. //depot/projects/hammer/sys/conf/options.pc98#37 integrate .. //depot/projects/hammer/sys/contrib/dev/oltr/if_oltr.c#15 integrate .. //depot/projects/hammer/sys/dev/aac/aac.c#35 integrate .. //depot/projects/hammer/sys/dev/an/if_an.c#28 integrate .. //depot/projects/hammer/sys/dev/arl/if_arl.c#10 integrate .. //depot/projects/hammer/sys/dev/ath/if_ath.c#38 integrate .. //depot/projects/hammer/sys/dev/bfe/if_bfe.c#22 integrate .. //depot/projects/hammer/sys/dev/bge/if_bge.c#55 integrate .. //depot/projects/hammer/sys/dev/bktr/bktr_card.c#12 integrate .. //depot/projects/hammer/sys/dev/bktr/bktr_card.h#6 integrate .. //depot/projects/hammer/sys/dev/bktr/bktr_tuner.c#9 integrate .. //depot/projects/hammer/sys/dev/bktr/bktr_tuner.h#5 integrate .. //depot/projects/hammer/sys/dev/ciss/ciss.c#36 integrate .. //depot/projects/hammer/sys/dev/dc/if_dc.c#3 integrate .. //depot/projects/hammer/sys/dev/ed/if_ed.c#36 integrate .. //depot/projects/hammer/sys/dev/em/if_em.c#52 integrate .. //depot/projects/hammer/sys/dev/em/if_em.h#26 integrate .. //depot/projects/hammer/sys/dev/ep/if_ep.c#25 integrate .. //depot/projects/hammer/sys/dev/ex/if_ex.c#19 integrate .. //depot/projects/hammer/sys/dev/fe/if_fe.c#23 integrate .. //depot/projects/hammer/sys/dev/fxp/if_fxp.c#54 integrate .. //depot/projects/hammer/sys/dev/gem/if_gem.c#22 integrate .. //depot/projects/hammer/sys/dev/hme/if_hme.c#25 integrate .. //depot/projects/hammer/sys/dev/hptmv/entry.c#9 integrate .. //depot/projects/hammer/sys/dev/ie/if_ie.c#17 integrate .. //depot/projects/hammer/sys/dev/ipw/if_ipw.c#11 integrate .. //depot/projects/hammer/sys/dev/iwi/if_iwi.c#12 integrate .. //depot/projects/hammer/sys/dev/ixgb/if_ixgb.c#15 integrate .. //depot/projects/hammer/sys/dev/lge/if_lge.c#29 integrate .. //depot/projects/hammer/sys/dev/lnc/if_lnc.c#23 integrate .. //depot/projects/hammer/sys/dev/lnc/if_lnc_cbus.c#10 integrate .. //depot/projects/hammer/sys/dev/my/if_my.c#22 integrate .. //depot/projects/hammer/sys/dev/nge/if_nge.c#36 integrate .. //depot/projects/hammer/sys/dev/nve/if_nve.c#12 integrate .. //depot/projects/hammer/sys/dev/owi/if_owi.c#12 integrate .. //depot/projects/hammer/sys/dev/pdq/if_fea.c#7 integrate .. //depot/projects/hammer/sys/dev/pdq/if_fpa.c#9 integrate .. //depot/projects/hammer/sys/dev/pdq/pdq_freebsd.h#8 integrate .. //depot/projects/hammer/sys/dev/pdq/pdq_ifsubr.c#11 integrate .. //depot/projects/hammer/sys/dev/ral/if_ral.c#10 integrate .. //depot/projects/hammer/sys/dev/ray/if_ray.c#22 integrate .. //depot/projects/hammer/sys/dev/re/if_re.c#36 integrate .. //depot/projects/hammer/sys/dev/sbni/if_sbni.c#17 integrate .. //depot/projects/hammer/sys/dev/snc/dp83932.c#15 integrate .. //depot/projects/hammer/sys/dev/sound/isa/sb16.c#15 integrate .. //depot/projects/hammer/sys/dev/sound/pci/es137x.c#14 integrate .. //depot/projects/hammer/sys/dev/sound/pci/ich.c#23 integrate .. //depot/projects/hammer/sys/dev/sound/pci/via8233.c#16 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/ac97.c#17 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/channel.c#15 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/dsp.c#23 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/feeder_fmt.c#8 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/feeder_rate.c#7 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/feeder_volume.c#2 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/mixer.c#19 integrate .. //depot/projects/hammer/sys/dev/sound/usb/uaudio.c#7 integrate .. //depot/projects/hammer/sys/dev/sound/usb/uaudio.h#5 integrate .. //depot/projects/hammer/sys/dev/sound/usb/uaudio_pcm.c#14 integrate .. //depot/projects/hammer/sys/dev/speaker/speaker.h#1 branch .. //depot/projects/hammer/sys/dev/speaker/spkr.c#1 branch .. //depot/projects/hammer/sys/dev/tx/if_tx.c#24 integrate .. //depot/projects/hammer/sys/dev/txp/if_txp.c#23 integrate .. //depot/projects/hammer/sys/dev/usb/if_aue.c#27 integrate .. //depot/projects/hammer/sys/dev/usb/if_axe.c#26 integrate .. //depot/projects/hammer/sys/dev/usb/if_cue.c#26 integrate .. //depot/projects/hammer/sys/dev/usb/if_kue.c#22 integrate .. //depot/projects/hammer/sys/dev/usb/if_rue.c#20 integrate .. //depot/projects/hammer/sys/dev/usb/if_udav.c#15 integrate .. //depot/projects/hammer/sys/dev/usb/if_ural.c#10 integrate .. //depot/projects/hammer/sys/dev/usb/ulpt.c#15 integrate .. //depot/projects/hammer/sys/dev/vge/if_vge.c#14 integrate .. //depot/projects/hammer/sys/dev/vx/if_vx.c#22 integrate .. //depot/projects/hammer/sys/dev/wi/if_wi.c#45 integrate .. //depot/projects/hammer/sys/dev/wl/if_wl.c#20 integrate .. //depot/projects/hammer/sys/dev/xe/if_xe.c#26 integrate .. //depot/projects/hammer/sys/geom/geom_dump.c#17 integrate .. //depot/projects/hammer/sys/geom/geom_gpt.c#23 integrate .. //depot/projects/hammer/sys/i386/conf/NOTES#80 integrate .. //depot/projects/hammer/sys/i386/i386/pmap.c#76 integrate .. //depot/projects/hammer/sys/i386/i386/vm_machdep.c#51 integrate .. //depot/projects/hammer/sys/i386/include/speaker.h#3 integrate .. //depot/projects/hammer/sys/i386/isa/spkr.c#12 delete .. //depot/projects/hammer/sys/i386/pci/pci_cfgreg.c#25 integrate .. //depot/projects/hammer/sys/ia64/ia64/pmap.c#50 integrate .. //depot/projects/hammer/sys/kern/imgact_elf.c#34 integrate .. //depot/projects/hammer/sys/kern/init_main.c#37 integrate .. //depot/projects/hammer/sys/kern/kern_acct.c#20 integrate .. //depot/projects/hammer/sys/kern/kern_descrip.c#53 integrate .. //depot/projects/hammer/sys/kern/kern_exit.c#53 integrate .. //depot/projects/hammer/sys/kern/kern_fork.c#52 integrate .. //depot/projects/hammer/sys/kern/kern_ktrace.c#22 integrate .. //depot/projects/hammer/sys/kern/kern_proc.c#50 integrate .. //depot/projects/hammer/sys/kern/kern_sig.c#65 integrate .. //depot/projects/hammer/sys/kern/subr_trap.c#33 integrate .. //depot/projects/hammer/sys/kern/uipc_usrreq.c#36 integrate .. //depot/projects/hammer/sys/kern/vfs_mount.c#60 integrate .. //depot/projects/hammer/sys/modules/Makefile#91 integrate .. //depot/projects/hammer/sys/modules/md/Makefile#4 integrate .. //depot/projects/hammer/sys/modules/speaker/Makefile#2 integrate .. //depot/projects/hammer/sys/net/fddi.h#4 integrate .. //depot/projects/hammer/sys/net/if.c#58 integrate .. //depot/projects/hammer/sys/net/if_arcsubr.c#18 integrate .. //depot/projects/hammer/sys/net/if_arp.h#8 integrate .. //depot/projects/hammer/sys/net/if_bridge.c#17 integrate .. //depot/projects/hammer/sys/net/if_disc.c#19 integrate .. //depot/projects/hammer/sys/net/if_ef.c#15 integrate .. //depot/projects/hammer/sys/net/if_ethersubr.c#50 integrate .. //depot/projects/hammer/sys/net/if_fddisubr.c#19 integrate .. //depot/projects/hammer/sys/net/if_fwsubr.c#13 integrate .. //depot/projects/hammer/sys/net/if_iso88025subr.c#17 integrate .. //depot/projects/hammer/sys/net/if_mib.c#6 integrate .. //depot/projects/hammer/sys/net/if_tap.c#27 integrate .. //depot/projects/hammer/sys/net/if_var.h#37 integrate .. //depot/projects/hammer/sys/net/if_vlan.c#33 integrate .. //depot/projects/hammer/sys/net/iso88025.h#6 integrate .. //depot/projects/hammer/sys/net/route.c#22 integrate .. //depot/projects/hammer/sys/net/rtsock.c#29 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_ioctl.c#24 integrate .. //depot/projects/hammer/sys/netatalk/aarp.c#17 integrate .. //depot/projects/hammer/sys/netatm/atm_if.c#13 integrate .. //depot/projects/hammer/sys/netgraph/ng_ether.c#26 integrate .. //depot/projects/hammer/sys/netgraph/ng_fec.c#19 integrate .. //depot/projects/hammer/sys/netinet/ip_carp.c#17 integrate .. //depot/projects/hammer/sys/netinet/ip_fw2.c#67 integrate .. //depot/projects/hammer/sys/netinet/ip_input.c#54 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_vnops.c#43 integrate .. //depot/projects/hammer/sys/pci/agp_amd64.c#9 integrate .. //depot/projects/hammer/sys/pci/if_de.c#29 integrate .. //depot/projects/hammer/sys/pci/if_pcn.c#34 integrate .. //depot/projects/hammer/sys/pci/if_rl.c#52 integrate .. //depot/projects/hammer/sys/pci/if_sf.c#39 integrate .. //depot/projects/hammer/sys/pci/if_sis.c#45 integrate .. //depot/projects/hammer/sys/pci/if_sk.c#45 integrate .. //depot/projects/hammer/sys/pci/if_ste.c#43 integrate .. //depot/projects/hammer/sys/pci/if_ti.c#37 integrate .. //depot/projects/hammer/sys/pci/if_tl.c#28 integrate .. //depot/projects/hammer/sys/pci/if_vr.c#40 integrate .. //depot/projects/hammer/sys/pci/if_wb.c#34 integrate .. //depot/projects/hammer/sys/pci/if_xl.c#61 integrate .. //depot/projects/hammer/sys/powerpc/include/pte.h#2 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/ofw_machdep.c#9 integrate .. //depot/projects/hammer/sys/powerpc/psim/ata_iobus.c#11 integrate .. //depot/projects/hammer/sys/sys/ata.h#13 integrate .. //depot/projects/hammer/sys/sys/ktrace.h#7 integrate .. //depot/projects/hammer/sys/sys/mdioctl.h#11 integrate .. //depot/projects/hammer/sys/sys/param.h#69 integrate .. //depot/projects/hammer/sys/sys/proc.h#91 integrate .. //depot/projects/hammer/sys/sys/signal.h#13 integrate .. //depot/projects/hammer/sys/sys/wait.h#5 integrate .. //depot/projects/hammer/tools/regression/geom_gpt/gctl.t#3 integrate .. //depot/projects/hammer/tools/tools/tinderbox/etc/default.rc#5 integrate .. //depot/projects/hammer/tools/tools/tinderbox/etc/head.rc#2 integrate .. //depot/projects/hammer/tools/tools/tinderbox/tbmaster.1#16 integrate .. //depot/projects/hammer/tools/tools/tinderbox/tbmaster.pl#26 integrate .. //depot/projects/hammer/tools/tools/tinderbox/tinderbox.1#10 integrate .. //depot/projects/hammer/tools/tools/tinderbox/tinderbox.pl#20 integrate .. //depot/projects/hammer/usr.bin/col/col.c#4 integrate .. //depot/projects/hammer/usr.bin/indent/indent.c#7 integrate .. //depot/projects/hammer/usr.bin/indent/indent_globs.h#6 integrate .. //depot/projects/hammer/usr.bin/indent/io.c#5 integrate .. //depot/projects/hammer/usr.bin/kdump/kdump.1#9 integrate .. //depot/projects/hammer/usr.bin/kdump/kdump.c#12 integrate .. //depot/projects/hammer/usr.bin/locate/locate/updatedb.sh#3 integrate .. //depot/projects/hammer/usr.bin/mt/mt.c#5 integrate .. //depot/projects/hammer/usr.bin/netstat/main.c#19 integrate .. //depot/projects/hammer/usr.bin/netstat/mbuf.c#11 integrate .. //depot/projects/hammer/usr.bin/netstat/netstat.h#13 integrate .. //depot/projects/hammer/usr.bin/rlogin/rlogin.c#6 integrate .. //depot/projects/hammer/usr.bin/rpcgen/rpc_clntout.c#5 integrate .. //depot/projects/hammer/usr.bin/rpcgen/rpc_cout.c#6 integrate .. //depot/projects/hammer/usr.bin/rpcgen/rpc_hout.c#5 integrate .. //depot/projects/hammer/usr.bin/rpcgen/rpc_main.c#10 integrate .. //depot/projects/hammer/usr.bin/rpcgen/rpc_parse.c#3 integrate .. //depot/projects/hammer/usr.bin/rpcgen/rpc_parse.h#3 integrate .. //depot/projects/hammer/usr.bin/rpcgen/rpc_sample.c#4 integrate .. //depot/projects/hammer/usr.bin/rpcgen/rpc_scan.c#3 integrate .. //depot/projects/hammer/usr.bin/rpcgen/rpc_scan.h#3 integrate .. //depot/projects/hammer/usr.bin/rpcgen/rpc_svcout.c#6 integrate .. //depot/projects/hammer/usr.bin/rpcgen/rpc_tblout.c#7 integrate .. //depot/projects/hammer/usr.bin/rpcgen/rpc_util.c#3 integrate .. //depot/projects/hammer/usr.bin/rpcgen/rpc_util.h#5 integrate .. //depot/projects/hammer/usr.sbin/arp/arp.4#7 integrate .. //depot/projects/hammer/usr.sbin/bsnmpd/modules/Makefile.inc#6 integrate .. //depot/projects/hammer/usr.sbin/bsnmpd/modules/snmp_atm/Makefile#4 integrate .. //depot/projects/hammer/usr.sbin/bsnmpd/modules/snmp_mibII/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/bsnmpd/modules/snmp_netgraph/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/bsnmpd/modules/snmp_netgraph/snmp_netgraph.c#3 integrate .. //depot/projects/hammer/usr.sbin/bsnmpd/modules/snmp_pf/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/kldxref/kldxref.c#7 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/add/add.h#3 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/add/main.c#13 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/add/perform.c#6 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/add/pkg_add.1#11 integrate Differences ... ==== //depot/projects/hammer/Makefile.inc1#107 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.515 2005/11/07 15:03:04 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.518 2005/11/12 19:31:30 ru Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically @@ -496,6 +496,7 @@ # Require DESTDIR to be set if installing for a different architecture. # .if ${TARGET_ARCH} != ${MACHINE_ARCH} || ${TARGET} != ${MACHINE} +.if !make(distributeworld) SPECIAL_INSTALLCHECKS+= installcheck_DESTDIR installcheck_DESTDIR: .if !defined(DESTDIR) || empty(DESTDIR) @@ -503,6 +504,7 @@ false .endif .endif +.endif # # installcheck @@ -989,8 +991,8 @@ _generic_libs+= kerberos5/lib .endif -_prebuild_libs+= lib/libcom_err lib/libcrypt lib/libexpat \ - lib/libkvm lib/libmd \ +_prebuild_libs+= lib/libbz2 lib/libcom_err lib/libcrypt lib/libexpat \ + lib/libipx lib/libkiconv lib/libkvm lib/libmd \ lib/libncurses lib/libnetgraph lib/libopie lib/libpam \ lib/libradius \ lib/libsbuf lib/libtacplus lib/libutil \ @@ -1003,8 +1005,7 @@ .if !defined(NO_CRYPT) .if !defined(NO_OPENSSL) _prebuild_libs+= secure/lib/libcrypto secure/lib/libssl -lib/libradius__L: secure/lib/libssl__L -secure/lib/libssl__L: secure/lib/libcrypto__L +lib/libradius__L secure/lib/libssl__L: secure/lib/libcrypto__L .if !defined(NO_OPENSSH) _prebuild_libs+= secure/lib/libssh secure/lib/libssh__L: lib/libz__L secure/lib/libcrypto__L lib/libcrypt__L @@ -1107,15 +1108,14 @@ && rm ${RM_I} "${DESTDIR}/${file}")) .endfor # Remove catpages without corresponding manpages. - @for dir in ${DESTDIR}/usr/share/man/cat*; do \ - for catpage in $${dir}/*; do \ - manpage=$$(echo $${catpage} \ - | sed 's:${DESTDIR}/usr/share/man/cat:${DESTDIR}/usr/share/man/man:') \ - check_empty=$$(echo $${catpage} \ - | sed 's:.*\*:empty:'); \ - [ "$${check_empty}" != "empty" -a ! -e "$${manpage}" ] \ - && rm ${RM_I} $${catpage} || true; \ - done; \ + @3<&0; \ + find ${DESTDIR}/usr/share/man/cat* ! -type d | \ + sed -ep -e's:${DESTDIR}/usr/share/man/cat:${DESTDIR}/usr/share/man/man:' | \ + while read catpage; do \ + read manpage; \ + if [ ! -e "$${manpage}" ]; then \ + rm ${RM_I} $${catpage} <&3 ; \ + fi; \ done @echo ">>> Old files removed" @@ -1125,15 +1125,13 @@ @[ ! -f "${DESTDIR}/${file}" ] || echo "${DESTDIR}/${file}" .endfor # Check for catpages without corresponding manpages. - @for dir in ${DESTDIR}/usr/share/man/cat*; do \ - for catpage in $${dir}/*; do \ - manpage=$$(echo $${catpage} \ - | sed 's:${DESTDIR}/usr/share/man/cat:${DESTDIR}/usr/share/man/man:'); \ - check_empty=$$(echo $${catpage} \ - | sed 's:.*\*:empty:'); \ - [ "$${check_empty}" != "empty" -a ! -e "$${manpage}" ] \ - && echo $${catpage} || true; \ - done; \ + @find ${DESTDIR}/usr/share/man/cat* ! -type d | \ + sed -ep -e's:${DESTDIR}/usr/share/man/cat:${DESTDIR}/usr/share/man/man:' | \ + while read catpage; do \ + read manpage; \ + if [ ! -e "$${manpage}" ]; then \ + echo $${catpage} ; \ + fi; \ done delete-old-libs: ==== //depot/projects/hammer/bin/ls/ls.1#23 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)ls.1 8.7 (Berkeley) 7/29/94 -.\" $FreeBSD: src/bin/ls/ls.1,v 1.92 2005/11/10 00:02:32 mux Exp $ +.\" $FreeBSD: src/bin/ls/ls.1,v 1.93 2005/11/10 14:26:50 mux Exp $ .\" -.Dd September 6, 2005 +.Dd November 10, 2005 .Dt LS 1 .Os .Sh NAME @@ -652,6 +652,7 @@ .Xr sticky 8 .Sh STANDARDS With the exception of options +.Fl I , .Fl g , .Fl n and ==== //depot/projects/hammer/contrib/tcpdump/print-tcp.c#5 (text+ko) ==== @@ -799,7 +799,7 @@ MD5_Update(&ctx, tcpmd5secret, strlen(tcpmd5secret)); MD5_Final(sig, &ctx); - if (memcmp(rcvsig, sig, 16)) + if (memcmp(rcvsig, sig, 16) == 0) return (SIGNATURE_VALID); else return (SIGNATURE_INVALID); ==== //depot/projects/hammer/etc/bluetooth/hosts#2 (text+ko) ==== @@ -1,5 +1,5 @@ # $Id: hosts,v 1.1 2003/05/21 17:48:40 max Exp $ -# $FreeBSD: src/etc/bluetooth/hosts,v 1.1 2003/10/12 22:04:18 emax Exp $ +# $FreeBSD: src/etc/bluetooth/hosts,v 1.2 2005/11/10 19:09:22 emax Exp $ # # Bluetooth Host Database # @@ -7,5 +7,4 @@ # # BD_ADDR Name [ alias0 alias1 ... ] -ff:ff:ff:00:00:00 localhost local # Magic sdpd address - +# 00:11:22:33:44:55 phone ==== //depot/projects/hammer/etc/bluetooth/protocols#2 (text+ko) ==== @@ -1,9 +1,10 @@ # $Id: protocols,v 1.2 2003/05/21 22:17:14 max Exp $ -# $FreeBSD: src/etc/bluetooth/protocols,v 1.1 2003/10/12 22:04:18 emax Exp $ +# $FreeBSD: src/etc/bluetooth/protocols,v 1.2 2005/11/10 19:09:22 emax Exp $ # # Bluetooth Protocol/Service Multiplexor (PSM) names and numbers # -# See also http://www.bluetoothsig.org/assigned-numbers/ +# See also +# https://www.bluetooth.org/foundry/assignnumb/document/assigned_numbers # # Protocol PSM Alias Reference ==== //depot/projects/hammer/etc/defaults/Makefile#5 (text+ko) ==== @@ -1,6 +1,6 @@ -# $FreeBSD: src/etc/defaults/Makefile,v 1.5 2004/12/21 08:46:49 ru Exp $ +# $FreeBSD: src/etc/defaults/Makefile,v 1.6 2005/11/10 19:09:22 emax Exp $ -FILES= devfs.rules pccard.conf periodic.conf rc.conf +FILES= bluetooth.device.conf devfs.rules pccard.conf periodic.conf rc.conf NO_OBJ= FILESDIR= /etc/defaults FILESMODE= 444 ==== //depot/projects/hammer/etc/devd.conf#23 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/devd.conf,v 1.28 2005/08/02 18:28:31 sam Exp $ +# $FreeBSD: src/etc/devd.conf,v 1.29 2005/11/12 03:42:56 emax Exp $ # # Refer to devd.conf(5) and devd(8) man pages for the details on how to # run and configure devd. @@ -86,6 +86,16 @@ device-name "ed50"; }; +# When a USB Bluetooth dongle appears activate it +attach 100 { + device-name "ubt[0-9]+"; + action "/etc/rc.d/bluetooth start $device-name"; +}; +detach 100 { + device-name "ubt[0-9]+"; + action "/etc/rc.d/bluetooth stop $device-name"; +}; + # When a USB keyboard arrives, attach it as the console keyboard. attach 100 { device-name "ukbd0"; ==== //depot/projects/hammer/etc/mtree/BSD.include.dist#37 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.103 2005/11/08 09:53:28 rwatson Exp $ +# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.104 2005/11/11 17:38:10 delphij Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -58,6 +58,8 @@ .. smbus .. + speaker + .. usb .. utopia ==== //depot/projects/hammer/etc/mtree/BSD.x11-4.dist#11 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.x11-4.dist,v 1.27 2005/06/15 02:27:41 lesi Exp $ +# $FreeBSD: src/etc/mtree/BSD.x11-4.dist,v 1.28 2005/11/11 21:05:40 ru Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -478,7 +478,7 @@ .. .. .. - pixmaps - .. + pixmaps + .. .. .. ==== //depot/projects/hammer/etc/rc.d/Makefile#42 (text+ko) ==== @@ -1,10 +1,10 @@ # $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $ -# $FreeBSD: src/etc/rc.d/Makefile,v 1.59 2005/10/29 05:05:52 yar Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.60 2005/11/10 19:09:22 emax Exp $ FILES= DAEMON LOGIN NETWORKING SERVERS \ abi accounting addswap adjkerntz amd \ apm apmd archdep atm1 atm2 atm3 \ - bgfsck bootparams bsnmpd \ + bgfsck bluetooth bootparams bsnmpd \ ccd cleanvar cleartmp cron \ devd devfs dhclient \ dmesg dumpon \ ==== //depot/projects/hammer/etc/rc.d/pf#11 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/pf,v 1.11 2005/11/03 13:17:49 rse Exp $ +# $FreeBSD: src/etc/rc.d/pf,v 1.12 2005/11/10 10:40:15 rse Exp $ # # PROVIDE: pf @@ -20,7 +20,7 @@ reload_cmd="pf_reload" resync_cmd="pf_resync" status_cmd="pf_status" -extra_commands="check reload resync" +extra_commands="check reload resync status" required_files="$pf_rules" pf_prestart() ==== //depot/projects/hammer/games/morse/Makefile#2 (text+ko) ==== @@ -1,10 +1,10 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $FreeBSD: src/games/morse/Makefile,v 1.7 2001/03/26 14:20:58 ru Exp $ +# $FreeBSD: src/games/morse/Makefile,v 1.8 2005/11/11 09:57:32 ru Exp $ PROG= morse MAN= morse.6 -.if ${MACHINE_ARCH} == "i386" +.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" CFLAGS += -DSPEAKER=\"/dev/speaker\" .endif ==== //depot/projects/hammer/games/morse/morse.c#7 (text+ko) ==== @@ -47,7 +47,7 @@ static char sccsid[] = "@(#)morse.c 8.1 (Berkeley) 5/31/93"; #endif static const char rcsid[] = - "$FreeBSD: src/games/morse/morse.c,v 1.20 2005/06/07 19:01:41 joerg Exp $"; + "$FreeBSD: src/games/morse/morse.c,v 1.21 2005/11/11 09:57:32 ru Exp $"; #endif /* not lint */ #include <sys/time.h> @@ -64,7 +64,7 @@ #include <unistd.h> #ifdef SPEAKER -#include <machine/speaker.h> +#include <dev/speaker/speaker.h> #endif struct morsetab { ==== //depot/projects/hammer/include/Makefile#49 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 1/4/94 -# $FreeBSD: src/include/Makefile,v 1.249 2005/10/03 07:09:40 scottl Exp $ +# $FreeBSD: src/include/Makefile,v 1.250 2005/11/11 16:48:01 delphij Exp $ # # Doing a "make install" builds /usr/include. @@ -36,7 +36,7 @@ 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/ppbus dev/smbus dev/usb dev/wi dev/utopia \ + dev/pbio dev/ppbus dev/smbus dev/speaker dev/usb dev/wi dev/utopia \ 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 \ ==== //depot/projects/hammer/kerberos5/tools/asn1_compile/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/kerberos5/tools/asn1_compile/Makefile,v 1.5 2004/12/21 08:47:01 ru Exp $ +# $FreeBSD: src/kerberos5/tools/asn1_compile/Makefile,v 1.6 2005/11/10 21:03:58 ru Exp $ PROG= asn1_compile NO_MAN= @@ -31,13 +31,13 @@ print_version.h: ../make-print-version/make-print-version ../make-print-version/make-print-version ${.TARGET} -../make-print-version/make-print-version: +../make-print-version/make-print-version: .PHONY cd ${.CURDIR}/../make-print-version && ${MAKE} roken.h: ../make-roken/make-roken ../make-roken/make-roken > ${.TARGET} -../make-roken/make-roken: +../make-roken/make-roken: .PHONY cd ${.CURDIR}/../make-roken && ${MAKE} .include <bsd.prog.mk> ==== //depot/projects/hammer/lib/libarchive/Makefile#29 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libarchive/Makefile,v 1.41 2005/10/14 16:32:50 kientzle Exp $ +# $FreeBSD: src/lib/libarchive/Makefile,v 1.42 2005/11/10 18:07:05 ru Exp $ # This Makefile is for use with the FreeBSD buid system. For # non-FreeBSD systems, you should first "make distfile" on FreeBSD, @@ -6,6 +6,8 @@ # autoconf/automake-generated build system--on the other system. LIB= archive +DPADD= ${LIBBZ2} ${LIBZ} +LDADD= -lbz2 -lz # Versioning <sigh>. There are three distinct sets of version # numbers: ==== //depot/projects/hammer/lib/libc/gen/_pthread_stubs.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/gen/_pthread_stubs.c,v 1.11 2004/07/29 18:07:08 kan Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/_pthread_stubs.c,v 1.12 2005/11/12 16:00:29 deischen Exp $"); #include <signal.h> #include <pthread.h> @@ -97,8 +97,8 @@ #define FUNC_EXP(name) __CONCAT(name, _exp) #define STUB_FUNC(name, idx, ret) \ - static ret FUNC_EXP(name)(void) __used; \ - static ret FUNC_INT(name)(void) __used; \ + static ret FUNC_EXP(name)(void) __used; \ + static ret FUNC_INT(name)(void) __used; \ WEAK_REF(FUNC_EXP(name), name); \ WEAK_REF(FUNC_INT(name), __CONCAT(_, name)); \ typedef ret (*FUNC_TYPE(name))(void); \ @@ -176,7 +176,7 @@ STUB_FUNC1(pthread_cond_destroy, PJT_COND_DESTROY, int, void *) STUB_FUNC2(pthread_cond_init, PJT_COND_INIT, int, void *, void *) STUB_FUNC1(pthread_cond_signal, PJT_COND_SIGNAL, int, void *) -STUB_FUNC1(pthread_cond_wait, PJT_COND_WAIT, int, void *) +STUB_FUNC2(pthread_cond_wait, PJT_COND_WAIT, int, void *, void *) STUB_FUNC1(pthread_getspecific, PJT_GETSPECIFIC, void *, pthread_key_t) STUB_FUNC2(pthread_key_create, PJT_KEY_CREATE, int, void *, void *) STUB_FUNC1(pthread_key_delete, PJT_KEY_DELETE, int, pthread_key_t) ==== //depot/projects/hammer/lib/libc/sys/Makefile.inc#17 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile.inc 8.3 (Berkeley) 10/24/94 -# $FreeBSD: src/lib/libc/sys/Makefile.inc,v 1.113 2005/07/07 18:17:55 jhb Exp $ +# $FreeBSD: src/lib/libc/sys/Makefile.inc,v 1.115 2005/11/11 07:48:38 davidxu Exp $ # sys sources .PATH: ${.CURDIR}/${MACHINE_ARCH}/sys ${.CURDIR}/sys @@ -77,10 +77,11 @@ rtprio.2 select.2 semctl.2 semget.2 semop.2 send.2 sendfile.2 \ setgroups.2 setpgid.2 setregid.2 setresuid.2 setreuid.2 setsid.2 \ setuid.2 shmat.2 shmctl.2 shmget.2 shutdown.2 \ - sigaction.2 sigaltstack.2 sigpending.2 sigprocmask.2 sigreturn.2 \ - sigstack.2 sigsuspend.2 sigwait.2 \ + sigaction.2 sigaltstack.2 sigpending.2 sigprocmask.2 sigqueue.2 \ + sigreturn.2 sigstack.2 sigsuspend.2 sigwait.2 sigwaitinfo.2 \ socket.2 socketpair.2 stat.2 statfs.2 \ swapon.2 symlink.2 sync.2 sysarch.2 syscall.2 \ + timer_create.2 timer_delete.2 timer_settime.2 \ truncate.2 umask.2 undelete.2 \ unlink.2 utimes.2 utrace.2 uuidgen.2 vfork.2 wait.2 write.2 .if !defined(NO_P1003_1B) @@ -134,10 +135,12 @@ MLINKS+=setresuid.2 setresgid.2 setresuid.2 getresuid.2 setresuid.2 getresgid.2 MLINKS+=setuid.2 setegid.2 setuid.2 seteuid.2 setuid.2 setgid.2 MLINKS+=shmat.2 shmdt.2 +MLINKS+=sigwaitinfo.2 sigtimedwait.2 MLINKS+=stat.2 fstat.2 stat.2 lstat.2 MLINKS+=statfs.2 fstatfs.2 MLINKS+=syscall.2 __syscall.2 MLINKS+=swapon.2 swapoff.2 +MLINKS+=timer_settime.2 timer_gettime.2 timer_settime.2 timer_getoverrun.2 MLINKS+=truncate.2 ftruncate.2 MLINKS+=utimes.2 futimes.2 utimes.2 lutimes.2 MLINKS+=wait.2 wait3.2 wait.2 wait4.2 wait.2 waitpid.2 ==== //depot/projects/hammer/lib/libc/sys/sigwait.2#3 (text+ko) ==== @@ -25,7 +25,7 @@ .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/sys/sigwait.2,v 1.11 2004/07/03 23:14:34 ru Exp $ +.\" $FreeBSD: src/lib/libc/sys/sigwait.2,v 1.12 2005/11/11 05:40:39 davidxu Exp $ .\" .Dd April 27, 2000 .Dt SIGWAIT 2 @@ -58,6 +58,24 @@ .Fa set should be blocked at the time of the call to .Fn sigwait . +.Pp +If more than one thread is using +.Fn sigwait +to wait for the same signal, no more than one of these threads will return from +.Fn sigwait +with the signal number. If more than a single thread is blocked in +.Fn sigwait +for a signal when that signal is generated for the process, it is unspecified +which of the waiting threads returns from +.Fn sigwait . +If the signal is generated for a specific thread, as by +.Fn pthread_kill , +only that thread will return. +.Pp +Should any of the multiple pending signals in the range SIGRTMIN to SIGRTMAX be +selected, it will be the lowest numbered one. The selection order between realtime +and non-realtime signals, or between multiple pending non-realtime signals, +is unspecified. .Sh RETURN VALUES If successful, .Fn sigwait @@ -75,8 +93,14 @@ .Fa set argument specifies one or more invalid signal numbers. +.It Bq Er EFAULT +Any arguments point outside the allocated address space or there is a +memory protection fault. .El .Sh SEE ALSO +.Xr sigtimedwait 2 , +.Xr sigwaitinfo 2 , +.Xr sigqueue 2 , .Xr sigaction 2 , .Xr sigpending 2 , .Xr sigsuspend 2 , ==== //depot/projects/hammer/lib/libc/sys/wait.2#6 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)wait.2 8.2 (Berkeley) 4/19/94 -.\" $FreeBSD: src/lib/libc/sys/wait.2,v 1.20 2005/01/20 09:17:05 ru Exp $ +.\" $FreeBSD: src/lib/libc/sys/wait.2,v 1.23 2005/11/12 01:37:03 davidxu Exp $ .\" .Dd April 19, 1994 .Dt WAIT 2 @@ -133,7 +133,7 @@ is non-zero, a summary of the resources used by the terminated process and all its children is returned (this information is currently not available -for stopped processes). +for stopped or continued processes). .Pp When the .Dv WNOHANG @@ -233,10 +233,23 @@ see .Xr intro 2 , System call restart. +.Pp +The implementation queues one SIGCHLD signal for each child process whose +status has changed, if +.Fn wait +returns because the status of a child process is available, the pending +SIGCHLD signal associated with the process ID of the child process will +be discarded. Any other pending SIGCHLD signals remain pending. +.Pp +If SIGCHLD is blocked, +.Fn wait +returns because the status of a child process is available, the pending +SIGCHLD signal will be cleared unless another status of the child process +is available. .Sh RETURN VALUES If .Fn wait -returns due to a stopped +returns due to a stopped, continued, or terminated child process, the process ID of the child is returned to the calling process. Otherwise, a value of -1 @@ -249,7 +262,7 @@ .Fn wait3 , or .Fn waitpid -returns due to a stopped +returns due to a stopped, continued, or terminated child process, the process ID of the child is returned to the calling process. If there are no children not previously awaited, @@ -260,7 +273,7 @@ Otherwise, if .Dv WNOHANG is specified and there are -no stopped or exited children, +no stopped, continued or exited children, 0 is returned. If an error is detected or a caught signal aborts the call, a value of -1 ==== //depot/projects/hammer/lib/libform/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ # Makefile for libform -# $FreeBSD: src/lib/libform/Makefile,v 1.8 2003/06/06 13:46:55 kuriyama Exp $ +# $FreeBSD: src/lib/libform/Makefile,v 1.9 2005/11/10 18:07:05 ru Exp $ NCURSES=${.CURDIR}/../../contrib/ncurses @@ -8,6 +8,9 @@ .PATH: ${NCURSES}/man LIB= form +DPADD= ${LIBNCURSES} +LDADD= -lncurses + AWK?= awk SRCS= ncurses_def.h \ ==== //depot/projects/hammer/lib/libmagic/Makefile#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libmagic/Makefile,v 1.7 2005/07/22 17:19:01 kensmith Exp $ +# $FreeBSD: src/lib/libmagic/Makefile,v 1.8 2005/11/10 18:07:05 ru Exp $ # Copyright (c) David E. O'Brien, 2000-2004 CONTRDIR= ${.CURDIR}/../../contrib/file @@ -6,6 +6,8 @@ LIB= magic SHLIB_MAJOR= 1 +DPADD= ${LIBZ} +LDADD= -lz MAN= libmagic.3 magic.5 SRCS= apprentice.c apptype.c ascmagic.c compress.c fsmagic.c funcs.c \ ==== //depot/projects/hammer/lib/libmemstat/Makefile#3 (text+ko) ==== @@ -1,8 +1,10 @@ -# $FreeBSD: src/lib/libmemstat/Makefile,v 1.3 2005/07/24 01:41:47 rwatson Exp $ +# $FreeBSD: src/lib/libmemstat/Makefile,v 1.5 2005/11/13 13:42:03 rwatson Exp $ WARNS?= 3 LIB= memstat SHLIB_MAJOR= 1 +DPADD= ${LIBKVM} +LDADD= -lkvm SRCS+= memstat.c SRCS+= memstat_all.c SRCS+= memstat_malloc.c @@ -21,5 +23,8 @@ MLINKS+= libmemstat.3 memstat_sysctl_all.3 MLINKS+= libmemstat.3 memstat_sysctl_malloc.3 MLINKS+= libmemstat.3 memstat_sysctl_uma.3 +MLINKS+= libmemstat.3 memstat_kvm_all.3 +MLINKS+= libmemstat.3 memstat_kvm_malloc.3 +MLINKS+= libmemstat.3 memstat_kvm_uma.3 .include <bsd.lib.mk> ==== //depot/projects/hammer/lib/libmenu/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ # Makefile for libmenu -# $FreeBSD: src/lib/libmenu/Makefile,v 1.10 2003/06/06 13:46:55 kuriyama Exp $ +# $FreeBSD: src/lib/libmenu/Makefile,v 1.11 2005/11/10 18:07:06 ru Exp $ NCURSES=${.CURDIR}/../../contrib/ncurses @@ -7,6 +7,8 @@ .PATH: ${NCURSES}/man LIB= menu +DPADD= ${LIBNCURSES} +LDADD= -lncurses AWK?= awk SRCS= ncurses_def.h \ ==== //depot/projects/hammer/lib/libmp/Makefile#6 (text+ko) ==== @@ -1,7 +1,9 @@ -# $FreeBSD: src/lib/libmp/Makefile,v 1.10 2005/07/22 17:19:01 kensmith Exp $ +# $FreeBSD: src/lib/libmp/Makefile,v 1.11 2005/11/10 18:07:06 ru Exp $ LIB= mp SHLIB_MAJOR= 4 +DPADD= ${LIBCRYPTO} +LDADD= -lcrypto MAN= libmp.3 INCS= mp.h SRCS= mpasbn.c ==== //depot/projects/hammer/lib/libncp/Makefile#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libncp/Makefile,v 1.6 2005/07/22 17:19:02 kensmith Exp $ +# $FreeBSD: src/lib/libncp/Makefile,v 1.7 2005/11/10 18:07:06 ru Exp $ NCPLIB=${.CURDIR} @@ -6,6 +6,9 @@ SHLIB_MAJOR= 1 +DPADD= ${LIBIPX} +LDADD= -lipx + NO_MAN= SRCS= ncpl_subr.c ncpl_bind.c ncpl_queue.c ncpl_file.c ncpl_misc.c \ ==== //depot/projects/hammer/lib/libpanel/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ # Makefile for libpanel -# $FreeBSD: src/lib/libpanel/Makefile,v 1.9 2003/06/06 13:46:55 kuriyama Exp $ +# $FreeBSD: src/lib/libpanel/Makefile,v 1.10 2005/11/10 18:07:06 ru Exp $ NCURSES=${.CURDIR}/../../contrib/ncurses @@ -7,6 +7,8 @@ .PATH: ${NCURSES}/man LIB= panel +DPADD= ${LIBNCURSES} +LDADD= -lncurses AWK?= awk SRCS= ncurses_def.h \ ==== //depot/projects/hammer/lib/libradius/Makefile#10 (text+ko) ==== @@ -22,7 +22,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/lib/libradius/Makefile,v 1.12 2005/07/22 17:19:03 kensmith Exp $ +# $FreeBSD: src/lib/libradius/Makefile,v 1.13 2005/11/10 18:07:06 ru Exp $ LIB= radius SRCS= radlib.c @@ -35,8 +35,8 @@ DPADD= ${LIBMD} LDADD= -lmd .else -DPADD= ${LIBSSL} -LDADD= -lssl +DPADD= ${LIBCRYPTO} +LDADD= -lcrypto CFLAGS+= -DWITH_SSL .endif >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200511142335.jAENZ9uM061403>