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

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Thu Dec 11 15:20:51 CET 2008


Revision: 2534
          http://gar.svn.sourceforge.net/gar/?rev=2534&view=rev
Author:   dmichelsen
Date:     2008-12-11 14:20:51 +0000 (Thu, 11 Dec 2008)

Log Message:
-----------
libtool: Standardize towards mGAR v2

Modified Paths:
--------------
    csw/mgar/pkg/libtool/trunk/Makefile
    csw/mgar/pkg/libtool/trunk/checksums
    csw/mgar/pkg/libtool/trunk/files/CSWlibtool.gspec
    csw/mgar/pkg/libtool/trunk/files/CSWlibtoolrt.gspec

Modified: csw/mgar/pkg/libtool/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libtool/trunk/Makefile	2008-12-11 13:47:58 UTC (rev 2533)
+++ csw/mgar/pkg/libtool/trunk/Makefile	2008-12-11 14:20:51 UTC (rev 2534)
@@ -1,11 +1,11 @@
-PKGVERSION ?= 2.2.4
-EXTRA_MODULATORS = PKGVERSION
-MODULATIONS_PKGVERSION = 1.5.26 2.2.4
 GARNAME = libtool
-GARVERSION ?=$(PKGVERSION)
+GARVERSION = 2.2.4
 CATEGORIES = devel
 
-DESCRIPTION = A generic library support tool.
+EXTRA_MODULATORS = GARVERSION
+MODULATIONS_GARVERSION = 1.5.26 2.2.4
+
+DESCRIPTION = A generic library support tool
 define BLURB
   GNU libtool is a generic library support script. Libtool hides the complexity
   of using shared and static libraries behind a consistent, portable interface.
@@ -13,51 +13,44 @@
 endef
 
 MASTER_SITES = $(GNU_MIRROR)
-SOURCEFILES  = $(foreach VERSION, $(MODULATIONS_PKGVERSION), $(GARNAME)-$(VERSION).tar.gz)
+SOURCEFILES  = $(foreach VERSION,$(MODULATIONS_GARVERSION), $(GARNAME)-$(VERSION).tar.gz)
 DISTFILES    = $(SOURCEFILES)
 DISTFILES   += $(call admfiles,CSWlibtool)
 DISTFILES   += $(call admfiles,CSWlibtoolrt)
-#NOEXTRACT    = $(filter-out $(GARNAME)-$(GARVERSION).tar.gz, $(SOURCEFILES))
 
+SPKG_DESC_CSWlibtool   = A generic library support tool
+SPKG_DESC_CSWlibtoolrt = A Generic library support tool runtime libraries
+
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
 
 CONFIGURE_ARGS = $(DIRPATHS)
 
 BUILD64 = 1
+NO_ISAEXEC = 1
 
 SKIPTEST = 1
 TEST_TARGET = check
 
-MERGE_SCRIPTS_isa-i386-pkgversion-1.5.26 = copy-only
-MERGE_DIRS_isa-i386-pkgversion-1.5.26 = $(libdir)
-MERGE_SCRIPTS_isa-amd64-pkgversion-1.5.26 = copy-relocated-only
-MERGE_DIRS_isa-amd64-pkgversion-1.5.26 = $(libdir)
+MERGE_SCRIPTS_isa-i386-garversion-1.5.26 = copy-only
+MERGE_DIRS_isa-i386-garversion-1.5.26 = $(libdir)
+MERGE_SCRIPTS_isa-amd64-garversion-1.5.26 = copy-relocated-only
+MERGE_DIRS_isa-amd64-garversion-1.5.26 = $(libdir)
 
-MERGE_SCRIPTS_isa-i386-pkgversion-2.2.4 = copy-all
-MERGE_SCRIPTS_isa-amd64-pkgversion-2.2.4 = copy-relocated-only
-MERGE_DIRS_isa-amd64-pkgversion-2.2.4 = $(bindir) $(sbindir) $(libexecdir) $(libdir)
+MERGE_SCRIPTS_isa-i386-garversion-2.2.4 = copy-all
+MERGE_SCRIPTS_isa-amd64-garversion-2.2.4 = copy-relocated-only
+MERGE_DIRS_isa-amd64-garversion-2.2.4 = $(bindir) $(sbindir) $(libexecdir) $(libdir)
 
-MERGE_SCRIPTS_isa-sparcv8-pkgversion-1.5.26 = copy-only
-MERGE_DIRS_isa-sparcv8-pkgversion-1.5.26 = $(libdir)
-MERGE_SCRIPTS_isa-sparcv9-pkgversion-1.5.26 = copy-relocated-only
-MERGE_DIRS_isa-sparcv9-pkgversion-1.5.26 = $(libdir)
+MERGE_SCRIPTS_isa-sparcv8-garversion-1.5.26 = copy-only
+MERGE_DIRS_isa-sparcv8-garversion-1.5.26 = $(libdir)
+MERGE_SCRIPTS_isa-sparcv9-garversion-1.5.26 = copy-relocated-only
+MERGE_DIRS_isa-sparcv9-garversion-1.5.26 = $(libdir)
 
-MERGE_SCRIPTS_isa-sparcv8-pkgversion-2.2.4 = copy-all
-MERGE_SCRIPTS_isa-sparcv9-pkgversion-2.2.4 = copy-relocated-only
-MERGE_DIRS_isa-sparcv9-pkgversion-2.2.4 = $(bindir) $(sbindir) $(libexecdir) $(libdir)
+MERGE_SCRIPTS_isa-sparcv8-garversion-2.2.4 = copy-all
+MERGE_SCRIPTS_isa-sparcv9-garversion-2.2.4 = copy-relocated-only
+MERGE_DIRS_isa-sparcv9-garversion-2.2.4 = $(bindir) $(sbindir) $(libexecdir) $(libdir)
 
-# Move runtime stuff to CSWlibtoolrt and put the rest in CSWlibtool
-PKGFILES_CSWlibtoolrt_EXCLUSIVE = $(PKGFILES_RT)
+PKGFILES_CSWlibtoolrt = $(PKGFILES_RT)
 
 include gar/category.mk
 
-#pre-package:
-#	@(for VERSION in $(OLD_VERSIONS); do gmake GARVERSION=$$VERSION install; done)
-#	@$(MAKECOOKIE)
-
-post-install:
-	@echo " ==> Fixing install anomalies"
-	@rm -f $(DESTDIR)$(prefix)/share/info/dir
-	@$(MAKECOOKIE)
-

Modified: csw/mgar/pkg/libtool/trunk/checksums
===================================================================
--- csw/mgar/pkg/libtool/trunk/checksums	2008-12-11 13:47:58 UTC (rev 2533)
+++ csw/mgar/pkg/libtool/trunk/checksums	2008-12-11 14:20:51 UTC (rev 2534)
@@ -1,4 +1,4 @@
 aa9c5107f3ec9ef4200eb6556f3b3c29  download/libtool-1.5.26.tar.gz
 0b87e84c7aad3b5e979bbe35312fd4c1  download/libtool-2.2.4.tar.gz
-f3775e02c6cf24fc34591608d0faafd7  download/CSWlibtool.gspec
-782d7a7a7d60533728e6d5ee4477a8f6  download/CSWlibtoolrt.gspec
+c8c05c4657da45bd2a70c0f1ed9b8ae5  download/CSWlibtool.gspec
+66e02987d097403a1662be5af0800a25  download/CSWlibtoolrt.gspec

Modified: csw/mgar/pkg/libtool/trunk/files/CSWlibtool.gspec
===================================================================
--- csw/mgar/pkg/libtool/trunk/files/CSWlibtool.gspec	2008-12-11 13:47:58 UTC (rev 2533)
+++ csw/mgar/pkg/libtool/trunk/files/CSWlibtool.gspec	2008-12-11 14:20:51 UTC (rev 2534)
@@ -1,4 +1,4 @@
 %var            bitname libtool
 %var            pkgname CSWlibtool
 %include        url file://%{PKGLIB}/csw_dyndepend.gspec
-%copyright      url file://%{WORKSRC}/COPYING
+%copyright      url file://%{WORKSRC_FIRSTMOD}/COPYING

Modified: csw/mgar/pkg/libtool/trunk/files/CSWlibtoolrt.gspec
===================================================================
--- csw/mgar/pkg/libtool/trunk/files/CSWlibtoolrt.gspec	2008-12-11 13:47:58 UTC (rev 2533)
+++ csw/mgar/pkg/libtool/trunk/files/CSWlibtoolrt.gspec	2008-12-11 14:20:51 UTC (rev 2534)
@@ -1,5 +1,4 @@
 %var            bitname libtool_rt
 %var            pkgname CSWlibtoolrt
-%var            desc Generic library support runtime libraries
 %include        url file://%{PKGLIB}/csw_dyndepend.gspec
-%copyright      url file://%{WORKSRC}/COPYING
+%copyright      url file://%{WORKSRC_FIRSTMOD}/COPYING


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