[csw-devel] SF.net SVN: gar:[7314] csw/mgar/pkg/libtool/trunk

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Mon Nov 16 17:39:25 CET 2009


Revision: 7314
          http://gar.svn.sourceforge.net/gar/?rev=7314&view=rev
Author:   dmichelsen
Date:     2009-11-16 16:39:11 +0000 (Mon, 16 Nov 2009)

Log Message:
-----------
libtool: Update to 2.2.6b

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

Modified: csw/mgar/pkg/libtool/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libtool/trunk/Makefile	2009-11-16 16:29:26 UTC (rev 7313)
+++ csw/mgar/pkg/libtool/trunk/Makefile	2009-11-16 16:39:11 UTC (rev 7314)
@@ -1,10 +1,9 @@
 GARNAME = libtool
-RELEASE = a
-GARVERSION = 2.2.6
+GARVERSION = 2.2.6b
 CATEGORIES = devel
 
 EXTRA_MODULATORS = GARVERSION GARCOMPILER
-MODULATIONS_GARVERSION = 1.5.26 2.2.6
+MODULATIONS_GARVERSION = 1.5.26 2.2.6b
 MODULATIONS_GARCOMPILER = GCC3 GCC4 SOS11
 
 # Modulate over compiler only for 2.2.6
@@ -12,9 +11,6 @@
 # Compile 64 bit libraries only with SOS11
 SKIP_MODULATIONS += $(foreach I,sparcv9 amd64,$(foreach C,GCC3 GCC4,isa-$I-garversion-2.2.6-garcompiler-$C))
 
-FILEVERSION_1.5.26 = 1.5.26
-FILEVERSION_2.2.6 = 2.2.6$(RELEASE)
-
 DESCRIPTION = A generic library support tool
 define BLURB
   GNU libtool is a generic library support script. Libtool hides the complexity
@@ -23,7 +19,7 @@
 endef
 
 MASTER_SITES = $(GNU_MIRROR)
-SOURCEFILES  = $(foreach VERSION,$(MODULATIONS_GARVERSION),$(GARNAME)-$(FILEVERSION_$(VERSION)).tar.gz)
+SOURCEFILES  = $(foreach VERSION,$(MODULATIONS_GARVERSION),$(GARNAME)-$(VERSION).tar.gz)
 DISTFILES    = $(SOURCEFILES)
 
 PATCH_LIBTOOL = patch-libtool.diff
@@ -31,7 +27,7 @@
 PATCHFILES_POSTINSTALL_isa-sparcv8-garversion-2.2.6-garcompiler-SOS11 = $(PATCH_LIBTOOL)
 DISTFILES += $(PATCH_LIBTOOL)
 
-NOEXTRACT = $(filter-out $(GARNAME)-$(FILEVERSION_$(GARVERSION)).tar.gz,$(SOURCEFILES))
+NOEXTRACT = $(filter-out $(GARNAME)-$(GARVERSION).tar.gz,$(SOURCEFILES))
 
 EXTRA_TAGS = gcc3 gcc4
 COMPILER_TAGNAME_GCC3 = gcc3
@@ -58,36 +54,22 @@
 SKIPTEST = 1
 TEST_TARGET = check
 
-   MERGE_SCRIPTS_isa-i386-garversion-1.5.26-garcompiler-SOS11 = copy-only
-      MERGE_DIRS_isa-i386-garversion-1.5.26-garcompiler-SOS11 = $(libdir)
-  MERGE_SCRIPTS_isa-amd64-garversion-1.5.26-garcompiler-SOS11 = copy-relocated-only
-     MERGE_DIRS_isa-amd64-garversion-1.5.26-garcompiler-SOS11 = $(libdir)
+   MERGE_SCRIPTS_isa-default-garversion-1.5.26-garcompiler-SOS11 = copy-only
+      MERGE_DIRS_isa-default-garversion-1.5.26-garcompiler-SOS11 = $(libdir)
+ MERGE_SCRIPTS_isa-default64-garversion-1.5.26-garcompiler-SOS11 = copy-relocated-only
+    MERGE_DIRS_isa-default64-garversion-1.5.26-garcompiler-SOS11 = $(libdir)
 
-    MERGE_SCRIPTS_isa-i386-garversion-2.2.6-garcompiler-SOS11 = copy-all
-   MERGE_SCRIPTS_isa-amd64-garversion-2.2.6-garcompiler-SOS11 = copy-relocated-only
-      MERGE_DIRS_isa-amd64-garversion-2.2.6-garcompiler-SOS11 = $(libdir)
+   MERGE_SCRIPTS_isa-default-garversion-2.2.6b-garcompiler-SOS11 = copy-all
+ MERGE_SCRIPTS_isa-default64-garversion-2.2.6b-garcompiler-SOS11 = copy-relocated-only
+    MERGE_DIRS_isa-default64-garversion-2.2.6b-garcompiler-SOS11 = $(libdir)
 
-     MERGE_SCRIPTS_isa-i386-garversion-2.2.6-garcompiler-GCC3 = copy-tags
-     MERGE_SCRIPTS_isa-i386-garversion-2.2.6-garcompiler-GCC4 = copy-tags
+    MERGE_SCRIPTS_isa-default-garversion-2.2.6b-garcompiler-GCC3 = copy-tags
+    MERGE_SCRIPTS_isa-default-garversion-2.2.6b-garcompiler-GCC4 = copy-tags
 
-MERGE_SCRIPTS_isa-sparcv8-garversion-1.5.26-garcompiler-SOS11 = copy-only
-   MERGE_DIRS_isa-sparcv8-garversion-1.5.26-garcompiler-SOS11 = $(libdir)
-MERGE_SCRIPTS_isa-sparcv9-garversion-1.5.26-garcompiler-SOS11 = copy-relocated-only
-   MERGE_DIRS_isa-sparcv9-garversion-1.5.26-garcompiler-SOS11 = $(libdir)
-
- MERGE_SCRIPTS_isa-sparcv8-garversion-2.2.6-garcompiler-SOS11 = copy-all
- MERGE_SCRIPTS_isa-sparcv9-garversion-2.2.6-garcompiler-SOS11 = copy-relocated-only
-    MERGE_DIRS_isa-sparcv9-garversion-2.2.6-garcompiler-SOS11 = $(libdir)
-
-  MERGE_SCRIPTS_isa-sparcv8-garversion-2.2.6-garcompiler-GCC3 = copy-tags
-  MERGE_SCRIPTS_isa-sparcv8-garversion-2.2.6-garcompiler-GCC4 = copy-tags
-
 PKGFILES_CSWlibtoolrt = $(PKGFILES_RT)
 
 include gar/category.mk
 
-SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(RELEASE)
-
 post-install-modulated: $(if $(PATCHFILES_POSTINSTALL_$(MODULATION)),patch-libtool)
 post-install-modulated: $(if $(COMPILER_TAGNAME_$(GARCOMPILER)),install-libtool-$(COMPILER_TAGNAME_$(GARCOMPILER)))
 

Modified: csw/mgar/pkg/libtool/trunk/checksums
===================================================================
--- csw/mgar/pkg/libtool/trunk/checksums	2009-11-16 16:29:26 UTC (rev 7313)
+++ csw/mgar/pkg/libtool/trunk/checksums	2009-11-16 16:39:11 UTC (rev 7314)
@@ -1,3 +1,3 @@
-aa9c5107f3ec9ef4200eb6556f3b3c29  download/libtool-1.5.26.tar.gz
-8ca1ea241cd27ff9832e045fe9afe4fd  download/libtool-2.2.6a.tar.gz
-92bb3c7712498b6a5993ab5d5fc8f077  download/patch-libtool.diff
+aa9c5107f3ec9ef4200eb6556f3b3c29  libtool-1.5.26.tar.gz
+07da460450490148c6d2df0f21481a25  libtool-2.2.6b.tar.gz
+92bb3c7712498b6a5993ab5d5fc8f077  patch-libtool.diff


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



More information about the devel mailing list