diff options
author | sketch <sketch@pkgsrc.org> | 2009-09-09 11:22:22 +0000 |
---|---|---|
committer | sketch <sketch@pkgsrc.org> | 2009-09-09 11:22:22 +0000 |
commit | 8e3cb49c694494eb59a885b63b14cf7092be0589 (patch) | |
tree | 100ca321079e918030e19629ea12c2aa6d5e332a /net/samba | |
parent | edb9b13c1b77c1c38ae8f2b2473cf739e693ee5b (diff) | |
download | pkgsrc-8e3cb49c694494eb59a885b63b14cf7092be0589.tar.gz |
Conditionalise on NSS_INFO_MODULES further, fixes Solaris build. Change
double-negative test to a positive one.
Diffstat (limited to 'net/samba')
-rw-r--r-- | net/samba/distinfo | 4 | ||||
-rw-r--r-- | net/samba/patches/patch-ba | 21 |
2 files changed, 18 insertions, 7 deletions
diff --git a/net/samba/distinfo b/net/samba/distinfo index c9ff5d48d66..d98085a5ce2 100644 --- a/net/samba/distinfo +++ b/net/samba/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.70 2009/08/16 16:37:19 wiz Exp $ +$NetBSD: distinfo,v 1.71 2009/09/09 11:22:22 sketch Exp $ SHA1 (samba-3.0.36.tar.gz) = 6465a574a02823ecd0973d1f0fc0e851f04900cc RMD160 (samba-3.0.36.tar.gz) = aa50924ed9634e90be5fa4082477d57b48b55313 @@ -15,7 +15,7 @@ SHA1 (patch-av) = c29ba19e96c24ef95a9a043f8678d77c00d73506 SHA1 (patch-aw) = 5b6c1bf65d23564eaabf1bafda41a29d1f687538 SHA1 (patch-ax) = e528921710514bc2651bfca808c21d608f928a95 SHA1 (patch-ay) = e6ccc4fb20fa909f5d3cecbc4bf3628ba5b355e9 -SHA1 (patch-ba) = 9ec5be176f8ba502607340dd15277952e0610784 +SHA1 (patch-ba) = e343938306be37a5d364f47effe0b1187b64fe47 SHA1 (patch-bc) = d525b9201a5cda85346704ad7b860e2b3a3aeb08 SHA1 (patch-bd) = faf24c792ecff76972d0a80f5418d8c38ca9ed21 SHA1 (patch-be) = b3386824969a1a02cf8e5d5a9889ce55f6813f48 diff --git a/net/samba/patches/patch-ba b/net/samba/patches/patch-ba index 14899880707..099d6786a7d 100644 --- a/net/samba/patches/patch-ba +++ b/net/samba/patches/patch-ba @@ -1,7 +1,7 @@ -$NetBSD: patch-ba,v 1.8 2009/03/21 18:25:35 tron Exp $ +$NetBSD: patch-ba,v 1.9 2009/09/09 11:22:22 sketch Exp $ ---- Makefile.in.orig 2009-01-19 10:40:09.000000000 +0000 -+++ Makefile.in 2009-03-21 14:48:11.000000000 +0000 +--- Makefile.in.orig Mon Jan 19 10:40:09 2009 ++++ Makefile.in Wed Sep 9 11:00:17 2009 @@ -106,6 +106,9 @@ # the directory where lock files go LOCKDIR = @lockdir@ @@ -91,13 +91,24 @@ $NetBSD: patch-ba,v 1.8 2009/03/21 18:25:35 tron Exp $ @$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS) $(DESTDIR) $(prefix) $(RPCLIBDIR) $(RPC_MODULES) @$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS) $(DESTDIR) $(prefix) $(IDMAPLIBDIR) $(IDMAP_MODULES) - @$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS) $(DESTDIR) $(prefix) $(NSSINFOLIBDIR) $(NSS_INFO_MODULES) -+ @if [ ! -z "$(NSS_INFO_MODULES)" ]; then \ ++ @if [ -n "$(NSS_INFO_MODULES)" ]; then \ + $(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS) $(DESTDIR) $(prefix) $(NSSINFOLIBDIR) $(NSS_INFO_MODULES); \ + fi @$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS) $(DESTDIR) $(prefix) $(CHARSETLIBDIR) $(CHARSET_MODULES) @$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS) $(DESTDIR) $(prefix) $(AUTHLIBDIR) $(AUTH_MODULES) @$(SHELL) $(srcdir)/script/linkmodules.sh $(DESTDIR)$(PDBLIBDIR) ldapsam.@SHLIBEXT@ ldapsam_compat.@SHLIBEXT@ -@@ -1715,6 +1720,7 @@ +@@ -1617,7 +1622,9 @@ + @$(SHELL) $(srcdir)/script/linkmodules.sh $(DESTDIR)$(AUTHLIBDIR) sam.@SHLIBEXT@ sam_ignoredomain.@SHLIBEXT@ + @$(SHELL) $(srcdir)/script/linkmodules.sh $(DESTDIR)$(AUTHLIBDIR) domain.@SHLIBEXT@ trustdomain.@SHLIBEXT@ ntdomain.@SHLIBEXT@ + @$(SHELL) $(srcdir)/script/linkmodules.sh $(DESTDIR)$(AUTHLIBDIR) builtin.@SHLIBEXT@ guest.@SHLIBEXT@ fixed_challenge.@SHLIBEXT@ name_to_ntstatus.@SHLIBEXT@ +- @$(SHELL) $(srcdir)/script/linkmodules.sh $(DESTDIR)$(NSSINFOLIBDIR) ../idmap/ad.@SHLIBEXT@ rfc2307.@SHLIBEXT@ sfu.@SHLIBEXT@ ++ @if [ -n "$(NSS_INFO_MODULES)" ]; then \ ++ $(SHELL) $(srcdir)/script/linkmodules.sh $(DESTDIR)$(NSSINFOLIBDIR) ../idmap/ad.@SHLIBEXT@ rfc2307.@SHLIBEXT@ sfu.@SHLIBEXT@; \ ++ fi + + installscripts: installdirs + @$(SHELL) $(srcdir)/script/installscripts.sh $(INSTALLPERMS) $(DESTDIR)$(BINDIR) $(SCRIPTS) +@@ -1715,6 +1722,7 @@ @echo " privatedir: $(PRIVATE_DIR)" @echo " configdir: $(CONFIGDIR)" @echo " lockdir: $(LOCKDIR)" |