5 files changed, 19 insertions, 59 deletions

diff --git a/www/gtkhtml3/files/gtkhtmlConf.sh b/www/gtkhtml3/files/gtkhtmlConf.sh
new file mode 100644
index 000000000000..3a1ac441de67
--- /dev/null
+++ b/www/gtkhtml3/files/gtkhtmlConf.sh
@@ -0,0 +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 -lgtk12 -lgdk12 -lgmodule12 -lglib12 -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 -lgtk12 -lgdk12 -lgmodule12 -lglib12 -lintl -lXi -lXext -lX11 -lm"
+GTKHTML_INCLUDEDIR="-I%%PREFIX%%/include -I%%PREFIX%%/include/gtkhtml-1.1 -I%%X11BASE%%/include/gdk-pixbuf-1.0 -I%%X11BASE%%/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%%X11BASE%%/lib/gnome-libs/include -I%%LOCALBASE%%/include/gnome-xml -I%%X11BASE%%/include/libglade-1.0 -I%%X11BASE%%/include/gconf/1 -I%%X11BASE%%/include -I%%LOCALBASE%%/include/glib12 -I%%LOCALBASE%%/include/orbit-1.0 -I%%LOCALBASE%%/include -I%%X11BASE%%/include/gtk12 -DGTKHTML_HAVE_GCONF"
+GTKHTML_DATADIR="%%PREFIX%%/share/gnome"
+MODULE_VERSION="%%VERSION%%"
diff --git a/www/gtkhtml3/files/patch-aa b/www/gtkhtml3/files/patch-aa
deleted file mode 100644
index d810dfeba569..000000000000
--- a/www/gtkhtml3/files/patch-aa
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- Makefile.in.orig	Tue Dec  4 17:05:01 2001
-+++ Makefile.in	Wed Dec  5 11:05:52 2001
-@@ -151,7 +151,7 @@
- @BONOBO_TRUE@DIR_COMPONENTS = components
- @BONOBO_FALSE@DIR_COMPONENTS = 
- 
--confexecdir = $(libdir)
-+confexecdir = $(sysconfdir)
- confexec_DATA = gtkhtmlConf.sh
- 
- SUBDIRS =  	intl						macros						src						capplet						doc						art						$(DIR_COMPONENTS)				po
diff --git a/www/gtkhtml3/files/patch-ad b/www/gtkhtml3/files/patch-ad
index 5ef7772b0a97..863d79c3bdf9 100644
--- a/www/gtkhtml3/files/patch-ad
+++ b/www/gtkhtml3/files/patch-ad
@@ -1,7 +1,11 @@
---- src/gtkhtml.c.orig	Thu Oct 19 04:04:22 2000
-+++ src/gtkhtml.c	Fri Oct 20 10:40:47 2000
-@@ -2625,3 +2625,3 @@
+--- 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/" : gnome_util_user_home ()),
-+	rcfile = g_strconcat ((from_share ? PREFIX "/share/gnome/gtkhtml/" : gnome_util_user_home ()),
+-	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/gtkhtml3/files/patch-af b/www/gtkhtml3/files/patch-af
index d0a58d2ba272..f6bf8a431549 100644
--- a/www/gtkhtml3/files/patch-af
+++ b/www/gtkhtml3/files/patch-af
@@ -1,9 +1,6 @@
-
-$FreeBSD$
-
---- configure.orig	Sun Jun 16 16:45:03 2002
-+++ configure	Sun Jun 16 16:45:40 2002
-@@ -7012,6 +7012,7 @@
+--- configure.orig	Mon Oct  7 15:12:16 2002
++++ configure	Sat Oct 12 20:42:50 2002
+@@ -7679,6 +7679,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -11,12 +8,12 @@ $FreeBSD$
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -9321,7 +9322,7 @@
+@@ -10215,7 +10216,7 @@
  
  if test "x$enable_xim" = "xyes"; then
  	BACKUP_LDFLAGS=$LDFLAGS
 -	LDFLAGS="$LDFLAGS `gtk-config --libs`"
 +	LDFLAGS="$LDFLAGS `$GTK_CONFIG --libs`"
- 	echo "$as_me:9325: checking for gdk_im_begin" >&5
+ 	echo "$as_me:$LINENO: checking for gdk_im_begin" >&5
  echo $ECHO_N "checking for gdk_im_begin... $ECHO_C" >&6
  if test "${ac_cv_func_gdk_im_begin+set}" = set; then
diff --git a/www/gtkhtml3/files/patch-capplet::Makefile.in b/www/gtkhtml3/files/patch-capplet::Makefile.in
deleted file mode 100644
index 192479a0fa87..000000000000
--- a/www/gtkhtml3/files/patch-capplet::Makefile.in
+++ /dev/null
@@ -1,32 +0,0 @@
-
-$FreeBSD$
-
---- capplet/Makefile.in	2001/12/12 21:45:18	1.1
-+++ capplet/Makefile.in	2001/12/12 21:49:47
-@@ -193,7 +193,7 @@
- LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
- LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
--DATA =  $(desk_DATA) $(glade_DATA) $(newsys_DATA) $(sys_DATA)
-+DATA =  $(desk_DATA) $(glade_DATA) $(sys_DATA)
- 
- DIST_COMMON =  ChangeLog Makefile.am Makefile.in
- 
-@@ -421,7 +421,7 @@
- install-exec-am: install-binPROGRAMS
- install-exec: install-exec-am
- 
--install-data-am: install-deskDATA install-gladeDATA install-newsysDATA \
-+install-data-am: install-deskDATA install-gladeDATA \
- 		install-sysDATA
- install-data: install-data-am
- 
-@@ -438,7 +438,7 @@
- 	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
- installdirs:
- 	$(mkinstalldirs)  $(DESTDIR)$(bindir) $(DESTDIR)$(deskdir) \
--		$(DESTDIR)$(gladedir) $(DESTDIR)$(newsysdir) \
-+		$(DESTDIR)$(gladedir) \
- 		$(DESTDIR)$(sysdir)
- 
-