summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeri Harris <keri@gentoo.org>2006-04-13 22:58:08 +0000
committerKeri Harris <keri@gentoo.org>2006-04-13 22:58:08 +0000
commitff4fb05b03f409d2d9ed12f0261031cfbc8783e9 (patch)
treec2bf78603b122be5076d21688164db346c96f4f9 /dev-lang
parentmarking ~ppc (Bug #129463, reported by Stephan Weller) (diff)
downloadhistorical-ff4fb05b03f409d2d9ed12f0261031cfbc8783e9.tar.gz
historical-ff4fb05b03f409d2d9ed12f0261031cfbc8783e9.tar.bz2
historical-ff4fb05b03f409d2d9ed12f0261031cfbc8783e9.zip
Update mercury_opengl patch to build mtogl
Package-Manager: portage-2.1_pre7-r5
Diffstat (limited to 'dev-lang')
-rw-r--r--dev-lang/mercury-extras/ChangeLog6
-rw-r--r--dev-lang/mercury-extras/Manifest12
-rw-r--r--dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta-mercury_opengl.patch2
3 files changed, 12 insertions, 8 deletions
diff --git a/dev-lang/mercury-extras/ChangeLog b/dev-lang/mercury-extras/ChangeLog
index ffec03b7fcb6..199900ab1fd1 100644
--- a/dev-lang/mercury-extras/ChangeLog
+++ b/dev-lang/mercury-extras/ChangeLog
@@ -1,6 +1,10 @@
# 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.5 2006/04/13 22:21:35 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/ChangeLog,v 1.6 2006/04/13 22:58:08 keri Exp $
+
+ 13 Apr 2006; Keri Harris <keri@gentoo.org>
+ files/mercury-extras-0.13.0_beta-mercury_opengl.patch:
+ Update mercury_opengl patch to build mtogl
*mercury-extras-0.13.0_beta-r1 (13 Apr 2006)
diff --git a/dev-lang/mercury-extras/Manifest b/dev-lang/mercury-extras/Manifest
index 39cdf70ecb31..fcf771aed575 100644
--- a/dev-lang/mercury-extras/Manifest
+++ b/dev-lang/mercury-extras/Manifest
@@ -1,6 +1,6 @@
-MD5 2e28c43a1af505694765b8c4eabfebdb ChangeLog 2083
-RMD160 6da7e784132f0e25f5e4b09ec817e3c6b11bae89 ChangeLog 2083
-SHA256 b792367006feda5eb3d2967fd4416b02f4018faef29edea0d049e8f6534163fd ChangeLog 2083
+MD5 4d0a8576e9f34938b616b14a1361ff9a ChangeLog 2231
+RMD160 61d587511e3ef0ac985e8e5779ea5263372c1502 ChangeLog 2231
+SHA256 4cea3afa70228896a08fdd34532909a1b6df273533085fd8fdbf0889e4767eaf ChangeLog 2231
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
@@ -49,9 +49,9 @@ SHA256 a0fb563a6fef06f3b342739beb7e1d9a9cfbd3c49fda636188c4bc3ebebaea33 files/me
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
-MD5 76a55490c96c784b8bed9995d76d45ab files/mercury-extras-0.13.0_beta-mercury_opengl.patch 3366
-RMD160 4c1462c58d3833cfb449783a232b2b128f92a1d1 files/mercury-extras-0.13.0_beta-mercury_opengl.patch 3366
-SHA256 f514291e0d2bf4223f4b2e730e6e2197609791e84338f05846eaf71ce77462cd files/mercury-extras-0.13.0_beta-mercury_opengl.patch 3366
+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
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
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
index 71d99c74dbcf..7631fc0913cd 100644
--- 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
@@ -25,7 +25,7 @@
# 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
++GL_LIBS = -lGL -lGLU -lX11 -lXmu
# Tell mmake to use the `mercury_tcltk' library.
-VPATH = $(MERCURY_TCLTK_DIR):$(MMAKE_VPATH)