Upgrade to 2.4.

PR:		15576
Submitted by:	maintainer

3 files changed, 46 insertions, 32 deletions

diff --git a/www/amaya/Makefile b/www/amaya/Makefile
index 77eb63d4fb3c..80e7581130e5 100644
--- a/www/amaya/Makefile
+++ b/www/amaya/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	amaya
-# Version required:	2.2
+# Version required:	2.4
 # Date created:		26 Dec 1998
 # Whom:			Don Croyle <croyle@gelemna.ft-wayne.in.us>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	amaya-src-2.2
-PKGNAME=	amaya-2.2
+DISTNAME=	amaya-src-2.4
+PKGNAME=	amaya-2.4
 CATEGORIES= 	www
 MASTER_SITES=	http://www.w3.org/Amaya/Distribution/ \
 		ftp://ftp.w3.org/pub/amaya/ \
@@ -19,14 +19,23 @@ MAINTAINER=	croyle@gelemna.ft-wayne.in.us
 REQUIRES_MOTIF=	yes
 USE_XLIB=	yes
 USE_GMAKE=	yes
-
 DIST_SUBDIR=	amaya
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
-.ifdef ENGLISH_DICT
-DISTFILES+=	English.tar.gz
+
+DICT?=		none
+
+.if ${DICT} != "none"
+.if ${DICT} == "all"
+DISTFILES+=    Dutch.tgz
+DISTFILES+=    English.tgz
+DISTFILES+=    French.tgz
+DISTFILES+=    German.tgz
+DISTFILES+=    Italian.tgz
+DISTFILES+=    Spanish.tgz
+DISTFILES+=    Swedish.tgz
+.else
+DISTFILES+=    ${DICT:S/$/.tgz/g}
 .endif
-.ifdef FRENCH_DICT
-DISTFILES+=	French.tar.gz
 .endif
 
 WRKSRC=		${WRKDIR}/Amaya/obj
@@ -36,9 +45,9 @@ CONFIGURE_SCRIPT=	../configure
 CONFIGURE_ARGS=	--with-amaya
 
 pre-fetch:
-.if !defined(ENGLISH_DICT) && !defined(FRENCH_DICT)
-	@${ECHO_MSG} To enable spell checking, define either
-	@${ECHO_MSG} ENGLISH_DICT or FRENCH_DICT
+.if ${DICT} == "none"
+	@${ECHO_MSG} Several spellchecking dictionaries are available.  To use
+	@${ECHO_MSG} one of them, define DICT to be the appropriate language.
 .endif
 
 post-extract:
@@ -51,18 +60,13 @@ post-install:
 .for file in amaya print
 	strip ${PREFIX}/Amaya/applis/bin/${file}
 .endfor
-	${INSTALL_DATA} ${WRKSRC}/../amaya/COPYRIGHT.html ${PREFIX}/Amaya/amaya/
-.ifdef ENGLISH_DICT
-	${INSTALL_DATA} ${WRKDIR}/dicopar/Eprinc.dic ${PREFIX}/Amaya/dicopar/
-	${MV} ${TMPPLIST} ${TMPPLIST}.new
-	${ECHO} Amaya/dicopar/Eprinc.dic > ${TMPPLIST}
-	${CAT} ${TMPPLIST}.new >> ${TMPPLIST}
-	${RM} ${TMPPLIST}.new
-.endif
-.ifdef FRENCH_DICT
-	${INSTALL_DATA} ${WRKDIR}/dicopar/Fprinc.dic ${PREFIX}/Amaya/dicopar/
+	${INSTALL_DATA} ${WRKSRC}/../amaya/COPYRIGHT.html\
+	${PREFIX}/Amaya/amaya/
+.if ${DICT} != "none"
+	${INSTALL_DATA} ${WRKDIR}/*.dic ${PREFIX}/Amaya/dicopar/
 	${MV} ${TMPPLIST} ${TMPPLIST}.new
-	${ECHO} Amaya/dicopar/Fprinc.dic > ${TMPPLIST}
+	cd ${WRKDIR} && ls -1 *.dic | perl -pi -e 's|^|Amaya/dicopar/|'\
+	> ${TMPPLIST}
 	${CAT} ${TMPPLIST}.new >> ${TMPPLIST}
 	${RM} ${TMPPLIST}.new
 .endif
diff --git a/www/amaya/distinfo b/www/amaya/distinfo
index 4655a88a3491..c6b36a4361a5 100644
--- a/www/amaya/distinfo
+++ b/www/amaya/distinfo
@@ -1,3 +1,8 @@
-MD5 (amaya/amaya-src-2.2.tgz) = 0ba0f33f02e4e6ae5083feaf153c9ace
-MD5 (amaya/English.tar.gz) = db59f59244fbc6698934aeefd6f5e53e
-MD5 (amaya/French.tar.gz) = c18bd862588d187b86c5c0c4d0cfd306
+MD5 (amaya/amaya-src-2.4.tgz) = 0116711b648aa15898fa017c7e761cff
+MD5 (amaya/Dutch.tgz) = 3edb9cce5ce160d7270b23808c1d5981
+MD5 (amaya/English.tgz) = 0e95d11b4817094b8cd9aa4010363806
+MD5 (amaya/French.tgz) = 791bc87281b27f10a987815aa7d10108
+MD5 (amaya/German.tgz) = 400eeeae974a64d23de4fcdd609c30bc
+MD5 (amaya/Italian.tgz) = 05e2d25ee8af11faaaa25a33da89d504
+MD5 (amaya/Spanish.tgz) = b504a75cd0f789a3046bf2041067b18b
+MD5 (amaya/Swedish.tgz) = 6536ab2e31e3f58618ba79d9fddc7f76
diff --git a/www/amaya/pkg-plist b/www/amaya/pkg-plist
index 5c06567828cb..bcd7fd288907 100644
--- a/www/amaya/pkg-plist
+++ b/www/amaya/pkg-plist
@@ -39,22 +39,20 @@ Amaya/config/XKeysymDB
 Amaya/config/amaya.keyboard
 Amaya/config/de-amayadialogue
 Amaya/config/de-amayamsg
+Amaya/config/de-corrdialogue
 Amaya/config/de-libdialogue
 Amaya/config/en-amayadialogue
 Amaya/config/en-amayamsg
 Amaya/config/en-corrdialogue
 Amaya/config/en-libdialogue
-Amaya/config/en-transdialogue
 Amaya/config/fr-amayadialogue
 Amaya/config/fr-amayamsg
 Amaya/config/fr-corrdialogue
 Amaya/config/fr-libdialogue
-Amaya/config/fr-transdialogue
 Amaya/config/tr-amayadialogue
 Amaya/config/tr-amayamsg
 Amaya/config/tr-corrdialogue
 Amaya/config/tr-libdialogue
-Amaya/config/tr-transdialogue
 Amaya/config/unix-thot.rc
 Amaya/dicopar/alphabet
 Amaya/dicopar/american.ptn
@@ -91,6 +89,7 @@ Amaya/doc/Icons/Plugin.gif
 Amaya/doc/Icons/ProfilesMenu.gif
 Amaya/doc/Icons/ProxyMenu.gif
 Amaya/doc/Icons/PublishMenu.gif
+Amaya/doc/Icons/Reload.png
 Amaya/doc/Icons/SaveAs.gif
 Amaya/doc/Icons/SourceJava.gif
 Amaya/doc/Icons/Sources.gif
@@ -119,23 +118,28 @@ Amaya/doc/Icons/ui.gif
 Amaya/doc/Icons/up.gif
 Amaya/doc/Icons/warning.gif
 Amaya/doc/Icons/w3c-amaya.gif
+Amaya/doc/amaya/Access.html
 Amaya/doc/amaya/Attributes.html
-Amaya/doc/amaya/Autoconf.html
-Amaya/doc/amaya/BinDist.html
 Amaya/doc/amaya/Browsing.html
 Amaya/doc/amaya/CSS.html
 Amaya/doc/amaya/Changing.html
 Amaya/doc/amaya/Configure.html
 Amaya/doc/amaya/Creating.html
+Amaya/doc/amaya/HTML-elements/40styling.html
+Amaya/doc/amaya/HTML-elements/address.html
+Amaya/doc/amaya/HTML-elements/headings.html
+Amaya/doc/amaya/HTML-elements/infoTypes.html
+Amaya/doc/amaya/HTML-elements/inline.html
+Amaya/doc/amaya/HTML-elements/lists.html
+Amaya/doc/amaya/HTML-elements/structure.html
+Amaya/doc/amaya/HTML.html
 Amaya/doc/amaya/ImageMaps.html
 Amaya/doc/amaya/Keyboard.html
 Amaya/doc/amaya/Links.html
 Amaya/doc/amaya/MakeBook.html
 Amaya/doc/amaya/Manual.html
 Amaya/doc/amaya/Math.html
-Amaya/doc/amaya/New.html
 Amaya/doc/amaya/Numbering.html
-Amaya/doc/amaya/Plugins.html
 Amaya/doc/amaya/Printing.html
 Amaya/doc/amaya/Publishing.html
 Amaya/doc/amaya/Put.html
@@ -159,6 +163,7 @@ Amaya/fonts/icones11.fb
 @dirrm Amaya/config
 @dirrm Amaya/dicopar
 @dirrm Amaya/doc/Icons
+@dirrm Amaya/doc/amaya/HTML-elements
 @dirrm Amaya/doc/amaya
 @dirrm Amaya/doc
 @dirrm Amaya/fonts