From 6c2ba820bfc75dd9c87035fff5a8dbcb807ad064 Mon Sep 17 00:00:00 2001 From: Mark Linimon Date: Mon, 22 Mar 2004 19:45:17 +0000 Subject: Update to 8.3. For extensive documentation about the update, see http://www.w3.org/Amaya/User/New.html. PR: ports/64051 Submitted by: Ports Fury Approved by: adam-ports@blacktabby.org (maintainer) --- www/amaya/Makefile | 13 +++++++------ www/amaya/distinfo | 12 ++++++++++-- www/amaya/files/patch-ad | 15 +++------------ www/amaya/files/patch-configure | 24 ++++++++++++------------ www/amaya/pkg-plist | 20 +++++++++++++++++++- 5 files changed, 51 insertions(+), 33 deletions(-) (limited to 'www/amaya') diff --git a/www/amaya/Makefile b/www/amaya/Makefile index eb4f40664171..c1f1649ab757 100644 --- a/www/amaya/Makefile +++ b/www/amaya/Makefile @@ -6,8 +6,7 @@ # PORTNAME= amaya -PORTVERSION= 8.2 -PORTREVISION= 1 +PORTVERSION= 8.3 CATEGORIES= www MASTER_SITES= http://www.w3.org/Amaya/Distribution/ \ ftp://ftp.w3.org/pub/amaya/ \ @@ -20,7 +19,7 @@ MASTER_SITES= http://www.w3.org/Amaya/Distribution/ \ ftp://nic.funet.fi/index/WWW/W3/amaya/ \ http://www.nic.funet.fi/index/WWW/W3/amaya/ DISTNAME= ${PORTNAME}-src-${PORTVERSION} -DISTFILES= ${DISTNAME}.tgz +EXTRACT_SUFX= .tgz DIST_SUBDIR= amaya MAINTAINER= adam-ports@blacktabby.org @@ -34,7 +33,8 @@ USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_SCRIPT= ../configure CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LIBS="${LDFLAGS}" -CONFIGURE_ARGS= --without-graphic-libs + +CFLAGS+= -fpermissive CPPFLAGS= -I${LOCALBASE}/include LDFLAGS= -L${LOCALBASE}/lib @@ -59,9 +59,10 @@ DISTFILES+= ${DICT:S/$/.tgz/g} .if ${XFREE86_VERSION} >= 4 && defined(WITH_OPENGL) LIB_DEPENDS+= gtkgl.5:${PORTSDIR}/x11-toolkits/gtkglarea -USE_MESA= yes +USE_GL= yes CONFIGURE_ARGS+= --with-gl -LDFLAGS+= -lcompat +CFLAGS+= ${PTHREAD_CFLAGS} +LDFLAGS+= -lcompat ${PTHREAD_LIBS} .endif pre-everything:: diff --git a/www/amaya/distinfo b/www/amaya/distinfo index 3923f2e702dd..2e9dbab28350 100644 --- a/www/amaya/distinfo +++ b/www/amaya/distinfo @@ -1,8 +1,16 @@ -MD5 (amaya/amaya-src-8.2.tgz) = 5c70a26cb3b97c40febd779f4b604a29 +MD5 (amaya/amaya-src-8.3.tgz) = 17ecfe47e27a8517344650627cc7762d +SIZE (amaya/amaya-src-8.3.tgz) = 9688629 MD5 (amaya/Dutch.tgz) = 3edb9cce5ce160d7270b23808c1d5981 +SIZE (amaya/Dutch.tgz) = 1228989 MD5 (amaya/English.tgz) = c1f7122288329dc3cbb3871ea00eb4b4 -MD5 (amaya/French.tgz) = 1d3705478bdcb4b5aca827c4492f2a90 +SIZE (amaya/English.tgz) = 619699 +MD5 (amaya/French.tgz) = 2412b593ec42c7aac2a341e54a7bb936 +SIZE (amaya/French.tgz) = 803561 MD5 (amaya/German.tgz) = 400eeeae974a64d23de4fcdd609c30bc +SIZE (amaya/German.tgz) = 1132270 MD5 (amaya/Italian.tgz) = 05e2d25ee8af11faaaa25a33da89d504 +SIZE (amaya/Italian.tgz) = 323845 MD5 (amaya/Spanish.tgz) = b504a75cd0f789a3046bf2041067b18b +SIZE (amaya/Spanish.tgz) = 525267 MD5 (amaya/Swedish.tgz) = 6536ab2e31e3f58618ba79d9fddc7f76 +SIZE (amaya/Swedish.tgz) = 96316 diff --git a/www/amaya/files/patch-ad b/www/amaya/files/patch-ad index d7e71bdc4241..3c9876671b71 100644 --- a/www/amaya/files/patch-ad +++ b/www/amaya/files/patch-ad @@ -1,15 +1,6 @@ ---- ../Options.in.orig Fri Sep 15 23:24:26 2000 -+++ ../Options.in Sat Mar 17 08:53:21 2001 -@@ -9,7 +9,7 @@ - SHELL = /bin/sh - - CC = @CC@ --CFLAGS = @CFLAGS@ -+CFLAGS = @CFLAGS@ @CPPFLAGS@ - CPP = @CPP@ - LD = @CC@ - LDFLAGS = @LDFLAGS@ -@@ -24,8 +24,8 @@ +--- ../Options.in.orig Fri Jan 30 01:06:42 2004 ++++ ../Options.in Wed Mar 10 14:37:42 2004 +@@ -27,8 +27,8 @@ DIFF = @DIFF@ INSTALL = @INSTALL@ diff --git a/www/amaya/files/patch-configure b/www/amaya/files/patch-configure index 095d0ad13175..a6b1e2f5bdfd 100644 --- a/www/amaya/files/patch-configure +++ b/www/amaya/files/patch-configure @@ -1,20 +1,20 @@ ---- ../configure.orig Mon Feb 3 23:43:57 2003 -+++ ../configure Wed Feb 5 01:18:24 2003 -@@ -6238,9 +6238,9 @@ +--- ../configure.orig Fri Jan 30 01:06:42 2004 ++++ ../configure Wed Mar 10 18:44:02 2004 +@@ -12713,9 +12713,9 @@ fi done --GTK_INCLUDES="`gtk-config --cflags`" -+GTK_INCLUDES="`imlib-config --cflags-gdk`" +- GTK_INCLUDES="`gtk-config --cflags`" ++ GTK_INCLUDES="`imlib-config --cflags-gdk`" --GTK_LIBRARIES="`gtk-config --libs`" -+GTK_LIBRARIES="`imlib-config --libs-gdk`" - if test "${with_gl}" != "yes" ; then - GTK_LIBRARIES="${GTK_LIBRARIES} -lgdk_imlib" - fi -@@ -7019,6 +7019,9 @@ +- GTK_LIBRARIES="`gtk-config --libs`" ++ GTK_LIBRARIES="`imlib-config --libs-gdk`" + if test "${with_gl}" != "yes" ; then + GTK_LIBRARIES="${GTK_LIBRARIES} -lgdk_imlib" + fi +@@ -13687,6 +13687,9 @@ if test "$with_dav" = "yes" ; then - + dav_frag=$srcdir/davlib/Makefile.dav +else + diff --git a/www/amaya/pkg-plist b/www/amaya/pkg-plist index 093d32d1e63d..8b0a34b9532b 100644 --- a/www/amaya/pkg-plist +++ b/www/amaya/pkg-plist @@ -10,6 +10,8 @@ Amaya/amaya/HTML.STR Amaya/amaya/HTML.conf Amaya/amaya/HTML.en Amaya/amaya/HTML.trans +Amaya/amaya/HTML.trans.es +Amaya/amaya/HTML.trans.fr Amaya/amaya/HTMLP.PRS Amaya/amaya/HTMLPBW.PRS Amaya/amaya/HTMLPL.PRS @@ -28,6 +30,8 @@ Amaya/amaya/MathML.STR Amaya/amaya/MathML.conf Amaya/amaya/MathML.en Amaya/amaya/MathML.trans +Amaya/amaya/MathML.trans.es +Amaya/amaya/MathML.trans.fr Amaya/amaya/MathMLP.PRS Amaya/amaya/MathMLT.TRA Amaya/amaya/MathMLTX.TRA @@ -337,6 +341,7 @@ Amaya/doc/html/Tables.html.es Amaya/doc/html/Tables.html.fr Amaya/doc/html/Transform.html Amaya/doc/html/Transform.html.es +Amaya/doc/html/Tutorial.html.fr Amaya/doc/html/Views.html Amaya/doc/html/Views.html.de Amaya/doc/html/Views.html.es @@ -707,7 +712,6 @@ Amaya/doc/images/ColorMenu-fr.gif Amaya/doc/images/ColorMenu.gif Amaya/doc/images/CooperationMenu.gif Amaya/doc/images/CooperationPreferences.gif -Amaya/doc/images/Cour.gif Amaya/doc/images/DL.gif Amaya/doc/images/Editor.gif Amaya/doc/images/Em.gif @@ -721,6 +725,7 @@ Amaya/doc/images/H2.gif Amaya/doc/images/H3.gif Amaya/doc/images/IDMenu.png Amaya/doc/images/Image.gif +Amaya/doc/images/Langue.png Amaya/doc/images/LangueNegotiation-fr.gif Amaya/doc/images/LangueNegotiation.gif Amaya/doc/images/LibraryDocDefaultStyle.gif @@ -745,10 +750,12 @@ Amaya/doc/images/SaveAs.gif Amaya/doc/images/Strong.gif Amaya/doc/images/TemplatesMenu-fr.gif Amaya/doc/images/TemplatesMenu.gif +Amaya/doc/images/View.png Amaya/doc/images/align-de.png Amaya/doc/images/alternateview-de.jpg Amaya/doc/images/alternateview.jpg Amaya/doc/images/amaya.gif +Amaya/doc/images/anim.gif Amaya/doc/images/annot.png Amaya/doc/images/annotationicon-de.png Amaya/doc/images/annotationicon-es.png @@ -786,6 +793,9 @@ Amaya/doc/images/configuration_for_annotations.png Amaya/doc/images/configurebox-fr.png Amaya/doc/images/configurebox.png Amaya/doc/images/createRule-de.png +Amaya/doc/images/create_image-fr.png +Amaya/doc/images/create_link-fr.png +Amaya/doc/images/create_table-fr.png Amaya/doc/images/css-fr.gif Amaya/doc/images/css.gif Amaya/doc/images/dialog_save_as-de.png @@ -803,17 +813,21 @@ Amaya/doc/images/geometry_preferences-de.png Amaya/doc/images/geometry_preferences-es.png Amaya/doc/images/geometry_preferences.png Amaya/doc/images/graphics_palette-de.png +Amaya/doc/images/home.gif Amaya/doc/images/image_button.gif +Amaya/doc/images/invalid_profile-fr.png Amaya/doc/images/language_negotiation-de.png Amaya/doc/images/language_negotiation-es.png Amaya/doc/images/language_negotiation.png Amaya/doc/images/left.gif +Amaya/doc/images/libsvg.gif Amaya/doc/images/linksview-de.jpg Amaya/doc/images/linksview.jpg Amaya/doc/images/linkwindow.png Amaya/doc/images/localfilter-es.png Amaya/doc/images/localfilter.png Amaya/doc/images/math_palette-de.png +Amaya/doc/images/not_well_formed-fr.png Amaya/doc/images/open.png Amaya/doc/images/printoptions_w32-de.png Amaya/doc/images/profiles_preferences-de.png @@ -829,9 +843,12 @@ Amaya/doc/images/put.gif Amaya/doc/images/right.gif Amaya/doc/images/scenario_graphique.png Amaya/doc/images/search_and_replace-de.png +Amaya/doc/images/search_and_replace-fr.png Amaya/doc/images/sourceview-de.jpg Amaya/doc/images/sourceview.jpg Amaya/doc/images/spellchecking-de.png +Amaya/doc/images/spellchecking-fr.png +Amaya/doc/images/stop.gif Amaya/doc/images/structureview-de.jpg Amaya/doc/images/structureview.jpg Amaya/doc/images/table.gif @@ -851,6 +868,7 @@ Amaya/fonts/icones.ff Amaya/fonts/icones.pcf Amaya/fonts/icones1.fb Amaya/fonts/icones11.fb +Amaya/resources/xrc/InitConfirmDlgWX.xrc @dirrm Amaya/fonts @dirrm Amaya/doc/images @dirrm Amaya/doc/html/viewing -- cgit v1.2.3