[csw-devel] SF.net SVN: gar:[15989] csw/mgar/pkg/gsasl/trunk

[dmichelsen at users.sourceforge.net]

Revision: 15989
          http://gar.svn.sourceforge.net/gar/?rev=15989&view=rev
Author:   dmichelsen
Date:     2011-10-25 16:01:13 +0000 (Tue, 25 Oct 2011)
Log Message:
-----------
gsasl/trunk: Update to 1.6.1, rename package to latest standard

Modified Paths:
--------------
    csw/mgar/pkg/gsasl/trunk/Makefile
    csw/mgar/pkg/gsasl/trunk/checksums

Modified: csw/mgar/pkg/gsasl/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gsasl/trunk/Makefile	2011-10-25 15:17:53 UTC (rev 15988)
+++ csw/mgar/pkg/gsasl/trunk/Makefile	2011-10-25 16:01:13 UTC (rev 15989)
@@ -1,5 +1,5 @@
 NAME = gsasl
-VERSION = 1.6.0
+VERSION = 1.6.1
 CATEGORIES = apps
 
 DESCRIPTION = GNU SASL binary
@@ -14,61 +14,65 @@
 MASTER_SITES = $(GNU_MIRROR)
 DISTFILES  = $(NAME)-$(VERSION).tar.gz
 
-# We define upstream file regex so we can be notifed of new upstream software release
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
+VENDOR_URL = http://www.gnu.org/software/$(GNU_PROJ)
 
-PACKAGES = CSWlibgsasl CSWlibgsasl7 CSWlibgsasldevel CSWgsasl
+BUILD_DEP_PKGS += CSWgnulinks
+BUILD_DEP_PKGS += CSWlibkrb5-dev
 
-CATALOGNAME_CSWlibgsasl = libgsasl
-CATALOGNAME_CSWlibgsasl7 = libgsasl7
-CATALOGNAME_CSWlibgsasldevel = libgsasl_devel
-CATALOGNAME_CSWgsasl = gsasl
+PACKAGES += CSWlibgsasl7
+SPKG_DESC_CSWlibgsasl7 = GNU SASL library, libgsasl.so.7
+PKGFILES_CSWlibgsasl7 += $(call pkgfiles_lib,libgsasl.so.7)
+PKGFILES_CSWlibgsasl7 += .*/libgsasl\.mo
+RUNTIME_DEP_PKGS_CSWlibgsasl7 += CSWlibgcrypt11
+RUNTIME_DEP_PKGS_CSWlibgsasl7 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibgsasl7 += CSWlibgpg-error0
+RUNTIME_DEP_PKGS_CSWlibgsasl7 += CSWlibcom-err3
+RUNTIME_DEP_PKGS_CSWlibgsasl7 += CSWlibkrb5-3
+RUNTIME_DEP_PKGS_CSWlibgsasl7 += CSWlibgssapi-krb5-2
+RUNTIME_DEP_PKGS_CSWlibgsasl7 += CSWlibntlm0
+RUNTIME_DEP_PKGS_CSWlibgsasl7 += CSWlibidn11
+RUNTIME_DEP_PKGS_CSWlibgsasl7 += CSWlibk5crypto3
+OBSOLETED_BY_CSWlibgsasl7 += CSWlibgsasl
 
-BUILD_DEP_PKGS = CSWkrb5libdev CSWgnulinks
-RUNTIME_DEP_PKGS_CSWlibgsasl7 = CSWggettextrt CSWkrb5lib CSWlibidn CSWlibntlm
-RUNTIME_DEP_PKGS_CSWlibgsasl7 += CSWgcrypt CSWgpgerr
-RUNTIME_DEP_PKGS_CSWlibgsasl = CSWlibgsasl7
-RUNTIME_DEP_PKGS_CSWgsasl = CSWlibgsasl7 CSWgnutls CSWggettextrt CSWiconv CSWkrb5lib CSWlibidn CSWlibntlm CSWreadline
-RUNTIME_DEP_PKGS_CSWgsasl += CSWgcrypt CSWgpgerr
-RUNTIME_DEP_PKGS_CSWlibgsasldevel = CSWlibgsasl7 CSWkrb5libdev
+PACKAGES += CSWlibgsasl-dev
+SPKG_DESC_CSWlibgsasl-dev = Development files for GNU SASL library libgsasl.so.7
+PKGFILES_CSWlibgsasl-dev += $(PKGFILES_DEVEL)
+RUNTIME_DEP_PKGS_CSWlibgsasl-dev += CSWlibgsasl7
+RUNTIME_DEP_PKGS_CSWlibgsasl-dev += CSWlibkrb5-dev
+OBSOLETED_BY_CSWlibgsasl-dev += CSWlibgsasldevel
+CATALOGNAME_CSWlibgsasldevel = libgsasl_devel_stub
 
-SPKG_DESC_CSWlibgsasl = Stub for legacy dependencies to CSWlibgsasl7
-SPKG_DESC_CSWlibgsasl7 = GNU SASL Library providing libgsasl.so.7
-SPKG_DESC_CSWlibgsasldevel = GNU SASL Development Files
+PACKAGES += CSWgsasl
 SPKG_DESC_CSWgsasl = GNU SASL
+# PKGFILES is catchall
+RUNTIME_DEP_PKGS_CSWgsasl += CSWlibgsasl7
+RUNTIME_DEP_PKGS_CSWgsasl += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWgsasl += CSWlibgcrypt11
+RUNTIME_DEP_PKGS_CSWgsasl += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWgsasl += CSWlibgpg-error0
+RUNTIME_DEP_PKGS_CSWgsasl += CSWlibgssapi-krb5-2
+RUNTIME_DEP_PKGS_CSWgsasl += CSWlibkrb5-3
+RUNTIME_DEP_PKGS_CSWgsasl += CSWlibcom-err3
+RUNTIME_DEP_PKGS_CSWgsasl += CSWlibntlm0
+RUNTIME_DEP_PKGS_CSWgsasl += CSWlibreadline6
+RUNTIME_DEP_PKGS_CSWgsasl += CSWlibidn11
+RUNTIME_DEP_PKGS_CSWgsasl += CSWlibk5crypto3
+RUNTIME_DEP_PKGS_CSWgsasl += CSWlibgnutls26
 
-SPKG_SOURCEURL = http://www.gnu.org/software/$(GNU_PROJ)
-
 # We don't need it and if defined the test breaks
 LD_OPTIONS =
 EXTRA_LINKER_FLAGS = $(RUNPATH_LINKER_FLAGS)
 
 # Disable 64 bit until krb5 is available in 64 bit
-# BUILD64 = 1
-CONFIGURE_ARGS = $(DIRPATHS)
+BUILD64 = 1
 
-TEST_TARGET = check
-
 # One test inside GNULib fails, reported upstream. This is most
-# probably harmless.
+# probably harmless. Disable testsuite unless this is fixed:
+#   http://lists.gnu.org/archive/html/help-gsasl/2009-03/msg00005.html
 SKIPTEST ?= 1
 
 EXTRA_MERGE_EXCLUDE_FILES = $(libdir)/charset.alias
 
-ARCHALL_CSWlibgsasl = 1
-
-# Make sure we do NOT add here /opt/csw/include/gsasl.h
-PKGFILES_CSWgsasl = $(bindir)/.*
-PKGFILES_CSWgsasl += $(infodir)/gsasl\..*
-PKGFILES_CSWgsasl += $(sharedstatedir)/.*/gsasl\..*
-PKGFILES_CSWgsasl += $(mandir)/.*/gsasl\..*
-
-PKGFILES_CSWlibgsasl = NOFILES
-
-PKGFILES_CSWlibgsasldevel = $(PKGFILES_DEVEL)
-
-CHECKPKG_OVERRIDES_CSWlibgsasl += surplus-dependency|CSWlibgsasl7
-
 include gar/category.mk
 
 # Tests use 'grep -e'

Modified: csw/mgar/pkg/gsasl/trunk/checksums
===================================================================
--- csw/mgar/pkg/gsasl/trunk/checksums	2011-10-25 15:17:53 UTC (rev 15988)
+++ csw/mgar/pkg/gsasl/trunk/checksums	2011-10-25 16:01:13 UTC (rev 15989)
@@ -1 +1 @@
-5a4cc39af4ba8dbd8b66380baf3c3c7d  gsasl-1.6.0.tar.gz
+7ae813eeb1f90ad52e9a781ac9e17f28  gsasl-1.6.1.tar.gz

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