Update libgtkhtml to 1.99.7 after a repo-copy from ports/www/gtkhtml and

connect it to the build.

7 files changed, 3 insertions, 107 deletions

diff --git a/www/libgtkhtml/files/patch-aa b/www/libgtkhtml/files/patch-aa
deleted file mode 100644
index d810dfeba569..000000000000
--- a/www/libgtkhtml/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/libgtkhtml/files/patch-ad b/www/libgtkhtml/files/patch-ad
deleted file mode 100644
index 5ef7772b0a97..000000000000
--- a/www/libgtkhtml/files/patch-ad
+++ /dev/null
@@ -1,7 +0,0 @@
---- 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 @@
- 
--	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 ()),
- 			      (from_share ? "" : "/.gnome/"), name, NULL);
diff --git a/www/libgtkhtml/files/patch-af b/www/libgtkhtml/files/patch-af
index fee4a53519fc..de57871ffe2f 100644
--- a/www/libgtkhtml/files/patch-af
+++ b/www/libgtkhtml/files/patch-af
@@ -1,9 +1,9 @@
 
 $FreeBSD$
 
---- configure.orig	Mon Apr 15 19:37:22 2002
-+++ configure	Wed May  1 12:17:00 2002
-@@ -7025,6 +7025,7 @@
+--- configure.orig	Fri May 17 13:34:46 2002
++++ configure	Fri May 17 13:37:13 2002
+@@ -6567,6 +6567,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -11,12 +11,3 @@ $FreeBSD$
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -9334,7 +9335,7 @@
- 
- if test "x$enable_xim" = "xyes"; then
- 	BACKUP_LDFLAGS=$LDFLAGS
--	LDFLAGS="$LDFLAGS `gtk-config --libs`"
-+	LDFLAGS="$LDFLAGS `$GTK_CONFIG --libs`"
- 	echo "$as_me:9338: 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/libgtkhtml/files/patch-capplet::Makefile.in b/www/libgtkhtml/files/patch-capplet::Makefile.in
deleted file mode 100644
index 192479a0fa87..000000000000
--- a/www/libgtkhtml/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)
- 
- 
diff --git a/www/libgtkhtml/files/patch-components::http-storage-module::Makefile.in b/www/libgtkhtml/files/patch-components::http-storage-module::Makefile.in
deleted file mode 100644
index 6f238102e76a..000000000000
--- a/www/libgtkhtml/files/patch-components::http-storage-module::Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- components/http-storage-module/Makefile.in	2002/01/22 14:05:48	1.1
-+++ components/http-storage-module/Makefile.in	2002/01/22 14:06:05
-@@ -154,7 +154,7 @@
- INCLUDES =          -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"        	-I$(srcdir) -I$(top_srcdir) 				-I$(top_builddir)					-DPLUGIN_DIR=\""$(PLUGIN_DIR)"\"		        -I$(includedir)                                 	$(EXTRA_GNOME_CFLAGS)
- 
- 
--common_ldflags = -avoid-version
-+common_ldflags = -avoid-version -module
- 
- bonobo_plugindir = $(PLUGIN_DIR)
- bonobo_plugin_LTLIBRARIES = libstorage_http.la
diff --git a/www/libgtkhtml/files/patch-doc::Makefile.in b/www/libgtkhtml/files/patch-doc::Makefile.in
deleted file mode 100644
index 575490af80ea..000000000000
--- a/www/libgtkhtml/files/patch-doc::Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- doc/Makefile.in	2002/05/01 09:15:00	1.1
-+++ doc/Makefile.in	2002/05/01 09:16:10
-@@ -151,7 +151,7 @@
- CFLAGS = @CFLAGS@ $(EXTRA_GNOME_CFLAGS)
- LDFLAGS = @LDFLAGS@ $(EXTRA_GNOME_LIBS)
- 
--HTML_DIR = $(datadir)/html
-+HTML_DIR = $(prefix)/share/doc/gtkhtml
- 
- TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE)
- 
diff --git a/www/libgtkhtml/files/patch-po::Makefile.in.in b/www/libgtkhtml/files/patch-po::Makefile.in.in
deleted file mode 100644
index 42f683d3e699..000000000000
--- a/www/libgtkhtml/files/patch-po::Makefile.in.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- po/Makefile.in.in	2002/03/25 14:35:10	1.1
-+++ po/Makefile.in.in	2002/03/25 14:35:35
-@@ -106,7 +106,7 @@
- 	@catalogs='$(CATALOGS)'; \
- 	for cat in $$catalogs; do \
- 	  cat=`basename $$cat`; \
--	  lang=`echo $$cat | sed 's/\.gmo$$//'`; \
-+	  lang=`echo $$cat | sed 's/\.mo$$//'`; \
- 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
- 	  $(mkinstalldirs) $(DESTDIR)$$dir; \
- 	  if test -r $$cat; then \