SF.net SVN: gar:[26027] csw/mgar/pkg/samba/branches/samba4/Makefile

[dmichelsen at users.sourceforge.net]

Revision: 26027
          http://sourceforge.net/p/gar/code/26027
Author:   dmichelsen
Date:     2016-11-08 13:41:51 +0000 (Tue, 08 Nov 2016)
Log Message:
-----------
samba/branches/samba4: Cleanup dependencies

Modified Paths:
--------------
    csw/mgar/pkg/samba/branches/samba4/Makefile

Modified: csw/mgar/pkg/samba/branches/samba4/Makefile
===================================================================
--- csw/mgar/pkg/samba/branches/samba4/Makefile	2016-11-08 08:26:59 UTC (rev 26026)
+++ csw/mgar/pkg/samba/branches/samba4/Makefile	2016-11-08 13:41:51 UTC (rev 26027)
@@ -148,13 +148,12 @@
 RUNTIME_DEP_PKGS_CSWsamba4 += CSWsamba4-winbind
 RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibpopt0
 RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibiconv2
-RUNTIME_DEP_PKGS_CSWsamba4_5.11 += CSWlibgcrypt11
 RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibintl9
 RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibreadline6
 #RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibgcc-s1
 RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibldap2-4-2
 RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibssp0
-RUNTIME_DEP_PKGS_CSWsamba4_5.10_sparc += CSWlibncurses6
+RUNTIME_DEP_PKGS_CSWsamba4_5.10 += CSWlibncurses6
 RUNTIME_DEP_PKGS_CSWsamba4_5.10 += CSWliblber2-4-2
 RUNTIME_DEP_PKGS_CSWsamba4_5.10 += CSWlibssl1-0-0
 RUNTIME_DEP_PKGS_CSWsamba4_5.10 += CSWlibz1
@@ -164,7 +163,6 @@
 RUNTIME_DEP_PKGS_CSWsamba4_5.10 += CSWlibgnutls28
 RUNTIME_DEP_PKGS_CSWsamba4 += $(RUNTIME_DEP_PKGS_CSWsamba4_$(GAROSREL))
 RUNTIME_DEP_PKGS_CSWsamba4 += $(RUNTIME_DEP_PKGS_CSWsamba4_$(GAROSREL)_$(GARCH))
-# Silence conflicts with CSWsamba
 CHECKPKG_OVERRIDES_CSWsamba4 += file-collision
 CHECKPKG_OVERRIDES_CSWsamba4 += file-with-bad-content|/usr/share|root/opt/csw/bin/smbtorture
 CHECKPKG_OVERRIDES_CSWsamba4 += surplus-dependency|CSWpython27
@@ -199,8 +197,7 @@
 RUNTIME_DEP_PKGS_CSWsamba4-client_5.10 += CSWlibcups2
 RUNTIME_DEP_PKGS_CSWsamba4-client_5.10 += CSWlibgnutls28
 RUNTIME_DEP_PKGS_CSWsamba4-client_5.10 += CSWlibldap2-4-2
-RUNTIME_DEP_PKGS_CSWsamba4-client_5.11 += CSWlibintl9
-RUNTIME_DEP_PKGS_CSWsamba4-client_sparc_5.10 += CSWlibintl9
+RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibintl9
 RUNTIME_DEP_PKGS_CSWsamba4-client += $(RUNTIME_DEP_PKGS_CSWsamba4-client_$(GAROSREL))
 RUNTIME_DEP_PKGS_CSWsamba4-client += $(RUNTIME_DEP_PKGS_CSWsamba4-client_$(GARCH)_$(GAROSREL))
 #CHECKPKG_OVERRIDES_CSWsamba4-client_5.11 += soname-unused
@@ -350,8 +347,7 @@
 RUNTIME_DEP_PKGS_CSWsamba4-python_5.10 += CSWlibcups2
 RUNTIME_DEP_PKGS_CSWsamba4-python_5.10 += CSWlibgnutls28
 RUNTIME_DEP_PKGS_CSWsamba4-python_5.10 += CSWlibldap2-4-2
-RUNTIME_DEP_PKGS_CSWsamba4-python_5.11 += CSWlibintl9
-RUNTIME_DEP_PKGS_CSWsamba4-python_sparc_5.10 += CSWlibintl9
+RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibintl9
 RUNTIME_DEP_PKGS_CSWsamba4-python += $(RUNTIME_DEP_PKGS_CSWsamba4-python_$(GAROSREL))
 RUNTIME_DEP_PKGS_CSWsamba4-python += $(RUNTIME_DEP_PKGS_CSWsamba4-python_$(GARCH)_$(GAROSREL))
 #CHECKPKG_OVERRIDES_CSWsamba4-python_5.11 += soname-unused
@@ -417,8 +413,7 @@
 RUNTIME_DEP_PKGS_CSWnss-winbind1 += CSWlibssp0
 RUNTIME_DEP_PKGS_CSWnss-winbind1 += CSWlibgcc-s1
 RUNTIME_DEP_PKGS_CSWnss-winbind1 += CSWsamba4-libs
-RUNTIME_DEP_PKGS_CSWnss-winbind1_5.11 += CSWlibintl9
-RUNTIME_DEP_PKGS_CSWnss-winbind1_sparc_5.10 += CSWlibintl9
+RUNTIME_DEP_PKGS_CSWnss-winbind1 += CSWlibintl9
 RUNTIME_DEP_PKGS_CSWnss-winbind1 += $(RUNTIME_DEP_PKGS_CSWnss-winbind1_$(GAROSREL))
 RUNTIME_DEP_PKGS_CSWnss-winbind1 += $(RUNTIME_DEP_PKGS_CSWnss-winbind1_$(GARCH)_$(GAROSREL))
 CHECKPKG_OVERRIDES_CSWnss-winbind1 += file-collision|/opt/csw/lib/nss_winbind.so.1|CSWnss-winbind1|CSWsamba-nss
@@ -432,8 +427,7 @@
 RUNTIME_DEP_PKGS_CSWwinbind-krb5locator += CSWsamba4-libs
 RUNTIME_DEP_PKGS_CSWwinbind-krb5locator += CSWlibgcc-s1
 RUNTIME_DEP_PKGS_CSWwinbind-krb5locator_5.10 += CSWlibssp0
-RUNTIME_DEP_PKGS_CSWwinbind-krb5locator_5.11 += CSWlibintl9
-RUNTIME_DEP_PKGS_CSWwinbind-krb5locator_sparc_5.10 += CSWlibintl9
+RUNTIME_DEP_PKGS_CSWwinbind-krb5locator += CSWlibintl9
 RUNTIME_DEP_PKGS_CSWwinbind-krb5locator += $(RUNTIME_DEP_PKGS_CSWwinbind-krb5locator_$(GAROSREL))
 RUNTIME_DEP_PKGS_CSWwinbind-krb5locator += $(RUNTIME_DEP_PKGS_CSWwinbind-krb5locator_$(GARCH)_$(GAROSREL))
 CHECKPKG_OVERRIDES_CSWwinbind-krb5locator += soname-equals-filename|file=/opt/csw/lib/winbind_krb5_locator.so

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.