PERFORCE change 93616 for review
soc-andrew
soc-andrew at FreeBSD.org
Mon Mar 20 09:43:40 UTC 2006
http://perforce.freebsd.org/chv.cgi?CH=93616
Change 93616 by soc-andrew at soc-andrew_serv on 2006/03/20 09:43:27
IFC
Affected files ...
.. //depot/projects/soc2005/bsdinstaller/src/Makefile.inc1#12 integrate
.. //depot/projects/soc2005/bsdinstaller/src/lib/Makefile#10 integrate
.. //depot/projects/soc2005/bsdinstaller/src/libexec/Makefile#3 integrate
.. //depot/projects/soc2005/bsdinstaller/src/release/Makefile#38 integrate
.. //depot/projects/soc2005/bsdinstaller/src/release/pc98/boot_crunch.conf#4 integrate
.. //depot/projects/soc2005/bsdinstaller/src/release/picobsd/tinyware/login/Makefile#2 integrate
.. //depot/projects/soc2005/bsdinstaller/src/release/scripts/package-split.py#4 integrate
.. //depot/projects/soc2005/bsdinstaller/src/share/Makefile#4 integrate
.. //depot/projects/soc2005/bsdinstaller/src/usr.bin/Makefile#6 integrate
.. //depot/projects/soc2005/bsdinstaller/src/usr.sbin/Makefile#14 integrate
Differences ...
==== //depot/projects/soc2005/bsdinstaller/src/Makefile.inc1#12 (text+ko) ====
@@ -1,21 +1,10 @@
#
-# $FreeBSD: src/Makefile.inc1,v 1.537 2006/03/09 12:55:02 keramida Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.542 2006/03/19 15:36:56 mux Exp $
#
# Make command line options:
-# -DNO_DYNAMICROOT do not link /bin and /sbin dynamically
-# -DNO_KERBEROS Do not build Heimdal (Kerberos 5)
-# -DNO_RESCUE do not build rescue binaries
# -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
# -DNO_CLEAN do not clean at all
-# -DNO_CRYPT will prevent building of crypt versions
-# -DNO_MAN do not build the manual pages
-# -DNO_NLS do not build Native Language Support files
-# -DNO_PROFILE do not build profiled libraries
-# -DNO_GAMES do not go into games subdir
# -DNO_SHARE do not go into share subdir
-# -DNO_INFO do not make or install info files
-# -DNO_LIBC_R do not build libc_r.
-# -DNO_FORTRAN do not build g77 and related libraries.
# -DNO_KERNELCONFIG do not run config in ${MAKE} buildkernel
# -DNO_KERNELCLEAN do not run ${MAKE} clean in ${MAKE} buildkernel
# -DNO_KERNELDEPEND do not run ${MAKE} depend in ${MAKE} buildkernel
@@ -34,6 +23,8 @@
# /usr/share/mk. These include:
# obj depend all install clean cleandepend cleanobj
+.include <bsd.own.mk>
+
# We must do share/info early so that installation of info `dir'
# entries works correctly. Do it first since it is less likely to
# grow dependencies on include and lib than vice versa.
@@ -46,18 +37,18 @@
# We must do etc last for install/distribute to work.
#
SUBDIR= share/info include lib libexec bin
-.if !defined(NO_GAMES)
+.if ${MK_GAMES} != "no"
SUBDIR+=games
.endif
SUBDIR+=gnu
-.if !defined(NO_KERBEROS) && !defined(NO_CRYPT) && !defined(NO_OPENSSL)
+.if ${MK_KERBEROS} != "no"
SUBDIR+=kerberos5
.endif
-.if !defined(NO_RESCUE)
+.if ${MK_RESCUE} != "no"
SUBDIR+=rescue
.endif
SUBDIR+=sbin
-.if !defined(NO_CRYPT)
+.if ${MK_CRYPT} != "no"
SUBDIR+=secure
.endif
.if !defined(NO_SHARE)
@@ -88,8 +79,8 @@
CVS?= cvs
CVSFLAGS?= -A -P -d -I!
-SUP?= /usr/local/bin/cvsup
-SUPFLAGS?= -g -L 2 -P -
+SUP?= /usr/bin/csup
+SUPFLAGS?= -g -L 2
.if defined(SUPHOST)
SUPFLAGS+= -h ${SUPHOST}
.endif
@@ -186,8 +177,9 @@
${BMAKEENV} ${MAKE} -f Makefile.inc1 \
DESTDIR= \
BOOTSTRAPPING=${OSRELDATE} \
- -DNO_HTML -DNO_INFO -DNO_LINT -DNO_MAN -DNO_NLS -DNO_PIC \
- -DNO_PROFILE -DNO_SHARED -DNO_CPU_CFLAGS -DNO_WARNS
+ -DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT -DWITHOUT_MAN \
+ -DWITHOUT_NLS -DNO_PIC -DWITHOUT_PROFILE -DNO_SHARED \
+ -DNO_CPU_CFLAGS -DNO_WARNS
# build-tools stage
TMAKE= MAKEOBJDIRPREFIX=${OBJTREE} \
@@ -196,7 +188,8 @@
BOOTSTRAPPING=${OSRELDATE} -DNO_LINT -DNO_CPU_CFLAGS -DNO_WARNS
# cross-tools stage
-XMAKE= TOOLS_PREFIX=${WORLDTMP} ${BMAKE} -DNO_FORTRAN -DNO_GDB
+XMAKE= TOOLS_PREFIX=${WORLDTMP} ${BMAKE} \
+ -DWITHOUT_FORTRAN -DWITHOUT_GDB
# world stage
WMAKEENV= ${CROSSENV} \
@@ -241,7 +234,8 @@
SHLIBDIR=/usr/lib32
LIB32MAKE= ${LIB32MAKEENV} ${MAKE} -DNO_CPU_CFLAGS -DCOMPAT_32BIT \
- -DNO_BIND -DNO_MAN -DNO_NLS -DNO_INFO -DNO_HTML
+ -DWITHOUT_BIND -DWITHOUT_MAN -DWITHOUT_NLS -DWITHOUT_INFO \
+ -DWITHOUT_HTML
LIB32IMAKE= ${LIB32MAKE:NINSTALL=*} -DNO_INCS
.endif
@@ -318,7 +312,7 @@
mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \
-p ${WORLDTMP}/usr/include >/dev/null
ln -sf ${.CURDIR}/sys ${WORLDTMP}
-.if defined(WITH_BIND_LIBS) && !defined(NO_BIND)
+.if ${MK_BIND_LIBS} != "no"
mtree -deU -f ${.CURDIR}/etc/mtree/BIND.include.dist \
-p ${WORLDTMP}/usr/include >/dev/null
.endif
@@ -375,8 +369,8 @@
@echo ">>> stage 4.2: building libraries"
@echo "--------------------------------------------------------------"
${_+_}cd ${.CURDIR}; \
- ${WMAKE} -DNO_FSCHG -DNO_HTML -DNO_INFO -DNO_LINT -DNO_MAN \
- -DNO_NLS -DNO_PROFILE libraries
+ ${WMAKE} -DNO_FSCHG -DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT \
+ -DWITHOUT_MAN -DWITHOUT_NLS -DWITHOUT_PROFILE libraries
_depend:
@echo
@echo "--------------------------------------------------------------"
@@ -405,7 +399,7 @@
-p ${LIB32TMP}/usr/include >/dev/null
mkdir -p ${WORLDTMP}
ln -sf ${.CURDIR}/sys ${WORLDTMP}
-.if !defined(NO_KERBEROS) && !defined(NO_CRYPT) && !defined(NO_OPENSSL)
+.if ${MK_KERBEROS} != "no"
.for _t in obj depend all
cd ${.CURDIR}/kerberos5/tools; \
MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} DESTDIR= ${_t}
@@ -418,11 +412,11 @@
${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t}
cd ${.CURDIR}/gnu/lib; \
${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t}
-.if !defined(NO_CRYPT)
+.if ${MK_CRYPT} != "no"
cd ${.CURDIR}/secure/lib; \
${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t}
.endif
-.if !defined(NO_KERBEROS) && !defined(NO_CRYPT) && !defined(NO_OPENSSL)
+.if ${MK_KERBEROS} != "no"
cd ${.CURDIR}/kerberos5/lib; \
${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t}
.endif
@@ -450,7 +444,7 @@
.endif
cd ${.CURDIR}/lib; ${LIB32IMAKE} ${.TARGET:S/32$//}
cd ${.CURDIR}/gnu/lib; ${LIB32IMAKE} ${.TARGET:S/32$//}
-.if !defined(NO_CRYPT)
+.if ${MK_CRYPT} != "no"
cd ${.CURDIR}/secure/lib; ${LIB32IMAKE} ${.TARGET:S/32$//}
.endif
cd ${.CURDIR}/libexec/rtld-elf; PROG=ld-elf32.so.1 ${LIB32IMAKE} ${.TARGET:S/32$//}
@@ -466,7 +460,7 @@
WMAKE_TGTS+= _cross-tools
.endif
WMAKE_TGTS+= _includes _libraries _depend everything
-.if ${TARGET_ARCH} == "amd64" && !defined(NO_LIB32)
+.if ${TARGET_ARCH} == "amd64" && ${MK_LIB32} != "no"
WMAKE_TGTS+= build32
.endif
@@ -507,11 +501,11 @@
#
CHECK_UIDS=
CHECK_GIDS= audit
-.if !defined(NO_SENDMAIL)
+.if ${MK_SENDMAIL} != "no"
CHECK_UIDS+= smmsp
CHECK_GIDS+= smmsp
.endif
-.if !defined(NO_PF)
+.if ${MK_PF} != "no"
CHECK_UIDS+= proxy
CHECK_GIDS+= proxy authpf
.endif
@@ -567,7 +561,7 @@
@echo ">>> Installing everything"
@echo "--------------------------------------------------------------"
${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install
-.if ${TARGET_ARCH} == "amd64" && !defined(NO_LIB32)
+.if ${TARGET_ARCH} == "amd64" && ${MK_LIB32} != "no"
${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install32
.endif
@@ -576,7 +570,7 @@
@echo ">>> Distributing everything"
@echo "--------------------------------------------------------------"
${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 distribute
-.if ${TARGET_ARCH} == "amd64" && !defined(NO_LIB32)
+.if ${TARGET_ARCH} == "amd64" && ${MK_LIB32} != "no"
${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 distribute32 DISTRIBUTION=lib32
.endif
@@ -782,11 +776,11 @@
#
# bootstrap-tools: Build tools needed for compatibility
#
-.if !defined(NO_GAMES)
+.if ${MK_GAMES} != "no"
_strfile= games/fortune/strfile
.endif
-.if !defined(NO_CXX)
+.if ${MK_CXX} != "no"
_gperf= gnu/usr.bin/gperf
.if ${BOOTSTRAPPING} < 700004
_groff= gnu/usr.bin/groff
@@ -815,7 +809,7 @@
_mklocale= usr.bin/mklocale
.endif
-.if !defined(NO_RESCUE) && \
+.if ${MK_RESCUE} != "no" && \
${BOOTSTRAPPING} < 600008
_crunchgen= usr.sbin/crunch/crunchgen
.endif
@@ -865,11 +859,11 @@
_share= share/syscons/scrnmaps
.endif
-.if !defined(NO_KERBEROS) && !defined(NO_CRYPT) && !defined(NO_OPENSSL)
+.if ${MK_KERBEROS} != "no"
_kerberos5_tools= kerberos5/tools
.endif
-.if !defined(NO_RESCUE)
+.if ${MK_RESCUE} != "no"
_rescue= rescue/rescue
.endif
@@ -906,7 +900,7 @@
.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386"
_btxld= usr.sbin/btxld
.endif
-.if !defined(NO_RESCUE) || defined(RELEASEDIR)
+.if ${MK_RESCUE} != "no" || defined(RELEASEDIR)
_crunchide= usr.sbin/crunch/crunchide
.endif
.if ${TARGET_ARCH} == "alpha"
@@ -969,7 +963,7 @@
_generic_libs= gnu/lib
-.if !defined(NO_KERBEROS) && !defined(NO_CRYPT) && !defined(NO_OPENSSL)
+.if ${MK_KERBEROS} != "no"
_prebuild_libs+= kerberos5/lib/libasn1
_prebuild_libs+= kerberos5/lib/libkrb5
_prebuild_libs+= kerberos5/lib/libroken
@@ -987,14 +981,14 @@
_generic_libs+= lib
-.if !defined(NO_CRYPT)
-.if !defined(NO_OPENSSL)
+.if ${MK_CRYPT} != "no"
+.if ${MK_OPENSSL} != "no"
_prebuild_libs+= secure/lib/libcrypto secure/lib/libssl
lib/libradius__L secure/lib/libssl__L: secure/lib/libcrypto__L
-.if !defined(NO_OPENSSH)
+.if ${MK_OPENSSH} != "no"
_prebuild_libs+= secure/lib/libssh
secure/lib/libssh__L: lib/libz__L secure/lib/libcrypto__L lib/libcrypt__L
-.if !defined(NO_KERBEROS)
+.if ${MK_KERBEROS} != "no"
secure/lib/libssh__L: lib/libgssapi__L
.endif
.endif
@@ -1002,17 +996,17 @@
_generic_libs+= secure/lib
.endif
-.if defined(NO_CRYPT) || defined(NO_OPENSSL)
+.if ${MK_OPENSSL} == "no"
lib/libradius__L: lib/libmd__L
.endif
-.if !defined(NO_NIS)
+.if ${MK_NIS} != "no"
_prebuild_libs+= lib/libypclnt
.endif
_generic_libs+= usr.bin/lex/lib
-.if ${MACHINE_ARCH} == "i386"
+.if ${MACHINE} == "i386"
_generic_libs+= usr.sbin/pcvt/keycap
.endif
@@ -1180,3 +1174,8 @@
.endif
+#
+# showconfig - show build configuration.
+#
+showconfig:
+ @${MAKE} -n -f bsd.own.mk -V dummy -dg1 | grep ^MK_ | sort
==== //depot/projects/soc2005/bsdinstaller/src/lib/Makefile#10 (text+ko) ====
@@ -1,5 +1,7 @@
# @(#)Makefile 8.1 (Berkeley) 6/4/93
-# $FreeBSD: src/lib/Makefile,v 1.212 2006/03/09 01:03:58 davidxu Exp $
+# $FreeBSD: src/lib/Makefile,v 1.213 2006/03/17 18:54:24 ru Exp $
+
+.include <bsd.own.mk>
# To satisfy shared library or ELF linkage when only the libraries being
# built are visible:
@@ -45,16 +47,16 @@
_csu=csu
.endif
-.if !defined(NO_ATM)
+.if ${MK_ATM} != "no"
_libatm= libatm
_libngatm= libngatm
.endif
-.if !defined(NO_BIND)
+.if ${MK_BIND} != "no"
_bind= bind
.endif
-.if !defined(NO_BLUETOOTH)
+.if ${MK_BLUETOOTH} != "no"
_libbluetooth= libbluetooth
_libsdp= libsdp
.endif
@@ -66,7 +68,7 @@
.endif
.if ${MACHINE_ARCH} != "arm" && ${MACHINE_ARCH} != "ia64" && \
- ${MACHINE_ARCH} != "powerpc" && !defined(NO_LIBC_R)
+ ${MACHINE_ARCH} != "powerpc" && ${MK_LIBC_R} != "no"
_libc_r=
.endif
@@ -74,14 +76,14 @@
_libio= libio
.endif
-.if !defined(NO_SENDMAIL)
+.if ${MK_SENDMAIL} != "no"
_libmilter= libmilter
_libsm= libsm
_libsmdb= libsmdb
_libsmutil= libsmutil
.endif
-.if !defined(NO_CRYPT) && !defined(NO_OPENSSL)
+.if ${MK_OPENSSL} != "no"
_libmp= libmp
.endif
@@ -94,11 +96,11 @@
_libsmb= libsmb
.endif
-.if !defined(NO_LIBPTHREAD)
+.if ${MK_LIBPTHREAD} != "no"
_libpthread= libpthread
.endif
-.if !defined(NO_LIBTHR)
+.if ${MK_LIBTHR} != "no"
_libthr= libthr
.endif
@@ -106,15 +108,15 @@
_libthread_db= libthread_db
.endif
-.if !defined(NO_USB)
+.if ${MK_USB} != "no"
_libusbhid= libusbhid
.endif
-.if !defined(NO_NIS)
+.if ${MK_NIS} != "no"
_libypclnt= libypclnt
.endif
-.if !defined(NO_GPIB)
+.if ${MK_GPIB} != "no"
_libgpib= libgpib
.endif
==== //depot/projects/soc2005/bsdinstaller/src/libexec/Makefile#3 (text+ko) ====
@@ -1,5 +1,7 @@
# @(#)Makefile 8.1 (Berkeley) 6/4/93
-# $FreeBSD: src/libexec/Makefile,v 1.75 2005/06/10 20:52:35 nectar Exp $
+# $FreeBSD: src/libexec/Makefile,v 1.76 2006/03/17 18:54:28 ru Exp $
+
+.include <bsd.own.mk>
SUBDIR= atrun \
bootpd \
@@ -33,12 +35,12 @@
tftpd \
${_ypxfr}
-.if !defined(NO_NIS)
+.if ${MK_NIS} != "no"
_mknetid= mknetid
_ypxfr= ypxfr
.endif
-.if !defined(NO_PF)
+.if ${MK_PF} != "no"
_ftp-proxy= ftp-proxy
.endif
@@ -46,12 +48,12 @@
_rtld-elf= rtld-elf
.endif
-.if !defined(NO_RCMDS)
+.if ${MK_RCMDS} != "no"
_rlogind= rlogind
_rshd= rshd
.endif
-.if !defined(NO_SENDMAIL)
+.if ${MK_SENDMAIL} != "no"
_mail.local= mail.local
_smrsh= smrsh
.endif
==== //depot/projects/soc2005/bsdinstaller/src/release/Makefile#38 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/release/Makefile,v 1.902 2006/03/09 17:55:08 ru Exp $
+# $FreeBSD: src/release/Makefile,v 1.906 2006/03/18 21:37:05 ru Exp $
#
# make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \
# [RELEASETAG=tag]
@@ -177,9 +177,10 @@
# Build and package both GENERIC and SMP kernels if the target
# has both configuration files. Otherwise only GENERIC is done.
#
-KERNELS+= GENERIC
.if exists(${.CURDIR}/../sys/${TARGET}/conf/SMP)
-KERNELS+= SMP
+KERNELS_BASE?= GENERIC SMP
+.else
+KERNELS_BASE?= GENERIC
.endif
# mountpoint for filesystems.
@@ -374,8 +375,8 @@
.endif
mkdir -p ${CHROOTDIR}
@echo ">>> make release for ${TARGET} started on `LC_ALL=C TZ=GMT date`"
- cd ${WORLDDIR} && ${NATIVEMAKE} -DNO_GAMES -DNO_HTML -DNO_LIB32 \
- -DNO_MAN -DNO_NLS -DNO_PROFILE installworld DESTDIR=${CHROOTDIR}
+ cd ${WORLDDIR} && ${NATIVEMAKE} -DWITHOUT_GAMES -DWITHOUT_HTML -DWITHOUT_LIB32 \
+ -DWITHOUT_MAN -DWITHOUT_NLS -DWITHOUT_PROFILE installworld DESTDIR=${CHROOTDIR}
cd ${WORLDDIR} && ${NATIVEMAKE} distribution DESTDIR=${CHROOTDIR}
if [ -f /etc/resolv.conf ]; then \
cp -p /etc/resolv.conf ${CHROOTDIR}/etc; \
@@ -483,6 +484,7 @@
FTP_PROXY \
HTTP_PROXY \
KERNELS \
+ KERNELS_BASE \
KERNEL_FLAGS \
MAKE_ISOS \
NOCDROM \
@@ -493,7 +495,6 @@
NO_CPU_CFLAGS \
NO_CPU_COPTFLAGS \
NO_FLOPPIES \
- NO_SENDMAIL \
RELEASETAG \
RELNOTES_LANG \
SEPARATE_LIVEFS \
@@ -588,8 +589,8 @@
-p ${RD}/trees/$$i/var > /dev/null ; \
done
mkdir ${RD}/kernels
- for i in ${KERNELS}; do \
- mkdir ${RD}/kernels/$${i}; \
+ for i in ${KERNELS_BASE} ${KERNELS}; do \
+ mkdir -p ${RD}/kernels/$${i}; \
done
touch ${.TARGET}
@@ -602,7 +603,7 @@
# Make and install the generic kernel(s).
release.3:
-.for kernel in ${KERNELS}
+.for kernel in ${KERNELS_BASE} ${KERNELS}
cd ${.CURDIR}/..; \
${CROSSMAKE} ${KERNEL_FLAGS} \
KERNCONF=${kernel} kernel \
@@ -665,7 +666,7 @@
echo "$${i} distribution is finished."; \
fi ; \
done
- @for i in ${KERNELS} ; \
+ @for i in ${KERNELS_BASE} ${KERNELS} ; \
do \
if [ -d ${RD}/kernels/$${i} ] ; then \
cd ${.CURDIR} && $(MAKE) doTARBALL \
==== //depot/projects/soc2005/bsdinstaller/src/release/pc98/boot_crunch.conf#4 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/release/pc98/boot_crunch.conf,v 1.61 2006/03/08 18:02:31 sam Exp $
+# $FreeBSD: src/release/pc98/boot_crunch.conf,v 1.62 2006/03/10 12:18:41 nyan Exp $
buildopts -DRELEASE_CRUNCH -Dlint
@@ -40,4 +40,4 @@
progs sysinstall
libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph
-libs -ldialog -lncurses -ldisk -lcam -lsbuf -lufs -ldevinfo
+libs -ldialog -lncurses -ldisk -lcam -lsbuf -lufs
==== //depot/projects/soc2005/bsdinstaller/src/release/picobsd/tinyware/login/Makefile#2 (text+ko) ====
@@ -1,5 +1,7 @@
# From: @(#)Makefile 8.1 (Berkeley) 7/19/93
-# $FreeBSD: src/release/picobsd/tinyware/login/Makefile,v 1.4 2004/12/21 12:49:24 ru Exp $
+# $FreeBSD: src/release/picobsd/tinyware/login/Makefile,v 1.5 2006/03/17 18:54:30 ru Exp $
+
+.include <bsd.own.mk>
.PATH: ${.CURDIR}/../../../../usr.bin/login
@@ -12,7 +14,7 @@
DPADD= ${LIBUTIL} ${LIBCRYPT}
LDADD= -lutil -lcrypt
-.if !defined(NO_PAM)
+.if ${MK_PAM_SUPPORT} != "no"
CFLAGS+= -DUSE_PAM
DPADD+= ${LIBPAM}
LDADD+= ${MINUSLPAM}
==== //depot/projects/soc2005/bsdinstaller/src/release/scripts/package-split.py#4 (text+ko) ====
@@ -7,7 +7,7 @@
#
# Usage: package-split.py <INDEX> <master INDEX>
#
-# $FreeBSD: src/release/scripts/package-split.py,v 1.9 2005/12/07 22:25:12 obrien Exp $
+# $FreeBSD: src/release/scripts/package-split.py,v 1.11 2006/03/17 02:05:46 kensmith Exp $
import os
import sys
@@ -57,8 +57,6 @@
'devel/gmake',
'editors/emacs',
'editors/vim',
- 'editors/vim-lite',
- 'editors/xemacs',
'emulators/mtools',
'graphics/png',
'graphics/xv',
@@ -70,7 +68,6 @@
'mail/popd',
'mail/xfmail',
'mail/postfix',
- 'net/cvsup',
'net/cvsup-without-gui',
'net/rsync',
'net/samba',
@@ -92,9 +89,6 @@
'x11/rxvt',
# Formerly on disc3
'security/portaudit'])
- if arch == 'i386':
- pkgs.extend(['comms/ltmdm',
- 'www/opera'])
return pkgs
# The list of desired packages
==== //depot/projects/soc2005/bsdinstaller/src/share/Makefile#4 (text+ko) ====
@@ -1,5 +1,7 @@
# @(#)Makefile 8.1 (Berkeley) 6/5/93
-# $FreeBSD: src/share/Makefile,v 1.35 2005/08/05 14:59:50 phk Exp $
+# $FreeBSD: src/share/Makefile,v 1.36 2006/03/17 18:54:32 ru Exp $
+
+.include <bsd.own.mk>
# Do not include `info' in the SUBDIR list, it is handled separately.
@@ -26,7 +28,7 @@
${_timedef} \
zoneinfo
-.if !defined(NO_LOCALES)
+.if ${MK_LOCALES} != "no"
_colldef = colldef
_mklocale = mklocale
_monetdef = monetdef
@@ -35,35 +37,35 @@
_timedef = timedef
.endif
-.if !defined(NO_SYSCONS)
+.if ${MK_SYSCONS} != "no"
_syscons= syscons
.endif
-.if !defined(NO_MAN)
+.if ${MK_MAN} != "no"
_man= man
.endif
-.if !defined(NO_GROFF)
+.if ${MK_GROFF} != "no"
_me= me
.endif
-.if !defined(NO_EXAMPLES)
+.if ${MK_EXAMPLES} != "no"
_examples= examples
.endif
-.if !defined(NO_I4B)
+.if ${MK_I4B} != "no"
_isdn= isdn
.endif
-.if !defined(NO_DICT)
+.if ${MK_DICT} != "no"
_dict= dict
.endif
-.if !defined(NO_SENDMAIL)
+.if ${MK_SENDMAIL} != "no"
_sendmail= sendmail
.endif
-.if !defined(NO_SHAREDOCS)
+.if ${MK_SHAREDOCS} != "no"
_doc= doc
.endif
==== //depot/projects/soc2005/bsdinstaller/src/usr.bin/Makefile#6 (text+ko) ====
@@ -1,5 +1,7 @@
# From: @(#)Makefile 8.3 (Berkeley) 1/7/94
-# $FreeBSD: src/usr.bin/Makefile,v 1.289 2006/03/03 21:12:05 mux Exp $
+# $FreeBSD: src/usr.bin/Makefile,v 1.290 2006/03/17 18:54:38 ru Exp $
+
+.include <bsd.own.mk>
# XXX MISSING: deroff diction graph learn plot
# spell spline struct xsend
@@ -7,6 +9,8 @@
# Moved to secure: bdes
#
+.include <bsd.own.mk>
+
SUBDIR= alias \
apply \
asa \
@@ -232,59 +236,59 @@
_truss= truss
.endif
-.if !defined(NO_ATM)
+.if ${MK_ATM} != "no"
_atm= atm
.endif
-.if !defined(NO_MAN)
+.if ${MK_MAN} != "no"
_catman= catman
.endif
-.if !defined(NO_BIND) && !defined(NO_BIND_UTILS)
+.if ${MK_BIND_UTILS} != "no"
_dig= dig
_host= host
_nslookup= nslookup
_nsupdate= nsupdate
.endif
-.if !defined(NO_BLUETOOTH)
+.if ${MK_BLUETOOTH} != "no"
_bluetooth= bluetooth
.endif
-.if !defined(NO_CALENDAR)
+.if ${MK_CALENDAR} != "no"
_calendar= calendar
.endif
-.if !defined(NO_CRYPT) && !defined(NO_OPENSSL)
+.if ${MK_OPENSSL} != "no"
_chkey= chkey
_newkey= newkey
_csup= csup
.endif
-.if defined(YES_HESIOD)
+.if ${MK_HESIOD} != "no"
_hesinfo= hesinfo
.endif
-.if !defined(NO_NETCAT)
+.if ${MK_NETCAT} != "no"
_nc= nc
.endif
-.if !defined(NO_NIS)
+.if ${MK_NIS} != "no"
_ypcat= ypcat
_ypmatch= ypmatch
_ypwhich= ypwhich
.endif
-.if !defined(NO_RCMDS)
+.if ${MK_RCMDS} != "no"
_rlogin= rlogin
_rsh= rsh
.endif
-.if !defined(NO_SENDMAIL)
+.if ${MK_SENDMAIL} != "no"
_vacation= vacation
.endif
-.if !defined(NO_TOOLCHAIN)
+.if ${MK_TOOLCHAIN} != "no"
_c89= c89
_c99= c99
_gprof= gprof
@@ -293,7 +297,7 @@
_yacc= yacc
.endif
-.if !defined(NO_USB)
+.if ${MK_USB} != "no"
_usbhidaction= usbhidaction
_usbhidctl= usbhidctl
.endif
==== //depot/projects/soc2005/bsdinstaller/src/usr.sbin/Makefile#14 (text+ko) ====
@@ -1,5 +1,7 @@
# From: @(#)Makefile 5.20 (Berkeley) 6/12/93
-# $FreeBSD: src/usr.sbin/Makefile,v 1.346 2006/02/27 16:17:25 harti Exp $
+# $FreeBSD: src/usr.sbin/Makefile,v 1.347 2006/03/17 18:54:39 ru Exp $
+
+.include <bsd.own.mk>
# XXX MISSING: mkproto
SUBDIR= ac \
@@ -196,23 +198,22 @@
_sysinstall= sysinstall
.endif
-.if !defined(NO_ATM)
+.if ${MK_ATM} != "no"
_atm= atm
.endif
-.if !defined(NO_AUDIT)
+.if ${MK_AUDIT} != "no"
_audit= audit
_auditd= auditd
_auditreduce= auditreduce
_praudit= praudit
.endif
-.if !defined(NO_BIND)
-.if !defined(NO_BIND_DNSSEC) && !defined(NO_CRYPT)
+.if ${MK_BIND_DNSSEC} != "no" && ${MK_OPENSSL} != "no"
_dnssec-keygen= dnssec-keygen
_dnssec-signzone= dnssec-signzone
.endif
-.if !defined(NO_BIND_NAMED)
+.if ${MK_BIND_NAMED} != "no"
_named= named
_named-checkconf= named-checkconf
_named-checkzone= named-checkzone
@@ -220,24 +221,23 @@
_rndc= rndc
_rndc-confgen= rndc-confgen
.endif
-.endif
-.if !defined(NO_BLUETOOTH)
+.if ${MK_BLUETOOTH} != "no"
_bluetooth= bluetooth
.endif
-.if !defined(NO_CRYPT) && !defined(NO_OPENSSL)
+.if ${MK_OPENSSL} != "no"
_keyserv= keyserv
.endif
-.if !defined(NO_INET6)
+.if ${MK_INET6} != "no"
_mld6query= mld6query
_rip6query= rip6query
_route6d= route6d
_traceroute6= traceroute6
.endif
-.if !defined(NO_NIS)
+.if ${MK_NIS} != "no"
_rpc.yppasswdd= rpc.yppasswdd
_rpc.ypupdated= rpc.ypupdated
_rpc.ypxfrd= rpc.ypxfrd
@@ -249,15 +249,15 @@
_ypset= ypset
.endif
-.if !defined(NO_PF) && !defined(NO_AUTHPF)
+.if ${MK_AUTHPF} != "no"
_authpf= authpf
.endif
-.if !defined(NO_LPR)
+.if ${MK_LPR} != "no"
_lpr= lpr
.endif
-.if !defined(NO_SENDMAIL)
+.if ${MK_SENDMAIL} != "no"
_editmap= editmap
_mailstats= mailstats
_makemap= makemap
@@ -265,7 +265,7 @@
_sendmail= sendmail
.endif
-.if !defined(NO_USB)
+.if ${MK_USB} != "no"
_usbdevs= usbdevs
.endif
@@ -278,7 +278,7 @@
_apmd= apmd
_asf= asf
_btxld= btxld
-.if !defined(NO_I4B)
+.if ${MK_I4B} != "no"
_i4b= i4b
.endif
_kgmon= kgmon
@@ -290,19 +290,19 @@
_ndiscvt= ndiscvt
_pccard= pccard
_pnpinfo= pnpinfo
-.if !defined(NO_LIBPTHREAD)
+.if ${MK_LIBPTHREAD} != "no"
_pppctl= pppctl
.endif
_sicontrol= sicontrol
_spkrtest= spkrtest
_zzz= zzz
.if ${MACHINE} == "i386"
-.if !defined(NO_ACPI)
+.if ${MK_ACPI} != "no"
_acpi= acpi
.endif
_arlcontrol= arlcontrol
_boot0cfg= boot0cfg
-.if !defined(NO_PCVT)
+.if ${MK_PCVT} != "no"
_pcvt= pcvt
.endif
_wlconfig= wlconfig
@@ -314,7 +314,7 @@
.if ${MACHINE_ARCH} == "alpha"
_elf2exe= elf2exe
_pnpinfo= pnpinfo
-.if !defined(NO_LIBC_R)
+.if ${MK_LIBC_R} != "no"
_pppctl= pppctl
.endif
.endif
@@ -323,7 +323,7 @@
# mptable: broken (not 64 bit clean)
# pnpinfo: crashes (not really useful anyway)
.if ${MACHINE_ARCH} == "amd64"
-.if !defined(NO_ACPI)
+.if ${MK_ACPI} != "no"
_acpi= acpi
.endif
_asf= asf
@@ -335,7 +335,7 @@
_mount_smbfs= mount_smbfs
_mptable= mptable
_ndiscvt= ndiscvt
-.if !defined(NO_LIBPTHREAD)
+.if ${MK_LIBPTHREAD} != "no"
_pppctl= pppctl
.endif
_sicontrol= sicontrol
@@ -344,11 +344,11 @@
.endif
.if ${MACHINE_ARCH} == "ia64"
-.if !defined(NO_ACPI)
+.if ${MK_ACPI} != "no"
_acpi= acpi
.endif
_kgmon= kgmon
-.if !defined(NO_LIBPTHREAD)
+.if ${MK_LIBPTHREAD} != "no"
_pppctl= pppctl
.endif
_zzz= zzz
@@ -361,7 +361,7 @@
.if ${MACHINE_ARCH} == "sparc64"
_eeprom= eeprom
_ofwdump= ofwdump
-.if !defined(NO_LIBC_R)
+.if ${MK_LIBC_R} != "no"
_pppctl= pppctl
.endif
.endif
More information about the p4-projects
mailing list