17 files changed, 165 insertions, 261 deletions

diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile
index d5dbb55b5aad..eb55e185215b 100644
--- a/www/epiphany/Makefile
+++ b/www/epiphany/Makefile
@@ -3,39 +3,44 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
+#   $MCom: ports/www/epiphany/Makefile,v 1.84 2005/10/02 23:28:19 marcus Exp $
 #
 
 PORTNAME=	epiphany
-PORTVERSION=	1.6.5
+PORTVERSION=	1.8.2
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.6
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.8
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	An extremely lightweight and simple web browser for GNOME 2
 
-BUILD_DEPENDS=	${X11BASE}/lib/${MOZILLA}/components/libwidget_gtk2.so:${PORTSDIR}/www/${MOZILLA}
-RUN_DEPENDS=	${X11BASE}/lib/${MOZILLA}/components/libwidget_gtk2.so:${PORTSDIR}/www/${MOZILLA}
+BUILD_DEPENDS=	${X11BASE}/lib/${MOZILLA}/components/libwidget_gtk2.so:${PORTSDIR}/www/${MOZILLA} \
+		${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
+RUN_DEPENDS=	${X11BASE}/lib/${MOZILLA}/components/libwidget_gtk2.so:${PORTSDIR}/www/${MOZILLA} \
+		${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
 
 MOZILLA=	mozilla
 HEADERS_SUFX=
 MOZ_BUILD=	mozilla
 
 .if !defined(WITH_MOZILLA)
-MOZILLA=	mozilla
-HEADERS_SUFX=
-.else
-.if ${WITH_MOZILLA}=="firefox"
 MOZILLA=	firefox
+HEADERS_SUFX=
 MOZ_BUILD=	firefox
 .else
+.if ${WITH_MOZILLA}=="mozilla"
+MOZILLA=	mozilla
+MOZ_BUILD=	mozilla
+.else
 .if ${WITH_MOZILLA}=="mozilla-devel" || ${WITH_MOZILLA}=="mozilla-devel-gtk2"
 MOZILLA=	mozilla-devel
 HEADERS_SUFX=	-devel
 .else
-MOZILLA=	mozilla
+MOZILLA=	firefox
 HEADERS_SUFX=
+MOZ_BUILD=	firefox
 .endif
 .endif
 .endif
@@ -43,12 +48,14 @@ HEADERS_SUFX=
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 GNOME_DESKTOP_VERSION=2
-USE_GNOME=	gnomeprefix gnomehack intlhack gnomedesktop desktopfileutils
-USE_LIBTOOL_VER=15
+USE_GNOME=	gnomeprefix gnomehack intlhack gnomedesktop desktopfileutils \
+		libgnomeprintui
+USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 INSTALLS_OMF=	yes
-CONFIGURE_ARGS=	--with-mozilla=${MOZ_BUILD}
+CONFIGURE_ARGS=	--with-mozilla=${MOZ_BUILD} \
+		--disable-python
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \
 		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 
@@ -75,23 +82,25 @@ USE_GCC=	3.4
 
 pre-everything::
 	@${ECHO_MSG} ""
-	@${ECHO_MSG} " By default epiphany uses www/mozilla for html rendering, but you can"
+	@${ECHO_MSG} " By default epiphany uses www/firefox for html rendering, but you can"
 	@${ECHO_MSG} " change this by defining WITH_MOZILLA to one of the following values:"
 	@${ECHO_MSG}
-	@${ECHO_MSG} "  firefox       "
+	@${ECHO_MSG} "  mozilla       "
 	@${ECHO_MSG} "  mozilla-devel "
 	@${ECHO_MSG} ""
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|mozilla-gtkmozembed|mozilla-gtkmozembed${HEADERS_SUFX}|g ; \
-		s|mozilla-xpcom|mozilla-xpcom${HEADERS_SUFX}|g ; \
-		s|$$MOZILLA-gtkmozembed|$$MOZILLA-gtkmozembed${HEADERS_SUFX}|g ; \
-		s|$$MOZILLA-xpcom|$$MOZILLA-xpcom${HEADERS_SUFX}|g' \
+.if defined(WITH_MOZILLA) && ${WITH_MOZILLA}=="mozilla-devel"
+	@${REINPLACE_CMD} -e 's|xmozilla|xmozilla${HEADERS_SUFX}|g; \
+		s|mozilla)|mozilla${HEADERS_SUFX})|g; \
+		s|mozilla-gtkmozembed|mozilla-gtkmozembed${HEADERS_SUFX}|g; \
+		s|mozilla-xpcom|mozilla-xpcom${HEADERS_SUFX}|g; \
+		s|$$MOZILLA-gtkmozembed|mozilla-gtkmozembed${HEADERS_SUFX}|g; \
+		s|$$MOZILLA-xpcom|mozilla-xpcom${HEADERS_SUFX}|g' \
 		${WRKSRC}/configure
+.endif
 	@${FIND} ${WRKSRC} -name "Makefile.in*" | ${XARGS} ${REINPLACE_CMD} -e \
 		 's|-lpthread|${PTHREAD_LIBS}|g'
-	@${FIND} ${WRKSRC} -name "*.cpp" | ${XARGS} ${REINPLACE_CMD} -e \
-		's|malloc\.h|stdlib.h|g'
 
 post-configure:
 	@${SED} -e 's|%%PREFIX%%|${PREFIX}|g ; \
diff --git a/www/epiphany/distinfo b/www/epiphany/distinfo
index b62f1cdf8427..6bfaecae7c1a 100644
--- a/www/epiphany/distinfo
+++ b/www/epiphany/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/epiphany-1.6.5.tar.bz2) = ac87745115e41f4d9488e80c8684c207
-SIZE (gnome2/epiphany-1.6.5.tar.bz2) = 3037945
+MD5 (gnome2/epiphany-1.8.2.tar.bz2) = 0a2e479816a1b2845c758e7a5d84a848
+SIZE (gnome2/epiphany-1.8.2.tar.bz2) = 3354620
diff --git a/www/epiphany/files/patch-help_Makefile.in b/www/epiphany/files/patch-help_Makefile.in
new file mode 100644
index 000000000000..1b9f2bb6f91c
--- /dev/null
+++ b/www/epiphany/files/patch-help_Makefile.in
@@ -0,0 +1,11 @@
+--- help/Makefile.in.orig	Wed Jul 27 02:50:59 2005
++++ help/Makefile.in	Wed Jul 27 02:51:22 2005
+@@ -972,7 +972,7 @@
+ 	    else \
+ 	      figfile="$(srcdir)/C/$$fig"; \
+ 	    fi; \
+-	    figdir="$$lc/"`echo $$fig | sed -e 's/^\(.*\/\).*\|.*/\1/'`; \
++	    figdir="$$lc/"`echo $$fig | sed -E -e 's/^(.*\/).*|.*/\1/'`; \
+ 	    figdir="$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$figdir"; \
+ 	    if ! test -d "$$figdir"; then \
+ 	      echo "$(mkinstalldirs) $$figdir"; \
diff --git a/www/epiphany/pkg-plist b/www/epiphany/pkg-plist
index f3a1693b0867..3adc515fd8df 100644
--- a/www/epiphany/pkg-plist
+++ b/www/epiphany/pkg-plist
@@ -1,38 +1,38 @@
 bin/epiphany
 bin/epiphany-bin
-include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-bookmarks-type-builtins.h
-include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-bookmarks.h
-include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-command-manager.h
-include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-cookie-manager.h
-include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-dialog.h
-include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-embed-event.h
-include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-embed-factory.h
-include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-embed-persist.h
-include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-embed-prefs.h
-include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-embed-shell.h
-include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-embed-single.h
-include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-embed-type-builtins.h
-include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-embed.h
-include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-extension.h
-include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-extensions-manager.h
-include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-history.h
-include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-lib-type-builtins.h
-include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-link.h
-include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-loader.h
-include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-node-db.h
-include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-node.h
-include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-notebook.h
-include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-password-manager.h
-include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-permission-manager.h
-include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-session.h
-include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-shell.h
-include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-state.h
-include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-statusbar.h
-include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-tab.h
-include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-type-builtins.h
-include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-window.h
+include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-bookmarks-type-builtins.h
+include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-bookmarks.h
+include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-command-manager.h
+include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-cookie-manager.h
+include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-dialog.h
+include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-embed-event.h
+include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-embed-factory.h
+include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-embed-persist.h
+include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-embed-prefs.h
+include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-embed-shell.h
+include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-embed-single.h
+include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-embed-type-builtins.h
+include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-embed.h
+include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-extension.h
+include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-extensions-manager.h
+include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-history.h
+include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-lib-type-builtins.h
+include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-link.h
+include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-loader.h
+include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-node-db.h
+include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-node.h
+include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-notebook.h
+include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-password-manager.h
+include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-permission-manager.h
+include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-session.h
+include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-shell.h
+include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-state.h
+include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-statusbar.h
+include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-tab.h
+include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-type-builtins.h
+include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-window.h
 libdata/bonobo/servers/GNOME_Epiphany_Automation.server
-libdata/pkgconfig/epiphany-%%EPHY_VERSION%%.pc
+libdata/pkgconfig/epiphany-1.8.pc
 %%DOCSDIR%%/EphyCommandManager.html
 %%DOCSDIR%%/EphyEmbed.html
 %%DOCSDIR%%/EphyNodeDb.html
@@ -61,6 +61,7 @@ libdata/pkgconfig/epiphany-%%EPHY_VERSION%%.pc
 share/gnome/application-registry/epiphany.applications
 share/gnome/applications/bme.desktop
 share/gnome/applications/epiphany.desktop
+@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 share/gnome/epiphany/art/epiphany-bookmarks.png
 share/gnome/epiphany/art/epiphany-close-tab.png
 share/gnome/epiphany/art/epiphany-download.png
@@ -89,39 +90,48 @@ share/gnome/help/epiphany/C/figures/ephy-bookmarkbar-smartbookmark-screenshot.pn
 share/gnome/help/epiphany/C/figures/ephy-history-window-screenshot.png
 share/gnome/help/epiphany/C/figures/ephy-screenshot.png
 share/gnome/help/epiphany/C/legal.xml
+share/gnome/help/epiphany/el/epiphany.xml
+share/gnome/help/epiphany/el/figures/ephy-addressbar-smartbookmark-screenshot.png
+share/gnome/help/epiphany/el/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
+share/gnome/help/epiphany/el/figures/ephy-history-window-screenshot.png
+share/gnome/help/epiphany/el/figures/ephy-screenshot.png
 share/gnome/help/epiphany/es/epiphany.xml
 share/gnome/help/epiphany/es/figures/ephy-addressbar-smartbookmark-screenshot.png
 share/gnome/help/epiphany/es/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
 share/gnome/help/epiphany/es/figures/ephy-history-window-screenshot.png
 share/gnome/help/epiphany/es/figures/ephy-screenshot.png
-share/gnome/help/epiphany/es/legal.xml
 share/gnome/help/epiphany/eu/epiphany.xml
+share/gnome/help/epiphany/eu/figures/ephy-addressbar-smartbookmark-screenshot.png
+share/gnome/help/epiphany/eu/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
 share/gnome/help/epiphany/eu/figures/ephy-history-window-screenshot.png
 share/gnome/help/epiphany/eu/figures/ephy-screenshot.png
-share/gnome/help/epiphany/eu/legal.xml
 share/gnome/help/epiphany/fi/epiphany.xml
 share/gnome/help/epiphany/fi/figures/ephy-addressbar-smartbookmark-screenshot.png
 share/gnome/help/epiphany/fi/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
 share/gnome/help/epiphany/fi/figures/ephy-history-window-screenshot.png
 share/gnome/help/epiphany/fi/figures/ephy-screenshot.png
-share/gnome/help/epiphany/fi/legal.xml
 share/gnome/help/epiphany/ja/epiphany.xml
 share/gnome/help/epiphany/ja/figures/ephy-addressbar-smartbookmark-screenshot.png
 share/gnome/help/epiphany/ja/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
 share/gnome/help/epiphany/ja/figures/ephy-history-window-screenshot.png
 share/gnome/help/epiphany/ja/figures/ephy-screenshot.png
-share/gnome/help/epiphany/ja/legal.xml
+share/gnome/help/epiphany/nl/epiphany.xml
+share/gnome/help/epiphany/nl/figures/ephy-addressbar-smartbookmark-screenshot.png
+share/gnome/help/epiphany/nl/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
+share/gnome/help/epiphany/nl/figures/ephy-history-window-screenshot.png
+share/gnome/help/epiphany/nl/figures/ephy-screenshot.png
 share/gnome/help/epiphany/uk/epiphany.xml
 share/gnome/help/epiphany/uk/figures/ephy-addressbar-smartbookmark-screenshot.png
 share/gnome/help/epiphany/uk/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
 share/gnome/help/epiphany/uk/figures/ephy-history-window-screenshot.png
 share/gnome/help/epiphany/uk/figures/ephy-screenshot.png
-share/gnome/help/epiphany/uk/legal.xml
 share/gnome/omf/epiphany/epiphany-C.omf
+share/gnome/omf/epiphany/epiphany-el.omf
 share/gnome/omf/epiphany/epiphany-es.omf
 share/gnome/omf/epiphany/epiphany-eu.omf
 share/gnome/omf/epiphany/epiphany-fi.omf
 share/gnome/omf/epiphany/epiphany-ja.omf
+share/gnome/omf/epiphany/epiphany-nl.omf
 share/gnome/omf/epiphany/epiphany-uk.omf
 share/gnome/pixmaps/epiphany-bookmarks.png
 share/locale/am/LC_MESSAGES/epiphany.mo
@@ -157,6 +167,7 @@ share/locale/is/LC_MESSAGES/epiphany.mo
 share/locale/it/LC_MESSAGES/epiphany.mo
 share/locale/ja/LC_MESSAGES/epiphany.mo
 share/locale/ko/LC_MESSAGES/epiphany.mo
+share/locale/ku/LC_MESSAGES/epiphany.mo
 share/locale/li/LC_MESSAGES/epiphany.mo
 share/locale/lt/LC_MESSAGES/epiphany.mo
 share/locale/mi/LC_MESSAGES/epiphany.mo
@@ -183,6 +194,7 @@ share/locale/sr/LC_MESSAGES/epiphany.mo
 share/locale/sr@Latn/LC_MESSAGES/epiphany.mo
 share/locale/sv/LC_MESSAGES/epiphany.mo
 share/locale/ta/LC_MESSAGES/epiphany.mo
+share/locale/te/LC_MESSAGES/epiphany.mo
 share/locale/th/LC_MESSAGES/epiphany.mo
 share/locale/tk/LC_MESSAGES/epiphany.mo
 share/locale/tr/LC_MESSAGES/epiphany.mo
@@ -191,13 +203,11 @@ share/locale/vi/LC_MESSAGES/epiphany.mo
 share/locale/wa/LC_MESSAGES/epiphany.mo
 share/locale/zh_CN/LC_MESSAGES/epiphany.mo
 share/locale/zh_TW/LC_MESSAGES/epiphany.mo
-@unexec rmdir %D/share/locale/rw/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/rw 2> /dev/null || true
-@unexec rmdir %D/share/locale/mi/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/mi 2> /dev/null || true
 @dirrm share/gnome/omf/epiphany
 @dirrm share/gnome/help/epiphany/uk/figures
 @dirrm share/gnome/help/epiphany/uk
+@dirrm share/gnome/help/epiphany/nl/figures
+@dirrm share/gnome/help/epiphany/nl
 @dirrm share/gnome/help/epiphany/ja/figures
 @dirrm share/gnome/help/epiphany/ja
 @dirrm share/gnome/help/epiphany/fi/figures
@@ -206,6 +216,8 @@ share/locale/zh_TW/LC_MESSAGES/epiphany.mo
 @dirrm share/gnome/help/epiphany/eu
 @dirrm share/gnome/help/epiphany/es/figures
 @dirrm share/gnome/help/epiphany/es
+@dirrm share/gnome/help/epiphany/el/figures
+@dirrm share/gnome/help/epiphany/el
 @dirrm share/gnome/help/epiphany/C/figures
 @dirrm share/gnome/help/epiphany/C
 @dirrm share/gnome/help/epiphany
@@ -213,7 +225,7 @@ share/locale/zh_TW/LC_MESSAGES/epiphany.mo
 @dirrm share/gnome/epiphany/art
 @dirrm share/gnome/epiphany
 @dirrm %%DOCSDIR%%
-@dirrm include/epiphany-%%EPHY_VERSION%%/epiphany
-@dirrm include/epiphany-%%EPHY_VERSION%%
-@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@dirrm include/epiphany/%%EPHY_VERSION%%/epiphany
+@dirrm include/epiphany/%%EPHY_VERSION%%
+@dirrm include/epiphany
 @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
diff --git a/www/evolution-webcal/Makefile b/www/evolution-webcal/Makefile
index 687e3f383895..feb0c17e8e73 100644
--- a/www/evolution-webcal/Makefile
+++ b/www/evolution-webcal/Makefile
@@ -3,13 +3,14 @@
 # Whom:					Koop Mast <kwm@rainbow-runner.nl>
 #
 # $FreeBSD$
+#   $MCom: ports/www/evolution-webcal/Makefile,v 1.29 2005/10/04 04:35:08 marcus Exp $
 #
 
 PORTNAME=	webcal
-PORTVERSION=	2.2.1
+PORTVERSION=	2.4.1
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PKGNAMEPREFIX}${PORTNAME}/2.2
+MASTER_SITE_SUBDIR=	sources/${PKGNAMEPREFIX}${PORTNAME}/2.4
 PKGNAMEPREFIX=	evolution-
 DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
 
@@ -21,10 +22,15 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_PERL=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack evolutiondataserver libgnomeui
+USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
 GCONF_SCHEMAS=	evolution-webcal.schemas
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|@mkdir_p@|mkdir -p|g' \
+		${WRKSRC}/po/Makefile.in.in
+
 .include <bsd.port.mk>
diff --git a/www/evolution-webcal/distinfo b/www/evolution-webcal/distinfo
index ea620920486a..e766d256569f 100644
--- a/www/evolution-webcal/distinfo
+++ b/www/evolution-webcal/distinfo
@@ -1,2 +1,2 @@
-MD5 (evolution-webcal-2.2.1.tar.bz2) = 36c667bb50a2ae89be457780081dfd39
-SIZE (evolution-webcal-2.2.1.tar.bz2) = 148574
+MD5 (evolution-webcal-2.4.1.tar.bz2) = 1ada1b3bf18604fea9bb6dec6752148c
+SIZE (evolution-webcal-2.4.1.tar.bz2) = 155367
diff --git a/www/evolution-webcal/pkg-plist b/www/evolution-webcal/pkg-plist
index e90cb4fa55fe..a37f1e0548df 100644
--- a/www/evolution-webcal/pkg-plist
+++ b/www/evolution-webcal/pkg-plist
@@ -18,6 +18,7 @@ share/locale/eu/LC_MESSAGES/evolution-webcal.mo
 share/locale/fa/LC_MESSAGES/evolution-webcal.mo
 share/locale/fi/LC_MESSAGES/evolution-webcal.mo
 share/locale/fr/LC_MESSAGES/evolution-webcal.mo
+share/locale/gl/LC_MESSAGES/evolution-webcal.mo
 share/locale/gu/LC_MESSAGES/evolution-webcal.mo
 share/locale/hi/LC_MESSAGES/evolution-webcal.mo
 share/locale/hu/LC_MESSAGES/evolution-webcal.mo
@@ -37,8 +38,10 @@ share/locale/pa/LC_MESSAGES/evolution-webcal.mo
 share/locale/pl/LC_MESSAGES/evolution-webcal.mo
 share/locale/pt/LC_MESSAGES/evolution-webcal.mo
 share/locale/pt_BR/LC_MESSAGES/evolution-webcal.mo
+share/locale/ro/LC_MESSAGES/evolution-webcal.mo
 share/locale/ru/LC_MESSAGES/evolution-webcal.mo
 share/locale/rw/LC_MESSAGES/evolution-webcal.mo
+share/locale/sk/LC_MESSAGES/evolution-webcal.mo
 share/locale/sq/LC_MESSAGES/evolution-webcal.mo
 share/locale/sr/LC_MESSAGES/evolution-webcal.mo
 share/locale/sr@Latn/LC_MESSAGES/evolution-webcal.mo
@@ -46,8 +49,11 @@ share/locale/sv/LC_MESSAGES/evolution-webcal.mo
 share/locale/ta/LC_MESSAGES/evolution-webcal.mo
 share/locale/th/LC_MESSAGES/evolution-webcal.mo
 share/locale/tr/LC_MESSAGES/evolution-webcal.mo
+share/locale/ug/LC_MESSAGES/evolution-webcal.mo
 share/locale/uk/LC_MESSAGES/evolution-webcal.mo
 share/locale/vi/LC_MESSAGES/evolution-webcal.mo
 share/locale/xh/LC_MESSAGES/evolution-webcal.mo
 share/locale/zh_CN/LC_MESSAGES/evolution-webcal.mo
 share/locale/zh_TW/LC_MESSAGES/evolution-webcal.mo
+@unexec rmdir %D/share/locale/ug/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/ug 2> /dev/null || true
diff --git a/www/gtkhtml3/Makefile b/www/gtkhtml3/Makefile
index 8a8ff55917d9..436777c96568 100644
--- a/www/gtkhtml3/Makefile
+++ b/www/gtkhtml3/Makefile
@@ -3,31 +3,32 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
+#   $MCom: ports/www/gtkhtml3/Makefile,v 1.62 2005/10/03 15:21:56 ahze Exp $
 #
 
 PORTNAME=	gtkhtml3
-PORTVERSION=	3.6.2
-PORTREVISION=	2
+PORTVERSION=	3.8.1
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/3$//}/3.6
+MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/3$//}/3.8
 DISTNAME=	${PORTNAME:S/3$//}-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Lightweight HTML rendering/printing/editing engine
 
-LIB_DEPENDS=	soup-2.2.9:${PORTSDIR}/devel/libsoup
+LIB_DEPENDS=	soup-2.2.8:${PORTSDIR}/devel/libsoup
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack gail libgnomeui libgnomeprintui
+USE_GNOME=	gnomeprefix gnomehack intlhack gail libgnomeui \
+		libgnomeprintui ltverhack
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
-PLIST_SUB=	VERSION="3.6"
+PLIST_SUB=	VERSION="3.8"
 
 .include <bsd.port.mk>
diff --git a/www/gtkhtml3/distinfo b/www/gtkhtml3/distinfo
index e6d83cf53847..dec9c77e783b 100644
--- a/www/gtkhtml3/distinfo
+++ b/www/gtkhtml3/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gtkhtml-3.6.2.tar.bz2) = 37465fde0f1e1d7ba2284c5a4fd06fe7
-SIZE (gnome2/gtkhtml-3.6.2.tar.bz2) = 1416041
+MD5 (gnome2/gtkhtml-3.8.1.tar.bz2) = 4c66f0eb30d6c26a09ee2c8d60d9c520
+SIZE (gnome2/gtkhtml-3.8.1.tar.bz2) = 1527241
diff --git a/www/gtkhtml3/files/patch-src_gtkhtml.c b/www/gtkhtml3/files/patch-src_gtkhtml.c
index 902c39e8ecb1..cc9534035220 100644
--- a/www/gtkhtml3/files/patch-src_gtkhtml.c
+++ b/www/gtkhtml3/files/patch-src_gtkhtml.c
@@ -1,11 +1,11 @@
---- src/gtkhtml.c.orig	Mon Aug  2 11:21:24 2004
-+++ src/gtkhtml.c	Tue Aug  3 15:19:41 2004
-@@ -2955,7 +2955,7 @@
+--- src/gtkhtml.c.orig	Mon Aug 22 15:56:46 2005
++++ src/gtkhtml.c	Mon Aug 22 18:56:03 2005
+@@ -3104,7 +3104,7 @@
  	add_bindings (klass);
  	gtk_html_accessibility_init ();
  
--	gtk_rc_parse (PREFIX "/share/" GTKHTML_RELEASE_STRING "/keybindingsrc.emacs");
-+	gtk_rc_parse (PREFIX "/share/gnome/" GTKHTML_RELEASE_STRING "/keybindingsrc.emacs");
+-	filename = g_build_filename (PREFIX, "share", GTKHTML_RELEASE_STRING, "keybindingsrc.emacs", NULL);
++	filename = g_build_filename (PREFIX, "share/gnome", GTKHTML_RELEASE_STRING, "keybindingsrc.emacs", NULL);
+ 	gtk_rc_parse (filename);
+ 	g_free (filename);
  	html_class->emacs_bindings = gtk_binding_set_find ("gtkhtml-bindings-emacs");
- 	read_key_theme (html_class);
- 	gconf_client_notify_add (gconf_client_get_default (), "/desktop/gnome/interface/gtk_key_theme",
diff --git a/www/gtkhtml3/pkg-plist b/www/gtkhtml3/pkg-plist
index 12becdca550e..f2e776ea939b 100644
--- a/www/gtkhtml3/pkg-plist
+++ b/www/gtkhtml3/pkg-plist
@@ -1,91 +1,17 @@
-include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml-compat.h
 include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml-embedded.h
 include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml-enums.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml-keybinding.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml-private.h
 include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml-properties.h
 include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml-search.h
 include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml-stream.h
 include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml-types.h
 include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtmldebug.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtmlfontstyle.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlanchor.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlbutton.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlcheckbox.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlclue.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlcluealigned.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlclueflow.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlclueh.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlcluev.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlcolor.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlcolorset.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlcursor.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmldrawqueue.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlembedded.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-edit-clueflowstyle.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-edit-cursor.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-edit-cut-and-paste.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-edit-fontstyle.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-edit-images.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-edit-movement.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-edit-rule.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-edit-selection-updater.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-edit-table.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-edit-tablecell.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-edit-text.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-edit.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-print.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-save.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-search.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlentity.h
 include/libgtkhtml-%%VERSION%%/gtkhtml/htmlenums.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlenumutils.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlfontmanager.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlform.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlframe.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlframeset.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlgdkpainter.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlhidden.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmliframe.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlimage.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlimageinput.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlinterval.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmllist.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlmap.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlmarshal.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlobject.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlpainter.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlplainpainter.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlprinter.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlradio.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlreplace.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlrule.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlsearch.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlselect.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlselection.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlsettings.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlshape.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlstack.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlstringtokenizer.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlstyle.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmltable.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmltablecell.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmltablepriv.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmltext.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmltextarea.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmltextinput.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmltextslave.h
 include/libgtkhtml-%%VERSION%%/gtkhtml/htmltokenizer.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmltype.h
 include/libgtkhtml-%%VERSION%%/gtkhtml/htmltypes.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlundo-action.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlundo.h
 lib/gtkhtml/libgnome-gtkhtml-editor-%%VERSION%%.so
 lib/libgtkhtml-%%VERSION%%.a
 lib/libgtkhtml-%%VERSION%%.so
-lib/libgtkhtml-%%VERSION%%.so.18
+lib/libgtkhtml-%%VERSION%%.so.15
 libdata/bonobo/servers/GNOME_GtkHTML_Editor-%%VERSION%%.server
 libdata/pkgconfig/libgtkhtml-%%VERSION%%.pc
 share/gnome/gtkhtml-%%VERSION%%/Editor.idl
@@ -137,8 +63,8 @@ share/gnome/gtkhtml-%%VERSION%%/icons/search-and-replace-16.png
 share/gnome/gtkhtml-%%VERSION%%/icons/search-and-replace-24.png
 share/gnome/gtkhtml-%%VERSION%%/icons/smiley-1.png
 share/gnome/gtkhtml-%%VERSION%%/icons/smiley-10.png
-share/gnome/gtkhtml-%%VERSION%%/icons/smiley-12.png
 share/gnome/gtkhtml-%%VERSION%%/icons/smiley-11.png
+share/gnome/gtkhtml-%%VERSION%%/icons/smiley-12.png
 share/gnome/gtkhtml-%%VERSION%%/icons/smiley-2.png
 share/gnome/gtkhtml-%%VERSION%%/icons/smiley-3.png
 share/gnome/gtkhtml-%%VERSION%%/icons/smiley-4.png
@@ -162,6 +88,7 @@ share/locale/bg/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/bn/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/ca/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/cs/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/cy/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/da/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/de/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/el/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
@@ -180,6 +107,7 @@ share/locale/he/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/hi/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/hr/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/hu/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/id/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/it/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/ja/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/ko/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
@@ -197,6 +125,7 @@ share/locale/pa/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/pl/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/pt/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/pt_BR/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/ro/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/ru/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/rw/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/sk/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
diff --git a/www/gtkhtml38/Makefile b/www/gtkhtml38/Makefile
index 8a8ff55917d9..436777c96568 100644
--- a/www/gtkhtml38/Makefile
+++ b/www/gtkhtml38/Makefile
@@ -3,31 +3,32 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
+#   $MCom: ports/www/gtkhtml3/Makefile,v 1.62 2005/10/03 15:21:56 ahze Exp $
 #
 
 PORTNAME=	gtkhtml3
-PORTVERSION=	3.6.2
-PORTREVISION=	2
+PORTVERSION=	3.8.1
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/3$//}/3.6
+MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/3$//}/3.8
 DISTNAME=	${PORTNAME:S/3$//}-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Lightweight HTML rendering/printing/editing engine
 
-LIB_DEPENDS=	soup-2.2.9:${PORTSDIR}/devel/libsoup
+LIB_DEPENDS=	soup-2.2.8:${PORTSDIR}/devel/libsoup
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack gail libgnomeui libgnomeprintui
+USE_GNOME=	gnomeprefix gnomehack intlhack gail libgnomeui \
+		libgnomeprintui ltverhack
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
-PLIST_SUB=	VERSION="3.6"
+PLIST_SUB=	VERSION="3.8"
 
 .include <bsd.port.mk>
diff --git a/www/gtkhtml38/distinfo b/www/gtkhtml38/distinfo
index e6d83cf53847..dec9c77e783b 100644
--- a/www/gtkhtml38/distinfo
+++ b/www/gtkhtml38/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gtkhtml-3.6.2.tar.bz2) = 37465fde0f1e1d7ba2284c5a4fd06fe7
-SIZE (gnome2/gtkhtml-3.6.2.tar.bz2) = 1416041
+MD5 (gnome2/gtkhtml-3.8.1.tar.bz2) = 4c66f0eb30d6c26a09ee2c8d60d9c520
+SIZE (gnome2/gtkhtml-3.8.1.tar.bz2) = 1527241
diff --git a/www/gtkhtml38/files/patch-src_gtkhtml.c b/www/gtkhtml38/files/patch-src_gtkhtml.c
index 902c39e8ecb1..cc9534035220 100644
--- a/www/gtkhtml38/files/patch-src_gtkhtml.c
+++ b/www/gtkhtml38/files/patch-src_gtkhtml.c
@@ -1,11 +1,11 @@
---- src/gtkhtml.c.orig	Mon Aug  2 11:21:24 2004
-+++ src/gtkhtml.c	Tue Aug  3 15:19:41 2004
-@@ -2955,7 +2955,7 @@
+--- src/gtkhtml.c.orig	Mon Aug 22 15:56:46 2005
++++ src/gtkhtml.c	Mon Aug 22 18:56:03 2005
+@@ -3104,7 +3104,7 @@
  	add_bindings (klass);
  	gtk_html_accessibility_init ();
  
--	gtk_rc_parse (PREFIX "/share/" GTKHTML_RELEASE_STRING "/keybindingsrc.emacs");
-+	gtk_rc_parse (PREFIX "/share/gnome/" GTKHTML_RELEASE_STRING "/keybindingsrc.emacs");
+-	filename = g_build_filename (PREFIX, "share", GTKHTML_RELEASE_STRING, "keybindingsrc.emacs", NULL);
++	filename = g_build_filename (PREFIX, "share/gnome", GTKHTML_RELEASE_STRING, "keybindingsrc.emacs", NULL);
+ 	gtk_rc_parse (filename);
+ 	g_free (filename);
  	html_class->emacs_bindings = gtk_binding_set_find ("gtkhtml-bindings-emacs");
- 	read_key_theme (html_class);
- 	gconf_client_notify_add (gconf_client_get_default (), "/desktop/gnome/interface/gtk_key_theme",
diff --git a/www/gtkhtml38/pkg-plist b/www/gtkhtml38/pkg-plist
index 12becdca550e..f2e776ea939b 100644
--- a/www/gtkhtml38/pkg-plist
+++ b/www/gtkhtml38/pkg-plist
@@ -1,91 +1,17 @@
-include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml-compat.h
 include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml-embedded.h
 include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml-enums.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml-keybinding.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml-private.h
 include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml-properties.h
 include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml-search.h
 include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml-stream.h
 include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml-types.h
 include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtmldebug.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtmlfontstyle.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlanchor.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlbutton.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlcheckbox.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlclue.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlcluealigned.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlclueflow.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlclueh.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlcluev.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlcolor.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlcolorset.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlcursor.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmldrawqueue.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlembedded.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-edit-clueflowstyle.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-edit-cursor.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-edit-cut-and-paste.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-edit-fontstyle.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-edit-images.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-edit-movement.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-edit-rule.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-edit-selection-updater.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-edit-table.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-edit-tablecell.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-edit-text.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-edit.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-print.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-save.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-search.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlentity.h
 include/libgtkhtml-%%VERSION%%/gtkhtml/htmlenums.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlenumutils.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlfontmanager.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlform.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlframe.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlframeset.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlgdkpainter.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlhidden.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmliframe.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlimage.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlimageinput.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlinterval.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmllist.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlmap.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlmarshal.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlobject.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlpainter.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlplainpainter.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlprinter.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlradio.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlreplace.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlrule.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlsearch.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlselect.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlselection.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlsettings.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlshape.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlstack.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlstringtokenizer.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlstyle.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmltable.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmltablecell.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmltablepriv.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmltext.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmltextarea.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmltextinput.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmltextslave.h
 include/libgtkhtml-%%VERSION%%/gtkhtml/htmltokenizer.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmltype.h
 include/libgtkhtml-%%VERSION%%/gtkhtml/htmltypes.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlundo-action.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlundo.h
 lib/gtkhtml/libgnome-gtkhtml-editor-%%VERSION%%.so
 lib/libgtkhtml-%%VERSION%%.a
 lib/libgtkhtml-%%VERSION%%.so
-lib/libgtkhtml-%%VERSION%%.so.18
+lib/libgtkhtml-%%VERSION%%.so.15
 libdata/bonobo/servers/GNOME_GtkHTML_Editor-%%VERSION%%.server
 libdata/pkgconfig/libgtkhtml-%%VERSION%%.pc
 share/gnome/gtkhtml-%%VERSION%%/Editor.idl
@@ -137,8 +63,8 @@ share/gnome/gtkhtml-%%VERSION%%/icons/search-and-replace-16.png
 share/gnome/gtkhtml-%%VERSION%%/icons/search-and-replace-24.png
 share/gnome/gtkhtml-%%VERSION%%/icons/smiley-1.png
 share/gnome/gtkhtml-%%VERSION%%/icons/smiley-10.png
-share/gnome/gtkhtml-%%VERSION%%/icons/smiley-12.png
 share/gnome/gtkhtml-%%VERSION%%/icons/smiley-11.png
+share/gnome/gtkhtml-%%VERSION%%/icons/smiley-12.png
 share/gnome/gtkhtml-%%VERSION%%/icons/smiley-2.png
 share/gnome/gtkhtml-%%VERSION%%/icons/smiley-3.png
 share/gnome/gtkhtml-%%VERSION%%/icons/smiley-4.png
@@ -162,6 +88,7 @@ share/locale/bg/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/bn/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/ca/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/cs/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/cy/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/da/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/de/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/el/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
@@ -180,6 +107,7 @@ share/locale/he/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/hi/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/hr/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/hu/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/id/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/it/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/ja/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/ko/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
@@ -197,6 +125,7 @@ share/locale/pa/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/pl/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/pt/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/pt_BR/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/ro/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/ru/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/rw/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/sk/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
diff --git a/www/libgtkhtml/Makefile b/www/libgtkhtml/Makefile
index 8f528ae66fa7..0e40bd33c432 100644
--- a/www/libgtkhtml/Makefile
+++ b/www/libgtkhtml/Makefile
@@ -3,14 +3,14 @@
 # Whom:					Ade Lovett <ade@FreeBSD.org>
 #
 # $FreeBSD$
+#   $MCom: ports/www/libgtkhtml/Makefile,v 1.36 2005/10/14 20:39:58 adamw Exp $
 #
 
 PORTNAME=	libgtkhtml
-PORTVERSION=	2.6.3
-PORTREVISION=	1
+PORTVERSION=	2.11.0
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.6
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.11
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -20,9 +20,9 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
-USE_GNOME=	gnomeprefix gnomehack lthack libxslt gnomevfs2 gail
+USE_GNOME=	gnomeprefix gnomehack libxslt gnomevfs2 gail ltverhack
 INSTALLS_SHLIB=	yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/www/libgtkhtml/distinfo b/www/libgtkhtml/distinfo
index 6c75968ad36f..9167a7761d02 100644
--- a/www/libgtkhtml/distinfo
+++ b/www/libgtkhtml/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/libgtkhtml-2.6.3.tar.bz2) = c77789241d725e189ffc0391eda94361
-SIZE (gnome2/libgtkhtml-2.6.3.tar.bz2) = 392127
+MD5 (gnome2/libgtkhtml-2.11.0.tar.bz2) = ae7fbfda3b5d118c17f089f4de64b5ef
+SIZE (gnome2/libgtkhtml-2.11.0.tar.bz2) = 565750