* Update to 1.1.10

* Remove USE_GNOMENG macro

4 files changed, 43 insertions, 45 deletions

diff --git a/www/gtkhtml/Makefile b/www/gtkhtml/Makefile
index 97f1b9682c09..4fa8c5674f36 100644
--- a/www/gtkhtml/Makefile
+++ b/www/gtkhtml/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gtkhtml
-PORTVERSION=	1.1.8
+PORTVERSION=	1.1.10
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.1
@@ -20,7 +20,6 @@ LIB_DEPENDS=	pspell.15:${PORTSDIR}/textproc/aspell
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_GNOMENG=	yes
 USE_GNOME=	gnomehack gnomeprefix gnomehier glibwww libghttp libcapplet gal
 INSTALLS_SHLIB=	yes
 USE_LIBTOOL=	yes
@@ -28,7 +27,6 @@ USE_REINPLACE=	yes
 CONFIGURE_ARGS=	--with-gconf=yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
-CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
 VERSION=	${PORTNAME}-${PORTVERSION}
 
diff --git a/www/gtkhtml/distinfo b/www/gtkhtml/distinfo
index 2d04d6661dc7..267c1d793396 100644
--- a/www/gtkhtml/distinfo
+++ b/www/gtkhtml/distinfo
@@ -1 +1 @@
-MD5 (gnome/gtkhtml-1.1.8.tar.bz2) = ea64ac887b834573d4ee6279926ba245
+MD5 (gnome/gtkhtml-1.1.10.tar.bz2) = 8647407560e4b61ba4a12653b9cc8869
diff --git a/www/gtkhtml/files/patch-af b/www/gtkhtml/files/patch-af
index f6bf8a431549..473c4820bbcf 100644
--- a/www/gtkhtml/files/patch-af
+++ b/www/gtkhtml/files/patch-af
@@ -1,6 +1,6 @@
---- configure.orig	Mon Oct  7 15:12:16 2002
-+++ configure	Sat Oct 12 20:42:50 2002
-@@ -7679,6 +7679,7 @@
+--- configure.orig	Mon Mar 31 13:06:33 2003
++++ configure	Fri Apr  4 22:43:24 2003
+@@ -5895,6 +5895,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -8,12 +8,12 @@
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -10215,7 +10216,7 @@
+@@ -7736,7 +7737,7 @@
  
  if test "x$enable_xim" = "xyes"; then
  	BACKUP_LDFLAGS=$LDFLAGS
 -	LDFLAGS="$LDFLAGS `gtk-config --libs`"
 +	LDFLAGS="$LDFLAGS `$GTK_CONFIG --libs`"
- 	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
+ 	echo $ac_n "checking for gdk_im_begin""... $ac_c" 1>&6
+ echo "configure:7742: checking for gdk_im_begin" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_gdk_im_begin'+set}'`\" = set"; then
diff --git a/www/gtkhtml/pkg-plist b/www/gtkhtml/pkg-plist
index e011376209c6..8bb643b123b2 100644
--- a/www/gtkhtml/pkg-plist
+++ b/www/gtkhtml/pkg-plist
@@ -159,40 +159,40 @@ share/gnome/gtkhtml-1.1/keybindingsrc.xemacs
 share/gnome/oaf/GNOME_GtkHTML_EBrowser.oaf
 share/gnome/oaf/GNOME_GtkHTML_Editor.oaf
 share/gnome/ui/GNOME_GtkHTML_Editor.xml
-share/locale/az/LC_MESSAGES/gtkhtml-1.1.mo
-share/locale/ca/LC_MESSAGES/gtkhtml-1.1.mo
-share/locale/cs/LC_MESSAGES/gtkhtml-1.1.mo
-share/locale/da/LC_MESSAGES/gtkhtml-1.1.mo
-share/locale/de/LC_MESSAGES/gtkhtml-1.1.mo
-share/locale/el/LC_MESSAGES/gtkhtml-1.1.mo
-share/locale/es/LC_MESSAGES/gtkhtml-1.1.mo
-share/locale/et/LC_MESSAGES/gtkhtml-1.1.mo
-share/locale/eu/LC_MESSAGES/gtkhtml-1.1.mo
-share/locale/fi/LC_MESSAGES/gtkhtml-1.1.mo
-share/locale/fr/LC_MESSAGES/gtkhtml-1.1.mo
-share/locale/gl/LC_MESSAGES/gtkhtml-1.1.mo
-share/locale/hu/LC_MESSAGES/gtkhtml-1.1.mo
-share/locale/it/LC_MESSAGES/gtkhtml-1.1.mo
-share/locale/ja/LC_MESSAGES/gtkhtml-1.1.mo
-share/locale/ko/LC_MESSAGES/gtkhtml-1.1.mo
-share/locale/lt/LC_MESSAGES/gtkhtml-1.1.mo
-share/locale/lv/LC_MESSAGES/gtkhtml-1.1.mo
-share/locale/ms/LC_MESSAGES/gtkhtml-1.1.mo
-share/locale/nl/LC_MESSAGES/gtkhtml-1.1.mo
-share/locale/nn/LC_MESSAGES/gtkhtml-1.1.mo
-share/locale/no/LC_MESSAGES/gtkhtml-1.1.mo
-share/locale/pl/LC_MESSAGES/gtkhtml-1.1.mo
-share/locale/pt/LC_MESSAGES/gtkhtml-1.1.mo
-share/locale/pt_BR/LC_MESSAGES/gtkhtml-1.1.mo
-share/locale/ru/LC_MESSAGES/gtkhtml-1.1.mo
-share/locale/sk/LC_MESSAGES/gtkhtml-1.1.mo
-share/locale/sl/LC_MESSAGES/gtkhtml-1.1.mo
-share/locale/sv/LC_MESSAGES/gtkhtml-1.1.mo
-share/locale/tr/LC_MESSAGES/gtkhtml-1.1.mo
-share/locale/uk/LC_MESSAGES/gtkhtml-1.1.mo
-share/locale/vi/LC_MESSAGES/gtkhtml-1.1.mo
-share/locale/zh_CN/LC_MESSAGES/gtkhtml-1.1.mo
-share/locale/zh_TW/LC_MESSAGES/gtkhtml-1.1.mo
+share/locale/az/LC_MESSAGES/gtkhtml.mo
+share/locale/ca/LC_MESSAGES/gtkhtml.mo
+share/locale/cs/LC_MESSAGES/gtkhtml.mo
+share/locale/da/LC_MESSAGES/gtkhtml.mo
+share/locale/de/LC_MESSAGES/gtkhtml.mo
+share/locale/el/LC_MESSAGES/gtkhtml.mo
+share/locale/es/LC_MESSAGES/gtkhtml.mo
+share/locale/et/LC_MESSAGES/gtkhtml.mo
+share/locale/eu/LC_MESSAGES/gtkhtml.mo
+share/locale/fi/LC_MESSAGES/gtkhtml.mo
+share/locale/fr/LC_MESSAGES/gtkhtml.mo
+share/locale/gl/LC_MESSAGES/gtkhtml.mo
+share/locale/hu/LC_MESSAGES/gtkhtml.mo
+share/locale/it/LC_MESSAGES/gtkhtml.mo
+share/locale/ja/LC_MESSAGES/gtkhtml.mo
+share/locale/ko/LC_MESSAGES/gtkhtml.mo
+share/locale/lt/LC_MESSAGES/gtkhtml.mo
+share/locale/lv/LC_MESSAGES/gtkhtml.mo
+share/locale/ms/LC_MESSAGES/gtkhtml.mo
+share/locale/nl/LC_MESSAGES/gtkhtml.mo
+share/locale/nn/LC_MESSAGES/gtkhtml.mo
+share/locale/no/LC_MESSAGES/gtkhtml.mo
+share/locale/pl/LC_MESSAGES/gtkhtml.mo
+share/locale/pt/LC_MESSAGES/gtkhtml.mo
+share/locale/pt_BR/LC_MESSAGES/gtkhtml.mo
+share/locale/ru/LC_MESSAGES/gtkhtml.mo
+share/locale/sk/LC_MESSAGES/gtkhtml.mo
+share/locale/sl/LC_MESSAGES/gtkhtml.mo
+share/locale/sv/LC_MESSAGES/gtkhtml.mo
+share/locale/tr/LC_MESSAGES/gtkhtml.mo
+share/locale/uk/LC_MESSAGES/gtkhtml.mo
+share/locale/vi/LC_MESSAGES/gtkhtml.mo
+share/locale/zh_CN/LC_MESSAGES/gtkhtml.mo
+share/locale/zh_TW/LC_MESSAGES/gtkhtml.mo
 @dirrm share/gnome/gtkhtml-1.1/icons
 @dirrm share/gnome/gtkhtml-1.1
 @dirrm share/doc/gtkhtml/gtkhtml