cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mergemaster has been superseded by sysmerge(8)

Browse Source
This commit is contained in:
naddy 2008-05-08 14:59:49 +00:00
parent 0593df6a52
commit a9074c7da9
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sysutils/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.152 2008/04/20 21:27:40 merdely Exp $
# $OpenBSD: Makefile,v 1.153 2008/05/08 14:59:49 naddy Exp $
# $FreeBSD: Makefile,v 1.26 1997/11/20 08:58:51 tg Exp $
SUBDIR += LPRng
@ -54,7 +54,6 @@
SUBDIR += mac-robber
SUBDIR += memtester
SUBDIR += mencal
SUBDIR += mergemaster
SUBDIR += modlogan
SUBDIR += monit
SUBDIR += monitord

4
sysutils/mergemaster/Makefile
View File

@ -1,4 +1,6 @@
# $OpenBSD: Makefile,v 1.13 2007/09/15 21:14:02 merdely Exp $
# $OpenBSD: Makefile,v 1.14 2008/05/08 14:59:49 naddy Exp $
COMES_WITH= 4.4 # sysmerge(8)
COMMENT= aids with merging configuration files during an upgrade