diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2008-03-24 03:52:36 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2008-03-24 03:52:36 +0000 |
| commit | 6f32add9a75efb180e462ffbdb0b080bc88088e3 (patch) | |
| tree | 0fc7af36e22fc0dc7c1dc8aacabf6fe117e881da /www | |
| parent | b8d245fedd5842fb6d68d0bdc6539885555a84e3 (diff) | |
Notes
Diffstat (limited to 'www')
30 files changed, 847 insertions, 104 deletions
diff --git a/www/Makefile b/www/Makefile index f8cb956ad92b..7376c51aafcd 100644 --- a/www/Makefile +++ b/www/Makefile @@ -168,6 +168,7 @@ SUBDIR += entrans SUBDIR += epiphany SUBDIR += epiphany-extensions + SUBDIR += epiphany-webkit SUBDIR += erwn SUBDIR += etoile-bookmarkkit SUBDIR += etoile-mollusk @@ -330,6 +331,7 @@ SUBDIR += mhonarc SUBDIR += micro_httpd SUBDIR += middleman + SUBDIR += midori SUBDIR += mimetex SUBDIR += mini_httpd SUBDIR += mkapachepw @@ -1319,6 +1321,7 @@ SUBDIR += webfs SUBDIR += webglimpse SUBDIR += webinject + SUBDIR += webkit-gtk2 SUBDIR += weblint SUBDIR += weblint++ SUBDIR += webredirect diff --git a/www/epiphany-extensions/Makefile b/www/epiphany-extensions/Makefile index 4aca8285d20a..f4147b6f87aa 100644 --- a/www/epiphany-extensions/Makefile +++ b/www/epiphany-extensions/Makefile @@ -3,14 +3,13 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/www/epiphany-extensions/Makefile,v 1.101 2007/10/15 22:00:17 mezz Exp $ +# $MCom: ports/www/epiphany-extensions/Makefile,v 1.105 2008/03/11 17:19:08 mezz Exp $ # PORTNAME= epiphany-extensions -PORTVERSION= 2.20.3 +PORTVERSION= 2.22.0 CATEGORIES= www gnome -MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} +MASTER_SITES= GNOME DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -35,9 +34,9 @@ CONFIGURE_ARGS= --with-mozilla=${GECKO} GCONF_SCHEMAS= smart-bookmarks.schemas EPHY_EXTENSIONS=all,rss -EPHY_VERSION= 2.20 +EPHY_VERSION= 2.22 -PLIST_SUB= VERSION="2.20" EPHY_VERSION=${EPHY_VERSION} +PLIST_SUB= VERSION="2.22" EPHY_VERSION=${EPHY_VERSION} OPTIONS= OPENSP "Enable OpenSP SGML support" off diff --git a/www/epiphany-extensions/distinfo b/www/epiphany-extensions/distinfo index 993d27d10568..3bbce21aae97 100644 --- a/www/epiphany-extensions/distinfo +++ b/www/epiphany-extensions/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/epiphany-extensions-2.20.3.tar.bz2) = 86563cb1e7cda31d45f220ae2e185fef -SHA256 (gnome2/epiphany-extensions-2.20.3.tar.bz2) = 3b19652c6717d9f1dbfc2b855e9777e58623247765accbe8cfc7b86cb840aea2 -SIZE (gnome2/epiphany-extensions-2.20.3.tar.bz2) = 909040 +MD5 (gnome2/epiphany-extensions-2.22.0.tar.bz2) = 05b131995c532f2689150c731b2f37c1 +SHA256 (gnome2/epiphany-extensions-2.22.0.tar.bz2) = 8d9b57aa22bbb318650dcb6dd73bec1951e9cb5ae64f37d84e39749fdbdd0754 +SIZE (gnome2/epiphany-extensions-2.22.0.tar.bz2) = 926352 diff --git a/www/epiphany-extensions/pkg-plist b/www/epiphany-extensions/pkg-plist index f107dc0306ba..b1021240d76f 100644 --- a/www/epiphany-extensions/pkg-plist +++ b/www/epiphany-extensions/pkg-plist @@ -62,7 +62,6 @@ lib/epiphany/%%VERSION%%/extensions/smart-bookmarks.ephy-extension lib/epiphany/%%VERSION%%/extensions/tab-groups.ephy-extension lib/epiphany/%%VERSION%%/extensions/tab-states.ephy-extension %%DATADIR%%/adblock-patterns -%%DATADIR%%/adblock-statusbar-icon.svg %%DATADIR%%/ephy-gestures.xml %%DATADIR%%/glade/action-properties.glade %%DATADIR%%/glade/actions-editor.glade @@ -73,8 +72,11 @@ lib/epiphany/%%VERSION%%/extensions/tab-states.ephy-extension %%DATADIR%%/glade/rss-ui.glade %%DATADIR%%/xml/epiphany-sidebar-ui.xml %%DATADIR%%/xml/page-info-context-ui.xml +share/epiphany/icons/hicolor/16x16/status/ad-blocked.png share/epiphany/icons/hicolor/16x16/status/feed-presence.png +share/epiphany/icons/hicolor/22x22/status/ad-blocked.png share/epiphany/icons/hicolor/22x22/status/feed-presence.png +share/epiphany/icons/hicolor/24x24/status/ad-blocked.png share/epiphany/icons/hicolor/24x24/status/feed-presence.png share/epiphany/icons/hicolor/32x32/status/feed-presence.png share/epiphany/icons/hicolor/scalable/status/feed-presence.svg @@ -99,6 +101,46 @@ 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/help/epiphany-extensions/es/epiphany-extensions.xml +share/gnome/help/epiphany-extensions/es/figures/epi-ext-action-create.png +share/gnome/help/epiphany-extensions/es/figures/epi-ext-adblocker.png +share/gnome/help/epiphany-extensions/es/figures/epi-ext-gestures-back.png +share/gnome/help/epiphany-extensions/es/figures/epi-ext-gestures-close-2.png +share/gnome/help/epiphany-extensions/es/figures/epi-ext-gestures-close.png +share/gnome/help/epiphany-extensions/es/figures/epi-ext-gestures-forward.png +share/gnome/help/epiphany-extensions/es/figures/epi-ext-gestures-fullscreen.png +share/gnome/help/epiphany-extensions/es/figures/epi-ext-gestures-homepage.png +share/gnome/help/epiphany-extensions/es/figures/epi-ext-gestures-new-tab.png +share/gnome/help/epiphany-extensions/es/figures/epi-ext-gestures-new-window.png +share/gnome/help/epiphany-extensions/es/figures/epi-ext-gestures-next-tab.png +share/gnome/help/epiphany-extensions/es/figures/epi-ext-gestures-prev-tab.png +share/gnome/help/epiphany-extensions/es/figures/epi-ext-gestures-reload.png +share/gnome/help/epiphany-extensions/es/figures/epi-ext-gestures-stop.png +share/gnome/help/epiphany-extensions/es/figures/epi-ext-gestures-up.png +share/gnome/help/epiphany-extensions/es/figures/epi-ext-gestures-view-source-2.png +share/gnome/help/epiphany-extensions/es/figures/epi-ext-gestures-view-source.png +share/gnome/help/epiphany-extensions/es/figures/epi-ext-sidebar.png +share/gnome/help/epiphany-extensions/es/figures/epi-ext-tabgroups.png +share/gnome/help/epiphany-extensions/oc/epiphany-extensions.xml +share/gnome/help/epiphany-extensions/oc/figures/epi-ext-action-create.png +share/gnome/help/epiphany-extensions/oc/figures/epi-ext-adblocker.png +share/gnome/help/epiphany-extensions/oc/figures/epi-ext-gestures-back.png +share/gnome/help/epiphany-extensions/oc/figures/epi-ext-gestures-close-2.png +share/gnome/help/epiphany-extensions/oc/figures/epi-ext-gestures-close.png +share/gnome/help/epiphany-extensions/oc/figures/epi-ext-gestures-forward.png +share/gnome/help/epiphany-extensions/oc/figures/epi-ext-gestures-fullscreen.png +share/gnome/help/epiphany-extensions/oc/figures/epi-ext-gestures-homepage.png +share/gnome/help/epiphany-extensions/oc/figures/epi-ext-gestures-new-tab.png +share/gnome/help/epiphany-extensions/oc/figures/epi-ext-gestures-new-window.png +share/gnome/help/epiphany-extensions/oc/figures/epi-ext-gestures-next-tab.png +share/gnome/help/epiphany-extensions/oc/figures/epi-ext-gestures-prev-tab.png +share/gnome/help/epiphany-extensions/oc/figures/epi-ext-gestures-reload.png +share/gnome/help/epiphany-extensions/oc/figures/epi-ext-gestures-stop.png +share/gnome/help/epiphany-extensions/oc/figures/epi-ext-gestures-up.png +share/gnome/help/epiphany-extensions/oc/figures/epi-ext-gestures-view-source-2.png +share/gnome/help/epiphany-extensions/oc/figures/epi-ext-gestures-view-source.png +share/gnome/help/epiphany-extensions/oc/figures/epi-ext-sidebar.png +share/gnome/help/epiphany-extensions/oc/figures/epi-ext-tabgroups.png share/gnome/help/epiphany-extensions/sv/epiphany-extensions.xml share/gnome/help/epiphany-extensions/sv/figures/epi-ext-action-create.png share/gnome/help/epiphany-extensions/sv/figures/epi-ext-adblocker.png @@ -133,6 +175,7 @@ share/locale/es/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo share/locale/fi/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo share/locale/fr/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo share/locale/gl/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo +share/locale/he/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo share/locale/hr/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo share/locale/hu/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo share/locale/it/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo @@ -163,10 +206,16 @@ share/locale/zh_CN/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo share/locale/zh_HK/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo share/locale/zh_TW/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo share/omf/epiphany-extensions/epiphany-extensions-C.omf +share/omf/epiphany-extensions/epiphany-extensions-es.omf +share/omf/epiphany-extensions/epiphany-extensions-oc.omf share/omf/epiphany-extensions/epiphany-extensions-sv.omf @dirrm share/omf/epiphany-extensions @dirrm share/gnome/help/epiphany-extensions/sv/figures @dirrm share/gnome/help/epiphany-extensions/sv +@dirrm share/gnome/help/epiphany-extensions/oc/figures +@dirrm share/gnome/help/epiphany-extensions/oc +@dirrm share/gnome/help/epiphany-extensions/es/figures +@dirrm share/gnome/help/epiphany-extensions/es @dirrm share/gnome/help/epiphany-extensions/C/figures @dirrm share/gnome/help/epiphany-extensions/C @dirrm share/gnome/help/epiphany-extensions diff --git a/www/epiphany-webkit/Makefile b/www/epiphany-webkit/Makefile new file mode 100644 index 000000000000..6df29de16439 --- /dev/null +++ b/www/epiphany-webkit/Makefile @@ -0,0 +1,17 @@ +# New ports collection makefile for: epiphany-webkit +# Date created: 2007-10-21 +# Whom: Michael Johnson <ahze@FreeBSD.org> +# +# $FreeBSD$ +# $MCom: ports/www/epiphany-webkit/Makefile,v 1.2 2008/02/24 22:10:56 ahze Exp $ + +PORTVERSION= 1 +PKGNAMESUFFIX= -webkit + +COMMENT= An extremely lightweight GNOME browser using the WebKit engine + +EPHY_SLAVE= webkit +MASTERDIR= ${.CURDIR}/../../www/epiphany +PLIST= ${.CURDIR}/pkg-plist + +.include "${MASTERDIR}/Makefile" diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile index a8fac99902e6..56940c94f261 100644 --- a/www/epiphany/Makefile +++ b/www/epiphany/Makefile @@ -3,20 +3,22 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports-stable/www/epiphany/Makefile,v 1.8 2007/12/01 19:54:36 marcus Exp $ +# $MCom: ports/www/epiphany/Makefile,v 1.168 2008/03/17 05:00:09 marcus Exp $ # PORTNAME= epiphany -PORTVERSION= 2.20.3 +PORTVERSION= 2.22.0 +PORTREVISION= 1 CATEGORIES= www gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org -COMMENT= An extremely lightweight and simple web browser for GNOME 2 +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-glib-1.2:${PORTSDIR}/devel/dbus-glib +LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ + notify.1:${PORTSDIR}/devel/libnotify RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \ ${LOCALBASE}/share/themes/LowContrast/index.theme:${PORTSDIR}/x11-themes/gnome-themes @@ -27,21 +29,18 @@ USE_BZIP2= yes USE_XLIB= yes USE_PYTHON= yes GNOME_DESKTOP_VERSION=2 -USE_GECKO= firefox seamonkey firefox15<->firefox xulrunner USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop desktopfileutils WANT_GNOME= yes GNU_CONFIGURE= yes USE_GMAKE= yes INSTALLS_OMF= yes -CONFIGURE_ARGS= --with-gecko=${GECKO} -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ - LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS} ${EXTRA_CFLAGS}" \ + LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS} ${EXTRA_LIBS}" GCONF_SCHEMAS= epiphany-lockdown.schemas epiphany.schemas \ epiphany-fonts.schemas epiphany-pango.schemas -PLIST_SUB+= EPHY_VERSION="${PORTVERSION:C/\.[0-9]+$//}" \ - EPHY_PREFIX="${PREFIX}" +PLIST_SUB+= EPHY_VERSION="${PORTVERSION:C/\.[0-9]+$//}" MAN1= epiphany.1 @@ -53,8 +52,20 @@ WITH_GNOME= yes .endif .include <bsd.port.pre.mk> + +.if defined(EPHY_SLAVE) && ${EPHY_SLAVE}=="webkit" +LIB_DEPENDS+= WebKitGtk.1:${PORTSDIR}/www/webkit-gtk2 +CONFIGURE_ARGS+= --with-engine=webkit +EXTRA_CFLAGS+= `pkg-config --cflags WebKitGtk` -I${LOCALBASE}/include/WebKit/webkit +EXTRA_LIBS+= `pkg-config --libs WebKitGtk` +CONFLICTS= epiphany-[1-9]* +.else +USE_GECKO+= firefox seamonkey firefox15<->firefox xulrunner +CONFIGURE_ARGS+= --with-gecko=${GECKO} \ + --with-engine=mozilla .include "${PORTSDIR}/www/mozilla/bsd.gecko.mk" -#.include "${.CURDIR}/../../www/mozilla/bsd.gecko.mk" +CONFLICTS= epiphany-webkit-[1-9]* +.endif NO_WERROR= yes # allow build with more warnings enabled @@ -79,6 +90,7 @@ CONFIGURE_ARGS+=--enable-spell-checker .endif post-patch: + @${REINPLACE_CMD} -e 's|WebKitGdk|WebKitGtk|' ${WRKSRC}/configure @${FIND} ${WRKSRC} -name "Makefile.in*" | ${XARGS} ${REINPLACE_CMD} -e \ 's|-lpthread|${PTHREAD_LIBS}|g' @${REINPLACE_CMD} -e 's|execinfo.h|#|g' \ diff --git a/www/epiphany/distinfo b/www/epiphany/distinfo index e9e986d6f7be..20a0b5c1e39a 100644 --- a/www/epiphany/distinfo +++ b/www/epiphany/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/epiphany-2.20.3.tar.bz2) = df2861b3e91bef6d365f50187b6170cb -SHA256 (gnome2/epiphany-2.20.3.tar.bz2) = a76268f0b842b9f9f2545717273062aeba84351208110064da55f3fe5277a9ca -SIZE (gnome2/epiphany-2.20.3.tar.bz2) = 4945544 +MD5 (gnome2/epiphany-2.22.0.tar.bz2) = 81ad67d1ad706930a295a7ed9887bf5f +SHA256 (gnome2/epiphany-2.22.0.tar.bz2) = 692c642f99ea52ac86acf1c00c31f2567cba1e155e5d93462625bd208dca7122 +SIZE (gnome2/epiphany-2.22.0.tar.bz2) = 5163182 diff --git a/www/epiphany/files/patch-lib_ephy-spell-check.c b/www/epiphany/files/patch-lib_ephy-spell-check.c new file mode 100644 index 000000000000..bd68a07d94df --- /dev/null +++ b/www/epiphany/files/patch-lib_ephy-spell-check.c @@ -0,0 +1,20 @@ +--- lib/ephy-spell-check.c.orig 2008-03-17 00:41:47.000000000 -0400 ++++ lib/ephy-spell-check.c 2008-03-17 00:47:22.000000000 -0400 +@@ -69,8 +69,15 @@ ephy_spell_check_init (EphySpellCheck *s + priv->dict = enchant_broker_request_dict (priv->broker, *locale); + if (priv->dict != NULL) break; + } +- if (priv->dict == NULL) +- g_warning (enchant_broker_get_error (priv->broker)); ++ if (priv->dict == NULL) { ++ g_warning ("No dictionary found for current locale; trying 'en'"); ++ priv->dict = enchant_broker_request_dict (priv->broker, "en"); ++ ++ if (priv->dict == NULL) { ++ g_warning (enchant_broker_get_error (priv->broker)); ++ g_warning ("No dictionary found; expect a crash until LANG is properly set"); ++ } ++ } + } + + static void diff --git a/www/epiphany/files/patch-src_bookmarks_ephy-bookmarks.c b/www/epiphany/files/patch-src_bookmarks_ephy-bookmarks.c index 146b9e594529..afe4f26f1a41 100644 --- a/www/epiphany/files/patch-src_bookmarks_ephy-bookmarks.c +++ b/www/epiphany/files/patch-src_bookmarks_ephy-bookmarks.c @@ -1,14 +1,498 @@ ---- 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 [] = +--- src/bookmarks/ephy-bookmarks.c 2008/01/14 19:29:31 7863 ++++ src/bookmarks/ephy-bookmarks.c 2008/03/13 14:09:36 8102 +@@ -136,39 +136,10 @@ + static void ephy_bookmarks_finalize (GObject *object); + static char *impl_resolve_address (EphyBookmarks*, const char*, const char*); + +-static GObjectClass *parent_class = NULL; +- +-GType +-ephy_bookmarks_get_type (void) +-{ +- static GType type = 0; +- +- if (G_UNLIKELY (type == 0)) +- { +- const GTypeInfo our_info = +- { +- sizeof (EphyBookmarksClass), +- NULL, /* base_init */ +- NULL, /* base_finalize */ +- (GClassInitFunc) ephy_bookmarks_class_init, +- NULL, +- NULL, /* class_data */ +- sizeof (EphyBookmarks), +- 0, /* n_preallocs */ +- (GInstanceInitFunc) ephy_bookmarks_init +- }; +- volatile GType flags_type; /* work around gcc's optimiser */ +- +- /* make sure the flags type is known */ +- flags_type = EPHY_TYPE_BOOKMARK_PROPERTY; +- +- type = g_type_register_static (G_TYPE_OBJECT, +- "EphyBookmarks", +- &our_info, 0); +- } +- +- return type; +-} ++G_DEFINE_TYPE_WITH_CODE (EphyBookmarks, ephy_bookmarks, G_TYPE_OBJECT, ++ volatile GType flags_type; /* work around gcc's optimiser */ ++ /* make sure the flags type is known */ ++ flags_type = EPHY_TYPE_BOOKMARK_PROPERTY;) + + static void + ephy_bookmarks_init_defaults (EphyBookmarks *eb) +@@ -194,8 +165,6 @@ + { + GObjectClass *object_class = G_OBJECT_CLASS (klass); + +- parent_class = g_type_class_peek_parent (klass); +- + object_class->finalize = ephy_bookmarks_finalize; + + klass->resolve_address = impl_resolve_address; +@@ -799,7 +768,10 @@ + char *key_dup, *value_dup; + char *raw_txt; + size_t raw_txt_len; +- ++ ++ if (!input_text) ++ return NULL; ++ + raw_txt_len = avahi_string_list_serialize (input_text, NULL, 0); + raw_txt = g_malloc (raw_txt_len); + raw_txt_len = avahi_string_list_serialize (input_text, raw_txt, raw_txt_len); +@@ -868,41 +840,14 @@ + name); + } + +-static EphyNode * +-get_node_for_id (EphyBookmarks *bookmarks, +- char *node_id) +-{ +- EphyBookmarksPrivate *priv = bookmarks->priv; +- EphyNode *kid, *node = NULL; +- GPtrArray *children; +- const char *id; +- guint i; +- +- children = ephy_node_get_children (priv->local); +- for (i = 0; i < children->len; i++) +- { +- kid = g_ptr_array_index (children, i); +- +- id = ephy_node_get_property_string (kid, +- EPHY_NODE_BMK_PROP_SERVICE_ID); +- +- if (g_str_equal (id, node_id)) +- { +- node = kid; +- break; +- } +- } +- +- g_free (node_id); +- +- return node; +-} +- + typedef struct + { + EphyBookmarks *bookmarks; ++ GaServiceResolver *resolver; + EphyNode *node; +- guint new_node : 1; ++ char *name; ++ char *type; ++ char *domain; + } ResolveData; + + static void +@@ -921,20 +866,20 @@ + { + EphyBookmarks *bookmarks = data->bookmarks; + EphyBookmarksPrivate *priv = bookmarks->priv; +- EphyNode *node = data->node; + GValue value = { 0, }; + const char *path = NULL; + char host[128]; + GHashTable *text_table; + char *url; + gboolean was_immutable; ++ gboolean is_new_node = FALSE; + guint i; + ++ LOG ("resolver_found_cb resolver %p\n", resolver); ++ + was_immutable = ephy_node_db_is_immutable (priv->db); + ephy_node_db_set_immutable (priv->db, FALSE); + +- g_hash_table_steal (priv->resolve_handles, node); +- + /* Find the protocol */ + for (i = 0; i < G_N_ELEMENTS (zeroconf_protos); ++i) + { +@@ -945,6 +890,12 @@ + } + if (i == G_N_ELEMENTS (zeroconf_protos)) return; + ++ if (address == NULL) ++ { ++ g_warning ("Zeroconf failed to resolve host %s", name); ++ return; ++ } ++ + text_table = decode_txt_record (txt); + + if (text_table != NULL) +@@ -956,32 +907,60 @@ + path = "/"; + } + +- if (address == NULL) +- { +- g_warning ("Zeroconf failed to resolve host %s", name); +- return; +- } + avahi_address_snprint (host, sizeof (host), address); + + LOG ("0conf RESOLVED type=%s domain=%s name=%s => proto=%s host=%s port=%d path=%s\n", + type, domain, name, + zeroconf_protos[i], host, port, path); + ++ was_immutable = ephy_node_db_is_immutable (priv->db); ++ ephy_node_db_set_immutable (priv->db, FALSE); ++ ++ if (data->node == NULL) ++ { ++ is_new_node = TRUE; ++ ++ data->node = ephy_node_new (priv->db); ++ g_assert (data->node != NULL); ++ ++ /* don't allow dragging this node */ ++ ephy_node_set_is_drag_source (data->node, FALSE); ++ ++ g_value_init (&value, G_TYPE_STRING); ++ g_value_take_string (&value, ++ get_id_for_response (data->type, ++ data->domain, ++ data->name)); ++ ephy_node_set_property (data->node, EPHY_NODE_BMK_PROP_SERVICE_ID, &value); ++ g_value_unset (&value); ++ ++ /* FIXME: limit length! */ ++ ephy_node_set_property_string (data->node, ++ EPHY_NODE_BMK_PROP_TITLE, ++ name); ++ ++ ephy_node_set_property_boolean (data->node, ++ EPHY_NODE_BMK_PROP_IMMUTABLE, ++ TRUE); ++ } ++ + /* FIXME: limit length! */ + url = g_strdup_printf ("%s://%s:%d%s", zeroconf_protos[i], host, port, path); + + g_value_init (&value, G_TYPE_STRING); + g_value_take_string (&value, url); +- ephy_node_set_property (node, EPHY_NODE_BMK_PROP_LOCATION, &value); ++ ephy_node_set_property (data->node, EPHY_NODE_BMK_PROP_LOCATION, &value); + g_value_unset (&value); + +- if (data->new_node) ++ if (is_new_node) + { +- ephy_node_add_child (priv->bookmarks, node); +- ephy_node_add_child (priv->local, node); ++ ephy_node_add_child (priv->bookmarks, data->node); ++ ephy_node_add_child (priv->local, data->node); + } + + ephy_node_db_set_immutable (priv->db, was_immutable); ++ ++ g_hash_table_unref (text_table); + } + + static void +@@ -989,53 +968,33 @@ + GError *error, + ResolveData *data) + { +- EphyBookmarks *bookmarks = data->bookmarks; +- EphyBookmarksPrivate *priv = bookmarks->priv; +- EphyNode *node = data->node; +- gboolean was_immutable; ++ LOG ("resolver_failure_cb resolver %p: %s\n", resolver, error?error->message:"(null)"); + +- was_immutable = ephy_node_db_is_immutable (priv->db); +- ephy_node_db_set_immutable (priv->db, FALSE); +- +- g_hash_table_steal (priv->resolve_handles, node); +- +- /* Error, don't add the service */ +- ephy_node_unref (node); +- ephy_node_db_set_immutable (priv->db, was_immutable); +- +- return; +-} ++ /* Remove the node, if present */ ++ if (data->node != NULL) ++ { ++ EphyBookmarks *bookmarks = data->bookmarks; ++ EphyBookmarksPrivate *priv = bookmarks->priv; ++ gboolean was_immutable; + +-static void +-free_resolve_cb_data (gpointer data) +-{ +- g_slice_free (ResolveData, data); ++ was_immutable = ephy_node_db_is_immutable (priv->db); ++ ephy_node_db_set_immutable (priv->db, FALSE); ++ ephy_node_unref (data->node); ++ data->node = NULL; ++ ephy_node_db_set_immutable (priv->db, was_immutable); ++ } + } + + static void +-browser_removed_service_cb (GaServiceBrowser *browser, +- int interface, +- GaProtocol protocol, +- const char *name, +- const char *type, +- const char *domain, +- glong flags, +- EphyBookmarks *bookmarks) ++resolve_data_free (ResolveData* data) + { +- EphyBookmarksPrivate *priv = bookmarks->priv; +- EphyNode *node; +- char *node_id; +- +- node_id = get_id_for_response (type, domain, name); +- node = get_node_for_id (bookmarks, node_id); ++ if (data->resolver) ++ g_object_unref (data->resolver); + +- if (node != NULL) +- { +- g_hash_table_remove (priv->resolve_handles, node); +- ephy_node_unref (node); +- } +- +- return; ++ g_free (data->type); ++ g_free (data->name); ++ g_free (data->domain); ++ g_slice_free (ResolveData, data); + } + + static void +@@ -1049,81 +1008,88 @@ + EphyBookmarks *bookmarks) + { + EphyBookmarksPrivate *priv = bookmarks->priv; +- EphyNode *node; +- GValue value = { 0, }; +- gboolean new_node = FALSE; +- GaServiceResolver *resolver = NULL; + ResolveData *data; + char *node_id; ++ GError *error = NULL; + + node_id = get_id_for_response (type, domain, name); +- node = get_node_for_id (bookmarks, node_id); + + LOG ("0conf ADD: type=%s domain=%s name=%s\n", + type, domain, name); + +- if (node != NULL && +- g_hash_table_lookup (priv->resolve_handles, node) != NULL) return; +- +- if (node == NULL) ++ if (g_hash_table_lookup (priv->resolve_handles, node_id) != NULL) + { +- gboolean was_immutable; +- +- was_immutable = ephy_node_db_is_immutable (priv->db); +- ephy_node_db_set_immutable (priv->db, FALSE); +- +- node = ephy_node_new (priv->db); +- g_assert (node != NULL); +- +- new_node = TRUE; +- +- /* don't allow dragging this node */ +- ephy_node_set_is_drag_source (node, FALSE); +- +- g_value_init (&value, G_TYPE_STRING); +- g_value_take_string (&value, get_id_for_response (type, domain, name)); +- ephy_node_set_property (node, EPHY_NODE_BMK_PROP_SERVICE_ID, &value); +- g_value_unset (&value); +- +- /* FIXME: limit length! */ +- ephy_node_set_property_string (node, +- EPHY_NODE_BMK_PROP_TITLE, +- name); +- +- ephy_node_set_property_boolean (node, +- EPHY_NODE_BMK_PROP_IMMUTABLE, +- TRUE); +- +- ephy_node_db_set_immutable (priv->db, was_immutable); ++ g_free (node_id); ++ return; + } + + data = g_slice_new0 (ResolveData); + data->bookmarks = bookmarks; +- data->node = node; +- data->new_node = new_node; +- +- resolver = ga_service_resolver_new (AVAHI_IF_UNSPEC, +- AVAHI_PROTO_UNSPEC, +- name, type, domain, +- AVAHI_PROTO_UNSPEC, +- GA_LOOKUP_USE_MULTICAST); +- g_signal_connect_data (resolver, "found", +- G_CALLBACK (resolver_found_cb), data, +- (GClosureNotify) free_resolve_cb_data, 0); +- g_signal_connect_data (resolver, "failure", +- G_CALLBACK (resolver_failure_cb), data, +- (GClosureNotify) free_resolve_cb_data, 0); +- if (!ga_service_resolver_attach (resolver, ++ data->node = NULL; ++ data->type = g_strdup (type); ++ data->name = g_strdup (name); ++ data->domain = g_strdup (domain); ++ ++ data->resolver = ga_service_resolver_new (AVAHI_IF_UNSPEC, ++ AVAHI_PROTO_UNSPEC, ++ name, type, domain, ++ AVAHI_PROTO_UNSPEC, ++ GA_LOOKUP_USE_MULTICAST); ++ g_signal_connect (data->resolver, "found", ++ G_CALLBACK (resolver_found_cb), data); ++ g_signal_connect (data->resolver, "failure", ++ G_CALLBACK (resolver_failure_cb), data); ++ if (!ga_service_resolver_attach (data->resolver, + priv->ga_client, +- NULL)) ++ &error)) + { +- g_warning ("Unable to resolve Zeroconf service %s", name); +- ephy_node_unref (node); +- free_resolve_cb_data (data); ++ g_warning ("Unable to resolve Zeroconf service %s: %s", name, error ? error->message : "(null)"); ++ g_clear_error (&error); ++ resolve_data_free (data); ++ g_free (node_id); + return; + } ++ + g_hash_table_insert (priv->resolve_handles, +- node, resolver); ++ node_id /* transfer ownership */, data); ++} ++ ++static void ++browser_removed_service_cb (GaServiceBrowser *browser, ++ int interface, ++ GaProtocol protocol, ++ const char *name, ++ const char *type, ++ const char *domain, ++ glong flags, ++ EphyBookmarks *bookmarks) ++{ ++ EphyBookmarksPrivate *priv = bookmarks->priv; ++ char *node_id; ++ ResolveData *data; ++ ++ node_id = get_id_for_response (type, domain, name); ++ data = g_hash_table_lookup (priv->resolve_handles, node_id); ++ /* shouldn't really happen, but let's play safe */ ++ if (!data) ++ { ++ g_free (node_id); ++ return; ++ } ++ ++ if (data->node != NULL) ++ { ++ gboolean was_immutable; ++ ++ was_immutable = ephy_node_db_is_immutable (priv->db); ++ ephy_node_db_set_immutable (priv->db, FALSE); ++ ephy_node_unref (data->node); ++ data->node = NULL; ++ ephy_node_db_set_immutable (priv->db, was_immutable); ++ } ++ ++ g_hash_table_remove (priv->resolve_handles, node_id); ++ g_free (node_id); + } + + static void +@@ -1150,9 +1116,10 @@ + NULL)) + { + g_warning ("Unable to start Zeroconf subsystem"); ++ g_object_unref (browser); + return; + } +- ++ + priv->browse_handles[i] = browser; + } + } +@@ -1166,6 +1133,7 @@ + { + if (avahi_client_errno (ga_client->avahi_client) == AVAHI_ERR_DISCONNECTED) + { ++ /* FIXMEchpe: is this correct */ + /* Destroy and reconnect */ + avahi_client_free (ga_client->avahi_client); + ga_client->avahi_client = NULL; +@@ -1197,7 +1165,9 @@ + return; + } + priv->ga_client = ga_client; +- priv->resolve_handles = g_hash_table_new (g_direct_hash, g_direct_equal); ++ priv->resolve_handles = g_hash_table_new_full (g_str_hash, g_str_equal, ++ g_free, ++ (GDestroyNotify) resolve_data_free); + } + + static void +@@ -1210,6 +1180,7 @@ + { + if (priv->browse_handles[i] != NULL) + { ++ g_object_unref (priv->browse_handles[i]); + priv->browse_handles[i] = NULL; + } + } +@@ -1222,7 +1193,8 @@ + + if (priv->local != NULL) + { +- ephy_node_remove_child (priv->keywords, priv->local); ++ ephy_node_unref (priv->local); ++ priv->local = NULL; + } + + if (priv->ga_client != NULL) +@@ -1431,7 +1403,7 @@ + + LOG ("Bookmarks finalized"); + +- G_OBJECT_CLASS (parent_class)->finalize (object); ++ G_OBJECT_CLASS (ephy_bookmarks_parent_class)->finalize (object); + } + + EphyBookmarks * diff --git a/www/epiphany/pkg-plist b/www/epiphany/pkg-plist index d6d6bdc1e198..bfa3c00ccd56 100644 --- a/www/epiphany/pkg-plist +++ b/www/epiphany/pkg-plist @@ -1,12 +1,14 @@ 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-base-embed.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-container.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 @@ -14,9 +16,11 @@ 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-utils.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-item.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 @@ -30,8 +34,8 @@ 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-version.h include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-window.h lib/epiphany/%%EPHY_VERSION%%/plugins/libdesktopfileplugin.la lib/epiphany/%%EPHY_VERSION%%/plugins/libdesktopfileplugin.so @@ -43,7 +47,6 @@ share/dbus-1/services/org.gnome.Epiphany.service %%DOCSDIR%%/EphyCommandManager.html %%DOCSDIR%%/EphyEmbed.html %%DOCSDIR%%/EphyNodeDb.html -%%DOCSDIR%%/EphyTab.html %%DOCSDIR%%/EphyWindow.html %%DOCSDIR%%/ch01.html %%DOCSDIR%%/ch02.html @@ -220,6 +223,7 @@ share/icons/hicolor/48x48/apps/epiphany-bookmarks.png share/icons/hicolor/scalable/apps/gnome-web-browser.svg share/locale/am/LC_MESSAGES/epiphany.mo share/locale/ar/LC_MESSAGES/epiphany.mo +share/locale/as/LC_MESSAGES/epiphany.mo share/locale/az/LC_MESSAGES/epiphany.mo share/locale/be/LC_MESSAGES/epiphany.mo share/locale/be@latin/LC_MESSAGES/epiphany.mo @@ -254,6 +258,7 @@ 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/kn/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 @@ -292,8 +297,6 @@ share/locale/th/LC_MESSAGES/epiphany.mo share/locale/tk/LC_MESSAGES/epiphany.mo share/locale/tr/LC_MESSAGES/epiphany.mo share/locale/uk/LC_MESSAGES/epiphany.mo -share/locale/uz/LC_MESSAGES/epiphany.mo -share/locale/uz@cyrillic/LC_MESSAGES/epiphany.mo share/locale/vi/LC_MESSAGES/epiphany.mo share/locale/wa/LC_MESSAGES/epiphany.mo share/locale/zh_CN/LC_MESSAGES/epiphany.mo @@ -318,6 +321,9 @@ share/omf/epiphany/epiphany-sv.omf share/omf/epiphany/epiphany-uk.omf share/pygtk/2.0/defs/epiphany.defs @dirrm share/omf/epiphany +@dirrmtry share/icons/LowContrastLargePrint/48x48/apps +@dirrmtry share/icons/LowContrastLargePrint/48x48 +@dirrmtry share/icons/LowContrastLargePrint @dirrm share/gnome/help/epiphany/uk/figures @dirrm share/gnome/help/epiphany/uk @dirrm share/gnome/help/epiphany/sv/figures @@ -353,38 +359,39 @@ share/pygtk/2.0/defs/epiphany.defs @dirrm share/gnome/help/epiphany/C/figures @dirrm share/gnome/help/epiphany/C @dirrm share/gnome/help/epiphany -@dirrm %%DATADIR%%/icons/hicolor/scalable/status -@dirrm %%DATADIR%%/icons/hicolor/scalable/actions -@dirrm %%DATADIR%%/icons/hicolor/scalable -@dirrm %%DATADIR%%/icons/hicolor/48x48/status -@dirrm %%DATADIR%%/icons/hicolor/48x48 -@dirrm %%DATADIR%%/icons/hicolor/32x32/status -@dirrm %%DATADIR%%/icons/hicolor/32x32/actions -@dirrm %%DATADIR%%/icons/hicolor/32x32 -@dirrm %%DATADIR%%/icons/hicolor/24x24/status -@dirrm %%DATADIR%%/icons/hicolor/24x24/places -@dirrm %%DATADIR%%/icons/hicolor/24x24/actions -@dirrm %%DATADIR%%/icons/hicolor/24x24 -@dirrm %%DATADIR%%/icons/hicolor/22x22/status -@dirrm %%DATADIR%%/icons/hicolor/22x22/places -@dirrm %%DATADIR%%/icons/hicolor/22x22/actions -@dirrm %%DATADIR%%/icons/hicolor/22x22 -@dirrm %%DATADIR%%/icons/hicolor/16x16/status -@dirrm %%DATADIR%%/icons/hicolor/16x16/places -@dirrm %%DATADIR%%/icons/hicolor/16x16/actions -@dirrm %%DATADIR%%/icons/hicolor/16x16 -@dirrm %%DATADIR%%/icons/hicolor -@dirrm %%DATADIR%%/icons +@dirrmtry %%DATADIR%%/icons/hicolor/scalable/status +@dirrmtry %%DATADIR%%/icons/hicolor/scalable/actions +@dirrmtry %%DATADIR%%/icons/hicolor/scalable +@dirrmtry %%DATADIR%%/icons/hicolor/48x48/status +@dirrmtry %%DATADIR%%/icons/hicolor/48x48 +@dirrmtry %%DATADIR%%/icons/hicolor/32x32/status +@dirrmtry %%DATADIR%%/icons/hicolor/32x32/actions +@dirrmtry %%DATADIR%%/icons/hicolor/32x32 +@dirrmtry %%DATADIR%%/icons/hicolor/24x24/status +@dirrmtry %%DATADIR%%/icons/hicolor/24x24/places +@dirrmtry %%DATADIR%%/icons/hicolor/24x24/actions +@dirrmtry %%DATADIR%%/icons/hicolor/24x24 +@dirrmtry %%DATADIR%%/icons/hicolor/22x22/status +@dirrmtry %%DATADIR%%/icons/hicolor/22x22/places +@dirrmtry %%DATADIR%%/icons/hicolor/22x22/actions +@dirrmtry %%DATADIR%%/icons/hicolor/22x22 +@dirrmtry %%DATADIR%%/icons/hicolor/16x16/status +@dirrmtry %%DATADIR%%/icons/hicolor/16x16/places +@dirrmtry %%DATADIR%%/icons/hicolor/16x16/actions +@dirrmtry %%DATADIR%%/icons/hicolor/16x16 +@dirrmtry %%DATADIR%%/icons/hicolor +@dirrmtry %%DATADIR%%/icons @dirrm %%DATADIR%%/glade @dirrm %%DATADIR%%/chrome/global @dirrm %%DATADIR%%/chrome/branding @dirrm %%DATADIR%%/chrome @dirrm %%DATADIR%%/art -@dirrm %%DATADIR%% +@dirrmtry %%DATADIR%% @dirrm %%DOCSDIR%% -@dirrm lib/epiphany/%%EPHY_VERSION%%/plugins -@dirrm lib/epiphany/%%EPHY_VERSION%% -@dirrm lib/epiphany +@dirrmtry share/applications +@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 @@ -392,8 +399,6 @@ share/pygtk/2.0/defs/epiphany.defs @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK -@dirrmtry share/locale/uz@cyrillic/LC_MESSAGES -@dirrmtry share/locale/uz@cyrillic @dirrmtry share/locale/te/LC_MESSAGES @dirrmtry share/locale/te @dirrmtry share/locale/si/LC_MESSAGES @@ -416,4 +421,5 @@ share/pygtk/2.0/defs/epiphany.defs @dirrmtry share/locale/bn_IN @dirrmtry share/locale/be@latin/LC_MESSAGES @dirrmtry share/locale/be@latin -@dirrmtry share/applications +@dirrmtry share/locale/as/LC_MESSAGES +@dirrmtry share/locale/as diff --git a/www/evolution-webcal/Makefile b/www/evolution-webcal/Makefile index 105f4fc1eadf..0289aacac6f2 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.50 2007/09/16 16:52:22 ahze Exp $ +# $MCom: ports/www/evolution-webcal/Makefile,v 1.54 2008/02/25 10:46:40 kwm Exp $ # -PORTNAME= webcal -PORTVERSION= 2.12.0 +PORTNAME= evolution-webcal +PORTVERSION= 2.21.92 CATEGORIES= www gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PKGNAMEPREFIX}${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} -PKGNAMEPREFIX= evolution- DISTNAME= ${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION} MAINTAINER= gnome@FreeBSD.org diff --git a/www/evolution-webcal/distinfo b/www/evolution-webcal/distinfo index 882d3aec8b85..d5c1ae16d141 100644 --- a/www/evolution-webcal/distinfo +++ b/www/evolution-webcal/distinfo @@ -1,3 +1,3 @@ -MD5 (evolution-webcal-2.12.0.tar.bz2) = 21e77fa081decb87ce641f3a77245864 -SHA256 (evolution-webcal-2.12.0.tar.bz2) = f8445c3d93af4f8f4f325c5eb3fa94093f9eb299171a0983056d069e9658fc00 -SIZE (evolution-webcal-2.12.0.tar.bz2) = 193553 +MD5 (evolution-webcal-2.21.92.tar.bz2) = 049ea414f6d82a1e4b1e88f71a4f19cb +SHA256 (evolution-webcal-2.21.92.tar.bz2) = c583707d338edf7957a2f92804901569c9f6c1b2d16ba3682b92ba96fa300dca +SIZE (evolution-webcal-2.21.92.tar.bz2) = 199394 diff --git a/www/evolution-webcal/pkg-plist b/www/evolution-webcal/pkg-plist index 82f6d353b2fe..a7beaebff5b2 100644 --- a/www/evolution-webcal/pkg-plist +++ b/www/evolution-webcal/pkg-plist @@ -41,6 +41,7 @@ share/locale/ms/LC_MESSAGES/evolution-webcal.mo share/locale/nb/LC_MESSAGES/evolution-webcal.mo share/locale/ne/LC_MESSAGES/evolution-webcal.mo share/locale/nl/LC_MESSAGES/evolution-webcal.mo +share/locale/nn/LC_MESSAGES/evolution-webcal.mo share/locale/oc/LC_MESSAGES/evolution-webcal.mo share/locale/or/LC_MESSAGES/evolution-webcal.mo share/locale/pa/LC_MESSAGES/evolution-webcal.mo diff --git a/www/gnome-user-share/Makefile b/www/gnome-user-share/Makefile index 6e03fb823668..37be80fdd31b 100644 --- a/www/gnome-user-share/Makefile +++ b/www/gnome-user-share/Makefile @@ -3,15 +3,14 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/www/gnome-user-share/Makefile,v 1.5 2007/05/19 21:36:26 marcus Exp $ +# $MCom: ports/www/gnome-user-share/Makefile,v 1.8 2008/02/24 20:36:08 marcus Exp $ # PORTNAME= gnome-user-share -PORTVERSION= 0.11 -PORTREVISION= 2 +PORTVERSION= 0.22 CATEGORIES= www deskutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.11 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -22,10 +21,11 @@ LIB_DEPENDS= avahi-client:${PORTSDIR}/net/avahi-app USE_BZIP2= yes USE_GMAKE= yes USE_GETTEXT= yes -USE_X_PREFIX= yes +USE_XLIB= yes USE_APACHE= 2.0+ USE_GNOME= gnomeprefix gnomehack intlhack libglade2 gconf2 GNU_CONFIGURE= yes +INSTALLS_ICONS= yes CONFIGURE_ARGS= --disable-howl CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/www/gnome-user-share/distinfo b/www/gnome-user-share/distinfo index 1e5e4656b74b..a82e337bcfe4 100644 --- a/www/gnome-user-share/distinfo +++ b/www/gnome-user-share/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-user-share-0.11.tar.bz2) = 4961e49c858fbb7d6050c62a73286d74 -SHA256 (gnome2/gnome-user-share-0.11.tar.bz2) = f9f1afd1e5d827367f7868080285803ab70cc929702ab5ef44fb896dfcaf1d64 -SIZE (gnome2/gnome-user-share-0.11.tar.bz2) = 299313 +MD5 (gnome2/gnome-user-share-0.22.tar.bz2) = 88722b281a49050d2333eb5c001459e6 +SHA256 (gnome2/gnome-user-share-0.22.tar.bz2) = 71641c7b0dfb13a59288b9e0a9975cf294e810e859c74d5cc121d1f5eaffbe46 +SIZE (gnome2/gnome-user-share-0.22.tar.bz2) = 337564 diff --git a/www/gnome-user-share/pkg-plist b/www/gnome-user-share/pkg-plist index f2908b82a8fc..d4e97fa77a0b 100644 --- a/www/gnome-user-share/pkg-plist +++ b/www/gnome-user-share/pkg-plist @@ -6,6 +6,11 @@ share/gnome-user-share/dav_user.conf share/gnome-user-share/dav_user_2.0.conf share/gnome-user-share/dav_user_2.2.conf share/gnome-user-share/file-share-properties.glade +share/gnome/autostart/gnome-user-share.desktop +share/icons/hicolor/16x16/apps/gnome-obex-server.png +share/icons/hicolor/22x22/apps/gnome-obex-server.png +share/icons/hicolor/32x32/apps/gnome-obex-server.png +share/icons/hicolor/48x48/apps/gnome-obex-server.png share/locale/ar/LC_MESSAGES/gnome-user-share.mo share/locale/bg/LC_MESSAGES/gnome-user-share.mo share/locale/ca/LC_MESSAGES/gnome-user-share.mo @@ -16,6 +21,7 @@ share/locale/dz/LC_MESSAGES/gnome-user-share.mo share/locale/el/LC_MESSAGES/gnome-user-share.mo share/locale/en_CA/LC_MESSAGES/gnome-user-share.mo share/locale/en_GB/LC_MESSAGES/gnome-user-share.mo +share/locale/es/LC_MESSAGES/gnome-user-share.mo share/locale/fi/LC_MESSAGES/gnome-user-share.mo share/locale/fr/LC_MESSAGES/gnome-user-share.mo share/locale/gl/LC_MESSAGES/gnome-user-share.mo @@ -25,22 +31,31 @@ share/locale/it/LC_MESSAGES/gnome-user-share.mo share/locale/ja/LC_MESSAGES/gnome-user-share.mo share/locale/ko/LC_MESSAGES/gnome-user-share.mo share/locale/lt/LC_MESSAGES/gnome-user-share.mo +share/locale/mk/LC_MESSAGES/gnome-user-share.mo share/locale/nb/LC_MESSAGES/gnome-user-share.mo share/locale/ne/LC_MESSAGES/gnome-user-share.mo share/locale/nl/LC_MESSAGES/gnome-user-share.mo +share/locale/oc/LC_MESSAGES/gnome-user-share.mo share/locale/pa/LC_MESSAGES/gnome-user-share.mo +share/locale/pl/LC_MESSAGES/gnome-user-share.mo +share/locale/pt/LC_MESSAGES/gnome-user-share.mo share/locale/pt_BR/LC_MESSAGES/gnome-user-share.mo share/locale/ru/LC_MESSAGES/gnome-user-share.mo share/locale/rw/LC_MESSAGES/gnome-user-share.mo share/locale/sk/LC_MESSAGES/gnome-user-share.mo +share/locale/sl/LC_MESSAGES/gnome-user-share.mo share/locale/sq/LC_MESSAGES/gnome-user-share.mo share/locale/sv/LC_MESSAGES/gnome-user-share.mo +share/locale/tr/LC_MESSAGES/gnome-user-share.mo share/locale/uk/LC_MESSAGES/gnome-user-share.mo share/locale/vi/LC_MESSAGES/gnome-user-share.mo +share/locale/zh_CN/LC_MESSAGES/gnome-user-share.mo share/locale/zh_TW/LC_MESSAGES/gnome-user-share.mo @dirrm share/gnome-user-share +@dirrmtry share/applications @dirrmtry share/locale/rw/LC_MESSAGES @dirrmtry share/locale/rw +@dirrmtry share/locale/oc/LC_MESSAGES +@dirrmtry share/locale/oc @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz -@dirrmtry share/applications diff --git a/www/gstreamer-plugins-neon/Makefile b/www/gstreamer-plugins-neon/Makefile index 1e73a85abada..8c6dffda79f8 100644 --- a/www/gstreamer-plugins-neon/Makefile +++ b/www/gstreamer-plugins-neon/Makefile @@ -3,7 +3,7 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/www/gstreamer-plugins-neon/Makefile,v 1.1 2006/07/06 19:32:35 ahze Exp $ +# $MCom: ports/www/gstreamer-plugins-neon/Makefile,v 1.5 2008/03/19 14:05:38 ahze Exp $ # PORTREVISION= 2 diff --git a/www/gtkhtml3/Makefile b/www/gtkhtml3/Makefile index 2dca8d803dea..2bfbba7c935a 100644 --- a/www/gtkhtml3/Makefile +++ b/www/gtkhtml3/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports-stable/www/gtkhtml3/Makefile,v 1.5 2007/11/30 19:38:35 marcus Exp $ +# $MCom: ports/www/gtkhtml3/Makefile,v 1.124 2008/03/10 20:10:34 mezz Exp $ # PORTNAME= gtkhtml3 -PORTVERSION= 3.16.3 +PORTVERSION= 3.18.0 CATEGORIES= www gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME:S/3$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -17,11 +17,11 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= Lightweight HTML rendering/printing/editing engine -LIB_DEPENDS= soup-2.2.8:${PORTSDIR}/devel/libsoup +LIB_DEPENDS= soup-2.4.1:${PORTSDIR}/devel/libsoup USE_GETTEXT= yes USE_BZIP2= yes -USE_XLIB= yes +USE_XORG= xinerama xi xrandr xcursor xcomposite xdamage USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack intlhack gail libgnomeui ltverhack USE_LDCONFIG= yes diff --git a/www/gtkhtml3/distinfo b/www/gtkhtml3/distinfo index f9af553ae7b0..e6d7a4cc13bf 100644 --- a/www/gtkhtml3/distinfo +++ b/www/gtkhtml3/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gtkhtml-3.16.3.tar.bz2) = bba94aecc723946e2a4e68e2dcf59722 -SHA256 (gnome2/gtkhtml-3.16.3.tar.bz2) = 00a313b7f56c235f3ac520dc1ebbb5c8245d76f8992a1187f165c0595a474850 -SIZE (gnome2/gtkhtml-3.16.3.tar.bz2) = 1302959 +MD5 (gnome2/gtkhtml-3.18.0.tar.bz2) = ec541b078ea9fbb1dd93f77075f77bd8 +SHA256 (gnome2/gtkhtml-3.18.0.tar.bz2) = 867036b10dd4b21f79bc0d8b303d348ff55cb4ded896c8cb384b2bb4bbf378d7 +SIZE (gnome2/gtkhtml-3.18.0.tar.bz2) = 1312369 diff --git a/www/gtkhtml38/Makefile b/www/gtkhtml38/Makefile index c34c002a4c56..efe5fdff5886 100644 --- a/www/gtkhtml38/Makefile +++ b/www/gtkhtml38/Makefile @@ -3,12 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/www/gtkhtml38/Makefile,v 1.104 2007/05/30 19:19:29 mezz Exp $ +# $MCom: ports/www/gtkhtml38/Makefile,v 1.106 2008/01/29 01:43:06 marcus Exp $ # PORTNAME= gtkhtml3 PORTVERSION= 3.12.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME:S/3$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -18,7 +18,7 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= Lightweight HTML rendering/printing/editing engine -LIB_DEPENDS= soup-2.2.8:${PORTSDIR}/devel/libsoup +LIB_DEPENDS= soup-2.2.8:${PORTSDIR}/devel/libsoup22 NO_LATEST_LINK= yes DEPRECATED= Older API; newer applications should use www/gtkhtml3 diff --git a/www/midori/Makefile b/www/midori/Makefile new file mode 100644 index 000000000000..264e0abc00f9 --- /dev/null +++ b/www/midori/Makefile @@ -0,0 +1,27 @@ +# New ports collection makefile for: midori +# Date created: 2007-10-21 +# Whom: Michael Johnson <ahze@FreeBSD.org> +# +# $FreeBSD$ +# $MCom: ports/www/midori/Makefile,v 1.3 2008/03/21 18:31:39 ahze Exp $ + +PORTNAME= midori +PORTVERSION= 0.0.17 +CATEGORIES= www +MASTER_SITES= http://software.twotoasts.de/media/${PORTNAME}/ + +MAINTAINER= ahze@FreeBSD.org +COMMENT= Lightweight web browser using WebKit browser engine + +LIB_DEPENDS= WebKitGtk.1:${PORTSDIR}/www/webkit-gtk2 \ + sexy.2:${PORTSDIR}/x11-toolkits/libsexy + +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/WebKit/webkit -I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" +GNU_CONFIGURE= yes +USE_GMAKE= yes + +pre-install: + ${CHMOD} +x ${WRKSRC}/install-sh + +.include <bsd.port.mk> diff --git a/www/midori/distinfo b/www/midori/distinfo new file mode 100644 index 000000000000..7cd5c3c5e15d --- /dev/null +++ b/www/midori/distinfo @@ -0,0 +1,3 @@ +MD5 (midori-0.0.17.tar.gz) = 58d1b7ed282540030eb1b5803b760865 +SHA256 (midori-0.0.17.tar.gz) = affeddb78d9342e961e868270872c166ac2eba7d43e5f629d91f03219d6e0df8 +SIZE (midori-0.0.17.tar.gz) = 385711 diff --git a/www/midori/pkg-descr b/www/midori/pkg-descr new file mode 100644 index 000000000000..fa4e7314b85f --- /dev/null +++ b/www/midori/pkg-descr @@ -0,0 +1,12 @@ +Midori is a lightweight web browser. + +* Full integration with GTK+2. +* Fast rendering with WebKit. +* Tabs, windows and session management. +* Bookmarks are stored with XBEL. +* Searchbox based on OpenSearch. +* Custom context menu actions. +* User scripts and user styles support. +* Extensible via Lua scripts. + +WWW: http://software.twotoasts.de/?page=midori diff --git a/www/midori/pkg-plist b/www/midori/pkg-plist new file mode 100644 index 000000000000..6ec31b1d31b8 --- /dev/null +++ b/www/midori/pkg-plist @@ -0,0 +1,5 @@ +bin/midori +share/applications/midori.desktop +@dirrmtry share/applications +@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true +@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true diff --git a/www/swfdec-plugin/Makefile b/www/swfdec-plugin/Makefile index f529775e0b4c..7e5a462ae628 100644 --- a/www/swfdec-plugin/Makefile +++ b/www/swfdec-plugin/Makefile @@ -6,15 +6,15 @@ # PORTNAME= swfdec-plugin -PORTVERSION= 0.5.5 +PORTVERSION= 0.6.0 CATEGORIES= www -MASTER_SITES= http://swfdec.freedesktop.org/download/swfdec-mozilla/0.5/ +MASTER_SITES= http://swfdec.freedesktop.org/download/swfdec-mozilla/0.6/ DISTNAME= swfdec-mozilla-${PORTVERSION} MAINTAINER= alexbl@FreeBSD.org COMMENT= Flash rendering plugin -LIB_DEPENDS= swfdec-0.5.5:${PORTSDIR}/graphics/swfdec +LIB_DEPENDS= swfdec-0.6:${PORTSDIR}/graphics/swfdec USE_AUTOTOOLS= libtool:15 CONFIGURE_ARGS= --with-plugin-dir="${PREFIX}/lib/browser_plugins" diff --git a/www/swfdec-plugin/distinfo b/www/swfdec-plugin/distinfo index f25e30c9a1c1..41b0a0096e9a 100644 --- a/www/swfdec-plugin/distinfo +++ b/www/swfdec-plugin/distinfo @@ -1,3 +1,3 @@ -MD5 (swfdec-mozilla-0.5.5.tar.gz) = 37d2b4235dd8c66de8f9ebd323aa6b1e -SHA256 (swfdec-mozilla-0.5.5.tar.gz) = 0a22cd22b115bdc89f974353dc3bf94ec7ab0ad97ce6fb1899ae7aad55921470 -SIZE (swfdec-mozilla-0.5.5.tar.gz) = 398937 +MD5 (swfdec-mozilla-0.6.0.tar.gz) = dc0fb84b5e5c7540ae1231eb04109f0e +SHA256 (swfdec-mozilla-0.6.0.tar.gz) = 05e93b4343998afd24b0ba879e25ef4f08c87af6afb51fb0cc5a0362c3feff34 +SIZE (swfdec-mozilla-0.6.0.tar.gz) = 399937 diff --git a/www/webkit-gtk2/Makefile b/www/webkit-gtk2/Makefile new file mode 100644 index 000000000000..775cb413a8dc --- /dev/null +++ b/www/webkit-gtk2/Makefile @@ -0,0 +1,57 @@ +# New ports collection makefile for: webkit +# Date created: 2007-10-21 +# Whom: Michael Johnson <ahze@FreeBSD.org> +# +# $FreeBSD$ +# $MCom: ports/www/webkit-gtk2/Makefile,v 1.5 2008/03/24 01:51:52 mezz Exp $ +# + +PORTNAME= webkit +PORTVERSION= 0.0.30549 +CATEGORIES= www +MASTER_SITES= http://nightly.webkit.org/files/trunk/src/ +PKGNAMESUFFIX= -gtk2 +DISTNAME= WebKit-r${PORTVERSION:S/0.0.//} + +MAINTAINER= gnome@FreeBSD.org +COMMENT= An opensource browser engine + +LIB_DEPENDS= icutu.38:${PORTSDIR}/devel/icu \ + curl.4:${PORTSDIR}/ftp/curl \ + sqlite3.8:${PORTSDIR}/databases/sqlite3 + +USE_BISON= build +USE_BZIP2= yes +USE_GMAKE= yes +USE_GNOME= gnometarget gtk20 libxslt +USE_PERL5= yes +USE_LDCONFIG= yes +USE_AUTOTOOLS= autoconf:261 automake:110 libtool:15 +USE_GSTREAMER= gnomevfs +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" +CONFIGURE_ARGS= --with-webkit-target=x11 \ + --enable-icon-database \ + --enable-svg \ + --enable-video +MAKEFILE= GNUmakefile + +post-patch: + @${REINPLACE_CMD} -e 's|autoconf|${AUTOCONF}|g ; \ + s|automake|${AUTOMAKE}|g ; s|aclocal|${ACLOCAL}|g ; \ + s|autoheader|${AUTOHEADER}|g ; \ + s|LIBTOOLIZE=libtoolize|LIBTOOLIZE=${LIBTOOLIZE}|g ; \ + s|$$srcdir/configure|#$$srcdir/configure|g' \ + ${WRKSRC}/autogen.sh + @${FIND} ${WRKSRC} -name GNUmakefile.am | ${XARGS} ${REINPLACE_CMD} -e \ + 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' + +pre-configure: + @(cd ${WRKSRC} && ${SH} autogen.sh) + +post-install: +# Install compat pkg-config file so we don't have to patch ports + ${CP} ${PREFIX}/libdata/pkgconfig/webkit-1.0.pc \ + ${PREFIX}/libdata/pkgconfig/WebKitGtk.pc + +.include <bsd.port.mk> diff --git a/www/webkit-gtk2/distinfo b/www/webkit-gtk2/distinfo new file mode 100644 index 000000000000..b91ff2311761 --- /dev/null +++ b/www/webkit-gtk2/distinfo @@ -0,0 +1,3 @@ +MD5 (WebKit-r30549.tar.bz2) = 081ce2cb23cf564454bfc5a3d627a4bb +SHA256 (WebKit-r30549.tar.bz2) = 7c9b9607fcb0909298c5d4c3ec47040082db139a28aca2547b2f657afe98b6cd +SIZE (WebKit-r30549.tar.bz2) = 8573000 diff --git a/www/webkit-gtk2/pkg-descr b/www/webkit-gtk2/pkg-descr new file mode 100644 index 000000000000..40ef1e3ef412 --- /dev/null +++ b/www/webkit-gtk2/pkg-descr @@ -0,0 +1,5 @@ +WebKit is an open source web browser engine. It is able to display content +such as HTML, SVG, XML, and others. It also supports DOM, XMLHttpRequest, +XSLT, CSS, Javascript/ECMAscript and more. + +WWW: http://webkit.org/ diff --git a/www/webkit-gtk2/pkg-plist b/www/webkit-gtk2/pkg-plist new file mode 100644 index 000000000000..71b65eff0f6a --- /dev/null +++ b/www/webkit-gtk2/pkg-plist @@ -0,0 +1,26 @@ +include/WebKit/JavaScriptCore/JSBase.h +include/WebKit/JavaScriptCore/JSContextRef.h +include/WebKit/JavaScriptCore/JSObjectRef.h +include/WebKit/JavaScriptCore/JSStringRef.h +include/WebKit/JavaScriptCore/JSStringRefBSTR.h +include/WebKit/JavaScriptCore/JSStringRefCF.h +include/WebKit/JavaScriptCore/JSValueRef.h +include/WebKit/JavaScriptCore/JavaScript.h +include/WebKit/JavaScriptCore/JavaScriptCore.h +include/WebKit/webkit/webkit.h +include/WebKit/webkit/webkitdefines.h +include/WebKit/webkit/webkitnetworkrequest.h +include/WebKit/webkit/webkitwebbackforwardlist.h +include/WebKit/webkit/webkitwebframe.h +include/WebKit/webkit/webkitwebhistoryitem.h +include/WebKit/webkit/webkitwebsettings.h +include/WebKit/webkit/webkitwebview.h +lib/libWebKitGtk.a +lib/libWebKitGtk.la +lib/libWebKitGtk.so +lib/libWebKitGtk.so.1 +libdata/pkgconfig/WebKitGtk.pc +libdata/pkgconfig/webkit-1.0.pc +@dirrm include/WebKit/webkit +@dirrm include/WebKit/JavaScriptCore +@dirrm include/WebKit |