diff options
author | Keri Harris <keri@gentoo.org> | 2006-04-29 01:41:37 +0000 |
---|---|---|
committer | Keri Harris <keri@gentoo.org> | 2006-04-29 01:41:37 +0000 |
commit | 4169862568364040ef020a6e7810d4855870c355 (patch) | |
tree | cf577a8d2b32643e8e769e11b7c8649e9731601f /dev-lang | |
parent | Stable on SPARC. (diff) | |
download | gentoo-2-4169862568364040ef020a6e7810d4855870c355.tar.gz gentoo-2-4169862568364040ef020a6e7810d4855870c355.tar.bz2 gentoo-2-4169862568364040ef020a6e7810d4855870c355.zip |
New development snapshot.
(Portage version: 2.1_pre9-r5)
Diffstat (limited to 'dev-lang')
6 files changed, 237 insertions, 1 deletions
diff --git a/dev-lang/mercury-extras/ChangeLog b/dev-lang/mercury-extras/ChangeLog index fe4093d19f12..478dc308d58e 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.14 2006/04/26 10:48:18 keri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/ChangeLog,v 1.15 2006/04/29 01:41:36 keri Exp $ + +*mercury-extras-0.13.0_beta7 (29 Apr 2006) + + 29 Apr 2006; Keri Harris <keri@gentoo.org> + +files/mercury-extras-0.13.0_beta7-concurrency.patch, + +files/mercury-extras-0.13.0_beta7-odbc.patch, + +files/mercury-extras-0.13.0_beta7-trailed_update.patch, + +mercury-extras-0.13.0_beta7.ebuild: + New development snapshot. *mercury-extras-0.13.0_beta6 (26 Apr 2006) diff --git a/dev-lang/mercury-extras/files/digest-mercury-extras-0.13.0_beta7 b/dev-lang/mercury-extras/files/digest-mercury-extras-0.13.0_beta7 new file mode 100644 index 000000000000..ef9af4e1f551 --- /dev/null +++ b/dev-lang/mercury-extras/files/digest-mercury-extras-0.13.0_beta7 @@ -0,0 +1,3 @@ +MD5 558e747642f3d981606a3a7beb9655ee mercury-extras-0.13.0-beta-2006-04-27-unstable.tar.gz 873616 +RMD160 8e00039f16141240613c615ecee92bd8352cdb59 mercury-extras-0.13.0-beta-2006-04-27-unstable.tar.gz 873616 +SHA256 88f778f67f166e21cc9b6a7637bd2bc15c3c69f42e669986fc105f62632035a7 mercury-extras-0.13.0-beta-2006-04-27-unstable.tar.gz 873616 diff --git a/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta7-concurrency.patch b/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta7-concurrency.patch new file mode 100644 index 000000000000..793e088bfeb0 --- /dev/null +++ b/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta7-concurrency.patch @@ -0,0 +1,11 @@ +--- 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_beta7-odbc.patch b/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta7-odbc.patch new file mode 100644 index 000000000000..b4b686a68215 --- /dev/null +++ b/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta7-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=-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_beta7-trailed_update.patch b/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta7-trailed_update.patch new file mode 100644 index 000000000000..c36106b5c7e4 --- /dev/null +++ b/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta7-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_beta7.ebuild b/dev-lang/mercury-extras/mercury-extras-0.13.0_beta7.ebuild new file mode 100644 index 000000000000..1060f3b85ac3 --- /dev/null +++ b/dev-lang/mercury-extras/mercury-extras-0.13.0_beta7.ebuild @@ -0,0 +1,114 @@ +# 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_beta7.ebuild,v 1.1 2006/04/29 01:41:36 keri Exp $ + +inherit eutils versionator + +BETA_V=$(get_version_component_range 4 $PV) +MY_PV=$(get_version_component_range 1-3 $PV)-beta +MY_P=${PN}-${MY_PV}-2006-04-27 + +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} + !<dev-lang/mercury-extras-0.13.0_beta + 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}-concurrency.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}-odbc.patch + epatch "${FILESDIR}"/${P/${BETA_V}/beta}-posix.patch + epatch "${FILESDIR}"/${P/${BETA_V}/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 +} |