diff options
| author | Jason Helfman <jgh@FreeBSD.org> | 2015-03-05 21:23:01 +0000 |
|---|---|---|
| committer | Jason Helfman <jgh@FreeBSD.org> | 2015-03-05 21:23:01 +0000 |
| commit | a0c547be8786078df896ad087d39f144b29f4ec1 (patch) | |
| tree | a6cdad6c16c4a4d6bf7eef215cfbb6f85c9755e8 /sysutils/etcmerge | |
| parent | bb3bfa5bc9ff67fda7d360c81cf3645e1485c99e (diff) | |
| download | ports-a0c547be8786078df896ad087d39f144b29f4ec1.tar.gz ports-a0c547be8786078df896ad087d39f144b29f4ec1.zip | |
- pass port to submitter, update pkg-descr and WWW [1]
- while here drop PORTREVISION, and move SRC calls to ${FILESDIR}
PR: 198266 [1]
Submitted by: portmaster@bsdforge.com
Notes
Notes:
svn path=/head/; revision=380552
Diffstat (limited to 'sysutils/etcmerge')
| -rw-r--r-- | sysutils/etcmerge/Makefile | 9 | ||||
| -rw-r--r-- | sysutils/etcmerge/files/etcmerge.8 (renamed from sysutils/etcmerge/src/etcmerge.8) | 0 | ||||
| -rw-r--r-- | sysutils/etcmerge/files/etcmerge.sh (renamed from sysutils/etcmerge/src/etcmerge.sh) | 0 | ||||
| -rw-r--r-- | sysutils/etcmerge/pkg-descr | 7 |
4 files changed, 8 insertions, 8 deletions
diff --git a/sysutils/etcmerge/Makefile b/sysutils/etcmerge/Makefile index b5df4911e82e..f5069aaca501 100644 --- a/sysutils/etcmerge/Makefile +++ b/sysutils/etcmerge/Makefile @@ -3,23 +3,20 @@ PORTNAME= etcmerge PORTVERSION= 0.4 -PORTREVISION= 0 CATEGORIES= sysutils MASTER_SITES= # none DISTFILES= # none -MAINTAINER= ports@FreeBSD.org +MAINTAINER= portmaster@BSDforge.com COMMENT= Automatic 3-way merge of /etc updates NO_BUILD= yes NO_WRKSUBDIR= yes -SRC= ${.CURDIR}/src - PLIST_FILES= man/man8/${PORTNAME}.8.gz sbin/etcmerge do-install: - ${INSTALL_SCRIPT} ${SRC}/${PORTNAME}.sh ${STAGEDIR}${PREFIX}/sbin/${PORTNAME} - ${INSTALL_MAN} ${SRC}/${PORTNAME}.8 ${STAGEDIR}${PREFIX}/man/man8 + ${INSTALL_SCRIPT} ${FILESDIR}/${PORTNAME}.sh ${STAGEDIR}${PREFIX}/sbin/${PORTNAME} + ${INSTALL_MAN} ${FILESDIR}/${PORTNAME}.8 ${STAGEDIR}${PREFIX}/man/man8 .include <bsd.port.mk> diff --git a/sysutils/etcmerge/src/etcmerge.8 b/sysutils/etcmerge/files/etcmerge.8 index 110d54e70a71..110d54e70a71 100644 --- a/sysutils/etcmerge/src/etcmerge.8 +++ b/sysutils/etcmerge/files/etcmerge.8 diff --git a/sysutils/etcmerge/src/etcmerge.sh b/sysutils/etcmerge/files/etcmerge.sh index da3b8c66012e..da3b8c66012e 100644 --- a/sysutils/etcmerge/src/etcmerge.sh +++ b/sysutils/etcmerge/files/etcmerge.sh diff --git a/sysutils/etcmerge/pkg-descr b/sysutils/etcmerge/pkg-descr index cb9c3b50c6fe..28b52abed6a0 100644 --- a/sysutils/etcmerge/pkg-descr +++ b/sysutils/etcmerge/pkg-descr @@ -1,4 +1,7 @@ -etcmerge is a tool for keeping /etc up to date when updating. -The primary difference from mergemaster is that etcmerge +etcmerge is a tool for keeping /etc up to date when updating, +or for management after installworld (instead of mergemester). +The primary difference from mergemaster, is that etcmerge requires much less manual work than mergemaster, due to the use of a three way merge. + +WWW: http://BSDforge.com/projects/sysutils/etcmerge/ |