DragonFly submit List (threaded) for 2005-09
[
Date Prev][
Date Next]
[
Thread Prev][
Thread Next]
[
Date Index][
Thread Index]
make.conf(5), make.conf, various Makefiles
Okay, earlier I sent two patches, make.conf.diff and make.conf.5.diff to
clean up some things.
Now I've got one big patch to clean up all the various Makefiles
(relevant to the make.conf(5) cleanups).
--
Carl Schmidt
carl@xxxxxxxxxxxxxxx
Index: Makefile.inc1
===================================================================
RCS file: /home/dcvs/dfly/Makefile.inc1,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile.inc1
--- Makefile.inc1 5 Sep 2005 19:14:01 -0000 1.1.1.1
+++ Makefile.inc1 5 Sep 2005 22:47:21 -0000
@@ -2,25 +2,7 @@
# $FreeBSD: src/Makefile.inc1,v 1.141.2.62 2003/04/06 19:54:00 dwmalone Exp $
# $DragonFly: src/Makefile.inc1,v 1.78 2005/09/05 15:36:34 corecode Exp $
#
-# Make command line options:
-# -DMAKE_KERBEROS5 to build Kerberos5
-# -DNOCLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
-# -DNOCLEAN do not clean at all
-# -DNOCRYPT will prevent building of crypt versions
-# -DNOMAN do not build the manual pages
-# -DNOPROFILE do not build profiled libraries
-# -DNOGAMES do not go into games subdir
-# -DNOSHARE do not go into share subdir
-# -DNOINFO do not make or install info files
-# -DNOLIBC_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
-# -DNO_PORTSUPDATE do not update ports in ${MAKE} update
-# -DNO_DOCUPDATE do not update doc in ${MAKE} update
-# LOCAL_DIRS="list of dirs" to add additional dirs to the SUBDIR list
-# TARGET_ARCH="arch" to crossbuild world to a different arch
+# Build-time options are documented in make.conf(5).
#
# The intended user-driven targets are:
#
@@ -66,14 +48,14 @@
.if exists(${.CURDIR}/bin)
SUBDIR+= bin
.endif
-.if exists(${.CURDIR}/games) && !defined(NOGAMES)
+.if exists(${.CURDIR}/games) && !defined(NO_GAMES)
SUBDIR+= games
.endif
.if exists(${.CURDIR}/gnu)
SUBDIR+= gnu
.endif
.if exists(${.CURDIR}/kerberos5) && exists(${.CURDIR}/crypto) && \
- !defined(NOCRYPT) && !defined(NO_OPENSSL) && defined(MAKE_KERBEROS5)
+ !defined(NO_CRYPT) && !defined(NO_OPENSSL) && defined(WANT_KERBEROS)
SUBDIR+= kerberos5
.endif
.if exists(${.CURDIR}/libexec)
@@ -82,10 +64,10 @@
.if exists(${.CURDIR}/sbin)
SUBDIR+= sbin
.endif
-.if exists(${.CURDIR}/secure) && !defined(NOCRYPT)
+.if exists(${.CURDIR}/secure) && !defined(NO_CRYPT)
SUBDIR+= secure
.endif
-.if exists(${.CURDIR}/share) && !defined(NOSHARE)
+.if exists(${.CURDIR}/share) && !defined(NO_SHARE)
SUBDIR+= share
.endif
.if exists(${.CURDIR}/sys)
@@ -217,8 +199,7 @@
INSTALL="sh ${.CURDIR}/tools/install.sh"
BMAKE= ${BMAKEENV} ${MAKE} -f Makefile.inc1 -DBOOTSTRAPPING \
- -DNOHTML -DNOINFO -DNOMAN -DNOPIC -DNOPROFILE -DNOSHARED \
- -DNO_WERROR
+ -DNOINFO -DNOMAN -DNOPROFILE -DNOSHARED -DNO_WERROR
# build-tool stage
#
@@ -762,7 +743,7 @@
# rpcgen: old rpcgen used a hardwired cpp path, newer OBJFORMAT_PATH
# envs are not compatible with older objformat binaries.
#
-.if exists(${.CURDIR}/games) && !defined(NOGAMES)
+.if exists(${.CURDIR}/games) && !defined(NO_GAMES)
_strfile= games/fortune/strfile
.endif
@@ -801,11 +782,11 @@
# XXX we may be able to remove or consolidate this into bootstrap-tools
# now that we have the native helper (.nx/.no) infrastructure.
#
-.if exists(${.CURDIR}/games) && !defined(NOGAMES)
+.if exists(${.CURDIR}/games) && !defined(NO_GAMES)
_games= games/adventure games/hack games/phantasia
.endif
-.if exists(${.CURDIR}/share) && !defined(NOSHARE)
+.if exists(${.CURDIR}/share) && !defined(NO_SHARE)
_share= share/syscons/scrnmaps
.endif
@@ -822,7 +803,7 @@
.endif
.if exists(${.CURDIR}/kerberos5) && exists(${.CURDIR}/crypto) && \
- !defined(NOCRYPT) && defined(MAKE_KERBEROS5)
+ !defined(NO_CRYPT) && defined(WANT_KERBEROS)
_libkrb5= kerberos5/tools kerberos5/lib/libroken kerberos5/lib/libvers \
kerberos5/lib/libasn1 kerberos5/lib/libhdb kerberos5/lib/libsl
.endif
@@ -909,7 +890,7 @@
_generic_libs= gnu/lib
-.if !defined(NOCRYPT) && defined(MAKE_KERBEROS5)
+.if !defined(NO_CRYPT) && defined(WANT_KERBEROS)
_prebuild_libs+= kerberos5/tools
_prebuild_libs+= kerberos5/lib/libasn1
_prebuild_libs+= kerberos5/lib/libgssapi
@@ -927,7 +908,7 @@
_generic_libs+= lib
-.if !defined(NOCRYPT)
+.if !defined(NO_CRYPT)
.if !defined(NO_OPENSSL)
_prebuild_libs+= secure/lib/libcrypto secure/lib/libssl
.if !defined(NO_OPENSSH)
Index: bin/ed/Makefile
===================================================================
RCS file: /home/dcvs/dfly/bin/ed/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- bin/ed/Makefile 5 Sep 2005 19:14:01 -0000 1.1.1.1
+++ bin/ed/Makefile 5 Sep 2005 22:35:47 -0000
@@ -7,7 +7,7 @@
LINKS= ${BINDIR}/ed ${BINDIR}/red
MLINKS= ed.1 red.1
-.if exists(${.CURDIR}/../../secure) && !defined(NOCRYPT)
+.if exists(${.CURDIR}/../../secure) && !defined(NO_CRYPT)
DISTRIBUTION=crypto
CFLAGS+=-DDES
DPADD= ${LIBCIPHER}
Index: etc/defaults/make.conf
===================================================================
RCS file: /home/dcvs/dfly/etc/defaults/make.conf,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 make.conf
--- etc/defaults/make.conf 5 Sep 2005 19:14:57 -0000 1.1.1.1
+++ etc/defaults/make.conf 5 Sep 2005 20:13:45 -0000
@@ -14,7 +14,6 @@
# You have to find the things you can put here in the Makefiles and
# documentation of the source tree.
#
-#
# The CPUTYPE variable controls which processor should be targeted for
# generated code. This controls processor-specific optimizations in
# certain code (currently only OpenSSL) as well as modifying the value
@@ -42,16 +41,12 @@
# be set in /etc/make.conf and that gcc 3.4 not yet be used to build the boot
# blocks, boot loader, or the kernel.
#
-# CCVER?=gcc34 # (use GCC 3.4, default)
-# CCVER?=gcc40 # (use GCC 4.0, experimental, only available
-# # if WANT_GCC40 set)
-#
+#CCVER?=gcc34 # (use GCC 3.4, default)
+#CCVER?=gcc40 # (use GCC 4.0, experimental, must define WANT_GCC40)
#
# Build gcc40 with world. This won't make gcc40 the default compiler
-#
#WANT_GCC40=yes
#
-#
# CFLAGS controls the compiler settings used when compiling C code.
# Note that optimization settings above -O (-O2, ...) are not recommended
# or supported for compiling the world or the kernel - please revert any
@@ -78,7 +73,6 @@
-Wredundant-decls -Wshadow -Wstrict-prototypes -Wwrite-strings
#
# WARNS_WERROR causes -Werror to be added when WARNS is in effect.
-#
#WARNS_WERROR= yes
#
# To compile just the kernel with special optimizations, you should use
@@ -95,9 +89,6 @@
# Compare before install
#INSTALL=install -C
#
-# To enable installing suidperl with the setuid bit turned on
-#ENABLE_SUIDPERL= true
-#
# To build ppp with normal permissions
#PPP_NOSUID= true
#
@@ -105,11 +96,14 @@
#ENABLE_SUID_SSH= true
#
# To avoid building various parts of the base system:
-#NO_CVS= true # do not build CVS
#NO_BIND= true # do not build BIND
+#NO_CRYPT= true # do not build crypto code
+#NO_CVS= true # do not build CVS
#NO_FORTRAN= true # do not build g77 and related libraries
+#NO_GAMES= true # do not enter the games subdirectory
#NO_I4B= true # do not build isdn4bsd package
#NO_IPFILTER= true # do not build IP Filter package
+#NO_LIBC_R= true # do not build libc_r (re-entrant version of libc)
#NO_LPR= true # do not build lpr and related programs
#NO_MAILWRAPPER=true # do not build the mailwrapper(8) MTA selector
#NO_MODULES= true # do not build modules with the kernel
@@ -118,13 +112,13 @@
#NO_OPENSSL= true # do not build OpenSSL (implies NO_OPENSSH)
#NO_PKGTOOLS= true # do not build included package tools (for pkgsrc)
#NO_SENDMAIL= true # do not build sendmail and related programs
+#NO_SHARE= true # do not enter the share subdirectory
#NO_SHAREDOCS= true # do not build the 4.4BSD legacy docs
#NO_X= true # do not compile in XWindows support (e.g. doscmd)
-#NOCRYPT= true # do not build any crypto code
-#NOGAMES= true # do not build games (games/ subdir)
#NOINFO= true # do not make or install info files
-#NOLIBC_R= true # do not build libc_r (re-entrant version of libc)
+#NOINFOCOMPRESS=true # do not compress info files
#NOMAN= true # do not build manual pages
+#NOMANCOMPRESS= true # do not compress man pages
#NOPROFILE= true # Avoid compiling profiled libraries
#NOSHARE= true # do not go into the share subdir
#
@@ -134,6 +128,9 @@
# The list of modules to build instead of all of them.
#MODULES_OVERRIDE= emulation/linux net/ipfw
#
+# To avoid running MAKEDEV all on /dev during install:
+#NO_MAKEDEV= true
+#
# The following controls building optional IDEA code in libcrypto and
# certain ports. Patents are involved - you must not use this unless
# you either have a license or fall within patent 'fair use'
@@ -143,40 +140,13 @@
#
# IDEA is patented in the USA and many European countries - thought to
# be OK to use for any non-commercial use. This is optional.
-#MAKE_IDEA= YES # IDEA (128 bit symmetric encryption)
-#
-# To avoid running MAKEDEV all on /dev during install:
-#NO_MAKEDEV= true
-#
-# If you do not want unformatted manual pages to be compressed
-# when they are installed:
-#
-#NOMANCOMPRESS= true
-#
-#
-# If you want the "compat" shared libraries installed as part of your normal
-# builds, uncomment these:
-#
-#COMPAT1X= yes
-#COMPAT20= yes
-#COMPAT21= yes
-#COMPAT22= yes
-#COMPAT3X= yes
-#COMPAT4X= yes
-#
-#
-# If you do not want additional documentation (some of which are
-# a few hundred KB's) for ports to be installed:
-#
-#NOPORTDOCS= true
-#
+#WANT_IDEA= YES # IDEA (128 bit symmetric encryption)
#
# Default format for system documentation, depends on your printer.
# Set this to "ascii" for simple printers or screen
#
#PRINTERDEVICE= ps
#
-#
# How long to wait for a console keypress before booting the default kernel.
# This value is approximately in milliseconds. Keypresses are accepted by the
# BIOS before booting from disk, making it possible to give custom boot
@@ -208,45 +178,6 @@
#
#LOADER_TFTP_SUPPORT= YES
#
-# By default, the ports collection attempts to use XFree86 4.X. If
-# you are running XFree86 3.3.X, uncomment this line.
-#
-#XFREE86_VERSION= 3
-#
-# By default, this points to /usr/X11R6 for XFree86 releases 3.0 or earlier.
-# If you have a XFree86 from before 3.0 that has the X distribution in
-# /usr/X386, you want to uncomment this.
-#
-#X11BASE= /usr/X386
-#
-#
-# If you have Motif on your system, uncomment this.
-#
-#HAVE_MOTIF= yes
-#MOTIF_STATIC= yes
-#
-# If the default location of the Motif library (specified below) is NOT
-# appropriate for you, uncomment this and change it to the correct value.
-# If your motif is in ${X11BASE}/lib, you don't need to touch this line.
-#
-#MOTIFLIB= -L${X11BASE}/lib -lXm
-#
-#
-# If you're resident in the USA, this will help various ports to determine
-# whether or not they should attempt to comply with the various U.S.
-# export regulations on certain types of software which do not apply to
-# anyone else in the world.
-#
-#USA_RESIDENT= YES
-#
-#
-# Override "don't install a port that's already installed" behavior.
-# One might wish to do this for ports debugging or to unconditionally
-# reinstall a set of suspect/broken ports.
-#
-#FORCE_PKG_REGISTER= YES
-#
-#
# If you're behind a firewall and need FTP or HTTP proxy services for
# ports collection fetching to work, the following examples give the
# necessary syntax. See the fetch(3) man page for details.
@@ -254,99 +185,22 @@
#FETCH_ENV= FTP_PROXY=ftp://10.0.0.1:21
#FETCH_ENV= HTTP_PROXY=http://10.0.0.1:80
#
+# If you want Kerberos 5, define this.
+#WANT_KERBEROS= yes
#
-# Port master sites.
-#
-# If you want your port fetches to go somewhere else than the default
-# (specified below) in case the distfile/patchfile was not found,
-# uncomment this and change it to a location nearest you. (Don't
-# remove the "/${DIST_SUBDIR}/" part.)
-#
-#MASTER_SITE_BACKUP?= \
-# ftp://ftp.freebsd.org/pub/FreeBSD/ports/distfiles/${DIST_SUBDIR}/
-#
-# If you want your port fetches to check the above site first (before
-# the MASTER_SITES specified in the port Makefiles), uncomment the
-# line below. You can also change the right side to point to wherever
-# you want.
-#
-#MASTER_SITE_OVERRIDE?= ${MASTER_SITE_BACKUP}
-#
-# Some ports use a special variable to point to a collection of
-# mirrors of well-known software archives. If you have a mirror close
-# to you, uncomment any of the following lines and change it to that
-# address. (Don't remove the "/%SUBDIR%/" part.)
-#
-# Note: the right hand sides of the following lines are only for your
-# information. For a full list of default sites, take a look at
-# bsd.sites.mk.
-#
-#MASTER_SITE_AFTERSTEP= ftp://ftp.afterstep.org/%SUBDIR%/
-#MASTER_SITE_COMP_SOURCES= ftp://gatekeeper.dec.com/pub/usenet/comp.sources.%SUBDIR%/
-#MASTER_SITE_FREEBSD_ORG= ftp://ftp.FreeBSD.org/pub/FreeBSD/%SUBDIR%/
-#MASTER_SITE_GNOME= ftp://ftp.gnome.org/pub/GNOME/%SUBDIR%/
-#MASTER_SITE_GNU= ftp://ftp.gnu.org/gnu/%SUBDIR%/
-#MASTER_SITE_KDE= ftp://ftp.kde.org/pub/kde/%SUBDIR%/
-#MASTER_SITE_LOCAL= ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/local-distfiles/%SUBDIR%/
-#MASTER_SITE_MOZILLA= ftp://ftp.mozilla.org/pub/%SUBDIR%/
-#MASTER_SITE_NETBSD= ftp://ftp.netbsd.org/pub/NetBSD/packages/distfiles/%SUBDIR%/
-#MASTER_SITE_PERL_CPAN= ftp://ftp.digital.com/pub/plan/perl/CPAN/modules/by-module/%SUBDIR%/
-#MASTER_SITE_PORTS_JP= ftp://ports.jp.FreeBSD.org/pub/FreeBSD-jp/ports-jp/LOCAL_PORTS/%SUBDIR%/
-#MASTER_SITE_RINGSERVER= ftp://ftp.dnsbalance.ring.gr.jp/pub/%SUBDIR%/
-#MASTER_SITE_RUBY= ftp://ftp.ruby-lang.org/pub/ruby/%SUBDIR%/
-#MASTER_SITE_SOURCEFORGE= ftp://ftp2.sourceforge.net/pub/sourceforge/%SUBDIR%/
-#MASTER_SITE_SOURCEWARE= ftp://ftp.freesoftware.com/pub/sourceware/%SUBDIR%/
-#MASTER_SITE_SUNSITE= ftp://metalab.unc.edu/pub/Linux/%SUBDIR%/
-#MASTER_SITE_TCLTK= ftp://ftp.scriptics.com/pub/tcl/%SUBDIR%/
-#MASTER_SITE_TEX_CTAN= ftp://ftp.tex.ac.uk/tex-archive/%SUBDIR%/
-#MASTER_SITE_THEMES= ftp://ftp.themes.org/pub/themes/%SUBDIR%/
-#MASTER_SITE_WINDOWMAKER= ftp://ftp.windowmaker.org/pub/%SUBDIR%/
-#MASTER_SITE_XCONTRIB= ftp://ftp.x.org/contrib/%SUBDIR%/
-#MASTER_SITE_XEMACS= ftp://ftp.xemacs.org/pub/xemacs/%SUBDIR%/
-#MASTER_SITE_XFREE= ftp://ftp.xfree86.org/pub/XFree86/%SUBDIR%/source/
-#
-# Also it is highly recommended that you configure MASTER_SORT_REGEX
-# to choose better mirror sites for you. List awk(1)-style regular
-# expressions separated by space so MASTER_SITES will be sorted in
-# that order. The following example is for Japanese users; change
-# "jp" part to your ccTLD ("de", "ru", "uk", etc.) or the domain names
-# of your nearest/upstream networks to meet your needs.
-#
-#MASTER_SORT_REGEX?= ://[^/]*\.jp[/.]
-#
-# Ports can place their working directories somewhere other than under
-# /usr/ports.
-#WRKDIRPREFIX= /var/tmp
-#
-# Kerberos 5
-# If you want Kerberos 5 (KTH Heimdal), define this:
-#
-#MAKE_KERBEROS5= yes
-#
-# Kerberos 5 su (k5su)
# If you want to use the k5su utility, define this to have it installed
# set-user-ID.
#ENABLE_SUID_K5SU= yes
#
-#
-# Kerberos5
-# If you want to install MIT Kerberos5 port somewhere other than /usr/local,
-# define this (this is also used to tell ssh1 that kerberos is needed):
-#
-#KRB5_HOME= /usr/local
-#
-#
# CVSup update flags. Edit SUPFILE settings to reflect whichever distribution
# file(s) you use on your site (see /usr/share/examples/cvsup/README for more
# information on CVSup and these files). To use, do "make update" in /usr/src.
#
#SUP_UPDATE= yes
-#
#SUP= /usr/local/bin/cvsup
#SUPFLAGS= -g -L 2
-#SUPHOST= cvsup.uk.FreeBSD.org
-#SUPFILE= /usr/share/examples/cvsup/stable-supfile
-#PORTSSUPFILE= /usr/share/examples/cvsup/ports-supfile
+#SUPHOST= cvsup.dragonflybsd.org
+#SUPFILE= /usr/share/examples/cvsup/DragonFly-src-supfile
#DOCSUPFILE= /usr/share/examples/cvsup/doc-supfile
#
# top(1) uses a hash table for the user names. The size of this hash
@@ -362,7 +216,6 @@
#
#DOC_LANG= en_US.ISO8859-1 ru_RU.KOI8-R
#
-#
# sendmail
#
# The following sets the default m4 configuration file to use at
Index: lib/Makefile
===================================================================
RCS file: /home/dcvs/dfly/lib/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- lib/Makefile 5 Sep 2005 19:15:02 -0000 1.1.1.1
+++ lib/Makefile 5 Sep 2005 22:44:55 -0000
@@ -36,7 +36,7 @@
_csu=csu/${MACHINE_ARCH}
.if ${MACHINE_ARCH} == "i386"
-.if !defined(NOLIBC_R)
+.if !defined(NO_LIBC_R)
_libc_r= libc_r
.endif
.endif
Index: lib/libcrypt/Makefile
===================================================================
RCS file: /home/dcvs/dfly/lib/libcrypt/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- lib/libcrypt/Makefile 5 Sep 2005 19:15:11 -0000 1.1.1.1
+++ lib/libcrypt/Makefile 5 Sep 2005 22:35:58 -0000
@@ -15,7 +15,7 @@
CFLAGS+= -D_CTYPE_H_DISABLE_MACROS_
# Pull in the crypt-des.c source, assuming it is present.
.if exists(${.CURDIR}/../../secure/lib/libcrypt/crypt-des.c) && \
- !defined(NOCRYPT)
+ !defined(NO_CRYPT)
.PATH: ${.CURDIR}/../../secure/lib/libcrypt
SRCS+= crypt-des.c crypt-blowfish.c blowfish.c
CFLAGS+= -I${.CURDIR} -DHAS_DES -DHAS_BLOWFISH
Index: lib/libfetch/Makefile
===================================================================
RCS file: /home/dcvs/dfly/lib/libfetch/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- lib/libfetch/Makefile 5 Sep 2005 19:15:11 -0000 1.1.1.1
+++ lib/libfetch/Makefile 5 Sep 2005 22:36:08 -0000
@@ -11,7 +11,7 @@
MAN= fetch.3
CLEANFILES= ftperr.h httperr.h
-.if !defined(NOCRYPT) && !defined(NO_OPENSSL)
+.if !defined(NO_CRYPT) && !defined(NO_OPENSSL)
CFLAGS+= -DWITH_SSL
DPADD= ${LIBSSL} ${LIBCRYPTO}
LDADD= -lssl -lcrypto
Index: lib/pam_module/Makefile
===================================================================
RCS file: /home/dcvs/dfly/lib/pam_module/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- lib/pam_module/Makefile 5 Sep 2005 19:15:14 -0000 1.1.1.1
+++ lib/pam_module/Makefile 5 Sep 2005 22:47:34 -0000
@@ -2,7 +2,7 @@
SUBDIR= pam_cleartext_pass_ok pam_deny pam_opie pam_opieaccess
SUBDIR+= pam_permit pam_radius pam_ssh pam_tacplus pam_unix
-.if defined(MAKE_KERBEROS5) && !defined(NOCRYPT) && !defined(NO_OPENSSL)
+.if defined(WANT_KERBEROS) && !defined(NO_CRYPT) && !defined(NO_OPENSSL)
SUBDIR+= pam_krb5
.endif
Index: libexec/Makefile
===================================================================
RCS file: /home/dcvs/dfly/libexec/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- libexec/Makefile 5 Sep 2005 19:15:14 -0000 1.1.1.1
+++ libexec/Makefile 5 Sep 2005 22:36:33 -0000
@@ -37,7 +37,7 @@
.endif
.if defined(RELEASEDIR) || \
- !exists(${.CURDIR}/../secure) || defined(NOCRYPT)
+ !exists(${.CURDIR}/../secure) || defined(NO_CRYPT)
# make release needs both
SUBDIR+=telnetd
.endif
Index: secure/Makefile.inc
===================================================================
RCS file: /home/dcvs/dfly/secure/Makefile.inc,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile.inc
--- secure/Makefile.inc 5 Sep 2005 19:15:16 -0000 1.1.1.1
+++ secure/Makefile.inc 5 Sep 2005 22:46:02 -0000
@@ -16,6 +16,6 @@
CRYPTOBJDIR= ${.CURDIR}/../../lib/libcrypt
.endif
-.if !defined(MAKE_IDEA) || ${MAKE_IDEA} != YES
+.if !defined(WANT_IDEA)
CFLAGS+= -DNO_IDEA
.endif
Index: secure/lib/Makefile
===================================================================
RCS file: /home/dcvs/dfly/secure/lib/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- secure/lib/Makefile 5 Sep 2005 19:15:16 -0000 1.1.1.1
+++ secure/lib/Makefile 5 Sep 2005 22:47:43 -0000
@@ -2,7 +2,7 @@
# $DragonFly: src/secure/lib/Makefile,v 1.3 2003/08/05 07:45:42 asmodai Exp $
SUBDIR= libcipher
-.if !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(MAKE_KERBEROS5)
+.if !defined(NO_CRYPT) && !defined(NO_OPENSSL) && !defined(WANT_KERBEROS)
SUBDIR+=libtelnet
.endif
.if !defined(NO_OPENSSL)
Index: secure/lib/libcrypto/Makefile
===================================================================
RCS file: /home/dcvs/dfly/secure/lib/libcrypto/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- secure/lib/libcrypto/Makefile 5 Sep 2005 19:15:16 -0000 1.1.1.1
+++ secure/lib/libcrypto/Makefile 5 Sep 2005 22:46:34 -0000
@@ -117,7 +117,7 @@
SRCS+= hmac.c
# idea
-.if defined(MAKE_IDEA) && ${MAKE_IDEA} == YES
+.if defined(WANT_IDEA)
SRCS+= i_cbc.c i_cfb64.c i_ecb.c i_ofb64.c i_skey.c
.endif
@@ -223,7 +223,7 @@
.include <bsd.lib.mk>
-.if defined(MAKE_IDEA) && ${MAKE_IDEA} == YES
+.if defined(WANT_IDEA)
_ideapath= ${LCRYPTO_SRC}/crypto/idea
.endif
Index: secure/lib/libcrypto/Makefile.inc
===================================================================
RCS file: /home/dcvs/dfly/secure/lib/libcrypto/Makefile.inc,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile.inc
--- secure/lib/libcrypto/Makefile.inc 5 Sep 2005 19:15:16 -0000 1.1.1.1
+++ secure/lib/libcrypto/Makefile.inc 5 Sep 2005 22:47:03 -0000
@@ -9,7 +9,7 @@
CFLAGS+= -I${LCRYPTO_SRC} -I${LCRYPTO_SRC}/crypto \
-I${LCRYPTO_SRC}/crypto/engine -I${.OBJDIR}
-.if !defined(MAKE_IDEA) || ${MAKE_IDEA} != YES
+.if !defined(WANT_IDEA)
CFLAGS+= -DOPENSSL_NO_IDEA
.else
_idea_h= idea/idea.h
@@ -85,7 +85,7 @@
cp ${.ALLSRC:Nopenssl/.dummy} ${.TARGET}
openssl/evp.h: openssl/.dummy ${LCRYPTO_SRC}/crypto/evp/evp.h
-.if !defined(MAKE_IDEA) || ${MAKE_IDEA} != YES
+.if !defined(WANT_IDEA)
sed '/^#ifndef OPENSSL_NO_IDEA$$/,/^#endif$$/d' ${.ALLSRC:Nopenssl/.dummy} > ${.TARGET}
.else
${INSTALL} -C -m 444 ${.ALLSRC:Nopenssl/.dummy} ${.TARGET}
Index: secure/lib/libssh/Makefile
===================================================================
RCS file: /home/dcvs/dfly/secure/lib/libssh/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- secure/lib/libssh/Makefile 5 Sep 2005 19:15:16 -0000 1.1.1.1
+++ secure/lib/libssh/Makefile 5 Sep 2005 22:47:55 -0000
@@ -18,7 +18,7 @@
# Patches
SRCS+= log.c.patch
-.if defined(MAKE_KERBEROS5)
+.if defined(WANT_KERBEROS)
CFLAGS+= -DKRB5 -DHEIMDAL
.endif
Index: secure/libexec/Makefile
===================================================================
RCS file: /home/dcvs/dfly/secure/libexec/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- secure/libexec/Makefile 5 Sep 2005 19:15:17 -0000 1.1.1.1
+++ secure/libexec/Makefile 5 Sep 2005 22:48:08 -0000
@@ -1,7 +1,7 @@
# $FreeBSD: src/secure/libexec/Makefile,v 1.4.2.6 2002/07/05 11:10:51 des Exp $
# $DragonFly: src/secure/libexec/Makefile,v 1.3 2003/08/05 07:45:42 asmodai Exp $
-.if !defined(NOCRYPT) && !defined(MAKE_KERBEROS5) && !defined(NO_OPENSSL)
+.if !defined(NO_CRYPT) && !defined(WANT_KERBEROS) && !defined(NO_OPENSSL)
SUBDIR= telnetd
.endif
.if !defined(NO_OPENSSL) && !defined(NO_OPENSSH)
Index: secure/usr.bin/Makefile
===================================================================
RCS file: /home/dcvs/dfly/secure/usr.bin/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- secure/usr.bin/Makefile 5 Sep 2005 19:15:17 -0000 1.1.1.1
+++ secure/usr.bin/Makefile 5 Sep 2005 22:48:32 -0000
@@ -2,7 +2,7 @@
# $DragonFly: src/secure/usr.bin/Makefile,v 1.3 2003/08/05 07:45:43 asmodai Exp $
SUBDIR= bdes
-.if !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(MAKE_KERBEROS5)
+.if !defined(NO_CRYPT) && !defined(NO_OPENSSL) && !defined(WANT_KERBEROS)
SUBDIR+=telnet
.endif
.if !defined(NO_OPENSSL)
Index: secure/usr.bin/ssh/Makefile
===================================================================
RCS file: /home/dcvs/dfly/secure/usr.bin/ssh/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- secure/usr.bin/ssh/Makefile 5 Sep 2005 19:15:17 -0000 1.1.1.1
+++ secure/usr.bin/ssh/Makefile 5 Sep 2005 22:49:01 -0000
@@ -13,7 +13,7 @@
SRCS+= ssh.1.no_obj.patch ssh_config.5.no_obj.patch
SRCS+= channels.c kex.c uidswap.c monitor_fdpass.c
-.if defined(MAKE_KERBEROS5)
+.if defined(WANT_KERBEROS)
DISTRIBUTION=krb5
CFLAGS+= -DKRB5 -DHEIMDAL
LDADD+= -lkrb5 -lasn1 -lcom_err -lmd -L${.OBJDIR}/../../../kerberos5/lib/libroken -lroken -lcrypt
Index: secure/usr.sbin/sshd/Makefile
===================================================================
RCS file: /home/dcvs/dfly/secure/usr.sbin/sshd/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- secure/usr.sbin/sshd/Makefile 5 Sep 2005 19:15:17 -0000 1.1.1.1
+++ secure/usr.sbin/sshd/Makefile 5 Sep 2005 22:49:24 -0000
@@ -30,7 +30,7 @@
SRCS+= sshd.8.no_obj.patch sshd_config.5.no_obj.patch
-.if defined(MAKE_KERBEROS5)
+.if defined(WANT_KERBEROS)
DISTRIBUTION=krb5
CFLAGS+= -DKRB5 -DHEIMDAL
SRCS+= auth-krb5.c
Index: share/doc/usd/Makefile
===================================================================
RCS file: /home/dcvs/dfly/share/doc/usd/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- share/doc/usd/Makefile 5 Sep 2005 19:15:18 -0000 1.1.1.1
+++ share/doc/usd/Makefile 5 Sep 2005 22:44:30 -0000
@@ -13,7 +13,7 @@
SUBDIR= title contents 04.csh 05.dc 06.bc 07.mail 10.exref 11.vitut 12.vi \
13.viref 18.msdiffs 19.memacros 20.meref
-.if exists(${.CURDIR}/../../../games) && !defined(NOGAMES)
+.if exists(${.CURDIR}/../../../games) && !defined(NO_GAMES)
SUBDIR+=30.rogue 31.trek
.endif
Index: share/man/Makefile
===================================================================
RCS file: /home/dcvs/dfly/share/man/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- share/man/Makefile 5 Sep 2005 19:15:20 -0000 1.1.1.1
+++ share/man/Makefile 5 Sep 2005 22:37:17 -0000
@@ -9,7 +9,7 @@
makedb:
${MAKEWHATIS} ${DESTDIR}${BINDIR}/man
-.if !defined(NOCRYPT) && !defined(NO_OPENSSL)
+.if !defined(NO_CRYPT) && !defined(NO_OPENSSL)
${MAKEWHATIS} ${DESTDIR}${BINDIR}/openssl/man
.endif
Index: share/man/man5/make.conf.5
===================================================================
RCS file: /home/dcvs/dfly/share/man/man5/make.conf.5,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 make.conf.5
--- share/man/man5/make.conf.5 5 Sep 2005 19:15:21 -0000 1.1.1.1
+++ share/man/man5/make.conf.5 5 Sep 2005 19:59:26 -0000
@@ -36,8 +36,7 @@
.Nm
contains settings that control the compilation of the
.Dx
-sources
-and ported applications.
+sources.
The file
.Nm
is generally created by the system administrator when the values need
@@ -47,13 +46,10 @@
.Nm
is not to run commands or perform compilation actions
directly.
-Instead, it is included by the
-various makefiles in
+Instead, it is included by the various makefiles in
.Pa /usr/src
-and
-.Pa /usr/ports
-which conditionalize their
-internal actions according to the settings found there.
+which conditionalize their internal actions according to the settings
+found there.
.Pp
The
.Pa /etc/make.conf
@@ -64,12 +60,11 @@
.Pa /etc/make.conf
when the system administrator wishes to override these defaults.
.Pp
-The build procedures occur in four broad areas: the world, the kernel,
-documentations and ports.
+The build procedures occur in three areas: world, kernel, and
+documentation.
Variables set in
.Nm
-may be applicable during builds in one, two, or all four of these
-areas.
+may be applicable during builds in one, two, or all of these areas.
They may be specified for a particular build via the
.Fl D
option of
@@ -77,46 +72,24 @@
.Pp
The following lists provide a name and short description for each
variable you can use during the indicated builds.
-The values of
-variables flagged as
+The values of variables flagged as
.Vt bool
-are ignored; the variable being
-set at all (even to
+are ignored; the variable being set at all (even to
.Dq Li FALSE
or
.Dq Li NO )
-causes it to
-be treated as if it were set.
+causes it to be treated as if it were set.
.Pp
The following list provides a name and short description for variables
that are used for all builds, or are used by the
.Pa makefiles
for things other than builds.
.Bl -tag -width Ar
-.It Va CFLAGS
-.Pq Vt str
-Controls the compiler setting when compiling C code.
-Optimization levels above
-.Fl O
-.Pq Fl O2 , No ...
-are not supported.
-.Va BDECFLAGS
-is provided as a set of
-.Xr gcc 1
-settings suggested by
-.An "Bruce Evans" Aq bde@xxxxxxxxxxx
-for developing and testing changes.
-They can be used, if set, by:
-.Pp
-.Bd -literal -offset indent
-CFLAGS+=${BDECFLAGS}
-.Ed
.It Va CPUTYPE
.Pq Vt str
-Controls which processor should be targeted for generated
-code. This controls processor-specific optimizations in
-certain code (currently only OpenSSL) as well as modifying
-the value of
+Controls which processor should be targeted for generated code.
+This controls processor-specific optimizations in certain code
+(currently only OpenSSL) as well as modifying the value of
.Va CFLAGS
and
.Va COPTFLAGS
@@ -135,32 +108,44 @@
for a list of recognized
.Va CPUTYPE
options.
+.It Va CCVER
+.Pq Vt str
+Controls which GCC version to use by default. It should be set as
+CCVER?= so as not to interfere with overrides from userland. We
+currently recommend that an override NOT be set in
+.Pa /etc/make.conf .
+Currently accepted values are cc34 and cc40 (experimental).
+.It Va CFLAGS
+.Pq Vt str
+Controls the compiler setting when compiling C code.
+Optimization levels above
+.Fl O
+.Pq Fl O2 , No ...
+are not supported.
+.Va BDECFLAGS
+is provided as a set of
+.Xr gcc 1
+settings suggested by
+.An "Bruce Evans" Aq bde@xxxxxxxxxxx
+for developing and testing changes.
+They can be used, if set, by:
+.Pp
+.Bd -literal -offset indent
+CFLAGS+=${BDECFLAGS}
+.Ed
.It Va NO_CPU_CFLAGS
.Pq Vt str
Setting this variable will prevent CPU specific compiler flags
from being automatically added to
.Va CFLAGS
during compile time.
-.It Va NO_CPU_COPTFLAGS
-.Pq Vt str
-Setting this variable will prevent CPU specific compiler flags
-from being automatically added to
-.Va COPTFLAGS
-during compile time.
-.It Va CVS_UPDATE
-.Pq Vt bool
-Set this to use
-.Xr cvs 1
-to update your ports with
-.Dq Li "make update" .
.It Va CXXFLAGS
.Pq Vt str
Controls the compiler settings when compiling C++ code.
.Va CXXFLAGS
is initially set to the value of
.Va CFLAGS .
-If you want to
-add to the
+If you want to add to the
.Va CXXFLAGS
value, use
.Dq Li +=
@@ -169,15 +154,13 @@
.It Va INSTALL
.Pq Vt str
the default install command.
-To have commands compared before doing
-the install, use
+To have components compared before doing the install, use
.Bd -literal -offset indent
INSTALL="install -C"
.Ed
.It Va LOCAL_DIRS
.Pq Vt str
-List any directories that should be entered when doing
-make's in
+List any directories that should be entered when running make
.Pa /usr/src
in this variable.
.It Va MAKE_SHELL
@@ -193,6 +176,9 @@
.Bd -literal -offset indent
MAKE_SHELL?=sh
.Ed
+.It Va MODULES_OVERRIDE
+.Pq Vt str
+Set to a list of modules to build instead of all of them.
.It Va MTREE_FOLLOWS_SYMLINKS
.Pq Vt str
Set this to
@@ -204,10 +190,13 @@
.Pq Vt bool
Set this to not update the doc tree during
.Dq Li "make update" .
-.It Va NO_PORTSUPDATE
-.Pq Vt bool
-Set this to not update the ports tree during
-.Dq Li "make update" .
+.It Va STRIP
+.Pq Vt str
+Set this to the flag to pass the
+.Xr strip 1
+command.
+If set to a blank value, components will be installed with debugging
+symbols.
.It Va SUP_UPDATE
.Pq Vt bool
Set this to use
@@ -256,14 +245,6 @@
.Dq Li "make update" .
This defaults to
.Pa /usr/share/examples/cvsup/secure\-supfile .
-.It Va PORTSSUPFILE
-.Pq Vt str
-The ports
-.Ar supfile
-to use when doing a
-.Dq Li "make update" .
-This defaults to
-.Pa /usr/share/examples/cvsup/ports\-supfile .
.It Va DOCSUPFILE
.Pq Vt str
The documentation
@@ -273,7 +254,9 @@
This defaults to
.Pa /usr/share/examples/cvsup/doc\-supfile .
.It Va WARNS_WERROR
-Causes -Werror to be added to
+Causes
+.Fl Werror
+to be added to
.Va CFLAGS
when WARNS is in effect.
@@ -337,9 +320,16 @@
still mount the server's
.Pa /
rather than load the server's kernel.
-.It Va MODULES_OVERRIDE
+.It Va NO_CPU_COPTFLAGS
.Pq Vt str
-Set to a list of modules to build instead of all of them.
+Setting this variable will prevent CPU specific compiler flags
+from being automatically added to
+.Va COPTFLAGS
+during compile time.
+.It Va NO_KERNELCLEAN
+.Pq Vt bool
+Set this to skip the clean target when using
+.Dq Li "${MAKE} buildkernel" .
.It Va NO_KERNELCONFIG
.Pq Vt bool
Set this to skip running
@@ -360,90 +350,48 @@
The following list provides a name and short description for variables
that are used during the world build:
.Bl -tag -width Ar
-.It Va COMPAT1X
-.Pq Vt bool
-Set to install the
-.Fx
-1 compatibility libraries.
-.It Va COMPAT20
-.Pq Vt bool
-Set to install the
-.Fx 2.0
-compatibility libraries.
-.It Va COMPAT21
-.Pq Vt bool
-Set to install the
-.Fx 2.1
-compatibility libraries.
-.It Va COMPAT22
-.Pq Vt bool
-Set to install the
-.Fx 2.2
-compatibility libraries.
-.It Va COMPAT3X
-.Pq Vt bool
-Set to install the
-.Fx
-3
-compatibility libraries.
-.It Va COMPAT4X
-.Pq Vt bool
-Set to install the
-.Fx
-4
-compatibility libraries.
-.It Va ENABLE_SUIDPERL
-.Pq Vt bool
-Set to enable the installation of an suid
-.Xr perl 1
-binary.
-.It Va FETCH_CMD
-.Pq Vt str
-Command to use to fetch files.
-Normally
-.Xr fetch 1 .
-.It Va KRB5_HOME
-.Pq Vt str
-If you want to install the MIT Kerberos5 port somewhere other than
-.Pa /usr/local ,
-define this. This is also used to tell ssh1 that kerberos is needed.
-.It Va MAKE_IDEA
-.Pq Vt bool
-Set to build the IDEA encryption code.
-This code is patented in the USA and many European countries.
-It is
-.Em "YOUR RESPONSIBILITY"
-to determine if you can legally use IDEA.
-.It Va MAKE_KERBEROS5
-.Pq Vt bool
-Set this to build Kerberos5 (KTH Heimdal).
-.Em WARNING !
-This is still experimental code.
-If you need stable Kerberos5, use the
-port(s).
.It Va ENABLE_SUID_K5SU
.Pq Vt bool
-Set this if you wish to use the k5su utility. Otherwise, it will be
-installed without the set-user-ID bit set.
+Set this if you wish to use the k5su utility.
+Otherwise, it will be installed without the set-user-ID bit set.
+This is only relevant if
+.Va WANT_KERBEROS
+is defined.
.It Va ENABLE_SUID_SSH
.Pq Vt bool
Set this to install
.Xr ssh 1
with the setuid bit turned on.
+.It Va FETCH_ENV
+.Pq Vt str
+If you're behind a firewall and need FTP or HTTP proxy services for
+.Xr fetch 1 ,
+the following examples provide the necessary syntax.
+.Pp
+.Bd -literal -offset indent
+FETCH_ENV=FTP_PROXY=ftp://10.0.0.1:21
+FETCH_ENV=FTP_PROXY=http://10.0.0.1:80
+.Ed
.It Va MODULES_WITH_WORLD
.Pq Vt bool
Set to build modules with the system instead of the kernel.
-.It Va NO_CVS
-.Pq Vt bool
-Set to not build CVS.
.It Va NO_BIND
.Pq Vt bool
Set to not build BIND.
+.It Va NO_CRYPT
+.Pq Vt bool
+Set to not build crypto code.
+.It Va NO_CVS
+.Pq Vt bool
+Set to not build CVS.
.It Va NO_FORTRAN
.Pq Vt bool
Set to not build
.Xr g77 1
and related libraries.
+.It Va NO_GAMES
+.Pq Vt bool
+Set to not build games.
.It Va NO_GDB
.Pq Vt bool
Set to not build
@@ -454,6 +402,12 @@
.It Va NO_IPFILTER
.Pq Vt bool
Set to not build IP Filter package.
+.It Va NO_LIBC_R
+.Pq Vt bool
+Set to not build
+.Nm libc_r
+(reentrant version of
+.Nm libc ) .
.It Va NO_LPR
.Pq Vt bool
Set to not build
@@ -464,9 +418,6 @@
Set to not build the
.Xr mailwrapper 8
MTA selector.
-.It Va NOMAN
-.Pq Vt bool
-Set to not build manual pages
.It Va NO_MAKEDEV
.Pq Vt bool
Set to avoid running
@@ -489,6 +440,9 @@
Set to not build
.Xr sendmail 8
and related programs.
+.It Va NO_SHARE
+.Pq Vt bool
+Set to not enter the share subdirectory.
.It Va NO_SHAREDOCS
.Pq Vt bool
Set to not build the
@@ -509,49 +463,32 @@
.Dq Li "${MAKE} clean"
instead of
.Dq Li "${MAKE} cleandir" .
-.It Va NOCRYPT
+.It Va NOFSCHG
.Pq Vt bool
-Set to not build any crypto code.
-.It Va NOGAMES
-.Pq Vt bool
-Set to not build games.
+Set to not install certain components with flag fschg.
+This is useful in a jailed environment.
.It Va NOINFO
.Pq Vt bool
Set to not make or install
.Xr info 5
files.
-.It Va NOLIBC_R
+.It Va NOINFOCOMPRESS
.Pq Vt bool
-Set to not build
-.Nm libc_r
-(reentrant version of
-.Nm libc ) .
-.It Va NOMANCOMPRESS
+Set to not compress the info pages.
+.It Va NOMAN
.Pq Vt bool
-Set to install man pages uncompressed.
-.It Va NOPERL
+Set to not build manual pages
+.It Va NOMANCOMPRESS
.Pq Vt bool
-Set to avoid building
-.Xr perl 1 .
+Set to not compress the manual pages.
.It Va NOPROFILE
.Pq Vt bool
Set to avoid compiling profiled libraries.
-.It Va NOSHARE
-.Pq Vt bool
-Set to not build in the
-.Pa share
-subdir.
-.It Va PERL_THREADED
-.Pq Vt bool
-Set to enable the building and installation of
-.Xr perl 1
-with thread
-support.
.It Va PPP_NOSUID
.Pq Vt bool
Set to disable the installation of
.Xr ppp 8
-as an suid root program.
+with the set-user-ID bit on.
.It Va SENDMAIL_MC
.Pq Vt str
The default
@@ -659,18 +596,26 @@
approximately twice as large as the number of lines in
.Pa /etc/passwd .
The default number is 20011.
+.It Va WANT_GCC40
+.Pq Vt bool
+Set to build the experimental version of GCC (4.0).
+.It Va WANT_IDEA
+.Pq Vt bool
+Set to build the IDEA encryption code.
+This code is patented in the USA and many European countries.
+It is
+.Em "YOUR RESPONSIBILITY"
+to determine if you can legally use IDEA.
+.It Va WANT_KERBEROS
+.Pq Vt bool
+Set this to build Kerberos5 (KTH Heimdal).
+.Em WARNING !
+This is still experimental code.
.El
.Pp
The following list provides a name and short description for variables
that are used when building documentation.
.Bl -tag -width Ar
-.It Va DISTDIR
-.Pq Vt str
-Where distfiles are kept.
-Normally, this is
-.Pa distfiles
-in
-.Va PORTSDIR .
.It Va DOC_LANG
.Pq Vt str
The list of languages and encodings to build and install.
@@ -685,209 +630,6 @@
for postscript or graphics printers with a ghostscript
filter.
.El
-.Pp
-The following list provides a name and short description for variables
-that are used when building ports:
-.Bl -tag -width Ar
-.It Va FORCE_PKG_REGISTER
-.Pq Vt bool
-Set this to override any existing package registration.
-.It Va HAVE_MOTIF
-.Pq Vt bool
-Set this if you have Motif on your system.
-.It Va KRB5_HOME
-.Pq Vt str
-Set this if you want to install the MIT Kerberos5 port somewhere
-other than
-.Pa /usr/local .
-.It Va LOCALBASE
-.Pq Vt str
-Set this to the base directory that non\-X ports should be
-installed in.
-It provides the default for
-.Va PREFIX
-when building in
-.Pa /usr/ports .
-.It Va MASTER_SITE_AFTERSTEP
-.Pq Vt str
-Set this to change the master site for AfterStep ports.
-The last
-part of the path must be
-.Dq Li /%SUBDIR%/ .
-.It Va MASTER_SITE_BACKUP
-.Pq Vt str
-Controls the site location that ports check for distfiles if the
-locations listed in their
-.Pa Makefile
-do not work.
-The last part of the path must be
-.Dq Li /${DIST_SUBDIR}/ .
-.It Va MASTER_SITE_COMP_SOURCES
-.Pq Vt str
-Controls the master site location for
-.Pa comp.sources
-ports.
-The
-last part of the path must be
-.Dq Li %SUBDIR%/
-.It Va MASTER_SITE_GNOME
-.Pq Vt str
-Controls the master site location for GNOME ports.
-The
-last part of the path must be
-.Dq Li /%SUBDIR%/
-.It Va MASTER_SITE_GNU
-.Pq Vt str
-Controls the master site location for GNU ports.
-The
-last part of the path must be
-.Dq Li /%SUBDIR%/
-.It Va MASTER_SITE_KDE
-.Pq Vt str
-Controls the master site location for KDE ports.
-The
-last part of the path must be
-.Dq Li /%SUBDIR%/
-.It Va MASTER_SITE_FREEBSD
-.Pq Vt bool
-If set, go to the master
-.Fx
-site for all files.
-.It Va MASTER_SITE_MOZILLA
-.Pq Vt str
-Controls the master site location for Mozilla ports.
-The
-last part of the path must be
-.Dq Li /%SUBDIR%/
-.It Va MASTER_SITE_OVERRIDE
-.Pq Vt str
-If set, this site is checked before the sites listed in the ports
-.Pa Makefile .
-You can have it check the backup site first by like so:
-.Bd -literal -offset indent
-MASTER_SITE_OVERRIDE?= ${MASTER_SITE_BACKUP}
-.Ed
-.It Va MASTER_SITE_PERL_CPAN
-.Pq Vt str
-Controls the master site location for Perl ports.
-The
-last part of the path must be
-.Bd -literal -offset indent
-/%SUBDIR%/
-.Ed
-.It Va MASTER_SORT_REGEX
-.Pq Vt str
-Set this to control the sort order for mirror sets.
-To set it to
-prefer mirrors in the
-.Pa .jp
-domain, use:
-.Bd -literal -offset indent
-MASTER_SORT_REGEX?= ^file: ^ftp://ftp\.FreeBSD\.org/pub/FreeBSD/ports/local-distfiles/ ://[^/]*\.jp/ ://[^/]*\.jp\.
-.Ed
-.Pp
-Users of other ccTLD domains should change the
-.Dq Li jp
-to the
-appropriate domain.
-.It Va MASTER_SITE_RINGSERVER
-.Pq Vt str
-Controls the master site location for Ringserver ports.
-The last
-part of the path must be
-.Dq Li /%SUBDIR%/ .
-.It Va MASTER_SITE_RUBY
-.Pq Vt str
-Controls the master site location for Ruby ports.
-The last
-part of the path must be
-.Dq Li /%SUBDIR%/ .
-.It Va MASTER_SITE_SUNSITE
-.Pq Vt str
-Controls the master site location for Sunsite ports.
-The last
-part of the path must be
-.Dq Li /%SUBDIR%/ .
-.It Va MASTER_SITE_TCLTK
-.Pq Vt str
-Controls the master site location for Tcl and Tk ports.
-The last
-part of the path must be
-.Dq Li /%SUBDIR%/ .
-.It Va MASTER_SITE_TEX_CTAN
-.Pq Vt str
-Controls the master site location for TeX ports.
-The last
-part of the path must be
-.Dq Li /%SUBDIR%/ .
-.It Va MASTER_SITE_WINDOWMAKER
-.Pq Vt str
-Controls the master site location for WindowMaker ports.
-The last
-part of the path must be
-.Dq Li /%SUBDIR%/ .
-.It Va MASTER_SITE_XCONTRIB
-.Pq Vt str
-Controls the master site location for contributed X ports.
-The last
-part of the path must be
-.Dq Li /%SUBDIR%/ .
-.It Va MASTER_SITE_XEMACS
-.Pq Vt str
-Controls the master site location for Xemacs ports.
-The last
-part of the path must be
-.Dq Li /%SUBDIR%/ .
-.It Va MASTER_SITE_XFREE
-.Pq Vt str
-Controls the master site location for XFree ports.
-The last
-part of the path must be
-.Dq Li /%SUBDIR%/ .
-.It Va MOTIFLIB
-.Pq Vt str
-Location of
-.Pa libXm.a
-and
-.Pa libXm.so .
-.It Va MOTIF_STATIC
-.Pq Vt bool
-Set this if you want ports that use Motif to be built so they
-can be run on systems without the Motif shared libraries.
-.It Va NOCLEANDEPENDS
-.Pq Vt bool
-Set this to prevent
-.Dq Li "make clean"
-from cleaning the ports that the one being cleaned depends on.
-.It Va NOPORTDOCS
-.Pq Vt bool
-Set this to disable installing additional documentation with ports.
-.It Va PACKAGES
-.Pq Vt str
-Used only for the package target; the directory for the package tree.
-.It Va PATCH_SITES
-.Pq Vt str
-Primary location(s) for the distribution of patch files.
-.It Va PORTSDIR
-.Pq Vt str
-The location of the ports tree.
-.It Va USA_RESIDENT
-.Pq Vt bool
-Set this if you are a resident of the USA so that ports that
-need to can attempt to comply with U.S. export regulations.
-.It Va WITHOUT_X11
-.Pq Vt bool
-Set this so that ports that can be built with or without X11
-support will build without X11 support by default.
-.It Va WRKDIRPREFIX
-.Pq Vt str
-Where to create temporary files used when building ports.
-.It Va X11BASE
-.Pq Vt str
-Should be set to where the X11 distribution has been
-installed if it is installed anywhere other than
-.Pa /usr/X11R6 .
-.El
.Sh FILES
.Bl -tag -width /etc/defaults/make.conf -compact
.It Pa /etc/defaults/make.conf
@@ -910,8 +652,7 @@
file appeared sometime before
.Fx 4.0 .
.Sh AUTHORS
-This
-manual page was written by
+This manual page was written by
.An Mike W. Meyer Aq mwm@xxxxxxxxx .
.Sh BUGS
This manual page may occasionally be out of date with respect to
Index: sys/netgraph/Makefile
===================================================================
RCS file: /home/dcvs/dfly/sys/netgraph/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- sys/netgraph/Makefile 5 Sep 2005 19:15:37 -0000 1.1.1.1
+++ sys/netgraph/Makefile 5 Sep 2005 22:37:27 -0000
@@ -29,7 +29,7 @@
tty \
vjc
-.if !defined(NOCRYPT) && exists(${.CURDIR}/../../crypto/rc4/rc4.c)
+.if !defined(NO_CRYPT) && exists(${.CURDIR}/../../crypto/rc4/rc4.c)
SUBDIR+= mppc
.endif
Index: usr.bin/fetch/Makefile
===================================================================
RCS file: /home/dcvs/dfly/usr.bin/fetch/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- usr.bin/fetch/Makefile 5 Sep 2005 19:15:42 -0000 1.1.1.1
+++ usr.bin/fetch/Makefile 5 Sep 2005 22:37:36 -0000
@@ -5,7 +5,7 @@
WARNS?= 6
DPADD= ${LIBFETCH}
LDADD= -lfetch
-.if !defined(NOCRYPT) && !defined(NO_OPENSSL)
+.if !defined(NO_CRYPT) && !defined(NO_OPENSSL)
DPADD+= ${LIBCRYPTO} ${LIBSSL}
LDADD+= -lcrypto -lssl
.endif
Index: usr.bin/su/Makefile
===================================================================
RCS file: /home/dcvs/dfly/usr.bin/su/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- usr.bin/su/Makefile 5 Sep 2005 19:15:44 -0000 1.1.1.1
+++ usr.bin/su/Makefile 5 Sep 2005 22:49:37 -0000
@@ -15,7 +15,7 @@
.endif
CFLAGS+= -Wall
-.if defined(MAKE_KERBEROS5) && !defined(NOCRYPT) && !defined(NO_OPENSSL)
+.if defined(WANT_KERBEROS) && !defined(NO_CRYPT) && !defined(NO_OPENSSL)
CFLAGS+=-DKERBEROS5
DPADD+= ${LIBKRB5} ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} \
${LIBROKEN}
Index: usr.sbin/pkg_install/Makefile
===================================================================
RCS file: /home/dcvs/dfly/usr.sbin/pkg_install/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- usr.sbin/pkg_install/Makefile 5 Sep 2005 19:15:48 -0000 1.1.1.1
+++ usr.sbin/pkg_install/Makefile 5 Sep 2005 22:42:57 -0000
@@ -3,7 +3,7 @@
SUBDIR= lib add create delete info ${_sign} version
-.if !defined(NOCRYPT) && !defined(NO_OPENSSL)
+.if !defined(NO_CRYPT) && !defined(NO_OPENSSL)
_sign= sign
.endif
Index: usr.sbin/pkg_install/Makefile.inc
===================================================================
RCS file: /home/dcvs/dfly/usr.sbin/pkg_install/Makefile.inc,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile.inc
--- usr.sbin/pkg_install/Makefile.inc 5 Sep 2005 19:15:48 -0000 1.1.1.1
+++ usr.sbin/pkg_install/Makefile.inc 5 Sep 2005 22:43:10 -0000
@@ -7,7 +7,7 @@
LIBINSTALL= ${.CURDIR}/../lib/libinstall.a
.endif
-.if !defined(NOCRYPT) && !defined(NO_OPENSSL) && \
+.if !defined(NO_CRYPT) && !defined(NO_OPENSSL) && \
defined(LDADD) && ${LDADD:M-lfetch} != ""
DPADD+= ${LIBSSL} ${LIBCRYPTO}
LDADD+= -lssl -lcrypto
Index: usr.sbin/ppp/Makefile
===================================================================
RCS file: /home/dcvs/dfly/usr.sbin/ppp/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- usr.sbin/ppp/Makefile 5 Sep 2005 19:15:48 -0000 1.1.1.1
+++ usr.sbin/ppp/Makefile 5 Sep 2005 22:43:26 -0000
@@ -70,7 +70,7 @@
SRCS+= id.c
.endif
-.if !exists(${.CURDIR}/../../secure) || defined(NOCRYPT) || defined(NO_OPENSSL) || defined(NODES)
+.if !exists(${.CURDIR}/../../secure) || defined(NO_CRYPT) || defined(NO_OPENSSL) || defined(NODES)
CFLAGS+=-DNODES
.else
DISTRIBUTION=crypto
Index: usr.sbin/pppd/Makefile
===================================================================
RCS file: /home/dcvs/dfly/usr.sbin/pppd/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- usr.sbin/pppd/Makefile 5 Sep 2005 19:15:49 -0000 1.1.1.1
+++ usr.sbin/pppd/Makefile 5 Sep 2005 22:43:40 -0000
@@ -28,7 +28,7 @@
DPADD+= ${LIBPCAP}
# MS-CHAP support. Requires the DES library.
-.if exists(${.CURDIR}/../../secure) && !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH)
+.if exists(${.CURDIR}/../../secure) && !defined(NO_CRYPT) && !defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH)
DISTRIBUTION=crypto
CFLAGS+=-DCHAPMS
SRCS+= chap_ms.c
Index: usr.sbin/sendmail/Makefile
===================================================================
RCS file: /home/dcvs/dfly/usr.sbin/sendmail/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- usr.sbin/sendmail/Makefile 5 Sep 2005 19:15:49 -0000 1.1.1.1
+++ usr.sbin/sendmail/Makefile 5 Sep 2005 22:43:52 -0000
@@ -62,7 +62,7 @@
SRCS+= sm_os.h
CLEANFILES+=sm_os.h
-.if exists(${.CURDIR}/../../secure) && !defined(NOCRYPT) && \
+.if exists(${.CURDIR}/../../secure) && !defined(NO_CRYPT) && \
!defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH)
# STARTTLS support
DISTRIBUTION= crypto
Index: usr.sbin/tcpdump/tcpdump/Makefile
===================================================================
RCS file: /home/dcvs/dfly/usr.sbin/tcpdump/tcpdump/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- usr.sbin/tcpdump/tcpdump/Makefile 5 Sep 2005 19:15:49 -0000 1.1.1.1
+++ usr.sbin/tcpdump/tcpdump/Makefile 5 Sep 2005 22:44:08 -0000
@@ -45,7 +45,7 @@
DPADD= ${LIBL} ${LIBPCAP}
LDADD= -ll -lpcap
-.if exists(../../../secure) && !defined(NOCRYPT) && !defined(NO_OPENSSL) && \
+.if exists(../../../secure) && !defined(NO_CRYPT) && !defined(NO_OPENSSL) && \
!defined(RELEASE_CRUNCH)
DISTRIBUTION=crypto
DPADD+= ${LIBCRYPTO}
[
Date Prev][
Date Next]
[
Thread Prev][
Thread Next]
[
Date Index][
Thread Index]
