[Lunar-commits] <moonbase> amaya: Version bump. They do not recommend using system libwww so lets just remove that

[Dennis `stumbles` Veatch]

commit 252be116ecd0df24e1f35fae08d1fe59b07852ee
Author: Dennis `stumbles` Veatch <stumbles at lunar-linux.org>
Date:   Fri Apr 9 21:57:56 2010 -0400

    amaya: Version bump. They do not recommend using system libwww so lets just remove that
    
    choice (the make borks if you try). Also a few adjustments in the BUILDs.
---
 web/amaya/BUILD          |    3 ---
 web/amaya/BUILD.x86_64   |    5 ++---
 web/amaya/DEPENDS        |    5 ++---
 web/amaya/DETAILS        |    4 ++--
 web/amaya/DETAILS.x86_64 |    6 +++---
 5 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/web/amaya/BUILD b/web/amaya/BUILD
index 64eb7df..d59077f 100644
--- a/web/amaya/BUILD
+++ b/web/amaya/BUILD
@@ -1,8 +1,5 @@
 (
 
-  OPTS="$OPTS --enable-motif --enable-system-raptor       \
-              --enable-system-libwww --with-graphic-libs"
-
   cd     Amaya                 &&
   mkdir  LINUX-ELF             &&
   cd     LINUX-ELF             &&
diff --git a/web/amaya/BUILD.x86_64 b/web/amaya/BUILD.x86_64
index 6e5f431..50f61f6 100644
--- a/web/amaya/BUILD.x86_64
+++ b/web/amaya/BUILD.x86_64
@@ -1,9 +1,8 @@
 (
 
-  OPTS="$OPTS --enable-motif --enable-system-raptor        \
-              --enable-system-libwww --with-graphic-libs" &&
+  cp -f  Mesa/configs/linux Mesa/configs/current &&
 
-  cp -f  Mesa/configs/linux-x86-64-static Mesa/configs/current &&
+  ARCH_FLAGS="-m32 -DGLX_USE_TLS" &&
 
   patch_it $SOURCE_CACHE/$SOURCE2 0 &&
 
diff --git a/web/amaya/DEPENDS b/web/amaya/DEPENDS
index 41b64c1..c0471c0 100644
--- a/web/amaya/DEPENDS
+++ b/web/amaya/DEPENDS
@@ -1,4 +1,3 @@
-depends  jpeg     
-depends  libpng   
 depends  openMotif
-depends  raptor
+
+optional_depends raptor     "--enable-system-raptor" "--disable-system-raptor" "Use system provided raptor"
diff --git a/web/amaya/DETAILS b/web/amaya/DETAILS
index c33a9e0..5f01506 100644
--- a/web/amaya/DETAILS
+++ b/web/amaya/DETAILS
@@ -1,5 +1,5 @@
           MODULE=amaya
-         VERSION=11.2
+         VERSION=11.3
           SOURCE=$MODULE-sources-$VERSION.tgz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/Amaya$VERSION
    SOURCE_URL[0]=http://www.w3.org/Amaya/Distribution/
@@ -7,7 +7,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/Amaya$VERSION
    MODULE_PREFIX=${AMAYA_INSTALL_DIR:-/opt/lunar/Amaya}
         WEB_SITE=http://www.w3.org/Amaya/
          ENTERED=20011115
-         UPDATED=20091118
+         UPDATED=20100409
            SHORT="Browser and WYSIWYG web authoring tool"
 
 PSAFE=no
diff --git a/web/amaya/DETAILS.x86_64 b/web/amaya/DETAILS.x86_64
index 7300916..242d831 100644
--- a/web/amaya/DETAILS.x86_64
+++ b/web/amaya/DETAILS.x86_64
@@ -1,16 +1,16 @@
           MODULE=amaya
-         VERSION=11.2
+         VERSION=11.3
           SOURCE=$MODULE-sources-$VERSION.tgz
          SOURCE2=amaya.gsockgtk.cpp.1.patch
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/Amaya$VERSION
    SOURCE_URL[0]=http://www.w3.org/Amaya/Distribution/
      SOURCE2_URL=$PATCH_URL
-      SOURCE_VFY=sha1:40d17d4545ab0ff97a0eabe7c2d9d7c76f6b6587
+      SOURCE_VFY=sha1:42092cfbe9274f5c88f8b97cb52ec2f3130fa1be
      SOURCE2_VFY=sha1:9175e81cc05bf1ad51c2096368011e929a9007bb
    MODULE_PREFIX=${AMAYA_INSTALL_DIR:-/opt/lunar/Amaya}
         WEB_SITE=http://www.w3.org/Amaya/
          ENTERED=20011115
-         UPDATED=20091118
+         UPDATED=20100409
            SHORT="Browser and WYSIWYG web authoring tool"
 
 PSAFE=no