Commit graph

310 commits

Author SHA1 Message Date
Doug Barton
922b7f2ad2 Break the NO_BIND knob out from the pack, and begin documenting
the finer granularity for the various BIND features.
2004-09-24 13:51:31 +00:00
Christian Brueffer
a0fa04aaeb Document a couple of build knobs
PR:		misc/71032 (partly)
Submitted by:	Divacky Roman <xdivac02@stud.fit.vutbr.cz>
Reviewed by:	ru
MFC after:	3 days
2004-09-04 10:05:17 +00:00
Dag-Erling Smørgrav
5c73a49168 Add a NO_BOOT knob to prevent building the boot blocks and loader.
Reviewed by:	ru
MFC after:	3 days
2004-08-19 09:54:28 +00:00
Marius Strobl
1d875a6ebd Shorten the description of NO_OPENSSL, which was split into two lines by a
patch of mine in revision 1.216, a bit so it fits in a single line again.
2004-08-15 20:32:06 +00:00
Hartmut Brandt
47a4e0e50d Document the correct use of MAKEOBJDIRPREFIX and MAKEOBJDIR.
Requested by: kris
2004-08-11 07:14:11 +00:00
Ruslan Ermilov
866b1c7484 Removed remnants of ports-related knobs from here. 2004-07-29 08:43:33 +00:00
Dag-Erling Smørgrav
c296e199b3 The -O2 bugs are in libalias(3), not ppp(8). 2004-07-03 09:41:58 +00:00
Dag-Erling Smørgrav
6063af3d9e Explain that -O2 is supported, but known to expose bugs in ppp(8). 2004-07-02 17:08:39 +00:00
Mike Pritchard
5b89956dbb Spelling fixes. 2004-06-20 13:33:35 +00:00
Josef El-Rayes
0d9e3b1ab9 Fix typo.
Submitted by:	Michel Lavondès <fox@vader.aacc.cc.md.us>
PR:		docs/66536
2004-05-12 20:33:25 +00:00
Dag-Erling Smørgrav
7ac2f2c2ec Remove mention of doscmd. 2004-03-24 20:19:57 +00:00
Max Laier
8d69c48be5 Link pf to the build and install:
This adds the former ports registered groups: proxy and authpf as well as
the proxy user. Make sure to run mergemaster -p in oder to complete make
installworld without errors.

This also provides the passive OS fingerprints from OpenBSD (pf.os) and an
example pf.conf.

For those who want to go without pf; it provides a NO_PF knob to make.conf.

__FreeBSD_version will be bumped soon to reflect this and to be able to
change ports accordingly.

Approved by:	bms(mentor)
2004-03-08 22:03:29 +00:00
Dag-Erling Smørgrav
43cebabc9f Document NO_VINUM, which is already listed in the man page. 2004-02-03 13:57:56 +00:00
David E. O'Brien
5c4d4bfad4 Always build ext2fs module. There is no written policy preventing the
building of GPL'ed modules.
2004-01-28 17:20:08 +00:00
Maksim Yevmenkin
18d948adb1 Add NO_BLUETOOTH knob to the build process
Requested by:	phk
Reviewed by:	imp (mentor), ru
2004-01-28 00:42:51 +00:00
David E. O'Brien
b9d9e53eb6 Remove verbage about -O2 producing bad code on Alpha. By all accounts
GCC 3.3 -O2 produces correct code on Alpha.  However, note that FreeBSD
has alias bugs that make -O2 produce bad code on all(most?) platforms.
Also don't tell people we don't want -O2 related bug reports, we do -- if
they contain patches.
2004-01-18 22:14:23 +00:00
Gregory Neil Shapiro
77e399e8be Turn SENDMAIL_CF_DIR into an officially supported make.conf variable
and use it in src/etc/sendmail/Makefile in case the user wants to use
a different path to the sendmail m4 sources (e.g., sendmail port users).

Submitted by:	dinoex
MFC after:	21 days
X-MFC after:	RELENG_4 code freeze ends
2003-09-24 04:19:26 +00:00
Jacques Vidrine
f88a547be4 Remove nsswitch.conf from the list of examples, because there is no
such example.

Reported by:	blackend
2003-09-15 16:42:52 +00:00
Gregory Neil Shapiro
25b7a99154 Thanks to Ruslan's src/etc/sendmail/Makefile patch, it is now safe
(though probably not a good idea in general) to set the various
SENDMAIL_*_MC variables to /etc/mail/sendmail.mc or /etc/mail/submit.mc.

MFC after:	5 days
2003-07-06 19:01:41 +00:00
Ruslan Ermilov
a0218a2a4d Unbreak world build if NO_OPENSSL is defined but NO_KERBEROS is not.
Submitted by:	Marius Strobl <marius@alchemy.franken.de>
Approved by:	re (jhb)
2003-05-21 21:47:20 +00:00
Dag-Erling Smørgrav
7691f66abf Retire the useless NOSECURE knob.
Approved by:	re (scottl)
2003-05-19 15:52:01 +00:00
David E. O'Brien
0dc1aeb6ac Consistentify our NO_KERBEROS documentation.
Approved by:	re(bmah)
2003-05-06 19:26:55 +00:00
Mark Murray
dbf104e68d Turn MAKE_KERBEROS5 into NO_KERBEROS by negating the logic. Some extra
cleanups were necessary in release/Makefile, and the tinderbox code
was syntax checked, not run checked.
2003-05-05 07:58:44 +00:00
Mark Murray
5b7cde36b6 KerberosIV deorbit sequence: MAKE_KERBEROS4 is no longer a valid option. 2003-03-08 11:47:44 +00:00
Tom Rhodes
0890842fe7 Move NOMAN down the section without underscore characters.
Add a forgotten `=' sign.

Thanks to:	ru, bde
2003-02-14 20:04:44 +00:00
Tom Rhodes
dc82395af0 Add NOMAN here also. 2003-02-11 19:45:44 +00:00
Jacques Vidrine
6042ca2e01 Install the OpenSSL man pages in /usr/share/openssl/man
and remove the WANT_OPENSSL_MANPAGES knob.
2003-02-10 19:57:56 +00:00
Alexander Langer
cd8f87b92f Remove MAKEDEV quirks, now obsolete. 2003-02-05 18:33:36 +00:00
David E. O'Brien
553f8de1dc Document WANT_EXT2FS_MODULE. 2003-01-29 06:22:57 +00:00
David E. O'Brien
a2a8085e7e As warned on freebsd-current@, remove the perl wrapper from /usr/src.
The /usr/bin/perl wrapper isn't solving many of the problems it was
imported to deal with.  There are limitations to it that don't have a
clear "fix".

Reviewed by:	markm, kris
Extorted approval from:	re(jhb)
2002-11-27 17:46:26 +00:00
Ruslan Ermilov
cd96609654 Removed the vestiges of modems(5).
Approved by:	re
2002-11-27 16:45:10 +00:00
Alfred Perlstein
ac1cc6ee11 Backout "compatibility hack" for __sF.
Requested by: Steve Kargl <sgk@troutmask.apl.washington.edu> (submitter)
2002-11-04 03:23:56 +00:00
Alfred Perlstein
0fc25b925d Provide a hook to make __sF visible outside of libc for commercial apps
if WANT_COMPAT4_STDIO is defined when compiling libc.

Submitted by: Steve Kargl <sgk@troutmask.apl.washington.edu>
2002-11-02 19:47:53 +00:00
Poul-Henning Kamp
f33aca987b Change to match NO_MAKEDEV* -> MAKEDEV*. 2002-10-22 15:02:53 +00:00
Juli Mallett
7cfab3bb92 Allow the shell preference for make(1) to be set in make.conf(5), and hopefully
trick a few people into setting MAKE_SHELL to csh, although that can still
rebuild itself to allow them to heal the wound in their foot.
2002-09-29 00:09:22 +00:00
Hajimu UMEMOTO
b838ab7c19 Mention about how to build sendmail with SASLv2. 2002-09-24 17:07:37 +00:00
Kris Kennaway
0dafadb731 Add support for ev67 and ev45 CPUTYPEs (new in gcc3) 2002-09-07 01:26:11 +00:00
Maxime Henrion
af1ed8d074 List the new athlon CPUs supported by the CPUTYPE make variable.
Submitted by:	kris
2002-09-07 01:19:15 +00:00
Ruslan Ermilov
32f8ca450d TARGET_CPUTYPE should exist solely in Makefile.inc1, similar to
TARGET_ARCH and TARGET.  This is problematic when one has the =
(unconditional) type of assigment for CPUTYPE in /etc/make.conf.
(This would override what was set on the command line to "make
buildworld".)

Add a (horrible) kludge to Makefile.inc1 to check the type of
assignment for CPUTYPE (only for those who attempts to set it to
a different value).  Fix an example make.conf.  Fix the kernel's
build-tools target (aicasm only at the moment) to catch up with
bsd.cpu.mk,v 1.15 (BOOTSTRAPPING replaced with NO_CPU_CFLAGS in
Makefile.inc1's BMAKE).

Reviewed by:	jhb
2002-08-02 18:04:22 +00:00
Mark Murray
e830ddcaf2 There is no more UUCP in the base system, so there is no need to
prevent its building.
2002-08-02 10:40:09 +00:00
Hajimu UMEMOTO
68966e0453 include file of SASLv1 was changed to /usr/local/include/sasl1. 2002-07-31 15:06:09 +00:00
Ruslan Ermilov
33c1de7d1f Ignore -C, -p, and -S options of install(1) when used with the -d
option.  Warn about COPY being phased out.  Restore the old method
of always comparing before installing: INSTALL="install -C".

Requested by:	bde
2002-07-29 08:51:04 +00:00
Ruslan Ermilov
d29831440a To force install(1) to always compare files before installing, one
now needs to set COPY=-C as -C is no longer compatible with the -d
option.  It is also likely to be renamed to INSTALL_COPY soon.
Update documentation to reflect this change.

PR:		bin/40724
2002-07-18 12:54:55 +00:00
Johan Karlsson
e88001443e 's/rather then/rather than/'
PR:           38096
Submitted by: Chris Pepper <pepper@rockefeller.edu>

While I'm here correct some typos pointed out by ispell.

Approved by:  sheldonh (mentor)
MFC after:    1 week
2002-07-02 14:33:52 +00:00
Gregory Neil Shapiro
2a1d418ce1 Add a warning regarding the SENDMAIL_*_MC make.conf variable values.
Using /etc/mail/sendmail.mc will create /etc/mail/sendmail.cf during
a buildworld.

PR:		misc/39397
MFC after:	3 days
2002-06-20 04:33:06 +00:00
Doug Barton
b075c273da Per previous discussion, and with Mark's blessing, update the value
of this knob to reflect (-)current reality.
2002-06-09 09:28:02 +00:00
Tim J. Robbins
7cc8320ab2 Document the ENABLE_SUID_NEWGRP variable.
Requested by:	mike
PR:		36190
2002-05-28 08:04:50 +00:00
Gregory Neil Shapiro
34925ba6f7 Add a new make.conf knob, SENDMAIL_MAP_PERMS, which specifies the
permissions to use for alias and map database files built by
/etc/mail/Makefile.  The default is 0640 to assist users in avoiding
a file locking local denial of service.

MFC after:	1 day
		pending RE approval
2002-05-24 01:46:39 +00:00
Mark Murray
588764aac2 Remove perl hooks.
Pointed out by:		des
2002-05-16 11:27:33 +00:00
Jacques Vidrine
95ba43303b Turn on the set-user-ID bit for k5su if ENABLE_SUID_K5SU is defined. 2002-05-12 03:17:31 +00:00
David E. O'Brien
788fcec086 Back out the NO_RCMNDS knob.
1. The committer refused to respond to questions over the commit.
2. The servers rlogind, rshd, rexecd were not wrapped.
3. "rcmnds" as an abbreviation gets an order of magnitude less hits on
    Google than the much more well known "rcmds".
2002-04-23 23:59:51 +00:00
Gregory Neil Shapiro
14d6d7657a Provide a new make.conf knob, SENDMAIL_SUBMIT_MC to allow users to pick
the .mc file used for /etc/mail/submit.cf.  By default,
/etc/mail/freebsd.submit.mc is installed and used.

Requested by:	fenner
Submitted by:	ume
MFC after:	1 week
2002-04-14 19:20:26 +00:00
Bosko Milekic
e5f7f97622 Introduce NO_RCMNDS flag so as to not compile rsh, rlogin, and rcp on will,
and document in share/examples/etc/make.conf

Submitted by: Aleksandar Simic <asimic@dsl.pipex.com>
MFC after: 1 week
2002-04-09 18:25:44 +00:00
Hajimu UMEMOTO
f0654170d1 sendmail 8.12 doesn't require _FFR_UNSAFE_SASL anymore.
This is standard feature.

Submitted by:	ru
2002-03-30 18:14:37 +00:00
Hajimu UMEMOTO
40a8850bd7 sendmail 8.12 claims against GroupReadableSASLFile.
Submitted by:	mistral@imasy.or.jp
2002-03-30 17:53:10 +00:00
Ruslan Ermilov
7a43a96ab0 Replaced hacks in sbin/Makefile,v 1.99 and usr.sbin/Makefile,v 1.217
with the NO_IPFILTER make.conf(5) knob.

(So that we can "make the-rest-of-the-world" again.)
2002-03-21 09:15:39 +00:00
Mark Murray
589622caaa Document NO_PERL. 2002-03-16 15:14:41 +00:00
Gregory Neil Shapiro
474c81fdd8 Document new build knob, SENDMAIL_SET_USER_ID, which installs sendmail as a
set-user-ID root binary instead of the new method (set-group-ID smmsp).
2002-02-17 22:10:06 +00:00
David E. O'Brien
5af956e9f8 Document NO_CXX and NO_GDB. 2002-02-11 07:09:22 +00:00
Ruslan Ermilov
3a289cbae7 Document MODULES_OVERRIDE.
PR:		docs/32560
Submitted by:	Maxim Konovalov <maxim@macomnet.ru>
2001-12-24 19:34:33 +00:00
Kris Kennaway
4412b0f413 Put back NOUUCP for now; cu and rmail are remaining pieces of the UUCP
code which will stay for now.
2001-10-01 08:13:57 +00:00
Kris Kennaway
0264ba41a1 Remove NOUUCP build option 2001-10-01 06:28:30 +00:00
Alexander Langer
d33a962d07 Move /etc/defaults/make.conf to /usr/share/examples/etc/make.conf as
discussed on the arch@ mailinglist (after repo-copy).

sys.mk will .error if it finds /etc/defaults/make.conf but include
it anyways (this is the same behaviour as with the make.conf.local
removal).

/usr/share/examples/etc/make.conf has BDEFLAGS commented out now,
since it's only an example file.

Adjust all textes that talk about make.conf or defaults/make.conf to
match the new situation.
2001-08-30 22:44:51 +00:00
Alexander Langer
ff6ea8bb9d Document defaults/periodic.conf. 2001-08-29 19:45:27 +00:00
Alexander Langer
2d68fd8741 RIP all ports options, as discussed on arch@. 2001-08-29 19:38:17 +00:00
David E. O'Brien
d549989694 Add the `WANT_FORCE_OPTIMIZATION_DOWNGRADE' knob. If set to an integer
value, it forces GCC to not optimize above this level.  For intance, GCC
made with "WANT_FORCE_OPTIMIZATION_DOWNGRADE=1" is a good setting for the
Alpha platform when building ports.
2001-08-16 06:05:18 +00:00
Mark Murray
37ee76af52 Remove the WANT_INSECURE_OPIE option - it is now a default. This is not
nearly as ominous as it sounds, and it allows OPIE to be used over SSH
and on xterms.

Requested by:	ache
Discussed on:	-security
2001-08-12 18:47:56 +00:00
Akinori MUSHA
f418fdfb89 Chagne MASTER_SITE_FREEBSD to MASTER_SITE_FREEBSD_ORG, because
MASTER_SITE_FREEBSD is already used in bsd.port.mk for some different
purpose.
2001-08-12 17:22:41 +00:00
Akinori MUSHA
000d8e5b75 Fix MASTER_SITE_RUBY. The listed master site is obsolete. 2001-08-12 17:09:19 +00:00
Akinori MUSHA
81030c6ed5 Add MASTER_SITE_FREEBSD. 2001-08-12 16:32:05 +00:00
Andrey A. Chernov
a1ff8bfdb3 Since we remove skey... 2001-07-30 16:05:03 +00:00
Peter Wemm
791da841a1 Take -Wconversion out of BDECFLAGS. It is not particularly useful for
us anyway because it doesn't work right on the x86 and alpha.  On
K&R code, small ints would be promoted to int.  ANSI-C doesn't require
this and the small ints can be passed taking 8 or 16 bits of stack
space.  However, the x86 abi that we use *does* promote to 32 bit,
and the alpha ABI passes them in 64 bit registers so we dont have
that aspect of the problem here.  Losing float precision by having it
cast down to int because the funtion prototype specifies int is the
least of our problems.  -Wmissing-prototypes helps here anyway.
2001-07-27 16:23:53 +00:00
Gregory Neil Shapiro
f4843be999 New make knob, SENDMAIL_M4_FLAGS, modifies the flags passed to m4 when
building a .cf file from a .mc file.

Include -D_FFR_TLS_O_T to enable tls policy control since the sendmail binary
build enables that FFR as well.

PR:		conf/28361
MFC after:	1 week
2001-07-23 01:33:54 +00:00
Mark Murray
b4248e7919 Provide a hint for the OPIE 'insecure' mode. 2001-07-10 17:11:02 +00:00
Gregory Neil Shapiro
f87b85b2f0 Typo fix (modifes -> modifies) 2001-06-27 01:48:02 +00:00
Nik Clayton
4ed950ad98 Include a mention of WRKDIRPREFIX, useful when mounting /usr/ports readonly
from another host.
2001-06-15 08:35:57 +00:00
Andrey A. Chernov
fe6f7d3ab4 ISO_ -> ISO in DOC_LANG 2001-06-11 01:26:52 +00:00
Mark Murray
7ed3b855bb PERL_THREADED is too experimental at this stage. Remove. 2001-05-31 11:19:00 +00:00
Sheldon Hearn
68933300c9 The PERL_THREADED knob is causing too many people too many problems.
Add a dire warning about the experimental nature of threaded Perl.
2001-05-27 11:23:31 +00:00
Ruslan Ermilov
f3bb47cca0 Add NO_I4B to avoid building/installing isdn4bsd package.
Prompted by:	Alexandr Listopad <laa@laa.zp.ua>
MFC after:	3 days
2001-05-23 13:32:32 +00:00
Assar Westerlund
eba4f69287 clarify comment about MAKE_KERBEROS5. noticed by Peter Pentchev
<roam@orbitel.bg>
2001-05-12 14:38:00 +00:00
Ruslan Ermilov
c59eb7cfb5 Removed reference to withdrawn secure-supfile. 2001-04-27 12:15:15 +00:00
Jim Mock
20affa347a Document XFREE86_VERSION. 2001-04-25 19:27:39 +00:00
Maxim Sobolev
bcc11eec02 Add missed and update existing MASTER_SITE_*. 2001-04-22 19:01:44 +00:00
Jeroen Ruigrok van der Werven
d8edf8110a Change NO_MAKEDEV to a finer granularity method:
NO_MAKEDEV_INSTALL and NO_MAKEDEV_RUN.  The former implying the latter.
The names imply what they do.  The last commit by DES based on a PR defeated
the original idea behind NO_MAKEDEV, which was not to run MAKEDEV, but to do
the installation of MAKEDEV.  This should satisfy both parties on the MAKEDEV
challenge.
2001-03-29 14:03:07 +00:00
Murray Stokely
5e30415625 Add a commented out entry for compat4x
PR:		25196
Submitted by:	Chris Knight <chris@aims.com.au>
2001-03-14 11:30:57 +00:00
Kris Kennaway
5ca7924a91 Use CPUTYPE to add appropriate compiler flags to COPTFLAGS for kernel
builds.  This may be disabled using the NO_CPU_COPTFLAGS variable.

Reviewed by:	arch
2001-03-12 07:47:09 +00:00
Gregory Neil Shapiro
332ca08080 Use the correct path to the SASL .h files as installed by the SASL port.
MFC candidate.

Submitted by:	jeh
2001-03-10 00:31:07 +00:00
Gregory Neil Shapiro
6b81e27f98 Use a different example to avoid confusion 2001-03-06 02:06:02 +00:00
Assar Westerlund
7a00c25671 remove warning of experimental nature of heimdal. it's now the same
version as the one in ports (and the latest at that), except that not
all programs that are in the port get built
2001-03-05 18:54:27 +00:00
Kris Kennaway
6a251185af Correct the comment above MAKE_IDEA to be less confusing now that we
only have one patented algorithm in make.conf.
2001-03-04 03:14:27 +00:00
Kris Kennaway
181b6941c7 Add definitions and support for the AMD k6-2, Pentium MMX (i586/MMX),
and Pentium II, III and IV processors (p2, p3, p4), as well as 'mmx' and
'3dnow' MACHINE_CPU tags as appropriate.  In the near future this will
be used to control various ports which have MMX/3dNow optimizations,
instead of the ad-hoc methods currently used.

Reviewed by:    peter
2001-02-27 11:21:47 +00:00
Jeroen Ruigrok van der Werven
f9eec60e72 Short lived fame for -Wundef.
Second thoughts by:	bde
2001-02-27 10:16:56 +00:00
Jeroen Ruigrok van der Werven
e18f542dc0 Add -Wundef to BDECFLAGS:
Warn if an undefined identifier is evaluated in an `#if' directive.

Not objected to by:	bde
2001-02-27 09:03:55 +00:00
Kris Kennaway
247b759d92 Update the list of OpenSSL manpages (now contains many more describing
libssl, for example), and hide it behind a make.conf option,
WANT_OPENSSL_MANPAGES, instead of having it commented out.  We still can't
install these by default because of clobbering of a number of system
manpages with the same name, but they're there for people who want them.
2001-02-25 21:42:12 +00:00
Seigo Tanimura
283ea61c54 I thought it was a new CPU :)
s/i585/i586/
2001-02-24 02:59:32 +00:00
Gregory Neil Shapiro
e6c77250ef Need one additional make.conf knob, SENDMAIL_ADDITIONAL_MC to satisfy bug
report.  It allows building multiple .cf files at build time.

PR:		bin/19897
2001-02-22 19:44:16 +00:00
Gregory Neil Shapiro
d1885c41cc Add a note indicating that SENDMAIL_MC should include the path. This is
necessary if you expect to be able to use this setting in both /etc/mail
and etc/sendmail.
2001-02-22 19:34:13 +00:00
Kris Kennaway
62d90fb793 Overhaul the MACHINE_CPU behaviour:
* Rip out MACHINE_CPU stuff from sys.mk and include a new <bsd.cpu.mk>
  after we pull in /etc/make.conf.  We need to do it afterwards so we can
  react to the user setting of the:

* CPUTYPE variable, which contains the CPU type which the user wants to
  optimize for.  For example, if you want your binaries to only run on an
  i686-class machine (or higher), set this to i686.  If you want to support
  running binaries on a variety of CPU generations, set this to the lowest
  common denominator.  Supported values are listed in make.conf.

* bsd.cpu.mk does the expansion of CPUTYPE into MACHINE_CPU using the
  (hopefully) correct unordered list of CPU types which should be used on
  that CPU.  For example, an AMD k6 CPU wants any of the following:
    k6 k5 i586 i486 i386
  This is still an unordered list so the client makefile logic is simple -
  client makefiles need to test for the various elements of the set in
  decreasing order of priority using ${MACHINE_CPU:M<foo>}, as before.
  The various MACHINE_CPU lists are believed to be correct, but should be
  checked.

* If NO_CPU_CFLAGS is not defined, add relevant gcc compiler optimization
  settings by default (e.g. -karch=k6 for CPUTYPE=k6, etc).  Release
  builders and developers of third-party software need to make sure not to
  enable CPU-specific optimization when generating code intended to be
  portable.  We probably need to move to an /etc/world.conf to allow the
  optimization stuff to be applied separately to world/kernel and external
  compilations, but it's not any worse a problem than it was before.

* Add coverage for the ia64/itanium MACHINE_ARCH/CPUTYPE.

* Add CPUTYPE support for all of the CPU types supported by FreeBSD and gcc
  (only i386, alpha and ia64 first, since those are the minimally-working
  ports.  Other architecture porters, please feel free to add the relevant
  gunk for your platform).

Reviewed by:    jhb, obrien
2001-02-22 11:14:25 +00:00
Gregory Neil Shapiro
25219d25e6 Add a new make knob, SENDMAIL_MC, which is meant to replace SENDMAIL_CF as
users should be configuring via m4 now.  If set, use m4 to create the .cf
file.  Also, if either SENDMAIL_MC or SENDMAIL_CF is set, 'make install' or
'make distribution' in src/etc/sendmail/ will install the appropriate .cf as
/etc/mail/sendmail.cf.  This fixes some mergemaster problems.

PR:		conf/13016
2001-02-22 04:11:52 +00:00