diff options
Diffstat (limited to 'dev-lang/mercury-extras')
8 files changed, 292 insertions, 4 deletions
diff --git a/dev-lang/mercury-extras/ChangeLog b/dev-lang/mercury-extras/ChangeLog index 59978a58dd83..ffec03b7fcb6 100644 --- a/dev-lang/mercury-extras/ChangeLog +++ b/dev-lang/mercury-extras/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for dev-lang/mercury-extras # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/ChangeLog,v 1.4 2006/04/07 12:15:13 keri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/ChangeLog,v 1.5 2006/04/13 22:21:35 keri Exp $ + +*mercury-extras-0.13.0_beta-r1 (13 Apr 2006) + + 13 Apr 2006; Keri Harris <keri@gentoo.org> + +files/mercury-extras-0.13.0_beta-posix.patch, + +files/mercury-extras-0.13.0_beta-r1-gcc4.patch, + +files/mercury-extras-0.13.0_beta-r1-odbc.patch, + +files/mercury-extras-0.13.0_beta-r1-trailed_update.patch, + +mercury-extras-0.13.0_beta-r1.ebuild: + Revbump to new development snapshot. *mercury-extras-0.13.0_beta (07 Apr 2006) diff --git a/dev-lang/mercury-extras/Manifest b/dev-lang/mercury-extras/Manifest index 5628b63feb5a..39cdf70ecb31 100644 --- a/dev-lang/mercury-extras/Manifest +++ b/dev-lang/mercury-extras/Manifest @@ -1,12 +1,15 @@ -MD5 d83bf50954a15afca70bfb4f8954d06d ChangeLog 1699 -RMD160 dac7f30aefd45e0ed9cb6cd63300b690401c40ca ChangeLog 1699 -SHA256 7496db2d32d10230accaadeb08c039930bd54d8274b2d79da22682ada7863c25 ChangeLog 1699 +MD5 2e28c43a1af505694765b8c4eabfebdb ChangeLog 2083 +RMD160 6da7e784132f0e25f5e4b09ec817e3c6b11bae89 ChangeLog 2083 +SHA256 b792367006feda5eb3d2967fd4416b02f4018faef29edea0d049e8f6534163fd ChangeLog 2083 MD5 04bb3f50c82519cd929f7754557a4124 files/digest-mercury-extras-0.12.2 265 RMD160 e18050a352bc3f86650cf53244bbb17545ef0817 files/digest-mercury-extras-0.12.2 265 SHA256 087bf13f383826ff1da30ff861cfc48008b7037a9a844f14fee94f51934ec525 files/digest-mercury-extras-0.12.2 265 MD5 6f8cdcb0dfbbe8dcb288d7d0c2e00bcc files/digest-mercury-extras-0.13.0_beta 340 RMD160 1b1f65813a3511cec7f0d921e0f5a3db6ae6ce68 files/digest-mercury-extras-0.13.0_beta 340 SHA256 e1b6085e039b11131e795b518c36f01c18bd5a935262b088277da86cc2e9d1e2 files/digest-mercury-extras-0.13.0_beta 340 +MD5 9054ef99aa50cd750b135c7d04ddba96 files/digest-mercury-extras-0.13.0_beta-r1 340 +RMD160 d0521ca70aee8d960931f0b34a67d62d9fad573b files/digest-mercury-extras-0.13.0_beta-r1 340 +SHA256 5dc2aaa7c0e7fcc4954a0dd2b35f9375e35a531da122206943331abab7c84698 files/digest-mercury-extras-0.13.0_beta-r1 340 MD5 46b54062fd1dea38e3b6f8724fe51f02 files/mercury-extras-0.12.2-concurrency.patch 316 RMD160 a9bcbafeaf0ee76782adbe289442bdff1012fa38 files/mercury-extras-0.12.2-concurrency.patch 316 SHA256 40fd7961b6677cacc80d2460c9f4b11effdabbe00c3b026f0f65ea46c70d7189 files/mercury-extras-0.12.2-concurrency.patch 316 @@ -55,6 +58,18 @@ SHA256 a5476c68d3165277db1d9ef3d583cd7df83efc34ab0049e4e610daf9a50c1b6a files/me MD5 3ba7d87efa5fc0d52b05398c49147796 files/mercury-extras-0.13.0_beta-odbc.patch 1252 RMD160 d64f31845e5333d03ad9bba617fb98faad433179 files/mercury-extras-0.13.0_beta-odbc.patch 1252 SHA256 7dfeae7242db7df183368d30f4e78abb16d074aacc4b986edbf0647ff3cc7e92 files/mercury-extras-0.13.0_beta-odbc.patch 1252 +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 +MD5 8ca02970a2e4a9079f679316a432fce6 files/mercury-extras-0.13.0_beta-r1-gcc4.patch 1734 +RMD160 726d87477484042985213b0c59c826a14fc474c7 files/mercury-extras-0.13.0_beta-r1-gcc4.patch 1734 +SHA256 c604ca6fd4b07175230ca59b14bf15f7d7f55a3647d98411b43c4ef295f78229 files/mercury-extras-0.13.0_beta-r1-gcc4.patch 1734 +MD5 a953d57835d38421007a1b867f2df223 files/mercury-extras-0.13.0_beta-r1-odbc.patch 1328 +RMD160 67ce8cbcce6f6f2e9d04d714df967981a162dda7 files/mercury-extras-0.13.0_beta-r1-odbc.patch 1328 +SHA256 f1b30d77068b72c36638687aec1b060c1adea528341e3252297319971b934334 files/mercury-extras-0.13.0_beta-r1-odbc.patch 1328 +MD5 4b4ff5851a45ae76eb7c7efb53ec770d files/mercury-extras-0.13.0_beta-r1-trailed_update.patch 1927 +RMD160 80643d6cc0b83f415629d7c00fee6fc2a40de3cf files/mercury-extras-0.13.0_beta-r1-trailed_update.patch 1927 +SHA256 47cc0bef68e63e5ac5eb22746c8266991c1af41af06d30d8b014a56a095ca079 files/mercury-extras-0.13.0_beta-r1-trailed_update.patch 1927 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 @@ -64,6 +79,9 @@ SHA256 8dfa795f9262d5d45661e43d1590ab25978a74154e91626debff48c0d6bfb621 files/me MD5 a0b740456e04a360edc59e40c97b86ee mercury-extras-0.12.2.ebuild 2690 RMD160 2c945112c44d2b87730d0f80c4985b72d3da5dad mercury-extras-0.12.2.ebuild 2690 SHA256 6a6f8742178abceaec1bea20d868ed0e03539c08b98ac520d02a2e6ebc490f49 mercury-extras-0.12.2.ebuild 2690 +MD5 55d2e8f3cd1c6d327a3d6033f64ecc6a mercury-extras-0.13.0_beta-r1.ebuild 3095 +RMD160 fbf3b7f1408efc72066a1c730707a3dadf3cb2ad mercury-extras-0.13.0_beta-r1.ebuild 3095 +SHA256 f39ff9ce83af189b3fd55e760bf5befb6f4691fecae5436a25c8c96d94f79981 mercury-extras-0.13.0_beta-r1.ebuild 3095 MD5 bdf71a67da1fd463a7bbb9aa41a6042c mercury-extras-0.13.0_beta.ebuild 2846 RMD160 62ebaeef2a5cc4c8ff29ddfe020530ad45d08927 mercury-extras-0.13.0_beta.ebuild 2846 SHA256 4379c8ffb157801da863f1a7d22a34f577ad7ef825617dc427cf1594561c80df mercury-extras-0.13.0_beta.ebuild 2846 diff --git a/dev-lang/mercury-extras/files/digest-mercury-extras-0.13.0_beta-r1 b/dev-lang/mercury-extras/files/digest-mercury-extras-0.13.0_beta-r1 new file mode 100644 index 000000000000..a76e82b3e47f --- /dev/null +++ b/dev-lang/mercury-extras/files/digest-mercury-extras-0.13.0_beta-r1 @@ -0,0 +1,3 @@ +MD5 10954407aba82451b8bacfe8f6bbc8c3 mercury-extras-0.13.0-beta-2006-04-09-unstable.tar.gz 873234 +RMD160 8512f4325d783aebc9704d36adc1cab706351dde mercury-extras-0.13.0-beta-2006-04-09-unstable.tar.gz 873234 +SHA256 bb9210cf60179d5442dcf708fadc43bf8b371765021c3f6ef2d1e4fe107e4ac2 mercury-extras-0.13.0-beta-2006-04-09-unstable.tar.gz 873234 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 new file mode 100644 index 000000000000..19522d8116e1 --- /dev/null +++ b/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta-posix.patch @@ -0,0 +1,11 @@ +--- 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-r1-gcc4.patch b/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta-r1-gcc4.patch new file mode 100644 index 000000000000..f06c08ebd27f --- /dev/null +++ b/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta-r1-gcc4.patch @@ -0,0 +1,36 @@ +diff -ur mercury-extras-0.13.0-beta-2006-04-09.orig/concurrency/global.m mercury-extras-0.13.0-beta-2006-04-09/concurrency/global.m +--- mercury-extras-0.13.0-beta-2006-04-09.orig/concurrency/global.m 2003-03-01 04:20:33.000000000 +1300 ++++ mercury-extras-0.13.0-beta-2006-04-09/concurrency/global.m 2006-04-11 19:42:21.000000000 +1200 +@@ -54,7 +54,7 @@ + :- pragma c_code(global__new(Thing::in, Glob::out, IO0::di, IO::uo), + will_not_call_mercury, "{ + MR_Word *tmp; +- MR_incr_hp((MR_Word) tmp, 1); ++ MR_incr_hp((*(MR_Word*) &(tmp)), 1); + *tmp = Thing; + Glob = (MR_Word) tmp; + IO = IO0; +diff -ur mercury-extras-0.13.0-beta-2006-04-09.orig/curs/curs.m mercury-extras-0.13.0-beta-2006-04-09/curs/curs.m +--- mercury-extras-0.13.0-beta-2006-04-09.orig/curs/curs.m 2005-10-26 18:04:14.000000000 +1300 ++++ mercury-extras-0.13.0-beta-2006-04-09/curs/curs.m 2006-04-11 19:43:19.000000000 +1200 +@@ -965,7 +965,7 @@ + wattrset(w, Attr); + wcolor_set(w, Attr, NULL); + wclear(w); +- (PANEL *)Panel = new_panel(w); ++ (*(PANEL**)&(Panel)) = new_panel(w); + + IO = IO0; + +diff -ur mercury-extras-0.13.0-beta-2006-04-09.orig/graphics/mercury_tcltk/mtcltk.m mercury-extras-0.13.0-beta-2006-04-09/graphics/mercury_tcltk/mtcltk.m +--- mercury-extras-0.13.0-beta-2006-04-09.orig/graphics/mercury_tcltk/mtcltk.m 2005-08-15 16:11:42.000000000 +1200 ++++ mercury-extras-0.13.0-beta-2006-04-09/graphics/mercury_tcltk/mtcltk.m 2006-04-11 19:44:26.000000000 +1200 +@@ -141,7 +141,7 @@ + argc++; + } + +- MR_incr_hp(MR_LVALUE_CAST(MR_Word, argv), argc + 1); ++ MR_incr_hp((*(MR_Word*)&( argv)), argc + 1); + + for (i = 0, l = Args; l != list_empty(); l = list_tail(l), i++) { + argv[i] = (char *) MR_list_head(l); diff --git a/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta-r1-odbc.patch b/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta-r1-odbc.patch new file mode 100644 index 000000000000..e099021c0f93 --- /dev/null +++ b/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta-r1-odbc.patch @@ -0,0 +1,43 @@ +--- 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=-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-r1-trailed_update.patch b/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta-r1-trailed_update.patch new file mode 100644 index 000000000000..c36106b5c7e4 --- /dev/null +++ b/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta-r1-trailed_update.patch @@ -0,0 +1,56 @@ +--- 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_beta-r1.ebuild b/dev-lang/mercury-extras/mercury-extras-0.13.0_beta-r1.ebuild new file mode 100644 index 000000000000..cdf4ae93031c --- /dev/null +++ b/dev-lang/mercury-extras/mercury-extras-0.13.0_beta-r1.ebuild @@ -0,0 +1,111 @@ +# 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_beta-r1.ebuild,v 1.1 2006/04/13 22:21:35 keri Exp $ + +inherit eutils versionator + +MY_PV=$(replace_version_separator 3 '-') +MY_P=${PN}-${MY_PV}-2006-04-09 + +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/${MY_PV}/${MY_P}-unstable.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~ppc ~x86" + +IUSE="doc glut iodbc odbc opengl tcltk" + +DEPEND="~dev-lang/mercury-${PV} + sys-libs/ncurses + glut? ( virtual/glut ) + odbc? ( dev-db/unixODBC ) + iodbc? ( !odbc? ( dev-db/libiodbc ) ) + opengl? ( virtual/opengl ) + tcktk? ( =dev-lang/tk-8.4* + x11-libs/libX11 + x11-libs/libXmu )" + +S="${WORKDIR}"/${MY_P} + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/${PF}-gcc4.patch + epatch "${FILESDIR}"/${P}-concurrency.patch + epatch "${FILESDIR}"/${P}-lex.patch + epatch "${FILESDIR}"/${P}-mercury_glut.patch + epatch "${FILESDIR}"/${P}-mercury_tcltk.patch + epatch "${FILESDIR}"/${P}-mercury_opengl.patch + epatch "${FILESDIR}"/${PF}-odbc.patch + epatch "${FILESDIR}"/${P}-posix.patch + epatch "${FILESDIR}"/${P}-references.patch + epatch "${FILESDIR}"/${PF}-trailed_update.patch + + sed -i -e "s:curs:concurrency curs:" \ + -e "s:posix:posix quickcheck:" \ + -e "s:xml:trailed_update xml:" Mmakefile + + 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 +} + +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 + + docinto samples/curs + dodoc curs/samples/*.m + + docinto samples/curses + dodoc curses/sample/*.m + + 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 +} |