[pkgsrc/trunk]: pkgsrc/net/samba4 The smb.conf(5) man page builds fine on net...

[hauke <hauke%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/50ae643ba538
branches:  trunk
changeset: 432140:50ae643ba538
user:      hauke <hauke%pkgsrc.org@localhost>
date:      Tue May 19 12:13:51 2020 +0000

description:
The smb.conf(5) man page builds fine on netbsd-9, so re-add it.

This is probably the most important of the Samba man pages, and it
should not have been excluded from the build without a detailed
explanation, "just to make the pkg build".

diffstat:

 net/samba4/Makefile                              |   3 ++-
 net/samba4/PLIST                                 |   3 ++-
 net/samba4/distinfo                              |   3 +--
 net/samba4/patches/patch-docs-xml_wscript__build |  14 --------------
 4 files changed, 5 insertions(+), 18 deletions(-)

diffs (64 lines):

diff -r e5a94c2316c0 -r 50ae643ba538 net/samba4/Makefile
--- a/net/samba4/Makefile       Tue May 19 12:09:07 2020 +0000
+++ b/net/samba4/Makefile       Tue May 19 12:13:51 2020 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.97 2020/05/13 04:29:24 rillig Exp $
+# $NetBSD: Makefile,v 1.98 2020/05/19 12:13:51 hauke Exp $
 
 DISTNAME=      samba-4.12.2
+PKGREVISION=   1
 CATEGORIES=    net
 MASTER_SITES=  https://download.samba.org/pub/samba/stable/
 
diff -r e5a94c2316c0 -r 50ae643ba538 net/samba4/PLIST
--- a/net/samba4/PLIST  Tue May 19 12:09:07 2020 +0000
+++ b/net/samba4/PLIST  Tue May 19 12:13:51 2020 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.29 2020/04/29 10:01:18 adam Exp $
+@comment $NetBSD: PLIST,v 1.30 2020/05/19 12:13:51 hauke Exp $
 bin/cifsdd
 bin/dbwrap_tool
 bin/dumpmscat
@@ -809,6 +809,7 @@
 man/man1/wbinfo.1
 man/man5/lmhosts.5
 man/man5/pam_winbind.conf.5
+man/man5/smb.conf.5
 man/man5/smbgetrc.5
 man/man5/smbpasswd.5
 man/man7/libsmbclient.7
diff -r e5a94c2316c0 -r 50ae643ba538 net/samba4/distinfo
--- a/net/samba4/distinfo       Tue May 19 12:09:07 2020 +0000
+++ b/net/samba4/distinfo       Tue May 19 12:13:51 2020 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.45 2020/04/29 10:01:18 adam Exp $
+$NetBSD: distinfo,v 1.46 2020/05/19 12:13:51 hauke Exp $
 
 SHA1 (samba-4.12.2.tar.gz) = c7c5b42fbcba4d2cbb505d8827ae43544d978c32
 RMD160 (samba-4.12.2.tar.gz) = 0abe010cfe12b10583bbbfa37d9fdde224ac7801
@@ -9,7 +9,6 @@
 SHA1 (patch-buildtools_wafsamba_samba__pidl.py) = e4c0ed3dacfcf5613a5b397b3c6cf88509497da7
 SHA1 (patch-buildtools_wafsamba_samba__utils.py) = 0a587421870c1974175fadbb02dde215f35938f2
 SHA1 (patch-buildtools_wafsamba_wscript) = 0ca4c3a9d2e07f9165784e495f6f6b2b21db2758
-SHA1 (patch-docs-xml_wscript__build) = 5aa5cbf61882604b7ec9d19f0cd1537a23705ad0
 SHA1 (patch-dynconfig_wscript) = 1858e5fcca913f21aa3e7868d9760b9c40c9f5c4
 SHA1 (patch-lib_param_loadparm.h) = 0216b69d33d1e17260a446e11bee764116c52b18
 SHA1 (patch-lib_pthreadpool_pthreadpool.c) = c29490473063d6bdbe5c50780a21bf2869ae959f
diff -r e5a94c2316c0 -r 50ae643ba538 net/samba4/patches/patch-docs-xml_wscript__build
--- a/net/samba4/patches/patch-docs-xml_wscript__build  Tue May 19 12:09:07 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-$NetBSD: patch-docs-xml_wscript__build,v 1.1 2018/12/22 01:13:52 adam Exp $
-
-Buidling smb.conf.5 is problematic.
-
---- docs-xml/wscript_build.orig        2018-12-21 20:53:06.000000000 +0000
-+++ docs-xml/wscript_build
-@@ -154,7 +154,6 @@ def SMBDOTCONF_MANPAGE(bld, target):
- 
- if ('XSLTPROC_MANPAGES' in bld.env and bld.env['XSLTPROC_MANPAGES']):
- 
--    SMBDOTCONF_MANPAGE(bld, 'manpages/smb.conf.5')
-     bld.SAMBAMANPAGES(manpages)
- 
-     if bld.CONFIG_SET('WITH_PAM_MODULES') and bld.CONFIG_SET('HAVE_PAM_START'):