[csw-devel] SF.net SVN: gar:[21414] csw/mgar/pkg/samba/branches/samba3/Makefile

[lblume at users.sourceforge.net]

Revision: 21414
          http://gar.svn.sourceforge.net/gar/?rev=21414&view=rev
Author:   lblume
Date:     2013-06-29 23:17:38 +0000 (Sat, 29 Jun 2013)
Log Message:
-----------
samba/branches/samba3: Add missing dependencies; clean up file selection a bit; add overrides for all the evil things I've done

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

Modified: csw/mgar/pkg/samba/branches/samba3/Makefile
===================================================================
--- csw/mgar/pkg/samba/branches/samba3/Makefile	2013-06-29 13:43:02 UTC (rev 21413)
+++ csw/mgar/pkg/samba/branches/samba3/Makefile	2013-06-29 23:17:38 UTC (rev 21414)
@@ -152,17 +152,28 @@
 
 PACKAGES += CSWsamba-nss
 CATALOGNAME_CSWsamba-nss = samba_nss
-PKGFILES_CSWsamba-nss += $(call pkgfiles_lib,nss_winbind.so.1)
-PKGFILES_CSWsamba-nss += $(call pkgfiles_lib,nss_wins.so.1)
+PKGFILES_CSWsamba-nss += $(call baseisadirs,$(libdir),nss_winbind\.so\.1)
+PKGFILES_CSWsamba-nss += $(call baseisadirs,$(libdir),nss_wins\.so\.1)
 SPKG_DESC_CSWsamba-nss += Samba nss modules,nss_winbind.so.1,nss_wins.so.1
+RUNTIME_DEP_PKGS_CSWsamba-nss += CSWliblber2-4-2
+RUNTIME_DEP_PKGS_CSWsamba-nss += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWsamba-nss += CSWlibtevent0
+RUNTIME_DEP_PKGS_CSWsamba-nss += CSWlibtdb1
+RUNTIME_DEP_PKGS_CSWsamba-nss += CSWlibtalloc2
+RUNTIME_DEP_PKGS_CSWsamba-nss += CSWlibldap2-4-2
 OBSOLETED_BY_CSWsamba-nss += CSWlibnss-winbind1
+CHECKPKG_OVERRIDES_CSWsamba-nss += shared-lib-pkgname-mismatch
 
 PACKAGES += CSWsamba-nss-system-links
 CATALOGNAME_CSWsamba-nss-system-links = samba_nss_system_links
-PKGFILES_CSWsamba-nss-system-links += $(call baseisadirs,/usr/lib/$(MEMORYMODEL),nss_winbind_csw\.so\.1)
-PKGFILES_CSWsamba-nss-system-links += $(call baseisadirs,/usr/lib/$(MEMORYMODEL),nss_wins_csw\.so\.1)
+PKGFILES_CSWsamba-nss-system-links += /usr/lib/nss_winbind_csw.so.1
+PKGFILES_CSWsamba-nss-system-links += /usr/lib/nss_wins_csw.so.1
+PKGFILES_CSWsamba-nss-system-links += /usr/lib/64/nss_winbind_csw.so.1
+PKGFILES_CSWsamba-nss-system-links += /usr/lib/64/nss_wins_csw.so.1
 SPKG_DESC_CSWsamba-nss-system-links += Samba nss modules links for the system
 RUNTIME_DEP_PKGS_CSWsamba-nss-system-links += CSWsamba-nss
+CHECKPKG_OVERRIDES_CSWsamba-nss-system-links += surplus-dependency|CSWsamba-nss
+CHECKPKG_OVERRIDES_CSWsamba-nss-system-links += bad-location-of-file
 
 PACKAGES += CSWlibtevent0
 CATALOGNAME_CSWlibtevent0 = libtevent0
@@ -367,7 +378,7 @@
 	# system's nsswitch.conf
 	if [ "$(MEMORYMODEL)" = "32" ]; then \
 		ginstall -d $(DESTDIR)/usr/lib; \
-		ln -s ../../opt/csw/lib/$(MEMORYMODEL)/nss_winbind.so.1 \
+		ln -s ../../opt/csw/lib/nss_winbind.so.1 \
 			$(DESTDIR)/usr/lib/nss_winbind_csw.so.1; \
 		ln -s ../../opt/csw/lib/nss_wins.so.1 \
 			$(DESTDIR)/usr/lib/nss_wins_csw.so.1; \

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