[csw-devel] SF.net SVN: gar:[5599] csw/mgar/pkg/automake/trunk

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Fri Jul 17 22:40:27 CEST 2009


Revision: 5599
          http://gar.svn.sourceforge.net/gar/?rev=5599&view=rev
Author:   dmichelsen
Date:     2009-07-17 20:40:27 +0000 (Fri, 17 Jul 2009)

Log Message:
-----------
automake: Update to mGAR v2

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

Removed Paths:
-------------
    csw/mgar/pkg/automake/trunk/files/CSWautomake.depend
    csw/mgar/pkg/automake/trunk/files/CSWautomake.gspec

Modified: csw/mgar/pkg/automake/trunk/Makefile
===================================================================
--- csw/mgar/pkg/automake/trunk/Makefile	2009-07-17 18:18:25 UTC (rev 5598)
+++ csw/mgar/pkg/automake/trunk/Makefile	2009-07-17 20:40:27 UTC (rev 5599)
@@ -1,8 +1,11 @@
-PKGVERSION = 1.10.2
 GARNAME = automake
-GARVERSION ?= $(PKGVERSION)
+GARVERSION = 1.11
 CATEGORIES = devel
 
+EXTRA_MODULATORS = GARVERSION
+# Version 1.1.2 is the last to contain libflac.so.7 where most of the binaries depend on
+MODULATIONS_GARVERSION = 1.6.3 1.7.9 1.8.5 1.9.6 1.10.2 1.11
+
 DESCRIPTION = A tool for automatically generating Makefiles.
 define BLURB
     Automake is a tool for automatically generating Makefiles compliant with the
@@ -16,51 +19,43 @@
     as an extensible, maintainable mechanism for augmenting autoconf.
 endef
 
-OLD_VERSIONS = 1.6.3 1.7.9 1.8.5 1.9.6
-ALL_VERSIONS = $(OLD_VERSIONS) $(PKGVERSION)
-
 MASTER_SITES = $(GNU_MIRROR)
-SOURCEFILES  = $(foreach VERSION, $(ALL_VERSIONS), $(GARNAME)-$(VERSION).tar.gz)
-DISTFILES    = $(SOURCEFILES)
-DISTFILES   += $(call admfiles,CSWautomake,depend)
-DISTFILES   += README.CSW
-NOEXTRACT    = $(filter-out $(GARNAME)-$(GARVERSION).tar.gz, $(SOURCEFILES))
+SOURCEFILES = $(foreach VERSION,$(MODULATIONS_GARVERSION),$(GARNAME)-$(VERSION).tar.gz)
+DISTFILES = $(SOURCEFILES)
+DISTFILES += README.CSW
+NOCHECKSUM = README.CSW
+NOEXTRACT = $(filter-out $(GARNAME)-$(GARVERSION).tar.gz, $(SOURCEFILES))
 
-COOKIEROOTDIR = cookies-$(GARVERSION)
+REQUIRED_PKGS = CSWperl
 
-# Move old documentation away
-ifneq ($(GARVERSION), $(PKGVERSION))
-  infodir = /ignore
-endif
-
 CONFIGURE_ARGS = $(DIRPATHS)
 
 TEST_TARGET = check
 
-CLEAN_SCRIPTS = custom
+# Lots of test fail on Solaris, but they are safe to ignore for now:
+#   <http://lists.gnu.org/archive/html/bug-automake/2009-07/msg00001.html>
+SKIPTEST = 1
 
+ARCHALL = 1
+
+$(foreach VERSION,$(MODULATIONS_GARVERSION),$(eval MERGE_SCRIPTS_isa-$(ISA)-garversion-$(VERSION) = copy-all))
+
+#CLEAN_SCRIPTS = custom
+
 include gar/category.mk
 
 $(DOWNLOADDIR)/README.CSW:
 	@echo " ==> Generating README.CSW"
 	@(exec >$@;								\
 	  echo "This package contains the following automake versions:";	\
-	  for VERSION in $(ALL_VERSIONS); do					\
+	  for VERSION in $(MODULATIONS_GARVERSION); do					\
 	    echo "  automake-$$VERSION";					\
 	  done)
 
-post-install:
-	@rm -f $(DESTDIR)$(prefix)/share/info/dir
-	@rm -f $(DESTDIR)$(bindir)/aclocal
-	@gln -s aclocal-1.10 $(DESTDIR)$(bindir)/aclocal
-	@rm -f $(DESTDIR)$(bindir)/automake
-	@gln -s automake-1.10 $(DESTDIR)$(bindir)/automake
-	@ginstall $(WORKDIR)/README.CSW $(DESTDIR)$(docdir)/$(GARNAME)/
+post-merge:
+	@rm -f $(PKGROOT)$(bindir)/aclocal
+	@gln -s aclocal-1.11 $(PKGROOT)$(bindir)/aclocal
+	@rm -f $(PKGROOT)$(bindir)/automake
+	@gln -s automake-1.11 $(PKGROOT)$(bindir)/automake
+	@ginstall $(WORKDIR)/README.CSW $(PKGROOT)$(docdir)/$(GARNAME)/
 	@$(MAKECOOKIE)
-
-pre-package:
-	@(for VERSION in $(OLD_VERSIONS); do gmake GARVERSION=$$VERSION install; done)
-	@$(MAKECOOKIE)
-	
-clean-custom: clean-all
-	@(for VERSION in $(OLD_VERSIONS); do gmake GARVERSION=$$VERSION clean-all; done)

Modified: csw/mgar/pkg/automake/trunk/checksums
===================================================================
--- csw/mgar/pkg/automake/trunk/checksums	2009-07-17 18:18:25 UTC (rev 5598)
+++ csw/mgar/pkg/automake/trunk/checksums	2009-07-17 20:40:27 UTC (rev 5599)
@@ -1,3 +1,5 @@
+ede3e08c696861a01f4d2c6a2e822053  download/automake-1.10.2.tar.gz
+fab0bd2c3990a6679adaf9eeac0c6d2a  download/automake-1.11.tar.gz
 2bd506db63b6d10458cb644b6171ce93  download/automake-1.6.3.tar.gz
 eb25355e3cf00aac83c580dde970a0b4  download/automake-1.7.9.tar.gz
 ce0662da5df68014eb1683c184c47a8e  download/automake-1.8.5.tar.gz
@@ -2,5 +4 @@
 c60f77a42f103606981d456f1615f5b4  download/automake-1.9.6.tar.gz
-ede3e08c696861a01f4d2c6a2e822053  download/automake-1.10.2.tar.gz
-6007274f3357f31848b87099c9f2728f  download/CSWautomake.gspec
-fd19c6295f6211062d4e4cdd93bc3278  download/CSWautomake.depend
-4b31ee6a5142570ab905c6571a6ecac2  download/README.CSW

Deleted: csw/mgar/pkg/automake/trunk/files/CSWautomake.depend
===================================================================
--- csw/mgar/pkg/automake/trunk/files/CSWautomake.depend	2009-07-17 18:18:25 UTC (rev 5598)
+++ csw/mgar/pkg/automake/trunk/files/CSWautomake.depend	2009-07-17 20:40:27 UTC (rev 5599)
@@ -1 +0,0 @@
-P CSWperl perl - A high-level, general-purpose programming language.

Deleted: csw/mgar/pkg/automake/trunk/files/CSWautomake.gspec
===================================================================
--- csw/mgar/pkg/automake/trunk/files/CSWautomake.gspec	2009-07-17 18:18:25 UTC (rev 5598)
+++ csw/mgar/pkg/automake/trunk/files/CSWautomake.gspec	2009-07-17 20:40:27 UTC (rev 5599)
@@ -1,5 +0,0 @@
-%var            bitname automake
-%var            pkgname CSWautomake
-%var		arch all
-%include        url file://%{PKGLIB}/csw_dyndepend.gspec
-%copyright      url file://%{WORKSRC}/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