[csw-devel] SF.net SVN: gar:[21101] csw/mgar/pkg/gnutls3/trunk/Makefile

[chninkel at users.sourceforge.net]

Revision: 21101
          http://gar.svn.sourceforge.net/gar/?rev=21101&view=rev
Author:   chninkel
Date:     2013-05-15 21:25:45 +0000 (Wed, 15 May 2013)
Log Message:
-----------
gnutls3/trunk: updated dependencies and disabled guile support for now

Modified Paths:
--------------
    csw/mgar/pkg/gnutls3/trunk/Makefile

Modified: csw/mgar/pkg/gnutls3/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gnutls3/trunk/Makefile	2013-05-15 20:40:34 UTC (rev 21100)
+++ csw/mgar/pkg/gnutls3/trunk/Makefile	2013-05-15 21:25:45 UTC (rev 21101)
@@ -29,35 +29,38 @@
 PACKAGES += CSWgnutls
 CATALOGNAME_gnutls = gnutls
 SPKG_DESC_CSWgnutls = GNU Transport Layer Security Utility Programs
-RUNTIME_DEP_PKGS_CSWgnutls += CSWlibgnutls26
-RUNTIME_DEP_PKGS_CSWgnutls += CSWgpgerr
-RUNTIME_DEP_PKGS_CSWgnutls += CSWreadline
-RUNTIME_DEP_PKGS_CSWgnutls += CSWzlib
-RUNTIME_DEP_PKGS_CSWgnutls += CSWlibtasn1-3
-RUNTIME_DEP_PKGS_CSWgnutls += CSWgcrypt
-RUNTIME_DEP_PKGS_CSWgnutls += CSWggettextrt
+RUNTIME_DEP_PKGS_CSWgnutls += CSWlibgnutls28
+RUNTIME_DEP_PKGS_CSWgnutls += CSWlibintl8
 # This is a dependency for legacy packages expecting to find libgnutls*.so.13 in CSWgnutls.
 # CSWlibgnutls13 is built from a branch
 RUNTIME_DEP_PKGS_CSWgnutls += CSWlibgnutls13
 CHECKPKG_OVERRIDES_CSWgnutls += unidentified-dependency|CSWlibgnutls13
 CHECKPKG_OVERRIDES_CSWgnutls += surplus-dependency|CSWlibgnutls13
 
-PACKAGES += CSWlibgnutls26
-CATALOGNAME_CSWlibgnutls = libgnutls26
-SPKG_DESC_CSWlibgnutls26 = GNU Transport Layer Security libraries and tools providing libgnutls*.so.26
-PKGFILES_CSWlibgnutls26 = $(call baseisadirs,$(libdir),libgnutls.*\.so\.26(\.\d+)*)
-RUNTIME_DEP_PKGS_CSWlibgnutls26 += CSWgcrypt
-RUNTIME_DEP_PKGS_CSWlibgnutls26 += CSWggettextrt
-RUNTIME_DEP_PKGS_CSWlibgnutls26 += CSWgpgerr
-RUNTIME_DEP_PKGS_CSWlibgnutls26 += CSWlibtasn1-3
-RUNTIME_DEP_PKGS_CSWlibgnutls26 += CSWzlib
+PACKAGES += CSWlibgnutls28
+CATALOGNAME_CSWlibgnutls = libgnutls28
+SPKG_DESC_CSWlibgnutls28 = GNU Transport Layer Security libraries and tools providing libgnutls*.so.28
+PKGFILES_CSWlibgnutls28  = $(PKGFILES_RT)
+PKGFILES_CSWlibgnutls28 += $(docdir)/libgnutls28/.*
+RUNTIME_DEP_PKGS_CSWlibgnutls28 += CSWlibz1
+RUNTIME_DEP_PKGS_CSWlibgnutls28 += CSWlibgnutls26
+RUNTIME_DEP_PKGS_CSWlibgnutls28 += CSWlibhogweed2
+RUNTIME_DEP_PKGS_CSWlibgnutls28 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibgnutls28 += CSWlibp11kit0
+RUNTIME_DEP_PKGS_CSWlibgnutls28 += CSWlibgmp10
+RUNTIME_DEP_PKGS_CSWlibgnutls28 += CSWlibstdc++6
+RUNTIME_DEP_PKGS_CSWlibgnutls28 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibgnutls28 += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWlibgnutls28 += CSWlibnettle4
 
+# We put all libs in one package as they are .so.28 and are all bumped together
+CHECKPKG_OVERRIDES_CSWlibgnutls28 += shared-lib-pkgname-mismatch
+
 PACKAGES += CSWlibgnutls-dev
 SPKG_DESC_CSWlibgnutls-dev = Development Files for GNU TLS
 PKGFILES_CSWlibgnutls-dev = $(PKGFILES_DEVEL)
-RUNTIME_DEP_PKGS_CSWlibgnutls-dev += CSWlibgnutls26
+RUNTIME_DEP_PKGS_CSWlibgnutls-dev += CSWlibgnutls28
 OBSOLETED_BY_CSWlibgnutls-dev = CSWgnutlsdevel
-CATALOGNAME_CSWgnutlsdevel = gnutls_devel_stub
 
 PATCHFILES += 0001-no-gets-warning.patch
 
@@ -70,12 +73,11 @@
 
 CONFIGURE_ARGS += $(DIRPATHS)
 CONFIGURE_ARGS += --with-lzo
+CONFIGURE_ARGS += --disable-guile
 # Workaround a host detection bug in configure for amd64
 CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(ISA))
-CONFIGURE_ARGS_amd64 += --host=x86_64-pc-solaris2$(shell uname -r |sed -e 's/[^.]*//')
+CONFIGURE_ARGS_amd64 += --build=x86_64-pc-solaris2$(shell uname -r |sed -e 's/[^.]*//')
 
-# We put all libs in one package as they are .so.26 and are all bumped together
-CHECKPKG_OVERRIDES_CSWlibgnutls26 += shared-lib-pkgname-mismatch
 
 include gar/category.mk
 

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