Bundle patches into distfiles tarball

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

17 files changed, 25 insertions, 811 deletions

diff --git a/dev-lang/mozart/ChangeLog b/dev-lang/mozart/ChangeLog
index b78a78d72ca2..fe8f8c6ce7ae 100644
--- a/dev-lang/mozart/ChangeLog
+++ b/dev-lang/mozart/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for dev-lang/mozart
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mozart/ChangeLog,v 1.28 2010/08/26 07:29:03 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mozart/ChangeLog,v 1.29 2010/11/18 08:01:21 keri Exp $
+
+  18 Nov 2010; <keri@gentoo.org> mozart-1.4.0.ebuild,
+  -files/mozart-1.4.0-const-cast.patch, -files/mozart-1.4.0-contrib.patch,
+  -files/mozart-1.4.0-cstdio.patch, -files/mozart-1.4.0-dss-ldflags.patch,
+  -files/mozart-1.4.0-dss-libpath.patch, -files/mozart-1.4.0-dss-pic.patch,
+  -files/mozart-1.4.0-dss-prefix.patch,
+  -files/mozart-1.4.0-mkinstalldirs.patch,
+  -files/mozart-1.4.0-nostrip.patch,
+  -files/mozart-1.4.0-ozbison-string.patch,
+  -files/mozart-1.4.0-ozhome.patch,
+  -files/mozart-1.4.0-ozplatform-amd64.patch,
+  -files/mozart-1.4.0-ozplatform-sparc.patch,
+  -files/mozart-1.4.0-parallel-make.patch:
+  Bundle patches into distfiles tarball
 
   26 Aug 2010; <keri@gentoo.org> mozart-1.4.0.ebuild,
   +files/mozart-1.4.0-ozbison-string.patch:
diff --git a/dev-lang/mozart/Manifest b/dev-lang/mozart/Manifest
index ebdaac7d2f70..f774c25c55ab 100644
--- a/dev-lang/mozart/Manifest
+++ b/dev-lang/mozart/Manifest
@@ -7,26 +7,13 @@ AUX mozart-1.3.2-nostrip.patch 329 RMD160 9d7e8059e0fc0baf556d7508cc266c6ead0b9a
 AUX mozart-1.3.2-ozplatform.patch 1925 RMD160 416db4fbc216edc4022114d40f1cb44a8b1b55df SHA1 1e2335b1b39389f7b97be0a8727bb96c7fe8da31 SHA256 3d629fd1903645025f7a4698122136fefe7e28d929eda132dc723d11a8d83d38
 AUX mozart-1.3.2-portage.patch 11472 RMD160 3b58dce99cafc4f282f2a3a1faff39f25af0f6fa SHA1 012c7b508dea8c4978f73292f6babe8303ecc730 SHA256 0f75d6879abfaeac70ec1713e013f2d6608eb3c2e197db9d02ad54729b02986f
 AUX mozart-1.3.2-ri-fpe.patch 1158 RMD160 d8741090acc8fe4bf67c55f873ad141bda01796b SHA1 6ccc5ea52f8cabde2d92a9e01977c37d1d6dd8a0 SHA256 544b2bdc701a80f69541417aeb05885155edc7111f2fd17581c1a0801eaee211
-AUX mozart-1.4.0-const-cast.patch 1271 RMD160 fc8cf1073bd1ca89b96f3c2b4a28150860fd71ce SHA1 8ec6fcac24e483dd07fab0eb5d509402e145cace SHA256 4eb9e7f8ee5304717510a5423e49f1cfa333c28baa5f5d78dd77b6ad6d2332b5
-AUX mozart-1.4.0-contrib.patch 10158 RMD160 c27d3537df58756706b2fe4dc53a1435eb03f8a6 SHA1 d4c01206336932dad16a6ec7a73da1b850347ca2 SHA256 6db14aa85d3f76439b8cddfc2cfc4e43df5750cf4d0a4c5637f2b89a5b6d82fb
-AUX mozart-1.4.0-cstdio.patch 318 RMD160 38a71ae337ae663b51f40ad4c30c11da4cbfd1f0 SHA1 7ef310929972fd8a580905bcb5fc5948037650aa SHA256 3e2396b75ca15a0276d473d358c532c4442c896221550b37a98af783389c3b33
-AUX mozart-1.4.0-dss-ldflags.patch 396 RMD160 65139d4e84e4f5640b833772ce4c3296c7fb95ed SHA1 afcb6b4f41a6c4ad1c03deb69ab8c54d1dd1f59f SHA256 609252195d6f52ebdb094f6d72963be9321da7208238981d404c3fc1c6cb87a1
-AUX mozart-1.4.0-dss-libpath.patch 1546 RMD160 92b250b7890c2f65c212ef87c9ac6fb9c9fb3605 SHA1 06e99d305d17b382f8806399656118c9e1101143 SHA256 78b8b1a1fe33eaaa2527c67fbf9bd33efbc3b7b8328ea73130315421d573d460
-AUX mozart-1.4.0-dss-pic.patch 420 RMD160 9626e86cb378d3e3155fa1bbc9b536563c8e5b53 SHA1 97c7ef74e71b35b7f95c4393f7809f940568c3dc SHA256 ad6bb0d12a6e047c34c223ee9e02f25281d5ec98760738507d8c603cbee222f8
-AUX mozart-1.4.0-dss-prefix.patch 1546 RMD160 e600b1c830dca05e466ad8d677fde4277ed3ef99 SHA1 993c214705c62183f7a04b3b383924d22d098b18 SHA256 9ccc1d8718edbd4dcf62f1e0c2b0117cc5ebc35d7abcf4f8992ba63521b489d6
-AUX mozart-1.4.0-mkinstalldirs.patch 382 RMD160 1dab41c175b9a6c60b5f57de29c3fffff9d44cfe SHA1 16cad8c16284560884cd40eea45453fda8a2b896 SHA256 f865abb4c92378e623f4d46255912149aa10fe104bb131bccaf3a680b88c83e5
-AUX mozart-1.4.0-nostrip.patch 347 RMD160 4a74bcda2c731c9828f2643df82edf5b1b2ec681 SHA1 b31ea5c757bdb3fc20b840415be4bbdbcad4fac1 SHA256 bc57e2d5c8c64a15f10d9ecd64e98709bf32c5bca3ba74816a74c96799e6d256
-AUX mozart-1.4.0-ozbison-string.patch 1457 RMD160 c1829da52996c7411dcd2b937a88f7026b8c1404 SHA1 1082c3655256dca1713d3ed415b71b896d791231 SHA256 9bc7407901f5e27bfe716ac0595075c86703ac9dd6a7e7fb4f0d83ba68a9d189
-AUX mozart-1.4.0-ozhome.patch 363 RMD160 0dcc89ead8d8629717c196e4e0eea2bf8c28d887 SHA1 5bd6fb021e4d4de10936bb40bd2295f69dfbf465 SHA256 8fc8feb27e2988d6ae33342d2d14dfb9e55606b3175b190558ca27ac54ca1f6a
-AUX mozart-1.4.0-ozplatform-amd64.patch 358 RMD160 117b7c6c1608c7d1974cc29c6b8842946a0ca6c8 SHA1 b0a5836fa8bdc8886cb1428f85af6f81b84c1899 SHA256 df8cb8d7ccd910bbb892ec350aa9e4633247336e41cc722bd75302465816fff4
-AUX mozart-1.4.0-ozplatform-sparc.patch 383 RMD160 aba8317b99e8016029e6bb4146394b61b073f28c SHA1 591f51e8a4f33df6aaac84a907e5445a1dfa0f39 SHA256 fa7c5aa6489ffc3d575a7745c1a5d373123250b7429476ce7a9d8ff6eff70639
-AUX mozart-1.4.0-parallel-make.patch 8295 RMD160 e1c0446a4b40631854638ded038205bcacc5a14c SHA1 ab363ce05f1dc752dc2cea49cb4da51af1f64939 SHA256 a60fb6491a0558a2533155518b221286b4a850cb3cbe6702e9bb088812f53349
 DIST mozart-1.3.2.20060615-doc.tar.gz 3890265 RMD160 450721bb64cbcc5cefddbaf9c3b0cdfe6261ae5f SHA1 28dfd9f92ba6ee698acb7363146b4a1c0ab4199f SHA256 b169418dd02fb6024d897778908928a6aa800e8ea96b6c76515b064bfac3b84e
 DIST mozart-1.3.2.20060615-src.tar.gz 10798680 RMD160 22dd1f639b6ea525744564b37be009bd599d60ad SHA1 aa980f4de7dcb2b4c2db511a464a5b6497b98109 SHA256 a09acd3365911348fd7b351d73ae1b2ad76ae96ffd335ee08746f5dcca3a55bf
+DIST mozart-1.4.0-gentoo-patchset-0.tar.gz 6690 RMD160 36ebb0303bed0d44cd882d5913d0e795be006112 SHA1 b211cc4c7062da406316445705f78510bd741c2f SHA256 2ece5d0ecf04b932ca64f5d3525befecf05a1bddd7dd1da0814cd6e998a35b00
 DIST mozart-1.4.0.20080704-doc.tar.gz 4085020 RMD160 1d0c9787ec1bbf28881060a2c360295c7f89d5e7 SHA1 308fdd1d835f5197795f31232ed2374b646bf26a SHA256 68c52cb7379504a5142af37459c89884355fb9cc020f585d7778e7d4b1f0cd9e
 DIST mozart-1.4.0.20080704-src.tar.gz 11848201 RMD160 090c0af3cba9db422c58c37d5fa3e703c8cc82d7 SHA1 5a12a1d66c871f01dc1223aa614d4e0bf7717b3f SHA256 5da73d80b5aa7fa42edca64159a1a076323f090e5c548f3747f94d0afc60b223
 EBUILD mozart-1.3.2-r1.ebuild 3353 RMD160 23eeed57eaa52152a1a80cf9342e2214b179a45d SHA1 a6f67779202464e8b3f424b3c2572fe4bef110d5 SHA256 8a6217db4b59b407e88c4dfcd74bdbc36821881cf8486eb3f83000009d5b227c
 EBUILD mozart-1.3.2.ebuild 2844 RMD160 b82d5f5f606dbb7159a8f9731f5666da49be2ccd SHA1 32c9b7b398be5dfa41765f1c2ed05646e4b7fd15 SHA256 812d800140a4ad6677f35e7be0f433a20c6eb0ace5411a81eb05bdedb9003fc7
-EBUILD mozart-1.4.0.ebuild 3476 RMD160 cd81bd1c823d21ae35fa2c2c1e3c51d0a4ffe835 SHA1 7a2ebed1718255e5bf92b77192fd8f3f4b605ed7 SHA256 c454c8b02728662ce4de08975dc2ec68effead97b29795230b8657b19235e021
-MISC ChangeLog 4448 RMD160 72ca6ac4245a416432c295907f9fcae573fbaf98 SHA1 4653c9e3e5b0ff85a620a22d1ffd5f460dbbf01e SHA256 415f66d4068cf9d05396fa3ea8447ad084f294e730e87e3c5b8a62946021baf5
+EBUILD mozart-1.4.0.ebuild 2987 RMD160 c466de6e331d203491fc06bd999635f7e82de7c8 SHA1 b52c8565c31705dd7c73fea36cb01eb450559f67 SHA256 7e504e682b1bf8ef74f4652212d01a51f7014ba87b1bb75f21f8c3dffb9179ff
+MISC ChangeLog 5104 RMD160 fcb35dbc0dd20d6322fd0ace6d4fc9dc610c4cde SHA1 c9273b4eeb4424777e5e59983274649ad2fdba88 SHA256 e706b4b1fa0ce593ef06687ce4caa93772dc4a75958b708a5592dda12013b53a
 MISC metadata.xml 247 RMD160 1b3df3c501d9a3b2e2651668be405677e8416397 SHA1 7b705a8a3368abab6ad31ea2fcb5e5db865d92b1 SHA256 2768d0688d443184194068497dcafb2e5d67521980cb46b7e8efc07d3900bcaa
diff --git a/dev-lang/mozart/files/mozart-1.4.0-const-cast.patch b/dev-lang/mozart/files/mozart-1.4.0-const-cast.patch
deleted file mode 100644
index 927b9e278427..000000000000
--- a/dev-lang/mozart/files/mozart-1.4.0-const-cast.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -ur mozart-1.4.0.20080704.orig/platform/emulator/urlc.cc mozart-1.4.0.20080704/platform/emulator/urlc.cc
---- mozart-1.4.0.20080704.orig/platform/emulator/urlc.cc	2005-05-19 00:23:12.000000000 +0000
-+++ mozart-1.4.0.20080704/platform/emulator/urlc.cc	2009-08-09 22:03:30.000000000 +0000
-@@ -625,13 +625,13 @@
-     }
-     port = 21;
- 
--    p_collon = strchr(line, ':');
--    p_at = strchr(line, '@');
-+    p_collon = strchr(const_cast<char*>(line), ':');
-+    p_at = strchr(const_cast<char*>(line), '@');
-     if(NULL != p_at) // we have a pass
- 	p_slash = strchr(p_at + 1, '/');
-     else
--	p_slash = strchr(line, '/'); 
--    p_semi = strchr(line, ';'); // to avoid masking by pass
-+	p_slash = strchr(const_cast<char*>(line), '/'); 
-+    p_semi = strchr(const_cast<char*>(line), ';'); // to avoid masking by pass
-     
-     // sanity checks
-     if((NULL != p_collon) && (0 == p_collon[1]))
-@@ -1140,8 +1140,8 @@
- 
-     if((NULL == line) || (0 == *line)) // emtpy line?
- 	return (URLC_EEMPTY);
--    p_collon = strchr(line, ':');
--    p_slash = strchr(line, '/');
-+    p_collon = strchr(const_cast<char*>(line), ':');
-+    p_slash = strchr(const_cast<char*>(line), '/');
-     
-     // sanity checks
-     if((NULL != p_collon) && (0 == p_collon[1])) // nothing after :
diff --git a/dev-lang/mozart/files/mozart-1.4.0-contrib.patch b/dev-lang/mozart/files/mozart-1.4.0-contrib.patch
deleted file mode 100644
index bf5830c61ce0..000000000000
--- a/dev-lang/mozart/files/mozart-1.4.0-contrib.patch
+++ /dev/null
@@ -1,273 +0,0 @@
-diff -ur mozart-1.4.0.20080704.orig/contrib/ap/Makefile.in mozart-1.4.0.20080704/contrib/ap/Makefile.in
---- mozart-1.4.0.20080704.orig/contrib/ap/Makefile.in	2001-08-05 10:24:45.000000000 +1200
-+++ mozart-1.4.0.20080704/contrib/ap/Makefile.in	2008-07-06 12:57:25.000000000 +1200
-@@ -12,13 +12,17 @@
- INSTALL_LIB	= $(INSTALL) -m 444
- FUNCTORS	= OptionSheet.ozf
- NEWCACHEDIR	= $(PREFIX)/cache/x-oz/contrib/ap
-+NEW_FUNCTORS	= $(addprefix $(NEWCACHEDIR)/,$(FUNCTORS))
- PLATFORM	= @PLATFORM@
- CYGPATH		= $(SRCTOP)/share/lib/cygpath.sh
- 
- all:		$(FUNCTORS)
- %.ozf: %.oz
- 	$(OZC) -z 9 -c $(shell $(CYGPATH) "$<") -o $@
--install: $(NEWCACHEDIR) $(addprefix $(NEWCACHEDIR)/,$(FUNCTORS))
-+install: $(NEWCACHEDIR) $(NEW_FUNCTORS)
-+
-+$(NEW_FUNCTORS): $(NEWCACHEDIR)
-+
- $(LIB_DIR) $(NEWCACHEDIR):
- 	$(INSTALL_DIR) $@
- $(LIB_DIR)/%.ozf: %.ozf
-diff -ur mozart-1.4.0.20080704.orig/contrib/compat/Makefile.in mozart-1.4.0.20080704/contrib/compat/Makefile.in
---- mozart-1.4.0.20080704.orig/contrib/compat/Makefile.in	2003-11-26 03:53:52.000000000 +1300
-+++ mozart-1.4.0.20080704/contrib/compat/Makefile.in	2008-07-06 12:58:27.000000000 +1200
-@@ -38,6 +38,9 @@
- 
- install: $(BIN_DIR) $(BIN_TARGETS) $(CACHEDIR) $(CACHE_TARGETS)
- 
-+$(BIN_TARGETS): $(BIN_DIR)
-+$(CACHE_TARGETS): $(CACHEDIR)
-+
- $(BIN_DIR) $(CACHEDIR):
- 	$(INSTALL_DIR) $@
- 
-diff -ur mozart-1.4.0.20080704.orig/contrib/davinci/Makefile.in mozart-1.4.0.20080704/contrib/davinci/Makefile.in
---- mozart-1.4.0.20080704.orig/contrib/davinci/Makefile.in	2001-08-05 10:24:45.000000000 +1200
-+++ mozart-1.4.0.20080704/contrib/davinci/Makefile.in	2008-07-06 12:59:05.000000000 +1200
-@@ -53,6 +53,8 @@
- all:     $(TARGETS)
- install: $(LIB_DIR) $(LIB_TARGETS)
- 
-+$(LIB_TARGETS): $(LIB_DIR)
-+
- $(LIB_DIR):
- 	$(INSTALL_DIR) $@
- 
-diff -ur mozart-1.4.0.20080704.orig/contrib/directory/Makefile.in mozart-1.4.0.20080704/contrib/directory/Makefile.in
---- mozart-1.4.0.20080704.orig/contrib/directory/Makefile.in	2001-08-05 10:24:45.000000000 +1200
-+++ mozart-1.4.0.20080704/contrib/directory/Makefile.in	2008-07-06 12:59:30.000000000 +1200
-@@ -56,6 +56,8 @@
- all:     $(TARGETS)
- install: $(NEWCACHEDIR) $(NEW_TARGETS)
- 
-+$(NEW_TARGETS): $(NEWCACHEDIR)
-+
- $(LIB_DIR) $(NEWCACHEDIR):
- 	$(INSTALL_DIR) $@
- 
-diff -ur mozart-1.4.0.20080704.orig/contrib/doc/code/Makefile.in mozart-1.4.0.20080704/contrib/doc/code/Makefile.in
---- mozart-1.4.0.20080704.orig/contrib/doc/code/Makefile.in	2002-04-02 00:31:22.000000000 +1200
-+++ mozart-1.4.0.20080704/contrib/doc/code/Makefile.in	2008-07-06 13:00:26.000000000 +1200
-@@ -54,6 +54,9 @@
- install:	$(ELIB_DIR) $(ELIB_TARGETS) \
- 	$(NEWCACHEDIR) $(NEW_TARGETS)
- 
-+$(ELIB_TARGETS): $(ELIB_DIR)
-+$(NEW_TARGETS): $(NEWCACHEDIR)
-+
- $(LIB_DIR) $(ELIB_DIR) $(NEWCACHEDIR):
- 	$(INSTALL_DIR) $@
- 
-diff -ur mozart-1.4.0.20080704.orig/contrib/doc/sgml/Makefile.in mozart-1.4.0.20080704/contrib/doc/sgml/Makefile.in
---- mozart-1.4.0.20080704.orig/contrib/doc/sgml/Makefile.in	2001-08-05 10:24:45.000000000 +1200
-+++ mozart-1.4.0.20080704/contrib/doc/sgml/Makefile.in	2008-07-06 13:00:51.000000000 +1200
-@@ -22,6 +22,8 @@
- all:		$(TARGETS)
- install:	$(NEWCACHEDIR) $(NEW_TARGETS)
- 
-+$(NEW_TARGETS): $(NEWCACHEDIR)
-+
- $(LIB_DIR) $(NEWCACHEDIR):
- 	$(INSTALL_DIR) $@
- 
-diff -ur mozart-1.4.0.20080704.orig/contrib/fcp/Makefile.in mozart-1.4.0.20080704/contrib/fcp/Makefile.in
---- mozart-1.4.0.20080704.orig/contrib/fcp/Makefile.in	2001-08-05 10:24:45.000000000 +1200
-+++ mozart-1.4.0.20080704/contrib/fcp/Makefile.in	2008-07-06 13:08:32.000000000 +1200
-@@ -74,6 +74,8 @@
- 
- new: clean all
- 
-+$(LIB_TARGETS): $(LIB_DIR)
-+
- $(LIB_DIR):
- 	$(INSTALL_DIR) $@
- 
-diff -ur mozart-1.4.0.20080704.orig/contrib/gdbm/Makefile.in mozart-1.4.0.20080704/contrib/gdbm/Makefile.in
---- mozart-1.4.0.20080704.orig/contrib/gdbm/Makefile.in	2003-01-08 02:40:10.000000000 +1300
-+++ mozart-1.4.0.20080704/contrib/gdbm/Makefile.in	2008-07-06 13:09:02.000000000 +1200
-@@ -36,6 +36,8 @@
- all:		$(TARGETS)
- install:	$(NEWCACHEDIR) $(NEW_TARGETS)
- 
-+$(NEW_TARGETS): $(NEWCACHEDIR)
-+
- $(LIB_DIR) $(NEWCACHEDIR):
- 	$(INSTALL_DIR) $@
- 
-diff -ur mozart-1.4.0.20080704.orig/contrib/gtk/Makefile.in mozart-1.4.0.20080704/contrib/gtk/Makefile.in
---- mozart-1.4.0.20080704.orig/contrib/gtk/Makefile.in	2003-01-08 02:40:10.000000000 +1300
-+++ mozart-1.4.0.20080704/contrib/gtk/Makefile.in	2008-07-06 13:10:48.000000000 +1200
-@@ -212,7 +212,7 @@
- all: $(TARGETS) binding
- install: $(LIB_DIR) $(LIB_TARGETS) $(EXAMPLES_DIR) $(EXAMPLES_TARGETS) \
- 	install_names
--install_names:
-+install_names: $(LIB_DIR)
- 	cp ClassNames.ozp $(LIB_DIR)/ClassNames.ozp
- 
- #---------------------------------------------------------------------
-@@ -259,6 +259,9 @@
- # Installing
- #---------------------------------------------------------------------
- 
-+$(LIB_TARGETS): $(LIB_DIR)
-+$(EXAMPLES_TARGETS): $(EXAMPLES_DIR)
-+
- $(LIB_DIR) $(EXAMPLES_DIR):
- 	$(INSTALL_DIR) $@
- 
-diff -ur mozart-1.4.0.20080704.orig/contrib/investigator/Makefile.in mozart-1.4.0.20080704/contrib/investigator/Makefile.in
---- mozart-1.4.0.20080704.orig/contrib/investigator/Makefile.in	2001-08-05 10:24:45.000000000 +1200
-+++ mozart-1.4.0.20080704/contrib/investigator/Makefile.in	2008-07-06 13:11:27.000000000 +1200
-@@ -64,6 +64,8 @@
- install: $(LIB_DIR) $(LIB_TARGETS)
- new:	 clean all
- 
-+$(LIB_TARGETS): $(LIB_DIR)
-+
- $(LIB_DIR):
- 	$(INSTALL_DIR) $@
- 
-diff -ur mozart-1.4.0.20080704.orig/contrib/lp/Makefile.in mozart-1.4.0.20080704/contrib/lp/Makefile.in
---- mozart-1.4.0.20080704.orig/contrib/lp/Makefile.in	2003-10-10 23:14:48.000000000 +1300
-+++ mozart-1.4.0.20080704/contrib/lp/Makefile.in	2008-07-06 13:11:55.000000000 +1200
-@@ -75,6 +75,8 @@
- all:		$(TARGETS)
- install:	$(LIB_DIR) $(LIB_TARGETS)
- 
-+$(LIB_TARGETS): $(LIB_DIR)
-+
- $(LIB_DIR):
- 	$(INSTALL_DIR) $@
- 
-diff -ur mozart-1.4.0.20080704.orig/contrib/maple/Makefile.in mozart-1.4.0.20080704/contrib/maple/Makefile.in
---- mozart-1.4.0.20080704.orig/contrib/maple/Makefile.in	2001-08-05 10:24:45.000000000 +1200
-+++ mozart-1.4.0.20080704/contrib/maple/Makefile.in	2008-07-06 13:12:29.000000000 +1200
-@@ -90,6 +90,8 @@
- all:            first $(TARGETS)
- install:        $(LIB_DIR) $(LIB_TARGETS)
- 
-+$(LIB_TARGETS): $(LIB_DIR)
-+
- $(LIB_DIR):
- 	$(INSTALL_DIR) $@
- 
-diff -ur mozart-1.4.0.20080704.orig/contrib/micq/Makefile.in mozart-1.4.0.20080704/contrib/micq/Makefile.in
---- mozart-1.4.0.20080704.orig/contrib/micq/Makefile.in	2001-08-05 10:24:45.000000000 +1200
-+++ mozart-1.4.0.20080704/contrib/micq/Makefile.in	2008-07-06 13:14:05.000000000 +1200
-@@ -17,6 +17,7 @@
- INSTALL_DIR	= @INSTALL_DIR@
- INSTALL_LIB	= $(INSTALL) -m 444
- APPLETS		= server.oza client.oza
-+NEW_APPLETS	= $(addprefix $(NEWCACHEDIR)/,$(APPLETS))
- GIFCONV		= Gif2Functor.oza
- ICONDIR		= $(SRCDIR)/Icons2
- MAKEGIF		= $(OZENGINE) $(GIFCONV)
-@@ -26,7 +27,10 @@
- all:		$(GIFCONV) $(GIFS) $(APPLETS)
- 
- install:: $(DEMO_DIR) $(DEMO_DIR)/MIM.oza \
--	$(NEWCACHEDIR) $(addprefix $(NEWCACHEDIR)/,$(APPLETS))
-+	$(NEWCACHEDIR) $(NEW_APPLETS)
-+
-+$(DEMO_DIR)/MIM.oza: $(DEMO_DIR)
-+$(NEW_APPLETS): $(NEWCACHEDIR)
- 
- $(NEWCACHEDIR)/% : %
- 	$(INSTALL_LIB) $< $@
-diff -ur mozart-1.4.0.20080704.orig/contrib/os/Makefile.in mozart-1.4.0.20080704/contrib/os/Makefile.in
---- mozart-1.4.0.20080704.orig/contrib/os/Makefile.in	2001-09-29 01:45:43.000000000 +1200
-+++ mozart-1.4.0.20080704/contrib/os/Makefile.in	2008-07-06 12:53:29.000000000 +1200
-@@ -49,6 +49,8 @@
- all:		$(FUNCTORS) $(NATIVES)
- install:	$(NEWCACHEDIR) $(NEW_FUNCTORS) $(NEW_NATIVES)
- 
-+$(NEW_FUNCTORS) $(NEW_NATIVES): $(NEWCACHEDIR)
-+
- $(LIB_DIR) $(NEWCACHEDIR):
- 	$(INSTALL_DIR) $@
- 
-diff -ur mozart-1.4.0.20080704.orig/contrib/psql/Makefile.in mozart-1.4.0.20080704/contrib/psql/Makefile.in
---- mozart-1.4.0.20080704.orig/contrib/psql/Makefile.in	2001-08-05 10:24:45.000000000 +1200
-+++ mozart-1.4.0.20080704/contrib/psql/Makefile.in	2008-07-06 13:14:57.000000000 +1200
-@@ -31,6 +31,8 @@
- all:		$(TARGETS)
- install:	$(LIB_DIR) $(LIB_TARGETS)
- 
-+$(LIB_TARGETS): $(LIB_DIR)
-+
- $(LIB_DIR):
- 	$(INSTALL_DIR) $@
- 
-diff -ur mozart-1.4.0.20080704.orig/contrib/reflect/Makefile.in mozart-1.4.0.20080704/contrib/reflect/Makefile.in
---- mozart-1.4.0.20080704.orig/contrib/reflect/Makefile.in	2001-08-05 10:24:45.000000000 +1200
-+++ mozart-1.4.0.20080704/contrib/reflect/Makefile.in	2008-07-06 13:35:37.000000000 +1200
-@@ -64,6 +64,8 @@
- all:     $(TARGETS)
- install: $(LIB_DIR) $(LIB_TARGETS)
- 
-+$(LIB_TARGETS): $(LIB_DIR)
-+
- $(LIB_DIR):
- 	$(INSTALL_DIR) $@
- 
-diff -ur mozart-1.4.0.20080704.orig/contrib/regex/Makefile.in mozart-1.4.0.20080704/contrib/regex/Makefile.in
---- mozart-1.4.0.20080704.orig/contrib/regex/Makefile.in	2003-01-08 02:40:10.000000000 +1300
-+++ mozart-1.4.0.20080704/contrib/regex/Makefile.in	2008-07-06 12:54:11.000000000 +1200
-@@ -35,6 +35,8 @@
- all:		$(TARGETS)
- install:	$(NEWCACHEDIR) $(NEW_TARGETS)
- 
-+$(NEW_TARGETS): $(NEWCACHEDIR)
-+
- $(LIB_DIR):
- 	$(INSTALL_DIR) $@
- 
-diff -ur mozart-1.4.0.20080704.orig/contrib/ri/Makefile.in mozart-1.4.0.20080704/contrib/ri/Makefile.in
---- mozart-1.4.0.20080704.orig/contrib/ri/Makefile.in	2002-07-07 01:05:36.000000000 +1200
-+++ mozart-1.4.0.20080704/contrib/ri/Makefile.in	2008-07-06 13:37:09.000000000 +1200
-@@ -78,6 +78,9 @@
- all:		first $(TARGETS)
- install:	$(LIB_DIR) $(LIB_TARGETS)
- 
-+$(TARGETS): first
-+$(LIB_TARGETS): $(LIB_DIR)
-+
- $(LIB_DIR):
- 	$(INSTALL_DIR) $@
- 
-diff -ur mozart-1.4.0.20080704.orig/contrib/tk/Makefile.in mozart-1.4.0.20080704/contrib/tk/Makefile.in
---- mozart-1.4.0.20080704.orig/contrib/tk/Makefile.in	2001-08-05 10:24:45.000000000 +1200
-+++ mozart-1.4.0.20080704/contrib/tk/Makefile.in	2008-07-06 13:38:10.000000000 +1200
-@@ -11,6 +11,7 @@
- INSTALL_DIR	= @INSTALL_DIR@
- INSTALL_LIB	= $(INSTALL) -m 444
- FUNCTORS	= CheckBox.ozf ScrollFrame.ozf
-+NEW_FUNCTORS	= $(addprefix $(NEWCACHEDIR)/,$(FUNCTORS))
- NEWCACHEDIR	= $(PREFIX)/cache/x-oz/contrib/tk
- PLATFORM	= @PLATFORM@
- CYGPATH		= $(SRCTOP)/share/lib/cygpath.sh
-@@ -18,7 +19,10 @@
- all:		$(FUNCTORS)
- %.ozf: %.oz
- 	$(OZC) -c $(shell $(CYGPATH) "$<") -o $@
--install:	$(NEWCACHEDIR) $(addprefix $(NEWCACHEDIR)/,$(FUNCTORS))
-+install:	$(NEWCACHEDIR) $(NEW_FUNCTORS)
-+
-+$(NEW_FUNCTORS): $(NEWCACHEDIR)
-+
- $(LIB_DIR) $(NEWCACHEDIR):
- 	$(INSTALL_DIR) $@
- $(LIB_DIR)/%.ozf: %.ozf
diff --git a/dev-lang/mozart/files/mozart-1.4.0-cstdio.patch b/dev-lang/mozart/files/mozart-1.4.0-cstdio.patch
deleted file mode 100644
index a74b686816cd..000000000000
--- a/dev-lang/mozart/files/mozart-1.4.0-cstdio.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- mozart-1.4.0.20080704.orig/platform/emulator/value.hh	2008-06-27 01:39:31.000000000 +1200
-+++ mozart-1.4.0.20080704/platform/emulator/value.hh	2008-08-24 09:24:46.000000000 +1200
-@@ -284,6 +284,7 @@
- // #include <math.h>
- #include <limits.h>
- 
-+#include <cstdio>
- #ifndef GMP_NEEDS_CPLUSPLUS
- extern "C" {
- #endif
diff --git a/dev-lang/mozart/files/mozart-1.4.0-dss-ldflags.patch b/dev-lang/mozart/files/mozart-1.4.0-dss-ldflags.patch
deleted file mode 100644
index 0f6647124681..000000000000
--- a/dev-lang/mozart/files/mozart-1.4.0-dss-ldflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mozart-1.4.0.20080704.orig/platform/dss/Makefile.in	2008-07-02 20:01:31.000000000 +1200
-+++ mozart-1.4.0.20080704/platform/dss/Makefile.in	2010-08-25 19:28:16.000000000 +1200
-@@ -44,7 +44,7 @@
- 	@EXAMPLES@
- 
- lib@ENV@.so: $(OBJS@ENV@)
--	@DYNLD@ -o $@ $(OBJS@ENV@) $(LIBS)
-+	@DYNLD@ -o $@ $(OBJS@ENV@) $(LIBS) $(LDFLAGS)
- 
- lib@ENV@.a: $(OBJS@ENV@)
- 	$(AR) -rc $@ $(OBJS@ENV@) && $(RANLIB) $@
diff --git a/dev-lang/mozart/files/mozart-1.4.0-dss-libpath.patch b/dev-lang/mozart/files/mozart-1.4.0-dss-libpath.patch
deleted file mode 100644
index d8f5eab79e80..000000000000
--- a/dev-lang/mozart/files/mozart-1.4.0-dss-libpath.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-diff -ur mozart-1.4.0.20080704.orig/share/Makefile.boot.in mozart-1.4.0.20080704/share/Makefile.boot.in
---- mozart-1.4.0.20080704.orig/share/Makefile.boot.in	2004-02-18 20:04:24.000000000 +0000
-+++ mozart-1.4.0.20080704/share/Makefile.boot.in	2008-08-26 03:01:04.000000000 +0000
-@@ -38,6 +38,7 @@
- 
- EXE_EXT=@EXE_EXT@
- 
-+BOOTDSS=$(BUILDTOP)/platform/dss
- BOOTEMU=$(BUILDTOP)/platform/emulator/@EMULATOR_EXE@
- BOOTENG=$(BUILDTOP)/share/ozengine.sh
- BOOTCOM=$(BOOTENG) $(BUILDTOP)/share/lib/ozc$(EXE_EXT)
-@@ -111,8 +112,15 @@
- endif
- endif
- 
-+ifdef @LD_VAR@
-+LD_VAR=$(BOOTDSS):$(@LD_VAR@)
-+else
-+LD_VAR=$(BOOTDSS)
-+endif
-+
- boot-%:
- 	$(MAKE) $* \
-+	@LD_VAR@=$(LD_VAR) \
- 	OZEMULATOR=$(BOOTEMU) \
- 	OZENGINE=$(BOOTENG) \
- 	OZC="$(BOOTCOM)" \
-diff -ur mozart-1.4.0.20080704.orig/share/configure mozart-1.4.0.20080704/share/configure
---- mozart-1.4.0.20080704.orig/share/configure	2004-04-01 10:48:04.000000000 +0000
-+++ mozart-1.4.0.20080704/share/configure	2008-08-26 03:00:42.000000000 +0000
-@@ -1408,12 +1408,20 @@
-     ;;
- esac
- 
--
--
--
--
--
--
-+case $platform in
-+win32*)
-+    LD_VAR=PATH
-+    ;;
-+darwin*)
-+    LD_VAR=DYLD_LIBRARY_PATH
-+    ;;
-+aix*)
-+    LD_VAR=LIBPATH
-+    ;;
-+*)
-+    LD_VAR=LD_LIBRARY_PATH
-+    ;;
-+esac
- 
- echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
- echo "configure:1420: checking whether ln -s works" >&5
-@@ -3896,6 +3904,7 @@
- s%@WINOZTOOLCXXFLAGS@%$WINOZTOOLCXXFLAGS%g
- s%@WINOZTOOLLDFLAGS@%$WINOZTOOLLDFLAGS%g
- s%@EXE_EXT@%$EXE_EXT%g
-+s%@LD_VAR@%$LD_VAR%g
- s%@LN_S@%$LN_S%g
- s%@M4@%$M4%g
- s%@PERL@%$PERL%g
diff --git a/dev-lang/mozart/files/mozart-1.4.0-dss-pic.patch b/dev-lang/mozart/files/mozart-1.4.0-dss-pic.patch
deleted file mode 100644
index 6cf1eb0cf58f..000000000000
--- a/dev-lang/mozart/files/mozart-1.4.0-dss-pic.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- mozart-1.4.0.20080704.orig/platform/dss/configure	2008-07-03 02:57:01.000000000 +1200
-+++ mozart-1.4.0.20080704/platform/dss/configure	2008-07-06 18:16:37.000000000 +1200
-@@ -5743,6 +5743,7 @@
-     { echo "$as_me:$LINENO: result: dynamic linking" >&5
- echo "${ECHO_T}dynamic linking" >&6; }
-     ENVTYPE="lib$ENV.so"
-+    CXXFLAGS="$CXXFLAGS -fPIC"
- fi
- 
- { echo "$as_me:$LINENO: checking inclusion of examples" >&5
diff --git a/dev-lang/mozart/files/mozart-1.4.0-dss-prefix.patch b/dev-lang/mozart/files/mozart-1.4.0-dss-prefix.patch
deleted file mode 100644
index 28f6f77c0a69..000000000000
--- a/dev-lang/mozart/files/mozart-1.4.0-dss-prefix.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- mozart-1.4.0.20080704.orig/platform/dss/Makefile.in	2008-07-02 20:01:31.000000000 +1200
-+++ mozart-1.4.0.20080704/platform/dss/Makefile.in	2008-07-06 14:25:32.000000000 +1200
-@@ -1,5 +1,6 @@
- # Includes necessary flags and environment
- 
-+PREFIX	=@prefix@
- SRCDIR	=@srcdir@/src
- VPATH   = $(SRCDIR)
- INCS    = -I. -I@srcdir@/include
-@@ -64,10 +65,10 @@
- 	-rm -f Makefile config.*
- 
- install: all
--	mkdir -p @prefix@
--	mkdir -p @prefix@/include
--	mkdir -p @prefix@/lib
--	@INSTALL@ @ENVTYPE@ @prefix@/lib; @EXAMPLES@
-+	mkdir -p $(PREFIX)
-+	mkdir -p $(PREFIX)/include
-+	mkdir -p $(PREFIX)/lib
-+	@INSTALL@ @ENVTYPE@ $(PREFIX)/lib; @EXAMPLES@
- 	@COPY_HEADERS@
- 
- depend:: $(REALSRC)
---- mozart-1.4.0.20080704.orig/platform/dss/configure	2008-07-03 02:57:01.000000000 +1200
-+++ mozart-1.4.0.20080704/platform/dss/configure	2008-07-06 14:43:46.000000000 +1200
-@@ -5718,13 +5718,13 @@
- 	{ echo "$as_me:$LINENO: result: will build stand-alone messaging component" >&5
- echo "${ECHO_T}will build stand-alone messaging component" >&6; }
- 	ENV="MSL"
--	COPY_HEADERS="$INSTALL $srcdir/include/dss_comService.hh $prefix/include"
-+	COPY_HEADERS="$INSTALL $srcdir/include/dss_comService.hh \$(PREFIX)/include"
-     ;;
-     *)
- 	{ echo "$as_me:$LINENO: result: will build full DSS" >&5
- echo "${ECHO_T}will build full DSS" >&6; }
-         ENV="DSS"
--        COPY_HEADERS="$INSTALL $srcdir/include/*.hh $prefix/include"
-+        COPY_HEADERS="$INSTALL $srcdir/include/*.hh \$(PREFIX)/include"
- esac
- 
- { echo "$as_me:$LINENO: checking for linking choice..." >&5
diff --git a/dev-lang/mozart/files/mozart-1.4.0-mkinstalldirs.patch b/dev-lang/mozart/files/mozart-1.4.0-mkinstalldirs.patch
deleted file mode 100644
index 778a81108765..000000000000
--- a/dev-lang/mozart/files/mozart-1.4.0-mkinstalldirs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mozart-1.4.0.20080704.orig/mkinstalldirs	1998-11-17 12:25:23.000000000 +1300
-+++ mozart-1.4.0.20080704/mkinstalldirs	2008-12-07 12:01:14.000000000 +1300
-@@ -40,7 +40,7 @@
- 
-      if test ! -d "${pathcomp}"; then
- 	echo "mkdir $pathcomp" 1>&2
--	mkdir "${pathcomp}" || errstatus=$?
-+	mkdir "${pathcomp}" || test -d "${pathcomp}" || errstatus=$?
- 	dochmod "${pathcomp}"
-      fi
- 
diff --git a/dev-lang/mozart/files/mozart-1.4.0-nostrip.patch b/dev-lang/mozart/files/mozart-1.4.0-nostrip.patch
deleted file mode 100644
index 46277f9717f6..000000000000
--- a/dev-lang/mozart/files/mozart-1.4.0-nostrip.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mozart-1.4.0.20080704.orig/platform/tools/gump/ozflex/Makefile.in	2001-08-05 10:24:45.000000000 +1200
-+++ mozart-1.4.0.20080704/platform/tools/gump/ozflex/Makefile.in	2008-07-06 16:17:19.000000000 +1200
-@@ -65,7 +65,7 @@
- 
- 
- all: $(FLEX)
--	$(STRIP) $(FLEX)
-+#	$(STRIP) $(FLEX)
- include $(BUILDTOP)/share/Makefile.boot
- bootstrap: cboot-all
- 
diff --git a/dev-lang/mozart/files/mozart-1.4.0-ozbison-string.patch b/dev-lang/mozart/files/mozart-1.4.0-ozbison-string.patch
deleted file mode 100644
index 1965b60496b1..000000000000
--- a/dev-lang/mozart/files/mozart-1.4.0-ozbison-string.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -ur mozart-1.4.0.20080704.orig/platform/tools/gump/ozbison/conflicts.c mozart-1.4.0.20080704/platform/tools/gump/ozbison/conflicts.c
---- mozart-1.4.0.20080704.orig/platform/tools/gump/ozbison/conflicts.c	1998-12-17 02:55:09.000000000 +1300
-+++ mozart-1.4.0.20080704/platform/tools/gump/ozbison/conflicts.c	2010-08-25 20:00:30.000000000 +1200
-@@ -18,6 +18,7 @@
- the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
- 
- #include <stdio.h>
-+#include <string.h>
- #include "system.h"
- #include "machine.h"
- #include "new.h"
-diff -ur mozart-1.4.0.20080704.orig/platform/tools/gump/ozbison/print.c mozart-1.4.0.20080704/platform/tools/gump/ozbison/print.c
---- mozart-1.4.0.20080704.orig/platform/tools/gump/ozbison/print.c	1998-02-07 00:31:08.000000000 +1300
-+++ mozart-1.4.0.20080704/platform/tools/gump/ozbison/print.c	2010-08-25 20:00:14.000000000 +1200
-@@ -19,6 +19,7 @@
- 
- 
- #include <stdio.h>
-+#include <string.h>
- #include "system.h"
- #include "machine.h"
- #include "new.h"
-diff -ur mozart-1.4.0.20080704.orig/platform/tools/gump/ozbison/symtab.c mozart-1.4.0.20080704/platform/tools/gump/ozbison/symtab.c
---- mozart-1.4.0.20080704.orig/platform/tools/gump/ozbison/symtab.c	1998-02-07 00:31:08.000000000 +1300
-+++ mozart-1.4.0.20080704/platform/tools/gump/ozbison/symtab.c	2010-08-25 19:59:28.000000000 +1200
-@@ -19,6 +19,7 @@
- 
- 
- #include <stdio.h>
-+#include <string.h>
- #include "system.h"
- #include "new.h"
- #include "symtab.h"
diff --git a/dev-lang/mozart/files/mozart-1.4.0-ozhome.patch b/dev-lang/mozart/files/mozart-1.4.0-ozhome.patch
deleted file mode 100644
index 2479ecab2c09..000000000000
--- a/dev-lang/mozart/files/mozart-1.4.0-ozhome.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mozart-1.4.0.20080704.orig/share/bin/oz.in	2008-04-22 20:40:41.000000000 +1200
-+++ mozart-1.4.0.20080704/share/bin/oz.in	2008-07-06 19:04:46.000000000 +1200
-@@ -4,7 +4,7 @@
- # to draw links from say /usr/local/bin to OZHOME/bin
- # see chapter "installation" in the users manual for more information
- 
--# OZHOME=/usr/local/mozart
-+OZHOME=/usr/lib/mozart
- 
- 
- 
diff --git a/dev-lang/mozart/files/mozart-1.4.0-ozplatform-amd64.patch b/dev-lang/mozart/files/mozart-1.4.0-ozplatform-amd64.patch
deleted file mode 100644
index 5b49aefb8e86..000000000000
--- a/dev-lang/mozart/files/mozart-1.4.0-ozplatform-amd64.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mozart-1.4.0.20080704.orig/share/bin/ozplatform	2007-09-17 05:33:08.000000000 +0000
-+++ mozart-1.4.0.20080704/share/bin/ozplatform	2009-08-09 22:36:47.000000000 +0000
-@@ -78,6 +78,8 @@
-    ;;
-    *i*86*Darwin*)       OZARCH=darwin-i386
-    ;;
-+   x86_64\ Linux*)	OZARCH=linux-x86_64_32
-+   ;;
-    *)  	                OZARCH=unknown-unknown
-    ;;
- esac
diff --git a/dev-lang/mozart/files/mozart-1.4.0-ozplatform-sparc.patch b/dev-lang/mozart/files/mozart-1.4.0-ozplatform-sparc.patch
deleted file mode 100644
index 3601abda2780..000000000000
--- a/dev-lang/mozart/files/mozart-1.4.0-ozplatform-sparc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mozart-1.4.0.20080704.orig/share/bin/ozplatform	2007-09-17 17:33:08.000000000 +1200
-+++ mozart-1.4.0.20080704/share/bin/ozplatform	2008-07-06 13:49:03.000000000 +1200
-@@ -40,7 +40,7 @@
-    ;;
-    m68k\ Linux\ *)      OZARCH=linux-m68k
-    ;;
--   sparc\ Linux\ *)     OZARCH=linux-sparc
-+   sparc*\ Linux\ *)    OZARCH=linux-sparc
-    ;;
-    9000/7*HP-UX*)	OZARCH=hpux-700
-    ;;
diff --git a/dev-lang/mozart/files/mozart-1.4.0-parallel-make.patch b/dev-lang/mozart/files/mozart-1.4.0-parallel-make.patch
deleted file mode 100644
index 76c85a1b9a38..000000000000
--- a/dev-lang/mozart/files/mozart-1.4.0-parallel-make.patch
+++ /dev/null
@@ -1,246 +0,0 @@
-diff -ur mozart-1.4.0.20080704.orig/doc/Makefile.in mozart-1.4.0.20080704/doc/Makefile.in
---- mozart-1.4.0.20080704.orig/doc/Makefile.in	2004-02-18 18:49:19.000000000 +1300
-+++ mozart-1.4.0.20080704/doc/Makefile.in	2008-07-06 12:46:26.000000000 +1200
-@@ -99,6 +99,7 @@
- 	dirs="$(SUBDIRS)"; \
- 	for i in $$dirs; do (cd $$i && $(MAKE) boot1st) || exit 1; done; \
- 	for i in $$dirs; do (cd $$i && $(MAKE) boot2nd) || exit 1; done
-+	$(MAKE) boot-THEINDEX
- 
- boot-1st boot1st:
- 	-rm -f xref.db index.db
-@@ -114,7 +115,6 @@
- # index/x-ref files got changed, the 2nd stage needs to run again
- # COMPLETELY.
- 
--bootstrap:: boot-THEINDEX
- all:: THEINDEX
- THEINDEX: idx/index.html
- 
-diff -ur mozart-1.4.0.20080704.orig/doc/utilities/Makefile.in mozart-1.4.0.20080704/doc/utilities/Makefile.in
---- mozart-1.4.0.20080704.orig/doc/utilities/Makefile.in	2004-02-18 18:49:19.000000000 +1300
-+++ mozart-1.4.0.20080704/doc/utilities/Makefile.in	2008-07-06 12:27:25.000000000 +1200
-@@ -85,6 +85,9 @@
- install: $(DOCDIR) $(DOCBINFILES) $(DOCFILES)
- installps:
- 
-+$(BINFILES): $(BINDIR)
-+$(DOCFILES): $(DOCBINFILES)
-+
- $(BINDIR) $(DOCDIR):
- 	$(INSTALL_DIR) $@
- 
-diff -ur mozart-1.4.0.20080704.orig/platform/emulator/Makefile.in mozart-1.4.0.20080704/platform/emulator/Makefile.in
---- mozart-1.4.0.20080704.orig/platform/emulator/Makefile.in	2008-06-27 01:39:31.000000000 +1200
-+++ mozart-1.4.0.20080704/platform/emulator/Makefile.in	2008-07-06 10:44:17.000000000 +1200
-@@ -229,10 +229,15 @@
- .PHONY:	all first install install-bin install-inc \
- 	install-dir depend tags clean cleaner distclean veryclean
- 
--all: $(TARGETS) $(DYNAMIC_MODULETARGETS)
-+all: $(TARGETS) dynamic_modules
- 
- bootstrap:: all
- 
-+dynamic_modules: $(TARGETS)
-+	for dynamic_module in $(DYNAMIC_MODULETARGETS); do \
-+	  $(MAKE) $$dynamic_module; \
-+	done
-+
- $(MODINTERS): bidecl.perl
- .PHONY: libDSS.a
- libDSS.a:
-@@ -390,6 +395,8 @@
- 	if test -s libDSS.so; then mkdir -p $(BINDIR)/lib; fi;
- 	if test -s libDSS.so; then cp libDSS.so $(BINDIR)/lib/libDSS.so; fi;
- 
-+$(NEWTARGETS): $(NEWCACHEDIR)
-+
- $(NEWCACHEDIR):
- 	$(INSTALL_DIR) $@
- 
-diff -ur mozart-1.4.0.20080704.orig/platform/emulator/libdp/Makefile.in mozart-1.4.0.20080704/platform/emulator/libdp/Makefile.in
---- mozart-1.4.0.20080704.orig/platform/emulator/libdp/Makefile.in	2008-06-27 01:39:31.000000000 +1200
-+++ mozart-1.4.0.20080704/platform/emulator/libdp/Makefile.in	2008-07-06 10:38:40.000000000 +1200
-@@ -58,6 +58,8 @@
- all:
- 
- # Remember the order, CREATEDFILES MUST be created before COREOBJS
-+$(COREOBJS): $(CREATEDFILES)
-+
- # The DSS should be included when dynamically linked..
- ../Glue.so-$(PLATFORM): $(CREATEDFILES) $(COREOBJS)
- 	$(DYNLD) -L$(BUILDTOP)/platform/emulator -lDSS -o $@ $(COREOBJS)
-diff -ur mozart-1.4.0.20080704.orig/platform/tools/gump/Makefile.in mozart-1.4.0.20080704/platform/tools/gump/Makefile.in
---- mozart-1.4.0.20080704.orig/platform/tools/gump/Makefile.in	2003-01-08 02:40:10.000000000 +1300
-+++ mozart-1.4.0.20080704/platform/tools/gump/Makefile.in	2008-07-06 10:26:30.000000000 +1200
-@@ -63,6 +63,10 @@
- 	$(INCDIR) $(INCFILES) \
- 	$(NEWCACHEDIR) $(NEWCACHEFILES)
- 
-+$(PLATFORMFILES): $(PLATFORMDIR)
-+$(INCFILES): $(INCDIR)
-+$(NEWCACHEFILES): $(NEWCACHEDIR)
-+
- $(SHAREDIR) $(PLATFORMDIR) $(INCDIR) $(NEWCACHEDIR):
- 	$(MKINSTALLDIRS) $@
- 
-diff -ur mozart-1.4.0.20080704.orig/share/bin/Makefile.in mozart-1.4.0.20080704/share/bin/Makefile.in
---- mozart-1.4.0.20080704.orig/share/bin/Makefile.in	2001-08-05 10:24:45.000000000 +1200
-+++ mozart-1.4.0.20080704/share/bin/Makefile.in	2008-07-06 10:20:55.000000000 +1200
-@@ -54,6 +54,9 @@
- 
- install: $(BINDIR) $(LIB_SCRIPTS) $(LIB_LINKS) $(WRAPPERS)
- 
-+$(LIB_SCRIPTS): $(BINDIR)
-+$(LIB_LINKS): $(BINDIR)
-+$(WRAPPERS): $(BINDIR)
- 
- $(LIB_SCRIPTS): $(BINDIR)/% : %
- 	$(INSTALL_BIN) $< $(BINDIR)
-diff -ur mozart-1.4.0.20080704.orig/share/demo/Makefile.in mozart-1.4.0.20080704/share/demo/Makefile.in
---- mozart-1.4.0.20080704.orig/share/demo/Makefile.in	2001-10-16 23:10:03.000000000 +1300
-+++ mozart-1.4.0.20080704/share/demo/Makefile.in	2008-07-06 10:18:32.000000000 +1200
-@@ -83,6 +83,10 @@
- install:: $(OZDEMO) $(DEMOAPPLETS) \
- 	$(SYSTEMDOC) $(SYSTEMOZF) $(SYSTEMOZF)/MT10.ozf $(SYSTEMDOC)/MT10.oz
- 
-+$(DEMOAPPLETS): $(OZDEMO)
-+$(SYSTEMOZF)/MT10.ozf: $(SYSTEMOZF)
-+$(SYSTEMDOC)/MT10.oz: $(SYSTEMDOC)
-+
- $(OZDEMO) $(SYSTEMDOC) $(SYSTEMOZF):
- 	$(INSTALL_DIR) $@
- 
-@@ -279,7 +283,10 @@
- 
- install:: $(OZIMGDIRS) $(OZIMAGES)
- 
--$(OZIMGDIRS):
-+$(OZIMGDIRS): $(OZIMG)
-+$(OZIMAGES): $(OZIMGDIRS)
-+
-+$(OZIMG) $(OZIMGDIRS):
- 	$(INSTALL_DIR) $@
- $(OZIMG)/animated-queens/%.xbm: images/animated-queens/%.xbm
- 	$(INSTALL_FILE) $< $@
-diff -ur mozart-1.4.0.20080704.orig/share/elisp/Makefile.in mozart-1.4.0.20080704/share/elisp/Makefile.in
---- mozart-1.4.0.20080704.orig/share/elisp/Makefile.in	2002-04-02 00:31:22.000000000 +1200
-+++ mozart-1.4.0.20080704/share/elisp/Makefile.in	2008-07-06 10:00:36.000000000 +1200
-@@ -72,6 +72,8 @@
- 
- install: all $(ELISPDIR) $(LIBFILES)
- 
-+$(LIBFILES): $(ELISPDIR)
-+
- $(ELISPDIR):
- 	$(INSTALL_DIR) $@
- 
-diff -ur mozart-1.4.0.20080704.orig/share/examples/Makefile.in mozart-1.4.0.20080704/share/examples/Makefile.in
---- mozart-1.4.0.20080704.orig/share/examples/Makefile.in	2003-04-23 21:49:55.000000000 +1200
-+++ mozart-1.4.0.20080704/share/examples/Makefile.in	2008-07-06 09:58:52.000000000 +1200
-@@ -62,16 +62,20 @@
- EXFUNCTORS = \
- 	$(FUNCTORS:%=$(OZEX)/fd/graphics/%)
- 
--EXDIRS = \
--	sampler sampler/constraints \
--	fd grammar grammar/shieber \
--	fd/graphics
--
-+EXDIRS = fd grammar sampler
-+EXFDDIRS = fd/graphics
-+EXGRDIRS = grammar/shieber
-+EXSAMPLERDIRS = sampler/constraints
- 
- OZEXDIRS = $(EXDIRS:%=$(OZEX)/%)
-+OZEXFDDIRS = $(EXFDDIRS:%=$(OZEX)/%)
-+OZEXGRDIRS = $(EXGRDIRS:%=$(OZEX)/%)
-+OZEXSAMPLERDIRS = $(EXSAMPLERDIRS:%=$(OZEX)/%)
- 
- 
--$(OZEX) $(OZEXDIRS):
-+$(OZEXFDDIRS) $(OZEXGRDIRS) $(OZEXSAMPLERDIRS): $(OZEXDIRS)
-+$(OZEXDIRS): $(OZEX)
-+$(OZEX) $(OZEXDIRS) $(OZEXFDDIRS) $(OZEXGRDIRS) $(OZEXSAMPLERDIRS):
- 	$(INSTALL_DIR) $@
- 
- FD = \
-@@ -116,6 +120,10 @@
- 
- install: all $(OZEX) $(OZEXDIRS) $(SAMPLER) $(EXAMPLES) $(EXFUNCTORS)
- 
-+$(SAMPLER): $(OZEXSAMPLERDIRS)
-+$(EXAMPLES): $(OZEXFDDIRS) $(OZEXGRDIRS)
-+$(EXFUNCTORS): $(OZEXFDDIRS)
-+
- clean:
- 	-rm -f *~ ./*/*~ ./*/*/*~
- 
-diff -ur mozart-1.4.0.20080704.orig/share/lib/Makefile.in mozart-1.4.0.20080704/share/lib/Makefile.in
---- mozart-1.4.0.20080704.orig/share/lib/Makefile.in	2008-06-27 01:39:31.000000000 +1200
-+++ mozart-1.4.0.20080704/share/lib/Makefile.in	2008-07-06 09:48:46.000000000 +1200
-@@ -291,7 +291,8 @@
- Builtins.ozf: compiler/Builtins.oz GroundZip.ozf compiler-Builtins.oz
- 
- Unnester.ozf: compiler/Unnester.oz compiler/TupleSyntax.oz \
--	compiler/BindingAnalysis.oz compiler/UnnestFD.oz FD.ozf
-+	compiler/BindingAnalysis.oz compiler/UnnestFD.oz FD.ozf \
-+	Builtins.ozf
- 
- Annotate.ozf: compiler/Annotate.oz
- 
-@@ -374,6 +375,11 @@
- 	$(OZLIB) $(NEWINIT) \
- 	$(NEWIMAGESDIR) $(NEWIMAGES)
- 
-+$(NEWIMAGESDIR): $(NEWCACHEDIR)
-+$(NEWFUNCTORS): $(NEWCACHEDIR)
-+$(NEWINIT): $(OZLIB)
-+$(NEWIMAGES): $(NEWIMAGESDIR)
-+
- $(NEWCACHEDIR) $(NEWIMAGESDIR):
- 	$(INSTALL_DIR) $@
- 
-@@ -427,10 +433,10 @@
- .PHONY: bootstrap check
- 
- # use the boot compiler to create the functors
--bootstrap:
--	$(MAKE) boot-unzip boot-init boot-ozc boot-all
-+bootstrap: boot-unzip
-+	$(MAKE) boot-all
- 
--boot-all:
-+boot-all: boot-init boot-ozc
- 	$(MAKE) all \
- 		OZC=$(SRCDIR)/boot-ozc.sh \
- 		OZENGINE=$(SRCDIR)/oze.sh \
-diff -ur mozart-1.4.0.20080704.orig/share/tools/Makefile.in mozart-1.4.0.20080704/share/tools/Makefile.in
---- mozart-1.4.0.20080704.orig/share/tools/Makefile.in	2002-01-30 01:39:23.000000000 +1300
-+++ mozart-1.4.0.20080704/share/tools/Makefile.in	2008-07-06 09:44:12.000000000 +1200
-@@ -270,6 +270,10 @@
- 	$(OZBIN) $(BINFILES) \
- 	$(OZEX) $(OZEXGUMP) $(EXAMPLEFILES)
- 
-+$(OZEXGUMP): $(OZEX)
-+$(BINFILES): $(OZBIN)
-+$(EXAMPLEFILES): $(OZEXGUMP)
-+
- $(OZBIN) $(OZEX) $(OZEXGUMP):
- 	$(INSTALL_DIR) $@
- 
-@@ -285,6 +289,13 @@
- 	$(OZCARIMAGESDIR) $(OZCARIMAGES) \
- 	$(INSPECTORIMAGESDIR) $(INSPECTORIMAGES)
- 
-+$(IMAGESDIR): $(CACHEDIR)
-+$(OZCARIMAGESDIR) $(INSPECTORIMAGESDIR): $(IMAGESDIR)
-+$(TOOLSFUNCTORS): $(CACHEDIR)
-+$(IMAGES): $(IMAGESDIR)
-+$(OZCARIMAGES): $(OZCARIMAGESDIR)
-+$(INSPECTORIMAGES): $(INSPECTORIMAGESDIR)
-+
- $(CACHEDIR) $(IMAGESDIR) $(OZCARIMAGESDIR) $(INSPECTORIMAGESDIR):
- 	$(INSTALL_DIR) $@
- 
diff --git a/dev-lang/mozart/mozart-1.4.0.ebuild b/dev-lang/mozart/mozart-1.4.0.ebuild
index d7aed8c58286..093a762f89f2 100644
--- a/dev-lang/mozart/mozart-1.4.0.ebuild
+++ b/dev-lang/mozart/mozart-1.4.0.ebuild
@@ -1,14 +1,16 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mozart/mozart-1.4.0.ebuild,v 1.9 2010/08/26 07:29:03 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mozart/mozart-1.4.0.ebuild,v 1.10 2010/11/18 08:01:21 keri Exp $
 
 inherit elisp-common eutils
 
+PATCHSET_VER="0"
 MY_P="mozart-${PV}.20080704"
 
 DESCRIPTION="Mozart is an advanced development platform for intelligent, distributed applications"
 HOMEPAGE="http://www.mozart-oz.org/"
 SRC_URI="http://www.mozart-oz.org/download/mozart-ftp/store/1.4.0-2008-07-02-tar/mozart-1.4.0.20080704-src.tar.gz
+	mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz
 	doc? ( http://www.mozart-oz.org/download/mozart-ftp/store/1.4.0-2008-07-02-tar/mozart-1.4.0.20080704-doc.tar.gz )"
 LICENSE="Mozart"
 
@@ -34,22 +36,10 @@ S="${WORKDIR}"/${MY_P}
 
 src_unpack() {
 	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${P}-cstdio.patch
-	epatch "${FILESDIR}"/${P}-const-cast.patch
-	epatch "${FILESDIR}"/${P}-ozhome.patch
-	epatch "${FILESDIR}"/${P}-ozplatform-amd64.patch
-	epatch "${FILESDIR}"/${P}-ozplatform-sparc.patch
-	epatch "${FILESDIR}"/${P}-parallel-make.patch
-	epatch "${FILESDIR}"/${P}-mkinstalldirs.patch
-	epatch "${FILESDIR}"/${P}-contrib.patch
-	epatch "${FILESDIR}"/${P}-dss-prefix.patch
-	epatch "${FILESDIR}"/${P}-dss-pic.patch
-	epatch "${FILESDIR}"/${P}-dss-ldflags.patch
-	epatch "${FILESDIR}"/${P}-dss-libpath.patch
-	epatch "${FILESDIR}"/${P}-ozbison-string.patch
-	epatch "${FILESDIR}"/${P}-nostrip.patch
+
+	EPATCH_FORCE=yes
+	EPATCH_SUFFIX=patch
+	epatch "${WORKDIR}"/${PV}
 }
 
 src_compile() {