diff -urN /usr/ports/www/amaya/Makefile www/amaya/Makefile
--- /usr/ports/www/amaya/Makefile	Fri Apr  9 19:08:27 2004
+++ www/amaya/Makefile	Thu Apr 15 20:08:13 2004
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	amaya
-PORTVERSION=	8.3
+PORTVERSION=	8.4
 CATEGORIES=	www
 MASTER_SITES=	http://www.w3.org/Amaya/Distribution/ \
 		ftp://ftp.w3.org/pub/amaya/ \
diff -urN /usr/ports/www/amaya/distinfo www/amaya/distinfo
--- /usr/ports/www/amaya/distinfo	Tue Mar 23 14:23:15 2004
+++ www/amaya/distinfo	Sat Apr 17 20:28:26 2004
@@ -1,5 +1,5 @@
-MD5 (amaya/amaya-src-8.3.tgz) = 17ecfe47e27a8517344650627cc7762d
-SIZE (amaya/amaya-src-8.3.tgz) = 9688629
+MD5 (amaya/amaya-src-8.4.tgz) = d6d21c6f8d8ad1e0841750f2e47bb532
+SIZE (amaya/amaya-src-8.4.tgz) = 9709063
 MD5 (amaya/Dutch.tgz) = 3edb9cce5ce160d7270b23808c1d5981
 SIZE (amaya/Dutch.tgz) = 1228989
 MD5 (amaya/English.tgz) = c1f7122288329dc3cbb3871ea00eb4b4
diff -urN /usr/ports/www/amaya/files/patch-configure www/amaya/files/patch-configure
--- /usr/ports/www/amaya/files/patch-configure	Tue Mar 23 14:23:15 2004
+++ www/amaya/files/patch-configure	Sat Apr 17 19:03:25 2004
@@ -1,18 +1,18 @@
---- ../configure.orig	Fri Jan 30 01:06:42 2004
-+++ ../configure	Wed Mar 10 18:44:02 2004
-@@ -12713,9 +12713,9 @@
+--- ../configure.orig	Thu Apr 15 16:39:55 2004
++++ ../configure	Sat Apr 17 19:02:52 2004
+@@ -13851,9 +13851,9 @@
      fi
    done
  
--  GTK_INCLUDES="`gtk-config --cflags`"
-+  GTK_INCLUDES="`imlib-config --cflags-gdk`"
+-  GTK_INCLUDES="${GTK_INCLUDES} `gtk-config --cflags`"
++  GTK_INCLUDES="${GTK_INCLUDES} `imlib-config --cflags-gdk`"
  
 -  GTK_LIBRARIES="`gtk-config --libs`"
 +  GTK_LIBRARIES="`imlib-config --libs-gdk`"
      if test "${with_gl}" != "yes" ; then
     GTK_LIBRARIES="${GTK_LIBRARIES} -lgdk_imlib"
    fi
-@@ -13687,6 +13687,9 @@
+@@ -14849,6 +14849,9 @@
  if test "$with_dav" = "yes" ; then
  
      dav_frag=$srcdir/davlib/Makefile.dav