cvs commit: ports/sysutils Makefile ports/sysutils/etcmerge Makefile pkg-descr pkg-plist ports/sysutils/etcmerge/src etcmerge.8 etcmerge.sh

[Eivind Eklund]

eivind      2003/07/30 09:55:35 PDT

  FreeBSD ports repository

  Modified files:
    sysutils             Makefile 
  Added files:
    sysutils/etcmerge    Makefile pkg-descr pkg-plist 
    sysutils/etcmerge/src etcmerge.8 etcmerge.sh 
  Log:
  3-way merge for /etc (mergemaster replacement)
  
  Revision  Changes    Path
  1.391     +1 -0      ports/sysutils/Makefile
  1.1       +34 -0     ports/sysutils/etcmerge/Makefile (new)
  1.1       +4 -0      ports/sysutils/etcmerge/pkg-descr (new)
  1.1       +1 -0      ports/sysutils/etcmerge/pkg-plist (new)
  1.1       +269 -0    ports/sysutils/etcmerge/src/etcmerge.8 (new)
  1.1       +401 -0    ports/sysutils/etcmerge/src/etcmerge.sh (new)