svn commit: r380552 - in head/sysutils/etcmerge: . files src

Jason Helfman jgh at FreeBSD.org
Thu Mar 5 21:23:03 UTC 2015


Author: jgh
Date: Thu Mar  5 21:23:01 2015
New Revision: 380552
URL: https://svnweb.freebsd.org/changeset/ports/380552
QAT: https://qat.redports.org/buildarchive/r380552/

Log:
  - 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 at bsdforge.com

Added:
  head/sysutils/etcmerge/files/
     - copied from r380551, head/sysutils/etcmerge/src/
Deleted:
  head/sysutils/etcmerge/src/
Modified:
  head/sysutils/etcmerge/Makefile
  head/sysutils/etcmerge/pkg-descr

Modified: head/sysutils/etcmerge/Makefile
==============================================================================
--- head/sysutils/etcmerge/Makefile	Thu Mar  5 21:15:50 2015	(r380551)
+++ head/sysutils/etcmerge/Makefile	Thu Mar  5 21:23:01 2015	(r380552)
@@ -3,23 +3,20 @@
 
 PORTNAME=	etcmerge
 PORTVERSION=	0.4
-PORTREVISION=	0
 CATEGORIES=	sysutils
 MASTER_SITES=	# none
 DISTFILES=	# none
 
-MAINTAINER=	ports at FreeBSD.org
+MAINTAINER=	portmaster at 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>

Modified: head/sysutils/etcmerge/pkg-descr
==============================================================================
--- head/sysutils/etcmerge/pkg-descr	Thu Mar  5 21:15:50 2015	(r380551)
+++ head/sysutils/etcmerge/pkg-descr	Thu Mar  5 21:23:01 2015	(r380552)
@@ -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/


More information about the svn-ports-head mailing list