diff options
| author | tnn <tnn@pkgsrc.org> | 2018-09-20 18:24:08 +0000 |
|---|---|---|
| committer | tnn <tnn@pkgsrc.org> | 2018-09-20 18:24:08 +0000 |
| commit | 3fd5bb2c85f8cbe7af5b9adb103433c84315bffe (patch) | |
| tree | dcbc3b8e16af0b2bd37d786471af3a1e7edd6344 /net | |
| parent | 7f204713e822c43bc2f637aa92006f89e754f443 (diff) | |
| download | pkgsrc-3fd5bb2c85f8cbe7af5b9adb103433c84315bffe.tar.gz | |
samba4: fix PLIST error if building while pkg is already installed
Diffstat (limited to 'net')
| -rw-r--r-- | net/samba4/distinfo | 3 | ||||
| -rw-r--r-- | net/samba4/patches/patch-pidl_lib_wscript__build | 18 |
2 files changed, 20 insertions, 1 deletions
diff --git a/net/samba4/distinfo b/net/samba4/distinfo index 6b456118e85..3b8e0bdd503 100644 --- a/net/samba4/distinfo +++ b/net/samba4/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.17 2017/11/11 01:32:47 jklos Exp $ +$NetBSD: distinfo,v 1.18 2018/09/20 18:24:08 tnn Exp $ SHA1 (samba-4.6.8.tar.gz) = 744fa10e3ad8ea7219e51c27f3792d99e25782be RMD160 (samba-4.6.8.tar.gz) = 3ecde1cfe97ce50d4864bf5c8e732127f13468bb @@ -11,6 +11,7 @@ SHA1 (patch-lib_param_loadparm.h) = 0216b69d33d1e17260a446e11bee764116c52b18 SHA1 (patch-lib_replace_wscript) = b6a042c2c13c0be78d7b64c0ce2efdaf4bbb1f3b SHA1 (patch-lib_tevent_wscript) = 9617b9e40d2ffc8d6297390a20ba9bd44147d669 SHA1 (patch-nsswitch_wscript__build) = e8a6251e031ffa13d6347fade8891f7afd65d3eb +SHA1 (patch-pidl_lib_wscript__build) = 82a4b42c20df7e6d8927b53471123f0536c81866 SHA1 (patch-source3_script_tests_test__smbclient__s3.sh) = 4b4be0691322afc70769602069c8a1bbd81ab639 SHA1 (patch-source4_heimdal__build_roken.h) = ee535f8e7cc46a3487d95bc859438c476a88fe60 SHA1 (patch-source4_scripting_wsript_build) = 6053076427835ac4fe97d93b2ff67d2caccc71f4 diff --git a/net/samba4/patches/patch-pidl_lib_wscript__build b/net/samba4/patches/patch-pidl_lib_wscript__build new file mode 100644 index 00000000000..38f6dfc768d --- /dev/null +++ b/net/samba4/patches/patch-pidl_lib_wscript__build @@ -0,0 +1,18 @@ +$NetBSD: patch-pidl_lib_wscript__build,v 1.1 2018/09/20 18:24:08 tnn Exp $ + +Fix PLIST error if building while pkg is already installed. +Samba's configure will detect it's own file in $PREFIX and +then elect to no install it because it thinks it is "system provided". + +--- pidl/lib/wscript_build.orig 2017-01-11 07:55:14.000000000 +0000 ++++ pidl/lib/wscript_build +@@ -31,7 +31,7 @@ bld.INSTALL_FILES(bld.env.PERL_LIB_INSTA + ''', + flat=False) + +-if not bld.CONFIG_SET('USING_SYSTEM_PARSE_YAPP_DRIVER'): +- bld.INSTALL_FILES(bld.env.PERL_LIB_INSTALL_DIR, ++#if not bld.CONFIG_SET('USING_SYSTEM_PARSE_YAPP_DRIVER'): ++bld.INSTALL_FILES(bld.env.PERL_LIB_INSTALL_DIR, + 'Parse/Yapp/Driver.pm', + flat=False) |