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

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Sun May 6 20:19:19 CEST 2012 

Revision: 17962
          http://gar.svn.sourceforge.net/gar/?rev=17962&view=rev
Author:   dmichelsen
Date:     2012-05-06 18:19:19 +0000 (Sun, 06 May 2012)
Log Message:
-----------
automake/trunk: Update to 1.12

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

Modified: csw/mgar/pkg/automake/trunk/Makefile
===================================================================
--- csw/mgar/pkg/automake/trunk/Makefile	2012-05-06 17:58:35 UTC (rev 17961)
+++ csw/mgar/pkg/automake/trunk/Makefile	2012-05-06 18:19:19 UTC (rev 17962)
@@ -1,10 +1,10 @@
 NAME = automake
-VERSION = 1.11.5
+VERSION = 1.12
 CATEGORIES = devel
 GARTYPE = v2
 
 EXTRA_MODULATORS = VERSION
-MODULATIONS_VERSION = 1.6.3 1.7.9 1.8.5 1.9.6 1.10.3 1.11.5
+MODULATIONS_VERSION = 1.6.3 1.7.9 1.8.5 1.9.6 1.10.3 1.11.5 1.12
 
 DESCRIPTION = A tool for automatically generating Makefiles.
 define BLURB
@@ -34,26 +34,54 @@
 # These are comments only
 CHECKPKG_OVERRIDES_CSWautomake += file-with-bad-content|/usr/share|root/opt/csw/bin/aclocal-1.10
 CHECKPKG_OVERRIDES_CSWautomake += file-with-bad-content|/usr/share|root/opt/csw/bin/aclocal-1.11
+CHECKPKG_OVERRIDES_CSWautomake += file-with-bad-content|/usr/share|root/opt/csw/bin/aclocal-1.12
 # These are just docs, override for now
 CHECKPKG_OVERRIDES_CSWautomake += file-with-bad-content|/usr/share|root/opt/csw/share/automake-1.9/py-compile
 CHECKPKG_OVERRIDES_CSWautomake += file-with-bad-content|/usr/share|root/opt/csw/share/automake-1.10/py-compile
-CHECKPKG_OVERRIDES_CSWautomake += file-with-bad-content|/usr/share|root/opt/csw/share/info/automake.info-1
 CHECKPKG_OVERRIDES_CSWautomake += file-with-bad-content|/usr/share|root/opt/csw/share/automake-1.11/py-compile
+CHECKPKG_OVERRIDES_CSWautomake += file-with-bad-content|/usr/share|root/opt/csw/share/automake-1.12/py-compile
+CHECKPKG_OVERRIDES_CSWautomake += file-with-bad-content|/usr/local|root/opt/csw/share/automake-1.6/INSTALL
+CHECKPKG_OVERRIDES_CSWautomake += file-with-bad-content|/usr/local|root/opt/csw/share/automake-1.7/INSTALL
+CHECKPKG_OVERRIDES_CSWautomake += file-with-bad-content|/usr/local|root/opt/csw/share/automake-1.8/INSTALL
 CHECKPKG_OVERRIDES_CSWautomake += file-with-bad-content|/usr/local|root/opt/csw/share/automake-1.9/INSTALL
-CHECKPKG_OVERRIDES_CSWautomake += file-with-bad-content|/usr/local|root/opt/csw/share/automake-1.10/texinfo.tex
 CHECKPKG_OVERRIDES_CSWautomake += file-with-bad-content|/usr/local|root/opt/csw/share/automake-1.10/INSTALL
-CHECKPKG_OVERRIDES_CSWautomake += file-with-bad-content|/usr/local|root/opt/csw/share/automake-1.7/INSTALL
+CHECKPKG_OVERRIDES_CSWautomake += file-with-bad-content|/usr/local|root/opt/csw/share/automake-1.11/INSTALL
+CHECKPKG_OVERRIDES_CSWautomake += file-with-bad-content|/usr/local|root/opt/csw/share/automake-1.12/INSTALL
+CHECKPKG_OVERRIDES_CSWautomake += file-with-bad-content|/usr/share|root/opt/csw/share/info/automake.info-1
+CHECKPKG_OVERRIDES_CSWautomake += file-with-bad-content|/usr/local|root/opt/csw/share/info/automake.info-1
 CHECKPKG_OVERRIDES_CSWautomake += file-with-bad-content|/usr/local|root/opt/csw/share/info/automake.info-2
-CHECKPKG_OVERRIDES_CSWautomake += file-with-bad-content|/usr/local|root/opt/csw/share/info/automake.info-1
-CHECKPKG_OVERRIDES_CSWautomake += file-with-bad-content|/usr/local|root/opt/csw/share/automake-1.8/INSTALL
+CHECKPKG_OVERRIDES_CSWautomake += file-with-bad-content|/usr/local|root/opt/csw/share/automake-1.10/texinfo.tex
 CHECKPKG_OVERRIDES_CSWautomake += file-with-bad-content|/usr/local|root/opt/csw/share/automake-1.11/texinfo.tex
-CHECKPKG_OVERRIDES_CSWautomake += file-with-bad-content|/usr/local|root/opt/csw/share/automake-1.11/INSTALL
-CHECKPKG_OVERRIDES_CSWautomake += file-with-bad-content|/usr/local|root/opt/csw/share/automake-1.6/INSTALL
+CHECKPKG_OVERRIDES_CSWautomake += file-with-bad-content|/usr/local|root/opt/csw/share/automake-1.12/texinfo.tex
 
 # 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
 
+# In 1.6.3 two tests are failing, but as this is old we can't much about it:
+# - depcomp2.test
+# - man2.test
+SKIPTEST-1.6.3 ?= 1
+
+# There are 38 tests failing in 1.7.9
+SKIPTEST-1.7.9 ?= 1
+
+# There are 35 of 465 tests failed in 1.8.5
+SKIPTEST-1.8.5 ?= 1
+
+# There are 6 of 485 tests failed in 1.9.6
+SKIPTEST-1.9.6 ?= 1
+
+# There are 5 of 542 tests failed in 1.10.3
+SKIPTEST-1.10.3 ?= 1
+
+# There are 7 of 804 tests failed in 1.11.5
+SKIPTEST-1.11.5 ?= 1
+
+# There are 172 of 2968 tests failed in 1.12
+SKIPTEST-1.12 ?= 1
+
+SKIPTEST = $(SKIPTEST-$(VERSION))
+
 ARCHALL = 1
 
 $(foreach VERSION,$(MODULATIONS_VERSION),$(eval MERGE_SCRIPTS_isa-$(ISA)-version-$(VERSION) = copy-all))
@@ -65,11 +93,12 @@
 EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8-version-1.9.6 = $(bindir)/automake $(bindir)/aclocal $(infodir)/.*
 EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8-version-1.10.3 = $(bindir)/automake $(bindir)/aclocal $(infodir)/.*
 EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8-version-1.11.5 = $(bindir)/automake $(bindir)/aclocal $(infodir)/.*
+EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8-version-1.12 = $(bindir)/automake $(bindir)/aclocal $(infodir)/.*
 
 #     alternatives [options] --install link name path priority  [-
 #     -slave link name path]...  [--initscript service]
 
-ALTERNATIVES = 1.6 1.7 1.8 1.9 1.10 1.11
+ALTERNATIVES = 1.6 1.7 1.8 1.9 1.10 1.11 1.12
 ALTERNATIVE_1.6 = $(bindir)/automake automake $(bindir)/automake-1.6 60
 ALTERNATIVE_1.6 += $(bindir)/aclocal aclocal $(bindir)/aclocal-1.6
 ALTERNATIVE_1.7 = $(bindir)/automake automake $(bindir)/automake-1.7 70
@@ -82,6 +111,8 @@
 ALTERNATIVE_1.10 += $(bindir)/aclocal aclocal $(bindir)/aclocal-1.10
 ALTERNATIVE_1.11 = $(bindir)/automake automake $(bindir)/automake-1.11 110
 ALTERNATIVE_1.11 += $(bindir)/aclocal aclocal $(bindir)/aclocal-1.11
+ALTERNATIVE_1.12 = $(bindir)/automake automake $(bindir)/automake-1.12 120
+ALTERNATIVE_1.12 += $(bindir)/aclocal aclocal $(bindir)/aclocal-1.12
 
 include gar/category.mk
 
@@ -99,11 +130,12 @@
 		echo; \
 		echo "  /opt/csw/sbin/alternatives --config automake"; \
 		echo; \
-		echo "See http://www.opencsw.org/packages/alternatives for details."; \
+		echo "See http://wiki.opencsw.org/project-alternatives for details."; \
 	)
 	@$(MAKECOOKIE)
 
 post-merge:
+	@# These are linked by alternatives
 	rm -f $(PKGROOT)$(bindir)/aclocal
 	rm -f $(PKGROOT)$(bindir)/automake
 	ginstall -d $(PKGROOT)$(dir $(POSTMSG))

Modified: csw/mgar/pkg/automake/trunk/checksums
===================================================================
--- csw/mgar/pkg/automake/trunk/checksums	2012-05-06 17:58:35 UTC (rev 17961)
+++ csw/mgar/pkg/automake/trunk/checksums	2012-05-06 18:19:19 UTC (rev 17962)
@@ -1,5 +1,6 @@
 03bc9ebfa805f9ee5635f1f53fa1fa5f  automake-1.10.3.tar.gz
 bf6548f750693e195367d0339c893ff3  automake-1.11.5.tar.gz
+d8a8f6bd898a6b34a874728cd1e47a95  automake-1.12.tar.gz
 2bd506db63b6d10458cb644b6171ce93  automake-1.6.3.tar.gz
 eb25355e3cf00aac83c580dde970a0b4  automake-1.7.9.tar.gz
 ce0662da5df68014eb1683c184c47a8e  automake-1.8.5.tar.gz

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