index
:
FreeBSD-src
RELENG_2_2
RELENG_2_3
RELENG_2_3_0
RELENG_2_3_1
RELENG_2_3_2
RELENG_2_3_3
RELENG_2_3_4
RELENG_2_4
RELENG_2_4_4
RELENG_2_4_OLD
devel
devel-11
releng/10.1
releng/10.3
releng/11.0
releng/11.1
stable/10
stable/11
Raptor Engineering's fork of pfsense FreeBSD src with pfSense changes
Raptor Engineering, LLC
summary
refs
log
tree
commit
diff
stats
log msg
author
committer
range
path:
root
/
usr.sbin
/
mergemaster
Commit message (
Expand
)
Author
Age
Files
Lines
*
MFC r314830:
ngie
2017-03-16
1
-4
/
+5
*
MFC r302674:
bdrewery
2016-07-15
1
-1
/
+1
*
All supported releases have the -m support from r186678, so remove
bdrewery
2015-09-29
1
-7
/
+6
*
Add META_MODE support.
sjg
2015-06-13
1
-0
/
+11
|
\
|
*
dirdeps.mk now sets DEP_RELDIR
sjg
2015-06-08
1
-2
/
+0
|
*
Merge head from 7/28
sjg
2014-08-19
2
-3
/
+3
|
|
\
|
|
/
|
/
|
|
*
Merge head
sjg
2014-04-28
1
-3
/
+10
|
|
\
|
*
\
Merge head
sjg
2013-09-11
1
-1
/
+1
|
|
\
\
|
*
\
\
Merge from head
sjg
2013-09-05
2
-13
/
+5
|
|
\
\
\
|
*
|
|
|
Updated dependencies
sjg
2013-02-16
1
-2
/
+0
|
*
|
|
|
Sync with HEAD.
obrien
2013-02-08
1
-13
/
+6
|
|
\
\
\
\
|
|
\
\
\
\
|
|
\
\
\
\
|
*
-
.
\
\
\
\
Sync from head
sjg
2012-11-04
1
-31
/
+37
|
|
\
\
\
\
\
\
|
*
|
|
|
|
|
|
Sync FreeBSD's bmake branch with Juniper's internal bmake branch.
marcel
2012-08-22
1
-0
/
+14
|
|
|
/
/
/
/
/
|
|
/
|
|
|
|
|
*
|
|
|
|
|
|
Remove ia64.
marcel
2014-07-07
1
-2
/
+2
*
|
|
|
|
|
|
use .Mt to mark up email addresses consistently (part2)
bapt
2014-06-20
1
-1
/
+1
|
|
_
|
_
|
_
|
_
|
/
|
/
|
|
|
|
|
*
|
|
|
|
|
mergemaster: Avoid "/var/tmp/temproot disappeared" if there is nothing to
jilles
2014-04-14
1
-1
/
+1
*
|
|
|
|
|
Generate /var/db/services.db during 'make distribution' so that it is
jhb
2014-01-22
1
-1
/
+2
*
|
|
|
|
|
Fix mergemaster -U by forcing FreeBSD 9 compatiblity in mtree when mtree is
brooks
2013-11-22
1
-1
/
+7
|
|
_
|
_
|
_
|
/
|
/
|
|
|
|
*
|
|
|
|
Pass -n (do not emit comments) when saving mtree information for future
delphij
2013-09-09
1
-1
/
+1
|
|
_
|
_
|
/
|
/
|
|
|
*
|
|
|
Remove request to email suggestions and fixes to the author.
eadler
2013-06-24
1
-8
/
+0
*
|
|
|
Don't mess with /etc/localtime if it is a symlink.
peter
2013-05-22
1
-1
/
+1
*
|
|
|
Permit relative paths with mergemaster -m
eadler
2013-05-10
1
-0
/
+1
*
|
|
|
Use the system MAKEOBJDIRPREFIX when running make targets in
brooks
2013-04-25
1
-4
/
+3
|
|
_
|
/
|
/
|
|
*
|
|
Remove pointless check for the existence of /usr/bin/less which exists
eadler
2012-12-05
1
-13
/
+1
*
|
|
Add ability to mergemaster to permit the user to type
eadler
2012-12-05
1
-0
/
+5
|
|
/
|
/
|
*
|
Remove references to CVS so that people will stop bringing it up
dougb
2012-10-05
1
-31
/
+37
|
/
*
If using DISTDIR we need to be sure to create a ${DESTDIR}/var/db/zoneinfo
dougb
2011-11-29
1
-2
/
+2
*
1. Add a new option, --run-updates, to always or never run the newalises,
dougb
2011-11-02
2
-17
/
+63
*
Make clear that the -U option can be dangerous. [1]
dougb
2011-08-09
2
-6
/
+10
*
mdoc: drop redundant .Pp and .LP calls
uqs
2010-10-08
1
-1
/
+0
*
Hide the creation and population of the temproot
dougb
2010-05-14
1
-5
/
+5
*
Add support run services_mkdb(8).
nork
2010-05-04
1
-0
/
+14
*
Make it more clear in the docs that -a is not compatible with -iFU,
dougb
2010-03-14
2
-7
/
+22
*
Make -U once again honor -D after my change to consolidate setting
dougb
2010-01-22
1
-5
/
+5
*
Use the newly brought %U macro.
ru
2010-01-15
1
-1
/
+1
*
Oops, deleted one line too many. Add back the null case for IGNORE_MOTD
dougb
2010-01-15
1
-0
/
+1
*
Now that we've officially arrived at FreeBSD 9, remove the IGNORE_MOTD
dougb
2010-01-15
1
-5
/
+2
*
Update copyright date
dougb
2010-01-08
2
-24
/
+30
*
If we are using -p it does not make any sense to even create the
dougb
2009-12-31
1
-2
/
+2
*
It's not necessary to include both Op and Fl for command line options
dougb
2009-12-30
1
-9
/
+11
*
Document the DELETE_STALE_RC_FILES option introduced in r201291. This is
dougb
2009-12-30
1
-16
/
+19
*
Add some patches contributed by jhb:
dougb
2009-12-30
1
-23
/
+34
*
Fix a problem with how mergemaster handles the hard links for /.cshrc
dougb
2009-12-19
1
-13
/
+20
*
Fix an indentation issue, no functional changes
dougb
2009-12-19
1
-22
/
+22
*
In the places where find is used that the user may see the results,
dougb
2009-12-19
1
-3
/
+3
*
Over time things that used to be files/directories/links can change
dougb
2009-12-12
1
-2
/
+59
*
Simplify handling of MTREEFILE relative to DESTDIR
dougb
2009-12-11
1
-7
/
+8
*
1. Update the message that prints out for -U when the mtree database does
dougb
2009-06-09
1
-7
/
+7
*
Enhance the safety of the -U option:
dougb
2009-05-16
1
-9
/
+13
*
Add -L to the mtree invocation to chase symbolic links that are present
dougb
2009-05-16
1
-1
/
+1
[next]