- remove mergemaster from the list of subdirs

(mergemaster has COMES_WITH=4.4)

"sure" espie@

infrastructure/plist/amd64

@@ -1,10 +1,9 @@
-# $OpenBSD: amd64,v 1.32 2008/03/20 22:05:02 pvalchev Exp $
+# $OpenBSD: amd64,v 1.33 2008/08/20 09:12:10 ajacoutot Exp $
 # This is the master list of subdirs used to choose amd64 packages.
 # Use with ${PORTSDIR}/infrastructure/package/check-plist
 # to create actual SUBDIRLIST to pass to ports main Makefile.
 net/rsync
 net/cvsync
-sysutils/mergemaster
 editors/vim,no_x11
 editors/emacs21
 archivers/unzip

infrastructure/plist/arm

@@ -1,10 +1,9 @@
-# $OpenBSD: arm,v 1.16 2008/06/12 21:09:28 sthen Exp $
+# $OpenBSD: arm,v 1.17 2008/08/20 09:12:10 ajacoutot Exp $
 # This is the master list of subdirs used to choose arm packages.
 # Use with ${PORTSDIR}/infrastructure/package/check-plist
 # to create actual SUBDIRLIST to pass to ports main Makefile.
 net/rsync
 net/cvsync
-sysutils/mergemaster
 editors/vim,no_x11
 editors/emacs21
 archivers/unzip

infrastructure/plist/i386

@@ -1,11 +1,10 @@
-# $OpenBSD: i386,v 1.38 2008/03/20 22:04:26 pvalchev Exp $
+# $OpenBSD: i386,v 1.39 2008/08/20 09:12:10 ajacoutot Exp $
 # This is the master list of subdirs used to choose i386 packages.
 # Use with ${PORTSDIR}/infrastructure/package/check-plist
 # to create actual SUBDIRLIST to pass to ports main Makefile.
 net/rsync
 net/cvsup
 net/cvsync
-sysutils/mergemaster
 editors/vim,no_x11
 editors/emacs21
 archivers/unzip

infrastructure/plist/powerpc

@@ -1,10 +1,9 @@
-# $OpenBSD: powerpc,v 1.26 2007/08/16 16:14:20 pvalchev Exp $
+# $OpenBSD: powerpc,v 1.27 2008/08/20 09:12:10 ajacoutot Exp $
 # This is the master list of subdirs used to choose powerpc packages.
 # Use with ${PORTSDIR}/infrastructure/package/check-plist
 # to create actual SUBDIRLIST to pass to ports main Makefile.
 net/rsync
 net/cvsync
-sysutils/mergemaster
 editors/vim,no_x11
 editors/emacs21
 shells/bash

infrastructure/plist/sh

@@ -1,9 +1,8 @@
-# $OpenBSD: sh,v 1.1 2007/01/04 13:34:06 robert Exp $
+# $OpenBSD: sh,v 1.2 2008/08/20 09:12:10 ajacoutot Exp $
 # This is the master list of subdirs used to choose sh packages.
 # Use with ${PORTSDIR}/infrastructure/package/check-plist
 # to create actual SUBDIRLIST to pass to ports main Makefile.
 net/rsync
-sysutils/mergemaster
 editors/vim,no_x11
 archivers/unzip
 archivers/bzip2

infrastructure/plist/sparc

@@ -1,10 +1,9 @@
-# $OpenBSD: sparc,v 1.21 2007/03/08 22:55:17 pvalchev Exp $
+# $OpenBSD: sparc,v 1.22 2008/08/20 09:12:10 ajacoutot Exp $
 # This is the master list of subdirs used to choose sparc packages.
 # Use with ${PORTSDIR}/infrastructure/package/check-plist
 # to create actual SUBDIRLIST to pass to ports main Makefile.
 net/rsync
 #textproc/gdiff
-#sysutils/mergemaster
 #editors/vim,no_x11 XXX
 editors/emacs21
 misc/screen

infrastructure/plist/sparc64

@@ -1,10 +1,9 @@
-# $OpenBSD: sparc64,v 1.30 2008/03/05 17:52:25 pvalchev Exp $
+# $OpenBSD: sparc64,v 1.31 2008/08/20 09:12:10 ajacoutot Exp $
 # This is the master list of subdirs used to choose sparc64 packages.
 # Use with ${PORTSDIR}/infrastructure/package/check-plist
 # to create actual SUBDIRLIST to pass to ports main Makefile.
 net/rsync
 textproc/gdiff
-sysutils/mergemaster
 editors/vim,no_x11
 editors/emacs21
 archivers/unzip

infrastructure/plist/vax

@@ -1,11 +1,10 @@
-# $OpenBSD: vax,v 1.14 2008/02/08 22:24:24 okan Exp $
+# $OpenBSD: vax,v 1.15 2008/08/20 09:12:10 ajacoutot Exp $
 # This is the master list of subdirs used to choose vax packages.
 # Use with ${PORTSDIR}/infrastructure/package/check-plist
 # to create actual SUBDIRLIST to pass to ports main Makefile.
 net/rsync
 net/cvsup
 net/cvsync
-sysutils/mergemaster
 editors/vim,no_x11
 editors/emacs21
 archivers/unzip