DragonFly submit List (threaded) for 2005-09
[
Date Prev][
Date Next]
[
Thread Prev][
Thread Next]
[
Date Index][
Thread Index]
Make options revisited
Okay, a little while earlier today I posted a lame set of patches to
simply change the knob for Kerberos to NO_KERBEROS.
Now I have quite a bit more done. I hope this is accepted on some
level or another.
For starters I've renamed almost every option I could find that was
in the form of NONAME to NO_NAME, with the exception of NOMAN, because
I could see that being a problem for people who are extremely used to
that particular convention (NOMAN=noman).
With regards to PPP:
o There are several ppp-specific options that are rather universally
named, such as NOSUID, NOATM, etc. I renamed all of the ppp-
specific items to PPP_NO_NAME. These control just the functionality
of ppp.
o PPP_NOSUID, NOKLDLOAD, NOALIAS, NONAT, NOI4B, NORADIUS, and
NONETGRAPH were all renamed to PPP_NO_SUID, PPP_NO_KLDLOAD,
PPP_NO_ALIAS, PPP_NO_NAT, PPP_NO_I4B, PPP_NO_RADIUS, and
PPP_NO_NETGRAPH respectively.
o There is an option called EXPERIMENTAL_NETGRAPH that pops up in
the ppp Makefile, but I didn't rename it. I have a few other things
I missed initially that I would happily find, fix, and submit.
With regards to NO_INET6:
o Several programs utilize this option, althought it was previously
known as NOINET6. This is undocumented (something I will work on
as well) but pops up in libipsec, libpcap, libwrap, ftpd, tcpd,
ipfilter, ppp, tcpdchk, tcpdmatch, and tcpdump.
With regards to NO_HTML:
o I'm not 100% certain what this actually is used for. The option
only pops up in Makefile.inc1 and libdialog.
With regards to NO_INFOCOMPRESS:
o This is undocumented and I assume serves the same purpose as
NO_MANCOMPRESS.
With regards to NO_PAM:
o This pops up in ftpd, lukemftpd, login, and passwd. Self-
explanitory.
With regards to NO_PIC:
o Undocumented, probably better off that way as I doubt too many
people will ever tweak this knob one way or the other.
With regards to NO_FSCHG:
o Undocumented, possible feature. I guess someone might find it
necessary to not install certain binaries without the flag fschg.
The default make.conf file went under the axe the most I'd say because
it is ridiculously behind the times, ports or no ports. I removed all
(I think) references to the FreeBSD ports system, as it has been
stated that pkgsrc will be officially supported, the rules are a bit
different I'd assume.
I've removed all references to COMPAT*X because they don't actually
do anything for us. I accidentally removed FETCH_ENV, forgetting that
we do have fetch, and that it's not just a port-specific tool. I
removed all references to MASTER_SITE_WHATEVER, changed
SUP_HOST to reflect something more appropriate (...), added two
documented featurettes, SUPFILE1 and SUPFILE2, which considering how
many trees I imagine some people are following, would be quite useful.
All instances of NOSHARED were changes to NO_SHARED, ditto for
NOPROFILE.
For libexec/ftpd, there is INET6-specific code, but no Makefile option
to disable/enable it, I threw an option in if NO_INET6 is not defined
to go ahead and build INET6-specific code.
NOINSTALLLIB was changed to NO_INSTALLLIB (only shows up twice iirc).
I understand that it will possibly be a source of contention, but with
the NO_KERBEROS option, kerberos would be built by default. I don't
know how desireable that is, but then why bother having the code at
all in the tree if it's not built by default? It seems counter to all
the other NO_ options. It's the only bit of code in the tree I've seen
that has the opposite option, to be disabled by default, and requires
an option to enable it. So this throws it in line with the rest of the
tree. Perhaps removal of kerberos is in order, if NO_KERBEROS is not
desired?
And then there are several appearances of port-specific items in
the make.conf manual page and the default make.conf file in etc.
I've removed them all. The one option I removed from Makefile.inc1
that I didn't entirely mean to was CVS_UPDATE (also removed from
make.conf(5) and etc/defaults/make.conf). At first I thought it was
probably obsolete since I think most are using cvsup, but then I
thought about pkgsrc using cvs and I figure CVS_UPDATE might be a
useful way to simplify updating of pkgsrc, whenever that gets worked
in the project in an official manner.
All options that changed from NOOPTION to NO_OPTION were documented
(provided they were already documented). New documentation for certain
other options can come along shortly, if these changes are accepted as
overall decent enough.
There were several really old references to crap like PERL_THREADED,
NOSUID_PERL (or something), and so on that were removed from
make.conf(5). Some other bogus crap that, frankly, should have never
been in a core make.conf in the first place, was removed such as
MOTIF_STATIC, HAVE_MOTIF, X11_BASE, MOTIFLIB, etc.
I am about to go through share/mk with a fine-tooth comb to see if I
spot anything that seems out of date, unnecessary, etc. Please let
me know what your thoughts are about any of these changes. I can
whittle them down, beef them up, whatever.
--
Carl Schmidt
carl@xxxxxxxxxxxxxxx
Index: Makefile.inc1
===================================================================
RCS file: /home/carl/cvs/dfly/Makefile.inc1,v
retrieving revision 1.2
diff -u -r1.2 Makefile.inc1
--- Makefile.inc1 3 Sep 2005 10:19:24 -0000 1.2
+++ Makefile.inc1 3 Sep 2005 17:27:21 -0000
@@ -3,22 +3,22 @@
# $DragonFly: src/Makefile.inc1,v 1.77 2005/08/28 07:06:42 dillon Exp $
#
# Make command line options:
-# -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_CLEAN do not clean at all
+# -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
+# -DNO_CRYPT will prevent building of crypt versions
+# -DNO_DOCUPDATE do not update doc in ${MAKE} update
# -DNO_FORTRAN do not build g77 and related libraries.
+# -DNO_GAMES do not go into games subdir
+# -DNO_INFO do not make or install info files
# -DNO_KERBEROS do nut build Kerberos 5.
-# -DNO_KERNELCONFIG do not run config in ${MAKE} buildkernel
# -DNO_KERNELCLEAN do not run ${MAKE} clean in ${MAKE} buildkernel
+# -DNO_KERNELCONFIG do not run config in ${MAKE} buildkernel
# -DNO_KERNELDEPEND do not run ${MAKE} depend in ${MAKE} buildkernel
+# -DNO_LIBC_R do not build libc_r.
+# -DNOMAN do not build the manual pages
# -DNO_PORTSUPDATE do not update ports in ${MAKE} update
-# -DNO_DOCUPDATE do not update doc in ${MAKE} update
+# -DNO_PROFILE do not build profiled libraries
+# -DNO_SHARE do not go into share subdir
# LOCAL_DIRS="list of dirs" to add additional dirs to the SUBDIR list
# TARGET_ARCH="arch" to crossbuild world to a different arch
#
@@ -66,14 +66,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(NO_KERBEROS)
+ !defined(NO_CRYPT) && !defined(NO_OPENSSL) && !defined(NO_KERBEROS)
SUBDIR+= kerberos5
.endif
.if exists(${.CURDIR}/libexec)
@@ -82,10 +82,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)
@@ -117,7 +117,7 @@
SUBDIR= ${SUBDIR_OVERRIDE}
.endif
-.if defined(NOCLEANDIR)
+.if defined(NO_CLEANDIR)
CLEANDIR= clean cleandepend
.else
CLEANDIR= cleandir
@@ -217,7 +217,7 @@
INSTALL="sh ${.CURDIR}/tools/install.sh"
BMAKE= ${BMAKEENV} ${MAKE} -f Makefile.inc1 -DBOOTSTRAPPING \
- -DNOHTML -DNOINFO -DNOMAN -DNOPIC -DNOPROFILE -DNOSHARED \
+ -DNO_HTML -DNO_INFO -DNOMAN -DNO_PIC -DNO_PROFILE -DNO_SHARED \
-DNO_WERROR
# build-tool stage
@@ -289,7 +289,7 @@
@echo "--------------------------------------------------------------"
@echo ">>> Rebuilding the temporary build tree"
@echo "--------------------------------------------------------------"
-.if !defined(NOCLEAN)
+.if !defined(NO_CLEAN)
rm -rf ${BTOOLSDEST} ${CTOOLSDEST} ${WORLDDEST}
.else
# XXX - These two can depend on any header file.
@@ -348,7 +348,7 @@
@echo "--------------------------------------------------------------"
@echo ">>> stage 4b: building libraries"
@echo "--------------------------------------------------------------"
- cd ${.CURDIR}; ${WMAKE} -DNOHTML -DNOINFO -DNOMAN -DNOFSCHG libraries
+ cd ${.CURDIR}; ${WMAKE} -DNO_HTML -DNO_INFO -DNOMAN -DNO_FSCHG libraries
_depend:
@echo
@echo "--------------------------------------------------------------"
@@ -554,7 +554,7 @@
@echo ">>> Kernel build for ${_kernel} started on `LC_ALL=C date`"
@echo "--------------------------------------------------------------"
@echo "===> ${_kernel}"
-.if !defined(NOCLEAN) && !defined(NO_KERNELCLEAN)
+.if !defined(NO_CLEAN) && !defined(NO_KERNELCLEAN)
rm -rf ${KRNLOBJDIR}/${_kernel}
.else
@if [ -f ${KRNLOBJDIR}/${_kernel}/.nativekernel_run ]; then \
@@ -568,7 +568,7 @@
config ${CONFIGARGS} -d ${KRNLOBJDIR}/${_kernel} \
${KERNCONFDIR}/${_kernel}
.endif
-.if !defined(NOCLEAN) && !defined(NO_KERNELCLEAN) && defined(KERNEL_VERSION_${_kernel})
+.if !defined(NO_CLEAN) && !defined(NO_KERNELCLEAN) && defined(KERNEL_VERSION_${_kernel})
echo ${KERNEL_VERSION_${_kernel}} > ${KRNLOBJDIR}/${_kernel}/version
.endif
touch ${KRNLOBJDIR}/${_kernel}/.buildkernel_run
@@ -597,7 +597,7 @@
@echo ">>> Kernel build for ${_kernel} started on `LC_ALL=C date`"
@echo "--------------------------------------------------------------"
@echo "===> ${_kernel}"
-.if !defined(NOCLEAN) && !defined(NO_KERNELCLEAN)
+.if !defined(NO_CLEAN) && !defined(NO_KERNELCLEAN)
rm -rf ${KRNLOBJDIR}/${_kernel}
.else
@if [ -f ${KRNLOBJDIR}/${_kernel}/.buildkernel_run ]; then \
@@ -610,7 +610,7 @@
config ${CONFIGARGS} -d ${KRNLOBJDIR}/${_kernel} \
${KERNCONFDIR}/${_kernel}
.endif
-.if !defined(NOCLEAN) && !defined(NO_KERNELCLEAN) && defined(KERNEL_VERSION_${_kernel})
+.if !defined(NO_CLEAN) && !defined(NO_KERNELCLEAN) && defined(KERNEL_VERSION_${_kernel})
echo ${KERNEL_VERSION_${_kernel}} > ${KRNLOBJDIR}/${_kernel}/version
.endif
touch ${KRNLOBJDIR}/${_kernel}/.nativekernel_run
@@ -704,13 +704,6 @@
@${SUP} ${SUPFLAGS} ${DOCSUPFILE}
.endif
.endif
-.if defined(CVS_UPDATE)
- @echo "--------------------------------------------------------------"
- @echo ">>> Updating ${.CURDIR} from cvs repository `cat ${.CURDIR}/CVS/Root`"
- @echo "--------------------------------------------------------------"
- @sleep 2
- cd ${.CURDIR}; cvs -q update -P -d
-.endif
#
# most
@@ -762,7 +755,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 +794,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
@@ -818,7 +811,7 @@
.endif
.if exists(${.CURDIR}/kerberos5) && exists(${.CURDIR}/crypto) && \
- !defined(NOCRYPT) && !defined(NO_KERBEROS)
+ !defined(NO_CRYPT) && !defined(NO_KERBEROS)
_libkrb5= kerberos5/tools kerberos5/lib/libroken kerberos5/lib/libvers \
kerberos5/lib/libasn1 kerberos5/lib/libhdb kerberos5/lib/libsl
.endif
@@ -898,7 +891,7 @@
_generic_libs= gnu/lib
-.if !defined(NOCRYPT) && !defined(NO_KERBEROS)
+.if !defined(NO_CRYPT) && !defined(NO_KERBEROS)
_prebuild_libs+= kerberos5/tools
_prebuild_libs+= kerberos5/lib/libasn1
_prebuild_libs+= kerberos5/lib/libgssapi
@@ -916,7 +909,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/Makefile.inc
===================================================================
RCS file: /home/carl/cvs/dfly/bin/Makefile.inc,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile.inc
--- bin/Makefile.inc 3 Sep 2005 01:39:54 -0000 1.1.1.1
+++ bin/Makefile.inc 3 Sep 2005 19:16:37 -0000
@@ -3,5 +3,5 @@
# $DragonFly: src/bin/Makefile.inc,v 1.3 2005/02/06 06:12:32 okumoto Exp $
BINDIR?= /bin
-NOSHARED?= YES
+NO_SHARED?= YES
WARNS?= 6
Index: bin/ed/Makefile
===================================================================
RCS file: /home/carl/cvs/dfly/bin/ed/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- bin/ed/Makefile 3 Sep 2005 01:39:54 -0000 1.1.1.1
+++ bin/ed/Makefile 3 Sep 2005 16:42:00 -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: bin/rcp/Makefile
===================================================================
RCS file: /home/carl/cvs/dfly/bin/rcp/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- bin/rcp/Makefile 3 Sep 2005 01:39:54 -0000 1.1.1.1
+++ bin/rcp/Makefile 3 Sep 2005 17:29:56 -0000
@@ -9,7 +9,7 @@
BINOWN= root
BINMODE=4555
-.if !defined(NOFSCHG)
+.if !defined(NO_FSCHG)
INSTALLFLAGS=-fschg
.endif
Index: bin/rmail/Makefile
===================================================================
RCS file: /home/carl/cvs/dfly/bin/rmail/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- bin/rmail/Makefile 3 Sep 2005 01:39:54 -0000 1.1.1.1
+++ bin/rmail/Makefile 3 Sep 2005 19:16:59 -0000
@@ -36,7 +36,7 @@
# CFLAGS+= -DQUEUE_ONLY
# Not much point this being static. It calls a shared sendmail...
-NOSHARED?= NO
+NO_SHARED?= NO
sm_os.h:
${LN} -sf ${SENDMAIL_DIR}/include/sm/os/sm_os_dragonfly.h sm_os.h
Index: contrib/smbfs/lib/smb/Makefile
===================================================================
RCS file: /home/carl/cvs/dfly/contrib/smbfs/lib/smb/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- contrib/smbfs/lib/smb/Makefile 3 Sep 2005 01:40:35 -0000 1.1.1.1
+++ contrib/smbfs/lib/smb/Makefile 3 Sep 2005 19:14:29 -0000
@@ -2,7 +2,7 @@
LIB= smb
-NOPROFILE= yes
+NO_PROFILE= yes
#SHLIB_MAJOR= 1
#SHLIB_MINOR= 0
@@ -24,7 +24,7 @@
LIBDIR=lib
.if !defined(USE_SHAREDLIBS)
-NOPIC= yes
+NO_PIC= yes
.endif
install-src: install-lib
Index: contrib/smbfs/mount_smbfs/Makefile
===================================================================
RCS file: /home/carl/cvs/dfly/contrib/smbfs/mount_smbfs/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- contrib/smbfs/mount_smbfs/Makefile 3 Sep 2005 01:40:35 -0000 1.1.1.1
+++ contrib/smbfs/mount_smbfs/Makefile 3 Sep 2005 19:17:12 -0000
@@ -5,7 +5,7 @@
MAN8= mount_smbfs.8
BINDIR= /sbin
-#NOSHARED=yes
+#NO_SHARED=yes
MOUNT= ${.CURDIR}/../mount
CFLAGS+= -DSMBFS -I${MOUNT}
Index: etc/defaults/make.conf
===================================================================
RCS file: /home/carl/cvs/dfly/etc/defaults/make.conf,v
retrieving revision 1.3
diff -u -r1.3 make.conf
--- etc/defaults/make.conf 3 Sep 2005 10:21:26 -0000 1.3
+++ etc/defaults/make.conf 3 Sep 2005 17:29:18 -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
@@ -45,7 +44,6 @@
# CCVER?=gcc2 # (use GCC 2.95.x, default)
# CCVER?=gcc34 # (use GCC 3.4, experimental)
#
-#
# 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
@@ -89,43 +87,39 @@
# 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
#
+# To enable installing k5su with the setuid bit turned on
+#ENABLE_SUID_K5SU= true
+#
# To enable installing ssh(1) with the setuid bit turned on
#ENABLE_SUID_SSH= true
#
# To avoid building various parts of the base system:
#NO_BIND= true # do not build BIND
+#NO_CRYPT= true # do not build any crypto code
#NO_CVS= true # do not build CVS
#NO_FORTRAN= true # do not build g77 and related libraries
+#NO_GAMES= true # do not build games (games/ subdir)
#NO_I4B= true # do not build isdn4bsd package
+#NO_INFO= true # do not make or install info files
#NO_IPFILTER= true # do not build IP Filter package
-NO_KERBEROS= true # do not build Kerberos 5 (KTH Heimdal)
+#NO_KERBEROS= true # do not build Kerberos 5 (KTH Heimdal)
+#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
+#NOMAN= true # do not build manual pages
#NO_MODULES= true # do not build modules with the kernel
#NO_OBJC= true # do not build Objective C support
#NO_OPENSSH= true # do not build OpenSSH
#NO_OPENSSL= true # do not build OpenSSL (implies NO_OPENSSH)
#NO_PKGTOOLS= true # do not build included package tools (for pkgsrc)
+#NO_PROFILE= true # Avoid compiling profiled libraries
#NO_SENDMAIL= true # do not build sendmail and related programs
+#NO_SHARE= true # do not go into the share subdir
#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)
-#NOMAN= true # do not build manual pages
-#NOPROFILE= true # Avoid compiling profiled libraries
-#NOSHARE= true # do not go into the share subdir
-#
-# Kerberos 5 Options
-#ENABLE_SUID_K5SU= yes # Install k5su utility setuid
-#KRB5_HOME= /usr/local # Destination for Kerberos 5
#
# To build sys/modules when building the world (our old way of doing things)
#MODULES_WITH_WORLD=true # do not build modules when building kernel
@@ -150,24 +144,12 @@
# 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
-#
+#NO_MANCOMPRESS=true
#
# If you do not want additional documentation (some of which are
# a few hundred KB's) for ports to be installed:
#
-#NOPORTDOCS= true
+#NO_PORTDOCS= true
#
#
# Default format for system documentation, depends on your printer.
@@ -175,7 +157,6 @@
#
#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
@@ -207,30 +188,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
@@ -238,98 +195,19 @@
#
#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.
-#
-#FETCH_ENV= FTP_PROXY=ftp://10.0.0.1:21
-#FETCH_ENV= HTTP_PROXY=http://10.0.0.1:80
-#
-#
-# 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
-#
-#
# 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
+#SUPHOST= cvsup.dragonflybsd.org
#SUPFILE= /usr/share/examples/cvsup/stable-supfile
#PORTSSUPFILE= /usr/share/examples/cvsup/ports-supfile
#DOCSUPFILE= /usr/share/examples/cvsup/doc-supfile
+#SUPFILE1=
+#SUPFILE2=
#
# top(1) uses a hash table for the user names. The size of this hash
# can be tuned to match the number of local users. The table size should
@@ -344,7 +222,6 @@
#
#DOC_LANG= en_US.ISO8859-1 ru_RU.KOI8-R
#
-#
# sendmail
#
# The following sets the default m4 configuration file to use at
Index: gnu/lib/libdialog/Makefile
===================================================================
RCS file: /home/carl/cvs/dfly/gnu/lib/libdialog/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- gnu/lib/libdialog/Makefile 3 Sep 2005 01:40:47 -0000 1.1.1.1
+++ gnu/lib/libdialog/Makefile 3 Sep 2005 17:10:48 -0000
@@ -21,7 +21,7 @@
LDADD+= -lncurses
DPADD+= ${LIBNCURSES}
-.if !defined(NOHTML)
+.if !defined(NO_HTML)
afterinstall:
.for file in ${EXAMPLES}
${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \
Index: gnu/usr.bin/binutils215/ar/Makefile
===================================================================
RCS file: /home/carl/cvs/dfly/gnu/usr.bin/binutils215/ar/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- gnu/usr.bin/binutils215/ar/Makefile 3 Sep 2005 01:40:47 -0000 1.1.1.1
+++ gnu/usr.bin/binutils215/ar/Makefile 3 Sep 2005 19:17:47 -0000
@@ -9,7 +9,7 @@
CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils
CFLAGS+= -I${SRCDIR}/binutils
CFLAGS+= -I${SRCDIR}/bfd -I${.OBJDIR}/../libbfd
-NOSHARED?= yes
+NO_SHARED?= yes
DPADD= ${RELTOP}/libbinutils/libbinutils.a
DPADD+= ${RELTOP}/libbfd/libbfd.a
DPADD+= ${RELTOP}/libiberty/libiberty.a
Index: gnu/usr.bin/binutils215/as/Makefile.inc0
===================================================================
RCS file: /home/carl/cvs/dfly/gnu/usr.bin/binutils215/as/Makefile.inc0,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile.inc0
--- gnu/usr.bin/binutils215/as/Makefile.inc0 3 Sep 2005 01:40:47 -0000 1.1.1.1
+++ gnu/usr.bin/binutils215/as/Makefile.inc0 3 Sep 2005 19:18:12 -0000
@@ -44,7 +44,7 @@
CFLAGS+= "-DEMULATIONS=${EMULATIONS}"
CFLAGS+= -DDEFAULT_EMULATION=\"${DEFAULT_EMULATION}\"
CFLAGS+= -DTE_DragonFly
-NOSHARED?= yes
+NO_SHARED?= yes
DPADD= ${RELTOP}/libbfd/libbfd.a
DPADD+= ${RELTOP}/libiberty/libiberty.a
DPADD+= ${RELTOP}/libopcodes/libopcodes.a
Index: gnu/usr.bin/binutils215/ld/Makefile
===================================================================
RCS file: /home/carl/cvs/dfly/gnu/usr.bin/binutils215/ld/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- gnu/usr.bin/binutils215/ld/Makefile 3 Sep 2005 01:40:47 -0000 1.1.1.1
+++ gnu/usr.bin/binutils215/ld/Makefile 3 Sep 2005 19:18:36 -0000
@@ -38,7 +38,7 @@
CFLAGS+= -I${SRCDIR}/ld -I${SRCDIR}/bfd -I${.OBJDIR}/../libbfd
CFLAGS+= -DBINDIR=\"${TOOLS_PREFIX}${LIBEXEC_BINUTILS}\"
CFLAGS+= -DTOOLBINDIR=\"${TOOLS_PREFIX}${LIBEXEC_BINUTILS}\"
-NOSHARED?= yes
+NO_SHARED?= yes
DPADD= ${RELTOP}/libbfd/libbfd.a
DPADD+= ${RELTOP}/libiberty/libiberty.a
LDADD= ${DPADD}
Index: gnu/usr.bin/binutils215/ranlib/Makefile
===================================================================
RCS file: /home/carl/cvs/dfly/gnu/usr.bin/binutils215/ranlib/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- gnu/usr.bin/binutils215/ranlib/Makefile 3 Sep 2005 01:40:47 -0000 1.1.1.1
+++ gnu/usr.bin/binutils215/ranlib/Makefile 3 Sep 2005 19:18:49 -0000
@@ -10,7 +10,7 @@
CFLAGS+= -I${SRCDIR}/binutils
CFLAGS+= -I${SRCDIR}/bfd -I${.OBJDIR}/../libbfd
-NOSHARED?= yes
+NO_SHARED?= yes
DPADD= ${RELTOP}/libbinutils/libbinutils.a
DPADD+= ${RELTOP}/libbfd/libbfd.a
DPADD+= ${RELTOP}/libiberty/libiberty.a
Index: gnu/usr.bin/cc34/cc1/Makefile
===================================================================
RCS file: /home/carl/cvs/dfly/gnu/usr.bin/cc34/cc1/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- gnu/usr.bin/cc34/cc1/Makefile 3 Sep 2005 01:40:47 -0000 1.1.1.1
+++ gnu/usr.bin/cc34/cc1/Makefile 3 Sep 2005 19:19:07 -0000
@@ -8,7 +8,7 @@
PROG= cc1
NOMAN= 1
-NOSHARED?= yes
+NO_SHARED?= yes
SRCS= c-lang.c c-parse.y c-pretty-print.c stub-objc.c attribs.c c-errors.c
SRCS+= c-lex.c c-pragma.c c-decl.c c-typeck.c c-convert.c c-aux-info.c
Index: gnu/usr.bin/cc34/cc1obj/Makefile
===================================================================
RCS file: /home/carl/cvs/dfly/gnu/usr.bin/cc34/cc1obj/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- gnu/usr.bin/cc34/cc1obj/Makefile 3 Sep 2005 01:40:47 -0000 1.1.1.1
+++ gnu/usr.bin/cc34/cc1obj/Makefile 3 Sep 2005 19:19:18 -0000
@@ -10,7 +10,7 @@
PROG= cc1obj
NOMAN= 1
-NOSHARED?= yes
+NO_SHARED?= yes
SRCS+= objc-lang.c objc-parse.y objc-act.c attribs.c c-errors.c c-lex.c
SRCS+= c-pragma.c c-decl.c c-typeck.c c-convert.c c-aux-info.c c-common.c
Index: gnu/usr.bin/cc34/f771/Makefile
===================================================================
RCS file: /home/carl/cvs/dfly/gnu/usr.bin/cc34/f771/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- gnu/usr.bin/cc34/f771/Makefile 3 Sep 2005 01:40:48 -0000 1.1.1.1
+++ gnu/usr.bin/cc34/f771/Makefile 3 Sep 2005 19:19:32 -0000
@@ -10,7 +10,7 @@
PROG= f771
NOMAN= 1
-NOSHARED?= yes
+NO_SHARED?= yes
SRCS= bad.c bit.c bld.c com.c data.c equiv.c expr.c global.c implic.c info.c
SRCS+= intrin.c lab.c lex.c malloc.c name.c parse.c src.c st.c sta.c stb.c
Index: gnu/usr.bin/cc40/cc1/Makefile
===================================================================
RCS file: /home/carl/cvs/dfly/gnu/usr.bin/cc40/cc1/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- gnu/usr.bin/cc40/cc1/Makefile 3 Sep 2005 01:40:48 -0000 1.1.1.1
+++ gnu/usr.bin/cc40/cc1/Makefile 3 Sep 2005 19:19:48 -0000
@@ -8,7 +8,7 @@
PROG= cc1
NOMAN= 1
-NOSHARED?= yes
+NO_SHARED?= yes
SRCS= c-parse.y c-lang.c stub-objc.c
Index: gnu/usr.bin/man/man/Makefile
===================================================================
RCS file: /home/carl/cvs/dfly/gnu/usr.bin/man/man/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- gnu/usr.bin/man/man/Makefile 3 Sep 2005 01:40:49 -0000 1.1.1.1
+++ gnu/usr.bin/man/man/Makefile 3 Sep 2005 17:30:09 -0000
@@ -8,7 +8,7 @@
SRCS= man.c manpath.c glob.c
BINOWN= man
BINMODE=4555
-.if !defined(NOFSCHG)
+.if !defined(NO_FSCHG)
INSTALLFLAGS= -fschg
.endif
Index: gnu/usr.bin/tar/Makefile
===================================================================
RCS file: /home/carl/cvs/dfly/gnu/usr.bin/tar/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- gnu/usr.bin/tar/Makefile 3 Sep 2005 01:40:49 -0000 1.1.1.1
+++ gnu/usr.bin/tar/Makefile 3 Sep 2005 19:20:02 -0000
@@ -23,7 +23,7 @@
CFLAGS+= -DHAVE_CONFIG_H -I${.CURDIR} -I${TARDIR}/lib -I${TARDIR}/src
-NOSHARED?= YES
+NO_SHARED?= YES
gtar.1: tar.1
cp ${.CURDIR}/tar.1 ${.TARGET}
Index: lib/Makefile
===================================================================
RCS file: /home/carl/cvs/dfly/lib/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- lib/Makefile 3 Sep 2005 01:40:49 -0000 1.1.1.1
+++ lib/Makefile 3 Sep 2005 17:16:15 -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/i18n_module/Makefile.inc
===================================================================
RCS file: /home/carl/cvs/dfly/lib/i18n_module/Makefile.inc,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile.inc
--- lib/i18n_module/Makefile.inc 3 Sep 2005 01:40:51 -0000 1.1.1.1
+++ lib/i18n_module/Makefile.inc 3 Sep 2005 19:07:58 -0000
@@ -1,6 +1,6 @@
# $DragonFly: src/lib/i18n_module/Makefile.inc,v 1.2 2005/07/28 19:43:55 joerg Exp $
-NOPROFILE= 1
+NO_PROFILE= 1
.include "../Makefile.shlib"
SHLIB_MAJOR= ${MODULE_SHLIB_MAJOR}
Index: lib/libc_rtld/Makefile
===================================================================
RCS file: /home/carl/cvs/dfly/lib/libc_rtld/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- lib/libc_rtld/Makefile 3 Sep 2005 01:40:55 -0000 1.1.1.1
+++ lib/libc_rtld/Makefile 3 Sep 2005 19:08:10 -0000
@@ -3,7 +3,7 @@
LIB= c_rtld
INTERNALLIB=
INSTALL_PIC_ARCHIVE=
-NOPROFILE=
+NO_PROFILE=
CFLAGS+=-I${.CURDIR}/../libc/include
CFLAGS+=-I${.CURDIR}/../../include -D__thread=
Index: lib/libcompat/Makefile
===================================================================
RCS file: /home/carl/cvs/dfly/lib/libcompat/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- lib/libcompat/Makefile 3 Sep 2005 01:40:55 -0000 1.1.1.1
+++ lib/libcompat/Makefile 3 Sep 2005 19:14:42 -0000
@@ -5,7 +5,7 @@
LIB=compat
CFLAGS+=-DLIBC_SCCS -DSYSLIBC_SCCS -I${.CURDIR}/../libc/locale
AINC= -I${.CURDIR}/../libc/${MACHINE_ARCH}
-NOPIC=
+NO_PIC=
.PATH: ${.CURDIR}/4.1/${MACHINE_ARCH} ${.CURDIR}/4.1 \
${.CURDIR}/4.3/${MACHINE_ARCH} ${.CURDIR}/4.3 \
Index: lib/libcrypt/Makefile
===================================================================
RCS file: /home/carl/cvs/dfly/lib/libcrypt/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- lib/libcrypt/Makefile 3 Sep 2005 01:40:58 -0000 1.1.1.1
+++ lib/libcrypt/Makefile 3 Sep 2005 16:47:39 -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/libdisk/Makefile
===================================================================
RCS file: /home/carl/cvs/dfly/lib/libdisk/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- lib/libdisk/Makefile 3 Sep 2005 01:40:58 -0000 1.1.1.1
+++ lib/libdisk/Makefile 3 Sep 2005 19:08:26 -0000
@@ -9,8 +9,8 @@
# Remove KERN_DISKS_BROKEN when kern.disks sysctl returns disks in sorted order
CFLAGS+= -Wall
CLEANFILES+= tmp.c tst01 tst01.o
-NOPROFILE= yes
-NOPIC= yes
+NO_PROFILE= yes
+NO_PIC= yes
MAN= libdisk.3
MLINKS+= libdisk.3 Open_Disk.3 \
Index: lib/libfetch/Makefile
RCS file: /home/carl/cvs/dfly/lib/libfetch/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- lib/libfetch/Makefile 3 Sep 2005 01:40:58 -0000 1.1.1.1
+++ lib/libfetch/Makefile 3 Sep 2005 16:47:50 -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/libipsec/Makefile
===================================================================
RCS file: /home/carl/cvs/dfly/lib/libipsec/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- lib/libipsec/Makefile 3 Sep 2005 01:40:58 -0000 1.1.1.1
+++ lib/libipsec/Makefile 3 Sep 2005 18:11:21 -0000
@@ -31,7 +31,7 @@
SHLIB_MAJOR= 2
CFLAGS+=-I. -I${.CURDIR}
CFLAGS+=-DIPSEC_DEBUG -DIPSEC
-.if !defined(NOINET6)
+.if !defined(NO_INET6)
CFLAGS+=-DINET6
.endif
Index: lib/libncurses/libncurses/Makefile
===================================================================
RCS file: /home/carl/cvs/dfly/lib/libncurses/libncurses/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- lib/libncurses/libncurses/Makefile 3 Sep 2005 01:40:59 -0000 1.1.1.1
+++ lib/libncurses/libncurses/Makefile 3 Sep 2005 19:14:57 -0000
@@ -245,7 +245,7 @@
SYMLINKS+=libncurses.a ${LIBDIR}/libmytinfo.a
SYMLINKS+=libncurses.a ${LIBDIR}/libtermlib.a
SYMLINKS+=libncurses.a ${LIBDIR}/libtermcap.a
-.if !defined(NOPIC)
+.if !defined(NO_PIC)
# no need for major at all, it's an ld-time redirection only
SYMLINKS+=libncurses.so ${SHLIBDIR}/libcurses.so
SYMLINKS+=libncurses.so ${SHLIBDIR}/libtermcap.so
@@ -253,7 +253,7 @@
SYMLINKS+=libncurses.so ${SHLIBDIR}/libmytinfo.so
SYMLINKS+=libncurses.so ${SHLIBDIR}/libtinfo.so
.endif
-.if !defined(NOPROFILE)
+.if !defined(NO_PROFILE)
SYMLINKS+=libncurses.a ${PROFLIBDIR}/libcurses.a
SYMLINKS+=libncurses.a ${PROFLIBDIR}/libtermcap.a
SYMLINKS+=libncurses.a ${PROFLIBDIR}/libtermlib.a
Index: lib/libpcap/Makefile
===================================================================
RCS file: /home/carl/cvs/dfly/lib/libpcap/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- lib/libpcap/Makefile 3 Sep 2005 01:40:59 -0000 1.1.1.1
+++ lib/libpcap/Makefile 3 Sep 2005 18:11:36 -0000
@@ -13,7 +13,7 @@
CFLAGS+=-DHAVE_CONFIG_H -Dyylval=pcap_lval -I${.CURDIR} -I.
CFLAGS+=-D_U_="__attribute__((unused))"
-.if !defined(NOINET6)
+.if !defined(NO_INET6)
CFLAGS+=-DINET6
.endif
Index: lib/libstand/Makefile
===================================================================
RCS file: /home/carl/cvs/dfly/lib/libstand/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- lib/libstand/Makefile 3 Sep 2005 01:40:59 -0000 1.1.1.1
+++ lib/libstand/Makefile 3 Sep 2005 19:09:38 -0000
@@ -9,8 +9,8 @@
#
LIB= stand
-NOPROFILE= YES
-NOPIC= YES
+NO_PROFILE= YES
+NO_PIC= YES
INCS= stand.h
MAN= libstand.3
Index: lib/libwrap/Makefile
===================================================================
RCS file: /home/carl/cvs/dfly/lib/libwrap/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- lib/libwrap/Makefile 3 Sep 2005 01:41:00 -0000 1.1.1.1
+++ lib/libwrap/Makefile 3 Sep 2005 18:11:51 -0000
@@ -16,7 +16,7 @@
-DSEVERITY=LOG_INFO -DRFC931_TIMEOUT=10 \
-DHOSTS_DENY=\"/etc/hosts.deny\" -DHOSTS_ALLOW=\"/etc/hosts.allow\" \
-DSYS_ERRLIST_DEFINED -DALWAYS_HOSTNAME
-.if !defined(NOINET6)
+.if !defined(NO_INET6)
CFLAGS+=-DINET6
.endif
Index: lib/liby/Makefile
===================================================================
RCS file: /home/carl/cvs/dfly/lib/liby/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- lib/liby/Makefile 3 Sep 2005 01:41:00 -0000 1.1.1.1
+++ lib/liby/Makefile 3 Sep 2005 19:15:12 -0000
@@ -6,6 +6,6 @@
SRCS= main.c yyerror.c
-NOPIC= true
+NO_PIC= true
.include <bsd.lib.mk>
Index: lib/pam_module/Makefile
===================================================================
RCS file: /home/carl/cvs/dfly/lib/pam_module/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- lib/pam_module/Makefile 3 Sep 2005 10:19:44 -0000 1.2
+++ lib/pam_module/Makefile 3 Sep 2005 16:48:02 -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(NO_KERBEROS) && !defined(NOCRYPT) && !defined(NO_OPENSSL)
+.if !defined(NO_KERBEROS) && !defined(NO_CRYPT) && !defined(NO_OPENSSL)
SUBDIR+= pam_krb5
.endif
Index: lib/pam_module/Makefile.inc
===================================================================
RCS file: /home/carl/cvs/dfly/lib/pam_module/Makefile.inc,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile.inc
--- lib/pam_module/Makefile.inc 3 Sep 2005 01:41:00 -0000 1.1.1.1
+++ lib/pam_module/Makefile.inc 3 Sep 2005 19:09:51 -0000
@@ -2,8 +2,8 @@
SHLIB_NAME= ${LIB}.so.${MODULE_SHLIB_MAJOR}
SHLIB_MAJOR= ${MODULE_SHLIB_MAJOR}
-NOINSTALLLIB= yes
-NOPROFILE= yes
+NO_INSTALLLIB= yes
+NO_PROFILE= yes
TARGET_LIBDIR= /usr/lib/security
TARGET_SHLIBDIR= /usr/lib/security
Index: libexec/Makefile
===================================================================
RCS file: /home/carl/cvs/dfly/libexec/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- libexec/Makefile 3 Sep 2005 01:41:00 -0000 1.1.1.1
+++ libexec/Makefile 3 Sep 2005 18:39:14 -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: libexec/ftpd/Makefile
===================================================================
RCS file: /home/carl/cvs/dfly/libexec/ftpd/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- libexec/ftpd/Makefile 3 Sep 2005 01:41:00 -0000 1.1.1.1
+++ libexec/ftpd/Makefile 3 Sep 2005 18:34:40 -0000
@@ -7,7 +7,9 @@
SRCS= ftpd.c ftpcmd.y logwtmp.c popen.c skey-stuff.c
CFLAGS+=-DSETPROCTITLE -DSKEY -DLOGIN_CAP -DVIRTUAL_HOSTING -Wall
+.if !defined(NO_INET6)
CFLAGS+=-DINET6
+.endif
YFLAGS=
LDADD= -lskey -lmd -lcrypt -lutil
@@ -21,7 +23,7 @@
DPADD+= ${LIBM}
LDADD+= -lm
-.if defined(NOPAM)
+.if defined(NO_PAM)
CFLAGS+=-DNOPAM
.else
DPADD+= ${LIBPAM}
Index: libexec/lukemftpd/Makefile
===================================================================
RCS file: /home/carl/cvs/dfly/libexec/lukemftpd/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- libexec/lukemftpd/Makefile 3 Sep 2005 01:41:00 -0000 1.1.1.1
+++ libexec/lukemftpd/Makefile 3 Sep 2005 18:37:37 -0000
@@ -33,7 +33,7 @@
sed -e 's/^main(/ls_main(/g' -e 's,extern.h,${LSDIR}/extern.h,' \
${.ALLSRC} > ${.TARGET}
-.if !defined(NOPAM)
+.if !defined(NO_PAM)
CFLAGS+= -DUSE_PAM
DPADD+= ${LIBPAM}
LDADD+= ${MINUSLPAM}
Index: libexec/tcpd/Makefile
===================================================================
RCS file: /home/carl/cvs/dfly/libexec/tcpd/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- libexec/tcpd/Makefile 3 Sep 2005 01:41:01 -0000 1.1.1.1
+++ libexec/tcpd/Makefile 3 Sep 2005 18:12:04 -0000
@@ -7,7 +7,7 @@
-DSEVERITY=LOG_INFO -DRFC931_TIMEOUT=10 \
-DHOSTS_DENY=\"/etc/hosts.deny\" -DHOSTS_ALLOW=\"/etc/hosts.allow\" \
-DFACILITY=LOG_DAEMON
-.if !defined(NOINET6)
+.if !defined(NO_INET6)
CFLAGS+=-DINET6
.endif
Index: sbin/Makefile.inc
===================================================================
RCS file: /home/carl/cvs/dfly/sbin/Makefile.inc,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile.inc
--- sbin/Makefile.inc 3 Sep 2005 01:41:01 -0000 1.1.1.1
+++ sbin/Makefile.inc 3 Sep 2005 19:20:12 -0000
@@ -3,4 +3,4 @@
# $DragonFly: src/sbin/Makefile.inc,v 1.2 2003/06/17 04:27:31 dillon Exp $
BINDIR?= /sbin
-NOSHARED?= YES
+NO_SHARED?= YES
Index: sbin/init/Makefile
===================================================================
RCS file: /home/carl/cvs/dfly/sbin/init/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- sbin/init/Makefile 3 Sep 2005 01:41:01 -0000 1.1.1.1
+++ sbin/init/Makefile 3 Sep 2005 17:30:20 -0000
@@ -7,7 +7,7 @@
MLINKS= init.8 securelevel.8
BINMODE=500
INSTALLFLAGS= -b -B.bak
-.if !defined(NOFSCHG)
+.if !defined(NO_FSCHG)
INSTALLFLAGS+= -fschg
.endif
CFLAGS+=-DDEBUGSHELL -DSECURE -DLOGIN_CAP -DCOMPAT_SYSV_INIT
Index: sbin/mount_smbfs/Makefile
===================================================================
RCS file: /home/carl/cvs/dfly/sbin/mount_smbfs/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- sbin/mount_smbfs/Makefile 3 Sep 2005 01:41:02 -0000 1.1.1.1
+++ sbin/mount_smbfs/Makefile 3 Sep 2005 19:20:48 -0000
@@ -16,7 +16,7 @@
# Needs to be dynamically linked for optional dlopen() access to
# userland libiconv (see the -E option).
#
-NOSHARED?= NO
+NO_SHARED?= NO
.PATH: ${CONTRIBDIR}/mount_smbfs
Index: secure/lib/Makefile
===================================================================
RCS file: /home/carl/cvs/dfly/secure/lib/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- secure/lib/Makefile 3 Sep 2005 10:19:46 -0000 1.2
+++ secure/lib/Makefile 3 Sep 2005 16:48:25 -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(NO_KERBEROS)
+.if !defined(NO_CRYPT) && !defined(NO_OPENSSL) && defined(NO_KERBEROS)
SUBDIR+=libtelnet
.endif
.if !defined(NO_OPENSSL)
Index: secure/lib/libcipher/Makefile
===================================================================
RCS file: /home/carl/cvs/dfly/secure/lib/libcipher/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- secure/lib/libcipher/Makefile 3 Sep 2005 01:41:02 -0000 1.1.1.1
+++ secure/lib/libcipher/Makefile 3 Sep 2005 19:10:49 -0000
@@ -6,7 +6,7 @@
LIB= cipher
SRCS= crypt.c
PRECIOUSLIB= yes
-#NOPROFILE= yes
+#NO_PROFILE= yes
MAN= cipher.3
MLINKS= cipher.3 encrypt.3 cipher.3 setkey.3
Index: secure/libexec/Makefile
===================================================================
RCS file: /home/carl/cvs/dfly/secure/libexec/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- secure/libexec/Makefile 3 Sep 2005 10:19:50 -0000 1.2
+++ secure/libexec/Makefile 3 Sep 2005 16:48:40 -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(NO_KERBEROS) && !defined(NO_OPENSSL)
+.if !defined(NO_CRYPT) && defined(NO_KERBEROS) && !defined(NO_OPENSSL)
SUBDIR= telnetd
.endif
.if !defined(NO_OPENSSL) && !defined(NO_OPENSSH)
Index: secure/usr.bin/Makefile
===================================================================
RCS file: /home/carl/cvs/dfly/secure/usr.bin/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- secure/usr.bin/Makefile 3 Sep 2005 10:19:51 -0000 1.2
+++ secure/usr.bin/Makefile 3 Sep 2005 16:48:51 -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(NO_KERBEROS)
+.if !defined(NO_CRYPT) && !defined(NO_OPENSSL) && defined(NO_KERBEROS)
SUBDIR+=telnet
.endif
.if !defined(NO_OPENSSL)
Index: share/doc/usd/Makefile
===================================================================
RCS file: /home/carl/cvs/dfly/share/doc/usd/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- share/doc/usd/Makefile 3 Sep 2005 01:41:04 -0000 1.1.1.1
+++ share/doc/usd/Makefile 3 Sep 2005 17:08:34 -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/carl/cvs/dfly/share/man/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- share/man/Makefile 3 Sep 2005 01:41:06 -0000 1.1.1.1
+++ share/man/Makefile 3 Sep 2005 16:49:02 -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/man3/pthread.3
===================================================================
RCS file: /home/carl/cvs/dfly/share/man/man3/pthread.3,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 pthread.3
--- share/man/man3/pthread.3 3 Sep 2005 01:41:06 -0000 1.1.1.1
+++ share/man/man3/pthread.3 3 Sep 2005 17:16:01 -0000
@@ -443,7 +443,7 @@
.Fa libc_r
is built as part of a 'make world'. To disable the build of
.Fa libc_r
-you must supply the '-DNOLIBC_R' option to
+you must supply the '-DNO_LIBC_R' option to
.Xr make 1 .
.Pp
A
Index: share/man/man5/make.conf.5
===================================================================
RCS file: /home/carl/cvs/dfly/share/man/man5/make.conf.5,v
retrieving revision 1.2
diff -u -r1.2 make.conf.5
--- share/man/man5/make.conf.5 3 Sep 2005 10:19:59 -0000 1.2
+++ share/man/man5/make.conf.5 3 Sep 2005 17:28:38 -0000
@@ -50,8 +50,6 @@
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.
.Pp
@@ -64,11 +62,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 broad areas: the world, the kernel,
+and documentations.
Variables set in
.Nm
-may be applicable during builds in one, two, or all four of these
+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
@@ -147,12 +145,6 @@
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.
@@ -360,43 +352,6 @@
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.
@@ -409,6 +364,10 @@
It is
.Em "YOUR RESPONSIBILITY"
to determine if you can legally use IDEA.
+.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.
.It Va ENABLE_SUID_SSH
.Pq Vt bool
Set this to install
@@ -441,15 +400,6 @@
.It Va NO_KERBEROS
.Pq Vt bool
Set to not build Kerberos (enabled by default).
-.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.
-.It Va KRB5_HOME
-.Pq Vt str
-If you want to install the MIT Kerberos5 port somewhere other than
-.Pa /usr/local ,
-define this.
.It Va NO_LPR
.Pq Vt bool
Set to not build
@@ -460,9 +410,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
@@ -470,6 +417,9 @@
on
.Pa /dev
during install.
+.It Va NOMAN
+.Pq Vt bool
+Set to not build manual pages.
.It Va NO_OBJC
.Pq Vt bool
Set to not build Objective C support.
@@ -494,55 +444,45 @@
.Pq Vt bool
Set to not compile in X\-Windows support (e.g.\&
.Xr doscmd 1 ) .
-.It Va NOCLEAN
+.It Va NO_CLEAN
.Pq Vt bool
Set this to disable cleaning during
.Dq Li "make buildworld" .
This should not be set unless you know what you are doing.
-.It Va NOCLEANDIR
+.It Va NO_CLEANDIR
.Pq Vt bool
Set this to run
.Dq Li "${MAKE} clean"
instead of
.Dq Li "${MAKE} cleandir" .
-.It Va NOCRYPT
+.It Va NO_CRYPT
.Pq Vt bool
Set to not build any crypto code.
-.It Va NOGAMES
+.It Va NO_GAMES
.Pq Vt bool
Set to not build games.
-.It Va NOINFO
+.It Va NO_INFO
.Pq Vt bool
Set to not make or install
.Xr info 5
files.
-.It Va NOLIBC_R
+.It Va NO_LIBC_R
.Pq Vt bool
Set to not build
.Nm libc_r
(reentrant version of
.Nm libc ) .
-.It Va NOMANCOMPRESS
+.It Va NO_MANCOMPRESS
.Pq Vt bool
Set to install man pages uncompressed.
-.It Va NOPERL
-.Pq Vt bool
-Set to avoid building
-.Xr perl 1 .
-.It Va NOPROFILE
+.It Va NO_PROFILE
.Pq Vt bool
Set to avoid compiling profiled libraries.
-.It Va NOSHARE
+.It Va NO_SHARE
.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
@@ -688,10 +628,6 @@
.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.
-.Pa /usr/local .
.It Va LOCALBASE
.Pq Vt str
Set this to the base directory that non\-X ports should be
@@ -836,49 +772,10 @@
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
Index: share/mk/bsd.info.mk
===================================================================
RCS file: /home/carl/cvs/dfly/share/mk/bsd.info.mk,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 bsd.info.mk
--- share/mk/bsd.info.mk 3 Sep 2005 01:41:08 -0000 1.1.1.1
+++ share/mk/bsd.info.mk 3 Sep 2005 17:13:17 -0000
@@ -54,9 +54,9 @@
#
# MAKEINFOFLAGS Options for ${MAKEINFO} command. [--no-split]
#
-# NOINFO Do not make or install info files. [not set]
+# NO_INFO Do not make or install info files. [not set]
#
-# NOINFOCOMPRESS If you do not want info files be
+# NO_INFOCOMPRESS If you do not want info files be
# compressed when they are installed. [not set]
#
# TEX A program for converting tex files into dvi files [tex]
@@ -130,9 +130,9 @@
IFILENS+= ${INFO:S/$/.${_f}/}
.endfor
-.if !defined(NOINFO)
+.if !defined(NO_INFO)
CLEANFILES+= ${IFILENS}
-.if !defined(NOINFOCOMPRESS)
+.if !defined(NO_INFOCOMPRESS)
CLEANFILES+= ${IFILENS:S/$/${ICOMPRESS_EXT}/}
IFILES= ${IFILENS:S/$/${ICOMPRESS_EXT}/:S/.html${ICOMPRESS_EXT}/.html/}
all: ${IFILES}
@@ -179,7 +179,7 @@
CLEANFILES+= ${INFO:S/$/.info.*.html/} ${INFO:S/$/.info/}
.endif
-.if !defined(NOINFO) && defined(INFO)
+.if !defined(NO_INFO) && defined(INFO)
install: ${INSTALLINFODIRS}
.if !empty(IFILES:N*.html)
${INSTALL} -o ${INFOOWN} -g ${INFOGRP} -m ${INFOMODE} \
Index: share/mk/bsd.lib.mk
===================================================================
RCS file: /home/carl/cvs/dfly/share/mk/bsd.lib.mk,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 bsd.lib.mk
--- share/mk/bsd.lib.mk 3 Sep 2005 01:41:08 -0000 1.1.1.1
+++ share/mk/bsd.lib.mk 3 Sep 2005 19:15:26 -0000
@@ -9,7 +9,7 @@
# SHLIB_NAME will be defined only if we are to create a shared library.
# SHLIB_LINK will be defined only if we are to create a link to it.
# INSTALL_PIC_ARCHIVE will be defined only if we are to create a PIC archive.
-.if defined(NOPIC)
+.if defined(NO_PIC)
.undef SHLIB_NAME
.undef INSTALL_PIC_ARCHIVE
.else
@@ -163,7 +163,7 @@
${RANLIB} ${.TARGET}
.endif
-.if !defined(INTERNALLIB) && !defined(NOPROFILE) && defined(LIB) && !empty(LIB)
+.if !defined(INTERNALLIB) && !defined(NO_PROFILE) && defined(LIB) && !empty(LIB)
_LIBS+= lib${LIB}_p.a
POBJS+= ${OBJS:.o=.po} ${STATICOBJS:.o=.po}
@@ -222,7 +222,7 @@
.if !target(install)
-.if defined(PRECIOUSLIB) && !defined(NOFSCHG)
+.if defined(PRECIOUSLIB) && !defined(NO_FSCHG)
SHLINSTALLFLAGS+= -fschg
.endif
@@ -239,11 +239,11 @@
realinstall: _libinstall
.ORDER: beforeinstall _libinstall
_libinstall:
-.if defined(LIB) && !empty(LIB) && !defined(NOINSTALLLIB)
+.if defined(LIB) && !empty(LIB) && !defined(NO_INSTALLLIB)
${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
${_INSTALLFLAGS} lib${LIB}.a ${DESTDIR}${TARGET_LIBDIR}
.endif
-.if !defined(NOPROFILE) && defined(LIB) && !empty(LIB)
+.if !defined(NO_PROFILE) && defined(LIB) && !empty(LIB)
${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
${_INSTALLFLAGS} lib${LIB}_p.a ${DESTDIR}${TARGET_PROFLIBDIR}/lib${LIB}.a
.endif
@@ -298,7 +298,7 @@
rm -f a.out ${OBJS} ${OBJS:S/$/.tmp/} ${STATICOBJS}
.endif
.if !defined(INTERNALLIB)
-.if !defined(NOPROFILE) && defined(LIB) && !empty(LIB)
+.if !defined(NO_PROFILE) && defined(LIB) && !empty(LIB)
rm -f ${POBJS} ${POBJS:S/$/.tmp/}
.endif
.if defined(SHLIB_NAME) || \
Index: share/mk/bsd.libnames.mk
===================================================================
RCS file: /home/carl/cvs/dfly/share/mk/bsd.libnames.mk,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 bsd.libnames.mk
--- share/mk/bsd.libnames.mk 3 Sep 2005 01:41:08 -0000 1.1.1.1
+++ share/mk/bsd.libnames.mk 3 Sep 2005 19:21:06 -0000
@@ -75,7 +75,7 @@
# so we have to specify them explictly.
LIBPAM?= ${DESTDIR}${LIBDIR}/libpam.a
MINUSLPAM?= -lpam
-.if defined(NOSHARED) && ${NOSHARED} != "no" && ${NOSHARED} != "NO"
+.if defined(NO_SHARED) && ${NO_SHARED} != "no" && ${NO_SHARED} != "NO"
LIBPAM+= ${LIBRADIUS} ${LIBTACPLUS} ${LIBSKEY} ${LIBCRYPT} ${LIBMD} \
${LIBUTIL}
MINUSLPAM+= -lradius -ltacplus -lskey -lcrypt -lmd -lutil
Index: share/mk/bsd.man.mk
===================================================================
RCS file: /home/carl/cvs/dfly/share/mk/bsd.man.mk,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 bsd.man.mk
--- share/mk/bsd.man.mk 3 Sep 2005 01:41:08 -0000 1.1.1.1
+++ share/mk/bsd.man.mk 3 Sep 2005 18:41:02 -0000
@@ -31,7 +31,7 @@
# second, and there may be multiple pairs. The files
# are hard-linked.
#
-# NOMANCOMPRESS If you do not want unformatted manual pages to be
+# NO_MANCOMPRESS If you do not want unformatted manual pages to be
# compressed when they are installed. [not set]
#
# NOMLINKS If you do not want install manual page links. [not set]
@@ -78,10 +78,10 @@
_manpages:
all-man: _manpages
-.if defined(NOMANCOMPRESS)
+.if defined(NO_MANCOMPRESS)
# Make special arrangements to filter to a temporary file at build time
-# for NOMANCOMPRESS.
+# for NO_MANCOMPRESS.
.if defined(MANFILTER)
FILTEXTENSION= .filt
.else
@@ -163,7 +163,7 @@
_maninstall:
.if defined(MAN) && !empty(MAN)
_maninstall: ${MAN}
-.if defined(NOMANCOMPRESS)
+.if defined(NO_MANCOMPRESS)
.if defined(MANFILTER)
.for page in ${MAN}
${MINSTALL} ${page:T:S/$/${FILTEXTENSION}/g} \
Index: share/mk/bsd.prog.mk
===================================================================
RCS file: /home/carl/cvs/dfly/share/mk/bsd.prog.mk,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 bsd.prog.mk
--- share/mk/bsd.prog.mk 3 Sep 2005 01:41:08 -0000 1.1.1.1
+++ share/mk/bsd.prog.mk 3 Sep 2005 19:21:27 -0000
@@ -12,7 +12,7 @@
STRIP?= -s
.endif
-.if defined(NOSHARED) && ( ${NOSHARED} != "no" && ${NOSHARED} != "NO" )
+.if defined(NO_SHARED) && ( ${NO_SHARED} != "no" && ${NO_SHARED} != "NO" )
LDFLAGS+= -static
.endif
Index: sys/net/ipfilter/Makefile
===================================================================
RCS file: /home/carl/cvs/dfly/sys/net/ipfilter/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- sys/net/ipfilter/Makefile 3 Sep 2005 01:41:21 -0000 1.1.1.1
+++ sys/net/ipfilter/Makefile 3 Sep 2005 18:12:22 -0000
@@ -6,7 +6,7 @@
SRCS= mlfk_ipl.c ip_nat.c ip_frag.c ip_state.c ip_proxy.c ip_auth.c \
ip_log.c ip_fil.c fil.c
NOMAN=
-.if !defined(NOINET6)
+.if !defined(NO_INET6)
CFLAGS+= -DUSE_INET6
.endif
CFLAGS+= -DIPFILTER_LKM -DIPFILTER_LOG
Index: sys/netgraph/Makefile
===================================================================
RCS file: /home/carl/cvs/dfly/sys/netgraph/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- sys/netgraph/Makefile 3 Sep 2005 01:41:21 -0000 1.1.1.1
+++ sys/netgraph/Makefile 3 Sep 2005 16:50:04 -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/bzip2/Makefile
===================================================================
RCS file: /home/carl/cvs/dfly/usr.bin/bzip2/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- usr.bin/bzip2/Makefile 3 Sep 2005 01:41:25 -0000 1.1.1.1
+++ usr.bin/bzip2/Makefile 3 Sep 2005 19:21:36 -0000
@@ -15,7 +15,7 @@
DPADD= ${LIBBZ2}
LDADD= -lbz2
-NOSHARED?= YES
+NO_SHARED?= YES
LINKS= ${BINDIR}/bzip2 ${BINDIR}/bunzip2
LINKS+= ${BINDIR}/bzip2 ${BINDIR}/bzcat
Index: usr.bin/checkpt/Makefile
===================================================================
RCS file: /home/carl/cvs/dfly/usr.bin/checkpt/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- usr.bin/checkpt/Makefile 3 Sep 2005 01:41:25 -0000 1.1.1.1
+++ usr.bin/checkpt/Makefile 3 Sep 2005 19:21:44 -0000
@@ -3,6 +3,6 @@
PROG= checkpt
WARNS?= 6
SRCS= checkpt.c
-NOSHARED?= YES
+NO_SHARED?= YES
.include <bsd.prog.mk>
Index: usr.bin/chflags/Makefile
===================================================================
RCS file: /home/carl/cvs/dfly/usr.bin/chflags/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- usr.bin/chflags/Makefile 3 Sep 2005 01:41:25 -0000 1.1.1.1
+++ usr.bin/chflags/Makefile 3 Sep 2005 19:21:51 -0000
@@ -2,7 +2,7 @@
# $FreeBSD: src/usr.bin/chflags/Makefile,v 1.8.2.2 2001/08/01 23:09:18 obrien Exp $
# $DragonFly: src/usr.bin/chflags/Makefile,v 1.3 2004/11/29 20:27:30 liamfoy Exp $
-NOSHARED?=yes
+NO_SHARED?=yes
PROG= chflags
SRCS= chflags.c
Index: usr.bin/chpass/Makefile
===================================================================
RCS file: /home/carl/cvs/dfly/usr.bin/chpass/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- usr.bin/chpass/Makefile 3 Sep 2005 01:41:25 -0000 1.1.1.1
+++ usr.bin/chpass/Makefile 3 Sep 2005 17:30:44 -0000
@@ -66,7 +66,7 @@
chflags noschg ${DESTDIR}${BINDIR}/$i || true
.endfor
-.if !defined(NOFSCHG)
+.if !defined(NO_FSCHG)
afterinstall:
-chflags schg ${DESTDIR}${BINDIR}/chpass
.endif
Index: usr.bin/fetch/Makefile
===================================================================
RCS file: /home/carl/cvs/dfly/usr.bin/fetch/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- usr.bin/fetch/Makefile 3 Sep 2005 01:41:26 -0000 1.1.1.1
+++ usr.bin/fetch/Makefile 3 Sep 2005 16:50:54 -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/gzip/Makefile
===================================================================
RCS file: /home/carl/cvs/dfly/usr.bin/gzip/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- usr.bin/gzip/Makefile 3 Sep 2005 01:41:26 -0000 1.1.1.1
+++ usr.bin/gzip/Makefile 3 Sep 2005 19:21:58 -0000
@@ -9,7 +9,7 @@
LDADD= -lz
WARNS= 6
-NOSHARED?= yes
+NO_SHARED?= yes
.if defined(NO_GZIP_UNCOMPRESS)
CFLAGS+= -DNO_COMPRESS_SUPPORT
Index: usr.bin/lex/lib/Makefile
===================================================================
RCS file: /home/carl/cvs/dfly/usr.bin/lex/lib/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- usr.bin/lex/lib/Makefile 3 Sep 2005 01:41:27 -0000 1.1.1.1
+++ usr.bin/lex/lib/Makefile 3 Sep 2005 19:15:37 -0000
@@ -3,12 +3,12 @@
LIB= ln
SRCS= libmain.c libyywrap.c
-NOPIC= yes
+NO_PIC= yes
LINKS= ${LIBDIR}/libln.a ${LIBDIR}/libl.a
LINKS+= ${LIBDIR}/libln.a ${LIBDIR}/libfl.a
-.if !defined(NOPROFILE)
+.if !defined(NO_PROFILE)
LINKS+= ${PROFLIBDIR}/libln.a ${PROFLIBDIR}/libl.a
LINKS+= ${PROFLIBDIR}/libln.a ${PROFLIBDIR}/libfl.a
.endif
Index: usr.bin/login/Makefile
===================================================================
RCS file: /home/carl/cvs/dfly/usr.bin/login/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- usr.bin/login/Makefile 3 Sep 2005 01:41:27 -0000 1.1.1.1
+++ usr.bin/login/Makefile 3 Sep 2005 17:31:04 -0000
@@ -11,14 +11,14 @@
DPADD= ${LIBUTIL} ${LIBCRYPT}
LDADD= -lutil -lcrypt
-.if !defined(NOPAM)
+.if !defined(NO_PAM)
CFLAGS+= -DUSE_PAM
DPADD+= ${LIBPAM}
LDADD+= ${MINUSLPAM}
.endif
BINMODE=4555
-.if !defined(NOFSCHG)
+.if !defined(NO_FSCHG)
INSTALLFLAGS=-fschg
.endif
NEED_LIBNAMES= yes
Index: usr.bin/make/Makefile
===================================================================
RCS file: /home/carl/cvs/dfly/usr.bin/make/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- usr.bin/make/Makefile 3 Sep 2005 01:41:27 -0000 1.1.1.1
+++ usr.bin/make/Makefile 3 Sep 2005 19:23:40 -0000
@@ -12,7 +12,7 @@
WARNS?= 6
WARNS_WERROR= YES
-NOSHARED?= YES
+NO_SHARED?= YES
CFLAGS+=-DMAKE_VERSION=\"5200408120\"
Index: usr.bin/objformat/Makefile
===================================================================
RCS file: /home/carl/cvs/dfly/usr.bin/objformat/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- usr.bin/objformat/Makefile 3 Sep 2005 01:41:27 -0000 1.1.1.1
+++ usr.bin/objformat/Makefile 3 Sep 2005 19:23:51 -0000
@@ -3,7 +3,7 @@
PROG= objformat
CFLAGS+= -Wall
-NOSHARED?= YES
+NO_SHARED?= YES
.if defined(TARGET_ARCH)
CFLAGS+= -DTARGET_ARCH="${TARGET_ARCH}"
.endif
Index: usr.bin/opieinfo/Makefile
===================================================================
RCS file: /home/carl/cvs/dfly/usr.bin/opieinfo/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- usr.bin/opieinfo/Makefile 3 Sep 2005 01:41:27 -0000 1.1.1.1
+++ usr.bin/opieinfo/Makefile 3 Sep 2005 17:32:31 -0000
@@ -14,7 +14,7 @@
BINOWN= root
BINMODE=4555
-.if !defined(NOFSCHG)
+.if !defined(NO_FSCHG)
INSTALLFLAGS=-fschg
.endif
Index: usr.bin/opiepasswd/Makefile
===================================================================
RCS file: /home/carl/cvs/dfly/usr.bin/opiepasswd/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- usr.bin/opiepasswd/Makefile 3 Sep 2005 01:41:27 -0000 1.1.1.1
+++ usr.bin/opiepasswd/Makefile 3 Sep 2005 17:32:43 -0000
@@ -14,7 +14,7 @@
BINOWN= root
BINMODE=4555
-.if !defined(NOFSCHG)
+.if !defined(NO_FSCHG)
INSTALLFLAGS=-fschg
.endif
Index: usr.bin/passwd/Makefile
===================================================================
RCS file: /home/carl/cvs/dfly/usr.bin/passwd/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- usr.bin/passwd/Makefile 3 Sep 2005 01:41:27 -0000 1.1.1.1
+++ usr.bin/passwd/Makefile 3 Sep 2005 18:40:17 -0000
@@ -2,9 +2,7 @@
# $FreeBSD: src/usr.bin/passwd/Makefile,v 1.40.2.3 2002/07/17 19:08:22 ru Exp $
# $DragonFly: src/usr.bin/passwd/Makefile,v 1.4 2004/11/17 19:16:05 dillon Exp $
-# NOPAM is used by PicoBSD
-
-.if defined(NOPAM)
+.if defined(NO_PAM)
PROG= passwd
SRCS= local_passwd.c passwd.c pw_copy.c pw_scan.c pw_util.c
@@ -89,7 +87,7 @@
chflags noschg ${DESTDIR}${BINDIR}/$i || true
.endfor
-.if !defined(NOFSCHG)
+.if !defined(NO_FSCHG)
afterinstall:
-chflags schg ${DESTDIR}${BINDIR}/passwd
.endif
Index: usr.bin/rlogin/Makefile
===================================================================
RCS file: /home/carl/cvs/dfly/usr.bin/rlogin/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- usr.bin/rlogin/Makefile 3 Sep 2005 01:41:27 -0000 1.1.1.1
+++ usr.bin/rlogin/Makefile 3 Sep 2005 17:32:59 -0000
@@ -8,7 +8,7 @@
CFLAGS+=-Wall
BINMODE=4555
-.if !defined(NOFSCHG)
+.if !defined(NO_FSCHG)
INSTALLFLAGS=-fschg
.endif
Index: usr.bin/rsh/Makefile
===================================================================
RCS file: /home/carl/cvs/dfly/usr.bin/rsh/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- usr.bin/rsh/Makefile 3 Sep 2005 01:41:28 -0000 1.1.1.1
+++ usr.bin/rsh/Makefile 3 Sep 2005 17:33:12 -0000
@@ -8,7 +8,7 @@
WARNS?= 6
BINMODE=4555
-.if !defined(NOFSCHG)
+.if !defined(NO_FSCHG)
INSTALLFLAGS=-fschg
.endif
===================================================================
RCS file: /home/carl/cvs/dfly/usr.bin/su/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- usr.bin/su/Makefile 3 Sep 2005 10:20:03 -0000 1.2
+++ usr.bin/su/Makefile 3 Sep 2005 17:33:24 -0000
@@ -15,7 +15,7 @@
.endif
CFLAGS+= -Wall
-.if !defined(NO_KERBEROS) && !defined(NOCRYPT) && !defined(NO_OPENSSL)
+.if !defined(NO_KERBEROS) && !defined(NO_CRYPT) && !defined(NO_OPENSSL)
CFLAGS+=-DKERBEROS5
DPADD+= ${LIBKRB5} ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} \
${LIBROKEN}
@@ -25,7 +25,7 @@
.endif
BINMODE=4555
-.if !defined(NOFSCHG)
+.if !defined(NO_FSCHG)
INSTALLFLAGS=-fschg
.endif
Index: usr.bin/tar/Makefile
===================================================================
RCS file: /home/carl/cvs/dfly/usr.bin/tar/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- usr.bin/tar/Makefile 3 Sep 2005 01:41:28 -0000 1.1.1.1
+++ usr.bin/tar/Makefile 3 Sep 2005 19:23:58 -0000
@@ -5,7 +5,7 @@
WARNS?= 6
DPADD= ${LIBARCHIVE} ${LIBBZ2} ${LIBZ}
LDADD= -larchive -lbz2 -lz
-NOSHARED?= yes
+NO_SHARED?= yes
PATCHES!= echo ${.CURDIR}/patches/*.patch
CONTRIBDIR= ${.CURDIR}/../../contrib/bsdtar
Index: usr.sbin/cron/crontab/Makefile
===================================================================
RCS file: /home/carl/cvs/dfly/usr.sbin/cron/crontab/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- usr.sbin/cron/crontab/Makefile 3 Sep 2005 01:41:29 -0000 1.1.1.1
+++ usr.sbin/cron/crontab/Makefile 3 Sep 2005 17:33:35 -0000
@@ -10,7 +10,7 @@
BINDIR= /usr/bin
BINOWN= root
BINMODE=4555
-.if !defined(NOFSCHG)
+.if !defined(NO_FSCHG)
INSTALLFLAGS=-fschg
.endif
Index: usr.sbin/pkg_install/Makefile
===================================================================
RCS file: /home/carl/cvs/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 3 Sep 2005 01:41:31 -0000 1.1.1.1
+++ usr.sbin/pkg_install/Makefile 3 Sep 2005 16:54:29 -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/carl/cvs/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 3 Sep 2005 01:41:31 -0000 1.1.1.1
+++ usr.sbin/pkg_install/Makefile.inc 3 Sep 2005 16:54:49 -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/carl/cvs/dfly/usr.sbin/ppp/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- usr.sbin/ppp/Makefile 3 Sep 2005 01:41:31 -0000 1.1.1.1
+++ usr.sbin/ppp/Makefile 3 Sep 2005 18:55:58 -0000
@@ -11,15 +11,15 @@
tcpmss.c throughput.c timer.c tty.c tun.c udp.c vjcomp.c
.if defined(RELEASE_CRUNCH)
CFLAGS+=-DRELEASE_CRUNCH
-NOATM= true
-NOI4B= true
-NONAT= true
-NOKLDLOAD= true
-NORADIUS= true
-NOSUID= true
+PPP_NO_ATM= true
+PPP_NO_I4B= true
+PPP_NO_NAT= true
+PPP_NO_KLDLOAD= true
+PPP_NO_RADIUS= true
+PPP_NO_SUID= true
.endif
-.if defined(NOSUID) || defined(PPP_NOSUID)
+.if defined(PPP_NO_SUID)
BINMODE=554
.else
BINMODE=4554
@@ -42,15 +42,15 @@
CFLAGS+=-DPPP_CONFDIR=\"${PPP_CONFDIR}\"
.endif
-.if defined(NOKLDLOAD)
+.if defined(PPP_NO_KLDLOAD)
CFLAGS+=-DNOKLDLOAD
.endif
-.if defined(NOINET6)
+.if defined(NO_INET6)
CFLAGS+=-DNOINET6
.endif
-.if defined(NOALIAS) || defined(NONAT)
+.if defined(PPP_NO_ALIAS) || defined(PPP_NO_NAT)
CFLAGS+=-DNONAT
.else
SRCS+= nat_cmd.c
@@ -58,19 +58,19 @@
DPADD+= ${LIBALIAS}
.endif
-.if defined(NOATM)
+.if defined(PPP_NO_ATM)
CFLAGS+=-DNOATM
.else
SRCS+= atm.c
.endif
-.if defined(NOSUID) || defined(PPP_NOSUID)
+.if defined(PPP_NO_SUID)
CFLAGS+=-DNOSUID
.else
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
@@ -79,7 +79,7 @@
DPADD+= ${LIBCRYPTO}
.endif
-.if defined(NORADIUS)
+.if defined(PPP_NO_RADIUS)
CFLAGS+=-DNORADIUS
.else
SRCS+= radius.c
@@ -87,13 +87,13 @@
DPADD+= ${LIBRADIUS}
.endif
-.if defined(NOI4B) || ${MACHINE_ARCH} != "i386"
+.if defined(PPP_NO_I4B) || ${MACHINE_ARCH} != "i386"
CFLAGS+=-DNOI4B
.else
SRCS+= i4b.c
.endif
-.if defined(NONETGRAPH)
+.if defined(PPP_NO_NETGRAPH)
CFLAGS+=-DNONETGRAPH
.else
SRCS+= ether.c
Index: usr.sbin/pppd/Makefile
===================================================================
RCS file: /home/carl/cvs/dfly/usr.sbin/pppd/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- usr.sbin/pppd/Makefile 3 Sep 2005 01:41:32 -0000 1.1.1.1
+++ usr.sbin/pppd/Makefile 3 Sep 2005 17:06:20 -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/carl/cvs/dfly/usr.sbin/sendmail/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- usr.sbin/sendmail/Makefile 3 Sep 2005 01:41:33 -0000 1.1.1.1
+++ usr.sbin/sendmail/Makefile 3 Sep 2005 17:06:33 -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/sliplogin/Makefile
===================================================================
RCS file: /home/carl/cvs/dfly/usr.sbin/sliplogin/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- usr.sbin/sliplogin/Makefile 3 Sep 2005 01:41:33 -0000 1.1.1.1
+++ usr.sbin/sliplogin/Makefile 3 Sep 2005 17:33:45 -0000
@@ -6,7 +6,7 @@
MAN= sliplogin.8
BINGRP= network
BINMODE=4550
-.if !defined(NOFSCHG)
+.if !defined(NO_FSCHG)
INSTALLFLAGS=-fschg
.endif
Index: usr.sbin/tcpdchk/Makefile
===================================================================
RCS file: /home/carl/cvs/dfly/usr.sbin/tcpdchk/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- usr.sbin/tcpdchk/Makefile 3 Sep 2005 01:41:33 -0000 1.1.1.1
+++ usr.sbin/tcpdchk/Makefile 3 Sep 2005 18:27:11 -0000
@@ -10,7 +10,7 @@
CFLAGS= -DREAL_DAEMON_DIR=\"/usr/libexec\" \
-DSEVERITY=LOG_INFO -DRFC931_TIMEOUT=10 \
-DHOSTS_DENY=\"/etc/hosts.deny\" -DHOSTS_ALLOW=\"/etc/hosts.allow\"
-.if !defined(NOINET6)
+.if !defined(NO_INET6)
CFLAGS+=-DINET6
.endif
Index: usr.sbin/tcpdmatch/Makefile
===================================================================
RCS file: /home/carl/cvs/dfly/usr.sbin/tcpdmatch/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- usr.sbin/tcpdmatch/Makefile 3 Sep 2005 01:41:33 -0000 1.1.1.1
+++ usr.sbin/tcpdmatch/Makefile 3 Sep 2005 18:26:53 -0000
@@ -9,7 +9,7 @@
CFLAGS= -DREAL_DAEMON_DIR=\"/usr/libexec\" \
-DSEVERITY=LOG_INFO -DRFC931_TIMEOUT=10
-.if !defined(NOINET6)
+.if !defined(NO_INET6)
CFLAGS+=-DINET6
.endif
Index: usr.sbin/tcpdump/tcpdump/Makefile
===================================================================
RCS file: /home/carl/cvs/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 3 Sep 2005 01:41:33 -0000 1.1.1.1
+++ usr.sbin/tcpdump/tcpdump/Makefile 3 Sep 2005 18:26:34 -0000
@@ -33,7 +33,7 @@
CFLAGS+= -I${.CURDIR} -I${TCPDUMP_DISTDIR}
CFLAGS+= -DHAVE_CONFIG_H -D_U_="__attribute__((unused))"
-.if !defined(NOINET6)
+.if !defined(NO_INET6)
SRCS+= print-ip6.c print-ip6opts.c print-mobility.c \
print-ripng.c print-icmp6.c print-frag6.c print-rt6.c \
print-ospf6.c print-dhcp6.c
@@ -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]
