[csw-devel] SF.net SVN: gar:[16879] csw/mgar/pkg

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Mon Jan 23 10:31:04 CET 2012


Revision: 16879
          http://gar.svn.sourceforge.net/gar/?rev=16879&view=rev
Author:   dmichelsen
Date:     2012-01-23 09:31:04 +0000 (Mon, 23 Jan 2012)
Log Message:
-----------
WHOLE TREE: Followup for r11888 (GARVERSION -> VERSION) to adjust modulations and var settings

Revision Links:
--------------
    http://gar.svn.sourceforge.net/gar/?rev=11888&view=rev

Modified Paths:
--------------
    csw/mgar/pkg/automake/trunk/Makefile
    csw/mgar/pkg/examples/modulations/trunk/Makefile
    csw/mgar/pkg/flac/trunk/Makefile
    csw/mgar/pkg/glib/trunk/Makefile
    csw/mgar/pkg/libmm/trunk/Makefile
    csw/mgar/pkg/wxwidgets/trunk/Makefile

Modified: csw/mgar/pkg/automake/trunk/Makefile
===================================================================
--- csw/mgar/pkg/automake/trunk/Makefile	2012-01-22 22:23:21 UTC (rev 16878)
+++ csw/mgar/pkg/automake/trunk/Makefile	2012-01-23 09:31:04 UTC (rev 16879)
@@ -58,12 +58,12 @@
 $(foreach VERSION,$(MODULATIONS_VERSION),$(eval MERGE_SCRIPTS_isa-$(ISA)-version-$(VERSION) = copy-all))
 
 # These are hardlinks to the versioned versions and will confuse the merging
-EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8-garversion-1.6.3 = $(bindir)/automake $(bindir)/aclocal $(infodir)/.*
-EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8-garversion-1.7.9 = $(bindir)/automake $(bindir)/aclocal $(infodir)/.*
-EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8-garversion-1.8.5 = $(bindir)/automake $(bindir)/aclocal $(infodir)/.*
-EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8-garversion-1.9.6 = $(bindir)/automake $(bindir)/aclocal $(infodir)/.*
-EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8-garversion-1.10.3 = $(bindir)/automake $(bindir)/aclocal $(infodir)/.*
-EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8-garversion-1.11.2 = $(bindir)/automake $(bindir)/aclocal $(infodir)/.*
+EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8-version-1.6.3 = $(bindir)/automake $(bindir)/aclocal $(infodir)/.*
+EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8-version-1.7.9 = $(bindir)/automake $(bindir)/aclocal $(infodir)/.*
+EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8-version-1.8.5 = $(bindir)/automake $(bindir)/aclocal $(infodir)/.*
+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.2 = $(bindir)/automake $(bindir)/aclocal $(infodir)/.*
 
 #     alternatives [options] --install link name path priority  [-
 #     -slave link name path]...  [--initscript service]

Modified: csw/mgar/pkg/examples/modulations/trunk/Makefile
===================================================================
--- csw/mgar/pkg/examples/modulations/trunk/Makefile	2012-01-22 22:23:21 UTC (rev 16878)
+++ csw/mgar/pkg/examples/modulations/trunk/Makefile	2012-01-23 09:31:04 UTC (rev 16879)
@@ -23,9 +23,9 @@
 
 EXTRA_MODULATORS = VERSION
 MODULATIONS_VERSION = 1.0 1.1 2.0
-MERGE_SCRIPTS_isa-sparcv8-garversion-1.0 = copy-all
-MERGE_SCRIPTS_isa-sparcv8-garversion-1.1 = copy-all
-MERGE_SCRIPTS_isa-sparcv8-garversion-2.0 = copy-all
+MERGE_SCRIPTS_isa-sparcv8-version-1.0 = copy-all
+MERGE_SCRIPTS_isa-sparcv8-version-1.1 = copy-all
+MERGE_SCRIPTS_isa-sparcv8-version-2.0 = copy-all
 
 # A really simple installator, creating different files for each VERSION.
 install-example:

Modified: csw/mgar/pkg/flac/trunk/Makefile
===================================================================
--- csw/mgar/pkg/flac/trunk/Makefile	2012-01-22 22:23:21 UTC (rev 16878)
+++ csw/mgar/pkg/flac/trunk/Makefile	2012-01-23 09:31:04 UTC (rev 16879)
@@ -8,10 +8,10 @@
 
 # There was no 64 bit legacy version. Do not provide it as new binaries should
 # link against the new version.
-SKIP_MODULATIONS = isa-sparcv9-garversion-1.0.4
-SKIP_MODULATIONS += isa-amd64-garversion-1.0.4
-SKIP_MODULATIONS += isa-sparcv9-garversion-1.1.2
-SKIP_MODULATIONS += isa-amd64-garversion-1.1.2
+SKIP_MODULATIONS = isa-sparcv9-version-1.0.4
+SKIP_MODULATIONS += isa-amd64-version-1.0.4
+SKIP_MODULATIONS += isa-sparcv9-version-1.1.2
+SKIP_MODULATIONS += isa-amd64-version-1.1.2
 
 DESCRIPTION = Free lossless audio codec
 define BLURB
@@ -32,16 +32,16 @@
 
 NOEXTRACT = $(filter-out $(SF_PROJ)-$(VERSION).tar.gz,$(SOURCEFILES))
 
-PATCHFILES_isa-sparcv8-garversion-1.1.2 = libtool-64bit.patch
-PATCHFILES_isa-sparcv9-garversion-1.1.2 = libtool-64bit.patch
-PATCHFILES_isa-sparcv8-garversion-1.2.1 = libtool-64bit.patch no-stdint.patch
-PATCHFILES_isa-sparcv9-garversion-1.2.1 = libtool-64bit.patch no-stdint.patch
+PATCHFILES_isa-sparcv8-version-1.1.2 = libtool-64bit.patch
+PATCHFILES_isa-sparcv9-version-1.1.2 = libtool-64bit.patch
+PATCHFILES_isa-sparcv8-version-1.2.1 = libtool-64bit.patch no-stdint.patch
+PATCHFILES_isa-sparcv9-version-1.2.1 = libtool-64bit.patch no-stdint.patch
 
-PATCHFILES_isa-i386-garversion-1.0.4 = strip-nasm-1.0.4.patch
-PATCHFILES_isa-i386-garversion-1.1.2 = strip-nasm-1.1.2.patch libtool-64bit.patch
-PATCHFILES_isa-amd64-garversion-1.1.2 = libtool-64bit.patch
-PATCHFILES_isa-i386-garversion-1.2.1 = strip-nasm-1.2.1.patch libtool-64bit.patch no-stdint.patch
-PATCHFILES_isa-amd64-garversion-1.2.1 = strip-nasm-1.2.1.patch libtool-64bit.patch no-stdint.patch
+PATCHFILES_isa-i386-version-1.0.4 = strip-nasm-1.0.4.patch
+PATCHFILES_isa-i386-version-1.1.2 = strip-nasm-1.1.2.patch libtool-64bit.patch
+PATCHFILES_isa-amd64-version-1.1.2 = libtool-64bit.patch
+PATCHFILES_isa-i386-version-1.2.1 = strip-nasm-1.2.1.patch libtool-64bit.patch no-stdint.patch
+PATCHFILES_isa-amd64-version-1.2.1 = strip-nasm-1.2.1.patch libtool-64bit.patch no-stdint.patch
 
 PACKAGES = CSWflac CSWxmmsflac
 CATALOGNAME_CSWflac = libflac
@@ -85,33 +85,33 @@
 
 TEST_TARGET = check
 
-MERGE_SCRIPTS_isa-i386-garversion-1.0.4 = copy-only
-MERGE_DIRS_isa-i386-garversion-1.0.4 = $(libdir)
-MERGE_SCRIPTS_isa-amd64-garversion-1.0.4 = copy-relocated-only
-MERGE_DIRS_isa-amd64-garversion-1.0.4 = $(libdir)
+MERGE_SCRIPTS_isa-i386-version-1.0.4 = copy-only
+MERGE_DIRS_isa-i386-version-1.0.4 = $(libdir)
+MERGE_SCRIPTS_isa-amd64-version-1.0.4 = copy-relocated-only
+MERGE_DIRS_isa-amd64-version-1.0.4 = $(libdir)
 
-MERGE_SCRIPTS_isa-i386-garversion-1.1.2 = copy-only
-MERGE_DIRS_isa-i386-garversion-1.1.2 = $(libdir)
-MERGE_SCRIPTS_isa-amd64-garversion-1.1.2 = copy-relocated-only
-MERGE_DIRS_isa-amd64-garversion-1.1.2 = $(libdir)
+MERGE_SCRIPTS_isa-i386-version-1.1.2 = copy-only
+MERGE_DIRS_isa-i386-version-1.1.2 = $(libdir)
+MERGE_SCRIPTS_isa-amd64-version-1.1.2 = copy-relocated-only
+MERGE_DIRS_isa-amd64-version-1.1.2 = $(libdir)
 
-MERGE_SCRIPTS_isa-i386-garversion-1.2.1 = copy-all
-MERGE_SCRIPTS_isa-amd64-garversion-1.2.1 = copy-relocated-only
-MERGE_DIRS_isa-amd64-garversion-1.2.1 = $(bindir) $(sbindir) $(libexecdir) $(libdir)
+MERGE_SCRIPTS_isa-i386-version-1.2.1 = copy-all
+MERGE_SCRIPTS_isa-amd64-version-1.2.1 = copy-relocated-only
+MERGE_DIRS_isa-amd64-version-1.2.1 = $(bindir) $(sbindir) $(libexecdir) $(libdir)
 
-MERGE_SCRIPTS_isa-sparcv8-garversion-1.0.4 = copy-only
-MERGE_DIRS_isa-sparcv8-garversion-1.0.4 = $(libdir)
-MERGE_SCRIPTS_isa-sparcv9-garversion-1.0.4 = copy-relocated-only
-MERGE_DIRS_isa-sparcv9-garversion-1.0.4 = $(libdir)
+MERGE_SCRIPTS_isa-sparcv8-version-1.0.4 = copy-only
+MERGE_DIRS_isa-sparcv8-version-1.0.4 = $(libdir)
+MERGE_SCRIPTS_isa-sparcv9-version-1.0.4 = copy-relocated-only
+MERGE_DIRS_isa-sparcv9-version-1.0.4 = $(libdir)
 
-MERGE_SCRIPTS_isa-sparcv8-garversion-1.1.2 = copy-only
-MERGE_DIRS_isa-sparcv8-garversion-1.1.2 = $(libdir)
-MERGE_SCRIPTS_isa-sparcv9-garversion-1.1.2 = copy-relocated-only
-MERGE_DIRS_isa-sparcv9-garversion-1.1.2 = $(libdir)
+MERGE_SCRIPTS_isa-sparcv8-version-1.1.2 = copy-only
+MERGE_DIRS_isa-sparcv8-version-1.1.2 = $(libdir)
+MERGE_SCRIPTS_isa-sparcv9-version-1.1.2 = copy-relocated-only
+MERGE_DIRS_isa-sparcv9-version-1.1.2 = $(libdir)
 
-MERGE_SCRIPTS_isa-sparcv8-garversion-1.2.1 = copy-all
-MERGE_SCRIPTS_isa-sparcv9-garversion-1.2.1 = copy-relocated-only
-MERGE_DIRS_isa-sparcv9-garversion-1.2.1 = $(bindir) $(sbindir) $(libexecdir) $(libdir)
+MERGE_SCRIPTS_isa-sparcv8-version-1.2.1 = copy-all
+MERGE_SCRIPTS_isa-sparcv9-version-1.2.1 = copy-relocated-only
+MERGE_DIRS_isa-sparcv9-version-1.2.1 = $(bindir) $(sbindir) $(libexecdir) $(libdir)
 
 PKGFILES_CSWxmmsflac = $(libdir)/xmms/.*
 
@@ -121,18 +121,18 @@
 CXX := $(abspath ./bin/CC)
 PATH := ./bin:$(PATH):/usr/ccs/bin
 
-post-patch-isa-i386-garversion-1.0.4:
+post-patch-isa-i386-version-1.0.4:
 	perl -pi -e "s/-O3 //g" $(WORKSRC)/configure
 	$(MAKECOOKIE)
 
-post-patch-isa-i386-garversion-1.1.2:
+post-patch-isa-i386-version-1.1.2:
 	perl -pi -e "s/-O2 //g" $(WORKSRC)/configure
 	$(MAKECOOKIE)
 
-post-patch-isa-sparcv8-garversion-1.0.4:
+post-patch-isa-sparcv8-version-1.0.4:
 	perl -pi -e "s/-O3 //g" $(WORKSRC)/configure
 	$(MAKECOOKIE)
 
-post-patch-isa-sparcv8-garversion-1.1.2:
+post-patch-isa-sparcv8-version-1.1.2:
 	perl -pi -e "s/-O2 //g" $(WORKSRC)/configure
 	$(MAKECOOKIE)

Modified: csw/mgar/pkg/glib/trunk/Makefile
===================================================================
--- csw/mgar/pkg/glib/trunk/Makefile	2012-01-22 22:23:21 UTC (rev 16878)
+++ csw/mgar/pkg/glib/trunk/Makefile	2012-01-23 09:31:04 UTC (rev 16879)
@@ -5,7 +5,7 @@
 EXTRA_MODULATORS = VERSION
 MODULATIONS_VERSION = 1.2.10 1.3.15
 
-SKIP_MODULATIONS = isa-sparcv9-garversion-1.2.10 isa-amd64-garversion-1.2.10
+SKIP_MODULATIONS = isa-sparcv9-version-1.2.10 isa-amd64-version-1.2.10
 
 DESCRIPTION = Utility library commonly associated with GNOME programs
 define BLURB
@@ -20,9 +20,9 @@
 NOEXTRACT = $(filter-out $(NAME)-$(VERSION).tar.gz,$(SOURCEFILES))
 PATCHFILES-1.3.15  = 0001-gtkdoc-mkhtml-returns-1-even-on-warnings.patch
 PATCHFILES-1.3.15 += 0002-Don-t-break-when-index.sgml-is-not-there.patch
-PATCHFILES_isa-i386-garversion-1.3.15 = $(PATCHFILES-1.3.15)
-PATCHFILES_isa-sparcv8-garversion-1.3.15 = $(PATCHFILES-1.3.15)
-PATCHFILES_isa-sparcv9-garversion-1.3.15 = $(PATCHFILES-1.3.15)
+PATCHFILES_isa-i386-version-1.3.15 = $(PATCHFILES-1.3.15)
+PATCHFILES_isa-sparcv8-version-1.3.15 = $(PATCHFILES-1.3.15)
+PATCHFILES_isa-sparcv9-version-1.3.15 = $(PATCHFILES-1.3.15)
 
 PACKAGES = CSWglib CSWglibdevel
 
@@ -51,8 +51,8 @@
 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2
 
 # There are three possible harmless tests failing for 1.3.15 64 bit, so skip for now
-TEST_SCRIPTS_isa-default-garversion-1.2.10 = $(WORKSRC)/Makefile
-TEST_SCRIPTS_isa-default-garversion-1.3.15 = $(WORKSRC)/Makefile
+TEST_SCRIPTS_isa-default-version-1.2.10 = $(WORKSRC)/Makefile
+TEST_SCRIPTS_isa-default-version-1.3.15 = $(WORKSRC)/Makefile
 TEST_SCRIPTS = $(call modulationvalue,TEST_SCRIPTS)
 
 TEST_TARGET = check
@@ -60,11 +60,11 @@
 #provided by iconv
 MERGE_EXCLUDE_FILES = .*/charset.alias
 
-MERGE_SCRIPTS_isa-default-garversion-1.2.10 = copy-only
-MERGE_DIRS_isa-default-garversion-1.2.10 = $(libdir)
-MERGE_SCRIPTS_isa-default-garversion-1.3.15 = copy-all
-MERGE_DIRS_isa-extra-garversion-1.3.15 = $(libdir)
-MERGE_SCRIPTS_isa-extra-garversion-1.3.15 = copy-relocated-only
+MERGE_SCRIPTS_isa-default-version-1.2.10 = copy-only
+MERGE_DIRS_isa-default-version-1.2.10 = $(libdir)
+MERGE_SCRIPTS_isa-default-version-1.3.15 = copy-all
+MERGE_DIRS_isa-extra-version-1.3.15 = $(libdir)
+MERGE_SCRIPTS_isa-extra-version-1.3.15 = copy-relocated-only
 
 PKGFILES_CSWglibdevel  = $(PKGFILES_DEVEL)
 PKGFILES_CSWglibdevel += $(sharedstatedir)/gtk-doc/.*

Modified: csw/mgar/pkg/libmm/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libmm/trunk/Makefile	2012-01-22 22:23:21 UTC (rev 16878)
+++ csw/mgar/pkg/libmm/trunk/Makefile	2012-01-23 09:31:04 UTC (rev 16879)
@@ -6,8 +6,8 @@
 MODULATIONS_VERSION = 1.3.1 1.4.2
 
 # No 64 bit for old version as it wasn't provided in the legacy version also
-SKIP_MODULATIONS = isa-amd64-garversion-1.3.1
-SKIP_MODULATIONS += isa-sparcv9-garversion-1.3.1
+SKIP_MODULATIONS = isa-amd64-version-1.3.1
+SKIP_MODULATIONS += isa-sparcv9-version-1.3.1
 
 DESCRIPTION = Shared Memory Allocation abstraction library
 define BLURB
@@ -42,23 +42,23 @@
 BUILD64 = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
-MERGE_SCRIPTS_isa-i386-garversion-1.3.1 = copy-only
-MERGE_DIRS_isa-i386-garversion-1.3.1 = $(libdir)
-MERGE_SCRIPTS_isa-amd64-garversion-1.3.1 = copy-relocated-only
-MERGE_DIRS_isa-amd64-garversion-1.3.1 = $(libdir)
+MERGE_SCRIPTS_isa-i386-version-1.3.1 = copy-only
+MERGE_DIRS_isa-i386-version-1.3.1 = $(libdir)
+MERGE_SCRIPTS_isa-amd64-version-1.3.1 = copy-relocated-only
+MERGE_DIRS_isa-amd64-version-1.3.1 = $(libdir)
 
-MERGE_SCRIPTS_isa-i386-garversion-1.4.2 = copy-all
-MERGE_SCRIPTS_isa-amd64-garversion-1.4.2 = copy-relocated-only
-MERGE_DIRS_isa-amd64-garversion-1.4.2 = $(bindir) $(sbindir) $(libexecdir) $(libdir)
+MERGE_SCRIPTS_isa-i386-version-1.4.2 = copy-all
+MERGE_SCRIPTS_isa-amd64-version-1.4.2 = copy-relocated-only
+MERGE_DIRS_isa-amd64-version-1.4.2 = $(bindir) $(sbindir) $(libexecdir) $(libdir)
 
-MERGE_SCRIPTS_isa-sparcv8-garversion-1.3.1 = copy-only
-MERGE_DIRS_isa-sparcv8-garversion-1.3.1 = $(libdir)
-MERGE_SCRIPTS_isa-sparcv9-garversion-1.3.1 = copy-relocated-only
-MERGE_DIRS_isa-sparcv9-garversion-1.3.1 = $(libdir)
+MERGE_SCRIPTS_isa-sparcv8-version-1.3.1 = copy-only
+MERGE_DIRS_isa-sparcv8-version-1.3.1 = $(libdir)
+MERGE_SCRIPTS_isa-sparcv9-version-1.3.1 = copy-relocated-only
+MERGE_DIRS_isa-sparcv9-version-1.3.1 = $(libdir)
 
-MERGE_SCRIPTS_isa-sparcv8-garversion-1.4.2 = copy-all
-MERGE_SCRIPTS_isa-sparcv9-garversion-1.4.2 = copy-relocated-only
-MERGE_DIRS_isa-sparcv9-garversion-1.4.2 = $(bindir) $(sbindir) $(libexecdir) $(libdir)
+MERGE_SCRIPTS_isa-sparcv8-version-1.4.2 = copy-all
+MERGE_SCRIPTS_isa-sparcv9-version-1.4.2 = copy-relocated-only
+MERGE_DIRS_isa-sparcv9-version-1.4.2 = $(bindir) $(sbindir) $(libexecdir) $(libdir)
 
 
 include gar/category.mk

Modified: csw/mgar/pkg/wxwidgets/trunk/Makefile
===================================================================
--- csw/mgar/pkg/wxwidgets/trunk/Makefile	2012-01-22 22:23:21 UTC (rev 16878)
+++ csw/mgar/pkg/wxwidgets/trunk/Makefile	2012-01-23 09:31:04 UTC (rev 16879)
@@ -25,12 +25,12 @@
 # files copied from the old package have been provided.
 MODULATIONS_VERSION = 2.8.10
 
-MERGE_SCRIPTS_isa-i386-garversion-2.8.5 = copy-only
-MERGE_DIRS_isa-i386-garversion-2.8.5 = $(libdir)
-MERGE_SCRIPTS_isa-sparcv8-garversion-2.8.5 = copy-only
-MERGE_DIRS_isa-sparcv8-garversion-2.8.5 = $(libdir)
-MERGE_SCRIPTS_isa-i386-garversion-2.8.10 = copy-all
-MERGE_SCRIPTS_isa-sparcv8-garversion-2.8.10 = copy-all
+MERGE_SCRIPTS_isa-i386-version-2.8.5 = copy-only
+MERGE_DIRS_isa-i386-version-2.8.5 = $(libdir)
+MERGE_SCRIPTS_isa-sparcv8-version-2.8.5 = copy-only
+MERGE_DIRS_isa-sparcv8-version-2.8.5 = $(libdir)
+MERGE_SCRIPTS_isa-i386-version-2.8.10 = copy-all
+MERGE_SCRIPTS_isa-sparcv8-version-2.8.10 = copy-all
 
 SOURCEFILES = $(foreach VERSION,$(MODULATIONS_VERSION),$(NAME)-$(VERSION).tar.gz)
 NOEXTRACT = $(filter-out $(NAME)-$(VERSION).tar.gz,$(SOURCEFILES))
@@ -44,26 +44,26 @@
 SF_PROJ = wxwindows
 
 
-PATCHFILES_isa-i386-garversion-2.8.5  = 0500-wxT-macro-first-iteration.patch
-PATCHFILES_isa-i386-garversion-2.8.5 += 0501-a-possible-fix-to-wxchar.h.patch
-PATCHFILES_isa-i386-garversion-2.8.5 += 0002-Fixing-retarded-checks-for-libGL.patch
-PATCHFILES_isa-i386-garversion-2.8.5 += 0003-vsscanf-support-via-ncursesw.patch
-PATCHFILES_isa-i386-garversion-2.8.5 += 0004-add-monodll_appbase.so-to-wxrc.patch
-PATCHFILES_isa-i386-garversion-2.8.5 += 0005-stupid-vwscanf-workaround.patch
-PATCHFILES_isa-sparcv8-garversion-2.8.5  = 0500-wxT-macro-first-iteration.patch
-PATCHFILES_isa-sparcv8-garversion-2.8.5 += 0501-a-possible-fix-to-wxchar.h.patch
-PATCHFILES_isa-sparcv8-garversion-2.8.5 += 0002-Fixing-retarded-checks-for-libGL.patch
-PATCHFILES_isa-sparcv8-garversion-2.8.5 += 0003-vsscanf-support-via-ncursesw.patch
-PATCHFILES_isa-sparcv8-garversion-2.8.5 += 0004-add-monodll_appbase.so-to-wxrc.patch
-PATCHFILES_isa-sparcv8-garversion-2.8.5 += 0005-stupid-vwscanf-workaround.patch
-PATCHFILES_isa-i386-garversion-2.8.10  = 0001-Patches-from-http-trac.wxwidgets.org-ticket-10660.patch
-PATCHFILES_isa-i386-garversion-2.8.10 += 0002-Fixing-retarded-checks-for-libGL.patch
-PATCHFILES_isa-i386-garversion-2.8.10 += 0003-vsscanf-support-via-ncursesw.patch
-PATCHFILES_isa-i386-garversion-2.8.10 += 0005-stupid-vwscanf-workaround.patch
-PATCHFILES_isa-sparcv8-garversion-2.8.10  = 0001-Patches-from-http-trac.wxwidgets.org-ticket-10660.patch
-PATCHFILES_isa-sparcv8-garversion-2.8.10 += 0002-Fixing-retarded-checks-for-libGL.patch
-PATCHFILES_isa-sparcv8-garversion-2.8.10 += 0003-vsscanf-support-via-ncursesw.patch
-PATCHFILES_isa-sparcv8-garversion-2.8.10 += 0005-stupid-vwscanf-workaround.patch
+PATCHFILES_isa-i386-version-2.8.5  = 0500-wxT-macro-first-iteration.patch
+PATCHFILES_isa-i386-version-2.8.5 += 0501-a-possible-fix-to-wxchar.h.patch
+PATCHFILES_isa-i386-version-2.8.5 += 0002-Fixing-retarded-checks-for-libGL.patch
+PATCHFILES_isa-i386-version-2.8.5 += 0003-vsscanf-support-via-ncursesw.patch
+PATCHFILES_isa-i386-version-2.8.5 += 0004-add-monodll_appbase.so-to-wxrc.patch
+PATCHFILES_isa-i386-version-2.8.5 += 0005-stupid-vwscanf-workaround.patch
+PATCHFILES_isa-sparcv8-version-2.8.5  = 0500-wxT-macro-first-iteration.patch
+PATCHFILES_isa-sparcv8-version-2.8.5 += 0501-a-possible-fix-to-wxchar.h.patch
+PATCHFILES_isa-sparcv8-version-2.8.5 += 0002-Fixing-retarded-checks-for-libGL.patch
+PATCHFILES_isa-sparcv8-version-2.8.5 += 0003-vsscanf-support-via-ncursesw.patch
+PATCHFILES_isa-sparcv8-version-2.8.5 += 0004-add-monodll_appbase.so-to-wxrc.patch
+PATCHFILES_isa-sparcv8-version-2.8.5 += 0005-stupid-vwscanf-workaround.patch
+PATCHFILES_isa-i386-version-2.8.10  = 0001-Patches-from-http-trac.wxwidgets.org-ticket-10660.patch
+PATCHFILES_isa-i386-version-2.8.10 += 0002-Fixing-retarded-checks-for-libGL.patch
+PATCHFILES_isa-i386-version-2.8.10 += 0003-vsscanf-support-via-ncursesw.patch
+PATCHFILES_isa-i386-version-2.8.10 += 0005-stupid-vwscanf-workaround.patch
+PATCHFILES_isa-sparcv8-version-2.8.10  = 0001-Patches-from-http-trac.wxwidgets.org-ticket-10660.patch
+PATCHFILES_isa-sparcv8-version-2.8.10 += 0002-Fixing-retarded-checks-for-libGL.patch
+PATCHFILES_isa-sparcv8-version-2.8.10 += 0003-vsscanf-support-via-ncursesw.patch
+PATCHFILES_isa-sparcv8-version-2.8.10 += 0005-stupid-vwscanf-workaround.patch
 PACKAGES  = CSWwxwidgetscommon
 PACKAGES += CSWwxwidgetsdevel
 PACKAGES += CSWwxwidgetsgtk2
@@ -160,8 +160,8 @@
 
 # The 2.8.5 version has been compiled as a monolithic library.  Building it the
 # same way for backwards compatibility.
-CONFIGURE_ARGS_garversion-2.8.5 = --enable-monolithic
-CONFIGURE_ARGS += $(CONFIGURE_ARGS_garversion-$(VERSION))
+CONFIGURE_ARGS_version-2.8.5 = --enable-monolithic
+CONFIGURE_ARGS += $(CONFIGURE_ARGS_version-$(VERSION))
 
 INSTALL_SCRIPTS = wxwidgets
 

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