3 files changed, 4 insertions, 15 deletions
diff --git a/www/gtkhtml/files/gtkhtmlConf.sh b/www/gtkhtml/files/gtkhtmlConf.sh
index 4dc806a68c1b..12cee8fa1e2d 100644
--- a/www/gtkhtml/files/gtkhtmlConf.sh
+++ b/www/gtkhtml/files/gtkhtmlConf.sh
@@ -1,5 +1,5 @@
 GTKHTML_LIBDIR="-L%%PREFIX%%/lib"
-GTKHTML_LIBS=" -L%%PREFIX%%/lib -lgtkhtml-1.1 -Wl,-E -L%%X11BASE%%/lib -L%%LOCALBASE%%/lib -lgal -lgnomeprint -lfreetype -lglade-gnome -lglade -lxml -lXpm -ljpeg -lgnomeui -lart_lgpl -lgdk_imlib -ltiff -lungif -lpng -lz -lSM -lICE -lgnome -lgnomesupport -lesd -laudiofile -lgdk_pixbuf -lgtk-12 -lgdk-12 -lgmodule-12 -lglib-12 -lintl -lXi -lXext -lX11 -lm -lgnomecanvaspixbuf -liconv -Wl,-E -L%%X11BASE%%/lib -L%%LOCALBASE%%/lib -lgconf-gtk-1 -lgconf-1 -loaf -lORBitCosNaming -lORBit -lIIOP -lORBitutil -lwrap -lgtk-12 -lgdk-12 -lgmodule-12 -lglib-12 -lintl -lXi -lXext -lX11 -lm"
-GTKHTML_INCLUDEDIR="-I%%PREFIX%%/include -I%%PREFIX%%/include/gtkhtml-1.1 -I%%LOCALBASE%%/include/gdk-pixbuf-1.0 -I%%LOCALBASE%%/include/gtk12 -I%%LOCALBASE%%/include/glib12 -I%%LOCALBASE%%/include -I%%X11BASE%%/include -I%%LOCALBASE%%/include/gnome-1.0 -I%%LOCALBASE%%/include/freetype2 -DNEED_GNOMESUPPORT_H -I%%LOCALBASE%%/lib/gnome-libs/include -I%%LOCALBASE%%/include/gnome-xml -I%%LOCALBASE%%/include/libglade-1.0 -I%%LOCALBASE%%/include/gconf/1 -I%%X11BASE%%/include -I%%LOCALBASE%%/include/glib12 -I%%LOCALBASE%%/include/orbit-1.0 -I%%LOCALBASE%%/include -I%%LOCALBASE%%/include/gtk12 -DGTKHTML_HAVE_GCONF"
-GTKHTML_DATADIR="%%PREFIX%%/share/gnome"
+GTKHTML_LIBS=" -L%%PREFIX%%/lib -lgtkhtml-1.1 -Wl,-E -L%%LOCALBASE%%/lib -lgal -lgnomeprint -lfreetype -lglade-gnome -lglade -lxml -lXpm -ljpeg -lgnomeui -lart_lgpl -lgdk_imlib -ltiff -lungif -lpng -lz -lSM -lICE -lgnome -lgnomesupport -lesd -laudiofile -lgdk_pixbuf -lgtk-12 -lgdk-12 -lgmodule-12 -lglib-12 -lintl -lXi -lXext -lX11 -lm -lgnomecanvaspixbuf -liconv -Wl,-E -L%%LOCALBASE%%/lib -lgconf-gtk-1 -lgconf-1 -loaf -lORBitCosNaming -lORBit -lIIOP -lORBitutil -lwrap -lgtk-12 -lgdk-12 -lgmodule-12 -lglib-12 -lintl -lXi -lXext -lX11 -lm"
+GTKHTML_INCLUDEDIR="-I%%PREFIX%%/include -I%%PREFIX%%/include/gtkhtml-1.1 -I%%LOCALBASE%%/include/gdk-pixbuf-1.0 -I%%LOCALBASE%%/include/gtk12 -I%%LOCALBASE%%/include/glib12 -I%%LOCALBASE%%/include -I%%LOCALBASE%%/include/gnome-1.0 -I%%LOCALBASE%%/include/freetype2 -DNEED_GNOMESUPPORT_H -I%%LOCALBASE%%/lib/gnome-libs/include -I%%LOCALBASE%%/include/gnome-xml -I%%LOCALBASE%%/include/libglade-1.0 -I%%LOCALBASE%%/include/gconf/1 -I%%LOCALBASE%%/include/glib12 -I%%LOCALBASE%%/include/orbit-1.0 -I%%LOCALBASE%%/include -I%%LOCALBASE%%/include/gtk12 -DGTKHTML_HAVE_GCONF"
+GTKHTML_DATADIR="%%PREFIX%%/share"
 MODULE_VERSION="%%VERSION%%"
diff --git a/www/gtkhtml/files/patch-ad b/www/gtkhtml/files/patch-ad
deleted file mode 100644
index 863d79c3bdf9..000000000000
--- a/www/gtkhtml/files/patch-ad
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/gtkhtml.c.orig	Wed Sep  4 20:00:35 2002
-+++ src/gtkhtml.c	Wed Sep 18 21:40:55 2002
-@@ -4353,7 +4353,7 @@
- {
- 	gchar *rcfile;
- 
--	rcfile = g_strconcat ((from_share ? PREFIX "/share/gtkhtml-" GTKHTML_RELEASE "/" : gnome_util_user_home ()),
-+	rcfile = g_strconcat ((from_share ? PREFIX "/share/gnome/gtkhtml-" GTKHTML_RELEASE "/" : gnome_util_user_home ()),
- 			      (from_share ? "" : "/.gnome/"), name, NULL);
- 
- 	if (g_file_test (rcfile, G_FILE_TEST_ISFILE))
diff --git a/www/gtkhtml/files/patch-doc::Makefile.in b/www/gtkhtml/files/patch-doc::Makefile.in
index 575490af80ea..cc08c2029ff4 100644
--- a/www/gtkhtml/files/patch-doc::Makefile.in
+++ b/www/gtkhtml/files/patch-doc::Makefile.in
@@ -7,7 +7,7 @@ $FreeBSD$
  CFLAGS = @CFLAGS@ $(EXTRA_GNOME_CFLAGS)
  LDFLAGS = @LDFLAGS@ $(EXTRA_GNOME_LIBS)
  
--HTML_DIR = $(datadir)/html
+-HTML_DIR = $(datadir)/gnome/html
 +HTML_DIR = $(prefix)/share/doc/gtkhtml
  
  TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE)