Update to 2.0

PR: ports/11483
Submitted by: croyle@gelemna.ft-wayne.in.us

6 files changed, 183 insertions, 140 deletions

diff --git a/www/amaya/Makefile b/www/amaya/Makefile
index 802377884725..29f0f777e873 100644
--- a/www/amaya/Makefile
+++ b/www/amaya/Makefile
@@ -1,17 +1,17 @@
 # New ports collection makefile for:	amaya
-# Version required:	1.4a
+# Version required:	2.0
 # Date created:		26 Dec 1998
 # Whom:			Don Croyle <croyle@gelemna.ft-wayne.in.us>
 #
-# $Id: Makefile,v 1.1.1.1 1999/01/10 18:54:23 steve Exp $
+# $Id: Makefile,v 1.2 1999/01/18 02:39:02 steve Exp $
 #
 
-DISTNAME=	amaya-src-1.4a
-PKGNAME=	amaya-1.4a
+DISTNAME=	amaya-src-2.0
+PKGNAME=	amaya-2.0
 CATEGORIES= 	www
 MASTER_SITES=	http://www.w3.org/Amaya/Distribution/ \
 		ftp://ftp.w3.org/pub/amaya/ \
-		ftp://ftp-eu.w3.org/pub/amaya/
+		ftp://mirror.aarnet.edu.au/pub/amaya/
 
 MAINTAINER=	croyle@gelemna.ft-wayne.in.us
 
@@ -19,12 +19,27 @@ REQUIRES_MOTIF=	yes
 USE_XLIB=	yes
 USE_GMAKE=	yes
 
-WRKSRC=		${WRKDIR}/Thot/obj
+DIST_SUBDIR=	amaya
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
+.ifdef ENGLISH_DICT
+DISTFILES+=	English.tar.gz
+.endif
+.ifdef FRENCH_DICT
+DISTFILES+=	French.tar.gz
+.endif
+
+WRKSRC=		${WRKDIR}/Amaya/obj
 
 GNU_CONFIGURE=	yes
 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
+.endif
+
 post-extract:
 	${MKDIR} ${WRKSRC}
 
@@ -33,8 +48,22 @@ post-configure:
 
 post-install:
 .for file in amaya print
-	strip ${PREFIX}/thot/applis/bin/${file}
+	strip ${PREFIX}/Amaya/applis/bin/${file}
 .endfor
-	${INSTALL_DATA} ${WRKSRC}/../amaya/COPYRIGHT.html ${PREFIX}/thot/amaya/
+	${INSTALL_DATA} ${WRKSRC}/../amaya/COPYRIGHT.html ${PREFIX}/Amaya/amaya/
+.ifdef ENGLISH_DICT
+	${INSTALL_DATA} ${WRKDIR}/Thot/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}/Thot/dicopar/Fprinc.dic ${PREFIX}/Amaya/dicopar/
+	${MV} ${TMPPLIST} ${TMPPLIST}.new
+	${ECHO} Amaya/dicopar/Fprinc.dic > ${TMPPLIST}
+	${CAT} ${TMPPLIST}.new >> ${TMPPLIST}
+	${RM} ${TMPPLIST}.new
+.endif
 
 .include <bsd.port.mk>
diff --git a/www/amaya/distinfo b/www/amaya/distinfo
index 16c4eaa1730c..5d67efe2e6b0 100644
--- a/www/amaya/distinfo
+++ b/www/amaya/distinfo
@@ -1 +1,3 @@
-MD5 (amaya-src-1.4a.tar.gz) = e2d795ffb6a010a275dc3aa2f82f15f3
+MD5 (amaya/amaya-src-2.0.tar.gz) = c25c94bb6f1bb3eaa7b92dcdde6d8a74
+MD5 (amaya/English.tar.gz) = 36eed18a4dd0ce73ef1a5c310e751c2e
+MD5 (amaya/French.tar.gz) = d62ee5e7e09e36b66e833b4ec4a98902
diff --git a/www/amaya/files/patch-aa b/www/amaya/files/patch-aa
index ceff513a2079..fce3b9bdf53e 100644
--- a/www/amaya/files/patch-aa
+++ b/www/amaya/files/patch-aa
@@ -1,11 +1,11 @@
---- ../amaya/Makefile.in.orig	Wed Dec 16 10:31:13 1998
-+++ ../amaya/Makefile.in	Sat Dec 26 09:55:33 1998
+--- ../amaya/Makefile.in.orig	Tue May  4 15:54:53 1999
++++ ../amaya/Makefile.in	Wed May  5 11:01:05 1999
 @@ -10,7 +10,7 @@
  include ../Options
  
  INCLUDES= -DHAVE_CONFIG_H $(AMAYA_INCLUDES) $(X_FLAGS)
 -XMLIB   = -lXm
-+XMLIB   = ${MOTIFLIB} 
++XMLIB   = ${MOTIFLIB}
  LIBS	=  $(LIBWWW_LIBS) $(AMAYA_JAVA_LIBS) $(AMAYA_PLUGIN_LIBS) \
  	  $(AMAYA_MATH_LIBS) $(AMAYA_GRAPH_LIBS) $(AMAYA_ILU_LIBS) \
            -L../tablelib -L../thotlib -L.. -lThotTable -lThotEditor \
diff --git a/www/amaya/pkg-comment b/www/amaya/pkg-comment
index 43fa67d285d9..78f02025f05a 100644
--- a/www/amaya/pkg-comment
+++ b/www/amaya/pkg-comment
@@ -1 +1 @@
-The W3C's testbed web browser/editor.
+The W3C's testbed web editor/browser.
diff --git a/www/amaya/pkg-descr b/www/amaya/pkg-descr
index bb98b0835ef6..187d8de97cc4 100644
--- a/www/amaya/pkg-descr
+++ b/www/amaya/pkg-descr
@@ -1,4 +1,4 @@
-Amaya is the W3C's testbed browser/editor for new HTML and CSS
+Amaya is the W3C's testbed editor/browser for new HTML and CSS
 features.  It provides a WYSIWYG editing interface while generating
 documents that adhere to a DTD.
 
diff --git a/www/amaya/pkg-plist b/www/amaya/pkg-plist
index 02c46f3ef1a5..25a3972c98d7 100644
--- a/www/amaya/pkg-plist
+++ b/www/amaya/pkg-plist
@@ -1,128 +1,140 @@
-thot/amaya/AmayaPage.html
-thot/amaya/COPYRIGHT.html
-thot/amaya/HTML.STR
-thot/amaya/HTML.conf
-thot/amaya/HTML.en
-thot/amaya/HTML.fr
-thot/amaya/HTML.trans
-thot/amaya/HTMLP.PRS
-thot/amaya/HTMLPBW.PRS
-thot/amaya/HTMLPLP.PRS
-thot/amaya/HTMLPLPUS.PRS
-thot/amaya/HTMLPP.PRS
-thot/amaya/HTMLPPUS.PRS
-thot/amaya/HTMLT.TRA
-thot/amaya/HTMLTT.TRA
-thot/amaya/HTMLTX.TRA
-thot/applis/bin/amaya
+Amaya/amaya/AmayaPage.html
+Amaya/amaya/COPYRIGHT.html
+Amaya/amaya/HTML.STR
+Amaya/amaya/HTML.conf
+Amaya/amaya/HTML.en
+Amaya/amaya/HTML.fr
+Amaya/amaya/HTML.trans
+Amaya/amaya/HTMLP.PRS
+Amaya/amaya/HTMLPBW.PRS
+Amaya/amaya/HTMLPLP.PRS
+Amaya/amaya/HTMLPLPUS.PRS
+Amaya/amaya/HTMLPP.PRS
+Amaya/amaya/HTMLPPUS.PRS
+Amaya/amaya/HTMLT.TRA
+Amaya/amaya/HTMLTT.TRA
+Amaya/amaya/HTMLTX.TRA
+Amaya/amaya/TextFile.STR
+Amaya/amaya/TextFileP.PRS
+Amaya/amaya/TextFilePP.PRS
+Amaya/amaya/TextFilePPUS.PRS
+Amaya/amaya/TextFileT.TRA
+Amaya/applis/bin/amaya
 @exec ln -sf %D/%F %D/bin/amaya
 @unexec rm -f %D/bin/amaya
-thot/applis/bin/print
-thot/config/XKeysymDB
-thot/config/amaya.keyboard
-thot/config/de-amayadialogue
-thot/config/de-amayamsg
-thot/config/de-libdialogue
-thot/config/en-amayadialogue
-thot/config/en-amayamsg
-thot/config/en-corrdialogue
-thot/config/en-libdialogue
-thot/config/en-transdialogue
-thot/config/fr-amayadialogue
-thot/config/fr-amayamsg
-thot/config/fr-corrdialogue
-thot/config/fr-libdialogue
-thot/config/fr-transdialogue
-thot/config/thot.ini
-thot/config/tr-amayadialogue
-thot/config/tr-amayamsg
-thot/config/tr-corrdialogue
-thot/config/tr-libdialogue
-thot/config/tr-transdialogue
-thot/dicopar/alphabet
-thot/dicopar/american.ptn
-thot/dicopar/clavier
-thot/dicopar/deutsch.ptn
-thot/dicopar/english.ptn
-thot/dicopar/espanol.ptn
-thot/dicopar/finish.ptn
-thot/dicopar/francais.ptn
-thot/dicopar/italiano.ptn
-thot/dicopar/nederl.ptn
-thot/dicopar/portug.ptn
-thot/dicopar/swedish.ptn
-thot/doc/Icons/Back.gif
-thot/doc/Icons/Browser.gif
-thot/doc/Icons/Editor.gif
-thot/doc/Icons/Forward.gif
-thot/doc/Icons/Image.gif
-thot/doc/Icons/Link.gif
-thot/doc/Icons/NumList.gif
-thot/doc/Icons/Plugin.gif
-thot/doc/Icons/SaveAs.gif
-thot/doc/Icons/SourceJava.gif
-thot/doc/Icons/Sources.gif
-thot/doc/Icons/amaya.gif
-thot/doc/Icons/background.gif
-thot/doc/Icons/bug.gif
-thot/doc/Icons/check.gif
-thot/doc/Icons/cross.gif
-thot/doc/Icons/doc48x.gif
-thot/doc/Icons/drapeau-F.gif
-thot/doc/Icons/eyec.gif
-thot/doc/Icons/find.gif
-thot/doc/Icons/floppy.gif
-thot/doc/Icons/left.gif
-thot/doc/Icons/opera.gif
-thot/doc/Icons/put.gif
-thot/doc/Icons/question.gif
-thot/doc/Icons/right.gif
-thot/doc/Icons/table.gif
-thot/doc/Icons/target.gif
-thot/doc/Icons/ui.gif
-thot/doc/Icons/up.gif
-thot/doc/Icons/warning.gif
-thot/doc/amaya/Attributes.html
-thot/doc/amaya/Autoconf.html
-thot/doc/amaya/BinDist.html
-thot/doc/amaya/Browsing.html
-thot/doc/amaya/CSS.html
-thot/doc/amaya/Changing.html
-thot/doc/amaya/Configure.html
-thot/doc/amaya/Creating.html
-thot/doc/amaya/ImageMaps.html
-thot/doc/amaya/Keyboard.html
-thot/doc/amaya/Links.html
-thot/doc/amaya/MakeBook.html
-thot/doc/amaya/Manual.html
-thot/doc/amaya/Math.html
-thot/doc/amaya/New.html
-thot/doc/amaya/Numbering.html
-thot/doc/amaya/Plugins.html
-thot/doc/amaya/Printing.html
-thot/doc/amaya/Publishing.html
-thot/doc/amaya/Put.html
-thot/doc/amaya/Registry.html
-thot/doc/amaya/Searching.html
-thot/doc/amaya/Selecting.html
-thot/doc/amaya/SpellChecking.html
-thot/doc/amaya/StyleSheets.html
-thot/doc/amaya/Tables.html
-thot/doc/amaya/Transform.html
-thot/doc/amaya/Views.html
-thot/fonts/Families.list
-thot/fonts/fonts.dir
-thot/fonts/icones.ff
-thot/fonts/icones.pcf
-thot/fonts/icones1.fb
-thot/fonts/icones11.fb
-@dirrm thot/amaya
-@dirrm thot/applis/bin
-@dirrm thot/applis
-@dirrm thot/config
-@dirrm thot/dicopar
-@dirrm thot/doc/Icons
-@dirrm thot/doc/amaya
-@dirrm thot/doc
-@dirrm thot/fonts
-@dirrm thot
+Amaya/applis/bin/print
+Amaya/config/XKeysymDB
+Amaya/config/amaya.keyboard
+Amaya/config/de-amayadialogue
+Amaya/config/de-amayamsg
+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
+Amaya/dicopar/clavier
+Amaya/dicopar/deutsch.ptn
+Amaya/dicopar/english.ptn
+Amaya/dicopar/espanol.ptn
+Amaya/dicopar/finish.ptn
+Amaya/dicopar/francais.ptn
+Amaya/dicopar/italiano.ptn
+Amaya/dicopar/nederl.ptn
+Amaya/dicopar/portug.ptn
+Amaya/dicopar/swedish.ptn
+Amaya/doc/Icons/Back.gif
+Amaya/doc/Icons/Browser.gif
+Amaya/doc/Icons/CacheMenu.gif
+Amaya/doc/Icons/ColorMenu.gif
+Amaya/doc/Icons/Editor.gif
+Amaya/doc/Icons/Forward.gif
+Amaya/doc/Icons/GeneralMenu.gif
+Amaya/doc/Icons/GeomMenu.gif
+Amaya/doc/Icons/Image.gif
+Amaya/doc/Icons/Link.gif
+Amaya/doc/Icons/NumList.gif
+Amaya/doc/Icons/Plugin.gif
+Amaya/doc/Icons/ProxyMenu.gif
+Amaya/doc/Icons/PublishMenu.gif
+Amaya/doc/Icons/SaveAs.gif
+Amaya/doc/Icons/SourceJava.gif
+Amaya/doc/Icons/Sources.gif
+Amaya/doc/Icons/amaya.gif
+Amaya/doc/Icons/background.gif
+Amaya/doc/Icons/bug.gif
+Amaya/doc/Icons/check.gif
+Amaya/doc/Icons/cross.gif
+Amaya/doc/Icons/css.gif
+Amaya/doc/Icons/doc48x.gif
+Amaya/doc/Icons/drapeau-F.gif
+Amaya/doc/Icons/eyec.gif
+Amaya/doc/Icons/find.gif
+Amaya/doc/Icons/floppy.gif
+Amaya/doc/Icons/left.gif
+Amaya/doc/Icons/opera.gif
+Amaya/doc/Icons/put.gif
+Amaya/doc/Icons/question.gif
+Amaya/doc/Icons/right.gif
+Amaya/doc/Icons/table.gif
+Amaya/doc/Icons/target.gif
+Amaya/doc/Icons/ui.gif
+Amaya/doc/Icons/up.gif
+Amaya/doc/Icons/warning.gif
+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/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
+Amaya/doc/amaya/Registry.html
+Amaya/doc/amaya/Searching.html
+Amaya/doc/amaya/Selecting.html
+Amaya/doc/amaya/SpellChecking.html
+Amaya/doc/amaya/StyleSheets.html
+Amaya/doc/amaya/Tables.html
+Amaya/doc/amaya/Transform.html
+Amaya/doc/amaya/Views.html
+Amaya/fonts/Families.list
+Amaya/fonts/fonts.dir
+Amaya/fonts/icones.ff
+Amaya/fonts/icones.pcf
+Amaya/fonts/icones1.fb
+Amaya/fonts/icones11.fb
+@dirrm Amaya/amaya
+@dirrm Amaya/applis/bin
+@dirrm Amaya/applis
+@dirrm Amaya/config
+@dirrm Amaya/dicopar
+@dirrm Amaya/doc/Icons
+@dirrm Amaya/doc/amaya
+@dirrm Amaya/doc
+@dirrm Amaya/fonts
+@dirrm Amaya