3 files changed, 134 insertions, 151 deletions

diff --git a/www/amaya/Makefile b/www/amaya/Makefile
index c771a00896e8..802377884725 100644
--- a/www/amaya/Makefile
+++ b/www/amaya/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	amaya
-# Version required:	1.4
+# Version required:	1.4a
 # Date created:		26 Dec 1998
 # Whom:			Don Croyle <croyle@gelemna.ft-wayne.in.us>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1999/01/10 18:54:23 steve Exp $
 #
 
-DISTNAME=	amaya-src-1.4
-PKGNAME=	amaya-1.4
+DISTNAME=	amaya-src-1.4a
+PKGNAME=	amaya-1.4a
 CATEGORIES= 	www
 MASTER_SITES=	http://www.w3.org/Amaya/Distribution/ \
 		ftp://ftp.w3.org/pub/amaya/ \
@@ -29,36 +29,12 @@ post-extract:
 	${MKDIR} ${WRKSRC}
 
 post-configure:
-	${SED} -e 's/CPP.*/CPP = cpp/' <${WRKSRC}/Options.orig\
-	 >${WRKSRC}/Options
+	${CP} ${WRKSRC}/Options.orig ${WRKSRC}/Options
 
 post-install:
 .for file in amaya print
-	strip ${PREFIX}/share/thot/applis/bin/${file}
+	strip ${PREFIX}/thot/applis/bin/${file}
 .endfor
-.for file in COPYRIGHT.html AmayaPage.html
-	${INSTALL_DATA} ${WRKSRC}/../amaya/${file} ${PREFIX}/share/thot/amaya/
-.endfor
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/thot/doc/Icons
-.for file in Back.gif Browser.gif Editor.gif Forward.gif Image.gif Link.gif\
-	 NumList.gif Plugin.gif SaveAs.gif SourceJava.gif Sources.gif\
-	 amaya.gif background.gif bug.gif check.gif cross.gif doc48x.gif\
-	 drapeau-F.gif eyec.gif find.gif floppy.gif left.gif opera.gif\
-	 put.gif question.gif right.gif target.gif ui.gif up.gif warning.gif
-	${INSTALL_DATA} ${WRKSRC}/../doc/Icons/${file}\
-	 ${PREFIX}/share/thot/doc/Icons/
-.endfor
-	${MKDIR} ${PREFIX}/share/thot/doc/amaya
-.for file in Creating.html MakeBook.html StyleSheets.html Manual.html\
-	 Tables.html Math.html Registry.html Transform.html Attributes.html\
-	 New.html Views.html Autoconf.html ImageMaps.html Numbering.html\
-	 Searching.html BinDist.html Selecting.html Browsing.html CSS.html\
-	 Plugins.html Keyboard.html Printing.html Changing.html\
-	 Publishing.html Configure.html Links.html Put.html SpellChecking.html
-	${INSTALL_DATA} ${WRKSRC}/../doc/amaya/${file}\
-	 ${PREFIX}/share/thot/doc/amaya/
-.endfor
-.endif
+	${INSTALL_DATA} ${WRKSRC}/../amaya/COPYRIGHT.html ${PREFIX}/thot/amaya/
 
 .include <bsd.port.mk>
diff --git a/www/amaya/distinfo b/www/amaya/distinfo
index cab5a476e42b..16c4eaa1730c 100644
--- a/www/amaya/distinfo
+++ b/www/amaya/distinfo
@@ -1 +1 @@
-MD5 (amaya-src-1.4.tar.gz) = 1277565db82caeedf1ddf60abe3f3f59
+MD5 (amaya-src-1.4a.tar.gz) = e2d795ffb6a010a275dc3aa2f82f15f3
diff --git a/www/amaya/pkg-plist b/www/amaya/pkg-plist
index 43300e21bb78..de424343a9c3 100644
--- a/www/amaya/pkg-plist
+++ b/www/amaya/pkg-plist
@@ -1,121 +1,128 @@
-share/thot/amaya/AmayaPage.html
-share/thot/amaya/COPYRIGHT.html
-share/thot/amaya/HTML.STR
-share/thot/amaya/HTML.conf
-share/thot/amaya/HTML.en
-share/thot/amaya/HTML.fr
-share/thot/amaya/HTML.trans
-share/thot/amaya/HTMLP.PRS
-share/thot/amaya/HTMLPBW.PRS
-share/thot/amaya/HTMLPLP.PRS
-share/thot/amaya/HTMLPLPUS.PRS
-share/thot/amaya/HTMLPP.PRS
-share/thot/amaya/HTMLPPUS.PRS
-share/thot/amaya/HTMLT.TRA
-share/thot/amaya/HTMLTT.TRA
-share/thot/amaya/HTMLTX.TRA
-share/thot/applis/bin/amaya
+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
 @exec ln -sf %D%F %D/bin/amaya
 @unexec rm -f %D/bin/amaya
-share/thot/applis/bin/print
-share/thot/config/XKeysymDB
-share/thot/config/amaya.keyboard
-share/thot/config/en-amayadialogue
-share/thot/config/en-amayamsg
-share/thot/config/en-corrdialogue
-share/thot/config/en-libdialogue
-share/thot/config/en-printdialogue
-share/thot/config/en-transdialogue
-share/thot/config/fr-amayadialogue
-share/thot/config/fr-amayamsg
-share/thot/config/fr-corrdialogue
-share/thot/config/fr-libdialogue
-share/thot/config/fr-printdialogue
-share/thot/config/fr-transdialogue
-share/thot/config/thot.ini
-share/thot/dicopar/alphabet
-share/thot/dicopar/american.ptn
-share/thot/dicopar/clavier
-share/thot/dicopar/deutsch.ptn
-share/thot/dicopar/english.ptn
-share/thot/dicopar/espanol.ptn
-share/thot/dicopar/finish.ptn
-share/thot/dicopar/francais.ptn
-share/thot/dicopar/italiano.ptn
-share/thot/dicopar/nederl.ptn
-share/thot/dicopar/portug.ptn
-share/thot/dicopar/swedish.ptn
-share/thot/doc/Icons/Back.gif
-share/thot/doc/Icons/Browser.gif
-share/thot/doc/Icons/Editor.gif
-share/thot/doc/Icons/Forward.gif
-share/thot/doc/Icons/Image.gif
-share/thot/doc/Icons/Link.gif
-share/thot/doc/Icons/NumList.gif
-share/thot/doc/Icons/Plugin.gif
-share/thot/doc/Icons/SaveAs.gif
-share/thot/doc/Icons/SourceJava.gif
-share/thot/doc/Icons/Sources.gif
-share/thot/doc/Icons/amaya.gif
-share/thot/doc/Icons/background.gif
-share/thot/doc/Icons/bug.gif
-share/thot/doc/Icons/check.gif
-share/thot/doc/Icons/cross.gif
-share/thot/doc/Icons/doc48x.gif
-share/thot/doc/Icons/drapeau-F.gif
-share/thot/doc/Icons/eyec.gif
-share/thot/doc/Icons/find.gif
-share/thot/doc/Icons/floppy.gif
-share/thot/doc/Icons/left.gif
-share/thot/doc/Icons/opera.gif
-share/thot/doc/Icons/put.gif
-share/thot/doc/Icons/question.gif
-share/thot/doc/Icons/right.gif
-share/thot/doc/Icons/target.gif
-share/thot/doc/Icons/ui.gif
-share/thot/doc/Icons/up.gif
-share/thot/doc/Icons/warning.gif
-share/thot/doc/amaya/Attributes.html
-share/thot/doc/amaya/Autoconf.html
-share/thot/doc/amaya/BinDist.html
-share/thot/doc/amaya/Browsing.html
-share/thot/doc/amaya/CSS.html
-share/thot/doc/amaya/Changing.html
-share/thot/doc/amaya/Configure.html
-share/thot/doc/amaya/Creating.html
-share/thot/doc/amaya/ImageMaps.html
-share/thot/doc/amaya/Keyboard.html
-share/thot/doc/amaya/Links.html
-share/thot/doc/amaya/MakeBook.html
-share/thot/doc/amaya/Manual.html
-share/thot/doc/amaya/Math.html
-share/thot/doc/amaya/New.html
-share/thot/doc/amaya/Numbering.html
-share/thot/doc/amaya/Plugins.html
-share/thot/doc/amaya/Printing.html
-share/thot/doc/amaya/Publishing.html
-share/thot/doc/amaya/Put.html
-share/thot/doc/amaya/Registry.html
-share/thot/doc/amaya/Searching.html
-share/thot/doc/amaya/Selecting.html
-share/thot/doc/amaya/SpellChecking.html
-share/thot/doc/amaya/StyleSheets.html
-share/thot/doc/amaya/Tables.html
-share/thot/doc/amaya/Transform.html
-share/thot/doc/amaya/Views.html
-share/thot/fonts/Families.list
-share/thot/fonts/fonts.dir
-share/thot/fonts/icones.ff
-share/thot/fonts/icones.pcf
-share/thot/fonts/icones1.fb
-share/thot/fonts/icones11.fb
-@dirrm share/thot/amaya
-@dirrm share/thot/applis/bin
-@dirrm share/thot/applis
-@dirrm share/thot/config
-@dirrm share/thot/dicopar
-@dirrm share/thot/doc/Icons
-@dirrm share/thot/doc/amaya
-@dirrm share/thot/doc
-@dirrm share/thot/fonts
-@dirrm share/thot
+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