diff options
| author | hauke <hauke@pkgsrc.org> | 2022-03-24 10:16:13 +0000 |
|---|---|---|
| committer | hauke <hauke@pkgsrc.org> | 2022-03-24 10:16:13 +0000 |
| commit | 19159527526ecda651db7fe7423bf5ad56b1d904 (patch) | |
| tree | a5e0bbbe85113144390ee3cbc54fd02fb1fe6b25 /net/samba4 | |
| parent | ef577282f797407358dff63ea214b9a576f9a985 (diff) | |
| download | pkgsrc-19159527526ecda651db7fe7423bf5ad56b1d904.tar.gz | |
Restore a SYSCONFDIR path substitution that had gone lost, probably as
a result of running mkpatches after 'make configure'.
Diffstat (limited to 'net/samba4')
| -rw-r--r-- | net/samba4/Makefile | 4 | ||||
| -rw-r--r-- | net/samba4/distinfo | 4 | ||||
| -rw-r--r-- | net/samba4/patches/patch-source4_heimdal__build_roken.h | 4 |
3 files changed, 7 insertions, 5 deletions
diff --git a/net/samba4/Makefile b/net/samba4/Makefile index 3f8deac5602..1d12f1c3b8c 100644 --- a/net/samba4/Makefile +++ b/net/samba4/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.141 2022/03/20 21:53:53 adam Exp $ +# $NetBSD: Makefile,v 1.142 2022/03/24 10:16:13 hauke Exp $ DISTNAME= samba-4.15.6 +PKGREVISION= 1 CATEGORIES= net MASTER_SITES= https://download.samba.org/pub/samba/stable/ @@ -159,6 +160,7 @@ SUBST_SED.docbook+= -e 's,http://docbook.sourceforge.net/release/xsl/current,${P SUBST_CLASSES+= paths SUBST_MESSAGE.paths= Fixing paths. SUBST_FILES.paths= ${WRKDIR}/adduser.sh ${WRKDIR}/deluser.sh +SUBST_FILES.paths+= source4/heimdal_build/roken.h SUBST_STAGE.paths= pre-configure SUBST_SED.paths+= -e 's,@PERL@,${PERL5},g' SUBST_VARS.paths= AWK CAT MKTEMP RM PWD_MKDB SH PERL PKG_SYSCONFBASE diff --git a/net/samba4/distinfo b/net/samba4/distinfo index 31fffdef37d..5b99ca2331f 100644 --- a/net/samba4/distinfo +++ b/net/samba4/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.75 2022/03/20 21:53:53 adam Exp $ +$NetBSD: distinfo,v 1.76 2022/03/24 10:16:13 hauke Exp $ BLAKE2s (samba-4.15.6.tar.gz) = b11fd56c12dfbb3e0dc3e7b5e25b73f964b3b26afcc504293f2050c9bb9b0cfd SHA512 (samba-4.15.6.tar.gz) = cd193d74173831449abc24f1769f0af2dabd5dd8a65507af7b09fde6dd5780d30336d59600add939b044cfa5781f357ec9192c7fed1a1e7278812b6c07b824e2 @@ -29,7 +29,7 @@ SHA1 (patch-source3_smbd_open.c) = 002f26f77dad54617bf9c0fe4fa12f093ef3b66c SHA1 (patch-source3_smbd_process.c) = 3a6f9682aca6473e364d0be0f601774df4fd1296 SHA1 (patch-source3_utils_net__offlinejoin.c) = 773a4686d5e2a7eaebf9430529708e8318d45c77 SHA1 (patch-source4_dsdb_samdb_ldb__modules_wscript__build__server) = 47f55ec16b667a0a4d38de5ac89a117f2ac8f898 -SHA1 (patch-source4_heimdal__build_roken.h) = 4d2b5ab1f5db994263c3a451175f01ff688ad20d +SHA1 (patch-source4_heimdal__build_roken.h) = c9fbcb1cf505022ae1483774ed429d74ac091253 SHA1 (patch-source4_heimdal_include_heim__threads.h) = 1108fe804f235c72a93bcda0ec14454828ed030f SHA1 (patch-source4_scripting_wsript_build) = 816d44f48b6cbc6d999995e00eaea1d2dc477159 SHA1 (patch-source4_utils_oLschema2ldif_wscript__build) = cbba15c2c0e1eee9d07424510a96b596f46992b4 diff --git a/net/samba4/patches/patch-source4_heimdal__build_roken.h b/net/samba4/patches/patch-source4_heimdal__build_roken.h index 465fdfe9a36..ad63a1ac387 100644 --- a/net/samba4/patches/patch-source4_heimdal__build_roken.h +++ b/net/samba4/patches/patch-source4_heimdal__build_roken.h @@ -1,4 +1,4 @@ -$NetBSD: patch-source4_heimdal__build_roken.h,v 1.3 2022/03/07 21:40:38 thor Exp $ +$NetBSD: patch-source4_heimdal__build_roken.h,v 1.4 2022/03/24 10:16:13 hauke Exp $ Substitute SYSCONFDIR in embedded Heimdal too. @@ -9,7 +9,7 @@ Substitute SYSCONFDIR in embedded Heimdal too. /* path to sysconf - should we force this to samba LIBDIR ? */ -#define SYSCONFDIR "/etc" -+#define SYSCONFDIR "/data/pkg/etc" ++#define SYSCONFDIR "@PKG_SYSCONFBASE@" #define rk_PATH_DELIM '/' |