diff options
| -rw-r--r-- | sysutils/etcmerge/Makefile | 2 | ||||
| -rw-r--r-- | sysutils/etcmerge/src/etcmerge.8 | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/sysutils/etcmerge/Makefile b/sysutils/etcmerge/Makefile index cd1a79755f21..1f6d3863e5d7 100644 --- a/sysutils/etcmerge/Makefile +++ b/sysutils/etcmerge/Makefile @@ -9,7 +9,7 @@ PORTNAME= etcmerge PORTVERSION= 0.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils textproc MASTER_SITES= # none DISTFILES= # none diff --git a/sysutils/etcmerge/src/etcmerge.8 b/sysutils/etcmerge/src/etcmerge.8 index 37205c8080c1..8db8e50891db 100644 --- a/sysutils/etcmerge/src/etcmerge.8 +++ b/sysutils/etcmerge/src/etcmerge.8 @@ -95,7 +95,12 @@ First, ensure you have a copy of the /etc distributed by FreeBSD (BEFORE you or .Xr sysinstall 8 started modifying it) stored in .Pa /var/db/etc . -The easiest way to do this is to run +There are two easy ways to do this: Either download a copy matching your +installation from +.Pa http://people.freebsd.org/~eivind/etc/ +and extract this in +.Pa /var/db/ +or run .Xr mergemaster 8 one last time, and copy .Pa /var/tmp/temproot/etc |