upgrade to 5.0

PR:		28830
Submitted by:	Don Croyle <croyle@gelemna.org>

5 files changed, 13 insertions, 25 deletions

diff --git a/www/amaya/Makefile b/www/amaya/Makefile
index 842fbd67432d..d9657362c581 100644
--- a/www/amaya/Makefile
+++ b/www/amaya/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	amaya
-PORTVERSION=	4.3.2
+PORTVERSION=	5.0
 CATEGORIES=	www
 MASTER_SITES=	http://www.w3.org/Amaya/Distribution/ \
 		ftp://ftp.w3.org/pub/amaya/
@@ -27,7 +27,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_SCRIPT=	../configure
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	--with-more-shared
+CONFIGURE_ARGS=	--without-graphic-libs
 
 DICT?=		none
 
diff --git a/www/amaya/distinfo b/www/amaya/distinfo
index 1d973a29f316..2fae6b694e0a 100644
--- a/www/amaya/distinfo
+++ b/www/amaya/distinfo
@@ -1,4 +1,4 @@
-MD5 (amaya/amaya-src-4.3.2.tgz) = 755b95ee831f33815708d1004dd751f2
+MD5 (amaya/amaya-src-5.0.tgz) = 1fe0221fbc887928d17fcd7af9597c41
 MD5 (amaya/Dutch.tgz) = 3edb9cce5ce160d7270b23808c1d5981
 MD5 (amaya/English.tgz) = e06eb8accd75b3e65d7ffa552244b011
 MD5 (amaya/French.tgz) = 791bc87281b27f10a987815aa7d10108
diff --git a/www/amaya/files/patch-aa b/www/amaya/files/patch-aa
deleted file mode 100644
index e4281d9c2670..000000000000
--- a/www/amaya/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../amaya/Makefile.in.orig	Thu Nov 23 09:03:30 2000
-+++ ../amaya/Makefile.in	Sat Dec 30 01:39:48 2000
-@@ -10,7 +10,7 @@
- include ../Options
- 
- INCLUDES= -DHAVE_CONFIG_H $(AMAYA_INCLUDES) $(EXPAT_INCLUDES) $(X_FLAGS)
--XMLIB   = -lXm
-+XMLIB   = ${MOTIFLIB}
- LIBS	=  $(AMAYA_PLUGIN_LIBS) $(AMAYA_ANNOT_LIBS) \
- 	   $(AMAYA_LIBWWW_LIBS) $(AMAYA_MATH_LIBS) $(AMAYA_GRAPH_LIBS) \
-           -L../tablelib -L../thotlib -L.. -lThotTable -lThotEditor \
diff --git a/www/amaya/files/patch-ae b/www/amaya/files/patch-ae
deleted file mode 100644
index 32111aa9a637..000000000000
--- a/www/amaya/files/patch-ae
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../configure.orig	Wed Feb 28 19:34:16 2001
-+++ ../configure	Mon Mar 19 22:16:50 2001
-@@ -1651,7 +1651,7 @@
-   :
- fi
- 
--if test "$with_graphic-libs" = "no" ; then
-+if test "$with_more_shared" = "yes" ; then
-     echo $ac_n "checking for libjpeg version = 6b""... $ac_c" 1>&6
- echo "configure:1657: checking for libjpeg version = 6b" >&5
-     cat > conftest.$ac_ext <<EOF
diff --git a/www/amaya/pkg-plist b/www/amaya/pkg-plist
index 6f1369475eff..38cc4fbfb1ae 100644
--- a/www/amaya/pkg-plist
+++ b/www/amaya/pkg-plist
@@ -21,6 +21,7 @@ Amaya/amaya/HTMLPLPUS.PRS
 Amaya/amaya/HTMLPP.PRS
 Amaya/amaya/HTMLPPUS.PRS
 Amaya/amaya/HTMLT.TRA
+Amaya/amaya/HTMLT11.TRA
 Amaya/amaya/HTMLTT.TRA
 Amaya/amaya/HTMLTX.TRA
 Amaya/amaya/HTMLUSL.PRS
@@ -45,6 +46,13 @@ Amaya/amaya/XLink.STR
 Amaya/amaya/XLinkP.PRS
 Amaya/amaya/XLinkT.TRA
 Amaya/amaya/XLink.en
+Amaya/amaya/XML.STR
+Amaya/amaya/XMLP.PRS
+Amaya/amaya/XMLPL.PRS
+Amaya/amaya/XMLPP.PRS
+Amaya/amaya/XMLPPUS.PRS
+Amaya/amaya/XMLT.TRA
+Amaya/amaya/XMLUSL.PRS
 Amaya/amaya/amaya.png
 Amaya/amaya/annot.gif
 Amaya/amaya/annotorp.gif
@@ -212,6 +220,7 @@ Amaya/doc/amaya/HTML-elements/structure.html
 Amaya/doc/amaya/HTML.html
 Amaya/doc/amaya/ImageMaps.html
 Amaya/doc/amaya/ImageMaps.html.fr
+Amaya/doc/amaya/Index.html
 Amaya/doc/amaya/Keyboard.html
 Amaya/doc/amaya/Keyboard.html.fr
 Amaya/doc/amaya/Links.html
@@ -245,6 +254,7 @@ Amaya/doc/amaya/Tables.html.fr
 Amaya/doc/amaya/Transform.html
 Amaya/doc/amaya/Views.html
 Amaya/doc/amaya/Views.html.fr
+Amaya/doc/amaya/index.css
 Amaya/fonts/Families.list
 Amaya/fonts/fonts.dir
 Amaya/fonts/icones.ff