diff options
author | Keri Harris <keri@gentoo.org> | 2006-04-19 08:37:15 +0000 |
---|---|---|
committer | Keri Harris <keri@gentoo.org> | 2006-04-19 08:37:15 +0000 |
commit | cf2721932cf08ddeef7a1f193df60f7d1da3edd3 (patch) | |
tree | f753a733b88a417c5126456d820dcbae86e890ca /dev-lang | |
parent | New development snapshot. (diff) | |
download | gentoo-2-cf2721932cf08ddeef7a1f193df60f7d1da3edd3.tar.gz gentoo-2-cf2721932cf08ddeef7a1f193df60f7d1da3edd3.tar.bz2 gentoo-2-cf2721932cf08ddeef7a1f193df60f7d1da3edd3.zip |
New development snapshot.
(Portage version: 2.1_pre7-r5)
Diffstat (limited to 'dev-lang')
7 files changed, 275 insertions, 1 deletions
diff --git a/dev-lang/mercury-extras/ChangeLog b/dev-lang/mercury-extras/ChangeLog index 199900ab1fd1..56ab825cb742 100644 --- a/dev-lang/mercury-extras/ChangeLog +++ b/dev-lang/mercury-extras/ChangeLog @@ -1,6 +1,15 @@ # 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.6 2006/04/13 22:58:08 keri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/ChangeLog,v 1.7 2006/04/19 08:37:15 keri Exp $ + +*mercury-extras-0.13.0_beta2 (19 Apr 2006) + + 19 Apr 2006; Keri Harris <keri@gentoo.org> + +files/mercury-extras-0.13.0_beta2-gcc4.patch, + +files/mercury-extras-0.13.0_beta2-odbc.patch, + +files/mercury-extras-0.13.0_beta2-trailed_update.patch, + +mercury-extras-0.13.0_beta2.ebuild: + New development snapshot. 13 Apr 2006; Keri Harris <keri@gentoo.org> files/mercury-extras-0.13.0_beta-mercury_opengl.patch: diff --git a/dev-lang/mercury-extras/Manifest b/dev-lang/mercury-extras/Manifest index fcf771aed575..95c16c89a5e4 100644 --- a/dev-lang/mercury-extras/Manifest +++ b/dev-lang/mercury-extras/Manifest @@ -10,6 +10,9 @@ SHA256 e1b6085e039b11131e795b518c36f01c18bd5a935262b088277da86cc2e9d1e2 files/di 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 6e37b5e1fb0f2b879ce2f6dd1293ca26 files/digest-mercury-extras-0.13.0_beta2 340 +RMD160 fc300c81107358196e3e838917a3eccd9375d4c8 files/digest-mercury-extras-0.13.0_beta2 340 +SHA256 a121a1d526fcc00e9dd372ed4af709b7c1540533f9be3b2927911612dd4ec268 files/digest-mercury-extras-0.13.0_beta2 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 @@ -76,6 +79,15 @@ SHA256 bada13e7a67e99fbcc0d8e4c0f941dd5ccb7447bb6dc2481977c7bd86c639700 files/me MD5 620e3e128fcc5715f0bbc55b9d01431b files/mercury-extras-0.13.0_beta-trailed_update.patch 794 RMD160 c489347887c247d35736f46248f103ea60930dbb files/mercury-extras-0.13.0_beta-trailed_update.patch 794 SHA256 8dfa795f9262d5d45661e43d1590ab25978a74154e91626debff48c0d6bfb621 files/mercury-extras-0.13.0_beta-trailed_update.patch 794 +MD5 8ca02970a2e4a9079f679316a432fce6 files/mercury-extras-0.13.0_beta2-gcc4.patch 1734 +RMD160 726d87477484042985213b0c59c826a14fc474c7 files/mercury-extras-0.13.0_beta2-gcc4.patch 1734 +SHA256 c604ca6fd4b07175230ca59b14bf15f7d7f55a3647d98411b43c4ef295f78229 files/mercury-extras-0.13.0_beta2-gcc4.patch 1734 +MD5 a953d57835d38421007a1b867f2df223 files/mercury-extras-0.13.0_beta2-odbc.patch 1328 +RMD160 67ce8cbcce6f6f2e9d04d714df967981a162dda7 files/mercury-extras-0.13.0_beta2-odbc.patch 1328 +SHA256 f1b30d77068b72c36638687aec1b060c1adea528341e3252297319971b934334 files/mercury-extras-0.13.0_beta2-odbc.patch 1328 +MD5 4b4ff5851a45ae76eb7c7efb53ec770d files/mercury-extras-0.13.0_beta2-trailed_update.patch 1927 +RMD160 80643d6cc0b83f415629d7c00fee6fc2a40de3cf files/mercury-extras-0.13.0_beta2-trailed_update.patch 1927 +SHA256 47cc0bef68e63e5ac5eb22746c8266991c1af41af06d30d8b014a56a095ca079 files/mercury-extras-0.13.0_beta2-trailed_update.patch 1927 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 @@ -85,6 +97,9 @@ SHA256 f39ff9ce83af189b3fd55e760bf5befb6f4691fecae5436a25c8c96d94f79981 mercury- 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 +MD5 defc39a4dccb44bfa65ae096c6d77080 mercury-extras-0.13.0_beta2.ebuild 3100 +RMD160 c525dbd79b4b5456e92dfaacba186dcbfabad107 mercury-extras-0.13.0_beta2.ebuild 3100 +SHA256 16e6e01bb1ad75b2e1cc668d1515fbc82823f3b06047a86379e6d8883f07cefb mercury-extras-0.13.0_beta2.ebuild 3100 MD5 6fca20d17d6d55a28537204aa9bb626f metadata.xml 247 RMD160 1b3df3c501d9a3b2e2651668be405677e8416397 metadata.xml 247 SHA256 be2c02607bd8d5bf707b178d925fa94c6c705014aa488156323589ca4eaac380 metadata.xml 247 diff --git a/dev-lang/mercury-extras/files/digest-mercury-extras-0.13.0_beta2 b/dev-lang/mercury-extras/files/digest-mercury-extras-0.13.0_beta2 new file mode 100644 index 000000000000..a9eca221f90d --- /dev/null +++ b/dev-lang/mercury-extras/files/digest-mercury-extras-0.13.0_beta2 @@ -0,0 +1,3 @@ +MD5 1655058401b950484c1c2a8aa34d41b3 mercury-extras-0.13.0-beta-2006-04-11-unstable.tar.gz 873407 +RMD160 3380a889d81801be0250ebcc989df5317f8674a1 mercury-extras-0.13.0-beta-2006-04-11-unstable.tar.gz 873407 +SHA256 0505b5826e52b4fdced4c55a11305eb190ad788197a64f727b0bd86bd12864b7 mercury-extras-0.13.0-beta-2006-04-11-unstable.tar.gz 873407 diff --git a/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta2-gcc4.patch b/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta2-gcc4.patch new file mode 100644 index 000000000000..f06c08ebd27f --- /dev/null +++ b/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta2-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_beta2-odbc.patch b/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta2-odbc.patch new file mode 100644 index 000000000000..e099021c0f93 --- /dev/null +++ b/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta2-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_beta2-trailed_update.patch b/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta2-trailed_update.patch new file mode 100644 index 000000000000..c36106b5c7e4 --- /dev/null +++ b/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta2-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_beta2.ebuild b/dev-lang/mercury-extras/mercury-extras-0.13.0_beta2.ebuild new file mode 100644 index 000000000000..da18c94412fa --- /dev/null +++ b/dev-lang/mercury-extras/mercury-extras-0.13.0_beta2.ebuild @@ -0,0 +1,112 @@ +# 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_beta2.ebuild,v 1.1 2006/04/19 08:37:15 keri Exp $ + +inherit eutils versionator + +MY_PV=$(get_version_component_range 1-3 $PV)-beta +MY_P=${PN}-${MY_PV}-2006-04-11 + +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}"/${P}-gcc4.patch + epatch "${FILESDIR}"/${P/beta2/beta}-concurrency.patch + epatch "${FILESDIR}"/${P/beta2/beta}-lex.patch + epatch "${FILESDIR}"/${P/beta2/beta}-mercury_glut.patch + epatch "${FILESDIR}"/${P/beta2/beta}-mercury_tcltk.patch + epatch "${FILESDIR}"/${P/beta2/beta}-mercury_opengl.patch + epatch "${FILESDIR}"/${P}-odbc.patch + epatch "${FILESDIR}"/${P/beta2/beta}-posix.patch + epatch "${FILESDIR}"/${P/beta2/beta}-references.patch + epatch "${FILESDIR}"/${P}-trailed_update.patch + + sed -i -e "s:curs:concurrency curs:" \ + -e "s:posix:posix quickcheck:" \ + -e "s:windows_installer_generator ::" \ + -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 +} |