summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
Diffstat (limited to 'www')
-rw-r--r--www/epiphany-extensions/Makefile47
-rw-r--r--www/epiphany-extensions/distinfo6
-rw-r--r--www/epiphany-extensions/pkg-plist84
-rw-r--r--www/epiphany/Makefile47
-rw-r--r--www/epiphany/distinfo6
-rw-r--r--www/epiphany/files/patch-src_bookmarks_ephy-bookmarks.c14
-rw-r--r--www/epiphany/pkg-plist59
-rw-r--r--www/evolution-webcal/Makefile9
-rw-r--r--www/evolution-webcal/distinfo6
-rw-r--r--www/evolution-webcal/pkg-plist3
-rw-r--r--www/gnome-user-share/Makefile5
-rw-r--r--www/gtkhtml3/Makefile10
-rw-r--r--www/gtkhtml3/distinfo6
-rw-r--r--www/gtkhtml3/files/patch-src_htmltext.c15
-rw-r--r--www/gtkhtml3/pkg-plist9
-rw-r--r--www/gtkhtml38/Makefile10
-rw-r--r--www/gtkhtml38/distinfo6
-rw-r--r--www/gtkhtml38/files/patch-src_htmltext.c15
-rw-r--r--www/gtkhtml38/pkg-plist9
19 files changed, 223 insertions, 143 deletions
diff --git a/www/epiphany-extensions/Makefile b/www/epiphany-extensions/Makefile
index abdaa5f52ff2..3ba13f9b6044 100644
--- a/www/epiphany-extensions/Makefile
+++ b/www/epiphany-extensions/Makefile
@@ -3,15 +3,15 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/www/epiphany-extensions/Makefile,v 1.54 2005/10/02 23:33:10 marcus Exp $
+# $MCom: ports/www/epiphany-extensions/Makefile,v 1.72 2006/04/24 04:49:23 marcus Exp $
#
PORTNAME= epiphany
-PORTVERSION= 1.8.2
-PORTREVISION= 2
+PORTVERSION= 2.14.1
+PORTREVISION= 1
CATEGORIES= www gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}${PKGNAMESUFFIX}/1.8
+MASTER_SITE_SUBDIR= sources/${PORTNAME}${PKGNAMESUFFIX}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
PKGNAMESUFFIX= -extensions
DISTNAME= ${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
DIST_SUBDIR= gnome2
@@ -22,30 +22,27 @@ COMMENT= A set of add-ons for the Epiphany web browser
BUILD_DEPENDS= epiphany:${PORTSDIR}/www/epiphany
RUN_DEPENDS= epiphany:${PORTSDIR}/www/epiphany
+USE_GETTEXT= yes
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GECKO= firefox mozilla seamonkey
USE_GNOME= gnomeprefix gnomehack intlhack gnometarget
+INSTALLS_OMF= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \
LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
-CONFIGURE_ARGS= --with-extensions="all" \
- --with-mozilla=${GECKO}
+CONFIGURE_ARGS= --with-mozilla=${GECKO}
-PLIST_SUB= VERSION="1.8" EPHY_VERSION="1.8"
+EPHY_EXTENSIONS=all
-.if defined(PACKAGE_BUILDING) || defined(PARALLEL_PACKAGE_BUILD)
-.undef WITHOUT_OPENSP
-WITH_OPENSP= yes
-.endif
+PLIST_SUB= VERSION="2.14" EPHY_VERSION="2.14"
-.include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../www/mozilla/bsd.gecko.mk"
+OPTIONS= OPENSP "Enable OpenSP SGML support" off \
+ ADBLOCK "Enable the adblock extension" on
-.if exists(${LOCALBASE}/lib/libosp.so)
-WITH_OPENSP= yes
-.endif
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/www/mozilla/bsd.gecko.mk"
.if defined(WITH_OPENSP)
CONFIGURE_ARGS+= --enable-opensp=yes
@@ -53,6 +50,24 @@ CONFIGURE_ARGS+= --enable-opensp=yes
CONFIGURE_ARGS+= --disable-opensp
.endif
+.if !defined(WITHOUT_ADBLOCK)
+EPHY_EXTENSIONS:= ${EPHY_EXTENSIONS},adblock
+LIB_DEPENDS+= pcre.0:${PORTSDIR}/devel/pcre-utf8
+PLIST_SUB+= ADBLOCK=""
+.else
+PLIST_SUB+= ADBLOCK="@comment "
+.endif
+
+.if exists(${LOCALBASE}/share/pygtk/2.0/defs/epiphany.defs)
+USE_PYTHON= yes
+.include "${PORTSDIR}/Mk/bsd.python.mk"
+PLIST_SUB+= PYTHON=""
+.else
+PLIST_SUB+= PYTHON="@comment "
+.endif
+
+CONFIGURE_ARGS+=--with-extensions="${EPHY_EXTENSIONS}"
+
pre-everything::
@${ECHO_MSG} "Epiphany-extensions also supports the following tunable option(s):"
@${ECHO_MSG} " WITH_OPENSP=yes Enable support for OpenSP SGML validation"
diff --git a/www/epiphany-extensions/distinfo b/www/epiphany-extensions/distinfo
index 5403e7870e34..c9bac805d778 100644
--- a/www/epiphany-extensions/distinfo
+++ b/www/epiphany-extensions/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/epiphany-extensions-1.8.2.tar.bz2) = 318418ce023ef5688e535309012591d9
-SHA256 (gnome2/epiphany-extensions-1.8.2.tar.bz2) = 63b09f3368ab6e275b9c9ff9a3e9c360f0235b19374e7f51b10fe94cdf7c7015
-SIZE (gnome2/epiphany-extensions-1.8.2.tar.bz2) = 615141
+MD5 (gnome2/epiphany-extensions-2.14.1.tar.bz2) = 8be9c522284b0a9d7ba2797e141cf26e
+SHA256 (gnome2/epiphany-extensions-2.14.1.tar.bz2) = 6b97e1160203869741c57c6720b2d1e5d16ad104b83d0391f73169542e72305c
+SIZE (gnome2/epiphany-extensions-2.14.1.tar.bz2) = 820099
diff --git a/www/epiphany-extensions/pkg-plist b/www/epiphany-extensions/pkg-plist
index 9575cd5352cb..f724bdaaaab7 100644
--- a/www/epiphany-extensions/pkg-plist
+++ b/www/epiphany-extensions/pkg-plist
@@ -1,30 +1,41 @@
-lib/epiphany/%%VERSION%%/extensions/actions.xml
-lib/epiphany/%%VERSION%%/extensions/auto-scroller.xml
-lib/epiphany/%%VERSION%%/extensions/bookmarks-tray.xml
-lib/epiphany/%%VERSION%%/extensions/certificates.xml
-lib/epiphany/%%VERSION%%/extensions/dashboard.xml
-lib/epiphany/%%VERSION%%/extensions/error-viewer.xml
-lib/epiphany/%%VERSION%%/extensions/extensions-manager-ui.xml
-lib/epiphany/%%VERSION%%/extensions/gestures.xml
+lib/epiphany/%%VERSION%%/extensions/actions.ephy-extension
+%%ADBLOCK%%lib/epiphany/%%VERSION%%/extensions/adblock.ephy-extension
+lib/epiphany/%%VERSION%%/extensions/auto-reload.ephy-extension
+lib/epiphany/%%VERSION%%/extensions/auto-scroller.ephy-extension
+lib/epiphany/%%VERSION%%/extensions/certificates.ephy-extension
+%%PYTHON%%lib/epiphany/%%VERSION%%/extensions/console.py
+%%PYTHON%%lib/epiphany/%%VERSION%%/extensions/console.pyc
+%%PYTHON%%lib/epiphany/%%VERSION%%/extensions/console.pyo
+lib/epiphany/%%VERSION%%/extensions/error-viewer.ephy-extension
+lib/epiphany/%%VERSION%%/extensions/extensions-manager-ui.ephy-extension
+%%PYTHON%%lib/epiphany/%%VERSION%%/extensions/favicon.ephy-extension
+%%PYTHON%%lib/epiphany/%%VERSION%%/extensions/favicon.py
+%%PYTHON%%lib/epiphany/%%VERSION%%/extensions/favicon.pyc
+%%PYTHON%%lib/epiphany/%%VERSION%%/extensions/favicon.pyo
+lib/epiphany/%%VERSION%%/extensions/gestures.ephy-extension
+lib/epiphany/%%VERSION%%/extensions/java-console.ephy-extension
lib/epiphany/%%VERSION%%/extensions/libactionsextension.la
lib/epiphany/%%VERSION%%/extensions/libactionsextension.so
-lib/epiphany/%%VERSION%%/extensions/libactionsextension.so.0
+%%ADBLOCK%%lib/epiphany/%%VERSION%%/extensions/libadblockextension.la
+%%ADBLOCK%%lib/epiphany/%%VERSION%%/extensions/libadblockextension.so
+lib/epiphany/%%VERSION%%/extensions/libautoreloadextension.la
+lib/epiphany/%%VERSION%%/extensions/libautoreloadextension.so
lib/epiphany/%%VERSION%%/extensions/libautoscrollerextension.la
lib/epiphany/%%VERSION%%/extensions/libautoscrollerextension.so
-lib/epiphany/%%VERSION%%/extensions/libbookmarkstrayextension.la
-lib/epiphany/%%VERSION%%/extensions/libbookmarkstrayextension.so
lib/epiphany/%%VERSION%%/extensions/libcertificatesextension.la
lib/epiphany/%%VERSION%%/extensions/libcertificatesextension.so
-lib/epiphany/%%VERSION%%/extensions/libdashboardextension.la
-lib/epiphany/%%VERSION%%/extensions/libdashboardextension.so
lib/epiphany/%%VERSION%%/extensions/liberrorviewerextension.la
lib/epiphany/%%VERSION%%/extensions/liberrorviewerextension.so
lib/epiphany/%%VERSION%%/extensions/libextensionsmanageruiextension.la
lib/epiphany/%%VERSION%%/extensions/libextensionsmanageruiextension.so
lib/epiphany/%%VERSION%%/extensions/libgesturesextension.la
lib/epiphany/%%VERSION%%/extensions/libgesturesextension.so
+lib/epiphany/%%VERSION%%/extensions/libjavaconsoleextension.la
+lib/epiphany/%%VERSION%%/extensions/libjavaconsoleextension.so
lib/epiphany/%%VERSION%%/extensions/libpageinfoextension.la
lib/epiphany/%%VERSION%%/extensions/libpageinfoextension.so
+lib/epiphany/%%VERSION%%/extensions/libpushscrollerextension.la
+lib/epiphany/%%VERSION%%/extensions/libpushscrollerextension.so
lib/epiphany/%%VERSION%%/extensions/libselectstylesheetextension.la
lib/epiphany/%%VERSION%%/extensions/libselectstylesheetextension.so
lib/epiphany/%%VERSION%%/extensions/libsidebarextension.la
@@ -35,22 +46,46 @@ lib/epiphany/%%VERSION%%/extensions/libtabgroupsextension.la
lib/epiphany/%%VERSION%%/extensions/libtabgroupsextension.so
lib/epiphany/%%VERSION%%/extensions/libtabstatesextension.la
lib/epiphany/%%VERSION%%/extensions/libtabstatesextension.so
-lib/epiphany/%%VERSION%%/extensions/libtabstatesextension.so.0
-lib/epiphany/%%VERSION%%/extensions/page-info.xml
-lib/epiphany/%%VERSION%%/extensions/select-stylesheet.xml
-lib/epiphany/%%VERSION%%/extensions/sidebar.xml
-lib/epiphany/%%VERSION%%/extensions/smart-bookmarks.xml
-lib/epiphany/%%VERSION%%/extensions/tab-groups.xml
-lib/epiphany/%%VERSION%%/extensions/tab-states.xml
+lib/epiphany/%%VERSION%%/extensions/page-info.ephy-extension
+lib/epiphany/%%VERSION%%/extensions/push-scroller.ephy-extension
+%%PYTHON%%lib/epiphany/%%VERSION%%/extensions/python-console.ephy-extension
+lib/epiphany/%%VERSION%%/extensions/select-stylesheet.ephy-extension
+lib/epiphany/%%VERSION%%/extensions/sidebar.ephy-extension
+lib/epiphany/%%VERSION%%/extensions/smart-bookmarks.ephy-extension
+lib/epiphany/%%VERSION%%/extensions/tab-groups.ephy-extension
+lib/epiphany/%%VERSION%%/extensions/tab-states.ephy-extension
+%%ADBLOCK%%share/gnome/epiphany-extensions/adblock-patterns
+%%ADBLOCK%%share/gnome/epiphany-extensions/adblock-statusbar-icon.svg
share/gnome/epiphany-extensions/ephy-gestures.xml
share/gnome/epiphany-extensions/glade/action-properties.glade
share/gnome/epiphany-extensions/glade/actions-editor.glade
share/gnome/epiphany-extensions/glade/error-viewer.glade
share/gnome/epiphany-extensions/glade/extensions-manager-ui.glade
share/gnome/epiphany-extensions/glade/page-info.glade
-share/gnome/epiphany-extensions/xml/ephy-bookmarks-tray-ui.xml
share/gnome/epiphany-extensions/xml/epiphany-sidebar-ui.xml
share/gnome/epiphany-extensions/xml/page-info-context-ui.xml
+share/gnome/help/epiphany-extensions/C/epiphany-extensions.xml
+share/gnome/help/epiphany-extensions/C/figures/epi-ext-action-create.png
+share/gnome/help/epiphany-extensions/C/figures/epi-ext-adblocker.png
+share/gnome/help/epiphany-extensions/C/figures/epi-ext-gestures-back.png
+share/gnome/help/epiphany-extensions/C/figures/epi-ext-gestures-close-2.png
+share/gnome/help/epiphany-extensions/C/figures/epi-ext-gestures-close.png
+share/gnome/help/epiphany-extensions/C/figures/epi-ext-gestures-forward.png
+share/gnome/help/epiphany-extensions/C/figures/epi-ext-gestures-fullscreen.png
+share/gnome/help/epiphany-extensions/C/figures/epi-ext-gestures-homepage.png
+share/gnome/help/epiphany-extensions/C/figures/epi-ext-gestures-new-tab.png
+share/gnome/help/epiphany-extensions/C/figures/epi-ext-gestures-new-window.png
+share/gnome/help/epiphany-extensions/C/figures/epi-ext-gestures-next-tab.png
+share/gnome/help/epiphany-extensions/C/figures/epi-ext-gestures-prev-tab.png
+share/gnome/help/epiphany-extensions/C/figures/epi-ext-gestures-reload.png
+share/gnome/help/epiphany-extensions/C/figures/epi-ext-gestures-stop.png
+share/gnome/help/epiphany-extensions/C/figures/epi-ext-gestures-up.png
+share/gnome/help/epiphany-extensions/C/figures/epi-ext-gestures-view-source-2.png
+share/gnome/help/epiphany-extensions/C/figures/epi-ext-gestures-view-source.png
+share/gnome/help/epiphany-extensions/C/figures/epi-ext-sidebar.png
+share/gnome/help/epiphany-extensions/C/figures/epi-ext-tabgroups.png
+share/gnome/help/epiphany-extensions/C/legal.xml
+share/gnome/omf/epiphany-extensions/epiphany-extensions-C.omf
share/locale/bg/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/ca/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/cs/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
@@ -69,6 +104,7 @@ share/locale/it/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/ja/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/ko/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/lt/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
+share/locale/nb/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/ne/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/nl/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/no/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
@@ -84,14 +120,20 @@ share/locale/sr/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/sr@Latn/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/sv/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/uk/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
+share/locale/vi/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/wa/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/zh_CN/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/zh_TW/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
+@dirrm share/gnome/omf/epiphany-extensions
+@dirrm share/gnome/help/epiphany-extensions/C/figures
+@dirrm share/gnome/help/epiphany-extensions/C
+@dirrm share/gnome/help/epiphany-extensions
@dirrm share/gnome/epiphany-extensions/xml
@dirrm share/gnome/epiphany-extensions/glade
@dirrm share/gnome/epiphany-extensions
@dirrmtry lib/epiphany/%%VERSION%%/extensions
+@dirrmtry lib/epiphany/%%VERSION%%/plugins
@dirrmtry lib/epiphany/%%VERSION%%
@dirrmtry lib/epiphany
diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile
index 01bbd39f07de..86c0768bd03a 100644
--- a/www/epiphany/Makefile
+++ b/www/epiphany/Makefile
@@ -3,66 +3,85 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/www/epiphany/Makefile,v 1.84 2005/10/02 23:28:19 marcus Exp $
+# $MCom: ports/www/epiphany/Makefile,v 1.112 2006/04/13 07:52:38 bland Exp $
#
PORTNAME= epiphany
-PORTVERSION= 1.8.5
+PORTVERSION= 2.14.1
CATEGORIES= www gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.8
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= An extremely lightweight and simple web browser for GNOME 2
BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
+LIB_DEPENDS= dbus-1.2:${PORTSDIR}/devel/dbus
RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
+USE_GETTEXT= yes
USE_BZIP2= yes
USE_X_PREFIX= yes
+USE_PYTHON= yes
GNOME_DESKTOP_VERSION=2
USE_GECKO= firefox mozilla seamonkey
USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop desktopfileutils \
libgnomeprintui
+WANT_GNOME= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_REINPLACE= yes
INSTALLS_OMF= yes
-CONFIGURE_ARGS= --with-mozilla=${GECKO} \
- --disable-python
+CONFIGURE_ARGS= --with-mozilla=${GECKO}
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \
LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
-GCONF_SCHEMAS= epiphany-lockdown.schemas epiphany.schemas
+GCONF_SCHEMAS= epiphany-lockdown.schemas epiphany.schemas \
+ epiphany-fonts.schemas epiphany-pango.schemas
-FLASHPLAYER= ${LOCALBASE}/lib/libflashplayer.so.1
-PLIST_SUB+= EPHY_VERSION="1.8"
+PLIST_SUB+= EPHY_VERSION="${PORTVERSION:C/\.[0-9]+$//}" \
+ EPHY_PREFIX="${PREFIX}"
MAN1= epiphany.1
+.if defined(PACKAGE_BUILDING)
+.undef WITHOUT_GNOME
+WITH_GNOME= yes
+.endif
+
.include <bsd.port.pre.mk>
.include "${.CURDIR}/../../www/mozilla/bsd.gecko.mk"
-.if ${OSVERSION} < 500000
-IGNORE= does not build on 4.X
-.endif
-
NO_WERROR= yes
# allow build with more warnings enabled
.if defined(NO_WERROR)
CONFIGURE_ARGS+= --enable-compile-warnings=no
.endif
+.if ${HAVE_GNOME:Mpygnome2}!=""
+USE_PYTHON= yes
+.include "${PORTSDIR}/Mk/bsd.python.mk"
+USE_GNOME+= pygnome2
+CONFIGURE_ARGS+=--enable-python
+PLIST_SUB+= PYTHON=""
+.else
+CONFIGURE_ARGS+=--disable-python
+PLIST_SUB+= PYTHON="@comment "
+.endif
+
post-patch:
@${FIND} ${WRKSRC} -name "Makefile.in*" | ${XARGS} ${REINPLACE_CMD} -e \
's|-lpthread|${PTHREAD_LIBS}|g'
@${REINPLACE_CMD} -e 's|execinfo.h|#|g' \
${WRKSRC}/configure
- @${REINPLACE_CMD} -e 's|/lib/mozilla/plugins|/lib/browser_plugins:${X11BASE}/lib/browser_linux_plugins|' \
+ @${REINPLACE_CMD} -e 's|/lib/mozilla/plugins"|/lib/browser_plugins" ":" MOZILLA_PREFIX "/lib/browser_linux_plugins"|' \
${WRKSRC}/embed/mozilla/mozilla-embed-single.cpp
+ @${REINPLACE_CMD} -e 's|[$$](datadir)/pygtk/2.0/defs|${LOCALBASE}/share/pygtk/2.0/defs|' \
+ ${WRKSRC}/src/Makefile.in
post-install:
+ ${INSTALL_DATA} ${WRKSRC}/data/epiphany-fonts.schemas \
+ ${PREFIX}/etc/gconf/schemas
@-update-desktop-database
.include <bsd.port.post.mk>
diff --git a/www/epiphany/distinfo b/www/epiphany/distinfo
index a325c9eeee9e..a9a5409eca81 100644
--- a/www/epiphany/distinfo
+++ b/www/epiphany/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/epiphany-1.8.5.tar.bz2) = 1acd61200098f03357fb6b44ef16b9c6
-SHA256 (gnome2/epiphany-1.8.5.tar.bz2) = 342b2771ae310815a803fefac8bfb7d1b9f80f4345240e09b2d6d848276e2b41
-SIZE (gnome2/epiphany-1.8.5.tar.bz2) = 3365521
+MD5 (gnome2/epiphany-2.14.1.tar.bz2) = 69f9760646b736d953f24442e0e38f7b
+SHA256 (gnome2/epiphany-2.14.1.tar.bz2) = 4eb5f8f8dacc81f47c54e3a579af3059cca3a7fa59d6cc270ed5b50d0b6a37a2
+SIZE (gnome2/epiphany-2.14.1.tar.bz2) = 3520979
diff --git a/www/epiphany/files/patch-src_bookmarks_ephy-bookmarks.c b/www/epiphany/files/patch-src_bookmarks_ephy-bookmarks.c
new file mode 100644
index 000000000000..146b9e594529
--- /dev/null
+++ b/www/epiphany/files/patch-src_bookmarks_ephy-bookmarks.c
@@ -0,0 +1,14 @@
+--- src/bookmarks/ephy-bookmarks.c.orig Sat Apr 15 04:11:39 2006
++++ src/bookmarks/ephy-bookmarks.c Sat Apr 15 04:13:43 2006
+@@ -92,7 +92,10 @@ static const EphyBookmarksBookmarkInfo d
+ * For instance in .nl these should be
+ * "http://www.google.nl" and "http://www.google.nl/search?q=%s"
+ */
+- { N_("Search the web"), N_("http://www.google.com/search?q=%s&ie=UTF-8&oe=UTF-8") }
++ { N_("Search the web"), N_("http://www.google.com/search?q=%s&ie=UTF-8&oe=UTF-8") },
++ { N_("The FreeBSD Project"), N_("http://www.freebsd.org/") },
++ { N_("Daemon News"), N_("http://daemonnews.org/") },
++ { N_("BSD News"), N_("http://bsdnews.com/") }
+ };
+
+ static const char *default_topics [] =
diff --git a/www/epiphany/pkg-plist b/www/epiphany/pkg-plist
index 099bc7b45aa7..0b2ebe191533 100644
--- a/www/epiphany/pkg-plist
+++ b/www/epiphany/pkg-plist
@@ -1,8 +1,11 @@
bin/epiphany
+include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-adblock-manager.h
+include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-adblock.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-dbus.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
@@ -30,53 +33,28 @@ 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-1.8.pc
-%%DOCSDIR%%/EphyCommandManager.html
-%%DOCSDIR%%/EphyEmbed.html
-%%DOCSDIR%%/EphyNodeDb.html
-%%DOCSDIR%%/EphyTab.html
-%%DOCSDIR%%/EphyWindow.html
-%%DOCSDIR%%/ch01.html
-%%DOCSDIR%%/ch02.html
-%%DOCSDIR%%/epiphany-EphyEmbedFactory.html
-%%DOCSDIR%%/epiphany-EphyEmbedPersist.html
-%%DOCSDIR%%/epiphany-EphyEmbedSingle.html
-%%DOCSDIR%%/epiphany-EphyExtensionsManager.html
-%%DOCSDIR%%/epiphany-EphyGlade.html
-%%DOCSDIR%%/epiphany-EphyPermissionManager.html
-%%DOCSDIR%%/epiphany-ephy-cookie-manager.html
-%%DOCSDIR%%/epiphany-ephy-password-manager.html
-%%DOCSDIR%%/epiphany-ephy-session.html
-%%DOCSDIR%%/epiphany-ephy-shell.html
-%%DOCSDIR%%/epiphany.devhelp
-%%DOCSDIR%%/home.png
-%%DOCSDIR%%/index.html
-%%DOCSDIR%%/index.sgml
-%%DOCSDIR%%/left.png
-%%DOCSDIR%%/right.png
-%%DOCSDIR%%/style.css
-%%DOCSDIR%%/up.png
-share/gnome/application-registry/epiphany.applications
+lib/epiphany/%%EPHY_VERSION%%/plugins/libdesktopfileplugin.la
+lib/epiphany/%%EPHY_VERSION%%/plugins/libdesktopfileplugin.so
+libdata/pkgconfig/epiphany-%%EPHY_VERSION%%.pc
+share/aclocal/epiphany.m4
+share/dbus-1/services/org.gnome.Epiphany.service
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
share/gnome/epiphany/art/epiphany-entry.png
share/gnome/epiphany/art/epiphany-history.png
share/gnome/epiphany/art/epiphany-popup-hidden.png
-share/gnome/epiphany/art/hand-open.png
share/gnome/epiphany/chrome/branding/brand.dtd
share/gnome/epiphany/chrome/branding/brand.properties
share/gnome/epiphany/chrome/epiphany.manifest
share/gnome/epiphany/chrome/global/about.xhtml
share/gnome/epiphany/default-prefs.js
+share/gnome/epiphany/ephy-xml2ini.xsl
share/gnome/epiphany/epiphany-bookmark-editor-ui.xml
share/gnome/epiphany/epiphany-bookmarks-html.xsl
share/gnome/epiphany/epiphany-bookmarksbar.xml
-share/gnome/epiphany/epiphany-extension.xsd
share/gnome/epiphany/epiphany-fs-toolbar.xml
share/gnome/epiphany/epiphany-history-window-ui.xml
share/gnome/epiphany/epiphany-toolbar.xml
@@ -93,6 +71,11 @@ 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/bg/epiphany.xml
+share/gnome/help/epiphany/bg/figures/ephy-addressbar-smartbookmark-screenshot.png
+share/gnome/help/epiphany/bg/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
+share/gnome/help/epiphany/bg/figures/ephy-history-window-screenshot.png
+share/gnome/help/epiphany/bg/figures/ephy-screenshot.png
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
@@ -129,6 +112,7 @@ share/gnome/help/epiphany/uk/figures/ephy-bookmarkbar-smartbookmark-screenshot.p
share/gnome/help/epiphany/uk/figures/ephy-history-window-screenshot.png
share/gnome/help/epiphany/uk/figures/ephy-screenshot.png
share/gnome/omf/epiphany/epiphany-C.omf
+share/gnome/omf/epiphany/epiphany-bg.omf
share/gnome/omf/epiphany/epiphany-el.omf
share/gnome/omf/epiphany/epiphany-es.omf
share/gnome/omf/epiphany/epiphany-eu.omf
@@ -143,12 +127,14 @@ share/locale/az/LC_MESSAGES/epiphany.mo
share/locale/be/LC_MESSAGES/epiphany.mo
share/locale/bg/LC_MESSAGES/epiphany.mo
share/locale/bn/LC_MESSAGES/epiphany.mo
+share/locale/br/LC_MESSAGES/epiphany.mo
share/locale/bs/LC_MESSAGES/epiphany.mo
share/locale/ca/LC_MESSAGES/epiphany.mo
share/locale/cs/LC_MESSAGES/epiphany.mo
share/locale/cy/LC_MESSAGES/epiphany.mo
share/locale/da/LC_MESSAGES/epiphany.mo
share/locale/de/LC_MESSAGES/epiphany.mo
+share/locale/dz/LC_MESSAGES/epiphany.mo
share/locale/el/LC_MESSAGES/epiphany.mo
share/locale/en_CA/LC_MESSAGES/epiphany.mo
share/locale/en_GB/LC_MESSAGES/epiphany.mo
@@ -169,6 +155,7 @@ share/locale/id/LC_MESSAGES/epiphany.mo
share/locale/is/LC_MESSAGES/epiphany.mo
share/locale/it/LC_MESSAGES/epiphany.mo
share/locale/ja/LC_MESSAGES/epiphany.mo
+share/locale/ka/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
@@ -209,6 +196,8 @@ share/locale/zh_HK/LC_MESSAGES/epiphany.mo
share/locale/zh_TW/LC_MESSAGES/epiphany.mo
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
@dirrm share/gnome/omf/epiphany
@dirrm share/gnome/help/epiphany/uk/figures
@dirrm share/gnome/help/epiphany/uk
@@ -224,6 +213,8 @@ share/locale/zh_TW/LC_MESSAGES/epiphany.mo
@dirrm share/gnome/help/epiphany/es
@dirrm share/gnome/help/epiphany/el/figures
@dirrm share/gnome/help/epiphany/el
+@dirrm share/gnome/help/epiphany/bg/figures
+@dirrm share/gnome/help/epiphany/bg
@dirrm share/gnome/help/epiphany/C/figures
@dirrm share/gnome/help/epiphany/C
@dirrm share/gnome/help/epiphany
@@ -234,7 +225,13 @@ share/locale/zh_TW/LC_MESSAGES/epiphany.mo
@dirrm share/gnome/epiphany/art
@dirrm share/gnome/epiphany
@dirrm %%DOCSDIR%%
+@dirrmtry lib/epiphany/%%EPHY_VERSION%%/plugins
+@dirrmtry lib/epiphany/%%EPHY_VERSION%%
+@dirrmtry lib/epiphany
@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
+%%PYTHON%%@cwd %%LOCALBASE%%
+%%PYTHON%%share/pygtk/2.0/defs/epiphany.defs
+%%PYTHON%%@cwd %%EPHY_PREFIX%%
diff --git a/www/evolution-webcal/Makefile b/www/evolution-webcal/Makefile
index 8aa2a21aa7d0..70d3f39a2caf 100644
--- a/www/evolution-webcal/Makefile
+++ b/www/evolution-webcal/Makefile
@@ -3,15 +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 $
+# $MCom: ports/www/evolution-webcal/Makefile,v 1.37 2006/04/15 06:53:55 marcus Exp $
#
PORTNAME= webcal
-PORTVERSION= 2.4.1
-PORTREVISION= 1
+PORTVERSION= 2.5.90
CATEGORIES= www gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PKGNAMEPREFIX}${PORTNAME}/2.4
+MASTER_SITE_SUBDIR= sources/${PKGNAMEPREFIX}${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
PKGNAMEPREFIX= evolution-
DISTNAME= ${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
@@ -21,9 +20,9 @@ COMMENT= Webcal(endar) handler for gnome
USE_X_PREFIX= yes
USE_BZIP2= yes
USE_GMAKE= yes
+USE_GETTEXT= 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"
diff --git a/www/evolution-webcal/distinfo b/www/evolution-webcal/distinfo
index 92e68c1fd5d0..85e7471af2be 100644
--- a/www/evolution-webcal/distinfo
+++ b/www/evolution-webcal/distinfo
@@ -1,3 +1,3 @@
-MD5 (evolution-webcal-2.4.1.tar.bz2) = 1ada1b3bf18604fea9bb6dec6752148c
-SHA256 (evolution-webcal-2.4.1.tar.bz2) = b9798dcee6d13cb05023ac8e221d7ec23448e339c50c974b1cb7d0897486aac2
-SIZE (evolution-webcal-2.4.1.tar.bz2) = 155367
+MD5 (evolution-webcal-2.5.90.tar.bz2) = de482967bbb601c07ba796562dafe34a
+SHA256 (evolution-webcal-2.5.90.tar.bz2) = 0fd89744637efa976032a6ca62867b2682a7bf8c61bf98b5487ee2f4d5665b3c
+SIZE (evolution-webcal-2.5.90.tar.bz2) = 154694
diff --git a/www/evolution-webcal/pkg-plist b/www/evolution-webcal/pkg-plist
index 78669fe92aee..da8f797a7874 100644
--- a/www/evolution-webcal/pkg-plist
+++ b/www/evolution-webcal/pkg-plist
@@ -26,6 +26,7 @@ share/locale/id/LC_MESSAGES/evolution-webcal.mo
share/locale/it/LC_MESSAGES/evolution-webcal.mo
share/locale/ja/LC_MESSAGES/evolution-webcal.mo
share/locale/ko/LC_MESSAGES/evolution-webcal.mo
+share/locale/ky/LC_MESSAGES/evolution-webcal.mo
share/locale/lt/LC_MESSAGES/evolution-webcal.mo
share/locale/mk/LC_MESSAGES/evolution-webcal.mo
share/locale/ms/LC_MESSAGES/evolution-webcal.mo
@@ -57,3 +58,5 @@ share/locale/zh_CN/LC_MESSAGES/evolution-webcal.mo
share/locale/zh_TW/LC_MESSAGES/evolution-webcal.mo
@dirrmtry share/locale/ug/LC_MESSAGES
@dirrmtry share/locale/ug
+@dirrmtry share/locale/ky/LC_MESSAGES
+@dirrmtry share/locale/ky
diff --git a/www/gnome-user-share/Makefile b/www/gnome-user-share/Makefile
index 37a633286c7c..ebfd79eb53f9 100644
--- a/www/gnome-user-share/Makefile
+++ b/www/gnome-user-share/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gnome-user-share
PORTVERSION= 0.10
+PORTREVISION= 1
CATEGORIES= www deskutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.10
@@ -15,14 +16,16 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= Personal file-sharing service for the GNOME Desktop
-LIB_DEPENDS= howl:${PORTSDIR}/net/howl
+LIB_DEPENDS= avahi-client:${PORTSDIR}/net/avahi
USE_BZIP2= yes
USE_GMAKE= yes
+USE_GETTEXT= yes
USE_X_PREFIX= yes
USE_APACHE= 2.0+
USE_GNOME= gnomeprefix gnomehack intlhack libglade2 gconf2
GNU_CONFIGURE= yes
+CONFIGURE_ARGS= --disable-howl
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/www/gtkhtml3/Makefile b/www/gtkhtml3/Makefile
index 5afc4a824318..d7e40fc2888b 100644
--- a/www/gtkhtml3/Makefile
+++ b/www/gtkhtml3/Makefile
@@ -3,15 +3,14 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/www/gtkhtml3/Makefile,v 1.62 2005/10/03 15:21:56 ahze Exp $
+# $MCom: ports/www/gtkhtml3/Makefile,v 1.77 2006/04/13 07:52:39 bland Exp $
#
PORTNAME= gtkhtml3
-PORTVERSION= 3.8.2
-PORTREVISION= 1
+PORTVERSION= 3.10.1
CATEGORIES= www gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME:S/3$//}/3.8
+MASTER_SITE_SUBDIR= sources/${PORTNAME:S/3$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DISTNAME= ${PORTNAME:S/3$//}-${PORTVERSION}
DIST_SUBDIR= gnome2
@@ -20,13 +19,14 @@ COMMENT= Lightweight HTML rendering/printing/editing engine
LIB_DEPENDS= soup-2.2.8:${PORTSDIR}/devel/libsoup
+USE_GETTEXT= yes
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack intlhack gail libgnomeui \
libgnomeprintui ltverhack
INSTALLS_SHLIB= yes
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/www/gtkhtml3/distinfo b/www/gtkhtml3/distinfo
index 0af85a2477c8..24036a9892c8 100644
--- a/www/gtkhtml3/distinfo
+++ b/www/gtkhtml3/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gtkhtml-3.8.2.tar.bz2) = 4455e24142cc914f00f1e8b81940df68
-SHA256 (gnome2/gtkhtml-3.8.2.tar.bz2) = d8fc9e7111773448bb07cc2619fbc3b8534a14a9b3075724465c7567cf1a94d0
-SIZE (gnome2/gtkhtml-3.8.2.tar.bz2) = 1247395
+MD5 (gnome2/gtkhtml-3.10.1.tar.bz2) = f2b7ff386dae9fcc3b01c4116564722d
+SHA256 (gnome2/gtkhtml-3.10.1.tar.bz2) = e2a1910fccc4f081f70028cf28a82406cf81bf1e8a0b4fd1d44898c2bb4b59ba
+SIZE (gnome2/gtkhtml-3.10.1.tar.bz2) = 1264910
diff --git a/www/gtkhtml3/files/patch-src_htmltext.c b/www/gtkhtml3/files/patch-src_htmltext.c
deleted file mode 100644
index f970e5b654c2..000000000000
--- a/www/gtkhtml3/files/patch-src_htmltext.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/htmltext.c.orig Wed Dec 8 01:45:57 2004
-+++ src/htmltext.c Wed Dec 8 01:46:10 2004
-@@ -2433,10 +2433,11 @@
- gsize
- html_text_sanitize (const gchar **str, gint *len)
- {
-+ gchar *end;
- g_return_val_if_fail (str != NULL, 0);
- g_return_val_if_fail (len != NULL, 0);
-
-- gchar *end = offset_to_pointer_validated (*str, *len, len);
-+ end = offset_to_pointer_validated (*str, *len, len);
- if (end) {
- return end - *str;
- } else {
diff --git a/www/gtkhtml3/pkg-plist b/www/gtkhtml3/pkg-plist
index b03ec689fc53..9bb8dfce8c6f 100644
--- a/www/gtkhtml3/pkg-plist
+++ b/www/gtkhtml3/pkg-plist
@@ -94,6 +94,7 @@ 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/dz/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/el/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/en_CA/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/en_GB/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
@@ -113,7 +114,9 @@ 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/ka/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/ko/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/ku/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/lt/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/lv/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/mk/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
@@ -138,12 +141,18 @@ share/locale/sr/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/sr@Latn/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/sv/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/ta/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/th/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/tr/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/uk/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/vi/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/xh/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/zh_CN/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/zh_HK/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/zh_TW/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
@dirrm share/gnome/gtkhtml-%%VERSION%%/icons
@dirrm share/gnome/gtkhtml-%%VERSION%%
@dirrm lib/gtkhtml
diff --git a/www/gtkhtml38/Makefile b/www/gtkhtml38/Makefile
index 5afc4a824318..d7e40fc2888b 100644
--- a/www/gtkhtml38/Makefile
+++ b/www/gtkhtml38/Makefile
@@ -3,15 +3,14 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/www/gtkhtml3/Makefile,v 1.62 2005/10/03 15:21:56 ahze Exp $
+# $MCom: ports/www/gtkhtml3/Makefile,v 1.77 2006/04/13 07:52:39 bland Exp $
#
PORTNAME= gtkhtml3
-PORTVERSION= 3.8.2
-PORTREVISION= 1
+PORTVERSION= 3.10.1
CATEGORIES= www gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME:S/3$//}/3.8
+MASTER_SITE_SUBDIR= sources/${PORTNAME:S/3$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DISTNAME= ${PORTNAME:S/3$//}-${PORTVERSION}
DIST_SUBDIR= gnome2
@@ -20,13 +19,14 @@ COMMENT= Lightweight HTML rendering/printing/editing engine
LIB_DEPENDS= soup-2.2.8:${PORTSDIR}/devel/libsoup
+USE_GETTEXT= yes
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack intlhack gail libgnomeui \
libgnomeprintui ltverhack
INSTALLS_SHLIB= yes
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/www/gtkhtml38/distinfo b/www/gtkhtml38/distinfo
index 0af85a2477c8..24036a9892c8 100644
--- a/www/gtkhtml38/distinfo
+++ b/www/gtkhtml38/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gtkhtml-3.8.2.tar.bz2) = 4455e24142cc914f00f1e8b81940df68
-SHA256 (gnome2/gtkhtml-3.8.2.tar.bz2) = d8fc9e7111773448bb07cc2619fbc3b8534a14a9b3075724465c7567cf1a94d0
-SIZE (gnome2/gtkhtml-3.8.2.tar.bz2) = 1247395
+MD5 (gnome2/gtkhtml-3.10.1.tar.bz2) = f2b7ff386dae9fcc3b01c4116564722d
+SHA256 (gnome2/gtkhtml-3.10.1.tar.bz2) = e2a1910fccc4f081f70028cf28a82406cf81bf1e8a0b4fd1d44898c2bb4b59ba
+SIZE (gnome2/gtkhtml-3.10.1.tar.bz2) = 1264910
diff --git a/www/gtkhtml38/files/patch-src_htmltext.c b/www/gtkhtml38/files/patch-src_htmltext.c
deleted file mode 100644
index f970e5b654c2..000000000000
--- a/www/gtkhtml38/files/patch-src_htmltext.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/htmltext.c.orig Wed Dec 8 01:45:57 2004
-+++ src/htmltext.c Wed Dec 8 01:46:10 2004
-@@ -2433,10 +2433,11 @@
- gsize
- html_text_sanitize (const gchar **str, gint *len)
- {
-+ gchar *end;
- g_return_val_if_fail (str != NULL, 0);
- g_return_val_if_fail (len != NULL, 0);
-
-- gchar *end = offset_to_pointer_validated (*str, *len, len);
-+ end = offset_to_pointer_validated (*str, *len, len);
- if (end) {
- return end - *str;
- } else {
diff --git a/www/gtkhtml38/pkg-plist b/www/gtkhtml38/pkg-plist
index b03ec689fc53..9bb8dfce8c6f 100644
--- a/www/gtkhtml38/pkg-plist
+++ b/www/gtkhtml38/pkg-plist
@@ -94,6 +94,7 @@ 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/dz/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/el/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/en_CA/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/en_GB/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
@@ -113,7 +114,9 @@ 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/ka/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/ko/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/ku/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/lt/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/lv/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/mk/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
@@ -138,12 +141,18 @@ share/locale/sr/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/sr@Latn/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/sv/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/ta/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/th/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/tr/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/uk/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/vi/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/xh/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/zh_CN/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/zh_HK/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/zh_TW/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
@dirrm share/gnome/gtkhtml-%%VERSION%%/icons
@dirrm share/gnome/gtkhtml-%%VERSION%%
@dirrm lib/gtkhtml
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-03 18:31:09 +0000