o Upgrade to Amaya 5.1

o Add gtk flavor, don't build it yet in www/amaya/Makefile until some scrollbar dysfunctionality is fixed. o Build amaya against system versions of: jpeg, png, zlib, expat, md5; some of the patches for this come from FreeBSD o Add HOMEPAGE o Unify dictionary installation to a common $frag (a bunch of dictionaries will be imported later separately) o Take over maintainer; ok naddy@ o Fix missing trailing slash in MASTER_SITES
2001-10-02 20:18:59 +00:00 · 2001-10-02 20:18:59 +00:00 · 2bce4338c2
commit 2bce4338c2
parent aaceb3cc70
22 changed files with 808 additions and 27 deletions
--- a/www/amaya/Makefile.inc
+++ b/www/amaya/Makefile.inc
@ -1,11 +1,11 @@
-# $OpenBSD: Makefile.inc,v 1.4 2001/07/13 11:24:52 naddy Exp $
+# $OpenBSD: Makefile.inc,v 1.5 2001/10/02 20:18:59 heko Exp $

 DIST_SUBDIR?=			amaya
 CATEGORIES?=			www

 EXTRACT_SUFX?=			.tgz

-MAINTAINER?=			Bruno Rohee <rohee@openbsd.org>
+MAINTAINER?=			Heikki Korpela <heko@openbsd.org>

 PERMIT_PACKAGE_CDROM?=		Yes
 PERMIT_PACKAGE_FTP?=		Yes
@ -14,5 +14,11 @@ PERMIT_DISTFILES_FTP?=		Yes

 MASTER_SITES?=			http://www.w3.org/Amaya/Distribution/ \
 				ftp://ftp.w3.org/pub/amaya/ \
-				ftp://mirror.aarnet.edu.au/pub/amaya \
-            			ftp://ftp.funet.fi/pub/mirrors/ftp.w3.org/pub/afs/w3.org/ftp/pub/amaya
+				ftp://mirror.aarnet.edu.au/pub/amaya/ \
+            			ftp://ftp.funet.fi/pub/mirrors/ftp.w3.org/pub/afs/w3.org/ftp/pub/amaya/
+
+DICT_RUN_DEPENDS?=		${PREFIX}/bin/amaya:amaya-*:www/amaya/browser
+
+dict_install_frag=	\
+	${INSTALL_DATA_DIR} ${PREFIX}/Amaya/dicopar; \
+	${INSTALL_DATA} ${WRKDIR}/${DICNAME}.dic ${PREFIX}/Amaya/dicopar
--- a/www/amaya/browser/Makefile
+++ b/www/amaya/browser/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2001/09/28 06:02:15 pvalchev Exp $
+# $OpenBSD: Makefile,v 1.8 2001/10/02 20:18:59 heko Exp $
 # Original from: Bruno Rohee <rohee@OpenBSD.ORG>
 #
 # Many variables moved to ../Makefile.inc
@ -6,27 +6,65 @@

 COMMENT=		"test-bed browser/authoring tool of the W3C"

-AMAYA_VERSION=		3.2.1
+AMAYA_VERSION=		5.1
 DISTNAME=		amaya-src-${AMAYA_VERSION}
 PKGNAME=		amaya-${AMAYA_VERSION}

-NEED_VERSION=		1.402
+HOMEPAGE=		http://www.w3.org/Amaya/
+
+NEED_VERSION=		1.454
+
+FLAVORS=		motif gtk
+FLAVOR?=		motif
+
+LIB_DEPENDS+=	 	expat.2::textproc/expat
+
+.if ${FLAVOR:L} == "gtk"
+
+CONFIGURE_ARGS+=	--with-gtk=${LOCALBASE}
+# I'm too lazy to write a proper imlib autoconf test.
+LIB_DEPENDS+=		gdk_imlib.19::graphics/imlib
+
+.elif ${FLAVOR:L} == "motif"

 USE_MOTIF=		any
+LIB_DEPENDS+=		jpeg.62::graphics/jpeg \
+			png.2::graphics/png 
+CONFIGURE_ARGS+=	--without-gtk \
+			--with-motif-includes=${LOCALBASE}/include \
+			--with-motif-libraries=${LOCALBASE}/lib
+
+.else
+ERRORS+=		"Fatal: Conflicting or missing flavor: '${FLAVOR}'"
+.endif

 WRKSRC=			${WRKDIR}/Amaya
-WRKBUILD=		${WRKSRC}/obj
+WRKBUILD=		${WRKDIR}/Amaya/obj
+WRKDIST=		${WRKDIR}

 USE_GMAKE=		Yes
-CONFIGURE_STYLE=	gnu dest
+CONFIGURE_STYLE=	autoconf dest
 MODGNU_CONFIG_GUESS_DIRS=	${WRKSRC} ${WRKSRC}/../libwww/config
 CONFIGURE_SCRIPT=	../configure
+CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
+			LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS+=	--without-graphic-libs

+# We need to regenerate configure in two places, Amaya/ and libwww/
+AUTOCONF_DIR=		${WRKSRC}
+post-patch:
+	@cd ${WRKDIST}/libwww && exec ${SETENV} \
+		${AUTOCONF_ENV} ${AUTOCONF}
+
+post-configure:
+	@cd ${WRKBUILD} && cp Options.orig Options
+	
 pre-install:
 	${STRIP} ${WRKBUILD}/bin/amaya
 	${STRIP} ${WRKBUILD}/bin/print

 post-install:
-	cd ${PREFIX}/bin; rm amaya; ln -s ${TRUEPREFIX}/Amaya/applis/bin/amaya
+	cd ${PREFIX}/bin; rm amaya; \
+		ln -s ${TRUEPREFIX}/Amaya/applis/bin/amaya

 .include <bsd.port.mk>
--- a/www/amaya/browser/files/md5
+++ b/www/amaya/browser/files/md5
@ -1,3 +1,3 @@
-MD5 (amaya/amaya-src-3.2.1.tgz) = 4b9ab0be44413dd35790bafb8d43737a
-RMD160 (amaya/amaya-src-3.2.1.tgz) = 25f5a2464d3a225b27f18f731c158ef041559d14
-SHA1 (amaya/amaya-src-3.2.1.tgz) = cab6040e12c6ddf17667789c8ae01ddaa6b49f2c
+MD5 (amaya/amaya-src-5.1.tgz) = 04c792debcd1aee79300cfbe3b37ba95
+RMD160 (amaya/amaya-src-5.1.tgz) = 2964bcda85a8b9cacbb92416405acb6523c7aece
+SHA1 (amaya/amaya-src-5.1.tgz) = fe032cce47ed3979606d43bd21e10c2d41d6e05b
--- a/www/amaya/browser/patches/patch-Amaya_Makefile_in
+++ b/www/amaya/browser/patches/patch-Amaya_Makefile_in
@ -0,0 +1,82 @@
+$OpenBSD: patch-Amaya_Makefile_in,v 1.1 2001/10/02 20:18:59 heko Exp $
+--- Amaya/Makefile.in.orig	Mon Jun 25 17:14:52 2001
+++ Amaya/Makefile.in	Tue Oct  2 02:01:04 2001
+@@ -181,61 +181,22 @@ libwww_config : force
+ 	  if [ ! -f Makefile -o ! -f wwwconf.h ] ; then \
+ 	  	$$libwwwdir/configure \
+ 			--disable-shared \
+-			--with-zlib="$$localdir/libz.a"; \
+			--with-zlib \
+			--with-expat \
+			--with-md5; \
+ 		$(ECHO) "libwww is configured" ; \
+ 	  fi)
+ 
+-libwww_make_module_md5 \
+-libmd5 : force
+-		@(localdir=`pwd`; \
+-		 zlibsrcdir="$$localdir/../libpng/zlib"; \
+-		 cd $(LIBWWW)/modules/md5 ; \
+-		 $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS) $(EXPAT_OPTIONS)" \
+-		 CPPFLAGS="$(CPPFLAGS) -I$$zlibsrcdir" \
+-	        	    libmd5.la)
+-
+-libwww_install_module_md5 : force
+-		@(if [ -e libmd5.a -a ! -L libmd5.a ] ; then \
+-			$(RM) libmd5.a ; \
+-		  fi ; \
+-		  if [ ! -L libmd5.a ] ; then \
+-			$(LN_S) $(LIBWWW)/modules/md5/.libs/libmd5.a ./libmd5.a ; \
+-		  fi)
+-
+-libwww_make_module_expat \
+-libexpat : force
+-		@(localdir=`pwd`; \
+-		  cd $(LIBWWW)/modules/expat/ ; \
+-		  $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS) $(EXPAT_OPTIONS) -DXML_AMAYA" \
+-		  CPPFLAGS="$(CPPFLAGS)" \
+-	        	    )
+-
+-libwww_install_module_expat : force
+-		@(if [ -e libxmlparse.a -a ! -L libxmlparse.a ] ; then \
+-			$(RM) libxmlparse.a ; \
+-		  fi ; \
+-		  if [ ! -L libxmlparse.a ] ; then \
+-			$(LN_S) $(LIBWWW)/modules/expat/xmlparse/.libs/libxmlparse.a ./libxmlparse.a ; \
+-		  fi)
+-		@(if [ -e libxmltok.a -a ! -L libxmltok.a ] ; then \
+-			$(RM) libxmltok.a ; \
+-		  fi ; \
+-		  if [ ! -L libxmltok.a ] ; then \
+-			$(LN_S) $(LIBWWW)/modules/expat/xmltok/.libs/libxmltok.a ./libxmltok.a ; \
+-		  fi)
+-
+-
+ libwww_make_standard_libs \
+ $(AMAYA_LIBWWW_STANDARD_LIBS) : force
+ 		@(localdir=`pwd`; \
+-		  zlibsrcdir="$$localdir/../libpng/zlib"; \
+ 		  all_libs="" ; \
+ 		  for lib in $(AMAYA_LIBWWW_STANDARD_LIBS) ; do \
+ 		      all_libs="$$all_libs $$lib.la" ; \
+ 		   done ; \
+ 		  cd $(LIBWWW)/Library/src ; \
+ 		  $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS) $(EXPAT_OPTIONS)" \
+-		  CPPFLAGS="$(CPPFLAGS) -I$$zlibsrcdir" \
+		  CPPFLAGS="$(CPPFLAGS)" \
+ 			     $$all_libs)
+ 
+ libwww_install_standard : force
+@@ -248,10 +209,8 @@ libwww_install_standard : force
+ 		    fi ; \
+ 		done)
+ 
+-libwww_make_module_libs : libwww_make_module_md5 libwww_make_module_expat
+-libwww_make : libwww_make_module_libs libwww_make_standard_libs
+-libwww_install_modules : libwww_install_module_md5 libwww_install_module_expat
+-libwww_install : libwww_install_modules libwww_install_standard 
+libwww_make : libwww_make_standard_libs
+libwww_install : libwww_install_standard 
+ 
+ libwww : libwww_config libwww_make
+ 		@($(ECHO) "libwww is installed")
--- a/www/amaya/browser/patches/patch-Amaya_Options_in
+++ b/www/amaya/browser/patches/patch-Amaya_Options_in
@ -0,0 +1,23 @@
+$OpenBSD: patch-Amaya_Options_in,v 1.1 2001/10/02 20:18:59 heko Exp $
+--- Amaya/Options.in.orig	Sun Sep 16 00:04:01 2001
+++ Amaya/Options.in	Sun Sep 16 00:04:29 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 @@ RANLIB	= @RANLIB@
+ DIFF	= @DIFF@
+ INSTALL	= @INSTALL@
+ 
+-INSTALL_DATA= $(INSTALL) -m 444
+-INSTALL_BIN= $(INSTALL) -m 755
+INSTALL_DATA=@INSTALL_DATA@
+INSTALL_BIN=@INSTALL_PROGRAM@
+ 
+ CEXTRACT_FLAGS=@CEXTRACT_FLAGS@
+ 
--- a/www/amaya/browser/patches/patch-Amaya_amaya_Makefile_in
+++ b/www/amaya/browser/patches/patch-Amaya_amaya_Makefile_in
@ -0,0 +1,12 @@
+$OpenBSD: patch-Amaya_amaya_Makefile_in,v 1.1 2001/10/02 20:18:59 heko Exp $
+--- Amaya/amaya/Makefile.in.orig	Sun Sep 16 00:59:53 2001
+++ Amaya/amaya/Makefile.in	Sun Sep 16 01:00:10 2001
+@@ -159,7 +159,7 @@ AMAYA_OPTION_SCHEMAS= $(AMAYA_PLUGIN_SCH
+ 
+ AMAYA_INCLUDES= -I. -I.. -I@top_srcdir@/thotlib/include -I@srcdir@ \
+ 		-I@srcdir@/f -I@srcdir@/xpm \
+-                -I@top_srcdir@/libpng/zlib $(AMAYA_OPTION_INCLUDES)
+                $(AMAYA_OPTION_INCLUDES)
+ 
+ AMAYA_LIBS= ../thotlib/libThotEditor.a ../tablelib/libThotTable.a \
+             libCSS.a $(AMAYA_OPTION_LIBS) \
--- a/www/amaya/browser/patches/patch-Amaya_amaya_Makefile_libwww
+++ b/www/amaya/browser/patches/patch-Amaya_amaya_Makefile_libwww
@ -0,0 +1,44 @@
+$OpenBSD: patch-Amaya_amaya_Makefile_libwww,v 1.1 2001/10/02 20:18:59 heko Exp $
+--- Amaya/amaya/Makefile.libwww.orig	Tue Aug 29 19:18:03 2000
+++ Amaya/amaya/Makefile.libwww	Tue Oct  2 02:02:01 2001
+@@ -34,23 +34,30 @@ AMAYA_LIBWWW_LIBS= \
+ 			-lwwwutils \
+ 			-lwwwzip \
+ 			-lwwwftp \
+-		-L../$(LIBWWW)/modules/md5/.libs \
+-			-lmd5 \
+-		-L../$(LIBWWW)/modules/expat/xmlparse/.libs \
+-			-lxmlparse \
+-		-L../$(LIBWWW)/modules/expat/xmltok/.libs \
+-			-lxmltok
+			-lexpat
+			
+# OpenBSD has md5 in -lc
+# 		-L../$(LIBWWW)/modules/md5/.libs \
+# 			-lmd5 \
+# Use expat-1.95.1 port
+#		-L../$(LIBWWW)/modules/expat/xmlparse/.libs \
+#			-lxmlparse \
+#		-L../$(LIBWWW)/modules/expat/xmltok/.libs \
+#			-lxmltok
+ 
+ AMAYA_LIBWWW_EXTRA_LIBS=
+ 
+ AMAYA_LIBWWW_INCLUDES= -I../libwww \
+ 		-I$(THOTDIR)/../libwww/Library/src \
+-		-I$(THOTDIR)../libwww/modules/md5 \
+-		-I$(THOTDIR)../libwww/modules/expat/xmlparse \
+-		-I$(THOTDIR)../libwww/modules/expat/xmltok
+ 
+# Use installed expat && md5
+# 		-I$(THOTDIR)../libwww/modules/md5 \
+# 		-I$(THOTDIR)../libwww/modules/expat/xmlparse \
+# 		-I$(THOTDIR)../libwww/modules/expat/xmltok
+
+		
+ # this dependency calls the ../Makefile rule that compiles libwww
+-AMAYA_LIBWWW_SRC= ../libz.a amaya_comp_libwww
+AMAYA_LIBWWW_SRC= amaya_comp_libwww
+ 
+ amaya_comp_libwww : force
+ 		@(cd .. ; $(MAKE) libwww)
--- a/www/amaya/browser/patches/patch-Amaya_annotlib_Makefile_in
+++ b/www/amaya/browser/patches/patch-Amaya_annotlib_Makefile_in
@ -0,0 +1,12 @@
+$OpenBSD: patch-Amaya_annotlib_Makefile_in,v 1.1 2001/10/02 20:18:59 heko Exp $
+--- Amaya/annotlib/Makefile.in.orig	Thu Apr  5 13:49:33 2001
+++ Amaya/annotlib/Makefile.in	Tue Oct  2 02:54:22 2001
+@@ -16,8 +16,6 @@ INCLUDES= -DHAVE_CONFIG_H -DANNOTATIONS 
+ 	  -I.. -I../amaya  -I@srcdir@/f -I@top_srcdir@/amaya \
+ 	  -I@top_srcdir@/amaya/f -I../libwww \
+ 	  -I@top_srcdir@/../libwww/Library/src \
+-	  -I@top_srcdir@/../libwww/modules/expat/xmlparse \
+-	  -I@top_srcdir@/../libwww/modules/expat/xmltok \
+ 	   @THOTINCLUDES@ $(X_FLAGS)
+ 
+ 
--- a/www/amaya/browser/patches/patch-Amaya_configure_in
+++ b/www/amaya/browser/patches/patch-Amaya_configure_in
@ -0,0 +1,120 @@
+$OpenBSD: patch-Amaya_configure_in,v 1.1 2001/10/02 20:18:59 heko Exp $
+--- Amaya/configure.in.orig	Tue Jul  3 14:23:50 2001
+++ Amaya/configure.in	Fri Sep 14 07:06:06 2001
+@@ -232,43 +232,32 @@ AC_FUNC_VPRINTF
+ AC_CHECK_FUNCS(getcwd gethostname gettimeofday getwd mkdir mktime putenv select socket strdup strerror strftime strstr strtod strtol uname lstat strcasecmp strncasecmp strchr memcpy)
+ 
+ GTK_OPTIONS=
+-AC_ARG_WITH(gtk, [  --with-gtk              use GTK instead of Motif])
+-if test "$withval" = "yes" ; then
+-  for ac_dir in               \
+-    /usr/lib/glib/include     \
+-    /usr/X11R6/include        \
+-                              \
+-    /usr/include/X11R6        \
+-    /usr/local/X11R6/include  \
+-    /usr/local/include/X11R6  \
+-                              \
+-    /usr/X11/include          \
+-    /usr/include/X11          \
+-    /usr/local/X11/include    \
+-    /usr/local/include/X11    \
+-                              \
+-    /usr/X386/include         \
+-    /usr/x386/include         \
+-    /usr/XFree86/include/X11  \
+-    /usr/dt/include           \
+-    /usr/include              \
+-    /usr/local/include        \
+-    /usr/local/lib/glib/include  \
+-    ; \
+-  do
+-    if test -r "$ac_dir/gdk/gdk.h"; then
+-      no_gtk= ac_gtk_includes=$ac_dir
+-      break
+-    fi
+-  done
+
+motif_includes_with=
+AC_ARG_WITH(motif-includes,
+[  --with-motif-includes=DIR
+                          Motif include files are in DIR],
+motif_includes_with="$withval")
+motif_libraries_with=
+AC_ARG_WITH(motif-libraries,
+[  --with-motif-libraries=DIR
+                          Motif libraries are in DIR],
+motif_libraries_with="$withval")
+
+AC_ARG_WITH(gtk, [  --with-gtk              use GTK instead of Motif],
+	use_gtk="$withval")
+no_gtk=yes
+if test "$use_gtk" != "no" ; then
+ 
+ GTK_INCLUDES="`gtk-config --cflags`"
+ AC_SUBST(GTK_INCLUDES)
+ GTK_LIBRARIES="`gtk-config --libs` -lgdk_imlib -ltiff -lgif"
+ AC_SUBST(GTK_LIBRARIES)
+ GTK_OPTIONS=-D_GTK
+  no_gtk=no
+   no_motif=yes
+ else
+
+ dnl
+ dnl Checking for Motif libraries and includes
+ dnl
+@@ -281,6 +270,7 @@ AC_DEFUN(AC_PATH_MOTIF_DIRECT,
+ test -z "$motif_direct_test_function" && motif_direct_test_function=XmCreatePushButton
+ test -z "$motif_direct_test_include" && motif_direct_test_include=Xm/Xm.h
+   for ac_dir in               \
+    $motif_includes_with      \
+     /usr/include/Motif1.2     \
+     /usr/Motif1.2/include     \
+                               \
+@@ -335,6 +325,7 @@ ac_save_LIBS="$LIBS"
+ LIBS="-l$motif_direct_test_library $LIBS"
+ # First see if replacing the include by lib works.
+ for ac_dir in `echo "$ac_motif_includes" | sed s/include/lib/` \
+    $motif_libraries_with \
+     /usr/lib/Motif1.2     \
+     /usr/Motif1.2/lib     \
+                           \
+@@ -744,21 +735,23 @@ if test "$build_amaya" = "yes" ; then
+     fi
+ fi
+ 
+-if test "$no_motif" = yes ; then
+-    echo "Motif seems not installed on this machine"
+-    echo "Amaya need Motif 1.2 or 2.0"
+-else
+-if test "$motif_includes" = "" ; then
+-    echo "Motif includes were not found"
+-    echo "Amaya might not compile"
+-    echo "Edit your Option file"
+-else
+-if test "$motif_libraries" = "" ; then
+-    echo "Motif libraries were not found"
+-    echo "Amaya might not compile"
+-    echo "Edit your Option file"
+-fi
+-fi
+if test "$no_gtk" = yes ; then
+	if test "$no_motif" = yes ; then
+	    echo "Motif seems not installed on this machine"
+	    echo "Amaya need Motif 1.2 or 2.0"
+	else
+	if test "$motif_includes" = "" ; then
+	    echo "Motif includes were not found"
+	    echo "Amaya might not compile"
+	    echo "Edit your Option file"
+	else
+	if test "$motif_libraries" = "" ; then
+	    echo "Motif libraries were not found"
+	    echo "Amaya might not compile"
+	    echo "Edit your Option file"
+	fi
+	fi
+	fi
+ fi
+ 
+ echo "Now start \"make all\" (GNU make preferably) to build the bianries"
--- a/www/amaya/browser/patches/patch-Amaya_thotlib_include_ustring_h
+++ b/www/amaya/browser/patches/patch-Amaya_thotlib_include_ustring_h
@ -0,0 +1,14 @@
+$OpenBSD: patch-Amaya_thotlib_include_ustring_h,v 1.1 2001/10/02 20:18:59 heko Exp $
+--- Amaya/thotlib/include/ustring.h.orig	Wed May 30 17:50:22 2001
+++ Amaya/thotlib/include/ustring.h	Thu Sep 13 01:44:27 2001
+@@ -5,7 +5,10 @@
+ #ifdef _WINDOWS
+ #include <windows.h>
+ #endif /* _WINDOWS */
+/* OpenBSD does not have ISO C99 conformant multibyte character library */
+#ifndef __OpenBSD__
+ #include <wchar.h>
+#endif /* __OpenBSD__ */
+ 
+ #ifdef _WINDOWS
+ #define strncasecmp _strnicmp
--- a/www/amaya/browser/patches/patch-libwww_Library_src_HTXML_h
+++ b/www/amaya/browser/patches/patch-libwww_Library_src_HTXML_h
@ -0,0 +1,12 @@
+$OpenBSD: patch-libwww_Library_src_HTXML_h,v 1.1 2001/10/02 20:18:59 heko Exp $
+--- libwww/Library/src/HTXML.h.orig	Thu Dec 21 18:26:29 2000
+++ libwww/Library/src/HTXML.h	Tue Oct  2 03:24:42 2001
+@@ -36,7 +36,7 @@ details. Thanks so much to John Punin fo
+ #include "SGML.h"
+ #endif /* HT_STRUCT_XML_STREAM */
+ 
+-#include <xmlparse.h>
+#include <expat.h>
+ 
+ /*
+ .
--- a/www/amaya/browser/patches/patch-libwww_Library_src_Makefile_am
+++ b/www/amaya/browser/patches/patch-libwww_Library_src_Makefile_am
@ -0,0 +1,35 @@
+$OpenBSD: patch-libwww_Library_src_Makefile_am,v 1.1 2001/10/02 20:18:59 heko Exp $
+--- libwww/Library/src/Makefile.am.orig	Mon Mar  6 09:58:50 2000
+++ libwww/Library/src/Makefile.am	Tue Oct  2 02:53:32 2001
+@@ -250,9 +250,6 @@ libwwwhttp_la_SOURCES = \
+ 	HTPEP.h \
+ 	HTPEP.c
+ 
+-libwwwhttp_la_DEPENDENCIES = \
+-	../../modules/md5/libmd5.la
+-
+ libwwwnews_la_SOURCES = \
+ 	WWWNews.h \
+ 	HTNDir.h \
+@@ -354,10 +351,6 @@ libwwwxml_la_SOURCES = \
+ 	HTXML.h \
+ 	HTXML.c
+ 
+-libwwwxml_la_DEPENDENCIES = \
+-	../../modules/expat/xmltok/libxmltok.la \
+-	../../modules/expat/xmlparse/libxmlparse.la
+-
+ libwwwxml_la_LDFLAGS = -rpath $(libdir)
+ 
+ libwwwzip_la_SOURCES = \
+@@ -379,9 +372,7 @@ libwwwsql_la_SOURCES = \
+ libwwwsql_la_LDFLAGS = -rpath $(libdir)
+ 
+ INCLUDES = \
+-	-I/usr/local/include \
+-	-I${top_srcdir}/modules/md5 \
+-	-I${top_srcdir}/modules/expat/xmlparse
+	-I/usr/local/include 
+ 
+ BUILT_SOURCES = \
+ 	wwwsys.h \
--- a/www/amaya/browser/patches/patch-libwww_Library_src_Makefile_in
+++ b/www/amaya/browser/patches/patch-libwww_Library_src_Makefile_in
@ -0,0 +1,60 @@
+$OpenBSD: patch-libwww_Library_src_Makefile_in,v 1.1 2001/10/02 20:18:59 heko Exp $
+--- libwww/Library/src/Makefile.in.orig	Fri Sep 15 18:45:58 2000
+++ libwww/Library/src/Makefile.in	Tue Oct  2 02:53:48 2001
+@@ -1,6 +1,6 @@
+-# Makefile.in generated automatically by automake 1.4 from Makefile.am
+# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -170,9 +170,6 @@ libwwwmime_la_SOURCES =  	WWWMIME.h 	HTB
+ libwwwhttp_la_SOURCES =  	WWWHTTP.h 	HTTPUtil.h 	HTAABrow.h 	HTAABrow.c 	HTAAUtil.h 	HTAAUtil.c 	HTCookie.h 	HTCookie.c 	HTDigest.h 	HTDigest.c 	HTTChunk.h 	HTTChunk.c 	HTTP.h 	HTTP.c 	HTTPGen.h 	HTTPGen.c 	HTTPReq.h 	HTTPReq.c 	HTTPRes.h 	HTTPRes.c 	HTTPServ.h 	HTTPServ.c 	HTPEP.h 	HTPEP.c
+ 
+ 
+-libwwwhttp_la_DEPENDENCIES =  	../../modules/md5/libmd5.la
+-
+-
+ libwwwnews_la_SOURCES =  	WWWNews.h 	HTNDir.h 	HTNDir.c 	HTNews.h 	HTNews.c 	HTNewsLs.h 	HTNewsLs.c 	HTNewsRq.h 	HTNewsRq.c
+ 
+ 
+@@ -202,9 +199,6 @@ libwwwmux_la_SOURCES =  	WWWMux.h 	HTDem
+ libwwwxml_la_SOURCES =  	WWWXML.h 	HTRDF.h 	HTRDF.c 	HTXML.h 	HTXML.c
+ 
+ 
+-libwwwxml_la_DEPENDENCIES =  	../../modules/expat/xmltok/libxmltok.la 	../../modules/expat/xmlparse/libxmlparse.la
+-
+-
+ libwwwxml_la_LDFLAGS = -rpath $(libdir)
+ 
+ libwwwzip_la_SOURCES =  	WWWZip.h 	HTZip.h 	HTZip.h 	HTZip.c
+@@ -217,7 +211,7 @@ libwwwsql_la_SOURCES =  	WWWSQL.h 	HTSQL
+ 
+ libwwwsql_la_LDFLAGS = -rpath $(libdir)
+ 
+-INCLUDES =  	-I/usr/local/include 	-I${top_srcdir}/modules/md5 	-I${top_srcdir}/modules/expat/xmlparse
+INCLUDES =  	-I/usr/local/include 
+ 
+ 
+ BUILT_SOURCES =  	wwwsys.h 	HTAABrow.h 	HTAAUtil.h 	HTANSI.h 	HTAccess.h 	HTAlert.h 	HTAncMan.h 	HTAnchor.h 	HTArray.h 	HTAssoc.h 	HTAtom.h 	HTBInit.h 	HTBTree.h 	HTBind.h 	HTBind.h 	HTBound.h 	HTBufWrt.h 	HTCache.h 	HTChannl.h 	HTChunk.h 	HTConLen.h 	HTCookie.h 	HTDNS.h 	HTDemux.h 	HTDescpt.h 	HTDialog.h 	HTDigest.h 	HTDir.h 	HTEPtoCl.h 	HTError.h 	HTEscape.h 	HTEvent.h 	HTEvtLst.h 	HTFSave.h 	HTFTP.h 	HTFTPDir.h 	HTFWrite.h 	HTFile.h 	HTFilter.h 	HTFormat.h 	HTGopher.h 	HTGuess.h 	HTHInit.h 	HTHash.h 	HTHeader.h 	HTHist.h 	HTHome.h 	HTHost.h 	HTHstMan.h 	HTIOStream.h 	HTIcons.h 	HTInet.h 	HTInit.h 	HTLib.h 	HTLink.h 	HTList.h 	HTLocal.h 	HTLog.h 	HTMIME.h 	HTMIMERq.h 	HTMIMImp.h 	HTMIMPrs.h 	HTML.h 	HTMLGen.h 	HTMLPDTD.h 	HTMemLog.h 	HTMemory.h 	HTMerge.h 	HTMethod.h 	HTMulpar.h 	HTMulti.h 	HTMuxCh.h 	HTMuxHeader.h 	HTMuxTx.h 	HTNDir.h 	HTNet.h 	HTNetMan.h 	HTNetTxt.h 	HTNews.h 	HTNewsLs.h 	HTNewsRq.h 	HTNoFree.h 	HTPEP.h 	HTParse.h 	HTPlain.h 	HTProfil.h 	HTProt.h 	HTProxy.h 	HTRDF.h 	HTReader.h 	HTReq.h 	HTReqMan.h 	HTResMan.h 	HTResponse.h 	HTRules.h 	HTSChunk.h 	HTSQL.h 	HTSQLLog.h 	HTSocket.h 	HTStream.h 	HTString.h 	HTStruct.h 	HTStyle.h 	HTTCP.h 	HTTChunk.h 	HTTP.h 	HTTPGen.h 	HTTPReq.h 	HTTPRes.h 	HTTPServ.h 	HTTPUtil.h 	HTTeXGen.h 	HTTee.h 	HTTelnet.h 	HTTimer.h 	HTTrans.h 	HTUTree.h 	HTUU.h 	HTUser.h 	HTUtils.h 	HTWAIS.h 	HTWSRC.h 	HTWWWStr.h 	HTWriter.h 	HTXML.h 	HTXParse.h 	HTZip.h 	HText.h 	HTextImp.h 	SGML.h 	WWWApp.h 	WWWCache.h 	WWWCore.h 	WWWDir.h 	WWWFTP.h 	WWWFile.h 	WWWGophe.h 	WWWHTML.h 	WWWHTTP.h 	WWWInit.h 	WWWLib.h 	WWWMIME.h 	WWWMux.h 	WWWNews.h 	WWWSQL.h 	WWWStream.h 	WWWTelnt.h 	WWWTrans.h 	WWWUtil.h 	WWWWAIS.h 	WWWXML.h 	WWWZip.h
+@@ -538,7 +532,8 @@ maintainer-clean-recursive:
+ 	dot_seen=no; \
+ 	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
+ 	  rev="$$subdir $$rev"; \
+-	  test "$$subdir" = "." && dot_seen=yes; \
+	  test "$$subdir" != "." || dot_seen=yes; \
+	  true; \
+ 	done; \
+ 	test "$$dot_seen" = "no" && rev=". $$rev"; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+@@ -604,7 +599,7 @@ distdir: $(DISTFILES)
+ 	@for file in $(DISTFILES); do \
+ 	  d=$(srcdir); \
+ 	  if test -d $$d/$$file; then \
+-	    cp -pr $$/$$file $(distdir)/$$file; \
+	    cp -pr $$d/$$file $(distdir)/$$file; \
+ 	  else \
+ 	    test -f $(distdir)/$$file \
+ 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
--- a/www/amaya/browser/patches/patch-libwww_config_ltconfig
+++ b/www/amaya/browser/patches/patch-libwww_config_ltconfig
@ -0,0 +1,81 @@
+$OpenBSD: patch-libwww_config_ltconfig,v 1.1 2001/10/02 20:18:59 heko Exp $
+--- libwww/config/ltconfig.orig	Mon Aug 28 17:23:02 2000
+++ libwww/config/ltconfig	Tue Oct  2 00:37:49 2001
+@@ -501,7 +501,14 @@ fi
+ 
+ if test -n "$RANLIB"; then
+   old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+-  old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
+  case "$host_os" in 
+  openbsd*) 
+    old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
+  ;;
+  *)
+    old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
+  ;;
+  esac
+ fi
+ 
+ # Set sane defaults for `DLLTOOL', `OBJDUMP', and `AS', used on cygwin.
+@@ -1105,7 +1112,9 @@ cygwin* | mingw*)
+     with_gnu_ld=no
+   fi
+   ;;
+-
+openbsd*)
+  with_gnu_ld=no
+  ;;
+ esac
+ 
+ ld_shlibs=yes
+@@ -1396,10 +1405,21 @@ else
+     ;;
+ 
+   openbsd*)
+-    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
+-    hardcode_libdir_flag_spec='-R$libdir'
+     hardcode_direct=yes
+     hardcode_shlibpath_var=no
+    case "$host_os" in
+      openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
+	hardcode_libdir_flag_spec='-R$libdir'
+      ;;
+      *)
+	archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts'
+	hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+	if test "`echo __ELF__ | $CC -E - | grep __ELF__`" = "" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	  export_dynamic_flag_spec='${wl}-E'
+	fi
+      ;;
+    esac
+     ;;
+ 
+   os2*)
+@@ -1997,9 +2017,23 @@ netbsd*)
+ 
+ openbsd*)
+   version_type=sunos
+-  if test "$with_gnu_ld" = yes; then
+-    need_lib_prefix=no
+-    need_version=no
+  need_lib_prefix=no
+  need_version=no
+  file_magic_cmd=/usr/bin/file
+  file_magic_test_file=`echo /usr/lib/libc.so.*`
+  if test "`echo __ELF__ | $CC -E - | grep __ELF__`" = "" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+    deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
+    case "$host_os" in
+    openbsd2.[89] | openbsd2.[89].*)
+      shlibpath_overrides_runpath=no
+    ;;
+    *)
+      shlibpath_overrides_runpath=yes
+    ;;
+    esac
+  else
+    deplibs_check_method='file_magic OpenBSD.* shared library'
+    shlibpath_overrides_runpath=yes
+   fi
+   library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
+   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
--- a/www/amaya/browser/patches/patch-libwww_config_ltmain_sh
+++ b/www/amaya/browser/patches/patch-libwww_config_ltmain_sh
@ -0,0 +1,83 @@
+$OpenBSD: patch-libwww_config_ltmain_sh,v 1.1 2001/10/02 20:18:59 heko Exp $
+--- libwww/config/ltmain.sh.orig	Mon Aug 28 17:23:04 2000
+++ libwww/config/ltmain.sh	Tue Oct  2 00:39:51 2001
+@@ -1079,6 +1079,17 @@ compiler."
+ 	    # These systems don't actually have c library (as such)
+ 	    continue
+ 	    ;;
+ 	  *-*-openbsd*)
+ 	    # Do not include libc due to us having libc/libc_r.
+ 	    continue
+ 	    ;;
+ 	  esac
+ 	elif test "$arg" = "-lc_r"; then
+ 	  case "$host" in
+ 	  *-*-openbsd*)
+       # Do not include libc_r directly, use -pthread flag.
+ 	    continue
+ 	    ;;
+ 	  esac
+ 	elif test "$arg" = "-lm"; then
+ 	  case "$host" in
+@@ -1091,6 +1102,10 @@ compiler."
+ 	deplibs="$deplibs $arg"
+ 	;;
+ 
+      -?thread)
+         deplibs="$deplibs $arg"
+         ;;
+
+       -module)
+ 	module=yes
+ 	continue
+@@ -2686,6 +2701,9 @@ static const void *lt_preloaded_setup() 
+ 	    # Absolute path.
+ 	    rpath="$rpath$dir:"
+ 	    ;;
+	  *-*-openbsd*)
+	    # Do not include libc due to us having libc/libc_r
+	    ;;
+ 	  *)
+ 	    # Relative path: add a thisdir entry.
+ 	    rpath="$rpath\$thisdir/$dir:"
+@@ -3555,40 +3573,6 @@ libdir='$install_libdir'\
+     # Exit here if they wanted silent mode.
+     test "$show" = : && exit 0
+ 
+-    echo "----------------------------------------------------------------------"
+-    echo "Libraries have been installed in:"
+-    for libdir in $libdirs; do
+-      echo "   $libdir"
+-    done
+-    echo
+-    echo "If you ever happen to want to link against installed libraries"
+-    echo "in a given directory, LIBDIR, you must either use libtool, and"
+-    echo "specify the full pathname of the library, or use \`-LLIBDIR'"
+-    echo "flag during linking and do at least one of the following:"
+-    if test -n "$shlibpath_var"; then
+-      echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
+-      echo "     during execution"
+-    fi
+-    if test -n "$runpath_var"; then
+-      echo "   - add LIBDIR to the \`$runpath_var' environment variable"
+-      echo "     during linking"
+-    fi
+-    if test -n "$hardcode_libdir_flag_spec"; then
+-      libdir=LIBDIR
+-      eval flag=\"$hardcode_libdir_flag_spec\"
+-
+-      echo "   - use the \`$flag' linker flag"
+-    fi
+-    if test -n "$admincmds"; then
+-      echo "   - have your system administrator run these commands:$admincmds"
+-    fi
+-    if test -f /etc/ld.so.conf; then
+-      echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
+-    fi
+-    echo
+-    echo "See any operating system documentation about shared libraries for"
+-    echo "more information, such as the ld(1) and ld.so(8) manual pages."
+-    echo "----------------------------------------------------------------------"
+     exit 0
+     ;;
+ 
--- a/www/amaya/browser/patches/patch-libwww_configure_in
+++ b/www/amaya/browser/patches/patch-libwww_configure_in
@ -0,0 +1,61 @@
+$OpenBSD: patch-libwww_configure_in,v 1.1 2001/10/02 20:18:59 heko Exp $
+--- libwww/configure.in.orig	Fri Sep 15 18:16:20 2000
+++ libwww/configure.in	Tue Oct  2 02:23:33 2001
+@@ -475,24 +475,24 @@ AC_ARG_WITH(expat,
+     AC_MSG_RESULT(yes)
+     AC_DEFINE(HT_EXPAT)
+     HTXML="HTXML.lo"
+-    HTLIBXML='${top_builddir}/modules/expat/xmlparse/libxmlparse.la ${top_builddir}/modules/expat/xmltok/libxmltok.la'
+-    XMLTOK="libxmltok.la"
+-    XMLPARSE="libxmlparse.la"
+    HTLIBXML=''
+    XMLTOK=""
+    XMLPARSE=""
+     WWWXML="libwwwxml.la"
+-    LWWWXML="-lwwwxml -lxmltok -lxmlparse"
+-    LIBWWWXML='${top_builddir}/Library/src/libwwwxml.la ${top_builddir}/modules/expat/xmlparse/libxmlparse.la ${top_builddir}/modules/expat/xmltok/libxmltok.la'
+    LWWWXML="-lwwwxml -lexpat"
+    LIBWWWXML='${top_builddir}/Library/src/libwwwxml.la'
+     SHOWXML=""
+     ;;
+   esac ],
+   AC_MSG_RESULT(yes)
+   AC_DEFINE(HT_EXPAT)
+   HTXML="HTXML.lo"
+-  HTLIBXML='${top_builddir}/modules/expat/xmlparse/libxmlparse.la ${top_builddir}/modules/expat/xmltok/libxmltok.la'
+-  XMLTOK="libxmltok.la"
+-  XMLPARSE="libxmlparse.la"
+  HTLIBXML=''
+  XMLTOK=""
+  XMLPARSE=""
+   WWWXML="libwwwxml.la"
+-  LWWWXML="-lwwwxml -lxmltok -lxmlparse"
+-  LIBWWWXML='${top_builddir}/Library/src/libwwwxml.la ${top_builddir}/modules/expat/xmlparse/libxmlparse.la ${top_builddir}/modules/expat/xmltok/libxmltok.la'
+  LWWWXML="-lwwwxml -lexpat"
+  LIBWWWXML='${top_builddir}/Library/src/libwwwxml.la'
+   SHOWXML=""
+ )
+ AC_SUBST(HTXML)		# for old style big library
+@@ -517,16 +517,16 @@ AC_ARG_WITH(md5,
+   *)
+     AC_MSG_RESULT(yes)
+     AC_DEFINE(HT_MD5)
+-    WWWMD5="libmd5.la"
+-    LWWWMD5="-lmd5"
+-    LIBWWWMD5='${top_builddir}/modules/md5/libmd5.la'
+    WWWMD5=""
+    LWWWMD5=""
+    LIBWWWMD5=""
+     ;;
+   esac ],
+   AC_MSG_RESULT(yes)
+   AC_DEFINE(HT_MD5)
+-  WWWMD5="libmd5.la"
+-  LWWWMD5="-lmd5"
+-  LIBWWWMD5='${top_builddir}/modules/md5/libmd5.la'
+  WWWMD5=""
+  LWWWMD5=""
+  LIBWWWMD5=""
+ )
+ AC_SUBST(WWWMD5)
+ AC_SUBST(LWWWMD5)
--- a/www/amaya/browser/pkg/DESCR
+++ b/www/amaya/browser/pkg/DESCR
@ -2,3 +2,5 @@ Amaya is a complete web browsing and authoring environment and comes equipped
 with a WYSIWYG style of interface, similar to that of the most popular
 browsers. With such an interface, users do not need to know the HTML or CSS
 languages. 
+
+WWW:	${HOMEPAGE}
--- a/www/amaya/browser/pkg/PLIST
+++ b/www/amaya/browser/pkg/PLIST
@ -1,6 +1,9 @@
-@comment $OpenBSD: PLIST,v 1.2 2000/08/10 08:48:23 kevlo Exp $
+@comment $OpenBSD: PLIST,v 1.3 2001/10/02 20:18:59 heko Exp $
 Amaya/amaya/AmayaPage.html
+Amaya/amaya/AmayaPage.html.fr
+Amaya/amaya/Annot.conf
 Amaya/amaya/GraphML.STR
+Amaya/amaya/GraphML.conf
 Amaya/amaya/GraphML.en
 Amaya/amaya/GraphMLP.PRS
 Amaya/amaya/GraphMLT.TRA
@ -8,7 +11,6 @@ Amaya/amaya/GraphMLTX.TRA
 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
@ -19,19 +21,21 @@ 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
 Amaya/amaya/HTMLUSLL.PRS
 Amaya/amaya/MathML.STR
+Amaya/amaya/MathML.conf
 Amaya/amaya/MathML.en
-Amaya/amaya/MathML.fr
 Amaya/amaya/MathML.trans
 Amaya/amaya/MathMLP.PRS
 Amaya/amaya/MathMLT.TRA
 Amaya/amaya/MathMLTX.TRA
 Amaya/amaya/TextFile.STR
 Amaya/amaya/TextFile.conf
+Amaya/amaya/TextFile.en
 Amaya/amaya/TextFileP.PRS
 Amaya/amaya/TextFilePL.PRS
 Amaya/amaya/TextFilePP.PRS
@ -39,12 +43,38 @@ Amaya/amaya/TextFilePPUS.PRS
 Amaya/amaya/TextFileT.TRA
 Amaya/amaya/TextFileUSL.PRS
 Amaya/amaya/XLink.STR
+Amaya/amaya/XLink.en
 Amaya/amaya/XLinkP.PRS
 Amaya/amaya/XLinkT.TRA
+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
+Amaya/amaya/index.gif
+Amaya/amaya/lost.gif
+Amaya/amaya/option.gif
+Amaya/amaya/radio-s.gif
+Amaya/amaya/radio.gif
+Amaya/amaya/target.gif
+Amaya/amaya/toggle-s.gif
+Amaya/amaya/toggle.gif
+Amaya/annotlib/Annot.STR
+Amaya/annotlib/AnnotP.PRS
+Amaya/annotlib/AnnotT.TRA
 Amaya/applis/bin/amaya
 Amaya/applis/bin/print
 Amaya/config/XKeysymDB
 Amaya/config/amaya.keyboard
+Amaya/config/amaya.profiles
+Amaya/config/annot.schemas
+Amaya/config/annotschema.rdf
+Amaya/config/annottypes.rdf
 Amaya/config/de-amayadialogue
 Amaya/config/de-amayamsg
 Amaya/config/de-corrdialogue
@ -53,6 +83,10 @@ Amaya/config/en-amayadialogue
 Amaya/config/en-amayamsg
 Amaya/config/en-corrdialogue
 Amaya/config/en-libdialogue
+Amaya/config/es-amayadialogue
+Amaya/config/es-amayamsg
+Amaya/config/es-corrdialogue
+Amaya/config/es-libdialogue
 Amaya/config/fr-amayadialogue
 Amaya/config/fr-amayamsg
 Amaya/config/fr-corrdialogue
@ -81,39 +115,63 @@ Amaya/dicopar/swedish.ptn
 Amaya/doc/Icons/Back.gif
 Amaya/doc/Icons/Browser.gif
 Amaya/doc/Icons/CacheMenu.gif
+Amaya/doc/Icons/CacheMenufr.gif
 Amaya/doc/Icons/ColorMenu.gif
+Amaya/doc/Icons/ColorMenufr.gif
 Amaya/doc/Icons/Cour.gif
 Amaya/doc/Icons/DL.gif
 Amaya/doc/Icons/Editor.gif
 Amaya/doc/Icons/Em.gif
 Amaya/doc/Icons/Forward.gif
 Amaya/doc/Icons/GeneralMenu.gif
+Amaya/doc/Icons/GeneralMenufr.gif
 Amaya/doc/Icons/GeomMenu.gif
+Amaya/doc/Icons/GeomMenufr.gif
+Amaya/doc/Icons/Graph.gif
 Amaya/doc/Icons/H1.gif
 Amaya/doc/Icons/H2.gif
 Amaya/doc/Icons/H3.gif
+Amaya/doc/Icons/IDMenu.png
 Amaya/doc/Icons/Image.gif
 Amaya/doc/Icons/LangueNegotiation.gif
+Amaya/doc/Icons/LangueNegotiationfr.gif
 Amaya/doc/Icons/Link.gif
+Amaya/doc/Icons/Math.gif
 Amaya/doc/Icons/NumList.gif
 Amaya/doc/Icons/OList.gif
 Amaya/doc/Icons/Plugin.gif
 Amaya/doc/Icons/Print.gif
 Amaya/doc/Icons/ProfilesMenu.gif
+Amaya/doc/Icons/ProfilesMenufr.gif
 Amaya/doc/Icons/ProxyMenu.gif
+Amaya/doc/Icons/ProxyMenufr.gif
 Amaya/doc/Icons/PublishMenu.gif
+Amaya/doc/Icons/PublishMenufr.gif
 Amaya/doc/Icons/Reload.png
 Amaya/doc/Icons/SaveAs.gif
+Amaya/doc/Icons/SaveAsfr.gif
 Amaya/doc/Icons/SourceJava.gif
 Amaya/doc/Icons/Sources.gif
 Amaya/doc/Icons/Strong.gif
 Amaya/doc/Icons/TemplatesMenu.gif
+Amaya/doc/Icons/TemplatesMenufr.gif
 Amaya/doc/Icons/amaya.gif
+Amaya/doc/Icons/annot.png
+Amaya/doc/Icons/annotationicon.png
+Amaya/doc/Icons/annotationiconfr.gif
+Amaya/doc/Icons/annotationsmenu.png
+Amaya/doc/Icons/annotationsmenu_fr.png
+Amaya/doc/Icons/annotationwindow.png
+Amaya/doc/Icons/annotationwindowfr.gif
+Amaya/doc/Icons/annotorp.png
 Amaya/doc/Icons/background.gif
 Amaya/doc/Icons/bug.gif
 Amaya/doc/Icons/check.gif
+Amaya/doc/Icons/configurebox.png
+Amaya/doc/Icons/configureboxfr.png
 Amaya/doc/Icons/cross.gif
 Amaya/doc/Icons/css.gif
+Amaya/doc/Icons/cssfr.gif
 Amaya/doc/Icons/doc48x.gif
 Amaya/doc/Icons/drapeau-F.gif
 Amaya/doc/Icons/eyec.gif
@ -121,6 +179,10 @@ Amaya/doc/Icons/find.gif
 Amaya/doc/Icons/floppy.gif
 Amaya/doc/Icons/home.gif
 Amaya/doc/Icons/left.gif
+Amaya/doc/Icons/linkwindow.png
+Amaya/doc/Icons/linkwindowfr.gif
+Amaya/doc/Icons/localfilter.png
+Amaya/doc/Icons/localfilterfr.gif
 Amaya/doc/Icons/opera.gif
 Amaya/doc/Icons/put.gif
 Amaya/doc/Icons/question.gif
@ -132,12 +194,20 @@ Amaya/doc/Icons/up.gif
 Amaya/doc/Icons/w3c-amaya.gif
 Amaya/doc/Icons/warning.gif
 Amaya/doc/amaya/Access.html
+Amaya/doc/amaya/Access.html.fr
+Amaya/doc/amaya/Annotations.html
+Amaya/doc/amaya/Annotations.html.fr
 Amaya/doc/amaya/Attributes.html
+Amaya/doc/amaya/Attributes.html.fr
 Amaya/doc/amaya/Browsing.html
+Amaya/doc/amaya/Browsing.html.fr
 Amaya/doc/amaya/CSS.html
 Amaya/doc/amaya/Changing.html
+Amaya/doc/amaya/Changing.html.fr
 Amaya/doc/amaya/Configure.html
+Amaya/doc/amaya/Configure.html.fr
 Amaya/doc/amaya/Creating.html
+Amaya/doc/amaya/Creating.html.fr
 Amaya/doc/amaya/HTML-elements/40styling.html
 Amaya/doc/amaya/HTML-elements/address.html
 Amaya/doc/amaya/HTML-elements/headings.html
@ -147,21 +217,42 @@ 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/ImageMaps.html.fr
+Amaya/doc/amaya/Index.html
 Amaya/doc/amaya/Keyboard.html
+Amaya/doc/amaya/Keyboard.html.fr
 Amaya/doc/amaya/Links.html
+Amaya/doc/amaya/Links.html.fr
 Amaya/doc/amaya/MakeBook.html
+Amaya/doc/amaya/MakeBook.html.fr
 Amaya/doc/amaya/Manual.html
+Amaya/doc/amaya/Manual.html.fr
 Amaya/doc/amaya/Math.html
+Amaya/doc/amaya/Math.html.fr
 Amaya/doc/amaya/Numbering.html
+Amaya/doc/amaya/Numbering.html.fr
 Amaya/doc/amaya/Printing.html
+Amaya/doc/amaya/Printing.html.fr
 Amaya/doc/amaya/Publishing.html
+Amaya/doc/amaya/Publishing.html.fr
+Amaya/doc/amaya/SVG.html
+Amaya/doc/amaya/SVG.html.fr
 Amaya/doc/amaya/Searching.html
+Amaya/doc/amaya/Searching.html.fr
 Amaya/doc/amaya/Selecting.html
+Amaya/doc/amaya/Selecting.html.fr
+Amaya/doc/amaya/ShortCuts.html
+Amaya/doc/amaya/ShortCuts.html.fr
 Amaya/doc/amaya/SpellChecking.html
+Amaya/doc/amaya/SpellChecking.html.fr
 Amaya/doc/amaya/StyleSheets.html
+Amaya/doc/amaya/StyleSheets.html.fr
 Amaya/doc/amaya/Tables.html
+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
@ -178,5 +269,6 @@ bin/amaya
@dirrm Amaya/config
@dirrm Amaya/applis/bin
@dirrm Amaya/applis
+@dirrm Amaya/annotlib
@dirrm Amaya/amaya
@dirrm Amaya
--- a/www/amaya/english-dict/Makefile
+++ b/www/amaya/english-dict/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2001/05/06 04:22:45 lebel Exp $
+# $OpenBSD: Makefile,v 1.6 2001/10/02 20:18:59 heko Exp $
 # Original from: Bruno Rohee <rohee@OpenBSD.ORG>
 #
 # Many variables moved to ../Makefile.inc
@ -6,16 +6,17 @@

 COMMENT=	"English dictionary for the Amaya browser/page composer"

-PKGNAME=		amaya-english-dict-20000321
+PKGNAME=		amaya-english-dict-19961207
 DISTNAME=		English
-NEED_VERSION=		1.402
+NEED_VERSION=		1.454

-RUN_DEPENDS=		${PREFIX}/bin/amaya:www/amaya/browser
+RUN_DEPENDS=		${DICT_RUN_DEPENDS}

 NO_BUILD=		Yes

+DICNAME=		Eprinc
+
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/Amaya/dicopar
-	${INSTALL_DATA} ${WRKDIR}/Eprinc.dic ${PREFIX}/Amaya/dicopar
+	${dict_install_frag}

 .include <bsd.port.mk>
--- a/www/amaya/english-dict/pkg/PLIST
+++ b/www/amaya/english-dict/pkg/PLIST
@ -1 +1,2 @@
+@comment $OpenBSD: PLIST,v 1.2 2001/10/02 20:18:59 heko Exp $
 Amaya/dicopar/Eprinc.dic
--- a/www/amaya/french-dict/Makefile
+++ b/www/amaya/french-dict/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2001/05/06 04:22:46 lebel Exp $
+# $OpenBSD: Makefile,v 1.6 2001/10/02 20:18:59 heko Exp $
 # Original from: Bruno Rohee <rohee@OpenBSD.ORG>
 #
 # Many variables moved to ../Makefile.inc
@ -8,14 +8,15 @@ COMMENT=	"French dictionary for the Amaya browser/page composer"

 PKGNAME=		amaya-french-dict-19961217
 DISTNAME=		French
-NEED_VERSION=		1.402
+NEED_VERSION=		1.454

-RUN_DEPENDS=		${PREFIX}/bin/amaya:www/amaya/browser
+RUN_DEPENDS=		${DICT_RUN_DEPENDS}

 NO_BUILD=		Yes

+DICNAME=		Fprinc
+
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/Amaya/dicopar
-	${INSTALL_DATA} ${WRKDIR}/Fprinc.dic ${PREFIX}/Amaya/dicopar
+	${dict_install_frag}

 .include <bsd.port.mk>
--- a/www/amaya/french-dict/pkg/PLIST
+++ b/www/amaya/french-dict/pkg/PLIST
@ -1 +1,2 @@
+@comment $OpenBSD: PLIST,v 1.2 2001/10/02 20:18:59 heko Exp $
 Amaya/dicopar/Fprinc.dic