Remove deprecated @dirrm's from pkg-plist of samba ports.

Note that net/samba4 got it's PORTVERSION bumped as stage-qa found
one file not included in pkg-plist.

PR:		205950
Submitted by:	myself
Approved by:	maintainer timeout

5 files changed, 29 insertions, 189 deletions

diff --git a/net/samba36/pkg-plist.swat b/net/samba36/pkg-plist.swat
index 0aafe08d694c..6ec8a653a061 100644
--- a/net/samba36/pkg-plist.swat
+++ b/net/samba36/pkg-plist.swat
@@ -337,25 +337,9 @@ share/swat/lang/tr/images/samba.gif
 share/swat/lang/tr/images/shares.gif
 share/swat/lang/tr/images/status.gif
 share/swat/lang/tr/images/viewconfig.gif
-@dirrm share/swat/lang/tr/js
-@dirrm share/swat/lang/tr/include
-@dirrm share/swat/lang/tr/images
-@dirrm share/swat/lang/tr/help
-@dirrm share/swat/lang/tr
-@dirrm share/swat/lang/ja/js
-@dirrm share/swat/lang/ja/include
-@dirrm share/swat/lang/ja/images
-@dirrm share/swat/lang/ja/help
-@dirrm share/swat/lang/ja
-@dirrm share/swat/lang
-@dirrm share/swat/js
-@dirrm share/swat/include
-@dirrm share/swat/images
-@dirrm share/swat/help/manpages
-@dirrm share/swat/help/Samba3-HOWTO/images
-@dirrm share/swat/help/Samba3-HOWTO
-@dirrm share/swat/help/Samba3-Developers-Guide
-@dirrm share/swat/help/Samba3-ByExample/images
-@dirrm share/swat/help/Samba3-ByExample
-@dirrm share/swat/help
-@dirrm share/swat
+@dir share/swat/lang/tr/js
+@dir share/swat/lang/tr/include
+@dir share/swat/lang/ja/js
+@dir share/swat/lang/ja/include
+@dir share/swat/lang/ja/images
+@dir share/swat/js
diff --git a/net/samba4/Makefile b/net/samba4/Makefile
index 849d750fe40e..9c9fe54c0ef7 100644
--- a/net/samba4/Makefile
+++ b/net/samba4/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME?=		${SAMBA4_BASENAME}4
 PORTVERSION?=		${SAMBA4_VERSION}
-PORTREVISION?=		3
+PORTREVISION?=		4
 CATEGORIES?=		net
 MASTER_SITES=		SAMBA/samba/stable SAMBA/samba/rc
 DISTNAME=		${SAMBA4_DISTNAME}
diff --git a/net/samba4/pkg-plist b/net/samba4/pkg-plist
index bea33fc8b247..04e1eb32cdab 100644
--- a/net/samba4/pkg-plist
+++ b/net/samba4/pkg-plist
@@ -152,12 +152,6 @@ include/samba4/util/time.h
 include/samba4/util/xfile.h
 include/samba4/util_ldb.h
 include/samba4/wbclient.h
-@dirrm include/samba4/util
-@dirrm include/samba4/samba
-@dirrm include/samba4/ndr
-@dirrm include/samba4/gen_ndr
-@dirrm include/samba4/core
-@dirrm include/samba4
 lib/libdcerpc-atsvc.so
 lib/libdcerpc-atsvc.so.0
 lib/libdcerpc-binding.so
@@ -445,20 +439,6 @@ lib/shared-modules/vfs/zfsacl.so
 %%MODULE_VFS_SHADOW_COPY_TEST%%lib/shared-modules/vfs/shadow_copy_test.so
 %%MODULE_VFS_SKEL_OPAQUE%%lib/shared-modules/vfs/skel_opaque.so
 %%MODULE_VFS_SKEL_TRANSPARENT%%lib/shared-modules/vfs/skel_transparent.so
-@dirrmtry lib/shared-modules/vfs
-%%AD_DC%%@dirrmtry lib/shared-modules/service
-%%AD_DC%%@dirrmtry lib/shared-modules/process_model
-@dirrmtry lib/shared-modules/perfcount
-@dirrmtry lib/shared-modules/pdb
-@dirrmtry lib/shared-modules/nss_info
-@dirrmtry lib/shared-modules/ldb
-@dirrmtry lib/shared-modules/idmap
-@dirrmtry lib/shared-modules/gpext
-@dirrmtry lib/shared-modules/gensec
-@dirrmtry lib/shared-modules/bind9
-@dirrmtry lib/shared-modules/auth
-@dirrmtry lib/shared-modules
-@dirrmtry lib/samba
 libdata/pkgconfig/dcerpc.pc
 libdata/pkgconfig/dcerpc_atsvc.pc
 libdata/pkgconfig/dcerpc_samr.pc
@@ -699,22 +679,6 @@ libdata/pkgconfig/wbclient.pc
 %%AD_DC%%%%PYTHON_SITELIBDIR%%/samba/xattr_native.so
 %%AD_DC%%%%PYTHON_SITELIBDIR%%/samba/xattr_tdb.so
 @unexec find %D/%%PYTHON_SITELIBDIR%%/samba -name '*.py[co]' -delete >/dev/null 2>&1
-@dirrm %%PYTHON_SITELIBDIR%%/samba/web_server
-@dirrm %%PYTHON_SITELIBDIR%%/samba/tests/samba_tool
-@dirrm %%PYTHON_SITELIBDIR%%/samba/tests/dcerpc
-@dirrm %%PYTHON_SITELIBDIR%%/samba/tests/blackbox
-@dirrm %%PYTHON_SITELIBDIR%%/samba/tests
-@dirrm %%PYTHON_SITELIBDIR%%/samba/samba3
-@dirrm %%PYTHON_SITELIBDIR%%/samba/provision
-@dirrm %%PYTHON_SITELIBDIR%%/samba/netcmd
-@dirrm %%PYTHON_SITELIBDIR%%/samba/external/testtools/tests
-@dirrm %%PYTHON_SITELIBDIR%%/samba/external/testtools/testresult
-@dirrm %%PYTHON_SITELIBDIR%%/samba/external/testtools
-@dirrm %%PYTHON_SITELIBDIR%%/samba/external/subunit/tests
-@dirrm %%PYTHON_SITELIBDIR%%/samba/external/subunit
-@dirrm %%PYTHON_SITELIBDIR%%/samba/external
-@dirrm %%PYTHON_SITELIBDIR%%/samba/dcerpc
-@dirrm %%PYTHON_SITELIBDIR%%/samba
 bin/pidl
 man/man1/pidl.1.gz
 man/man3/Parse::Pidl::Dump.3.gz
@@ -747,14 +711,7 @@ man/man3/Parse::Pidl::Wireshark::NDR.3.gz
 %%DATADIR%%/perl5/Parse/Pidl/Util.pm
 %%DATADIR%%/perl5/Parse/Pidl/Wireshark/Conformance.pm
 %%DATADIR%%/perl5/Parse/Pidl/Wireshark/NDR.pm
-@dirrm %%DATADIR%%/perl5/Parse/Pidl/Wireshark
-@dirrm %%DATADIR%%/perl5/Parse/Pidl/Samba4/NDR
-@dirrm %%DATADIR%%/perl5/Parse/Pidl/Samba4/COM
-@dirrm %%DATADIR%%/perl5/Parse/Pidl/Samba4
-@dirrm %%DATADIR%%/perl5/Parse/Pidl/Samba3
-@dirrm %%DATADIR%%/perl5/Parse/Pidl
-@dirrm %%DATADIR%%/perl5/Parse
-@dirrm %%DATADIR%%/perl5
+%%DATADIR%%/perl5/Parse/Yapp/Driver.pm
 %%DATADIR%%/codepages/de.msg
 %%DATADIR%%/codepages/en.msg
 %%DATADIR%%/codepages/fi.msg
@@ -892,25 +849,6 @@ man/man3/Parse::Pidl::Wireshark::NDR.3.gz
 %%DATADIR%%/swat/lang/tr/images/shares.gif
 %%DATADIR%%/swat/lang/tr/images/status.gif
 %%DATADIR%%/swat/lang/tr/images/viewconfig.gif
-@dirrm %%DATADIR%%/swat/lang/tr/images
-@dirrm %%DATADIR%%/swat/lang/tr/help
-@dirrm %%DATADIR%%/swat/lang/tr
-@dirrm %%DATADIR%%/swat/lang/ru/include
-@dirrm %%DATADIR%%/swat/lang/ru/images
-@dirrm %%DATADIR%%/swat/lang/ru/help
-@dirrm %%DATADIR%%/swat/lang/ru
-@dirrm %%DATADIR%%/swat/lang/ja/help
-@dirrm %%DATADIR%%/swat/lang/ja
-@dirrm %%DATADIR%%/swat/lang
-@dirrm %%DATADIR%%/swat/include
-@dirrm %%DATADIR%%/swat/images
-@dirrm %%DATADIR%%/swat/help
-@dirrm %%DATADIR%%/swat
-%%AD_DC%%@dirrm %%DATADIR%%/setup/display-specifiers
-%%AD_DC%%@dirrm %%DATADIR%%/setup/ad-schema
-%%AD_DC%%@dirrm %%DATADIR%%/setup
-@dirrm %%DATADIR%%/codepages
-@dirrm %%DATADIR%%
 man/man1/dbwrap_tool.1.gz
 man/man1/findsmb.1.gz
 man/man1/gentest.1.gz
@@ -1005,7 +943,10 @@ man/man8/vfs_time_audit.8.gz
 man/man8/vfs_tsmsm.8.gz
 man/man8/vfs_xattr_tdb.8.gz
 man/man8/winbindd.8.gz
-@dirrmtry /var/run/samba4
-@dirrmtry /var/log/samba4
-@dirrmtry /var/db/samba4/private
-@dirrmtry /var/db/samba4
+@dir lib/shared-modules/perfcount
+@dir lib/shared-modules/pdb
+@dir lib/shared-modules/gpext
+@dir /var/run/samba4
+@dir /var/log/samba4
+@dir /var/db/samba4/private
+@dir /var/db/samba4
diff --git a/net/samba41/pkg-plist b/net/samba41/pkg-plist
index 52c2b6b18d5a..6a7ecb8b9a25 100644
--- a/net/samba41/pkg-plist
+++ b/net/samba41/pkg-plist
@@ -153,12 +153,6 @@ include/samba4/util/time.h
 include/samba4/util/xfile.h
 include/samba4/util_ldb.h
 include/samba4/wbclient.h
-@dirrm include/samba4/util
-@dirrm include/samba4/samba
-@dirrm include/samba4/ndr
-@dirrm include/samba4/gen_ndr
-@dirrm include/samba4/core
-@dirrm include/samba4
 lib/libdcerpc-atsvc.so
 lib/libdcerpc-atsvc.so.0
 lib/libdcerpc-binding.so
@@ -451,20 +445,6 @@ lib/shared-modules/vfs/zfsacl.so
 %%MODULE_VFS_SHADOW_COPY_TEST%%lib/shared-modules/vfs/shadow_copy_test.so
 %%MODULE_VFS_SKEL_OPAQUE%%lib/shared-modules/vfs/skel_opaque.so
 %%MODULE_VFS_SKEL_TRANSPARENT%%lib/shared-modules/vfs/skel_transparent.so
-@dirrmtry lib/shared-modules/vfs
-%%AD_DC%%@dirrmtry lib/shared-modules/service
-%%AD_DC%%@dirrmtry lib/shared-modules/process_model
-@dirrmtry lib/shared-modules/perfcount
-@dirrmtry lib/shared-modules/pdb
-@dirrmtry lib/shared-modules/nss_info
-@dirrmtry lib/shared-modules/ldb
-@dirrmtry lib/shared-modules/idmap
-@dirrmtry lib/shared-modules/gpext
-@dirrmtry lib/shared-modules/gensec
-@dirrmtry lib/shared-modules/bind9
-@dirrmtry lib/shared-modules/auth
-@dirrmtry lib/shared-modules
-@dirrmtry lib/samba
 libdata/pkgconfig/dcerpc.pc
 libdata/pkgconfig/dcerpc_atsvc.pc
 libdata/pkgconfig/dcerpc_samr.pc
@@ -805,28 +785,6 @@ libdata/pkgconfig/wbclient.pc
 %%AD_DC%%%%PYTHON_SITELIBDIR%%/samba/xattr_native.so
 %%AD_DC%%%%PYTHON_SITELIBDIR%%/samba/xattr_tdb.so
 @unexec find %D/%%PYTHON_SITELIBDIR%%/samba -name '*.py[co]' -delete >/dev/null 2>&1
-@dirrm %%PYTHON_SITELIBDIR%%/samba/web_server
-@dirrm %%PYTHON_SITELIBDIR%%/samba/tests/samba_tool
-@dirrm %%PYTHON_SITELIBDIR%%/samba/tests/dcerpc
-@dirrm %%PYTHON_SITELIBDIR%%/samba/tests/blackbox
-@dirrm %%PYTHON_SITELIBDIR%%/samba/tests
-@dirrm %%PYTHON_SITELIBDIR%%/samba/samba3
-@dirrm %%PYTHON_SITELIBDIR%%/samba/provision
-@dirrm %%PYTHON_SITELIBDIR%%/samba/netcmd
-@dirrm %%PYTHON_SITELIBDIR%%/samba/external/testtools/tests/matchers
-@dirrm %%PYTHON_SITELIBDIR%%/samba/external/testtools/tests
-@dirrm %%PYTHON_SITELIBDIR%%/samba/external/testtools/testresult
-@dirrm %%PYTHON_SITELIBDIR%%/samba/external/testtools/matchers
-@dirrm %%PYTHON_SITELIBDIR%%/samba/external/testtools
-@dirrm %%PYTHON_SITELIBDIR%%/samba/external/subunit/tests
-@dirrm %%PYTHON_SITELIBDIR%%/samba/external/subunit
-%%PY_DNSPYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN
-%%PY_DNSPYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY
-%%PY_DNSPYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes
-%%PY_DNSPYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/samba/external/dns
-@dirrm %%PYTHON_SITELIBDIR%%/samba/external
-@dirrm %%PYTHON_SITELIBDIR%%/samba/dcerpc
-@dirrm %%PYTHON_SITELIBDIR%%/samba
 %%DATADIR%%/codepages/lowcase.dat
 %%DATADIR%%/codepages/upcase.dat
 %%DATADIR%%/codepages/valid.dat
@@ -920,11 +878,6 @@ libdata/pkgconfig/wbclient.pc
 %%AD_DC%%%%DATADIR%%/setup/slapd.conf
 %%AD_DC%%%%DATADIR%%/setup/spn_update_list
 %%AD_DC%%%%DATADIR%%/setup/ypServ30.ldif
-%%AD_DC%%@dirrm %%DATADIR%%/setup/display-specifiers
-%%AD_DC%%@dirrm %%DATADIR%%/setup/ad-schema
-%%AD_DC%%@dirrm %%DATADIR%%/setup
-@dirrm %%DATADIR%%/codepages
-@dirrm %%DATADIR%%
 man/man1/dbwrap_tool.1.gz
 man/man1/findsmb.1.gz
 man/man1/gentest.1.gz
@@ -1024,7 +977,10 @@ man/man8/vfs_time_audit.8.gz
 man/man8/vfs_tsmsm.8.gz
 man/man8/vfs_xattr_tdb.8.gz
 man/man8/winbindd.8.gz
-@dirrmtry /var/run/samba4
-@dirrmtry /var/log/samba4
-@dirrmtry /var/db/samba4/private
-@dirrmtry /var/db/samba4
+@dir lib/shared-modules/perfcount
+@dir lib/shared-modules/pdb
+@dir lib/shared-modules/gpext
+@dir /var/run/samba4
+@dir /var/log/samba4
+@dir /var/db/samba4/private
+@dir /var/db/samba4
diff --git a/net/samba42/pkg-plist b/net/samba42/pkg-plist
index 993127e7ae0e..adab64c87e4b 100644
--- a/net/samba42/pkg-plist
+++ b/net/samba42/pkg-plist
@@ -161,12 +161,6 @@ include/samba4/util/time.h
 include/samba4/util/xfile.h
 include/samba4/util_ldb.h
 include/samba4/wbclient.h
-@dirrm include/samba4/util
-@dirrm include/samba4/samba
-@dirrm include/samba4/ndr
-@dirrm include/samba4/gen_ndr
-@dirrm include/samba4/core
-@dirrm include/samba4
 lib/libdcerpc-atsvc.so
 lib/libdcerpc-atsvc.so.0
 lib/libdcerpc-binding.so
@@ -463,20 +457,6 @@ lib/shared-modules/vfs/zfsacl.so
 %%MODULE_VFS_SHADOW_COPY_TEST%%lib/shared-modules/vfs/shadow_copy_test.so
 %%MODULE_VFS_SKEL_OPAQUE%%lib/shared-modules/vfs/skel_opaque.so
 %%MODULE_VFS_SKEL_TRANSPARENT%%lib/shared-modules/vfs/skel_transparent.so
-@dirrmtry lib/shared-modules/vfs
-%%AD_DC%%@dirrmtry lib/shared-modules/service
-%%AD_DC%%@dirrmtry lib/shared-modules/process_model
-@dirrmtry lib/shared-modules/perfcount
-@dirrmtry lib/shared-modules/pdb
-@dirrmtry lib/shared-modules/nss_info
-@dirrmtry lib/shared-modules/ldb
-@dirrmtry lib/shared-modules/idmap
-@dirrmtry lib/shared-modules/gpext
-@dirrmtry lib/shared-modules/gensec
-@dirrmtry lib/shared-modules/bind9
-@dirrmtry lib/shared-modules/auth
-@dirrmtry lib/shared-modules
-@dirrmtry lib/samba
 %%PKGCONFIGDIR%%/dcerpc.pc
 %%PKGCONFIGDIR%%/dcerpc_atsvc.pc
 %%PKGCONFIGDIR%%/dcerpc_samr.pc
@@ -741,25 +721,6 @@ lib/shared-modules/vfs/zfsacl.so
 %%AD_DC%%%%PYTHON_SITELIBDIR%%/samba/xattr_native.so
 %%AD_DC%%%%PYTHON_SITELIBDIR%%/samba/xattr_tdb.so
 @unexec find %D/%%PYTHON_SITELIBDIR%%/samba -name '*.py[co]' -delete >/dev/null 2>&1
-@dirrm %%PYTHON_SITELIBDIR%%/samba/web_server
-@dirrm %%PYTHON_SITELIBDIR%%/samba/tests/samba_tool
-@dirrm %%PYTHON_SITELIBDIR%%/samba/tests/dcerpc
-@dirrm %%PYTHON_SITELIBDIR%%/samba/tests/blackbox
-@dirrm %%PYTHON_SITELIBDIR%%/samba/tests
-@dirrm %%PYTHON_SITELIBDIR%%/samba/samba3
-@dirrm %%PYTHON_SITELIBDIR%%/samba/provision
-@dirrm %%PYTHON_SITELIBDIR%%/samba/netcmd
-@dirrm %%PYTHON_SITELIBDIR%%/samba/external/testtools/tests/matchers
-@dirrm %%PYTHON_SITELIBDIR%%/samba/external/testtools/tests
-@dirrm %%PYTHON_SITELIBDIR%%/samba/external/testtools/testresult
-@dirrm %%PYTHON_SITELIBDIR%%/samba/external/testtools/matchers
-@dirrm %%PYTHON_SITELIBDIR%%/samba/external/testtools
-@dirrm %%PYTHON_SITELIBDIR%%/samba/external/subunit/tests
-@dirrm %%PYTHON_SITELIBDIR%%/samba/external/subunit
-@dirrm %%PYTHON_SITELIBDIR%%/samba/external/extras
-@dirrm %%PYTHON_SITELIBDIR%%/samba/external
-@dirrm %%PYTHON_SITELIBDIR%%/samba/dcerpc
-@dirrm %%PYTHON_SITELIBDIR%%/samba
 %%DATADIR%%/codepages/lowcase.dat
 %%DATADIR%%/codepages/upcase.dat
 %%DATADIR%%/codepages/valid.dat
@@ -851,11 +812,6 @@ lib/shared-modules/vfs/zfsacl.so
 %%AD_DC%%%%DATADIR%%/setup/slapd.conf
 %%AD_DC%%%%DATADIR%%/setup/spn_update_list
 %%AD_DC%%%%DATADIR%%/setup/ypServ30.ldif
-%%AD_DC%%@dirrm %%DATADIR%%/setup/display-specifiers
-%%AD_DC%%@dirrm %%DATADIR%%/setup/ad-schema
-%%AD_DC%%@dirrm %%DATADIR%%/setup
-@dirrm %%DATADIR%%/codepages
-@dirrm %%DATADIR%%
 man/man1/dbwrap_tool.1.gz
 man/man1/findsmb.1.gz
 man/man1/gentest.1.gz
@@ -958,7 +914,10 @@ man/man8/vfs_tsmsm.8.gz
 man/man8/vfs_worm.8.gz
 man/man8/vfs_xattr_tdb.8.gz
 man/man8/winbindd.8.gz
-@dirrmtry /var/run/samba4
-@dirrmtry /var/log/samba4
-@dirrmtry /var/db/samba4/private
-@dirrmtry /var/db/samba4
+@dir lib/shared-modules/perfcount
+@dir lib/shared-modules/pdb
+@dir lib/shared-modules/gpext
+@dir /var/run/samba4
+@dir /var/log/samba4
+@dir /var/db/samba4/private
+@dir /var/db/samba4