diff options
| author | rillig <rillig@pkgsrc.org> | 2019-11-03 11:45:28 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2019-11-03 11:45:28 +0000 |
| commit | 6d1d2ca41e824dc78d236dd7507b72a54ede5a88 (patch) | |
| tree | 97ee76f3981200121bbba776c699b2cf57cc3af5 /net/samba | |
| parent | c541c77da9d5d98e1ba6000a10bd6ad0d291105c (diff) | |
| download | pkgsrc-6d1d2ca41e824dc78d236dd7507b72a54ede5a88.tar.gz | |
net: align variable assignments
pkglint -Wall -F --only aligned --only indent -r
No manual corrections.
Diffstat (limited to 'net/samba')
| -rw-r--r-- | net/samba/Makefile | 36 | ||||
| -rw-r--r-- | net/samba/options.mk | 6 |
2 files changed, 21 insertions, 21 deletions
diff --git a/net/samba/Makefile b/net/samba/Makefile index f5f14298a2a..3eb1a9d4053 100644 --- a/net/samba/Makefile +++ b/net/samba/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.276 2019/08/11 13:22:29 wiz Exp $ +# $NetBSD: Makefile,v 1.277 2019/11/03 11:45:52 rillig Exp $ DISTNAME= samba-${VERSION} CATEGORIES= net @@ -52,26 +52,26 @@ FILES_SUBST+= WINBINDD_RCD_SCRIPT=${WINBINDD_RCD_SCRIPT:Q} USE_TOOLS+= gmake mktemp perl:run pkg-config REPLACE_PERL= script/findsmb.in -BROKEN_GETTEXT_DETECTION=yes -GNU_CONFIGURE= yes -GNU_CONFIGURE_LIBDIR= ${SAMBA_LIBDIR} -CONFIGURE_ARGS+= --with-libiconv=${BUILDLINK_PREFIX.iconv} -CONFIGURE_ARGS+= --with-readline=${BUILDLINK_PREFIX.readline} -CONFIGURE_ARGS+= --with-configdir=${SAMBA_ETCDIR} -CONFIGURE_ARGS+= --with-lockdir=${SAMBA_LOCKDIR} -CONFIGURE_ARGS+= --with-logfilebase=${SAMBA_LOGDIR} -CONFIGURE_ARGS+= --with-modulesdir=${SAMBA_MODULESDIR} -CONFIGURE_ARGS+= --with-piddir=${SAMBA_PIDDIR} -CONFIGURE_ARGS+= --with-privatedir=${SAMBA_PRIVATE:Q} -CONFIGURE_ARGS+= --with-statedir=${SAMBA_STATEDIR} -CONFIGURE_ARGS+= --localstatedir=${SAMBA_VARDIR} -CONFIGURE_ARGS+= --with-mandir=${PREFIX}/${PKGMANDIR} -CONFIGURE_ARGS+= --with-swatdir=${PREFIX}/share/samba/swat -CONFIGURE_ARGS+= --enable-external-libtdb +BROKEN_GETTEXT_DETECTION= yes +GNU_CONFIGURE= yes +GNU_CONFIGURE_LIBDIR= ${SAMBA_LIBDIR} +CONFIGURE_ARGS+= --with-libiconv=${BUILDLINK_PREFIX.iconv} +CONFIGURE_ARGS+= --with-readline=${BUILDLINK_PREFIX.readline} +CONFIGURE_ARGS+= --with-configdir=${SAMBA_ETCDIR} +CONFIGURE_ARGS+= --with-lockdir=${SAMBA_LOCKDIR} +CONFIGURE_ARGS+= --with-logfilebase=${SAMBA_LOGDIR} +CONFIGURE_ARGS+= --with-modulesdir=${SAMBA_MODULESDIR} +CONFIGURE_ARGS+= --with-piddir=${SAMBA_PIDDIR} +CONFIGURE_ARGS+= --with-privatedir=${SAMBA_PRIVATE:Q} +CONFIGURE_ARGS+= --with-statedir=${SAMBA_STATEDIR} +CONFIGURE_ARGS+= --localstatedir=${SAMBA_VARDIR} +CONFIGURE_ARGS+= --with-mandir=${PREFIX}/${PKGMANDIR} +CONFIGURE_ARGS+= --with-swatdir=${PREFIX}/share/samba/swat +CONFIGURE_ARGS+= --enable-external-libtdb # # Explicitly disable samba4 merged-build option which is broken. # -CONFIGURE_ARGS+= --enable-merged-build=no +CONFIGURE_ARGS+= --enable-merged-build=no .include "../../net/samba/options.mk" diff --git a/net/samba/options.mk b/net/samba/options.mk index 8e518b409ad..ef56c28e1bf 100644 --- a/net/samba/options.mk +++ b/net/samba/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.39 2018/01/16 07:48:47 maya Exp $ +# $NetBSD: options.mk,v 1.40 2019/11/03 11:45:52 rillig Exp $ # Recommended package options for various setups: # @@ -154,10 +154,10 @@ NSS_WINBIND_cmd= \ # Install a /usr/lib/${NSS_WINBIND:T} -> ${PREFIX}/${NSS_WINBIND} symlink # Unfortunately NSS_WINDIND_cmd can not be used to determine whether the # (de)install templates are needed or not. -.if ${OS_VARIANT} != "SmartOS" +. if ${OS_VARIANT} != "SmartOS" INSTALL_TEMPLATES+= INSTALL.nss_winbind DEINSTALL_TEMPLATES+= DEINSTALL.nss_winbind -.endif +. endif .PHONY: samba-nss-winbind-install post-install: samba-nss-winbind-install |