diff options
author | Keri Harris <keri@gentoo.org> | 2006-09-16 21:33:00 +0000 |
---|---|---|
committer | Keri Harris <keri@gentoo.org> | 2006-09-16 21:33:00 +0000 |
commit | d653a6f2ccbeed267454b8c98d1382092cbe6d16 (patch) | |
tree | d19c7dec390cae27896561dfdbe11d499efbdb6f /dev-lang/mercury-extras | |
parent | ppc stable (diff) | |
download | gentoo-2-d653a6f2ccbeed267454b8c98d1382092cbe6d16.tar.gz gentoo-2-d653a6f2ccbeed267454b8c98d1382092cbe6d16.tar.bz2 gentoo-2-d653a6f2ccbeed267454b8c98d1382092cbe6d16.zip |
Remove 0.13.0_beta development snapshot.
(Portage version: 2.1.1)
Diffstat (limited to 'dev-lang/mercury-extras')
13 files changed, 0 insertions, 459 deletions
diff --git a/dev-lang/mercury-extras/Manifest b/dev-lang/mercury-extras/Manifest index 5e1551d8cb63..ead746b09a62 100644 --- a/dev-lang/mercury-extras/Manifest +++ b/dev-lang/mercury-extras/Manifest @@ -82,48 +82,7 @@ AUX mercury-extras-0.13.0-trailed_update.patch 759 RMD160 d079c3a8d19b74f71bf8d9 MD5 56cd11cec1d931c51b9f366dcdeae204 files/mercury-extras-0.13.0-trailed_update.patch 759 RMD160 d079c3a8d19b74f71bf8d972577f52c492f7d214 files/mercury-extras-0.13.0-trailed_update.patch 759 SHA256 034c6dfde10f3514646491630eee005bd35365f427cbf236739ff89ed0cc4f33 files/mercury-extras-0.13.0-trailed_update.patch 759 -AUX mercury-extras-0.13.0_beta-concurrency-r1.patch 348 RMD160 ef59a85f37c7eec3dc192c533e0912b35d6470ba SHA1 0f3c33291288991d575b9c372740b7421e09e15b SHA256 7a0395b70a10f0e769657e86a9ec12d1a9b1ad2a830f1abcfa85ffb51b86ca43 -MD5 0b9db2c291e37973586bef548e6bfbfe files/mercury-extras-0.13.0_beta-concurrency-r1.patch 348 -RMD160 ef59a85f37c7eec3dc192c533e0912b35d6470ba files/mercury-extras-0.13.0_beta-concurrency-r1.patch 348 -SHA256 7a0395b70a10f0e769657e86a9ec12d1a9b1ad2a830f1abcfa85ffb51b86ca43 files/mercury-extras-0.13.0_beta-concurrency-r1.patch 348 -AUX mercury-extras-0.13.0_beta-dynamic_linking.patch 408 RMD160 392fd1d24af701fe91a30302c2a23638933fb441 SHA1 7ae4aab1e6f13d49981edaf45eca6eee15f7cc98 SHA256 97df38482ccbbb6c56af8a116c32299a08fe66bae5d7c9c2a2b9b7782a034b00 -MD5 75b0ca8fe3bb2411f5065cec870b6ac7 files/mercury-extras-0.13.0_beta-dynamic_linking.patch 408 -RMD160 392fd1d24af701fe91a30302c2a23638933fb441 files/mercury-extras-0.13.0_beta-dynamic_linking.patch 408 -SHA256 97df38482ccbbb6c56af8a116c32299a08fe66bae5d7c9c2a2b9b7782a034b00 files/mercury-extras-0.13.0_beta-dynamic_linking.patch 408 -AUX mercury-extras-0.13.0_beta-lex.patch 668 RMD160 edd76175572180acb237eb4a99c7704c37cebfc6 SHA1 db237c3a8be73b237d8fe5e33e8f8302c15cdee1 SHA256 a0fb563a6fef06f3b342739beb7e1d9a9cfbd3c49fda636188c4bc3ebebaea33 -MD5 da7ddc1456d77e6a68bb17d213625a55 files/mercury-extras-0.13.0_beta-lex.patch 668 -RMD160 edd76175572180acb237eb4a99c7704c37cebfc6 files/mercury-extras-0.13.0_beta-lex.patch 668 -SHA256 a0fb563a6fef06f3b342739beb7e1d9a9cfbd3c49fda636188c4bc3ebebaea33 files/mercury-extras-0.13.0_beta-lex.patch 668 -AUX mercury-extras-0.13.0_beta-mercury_glut.patch 792 RMD160 3b12b79b17c1d25767465e490b7510f8692c3228 SHA1 dbed9a505363cd3a63eeb48fd838dd7623557c9d SHA256 bfb438dd288d49cc03906d8dd89d70c0cfa7de5177ed3d2f8ff014e7f77d8e8e -MD5 a4ebb99eb5d1e74717fa48f15e9fb877 files/mercury-extras-0.13.0_beta-mercury_glut.patch 792 -RMD160 3b12b79b17c1d25767465e490b7510f8692c3228 files/mercury-extras-0.13.0_beta-mercury_glut.patch 792 -SHA256 bfb438dd288d49cc03906d8dd89d70c0cfa7de5177ed3d2f8ff014e7f77d8e8e files/mercury-extras-0.13.0_beta-mercury_glut.patch 792 -AUX mercury-extras-0.13.0_beta-mercury_opengl.patch 3366 RMD160 e52a92988a3e49353cdf71dbbd515884b6cd20d7 SHA1 0143654493a9838b90fa7dfc48a1927e7a735534 SHA256 fc0c4577d13a0e2f6a8d3e5963e742c3e7db8c34ff8ad824dcf173071833c381 -MD5 525273fbe2f220119f5b8f4efec09b51 files/mercury-extras-0.13.0_beta-mercury_opengl.patch 3366 -RMD160 e52a92988a3e49353cdf71dbbd515884b6cd20d7 files/mercury-extras-0.13.0_beta-mercury_opengl.patch 3366 -SHA256 fc0c4577d13a0e2f6a8d3e5963e742c3e7db8c34ff8ad824dcf173071833c381 files/mercury-extras-0.13.0_beta-mercury_opengl.patch 3366 -AUX mercury-extras-0.13.0_beta-mercury_tcltk.patch 546 RMD160 fc047570a12e649b1d2f1ae4908a0be49452a84d SHA1 d13e14b243d22c9c174df1b19dbc27adcc8bedf5 SHA256 a5476c68d3165277db1d9ef3d583cd7df83efc34ab0049e4e610daf9a50c1b6a -MD5 bb9d31838770be5115eb3073b1a996a1 files/mercury-extras-0.13.0_beta-mercury_tcltk.patch 546 -RMD160 fc047570a12e649b1d2f1ae4908a0be49452a84d files/mercury-extras-0.13.0_beta-mercury_tcltk.patch 546 -SHA256 a5476c68d3165277db1d9ef3d583cd7df83efc34ab0049e4e610daf9a50c1b6a files/mercury-extras-0.13.0_beta-mercury_tcltk.patch 546 -AUX mercury-extras-0.13.0_beta-odbc-r1.patch 1339 RMD160 70b23874a3add6dab7b25949faa85260de46c22d SHA1 8cf38cc4dbdda9d42dc036071488e0c919a87296 SHA256 da96e81dd3b52feaebe5bbe2ae16ab85fc3a115d74d961a6b2f8a4d84f1ec64c -MD5 2e38d1b72337d73e77704bf9ab05b533 files/mercury-extras-0.13.0_beta-odbc-r1.patch 1339 -RMD160 70b23874a3add6dab7b25949faa85260de46c22d files/mercury-extras-0.13.0_beta-odbc-r1.patch 1339 -SHA256 da96e81dd3b52feaebe5bbe2ae16ab85fc3a115d74d961a6b2f8a4d84f1ec64c files/mercury-extras-0.13.0_beta-odbc-r1.patch 1339 -AUX mercury-extras-0.13.0_beta-posix.patch 351 RMD160 6b52d219d41c441b6bc8c77438aca2993eb65dda SHA1 9b13d806a983ec17491064dfebc4dcfe0d0c33f6 SHA256 80054a1dd5a9a1d0c29fb03d3609bfcaed1f45453ecbbc5c1acfc0093cb2f570 -MD5 3ae01dd37c7a529cdc16136c016e43fa files/mercury-extras-0.13.0_beta-posix.patch 351 -RMD160 6b52d219d41c441b6bc8c77438aca2993eb65dda files/mercury-extras-0.13.0_beta-posix.patch 351 -SHA256 80054a1dd5a9a1d0c29fb03d3609bfcaed1f45453ecbbc5c1acfc0093cb2f570 files/mercury-extras-0.13.0_beta-posix.patch 351 -AUX mercury-extras-0.13.0_beta-references.patch 545 RMD160 109a113a1f44c3fbd435c8da2af3cec21a79b427 SHA1 2b60aebc8baa16f061c22310b10f37ce5f7ce2ce SHA256 bada13e7a67e99fbcc0d8e4c0f941dd5ccb7447bb6dc2481977c7bd86c639700 -MD5 8bb53e1d1cb817c2e86d542f42358df3 files/mercury-extras-0.13.0_beta-references.patch 545 -RMD160 109a113a1f44c3fbd435c8da2af3cec21a79b427 files/mercury-extras-0.13.0_beta-references.patch 545 -SHA256 bada13e7a67e99fbcc0d8e4c0f941dd5ccb7447bb6dc2481977c7bd86c639700 files/mercury-extras-0.13.0_beta-references.patch 545 -AUX mercury-extras-0.13.0_beta-trailed_update-r1.patch 1927 RMD160 80643d6cc0b83f415629d7c00fee6fc2a40de3cf SHA1 2adc29c2d23a184af7818b63c9d80869c0f2f807 SHA256 47cc0bef68e63e5ac5eb22746c8266991c1af41af06d30d8b014a56a095ca079 -MD5 4b4ff5851a45ae76eb7c7efb53ec770d files/mercury-extras-0.13.0_beta-trailed_update-r1.patch 1927 -RMD160 80643d6cc0b83f415629d7c00fee6fc2a40de3cf files/mercury-extras-0.13.0_beta-trailed_update-r1.patch 1927 -SHA256 47cc0bef68e63e5ac5eb22746c8266991c1af41af06d30d8b014a56a095ca079 files/mercury-extras-0.13.0_beta-trailed_update-r1.patch 1927 DIST mercury-extras-0.12.2.tar.gz 759070 RMD160 3e7c4c67590408d2da056135c9560ff4d078eff6 SHA1 fc0f446f8b7f448c27f61bfe226a33fbaa007e0a SHA256 3a5be0941fad7ed8f8d2e967138984127510ba388b65b0f3f35f46ae8b6b43a8 -DIST mercury-extras-0.13.0-beta-2006-09-07-unstable.tar.gz 873920 RMD160 ec57cbb7f06212efc17290c7def2f418ab988964 SHA1 ee709be0e6452b8fa9382144e9b63d06f579da28 SHA256 1956469324fc15f9f0ca2cdf9fe4eabb578a4d9cd092d14c98c7fc5a623e4a45 DIST mercury-extras-0.13.0.tar.gz 876713 RMD160 a310a51b050647ec49e797a6469ce11145368c6d SHA1 4e12415003488eac13991c55164f42e10d827fcc SHA256 0e4238a9b891067f75c9f792e9dc970005d66a3248be6e8a4adc24e5291b1f24 EBUILD mercury-extras-0.12.2-r1.ebuild 2925 RMD160 41a913f2802c9ce9dadc1188cc7df763ffbfd45a SHA1 7d6bb912018a41c4dd77d0d8549f79dabe9136df SHA256 ae00eb0a2d28f2ad6606864e0ed92fb0bbaaa35c238a5aacb68668154851463b MD5 124745e0d3a42531366cfc18fba3f7b9 mercury-extras-0.12.2-r1.ebuild 2925 @@ -141,10 +100,6 @@ EBUILD mercury-extras-0.13.0.ebuild 3359 RMD160 1a77d77258ea5878d5f62aba3c90d682 MD5 f34f3fbd5f105e982e712f77413d4b84 mercury-extras-0.13.0.ebuild 3359 RMD160 1a77d77258ea5878d5f62aba3c90d682c3b59e09 mercury-extras-0.13.0.ebuild 3359 SHA256 532456c6489a0be114176f6faf8face13b5e09dcbe10489e7231dfb53741dbef mercury-extras-0.13.0.ebuild 3359 -EBUILD mercury-extras-0.13.0_beta20060907.ebuild 3836 RMD160 199cf4f215d3faddf8f33163423fa39cc480ed9a SHA1 9d95dad8f26020250339ce3dc7760cf292eb3ba9 SHA256 2387dfddb10e1a86abdb55a100c54f6942b1d62a821b162923c7ea29c55497d0 -MD5 08beca466cfaeddfee03e3e2b6037352 mercury-extras-0.13.0_beta20060907.ebuild 3836 -RMD160 199cf4f215d3faddf8f33163423fa39cc480ed9a mercury-extras-0.13.0_beta20060907.ebuild 3836 -SHA256 2387dfddb10e1a86abdb55a100c54f6942b1d62a821b162923c7ea29c55497d0 mercury-extras-0.13.0_beta20060907.ebuild 3836 MISC ChangeLog 11377 RMD160 ea480823653e055ab238b0196ef9fc611eab585b SHA1 e41ccc614d5a1c3b61398a128d36ea05ffaa0fc0 SHA256 2d9f1187306c26e5549d9da751db5fbfe3d373a014faa205dfb4962a45e8a8f8 MD5 7fa49e59c89e8226ff175c041bd7e7d9 ChangeLog 11377 RMD160 ea480823653e055ab238b0196ef9fc611eab585b ChangeLog 11377 @@ -165,6 +120,3 @@ SHA256 087bf13f383826ff1da30ff861cfc48008b7037a9a844f14fee94f51934ec525 files/di MD5 0df6fdfa0b711ce32f82e6661f9ac4a1 files/digest-mercury-extras-0.13.0 265 RMD160 083abb2da996e9c79af8b8d6a733cbb25bb8e657 files/digest-mercury-extras-0.13.0 265 SHA256 c0f9ca9a8d69c1b6ee73c253c883466c77ab8ef199e217603293df430241f827 files/digest-mercury-extras-0.13.0 265 -MD5 307b72d614fb3de37b23ac01d0d59ed7 files/digest-mercury-extras-0.13.0_beta20060907 340 -RMD160 4eb561d898522ad1561409f4322d6acacdb7b548 files/digest-mercury-extras-0.13.0_beta20060907 340 -SHA256 fbbe2a92a3bfe567e7e9c2a2e4cf8001d12de2096cf64f38ce1056adf2c5463d files/digest-mercury-extras-0.13.0_beta20060907 340 diff --git a/dev-lang/mercury-extras/files/digest-mercury-extras-0.13.0_beta20060907 b/dev-lang/mercury-extras/files/digest-mercury-extras-0.13.0_beta20060907 deleted file mode 100644 index ee0bc8fe9061..000000000000 --- a/dev-lang/mercury-extras/files/digest-mercury-extras-0.13.0_beta20060907 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 ab3ec91bb45b6636af22ea0f7745feff mercury-extras-0.13.0-beta-2006-09-07-unstable.tar.gz 873920 -RMD160 ec57cbb7f06212efc17290c7def2f418ab988964 mercury-extras-0.13.0-beta-2006-09-07-unstable.tar.gz 873920 -SHA256 1956469324fc15f9f0ca2cdf9fe4eabb578a4d9cd092d14c98c7fc5a623e4a45 mercury-extras-0.13.0-beta-2006-09-07-unstable.tar.gz 873920 diff --git a/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta-concurrency-r1.patch b/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta-concurrency-r1.patch deleted file mode 100644 index 793e088bfeb0..000000000000 --- a/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta-concurrency-r1.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- mercury-extras-0.13.0-beta-2006-04-03.orig/concurrency/Mmakefile 2003-01-16 23:44:13.000000000 +1300 -+++ mercury-extras-0.13.0-beta-2006-04-03/concurrency/Mmakefile 2006-03-26 18:45:21.000000000 +1200 -@@ -8,6 +8,8 @@ - - TESTS = philo philo2 philo3 midimon - -+LIBGRADES := $(LIBGRADES:hlc.gc=) -+ - -include ../Mmake.params - - default_target: all diff --git a/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta-dynamic_linking.patch b/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta-dynamic_linking.patch deleted file mode 100644 index a009cdf30e56..000000000000 --- a/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta-dynamic_linking.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- mercury-extras-0.13.0-beta-2006-04-21.orig/dynamic_linking/Mmakefile 2005-01-25 20:49:05.000000000 +1300 -+++ mercury-extras-0.13.0-beta-2006-04-21/dynamic_linking/Mmakefile 2006-04-23 14:54:25.000000000 +1200 -@@ -11,7 +11,7 @@ - MLFLAGS = --shared - - # Link in the `-ldl' library (this may not be needed on some systems) --MLLIBS = -ldl -+MLLIBS = -L/usr/lib -ldl - - # enable C-level debugging - CFLAGS = -g diff --git a/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta-lex.patch b/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta-lex.patch deleted file mode 100644 index 09b21cd27db6..000000000000 --- a/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta-lex.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- mercury-extras-0.13.0-beta-2006-04-03.orig/lex/Mmakefile 2002-12-03 17:48:31.000000000 +1300 -+++ mercury-extras-0.13.0-beta-2006-04-03/lex/Mmakefile 2006-04-01 15:14:41.000000000 +1200 -@@ -20,12 +20,12 @@ - # necessary, and everything put there. - # - #INSTALL_PREFIX := $(INSTALL_PREFIX)/extras --INSTALL_PREFIX = . -+#INSTALL_PREFIX = . - - # Omit this line if you want to install the default grades. - # Edit this line if you want to install with different grades. - # --LIBGRADES = asm_fast.gc hlc.gc asm_fast.gc.tr.debug -+#LIBGRADES = asm_fast.gc hlc.gc asm_fast.gc.tr.debug - - # Any application using these libraries will also need the following - # in its Mmakefile: diff --git a/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta-mercury_glut.patch b/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta-mercury_glut.patch deleted file mode 100644 index 9e0ce8650c85..000000000000 --- a/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta-mercury_glut.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- mercury-extras-0.13.0-beta-2006-04-03.orig/graphics/mercury_glut/Mmakefile 2006-03-30 14:52:44.000000000 +1200 -+++ mercury-extras-0.13.0-beta-2006-04-03/graphics/mercury_glut/Mmakefile 2006-04-06 07:22:46.000000000 +1200 -@@ -13,10 +13,10 @@ - # The following libraries are for X on Linux (Debian) using Mesa. - - # Libaries required by X windows. --X_LIBS = -lX11 -lXext -lXt -lXi -lSM -lICE -L/usr/X11R6/lib -+# X_LIBS = -lX11 -lXext -lXt -lXi -lSM -lICE -L/usr/X11R6/lib - - # Libraries required by OpenGL. --GL_LIBS = -lGL -LGL -+# GL_LIBS = -lGL -LGL - - MCFLAGS-mercury_glut+=--no-warn-nothing-exported --no-warn-interface-imports - -@@ -26,7 +26,7 @@ - MGNUCFLAGS = --pic-reg - EXTRA_MLFLAGS = -shared - --MLLIBS = -lglut $(X_LIBS) $(GL_LIBS) -+MLLIBS = -lglut - - depend: mercury_glut.depend - diff --git a/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta-mercury_opengl.patch b/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta-mercury_opengl.patch deleted file mode 100644 index 7631fc0913cd..000000000000 --- a/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta-mercury_opengl.patch +++ /dev/null @@ -1,79 +0,0 @@ ---- mercury-extras-0.13.0-beta-2006-04-03.orig/graphics/mercury_opengl/Mmakefile 2006-03-30 14:52:44.000000000 +1200 -+++ mercury-extras-0.13.0-beta-2006-04-03/graphics/mercury_opengl/Mmakefile 2006-04-06 20:17:20.000000000 +1200 -@@ -11,7 +11,7 @@ - - # Specify what libraries we need to link against for OpenGL on this system. - # (The following works on Debian with mesa as the OpenGL implementation). --GL_LIBS = -lGL -lGLU -L/usr/X11R6/lib -lX11 -lXi -lXt -lICE -lXext -lSM -+GL_LIBS = -lGL -lGLU - - # Don't issue a warning because mercury_opengl doesn't export anything. - MCFLAGS-mercury_opengl = --no-warn-nothing-exported ---- mercury-extras-0.13.0-beta-2006-04-03.orig/graphics/mercury_opengl/Mmakefile.mtogl 2004-12-01 14:45:30.000000000 +1300 -+++ mercury-extras-0.13.0-beta-2006-04-03/graphics/mercury_opengl/Mmakefile.mtogl 2006-04-06 20:22:36.000000000 +1200 -@@ -11,29 +11,30 @@ - MLOBJS-mtogl = togl.o - - # Specify the location of the `mercury_tcltk' package. --MERCURY_TCLTK_DIR = ../mercury_tcltk -+# MERCURY_TCLTK_DIR = ../mercury_tcltk - - # Specify the version of Tcl/Tk. --TCLTK_VERSION = 8.0 -+TCLTK_VERSION = 8.4 - - # Specify what libraries we need to link against for Tcl/Tk on this system. --TCLTK_LIBS = -ltcl$(TCLTK_VERSION) -ltk$(TCLTK_VERSION) -ldl -+TCLTK_LIBS = -ltcl -ltk -ldl -+GL_LIBS = -lGL -lGLU -lX11 -lXmu - - # Tell mmake to use the `mercury_tcltk' library. --VPATH = $(MERCURY_TCLTK_DIR):$(MMAKE_VPATH) --MCFLAGS = -I$(MERCURY_TCLTK_DIR) $(EXTRA_MCFLAGS) --MLFLAGS = -R$(MERCURY_TCLTK_DIR) $(EXTRA_MLFLAGS) \ -+# VPATH = $(MERCURY_TCLTK_DIR):$(MMAKE_VPATH) -+# MCFLAGS = -I$(MERCURY_TCLTK_DIR) $(EXTRA_MCFLAGS) -+# MLFLAGS = -R$(MERCURY_TCLTK_DIR) $(EXTRA_MLFLAGS) \ - -L$(MERCURY_TCLTK_DIR) --MLLIBS = $(TCLTK_LIBS) $(EXTRA_MLLIBS) --C2INITARGS = $(MERCURY_TCLTK_DIR)/mercury_tcltk.init -+MLLIBS = $(TCLTK_LIBS) $(GL_LIBS) $(EXTRA_MLLIBS) -+# C2INITARGS = $(MERCURY_TCLTK_DIR)/mercury_tcltk.init - - # We may need to tell mmake where tcl.h and tk.h are. - # If we are using Tcl/Tk version 8.0 on Debian the include directory - # we need is `/usr/include/tcl8.0/generic'. --CFLAGS = -I/usr/include/tcl$(TCLTK_VERSION) -+# CFLAGS = -I/usr/include/tcl$(TCLTK_VERSION) - - # We need to also access mtcltk.mh --MGNUCFLAGS = -I$(MERCURY_TCLTK_DIR) -+MGNUCFLAGS = -I/usr/lib/tk$(TCLTK_VERSION)/include/generic - - depend: mtogl.depend - ---- mercury-extras-0.13.0-beta-2006-04-03.orig/graphics/mercury_opengl/togl.c 2003-08-13 17:49:46.000000000 +1200 -+++ mercury-extras-0.13.0-beta-2006-04-03/graphics/mercury_opengl/togl.c 2006-04-06 20:26:23.000000000 +1200 -@@ -274,21 +274,7 @@ - #include <tcl.h> - #include <tk.h> - #if defined(X11) --#if TK_MAJOR_VERSION==4 && TK_MINOR_VERSION==0 --# include "tkInt4.0.h" --# define NO_TK_CURSOR --#elif TK_MAJOR_VERSION==4 && TK_MINOR_VERSION==1 --# include "tkInt4.1.h" --#elif TK_MAJOR_VERSION==4 && TK_MINOR_VERSION==2 --# include "tkInt4.2.h" --#elif TK_MAJOR_VERSION==8 && TK_MINOR_VERSION==0 && TK_RELEASE_SERIAL==0 --# include "tkInt8.0.h" --#elif TK_MAJOR_VERSION==8 && TK_MINOR_VERSION==0 && TK_RELEASE_SERIAL==2 --# include "tkInt8.0p2.h" --#elif TK_MAJOR_VERSION==8 && TK_MINOR_VERSION==0 && TK_RELEASE_SERIAL==5 --# include "tkInt8.0p5.h" --#else -- Sorry, you will have to edit togl.c to include the right tkInt.h file -+#include <tkInt.h> - #endif - #elif defined(WIN32) - #if TK_MAJOR_VERSION<8 diff --git a/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta-mercury_tcltk.patch b/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta-mercury_tcltk.patch deleted file mode 100644 index 9f197bfbb669..000000000000 --- a/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta-mercury_tcltk.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- mercury-extras-0.13.0-beta-2006-04-03.orig/graphics/mercury_tcltk/Mmakefile 2005-08-15 16:11:42.000000000 +1200 -+++ mercury-extras-0.13.0-beta-2006-04-03/graphics/mercury_tcltk/Mmakefile 2006-04-06 07:25:40.000000000 +1200 -@@ -8,10 +8,7 @@ - - # You may need to modify the line below - --MLLIBS = -ltk8.4 -ltcl8.4 -L/usr/X11R6/lib -lX11 -lXmu -lXext -lm -ldl \ -- -lXt -lICE -lSM -- --MLFLAGS = -R/usr/X11R6/lib -+MLLIBS = -ltk -ltcl - - # On some Linux machines you may need to let mgnuc know where the - # tcl/tk header files are. diff --git a/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta-odbc-r1.patch b/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta-odbc-r1.patch deleted file mode 100644 index b4b686a68215..000000000000 --- a/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta-odbc-r1.patch +++ /dev/null @@ -1,43 +0,0 @@ ---- mercury-extras-0.13.0-beta-2006-04-09.orig/odbc/Mmakefile 2006-04-04 13:49:14.000000000 +1200 -+++ mercury-extras-0.13.0-beta-2006-04-09/odbc/Mmakefile 2006-04-11 22:52:58.000000000 +1200 -@@ -40,18 +40,23 @@ - - # The following are for Debian. - -- # for unixODBC -- MLLIBS=-lodbc -lpthread -lltdl -ldl -- -- # for iODBC -- # MLLIBS=-liodbc l-pthread -ldl -- # note: on a DEC Alpha using OSF1 remove the -ldl. -+ ifeq ($(MODBC_DRIVER),MODBC_UNIX) -+ # for unixODBC -+ MLLIBS=-L/usr/lib -lodbc -lpthread -lltdl -ldl -+ else -+ # for iODBC -+ ODBC_LIBS=`iodbc-config --libs` -+ ODBC_INCLS=`iodbc-config --cflags` -+ MLLIBS=$(ODBC_LIBS) -lpthread -ldl -+ endif - endif - --MAIN_TARGET=odbc_test -+MAIN_TARGET=libodbc - - .PHONY: depend --depend: odbc_test.depend -+depend: odbc.depend -+ -+install: libodbc.install - - .PHONY: check - check: -@@ -62,7 +67,7 @@ - # `--no-ansi' is needed because the ODBC header files include C++-style - # "//" comments. `--no-ansi' allows recognition of C++-style "//" comments, - # presuming you have gcc version 2.7.1 or greater. --MGNUCFLAGS=--no-ansi -D$(MODBC_DRIVER) -D$(MODBC_DB) -I$(ODBC_INCL_DIR) -+MGNUCFLAGS=-D$(MODBC_DRIVER) -D$(MODBC_DB) $(ODBC_INCLS) - - #-----------------------------------------------------------------------------# - #-----------------------------------------------------------------------------# diff --git a/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta-posix.patch b/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta-posix.patch deleted file mode 100644 index 19522d8116e1..000000000000 --- a/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta-posix.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- mercury-extras-0.13.0-beta-2006-04-09.orig/posix/posix.exec.m 2001-07-16 15:08:18.000000000 +1200 -+++ mercury-extras-0.13.0-beta-2006-04-09/posix/posix.exec.m 2006-04-12 20:18:11.000000000 +1200 -@@ -12,7 +12,7 @@ - - :- interface. - --:- import_module string, list, map. -+:- import_module string, list, map, pair. - - :- type argv == list(string). - diff --git a/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta-references.patch b/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta-references.patch deleted file mode 100644 index cf66cf651359..000000000000 --- a/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta-references.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- mercury-extras-0.13.0-beta-2006-04-03.orig/references/Mmakefile 2004-02-17 13:00:24.000000000 +1300 -+++ mercury-extras-0.13.0-beta-2006-04-03/references/Mmakefile 2006-04-01 16:15:40.000000000 +1200 -@@ -10,7 +10,9 @@ - - # Install in an "extras" subdirectory of the main installation tree - INSTALL_PREFIX := $(INSTALL_PREFIX)/extras --LIBGRADES = asm_fast.gc.tr asm_fast.gc.tr.debug -+LIBGRADES := $(foreach grade,$(LIBGRADES), \ -+ $(subst .tr.,$(grade),$(findstring .tr.,$(grade))) \ -+ $(filter %.tr,$(grade))) - - MAIN_TARGET = libglobal - diff --git a/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta-trailed_update-r1.patch b/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta-trailed_update-r1.patch deleted file mode 100644 index c36106b5c7e4..000000000000 --- a/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta-trailed_update-r1.patch +++ /dev/null @@ -1,56 +0,0 @@ ---- mercury-extras-0.13.0-beta-2006-04-03.orig/trailed_update/Mmakefile 2004-07-30 19:03:46.000000000 +1200 -+++ mercury-extras-0.13.0-beta-2006-04-03/trailed_update/Mmakefile 2006-03-26 22:00:13.000000000 +1200 -@@ -4,6 +4,10 @@ - # Public License - see the file COPYING.LIB in the Mercury distribution. - #-----------------------------------------------------------------------------# - -+LIBGRADES := $(foreach grade,$(LIBGRADES), \ -+ $(subst .tr.,$(grade),$(findstring .tr.,$(grade))) \ -+ $(filter %.tr,$(grade))) -+ - GRADEFLAGS += --use-trail - - # enable C debugging -@@ -25,6 +29,8 @@ - cd samples && mmake $(MMAKEFLAGS) depend - cd tests && mmake $(MMAKEFLAGS) depend - -+install: libtrailed_update.install -+ - .PHONY: check - check: libtrailed_update - cd samples && mmake $(MMAKEFLAGS) check ---- mercury-extras-0.13.0-beta-2006-04-09.orig/trailed_update/var.m 2006-03-30 13:21:19.000000000 +1200 -+++ mercury-extras-0.13.0-beta-2006-04-09/trailed_update/var.m 2006-04-12 21:16:27.000000000 +1200 -@@ -831,12 +831,12 @@ - - :- pragma export(var.rep_unify(in(ptr(var_rep_any)), in(ptr(var_rep_any))), - "ML_var_unify"). --:- impure pred var.rep_unify(var_rep(T), var_rep(T)). -+:- pred var.rep_unify(var_rep(T), var_rep(T)). - :- mode var.rep_unify(in(ptr(var_rep_any)), in(ptr(var_rep_any))) is semidet. - - var.rep_unify(XPtr, YPtr) :- - XPtr = alias(X), -- ( -+ promise_pure ( - X = alias(_), - impure var.rep_unify(X, YPtr) - ; -@@ -880,14 +880,14 @@ - - % This is the case when the first var is free(DelayedGoals). - % --:- impure pred var.rep_unify_fr(var_rep(T), var_rep(T), var_rep(T)). -+:- pred var.rep_unify_fr(var_rep(T), var_rep(T), var_rep(T)). - :- mode var.rep_unify_fr(in(ptr(var_rep_any)), % really deref_delayed - in(ptr(var_rep_any)), - in(var_rep_deref_delayed)) is semidet. - - var.rep_unify_fr(XPtr, YPtr, X) :- - YPtr = alias(Y), -- ( -+ promise_pure ( - Y = alias(_), - impure var.rep_unify_fr(XPtr, Y, X) - ; diff --git a/dev-lang/mercury-extras/mercury-extras-0.13.0_beta20060907.ebuild b/dev-lang/mercury-extras/mercury-extras-0.13.0_beta20060907.ebuild deleted file mode 100644 index cd359d17ef57..000000000000 --- a/dev-lang/mercury-extras/mercury-extras-0.13.0_beta20060907.ebuild +++ /dev/null @@ -1,129 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/mercury-extras-0.13.0_beta20060907.ebuild,v 1.2 2006/09/09 22:12:57 keri Exp $ - -inherit eutils versionator - -BETA_V=$(get_version_component_range 4 $PV) -BETA_V_YYYY=${BETA_V:4:4} -BETA_V_MM=${BETA_V:8:2} -BETA_V_DD=${BETA_V:10:2} -MY_PV=$(get_version_component_range 1-3 $PV)-beta-${BETA_V_YYYY}-${BETA_V_MM}-${BETA_V_DD} -MY_P=${PN}-${MY_PV} - -DESCRIPTION="Additional libraries and tools that are not part of the Mercury standard library" -HOMEPAGE="http://www.cs.mu.oz.au/research/mercury/index.html" -SRC_URI="ftp://ftp.mercury.cs.mu.oz.au/pub/mercury/beta-releases/0.13.0-beta/${MY_P}-unstable.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~ppc ~x86" - -IUSE="doc glut iodbc ncurses odbc opengl tcltk xml" - -DEPEND="~dev-lang/mercury-${PV} - glut? ( virtual/glut ) - odbc? ( dev-db/unixODBC ) - iodbc? ( !odbc? ( dev-db/libiodbc ) ) - ncurses? ( sys-libs/ncurses ) - opengl? ( virtual/opengl ) - tcltk? ( =dev-lang/tk-8.4* - || ( ( - x11-libs/libX11 - x11-libs/libXmu ) - virtual/x11 ) )" - -S="${WORKDIR}"/${MY_P} - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${P/${BETA_V}/beta}-concurrency-r1.patch - epatch "${FILESDIR}"/${P/${BETA_V}/beta}-dynamic_linking.patch - epatch "${FILESDIR}"/${P/${BETA_V}/beta}-lex.patch - epatch "${FILESDIR}"/${P/${BETA_V}/beta}-mercury_glut.patch - epatch "${FILESDIR}"/${P/${BETA_V}/beta}-mercury_tcltk.patch - epatch "${FILESDIR}"/${P/${BETA_V}/beta}-mercury_opengl.patch - epatch "${FILESDIR}"/${P/${BETA_V}/beta}-odbc-r1.patch - epatch "${FILESDIR}"/${P/${BETA_V}/beta}-posix.patch - epatch "${FILESDIR}"/${P/${BETA_V}/beta}-references.patch - epatch "${FILESDIR}"/${P/${BETA_V}/beta}-trailed_update-r1.patch - - sed -i -e "s:curs:concurrency curs:" \ - -e "s:posix:posix quickcheck:" \ - -e "s:windows_installer_generator ::" Mmakefile - sed -i -e "s:lib/mercury:lib/mercury-${PV}:" posix/Mmakefile - - if built_with_use dev-lang/mercury minimal; then - sed -i -e "s:references::" Mmakefile - else - sed -i -e "s:xml:trailed_update xml:" Mmakefile - fi - - use glut && sed -i -e "s: lex : graphics/mercury_glut lex :" Mmakefile - use tcltk && sed -i -e "s: lex : graphics/mercury_tcltk lex :" Mmakefile - use opengl && sed -i -e "s: lex : graphics/mercury_opengl lex :" Mmakefile - - if use odbc ; then - sed -i -e "s:moose:moose odbc:" Mmakefile - elif use iodbc ; then - sed -i -e "s:moose:moose odbc:" Mmakefile - sed -i -e "s:MODBC_DRIVER=MODBC_UNIX:MODBC_DRIVER=MODBC_IODBC:" odbc/Mmakefile - fi - - ! use ncurses && sed -i -e "s:curs curses::" Mmakefile - ! use xml && sed -i -e "s:xml::" Mmakefile -} - -src_compile() { - mmake depend || die "mmake depend failed" - mmake || die "mmake failed" - - if use opengl && use tcltk ; then - cd "${S}"/graphics/mercury_opengl - cp ../mercury_tcltk/mtcltk.m ./ - mmake -f Mmakefile.mtogl depend || die "mmake depend mtogl failed" - mmake -f Mmakefile.mtogl || die "mmake mtogl failed" - fi -} - -src_install() { - cd "${S}" - mmake INSTALL_PREFIX="${D}"/usr install || die "mmake install failed" - - if use opengl && use tcltk ; then - cd "${S}"/graphics/mercury_opengl - mv Mmakefile Mmakefile.opengl - mv Mmakefile.mtogl Mmakefile - mmake INSTALL_PREFIX="${D}"/usr \ - install || die "mmake install mtogl failed" - fi - - cd "${S}" - if use doc ; then - docinto samples/complex_numbers - dodoc complex_numbers/samples/*.m - - if use ncurses ; then - docinto samples/curs - dodoc curs/samples/*.m - - docinto samples/curses - dodoc curses/sample/*.m - fi - - docinto samples/dynamic_linking - dodoc dynamic_linking/hello.m - - docinto samples/lex - dodoc lex/samples/*.m - - docinto samples/moose - dodoc moose/samples/*.m moose/samples/*.moo - - docinto samples/references - dodoc references/samples/*.m - fi - - dodoc README -} |