diff options
510 files changed, 7713 insertions, 8075 deletions
diff --git a/accessibility/atk/Makefile b/accessibility/atk/Makefile index 4c4ec4d0e1dd..add39ca63b46 100644 --- a/accessibility/atk/Makefile +++ b/accessibility/atk/Makefile @@ -3,14 +3,15 @@ # Whom: Maxim Sobolev <sobomax@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/accessibility/atk/Makefile,v 1.56 2005/09/05 21:13:50 marcus Exp $ # PORTNAME= atk -PORTVERSION= 1.9.1 +PORTVERSION= 1.10.3 CATEGORIES= accessibility devel MASTER_SITES= ${MASTER_SITE_GNOME} \ ftp://ftp.gtk.org/pub/gtk/v2.6/ -MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.9 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.10 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -18,12 +19,16 @@ COMMENT= A GNOME accessibility toolkit (ATK) USE_BZIP2= yes INSTALLS_SHLIB= yes -USE_LIBTOOL_VER=15 -USE_GNOME= gnomehack glib20 +USE_AUTOTOOLS= libtool:15 +USE_GNOME= gnomehack glib20 ltverhack CONFIGURE_ARGS= --enable-static \ --disable-gtk-doc \ --with-html-dir=${PREFIX}/share/doc CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" +post-patch: + @${REINPLACE_CMD} -e "/^SUBDIRS =/s/tests//" \ + ${WRKSRC}/Makefile.in + .include <bsd.port.mk> diff --git a/accessibility/atk/distinfo b/accessibility/atk/distinfo index c6fba736eec7..3028cc62de16 100644 --- a/accessibility/atk/distinfo +++ b/accessibility/atk/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/atk-1.9.1.tar.bz2) = 689eb6a77215858eb804f6dcc90058be -SIZE (gnome2/atk-1.9.1.tar.bz2) = 483363 +MD5 (gnome2/atk-1.10.3.tar.bz2) = c84a01fea567b365c0d44b227fead948 +SIZE (gnome2/atk-1.10.3.tar.bz2) = 542712 diff --git a/accessibility/atk/files/patch-Makefile.in b/accessibility/atk/files/patch-Makefile.in deleted file mode 100644 index 90d6da723065..000000000000 --- a/accessibility/atk/files/patch-Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.in.orig Fri Nov 8 17:09:46 2002 -+++ Makefile.in Fri Nov 8 17:10:22 2002 -@@ -116,7 +116,7 @@ - atktargetlib = @atktargetlib@ - ms_librarian = @ms_librarian@ - --SUBDIRS = atk tests docs po -+SUBDIRS = atk docs po - - EXTRA_DIST = atk-uninstalled.pc.in atk.pc.in atk.spec.in atk.spec atk-zip.sh - diff --git a/accessibility/atk/pkg-plist b/accessibility/atk/pkg-plist index 326002e10dc3..88bec4c1e7af 100644 --- a/accessibility/atk/pkg-plist +++ b/accessibility/atk/pkg-plist @@ -26,8 +26,12 @@ include/atk-1.0/atk/atkutil.h include/atk-1.0/atk/atkvalue.h lib/libatk-1.0.a lib/libatk-1.0.so -lib/libatk-1.0.so.901 +lib/libatk-1.0.so.0 libdata/pkgconfig/atk.pc +%%DOCSDIR%%/home.png +%%DOCSDIR%%/left.png +%%DOCSDIR%%/right.png +%%DOCSDIR%%/up.png share/locale/af/LC_MESSAGES/atk10.mo share/locale/am/LC_MESSAGES/atk10.mo share/locale/ar/LC_MESSAGES/atk10.mo @@ -53,6 +57,7 @@ share/locale/fa/LC_MESSAGES/atk10.mo share/locale/fi/LC_MESSAGES/atk10.mo share/locale/fr/LC_MESSAGES/atk10.mo share/locale/ga/LC_MESSAGES/atk10.mo +share/locale/gl/LC_MESSAGES/atk10.mo share/locale/gu/LC_MESSAGES/atk10.mo share/locale/he/LC_MESSAGES/atk10.mo share/locale/hi/LC_MESSAGES/atk10.mo @@ -83,6 +88,7 @@ share/locale/pt/LC_MESSAGES/atk10.mo share/locale/pt_BR/LC_MESSAGES/atk10.mo share/locale/ro/LC_MESSAGES/atk10.mo share/locale/ru/LC_MESSAGES/atk10.mo +share/locale/rw/LC_MESSAGES/atk10.mo share/locale/sk/LC_MESSAGES/atk10.mo share/locale/sl/LC_MESSAGES/atk10.mo share/locale/sq/LC_MESSAGES/atk10.mo @@ -94,6 +100,7 @@ share/locale/ta/LC_MESSAGES/atk10.mo share/locale/th/LC_MESSAGES/atk10.mo share/locale/tk/LC_MESSAGES/atk10.mo share/locale/tr/LC_MESSAGES/atk10.mo +share/locale/ug/LC_MESSAGES/atk10.mo share/locale/uk/LC_MESSAGES/atk10.mo share/locale/vi/LC_MESSAGES/atk10.mo share/locale/wa/LC_MESSAGES/atk10.mo @@ -101,15 +108,19 @@ share/locale/xh/LC_MESSAGES/atk10.mo share/locale/yi/LC_MESSAGES/atk10.mo share/locale/zh_CN/LC_MESSAGES/atk10.mo share/locale/zh_TW/LC_MESSAGES/atk10.mo +@dirrm %%DOCSDIR%% @exec mkdir -p %D/%%DOCSDIR%% @unexec rmdir %D/share/locale/as/LC_MESSAGES 2> /dev/null || true @unexec rmdir %D/share/locale/as 2> /dev/null || true +@unexec rmdir %D/share/locale/gl/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/gl 2> /dev/null || true @unexec rmdir %D/share/locale/li/LC_MESSAGES 2> /dev/null || true @unexec rmdir %D/share/locale/li 2> /dev/null || true @unexec rmdir %D/share/locale/mr/LC_MESSAGES 2> /dev/null || true @unexec rmdir %D/share/locale/mr 2> /dev/null || true @unexec rmdir %D/share/locale/tk/LC_MESSAGES 2> /dev/null || true @unexec rmdir %D/share/locale/tk 2> /dev/null || true -@dirrm %%DOCSDIR%% +@unexec rmdir %D/share/locale/ug/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/ug 2> /dev/null || true @dirrm include/atk-1.0/atk @dirrm include/atk-1.0 diff --git a/accessibility/dasher/Makefile b/accessibility/dasher/Makefile index 2d3b6086483f..b701889b8ab7 100644 --- a/accessibility/dasher/Makefile +++ b/accessibility/dasher/Makefile @@ -3,10 +3,11 @@ # Whom: lewiz <purple@lewiz.net> # # $FreeBSD$ +# $MCom: ports/accessibility/dasher/Makefile,v 1.18 2005/10/29 22:31:15 marcus Exp $ # PORTNAME= dasher -PORTVERSION= 3.2.17 +PORTVERSION= 3.2.18 PORTEPOCH= 1 CATEGORIES= accessibility editors x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} @@ -56,5 +57,4 @@ patch-autotools: ${RM} $$file.tmp; \ done); - .include <bsd.port.post.mk> diff --git a/accessibility/dasher/distinfo b/accessibility/dasher/distinfo index 68955a8fac76..06f209a7539f 100644 --- a/accessibility/dasher/distinfo +++ b/accessibility/dasher/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/dasher-3.2.17.tar.bz2) = 583dbd217ca9352e1a1a2f11fdfd55b2 -SIZE (gnome2/dasher-3.2.17.tar.bz2) = 4596772 +MD5 (gnome2/dasher-3.2.18.tar.bz2) = f724113d3148a3c7f888b9e830ae75af +SIZE (gnome2/dasher-3.2.18.tar.bz2) = 4758337 diff --git a/accessibility/dasher/pkg-plist b/accessibility/dasher/pkg-plist index c902e50152b1..1f6aa03b3f04 100644 --- a/accessibility/dasher/pkg-plist +++ b/accessibility/dasher/pkg-plist @@ -163,6 +163,7 @@ share/gnome/dasher/training_hiragana83_JP.txt share/gnome/dasher/training_hungarian_HU.txt share/gnome/dasher/training_italian_IT.txt share/gnome/dasher/training_mongolian_MN.txt +share/gnome/dasher/training_persian_IR.txt share/gnome/dasher/training_polish_PL.txt share/gnome/dasher/training_portuguese_BR.txt share/gnome/dasher/training_russian_RU.txt diff --git a/accessibility/gnopernicus/Makefile b/accessibility/gnopernicus/Makefile index 335bbdcaa136..e91aa26cdf10 100644 --- a/accessibility/gnopernicus/Makefile +++ b/accessibility/gnopernicus/Makefile @@ -3,13 +3,14 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/accessibility/gnopernicus/Makefile,v 1.63 2005/10/12 00:10:26 marcus Exp $ # PORTNAME= gnopernicus -PORTVERSION= 0.10.9 +PORTVERSION= 0.12.0 CATEGORIES= accessibility x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.10 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.12 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -23,13 +24,13 @@ INSTALLS_OMF= yes USE_GMAKE= yes USE_REINPLACE= yes USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui atspi gnomespeech -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" MAKE_ENV= SED="${SED}" GCONF_SCHEMAS= brlmonitor.schemas gnopernicus.schemas remote.schemas -SHLIB_VERSION= 9 +SHLIB_VERSION= 0 PLIST_SUB= SHLIB_VERSION=${SHLIB_VERSION} post-patch: diff --git a/accessibility/gnopernicus/distinfo b/accessibility/gnopernicus/distinfo index 814639f0a3f1..5b4907a63e3c 100644 --- a/accessibility/gnopernicus/distinfo +++ b/accessibility/gnopernicus/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnopernicus-0.10.9.tar.bz2) = dd36c9b729344153812918c03dd84b12 -SIZE (gnome2/gnopernicus-0.10.9.tar.bz2) = 2036421 +MD5 (gnome2/gnopernicus-0.12.0.tar.bz2) = 8228afc6b98306207349df150592b83b +SIZE (gnome2/gnopernicus-0.12.0.tar.bz2) = 2202137 diff --git a/accessibility/gnopernicus/files/patch-braille_libbrl_brlxml.c b/accessibility/gnopernicus/files/patch-braille_libbrl_brlxml.c deleted file mode 100644 index 3a2d38735abb..000000000000 --- a/accessibility/gnopernicus/files/patch-braille_libbrl_brlxml.c +++ /dev/null @@ -1,13 +0,0 @@ ---- braille/libbrl/brlxml.c.orig Tue Aug 3 14:50:31 2004 -+++ braille/libbrl/brlxml.c Tue Aug 3 14:50:48 2004 -@@ -730,9 +730,9 @@ - /* fprintf (stderr, "\n attr_val; %s", *attrs); */ - if (g_strcasecmp ((gchar*)*attrs, "mode") == 0) - { -- ++attrs; - gint16 new_offset = 0; - gshort sign = 1; -+ ++attrs; - - attr_val = g_strdup ((gchar*)*attrs); - tattr_val = g_strdup (attr_val); diff --git a/accessibility/gnopernicus/files/patch-gnopi_gnopi.c b/accessibility/gnopernicus/files/patch-gnopi_gnopi.c deleted file mode 100644 index ee014bef5a98..000000000000 --- a/accessibility/gnopernicus/files/patch-gnopi_gnopi.c +++ /dev/null @@ -1,28 +0,0 @@ ---- gnopi/gnopi.c.orig Mon Dec 20 23:47:10 2004 -+++ gnopi/gnopi.c Mon Dec 20 23:48:21 2004 -@@ -530,6 +530,7 @@ - GladeXML *xml = NULL; - gint response_id; - gboolean accessibility_on; -+ AtkObject *obj; - - /* check if accessibility flag is TRUE */ - accessibility_on = gnopiconf_get_bool (ACCESSIBILITY_GCONF_KEY, -@@ -550,7 +551,7 @@ - - g_object_unref (G_OBJECT (xml)); - -- AtkObject *obj = gtk_widget_get_accessible (dialog); -+ obj = gtk_widget_get_accessible (dialog); - atk_object_set_role (obj, ATK_ROLE_ALERT); - - response_id = gtk_dialog_run (GTK_DIALOG (dialog)); -@@ -570,7 +571,7 @@ - - g_object_unref (G_OBJECT (xml)); - -- AtkObject *obj = gtk_widget_get_accessible (dialog); -+ obj = gtk_widget_get_accessible (dialog); - atk_object_set_role (obj, ATK_ROLE_ALERT); - - response_id = gtk_dialog_run (GTK_DIALOG (dialog)); diff --git a/accessibility/gnopernicus/files/patch-srcore_srbrl.c b/accessibility/gnopernicus/files/patch-srcore_srbrl.c deleted file mode 100644 index aef29ae8d7d3..000000000000 --- a/accessibility/gnopernicus/files/patch-srcore_srbrl.c +++ /dev/null @@ -1,50 +0,0 @@ ---- srcore/srbrl.c.orig Wed Mar 23 04:02:10 2005 -+++ srcore/srbrl.c Wed Mar 23 17:32:38 2005 -@@ -763,6 +763,11 @@ - src_braille_load_values (SRCBraille *braille) - { - gint default_port = DEFAULT_BRAILLE_PORT_NO; -+ gint default_pos_sensor; -+ gint default_opt_sensor; -+ gchar *default_braille_transaltion_table; -+ gchar *default_braille_style; -+ gchar *default_braille_cursor_style; - - sru_assert (braille); - -@@ -786,7 +791,7 @@ - SET_BRAILLE_CONFIG_DATA (BRAILLE_PORT_NO, CFGT_INT, &braille->port); - } - -- gchar *default_braille_transaltion_table = DEFAULT_BRAILLE_TRANSLATION; -+ default_braille_transaltion_table = DEFAULT_BRAILLE_TRANSLATION; - GET_BRAILLE_CONFIG_DATA_WITH_DEFAULT (BRAILLE_TRANSLATION, CFGT_STRING, - &braille->translation_table, - default_braille_transaltion_table); -@@ -798,22 +803,22 @@ - } - - -- gchar *default_braille_style = DEFAULT_BRAILLE_STYLE; -+ default_braille_style = DEFAULT_BRAILLE_STYLE; - GET_BRAILLE_CONFIG_DATA_WITH_DEFAULT (BRAILLE_STYLE, CFGT_STRING, - &braille->style, - default_braille_style); - -- gchar *default_braille_cursor_style = DEFAULT_BRAILLE_CURSOR_STYLE; -+ default_braille_cursor_style = DEFAULT_BRAILLE_CURSOR_STYLE; - GET_BRAILLE_CONFIG_DATA_WITH_DEFAULT (BRAILLE_CURSOR_STYLE, CFGT_STRING, - &braille->cursor_style, - default_braille_cursor_style); - -- gint default_pos_sensor = DEFAULT_BRAILLE_POSITION_SENSOR; -+ default_pos_sensor = DEFAULT_BRAILLE_POSITION_SENSOR; - GET_BRAILLE_CONFIG_DATA_WITH_DEFAULT (BRAILLE_POSITION_SENSOR, CFGT_INT, - &braille->position_sensor, - &default_pos_sensor); - -- gint default_opt_sensor = DEFAULT_BRAILLE_OPTICAL_SENSOR; -+ default_opt_sensor = DEFAULT_BRAILLE_OPTICAL_SENSOR; - GET_BRAILLE_CONFIG_DATA_WITH_DEFAULT (BRAILLE_OPTICAL_SENSOR, CFGT_INT, - &braille->optical_sensor, - &default_opt_sensor); diff --git a/accessibility/gnopernicus/files/patch-srcore_srmain.c b/accessibility/gnopernicus/files/patch-srcore_srmain.c deleted file mode 100644 index 7b113f5bad80..000000000000 --- a/accessibility/gnopernicus/files/patch-srcore_srmain.c +++ /dev/null @@ -1,26 +0,0 @@ ---- srcore/srmain.c.orig Sun May 30 03:08:45 2004 -+++ srcore/srmain.c Sun May 30 03:09:28 2004 -@@ -602,9 +602,10 @@ - sru_assert (config->key); - if (strcmp (config->key, BRAILLE_DEVICE) == 0) - { -+ gboolean rv; - sru_assert (config->newvalue && config->type == CFGT_STRING); - -- gboolean rv = src_braille_set_device ((gchar*)config->newvalue); -+ rv = src_braille_set_device ((gchar*)config->newvalue); - if (!rv) - { - sru_message ("SR: process config changed for braille: brl_device did not change!!!"); -@@ -636,9 +637,10 @@ - } - else if (strcmp (config->key, BRAILLE_TRANSLATION) == 0) - { -+ gboolean rv; - sru_assert (config->type == CFGT_STRING && config->newvalue); - -- gboolean rv = src_braille_set_translation_table ((gchar*)config->newvalue); -+ rv = src_braille_set_translation_table ((gchar*)config->newvalue); - - if (!rv) - { diff --git a/accessibility/gnopernicus/files/patch-srlow_libsrlow_SRLow.c b/accessibility/gnopernicus/files/patch-srlow_libsrlow_SRLow.c new file mode 100644 index 000000000000..231ee7891606 --- /dev/null +++ b/accessibility/gnopernicus/files/patch-srlow_libsrlow_SRLow.c @@ -0,0 +1,13 @@ +--- srlow/libsrlow/SRLow.c.orig Mon Jun 27 04:14:03 2005 ++++ srlow/libsrlow/SRLow.c Mon Jun 27 04:14:18 2005 +@@ -666,8 +666,9 @@ srl_get_focused_cell (Accessible *acc_ta + for (i = rows; !rv && i <= rowe && count < SRL_MAX_CHILDREN_CNT; i++) + for (j = cols; !rv && j <= cole && count < SRL_MAX_CHILDREN_CNT; j++) + { ++ Accessible *cell; + count++; +- Accessible *cell = AccessibleTable_getAccessibleAt (table, i, j); ++ cell = AccessibleTable_getAccessibleAt (table, i, j); + if (cell) + { + if (srl_acc_has_state (cell, SPI_STATE_FOCUSED)) diff --git a/accessibility/gnopernicus/files/patch-srlow_libsrlow_SRObject.c b/accessibility/gnopernicus/files/patch-srlow_libsrlow_SRObject.c deleted file mode 100644 index 86addc0fc0c7..000000000000 --- a/accessibility/gnopernicus/files/patch-srlow_libsrlow_SRObject.c +++ /dev/null @@ -1,14 +0,0 @@ ---- srlow/libsrlow/SRObject.c.orig Mon Feb 28 17:11:27 2005 -+++ srlow/libsrlow/SRObject.c Mon Feb 28 17:11:41 2005 -@@ -4206,9 +4206,10 @@ - offset = AccessibleText_getCaretOffset (acc_text); - if (offset == AccessibleText_getCharacterCount (acc_text) && offset > 0) - { -+ char *ret; - offset--; - last = TRUE;/*the char is the last char in the text*/ -- char *ret = AccessibleText_getTextBeforeOffset (acc_text, offset+1, -+ ret = AccessibleText_getTextBeforeOffset (acc_text, offset+1, - SPI_TEXT_BOUNDARY_LINE_START, &line_start_offset, &line_end_offset); - SPI_freeString (ret); - if (offset == line_start_offset && offset > 0) diff --git a/accessibility/gnopernicus/pkg-plist b/accessibility/gnopernicus/pkg-plist index 74915167f0c8..b43a4644b069 100644 --- a/accessibility/gnopernicus/pkg-plist +++ b/accessibility/gnopernicus/pkg-plist @@ -99,9 +99,11 @@ share/locale/en_CA/LC_MESSAGES/gnopernicus.mo share/locale/en_GB/LC_MESSAGES/gnopernicus.mo share/locale/es/LC_MESSAGES/gnopernicus.mo share/locale/eu/LC_MESSAGES/gnopernicus.mo +share/locale/fa/LC_MESSAGES/gnopernicus.mo share/locale/fi/LC_MESSAGES/gnopernicus.mo share/locale/fr/LC_MESSAGES/gnopernicus.mo share/locale/ga/LC_MESSAGES/gnopernicus.mo +share/locale/gl/LC_MESSAGES/gnopernicus.mo share/locale/gu/LC_MESSAGES/gnopernicus.mo share/locale/hi/LC_MESSAGES/gnopernicus.mo share/locale/hr/LC_MESSAGES/gnopernicus.mo diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile index 14784828a70c..a08999c13d84 100644 --- a/archivers/file-roller/Makefile +++ b/archivers/file-roller/Makefile @@ -3,14 +3,15 @@ # Whom: Anders Nordby <anders@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/archivers/fileroller/Makefile,v 1.79 2005/10/03 21:14:16 mezz Exp $ # PORTNAME= fileroller -PORTVERSION= 2.10.4 +PORTVERSION= 2.12.1 PORTEPOCH= 1 CATEGORIES= archivers gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/file-roller/2.10 +MASTER_SITE_SUBDIR= sources/file-roller/2.12 DISTNAME= file-roller-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -27,8 +28,9 @@ INSTALLS_OMF= yes USE_X_PREFIX= yes USE_REINPLACE= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix intlhack gnomehack desktopfileutils nautilus2 -USE_LIBTOOL_VER=15 +USE_GNOME= gnomeprefix intlhack gnomehack desktopfileutils nautilus2 \ + gnomedocutils +USE_AUTOTOOLS= libtool:15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" @@ -37,6 +39,8 @@ GCONF_SCHEMAS= file-roller.schemas post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ ${WRKSRC}/src/fr-command-tar.c + @${FIND} ${WRKSRC} -name "fr-command-*.c" | ${XARGS} ${REINPLACE_CMD} \ + -e 's|atoll|fr_atoll|g' post-install: @-update-desktop-database diff --git a/archivers/file-roller/distinfo b/archivers/file-roller/distinfo index e7be152bfb20..86f081c99341 100644 --- a/archivers/file-roller/distinfo +++ b/archivers/file-roller/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/file-roller-2.10.4.tar.bz2) = 74115fe3289042cc41dc517dede3f64f -SIZE (gnome2/file-roller-2.10.4.tar.bz2) = 1307330 +MD5 (gnome2/file-roller-2.12.1.tar.bz2) = 5b256e9c56e132007ae6933b6b604157 +SIZE (gnome2/file-roller-2.12.1.tar.bz2) = 1162479 diff --git a/archivers/file-roller/files/patch-help_Makefile.in b/archivers/file-roller/files/patch-help_Makefile.in new file mode 100644 index 000000000000..d1e1b99597dd --- /dev/null +++ b/archivers/file-roller/files/patch-help_Makefile.in @@ -0,0 +1,20 @@ +--- help/Makefile.in.orig Tue Aug 9 00:19:45 2005 ++++ help/Makefile.in Tue Aug 9 00:20:04 2005 +@@ -869,7 +869,7 @@ + @for fig in $(_DOC_C_FIGURES) $(_DOC_LC_FIGURES); do \ + if test -f "$$fig"; then d=; else d="$(srcdir)/"; fi; \ + if test -f "$$d$$fig"; then \ +- figdir=`echo $$fig | sed -e 's/^\(.*\/\).*\|.*/\1/'`; \ ++ figdir=`echo $$fig | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ + if ! test -d "$(distdir)/$$figdir"; then \ + echo "$(mkinstalldirs) $(distdir)/$$figdir"; \ + $(mkinstalldirs) "$(distdir)/$$figdir"; \ +@@ -944,7 +944,7 @@ + else \ + figfile="$(srcdir)/C/$$fig"; \ + fi; \ +- figdir="$$lc/"`echo $$fig | sed -e 's/^\(.*\/\).*\|.*/\1/'`; \ ++ figdir="$$lc/"`echo $$fig | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ + figdir="$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$figdir"; \ + if ! test -d "$$figdir"; then \ + echo "$(mkinstalldirs) $$figdir"; \ diff --git a/archivers/file-roller/files/patch-src_file-utils.h b/archivers/file-roller/files/patch-src_file-utils.h new file mode 100644 index 000000000000..d3223290fe1c --- /dev/null +++ b/archivers/file-roller/files/patch-src_file-utils.h @@ -0,0 +1,16 @@ +--- src/file-utils.h.orig Sun Jul 3 19:11:59 2005 ++++ src/file-utils.h Sun Jul 3 19:12:52 2005 +@@ -25,8 +25,13 @@ + + #include <sys/types.h> + #include <time.h> ++#include <stdlib.h> ++#include <limits.h> + #include <libgnomevfs/gnome-vfs-file-size.h> + #include <libgnomevfs/gnome-vfs-mime-handlers.h> ++ ++#undef fr_atoll ++#define fr_atoll(nptr) strtoll(nptr, (char **)NULL, 10) + + + #define FILENAME_MAX_LENGTH 30 /* FIXME: find out the best value */ diff --git a/archivers/file-roller/files/patch-src_fr-command-tar.c b/archivers/file-roller/files/patch-src_fr-command-tar.c index 5a046266d274..c4e3bac836f0 100644 --- a/archivers/file-roller/files/patch-src_fr-command-tar.c +++ b/archivers/file-roller/files/patch-src_fr-command-tar.c @@ -1,13 +1,13 @@ ---- src/fr-command-tar.c.orig Fri Apr 22 13:11:56 2005 -+++ src/fr-command-tar.c Fri Apr 22 13:16:00 2005 -@@ -221,6 +221,10 @@ +--- src/fr-command-tar.c.orig Fri Jul 1 14:41:32 2005 ++++ src/fr-command-tar.c Sun Jul 3 19:03:01 2005 +@@ -222,6 +223,10 @@ begin_tar_command (FRCommand *comm) + #if defined (__SVR4) && defined (__sun) if (g_file_test ("/usr/sfw/bin/gtar", G_FILE_TEST_IS_EXECUTABLE)) { command = g_strdup ("/usr/sfw/bin/gtar"); - } ++ } +#elif defined(__FreeBSD__) + if (g_file_test ("%%LOCALBASE%%/bin/gtar", G_FILE_TEST_IS_EXECUTABLE)) { + command = g_strdup ("%%LOCALBASE%%/bin/gtar"); -+ } + } #endif if (command != NULL) - fr_process_begin_command (comm->process, command); diff --git a/archivers/file-roller/pkg-plist b/archivers/file-roller/pkg-plist index e6b9618adeaa..61dad2114c70 100644 --- a/archivers/file-roller/pkg-plist +++ b/archivers/file-roller/pkg-plist @@ -8,7 +8,8 @@ libdata/bonobo/servers/File_Roller_Component.server %%PORTDOCS%%%%DOCSDIR%%/TODO share/gnome/application-registry/file-roller.applications share/gnome/applications/file-roller.desktop -share/gnome/file-roller/glade/file_roller.glade +share/gnome/file-roller/glade/file-roller-extract.glade +share/gnome/file-roller/glade/file-roller.glade share/gnome/help/file-roller/C/figures/file-roller_home.png share/gnome/help/file-roller/C/figures/file-roller_leftarrow.png share/gnome/help/file-roller/C/figures/file-roller_main_window.png @@ -16,53 +17,78 @@ share/gnome/help/file-roller/C/figures/file-roller_rightarrow.png share/gnome/help/file-roller/C/figures/file-roller_uparrow.png share/gnome/help/file-roller/C/file-roller.xml share/gnome/help/file-roller/C/legal.xml +share/gnome/help/file-roller/de/figures/file-roller_home.png +share/gnome/help/file-roller/de/figures/file-roller_leftarrow.png share/gnome/help/file-roller/de/figures/file-roller_main_window.png +share/gnome/help/file-roller/de/figures/file-roller_rightarrow.png +share/gnome/help/file-roller/de/figures/file-roller_uparrow.png share/gnome/help/file-roller/de/file-roller.xml -share/gnome/help/file-roller/de/legal.xml share/gnome/help/file-roller/es/figures/file-roller_home.png share/gnome/help/file-roller/es/figures/file-roller_leftarrow.png share/gnome/help/file-roller/es/figures/file-roller_main_window.png share/gnome/help/file-roller/es/figures/file-roller_rightarrow.png share/gnome/help/file-roller/es/figures/file-roller_uparrow.png share/gnome/help/file-roller/es/file-roller.xml -share/gnome/help/file-roller/es/legal.xml +share/gnome/help/file-roller/fr/figures/file-roller_home.png +share/gnome/help/file-roller/fr/figures/file-roller_leftarrow.png share/gnome/help/file-roller/fr/figures/file-roller_main_window.png +share/gnome/help/file-roller/fr/figures/file-roller_rightarrow.png +share/gnome/help/file-roller/fr/figures/file-roller_uparrow.png share/gnome/help/file-roller/fr/file-roller.xml -share/gnome/help/file-roller/fr/legal.xml +share/gnome/help/file-roller/it/figures/file-roller_home.png +share/gnome/help/file-roller/it/figures/file-roller_leftarrow.png share/gnome/help/file-roller/it/figures/file-roller_main_window.png +share/gnome/help/file-roller/it/figures/file-roller_rightarrow.png +share/gnome/help/file-roller/it/figures/file-roller_uparrow.png share/gnome/help/file-roller/it/file-roller.xml -share/gnome/help/file-roller/it/legal.xml +share/gnome/help/file-roller/ja/figures/file-roller_home.png +share/gnome/help/file-roller/ja/figures/file-roller_leftarrow.png share/gnome/help/file-roller/ja/figures/file-roller_main_window.png +share/gnome/help/file-roller/ja/figures/file-roller_rightarrow.png +share/gnome/help/file-roller/ja/figures/file-roller_uparrow.png share/gnome/help/file-roller/ja/file-roller.xml -share/gnome/help/file-roller/ja/legal.xml +share/gnome/help/file-roller/ko/figures/file-roller_home.png +share/gnome/help/file-roller/ko/figures/file-roller_leftarrow.png share/gnome/help/file-roller/ko/figures/file-roller_main_window.png +share/gnome/help/file-roller/ko/figures/file-roller_rightarrow.png +share/gnome/help/file-roller/ko/figures/file-roller_uparrow.png share/gnome/help/file-roller/ko/file-roller.xml -share/gnome/help/file-roller/ko/legal.xml -share/gnome/help/file-roller/ru/figures/fr-add-dialog.png -share/gnome/help/file-roller/ru/figures/fr-extract.png -share/gnome/help/file-roller/ru/figures/fr-mainwindow.png -share/gnome/help/file-roller/ru/figures/fr-prefs.png +share/gnome/help/file-roller/ru/figures/file-roller_home.png +share/gnome/help/file-roller/ru/figures/file-roller_leftarrow.png +share/gnome/help/file-roller/ru/figures/file-roller_main_window.png +share/gnome/help/file-roller/ru/figures/file-roller_rightarrow.png +share/gnome/help/file-roller/ru/figures/file-roller_uparrow.png share/gnome/help/file-roller/ru/file-roller.xml -share/gnome/help/file-roller/ru/legal.xml +share/gnome/help/file-roller/sv/figures/file-roller_home.png +share/gnome/help/file-roller/sv/figures/file-roller_leftarrow.png share/gnome/help/file-roller/sv/figures/file-roller_main_window.png +share/gnome/help/file-roller/sv/figures/file-roller_rightarrow.png +share/gnome/help/file-roller/sv/figures/file-roller_uparrow.png share/gnome/help/file-roller/sv/file-roller.xml -share/gnome/help/file-roller/sv/legal.xml share/gnome/help/file-roller/uk/figures/file-roller_home.png share/gnome/help/file-roller/uk/figures/file-roller_leftarrow.png share/gnome/help/file-roller/uk/figures/file-roller_main_window.png share/gnome/help/file-roller/uk/figures/file-roller_rightarrow.png share/gnome/help/file-roller/uk/figures/file-roller_uparrow.png share/gnome/help/file-roller/uk/file-roller.xml -share/gnome/help/file-roller/uk/legal.xml +share/gnome/help/file-roller/zh_CN/figures/file-roller_home.png +share/gnome/help/file-roller/zh_CN/figures/file-roller_leftarrow.png share/gnome/help/file-roller/zh_CN/figures/file-roller_main_window.png +share/gnome/help/file-roller/zh_CN/figures/file-roller_rightarrow.png +share/gnome/help/file-roller/zh_CN/figures/file-roller_uparrow.png share/gnome/help/file-roller/zh_CN/file-roller.xml -share/gnome/help/file-roller/zh_CN/legal.xml +share/gnome/help/file-roller/zh_HK/figures/file-roller_home.png +share/gnome/help/file-roller/zh_HK/figures/file-roller_leftarrow.png share/gnome/help/file-roller/zh_HK/figures/file-roller_main_window.png +share/gnome/help/file-roller/zh_HK/figures/file-roller_rightarrow.png +share/gnome/help/file-roller/zh_HK/figures/file-roller_uparrow.png share/gnome/help/file-roller/zh_HK/file-roller.xml -share/gnome/help/file-roller/zh_HK/legal.xml +share/gnome/help/file-roller/zh_TW/figures/file-roller_home.png +share/gnome/help/file-roller/zh_TW/figures/file-roller_leftarrow.png share/gnome/help/file-roller/zh_TW/figures/file-roller_main_window.png +share/gnome/help/file-roller/zh_TW/figures/file-roller_rightarrow.png +share/gnome/help/file-roller/zh_TW/figures/file-roller_uparrow.png share/gnome/help/file-roller/zh_TW/file-roller.xml -share/gnome/help/file-roller/zh_TW/legal.xml share/gnome/mime-info/file-roller.keys share/gnome/mime-info/file-roller.mime share/gnome/omf/file-roller/file-roller-C.omf @@ -113,6 +139,7 @@ share/locale/it/LC_MESSAGES/file-roller.mo share/locale/ja/LC_MESSAGES/file-roller.mo share/locale/kn/LC_MESSAGES/file-roller.mo share/locale/ko/LC_MESSAGES/file-roller.mo +share/locale/ku/LC_MESSAGES/file-roller.mo share/locale/lt/LC_MESSAGES/file-roller.mo share/locale/lv/LC_MESSAGES/file-roller.mo share/locale/mk/LC_MESSAGES/file-roller.mo @@ -156,6 +183,8 @@ share/locale/zh_TW/LC_MESSAGES/file-roller.mo @unexec rmdir %D/share/locale/sr@ije 2> /dev/null || true @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/ku/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/ku 2> /dev/null || true @dirrm share/gnome/omf/file-roller @dirrm share/gnome/help/file-roller/zh_TW/figures @dirrm share/gnome/help/file-roller/zh_TW diff --git a/archivers/fileroller/Makefile b/archivers/fileroller/Makefile index 14784828a70c..a08999c13d84 100644 --- a/archivers/fileroller/Makefile +++ b/archivers/fileroller/Makefile @@ -3,14 +3,15 @@ # Whom: Anders Nordby <anders@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/archivers/fileroller/Makefile,v 1.79 2005/10/03 21:14:16 mezz Exp $ # PORTNAME= fileroller -PORTVERSION= 2.10.4 +PORTVERSION= 2.12.1 PORTEPOCH= 1 CATEGORIES= archivers gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/file-roller/2.10 +MASTER_SITE_SUBDIR= sources/file-roller/2.12 DISTNAME= file-roller-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -27,8 +28,9 @@ INSTALLS_OMF= yes USE_X_PREFIX= yes USE_REINPLACE= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix intlhack gnomehack desktopfileutils nautilus2 -USE_LIBTOOL_VER=15 +USE_GNOME= gnomeprefix intlhack gnomehack desktopfileutils nautilus2 \ + gnomedocutils +USE_AUTOTOOLS= libtool:15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" @@ -37,6 +39,8 @@ GCONF_SCHEMAS= file-roller.schemas post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ ${WRKSRC}/src/fr-command-tar.c + @${FIND} ${WRKSRC} -name "fr-command-*.c" | ${XARGS} ${REINPLACE_CMD} \ + -e 's|atoll|fr_atoll|g' post-install: @-update-desktop-database diff --git a/archivers/fileroller/distinfo b/archivers/fileroller/distinfo index e7be152bfb20..86f081c99341 100644 --- a/archivers/fileroller/distinfo +++ b/archivers/fileroller/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/file-roller-2.10.4.tar.bz2) = 74115fe3289042cc41dc517dede3f64f -SIZE (gnome2/file-roller-2.10.4.tar.bz2) = 1307330 +MD5 (gnome2/file-roller-2.12.1.tar.bz2) = 5b256e9c56e132007ae6933b6b604157 +SIZE (gnome2/file-roller-2.12.1.tar.bz2) = 1162479 diff --git a/archivers/fileroller/files/patch-help_Makefile.in b/archivers/fileroller/files/patch-help_Makefile.in new file mode 100644 index 000000000000..d1e1b99597dd --- /dev/null +++ b/archivers/fileroller/files/patch-help_Makefile.in @@ -0,0 +1,20 @@ +--- help/Makefile.in.orig Tue Aug 9 00:19:45 2005 ++++ help/Makefile.in Tue Aug 9 00:20:04 2005 +@@ -869,7 +869,7 @@ + @for fig in $(_DOC_C_FIGURES) $(_DOC_LC_FIGURES); do \ + if test -f "$$fig"; then d=; else d="$(srcdir)/"; fi; \ + if test -f "$$d$$fig"; then \ +- figdir=`echo $$fig | sed -e 's/^\(.*\/\).*\|.*/\1/'`; \ ++ figdir=`echo $$fig | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ + if ! test -d "$(distdir)/$$figdir"; then \ + echo "$(mkinstalldirs) $(distdir)/$$figdir"; \ + $(mkinstalldirs) "$(distdir)/$$figdir"; \ +@@ -944,7 +944,7 @@ + else \ + figfile="$(srcdir)/C/$$fig"; \ + fi; \ +- figdir="$$lc/"`echo $$fig | sed -e 's/^\(.*\/\).*\|.*/\1/'`; \ ++ figdir="$$lc/"`echo $$fig | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ + figdir="$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$figdir"; \ + if ! test -d "$$figdir"; then \ + echo "$(mkinstalldirs) $$figdir"; \ diff --git a/archivers/fileroller/files/patch-src_file-utils.h b/archivers/fileroller/files/patch-src_file-utils.h new file mode 100644 index 000000000000..d3223290fe1c --- /dev/null +++ b/archivers/fileroller/files/patch-src_file-utils.h @@ -0,0 +1,16 @@ +--- src/file-utils.h.orig Sun Jul 3 19:11:59 2005 ++++ src/file-utils.h Sun Jul 3 19:12:52 2005 +@@ -25,8 +25,13 @@ + + #include <sys/types.h> + #include <time.h> ++#include <stdlib.h> ++#include <limits.h> + #include <libgnomevfs/gnome-vfs-file-size.h> + #include <libgnomevfs/gnome-vfs-mime-handlers.h> ++ ++#undef fr_atoll ++#define fr_atoll(nptr) strtoll(nptr, (char **)NULL, 10) + + + #define FILENAME_MAX_LENGTH 30 /* FIXME: find out the best value */ diff --git a/archivers/fileroller/files/patch-src_fr-command-tar.c b/archivers/fileroller/files/patch-src_fr-command-tar.c index 5a046266d274..c4e3bac836f0 100644 --- a/archivers/fileroller/files/patch-src_fr-command-tar.c +++ b/archivers/fileroller/files/patch-src_fr-command-tar.c @@ -1,13 +1,13 @@ ---- src/fr-command-tar.c.orig Fri Apr 22 13:11:56 2005 -+++ src/fr-command-tar.c Fri Apr 22 13:16:00 2005 -@@ -221,6 +221,10 @@ +--- src/fr-command-tar.c.orig Fri Jul 1 14:41:32 2005 ++++ src/fr-command-tar.c Sun Jul 3 19:03:01 2005 +@@ -222,6 +223,10 @@ begin_tar_command (FRCommand *comm) + #if defined (__SVR4) && defined (__sun) if (g_file_test ("/usr/sfw/bin/gtar", G_FILE_TEST_IS_EXECUTABLE)) { command = g_strdup ("/usr/sfw/bin/gtar"); - } ++ } +#elif defined(__FreeBSD__) + if (g_file_test ("%%LOCALBASE%%/bin/gtar", G_FILE_TEST_IS_EXECUTABLE)) { + command = g_strdup ("%%LOCALBASE%%/bin/gtar"); -+ } + } #endif if (command != NULL) - fr_process_begin_command (comm->process, command); diff --git a/archivers/fileroller/pkg-plist b/archivers/fileroller/pkg-plist index e6b9618adeaa..61dad2114c70 100644 --- a/archivers/fileroller/pkg-plist +++ b/archivers/fileroller/pkg-plist @@ -8,7 +8,8 @@ libdata/bonobo/servers/File_Roller_Component.server %%PORTDOCS%%%%DOCSDIR%%/TODO share/gnome/application-registry/file-roller.applications share/gnome/applications/file-roller.desktop -share/gnome/file-roller/glade/file_roller.glade +share/gnome/file-roller/glade/file-roller-extract.glade +share/gnome/file-roller/glade/file-roller.glade share/gnome/help/file-roller/C/figures/file-roller_home.png share/gnome/help/file-roller/C/figures/file-roller_leftarrow.png share/gnome/help/file-roller/C/figures/file-roller_main_window.png @@ -16,53 +17,78 @@ share/gnome/help/file-roller/C/figures/file-roller_rightarrow.png share/gnome/help/file-roller/C/figures/file-roller_uparrow.png share/gnome/help/file-roller/C/file-roller.xml share/gnome/help/file-roller/C/legal.xml +share/gnome/help/file-roller/de/figures/file-roller_home.png +share/gnome/help/file-roller/de/figures/file-roller_leftarrow.png share/gnome/help/file-roller/de/figures/file-roller_main_window.png +share/gnome/help/file-roller/de/figures/file-roller_rightarrow.png +share/gnome/help/file-roller/de/figures/file-roller_uparrow.png share/gnome/help/file-roller/de/file-roller.xml -share/gnome/help/file-roller/de/legal.xml share/gnome/help/file-roller/es/figures/file-roller_home.png share/gnome/help/file-roller/es/figures/file-roller_leftarrow.png share/gnome/help/file-roller/es/figures/file-roller_main_window.png share/gnome/help/file-roller/es/figures/file-roller_rightarrow.png share/gnome/help/file-roller/es/figures/file-roller_uparrow.png share/gnome/help/file-roller/es/file-roller.xml -share/gnome/help/file-roller/es/legal.xml +share/gnome/help/file-roller/fr/figures/file-roller_home.png +share/gnome/help/file-roller/fr/figures/file-roller_leftarrow.png share/gnome/help/file-roller/fr/figures/file-roller_main_window.png +share/gnome/help/file-roller/fr/figures/file-roller_rightarrow.png +share/gnome/help/file-roller/fr/figures/file-roller_uparrow.png share/gnome/help/file-roller/fr/file-roller.xml -share/gnome/help/file-roller/fr/legal.xml +share/gnome/help/file-roller/it/figures/file-roller_home.png +share/gnome/help/file-roller/it/figures/file-roller_leftarrow.png share/gnome/help/file-roller/it/figures/file-roller_main_window.png +share/gnome/help/file-roller/it/figures/file-roller_rightarrow.png +share/gnome/help/file-roller/it/figures/file-roller_uparrow.png share/gnome/help/file-roller/it/file-roller.xml -share/gnome/help/file-roller/it/legal.xml +share/gnome/help/file-roller/ja/figures/file-roller_home.png +share/gnome/help/file-roller/ja/figures/file-roller_leftarrow.png share/gnome/help/file-roller/ja/figures/file-roller_main_window.png +share/gnome/help/file-roller/ja/figures/file-roller_rightarrow.png +share/gnome/help/file-roller/ja/figures/file-roller_uparrow.png share/gnome/help/file-roller/ja/file-roller.xml -share/gnome/help/file-roller/ja/legal.xml +share/gnome/help/file-roller/ko/figures/file-roller_home.png +share/gnome/help/file-roller/ko/figures/file-roller_leftarrow.png share/gnome/help/file-roller/ko/figures/file-roller_main_window.png +share/gnome/help/file-roller/ko/figures/file-roller_rightarrow.png +share/gnome/help/file-roller/ko/figures/file-roller_uparrow.png share/gnome/help/file-roller/ko/file-roller.xml -share/gnome/help/file-roller/ko/legal.xml -share/gnome/help/file-roller/ru/figures/fr-add-dialog.png -share/gnome/help/file-roller/ru/figures/fr-extract.png -share/gnome/help/file-roller/ru/figures/fr-mainwindow.png -share/gnome/help/file-roller/ru/figures/fr-prefs.png +share/gnome/help/file-roller/ru/figures/file-roller_home.png +share/gnome/help/file-roller/ru/figures/file-roller_leftarrow.png +share/gnome/help/file-roller/ru/figures/file-roller_main_window.png +share/gnome/help/file-roller/ru/figures/file-roller_rightarrow.png +share/gnome/help/file-roller/ru/figures/file-roller_uparrow.png share/gnome/help/file-roller/ru/file-roller.xml -share/gnome/help/file-roller/ru/legal.xml +share/gnome/help/file-roller/sv/figures/file-roller_home.png +share/gnome/help/file-roller/sv/figures/file-roller_leftarrow.png share/gnome/help/file-roller/sv/figures/file-roller_main_window.png +share/gnome/help/file-roller/sv/figures/file-roller_rightarrow.png +share/gnome/help/file-roller/sv/figures/file-roller_uparrow.png share/gnome/help/file-roller/sv/file-roller.xml -share/gnome/help/file-roller/sv/legal.xml share/gnome/help/file-roller/uk/figures/file-roller_home.png share/gnome/help/file-roller/uk/figures/file-roller_leftarrow.png share/gnome/help/file-roller/uk/figures/file-roller_main_window.png share/gnome/help/file-roller/uk/figures/file-roller_rightarrow.png share/gnome/help/file-roller/uk/figures/file-roller_uparrow.png share/gnome/help/file-roller/uk/file-roller.xml -share/gnome/help/file-roller/uk/legal.xml +share/gnome/help/file-roller/zh_CN/figures/file-roller_home.png +share/gnome/help/file-roller/zh_CN/figures/file-roller_leftarrow.png share/gnome/help/file-roller/zh_CN/figures/file-roller_main_window.png +share/gnome/help/file-roller/zh_CN/figures/file-roller_rightarrow.png +share/gnome/help/file-roller/zh_CN/figures/file-roller_uparrow.png share/gnome/help/file-roller/zh_CN/file-roller.xml -share/gnome/help/file-roller/zh_CN/legal.xml +share/gnome/help/file-roller/zh_HK/figures/file-roller_home.png +share/gnome/help/file-roller/zh_HK/figures/file-roller_leftarrow.png share/gnome/help/file-roller/zh_HK/figures/file-roller_main_window.png +share/gnome/help/file-roller/zh_HK/figures/file-roller_rightarrow.png +share/gnome/help/file-roller/zh_HK/figures/file-roller_uparrow.png share/gnome/help/file-roller/zh_HK/file-roller.xml -share/gnome/help/file-roller/zh_HK/legal.xml +share/gnome/help/file-roller/zh_TW/figures/file-roller_home.png +share/gnome/help/file-roller/zh_TW/figures/file-roller_leftarrow.png share/gnome/help/file-roller/zh_TW/figures/file-roller_main_window.png +share/gnome/help/file-roller/zh_TW/figures/file-roller_rightarrow.png +share/gnome/help/file-roller/zh_TW/figures/file-roller_uparrow.png share/gnome/help/file-roller/zh_TW/file-roller.xml -share/gnome/help/file-roller/zh_TW/legal.xml share/gnome/mime-info/file-roller.keys share/gnome/mime-info/file-roller.mime share/gnome/omf/file-roller/file-roller-C.omf @@ -113,6 +139,7 @@ share/locale/it/LC_MESSAGES/file-roller.mo share/locale/ja/LC_MESSAGES/file-roller.mo share/locale/kn/LC_MESSAGES/file-roller.mo share/locale/ko/LC_MESSAGES/file-roller.mo +share/locale/ku/LC_MESSAGES/file-roller.mo share/locale/lt/LC_MESSAGES/file-roller.mo share/locale/lv/LC_MESSAGES/file-roller.mo share/locale/mk/LC_MESSAGES/file-roller.mo @@ -156,6 +183,8 @@ share/locale/zh_TW/LC_MESSAGES/file-roller.mo @unexec rmdir %D/share/locale/sr@ije 2> /dev/null || true @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/ku/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/ku 2> /dev/null || true @dirrm share/gnome/omf/file-roller @dirrm share/gnome/help/file-roller/zh_TW/figures @dirrm share/gnome/help/file-roller/zh_TW diff --git a/audio/gnome-media/Makefile b/audio/gnome-media/Makefile index 51946794819d..d1236e0f19f2 100644 --- a/audio/gnome-media/Makefile +++ b/audio/gnome-media/Makefile @@ -3,13 +3,14 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/audio/gnomemedia2/Makefile,v 1.79 2005/09/04 21:49:55 marcus Exp $ # PORTNAME= gnomemedia2 -PORTVERSION= 2.10.2 +PORTVERSION= 2.12.0 CATEGORIES= audio gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-media/2.10 +MASTER_SITE_SUBDIR= sources/gnome-media/2.12 DISTNAME= gnome-media-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -20,7 +21,7 @@ USE_BZIP2= yes INSTALLS_OMF= yes USE_X_PREFIX= yes USE_GMAKE= yes -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 INSTALLS_SHLIB= yes USE_REINPLACE= yes GNOME_DESKTOP_VERSION=2 @@ -31,7 +32,8 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" GCONF_SCHEMAS= CDDB-Slave2.schemas gnome-audio-profiles.schemas \ - gnome-cd.schemas gnome-sound-recorder.schemas + gnome-cd.schemas gnome-sound-recorder.schemas \ + gnome-volume-control.schemas .include <bsd.port.pre.mk> @@ -43,10 +45,5 @@ post-patch: .else @${REINPLACE_CMD} -e 's|%%CDROM%%|acd0c|' ${WRKSRC}/configure .endif -.if ${OSVERSION} < 504000 - @${REINPLACE_CMD} -e 's|lrint|rint|' \ - ${WRKSRC}/gnome-cd/gst-cdparanoia-cdrom.c \ - ${WRKSRC}/gst-mixer/src/volume.c -.endif .include <bsd.port.post.mk> diff --git a/audio/gnome-media/distinfo b/audio/gnome-media/distinfo index ecdc3f5b955b..97a4c2785c34 100644 --- a/audio/gnome-media/distinfo +++ b/audio/gnome-media/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-media-2.10.2.tar.bz2) = 3d73cd40cfa52c5eef882302f92c60d6 -SIZE (gnome2/gnome-media-2.10.2.tar.bz2) = 3328141 +MD5 (gnome2/gnome-media-2.12.0.tar.bz2) = 74d9a78f7269602e033ab1a4a144afdf +SIZE (gnome2/gnome-media-2.12.0.tar.bz2) = 3444233 diff --git a/audio/gnome-media/pkg-plist b/audio/gnome-media/pkg-plist index d4b0694c11e6..b5e234a8959e 100644 --- a/audio/gnome-media/pkg-plist +++ b/audio/gnome-media/pkg-plist @@ -42,7 +42,7 @@ share/gnome/gnome-media/pixmaps/play.png share/gnome/gnome-media/pixmaps/record.png share/gnome/gnome-media/pixmaps/tone.png share/gnome/gnome-media/pixmaps/video.png -share/gnome/gnome-sound-recorder/ui/gsr.xml +share/gnome/gnome-sound-recorder/ui/ui.xml share/gnome/gstreamer-properties/glade/gstreamer-properties.glade share/gnome/gstreamer-properties/icons/gstreamer-properties.png share/gnome/help/gnome-cd/C/figures/cdplayer_trackeditor_button.png @@ -161,6 +161,20 @@ share/gnome/help/gnome-cd/ko/figures/rewind_button.png share/gnome/help/gnome-cd/ko/figures/stop_button.png share/gnome/help/gnome-cd/ko/gnome-cd.xml share/gnome/help/gnome-cd/ko/legal.xml +share/gnome/help/gnome-cd/nl/figures/cdplayer_trackeditor_button.png +share/gnome/help/gnome-cd/nl/figures/cdplayer_trackeditor_window.png +share/gnome/help/gnome-cd/nl/figures/cdplayer_window.png +share/gnome/help/gnome-cd/nl/figures/eject_button.png +share/gnome/help/gnome-cd/nl/figures/forward_button.png +share/gnome/help/gnome-cd/nl/figures/next_button.png +share/gnome/help/gnome-cd/nl/figures/pause_button.png +share/gnome/help/gnome-cd/nl/figures/play_button.png +share/gnome/help/gnome-cd/nl/figures/preferences_button.png +share/gnome/help/gnome-cd/nl/figures/previous_button.png +share/gnome/help/gnome-cd/nl/figures/rewind_button.png +share/gnome/help/gnome-cd/nl/figures/stop_button.png +share/gnome/help/gnome-cd/nl/gnome-cd.xml +share/gnome/help/gnome-cd/nl/legal.xml share/gnome/help/gnome-cd/sv/figures/cdplayer_trackeditor_button.png share/gnome/help/gnome-cd/sv/figures/cdplayer_trackeditor_window.png share/gnome/help/gnome-cd/sv/figures/cdplayer_window.png @@ -178,6 +192,20 @@ share/gnome/help/gnome-cd/sv/figures/rewind_button.png share/gnome/help/gnome-cd/sv/figures/stop_button.png share/gnome/help/gnome-cd/sv/gnome-cd.xml share/gnome/help/gnome-cd/sv/legal.xml +share/gnome/help/gnome-cd/uk/figures/cdplayer_trackeditor_button.png +share/gnome/help/gnome-cd/uk/figures/cdplayer_trackeditor_window.png +share/gnome/help/gnome-cd/uk/figures/cdplayer_window.png +share/gnome/help/gnome-cd/uk/figures/eject_button.png +share/gnome/help/gnome-cd/uk/figures/forward_button.png +share/gnome/help/gnome-cd/uk/figures/next_button.png +share/gnome/help/gnome-cd/uk/figures/pause_button.png +share/gnome/help/gnome-cd/uk/figures/play_button.png +share/gnome/help/gnome-cd/uk/figures/preferences_button.png +share/gnome/help/gnome-cd/uk/figures/previous_button.png +share/gnome/help/gnome-cd/uk/figures/rewind_button.png +share/gnome/help/gnome-cd/uk/figures/stop_button.png +share/gnome/help/gnome-cd/uk/gnome-cd.xml +share/gnome/help/gnome-cd/uk/legal.xml share/gnome/help/gnome-cd/zh_CN/figures/cdplayer_trackeditor_button.png share/gnome/help/gnome-cd/zh_CN/figures/cdplayer_trackeditor_window.png share/gnome/help/gnome-cd/zh_CN/figures/cdplayer_window.png @@ -215,11 +243,19 @@ share/gnome/help/gnome-cd/zh_TW/legal.xml share/gnome/help/gnome-sound-recorder/C/figures/grecord_window.png share/gnome/help/gnome-sound-recorder/C/gnome-sound-recorder.xml share/gnome/help/gnome-sound-recorder/C/legal.xml +share/gnome/help/gnome-sound-recorder/uk/figures/grecord_window.png +share/gnome/help/gnome-sound-recorder/uk/gnome-sound-recorder.xml +share/gnome/help/gnome-sound-recorder/uk/legal.xml share/gnome/help/gnome-volume-control/C/figures/gmix-prefs.png share/gnome/help/gnome-volume-control/C/figures/gmix.png share/gnome/help/gnome-volume-control/C/figures/gnome-volume-control_window.png share/gnome/help/gnome-volume-control/C/gnome-volume-control.xml share/gnome/help/gnome-volume-control/C/legal.xml +share/gnome/help/gnome-volume-control/uk/figures/gmix-prefs.png +share/gnome/help/gnome-volume-control/uk/figures/gmix.png +share/gnome/help/gnome-volume-control/uk/figures/gnome-volume-control_window.png +share/gnome/help/gnome-volume-control/uk/gnome-volume-control.xml +share/gnome/help/gnome-volume-control/uk/legal.xml share/gnome/help/grecord/de/figures/grecord-prefs-path.png share/gnome/help/grecord/de/figures/grecord-prefs-play.png share/gnome/help/grecord/de/figures/grecord-prefs-rec.png @@ -304,6 +340,9 @@ share/gnome/help/grecord/zh_TW/legal.xml share/gnome/help/gstreamer-properties/C/figures/gstreamer_properties_window.png share/gnome/help/gstreamer-properties/C/gstreamer-properties.xml share/gnome/help/gstreamer-properties/C/legal.xml +share/gnome/help/gstreamer-properties/uk/figures/gstreamer_properties_window.png +share/gnome/help/gstreamer-properties/uk/gstreamer-properties.xml +share/gnome/help/gstreamer-properties/uk/legal.xml share/gnome/idl/GNOME_Media_CDDBSlave2.idl share/gnome/omf/gnome-media/gnome-cd-C.omf share/gnome/omf/gnome-media/gnome-cd-de.omf @@ -312,10 +351,13 @@ share/gnome/omf/gnome-media/gnome-cd-fr.omf share/gnome/omf/gnome-media/gnome-cd-it.omf share/gnome/omf/gnome-media/gnome-cd-ja.omf share/gnome/omf/gnome-media/gnome-cd-ko.omf +share/gnome/omf/gnome-media/gnome-cd-nl.omf share/gnome/omf/gnome-media/gnome-cd-sv.omf +share/gnome/omf/gnome-media/gnome-cd-uk.omf share/gnome/omf/gnome-media/gnome-cd-zh_CN.omf share/gnome/omf/gnome-media/gnome-cd-zh_TW.omf share/gnome/omf/gnome-media/gnome-volume-control-C.omf +share/gnome/omf/gnome-media/gnome-volume-control-uk.omf share/gnome/omf/gnome-media/grecord-C.omf share/gnome/omf/gnome-media/grecord-de.omf share/gnome/omf/gnome-media/grecord-es.omf @@ -324,21 +366,15 @@ share/gnome/omf/gnome-media/grecord-it.omf share/gnome/omf/gnome-media/grecord-ja.omf share/gnome/omf/gnome-media/grecord-ko.omf share/gnome/omf/gnome-media/grecord-sv.omf +share/gnome/omf/gnome-media/grecord-uk.omf share/gnome/omf/gnome-media/grecord-zh_CN.omf share/gnome/omf/gnome-media/grecord-zh_TW.omf share/gnome/omf/gnome-media/gstreamer-properties-C.omf +share/gnome/omf/gnome-media/gstreamer-properties-uk.omf share/gnome/pixmaps/gnome-cd.png share/gnome/pixmaps/gnome-cd/cd.png share/gnome/pixmaps/gnome-cd/disc.png share/gnome/pixmaps/gnome-cd/media-eject.png -share/gnome/pixmaps/gnome-cd/media-ffwd.png -share/gnome/pixmaps/gnome-cd/media-next.png -share/gnome/pixmaps/gnome-cd/media-pause.png -share/gnome/pixmaps/gnome-cd/media-play.png -share/gnome/pixmaps/gnome-cd/media-prev.png -share/gnome/pixmaps/gnome-cd/media-record.png -share/gnome/pixmaps/gnome-cd/media-rewind.png -share/gnome/pixmaps/gnome-cd/media-stop.png share/gnome/pixmaps/gnome-cd/once.png share/gnome/pixmaps/gnome-cd/repeat.png share/gnome/pixmaps/gnome-cd/themes/None/None.theme @@ -396,9 +432,6 @@ share/gnome/pixmaps/gnome-cd/themes/red-lcd/top-right.png share/gnome/pixmaps/gnome-cd/themes/red-lcd/top.png share/gnome/pixmaps/gnome-cd/track.png share/gnome/pixmaps/gnome-grecord.png -share/gnome/pixmaps/gnome-media/gnome-sound-recorder/media-play.png -share/gnome/pixmaps/gnome-media/gnome-sound-recorder/media-record.png -share/gnome/pixmaps/gnome-media/gnome-sound-recorder/media-stop.png share/gnome/pixmaps/gnome-mixer.png share/gnome/pixmaps/gnome-reclevel.png share/gnome/pixmaps/gnome-vumeter.png @@ -469,8 +502,6 @@ share/locale/wa/LC_MESSAGES/gnome-media-2.0.mo share/locale/xh/LC_MESSAGES/gnome-media-2.0.mo share/locale/zh_CN/LC_MESSAGES/gnome-media-2.0.mo share/locale/zh_TW/LC_MESSAGES/gnome-media-2.0.mo -@dirrm share/gnome/pixmaps/gnome-media/gnome-sound-recorder -@dirrm share/gnome/pixmaps/gnome-media @dirrm share/gnome/pixmaps/gnome-cd/themes/red-lcd @dirrm share/gnome/pixmaps/gnome-cd/themes/media @dirrm share/gnome/pixmaps/gnome-cd/themes/lcd @@ -478,6 +509,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-media-2.0.mo @dirrm share/gnome/pixmaps/gnome-cd/themes @dirrm share/gnome/pixmaps/gnome-cd @dirrm share/gnome/omf/gnome-media +@dirrm share/gnome/help/gstreamer-properties/uk/figures +@dirrm share/gnome/help/gstreamer-properties/uk @dirrm share/gnome/help/gstreamer-properties/C/figures @dirrm share/gnome/help/gstreamer-properties/C @dirrm share/gnome/help/gstreamer-properties @@ -487,6 +520,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-media-2.0.mo @dirrm share/gnome/help/grecord/zh_CN @dirrm share/gnome/help/grecord/sv/figures @dirrm share/gnome/help/grecord/sv +@dirrm share/gnome/help/gnome-cd/nl/figures +@dirrm share/gnome/help/gnome-cd/nl @dirrm share/gnome/help/grecord/ko/figures @dirrm share/gnome/help/grecord/ko @dirrm share/gnome/help/grecord/ja/figures @@ -500,9 +535,13 @@ share/locale/zh_TW/LC_MESSAGES/gnome-media-2.0.mo @dirrm share/gnome/help/grecord/de/figures @dirrm share/gnome/help/grecord/de @dirrm share/gnome/help/grecord +@dirrm share/gnome/help/gnome-volume-control/uk/figures +@dirrm share/gnome/help/gnome-volume-control/uk @dirrm share/gnome/help/gnome-volume-control/C/figures @dirrm share/gnome/help/gnome-volume-control/C @dirrm share/gnome/help/gnome-volume-control +@dirrm share/gnome/help/gnome-sound-recorder/uk/figures +@dirrm share/gnome/help/gnome-sound-recorder/uk @dirrm share/gnome/help/gnome-sound-recorder/C/figures @dirrm share/gnome/help/gnome-sound-recorder/C @dirrm share/gnome/help/gnome-sound-recorder @@ -510,6 +549,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-media-2.0.mo @dirrm share/gnome/help/gnome-cd/zh_TW @dirrm share/gnome/help/gnome-cd/zh_CN/figures @dirrm share/gnome/help/gnome-cd/zh_CN +@dirrm share/gnome/help/gnome-cd/uk/figures +@dirrm share/gnome/help/gnome-cd/uk @dirrm share/gnome/help/gnome-cd/sv/figures @dirrm share/gnome/help/gnome-cd/sv @dirrm share/gnome/help/gnome-cd/ko/figures diff --git a/audio/gnomemedia2/Makefile b/audio/gnomemedia2/Makefile index 51946794819d..d1236e0f19f2 100644 --- a/audio/gnomemedia2/Makefile +++ b/audio/gnomemedia2/Makefile @@ -3,13 +3,14 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/audio/gnomemedia2/Makefile,v 1.79 2005/09/04 21:49:55 marcus Exp $ # PORTNAME= gnomemedia2 -PORTVERSION= 2.10.2 +PORTVERSION= 2.12.0 CATEGORIES= audio gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-media/2.10 +MASTER_SITE_SUBDIR= sources/gnome-media/2.12 DISTNAME= gnome-media-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -20,7 +21,7 @@ USE_BZIP2= yes INSTALLS_OMF= yes USE_X_PREFIX= yes USE_GMAKE= yes -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 INSTALLS_SHLIB= yes USE_REINPLACE= yes GNOME_DESKTOP_VERSION=2 @@ -31,7 +32,8 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" GCONF_SCHEMAS= CDDB-Slave2.schemas gnome-audio-profiles.schemas \ - gnome-cd.schemas gnome-sound-recorder.schemas + gnome-cd.schemas gnome-sound-recorder.schemas \ + gnome-volume-control.schemas .include <bsd.port.pre.mk> @@ -43,10 +45,5 @@ post-patch: .else @${REINPLACE_CMD} -e 's|%%CDROM%%|acd0c|' ${WRKSRC}/configure .endif -.if ${OSVERSION} < 504000 - @${REINPLACE_CMD} -e 's|lrint|rint|' \ - ${WRKSRC}/gnome-cd/gst-cdparanoia-cdrom.c \ - ${WRKSRC}/gst-mixer/src/volume.c -.endif .include <bsd.port.post.mk> diff --git a/audio/gnomemedia2/distinfo b/audio/gnomemedia2/distinfo index ecdc3f5b955b..97a4c2785c34 100644 --- a/audio/gnomemedia2/distinfo +++ b/audio/gnomemedia2/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-media-2.10.2.tar.bz2) = 3d73cd40cfa52c5eef882302f92c60d6 -SIZE (gnome2/gnome-media-2.10.2.tar.bz2) = 3328141 +MD5 (gnome2/gnome-media-2.12.0.tar.bz2) = 74d9a78f7269602e033ab1a4a144afdf +SIZE (gnome2/gnome-media-2.12.0.tar.bz2) = 3444233 diff --git a/audio/gnomemedia2/pkg-plist b/audio/gnomemedia2/pkg-plist index d4b0694c11e6..b5e234a8959e 100644 --- a/audio/gnomemedia2/pkg-plist +++ b/audio/gnomemedia2/pkg-plist @@ -42,7 +42,7 @@ share/gnome/gnome-media/pixmaps/play.png share/gnome/gnome-media/pixmaps/record.png share/gnome/gnome-media/pixmaps/tone.png share/gnome/gnome-media/pixmaps/video.png -share/gnome/gnome-sound-recorder/ui/gsr.xml +share/gnome/gnome-sound-recorder/ui/ui.xml share/gnome/gstreamer-properties/glade/gstreamer-properties.glade share/gnome/gstreamer-properties/icons/gstreamer-properties.png share/gnome/help/gnome-cd/C/figures/cdplayer_trackeditor_button.png @@ -161,6 +161,20 @@ share/gnome/help/gnome-cd/ko/figures/rewind_button.png share/gnome/help/gnome-cd/ko/figures/stop_button.png share/gnome/help/gnome-cd/ko/gnome-cd.xml share/gnome/help/gnome-cd/ko/legal.xml +share/gnome/help/gnome-cd/nl/figures/cdplayer_trackeditor_button.png +share/gnome/help/gnome-cd/nl/figures/cdplayer_trackeditor_window.png +share/gnome/help/gnome-cd/nl/figures/cdplayer_window.png +share/gnome/help/gnome-cd/nl/figures/eject_button.png +share/gnome/help/gnome-cd/nl/figures/forward_button.png +share/gnome/help/gnome-cd/nl/figures/next_button.png +share/gnome/help/gnome-cd/nl/figures/pause_button.png +share/gnome/help/gnome-cd/nl/figures/play_button.png +share/gnome/help/gnome-cd/nl/figures/preferences_button.png +share/gnome/help/gnome-cd/nl/figures/previous_button.png +share/gnome/help/gnome-cd/nl/figures/rewind_button.png +share/gnome/help/gnome-cd/nl/figures/stop_button.png +share/gnome/help/gnome-cd/nl/gnome-cd.xml +share/gnome/help/gnome-cd/nl/legal.xml share/gnome/help/gnome-cd/sv/figures/cdplayer_trackeditor_button.png share/gnome/help/gnome-cd/sv/figures/cdplayer_trackeditor_window.png share/gnome/help/gnome-cd/sv/figures/cdplayer_window.png @@ -178,6 +192,20 @@ share/gnome/help/gnome-cd/sv/figures/rewind_button.png share/gnome/help/gnome-cd/sv/figures/stop_button.png share/gnome/help/gnome-cd/sv/gnome-cd.xml share/gnome/help/gnome-cd/sv/legal.xml +share/gnome/help/gnome-cd/uk/figures/cdplayer_trackeditor_button.png +share/gnome/help/gnome-cd/uk/figures/cdplayer_trackeditor_window.png +share/gnome/help/gnome-cd/uk/figures/cdplayer_window.png +share/gnome/help/gnome-cd/uk/figures/eject_button.png +share/gnome/help/gnome-cd/uk/figures/forward_button.png +share/gnome/help/gnome-cd/uk/figures/next_button.png +share/gnome/help/gnome-cd/uk/figures/pause_button.png +share/gnome/help/gnome-cd/uk/figures/play_button.png +share/gnome/help/gnome-cd/uk/figures/preferences_button.png +share/gnome/help/gnome-cd/uk/figures/previous_button.png +share/gnome/help/gnome-cd/uk/figures/rewind_button.png +share/gnome/help/gnome-cd/uk/figures/stop_button.png +share/gnome/help/gnome-cd/uk/gnome-cd.xml +share/gnome/help/gnome-cd/uk/legal.xml share/gnome/help/gnome-cd/zh_CN/figures/cdplayer_trackeditor_button.png share/gnome/help/gnome-cd/zh_CN/figures/cdplayer_trackeditor_window.png share/gnome/help/gnome-cd/zh_CN/figures/cdplayer_window.png @@ -215,11 +243,19 @@ share/gnome/help/gnome-cd/zh_TW/legal.xml share/gnome/help/gnome-sound-recorder/C/figures/grecord_window.png share/gnome/help/gnome-sound-recorder/C/gnome-sound-recorder.xml share/gnome/help/gnome-sound-recorder/C/legal.xml +share/gnome/help/gnome-sound-recorder/uk/figures/grecord_window.png +share/gnome/help/gnome-sound-recorder/uk/gnome-sound-recorder.xml +share/gnome/help/gnome-sound-recorder/uk/legal.xml share/gnome/help/gnome-volume-control/C/figures/gmix-prefs.png share/gnome/help/gnome-volume-control/C/figures/gmix.png share/gnome/help/gnome-volume-control/C/figures/gnome-volume-control_window.png share/gnome/help/gnome-volume-control/C/gnome-volume-control.xml share/gnome/help/gnome-volume-control/C/legal.xml +share/gnome/help/gnome-volume-control/uk/figures/gmix-prefs.png +share/gnome/help/gnome-volume-control/uk/figures/gmix.png +share/gnome/help/gnome-volume-control/uk/figures/gnome-volume-control_window.png +share/gnome/help/gnome-volume-control/uk/gnome-volume-control.xml +share/gnome/help/gnome-volume-control/uk/legal.xml share/gnome/help/grecord/de/figures/grecord-prefs-path.png share/gnome/help/grecord/de/figures/grecord-prefs-play.png share/gnome/help/grecord/de/figures/grecord-prefs-rec.png @@ -304,6 +340,9 @@ share/gnome/help/grecord/zh_TW/legal.xml share/gnome/help/gstreamer-properties/C/figures/gstreamer_properties_window.png share/gnome/help/gstreamer-properties/C/gstreamer-properties.xml share/gnome/help/gstreamer-properties/C/legal.xml +share/gnome/help/gstreamer-properties/uk/figures/gstreamer_properties_window.png +share/gnome/help/gstreamer-properties/uk/gstreamer-properties.xml +share/gnome/help/gstreamer-properties/uk/legal.xml share/gnome/idl/GNOME_Media_CDDBSlave2.idl share/gnome/omf/gnome-media/gnome-cd-C.omf share/gnome/omf/gnome-media/gnome-cd-de.omf @@ -312,10 +351,13 @@ share/gnome/omf/gnome-media/gnome-cd-fr.omf share/gnome/omf/gnome-media/gnome-cd-it.omf share/gnome/omf/gnome-media/gnome-cd-ja.omf share/gnome/omf/gnome-media/gnome-cd-ko.omf +share/gnome/omf/gnome-media/gnome-cd-nl.omf share/gnome/omf/gnome-media/gnome-cd-sv.omf +share/gnome/omf/gnome-media/gnome-cd-uk.omf share/gnome/omf/gnome-media/gnome-cd-zh_CN.omf share/gnome/omf/gnome-media/gnome-cd-zh_TW.omf share/gnome/omf/gnome-media/gnome-volume-control-C.omf +share/gnome/omf/gnome-media/gnome-volume-control-uk.omf share/gnome/omf/gnome-media/grecord-C.omf share/gnome/omf/gnome-media/grecord-de.omf share/gnome/omf/gnome-media/grecord-es.omf @@ -324,21 +366,15 @@ share/gnome/omf/gnome-media/grecord-it.omf share/gnome/omf/gnome-media/grecord-ja.omf share/gnome/omf/gnome-media/grecord-ko.omf share/gnome/omf/gnome-media/grecord-sv.omf +share/gnome/omf/gnome-media/grecord-uk.omf share/gnome/omf/gnome-media/grecord-zh_CN.omf share/gnome/omf/gnome-media/grecord-zh_TW.omf share/gnome/omf/gnome-media/gstreamer-properties-C.omf +share/gnome/omf/gnome-media/gstreamer-properties-uk.omf share/gnome/pixmaps/gnome-cd.png share/gnome/pixmaps/gnome-cd/cd.png share/gnome/pixmaps/gnome-cd/disc.png share/gnome/pixmaps/gnome-cd/media-eject.png -share/gnome/pixmaps/gnome-cd/media-ffwd.png -share/gnome/pixmaps/gnome-cd/media-next.png -share/gnome/pixmaps/gnome-cd/media-pause.png -share/gnome/pixmaps/gnome-cd/media-play.png -share/gnome/pixmaps/gnome-cd/media-prev.png -share/gnome/pixmaps/gnome-cd/media-record.png -share/gnome/pixmaps/gnome-cd/media-rewind.png -share/gnome/pixmaps/gnome-cd/media-stop.png share/gnome/pixmaps/gnome-cd/once.png share/gnome/pixmaps/gnome-cd/repeat.png share/gnome/pixmaps/gnome-cd/themes/None/None.theme @@ -396,9 +432,6 @@ share/gnome/pixmaps/gnome-cd/themes/red-lcd/top-right.png share/gnome/pixmaps/gnome-cd/themes/red-lcd/top.png share/gnome/pixmaps/gnome-cd/track.png share/gnome/pixmaps/gnome-grecord.png -share/gnome/pixmaps/gnome-media/gnome-sound-recorder/media-play.png -share/gnome/pixmaps/gnome-media/gnome-sound-recorder/media-record.png -share/gnome/pixmaps/gnome-media/gnome-sound-recorder/media-stop.png share/gnome/pixmaps/gnome-mixer.png share/gnome/pixmaps/gnome-reclevel.png share/gnome/pixmaps/gnome-vumeter.png @@ -469,8 +502,6 @@ share/locale/wa/LC_MESSAGES/gnome-media-2.0.mo share/locale/xh/LC_MESSAGES/gnome-media-2.0.mo share/locale/zh_CN/LC_MESSAGES/gnome-media-2.0.mo share/locale/zh_TW/LC_MESSAGES/gnome-media-2.0.mo -@dirrm share/gnome/pixmaps/gnome-media/gnome-sound-recorder -@dirrm share/gnome/pixmaps/gnome-media @dirrm share/gnome/pixmaps/gnome-cd/themes/red-lcd @dirrm share/gnome/pixmaps/gnome-cd/themes/media @dirrm share/gnome/pixmaps/gnome-cd/themes/lcd @@ -478,6 +509,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-media-2.0.mo @dirrm share/gnome/pixmaps/gnome-cd/themes @dirrm share/gnome/pixmaps/gnome-cd @dirrm share/gnome/omf/gnome-media +@dirrm share/gnome/help/gstreamer-properties/uk/figures +@dirrm share/gnome/help/gstreamer-properties/uk @dirrm share/gnome/help/gstreamer-properties/C/figures @dirrm share/gnome/help/gstreamer-properties/C @dirrm share/gnome/help/gstreamer-properties @@ -487,6 +520,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-media-2.0.mo @dirrm share/gnome/help/grecord/zh_CN @dirrm share/gnome/help/grecord/sv/figures @dirrm share/gnome/help/grecord/sv +@dirrm share/gnome/help/gnome-cd/nl/figures +@dirrm share/gnome/help/gnome-cd/nl @dirrm share/gnome/help/grecord/ko/figures @dirrm share/gnome/help/grecord/ko @dirrm share/gnome/help/grecord/ja/figures @@ -500,9 +535,13 @@ share/locale/zh_TW/LC_MESSAGES/gnome-media-2.0.mo @dirrm share/gnome/help/grecord/de/figures @dirrm share/gnome/help/grecord/de @dirrm share/gnome/help/grecord +@dirrm share/gnome/help/gnome-volume-control/uk/figures +@dirrm share/gnome/help/gnome-volume-control/uk @dirrm share/gnome/help/gnome-volume-control/C/figures @dirrm share/gnome/help/gnome-volume-control/C @dirrm share/gnome/help/gnome-volume-control +@dirrm share/gnome/help/gnome-sound-recorder/uk/figures +@dirrm share/gnome/help/gnome-sound-recorder/uk @dirrm share/gnome/help/gnome-sound-recorder/C/figures @dirrm share/gnome/help/gnome-sound-recorder/C @dirrm share/gnome/help/gnome-sound-recorder @@ -510,6 +549,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-media-2.0.mo @dirrm share/gnome/help/gnome-cd/zh_TW @dirrm share/gnome/help/gnome-cd/zh_CN/figures @dirrm share/gnome/help/gnome-cd/zh_CN +@dirrm share/gnome/help/gnome-cd/uk/figures +@dirrm share/gnome/help/gnome-cd/uk @dirrm share/gnome/help/gnome-cd/sv/figures @dirrm share/gnome/help/gnome-cd/sv @dirrm share/gnome/help/gnome-cd/ko/figures diff --git a/audio/sound-juicer/Makefile b/audio/sound-juicer/Makefile index a4bea860dbd1..c3df43e8d17d 100644 --- a/audio/sound-juicer/Makefile +++ b/audio/sound-juicer/Makefile @@ -3,13 +3,14 @@ # Whom: Alexander Nedotsukov <bland@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/audio/sound-juicer/Makefile,v 1.29 2005/09/19 13:18:32 marcus Exp $ # PORTNAME= sound-juicer -PORTVERSION= 2.10.1 +PORTVERSION= 2.12.2 CATEGORIES= audio gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.10 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.12 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -23,9 +24,10 @@ USE_X_PREFIX= yes USE_GMAKE= yes INSTALLS_OMF= yes USE_REINPLACE= yes -USE_GNOME= gnomehack intlhack gnomeprefix libgnomeui nautiluscdburner +USE_GNOME= gnomehack intlhack gnomeprefix libgnomeui nautiluscdburner \ + gnomedocutils USE_GSTREAMER= cdparanoia vorbis flac gconf -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 CONFIGURE_ARGS= --enable-ignore-missing-cd CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/audio/sound-juicer/distinfo b/audio/sound-juicer/distinfo index 3227b069b843..49c965a65292 100644 --- a/audio/sound-juicer/distinfo +++ b/audio/sound-juicer/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/sound-juicer-2.10.1.tar.bz2) = 59a5e142cf39152bcbc1467d02e4494a -SIZE (gnome2/sound-juicer-2.10.1.tar.bz2) = 518894 +MD5 (gnome2/sound-juicer-2.12.2.tar.bz2) = e7e873cc77a002eb0d9c4cf502bd343d +SIZE (gnome2/sound-juicer-2.12.2.tar.bz2) = 573186 diff --git a/audio/sound-juicer/files/patch-src::Makefile.in b/audio/sound-juicer/files/patch-src::Makefile.in index 460020551993..187926fc41e3 100644 --- a/audio/sound-juicer/files/patch-src::Makefile.in +++ b/audio/sound-juicer/files/patch-src::Makefile.in @@ -1,15 +1,15 @@ ---- src/Makefile.in.orig Mon Feb 7 02:21:49 2005 -+++ src/Makefile.in Mon Feb 7 02:22:46 2005 -@@ -61,7 +61,7 @@ - sj-about.$(OBJEXT) sj-extracting.$(OBJEXT) $(am__objects_1) \ - $(am__objects_2) +--- src/Makefile.in.orig Tue Aug 23 20:23:29 2005 ++++ src/Makefile.in Tue Aug 23 20:23:57 2005 +@@ -63,7 +63,7 @@ + sj-about.$(OBJEXT) sj-extracting.$(OBJEXT) \ + bacon-volume.$(OBJEXT) $(am__objects_1) $(am__objects_2) sound_juicer_OBJECTS = $(am_sound_juicer_OBJECTS) -sound_juicer_LDADD = $(LDADD) +sound_juicer_LDADD = $(LDADD) -lcam DEFAULT_INCLUDES = -I. -I$(srcdir) -I. depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles -@@ -233,7 +233,7 @@ +@@ -257,7 +257,7 @@ target_alias = @target_alias@ # General compiler flags diff --git a/audio/sound-juicer/files/patch-src::sj-genres.c b/audio/sound-juicer/files/patch-src::sj-genres.c deleted file mode 100644 index 5bbf888cbed3..000000000000 --- a/audio/sound-juicer/files/patch-src::sj-genres.c +++ /dev/null @@ -1,13 +0,0 @@ ---- src/sj-genres.c.orig Mon Jan 17 13:22:28 2005 -+++ src/sj-genres.c Mon Jan 17 13:22:34 2005 -@@ -20,9 +20,9 @@ - * Authors: Ross Burton <ross@burtonini.com> - */ - --#include "sound-juicer.h" - - #include <glib/gi18n.h> -+#include "sound-juicer.h" - - #include "sj-genres.h" - diff --git a/audio/sound-juicer/files/patch-src::sj-util.c b/audio/sound-juicer/files/patch-src::sj-util.c deleted file mode 100644 index b29d97bbd4f9..000000000000 --- a/audio/sound-juicer/files/patch-src::sj-util.c +++ /dev/null @@ -1,43 +0,0 @@ ---- src/sj-util.c.orig Tue Feb 8 14:06:57 2005 -+++ src/sj-util.c Tue Feb 8 14:25:03 2005 -@@ -157,6 +157,15 @@ - if (fd < 0) { - return FALSE; - } -+#if defined(__FreeBSD__) -+ status = FALSE; -+ -+ ioctl (fd, CDIOCCLOSE); -+ -+ close (fd); -+ -+ return status; -+#else - - status = ioctl (fd, CDROM_DRIVE_STATUS, CDSL_CURRENT); - if (status < 0) { -@@ -167,6 +176,7 @@ - close (fd); - - return status == CDS_TRAY_OPEN; -+#endif - } - - gboolean is_audio_cd (const char *device) -@@ -191,7 +201,7 @@ - default: - return FALSE; - } -- -+/* - fd = open (device, O_RDONLY | O_NONBLOCK | O_EXCL); - if (fd <0) { - return FALSE; -@@ -206,6 +216,7 @@ - close (fd); - - return status == CDS_AUDIO; -+ */ - } - - /* Pass NULL to use g_free */ diff --git a/audio/sound-juicer/pkg-plist b/audio/sound-juicer/pkg-plist index af795151e073..e3ebca0dda03 100644 --- a/audio/sound-juicer/pkg-plist +++ b/audio/sound-juicer/pkg-plist @@ -1,13 +1,21 @@ bin/sound-juicer share/gnome/applications/sound-juicer.desktop share/gnome/help/sound-juicer/C/fdl-appendix.xml -share/gnome/help/sound-juicer/C/figures/prefs.png -share/gnome/help/sound-juicer/C/figures/startup.png share/gnome/help/sound-juicer/C/legal.xml share/gnome/help/sound-juicer/C/sound-juicer.xml -share/gnome/omf/sound-juicer/sound-juicer-manual-C.omf +share/gnome/help/sound-juicer/es/fdl-appendix.xml +share/gnome/help/sound-juicer/es/legal.xml +share/gnome/help/sound-juicer/es/sound-juicer.xml +share/gnome/help/sound-juicer/uk/fdl-appendix.xml +share/gnome/help/sound-juicer/uk/legal.xml +share/gnome/help/sound-juicer/uk/sound-juicer.xml +share/gnome/omf/sound-juicer/sound-juicer-C.omf +share/gnome/omf/sound-juicer/sound-juicer-es.omf +share/gnome/omf/sound-juicer/sound-juicer-uk.omf share/gnome/pixmaps/sound-juicer.png share/gnome/sound-juicer/orange-slice.png +share/gnome/sound-juicer/sj-play.png +share/gnome/sound-juicer/sj-record.png share/gnome/sound-juicer/sound-juicer.glade share/locale/ar/LC_MESSAGES/sound-juicer.mo share/locale/az/LC_MESSAGES/sound-juicer.mo @@ -15,6 +23,7 @@ share/locale/be/LC_MESSAGES/sound-juicer.mo share/locale/bg/LC_MESSAGES/sound-juicer.mo share/locale/ca/LC_MESSAGES/sound-juicer.mo share/locale/cs/LC_MESSAGES/sound-juicer.mo +share/locale/cy/LC_MESSAGES/sound-juicer.mo share/locale/da/LC_MESSAGES/sound-juicer.mo share/locale/de/LC_MESSAGES/sound-juicer.mo share/locale/el/LC_MESSAGES/sound-juicer.mo @@ -23,8 +32,10 @@ share/locale/en_GB/LC_MESSAGES/sound-juicer.mo share/locale/es/LC_MESSAGES/sound-juicer.mo share/locale/et/LC_MESSAGES/sound-juicer.mo share/locale/eu/LC_MESSAGES/sound-juicer.mo +share/locale/fa/LC_MESSAGES/sound-juicer.mo share/locale/fi/LC_MESSAGES/sound-juicer.mo share/locale/fr/LC_MESSAGES/sound-juicer.mo +share/locale/gl/LC_MESSAGES/sound-juicer.mo share/locale/gu/LC_MESSAGES/sound-juicer.mo share/locale/hi/LC_MESSAGES/sound-juicer.mo share/locale/hr/LC_MESSAGES/sound-juicer.mo @@ -48,18 +59,22 @@ share/locale/pt_BR/LC_MESSAGES/sound-juicer.mo share/locale/ro/LC_MESSAGES/sound-juicer.mo share/locale/ru/LC_MESSAGES/sound-juicer.mo share/locale/rw/LC_MESSAGES/sound-juicer.mo +share/locale/sk/LC_MESSAGES/sound-juicer.mo share/locale/sq/LC_MESSAGES/sound-juicer.mo share/locale/sr/LC_MESSAGES/sound-juicer.mo share/locale/sr@Latn/LC_MESSAGES/sound-juicer.mo share/locale/sv/LC_MESSAGES/sound-juicer.mo +share/locale/ta/LC_MESSAGES/sound-juicer.mo share/locale/th/LC_MESSAGES/sound-juicer.mo share/locale/tr/LC_MESSAGES/sound-juicer.mo +share/locale/ug/LC_MESSAGES/sound-juicer.mo share/locale/uk/LC_MESSAGES/sound-juicer.mo share/locale/xh/LC_MESSAGES/sound-juicer.mo share/locale/zh_CN/LC_MESSAGES/sound-juicer.mo share/locale/zh_TW/LC_MESSAGES/sound-juicer.mo @dirrm share/gnome/sound-juicer @dirrm share/gnome/omf/sound-juicer -@dirrm share/gnome/help/sound-juicer/C/figures +@dirrm share/gnome/help/sound-juicer/uk +@dirrm share/gnome/help/sound-juicer/es @dirrm share/gnome/help/sound-juicer/C @dirrm share/gnome/help/sound-juicer diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile index 22ddebd3403b..b3a55d2f0543 100644 --- a/databases/evolution-data-server/Makefile +++ b/databases/evolution-data-server/Makefile @@ -3,20 +3,20 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/databases/evolution-data-server/Makefile,v 1.64 2005/10/09 20:44:42 marcus Exp $ # PORTNAME= evolution-data-server -PORTVERSION= 1.2.3 -PORTREVISION= 2 +PORTVERSION= 1.4.1.1 CATEGORIES= databases gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.2 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.4 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= The data backends for the Evolution integrated mail/PIM suite -LIB_DEPENDS= soup-2.2.9:${PORTSDIR}/devel/libsoup \ +LIB_DEPENDS= soup-2.2.8:${PORTSDIR}/devel/libsoup \ nss3.1:${PORTSDIR}/security/nss \ tasn1.2:${PORTSDIR}/security/libtasn1 @@ -24,12 +24,15 @@ USE_BZIP2= yes USE_GMAKE= yes USE_BISON= yes USE_X_PREFIX= yes -USE_GNOME= gnomeprefix gnomehack intlhack gnometarget libgnomeui +USE_GNOME= gnomeprefix gnomehack intlhack gnometarget libgnomeui \ + ltverhack +USE_OPENLDAP= yes USE_REINPLACE= yes -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 INSTALLS_SHLIB= yes CONFIGURE_ARGS= --enable-static \ --enable-nss=yes \ + --with-openldap=yes \ --with-nss-includes=${LOCALBASE}/include/nss/nss \ --with-nss-libs=${LOCALBASE}/lib \ --with-nspr-includes=${LOCALBASE}/include/nspr \ @@ -38,7 +41,7 @@ CONFIGURE_ARGS= --enable-static \ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" -PLIST_SUB= VERSION="1.2" EVO_VERSION="1.2" +PLIST_SUB= VERSION="1.4" EVO_VERSION="1.2" .include <bsd.port.pre.mk> @@ -46,13 +49,6 @@ PLIST_SUB= VERSION="1.2" EVO_VERSION="1.2" EXTRA_PATCHES+= ${FILESDIR}/extra-patch-libedataserver_e-msgport.c .endif -.if !defined(WITHOUT_LDAP) -USE_OPENLDAP= yes -CONFIGURE_ARGS+=--with-openldap=yes -.else -CONFIGURE_ARGS+=--with-openldap=no -.endif - .if ${OSVERSION} >= 500000 && !defined(NO_KERBEROS) && \ exists(/usr/lib/libkrb5.so) CONFIGURE_ARGS+= --with-krb5=/usr @@ -65,10 +61,4 @@ CONFIGURE_ARGS+= --with-krb5=${LOCALBASE} .endif .endif -pre-everything:: - @${ECHO_MSG} "" - @${ECHO_MSG} "evolution-data-server has the following configurable option(s):" - @${ECHO_MSG} " WITHOUT_LDAP Disable LDAP support" - @${ECHO_MSG} "" - .include <bsd.port.post.mk> diff --git a/databases/evolution-data-server/distinfo b/databases/evolution-data-server/distinfo index 14327dd95c0a..00be48628171 100644 --- a/databases/evolution-data-server/distinfo +++ b/databases/evolution-data-server/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/evolution-data-server-1.2.3.tar.bz2) = 067d808957d4b3ac60159f8c8c1358fb -SIZE (gnome2/evolution-data-server-1.2.3.tar.bz2) = 14152903 +MD5 (gnome2/evolution-data-server-1.4.1.1.tar.bz2) = 1590ec25527b1bcc5046e84ec2d1227f +SIZE (gnome2/evolution-data-server-1.4.1.1.tar.bz2) = 14175749 diff --git a/databases/evolution-data-server/files/patch-addressbook_backends_ldap_e-book-backend-ldap.c b/databases/evolution-data-server/files/patch-addressbook_backends_ldap_e-book-backend-ldap.c new file mode 100644 index 000000000000..51f468867330 --- /dev/null +++ b/databases/evolution-data-server/files/patch-addressbook_backends_ldap_e-book-backend-ldap.c @@ -0,0 +1,13 @@ +--- addressbook/backends/ldap/e-book-backend-ldap.c.orig Fri Sep 9 16:06:37 2005 ++++ addressbook/backends/ldap/e-book-backend-ldap.c Fri Sep 9 16:08:21 2005 +@@ -301,8 +301,8 @@ struct prop_info { + + /* misc fields */ + STRING_PROP (E_CONTACT_HOMEPAGE_URL, "labeledURI"), +- /* map nickname to displayName */ +- STRING_PROP (E_CONTACT_NICKNAME, "displayName"), ++ /* map nickname to nickname */ ++ STRING_PROP (E_CONTACT_NICKNAME, "nickname"), + E_STRING_PROP (E_CONTACT_SPOUSE, "spouseName"), + E_STRING_PROP (E_CONTACT_NOTE, "note"), + E_COMPLEX_PROP (E_CONTACT_ANNIVERSARY, "anniversary", anniversary_populate, anniversary_ber, anniversary_compare), diff --git a/databases/evolution-data-server/files/patch-configure b/databases/evolution-data-server/files/patch-configure index 7bc7a9cdfb65..fe88433c1287 100644 --- a/databases/evolution-data-server/files/patch-configure +++ b/databases/evolution-data-server/files/patch-configure @@ -1,27 +1,29 @@ ---- configure.orig Tue Dec 21 13:46:01 2004 -+++ configure Tue Dec 21 13:50:02 2004 -@@ -7894,10 +7894,10 @@ - Example: --with-nspr-libs=/usr/lib" >&2;} - { (exit 1); exit 1; }; } - else -- nsprlibs="-ldl $with_nspr_libs/libplc4.a $with_nspr_libs/libplds4.a $with_nspr_libs/libnspr4.a $PTHREAD_LIB" -+ nsprlibs="$with_nspr_libs/libplc4.a $with_nspr_libs/libplds4.a $with_nspr_libs/libnspr4.a $PTHREAD_LIB" - fi - else -- nsprlibs="-ldl -lplc4 -lplds4 -lnspr4 $PTHREAD_LIB" -+ nsprlibs="-lplc4 -lplds4 -lnspr4 $PTHREAD_LIB" - fi - - echo "$as_me:$LINENO: checking for Mozilla nspr libraries" >&5 -@@ -10011,6 +10011,7 @@ +--- configure.orig Fri Jul 29 17:13:44 2005 ++++ configure Fri Jul 29 17:15:52 2005 +@@ -23461,6 +23461,13 @@ + DL_LIB='' + SOFTOKN3_LIB='' + ;; ++*freebsd*) ++ os_win32=no ++ NO_UNDEFINED='' ++ SOCKET_LIBS='' ++ DL_LIB='' ++ SOFTOKN3_LIB='-lsoftokn3' ++ ;; + *) os_win32=no + NO_UNDEFINED='' + SOCKET_LIBS='' +@@ -27135,7 +27142,7 @@ #include <sys/socket.h> #include <netinet/in.h> #include <netdb.h> +- + #include <stdio.h> - int -@@ -10777,7 +10778,7 @@ + main () +@@ -27873,7 +27880,7 @@ LDFLAGS_save="$LDFLAGS" mitlibs="-lkrb5 -lk5crypto -lcom_err -lgssapi_krb5" @@ -30,12 +32,12 @@ echo "$as_me:$LINENO: checking for Kerberos 5" >&5 echo $ECHO_N "checking for Kerberos 5... $ECHO_C" >&6 if test "${ac_cv_lib_kerberos5+set}" = set; then -@@ -29833,7 +29834,7 @@ - idldir="$datadir/idl/evolution-data-server-$BASE_VERSION" +@@ -31176,7 +31183,7 @@ + imagesdir="$datadir/pixmaps/evolution-data-server-$BASE_VERSION" -serverdir="$libdir/bonobo/servers" +serverdir="$prefix/libdata/bonobo/servers" - extensiondir='${privlibdir}'/extensions + extensiondir='${libdir}'/evolution-data-server-$API_VERSION/extensions diff --git a/databases/evolution-data-server/files/patch-servers_groupwise_e-gw-connection.c b/databases/evolution-data-server/files/patch-servers_groupwise_e-gw-connection.c deleted file mode 100644 index 576ecea6ae3c..000000000000 --- a/databases/evolution-data-server/files/patch-servers_groupwise_e-gw-connection.c +++ /dev/null @@ -1,12 +0,0 @@ ---- servers/groupwise/e-gw-connection.c.orig Tue Mar 8 03:50:29 2005 -+++ servers/groupwise/e-gw-connection.c Tue Mar 8 03:50:40 2005 -@@ -1764,8 +1764,8 @@ - EGwConnectionPrivate *priv; - SoupSoapParameter *param, *subparam, *second_level_child; - char *id, *name; -- g_return_val_if_fail (E_IS_GW_CONNECTION (cnc), E_GW_CONNECTION_STATUS_INVALID_OBJECT); - static GStaticMutex connecting = G_STATIC_MUTEX_INIT; -+ g_return_val_if_fail (E_IS_GW_CONNECTION (cnc), E_GW_CONNECTION_STATUS_INVALID_OBJECT); - - priv = cnc->priv; - g_static_mutex_lock (&connecting); diff --git a/databases/evolution-data-server/files/patch-servers_groupwise_e-gw-item.c b/databases/evolution-data-server/files/patch-servers_groupwise_e-gw-item.c deleted file mode 100644 index c865775dae15..000000000000 --- a/databases/evolution-data-server/files/patch-servers_groupwise_e-gw-item.c +++ /dev/null @@ -1,22 +0,0 @@ ---- servers/groupwise/e-gw-item.c.orig Tue Jan 25 20:31:45 2005 -+++ servers/groupwise/e-gw-item.c Tue Jan 25 20:32:28 2005 -@@ -2604,8 +2604,8 @@ - - /*attachments*/ - if (priv->attach_list) { -- soup_soap_message_start_element (msg, "attachments", NULL, NULL) ; - GSList *al ; -+ soup_soap_message_start_element (msg, "attachments", NULL, NULL) ; - for (al = priv->attach_list ; al != NULL ; al = al->next) { - EGwItemAttachment *attachment = (EGwItemAttachment *)al->data ; - add_attachment_to_soap_message (attachment, msg) ; -@@ -2669,8 +2669,8 @@ - - /*attachments*/ - if (priv->attach_list) { -- soup_soap_message_start_element (msg, "attachments", NULL, NULL) ; - GSList *al ; -+ soup_soap_message_start_element (msg, "attachments", NULL, NULL) ; - for (al = priv->attach_list ; al != NULL ; al = al->next) { - EGwItemAttachment *attachment = (EGwItemAttachment *)al->data ; - add_attachment_to_soap_message (attachment, msg) ; diff --git a/databases/evolution-data-server/pkg-plist b/databases/evolution-data-server/pkg-plist index 88b4e6712c8d..cfe9bbcfa2f4 100644 --- a/databases/evolution-data-server/pkg-plist +++ b/databases/evolution-data-server/pkg-plist @@ -32,7 +32,6 @@ include/evolution-data-server-%%VERSION%%/camel/camel-junk-plugin.h include/evolution-data-server-%%VERSION%%/camel/camel-list-utils.h include/evolution-data-server-%%VERSION%%/camel/camel-lock-client.h include/evolution-data-server-%%VERSION%%/camel/camel-lock.h -include/evolution-data-server-%%VERSION%%/camel/camel-nntp-address.h include/evolution-data-server-%%VERSION%%/camel/camel-medium.h include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-basic.h include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-bestenc.h @@ -45,6 +44,7 @@ include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-gzip.h include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-html.h include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-index.h include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-linewrap.h +include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-pgp.h include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-save.h include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-tohtml.h include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-windows.h @@ -60,6 +60,7 @@ include/evolution-data-server-%%VERSION%%/camel/camel-multipart-encrypted.h include/evolution-data-server-%%VERSION%%/camel/camel-multipart-signed.h include/evolution-data-server-%%VERSION%%/camel/camel-multipart.h include/evolution-data-server-%%VERSION%%/camel/camel-net-utils.h +include/evolution-data-server-%%VERSION%%/camel/camel-nntp-address.h include/evolution-data-server-%%VERSION%%/camel/camel-object.h include/evolution-data-server-%%VERSION%%/camel/camel-offline-folder.h include/evolution-data-server-%%VERSION%%/camel/camel-offline-journal.h @@ -108,11 +109,45 @@ include/evolution-data-server-%%VERSION%%/camel/camel-vee-store.h include/evolution-data-server-%%VERSION%%/camel/camel-vee-summary.h include/evolution-data-server-%%VERSION%%/camel/camel-vtrash-folder.h include/evolution-data-server-%%VERSION%%/camel/camel.h +include/evolution-data-server-%%VERSION%%/exchange/e-folder-exchange.h +include/evolution-data-server-%%VERSION%%/exchange/e-folder.h +include/evolution-data-server-%%VERSION%%/exchange/e-storage.h +include/evolution-data-server-%%VERSION%%/exchange/e2k-autoconfig.h +include/evolution-data-server-%%VERSION%%/exchange/e2k-context.h +include/evolution-data-server-%%VERSION%%/exchange/e2k-freebusy.h +include/evolution-data-server-%%VERSION%%/exchange/e2k-global-catalog-ldap.h +include/evolution-data-server-%%VERSION%%/exchange/e2k-global-catalog.h +include/evolution-data-server-%%VERSION%%/exchange/e2k-http-utils.h +include/evolution-data-server-%%VERSION%%/exchange/e2k-marshal.h +include/evolution-data-server-%%VERSION%%/exchange/e2k-operation.h +include/evolution-data-server-%%VERSION%%/exchange/e2k-properties.h +include/evolution-data-server-%%VERSION%%/exchange/e2k-propnames.h +include/evolution-data-server-%%VERSION%%/exchange/e2k-restriction.h +include/evolution-data-server-%%VERSION%%/exchange/e2k-result.h +include/evolution-data-server-%%VERSION%%/exchange/e2k-security-descriptor.h +include/evolution-data-server-%%VERSION%%/exchange/e2k-sid.h +include/evolution-data-server-%%VERSION%%/exchange/e2k-types.h +include/evolution-data-server-%%VERSION%%/exchange/e2k-uri.h +include/evolution-data-server-%%VERSION%%/exchange/e2k-utils.h +include/evolution-data-server-%%VERSION%%/exchange/e2k-validate.h +include/evolution-data-server-%%VERSION%%/exchange/e2k-xml-utils.h +include/evolution-data-server-%%VERSION%%/exchange/exchange-account.h +include/evolution-data-server-%%VERSION%%/exchange/exchange-constants.h +include/evolution-data-server-%%VERSION%%/exchange/exchange-folder-size.h +include/evolution-data-server-%%VERSION%%/exchange/exchange-hierarchy-foreign.h +include/evolution-data-server-%%VERSION%%/exchange/exchange-hierarchy-somedav.h +include/evolution-data-server-%%VERSION%%/exchange/exchange-hierarchy-webdav.h +include/evolution-data-server-%%VERSION%%/exchange/exchange-hierarchy.h +include/evolution-data-server-%%VERSION%%/exchange/exchange-oof.h +include/evolution-data-server-%%VERSION%%/exchange/exchange-types.h +include/evolution-data-server-%%VERSION%%/exchange/mapi.h include/evolution-data-server-%%VERSION%%/groupwise/e-gw-connection.h include/evolution-data-server-%%VERSION%%/groupwise/e-gw-container.h include/evolution-data-server-%%VERSION%%/groupwise/e-gw-filter.h include/evolution-data-server-%%VERSION%%/groupwise/e-gw-item.h include/evolution-data-server-%%VERSION%%/groupwise/e-gw-message.h +include/evolution-data-server-%%VERSION%%/groupwise/e-gw-proxy.h +include/evolution-data-server-%%VERSION%%/groupwise/e-gw-recur-utils.h include/evolution-data-server-%%VERSION%%/groupwise/e-gw-sendoptions.h include/evolution-data-server-%%VERSION%%/libebook/Evolution-DataServer-Addressbook.h include/evolution-data-server-%%VERSION%%/libebook/e-address-western.h @@ -188,10 +223,10 @@ include/evolution-data-server-%%VERSION%%/libedataserverui/e-book-auth-util.h include/evolution-data-server-%%VERSION%%/libedataserverui/e-categories-dialog.h include/evolution-data-server-%%VERSION%%/libedataserverui/e-contact-store.h include/evolution-data-server-%%VERSION%%/libedataserverui/e-destination-store.h -include/evolution-data-server-%%VERSION%%/libedataserverui/e-name-selector.h include/evolution-data-server-%%VERSION%%/libedataserverui/e-name-selector-dialog.h include/evolution-data-server-%%VERSION%%/libedataserverui/e-name-selector-entry.h include/evolution-data-server-%%VERSION%%/libedataserverui/e-name-selector-model.h +include/evolution-data-server-%%VERSION%%/libedataserverui/e-name-selector.h include/evolution-data-server-%%VERSION%%/libedataserverui/e-passwords.h include/evolution-data-server-%%VERSION%%/libedataserverui/e-source-option-menu.h include/evolution-data-server-%%VERSION%%/libedataserverui/e-source-selector-dialog.h @@ -241,71 +276,75 @@ include/evolution-data-server-%%VERSION%%/libical/sspm.h include/evolution-data-server-%%VERSION%%/libical/vcaltmp.h include/evolution-data-server-%%VERSION%%/libical/vcc.h include/evolution-data-server-%%VERSION%%/libical/vobject.h -lib/evolution-data-server-%%VERSION%%/camel-providers/libcamelgroupwise.so -lib/evolution-data-server-%%VERSION%%/camel-providers/libcamelgroupwise.urls -lib/evolution-data-server-%%VERSION%%/camel-providers/libcamelimap.so -lib/evolution-data-server-%%VERSION%%/camel-providers/libcamelimap.urls -lib/evolution-data-server-%%VERSION%%/camel-providers/libcamelimap4.so -lib/evolution-data-server-%%VERSION%%/camel-providers/libcamelimap4.urls -lib/evolution-data-server-%%VERSION%%/camel-providers/libcamellocal.so -lib/evolution-data-server-%%VERSION%%/camel-providers/libcamellocal.urls -lib/evolution-data-server-%%VERSION%%/camel-providers/libcamelnntp.so -lib/evolution-data-server-%%VERSION%%/camel-providers/libcamelnntp.urls -lib/evolution-data-server-%%VERSION%%/camel-providers/libcamelpop3.so -lib/evolution-data-server-%%VERSION%%/camel-providers/libcamelpop3.urls -lib/evolution-data-server-%%VERSION%%/camel-providers/libcamelsendmail.so -lib/evolution-data-server-%%VERSION%%/camel-providers/libcamelsendmail.urls -lib/evolution-data-server-%%VERSION%%/camel-providers/libcamelsmtp.so -lib/evolution-data-server-%%VERSION%%/camel-providers/libcamelsmtp.urls -lib/evolution-data-server-%%VERSION%%/extensions/libebookbackendfile.so -lib/evolution-data-server-%%VERSION%%/extensions/libebookbackendgroupwise.so -lib/evolution-data-server-%%VERSION%%/extensions/libebookbackendldap.so -lib/evolution-data-server-%%VERSION%%/extensions/libebookbackendvcf.so -lib/evolution-data-server-%%VERSION%%/extensions/libecalbackendcontacts.so -lib/evolution-data-server-%%VERSION%%/extensions/libecalbackendfile.so -lib/evolution-data-server-%%VERSION%%/extensions/libecalbackendgroupwise.so -lib/evolution-data-server-%%VERSION%%/extensions/libecalbackendhttp.so -lib/evolution-data-server-%%VERSION%%/extensions/libecalbackendweather.so -lib/libcamel-%%VERSION%%.a -lib/libcamel-%%VERSION%%.so -lib/libcamel-%%VERSION%%.so.0 -lib/libcamel-provider-%%VERSION%%.a -lib/libcamel-provider-%%VERSION%%.so -lib/libcamel-provider-%%VERSION%%.so.4 -lib/libebook-%%VERSION%%.a -lib/libebook-%%VERSION%%.so -lib/libebook-%%VERSION%%.so.4 -lib/libecal-%%VERSION%%.a -lib/libecal-%%VERSION%%.so -lib/libecal-%%VERSION%%.so.3 -lib/libedata-book-%%VERSION%%.a -lib/libedata-book-%%VERSION%%.so -lib/libedata-book-%%VERSION%%.so.3 -lib/libedata-cal-%%VERSION%%.a -lib/libedata-cal-%%VERSION%%.so -lib/libedata-cal-%%VERSION%%.so.3 -lib/libedataserver-%%VERSION%%.a -lib/libedataserver-%%VERSION%%.so -lib/libedataserver-%%VERSION%%.so.4 -lib/libedataserverui-%%VERSION%%.a -lib/libedataserverui-%%VERSION%%.so -lib/libedataserverui-%%VERSION%%.so.5 -lib/libegroupwise-%%VERSION%%.a -lib/libegroupwise-%%VERSION%%.so -lib/libegroupwise-%%VERSION%%.so.5 -libdata/bonobo/servers/GNOME_Evolution_DataServer_%%VERSION%%.server -libdata/pkgconfig/camel-%%VERSION%%.pc -libdata/pkgconfig/camel-provider-%%VERSION%%.pc -libdata/pkgconfig/evolution-data-server-%%VERSION%%.pc -libdata/pkgconfig/libebook-%%VERSION%%.pc -libdata/pkgconfig/libecal-%%VERSION%%.pc -libdata/pkgconfig/libedata-book-%%VERSION%%.pc -libdata/pkgconfig/libedata-cal-%%VERSION%%.pc -libdata/pkgconfig/libedataserver-%%VERSION%%.pc -libdata/pkgconfig/libedataserverui-%%VERSION%%.pc -libdata/pkgconfig/libegroupwise-%%VERSION%%.pc -libexec/camel-index-control-%%VERSION%% -libexec/camel-lock-helper-%%VERSION%% +lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelgroupwise.so +lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelgroupwise.urls +lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelimap.so +lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelimap.urls +lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelimap4.so +lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelimap4.urls +lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamellocal.so +lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamellocal.urls +lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelnntp.so +lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelnntp.urls +lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelpop3.so +lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelpop3.urls +lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelsendmail.so +lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelsendmail.urls +lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelsmtp.so +lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelsmtp.urls +lib/evolution-data-server-%%EVO_VERSION%%/extensions/libebookbackendfile.so +lib/evolution-data-server-%%EVO_VERSION%%/extensions/libebookbackendgroupwise.so +lib/evolution-data-server-%%EVO_VERSION%%/extensions/libebookbackendldap.so +lib/evolution-data-server-%%EVO_VERSION%%/extensions/libebookbackendvcf.so +lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendcontacts.so +lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendfile.so +lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendgroupwise.so +lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendhttp.so +lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendweather.so +lib/libcamel-%%EVO_VERSION%%.a +lib/libcamel-%%EVO_VERSION%%.so +lib/libcamel-%%EVO_VERSION%%.so.0 +lib/libcamel-provider-%%EVO_VERSION%%.a +lib/libcamel-provider-%%EVO_VERSION%%.so +lib/libcamel-provider-%%EVO_VERSION%%.so.6 +lib/libebook-%%EVO_VERSION%%.a +lib/libebook-%%EVO_VERSION%%.so +lib/libebook-%%EVO_VERSION%%.so.5 +lib/libecal-%%EVO_VERSION%%.a +lib/libecal-%%EVO_VERSION%%.so +lib/libecal-%%EVO_VERSION%%.so.3 +lib/libedata-book-%%EVO_VERSION%%.a +lib/libedata-book-%%EVO_VERSION%%.so +lib/libedata-book-%%EVO_VERSION%%.so.2 +lib/libedata-cal-%%EVO_VERSION%%.a +lib/libedata-cal-%%EVO_VERSION%%.so +lib/libedata-cal-%%EVO_VERSION%%.so.1 +lib/libedataserver-%%EVO_VERSION%%.a +lib/libedataserver-%%EVO_VERSION%%.so +lib/libedataserver-%%EVO_VERSION%%.so.4 +lib/libedataserverui-%%EVO_VERSION%%.a +lib/libedataserverui-%%EVO_VERSION%%.so +lib/libedataserverui-%%EVO_VERSION%%.so.6 +lib/libegroupwise-%%EVO_VERSION%%.a +lib/libegroupwise-%%EVO_VERSION%%.so +lib/libegroupwise-%%EVO_VERSION%%.so.8 +lib/libexchange-storage-%%EVO_VERSION%%.a +lib/libexchange-storage-%%EVO_VERSION%%.so +lib/libexchange-storage-%%EVO_VERSION%%.so.0 +libdata/bonobo/servers/GNOME_Evolution_DataServer_%%EVO_VERSION%%.server +libdata/pkgconfig/camel-%%EVO_VERSION%%.pc +libdata/pkgconfig/camel-provider-%%EVO_VERSION%%.pc +libdata/pkgconfig/evolution-data-server-%%EVO_VERSION%%.pc +libdata/pkgconfig/libebook-%%EVO_VERSION%%.pc +libdata/pkgconfig/libecal-%%EVO_VERSION%%.pc +libdata/pkgconfig/libedata-book-%%EVO_VERSION%%.pc +libdata/pkgconfig/libedata-cal-%%EVO_VERSION%%.pc +libdata/pkgconfig/libedataserver-%%EVO_VERSION%%.pc +libdata/pkgconfig/libedataserverui-%%EVO_VERSION%%.pc +libdata/pkgconfig/libegroupwise-%%EVO_VERSION%%.pc +libdata/pkgconfig/libexchange-storage-%%EVO_VERSION%%.pc +libexec/camel-index-control-%%EVO_VERSION%% +libexec/camel-lock-helper-%%EVO_VERSION%% libexec/evolution-data-server-%%VERSION%% share/doc/libebook/EBook.html share/doc/libebook/EBookListener.html @@ -345,15 +384,46 @@ share/doc/libecal/libecal.devhelp share/doc/libecal/right.png share/doc/libecal/style.css share/doc/libecal/up.png +share/doc/libedata-cal/ECalBackend.html +share/doc/libedata-cal/ECalBackendSExp.html +share/doc/libedata-cal/EDataCal.html +share/doc/libedata-cal/EDataCalView.html +share/doc/libedata-cal/ch01.html +share/doc/libedata-cal/home.png +share/doc/libedata-cal/index.html +share/doc/libedata-cal/index.sgml +share/doc/libedata-cal/left.png +share/doc/libedata-cal/libedata-cal.devhelp +share/doc/libedata-cal/right.png +share/doc/libedata-cal/style.css +share/doc/libedata-cal/up.png share/doc/libedataserver/ch01.html share/doc/libedataserver/home.png share/doc/libedataserver/index.html share/doc/libedataserver/index.sgml share/doc/libedataserver/left.png -share/doc/libedataserver/libedataserver-ETrie.html -share/doc/libedataserver/libedataserver-EUrl.html -share/doc/libedataserver/libedataserver-EXMLHash.html -share/doc/libedataserver/libedataserver-Utility-Functions.html +share/doc/libedataserver/libedataserver-EAccount.html +share/doc/libedataserver/libedataserver-EAccountList.html +share/doc/libedataserver/libedataserver-EFileCache.html +share/doc/libedataserver/libedataserver-EIterator.html +share/doc/libedataserver/libedataserver-EList.html +share/doc/libedataserver/libedataserver-EListIterator.html +share/doc/libedataserver/libedataserver-ESExp.html +share/doc/libedataserver/libedataserver-ESource.html +share/doc/libedataserver/libedataserver-ESourceGroup.html +share/doc/libedataserver/libedataserver-ESourceList.html +share/doc/libedataserver/libedataserver-e-categories.html +share/doc/libedataserver/libedataserver-e-db3-utils.html +share/doc/libedataserver/libedataserver-e-dbhash.html +share/doc/libedataserver/libedataserver-e-iconv.html +share/doc/libedataserver/libedataserver-e-memory.html +share/doc/libedataserver/libedataserver-e-msgport.html +share/doc/libedataserver/libedataserver-e-time-utils.html +share/doc/libedataserver/libedataserver-e-trie.html +share/doc/libedataserver/libedataserver-e-uid.html +share/doc/libedataserver/libedataserver-e-url.html +share/doc/libedataserver/libedataserver-e-util.html +share/doc/libedataserver/libedataserver-md5-utils.html share/doc/libedataserver/libedataserver.devhelp share/doc/libedataserver/right.png share/doc/libedataserver/style.css @@ -741,9 +811,9 @@ share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Wake.ics share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Wallis.ics share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Yap.ics share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/zones.tab -share/gnome/idl/evolution-data-server-%%VERSION%%/Evolution-DataServer-Addressbook.idl -share/gnome/idl/evolution-data-server-%%VERSION%%/Evolution-DataServer-Calendar.idl -share/gnome/idl/evolution-data-server-%%VERSION%%/Evolution-DataServer.idl +share/gnome/idl/evolution-data-server-%%EVO_VERSION%%/Evolution-DataServer-Addressbook.idl +share/gnome/idl/evolution-data-server-%%EVO_VERSION%%/Evolution-DataServer-Calendar.idl +share/gnome/idl/evolution-data-server-%%EVO_VERSION%%/Evolution-DataServer.idl share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_birthday_16.png share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_business_16.png share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_favorites_16.png @@ -762,72 +832,73 @@ share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_status_16.png share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_strategies_16.png share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_suppliers_16.png share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_time-and-expenses_16.png -share/locale/am/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo -share/locale/ar/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo -share/locale/az/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo -share/locale/be/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo -share/locale/bg/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo -share/locale/bn/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo -share/locale/bs/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo -share/locale/ca/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo -share/locale/cs/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo -share/locale/cy/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo -share/locale/da/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo -share/locale/de/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo -share/locale/el/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo -share/locale/en_AU/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo -share/locale/en_CA/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo -share/locale/en_GB/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo -share/locale/es/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo -share/locale/et/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo -share/locale/eu/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo -share/locale/fa/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo -share/locale/fi/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo -share/locale/fr/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo -share/locale/ga/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo -share/locale/gl/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo -share/locale/gu/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo -share/locale/he/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo -share/locale/hi/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo -share/locale/hr/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo -share/locale/hu/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo -share/locale/id/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo -share/locale/is/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo -share/locale/it/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo -share/locale/ja/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo -share/locale/ko/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo -share/locale/lt/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo -share/locale/lv/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo -share/locale/mk/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo -share/locale/ml/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo -share/locale/mn/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo -share/locale/ms/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo -share/locale/nb/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo -share/locale/nl/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo -share/locale/nn/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo -share/locale/no/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo -share/locale/pa/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo -share/locale/pl/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo -share/locale/pt/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo -share/locale/pt_BR/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo -share/locale/ro/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo -share/locale/ru/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo -share/locale/rw/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo -share/locale/sk/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo -share/locale/sl/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo -share/locale/sq/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo -share/locale/sr/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo -share/locale/sr@Latn/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo -share/locale/sv/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo -share/locale/tr/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo -share/locale/uk/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo -share/locale/vi/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo -share/locale/wa/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo -share/locale/xh/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo -share/locale/zh_CN/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo -share/locale/zh_TW/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo +share/locale/am/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo +share/locale/ar/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo +share/locale/az/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo +share/locale/be/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo +share/locale/bg/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo +share/locale/bn/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo +share/locale/bs/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo +share/locale/ca/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo +share/locale/cs/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo +share/locale/cy/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo +share/locale/da/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo +share/locale/de/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo +share/locale/el/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo +share/locale/en_AU/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo +share/locale/en_CA/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo +share/locale/en_GB/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo +share/locale/es/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo +share/locale/et/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo +share/locale/eu/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo +share/locale/fa/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo +share/locale/fi/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo +share/locale/fr/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo +share/locale/ga/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo +share/locale/gl/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo +share/locale/gu/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo +share/locale/he/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo +share/locale/hi/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo +share/locale/hr/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo +share/locale/hu/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo +share/locale/id/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo +share/locale/is/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo +share/locale/it/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo +share/locale/ja/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo +share/locale/ko/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo +share/locale/lt/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo +share/locale/lv/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo +share/locale/mk/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo +share/locale/ml/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo +share/locale/mn/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo +share/locale/ms/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo +share/locale/nb/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo +share/locale/ne/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo +share/locale/nl/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo +share/locale/nn/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo +share/locale/no/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo +share/locale/pa/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo +share/locale/pl/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo +share/locale/pt/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo +share/locale/pt_BR/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo +share/locale/ro/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo +share/locale/ru/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo +share/locale/rw/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo +share/locale/sk/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo +share/locale/sl/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo +share/locale/sq/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo +share/locale/sr/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo +share/locale/sr@Latn/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo +share/locale/sv/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo +share/locale/tr/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo +share/locale/uk/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo +share/locale/vi/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo +share/locale/wa/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo +share/locale/xh/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo +share/locale/zh_CN/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo +share/locale/zh_TW/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo @dirrm share/gnome/pixmaps/evolution-data-server-%%VERSION%% -@dirrm share/gnome/idl/evolution-data-server-%%VERSION%% +@dirrm share/gnome/idl/evolution-data-server-%%EVO_VERSION%% @dirrm share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific @dirrm share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Indian @dirrm share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe @@ -846,11 +917,12 @@ share/locale/zh_TW/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo @dirrm share/gnome/evolution-data-server-%%VERSION%%/glade @dirrm share/gnome/evolution-data-server-%%VERSION%% @dirrm share/doc/libedataserver +@dirrm share/doc/libedata-cal @dirrm share/doc/libecal @dirrm share/doc/libebook -@dirrm lib/evolution-data-server-%%VERSION%%/extensions -@dirrm lib/evolution-data-server-%%VERSION%%/camel-providers -@dirrm lib/evolution-data-server-%%VERSION%% +@dirrm lib/evolution-data-server-%%EVO_VERSION%%/extensions +@dirrm lib/evolution-data-server-%%EVO_VERSION%%/camel-providers +@dirrm lib/evolution-data-server-%%EVO_VERSION%% @dirrm include/evolution-data-server-%%VERSION%%/libical @dirrm include/evolution-data-server-%%VERSION%%/libedataserverui @dirrm include/evolution-data-server-%%VERSION%%/libedataserver @@ -859,5 +931,6 @@ share/locale/zh_TW/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo @dirrm include/evolution-data-server-%%VERSION%%/libecal @dirrm include/evolution-data-server-%%VERSION%%/libebook @dirrm include/evolution-data-server-%%VERSION%%/groupwise +@dirrm include/evolution-data-server-%%VERSION%%/exchange @dirrm include/evolution-data-server-%%VERSION%%/camel @dirrm include/evolution-data-server-%%VERSION%% diff --git a/deskutils/gnome-menu-editor/Makefile b/deskutils/gnome-menu-editor/Makefile index 2479abefa68a..06f6b645a3dd 100644 --- a/deskutils/gnome-menu-editor/Makefile +++ b/deskutils/gnome-menu-editor/Makefile @@ -3,10 +3,12 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/deskutils/gnome-menu-editor/Makefile,v 1.8 2005/09/08 18:09:45 marcus Exp $ # PORTNAME= gnome-menu-editor -PORTVERSION= 0.1 +PORTVERSION= 0.5 +PORTREVISION= 1 CATEGORIES= deskutils MASTER_SITES= http://manny.cluecoder.org/packages/gnome-menu-editor/ @@ -14,17 +16,22 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= Simple menu editor for Gnome USE_REINPLACE= yes -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 USE_GMAKE= yes USE_X_PREFIX= yes USE_GNOME= gnomeprefix gnomehack gnomemenus intlhack PLIST_FILES= bin/gnome-menu-editor \ + bin/gmenu-simple-editor \ share/gnome/applications/gnome-menu-editor.desktop post-patch: # Make .desktop file valid to desktop-file-validate @${REINPLACE_CMD} -e 's|OnlyShowIn=GNOME|OnlyShowIn=GNOME;|' \ - ${WRKSRC}/gnome-menu-editor.desktop.in + ${WRKSRC}/data/gnome-menu-editor.desktop.in + +post-install: + ${LN} -sf ${PREFIX}/bin/gnome-menu-editor \ + ${PREFIX}/bin/gmenu-simple-editor .include <bsd.port.mk> diff --git a/deskutils/gnome-menu-editor/distinfo b/deskutils/gnome-menu-editor/distinfo index cd2df3c167e5..4c0a1fe85902 100644 --- a/deskutils/gnome-menu-editor/distinfo +++ b/deskutils/gnome-menu-editor/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome-menu-editor-0.1.tar.gz) = 34ee57b0936e7e9757bf4cd2a330dc1e -SIZE (gnome-menu-editor-0.1.tar.gz) = 344990 +MD5 (gnome-menu-editor-0.5.tar.gz) = a48bfe47851b700bdd5b46fe6980a42d +SIZE (gnome-menu-editor-0.5.tar.gz) = 428694 diff --git a/deskutils/gnome-menu-editor/files/patch-data_gnome-menu-editor.desktop.in b/deskutils/gnome-menu-editor/files/patch-data_gnome-menu-editor.desktop.in new file mode 100644 index 000000000000..4ebee9532a07 --- /dev/null +++ b/deskutils/gnome-menu-editor/files/patch-data_gnome-menu-editor.desktop.in @@ -0,0 +1,10 @@ +--- data/gnome-menu-editor.desktop.in.orig Thu Sep 8 14:05:52 2005 ++++ data/gnome-menu-editor.desktop.in Thu Sep 8 14:06:00 2005 +@@ -4,6 +4,7 @@ + _Comment=Edit your application menu + Exec=gnome-menu-editor + StartupNotify=true ++NoDisplay=true + Terminal=false + Type=Application + OnlyShowIn=GNOME diff --git a/deskutils/gnome-utils/Makefile b/deskutils/gnome-utils/Makefile index fe275b6bfe4a..3df0b8bed07b 100644 --- a/deskutils/gnome-utils/Makefile +++ b/deskutils/gnome-utils/Makefile @@ -3,14 +3,15 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/deskutils/gnomeutils2/Makefile,v 1.70 2005/10/04 17:39:31 mezz Exp $ # PORTNAME= gnomeutils2 -PORTVERSION= 2.10.1 +PORTVERSION= 2.12.1 PORTEPOCH= 1 CATEGORIES= deskutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-utils/2.10 +MASTER_SITE_SUBDIR= sources/gnome-utils/2.12 DISTNAME= gnome-utils-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -25,7 +26,7 @@ USE_GMAKE= yes GNOME_DESKTOP_VERSION=2 USE_GNOME= gnomeprefix gnomehack intlhack gnomepanel \ libgnomeprintui gnomedesktop -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/deskutils/gnome-utils/distinfo b/deskutils/gnome-utils/distinfo index 431d41d29274..f89b2634bf02 100644 --- a/deskutils/gnome-utils/distinfo +++ b/deskutils/gnome-utils/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-utils-2.10.1.tar.bz2) = 78c0afdc112757b13d203fe1ad9c04ad -SIZE (gnome2/gnome-utils-2.10.1.tar.bz2) = 2049143 +MD5 (gnome2/gnome-utils-2.12.1.tar.bz2) = 345a330b7a80e09c0d5a6562438b346b +SIZE (gnome2/gnome-utils-2.12.1.tar.bz2) = 1714248 diff --git a/deskutils/gnome-utils/files/patch-logview_logview.c b/deskutils/gnome-utils/files/patch-logview_logview.c index 4ac243d34e9a..5dd057d1a77c 100644 --- a/deskutils/gnome-utils/files/patch-logview_logview.c +++ b/deskutils/gnome-utils/files/patch-logview_logview.c @@ -1,6 +1,6 @@ ---- logview/logview.c.orig Tue Nov 30 00:29:01 2004 -+++ logview/logview.c Tue Nov 30 00:30:44 2004 -@@ -656,7 +656,7 @@ +--- logview/logview.c.orig Tue Oct 4 12:31:47 2005 ++++ logview/logview.c Tue Oct 4 12:32:04 2005 +@@ -930,7 +930,7 @@ if ( ! found) { g_snprintf (full_name, sizeof (full_name), @@ -9,7 +9,7 @@ if (access (full_name, R_OK) == 0) { found = TRUE; g_free (cfg->regexp_db_path); -@@ -678,7 +678,7 @@ +@@ -952,7 +952,7 @@ if ( ! found) { g_snprintf (full_name, sizeof (full_name), @@ -18,7 +18,7 @@ if (access (full_name, R_OK) == 0) { found = TRUE; g_free (cfg->descript_db_path); -@@ -709,7 +709,7 @@ +@@ -983,7 +983,7 @@ if ( ! found) { g_snprintf (full_name, sizeof (full_name), diff --git a/deskutils/gnome-utils/files/patch-logview_userprefs.c b/deskutils/gnome-utils/files/patch-logview_userprefs.c deleted file mode 100644 index d93f8ae57fc2..000000000000 --- a/deskutils/gnome-utils/files/patch-logview_userprefs.c +++ /dev/null @@ -1,10 +0,0 @@ ---- logview/userprefs.c.orig Tue Nov 30 00:35:05 2004 -+++ logview/userprefs.c Tue Nov 30 00:36:34 2004 -@@ -56,6 +56,7 @@ - /* remove trailing newline */ - if (logfile[strlen(logfile)-1] == '\n') - logfile[strlen(logfile)-1] = '\0'; -+ if (strcmp (logfile, "/dev/console") == 0) continue; - return logfile; - } - } diff --git a/deskutils/gnome-utils/pkg-plist b/deskutils/gnome-utils/pkg-plist index ef6c79aab8ae..24ef4bd1cfd7 100644 --- a/deskutils/gnome-utils/pkg-plist +++ b/deskutils/gnome-utils/pkg-plist @@ -116,6 +116,7 @@ share/gnome/omf/gnome-utils/gnome-system-log-sv.omf share/gnome/omf/gnome-utils/gnome-system-log-uk.omf share/gnome/omf/gnome-utils/gnome-system-log-zh_CN.omf share/gnome/omf/gnome-utils/gnome-system-log-zh_TW.omf +share/gnome/pixmaps/gsearchtool/thumbnail_frame.png share/locale/am/LC_MESSAGES/gnome-utils-2.0.mo share/locale/ar/LC_MESSAGES/gnome-utils-2.0.mo share/locale/az/LC_MESSAGES/gnome-utils-2.0.mo @@ -181,6 +182,7 @@ share/locale/wa/LC_MESSAGES/gnome-utils-2.0.mo share/locale/xh/LC_MESSAGES/gnome-utils-2.0.mo share/locale/zh_CN/LC_MESSAGES/gnome-utils-2.0.mo share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo +@dirrm share/gnome/pixmaps/gsearchtool @dirrm share/gnome/omf/gnome-utils @dirrm share/gnome/help/gnome-system-log/zh_TW/figures @dirrm share/gnome/help/gnome-system-log/zh_TW diff --git a/deskutils/gnomeutils2/Makefile b/deskutils/gnomeutils2/Makefile index fe275b6bfe4a..3df0b8bed07b 100644 --- a/deskutils/gnomeutils2/Makefile +++ b/deskutils/gnomeutils2/Makefile @@ -3,14 +3,15 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/deskutils/gnomeutils2/Makefile,v 1.70 2005/10/04 17:39:31 mezz Exp $ # PORTNAME= gnomeutils2 -PORTVERSION= 2.10.1 +PORTVERSION= 2.12.1 PORTEPOCH= 1 CATEGORIES= deskutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-utils/2.10 +MASTER_SITE_SUBDIR= sources/gnome-utils/2.12 DISTNAME= gnome-utils-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -25,7 +26,7 @@ USE_GMAKE= yes GNOME_DESKTOP_VERSION=2 USE_GNOME= gnomeprefix gnomehack intlhack gnomepanel \ libgnomeprintui gnomedesktop -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/deskutils/gnomeutils2/distinfo b/deskutils/gnomeutils2/distinfo index 431d41d29274..f89b2634bf02 100644 --- a/deskutils/gnomeutils2/distinfo +++ b/deskutils/gnomeutils2/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-utils-2.10.1.tar.bz2) = 78c0afdc112757b13d203fe1ad9c04ad -SIZE (gnome2/gnome-utils-2.10.1.tar.bz2) = 2049143 +MD5 (gnome2/gnome-utils-2.12.1.tar.bz2) = 345a330b7a80e09c0d5a6562438b346b +SIZE (gnome2/gnome-utils-2.12.1.tar.bz2) = 1714248 diff --git a/deskutils/gnomeutils2/files/patch-logview_logview.c b/deskutils/gnomeutils2/files/patch-logview_logview.c index 4ac243d34e9a..5dd057d1a77c 100644 --- a/deskutils/gnomeutils2/files/patch-logview_logview.c +++ b/deskutils/gnomeutils2/files/patch-logview_logview.c @@ -1,6 +1,6 @@ ---- logview/logview.c.orig Tue Nov 30 00:29:01 2004 -+++ logview/logview.c Tue Nov 30 00:30:44 2004 -@@ -656,7 +656,7 @@ +--- logview/logview.c.orig Tue Oct 4 12:31:47 2005 ++++ logview/logview.c Tue Oct 4 12:32:04 2005 +@@ -930,7 +930,7 @@ if ( ! found) { g_snprintf (full_name, sizeof (full_name), @@ -9,7 +9,7 @@ if (access (full_name, R_OK) == 0) { found = TRUE; g_free (cfg->regexp_db_path); -@@ -678,7 +678,7 @@ +@@ -952,7 +952,7 @@ if ( ! found) { g_snprintf (full_name, sizeof (full_name), @@ -18,7 +18,7 @@ if (access (full_name, R_OK) == 0) { found = TRUE; g_free (cfg->descript_db_path); -@@ -709,7 +709,7 @@ +@@ -983,7 +983,7 @@ if ( ! found) { g_snprintf (full_name, sizeof (full_name), diff --git a/deskutils/gnomeutils2/files/patch-logview_userprefs.c b/deskutils/gnomeutils2/files/patch-logview_userprefs.c deleted file mode 100644 index d93f8ae57fc2..000000000000 --- a/deskutils/gnomeutils2/files/patch-logview_userprefs.c +++ /dev/null @@ -1,10 +0,0 @@ ---- logview/userprefs.c.orig Tue Nov 30 00:35:05 2004 -+++ logview/userprefs.c Tue Nov 30 00:36:34 2004 -@@ -56,6 +56,7 @@ - /* remove trailing newline */ - if (logfile[strlen(logfile)-1] == '\n') - logfile[strlen(logfile)-1] = '\0'; -+ if (strcmp (logfile, "/dev/console") == 0) continue; - return logfile; - } - } diff --git a/deskutils/gnomeutils2/pkg-plist b/deskutils/gnomeutils2/pkg-plist index ef6c79aab8ae..24ef4bd1cfd7 100644 --- a/deskutils/gnomeutils2/pkg-plist +++ b/deskutils/gnomeutils2/pkg-plist @@ -116,6 +116,7 @@ share/gnome/omf/gnome-utils/gnome-system-log-sv.omf share/gnome/omf/gnome-utils/gnome-system-log-uk.omf share/gnome/omf/gnome-utils/gnome-system-log-zh_CN.omf share/gnome/omf/gnome-utils/gnome-system-log-zh_TW.omf +share/gnome/pixmaps/gsearchtool/thumbnail_frame.png share/locale/am/LC_MESSAGES/gnome-utils-2.0.mo share/locale/ar/LC_MESSAGES/gnome-utils-2.0.mo share/locale/az/LC_MESSAGES/gnome-utils-2.0.mo @@ -181,6 +182,7 @@ share/locale/wa/LC_MESSAGES/gnome-utils-2.0.mo share/locale/xh/LC_MESSAGES/gnome-utils-2.0.mo share/locale/zh_CN/LC_MESSAGES/gnome-utils-2.0.mo share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo +@dirrm share/gnome/pixmaps/gsearchtool @dirrm share/gnome/omf/gnome-utils @dirrm share/gnome/help/gnome-system-log/zh_TW/figures @dirrm share/gnome/help/gnome-system-log/zh_TW diff --git a/deskutils/gucharmap/Makefile b/deskutils/gucharmap/Makefile index ee9fabb82ad0..8685060d734c 100644 --- a/deskutils/gucharmap/Makefile +++ b/deskutils/gucharmap/Makefile @@ -3,11 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/deskutils/gucharmap/Makefile,v 1.12 2005/10/29 22:31:15 marcus Exp $ # PORTNAME= gucharmap -PORTVERSION= 1.4.3 -PORTREVISION= 1 +PORTVERSION= 1.4.4 +PORTREVISION= 2 CATEGORIES= deskutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.4 @@ -23,7 +24,7 @@ RUN_DEPENDS= scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix intlhack gnomehack gtk20 +USE_GNOME= gnomeprefix intlhack gnomehack gtk20 gnomedocutils WANT_GNOME= yes USE_LIBTOOL_VER=15 INSTALLS_OMF= yes @@ -41,7 +42,7 @@ WITH_GNOME= yes .if ${HAVE_GNOME:Mlibgnomeui}!="" USE_GNOME+= libgnomeui -PKGNAMESUFFIX= -gnome +PKGNAMESUFFIX:= -gnome .else CONFIGURE_ARGS= --disable-gnome .endif diff --git a/deskutils/gucharmap/distinfo b/deskutils/gucharmap/distinfo index 439a054a5f65..e51168d1d831 100644 --- a/deskutils/gucharmap/distinfo +++ b/deskutils/gucharmap/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gucharmap-1.4.3.tar.bz2) = 9003427becd6fae9b2df5ddf1a6c390b -SIZE (gnome2/gucharmap-1.4.3.tar.bz2) = 1507924 +MD5 (gnome2/gucharmap-1.4.4.tar.bz2) = c9741329d08908a271864664c3f2e91c +SIZE (gnome2/gucharmap-1.4.4.tar.bz2) = 1450271 diff --git a/deskutils/gucharmap/files/patch-gucharmap_gucharmap-window.c b/deskutils/gucharmap/files/patch-gucharmap_gucharmap-window.c index ce9879281483..c0abeb262374 100644 --- a/deskutils/gucharmap/files/patch-gucharmap_gucharmap-window.c +++ b/deskutils/gucharmap/files/patch-gucharmap_gucharmap-window.c @@ -1,6 +1,15 @@ ---- gucharmap/gucharmap-window.c.orig Fri Feb 27 13:11:01 2004 -+++ gucharmap/gucharmap-window.c Wed Mar 3 22:45:21 2004 -@@ -417,8 +417,8 @@ +--- gucharmap/gucharmap-window.c.orig Mon Jan 24 05:56:53 2005 ++++ gucharmap/gucharmap-window.c Sat Sep 17 04:04:07 2005 +@@ -82,6 +82,8 @@ + ChaptersMode chapters_mode; + }; + ++static GtkWindowClass *parent_class = NULL; ++ + static void + status_message (GtkWidget *widget, + const gchar *message, +@@ -417,8 +419,8 @@ { GucharmapWindowPrivate *priv = GUCHARMAP_WINDOW_GET_PRIVATE (guw); gucharmap_charmap_set_chapters (guw->charmap, GUCHARMAP_CHAPTERS (gucharmap_script_chapters_new ())); @@ -11,7 +20,7 @@ } } -@@ -430,8 +430,8 @@ +@@ -430,8 +432,8 @@ { GucharmapWindowPrivate *priv = GUCHARMAP_WINDOW_GET_PRIVATE (guw); gucharmap_charmap_set_chapters (guw->charmap, GUCHARMAP_CHAPTERS (gucharmap_block_chapters_new ())); @@ -22,7 +31,7 @@ } } -@@ -834,12 +834,12 @@ +@@ -834,12 +836,12 @@ g_signal_connect (priv->status, "realize", G_CALLBACK (status_realize), guw); priv->progress = gtk_progress_bar_new (); @@ -37,3 +46,17 @@ #endif gtk_widget_show_all (hbox); +@@ -886,11 +888,13 @@ + g_free (priv->last_search); + */ + #endif ++ G_OBJECT_CLASS (parent_class)->finalize (object); + } + + static void + gucharmap_window_class_init (GucharmapWindowClass *clazz) + { ++ parent_class = g_type_class_peek_parent (clazz); + GTK_WIDGET_CLASS (clazz)->show_all = show_all; + G_OBJECT_CLASS (clazz)->finalize = window_finalize; + g_type_class_add_private (clazz, sizeof (GucharmapWindowPrivate)); diff --git a/deskutils/gucharmap/pkg-plist b/deskutils/gucharmap/pkg-plist index 489b356c41c4..54775771e877 100644 --- a/deskutils/gucharmap/pkg-plist +++ b/deskutils/gucharmap/pkg-plist @@ -18,8 +18,6 @@ lib/libgucharmap.so lib/libgucharmap.so.4 libdata/pkgconfig/gucharmap.pc share/gnome/applications/gucharmap.desktop -share/gnome/help/gucharmap/C/figures/gucharmap_start_window.png -share/gnome/help/gucharmap/C/figures/gucharmap_window.png share/gnome/help/gucharmap/C/gucharmap.xml share/gnome/help/gucharmap/C/legal.xml share/gnome/help/gucharmap/de/figures/gucharmap_window.png @@ -82,6 +80,7 @@ share/locale/fa/LC_MESSAGES/gucharmap.mo share/locale/fi/LC_MESSAGES/gucharmap.mo share/locale/fr/LC_MESSAGES/gucharmap.mo share/locale/ga/LC_MESSAGES/gucharmap.mo +share/locale/gl/LC_MESSAGES/gucharmap.mo share/locale/gu/LC_MESSAGES/gucharmap.mo share/locale/hi/LC_MESSAGES/gucharmap.mo share/locale/hr/LC_MESSAGES/gucharmap.mo @@ -108,6 +107,7 @@ share/locale/pt/LC_MESSAGES/gucharmap.mo share/locale/pt_BR/LC_MESSAGES/gucharmap.mo share/locale/ro/LC_MESSAGES/gucharmap.mo share/locale/ru/LC_MESSAGES/gucharmap.mo +share/locale/rw/LC_MESSAGES/gucharmap.mo share/locale/sk/LC_MESSAGES/gucharmap.mo share/locale/sq/LC_MESSAGES/gucharmap.mo share/locale/sr/LC_MESSAGES/gucharmap.mo @@ -119,6 +119,7 @@ share/locale/tr/LC_MESSAGES/gucharmap.mo share/locale/uk/LC_MESSAGES/gucharmap.mo share/locale/vi/LC_MESSAGES/gucharmap.mo share/locale/wa/LC_MESSAGES/gucharmap.mo +share/locale/xh/LC_MESSAGES/gucharmap.mo share/locale/zh_CN/LC_MESSAGES/gucharmap.mo share/locale/zh_TW/LC_MESSAGES/gucharmap.mo @dirrm share/gnome/omf/gucharmap @@ -140,7 +141,6 @@ share/locale/zh_TW/LC_MESSAGES/gucharmap.mo @dirrm share/gnome/help/gucharmap/es @dirrm share/gnome/help/gucharmap/de/figures @dirrm share/gnome/help/gucharmap/de -@dirrm share/gnome/help/gucharmap/C/figures @dirrm share/gnome/help/gucharmap/C @dirrm share/gnome/help/gucharmap @dirrm include/gucharmap diff --git a/devel/bug-buddy/Makefile b/devel/bug-buddy/Makefile index ac0b3069a4f8..09e8d6085e4c 100644 --- a/devel/bug-buddy/Makefile +++ b/devel/bug-buddy/Makefile @@ -3,35 +3,31 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/devel/bugbuddy/Makefile,v 1.19 2005/10/01 04:41:05 ahze Exp $ # PORTNAME= bugbuddy -PORTVERSION= 2.10.0 -PORTREVISION= 1 +PORTVERSION= 2.12.1 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/bug-buddy/2.10 +MASTER_SITE_SUBDIR= sources/bug-buddy/2.12 DISTNAME= bug-buddy-${PORTVERSION} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= A bug reporting tool for GNOME 2 -BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/gnome-doc-utils.pc:${PORTSDIR}/textproc/gnomedocutils -RUN_DEPENDS= ${X11BASE}/libdata/pkgconfig/gnome-doc-utils.pc:${PORTSDIR}/textproc/gnomedocutils - USE_BZIP2= yes USE_X_PREFIX= yes INSTALLS_OMF= yes USE_REINPLACE= yes USE_GMAKE= yes -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop gnomemenus \ - desktopfileutils + desktopfileutils gnomedocutils GNOME_DESKTOP_VERSION=2 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS= --with-help-dir=${PREFIX}/share/gnome/help MAN1= bug-buddy.1 GCONF_SCHEMAS= bug-buddy.schemas diff --git a/devel/bug-buddy/distinfo b/devel/bug-buddy/distinfo index d7003e3d31ca..5147bcc5c05b 100644 --- a/devel/bug-buddy/distinfo +++ b/devel/bug-buddy/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/bug-buddy-2.10.0.tar.bz2) = c821a933f3d7be64071c7bfcb07ee1ac -SIZE (gnome2/bug-buddy-2.10.0.tar.bz2) = 718182 +MD5 (gnome2/bug-buddy-2.12.1.tar.bz2) = 2f8b52ad25891e7c99820c80e7c6d78d +SIZE (gnome2/bug-buddy-2.12.1.tar.bz2) = 555641 diff --git a/devel/bug-buddy/files/patch-docs_bug-buddy.omf.in b/devel/bug-buddy/files/patch-docs_bug-buddy.omf.in deleted file mode 100644 index 1074dd7520d2..000000000000 --- a/devel/bug-buddy/files/patch-docs_bug-buddy.omf.in +++ /dev/null @@ -1,12 +0,0 @@ ---- docs/bug-buddy.omf.in.orig Fri Feb 11 14:23:02 2005 -+++ docs/bug-buddy.omf.in Fri Feb 11 14:22:48 2005 -@@ -0,0 +1,9 @@ -+<?xml version="1.0" standalone="no"?> -+<omf> -+ <resource> -+ <subject category="GNOME|Development"/> -+ <type>user's guide</type> -+ <relation seriesid="69b6f5ee-6cc5-11d6-8051-fe97a46511fa"/> -+ <rights type="GNU FDL" license.version="1.1" holder="Eric Baudais"/> -+ </resource> -+</omf> diff --git a/devel/bug-buddy/files/patch-src::united-states-of-bug-buddy.c b/devel/bug-buddy/files/patch-src::united-states-of-bug-buddy.c deleted file mode 100644 index bc0a6ba22c2f..000000000000 --- a/devel/bug-buddy/files/patch-src::united-states-of-bug-buddy.c +++ /dev/null @@ -1,10 +0,0 @@ ---- src/united-states-of-bug-buddy.c.orig Tue Nov 30 18:21:10 2004 -+++ src/united-states-of-bug-buddy.c Tue Nov 30 18:21:15 2004 -@@ -36,6 +36,7 @@ - #include <sys/types.h> - #include <sysexits.h> - #include <sys/wait.h> -+#include <signal.h> - - #if 0 - static char *help_pages[] = { diff --git a/devel/bug-buddy/pkg-plist b/devel/bug-buddy/pkg-plist index ec291fb0ac4e..ea36fa1c04a7 100644 --- a/devel/bug-buddy/pkg-plist +++ b/devel/bug-buddy/pkg-plist @@ -1,7 +1,6 @@ bin/bug-buddy share/gnome/application-registry/bug-buddy.applications share/gnome/applications/bug-buddy-core.desktop -@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true share/gnome/applications/bug-buddy.desktop share/gnome/bug-buddy/bug-buddy.glade share/gnome/bug-buddy/bug-buddy.png @@ -18,8 +17,16 @@ share/gnome/bug-buddy/gnome.png share/gnome/bug-buddy/ximian.png share/gnome/help/bug-buddy/C/bug-buddy.xml share/gnome/help/bug-buddy/C/legal.xml +share/gnome/help/bug-buddy/es/bug-buddy.xml +share/gnome/help/bug-buddy/pa/bug-buddy.xml +share/gnome/help/bug-buddy/sr/bug-buddy.xml +share/gnome/help/bug-buddy/uk/bug-buddy.xml share/gnome/mime-info/bug-buddy.keys share/gnome/omf/bug-buddy/bug-buddy-C.omf +share/gnome/omf/bug-buddy/bug-buddy-es.omf +share/gnome/omf/bug-buddy/bug-buddy-pa.omf +share/gnome/omf/bug-buddy/bug-buddy-sr.omf +share/gnome/omf/bug-buddy/bug-buddy-uk.omf share/gnome/pixmaps/bug-buddy.png share/locale/am/LC_MESSAGES/bug-buddy.mo share/locale/ar/LC_MESSAGES/bug-buddy.mo @@ -59,6 +66,7 @@ share/locale/lv/LC_MESSAGES/bug-buddy.mo share/locale/mk/LC_MESSAGES/bug-buddy.mo share/locale/ml/LC_MESSAGES/bug-buddy.mo share/locale/mn/LC_MESSAGES/bug-buddy.mo +share/locale/mr/LC_MESSAGES/bug-buddy.mo share/locale/ms/LC_MESSAGES/bug-buddy.mo share/locale/nb/LC_MESSAGES/bug-buddy.mo share/locale/ne/LC_MESSAGES/bug-buddy.mo @@ -72,6 +80,7 @@ share/locale/pt/LC_MESSAGES/bug-buddy.mo share/locale/pt_BR/LC_MESSAGES/bug-buddy.mo share/locale/ro/LC_MESSAGES/bug-buddy.mo share/locale/ru/LC_MESSAGES/bug-buddy.mo +share/locale/rw/LC_MESSAGES/bug-buddy.mo share/locale/sk/LC_MESSAGES/bug-buddy.mo share/locale/sl/LC_MESSAGES/bug-buddy.mo share/locale/sq/LC_MESSAGES/bug-buddy.mo @@ -81,16 +90,31 @@ share/locale/sv/LC_MESSAGES/bug-buddy.mo share/locale/ta/LC_MESSAGES/bug-buddy.mo share/locale/th/LC_MESSAGES/bug-buddy.mo share/locale/tr/LC_MESSAGES/bug-buddy.mo +share/locale/ug/LC_MESSAGES/bug-buddy.mo share/locale/uk/LC_MESSAGES/bug-buddy.mo share/locale/vi/LC_MESSAGES/bug-buddy.mo share/locale/wa/LC_MESSAGES/bug-buddy.mo +share/locale/xh/LC_MESSAGES/bug-buddy.mo share/locale/zh_CN/LC_MESSAGES/bug-buddy.mo share/locale/zh_TW/LC_MESSAGES/bug-buddy.mo +@unexec rmdir %D/share/locale/xh/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/xh 2> /dev/null || true +@unexec rmdir %D/share/locale/ug/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/ug 2> /dev/null || true +@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/mr/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/mr 2> /dev/null || true @dirrm share/gnome/omf/bug-buddy +@dirrm share/gnome/help/bug-buddy/uk +@dirrm share/gnome/help/bug-buddy/sr +@dirrm share/gnome/help/bug-buddy/pa +@dirrm share/gnome/help/bug-buddy/es @dirrm share/gnome/help/bug-buddy/C @dirrm share/gnome/help/bug-buddy @dirrm share/gnome/bug-buddy/bugzilla/ximian @dirrm share/gnome/bug-buddy/bugzilla/gnome @dirrm share/gnome/bug-buddy/bugzilla @dirrm share/gnome/bug-buddy +@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/devel/bugbuddy/Makefile b/devel/bugbuddy/Makefile index ac0b3069a4f8..09e8d6085e4c 100644 --- a/devel/bugbuddy/Makefile +++ b/devel/bugbuddy/Makefile @@ -3,35 +3,31 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/devel/bugbuddy/Makefile,v 1.19 2005/10/01 04:41:05 ahze Exp $ # PORTNAME= bugbuddy -PORTVERSION= 2.10.0 -PORTREVISION= 1 +PORTVERSION= 2.12.1 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/bug-buddy/2.10 +MASTER_SITE_SUBDIR= sources/bug-buddy/2.12 DISTNAME= bug-buddy-${PORTVERSION} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= A bug reporting tool for GNOME 2 -BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/gnome-doc-utils.pc:${PORTSDIR}/textproc/gnomedocutils -RUN_DEPENDS= ${X11BASE}/libdata/pkgconfig/gnome-doc-utils.pc:${PORTSDIR}/textproc/gnomedocutils - USE_BZIP2= yes USE_X_PREFIX= yes INSTALLS_OMF= yes USE_REINPLACE= yes USE_GMAKE= yes -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop gnomemenus \ - desktopfileutils + desktopfileutils gnomedocutils GNOME_DESKTOP_VERSION=2 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS= --with-help-dir=${PREFIX}/share/gnome/help MAN1= bug-buddy.1 GCONF_SCHEMAS= bug-buddy.schemas diff --git a/devel/bugbuddy/distinfo b/devel/bugbuddy/distinfo index d7003e3d31ca..5147bcc5c05b 100644 --- a/devel/bugbuddy/distinfo +++ b/devel/bugbuddy/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/bug-buddy-2.10.0.tar.bz2) = c821a933f3d7be64071c7bfcb07ee1ac -SIZE (gnome2/bug-buddy-2.10.0.tar.bz2) = 718182 +MD5 (gnome2/bug-buddy-2.12.1.tar.bz2) = 2f8b52ad25891e7c99820c80e7c6d78d +SIZE (gnome2/bug-buddy-2.12.1.tar.bz2) = 555641 diff --git a/devel/bugbuddy/files/patch-docs_bug-buddy.omf.in b/devel/bugbuddy/files/patch-docs_bug-buddy.omf.in deleted file mode 100644 index 1074dd7520d2..000000000000 --- a/devel/bugbuddy/files/patch-docs_bug-buddy.omf.in +++ /dev/null @@ -1,12 +0,0 @@ ---- docs/bug-buddy.omf.in.orig Fri Feb 11 14:23:02 2005 -+++ docs/bug-buddy.omf.in Fri Feb 11 14:22:48 2005 -@@ -0,0 +1,9 @@ -+<?xml version="1.0" standalone="no"?> -+<omf> -+ <resource> -+ <subject category="GNOME|Development"/> -+ <type>user's guide</type> -+ <relation seriesid="69b6f5ee-6cc5-11d6-8051-fe97a46511fa"/> -+ <rights type="GNU FDL" license.version="1.1" holder="Eric Baudais"/> -+ </resource> -+</omf> diff --git a/devel/bugbuddy/files/patch-src::united-states-of-bug-buddy.c b/devel/bugbuddy/files/patch-src::united-states-of-bug-buddy.c deleted file mode 100644 index bc0a6ba22c2f..000000000000 --- a/devel/bugbuddy/files/patch-src::united-states-of-bug-buddy.c +++ /dev/null @@ -1,10 +0,0 @@ ---- src/united-states-of-bug-buddy.c.orig Tue Nov 30 18:21:10 2004 -+++ src/united-states-of-bug-buddy.c Tue Nov 30 18:21:15 2004 -@@ -36,6 +36,7 @@ - #include <sys/types.h> - #include <sysexits.h> - #include <sys/wait.h> -+#include <signal.h> - - #if 0 - static char *help_pages[] = { diff --git a/devel/bugbuddy/pkg-plist b/devel/bugbuddy/pkg-plist index ec291fb0ac4e..ea36fa1c04a7 100644 --- a/devel/bugbuddy/pkg-plist +++ b/devel/bugbuddy/pkg-plist @@ -1,7 +1,6 @@ bin/bug-buddy share/gnome/application-registry/bug-buddy.applications share/gnome/applications/bug-buddy-core.desktop -@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true share/gnome/applications/bug-buddy.desktop share/gnome/bug-buddy/bug-buddy.glade share/gnome/bug-buddy/bug-buddy.png @@ -18,8 +17,16 @@ share/gnome/bug-buddy/gnome.png share/gnome/bug-buddy/ximian.png share/gnome/help/bug-buddy/C/bug-buddy.xml share/gnome/help/bug-buddy/C/legal.xml +share/gnome/help/bug-buddy/es/bug-buddy.xml +share/gnome/help/bug-buddy/pa/bug-buddy.xml +share/gnome/help/bug-buddy/sr/bug-buddy.xml +share/gnome/help/bug-buddy/uk/bug-buddy.xml share/gnome/mime-info/bug-buddy.keys share/gnome/omf/bug-buddy/bug-buddy-C.omf +share/gnome/omf/bug-buddy/bug-buddy-es.omf +share/gnome/omf/bug-buddy/bug-buddy-pa.omf +share/gnome/omf/bug-buddy/bug-buddy-sr.omf +share/gnome/omf/bug-buddy/bug-buddy-uk.omf share/gnome/pixmaps/bug-buddy.png share/locale/am/LC_MESSAGES/bug-buddy.mo share/locale/ar/LC_MESSAGES/bug-buddy.mo @@ -59,6 +66,7 @@ share/locale/lv/LC_MESSAGES/bug-buddy.mo share/locale/mk/LC_MESSAGES/bug-buddy.mo share/locale/ml/LC_MESSAGES/bug-buddy.mo share/locale/mn/LC_MESSAGES/bug-buddy.mo +share/locale/mr/LC_MESSAGES/bug-buddy.mo share/locale/ms/LC_MESSAGES/bug-buddy.mo share/locale/nb/LC_MESSAGES/bug-buddy.mo share/locale/ne/LC_MESSAGES/bug-buddy.mo @@ -72,6 +80,7 @@ share/locale/pt/LC_MESSAGES/bug-buddy.mo share/locale/pt_BR/LC_MESSAGES/bug-buddy.mo share/locale/ro/LC_MESSAGES/bug-buddy.mo share/locale/ru/LC_MESSAGES/bug-buddy.mo +share/locale/rw/LC_MESSAGES/bug-buddy.mo share/locale/sk/LC_MESSAGES/bug-buddy.mo share/locale/sl/LC_MESSAGES/bug-buddy.mo share/locale/sq/LC_MESSAGES/bug-buddy.mo @@ -81,16 +90,31 @@ share/locale/sv/LC_MESSAGES/bug-buddy.mo share/locale/ta/LC_MESSAGES/bug-buddy.mo share/locale/th/LC_MESSAGES/bug-buddy.mo share/locale/tr/LC_MESSAGES/bug-buddy.mo +share/locale/ug/LC_MESSAGES/bug-buddy.mo share/locale/uk/LC_MESSAGES/bug-buddy.mo share/locale/vi/LC_MESSAGES/bug-buddy.mo share/locale/wa/LC_MESSAGES/bug-buddy.mo +share/locale/xh/LC_MESSAGES/bug-buddy.mo share/locale/zh_CN/LC_MESSAGES/bug-buddy.mo share/locale/zh_TW/LC_MESSAGES/bug-buddy.mo +@unexec rmdir %D/share/locale/xh/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/xh 2> /dev/null || true +@unexec rmdir %D/share/locale/ug/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/ug 2> /dev/null || true +@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/mr/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/mr 2> /dev/null || true @dirrm share/gnome/omf/bug-buddy +@dirrm share/gnome/help/bug-buddy/uk +@dirrm share/gnome/help/bug-buddy/sr +@dirrm share/gnome/help/bug-buddy/pa +@dirrm share/gnome/help/bug-buddy/es @dirrm share/gnome/help/bug-buddy/C @dirrm share/gnome/help/bug-buddy @dirrm share/gnome/bug-buddy/bugzilla/ximian @dirrm share/gnome/bug-buddy/bugzilla/gnome @dirrm share/gnome/bug-buddy/bugzilla @dirrm share/gnome/bug-buddy +@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/devel/gconf2/Makefile b/devel/gconf2/Makefile index 4a56b29b8ed2..5fd580ee5ed2 100644 --- a/devel/gconf2/Makefile +++ b/devel/gconf2/Makefile @@ -3,13 +3,14 @@ # Whom: Ade Lovett <ade@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/devel/gconf2/Makefile,v 1.62 2005/11/03 18:43:02 mezz Exp $ # PORTNAME= gconf2 -PORTVERSION= 2.10.1 +PORTVERSION= 2.12.1 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/GConf/2.10 +MASTER_SITE_SUBDIR= sources/GConf/2.12 DISTNAME= GConf-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -19,14 +20,33 @@ COMMENT= A configuration database system for GNOME USE_BZIP2= yes USE_GMAKE= yes USE_X_PREFIX= yes -USE_GNOME= gnomehier gnomehack orbit2 gtk20 libxml2 linc +USE_GNOME= gnomehier gnomehack orbit2 gtk20 libxml2 linc ltverhack INSTALLS_SHLIB= yes -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \ --disable-gtk-doc +# --enable-gconf-source=${PREFIX}/etc/gconf/schemas \ + CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" - MAN1= gconftool-2.1 -.include <bsd.port.mk> +.include <bsd.port.pre.mk> + +.if defined(WITH_LDAP) || exists(${LOCALBASE}/include/ldap.h) +USE_OPENLDAP= yes + +PLIST_SUB+= LDAP="" +.else +PLIST_SUB+= LDAP="@comment " +.endif + +pre-everything:: +.if !defined(WITH_LDAP) + @${ECHO_MSG} + @${ECHO_MSG} "You can enable ldap support by defining" + @${ECHO_MSG} "WITH_LDAP" + @${ECHO_MSG} +.endif + +.include <bsd.port.post.mk> diff --git a/devel/gconf2/distinfo b/devel/gconf2/distinfo index ace963253f36..7044307011b8 100644 --- a/devel/gconf2/distinfo +++ b/devel/gconf2/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/GConf-2.10.1.tar.bz2) = c411bd6e9e25362ea613bb9a084be904 -SIZE (gnome2/GConf-2.10.1.tar.bz2) = 1797862 +MD5 (gnome2/GConf-2.12.1.tar.bz2) = 247110de013ed24b17cf4191eb6daec5 +SIZE (gnome2/GConf-2.12.1.tar.bz2) = 1945241 diff --git a/devel/gconf2/pkg-plist b/devel/gconf2/pkg-plist index 05cf76ac212e..37a1e763d824 100644 --- a/devel/gconf2/pkg-plist +++ b/devel/gconf2/pkg-plist @@ -1,5 +1,6 @@ bin/gconf-merge-tree bin/gconftool-2 +%%LDAP%%etc/gconf/2/evoldap.conf etc/gconf/2/path include/gconf/2/gconf/gconf-changeset.h include/gconf/2/gconf/gconf-client.h @@ -10,14 +11,16 @@ include/gconf/2/gconf/gconf-listeners.h include/gconf/2/gconf/gconf-schema.h include/gconf/2/gconf/gconf-value.h include/gconf/2/gconf/gconf.h +%%LDAP%%lib/GConf/2/libgconfbackend-evoldap.so lib/GConf/2/libgconfbackend-oldxml.so lib/GConf/2/libgconfbackend-xml.so lib/libgconf-2.a lib/libgconf-2.so -lib/libgconf-2.so.5 +lib/libgconf-2.so.4 libdata/pkgconfig/gconf-2.0.pc libexec/gconf-sanity-check-2 libexec/gconfd-2 +%%LDAP%%share/GConf/schema/evoldap.schema share/aclocal/gconf-2.m4 share/doc/gconf/ch01.html share/doc/gconf/gconf-GConfClient.html @@ -64,6 +67,7 @@ share/locale/fr/LC_MESSAGES/GConf2.mo share/locale/ga/LC_MESSAGES/GConf2.mo share/locale/gl/LC_MESSAGES/GConf2.mo share/locale/gu/LC_MESSAGES/GConf2.mo +share/locale/he/LC_MESSAGES/GConf2.mo share/locale/hi/LC_MESSAGES/GConf2.mo share/locale/hr/LC_MESSAGES/GConf2.mo share/locale/hu/LC_MESSAGES/GConf2.mo @@ -71,6 +75,7 @@ share/locale/id/LC_MESSAGES/GConf2.mo share/locale/it/LC_MESSAGES/GConf2.mo share/locale/ja/LC_MESSAGES/GConf2.mo share/locale/ko/LC_MESSAGES/GConf2.mo +share/locale/ku/LC_MESSAGES/GConf2.mo share/locale/lt/LC_MESSAGES/GConf2.mo share/locale/lv/LC_MESSAGES/GConf2.mo share/locale/mk/LC_MESSAGES/GConf2.mo @@ -96,6 +101,7 @@ share/locale/sr/LC_MESSAGES/GConf2.mo share/locale/sr@Latn/LC_MESSAGES/GConf2.mo share/locale/sv/LC_MESSAGES/GConf2.mo share/locale/ta/LC_MESSAGES/GConf2.mo +share/locale/th/LC_MESSAGES/GConf2.mo share/locale/tr/LC_MESSAGES/GConf2.mo share/locale/uk/LC_MESSAGES/GConf2.mo share/locale/vi/LC_MESSAGES/GConf2.mo @@ -105,13 +111,11 @@ share/locale/zh_CN/LC_MESSAGES/GConf2.mo share/locale/zh_TW/LC_MESSAGES/GConf2.mo share/sgml/gconf/gconf-1.0.dtd @dirrm share/sgml/gconf -@unexec rmdir %D/share/locale/yi/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/yi 2> /dev/null || true -@unexec rmdir %D/share/locale/xh/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/xh 2> /dev/null || true -@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/ku/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/ku 2> /dev/null || true @dirrm share/doc/gconf +@dirrm share/GConf/schema +@dirrm share/GConf @dirrm lib/GConf/2 @dirrm include/gconf/2/gconf @dirrm include/gconf/2 diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile index 5fc2c11da242..2819fd997a61 100644 --- a/devel/glib20/Makefile +++ b/devel/glib20/Makefile @@ -3,13 +3,14 @@ # Whom: Vanilla I. Shu <vanilla@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/devel/glib20/Makefile,v 1.55 2005/10/03 17:39:56 mezz Exp $ # PORTNAME= glib -PORTVERSION= 2.6.6 +PORTVERSION= 2.8.3 CATEGORIES= devel -MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/${PORTNAME}/2.6,} \ - ftp://ftp.gtk.org/pub/gtk/v2.6/ \ +MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/${PORTNAME}/2.8,} \ + ftp://ftp.gtk.org/pub/gtk/v2.8/ \ ftp://ftp.gimp.org/pub/%SUBDIR%/ \ ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \ http://www.ameth.org/gimp/%SUBDIR%/ \ @@ -24,10 +25,10 @@ LATEST_LINK= glib20 USE_BZIP2= yes USE_GETTEXT= yes -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 USE_REINPLACE= yes INSTALLS_SHLIB= yes -USE_GNOME= gnomehack gnometarget pkgconfig +USE_GNOME= gnomehack gnometarget pkgconfig ltverhack USE_GMAKE= yes USE_PERL5= yes CONFIGURE_ARGS= --enable-static --with-libiconv=gnu \ diff --git a/devel/glib20/distinfo b/devel/glib20/distinfo index 7d233fea9ba5..0cca1c837dce 100644 --- a/devel/glib20/distinfo +++ b/devel/glib20/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/glib-2.6.6.tar.bz2) = 6e22b0639d314536f23ee118f29b43de -SIZE (gnome2/glib-2.6.6.tar.bz2) = 2380899 +MD5 (gnome2/glib-2.8.3.tar.bz2) = 58177fe64c189b86bac1625350512159 +SIZE (gnome2/glib-2.8.3.tar.bz2) = 2564822 diff --git a/devel/glib20/files/extra-patch-gthread_gthread-posix.c b/devel/glib20/files/extra-patch-gthread_gthread-posix.c index b74c39d48df2..bde2862f605e 100644 --- a/devel/glib20/files/extra-patch-gthread_gthread-posix.c +++ b/devel/glib20/files/extra-patch-gthread_gthread-posix.c @@ -1,6 +1,6 @@ ---- gthread/gthread-posix.c.orig Thu Jun 9 17:27:13 2005 -+++ gthread/gthread-posix.c Fri Jun 10 22:38:37 2005 -@@ -115,7 +115,11 @@ +--- gthread/gthread-posix.c.orig Thu Jun 9 11:25:01 2005 ++++ gthread/gthread-posix.c Fri Jun 10 20:23:17 2005 +@@ -115,7 +115,11 @@ static gint priority_normal_value; # define PRIORITY_NORMAL_VALUE priority_normal_value #endif /* POSIX_MIN_PRIORITY && POSIX_MAX_PRIORITY */ @@ -12,18 +12,18 @@ #define G_MUTEX_SIZE (sizeof (pthread_mutex_t)) -@@ -309,8 +313,16 @@ +@@ -309,8 +313,16 @@ g_thread_create_posix_impl (GThreadFunc stack_size = MAX (g_thread_min_stack_size, stack_size); /* No error check here, because some systems can't do it and * we simply don't want threads to fail because of that. */ - pthread_attr_setstacksize (&attr, stack_size); } -+ else ++ else + { + if (sizeof(void *) == 8) -+ g_thread_default_stack_size = G_THREAD_STACK_SIZE64; ++ g_thread_default_stack_size = G_THREAD_STACK_SIZE64; + else -+ g_thread_default_stack_size = G_THREAD_STACK_SIZE32; ++ g_thread_default_stack_size = G_THREAD_STACK_SIZE32; + stack_size = MAX (g_thread_min_stack_size, g_thread_default_stack_size); + } + pthread_attr_setstacksize (&attr, stack_size); diff --git a/devel/glib20/files/patch-gmodule::gmodule-dl.c b/devel/glib20/files/patch-gmodule::gmodule-dl.c index eaa43a74e423..d3c7dc6bf2db 100644 --- a/devel/glib20/files/patch-gmodule::gmodule-dl.c +++ b/devel/glib20/files/patch-gmodule::gmodule-dl.c @@ -1,5 +1,6 @@ $FreeBSD$ + $MCom: ports/devel/glib20/files/patch-gmodule::gmodule-dl.c,v 1.14 2005/06/28 05:40:00 adamw Exp $ --- gmodule/gmodule-dl.c.orig Sat Feb 17 08:28:07 2001 +++ gmodule/gmodule-dl.c Fri Jan 18 09:48:45 2002 diff --git a/devel/glib20/pkg-plist b/devel/glib20/pkg-plist index 11ff429c7984..0cc41e9d3b01 100644 --- a/devel/glib20/pkg-plist +++ b/devel/glib20/pkg-plist @@ -26,6 +26,7 @@ include/glib-2.0/glib/gkeyfile.h include/glib-2.0/glib/glist.h include/glib-2.0/glib/gmacros.h include/glib-2.0/glib/gmain.h +include/glib-2.0/glib/gmappedfile.h include/glib-2.0/glib/gmarkup.h include/glib-2.0/glib/gmem.h include/glib-2.0/glib/gmessages.h @@ -75,18 +76,19 @@ include/glib-2.0/gobject/gvaluecollector.h include/glib-2.0/gobject/gvaluetypes.h lib/libglib-2.0.a lib/libglib-2.0.so -lib/libglib-2.0.so.600 +lib/libglib-2.0.so.0 lib/libgmodule-2.0.a lib/libgmodule-2.0.so -lib/libgmodule-2.0.so.600 +lib/libgmodule-2.0.so.0 lib/libgobject-2.0.a lib/libgobject-2.0.so -lib/libgobject-2.0.so.600 +lib/libgobject-2.0.so.0 lib/libgthread-2.0.a lib/libgthread-2.0.so -lib/libgthread-2.0.so.600 +lib/libgthread-2.0.so.0 libdata/pkgconfig/glib-2.0.pc libdata/pkgconfig/gmodule-2.0.pc +libdata/pkgconfig/gmodule-export-2.0.pc libdata/pkgconfig/gmodule-no-export-2.0.pc libdata/pkgconfig/gobject-2.0.pc libdata/pkgconfig/gthread-2.0.pc @@ -155,6 +157,7 @@ share/locale/sr@ije/LC_MESSAGES/glib20.mo share/locale/sv/LC_MESSAGES/glib20.mo share/locale/ta/LC_MESSAGES/glib20.mo share/locale/te/LC_MESSAGES/glib20.mo +share/locale/th/LC_MESSAGES/glib20.mo share/locale/tl/LC_MESSAGES/glib20.mo share/locale/tr/LC_MESSAGES/glib20.mo share/locale/uk/LC_MESSAGES/glib20.mo @@ -170,10 +173,10 @@ share/locale/zh_TW/LC_MESSAGES/glib20.mo @unexec rmdir %D/share/locale/rw 2> /dev/null || true @unexec rmdir %D/share/locale/sr@ije/LC_MESSAGES 2> /dev/null || true @unexec rmdir %D/share/locale/sr@ije 2> /dev/null || true -@unexec rmdir %D/share/locale/tl/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/tl 2> /dev/null || true @unexec rmdir %D/share/locale/te/LC_MESSAGES 2> /dev/null || true @unexec rmdir %D/share/locale/te 2> /dev/null || true +@unexec rmdir %D/share/locale/tl/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/tl 2> /dev/null || true @unexec rmdir %D/share/locale/xh/LC_MESSAGES 2> /dev/null || true @unexec rmdir %D/share/locale/xh 2> /dev/null || true @unexec rmdir %D/share/locale/yi/LC_MESSAGES 2> /dev/null || true diff --git a/devel/gnome-common/Makefile b/devel/gnome-common/Makefile index dddfaa261ac6..764daaf916a3 100644 --- a/devel/gnome-common/Makefile +++ b/devel/gnome-common/Makefile @@ -3,13 +3,14 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/devel/gnomecommon/Makefile,v 1.5 2005/09/20 09:39:51 ahze Exp $ # PORTNAME= gnomecommon -PORTVERSION= 2.8.0 +PORTVERSION= 2.12.0 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-common/2.8 +MASTER_SITE_SUBDIR= sources/gnome-common/2.12 DISTNAME= gnome-common-${PORTVERSION} DIST_SUBDIR= gnome2 diff --git a/devel/gnome-common/distinfo b/devel/gnome-common/distinfo index a3fa6f30afaa..e22e25e9fb8d 100644 --- a/devel/gnome-common/distinfo +++ b/devel/gnome-common/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-common-2.8.0.tar.bz2) = 4630d4cf2b83499c89211b3ae76b662f -SIZE (gnome2/gnome-common-2.8.0.tar.bz2) = 58694 +MD5 (gnome2/gnome-common-2.12.0.tar.bz2) = 817be32ab5dc7a5d56e6ec50d56100f8 +SIZE (gnome2/gnome-common-2.12.0.tar.bz2) = 60283 diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile index e152131a2aae..56cd876c36b4 100644 --- a/devel/gnome-vfs/Makefile +++ b/devel/gnome-vfs/Makefile @@ -3,14 +3,15 @@ # Whom: Ade Lovett <ade@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/devel/gnomevfs2/Makefile,v 1.115 2005/10/31 00:12:01 marcus Exp $ # PORTNAME= gnomevfs2 -PORTVERSION= 2.10.1 -PORTREVISION= 1 +PORTVERSION= 2.12.1.1 +PORTREVISION= 2 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-vfs/2.10 +MASTER_SITE_SUBDIR= sources/gnome-vfs/2.12 DISTNAME= gnome-vfs-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -23,9 +24,9 @@ USE_BZIP2= yes USE_GMAKE= yes USE_X_PREFIX= yes USE_GNOME= gnomeprefix gnomehack intlhack gnomemimedata gconf2 \ - libbonobo + libbonobo ltverhack USE_REINPLACE= yes -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 INSTALLS_SHLIB= yes CONFIGURE_ARGS= --enable-openssl \ --disable-gnutls @@ -38,37 +39,13 @@ PKGDEINSTALL= ${WRKDIR}/pkg-deinstall GCONF_SCHEMAS= desktop_default_applications.schemas \ desktop_gnome_url_handlers.schemas system_dns_sd.schemas \ - system_http_proxy.schemas system_smb.schemas + system_http_proxy.schemas system_smb.schemas \ + system_storage.schemas -.include <bsd.port.pre.mk> - -.if defined(PACKAGE_BUILDING) || defined(PARALLEL_PACKAGE_BUILD) -.undef WITHOUT_CDPARANOIA -.undef WITHOUT_SAMBA -.undef WITHOUT_MDNS -WITH_MDNS= yes -WITH_CDPARANOIA= yes -WITH_SAMBA= yes -.endif - -.if exists(${LOCALBASE}/lib/libcdda_paranoia.a) -WITH_CDPARANOIA= yes -.endif - -.if exists(${LOCALBASE}/lib/libsmbclient.so) -WITH_SAMBA= yes -.endif +OPTIONS= SAMBA "Enable SMB volume support" on \ + MDNS "Enable Bonjour/Rendezvous support" on -.if exists(${LOCALBASE}/lib/libhowl.so) -WITH_MDNS= yes -.endif - -.if defined(WITH_CDPARANOIA) -LIB_DEPENDS+= cdda_paranoia.0:${PORTSDIR}/audio/cdparanoia -PLIST_SUB+= CDPARANOIA="" -.else -PLIST_SUB+= CDPARANOIA="@comment " -.endif +.include <bsd.port.pre.mk> .if exists(${LOCALBASE}/lib/libfam.so) || !defined(WITHOUT_FAM) USE_FAM= yes @@ -78,15 +55,18 @@ USE_FAM= yes LIB_DEPENDS+= krb5:${PORTSDIR}/security/heimdal .endif -.if defined(WITH_SAMBA) +.if !defined(WITHOUT_SAMBA) LIB_DEPENDS+= smbclient.0:${PORTSDIR}/net/samba-libsmbclient PLIST_SUB+= SAMBA="" .else PLIST_SUB+= SAMBA="@comment " +CONFIGURE_ARGS+=--disable-samba .endif -.if defined(WITH_MDNS) +.if !defined(WITHOUT_MDNS) LIB_DEPENDS+= howl:${PORTSDIR}/net/howl +.else +CONFIGURE_ARGS+=--disable-howl .endif post-patch: @@ -94,8 +74,7 @@ post-patch: ${WRKSRC}/libgnomevfs/Makefile.in @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g ; \ s|%%X11BASE%%|${X11BASE}|g' \ - ${WRKSRC}/libgnomevfs/xdgmime.c \ - ${WRKSRC}/libgnomevfs/gnome-vfs-mime-info.c + ${WRKSRC}/libgnomevfs/xdgmime.c @${SED} -e 's|%%X11BASE%%|${X11BASE}|g' \ < ${MASTERDIR}/pkg-install.in > ${PKGINSTALL} @${SED} -e 's|%%X11BASE%%|${X11BASE}|g' \ diff --git a/devel/gnome-vfs/distinfo b/devel/gnome-vfs/distinfo index e4923630ccb0..df476c6026a5 100644 --- a/devel/gnome-vfs/distinfo +++ b/devel/gnome-vfs/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-vfs-2.10.1.tar.bz2) = 88b520e5de748a310a2aef62fc095c8b -SIZE (gnome2/gnome-vfs-2.10.1.tar.bz2) = 1905314 +MD5 (gnome2/gnome-vfs-2.12.1.1.tar.bz2) = bc62212600167acf78c9771add5cce7e +SIZE (gnome2/gnome-vfs-2.12.1.1.tar.bz2) = 1726588 diff --git a/devel/gnome-vfs/files/patch-ac b/devel/gnome-vfs/files/patch-ac index 9362cac1715f..383987654ef2 100644 --- a/devel/gnome-vfs/files/patch-ac +++ b/devel/gnome-vfs/files/patch-ac @@ -1,11 +1,11 @@ ---- modules/Makefile.in.orig Tue May 6 15:39:48 2003 -+++ modules/Makefile.in Tue May 6 15:41:28 2003 -@@ -210,7 +210,7 @@ - @BUILD_CDEMENU_MODULE_TRUE@CDEMENU_LTLIBS = @BUILD_CDEMENU_MODULE_TRUE@libcdemenu-desktop.la - @BUILD_CDEMENU_MODULE_FALSE@CDEMENU_LTLIBS = - +--- modules/Makefile.in.orig Mon Oct 3 11:55:14 2005 ++++ modules/Makefile.in Mon Oct 3 11:55:55 2005 +@@ -465,7 +465,7 @@ + @HAVE_SAMBA_TRUE@SMB_LTLIBS = libsmb.la + @OS_WIN32_FALSE@PLATFROM_SPECIFIC_LTLIBS = libdns-sd.la libnetwork.la libnntp.la libsftp.la $(HTTP_LTLIBS) libftp.la + @OS_WIN32_TRUE@PLATFROM_SPECIFIC_LTLIBS = -module_flags = -export_dynamic -avoid-version -module -no-undefined +module_flags = -export_dynamic -avoid-version -module -no-undefined $(PTHREAD_LIB) modulesdir = $(libdir)/gnome-vfs-2.0/modules - modules_LTLIBRARIES = \ + $(CDDA_LTLIBS) \ diff --git a/devel/gnome-vfs/files/patch-devel-docs::Makefile.in b/devel/gnome-vfs/files/patch-devel-docs::Makefile.in index b02290aa2ebb..5d2778e291bf 100644 --- a/devel/gnome-vfs/files/patch-devel-docs::Makefile.in +++ b/devel/gnome-vfs/files/patch-devel-docs::Makefile.in @@ -1,5 +1,6 @@ $FreeBSD$ + $MCom: ports/devel/gnomevfs2/files/patch-devel-docs::Makefile.in,v 1.18 2005/06/28 05:40:02 adamw Exp $ --- devel-docs/Makefile.in 2002/02/16 16:44:53 1.1 +++ devel-docs/Makefile.in 2002/02/16 16:45:47 diff --git a/devel/gnome-vfs/files/patch-gnome-vfs-2.0.pc.in b/devel/gnome-vfs/files/patch-gnome-vfs-2.0.pc.in index 4acd9a1bc552..088433c51a28 100644 --- a/devel/gnome-vfs/files/patch-gnome-vfs-2.0.pc.in +++ b/devel/gnome-vfs/files/patch-gnome-vfs-2.0.pc.in @@ -1,13 +1,9 @@ - -$FreeBSD$ - ---- gnome-vfs-2.0.pc.in.orig Thu Oct 28 13:25:35 2004 -+++ gnome-vfs-2.0.pc.in Thu Oct 28 13:25:51 2004 +--- gnome-vfs-2.0.pc.in.orig Wed Sep 14 05:30:25 2005 ++++ gnome-vfs-2.0.pc.in Mon Oct 3 12:00:02 2005 @@ -8,5 +8,5 @@ Description: The GNOME virtual file-system libraries Version: @VERSION@ - Requires: bonobo-activation-2.0 libbonobo-2.0 gconf-2.0 gthread-2.0 gmodule-2.0 + Requires: bonobo-activation-2.0 libbonobo-2.0 gconf-2.0 gthread-2.0 gmodule-no-export-2.0 gobject-2.0 -Libs: -L${libdir} -lgnomevfs-2 +Libs: -L${libdir} -lgnomevfs-2 @PTHREAD_LIB@ Cflags: -I${includedir}/gnome-vfs-2.0 -I${libdir}/gnome-vfs-2.0/include - diff --git a/devel/gnome-vfs/files/patch-gnome-vfs-module-2.0.pc.in b/devel/gnome-vfs/files/patch-gnome-vfs-module-2.0.pc.in index f9b09d46b7a3..c3f0d2c30ea2 100644 --- a/devel/gnome-vfs/files/patch-gnome-vfs-module-2.0.pc.in +++ b/devel/gnome-vfs/files/patch-gnome-vfs-module-2.0.pc.in @@ -1,12 +1,9 @@ - -$FreeBSD$ - ---- gnome-vfs-module-2.0.pc.in 2002/02/16 13:07:42 1.1 -+++ gnome-vfs-module-2.0.pc.in 2002/02/16 13:07:51 +--- gnome-vfs-module-2.0.pc.in.orig Wed Sep 14 05:30:25 2005 ++++ gnome-vfs-module-2.0.pc.in Mon Oct 3 12:01:04 2005 @@ -8,5 +8,5 @@ Description: The GNOME virtual file-system module include info Version: @VERSION@ - Requires: bonobo-activation-2.0,gthread-2.0,gmodule-2.0 + Requires: bonobo-activation-2.0 libbonobo-2.0 gconf-2.0 gthread-2.0 gmodule-no-export-2.0 gobject-2.0 -Libs: -L${libdir} -lgnomevfs-2 +Libs: -L${libdir} -lgnomevfs-2 @PTHREAD_LIB@ Cflags: -I${includedir}/gnome-vfs-2.0 -I${includedir}/gnome-vfs-module-2.0 -I${libdir}/gnome-vfs-2.0/include diff --git a/devel/gnome-vfs/files/patch-libgnomevfs::gnome-vfs-application-registry.c b/devel/gnome-vfs/files/patch-libgnomevfs::gnome-vfs-application-registry.c index bd679de032d2..2747466f7bd9 100644 --- a/devel/gnome-vfs/files/patch-libgnomevfs::gnome-vfs-application-registry.c +++ b/devel/gnome-vfs/files/patch-libgnomevfs::gnome-vfs-application-registry.c @@ -1,9 +1,6 @@ - -$FreeBSD$ - ---- libgnomevfs/gnome-vfs-application-registry.c 2002/06/13 07:31:15 1.1 -+++ libgnomevfs/gnome-vfs-application-registry.c 2002/06/13 08:25:24 -@@ -940,6 +940,8 @@ +--- libgnomevfs/gnome-vfs-application-registry.c.orig Sun May 22 23:09:39 2005 ++++ libgnomevfs/gnome-vfs-application-registry.c Sun May 22 23:14:22 2005 +@@ -943,6 +943,8 @@ load_application_info (void) static void gnome_vfs_application_registry_init (void) { @@ -12,18 +9,18 @@ $FreeBSD$ if (gnome_vfs_application_registry_initialized) return; -@@ -961,6 +963,14 @@ - gnome_registry_dir.dirname = g_strdup (DATADIR "/application-registry"); +@@ -963,6 +965,14 @@ gnome_vfs_application_registry_init (voi + "application-registry", + NULL); gnome_registry_dir.system_dir = TRUE; - ++ + tmp = g_strconcat (g_get_home_dir(), "/.gnome", NULL); + if (mkdir (tmp, 0700) && -+ errno != EEXIST) { -+ g_warning("Could not create per-user Gnome configuration directory: %s", -+ tmp); ++ errno != EEXIST) { ++ g_warning("Could not create per-user GNOME configuration directory: %s", ++ tmp); + } + g_free(tmp); -+ - user_registry_dir.dirname = g_strconcat (g_get_home_dir(), "/.gnome/application-info", NULL); - user_registry_dir.system_dir = FALSE; - + + user_registry_dir.dirname = g_build_filename (g_get_home_dir(), + ".gnome", diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-mime-info.c b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-mime-info.c deleted file mode 100644 index a61e83417651..000000000000 --- a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-mime-info.c +++ /dev/null @@ -1,11 +0,0 @@ ---- libgnomevfs/gnome-vfs-mime-info.c.orig Wed Aug 4 13:41:52 2004 -+++ libgnomevfs/gnome-vfs-mime-info.c Wed Aug 4 13:42:10 2004 -@@ -149,7 +149,7 @@ - - xdg_data_dirs = g_getenv ("XDG_DATA_DIRS"); - if (!xdg_data_dirs) { -- xdg_data_dirs = "/usr/local/share/:/usr/share/"; -+ xdg_data_dirs = "%%X11BASE%%/share/gnome/:/usr/local/share/gnome/:%%X11BASE%%/share/:/usr/local/share/:/usr/share/"; - } - - split_data_dirs = g_strsplit (xdg_data_dirs, ":", 0); diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-mime.c b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-mime.c deleted file mode 100644 index 698150125205..000000000000 --- a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-mime.c +++ /dev/null @@ -1,38 +0,0 @@ ---- libgnomevfs/gnome-vfs-mime.c.orig Sat Mar 19 18:59:45 2005 -+++ libgnomevfs/gnome-vfs-mime.c Sat Mar 19 19:02:24 2005 -@@ -167,7 +167,9 @@ - GnomeVFSResult result = GNOME_VFS_OK; - const char *mime_type; - -+ G_LOCK (mime_mutex); - max_extents = xdg_mime_get_max_buffer_extents (); -+ G_UNLOCK (mime_mutex); - max_extents = CLAMP (max_extents, 0, MAX_SNIFF_BUFFER_ALLOWED); - - if (!buffer->read_whole_file) { -@@ -592,7 +594,9 @@ - g_return_val_if_fail (a != NULL, FALSE); - g_return_val_if_fail (b != NULL, FALSE); - -+ G_LOCK (mime_mutex); - xdg_mime_mime_type_equal (a, b); -+ G_UNLOCK (mime_mutex); - - return FALSE; - } -@@ -626,8 +630,13 @@ - - if (gnome_vfs_mime_type_is_equal (mime_type, base_mime_type)) { - return GNOME_VFS_MIME_IDENTICAL; -- } else if (xdg_mime_mime_type_subclass (mime_type, base_mime_type)) { -- return GNOME_VFS_MIME_PARENT; -+ } else { -+ G_LOCK (mime_mutex); -+ if (xdg_mime_mime_type_subclass (mime_type, base_mime_type)) { -+ G_UNLOCK (mime_mutex); -+ return GNOME_VFS_MIME_PARENT; -+ } -+ G_UNLOCK (mime_mutex); - } - - return GNOME_VFS_MIME_UNRELATED; diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-resolve.c b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-resolve.c index c58be91fa94b..6e3660c845b0 100644 --- a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-resolve.c +++ b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-resolve.c @@ -1,13 +1,15 @@ ---- libgnomevfs/gnome-vfs-resolve.c.orig Sat Jul 31 17:52:23 2004 -+++ libgnomevfs/gnome-vfs-resolve.c Sat Jul 31 17:52:45 2004 -@@ -171,8 +171,10 @@ +--- libgnomevfs/gnome-vfs-resolve.c.orig Tue Apr 19 07:54:52 2005 ++++ libgnomevfs/gnome-vfs-resolve.c Sun May 22 23:25:22 2005 +@@ -171,10 +171,12 @@ _gnome_vfs_result_from_gai_error (int er switch (error) { case EAI_NONAME: return GNOME_VFS_ERROR_HOST_NOT_FOUND; -+#if defined(EAI_ADDRFAMILY) && defined(EAI_NODATA) ++#ifdef EAI_NODATA + #ifdef EAI_ADDRFAMILY case EAI_ADDRFAMILY: + #endif case EAI_NODATA: return GNOME_VFS_ERROR_HOST_HAS_NO_ADDRESS; +#endif + #ifdef EAI_SYSTEM case EAI_SYSTEM: return gnome_vfs_result_from_errno (); - case EAI_FAIL: - case EAI_AGAIN: return GNOME_VFS_ERROR_NAMESERVER; + #endif diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-utils.c b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-utils.c index 9788a89f060e..9c558eefd4f2 100644 --- a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-utils.c +++ b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-utils.c @@ -1,11 +1,26 @@ ---- libgnomevfs/gnome-vfs-utils.c.orig Mon Aug 16 11:11:09 2004 -+++ libgnomevfs/gnome-vfs-utils.c Mon Aug 16 11:11:16 2004 -@@ -871,7 +871,7 @@ - paths = g_strsplit (gnome_var, ":", 0); - +--- libgnomevfs/gnome-vfs-utils.c.orig Thu Sep 15 07:02:53 2005 ++++ libgnomevfs/gnome-vfs-utils.c Sat Oct 22 02:12:32 2005 +@@ -839,6 +839,7 @@ gnome_vfs_icon_path_from_filename (const for (temp_paths = paths; *temp_paths != NULL; temp_paths++) { -- full_filename = g_strconcat (*temp_paths, "/share/pixmaps/", relative_filename, NULL); -+ full_filename = g_strconcat (*temp_paths, "/share/gnome/pixmaps/", relative_filename, NULL); - if (g_file_test (full_filename, G_FILE_TEST_EXISTS)) { - g_strfreev (paths); - return full_filename; + full_filename = g_build_filename (*temp_paths, + "share", ++ "gnome", + "pixmaps", + relative_filename, + NULL); +@@ -1991,9 +1992,14 @@ _gnome_vfs_uri_resolve_all_symlinks_uri + resolved_uri = gnome_vfs_uri_resolve_relative (new_uri, + info->symlink_name); + if (*p != 0) { ++ gnome_vfs_uri_unref (new_uri); ++ ++ new_uri = gnome_vfs_uri_append_string (resolved_uri, p); ++ + gnome_vfs_uri_unref (uri); +- uri = gnome_vfs_uri_append_string (resolved_uri, p); + gnome_vfs_uri_unref (resolved_uri); ++ ++ uri = gnome_vfs_uri_ref (new_uri); + } else { + gnome_vfs_uri_unref (uri); + uri = resolved_uri; diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_xdgmime.c b/devel/gnome-vfs/files/patch-libgnomevfs_xdgmime.c index 472a4b5f6c19..37cc69f1ea3b 100644 --- a/devel/gnome-vfs/files/patch-libgnomevfs_xdgmime.c +++ b/devel/gnome-vfs/files/patch-libgnomevfs_xdgmime.c @@ -1,6 +1,6 @@ ---- libgnomevfs/xdgmime.c.orig Thu Jul 22 11:20:13 2004 -+++ libgnomevfs/xdgmime.c Thu Jul 22 11:20:52 2004 -@@ -189,7 +189,7 @@ +--- libgnomevfs/xdgmime.c.orig Wed Aug 24 16:52:03 2005 ++++ libgnomevfs/xdgmime.c Wed Aug 24 16:52:47 2005 +@@ -234,7 +234,7 @@ xdg_data_dirs = getenv ("XDG_DATA_DIRS"); if (xdg_data_dirs == NULL) diff --git a/devel/gnome-vfs/files/patch-modules_file-method.c b/devel/gnome-vfs/files/patch-modules_file-method.c new file mode 100644 index 000000000000..dbb237226e99 --- /dev/null +++ b/devel/gnome-vfs/files/patch-modules_file-method.c @@ -0,0 +1,12 @@ +--- modules/file-method.c.orig Sun May 22 23:30:16 2005 ++++ modules/file-method.c Sun May 22 23:31:08 2005 +@@ -66,6 +66,9 @@ + #if HAVE_SYS_VFS_H + #include <sys/vfs.h> + #elif HAVE_SYS_MOUNT_H ++#if HAVE_SYS_PARAM_H ++#include <sys/param.h> ++#endif + #include <sys/mount.h> + #endif + diff --git a/devel/gnome-vfs/files/patch-modules_smb-method.c b/devel/gnome-vfs/files/patch-modules_smb-method.c deleted file mode 100644 index 34c10cd54f08..000000000000 --- a/devel/gnome-vfs/files/patch-modules_smb-method.c +++ /dev/null @@ -1,20 +0,0 @@ ---- modules/smb-method.c.orig Wed Mar 2 18:44:11 2005 -+++ modules/smb-method.c Mon Sep 12 02:36:28 2005 -@@ -1425,7 +1425,7 @@ do_close (GnomeVFSMethod *method, - - /* Important: perform_authentication leaves and re-enters the lock! */ - while (perform_authentication (&actx) > 0) { -- r = smb_context->close (smb_context, handle->file); -+ r = smb_context->close_fn (smb_context, handle->file); - actx.res = (r >= 0) ? GNOME_VFS_OK : gnome_vfs_result_from_errno (); - } - -@@ -1446,7 +1446,7 @@ do_read (GnomeVFSMethod *method, - GnomeVFSContext *context) - { - FileHandle *handle = (FileHandle *)method_handle; -- GnomeVFSResult res = GNOME_VFS_OK;; -+ GnomeVFSResult res = GNOME_VFS_OK; - SmbAuthContext actx; - ssize_t n = 0; - diff --git a/devel/gnome-vfs/pkg-deinstall.in b/devel/gnome-vfs/pkg-deinstall.in index 7e289a563dd1..ed494001730b 100644 --- a/devel/gnome-vfs/pkg-deinstall.in +++ b/devel/gnome-vfs/pkg-deinstall.in @@ -1,6 +1,7 @@ #!/bin/sh # # $FreeBSD$ +# $MCom: ports/devel/gnomevfs2/pkg-deinstall.in,v 1.5 2005/06/28 05:40:01 adamw Exp $ # # Restore gconf keys of libgnome. diff --git a/devel/gnome-vfs/pkg-install.in b/devel/gnome-vfs/pkg-install.in index 6a407a1e4f42..f7ad446b9783 100644 --- a/devel/gnome-vfs/pkg-install.in +++ b/devel/gnome-vfs/pkg-install.in @@ -1,6 +1,7 @@ #!/bin/sh # # $FreeBSD$ +# $MCom: ports/devel/gnomevfs2/pkg-install.in,v 1.5 2005/06/28 05:40:01 adamw Exp $ # # Restore gconf keys of libgnome. diff --git a/devel/gnome-vfs/pkg-plist b/devel/gnome-vfs/pkg-plist index 48f676f445a3..e3505b507a49 100644 --- a/devel/gnome-vfs/pkg-plist +++ b/devel/gnome-vfs/pkg-plist @@ -3,9 +3,9 @@ bin/gnomevfs-copy bin/gnomevfs-info bin/gnomevfs-ls bin/gnomevfs-mkdir +bin/gnomevfs-monitor bin/gnomevfs-mv bin/gnomevfs-rm -%%CDPARANOIA%%etc/gnome-vfs-2.0/modules/cdda-module.conf etc/gnome-vfs-2.0/modules/default-modules.conf %%SAMBA%%etc/gnome-vfs-2.0/modules/smb-module.conf etc/gnome-vfs-2.0/modules/ssl-modules.conf @@ -58,7 +58,6 @@ include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-ssl.h include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-transform.h lib/bonobo/monikers/libmoniker_gnome_vfs_std.so lib/gnome-vfs-2.0/modules/libbzip2.so -%%CDPARANOIA%%lib/gnome-vfs-2.0/modules/libcdda.so lib/gnome-vfs-2.0/modules/libcomputer.so lib/gnome-vfs-2.0/modules/libdns-sd.so lib/gnome-vfs-2.0/modules/libfile.so @@ -70,12 +69,10 @@ lib/gnome-vfs-2.0/modules/libnntp.so lib/gnome-vfs-2.0/modules/libsftp.so %%SAMBA%%lib/gnome-vfs-2.0/modules/libsmb.so lib/gnome-vfs-2.0/modules/libtar.so -lib/gnome-vfs-2.0/modules/libvfs-pipe.so lib/gnome-vfs-2.0/modules/libvfs-test.so -lib/gnome-vfs-2.0/modules/libvfs-translate.so lib/libgnomevfs-2.a lib/libgnomevfs-2.so -lib/libgnomevfs-2.so.1000 +lib/libgnomevfs-2.so.0 libdata/bonobo/servers/GNOME_VFS_Daemon.server libdata/bonobo/servers/GNOME_VFS_Moniker_std.server libdata/pkgconfig/gnome-vfs-2.0.pc diff --git a/devel/gnome2-hacker-tools/Makefile b/devel/gnome2-hacker-tools/Makefile index 997d799397dc..2a2218b602e2 100644 --- a/devel/gnome2-hacker-tools/Makefile +++ b/devel/gnome2-hacker-tools/Makefile @@ -3,16 +3,13 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/devel/gnome2-hacker-tools/Makefile,v 1.40 2005/08/11 02:55:29 marcus Exp $ # -PORTNAME= gnome2-hacker-tools -PORTVERSION= 2.10.2 +PORTREVISION= 0 CATEGORIES= devel gnome -MASTER_SITES= # empty -DISTFILES= # empty -EXTRACT_ONLY= # empty +PKGNAMESUFFIX= -hacker-tools -MAINTAINER= gnome@FreeBSD.org COMMENT= GNOME 2 development tools RUN_DEPENDS= mlview:${PORTSDIR}/editors/mlview \ @@ -26,8 +23,9 @@ RUN_DEPENDS= mlview:${PORTSDIR}/editors/mlview \ regexxer:${PORTSDIR}/devel/regexxer \ anjuta:${PORTSDIR}/devel/anjuta -NO_BUILD= yes +MASTERDIR= ${.CURDIR}/../../x11/gnome2 +GNOME_SLAVE= yes -do-install: # empty +DESCR= ${.CURDIR}/pkg-descr -.include <bsd.port.mk> +.include "${MASTERDIR}/Makefile" diff --git a/devel/gnome2-hacker-tools/pkg-plist b/devel/gnome2-hacker-tools/pkg-plist deleted file mode 100644 index 549a621fec0c..000000000000 --- a/devel/gnome2-hacker-tools/pkg-plist +++ /dev/null @@ -1 +0,0 @@ -@comment this plist intentionally left empty diff --git a/devel/gnomecommon/Makefile b/devel/gnomecommon/Makefile index dddfaa261ac6..764daaf916a3 100644 --- a/devel/gnomecommon/Makefile +++ b/devel/gnomecommon/Makefile @@ -3,13 +3,14 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/devel/gnomecommon/Makefile,v 1.5 2005/09/20 09:39:51 ahze Exp $ # PORTNAME= gnomecommon -PORTVERSION= 2.8.0 +PORTVERSION= 2.12.0 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-common/2.8 +MASTER_SITE_SUBDIR= sources/gnome-common/2.12 DISTNAME= gnome-common-${PORTVERSION} DIST_SUBDIR= gnome2 diff --git a/devel/gnomecommon/distinfo b/devel/gnomecommon/distinfo index a3fa6f30afaa..e22e25e9fb8d 100644 --- a/devel/gnomecommon/distinfo +++ b/devel/gnomecommon/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-common-2.8.0.tar.bz2) = 4630d4cf2b83499c89211b3ae76b662f -SIZE (gnome2/gnome-common-2.8.0.tar.bz2) = 58694 +MD5 (gnome2/gnome-common-2.12.0.tar.bz2) = 817be32ab5dc7a5d56e6ec50d56100f8 +SIZE (gnome2/gnome-common-2.12.0.tar.bz2) = 60283 diff --git a/devel/gnomevfs2/Makefile b/devel/gnomevfs2/Makefile index e152131a2aae..56cd876c36b4 100644 --- a/devel/gnomevfs2/Makefile +++ b/devel/gnomevfs2/Makefile @@ -3,14 +3,15 @@ # Whom: Ade Lovett <ade@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/devel/gnomevfs2/Makefile,v 1.115 2005/10/31 00:12:01 marcus Exp $ # PORTNAME= gnomevfs2 -PORTVERSION= 2.10.1 -PORTREVISION= 1 +PORTVERSION= 2.12.1.1 +PORTREVISION= 2 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-vfs/2.10 +MASTER_SITE_SUBDIR= sources/gnome-vfs/2.12 DISTNAME= gnome-vfs-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -23,9 +24,9 @@ USE_BZIP2= yes USE_GMAKE= yes USE_X_PREFIX= yes USE_GNOME= gnomeprefix gnomehack intlhack gnomemimedata gconf2 \ - libbonobo + libbonobo ltverhack USE_REINPLACE= yes -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 INSTALLS_SHLIB= yes CONFIGURE_ARGS= --enable-openssl \ --disable-gnutls @@ -38,37 +39,13 @@ PKGDEINSTALL= ${WRKDIR}/pkg-deinstall GCONF_SCHEMAS= desktop_default_applications.schemas \ desktop_gnome_url_handlers.schemas system_dns_sd.schemas \ - system_http_proxy.schemas system_smb.schemas + system_http_proxy.schemas system_smb.schemas \ + system_storage.schemas -.include <bsd.port.pre.mk> - -.if defined(PACKAGE_BUILDING) || defined(PARALLEL_PACKAGE_BUILD) -.undef WITHOUT_CDPARANOIA -.undef WITHOUT_SAMBA -.undef WITHOUT_MDNS -WITH_MDNS= yes -WITH_CDPARANOIA= yes -WITH_SAMBA= yes -.endif - -.if exists(${LOCALBASE}/lib/libcdda_paranoia.a) -WITH_CDPARANOIA= yes -.endif - -.if exists(${LOCALBASE}/lib/libsmbclient.so) -WITH_SAMBA= yes -.endif +OPTIONS= SAMBA "Enable SMB volume support" on \ + MDNS "Enable Bonjour/Rendezvous support" on -.if exists(${LOCALBASE}/lib/libhowl.so) -WITH_MDNS= yes -.endif - -.if defined(WITH_CDPARANOIA) -LIB_DEPENDS+= cdda_paranoia.0:${PORTSDIR}/audio/cdparanoia -PLIST_SUB+= CDPARANOIA="" -.else -PLIST_SUB+= CDPARANOIA="@comment " -.endif +.include <bsd.port.pre.mk> .if exists(${LOCALBASE}/lib/libfam.so) || !defined(WITHOUT_FAM) USE_FAM= yes @@ -78,15 +55,18 @@ USE_FAM= yes LIB_DEPENDS+= krb5:${PORTSDIR}/security/heimdal .endif -.if defined(WITH_SAMBA) +.if !defined(WITHOUT_SAMBA) LIB_DEPENDS+= smbclient.0:${PORTSDIR}/net/samba-libsmbclient PLIST_SUB+= SAMBA="" .else PLIST_SUB+= SAMBA="@comment " +CONFIGURE_ARGS+=--disable-samba .endif -.if defined(WITH_MDNS) +.if !defined(WITHOUT_MDNS) LIB_DEPENDS+= howl:${PORTSDIR}/net/howl +.else +CONFIGURE_ARGS+=--disable-howl .endif post-patch: @@ -94,8 +74,7 @@ post-patch: ${WRKSRC}/libgnomevfs/Makefile.in @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g ; \ s|%%X11BASE%%|${X11BASE}|g' \ - ${WRKSRC}/libgnomevfs/xdgmime.c \ - ${WRKSRC}/libgnomevfs/gnome-vfs-mime-info.c + ${WRKSRC}/libgnomevfs/xdgmime.c @${SED} -e 's|%%X11BASE%%|${X11BASE}|g' \ < ${MASTERDIR}/pkg-install.in > ${PKGINSTALL} @${SED} -e 's|%%X11BASE%%|${X11BASE}|g' \ diff --git a/devel/gnomevfs2/distinfo b/devel/gnomevfs2/distinfo index e4923630ccb0..df476c6026a5 100644 --- a/devel/gnomevfs2/distinfo +++ b/devel/gnomevfs2/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-vfs-2.10.1.tar.bz2) = 88b520e5de748a310a2aef62fc095c8b -SIZE (gnome2/gnome-vfs-2.10.1.tar.bz2) = 1905314 +MD5 (gnome2/gnome-vfs-2.12.1.1.tar.bz2) = bc62212600167acf78c9771add5cce7e +SIZE (gnome2/gnome-vfs-2.12.1.1.tar.bz2) = 1726588 diff --git a/devel/gnomevfs2/files/patch-ac b/devel/gnomevfs2/files/patch-ac index 9362cac1715f..383987654ef2 100644 --- a/devel/gnomevfs2/files/patch-ac +++ b/devel/gnomevfs2/files/patch-ac @@ -1,11 +1,11 @@ ---- modules/Makefile.in.orig Tue May 6 15:39:48 2003 -+++ modules/Makefile.in Tue May 6 15:41:28 2003 -@@ -210,7 +210,7 @@ - @BUILD_CDEMENU_MODULE_TRUE@CDEMENU_LTLIBS = @BUILD_CDEMENU_MODULE_TRUE@libcdemenu-desktop.la - @BUILD_CDEMENU_MODULE_FALSE@CDEMENU_LTLIBS = - +--- modules/Makefile.in.orig Mon Oct 3 11:55:14 2005 ++++ modules/Makefile.in Mon Oct 3 11:55:55 2005 +@@ -465,7 +465,7 @@ + @HAVE_SAMBA_TRUE@SMB_LTLIBS = libsmb.la + @OS_WIN32_FALSE@PLATFROM_SPECIFIC_LTLIBS = libdns-sd.la libnetwork.la libnntp.la libsftp.la $(HTTP_LTLIBS) libftp.la + @OS_WIN32_TRUE@PLATFROM_SPECIFIC_LTLIBS = -module_flags = -export_dynamic -avoid-version -module -no-undefined +module_flags = -export_dynamic -avoid-version -module -no-undefined $(PTHREAD_LIB) modulesdir = $(libdir)/gnome-vfs-2.0/modules - modules_LTLIBRARIES = \ + $(CDDA_LTLIBS) \ diff --git a/devel/gnomevfs2/files/patch-devel-docs::Makefile.in b/devel/gnomevfs2/files/patch-devel-docs::Makefile.in index b02290aa2ebb..5d2778e291bf 100644 --- a/devel/gnomevfs2/files/patch-devel-docs::Makefile.in +++ b/devel/gnomevfs2/files/patch-devel-docs::Makefile.in @@ -1,5 +1,6 @@ $FreeBSD$ + $MCom: ports/devel/gnomevfs2/files/patch-devel-docs::Makefile.in,v 1.18 2005/06/28 05:40:02 adamw Exp $ --- devel-docs/Makefile.in 2002/02/16 16:44:53 1.1 +++ devel-docs/Makefile.in 2002/02/16 16:45:47 diff --git a/devel/gnomevfs2/files/patch-gnome-vfs-2.0.pc.in b/devel/gnomevfs2/files/patch-gnome-vfs-2.0.pc.in index 4acd9a1bc552..088433c51a28 100644 --- a/devel/gnomevfs2/files/patch-gnome-vfs-2.0.pc.in +++ b/devel/gnomevfs2/files/patch-gnome-vfs-2.0.pc.in @@ -1,13 +1,9 @@ - -$FreeBSD$ - ---- gnome-vfs-2.0.pc.in.orig Thu Oct 28 13:25:35 2004 -+++ gnome-vfs-2.0.pc.in Thu Oct 28 13:25:51 2004 +--- gnome-vfs-2.0.pc.in.orig Wed Sep 14 05:30:25 2005 ++++ gnome-vfs-2.0.pc.in Mon Oct 3 12:00:02 2005 @@ -8,5 +8,5 @@ Description: The GNOME virtual file-system libraries Version: @VERSION@ - Requires: bonobo-activation-2.0 libbonobo-2.0 gconf-2.0 gthread-2.0 gmodule-2.0 + Requires: bonobo-activation-2.0 libbonobo-2.0 gconf-2.0 gthread-2.0 gmodule-no-export-2.0 gobject-2.0 -Libs: -L${libdir} -lgnomevfs-2 +Libs: -L${libdir} -lgnomevfs-2 @PTHREAD_LIB@ Cflags: -I${includedir}/gnome-vfs-2.0 -I${libdir}/gnome-vfs-2.0/include - diff --git a/devel/gnomevfs2/files/patch-gnome-vfs-module-2.0.pc.in b/devel/gnomevfs2/files/patch-gnome-vfs-module-2.0.pc.in index f9b09d46b7a3..c3f0d2c30ea2 100644 --- a/devel/gnomevfs2/files/patch-gnome-vfs-module-2.0.pc.in +++ b/devel/gnomevfs2/files/patch-gnome-vfs-module-2.0.pc.in @@ -1,12 +1,9 @@ - -$FreeBSD$ - ---- gnome-vfs-module-2.0.pc.in 2002/02/16 13:07:42 1.1 -+++ gnome-vfs-module-2.0.pc.in 2002/02/16 13:07:51 +--- gnome-vfs-module-2.0.pc.in.orig Wed Sep 14 05:30:25 2005 ++++ gnome-vfs-module-2.0.pc.in Mon Oct 3 12:01:04 2005 @@ -8,5 +8,5 @@ Description: The GNOME virtual file-system module include info Version: @VERSION@ - Requires: bonobo-activation-2.0,gthread-2.0,gmodule-2.0 + Requires: bonobo-activation-2.0 libbonobo-2.0 gconf-2.0 gthread-2.0 gmodule-no-export-2.0 gobject-2.0 -Libs: -L${libdir} -lgnomevfs-2 +Libs: -L${libdir} -lgnomevfs-2 @PTHREAD_LIB@ Cflags: -I${includedir}/gnome-vfs-2.0 -I${includedir}/gnome-vfs-module-2.0 -I${libdir}/gnome-vfs-2.0/include diff --git a/devel/gnomevfs2/files/patch-libgnomevfs::gnome-vfs-application-registry.c b/devel/gnomevfs2/files/patch-libgnomevfs::gnome-vfs-application-registry.c index bd679de032d2..2747466f7bd9 100644 --- a/devel/gnomevfs2/files/patch-libgnomevfs::gnome-vfs-application-registry.c +++ b/devel/gnomevfs2/files/patch-libgnomevfs::gnome-vfs-application-registry.c @@ -1,9 +1,6 @@ - -$FreeBSD$ - ---- libgnomevfs/gnome-vfs-application-registry.c 2002/06/13 07:31:15 1.1 -+++ libgnomevfs/gnome-vfs-application-registry.c 2002/06/13 08:25:24 -@@ -940,6 +940,8 @@ +--- libgnomevfs/gnome-vfs-application-registry.c.orig Sun May 22 23:09:39 2005 ++++ libgnomevfs/gnome-vfs-application-registry.c Sun May 22 23:14:22 2005 +@@ -943,6 +943,8 @@ load_application_info (void) static void gnome_vfs_application_registry_init (void) { @@ -12,18 +9,18 @@ $FreeBSD$ if (gnome_vfs_application_registry_initialized) return; -@@ -961,6 +963,14 @@ - gnome_registry_dir.dirname = g_strdup (DATADIR "/application-registry"); +@@ -963,6 +965,14 @@ gnome_vfs_application_registry_init (voi + "application-registry", + NULL); gnome_registry_dir.system_dir = TRUE; - ++ + tmp = g_strconcat (g_get_home_dir(), "/.gnome", NULL); + if (mkdir (tmp, 0700) && -+ errno != EEXIST) { -+ g_warning("Could not create per-user Gnome configuration directory: %s", -+ tmp); ++ errno != EEXIST) { ++ g_warning("Could not create per-user GNOME configuration directory: %s", ++ tmp); + } + g_free(tmp); -+ - user_registry_dir.dirname = g_strconcat (g_get_home_dir(), "/.gnome/application-info", NULL); - user_registry_dir.system_dir = FALSE; - + + user_registry_dir.dirname = g_build_filename (g_get_home_dir(), + ".gnome", diff --git a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-mime-info.c b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-mime-info.c deleted file mode 100644 index a61e83417651..000000000000 --- a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-mime-info.c +++ /dev/null @@ -1,11 +0,0 @@ ---- libgnomevfs/gnome-vfs-mime-info.c.orig Wed Aug 4 13:41:52 2004 -+++ libgnomevfs/gnome-vfs-mime-info.c Wed Aug 4 13:42:10 2004 -@@ -149,7 +149,7 @@ - - xdg_data_dirs = g_getenv ("XDG_DATA_DIRS"); - if (!xdg_data_dirs) { -- xdg_data_dirs = "/usr/local/share/:/usr/share/"; -+ xdg_data_dirs = "%%X11BASE%%/share/gnome/:/usr/local/share/gnome/:%%X11BASE%%/share/:/usr/local/share/:/usr/share/"; - } - - split_data_dirs = g_strsplit (xdg_data_dirs, ":", 0); diff --git a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-mime.c b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-mime.c deleted file mode 100644 index 698150125205..000000000000 --- a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-mime.c +++ /dev/null @@ -1,38 +0,0 @@ ---- libgnomevfs/gnome-vfs-mime.c.orig Sat Mar 19 18:59:45 2005 -+++ libgnomevfs/gnome-vfs-mime.c Sat Mar 19 19:02:24 2005 -@@ -167,7 +167,9 @@ - GnomeVFSResult result = GNOME_VFS_OK; - const char *mime_type; - -+ G_LOCK (mime_mutex); - max_extents = xdg_mime_get_max_buffer_extents (); -+ G_UNLOCK (mime_mutex); - max_extents = CLAMP (max_extents, 0, MAX_SNIFF_BUFFER_ALLOWED); - - if (!buffer->read_whole_file) { -@@ -592,7 +594,9 @@ - g_return_val_if_fail (a != NULL, FALSE); - g_return_val_if_fail (b != NULL, FALSE); - -+ G_LOCK (mime_mutex); - xdg_mime_mime_type_equal (a, b); -+ G_UNLOCK (mime_mutex); - - return FALSE; - } -@@ -626,8 +630,13 @@ - - if (gnome_vfs_mime_type_is_equal (mime_type, base_mime_type)) { - return GNOME_VFS_MIME_IDENTICAL; -- } else if (xdg_mime_mime_type_subclass (mime_type, base_mime_type)) { -- return GNOME_VFS_MIME_PARENT; -+ } else { -+ G_LOCK (mime_mutex); -+ if (xdg_mime_mime_type_subclass (mime_type, base_mime_type)) { -+ G_UNLOCK (mime_mutex); -+ return GNOME_VFS_MIME_PARENT; -+ } -+ G_UNLOCK (mime_mutex); - } - - return GNOME_VFS_MIME_UNRELATED; diff --git a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-resolve.c b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-resolve.c index c58be91fa94b..6e3660c845b0 100644 --- a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-resolve.c +++ b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-resolve.c @@ -1,13 +1,15 @@ ---- libgnomevfs/gnome-vfs-resolve.c.orig Sat Jul 31 17:52:23 2004 -+++ libgnomevfs/gnome-vfs-resolve.c Sat Jul 31 17:52:45 2004 -@@ -171,8 +171,10 @@ +--- libgnomevfs/gnome-vfs-resolve.c.orig Tue Apr 19 07:54:52 2005 ++++ libgnomevfs/gnome-vfs-resolve.c Sun May 22 23:25:22 2005 +@@ -171,10 +171,12 @@ _gnome_vfs_result_from_gai_error (int er switch (error) { case EAI_NONAME: return GNOME_VFS_ERROR_HOST_NOT_FOUND; -+#if defined(EAI_ADDRFAMILY) && defined(EAI_NODATA) ++#ifdef EAI_NODATA + #ifdef EAI_ADDRFAMILY case EAI_ADDRFAMILY: + #endif case EAI_NODATA: return GNOME_VFS_ERROR_HOST_HAS_NO_ADDRESS; +#endif + #ifdef EAI_SYSTEM case EAI_SYSTEM: return gnome_vfs_result_from_errno (); - case EAI_FAIL: - case EAI_AGAIN: return GNOME_VFS_ERROR_NAMESERVER; + #endif diff --git a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-utils.c b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-utils.c index 9788a89f060e..9c558eefd4f2 100644 --- a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-utils.c +++ b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-utils.c @@ -1,11 +1,26 @@ ---- libgnomevfs/gnome-vfs-utils.c.orig Mon Aug 16 11:11:09 2004 -+++ libgnomevfs/gnome-vfs-utils.c Mon Aug 16 11:11:16 2004 -@@ -871,7 +871,7 @@ - paths = g_strsplit (gnome_var, ":", 0); - +--- libgnomevfs/gnome-vfs-utils.c.orig Thu Sep 15 07:02:53 2005 ++++ libgnomevfs/gnome-vfs-utils.c Sat Oct 22 02:12:32 2005 +@@ -839,6 +839,7 @@ gnome_vfs_icon_path_from_filename (const for (temp_paths = paths; *temp_paths != NULL; temp_paths++) { -- full_filename = g_strconcat (*temp_paths, "/share/pixmaps/", relative_filename, NULL); -+ full_filename = g_strconcat (*temp_paths, "/share/gnome/pixmaps/", relative_filename, NULL); - if (g_file_test (full_filename, G_FILE_TEST_EXISTS)) { - g_strfreev (paths); - return full_filename; + full_filename = g_build_filename (*temp_paths, + "share", ++ "gnome", + "pixmaps", + relative_filename, + NULL); +@@ -1991,9 +1992,14 @@ _gnome_vfs_uri_resolve_all_symlinks_uri + resolved_uri = gnome_vfs_uri_resolve_relative (new_uri, + info->symlink_name); + if (*p != 0) { ++ gnome_vfs_uri_unref (new_uri); ++ ++ new_uri = gnome_vfs_uri_append_string (resolved_uri, p); ++ + gnome_vfs_uri_unref (uri); +- uri = gnome_vfs_uri_append_string (resolved_uri, p); + gnome_vfs_uri_unref (resolved_uri); ++ ++ uri = gnome_vfs_uri_ref (new_uri); + } else { + gnome_vfs_uri_unref (uri); + uri = resolved_uri; diff --git a/devel/gnomevfs2/files/patch-libgnomevfs_xdgmime.c b/devel/gnomevfs2/files/patch-libgnomevfs_xdgmime.c index 472a4b5f6c19..37cc69f1ea3b 100644 --- a/devel/gnomevfs2/files/patch-libgnomevfs_xdgmime.c +++ b/devel/gnomevfs2/files/patch-libgnomevfs_xdgmime.c @@ -1,6 +1,6 @@ ---- libgnomevfs/xdgmime.c.orig Thu Jul 22 11:20:13 2004 -+++ libgnomevfs/xdgmime.c Thu Jul 22 11:20:52 2004 -@@ -189,7 +189,7 @@ +--- libgnomevfs/xdgmime.c.orig Wed Aug 24 16:52:03 2005 ++++ libgnomevfs/xdgmime.c Wed Aug 24 16:52:47 2005 +@@ -234,7 +234,7 @@ xdg_data_dirs = getenv ("XDG_DATA_DIRS"); if (xdg_data_dirs == NULL) diff --git a/devel/gnomevfs2/files/patch-modules_file-method.c b/devel/gnomevfs2/files/patch-modules_file-method.c new file mode 100644 index 000000000000..dbb237226e99 --- /dev/null +++ b/devel/gnomevfs2/files/patch-modules_file-method.c @@ -0,0 +1,12 @@ +--- modules/file-method.c.orig Sun May 22 23:30:16 2005 ++++ modules/file-method.c Sun May 22 23:31:08 2005 +@@ -66,6 +66,9 @@ + #if HAVE_SYS_VFS_H + #include <sys/vfs.h> + #elif HAVE_SYS_MOUNT_H ++#if HAVE_SYS_PARAM_H ++#include <sys/param.h> ++#endif + #include <sys/mount.h> + #endif + diff --git a/devel/gnomevfs2/files/patch-modules_smb-method.c b/devel/gnomevfs2/files/patch-modules_smb-method.c deleted file mode 100644 index 34c10cd54f08..000000000000 --- a/devel/gnomevfs2/files/patch-modules_smb-method.c +++ /dev/null @@ -1,20 +0,0 @@ ---- modules/smb-method.c.orig Wed Mar 2 18:44:11 2005 -+++ modules/smb-method.c Mon Sep 12 02:36:28 2005 -@@ -1425,7 +1425,7 @@ do_close (GnomeVFSMethod *method, - - /* Important: perform_authentication leaves and re-enters the lock! */ - while (perform_authentication (&actx) > 0) { -- r = smb_context->close (smb_context, handle->file); -+ r = smb_context->close_fn (smb_context, handle->file); - actx.res = (r >= 0) ? GNOME_VFS_OK : gnome_vfs_result_from_errno (); - } - -@@ -1446,7 +1446,7 @@ do_read (GnomeVFSMethod *method, - GnomeVFSContext *context) - { - FileHandle *handle = (FileHandle *)method_handle; -- GnomeVFSResult res = GNOME_VFS_OK;; -+ GnomeVFSResult res = GNOME_VFS_OK; - SmbAuthContext actx; - ssize_t n = 0; - diff --git a/devel/gnomevfs2/pkg-deinstall.in b/devel/gnomevfs2/pkg-deinstall.in index 7e289a563dd1..ed494001730b 100644 --- a/devel/gnomevfs2/pkg-deinstall.in +++ b/devel/gnomevfs2/pkg-deinstall.in @@ -1,6 +1,7 @@ #!/bin/sh # # $FreeBSD$ +# $MCom: ports/devel/gnomevfs2/pkg-deinstall.in,v 1.5 2005/06/28 05:40:01 adamw Exp $ # # Restore gconf keys of libgnome. diff --git a/devel/gnomevfs2/pkg-install.in b/devel/gnomevfs2/pkg-install.in index 6a407a1e4f42..f7ad446b9783 100644 --- a/devel/gnomevfs2/pkg-install.in +++ b/devel/gnomevfs2/pkg-install.in @@ -1,6 +1,7 @@ #!/bin/sh # # $FreeBSD$ +# $MCom: ports/devel/gnomevfs2/pkg-install.in,v 1.5 2005/06/28 05:40:01 adamw Exp $ # # Restore gconf keys of libgnome. diff --git a/devel/gnomevfs2/pkg-plist b/devel/gnomevfs2/pkg-plist index 48f676f445a3..e3505b507a49 100644 --- a/devel/gnomevfs2/pkg-plist +++ b/devel/gnomevfs2/pkg-plist @@ -3,9 +3,9 @@ bin/gnomevfs-copy bin/gnomevfs-info bin/gnomevfs-ls bin/gnomevfs-mkdir +bin/gnomevfs-monitor bin/gnomevfs-mv bin/gnomevfs-rm -%%CDPARANOIA%%etc/gnome-vfs-2.0/modules/cdda-module.conf etc/gnome-vfs-2.0/modules/default-modules.conf %%SAMBA%%etc/gnome-vfs-2.0/modules/smb-module.conf etc/gnome-vfs-2.0/modules/ssl-modules.conf @@ -58,7 +58,6 @@ include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-ssl.h include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-transform.h lib/bonobo/monikers/libmoniker_gnome_vfs_std.so lib/gnome-vfs-2.0/modules/libbzip2.so -%%CDPARANOIA%%lib/gnome-vfs-2.0/modules/libcdda.so lib/gnome-vfs-2.0/modules/libcomputer.so lib/gnome-vfs-2.0/modules/libdns-sd.so lib/gnome-vfs-2.0/modules/libfile.so @@ -70,12 +69,10 @@ lib/gnome-vfs-2.0/modules/libnntp.so lib/gnome-vfs-2.0/modules/libsftp.so %%SAMBA%%lib/gnome-vfs-2.0/modules/libsmb.so lib/gnome-vfs-2.0/modules/libtar.so -lib/gnome-vfs-2.0/modules/libvfs-pipe.so lib/gnome-vfs-2.0/modules/libvfs-test.so -lib/gnome-vfs-2.0/modules/libvfs-translate.so lib/libgnomevfs-2.a lib/libgnomevfs-2.so -lib/libgnomevfs-2.so.1000 +lib/libgnomevfs-2.so.0 libdata/bonobo/servers/GNOME_VFS_Daemon.server libdata/bonobo/servers/GNOME_VFS_Moniker_std.server libdata/pkgconfig/gnome-vfs-2.0.pc diff --git a/devel/libgsf-gnome/Makefile b/devel/libgsf-gnome/Makefile index 172b752b9c27..63f12c1d616a 100644 --- a/devel/libgsf-gnome/Makefile +++ b/devel/libgsf-gnome/Makefile @@ -3,6 +3,7 @@ # Whom: Maxim Sobolev <sobomax@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/devel/libgsf-gnome/Makefile,v 1.8 2005/09/08 17:53:00 marcus Exp $ # CATEGORIES= devel gnome @@ -15,17 +16,21 @@ MASTERDIR= ${.CURDIR}/../libgsf DESCR= ${.CURDIR}/pkg-descr PLIST= ${.CURDIR}/pkg-plist -USE_GNOME= gnomehack libgsf gnomevfs2 +USE_GNOME= gnomehack libgsf gnomevfs2 ltverhack intlhack CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc/gsf \ --disable-gtk-doc --with-bz2 --with-gnome -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -lgsf-1" +CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \ + LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib -lgsf-1" + +GCONF_SCHEMAS= +GSF_SLAVE= yes do-build: @cd ${WRKSRC}/gsf-gnome && ${MAKE} do-install: - cd ${WRKSRC}/gsf-gnome && ${MAKE} install + cd ${WRKSRC}/gsf-gnome && ${MAKE} ${INSTALL_TARGET} + ${MKDIR} ${PREFIX}/libdata/pkgconfig ${INSTALL_DATA} ${WRKSRC}/libgsf-gnome-1.pc ${PREFIX}/libdata/pkgconfig .include "${MASTERDIR}/Makefile" diff --git a/devel/libgsf-gnome/pkg-plist b/devel/libgsf-gnome/pkg-plist index fdd0f93c589f..9c9ca34bf41d 100644 --- a/devel/libgsf-gnome/pkg-plist +++ b/devel/libgsf-gnome/pkg-plist @@ -5,6 +5,6 @@ include/libgsf-1/gsf-gnome/gsf-output-gnomevfs.h include/libgsf-1/gsf-gnome/gsf-shared-bonobo-stream.h lib/libgsf-gnome-1.a lib/libgsf-gnome-1.so -lib/libgsf-gnome-1.so.12 +lib/libgsf-gnome-1.so.113 libdata/pkgconfig/libgsf-gnome-1.pc @dirrm include/libgsf-1/gsf-gnome diff --git a/devel/libgsf/Makefile b/devel/libgsf/Makefile index b76935f4dfff..7aed3c3c1b32 100644 --- a/devel/libgsf/Makefile +++ b/devel/libgsf/Makefile @@ -3,11 +3,12 @@ # Whom: Maxim Sobolev <sobomax@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/devel/libgsf/Makefile,v 1.17 2005/10/11 22:08:17 marcus Exp $ # PORTNAME= libgsf -PORTVERSION= 1.11.1 -PORTREVISION?= 1 +PORTVERSION= 1.13.2 +PORTREVISION?= 0 CATEGORIES?= devel MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R} @@ -20,14 +21,21 @@ COMMENT?= An extensible i/o abstraction for dealing with structured file formats LIB_DEPENDS+= bz2.1:${PORTSDIR}/archivers/bzip2 .endif +USE_X_PREFIX= yes USE_BZIP2= yes USE_GMAKE= yes INSTALLS_SHLIB= yes -USE_GNOME?= gnomehack glib20 libxml2 -USE_LIBTOOL_VER=15 +USE_GNOME?= gnomehack glib20 libxml2 gconf2 ltverhack intlhack +USE_AUTOTOOLS= libtool:15 CONFIGURE_ARGS?=--with-html-dir=${PREFIX}/share/doc \ - --disable-gtk-doc --without-gnome --with-bz2 + --disable-gtk-doc --without-gnome --with-bz2 \ + --mandir=${PREFIX}/man CONFIGURE_ENV?= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" +.if !defined(GSF_SLAVE) +GCONF_SCHEMAS= gsf-office-thumbnailer.schemas +MAN1= gsf-office-thumbnailer.1 +.endif + .include <bsd.port.mk> diff --git a/devel/libgsf/distinfo b/devel/libgsf/distinfo index 01cc1c40a6dd..bcd0b44dd610 100644 --- a/devel/libgsf/distinfo +++ b/devel/libgsf/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/libgsf-1.11.1.tar.bz2) = b6d867f46e20dca5c6bf2cf3bfc38cfc -SIZE (gnome2/libgsf-1.11.1.tar.bz2) = 413711 +MD5 (gnome2/libgsf-1.13.2.tar.bz2) = 0894afd88f9e43eada27e52cb22cd0f1 +SIZE (gnome2/libgsf-1.13.2.tar.bz2) = 504413 diff --git a/devel/libgsf/files/patch-doc_Makefile.in b/devel/libgsf/files/patch-doc_Makefile.in new file mode 100644 index 000000000000..2d1069fce2c8 --- /dev/null +++ b/devel/libgsf/files/patch-doc_Makefile.in @@ -0,0 +1,11 @@ +--- doc/Makefile.in.orig Tue Oct 11 15:56:09 2005 ++++ doc/Makefile.in Tue Oct 11 15:56:24 2005 +@@ -293,7 +293,7 @@ + # if $(DOC_MODULE).types is non-empty. + GTKDOC_CFLAGS = -I$(top_srcdir) $(LIBGSF_CFLAGS) + GTKDOC_LIBS = $(top_builddir)/gsf/libgsf-1.la $(LIBGSF_LIBS) +-manpagedir = $(datadir)/man/man1 ++manpagedir = $(prefix)/man/man1 + manpage_DATA = gsf-office-thumbnailer.1 + @GTK_DOC_INSTALLED_TRUE@@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS) + @GTK_DOC_INSTALLED_TRUE@@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS) diff --git a/devel/libgsf/files/patch-gsf-gnome-Makefile.in b/devel/libgsf/files/patch-gsf-gnome-Makefile.in index 4051a60c2310..ffe67fa45f86 100644 --- a/devel/libgsf/files/patch-gsf-gnome-Makefile.in +++ b/devel/libgsf/files/patch-gsf-gnome-Makefile.in @@ -1,30 +1,29 @@ ---- gsf-gnome/Makefile.in.orig Sat May 22 18:56:24 2004 -+++ gsf-gnome/Makefile.in Sat May 22 18:57:23 2004 -@@ -170,7 +170,7 @@ - - lib_LTLIBRARIES = $(target_libgsf_gnome) - --libgsf_gnome_1_la_LIBADD = $(top_builddir)/gsf/libgsf-1.la $(LIBGSF_GNOME_LIBS) -+libgsf_gnome_1_la_LIBADD = $(LIBGSF_GNOME_LIBS) - libgsf_gnome_1_la_LDFLAGS = -version-info $(VERSION_INFO) - libgsf_gnome_1_la_SOURCES = \ - gsf-input-gnomevfs.c \ -@@ -199,7 +199,7 @@ - CONFIG_CLEAN_FILES = +--- gsf-gnome/Makefile.in.orig Tue Oct 11 15:47:39 2005 ++++ gsf-gnome/Makefile.in Tue Oct 11 15:50:56 2005 +@@ -54,9 +54,7 @@ + libLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(lib_LTLIBRARIES) - --libgsf_gnome_1_la_DEPENDENCIES = $(top_builddir)/gsf/libgsf-1.la -+libgsf_gnome_1_la_DEPENDENCIES = - am_libgsf_gnome_1_la_OBJECTS = gsf-input-gnomevfs.lo \ - gsf-output-gnomevfs.lo gsf-input-bonobo.lo gsf-output-bonobo.lo \ - gsf-shared-bonobo-stream.lo ---- gsf-gnome/Makefile.in.orig Sat May 22 19:26:16 2004 -+++ gsf-gnome/Makefile.in Sat May 22 19:30:30 2004 -@@ -179,14 +179,15 @@ - gsf-output-bonobo.c \ + am__DEPENDENCIES_1 = +-@WITH_LIBGSF_GNOME_TRUE@libgsf_gnome_1_la_DEPENDENCIES = \ +-@WITH_LIBGSF_GNOME_TRUE@ $(top_builddir)/gsf/libgsf-1.la \ +-@WITH_LIBGSF_GNOME_TRUE@ $(am__DEPENDENCIES_1) ++@WITH_LIBGSF_GNOME_TRUE@libgsf_gnome_1_la_DEPENDENCIES = + am__libgsf_gnome_1_la_SOURCES_DIST = gsf-input-gnomevfs.c \ + gsf-output-gnomevfs.c gsf-input-bonobo.c gsf-output-bonobo.c \ gsf-shared-bonobo-stream.c +@@ -273,7 +271,7 @@ + target_alias = @target_alias@ + AM_CPPFLAGS = -I$(top_srcdir) $(LIBGSF_GNOME_CFLAGS) + @WITH_LIBGSF_GNOME_TRUE@lib_LTLIBRARIES = libgsf-gnome-1.la +-@WITH_LIBGSF_GNOME_TRUE@libgsf_gnome_1_la_LIBADD = $(top_builddir)/gsf/libgsf-1.la $(LIBGSF_GNOME_LIBS) ++@WITH_LIBGSF_GNOME_TRUE@libgsf_gnome_1_la_LIBADD = $(LIBGSF_GNOME_LIBS) + @WITH_LIBGSF_GNOME_TRUE@libgsf_gnome_1_la_LDFLAGS = -version-info $(VERSION_INFO) $(am__append_1) + @WITH_LIBGSF_GNOME_TRUE@libgsf_gnome_1_la_SOURCES = \ + @WITH_LIBGSF_GNOME_TRUE@ gsf-input-gnomevfs.c \ +@@ -282,13 +280,15 @@ + @WITH_LIBGSF_GNOME_TRUE@ gsf-output-bonobo.c \ + @WITH_LIBGSF_GNOME_TRUE@ gsf-shared-bonobo-stream.c -- -libgsf_gnome_1_includedir = $(includedir)/libgsf-1/gsf-gnome -libgsf_gnome_1_include_HEADERS = \ - gsf-input-gnomevfs.h \ @@ -36,11 +35,11 @@ +@WITH_LIBGSF_GNOME_FALSE@libgsf_gnome_1_include_HEADERS = +@WITH_LIBGSF_GNOME_TRUE@libgsf_gnome_1_includedir = $(includedir)/libgsf-1/gsf-gnome +@WITH_LIBGSF_GNOME_TRUE@libgsf_gnome_1_include_HEADERS = \ -+@WITH_LIBGSF_GNOME_TRUE@ gsf-input-gnomevfs.h \ -+@WITH_LIBGSF_GNOME_TRUE@ gsf-output-gnomevfs.h \ -+@WITH_LIBGSF_GNOME_TRUE@ gsf-input-bonobo.h \ -+@WITH_LIBGSF_GNOME_TRUE@ gsf-output-bonobo.h \ -+@WITH_LIBGSF_GNOME_TRUE@ gsf-shared-bonobo-stream.h ++@WITH_LIBGSF_GNOME_TRUE@ gsf-input-gnomevfs.h \ ++@WITH_LIBGSF_GNOME_TRUE@ gsf-output-gnomevfs.h \ ++@WITH_LIBGSF_GNOME_TRUE@ gsf-input-bonobo.h \ ++@WITH_LIBGSF_GNOME_TRUE@ gsf-output-bonobo.h \ ++@WITH_LIBGSF_GNOME_TRUE@ gsf-shared-bonobo-stream.h + all: all-am - # include these just in case we are building a tarball without diff --git a/devel/libgsf/pkg-plist b/devel/libgsf/pkg-plist index 9f6dc384532b..169911e34ccb 100644 --- a/devel/libgsf/pkg-plist +++ b/devel/libgsf/pkg-plist @@ -1,6 +1,10 @@ +bin/gsf-office-thumbnailer include/libgsf-1/gsf-win32/gsf-input-win32.h include/libgsf-1/gsf-win32/gsf-output-win32.h +include/libgsf-1/gsf/gsf-blob.h +include/libgsf-1/gsf/gsf-clip-data.h include/libgsf-1/gsf/gsf-doc-meta-data.h +include/libgsf-1/gsf/gsf-docprop-vector.h include/libgsf-1/gsf/gsf-impl-utils.h include/libgsf-1/gsf/gsf-infile-impl.h include/libgsf-1/gsf/gsf-infile-msole.h @@ -20,13 +24,16 @@ include/libgsf-1/gsf/gsf-input.h include/libgsf-1/gsf/gsf-libxml.h include/libgsf-1/gsf/gsf-meta-names.h include/libgsf-1/gsf/gsf-msole-utils.h +include/libgsf-1/gsf/gsf-opendoc-utils.h include/libgsf-1/gsf/gsf-outfile-impl.h include/libgsf-1/gsf/gsf-outfile-msole.h include/libgsf-1/gsf/gsf-outfile-stdio.h include/libgsf-1/gsf/gsf-outfile-zip.h include/libgsf-1/gsf/gsf-outfile.h include/libgsf-1/gsf/gsf-output-bzip.h +include/libgsf-1/gsf/gsf-output-csv.h include/libgsf-1/gsf/gsf-output-gzip.h +include/libgsf-1/gsf/gsf-output-iconv.h include/libgsf-1/gsf/gsf-output-impl.h include/libgsf-1/gsf/gsf-output-iochannel.h include/libgsf-1/gsf/gsf-output-memory.h @@ -38,8 +45,10 @@ include/libgsf-1/gsf/gsf-utils.h include/libgsf-1/gsf/gsf.h lib/libgsf-1.a lib/libgsf-1.so -lib/libgsf-1.so.12 +lib/libgsf-1.so.113 libdata/pkgconfig/libgsf-1.pc +share/doc/gsf/GsfBlob.html +share/doc/gsf/GsfClipData.html share/doc/gsf/api.html share/doc/gsf/gsf-Bononbo.html share/doc/gsf/gsf-Compression.html @@ -72,6 +81,7 @@ share/doc/gsf/right.png share/doc/gsf/sources.html share/doc/gsf/style.css share/doc/gsf/up.png +share/locale/es/LC_MESSAGES/libgsf.mo @dirrm share/doc/gsf @dirrm include/libgsf-1/gsf-win32 @dirrm include/libgsf-1/gsf diff --git a/devel/libgtop2/Makefile b/devel/libgtop2/Makefile index 2ba4862787c9..dd0e06b48b1c 100644 --- a/devel/libgtop2/Makefile +++ b/devel/libgtop2/Makefile @@ -3,13 +3,14 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/devel/libgtop2/Makefile,v 1.49 2005/09/05 19:23:42 ahze Exp $ # PORTNAME= libgtop2 -PORTVERSION= 2.10.2 +PORTVERSION= 2.12.0 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.10 +MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.12 DISTNAME= libgtop-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -25,7 +26,7 @@ USE_GMAKE= yes USE_GNOME= gnomehack glib20 USE_REINPLACE= yes INSTALLS_SHLIB= yes -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" @@ -35,7 +36,9 @@ INFO= libgtop2 .if ${OSVERSION} >= 600000 PKGMESSAGE= ${FILESDIR}/pkg-message -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-sysdeps_freebsd_Makefile.in +EXTRA_PATCHES+= ${FILESDIR}/extra-67-patch-sysdeps_freebsd_Makefile.in +.else +EXTRA_PATCHES+= ${FILESDIR}/extra-45-patch-sysdeps_freebsd_Makefile.in .endif post-patch: diff --git a/devel/libgtop2/distinfo b/devel/libgtop2/distinfo index 49626f8eac1a..8e403b0b1b28 100644 --- a/devel/libgtop2/distinfo +++ b/devel/libgtop2/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/libgtop-2.10.2.tar.bz2) = 59d1f49a37abe98a25fdb005711cd5fe -SIZE (gnome2/libgtop-2.10.2.tar.bz2) = 751695 +MD5 (gnome2/libgtop-2.12.0.tar.bz2) = 616ed8352f3463855b3eace26b22536e +SIZE (gnome2/libgtop-2.12.0.tar.bz2) = 740843 diff --git a/devel/libgtop2/files/extra-45-patch-sysdeps_freebsd_Makefile.in b/devel/libgtop2/files/extra-45-patch-sysdeps_freebsd_Makefile.in new file mode 100644 index 000000000000..dea0aec8224c --- /dev/null +++ b/devel/libgtop2/files/extra-45-patch-sysdeps_freebsd_Makefile.in @@ -0,0 +1,33 @@ +--- sysdeps/freebsd/Makefile.in.orig Mon Aug 8 15:10:50 2005 ++++ sysdeps/freebsd/Makefile.in Mon Aug 8 15:15:54 2005 +@@ -143,12 +143,11 @@ + + noinst_LTLIBRARIES = libgtop_sysdeps-2.0.la libgtop_sysdeps_suid-2.0.la + +-libgtop_sysdeps_2_0_la_SOURCES = nosuid.c siglist.c ++libgtop_sysdeps_2_0_la_SOURCES = nosuid.c siglist.c netlist.c + + libgtop_sysdeps_2_0_la_LDFLAGS = $(LT_VERSION_INFO) + +-libgtop_sysdeps_suid_2_0_la_SOURCES = open.c close.c cpu.c mem.c swap.c uptime.c loadavg.c shm_limits.c msg_limits.c sem_limits.c proclist.c procstate.c procuid.c proctime.c procmem.c procsignal.c prockernel.c procsegment.c procargs.c procmap.c netlist.c netload.c ppp.c procopenfiles.c fsusage.c +- ++libgtop_sysdeps_suid_2_0_la_SOURCES = open.c close.c cpu.c mem.c swap.c uptime.c loadavg.c shm_limits.c msg_limits.c sem_limits.c proclist.c procstate.c procuid.c proctime.c procmem.c procsignal.c prockernel.c procsegment.c procargs.c procmap.c netload.c ppp.c procopenfiles.c fsusage.c sysinfo.c + + libgtop_sysdeps_suid_2_0_la_LDFLAGS = $(LT_VERSION_INFO) + +@@ -171,13 +170,13 @@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ + libgtop_sysdeps_2_0_la_LIBADD = +-libgtop_sysdeps_2_0_la_OBJECTS = nosuid.lo siglist.lo ++libgtop_sysdeps_2_0_la_OBJECTS = nosuid.lo siglist.lo netlist.lo + libgtop_sysdeps_suid_2_0_la_LIBADD = + libgtop_sysdeps_suid_2_0_la_OBJECTS = open.lo close.lo cpu.lo mem.lo \ + swap.lo uptime.lo loadavg.lo shm_limits.lo msg_limits.lo sem_limits.lo \ + proclist.lo procstate.lo procuid.lo proctime.lo procmem.lo \ + procsignal.lo prockernel.lo procsegment.lo procargs.lo procmap.lo \ +-netlist.lo netload.lo ppp.lo procopenfiles.lo fsusage.lo ++netload.lo ppp.lo procopenfiles.lo fsusage.lo sysinfo.lo + CFLAGS = @CFLAGS@ + COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) diff --git a/devel/libgtop2/files/extra-67-patch-sysdeps_freebsd_Makefile.in b/devel/libgtop2/files/extra-67-patch-sysdeps_freebsd_Makefile.in new file mode 100644 index 000000000000..8168ecb6ddd0 --- /dev/null +++ b/devel/libgtop2/files/extra-67-patch-sysdeps_freebsd_Makefile.in @@ -0,0 +1,34 @@ +--- sysdeps/freebsd/Makefile.in.orig Mon Aug 8 20:25:56 2005 ++++ sysdeps/freebsd/Makefile.in Mon Aug 8 20:28:06 2005 +@@ -143,12 +143,11 @@ + + noinst_LTLIBRARIES = libgtop_sysdeps-2.0.la libgtop_sysdeps_suid-2.0.la + +-libgtop_sysdeps_2_0_la_SOURCES = nosuid.c siglist.c ++libgtop_sysdeps_2_0_la_SOURCES = nosuid.c siglist.c netlist.c + + libgtop_sysdeps_2_0_la_LDFLAGS = $(LT_VERSION_INFO) + +-libgtop_sysdeps_suid_2_0_la_SOURCES = open.c close.c cpu.c mem.c swap.c uptime.c loadavg.c shm_limits.c msg_limits.c sem_limits.c proclist.c procstate.c procuid.c proctime.c procmem.c procsignal.c prockernel.c procsegment.c procargs.c procmap.c netlist.c netload.c ppp.c procopenfiles.c fsusage.c +- ++libgtop_sysdeps_suid_2_0_la_SOURCES = open.c close.c cpu.c mem.c swap.c uptime.c loadavg.c shm_limits.c msg_limits.c sem_limits.c proclist.c procstate.c procuid.c proctime.c procmem.c procsignal.c prockernel.c procsegment.c procargs.c procmap.c netload.c ppp.c procopenfiles.c fsusage.c sysinfo.c + + libgtop_sysdeps_suid_2_0_la_LDFLAGS = $(LT_VERSION_INFO) + +@@ -171,13 +170,13 @@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ + libgtop_sysdeps_2_0_la_LIBADD = +-libgtop_sysdeps_2_0_la_OBJECTS = nosuid.lo siglist.lo +-libgtop_sysdeps_suid_2_0_la_LIBADD = ++libgtop_sysdeps_2_0_la_OBJECTS = nosuid.lo siglist.lo netlist.lo ++libgtop_sysdeps_suid_2_0_la_LIBADD = -lgeom -ldevstat + libgtop_sysdeps_suid_2_0_la_OBJECTS = open.lo close.lo cpu.lo mem.lo \ + swap.lo uptime.lo loadavg.lo shm_limits.lo msg_limits.lo sem_limits.lo \ + proclist.lo procstate.lo procuid.lo proctime.lo procmem.lo \ + procsignal.lo prockernel.lo procsegment.lo procargs.lo procmap.lo \ +-netlist.lo netload.lo ppp.lo procopenfiles.lo fsusage.lo ++netload.lo ppp.lo procopenfiles.lo fsusage.lo sysinfo.lo + CFLAGS = @CFLAGS@ + COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) diff --git a/devel/libgtop2/files/extra-patch-sysdeps_freebsd_Makefile.in b/devel/libgtop2/files/extra-patch-sysdeps_freebsd_Makefile.in deleted file mode 100644 index 9abc77d16d84..000000000000 --- a/devel/libgtop2/files/extra-patch-sysdeps_freebsd_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- sysdeps/freebsd/Makefile.in.orig Thu May 12 15:12:13 2005 -+++ sysdeps/freebsd/Makefile.in Thu May 12 15:22:01 2005 -@@ -175,7 +175,7 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - libgtop_sysdeps_2_0_la_LIBADD = - libgtop_sysdeps_2_0_la_OBJECTS = nosuid.lo siglist.lo --libgtop_sysdeps_suid_2_0_la_LIBADD = -+libgtop_sysdeps_suid_2_0_la_LIBADD = -lgeom -ldevstat - libgtop_sysdeps_suid_2_0_la_OBJECTS = open.lo close.lo cpu.lo mem.lo \ - swap.lo uptime.lo loadavg.lo shm_limits.lo msg_limits.lo sem_limits.lo \ - proclist.lo procstate.lo procuid.lo proctime.lo procmem.lo \ diff --git a/devel/libgtop2/files/patch-configure b/devel/libgtop2/files/patch-configure index 662f75ac3671..e40ac7b08c2c 100644 --- a/devel/libgtop2/files/patch-configure +++ b/devel/libgtop2/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig Thu Mar 11 15:38:00 2004 -+++ configure Thu Mar 11 15:38:00 2004 -@@ -1917,9 +1917,9 @@ +--- configure.orig Wed Jul 13 19:29:53 2005 ++++ configure Wed Jul 13 19:36:36 2005 +@@ -1931,9 +1931,9 @@ # libtool versioning LT_RELEASE=$LIBGTOP_MAJOR_VERSION.$LIBGTOP_MINOR_VERSION @@ -13,3 +13,21 @@ LT_VERSION_INFO="-version-info ${LT_CURRENT}:${LT_REVISION}:${LT_AGE}" +@@ -23654,6 +23654,8 @@ + fi + + done ++;; ++esac + + + +@@ -23792,8 +23794,6 @@ + + fi + +- ;; +-esac + + + echo "$as_me:$LINENO: checking for vm_statistics in -lmach" >&5 diff --git a/devel/libgtop2/files/patch-sysdeps_freebsd_glibtop_server.h b/devel/libgtop2/files/patch-sysdeps_freebsd_glibtop_server.h new file mode 100644 index 000000000000..5ded2dc3c3c0 --- /dev/null +++ b/devel/libgtop2/files/patch-sysdeps_freebsd_glibtop_server.h @@ -0,0 +1,21 @@ +--- sysdeps/freebsd/glibtop_server.h.orig Mon Oct 20 11:19:49 2003 ++++ sysdeps/freebsd/glibtop_server.h Mon Aug 8 15:10:14 2005 +@@ -21,8 +21,8 @@ + Boston, MA 02111-1307, USA. + */ + +-#ifndef __GLIBTOP_SERVER_H__ +-#define __GLIBTOP_SERVER_H__ ++#ifndef __FREEBSD__GLIBTOP_SERVER_H__ ++#define __FREEBSD__GLIBTOP_SERVER_H__ + + G_BEGIN_DECLS + +@@ -45,6 +45,7 @@ G_BEGIN_DECLS + #define GLIBTOP_SUID_PROC_ARGS (1 << GLIBTOP_SYSDEPS_PROC_ARGS) + #define GLIBTOP_SUID_PROC_MAP (1 << GLIBTOP_SYSDEPS_PROC_MAP) + #define GLIBTOP_SUID_NETLOAD (1 << GLIBTOP_SYSDEPS_NETLOAD) ++#define GLIBTOP_SUID_NETLIST 0 + #define GLIBTOP_SUID_PPP (1 << GLIBTOP_SYSDEPS_PPP) + + G_END_DECLS diff --git a/devel/libgtop2/files/patch-sysdeps_freebsd_sysinfo.c b/devel/libgtop2/files/patch-sysdeps_freebsd_sysinfo.c new file mode 100644 index 000000000000..7a86f3327730 --- /dev/null +++ b/devel/libgtop2/files/patch-sysdeps_freebsd_sysinfo.c @@ -0,0 +1,95 @@ +--- sysdeps/freebsd/sysinfo.c.orig Thu Jun 9 22:56:29 2005 ++++ sysdeps/freebsd/sysinfo.c Thu Jun 9 22:58:36 2005 +@@ -0,0 +1,92 @@ ++/* $Id$ */ ++ ++/* Copyright (C) 1998-99 Martin Baulig ++ This file is part of LibGTop 1.0. ++ ++ Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998. ++ ++ LibGTop is free software; you can redistribute it and/or modify it ++ under the terms of the GNU General Public License as published by ++ the Free Software Foundation; either version 2 of the License, ++ or (at your option) any later version. ++ ++ LibGTop is distributed in the hope that it will be useful, but WITHOUT ++ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or ++ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License ++ for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with LibGTop; see the file COPYING. If not, write to the ++ Free Software Foundation, Inc., 59 Temple Place - Suite 330, ++ Boston, MA 02111-1307, USA. ++*/ ++ ++#include <config.h> ++#include <sys/types.h> ++#include <sys/sysctl.h> ++#include <glibtop/error.h> ++#include <glibtop/cpu.h> ++#include <glibtop/sysinfo.h> ++ ++static const unsigned long _glibtop_sysdeps_sysinfo = ++(1L << GLIBTOP_SYSINFO_CPUINFO); ++ ++static glibtop_sysinfo sysinfo = { .flags = 0 }; ++ ++static void ++init_sysinfo (glibtop *server) ++{ ++ char *model; ++ int ncpus = 1; ++ int mhz = 0; ++ size_t len; ++ ++ if(G_LIKELY(sysinfo.flags)) return; ++ ++ glibtop_init_s (&server, GLIBTOP_SYSDEPS_CPU, 0); ++ ++ len = sizeof (ncpus); ++ sysctlbyname ("hw.ncpu", &ncpus, &len, NULL, 0); ++ len = 0; ++ sysctlbyname ("hw.model", NULL, &len, NULL, 0); ++ model = malloc (len); ++ sysctlbyname ("hw.model", model, &len, NULL, 0); ++ len = sizeof (mhz); ++ sysctlbyname ("hw.clockrate", &mhz, &len, NULL, 0); ++ ++ for(sysinfo.ncpu = 0; ++ sysinfo.ncpu < GLIBTOP_NCPU && sysinfo.ncpu < ncpus; ++ sysinfo.ncpu++) { ++ ++ glibtop_entry * const cpuinfo = &sysinfo.cpuinfo[sysinfo.ncpu]; ++ ++ cpuinfo->labels = g_ptr_array_new (); ++ ++ cpuinfo->values = g_hash_table_new_full(g_str_hash, g_str_equal, ++ g_free, g_free); ++ ++ cpuinfo->descriptions = g_hash_table_new_full(g_str_hash, g_str_equal, ++ g_free, g_free); ++ ++ g_ptr_array_add (cpuinfo->labels, "processor"); ++ g_hash_table_insert (cpuinfo->values, "processor", &sysinfo.ncpu); ++ ++ g_ptr_array_add (cpuinfo->labels, "vendor_id"); ++ g_hash_table_insert (cpuinfo->values, "vendor_id", model); ++ ++ g_ptr_array_add (cpuinfo->labels, "cpu MHz"); ++ g_hash_table_insert (cpuinfo->values, "cpu MHz", &mhz); ++ ++ } ++ ++ free (model); ++ ++ sysinfo.flags = _glibtop_sysdeps_sysinfo; ++} ++ ++const glibtop_sysinfo * ++glibtop_get_sysinfo_s (glibtop *server) ++{ ++ init_sysinfo (server); ++ return &sysinfo; ++} diff --git a/devel/libgtop2/files/patch-systeps::freebsd::proctime.c b/devel/libgtop2/files/patch-systeps::freebsd::proctime.c index da0908ce778c..9857d6cb856d 100644 --- a/devel/libgtop2/files/patch-systeps::freebsd::proctime.c +++ b/devel/libgtop2/files/patch-systeps::freebsd::proctime.c @@ -1,6 +1,6 @@ ---- sysdeps/freebsd/proctime.c Wed Feb 23 17:20:45 2005 -+++ sysdeps/freebsd/proctime.c.orig Sat Mar 19 02:38:31 2005 -@@ -146,8 +146,10 @@ +--- sysdeps/freebsd/proctime.c.orig Wed Feb 23 03:20:45 2005 ++++ sysdeps/freebsd/proctime.c Tue Aug 2 12:49:38 2005 +@@ -146,8 +146,10 @@ glibtop_get_proc_time_p (glibtop *server /* Get the process information */ pinfo = kvm_getprocs (server->machine.kd, KERN_PROC_PID, pid, &count); @@ -13,3 +13,19 @@ #if defined(__FreeBSD__) && (__FreeBSD_version >= 500013) buf->rtime = pinfo [0].ki_runtime; +@@ -193,9 +195,13 @@ glibtop_get_proc_time_p (glibtop *server + if ((pinfo [0].ki_flag & P_INMEM)) { + #endif + buf->utime = pinfo [0].ki_runtime; +- buf->stime = 0; /* XXX */ ++ buf->stime = tv2sec (pinfo [0].ki_rusage.ru_stime); + buf->cutime = tv2sec (pinfo [0].ki_childtime); +- buf->cstime = 0; /* XXX */ ++#if __FreeBSD_version >= 600000 ++ buf->cstime = tv2sec (pinfo [0].ki_rusage_ch.ru_stime); ++#else ++ buf->cstime = 0; ++#endif + buf->start_time = tv2sec (pinfo [0].ki_start); + buf->flags = _glibtop_sysdeps_proc_time_user; + } diff --git a/devel/libgtop2/pkg-plist b/devel/libgtop2/pkg-plist index a6f6c3607b25..a7e68fc0f119 100644 --- a/devel/libgtop2/pkg-plist +++ b/devel/libgtop2/pkg-plist @@ -110,11 +110,11 @@ share/locale/vi/LC_MESSAGES/libgtop-2.0.mo share/locale/xh/LC_MESSAGES/libgtop-2.0.mo share/locale/zh_CN/LC_MESSAGES/libgtop-2.0.mo share/locale/zh_TW/LC_MESSAGES/libgtop-2.0.mo +@dirrm include/libgtop-2.0/glibtop +@dirrm include/libgtop-2.0 @unexec rmdir %D/share/locale/xh/LC_MESSAGES 2> /dev/null || true @unexec rmdir %D/share/locale/xh 2> /dev/null || true @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 include/libgtop-2.0/glibtop -@dirrm include/libgtop-2.0 diff --git a/devel/libsoup/Makefile b/devel/libsoup/Makefile index 285cf8293a9e..125ff3a2e1cf 100644 --- a/devel/libsoup/Makefile +++ b/devel/libsoup/Makefile @@ -3,10 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/devel/libsoup/Makefile,v 1.30 2005/08/29 03:22:33 marcus Exp $ # PORTNAME= libsoup PORTVERSION= 2.2.6.1 +PORTREVISION= 1 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.2 @@ -18,9 +20,9 @@ COMMENT= A SOAP (Simple Object Access Protocol) implementation in C LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt USE_BZIP2= yes -USE_GNOME= gnomehack glib20 libxml2 +USE_GNOME= gnomehack glib20 libxml2 ltverhack INSTALLS_SHLIB= yes -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 USE_GMAKE= yes CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \ --disable-gtk-doc diff --git a/devel/libsoup/pkg-plist b/devel/libsoup/pkg-plist index e3f0fb313d97..8ff6cd1639bd 100644 --- a/devel/libsoup/pkg-plist +++ b/devel/libsoup/pkg-plist @@ -25,7 +25,7 @@ include/libsoup-%%VERSION%%/libsoup/soup-xmlrpc-response.h include/libsoup-%%VERSION%%/libsoup/soup.h lib/libsoup-%%VERSION%%.a lib/libsoup-%%VERSION%%.so -lib/libsoup-%%VERSION%%.so.9 +lib/libsoup-%%VERSION%%.so.8 libdata/pkgconfig/libsoup-%%VERSION%%.pc %%DOCSDIR%%/SoupAddress.html %%DOCSDIR%%/SoupAuth.html diff --git a/devel/libsoup22/Makefile b/devel/libsoup22/Makefile index 285cf8293a9e..125ff3a2e1cf 100644 --- a/devel/libsoup22/Makefile +++ b/devel/libsoup22/Makefile @@ -3,10 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/devel/libsoup/Makefile,v 1.30 2005/08/29 03:22:33 marcus Exp $ # PORTNAME= libsoup PORTVERSION= 2.2.6.1 +PORTREVISION= 1 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.2 @@ -18,9 +20,9 @@ COMMENT= A SOAP (Simple Object Access Protocol) implementation in C LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt USE_BZIP2= yes -USE_GNOME= gnomehack glib20 libxml2 +USE_GNOME= gnomehack glib20 libxml2 ltverhack INSTALLS_SHLIB= yes -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 USE_GMAKE= yes CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \ --disable-gtk-doc diff --git a/devel/libsoup22/pkg-plist b/devel/libsoup22/pkg-plist index e3f0fb313d97..8ff6cd1639bd 100644 --- a/devel/libsoup22/pkg-plist +++ b/devel/libsoup22/pkg-plist @@ -25,7 +25,7 @@ include/libsoup-%%VERSION%%/libsoup/soup-xmlrpc-response.h include/libsoup-%%VERSION%%/libsoup/soup.h lib/libsoup-%%VERSION%%.a lib/libsoup-%%VERSION%%.so -lib/libsoup-%%VERSION%%.so.9 +lib/libsoup-%%VERSION%%.so.8 libdata/pkgconfig/libsoup-%%VERSION%%.pc %%DOCSDIR%%/SoupAddress.html %%DOCSDIR%%/SoupAuth.html diff --git a/devel/pkg-config/Makefile b/devel/pkg-config/Makefile index 742b418057fe..4a66677fc427 100644 --- a/devel/pkg-config/Makefile +++ b/devel/pkg-config/Makefile @@ -3,19 +3,21 @@ # Whom: Maxim Sobolev <sobomax@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/devel/pkgconfig/Makefile,v 1.6 2005/10/14 20:39:57 adamw Exp $ # PORTNAME= pkgconfig -PORTVERSION= 0.17.2 +PORTVERSION= 0.19 CATEGORIES= devel MASTER_SITES= http://pkgconfig.freedesktop.org/releases/ +DISTNAME= pkg-config-${PORTVERSION} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= A utility to retrieve information about installed libraries USE_GMAKE= yes -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 USE_GNOME= gnometarget LIBTOOLFILES= glib-1.2.8/configure LIBTOOLFLAGS= --disable-ltlibs \ diff --git a/devel/pkg-config/distinfo b/devel/pkg-config/distinfo index 20b35cccca85..220f87d0cfa3 100644 --- a/devel/pkg-config/distinfo +++ b/devel/pkg-config/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/pkgconfig-0.17.2.tar.gz) = a0829ae71b586e027183b2a1cfe0ce88 -SIZE (gnome2/pkgconfig-0.17.2.tar.gz) = 965129 +MD5 (gnome2/pkg-config-0.19.tar.gz) = 25f106d2cc82a0013f5bdc89875d5790 +SIZE (gnome2/pkg-config-0.19.tar.gz) = 968790 diff --git a/devel/pkg-config/files/patch-parse.c b/devel/pkg-config/files/patch-parse.c index b591663c5709..eb828f3e7743 100644 --- a/devel/pkg-config/files/patch-parse.c +++ b/devel/pkg-config/files/patch-parse.c @@ -1,5 +1,6 @@ $FreeBSD$ +$MCom: ports/devel/pkgconfig/files/patch-parse.c,v 1.4 2005/10/14 20:39:57 adamw Exp $ --- parse.c 2001/08/01 07:24:17 1.1 +++ parse.c 2001/08/01 07:25:02 diff --git a/devel/pkg-config/pkg-descr b/devel/pkg-config/pkg-descr index afd75d04435b..c24838f6230e 100644 --- a/devel/pkg-config/pkg-descr +++ b/devel/pkg-config/pkg-descr @@ -1,18 +1,13 @@ The pkg-config program is used to retrieve information about installed libraries in the system. It is typically used to compile and link against one -or more libraries. +or more libraries. It's more useful to the compilation process than to +the end-user. pkg-config retrieves information about packages from special metadata files. These files are named after the package, with the extension .pc. By default, -pkg-config looks in the following directories: ${PREFIX}/libdata/pkgconfig, -${LOCALBASE}/libdata/pkgconfig and ${X11BASE}/libdata/pkgconfig for these -files; it will also look in the list of directories specified by the -PKG_CONFIG_PATH environment variable. +pkg-config looks for these files in the following directories: +${PREFIX}/libdata/pkgconfig, ${LOCALBASE}/libdata/pkgconfig and +${X11BASE}/libdata/pkgconfig; it will also look in the list of directories +specified by the PKG_CONFIG_PATH environment variable. -The package name specified on the pkg-config command line is defined to be the -name of the metadata file, minus the .pc extension. If a library can install -multiple versions simultaneously, it must give each version its own name (for -example, GTK 1.2 might have the package name "gtk+" while GTK 2.0 has -"gtk+-2.0"). - -WWW: http://www.freedesktop.org/wiki/Software_2fpkgconfig +WWW: http://pkgconfig.freedesktop.org/wiki/ diff --git a/devel/pkgconfig/Makefile b/devel/pkgconfig/Makefile index 742b418057fe..4a66677fc427 100644 --- a/devel/pkgconfig/Makefile +++ b/devel/pkgconfig/Makefile @@ -3,19 +3,21 @@ # Whom: Maxim Sobolev <sobomax@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/devel/pkgconfig/Makefile,v 1.6 2005/10/14 20:39:57 adamw Exp $ # PORTNAME= pkgconfig -PORTVERSION= 0.17.2 +PORTVERSION= 0.19 CATEGORIES= devel MASTER_SITES= http://pkgconfig.freedesktop.org/releases/ +DISTNAME= pkg-config-${PORTVERSION} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= A utility to retrieve information about installed libraries USE_GMAKE= yes -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 USE_GNOME= gnometarget LIBTOOLFILES= glib-1.2.8/configure LIBTOOLFLAGS= --disable-ltlibs \ diff --git a/devel/pkgconfig/distinfo b/devel/pkgconfig/distinfo index 20b35cccca85..220f87d0cfa3 100644 --- a/devel/pkgconfig/distinfo +++ b/devel/pkgconfig/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/pkgconfig-0.17.2.tar.gz) = a0829ae71b586e027183b2a1cfe0ce88 -SIZE (gnome2/pkgconfig-0.17.2.tar.gz) = 965129 +MD5 (gnome2/pkg-config-0.19.tar.gz) = 25f106d2cc82a0013f5bdc89875d5790 +SIZE (gnome2/pkg-config-0.19.tar.gz) = 968790 diff --git a/devel/pkgconfig/files/patch-parse.c b/devel/pkgconfig/files/patch-parse.c index b591663c5709..eb828f3e7743 100644 --- a/devel/pkgconfig/files/patch-parse.c +++ b/devel/pkgconfig/files/patch-parse.c @@ -1,5 +1,6 @@ $FreeBSD$ +$MCom: ports/devel/pkgconfig/files/patch-parse.c,v 1.4 2005/10/14 20:39:57 adamw Exp $ --- parse.c 2001/08/01 07:24:17 1.1 +++ parse.c 2001/08/01 07:25:02 diff --git a/devel/pkgconfig/pkg-descr b/devel/pkgconfig/pkg-descr index afd75d04435b..c24838f6230e 100644 --- a/devel/pkgconfig/pkg-descr +++ b/devel/pkgconfig/pkg-descr @@ -1,18 +1,13 @@ The pkg-config program is used to retrieve information about installed libraries in the system. It is typically used to compile and link against one -or more libraries. +or more libraries. It's more useful to the compilation process than to +the end-user. pkg-config retrieves information about packages from special metadata files. These files are named after the package, with the extension .pc. By default, -pkg-config looks in the following directories: ${PREFIX}/libdata/pkgconfig, -${LOCALBASE}/libdata/pkgconfig and ${X11BASE}/libdata/pkgconfig for these -files; it will also look in the list of directories specified by the -PKG_CONFIG_PATH environment variable. +pkg-config looks for these files in the following directories: +${PREFIX}/libdata/pkgconfig, ${LOCALBASE}/libdata/pkgconfig and +${X11BASE}/libdata/pkgconfig; it will also look in the list of directories +specified by the PKG_CONFIG_PATH environment variable. -The package name specified on the pkg-config command line is defined to be the -name of the metadata file, minus the .pc extension. If a library can install -multiple versions simultaneously, it must give each version its own name (for -example, GTK 1.2 might have the package name "gtk+" while GTK 2.0 has -"gtk+-2.0"). - -WWW: http://www.freedesktop.org/wiki/Software_2fpkgconfig +WWW: http://pkgconfig.freedesktop.org/wiki/ diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile index 751484043968..af6ac9b792f6 100644 --- a/editors/gedit/Makefile +++ b/editors/gedit/Makefile @@ -3,13 +3,14 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/editors/gedit/Makefile,v 1.12 2005/10/03 15:49:09 ahze Exp $ # PORTNAME= gedit -PORTVERSION= 2.10.5 +PORTVERSION= 2.12.1 CATEGORIES= editors gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.10 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.12 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -22,12 +23,12 @@ USE_X_PREFIX= yes INSTALLS_OMF= yes INSTALLS_SHLIB= yes USE_GMAKE= yes -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 USE_GNOME= gnomeprefix gnomehack intlhack \ libgnomeprintui libgnomeui eel2 gtksourceview desktopfileutils CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -PLIST_SUB= VERSION="2.10" +PLIST_SUB= VERSION="2.12" MAN1= gedit.1 GCONF_SCHEMAS= gedit.schemas diff --git a/editors/gedit/distinfo b/editors/gedit/distinfo index 828e7fbc2dd6..1b22cc699a1b 100644 --- a/editors/gedit/distinfo +++ b/editors/gedit/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gedit-2.10.5.tar.bz2) = 790f804d4754c382630ba70d8d264e18 -SIZE (gnome2/gedit-2.10.5.tar.bz2) = 2099478 +MD5 (gnome2/gedit-2.12.1.tar.bz2) = 13f376c6c63b0fbd25ba9b6c7d6fb97c +SIZE (gnome2/gedit-2.12.1.tar.bz2) = 2018712 diff --git a/editors/gedit/pkg-plist b/editors/gedit/pkg-plist index d256d789cb6c..ee3dd784d391 100644 --- a/editors/gedit/pkg-plist +++ b/editors/gedit/pkg-plist @@ -178,6 +178,7 @@ share/locale/it/LC_MESSAGES/gedit.mo share/locale/ja/LC_MESSAGES/gedit.mo share/locale/kn/LC_MESSAGES/gedit.mo share/locale/ko/LC_MESSAGES/gedit.mo +share/locale/ku/LC_MESSAGES/gedit.mo share/locale/lt/LC_MESSAGES/gedit.mo share/locale/lv/LC_MESSAGES/gedit.mo share/locale/mi/LC_MESSAGES/gedit.mo diff --git a/editors/gnome2-office/Makefile b/editors/gnome2-office/Makefile index 55c2a61c3681..97743d7cda2f 100644 --- a/editors/gnome2-office/Makefile +++ b/editors/gnome2-office/Makefile @@ -3,16 +3,13 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/editors/gnome2-office/Makefile,v 1.39 2005/08/11 02:55:29 marcus Exp $ # -PORTNAME= gnome2-office -PORTVERSION= 2.10.2 +PORTREVISION= 0 CATEGORIES= editors gnome -MASTER_SITES= # empty -DISTFILES= # empty -EXTRACT_ONLY= # empty +PKGNAMESUFFIX= -office -MAINTAINER= gnome@FreeBSD.org COMMENT= GNOME 2 office applications RUN_DEPENDS= gnumeric:${PORTSDIR}/math/gnumeric \ @@ -22,8 +19,9 @@ RUN_DEPENDS= gnumeric:${PORTSDIR}/math/gnumeric \ abiword:${PORTSDIR}/editors/abiword \ mergeant:${PORTSDIR}/databases/mergeant -NO_BUILD= yes +MASTERDIR= ${.CURDIR}/../../x11/gnome2 +GNOME_SLAVE= yes -do-install: # empty +DESCR= ${.CURDIR}/pkg-descr -.include <bsd.port.mk> +.include "${MASTERDIR}/Makefile" diff --git a/editors/gnome2-office/pkg-plist b/editors/gnome2-office/pkg-plist deleted file mode 100644 index 549a621fec0c..000000000000 --- a/editors/gnome2-office/pkg-plist +++ /dev/null @@ -1 +0,0 @@ -@comment this plist intentionally left empty diff --git a/games/gnome-games-extra-data/Makefile b/games/gnome-games-extra-data/Makefile index f9b6017459aa..1b2ea3165e42 100644 --- a/games/gnome-games-extra-data/Makefile +++ b/games/gnome-games-extra-data/Makefile @@ -3,13 +3,14 @@ # Whom: Adam Weinberger <adamw@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/games/gnomegames2-extra-data/Makefile,v 1.6 2005/09/07 15:01:43 adamw Exp $ # PORTNAME= gnomegames2-extra-data -PORTVERSION= 2.10.0 +PORTVERSION= 2.12.0 CATEGORIES= games gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-games-extra-data/2.10 +MASTER_SITE_SUBDIR= sources/gnome-games-extra-data/2.12 DISTNAME= gnome-games-extra-data-${PORTVERSION} DIST_SUBDIR= gnome2 diff --git a/games/gnome-games-extra-data/distinfo b/games/gnome-games-extra-data/distinfo index aac4e3c29660..c81762fef5e6 100644 --- a/games/gnome-games-extra-data/distinfo +++ b/games/gnome-games-extra-data/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-games-extra-data-2.10.0.tar.bz2) = 344c36ae58fa13fd4b180bd9fefe94d0 -SIZE (gnome2/gnome-games-extra-data-2.10.0.tar.bz2) = 3566365 +MD5 (gnome2/gnome-games-extra-data-2.12.0.tar.bz2) = 51b2b54c41b6d9cb1a228143723b43a1 +SIZE (gnome2/gnome-games-extra-data-2.12.0.tar.bz2) = 2644415 diff --git a/games/gnome-games-extra-data/pkg-plist b/games/gnome-games-extra-data/pkg-plist index ac96ec5afe0a..15c24fa98b90 100644 --- a/games/gnome-games-extra-data/pkg-plist +++ b/games/gnome-games-extra-data/pkg-plist @@ -28,6 +28,3 @@ share/gnome/pixmaps/mahjongg/default.png share/gnome/pixmaps/mahjongg/default2.png share/gnome/pixmaps/mahjongg/maya.png share/gnome/pixmaps/mahjongg/seta.png -@dirrm share/gnome/gnome-games/same-gnome/themes/2.10 -@dirrm share/gnome/gnome-games/same-gnome/themes -@dirrm share/gnome/gnome-games/same-gnome diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile index c0818a53d153..4da7bdda6c29 100644 --- a/games/gnome-games/Makefile +++ b/games/gnome-games/Makefile @@ -3,13 +3,14 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/games/gnomegames2/Makefile,v 1.89 2005/10/03 15:30:09 ahze Exp $ # PORTNAME= gnomegames2 -PORTVERSION= 2.10.2 +PORTVERSION= 2.12.1 CATEGORIES= games gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-games/2.10 +MASTER_SITE_SUBDIR= sources/gnome-games/2.12 DISTNAME= gnome-games-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -26,7 +27,7 @@ USE_GMAKE= yes USE_REINPLACE= yes USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui \ librsvg2 desktopfileutils -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/games/gnome-games/distinfo b/games/gnome-games/distinfo index 41d3ee66a30c..511512eb74a5 100644 --- a/games/gnome-games/distinfo +++ b/games/gnome-games/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-games-2.10.2.tar.bz2) = fa9488c0ebb34081da2433db5136d07a -SIZE (gnome2/gnome-games-2.10.2.tar.bz2) = 6471962 +MD5 (gnome2/gnome-games-2.12.1.tar.bz2) = b4870504aa1a5a759c89a2b92f1a2c21 +SIZE (gnome2/gnome-games-2.12.1.tar.bz2) = 4911510 diff --git a/games/gnome-games/pkg-install b/games/gnome-games/pkg-install index 7b1b35161239..af98af89ff24 100644 --- a/games/gnome-games/pkg-install +++ b/games/gnome-games/pkg-install @@ -5,7 +5,7 @@ PATH=/bin:/usr/bin:/usr/sbin case $2 in POST-INSTALL) mkdir -p ${PKG_PREFIX}/share/gnome/games - SCORES="glines.scores gnibbles.1.0.scores gnibbles.1.1.scores gnibbles.2.0.scores gnibbles.2.1.scores gnibbles.3.0.scores gnibbles.3.1.scores gnibbles.4.0.scores gnibbles.4.1.scores gnobots2.classic_robots-safe.scores gnobots2.classic_robots-super-safe.scores gnobots2.classic_robots.scores gnobots2.nightmare-safe.scores gnobots2.nightmare-super-safe.scores gnobots2.nightmare.scores gnobots2.robots2-safe.scores gnobots2.robots2-super-safe.scores gnobots2.robots2.scores gnobots2.robots2_easy-safe.scores gnobots2.robots2_easy-super-safe.scores gnobots2.robots2_easy.scores gnobots2.robots_with_safe_teleport-safe.scores gnobots2.robots_with_safe_teleport-super-safe.scores gnobots2.robots_with_safe_teleport.scores gnome-stones.scores gnometris.scores gnomine.Custom.scores gnomine.Large.scores gnomine.Medium.scores gnomine.Small.scores gnotravex.2x2.scores gnotravex.3x3.scores gnotravex.4x4.scores gnotravex.5x5.scores gnotravex.6x6.scores gnotski.1.scores gnotski10.scores gnotski.11.scores gnotski.12.scores gnotski.13.scores gnotski.14.scores gnotski.15.scores gnotski.16.scores gnotski.17.scores gnotski.18.scores gnotski.2.scores gnotski.20.scores gnotski.21.scores gnotski.22.scores gnotski.23.scores gnotski.24.scores gnotski.25.scores gnotski.26.scores gnotski.27.scores gnotski.28.scores gnotski.29.scores gnotski.3.scores gnotski.30.scores gnotski.31.scores gnotski.32.scores gnotski.33.scores gnotski.34.scores gnotski.35.scores gnotski.36.scores gnotski.37.score gnotski.4.scores gnotski.5.scores gnotski.6.scores gnotski.7.scores gnotski.8.scores gnotski.9.scores gtali.scores mahjongg.bridges.scores mahjongg.cloud.scores mahjongg.confounding.scores mahjongg.difficult.scores mahjongg.dragon.scores mahjongg.easy.scores mahjongg.pyramid.scores mahjongg.tictactoe.scores mahjongg.ziggurat.scores same-gnome.scores" + SCORES="glines.scores glines.Large.scores glines.Medium.scores glines.Small.scores gnibbles.1.0.scores gnibbles.1.1.scores gnibbles.2.0.scores gnibbles.2.1.scores gnibbles.3.0.scores gnibbles.3.1.scores gnibbles.4.0.scores gnibbles.4.1.scores gnobots2.classic_robots-safe.scores gnobots2.classic_robots-super-safe.scores gnobots2.classic_robots.scores gnobots2.nightmare-safe.scores gnobots2.nightmare-super-safe.scores gnobots2.nightmare.scores gnobots2.robots2-safe.scores gnobots2.robots2-super-safe.scores gnobots2.robots2.scores gnobots2.robots2_easy-safe.scores gnobots2.robots2_easy-super-safe.scores gnobots2.robots2_easy.scores gnobots2.robots_with_safe_teleport-safe.scores gnobots2.robots_with_safe_teleport-super-safe.scores gnobots2.robots_with_safe_teleport.scores gnome-stones.scores gnometris.scores gnomine.Custom.scores gnomine.Large.scores gnomine.Medium.scores gnomine.Small.scores gnotravex.2x2.scores gnotravex.3x3.scores gnotravex.4x4.scores gnotravex.5x5.scores gnotravex.6x6.scores gnotski.1.scores gnotski10.scores gnotski.11.scores gnotski.12.scores gnotski.13.scores gnotski.14.scores gnotski.15.scores gnotski.16.scores gnotski.17.scores gnotski.18.scores gnotski.2.scores gnotski.20.scores gnotski.21.scores gnotski.22.scores gnotski.23.scores gnotski.24.scores gnotski.25.scores gnotski.26.scores gnotski.27.scores gnotski.28.scores gnotski.29.scores gnotski.3.scores gnotski.30.scores gnotski.31.scores gnotski.32.scores gnotski.33.scores gnotski.34.scores gnotski.35.scores gnotski.36.scores gnotski.37.score gnotski.4.scores gnotski.5.scores gnotski.6.scores gnotski.7.scores gnotski.8.scores gnotski.9.scores gtali.scores mahjongg.bridges.scores mahjongg.cloud.scores mahjongg.confounding.scores mahjongg.difficult.scores mahjongg.dragon.scores mahjongg.easy.scores mahjongg.pyramid.scores mahjongg.tictactoe.scores mahjongg.ziggurat.scores same-gnome.scores" for i in ${SCORES}; do if [ ! -f ${PKG_PREFIX}/share/gnome/games/${i} ]; then touch -f ${PKG_PREFIX}/share/gnome/games/${i} diff --git a/games/gnome-games/pkg-plist b/games/gnome-games/pkg-plist index cb63180fc465..c97ff64b5a03 100644 --- a/games/gnome-games/pkg-plist +++ b/games/gnome-games/pkg-plist @@ -43,6 +43,9 @@ share/gnome/blackjack/Atlantic_City.rules share/gnome/blackjack/Vegas_Downtown.rules share/gnome/blackjack/Vegas_Strip.rules @unexec [ -s %D/share/gnome/games/glines.scores ] || rm -f %D/share/gnome/games/glines.scores +@unexec [ -s %D/share/gnome/games/glines.Large.scores ] || rm -f %D/share/gnome/games/glines.Large.scores +@unexec [ -s %D/share/gnome/games/glines.Medium.scores ] || rm -f %D/share/gnome/games/glines.Medium.scores +@unexec [ -s %D/share/gnome/games/glines.Small.scores ] || rm -f %D/share/gnome/games/glines.Small.scores @unexec [ -s %D/share/gnome/games/gnibbles.1.0.scores ] || rm -f %D/share/gnome/games/gnibbles.1.0.scores @unexec [ -s %D/share/gnome/games/gnibbles.1.1.scores ] || rm -f %D/share/gnome/games/gnibbles.1.1.scores @unexec [ -s %D/share/gnome/games/gnibbles.2.0.scores ] || rm -f %D/share/gnome/games/gnibbles.2.0.scores @@ -171,6 +174,7 @@ share/gnome/gnome-stones/tutorial.caves share/gnome/help/aisleriot/C/agnes.xml share/gnome/help/aisleriot/C/aisleriot.xml share/gnome/help/aisleriot/C/auld_lang_syne.xml +share/gnome/help/aisleriot/C/backbone.xml share/gnome/help/aisleriot/C/bakers_dozen.xml share/gnome/help/aisleriot/C/bakers_game.xml share/gnome/help/aisleriot/C/beleaguered_castle.xml @@ -178,6 +182,7 @@ share/gnome/help/aisleriot/C/block_ten.xml share/gnome/help/aisleriot/C/bristol.xml share/gnome/help/aisleriot/C/camelot.xml share/gnome/help/aisleriot/C/canfield.xml +share/gnome/help/aisleriot/C/carpet.xml share/gnome/help/aisleriot/C/chessboard.xml share/gnome/help/aisleriot/C/clock.xml share/gnome/help/aisleriot/C/cover.xml @@ -237,6 +242,7 @@ share/gnome/help/aisleriot/C/thieves.xml share/gnome/help/aisleriot/C/thirteen.xml share/gnome/help/aisleriot/C/thumb_and_pouch.xml share/gnome/help/aisleriot/C/treize.xml +share/gnome/help/aisleriot/C/triple_peaks.xml share/gnome/help/aisleriot/C/union_square.xml share/gnome/help/aisleriot/C/valentine.xml share/gnome/help/aisleriot/C/westhaven.xml @@ -248,6 +254,7 @@ share/gnome/help/aisleriot/C/zebra.xml share/gnome/help/aisleriot/fr/agnes.xml share/gnome/help/aisleriot/fr/aisleriot.xml share/gnome/help/aisleriot/fr/auld_lang_syne.xml +share/gnome/help/aisleriot/fr/backbone.xml share/gnome/help/aisleriot/fr/bakers_dozen.xml share/gnome/help/aisleriot/fr/bakers_game.xml share/gnome/help/aisleriot/fr/beleaguered_castle.xml @@ -255,6 +262,7 @@ share/gnome/help/aisleriot/fr/block_ten.xml share/gnome/help/aisleriot/fr/bristol.xml share/gnome/help/aisleriot/fr/camelot.xml share/gnome/help/aisleriot/fr/canfield.xml +share/gnome/help/aisleriot/fr/carpet.xml share/gnome/help/aisleriot/fr/chessboard.xml share/gnome/help/aisleriot/fr/clock.xml share/gnome/help/aisleriot/fr/cover.xml @@ -312,6 +320,7 @@ share/gnome/help/aisleriot/fr/streets_and_alleys.xml share/gnome/help/aisleriot/fr/ten_across.xml share/gnome/help/aisleriot/fr/thieves.xml share/gnome/help/aisleriot/fr/thirteen.xml +share/gnome/help/aisleriot/fr/triple_peaks.xml share/gnome/help/aisleriot/fr/thumb_and_pouch.xml share/gnome/help/aisleriot/fr/treize.xml share/gnome/help/aisleriot/fr/union_square.xml @@ -398,7 +407,6 @@ share/gnome/help/iagno/C/figures/START.png share/gnome/help/iagno/C/iagno.xml share/gnome/help/iagno/C/legal.xml share/gnome/help/mahjongg/C/figures/mahjongg.png -share/gnome/help/mahjongg/C/figures/no-match.png share/gnome/help/mahjongg/C/figures/no-move.png share/gnome/help/mahjongg/C/figures/preferences.png share/gnome/help/mahjongg/C/figures/toolbar.png @@ -449,10 +457,11 @@ share/gnome/pixmaps/gnect/bg_grotty.jpg share/gnome/pixmaps/gnect/bg_nightfall.jpg share/gnome/pixmaps/gnect/bg_toplight.png share/gnome/pixmaps/gnect/tileset_50x50_catseyes.png -share/gnome/pixmaps/gnect/tileset_50x50_classic.png share/gnome/pixmaps/gnect/tileset_50x50_glassy.png -share/gnome/pixmaps/gnect/tileset_50x50_hcontrast.png +share/gnome/pixmaps/gnect/tileset_50x50_hcinverse.svg +share/gnome/pixmaps/gnect/tileset_50x50_hcontrast.svg share/gnome/pixmaps/gnect/tileset_50x50_square.png +share/gnome/pixmaps/gnect/tileset_50x50_sunspot.svg share/gnome/pixmaps/gnibbles/blank.svg share/gnome/pixmaps/gnibbles/bonus1.svg share/gnome/pixmaps/gnibbles/bonus2.svg @@ -522,6 +531,7 @@ share/gnome/pixmaps/gnome-stones/title-tile.png share/gnome/pixmaps/gnome-stones/wall.png share/gnome/pixmaps/gnometris/7blocks-gw.png share/gnome/pixmaps/gnometris/7blocks-tig.png +share/gnome/pixmaps/gnomine/bang.svg share/gnome/pixmaps/gnomine/face-cool.png share/gnome/pixmaps/gnomine/face-sad.png share/gnome/pixmaps/gnomine/face-smile.png @@ -548,12 +558,14 @@ share/gnome/pixmaps/rteleport.png share/gnome/pixmaps/teleport.png share/gnome/sol-games/agnes.scm share/gnome/sol-games/auld_lang_syne.scm +share/gnome/sol-games/backbone.scm share/gnome/sol-games/bakers_dozen.scm share/gnome/sol-games/bakers_game.scm share/gnome/sol-games/beleaguered_castle.scm share/gnome/sol-games/bristol.scm share/gnome/sol-games/camelot.scm share/gnome/sol-games/canfield.scm +share/gnome/sol-games/carpet.scm share/gnome/sol-games/chessboard.scm share/gnome/sol-games/clock.scm share/gnome/sol-games/cover.scm @@ -611,6 +623,7 @@ share/gnome/sol-games/thieves.scm share/gnome/sol-games/thirteen.scm share/gnome/sol-games/thumb_and_pouch.scm share/gnome/sol-games/treize.scm +share/gnome/sol-games/triple_peaks.scm share/gnome/sol-games/union_square.scm share/gnome/sol-games/valentine.scm share/gnome/sol-games/westhaven.scm @@ -683,6 +696,7 @@ share/locale/ml/LC_MESSAGES/gnome-games.mo share/locale/mn/LC_MESSAGES/gnome-games.mo share/locale/ms/LC_MESSAGES/gnome-games.mo share/locale/nb/LC_MESSAGES/gnome-games.mo +share/locale/ne/LC_MESSAGES/gnome-games.mo share/locale/nl/LC_MESSAGES/gnome-games.mo share/locale/nn/LC_MESSAGES/gnome-games.mo share/locale/no/LC_MESSAGES/gnome-games.mo diff --git a/games/gnomegames2-extra-data/Makefile b/games/gnomegames2-extra-data/Makefile index f9b6017459aa..1b2ea3165e42 100644 --- a/games/gnomegames2-extra-data/Makefile +++ b/games/gnomegames2-extra-data/Makefile @@ -3,13 +3,14 @@ # Whom: Adam Weinberger <adamw@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/games/gnomegames2-extra-data/Makefile,v 1.6 2005/09/07 15:01:43 adamw Exp $ # PORTNAME= gnomegames2-extra-data -PORTVERSION= 2.10.0 +PORTVERSION= 2.12.0 CATEGORIES= games gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-games-extra-data/2.10 +MASTER_SITE_SUBDIR= sources/gnome-games-extra-data/2.12 DISTNAME= gnome-games-extra-data-${PORTVERSION} DIST_SUBDIR= gnome2 diff --git a/games/gnomegames2-extra-data/distinfo b/games/gnomegames2-extra-data/distinfo index aac4e3c29660..c81762fef5e6 100644 --- a/games/gnomegames2-extra-data/distinfo +++ b/games/gnomegames2-extra-data/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-games-extra-data-2.10.0.tar.bz2) = 344c36ae58fa13fd4b180bd9fefe94d0 -SIZE (gnome2/gnome-games-extra-data-2.10.0.tar.bz2) = 3566365 +MD5 (gnome2/gnome-games-extra-data-2.12.0.tar.bz2) = 51b2b54c41b6d9cb1a228143723b43a1 +SIZE (gnome2/gnome-games-extra-data-2.12.0.tar.bz2) = 2644415 diff --git a/games/gnomegames2-extra-data/pkg-plist b/games/gnomegames2-extra-data/pkg-plist index ac96ec5afe0a..15c24fa98b90 100644 --- a/games/gnomegames2-extra-data/pkg-plist +++ b/games/gnomegames2-extra-data/pkg-plist @@ -28,6 +28,3 @@ share/gnome/pixmaps/mahjongg/default.png share/gnome/pixmaps/mahjongg/default2.png share/gnome/pixmaps/mahjongg/maya.png share/gnome/pixmaps/mahjongg/seta.png -@dirrm share/gnome/gnome-games/same-gnome/themes/2.10 -@dirrm share/gnome/gnome-games/same-gnome/themes -@dirrm share/gnome/gnome-games/same-gnome diff --git a/games/gnomegames2/Makefile b/games/gnomegames2/Makefile index c0818a53d153..4da7bdda6c29 100644 --- a/games/gnomegames2/Makefile +++ b/games/gnomegames2/Makefile @@ -3,13 +3,14 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/games/gnomegames2/Makefile,v 1.89 2005/10/03 15:30:09 ahze Exp $ # PORTNAME= gnomegames2 -PORTVERSION= 2.10.2 +PORTVERSION= 2.12.1 CATEGORIES= games gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-games/2.10 +MASTER_SITE_SUBDIR= sources/gnome-games/2.12 DISTNAME= gnome-games-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -26,7 +27,7 @@ USE_GMAKE= yes USE_REINPLACE= yes USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui \ librsvg2 desktopfileutils -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/games/gnomegames2/distinfo b/games/gnomegames2/distinfo index 41d3ee66a30c..511512eb74a5 100644 --- a/games/gnomegames2/distinfo +++ b/games/gnomegames2/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-games-2.10.2.tar.bz2) = fa9488c0ebb34081da2433db5136d07a -SIZE (gnome2/gnome-games-2.10.2.tar.bz2) = 6471962 +MD5 (gnome2/gnome-games-2.12.1.tar.bz2) = b4870504aa1a5a759c89a2b92f1a2c21 +SIZE (gnome2/gnome-games-2.12.1.tar.bz2) = 4911510 diff --git a/games/gnomegames2/pkg-install b/games/gnomegames2/pkg-install index 7b1b35161239..af98af89ff24 100644 --- a/games/gnomegames2/pkg-install +++ b/games/gnomegames2/pkg-install @@ -5,7 +5,7 @@ PATH=/bin:/usr/bin:/usr/sbin case $2 in POST-INSTALL) mkdir -p ${PKG_PREFIX}/share/gnome/games - SCORES="glines.scores gnibbles.1.0.scores gnibbles.1.1.scores gnibbles.2.0.scores gnibbles.2.1.scores gnibbles.3.0.scores gnibbles.3.1.scores gnibbles.4.0.scores gnibbles.4.1.scores gnobots2.classic_robots-safe.scores gnobots2.classic_robots-super-safe.scores gnobots2.classic_robots.scores gnobots2.nightmare-safe.scores gnobots2.nightmare-super-safe.scores gnobots2.nightmare.scores gnobots2.robots2-safe.scores gnobots2.robots2-super-safe.scores gnobots2.robots2.scores gnobots2.robots2_easy-safe.scores gnobots2.robots2_easy-super-safe.scores gnobots2.robots2_easy.scores gnobots2.robots_with_safe_teleport-safe.scores gnobots2.robots_with_safe_teleport-super-safe.scores gnobots2.robots_with_safe_teleport.scores gnome-stones.scores gnometris.scores gnomine.Custom.scores gnomine.Large.scores gnomine.Medium.scores gnomine.Small.scores gnotravex.2x2.scores gnotravex.3x3.scores gnotravex.4x4.scores gnotravex.5x5.scores gnotravex.6x6.scores gnotski.1.scores gnotski10.scores gnotski.11.scores gnotski.12.scores gnotski.13.scores gnotski.14.scores gnotski.15.scores gnotski.16.scores gnotski.17.scores gnotski.18.scores gnotski.2.scores gnotski.20.scores gnotski.21.scores gnotski.22.scores gnotski.23.scores gnotski.24.scores gnotski.25.scores gnotski.26.scores gnotski.27.scores gnotski.28.scores gnotski.29.scores gnotski.3.scores gnotski.30.scores gnotski.31.scores gnotski.32.scores gnotski.33.scores gnotski.34.scores gnotski.35.scores gnotski.36.scores gnotski.37.score gnotski.4.scores gnotski.5.scores gnotski.6.scores gnotski.7.scores gnotski.8.scores gnotski.9.scores gtali.scores mahjongg.bridges.scores mahjongg.cloud.scores mahjongg.confounding.scores mahjongg.difficult.scores mahjongg.dragon.scores mahjongg.easy.scores mahjongg.pyramid.scores mahjongg.tictactoe.scores mahjongg.ziggurat.scores same-gnome.scores" + SCORES="glines.scores glines.Large.scores glines.Medium.scores glines.Small.scores gnibbles.1.0.scores gnibbles.1.1.scores gnibbles.2.0.scores gnibbles.2.1.scores gnibbles.3.0.scores gnibbles.3.1.scores gnibbles.4.0.scores gnibbles.4.1.scores gnobots2.classic_robots-safe.scores gnobots2.classic_robots-super-safe.scores gnobots2.classic_robots.scores gnobots2.nightmare-safe.scores gnobots2.nightmare-super-safe.scores gnobots2.nightmare.scores gnobots2.robots2-safe.scores gnobots2.robots2-super-safe.scores gnobots2.robots2.scores gnobots2.robots2_easy-safe.scores gnobots2.robots2_easy-super-safe.scores gnobots2.robots2_easy.scores gnobots2.robots_with_safe_teleport-safe.scores gnobots2.robots_with_safe_teleport-super-safe.scores gnobots2.robots_with_safe_teleport.scores gnome-stones.scores gnometris.scores gnomine.Custom.scores gnomine.Large.scores gnomine.Medium.scores gnomine.Small.scores gnotravex.2x2.scores gnotravex.3x3.scores gnotravex.4x4.scores gnotravex.5x5.scores gnotravex.6x6.scores gnotski.1.scores gnotski10.scores gnotski.11.scores gnotski.12.scores gnotski.13.scores gnotski.14.scores gnotski.15.scores gnotski.16.scores gnotski.17.scores gnotski.18.scores gnotski.2.scores gnotski.20.scores gnotski.21.scores gnotski.22.scores gnotski.23.scores gnotski.24.scores gnotski.25.scores gnotski.26.scores gnotski.27.scores gnotski.28.scores gnotski.29.scores gnotski.3.scores gnotski.30.scores gnotski.31.scores gnotski.32.scores gnotski.33.scores gnotski.34.scores gnotski.35.scores gnotski.36.scores gnotski.37.score gnotski.4.scores gnotski.5.scores gnotski.6.scores gnotski.7.scores gnotski.8.scores gnotski.9.scores gtali.scores mahjongg.bridges.scores mahjongg.cloud.scores mahjongg.confounding.scores mahjongg.difficult.scores mahjongg.dragon.scores mahjongg.easy.scores mahjongg.pyramid.scores mahjongg.tictactoe.scores mahjongg.ziggurat.scores same-gnome.scores" for i in ${SCORES}; do if [ ! -f ${PKG_PREFIX}/share/gnome/games/${i} ]; then touch -f ${PKG_PREFIX}/share/gnome/games/${i} diff --git a/games/gnomegames2/pkg-plist b/games/gnomegames2/pkg-plist index cb63180fc465..c97ff64b5a03 100644 --- a/games/gnomegames2/pkg-plist +++ b/games/gnomegames2/pkg-plist @@ -43,6 +43,9 @@ share/gnome/blackjack/Atlantic_City.rules share/gnome/blackjack/Vegas_Downtown.rules share/gnome/blackjack/Vegas_Strip.rules @unexec [ -s %D/share/gnome/games/glines.scores ] || rm -f %D/share/gnome/games/glines.scores +@unexec [ -s %D/share/gnome/games/glines.Large.scores ] || rm -f %D/share/gnome/games/glines.Large.scores +@unexec [ -s %D/share/gnome/games/glines.Medium.scores ] || rm -f %D/share/gnome/games/glines.Medium.scores +@unexec [ -s %D/share/gnome/games/glines.Small.scores ] || rm -f %D/share/gnome/games/glines.Small.scores @unexec [ -s %D/share/gnome/games/gnibbles.1.0.scores ] || rm -f %D/share/gnome/games/gnibbles.1.0.scores @unexec [ -s %D/share/gnome/games/gnibbles.1.1.scores ] || rm -f %D/share/gnome/games/gnibbles.1.1.scores @unexec [ -s %D/share/gnome/games/gnibbles.2.0.scores ] || rm -f %D/share/gnome/games/gnibbles.2.0.scores @@ -171,6 +174,7 @@ share/gnome/gnome-stones/tutorial.caves share/gnome/help/aisleriot/C/agnes.xml share/gnome/help/aisleriot/C/aisleriot.xml share/gnome/help/aisleriot/C/auld_lang_syne.xml +share/gnome/help/aisleriot/C/backbone.xml share/gnome/help/aisleriot/C/bakers_dozen.xml share/gnome/help/aisleriot/C/bakers_game.xml share/gnome/help/aisleriot/C/beleaguered_castle.xml @@ -178,6 +182,7 @@ share/gnome/help/aisleriot/C/block_ten.xml share/gnome/help/aisleriot/C/bristol.xml share/gnome/help/aisleriot/C/camelot.xml share/gnome/help/aisleriot/C/canfield.xml +share/gnome/help/aisleriot/C/carpet.xml share/gnome/help/aisleriot/C/chessboard.xml share/gnome/help/aisleriot/C/clock.xml share/gnome/help/aisleriot/C/cover.xml @@ -237,6 +242,7 @@ share/gnome/help/aisleriot/C/thieves.xml share/gnome/help/aisleriot/C/thirteen.xml share/gnome/help/aisleriot/C/thumb_and_pouch.xml share/gnome/help/aisleriot/C/treize.xml +share/gnome/help/aisleriot/C/triple_peaks.xml share/gnome/help/aisleriot/C/union_square.xml share/gnome/help/aisleriot/C/valentine.xml share/gnome/help/aisleriot/C/westhaven.xml @@ -248,6 +254,7 @@ share/gnome/help/aisleriot/C/zebra.xml share/gnome/help/aisleriot/fr/agnes.xml share/gnome/help/aisleriot/fr/aisleriot.xml share/gnome/help/aisleriot/fr/auld_lang_syne.xml +share/gnome/help/aisleriot/fr/backbone.xml share/gnome/help/aisleriot/fr/bakers_dozen.xml share/gnome/help/aisleriot/fr/bakers_game.xml share/gnome/help/aisleriot/fr/beleaguered_castle.xml @@ -255,6 +262,7 @@ share/gnome/help/aisleriot/fr/block_ten.xml share/gnome/help/aisleriot/fr/bristol.xml share/gnome/help/aisleriot/fr/camelot.xml share/gnome/help/aisleriot/fr/canfield.xml +share/gnome/help/aisleriot/fr/carpet.xml share/gnome/help/aisleriot/fr/chessboard.xml share/gnome/help/aisleriot/fr/clock.xml share/gnome/help/aisleriot/fr/cover.xml @@ -312,6 +320,7 @@ share/gnome/help/aisleriot/fr/streets_and_alleys.xml share/gnome/help/aisleriot/fr/ten_across.xml share/gnome/help/aisleriot/fr/thieves.xml share/gnome/help/aisleriot/fr/thirteen.xml +share/gnome/help/aisleriot/fr/triple_peaks.xml share/gnome/help/aisleriot/fr/thumb_and_pouch.xml share/gnome/help/aisleriot/fr/treize.xml share/gnome/help/aisleriot/fr/union_square.xml @@ -398,7 +407,6 @@ share/gnome/help/iagno/C/figures/START.png share/gnome/help/iagno/C/iagno.xml share/gnome/help/iagno/C/legal.xml share/gnome/help/mahjongg/C/figures/mahjongg.png -share/gnome/help/mahjongg/C/figures/no-match.png share/gnome/help/mahjongg/C/figures/no-move.png share/gnome/help/mahjongg/C/figures/preferences.png share/gnome/help/mahjongg/C/figures/toolbar.png @@ -449,10 +457,11 @@ share/gnome/pixmaps/gnect/bg_grotty.jpg share/gnome/pixmaps/gnect/bg_nightfall.jpg share/gnome/pixmaps/gnect/bg_toplight.png share/gnome/pixmaps/gnect/tileset_50x50_catseyes.png -share/gnome/pixmaps/gnect/tileset_50x50_classic.png share/gnome/pixmaps/gnect/tileset_50x50_glassy.png -share/gnome/pixmaps/gnect/tileset_50x50_hcontrast.png +share/gnome/pixmaps/gnect/tileset_50x50_hcinverse.svg +share/gnome/pixmaps/gnect/tileset_50x50_hcontrast.svg share/gnome/pixmaps/gnect/tileset_50x50_square.png +share/gnome/pixmaps/gnect/tileset_50x50_sunspot.svg share/gnome/pixmaps/gnibbles/blank.svg share/gnome/pixmaps/gnibbles/bonus1.svg share/gnome/pixmaps/gnibbles/bonus2.svg @@ -522,6 +531,7 @@ share/gnome/pixmaps/gnome-stones/title-tile.png share/gnome/pixmaps/gnome-stones/wall.png share/gnome/pixmaps/gnometris/7blocks-gw.png share/gnome/pixmaps/gnometris/7blocks-tig.png +share/gnome/pixmaps/gnomine/bang.svg share/gnome/pixmaps/gnomine/face-cool.png share/gnome/pixmaps/gnomine/face-sad.png share/gnome/pixmaps/gnomine/face-smile.png @@ -548,12 +558,14 @@ share/gnome/pixmaps/rteleport.png share/gnome/pixmaps/teleport.png share/gnome/sol-games/agnes.scm share/gnome/sol-games/auld_lang_syne.scm +share/gnome/sol-games/backbone.scm share/gnome/sol-games/bakers_dozen.scm share/gnome/sol-games/bakers_game.scm share/gnome/sol-games/beleaguered_castle.scm share/gnome/sol-games/bristol.scm share/gnome/sol-games/camelot.scm share/gnome/sol-games/canfield.scm +share/gnome/sol-games/carpet.scm share/gnome/sol-games/chessboard.scm share/gnome/sol-games/clock.scm share/gnome/sol-games/cover.scm @@ -611,6 +623,7 @@ share/gnome/sol-games/thieves.scm share/gnome/sol-games/thirteen.scm share/gnome/sol-games/thumb_and_pouch.scm share/gnome/sol-games/treize.scm +share/gnome/sol-games/triple_peaks.scm share/gnome/sol-games/union_square.scm share/gnome/sol-games/valentine.scm share/gnome/sol-games/westhaven.scm @@ -683,6 +696,7 @@ share/locale/ml/LC_MESSAGES/gnome-games.mo share/locale/mn/LC_MESSAGES/gnome-games.mo share/locale/ms/LC_MESSAGES/gnome-games.mo share/locale/nb/LC_MESSAGES/gnome-games.mo +share/locale/ne/LC_MESSAGES/gnome-games.mo share/locale/nl/LC_MESSAGES/gnome-games.mo share/locale/nn/LC_MESSAGES/gnome-games.mo share/locale/no/LC_MESSAGES/gnome-games.mo diff --git a/graphics/cairo/Makefile b/graphics/cairo/Makefile index e7c86885f9e4..5c6c9822b909 100644 --- a/graphics/cairo/Makefile +++ b/graphics/cairo/Makefile @@ -3,27 +3,28 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/graphics/cairo/Makefile,v 1.30 2005/10/04 04:35:57 ahze Exp $ # PORTNAME= cairo -PORTVERSION= 0.4.0 +PORTVERSION= 1.0.2 CATEGORIES= graphics -MASTER_SITES= http://cairographics.org/snapshots/ +MASTER_SITES= http://cairographics.org/releases/ MAINTAINER= gnome@FreeBSD.org COMMENT= Vector graphics library with cross-device output support -LIB_DEPENDS= pixman.1:${PORTSDIR}/graphics/libpixman \ - freetype.9:${PORTSDIR}/print/freetype2 \ +LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \ png.5:${PORTSDIR}/graphics/png \ fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig -USE_GNOME= gnometarget gnomehack -USE_LIBTOOL_VER=15 +CONFIGURE_ARGS= --with-html-dir=${DOCSDIR} \ + --enable-pdf \ + --enable-ps +USE_GNOME= gnometarget gnomehack ltverhack +USE_AUTOTOOLS= libtool:15 INSTALLS_SHLIB= yes -CONFIGURE_ARGS= --with-html-dir=${DOCSDIR} - CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS} -I${X11BASE}/include" \ LDFLAGS="${PTHREAD_LIBS}" @@ -31,10 +32,12 @@ OPTIONS+= GLITZ "Enable Glitz OpenGL Support" Off .include <bsd.port.pre.mk> -.if defined(WITH_GLITZ) || exists(${LOCALBASE}/lib/libglitz.a) +.if defined(WITH_GLITZ) LIB_DEPENDS+= glitz-glx.1:${PORTSDIR}/graphics/glitz +CONFIGURE_ARGS+= --enable-glitz PLIST_SUB+= GLITZ="" .else +CONFIGURE_ARGS+= --disable-glitz PLIST_SUB+= GLITZ="@comment " .endif @@ -49,7 +52,10 @@ PLIST_SUB+= X11="" post-patch: .if ${OSVERSION} < 500000 @${REINPLACE_CMD} -e 's|stdint.h|inttypes.h|' \ - ${WRKSRC}/src/*.* + ${WRKSRC}/src/*.* \ + ${WRKSRC}/pixman/src/*.* .endif + @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|' \ + ${WRKSRC}/test/Makefile.in .include <bsd.port.post.mk> diff --git a/graphics/cairo/distinfo b/graphics/cairo/distinfo index 3243e4b2e893..bd6f30e26f2e 100644 --- a/graphics/cairo/distinfo +++ b/graphics/cairo/distinfo @@ -1,2 +1,2 @@ -MD5 (cairo-0.4.0.tar.gz) = 2c76c6f6717cb5fc7398eb2e0f9cb025 -SIZE (cairo-0.4.0.tar.gz) = 781463 +MD5 (cairo-1.0.2.tar.gz) = d0b7111a14f90ec3afa777ec40c44984 +SIZE (cairo-1.0.2.tar.gz) = 1458903 diff --git a/graphics/cairo/files/patch-src_cairo-ft-font.c b/graphics/cairo/files/patch-src_cairo-ft-font.c new file mode 100644 index 000000000000..8cd60665fef0 --- /dev/null +++ b/graphics/cairo/files/patch-src_cairo-ft-font.c @@ -0,0 +1,28 @@ +--- src/cairo-ft-font.c.orig Tue Aug 16 14:46:46 2005 ++++ src/cairo-ft-font.c Tue Aug 16 14:46:59 2005 +@@ -44,6 +44,11 @@ + #include <fontconfig/fontconfig.h> + #include <fontconfig/fcfreetype.h> + ++#include <sys/types.h> ++#include <stdlib.h> ++#include <time.h> ++#include <unistd.h> ++ + #include <ft2build.h> + #include FT_FREETYPE_H + #include FT_OUTLINE_H +@@ -257,7 +262,12 @@ _cairo_ft_unscaled_font_init_key (cairo_ + key->id = id; + + /* 1607 is just an arbitrary prime. */ +- hash = _cairo_hash_string (filename); ++ if (filename != NULL) { ++ hash = _cairo_hash_string (filename); ++ } else { ++ srandom(time(NULL) * getpid()); ++ hash = random(); ++ } + hash += ((unsigned long) id) * 1607; + + key->base.hash_entry.hash = hash; diff --git a/graphics/cairo/pkg-plist b/graphics/cairo/pkg-plist index aec401c94fa9..437d0b55b4b7 100644 --- a/graphics/cairo/pkg-plist +++ b/graphics/cairo/pkg-plist @@ -2,32 +2,55 @@ include/cairo/cairo-features.h include/cairo/cairo-ft.h %%GLITZ%%include/cairo/cairo-glitz.h include/cairo/cairo-pdf.h -include/cairo/cairo-png.h include/cairo/cairo-ps.h +%%X11%%include/cairo/cairo-xlib-xrender.h %%X11%%include/cairo/cairo-xlib.h include/cairo/cairo.h lib/libcairo.a lib/libcairo.so -lib/libcairo.so.1 +lib/libcairo.so.2 libdata/pkgconfig/cairo.pc -%%DOCSDIR%%/cairo/cairo-ATSUI-Fonts.html +%%DOCSDIR%%/cairo/Drawing.html +%%DOCSDIR%%/cairo/Fonts.html +%%DOCSDIR%%/cairo/Support.html +%%DOCSDIR%%/cairo/Surfaces.html +%%DOCSDIR%%/cairo/bindings-errors.html +%%DOCSDIR%%/cairo/bindings-fonts.html +%%DOCSDIR%%/cairo/bindings-memory.html +%%DOCSDIR%%/cairo/bindings-overloading.html +%%DOCSDIR%%/cairo/bindings-path.html +%%DOCSDIR%%/cairo/bindings-patterns.html +%%DOCSDIR%%/cairo/bindings-return-values.html +%%DOCSDIR%%/cairo/bindings-streams.html +%%DOCSDIR%%/cairo/bindings-surfaces.html +%%DOCSDIR%%/cairo/cairo-Error-handling.html +%%DOCSDIR%%/cairo/cairo-Font-Options.html %%DOCSDIR%%/cairo/cairo-FreeType-Fonts.html -%%DOCSDIR%%/cairo/cairo-Glitz-backend.html -%%DOCSDIR%%/cairo/cairo-Microsoft-Windows-Backend.html -%%DOCSDIR%%/cairo/cairo-PDF-Backend.html -%%DOCSDIR%%/cairo/cairo-PNG-Backend.html -%%DOCSDIR%%/cairo/cairo-PS-Backend.html -%%DOCSDIR%%/cairo/cairo-Quartz-Backend.html -%%DOCSDIR%%/cairo/cairo-XCB-Backend.html -%%DOCSDIR%%/cairo/cairo-XLib-Backend.html +%%DOCSDIR%%/cairo/cairo-Glitz-Surfaces.html +%%DOCSDIR%%/cairo/cairo-Image-Surfaces.html +%%DOCSDIR%%/cairo/cairo-PDF-Surfaces.html +%%DOCSDIR%%/cairo/cairo-PNG-Support.html +%%DOCSDIR%%/cairo/cairo-Paths.html +%%DOCSDIR%%/cairo/cairo-Patterns.html +%%DOCSDIR%%/cairo/cairo-PostScript-Surfaces.html +%%DOCSDIR%%/cairo/cairo-Scaled-Fonts.html +%%DOCSDIR%%/cairo/cairo-Text.html +%%DOCSDIR%%/cairo/cairo-Transformations.html +%%DOCSDIR%%/cairo/cairo-Types.html +%%DOCSDIR%%/cairo/cairo-Version-Information.html +%%DOCSDIR%%/cairo/cairo-Win32-Fonts.html +%%DOCSDIR%%/cairo/cairo-Win32-Surfaces.html +%%DOCSDIR%%/cairo/cairo-XLib-Surfaces.html +%%DOCSDIR%%/cairo/cairo-cairo-font-face-t.html %%DOCSDIR%%/cairo/cairo-cairo-matrix-t.html -%%DOCSDIR%%/cairo/cairo-cairo-pattern-t.html %%DOCSDIR%%/cairo/cairo-cairo-surface-t.html %%DOCSDIR%%/cairo/cairo-cairo-t.html %%DOCSDIR%%/cairo/cairo.devhelp %%DOCSDIR%%/cairo/home.png %%DOCSDIR%%/cairo/index.html %%DOCSDIR%%/cairo/index.sgml +%%DOCSDIR%%/cairo/ix01.html +%%DOCSDIR%%/cairo/language-bindings.html %%DOCSDIR%%/cairo/left.png %%DOCSDIR%%/cairo/pt01.html %%DOCSDIR%%/cairo/pt02.html diff --git a/graphics/eog/Makefile b/graphics/eog/Makefile index f1ff2b2702f5..75a3ba5ecf3e 100644 --- a/graphics/eog/Makefile +++ b/graphics/eog/Makefile @@ -3,13 +3,14 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/graphics/eog/Makefile,v 1.9 2005/10/04 03:00:35 ahze Exp $ # PORTNAME= eog -PORTVERSION= 2.10.2 +PORTVERSION= 2.12.1 CATEGORIES= graphics gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.10 +MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.12 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -22,7 +23,7 @@ USE_GNOME= gnomeprefix gnomehack intlhack libgnomeprintui \ librsvg2 desktopfileutils libgnomeui USE_X_PREFIX= yes INSTALLS_OMF= yes -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" @@ -30,6 +31,10 @@ GCONF_SCHEMAS= eog.schemas .include <bsd.port.pre.mk> +.if defined(PACKAGE_BUILDING) || defined(PARALLEL_PACKAGE_BUILD) +WITH_EXIF= yes +.endif + .if defined(WITH_EXIF) || exists(${LOCALBASE}/lib/libexif.so.12) LIB_DEPENDS+= exif.12:${PORTSDIR}/graphics/libexif .endif diff --git a/graphics/eog/distinfo b/graphics/eog/distinfo index b370fc72f13f..53ebdf94e042 100644 --- a/graphics/eog/distinfo +++ b/graphics/eog/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/eog-2.10.2.tar.bz2) = 09884ebaf4d520195093b2a516252579 -SIZE (gnome2/eog-2.10.2.tar.bz2) = 870480 +MD5 (gnome2/eog-2.12.1.tar.bz2) = d5dc20850777bb85ec90ff92817106dd +SIZE (gnome2/eog-2.12.1.tar.bz2) = 799227 diff --git a/graphics/eog/files/patch-libeog_eog-image-list.c b/graphics/eog/files/patch-libeog_eog-image-list.c new file mode 100644 index 000000000000..609cd0469a4e --- /dev/null +++ b/graphics/eog/files/patch-libeog_eog-image-list.c @@ -0,0 +1,17 @@ +--- libeog/eog-image-list.c.orig Thu Aug 25 14:57:02 2005 ++++ libeog/eog-image-list.c Thu Aug 25 14:57:46 2005 +@@ -450,12 +450,13 @@ + case GNOME_VFS_MONITOR_EVENT_CREATED: + + if (list && list->priv) { ++ gchar *str; + node = list->priv->store; + + while (node != NULL && !found) { + + uri = eog_image_get_uri(node->data); +- gchar *str = gnome_vfs_uri_to_string ++ str = gnome_vfs_uri_to_string + (uri, GNOME_VFS_URI_HIDE_NONE); + found = (strcmp (str, info_uri)==0)?TRUE:FALSE; + g_free (str); diff --git a/graphics/eog/pkg-plist b/graphics/eog/pkg-plist index b1d8e407371a..9ab737a65952 100644 --- a/graphics/eog/pkg-plist +++ b/graphics/eog/pkg-plist @@ -30,6 +30,10 @@ share/gnome/help/eog/ko/legal.xml share/gnome/help/eog/sv/eog.xml share/gnome/help/eog/sv/figures/eog_start_window.png share/gnome/help/eog/sv/legal.xml +share/gnome/help/eog/uk/eog.xml +share/gnome/help/eog/uk/figures/eog_save_as_window.png +share/gnome/help/eog/uk/figures/eog_start_window.png +share/gnome/help/eog/uk/legal.xml share/gnome/help/eog/zh_CN/eog.xml share/gnome/help/eog/zh_CN/figures/eog_start_window.png share/gnome/help/eog/zh_CN/legal.xml @@ -45,6 +49,7 @@ share/gnome/omf/eog/eog-it.omf share/gnome/omf/eog/eog-ja.omf share/gnome/omf/eog/eog-ko.omf share/gnome/omf/eog/eog-sv.omf +share/gnome/omf/eog/eog-uk.omf share/gnome/omf/eog/eog-zh_CN.omf share/gnome/omf/eog/eog-zh_TW.omf share/gnome/pixmaps/eog/down-right.png @@ -93,6 +98,7 @@ share/locale/it/LC_MESSAGES/eog.mo share/locale/ja/LC_MESSAGES/eog.mo share/locale/kn/LC_MESSAGES/eog.mo share/locale/ko/LC_MESSAGES/eog.mo +share/locale/ku/LC_MESSAGES/eog.mo share/locale/lt/LC_MESSAGES/eog.mo share/locale/lv/LC_MESSAGES/eog.mo share/locale/mk/LC_MESSAGES/eog.mo @@ -123,6 +129,7 @@ share/locale/ta/LC_MESSAGES/eog.mo share/locale/th/LC_MESSAGES/eog.mo share/locale/tk/LC_MESSAGES/eog.mo share/locale/tr/LC_MESSAGES/eog.mo +share/locale/ug/LC_MESSAGES/eog.mo share/locale/uk/LC_MESSAGES/eog.mo share/locale/vi/LC_MESSAGES/eog.mo share/locale/wa/LC_MESSAGES/eog.mo @@ -134,16 +141,22 @@ share/locale/zu/LC_MESSAGES/eog.mo @unexec rmdir %D/share/locale/zu 2> /dev/null || true @unexec rmdir %D/share/locale/xh/LC_MESSAGES 2> /dev/null || true @unexec rmdir %D/share/locale/xh 2> /dev/null || true +@unexec rmdir %D/share/locale/ug/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/ug 2> /dev/null || true @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/nso/LC_MESSAGES 2> /dev/null || true @unexec rmdir %D/share/locale/nso 2> /dev/null || true +@unexec rmdir %D/share/locale/ku/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/ku 2> /dev/null || true @dirrm share/gnome/pixmaps/eog @dirrm share/gnome/omf/eog @dirrm share/gnome/help/eog/zh_TW/figures @dirrm share/gnome/help/eog/zh_TW @dirrm share/gnome/help/eog/zh_CN/figures @dirrm share/gnome/help/eog/zh_CN +@dirrm share/gnome/help/eog/uk/figures +@dirrm share/gnome/help/eog/uk @dirrm share/gnome/help/eog/sv/figures @dirrm share/gnome/help/eog/sv @dirrm share/gnome/help/eog/ko/figures diff --git a/graphics/evince/Makefile b/graphics/evince/Makefile index 42d8fb1e39c1..190410c12660 100644 --- a/graphics/evince/Makefile +++ b/graphics/evince/Makefile @@ -3,13 +3,15 @@ # Whom: Adam Weinberger <adamw@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/graphics/evince/Makefile,v 1.35 2005/10/20 01:37:54 ahze Exp $ # PORTNAME= evince -PORTVERSION= 0.3.0 +PORTVERSION= 0.4.0 +PORTREVISION= 2 CATEGORIES= graphics print gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.3 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.4 MAINTAINER= gnome@FreeBSD.org COMMENT= GNOME 2 multi-format document viewer @@ -17,38 +19,78 @@ COMMENT= GNOME 2 multi-format document viewer LIB_DEPENDS= poppler.0:${PORTSDIR}/graphics/poppler USE_BZIP2= yes -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 +USE_REINPLACE= yes USE_X_PREFIX= yes USE_GMAKE= yes USE_GHOSTSCRIPT=yes INSTALLS_OMF= yes USE_GNOME= gnomehack intlhack gnomeprefix libgnomeui libgnomeprintui \ - desktopfileutils + desktopfileutils gnomedocutils CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" GCONF_SCHEMAS= evince.schemas evince-thumbnailer.schemas +OPTIONS= DVI "Enable DVI viewer support" off \ + T1LIB "Enable T1LIB for TYPE1 fonts to DVI (Enables DVI)" off \ + NAUTILUS "Enable Nautilus plugin" on \ + DBUS "Enable D-BUS support" off \ + DJVU "Enable DJVU support" off + +.include <bsd.port.pre.mk> + +.if defined(PACKAGE_BUILDING) || defined(PARALLEL_PACKAGE_BUILD) \ + || exists(${LOCALBASE}/lib/libdbus-glib-1.so) +WITH_DBUS= yes +.endif + +.if defined(WITH_DVI) || defined(WITH_T1LIB) +BUILD_DEPENDS+= tex:${PORTSDIR}/print/teTeX-base +RUN_DEPENDS+= tex:${PORTSDIR}/print/teTeX-base + +CONFIGURE_ARGS+= --enable-dvi +GCONF_SCHEMAS+= evince-thumbnailer-dvi.schemas +. if defined(WITH_T1LIB) +LIB_DEPENDS+= t1.5:${PORTSDIR}/devel/t1lib + +CONFIGURE_ARGS+= --enable-t1lib +. endif +.endif + +.if !defined(WITHOUT_NAUTILUS) +USE_GNOME+= nautilus2 +CONFIGURE_ARGS+= --enable-nautilus +PLIST_SUB+= NAUTILUS="" +.else +CONFIGURE_ARGS+= --disable-nautilus +PLIST_SUB+= NAUTILUS="@comment " +.endif + +.if exists(${X11BASE}/bin/djview) +DJVU_DIR?= # empty +.else +DJVU_DIR?= -nox11 +.endif + .if defined(WITH_DJVU) -LIB_DEPENDS+= djvulibre.14:${PORTSDIR}/graphics/djvulibre +LIB_DEPENDS+= djvulibre.15:${PORTSDIR}/graphics/djvulibre${DJVU_DIR} CONFIGURE_ARGS+= --enable-djvu GCONF_SCHEMAS+= evince-thumbnailer-djvu.schemas .else CONFIGURE_ARGS+= --disable-djvu .endif -pre-everything:: -.if !defined(WITH_DJVU) - @${ECHO_MSG} - @${ECHO_MSG} "If you want DjVu support included, hit Ctrl-C now and use" - @${ECHO_MSG} "\"make WITH_DJVU=yes\"" - @${ECHO_MSG} "NOTE: GNOME/Gtk+ users may want to avoid QT dependency required" - @${ECHO_MSG} "by defaut djvulibre installation. They need to use - @${ECHO_MSG} "\"make WITHOUT_X11=yes\" when build that library then." - @${ECHO_MSG} +.if defined(WITH_DBUS) +LIB_DEPENDS+= dbus-glib-1.1:${PORTSDIR}/devel/dbus .endif +post-patch: + @${REINPLACE_CMD} -e 's|-lt1lib|-lt1 -lm|' \ + ${WRKSRC}/configure \ + ${WRKSRC}/dvi/mdvi-lib/Makefile.in + post-install: @-update-desktop-database -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/graphics/evince/distinfo b/graphics/evince/distinfo index 1ee219b32558..381e7baf0a1b 100644 --- a/graphics/evince/distinfo +++ b/graphics/evince/distinfo @@ -1,2 +1,2 @@ -MD5 (evince-0.3.0.tar.bz2) = 33e760db0295b393864b969f3b62a52a -SIZE (evince-0.3.0.tar.bz2) = 640308 +MD5 (evince-0.4.0.tar.bz2) = cc41e30108bc54a345bd6ca2556ab857 +SIZE (evince-0.4.0.tar.bz2) = 891605 diff --git a/graphics/evince/files/patch-shell_main.c b/graphics/evince/files/patch-shell_main.c new file mode 100644 index 000000000000..05a0c788287d --- /dev/null +++ b/graphics/evince/files/patch-shell_main.c @@ -0,0 +1,20 @@ +--- shell/main.c.dbus-fix 2005-09-01 04:14:54.000000000 -0400 ++++ shell/main.c 2005-09-01 04:15:33.000000000 -0400 +@@ -152,7 +152,7 @@ + if (!files) { + #if DBUS_VERSION <= 33 + call = dbus_g_proxy_begin_call (remote_object, "OpenWindow", +- DBUS_TYPE_UINT32, timestamp, ++ DBUS_TYPE_UINT32, ×tamp, + DBUS_TYPE_INVALID); + + if (!dbus_g_proxy_end_call (remote_object, call, &error, DBUS_TYPE_INVALID)) { +@@ -193,7 +193,7 @@ + call = dbus_g_proxy_begin_call (remote_object, "OpenURI", + DBUS_TYPE_STRING, &uri, + DBUS_TYPE_STRING, &page_label, +- DBUS_TYPE_UINT32, timestamp, ++ DBUS_TYPE_UINT32, ×tamp, + DBUS_TYPE_INVALID); + + if (!dbus_g_proxy_end_call (remote_object, call, &error, DBUS_TYPE_INVALID)) { diff --git a/graphics/evince/pkg-plist b/graphics/evince/pkg-plist index 97ba11412ea8..19fe298a8fd8 100644 --- a/graphics/evince/pkg-plist +++ b/graphics/evince/pkg-plist @@ -1,14 +1,30 @@ bin/evince bin/evince-thumbnailer +%%NAUTILUS%%lib/nautilus/extensions-1.0/libevince-properties-page.a +%%NAUTILUS%%lib/nautilus/extensions-1.0/libevince-properties-page.so +%%NAUTILUS%%lib/nautilus/extensions-1.0/libevince-properties-page.so.0 share/gnome/applications/evince.desktop -@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true share/gnome/evince/evince-password.glade +share/gnome/evince/evince-properties.glade +share/gnome/evince/evince-toolbar.xml share/gnome/evince/evince-ui.xml -share/gnome/evince/pdf-icon.png +share/gnome/evince/hand-open.png share/gnome/help/evince/C/evince.xml share/gnome/help/evince/C/figures/evince_start_window.png share/gnome/help/evince/C/legal.xml +share/gnome/help/evince/el/evince.xml +share/gnome/help/evince/el/figures/evince_start_window.png +share/gnome/help/evince/es/evince.xml +share/gnome/help/evince/es/figures/evince_start_window.png +share/gnome/help/evince/sr/evince.xml +share/gnome/help/evince/sr/figures/evince_start_window.png +share/gnome/help/evince/uk/evince.xml +share/gnome/help/evince/uk/figures/evince_start_window.png share/gnome/omf/evince/evince-C.omf +share/gnome/omf/evince/evince-el.omf +share/gnome/omf/evince/evince-es.omf +share/gnome/omf/evince/evince-sr.omf +share/gnome/omf/evince/evince-uk.omf share/locale/bg/LC_MESSAGES/evince.mo share/locale/ca/LC_MESSAGES/evince.mo share/locale/cs/LC_MESSAGES/evince.mo @@ -17,26 +33,53 @@ share/locale/de/LC_MESSAGES/evince.mo share/locale/el/LC_MESSAGES/evince.mo share/locale/en_CA/LC_MESSAGES/evince.mo share/locale/en_GB/LC_MESSAGES/evince.mo +share/locale/es/LC_MESSAGES/evince.mo +share/locale/et/LC_MESSAGES/evince.mo +share/locale/eu/LC_MESSAGES/evince.mo share/locale/fi/LC_MESSAGES/evince.mo share/locale/fr/LC_MESSAGES/evince.mo +share/locale/gl/LC_MESSAGES/evince.mo +share/locale/gu/LC_MESSAGES/evince.mo +share/locale/he/LC_MESSAGES/evince.mo +share/locale/hi/LC_MESSAGES/evince.mo +share/locale/hu/LC_MESSAGES/evince.mo share/locale/ja/LC_MESSAGES/evince.mo share/locale/ko/LC_MESSAGES/evince.mo share/locale/lt/LC_MESSAGES/evince.mo share/locale/nb/LC_MESSAGES/evince.mo +share/locale/ne/LC_MESSAGES/evince.mo share/locale/nl/LC_MESSAGES/evince.mo share/locale/no/LC_MESSAGES/evince.mo +share/locale/pa/LC_MESSAGES/evince.mo +share/locale/pl/LC_MESSAGES/evince.mo share/locale/pt_BR/LC_MESSAGES/evince.mo share/locale/ru/LC_MESSAGES/evince.mo share/locale/rw/LC_MESSAGES/evince.mo +share/locale/sk/LC_MESSAGES/evince.mo +share/locale/sq/LC_MESSAGES/evince.mo +share/locale/sr/LC_MESSAGES/evince.mo +share/locale/sr@Latn/LC_MESSAGES/evince.mo share/locale/sv/LC_MESSAGES/evince.mo +share/locale/th/LC_MESSAGES/evince.mo +share/locale/tr/LC_MESSAGES/evince.mo +share/locale/uk/LC_MESSAGES/evince.mo share/locale/wa/LC_MESSAGES/evince.mo share/locale/zh_CN/LC_MESSAGES/evince.mo share/locale/zh_TW/LC_MESSAGES/evince.mo @unexec rmdir %D/share/locale/rw/LC_MESSAGES 2> /dev/null || true @unexec rmdir %D/share/locale/rw 2> /dev/null || true @dirrm share/gnome/omf/evince +@dirrm share/gnome/help/evince/uk/figures +@dirrm share/gnome/help/evince/uk +@dirrm share/gnome/help/evince/sr/figures +@dirrm share/gnome/help/evince/sr +@dirrm share/gnome/help/evince/es/figures +@dirrm share/gnome/help/evince/es +@dirrm share/gnome/help/evince/el/figures +@dirrm share/gnome/help/evince/el @dirrm share/gnome/help/evince/C/figures @dirrm share/gnome/help/evince/C @dirrm share/gnome/help/evince @dirrm share/gnome/evince +@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/graphics/glitz/Makefile b/graphics/glitz/Makefile index e7cd752d493c..48dadc5e3621 100644 --- a/graphics/glitz/Makefile +++ b/graphics/glitz/Makefile @@ -3,10 +3,11 @@ # Whom: Michael Johnson <ahze@ahze.net> # # $FreeBSD$ +# $MCom: ports/graphics/glitz/Makefile,v 1.4 2005/08/09 22:54:54 ahze Exp $ # PORTNAME= glitz -PORTVERSION= 0.4.0 +PORTVERSION= 0.4.4 CATEGORIES= graphics MASTER_SITES= http://cairographics.org/snapshots/ @@ -16,7 +17,7 @@ COMMENT= OpenGL image compositing library USE_REINPLACE= yes USE_GL= yes USE_GNOME= pkgconfig gnometarget gnomehack -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 INSTALLS_SHLIB= yes CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" \ diff --git a/graphics/glitz/distinfo b/graphics/glitz/distinfo index 51d835dad7b2..abf70c1b2477 100644 --- a/graphics/glitz/distinfo +++ b/graphics/glitz/distinfo @@ -1,2 +1,2 @@ -MD5 (glitz-0.4.0.tar.gz) = 32a34fa31686be88cc5c518085444a68 -SIZE (glitz-0.4.0.tar.gz) = 391481 +MD5 (glitz-0.4.4.tar.gz) = 56162ec6f5df9603c0e98391c64565f8 +SIZE (glitz-0.4.4.tar.gz) = 425742 diff --git a/graphics/gstreamer-plugins-cairo/Makefile b/graphics/gstreamer-plugins-cairo/Makefile index 5ca6a5d96a36..12bea45427e9 100644 --- a/graphics/gstreamer-plugins-cairo/Makefile +++ b/graphics/gstreamer-plugins-cairo/Makefile @@ -3,6 +3,7 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/graphics/gstreamer-plugins-cairo/Makefile,v 1.2 2005/10/14 20:39:57 adamw Exp $ # CATEGORIES= graphics @@ -14,6 +15,4 @@ GST_PLUGIN= cairo MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins -IGNORE= Cairo needs to be updated to 1.0 for plugin to work. - .include "${MASTERDIR}/Makefile" diff --git a/graphics/gstreamer-plugins-cairo80/Makefile b/graphics/gstreamer-plugins-cairo80/Makefile index 5ca6a5d96a36..12bea45427e9 100644 --- a/graphics/gstreamer-plugins-cairo80/Makefile +++ b/graphics/gstreamer-plugins-cairo80/Makefile @@ -3,6 +3,7 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/graphics/gstreamer-plugins-cairo/Makefile,v 1.2 2005/10/14 20:39:57 adamw Exp $ # CATEGORIES= graphics @@ -14,6 +15,4 @@ GST_PLUGIN= cairo MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins -IGNORE= Cairo needs to be updated to 1.0 for plugin to work. - .include "${MASTERDIR}/Makefile" diff --git a/graphics/libgnomecanvas/Makefile b/graphics/libgnomecanvas/Makefile index 4bddea772adf..3ffeb8feadab 100644 --- a/graphics/libgnomecanvas/Makefile +++ b/graphics/libgnomecanvas/Makefile @@ -3,14 +3,14 @@ # Whom: Maxim Sobolev <sobomax@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/graphics/libgnomecanvas/Makefile,v 1.48 2005/09/06 18:43:35 mezz Exp $ # PORTNAME= libgnomecanvas -PORTVERSION= 2.10.2 -PORTREVISION= 1 +PORTVERSION= 2.12.0 CATEGORIES= graphics gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.10 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.12 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -20,8 +20,8 @@ USE_BZIP2= yes USE_GMAKE= yes USE_X_PREFIX= yes INSTALLS_SHLIB= yes -USE_LIBTOOL_VER=15 -USE_GNOME= gnomehack libglade2 libartlgpl2 +USE_AUTOTOOLS= libtool:15 +USE_GNOME= gnomehack libglade2 libartlgpl2 ltverhack CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \ --disable-gtk-doc CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/graphics/libgnomecanvas/distinfo b/graphics/libgnomecanvas/distinfo index fa70270723a9..0279b3e30005 100644 --- a/graphics/libgnomecanvas/distinfo +++ b/graphics/libgnomecanvas/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/libgnomecanvas-2.10.2.tar.bz2) = 976eada7b499ae6e74966f8888c015d1 -SIZE (gnome2/libgnomecanvas-2.10.2.tar.bz2) = 552370 +MD5 (gnome2/libgnomecanvas-2.12.0.tar.bz2) = 62c0edd3d27803d341662fd9088b2d9b +SIZE (gnome2/libgnomecanvas-2.12.0.tar.bz2) = 590010 diff --git a/graphics/libgnomecanvas/files/patch-libgnomecanvas_gnome-canvas-shape.c b/graphics/libgnomecanvas/files/patch-libgnomecanvas_gnome-canvas-shape.c new file mode 100644 index 000000000000..75c1fd41d8f0 --- /dev/null +++ b/graphics/libgnomecanvas/files/patch-libgnomecanvas_gnome-canvas-shape.c @@ -0,0 +1,11 @@ +--- libgnomecanvas/gnome-canvas-shape.c.orig Fri May 20 16:55:35 2005 ++++ libgnomecanvas/gnome-canvas-shape.c Fri May 20 16:55:41 2005 +@@ -1343,7 +1343,7 @@ gcbp_destroy_gdk (GnomeCanvasShape * sha + { + GnomeCanvasShapePrivGdk * gdk; + +- g_assert (!((GnomeCanvasItem *)shape)->canvas->aa); ++ /*g_assert (!((GnomeCanvasItem *)shape)->canvas->aa);*/ + + gdk = shape->priv->gdk; + diff --git a/graphics/libgnomecanvas/pkg-plist b/graphics/libgnomecanvas/pkg-plist index 0d5dfea1271e..1fc4c55602e7 100644 --- a/graphics/libgnomecanvas/pkg-plist +++ b/graphics/libgnomecanvas/pkg-plist @@ -15,8 +15,35 @@ include/libgnomecanvas-2.0/libgnomecanvas/libgnomecanvas.h lib/libglade/2.0/libcanvas.so lib/libgnomecanvas-2.a lib/libgnomecanvas-2.so -lib/libgnomecanvas-2.so.1000 +lib/libgnomecanvas-2.so.0 libdata/pkgconfig/libgnomecanvas-2.0.pc +%%DOCSDIR%%/GnomeCanvas.html +%%DOCSDIR%%/GnomeCanvasBpath.html +%%DOCSDIR%%/GnomeCanvasClipgroup.html +%%DOCSDIR%%/GnomeCanvasEllipse.html +%%DOCSDIR%%/GnomeCanvasGroup.html +%%DOCSDIR%%/GnomeCanvasItem.html +%%DOCSDIR%%/GnomeCanvasLine.html +%%DOCSDIR%%/GnomeCanvasPixbuf.html +%%DOCSDIR%%/GnomeCanvasPolygon.html +%%DOCSDIR%%/GnomeCanvasRE.html +%%DOCSDIR%%/GnomeCanvasRect.html +%%DOCSDIR%%/GnomeCanvasRichText.html +%%DOCSDIR%%/GnomeCanvasShape.html +%%DOCSDIR%%/GnomeCanvasText.html +%%DOCSDIR%%/GnomeCanvasWidget.html +%%DOCSDIR%%/ch01.html +%%DOCSDIR%%/ch02.html +%%DOCSDIR%%/home.png +%%DOCSDIR%%/index.html +%%DOCSDIR%%/index.sgml +%%DOCSDIR%%/left.png +%%DOCSDIR%%/libgnomecanvas-gnome-canvas-path-def.html +%%DOCSDIR%%/libgnomecanvas-gnome-canvas-util.html +%%DOCSDIR%%/libgnomecanvas.devhelp +%%DOCSDIR%%/right.png +%%DOCSDIR%%/style.css +%%DOCSDIR%%/up.png share/locale/am/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/ang/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/ar/LC_MESSAGES/libgnomecanvas-2.0.mo @@ -41,6 +68,7 @@ share/locale/fa/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/fi/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/fr/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/ga/LC_MESSAGES/libgnomecanvas-2.0.mo +share/locale/gl/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/gu/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/he/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/hi/LC_MESSAGES/libgnomecanvas-2.0.mo @@ -75,8 +103,8 @@ share/locale/sk/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/sl/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/sq/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/sr/LC_MESSAGES/libgnomecanvas-2.0.mo -share/locale/sr@ije/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/sr@Latn/LC_MESSAGES/libgnomecanvas-2.0.mo +share/locale/sr@ije/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/sv/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/ta/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/tr/LC_MESSAGES/libgnomecanvas-2.0.mo @@ -91,5 +119,6 @@ share/locale/zh_TW/LC_MESSAGES/libgnomecanvas-2.0.mo @unexec rmdir %D/share/locale/xh 2> /dev/null || true @unexec rmdir %D/share/locale/ang/LC_MESSAGES 2> /dev/null || true @unexec rmdir %D/share/locale/ang 2> /dev/null || true +@dirrm %%DOCSDIR%% @dirrm include/libgnomecanvas-2.0/libgnomecanvas @dirrm include/libgnomecanvas-2.0 diff --git a/graphics/librsvg2/Makefile b/graphics/librsvg2/Makefile index 87b9a037c479..5b3dd6dc7008 100644 --- a/graphics/librsvg2/Makefile +++ b/graphics/librsvg2/Makefile @@ -3,14 +3,15 @@ # Whom: Ade Lovett <ade@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/graphics/librsvg2/Makefile,v 1.73 2005/10/11 22:27:04 marcus Exp $ # PORTNAME= librsvg2 -PORTVERSION= 2.9.5 -PORTREVISION= 2 +PORTVERSION= 2.12.7 +PORTREVISION= 1 CATEGORIES= graphics gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.9 +MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.12 DISTNAME= librsvg-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -27,10 +28,9 @@ USE_BZIP2= yes USE_GMAKE= yes USE_X_PREFIX= yes INSTALLS_SHLIB= yes -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 USE_REINPLACE= yes -WANT_GNOME= yes -USE_GNOME= gnomehack gnomeprefix libartlgpl2 libgsf gtk20 +USE_GNOME= gnomehack gnomeprefix libartlgpl2 libgsf gtk20 ltverhack CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --with-svgz \ @@ -46,75 +46,46 @@ PLIST_SUB= GTK_VERSION=${GTK_VERSION} MAN1= rsvg.1 -OPTIONS= MOZILLA_PLUGIN "Enable the RSVG browser plug-in" no - -.if defined(PACKAGE_BUILDING) || defined(PARALLEL_PACKAGE_BUILD) -.undef WITHOUT_GNOME -WITH_GNOME= yes -.endif +OPTIONS= MOZILLA_PLUGIN "Enable the SVG browser plug-in" no .include <bsd.port.pre.mk> .if defined(WITH_MOZILLA_PLUGIN) -.if defined(WITH_MOZILLA) && ${WITH_MOZILLA}=="firefox" -BUILD_DEPENDS+= ${X11BASE}/libdata/pkgconfig/firefox-plugin.pc:${PORTSDIR}/www/firefox -RUN_DEPENDS+= ${X11BASE}/libdata/pkgconfig/firefox-plugin.pc:${PORTSDIR}/www/firefox -.else -BUILD_DEPENDS+= ${X11BASE}/libdata/pkgconfig/mozilla-plugin${HEADERS_SUFX}.pc:${PORTSDIR}/www/mozilla${HEADERS_SUFX} -RUN_DEPENDS+= ${X11BASE}/libdata/pkgconfig/mozilla-plugin${HEADERS_SUFX}.pc:${PORTSDIR}/www/mozilla${HEADERS_SUFX} -.endif +WITH_MOZILLA?= firefox +.if ${WITH_MOZILLA}=="firefox" +MOZILLA= firefox HEADERS_SUFX= - -.if !defined(WITH_MOZILLA) -HEADERS_SUFX= -.else -.if ${WITH_MOZILLA}=="mozilla" +.elif ${WITH_MOZILLA}=="mozilla" +MOZILLA= mozilla HEADERS_SUFX= -.else -.if ${WITH_MOZILLA}=="mozilla-devel" +.elif ${WITH_MOZILLA}=="mozilla-devel" +MOZILLA= mozilla HEADERS_SUFX= -devel .else -.if ${WITH_MOZILLA}=="firefox" -HEADERS_SUFX= -.endif -.endif +BROKEN= "Unknown Gecko source specified (${WITH_MOZILLA})" .endif + +BUILD_DEPENDS+= ${X11BASE}/libdata/pkgconfig/${MOZILLA}-plugin${HEADERS_SUFX}.pc:${PORTSDIR}/www/${MOZILLA}${HEADERS_SUFX} +RUN_DEPENDS+= ${X11BASE}/libdata/pkgconfig/${MOZILLA}-plugin${HEADERS_SUFX}.pc:${PORTSDIR}/www/${MOZILLA}${HEADERS_SUFX} + +.if ${WITH_MOZILLA}=="mozilla-devel" && ${OSVERSION} < 500000 +USE_GCC= 3.4 .endif +CONFIGURE_ENV+= MOZILLA_CONFIG=no +CONFIGURE_ARGS+=--enable-mozilla-plugin=yes + PLIST_SUB+= PLUGIN="" .else -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-Makefile.in -PLIST_SUB+= PLUGIN="@comment " -.endif +CONFIGURE_ARGS+=--enable-mozilla-plugin=no -.if ${OSVERSION} < 500000 -.if defined(WITH_MOZILLA) -.if ${WITH_MOZILLA}=="mozilla-devel" -USE_GCC= 3.4 -.endif -.endif +PLIST_SUB+= PLUGIN="@comment " .endif post-patch: - @${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \ - ${WRKSRC}/librsvg-2.0.pc.in .if defined(WITH_MOZILLA_PLUGIN) -.if defined(WITH_MOZILLA) && ${WITH_MOZILLA}=="firefox" - @${REINPLACE_CMD} -e 's|mozilla-|firefox-|g' ${WRKSRC}/configure -.else - @${REINPLACE_CMD} -e 's|mozilla-plugin|mozilla-plugin${HEADERS_SUFX}|g' \ + @${REINPLACE_CMD} -e 's|mozilla-plugin|${MOZILLA}-plugin${HEADERS_SUFX}|g' \ ${WRKSRC}/configure .endif -.endif - -pre-build: - @${REINPLACE_CMD} -E -e 's|O2|O|g' ${WRKSRC}/Makefile - -.if defined(WITH_MOZILLA_PLUGIN) -post-install: - ${MKDIR} ${PREFIX}/lib/browser_plugins - ${INSTALL_PROGRAM} ${WRKSRC}/moz-plugin/.libs/libmozsvgdec.so \ - ${PREFIX}/lib/browser_plugins -.endif .include <bsd.port.post.mk> diff --git a/graphics/librsvg2/distinfo b/graphics/librsvg2/distinfo index 40f8c84a55e4..7ca3362f9855 100644 --- a/graphics/librsvg2/distinfo +++ b/graphics/librsvg2/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/librsvg-2.9.5.tar.bz2) = 44799d75e940eb4150acdae4f63cbe2a -SIZE (gnome2/librsvg-2.9.5.tar.bz2) = 392785 +MD5 (gnome2/librsvg-2.12.7.tar.bz2) = 2113f01fbf228f3f8fc17c49966143fe +SIZE (gnome2/librsvg-2.12.7.tar.bz2) = 396901 diff --git a/graphics/librsvg2/files/extra-patch-Makefile.in b/graphics/librsvg2/files/extra-patch-Makefile.in deleted file mode 100644 index 6bcb7ef6882e..000000000000 --- a/graphics/librsvg2/files/extra-patch-Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.in.orig Wed Jan 26 04:47:10 2005 -+++ Makefile.in Wed Jan 26 04:47:24 2005 -@@ -199,7 +199,7 @@ - sharedstatedir = @sharedstatedir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --SUBDIRS = . gtk-engine gdk-pixbuf-loader moz-plugin doc data -+SUBDIRS = . gtk-engine gdk-pixbuf-loader doc data - - @HAVE_GTK_TRUE@target_rsvg_view = rsvg-view - @HAVE_GTK_FALSE@target_rsvg_view = diff --git a/graphics/librsvg2/files/patch-librsvg-2.0.pc.in b/graphics/librsvg2/files/patch-librsvg-2.0.pc.in deleted file mode 100644 index 8210a432bc0d..000000000000 --- a/graphics/librsvg2/files/patch-librsvg-2.0.pc.in +++ /dev/null @@ -1,9 +0,0 @@ ---- librsvg-2.0.pc.in.orig Fri Jun 4 20:23:35 2004 -+++ librsvg-2.0.pc.in Wed Jun 9 01:58:50 2004 -@@ -7,5 +7,5 @@ - Description: library that renders svg files - Version: @VERSION@ - Requires: glib-2.0 gdk-pixbuf-2.0 --Libs: -L${libdir} -lrsvg-2 -+Libs: -L${libdir} -lrsvg-2 %%PTHREAD_LIBS%% - Cflags: -I${includedir}/librsvg-2 diff --git a/graphics/librsvg2/files/patch-moz-plugin_Makefile.in b/graphics/librsvg2/files/patch-moz-plugin_Makefile.in index 97a0a3fd20e0..835590afdfa7 100644 --- a/graphics/librsvg2/files/patch-moz-plugin_Makefile.in +++ b/graphics/librsvg2/files/patch-moz-plugin_Makefile.in @@ -1,27 +1,20 @@ ---- moz-plugin/Makefile.in.orig Tue Jan 25 23:31:56 2005 -+++ moz-plugin/Makefile.in Tue Jan 25 23:32:32 2005 -@@ -252,15 +252,15 @@ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) +--- moz-plugin/Makefile.in.orig Fri Sep 9 23:59:09 2005 ++++ moz-plugin/Makefile.in Sat Sep 10 00:01:22 2005 +@@ -204,7 +204,7 @@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-plugindir = $(libdir)/mozilla/plugins/ ++plugindir = $(libdir)/browser_plugins/ + @WITH_MOZILLA_FALSE@plugin_LTLIBRARIES = + + @WITH_MOZILLA_TRUE@plugin_LTLIBRARIES = libmozsvgdec.la +@@ -253,7 +253,7 @@ pluginLTLIBRARIES_INSTALL = $(INSTALL) install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) -- @$(NORMAL_INSTALL) + @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(plugindir) -- @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ -- if test -f $$p; then \ -- f="`echo $$p | sed -e 's|^.*/||'`"; \ -- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \ -- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \ -- else :; fi; \ -- done -+# @$(NORMAL_INSTALL) -+# $(mkinstalldirs) $(DESTDIR)$(plugindir) -+# @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ -+# if test -f $$p; then \ -+# f="`echo $$p | sed -e 's|^.*/||'`"; \ -+# echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \ -+# $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \ -+# else :; fi; \ -+# done - - uninstall-pluginLTLIBRARIES: - @$(NORMAL_UNINSTALL) ++@WITH_MOZILLA_TRUE@ $(mkinstalldirs) $(DESTDIR)$(plugindir) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ + f="`echo $$p | sed -e 's|^.*/||'`"; \ diff --git a/graphics/librsvg2/files/patch-rsvg-paint-server.c b/graphics/librsvg2/files/patch-rsvg-paint-server.c deleted file mode 100644 index f6e05c030dc4..000000000000 --- a/graphics/librsvg2/files/patch-rsvg-paint-server.c +++ /dev/null @@ -1,14 +0,0 @@ ---- rsvg-paint-server.c.orig Tue Jan 25 23:39:10 2005 -+++ rsvg-paint-server.c Tue Jan 25 23:39:19 2005 -@@ -84,10 +84,10 @@ - const RsvgPSCtx *ctx) - { - RsvgPaintServerSolid *z = (RsvgPaintServerSolid *)self; -+ ArtPixMaxDepth color[3]; - guint32 rgb = z->rgb; - if (z->currentcolour) - rgb = rsvg_state_current(ctx->ctx)->current_color; -- ArtPixMaxDepth color[3]; - - color[0] = ART_PIX_MAX_FROM_8 (rgb >> 16); - color[1] = ART_PIX_MAX_FROM_8 ((rgb >> 8) & 0xff); diff --git a/graphics/librsvg2/files/patch-rsvg-shapes.c b/graphics/librsvg2/files/patch-rsvg-shapes.c deleted file mode 100644 index 2642a2539b36..000000000000 --- a/graphics/librsvg2/files/patch-rsvg-shapes.c +++ /dev/null @@ -1,14 +0,0 @@ ---- rsvg-shapes.c.orig Tue Jan 25 23:43:50 2005 -+++ rsvg-shapes.c Tue Jan 25 23:44:01 2005 -@@ -2579,10 +2579,10 @@ - const char * id, *value; - double vbox_x = 0, vbox_y = 0, vbox_w = 0, vbox_h = 0; - gboolean has_vbox = FALSE, overflow = 0; -- id = NULL; - RsvgDefsDrawableSvg * svg; - RsvgDefsDrawableGroup * group; - RsvgState state; -+ id = NULL; - rsvg_state_init(&state); - - if (rsvg_property_bag_size (atts)) diff --git a/graphics/librsvg2/pkg-plist b/graphics/librsvg2/pkg-plist index 5604203a5e03..de42cc94224b 100644 --- a/graphics/librsvg2/pkg-plist +++ b/graphics/librsvg2/pkg-plist @@ -2,14 +2,13 @@ bin/rsvg bin/rsvg-view include/librsvg-2/librsvg/librsvg-enum-types.h include/librsvg-2/librsvg/librsvg-features.h -include/librsvg-2/librsvg/rsvg-gz.h include/librsvg-2/librsvg/rsvg.h %%PLUGIN%%lib/browser_plugins/libmozsvgdec.so lib/gtk-2.0/%%GTK_VERSION%%/engines/libsvg.so lib/gtk-2.0/%%GTK_VERSION%%/loaders/svg_loader.so lib/librsvg-2.a lib/librsvg-2.so -lib/librsvg-2.so.11 +lib/librsvg-2.so.2 libdata/pkgconfig/librsvg-2.0.pc share/doc/librsvg/html/home.png share/doc/librsvg/html/index.html diff --git a/graphics/poppler/Makefile b/graphics/poppler/Makefile index 9307727c6c08..19124133b48a 100644 --- a/graphics/poppler/Makefile +++ b/graphics/poppler/Makefile @@ -3,31 +3,23 @@ # Whom: marcus@FreeBSD.org # # $FreeBSD$ +# $MCom: ports/graphics/poppler/Makefile,v 1.14 2005/09/03 04:44:58 ahze Exp $ # PORTNAME= poppler -PORTVERSION= 0.3.1 -PORTREVISION= 1 +PORTVERSION= 0.4.2 CATEGORIES= graphics print MASTER_SITES= http://poppler.freedesktop.org/ MAINTAINER= gnome@FreeBSD.org COMMENT= A PDF rendering library -LIB_DEPENDS= cairo.1:${PORTSDIR}/graphics/cairo - USE_X_PREFIX= yes USE_GMAKE= yes -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 USE_GNOME= gnomeprefix gnomehack gtk20 INSTALLS_SHLIB= yes -USE_REINPLACE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2" \ LDFLAGS="-L${LOCALBASE}/lib" -post-patch: - @${REINPLACE_CMD} -e 's|poppler-[@]VERSION[@]|poppler|g' \ - ${WRKSRC}/poppler-cairo.pc.in \ - ${WRKSRC}/poppler-splash.pc.in - .include <bsd.port.mk> diff --git a/graphics/poppler/distinfo b/graphics/poppler/distinfo index 7085df922c3f..68c71d7bc4a5 100644 --- a/graphics/poppler/distinfo +++ b/graphics/poppler/distinfo @@ -1,2 +1,2 @@ -MD5 (poppler-0.3.1.tar.gz) = 1d2843e84753f71491417ad70ee8d1da -SIZE (poppler-0.3.1.tar.gz) = 739976 +MD5 (poppler-0.4.2.tar.gz) = beb1eea135a3c5b679a7a22d01a500c0 +SIZE (poppler-0.4.2.tar.gz) = 777935 diff --git a/graphics/poppler/pkg-plist b/graphics/poppler/pkg-plist index 7aedfec0f409..6a247e409432 100644 --- a/graphics/poppler/pkg-plist +++ b/graphics/poppler/pkg-plist @@ -6,8 +6,6 @@ include/poppler/BuiltinFontTables.h include/poppler/CMap.h include/poppler/CairoFontEngine.h include/poppler/CairoOutputDev.h -include/poppler/CairoOutputDevImage.h -include/poppler/CairoOutputDevX.h include/poppler/Catalog.h include/poppler/CharCodeToUnicode.h include/poppler/CharTypes.h @@ -17,6 +15,7 @@ include/poppler/Dict.h include/poppler/Error.h include/poppler/ErrorCodes.h include/poppler/FontEncodingTables.h +include/poppler/FontInfo.h include/poppler/Function.cc include/poppler/Function.h include/poppler/Gfx.h @@ -57,6 +56,7 @@ include/poppler/goo/GooHash.h include/poppler/goo/GooList.h include/poppler/goo/GooMutex.h include/poppler/goo/GooString.h +include/poppler/goo/GooTimer.h include/poppler/goo/gfile.h include/poppler/goo/gmem.h include/poppler/goo/gtypes.h diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile index d2402cec05b5..a5b7657194fa 100644 --- a/mail/evolution/Makefile +++ b/mail/evolution/Makefile @@ -3,14 +3,14 @@ # Whom: Ade Lovett <ade@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/mail/evolution/Makefile,v 1.76 2005/10/09 11:09:15 kwm Exp $ # PORTNAME= evolution -PORTVERSION= 2.2.3 -PORTREVISION= 1 +PORTVERSION= 2.4.1 CATEGORIES= mail gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.2 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.4 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -23,28 +23,30 @@ USE_BZIP2= yes USE_GMAKE= yes USE_BISON= yes USE_X_PREFIX= yes -USE_GNOME= gnomeprefix gnomehack intlhack evolutiondataserver gal2 \ +USE_GNOME= gnomeprefix gnomehack intlhack evolutiondataserver \ gtkhtml3 desktopfileutils USE_REINPLACE= yes -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 INSTALLS_OMF= yes CONFIGURE_ARGS= --enable-nss=yes \ --with-nss-includes=${LOCALBASE}/include/nss/nss \ --with-nss-libs=${LOCALBASE}/lib \ --with-nspr-includes=${LOCALBASE}/include/nspr \ --with-nspr-libs=${LOCALBASE}/lib \ + --enable-mono=no \ --with-sub-version=" FreeBSD GNOME Team Port" CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" GCONF_SCHEMAS= apps_evolution_addressbook-${EVO_VERSION}.schemas \ apps_evolution_calendar-${EVO_VERSION}.schemas \ + apps-evolution-mail-prompts-checkdefault-2.4.schemas \ apps_evolution_shell-${EVO_VERSION}.schemas \ evolution-mail-${EVO_VERSION}.schemas -EVO_VERSION= 2.2 +EVO_VERSION= 2.4 PLIST_SUB= VERSION=${EVO_VERSION} \ - PORTVERSION=2.2 + PORTVERSION=2.4 OPTIONS= PILOT "Enable Palm Pilot sync support" off \ LDAP "Enable LDAP support" on \ @@ -52,14 +54,18 @@ OPTIONS= PILOT "Enable Palm Pilot sync support" off \ .include <bsd.port.pre.mk> -.if exists(${X11BASE}/lib/libgstreamer-0.8.so.5) || \ - defined(PACKAGE_BUILDING) || defined(PARALLEL_PACKAGE_BUILD) +.if defined(PACKAGE_BUILDING) || defined(PARALLEL_PACKAGE_BUILD) WITH_GSTREAMER= yes +WITH_DBUS= yes .endif -#.if exists(${LOCALBASE}/lib/libdbus-glib-1.so) -#WITH_DBUS= yes -#.endif +.if exists(${LOCALBASE}/lib/libdbus-glib-1.so) +WITH_DBUS= yes +.endif + +.if exists(${X11BASE}/lib/libgstreamer-0.8.so) +WITH_GSTREAMER= yes +.endif .if defined(WITH_PILOT) LIB_DEPENDS+= gpilotdconduit.2:${PORTSDIR}/palm/gnomepilot2 @@ -88,12 +94,12 @@ PLIST_SUB+= GSTREAMER="" PLIST_SUB+= GSTREAMER="@comment " .endif -#.if defined(WITH_DBUS) -#LIB_DEPENDS+= dbus-glib-1.1:${PORTSDIR}/devel/dbus -#PLIST_SUB+= DBUS="" -#.else -#PLIST_SUB+= DBUS="@comment " -#.endif +.if defined(WITH_DBUS) +LIB_DEPENDS+= dbus-glib-1.1:${PORTSDIR}/devel/dbus +PLIST_SUB+= DBUS="" +.else +PLIST_SUB+= DBUS="@comment " +.endif .if ${OSVERSION} >= 500000 && !defined(NO_KERBEROS) && \ exists(/usr/lib/libkrb5.so) @@ -111,6 +117,9 @@ post-patch: @${SED} -e 's|%%PREFIX%%|${PREFIX}| ; \ s|%%EVO_VERSION%%|${EVO_VERSION}|' \ ${FILESDIR}/evolibs.sh > ${WRKDIR}/evolibs.sh + @${REINPLACE_CMD} -e "s|gal-2.4|gal-2.6|g" \ + ${WRKSRC}/evolution-shell.pc.in \ + ${WRKSRC}/evolution-plugin.pc.in post-install: @${LN} -sf ${PREFIX}/bin/evolution-${EVO_VERSION} \ diff --git a/mail/evolution/distinfo b/mail/evolution/distinfo index b2c4c622874e..e98cf955b25b 100644 --- a/mail/evolution/distinfo +++ b/mail/evolution/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/evolution-2.2.3.tar.bz2) = 1e01511c78b2dd0dcb8cf83521c167af -SIZE (gnome2/evolution-2.2.3.tar.bz2) = 10435908 +MD5 (gnome2/evolution-2.4.1.tar.bz2) = 13235405e08d14a54129e3a65548f58e +SIZE (gnome2/evolution-2.4.1.tar.bz2) = 11543481 diff --git a/mail/evolution/files/patch-aa b/mail/evolution/files/patch-aa index eadafd8477d1..0ad426b2d938 100644 --- a/mail/evolution/files/patch-aa +++ b/mail/evolution/files/patch-aa @@ -1,6 +1,21 @@ ---- configure.orig Wed Sep 29 14:06:43 2004 -+++ configure Wed Sep 29 14:24:28 2004 -@@ -24206,6 +24206,7 @@ +--- configure.orig Fri Jul 29 17:50:28 2005 ++++ configure Fri Jul 29 17:51:42 2005 +@@ -23657,6 +23657,14 @@ + DL_LIB='' + SOFTOKN3_LIB='' + ;; ++*freebsd*) os_win32=no ++ NO_UNDEFINED='' ++ SOCKET_LIBS='' ++ SOEXT='.so' ++ SA_JUNK_PLUGIN=sa-junk-plugin ++ DL_LIB='' ++ SOFTOKN3_LIB='-lsoftokn3' ++ ;; + *) os_win32=no + NO_UNDEFINED='' + SOCKET_LIBS='' +@@ -26205,6 +26213,7 @@ #include <sys/socket.h> #include <netinet/in.h> #include <netdb.h> @@ -8,7 +23,7 @@ int -@@ -25772,7 +25773,7 @@ +@@ -27882,7 +27891,7 @@ LDFLAGS_save="$LDFLAGS" mitlibs="-lkrb5 -lk5crypto -lcom_err -lgssapi_krb5" @@ -17,20 +32,7 @@ echo "$as_me:$LINENO: checking for Kerberos 5" >&5 echo $ECHO_N "checking for Kerberos 5... $ECHO_C" >&6 if test "${ac_cv_lib_kerberos5+set}" = set; then -@@ -26928,10 +26929,10 @@ - Example: --with-nspr-libs=/usr/lib" >&2;} - { (exit 1); exit 1; }; } - else -- nsprlibs="-ldl $with_nspr_libs/libplc4.a $with_nspr_libs/libplds4.a $with_nspr_libs/libnspr4.a $PTHREAD_LIB" -+ nsprlibs="$with_nspr_libs/libplc4.a $with_nspr_libs/libplds4.a $with_nspr_libs/libnspr4.a $PTHREAD_LIB" - fi - else -- nsprlibs="-ldl -lplc4 -lplds4 -lnspr4 $PTHREAD_LIB" -+ nsprlibs="-lplc4 -lplds4 -lnspr4 $PTHREAD_LIB" - fi - - echo "$as_me:$LINENO: checking for Mozilla nspr libraries" >&5 -@@ -30807,7 +30808,7 @@ +@@ -33151,7 +33160,7 @@ idldir="$datadir/idl/evolution-$BASE_VERSION" diff --git a/mail/evolution/files/patch-plugins_exchange-account-setup_exchange-account-setup.c b/mail/evolution/files/patch-plugins_exchange-account-setup_exchange-account-setup.c deleted file mode 100644 index 8d880e79f05a..000000000000 --- a/mail/evolution/files/patch-plugins_exchange-account-setup_exchange-account-setup.c +++ /dev/null @@ -1,14 +0,0 @@ ---- plugins/exchange-account-setup/exchange-account-setup.c.orig Tue Mar 1 15:38:29 2005 -+++ plugins/exchange-account-setup/exchange-account-setup.c Tue Mar 1 15:38:45 2005 -@@ -564,9 +564,10 @@ - org_gnome_exchange_commit (EPlugin *epl, EConfigHookItemFactoryData *data) - { - EMConfigTargetAccount *target_account; -- target_account = (EMConfigTargetAccount *)data->config->target; - const char *source_url; - CamelURL *url; -+ -+ target_account = (EMConfigTargetAccount *)data->config->target; - - source_url = e_account_get_string (target_account->account, E_ACCOUNT_SOURCE_URL); - url = camel_url_new (source_url, NULL); diff --git a/mail/evolution/files/patch-plugins_groupwise-features_proxy-login.c b/mail/evolution/files/patch-plugins_groupwise-features_proxy-login.c new file mode 100644 index 000000000000..4d8e131a6250 --- /dev/null +++ b/mail/evolution/files/patch-plugins_groupwise-features_proxy-login.c @@ -0,0 +1,10 @@ +--- plugins/groupwise-features/proxy-login.c.orig Fri Jul 29 18:55:40 2005 ++++ plugins/groupwise-features/proxy-login.c Fri Jul 29 18:55:58 2005 +@@ -236,7 +236,6 @@ proxy_login_get_cnc (EAccount *account) + { + EGwConnection *cnc; + CamelURL *url; +- url = camel_url_new (account->source->url, NULL); + char *uri = NULL, *failed_auth = NULL, *key = NULL, *prompt = NULL, *password = NULL; + const char *use_ssl, *soap_port; + diff --git a/mail/evolution/files/patch-string_vuln b/mail/evolution/files/patch-string_vuln deleted file mode 100644 index b9e9d2bd7ab6..000000000000 --- a/mail/evolution/files/patch-string_vuln +++ /dev/null @@ -1,62 +0,0 @@ ---- calendar/gui/e-cal-component-preview.c.orig Sat Aug 27 18:48:58 2005 -+++ calendar/gui/e-cal-component-preview.c Sat Aug 27 18:49:14 2005 -@@ -284,7 +284,7 @@ write_html (GtkHTMLStream *stream, ECal - str = g_string_append_c (str, text.value[i]); - } - -- gtk_html_stream_printf (stream, str->str); -+ gtk_html_stream_printf (stream, "%s", str->str); - g_string_free (str, TRUE); - } - ---- addressbook/gui/widgets/eab-contact-display.c.orig Sat Aug 27 18:50:22 2005 -+++ addressbook/gui/widgets/eab-contact-display.c Sat Aug 27 18:51:58 2005 -@@ -353,7 +353,7 @@ render_contact (GtkHTMLStream *html_stre - accum_multival_attribute (accum, contact, _("Yahoo"), E_CONTACT_IM_YAHOO, YAHOO_ICON, 0); - - if (accum->len > 0) -- gtk_html_stream_printf (html_stream, accum->str); -+ gtk_html_stream_printf (html_stream, "%s", accum->str); - - end_block (html_stream); - -@@ -368,7 +368,7 @@ render_contact (GtkHTMLStream *html_stre - - if (accum->len > 0) { - start_block (html_stream, _("work")); -- gtk_html_stream_printf (html_stream, accum->str); -+ gtk_html_stream_printf (html_stream, "%s", accum->str); - end_block (html_stream); - } - -@@ -383,7 +383,7 @@ render_contact (GtkHTMLStream *html_stre - - if (accum->len > 0) { - start_block (html_stream, _("personal")); -- gtk_html_stream_printf (html_stream, accum->str); -+ gtk_html_stream_printf (html_stream, "%s", accum->str); - end_block (html_stream); - } - ---- calendar/gui/e-calendar-view.c.orig Sat Aug 27 18:52:46 2005 -+++ calendar/gui/e-calendar-view.c Sat Aug 27 18:53:10 2005 -@@ -1079,7 +1079,7 @@ on_save_as (EPopup *ep, EPopupItem *pite - return; - } - -- fprintf (file, ical_string); -+ fprintf (file, "%s", ical_string); - g_free (ical_string); - fclose (file); - ---- calendar/gui/e-calendar-table.c.orig Sat Aug 27 18:53:42 2005 -+++ calendar/gui/e-calendar-table.c Sat Aug 27 18:53:58 2005 -@@ -1027,7 +1027,7 @@ e_calendar_table_on_save_as (EPopup *ep, - return; - } - -- fprintf (file, ical_string); -+ fprintf (file, "%s", ical_string); - g_free (ical_string); - fclose (file); - } diff --git a/mail/evolution/files/patch-widgets_misc_e-multi-config-dialog.c b/mail/evolution/files/patch-widgets_misc_e-multi-config-dialog.c deleted file mode 100644 index f2389bd047f1..000000000000 --- a/mail/evolution/files/patch-widgets_misc_e-multi-config-dialog.c +++ /dev/null @@ -1,19 +0,0 @@ ---- widgets/misc/e-multi-config-dialog.c.orig Tue Nov 23 15:53:34 2004 -+++ widgets/misc/e-multi-config-dialog.c Tue Nov 23 15:54:02 2004 -@@ -396,6 +396,7 @@ - { - EMultiConfigDialogPrivate *priv; - AtkObject *a11y; -+ AtkObject *a11yPage; - gint page_no; - - g_return_if_fail (E_IS_MULTI_CONFIG_DIALOG (dialog)); -@@ -418,7 +419,7 @@ - NULL); - - a11y = gtk_widget_get_accessible (GTK_WIDGET(priv->notebook)); -- AtkObject *a11yPage = atk_object_ref_accessible_child (a11y, page_no); -+ a11yPage = atk_object_ref_accessible_child (a11y, page_no); - if (a11yPage != NULL) { - if (atk_object_get_role (a11yPage) == ATK_ROLE_PAGE_TAB) - atk_object_set_name (a11yPage, title); diff --git a/mail/evolution/pkg-plist b/mail/evolution/pkg-plist index aeaf77774108..c25dda375ffc 100644 --- a/mail/evolution/pkg-plist +++ b/mail/evolution/pkg-plist @@ -1,20 +1,45 @@ bin/evolution bin/evolution-%%VERSION%% etc/rc.d/000.evolibs.sh +include/evolution-%%VERSION%%/a11y/e-table/gal-a11y-e-cell-popup.h +include/evolution-%%VERSION%%/a11y/e-table/gal-a11y-e-cell-registry.h +include/evolution-%%VERSION%%/a11y/e-table/gal-a11y-e-cell-text.h +include/evolution-%%VERSION%%/a11y/e-table/gal-a11y-e-cell-toggle.h +include/evolution-%%VERSION%%/a11y/e-table/gal-a11y-e-cell-tree.h +include/evolution-%%VERSION%%/a11y/e-table/gal-a11y-e-cell-vbox.h +include/evolution-%%VERSION%%/a11y/e-table/gal-a11y-e-cell.h +include/evolution-%%VERSION%%/a11y/e-table/gal-a11y-e-table-click-to-add-factory.h +include/evolution-%%VERSION%%/a11y/e-table/gal-a11y-e-table-click-to-add.h +include/evolution-%%VERSION%%/a11y/e-table/gal-a11y-e-table-column-header.h +include/evolution-%%VERSION%%/a11y/e-table/gal-a11y-e-table-factory.h +include/evolution-%%VERSION%%/a11y/e-table/gal-a11y-e-table-item-factory.h +include/evolution-%%VERSION%%/a11y/e-table/gal-a11y-e-table-item.h +include/evolution-%%VERSION%%/a11y/e-table/gal-a11y-e-table.h +include/evolution-%%VERSION%%/a11y/e-table/gal-a11y-e-tree-factory.h +include/evolution-%%VERSION%%/a11y/e-table/gal-a11y-e-tree.h +include/evolution-%%VERSION%%/a11y/e-text/gal-a11y-e-text-factory.h +include/evolution-%%VERSION%%/a11y/e-text/gal-a11y-e-text.h +include/evolution-%%VERSION%%/a11y/gal-a11y-factory.h +include/evolution-%%VERSION%%/a11y/gal-a11y-util.h +include/evolution-%%VERSION%%/addressbook/gui/widgets/eab-config.h +include/evolution-%%VERSION%%/addressbook/gui/widgets/eab-menu.h +include/evolution-%%VERSION%%/addressbook/gui/widgets/eab-popup.h include/evolution-%%VERSION%%/calendar/gui/e-cal-config.h include/evolution-%%VERSION%%/e-conduit/e-pilot-map.h include/evolution-%%VERSION%%/e-conduit/e-pilot-util.h include/evolution-%%VERSION%%/e-util/e-account-list.h include/evolution-%%VERSION%%/e-util/e-account.h include/evolution-%%VERSION%%/e-util/e-bconf-map.h +include/evolution-%%VERSION%%/e-util/e-bit-array.h include/evolution-%%VERSION%%/e-util/e-categories-config.h -include/evolution-%%VERSION%%/e-util/e-categories-master-list-wombat.h include/evolution-%%VERSION%%/e-util/e-component-listener.h include/evolution-%%VERSION%%/e-util/e-config-listener.h include/evolution-%%VERSION%%/e-util/e-config.h include/evolution-%%VERSION%%/e-util/e-corba-utils.h +include/evolution-%%VERSION%%/e-util/e-cursor.h include/evolution-%%VERSION%%/e-util/e-dialog-utils.h include/evolution-%%VERSION%%/e-util/e-dialog-widgets.h +include/evolution-%%VERSION%%/e-util/e-error.h include/evolution-%%VERSION%%/e-util/e-event.h include/evolution-%%VERSION%%/e-util/e-folder-map.h include/evolution-%%VERSION%%/e-util/e-fsutils.h @@ -22,6 +47,8 @@ include/evolution-%%VERSION%%/e-util/e-gtk-utils.h include/evolution-%%VERSION%%/e-util/e-gui-utils.h include/evolution-%%VERSION%%/e-util/e-html-utils.h include/evolution-%%VERSION%%/e-util/e-icon-factory.h +include/evolution-%%VERSION%%/e-util/e-iconv.h +include/evolution-%%VERSION%%/e-util/e-import.h include/evolution-%%VERSION%%/e-util/e-iterator.h include/evolution-%%VERSION%%/e-util/e-list-iterator.h include/evolution-%%VERSION%%/e-util/e-list.h @@ -30,58 +57,197 @@ include/evolution-%%VERSION%%/e-util/e-mktemp.h include/evolution-%%VERSION%%/e-util/e-plugin.h include/evolution-%%VERSION%%/e-util/e-popup.h include/evolution-%%VERSION%%/e-util/e-print.h +include/evolution-%%VERSION%%/e-util/e-profile-event.h include/evolution-%%VERSION%%/e-util/e-request.h include/evolution-%%VERSION%%/e-util/e-signature-list.h include/evolution-%%VERSION%%/e-util/e-signature.h +include/evolution-%%VERSION%%/e-util/e-sorter-array.h +include/evolution-%%VERSION%%/e-util/e-sorter.h +include/evolution-%%VERSION%%/e-util/e-text-event-processor-emacs-like.h +include/evolution-%%VERSION%%/e-util/e-text-event-processor-types.h +include/evolution-%%VERSION%%/e-util/e-text-event-processor.h include/evolution-%%VERSION%%/e-util/e-time-utils.h include/evolution-%%VERSION%%/e-util/e-uid.h +include/evolution-%%VERSION%%/e-util/e-util-marshal.h +include/evolution-%%VERSION%%/e-util/e-util.h +include/evolution-%%VERSION%%/e-util/e-xml-utils.h include/evolution-%%VERSION%%/e-util/md5-utils.h -include/evolution-%%VERSION%%/importer/GNOME_Evolution_Importer.h -include/evolution-%%VERSION%%/importer/evolution-importer-client.h -include/evolution-%%VERSION%%/importer/evolution-importer-listener.h -include/evolution-%%VERSION%%/importer/evolution-importer.h -include/evolution-%%VERSION%%/importer/evolution-intelligent-importer.h +include/evolution-%%VERSION%%/mail/Evolution-Mail.h +include/evolution-%%VERSION%%/mail/em-composer-utils.h +include/evolution-%%VERSION%%/mail/em-config.h +include/evolution-%%VERSION%%/mail/em-event.h +include/evolution-%%VERSION%%/mail/em-folder-browser.h +include/evolution-%%VERSION%%/mail/em-folder-tree-model.h +include/evolution-%%VERSION%%/mail/em-folder-tree.h +include/evolution-%%VERSION%%/mail/em-folder-utils.h +include/evolution-%%VERSION%%/mail/em-folder-view.h +include/evolution-%%VERSION%%/mail/em-format-hook.h +include/evolution-%%VERSION%%/mail/em-format-html-display.h +include/evolution-%%VERSION%%/mail/em-format-html-print.h +include/evolution-%%VERSION%%/mail/em-format-html.h +include/evolution-%%VERSION%%/mail/em-format-quote.h +include/evolution-%%VERSION%%/mail/em-format.h +include/evolution-%%VERSION%%/mail/em-html-stream.h +include/evolution-%%VERSION%%/mail/em-icon-stream.h +include/evolution-%%VERSION%%/mail/em-inline-filter.h +include/evolution-%%VERSION%%/mail/em-junk-hook.h +include/evolution-%%VERSION%%/mail/em-menu.h +include/evolution-%%VERSION%%/mail/em-message-browser.h +include/evolution-%%VERSION%%/mail/em-popup.h +include/evolution-%%VERSION%%/mail/em-stripsig-filter.h +include/evolution-%%VERSION%%/mail/em-sync-stream.h +include/evolution-%%VERSION%%/mail/em-utils.h +include/evolution-%%VERSION%%/mail/em-vfs-stream.h +include/evolution-%%VERSION%%/mail/mail-autofilter.h +include/evolution-%%VERSION%%/mail/mail-component.h +include/evolution-%%VERSION%%/mail/mail-config.h +include/evolution-%%VERSION%%/mail/mail-mt.h +include/evolution-%%VERSION%%/mail/mail-ops.h +include/evolution-%%VERSION%%/mail/mail-session.h +include/evolution-%%VERSION%%/mail/mail-tools.h +include/evolution-%%VERSION%%/mail/mail-vfolder.h +include/evolution-%%VERSION%%/mail/message-list.h +include/evolution-%%VERSION%%/menus/gal-define-views-dialog.h +include/evolution-%%VERSION%%/menus/gal-define-views-model.h +include/evolution-%%VERSION%%/menus/gal-view-collection.h +include/evolution-%%VERSION%%/menus/gal-view-etable.h +include/evolution-%%VERSION%%/menus/gal-view-factory-etable.h +include/evolution-%%VERSION%%/menus/gal-view-factory.h +include/evolution-%%VERSION%%/menus/gal-view-instance-save-as-dialog.h +include/evolution-%%VERSION%%/menus/gal-view-instance.h +include/evolution-%%VERSION%%/menus/gal-view-new-dialog.h +include/evolution-%%VERSION%%/menus/gal-view.h +include/evolution-%%VERSION%%/misc/e-activity-handler.h +include/evolution-%%VERSION%%/misc/e-attachment-bar.h +include/evolution-%%VERSION%%/misc/e-attachment.h +include/evolution-%%VERSION%%/misc/e-calendar-item.h +include/evolution-%%VERSION%%/misc/e-calendar.h +include/evolution-%%VERSION%%/misc/e-canvas-background.h +include/evolution-%%VERSION%%/misc/e-canvas-utils.h +include/evolution-%%VERSION%%/misc/e-canvas-vbox.h +include/evolution-%%VERSION%%/misc/e-canvas.h +include/evolution-%%VERSION%%/misc/e-cell-date-edit.h +include/evolution-%%VERSION%%/misc/e-cell-percent.h +include/evolution-%%VERSION%%/misc/e-cell-renderer-combo.h +include/evolution-%%VERSION%%/misc/e-charset-picker.h +include/evolution-%%VERSION%%/misc/e-clipped-label.h +include/evolution-%%VERSION%%/misc/e-colors.h +include/evolution-%%VERSION%%/misc/e-combo-button.h +include/evolution-%%VERSION%%/misc/e-combo-cell-editable.h +include/evolution-%%VERSION%%/misc/e-config-page.h +include/evolution-%%VERSION%%/misc/e-cursors.h +include/evolution-%%VERSION%%/misc/e-dateedit.h +include/evolution-%%VERSION%%/misc/e-dropdown-button.h +include/evolution-%%VERSION%%/misc/e-expander.h +include/evolution-%%VERSION%%/misc/e-gui-utils.h +include/evolution-%%VERSION%%/misc/e-hsv-utils.h +include/evolution-%%VERSION%%/misc/e-image-chooser.h +include/evolution-%%VERSION%%/misc/e-info-label.h +include/evolution-%%VERSION%%/misc/e-map.h +include/evolution-%%VERSION%%/misc/e-multi-config-dialog.h +%%PILOT:%%include/evolution-%%VERSION%%/misc/e-pilot-settings.h +include/evolution-%%VERSION%%/misc/e-popup-menu.h +include/evolution-%%VERSION%%/misc/e-printable.h +include/evolution-%%VERSION%%/misc/e-reflow-model.h +include/evolution-%%VERSION%%/misc/e-reflow.h +include/evolution-%%VERSION%%/misc/e-search-bar.h +include/evolution-%%VERSION%%/misc/e-selection-model-array.h +include/evolution-%%VERSION%%/misc/e-selection-model-simple.h +include/evolution-%%VERSION%%/misc/e-selection-model.h +include/evolution-%%VERSION%%/misc/e-send-options.h +include/evolution-%%VERSION%%/misc/e-task-bar.h +include/evolution-%%VERSION%%/misc/e-task-widget.h +include/evolution-%%VERSION%%/misc/e-unicode.h +include/evolution-%%VERSION%%/misc/e-url-entry.h +include/evolution-%%VERSION%%/misc/gal-combo-box.h +include/evolution-%%VERSION%%/misc/gal-combo-text.h include/evolution-%%VERSION%%/shell/Evolution.h -include/evolution-%%VERSION%%/shell/e-shell-corba-icon-utils.h include/evolution-%%VERSION%%/shell/e-shell-utils.h include/evolution-%%VERSION%%/shell/e-user-creatable-items-handler.h +include/evolution-%%VERSION%%/shell/es-event.h +include/evolution-%%VERSION%%/shell/es-menu.h +include/evolution-%%VERSION%%/shell/evolution-component.h include/evolution-%%VERSION%%/shell/evolution-config-control.h +include/evolution-%%VERSION%%/shell/evolution-listener.h include/evolution-%%VERSION%%/shell/evolution-shell-component-utils.h -include/evolution-%%VERSION%%/shell/evolution-wizard.h -include/evolution-%%VERSION%%/widgets/e-activity-handler.h -include/evolution-%%VERSION%%/widgets/e-calendar-item.h -include/evolution-%%VERSION%%/widgets/e-calendar.h -include/evolution-%%VERSION%%/widgets/e-cell-date-edit.h -include/evolution-%%VERSION%%/widgets/e-cell-percent.h -include/evolution-%%VERSION%%/widgets/e-cell-renderer-combo.h -include/evolution-%%VERSION%%/widgets/e-charset-picker.h -include/evolution-%%VERSION%%/widgets/e-clipped-label.h -include/evolution-%%VERSION%%/widgets/e-combo-button.h -include/evolution-%%VERSION%%/widgets/e-combo-cell-editable.h -include/evolution-%%VERSION%%/widgets/e-config-page.h -include/evolution-%%VERSION%%/widgets/e-dateedit.h -include/evolution-%%VERSION%%/widgets/e-dropdown-button.h -include/evolution-%%VERSION%%/widgets/e-error.h -include/evolution-%%VERSION%%/widgets/e-expander.h -include/evolution-%%VERSION%%/widgets/e-image-chooser.h -include/evolution-%%VERSION%%/widgets/e-info-label.h -include/evolution-%%VERSION%%/widgets/e-map.h -include/evolution-%%VERSION%%/widgets/e-multi-config-dialog.h -%%PILOT:%%include/evolution-%%VERSION%%/widgets/e-pilot-settings.h -include/evolution-%%VERSION%%/widgets/e-search-bar.h -include/evolution-%%VERSION%%/widgets/e-send-options.h -include/evolution-%%VERSION%%/widgets/e-task-bar.h -include/evolution-%%VERSION%%/widgets/e-task-widget.h -include/evolution-%%VERSION%%/widgets/e-url-entry.h +include/evolution-%%VERSION%%/table/e-cell-checkbox.h +include/evolution-%%VERSION%%/table/e-cell-combo.h +include/evolution-%%VERSION%%/table/e-cell-date.h +include/evolution-%%VERSION%%/table/e-cell-float.h +include/evolution-%%VERSION%%/table/e-cell-number.h +include/evolution-%%VERSION%%/table/e-cell-pixbuf.h +include/evolution-%%VERSION%%/table/e-cell-popup.h +include/evolution-%%VERSION%%/table/e-cell-progress.h +include/evolution-%%VERSION%%/table/e-cell-size.h +include/evolution-%%VERSION%%/table/e-cell-spin-button.h +include/evolution-%%VERSION%%/table/e-cell-text.h +include/evolution-%%VERSION%%/table/e-cell-toggle.h +include/evolution-%%VERSION%%/table/e-cell-tree.h +include/evolution-%%VERSION%%/table/e-cell-vbox.h +include/evolution-%%VERSION%%/table/e-cell.h +include/evolution-%%VERSION%%/table/e-table-click-to-add.h +include/evolution-%%VERSION%%/table/e-table-col-dnd.h +include/evolution-%%VERSION%%/table/e-table-col.h +include/evolution-%%VERSION%%/table/e-table-column-specification.h +include/evolution-%%VERSION%%/table/e-table-config.h +include/evolution-%%VERSION%%/table/e-table-defines.h +include/evolution-%%VERSION%%/table/e-table-extras.h +include/evolution-%%VERSION%%/table/e-table-field-chooser-dialog.h +include/evolution-%%VERSION%%/table/e-table-field-chooser-item.h +include/evolution-%%VERSION%%/table/e-table-field-chooser.h +include/evolution-%%VERSION%%/table/e-table-group-container.h +include/evolution-%%VERSION%%/table/e-table-group-leaf.h +include/evolution-%%VERSION%%/table/e-table-group.h +include/evolution-%%VERSION%%/table/e-table-header-item.h +include/evolution-%%VERSION%%/table/e-table-header-utils.h +include/evolution-%%VERSION%%/table/e-table-header.h +include/evolution-%%VERSION%%/table/e-table-item.h +include/evolution-%%VERSION%%/table/e-table-memory-callbacks.h +include/evolution-%%VERSION%%/table/e-table-memory-store.h +include/evolution-%%VERSION%%/table/e-table-memory.h +include/evolution-%%VERSION%%/table/e-table-model.h +include/evolution-%%VERSION%%/table/e-table-one.h +include/evolution-%%VERSION%%/table/e-table-scrolled.h +include/evolution-%%VERSION%%/table/e-table-search.h +include/evolution-%%VERSION%%/table/e-table-selection-model.h +include/evolution-%%VERSION%%/table/e-table-simple.h +include/evolution-%%VERSION%%/table/e-table-sort-info.h +include/evolution-%%VERSION%%/table/e-table-sorted-variable.h +include/evolution-%%VERSION%%/table/e-table-sorted.h +include/evolution-%%VERSION%%/table/e-table-sorter.h +include/evolution-%%VERSION%%/table/e-table-sorting-utils.h +include/evolution-%%VERSION%%/table/e-table-specification.h +include/evolution-%%VERSION%%/table/e-table-state.h +include/evolution-%%VERSION%%/table/e-table-subset-variable.h +include/evolution-%%VERSION%%/table/e-table-subset.h +include/evolution-%%VERSION%%/table/e-table-tooltip.h +include/evolution-%%VERSION%%/table/e-table-utils.h +include/evolution-%%VERSION%%/table/e-table-without.h +include/evolution-%%VERSION%%/table/e-table.h +include/evolution-%%VERSION%%/table/e-tree-memory-callbacks.h +include/evolution-%%VERSION%%/table/e-tree-memory.h +include/evolution-%%VERSION%%/table/e-tree-model.h +include/evolution-%%VERSION%%/table/e-tree-scrolled.h +include/evolution-%%VERSION%%/table/e-tree-selection-model.h +include/evolution-%%VERSION%%/table/e-tree-sorted.h +include/evolution-%%VERSION%%/table/e-tree-table-adapter.h +include/evolution-%%VERSION%%/table/e-tree.h +include/evolution-%%VERSION%%/text/e-completion-callbacks.h +include/evolution-%%VERSION%%/text/e-completion-match.h +include/evolution-%%VERSION%%/text/e-completion-view.h +include/evolution-%%VERSION%%/text/e-completion.h +include/evolution-%%VERSION%%/text/e-entry.h +include/evolution-%%VERSION%%/text/e-table-text-model.h +include/evolution-%%VERSION%%/text/e-text-model-repos.h +include/evolution-%%VERSION%%/text/e-text-model-uri.h +include/evolution-%%VERSION%%/text/e-text-model.h +include/evolution-%%VERSION%%/text/e-text.h lib/evolution/%%VERSION%%/components/libevolution-addressbook.so lib/evolution/%%VERSION%%/components/libevolution-calendar.so lib/evolution/%%VERSION%%/components/libevolution-mail.so %%PILOT:%%lib/evolution/%%VERSION%%/conduits/libeaddress_conduit.so %%PILOT:%%lib/evolution/%%VERSION%%/conduits/libecalendar_conduit.so %%PILOT:%%lib/evolution/%%VERSION%%/conduits/libetodo_conduit.so -lib/evolution/%%VERSION%%/evolution-addressbook-importers/libevolution-addressbook-ldif-importer.so -lib/evolution/%%VERSION%%/evolution-addressbook-importers/libevolution-addressbook-vcard-importer.so -lib/evolution/%%VERSION%%/evolution-calendar-importers/libevolution-calendar-importers.so lib/evolution/%%VERSION%%/libeabutil.a lib/evolution/%%VERSION%%/libeabutil.so lib/evolution/%%VERSION%%/libeabutil.so.0 @@ -106,6 +272,12 @@ lib/evolution/%%VERSION%%/libeshell.so.0 lib/evolution/%%VERSION%%/libessmime.a lib/evolution/%%VERSION%%/libessmime.so lib/evolution/%%VERSION%%/libessmime.so.0 +lib/evolution/%%VERSION%%/libetable.a +lib/evolution/%%VERSION%%/libetable.so +lib/evolution/%%VERSION%%/libetable.so.0 +lib/evolution/%%VERSION%%/libetext.a +lib/evolution/%%VERSION%%/libetext.so +lib/evolution/%%VERSION%%/libetext.so.0 lib/evolution/%%VERSION%%/libetimezonedialog.a lib/evolution/%%VERSION%%/libetimezonedialog.so lib/evolution/%%VERSION%%/libetimezonedialog.so.0 @@ -118,12 +290,15 @@ lib/evolution/%%VERSION%%/libevolution-a11y.so.0 lib/evolution/%%VERSION%%/libevolution-addressbook-a11y.a lib/evolution/%%VERSION%%/libevolution-addressbook-a11y.so lib/evolution/%%VERSION%%/libevolution-addressbook-a11y.so.0 +lib/evolution/%%VERSION%%/libevolution-addressbook-importers.a +lib/evolution/%%VERSION%%/libevolution-addressbook-importers.so +lib/evolution/%%VERSION%%/libevolution-addressbook-importers.so.0 lib/evolution/%%VERSION%%/libevolution-calendar-a11y.a lib/evolution/%%VERSION%%/libevolution-calendar-a11y.so lib/evolution/%%VERSION%%/libevolution-calendar-a11y.so.0 -lib/evolution/%%VERSION%%/libevolution-importer.a -lib/evolution/%%VERSION%%/libevolution-importer.so -lib/evolution/%%VERSION%%/libevolution-importer.so.0 +lib/evolution/%%VERSION%%/libevolution-calendar-importers.a +lib/evolution/%%VERSION%%/libevolution-calendar-importers.so +lib/evolution/%%VERSION%%/libevolution-calendar-importers.so.0 lib/evolution/%%VERSION%%/libevolution-mail-importers.a lib/evolution/%%VERSION%%/libevolution-mail-importers.so lib/evolution/%%VERSION%%/libevolution-mail-importers.so.0 @@ -139,72 +314,71 @@ lib/evolution/%%VERSION%%/libfilter.so.0 lib/evolution/%%VERSION%%/libmenus.a lib/evolution/%%VERSION%%/libmenus.so lib/evolution/%%VERSION%%/libmenus.so.0 +lib/evolution/%%VERSION%%/plugins/libmail-account-disable.so lib/evolution/%%VERSION%%/plugins/liborg-gnome-addressbook-file.so -lib/evolution/%%VERSION%%/plugins/liborg-gnome-addressbook-groupwise.so -%%GSTREAMER%%lib/evolution/%%VERSION%%/plugins/liborg-gnome-audio-inline.so +lib/evolution/%%VERSION%%/plugins/liborg-gnome-audio-inline.so lib/evolution/%%VERSION%%/plugins/liborg-gnome-calendar-file.so lib/evolution/%%VERSION%%/plugins/liborg-gnome-calendar-http.so lib/evolution/%%VERSION%%/plugins/liborg-gnome-calendar-weather.so -lib/evolution/%%VERSION%%/plugins/liborg-gnome-compose-send-options.so lib/evolution/%%VERSION%%/plugins/liborg-gnome-copy-tool.so +lib/evolution/%%VERSION%%/plugins/liborg-gnome-default-mailer.so lib/evolution/%%VERSION%%/plugins/liborg-gnome-default-source.so lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-bbdb.so lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-startup-wizard.so -lib/evolution/%%VERSION%%/plugins/liborg-gnome-exchange-account-settings.so +lib/evolution/%%VERSION%%/plugins/liborg-gnome-exchange-operations.so +lib/evolution/%%VERSION%%/plugins/liborg-gnome-groupwise-features.so lib/evolution/%%VERSION%%/plugins/liborg-gnome-gw-account-setup.so lib/evolution/%%VERSION%%/plugins/liborg-gnome-itip-formatter.so -lib/evolution/%%VERSION%%/plugins/liborg-gnome-mail-folder-unsubscribe.so lib/evolution/%%VERSION%%/plugins/liborg-gnome-mail-to-task.so lib/evolution/%%VERSION%%/plugins/liborg-gnome-mailing-list-actions.so +lib/evolution/%%VERSION%%/plugins/liborg-gnome-mark-all-read.so lib/evolution/%%VERSION%%/plugins/liborg-gnome-mark-calendar-offline.so -lib/evolution/%%VERSION%%/plugins/liborg-gnome-prefer-plain.so +%%DBUS%%lib/evolution/%%VERSION%%/plugins/liborg-gnome-new-mail-notify.so lib/evolution/%%VERSION%%/plugins/liborg-gnome-plugin-manager.so -lib/evolution/%%VERSION%%/plugins/liborg-gnome-save-attachments.so +lib/evolution/%%VERSION%%/plugins/liborg-gnome-print-message.so +lib/evolution/%%VERSION%%/plugins/liborg-gnome-sa-junk-plugin.so lib/evolution/%%VERSION%%/plugins/liborg-gnome-save-calendar.so lib/evolution/%%VERSION%%/plugins/liborg-gnome-select-one-source.so -lib/evolution/%%VERSION%%/plugins/liborg-gnome-send-options.so -lib/evolution/%%VERSION%%/plugins/liborg-gnome-shared-folder.so -lib/evolution/%%VERSION%%/plugins/liborg-gnome-status-track.so lib/evolution/%%VERSION%%/plugins/liborg-gnome-subject-thread.so lib/evolution/%%VERSION%%/plugins/org-gnome-addressbook-file.eplug -lib/evolution/%%VERSION%%/plugins/org-gnome-addressbook-groupwise.eplug -%%GSTREAMER%%lib/evolution/%%VERSION%%/plugins/org-gnome-audio-inline.eplug +lib/evolution/%%VERSION%%/plugins/org-gnome-audio-inline.eplug lib/evolution/%%VERSION%%/plugins/org-gnome-calendar-file.eplug lib/evolution/%%VERSION%%/plugins/org-gnome-calendar-http.eplug lib/evolution/%%VERSION%%/plugins/org-gnome-calendar-weather.eplug -lib/evolution/%%VERSION%%/plugins/org-gnome-compose-send-options.eplug lib/evolution/%%VERSION%%/plugins/org-gnome-compose-send-options.xml lib/evolution/%%VERSION%%/plugins/org-gnome-copy-tool.eplug +lib/evolution/%%VERSION%%/plugins/org-gnome-default-mailer.eplug lib/evolution/%%VERSION%%/plugins/org-gnome-default-source.eplug lib/evolution/%%VERSION%%/plugins/org-gnome-evolution-bbdb.eplug lib/evolution/%%VERSION%%/plugins/org-gnome-evolution-startup-wizard.eplug -lib/evolution/%%VERSION%%/plugins/org-gnome-exchange-account-setup.eplug +lib/evolution/%%VERSION%%/plugins/org-gnome-exchange-ab-subscription.xml +lib/evolution/%%VERSION%%/plugins/org-gnome-exchange-cal-subscription.xml +lib/evolution/%%VERSION%%/plugins/org-gnome-exchange-operations.eplug +lib/evolution/%%VERSION%%/plugins/org-gnome-exchange-tasks-subscription.xml +lib/evolution/%%VERSION%%/plugins/org-gnome-folder-permissions.xml +lib/evolution/%%VERSION%%/plugins/org-gnome-folder-subscription.xml +lib/evolution/%%VERSION%%/plugins/org-gnome-groupwise-features.eplug lib/evolution/%%VERSION%%/plugins/org-gnome-gw-account-setup.eplug lib/evolution/%%VERSION%%/plugins/org-gnome-itip-formatter.eplug -lib/evolution/%%VERSION%%/plugins/org-gnome-mail-folder-unsubscribe.eplug +lib/evolution/%%VERSION%%/plugins/org-gnome-mail-account-disable.eplug lib/evolution/%%VERSION%%/plugins/org-gnome-mail-to-task.eplug lib/evolution/%%VERSION%%/plugins/org-gnome-mailing-list-actions.eplug lib/evolution/%%VERSION%%/plugins/org-gnome-mailing-list-actions.xml +lib/evolution/%%VERSION%%/plugins/org-gnome-mark-all-read.eplug lib/evolution/%%VERSION%%/plugins/org-gnome-mark-calendar-offline.eplug +%%DBUS%%lib/evolution/%%VERSION%%/plugins/org-gnome-new-mail-notify.eplug lib/evolution/%%VERSION%%/plugins/org-gnome-plugin-manager.eplug lib/evolution/%%VERSION%%/plugins/org-gnome-plugin-manager.xml -lib/evolution/%%VERSION%%/plugins/org-gnome-prefer-plain.eplug -lib/evolution/%%VERSION%%/plugins/org-gnome-save-attachments.eplug -lib/evolution/%%VERSION%%/plugins/org-gnome-save-attachments.xml +lib/evolution/%%VERSION%%/plugins/org-gnome-print-message.eplug +lib/evolution/%%VERSION%%/plugins/org-gnome-print-message.xml +lib/evolution/%%VERSION%%/plugins/org-gnome-sa-junk-plugin.eplug lib/evolution/%%VERSION%%/plugins/org-gnome-save-calendar.eplug lib/evolution/%%VERSION%%/plugins/org-gnome-select-one-source.eplug -lib/evolution/%%VERSION%%/plugins/org-gnome-send-options.eplug -lib/evolution/%%VERSION%%/plugins/org-gnome-shared-folder.eplug -lib/evolution/%%VERSION%%/plugins/org-gnome-status-track.eplug lib/evolution/%%VERSION%%/plugins/org-gnome-subject-thread.eplug libdata/bonobo/servers/GNOME_Evolution_Addressbook_%%VERSION%%.server -libdata/bonobo/servers/GNOME_Evolution_Addressbook_LDIF_Importer_%%VERSION%%.server -libdata/bonobo/servers/GNOME_Evolution_Addressbook_VCard_Importer_%%VERSION%%.server libdata/bonobo/servers/GNOME_Evolution_Calendar_%%VERSION%%.server libdata/bonobo/servers/GNOME_Evolution_Calendar_AlarmNotify_%%VERSION%%.server -libdata/bonobo/servers/GNOME_Evolution_Calendar_Importer_%%VERSION%%.server libdata/bonobo/servers/GNOME_Evolution_Mail_%%VERSION%%.server -libdata/bonobo/servers/GNOME_Evolution_Mail_Importers_%%VERSION%%.server libdata/bonobo/servers/GNOME_Evolution_Shell_%%VERSION%%.server libdata/pkgconfig/evolution-plugin-%%VERSION%%.pc libdata/pkgconfig/evolution-shell-%%VERSION%%.pc @@ -225,16 +399,20 @@ share/gnome/evolution/%%VERSION%%/default/zh_CN/mail/local/Inbox share/gnome/evolution/%%VERSION%%/ecps/medbook.ecps share/gnome/evolution/%%VERSION%%/ecps/phonelist.ecps share/gnome/evolution/%%VERSION%%/ecps/smallbook.ecps -share/gnome/evolution/%%VERSION%%/errors/addressbook-errors.xml -share/gnome/evolution/%%VERSION%%/errors/calendar-errors.xml -share/gnome/evolution/%%VERSION%%/errors/e-system-errors.xml -share/gnome/evolution/%%VERSION%%/errors/filter-errors.xml -share/gnome/evolution/%%VERSION%%/errors/org-gnome-itip-formatter-errors.xml -share/gnome/evolution/%%VERSION%%/errors/org-gnome-mailing-list-actions-errors.xml -share/gnome/evolution/%%VERSION%%/errors/org-gnome-shared-folder-errors.xml -share/gnome/evolution/%%VERSION%%/errors/mail-composer-errors.xml -share/gnome/evolution/%%VERSION%%/errors/mail-errors.xml -share/gnome/evolution/%%VERSION%%/errors/shell-errors.xml +share/gnome/evolution/%%VERSION%%/errors/addressbook.error +share/gnome/evolution/%%VERSION%%/errors/calendar.error +share/gnome/evolution/%%VERSION%%/errors/e-system.error +share/gnome/evolution/%%VERSION%%/errors/filter.error +share/gnome/evolution/%%VERSION%%/errors/mail-composer.error +share/gnome/evolution/%%VERSION%%/errors/mail.error +share/gnome/evolution/%%VERSION%%/errors/org-gnome-default-mailer.error +share/gnome/evolution/%%VERSION%%/errors/org-gnome-exchange-operations.error +share/gnome/evolution/%%VERSION%%/errors/org-gnome-itip-formatter.error +share/gnome/evolution/%%VERSION%%/errors/org-gnome-mailing-list-actions.error +share/gnome/evolution/%%VERSION%%/errors/org-gnome-proxy-errors.xml +share/gnome/evolution/%%VERSION%%/errors/org-gnome-proxy-login-errors.xml +share/gnome/evolution/%%VERSION%%/errors/org-gnome-shared-folder.errors.xml +share/gnome/evolution/%%VERSION%%/errors/shell.error share/gnome/evolution/%%VERSION%%/etspec/e-addressbook-view.etspec share/gnome/evolution/%%VERSION%%/etspec/e-cal-list-view.etspec share/gnome/evolution/%%VERSION%%/etspec/e-calendar-table.etspec @@ -245,32 +423,46 @@ share/gnome/evolution/%%VERSION%%/filtertypes.xml share/gnome/evolution/%%VERSION%%/glade/alarm-dialog.glade share/gnome/evolution/%%VERSION%%/glade/alarm-list-dialog.glade share/gnome/evolution/%%VERSION%%/glade/alarm-notify.glade -share/gnome/evolution/%%VERSION%%/glade/cal-attachment.glade share/gnome/evolution/%%VERSION%%/glade/cal-prefs-dialog.glade share/gnome/evolution/%%VERSION%%/glade/contact-editor.glade share/gnome/evolution/%%VERSION%%/glade/contact-list-editor.glade share/gnome/evolution/%%VERSION%%/glade/e-active-connection-dialog.glade +share/gnome/evolution/%%VERSION%%/glade/e-attachment.glade share/gnome/evolution/%%VERSION%%/glade/e-contact-print.glade share/gnome/evolution/%%VERSION%%/glade/e-delegate-dialog.glade +share/gnome/evolution/%%VERSION%%/glade/e-foreign-folder-dialog.glade share/gnome/evolution/%%VERSION%%/glade/e-itip-control.glade -share/gnome/evolution/%%VERSION%%/glade/e-msg-composer-attachment.glade share/gnome/evolution/%%VERSION%%/glade/e-send-options.glade +share/gnome/evolution/%%VERSION%%/glade/e-table-config-no-group.glade +share/gnome/evolution/%%VERSION%%/glade/e-table-config.glade +share/gnome/evolution/%%VERSION%%/glade/e-table-field-chooser.glade share/gnome/evolution/%%VERSION%%/glade/e-timezone-dialog.glade share/gnome/evolution/%%VERSION%%/glade/eab-contact-commit-duplicate-detected.glade share/gnome/evolution/%%VERSION%%/glade/eab-contact-duplicate-detected.glade share/gnome/evolution/%%VERSION%%/glade/event-page.glade -share/gnome/evolution/%%VERSION%%/glade/evolution-startup-wizard.glade +share/gnome/evolution/%%VERSION%%/glade/exchange-change-password.glade +share/gnome/evolution/%%VERSION%%/glade/exchange-delegates.glade +share/gnome/evolution/%%VERSION%%/glade/exchange-folder-tree.glade +share/gnome/evolution/%%VERSION%%/glade/exchange-permissions-dialog.glade share/gnome/evolution/%%VERSION%%/glade/filter.glade share/gnome/evolution/%%VERSION%%/glade/fulladdr.glade share/gnome/evolution/%%VERSION%%/glade/fullname.glade +share/gnome/evolution/%%VERSION%%/glade/gal-categories.glade +share/gnome/evolution/%%VERSION%%/glade/gal-define-views.glade +share/gnome/evolution/%%VERSION%%/glade/gal-view-instance-save-as-dialog.glade +share/gnome/evolution/%%VERSION%%/glade/gal-view-new-dialog.glade share/gnome/evolution/%%VERSION%%/glade/goto-dialog.glade share/gnome/evolution/%%VERSION%%/glade/im.glade share/gnome/evolution/%%VERSION%%/glade/import.glade +share/gnome/evolution/%%VERSION%%/glade/junk-settings.glade share/gnome/evolution/%%VERSION%%/glade/ldap-config.glade share/gnome/evolution/%%VERSION%%/glade/mail-config.glade share/gnome/evolution/%%VERSION%%/glade/mail-dialogs.glade share/gnome/evolution/%%VERSION%%/glade/meeting-page.glade share/gnome/evolution/%%VERSION%%/glade/properties.glade +share/gnome/evolution/%%VERSION%%/glade/proxy-add-dialog.glade +share/gnome/evolution/%%VERSION%%/glade/proxy-listing.glade +share/gnome/evolution/%%VERSION%%/glade/proxy-login-dialog.glade share/gnome/evolution/%%VERSION%%/glade/recurrence-page.glade share/gnome/evolution/%%VERSION%%/glade/schedule-page.glade share/gnome/evolution/%%VERSION%%/glade/smime-ui.glade @@ -327,73 +519,71 @@ share/gnome/evolution/%%VERSION%%/weather/category_weather_tstorm_16.png %%PILOT:%%share/gnome/gnome-pilot/conduits/e-address-%%VERSION%%.conduit %%PILOT:%%share/gnome/gnome-pilot/conduits/e-calendar-%%VERSION%%.conduit %%PILOT:%%share/gnome/gnome-pilot/conduits/e-todo-%%VERSION%%.conduit -share/gnome/help/evolution-%%PORTVERSION%%/C/evolution-%%PORTVERSION%%.xml -share/gnome/help/evolution-%%PORTVERSION%%/C/figures/calendar.png -share/gnome/help/evolution-%%PORTVERSION%%/C/figures/config-cal.png -share/gnome/help/evolution-%%PORTVERSION%%/C/figures/config-mail.png -share/gnome/help/evolution-%%PORTVERSION%%/C/figures/contact-editor.png -share/gnome/help/evolution-%%PORTVERSION%%/C/figures/contact.png -share/gnome/help/evolution-%%PORTVERSION%%/C/figures/contacts_mainwindow_a.png -share/gnome/help/evolution-%%PORTVERSION%%/C/figures/evo_account_info_a.png -share/gnome/help/evolution-%%PORTVERSION%%/C/figures/evo_contacteditor_a.png -share/gnome/help/evolution-%%PORTVERSION%%/C/figures/evo_email_a.png -share/gnome/help/evolution-%%PORTVERSION%%/C/figures/evo_gwreceive_a.png -share/gnome/help/evolution-%%PORTVERSION%%/C/figures/evo_identity_a.png -share/gnome/help/evolution-%%PORTVERSION%%/C/figures/evo_imapreceive_a.png -share/gnome/help/evolution-%%PORTVERSION%%/C/figures/evo_mail_callout_a.png -share/gnome/help/evolution-%%PORTVERSION%%/C/figures/evo_maildirreceive_a.png -share/gnome/help/evolution-%%PORTVERSION%%/C/figures/evo_mboxreceive_a.png -share/gnome/help/evolution-%%PORTVERSION%%/C/figures/evo_mereceive_a.png -share/gnome/help/evolution-%%PORTVERSION%%/C/figures/evo_mhreceive_a.png -share/gnome/help/evolution-%%PORTVERSION%%/C/figures/evo_newmess_a.png -share/gnome/help/evolution-%%PORTVERSION%%/C/figures/evo_popreceive_a.png -share/gnome/help/evolution-%%PORTVERSION%%/C/figures/evo_receive_setup2_a.png -share/gnome/help/evolution-%%PORTVERSION%%/C/figures/evo_receive_setup_a.png -share/gnome/help/evolution-%%PORTVERSION%%/C/figures/evo_rule_a.png -share/gnome/help/evolution-%%PORTVERSION%%/C/figures/evo_send_setup_a.png -share/gnome/help/evolution-%%PORTVERSION%%/C/figures/evo_timezone_a.png -share/gnome/help/evolution-%%PORTVERSION%%/C/figures/evo_usereceive_a.png -share/gnome/help/evolution-%%PORTVERSION%%/C/figures/exchange-delegation.png -share/gnome/help/evolution-%%PORTVERSION%%/C/figures/exchange-identity.png -share/gnome/help/evolution-%%PORTVERSION%%/C/figures/exchange-receive-options.png -share/gnome/help/evolution-%%PORTVERSION%%/C/figures/exchange-receive.png -share/gnome/help/evolution-%%PORTVERSION%%/C/figures/filter-new-fig.png -share/gnome/help/evolution-%%PORTVERSION%%/C/figures/full-1.png -share/gnome/help/evolution-%%PORTVERSION%%/C/figures/full-2.png -share/gnome/help/evolution-%%PORTVERSION%%/C/figures/full-3.png -share/gnome/help/evolution-%%PORTVERSION%%/C/figures/full-4.png -share/gnome/help/evolution-%%PORTVERSION%%/C/figures/full-5.png -share/gnome/help/evolution-%%PORTVERSION%%/C/figures/full-6.png -share/gnome/help/evolution-%%PORTVERSION%%/C/figures/full-7.png -share/gnome/help/evolution-%%PORTVERSION%%/C/figures/mail-druid-pic.png -share/gnome/help/evolution-%%PORTVERSION%%/C/figures/mail-inbox.png -share/gnome/help/evolution-%%PORTVERSION%%/C/figures/mail-threaded.png -share/gnome/help/evolution-%%PORTVERSION%%/C/figures/mainwindow-pic.png -share/gnome/help/evolution-%%PORTVERSION%%/C/figures/mail_mainwindow_a.png -share/gnome/help/evolution-%%PORTVERSION%%/C/figures/newmsg.png -share/gnome/help/evolution-%%PORTVERSION%%/C/figures/replymsg.png -share/gnome/help/evolution-%%PORTVERSION%%/C/figures/schedule.png -share/gnome/help/evolution-%%PORTVERSION%%/C/figures/vfolder-createrule-fig.png +share/gnome/help/evolution-%%VERSION%%/C/evolution-%%VERSION%%.xml +share/gnome/help/evolution-%%VERSION%%/C/figures/calendar.png +share/gnome/help/evolution-%%VERSION%%/C/figures/config-cal.png +share/gnome/help/evolution-%%VERSION%%/C/figures/config-mail.png +share/gnome/help/evolution-%%VERSION%%/C/figures/contact-editor.png +share/gnome/help/evolution-%%VERSION%%/C/figures/contact.png +share/gnome/help/evolution-%%VERSION%%/C/figures/contacts_mainwindow_a.png +share/gnome/help/evolution-%%VERSION%%/C/figures/evo_account_info_a.png +share/gnome/help/evolution-%%VERSION%%/C/figures/evo_contacteditor_a.png +share/gnome/help/evolution-%%VERSION%%/C/figures/evo_email_a.png +share/gnome/help/evolution-%%VERSION%%/C/figures/evo_gwreceive_a.png +share/gnome/help/evolution-%%VERSION%%/C/figures/evo_identity_a.png +share/gnome/help/evolution-%%VERSION%%/C/figures/evo_imapreceive_a.png +share/gnome/help/evolution-%%VERSION%%/C/figures/evo_mail_callout_a.png +share/gnome/help/evolution-%%VERSION%%/C/figures/evo_maildirreceive_a.png +share/gnome/help/evolution-%%VERSION%%/C/figures/evo_mboxreceive_a.png +share/gnome/help/evolution-%%VERSION%%/C/figures/evo_mereceive_a.png +share/gnome/help/evolution-%%VERSION%%/C/figures/evo_mhreceive_a.png +share/gnome/help/evolution-%%VERSION%%/C/figures/evo_newmess_a.png +share/gnome/help/evolution-%%VERSION%%/C/figures/evo_popreceive_a.png +share/gnome/help/evolution-%%VERSION%%/C/figures/evo_receive_setup2_a.png +share/gnome/help/evolution-%%VERSION%%/C/figures/evo_receive_setup_a.png +share/gnome/help/evolution-%%VERSION%%/C/figures/evo_rule_a.png +share/gnome/help/evolution-%%VERSION%%/C/figures/evo_send_setup_a.png +share/gnome/help/evolution-%%VERSION%%/C/figures/evo_timezone_a.png +share/gnome/help/evolution-%%VERSION%%/C/figures/evo_usereceive_a.png +share/gnome/help/evolution-%%VERSION%%/C/figures/exchange-delegation.png +share/gnome/help/evolution-%%VERSION%%/C/figures/exchange-identity.png +share/gnome/help/evolution-%%VERSION%%/C/figures/exchange-receive-options.png +share/gnome/help/evolution-%%VERSION%%/C/figures/exchange-receive.png +share/gnome/help/evolution-%%VERSION%%/C/figures/filter-new-fig.png +share/gnome/help/evolution-%%VERSION%%/C/figures/full-1.png +share/gnome/help/evolution-%%VERSION%%/C/figures/full-2.png +share/gnome/help/evolution-%%VERSION%%/C/figures/full-3.png +share/gnome/help/evolution-%%VERSION%%/C/figures/full-4.png +share/gnome/help/evolution-%%VERSION%%/C/figures/full-5.png +share/gnome/help/evolution-%%VERSION%%/C/figures/full-6.png +share/gnome/help/evolution-%%VERSION%%/C/figures/full-7.png +share/gnome/help/evolution-%%VERSION%%/C/figures/mail-druid-pic.png +share/gnome/help/evolution-%%VERSION%%/C/figures/mail-inbox.png +share/gnome/help/evolution-%%VERSION%%/C/figures/mail-threaded.png +share/gnome/help/evolution-%%VERSION%%/C/figures/mail_mainwindow_a.png +share/gnome/help/evolution-%%VERSION%%/C/figures/mainwindow-pic.png +share/gnome/help/evolution-%%VERSION%%/C/figures/newmsg.png +share/gnome/help/evolution-%%VERSION%%/C/figures/replymsg.png +share/gnome/help/evolution-%%VERSION%%/C/figures/schedule.png +share/gnome/help/evolution-%%VERSION%%/C/figures/vfolder-createrule-fig.png share/gnome/idl/evolution-%%VERSION%%/Composer.idl share/gnome/idl/evolution-%%VERSION%%/Evolution-Component.idl share/gnome/idl/evolution-%%VERSION%%/Evolution-Composer.idl share/gnome/idl/evolution-%%VERSION%%/Evolution-ConfigControl.idl -share/gnome/idl/evolution-%%VERSION%%/Evolution-Offline.idl +share/gnome/idl/evolution-%%VERSION%%/Evolution-Mail.idl share/gnome/idl/evolution-%%VERSION%%/Evolution-Shell.idl -share/gnome/idl/evolution-%%VERSION%%/Evolution-Wizard.idl -share/gnome/idl/evolution-%%VERSION%%/Evolution-common.idl share/gnome/idl/evolution-%%VERSION%%/Evolution.idl -share/gnome/idl/evolution-%%VERSION%%/GNOME_Evolution_Importer.idl share/gnome/idl/evolution-%%VERSION%%/evolution-calendar.idl share/gnome/mime-info/evolution-%%VERSION%%.keys share/gnome/mime-info/evolution-%%VERSION%%.mime -share/gnome/omf/evolution/evolution-%%PORTVERSION%%-C.omf +share/gnome/omf/evolution/evolution-%%VERSION%%-C.omf share/gnome/pixmaps/evolution-%%VERSION%%.png share/locale/am/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/ar/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/az/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/be/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/bg/LC_MESSAGES/evolution-%%VERSION%%.mo +share/locale/bn/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/bs/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/ca/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/cs/LC_MESSAGES/evolution-%%VERSION%%.mo @@ -443,6 +633,8 @@ share/locale/sq/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/sr/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/sr@Latn/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/sv/LC_MESSAGES/evolution-%%VERSION%%.mo +share/locale/te/LC_MESSAGES/evolution-%%VERSION%%.mo +share/locale/th/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/tr/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/uk/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/vi/LC_MESSAGES/evolution-%%VERSION%%.mo @@ -452,9 +644,9 @@ share/locale/zh_CN/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/zh_TW/LC_MESSAGES/evolution-%%VERSION%%.mo @dirrm share/gnome/omf/evolution @dirrm share/gnome/idl/evolution-%%VERSION%% -@dirrm share/gnome/help/evolution-%%PORTVERSION%%/C/figures -@dirrm share/gnome/help/evolution-%%PORTVERSION%%/C -@dirrm share/gnome/help/evolution-%%PORTVERSION%% +@dirrm share/gnome/help/evolution-%%VERSION%%/C/figures +@dirrm share/gnome/help/evolution-%%VERSION%%/C +@dirrm share/gnome/help/evolution-%%VERSION%% @dirrm share/gnome/evolution/%%VERSION%%/weather @dirrm share/gnome/evolution/%%VERSION%%/views/tasks @dirrm share/gnome/evolution/%%VERSION%%/views/mail @@ -494,18 +686,25 @@ share/locale/zh_TW/LC_MESSAGES/evolution-%%VERSION%%.mo @dirrm libexec/evolution/%%VERSION%% @dirrm libexec/evolution @dirrm lib/evolution/%%VERSION%%/plugins -@dirrm lib/evolution/%%VERSION%%/evolution-calendar-importers -@dirrm lib/evolution/%%VERSION%%/evolution-addressbook-importers %%PILOT:%%@dirrm lib/evolution/%%VERSION%%/conduits @dirrm lib/evolution/%%VERSION%%/components @dirrm lib/evolution/%%VERSION%% @dirrm lib/evolution -@dirrm include/evolution-%%VERSION%%/widgets +@dirrm include/evolution-%%VERSION%%/text +@dirrm include/evolution-%%VERSION%%/table @dirrm include/evolution-%%VERSION%%/shell -@dirrm include/evolution-%%VERSION%%/importer +@dirrm include/evolution-%%VERSION%%/misc +@dirrm include/evolution-%%VERSION%%/menus +@dirrm include/evolution-%%VERSION%%/mail @dirrm include/evolution-%%VERSION%%/e-util @dirrm include/evolution-%%VERSION%%/e-conduit @dirrm include/evolution-%%VERSION%%/calendar/gui @dirrm include/evolution-%%VERSION%%/calendar +@dirrm include/evolution-%%VERSION%%/addressbook/gui/widgets +@dirrm include/evolution-%%VERSION%%/addressbook/gui +@dirrm include/evolution-%%VERSION%%/addressbook +@dirrm include/evolution-%%VERSION%%/a11y/e-text +@dirrm include/evolution-%%VERSION%%/a11y/e-table +@dirrm include/evolution-%%VERSION%%/a11y @dirrm include/evolution-%%VERSION%% @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true diff --git a/math/gcalctool/Makefile b/math/gcalctool/Makefile index 315c16280fb7..f64c6b0d51c5 100644 --- a/math/gcalctool/Makefile +++ b/math/gcalctool/Makefile @@ -3,10 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/math/gcalctool/Makefile,v 1.44 2005/10/13 21:27:26 ahze Exp $ # PORTNAME= gcalctool -PORTVERSION= 5.5.42 +PORTVERSION= 5.7.8 PORTEPOCH= 2 CATEGORIES= math gnome MASTER_SITES= ${MASTER_SITE_GNOME} @@ -21,7 +22,7 @@ USE_BISON= yes INSTALLS_OMF= yes USE_X_PREFIX= yes USE_GMAKE= yes -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 USE_REINPLACE= yes USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ @@ -30,8 +31,4 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ MAN1= gcalctool.1 GCONF_SCHEMAS= gcalctool.schemas -post-patch: - @${FIND} ${WRKSRC} -name "*.[ch]" | ${XARGS} ${REINPLACE_CMD} -e \ - 's|malloc\.h|stdlib.h|g' - .include <bsd.port.mk> diff --git a/math/gcalctool/distinfo b/math/gcalctool/distinfo index 80249d181012..7adcf8a8695c 100644 --- a/math/gcalctool/distinfo +++ b/math/gcalctool/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gcalctool-5.5.42.tar.bz2) = 0f42e6e437f64c844b7b30e3255b02aa -SIZE (gnome2/gcalctool-5.5.42.tar.bz2) = 1072489 +MD5 (gnome2/gcalctool-5.7.8.tar.bz2) = 112219984f04d9101b00167dd522f04a +SIZE (gnome2/gcalctool-5.7.8.tar.bz2) = 1108227 diff --git a/math/gcalctool/pkg-plist b/math/gcalctool/pkg-plist index eeaef685ba57..614858da39b8 100644 --- a/math/gcalctool/pkg-plist +++ b/math/gcalctool/pkg-plist @@ -100,6 +100,7 @@ share/locale/fa/LC_MESSAGES/gcalctool.mo share/locale/fi/LC_MESSAGES/gcalctool.mo share/locale/fr/LC_MESSAGES/gcalctool.mo share/locale/ga/LC_MESSAGES/gcalctool.mo +share/locale/gl/LC_MESSAGES/gcalctool.mo share/locale/gu/LC_MESSAGES/gcalctool.mo share/locale/he/LC_MESSAGES/gcalctool.mo share/locale/hi/LC_MESSAGES/gcalctool.mo @@ -133,6 +134,7 @@ share/locale/sr/LC_MESSAGES/gcalctool.mo share/locale/sr@Latn/LC_MESSAGES/gcalctool.mo share/locale/sv/LC_MESSAGES/gcalctool.mo share/locale/ta/LC_MESSAGES/gcalctool.mo +share/locale/te/LC_MESSAGES/gcalctool.mo share/locale/th/LC_MESSAGES/gcalctool.mo share/locale/tk/LC_MESSAGES/gcalctool.mo share/locale/tr/LC_MESSAGES/gcalctool.mo diff --git a/misc/gnome-icon-theme/Makefile b/misc/gnome-icon-theme/Makefile index 5f7cc0e5929a..27e4787d0068 100644 --- a/misc/gnome-icon-theme/Makefile +++ b/misc/gnome-icon-theme/Makefile @@ -3,14 +3,15 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/misc/gnome-icon-theme/Makefile,v 1.56 2005/10/06 17:36:54 mezz Exp $ # PORTNAME= gnome-icon-theme -PORTVERSION= 2.10.1 +PORTVERSION= 2.12.1 PORTREVISION= 1 CATEGORIES= misc gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.10 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -29,8 +30,11 @@ CONFIGURE_ARGS= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" post-patch: - @${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|g' \ - ${WRKSRC}/Makefile.in + @${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|g ; \ + s|[(]datadir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' \ + ${WRKSRC}/Makefile.in + @${REINPLACE_CMD} -e 's|@mkdir_p@|mkdir -p|g' \ + ${WRKSRC}/po/Makefile.in.in post-install: @${MKDIR} ${PREFIX}/share/icons/gnome/48x48/apps diff --git a/misc/gnome-icon-theme/distinfo b/misc/gnome-icon-theme/distinfo index aa4836b62098..aca18983bd2a 100644 --- a/misc/gnome-icon-theme/distinfo +++ b/misc/gnome-icon-theme/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-icon-theme-2.10.1.tar.bz2) = 680a57ed3cecb9a16824570f7002879e -SIZE (gnome2/gnome-icon-theme-2.10.1.tar.bz2) = 2989029 +MD5 (gnome2/gnome-icon-theme-2.12.1.tar.bz2) = a5401d6f085979fe6601f2241743af86 +SIZE (gnome2/gnome-icon-theme-2.12.1.tar.bz2) = 3113824 diff --git a/misc/gnome-icon-theme/pkg-plist b/misc/gnome-icon-theme/pkg-plist index b6c26901baf4..e38a60a99716 100644 --- a/misc/gnome-icon-theme/pkg-plist +++ b/misc/gnome-icon-theme/pkg-plist @@ -3,52 +3,269 @@ share/icons/gnome/12x12/emblems/emblem-symbolic-link.png share/icons/gnome/12x12/filesystems/gnome-fs-directory-accept.png share/icons/gnome/12x12/filesystems/gnome-fs-directory-visiting.png share/icons/gnome/12x12/filesystems/gnome-fs-directory.png -share/icons/gnome/16x16/filesystems/gnome-fs-directory.png -share/icons/gnome/16x16/filesystems/gnome-fs-home.png -share/icons/gnome/16x16/filesystems/gnome-fs-share.png -share/icons/gnome/16x16/filesystems/gnome-fs-trash-empty.png -share/icons/gnome/16x16/filesystems/gnome-fs-trash-full.png share/icons/gnome/16x16/devices/gnome-dev-cdrom-audio.png share/icons/gnome/16x16/devices/gnome-dev-cdrom.png share/icons/gnome/16x16/devices/gnome-dev-dvd.png share/icons/gnome/16x16/devices/gnome-dev-ethernet.png share/icons/gnome/16x16/devices/gnome-dev-floppy.png -share/icons/gnome/16x16/devices/gnome-dev-harddisk.png share/icons/gnome/16x16/devices/gnome-dev-harddisk-1394.png share/icons/gnome/16x16/devices/gnome-dev-harddisk-usb.png +share/icons/gnome/16x16/devices/gnome-dev-harddisk.png share/icons/gnome/16x16/devices/gnome-dev-ipod.png share/icons/gnome/16x16/devices/gnome-dev-memory.png share/icons/gnome/16x16/devices/gnome-dev-mouse-ball.png share/icons/gnome/16x16/devices/gnome-dev-pci.png share/icons/gnome/16x16/devices/gnome-dev-printer.png -share/icons/gnome/16x16/devices/gnome-dev-removable.png share/icons/gnome/16x16/devices/gnome-dev-removable-1394.png share/icons/gnome/16x16/devices/gnome-dev-removable-usb.png +share/icons/gnome/16x16/devices/gnome-dev-removable.png share/icons/gnome/16x16/devices/gnome-dev-wavelan-encrypted.png share/icons/gnome/16x16/devices/gnome-dev-wavelan.png share/icons/gnome/16x16/filesystems/gnome-fs-bookmark-missing.png share/icons/gnome/16x16/filesystems/gnome-fs-bookmark.png share/icons/gnome/16x16/filesystems/gnome-fs-client.png share/icons/gnome/16x16/filesystems/gnome-fs-desktop.png +share/icons/gnome/16x16/filesystems/gnome-fs-directory-accept.png +share/icons/gnome/16x16/filesystems/gnome-fs-directory.png share/icons/gnome/16x16/filesystems/gnome-fs-ftp.png +share/icons/gnome/16x16/filesystems/gnome-fs-home.png share/icons/gnome/16x16/filesystems/gnome-fs-network.png share/icons/gnome/16x16/filesystems/gnome-fs-nfs.png share/icons/gnome/16x16/filesystems/gnome-fs-server.png +share/icons/gnome/16x16/filesystems/gnome-fs-share.png share/icons/gnome/16x16/filesystems/gnome-fs-smb.png share/icons/gnome/16x16/filesystems/gnome-fs-ssh.png +share/icons/gnome/16x16/filesystems/gnome-fs-trash-empty.png +share/icons/gnome/16x16/filesystems/gnome-fs-trash-full.png +share/icons/gnome/16x16/mimetypes/gnome-library.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-magicpoint.png share/icons/gnome/16x16/mimetypes/gnome-mime-application-msword.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-ogg.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-par.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-pdf.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-pgp-encrypted.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-pgp-keys.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-pgp.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-postscript.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-qif.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-rhythmbox-effect.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-rhythmbox-playlist.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-rtf.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-smil.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-vnd.lotus-1-2-3.png share/icons/gnome/16x16/mimetypes/gnome-mime-application-vnd.ms-excel.png share/icons/gnome/16x16/mimetypes/gnome-mime-application-vnd.ms-powerpoint.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-vnd.stardivision.calc.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-vnd.stardivision.impress.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-vnd.stardivision.writer.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-vnd.sun.xml.calc.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-vnd.sun.xml.draw.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-vnd.sun.xml.impress.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-vnd.sun.xml.writer.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-vnd.sun.xml.writer.template.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-wordperfect.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-abiword.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-applix-spreadsheet.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-applix-word.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-archive.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-arj.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-bittorrent.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-bla.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-blender.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-blf.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-blv.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-bzip-compressed-tar.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-bzip.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-cd-image.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-class-file.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-compress.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-compressed-tar.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-core.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-cpio-compressed.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-cpio.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-dc-rom.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-deb.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-desktop.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-dia-diagram.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-dv.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-dvi.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-e-theme.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-executable.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-extension-nfo.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-extension-par2.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-font-afm.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-font-bdf.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-font-linux-psf.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-font-pcf.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-font-sunos-news.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-font-ttf.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-gameboy-rom.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-genesis-rom.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-glade.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-gnucash.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-gnumeric.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-gtktalog.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-gzip.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-ipod-firmware.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-jar.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-killustrator.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-kpresenter.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-kspread.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-kword.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-lha.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-lhz.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-mrproject.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-msx-rom.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-n64-rom.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-nes-rom.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-object.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-perl.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-php.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-python-bytecode.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-python.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-qw.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-rar.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-reject.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-rpm.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-ruby.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-sharedlib.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-shellscript.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-shockwave-flash.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-sms-rom.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-sql.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-stuffit.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-tar.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-tex.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-trash.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-x509-ca-cert.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-zip.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application.png +share/icons/gnome/16x16/mimetypes/gnome-mime-audio-ac3.png +share/icons/gnome/16x16/mimetypes/gnome-mime-audio-basic.png +share/icons/gnome/16x16/mimetypes/gnome-mime-audio-midi.png +share/icons/gnome/16x16/mimetypes/gnome-mime-audio-x-aiff.png +share/icons/gnome/16x16/mimetypes/gnome-mime-audio-x-it.png +share/icons/gnome/16x16/mimetypes/gnome-mime-audio-x-midi.png +share/icons/gnome/16x16/mimetypes/gnome-mime-audio-x-mod.png +share/icons/gnome/16x16/mimetypes/gnome-mime-audio-x-mp3.png +share/icons/gnome/16x16/mimetypes/gnome-mime-audio-x-s3m.png +share/icons/gnome/16x16/mimetypes/gnome-mime-audio-x-stm.png +share/icons/gnome/16x16/mimetypes/gnome-mime-audio-x-ulaw.png +share/icons/gnome/16x16/mimetypes/gnome-mime-audio-x-voc.png +share/icons/gnome/16x16/mimetypes/gnome-mime-audio-x-wav.png +share/icons/gnome/16x16/mimetypes/gnome-mime-audio-x-xi.png +share/icons/gnome/16x16/mimetypes/gnome-mime-audio-x-xm.png +share/icons/gnome/16x16/mimetypes/gnome-mime-audio.png share/icons/gnome/16x16/mimetypes/gnome-mime-image-bmp.png share/icons/gnome/16x16/mimetypes/gnome-mime-image-gif.png share/icons/gnome/16x16/mimetypes/gnome-mime-image-jpeg.png share/icons/gnome/16x16/mimetypes/gnome-mime-image-png.png +share/icons/gnome/16x16/mimetypes/gnome-mime-image-svg+xml.png share/icons/gnome/16x16/mimetypes/gnome-mime-image-svg.png share/icons/gnome/16x16/mimetypes/gnome-mime-image-tiff.png share/icons/gnome/16x16/mimetypes/gnome-mime-image-wmf.png +share/icons/gnome/16x16/mimetypes/gnome-mime-image-x-3ds.png +share/icons/gnome/16x16/mimetypes/gnome-mime-image-x-applix-graphic.png +share/icons/gnome/16x16/mimetypes/gnome-mime-image-x-cmu-raster.png +share/icons/gnome/16x16/mimetypes/gnome-mime-image-x-lwo.png +share/icons/gnome/16x16/mimetypes/gnome-mime-image-x-lws.png +share/icons/gnome/16x16/mimetypes/gnome-mime-image-x-xcf.png +share/icons/gnome/16x16/mimetypes/gnome-mime-image.png +share/icons/gnome/16x16/mimetypes/gnome-mime-text-css.png +share/icons/gnome/16x16/mimetypes/gnome-mime-text-html.png +share/icons/gnome/16x16/mimetypes/gnome-mime-text-x-authors.png +share/icons/gnome/16x16/mimetypes/gnome-mime-text-x-c++src.png +share/icons/gnome/16x16/mimetypes/gnome-mime-text-x-c-header.png +share/icons/gnome/16x16/mimetypes/gnome-mime-text-x-c.png +share/icons/gnome/16x16/mimetypes/gnome-mime-text-x-chdr.png +share/icons/gnome/16x16/mimetypes/gnome-mime-text-x-copying.png +share/icons/gnome/16x16/mimetypes/gnome-mime-text-x-credits.png +share/icons/gnome/16x16/mimetypes/gnome-mime-text-x-csh.png +share/icons/gnome/16x16/mimetypes/gnome-mime-text-x-csharp.png +share/icons/gnome/16x16/mimetypes/gnome-mime-text-x-csrc.png +share/icons/gnome/16x16/mimetypes/gnome-mime-text-x-haskell.png +share/icons/gnome/16x16/mimetypes/gnome-mime-text-x-install.png +share/icons/gnome/16x16/mimetypes/gnome-mime-text-x-java.png +share/icons/gnome/16x16/mimetypes/gnome-mime-text-x-literate-haskell.png +share/icons/gnome/16x16/mimetypes/gnome-mime-text-x-lyx.png +share/icons/gnome/16x16/mimetypes/gnome-mime-text-x-makefile.png +share/icons/gnome/16x16/mimetypes/gnome-mime-text-x-objcsrc.png +share/icons/gnome/16x16/mimetypes/gnome-mime-text-x-patch.png +share/icons/gnome/16x16/mimetypes/gnome-mime-text-x-readme.png +share/icons/gnome/16x16/mimetypes/gnome-mime-text-x-scheme.png +share/icons/gnome/16x16/mimetypes/gnome-mime-text-x-sql.png +share/icons/gnome/16x16/mimetypes/gnome-mime-text-x-tex.png +share/icons/gnome/16x16/mimetypes/gnome-mime-text-x-troff-man.png +share/icons/gnome/16x16/mimetypes/gnome-mime-text-x-txt.png +share/icons/gnome/16x16/mimetypes/gnome-mime-text-x-vcalendar.png +share/icons/gnome/16x16/mimetypes/gnome-mime-text-x-vcard.png +share/icons/gnome/16x16/mimetypes/gnome-mime-text-x-zsh.png +share/icons/gnome/16x16/mimetypes/gnome-mime-text-xml.png +share/icons/gnome/16x16/mimetypes/gnome-mime-text.png +share/icons/gnome/16x16/mimetypes/gnome-mime-video-mpeg.png +share/icons/gnome/16x16/mimetypes/gnome-mime-video-quicktime.png +share/icons/gnome/16x16/mimetypes/gnome-mime-video-x-ms-asf.png +share/icons/gnome/16x16/mimetypes/gnome-mime-video-x-ms-wmv.png +share/icons/gnome/16x16/mimetypes/gnome-mime-video-x-msvideo.png +share/icons/gnome/16x16/mimetypes/gnome-mime-video.png share/icons/gnome/16x16/mimetypes/gnome-mime-x-directory-nfs-server.png +share/icons/gnome/16x16/mimetypes/gnome-mime-x-directory-smb-server.png +share/icons/gnome/16x16/mimetypes/gnome-mime-x-directory-smb-share.png share/icons/gnome/16x16/mimetypes/gnome-mime-x-directory-smb-workgroup.png -share/icons/gnome/192x192/devices/gnome-dev-cdrom.png +share/icons/gnome/16x16/mimetypes/gnome-mime-x-font-afm.png +share/icons/gnome/16x16/mimetypes/gnome-package.png +share/icons/gnome/16x16/stock/emoticons/stock_smiley-1.png +share/icons/gnome/16x16/stock/emoticons/stock_smiley-10.png +share/icons/gnome/16x16/stock/emoticons/stock_smiley-11.png +share/icons/gnome/16x16/stock/emoticons/stock_smiley-12.png +share/icons/gnome/16x16/stock/emoticons/stock_smiley-13.png +share/icons/gnome/16x16/stock/emoticons/stock_smiley-14.png +share/icons/gnome/16x16/stock/emoticons/stock_smiley-15.png +share/icons/gnome/16x16/stock/emoticons/stock_smiley-16.png +share/icons/gnome/16x16/stock/emoticons/stock_smiley-17.png +share/icons/gnome/16x16/stock/emoticons/stock_smiley-18.png +share/icons/gnome/16x16/stock/emoticons/stock_smiley-19.png +share/icons/gnome/16x16/stock/emoticons/stock_smiley-2.png +share/icons/gnome/16x16/stock/emoticons/stock_smiley-20.png +share/icons/gnome/16x16/stock/emoticons/stock_smiley-21.png +share/icons/gnome/16x16/stock/emoticons/stock_smiley-22.png +share/icons/gnome/16x16/stock/emoticons/stock_smiley-23.png +share/icons/gnome/16x16/stock/emoticons/stock_smiley-24.png +share/icons/gnome/16x16/stock/emoticons/stock_smiley-25.png +share/icons/gnome/16x16/stock/emoticons/stock_smiley-26.png +share/icons/gnome/16x16/stock/emoticons/stock_smiley-3.png +share/icons/gnome/16x16/stock/emoticons/stock_smiley-4.png +share/icons/gnome/16x16/stock/emoticons/stock_smiley-5.png +share/icons/gnome/16x16/stock/emoticons/stock_smiley-6.png +share/icons/gnome/16x16/stock/emoticons/stock_smiley-7.png +share/icons/gnome/16x16/stock/emoticons/stock_smiley-8.png +share/icons/gnome/16x16/stock/emoticons/stock_smiley-9.png +share/icons/gnome/16x16/stock/media/stock_3dsound.png +share/icons/gnome/16x16/stock/media/stock_effects-sound.png +share/icons/gnome/16x16/stock/media/stock_headphones.png +share/icons/gnome/16x16/stock/media/stock_insert-video-plugin.png +share/icons/gnome/16x16/stock/media/stock_line_in.png +share/icons/gnome/16x16/stock/media/stock_media-fwd.png +share/icons/gnome/16x16/stock/media/stock_media-next.png +share/icons/gnome/16x16/stock/media/stock_media-pause.png +share/icons/gnome/16x16/stock/media/stock_media-play.png +share/icons/gnome/16x16/stock/media/stock_media-prev.png +share/icons/gnome/16x16/stock/media/stock_media-rec.png +share/icons/gnome/16x16/stock/media/stock_media-rew.png +share/icons/gnome/16x16/stock/media/stock_media-stop.png +share/icons/gnome/16x16/stock/media/stock_mic.png +share/icons/gnome/16x16/stock/media/stock_midi.png +share/icons/gnome/16x16/stock/media/stock_music-library.png +share/icons/gnome/16x16/stock/media/stock_playlist.png +share/icons/gnome/16x16/stock/media/stock_repeat.png +share/icons/gnome/16x16/stock/media/stock_shuffle.png +share/icons/gnome/16x16/stock/media/stock_smart-playlist.png +share/icons/gnome/16x16/stock/media/stock_volume-0.png +share/icons/gnome/16x16/stock/media/stock_volume-max.png +share/icons/gnome/16x16/stock/media/stock_volume-med.png +share/icons/gnome/16x16/stock/media/stock_volume-min.png +share/icons/gnome/16x16/stock/media/stock_volume-mute.png +share/icons/gnome/16x16/stock/media/stock_volume.png share/icons/gnome/192x192/filesystems/gnome-fs-regular.icon share/icons/gnome/192x192/filesystems/gnome-fs-regular.png share/icons/gnome/24x24/devices/gnome-dev-battery.png @@ -99,15 +316,41 @@ share/icons/gnome/24x24/filesystems/gnome-fs-share.png share/icons/gnome/24x24/filesystems/gnome-fs-trash-empty.png share/icons/gnome/24x24/filesystems/gnome-fs-trash-full.png share/icons/gnome/24x24/mimetypes/gnome-mime-x-directory-nfs-server.png +share/icons/gnome/24x24/stock/media/stock_3dsound.png +share/icons/gnome/24x24/stock/media/stock_effects-sound.png +share/icons/gnome/24x24/stock/media/stock_headphones.png +share/icons/gnome/24x24/stock/media/stock_insert-video-plugin.png +share/icons/gnome/24x24/stock/media/stock_line_in.png +share/icons/gnome/24x24/stock/media/stock_media-fwd.png +share/icons/gnome/24x24/stock/media/stock_media-next.png +share/icons/gnome/24x24/stock/media/stock_media-pause.png +share/icons/gnome/24x24/stock/media/stock_media-play.png +share/icons/gnome/24x24/stock/media/stock_media-prev.png +share/icons/gnome/24x24/stock/media/stock_media-rec.png +share/icons/gnome/24x24/stock/media/stock_media-rew.png +share/icons/gnome/24x24/stock/media/stock_media-shuffle.png +share/icons/gnome/24x24/stock/media/stock_media-stop.png +share/icons/gnome/24x24/stock/media/stock_mic.png +share/icons/gnome/24x24/stock/media/stock_midi.png +share/icons/gnome/24x24/stock/media/stock_music-library.png +share/icons/gnome/24x24/stock/media/stock_playlist.png +share/icons/gnome/24x24/stock/media/stock_repeat.png +share/icons/gnome/24x24/stock/media/stock_smart-playlist.png +share/icons/gnome/24x24/stock/media/stock_volume-0.png +share/icons/gnome/24x24/stock/media/stock_volume-max.png +share/icons/gnome/24x24/stock/media/stock_volume-med.png +share/icons/gnome/24x24/stock/media/stock_volume-min.png +share/icons/gnome/24x24/stock/media/stock_volume-mute.png +share/icons/gnome/24x24/stock/media/stock_volume.png share/icons/gnome/32x32/devices/gnome-dev-ipod.png share/icons/gnome/32x32/filesystems/gnome-fs-bookmark-missing.png share/icons/gnome/32x32/filesystems/gnome-fs-bookmark.png share/icons/gnome/32x32/filesystems/gnome-fs-client.png share/icons/gnome/32x32/filesystems/gnome-fs-desktop.png -share/icons/gnome/32x32/filesystems/gnome-fs-trash-empty.png -share/icons/gnome/32x32/filesystems/gnome-fs-trash-full.png share/icons/gnome/32x32/filesystems/gnome-fs-network.png share/icons/gnome/32x32/filesystems/gnome-fs-server.png +share/icons/gnome/32x32/filesystems/gnome-fs-trash-empty.png +share/icons/gnome/32x32/filesystems/gnome-fs-trash-full.png share/icons/gnome/32x32/mimetypes/gnome-mime-application-msword.png share/icons/gnome/32x32/mimetypes/gnome-mime-application-vnd.ms-excel.png share/icons/gnome/32x32/mimetypes/gnome-mime-application-vnd.ms-powerpoint.png @@ -118,6 +361,13 @@ share/icons/gnome/32x32/mimetypes/gnome-mime-image-png.png share/icons/gnome/32x32/mimetypes/gnome-mime-image-svg.png share/icons/gnome/32x32/mimetypes/gnome-mime-image-tiff.png share/icons/gnome/32x32/mimetypes/gnome-mime-image-wmf.png +share/icons/gnome/32x32/stock/media/stock_sound.png +share/icons/gnome/32x32/stock/media/stock_volume-0.png +share/icons/gnome/32x32/stock/media/stock_volume-max.png +share/icons/gnome/32x32/stock/media/stock_volume-med.png +share/icons/gnome/32x32/stock/media/stock_volume-min.png +share/icons/gnome/32x32/stock/media/stock_volume-mute.png +share/icons/gnome/32x32/stock/media/stock_volume.png share/icons/gnome/36x36/emblems/emblem-symbolic-link.png share/icons/gnome/36x36/filesystems/gnome-fs-directory-accept.icon share/icons/gnome/36x36/filesystems/gnome-fs-directory-accept.png @@ -125,7 +375,6 @@ share/icons/gnome/36x36/filesystems/gnome-fs-directory-visiting.icon share/icons/gnome/36x36/filesystems/gnome-fs-directory-visiting.png share/icons/gnome/36x36/filesystems/gnome-fs-directory.icon share/icons/gnome/36x36/filesystems/gnome-fs-directory.png -@exec mkdir -p %D/share/icons/gnome/48x48/apps share/icons/gnome/48x48/devices/gnome-dev-battery.png share/icons/gnome/48x48/devices/gnome-dev-cdrom-audio.png share/icons/gnome/48x48/devices/gnome-dev-cdrom.png @@ -162,8 +411,6 @@ share/icons/gnome/48x48/emblems/emblem-OK.icon share/icons/gnome/48x48/emblems/emblem-OK.png share/icons/gnome/48x48/emblems/emblem-art.icon share/icons/gnome/48x48/emblems/emblem-art.png -share/icons/gnome/48x48/emblems/emblem-bin.icon -share/icons/gnome/48x48/emblems/emblem-bin.png share/icons/gnome/48x48/emblems/emblem-camera.icon share/icons/gnome/48x48/emblems/emblem-camera.png share/icons/gnome/48x48/emblems/emblem-certified.icon @@ -194,12 +441,8 @@ share/icons/gnome/48x48/emblems/emblem-documents.icon share/icons/gnome/48x48/emblems/emblem-documents.png share/icons/gnome/48x48/emblems/emblem-draft.icon share/icons/gnome/48x48/emblems/emblem-draft.png -share/icons/gnome/48x48/emblems/emblem-generic.icon -share/icons/gnome/48x48/emblems/emblem-generic.png share/icons/gnome/48x48/emblems/emblem-handshake.icon share/icons/gnome/48x48/emblems/emblem-handshake.png -share/icons/gnome/48x48/emblems/emblem-important.icon -share/icons/gnome/48x48/emblems/emblem-important.png share/icons/gnome/48x48/emblems/emblem-marketing.icon share/icons/gnome/48x48/emblems/emblem-marketing.png share/icons/gnome/48x48/emblems/emblem-money.icon @@ -234,14 +477,10 @@ share/icons/gnome/48x48/emblems/emblem-shared.icon share/icons/gnome/48x48/emblems/emblem-shared.png share/icons/gnome/48x48/emblems/emblem-sound.icon share/icons/gnome/48x48/emblems/emblem-sound.png -share/icons/gnome/48x48/emblems/emblem-special.icon -share/icons/gnome/48x48/emblems/emblem-special.png share/icons/gnome/48x48/emblems/emblem-symbolic-link.icon share/icons/gnome/48x48/emblems/emblem-symbolic-link.png share/icons/gnome/48x48/emblems/emblem-trash.icon share/icons/gnome/48x48/emblems/emblem-trash.png -share/icons/gnome/48x48/emblems/emblem-urgent.icon -share/icons/gnome/48x48/emblems/emblem-urgent.png share/icons/gnome/48x48/emblems/emblem-web.icon share/icons/gnome/48x48/emblems/emblem-web.png share/icons/gnome/48x48/filesystems/gnome-fs-blockdev.png @@ -280,6 +519,7 @@ share/icons/gnome/48x48/mimetypes/gnome-mime-application-ogg.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-pdf.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-pgp-encrypted.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-pgp-keys.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-pgp-signature.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-pgp.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-postscript.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-qif.png @@ -304,7 +544,6 @@ share/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.oasis.opendocument. share/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.oasis.opendocument.text-template.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.oasis.opendocument.text-web.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.oasis.opendocument.text.png -share/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.rn-realmedia.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.stardivision.calc.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.stardivision.impress.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.stardivision.writer.png @@ -360,7 +599,6 @@ share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-gzip.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-ipod-firmware.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-jar.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-java-byte-code.png -share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-kde-app-info.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-killustrator.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-kpresenter.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-kspread.png @@ -376,7 +614,6 @@ share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-object.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-perl.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-php.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-python-bytecode.png -share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-python.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-qw.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-rar.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-reject.png @@ -402,7 +639,6 @@ share/icons/gnome/48x48/mimetypes/gnome-mime-audio-x-it.png share/icons/gnome/48x48/mimetypes/gnome-mime-audio-x-midi.png share/icons/gnome/48x48/mimetypes/gnome-mime-audio-x-mod.png share/icons/gnome/48x48/mimetypes/gnome-mime-audio-x-mp3.png -share/icons/gnome/48x48/mimetypes/gnome-mime-audio-x-pn-realaudio.png share/icons/gnome/48x48/mimetypes/gnome-mime-audio-x-s3m.png share/icons/gnome/48x48/mimetypes/gnome-mime-audio-x-stm.png share/icons/gnome/48x48/mimetypes/gnome-mime-audio-x-ulaw.png @@ -458,6 +694,7 @@ share/icons/gnome/48x48/mimetypes/gnome-mime-text-x-lyx.png share/icons/gnome/48x48/mimetypes/gnome-mime-text-x-makefile.png share/icons/gnome/48x48/mimetypes/gnome-mime-text-x-objcsrc.png share/icons/gnome/48x48/mimetypes/gnome-mime-text-x-patch.png +share/icons/gnome/48x48/mimetypes/gnome-mime-text-x-python.png share/icons/gnome/48x48/mimetypes/gnome-mime-text-x-readme.png share/icons/gnome/48x48/mimetypes/gnome-mime-text-x-scheme.png share/icons/gnome/48x48/mimetypes/gnome-mime-text-x-sh.png @@ -486,18 +723,28 @@ share/icons/gnome/72x72/filesystems/gnome-fs-regular.png share/icons/gnome/96x96/filesystems/gnome-fs-regular.icon share/icons/gnome/96x96/filesystems/gnome-fs-regular.png share/icons/gnome/index.theme +share/icons/gnome/scalable/emblems/emblem-bin.icon +share/icons/gnome/scalable/emblems/emblem-bin.svg share/icons/gnome/scalable/emblems/emblem-favorite.icon share/icons/gnome/scalable/emblems/emblem-favorite.svg +share/icons/gnome/scalable/emblems/emblem-generic.icon +share/icons/gnome/scalable/emblems/emblem-generic.svg +share/icons/gnome/scalable/emblems/emblem-important.icon +share/icons/gnome/scalable/emblems/emblem-important.svg share/icons/gnome/scalable/emblems/emblem-mail.icon share/icons/gnome/scalable/emblems/emblem-mail.svg +share/icons/gnome/scalable/emblems/emblem-special.icon +share/icons/gnome/scalable/emblems/emblem-special.svg +share/icons/gnome/scalable/emblems/emblem-urgent.icon +share/icons/gnome/scalable/emblems/emblem-urgent.svg share/icons/gnome/scalable/filesystems/gnome-fs-directory-accept.svg share/icons/gnome/scalable/filesystems/gnome-fs-directory-visiting.svg share/icons/gnome/scalable/filesystems/gnome-fs-directory.svg share/icons/gnome/scalable/filesystems/gnome-fs-home.svg share/icons/gnome/scalable/filesystems/gnome-fs-trash-empty.svg share/icons/gnome/scalable/filesystems/gnome-fs-trash-full.svg -share/icons/hicolor/16x16/apps/blender.png share/icons/hicolor/16x16/apps/config-language.png +share/icons/hicolor/16x16/apps/evolution.png share/icons/hicolor/16x16/apps/gnome-devel.png share/icons/hicolor/16x16/apps/gnome-globe.png share/icons/hicolor/16x16/apps/gnome-help.png @@ -512,10 +759,12 @@ share/icons/hicolor/16x16/apps/im-msn.png share/icons/hicolor/16x16/apps/im-nov.png share/icons/hicolor/16x16/apps/im-yahoo.png share/icons/hicolor/16x16/apps/im.png +share/icons/hicolor/16x16/apps/image-viewer.png share/icons/hicolor/16x16/apps/panel-notification-area.png share/icons/hicolor/16x16/apps/panel-window-list.png share/icons/hicolor/16x16/apps/panel-window-menu.png share/icons/hicolor/16x16/apps/text-editor.png +share/icons/hicolor/16x16/apps/volume-knob.png share/icons/hicolor/16x16/filesystems/gnome-fs-locally-shared.png share/icons/hicolor/16x16/filesystems/gnome-fs-share-private.png share/icons/hicolor/16x16/stock/chart/stock_chart-autoformat.png @@ -596,6 +845,7 @@ share/icons/hicolor/16x16/stock/data/stock_data-sources.png share/icons/hicolor/16x16/stock/data/stock_data-table.png share/icons/hicolor/16x16/stock/data/stock_data-tables.png share/icons/hicolor/16x16/stock/data/stock_data-undo.png +share/icons/hicolor/16x16/stock/data/stock_database.png share/icons/hicolor/16x16/stock/data/stock_delete-autofilter.png share/icons/hicolor/16x16/stock/data/stock_delete-decimal-place.png share/icons/hicolor/16x16/stock/data/stock_filter-data-by-criteria.png @@ -648,32 +898,6 @@ share/icons/hicolor/16x16/stock/document/stock_task-recurring.png share/icons/hicolor/16x16/stock/document/stock_task.png share/icons/hicolor/16x16/stock/document/stock_todo.png share/icons/hicolor/16x16/stock/document/stock_view-html-source.png -share/icons/hicolor/16x16/stock/emoticons/stock_smiley-1.png -share/icons/hicolor/16x16/stock/emoticons/stock_smiley-10.png -share/icons/hicolor/16x16/stock/emoticons/stock_smiley-11.png -share/icons/hicolor/16x16/stock/emoticons/stock_smiley-12.png -share/icons/hicolor/16x16/stock/emoticons/stock_smiley-13.png -share/icons/hicolor/16x16/stock/emoticons/stock_smiley-14.png -share/icons/hicolor/16x16/stock/emoticons/stock_smiley-15.png -share/icons/hicolor/16x16/stock/emoticons/stock_smiley-16.png -share/icons/hicolor/16x16/stock/emoticons/stock_smiley-17.png -share/icons/hicolor/16x16/stock/emoticons/stock_smiley-18.png -share/icons/hicolor/16x16/stock/emoticons/stock_smiley-19.png -share/icons/hicolor/16x16/stock/emoticons/stock_smiley-2.png -share/icons/hicolor/16x16/stock/emoticons/stock_smiley-20.png -share/icons/hicolor/16x16/stock/emoticons/stock_smiley-21.png -share/icons/hicolor/16x16/stock/emoticons/stock_smiley-22.png -share/icons/hicolor/16x16/stock/emoticons/stock_smiley-23.png -share/icons/hicolor/16x16/stock/emoticons/stock_smiley-24.png -share/icons/hicolor/16x16/stock/emoticons/stock_smiley-25.png -share/icons/hicolor/16x16/stock/emoticons/stock_smiley-26.png -share/icons/hicolor/16x16/stock/emoticons/stock_smiley-3.png -share/icons/hicolor/16x16/stock/emoticons/stock_smiley-4.png -share/icons/hicolor/16x16/stock/emoticons/stock_smiley-5.png -share/icons/hicolor/16x16/stock/emoticons/stock_smiley-6.png -share/icons/hicolor/16x16/stock/emoticons/stock_smiley-7.png -share/icons/hicolor/16x16/stock/emoticons/stock_smiley-8.png -share/icons/hicolor/16x16/stock/emoticons/stock_smiley-9.png share/icons/hicolor/16x16/stock/form/stock_form-activation-order.png share/icons/hicolor/16x16/stock/form/stock_form-add-field.png share/icons/hicolor/16x16/stock/form/stock_form-automatic-control-focus.png @@ -989,32 +1213,6 @@ share/icons/hicolor/16x16/stock/io/stock_save-template.png share/icons/hicolor/16x16/stock/io/stock_save.png share/icons/hicolor/16x16/stock/io/stock_save_as.png share/icons/hicolor/16x16/stock/io/stock_up-one-dir.png -share/icons/hicolor/16x16/stock/media/stock_3dsound.png -share/icons/hicolor/16x16/stock/media/stock_effects-sound.png -share/icons/hicolor/16x16/stock/media/stock_headphones.png -share/icons/hicolor/16x16/stock/media/stock_insert-video-plugin.png -share/icons/hicolor/16x16/stock/media/stock_line_in.png -share/icons/hicolor/16x16/stock/media/stock_media-fwd.png -share/icons/hicolor/16x16/stock/media/stock_media-next.png -share/icons/hicolor/16x16/stock/media/stock_media-pause.png -share/icons/hicolor/16x16/stock/media/stock_media-play.png -share/icons/hicolor/16x16/stock/media/stock_media-prev.png -share/icons/hicolor/16x16/stock/media/stock_media-rec.png -share/icons/hicolor/16x16/stock/media/stock_media-rew.png -share/icons/hicolor/16x16/stock/media/stock_media-stop.png -share/icons/hicolor/16x16/stock/media/stock_mic.png -share/icons/hicolor/16x16/stock/media/stock_midi.png -share/icons/hicolor/16x16/stock/media/stock_music-library.png -share/icons/hicolor/16x16/stock/media/stock_playlist.png -share/icons/hicolor/16x16/stock/media/stock_repeat.png -share/icons/hicolor/16x16/stock/media/stock_shuffle.png -share/icons/hicolor/16x16/stock/media/stock_smart-playlist.png -share/icons/hicolor/16x16/stock/media/stock_volume.png -share/icons/hicolor/16x16/stock/media/stock_volume-0.png -share/icons/hicolor/16x16/stock/media/stock_volume-max.png -share/icons/hicolor/16x16/stock/media/stock_volume-med.png -share/icons/hicolor/16x16/stock/media/stock_volume-min.png -share/icons/hicolor/16x16/stock/media/stock_volume-mute.png share/icons/hicolor/16x16/stock/navigation/stock_bottom.png share/icons/hicolor/16x16/stock/navigation/stock_down-with-subpoints.png share/icons/hicolor/16x16/stock/navigation/stock_down.png @@ -1390,30 +1588,96 @@ share/icons/hicolor/16x16/stock/text/stock_wrap-left.png share/icons/hicolor/16x16/stock/text/stock_wrap-optimal.png share/icons/hicolor/16x16/stock/text/stock_wrap-right.png share/icons/hicolor/192x192/apps/gnome-globe.png +share/icons/hicolor/24x24/apps/accessibility-directory.png +share/icons/hicolor/24x24/apps/administration.png share/icons/hicolor/24x24/apps/advanced-directory.png +share/icons/hicolor/24x24/apps/apacheconf.png share/icons/hicolor/24x24/apps/applets-screenshooter.png -share/icons/hicolor/24x24/apps/blender.png +share/icons/hicolor/24x24/apps/beep-media-player.png +share/icons/hicolor/24x24/apps/boot.png +share/icons/hicolor/24x24/apps/burner.png +share/icons/hicolor/24x24/apps/character-picker.png +share/icons/hicolor/24x24/apps/clock.png share/icons/hicolor/24x24/apps/config-language.png +share/icons/hicolor/24x24/apps/config-users.png +share/icons/hicolor/24x24/apps/display-capplet.png +share/icons/hicolor/24x24/apps/evolution-calendar.png +share/icons/hicolor/24x24/apps/evolution-mail.png +share/icons/hicolor/24x24/apps/evolution-tasks.png +share/icons/hicolor/24x24/apps/evolution.png +share/icons/hicolor/24x24/apps/gaim.png +share/icons/hicolor/24x24/apps/gdm.png +share/icons/hicolor/24x24/apps/gftp.png share/icons/hicolor/24x24/apps/gnome-amusements.png +share/icons/hicolor/24x24/apps/gnome-applications.png +share/icons/hicolor/24x24/apps/gnome-audio.png +share/icons/hicolor/24x24/apps/gnome-calculator.png +share/icons/hicolor/24x24/apps/gnome-cdplayer-icon.png +share/icons/hicolor/24x24/apps/gnome-control-center.png +share/icons/hicolor/24x24/apps/gnome-cpu.png +share/icons/hicolor/24x24/apps/gnome-desktop-config.png share/icons/hicolor/24x24/apps/gnome-devel.png +share/icons/hicolor/24x24/apps/gnome-eyes.png share/icons/hicolor/24x24/apps/gnome-favorites.png +share/icons/hicolor/24x24/apps/gnome-finance.png share/icons/hicolor/24x24/apps/gnome-globe.png +share/icons/hicolor/24x24/apps/gnome-gnomine.png share/icons/hicolor/24x24/apps/gnome-graphics.png +share/icons/hicolor/24x24/apps/gnome-gsame.png share/icons/hicolor/24x24/apps/gnome-help.png share/icons/hicolor/24x24/apps/gnome-joystick.png share/icons/hicolor/24x24/apps/gnome-lockscreen.png share/icons/hicolor/24x24/apps/gnome-logout.png +share/icons/hicolor/24x24/apps/gnome-mini-commander.png +share/icons/hicolor/24x24/apps/gnome-modem.png +share/icons/hicolor/24x24/apps/gnome-money.png +share/icons/hicolor/24x24/apps/gnome-monitor.png share/icons/hicolor/24x24/apps/gnome-multimedia.png +share/icons/hicolor/24x24/apps/gnome-netstatus-disconn.png +share/icons/hicolor/24x24/apps/gnome-netstatus-error.png +share/icons/hicolor/24x24/apps/gnome-netstatus-idle.png +share/icons/hicolor/24x24/apps/gnome-netstatus-rx.png +share/icons/hicolor/24x24/apps/gnome-netstatus-tx.png +share/icons/hicolor/24x24/apps/gnome-netstatus-txrx.png +share/icons/hicolor/24x24/apps/gnome-networktool.png +share/icons/hicolor/24x24/apps/gnome-nibbles.png +share/icons/hicolor/24x24/apps/gnome-office.png +share/icons/hicolor/24x24/apps/gnome-panel.png share/icons/hicolor/24x24/apps/gnome-run.png share/icons/hicolor/24x24/apps/gnome-searchtool.png +share/icons/hicolor/24x24/apps/gnome-session.png +share/icons/hicolor/24x24/apps/gnome-settings-background.png +share/icons/hicolor/24x24/apps/gnome-settings-font.png +share/icons/hicolor/24x24/apps/gnome-settings-keybindings.png +share/icons/hicolor/24x24/apps/gnome-settings-sound.png +share/icons/hicolor/24x24/apps/gnome-settings-theme.png +share/icons/hicolor/24x24/apps/gnome-settings-ui-behavior.png share/icons/hicolor/24x24/apps/gnome-settings.png +share/icons/hicolor/24x24/apps/gnome-shutdown.png share/icons/hicolor/24x24/apps/gnome-status.png share/icons/hicolor/24x24/apps/gnome-terminal.png +share/icons/hicolor/24x24/apps/gnome-unknown.png share/icons/hicolor/24x24/apps/gnome-window-manager.png +share/icons/hicolor/24x24/apps/image-viewer.png +share/icons/hicolor/24x24/apps/ooo_calc.png +share/icons/hicolor/24x24/apps/ooo_draw.png +share/icons/hicolor/24x24/apps/ooo_gulls.png +share/icons/hicolor/24x24/apps/ooo_impress.png +share/icons/hicolor/24x24/apps/ooo_math.png +share/icons/hicolor/24x24/apps/ooo_printeradmin.png +share/icons/hicolor/24x24/apps/ooo_template.png +share/icons/hicolor/24x24/apps/ooo_web.png +share/icons/hicolor/24x24/apps/ooo_writer.png share/icons/hicolor/24x24/apps/panel-notification-area.png share/icons/hicolor/24x24/apps/panel-window-list.png share/icons/hicolor/24x24/apps/panel-window-menu.png +share/icons/hicolor/24x24/apps/postscript-viewer.png +share/icons/hicolor/24x24/apps/screensaver.png +share/icons/hicolor/24x24/apps/shares.png +share/icons/hicolor/24x24/apps/stock-ticker.png share/icons/hicolor/24x24/apps/text-editor.png +share/icons/hicolor/24x24/apps/tsclient.png +share/icons/hicolor/24x24/apps/volume-knob.png share/icons/hicolor/24x24/filesystems/gnome-fs-locally-shared.png share/icons/hicolor/24x24/filesystems/gnome-fs-share-private.png share/icons/hicolor/24x24/stock/chart/stock_chart-autoformat.png @@ -1471,6 +1735,7 @@ share/icons/hicolor/24x24/stock/data/stock_data-previous.png share/icons/hicolor/24x24/stock/data/stock_data-save.png share/icons/hicolor/24x24/stock/data/stock_data-sources.png share/icons/hicolor/24x24/stock/data/stock_data-undo.png +share/icons/hicolor/24x24/stock/data/stock_database.png share/icons/hicolor/24x24/stock/data/stock_delete-autofilter.png share/icons/hicolor/24x24/stock/data/stock_delete-decimal-place.png share/icons/hicolor/24x24/stock/data/stock_filter-data-by-criteria.png @@ -1800,32 +2065,6 @@ share/icons/hicolor/24x24/stock/io/stock_save-pdf.png share/icons/hicolor/24x24/stock/io/stock_save-template.png share/icons/hicolor/24x24/stock/io/stock_save.png share/icons/hicolor/24x24/stock/io/stock_save_as.png -share/icons/hicolor/24x24/stock/media/stock_3dsound.png -share/icons/hicolor/24x24/stock/media/stock_effects-sound.png -share/icons/hicolor/24x24/stock/media/stock_headphones.png -share/icons/hicolor/24x24/stock/media/stock_insert-video-plugin.png -share/icons/hicolor/24x24/stock/media/stock_line_in.png -share/icons/hicolor/24x24/stock/media/stock_media-fwd.png -share/icons/hicolor/24x24/stock/media/stock_media-next.png -share/icons/hicolor/24x24/stock/media/stock_media-pause.png -share/icons/hicolor/24x24/stock/media/stock_media-play.png -share/icons/hicolor/24x24/stock/media/stock_media-prev.png -share/icons/hicolor/24x24/stock/media/stock_media-rec.png -share/icons/hicolor/24x24/stock/media/stock_media-rew.png -share/icons/hicolor/24x24/stock/media/stock_media-shuffle.png -share/icons/hicolor/24x24/stock/media/stock_media-stop.png -share/icons/hicolor/24x24/stock/media/stock_mic.png -share/icons/hicolor/24x24/stock/media/stock_midi.png -share/icons/hicolor/24x24/stock/media/stock_music-library.png -share/icons/hicolor/24x24/stock/media/stock_playlist.png -share/icons/hicolor/24x24/stock/media/stock_repeat.png -share/icons/hicolor/24x24/stock/media/stock_smart-playlist.png -share/icons/hicolor/24x24/stock/media/stock_volume.png -share/icons/hicolor/24x24/stock/media/stock_volume-0.png -share/icons/hicolor/24x24/stock/media/stock_volume-max.png -share/icons/hicolor/24x24/stock/media/stock_volume-med.png -share/icons/hicolor/24x24/stock/media/stock_volume-min.png -share/icons/hicolor/24x24/stock/media/stock_volume-mute.png share/icons/hicolor/24x24/stock/navigation/stock_bottom.png share/icons/hicolor/24x24/stock/navigation/stock_down-with-subpoints.png share/icons/hicolor/24x24/stock/navigation/stock_down.png @@ -2115,14 +2354,12 @@ share/icons/hicolor/24x24/stock/text/stock_wrap-right.png share/icons/hicolor/32x32/apps/administration.png share/icons/hicolor/32x32/apps/apacheconf.png share/icons/hicolor/32x32/apps/applets-screenshooter.png -share/icons/hicolor/32x32/apps/blender.png share/icons/hicolor/32x32/apps/config-date.png share/icons/hicolor/32x32/apps/config-language.png share/icons/hicolor/32x32/apps/config-users.png share/icons/hicolor/32x32/apps/config-xfree.png share/icons/hicolor/32x32/apps/dia_gnome_icon.png share/icons/hicolor/32x32/apps/disks.png -share/icons/hicolor/32x32/apps/evolution.png share/icons/hicolor/32x32/apps/file-manager.png share/icons/hicolor/32x32/apps/gdict.png share/icons/hicolor/32x32/apps/gdm.png @@ -2220,7 +2457,6 @@ share/icons/hicolor/32x32/stock/io/stock_print-preview.png share/icons/hicolor/32x32/stock/io/stock_print-setup.png share/icons/hicolor/32x32/stock/io/stock_print.png share/icons/hicolor/32x32/stock/io/stock_printers.png -share/icons/hicolor/32x32/stock/media/stock_sound.png share/icons/hicolor/32x32/stock/net/stock_addressbook.png share/icons/hicolor/32x32/stock/net/stock_appointment-reminder-excl.png share/icons/hicolor/32x32/stock/net/stock_appointment-reminder.png @@ -2267,7 +2503,6 @@ share/icons/hicolor/48x48/apps/advanced-directory.png share/icons/hicolor/48x48/apps/apacheconf.png share/icons/hicolor/48x48/apps/applets-screenshooter.png share/icons/hicolor/48x48/apps/beast.png -share/icons/hicolor/48x48/apps/blender.png share/icons/hicolor/48x48/apps/burner.png share/icons/hicolor/48x48/apps/character-picker.png share/icons/hicolor/48x48/apps/clock.png @@ -2278,7 +2513,6 @@ share/icons/hicolor/48x48/apps/config-xfree.png share/icons/hicolor/48x48/apps/dia_gnome_icon.png share/icons/hicolor/48x48/apps/disks.png share/icons/hicolor/48x48/apps/drawer.png -share/icons/hicolor/48x48/apps/evolution.png share/icons/hicolor/48x48/apps/eyes.png share/icons/hicolor/48x48/apps/file-manager.png share/icons/hicolor/48x48/apps/file-roller.png @@ -2346,6 +2580,7 @@ share/icons/hicolor/48x48/apps/im-msn.png share/icons/hicolor/48x48/apps/im-nov.png share/icons/hicolor/48x48/apps/im-yahoo.png share/icons/hicolor/48x48/apps/im.png +share/icons/hicolor/48x48/apps/image-viewer.png share/icons/hicolor/48x48/apps/keyboard.png share/icons/hicolor/48x48/apps/launcher-program.png share/icons/hicolor/48x48/apps/logviewer.png @@ -2357,7 +2592,6 @@ share/icons/hicolor/48x48/apps/panel-notification-area.png share/icons/hicolor/48x48/apps/panel-window-list.png share/icons/hicolor/48x48/apps/panel-window-menu.png share/icons/hicolor/48x48/apps/postscript-viewer.png -share/icons/hicolor/48x48/apps/realplayer.png share/icons/hicolor/48x48/apps/screensaver.png share/icons/hicolor/48x48/apps/serviceconf.png share/icons/hicolor/48x48/apps/sodipodi.png @@ -2366,7 +2600,6 @@ share/icons/hicolor/48x48/apps/text-editor.png share/icons/hicolor/48x48/apps/tsclient.png share/icons/hicolor/48x48/apps/user-info.png share/icons/hicolor/48x48/apps/visor.png -share/icons/hicolor/48x48/apps/volume-knob.png share/icons/hicolor/48x48/apps/wallpaper.png share/icons/hicolor/48x48/apps/web-browser.png share/icons/hicolor/48x48/apps/wine.png @@ -2472,6 +2705,12 @@ share/icons/hicolor/48x48/stock/net/stock_spam.png share/icons/hicolor/72x72/apps/gnome-globe.png share/icons/hicolor/96x96/apps/gnome-globe.png share/icons/hicolor/96x96/apps/gnome-starthere.png +share/icons/hicolor/scalable/apps/evolution.svg +share/icons/hicolor/scalable/apps/volume-knob.svg +@unexec rmdir %D/share/locale/xh/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/xh 2> /dev/null || true +@unexec rmdir %D/share/locale/rw/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/rw 2> /dev/null || true @unexec /bin/rmdir %D/share/icons/hicolor/96x96 2>/dev/null || /usr/bin/true @unexec /bin/rmdir %D/share/icons/hicolor/72x72 2>/dev/null || /usr/bin/true @unexec /bin/rmdir %D/share/icons/hicolor/48x48/stock/generic 2>/dev/null || /usr/bin/true @@ -2513,6 +2752,7 @@ share/icons/hicolor/96x96/apps/gnome-starthere.png @unexec /bin/rmdir %D/share/icons/gnome/scalable/filesystems 2>/dev/null || /usr/bin/true @unexec /bin/rmdir %D/share/icons/gnome/scalable/emblems 2>/dev/null || /usr/bin/true @unexec /bin/rmdir %D/share/icons/gnome/scalable/devices 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons/gnome/scalable/apps 2>/dev/null || /usr/bin/true @unexec /bin/rmdir %D/share/icons/gnome/scalable 2>/dev/null || /usr/bin/true @unexec /bin/rmdir %D/share/icons/gnome/96x96/mimetypes 2>/dev/null || /usr/bin/true @unexec /bin/rmdir %D/share/icons/gnome/96x96/filesystems 2>/dev/null || /usr/bin/true @@ -2535,10 +2775,14 @@ share/icons/hicolor/96x96/apps/gnome-starthere.png @unexec /bin/rmdir %D/share/icons/gnome/36x36/emblems 2>/dev/null || /usr/bin/true @unexec /bin/rmdir %D/share/icons/gnome/36x36/devices 2>/dev/null || /usr/bin/true @unexec /bin/rmdir %D/share/icons/gnome/36x36 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons/gnome/32x32/stock/media 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons/gnome/32x32/stock 2>/dev/null || /usr/bin/true @unexec /bin/rmdir %D/share/icons/gnome/32x32/mimetypes 2>/dev/null || /usr/bin/true @unexec /bin/rmdir %D/share/icons/gnome/32x32/filesystems 2>/dev/null || /usr/bin/true @unexec /bin/rmdir %D/share/icons/gnome/32x32/devices 2>/dev/null || /usr/bin/true @unexec /bin/rmdir %D/share/icons/gnome/32x32 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons/gnome/24x24/stock/media 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons/gnome/24x24/stock 2>/dev/null || /usr/bin/true @unexec /bin/rmdir %D/share/icons/gnome/24x24/mimetypes 2>/dev/null || /usr/bin/true @unexec /bin/rmdir %D/share/icons/gnome/24x24/filesystems 2>/dev/null || /usr/bin/true @unexec /bin/rmdir %D/share/icons/gnome/24x24/emblems 2>/dev/null || /usr/bin/true @@ -2549,6 +2793,9 @@ share/icons/hicolor/96x96/apps/gnome-starthere.png @unexec /bin/rmdir %D/share/icons/gnome/192x192/emblems 2>/dev/null || /usr/bin/true @unexec /bin/rmdir %D/share/icons/gnome/192x192/devices 2>/dev/null || /usr/bin/true @unexec /bin/rmdir %D/share/icons/gnome/192x192 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons/gnome/16x16/stock/media 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons/gnome/16x16/stock/emoticons 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons/gnome/16x16/stock 2>/dev/null || /usr/bin/true @unexec /bin/rmdir %D/share/icons/gnome/16x16/mimetypes 2>/dev/null || /usr/bin/true @unexec /bin/rmdir %D/share/icons/gnome/16x16/filesystems 2>/dev/null || /usr/bin/true @unexec /bin/rmdir %D/share/icons/gnome/16x16/devices 2>/dev/null || /usr/bin/true diff --git a/multimedia/gstreamer-plugins-all/Makefile b/multimedia/gstreamer-plugins-all/Makefile index f4faa6063896..043981611e14 100644 --- a/multimedia/gstreamer-plugins-all/Makefile +++ b/multimedia/gstreamer-plugins-all/Makefile @@ -3,6 +3,7 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/multimedia/gstreamer-plugins-all/Makefile,v 1.3 2005/10/22 06:20:02 ahze Exp $ # PORTNAME= gstreamer-plugins-all @@ -21,7 +22,6 @@ OPTIONS= # Hacky.. but it works the way it is set up... .include <bsd.port.pre.mk> -WITHOUT_CAIRO= yes # Weed out gst-plugins that can not be packaged. or are broken. .if defined(PACKAGE_BUILDING) WITHOUT_FAAC= yes # Mp4 Dolby license , no package diff --git a/multimedia/gstreamer-plugins-all80/Makefile b/multimedia/gstreamer-plugins-all80/Makefile index f4faa6063896..043981611e14 100644 --- a/multimedia/gstreamer-plugins-all80/Makefile +++ b/multimedia/gstreamer-plugins-all80/Makefile @@ -3,6 +3,7 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/multimedia/gstreamer-plugins-all/Makefile,v 1.3 2005/10/22 06:20:02 ahze Exp $ # PORTNAME= gstreamer-plugins-all @@ -21,7 +22,6 @@ OPTIONS= # Hacky.. but it works the way it is set up... .include <bsd.port.pre.mk> -WITHOUT_CAIRO= yes # Weed out gst-plugins that can not be packaged. or are broken. .if defined(PACKAGE_BUILDING) WITHOUT_FAAC= yes # Mp4 Dolby license , no package diff --git a/multimedia/gstreamer-plugins-core/Makefile b/multimedia/gstreamer-plugins-core/Makefile index 9b158fd75de5..6d47936803bc 100644 --- a/multimedia/gstreamer-plugins-core/Makefile +++ b/multimedia/gstreamer-plugins-core/Makefile @@ -3,11 +3,12 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/multimedia/gstreamer-plugins-core/Makefile,v 1.8 2005/07/13 06:48:22 ahze Exp $ # PORTNAME= gstreamer-plugins-core PORTVERSION= 0.8 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= multimedia audio MASTER_SITES= # empty DISTFILES= # empty @@ -33,7 +34,7 @@ USE_GSTREAMER+= mad vorbis USE_GSTREAMER+= libpng # Misc plugins -USE_GSTREAMER+= gconf pango +USE_GSTREAMER+= pango # Multimedia plugins USE_GSTREAMER+= ffmpeg diff --git a/multimedia/gstreamer-plugins-core80/Makefile b/multimedia/gstreamer-plugins-core80/Makefile index 9b158fd75de5..6d47936803bc 100644 --- a/multimedia/gstreamer-plugins-core80/Makefile +++ b/multimedia/gstreamer-plugins-core80/Makefile @@ -3,11 +3,12 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/multimedia/gstreamer-plugins-core/Makefile,v 1.8 2005/07/13 06:48:22 ahze Exp $ # PORTNAME= gstreamer-plugins-core PORTVERSION= 0.8 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= multimedia audio MASTER_SITES= # empty DISTFILES= # empty @@ -33,7 +34,7 @@ USE_GSTREAMER+= mad vorbis USE_GSTREAMER+= libpng # Misc plugins -USE_GSTREAMER+= gconf pango +USE_GSTREAMER+= pango # Multimedia plugins USE_GSTREAMER+= ffmpeg diff --git a/multimedia/totem/Makefile b/multimedia/totem/Makefile index 7219abe9e3ef..d7afe69d99ae 100644 --- a/multimedia/totem/Makefile +++ b/multimedia/totem/Makefile @@ -6,8 +6,7 @@ # PORTNAME= totem -PORTVERSION= 1.0.4 -PORTREVISION?= 1 +PORTVERSION= 1.2.0 CATEGORIES= multimedia gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R} @@ -23,7 +22,7 @@ USE_GNOME= gnomeprefix intlhack gnomehack gnomedesktop desktopfileutils \ nautiluscdburner WANT_GSTREAMER= yes USE_GMAKE= yes -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 INSTALLS_SHLIB= yes INSTALLS_OMF= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ @@ -36,11 +35,15 @@ OPTIONS?= DVDNAV "Enable DVD support" on \ MAN1= totem.1 totem-video-thumbnailer.1 GCONF_SCHEMAS= totem-handlers.schemas totem-video-thumbnail.schemas \ totem.schemas -CONFLICTS?= totem-gstreamer-[0-9]* +CONFLICTS= totem-gstreamer-[0-9]* .include <bsd.port.pre.mk> +LIB_DEPENDS+= musicbrainz:${PORTSDIR}/audio/libmusicbrainz + .if defined(WITH_GSTREAMER) +BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes +RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes CONFIGURE_ARGS+=--enable-gstreamer USE_GSTREAMER+= gnomevfs core gconf WITHOUT_DVDNAV= yes @@ -86,13 +89,11 @@ pre-everything:: post-patch: @${REINPLACE_CMD} -e 's|/dev/cdrom|${DEFAULT_CDROM_DEVICE}|' \ ${WRKSRC}/src/totem-preferences.c \ - ${WRKSRC}/src/bacon-video-widget-gst.c + ${WRKSRC}/src/backend/bacon-video-widget-gst.c .if defined(WITH_GSTREAMER) @${REINPLACE_CMD} -e 's|/dev/dvd|${DEFAULT_DVD_DEVICE}|' \ - ${WRKSRC}/src/bacon-video-widget-gst.c + ${WRKSRC}/src/backend/bacon-video-widget-gst.c .endif - @${REINPLACE_CMD} -e 's|@LOCALBASE@|${LOCALBASE}|' \ - ${WRKSRC}/src/bacon-video-widget-xine.c post-install: @-update-desktop-database diff --git a/multimedia/totem/distinfo b/multimedia/totem/distinfo index ed9376d4d0f8..0ce4edd042b6 100644 --- a/multimedia/totem/distinfo +++ b/multimedia/totem/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/totem-1.0.4.tar.bz2) = 60dfa922d8de40fe3cdbdb5062065d55 -SIZE (gnome2/totem-1.0.4.tar.bz2) = 1394585 +MD5 (gnome2/totem-1.2.0.tar.bz2) = e07aded62a929779a4cd28c16fdb2efd +SIZE (gnome2/totem-1.2.0.tar.bz2) = 1720687 diff --git a/multimedia/totem/files/patch-src::Makefile.in b/multimedia/totem/files/patch-src::Makefile.in deleted file mode 100644 index 88baa73c4532..000000000000 --- a/multimedia/totem/files/patch-src::Makefile.in +++ /dev/null @@ -1,12 +0,0 @@ ---- src/Makefile.in.orig Thu Jan 13 13:03:04 2005 -+++ src/Makefile.in Thu Jan 13 13:04:42 2005 -@@ -236,7 +236,8 @@ - - totem_mozilla_viewer_LDADD = $(X_LIBS) $(EXTRA_GNOME_LIBS) $(XTEST_LIBS) $(RANDR_LIBS) $(NVTV_LIBS) - --plugindir = $(libdir)/mozilla/plugins/ -+@HAVE_MOZILLA_FALSE@plugindir = -+@HAVE_MOZILLA_TRUE@plugindir = $(libdir)/mozilla/plugins/ - module_flags = -export_dynamic -avoid-version - - vanity_SOURCES = \ diff --git a/multimedia/totem/files/patch-src::bacon-video-widget-xine.c b/multimedia/totem/files/patch-src::bacon-video-widget-xine.c deleted file mode 100644 index 903e5b2e2b3e..000000000000 --- a/multimedia/totem/files/patch-src::bacon-video-widget-xine.c +++ /dev/null @@ -1,15 +0,0 @@ ---- src/bacon-video-widget-xine.c.orig Wed Mar 9 18:03:18 2005 -+++ src/bacon-video-widget-xine.c Wed Mar 9 18:05:59 2005 -@@ -2504,10 +2504,8 @@ - - /* And we try and create symlinks from /usr/lib/win32 to - * the local user path */ -- totem_create_symlinks ("/usr/lib/win32", path); -- totem_create_symlinks ("/usr/lib/RealPlayer9/Codecs/", path); -- totem_create_symlinks ("/usr/lib/RealPlayer9/users/Real/Codecs/", path); -- totem_create_symlinks ("/usr/lib/RealPlayer8/Codecs", path); -+ totem_create_symlinks ("@LOCALBASE@/lib/win32", path); -+ totem_create_symlinks ("@LOCALBASE@/lib/RealPlayer/codecs", path); - - g_free (bvw->priv->codecs_path); - bvw->priv->codecs_path = g_strdup (path); diff --git a/multimedia/totem/files/patch-src_totem-disk.c b/multimedia/totem/files/patch-src_totem-disk.c index 502ffec47a24..d522008f04bc 100644 --- a/multimedia/totem/files/patch-src_totem-disk.c +++ b/multimedia/totem/files/patch-src_totem-disk.c @@ -1,5 +1,5 @@ ---- src/totem-disc.c.orig Sun Mar 13 08:37:57 2005 -+++ src/totem-disc.c Wed Mar 23 03:29:26 2005 +--- src/plparse/totem-disc.c.orig Sun Mar 13 08:37:57 2005 ++++ src/plparse/totem-disc.c Wed Mar 23 03:29:26 2005 @@ -34,18 +34,40 @@ #include <stdio.h> #include <stdlib.h> diff --git a/multimedia/totem/pkg-plist b/multimedia/totem/pkg-plist index 5c942a00c827..2dc09f12e3b2 100644 --- a/multimedia/totem/pkg-plist +++ b/multimedia/totem/pkg-plist @@ -5,9 +5,10 @@ include/totem/1/plparser/totem-pl-parser-builtins.h include/totem/1/plparser/totem-pl-parser.h lib/libtotem-plparser.a lib/libtotem-plparser.so -lib/libtotem-plparser.so.0 +lib/libtotem-plparser.so.1 lib/nautilus/extensions-1.0/libtotem-properties-page.a lib/nautilus/extensions-1.0/libtotem-properties-page.so +lib/nautilus/extensions-1.0/libtotem-properties-page.so.0 libdata/pkgconfig/totem-plparser.pc share/gnome/applications/totem.desktop share/gnome/help/totem/C/figures/totem_next_button.png @@ -40,6 +41,16 @@ share/gnome/help/totem/es/figures/totem_volume_maximum_button.png share/gnome/help/totem/es/figures/totem_volume_mute_button.png share/gnome/help/totem/es/legal.xml share/gnome/help/totem/es/totem.xml +share/gnome/help/totem/fr/figures/totem_next_button.png +share/gnome/help/totem/fr/figures/totem_pause_button.png +share/gnome/help/totem/fr/figures/totem_play_button.png +share/gnome/help/totem/fr/figures/totem_previous_button.png +share/gnome/help/totem/fr/figures/totem_show_playlist_button.png +share/gnome/help/totem/fr/figures/totem_start_window.png +share/gnome/help/totem/fr/figures/totem_volume_maximum_button.png +share/gnome/help/totem/fr/figures/totem_volume_mute_button.png +share/gnome/help/totem/fr/legal.xml +share/gnome/help/totem/fr/totem.xml share/gnome/help/totem/ru/figures/totem_screenshot.png share/gnome/help/totem/ru/figures/totem_start_window.png share/gnome/help/totem/ru/legal.xml @@ -47,6 +58,7 @@ share/gnome/help/totem/ru/totem.xml share/gnome/omf/totem/totem-C.omf share/gnome/omf/totem/totem-de.omf share/gnome/omf/totem/totem-es.omf +share/gnome/omf/totem/totem-fr.omf share/gnome/omf/totem/totem-ru.omf share/gnome/pixmaps/media-player-48.png share/gnome/pixmaps/vanity.png @@ -55,8 +67,6 @@ share/gnome/totem/filmholes-big-right.png share/gnome/totem/filmholes.png share/gnome/totem/media-player-48.png share/gnome/totem/mozilla-viewer.glade -share/gnome/totem/playlist-16.png -share/gnome/totem/playlist-24.png share/gnome/totem/playlist-playing.png share/gnome/totem/playlist.glade share/gnome/totem/popup.glade @@ -92,6 +102,7 @@ share/locale/en_GB/LC_MESSAGES/totem.mo share/locale/es/LC_MESSAGES/totem.mo share/locale/et/LC_MESSAGES/totem.mo share/locale/eu/LC_MESSAGES/totem.mo +share/locale/fa/LC_MESSAGES/totem.mo share/locale/fi/LC_MESSAGES/totem.mo share/locale/fr/LC_MESSAGES/totem.mo share/locale/ga/LC_MESSAGES/totem.mo @@ -112,6 +123,7 @@ share/locale/mk/LC_MESSAGES/totem.mo share/locale/ml/LC_MESSAGES/totem.mo share/locale/ms/LC_MESSAGES/totem.mo share/locale/nb/LC_MESSAGES/totem.mo +share/locale/ne/LC_MESSAGES/totem.mo share/locale/nl/LC_MESSAGES/totem.mo share/locale/no/LC_MESSAGES/totem.mo share/locale/pa/LC_MESSAGES/totem.mo @@ -126,8 +138,10 @@ share/locale/sq/LC_MESSAGES/totem.mo share/locale/sr/LC_MESSAGES/totem.mo share/locale/sr@Latn/LC_MESSAGES/totem.mo share/locale/sv/LC_MESSAGES/totem.mo +share/locale/te/LC_MESSAGES/totem.mo share/locale/th/LC_MESSAGES/totem.mo share/locale/tr/LC_MESSAGES/totem.mo +share/locale/ug/LC_MESSAGES/totem.mo share/locale/uk/LC_MESSAGES/totem.mo share/locale/vi/LC_MESSAGES/totem.mo share/locale/wa/LC_MESSAGES/totem.mo @@ -138,6 +152,8 @@ share/locale/zh_TW/LC_MESSAGES/totem.mo @dirrm share/gnome/omf/totem @dirrm share/gnome/help/totem/ru/figures @dirrm share/gnome/help/totem/ru +@dirrm share/gnome/help/totem/fr/figures +@dirrm share/gnome/help/totem/fr @dirrm share/gnome/help/totem/es/figures @dirrm share/gnome/help/totem/es @dirrm share/gnome/help/totem/de/figures diff --git a/net/gnome-netstatus/Makefile b/net/gnome-netstatus/Makefile index b455b8fb7edf..5c8a5647d921 100644 --- a/net/gnome-netstatus/Makefile +++ b/net/gnome-netstatus/Makefile @@ -3,14 +3,15 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/net/gnomenetstatus/Makefile,v 1.39 2005/10/08 19:41:39 marcus Exp $ # PORTNAME= gnomenetstatus -PORTVERSION= 2.10.0 +PORTVERSION= 2.12.0 PORTREVISION= 1 CATEGORIES= net gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-netstatus/2.10 +MASTER_SITE_SUBDIR= sources/gnome-netstatus/2.12 DISTNAME= gnome-netstatus-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -19,11 +20,13 @@ COMMENT= A GNOME applet that shows network status USE_X_PREFIX= yes INSTALLS_OMF= yes +INSTALLS_ICONS= yes USE_BZIP2= yes GNOME_DESKTOP_VERSION=2 -USE_GNOME= gnomehack intlhack gnomeprefix libgnome gnomepanel libglade2 +USE_GNOME= gnomehack intlhack gnomeprefix libgnome gnomepanel libglade2 \ + gnomedocutils USE_GMAKE= yes -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 CONFIGURE_ARGS= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/net/gnome-netstatus/distinfo b/net/gnome-netstatus/distinfo index 48e9fbf2c961..6b98eac7f423 100644 --- a/net/gnome-netstatus/distinfo +++ b/net/gnome-netstatus/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-netstatus-2.10.0.tar.bz2) = b1a044cfbe3299e00d514d966d4766e8 -SIZE (gnome2/gnome-netstatus-2.10.0.tar.bz2) = 510277 +MD5 (gnome2/gnome-netstatus-2.12.0.tar.bz2) = a5f23731a3bf232969e82afef8792a36 +SIZE (gnome2/gnome-netstatus-2.12.0.tar.bz2) = 473226 diff --git a/net/gnome-netstatus/files/patch-src_netstatus-iface.c b/net/gnome-netstatus/files/patch-src_netstatus-iface.c deleted file mode 100644 index 64c9ad52f8c9..000000000000 --- a/net/gnome-netstatus/files/patch-src_netstatus-iface.c +++ /dev/null @@ -1,18 +0,0 @@ ---- src/netstatus-iface.c.orig Tue Nov 30 18:35:23 2004 -+++ src/netstatus-iface.c Tue Nov 30 18:35:43 2004 -@@ -33,6 +33,7 @@ - - #include <libgnome/gnome-i18n.h> - -+#include <sys/types.h> - #include <sys/ioctl.h> - #ifdef HAVE_SYS_SOCKIO_H - #include <sys/sockio.h> -@@ -41,6 +42,7 @@ - #include <sys/socket.h> - #include <net/if.h> - #include <net/if_arp.h> -+#include <netinet/in.h> - #include <arpa/inet.h> - #include <errno.h> - #include <unistd.h> diff --git a/net/gnome-netstatus/files/patch-src_netstatus-sysdeps.c b/net/gnome-netstatus/files/patch-src_netstatus-sysdeps.c index 00ba2cb1e7eb..bf655bd6a0a8 100644 --- a/net/gnome-netstatus/files/patch-src_netstatus-sysdeps.c +++ b/net/gnome-netstatus/files/patch-src_netstatus-sysdeps.c @@ -1,253 +1,11 @@ ---- src/netstatus-sysdeps.c.orig Fri Jul 30 04:21:30 2004 -+++ src/netstatus-sysdeps.c Mon Jun 27 14:14:19 2005 -@@ -35,6 +35,16 @@ - #include <glib.h> - #include <libgnome/gnome-i18n.h> - -+#ifdef __FreeBSD__ -+#include <sys/types.h> -+#include <sys/socket.h> -+#include <sys/ioctl.h> -+#include <net/if.h> -+#include <net/if_var.h> -+#include <dev/an/if_aironet_ieee.h> -+#include <dev/wi/if_wavelan_ieee.h> -+#endif -+ - static inline gboolean - parse_stats (char *buf, - int prx_idx, -@@ -384,6 +394,174 @@ parse_header (char *buf, - } - } - -+static inline gboolean -+wireless_getval (const char *iface, -+ gpointer req, -+ unsigned long req_type, -+ char **error) -+{ -+ struct ifreq ifr; -+ int s; -+ -+ memset (&ifr, 0, sizeof (ifr)); -+ -+ strlcpy (ifr.ifr_name, iface, sizeof (ifr.ifr_name)); -+ ifr.ifr_data = (caddr_t) req; -+ -+ s = socket (AF_INET, SOCK_DGRAM, 0); -+ -+ if (s == -1) -+ { -+ *error = g_strdup_printf (_("Could not connect to interface, '%s'"), iface); -+ return FALSE; -+ } -+ -+ if (ioctl (s, req_type, &ifr) == -1) -+ { -+ *error = g_strdup_printf (_("Could not send ioctl to interface, '%s'"), iface); -+ close (s); -+ return FALSE; -+ } -+ -+ close (s); -+ return TRUE; -+} -+ -+static inline char* -+get_an_data (const char *iface, -+ int *signal_strength) -+{ -+ struct an_req areq; -+ struct an_ltv_status *sts; -+#ifdef AN_RID_RSSI_MAP -+ struct an_ltv_rssi_map an_rssimap; -+#endif -+ int level; -+ char *error = NULL; -+ gboolean rssimap_valid = FALSE; -+ -+#ifdef AN_RID_RSSI_MAP -+ an_rssimap.an_len = sizeof (an_rssimap); -+ an_rssimap.an_type = AN_RID_RSSI_MAP; -+ rssimap_valid = wireless_getval (iface, (gpointer) &an_rssimap, SIOCGAIRONET, &error); -+#endif -+ -+ areq.an_len = sizeof (areq); -+ areq.an_type = AN_RID_STATUS; -+ -+ if (!wireless_getval (iface, (gpointer) &areq, SIOCGAIRONET, &error)) -+ return error; -+ -+ sts = (struct an_ltv_status *)&areq; -+#ifdef AN_RID_RSSI_MAP -+ if (rssimap_valid) -+ level = (int) (an_rssimap.an_entries[sts->an_normalized_strength].an_rss_pct); -+ else -+ level = (int) (sts->an_normalized_strength); -+#else -+ level = (int) (sts->an_normalized_rssi); -+#endif -+ memcpy (signal_strength, &level, sizeof (signal_strength)); -+ -+ return error; -+} -+ -+static inline char* -+get_wi_data (const char *iface, -+ int *signal_strength) -+{ -+ struct wi_req wreq; -+ int level; -+ char *error = NULL; -+ -+ memset (&wreq, 0, sizeof (wreq)); -+ -+ wreq.wi_len = WI_MAX_DATALEN; -+ wreq.wi_type = WI_RID_COMMS_QUALITY; -+ -+ if (!wireless_getval (iface, (gpointer) &wreq, SIOCGWAVELAN, &error)) -+ return error; -+ -+ level = (int) (wreq.wi_val[1]); -+ -+#ifdef WI_RID_READ_APS -+ if (signal_strength <= 0) -+ { -+ /* we fail to get signal strength by usual means, try another way */ -+ static time_t last_scan; -+ static long int cached; -+ time_t now = time (NULL); -+ -+ /* XXX: this is long operation, and we will scan station not often then one in 5 secs */ -+ if (now > last_scan + 5) -+ { -+ struct wi_apinfo *w; -+ int nstations; -+ -+ bzero ((char *)&wreq, sizeof(wreq)); -+ wreq.wi_len = WI_MAX_DATALEN; -+ wreq.wi_type = WI_RID_READ_APS; -+ if (!wireless_getval (iface, (gpointer) &wreq, SIOCGWAVELAN, &error)) -+ return error; -+ nstations = *(int *)wreq.wi_val; -+ if (nstations > 0) -+ { -+ w = (struct wi_apinfo *)(((char *)&wreq.wi_val) + sizeof(int)); -+ signal_strength = (long int)w->signal; -+ } -+ -+ cached = signal_strength; -+ last_scan = now; -+ } -+ else -+ { -+ signal_strength = cached; -+ } -+ } -+#endif -+ -+ memcpy (signal_strength, &level, sizeof (signal_strength)); -+ -+ return error; -+} -+ -+char * -+netstatus_sysdeps_read_iface_wireless_details (const char *iface, -+ gboolean *is_wireless, -+ int *signal_strength) -+{ -+ char *error_message = NULL; -+ -+ g_return_val_if_fail (iface != NULL, NULL); -+ g_return_val_if_fail (is_wireless != NULL, NULL); -+ g_return_val_if_fail (signal_strength != NULL, NULL); -+ -+ if (is_wireless) -+ *is_wireless = FALSE; -+ if (signal_strength) -+ *signal_strength = 0; -+ -+ if (g_strncasecmp (iface, "an", 2) && g_strncasecmp (iface, "wi", 2) && -+ g_strncasecmp (iface, "ath", 3) && g_strncasecmp (iface, "ndis", 4) && -+ g_strncasecmp (iface, "ural", 4) && g_strncasecmp (iface, "ral", 3) && -+ g_strncasecmp (iface, "ipw", 3) && g_strncasecmp (iface, "iwi", 3) && -+ g_strncasecmp (iface, "acx", 3)) -+ return error_message; -+ -+ if (g_strncasecmp (iface, "an", 2) == 0) -+ { -+ error_message = get_an_data (iface, signal_strength); -+ *is_wireless = TRUE; -+ } -+ else -+ { -+ error_message = get_wi_data (iface, signal_strength); -+ *is_wireless = TRUE; -+ } -+ -+ return error_message; -+} -+ - char * - netstatus_sysdeps_read_iface_statistics (const char *iface, - gulong *in_packets, -@@ -413,11 +591,11 @@ netstatus_sysdeps_read_iface_statistics - if (!g_shell_parse_argv (command_line, NULL, &argv, &error)) - { - error_message = g_strdup_printf (_("Could not parse command line '%s': %s"), -- command_line, -- error->message); -+ command_line, -+ error->message); - g_error_free (error); - g_free (command_line); -- -+ - return error_message; - } - g_free (command_line); -@@ -456,8 +634,8 @@ netstatus_sysdeps_read_iface_statistics - g_io_channel_read_line (channel, &buf, NULL, NULL, NULL); - - if (!parse_stats (buf, -- prx_idx, ptx_idx, in_packets, out_packets, -- brx_idx, btx_idx, in_bytes, out_bytes)) -+ prx_idx, ptx_idx, in_packets, out_packets, -+ brx_idx, btx_idx, in_bytes, out_bytes)) - { - error_message = g_strdup_printf (_("Could not parse interface statistics from '%s'. " - "prx_idx = %d; ptx_idx = %d; brx_idx = %d; btx_idx = %d;"), -@@ -477,7 +655,7 @@ netstatus_sysdeps_read_iface_statistics - } - else - { -- error_message = g_strdup_printf ("Error running /usr/bin/netstat for '%s': %s", -+ error_message = g_strdup_printf ("Error running /usr/bin/netstat for '%s': %s", - iface, error->message); - g_error_free (error); - } -@@ -485,23 +663,6 @@ netstatus_sysdeps_read_iface_statistics - g_strfreev (argv); - - return error_message; --} -- --char * --netstatus_sysdeps_read_iface_wireless_details (const char *iface, -- gboolean *is_wireless, -- int *signal_strength) --{ -- g_return_val_if_fail (iface != NULL, NULL); -- g_return_val_if_fail (is_wireless != NULL, NULL); -- g_return_val_if_fail (signal_strength_wireless != NULL, NULL); -- -- if (is_wireless) -- *is_wireless = FALSE; -- if (signal_strength) -- *signal_strength = 0; -- -- return NULL; - } - - #endif /* !defined(__FreeBSD__) */ +--- src/netstatus-sysdeps.c.orig Mon Jun 27 14:29:53 2005 ++++ src/netstatus-sysdeps.c Mon Jun 27 14:30:18 2005 +@@ -548,6 +548,8 @@ netstatus_sysdeps_read_iface_wireless_de + g_strncasecmp (iface, "wi", 2) && + g_strncasecmp (iface, "ath", 3) && + g_strncasecmp (iface, "ndis", 4) && ++ g_strncasecmp (iface, "ural", 4) && ++ g_strncasecmp (iface, "ral", 3) && + g_strncasecmp (iface, "ipw", 3) && + g_strncasecmp (iface, "iwi", 3) && + g_strncasecmp (iface, "acx", 3)) diff --git a/net/gnome-netstatus/pkg-plist b/net/gnome-netstatus/pkg-plist index bf881c64c294..266c5b3ad9be 100644 --- a/net/gnome-netstatus/pkg-plist +++ b/net/gnome-netstatus/pkg-plist @@ -2,12 +2,6 @@ libdata/bonobo/servers/GNOME_NetstatusApplet_Factory.server libexec/gnome-netstatus-applet share/gnome/gnome-2.0/ui/GNOME_NetstatusApplet.xml share/gnome/gnome-netstatus/gnome-netstatus.glade -share/gnome/help/gnome-netstatus/C/figures/gnome-netstatus-disconn.png -share/gnome/help/gnome-netstatus/C/figures/gnome-netstatus-error.png -share/gnome/help/gnome-netstatus/C/figures/gnome-netstatus-idle.png -share/gnome/help/gnome-netstatus/C/figures/gnome-netstatus-rx.png -share/gnome/help/gnome-netstatus/C/figures/gnome-netstatus-tx.png -share/gnome/help/gnome-netstatus/C/figures/gnome-netstatus-txrx.png share/gnome/help/gnome-netstatus/C/gnome-netstatus.xml share/gnome/help/gnome-netstatus/C/legal.xml share/gnome/help/gnome-netstatus/de/figures/gnome-netstatus-disconn.png @@ -18,14 +12,7 @@ share/gnome/help/gnome-netstatus/de/figures/gnome-netstatus-tx.png share/gnome/help/gnome-netstatus/de/figures/gnome-netstatus-txrx.png share/gnome/help/gnome-netstatus/de/gnome-netstatus.xml share/gnome/help/gnome-netstatus/de/legal.xml -share/gnome/help/gnome-netstatus/es/figures/gnome-netstatus-disconn.png -share/gnome/help/gnome-netstatus/es/figures/gnome-netstatus-error.png -share/gnome/help/gnome-netstatus/es/figures/gnome-netstatus-idle.png -share/gnome/help/gnome-netstatus/es/figures/gnome-netstatus-rx.png -share/gnome/help/gnome-netstatus/es/figures/gnome-netstatus-tx.png -share/gnome/help/gnome-netstatus/es/figures/gnome-netstatus-txrx.png share/gnome/help/gnome-netstatus/es/gnome-netstatus.xml -share/gnome/help/gnome-netstatus/es/legal.xml share/gnome/help/gnome-netstatus/fr/figures/gnome-netstatus-disconn.png share/gnome/help/gnome-netstatus/fr/figures/gnome-netstatus-error.png share/gnome/help/gnome-netstatus/fr/figures/gnome-netstatus-idle.png @@ -66,6 +53,7 @@ share/gnome/help/gnome-netstatus/sv/figures/gnome-netstatus-tx.png share/gnome/help/gnome-netstatus/sv/figures/gnome-netstatus-txrx.png share/gnome/help/gnome-netstatus/sv/gnome-netstatus.xml share/gnome/help/gnome-netstatus/sv/legal.xml +share/gnome/help/gnome-netstatus/uk/gnome-netstatus.xml share/gnome/help/gnome-netstatus/zh_CN/figures/gnome-netstatus-disconn.png share/gnome/help/gnome-netstatus/zh_CN/figures/gnome-netstatus-error.png share/gnome/help/gnome-netstatus/zh_CN/figures/gnome-netstatus-idle.png @@ -98,6 +86,7 @@ share/gnome/omf/gnome-netstatus/gnome-netstatus-it.omf share/gnome/omf/gnome-netstatus/gnome-netstatus-ja.omf share/gnome/omf/gnome-netstatus/gnome-netstatus-ko.omf share/gnome/omf/gnome-netstatus/gnome-netstatus-sv.omf +share/gnome/omf/gnome-netstatus/gnome-netstatus-uk.omf share/gnome/omf/gnome-netstatus/gnome-netstatus-zh_CN.omf share/gnome/omf/gnome-netstatus/gnome-netstatus-zh_HK.omf share/gnome/omf/gnome-netstatus/gnome-netstatus-zh_TW.omf @@ -126,7 +115,9 @@ share/locale/el/LC_MESSAGES/gnome-netstatus.mo share/locale/en_CA/LC_MESSAGES/gnome-netstatus.mo share/locale/en_GB/LC_MESSAGES/gnome-netstatus.mo share/locale/es/LC_MESSAGES/gnome-netstatus.mo +share/locale/et/LC_MESSAGES/gnome-netstatus.mo share/locale/eu/LC_MESSAGES/gnome-netstatus.mo +share/locale/fa/LC_MESSAGES/gnome-netstatus.mo share/locale/fi/LC_MESSAGES/gnome-netstatus.mo share/locale/fr/LC_MESSAGES/gnome-netstatus.mo share/locale/ga/LC_MESSAGES/gnome-netstatus.mo @@ -153,6 +144,7 @@ share/locale/pt/LC_MESSAGES/gnome-netstatus.mo share/locale/pt_BR/LC_MESSAGES/gnome-netstatus.mo share/locale/ro/LC_MESSAGES/gnome-netstatus.mo share/locale/ru/LC_MESSAGES/gnome-netstatus.mo +share/locale/rw/LC_MESSAGES/gnome-netstatus.mo share/locale/sk/LC_MESSAGES/gnome-netstatus.mo share/locale/sq/LC_MESSAGES/gnome-netstatus.mo share/locale/sr/LC_MESSAGES/gnome-netstatus.mo @@ -164,6 +156,7 @@ share/locale/tr/LC_MESSAGES/gnome-netstatus.mo share/locale/uk/LC_MESSAGES/gnome-netstatus.mo share/locale/vi/LC_MESSAGES/gnome-netstatus.mo share/locale/wa/LC_MESSAGES/gnome-netstatus.mo +share/locale/xh/LC_MESSAGES/gnome-netstatus.mo share/locale/zh_CN/LC_MESSAGES/gnome-netstatus.mo share/locale/zh_TW/LC_MESSAGES/gnome-netstatus.mo @dirrm share/gnome/omf/gnome-netstatus @@ -173,6 +166,7 @@ share/locale/zh_TW/LC_MESSAGES/gnome-netstatus.mo @dirrm share/gnome/help/gnome-netstatus/zh_HK @dirrm share/gnome/help/gnome-netstatus/zh_CN/figures @dirrm share/gnome/help/gnome-netstatus/zh_CN +@dirrm share/gnome/help/gnome-netstatus/uk @dirrm share/gnome/help/gnome-netstatus/sv/figures @dirrm share/gnome/help/gnome-netstatus/sv @dirrm share/gnome/help/gnome-netstatus/ko/figures @@ -183,11 +177,9 @@ share/locale/zh_TW/LC_MESSAGES/gnome-netstatus.mo @dirrm share/gnome/help/gnome-netstatus/it @dirrm share/gnome/help/gnome-netstatus/fr/figures @dirrm share/gnome/help/gnome-netstatus/fr -@dirrm share/gnome/help/gnome-netstatus/es/figures @dirrm share/gnome/help/gnome-netstatus/es @dirrm share/gnome/help/gnome-netstatus/de/figures @dirrm share/gnome/help/gnome-netstatus/de -@dirrm share/gnome/help/gnome-netstatus/C/figures @dirrm share/gnome/help/gnome-netstatus/C @dirrm share/gnome/help/gnome-netstatus @dirrm share/gnome/gnome-netstatus diff --git a/net/gnome-nettool/Makefile b/net/gnome-nettool/Makefile index 354f8005f5bc..ef5791839707 100644 --- a/net/gnome-nettool/Makefile +++ b/net/gnome-nettool/Makefile @@ -3,14 +3,15 @@ # Whom: Adam Weinberger <adamw@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/net/gnomenettool/Makefile,v 1.11 2005/10/04 03:12:16 ahze Exp $ # PORTNAME= gnomenettool -PORTVERSION= 1.2.0 +PORTVERSION= 1.4.1 PORTEPOCH= 1 CATEGORIES= net gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-nettool/1.2 +MASTER_SITE_SUBDIR= sources/gnome-nettool/1.4 DISTNAME= gnome-nettool-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -19,9 +20,9 @@ COMMENT= A GNOME utility that provides network information statistics USE_X_PREFIX= yes USE_BZIP2= yes -USE_GNOME= gnomehack intlhack gnomeprefix libgnomeui +USE_GNOME= gnomehack intlhack gnomeprefix libglade2 gconf2 USE_GMAKE= yes -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" CFLAGS+= -DHAVE_SOCKADDR_SA_LEN diff --git a/net/gnome-nettool/distinfo b/net/gnome-nettool/distinfo index 9606b0ac5244..97d559067edb 100644 --- a/net/gnome-nettool/distinfo +++ b/net/gnome-nettool/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-nettool-1.2.0.tar.bz2) = 277338cf5d54ae9941260dd993a14f7a -SIZE (gnome2/gnome-nettool-1.2.0.tar.bz2) = 572511 +MD5 (gnome2/gnome-nettool-1.4.1.tar.bz2) = a64f7b39f24b4d3a843d545f2dbb611d +SIZE (gnome2/gnome-nettool-1.4.1.tar.bz2) = 477548 diff --git a/net/gnome-nettool/files/patch-src_info.c b/net/gnome-nettool/files/patch-src_info.c index 2d95d26204ac..9b895e8fd67f 100644 --- a/net/gnome-nettool/files/patch-src_info.c +++ b/net/gnome-nettool/files/patch-src_info.c @@ -1,14 +1,15 @@ ---- src/info.c.orig Tue Feb 1 06:05:58 2005 -+++ src/info.c Thu Mar 3 23:39:57 2005 -@@ -20,6 +20,7 @@ +--- src/info.c.orig Thu Jan 27 18:26:53 2005 ++++ src/info.c Sun Jul 3 17:46:31 2005 +@@ -20,6 +20,8 @@ #include <gtk/gtk.h> #include <glib/gi18n.h> #include <glib/gprintf.h> +#include <sys/types.h> ++#include <string.h> #ifdef HAVE_CONFIG_H # include <config.h> -@@ -38,6 +39,11 @@ +@@ -38,6 +40,11 @@ #include <sys/ioctl.h> #include <stdlib.h> #include <net/if.h> @@ -20,7 +21,7 @@ #include "info.h" #include "utils.h" -@@ -58,6 +64,7 @@ +@@ -58,6 +65,7 @@ static InfoInterfaceDescription info_ifa { N_("Ethernet Interface"), INFO_INTERFACE_ETH, "16_ethernet.xpm", "eth", NULL }, { N_("Wireless Interface"), INFO_INTERFACE_WLAN, "wavelan-16.png", "wlan", NULL }, { N_("Modem Interface"), INFO_INTERFACE_PPP, "16_ppp.xpm", "ppp", NULL }, @@ -28,7 +29,7 @@ { N_("Parallel Line Interface"), INFO_INTERFACE_PLIP, "16_plip.xpm", "plip", NULL }, { N_("Infrared Interface"), INFO_INTERFACE_IRLAN, "irda-16.png", "irlan", NULL }, { N_("Loopback Interface"), INFO_INTERFACE_LO, "16_loopback.xpm", "lo", NULL }, -@@ -128,9 +135,42 @@ +@@ -128,9 +136,42 @@ info_get_interface_from_dev_name (const { gint i; gchar *path; @@ -73,7 +74,7 @@ (*iface) = g_strdup_printf ("%s (%s)", info_iface_desc[i].name, dev_name); if (info_iface_desc[i].pixbuf == NULL) { path = g_build_filename (PIXMAPS_DIR, info_iface_desc[i].icon, NULL); -@@ -217,38 +257,87 @@ +@@ -217,38 +258,87 @@ info_nic_update_stats (gpointer data) gchar tx[10], tx_error[10], tx_drop[10], tx_ovr[10]; */ gchar iface[30]; /*, flags[30]; */ @@ -167,7 +168,7 @@ if (g_ascii_strcasecmp (iface, text) == 0) { /* -@@ -276,7 +365,9 @@ +@@ -276,7 +366,9 @@ info_nic_update_stats (gpointer data) } g_io_channel_unref (io); @@ -178,7 +179,7 @@ return TRUE; } -@@ -405,8 +496,16 @@ +@@ -405,8 +497,16 @@ info_get_nic_information (const gchar *n InfoIpAddr *ip; gint flags; mii_data_result data; @@ -195,7 +196,7 @@ for (ifr6 = ifa0; ifr6; ifr6 = ifr6->ifa_next) { if (strcmp (ifr6->ifa_name, nic) != 0) { -@@ -452,7 +551,9 @@ +@@ -452,7 +552,9 @@ info_get_nic_information (const gchar *n ifc.ifc_req = (struct ifreq *) buf; ioctl (sockfd, SIOCGIFCONF, &ifc); @@ -205,7 +206,7 @@ for (ptr = buf; ptr < buf + ifc.ifc_len;) { ifr = (struct ifreq *) ptr; -@@ -483,6 +584,45 @@ +@@ -483,6 +585,45 @@ info_get_nic_information (const gchar *n (int) ((guchar *) &ifrcopy.ifr_hwaddr.sa_data)[3], (int) ((guchar *) &ifrcopy.ifr_hwaddr.sa_data)[4], (int) ((guchar *) &ifrcopy.ifr_hwaddr.sa_data)[5]); diff --git a/net/gnome-nettool/files/patch-src_lookup.c b/net/gnome-nettool/files/patch-src_lookup.c new file mode 100644 index 000000000000..9744c13973da --- /dev/null +++ b/net/gnome-nettool/files/patch-src_lookup.c @@ -0,0 +1,10 @@ +--- src/lookup.c.orig Sun Jul 3 17:47:02 2005 ++++ src/lookup.c Sun Jul 3 17:47:20 2005 +@@ -21,6 +21,7 @@ + #include <gtk/gtk.h> + #include <glib/gi18n.h> + #include <glib/gprintf.h> ++#include <sys/types.h> + + #include "lookup.h" + #include "utils.h" diff --git a/net/gnome-nettool/files/patch-src_utils.c b/net/gnome-nettool/files/patch-src_utils.c index 0c8111ade4bf..921c780498c1 100644 --- a/net/gnome-nettool/files/patch-src_utils.c +++ b/net/gnome-nettool/files/patch-src_utils.c @@ -1,6 +1,15 @@ ---- src/utils.c.orig Sun Jul 4 20:11:49 2004 -+++ src/utils.c Sun Jul 4 20:12:14 2004 -@@ -240,7 +240,7 @@ +--- src/utils.c.orig Fri May 6 16:10:28 2005 ++++ src/utils.c Sun Jul 3 17:48:12 2005 +@@ -24,6 +24,8 @@ + on GNOME 2.0 */ + + #include "utils.h" ++#include <stdlib.h> ++#include <limits.h> + #include <string.h> + #include <glib/gi18n.h> + +@@ -240,7 +242,7 @@ util_legible_bytes (gchar *bytes) const gchar *unit = "B"; gchar *result; diff --git a/net/gnome-nettool/pkg-plist b/net/gnome-nettool/pkg-plist index b1f5ab614ccf..0d3d6886cd50 100644 --- a/net/gnome-nettool/pkg-plist +++ b/net/gnome-nettool/pkg-plist @@ -23,6 +23,7 @@ share/locale/el/LC_MESSAGES/gnome-nettool.mo share/locale/en_CA/LC_MESSAGES/gnome-nettool.mo share/locale/en_GB/LC_MESSAGES/gnome-nettool.mo share/locale/es/LC_MESSAGES/gnome-nettool.mo +share/locale/et/LC_MESSAGES/gnome-nettool.mo share/locale/eu/LC_MESSAGES/gnome-nettool.mo share/locale/fa/LC_MESSAGES/gnome-nettool.mo share/locale/fi/LC_MESSAGES/gnome-nettool.mo @@ -52,6 +53,7 @@ share/locale/pt/LC_MESSAGES/gnome-nettool.mo share/locale/pt_BR/LC_MESSAGES/gnome-nettool.mo share/locale/ro/LC_MESSAGES/gnome-nettool.mo share/locale/ru/LC_MESSAGES/gnome-nettool.mo +share/locale/rw/LC_MESSAGES/gnome-nettool.mo share/locale/sk/LC_MESSAGES/gnome-nettool.mo share/locale/sq/LC_MESSAGES/gnome-nettool.mo share/locale/sr/LC_MESSAGES/gnome-nettool.mo @@ -63,6 +65,7 @@ share/locale/tr/LC_MESSAGES/gnome-nettool.mo share/locale/uk/LC_MESSAGES/gnome-nettool.mo share/locale/vi/LC_MESSAGES/gnome-nettool.mo share/locale/wa/LC_MESSAGES/gnome-nettool.mo +share/locale/xh/LC_MESSAGES/gnome-nettool.mo share/locale/zh_CN/LC_MESSAGES/gnome-nettool.mo share/locale/zh_TW/LC_MESSAGES/gnome-nettool.mo @dirrm share/gnome/gnome-nettool/pixmaps diff --git a/net/gnomenetstatus/Makefile b/net/gnomenetstatus/Makefile index b455b8fb7edf..5c8a5647d921 100644 --- a/net/gnomenetstatus/Makefile +++ b/net/gnomenetstatus/Makefile @@ -3,14 +3,15 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/net/gnomenetstatus/Makefile,v 1.39 2005/10/08 19:41:39 marcus Exp $ # PORTNAME= gnomenetstatus -PORTVERSION= 2.10.0 +PORTVERSION= 2.12.0 PORTREVISION= 1 CATEGORIES= net gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-netstatus/2.10 +MASTER_SITE_SUBDIR= sources/gnome-netstatus/2.12 DISTNAME= gnome-netstatus-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -19,11 +20,13 @@ COMMENT= A GNOME applet that shows network status USE_X_PREFIX= yes INSTALLS_OMF= yes +INSTALLS_ICONS= yes USE_BZIP2= yes GNOME_DESKTOP_VERSION=2 -USE_GNOME= gnomehack intlhack gnomeprefix libgnome gnomepanel libglade2 +USE_GNOME= gnomehack intlhack gnomeprefix libgnome gnomepanel libglade2 \ + gnomedocutils USE_GMAKE= yes -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 CONFIGURE_ARGS= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/net/gnomenetstatus/distinfo b/net/gnomenetstatus/distinfo index 48e9fbf2c961..6b98eac7f423 100644 --- a/net/gnomenetstatus/distinfo +++ b/net/gnomenetstatus/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-netstatus-2.10.0.tar.bz2) = b1a044cfbe3299e00d514d966d4766e8 -SIZE (gnome2/gnome-netstatus-2.10.0.tar.bz2) = 510277 +MD5 (gnome2/gnome-netstatus-2.12.0.tar.bz2) = a5f23731a3bf232969e82afef8792a36 +SIZE (gnome2/gnome-netstatus-2.12.0.tar.bz2) = 473226 diff --git a/net/gnomenetstatus/files/patch-src_netstatus-iface.c b/net/gnomenetstatus/files/patch-src_netstatus-iface.c deleted file mode 100644 index 64c9ad52f8c9..000000000000 --- a/net/gnomenetstatus/files/patch-src_netstatus-iface.c +++ /dev/null @@ -1,18 +0,0 @@ ---- src/netstatus-iface.c.orig Tue Nov 30 18:35:23 2004 -+++ src/netstatus-iface.c Tue Nov 30 18:35:43 2004 -@@ -33,6 +33,7 @@ - - #include <libgnome/gnome-i18n.h> - -+#include <sys/types.h> - #include <sys/ioctl.h> - #ifdef HAVE_SYS_SOCKIO_H - #include <sys/sockio.h> -@@ -41,6 +42,7 @@ - #include <sys/socket.h> - #include <net/if.h> - #include <net/if_arp.h> -+#include <netinet/in.h> - #include <arpa/inet.h> - #include <errno.h> - #include <unistd.h> diff --git a/net/gnomenetstatus/files/patch-src_netstatus-sysdeps.c b/net/gnomenetstatus/files/patch-src_netstatus-sysdeps.c index 00ba2cb1e7eb..bf655bd6a0a8 100644 --- a/net/gnomenetstatus/files/patch-src_netstatus-sysdeps.c +++ b/net/gnomenetstatus/files/patch-src_netstatus-sysdeps.c @@ -1,253 +1,11 @@ ---- src/netstatus-sysdeps.c.orig Fri Jul 30 04:21:30 2004 -+++ src/netstatus-sysdeps.c Mon Jun 27 14:14:19 2005 -@@ -35,6 +35,16 @@ - #include <glib.h> - #include <libgnome/gnome-i18n.h> - -+#ifdef __FreeBSD__ -+#include <sys/types.h> -+#include <sys/socket.h> -+#include <sys/ioctl.h> -+#include <net/if.h> -+#include <net/if_var.h> -+#include <dev/an/if_aironet_ieee.h> -+#include <dev/wi/if_wavelan_ieee.h> -+#endif -+ - static inline gboolean - parse_stats (char *buf, - int prx_idx, -@@ -384,6 +394,174 @@ parse_header (char *buf, - } - } - -+static inline gboolean -+wireless_getval (const char *iface, -+ gpointer req, -+ unsigned long req_type, -+ char **error) -+{ -+ struct ifreq ifr; -+ int s; -+ -+ memset (&ifr, 0, sizeof (ifr)); -+ -+ strlcpy (ifr.ifr_name, iface, sizeof (ifr.ifr_name)); -+ ifr.ifr_data = (caddr_t) req; -+ -+ s = socket (AF_INET, SOCK_DGRAM, 0); -+ -+ if (s == -1) -+ { -+ *error = g_strdup_printf (_("Could not connect to interface, '%s'"), iface); -+ return FALSE; -+ } -+ -+ if (ioctl (s, req_type, &ifr) == -1) -+ { -+ *error = g_strdup_printf (_("Could not send ioctl to interface, '%s'"), iface); -+ close (s); -+ return FALSE; -+ } -+ -+ close (s); -+ return TRUE; -+} -+ -+static inline char* -+get_an_data (const char *iface, -+ int *signal_strength) -+{ -+ struct an_req areq; -+ struct an_ltv_status *sts; -+#ifdef AN_RID_RSSI_MAP -+ struct an_ltv_rssi_map an_rssimap; -+#endif -+ int level; -+ char *error = NULL; -+ gboolean rssimap_valid = FALSE; -+ -+#ifdef AN_RID_RSSI_MAP -+ an_rssimap.an_len = sizeof (an_rssimap); -+ an_rssimap.an_type = AN_RID_RSSI_MAP; -+ rssimap_valid = wireless_getval (iface, (gpointer) &an_rssimap, SIOCGAIRONET, &error); -+#endif -+ -+ areq.an_len = sizeof (areq); -+ areq.an_type = AN_RID_STATUS; -+ -+ if (!wireless_getval (iface, (gpointer) &areq, SIOCGAIRONET, &error)) -+ return error; -+ -+ sts = (struct an_ltv_status *)&areq; -+#ifdef AN_RID_RSSI_MAP -+ if (rssimap_valid) -+ level = (int) (an_rssimap.an_entries[sts->an_normalized_strength].an_rss_pct); -+ else -+ level = (int) (sts->an_normalized_strength); -+#else -+ level = (int) (sts->an_normalized_rssi); -+#endif -+ memcpy (signal_strength, &level, sizeof (signal_strength)); -+ -+ return error; -+} -+ -+static inline char* -+get_wi_data (const char *iface, -+ int *signal_strength) -+{ -+ struct wi_req wreq; -+ int level; -+ char *error = NULL; -+ -+ memset (&wreq, 0, sizeof (wreq)); -+ -+ wreq.wi_len = WI_MAX_DATALEN; -+ wreq.wi_type = WI_RID_COMMS_QUALITY; -+ -+ if (!wireless_getval (iface, (gpointer) &wreq, SIOCGWAVELAN, &error)) -+ return error; -+ -+ level = (int) (wreq.wi_val[1]); -+ -+#ifdef WI_RID_READ_APS -+ if (signal_strength <= 0) -+ { -+ /* we fail to get signal strength by usual means, try another way */ -+ static time_t last_scan; -+ static long int cached; -+ time_t now = time (NULL); -+ -+ /* XXX: this is long operation, and we will scan station not often then one in 5 secs */ -+ if (now > last_scan + 5) -+ { -+ struct wi_apinfo *w; -+ int nstations; -+ -+ bzero ((char *)&wreq, sizeof(wreq)); -+ wreq.wi_len = WI_MAX_DATALEN; -+ wreq.wi_type = WI_RID_READ_APS; -+ if (!wireless_getval (iface, (gpointer) &wreq, SIOCGWAVELAN, &error)) -+ return error; -+ nstations = *(int *)wreq.wi_val; -+ if (nstations > 0) -+ { -+ w = (struct wi_apinfo *)(((char *)&wreq.wi_val) + sizeof(int)); -+ signal_strength = (long int)w->signal; -+ } -+ -+ cached = signal_strength; -+ last_scan = now; -+ } -+ else -+ { -+ signal_strength = cached; -+ } -+ } -+#endif -+ -+ memcpy (signal_strength, &level, sizeof (signal_strength)); -+ -+ return error; -+} -+ -+char * -+netstatus_sysdeps_read_iface_wireless_details (const char *iface, -+ gboolean *is_wireless, -+ int *signal_strength) -+{ -+ char *error_message = NULL; -+ -+ g_return_val_if_fail (iface != NULL, NULL); -+ g_return_val_if_fail (is_wireless != NULL, NULL); -+ g_return_val_if_fail (signal_strength != NULL, NULL); -+ -+ if (is_wireless) -+ *is_wireless = FALSE; -+ if (signal_strength) -+ *signal_strength = 0; -+ -+ if (g_strncasecmp (iface, "an", 2) && g_strncasecmp (iface, "wi", 2) && -+ g_strncasecmp (iface, "ath", 3) && g_strncasecmp (iface, "ndis", 4) && -+ g_strncasecmp (iface, "ural", 4) && g_strncasecmp (iface, "ral", 3) && -+ g_strncasecmp (iface, "ipw", 3) && g_strncasecmp (iface, "iwi", 3) && -+ g_strncasecmp (iface, "acx", 3)) -+ return error_message; -+ -+ if (g_strncasecmp (iface, "an", 2) == 0) -+ { -+ error_message = get_an_data (iface, signal_strength); -+ *is_wireless = TRUE; -+ } -+ else -+ { -+ error_message = get_wi_data (iface, signal_strength); -+ *is_wireless = TRUE; -+ } -+ -+ return error_message; -+} -+ - char * - netstatus_sysdeps_read_iface_statistics (const char *iface, - gulong *in_packets, -@@ -413,11 +591,11 @@ netstatus_sysdeps_read_iface_statistics - if (!g_shell_parse_argv (command_line, NULL, &argv, &error)) - { - error_message = g_strdup_printf (_("Could not parse command line '%s': %s"), -- command_line, -- error->message); -+ command_line, -+ error->message); - g_error_free (error); - g_free (command_line); -- -+ - return error_message; - } - g_free (command_line); -@@ -456,8 +634,8 @@ netstatus_sysdeps_read_iface_statistics - g_io_channel_read_line (channel, &buf, NULL, NULL, NULL); - - if (!parse_stats (buf, -- prx_idx, ptx_idx, in_packets, out_packets, -- brx_idx, btx_idx, in_bytes, out_bytes)) -+ prx_idx, ptx_idx, in_packets, out_packets, -+ brx_idx, btx_idx, in_bytes, out_bytes)) - { - error_message = g_strdup_printf (_("Could not parse interface statistics from '%s'. " - "prx_idx = %d; ptx_idx = %d; brx_idx = %d; btx_idx = %d;"), -@@ -477,7 +655,7 @@ netstatus_sysdeps_read_iface_statistics - } - else - { -- error_message = g_strdup_printf ("Error running /usr/bin/netstat for '%s': %s", -+ error_message = g_strdup_printf ("Error running /usr/bin/netstat for '%s': %s", - iface, error->message); - g_error_free (error); - } -@@ -485,23 +663,6 @@ netstatus_sysdeps_read_iface_statistics - g_strfreev (argv); - - return error_message; --} -- --char * --netstatus_sysdeps_read_iface_wireless_details (const char *iface, -- gboolean *is_wireless, -- int *signal_strength) --{ -- g_return_val_if_fail (iface != NULL, NULL); -- g_return_val_if_fail (is_wireless != NULL, NULL); -- g_return_val_if_fail (signal_strength_wireless != NULL, NULL); -- -- if (is_wireless) -- *is_wireless = FALSE; -- if (signal_strength) -- *signal_strength = 0; -- -- return NULL; - } - - #endif /* !defined(__FreeBSD__) */ +--- src/netstatus-sysdeps.c.orig Mon Jun 27 14:29:53 2005 ++++ src/netstatus-sysdeps.c Mon Jun 27 14:30:18 2005 +@@ -548,6 +548,8 @@ netstatus_sysdeps_read_iface_wireless_de + g_strncasecmp (iface, "wi", 2) && + g_strncasecmp (iface, "ath", 3) && + g_strncasecmp (iface, "ndis", 4) && ++ g_strncasecmp (iface, "ural", 4) && ++ g_strncasecmp (iface, "ral", 3) && + g_strncasecmp (iface, "ipw", 3) && + g_strncasecmp (iface, "iwi", 3) && + g_strncasecmp (iface, "acx", 3)) diff --git a/net/gnomenetstatus/pkg-plist b/net/gnomenetstatus/pkg-plist index bf881c64c294..266c5b3ad9be 100644 --- a/net/gnomenetstatus/pkg-plist +++ b/net/gnomenetstatus/pkg-plist @@ -2,12 +2,6 @@ libdata/bonobo/servers/GNOME_NetstatusApplet_Factory.server libexec/gnome-netstatus-applet share/gnome/gnome-2.0/ui/GNOME_NetstatusApplet.xml share/gnome/gnome-netstatus/gnome-netstatus.glade -share/gnome/help/gnome-netstatus/C/figures/gnome-netstatus-disconn.png -share/gnome/help/gnome-netstatus/C/figures/gnome-netstatus-error.png -share/gnome/help/gnome-netstatus/C/figures/gnome-netstatus-idle.png -share/gnome/help/gnome-netstatus/C/figures/gnome-netstatus-rx.png -share/gnome/help/gnome-netstatus/C/figures/gnome-netstatus-tx.png -share/gnome/help/gnome-netstatus/C/figures/gnome-netstatus-txrx.png share/gnome/help/gnome-netstatus/C/gnome-netstatus.xml share/gnome/help/gnome-netstatus/C/legal.xml share/gnome/help/gnome-netstatus/de/figures/gnome-netstatus-disconn.png @@ -18,14 +12,7 @@ share/gnome/help/gnome-netstatus/de/figures/gnome-netstatus-tx.png share/gnome/help/gnome-netstatus/de/figures/gnome-netstatus-txrx.png share/gnome/help/gnome-netstatus/de/gnome-netstatus.xml share/gnome/help/gnome-netstatus/de/legal.xml -share/gnome/help/gnome-netstatus/es/figures/gnome-netstatus-disconn.png -share/gnome/help/gnome-netstatus/es/figures/gnome-netstatus-error.png -share/gnome/help/gnome-netstatus/es/figures/gnome-netstatus-idle.png -share/gnome/help/gnome-netstatus/es/figures/gnome-netstatus-rx.png -share/gnome/help/gnome-netstatus/es/figures/gnome-netstatus-tx.png -share/gnome/help/gnome-netstatus/es/figures/gnome-netstatus-txrx.png share/gnome/help/gnome-netstatus/es/gnome-netstatus.xml -share/gnome/help/gnome-netstatus/es/legal.xml share/gnome/help/gnome-netstatus/fr/figures/gnome-netstatus-disconn.png share/gnome/help/gnome-netstatus/fr/figures/gnome-netstatus-error.png share/gnome/help/gnome-netstatus/fr/figures/gnome-netstatus-idle.png @@ -66,6 +53,7 @@ share/gnome/help/gnome-netstatus/sv/figures/gnome-netstatus-tx.png share/gnome/help/gnome-netstatus/sv/figures/gnome-netstatus-txrx.png share/gnome/help/gnome-netstatus/sv/gnome-netstatus.xml share/gnome/help/gnome-netstatus/sv/legal.xml +share/gnome/help/gnome-netstatus/uk/gnome-netstatus.xml share/gnome/help/gnome-netstatus/zh_CN/figures/gnome-netstatus-disconn.png share/gnome/help/gnome-netstatus/zh_CN/figures/gnome-netstatus-error.png share/gnome/help/gnome-netstatus/zh_CN/figures/gnome-netstatus-idle.png @@ -98,6 +86,7 @@ share/gnome/omf/gnome-netstatus/gnome-netstatus-it.omf share/gnome/omf/gnome-netstatus/gnome-netstatus-ja.omf share/gnome/omf/gnome-netstatus/gnome-netstatus-ko.omf share/gnome/omf/gnome-netstatus/gnome-netstatus-sv.omf +share/gnome/omf/gnome-netstatus/gnome-netstatus-uk.omf share/gnome/omf/gnome-netstatus/gnome-netstatus-zh_CN.omf share/gnome/omf/gnome-netstatus/gnome-netstatus-zh_HK.omf share/gnome/omf/gnome-netstatus/gnome-netstatus-zh_TW.omf @@ -126,7 +115,9 @@ share/locale/el/LC_MESSAGES/gnome-netstatus.mo share/locale/en_CA/LC_MESSAGES/gnome-netstatus.mo share/locale/en_GB/LC_MESSAGES/gnome-netstatus.mo share/locale/es/LC_MESSAGES/gnome-netstatus.mo +share/locale/et/LC_MESSAGES/gnome-netstatus.mo share/locale/eu/LC_MESSAGES/gnome-netstatus.mo +share/locale/fa/LC_MESSAGES/gnome-netstatus.mo share/locale/fi/LC_MESSAGES/gnome-netstatus.mo share/locale/fr/LC_MESSAGES/gnome-netstatus.mo share/locale/ga/LC_MESSAGES/gnome-netstatus.mo @@ -153,6 +144,7 @@ share/locale/pt/LC_MESSAGES/gnome-netstatus.mo share/locale/pt_BR/LC_MESSAGES/gnome-netstatus.mo share/locale/ro/LC_MESSAGES/gnome-netstatus.mo share/locale/ru/LC_MESSAGES/gnome-netstatus.mo +share/locale/rw/LC_MESSAGES/gnome-netstatus.mo share/locale/sk/LC_MESSAGES/gnome-netstatus.mo share/locale/sq/LC_MESSAGES/gnome-netstatus.mo share/locale/sr/LC_MESSAGES/gnome-netstatus.mo @@ -164,6 +156,7 @@ share/locale/tr/LC_MESSAGES/gnome-netstatus.mo share/locale/uk/LC_MESSAGES/gnome-netstatus.mo share/locale/vi/LC_MESSAGES/gnome-netstatus.mo share/locale/wa/LC_MESSAGES/gnome-netstatus.mo +share/locale/xh/LC_MESSAGES/gnome-netstatus.mo share/locale/zh_CN/LC_MESSAGES/gnome-netstatus.mo share/locale/zh_TW/LC_MESSAGES/gnome-netstatus.mo @dirrm share/gnome/omf/gnome-netstatus @@ -173,6 +166,7 @@ share/locale/zh_TW/LC_MESSAGES/gnome-netstatus.mo @dirrm share/gnome/help/gnome-netstatus/zh_HK @dirrm share/gnome/help/gnome-netstatus/zh_CN/figures @dirrm share/gnome/help/gnome-netstatus/zh_CN +@dirrm share/gnome/help/gnome-netstatus/uk @dirrm share/gnome/help/gnome-netstatus/sv/figures @dirrm share/gnome/help/gnome-netstatus/sv @dirrm share/gnome/help/gnome-netstatus/ko/figures @@ -183,11 +177,9 @@ share/locale/zh_TW/LC_MESSAGES/gnome-netstatus.mo @dirrm share/gnome/help/gnome-netstatus/it @dirrm share/gnome/help/gnome-netstatus/fr/figures @dirrm share/gnome/help/gnome-netstatus/fr -@dirrm share/gnome/help/gnome-netstatus/es/figures @dirrm share/gnome/help/gnome-netstatus/es @dirrm share/gnome/help/gnome-netstatus/de/figures @dirrm share/gnome/help/gnome-netstatus/de -@dirrm share/gnome/help/gnome-netstatus/C/figures @dirrm share/gnome/help/gnome-netstatus/C @dirrm share/gnome/help/gnome-netstatus @dirrm share/gnome/gnome-netstatus diff --git a/net/gnomenettool/Makefile b/net/gnomenettool/Makefile index 354f8005f5bc..ef5791839707 100644 --- a/net/gnomenettool/Makefile +++ b/net/gnomenettool/Makefile @@ -3,14 +3,15 @@ # Whom: Adam Weinberger <adamw@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/net/gnomenettool/Makefile,v 1.11 2005/10/04 03:12:16 ahze Exp $ # PORTNAME= gnomenettool -PORTVERSION= 1.2.0 +PORTVERSION= 1.4.1 PORTEPOCH= 1 CATEGORIES= net gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-nettool/1.2 +MASTER_SITE_SUBDIR= sources/gnome-nettool/1.4 DISTNAME= gnome-nettool-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -19,9 +20,9 @@ COMMENT= A GNOME utility that provides network information statistics USE_X_PREFIX= yes USE_BZIP2= yes -USE_GNOME= gnomehack intlhack gnomeprefix libgnomeui +USE_GNOME= gnomehack intlhack gnomeprefix libglade2 gconf2 USE_GMAKE= yes -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" CFLAGS+= -DHAVE_SOCKADDR_SA_LEN diff --git a/net/gnomenettool/distinfo b/net/gnomenettool/distinfo index 9606b0ac5244..97d559067edb 100644 --- a/net/gnomenettool/distinfo +++ b/net/gnomenettool/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-nettool-1.2.0.tar.bz2) = 277338cf5d54ae9941260dd993a14f7a -SIZE (gnome2/gnome-nettool-1.2.0.tar.bz2) = 572511 +MD5 (gnome2/gnome-nettool-1.4.1.tar.bz2) = a64f7b39f24b4d3a843d545f2dbb611d +SIZE (gnome2/gnome-nettool-1.4.1.tar.bz2) = 477548 diff --git a/net/gnomenettool/files/patch-src_info.c b/net/gnomenettool/files/patch-src_info.c index 2d95d26204ac..9b895e8fd67f 100644 --- a/net/gnomenettool/files/patch-src_info.c +++ b/net/gnomenettool/files/patch-src_info.c @@ -1,14 +1,15 @@ ---- src/info.c.orig Tue Feb 1 06:05:58 2005 -+++ src/info.c Thu Mar 3 23:39:57 2005 -@@ -20,6 +20,7 @@ +--- src/info.c.orig Thu Jan 27 18:26:53 2005 ++++ src/info.c Sun Jul 3 17:46:31 2005 +@@ -20,6 +20,8 @@ #include <gtk/gtk.h> #include <glib/gi18n.h> #include <glib/gprintf.h> +#include <sys/types.h> ++#include <string.h> #ifdef HAVE_CONFIG_H # include <config.h> -@@ -38,6 +39,11 @@ +@@ -38,6 +40,11 @@ #include <sys/ioctl.h> #include <stdlib.h> #include <net/if.h> @@ -20,7 +21,7 @@ #include "info.h" #include "utils.h" -@@ -58,6 +64,7 @@ +@@ -58,6 +65,7 @@ static InfoInterfaceDescription info_ifa { N_("Ethernet Interface"), INFO_INTERFACE_ETH, "16_ethernet.xpm", "eth", NULL }, { N_("Wireless Interface"), INFO_INTERFACE_WLAN, "wavelan-16.png", "wlan", NULL }, { N_("Modem Interface"), INFO_INTERFACE_PPP, "16_ppp.xpm", "ppp", NULL }, @@ -28,7 +29,7 @@ { N_("Parallel Line Interface"), INFO_INTERFACE_PLIP, "16_plip.xpm", "plip", NULL }, { N_("Infrared Interface"), INFO_INTERFACE_IRLAN, "irda-16.png", "irlan", NULL }, { N_("Loopback Interface"), INFO_INTERFACE_LO, "16_loopback.xpm", "lo", NULL }, -@@ -128,9 +135,42 @@ +@@ -128,9 +136,42 @@ info_get_interface_from_dev_name (const { gint i; gchar *path; @@ -73,7 +74,7 @@ (*iface) = g_strdup_printf ("%s (%s)", info_iface_desc[i].name, dev_name); if (info_iface_desc[i].pixbuf == NULL) { path = g_build_filename (PIXMAPS_DIR, info_iface_desc[i].icon, NULL); -@@ -217,38 +257,87 @@ +@@ -217,38 +258,87 @@ info_nic_update_stats (gpointer data) gchar tx[10], tx_error[10], tx_drop[10], tx_ovr[10]; */ gchar iface[30]; /*, flags[30]; */ @@ -167,7 +168,7 @@ if (g_ascii_strcasecmp (iface, text) == 0) { /* -@@ -276,7 +365,9 @@ +@@ -276,7 +366,9 @@ info_nic_update_stats (gpointer data) } g_io_channel_unref (io); @@ -178,7 +179,7 @@ return TRUE; } -@@ -405,8 +496,16 @@ +@@ -405,8 +497,16 @@ info_get_nic_information (const gchar *n InfoIpAddr *ip; gint flags; mii_data_result data; @@ -195,7 +196,7 @@ for (ifr6 = ifa0; ifr6; ifr6 = ifr6->ifa_next) { if (strcmp (ifr6->ifa_name, nic) != 0) { -@@ -452,7 +551,9 @@ +@@ -452,7 +552,9 @@ info_get_nic_information (const gchar *n ifc.ifc_req = (struct ifreq *) buf; ioctl (sockfd, SIOCGIFCONF, &ifc); @@ -205,7 +206,7 @@ for (ptr = buf; ptr < buf + ifc.ifc_len;) { ifr = (struct ifreq *) ptr; -@@ -483,6 +584,45 @@ +@@ -483,6 +585,45 @@ info_get_nic_information (const gchar *n (int) ((guchar *) &ifrcopy.ifr_hwaddr.sa_data)[3], (int) ((guchar *) &ifrcopy.ifr_hwaddr.sa_data)[4], (int) ((guchar *) &ifrcopy.ifr_hwaddr.sa_data)[5]); diff --git a/net/gnomenettool/files/patch-src_lookup.c b/net/gnomenettool/files/patch-src_lookup.c new file mode 100644 index 000000000000..9744c13973da --- /dev/null +++ b/net/gnomenettool/files/patch-src_lookup.c @@ -0,0 +1,10 @@ +--- src/lookup.c.orig Sun Jul 3 17:47:02 2005 ++++ src/lookup.c Sun Jul 3 17:47:20 2005 +@@ -21,6 +21,7 @@ + #include <gtk/gtk.h> + #include <glib/gi18n.h> + #include <glib/gprintf.h> ++#include <sys/types.h> + + #include "lookup.h" + #include "utils.h" diff --git a/net/gnomenettool/files/patch-src_utils.c b/net/gnomenettool/files/patch-src_utils.c index 0c8111ade4bf..921c780498c1 100644 --- a/net/gnomenettool/files/patch-src_utils.c +++ b/net/gnomenettool/files/patch-src_utils.c @@ -1,6 +1,15 @@ ---- src/utils.c.orig Sun Jul 4 20:11:49 2004 -+++ src/utils.c Sun Jul 4 20:12:14 2004 -@@ -240,7 +240,7 @@ +--- src/utils.c.orig Fri May 6 16:10:28 2005 ++++ src/utils.c Sun Jul 3 17:48:12 2005 +@@ -24,6 +24,8 @@ + on GNOME 2.0 */ + + #include "utils.h" ++#include <stdlib.h> ++#include <limits.h> + #include <string.h> + #include <glib/gi18n.h> + +@@ -240,7 +242,7 @@ util_legible_bytes (gchar *bytes) const gchar *unit = "B"; gchar *result; diff --git a/net/gnomenettool/pkg-plist b/net/gnomenettool/pkg-plist index b1f5ab614ccf..0d3d6886cd50 100644 --- a/net/gnomenettool/pkg-plist +++ b/net/gnomenettool/pkg-plist @@ -23,6 +23,7 @@ share/locale/el/LC_MESSAGES/gnome-nettool.mo share/locale/en_CA/LC_MESSAGES/gnome-nettool.mo share/locale/en_GB/LC_MESSAGES/gnome-nettool.mo share/locale/es/LC_MESSAGES/gnome-nettool.mo +share/locale/et/LC_MESSAGES/gnome-nettool.mo share/locale/eu/LC_MESSAGES/gnome-nettool.mo share/locale/fa/LC_MESSAGES/gnome-nettool.mo share/locale/fi/LC_MESSAGES/gnome-nettool.mo @@ -52,6 +53,7 @@ share/locale/pt/LC_MESSAGES/gnome-nettool.mo share/locale/pt_BR/LC_MESSAGES/gnome-nettool.mo share/locale/ro/LC_MESSAGES/gnome-nettool.mo share/locale/ru/LC_MESSAGES/gnome-nettool.mo +share/locale/rw/LC_MESSAGES/gnome-nettool.mo share/locale/sk/LC_MESSAGES/gnome-nettool.mo share/locale/sq/LC_MESSAGES/gnome-nettool.mo share/locale/sr/LC_MESSAGES/gnome-nettool.mo @@ -63,6 +65,7 @@ share/locale/tr/LC_MESSAGES/gnome-nettool.mo share/locale/uk/LC_MESSAGES/gnome-nettool.mo share/locale/vi/LC_MESSAGES/gnome-nettool.mo share/locale/wa/LC_MESSAGES/gnome-nettool.mo +share/locale/xh/LC_MESSAGES/gnome-nettool.mo share/locale/zh_CN/LC_MESSAGES/gnome-nettool.mo share/locale/zh_TW/LC_MESSAGES/gnome-nettool.mo @dirrm share/gnome/gnome-nettool/pixmaps diff --git a/net/vino/Makefile b/net/vino/Makefile index fbe9e90e857d..740f9bb9025e 100644 --- a/net/vino/Makefile +++ b/net/vino/Makefile @@ -3,13 +3,15 @@ # Whom: Tom McLaughlin <tmclaugh@sdf.lonestar.org> # # $FreeBSD$ +# $MCom: ports/net/vino/Makefile,v 1.21 2005/10/08 19:41:39 marcus Exp $ # PORTNAME= vino -PORTVERSION= 2.10.0 +PORTVERSION= 2.12.0 +PORTREVISION= 1 CATEGORIES= net gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.10 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.12 MAINTAINER= gnome@FreeBSD.org COMMENT= VNC server that allows for remote access to your GNOME desktop @@ -21,7 +23,8 @@ USE_X_PREFIX= yes USE_GNOME= gnomeprefix intlhack gnomehack gnomepanel USE_GMAKE= yes GNOME_DESKTOP_VERSION=2 -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 +INSTALLS_ICONS= yes CONFIGURE_ARGS= --enable-session-support CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/net/vino/distinfo b/net/vino/distinfo index b7aee1de50d9..f751f70367a3 100644 --- a/net/vino/distinfo +++ b/net/vino/distinfo @@ -1,2 +1,2 @@ -MD5 (vino-2.10.0.tar.bz2) = a9b5c811807e01e7fb420f52820f0150 -SIZE (vino-2.10.0.tar.bz2) = 581602 +MD5 (vino-2.12.0.tar.bz2) = eba0962a0e1b9f21719c5688d3d0728b +SIZE (vino-2.12.0.tar.bz2) = 564627 diff --git a/net/vino/pkg-plist b/net/vino/pkg-plist index 9d7a4550c201..c3823708470b 100644 --- a/net/vino/pkg-plist +++ b/net/vino/pkg-plist @@ -22,9 +22,12 @@ share/locale/en_GB/LC_MESSAGES/vino.mo share/locale/es/LC_MESSAGES/vino.mo share/locale/et/LC_MESSAGES/vino.mo share/locale/eu/LC_MESSAGES/vino.mo +share/locale/fa/LC_MESSAGES/vino.mo share/locale/fi/LC_MESSAGES/vino.mo share/locale/fr/LC_MESSAGES/vino.mo +share/locale/gl/LC_MESSAGES/vino.mo share/locale/gu/LC_MESSAGES/vino.mo +share/locale/he/LC_MESSAGES/vino.mo share/locale/hi/LC_MESSAGES/vino.mo share/locale/hu/LC_MESSAGES/vino.mo share/locale/id/LC_MESSAGES/vino.mo @@ -47,15 +50,22 @@ share/locale/pt/LC_MESSAGES/vino.mo share/locale/pt_BR/LC_MESSAGES/vino.mo share/locale/ro/LC_MESSAGES/vino.mo share/locale/ru/LC_MESSAGES/vino.mo +share/locale/rw/LC_MESSAGES/vino.mo share/locale/sk/LC_MESSAGES/vino.mo share/locale/sq/LC_MESSAGES/vino.mo share/locale/sr/LC_MESSAGES/vino.mo share/locale/sr@Latn/LC_MESSAGES/vino.mo share/locale/sv/LC_MESSAGES/vino.mo share/locale/ta/LC_MESSAGES/vino.mo +share/locale/th/LC_MESSAGES/vino.mo share/locale/tr/LC_MESSAGES/vino.mo +share/locale/ug/LC_MESSAGES/vino.mo share/locale/uk/LC_MESSAGES/vino.mo share/locale/vi/LC_MESSAGES/vino.mo +share/locale/wa/LC_MESSAGES/vino.mo +share/locale/xh/LC_MESSAGES/vino.mo share/locale/zh_CN/LC_MESSAGES/vino.mo share/locale/zh_TW/LC_MESSAGES/vino.mo @dirrm share/gnome/vino +@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/print/libgnomeprint/Makefile b/print/libgnomeprint/Makefile index 2cc5717e6710..a7f58f3a5c9b 100644 --- a/print/libgnomeprint/Makefile +++ b/print/libgnomeprint/Makefile @@ -3,14 +3,14 @@ # Whom: Vanilla I. Shu <vanilla@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/print/libgnomeprint/Makefile,v 1.54 2005/09/26 21:07:03 marcus Exp $ # PORTNAME= libgnomeprint -PORTVERSION= 2.10.3 -PORTREVISION= 1 +PORTVERSION= 2.12.1 CATEGORIES= print gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.10 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.12 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -19,14 +19,15 @@ COMMENT= Gnome print support library LIB_DEPENDS= fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \ popt.0:${PORTSDIR}/devel/popt +USE_BISON= yes USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes USE_REINPLACE= yes USE_GNOME= gnomeprefix intlhack gnomehack gnomehier glib20 pango libxml2 \ - libartlgpl2 + libartlgpl2 ltverhack INSTALLS_SHLIB= yes -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" @@ -35,11 +36,7 @@ PLIST_SUB= VERSION=${PORTVERSION} \ .include <bsd.port.pre.mk> -.if exists(${LOCALBASE}/lib/libcups.so) -WITH_CUPS= yes -.endif - -.if defined(WITH_CUPS) && !defined(WITHOUT_CUPS) +.if defined(WITH_CUPS) || exists(${LOCALBASE}/lib/libcups.so) CONFIGURE_ARGS+= --with-cups LIB_DEPENDS+= gnomecups-1.0:${PORTSDIR}/print/libgnomecups PLIST_SUB+= CUPS:="" @@ -48,6 +45,13 @@ CONFIGURE_ARGS+= --without-cups PLIST_SUB+= CUPS:="@comment " .endif +pre-everything:: +.if !defined(WITH_CUPS) + @${ECHO_MSG} " Enable cups support by defining" + @${ECHO_MSG} " WITH_CUPS" + @${ECHO_MSG} "" +.endif + post-patch: @${FIND} ${WRKSRC} -name '*.[ch]' | ${XARGS} ${REINPLACE_CMD} -e \ 's|<malloc[.]h>|<stdlib.h>|' diff --git a/print/libgnomeprint/distinfo b/print/libgnomeprint/distinfo index 8d58d7c70ad5..0bd143323a41 100644 --- a/print/libgnomeprint/distinfo +++ b/print/libgnomeprint/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/libgnomeprint-2.10.3.tar.bz2) = 9052dc919ad038b1a9e4d5301148588e -SIZE (gnome2/libgnomeprint-2.10.3.tar.bz2) = 727745 +MD5 (gnome2/libgnomeprint-2.12.1.tar.bz2) = ea729d4968fe2169c84efb12ace5f6cc +SIZE (gnome2/libgnomeprint-2.12.1.tar.bz2) = 787980 diff --git a/print/libgnomeprint/pkg-plist b/print/libgnomeprint/pkg-plist index bc5a6fc5e733..783bea79666b 100644 --- a/print/libgnomeprint/pkg-plist +++ b/print/libgnomeprint/pkg-plist @@ -2,11 +2,12 @@ etc/gnome/libgnomeprint-2.0/fonts/gnome-print.fontmap include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/gnome-font-face.h include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/gnome-font.h include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/gnome-glyphlist.h -include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/gnome-print-pango.h include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/gnome-pgl.h include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/gnome-print-config.h +include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/gnome-print-filter.h include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/gnome-print-job.h include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/gnome-print-meta.h +include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/gnome-print-pango.h include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/gnome-print-paper.h include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/gnome-print-transport.h include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/gnome-print-unit.h @@ -18,6 +19,7 @@ include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/private/gnome-font-private.h include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/private/gnome-fontmap.h include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/private/gnome-glyphlist-private.h include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/private/gnome-print-config-private.h +include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/private/gnome-print-path.h include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/private/gnome-print-private.h include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/private/gp-gc-private.h include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/private/gpa-config.h @@ -35,8 +37,17 @@ include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/private/gpa-state.h include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/private/gpa-utils.h lib/libgnomeprint-2-2.a lib/libgnomeprint-2-2.so -lib/libgnomeprint-2-2.so.1 +lib/libgnomeprint-2-2.so.0 %%CUPS:%%lib/libgnomeprint/%%VERSION%%/modules/libgnomeprintcups.so +lib/libgnomeprint/%%VERSION%%/modules/filters/libgnomeprint-clip.so +lib/libgnomeprint/%%VERSION%%/modules/filters/libgnomeprint-draft.so +lib/libgnomeprint/%%VERSION%%/modules/filters/libgnomeprint-frgba.so +lib/libgnomeprint/%%VERSION%%/modules/filters/libgnomeprint-multipage.so +lib/libgnomeprint/%%VERSION%%/modules/filters/libgnomeprint-position.so +lib/libgnomeprint/%%VERSION%%/modules/filters/libgnomeprint-reorder.so +lib/libgnomeprint/%%VERSION%%/modules/filters/libgnomeprint-rotate.so +lib/libgnomeprint/%%VERSION%%/modules/filters/libgnomeprint-select.so +lib/libgnomeprint/%%VERSION%%/modules/filters/libgnomeprint-zoom.so lib/libgnomeprint/%%VERSION%%/modules/libgnomeprintlpd.so lib/libgnomeprint/%%VERSION%%/modules/transports/libgnomeprint-custom.so lib/libgnomeprint/%%VERSION%%/modules/transports/libgnomeprint-file.so @@ -95,6 +106,7 @@ share/locale/fa/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo share/locale/fi/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo share/locale/fr/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo share/locale/ga/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo +share/locale/gl/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo share/locale/gu/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo share/locale/he/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo share/locale/hi/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo @@ -123,6 +135,7 @@ share/locale/pt/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo share/locale/pt_BR/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo share/locale/ro/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo share/locale/ru/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo +share/locale/rw/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo share/locale/sk/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo share/locale/sl/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo share/locale/sq/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo @@ -130,13 +143,21 @@ share/locale/sr/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo share/locale/sr@Latn/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo share/locale/sv/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo share/locale/ta/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo +share/locale/te/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo share/locale/th/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo share/locale/tr/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo share/locale/uk/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo share/locale/vi/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo share/locale/wa/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo +share/locale/xh/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo share/locale/zh_CN/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo share/locale/zh_TW/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo +@unexec rmdir %D/share/locale/xh/LC_MESSAGES 2>/dev/null || true +@unexec rmdir %D/share/locale/xh 2>/dev/null || true +@unexec rmdir %D/share/locale/te/LC_MESSAGES 2>/dev/null || true +@unexec rmdir %D/share/locale/te 2>/dev/null || true +@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/mr/LC_MESSAGES 2>/dev/null || true @unexec rmdir %D/share/locale/mr 2>/dev/null || true @dirrm share/gnome/libgnomeprint/%%VERSION%%/printers/uninstalled @@ -147,6 +168,7 @@ share/locale/zh_TW/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo @dirrm share/gnome/libgnomeprint @dirrm %%DOCSDIR%% @dirrm lib/libgnomeprint/%%VERSION%%/modules/transports +@dirrm lib/libgnomeprint/%%VERSION%%/modules/filters @dirrm lib/libgnomeprint/%%VERSION%%/modules @dirrm lib/libgnomeprint/%%VERSION%% @dirrm lib/libgnomeprint diff --git a/security/gnome-keyring-manager/Makefile b/security/gnome-keyring-manager/Makefile index 40c1328621a0..98687e2548e5 100644 --- a/security/gnome-keyring-manager/Makefile +++ b/security/gnome-keyring-manager/Makefile @@ -3,30 +3,34 @@ # Whom: Adam Weinberger <adamw@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/security/gnomekeyringmanager/Makefile,v 1.14 2005/09/07 14:54:53 adamw Exp $ # PORTNAME= gnomekeyringmanager -PORTVERSION= 0.0.4 -PORTREVISION= 1 +PORTVERSION= 2.12.0 CATEGORIES= security gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-keyring-manager/0.0 +MASTER_SITE_SUBDIR= sources/gnome-keyring-manager/2.12 DISTNAME= gnome-keyring-manager-${PORTVERSION} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= GNOME keyring manager +BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/gnome-doc-utils.pc:${PORTSDIR}/textproc/gnomedocutils LIB_DEPENDS= gnome-keyring:${PORTSDIR}/security/gnomekeyring USE_X_PREFIX= yes USE_BZIP2= yes -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 USE_GMAKE= yes +INSTALLS_OMF= yes USE_GNOME= gnomehack gnomeprefix intlhack libgnomeui +CONFIGURE_ARGS= --with-help-dir=${PREFIX}/share/gnome/help CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" +MAN1= gnome-keyring-manager.1 GCONF_SCHEMAS= gnome-keyring-manager.schemas .include <bsd.port.mk> diff --git a/security/gnome-keyring-manager/distinfo b/security/gnome-keyring-manager/distinfo index 6237ee9e1162..640916c094a3 100644 --- a/security/gnome-keyring-manager/distinfo +++ b/security/gnome-keyring-manager/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-keyring-manager-0.0.4.tar.bz2) = 6c44751e9d5fa25559a751fc9751606f -SIZE (gnome2/gnome-keyring-manager-0.0.4.tar.bz2) = 385608 +MD5 (gnome2/gnome-keyring-manager-2.12.0.tar.bz2) = 0a588c64839390e0c6e07250b509a86a +SIZE (gnome2/gnome-keyring-manager-2.12.0.tar.bz2) = 380274 diff --git a/security/gnome-keyring-manager/files/patch-src::gnome-keyring-manager-keyring-manager.c b/security/gnome-keyring-manager/files/patch-src::gnome-keyring-manager-keyring-manager.c deleted file mode 100644 index 763ead9f9ebe..000000000000 --- a/security/gnome-keyring-manager/files/patch-src::gnome-keyring-manager-keyring-manager.c +++ /dev/null @@ -1,30 +0,0 @@ ---- src/gnome-keyring-manager-keyring-manager.c.orig Mon Jul 12 23:14:24 2004 -+++ src/gnome-keyring-manager-keyring-manager.c Mon Jul 12 23:15:32 2004 -@@ -240,6 +240,13 @@ - GtkWidget *menubar; - GtkWidget *menu_item; - GError *error; -+ SetColumnPrefsData toggle[] = -+ { -+ { COLUMN_LOCK_ON_IDLE, "ToggleLockOnIdle", "lock-on-idle" }, -+ { COLUMN_LOCK_TIMEOUT, "ToggleLockTimeout", "lock-timeout" }, -+ { COLUMN_MTIME, "ToggleModificationTime", "mtime" }, -+ { COLUMN_CTIME, "ToggleCreationTime", "ctime" } -+ }; - - manager->priv = g_new0 (GKMKeyringManagerPrivate, 1); - -@@ -329,13 +336,6 @@ - g_signal_connect (manager->priv->tree_view, "button-press-event", G_CALLBACK (keyring_tree_button_press_callback), manager); - g_signal_connect (manager->priv->tree_view, "popup-menu", G_CALLBACK (keyring_tree_context_menu_callback), manager); - -- SetColumnPrefsData toggle[] = -- { -- { COLUMN_LOCK_ON_IDLE, "ToggleLockOnIdle", "lock-on-idle" }, -- { COLUMN_LOCK_TIMEOUT, "ToggleLockTimeout", "lock-timeout" }, -- { COLUMN_MTIME, "ToggleModificationTime", "mtime" }, -- { COLUMN_CTIME, "ToggleCreationTime", "ctime" } -- }; - manager->priv->gconf_cnxn_ids = - set_column_visibility_preferences (toggle, - G_N_ELEMENTS (toggle), diff --git a/security/gnome-keyring-manager/files/patch-src::gnome-keyring-manager-util.c b/security/gnome-keyring-manager/files/patch-src::gnome-keyring-manager-util.c deleted file mode 100644 index 946f458084d7..000000000000 --- a/security/gnome-keyring-manager/files/patch-src::gnome-keyring-manager-util.c +++ /dev/null @@ -1,20 +0,0 @@ ---- src/gnome-keyring-manager-util.c.orig Mon Jul 12 23:12:27 2004 -+++ src/gnome-keyring-manager-util.c Mon Jul 12 23:13:00 2004 -@@ -189,8 +189,6 @@ - GtkIconTheme *icon_theme; - GdkPixbuf *pixbuf; - -- g_return_val_if_fail (GTK_IS_WINDOW (transient_parent), NULL); -- - const char *authors[] = { - "Fernando Herrera <fherrera@onirica.com>", - "Mariano Su\303\241rez-Alvarez <mariano@gnome.org>", -@@ -201,6 +199,8 @@ - }; - const char *translator_credits = _("translator_credits"); - -+ g_return_val_if_fail (GTK_IS_WINDOW (transient_parent), NULL); -+ - icon_theme = gtk_icon_theme_get_default (); - pixbuf = gtk_icon_theme_load_icon (icon_theme, "stock_keyring", 48, 0, NULL); - diff --git a/security/gnome-keyring-manager/files/patch-src::gnome-keyring-manager.c b/security/gnome-keyring-manager/files/patch-src::gnome-keyring-manager.c deleted file mode 100644 index cfb78173e594..000000000000 --- a/security/gnome-keyring-manager/files/patch-src::gnome-keyring-manager.c +++ /dev/null @@ -1,12 +0,0 @@ ---- src/gnome-keyring-manager.c.orig Sun Jun 13 22:16:43 2004 -+++ src/gnome-keyring-manager.c Thu Dec 16 22:58:42 2004 -@@ -312,7 +312,8 @@ - { "manager", 'm', POPT_ARG_NONE, NULL, OPTION_MANAGER, - N_("Open the keyring manager"), NULL }, - { "keyring", 'k', POPT_ARG_STRING, NULL, OPTION_KEYRING, -- N_("Open the keyring editor for KEYRING"), N_("KEYRING") } -+ N_("Open the keyring editor for KEYRING"), N_("KEYRING") }, -+ { NULL, '\0', 0, NULL, 0, NULL, NULL } - }; - - int diff --git a/security/gnome-keyring-manager/files/patch-src_gnome-keyring-manager-acl-display.c b/security/gnome-keyring-manager/files/patch-src_gnome-keyring-manager-acl-display.c new file mode 100644 index 000000000000..3df8081babdb --- /dev/null +++ b/security/gnome-keyring-manager/files/patch-src_gnome-keyring-manager-acl-display.c @@ -0,0 +1,19 @@ +--- src/gnome-keyring-manager-acl-display.c.orig Sat Jul 2 02:12:49 2005 ++++ src/gnome-keyring-manager-acl-display.c Sat Jul 2 02:16:31 2005 +@@ -393,13 +393,15 @@ gkm_acl_display_set_acl (GKMAclDisplay * + GnomeKeyringAccessType at; + GtkTreeIter iter; + char *name, *path; ++ const char *app_path; + + ac = (GnomeKeyringAccessControl*) tmp->data; + name = gnome_keyring_item_ac_get_display_name (ac); + path = gnome_keyring_item_ac_get_path_name (ac); ++ app_path = gkm_get_application_path (); + + /* We don't want to include ourself in the list. */ +- if (g_str_equal (path, gkm_get_application_path ())) ++ if (app_path && g_str_equal (path, app_path)) + { + self->priv->gkm_ac = gnome_keyring_access_control_copy (ac); + } diff --git a/security/gnome-keyring-manager/files/patch-src_gnome-keyring-manager-main-ui.c b/security/gnome-keyring-manager/files/patch-src_gnome-keyring-manager-main-ui.c new file mode 100644 index 000000000000..81a4de59585d --- /dev/null +++ b/security/gnome-keyring-manager/files/patch-src_gnome-keyring-manager-main-ui.c @@ -0,0 +1,18 @@ +--- src/gnome-keyring-manager-main-ui.c.orig Fri Jun 10 19:59:37 2005 ++++ src/gnome-keyring-manager-main-ui.c Fri Jun 10 19:59:45 2005 +@@ -1100,6 +1100,7 @@ gkm_main_ui_initialize_menu (GKMMainUI * + { + GtkWidget *menubar; + GtkAccelGroup *accel_group; ++ GError *error = NULL; + + self->priv->action_group = gtk_action_group_new ("MenuActions"); + gtk_action_group_add_actions (self->priv->action_group, entries, +@@ -1111,7 +1112,6 @@ gkm_main_ui_initialize_menu (GKMMainUI * + self->priv->action_group, 0); + accel_group = gtk_ui_manager_get_accel_group (self->priv->ui_manager); + gtk_window_add_accel_group (GTK_WINDOW (self->priv->window), accel_group); +- GError *error = NULL; + if (!gtk_ui_manager_add_ui_from_file (self->priv->ui_manager, + GLADEDIR MENU_FILE, + &error)) diff --git a/security/gnome-keyring-manager/files/patch-src_gnome-keyring-manager-util.c b/security/gnome-keyring-manager/files/patch-src_gnome-keyring-manager-util.c new file mode 100644 index 000000000000..c05c11acf6e4 --- /dev/null +++ b/security/gnome-keyring-manager/files/patch-src_gnome-keyring-manager-util.c @@ -0,0 +1,31 @@ +--- src/gnome-keyring-manager-util.c.orig Wed May 18 16:41:35 2005 ++++ src/gnome-keyring-manager-util.c Sat Jul 2 02:12:38 2005 +@@ -304,8 +304,6 @@ gkm_about_dialog_new (GtkWindow *transie + { + GtkWidget *about; + +- g_return_val_if_fail (GTK_IS_WINDOW (transient_parent), NULL); +- + const char *authors[] = { + "Fernando Herrera <fherrera@onirica.com>", + "Mariano Su\303\241rez-Alvarez <mariano@gnome.org>", +@@ -317,6 +315,8 @@ gkm_about_dialog_new (GtkWindow *transie + NULL + }; + ++ g_return_val_if_fail (GTK_IS_WINDOW (transient_parent), NULL); ++ + gtk_about_dialog_set_email_hook ((GtkAboutDialogActivateLinkFunc) gkm_about_dialog_activate_links, + GINT_TO_POINTER (LINK_TYPE_EMAIL), NULL); + +@@ -354,6 +354,10 @@ gkm_get_application_path (void) + { + path = g_file_read_link ("/proc/self/exe", NULL); + } ++#elif defined(__FreeBSD__) ++ { ++ path = g_file_read_link ("/proc/curproc/file", NULL); ++ } + #endif + } + diff --git a/security/gnome-keyring-manager/pkg-plist b/security/gnome-keyring-manager/pkg-plist index de199b0c3d26..9b1c28598b19 100644 --- a/security/gnome-keyring-manager/pkg-plist +++ b/security/gnome-keyring-manager/pkg-plist @@ -1,5 +1,16 @@ bin/gnome-keyring-manager share/gnome/applications/gnome-keyring-manager.desktop +share/gnome/gnome-keyring-manager/gnome-keyring-manager-ui.xml +share/gnome/gnome-keyring-manager/gnome-keyring-manager.glade +share/gnome/gnome-keyring-manager/stock_delete-key.png +share/gnome/gnome-keyring-manager/stock_delete-keyring.png +share/gnome/gnome-keyring-manager/stock_new-key.png +share/gnome/gnome-keyring-manager/stock_new-keyring.png +share/gnome/help/gnome-keyring-manager/C/gnome-keyring-manager.xml +share/gnome/help/gnome-keyring-manager/C/legal.xml +share/gnome/help/gnome-keyring-manager/uk/gnome-keyring-manager.xml +share/gnome/omf/gnome-keyring-manager/gnome-keyring-manager-C.omf +share/gnome/omf/gnome-keyring-manager/gnome-keyring-manager-uk.omf share/locale/bg/LC_MESSAGES/gnome-keyring-manager.mo share/locale/bn/LC_MESSAGES/gnome-keyring-manager.mo share/locale/ca/LC_MESSAGES/gnome-keyring-manager.mo @@ -10,22 +21,41 @@ share/locale/el/LC_MESSAGES/gnome-keyring-manager.mo share/locale/en_CA/LC_MESSAGES/gnome-keyring-manager.mo share/locale/en_GB/LC_MESSAGES/gnome-keyring-manager.mo share/locale/es/LC_MESSAGES/gnome-keyring-manager.mo +share/locale/et/LC_MESSAGES/gnome-keyring-manager.mo +share/locale/fa/LC_MESSAGES/gnome-keyring-manager.mo share/locale/fi/LC_MESSAGES/gnome-keyring-manager.mo share/locale/fr/LC_MESSAGES/gnome-keyring-manager.mo +share/locale/gl/LC_MESSAGES/gnome-keyring-manager.mo share/locale/gu/LC_MESSAGES/gnome-keyring-manager.mo +share/locale/hi/LC_MESSAGES/gnome-keyring-manager.mo share/locale/hu/LC_MESSAGES/gnome-keyring-manager.mo share/locale/it/LC_MESSAGES/gnome-keyring-manager.mo share/locale/ja/LC_MESSAGES/gnome-keyring-manager.mo share/locale/ko/LC_MESSAGES/gnome-keyring-manager.mo share/locale/lt/LC_MESSAGES/gnome-keyring-manager.mo share/locale/nb/LC_MESSAGES/gnome-keyring-manager.mo +share/locale/ne/LC_MESSAGES/gnome-keyring-manager.mo share/locale/nl/LC_MESSAGES/gnome-keyring-manager.mo share/locale/no/LC_MESSAGES/gnome-keyring-manager.mo share/locale/pa/LC_MESSAGES/gnome-keyring-manager.mo share/locale/pl/LC_MESSAGES/gnome-keyring-manager.mo share/locale/pt/LC_MESSAGES/gnome-keyring-manager.mo share/locale/pt_BR/LC_MESSAGES/gnome-keyring-manager.mo +share/locale/ro/LC_MESSAGES/gnome-keyring-manager.mo +share/locale/ru/LC_MESSAGES/gnome-keyring-manager.mo +share/locale/rw/LC_MESSAGES/gnome-keyring-manager.mo +share/locale/sk/LC_MESSAGES/gnome-keyring-manager.mo share/locale/sq/LC_MESSAGES/gnome-keyring-manager.mo +share/locale/sr/LC_MESSAGES/gnome-keyring-manager.mo +share/locale/sr@Latn/LC_MESSAGES/gnome-keyring-manager.mo share/locale/sv/LC_MESSAGES/gnome-keyring-manager.mo +share/locale/th/LC_MESSAGES/gnome-keyring-manager.mo +share/locale/tr/LC_MESSAGES/gnome-keyring-manager.mo share/locale/uk/LC_MESSAGES/gnome-keyring-manager.mo share/locale/zh_CN/LC_MESSAGES/gnome-keyring-manager.mo +share/locale/zh_TW/LC_MESSAGES/gnome-keyring-manager.mo +@dirrm share/gnome/omf/gnome-keyring-manager +@dirrm share/gnome/help/gnome-keyring-manager/uk +@dirrm share/gnome/help/gnome-keyring-manager/C +@dirrm share/gnome/help/gnome-keyring-manager +@dirrm share/gnome/gnome-keyring-manager diff --git a/security/gnomekeyringmanager/Makefile b/security/gnomekeyringmanager/Makefile index 40c1328621a0..98687e2548e5 100644 --- a/security/gnomekeyringmanager/Makefile +++ b/security/gnomekeyringmanager/Makefile @@ -3,30 +3,34 @@ # Whom: Adam Weinberger <adamw@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/security/gnomekeyringmanager/Makefile,v 1.14 2005/09/07 14:54:53 adamw Exp $ # PORTNAME= gnomekeyringmanager -PORTVERSION= 0.0.4 -PORTREVISION= 1 +PORTVERSION= 2.12.0 CATEGORIES= security gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-keyring-manager/0.0 +MASTER_SITE_SUBDIR= sources/gnome-keyring-manager/2.12 DISTNAME= gnome-keyring-manager-${PORTVERSION} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= GNOME keyring manager +BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/gnome-doc-utils.pc:${PORTSDIR}/textproc/gnomedocutils LIB_DEPENDS= gnome-keyring:${PORTSDIR}/security/gnomekeyring USE_X_PREFIX= yes USE_BZIP2= yes -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 USE_GMAKE= yes +INSTALLS_OMF= yes USE_GNOME= gnomehack gnomeprefix intlhack libgnomeui +CONFIGURE_ARGS= --with-help-dir=${PREFIX}/share/gnome/help CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" +MAN1= gnome-keyring-manager.1 GCONF_SCHEMAS= gnome-keyring-manager.schemas .include <bsd.port.mk> diff --git a/security/gnomekeyringmanager/distinfo b/security/gnomekeyringmanager/distinfo index 6237ee9e1162..640916c094a3 100644 --- a/security/gnomekeyringmanager/distinfo +++ b/security/gnomekeyringmanager/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-keyring-manager-0.0.4.tar.bz2) = 6c44751e9d5fa25559a751fc9751606f -SIZE (gnome2/gnome-keyring-manager-0.0.4.tar.bz2) = 385608 +MD5 (gnome2/gnome-keyring-manager-2.12.0.tar.bz2) = 0a588c64839390e0c6e07250b509a86a +SIZE (gnome2/gnome-keyring-manager-2.12.0.tar.bz2) = 380274 diff --git a/security/gnomekeyringmanager/files/patch-src::gnome-keyring-manager-keyring-manager.c b/security/gnomekeyringmanager/files/patch-src::gnome-keyring-manager-keyring-manager.c deleted file mode 100644 index 763ead9f9ebe..000000000000 --- a/security/gnomekeyringmanager/files/patch-src::gnome-keyring-manager-keyring-manager.c +++ /dev/null @@ -1,30 +0,0 @@ ---- src/gnome-keyring-manager-keyring-manager.c.orig Mon Jul 12 23:14:24 2004 -+++ src/gnome-keyring-manager-keyring-manager.c Mon Jul 12 23:15:32 2004 -@@ -240,6 +240,13 @@ - GtkWidget *menubar; - GtkWidget *menu_item; - GError *error; -+ SetColumnPrefsData toggle[] = -+ { -+ { COLUMN_LOCK_ON_IDLE, "ToggleLockOnIdle", "lock-on-idle" }, -+ { COLUMN_LOCK_TIMEOUT, "ToggleLockTimeout", "lock-timeout" }, -+ { COLUMN_MTIME, "ToggleModificationTime", "mtime" }, -+ { COLUMN_CTIME, "ToggleCreationTime", "ctime" } -+ }; - - manager->priv = g_new0 (GKMKeyringManagerPrivate, 1); - -@@ -329,13 +336,6 @@ - g_signal_connect (manager->priv->tree_view, "button-press-event", G_CALLBACK (keyring_tree_button_press_callback), manager); - g_signal_connect (manager->priv->tree_view, "popup-menu", G_CALLBACK (keyring_tree_context_menu_callback), manager); - -- SetColumnPrefsData toggle[] = -- { -- { COLUMN_LOCK_ON_IDLE, "ToggleLockOnIdle", "lock-on-idle" }, -- { COLUMN_LOCK_TIMEOUT, "ToggleLockTimeout", "lock-timeout" }, -- { COLUMN_MTIME, "ToggleModificationTime", "mtime" }, -- { COLUMN_CTIME, "ToggleCreationTime", "ctime" } -- }; - manager->priv->gconf_cnxn_ids = - set_column_visibility_preferences (toggle, - G_N_ELEMENTS (toggle), diff --git a/security/gnomekeyringmanager/files/patch-src::gnome-keyring-manager-util.c b/security/gnomekeyringmanager/files/patch-src::gnome-keyring-manager-util.c deleted file mode 100644 index 946f458084d7..000000000000 --- a/security/gnomekeyringmanager/files/patch-src::gnome-keyring-manager-util.c +++ /dev/null @@ -1,20 +0,0 @@ ---- src/gnome-keyring-manager-util.c.orig Mon Jul 12 23:12:27 2004 -+++ src/gnome-keyring-manager-util.c Mon Jul 12 23:13:00 2004 -@@ -189,8 +189,6 @@ - GtkIconTheme *icon_theme; - GdkPixbuf *pixbuf; - -- g_return_val_if_fail (GTK_IS_WINDOW (transient_parent), NULL); -- - const char *authors[] = { - "Fernando Herrera <fherrera@onirica.com>", - "Mariano Su\303\241rez-Alvarez <mariano@gnome.org>", -@@ -201,6 +199,8 @@ - }; - const char *translator_credits = _("translator_credits"); - -+ g_return_val_if_fail (GTK_IS_WINDOW (transient_parent), NULL); -+ - icon_theme = gtk_icon_theme_get_default (); - pixbuf = gtk_icon_theme_load_icon (icon_theme, "stock_keyring", 48, 0, NULL); - diff --git a/security/gnomekeyringmanager/files/patch-src::gnome-keyring-manager.c b/security/gnomekeyringmanager/files/patch-src::gnome-keyring-manager.c deleted file mode 100644 index cfb78173e594..000000000000 --- a/security/gnomekeyringmanager/files/patch-src::gnome-keyring-manager.c +++ /dev/null @@ -1,12 +0,0 @@ ---- src/gnome-keyring-manager.c.orig Sun Jun 13 22:16:43 2004 -+++ src/gnome-keyring-manager.c Thu Dec 16 22:58:42 2004 -@@ -312,7 +312,8 @@ - { "manager", 'm', POPT_ARG_NONE, NULL, OPTION_MANAGER, - N_("Open the keyring manager"), NULL }, - { "keyring", 'k', POPT_ARG_STRING, NULL, OPTION_KEYRING, -- N_("Open the keyring editor for KEYRING"), N_("KEYRING") } -+ N_("Open the keyring editor for KEYRING"), N_("KEYRING") }, -+ { NULL, '\0', 0, NULL, 0, NULL, NULL } - }; - - int diff --git a/security/gnomekeyringmanager/files/patch-src_gnome-keyring-manager-acl-display.c b/security/gnomekeyringmanager/files/patch-src_gnome-keyring-manager-acl-display.c new file mode 100644 index 000000000000..3df8081babdb --- /dev/null +++ b/security/gnomekeyringmanager/files/patch-src_gnome-keyring-manager-acl-display.c @@ -0,0 +1,19 @@ +--- src/gnome-keyring-manager-acl-display.c.orig Sat Jul 2 02:12:49 2005 ++++ src/gnome-keyring-manager-acl-display.c Sat Jul 2 02:16:31 2005 +@@ -393,13 +393,15 @@ gkm_acl_display_set_acl (GKMAclDisplay * + GnomeKeyringAccessType at; + GtkTreeIter iter; + char *name, *path; ++ const char *app_path; + + ac = (GnomeKeyringAccessControl*) tmp->data; + name = gnome_keyring_item_ac_get_display_name (ac); + path = gnome_keyring_item_ac_get_path_name (ac); ++ app_path = gkm_get_application_path (); + + /* We don't want to include ourself in the list. */ +- if (g_str_equal (path, gkm_get_application_path ())) ++ if (app_path && g_str_equal (path, app_path)) + { + self->priv->gkm_ac = gnome_keyring_access_control_copy (ac); + } diff --git a/security/gnomekeyringmanager/files/patch-src_gnome-keyring-manager-main-ui.c b/security/gnomekeyringmanager/files/patch-src_gnome-keyring-manager-main-ui.c new file mode 100644 index 000000000000..81a4de59585d --- /dev/null +++ b/security/gnomekeyringmanager/files/patch-src_gnome-keyring-manager-main-ui.c @@ -0,0 +1,18 @@ +--- src/gnome-keyring-manager-main-ui.c.orig Fri Jun 10 19:59:37 2005 ++++ src/gnome-keyring-manager-main-ui.c Fri Jun 10 19:59:45 2005 +@@ -1100,6 +1100,7 @@ gkm_main_ui_initialize_menu (GKMMainUI * + { + GtkWidget *menubar; + GtkAccelGroup *accel_group; ++ GError *error = NULL; + + self->priv->action_group = gtk_action_group_new ("MenuActions"); + gtk_action_group_add_actions (self->priv->action_group, entries, +@@ -1111,7 +1112,6 @@ gkm_main_ui_initialize_menu (GKMMainUI * + self->priv->action_group, 0); + accel_group = gtk_ui_manager_get_accel_group (self->priv->ui_manager); + gtk_window_add_accel_group (GTK_WINDOW (self->priv->window), accel_group); +- GError *error = NULL; + if (!gtk_ui_manager_add_ui_from_file (self->priv->ui_manager, + GLADEDIR MENU_FILE, + &error)) diff --git a/security/gnomekeyringmanager/files/patch-src_gnome-keyring-manager-util.c b/security/gnomekeyringmanager/files/patch-src_gnome-keyring-manager-util.c new file mode 100644 index 000000000000..c05c11acf6e4 --- /dev/null +++ b/security/gnomekeyringmanager/files/patch-src_gnome-keyring-manager-util.c @@ -0,0 +1,31 @@ +--- src/gnome-keyring-manager-util.c.orig Wed May 18 16:41:35 2005 ++++ src/gnome-keyring-manager-util.c Sat Jul 2 02:12:38 2005 +@@ -304,8 +304,6 @@ gkm_about_dialog_new (GtkWindow *transie + { + GtkWidget *about; + +- g_return_val_if_fail (GTK_IS_WINDOW (transient_parent), NULL); +- + const char *authors[] = { + "Fernando Herrera <fherrera@onirica.com>", + "Mariano Su\303\241rez-Alvarez <mariano@gnome.org>", +@@ -317,6 +315,8 @@ gkm_about_dialog_new (GtkWindow *transie + NULL + }; + ++ g_return_val_if_fail (GTK_IS_WINDOW (transient_parent), NULL); ++ + gtk_about_dialog_set_email_hook ((GtkAboutDialogActivateLinkFunc) gkm_about_dialog_activate_links, + GINT_TO_POINTER (LINK_TYPE_EMAIL), NULL); + +@@ -354,6 +354,10 @@ gkm_get_application_path (void) + { + path = g_file_read_link ("/proc/self/exe", NULL); + } ++#elif defined(__FreeBSD__) ++ { ++ path = g_file_read_link ("/proc/curproc/file", NULL); ++ } + #endif + } + diff --git a/security/gnomekeyringmanager/pkg-plist b/security/gnomekeyringmanager/pkg-plist index de199b0c3d26..9b1c28598b19 100644 --- a/security/gnomekeyringmanager/pkg-plist +++ b/security/gnomekeyringmanager/pkg-plist @@ -1,5 +1,16 @@ bin/gnome-keyring-manager share/gnome/applications/gnome-keyring-manager.desktop +share/gnome/gnome-keyring-manager/gnome-keyring-manager-ui.xml +share/gnome/gnome-keyring-manager/gnome-keyring-manager.glade +share/gnome/gnome-keyring-manager/stock_delete-key.png +share/gnome/gnome-keyring-manager/stock_delete-keyring.png +share/gnome/gnome-keyring-manager/stock_new-key.png +share/gnome/gnome-keyring-manager/stock_new-keyring.png +share/gnome/help/gnome-keyring-manager/C/gnome-keyring-manager.xml +share/gnome/help/gnome-keyring-manager/C/legal.xml +share/gnome/help/gnome-keyring-manager/uk/gnome-keyring-manager.xml +share/gnome/omf/gnome-keyring-manager/gnome-keyring-manager-C.omf +share/gnome/omf/gnome-keyring-manager/gnome-keyring-manager-uk.omf share/locale/bg/LC_MESSAGES/gnome-keyring-manager.mo share/locale/bn/LC_MESSAGES/gnome-keyring-manager.mo share/locale/ca/LC_MESSAGES/gnome-keyring-manager.mo @@ -10,22 +21,41 @@ share/locale/el/LC_MESSAGES/gnome-keyring-manager.mo share/locale/en_CA/LC_MESSAGES/gnome-keyring-manager.mo share/locale/en_GB/LC_MESSAGES/gnome-keyring-manager.mo share/locale/es/LC_MESSAGES/gnome-keyring-manager.mo +share/locale/et/LC_MESSAGES/gnome-keyring-manager.mo +share/locale/fa/LC_MESSAGES/gnome-keyring-manager.mo share/locale/fi/LC_MESSAGES/gnome-keyring-manager.mo share/locale/fr/LC_MESSAGES/gnome-keyring-manager.mo +share/locale/gl/LC_MESSAGES/gnome-keyring-manager.mo share/locale/gu/LC_MESSAGES/gnome-keyring-manager.mo +share/locale/hi/LC_MESSAGES/gnome-keyring-manager.mo share/locale/hu/LC_MESSAGES/gnome-keyring-manager.mo share/locale/it/LC_MESSAGES/gnome-keyring-manager.mo share/locale/ja/LC_MESSAGES/gnome-keyring-manager.mo share/locale/ko/LC_MESSAGES/gnome-keyring-manager.mo share/locale/lt/LC_MESSAGES/gnome-keyring-manager.mo share/locale/nb/LC_MESSAGES/gnome-keyring-manager.mo +share/locale/ne/LC_MESSAGES/gnome-keyring-manager.mo share/locale/nl/LC_MESSAGES/gnome-keyring-manager.mo share/locale/no/LC_MESSAGES/gnome-keyring-manager.mo share/locale/pa/LC_MESSAGES/gnome-keyring-manager.mo share/locale/pl/LC_MESSAGES/gnome-keyring-manager.mo share/locale/pt/LC_MESSAGES/gnome-keyring-manager.mo share/locale/pt_BR/LC_MESSAGES/gnome-keyring-manager.mo +share/locale/ro/LC_MESSAGES/gnome-keyring-manager.mo +share/locale/ru/LC_MESSAGES/gnome-keyring-manager.mo +share/locale/rw/LC_MESSAGES/gnome-keyring-manager.mo +share/locale/sk/LC_MESSAGES/gnome-keyring-manager.mo share/locale/sq/LC_MESSAGES/gnome-keyring-manager.mo +share/locale/sr/LC_MESSAGES/gnome-keyring-manager.mo +share/locale/sr@Latn/LC_MESSAGES/gnome-keyring-manager.mo share/locale/sv/LC_MESSAGES/gnome-keyring-manager.mo +share/locale/th/LC_MESSAGES/gnome-keyring-manager.mo +share/locale/tr/LC_MESSAGES/gnome-keyring-manager.mo share/locale/uk/LC_MESSAGES/gnome-keyring-manager.mo share/locale/zh_CN/LC_MESSAGES/gnome-keyring-manager.mo +share/locale/zh_TW/LC_MESSAGES/gnome-keyring-manager.mo +@dirrm share/gnome/omf/gnome-keyring-manager +@dirrm share/gnome/help/gnome-keyring-manager/uk +@dirrm share/gnome/help/gnome-keyring-manager/C +@dirrm share/gnome/help/gnome-keyring-manager +@dirrm share/gnome/gnome-keyring-manager diff --git a/sysutils/gconf-editor/Makefile b/sysutils/gconf-editor/Makefile index e1eb4d78c2d0..df4c4624c8a3 100644 --- a/sysutils/gconf-editor/Makefile +++ b/sysutils/gconf-editor/Makefile @@ -3,14 +3,16 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/sysutils/gconf-editor/Makefile,v 1.41 2005/10/08 19:41:39 marcus Exp $ # PORTNAME= gconf-editor -PORTVERSION= 2.10.0 +PORTVERSION= 2.12.0 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.10 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.12 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -19,10 +21,10 @@ COMMENT= A gconf database editor for the GNOME 2 environment USE_BZIP2= yes USE_X_PREFIX= yes INSTALLS_OMF= yes +INSTALLS_ICONS= yes USE_GMAKE= yes USE_GNOME= gnomeprefix intlhack gnomehack libgnomeui -USE_LIBTOOL_VER=15 -USE_REINPLACE= yes +USE_AUTOTOOLS= libtool:15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/sysutils/gconf-editor/distinfo b/sysutils/gconf-editor/distinfo index c8cc01673e98..ac148f0445a3 100644 --- a/sysutils/gconf-editor/distinfo +++ b/sysutils/gconf-editor/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gconf-editor-2.10.0.tar.bz2) = 651a18f7eb5af91761521aa4f04ccc07 -SIZE (gnome2/gconf-editor-2.10.0.tar.bz2) = 543405 +MD5 (gnome2/gconf-editor-2.12.0.tar.bz2) = ec8b0d4ee2a460ed31f69e4825fb4e17 +SIZE (gnome2/gconf-editor-2.12.0.tar.bz2) = 531655 diff --git a/sysutils/gconf-editor/pkg-plist b/sysutils/gconf-editor/pkg-plist index b24a6c9a4c40..c3037e36b7b9 100644 --- a/sysutils/gconf-editor/pkg-plist +++ b/sysutils/gconf-editor/pkg-plist @@ -9,7 +9,17 @@ share/gnome/help/gconf-editor/C/figures/entry-string.png share/gnome/help/gconf-editor/C/figures/gconf_editor_anno_window.png share/gnome/help/gconf-editor/C/gconf-editor.xml share/gnome/help/gconf-editor/C/legal.xml +share/gnome/help/gconf-editor/uk/figures/entry-blank.png +share/gnome/help/gconf-editor/uk/figures/entry-bool.png +share/gnome/help/gconf-editor/uk/figures/entry-list.png +share/gnome/help/gconf-editor/uk/figures/entry-number.png +share/gnome/help/gconf-editor/uk/figures/entry-schema.png +share/gnome/help/gconf-editor/uk/figures/entry-string.png +share/gnome/help/gconf-editor/uk/figures/gconf_editor_anno_window.png +share/gnome/help/gconf-editor/uk/gconf-editor.xml +share/gnome/help/gconf-editor/uk/legal.xml share/gnome/omf/gconf-editor/gconf-editor-C.omf +share/gnome/omf/gconf-editor/gconf-editor-uk.omf share/gnome/pixmaps/gconf-editor/entry-blank.png share/gnome/pixmaps/gconf-editor/entry-bool.png share/gnome/pixmaps/gconf-editor/entry-list.png @@ -71,6 +81,7 @@ share/locale/pt/LC_MESSAGES/gconf-editor.mo share/locale/pt_BR/LC_MESSAGES/gconf-editor.mo share/locale/ro/LC_MESSAGES/gconf-editor.mo share/locale/ru/LC_MESSAGES/gconf-editor.mo +share/locale/rw/LC_MESSAGES/gconf-editor.mo share/locale/sk/LC_MESSAGES/gconf-editor.mo share/locale/sl/LC_MESSAGES/gconf-editor.mo share/locale/sq/LC_MESSAGES/gconf-editor.mo @@ -78,14 +89,23 @@ share/locale/sr/LC_MESSAGES/gconf-editor.mo share/locale/sr@Latn/LC_MESSAGES/gconf-editor.mo share/locale/sv/LC_MESSAGES/gconf-editor.mo share/locale/ta/LC_MESSAGES/gconf-editor.mo +share/locale/te/LC_MESSAGES/gconf-editor.mo share/locale/th/LC_MESSAGES/gconf-editor.mo share/locale/tr/LC_MESSAGES/gconf-editor.mo +share/locale/ug/LC_MESSAGES/gconf-editor.mo share/locale/uk/LC_MESSAGES/gconf-editor.mo share/locale/vi/LC_MESSAGES/gconf-editor.mo +share/locale/xh/LC_MESSAGES/gconf-editor.mo share/locale/zh_CN/LC_MESSAGES/gconf-editor.mo share/locale/zh_TW/LC_MESSAGES/gconf-editor.mo +@unexec rmdir %D/share/locale/ug/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/ug 2> /dev/null || true +@unexec rmdir %D/share/locale/te/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/te 2> /dev/null || true @dirrm share/gnome/pixmaps/gconf-editor @dirrm share/gnome/omf/gconf-editor +@dirrm share/gnome/help/gconf-editor/uk/figures +@dirrm share/gnome/help/gconf-editor/uk @dirrm share/gnome/help/gconf-editor/C/figures @dirrm share/gnome/help/gconf-editor/C @dirrm share/gnome/help/gconf-editor diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile index 10c307825914..f11fdb353fa9 100644 --- a/sysutils/gnome-control-center/Makefile +++ b/sysutils/gnome-control-center/Makefile @@ -3,13 +3,14 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/sysutils/gnomecontrolcenter2/Makefile,v 1.85 2005/10/03 15:29:07 ahze Exp $ # PORTNAME= gnomecontrolcenter2 -PORTVERSION= 2.10.2 +PORTVERSION= 2.12.1 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/control-center/2.10 +MASTER_SITE_SUBDIR= sources/control-center/2.12 DISTNAME= control-center-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -24,9 +25,11 @@ USE_REINPLACE= yes USE_GMAKE= yes GNOME_DESKTOP_VERSION=2 USE_GSTREAMER= yes +WANT_GNOME= yes USE_GNOME= gnomeprefix gnomehack intlhack metacity nautilus2 \ gnomemenus desktopfileutils -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 +INSTALLS_OMF= yes INSTALLS_SHLIB= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" @@ -38,9 +41,27 @@ GCONF_SCHEMAS= apps_gnome_settings_daemon_default_editor.schemas \ desktop_gnome_peripherals_keyboard_xkb.schemas \ fontilus.schemas themus.schemas +.if defined(PACKAGE_BUILDING) || defined(PARALLEL_PACKAGE_BUILD) +.undef WITHOUT_GNOME +WITH_GNOME= yes +.endif + +.include <bsd.port.pre.mk> + +.if ${HAVE_GNOME:Mevolutiondataserver}!="" +USE_GNOME+= evolutiondataserver +CONFIGURE_ARGS+=--enable-aboutme +PLIST_SUB+= ABOUTME="" +.else +CONFIGURE_ARGS+=--disable-aboutme +PLIST_SUB+= ABOUTME="@comment " +.endif + post-patch: @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \ 's|[{]prefix[}]/share/pixmaps|{datadir}/pixmaps|g' + @${REINPLACE_CMD} -e 's|mozilla-thunderbird|thunderbird|g' \ + ${WRKSRC}/capplets/default-applications/gnome-default-applications-properties-structs.c @${REINPLACE_CMD} -e 's|/bin/tar|/usr/bin/tar|g ; \ s|/bin/gzip|/usr/bin/gzip|g' \ ${WRKSRC}/capplets/theme-switcher/gnome-theme-installer.c @@ -48,4 +69,4 @@ post-patch: post-install: @-update-desktop-database -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/sysutils/gnome-control-center/distinfo b/sysutils/gnome-control-center/distinfo index b834f271fa82..550ff98a48b6 100644 --- a/sysutils/gnome-control-center/distinfo +++ b/sysutils/gnome-control-center/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/control-center-2.10.2.tar.bz2) = 36022dcd340dac004903f5dadc8af589 -SIZE (gnome2/control-center-2.10.2.tar.bz2) = 2833639 +MD5 (gnome2/control-center-2.12.1.tar.bz2) = f3d8520b8544e1f910600ba889e02523 +SIZE (gnome2/control-center-2.12.1.tar.bz2) = 1771524 diff --git a/sysutils/gnome-control-center/files/patch-capplets_about-me_gnome-about-me-password.c b/sysutils/gnome-control-center/files/patch-capplets_about-me_gnome-about-me-password.c new file mode 100644 index 000000000000..7ea6bb0dd359 --- /dev/null +++ b/sysutils/gnome-control-center/files/patch-capplets_about-me_gnome-about-me-password.c @@ -0,0 +1,16 @@ +--- capplets/about-me/gnome-about-me-password.c.orig Wed Aug 10 05:45:08 2005 ++++ capplets/about-me/gnome-about-me-password.c Wed Aug 10 15:44:57 2005 +@@ -35,7 +35,13 @@ + #include <sys/wait.h> + #include <sys/poll.h> + #include <termios.h> ++#include <signal.h> ++#ifndef __FreeBSD__ + #include <pty.h> ++#else ++#include <sys/types.h> ++#include <libutil.h> ++#endif + + #include "capplet-util.h" + #include "eel-alert-dialog.h" diff --git a/sysutils/gnome-control-center/files/patch-capplets_about-me_gnome-about-me.c b/sysutils/gnome-control-center/files/patch-capplets_about-me_gnome-about-me.c new file mode 100644 index 000000000000..0d1f85f32c7f --- /dev/null +++ b/sysutils/gnome-control-center/files/patch-capplets_about-me_gnome-about-me.c @@ -0,0 +1,34 @@ +--- capplets/about-me/gnome-about-me.c.orig Wed Jul 27 13:45:17 2005 ++++ capplets/about-me/gnome-about-me.c Wed Jul 27 13:47:09 2005 +@@ -258,12 +258,10 @@ + static char * + get_user_login (void) + { +- char buf[LINE_MAX * 4]; +- struct passwd pwd, *err; ++ struct passwd *pwd; + +- int i; +- i = getpwuid_r(getuid(), &pwd, buf, sizeof(buf), &err); +- return ((i == 0) && (err == &pwd)) ? g_strdup(pwd.pw_name) : NULL; ++ pwd = getpwuid(getuid()); ++ return (pwd != NULL) ? g_strdup(pwd->pw_name) : NULL; + } + + /* +@@ -664,6 +662,7 @@ + struct passwd *pwent; + char *user = NULL; + gchar *str; ++ gchar **tok; + + me = g_new0 (GnomeAboutMe, 1); + +@@ -733,7 +732,6 @@ + _("Unknown login ID, the user database might be corrupted")); + return ; + } +- gchar **tok; + tok = g_strsplit (pwent->pw_gecos, ",", 0); + + /************************************************/ diff --git a/sysutils/gnome-control-center/files/patch-capplets_gnome-keyboard-properties-xkbot.c b/sysutils/gnome-control-center/files/patch-capplets_gnome-keyboard-properties-xkbot.c new file mode 100644 index 000000000000..ab7180f75c17 --- /dev/null +++ b/sysutils/gnome-control-center/files/patch-capplets_gnome-keyboard-properties-xkbot.c @@ -0,0 +1,17 @@ +--- capplets/keyboard/gnome-keyboard-properties-xkbot.c.orig Wed Jul 27 13:48:58 2005 ++++ capplets/keyboard/gnome-keyboard-properties-xkbot.c Wed Jul 27 13:49:37 2005 +@@ -265,11 +265,12 @@ + GladeXML * dialog) + { + GtkWidget *expander, *align, *vbox; ++ gchar *utfGroupName, *titlemarkup; + + GSList * expanders_list = g_object_get_data (G_OBJECT (dialog), EXPANDERS_PROP); + +- gchar *utfGroupName = xci_desc_to_utf8 (configItem); +- gchar *titlemarkup = g_strconcat ("<span>", utfGroupName, "</span>", NULL); ++ utfGroupName = xci_desc_to_utf8 (configItem); ++ titlemarkup = g_strconcat ("<span>", utfGroupName, "</span>", NULL); + + expander = gtk_expander_new (titlemarkup); + g_object_set_data_full (G_OBJECT (expander), "utfGroupName", utfGroupName, g_free); diff --git a/sysutils/gnome-control-center/files/patch-capplets_mouse_gnome-mouse-properties.c b/sysutils/gnome-control-center/files/patch-capplets_mouse_gnome-mouse-properties.c new file mode 100644 index 000000000000..32c81dfdebba --- /dev/null +++ b/sysutils/gnome-control-center/files/patch-capplets_mouse_gnome-mouse-properties.c @@ -0,0 +1,21 @@ +--- capplets/mouse/gnome-mouse-properties.c.orig Mon Sep 5 17:05:46 2005 ++++ capplets/mouse/gnome-mouse-properties.c Mon Sep 5 17:06:23 2005 +@@ -658,7 +658,8 @@ + + gchar **iterator = NULL; + gchar **paths = NULL; +- ++ const gchar *xpaths; ++ + GConfClient* client = gconf_client_get_default(); + GtkListStore* store = GTK_LIST_STORE(gtk_tree_model_sort_get_model(model)); + gchar* current_theme = gconf_client_get_string(client, CURSOR_THEME_KEY, NULL); +@@ -666,7 +667,7 @@ + g_object_unref(client); + client = NULL; + +- const gchar *xpaths = g_getenv ("XCURSOR_PATH"); ++ xpaths = g_getenv ("XCURSOR_PATH"); + + if (xpaths != NULL) { + paths = g_strsplit (xpaths, ":", 0); diff --git a/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_actions_Makefile.in b/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_actions_Makefile.in deleted file mode 100644 index 52a627fb20df..000000000000 --- a/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_actions_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- gnome-settings-daemon/actions/Makefile.in.orig Mon Dec 20 19:19:31 2004 -+++ gnome-settings-daemon/actions/Makefile.in Mon Dec 20 19:20:45 2004 -@@ -296,7 +296,7 @@ - Datadir = $(datadir)/control-center-2.0/interfaces/ - Data_DATA = acme.glade - --pixmapsdir = $(GNOMECC_PIXMAPS_DIR) -+pixmapsdir = $(prefix)/share/icons/gnome/48x48/apps - pixmaps_DATA = acme-brightness.png acme-eject.png gnome-speakernotes-muted.png gnome-speakernotes.png - - EXTRA_DIST = \ diff --git a/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_gnome-settings-multimedia-keys.c b/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_gnome-settings-multimedia-keys.c index f66b82c9ffd1..ed30cddab65a 100644 --- a/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_gnome-settings-multimedia-keys.c +++ b/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_gnome-settings-multimedia-keys.c @@ -1,6 +1,6 @@ ---- gnome-settings-daemon/gnome-settings-multimedia-keys.c.orig Thu Oct 14 15:44:21 2004 -+++ gnome-settings-daemon/gnome-settings-multimedia-keys.c Thu Oct 14 15:44:38 2004 -@@ -813,7 +813,7 @@ +--- gnome-settings-daemon/gnome-settings-multimedia-keys.c.orig Wed Jul 27 13:52:13 2005 ++++ gnome-settings-daemon/gnome-settings-multimedia-keys.c Wed Jul 27 13:52:32 2005 +@@ -828,7 +828,7 @@ do_mail_action (acme); break; case SLEEP_KEY: @@ -8,4 +8,4 @@ + do_sleep_action ("zzz", "xset dpms force off"); break; case SCREENSAVER_KEY: - execute ("xscreensaver-command -lock", FALSE); + if ((cmd = g_find_program_in_path ("gnome-screensaver-command"))) diff --git a/sysutils/gnome-control-center/files/patch-libwindow-settings_wm-list.c b/sysutils/gnome-control-center/files/patch-libwindow-settings_wm-list.c deleted file mode 100644 index 149d59a9b0c8..000000000000 --- a/sysutils/gnome-control-center/files/patch-libwindow-settings_wm-list.c +++ /dev/null @@ -1,11 +0,0 @@ ---- libwindow-settings/wm-list.c.orig Tue Oct 8 17:43:12 2002 -+++ libwindow-settings/wm-list.c Tue Oct 8 17:43:25 2002 -@@ -251,7 +251,7 @@ - gchar *name; - GConfClient *client; - -- tempdir = gnome_unconditional_datadir_file ("gnome/wm-properties/"); -+ tempdir = gnome_unconditional_datadir_file ("wm-properties/"); - wm_list_read_dir (tempdir, FALSE); - g_free (tempdir); - diff --git a/sysutils/gnome-control-center/pkg-plist b/sysutils/gnome-control-center/pkg-plist index 9bf38dd44446..b43391f76cfb 100644 --- a/sysutils/gnome-control-center/pkg-plist +++ b/sysutils/gnome-control-center/pkg-plist @@ -1,3 +1,4 @@ +%%ABOUTME%%bin/gnome-about-me bin/gnome-accessibility-keyboard-properties bin/gnome-at-properties bin/gnome-background-properties @@ -40,6 +41,7 @@ share/gnome/applications/background.desktop share/gnome/applications/default-applications.desktop share/gnome/applications/display-properties.desktop share/gnome/applications/font-properties.desktop +%%ABOUTME%%share/gnome/applications/gnome-about-me.desktop share/gnome/applications/gnome-font-viewer.desktop share/gnome/applications/gnome-network-preferences.desktop share/gnome/applications/gnome-settings-mouse.desktop @@ -51,12 +53,12 @@ share/gnome/applications/keybinding.desktop share/gnome/applications/keyboard.desktop share/gnome/applications/themus-theme-applier.desktop share/gnome/applications/window-properties.desktop -@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true share/gnome/control-center-2.0/icons/display-capplet.png share/gnome/control-center-2.0/interfaces/acme.glade share/gnome/control-center-2.0/interfaces/apply-font.glade share/gnome/control-center-2.0/interfaces/at-enable-dialog.glade share/gnome/control-center-2.0/interfaces/font-properties.glade +%%ABOUTME%%share/gnome/control-center-2.0/interfaces/gnome-about-me.glade share/gnome/control-center-2.0/interfaces/gnome-accessibility-keyboard-properties.glade share/gnome/control-center-2.0/interfaces/gnome-background-properties.glade share/gnome/control-center-2.0/interfaces/gnome-default-applications-properties.glade @@ -84,6 +86,12 @@ share/gnome/control-center-2.0/pixmaps/bar.png share/gnome/control-center-2.0/pixmaps/double-click-maybe.png share/gnome/control-center-2.0/pixmaps/double-click-off.png share/gnome/control-center-2.0/pixmaps/double-click-on.png +%%ABOUTME%%share/gnome/control-center-2.0/pixmaps/gnome-about-me-bulb-off.png +%%ABOUTME%%share/gnome/control-center-2.0/pixmaps/gnome-about-me-bulb-on.png +share/gnome/control-center-2.0/pixmaps/acme-brightness.png +share/gnome/control-center-2.0/pixmaps/acme-eject.png +share/gnome/control-center-2.0/pixmaps/gnome-speakernotes-muted.png +share/gnome/control-center-2.0/pixmaps/gnome-speakernotes.png share/gnome/control-center-2.0/pixmaps/keyboard-bell.png share/gnome/control-center-2.0/pixmaps/keyboard-cursor.png share/gnome/control-center-2.0/pixmaps/keyboard-repeat.png @@ -111,15 +119,27 @@ share/gnome/control-center-2.0/xrdb/Xaw.ad share/gnome/cursor-fonts/cursor-large-white.pcf share/gnome/cursor-fonts/cursor-large.pcf share/gnome/cursor-fonts/cursor-white.pcf +share/gnome/help/control-center/C/config-accessibility-keyboard.xml +share/gnome/help/control-center/C/config-background.xml +share/gnome/help/control-center/C/config-behavior.xml +share/gnome/help/control-center/C/config-cds.xml +share/gnome/help/control-center/C/config-default-apps.xml +share/gnome/help/control-center/C/config-file-type.xml +share/gnome/help/control-center/C/config-hints.xml +share/gnome/help/control-center/C/config-html.xml +share/gnome/help/control-center/C/config-kbd.xml +share/gnome/help/control-center/C/config-keybindings.xml +share/gnome/help/control-center/C/config-mouse.xml +share/gnome/help/control-center/C/config-screensaver.xml +share/gnome/help/control-center/C/config-sound.xml +share/gnome/help/control-center/C/config-themes.xml +share/gnome/help/control-center/C/control-center.xml share/gnome/idl/ConfigArchiver.idl share/gnome/idl/GNOME_SettingsDaemon.idl +share/gnome/omf/control-center/control-center-C.omf share/gnome/pixmaps/display-capplet.png share/gnome/vfolders/font-method.directory share/gnome/vfolders/theme-method.directory -share/icons/gnome/48x48/apps/acme-brightness.png -share/icons/gnome/48x48/apps/acme-eject.png -share/icons/gnome/48x48/apps/gnome-speakernotes-muted.png -share/icons/gnome/48x48/apps/gnome-speakernotes.png share/icons/hicolor/48x48/apps/gnome-control-center.png share/locale/af/LC_MESSAGES/control-center-2.0.mo share/locale/am/LC_MESSAGES/control-center-2.0.mo @@ -155,6 +175,7 @@ share/locale/is/LC_MESSAGES/control-center-2.0.mo share/locale/it/LC_MESSAGES/control-center-2.0.mo share/locale/ja/LC_MESSAGES/control-center-2.0.mo share/locale/ko/LC_MESSAGES/control-center-2.0.mo +share/locale/ku/LC_MESSAGES/control-center-2.0.mo share/locale/lt/LC_MESSAGES/control-center-2.0.mo share/locale/lv/LC_MESSAGES/control-center-2.0.mo share/locale/mk/LC_MESSAGES/control-center-2.0.mo @@ -181,6 +202,7 @@ share/locale/sr/LC_MESSAGES/control-center-2.0.mo share/locale/sr@Latn/LC_MESSAGES/control-center-2.0.mo share/locale/sv/LC_MESSAGES/control-center-2.0.mo share/locale/ta/LC_MESSAGES/control-center-2.0.mo +share/locale/te/LC_MESSAGES/control-center-2.0.mo share/locale/th/LC_MESSAGES/control-center-2.0.mo share/locale/tr/LC_MESSAGES/control-center-2.0.mo share/locale/uk/LC_MESSAGES/control-center-2.0.mo @@ -190,9 +212,18 @@ share/locale/xh/LC_MESSAGES/control-center-2.0.mo share/locale/zh_CN/LC_MESSAGES/control-center-2.0.mo share/locale/zh_TW/LC_MESSAGES/control-center-2.0.mo share/locale/zu/LC_MESSAGES/control-center-2.0.mo +@unexec rmdir %D/share/locale/zu/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/zu 2> /dev/null || true +@unexec rmdir %D/share/locale/xh/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/xh 2> /dev/null || true +@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/nso/LC_MESSAGES 2> /dev/null || true @unexec rmdir %D/share/locale/nso 2> /dev/null || true -@dirrm share/gnome/gnome-background-properties +@dirrm share/gnome/omf/control-center +@dirrm share/gnome/help/control-center/C +@dirrm share/gnome/help/control-center +@unexec /bin/rmdir %D/share/gnome/gnome-background-properties 2>/dev/null || /usr/bin/true @dirrm share/gnome/cursor-fonts @dirrm share/gnome/control-center-2.0/xrdb @dirrm share/gnome/control-center-2.0/pixmaps @@ -200,4 +231,5 @@ share/locale/zu/LC_MESSAGES/control-center-2.0.mo @unexec rmdir %D/share/gnome/control-center-2.0/icons 2> /dev/null || true @dirrm lib/window-manager-settings @dirrm include/gnome-window-settings-2.0 +@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/sysutils/gnome-system-monitor/Makefile b/sysutils/gnome-system-monitor/Makefile index 0638e562902c..9c5ce1123877 100644 --- a/sysutils/gnome-system-monitor/Makefile +++ b/sysutils/gnome-system-monitor/Makefile @@ -3,13 +3,14 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/sysutils/gnomesystemmonitor/Makefile,v 1.51 2005/10/04 03:07:41 ahze Exp $ # PORTNAME= gnomesystemmonitor -PORTVERSION= 2.10.1 +PORTVERSION= 2.12.1 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-system-monitor/2.10 +MASTER_SITE_SUBDIR= sources/gnome-system-monitor/2.12 DISTNAME= gnome-system-monitor-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -24,7 +25,7 @@ INSTALLS_OMF= yes USE_GMAKE= yes USE_REINPLACE= yes USE_GNOME= gnomeprefix intlhack gnomehack libgnomeui libwnck -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib -lutil" diff --git a/sysutils/gnome-system-monitor/distinfo b/sysutils/gnome-system-monitor/distinfo index dfde097daf11..04fc6c3149c0 100644 --- a/sysutils/gnome-system-monitor/distinfo +++ b/sysutils/gnome-system-monitor/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-system-monitor-2.10.1.tar.bz2) = 22acb1699193f8bd2ced656d44f57377 -SIZE (gnome2/gnome-system-monitor-2.10.1.tar.bz2) = 766187 +MD5 (gnome2/gnome-system-monitor-2.12.1.tar.bz2) = 31924d02786622151c0fb30314d1f85d +SIZE (gnome2/gnome-system-monitor-2.12.1.tar.bz2) = 785235 diff --git a/sysutils/gnome-system-monitor/files/patch-src::proctable.c b/sysutils/gnome-system-monitor/files/patch-src::proctable.c index 49a699641476..70b2f9e30c64 100644 --- a/sysutils/gnome-system-monitor/files/patch-src::proctable.c +++ b/sysutils/gnome-system-monitor/files/patch-src::proctable.c @@ -1,7 +1,7 @@ ---- src/proctable.c.orig Tue Nov 30 01:28:31 2004 -+++ src/proctable.c Wed Dec 1 13:25:55 2004 -@@ -772,6 +772,12 @@ - +--- src/proctable.c.orig Fri Jul 22 18:58:42 2005 ++++ src/proctable.c Mon Jul 25 22:25:58 2005 +@@ -853,6 +853,12 @@ static void cb_exclude(ProcInfo* info, G + } +static int @@ -13,7 +13,7 @@ static void refresh_list (ProcData *procdata, const unsigned *pid_list, const guint n) { -@@ -863,10 +869,15 @@ +@@ -945,10 +951,15 @@ proctable_update_list (ProcData * const pid_list = glibtop_get_proclist (&proclist, which, arg); @@ -22,7 +22,7 @@ /* FIXME: total cpu time elapsed should be calculated on an individual basis here ** should probably have a total_time_last gint in the ProcInfo structure */ glibtop_get_cpu (&cpu); - total_time = cpu.total - total_time_last; + total_time = MAX(cpu.total - total_time_last, 1); + if (cpu.frequency) { + total_time /= (cpu.frequency/100); + } diff --git a/sysutils/gnome-system-monitor/pkg-plist b/sysutils/gnome-system-monitor/pkg-plist index 6f9dcfca6975..e7455e4cedcb 100644 --- a/sysutils/gnome-system-monitor/pkg-plist +++ b/sysutils/gnome-system-monitor/pkg-plist @@ -75,10 +75,13 @@ share/locale/sv/LC_MESSAGES/gnome-system-monitor.mo share/locale/ta/LC_MESSAGES/gnome-system-monitor.mo share/locale/th/LC_MESSAGES/gnome-system-monitor.mo share/locale/tr/LC_MESSAGES/gnome-system-monitor.mo +share/locale/ug/LC_MESSAGES/gnome-system-monitor.mo share/locale/uk/LC_MESSAGES/gnome-system-monitor.mo share/locale/vi/LC_MESSAGES/gnome-system-monitor.mo share/locale/zh_CN/LC_MESSAGES/gnome-system-monitor.mo share/locale/zh_TW/LC_MESSAGES/gnome-system-monitor.mo +@unexec rmdir %D/share/locale/ug/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/ug 2> /dev/null || true @dirrm share/gnome/omf/gnome-system-monitor @dirrm share/gnome/help/gnome-system-monitor/C/figures @dirrm share/gnome/help/gnome-system-monitor/C diff --git a/sysutils/gnome-system-tools/Makefile b/sysutils/gnome-system-tools/Makefile index 1dca8a647c5c..005b91a17f19 100644 --- a/sysutils/gnome-system-tools/Makefile +++ b/sysutils/gnome-system-tools/Makefile @@ -3,14 +3,15 @@ # Whom: Adam Weinberger <adamw@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/sysutils/gnomesystemtools/Makefile,v 1.30 2005/09/10 05:52:02 marcus Exp $ # PORTNAME= gnomesystemtools -PORTVERSION= 1.2.0 -PORTREVISION= 2 +PORTVERSION= 1.4.0 +PORTREVISION= 1 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-system-tools/1.2 +MASTER_SITE_SUBDIR= sources/gnome-system-tools/1.4 DISTNAME= gnome-system-tools-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -25,8 +26,9 @@ USE_GMAKE= yes USE_X_PREFIX= yes GNOME_DESKTOP_VERSION=2 USE_GNOME= gnomehack gnomeprefix gnometarget intlhack nautilus2 -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 INSTALLS_OMF= yes +CONFIGURE_ARGS= --enable-services CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" @@ -34,11 +36,8 @@ GCONF_SCHEMAS= gnome-system-tools.schemas .include <bsd.port.pre.mk> -.if ${OSVERSION} >= 500000 -CONFIGURE_ARGS+= --enable-services -PLIST_SUB+= SERVICES="" -.else -PLIST_SUB+= SERVICES="@comment " +.if ${OSVERSION} < 500000 +IGNORE= Uses symbols not present in 4.X .endif .include <bsd.port.post.mk> diff --git a/sysutils/gnome-system-tools/distinfo b/sysutils/gnome-system-tools/distinfo index 6eb37fa99a84..e0cb6d350a79 100644 --- a/sysutils/gnome-system-tools/distinfo +++ b/sysutils/gnome-system-tools/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-system-tools-1.2.0.tar.bz2) = fbcf8866ecea8b330cbe53cf8b0df55e -SIZE (gnome2/gnome-system-tools-1.2.0.tar.bz2) = 1780677 +MD5 (gnome2/gnome-system-tools-1.4.0.tar.bz2) = bbc13f526025c4da1607fa640499b6ee +SIZE (gnome2/gnome-system-tools-1.4.0.tar.bz2) = 1959280 diff --git a/sysutils/gnome-system-tools/files/patch-src_common_gst-auth.c b/sysutils/gnome-system-tools/files/patch-src_common_gst-auth.c index 9272d918136c..f73b28ae4d10 100644 --- a/sysutils/gnome-system-tools/files/patch-src_common_gst-auth.c +++ b/sysutils/gnome-system-tools/files/patch-src_common_gst-auth.c @@ -1,13 +1,105 @@ ---- src/common/gst-auth.c.orig Thu Mar 10 14:39:18 2005 -+++ src/common/gst-auth.c Thu Mar 10 14:39:50 2005 -@@ -142,12 +142,12 @@ gst_auth_run_term (GstTool *tool, gchar +--- src/common/gst-auth.c.orig Mon Aug 8 15:00:01 2005 ++++ src/common/gst-auth.c Sat Sep 10 01:47:35 2005 +@@ -55,6 +55,82 @@ + static int root; /* if we are root, no password is + required */ + ++#ifdef __FreeBSD__ ++static int ++_forkpty (int *amaster, char *name, ++ struct termios *termp, struct winsize *winp) ++{ ++ int master, slave; ++ char *line; ++ pid_t pid; ++ ++ master = posix_openpt (O_RDWR); ++ if (master == -1) ++ return (-1); ++ ++ if (grantpt (master) == -1) ++ { ++ (void) close (master); ++ return (-1); ++ } ++ ++ if (unlockpt (master) == -1) ++ { ++ (void) close (master); ++ return (-1); ++ } ++ ++ line = ptsname (master); ++ if (line == NULL) ++ { ++ (void) close (master); ++ return (-1); ++ } ++ ++ slave = open (line, O_RDWR); ++ if (slave < 0) ++ { ++ (void) close (master); ++ return (-1); ++ } ++ ++ if (amaster) ++ *amaster = master; ++ ++ if (name) ++ strcpy (name, line); ++ ++ if (termp) ++ (void) tcsetattr(slave, TCSAFLUSH, termp); ++ ++ if (winp) ++ (void) ioctl(slave, TIOCSWINSZ, (char *) winp); ++ ++ pid = fork (); ++ switch (pid) ++ { ++ case -1: ++ (void) close (slave); ++ (void) close (master); ++ return (-1); ++ case 0: ++ (void) close (master); ++ dup2 (slave, STDIN_FILENO); ++ dup2 (slave, STDOUT_FILENO); ++ dup2 (slave, STDERR_FILENO); ++ return (0); ++ default: ++ (void) close (slave); ++ return (pid); ++ } ++ ++ (void) close (master); ++ return (-1); ++} ++#else ++#define _forkpty forkpty ++#endif ++ + static void + gst_auth_display_error_message (GstTool *tool, gchar *primary_text, gchar *secondary_text) + { +@@ -125,7 +201,7 @@ gst_auth_run_term (GstTool *tool, gchar + int p[2]; + + pipe (p); +- tool->backend_pid = forkpty (&tool->write_fd, NULL, NULL, NULL); ++ tool->backend_pid = _forkpty (&tool->write_fd, NULL, NULL, NULL); + + if (tool->backend_pid < 0) { + gst_auth_display_error_message (tool, +@@ -142,12 +218,12 @@ gst_auth_run_term (GstTool *tool, gchar unsetenv("LANG"); unsetenv("LANGUAGE"); - dup2 (p[1], 1); - dup2 (p[1], 2); + dup2 (p[1], STDOUT_FILENO); -+ /*dup2 (p[1], 2);*/ ++ dup2 (p[1], STDERR_FILENO); close (p[0]); execv (args[0], args); diff --git a/sysutils/gnome-system-tools/files/patch-src_common_gst-tool.c b/sysutils/gnome-system-tools/files/patch-src_common_gst-tool.c index 5134f30e581b..9aaef15031fd 100644 --- a/sysutils/gnome-system-tools/files/patch-src_common_gst-tool.c +++ b/sysutils/gnome-system-tools/files/patch-src_common_gst-tool.c @@ -1,6 +1,21 @@ ---- src/common/gst-tool.c.orig Thu Mar 10 14:39:54 2005 -+++ src/common/gst-tool.c Thu Mar 10 14:40:00 2005 -@@ -1653,7 +1653,7 @@ poll_backend (GstTool *tool) +--- src/common/gst-tool.c.orig Tue Jun 21 15:07:05 2005 ++++ src/common/gst-tool.c Wed Jul 6 01:28:22 2005 +@@ -598,7 +598,14 @@ gst_tool_kill_backend_cb (GstDirectiveEn + if (tool->root_access == ROOT_ACCESS_SIMULATED_DISABLED) + tool->root_access = ROOT_ACCESS_SIMULATED; + ++#if 0 ++ /* ++ * We do not need to wait for the tool, ++ * as it will get SIGPIPE anyway. ++ * This waitpid causes problems on FreeBSD. ++ */ + waitpid (tool->backend_pid, NULL, 0); ++#endif + } + } + +@@ -1655,7 +1662,7 @@ poll_backend (GstTool *tool) struct pollfd fd; fd.fd = tool->read_fd; diff --git a/sysutils/gnome-system-tools/files/patch-src_network_location.c b/sysutils/gnome-system-tools/files/patch-src_network_location.c deleted file mode 100644 index e2577a6a49e0..000000000000 --- a/sysutils/gnome-system-tools/files/patch-src_network_location.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/network/location.c.orig Thu Dec 23 13:16:33 2004 -+++ src/network/location.c Thu Dec 23 13:16:40 2004 -@@ -687,7 +687,7 @@ - static void - copy_tag_list (xmlNodePtr source, xmlNodePtr dest, const gchar *list[]) - { -- gchar **string = (gchar **) list;; -+ gchar **string = (gchar **) list; - gchar *value; - - while (*string) diff --git a/sysutils/gnome-system-tools/pkg-plist b/sysutils/gnome-system-tools/pkg-plist index a52125a51fcd..48800800d0e0 100644 --- a/sysutils/gnome-system-tools/pkg-plist +++ b/sysutils/gnome-system-tools/pkg-plist @@ -1,5 +1,5 @@ bin/network-admin -%%SERVICES%%bin/services-admin +bin/services-admin bin/shares-admin bin/time-admin bin/users-admin @@ -58,12 +58,13 @@ share/gnome-system-tools/pixmaps/turbolinux.png share/gnome-system-tools/pixmaps/unsupported-distro.png share/gnome-system-tools/pixmaps/users-groups.png share/gnome-system-tools/pixmaps/users.png +share/gnome-system-tools/pixmaps/vidalinux.png share/gnome-system-tools/pixmaps/vine.png share/gnome-system-tools/pixmaps/wavelan-16.png share/gnome-system-tools/pixmaps/wavelan-48.png share/gnome-system-tools/pixmaps/world_map-960.png share/gnome/applications/network.desktop -%%SERVICES%%share/gnome/applications/services.desktop +share/gnome/applications/services.desktop share/gnome/applications/shares.desktop share/gnome/applications/time.desktop share/gnome/applications/users.desktop @@ -77,18 +78,29 @@ share/gnome/help/services-admin/C/figures/service-properties.png share/gnome/help/services-admin/C/figures/services-tool.png share/gnome/help/services-admin/C/legal.xml share/gnome/help/services-admin/C/services-admin.xml +share/gnome/help/services-admin/nl/figures/service-properties.png +share/gnome/help/services-admin/nl/figures/services-tool.png +share/gnome/help/services-admin/nl/legal.xml +share/gnome/help/services-admin/nl/services-admin.xml share/gnome/help/time-admin/C/figures/time-map.png share/gnome/help/time-admin/C/figures/time-servers.png share/gnome/help/time-admin/C/figures/time-tool.png share/gnome/help/time-admin/C/legal.xml share/gnome/help/time-admin/C/time-admin.xml +share/gnome/help/time-admin/nl/figures/time-map.png +share/gnome/help/time-admin/nl/figures/time-servers.png +share/gnome/help/time-admin/nl/figures/time-tool.png +share/gnome/help/time-admin/nl/legal.xml +share/gnome/help/time-admin/nl/time-admin.xml share/gnome/help/users-admin/C/figures/users-tool.png share/gnome/help/users-admin/C/legal.xml share/gnome/help/users-admin/C/users-admin.xml share/gnome/omf/gnome-system-tools/boot-admin-C.omf share/gnome/omf/gnome-system-tools/network-admin-C.omf share/gnome/omf/gnome-system-tools/services-admin-C.omf +share/gnome/omf/gnome-system-tools/services-admin-nl.omf share/gnome/omf/gnome-system-tools/time-admin-C.omf +share/gnome/omf/gnome-system-tools/time-admin-nl.omf share/gnome/omf/gnome-system-tools/users-admin-C.omf share/locale/am/LC_MESSAGES/gnome-system-tools.mo share/locale/ar/LC_MESSAGES/gnome-system-tools.mo @@ -110,6 +122,7 @@ share/locale/fr/LC_MESSAGES/gnome-system-tools.mo share/locale/ga/LC_MESSAGES/gnome-system-tools.mo share/locale/gl/LC_MESSAGES/gnome-system-tools.mo share/locale/gu/LC_MESSAGES/gnome-system-tools.mo +share/locale/he/LC_MESSAGES/gnome-system-tools.mo share/locale/hi/LC_MESSAGES/gnome-system-tools.mo share/locale/hr/LC_MESSAGES/gnome-system-tools.mo share/locale/hu/LC_MESSAGES/gnome-system-tools.mo @@ -123,6 +136,8 @@ share/locale/mk/LC_MESSAGES/gnome-system-tools.mo share/locale/ml/LC_MESSAGES/gnome-system-tools.mo share/locale/mn/LC_MESSAGES/gnome-system-tools.mo share/locale/ms/LC_MESSAGES/gnome-system-tools.mo +share/locale/nb/LC_MESSAGES/gnome-system-tools.mo +share/locale/ne/LC_MESSAGES/gnome-system-tools.mo share/locale/nl/LC_MESSAGES/gnome-system-tools.mo share/locale/nn/LC_MESSAGES/gnome-system-tools.mo share/locale/no/LC_MESSAGES/gnome-system-tools.mo @@ -132,6 +147,7 @@ share/locale/pt/LC_MESSAGES/gnome-system-tools.mo share/locale/pt_BR/LC_MESSAGES/gnome-system-tools.mo share/locale/ro/LC_MESSAGES/gnome-system-tools.mo share/locale/ru/LC_MESSAGES/gnome-system-tools.mo +share/locale/rw/LC_MESSAGES/gnome-system-tools.mo share/locale/sk/LC_MESSAGES/gnome-system-tools.mo share/locale/sq/LC_MESSAGES/gnome-system-tools.mo share/locale/sr/LC_MESSAGES/gnome-system-tools.mo @@ -143,15 +159,20 @@ share/locale/tr/LC_MESSAGES/gnome-system-tools.mo share/locale/uk/LC_MESSAGES/gnome-system-tools.mo share/locale/vi/LC_MESSAGES/gnome-system-tools.mo share/locale/wa/LC_MESSAGES/gnome-system-tools.mo +share/locale/xh/LC_MESSAGES/gnome-system-tools.mo share/locale/zh_CN/LC_MESSAGES/gnome-system-tools.mo share/locale/zh_TW/LC_MESSAGES/gnome-system-tools.mo @dirrm share/gnome/omf/gnome-system-tools @dirrm share/gnome/help/users-admin/C/figures @dirrm share/gnome/help/users-admin/C @dirrm share/gnome/help/users-admin +@dirrm share/gnome/help/time-admin/nl/figures +@dirrm share/gnome/help/time-admin/nl @dirrm share/gnome/help/time-admin/C/figures @dirrm share/gnome/help/time-admin/C @dirrm share/gnome/help/time-admin +@dirrm share/gnome/help/services-admin/nl/figures +@dirrm share/gnome/help/services-admin/nl @dirrm share/gnome/help/services-admin/C/figures @dirrm share/gnome/help/services-admin/C @dirrm share/gnome/help/services-admin diff --git a/sysutils/gnomecontrolcenter2/Makefile b/sysutils/gnomecontrolcenter2/Makefile index 10c307825914..f11fdb353fa9 100644 --- a/sysutils/gnomecontrolcenter2/Makefile +++ b/sysutils/gnomecontrolcenter2/Makefile @@ -3,13 +3,14 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/sysutils/gnomecontrolcenter2/Makefile,v 1.85 2005/10/03 15:29:07 ahze Exp $ # PORTNAME= gnomecontrolcenter2 -PORTVERSION= 2.10.2 +PORTVERSION= 2.12.1 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/control-center/2.10 +MASTER_SITE_SUBDIR= sources/control-center/2.12 DISTNAME= control-center-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -24,9 +25,11 @@ USE_REINPLACE= yes USE_GMAKE= yes GNOME_DESKTOP_VERSION=2 USE_GSTREAMER= yes +WANT_GNOME= yes USE_GNOME= gnomeprefix gnomehack intlhack metacity nautilus2 \ gnomemenus desktopfileutils -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 +INSTALLS_OMF= yes INSTALLS_SHLIB= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" @@ -38,9 +41,27 @@ GCONF_SCHEMAS= apps_gnome_settings_daemon_default_editor.schemas \ desktop_gnome_peripherals_keyboard_xkb.schemas \ fontilus.schemas themus.schemas +.if defined(PACKAGE_BUILDING) || defined(PARALLEL_PACKAGE_BUILD) +.undef WITHOUT_GNOME +WITH_GNOME= yes +.endif + +.include <bsd.port.pre.mk> + +.if ${HAVE_GNOME:Mevolutiondataserver}!="" +USE_GNOME+= evolutiondataserver +CONFIGURE_ARGS+=--enable-aboutme +PLIST_SUB+= ABOUTME="" +.else +CONFIGURE_ARGS+=--disable-aboutme +PLIST_SUB+= ABOUTME="@comment " +.endif + post-patch: @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \ 's|[{]prefix[}]/share/pixmaps|{datadir}/pixmaps|g' + @${REINPLACE_CMD} -e 's|mozilla-thunderbird|thunderbird|g' \ + ${WRKSRC}/capplets/default-applications/gnome-default-applications-properties-structs.c @${REINPLACE_CMD} -e 's|/bin/tar|/usr/bin/tar|g ; \ s|/bin/gzip|/usr/bin/gzip|g' \ ${WRKSRC}/capplets/theme-switcher/gnome-theme-installer.c @@ -48,4 +69,4 @@ post-patch: post-install: @-update-desktop-database -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/sysutils/gnomecontrolcenter2/distinfo b/sysutils/gnomecontrolcenter2/distinfo index b834f271fa82..550ff98a48b6 100644 --- a/sysutils/gnomecontrolcenter2/distinfo +++ b/sysutils/gnomecontrolcenter2/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/control-center-2.10.2.tar.bz2) = 36022dcd340dac004903f5dadc8af589 -SIZE (gnome2/control-center-2.10.2.tar.bz2) = 2833639 +MD5 (gnome2/control-center-2.12.1.tar.bz2) = f3d8520b8544e1f910600ba889e02523 +SIZE (gnome2/control-center-2.12.1.tar.bz2) = 1771524 diff --git a/sysutils/gnomecontrolcenter2/files/patch-capplets_about-me_gnome-about-me-password.c b/sysutils/gnomecontrolcenter2/files/patch-capplets_about-me_gnome-about-me-password.c new file mode 100644 index 000000000000..7ea6bb0dd359 --- /dev/null +++ b/sysutils/gnomecontrolcenter2/files/patch-capplets_about-me_gnome-about-me-password.c @@ -0,0 +1,16 @@ +--- capplets/about-me/gnome-about-me-password.c.orig Wed Aug 10 05:45:08 2005 ++++ capplets/about-me/gnome-about-me-password.c Wed Aug 10 15:44:57 2005 +@@ -35,7 +35,13 @@ + #include <sys/wait.h> + #include <sys/poll.h> + #include <termios.h> ++#include <signal.h> ++#ifndef __FreeBSD__ + #include <pty.h> ++#else ++#include <sys/types.h> ++#include <libutil.h> ++#endif + + #include "capplet-util.h" + #include "eel-alert-dialog.h" diff --git a/sysutils/gnomecontrolcenter2/files/patch-capplets_about-me_gnome-about-me.c b/sysutils/gnomecontrolcenter2/files/patch-capplets_about-me_gnome-about-me.c new file mode 100644 index 000000000000..0d1f85f32c7f --- /dev/null +++ b/sysutils/gnomecontrolcenter2/files/patch-capplets_about-me_gnome-about-me.c @@ -0,0 +1,34 @@ +--- capplets/about-me/gnome-about-me.c.orig Wed Jul 27 13:45:17 2005 ++++ capplets/about-me/gnome-about-me.c Wed Jul 27 13:47:09 2005 +@@ -258,12 +258,10 @@ + static char * + get_user_login (void) + { +- char buf[LINE_MAX * 4]; +- struct passwd pwd, *err; ++ struct passwd *pwd; + +- int i; +- i = getpwuid_r(getuid(), &pwd, buf, sizeof(buf), &err); +- return ((i == 0) && (err == &pwd)) ? g_strdup(pwd.pw_name) : NULL; ++ pwd = getpwuid(getuid()); ++ return (pwd != NULL) ? g_strdup(pwd->pw_name) : NULL; + } + + /* +@@ -664,6 +662,7 @@ + struct passwd *pwent; + char *user = NULL; + gchar *str; ++ gchar **tok; + + me = g_new0 (GnomeAboutMe, 1); + +@@ -733,7 +732,6 @@ + _("Unknown login ID, the user database might be corrupted")); + return ; + } +- gchar **tok; + tok = g_strsplit (pwent->pw_gecos, ",", 0); + + /************************************************/ diff --git a/sysutils/gnomecontrolcenter2/files/patch-capplets_gnome-keyboard-properties-xkbot.c b/sysutils/gnomecontrolcenter2/files/patch-capplets_gnome-keyboard-properties-xkbot.c new file mode 100644 index 000000000000..ab7180f75c17 --- /dev/null +++ b/sysutils/gnomecontrolcenter2/files/patch-capplets_gnome-keyboard-properties-xkbot.c @@ -0,0 +1,17 @@ +--- capplets/keyboard/gnome-keyboard-properties-xkbot.c.orig Wed Jul 27 13:48:58 2005 ++++ capplets/keyboard/gnome-keyboard-properties-xkbot.c Wed Jul 27 13:49:37 2005 +@@ -265,11 +265,12 @@ + GladeXML * dialog) + { + GtkWidget *expander, *align, *vbox; ++ gchar *utfGroupName, *titlemarkup; + + GSList * expanders_list = g_object_get_data (G_OBJECT (dialog), EXPANDERS_PROP); + +- gchar *utfGroupName = xci_desc_to_utf8 (configItem); +- gchar *titlemarkup = g_strconcat ("<span>", utfGroupName, "</span>", NULL); ++ utfGroupName = xci_desc_to_utf8 (configItem); ++ titlemarkup = g_strconcat ("<span>", utfGroupName, "</span>", NULL); + + expander = gtk_expander_new (titlemarkup); + g_object_set_data_full (G_OBJECT (expander), "utfGroupName", utfGroupName, g_free); diff --git a/sysutils/gnomecontrolcenter2/files/patch-capplets_mouse_gnome-mouse-properties.c b/sysutils/gnomecontrolcenter2/files/patch-capplets_mouse_gnome-mouse-properties.c new file mode 100644 index 000000000000..32c81dfdebba --- /dev/null +++ b/sysutils/gnomecontrolcenter2/files/patch-capplets_mouse_gnome-mouse-properties.c @@ -0,0 +1,21 @@ +--- capplets/mouse/gnome-mouse-properties.c.orig Mon Sep 5 17:05:46 2005 ++++ capplets/mouse/gnome-mouse-properties.c Mon Sep 5 17:06:23 2005 +@@ -658,7 +658,8 @@ + + gchar **iterator = NULL; + gchar **paths = NULL; +- ++ const gchar *xpaths; ++ + GConfClient* client = gconf_client_get_default(); + GtkListStore* store = GTK_LIST_STORE(gtk_tree_model_sort_get_model(model)); + gchar* current_theme = gconf_client_get_string(client, CURSOR_THEME_KEY, NULL); +@@ -666,7 +667,7 @@ + g_object_unref(client); + client = NULL; + +- const gchar *xpaths = g_getenv ("XCURSOR_PATH"); ++ xpaths = g_getenv ("XCURSOR_PATH"); + + if (xpaths != NULL) { + paths = g_strsplit (xpaths, ":", 0); diff --git a/sysutils/gnomecontrolcenter2/files/patch-gnome-settings-daemon_actions_Makefile.in b/sysutils/gnomecontrolcenter2/files/patch-gnome-settings-daemon_actions_Makefile.in deleted file mode 100644 index 52a627fb20df..000000000000 --- a/sysutils/gnomecontrolcenter2/files/patch-gnome-settings-daemon_actions_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- gnome-settings-daemon/actions/Makefile.in.orig Mon Dec 20 19:19:31 2004 -+++ gnome-settings-daemon/actions/Makefile.in Mon Dec 20 19:20:45 2004 -@@ -296,7 +296,7 @@ - Datadir = $(datadir)/control-center-2.0/interfaces/ - Data_DATA = acme.glade - --pixmapsdir = $(GNOMECC_PIXMAPS_DIR) -+pixmapsdir = $(prefix)/share/icons/gnome/48x48/apps - pixmaps_DATA = acme-brightness.png acme-eject.png gnome-speakernotes-muted.png gnome-speakernotes.png - - EXTRA_DIST = \ diff --git a/sysutils/gnomecontrolcenter2/files/patch-gnome-settings-daemon_gnome-settings-multimedia-keys.c b/sysutils/gnomecontrolcenter2/files/patch-gnome-settings-daemon_gnome-settings-multimedia-keys.c index f66b82c9ffd1..ed30cddab65a 100644 --- a/sysutils/gnomecontrolcenter2/files/patch-gnome-settings-daemon_gnome-settings-multimedia-keys.c +++ b/sysutils/gnomecontrolcenter2/files/patch-gnome-settings-daemon_gnome-settings-multimedia-keys.c @@ -1,6 +1,6 @@ ---- gnome-settings-daemon/gnome-settings-multimedia-keys.c.orig Thu Oct 14 15:44:21 2004 -+++ gnome-settings-daemon/gnome-settings-multimedia-keys.c Thu Oct 14 15:44:38 2004 -@@ -813,7 +813,7 @@ +--- gnome-settings-daemon/gnome-settings-multimedia-keys.c.orig Wed Jul 27 13:52:13 2005 ++++ gnome-settings-daemon/gnome-settings-multimedia-keys.c Wed Jul 27 13:52:32 2005 +@@ -828,7 +828,7 @@ do_mail_action (acme); break; case SLEEP_KEY: @@ -8,4 +8,4 @@ + do_sleep_action ("zzz", "xset dpms force off"); break; case SCREENSAVER_KEY: - execute ("xscreensaver-command -lock", FALSE); + if ((cmd = g_find_program_in_path ("gnome-screensaver-command"))) diff --git a/sysutils/gnomecontrolcenter2/files/patch-libwindow-settings_wm-list.c b/sysutils/gnomecontrolcenter2/files/patch-libwindow-settings_wm-list.c deleted file mode 100644 index 149d59a9b0c8..000000000000 --- a/sysutils/gnomecontrolcenter2/files/patch-libwindow-settings_wm-list.c +++ /dev/null @@ -1,11 +0,0 @@ ---- libwindow-settings/wm-list.c.orig Tue Oct 8 17:43:12 2002 -+++ libwindow-settings/wm-list.c Tue Oct 8 17:43:25 2002 -@@ -251,7 +251,7 @@ - gchar *name; - GConfClient *client; - -- tempdir = gnome_unconditional_datadir_file ("gnome/wm-properties/"); -+ tempdir = gnome_unconditional_datadir_file ("wm-properties/"); - wm_list_read_dir (tempdir, FALSE); - g_free (tempdir); - diff --git a/sysutils/gnomecontrolcenter2/pkg-plist b/sysutils/gnomecontrolcenter2/pkg-plist index 9bf38dd44446..b43391f76cfb 100644 --- a/sysutils/gnomecontrolcenter2/pkg-plist +++ b/sysutils/gnomecontrolcenter2/pkg-plist @@ -1,3 +1,4 @@ +%%ABOUTME%%bin/gnome-about-me bin/gnome-accessibility-keyboard-properties bin/gnome-at-properties bin/gnome-background-properties @@ -40,6 +41,7 @@ share/gnome/applications/background.desktop share/gnome/applications/default-applications.desktop share/gnome/applications/display-properties.desktop share/gnome/applications/font-properties.desktop +%%ABOUTME%%share/gnome/applications/gnome-about-me.desktop share/gnome/applications/gnome-font-viewer.desktop share/gnome/applications/gnome-network-preferences.desktop share/gnome/applications/gnome-settings-mouse.desktop @@ -51,12 +53,12 @@ share/gnome/applications/keybinding.desktop share/gnome/applications/keyboard.desktop share/gnome/applications/themus-theme-applier.desktop share/gnome/applications/window-properties.desktop -@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true share/gnome/control-center-2.0/icons/display-capplet.png share/gnome/control-center-2.0/interfaces/acme.glade share/gnome/control-center-2.0/interfaces/apply-font.glade share/gnome/control-center-2.0/interfaces/at-enable-dialog.glade share/gnome/control-center-2.0/interfaces/font-properties.glade +%%ABOUTME%%share/gnome/control-center-2.0/interfaces/gnome-about-me.glade share/gnome/control-center-2.0/interfaces/gnome-accessibility-keyboard-properties.glade share/gnome/control-center-2.0/interfaces/gnome-background-properties.glade share/gnome/control-center-2.0/interfaces/gnome-default-applications-properties.glade @@ -84,6 +86,12 @@ share/gnome/control-center-2.0/pixmaps/bar.png share/gnome/control-center-2.0/pixmaps/double-click-maybe.png share/gnome/control-center-2.0/pixmaps/double-click-off.png share/gnome/control-center-2.0/pixmaps/double-click-on.png +%%ABOUTME%%share/gnome/control-center-2.0/pixmaps/gnome-about-me-bulb-off.png +%%ABOUTME%%share/gnome/control-center-2.0/pixmaps/gnome-about-me-bulb-on.png +share/gnome/control-center-2.0/pixmaps/acme-brightness.png +share/gnome/control-center-2.0/pixmaps/acme-eject.png +share/gnome/control-center-2.0/pixmaps/gnome-speakernotes-muted.png +share/gnome/control-center-2.0/pixmaps/gnome-speakernotes.png share/gnome/control-center-2.0/pixmaps/keyboard-bell.png share/gnome/control-center-2.0/pixmaps/keyboard-cursor.png share/gnome/control-center-2.0/pixmaps/keyboard-repeat.png @@ -111,15 +119,27 @@ share/gnome/control-center-2.0/xrdb/Xaw.ad share/gnome/cursor-fonts/cursor-large-white.pcf share/gnome/cursor-fonts/cursor-large.pcf share/gnome/cursor-fonts/cursor-white.pcf +share/gnome/help/control-center/C/config-accessibility-keyboard.xml +share/gnome/help/control-center/C/config-background.xml +share/gnome/help/control-center/C/config-behavior.xml +share/gnome/help/control-center/C/config-cds.xml +share/gnome/help/control-center/C/config-default-apps.xml +share/gnome/help/control-center/C/config-file-type.xml +share/gnome/help/control-center/C/config-hints.xml +share/gnome/help/control-center/C/config-html.xml +share/gnome/help/control-center/C/config-kbd.xml +share/gnome/help/control-center/C/config-keybindings.xml +share/gnome/help/control-center/C/config-mouse.xml +share/gnome/help/control-center/C/config-screensaver.xml +share/gnome/help/control-center/C/config-sound.xml +share/gnome/help/control-center/C/config-themes.xml +share/gnome/help/control-center/C/control-center.xml share/gnome/idl/ConfigArchiver.idl share/gnome/idl/GNOME_SettingsDaemon.idl +share/gnome/omf/control-center/control-center-C.omf share/gnome/pixmaps/display-capplet.png share/gnome/vfolders/font-method.directory share/gnome/vfolders/theme-method.directory -share/icons/gnome/48x48/apps/acme-brightness.png -share/icons/gnome/48x48/apps/acme-eject.png -share/icons/gnome/48x48/apps/gnome-speakernotes-muted.png -share/icons/gnome/48x48/apps/gnome-speakernotes.png share/icons/hicolor/48x48/apps/gnome-control-center.png share/locale/af/LC_MESSAGES/control-center-2.0.mo share/locale/am/LC_MESSAGES/control-center-2.0.mo @@ -155,6 +175,7 @@ share/locale/is/LC_MESSAGES/control-center-2.0.mo share/locale/it/LC_MESSAGES/control-center-2.0.mo share/locale/ja/LC_MESSAGES/control-center-2.0.mo share/locale/ko/LC_MESSAGES/control-center-2.0.mo +share/locale/ku/LC_MESSAGES/control-center-2.0.mo share/locale/lt/LC_MESSAGES/control-center-2.0.mo share/locale/lv/LC_MESSAGES/control-center-2.0.mo share/locale/mk/LC_MESSAGES/control-center-2.0.mo @@ -181,6 +202,7 @@ share/locale/sr/LC_MESSAGES/control-center-2.0.mo share/locale/sr@Latn/LC_MESSAGES/control-center-2.0.mo share/locale/sv/LC_MESSAGES/control-center-2.0.mo share/locale/ta/LC_MESSAGES/control-center-2.0.mo +share/locale/te/LC_MESSAGES/control-center-2.0.mo share/locale/th/LC_MESSAGES/control-center-2.0.mo share/locale/tr/LC_MESSAGES/control-center-2.0.mo share/locale/uk/LC_MESSAGES/control-center-2.0.mo @@ -190,9 +212,18 @@ share/locale/xh/LC_MESSAGES/control-center-2.0.mo share/locale/zh_CN/LC_MESSAGES/control-center-2.0.mo share/locale/zh_TW/LC_MESSAGES/control-center-2.0.mo share/locale/zu/LC_MESSAGES/control-center-2.0.mo +@unexec rmdir %D/share/locale/zu/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/zu 2> /dev/null || true +@unexec rmdir %D/share/locale/xh/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/xh 2> /dev/null || true +@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/nso/LC_MESSAGES 2> /dev/null || true @unexec rmdir %D/share/locale/nso 2> /dev/null || true -@dirrm share/gnome/gnome-background-properties +@dirrm share/gnome/omf/control-center +@dirrm share/gnome/help/control-center/C +@dirrm share/gnome/help/control-center +@unexec /bin/rmdir %D/share/gnome/gnome-background-properties 2>/dev/null || /usr/bin/true @dirrm share/gnome/cursor-fonts @dirrm share/gnome/control-center-2.0/xrdb @dirrm share/gnome/control-center-2.0/pixmaps @@ -200,4 +231,5 @@ share/locale/zu/LC_MESSAGES/control-center-2.0.mo @unexec rmdir %D/share/gnome/control-center-2.0/icons 2> /dev/null || true @dirrm lib/window-manager-settings @dirrm include/gnome-window-settings-2.0 +@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/sysutils/gnomesystemmonitor/Makefile b/sysutils/gnomesystemmonitor/Makefile index 0638e562902c..9c5ce1123877 100644 --- a/sysutils/gnomesystemmonitor/Makefile +++ b/sysutils/gnomesystemmonitor/Makefile @@ -3,13 +3,14 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/sysutils/gnomesystemmonitor/Makefile,v 1.51 2005/10/04 03:07:41 ahze Exp $ # PORTNAME= gnomesystemmonitor -PORTVERSION= 2.10.1 +PORTVERSION= 2.12.1 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-system-monitor/2.10 +MASTER_SITE_SUBDIR= sources/gnome-system-monitor/2.12 DISTNAME= gnome-system-monitor-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -24,7 +25,7 @@ INSTALLS_OMF= yes USE_GMAKE= yes USE_REINPLACE= yes USE_GNOME= gnomeprefix intlhack gnomehack libgnomeui libwnck -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib -lutil" diff --git a/sysutils/gnomesystemmonitor/distinfo b/sysutils/gnomesystemmonitor/distinfo index dfde097daf11..04fc6c3149c0 100644 --- a/sysutils/gnomesystemmonitor/distinfo +++ b/sysutils/gnomesystemmonitor/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-system-monitor-2.10.1.tar.bz2) = 22acb1699193f8bd2ced656d44f57377 -SIZE (gnome2/gnome-system-monitor-2.10.1.tar.bz2) = 766187 +MD5 (gnome2/gnome-system-monitor-2.12.1.tar.bz2) = 31924d02786622151c0fb30314d1f85d +SIZE (gnome2/gnome-system-monitor-2.12.1.tar.bz2) = 785235 diff --git a/sysutils/gnomesystemmonitor/files/patch-src::proctable.c b/sysutils/gnomesystemmonitor/files/patch-src::proctable.c index 49a699641476..70b2f9e30c64 100644 --- a/sysutils/gnomesystemmonitor/files/patch-src::proctable.c +++ b/sysutils/gnomesystemmonitor/files/patch-src::proctable.c @@ -1,7 +1,7 @@ ---- src/proctable.c.orig Tue Nov 30 01:28:31 2004 -+++ src/proctable.c Wed Dec 1 13:25:55 2004 -@@ -772,6 +772,12 @@ - +--- src/proctable.c.orig Fri Jul 22 18:58:42 2005 ++++ src/proctable.c Mon Jul 25 22:25:58 2005 +@@ -853,6 +853,12 @@ static void cb_exclude(ProcInfo* info, G + } +static int @@ -13,7 +13,7 @@ static void refresh_list (ProcData *procdata, const unsigned *pid_list, const guint n) { -@@ -863,10 +869,15 @@ +@@ -945,10 +951,15 @@ proctable_update_list (ProcData * const pid_list = glibtop_get_proclist (&proclist, which, arg); @@ -22,7 +22,7 @@ /* FIXME: total cpu time elapsed should be calculated on an individual basis here ** should probably have a total_time_last gint in the ProcInfo structure */ glibtop_get_cpu (&cpu); - total_time = cpu.total - total_time_last; + total_time = MAX(cpu.total - total_time_last, 1); + if (cpu.frequency) { + total_time /= (cpu.frequency/100); + } diff --git a/sysutils/gnomesystemmonitor/pkg-plist b/sysutils/gnomesystemmonitor/pkg-plist index 6f9dcfca6975..e7455e4cedcb 100644 --- a/sysutils/gnomesystemmonitor/pkg-plist +++ b/sysutils/gnomesystemmonitor/pkg-plist @@ -75,10 +75,13 @@ share/locale/sv/LC_MESSAGES/gnome-system-monitor.mo share/locale/ta/LC_MESSAGES/gnome-system-monitor.mo share/locale/th/LC_MESSAGES/gnome-system-monitor.mo share/locale/tr/LC_MESSAGES/gnome-system-monitor.mo +share/locale/ug/LC_MESSAGES/gnome-system-monitor.mo share/locale/uk/LC_MESSAGES/gnome-system-monitor.mo share/locale/vi/LC_MESSAGES/gnome-system-monitor.mo share/locale/zh_CN/LC_MESSAGES/gnome-system-monitor.mo share/locale/zh_TW/LC_MESSAGES/gnome-system-monitor.mo +@unexec rmdir %D/share/locale/ug/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/ug 2> /dev/null || true @dirrm share/gnome/omf/gnome-system-monitor @dirrm share/gnome/help/gnome-system-monitor/C/figures @dirrm share/gnome/help/gnome-system-monitor/C diff --git a/sysutils/gnomesystemtools/Makefile b/sysutils/gnomesystemtools/Makefile index 1dca8a647c5c..005b91a17f19 100644 --- a/sysutils/gnomesystemtools/Makefile +++ b/sysutils/gnomesystemtools/Makefile @@ -3,14 +3,15 @@ # Whom: Adam Weinberger <adamw@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/sysutils/gnomesystemtools/Makefile,v 1.30 2005/09/10 05:52:02 marcus Exp $ # PORTNAME= gnomesystemtools -PORTVERSION= 1.2.0 -PORTREVISION= 2 +PORTVERSION= 1.4.0 +PORTREVISION= 1 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-system-tools/1.2 +MASTER_SITE_SUBDIR= sources/gnome-system-tools/1.4 DISTNAME= gnome-system-tools-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -25,8 +26,9 @@ USE_GMAKE= yes USE_X_PREFIX= yes GNOME_DESKTOP_VERSION=2 USE_GNOME= gnomehack gnomeprefix gnometarget intlhack nautilus2 -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 INSTALLS_OMF= yes +CONFIGURE_ARGS= --enable-services CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" @@ -34,11 +36,8 @@ GCONF_SCHEMAS= gnome-system-tools.schemas .include <bsd.port.pre.mk> -.if ${OSVERSION} >= 500000 -CONFIGURE_ARGS+= --enable-services -PLIST_SUB+= SERVICES="" -.else -PLIST_SUB+= SERVICES="@comment " +.if ${OSVERSION} < 500000 +IGNORE= Uses symbols not present in 4.X .endif .include <bsd.port.post.mk> diff --git a/sysutils/gnomesystemtools/distinfo b/sysutils/gnomesystemtools/distinfo index 6eb37fa99a84..e0cb6d350a79 100644 --- a/sysutils/gnomesystemtools/distinfo +++ b/sysutils/gnomesystemtools/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-system-tools-1.2.0.tar.bz2) = fbcf8866ecea8b330cbe53cf8b0df55e -SIZE (gnome2/gnome-system-tools-1.2.0.tar.bz2) = 1780677 +MD5 (gnome2/gnome-system-tools-1.4.0.tar.bz2) = bbc13f526025c4da1607fa640499b6ee +SIZE (gnome2/gnome-system-tools-1.4.0.tar.bz2) = 1959280 diff --git a/sysutils/gnomesystemtools/files/patch-src_common_gst-auth.c b/sysutils/gnomesystemtools/files/patch-src_common_gst-auth.c index 9272d918136c..f73b28ae4d10 100644 --- a/sysutils/gnomesystemtools/files/patch-src_common_gst-auth.c +++ b/sysutils/gnomesystemtools/files/patch-src_common_gst-auth.c @@ -1,13 +1,105 @@ ---- src/common/gst-auth.c.orig Thu Mar 10 14:39:18 2005 -+++ src/common/gst-auth.c Thu Mar 10 14:39:50 2005 -@@ -142,12 +142,12 @@ gst_auth_run_term (GstTool *tool, gchar +--- src/common/gst-auth.c.orig Mon Aug 8 15:00:01 2005 ++++ src/common/gst-auth.c Sat Sep 10 01:47:35 2005 +@@ -55,6 +55,82 @@ + static int root; /* if we are root, no password is + required */ + ++#ifdef __FreeBSD__ ++static int ++_forkpty (int *amaster, char *name, ++ struct termios *termp, struct winsize *winp) ++{ ++ int master, slave; ++ char *line; ++ pid_t pid; ++ ++ master = posix_openpt (O_RDWR); ++ if (master == -1) ++ return (-1); ++ ++ if (grantpt (master) == -1) ++ { ++ (void) close (master); ++ return (-1); ++ } ++ ++ if (unlockpt (master) == -1) ++ { ++ (void) close (master); ++ return (-1); ++ } ++ ++ line = ptsname (master); ++ if (line == NULL) ++ { ++ (void) close (master); ++ return (-1); ++ } ++ ++ slave = open (line, O_RDWR); ++ if (slave < 0) ++ { ++ (void) close (master); ++ return (-1); ++ } ++ ++ if (amaster) ++ *amaster = master; ++ ++ if (name) ++ strcpy (name, line); ++ ++ if (termp) ++ (void) tcsetattr(slave, TCSAFLUSH, termp); ++ ++ if (winp) ++ (void) ioctl(slave, TIOCSWINSZ, (char *) winp); ++ ++ pid = fork (); ++ switch (pid) ++ { ++ case -1: ++ (void) close (slave); ++ (void) close (master); ++ return (-1); ++ case 0: ++ (void) close (master); ++ dup2 (slave, STDIN_FILENO); ++ dup2 (slave, STDOUT_FILENO); ++ dup2 (slave, STDERR_FILENO); ++ return (0); ++ default: ++ (void) close (slave); ++ return (pid); ++ } ++ ++ (void) close (master); ++ return (-1); ++} ++#else ++#define _forkpty forkpty ++#endif ++ + static void + gst_auth_display_error_message (GstTool *tool, gchar *primary_text, gchar *secondary_text) + { +@@ -125,7 +201,7 @@ gst_auth_run_term (GstTool *tool, gchar + int p[2]; + + pipe (p); +- tool->backend_pid = forkpty (&tool->write_fd, NULL, NULL, NULL); ++ tool->backend_pid = _forkpty (&tool->write_fd, NULL, NULL, NULL); + + if (tool->backend_pid < 0) { + gst_auth_display_error_message (tool, +@@ -142,12 +218,12 @@ gst_auth_run_term (GstTool *tool, gchar unsetenv("LANG"); unsetenv("LANGUAGE"); - dup2 (p[1], 1); - dup2 (p[1], 2); + dup2 (p[1], STDOUT_FILENO); -+ /*dup2 (p[1], 2);*/ ++ dup2 (p[1], STDERR_FILENO); close (p[0]); execv (args[0], args); diff --git a/sysutils/gnomesystemtools/files/patch-src_common_gst-tool.c b/sysutils/gnomesystemtools/files/patch-src_common_gst-tool.c index 5134f30e581b..9aaef15031fd 100644 --- a/sysutils/gnomesystemtools/files/patch-src_common_gst-tool.c +++ b/sysutils/gnomesystemtools/files/patch-src_common_gst-tool.c @@ -1,6 +1,21 @@ ---- src/common/gst-tool.c.orig Thu Mar 10 14:39:54 2005 -+++ src/common/gst-tool.c Thu Mar 10 14:40:00 2005 -@@ -1653,7 +1653,7 @@ poll_backend (GstTool *tool) +--- src/common/gst-tool.c.orig Tue Jun 21 15:07:05 2005 ++++ src/common/gst-tool.c Wed Jul 6 01:28:22 2005 +@@ -598,7 +598,14 @@ gst_tool_kill_backend_cb (GstDirectiveEn + if (tool->root_access == ROOT_ACCESS_SIMULATED_DISABLED) + tool->root_access = ROOT_ACCESS_SIMULATED; + ++#if 0 ++ /* ++ * We do not need to wait for the tool, ++ * as it will get SIGPIPE anyway. ++ * This waitpid causes problems on FreeBSD. ++ */ + waitpid (tool->backend_pid, NULL, 0); ++#endif + } + } + +@@ -1655,7 +1662,7 @@ poll_backend (GstTool *tool) struct pollfd fd; fd.fd = tool->read_fd; diff --git a/sysutils/gnomesystemtools/files/patch-src_network_location.c b/sysutils/gnomesystemtools/files/patch-src_network_location.c deleted file mode 100644 index e2577a6a49e0..000000000000 --- a/sysutils/gnomesystemtools/files/patch-src_network_location.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/network/location.c.orig Thu Dec 23 13:16:33 2004 -+++ src/network/location.c Thu Dec 23 13:16:40 2004 -@@ -687,7 +687,7 @@ - static void - copy_tag_list (xmlNodePtr source, xmlNodePtr dest, const gchar *list[]) - { -- gchar **string = (gchar **) list;; -+ gchar **string = (gchar **) list; - gchar *value; - - while (*string) diff --git a/sysutils/gnomesystemtools/pkg-plist b/sysutils/gnomesystemtools/pkg-plist index a52125a51fcd..48800800d0e0 100644 --- a/sysutils/gnomesystemtools/pkg-plist +++ b/sysutils/gnomesystemtools/pkg-plist @@ -1,5 +1,5 @@ bin/network-admin -%%SERVICES%%bin/services-admin +bin/services-admin bin/shares-admin bin/time-admin bin/users-admin @@ -58,12 +58,13 @@ share/gnome-system-tools/pixmaps/turbolinux.png share/gnome-system-tools/pixmaps/unsupported-distro.png share/gnome-system-tools/pixmaps/users-groups.png share/gnome-system-tools/pixmaps/users.png +share/gnome-system-tools/pixmaps/vidalinux.png share/gnome-system-tools/pixmaps/vine.png share/gnome-system-tools/pixmaps/wavelan-16.png share/gnome-system-tools/pixmaps/wavelan-48.png share/gnome-system-tools/pixmaps/world_map-960.png share/gnome/applications/network.desktop -%%SERVICES%%share/gnome/applications/services.desktop +share/gnome/applications/services.desktop share/gnome/applications/shares.desktop share/gnome/applications/time.desktop share/gnome/applications/users.desktop @@ -77,18 +78,29 @@ share/gnome/help/services-admin/C/figures/service-properties.png share/gnome/help/services-admin/C/figures/services-tool.png share/gnome/help/services-admin/C/legal.xml share/gnome/help/services-admin/C/services-admin.xml +share/gnome/help/services-admin/nl/figures/service-properties.png +share/gnome/help/services-admin/nl/figures/services-tool.png +share/gnome/help/services-admin/nl/legal.xml +share/gnome/help/services-admin/nl/services-admin.xml share/gnome/help/time-admin/C/figures/time-map.png share/gnome/help/time-admin/C/figures/time-servers.png share/gnome/help/time-admin/C/figures/time-tool.png share/gnome/help/time-admin/C/legal.xml share/gnome/help/time-admin/C/time-admin.xml +share/gnome/help/time-admin/nl/figures/time-map.png +share/gnome/help/time-admin/nl/figures/time-servers.png +share/gnome/help/time-admin/nl/figures/time-tool.png +share/gnome/help/time-admin/nl/legal.xml +share/gnome/help/time-admin/nl/time-admin.xml share/gnome/help/users-admin/C/figures/users-tool.png share/gnome/help/users-admin/C/legal.xml share/gnome/help/users-admin/C/users-admin.xml share/gnome/omf/gnome-system-tools/boot-admin-C.omf share/gnome/omf/gnome-system-tools/network-admin-C.omf share/gnome/omf/gnome-system-tools/services-admin-C.omf +share/gnome/omf/gnome-system-tools/services-admin-nl.omf share/gnome/omf/gnome-system-tools/time-admin-C.omf +share/gnome/omf/gnome-system-tools/time-admin-nl.omf share/gnome/omf/gnome-system-tools/users-admin-C.omf share/locale/am/LC_MESSAGES/gnome-system-tools.mo share/locale/ar/LC_MESSAGES/gnome-system-tools.mo @@ -110,6 +122,7 @@ share/locale/fr/LC_MESSAGES/gnome-system-tools.mo share/locale/ga/LC_MESSAGES/gnome-system-tools.mo share/locale/gl/LC_MESSAGES/gnome-system-tools.mo share/locale/gu/LC_MESSAGES/gnome-system-tools.mo +share/locale/he/LC_MESSAGES/gnome-system-tools.mo share/locale/hi/LC_MESSAGES/gnome-system-tools.mo share/locale/hr/LC_MESSAGES/gnome-system-tools.mo share/locale/hu/LC_MESSAGES/gnome-system-tools.mo @@ -123,6 +136,8 @@ share/locale/mk/LC_MESSAGES/gnome-system-tools.mo share/locale/ml/LC_MESSAGES/gnome-system-tools.mo share/locale/mn/LC_MESSAGES/gnome-system-tools.mo share/locale/ms/LC_MESSAGES/gnome-system-tools.mo +share/locale/nb/LC_MESSAGES/gnome-system-tools.mo +share/locale/ne/LC_MESSAGES/gnome-system-tools.mo share/locale/nl/LC_MESSAGES/gnome-system-tools.mo share/locale/nn/LC_MESSAGES/gnome-system-tools.mo share/locale/no/LC_MESSAGES/gnome-system-tools.mo @@ -132,6 +147,7 @@ share/locale/pt/LC_MESSAGES/gnome-system-tools.mo share/locale/pt_BR/LC_MESSAGES/gnome-system-tools.mo share/locale/ro/LC_MESSAGES/gnome-system-tools.mo share/locale/ru/LC_MESSAGES/gnome-system-tools.mo +share/locale/rw/LC_MESSAGES/gnome-system-tools.mo share/locale/sk/LC_MESSAGES/gnome-system-tools.mo share/locale/sq/LC_MESSAGES/gnome-system-tools.mo share/locale/sr/LC_MESSAGES/gnome-system-tools.mo @@ -143,15 +159,20 @@ share/locale/tr/LC_MESSAGES/gnome-system-tools.mo share/locale/uk/LC_MESSAGES/gnome-system-tools.mo share/locale/vi/LC_MESSAGES/gnome-system-tools.mo share/locale/wa/LC_MESSAGES/gnome-system-tools.mo +share/locale/xh/LC_MESSAGES/gnome-system-tools.mo share/locale/zh_CN/LC_MESSAGES/gnome-system-tools.mo share/locale/zh_TW/LC_MESSAGES/gnome-system-tools.mo @dirrm share/gnome/omf/gnome-system-tools @dirrm share/gnome/help/users-admin/C/figures @dirrm share/gnome/help/users-admin/C @dirrm share/gnome/help/users-admin +@dirrm share/gnome/help/time-admin/nl/figures +@dirrm share/gnome/help/time-admin/nl @dirrm share/gnome/help/time-admin/C/figures @dirrm share/gnome/help/time-admin/C @dirrm share/gnome/help/time-admin +@dirrm share/gnome/help/services-admin/nl/figures +@dirrm share/gnome/help/services-admin/nl @dirrm share/gnome/help/services-admin/C/figures @dirrm share/gnome/help/services-admin/C @dirrm share/gnome/help/services-admin diff --git a/sysutils/nautilus-cd-burner/Makefile b/sysutils/nautilus-cd-burner/Makefile index a9af98dde82f..0ed17b7fecbd 100644 --- a/sysutils/nautilus-cd-burner/Makefile +++ b/sysutils/nautilus-cd-burner/Makefile @@ -3,49 +3,48 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/sysutils/nautilus-cd-burner/Makefile,v 1.77 2005/10/03 23:36:08 marcus Exp $ # PORTNAME= nautilus-cd-burner -PORTVERSION= 2.10.2 +PORTVERSION= 2.12.1 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.10 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.12 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= CD burner view for Nautilus -RUN_DEPENDS= cdrecord:${PORTSDIR}/sysutils/cdrtools-cjk - USE_BZIP2= yes USE_X_PREFIX= yes USE_REINPLACE= yes USE_GMAKE= yes GNOME_DESKTOP_VERSION=2 USE_GNOME= gnomeprefix gnomehack intlhack nautilus2 -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 INSTALLS_SHLIB= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" GCONF_SCHEMAS= ncb.schemas +OPTIONS= DVD "Enable DVD support" on \ + CJK "Use cdrtools-cjk instead of cdrtools" off + .include <bsd.port.pre.mk> -.if exists(${LOCALBASE}/bin/growisofs) -WITH_DVD= yes +.if defined(WITH_CJK) +RUN_DEPENDS+= cdrecord:${PORTSDIR}/sysutils/cdrtools-cjk +WITHOUT_DVD= yes +.else +RUN_DEPENDS+= cdrecord:${PORTSDIR}/sysutils/cdrtools .endif -.if defined(WITH_DVD) +.if !defined(WITHOUT_DVD) RUN_DEPENDS+= growisofs:${PORTSDIR}/sysutils/dvd+rw-tools .endif -pre-everything:: - @${ECHO_MSG} "" - @${ECHO_MSG} "${PORTNAME} has the following configurable option(s):" - @${ECHO_MSG} " WITH_DVD Enable DVD burning support" - @${ECHO_MSG} "" - post-install: @${CAT} ${PKGMESSAGE} diff --git a/sysutils/nautilus-cd-burner/distinfo b/sysutils/nautilus-cd-burner/distinfo index 30c8c2d59ba4..8903df2a73f8 100644 --- a/sysutils/nautilus-cd-burner/distinfo +++ b/sysutils/nautilus-cd-burner/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/nautilus-cd-burner-2.10.2.tar.bz2) = ed87311d620041d118d408072341343b -SIZE (gnome2/nautilus-cd-burner-2.10.2.tar.bz2) = 544237 +MD5 (gnome2/nautilus-cd-burner-2.12.1.tar.bz2) = 6fb90feb52340627d4b93a1127654a00 +SIZE (gnome2/nautilus-cd-burner-2.12.1.tar.bz2) = 614118 diff --git a/sysutils/nautilus-cd-burner/files/patch-mapping-protocol.c b/sysutils/nautilus-cd-burner/files/patch-mapping-protocol.c new file mode 100644 index 000000000000..aab64aa8abb9 --- /dev/null +++ b/sysutils/nautilus-cd-burner/files/patch-mapping-protocol.c @@ -0,0 +1,11 @@ +--- mapping-protocol.c.orig Tue May 17 17:14:35 2005 ++++ mapping-protocol.c Tue May 17 17:15:24 2005 +@@ -24,6 +24,8 @@ + * William Jon McCann <mccann@jhu.edu> + */ + ++#include <sys/types.h> ++#include <sys/time.h> + #include <unistd.h> + #include <string.h> + #include <fcntl.h> diff --git a/sysutils/nautilus-cd-burner/files/patch-nautilus-burn-drive.c b/sysutils/nautilus-cd-burner/files/patch-nautilus-burn-drive.c new file mode 100644 index 000000000000..e836eb9823f8 --- /dev/null +++ b/sysutils/nautilus-cd-burner/files/patch-nautilus-burn-drive.c @@ -0,0 +1,30 @@ +--- nautilus-burn-drive.c.orig Tue Aug 23 11:55:56 2005 ++++ nautilus-burn-drive.c Sat Sep 10 20:32:26 2005 +@@ -471,7 +471,6 @@ get_disc_type (const char *dev_path) + struct cd_toc_entry entry; + int i; + #endif +- int type; + #ifndef CDROM_DATA_TRACK + #define CDROM_DATA_TRACK 4 + #endif +@@ -483,6 +482,10 @@ get_disc_type (const char *dev_path) + + if (ioctl (fd, CDIOREADTOCHEADER, &header) < 0) { + close (fd); ++ if (errno == EINVAL) ++ /* If you try to read the TOC header of a blank disc ++ * on FreeBSD, you get EINVAL. */ ++ return CDS_NO_INFO; + return -1; + } + +@@ -649,7 +652,7 @@ nautilus_burn_drive_get_media_type_from_ + *is_blank = mmc_profile & 0x10000; + + disc_type = get_disc_type (device); +- disc_type_get_info (disc_type, is_blank, has_data, has_audio); ++ disc_type_get_info (disc_type, NULL, has_data, has_audio); + + switch (mmc_profile & 0xFFFF) { + case -1: diff --git a/sysutils/nautilus-cd-burner/files/patch-nautilus-cd-burner.c b/sysutils/nautilus-cd-burner/files/patch-nautilus-cd-burner.c index c545be7d5513..9d286fda0065 100644 --- a/sysutils/nautilus-cd-burner/files/patch-nautilus-cd-burner.c +++ b/sysutils/nautilus-cd-burner/files/patch-nautilus-cd-burner.c @@ -1,20 +1,18 @@ ---- nautilus-cd-burner.c.orig Mon Feb 28 19:40:05 2005 -+++ nautilus-cd-burner.c Mon Feb 28 20:05:56 2005 -@@ -23,6 +23,8 @@ - * Bastien Nocera <hadess@hadess.net> +--- nautilus-cd-burner.c.orig Wed May 11 18:56:59 2005 ++++ nautilus-cd-burner.c Tue May 17 17:11:49 2005 +@@ -25,6 +25,8 @@ + * William Jon McCann <mccann@jhu.edu> */ +#include <sys/types.h> +#include <sys/stat.h> - #include <gtk/gtk.h> - #include <gtk/gtkfilesel.h> - #include <gtk/gtkseparatormenuitem.h> -@@ -843,8 +845,19 @@ + #include <time.h> + #include <stdio.h> + #include <stdlib.h> +@@ -1103,10 +1105,20 @@ burn_cd (const NautilusBurnDrive *drive, } if (res == NAUTILUS_BURN_RECORDER_RESULT_RETRY) { -- g_free (filename); -- filename = g_build_filename (g_get_tmp_dir (), "image.iso.XXXXXX", NULL); + gchar *path1; + + path1 = g_strdup_printf ("%s/.ncb", g_get_home_dir()); @@ -23,11 +21,13 @@ + mkdir (path1, 0700); + } + -+ if (filename != NULL) { -+ g_free (filename); -+ } + g_free (toc_filename); + g_free (filename); + +- filename = g_build_filename (g_get_tmp_dir (), "image.iso.XXXXXX", NULL); + filename = g_build_filename (path1, "image.iso.XXXXXX", NULL); + g_free (path1); - fd = g_mkstemp(filename); ++ + fd = g_mkstemp (filename); close (fd); diff --git a/sysutils/nautilus-cd-burner/pkg-plist b/sysutils/nautilus-cd-burner/pkg-plist index b368003149ed..f58bdd6772fe 100644 --- a/sysutils/nautilus-cd-burner/pkg-plist +++ b/sysutils/nautilus-cd-burner/pkg-plist @@ -6,7 +6,7 @@ include/libnautilus-burn/nautilus-burn-recorder.h lib/gnome-vfs-2.0/modules/libmapping.so lib/libnautilus-burn.a lib/libnautilus-burn.so -lib/libnautilus-burn.so.1 +lib/libnautilus-burn.so.2 lib/nautilus/extensions-1.0/libnautilus-burn-extension.so libdata/pkgconfig/libnautilus-burn.pc libexec/mapping-daemon @@ -58,6 +58,7 @@ share/locale/mk/LC_MESSAGES/nautilus-cd-burner.mo share/locale/mn/LC_MESSAGES/nautilus-cd-burner.mo share/locale/ms/LC_MESSAGES/nautilus-cd-burner.mo share/locale/nb/LC_MESSAGES/nautilus-cd-burner.mo +share/locale/ne/LC_MESSAGES/nautilus-cd-burner.mo share/locale/nl/LC_MESSAGES/nautilus-cd-burner.mo share/locale/nn/LC_MESSAGES/nautilus-cd-burner.mo share/locale/no/LC_MESSAGES/nautilus-cd-burner.mo @@ -78,10 +79,13 @@ share/locale/sv/LC_MESSAGES/nautilus-cd-burner.mo share/locale/ta/LC_MESSAGES/nautilus-cd-burner.mo share/locale/th/LC_MESSAGES/nautilus-cd-burner.mo share/locale/tr/LC_MESSAGES/nautilus-cd-burner.mo +share/locale/ug/LC_MESSAGES/nautilus-cd-burner.mo share/locale/uk/LC_MESSAGES/nautilus-cd-burner.mo share/locale/vi/LC_MESSAGES/nautilus-cd-burner.mo share/locale/xh/LC_MESSAGES/nautilus-cd-burner.mo share/locale/zh_CN/LC_MESSAGES/nautilus-cd-burner.mo share/locale/zh_TW/LC_MESSAGES/nautilus-cd-burner.mo +@unexec rmdir %D/share/locale/ug/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/ug 2> /dev/null || true @dirrm share/gnome/nautilus-cd-burner @dirrm include/libnautilus-burn diff --git a/sysutils/system-tools-backends/Makefile b/sysutils/system-tools-backends/Makefile index 1e2e4537cd61..54bde9d493db 100644 --- a/sysutils/system-tools-backends/Makefile +++ b/sysutils/system-tools-backends/Makefile @@ -3,14 +3,14 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/sysutils/system-tools-backends/Makefile,v 1.12 2005/09/04 18:51:49 marcus Exp $ # PORTNAME= system-tools-backends -PORTVERSION= 1.2.0 -PORTREVISION= 2 +PORTVERSION= 1.4.0 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.2 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.4 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org diff --git a/sysutils/system-tools-backends/distinfo b/sysutils/system-tools-backends/distinfo index 1fd288819b40..da6f030f7bf0 100644 --- a/sysutils/system-tools-backends/distinfo +++ b/sysutils/system-tools-backends/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/system-tools-backends-1.2.0.tar.bz2) = 96b00eb0f800c1b5346be2f71d4dc3b2 -SIZE (gnome2/system-tools-backends-1.2.0.tar.bz2) = 532611 +MD5 (gnome2/system-tools-backends-1.4.0.tar.bz2) = 71c9f6fc393ff05d29c7e6883e83c1b4 +SIZE (gnome2/system-tools-backends-1.4.0.tar.bz2) = 706880 diff --git a/sysutils/system-tools-backends/files/patch-network-conf.in b/sysutils/system-tools-backends/files/patch-network-conf.in new file mode 100644 index 000000000000..e23863c28b89 --- /dev/null +++ b/sysutils/system-tools-backends/files/patch-network-conf.in @@ -0,0 +1,11 @@ +--- network-conf.in.orig Fri Aug 26 00:54:38 2005 ++++ network-conf.in Fri Aug 26 00:55:10 2005 +@@ -75,7 +75,7 @@ + "conectiva-9", "conectiva-10", + "vine-3.0", "vine-3.1", + "slackware-9.1.0", "slackware-10.0.0", "slackware-10.1.0", +- "gentoo", "vlos-1.2", "freebsd-5", "freebsd-6"); ++ "gentoo", "vlos-1.2", "freebsd-5", "freebsd-6", "freebsd-7"); + + $description =<<"end_of_description;"; + Configures all network parameters and interfaces. diff --git a/sysutils/system-tools-backends/files/patch-network.pl.in b/sysutils/system-tools-backends/files/patch-network.pl.in index 29bde7d15901..22a06fbb3c73 100644 --- a/sysutils/system-tools-backends/files/patch-network.pl.in +++ b/sysutils/system-tools-backends/files/patch-network.pl.in @@ -1,20 +1,67 @@ ---- network.pl.in.orig Mon Mar 7 17:33:59 2005 -+++ network.pl.in Sun Apr 24 02:36:51 2005 -@@ -777,7 +777,7 @@ +--- network.pl.in.orig Tue Aug 23 05:58:01 2005 ++++ network.pl.in Fri Aug 26 00:56:03 2005 +@@ -522,6 +522,7 @@ + "vlos-1.2" => "debian-2.2", + "freebsd-5" => "debian-2.2", + "freebsd-6" => "debian-2.2", ++ "freebsd-7" => "debian-2.2", + ); + + return $cmd_map{$dist_map{$gst_dist}}; +@@ -791,7 +792,7 @@ $types_cache{$dev} = "modem"; } } -- elsif ($dev =~ /(eth|dc|ed|bfe)[0-9]/) +- elsif ($dev =~ /^(eth|dc|ed|bfe|em|fxp|bge|de|xl|ixgb|txp|vx|lge|nge|pcn|re|rl|sf|sis|sk|ste|ti|tl|tx|vge|vr|wb|cs|ex|ep|fe|ie|lnc|sn|xe|le|an|awi|wi|ndis|wlaue|axe|cue|kue|rue|fwe|nve)[0-9]/) + elsif ($dev =~ /(eth|dc|ed|bfe|em|fxp|bge|de|xl|ixgb|txp|vx|lge|nge|pcn|re|rl|sf|sis|sk|ste|ti|tl|tx|vge|vr|wb|cs|ex|ep|fe|ie|lnc|sn|xe|le|an|awi|wi|ndis|wl|aue|axe|cue|kue|rue|fwe|nve|hme|ath|iwi|ipw|ral|ural|my)[0-9]/) { $types_cache{$dev} = "ethernet"; } -@@ -4285,7 +4285,7 @@ - table => - [ - [ "hostname", \&gst_parse_sh_re, RC_CONF, hostname, "^([^\.]*)\." ], -- [ "domain", \&gst_parse_sh_re, RC_CONF, hostname, "\.([^\.]*)\$" ], -+ [ "domain", \&gst_parse_split_first_str, RESOLV_CONF, "domain", "[ \t]+" ], - [ "nameserver", \&gst_parse_split_all_unique_hash_comment, RESOLV_CONF, "nameserver", "[ \t]+" ], - [ "searchdomain", \&gst_parse_split_first_array_unique, RESOLV_CONF, "search", "[ \t]+", "[ \t]+" ], - [ "statichost", \&gst_parse_split_hash, HOSTS, "[ \t]+", "[ \t]+" ], +@@ -1803,6 +1804,7 @@ + "gentoo" => \&gst_network_deb22_get_file, + "freebsd-5" => \&gst_network_deb22_get_file, + "freebsd-6" => \&gst_network_deb22_get_file, ++ "freebsd-7" => \&gst_network_deb22_get_file, + ); + + $proc = $dist_map{$gst_dist}; +@@ -3906,6 +3908,7 @@ + "vlos-1.2" => "", + "freebsd-5" => "", + "freebsd-6" => "", ++ "freebsd-7" => "", + ); + + $dev = $dist_map {$gst_dist}; +@@ -4034,6 +4037,7 @@ + "vlos-1.2" => "vlos-1.2", + "freebsd-5" => "freebsd-5", + "freebsd-6" => "freebsd-5", ++ "freebsd-7" => "freebsd-5", + ); + + my %dist_tables = +@@ -4478,6 +4482,7 @@ + "vlos-1.2" => "vlos-1.2", + "freebsd-5" => "freebsd-5", + "freebsd-6" => "freebsd-5", ++ "freebsd-7" => "freebsd-5", + ); + + my %dist_tables = +@@ -5352,6 +5357,7 @@ + "vlos-1.2" => "vlos-1.2", + "freebsd-5" => "freebsd-5", + "freebsd-6" => "freebsd-5", ++ "freebsd-7" => "freebsd-5", + ); + + my %dist_tables = +@@ -5782,6 +5788,7 @@ + "vlos-1.2" => "vlos-1.2", + "freebsd-5" => "freebsd-5", + "freebsd-6" => "freebsd-5", ++ "freebsd-7" => "freebsd-5", + ); + + my %dist_tables = diff --git a/sysutils/system-tools-backends/files/patch-platform.pl.in b/sysutils/system-tools-backends/files/patch-platform.pl.in new file mode 100644 index 000000000000..81ad3b2e927c --- /dev/null +++ b/sysutils/system-tools-backends/files/patch-platform.pl.in @@ -0,0 +1,10 @@ +--- platform.pl.in.orig Fri Aug 26 00:56:21 2005 ++++ platform.pl.in Fri Aug 26 00:56:36 2005 +@@ -77,6 +77,7 @@ + "freebsd-4" => "FreeBSD 4", + "freebsd-5" => "FreeBSD 5", + "freebsd-6" => "FreeBSD 6", ++ "freebsd-7" => "FreeBSD 7", + "gentoo" => "Gentoo Linux", + "vlos-1.2" => "Vida Linux OS 1.2", + "archlinux-0.7" => "Arch Linux 0.7", diff --git a/sysutils/system-tools-backends/files/patch-service.pl.in b/sysutils/system-tools-backends/files/patch-service.pl.in new file mode 100644 index 000000000000..1162f2730695 --- /dev/null +++ b/sysutils/system-tools-backends/files/patch-service.pl.in @@ -0,0 +1,18 @@ +--- service.pl.in.orig Fri Aug 26 00:57:01 2005 ++++ service.pl.in Fri Aug 26 00:57:13 2005 +@@ -227,6 +227,7 @@ + + "freebsd-5" => "freebsd-5", + "freebsd-6" => "freebsd-5", ++ "freebsd-7" => "freebsd-5", + ); + + %runlevels= +@@ -1571,6 +1572,7 @@ + + "freebsd-5" => \&gst_service_rcng_get_status, + "freebsd-6" => \&gst_service_rcng_get_status, ++ "freebsd-7" => \&gst_service_rcng_get_status, + ); + my $proc; + diff --git a/sysutils/system-tools-backends/files/patch-services-conf.in b/sysutils/system-tools-backends/files/patch-services-conf.in new file mode 100644 index 000000000000..5a05ce27136e --- /dev/null +++ b/sysutils/system-tools-backends/files/patch-services-conf.in @@ -0,0 +1,11 @@ +--- services-conf.in.orig Fri Aug 26 00:57:28 2005 ++++ services-conf.in Fri Aug 26 00:57:37 2005 +@@ -55,7 +55,7 @@ + "pld-1.0", "pld-1.1", "pld-1.99", + "slackware-9.1.0", "slackware-10.0.0", "slackware-10.1.0", + "vine-3.0", "vine-3.1", +- "gentoo", "vlos-1.2", "freebsd-5", "freebsd-6", "suse-9.0", "suse-9.1"); ++ "gentoo", "vlos-1.2", "freebsd-5", "freebsd-6", "freebsd-7", "suse-9.0", "suse-9.1"); + + $description =<<"end_of_description;"; + Configures which services are to be started or stopped at which runlevels diff --git a/sysutils/system-tools-backends/files/patch-shares-conf.in b/sysutils/system-tools-backends/files/patch-shares-conf.in new file mode 100644 index 000000000000..5fa1e78a5911 --- /dev/null +++ b/sysutils/system-tools-backends/files/patch-shares-conf.in @@ -0,0 +1,10 @@ +--- shares-conf.in.orig Fri Aug 26 00:57:50 2005 ++++ shares-conf.in Fri Aug 26 00:57:57 2005 +@@ -557,6 +557,7 @@ + "vlos-1.2" => "gentoo", + "freebsd-5" => "freebsd-5", + "freebsd-6" => "freebsd-5", ++ "freebsd-7" => "freebsd-5", + ); + + my %dist_table = diff --git a/sysutils/system-tools-backends/files/patch-time-conf.in b/sysutils/system-tools-backends/files/patch-time-conf.in new file mode 100644 index 000000000000..1fe69aaf8fb2 --- /dev/null +++ b/sysutils/system-tools-backends/files/patch-time-conf.in @@ -0,0 +1,27 @@ +--- time-conf.in.orig Fri Aug 26 00:58:10 2005 ++++ time-conf.in Fri Aug 26 00:58:28 2005 +@@ -71,7 +71,7 @@ + "slackware-8.0.0", "slackware-8.1", "slackware-9.0.0", "slackware-9.1.0", "slackware-10.0.0", "slackware-10.1.0", + "gentoo", "vlos-1.2", "pld-1.0", "pld-1.1", "pld-1.99", "fedora-1", "fedora-2", "fedora-3", "specifix", + "vine-3.0", "vine-3.1", +- "freebsd-5", "freebsd-6"); ++ "freebsd-5", "freebsd-6", "freebsd-7"); + + $description =<<"end_of_description;"; + Configures your system clock, timezone and time server list. +@@ -551,6 +551,7 @@ + + "freebsd-5" => "freebsd-5", + "freebsd-6" => "freebsd-5", ++ "freebsd-7" => "freebsd-5", + ); + + my %dist_tables = +@@ -782,6 +783,7 @@ + + "freebsd-5" => "freebsd-5", + "freebsd-6" => "freebsd-5", ++ "freebsd-7" => "freebsd-5", + ); + + my %dist_tables = diff --git a/sysutils/system-tools-backends/files/patch-users-conf.in b/sysutils/system-tools-backends/files/patch-users-conf.in new file mode 100644 index 000000000000..11f70159358f --- /dev/null +++ b/sysutils/system-tools-backends/files/patch-users-conf.in @@ -0,0 +1,19 @@ +--- users-conf.in.orig Fri Aug 26 00:58:40 2005 ++++ users-conf.in Fri Aug 26 00:58:54 2005 +@@ -76,7 +76,7 @@ + "debian-2.2", "debian-3.0", "debian-sarge", + "suse-7.0", "suse-9.0", "suse-9.1", "turbolinux-7.0", + "slackware-8.0.0", "slackware-8.1", "slackware-9.0.0", "slackware-9.1.0", "slackware-10.0.0", "slackware-10.1.0", +- "freebsd-4", "freebsd-5", "freebsd-6", ++ "freebsd-4", "freebsd-5", "freebsd-6", "freebsd-7", + "gentoo", "vlos-1.2", + "archlinux-0.7", + "pld-1.0", "pld-1.1", "pld-1.99", "fedora-1", "fedora-2", "fedora-3", "specifix", "vine-3.0", "vine-3.1"); +@@ -373,6 +373,7 @@ + 'freebsd-4' => $freebsd_logindefs_defaults, + 'freebsd-5' => $freebsd_logindefs_defaults, + 'freebsd-6' => $freebsd_logindefs_defaults, ++ 'freebsd-7' => $freebsd_logindefs_defaults, + 'suse-7.0' => $gentoo_logindefs_defaults, + 'suse-9.0' => $gentoo_logindefs_defaults, + 'suse-9.1' => $gentoo_logindefs_defaults, diff --git a/sysutils/system-tools-backends/pkg-plist b/sysutils/system-tools-backends/pkg-plist index da943e8f93fd..02ed2d8a7879 100644 --- a/sysutils/system-tools-backends/pkg-plist +++ b/sysutils/system-tools-backends/pkg-plist @@ -1,51 +1,54 @@ libdata/pkgconfig/system-tools-backends.pc share/aclocal/system-tools-backends.m4 -share/locale/ar/LC_MESSAGES/setup-tools-backends.mo -share/locale/az/LC_MESSAGES/setup-tools-backends.mo -share/locale/bg/LC_MESSAGES/setup-tools-backends.mo -share/locale/bn/LC_MESSAGES/setup-tools-backends.mo -share/locale/bs/LC_MESSAGES/setup-tools-backends.mo -share/locale/ca/LC_MESSAGES/setup-tools-backends.mo -share/locale/cs/LC_MESSAGES/setup-tools-backends.mo -share/locale/da/LC_MESSAGES/setup-tools-backends.mo -share/locale/de/LC_MESSAGES/setup-tools-backends.mo -share/locale/el/LC_MESSAGES/setup-tools-backends.mo -share/locale/en_CA/LC_MESSAGES/setup-tools-backends.mo -share/locale/en_GB/LC_MESSAGES/setup-tools-backends.mo -share/locale/es/LC_MESSAGES/setup-tools-backends.mo -share/locale/eu/LC_MESSAGES/setup-tools-backends.mo -share/locale/fi/LC_MESSAGES/setup-tools-backends.mo -share/locale/fr/LC_MESSAGES/setup-tools-backends.mo -share/locale/gu/LC_MESSAGES/setup-tools-backends.mo -share/locale/hi/LC_MESSAGES/setup-tools-backends.mo -share/locale/hr/LC_MESSAGES/setup-tools-backends.mo -share/locale/hu/LC_MESSAGES/setup-tools-backends.mo -share/locale/id/LC_MESSAGES/setup-tools-backends.mo -share/locale/it/LC_MESSAGES/setup-tools-backends.mo -share/locale/ja/LC_MESSAGES/setup-tools-backends.mo -share/locale/ko/LC_MESSAGES/setup-tools-backends.mo -share/locale/lt/LC_MESSAGES/setup-tools-backends.mo -share/locale/ms/LC_MESSAGES/setup-tools-backends.mo -share/locale/nb/LC_MESSAGES/setup-tools-backends.mo -share/locale/nl/LC_MESSAGES/setup-tools-backends.mo -share/locale/no/LC_MESSAGES/setup-tools-backends.mo -share/locale/pa/LC_MESSAGES/setup-tools-backends.mo -share/locale/pl/LC_MESSAGES/setup-tools-backends.mo -share/locale/pt/LC_MESSAGES/setup-tools-backends.mo -share/locale/pt_BR/LC_MESSAGES/setup-tools-backends.mo -share/locale/ro/LC_MESSAGES/setup-tools-backends.mo -share/locale/sk/LC_MESSAGES/setup-tools-backends.mo -share/locale/sq/LC_MESSAGES/setup-tools-backends.mo -share/locale/sr/LC_MESSAGES/setup-tools-backends.mo -share/locale/sr@Latn/LC_MESSAGES/setup-tools-backends.mo -share/locale/sv/LC_MESSAGES/setup-tools-backends.mo -share/locale/ta/LC_MESSAGES/setup-tools-backends.mo -share/locale/th/LC_MESSAGES/setup-tools-backends.mo -share/locale/tr/LC_MESSAGES/setup-tools-backends.mo -share/locale/uk/LC_MESSAGES/setup-tools-backends.mo -share/locale/vi/LC_MESSAGES/setup-tools-backends.mo -share/locale/zh_CN/LC_MESSAGES/setup-tools-backends.mo -share/locale/zh_TW/LC_MESSAGES/setup-tools-backends.mo +share/locale/ar/LC_MESSAGES/system-tools-backends.mo +share/locale/az/LC_MESSAGES/system-tools-backends.mo +share/locale/bg/LC_MESSAGES/system-tools-backends.mo +share/locale/bn/LC_MESSAGES/system-tools-backends.mo +share/locale/bs/LC_MESSAGES/system-tools-backends.mo +share/locale/ca/LC_MESSAGES/system-tools-backends.mo +share/locale/cs/LC_MESSAGES/system-tools-backends.mo +share/locale/da/LC_MESSAGES/system-tools-backends.mo +share/locale/de/LC_MESSAGES/system-tools-backends.mo +share/locale/el/LC_MESSAGES/system-tools-backends.mo +share/locale/en_CA/LC_MESSAGES/system-tools-backends.mo +share/locale/en_GB/LC_MESSAGES/system-tools-backends.mo +share/locale/es/LC_MESSAGES/system-tools-backends.mo +share/locale/eu/LC_MESSAGES/system-tools-backends.mo +share/locale/fi/LC_MESSAGES/system-tools-backends.mo +share/locale/fr/LC_MESSAGES/system-tools-backends.mo +share/locale/gu/LC_MESSAGES/system-tools-backends.mo +share/locale/hi/LC_MESSAGES/system-tools-backends.mo +share/locale/hr/LC_MESSAGES/system-tools-backends.mo +share/locale/hu/LC_MESSAGES/system-tools-backends.mo +share/locale/id/LC_MESSAGES/system-tools-backends.mo +share/locale/it/LC_MESSAGES/system-tools-backends.mo +share/locale/ja/LC_MESSAGES/system-tools-backends.mo +share/locale/ko/LC_MESSAGES/system-tools-backends.mo +share/locale/lt/LC_MESSAGES/system-tools-backends.mo +share/locale/ms/LC_MESSAGES/system-tools-backends.mo +share/locale/nb/LC_MESSAGES/system-tools-backends.mo +share/locale/ne/LC_MESSAGES/system-tools-backends.mo +share/locale/nl/LC_MESSAGES/system-tools-backends.mo +share/locale/no/LC_MESSAGES/system-tools-backends.mo +share/locale/pa/LC_MESSAGES/system-tools-backends.mo +share/locale/pl/LC_MESSAGES/system-tools-backends.mo +share/locale/pt/LC_MESSAGES/system-tools-backends.mo +share/locale/pt_BR/LC_MESSAGES/system-tools-backends.mo +share/locale/ro/LC_MESSAGES/system-tools-backends.mo +share/locale/rw/LC_MESSAGES/system-tools-backends.mo +share/locale/sk/LC_MESSAGES/system-tools-backends.mo +share/locale/sq/LC_MESSAGES/system-tools-backends.mo +share/locale/sr/LC_MESSAGES/system-tools-backends.mo +share/locale/sr@Latn/LC_MESSAGES/system-tools-backends.mo +share/locale/sv/LC_MESSAGES/system-tools-backends.mo +share/locale/ta/LC_MESSAGES/system-tools-backends.mo +share/locale/th/LC_MESSAGES/system-tools-backends.mo +share/locale/tr/LC_MESSAGES/system-tools-backends.mo +share/locale/uk/LC_MESSAGES/system-tools-backends.mo +share/locale/vi/LC_MESSAGES/system-tools-backends.mo +share/locale/xh/LC_MESSAGES/system-tools-backends.mo +share/locale/zh_CN/LC_MESSAGES/system-tools-backends.mo +share/locale/zh_TW/LC_MESSAGES/system-tools-backends.mo share/setup-tool-backends/files/general_isdn_ppp_options share/setup-tool-backends/scripts/boot-conf share/setup-tool-backends/scripts/boot-grub.pl @@ -94,3 +97,7 @@ share/setup-tool-backends/scripts/xml.pl @dirrm share/setup-tool-backends/scripts @dirrm share/setup-tool-backends/files @dirrm share/setup-tool-backends +@unexec rmdir %D/share/locale/xh/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/xh 2> /dev/null || true +@unexec rmdir %D/share/locale/rw/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/rw 2> /dev/null || true diff --git a/textproc/gnome-doc-utils/Makefile b/textproc/gnome-doc-utils/Makefile index da40260d8dda..df0e7cf842c3 100644 --- a/textproc/gnome-doc-utils/Makefile +++ b/textproc/gnome-doc-utils/Makefile @@ -3,13 +3,14 @@ # Whom: Adam Weinberger <adamw@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/textproc/gnomedocutils/Makefile,v 1.21 2005/10/12 19:50:19 marcus Exp $ # PORTNAME= gnomedocutils -PORTVERSION= 0.2.2 +PORTVERSION= 0.4.3 CATEGORIES= textproc gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-doc-utils/0.2 +MASTER_SITE_SUBDIR= sources/gnome-doc-utils/0.4 DISTNAME= gnome-doc-utils-${PORTVERSION} MAINTAINER= gnome@FreeBSD.org @@ -36,8 +37,11 @@ MAN1= xml2po.1 DOCBOOK_VERSION=4.1.2 post-patch: - @${REINPLACE_CMD} -e 's|4\.2|${DOCBOOK_VERSION}|g' \ + @${REINPLACE_CMD} -e 's|4\.4|${DOCBOOK_VERSION}|g' \ ${WRKSRC}/doc/xslt/C/gnome-doc-xslt.xml \ ${WRKSRC}/doc/gnome-doc-make/C/gnome-doc-make.xml +post-install: + @${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py -l ${PREFIX}/share/xml2po + .include <bsd.port.mk> diff --git a/textproc/gnome-doc-utils/distinfo b/textproc/gnome-doc-utils/distinfo index 4d19d7fc0270..82023ce76987 100644 --- a/textproc/gnome-doc-utils/distinfo +++ b/textproc/gnome-doc-utils/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome-doc-utils-0.2.2.tar.bz2) = 70205b2337511c7bb73df32ffef2f3a0 -SIZE (gnome-doc-utils-0.2.2.tar.bz2) = 305872 +MD5 (gnome-doc-utils-0.4.3.tar.bz2) = 7931f20fa72bcb5ae956d6f7dfed0b7a +SIZE (gnome-doc-utils-0.4.3.tar.bz2) = 373295 diff --git a/textproc/gnome-doc-utils/pkg-plist b/textproc/gnome-doc-utils/pkg-plist index 156055279b27..6b2efcf5c9ff 100644 --- a/textproc/gnome-doc-utils/pkg-plist +++ b/textproc/gnome-doc-utils/pkg-plist @@ -9,7 +9,6 @@ share/gnome/help/gnome-doc-make/C/legal.xml share/gnome/help/gnome-doc-make/C/make-ref.xml share/gnome/help/gnome-doc-xslt/C/db-chunk.xml share/gnome/help/gnome-doc-xslt/C/db-common.xml -share/gnome/help/gnome-doc-xslt/C/db-format.xml share/gnome/help/gnome-doc-xslt/C/db-label.xml share/gnome/help/gnome-doc-xslt/C/db-title.xml share/gnome/help/gnome-doc-xslt/C/db-xref.xml @@ -35,7 +34,6 @@ share/gnome/help/gnome-doc-xslt/C/db2html-title.xml share/gnome/help/gnome-doc-xslt/C/db2html-xref.xml share/gnome/help/gnome-doc-xslt/C/db2html.xml share/gnome/help/gnome-doc-xslt/C/db2omf.xml -share/gnome/help/gnome-doc-xslt/C/format2xsl.xml share/gnome/help/gnome-doc-xslt/C/gettext.xml share/gnome/help/gnome-doc-xslt/C/gnome-doc-xslt.xml share/gnome/help/gnome-doc-xslt/C/legal.xml @@ -45,7 +43,6 @@ share/gnome/omf/gnome-doc-make/gnome-doc-make-C.omf share/gnome/omf/gnome-doc-xslt/gnome-doc-xslt-C.omf share/xml/gnome/xslt/docbook/common/db-chunk.xsl share/xml/gnome/xslt/docbook/common/db-common.xsl -share/xml/gnome/xslt/docbook/common/db-format.xsl share/xml/gnome/xslt/docbook/common/db-label.xsl share/xml/gnome/xslt/docbook/common/db-title.xsl share/xml/gnome/xslt/docbook/common/db-xref.xsl @@ -74,13 +71,15 @@ share/xml/gnome/xslt/docbook/omf/db2omf.xsl share/xml/gnome/xslt/docbook/utils/chunks.xsl share/xml/gnome/xslt/docbook/utils/credits.xsl share/xml/gnome/xslt/docbook/utils/ids.xsl -share/xml/gnome/xslt/gettext/format2xsl.xsl share/xml/gnome/xslt/gettext/gettext.xsl share/xml/gnome/xslt/gettext/l10n.xml share/xml/gnome/xslt/xsldoc/xsldoc.xsl share/xml2po/docbook.py +share/xml2po/docbook.pyc share/xml2po/empty.py +share/xml2po/empty.pyc share/xml2po/gs.py +share/xml2po/gs.pyc @dirrm share/xml2po @dirrm share/xml/gnome/xslt/xsldoc @dirrm share/xml/gnome/xslt/gettext diff --git a/textproc/gnomedocutils/Makefile b/textproc/gnomedocutils/Makefile index da40260d8dda..df0e7cf842c3 100644 --- a/textproc/gnomedocutils/Makefile +++ b/textproc/gnomedocutils/Makefile @@ -3,13 +3,14 @@ # Whom: Adam Weinberger <adamw@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/textproc/gnomedocutils/Makefile,v 1.21 2005/10/12 19:50:19 marcus Exp $ # PORTNAME= gnomedocutils -PORTVERSION= 0.2.2 +PORTVERSION= 0.4.3 CATEGORIES= textproc gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-doc-utils/0.2 +MASTER_SITE_SUBDIR= sources/gnome-doc-utils/0.4 DISTNAME= gnome-doc-utils-${PORTVERSION} MAINTAINER= gnome@FreeBSD.org @@ -36,8 +37,11 @@ MAN1= xml2po.1 DOCBOOK_VERSION=4.1.2 post-patch: - @${REINPLACE_CMD} -e 's|4\.2|${DOCBOOK_VERSION}|g' \ + @${REINPLACE_CMD} -e 's|4\.4|${DOCBOOK_VERSION}|g' \ ${WRKSRC}/doc/xslt/C/gnome-doc-xslt.xml \ ${WRKSRC}/doc/gnome-doc-make/C/gnome-doc-make.xml +post-install: + @${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py -l ${PREFIX}/share/xml2po + .include <bsd.port.mk> diff --git a/textproc/gnomedocutils/distinfo b/textproc/gnomedocutils/distinfo index 4d19d7fc0270..82023ce76987 100644 --- a/textproc/gnomedocutils/distinfo +++ b/textproc/gnomedocutils/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome-doc-utils-0.2.2.tar.bz2) = 70205b2337511c7bb73df32ffef2f3a0 -SIZE (gnome-doc-utils-0.2.2.tar.bz2) = 305872 +MD5 (gnome-doc-utils-0.4.3.tar.bz2) = 7931f20fa72bcb5ae956d6f7dfed0b7a +SIZE (gnome-doc-utils-0.4.3.tar.bz2) = 373295 diff --git a/textproc/gnomedocutils/pkg-plist b/textproc/gnomedocutils/pkg-plist index 156055279b27..6b2efcf5c9ff 100644 --- a/textproc/gnomedocutils/pkg-plist +++ b/textproc/gnomedocutils/pkg-plist @@ -9,7 +9,6 @@ share/gnome/help/gnome-doc-make/C/legal.xml share/gnome/help/gnome-doc-make/C/make-ref.xml share/gnome/help/gnome-doc-xslt/C/db-chunk.xml share/gnome/help/gnome-doc-xslt/C/db-common.xml -share/gnome/help/gnome-doc-xslt/C/db-format.xml share/gnome/help/gnome-doc-xslt/C/db-label.xml share/gnome/help/gnome-doc-xslt/C/db-title.xml share/gnome/help/gnome-doc-xslt/C/db-xref.xml @@ -35,7 +34,6 @@ share/gnome/help/gnome-doc-xslt/C/db2html-title.xml share/gnome/help/gnome-doc-xslt/C/db2html-xref.xml share/gnome/help/gnome-doc-xslt/C/db2html.xml share/gnome/help/gnome-doc-xslt/C/db2omf.xml -share/gnome/help/gnome-doc-xslt/C/format2xsl.xml share/gnome/help/gnome-doc-xslt/C/gettext.xml share/gnome/help/gnome-doc-xslt/C/gnome-doc-xslt.xml share/gnome/help/gnome-doc-xslt/C/legal.xml @@ -45,7 +43,6 @@ share/gnome/omf/gnome-doc-make/gnome-doc-make-C.omf share/gnome/omf/gnome-doc-xslt/gnome-doc-xslt-C.omf share/xml/gnome/xslt/docbook/common/db-chunk.xsl share/xml/gnome/xslt/docbook/common/db-common.xsl -share/xml/gnome/xslt/docbook/common/db-format.xsl share/xml/gnome/xslt/docbook/common/db-label.xsl share/xml/gnome/xslt/docbook/common/db-title.xsl share/xml/gnome/xslt/docbook/common/db-xref.xsl @@ -74,13 +71,15 @@ share/xml/gnome/xslt/docbook/omf/db2omf.xsl share/xml/gnome/xslt/docbook/utils/chunks.xsl share/xml/gnome/xslt/docbook/utils/credits.xsl share/xml/gnome/xslt/docbook/utils/ids.xsl -share/xml/gnome/xslt/gettext/format2xsl.xsl share/xml/gnome/xslt/gettext/gettext.xsl share/xml/gnome/xslt/gettext/l10n.xml share/xml/gnome/xslt/xsldoc/xsldoc.xsl share/xml2po/docbook.py +share/xml2po/docbook.pyc share/xml2po/empty.py +share/xml2po/empty.pyc share/xml2po/gs.py +share/xml2po/gs.pyc @dirrm share/xml2po @dirrm share/xml/gnome/xslt/xsldoc @dirrm share/xml/gnome/xslt/gettext 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 diff --git a/x11-fm/nautilus2/Makefile b/x11-fm/nautilus2/Makefile index f751fbc85c19..f39b9a22af2b 100644 --- a/x11-fm/nautilus2/Makefile +++ b/x11-fm/nautilus2/Makefile @@ -3,18 +3,19 @@ # Whom: ade, archie # # $FreeBSD$ +# $MCom: ports/x11-fm/nautilus2/Makefile,v 1.90 2005/10/03 16:24:38 marcus Exp $ # PORTNAME= nautilus2 -PORTVERSION= 2.10.1 +PORTVERSION= 2.12.1 CATEGORIES= x11-fm gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.10 +MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.12 DISTNAME= nautilus-${PORTVERSION} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org -COMMENT= GNOME file manager and graphical shell developed by Eazel +COMMENT= File manager for the GNOME desktop LIB_DEPENDS= exif.12:${PORTSDIR}/graphics/libexif @@ -25,7 +26,7 @@ USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop eel2 \ librsvg2 desktopfileutils GNOME_DESKTOP_VERSION=2 INSTALLS_SHLIB= yes -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 USE_REINPLACE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="${PTHREAD_LIBS} -L${LOCALBASE}/lib -L${X11BASE}/lib -liconv" \ diff --git a/x11-fm/nautilus2/distinfo b/x11-fm/nautilus2/distinfo index 59982ad77c29..e9e415e3e968 100644 --- a/x11-fm/nautilus2/distinfo +++ b/x11-fm/nautilus2/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/nautilus-2.10.1.tar.bz2) = 976d725db15e901bc881dfb8c50145c1 -SIZE (gnome2/nautilus-2.10.1.tar.bz2) = 5960278 +MD5 (gnome2/nautilus-2.12.1.tar.bz2) = 61878b1c3f9bee37cd568e17b31d66b1 +SIZE (gnome2/nautilus-2.12.1.tar.bz2) = 4056062 diff --git a/x11-fm/nautilus2/pkg-plist b/x11-fm/nautilus2/pkg-plist index d9580a06efda..2e738f0a6fbe 100644 --- a/x11-fm/nautilus2/pkg-plist +++ b/x11-fm/nautilus2/pkg-plist @@ -69,34 +69,15 @@ share/gnome/nautilus/ui/nautilus-list-view-ui.xml share/gnome/nautilus/ui/nautilus-navigation-window-ui.xml share/gnome/nautilus/ui/nautilus-shell-ui.xml share/gnome/nautilus/ui/nautilus-spatial-window-ui.xml -share/gnome/pixmaps/nautilus/Search.png -share/gnome/pixmaps/nautilus/audio.png +share/gnome/pixmaps/nautilus/audio.svg share/gnome/pixmaps/nautilus/backgrounds.png share/gnome/pixmaps/nautilus/chit_frame.png share/gnome/pixmaps/nautilus/colors.png -share/gnome/pixmaps/nautilus/crux_eggplant/Search.png -share/gnome/pixmaps/nautilus/crux_eggplant/crux_eggplant.xml -share/gnome/pixmaps/nautilus/crux_teal/Search.png -share/gnome/pixmaps/nautilus/crux_teal/crux_teal.xml -share/gnome/pixmaps/nautilus/default/Search.png -share/gnome/pixmaps/nautilus/default/default.xml -share/gnome/pixmaps/nautilus/default/side_bar_image.png share/gnome/pixmaps/nautilus/emblems.png share/gnome/pixmaps/nautilus/erase.png -share/gnome/pixmaps/nautilus/gnome/Services.png -share/gnome/pixmaps/nautilus/gnome/gnome.xml share/gnome/pixmaps/nautilus/knob.png -share/gnome/pixmaps/nautilus/nautilus-desktop.png -share/gnome/pixmaps/nautilus/nautilus-file-management-properties.png share/gnome/pixmaps/nautilus/nautilus-launch-icon.png -share/gnome/pixmaps/nautilus/nautilus-mini-logo.png -share/gnome/pixmaps/nautilus/nautilus-server-connect.png share/gnome/pixmaps/nautilus/note-indicator.png -share/gnome/pixmaps/nautilus/side_bar_image.png -share/gnome/pixmaps/nautilus/sierra/green_weave.png -share/gnome/pixmaps/nautilus/sierra/sierra.xml -share/gnome/pixmaps/nautilus/tahoe/bluewall.png -share/gnome/pixmaps/nautilus/tahoe/tahoe.xml share/gnome/pixmaps/nautilus/text-selection-frame.png share/gnome/pixmaps/nautilus/thumbnail_frame.png share/locale/af/LC_MESSAGES/nautilus.mo @@ -133,6 +114,7 @@ share/locale/is/LC_MESSAGES/nautilus.mo share/locale/it/LC_MESSAGES/nautilus.mo share/locale/ja/LC_MESSAGES/nautilus.mo share/locale/ko/LC_MESSAGES/nautilus.mo +share/locale/ku/LC_MESSAGES/nautilus.mo share/locale/li/LC_MESSAGES/nautilus.mo share/locale/lt/LC_MESSAGES/nautilus.mo share/locale/lv/LC_MESSAGES/nautilus.mo @@ -162,6 +144,7 @@ share/locale/sr@Latn/LC_MESSAGES/nautilus.mo share/locale/sr@ije/LC_MESSAGES/nautilus.mo share/locale/sv/LC_MESSAGES/nautilus.mo share/locale/ta/LC_MESSAGES/nautilus.mo +share/locale/te/LC_MESSAGES/nautilus.mo share/locale/th/LC_MESSAGES/nautilus.mo share/locale/tk/LC_MESSAGES/nautilus.mo share/locale/tr/LC_MESSAGES/nautilus.mo @@ -177,12 +160,6 @@ share/locale/zu/LC_MESSAGES/nautilus.mo @unexec rmdir %D/share/locale/xh 2> /dev/null || true @unexec rmdir %D/share/locale/rw/LC_MESSAGES 2> /dev/null || true @unexec rmdir %D/share/locale/rw 2> /dev/null || true -@dirrm share/gnome/pixmaps/nautilus/tahoe -@dirrm share/gnome/pixmaps/nautilus/sierra -@dirrm share/gnome/pixmaps/nautilus/gnome -@dirrm share/gnome/pixmaps/nautilus/default -@dirrm share/gnome/pixmaps/nautilus/crux_teal -@dirrm share/gnome/pixmaps/nautilus/crux_eggplant @dirrm share/gnome/pixmaps/nautilus @dirrm share/gnome/nautilus/ui @dirrm share/gnome/nautilus/patterns diff --git a/x11-fonts/bitstream-vera/Makefile b/x11-fonts/bitstream-vera/Makefile index 98890ad29fe7..ca2970ad61ac 100644 --- a/x11-fonts/bitstream-vera/Makefile +++ b/x11-fonts/bitstream-vera/Makefile @@ -3,11 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/x11-fonts/bitstream-vera/Makefile,v 1.2 2005/10/14 20:39:59 adamw Exp $ # PORTNAME= bitstream-vera PORTVERSION= 1.10 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-fonts MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/ttf-${PORTNAME}/1.10 @@ -56,12 +57,9 @@ install-fonts: ${INSTALL_DATA} ${WRKSRC}/COPYRIGHT.TXT ${FONTSDIR} install-conf: - ${MKDIR} ${PREFIX}/etc/fonts - if [ ! -f ${PREFIX}/etc/fonts/local.conf ]; then \ - ${INSTALL_DATA} ${WRKSRC}/local.conf ${PREFIX}/etc/fonts ; \ - fi + ${MKDIR} ${PREFIX}/etc/fonts/conf.d ${INSTALL_DATA} ${WRKSRC}/local.conf \ - ${PREFIX}/etc/fonts/local.conf-vera + ${PREFIX}/etc/fonts/conf.d/0.vera.conf install-docs: .if !defined(NOPORTDOCS) diff --git a/x11-fonts/bitstream-vera/pkg-plist b/x11-fonts/bitstream-vera/pkg-plist index defc5ac3d58f..30445c503b4f 100644 --- a/x11-fonts/bitstream-vera/pkg-plist +++ b/x11-fonts/bitstream-vera/pkg-plist @@ -1,6 +1,4 @@ -@unexec if cmp -s %D/etc/fonts/local.conf %D/etc/fonts/local.conf-vera; then rm -f %D/etc/fonts/local.conf; fi -etc/fonts/local.conf-vera -@exec [ ! -f %B/local.conf ] && cp %B/%f %B/local.conf +etc/fonts/conf.d/0.vera.conf %%FONTSDIR%%/COPYRIGHT.TXT %%FONTSDIR%%/fonts.dir %%FONTSDIR%%/Vera.ttf diff --git a/x11-fonts/fontconfig/Makefile b/x11-fonts/fontconfig/Makefile index 66128af202f9..62eb9e170104 100644 --- a/x11-fonts/fontconfig/Makefile +++ b/x11-fonts/fontconfig/Makefile @@ -3,10 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/x11-fonts/fontconfig/Makefile,v 1.3 2005/08/26 04:03:55 marcus Exp $ # PORTNAME= fontconfig -PORTVERSION= 2.2.3 +PORTVERSION= 2.3.2 PORTEPOCH= 1 CATEGORIES= x11-fonts MASTER_SITES= http://fontconfig.org/release/ @@ -20,7 +21,7 @@ LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \ USE_GMAKE= yes PREFIX?= ${X11BASE} INSTALLS_SHLIB= yes -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 USE_GNOME= gnomehack gnometarget pkgconfig CONFIGURE_ARGS= --with-confdir=${PREFIX}/etc/fonts \ --with-expat-includes=${LOCALBASE}/include \ @@ -31,7 +32,7 @@ PKGINSTALL= ${WRKDIR}/pkg-install PKGDEINSTALL= ${PKGINSTALL} USE_REINPLACE= yes -MAN1= fc-cache.1 fc-list.1 +MAN1= fc-match.1 MAN3= FcAtomicCreate.3 \ FcAtomicDeleteNew.3 \ FcAtomicDestroy.3 \ @@ -85,6 +86,7 @@ MAN3= FcAtomicCreate.3 \ FcDirSave.3 \ FcDirScan.3 \ FcFileScan.3 \ + FcFini.3 \ FcFontList.3 \ FcFontMatch.3 \ FcFontRenderPrepare.3 \ @@ -134,11 +136,13 @@ MAN3= FcAtomicCreate.3 \ FcPatternGet.3 \ FcPatternHash.3 \ FcPatternPrint.3 \ + FcPatternRemove.3 \ FcStrBasename.3 \ FcStrCmpIgnoreCase.3 \ FcStrCopy.3 \ FcStrCopyFilename.3 \ FcStrDirname.3 \ + FcStrDowncase.3 \ FcStrListCreate.3 \ FcStrListDone.3 \ FcStrListNext.3 \ @@ -148,6 +152,8 @@ MAN3= FcAtomicCreate.3 \ FcStrSetDel.3 \ FcStrSetDestroy.3 \ FcStrSetMember.3 \ + FcStrStr.3 \ + FcStrStrIgnoreCase.3 \ FcUcs4ToUtf8.3 \ FcUtf16Len.3 \ FcUtf16ToUcs4.3 \ @@ -159,12 +165,12 @@ MAN5= fonts-conf.5 .include <bsd.port.pre.mk> -.if defined(WITH_CJK) -PATCH_SITES+= ftp://local-distfiles.freebsd.org.cn/pub/china-ports/hamigua/ \ - http://bsdchat.com/dist/firefly-cjk-patchset/ -PATCHFILES+= cjk-fontconfig-2.2.3-20050315.patch.gz -PATCH_DIST_STRIP+= -p1 -.endif +#.if defined(WITH_CJK) +#PATCH_SITES+= ftp://local-distfiles.freebsd.org.cn/pub/china-ports/hamigua/ \ +# http://bsdchat.com/dist/firefly-cjk-patchset/ +#PATCHFILES+= cjk-fontconfig-2.2.3-20050315.patch.gz +#PATCH_DIST_STRIP+= -p1 +#.endif .if defined(NOPORTDOCS) post-patch: @@ -173,6 +179,12 @@ post-patch: .endif post-install: + if [ ! -f ${PREFIX}/etc/fonts/fonts.conf ]; then \ + ${INSTALL_DATA} ${WRKSRC}/fonts.conf ${PREFIX}/etc/fonts/fonts.conf; \ + ${INSTALL_DATA} ${WRKSRC}/fonts.conf ${PREFIX}/etc/fonts/fonts.conf.default; \ + else \ + ${INSTALL_DATA} ${WRKSRC}/fonts.conf ${PREFIX}/etc/fonts/fonts.conf.default; \ + fi @${SED} -e 's|%%PREFIX%%|${PREFIX}|' < ${FILESDIR}/pkg-install.in \ > ${PKGINSTALL} .if !defined(PACKAGE_BUILDING) diff --git a/x11-fonts/fontconfig/distinfo b/x11-fonts/fontconfig/distinfo index 42133084149a..1126a25fe5fd 100644 --- a/x11-fonts/fontconfig/distinfo +++ b/x11-fonts/fontconfig/distinfo @@ -1,4 +1,2 @@ -MD5 (fontconfig-2.2.3.tar.gz) = 2466a797d645cda5eb466080fdaec416 -SIZE (fontconfig-2.2.3.tar.gz) = 750035 -MD5 (cjk-fontconfig-2.2.3-20050315.patch.gz) = f796ba6ba54c3a211a218bb686e993d4 -SIZE (cjk-fontconfig-2.2.3-20050315.patch.gz) = 307843 +MD5 (fontconfig-2.3.2.tar.gz) = 7354f9f125ea78a8f2851cb9c31d4866 +SIZE (fontconfig-2.3.2.tar.gz) = 964045 diff --git a/x11-fonts/fontconfig/files/patch-Makefile.in b/x11-fonts/fontconfig/files/patch-Makefile.in index f8f2f6dfa127..1a310350fade 100644 --- a/x11-fonts/fontconfig/files/patch-Makefile.in +++ b/x11-fonts/fontconfig/files/patch-Makefile.in @@ -1,28 +1,32 @@ ---- Makefile.in.orig Tue Mar 16 15:15:47 2004 -+++ Makefile.in Tue Mar 16 15:16:18 2004 -@@ -192,7 +192,6 @@ - fontconfig.pc.in \ - fonts.conf.in \ - fonts.dtd \ -- local.conf \ - fontconfig.spec.in \ - fontconfig.spec \ - fontconfig-zip.in -@@ -671,16 +670,7 @@ +--- Makefile.in.orig Wed Jul 27 02:23:03 2005 ++++ Makefile.in Wed Jul 27 02:25:27 2005 +@@ -721,28 +721,7 @@ install-data-local: -- if [ -f $(DESTDIR)$(configdir)/local.conf ]; then \ -- echo "not overwriting existing $(DESTDIR)$(configdir)/local.conf"; \ -- else if [ -f $(srcdir)/local.conf ]; then \ -- echo " $(INSTALL_DATA) $(srcdir)/local.conf $(DESTDIR)$(configdir)/local.conf"; \ -- $(INSTALL_DATA) $(srcdir)/local.conf $(DESTDIR)$(configdir)/local.conf; \ -- else if [ -f local.conf ]; then \ -- echo " $(INSTALL_DATA) local.conf $(DESTDIR)$(configdir)/local.conf"; \ -- $(INSTALL_DATA) local.conf $(DESTDIR)$(configdir)/local.conf; \ -- fi; fi; fi -- if [ x$(DESTDIR) = x ]; then fc-cache/fc-cache -f -v; fi -+# if [ x$(DESTDIR) = x ]; then fc-cache/fc-cache -f -v; fi - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. - .NOEXPORT: +- $(mkinstalldirs) $(DESTDIR)$(configdir) +- if [ -f $(DESTDIR)$(configdir)/fonts.conf ]; then \ +- echo "backing up existing $(DESTDIR)$(configdir)/fonts.conf"; \ +- mv $(DESTDIR)$(configdir)/fonts.conf $(DESTDIR)$(configdir)/fonts.conf.bak; \ +- fi +- if [ -f $(srcdir)/fonts.conf ]; then \ +- echo " $(INSTALL_DATA) $(srcdir)/fonts.conf $(DESTDIR)$(configdir)/fonts.conf"; \ +- $(INSTALL_DATA) $(srcdir)/fonts.conf $(DESTDIR)$(configdir)/fonts.conf; \ +- else if [ -f fonts.conf ]; then \ +- echo " $(INSTALL_DATA) fonts.conf $(DESTDIR)$(configdir)/fonts.conf"; \ +- $(INSTALL_DATA) fonts.conf $(DESTDIR)$(configdir)/fonts.conf; \ +- fi; fi +- if $(RUN_FC_CACHE_TEST); then \ +- echo " fc-cache/fc-cache -f -v"; \ +- fc-cache/fc-cache -f -v; \ +- else \ +- echo "***"; \ +- echo "*** Warning: fonts.cache not built"; \ +- echo "***"; \ +- echo "*** Generate this file manually on host system using fc-cache"; \ +- echo "***"; \ +- fi ++ + + uninstall-local: + if [ -f $(srcdir)/fonts.conf ]; then \ diff --git a/x11-fonts/fontconfig/pkg-plist b/x11-fonts/fontconfig/pkg-plist index d5c26dcfdf24..9787a747ec40 100644 --- a/x11-fonts/fontconfig/pkg-plist +++ b/x11-fonts/fontconfig/pkg-plist @@ -1,6 +1,15 @@ bin/fc-cache bin/fc-list -etc/fonts/fonts.conf +bin/fc-match +etc/fonts/conf.d/autohint.conf +etc/fonts/conf.d/no-bitmaps.conf +etc/fonts/conf.d/no-sub-pixel.conf +etc/fonts/conf.d/sub-pixel.conf +etc/fonts/conf.d/unhinted.conf +etc/fonts/conf.d/yes-bitmaps.conf +@unexec if cmp -s %D/etc/fonts/fonts.conf %D/etc/fonts/fonts.conf.default; then rm -f %D/etc/fonts/fonts.conf; fi +etc/fonts/fonts.conf.default +@exec [ -f %B/fonts.conf ] || cp %B/%f %B/fonts.conf etc/fonts/fonts.dtd include/fontconfig/fcfreetype.h include/fontconfig/fcprivate.h @@ -9,137 +18,145 @@ lib/libfontconfig.a lib/libfontconfig.so lib/libfontconfig.so.1 libdata/pkgconfig/fontconfig.pc +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel.pdf %%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel.txt %%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/index.html -%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1016.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1011.html %%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1042.html %%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1064.html -%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1087.html -%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1111.html -%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1134.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1090.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1112.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1135.html %%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1159.html -%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1184.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1182.html %%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r120.html -%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1209.html -%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1234.html -%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1259.html -%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1281.html -%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1306.html -%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1331.html -%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1356.html -%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1383.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1207.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1232.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1257.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1282.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1307.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1329.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1354.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1379.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1404.html %%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r141.html -%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1414.html -%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1437.html -%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1460.html -%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1486.html -%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1515.html -%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1545.html -%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1575.html -%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1608.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1431.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1462.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1485.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1508.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1534.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1563.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1593.html %%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r162.html -%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1629.html -%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1650.html -%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1672.html -%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1693.html -%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1715.html -%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1736.html -%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1758.html -%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1780.html -%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1802.html -%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1823.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1623.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1656.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1677.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1698.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1720.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1741.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1763.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1784.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1806.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1828.html %%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r183.html -%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1847.html -%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1868.html -%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1890.html -%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1913.html -%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1936.html -%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1959.html -%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1980.html -%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2009.html -%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2034.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1850.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1871.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1895.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1916.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1938.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1961.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1984.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2007.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2028.html %%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r204.html -%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2062.html -%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2099.html -%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2130.html -%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2157.html -%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2181.html -%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2207.html -%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2231.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2057.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2082.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2110.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2147.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2178.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2205.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2229.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r225.html %%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2255.html -%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r228.html -%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2280.html -%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2304.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2279.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2303.html %%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2328.html -%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2350.html -%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2378.html -%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2399.html -%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2420.html -%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2443.html -%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2469.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2352.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2376.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2398.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2426.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2447.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2468.html %%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r249.html %%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2491.html -%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2513.html -%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2535.html -%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2557.html -%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2579.html -%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2600.html -%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2621.html -%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2646.html -%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2682.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2517.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2539.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2561.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2583.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2605.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2627.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2648.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2669.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2694.html %%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r270.html -%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2717.html -%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2745.html -%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2770.html -%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2791.html -%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2816.html -%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2841.html -%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2866.html -%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2892.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2730.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2765.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2793.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2818.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2839.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2864.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2889.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r291.html %%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2914.html -%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2936.html -%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r295.html -%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2958.html -%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2983.html -%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r3012.html -%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r3037.html -%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r3069.html -%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r3102.html -%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r3138.html -%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r3161.html -%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r3184.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2940.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2962.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2984.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r3006.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r3031.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r3060.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r3085.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r3117.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r3150.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r316.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r3186.html %%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r3209.html -%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r323.html %%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r3231.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r3254.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r3279.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r3306.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r3333.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r3355.html %%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r344.html -%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r372.html -%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r401.html -%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r476.html -%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r504.html -%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r591.html -%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r632.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r365.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r393.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r422.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r497.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r527.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r614.html %%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r655.html -%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r676.html -%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r704.html -%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r726.html -%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r750.html -%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r771.html -%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r792.html -%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r818.html -%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r839.html -%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r862.html -%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r883.html -%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r917.html -%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r940.html -%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r963.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r678.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r703.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r724.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r752.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r774.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r798.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r819.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r840.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r866.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r887.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r910.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r931.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r965.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r988.html %%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r99.html -%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r994.html %%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/x19.html %%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/x31.html %%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/x93.html %%PORTDOCS%%%%DOCSDIR%%/fontconfig-user.html +%%PORTDOCS%%%%DOCSDIR%%/fontconfig-user.pdf %%PORTDOCS%%%%DOCSDIR%%/fontconfig-user.txt %%PORTDOCS%%@dirrm %%DOCSDIR%%/fontconfig-devel %%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm include/fontconfig -@dirrm etc/fonts +@unexec rmdir %D/etc/fonts/conf.d 2> /dev/null || true +@unexec rmdir %D/etc/fonts 2> /dev/null || true diff --git a/x11-themes/gnome-backgrounds/Makefile b/x11-themes/gnome-backgrounds/Makefile index a5469984aea9..0ab7d6347375 100644 --- a/x11-themes/gnome-backgrounds/Makefile +++ b/x11-themes/gnome-backgrounds/Makefile @@ -3,13 +3,14 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/x11-themes/gnome-backgrounds/Makefile,v 1.11 2005/10/03 23:56:21 ahze Exp $ # PORTNAME= gnome-backgrounds -PORTVERSION= 2.10.2 +PORTVERSION= 2.12.1 CATEGORIES= x11-themes graphics gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.10 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.12 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org diff --git a/x11-themes/gnome-backgrounds/distinfo b/x11-themes/gnome-backgrounds/distinfo index 703c9e3f6a76..07ac1d4d25b4 100644 --- a/x11-themes/gnome-backgrounds/distinfo +++ b/x11-themes/gnome-backgrounds/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-backgrounds-2.10.2.tar.bz2) = 20b6cf2ed37c4b6ef4982dee0a5d9226 -SIZE (gnome2/gnome-backgrounds-2.10.2.tar.bz2) = 2264170 +MD5 (gnome2/gnome-backgrounds-2.12.1.tar.bz2) = 3f84adbe8c22e18033f10e8c506d601f +SIZE (gnome2/gnome-backgrounds-2.12.1.tar.bz2) = 1756483 diff --git a/x11-themes/gnome-backgrounds/pkg-plist b/x11-themes/gnome-backgrounds/pkg-plist index 04c340adda4f..adb7d59d46ad 100644 --- a/x11-themes/gnome-backgrounds/pkg-plist +++ b/x11-themes/gnome-backgrounds/pkg-plist @@ -8,11 +8,12 @@ share/gnome/pixmaps/backgrounds/gnome/branded/GNOME-Weirdcolours.jpg share/gnome/pixmaps/backgrounds/gnome/tiles/alien-artifact-trans.png share/gnome/pixmaps/backgrounds/gnome/tiles/cow-trans.png share/gnome/pixmaps/backgrounds/gnome/tiles/tiles-trans.png -share/gnome/pixmaps/backgrounds/gnome/translucent/ellipsis.png -share/gnome/pixmaps/backgrounds/gnome/translucent/rects.png -share/gnome/pixmaps/backgrounds/gnome/translucent/tentacles.png +share/gnome/pixmaps/backgrounds/gnome/translucent/ellipsis.svg +share/gnome/pixmaps/backgrounds/gnome/translucent/rects.svg +share/gnome/pixmaps/backgrounds/gnome/translucent/tentacles.svg share/locale/ar/LC_MESSAGES/gnome-backgrounds.mo share/locale/bg/LC_MESSAGES/gnome-backgrounds.mo +share/locale/bn/LC_MESSAGES/gnome-backgrounds.mo share/locale/ca/LC_MESSAGES/gnome-backgrounds.mo share/locale/cs/LC_MESSAGES/gnome-backgrounds.mo share/locale/cy/LC_MESSAGES/gnome-backgrounds.mo @@ -23,12 +24,14 @@ share/locale/en_CA/LC_MESSAGES/gnome-backgrounds.mo share/locale/en_GB/LC_MESSAGES/gnome-backgrounds.mo share/locale/es/LC_MESSAGES/gnome-backgrounds.mo share/locale/et/LC_MESSAGES/gnome-backgrounds.mo +share/locale/eu/LC_MESSAGES/gnome-backgrounds.mo share/locale/fa/LC_MESSAGES/gnome-backgrounds.mo share/locale/fi/LC_MESSAGES/gnome-backgrounds.mo share/locale/fr/LC_MESSAGES/gnome-backgrounds.mo share/locale/gl/LC_MESSAGES/gnome-backgrounds.mo share/locale/gu/LC_MESSAGES/gnome-backgrounds.mo share/locale/hi/LC_MESSAGES/gnome-backgrounds.mo +share/locale/hy/LC_MESSAGES/gnome-backgrounds.mo share/locale/hu/LC_MESSAGES/gnome-backgrounds.mo share/locale/id/LC_MESSAGES/gnome-backgrounds.mo share/locale/it/LC_MESSAGES/gnome-backgrounds.mo @@ -65,9 +68,11 @@ share/locale/zh_TW/LC_MESSAGES/gnome-backgrounds.mo @unexec rmdir %D/share/locale/rw 2> /dev/null || true @unexec rmdir %D/share/locale/ku/LC_MESSAGES 2> /dev/null || true @unexec rmdir %D/share/locale/ku 2> /dev/null || true +@unexec rmdir %D/share/locale/hy/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/hy 2> /dev/null || true @dirrm share/gnome/pixmaps/backgrounds/gnome/translucent @dirrm share/gnome/pixmaps/backgrounds/gnome/tiles @dirrm share/gnome/pixmaps/backgrounds/gnome/branded @dirrm share/gnome/pixmaps/backgrounds/gnome @dirrm share/gnome/pixmaps/backgrounds -@dirrm share/gnome/gnome-background-properties +@unexec /bin/rmdir %D/share/gnome/gnome-background-properties 2>/dev/null || /usr/bin/true diff --git a/x11-themes/gnome-themes/Makefile b/x11-themes/gnome-themes/Makefile index c491ed6d199c..7cfc2bf07b10 100644 --- a/x11-themes/gnome-themes/Makefile +++ b/x11-themes/gnome-themes/Makefile @@ -3,25 +3,30 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/x11-themes/gnome-themes/Makefile,v 1.75 2005/10/08 19:41:41 marcus Exp $ # PORTNAME= gnome-themes -PORTVERSION= 2.10.2 +PORTVERSION= 2.12.1 +PORTREVISION= 1 CATEGORIES= x11-themes gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.10 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.12 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org -COMMENT= A collection of themes and icons for GNOME2 designed for accessibility +COMMENT= A collection of themes and icons for GNOME2 BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/gtk-engines-2.pc:${PORTSDIR}/x11-themes/gtk-engines2 RUN_DEPENDS= ${X11BASE}/libdata/pkgconfig/gtk-engines-2.pc:${PORTSDIR}/x11-themes/gtk-engines2 +CONFLICTS= clearlooks-metacity-0.* + USE_BZIP2= yes USE_X_PREFIX= yes USE_REINPLACE= yes -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 +INSTALLS_ICONS= yes USE_GMAKE= yes USE_GNOME= gnomehack intlhack metacity libgnomeui CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/x11-themes/gnome-themes/distinfo b/x11-themes/gnome-themes/distinfo index 6a6e34cb67e0..10c67e29770a 100644 --- a/x11-themes/gnome-themes/distinfo +++ b/x11-themes/gnome-themes/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-themes-2.10.2.tar.bz2) = 53815aac541cc2d0302e94be4892a4ec -SIZE (gnome2/gnome-themes-2.10.2.tar.bz2) = 2563259 +MD5 (gnome2/gnome-themes-2.12.1.tar.bz2) = ab6d63ecb304506153fac3e958995ef4 +SIZE (gnome2/gnome-themes-2.12.1.tar.bz2) = 2561550 diff --git a/x11-themes/gnome-themes/pkg-plist b/x11-themes/gnome-themes/pkg-plist index 8f50bb423842..1a1c5e2ce58c 100644 --- a/x11-themes/gnome-themes/pkg-plist +++ b/x11-themes/gnome-themes/pkg-plist @@ -1,3 +1,4 @@ +share/gnome/themes/Clearlooks/metacity-1/metacity-theme-1.xml share/gnome/themes/Glider/metacity-1/metacity-theme-1.xml share/gnome/themes/Mist/metacity-1/metacity-theme-1.xml share/gnome/themes/Sandwish/metacity-1/active-border-top-left-border.png @@ -167,6 +168,7 @@ share/icons/HighContrastLargePrint/48x48/apps/acme-48.png share/icons/HighContrastLargePrint/48x48/apps/administration.png share/icons/HighContrastLargePrint/48x48/apps/advanced-directory.png share/icons/HighContrastLargePrint/48x48/apps/ax-applet.png +share/icons/HighContrastLargePrint/48x48/apps/battstat.png share/icons/HighContrastLargePrint/48x48/apps/charpick.png share/icons/HighContrastLargePrint/48x48/apps/clock.png share/icons/HighContrastLargePrint/48x48/apps/config-language.png @@ -174,6 +176,7 @@ share/icons/HighContrastLargePrint/48x48/apps/config-users.png share/icons/HighContrastLargePrint/48x48/apps/config-xfree.png share/icons/HighContrastLargePrint/48x48/apps/disks.png share/icons/HighContrastLargePrint/48x48/apps/display-capplet.png +share/icons/HighContrastLargePrint/48x48/apps/drivemount-applet.png share/icons/HighContrastLargePrint/48x48/apps/evolution-1.4.png share/icons/HighContrastLargePrint/48x48/apps/evolution.png share/icons/HighContrastLargePrint/48x48/apps/file-manager.png @@ -184,12 +187,14 @@ share/icons/HighContrastLargePrint/48x48/apps/gataxx.png share/icons/HighContrastLargePrint/48x48/apps/gcalctool.png share/icons/HighContrastLargePrint/48x48/apps/gconf-editor.png share/icons/HighContrastLargePrint/48x48/apps/gdict.png +share/icons/HighContrastLargePrint/48x48/apps/gdm-setup.png +share/icons/HighContrastLargePrint/48x48/apps/gdm-xnest.png share/icons/HighContrastLargePrint/48x48/apps/gdm.png share/icons/HighContrastLargePrint/48x48/apps/gedit-icon.png share/icons/HighContrastLargePrint/48x48/apps/gkb.png share/icons/HighContrastLargePrint/48x48/apps/glade-2.png share/icons/HighContrastLargePrint/48x48/apps/glines.png -share/icons/HighContrastLargePrint/48x48/apps/glow.png +share/icons/HighContrastLargePrint/48x48/apps/glow-app-icon.png share/icons/HighContrastLargePrint/48x48/apps/gnect-icon.png share/icons/HighContrastLargePrint/48x48/apps/gnome-application-generic.png share/icons/HighContrastLargePrint/48x48/apps/gnome-applications.png @@ -205,7 +210,6 @@ share/icons/HighContrastLargePrint/48x48/apps/gnome-desktop-config.png share/icons/HighContrastLargePrint/48x48/apps/gnome-devel.png share/icons/HighContrastLargePrint/48x48/apps/gnome-eog.png share/icons/HighContrastLargePrint/48x48/apps/gnome-folder-generic.png -share/icons/HighContrastLargePrint/48x48/apps/gnome-folder.png share/icons/HighContrastLargePrint/48x48/apps/gnome-ftp.png share/icons/HighContrastLargePrint/48x48/apps/gnome-ghex.png share/icons/HighContrastLargePrint/48x48/apps/gnome-ghostview.png @@ -230,6 +234,7 @@ share/icons/HighContrastLargePrint/48x48/apps/gnome-mini-commander.png share/icons/HighContrastLargePrint/48x48/apps/gnome-mixer-applet.png share/icons/HighContrastLargePrint/48x48/apps/gnome-mixer.png share/icons/HighContrastLargePrint/48x48/apps/gnome-modem.png +share/icons/HighContrastLargePrint/48x48/apps/gnome-money.png share/icons/HighContrastLargePrint/48x48/apps/gnome-monitor.png share/icons/HighContrastLargePrint/48x48/apps/gnome-multimedia.png share/icons/HighContrastLargePrint/48x48/apps/gnome-nibbles.png @@ -270,6 +275,7 @@ share/icons/HighContrastLargePrint/48x48/apps/gnomemeeting-logo-icon.png share/icons/HighContrastLargePrint/48x48/apps/gnopernicus.png share/icons/HighContrastLargePrint/48x48/apps/gnotski-icon.png share/icons/HighContrastLargePrint/48x48/apps/gok.png +share/icons/HighContrastLargePrint/48x48/apps/gswitchit-applet.png share/icons/HighContrastLargePrint/48x48/apps/gthumb.png share/icons/HighContrastLargePrint/48x48/apps/gtkam-camera.png share/icons/HighContrastLargePrint/48x48/apps/gucharmap.png @@ -287,15 +293,16 @@ share/icons/HighContrastLargePrint/48x48/apps/logviewer.png share/icons/HighContrastLargePrint/48x48/apps/media-player-48.png share/icons/HighContrastLargePrint/48x48/apps/mozilla-icon.png share/icons/HighContrastLargePrint/48x48/apps/nb48x48.png +share/icons/HighContrastLargePrint/48x48/apps/netapplet.png share/icons/HighContrastLargePrint/48x48/apps/network-config.png share/icons/HighContrastLargePrint/48x48/apps/network.png +share/icons/HighContrastLargePrint/48x48/apps/panel-notification-area.png share/icons/HighContrastLargePrint/48x48/apps/password.png share/icons/HighContrastLargePrint/48x48/apps/perfmeter.png share/icons/HighContrastLargePrint/48x48/apps/postscript-viewer.png share/icons/HighContrastLargePrint/48x48/apps/procman.png +share/icons/HighContrastLargePrint/48x48/apps/quick-lounge-applet.png share/icons/HighContrastLargePrint/48x48/apps/realplay.png -share/icons/HighContrastLargePrint/48x48/apps/realplayer.xpm -share/icons/HighContrastLargePrint/48x48/apps/rp7.xpm share/icons/HighContrastLargePrint/48x48/apps/screensaver.png share/icons/HighContrastLargePrint/48x48/apps/serviceconf.png share/icons/HighContrastLargePrint/48x48/apps/sound-capplet.png @@ -303,8 +310,10 @@ share/icons/HighContrastLargePrint/48x48/apps/star.png share/icons/HighContrastLargePrint/48x48/apps/staroffice-calc.png share/icons/HighContrastLargePrint/48x48/apps/staroffice-impress.png share/icons/HighContrastLargePrint/48x48/apps/staroffice-writer.png +share/icons/HighContrastLargePrint/48x48/apps/stock_notes.png share/icons/HighContrastLargePrint/48x48/apps/stock_proxy.png share/icons/HighContrastLargePrint/48x48/apps/stock_timezone.png +share/icons/HighContrastLargePrint/48x48/apps/stock_weather-storm.png share/icons/HighContrastLargePrint/48x48/apps/sun_java.png share/icons/HighContrastLargePrint/48x48/apps/web-browser.png share/icons/HighContrastLargePrint/48x48/apps/window-capplet.png @@ -318,6 +327,8 @@ share/icons/HighContrastLargePrint/48x48/devices/gnome-dev-jazdisk.png share/icons/HighContrastLargePrint/48x48/devices/gnome-dev-keyboard.png share/icons/HighContrastLargePrint/48x48/devices/gnome-dev-mouse-ball.png share/icons/HighContrastLargePrint/48x48/devices/gnome-dev-mouse-optical.png +share/icons/HighContrastLargePrint/48x48/devices/gnome-dev-printer-network.png +share/icons/HighContrastLargePrint/48x48/devices/gnome-dev-printer-new.png share/icons/HighContrastLargePrint/48x48/devices/gnome-dev-printer.png share/icons/HighContrastLargePrint/48x48/devices/gnome-dev-removable.png share/icons/HighContrastLargePrint/48x48/devices/gnome-dev-zipdisk.png @@ -536,6 +547,7 @@ share/icons/HighContrastLargePrintInverse/48x48/apps/acme-48.png share/icons/HighContrastLargePrintInverse/48x48/apps/administration.png share/icons/HighContrastLargePrintInverse/48x48/apps/advanced-directory.png share/icons/HighContrastLargePrintInverse/48x48/apps/ax-applet.png +share/icons/HighContrastLargePrintInverse/48x48/apps/battstat.png share/icons/HighContrastLargePrintInverse/48x48/apps/charpick.png share/icons/HighContrastLargePrintInverse/48x48/apps/clock.png share/icons/HighContrastLargePrintInverse/48x48/apps/config-language.png @@ -543,6 +555,7 @@ share/icons/HighContrastLargePrintInverse/48x48/apps/config-users.png share/icons/HighContrastLargePrintInverse/48x48/apps/config-xfree.png share/icons/HighContrastLargePrintInverse/48x48/apps/disks.png share/icons/HighContrastLargePrintInverse/48x48/apps/display-capplet.png +share/icons/HighContrastLargePrintInverse/48x48/apps/drivemount-applet.png share/icons/HighContrastLargePrintInverse/48x48/apps/evolution-1.4.png share/icons/HighContrastLargePrintInverse/48x48/apps/evolution.png share/icons/HighContrastLargePrintInverse/48x48/apps/file-manager.png @@ -553,12 +566,14 @@ share/icons/HighContrastLargePrintInverse/48x48/apps/gataxx.png share/icons/HighContrastLargePrintInverse/48x48/apps/gcalctool.png share/icons/HighContrastLargePrintInverse/48x48/apps/gconf-editor.png share/icons/HighContrastLargePrintInverse/48x48/apps/gdict.png +share/icons/HighContrastLargePrintInverse/48x48/apps/gdm-setup.png +share/icons/HighContrastLargePrintInverse/48x48/apps/gdm-xnest.png share/icons/HighContrastLargePrintInverse/48x48/apps/gdm.png share/icons/HighContrastLargePrintInverse/48x48/apps/gedit-icon.png share/icons/HighContrastLargePrintInverse/48x48/apps/gkb.png share/icons/HighContrastLargePrintInverse/48x48/apps/glade-2.png share/icons/HighContrastLargePrintInverse/48x48/apps/glines.png -share/icons/HighContrastLargePrintInverse/48x48/apps/glow.png +share/icons/HighContrastLargePrintInverse/48x48/apps/glow-app-icon.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnect-icon.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-application-generic.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-applications.png @@ -574,7 +589,6 @@ share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-desktop-config.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-devel.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-eog.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-folder-generic.png -share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-folder.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-ftp.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-ghex.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-ghostview.png @@ -599,6 +613,7 @@ share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-mini-commander.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-mixer-applet.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-mixer.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-modem.png +share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-money.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-monitor.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-multimedia.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-nibbles.png @@ -639,6 +654,7 @@ share/icons/HighContrastLargePrintInverse/48x48/apps/gnomemeeting-logo-icon.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnopernicus.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnotski-icon.png share/icons/HighContrastLargePrintInverse/48x48/apps/gok.png +share/icons/HighContrastLargePrintInverse/48x48/apps/gswitchit-applet.png share/icons/HighContrastLargePrintInverse/48x48/apps/gthumb.png share/icons/HighContrastLargePrintInverse/48x48/apps/gtkam-camera.png share/icons/HighContrastLargePrintInverse/48x48/apps/gucharmap.png @@ -656,15 +672,16 @@ share/icons/HighContrastLargePrintInverse/48x48/apps/logviewer.png share/icons/HighContrastLargePrintInverse/48x48/apps/media-player-48.png share/icons/HighContrastLargePrintInverse/48x48/apps/mozilla-icon.png share/icons/HighContrastLargePrintInverse/48x48/apps/nb48x48.png +share/icons/HighContrastLargePrintInverse/48x48/apps/netapplet.png share/icons/HighContrastLargePrintInverse/48x48/apps/network-config.png share/icons/HighContrastLargePrintInverse/48x48/apps/network.png +share/icons/HighContrastLargePrintInverse/48x48/apps/panel-notification-area.png share/icons/HighContrastLargePrintInverse/48x48/apps/password.png share/icons/HighContrastLargePrintInverse/48x48/apps/perfmeter.png share/icons/HighContrastLargePrintInverse/48x48/apps/postscript-viewer.png share/icons/HighContrastLargePrintInverse/48x48/apps/procman.png +share/icons/HighContrastLargePrintInverse/48x48/apps/quick-lounge-applet.png share/icons/HighContrastLargePrintInverse/48x48/apps/realplay.png -share/icons/HighContrastLargePrintInverse/48x48/apps/realplayer.xpm -share/icons/HighContrastLargePrintInverse/48x48/apps/rp7.xpm share/icons/HighContrastLargePrintInverse/48x48/apps/screensaver.png share/icons/HighContrastLargePrintInverse/48x48/apps/serviceconf.png share/icons/HighContrastLargePrintInverse/48x48/apps/sound-capplet.png @@ -672,8 +689,10 @@ share/icons/HighContrastLargePrintInverse/48x48/apps/star.png share/icons/HighContrastLargePrintInverse/48x48/apps/staroffice-calc.png share/icons/HighContrastLargePrintInverse/48x48/apps/staroffice-impress.png share/icons/HighContrastLargePrintInverse/48x48/apps/staroffice-writer.png +share/icons/HighContrastLargePrintInverse/48x48/apps/stock_notes.png share/icons/HighContrastLargePrintInverse/48x48/apps/stock_proxy.png share/icons/HighContrastLargePrintInverse/48x48/apps/stock_timezone.png +share/icons/HighContrastLargePrintInverse/48x48/apps/stock_weather-storm.png share/icons/HighContrastLargePrintInverse/48x48/apps/sun_java.png share/icons/HighContrastLargePrintInverse/48x48/apps/web-browser.png share/icons/HighContrastLargePrintInverse/48x48/apps/window-capplet.png @@ -687,6 +706,8 @@ share/icons/HighContrastLargePrintInverse/48x48/devices/gnome-dev-jazdisk.png share/icons/HighContrastLargePrintInverse/48x48/devices/gnome-dev-keyboard.png share/icons/HighContrastLargePrintInverse/48x48/devices/gnome-dev-mouse-ball.png share/icons/HighContrastLargePrintInverse/48x48/devices/gnome-dev-mouse-optical.png +share/icons/HighContrastLargePrintInverse/48x48/devices/gnome-dev-printer-network.png +share/icons/HighContrastLargePrintInverse/48x48/devices/gnome-dev-printer-new.png share/icons/HighContrastLargePrintInverse/48x48/devices/gnome-dev-printer.png share/icons/HighContrastLargePrintInverse/48x48/devices/gnome-dev-removable.png share/icons/HighContrastLargePrintInverse/48x48/devices/gnome-dev-zipdisk.png @@ -976,6 +997,9 @@ share/icons/LowContrastLargePrint/48x48/devices/gnome-dev-jazdisk.png share/icons/LowContrastLargePrint/48x48/devices/gnome-dev-keyboard.png share/icons/LowContrastLargePrint/48x48/devices/gnome-dev-memory.png share/icons/LowContrastLargePrint/48x48/devices/gnome-dev-mouse-optical.png +share/icons/LowContrastLargePrint/48x48/devices/gnome-dev-printer-network.png +share/icons/LowContrastLargePrint/48x48/devices/gnome-dev-printer-new.png +share/icons/LowContrastLargePrint/48x48/devices/gnome-dev-printer.png share/icons/LowContrastLargePrint/48x48/devices/gnome-dev-zipdisk.png share/icons/LowContrastLargePrint/48x48/emblems/emblem-art.png share/icons/LowContrastLargePrint/48x48/emblems/emblem-camera.png @@ -1255,6 +1279,7 @@ share/locale/wa/LC_MESSAGES/gnome-themes.mo share/locale/xh/LC_MESSAGES/gnome-themes.mo share/locale/zh_CN/LC_MESSAGES/gnome-themes.mo share/locale/zh_TW/LC_MESSAGES/gnome-themes.mo +share/themes/Clearlooks/index.theme share/themes/Crux/index.theme share/themes/Glider/gtk-2.0/gtkrc share/themes/Glider/index.theme @@ -1907,12 +1932,9 @@ share/themes/Traditional/index.theme @dirrm share/themes/Glider/gtk-2.0 @dirrm share/themes/Glider @dirrm share/themes/Crux -@unexec rmdir %D/share/locale/xh/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/xh 2> /dev/null || true +@dirrm share/themes/Clearlooks @unexec rmdir %D/share/locale/ug/LC_MESSAGES 2> /dev/null || true @unexec rmdir %D/share/locale/ug 2> /dev/null || true -@unexec rmdir %D/share/locale/rw/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/rw 2> /dev/null || true @dirrm share/icons/Smokey-Red/96x96/filesystems @dirrm share/icons/Smokey-Red/96x96 @dirrm share/icons/Smokey-Red/72x72/filesystems @@ -2023,4 +2045,6 @@ share/themes/Traditional/index.theme @dirrm share/gnome/themes/Mist @dirrm share/gnome/themes/Glider/metacity-1 @dirrm share/gnome/themes/Glider +@dirrm share/gnome/themes/Clearlooks/metacity-1 +@dirrm share/gnome/themes/Clearlooks @unexec /bin/rmdir %D/share/icons 2>/dev/null || /usr/bin/true diff --git a/x11-themes/gtk-engines2/Makefile b/x11-themes/gtk-engines2/Makefile index 45e178f6bb6f..d2272c2458e0 100644 --- a/x11-themes/gtk-engines2/Makefile +++ b/x11-themes/gtk-engines2/Makefile @@ -3,10 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/x11-themes/gtk-engines2/Makefile,v 1.10 2005/09/07 05:44:23 marcus Exp $ # PORTNAME= gtk-engines2 -PORTVERSION= 2.6.4 +PORTVERSION= 2.6.5 +PORTREVISION= 2 CATEGORIES= x11-themes MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.6 @@ -21,7 +23,7 @@ CONFLICTS= gtk-smooth-engine-[0-9]* clearlooks-[0-9]* USE_BZIP2= yes USE_X_PREFIX= yes USE_REINPLACE= yes -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 USE_GNOME= gnomehack gtk20 PLIST_SUB= GTK_VERSION="2.4.0" diff --git a/x11-themes/gtk-engines2/distinfo b/x11-themes/gtk-engines2/distinfo index de098903150a..f9922ae6e745 100644 --- a/x11-themes/gtk-engines2/distinfo +++ b/x11-themes/gtk-engines2/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gtk-engines-2.6.4.tar.bz2) = 3389a92b62b9c8b916fbb52c4529f072 -SIZE (gnome2/gtk-engines-2.6.4.tar.bz2) = 477425 +MD5 (gnome2/gtk-engines-2.6.5.tar.bz2) = 28469a797ba1e6aaa3f7eea4c9f5f9b7 +SIZE (gnome2/gtk-engines-2.6.5.tar.bz2) = 477897 diff --git a/x11-themes/gtk-engines2/files/patch-clearlooks-symbol-conflict b/x11-themes/gtk-engines2/files/patch-clearlooks-symbol-conflict new file mode 100644 index 000000000000..0d742c2ec86f --- /dev/null +++ b/x11-themes/gtk-engines2/files/patch-clearlooks-symbol-conflict @@ -0,0 +1,54 @@ +--- engines/clearlooks/src/clearlooks_style.c.orig Wed Sep 7 01:41:42 2005 ++++ engines/clearlooks/src/clearlooks_style.c Wed Sep 7 01:41:49 2005 +@@ -178,7 +178,7 @@ clearlooks_draw_arrow (GtkStyle *st + + sanitize_size (window, &width, &height); + +- if (is_combo_box (widget)) ++ if (is_combo_box_cl (widget)) + { + width = 7; + height = 5; +--- engines/clearlooks/src/support.c.orig Wed Sep 7 01:40:25 2005 ++++ engines/clearlooks/src/support.c Wed Sep 7 01:40:59 2005 +@@ -959,7 +959,7 @@ GdkColor *get_parent_bgcolor (GtkWidget + } + + GtkWidget * +-find_combo_box_widget (GtkWidget * widget) ++find_combo_box_widget_cl (GtkWidget * widget) + { + GtkWidget *result = NULL; + +@@ -968,14 +968,14 @@ find_combo_box_widget (GtkWidget * widge + if (GTK_IS_COMBO_BOX (widget)) + result = widget; + else +- result = find_combo_box_widget(widget->parent); ++ result = find_combo_box_widget_cl(widget->parent); + } + + return result; + } + + gboolean +-is_combo_box (GtkWidget * widget) ++is_combo_box_cl (GtkWidget * widget) + { +- return (find_combo_box_widget(widget) != NULL); ++ return (find_combo_box_widget_cl(widget) != NULL); + } +--- engines/clearlooks/src/support.h.orig Wed Sep 7 01:41:03 2005 ++++ engines/clearlooks/src/support.h Wed Sep 7 01:41:17 2005 +@@ -102,9 +102,9 @@ GtkWidget *get_parent_window (GtkWidget + + GdkColor *get_parent_bgcolor (GtkWidget *widget); + +-gboolean is_combo_box (GtkWidget * widget); ++gboolean is_combo_box_cl (GtkWidget * widget); + +-GtkWidget *find_combo_box_widget (GtkWidget * widget); ++GtkWidget *find_combo_box_widget_cl (GtkWidget * widget); + + void gtk_clist_get_header_index (GtkCList *clist, GtkWidget *button, + gint *column_index, gint *columns); diff --git a/x11-themes/gtk-engines2/files/patch-engines_crux_src_crux-draw.c b/x11-themes/gtk-engines2/files/patch-engines_crux_src_crux-draw.c new file mode 100644 index 000000000000..371abad8e669 --- /dev/null +++ b/x11-themes/gtk-engines2/files/patch-engines_crux_src_crux-draw.c @@ -0,0 +1,20 @@ +--- engines/crux/src/crux-draw.c.orig Wed Aug 24 12:45:47 2005 ++++ engines/crux/src/crux-draw.c Wed Aug 24 12:46:08 2005 +@@ -2323,6 +2323,8 @@ draw_extension (GtkStyle *style, + GdkRectangle rect; + + eazel_theme_data *theme_data; ++ GtkWidget* parent_widget; ++ gint relative_x; + + g_return_if_fail (style != NULL); + g_return_if_fail (window != NULL); +@@ -2334,8 +2336,6 @@ draw_extension (GtkStyle *style, + detail, state_type, shadow_type, x, y, width, height); + + /* Get x relative to parent widget, not window */ +- GtkWidget* parent_widget; +- gint relative_x; + if (widget != NULL) + { + parent_widget = gtk_widget_get_parent(widget); diff --git a/x11-toolkits/eel/Makefile b/x11-toolkits/eel/Makefile index c933c7ef01c8..79e7f2e4b5b6 100644 --- a/x11-toolkits/eel/Makefile +++ b/x11-toolkits/eel/Makefile @@ -3,14 +3,14 @@ # Whom: Ade Lovett <ade@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/x11-toolkits/eel/Makefile,v 1.21 2005/10/03 15:22:10 ahze Exp $ # PORTNAME= eel -PORTVERSION= 2.10.1 -PORTREVISION= 1 +PORTVERSION= 2.12.1 CATEGORIES= x11-toolkits gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.10 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.12 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -20,8 +20,8 @@ USE_BZIP2= yes USE_GMAKE= yes USE_X_PREFIX= yes GNOME_DESKTOP_VERSION=2 -USE_GNOME= gnomeprefix gnomehack gail gnomedesktop gnomemenus -USE_LIBTOOL_VER=15 +USE_GNOME= gnomeprefix gnomehack gail gnomedesktop gnomemenus ltverhack +USE_AUTOTOOLS= libtool:15 USE_REINPLACE= yes INSTALLS_SHLIB= yes CONFIGURE_ARGS= --enable-shared --enable-static diff --git a/x11-toolkits/eel/distinfo b/x11-toolkits/eel/distinfo index ec66f59e89d3..aaf75b416b95 100644 --- a/x11-toolkits/eel/distinfo +++ b/x11-toolkits/eel/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/eel-2.10.1.tar.bz2) = 2978fae17565dfb6e2d7ca129e738b9d -SIZE (gnome2/eel-2.10.1.tar.bz2) = 672143 +MD5 (gnome2/eel-2.12.1.tar.bz2) = 08281630bef2e2f957ec2c349d73d112 +SIZE (gnome2/eel-2.12.1.tar.bz2) = 675963 diff --git a/x11-toolkits/eel/files/patch-Makefile.in b/x11-toolkits/eel/files/patch-Makefile.in index c3cb2f239196..eaa3dc117279 100644 --- a/x11-toolkits/eel/files/patch-Makefile.in +++ b/x11-toolkits/eel/files/patch-Makefile.in @@ -1,5 +1,6 @@ $FreeBSD$ + $MCom: ports/x11-toolkits/eel/files/patch-Makefile.in,v 1.4 2005/06/28 05:40:14 adamw Exp $ --- Makefile.in 2002/06/13 16:05:09 1.1 +++ Makefile.in 2002/06/13 16:05:18 diff --git a/x11-toolkits/eel/pkg-plist b/x11-toolkits/eel/pkg-plist index 5bd16dbe783a..901b8bff6687 100644 --- a/x11-toolkits/eel/pkg-plist +++ b/x11-toolkits/eel/pkg-plist @@ -46,7 +46,7 @@ include/eel-2/eel/eel-xml-extensions.h include/eel-2/eel/eel.h lib/libeel-2.a lib/libeel-2.so -lib/libeel-2.so.12 +lib/libeel-2.so.2 libdata/pkgconfig/eel-2.0.pc share/locale/am/LC_MESSAGES/eel-2.0.mo share/locale/ang/LC_MESSAGES/eel-2.0.mo @@ -114,6 +114,7 @@ share/locale/sv/LC_MESSAGES/eel-2.0.mo share/locale/ta/LC_MESSAGES/eel-2.0.mo share/locale/th/LC_MESSAGES/eel-2.0.mo share/locale/tr/LC_MESSAGES/eel-2.0.mo +share/locale/ug/LC_MESSAGES/eel-2.0.mo share/locale/uk/LC_MESSAGES/eel-2.0.mo share/locale/vi/LC_MESSAGES/eel-2.0.mo share/locale/wa/LC_MESSAGES/eel-2.0.mo @@ -122,6 +123,8 @@ share/locale/zh_CN/LC_MESSAGES/eel-2.0.mo share/locale/zh_TW/LC_MESSAGES/eel-2.0.mo @unexec rmdir %D/share/locale/xh/LC_MESSAGES 2> /dev/null || true @unexec rmdir %D/share/locale/xh 2> /dev/null || true +@unexec rmdir %D/share/locale/ug/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/ug 2> /dev/null || true @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/ang/LC_MESSAGES 2> /dev/null || true diff --git a/x11-toolkits/gal2/Makefile b/x11-toolkits/gal2/Makefile index da148b95ed6e..ca84b9d42e2d 100644 --- a/x11-toolkits/gal2/Makefile +++ b/x11-toolkits/gal2/Makefile @@ -3,13 +3,14 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/x11-toolkits/gal2/Makefile,v 1.52 2005/08/19 13:26:41 marcus Exp $ # PORTNAME= gal2 -PORTVERSION= 2.4.3 +PORTVERSION= 2.5.3 CATEGORIES= x11-toolkits gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.4 +MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.5 DISTNAME= ${PORTNAME:S/2$//}-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -21,17 +22,22 @@ USE_X_PREFIX= yes USE_REINPLACE= yes USE_PERL5= yes USE_GMAKE= yes -USE_GNOME= gnomehack gnomeprefix intlhack libgnomeui libgnomeprintui +USE_GNOME= gnomehack gnomeprefix intlhack libgnomeui libgnomeprintui \ + ltverhack INSTALLS_SHLIB= yes -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 CONFIGURE_ARGS= --enable-static --with-libiconv CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -PLIST_SUB= VERSION="2.4" PORTVERSION=${PORTVERSION} +PLIST_SUB= VERSION="2.6" PORTVERSION=${PORTVERSION} \ + SHLIBVERSION="2.4" .include <bsd.port.pre.mk> +post-extract: + ${TOUCH} -f ${WRKSRC}/gal/util/e-util-private.h + post-patch: .if ( ${OSVERSION} > 600000 && ${OSVERSION} < 600006 ) || \ ( ${OSVERSION} < 503101 ) diff --git a/x11-toolkits/gal2/distinfo b/x11-toolkits/gal2/distinfo index 036606f5fcdd..bc3f355aa0a5 100644 --- a/x11-toolkits/gal2/distinfo +++ b/x11-toolkits/gal2/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gal-2.4.3.tar.bz2) = de9ef290fd614a1057e26e31bc294142 -SIZE (gnome2/gal-2.4.3.tar.bz2) = 1056344 +MD5 (gnome2/gal-2.5.3.tar.bz2) = 8fae770488887f9d0f95bcdbffc673cc +SIZE (gnome2/gal-2.5.3.tar.bz2) = 1153998 diff --git a/x11-toolkits/gal2/files/patch-gal_widgets_e-canvas.c b/x11-toolkits/gal2/files/patch-gal_widgets_e-canvas.c deleted file mode 100644 index 10dc71d4cb9f..000000000000 --- a/x11-toolkits/gal2/files/patch-gal_widgets_e-canvas.c +++ /dev/null @@ -1,11 +0,0 @@ ---- gal/widgets/e-canvas.c.orig Tue May 24 01:16:33 2005 -+++ gal/widgets/e-canvas.c Tue May 24 01:16:51 2005 -@@ -1015,7 +1015,7 @@ void e_canvas_popup_tooltip (ECanvas *ca - - void e_canvas_hide_tooltip (ECanvas *canvas) - { -- if (canvas->tooltip_window) { -+ if (canvas && canvas->tooltip_window) { - gtk_widget_destroy (canvas->tooltip_window); - canvas->tooltip_window = NULL; - } diff --git a/x11-toolkits/gal2/pkg-plist b/x11-toolkits/gal2/pkg-plist index ba5831247aa9..3c7ce3862c55 100644 --- a/x11-toolkits/gal2/pkg-plist +++ b/x11-toolkits/gal2/pkg-plist @@ -7,6 +7,7 @@ include/gal-%%VERSION%%/gal/a11y/e-table/gal-a11y-e-cell-vbox.h include/gal-%%VERSION%%/gal/a11y/e-table/gal-a11y-e-cell.h include/gal-%%VERSION%%/gal/a11y/e-table/gal-a11y-e-table-click-to-add-factory.h include/gal-%%VERSION%%/gal/a11y/e-table/gal-a11y-e-table-click-to-add.h +include/gal-%%VERSION%%/gal/a11y/e-table/gal-a11y-e-table-column-header.h include/gal-%%VERSION%%/gal/a11y/e-table/gal-a11y-e-table-factory.h include/gal-%%VERSION%%/gal/a11y/e-table/gal-a11y-e-table-item-factory.h include/gal-%%VERSION%%/gal/a11y/e-table/gal-a11y-e-table-item.h @@ -148,20 +149,115 @@ include/gal-%%VERSION%%/gal/widgets/gal-combo-stack.h include/gal-%%VERSION%%/gal/widgets/gal-combo-text.h include/gal-%%VERSION%%/gal/widgets/widget-color-combo.h include/gal-%%VERSION%%/gal/widgets/widget-pixmap-combo.h -lib/libgal-%%VERSION%%.a -lib/libgal-%%VERSION%%.so -lib/libgal-%%VERSION%%.so.0 -lib/libgal-a11y-%%VERSION%%.a -lib/libgal-a11y-%%VERSION%%.so -lib/libgal-a11y-%%VERSION%%.so.0 +lib/libgal-%%SHLIBVERSION%%.a +lib/libgal-%%SHLIBVERSION%%.so +lib/libgal-%%SHLIBVERSION%%.so.0 +lib/libgal-a11y-%%SHLIBVERSION%%.a +lib/libgal-a11y-%%SHLIBVERSION%%.so +lib/libgal-a11y-%%SHLIBVERSION%%.so.0 libdata/pkgconfig/gal-%%VERSION%%.pc -share/doc/gal-%%VERSION%%/gal-api.html -share/doc/gal-%%VERSION%%/gal-api.sgml -share/doc/gal-%%VERSION%%/gal-decl.txt -share/doc/gal-%%VERSION%%/gal-sections.txt -share/doc/gal-%%VERSION%%/gal.hierarchy -share/doc/gal-%%VERSION%%/gal.signals -share/doc/gal-%%VERSION%%/gal.types +share/doc/gal/book1.html +share/doc/gal/cell-renderers.html +share/doc/gal/combo-boxes.html +share/doc/gal/cut-and-paste.html +share/doc/gal/e-font.html +share/doc/gal/e-table-core.html +share/doc/gal/e-table.html +share/doc/gal/e-text.html +share/doc/gal/ecanvas.html +share/doc/gal/ecanvasvbox.html +share/doc/gal/ecell.html +share/doc/gal/ecellcheckbox.html +share/doc/gal/ecelltext.html +share/doc/gal/ecelltoggle.html +share/doc/gal/ecelltree.html +share/doc/gal/eentry.html +share/doc/gal/ehpaned.html +share/doc/gal/ehscrollbar.html +share/doc/gal/epaned.html +share/doc/gal/eprintable.html +share/doc/gal/ereflow.html +share/doc/gal/ereflowsorted.html +share/doc/gal/escrollframe.html +share/doc/gal/etable.html +share/doc/gal/etableclicktoadd.html +share/doc/gal/etablecol.html +share/doc/gal/etablecolumnspecification.html +share/doc/gal/etableconfig.html +share/doc/gal/etableconfigfield.html +share/doc/gal/etableextras.html +share/doc/gal/etablefieldchooser.html +share/doc/gal/etablefieldchooserdialog.html +share/doc/gal/etablefieldchooseritem.html +share/doc/gal/etablegroup.html +share/doc/gal/etablegroupcontainer.html +share/doc/gal/etablegroupleaf.html +share/doc/gal/etableheader.html +share/doc/gal/etableheaderitem.html +share/doc/gal/etableitem.html +share/doc/gal/etablemodel.html +share/doc/gal/etableone.html +share/doc/gal/etablescrolled.html +share/doc/gal/etableselectionmodel.html +share/doc/gal/etablesimple.html +share/doc/gal/etablesorted.html +share/doc/gal/etablesortedvariable.html +share/doc/gal/etablesorter.html +share/doc/gal/etablesortinfo.html +share/doc/gal/etablespecification.html +share/doc/gal/etablestate.html +share/doc/gal/etablesubset.html +share/doc/gal/etablesubsetvariable.html +share/doc/gal/etabletextmodel.html +share/doc/gal/etext.html +share/doc/gal/etexteventprocessor.html +share/doc/gal/etexteventprocessoremacslike.html +share/doc/gal/etextmodel.html +share/doc/gal/etreesimple.html +share/doc/gal/evpaned.html +share/doc/gal/evscrollbar.html +share/doc/gal/gal-api.html +share/doc/gal/gal-api.sgml +share/doc/gal/gal-colorcombo.html +share/doc/gal/gal-colorgroup.html +share/doc/gal/gal-colorpalette.html +share/doc/gal/gal-decl.txt +share/doc/gal/gal-e-cache.html +share/doc/gal/gal-e-canvas-utils.html +share/doc/gal/gal-e-colors.html +share/doc/gal/gal-e-cursors.html +share/doc/gal/gal-e-font.html +share/doc/gal/gal-e-gui-utils.html +share/doc/gal/gal-e-popup-menu.html +share/doc/gal/gal-e-table-col-dnd.html +share/doc/gal/gal-e-table-defines.html +share/doc/gal/gal-e-table-header-utils.html +share/doc/gal/gal-e-table-tooltip.html +share/doc/gal/gal-e-table-tree.html +share/doc/gal/gal-e-text-event-processor-types.html +share/doc/gal/gal-e-tree-model.html +share/doc/gal/gal-e-unicode.html +share/doc/gal/gal-e-util.html +share/doc/gal/gal-e-xml-utils.html +share/doc/gal/gal-gtkcombobox.html +share/doc/gal/gal-sections.txt +share/doc/gal/gal.hierarchy +share/doc/gal/gal.signals +share/doc/gal/gal.types +share/doc/gal/galdefineviewsdialog.html +share/doc/gal/galdefineviewsmodel.html +share/doc/gal/galview.html +share/doc/gal/galviewcollection.html +share/doc/gal/galviewetable.html +share/doc/gal/galviewfactory.html +share/doc/gal/galviewfactoryetable.html +share/doc/gal/galviewnewdialog.html +share/doc/gal/gtkcombostack.html +share/doc/gal/gtkcombotext.html +share/doc/gal/pixmapcombo.html +share/doc/gal/reflow.html +share/doc/gal/utility-widgets.html +share/doc/gal/view-configurationt.html share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/glade/e-categories-master-list-dialog.glade share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/glade/e-table-config-no-group.glade share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/glade/e-table-config.glade @@ -224,6 +320,7 @@ share/locale/lv/LC_MESSAGES/gal-%%VERSION%%.mo share/locale/mn/LC_MESSAGES/gal-%%VERSION%%.mo share/locale/ms/LC_MESSAGES/gal-%%VERSION%%.mo share/locale/nb/LC_MESSAGES/gal-%%VERSION%%.mo +share/locale/ne/LC_MESSAGES/gal-%%VERSION%%.mo share/locale/nl/LC_MESSAGES/gal-%%VERSION%%.mo share/locale/nn/LC_MESSAGES/gal-%%VERSION%%.mo share/locale/no/LC_MESSAGES/gal-%%VERSION%%.mo @@ -253,7 +350,7 @@ share/locale/zh_TW/LC_MESSAGES/gal-%%VERSION%%.mo @dirrm share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/glade @dirrm share/gnome/gal-%%VERSION%%/%%PORTVERSION%% @dirrm share/gnome/gal-%%VERSION%% -@dirrm share/doc/gal-%%VERSION%% +@dirrm share/doc/gal @dirrm include/gal-%%VERSION%%/gal/widgets @dirrm include/gal-%%VERSION%%/gal/util @dirrm include/gal-%%VERSION%%/gal/shortcut-bar diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile index 3001ebcaaaad..014cf40de698 100644 --- a/x11-toolkits/gtk20/Makefile +++ b/x11-toolkits/gtk20/Makefile @@ -3,14 +3,14 @@ # Whom: Vanilla I. Shu <vanilla@MinJe.com.TW> # # $FreeBSD$ +# $MCom: ports/x11-toolkits/gtk20/Makefile,v 1.80 2005/10/29 22:42:26 mezz Exp $ # PORTNAME= gtk -PORTVERSION= 2.6.10 -PORTREVISION= 1 +PORTVERSION= 2.8.6 CATEGORIES= x11-toolkits -MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/2.6,} \ - ftp://ftp.gtk.org/pub/gtk/v2.6/ \ +MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/2.8,} \ + ftp://ftp.gtk.org/pub/gtk/v2.8/ \ ftp://ftp.gimp.org/pub/%SUBDIR%/ \ ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \ http://www.ameth.org/gimp/%SUBDIR%/ \ @@ -20,13 +20,6 @@ MASTER_SITE_SUBDIR= gtk/v${PORTVERSION:R} DISTNAME= gtk+-${PORTVERSION} DIST_SUBDIR= gnome2 -.if defined(WITH_DROPSHADOW) -PATCH_SITES= ${MASTER_SITE_SOURCEFORGE} -PATCH_SITE_SUBDIR= xfce -PATCHFILES= gtk+-2.4.0-menushadow.patch -PATCH_DIST_STRIP= -p1 -.endif - MAINTAINER= gnome@FreeBSD.org COMMENT= Gimp Toolkit for X11 GUI (current stable version) @@ -43,8 +36,8 @@ USE_XPM= yes USE_REINPLACE= yes USE_PERL5= yes INSTALLS_SHLIB= yes -USE_LIBTOOL_VER=15 -USE_GNOME= gnomehack atk pango +USE_AUTOTOOLS= libtool:15 +USE_GNOME= gnomehack atk pango ltverhack CONFIGURE_ARGS= --enable-static --with-xinput=yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/freetype2 \ -I${LOCALBASE}/include -I${X11BASE}/include" \ @@ -64,9 +57,10 @@ CONFIGURE_ARGS+= --enable-debug=no .else .if ${WITH_DEBUG:L} == "yes" CONFIGURE_ARGS+= --enable-debug=yes +STRIP= .else CONFIGURE_ARGS+= --enable-debug=minimum -CFLAGS+= -g +CFLAGS+= -g .endif STRIP= .endif @@ -84,15 +78,6 @@ CFLAGS+= -mno-sse2 .endif pre-everything:: -.if !defined(WITH_DROPSHADOW) - @${ECHO_MSG} - @${ECHO_MSG} "If you want to compile with experimental menu dropshadow patch," - @${ECHO_MSG} "hit Ctrl-C right now and use make \"WITH_DROPSHADOW=yes\"" - @${ECHO_MSG} "NOTE: This option is not supported by the FreeBSD GNOME Team." - @${ECHO_MSG} "If the patch does not work or causes the build to fail, just" - @${ECHO_MSG} "stop using the patch; we will not further debug it." - @${ECHO_MSG} -.endif .if !defined(WITH_DEBUG) @${ECHO_MSG} @${ECHO_MSG} "Enable or disable debugging with the following knob" @@ -115,6 +100,8 @@ pre-build: @${RM} -rf ${WRKSRC}/docs/gtk.info* post-install: + -@${FIND} ${PREFIX}/share/icons -type d -depth 1 -exec \ + ${PREFIX}/bin/gtk-update-icon-cache -q -f {} \; 2>/dev/null @${MKDIR} ${PREFIX}/lib/gtk-2.0/modules @${MKDIR} ${PREFIX}/lib/gtk-2.0/${GTK_VERSION}/engines diff --git a/x11-toolkits/gtk20/distinfo b/x11-toolkits/gtk20/distinfo index b725466f4aba..5766a84bc39b 100644 --- a/x11-toolkits/gtk20/distinfo +++ b/x11-toolkits/gtk20/distinfo @@ -1,4 +1,2 @@ -MD5 (gnome2/gtk+-2.6.10.tar.bz2) = 520090ef291e35ba93397060e20f5025 -SIZE (gnome2/gtk+-2.6.10.tar.bz2) = 11521380 -MD5 (gnome2/gtk+-2.4.0-menushadow.patch) = 5dde5c5af8f25d282c365663a7256b5c -SIZE (gnome2/gtk+-2.4.0-menushadow.patch) = 15603 +MD5 (gnome2/gtk+-2.8.6.tar.bz2) = 2bcb9e3feb62ac895101cb8ee87ca49a +SIZE (gnome2/gtk+-2.8.6.tar.bz2) = 11818976 diff --git a/x11-toolkits/gtk20/files/patch-Makefile.in b/x11-toolkits/gtk20/files/patch-Makefile.in index c47baaab5ef5..307fd6fc2f77 100644 --- a/x11-toolkits/gtk20/files/patch-Makefile.in +++ b/x11-toolkits/gtk20/files/patch-Makefile.in @@ -1,11 +1,11 @@ ---- Makefile.in.orig Thu Jan 22 19:40:10 2004 -+++ Makefile.in Thu Jan 22 19:40:52 2004 -@@ -286,7 +286,7 @@ +--- Makefile.in.orig Wed Aug 3 18:09:32 2005 ++++ Makefile.in Wed Aug 3 18:10:01 2005 +@@ -288,7 +288,7 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ --SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests contrib -+SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos contrib - SUBDIRS = po po-properties $(SRC_SUBDIRS) docs build m4macros +-SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib ++SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos perf contrib + SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros # require automake 1.4 diff --git a/x11-toolkits/gtk20/files/patch-ak b/x11-toolkits/gtk20/files/patch-ak index cc94fa96593c..41bffeab1b08 100644 --- a/x11-toolkits/gtk20/files/patch-ak +++ b/x11-toolkits/gtk20/files/patch-ak @@ -1,5 +1,6 @@ $FreeBSD$ + $MCom: ports/x11-toolkits/gtk20/files/patch-ak,v 1.16 2005/06/28 05:40:15 adamw Exp $ --- gdk/Makefile.in.orig Thu Feb 14 12:38:26 2002 +++ gdk/Makefile.in Thu Feb 14 12:45:37 2002 diff --git a/x11-toolkits/gtk20/files/patch-gtk_gtkcalendar.c b/x11-toolkits/gtk20/files/patch-gtk_gtkcalendar.c new file mode 100644 index 000000000000..4dcf1fd052a5 --- /dev/null +++ b/x11-toolkits/gtk20/files/patch-gtk_gtkcalendar.c @@ -0,0 +1,10 @@ +--- gtk/gtkcalendar.c.orig Mon Oct 3 22:01:14 2005 ++++ gtk/gtkcalendar.c Mon Oct 3 22:02:36 2005 +@@ -566,6 +566,7 @@ gtk_calendar_init (GtkCalendar *calendar + GtkCalendarPrivate *priv; + gchar *year_before; + gchar *langinfo; ++ gchar *week_start; + gint week_1stday = 0; + gint first_weekday = 1; + guint week_origin; diff --git a/x11-toolkits/gtk20/files/patch-gtk_gtkentry.c b/x11-toolkits/gtk20/files/patch-gtk_gtkentry.c deleted file mode 100644 index e725de399cff..000000000000 --- a/x11-toolkits/gtk20/files/patch-gtk_gtkentry.c +++ /dev/null @@ -1,13 +0,0 @@ ---- gtk/gtkentry.c.orig Wed Aug 25 12:44:23 2004 -+++ gtk/gtkentry.c Wed Aug 25 12:44:52 2004 -@@ -1670,8 +1670,9 @@ - event->x + entry->scroll_offset, event->y)) - { - GdkDragContext *context; -+ guint actions; - GtkTargetList *target_list = gtk_target_list_new (NULL, 0); -- guint actions = entry->editable ? GDK_ACTION_COPY | GDK_ACTION_MOVE : GDK_ACTION_COPY; -+ actions = entry->editable ? GDK_ACTION_COPY | GDK_ACTION_MOVE : GDK_ACTION_COPY; - - gtk_target_list_add_text_targets (target_list); - diff --git a/x11-toolkits/gtk20/files/patch-gtk_gtkiconcache.c b/x11-toolkits/gtk20/files/patch-gtk_gtkiconcache.c deleted file mode 100644 index d393bd3dfa8d..000000000000 --- a/x11-toolkits/gtk20/files/patch-gtk_gtkiconcache.c +++ /dev/null @@ -1,20 +0,0 @@ ---- gtk/gtkiconcache.c.orig Sun Dec 12 16:09:13 2004 -+++ gtk/gtkiconcache.c Thu Dec 16 17:09:23 2004 -@@ -21,6 +21,8 @@ - #include "gtkdebug.h" - #include "gtkiconcache.h" - #include <glib/gstdio.h> -+#include <sys/types.h> -+#include <sys/stat.h> - - #ifdef HAVE_MMAP - #include <sys/mman.h> -@@ -29,8 +31,6 @@ - #include <windows.h> - #include <io.h> - #endif --#include <sys/types.h> --#include <sys/stat.h> - #ifdef HAVE_UNISTD_H - #include <unistd.h> - #endif diff --git a/x11-toolkits/gtk20/pkg-plist b/x11-toolkits/gtk20/pkg-plist index ec10564dc771..a7a06be2c7d3 100644 --- a/x11-toolkits/gtk20/pkg-plist +++ b/x11-toolkits/gtk20/pkg-plist @@ -14,11 +14,13 @@ include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-features.h include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-io.h include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-loader.h include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-marshal.h +include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-simple-anim.h include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-transform.h include/gtk-2.0/gdk-pixbuf/gdk-pixbuf.h include/gtk-2.0/gdk-pixbuf/gdk-pixdata.h include/gtk-2.0/gdk/gdk.h include/gtk-2.0/gdk/gdkalias.h +include/gtk-2.0/gdk/gdkcairo.h include/gtk-2.0/gdk/gdkcolor.h include/gtk-2.0/gdk/gdkcursor.h include/gtk-2.0/gdk/gdkdisplay.h @@ -253,16 +255,16 @@ lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xbm.so lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xpm.so lib/libgdk-x11-2.0.a lib/libgdk-x11-2.0.so -lib/libgdk-x11-2.0.so.600 +lib/libgdk-x11-2.0.so.0 lib/libgdk_pixbuf-2.0.a lib/libgdk_pixbuf-2.0.so -lib/libgdk_pixbuf-2.0.so.600 +lib/libgdk_pixbuf-2.0.so.0 lib/libgdk_pixbuf_xlib-2.0.a lib/libgdk_pixbuf_xlib-2.0.so -lib/libgdk_pixbuf_xlib-2.0.so.600 +lib/libgdk_pixbuf_xlib-2.0.so.0 lib/libgtk-x11-2.0.a lib/libgtk-x11-2.0.so -lib/libgtk-x11-2.0.so.600 +lib/libgtk-x11-2.0.so.0 libdata/pkgconfig/gdk-2.0.pc libdata/pkgconfig/gdk-pixbuf-2.0.pc libdata/pkgconfig/gdk-pixbuf-xlib-2.0.pc @@ -297,6 +299,7 @@ share/gtk-2.0/demo/gnu-keys.png share/gtk-2.0/demo/gtk-logo-rgb.gif share/gtk-2.0/demo/hypertext.c share/gtk-2.0/demo/iconview.c +share/gtk-2.0/demo/iconview_edit.c share/gtk-2.0/demo/images.c share/gtk-2.0/demo/list_store.c share/gtk-2.0/demo/menus.c @@ -385,6 +388,8 @@ share/locale/ja/LC_MESSAGES/gtk20-properties.mo share/locale/ja/LC_MESSAGES/gtk20.mo share/locale/ko/LC_MESSAGES/gtk20-properties.mo share/locale/ko/LC_MESSAGES/gtk20.mo +share/locale/ku/LC_MESSAGES/gtk20-properties.mo +share/locale/ku/LC_MESSAGES/gtk20.mo share/locale/li/LC_MESSAGES/gtk20-properties.mo share/locale/li/LC_MESSAGES/gtk20.mo share/locale/lt/LC_MESSAGES/gtk20-properties.mo @@ -445,6 +450,8 @@ share/locale/sv/LC_MESSAGES/gtk20-properties.mo share/locale/sv/LC_MESSAGES/gtk20.mo share/locale/ta/LC_MESSAGES/gtk20-properties.mo share/locale/ta/LC_MESSAGES/gtk20.mo +share/locale/te/LC_MESSAGES/gtk20-properties.mo +share/locale/te/LC_MESSAGES/gtk20.mo share/locale/th/LC_MESSAGES/gtk20-properties.mo share/locale/th/LC_MESSAGES/gtk20.mo share/locale/tk/LC_MESSAGES/gtk20-properties.mo @@ -470,20 +477,17 @@ share/locale/zh_CN/LC_MESSAGES/gtk20.mo share/locale/zh_TW/LC_MESSAGES/gtk20-properties.mo share/locale/zh_TW/LC_MESSAGES/gtk20.mo share/themes/Default/gtk-2.0-key/gtkrc -share/themes/Default/gtk-2.0/gtkrc share/themes/Emacs/gtk-2.0-key/gtkrc +share/themes/Raleigh/gtk-2.0/gtkrc +@exec /usr/bin/find %D/share/icons -type d -depth 1 -exec %D/bin/gtk-update-icon-cache -q -f {} \; 2>/dev/null || /usr/bin/true +@unexec /usr/bin/find %D/share/icons -type f -depth 2 -name icon-theme.cache -delete 2>/dev/null || /usr/bin/true +@dirrm share/themes/Raleigh/gtk-2.0 +@dirrm share/themes/Raleigh @dirrm share/themes/Emacs/gtk-2.0-key @dirrm share/themes/Emacs @dirrm share/themes/Default/gtk-2.0-key -@dirrm share/themes/Default/gtk-2.0 @dirrm share/gtk-2.0/demo @dirrm share/gtk-2.0 -@unexec /bin/rmdir %D/lib/gtk-2.0/modules 2>/dev/null || /usr/bin/true -@unexec /bin/rmdir %D/lib/gtk-2.0/%%GTK_VERSION%%/loaders 2>/dev/null || /usr/bin/true -@unexec /bin/rmdir %D/lib/gtk-2.0/%%GTK_VERSION%%/immodules 2>/dev/null || /usr/bin/true -@unexec /bin/rmdir %D/lib/gtk-2.0/%%GTK_VERSION%%/engines 2>/dev/null || /usr/bin/true -@unexec /bin/rmdir %D/lib/gtk-2.0/%%GTK_VERSION%% 2>/dev/null || /usr/bin/true -@unexec /bin/rmdir %D/lib/gtk-2.0 2>/dev/null || /usr/bin/true @dirrm include/gtk-2.0/gtk @dirrm include/gtk-2.0/gdk-pixbuf-xlib @dirrm include/gtk-2.0/gdk-pixbuf @@ -494,27 +498,37 @@ share/themes/Emacs/gtk-2.0-key/gtkrc @exec /bin/mkdir -p %D/lib/gtk-2.0/%%GTK_VERSION%%/engines @unexec /bin/rmdir %D/share/themes/Default 2>/dev/null || /usr/bin/true @unexec /bin/rmdir %D/share/themes 2>/dev/null || /usr/bin/true -@unexec rmdir %D/share/locale/az_IR/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/az_IR 2> /dev/null || true -@unexec rmdir %D/share/locale/br/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/br 2> /dev/null || true -@unexec rmdir %D/share/locale/hy/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/hy 2> /dev/null || true -@unexec rmdir %D/share/locale/ia/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/ia 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 -@unexec rmdir %D/share/locale/mr/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/mr 2> /dev/null || true -@unexec rmdir %D/share/locale/nso/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/nso 2> /dev/null || true -@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/sr@ije/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/sr@ije 2> /dev/null || true -@unexec rmdir %D/share/locale/uz@Latn/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/uz@Latn 2> /dev/null || true @unexec rmdir %D/share/locale/yi/LC_MESSAGES 2> /dev/null || true @unexec rmdir %D/share/locale/yi 2> /dev/null || true -@unexec rmdir %D/share/locale/xh/LC_MESSAGES/ 2> /dev/null || true +@unexec rmdir %D/share/locale/xh/LC_MESSAGES 2> /dev/null || true @unexec rmdir %D/share/locale/xh 2> /dev/null || true +@unexec rmdir %D/share/locale/te/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/te 2> /dev/null || true +@unexec rmdir %D/share/locale/uz@Latn/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/uz@Latn 2> /dev/null || true +@unexec rmdir %D/share/locale/sr@ije/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/sr@ije 2> /dev/null || true +@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/nso/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/nso 2> /dev/null || true +@unexec rmdir %D/share/locale/mr/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/mr 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 +@unexec rmdir %D/share/locale/ku/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/ku 2> /dev/null || true +@unexec rmdir %D/share/locale/ia/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/ia 2> /dev/null || true +@unexec rmdir %D/share/locale/hy/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/hy 2> /dev/null || true +@unexec rmdir %D/share/locale/br/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/br 2> /dev/null || true +@unexec rmdir %D/share/locale/az_IR/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/az_IR 2> /dev/null || true +@unexec /bin/rmdir %D/lib/gtk-2.0/modules 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/lib/gtk-2.0/%%GTK_VERSION%%/loaders 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/lib/gtk-2.0/%%GTK_VERSION%%/immodules 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/lib/gtk-2.0/%%GTK_VERSION%%/engines 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/lib/gtk-2.0/%%GTK_VERSION%% 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/lib/gtk-2.0 2>/dev/null || /usr/bin/true diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile index 3001ebcaaaad..014cf40de698 100644 --- a/x11-toolkits/gtk30/Makefile +++ b/x11-toolkits/gtk30/Makefile @@ -3,14 +3,14 @@ # Whom: Vanilla I. Shu <vanilla@MinJe.com.TW> # # $FreeBSD$ +# $MCom: ports/x11-toolkits/gtk20/Makefile,v 1.80 2005/10/29 22:42:26 mezz Exp $ # PORTNAME= gtk -PORTVERSION= 2.6.10 -PORTREVISION= 1 +PORTVERSION= 2.8.6 CATEGORIES= x11-toolkits -MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/2.6,} \ - ftp://ftp.gtk.org/pub/gtk/v2.6/ \ +MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/2.8,} \ + ftp://ftp.gtk.org/pub/gtk/v2.8/ \ ftp://ftp.gimp.org/pub/%SUBDIR%/ \ ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \ http://www.ameth.org/gimp/%SUBDIR%/ \ @@ -20,13 +20,6 @@ MASTER_SITE_SUBDIR= gtk/v${PORTVERSION:R} DISTNAME= gtk+-${PORTVERSION} DIST_SUBDIR= gnome2 -.if defined(WITH_DROPSHADOW) -PATCH_SITES= ${MASTER_SITE_SOURCEFORGE} -PATCH_SITE_SUBDIR= xfce -PATCHFILES= gtk+-2.4.0-menushadow.patch -PATCH_DIST_STRIP= -p1 -.endif - MAINTAINER= gnome@FreeBSD.org COMMENT= Gimp Toolkit for X11 GUI (current stable version) @@ -43,8 +36,8 @@ USE_XPM= yes USE_REINPLACE= yes USE_PERL5= yes INSTALLS_SHLIB= yes -USE_LIBTOOL_VER=15 -USE_GNOME= gnomehack atk pango +USE_AUTOTOOLS= libtool:15 +USE_GNOME= gnomehack atk pango ltverhack CONFIGURE_ARGS= --enable-static --with-xinput=yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/freetype2 \ -I${LOCALBASE}/include -I${X11BASE}/include" \ @@ -64,9 +57,10 @@ CONFIGURE_ARGS+= --enable-debug=no .else .if ${WITH_DEBUG:L} == "yes" CONFIGURE_ARGS+= --enable-debug=yes +STRIP= .else CONFIGURE_ARGS+= --enable-debug=minimum -CFLAGS+= -g +CFLAGS+= -g .endif STRIP= .endif @@ -84,15 +78,6 @@ CFLAGS+= -mno-sse2 .endif pre-everything:: -.if !defined(WITH_DROPSHADOW) - @${ECHO_MSG} - @${ECHO_MSG} "If you want to compile with experimental menu dropshadow patch," - @${ECHO_MSG} "hit Ctrl-C right now and use make \"WITH_DROPSHADOW=yes\"" - @${ECHO_MSG} "NOTE: This option is not supported by the FreeBSD GNOME Team." - @${ECHO_MSG} "If the patch does not work or causes the build to fail, just" - @${ECHO_MSG} "stop using the patch; we will not further debug it." - @${ECHO_MSG} -.endif .if !defined(WITH_DEBUG) @${ECHO_MSG} @${ECHO_MSG} "Enable or disable debugging with the following knob" @@ -115,6 +100,8 @@ pre-build: @${RM} -rf ${WRKSRC}/docs/gtk.info* post-install: + -@${FIND} ${PREFIX}/share/icons -type d -depth 1 -exec \ + ${PREFIX}/bin/gtk-update-icon-cache -q -f {} \; 2>/dev/null @${MKDIR} ${PREFIX}/lib/gtk-2.0/modules @${MKDIR} ${PREFIX}/lib/gtk-2.0/${GTK_VERSION}/engines diff --git a/x11-toolkits/gtk30/distinfo b/x11-toolkits/gtk30/distinfo index b725466f4aba..5766a84bc39b 100644 --- a/x11-toolkits/gtk30/distinfo +++ b/x11-toolkits/gtk30/distinfo @@ -1,4 +1,2 @@ -MD5 (gnome2/gtk+-2.6.10.tar.bz2) = 520090ef291e35ba93397060e20f5025 -SIZE (gnome2/gtk+-2.6.10.tar.bz2) = 11521380 -MD5 (gnome2/gtk+-2.4.0-menushadow.patch) = 5dde5c5af8f25d282c365663a7256b5c -SIZE (gnome2/gtk+-2.4.0-menushadow.patch) = 15603 +MD5 (gnome2/gtk+-2.8.6.tar.bz2) = 2bcb9e3feb62ac895101cb8ee87ca49a +SIZE (gnome2/gtk+-2.8.6.tar.bz2) = 11818976 diff --git a/x11-toolkits/gtk30/files/patch-Makefile.in b/x11-toolkits/gtk30/files/patch-Makefile.in index c47baaab5ef5..307fd6fc2f77 100644 --- a/x11-toolkits/gtk30/files/patch-Makefile.in +++ b/x11-toolkits/gtk30/files/patch-Makefile.in @@ -1,11 +1,11 @@ ---- Makefile.in.orig Thu Jan 22 19:40:10 2004 -+++ Makefile.in Thu Jan 22 19:40:52 2004 -@@ -286,7 +286,7 @@ +--- Makefile.in.orig Wed Aug 3 18:09:32 2005 ++++ Makefile.in Wed Aug 3 18:10:01 2005 +@@ -288,7 +288,7 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ --SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests contrib -+SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos contrib - SUBDIRS = po po-properties $(SRC_SUBDIRS) docs build m4macros +-SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib ++SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos perf contrib + SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros # require automake 1.4 diff --git a/x11-toolkits/gtk30/files/patch-ak b/x11-toolkits/gtk30/files/patch-ak index cc94fa96593c..41bffeab1b08 100644 --- a/x11-toolkits/gtk30/files/patch-ak +++ b/x11-toolkits/gtk30/files/patch-ak @@ -1,5 +1,6 @@ $FreeBSD$ + $MCom: ports/x11-toolkits/gtk20/files/patch-ak,v 1.16 2005/06/28 05:40:15 adamw Exp $ --- gdk/Makefile.in.orig Thu Feb 14 12:38:26 2002 +++ gdk/Makefile.in Thu Feb 14 12:45:37 2002 diff --git a/x11-toolkits/gtk30/files/patch-gtk_gtkcalendar.c b/x11-toolkits/gtk30/files/patch-gtk_gtkcalendar.c new file mode 100644 index 000000000000..4dcf1fd052a5 --- /dev/null +++ b/x11-toolkits/gtk30/files/patch-gtk_gtkcalendar.c @@ -0,0 +1,10 @@ +--- gtk/gtkcalendar.c.orig Mon Oct 3 22:01:14 2005 ++++ gtk/gtkcalendar.c Mon Oct 3 22:02:36 2005 +@@ -566,6 +566,7 @@ gtk_calendar_init (GtkCalendar *calendar + GtkCalendarPrivate *priv; + gchar *year_before; + gchar *langinfo; ++ gchar *week_start; + gint week_1stday = 0; + gint first_weekday = 1; + guint week_origin; diff --git a/x11-toolkits/gtk30/files/patch-gtk_gtkentry.c b/x11-toolkits/gtk30/files/patch-gtk_gtkentry.c deleted file mode 100644 index e725de399cff..000000000000 --- a/x11-toolkits/gtk30/files/patch-gtk_gtkentry.c +++ /dev/null @@ -1,13 +0,0 @@ ---- gtk/gtkentry.c.orig Wed Aug 25 12:44:23 2004 -+++ gtk/gtkentry.c Wed Aug 25 12:44:52 2004 -@@ -1670,8 +1670,9 @@ - event->x + entry->scroll_offset, event->y)) - { - GdkDragContext *context; -+ guint actions; - GtkTargetList *target_list = gtk_target_list_new (NULL, 0); -- guint actions = entry->editable ? GDK_ACTION_COPY | GDK_ACTION_MOVE : GDK_ACTION_COPY; -+ actions = entry->editable ? GDK_ACTION_COPY | GDK_ACTION_MOVE : GDK_ACTION_COPY; - - gtk_target_list_add_text_targets (target_list); - diff --git a/x11-toolkits/gtk30/files/patch-gtk_gtkiconcache.c b/x11-toolkits/gtk30/files/patch-gtk_gtkiconcache.c deleted file mode 100644 index d393bd3dfa8d..000000000000 --- a/x11-toolkits/gtk30/files/patch-gtk_gtkiconcache.c +++ /dev/null @@ -1,20 +0,0 @@ ---- gtk/gtkiconcache.c.orig Sun Dec 12 16:09:13 2004 -+++ gtk/gtkiconcache.c Thu Dec 16 17:09:23 2004 -@@ -21,6 +21,8 @@ - #include "gtkdebug.h" - #include "gtkiconcache.h" - #include <glib/gstdio.h> -+#include <sys/types.h> -+#include <sys/stat.h> - - #ifdef HAVE_MMAP - #include <sys/mman.h> -@@ -29,8 +31,6 @@ - #include <windows.h> - #include <io.h> - #endif --#include <sys/types.h> --#include <sys/stat.h> - #ifdef HAVE_UNISTD_H - #include <unistd.h> - #endif diff --git a/x11-toolkits/gtk30/pkg-plist b/x11-toolkits/gtk30/pkg-plist index ec10564dc771..a7a06be2c7d3 100644 --- a/x11-toolkits/gtk30/pkg-plist +++ b/x11-toolkits/gtk30/pkg-plist @@ -14,11 +14,13 @@ include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-features.h include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-io.h include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-loader.h include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-marshal.h +include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-simple-anim.h include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-transform.h include/gtk-2.0/gdk-pixbuf/gdk-pixbuf.h include/gtk-2.0/gdk-pixbuf/gdk-pixdata.h include/gtk-2.0/gdk/gdk.h include/gtk-2.0/gdk/gdkalias.h +include/gtk-2.0/gdk/gdkcairo.h include/gtk-2.0/gdk/gdkcolor.h include/gtk-2.0/gdk/gdkcursor.h include/gtk-2.0/gdk/gdkdisplay.h @@ -253,16 +255,16 @@ lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xbm.so lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xpm.so lib/libgdk-x11-2.0.a lib/libgdk-x11-2.0.so -lib/libgdk-x11-2.0.so.600 +lib/libgdk-x11-2.0.so.0 lib/libgdk_pixbuf-2.0.a lib/libgdk_pixbuf-2.0.so -lib/libgdk_pixbuf-2.0.so.600 +lib/libgdk_pixbuf-2.0.so.0 lib/libgdk_pixbuf_xlib-2.0.a lib/libgdk_pixbuf_xlib-2.0.so -lib/libgdk_pixbuf_xlib-2.0.so.600 +lib/libgdk_pixbuf_xlib-2.0.so.0 lib/libgtk-x11-2.0.a lib/libgtk-x11-2.0.so -lib/libgtk-x11-2.0.so.600 +lib/libgtk-x11-2.0.so.0 libdata/pkgconfig/gdk-2.0.pc libdata/pkgconfig/gdk-pixbuf-2.0.pc libdata/pkgconfig/gdk-pixbuf-xlib-2.0.pc @@ -297,6 +299,7 @@ share/gtk-2.0/demo/gnu-keys.png share/gtk-2.0/demo/gtk-logo-rgb.gif share/gtk-2.0/demo/hypertext.c share/gtk-2.0/demo/iconview.c +share/gtk-2.0/demo/iconview_edit.c share/gtk-2.0/demo/images.c share/gtk-2.0/demo/list_store.c share/gtk-2.0/demo/menus.c @@ -385,6 +388,8 @@ share/locale/ja/LC_MESSAGES/gtk20-properties.mo share/locale/ja/LC_MESSAGES/gtk20.mo share/locale/ko/LC_MESSAGES/gtk20-properties.mo share/locale/ko/LC_MESSAGES/gtk20.mo +share/locale/ku/LC_MESSAGES/gtk20-properties.mo +share/locale/ku/LC_MESSAGES/gtk20.mo share/locale/li/LC_MESSAGES/gtk20-properties.mo share/locale/li/LC_MESSAGES/gtk20.mo share/locale/lt/LC_MESSAGES/gtk20-properties.mo @@ -445,6 +450,8 @@ share/locale/sv/LC_MESSAGES/gtk20-properties.mo share/locale/sv/LC_MESSAGES/gtk20.mo share/locale/ta/LC_MESSAGES/gtk20-properties.mo share/locale/ta/LC_MESSAGES/gtk20.mo +share/locale/te/LC_MESSAGES/gtk20-properties.mo +share/locale/te/LC_MESSAGES/gtk20.mo share/locale/th/LC_MESSAGES/gtk20-properties.mo share/locale/th/LC_MESSAGES/gtk20.mo share/locale/tk/LC_MESSAGES/gtk20-properties.mo @@ -470,20 +477,17 @@ share/locale/zh_CN/LC_MESSAGES/gtk20.mo share/locale/zh_TW/LC_MESSAGES/gtk20-properties.mo share/locale/zh_TW/LC_MESSAGES/gtk20.mo share/themes/Default/gtk-2.0-key/gtkrc -share/themes/Default/gtk-2.0/gtkrc share/themes/Emacs/gtk-2.0-key/gtkrc +share/themes/Raleigh/gtk-2.0/gtkrc +@exec /usr/bin/find %D/share/icons -type d -depth 1 -exec %D/bin/gtk-update-icon-cache -q -f {} \; 2>/dev/null || /usr/bin/true +@unexec /usr/bin/find %D/share/icons -type f -depth 2 -name icon-theme.cache -delete 2>/dev/null || /usr/bin/true +@dirrm share/themes/Raleigh/gtk-2.0 +@dirrm share/themes/Raleigh @dirrm share/themes/Emacs/gtk-2.0-key @dirrm share/themes/Emacs @dirrm share/themes/Default/gtk-2.0-key -@dirrm share/themes/Default/gtk-2.0 @dirrm share/gtk-2.0/demo @dirrm share/gtk-2.0 -@unexec /bin/rmdir %D/lib/gtk-2.0/modules 2>/dev/null || /usr/bin/true -@unexec /bin/rmdir %D/lib/gtk-2.0/%%GTK_VERSION%%/loaders 2>/dev/null || /usr/bin/true -@unexec /bin/rmdir %D/lib/gtk-2.0/%%GTK_VERSION%%/immodules 2>/dev/null || /usr/bin/true -@unexec /bin/rmdir %D/lib/gtk-2.0/%%GTK_VERSION%%/engines 2>/dev/null || /usr/bin/true -@unexec /bin/rmdir %D/lib/gtk-2.0/%%GTK_VERSION%% 2>/dev/null || /usr/bin/true -@unexec /bin/rmdir %D/lib/gtk-2.0 2>/dev/null || /usr/bin/true @dirrm include/gtk-2.0/gtk @dirrm include/gtk-2.0/gdk-pixbuf-xlib @dirrm include/gtk-2.0/gdk-pixbuf @@ -494,27 +498,37 @@ share/themes/Emacs/gtk-2.0-key/gtkrc @exec /bin/mkdir -p %D/lib/gtk-2.0/%%GTK_VERSION%%/engines @unexec /bin/rmdir %D/share/themes/Default 2>/dev/null || /usr/bin/true @unexec /bin/rmdir %D/share/themes 2>/dev/null || /usr/bin/true -@unexec rmdir %D/share/locale/az_IR/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/az_IR 2> /dev/null || true -@unexec rmdir %D/share/locale/br/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/br 2> /dev/null || true -@unexec rmdir %D/share/locale/hy/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/hy 2> /dev/null || true -@unexec rmdir %D/share/locale/ia/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/ia 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 -@unexec rmdir %D/share/locale/mr/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/mr 2> /dev/null || true -@unexec rmdir %D/share/locale/nso/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/nso 2> /dev/null || true -@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/sr@ije/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/sr@ije 2> /dev/null || true -@unexec rmdir %D/share/locale/uz@Latn/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/uz@Latn 2> /dev/null || true @unexec rmdir %D/share/locale/yi/LC_MESSAGES 2> /dev/null || true @unexec rmdir %D/share/locale/yi 2> /dev/null || true -@unexec rmdir %D/share/locale/xh/LC_MESSAGES/ 2> /dev/null || true +@unexec rmdir %D/share/locale/xh/LC_MESSAGES 2> /dev/null || true @unexec rmdir %D/share/locale/xh 2> /dev/null || true +@unexec rmdir %D/share/locale/te/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/te 2> /dev/null || true +@unexec rmdir %D/share/locale/uz@Latn/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/uz@Latn 2> /dev/null || true +@unexec rmdir %D/share/locale/sr@ije/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/sr@ije 2> /dev/null || true +@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/nso/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/nso 2> /dev/null || true +@unexec rmdir %D/share/locale/mr/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/mr 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 +@unexec rmdir %D/share/locale/ku/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/ku 2> /dev/null || true +@unexec rmdir %D/share/locale/ia/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/ia 2> /dev/null || true +@unexec rmdir %D/share/locale/hy/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/hy 2> /dev/null || true +@unexec rmdir %D/share/locale/br/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/br 2> /dev/null || true +@unexec rmdir %D/share/locale/az_IR/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/az_IR 2> /dev/null || true +@unexec /bin/rmdir %D/lib/gtk-2.0/modules 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/lib/gtk-2.0/%%GTK_VERSION%%/loaders 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/lib/gtk-2.0/%%GTK_VERSION%%/immodules 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/lib/gtk-2.0/%%GTK_VERSION%%/engines 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/lib/gtk-2.0/%%GTK_VERSION%% 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/lib/gtk-2.0 2>/dev/null || /usr/bin/true diff --git a/x11-toolkits/gtksourceview/Makefile b/x11-toolkits/gtksourceview/Makefile index a67fd229f3a3..0b738f66243c 100644 --- a/x11-toolkits/gtksourceview/Makefile +++ b/x11-toolkits/gtksourceview/Makefile @@ -3,13 +3,14 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/x11-toolkits/gtksourceview/Makefile,v 1.23 2005/10/03 15:24:49 ahze Exp $ # PORTNAME= gtksourceview -PORTVERSION= 1.2.1 +PORTVERSION= 1.4.2 CATEGORIES= x11-toolkits gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.2 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.4 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -18,9 +19,10 @@ COMMENT= A text widget that adds syntax highlighting to the GtkTextView widget USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 INSTALLS_SHLIB= yes -USE_GNOME= gnomeprefix gnomehack libgnome libgnomeprintui +USE_GNOME= gnomeprefix gnomehack libgnome libgnomeprintui intlhack \ + ltverhack CONFIGURE_ARGS= --enable-compile-warnings=no CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib -lgnuregex" diff --git a/x11-toolkits/gtksourceview/distinfo b/x11-toolkits/gtksourceview/distinfo index 188e78930a68..5a1dfef26d5b 100644 --- a/x11-toolkits/gtksourceview/distinfo +++ b/x11-toolkits/gtksourceview/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gtksourceview-1.2.1.tar.bz2) = fb88eec6d174514a87f53e635f50041e -SIZE (gnome2/gtksourceview-1.2.1.tar.bz2) = 675115 +MD5 (gnome2/gtksourceview-1.4.2.tar.bz2) = 323a56ae9559af12f64fc5090955e68b +SIZE (gnome2/gtksourceview-1.4.2.tar.bz2) = 704867 diff --git a/x11-toolkits/gtksourceview/pkg-plist b/x11-toolkits/gtksourceview/pkg-plist index ce8bafb2b07b..185f1673872d 100644 --- a/x11-toolkits/gtksourceview/pkg-plist +++ b/x11-toolkits/gtksourceview/pkg-plist @@ -53,6 +53,7 @@ share/gnome/gtksourceview-1.0/language-specs/javascript.lang share/gnome/gtksourceview-1.0/language-specs/language.dtd share/gnome/gtksourceview-1.0/language-specs/latex.lang share/gnome/gtksourceview-1.0/language-specs/lua.lang +share/gnome/gtksourceview-1.0/language-specs/makefile.lang share/gnome/gtksourceview-1.0/language-specs/msil.lang share/gnome/gtksourceview-1.0/language-specs/nemerle.lang share/gnome/gtksourceview-1.0/language-specs/pascal.lang @@ -90,6 +91,7 @@ share/locale/fa/LC_MESSAGES/gtksourceview-1.0.mo share/locale/fi/LC_MESSAGES/gtksourceview-1.0.mo share/locale/fr/LC_MESSAGES/gtksourceview-1.0.mo share/locale/ga/LC_MESSAGES/gtksourceview-1.0.mo +share/locale/gl/LC_MESSAGES/gtksourceview-1.0.mo share/locale/gu/LC_MESSAGES/gtksourceview-1.0.mo share/locale/he/LC_MESSAGES/gtksourceview-1.0.mo share/locale/hi/LC_MESSAGES/gtksourceview-1.0.mo @@ -112,6 +114,7 @@ share/locale/pa/LC_MESSAGES/gtksourceview-1.0.mo share/locale/pl/LC_MESSAGES/gtksourceview-1.0.mo share/locale/pt/LC_MESSAGES/gtksourceview-1.0.mo share/locale/pt_BR/LC_MESSAGES/gtksourceview-1.0.mo +share/locale/ro/LC_MESSAGES/gtksourceview-1.0.mo share/locale/ru/LC_MESSAGES/gtksourceview-1.0.mo share/locale/rw/LC_MESSAGES/gtksourceview-1.0.mo share/locale/sk/LC_MESSAGES/gtksourceview-1.0.mo diff --git a/x11-toolkits/libgnomeprintui/Makefile b/x11-toolkits/libgnomeprintui/Makefile index 7045ce502edc..dfef08682160 100644 --- a/x11-toolkits/libgnomeprintui/Makefile +++ b/x11-toolkits/libgnomeprintui/Makefile @@ -3,13 +3,14 @@ # Whom: Maxim Sobolev <sobomax@FreBSD.org> # # $FreeBSD$ +# $MCom: ports/x11-toolkits/libgnomeprintui/Makefile,v 1.53 2005/09/26 21:14:32 marcus Exp $ # PORTNAME= libgnomeprintui -PORTVERSION= 2.10.2 +PORTVERSION= 2.12.1 CATEGORIES= x11-toolkits gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.10 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.12 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -23,12 +24,14 @@ USE_X_PREFIX= yes USE_XPM= yes USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack libgnomeprint libgnomecanvas \ - intlhack + intlhack ltverhack USE_REINPLACE= yes INSTALLS_SHLIB= yes -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 USE_BISON= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" +PLIST_SUB= VERSION=${PORTVERSION} + .include <bsd.port.mk> diff --git a/x11-toolkits/libgnomeprintui/distinfo b/x11-toolkits/libgnomeprintui/distinfo index 85294dc7b6da..bc22413317b5 100644 --- a/x11-toolkits/libgnomeprintui/distinfo +++ b/x11-toolkits/libgnomeprintui/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/libgnomeprintui-2.10.2.tar.bz2) = 01fce7918f4e106e00ee8b5447783e4c -SIZE (gnome2/libgnomeprintui-2.10.2.tar.bz2) = 626042 +MD5 (gnome2/libgnomeprintui-2.12.1.tar.bz2) = fa0b0410c3ba8b6899c5ed278f02cbe5 +SIZE (gnome2/libgnomeprintui-2.12.1.tar.bz2) = 646459 diff --git a/x11-toolkits/libgnomeprintui/pkg-plist b/x11-toolkits/libgnomeprintui/pkg-plist index bd41a2e5cbd3..0a333a7a0faa 100644 --- a/x11-toolkits/libgnomeprintui/pkg-plist +++ b/x11-toolkits/libgnomeprintui/pkg-plist @@ -1,5 +1,6 @@ include/libgnomeprintui-2.2/libgnomeprintui/gnome-font-dialog.h include/libgnomeprintui-2.2/libgnomeprintui/gnome-print-config-dialog.h +include/libgnomeprintui-2.2/libgnomeprintui/gnome-print-content-selector.h include/libgnomeprintui-2.2/libgnomeprintui/gnome-print-dialog.h include/libgnomeprintui-2.2/libgnomeprintui/gnome-print-job-preview.h include/libgnomeprintui-2.2/libgnomeprintui/gnome-print-paper-selector.h @@ -8,25 +9,9 @@ include/libgnomeprintui-2.2/libgnomeprintui/gnome-print-unit-selector.h include/libgnomeprintui-2.2/libgnomeprintui/libgnomeprintui-enum-types.h lib/libgnomeprintui-2-2.a lib/libgnomeprintui-2-2.so -lib/libgnomeprintui-2-2.so.1 +lib/libgnomeprintui-2-2.so.0 libdata/pkgconfig/libgnomeprintui-2.2.pc -%%DOCSDIR%%/ch02.html -%%DOCSDIR%%/home.png -%%DOCSDIR%%/index.html -%%DOCSDIR%%/index.sgml -%%DOCSDIR%%/left.png -%%DOCSDIR%%/libgnomeprintui-gnome-font-dialog.html -%%DOCSDIR%%/libgnomeprintui-gnome-print-copies.html -%%DOCSDIR%%/libgnomeprintui-gnome-print-dialog.html -%%DOCSDIR%%/libgnomeprintui-gnome-print-job-preview.html -%%DOCSDIR%%/libgnomeprintui-gnome-print-paper-selector.html -%%DOCSDIR%%/libgnomeprintui-gnome-print-preview.html -%%DOCSDIR%%/libgnomeprintui-gnome-printer-selector.html -%%DOCSDIR%%/libgnomeprintui.devhelp -%%DOCSDIR%%/libgnomeprintui.html -%%DOCSDIR%%/right.png -%%DOCSDIR%%/style.css -%%DOCSDIR%%/up.png +share/gnome/libgnomeprintui/%%VERSION%%/gnome-print-job-preview.xml share/locale/af/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/am/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/ar/LC_MESSAGES/libgnomeprintui-2.2.mo @@ -80,6 +65,7 @@ share/locale/pt/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/pt_BR/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/ro/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/ru/LC_MESSAGES/libgnomeprintui-2.2.mo +share/locale/rw/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/sk/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/sl/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/sq/LC_MESSAGES/libgnomeprintui-2.2.mo @@ -87,13 +73,16 @@ share/locale/sr/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/sr@Latn/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/sv/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/ta/LC_MESSAGES/libgnomeprintui-2.2.mo +share/locale/te/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/th/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/tr/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/uk/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/vi/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/wa/LC_MESSAGES/libgnomeprintui-2.2.mo +share/locale/xh/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/zh_CN/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/zh_TW/LC_MESSAGES/libgnomeprintui-2.2.mo -@dirrm %%DOCSDIR%% +@dirrm share/gnome/libgnomeprintui/%%VERSION%% +@dirrm share/gnome/libgnomeprintui @dirrm include/libgnomeprintui-2.2/libgnomeprintui @dirrm include/libgnomeprintui-2.2 diff --git a/x11-toolkits/libgnomeui/Makefile b/x11-toolkits/libgnomeui/Makefile index 89ecfea12e81..f42acce28250 100644 --- a/x11-toolkits/libgnomeui/Makefile +++ b/x11-toolkits/libgnomeui/Makefile @@ -3,14 +3,14 @@ # Whom: Joe Marcus Clarke <marcus@FreBSD.org> # # $FreeBSD$ -# +# $MCom: ports/x11-toolkits/libgnomeui/Makefile,v 1.66 2005/09/07 04:43:08 marcus Exp $ PORTNAME= libgnomeui -PORTVERSION= 2.10.1 +PORTVERSION= 2.12.0 PORTREVISION= 1 CATEGORIES= x11-toolkits gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.10 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.12 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -24,9 +24,9 @@ USE_BZIP2= yes USE_X_PREFIX= yes USE_XPM= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix gnomehack gnomehier libbonoboui +USE_GNOME= gnomeprefix gnomehack gnomehier libbonoboui ltverhack INSTALLS_SHLIB= yes -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 USE_BISON= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" diff --git a/x11-toolkits/libgnomeui/distinfo b/x11-toolkits/libgnomeui/distinfo index 77dc80cbe1ef..54f89dc79414 100644 --- a/x11-toolkits/libgnomeui/distinfo +++ b/x11-toolkits/libgnomeui/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/libgnomeui-2.10.1.tar.bz2) = bc52006f097017adda8cb90e31743866 -SIZE (gnome2/libgnomeui-2.10.1.tar.bz2) = 1705230 +MD5 (gnome2/libgnomeui-2.12.0.tar.bz2) = 342a5b8a9d427ff950a71a245a5f4485 +SIZE (gnome2/libgnomeui-2.12.0.tar.bz2) = 1831358 diff --git a/x11-toolkits/libgnomeui/files/patch-file-chooser::gtkfilesystemgnomevfs.c b/x11-toolkits/libgnomeui/files/patch-file-chooser::gtkfilesystemgnomevfs.c deleted file mode 100644 index 9afa5350522e..000000000000 --- a/x11-toolkits/libgnomeui/files/patch-file-chooser::gtkfilesystemgnomevfs.c +++ /dev/null @@ -1,24 +0,0 @@ ---- file-chooser/gtkfilesystemgnomevfs.c.orig Sun Mar 20 20:58:22 2005 -+++ file-chooser/gtkfilesystemgnomevfs.c Sun Mar 20 20:59:03 2005 -@@ -2536,13 +2536,20 @@ - GtkFileSystemGnomeVFS *system_vfs; - GConfValue *value; - -+ GDK_THREADS_ENTER(); -+ - system_vfs = GTK_FILE_SYSTEM_GNOME_VFS (data); - - if (strcmp (gconf_entry_get_key (entry), BOOKMARKS_KEY) != 0) -- return; -+ { -+ GDK_THREADS_LEAVE(); -+ return; -+ } - - value = gconf_entry_get_value (entry); - set_bookmarks_from_value (system_vfs, value, TRUE); -+ -+ GDK_THREADS_LEAVE(); - } - #endif - diff --git a/x11-toolkits/libgnomeui/pkg-plist b/x11-toolkits/libgnomeui/pkg-plist index df103966c238..0ee38ebceff8 100644 --- a/x11-toolkits/libgnomeui/pkg-plist +++ b/x11-toolkits/libgnomeui/pkg-plist @@ -53,7 +53,7 @@ lib/gtk-2.0/%%GTK_VERSION%%/filesystems/libgnome-vfs.so lib/libglade/2.0/libgnome.so lib/libgnomeui-2.a lib/libgnomeui-2.so -lib/libgnomeui-2.so.1000 +lib/libgnomeui-2.so.0 libdata/pkgconfig/libgnomeui-2.0.pc libexec/gnome_segv2 %%DOCSDIR%%/GnomeAbout.html @@ -187,6 +187,7 @@ share/locale/it/LC_MESSAGES/libgnomeui-2.0.mo share/locale/ja/LC_MESSAGES/libgnomeui-2.0.mo share/locale/kn/LC_MESSAGES/libgnomeui-2.0.mo share/locale/ko/LC_MESSAGES/libgnomeui-2.0.mo +share/locale/ku/LC_MESSAGES/libgnomeui-2.0.mo share/locale/li/LC_MESSAGES/libgnomeui-2.0.mo share/locale/lt/LC_MESSAGES/libgnomeui-2.0.mo share/locale/lv/LC_MESSAGES/libgnomeui-2.0.mo @@ -217,6 +218,7 @@ share/locale/sr@Latn/LC_MESSAGES/libgnomeui-2.0.mo share/locale/sr@ije/LC_MESSAGES/libgnomeui-2.0.mo share/locale/sv/LC_MESSAGES/libgnomeui-2.0.mo share/locale/ta/LC_MESSAGES/libgnomeui-2.0.mo +share/locale/te/LC_MESSAGES/libgnomeui-2.0.mo share/locale/th/LC_MESSAGES/libgnomeui-2.0.mo share/locale/tk/LC_MESSAGES/libgnomeui-2.0.mo share/locale/tr/LC_MESSAGES/libgnomeui-2.0.mo @@ -228,7 +230,11 @@ share/locale/yi/LC_MESSAGES/libgnomeui-2.0.mo share/locale/zh_CN/LC_MESSAGES/libgnomeui-2.0.mo share/locale/zh_TW/LC_MESSAGES/libgnomeui-2.0.mo share/locale/zu/LC_MESSAGES/libgnomeui-2.0.mo +@unexec rmdir %D/share/locale/te/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/te 2> /dev/null || true +@unexec rmdir %D/share/locale/ku/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/ku 2> /dev/null || true @dirrm %%DOCSDIR%% -@dirrm lib/gtk-2.0/%%GTK_VERSION%%/filesystems @dirrm include/libgnomeui-2.0/libgnomeui @dirrm include/libgnomeui-2.0 +@dirrm lib/gtk-2.0/%%GTK_VERSION%%/filesystems diff --git a/x11-toolkits/libwnck/Makefile b/x11-toolkits/libwnck/Makefile index 9c2b7d217131..359ec22f9d79 100644 --- a/x11-toolkits/libwnck/Makefile +++ b/x11-toolkits/libwnck/Makefile @@ -3,13 +3,14 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/x11-toolkits/libwnck/Makefile,v 1.52 2005/10/03 15:44:48 ahze Exp $ # PORTNAME= libwnck -PORTVERSION= 2.10.3 +PORTVERSION= 2.12.1 CATEGORIES= x11-toolkits gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.10 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.12 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -20,10 +21,10 @@ LIB_DEPENDS= startup-notification-1.0:${PORTSDIR}/x11/startup-notification USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes -USE_GNOME= gnomehack gtk20 +USE_GNOME= gnomehack gtk20 ltverhack USE_BISON= yes INSTALLS_SHLIB= yes -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/x11-toolkits/libwnck/distinfo b/x11-toolkits/libwnck/distinfo index 5f5414ccb045..c3ab6e15a530 100644 --- a/x11-toolkits/libwnck/distinfo +++ b/x11-toolkits/libwnck/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/libwnck-2.10.3.tar.bz2) = 0df4df1ae1129e521c77420d33a5b7f6 -SIZE (gnome2/libwnck-2.10.3.tar.bz2) = 429835 +MD5 (gnome2/libwnck-2.12.1.tar.bz2) = f7aad7b8dad79b38d3055d84c3838e2c +SIZE (gnome2/libwnck-2.12.1.tar.bz2) = 441443 diff --git a/x11-toolkits/libwnck/pkg-plist b/x11-toolkits/libwnck/pkg-plist index 2986836ba3d4..0036c70b6062 100644 --- a/x11-toolkits/libwnck/pkg-plist +++ b/x11-toolkits/libwnck/pkg-plist @@ -12,7 +12,7 @@ include/libwnck-1.0/libwnck/wnck-enum-types.h include/libwnck-1.0/libwnck/workspace.h lib/libwnck-1.a lib/libwnck-1.so -lib/libwnck-1.so.16 +lib/libwnck-1.so.18 libdata/pkgconfig/libwnck-1.0.pc %%DOCSDIR%%/ch01.html %%DOCSDIR%%/home.png @@ -113,14 +113,6 @@ share/locale/wa/LC_MESSAGES/libwnck.mo share/locale/xh/LC_MESSAGES/libwnck.mo share/locale/zh_CN/LC_MESSAGES/libwnck.mo share/locale/zh_TW/LC_MESSAGES/libwnck.mo -@unexec rmdir %D/share/locale/xh/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/xh 2> /dev/null || true -@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/mr/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/mr 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 %%DOCSDIR%% @dirrm include/libwnck-1.0/libwnck @dirrm include/libwnck-1.0 diff --git a/x11-toolkits/pango/Makefile b/x11-toolkits/pango/Makefile index 19610636faf2..b84857142399 100644 --- a/x11-toolkits/pango/Makefile +++ b/x11-toolkits/pango/Makefile @@ -3,20 +3,22 @@ # Whom: Maxim Sobolev <sobomax@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/x11-toolkits/pango/Makefile,v 1.43 2005/10/03 15:42:47 ahze Exp $ # PORTNAME= pango -PORTVERSION= 1.8.2 +PORTVERSION= 1.10.1 CATEGORIES= x11-toolkits -MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/${PORTNAME}/1.8,} \ - ftp://ftp.gtk.org/pub/gtk/v2.6/ +MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/${PORTNAME}/1.10,} \ + ftp://ftp.gtk.org/pub/gtk/v2.7/ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= An open-source framework for the layout and rendering of i18n text BUILD_DEPENDS= freetype-config:${PORTSDIR}/print/freetype2 -LIB_DEPENDS= Xft.2:${PORTSDIR}/x11-fonts/libXft +LIB_DEPENDS= Xft.2:${PORTSDIR}/x11-fonts/libXft \ + cairo.2:${PORTSDIR}/graphics/cairo RUN_DEPENDS= ${FONTSCALE}:${X_FONTS_TTF_PORT} \ ${FONTENCOD}:${X_FONTS_ENCODINGS_PORT} @@ -26,8 +28,8 @@ USE_X_PREFIX= yes USE_GMAKE= yes USE_REINPLACE= yes INSTALLS_SHLIB= yes -USE_LIBTOOL_VER=15 -USE_GNOME= gnomehack glib20 +USE_AUTOTOOLS= libtool:15 +USE_GNOME= gnomehack glib20 ltverhack CONFIGURE_ARGS= --with-qt=no \ --with-html-dir=${PREFIX}/share/doc \ --enable-static @@ -52,9 +54,6 @@ post-patch: @${FIND} ${WRKSRC}/pango/opentype -name "*.[ch]" | ${XARGS} \ ${REINPLACE_CMD} -e 's|internal/tterrors\.h|fterrors.h| ; \ s|TT_Err_|FT_Err_|g' - @${REINPLACE_CMD} -e 's|LT_VERSION_INFO="801:1:801"|LT_VERSION_INFO="800:1:800"|g' \ - ${WRKSRC}/configure - post-install: @${SED} -e 's|%%X11BASE%%|${X11BASE}|' < ${FILESDIR}/pkg-install.in \ > ${PKGINSTALL} diff --git a/x11-toolkits/pango/distinfo b/x11-toolkits/pango/distinfo index d3637baa544b..4666201303b7 100644 --- a/x11-toolkits/pango/distinfo +++ b/x11-toolkits/pango/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/pango-1.8.2.tar.bz2) = f5b5da7a173f0566d8217ec112fde993 -SIZE (gnome2/pango-1.8.2.tar.bz2) = 1021372 +MD5 (gnome2/pango-1.10.1.tar.bz2) = 1ff4c96982f61ea6f390d09a4febdf18 +SIZE (gnome2/pango-1.10.1.tar.bz2) = 1186783 diff --git a/x11-toolkits/pango/files/patch-ac b/x11-toolkits/pango/files/patch-ac index 362dcd3f45d5..e6215105d2ee 100644 --- a/x11-toolkits/pango/files/patch-ac +++ b/x11-toolkits/pango/files/patch-ac @@ -1,5 +1,6 @@ $FreeBSD$ + $MCom: ports/x11-toolkits/pango/files/patch-ac,v 1.15 2005/06/28 05:40:16 adamw Exp $ --- Makefile.in.orig Mon Aug 2 19:12:56 2004 +++ Makefile.in Mon Aug 2 19:13:11 2004 diff --git a/x11-toolkits/pango/pkg-plist b/x11-toolkits/pango/pkg-plist index 46c8656d3cde..9eb6d24a8d7c 100644 --- a/x11-toolkits/pango/pkg-plist +++ b/x11-toolkits/pango/pkg-plist @@ -22,6 +22,7 @@ include/pango-1.0/pango/pango-tabs.h include/pango-1.0/pango/pango-types.h include/pango-1.0/pango/pango-utils.h include/pango-1.0/pango/pango.h +include/pango-1.0/pango/pangocairo.h include/pango-1.0/pango/pangofc-decoder.h include/pango-1.0/pango/pangofc-font.h include/pango-1.0/pango/pangofc-fontmap.h @@ -31,16 +32,19 @@ include/pango-1.0/pango/pangoxft-render.h include/pango-1.0/pango/pangoxft.h lib/libpango-1.0.a lib/libpango-1.0.so -lib/libpango-1.0.so.800 +lib/libpango-1.0.so.0 +lib/libpangocairo-1.0.a +lib/libpangocairo-1.0.so +lib/libpangocairo-1.0.so.0 lib/libpangoft2-1.0.a lib/libpangoft2-1.0.so -lib/libpangoft2-1.0.so.800 +lib/libpangoft2-1.0.so.0 lib/libpangox-1.0.a lib/libpangox-1.0.so -lib/libpangox-1.0.so.800 +lib/libpangox-1.0.so.0 lib/libpangoxft-1.0.a lib/libpangoxft-1.0.so -lib/libpangoxft-1.0.so.800 +lib/libpangoxft-1.0.so.0 lib/pango/%%VERSION%%/modules/pango-arabic-fc.so lib/pango/%%VERSION%%/modules/pango-basic-fc.so lib/pango/%%VERSION%%/modules/pango-basic-x.so @@ -52,6 +56,7 @@ lib/pango/%%VERSION%%/modules/pango-syriac-fc.so lib/pango/%%VERSION%%/modules/pango-thai-fc.so lib/pango/%%VERSION%%/modules/pango-tibetan-fc.so libdata/pkgconfig/pango.pc +libdata/pkgconfig/pangocairo.pc libdata/pkgconfig/pangoft2.pc libdata/pkgconfig/pangox.pc libdata/pkgconfig/pangoxft.pc @@ -68,6 +73,7 @@ libdata/pkgconfig/pangoxft.pc %%DOCSDIR%%/layout.gif %%DOCSDIR%%/left.png %%DOCSDIR%%/lowlevel.html +%%DOCSDIR%%/pango-Cairo-Rendering.html %%DOCSDIR%%/pango-Coverage-Maps.html %%DOCSDIR%%/pango-Engines.html %%DOCSDIR%%/pango-Fonts.html @@ -88,6 +94,7 @@ libdata/pkgconfig/pangoxft.pc %%DOCSDIR%%/pango.html %%DOCSDIR%%/rendering.html %%DOCSDIR%%/right.png +%%DOCSDIR%%/rotated-text.png %%DOCSDIR%%/style.css %%DOCSDIR%%/tools.html %%DOCSDIR%%/up.png diff --git a/x11-wm/metacity/Makefile b/x11-wm/metacity/Makefile index f5260f70706c..7ef412c0aa2d 100644 --- a/x11-wm/metacity/Makefile +++ b/x11-wm/metacity/Makefile @@ -3,10 +3,11 @@ # Whom: Garrett Rooney <rooneg@electricjellyfish.net> # # $FreeBSD$ +# $MCom: ports/x11-wm/metacity/Makefile,v 1.59 2005/10/03 21:18:00 mezz Exp $ # PORTNAME= metacity -PORTVERSION= 2.10.3 +PORTVERSION= 2.12.1 CATEGORIES= x11-wm MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R} @@ -21,7 +22,7 @@ CONFLICTS= expocity-[0-9]* USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 USE_GNOME= gnomeprefix intlhack gnomehack gconf2 INSTALLS_SHLIB= yes CONFIGURE_ARGS= --enable-render diff --git a/x11-wm/metacity/distinfo b/x11-wm/metacity/distinfo index 7336fbebfb31..ea4cbcc1885d 100644 --- a/x11-wm/metacity/distinfo +++ b/x11-wm/metacity/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/metacity-2.10.3.tar.bz2) = ca60e4c135118dbc03f87dc10b164f45 -SIZE (gnome2/metacity-2.10.3.tar.bz2) = 1684968 +MD5 (gnome2/metacity-2.12.1.tar.bz2) = f702edb8599d7364ac58de9c0edfa798 +SIZE (gnome2/metacity-2.12.1.tar.bz2) = 1668143 diff --git a/x11-wm/metacity/pkg-plist b/x11-wm/metacity/pkg-plist index 509121e23254..1bb70d45a737 100644 --- a/x11-wm/metacity/pkg-plist +++ b/x11-wm/metacity/pkg-plist @@ -131,6 +131,7 @@ share/locale/he/LC_MESSAGES/metacity.mo share/locale/hi/LC_MESSAGES/metacity.mo share/locale/hr/LC_MESSAGES/metacity.mo share/locale/hu/LC_MESSAGES/metacity.mo +share/locale/hy/LC_MESSAGES/metacity.mo share/locale/id/LC_MESSAGES/metacity.mo share/locale/is/LC_MESSAGES/metacity.mo share/locale/it/LC_MESSAGES/metacity.mo @@ -154,13 +155,13 @@ share/locale/pt/LC_MESSAGES/metacity.mo share/locale/pt_BR/LC_MESSAGES/metacity.mo share/locale/ro/LC_MESSAGES/metacity.mo share/locale/ru/LC_MESSAGES/metacity.mo +share/locale/rw/LC_MESSAGES/metacity.mo share/locale/sk/LC_MESSAGES/metacity.mo share/locale/sl/LC_MESSAGES/metacity.mo share/locale/sq/LC_MESSAGES/metacity.mo share/locale/sr/LC_MESSAGES/metacity.mo share/locale/sr@Latn/LC_MESSAGES/metacity.mo share/locale/sv/LC_MESSAGES/metacity.mo -share/locale/rw/LC_MESSAGES/metacity.mo share/locale/ta/LC_MESSAGES/metacity.mo share/locale/th/LC_MESSAGES/metacity.mo share/locale/tk/LC_MESSAGES/metacity.mo diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile index 79b2c9131064..606142c11566 100644 --- a/x11/gnome-applets/Makefile +++ b/x11/gnome-applets/Makefile @@ -3,14 +3,15 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/x11/gnomeapplets2/Makefile,v 1.94 2005/10/08 19:41:40 marcus Exp $ # PORTNAME= gnomeapplets2 -PORTVERSION= 2.10.1 -PORTREVISION= 3 +PORTVERSION= 2.12.1 +PORTREVISION= 1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-applets/2.10 +MASTER_SITE_SUBDIR= sources/gnome-applets/2.12 DISTNAME= gnome-applets-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -28,10 +29,11 @@ USE_X_PREFIX= yes USE_GMAKE= yes GNOME_DESKTOP_VERSION=2 INSTALLS_OMF= yes +INSTALLS_ICONS= yes USE_GNOME= gnomeprefix gnomehack intlhack gnomepanel \ - gail + gail gnomedocutils USE_GSTREAMER= yes -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" \ FREEBSD_SYS=${FREEBSD_SYS} @@ -52,22 +54,6 @@ PLIST_SUB= BATTERY="@comment " .else GCONF_SCHEMAS+= battstat.schemas PLIST_SUB= BATTERY="" - -.if ${OSVERSION} < 600019 -.if ${OSVERSION} < 503105 || ${OSVERSION} >= 600000 -pre-everything:: - @${ECHO_MSG} "" - @${ECHO_MSG} " W A R N I N G" - @${ECHO_MSG} "*****************************************************" - @${ECHO_MSG} "* gnomeapplets2 requires that you have your kernel *" - @${ECHO_MSG} "* sources installed. If your kernel sources *" - @${ECHO_MSG} "* are somewhere other than /usr/src/sys, you *" - @${ECHO_MSG} "* may set the FREEBSD_SYS variable to the *" - @${ECHO_MSG} "* correct path. *" - @${ECHO_MSG} "*****************************************************" - @${ECHO_MSG} "" -.endif -.endif .endif .if ${ARCH} != "i386" && ${ARCH} != "amd64" diff --git a/x11/gnome-applets/distinfo b/x11/gnome-applets/distinfo index 543fc30599f3..ad6838c15a4d 100644 --- a/x11/gnome-applets/distinfo +++ b/x11/gnome-applets/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-applets-2.10.1.tar.bz2) = da9cd75f77972c96eec9551d41878a7f -SIZE (gnome2/gnome-applets-2.10.1.tar.bz2) = 6250092 +MD5 (gnome2/gnome-applets-2.12.1.tar.bz2) = 06dd0b634d7092fa8af2ce302f68f912 +SIZE (gnome2/gnome-applets-2.12.1.tar.bz2) = 5369404 diff --git a/x11/gnome-applets/files/patch-aa b/x11/gnome-applets/files/patch-aa index 9e8038833e85..48b84e4569f6 100644 --- a/x11/gnome-applets/files/patch-aa +++ b/x11/gnome-applets/files/patch-aa @@ -1,15 +1,6 @@ ---- configure.orig Tue Mar 1 12:35:29 2005 -+++ configure Tue Mar 1 12:36:09 2005 -@@ -463,7 +463,7 @@ - # include <unistd.h> - #endif" - --ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XAM_RULE INTLTOOL_KBD_RULE INTLTOOL_XML_RULE INTLTOOL_XML_NOMERGE_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL INTLTOOL_ICONV INTLTOOL_MSGFMT INTLTOOL_MSGMERGE INTLTOOL_XGETTEXT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL PATH_TO_XRDB X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS WARN_CFLAGS PKG_CONFIG GAILUTIL_CFLAGS GAILUTIL_LIBS GNOME_APPLETS_CFLAGS GNOME_APPLETS_LIBS GNOME_LIBS2_CFLAGS GNOME_LIBS2_LIBS GNOME_VFS_APPLETS_CFLAGS GNOME_VFS_APPLETS_LIBS BUILD_GNOME_VFS_APPLETS_TRUE BUILD_GNOME_VFS_APPLETS_FALSE LIBGLADE_CFLAGS LIBGLADE_LIBS GDK_PIXBUF_CSOURCE GCONFTOOL GCONF_SCHEMA_CONFIG_SOURCE GCONF_SCHEMA_FILE_DIR GCONF_SCHEMAS_INSTALL_TRUE GCONF_SCHEMAS_INSTALL_FALSE XSLTPROC GTOP_APPLETS_CFLAGS GTOP_APPLETS_LIBS BUILD_GTOP_APPLETS_TRUE BUILD_GTOP_APPLETS_FALSE LIBXKLAVIER_CFLAGS LIBXKLAVIER_LIBS ENABLE_FLAGS_TRUE ENABLE_FLAGS_FALSE LIBWNCK_CFLAGS LIBWNCK_LIBS INCLUDE_GSWITCHIT_DEVEL_TRUE INCLUDE_GSWITCHIT_DEVEL_FALSE GETTEXT_PACKAGE GNOMELOCALEDIR USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS gnomelocaledir SCROLLKEEPER_CONFIG SCROLLKEEPER_REQUIRED JW HAVE_JW_TRUE HAVE_JW_FALSE HAVE_JW GKB_SUN_TRUE GKB_SUN_FALSE HAVE_LIBAPM NEED_LIBAPM HAVE_LIBAPM_TRUE HAVE_LIBAPM_FALSE NEED_LIBAPM_TRUE NEED_LIBAPM_FALSE BUILD_BATTSTAT_APPLET_TRUE BUILD_BATTSTAT_APPLET_FALSE MIXER_CFLAGS MIXER_LIBS APPLET_MIXER_TRUE APPLET_MIXER_FALSE GUCHARMAP_CFLAGS GUCHARMAP_LIBS APPLET_ACCESSX_TRUE APPLET_ACCESSX_FALSE APPLET_GSWITCHIT_TRUE APPLET_GSWITCHIT_FALSE SU_TOOL STB_SCRIPTS_DIR APPLET_MODEMLIGHTS_TRUE APPLET_MODEMLIGHTS_FALSE MODEMLIGHTS_LIBS CPUFREQ_SELECTOR_CFLAGS CPUFREQ_SELECTOR_LIBS BUILD_CPUFREQ_APPLET_TRUE BUILD_CPUFREQ_APPLET_FALSE BUILD_CPUFREQ_SELECTOR_TRUE BUILD_CPUFREQ_SELECTOR_FALSE CPUFREQ_SELECTOR_SUID_TRUE CPUFREQ_SELECTOR_SUID_FALSE ACLOCAL_AMFLAGS iconsdir pixmapsdir pkgdatadir gladedir GNOME_ICONDIR GNOME_PIXMAPSDIR GNOME_GLADEDIR DATADIR SYSCONFDIR LIBDIR PREFIX LIBOBJS LTLIBOBJS' -+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XAM_RULE INTLTOOL_KBD_RULE INTLTOOL_XML_RULE INTLTOOL_XML_NOMERGE_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL INTLTOOL_ICONV INTLTOOL_MSGFMT INTLTOOL_MSGMERGE INTLTOOL_XGETTEXT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL PATH_TO_XRDB X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS WARN_CFLAGS PKG_CONFIG GAILUTIL_CFLAGS GAILUTIL_LIBS GNOME_APPLETS_CFLAGS GNOME_APPLETS_LIBS GNOME_LIBS2_CFLAGS GNOME_LIBS2_LIBS GNOME_VFS_APPLETS_CFLAGS GNOME_VFS_APPLETS_LIBS BUILD_GNOME_VFS_APPLETS_TRUE BUILD_GNOME_VFS_APPLETS_FALSE LIBGLADE_CFLAGS LIBGLADE_LIBS GDK_PIXBUF_CSOURCE GCONFTOOL GCONF_SCHEMA_CONFIG_SOURCE GCONF_SCHEMA_FILE_DIR GCONF_SCHEMAS_INSTALL_TRUE GCONF_SCHEMAS_INSTALL_FALSE XSLTPROC GTOP_APPLETS_CFLAGS GTOP_APPLETS_LIBS BUILD_GTOP_APPLETS_TRUE BUILD_GTOP_APPLETS_FALSE LIBXKLAVIER_CFLAGS LIBXKLAVIER_LIBS ENABLE_FLAGS_TRUE ENABLE_FLAGS_FALSE LIBWNCK_CFLAGS LIBWNCK_LIBS INCLUDE_GSWITCHIT_DEVEL_TRUE INCLUDE_GSWITCHIT_DEVEL_FALSE GETTEXT_PACKAGE GNOMELOCALEDIR USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS gnomelocaledir SCROLLKEEPER_CONFIG SCROLLKEEPER_REQUIRED JW HAVE_JW_TRUE HAVE_JW_FALSE HAVE_JW GKB_SUN_TRUE GKB_SUN_FALSE ACPIINC HAVE_LIBAPM NEED_LIBAPM HAVE_LIBAPM_TRUE HAVE_LIBAPM_FALSE NEED_LIBAPM_TRUE NEED_LIBAPM_FALSE BUILD_BATTSTAT_APPLET_TRUE BUILD_BATTSTAT_APPLET_FALSE MIXER_CFLAGS MIXER_LIBS APPLET_MIXER_TRUE APPLET_MIXER_FALSE GUCHARMAP_CFLAGS GUCHARMAP_LIBS APPLET_ACCESSX_TRUE APPLET_ACCESSX_FALSE APPLET_GSWITCHIT_TRUE APPLET_GSWITCHIT_FALSE SU_TOOL STB_SCRIPTS_DIR APPLET_MODEMLIGHTS_TRUE APPLET_MODEMLIGHTS_FALSE MODEMLIGHTS_LIBS CPUFREQ_SELECTOR_CFLAGS CPUFREQ_SELECTOR_LIBS BUILD_CPUFREQ_APPLET_TRUE BUILD_CPUFREQ_APPLET_FALSE BUILD_CPUFREQ_SELECTOR_TRUE BUILD_CPUFREQ_SELECTOR_FALSE CPUFREQ_SELECTOR_SUID_TRUE CPUFREQ_SELECTOR_SUID_FALSE ACLOCAL_AMFLAGS iconsdir pixmapsdir pkgdatadir gladedir GNOME_ICONDIR GNOME_PIXMAPSDIR GNOME_GLADEDIR DATADIR SYSCONFDIR LIBDIR PREFIX LIBOBJS LTLIBOBJS' - ac_subst_files='' - - # Initialize some variables set by options. -@@ -23136,8 +23136,7 @@ +--- configure.orig Sat Jul 16 12:55:48 2005 ++++ configure Sat Jul 16 13:04:33 2005 +@@ -23272,8 +23272,7 @@ test "x$prefix" = xNONE && prefix="$ac_default_prefix" test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' @@ -19,30 +10,35 @@ GNOMELOCALEDIR="$ac_define_dir" -@@ -24838,6 +24837,7 @@ - - HAVE_LIBAPM=no - NEED_LIBAPM=no -+ACPIINC= - build_battstat_applet=no - - if test x$disable_battstat = xno; then -@@ -24989,7 +24989,12 @@ +@@ -25126,7 +25125,7 @@ ;; # list of supported OS cores that do not use libapm -- *-*-freebsd*|*-*-netbsd*|*-*-openbsd*) +- i386-*-freebsd*|*-*-netbsd*|*-*-openbsd*) + i386-*-freebsd*|amd64-*-freebsd*|*-*-netbsd*|*-*-openbsd*) -+ if [ -n "${FREEBSD_SYS}" ]; then -+ ACPIINC="-I${FREEBSD_SYS}" -+ else -+ ACPIINC="-I/usr/src/sys" -+ fi - ;; - *) - echo "warning: ${host} is not supported by battstat_applet, not building" >&2 -@@ -25795,6 +25800,9 @@ - *linux*) + if -n "${OS_SYS}" ; then + ACPIINC="-I${OS_SYS}" + else +@@ -25406,7 +25405,7 @@ + APPLET_MIXER_FALSE= + fi + +-if test x"$P_MIXER" == x"mixer"; then ++if test x"$P_MIXER" = x"mixer"; then + echo "$as_me:$LINENO: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + else +@@ -25983,7 +25982,7 @@ + fi + + +-if test "x$SU_TOOL" == "x" -o "x$HAVE_LIBUTIL" != "xtrue" -o "x$P_MODEMLIGHTS" != "xmodemlights"; then ++if test "x$SU_TOOL" = "x" -o "x$HAVE_LIBUTIL" != "xtrue" -o "x$P_MODEMLIGHTS" != "xmodemlights"; then + { echo "$as_me:$LINENO: WARNING: *** \`modemlights' applet will not be built ***" >&5 + echo "$as_me: WARNING: *** \`modemlights' applet will not be built ***" >&2;} + else +@@ -26119,6 +26118,9 @@ + echo "${ECHO_T}yes" >&6 build_cpufreq_applet=yes ;; + i386-*-freebsd*|amd64-*-freebsd*) @@ -51,7 +47,7 @@ *) echo "warning: ${host} is not supported by cpufreq applet, not building" >&2 build_cpufreq_applet=no -@@ -26085,7 +26093,7 @@ +@@ -26409,7 +26411,7 @@ ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}" @@ -60,7 +56,7 @@ pixmapsdir="${datadir}/pixmaps" -@@ -26099,8 +26107,7 @@ +@@ -26423,8 +26425,7 @@ test "x$prefix" = xNONE && prefix="$ac_default_prefix" test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' @@ -70,7 +66,7 @@ GNOME_ICONDIR="$ac_define_dir" -@@ -26112,8 +26119,7 @@ +@@ -26436,8 +26437,7 @@ test "x$prefix" = xNONE && prefix="$ac_default_prefix" test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' @@ -80,7 +76,7 @@ GNOME_PIXMAPSDIR="$ac_define_dir" -@@ -26125,8 +26131,7 @@ +@@ -26449,8 +26449,7 @@ test "x$prefix" = xNONE && prefix="$ac_default_prefix" test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' @@ -90,7 +86,7 @@ GNOME_GLADEDIR="$ac_define_dir" -@@ -26138,8 +26143,7 @@ +@@ -26462,8 +26461,7 @@ test "x$prefix" = xNONE && prefix="$ac_default_prefix" test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' @@ -100,7 +96,7 @@ DATADIR="$ac_define_dir" -@@ -26151,8 +26155,7 @@ +@@ -26475,8 +26473,7 @@ test "x$prefix" = xNONE && prefix="$ac_default_prefix" test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' @@ -110,7 +106,7 @@ SYSCONFDIR="$ac_define_dir" -@@ -26164,8 +26167,7 @@ +@@ -26488,8 +26485,7 @@ test "x$prefix" = xNONE && prefix="$ac_default_prefix" test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' @@ -120,7 +116,7 @@ LIBDIR="$ac_define_dir" -@@ -26177,8 +26179,7 @@ +@@ -26501,8 +26497,7 @@ test "x$prefix" = xNONE && prefix="$ac_default_prefix" test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' @@ -130,11 +126,3 @@ PREFIX="$ac_define_dir" -@@ -27311,6 +27312,7 @@ - s,@GKB_SUN_FALSE@,$GKB_SUN_FALSE,;t t - s,@HAVE_LIBAPM@,$HAVE_LIBAPM,;t t - s,@NEED_LIBAPM@,$NEED_LIBAPM,;t t -+s,@ACPIINC@,$ACPIINC,;t t - s,@HAVE_LIBAPM_TRUE@,$HAVE_LIBAPM_TRUE,;t t - s,@HAVE_LIBAPM_FALSE@,$HAVE_LIBAPM_FALSE,;t t - s,@NEED_LIBAPM_TRUE@,$NEED_LIBAPM_TRUE,;t t diff --git a/x11/gnome-applets/files/patch-battstat-acpi b/x11/gnome-applets/files/patch-battstat-acpi deleted file mode 100644 index 903e8b951d11..000000000000 --- a/x11/gnome-applets/files/patch-battstat-acpi +++ /dev/null @@ -1,576 +0,0 @@ ---- battstat/Makefile.in.orig Mon Jan 24 20:20:49 2005 -+++ battstat/Makefile.in Mon Jan 24 20:22:02 2005 -@@ -55,9 +55,10 @@ - PROGRAMS = $(libexec_PROGRAMS) - am_battstat_applet_2_OBJECTS = properties.$(OBJEXT) \ - battstat_applet.$(OBJEXT) power-management.$(OBJEXT) \ -- acpi-linux.$(OBJEXT) -+ acpi-freebsd.$(OBJEXT) acpi-linux.$(OBJEXT) - battstat_applet_2_OBJECTS = $(am_battstat_applet_2_OBJECTS) - am__DEPENDENCIES_1 = -+ACPIINC = @ACPIINC@ - @HAVE_LIBAPM_FALSE@@NEED_LIBAPM_TRUE@am__DEPENDENCIES_2 = \ - @HAVE_LIBAPM_FALSE@@NEED_LIBAPM_TRUE@ apmlib/libapm.a - battstat_applet_2_DEPENDENCIES = $(am__DEPENDENCIES_1) \ -@@ -66,6 +67,7 @@ - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/acpi-linux.Po \ -+@AMDEP_TRUE@ ./$(DEPDIR)/acpi-freebsd.Po \ - @AMDEP_TRUE@ ./$(DEPDIR)/battstat_applet.Po \ - @AMDEP_TRUE@ ./$(DEPDIR)/power-management.Po \ - @AMDEP_TRUE@ ./$(DEPDIR)/properties.Po -@@ -336,6 +338,7 @@ - $(GNOME_APPLETS_CFLAGS) \ - $(LIBGLADE_CFLAGS) \ - $(APMINC) \ -+ $(ACPIINC) \ - -DG_LOG_DOMAIN=\"battstat_applet\" - - battstat_applet_2_SOURCES = \ -@@ -345,7 +348,9 @@ - battstat_applet.c \ - power-management.c \ - acpi-linux.c \ -- acpi-linux.h -+ acpi-linux.h \ -+ acpi-freebsd.c \ -+ acpi-freebsd.h - - battstat_applet_2_LDADD = \ - $(GNOME_APPLETS_LIBS) \ -@@ -439,6 +444,7 @@ - -rm -f *.tab.c - - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acpi-linux.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acpi-freebsd.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/battstat_applet.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/power-management.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/properties.Po@am__quote@ ---- battstat/battstat_applet.c.orig Mon Jan 24 12:51:51 2005 -+++ battstat/battstat_applet.c Mon Jan 24 20:20:50 2005 -@@ -953,6 +953,7 @@ - "Seth Nickell <snickell@stanford.edu> (GNOME2 port)", - "Davyd Madeley <davyd@madeley.id.au>", - "Ryan Lortie <desrt@desrt.ca>", -+ "Joe Marcus Clarke <marcus@FreeBSD.org> (FreeBSD ACPI support)", - NULL - }; - ---- battstat/properties.c.orig Fri Jan 14 23:38:18 2005 -+++ battstat/properties.c Mon Mar 14 19:49:26 2005 -@@ -27,7 +27,7 @@ - - #include <stdio.h> - --#ifdef __FreeBSD__ -+#if defined(__FreeBSD__) && defined(__i386__) - #include <machine/apm_bios.h> - #elif defined(__NetBSD__) || defined(__OpenBSD__) - #include <sys/param.h> -@@ -61,6 +61,9 @@ - #include <panel-applet-gconf.h> - /*#include <status-docklet.h>*/ - -+#if defined(__FreeBSD__) && !defined(__i386__) -+#include "acpi-freebsd.h" -+#endif - #include "battstat.h" - - #ifndef gettext_noop ---- battstat/acpi-freebsd.c.orig Sun Jul 3 16:00:01 2005 -+++ battstat/acpi-freebsd.c Sun Jul 3 16:23:26 2005 -@@ -0,0 +1,280 @@ -+/* battstat A GNOME battery meter for laptops. -+ * Copyright (C) 2000 by Jörgen Pehrson <jp@spektr.eu.org> -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA. -+ * -+ $Id: patch-battstat-acpi,v 1.13 2005/02/28 08:02:03 marcus Exp $ -+ */ -+ -+/* -+ * ACPI battery functions for FreeBSD >= 5.2. -+ * September 2004 by Joe Marcus Clarke <marcus@FreeBSD.org> -+ */ -+ -+#ifdef HAVE_CONFIG_H -+#include <config.h> -+#endif -+ -+#ifdef __FreeBSD__ -+ -+#include <stdio.h> -+#include <sys/types.h> -+#include <sys/socket.h> -+#include <sys/sysctl.h> -+#include <sys/un.h> -+#include <sys/ioctl.h> -+#if defined(__i386__) -+#include <machine/apm_bios.h> -+#endif -+#include <stdlib.h> -+#include <errno.h> -+#include <unistd.h> -+#include <fcntl.h> -+#include <glib.h> -+ -+#include <dev/acpica/acpiio.h> -+ -+#include "acpi-freebsd.h" -+ -+static gboolean -+update_ac_info(struct acpi_info * acpiinfo) -+{ -+ int acline; -+ size_t len = sizeof(acline); -+ -+ acpiinfo->ac_online = FALSE; -+ -+ if (sysctlbyname(ACPI_ACLINE, &acline, &len, NULL, 0) == -1) { -+ return FALSE; -+ } -+ -+ acpiinfo->ac_online = acline ? TRUE : FALSE; -+ -+ return TRUE; -+} -+ -+static gboolean -+update_battery_info(struct acpi_info * acpiinfo) -+{ -+ union acpi_battery_ioctl_arg battio; -+ int i; -+ -+ /* We really don't have to do this here. All of the relevant battery -+ * info can be obtained through sysctl. However, one day, the rate -+ * may be useful to get time left to full charge. -+ */ -+ -+ for(i = BATT_MIN; i < BATT_MAX; i++) { -+ battio.unit = i; -+ if (ioctl(acpiinfo->acpifd, ACPIIO_CMBAT_GET_BIF, &battio) == -1) { -+ continue; -+ } -+ -+ acpiinfo->max_capacity += battio.bif.lfcap; -+ acpiinfo->low_capacity += battio.bif.wcap; -+ acpiinfo->critical_capacity += battio.bif.lcap; -+ } -+ -+ return TRUE; -+} -+ -+gboolean -+acpi_freebsd_init(struct acpi_info * acpiinfo) -+{ -+ int acpi_fd; -+ int event_fd; -+ -+ g_assert(acpiinfo); -+ -+ if (acpiinfo->acpifd == -1) { -+ acpi_fd = open(ACPIDEV, O_RDONLY); -+ if (acpi_fd >= 0) { -+ acpiinfo->acpifd = acpi_fd; -+ } -+ else { -+ acpiinfo->acpifd = -1; -+ return FALSE; -+ } -+ } -+ -+ event_fd = socket(PF_UNIX, SOCK_STREAM, 0); -+ if (event_fd >= 0) { -+ struct sockaddr_un addr; -+ addr.sun_family = AF_UNIX; -+ strcpy(addr.sun_path, "/var/run/devd.pipe"); -+ if (connect(event_fd, (struct sockaddr *) &addr, sizeof(addr)) == 0) { -+ acpiinfo->event_fd = event_fd; -+ acpiinfo->event_inited = TRUE; -+ acpiinfo->channel = g_io_channel_unix_new(event_fd); -+ } -+ else { -+ close(event_fd); -+ acpiinfo->event_fd = -1; -+ acpiinfo->event_inited = FALSE; -+ } -+ } -+ -+ update_battery_info(acpiinfo); -+ update_ac_info(acpiinfo); -+ -+ return TRUE; -+} -+ -+#define ACPI_EVENT_IGNORE 0 -+#define ACPI_EVENT_AC 1 -+#define ACPI_EVENT_BATTERY_INFO 2 -+ -+static int parse_acpi_event(GString *buffer) -+{ -+ if (strstr(buffer->str, "system=ACPI")) { -+ if (strstr(buffer->str, "subsystem=ACAD")) -+ return ACPI_EVENT_AC; -+ if (strstr(buffer->str, "subsystem=CMBAT")) -+ return ACPI_EVENT_BATTERY_INFO; -+ } -+ -+ return ACPI_EVENT_IGNORE; -+} -+ -+void acpi_freebsd_update(struct acpi_info *acpiinfo) -+{ -+ /* XXX This is needed for systems where devd does not have permissions -+ * to allow for event-driven updates. -+ */ -+ update_ac_info(acpiinfo); -+ update_battery_info(acpiinfo); -+} -+ -+gboolean acpi_process_event(struct acpi_info *acpiinfo, gboolean *read_error) -+{ -+ gsize i; -+ int evt; -+ gboolean result = FALSE; -+ GString *buffer; -+ GIOStatus stat; -+ buffer = g_string_new(NULL); -+ -+ *read_error = FALSE; -+ stat = g_io_channel_read_line_string(acpiinfo->channel, buffer, &i, NULL); -+ -+ if (stat == G_IO_STATUS_ERROR || stat == G_IO_STATUS_EOF) { -+ *read_error = TRUE; -+ g_string_free(buffer, TRUE); -+ return FALSE; -+ } -+ -+ evt = parse_acpi_event(buffer); -+ switch (evt) { -+ case ACPI_EVENT_AC: -+ update_ac_info(acpiinfo); -+ result = TRUE; -+ break; -+ case ACPI_EVENT_BATTERY_INFO: -+ update_battery_info(acpiinfo); -+ result = TRUE; -+ break; -+ } -+ -+ g_string_free(buffer, TRUE); -+ return result; -+} -+ -+void -+acpi_freebsd_cleanup(struct acpi_info * acpiinfo) -+{ -+ g_assert(acpiinfo); -+ -+ if (acpiinfo->acpifd >= 0) { -+ close(acpiinfo->acpifd); -+ acpiinfo->acpifd = -1; -+ } -+ -+ if (acpiinfo->event_fd >= 0) { -+ g_io_channel_unref(acpiinfo->channel); -+ close(acpiinfo->event_fd); -+ acpiinfo->event_fd = -1; -+ } -+} -+ -+gboolean -+acpi_freebsd_read(struct apm_info *apminfo, struct acpi_info * acpiinfo) -+{ -+ int time; -+ int life; -+ int acline; -+ int state; -+ size_t len; -+ int rate; -+ int remain; -+ union acpi_battery_ioctl_arg battio; -+ gboolean charging; -+ int i; -+ -+ g_assert(acpiinfo); -+ -+ charging = FALSE; -+ -+ for(i = BATT_MIN; i < BATT_MAX; i++) { -+ battio.unit = i; -+ if (ioctl(acpiinfo->acpifd, ACPIIO_CMBAT_GET_BST, &battio) == -1) { -+ continue; -+ } -+ -+ remain += battio.bst.cap; -+ rate += battio.bst.rate; -+ } -+ -+ len = sizeof(time); -+ if (sysctlbyname(ACPI_TIME, &time, &len, NULL, 0) == -1) { -+ return FALSE; -+ } -+ -+ len = sizeof(life); -+ if (sysctlbyname(ACPI_LIFE, &life, &len, NULL, 0) == -1) { -+ return FALSE; -+ } -+ -+ len = sizeof(state); -+ if (sysctlbyname(ACPI_STATE, &state, &len, NULL, 0) == -1) { -+ return FALSE; -+ } -+ -+ apminfo->ai_acline = acpiinfo->ac_online ? 1 : 0; -+ if (state & ACPI_BATT_STAT_CHARGING) { -+ apminfo->ai_batt_stat = 3; -+ charging = TRUE; -+ } -+ else if (state & ACPI_BATT_STAT_CRITICAL) { -+ /* Add a special check here since FreeBSD's ACPI interface will tell us -+ * when the battery is critical. -+ */ -+ apminfo->ai_batt_stat = 2; -+ } -+ else { -+ apminfo->ai_batt_stat = remain < acpiinfo->low_capacity ? 1 : remain < acpiinfo->critical_capacity ? 2 : 0; -+ } -+ apminfo->ai_batt_life = life; -+ if (!charging) { -+ apminfo->ai_batt_time = time; -+ } -+ else if (charging && rate > 0) { -+ apminfo->ai_batt_time = (int) ((acpiinfo->max_capacity-remain)/(float)rate); -+ } -+ else -+ apminfo->ai_batt_time = -1; -+ -+ return TRUE; -+} -+#endif ---- battstat/acpi-freebsd.h.orig Sun Jul 3 16:00:01 2005 -+++ battstat/acpi-freebsd.h Sun Jul 3 16:23:56 2005 -@@ -0,0 +1,60 @@ -+/* -+ * Copyright (C) 2004 by Joe Marcus Clarke <marcus@FreeBSD.org> -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA. -+ */ -+ -+#ifndef __ACPI_FREEBSD_H__ -+#define __ACPI_FREEBSD_H__ -+ -+#define ACPIDEV "/dev/acpi" -+ -+#define BATT_MIN 0 -+#define BATT_MAX 64 -+ -+#define ACPI_ACLINE "hw.acpi.acline" -+#define ACPI_TIME "hw.acpi.battery.time" -+#define ACPI_LIFE "hw.acpi.battery.life" -+#define ACPI_STATE "hw.acpi.battery.state" -+ -+/* XXX: AMD64 does not have machine/apm_bios.h. */ -+#if !defined(__i386__) -+struct apm_info { -+ guint ai_acline; -+ guint ai_batt_stat; -+ guint ai_batt_life; -+ int ai_batt_time; -+ guint ai_status; -+}; -+#endif -+ -+struct acpi_info { -+ gboolean ac_online; -+ gboolean event_inited; -+ int acpifd; -+ int event_fd; -+ int max_capacity; -+ int low_capacity; -+ int critical_capacity; -+ GIOChannel * channel; -+}; -+ -+gboolean acpi_freebsd_read(struct apm_info *apminfo, struct acpi_info * acpiinfo); -+void acpi_freebsd_update(struct acpi_info * acpiinfo); -+gboolean acpi_process_event(struct acpi_info * acpiinfo, gboolean *read_error); -+gboolean acpi_freebsd_init(struct acpi_info * acpiinfo); -+void acpi_freebsd_cleanup(struct acpi_info * acpiinfo); -+ -+#endif /* __ACPI_FREEBSD_H__ */ ---- battstat/power-management.c.orig Sun Mar 20 05:20:55 2005 -+++ battstat/power-management.c Sun Jul 3 16:21:42 2005 -@@ -73,12 +73,42 @@ static int pm_initialised; - * the problem might be. This error message is not to be freed. - */ - --#ifdef __FreeBSD__ -- -+#if defined(__FreeBSD__) -+#if defined(__i386__) - #include <machine/apm_bios.h> -+#endif -+#include "acpi-freebsd.h" -+ -+static struct acpi_info acpiinfo; -+static gboolean using_acpi; -+static int acpi_count; -+static int acpiwatch; -+static struct apm_info apminfo; -+ -+gboolean acpi_freebsd_read(struct apm_info *apminfo, struct acpi_info *acpiinfo); - - #define APMDEVICE "/dev/apm" - -+static gboolean acpi_callback (GIOChannel * chan, GIOCondition cond, gpointer data) -+{ -+ gboolean read_error; -+ -+ if (cond & (G_IO_ERR | G_IO_HUP)) { -+ acpi_freebsd_cleanup(&acpiinfo); -+ return FALSE; -+ } -+ -+ if (acpi_process_event(&acpiinfo, &read_error)) { -+ acpi_freebsd_read(&apminfo, &acpiinfo); -+ } -+ else if (read_error) { -+ acpi_freebsd_cleanup(&acpiinfo); -+ return FALSE; -+ } -+ -+ return TRUE; -+} -+ - static const char * - apm_readinfo (BatteryStatus *status) - { -@@ -86,32 +116,56 @@ apm_readinfo (BatteryStatus *status) - FreeBSD. Each time this functions is called (once every second) - the APM device is opened, read from and then closed. - */ -- struct apm_info apminfo; - int fd; - - if (DEBUG) g_print("apm_readinfo() (FreeBSD)\n"); - -- fd = open(APMDEVICE, O_RDONLY); -- if (fd == -1) -- { -- pm_initialised = 0; -- return ERR_OPEN_APMDEV; -+ if (using_acpi && (!acpiinfo.event_inited || acpiinfo.event_fd >= 0)) { -+ if (acpi_count <= 0) { -+ acpi_count = 30; -+ if (!acpiinfo.event_inited) { -+ acpi_freebsd_update(&acpiinfo); -+ } -+ acpi_freebsd_read(&apminfo, &acpiinfo); -+ } -+ acpi_count--; -+ } -+ else if (using_acpi && acpiinfo.event_inited) { -+ if (acpi_freebsd_init(&acpiinfo)) { -+ acpiwatch = g_io_add_watch (acpiinfo.channel, -+ G_IO_IN | G_IO_ERR | G_IO_HUP, -+ acpi_callback, NULL); -+ acpi_freebsd_read(&apminfo, &acpiinfo); -+ } - } -+ else { -+#if defined(__i386__) -+ fd = open(APMDEVICE, O_RDONLY); -+ if (fd == -1) { -+ return ERR_OPEN_APMDEV; -+ } - -- if (ioctl(fd, APMIO_GETINFO, &apminfo) == -1) -- err(1, "ioctl(APMIO_GETINFO)"); -+ if (ioctl(fd, APMIO_GETINFO, &apminfo) == -1) -+ err(1, "ioctl(APMIO_GETINFO)"); - -- close(fd); -+ close(fd); - -- if(apminfo.ai_status == 0) -- return ERR_APM_E; -+ if(apminfo.ai_status == 0) -+ return ERR_APM_E; -+#else -+ return ERR_OPEN_APMDEV; -+#endif -+ } - - status->present = TRUE; - status->on_ac_power = apminfo.ai_acline ? 1 : 0; - status->state = apminfo.ai_batt_stat; - status->percent = apminfo.ai_batt_life; - status->charging = (status->state == 3) ? TRUE : FALSE; -- status->minutes = apminfo.ai_batt_time; -+ if (using_acpi) -+ status->minutes = apminfo.ai_batt_time; -+ else -+ status->minutes = (int) (apminfo.ai_batt_time/60.0); - - return NULL; - } -@@ -339,6 +393,19 @@ power_management_initialise( void ) - G_IO_IN | G_IO_ERR | G_IO_HUP, - acpi_callback, NULL); - } -+#elif defined(__FreeBSD__) -+ if (acpi_freebsd_init(&acpiinfo)) { -+ using_acpi = TRUE; -+ acpi_count = 0; -+ } -+ else -+ using_acpi = FALSE; -+ -+ if (using_acpi && acpiinfo.event_fd >= 0) { -+ acpiwatch = g_io_add_watch (acpiinfo.channel, -+ G_IO_IN | G_IO_ERR | G_IO_HUP, -+ acpi_callback, NULL); -+ } - #endif - pm_initialised = 1; - -@@ -360,6 +427,13 @@ power_management_cleanup( void ) - g_source_remove(acpiwatch); - acpiwatch = 0; - acpi_linux_cleanup(&acpiinfo); -+ } -+#elif defined(__FreeBSD__) -+ if (using_acpi) { -+ if (acpiwatch != 0) -+ g_source_remove(acpiwatch); -+ acpiwatch = 0; -+ acpi_freebsd_cleanup(&acpiinfo); - } - #endif - diff --git a/x11/gnome-applets/files/patch-battstat_acpi-freebsd.c b/x11/gnome-applets/files/patch-battstat_acpi-freebsd.c new file mode 100644 index 000000000000..48746fa03bbd --- /dev/null +++ b/x11/gnome-applets/files/patch-battstat_acpi-freebsd.c @@ -0,0 +1,152 @@ +--- battstat/acpi-freebsd.c.orig Sun Jul 3 16:41:26 2005 ++++ battstat/acpi-freebsd.c Sun Jul 3 16:49:55 2005 +@@ -31,9 +31,13 @@ + + #include <stdio.h> + #include <sys/types.h> ++#include <sys/socket.h> + #include <sys/sysctl.h> ++#include <sys/un.h> + #include <sys/ioctl.h> ++#if defined(__i386__) + #include <machine/apm_bios.h> ++#endif + #include <stdlib.h> + #include <errno.h> + #include <unistd.h> +@@ -92,16 +96,36 @@ gboolean + acpi_freebsd_init(struct acpi_info * acpiinfo) + { + int acpi_fd; ++ int event_fd; + + g_assert(acpiinfo); + +- acpi_fd = open(ACPIDEV, O_RDONLY); +- if (acpi_fd >= 0) { +- acpiinfo->acpifd = acpi_fd; ++ if (acpiinfo->acpifd == -1) { ++ acpi_fd = open(ACPIDEV, O_RDONLY); ++ if (acpi_fd >= 0) { ++ acpiinfo->acpifd = acpi_fd; ++ } ++ else { ++ acpiinfo->acpifd = -1; ++ return FALSE; ++ } + } +- else { +- acpiinfo->acpifd = -1; +- return FALSE; ++ ++ event_fd = socket(PF_UNIX, SOCK_STREAM, 0); ++ if (event_fd >= 0) { ++ struct sockaddr_un addr; ++ addr.sun_family = AF_UNIX; ++ strcpy(addr.sun_path, "/var/run/devd.pipe"); ++ if (connect(event_fd, (struct sockaddr *) &addr, sizeof(addr)) == 0) { ++ acpiinfo->event_fd = event_fd; ++ acpiinfo->event_inited = TRUE; ++ acpiinfo->channel = g_io_channel_unix_new(event_fd); ++ } ++ else { ++ close(event_fd); ++ acpiinfo->event_fd = -1; ++ acpiinfo->event_inited = FALSE; ++ } + } + + update_battery_info(acpiinfo); +@@ -110,6 +134,65 @@ acpi_freebsd_init(struct acpi_info * acp + return TRUE; + } + ++#define ACPI_EVENT_IGNORE 0 ++#define ACPI_EVENT_AC 1 ++#define ACPI_EVENT_BATTERY_INFO 2 ++ ++static int parse_acpi_event(GString *buffer) ++{ ++ if (strstr(buffer->str, "system=ACPI")) { ++ if (strstr(buffer->str, "subsystem=ACAD")) ++ return ACPI_EVENT_AC; ++ if (strstr(buffer->str, "subsystem=CMBAT")) ++ return ACPI_EVENT_BATTERY_INFO; ++ } ++ ++ return ACPI_EVENT_IGNORE; ++} ++ ++void acpi_freebsd_update(struct acpi_info *acpiinfo) ++{ ++ /* XXX This is needed for systems where devd does not have permissions ++ * to allow for event-driven updates. ++ */ ++ update_ac_info(acpiinfo); ++ update_battery_info(acpiinfo); ++} ++ ++gboolean acpi_process_event(struct acpi_info *acpiinfo, gboolean *read_error) ++{ ++ gsize i; ++ int evt; ++ gboolean result = FALSE; ++ GString *buffer; ++ GIOStatus stat; ++ buffer = g_string_new(NULL); ++ ++ *read_error = FALSE; ++ stat = g_io_channel_read_line_string(acpiinfo->channel, buffer, &i, NULL); ++ ++ if (stat == G_IO_STATUS_ERROR || stat == G_IO_STATUS_EOF) { ++ *read_error = TRUE; ++ g_string_free(buffer, TRUE); ++ return FALSE; ++ } ++ ++ evt = parse_acpi_event(buffer); ++ switch (evt) { ++ case ACPI_EVENT_AC: ++ update_ac_info(acpiinfo); ++ result = TRUE; ++ break; ++ case ACPI_EVENT_BATTERY_INFO: ++ update_battery_info(acpiinfo); ++ result = TRUE; ++ break; ++ } ++ ++ g_string_free(buffer, TRUE); ++ return result; ++} ++ + void + acpi_freebsd_cleanup(struct acpi_info * acpiinfo) + { +@@ -119,21 +202,12 @@ acpi_freebsd_cleanup(struct acpi_info * + close(acpiinfo->acpifd); + acpiinfo->acpifd = -1; + } +-} + +-/* XXX This is a hack since user-land applications can't get ACPI events yet. +- * Devd provides this (or supposedly provides this), but you need to be +- * root to access devd. +- */ +-gboolean +-acpi_process_event(struct acpi_info * acpiinfo) +-{ +- g_assert(acpiinfo); +- +- update_ac_info(acpiinfo); +- update_battery_info(acpiinfo); +- +- return TRUE; ++ if (acpiinfo->event_fd >= 0) { ++ g_io_channel_unref(acpiinfo->channel); ++ close(acpiinfo->event_fd); ++ acpiinfo->event_fd = -1; ++ } + } + + gboolean diff --git a/x11/gnome-applets/files/patch-battstat_acpi-freebsd.h b/x11/gnome-applets/files/patch-battstat_acpi-freebsd.h new file mode 100644 index 000000000000..918cd59eb241 --- /dev/null +++ b/x11/gnome-applets/files/patch-battstat_acpi-freebsd.h @@ -0,0 +1,78 @@ +--- battstat/acpi-freebsd.h.orig Sun Jul 3 16:50:22 2005 ++++ battstat/acpi-freebsd.h Sun Jul 3 16:54:14 2005 +@@ -29,61 +29,31 @@ + #define ACPI_LIFE "hw.acpi.battery.life" + #define ACPI_STATE "hw.acpi.battery.state" + +-struct acpi_info { +- gboolean ac_online; +- int acpifd; +- int max_capacity; +- int low_capacity; +- int critical_capacity; ++/* XXX: AMD64 does not have machine/apm_bios.h. */ ++#if !defined(__i386__) ++struct apm_info { ++ guint ai_acline; ++ guint ai_batt_stat; ++ guint ai_batt_life; ++ int ai_batt_time; ++ guint ai_status; + }; +- +-gboolean acpi_freebsd_read(struct apm_info *apminfo, struct acpi_info * acpiinfo); +-gboolean acpi_process_event(struct acpi_info * acpiinfo); +-gboolean acpi_freebsd_init(struct acpi_info * acpiinfo); +-void acpi_freebsd_cleanup(struct acpi_info * acpiinfo); +- +-#endif /* __ACPI_FREEBSD_H__ */ +-/* +- * Copyright (C) 2004 by Joe Marcus Clarke <marcus@FreeBSD.org> +- * +- * This program is free software; you can redistribute it and/or modify +- * it under the terms of the GNU General Public License as published by +- * the Free Software Foundation; either version 2 of the License, or +- * (at your option) any later version. +- * +- * This program is distributed in the hope that it will be useful, +- * but WITHOUT ANY WARRANTY; without even the implied warranty of +- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- * GNU General Public License for more details. +- * +- * You should have received a copy of the GNU General Public License +- * along with this program; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA. +- */ +- +-#ifndef __ACPI_FREEBSD_H__ +-#define __ACPI_FREEBSD_H__ +- +-#define ACPIDEV "/dev/acpi" +- +-#define BATT_MIN 0 +-#define BATT_MAX 64 +- +-#define ACPI_ACLINE "hw.acpi.acline" +-#define ACPI_TIME "hw.acpi.battery.time" +-#define ACPI_LIFE "hw.acpi.battery.life" +-#define ACPI_STATE "hw.acpi.battery.state" ++#endif + + struct acpi_info { + gboolean ac_online; ++ gboolean event_inited; + int acpifd; ++ int event_fd; + int max_capacity; + int low_capacity; + int critical_capacity; ++ GIOChannel * channel; + }; + + gboolean acpi_freebsd_read(struct apm_info *apminfo, struct acpi_info * acpiinfo); +-gboolean acpi_process_event(struct acpi_info * acpiinfo); ++void acpi_freebsd_update(struct acpi_info * acpiinfo); ++gboolean acpi_process_event(struct acpi_info * acpiinfo, gboolean *read_error); + gboolean acpi_freebsd_init(struct acpi_info * acpiinfo); + void acpi_freebsd_cleanup(struct acpi_info * acpiinfo); + diff --git a/x11/gnome-applets/files/patch-battstat_battstat.schemas.in b/x11/gnome-applets/files/patch-battstat_battstat.schemas.in deleted file mode 100644 index a6bed2361540..000000000000 --- a/x11/gnome-applets/files/patch-battstat_battstat.schemas.in +++ /dev/null @@ -1,11 +0,0 @@ ---- battstat/battstat.schemas.in.orig Fri Oct 1 16:22:39 2004 -+++ battstat/battstat.schemas.in Fri Oct 1 16:22:46 2004 -@@ -115,7 +115,7 @@ - <key>/schemas/apps/battstat-applet/prefs/suspend_command</key> - <owner>battstat-applet</owner> - <type>string</type> -- <default>/usr/bin/apm -s</default> -+ <default>/usr/sbin/zzz</default> - <locale name="C"> - <short>Suspend Command</short> - <long>Command to send to suspend the computer</long> diff --git a/x11/gnome-applets/files/patch-battstat_battstat_applet.c b/x11/gnome-applets/files/patch-battstat_battstat_applet.c new file mode 100644 index 000000000000..a95b7b569a09 --- /dev/null +++ b/x11/gnome-applets/files/patch-battstat_battstat_applet.c @@ -0,0 +1,21 @@ +--- battstat/battstat_applet.c.orig Fri Aug 19 22:13:49 2005 ++++ battstat/battstat_applet.c Tue Aug 23 20:37:13 2005 +@@ -430,14 +430,14 @@ battery_full_notify (GtkWidget *applet) + static void + battery_full_dialog (GtkWidget *applet) + { +- /* first attempt to use libnotify */ +- if (battery_full_notify (applet)) +- return; +- + GtkWidget *dialog, *hbox, *image, *label; + GdkPixbuf *pixbuf; + + gchar *new_label; ++ /* first attempt to use libnotify */ ++ if (battery_full_notify (applet)) ++ return; ++ + dialog = gtk_dialog_new_with_buttons ( + _("Battery Notice"), + NULL, diff --git a/x11/gnome-applets/files/patch-battstat_power-management.c b/x11/gnome-applets/files/patch-battstat_power-management.c new file mode 100644 index 000000000000..9cea2d65b8fb --- /dev/null +++ b/x11/gnome-applets/files/patch-battstat_power-management.c @@ -0,0 +1,123 @@ +--- battstat/power-management.c.orig Thu Aug 25 23:45:47 2005 ++++ battstat/power-management.c Tue Aug 30 01:28:40 2005 +@@ -61,9 +61,7 @@ + + static const char *apm_readinfo (BatteryStatus *status); + static int pm_initialised; +-#ifdef HAVE_HAL +-static int using_hal; +-#endif ++static int using_hal = FALSE; + + /* + * What follows is a series of platform-specific apm_readinfo functions +@@ -173,16 +171,40 @@ apm_readinfo (BatteryStatus *status) + + #elif __FreeBSD__ + ++#if defined(__i386__) + #include <machine/apm_bios.h> ++#endif + #include "acpi-freebsd.h" + + static struct acpi_info acpiinfo; + static gboolean using_acpi; + static int acpi_count; ++static int acpiwatch; + static struct apm_info apminfo; + ++gboolean acpi_freebsd_read(struct apm_info *apminfo, struct acpi_info *acpiinfo); ++ + #define APMDEVICE "/dev/apm" + ++static gboolean acpi_callback (GIOChannel * chan, GIOCondition cond, gpointer data) ++{ ++ gboolean read_error; ++ if (cond & (G_IO_ERR | G_IO_HUP)) { ++ acpi_freebsd_cleanup(&acpiinfo); ++ return FALSE; ++ } ++ ++ if (acpi_process_event(&acpiinfo, &read_error)) { ++ acpi_freebsd_read(&apminfo, &acpiinfo); ++ } ++ else if (read_error) { ++ acpi_freebsd_cleanup(&acpiinfo); ++ return FALSE; ++ } ++ ++ return TRUE; ++} ++ + static const char * + apm_readinfo (BatteryStatus *status) + { +@@ -190,21 +212,27 @@ apm_readinfo (BatteryStatus *status) + + if (DEBUG) g_print("apm_readinfo() (FreeBSD)\n"); + +- if (using_acpi) { ++ if (using_acpi && (!acpiinfo.event_inited || acpiinfo.event_fd >= 0)) { + if (acpi_count <= 0) { + acpi_count = 30; +- acpi_process_event(&acpiinfo); ++ if (!acpiinfo.event_inited) { ++ acpi_freebsd_update(&acpiinfo); ++ } + if (acpi_freebsd_read(&apminfo, &acpiinfo) == FALSE) + return ERR_FREEBSD_ACPI; + } + acpi_count--; + } +- else +- { +- /* This is how I read the information from the APM subsystem under +- FreeBSD. Each time this functions is called (once every second) +- the APM device is opened, read from and then closed. +- */ ++ else if (using_acpi && acpiinfo.event_inited) { ++ if (acpi_freebsd_init(&acpiinfo)) { ++ acpiwatch = g_io_add_watch (acpiinfo.channel, ++ G_IO_IN | G_IO_ERR | G_IO_HUP, ++ acpi_callback, NULL); ++ acpi_freebsd_read(&apminfo, &acpiinfo); ++ } ++ } ++ else { ++#if defined(__i386__) + fd = open(APMDEVICE, O_RDONLY); + if (fd == -1) { + return ERR_OPEN_APMDEV; +@@ -217,6 +245,9 @@ apm_readinfo (BatteryStatus *status) + + if(apminfo.ai_status == 0) + return ERR_APM_E; ++#else ++ return ERR_OPEN_APMDEV; ++#endif + } + + status->present = TRUE; +@@ -480,6 +511,12 @@ power_management_initialise( int no_hal + } + else + using_acpi = FALSE; ++ ++ if (using_acpi && acpiinfo.event_fd >= 0) { ++ acpiwatch = g_io_add_watch (acpiinfo.channel, ++ G_IO_IN | G_IO_ERR | G_IO_HUP, ++ acpi_callback, NULL); ++ } + #endif + pm_initialised = 1; + +@@ -513,6 +550,9 @@ power_management_cleanup( void ) + } + #elif defined(__FreeBSD__) + if (using_acpi) { ++ if (acpiwatch != 0) ++ g_source_remove(acpiwatch); ++ acpiwatch = 0; + acpi_freebsd_cleanup(&acpiinfo); + } + #endif diff --git a/x11/gnome-applets/files/patch-cpufreq-freebsd b/x11/gnome-applets/files/patch-cpufreq-freebsd index 48f2ebb6c5b1..4bed0298db89 100644 --- a/x11/gnome-applets/files/patch-cpufreq-freebsd +++ b/x11/gnome-applets/files/patch-cpufreq-freebsd @@ -1,37 +1,3 @@ ---- cpufreq/src/Makefile.in.orig Sun Feb 13 01:00:35 2005 -+++ cpufreq/src/Makefile.in Sun Feb 13 01:01:31 2005 -@@ -55,6 +55,7 @@ - cpufreq-prefs.$(OBJEXT) cpufreq-popup.$(OBJEXT) \ - cpufreq-monitor.$(OBJEXT) cpufreq-monitor-factory.$(OBJEXT) \ - cpufreq-monitor-procfs.$(OBJEXT) \ -+ cpufreq-monitor-sysctl.$(OBJEXT) \ - cpufreq-monitor-sysfs.$(OBJEXT) \ - cpufreq-monitor-cpuinfo.$(OBJEXT) - cpufreq_applet_OBJECTS = $(am_cpufreq_applet_OBJECTS) -@@ -68,6 +69,7 @@ - @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-monitor-cpuinfo.Po \ - @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-monitor-factory.Po \ - @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-monitor-procfs.Po \ -+@AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-monitor-sysctl.Po \ - @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-monitor-sysfs.Po \ - @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-monitor.Po \ - @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-popup.Po \ -@@ -336,6 +338,7 @@ - cpufreq-monitor-protected.h \ - cpufreq-monitor-factory.c cpufreq-monitor-factory.h \ - cpufreq-monitor-procfs.c cpufreq-monitor-procfs.h \ -+ cpufreq-monitor-sysctl.c cpufreq-monitor-sysctl.h \ - cpufreq-monitor-sysfs.c cpufreq-monitor-sysfs.h \ - cpufreq-monitor-cpuinfo.c cpufreq-monitor-cpuinfo.h - -@@ -419,6 +422,7 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-cpuinfo.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-factory.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-procfs.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-sysctl.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-sysfs.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-popup.Po@am__quote@ --- cpufreq/src/cpufreq-monitor-sysctl.h.orig Sun Feb 13 01:00:25 2005 +++ cpufreq/src/cpufreq-monitor-sysctl.h Sat Feb 12 20:25:21 2005 @@ -0,0 +1,48 @@ @@ -83,111 +49,6 @@ +CPUFreqMonitor *cpufreq_monitor_sysctl_new (guint cpu); + +#endif /* __CPUFREQ_MONITOR_SYSCTL_H__ */ ---- cpufreq/src/cpufreq-monitor-cpuinfo.c.orig Fri Dec 31 14:39:04 2004 -+++ cpufreq/src/cpufreq-monitor-cpuinfo.c Sun Feb 13 23:58:38 2005 -@@ -22,6 +22,10 @@ - #include <glib/gi18n.h> - #include <libgnomevfs/gnome-vfs.h> - -+#ifdef __FreeBSD__ -+#include <sys/types.h> -+#include <sys/sysctl.h> -+#endif /* __FreeBSD__ */ - #include <string.h> - - #include "cpufreq-monitor-cpuinfo.h" -@@ -102,6 +106,7 @@ - static gboolean - cpufreq_monitor_cpuinfo_get (gpointer gdata) - { -+#ifndef __FreeBSD__ - GnomeVFSHandle *handle; - GnomeVFSFileSize bytes_read; - GnomeVFSResult result; -@@ -109,6 +114,9 @@ - gchar **lines; - gchar buffer[256]; - gchar *p; -+#else -+ size_t len; -+#endif /* __FreeBSD__ */ - gchar *freq, *perc, *unit, *governor; - gint cpu, i; - CPUFreqMonitorCPUInfo *monitor; -@@ -118,6 +126,7 @@ - - private = CPUFREQ_MONITOR_GET_PROTECTED (CPUFREQ_MONITOR (monitor)); - -+#ifndef __FreeBSD__ - uri = gnome_vfs_get_uri_from_local_path ("/proc/cpuinfo"); - - result = gnome_vfs_open (&handle, uri, GNOME_VFS_OPEN_READ); -@@ -178,6 +187,12 @@ - - g_strfreev (lines); - g_free (file); -+#else -+ len = sizeof (cpu); -+ -+ if (sysctlbyname ("hw.clockrate", &cpu, &len, NULL, 0) == -1) -+ return FALSE; -+#endif /* __FreeBSD__ */ - - governor = g_strdup (_("Frequency Scaling Unsupported")); - freq = parent_class->get_human_readable_freq (cpu * 1000); /* kHz are expected*/ ---- cpufreq/src/cpufreq-monitor-factory.c.orig Mon Dec 27 12:53:46 2004 -+++ cpufreq/src/cpufreq-monitor-factory.c Sun Feb 13 23:58:44 2005 -@@ -16,13 +16,21 @@ - * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * - * Authors : Carlos García Campos <carlosgc@gnome.org> -+ * Joe Marcus Clarke <marcus@FreeBSD.org> - */ - - #include <glib.h> -+#ifdef __FreeBSD__ -+#include <sys/types.h> -+#include <sys/sysctl.h> -+#endif /* __FreeBSD__ */ - - #include "cpufreq-applet.h" - #include "cpufreq-monitor-sysfs.h" - #include "cpufreq-monitor-procfs.h" -+#ifdef __FreeBSD__ -+#include "cpufreq-monitor-sysctl.h" -+#endif /* __FreeBSD__ */ - #include "cpufreq-monitor-cpuinfo.h" - #include "cpufreq-monitor-factory.h" - -@@ -30,6 +38,7 @@ - cpufreq_monitor_factory_create_monitor (guint cpu) - { - CPUFreqMonitor *monitor = NULL; -+#ifndef __FreeBSD__ - - if (g_file_test ("/sys/devices/system/cpu/cpu0/cpufreq", G_FILE_TEST_EXISTS)) { /* 2.6 kernel */ - monitor = cpufreq_monitor_sysfs_new (cpu); -@@ -48,6 +57,20 @@ - - monitor = cpufreq_monitor_cpuinfo_new (cpu); - } -+#else -+ size_t len; -+ -+ if (sysctlbyname ("dev.cpu.0.freq", NULL, &len, NULL, 0) == 0) { -+ monitor = cpufreq_monitor_sysctl_new (cpu); -+ } else { -+ cpufreq_applet_display_error (_("CPU frequency scaling unsupported"), -+ _("You will not be able to modify the frequency of your machine. " -+ "Your machine may be misconfigured or not have hardware support " -+ "for CPU frequency scaling.")); -+ -+ monitor = cpufreq_monitor_cpuinfo_new (cpu); -+ } -+#endif /* __FreeBSD__ */ - - return monitor; - } --- cpufreq/src/cpufreq-monitor-sysctl.c.orig Sun Feb 13 03:52:42 2005 +++ cpufreq/src/cpufreq-monitor-sysctl.c Mon Feb 14 00:42:07 2005 @@ -0,0 +1,269 @@ @@ -460,9 +321,114 @@ + return private->available_freqs; +} +#endif /* __FreeBSD__ */ ---- cpufreq/src/cpufreq-applet.c.orig Fri Jan 14 23:38:20 2005 -+++ cpufreq/src/cpufreq-applet.c Mon Feb 14 00:47:36 2005 -@@ -16,6 +16,7 @@ +--- cpufreq/src/cpufreq-monitor-factory.c.orig Thu Apr 14 12:11:06 2005 ++++ cpufreq/src/cpufreq-monitor-factory.c Sun Jul 3 17:09:15 2005 +@@ -17,13 +17,21 @@ + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * + * Authors : Carlos García Campos <carlosgc@gnome.org> ++ * Joe Marcus Clarke <marcus@FreeBSD.org> + */ + + #include <glib.h> ++#ifdef __FreeBSD__ ++#include <sys/types.h> ++#include <sys/sysctl.h> ++#endif /* __FreeBSD__ */ + + #include "cpufreq-applet.h" + #include "cpufreq-monitor-sysfs.h" + #include "cpufreq-monitor-procfs.h" ++#ifdef __FreeBSD__ ++#include "cpufreq-monitor-sysctl.h" ++#endif /* __FreeBSD__ */ + #include "cpufreq-monitor-cpuinfo.h" + #include "cpufreq-monitor-factory.h" + +@@ -31,6 +39,7 @@ CPUFreqMonitor * + cpufreq_monitor_factory_create_monitor (guint cpu) + { + CPUFreqMonitor *monitor = NULL; ++#ifndef __FreeBSD__ + + if (g_file_test ("/sys/devices/system/cpu/cpu0/cpufreq", G_FILE_TEST_EXISTS)) { /* 2.6 kernel */ + monitor = cpufreq_monitor_sysfs_new (cpu); +@@ -49,6 +58,20 @@ cpufreq_monitor_factory_create_monitor ( + + monitor = cpufreq_monitor_cpuinfo_new (cpu); + } ++#else ++ size_t len; ++ ++ if (sysctlbyname ("dev.cpu.0.freq", NULL, &len, NULL, 0) == 0) { ++ monitor = cpufreq_monitor_sysctl_new (cpu); ++ } else { ++ cpufreq_applet_display_error (_("CPU frequency scaling unsupported"), ++ _("You will not be able to modify the frequency of your machine. " ++ "Your machine may be misconfigured or not have hardware support " ++ "for CPU frequency scaling.")); ++ ++ monitor = cpufreq_monitor_cpuinfo_new (cpu); ++ } ++#endif /* __FreeBSD__ */ + + return monitor; + } +--- cpufreq/src/cpufreq-monitor-cpuinfo.c.orig Thu Apr 14 12:11:06 2005 ++++ cpufreq/src/cpufreq-monitor-cpuinfo.c Sun Jul 3 17:07:16 2005 +@@ -23,6 +23,10 @@ + #include <glib/gi18n.h> + #include <libgnomevfs/gnome-vfs.h> + ++#ifdef __FreeBSD__ ++#include <sys/types.h> ++#include <sys/sysctl.h> ++#endif /* __FreeBSD__ */ + #include <string.h> + #include <stdio.h> + +@@ -104,6 +108,7 @@ cpufreq_monitor_cpuinfo_new (guint cpu) + static gboolean + cpufreq_monitor_cpuinfo_get (gpointer gdata) + { ++#ifndef __FreeBSD__ + GnomeVFSHandle *handle; + GnomeVFSFileSize bytes_read; + GnomeVFSResult result; +@@ -111,6 +116,9 @@ cpufreq_monitor_cpuinfo_get (gpointer gd + gchar **lines; + gchar buffer[256]; + gchar *p; ++#else ++ size_t len; ++#endif /* __FreeBSD__ */ + gchar *freq, *perc, *unit, *governor; + gint cpu, i; + CPUFreqMonitorCPUInfo *monitor; +@@ -120,6 +128,7 @@ cpufreq_monitor_cpuinfo_get (gpointer gd + + private = CPUFREQ_MONITOR_GET_PROTECTED (CPUFREQ_MONITOR (monitor)); + ++#ifndef __FreeBSD__ + uri = gnome_vfs_get_uri_from_local_path ("/proc/cpuinfo"); + + result = gnome_vfs_open (&handle, uri, GNOME_VFS_OPEN_READ); +@@ -180,6 +189,12 @@ cpufreq_monitor_cpuinfo_get (gpointer gd + + g_strfreev (lines); + g_free (file); ++#else ++ len = sizeof (cpu); ++ ++ if (sysctlbyname ("hw.clockrate", &cpu, &len, NULL, 0) == -1) ++ return FALSE; ++#endif /* __FreeBSD__ */ + + governor = g_strdup (_("Frequency Scaling Unsupported")); + freq = parent_class->get_human_readable_freq (cpu * 1000); /* kHz are expected*/ +--- cpufreq/src/cpufreq-applet.c.orig Thu Apr 14 12:11:06 2005 ++++ cpufreq/src/cpufreq-applet.c Sun Jul 3 17:28:43 2005 +@@ -17,6 +17,7 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * * Authors : Carlos García Campos <carlosgc@gnome.org> @@ -470,7 +436,7 @@ */ #include <config.h> -@@ -25,6 +26,10 @@ +@@ -26,6 +27,10 @@ #include <panel-applet-gconf.h> #include <glade/glade.h> #include <glib/gi18n.h> @@ -481,34 +447,82 @@ #include <string.h> #include "cpufreq-applet.h" -@@ -192,6 +197,7 @@ +@@ -193,6 +198,7 @@ cpufreq_applet_about_cb (BonoboUICompone { - static const gchar *authors[] = { - "Carlos Garcia Campos <carlosgc@gnome.org>", -+ "Joe Marcus Clarke <marcus@FreeBSD.org> (FreeBSD support)", - NULL - }; - static const gchar *documenters[] = { -@@ -231,6 +237,7 @@ - cpufreq_applet_get_max_cpu () + static const gchar *authors[] = { + "Carlos Garcia Campos <carlosgc@gnome.org>", ++ "Joe Marcus Clarke <marcus@FreeBSD.org> (FreeBSD support)", + NULL + }; + static const gchar *documenters[] = { +@@ -233,6 +239,7 @@ static gint + cpufreq_applet_get_max_cpu (void) { - gint mcpu = -1; + gint mcpu = -1; +#ifndef __FreeBSD__ - gchar *file = NULL; + gchar *file = NULL; - do { -@@ -253,6 +260,14 @@ - } while (g_file_test (file, G_FILE_TEST_EXISTS)); - g_free (file); - mcpu --; + do { +@@ -242,11 +249,20 @@ cpufreq_applet_get_max_cpu (void) + } while (g_file_test (file, G_FILE_TEST_EXISTS)); + g_free (file); + mcpu --; +#else -+ size_t len; ++ size_t len; + -+ len = sizeof (mcpu); ++ len = sizeof (mcpu); + -+ sysctlbyname ("hw.ncpu", &mcpu, &len, NULL, 0); -+ mcpu --; ++ sysctlbyname ("hw.ncpu", &mcpu, &len, NULL, 0); ++ mcpu --; +#endif /* __FreeBSD__ */ - if (mcpu >= 0) - return mcpu; + if (mcpu >= 0) + return mcpu; + + mcpu = -1; ++#ifndef __FreeBSD__ + file = NULL; + do { + if (file) g_free (file); +@@ -255,6 +271,7 @@ cpufreq_applet_get_max_cpu (void) + } while (g_file_test (file, G_FILE_TEST_EXISTS)); + g_free (file); + mcpu --; ++#endif + + if (mcpu >= 0) + return mcpu; +--- cpufreq/src/Makefile.in.orig Tue Oct 4 00:11:26 2005 ++++ cpufreq/src/Makefile.in Tue Oct 4 00:20:37 2005 +@@ -57,6 +57,7 @@ + cpufreq-prefs.$(OBJEXT) cpufreq-popup.$(OBJEXT) \ + cpufreq-monitor.$(OBJEXT) cpufreq-monitor-factory.$(OBJEXT) \ + cpufreq-monitor-procfs.$(OBJEXT) \ ++ cpufreq-monitor-sysctl.$(OBJEXT) \ + cpufreq-monitor-sysfs.$(OBJEXT) \ + cpufreq-monitor-cpuinfo.$(OBJEXT) + cpufreq_applet_OBJECTS = $(am_cpufreq_applet_OBJECTS) +@@ -71,6 +72,7 @@ + @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-monitor-factory.Po \ + @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-monitor-procfs.Po \ + @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-monitor-sysfs.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-monitor-sysctl.Po \ + @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-monitor.Po \ + @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-popup.Po \ + @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-prefs.Po +@@ -358,6 +360,7 @@ + cpufreq-monitor-protected.h \ + cpufreq-monitor-factory.c cpufreq-monitor-factory.h \ + cpufreq-monitor-procfs.c cpufreq-monitor-procfs.h \ ++ cpufreq-monitor-sysctl.c cpufreq-monitor-sysctl.h \ + cpufreq-monitor-sysfs.c cpufreq-monitor-sysfs.h \ + cpufreq-monitor-cpuinfo.c cpufreq-monitor-cpuinfo.h + +@@ -441,6 +444,7 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-cpuinfo.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-factory.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-procfs.Po@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-sysctl.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-sysfs.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-popup.Po@am__quote@ diff --git a/x11/gnome-applets/files/patch-cpufreq-selector-freebsd b/x11/gnome-applets/files/patch-cpufreq-selector-freebsd index f577a0fed39b..d25df35e2b5d 100644 --- a/x11/gnome-applets/files/patch-cpufreq-selector-freebsd +++ b/x11/gnome-applets/files/patch-cpufreq-selector-freebsd @@ -1,38 +1,3 @@ ---- cpufreq/src/cpufreq-selector/Makefile.in.orig Mon Feb 14 00:26:10 2005 -+++ cpufreq/src/cpufreq-selector/Makefile.in Mon Feb 14 00:26:58 2005 -@@ -53,7 +53,7 @@ - PROGRAMS = $(bin_PROGRAMS) - am_cpufreq_selector_OBJECTS = cpufreq.$(OBJEXT) \ - cpufreq-sysfs.$(OBJEXT) cpufreq-procfs.$(OBJEXT) \ -- main.$(OBJEXT) -+ cpufreq-sysctl.$(OBJEXT) main.$(OBJEXT) - cpufreq_selector_OBJECTS = $(am_cpufreq_selector_OBJECTS) - am__DEPENDENCIES_1 = - cpufreq_selector_DEPENDENCIES = $(am__DEPENDENCIES_1) -@@ -61,6 +61,7 @@ - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/cpufreq-procfs.Po \ -+@AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-sysctl.Po \ - @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-sysfs.Po \ - @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq.Po ./$(DEPDIR)/main.Po - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -@@ -310,6 +311,7 @@ - cpufreq.c cpufreq.h \ - cpufreq-sysfs.c cpufreq-sysfs.h \ - cpufreq-procfs.c cpufreq-procfs.h \ -+ cpufreq-sysctl.c cpufreq-sysctl.h \ - main.c - - cpufreq_selector_LDADD = $(CPUFREQ_SELECTOR_LIBS) -lpopt -@@ -385,6 +387,7 @@ - -rm -f *.tab.c - - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-procfs.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-sysctl.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-sysfs.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@ --- cpufreq/src/cpufreq-selector/cpufreq-sysctl.h.orig Mon Feb 14 00:38:57 2005 +++ cpufreq/src/cpufreq-selector/cpufreq-sysctl.h Mon Feb 14 00:21:39 2005 @@ -0,0 +1,51 @@ @@ -87,52 +52,6 @@ +CPUFreqSysctl *cpufreq_sysctl_new (); + +#endif /* __CPUFREQ_SYSCTL_H__ */ ---- cpufreq/src/cpufreq-selector/main.c.orig Mon Feb 14 00:22:12 2005 -+++ cpufreq/src/cpufreq-selector/main.c Mon Feb 14 00:26:04 2005 -@@ -16,6 +16,7 @@ - * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * - * Authors : Carlos García Campos <carlosgc@gnome.org> -+ * Joe Marcus Clarke <marcus@FreeBSD.org> - */ - - #include <glib-object.h> -@@ -26,6 +27,9 @@ - #include "cpufreq.h" - #include "cpufreq-sysfs.h" - #include "cpufreq-procfs.h" -+#ifdef __FreeBSD__ -+#include "cpufreq-sysctl.h" -+#endif /* __FreeBSD__ */ - - gint - main (gint argc, gchar **argv) -@@ -35,6 +39,9 @@ - gulong frequency = 0; - poptContext ctx; - gint nextopt; -+#ifdef __FreeBSD__ -+ size_t len; -+#endif /* __FreeBSD__ */ - CPUFreq *cfq; - - struct poptOption options[] = { -@@ -76,10 +83,15 @@ - - poptFreeContext(ctx); - -+#ifndef __FreeBSD__ - if (g_file_test ("/sys/devices/system/cpu/cpu0/cpufreq", G_FILE_TEST_EXISTS)) { /* 2.6 kernel */ - cfq = CPUFREQ (cpufreq_sysfs_new ()); - } else if (g_file_test ("/proc/cpufreq", G_FILE_TEST_EXISTS)) { /* 2.4 kernel */ - cfq = CPUFREQ (cpufreq_procfs_new ()); -+#else -+ if (sysctlbyname ("dev.cpu.0.freq", NULL, &len, NULL, 0) == 0) { -+ cfq = CPUFREQ (cpufreq_sysctl_new ()); -+#endif /* __FreeBSD __ */ - } else { - g_print ("No cpufreq support\n"); - return 1; --- cpufreq/src/cpufreq-selector/cpufreq-sysctl.c.orig Mon Feb 14 00:38:52 2005 +++ cpufreq/src/cpufreq-selector/cpufreq-sysctl.c Mon Feb 14 00:44:43 2005 @@ -0,0 +1,235 @@ @@ -371,3 +290,84 @@ + + g_free (governor); +} +--- cpufreq/src/cpufreq-selector/main.c.orig Sun Apr 3 12:03:13 2005 ++++ cpufreq/src/cpufreq-selector/main.c Sun Jul 3 17:16:19 2005 +@@ -17,6 +17,7 @@ + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * + * Authors : Carlos García Campos <carlosgc@gnome.org> ++ * Joe Marcus Clarke <marcus@FreeBSD.org> + */ + + #include <glib-object.h> +@@ -26,6 +27,9 @@ + #include "cpufreq.h" + #include "cpufreq-sysfs.h" + #include "cpufreq-procfs.h" ++#ifdef __FreeBSD__ ++#include "cpufreq-sysctl.h" ++#endif /* __FreeBSD__ */ + + gint + main (gint argc, gchar **argv) +@@ -34,6 +38,9 @@ main (gint argc, gchar **argv) + static gint cpu = 0; + static gchar *governor = NULL; + static gulong frequency = 0; ++#ifdef __FreeBSD__ ++ size_t len; ++#endif /* __FreeBSD__ */ + GError *error = NULL; + CPUFreq *cfq; + +@@ -71,10 +78,15 @@ main (gint argc, gchar **argv) + + g_option_context_free (context); + ++#ifndef __FreeBSD__ + if (g_file_test ("/sys/devices/system/cpu/cpu0/cpufreq", G_FILE_TEST_EXISTS)) { /* 2.6 kernel */ + cfq = CPUFREQ (cpufreq_sysfs_new ()); + } else if (g_file_test ("/proc/cpufreq", G_FILE_TEST_EXISTS)) { /* 2.4 kernel */ + cfq = CPUFREQ (cpufreq_procfs_new ()); ++#else ++ if (sysctlbyname ("dev.cpu.0.freq", NULL, &len, NULL, 0) == 0) { ++ cfq = CPUFREQ (cpufreq_sysctl_new ()); ++#endif /* __FreeBSD__ */ + } else { + g_print ("No cpufreq support\n"); + return 1; +--- cpufreq/src/cpufreq-selector/Makefile.in.orig Tue Oct 4 00:21:25 2005 ++++ cpufreq/src/cpufreq-selector/Makefile.in Tue Oct 4 00:27:54 2005 +@@ -55,7 +55,7 @@ + PROGRAMS = $(bin_PROGRAMS) + am_cpufreq_selector_OBJECTS = cpufreq.$(OBJEXT) \ + cpufreq-sysfs.$(OBJEXT) cpufreq-procfs.$(OBJEXT) \ +- main.$(OBJEXT) ++ cpufreq-sysctl.$(OBJEXT) main.$(OBJEXT) + cpufreq_selector_OBJECTS = $(am_cpufreq_selector_OBJECTS) + am__DEPENDENCIES_1 = + cpufreq_selector_DEPENDENCIES = $(am__DEPENDENCIES_1) +@@ -64,6 +64,7 @@ + am__depfiles_maybe = depfiles + @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/cpufreq-procfs.Po \ + @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-sysfs.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-sysctl.Po \ + @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq.Po ./$(DEPDIR)/main.Po + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +@@ -332,6 +333,7 @@ + cpufreq.c cpufreq.h \ + cpufreq-sysfs.c cpufreq-sysfs.h \ + cpufreq-procfs.c cpufreq-procfs.h \ ++ cpufreq-sysctl.c cpufreq-sysctl.h \ + main.c + + cpufreq_selector_LDADD = $(CPUFREQ_SELECTOR_LIBS) -lpopt +@@ -407,6 +409,7 @@ + -rm -f *.tab.c + + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-procfs.Po@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-sysctl.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-sysfs.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@ diff --git a/x11/gnome-applets/files/patch-drivemount_drive-button.c b/x11/gnome-applets/files/patch-drivemount_drive-button.c new file mode 100644 index 000000000000..f26e3121ee4b --- /dev/null +++ b/x11/gnome-applets/files/patch-drivemount_drive-button.c @@ -0,0 +1,48 @@ +--- drivemount/drive-button.c.orig Tue Aug 23 05:16:27 2005 ++++ drivemount/drive-button.c Tue Aug 23 20:37:43 2005 +@@ -24,6 +24,7 @@ + # include <config.h> + #endif + ++#include <string.h> + #include "drive-button.h" + #include <glib/gi18n.h> + #include <gdk/gdkkeysyms.h> +@@ -710,11 +711,13 @@ run_command (DriveButton *self, const ch + + GList *volumes; + GnomeVFSVolume *volume; ++ char *uri; ++ char *mount_path; + + volumes = gnome_vfs_drive_get_mounted_volumes (self->drive); + volume = GNOME_VFS_VOLUME (volumes->data); +- char *uri = gnome_vfs_volume_get_activation_uri (volume); +- char *mount_path = gnome_vfs_get_local_path_from_uri (uri); ++ uri = gnome_vfs_volume_get_activation_uri (volume); ++ mount_path = gnome_vfs_get_local_path_from_uri (uri); + g_free (uri); + + gnome_vfs_drive_get_display_name (self->drive); +@@ -794,6 +797,11 @@ drive_button_ensure_popup (DriveButton * + char *display_name, *tmp, *label; + int action; + GtkWidget *item; ++ GList *volumes; ++ GnomeVFSVolume *volume = NULL; ++ GnomeVFSDeviceType volume_type; ++ GCallback callback; ++ const char *action_icon = GTK_STOCK_OPEN; + + if (self->popup_menu) return; + +@@ -869,8 +877,7 @@ drive_button_ensure_popup (DriveButton * + g_free (display_name); + display_name = tmp; + +- GCallback callback = G_CALLBACK (open_drive); +- const char *action_icon = GTK_STOCK_OPEN; ++ callback = G_CALLBACK (open_drive); + + switch (device_type) { + case GNOME_VFS_DEVICE_TYPE_VIDEO_DVD: diff --git a/x11/gnome-applets/files/patch-gswitchit_gswitchit-applet.c b/x11/gnome-applets/files/patch-gswitchit_gswitchit-applet.c new file mode 100644 index 000000000000..5abf18032f00 --- /dev/null +++ b/x11/gnome-applets/files/patch-gswitchit_gswitchit-applet.c @@ -0,0 +1,61 @@ +--- gswitchit/gswitchit-applet.c.orig Sun Aug 7 18:07:33 2005 ++++ gswitchit/gswitchit-applet.c Sun Aug 7 18:10:07 2005 +@@ -331,6 +331,10 @@ GSwitchItAppletPrepareDrawing (GSwitchIt + XklConfigItem configItem; + GtkWidget *align, *label; + static GHashTable *shortDescrs = NULL; ++ gpointer pcounter = NULL; ++ char *prevLayoutName = NULL; ++ char *labelTitle = NULL; ++ int counter = 0; + if (group == 0) + shortDescrs = g_hash_table_new_full (g_str_hash, g_str_equal, + g_free, NULL); +@@ -363,10 +367,6 @@ GSwitchItAppletPrepareDrawing (GSwitchIt + if (layoutName == NULL) + layoutName = g_strdup ("?"); + +- gpointer pcounter = NULL; +- char *prevLayoutName = NULL; +- char *labelTitle = NULL; +- int counter = 0; + if (g_hash_table_lookup_extended (shortDescrs, layoutName, + (gpointer*)&prevLayoutName, &pcounter)) + { +@@ -599,6 +599,13 @@ GSwitchItAppletCmdPreview (BonoboUICompo + groupsLevels, groupsLevels + 1, groupsLevels + 2, groupsLevels + 3 }; + XklState *xklState = XklGetCurrentState (); + gpointer p = g_hash_table_lookup (globals.previewDialogs, GINT_TO_POINTER (xklState->group)); ++#ifdef HAVE_XKB ++ GladeXML *gladeData; ++ GtkWidget *dialog; ++ GtkWidget *kbdraw; ++ XkbComponentNamesRec componentNames; ++ XklConfigRec xklData; ++#endif + if (p != NULL) + { + /* existing window */ +@@ -606,11 +613,10 @@ GSwitchItAppletCmdPreview (BonoboUICompo + return; + } + #ifdef HAVE_XKB +- GladeXML *gladeData = glade_xml_new (GNOME_GLADEDIR "/gswitchit.glade", "gswitchit_layout_view", NULL); +- GtkWidget *dialog = ++ gladeData = glade_xml_new (GNOME_GLADEDIR "/gswitchit.glade", "gswitchit_layout_view", NULL); ++ dialog = + glade_xml_get_widget (gladeData, "gswitchit_layout_view"); +- GtkWidget *kbdraw = keyboard_drawing_new (); +- XkbComponentNamesRec componentNames; ++ kbdraw = keyboard_drawing_new (); + + if (xklState->group >= 0 && + xklState->group < g_slist_length (globals.groupNames)) +@@ -624,7 +630,6 @@ GSwitchItAppletCmdPreview (BonoboUICompo + + keyboard_drawing_set_groups_levels (KEYBOARD_DRAWING (kbdraw), pGroupsLevels); + +- XklConfigRec xklData; + XklConfigRecInit (&xklData); + if (XklConfigGetFromServer (&xklData)) + { diff --git a/x11/gnome-applets/files/patch-gweather_weather.c b/x11/gnome-applets/files/patch-gweather_weather.c deleted file mode 100644 index cdc1921ab4c7..000000000000 --- a/x11/gnome-applets/files/patch-gweather_weather.c +++ /dev/null @@ -1,12 +0,0 @@ ---- gweather/weather.c.orig Tue Mar 1 04:34:33 2005 -+++ gweather/weather.c Tue Mar 1 12:36:54 2005 -@@ -20,7 +20,9 @@ - #include <string.h> - #include <ctype.h> - #include <math.h> -+#ifndef __FreeBSD__ - #include <values.h> -+#endif - - #ifdef __FreeBSD__ - #include <sys/types.h> diff --git a/x11/gnome-applets/files/patch-mixer_applet.c b/x11/gnome-applets/files/patch-mixer_applet.c new file mode 100644 index 000000000000..178c7d5a31a1 --- /dev/null +++ b/x11/gnome-applets/files/patch-mixer_applet.c @@ -0,0 +1,11 @@ +--- mixer/applet.c.orig Tue Oct 4 00:15:40 2005 ++++ mixer/applet.c Tue Oct 4 00:16:09 2005 +@@ -953,7 +953,7 @@ gnome_volume_applet_adjust_volume (GstMi + + volumes = g_new (gint, track->num_channels); + for (n = 0; n < track->num_channels; n++) +- volumes[n] = lrintf (volume); ++ volumes[n] = (int)rint (volume); + gst_mixer_set_volume (mixer, track, volumes); + g_free (volumes); + } diff --git a/x11/gnome-applets/files/patch-modemlights_modem-applet.c b/x11/gnome-applets/files/patch-modemlights_modem-applet.c deleted file mode 100644 index f4fb13717732..000000000000 --- a/x11/gnome-applets/files/patch-modemlights_modem-applet.c +++ /dev/null @@ -1,22 +0,0 @@ ---- modemlights/modem-applet.c.orig Fri Jan 14 00:06:52 2005 -+++ modemlights/modem-applet.c Fri Jan 14 00:08:28 2005 -@@ -24,12 +24,19 @@ - - #include <panel-applet.h> - #include <fcntl.h> -+#ifndef __FreeBSD__ - #include <pty.h> -+#endif - #include <sys/poll.h> - #include <sys/types.h> - #include <sys/wait.h> - #include <libxml/tree.h> - #include <glade/glade.h> -+#ifdef __FreeBSD__ -+#include <sys/ioctl.h> -+#include <termios.h> -+#include <libutil.h> -+#endif - - #include "modem-applet.h" - diff --git a/x11/gnome-applets/files/patch-stickynotes_stickynotes_applet_callbacks.c b/x11/gnome-applets/files/patch-stickynotes_stickynotes_applet_callbacks.c new file mode 100644 index 000000000000..718f52a0dd67 --- /dev/null +++ b/x11/gnome-applets/files/patch-stickynotes_stickynotes_applet_callbacks.c @@ -0,0 +1,18 @@ +--- stickynotes/stickynotes_applet_callbacks.c.orig Wed Jul 13 18:57:03 2005 ++++ stickynotes/stickynotes_applet_callbacks.c Wed Jul 13 18:57:13 2005 +@@ -153,6 +153,7 @@ gboolean applet_check_click_on_desktop_c + { + static Window desktop_window = 0; + static Display *dpy; ++ XEvent event; + + if (desktop_window == 0) { + desktop_window = get_desktop_window (); +@@ -162,7 +163,6 @@ gboolean applet_check_click_on_desktop_c + * at every click on the desktop */ + XSelectInput(dpy, desktop_window, PropertyChangeMask); + } +- XEvent event; + + if (XCheckWindowEvent(dpy, desktop_window, PropertyChangeMask, &event) == True) { + stickynote_show_notes (FALSE); diff --git a/x11/gnome-applets/pkg-plist b/x11/gnome-applets/pkg-plist index 209107a6d038..cc8600d5da3c 100644 --- a/x11/gnome-applets/pkg-plist +++ b/x11/gnome-applets/pkg-plist @@ -34,16 +34,16 @@ libexec/gnome-keyboard-applet libexec/gtik2_applet2 libexec/gweather-applet-2 libexec/mini_commander_applet -libexec/modem_applet libexec/mixer_applet2 +libexec/modem_applet libexec/multiload-applet-2 libexec/null_applet libexec/stickynotes_applet libexec/trashapplet share/gnome/gnome-2.0/ui/GNOME_AccessxApplet.xml %%BATTERY%%share/gnome/gnome-2.0/ui/GNOME_BattstatApplet.xml -share/gnome/gnome-2.0/ui/GNOME_CharpickerApplet.xml %%CPUFREQ%%share/gnome/gnome-2.0/ui/GNOME_CPUFreqApplet.xml +share/gnome/gnome-2.0/ui/GNOME_CharpickerApplet.xml share/gnome/gnome-2.0/ui/GNOME_DriveMountApplet.xml share/gnome/gnome-2.0/ui/GNOME_GSwitchItApplet.xml share/gnome/gnome-2.0/ui/GNOME_GWeatherApplet.xml @@ -53,8 +53,8 @@ share/gnome/gnome-2.0/ui/GNOME_MiniCommanderApplet.xml share/gnome/gnome-2.0/ui/GNOME_MixerApplet.xml share/gnome/gnome-2.0/ui/GNOME_ModemLights.xml share/gnome/gnome-2.0/ui/GNOME_MultiloadApplet.xml -share/gnome/gnome-2.0/ui/GNOME_StickyNotesApplet.xml share/gnome/gnome-2.0/ui/GNOME_Panel_TrashApplet.xml +share/gnome/gnome-2.0/ui/GNOME_StickyNotesApplet.xml share/gnome/gnome-applets/geyes/Bizarre/Bizarre-eye.png share/gnome/gnome-applets/geyes/Bizarre/Bizarre-pupil.png share/gnome/gnome-applets/geyes/Bizarre/config @@ -73,313 +73,160 @@ share/gnome/gnome-applets/geyes/Horrid/horrid_pupil.png %%BATTERY%%share/gnome/gnome-applets/glade/battstat_applet.glade %%CPUFREQ%%share/gnome/gnome-applets/glade/cpufreq-preferences.glade share/gnome/gnome-applets/glade/gswitchit-plugins.glade -share/gnome/gnome-applets/glade/gswitchit-properties.glade +share/gnome/gnome-applets/glade/gswitchit.glade share/gnome/gnome-applets/glade/mini-commander.glade share/gnome/gnome-applets/glade/modemlights.glade share/gnome/gnome-applets/glade/stickynotes.glade +share/gnome/gnome-applets/glade/trashapplet.glade share/gnome/gnome-applets/gweather/Locations.xml share/gnome/gnome-applets/gweather/locations.dtd share/gnome/help/accessx-status/C/accessx-status.xml share/gnome/help/accessx-status/C/figures/accessx-status-applet.png +share/gnome/help/accessx-status/C/figures/accessx-status-disabled.png +share/gnome/help/accessx-status/C/figures/accessx_bounce-keys.png +share/gnome/help/accessx-status/C/figures/accessx_mouse-keys.png +share/gnome/help/accessx-status/C/figures/accessx_slow-keys.png +share/gnome/help/accessx-status/C/figures/accessx_sticky-altGr-key.png +share/gnome/help/accessx-status/C/figures/accessx_sticky-ctrl-key.png +share/gnome/help/accessx-status/C/figures/accessx_sticky-keys.png +share/gnome/help/accessx-status/C/figures/accessx_sticky-meta-key.png +share/gnome/help/accessx-status/C/figures/accessx_sticky-shift-key.png +share/gnome/help/accessx-status/C/figures/accessx_sticky-windows-key.png share/gnome/help/accessx-status/C/legal.xml -share/gnome/help/accessx-status/eu/accessx-status.xml -share/gnome/help/accessx-status/eu/figures/accessx-status-applet.png -share/gnome/help/accessx-status/eu/legal.xml +share/gnome/help/accessx-status/es/accessx-status.xml +share/gnome/help/accessx-status/es/figures/accessx-status-applet.png +share/gnome/help/accessx-status/es/figures/accessx-status-disabled.png +share/gnome/help/accessx-status/es/figures/accessx_bounce-keys.png +share/gnome/help/accessx-status/es/figures/accessx_mouse-keys.png +share/gnome/help/accessx-status/es/figures/accessx_slow-keys.png +share/gnome/help/accessx-status/es/figures/accessx_sticky-altGr-key.png +share/gnome/help/accessx-status/es/figures/accessx_sticky-ctrl-key.png +share/gnome/help/accessx-status/es/figures/accessx_sticky-keys.png +share/gnome/help/accessx-status/es/figures/accessx_sticky-meta-key.png +share/gnome/help/accessx-status/es/figures/accessx_sticky-shift-key.png +share/gnome/help/accessx-status/es/figures/accessx_sticky-windows-key.png +share/gnome/help/accessx-status/fr/accessx-status.xml +share/gnome/help/accessx-status/fr/figures/accessx-status-applet.png +share/gnome/help/accessx-status/fr/figures/accessx-status-disabled.png +share/gnome/help/accessx-status/fr/figures/accessx_bounce-keys.png +share/gnome/help/accessx-status/fr/figures/accessx_mouse-keys.png +share/gnome/help/accessx-status/fr/figures/accessx_slow-keys.png +share/gnome/help/accessx-status/fr/figures/accessx_sticky-altGr-key.png +share/gnome/help/accessx-status/fr/figures/accessx_sticky-ctrl-key.png +share/gnome/help/accessx-status/fr/figures/accessx_sticky-keys.png +share/gnome/help/accessx-status/fr/figures/accessx_sticky-meta-key.png +share/gnome/help/accessx-status/fr/figures/accessx_sticky-shift-key.png +share/gnome/help/accessx-status/fr/figures/accessx_sticky-windows-key.png share/gnome/help/accessx-status/uk/accessx-status.xml share/gnome/help/accessx-status/uk/figures/accessx-status-applet.png -share/gnome/help/accessx-status/uk/legal.xml +share/gnome/help/accessx-status/uk/figures/accessx-status-disabled.png +share/gnome/help/accessx-status/uk/figures/accessx_bounce-keys.png +share/gnome/help/accessx-status/uk/figures/accessx_mouse-keys.png +share/gnome/help/accessx-status/uk/figures/accessx_slow-keys.png +share/gnome/help/accessx-status/uk/figures/accessx_sticky-altGr-key.png +share/gnome/help/accessx-status/uk/figures/accessx_sticky-ctrl-key.png +share/gnome/help/accessx-status/uk/figures/accessx_sticky-keys.png +share/gnome/help/accessx-status/uk/figures/accessx_sticky-meta-key.png +share/gnome/help/accessx-status/uk/figures/accessx_sticky-shift-key.png +share/gnome/help/accessx-status/uk/figures/accessx_sticky-windows-key.png %%BATTERY%%share/gnome/help/battstat/C/battstat.xml -%%BATTERY%%share/gnome/help/battstat/C/figures/battstat-preferences.png -%%BATTERY%%share/gnome/help/battstat/C/figures/ac_small.png -%%BATTERY%%share/gnome/help/battstat/C/figures/batt_green.png -%%BATTERY%%share/gnome/help/battstat/C/figures/batt_orange.png -%%BATTERY%%share/gnome/help/battstat/C/figures/batt_red.png -%%BATTERY%%share/gnome/help/battstat/C/figures/batt_yellow.png -%%BATTERY%%share/gnome/help/battstat/C/figures/battery_small.png +%%BATTERY%%share/gnome/help/battstat/C/figures/battstat-applet-expanded.png %%BATTERY%%share/gnome/help/battstat/C/figures/battstat-applet.png -%%BATTERY%%share/gnome/help/battstat/C/figures/battstat-applet_window.png -%%BATTERY%%share/gnome/help/battstat/C/figures/flash_small.png -%%BATTERY%%share/gnome/help/battstat/C/figures/warning_small.png +%%BATTERY%%share/gnome/help/battstat/C/figures/battstat-credits-hal.png +%%BATTERY%%share/gnome/help/battstat/C/figures/battstat-preferences.png +%%BATTERY%%share/gnome/help/battstat/C/figures/context-menu.png %%BATTERY%%share/gnome/help/battstat/C/legal.xml -%%BATTERY%%share/gnome/help/battstat/de/battstat.xml -%%BATTERY%%share/gnome/help/battstat/de/figures/ac_small.png -%%BATTERY%%share/gnome/help/battstat/de/figures/batt_green.png -%%BATTERY%%share/gnome/help/battstat/de/figures/batt_orange.png -%%BATTERY%%share/gnome/help/battstat/de/figures/batt_red.png -%%BATTERY%%share/gnome/help/battstat/de/figures/batt_yellow.png -%%BATTERY%%share/gnome/help/battstat/de/figures/battery_small.png -%%BATTERY%%share/gnome/help/battstat/de/figures/battstat-applet.png -%%BATTERY%%share/gnome/help/battstat/de/figures/battstat-applet_window.png -%%BATTERY%%share/gnome/help/battstat/de/figures/flash_small.png -%%BATTERY%%share/gnome/help/battstat/de/figures/warning_small.png -%%BATTERY%%share/gnome/help/battstat/de/legal.xml %%BATTERY%%share/gnome/help/battstat/es/battstat.xml -%%BATTERY%%share/gnome/help/battstat/es/figures/ac_small.png -%%BATTERY%%share/gnome/help/battstat/es/figures/batt_green.png -%%BATTERY%%share/gnome/help/battstat/es/figures/batt_orange.png -%%BATTERY%%share/gnome/help/battstat/es/figures/batt_red.png -%%BATTERY%%share/gnome/help/battstat/es/figures/batt_yellow.png -%%BATTERY%%share/gnome/help/battstat/es/figures/battery_small.png +%%BATTERY%%share/gnome/help/battstat/es/figures/battstat-applet-expanded.png %%BATTERY%%share/gnome/help/battstat/es/figures/battstat-applet.png -%%BATTERY%%share/gnome/help/battstat/es/figures/battstat-applet_window.png -%%BATTERY%%share/gnome/help/battstat/es/figures/flash_small.png -%%BATTERY%%share/gnome/help/battstat/es/figures/warning_small.png -%%BATTERY%%share/gnome/help/battstat/es/legal.xml -%%BATTERY%%share/gnome/help/battstat/eu/battstat.xml -%%BATTERY%%share/gnome/help/battstat/eu/figures/battstat-apperance.png -%%BATTERY%%share/gnome/help/battstat/eu/figures/battstat-applet.png -%%BATTERY%%share/gnome/help/battstat/eu/figures/battstat-general.png -%%BATTERY%%share/gnome/help/battstat/eu/legal.xml -%%BATTERY%%share/gnome/help/battstat/fr/battstat.xml -%%BATTERY%%share/gnome/help/battstat/fr/figures/ac_small.png -%%BATTERY%%share/gnome/help/battstat/fr/figures/batt_green.png -%%BATTERY%%share/gnome/help/battstat/fr/figures/batt_orange.png -%%BATTERY%%share/gnome/help/battstat/fr/figures/batt_red.png -%%BATTERY%%share/gnome/help/battstat/fr/figures/batt_yellow.png -%%BATTERY%%share/gnome/help/battstat/fr/figures/battery_small.png -%%BATTERY%%share/gnome/help/battstat/fr/figures/battstat-applet.png -%%BATTERY%%share/gnome/help/battstat/fr/figures/battstat-applet_window.png -%%BATTERY%%share/gnome/help/battstat/fr/figures/flash_small.png -%%BATTERY%%share/gnome/help/battstat/fr/figures/warning_small.png -%%BATTERY%%share/gnome/help/battstat/fr/legal.xml -%%BATTERY%%share/gnome/help/battstat/it/battstat.xml -%%BATTERY%%share/gnome/help/battstat/it/figures/ac_small.png -%%BATTERY%%share/gnome/help/battstat/it/figures/batt_green.png -%%BATTERY%%share/gnome/help/battstat/it/figures/batt_orange.png -%%BATTERY%%share/gnome/help/battstat/it/figures/batt_red.png -%%BATTERY%%share/gnome/help/battstat/it/figures/batt_yellow.png -%%BATTERY%%share/gnome/help/battstat/it/figures/battery_small.png -%%BATTERY%%share/gnome/help/battstat/it/figures/battstat-applet.png -%%BATTERY%%share/gnome/help/battstat/it/figures/battstat-applet_window.png -%%BATTERY%%share/gnome/help/battstat/it/figures/flash_small.png -%%BATTERY%%share/gnome/help/battstat/it/figures/warning_small.png -%%BATTERY%%share/gnome/help/battstat/it/legal.xml -%%BATTERY%%share/gnome/help/battstat/ja/battstat.xml -%%BATTERY%%share/gnome/help/battstat/ja/figures/ac_small.png -%%BATTERY%%share/gnome/help/battstat/ja/figures/batt_green.png -%%BATTERY%%share/gnome/help/battstat/ja/figures/batt_orange.png -%%BATTERY%%share/gnome/help/battstat/ja/figures/batt_red.png -%%BATTERY%%share/gnome/help/battstat/ja/figures/batt_yellow.png -%%BATTERY%%share/gnome/help/battstat/ja/figures/battery_small.png -%%BATTERY%%share/gnome/help/battstat/ja/figures/battstat-applet.png -%%BATTERY%%share/gnome/help/battstat/ja/figures/battstat-applet_window.png -%%BATTERY%%share/gnome/help/battstat/ja/figures/flash_small.png -%%BATTERY%%share/gnome/help/battstat/ja/figures/warning_small.png -%%BATTERY%%share/gnome/help/battstat/ja/legal.xml -%%BATTERY%%share/gnome/help/battstat/ko/battstat.xml -%%BATTERY%%share/gnome/help/battstat/ko/figures/ac_small.png -%%BATTERY%%share/gnome/help/battstat/ko/figures/batt_green.png -%%BATTERY%%share/gnome/help/battstat/ko/figures/batt_orange.png -%%BATTERY%%share/gnome/help/battstat/ko/figures/batt_red.png -%%BATTERY%%share/gnome/help/battstat/ko/figures/batt_yellow.png -%%BATTERY%%share/gnome/help/battstat/ko/figures/battery_small.png -%%BATTERY%%share/gnome/help/battstat/ko/figures/battstat-applet.png -%%BATTERY%%share/gnome/help/battstat/ko/figures/battstat-applet_window.png -%%BATTERY%%share/gnome/help/battstat/ko/figures/flash_small.png -%%BATTERY%%share/gnome/help/battstat/ko/figures/warning_small.png -%%BATTERY%%share/gnome/help/battstat/ko/legal.xml -%%BATTERY%%share/gnome/help/battstat/sv/battstat.xml -%%BATTERY%%share/gnome/help/battstat/sv/figures/ac_small.png -%%BATTERY%%share/gnome/help/battstat/sv/figures/batt_green.png -%%BATTERY%%share/gnome/help/battstat/sv/figures/batt_orange.png -%%BATTERY%%share/gnome/help/battstat/sv/figures/batt_red.png -%%BATTERY%%share/gnome/help/battstat/sv/figures/batt_yellow.png -%%BATTERY%%share/gnome/help/battstat/sv/figures/battery_small.png -%%BATTERY%%share/gnome/help/battstat/sv/figures/battstat-applet.png -%%BATTERY%%share/gnome/help/battstat/sv/figures/battstat-applet_window.png -%%BATTERY%%share/gnome/help/battstat/sv/figures/flash_small.png -%%BATTERY%%share/gnome/help/battstat/sv/figures/warning_small.png -%%BATTERY%%share/gnome/help/battstat/sv/legal.xml +%%BATTERY%%share/gnome/help/battstat/es/figures/battstat-credits-hal.png +%%BATTERY%%share/gnome/help/battstat/es/figures/battstat-preferences.png +%%BATTERY%%share/gnome/help/battstat/es/figures/context-menu.png %%BATTERY%%share/gnome/help/battstat/uk/battstat.xml -%%BATTERY%%share/gnome/help/battstat/uk/figures/ac_small.png -%%BATTERY%%share/gnome/help/battstat/uk/figures/batt_green.png -%%BATTERY%%share/gnome/help/battstat/uk/figures/batt_orange.png -%%BATTERY%%share/gnome/help/battstat/uk/figures/batt_red.png -%%BATTERY%%share/gnome/help/battstat/uk/figures/batt_yellow.png -%%BATTERY%%share/gnome/help/battstat/uk/figures/battery_small.png +%%BATTERY%%share/gnome/help/battstat/uk/figures/battstat-applet-expanded.png %%BATTERY%%share/gnome/help/battstat/uk/figures/battstat-applet.png -%%BATTERY%%share/gnome/help/battstat/uk/figures/battstat-applet_window.png +%%BATTERY%%share/gnome/help/battstat/uk/figures/battstat-credits-hal.png %%BATTERY%%share/gnome/help/battstat/uk/figures/battstat-preferences.png -%%BATTERY%%share/gnome/help/battstat/uk/figures/flash_small.png -%%BATTERY%%share/gnome/help/battstat/uk/figures/warning_small.png -%%BATTERY%%share/gnome/help/battstat/uk/legal.xml -%%BATTERY%%share/gnome/help/battstat/zh_CN/battstat.xml -%%BATTERY%%share/gnome/help/battstat/zh_CN/figures/ac_small.png -%%BATTERY%%share/gnome/help/battstat/zh_CN/figures/batt_green.png -%%BATTERY%%share/gnome/help/battstat/zh_CN/figures/batt_orange.png -%%BATTERY%%share/gnome/help/battstat/zh_CN/figures/batt_red.png -%%BATTERY%%share/gnome/help/battstat/zh_CN/figures/batt_yellow.png -%%BATTERY%%share/gnome/help/battstat/zh_CN/figures/battery_small.png -%%BATTERY%%share/gnome/help/battstat/zh_CN/figures/battstat-applet.png -%%BATTERY%%share/gnome/help/battstat/zh_CN/figures/battstat-applet_window.png -%%BATTERY%%share/gnome/help/battstat/zh_CN/figures/flash_small.png -%%BATTERY%%share/gnome/help/battstat/zh_CN/figures/warning_small.png -%%BATTERY%%share/gnome/help/battstat/zh_CN/legal.xml -%%BATTERY%%share/gnome/help/battstat/zh_HK/battstat.xml -%%BATTERY%%share/gnome/help/battstat/zh_HK/figures/ac_small.png -%%BATTERY%%share/gnome/help/battstat/zh_HK/figures/batt_green.png -%%BATTERY%%share/gnome/help/battstat/zh_HK/figures/batt_orange.png -%%BATTERY%%share/gnome/help/battstat/zh_HK/figures/batt_red.png -%%BATTERY%%share/gnome/help/battstat/zh_HK/figures/batt_yellow.png -%%BATTERY%%share/gnome/help/battstat/zh_HK/figures/battery_small.png -%%BATTERY%%share/gnome/help/battstat/zh_HK/figures/battstat-applet.png -%%BATTERY%%share/gnome/help/battstat/zh_HK/figures/battstat-applet_window.png -%%BATTERY%%share/gnome/help/battstat/zh_HK/figures/flash_small.png -%%BATTERY%%share/gnome/help/battstat/zh_HK/figures/warning_small.png -%%BATTERY%%share/gnome/help/battstat/zh_HK/legal.xml -%%BATTERY%%share/gnome/help/battstat/zh_TW/battstat.xml -%%BATTERY%%share/gnome/help/battstat/zh_TW/figures/ac_small.png -%%BATTERY%%share/gnome/help/battstat/zh_TW/figures/batt_green.png -%%BATTERY%%share/gnome/help/battstat/zh_TW/figures/batt_orange.png -%%BATTERY%%share/gnome/help/battstat/zh_TW/figures/batt_red.png -%%BATTERY%%share/gnome/help/battstat/zh_TW/figures/batt_yellow.png -%%BATTERY%%share/gnome/help/battstat/zh_TW/figures/battery_small.png -%%BATTERY%%share/gnome/help/battstat/zh_TW/figures/battstat-applet.png -%%BATTERY%%share/gnome/help/battstat/zh_TW/figures/battstat-applet_window.png -%%BATTERY%%share/gnome/help/battstat/zh_TW/figures/flash_small.png -%%BATTERY%%share/gnome/help/battstat/zh_TW/figures/warning_small.png -%%BATTERY%%share/gnome/help/battstat/zh_TW/legal.xml +%%BATTERY%%share/gnome/help/battstat/uk/figures/context-menu.png share/gnome/help/char-palette/C/char-palette.xml share/gnome/help/char-palette/C/figures/charpalette_applet.png share/gnome/help/char-palette/C/figures/charpalette_chargroup.png -share/gnome/help/char-palette/C/figures/charpick_characters.png share/gnome/help/char-palette/C/figures/charpick-preferences.png +share/gnome/help/char-palette/C/figures/charpick_characters.png share/gnome/help/char-palette/C/legal.xml -share/gnome/help/char-palette/de/char-palette.xml -share/gnome/help/char-palette/de/figures/charpalette_applet.png -share/gnome/help/char-palette/de/figures/charpalette_chargroup.png -share/gnome/help/char-palette/de/figures/charpick_applet.png -share/gnome/help/char-palette/de/figures/charpick_characters.png -share/gnome/help/char-palette/de/figures/charpick_chargroup.png -share/gnome/help/char-palette/de/legal.xml share/gnome/help/char-palette/es/char-palette.xml share/gnome/help/char-palette/es/figures/charpalette_applet.png share/gnome/help/char-palette/es/figures/charpalette_chargroup.png -share/gnome/help/char-palette/es/figures/charpick_applet.png +share/gnome/help/char-palette/es/figures/charpick-preferences.png share/gnome/help/char-palette/es/figures/charpick_characters.png -share/gnome/help/char-palette/es/figures/charpick_chargroup.png -share/gnome/help/char-palette/es/legal.xml -share/gnome/help/char-palette/eu/char-palette.xml -share/gnome/help/char-palette/eu/figures/charpalette_applet.png -share/gnome/help/char-palette/eu/figures/charpalette_chargroup.png -share/gnome/help/char-palette/eu/figures/charpick_characters.png -share/gnome/help/char-palette/eu/legal.xml -share/gnome/help/char-palette/fr/char-palette.xml -share/gnome/help/char-palette/fr/figures/charpalette_applet.png -share/gnome/help/char-palette/fr/figures/charpalette_chargroup.png -share/gnome/help/char-palette/fr/figures/charpick_applet.png -share/gnome/help/char-palette/fr/figures/charpick_characters.png -share/gnome/help/char-palette/fr/figures/charpick_chargroup.png -share/gnome/help/char-palette/fr/legal.xml share/gnome/help/char-palette/it/char-palette.xml share/gnome/help/char-palette/it/figures/charpalette_applet.png share/gnome/help/char-palette/it/figures/charpalette_chargroup.png -share/gnome/help/char-palette/it/figures/charpick_applet.png +share/gnome/help/char-palette/it/figures/charpick-preferences.png share/gnome/help/char-palette/it/figures/charpick_characters.png -share/gnome/help/char-palette/it/figures/charpick_chargroup.png -share/gnome/help/char-palette/it/legal.xml -share/gnome/help/char-palette/ja/char-palette.xml -share/gnome/help/char-palette/ja/figures/charpalette_applet.png -share/gnome/help/char-palette/ja/legal.xml -share/gnome/help/char-palette/ko/char-palette.xml -share/gnome/help/char-palette/ko/figures/charpalette_applet.png -share/gnome/help/char-palette/ko/figures/charpalette_chargroup.png -share/gnome/help/char-palette/ko/figures/charpick_applet.png -share/gnome/help/char-palette/ko/figures/charpick_characters.png -share/gnome/help/char-palette/ko/figures/charpick_chargroup.png -share/gnome/help/char-palette/ko/legal.xml -share/gnome/help/char-palette/sv/char-palette.xml -share/gnome/help/char-palette/sv/figures/charpalette_applet.png -share/gnome/help/char-palette/sv/figures/charpalette_chargroup.png -share/gnome/help/char-palette/sv/figures/charpick_applet.png -share/gnome/help/char-palette/sv/figures/charpick_characters.png -share/gnome/help/char-palette/sv/figures/charpick_chargroup.png -share/gnome/help/char-palette/sv/legal.xml +share/gnome/help/char-palette/nl/char-palette.xml +share/gnome/help/char-palette/nl/figures/charpalette_applet.png +share/gnome/help/char-palette/nl/figures/charpalette_chargroup.png +share/gnome/help/char-palette/nl/figures/charpick-preferences.png +share/gnome/help/char-palette/nl/figures/charpick_characters.png +share/gnome/help/char-palette/pt_BR/char-palette.xml +share/gnome/help/char-palette/pt_BR/figures/charpalette_applet.png +share/gnome/help/char-palette/pt_BR/figures/charpalette_chargroup.png +share/gnome/help/char-palette/pt_BR/figures/charpick-preferences.png +share/gnome/help/char-palette/pt_BR/figures/charpick_characters.png share/gnome/help/char-palette/uk/char-palette.xml share/gnome/help/char-palette/uk/figures/charpalette_applet.png share/gnome/help/char-palette/uk/figures/charpalette_chargroup.png share/gnome/help/char-palette/uk/figures/charpick-preferences.png share/gnome/help/char-palette/uk/figures/charpick_characters.png -share/gnome/help/char-palette/uk/legal.xml -share/gnome/help/char-palette/zh_CN/char-palette.xml -share/gnome/help/char-palette/zh_CN/figures/charpalette_applet.png -share/gnome/help/char-palette/zh_CN/figures/charpalette_chargroup.png -share/gnome/help/char-palette/zh_CN/figures/charpick_applet.png -share/gnome/help/char-palette/zh_CN/figures/charpick_characters.png -share/gnome/help/char-palette/zh_CN/figures/charpick_chargroup.png -share/gnome/help/char-palette/zh_CN/legal.xml -share/gnome/help/char-palette/zh_HK/char-palette.xml -share/gnome/help/char-palette/zh_HK/figures/charpalette_applet.png -share/gnome/help/char-palette/zh_HK/figures/charpalette_chargroup.png -share/gnome/help/char-palette/zh_HK/legal.xml -share/gnome/help/char-palette/zh_TW/char-palette.xml -share/gnome/help/char-palette/zh_TW/figures/charpalette_applet.png -share/gnome/help/char-palette/zh_TW/figures/charpalette_chargroup.png -share/gnome/help/char-palette/zh_TW/figures/charpick_applet.png -share/gnome/help/char-palette/zh_TW/figures/charpick_characters.png -share/gnome/help/char-palette/zh_TW/figures/charpick_chargroup.png -share/gnome/help/char-palette/zh_TW/legal.xml share/gnome/help/command-line/C/command-line.xml share/gnome/help/command-line/C/figures/command-line.png share/gnome/help/command-line/C/figures/prefs-macros.png share/gnome/help/command-line/C/figures/prefs.png share/gnome/help/command-line/C/legal.xml -share/gnome/help/command-line/de/command-line.xml -share/gnome/help/command-line/de/figures/command-line.png -share/gnome/help/command-line/de/legal.xml share/gnome/help/command-line/es/command-line.xml share/gnome/help/command-line/es/figures/command-line.png -share/gnome/help/command-line/es/legal.xml -share/gnome/help/command-line/eu/command-line.xml -share/gnome/help/command-line/eu/figures/command-line.png -share/gnome/help/command-line/eu/legal.xml -share/gnome/help/command-line/fr/command-line.xml -share/gnome/help/command-line/fr/figures/command-line.png -share/gnome/help/command-line/fr/legal.xml -share/gnome/help/command-line/it/command-line.xml -share/gnome/help/command-line/it/figures/command-line.png -share/gnome/help/command-line/it/legal.xml -share/gnome/help/command-line/ja/command-line.xml -share/gnome/help/command-line/ja/figures/command-line.png -share/gnome/help/command-line/ja/legal.xml -share/gnome/help/command-line/ko/command-line.xml -share/gnome/help/command-line/ko/figures/command-line.png -share/gnome/help/command-line/ko/legal.xml -share/gnome/help/command-line/sv/command-line.xml -share/gnome/help/command-line/sv/figures/command-line.png -share/gnome/help/command-line/sv/legal.xml +share/gnome/help/command-line/es/figures/prefs-macros.png +share/gnome/help/command-line/es/figures/prefs.png +share/gnome/help/command-line/pt_BR/command-line.xml +share/gnome/help/command-line/pt_BR/figures/command-line.png +share/gnome/help/command-line/pt_BR/figures/prefs-macros.png +share/gnome/help/command-line/pt_BR/figures/prefs.png share/gnome/help/command-line/uk/command-line.xml share/gnome/help/command-line/uk/figures/command-line.png share/gnome/help/command-line/uk/figures/prefs-macros.png share/gnome/help/command-line/uk/figures/prefs.png -share/gnome/help/command-line/uk/legal.xml -share/gnome/help/command-line/zh_CN/command-line.xml -share/gnome/help/command-line/zh_CN/figures/command-line.png -share/gnome/help/command-line/zh_CN/legal.xml -share/gnome/help/command-line/zh_HK/command-line.xml -share/gnome/help/command-line/zh_HK/figures/command-line.png -share/gnome/help/command-line/zh_HK/legal.xml -share/gnome/help/command-line/zh_TW/command-line.xml -share/gnome/help/command-line/zh_TW/figures/command-line.png -share/gnome/help/command-line/zh_TW/legal.xml %%CPUFREQ%%share/gnome/help/cpufreq-applet/C/cpufreq-applet.xml %%CPUFREQ%%share/gnome/help/cpufreq-applet/C/figures/cpufreq-100.png %%CPUFREQ%%share/gnome/help/cpufreq-applet/C/figures/cpufreq-25.png %%CPUFREQ%%share/gnome/help/cpufreq-applet/C/figures/cpufreq-50.png %%CPUFREQ%%share/gnome/help/cpufreq-applet/C/figures/cpufreq-75.png -%%CPUFREQ%%share/gnome/help/cpufreq-applet/C/figures/cpufreq-applet.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/C/figures/cpufreq-applet-preferences-smp.png %%CPUFREQ%%share/gnome/help/cpufreq-applet/C/figures/cpufreq-applet-preferences.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/C/figures/cpufreq-applet-selector-both.png %%CPUFREQ%%share/gnome/help/cpufreq-applet/C/figures/cpufreq-applet-selector.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/C/figures/cpufreq-applet.png %%CPUFREQ%%share/gnome/help/cpufreq-applet/C/legal.xml +%%CPUFREQ%%share/gnome/help/cpufreq-applet/es/cpufreq-applet.xml +%%CPUFREQ%%share/gnome/help/cpufreq-applet/es/figures/cpufreq-100.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/es/figures/cpufreq-25.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/es/figures/cpufreq-50.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/es/figures/cpufreq-75.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/es/figures/cpufreq-applet-preferences-smp.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/es/figures/cpufreq-applet-preferences.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/es/figures/cpufreq-applet-selector-both.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/es/figures/cpufreq-applet-selector.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/es/figures/cpufreq-applet.png %%CPUFREQ%%share/gnome/help/cpufreq-applet/uk/cpufreq-applet.xml %%CPUFREQ%%share/gnome/help/cpufreq-applet/uk/figures/cpufreq-100.png %%CPUFREQ%%share/gnome/help/cpufreq-applet/uk/figures/cpufreq-25.png %%CPUFREQ%%share/gnome/help/cpufreq-applet/uk/figures/cpufreq-50.png %%CPUFREQ%%share/gnome/help/cpufreq-applet/uk/figures/cpufreq-75.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/uk/figures/cpufreq-applet-preferences-smp.png %%CPUFREQ%%share/gnome/help/cpufreq-applet/uk/figures/cpufreq-applet-preferences.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/uk/figures/cpufreq-applet-selector-both.png %%CPUFREQ%%share/gnome/help/cpufreq-applet/uk/figures/cpufreq-applet-selector.png %%CPUFREQ%%share/gnome/help/cpufreq-applet/uk/figures/cpufreq-applet.png -%%CPUFREQ%%share/gnome/help/cpufreq-applet/uk/legal.xml share/gnome/help/drivemount/C/drivemount.xml share/gnome/help/drivemount/C/figures/drivemount-applet_eject.png share/gnome/help/drivemount/C/figures/drivemount-applet_example.png @@ -387,184 +234,56 @@ share/gnome/help/drivemount/C/figures/drivemount-applet_mount.png share/gnome/help/drivemount/C/figures/drivemount-applet_open.png share/gnome/help/drivemount/C/figures/drivemount-applet_status.png share/gnome/help/drivemount/C/legal.xml -share/gnome/help/drivemount/de/drivemount.xml -share/gnome/help/drivemount/de/figures/drivemount-applet_window.png -share/gnome/help/drivemount/de/figures/drivemount_applet_all.png -share/gnome/help/drivemount/de/figures/drivemount_applet_floppy.png -share/gnome/help/drivemount/de/figures/drivemount_applet_settings.png -share/gnome/help/drivemount/de/figures/drivemount_applet_tooltip.png -share/gnome/help/drivemount/de/legal.xml share/gnome/help/drivemount/es/drivemount.xml -share/gnome/help/drivemount/es/figures/drivemount-applet_window.png -share/gnome/help/drivemount/es/figures/drivemount_applet_all.png -share/gnome/help/drivemount/es/figures/drivemount_applet_floppy.png -share/gnome/help/drivemount/es/figures/drivemount_applet_settings.png -share/gnome/help/drivemount/es/figures/drivemount_applet_tooltip.png -share/gnome/help/drivemount/es/legal.xml -share/gnome/help/drivemount/eu/drivemount.xml -share/gnome/help/drivemount/eu/figures/drivemount_applet_all.png -share/gnome/help/drivemount/eu/figures/drivemount_applet_floppy.png -share/gnome/help/drivemount/eu/figures/drivemount_applet_settings.png -share/gnome/help/drivemount/eu/figures/drivemount_applet_tooltip.png -share/gnome/help/drivemount/eu/legal.xml -share/gnome/help/drivemount/fr/drivemount.xml -share/gnome/help/drivemount/fr/figures/drivemount-applet_window.png -share/gnome/help/drivemount/fr/figures/drivemount_applet_all.png -share/gnome/help/drivemount/fr/figures/drivemount_applet_floppy.png -share/gnome/help/drivemount/fr/figures/drivemount_applet_settings.png -share/gnome/help/drivemount/fr/figures/drivemount_applet_tooltip.png -share/gnome/help/drivemount/fr/legal.xml +share/gnome/help/drivemount/es/figures/drivemount-applet_eject.png +share/gnome/help/drivemount/es/figures/drivemount-applet_example.png +share/gnome/help/drivemount/es/figures/drivemount-applet_mount.png +share/gnome/help/drivemount/es/figures/drivemount-applet_open.png +share/gnome/help/drivemount/es/figures/drivemount-applet_status.png share/gnome/help/drivemount/it/drivemount.xml -share/gnome/help/drivemount/it/figures/drivemount-applet_window.png -share/gnome/help/drivemount/it/figures/drivemount_applet_all.png -share/gnome/help/drivemount/it/figures/drivemount_applet_floppy.png -share/gnome/help/drivemount/it/figures/drivemount_applet_settings.png -share/gnome/help/drivemount/it/figures/drivemount_applet_tooltip.png -share/gnome/help/drivemount/it/legal.xml -share/gnome/help/drivemount/ja/drivemount.xml -share/gnome/help/drivemount/ja/figures/drivemount-applet_window.png -share/gnome/help/drivemount/ja/figures/drivemount_applet_all.png -share/gnome/help/drivemount/ja/figures/drivemount_applet_floppy.png -share/gnome/help/drivemount/ja/figures/drivemount_applet_settings.png -share/gnome/help/drivemount/ja/figures/drivemount_applet_tooltip.png -share/gnome/help/drivemount/ja/legal.xml -share/gnome/help/drivemount/ko/drivemount.xml -share/gnome/help/drivemount/ko/figures/drivemount-applet_window.png -share/gnome/help/drivemount/ko/figures/drivemount_applet_all.png -share/gnome/help/drivemount/ko/figures/drivemount_applet_floppy.png -share/gnome/help/drivemount/ko/figures/drivemount_applet_settings.png -share/gnome/help/drivemount/ko/figures/drivemount_applet_tooltip.png -share/gnome/help/drivemount/ko/legal.xml -share/gnome/help/drivemount/sv/drivemount.xml -share/gnome/help/drivemount/sv/figures/drivemount-applet_window.png -share/gnome/help/drivemount/sv/figures/drivemount_applet_all.png -share/gnome/help/drivemount/sv/figures/drivemount_applet_floppy.png -share/gnome/help/drivemount/sv/figures/drivemount_applet_settings.png -share/gnome/help/drivemount/sv/figures/drivemount_applet_tooltip.png -share/gnome/help/drivemount/sv/legal.xml +share/gnome/help/drivemount/it/figures/drivemount-applet_eject.png +share/gnome/help/drivemount/it/figures/drivemount-applet_example.png +share/gnome/help/drivemount/it/figures/drivemount-applet_mount.png +share/gnome/help/drivemount/it/figures/drivemount-applet_open.png +share/gnome/help/drivemount/it/figures/drivemount-applet_status.png +share/gnome/help/drivemount/pa/drivemount.xml +share/gnome/help/drivemount/pa/figures/drivemount-applet_eject.png +share/gnome/help/drivemount/pa/figures/drivemount-applet_example.png +share/gnome/help/drivemount/pa/figures/drivemount-applet_mount.png +share/gnome/help/drivemount/pa/figures/drivemount-applet_open.png +share/gnome/help/drivemount/pa/figures/drivemount-applet_status.png share/gnome/help/drivemount/uk/drivemount.xml share/gnome/help/drivemount/uk/figures/drivemount-applet_eject.png share/gnome/help/drivemount/uk/figures/drivemount-applet_example.png share/gnome/help/drivemount/uk/figures/drivemount-applet_mount.png share/gnome/help/drivemount/uk/figures/drivemount-applet_open.png share/gnome/help/drivemount/uk/figures/drivemount-applet_status.png -share/gnome/help/drivemount/uk/legal.xml -share/gnome/help/drivemount/zh_CN/drivemount.xml -share/gnome/help/drivemount/zh_CN/figures/drivemount-applet_window.png -share/gnome/help/drivemount/zh_CN/figures/drivemount_applet_all.png -share/gnome/help/drivemount/zh_CN/figures/drivemount_applet_floppy.png -share/gnome/help/drivemount/zh_CN/figures/drivemount_applet_settings.png -share/gnome/help/drivemount/zh_CN/figures/drivemount_applet_tooltip.png -share/gnome/help/drivemount/zh_CN/legal.xml -share/gnome/help/drivemount/zh_HK/drivemount.xml -share/gnome/help/drivemount/zh_HK/figures/drivemount-applet_window.png -share/gnome/help/drivemount/zh_HK/figures/drivemount_applet_all.png -share/gnome/help/drivemount/zh_HK/figures/drivemount_applet_floppy.png -share/gnome/help/drivemount/zh_HK/figures/drivemount_applet_settings.png -share/gnome/help/drivemount/zh_HK/figures/drivemount_applet_tooltip.png -share/gnome/help/drivemount/zh_HK/legal.xml -share/gnome/help/drivemount/zh_TW/drivemount.xml -share/gnome/help/drivemount/zh_TW/figures/drivemount-applet_window.png -share/gnome/help/drivemount/zh_TW/figures/drivemount_applet_all.png -share/gnome/help/drivemount/zh_TW/figures/drivemount_applet_floppy.png -share/gnome/help/drivemount/zh_TW/figures/drivemount_applet_settings.png -share/gnome/help/drivemount/zh_TW/figures/drivemount_applet_tooltip.png -share/gnome/help/drivemount/zh_TW/legal.xml share/gnome/help/geyes/C/figures/geyes_applet.png share/gnome/help/geyes/C/geyes.xml share/gnome/help/geyes/C/legal.xml -share/gnome/help/geyes/de/figures/geyes_applet.png -share/gnome/help/geyes/de/figures/geyes_settings.png -share/gnome/help/geyes/de/geyes.xml -share/gnome/help/geyes/de/legal.xml share/gnome/help/geyes/es/figures/geyes_applet.png -share/gnome/help/geyes/es/figures/geyes_settings.png share/gnome/help/geyes/es/geyes.xml -share/gnome/help/geyes/es/legal.xml -share/gnome/help/geyes/eu/figures/geyes_applet.png -share/gnome/help/geyes/eu/geyes.xml -share/gnome/help/geyes/eu/legal.xml -share/gnome/help/geyes/fr/figures/geyes_applet.png -share/gnome/help/geyes/fr/figures/geyes_settings.png -share/gnome/help/geyes/fr/geyes.xml -share/gnome/help/geyes/fr/legal.xml share/gnome/help/geyes/it/figures/geyes_applet.png -share/gnome/help/geyes/it/figures/geyes_settings.png share/gnome/help/geyes/it/geyes.xml -share/gnome/help/geyes/it/legal.xml -share/gnome/help/geyes/ja/figures/geyes_applet.png -share/gnome/help/geyes/ja/figures/geyes_settings.png -share/gnome/help/geyes/ja/geyes.xml -share/gnome/help/geyes/ja/legal.xml -share/gnome/help/geyes/ko/figures/geyes_applet.png -share/gnome/help/geyes/ko/figures/geyes_settings.png -share/gnome/help/geyes/ko/geyes.xml -share/gnome/help/geyes/ko/legal.xml -share/gnome/help/geyes/sv/figures/geyes_applet.png -share/gnome/help/geyes/sv/figures/geyes_settings.png -share/gnome/help/geyes/sv/geyes.xml -share/gnome/help/geyes/sv/legal.xml share/gnome/help/geyes/uk/figures/geyes_applet.png share/gnome/help/geyes/uk/geyes.xml -share/gnome/help/geyes/uk/legal.xml -share/gnome/help/geyes/zh_CN/figures/geyes_applet.png -share/gnome/help/geyes/zh_CN/figures/geyes_settings.png -share/gnome/help/geyes/zh_CN/geyes.xml -share/gnome/help/geyes/zh_CN/legal.xml -share/gnome/help/geyes/zh_HK/figures/geyes_applet.png -share/gnome/help/geyes/zh_HK/geyes.xml -share/gnome/help/geyes/zh_HK/legal.xml -share/gnome/help/geyes/zh_TW/figures/geyes_applet.png -share/gnome/help/geyes/zh_TW/figures/geyes_settings.png -share/gnome/help/geyes/zh_TW/geyes.xml -share/gnome/help/geyes/zh_TW/legal.xml share/gnome/help/gswitchit/C/gswitchit.xml share/gnome/help/gswitchit/C/legal.xml +share/gnome/help/gswitchit/es/gswitchit.xml +share/gnome/help/gswitchit/fr/gswitchit.xml share/gnome/help/gswitchit/uk/gswitchit.xml -share/gnome/help/gswitchit/uk/legal.xml share/gnome/help/gtik2_applet2/C/figures/gtik_applet.png share/gnome/help/gtik2_applet2/C/gtik2_applet2.xml share/gnome/help/gtik2_applet2/C/legal.xml -share/gnome/help/gtik2_applet2/de/figures/gtik_applet.png -share/gnome/help/gtik2_applet2/de/gtik2_applet2.xml -share/gnome/help/gtik2_applet2/de/legal.xml share/gnome/help/gtik2_applet2/es/figures/gtik_applet.png share/gnome/help/gtik2_applet2/es/gtik2_applet2.xml -share/gnome/help/gtik2_applet2/es/legal.xml -share/gnome/help/gtik2_applet2/eu/figures/gtik_applet.png -share/gnome/help/gtik2_applet2/eu/gtik2_applet2.xml -share/gnome/help/gtik2_applet2/eu/legal.xml -share/gnome/help/gtik2_applet2/fr/figures/gtik_applet.png -share/gnome/help/gtik2_applet2/fr/gtik2_applet2.xml -share/gnome/help/gtik2_applet2/fr/legal.xml -share/gnome/help/gtik2_applet2/it/figures/gtik_applet.png -share/gnome/help/gtik2_applet2/it/gtik2_applet2.xml -share/gnome/help/gtik2_applet2/it/legal.xml -share/gnome/help/gtik2_applet2/ja/figures/gtik_applet.png -share/gnome/help/gtik2_applet2/ja/gtik2_applet2.xml -share/gnome/help/gtik2_applet2/ja/legal.xml -share/gnome/help/gtik2_applet2/ko/figures/gtik_applet.png -share/gnome/help/gtik2_applet2/ko/gtik2_applet2.xml -share/gnome/help/gtik2_applet2/ko/legal.xml -share/gnome/help/gtik2_applet2/sv/figures/gtik_applet.png -share/gnome/help/gtik2_applet2/sv/gtik2_applet2.xml -share/gnome/help/gtik2_applet2/sv/legal.xml share/gnome/help/gtik2_applet2/uk/figures/gtik_applet.png share/gnome/help/gtik2_applet2/uk/gtik2_applet2.xml -share/gnome/help/gtik2_applet2/uk/legal.xml -share/gnome/help/gtik2_applet2/zh_CN/figures/gtik_applet.png -share/gnome/help/gtik2_applet2/zh_CN/gtik2_applet2.xml -share/gnome/help/gtik2_applet2/zh_CN/legal.xml -share/gnome/help/gtik2_applet2/zh_HK/figures/gtik_applet.png -share/gnome/help/gtik2_applet2/zh_HK/gtik2_applet2.xml -share/gnome/help/gtik2_applet2/zh_HK/legal.xml -share/gnome/help/gtik2_applet2/zh_TW/figures/gtik_applet.png -share/gnome/help/gtik2_applet2/zh_TW/gtik2_applet2.xml -share/gnome/help/gtik2_applet2/zh_TW/legal.xml -share/gnome/help/gweather/C/figures/gweather_applet.png share/gnome/help/gweather/C/figures/gweather-details.png +share/gnome/help/gweather/C/figures/gweather-menu-prefs.png share/gnome/help/gweather/C/figures/gweather-prefs-general.png share/gnome/help/gweather/C/figures/gweather-prefs-locations.png +share/gnome/help/gweather/C/figures/gweather_applet.png share/gnome/help/gweather/C/figures/stock_weather-cloudy.png share/gnome/help/gweather/C/figures/stock_weather-few-clouds.png share/gnome/help/gweather/C/figures/stock_weather-fog.png @@ -576,47 +295,23 @@ share/gnome/help/gweather/C/figures/stock_weather-storm.png share/gnome/help/gweather/C/figures/stock_weather-sunny.png share/gnome/help/gweather/C/gweather.xml share/gnome/help/gweather/C/legal.xml -share/gnome/help/gweather/de/figures/gweather_applet.png -share/gnome/help/gweather/de/figures/gweather_settings.png -share/gnome/help/gweather/de/figures/gweather_weather.png -share/gnome/help/gweather/de/gweather.xml -share/gnome/help/gweather/de/legal.xml +share/gnome/help/gweather/es/figures/gweather-details.png +share/gnome/help/gweather/es/figures/gweather-menu-prefs.png +share/gnome/help/gweather/es/figures/gweather-prefs-general.png +share/gnome/help/gweather/es/figures/gweather-prefs-locations.png share/gnome/help/gweather/es/figures/gweather_applet.png -share/gnome/help/gweather/es/figures/gweather_settings.png -share/gnome/help/gweather/es/figures/gweather_weather.png +share/gnome/help/gweather/es/figures/stock_weather-cloudy.png +share/gnome/help/gweather/es/figures/stock_weather-few-clouds.png +share/gnome/help/gweather/es/figures/stock_weather-fog.png +share/gnome/help/gweather/es/figures/stock_weather-night-clear.png +share/gnome/help/gweather/es/figures/stock_weather-night-few-clouds.png +share/gnome/help/gweather/es/figures/stock_weather-showers.png +share/gnome/help/gweather/es/figures/stock_weather-snow.png +share/gnome/help/gweather/es/figures/stock_weather-storm.png +share/gnome/help/gweather/es/figures/stock_weather-sunny.png share/gnome/help/gweather/es/gweather.xml -share/gnome/help/gweather/es/legal.xml -share/gnome/help/gweather/eu/figures/gweather_applet.png -share/gnome/help/gweather/eu/figures/gweather_settings.png -share/gnome/help/gweather/eu/figures/gweather_weather.png -share/gnome/help/gweather/eu/gweather.xml -share/gnome/help/gweather/eu/legal.xml -share/gnome/help/gweather/fr/figures/gweather_applet.png -share/gnome/help/gweather/fr/figures/gweather_settings.png -share/gnome/help/gweather/fr/figures/gweather_weather.png -share/gnome/help/gweather/fr/gweather.xml -share/gnome/help/gweather/fr/legal.xml -share/gnome/help/gweather/it/figures/gweather_applet.png -share/gnome/help/gweather/it/figures/gweather_settings.png -share/gnome/help/gweather/it/figures/gweather_weather.png -share/gnome/help/gweather/it/gweather.xml -share/gnome/help/gweather/it/legal.xml -share/gnome/help/gweather/ja/figures/gweather_applet.png -share/gnome/help/gweather/ja/figures/gweather_settings.png -share/gnome/help/gweather/ja/figures/gweather_weather.png -share/gnome/help/gweather/ja/gweather.xml -share/gnome/help/gweather/ja/legal.xml -share/gnome/help/gweather/ko/figures/gweather_applet.png -share/gnome/help/gweather/ko/figures/gweather_settings.png -share/gnome/help/gweather/ko/figures/gweather_weather.png -share/gnome/help/gweather/ko/gweather.xml -share/gnome/help/gweather/ko/legal.xml -share/gnome/help/gweather/sv/figures/gweather_applet.png -share/gnome/help/gweather/sv/figures/gweather_settings.png -share/gnome/help/gweather/sv/figures/gweather_weather.png -share/gnome/help/gweather/sv/gweather.xml -share/gnome/help/gweather/sv/legal.xml share/gnome/help/gweather/uk/figures/gweather-details.png +share/gnome/help/gweather/uk/figures/gweather-menu-prefs.png share/gnome/help/gweather/uk/figures/gweather-prefs-general.png share/gnome/help/gweather/uk/figures/gweather-prefs-locations.png share/gnome/help/gweather/uk/figures/gweather_applet.png @@ -630,306 +325,112 @@ share/gnome/help/gweather/uk/figures/stock_weather-snow.png share/gnome/help/gweather/uk/figures/stock_weather-storm.png share/gnome/help/gweather/uk/figures/stock_weather-sunny.png share/gnome/help/gweather/uk/gweather.xml -share/gnome/help/gweather/uk/legal.xml -share/gnome/help/gweather/zh_CN/figures/gweather_applet.png -share/gnome/help/gweather/zh_CN/figures/gweather_settings.png -share/gnome/help/gweather/zh_CN/figures/gweather_weather.png -share/gnome/help/gweather/zh_CN/gweather.xml -share/gnome/help/gweather/zh_CN/legal.xml -share/gnome/help/gweather/zh_HK/figures/gweather_applet.png -share/gnome/help/gweather/zh_HK/figures/gweather_settings.png -share/gnome/help/gweather/zh_HK/figures/gweather_weather.png -share/gnome/help/gweather/zh_HK/gweather.xml -share/gnome/help/gweather/zh_HK/legal.xml -share/gnome/help/gweather/zh_TW/figures/gweather_applet.png -share/gnome/help/gweather/zh_TW/figures/gweather_settings.png -share/gnome/help/gweather/zh_TW/figures/gweather_weather.png -share/gnome/help/gweather/zh_TW/gweather.xml -share/gnome/help/gweather/zh_TW/legal.xml share/gnome/help/mixer_applet2/C/figures/volumecontrol_applet.png share/gnome/help/mixer_applet2/C/legal.xml share/gnome/help/mixer_applet2/C/mixer_applet2.xml -share/gnome/help/mixer_applet2/de/figures/mixer_applet.png -share/gnome/help/mixer_applet2/de/figures/volumecontrol_applet.png -share/gnome/help/mixer_applet2/de/legal.xml -share/gnome/help/mixer_applet2/de/mixer_applet2.xml -share/gnome/help/mixer_applet2/es/figures/mixer_applet.png share/gnome/help/mixer_applet2/es/figures/volumecontrol_applet.png -share/gnome/help/mixer_applet2/es/legal.xml share/gnome/help/mixer_applet2/es/mixer_applet2.xml -share/gnome/help/mixer_applet2/eu/figures/volumecontrol_applet.png -share/gnome/help/mixer_applet2/eu/legal.xml -share/gnome/help/mixer_applet2/eu/mixer_applet2.xml -share/gnome/help/mixer_applet2/fr/figures/mixer_applet.png -share/gnome/help/mixer_applet2/fr/figures/volumecontrol_applet.png -share/gnome/help/mixer_applet2/fr/legal.xml -share/gnome/help/mixer_applet2/fr/mixer_applet2.xml -share/gnome/help/mixer_applet2/it/figures/mixer_applet.png -share/gnome/help/mixer_applet2/it/figures/volumecontrol_applet.png -share/gnome/help/mixer_applet2/it/legal.xml -share/gnome/help/mixer_applet2/it/mixer_applet2.xml -share/gnome/help/mixer_applet2/ja/figures/mixer_applet.png -share/gnome/help/mixer_applet2/ja/figures/volumecontrol_applet.png -share/gnome/help/mixer_applet2/ja/legal.xml -share/gnome/help/mixer_applet2/ja/mixer_applet2.xml -share/gnome/help/mixer_applet2/ko/figures/mixer_applet.png -share/gnome/help/mixer_applet2/ko/figures/volumecontrol_applet.png -share/gnome/help/mixer_applet2/ko/legal.xml -share/gnome/help/mixer_applet2/ko/mixer_applet2.xml -share/gnome/help/mixer_applet2/sv/figures/mixer_applet.png -share/gnome/help/mixer_applet2/sv/figures/volumecontrol_applet.png -share/gnome/help/mixer_applet2/sv/legal.xml -share/gnome/help/mixer_applet2/sv/mixer_applet2.xml share/gnome/help/mixer_applet2/uk/figures/volumecontrol_applet.png -share/gnome/help/mixer_applet2/uk/legal.xml share/gnome/help/mixer_applet2/uk/mixer_applet2.xml -share/gnome/help/mixer_applet2/zh_CN/figures/mixer_applet.png -share/gnome/help/mixer_applet2/zh_CN/figures/volumecontrol_applet.png -share/gnome/help/mixer_applet2/zh_CN/legal.xml -share/gnome/help/mixer_applet2/zh_CN/mixer_applet2.xml -share/gnome/help/mixer_applet2/zh_HK/figures/volumecontrol_applet.png -share/gnome/help/mixer_applet2/zh_HK/legal.xml -share/gnome/help/mixer_applet2/zh_HK/mixer_applet2.xml -share/gnome/help/mixer_applet2/zh_TW/figures/mixer_applet.png -share/gnome/help/mixer_applet2/zh_TW/figures/volumecontrol_applet.png -share/gnome/help/mixer_applet2/zh_TW/legal.xml -share/gnome/help/mixer_applet2/zh_TW/mixer_applet2.xml share/gnome/help/multiload/C/figures/multiload-preferences.png share/gnome/help/multiload/C/figures/system-monitor-applet_window.png share/gnome/help/multiload/C/figures/system_monitor.png share/gnome/help/multiload/C/legal.xml share/gnome/help/multiload/C/multiload.xml -share/gnome/help/multiload/de/figures/system-monitor-applet_window.png -share/gnome/help/multiload/de/legal.xml -share/gnome/help/multiload/de/multiload.xml +share/gnome/help/multiload/es/figures/multiload-preferences.png share/gnome/help/multiload/es/figures/system-monitor-applet_window.png -share/gnome/help/multiload/es/legal.xml +share/gnome/help/multiload/es/figures/system_monitor.png share/gnome/help/multiload/es/multiload.xml -share/gnome/help/multiload/eu/figures/system_monitor.png -share/gnome/help/multiload/eu/figures/system_monitor_prefs.png -share/gnome/help/multiload/eu/legal.xml -share/gnome/help/multiload/eu/multiload.xml -share/gnome/help/multiload/fr/figures/system-monitor-applet_window.png -share/gnome/help/multiload/fr/legal.xml -share/gnome/help/multiload/fr/multiload.xml -share/gnome/help/multiload/it/figures/system-monitor-applet_window.png -share/gnome/help/multiload/it/legal.xml -share/gnome/help/multiload/it/multiload.xml -share/gnome/help/multiload/ja/figures/system-monitor-applet_window.png -share/gnome/help/multiload/ja/legal.xml -share/gnome/help/multiload/ja/multiload.xml -share/gnome/help/multiload/ko/figures/system-monitor-applet_window.png -share/gnome/help/multiload/ko/legal.xml -share/gnome/help/multiload/ko/multiload.xml -share/gnome/help/multiload/sv/figures/system-monitor-applet_window.png -share/gnome/help/multiload/sv/legal.xml -share/gnome/help/multiload/sv/multiload.xml share/gnome/help/multiload/uk/figures/multiload-preferences.png share/gnome/help/multiload/uk/figures/system-monitor-applet_window.png share/gnome/help/multiload/uk/figures/system_monitor.png -share/gnome/help/multiload/uk/legal.xml share/gnome/help/multiload/uk/multiload.xml -share/gnome/help/multiload/zh_CN/figures/system-monitor-applet_window.png -share/gnome/help/multiload/zh_CN/legal.xml -share/gnome/help/multiload/zh_CN/multiload.xml -share/gnome/help/multiload/zh_HK/figures/system-monitor-applet_window.png -share/gnome/help/multiload/zh_HK/legal.xml -share/gnome/help/multiload/zh_HK/multiload.xml -share/gnome/help/multiload/zh_TW/figures/system-monitor-applet_window.png -share/gnome/help/multiload/zh_TW/legal.xml -share/gnome/help/multiload/zh_TW/multiload.xml -share/gnome/help/stickynotes_applet/C/legal.xml -share/gnome/help/stickynotes_applet/C/stickynotes_applet.xml -share/gnome/help/stickynotes_applet/C/figures/stickynote-left-menu.png -share/gnome/help/stickynotes_applet/C/figures/stickynote-right-menu.png +share/gnome/help/stickynotes_applet/C/figures/stickynote-right-menu-lock.png +share/gnome/help/stickynotes_applet/C/figures/stickynote-right-menu-new.png share/gnome/help/stickynotes_applet/C/figures/stickynotes-note-prefs.png share/gnome/help/stickynotes_applet/C/figures/stickynotes-prefs.png share/gnome/help/stickynotes_applet/C/figures/stickynotes_applet.png -share/gnome/help/stickynotes_applet/de/figures/stickynotes_applet.png -share/gnome/help/stickynotes_applet/de/legal.xml -share/gnome/help/stickynotes_applet/de/stickynotes_applet.xml +share/gnome/help/stickynotes_applet/C/legal.xml +share/gnome/help/stickynotes_applet/C/stickynotes_applet.xml +share/gnome/help/stickynotes_applet/es/figures/stickynote-right-menu-lock.png +share/gnome/help/stickynotes_applet/es/figures/stickynote-right-menu-new.png +share/gnome/help/stickynotes_applet/es/figures/stickynotes-note-prefs.png +share/gnome/help/stickynotes_applet/es/figures/stickynotes-prefs.png share/gnome/help/stickynotes_applet/es/figures/stickynotes_applet.png -share/gnome/help/stickynotes_applet/es/legal.xml share/gnome/help/stickynotes_applet/es/stickynotes_applet.xml -share/gnome/help/stickynotes_applet/eu/figures/stickynotes_applet.png -share/gnome/help/stickynotes_applet/eu/legal.xml -share/gnome/help/stickynotes_applet/eu/stickynotes_applet.xml -share/gnome/help/stickynotes_applet/fr/figures/stickynotes_applet.png -share/gnome/help/stickynotes_applet/fr/legal.xml -share/gnome/help/stickynotes_applet/fr/stickynotes_applet.xml -share/gnome/help/stickynotes_applet/it/figures/stickynotes_applet.png -share/gnome/help/stickynotes_applet/it/legal.xml -share/gnome/help/stickynotes_applet/it/stickynotes_applet.xml -share/gnome/help/stickynotes_applet/ja/figures/stickynotes_applet.png -share/gnome/help/stickynotes_applet/ja/legal.xml -share/gnome/help/stickynotes_applet/ja/stickynotes_applet.xml -share/gnome/help/stickynotes_applet/ko/figures/stickynotes_applet.png -share/gnome/help/stickynotes_applet/ko/legal.xml -share/gnome/help/stickynotes_applet/ko/stickynotes_applet.xml -share/gnome/help/stickynotes_applet/sv/figures/stickynotes_applet.png -share/gnome/help/stickynotes_applet/sv/legal.xml -share/gnome/help/stickynotes_applet/sv/stickynotes_applet.xml -share/gnome/help/stickynotes_applet/uk/figures/stickynote-left-menu.png -share/gnome/help/stickynotes_applet/uk/figures/stickynote-right-menu.png +share/gnome/help/stickynotes_applet/uk/figures/stickynote-right-menu-lock.png +share/gnome/help/stickynotes_applet/uk/figures/stickynote-right-menu-new.png share/gnome/help/stickynotes_applet/uk/figures/stickynotes-note-prefs.png share/gnome/help/stickynotes_applet/uk/figures/stickynotes-prefs.png share/gnome/help/stickynotes_applet/uk/figures/stickynotes_applet.png -share/gnome/help/stickynotes_applet/uk/legal.xml share/gnome/help/stickynotes_applet/uk/stickynotes_applet.xml -share/gnome/help/stickynotes_applet/zh_CN/figures/stickynotes_applet.png -share/gnome/help/stickynotes_applet/zh_CN/legal.xml -share/gnome/help/stickynotes_applet/zh_CN/stickynotes_applet.xml -share/gnome/help/stickynotes_applet/zh_HK/figures/stickynotes_applet.png -share/gnome/help/stickynotes_applet/zh_HK/legal.xml -share/gnome/help/stickynotes_applet/zh_HK/stickynotes_applet.xml -share/gnome/help/stickynotes_applet/zh_TW/figures/stickynotes_applet.png -share/gnome/help/stickynotes_applet/zh_TW/legal.xml -share/gnome/help/stickynotes_applet/zh_TW/stickynotes_applet.xml -share/gnome/help/trashapplet/C/legal.xml share/gnome/help/trashapplet/C/figures/trash-applet.png +share/gnome/help/trashapplet/C/legal.xml share/gnome/help/trashapplet/C/trashapplet.xml +share/gnome/help/trashapplet/es/figures/trash-applet.png +share/gnome/help/trashapplet/es/trashapplet.xml +share/gnome/help/trashapplet/fr/figures/trash-applet.png +share/gnome/help/trashapplet/fr/trashapplet.xml +share/gnome/help/trashapplet/it/figures/trash-applet.png +share/gnome/help/trashapplet/it/trashapplet.xml +share/gnome/help/trashapplet/pa/figures/trash-applet.png +share/gnome/help/trashapplet/pa/trashapplet.xml share/gnome/help/trashapplet/uk/figures/trash-applet.png -share/gnome/help/trashapplet/uk/legal.xml share/gnome/help/trashapplet/uk/trashapplet.xml -share/gnome/omf/gnome-applets/accessx-status-C.omf -share/gnome/omf/gnome-applets/accessx-status-uk.omf -share/gnome/omf/gnome-applets/accessx-status-eu.omf -%%BATTERY%%share/gnome/omf/gnome-applets/battstat-C.omf -%%BATTERY%%share/gnome/omf/gnome-applets/battstat-de.omf -%%BATTERY%%share/gnome/omf/gnome-applets/battstat-es.omf -%%BATTERY%%share/gnome/omf/gnome-applets/battstat-eu.omf -%%BATTERY%%share/gnome/omf/gnome-applets/battstat-fr.omf -%%BATTERY%%share/gnome/omf/gnome-applets/battstat-it.omf -%%BATTERY%%share/gnome/omf/gnome-applets/battstat-ja.omf -%%BATTERY%%share/gnome/omf/gnome-applets/battstat-ko.omf -%%BATTERY%%share/gnome/omf/gnome-applets/battstat-sv.omf -%%BATTERY%%share/gnome/omf/gnome-applets/battstat-uk.omf -%%BATTERY%%share/gnome/omf/gnome-applets/battstat-zh_CN.omf -%%BATTERY%%share/gnome/omf/gnome-applets/battstat-zh_HK.omf -%%BATTERY%%share/gnome/omf/gnome-applets/battstat-zh_TW.omf -share/gnome/omf/gnome-applets/char-palette-C.omf -share/gnome/omf/gnome-applets/char-palette-de.omf -share/gnome/omf/gnome-applets/char-palette-es.omf -share/gnome/omf/gnome-applets/char-palette-eu.omf -share/gnome/omf/gnome-applets/char-palette-fr.omf -share/gnome/omf/gnome-applets/char-palette-it.omf -share/gnome/omf/gnome-applets/char-palette-ja.omf -share/gnome/omf/gnome-applets/char-palette-ko.omf -share/gnome/omf/gnome-applets/char-palette-sv.omf -share/gnome/omf/gnome-applets/char-palette-uk.omf -share/gnome/omf/gnome-applets/char-palette-zh_CN.omf -share/gnome/omf/gnome-applets/char-palette-zh_HK.omf -share/gnome/omf/gnome-applets/char-palette-zh_TW.omf -share/gnome/omf/gnome-applets/command-line-C.omf -share/gnome/omf/gnome-applets/command-line-de.omf -share/gnome/omf/gnome-applets/command-line-es.omf -share/gnome/omf/gnome-applets/command-line-eu.omf -share/gnome/omf/gnome-applets/command-line-fr.omf -share/gnome/omf/gnome-applets/command-line-it.omf -share/gnome/omf/gnome-applets/command-line-ja.omf -share/gnome/omf/gnome-applets/command-line-ko.omf -share/gnome/omf/gnome-applets/command-line-sv.omf -share/gnome/omf/gnome-applets/command-line-uk.omf -share/gnome/omf/gnome-applets/command-line-zh_CN.omf -share/gnome/omf/gnome-applets/command-line-zh_HK.omf -share/gnome/omf/gnome-applets/command-line-zh_TW.omf -%%CPUFREQ%%share/gnome/omf/gnome-applets/cpufreq-applet-C.omf -%%CPUFREQ%%share/gnome/omf/gnome-applets/cpufreq-applet-uk.omf -share/gnome/omf/gnome-applets/drivemount-C.omf -share/gnome/omf/gnome-applets/drivemount-de.omf -share/gnome/omf/gnome-applets/drivemount-es.omf -share/gnome/omf/gnome-applets/drivemount-eu.omf -share/gnome/omf/gnome-applets/drivemount-fr.omf -share/gnome/omf/gnome-applets/drivemount-it.omf -share/gnome/omf/gnome-applets/drivemount-ja.omf -share/gnome/omf/gnome-applets/drivemount-ko.omf -share/gnome/omf/gnome-applets/drivemount-sv.omf -share/gnome/omf/gnome-applets/drivemount-uk.omf -share/gnome/omf/gnome-applets/drivemount-zh_CN.omf -share/gnome/omf/gnome-applets/drivemount-zh_HK.omf -share/gnome/omf/gnome-applets/drivemount-zh_TW.omf -share/gnome/omf/gnome-applets/geyes-C.omf -share/gnome/omf/gnome-applets/geyes-de.omf -share/gnome/omf/gnome-applets/geyes-es.omf -share/gnome/omf/gnome-applets/geyes-eu.omf -share/gnome/omf/gnome-applets/geyes-fr.omf -share/gnome/omf/gnome-applets/geyes-it.omf -share/gnome/omf/gnome-applets/geyes-ja.omf -share/gnome/omf/gnome-applets/geyes-ko.omf -share/gnome/omf/gnome-applets/geyes-sv.omf -share/gnome/omf/gnome-applets/geyes-uk.omf -share/gnome/omf/gnome-applets/geyes-zh_CN.omf -share/gnome/omf/gnome-applets/geyes-zh_HK.omf -share/gnome/omf/gnome-applets/geyes-zh_TW.omf -share/gnome/omf/gnome-applets/gswitchit-C.omf -share/gnome/omf/gnome-applets/gswitchit-uk.omf -share/gnome/omf/gnome-applets/gtik2_applet2-C.omf -share/gnome/omf/gnome-applets/gtik2_applet2-de.omf -share/gnome/omf/gnome-applets/gtik2_applet2-es.omf -share/gnome/omf/gnome-applets/gtik2_applet2-eu.omf -share/gnome/omf/gnome-applets/gtik2_applet2-fr.omf -share/gnome/omf/gnome-applets/gtik2_applet2-it.omf -share/gnome/omf/gnome-applets/gtik2_applet2-ja.omf -share/gnome/omf/gnome-applets/gtik2_applet2-ko.omf -share/gnome/omf/gnome-applets/gtik2_applet2-sv.omf -share/gnome/omf/gnome-applets/gtik2_applet2-uk.omf -share/gnome/omf/gnome-applets/gtik2_applet2-zh_CN.omf -share/gnome/omf/gnome-applets/gtik2_applet2-zh_HK.omf -share/gnome/omf/gnome-applets/gtik2_applet2-zh_TW.omf -share/gnome/omf/gnome-applets/gweather-C.omf -share/gnome/omf/gnome-applets/gweather-de.omf -share/gnome/omf/gnome-applets/gweather-es.omf -share/gnome/omf/gnome-applets/gweather-eu.omf -share/gnome/omf/gnome-applets/gweather-fr.omf -share/gnome/omf/gnome-applets/gweather-it.omf -share/gnome/omf/gnome-applets/gweather-ja.omf -share/gnome/omf/gnome-applets/gweather-ko.omf -share/gnome/omf/gnome-applets/gweather-sv.omf -share/gnome/omf/gnome-applets/gweather-uk.omf -share/gnome/omf/gnome-applets/gweather-zh_CN.omf -share/gnome/omf/gnome-applets/gweather-zh_HK.omf -share/gnome/omf/gnome-applets/gweather-zh_TW.omf -share/gnome/omf/gnome-applets/mixer_applet2-C.omf -share/gnome/omf/gnome-applets/mixer_applet2-de.omf -share/gnome/omf/gnome-applets/mixer_applet2-es.omf -share/gnome/omf/gnome-applets/mixer_applet2-eu.omf -share/gnome/omf/gnome-applets/mixer_applet2-fr.omf -share/gnome/omf/gnome-applets/mixer_applet2-it.omf -share/gnome/omf/gnome-applets/mixer_applet2-ja.omf -share/gnome/omf/gnome-applets/mixer_applet2-ko.omf -share/gnome/omf/gnome-applets/mixer_applet2-sv.omf -share/gnome/omf/gnome-applets/mixer_applet2-uk.omf -share/gnome/omf/gnome-applets/mixer_applet2-zh_CN.omf -share/gnome/omf/gnome-applets/mixer_applet2-zh_HK.omf -share/gnome/omf/gnome-applets/mixer_applet2-zh_TW.omf -share/gnome/omf/gnome-applets/multiload-C.omf -share/gnome/omf/gnome-applets/multiload-de.omf -share/gnome/omf/gnome-applets/multiload-es.omf -share/gnome/omf/gnome-applets/multiload-eu.omf -share/gnome/omf/gnome-applets/multiload-fr.omf -share/gnome/omf/gnome-applets/multiload-it.omf -share/gnome/omf/gnome-applets/multiload-ja.omf -share/gnome/omf/gnome-applets/multiload-ko.omf -share/gnome/omf/gnome-applets/multiload-sv.omf -share/gnome/omf/gnome-applets/multiload-uk.omf -share/gnome/omf/gnome-applets/multiload-zh_CN.omf -share/gnome/omf/gnome-applets/multiload-zh_HK.omf -share/gnome/omf/gnome-applets/multiload-zh_TW.omf -share/gnome/omf/gnome-applets/stickynotes_applet-C.omf -share/gnome/omf/gnome-applets/stickynotes_applet-de.omf -share/gnome/omf/gnome-applets/stickynotes_applet-es.omf -share/gnome/omf/gnome-applets/stickynotes_applet-eu.omf -share/gnome/omf/gnome-applets/stickynotes_applet-fr.omf -share/gnome/omf/gnome-applets/stickynotes_applet-it.omf -share/gnome/omf/gnome-applets/stickynotes_applet-ja.omf -share/gnome/omf/gnome-applets/stickynotes_applet-ko.omf -share/gnome/omf/gnome-applets/stickynotes_applet-sv.omf -share/gnome/omf/gnome-applets/stickynotes_applet-uk.omf -share/gnome/omf/gnome-applets/stickynotes_applet-zh_CN.omf -share/gnome/omf/gnome-applets/stickynotes_applet-zh_HK.omf -share/gnome/omf/gnome-applets/stickynotes_applet-zh_TW.omf -share/gnome/omf/gnome-applets/trashapplet-C.omf -share/gnome/omf/gnome-applets/trashapplet-uk.omf +share/gnome/omf/accessx-status/accessx-status-C.omf +share/gnome/omf/accessx-status/accessx-status-es.omf +share/gnome/omf/accessx-status/accessx-status-fr.omf +share/gnome/omf/accessx-status/accessx-status-uk.omf +%%BATTERY%%share/gnome/omf/battstat/battstat-C.omf +%%BATTERY%%share/gnome/omf/battstat/battstat-es.omf +%%BATTERY%%share/gnome/omf/battstat/battstat-uk.omf +share/gnome/omf/char-palette/char-palette-C.omf +share/gnome/omf/char-palette/char-palette-es.omf +share/gnome/omf/char-palette/char-palette-it.omf +share/gnome/omf/char-palette/char-palette-nl.omf +share/gnome/omf/char-palette/char-palette-pt_BR.omf +share/gnome/omf/char-palette/char-palette-uk.omf +share/gnome/omf/command-line/command-line-C.omf +share/gnome/omf/command-line/command-line-es.omf +share/gnome/omf/command-line/command-line-pt_BR.omf +share/gnome/omf/command-line/command-line-uk.omf +%%CPUFREQ%%share/gnome/omf/cpufreq-applet/cpufreq-applet-C.omf +%%CPUFREQ%%share/gnome/omf/cpufreq-applet/cpufreq-applet-es.omf +%%CPUFREQ%%share/gnome/omf/cpufreq-applet/cpufreq-applet-uk.omf +share/gnome/omf/drivemount/drivemount-C.omf +share/gnome/omf/drivemount/drivemount-es.omf +share/gnome/omf/drivemount/drivemount-it.omf +share/gnome/omf/drivemount/drivemount-pa.omf +share/gnome/omf/drivemount/drivemount-uk.omf +share/gnome/omf/geyes/geyes-C.omf +share/gnome/omf/geyes/geyes-es.omf +share/gnome/omf/geyes/geyes-it.omf +share/gnome/omf/geyes/geyes-uk.omf +share/gnome/omf/gswitchit/gswitchit-C.omf +share/gnome/omf/gswitchit/gswitchit-es.omf +share/gnome/omf/gswitchit/gswitchit-fr.omf +share/gnome/omf/gswitchit/gswitchit-uk.omf +share/gnome/omf/gtik2_applet2/gtik2_applet2-C.omf +share/gnome/omf/gtik2_applet2/gtik2_applet2-es.omf +share/gnome/omf/gtik2_applet2/gtik2_applet2-uk.omf +share/gnome/omf/gweather/gweather-C.omf +share/gnome/omf/gweather/gweather-es.omf +share/gnome/omf/gweather/gweather-uk.omf +share/gnome/omf/mixer_applet2/mixer_applet2-C.omf +share/gnome/omf/mixer_applet2/mixer_applet2-es.omf +share/gnome/omf/mixer_applet2/mixer_applet2-uk.omf +share/gnome/omf/multiload/multiload-C.omf +share/gnome/omf/multiload/multiload-es.omf +share/gnome/omf/multiload/multiload-uk.omf +share/gnome/omf/stickynotes_applet/stickynotes_applet-C.omf +share/gnome/omf/stickynotes_applet/stickynotes_applet-es.omf +share/gnome/omf/stickynotes_applet/stickynotes_applet-uk.omf +share/gnome/omf/trashapplet/trashapplet-C.omf +share/gnome/omf/trashapplet/trashapplet-es.omf +share/gnome/omf/trashapplet/trashapplet-fr.omf +share/gnome/omf/trashapplet/trashapplet-it.omf +share/gnome/omf/trashapplet/trashapplet-pa.omf +share/gnome/omf/trashapplet/trashapplet-uk.omf share/gnome/pixmaps/accessx-status-applet/ax-applet.png share/gnome/pixmaps/accessx-status-applet/ax-bouncekeys.png share/gnome/pixmaps/accessx-status-applet/ax-key-base.png @@ -1102,6 +603,7 @@ share/locale/he/LC_MESSAGES/gnome-applets-2.0.mo share/locale/hi/LC_MESSAGES/gnome-applets-2.0.mo share/locale/hr/LC_MESSAGES/gnome-applets-2.0.mo share/locale/hu/LC_MESSAGES/gnome-applets-2.0.mo +share/locale/hy/LC_MESSAGES/gnome-applets-2.0.mo share/locale/id/LC_MESSAGES/gnome-applets-2.0.mo share/locale/is/LC_MESSAGES/gnome-applets-2.0.mo share/locale/it/LC_MESSAGES/gnome-applets-2.0.mo @@ -1114,6 +616,7 @@ share/locale/ml/LC_MESSAGES/gnome-applets-2.0.mo share/locale/mn/LC_MESSAGES/gnome-applets-2.0.mo share/locale/ms/LC_MESSAGES/gnome-applets-2.0.mo share/locale/nb/LC_MESSAGES/gnome-applets-2.0.mo +share/locale/ne/LC_MESSAGES/gnome-applets-2.0.mo share/locale/nl/LC_MESSAGES/gnome-applets-2.0.mo share/locale/nn/LC_MESSAGES/gnome-applets-2.0.mo share/locale/no/LC_MESSAGES/gnome-applets-2.0.mo @@ -1131,312 +634,167 @@ share/locale/sr/LC_MESSAGES/gnome-applets-2.0.mo share/locale/sr@Latn/LC_MESSAGES/gnome-applets-2.0.mo share/locale/sv/LC_MESSAGES/gnome-applets-2.0.mo share/locale/ta/LC_MESSAGES/gnome-applets-2.0.mo +share/locale/te/LC_MESSAGES/gnome-applets-2.0.mo share/locale/th/LC_MESSAGES/gnome-applets-2.0.mo share/locale/tr/LC_MESSAGES/gnome-applets-2.0.mo share/locale/uk/LC_MESSAGES/gnome-applets-2.0.mo share/locale/vi/LC_MESSAGES/gnome-applets-2.0.mo share/locale/wa/LC_MESSAGES/gnome-applets-2.0.mo +share/locale/xh/LC_MESSAGES/gnome-applets-2.0.mo share/locale/zh_CN/LC_MESSAGES/gnome-applets-2.0.mo share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo -@dirrm share/gnome/help/stickynotes_applet/uk/figures -@dirrm share/gnome/help/stickynotes_applet/uk +@unexec /bin/rmdir %D/share/locale/xh/LC_MESSAGES 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/locale/xh 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/locale/te/LC_MESSAGES 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/locale/te 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/locale/rw/LC_MESSAGES 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/locale/rw 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/locale/hy/LC_MESSAGES 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/locale/hy 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons/hicolor/48x48/apps 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons/hicolor/48x48 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons/hicolor 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons 2>/dev/null || /usr/bin/true @dirrm share/gnome/pixmaps/stickynotes -%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/uk/figures -%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/uk %%CPUFREQ%%@dirrm share/gnome/pixmaps/cpufreq-applet @dirrm share/gnome/pixmaps/accessx-status-applet -@dirrm share/gnome/omf/gnome-applets -@dirrm share/gnome/help/trashapplet/C/figures -@dirrm share/gnome/help/trashapplet/C +@dirrm share/gnome/omf/trashapplet +@dirrm share/gnome/omf/stickynotes_applet +@dirrm share/gnome/omf/multiload +@dirrm share/gnome/omf/mixer_applet2 +@dirrm share/gnome/omf/gweather +@dirrm share/gnome/omf/gtik2_applet2 +@dirrm share/gnome/omf/gswitchit +@dirrm share/gnome/omf/geyes +@dirrm share/gnome/omf/drivemount +%%CPUFREQ%%@dirrm share/gnome/omf/cpufreq-applet +@dirrm share/gnome/omf/command-line +@dirrm share/gnome/omf/char-palette +%%BATTERY%%@dirrm share/gnome/omf/battstat +@dirrm share/gnome/omf/accessx-status @dirrm share/gnome/help/trashapplet/uk/figures @dirrm share/gnome/help/trashapplet/uk +@dirrm share/gnome/help/trashapplet/pa/figures +@dirrm share/gnome/help/trashapplet/pa +@dirrm share/gnome/help/trashapplet/fr/figures +@dirrm share/gnome/help/trashapplet/fr +@dirrm share/gnome/help/trashapplet/it/figures +@dirrm share/gnome/help/trashapplet/it +@dirrm share/gnome/help/trashapplet/es/figures +@dirrm share/gnome/help/trashapplet/es +@dirrm share/gnome/help/trashapplet/C/figures +@dirrm share/gnome/help/trashapplet/C @dirrm share/gnome/help/trashapplet -@dirrm share/gnome/help/stickynotes_applet/zh_TW/figures -@dirrm share/gnome/help/stickynotes_applet/zh_TW -@dirrm share/gnome/help/stickynotes_applet/zh_HK/figures -@dirrm share/gnome/help/stickynotes_applet/zh_HK -@dirrm share/gnome/help/stickynotes_applet/zh_CN/figures -@dirrm share/gnome/help/stickynotes_applet/zh_CN -@dirrm share/gnome/help/stickynotes_applet/sv/figures -@dirrm share/gnome/help/stickynotes_applet/sv -@dirrm share/gnome/help/stickynotes_applet/ko/figures -@dirrm share/gnome/help/stickynotes_applet/ko -@dirrm share/gnome/help/stickynotes_applet/ja/figures -@dirrm share/gnome/help/stickynotes_applet/ja -@dirrm share/gnome/help/stickynotes_applet/it/figures -@dirrm share/gnome/help/stickynotes_applet/it -@dirrm share/gnome/help/stickynotes_applet/fr/figures -@dirrm share/gnome/help/stickynotes_applet/fr -@dirrm share/gnome/help/stickynotes_applet/eu/figures -@dirrm share/gnome/help/stickynotes_applet/eu +@dirrm share/gnome/help/stickynotes_applet/uk/figures +@dirrm share/gnome/help/stickynotes_applet/uk @dirrm share/gnome/help/stickynotes_applet/es/figures @dirrm share/gnome/help/stickynotes_applet/es -@dirrm share/gnome/help/stickynotes_applet/de/figures -@dirrm share/gnome/help/stickynotes_applet/de @dirrm share/gnome/help/stickynotes_applet/C/figures @dirrm share/gnome/help/stickynotes_applet/C @dirrm share/gnome/help/stickynotes_applet -@dirrm share/gnome/help/multiload/zh_TW/figures -@dirrm share/gnome/help/multiload/zh_TW -@dirrm share/gnome/help/multiload/zh_HK/figures -@dirrm share/gnome/help/multiload/zh_HK -@dirrm share/gnome/help/multiload/zh_CN/figures -@dirrm share/gnome/help/multiload/zh_CN @dirrm share/gnome/help/multiload/uk/figures @dirrm share/gnome/help/multiload/uk -@dirrm share/gnome/help/multiload/sv/figures -@dirrm share/gnome/help/multiload/sv -@dirrm share/gnome/help/multiload/ko/figures -@dirrm share/gnome/help/multiload/ko -@dirrm share/gnome/help/multiload/ja/figures -@dirrm share/gnome/help/multiload/ja -@dirrm share/gnome/help/multiload/it/figures -@dirrm share/gnome/help/multiload/it -@dirrm share/gnome/help/multiload/fr/figures -@dirrm share/gnome/help/multiload/fr -@dirrm share/gnome/help/multiload/eu/figures -@dirrm share/gnome/help/multiload/eu @dirrm share/gnome/help/multiload/es/figures @dirrm share/gnome/help/multiload/es -@dirrm share/gnome/help/multiload/de/figures -@dirrm share/gnome/help/multiload/de @dirrm share/gnome/help/multiload/C/figures @dirrm share/gnome/help/multiload/C @dirrm share/gnome/help/multiload -@dirrm share/gnome/help/mixer_applet2/zh_TW/figures -@dirrm share/gnome/help/mixer_applet2/zh_TW -@dirrm share/gnome/help/mixer_applet2/zh_HK/figures -@dirrm share/gnome/help/mixer_applet2/zh_HK -@dirrm share/gnome/help/mixer_applet2/zh_CN/figures -@dirrm share/gnome/help/mixer_applet2/zh_CN @dirrm share/gnome/help/mixer_applet2/uk/figures @dirrm share/gnome/help/mixer_applet2/uk -@dirrm share/gnome/help/mixer_applet2/sv/figures -@dirrm share/gnome/help/mixer_applet2/sv -@dirrm share/gnome/help/mixer_applet2/ko/figures -@dirrm share/gnome/help/mixer_applet2/ko -@dirrm share/gnome/help/mixer_applet2/ja/figures -@dirrm share/gnome/help/mixer_applet2/ja -@dirrm share/gnome/help/mixer_applet2/it/figures -@dirrm share/gnome/help/mixer_applet2/it -@dirrm share/gnome/help/mixer_applet2/fr/figures -@dirrm share/gnome/help/mixer_applet2/fr -@dirrm share/gnome/help/mixer_applet2/eu/figures -@dirrm share/gnome/help/mixer_applet2/eu @dirrm share/gnome/help/mixer_applet2/es/figures @dirrm share/gnome/help/mixer_applet2/es -@dirrm share/gnome/help/mixer_applet2/de/figures -@dirrm share/gnome/help/mixer_applet2/de @dirrm share/gnome/help/mixer_applet2/C/figures @dirrm share/gnome/help/mixer_applet2/C @dirrm share/gnome/help/mixer_applet2 -@dirrm share/gnome/help/gweather/zh_TW/figures -@dirrm share/gnome/help/gweather/zh_TW -@dirrm share/gnome/help/gweather/zh_HK/figures -@dirrm share/gnome/help/gweather/zh_HK -@dirrm share/gnome/help/gweather/zh_CN/figures -@dirrm share/gnome/help/gweather/zh_CN @dirrm share/gnome/help/gweather/uk/figures @dirrm share/gnome/help/gweather/uk -@dirrm share/gnome/help/gweather/sv/figures -@dirrm share/gnome/help/gweather/sv -@dirrm share/gnome/help/gweather/ko/figures -@dirrm share/gnome/help/gweather/ko -@dirrm share/gnome/help/gweather/ja/figures -@dirrm share/gnome/help/gweather/ja -@dirrm share/gnome/help/gweather/it/figures -@dirrm share/gnome/help/gweather/it -@dirrm share/gnome/help/gweather/fr/figures -@dirrm share/gnome/help/gweather/fr -@dirrm share/gnome/help/gweather/eu/figures -@dirrm share/gnome/help/gweather/eu @dirrm share/gnome/help/gweather/es/figures @dirrm share/gnome/help/gweather/es -@dirrm share/gnome/help/gweather/de/figures -@dirrm share/gnome/help/gweather/de @dirrm share/gnome/help/gweather/C/figures @dirrm share/gnome/help/gweather/C @dirrm share/gnome/help/gweather -@dirrm share/gnome/help/gtik2_applet2/zh_TW/figures -@dirrm share/gnome/help/gtik2_applet2/zh_TW -@dirrm share/gnome/help/gtik2_applet2/zh_HK/figures -@dirrm share/gnome/help/gtik2_applet2/zh_HK -@dirrm share/gnome/help/gtik2_applet2/zh_CN/figures -@dirrm share/gnome/help/gtik2_applet2/zh_CN @dirrm share/gnome/help/gtik2_applet2/uk/figures @dirrm share/gnome/help/gtik2_applet2/uk -@dirrm share/gnome/help/gtik2_applet2/sv/figures -@dirrm share/gnome/help/gtik2_applet2/sv -@dirrm share/gnome/help/gtik2_applet2/ko/figures -@dirrm share/gnome/help/gtik2_applet2/ko -@dirrm share/gnome/help/gtik2_applet2/ja/figures -@dirrm share/gnome/help/gtik2_applet2/ja -@dirrm share/gnome/help/gtik2_applet2/it/figures -@dirrm share/gnome/help/gtik2_applet2/it -@dirrm share/gnome/help/gtik2_applet2/fr/figures -@dirrm share/gnome/help/gtik2_applet2/fr -@dirrm share/gnome/help/gtik2_applet2/eu/figures -@dirrm share/gnome/help/gtik2_applet2/eu @dirrm share/gnome/help/gtik2_applet2/es/figures @dirrm share/gnome/help/gtik2_applet2/es -@dirrm share/gnome/help/gtik2_applet2/de/figures -@dirrm share/gnome/help/gtik2_applet2/de @dirrm share/gnome/help/gtik2_applet2/C/figures @dirrm share/gnome/help/gtik2_applet2/C @dirrm share/gnome/help/gtik2_applet2 -@dirrm share/gnome/help/gswitchit/C @dirrm share/gnome/help/gswitchit/uk +@dirrm share/gnome/help/gswitchit/fr +@dirrm share/gnome/help/gswitchit/es +@dirrm share/gnome/help/gswitchit/C @dirrm share/gnome/help/gswitchit -@dirrm share/gnome/help/geyes/zh_TW/figures -@dirrm share/gnome/help/geyes/zh_TW -@dirrm share/gnome/help/geyes/zh_HK/figures -@dirrm share/gnome/help/geyes/zh_HK -@dirrm share/gnome/help/geyes/zh_CN/figures -@dirrm share/gnome/help/geyes/zh_CN @dirrm share/gnome/help/geyes/uk/figures @dirrm share/gnome/help/geyes/uk -@dirrm share/gnome/help/geyes/sv/figures -@dirrm share/gnome/help/geyes/sv -@dirrm share/gnome/help/geyes/ko/figures -@dirrm share/gnome/help/geyes/ko -@dirrm share/gnome/help/geyes/ja/figures -@dirrm share/gnome/help/geyes/ja @dirrm share/gnome/help/geyes/it/figures @dirrm share/gnome/help/geyes/it -@dirrm share/gnome/help/geyes/fr/figures -@dirrm share/gnome/help/geyes/fr -@dirrm share/gnome/help/geyes/eu/figures -@dirrm share/gnome/help/geyes/eu @dirrm share/gnome/help/geyes/es/figures @dirrm share/gnome/help/geyes/es -@dirrm share/gnome/help/geyes/de/figures -@dirrm share/gnome/help/geyes/de @dirrm share/gnome/help/geyes/C/figures @dirrm share/gnome/help/geyes/C @dirrm share/gnome/help/geyes -@dirrm share/gnome/help/drivemount/zh_TW/figures -@dirrm share/gnome/help/drivemount/zh_TW -@dirrm share/gnome/help/drivemount/zh_HK/figures -@dirrm share/gnome/help/drivemount/zh_HK -@dirrm share/gnome/help/drivemount/zh_CN/figures -@dirrm share/gnome/help/drivemount/zh_CN @dirrm share/gnome/help/drivemount/uk/figures @dirrm share/gnome/help/drivemount/uk -@dirrm share/gnome/help/drivemount/sv/figures -@dirrm share/gnome/help/drivemount/sv -@dirrm share/gnome/help/drivemount/ko/figures -@dirrm share/gnome/help/drivemount/ko -@dirrm share/gnome/help/drivemount/ja/figures -@dirrm share/gnome/help/drivemount/ja +@dirrm share/gnome/help/drivemount/pa/figures +@dirrm share/gnome/help/drivemount/pa @dirrm share/gnome/help/drivemount/it/figures @dirrm share/gnome/help/drivemount/it -@dirrm share/gnome/help/drivemount/fr/figures -@dirrm share/gnome/help/drivemount/fr -@dirrm share/gnome/help/drivemount/eu/figures -@dirrm share/gnome/help/drivemount/eu @dirrm share/gnome/help/drivemount/es/figures @dirrm share/gnome/help/drivemount/es -@dirrm share/gnome/help/drivemount/de/figures -@dirrm share/gnome/help/drivemount/de @dirrm share/gnome/help/drivemount/C/figures @dirrm share/gnome/help/drivemount/C @dirrm share/gnome/help/drivemount +%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/uk/figures +%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/uk +%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/es/figures +%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/es %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/C/figures %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/C %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet -@dirrm share/gnome/help/command-line/zh_TW/figures -@dirrm share/gnome/help/command-line/zh_TW -@dirrm share/gnome/help/command-line/zh_HK/figures -@dirrm share/gnome/help/command-line/zh_HK -@dirrm share/gnome/help/command-line/zh_CN/figures -@dirrm share/gnome/help/command-line/zh_CN @dirrm share/gnome/help/command-line/uk/figures @dirrm share/gnome/help/command-line/uk -@dirrm share/gnome/help/command-line/sv/figures -@dirrm share/gnome/help/command-line/sv -@dirrm share/gnome/help/command-line/ko/figures -@dirrm share/gnome/help/command-line/ko -@dirrm share/gnome/help/command-line/ja/figures -@dirrm share/gnome/help/command-line/ja -@dirrm share/gnome/help/command-line/it/figures -@dirrm share/gnome/help/command-line/it -@dirrm share/gnome/help/command-line/fr/figures -@dirrm share/gnome/help/command-line/fr -@dirrm share/gnome/help/command-line/eu/figures -@dirrm share/gnome/help/command-line/eu +@dirrm share/gnome/help/command-line/pt_BR/figures +@dirrm share/gnome/help/command-line/pt_BR @dirrm share/gnome/help/command-line/es/figures @dirrm share/gnome/help/command-line/es -@dirrm share/gnome/help/command-line/de/figures -@dirrm share/gnome/help/command-line/de @dirrm share/gnome/help/command-line/C/figures @dirrm share/gnome/help/command-line/C @dirrm share/gnome/help/command-line -@dirrm share/gnome/help/char-palette/zh_TW/figures -@dirrm share/gnome/help/char-palette/zh_TW -@dirrm share/gnome/help/char-palette/zh_HK/figures -@dirrm share/gnome/help/char-palette/zh_HK -@dirrm share/gnome/help/char-palette/zh_CN/figures -@dirrm share/gnome/help/char-palette/zh_CN @dirrm share/gnome/help/char-palette/uk/figures @dirrm share/gnome/help/char-palette/uk -@dirrm share/gnome/help/char-palette/sv/figures -@dirrm share/gnome/help/char-palette/sv -@dirrm share/gnome/help/char-palette/ko/figures -@dirrm share/gnome/help/char-palette/ko -@dirrm share/gnome/help/char-palette/ja/figures -@dirrm share/gnome/help/char-palette/ja +@dirrm share/gnome/help/char-palette/pt_BR/figures +@dirrm share/gnome/help/char-palette/pt_BR +@dirrm share/gnome/help/char-palette/nl/figures +@dirrm share/gnome/help/char-palette/nl @dirrm share/gnome/help/char-palette/it/figures @dirrm share/gnome/help/char-palette/it -@dirrm share/gnome/help/char-palette/fr/figures -@dirrm share/gnome/help/char-palette/fr -@dirrm share/gnome/help/char-palette/eu/figures -@dirrm share/gnome/help/char-palette/eu @dirrm share/gnome/help/char-palette/es/figures @dirrm share/gnome/help/char-palette/es -@dirrm share/gnome/help/char-palette/de/figures -@dirrm share/gnome/help/char-palette/de @dirrm share/gnome/help/char-palette/C/figures @dirrm share/gnome/help/char-palette/C @dirrm share/gnome/help/char-palette -%%BATTERY%%@dirrm share/gnome/help/battstat/zh_TW/figures -%%BATTERY%%@dirrm share/gnome/help/battstat/zh_TW -%%BATTERY%%@dirrm share/gnome/help/battstat/zh_HK/figures -%%BATTERY%%@dirrm share/gnome/help/battstat/zh_HK -%%BATTERY%%@dirrm share/gnome/help/battstat/zh_CN/figures -%%BATTERY%%@dirrm share/gnome/help/battstat/zh_CN %%BATTERY%%@dirrm share/gnome/help/battstat/uk/figures %%BATTERY%%@dirrm share/gnome/help/battstat/uk -%%BATTERY%%@dirrm share/gnome/help/battstat/sv/figures -%%BATTERY%%@dirrm share/gnome/help/battstat/sv -%%BATTERY%%@dirrm share/gnome/help/battstat/ko/figures -%%BATTERY%%@dirrm share/gnome/help/battstat/ko -%%BATTERY%%@dirrm share/gnome/help/battstat/ja/figures -%%BATTERY%%@dirrm share/gnome/help/battstat/ja -%%BATTERY%%@dirrm share/gnome/help/battstat/it/figures -%%BATTERY%%@dirrm share/gnome/help/battstat/it -%%BATTERY%%@dirrm share/gnome/help/battstat/fr/figures -%%BATTERY%%@dirrm share/gnome/help/battstat/fr -%%BATTERY%%@dirrm share/gnome/help/battstat/eu/figures -%%BATTERY%%@dirrm share/gnome/help/battstat/eu %%BATTERY%%@dirrm share/gnome/help/battstat/es/figures %%BATTERY%%@dirrm share/gnome/help/battstat/es -%%BATTERY%%@dirrm share/gnome/help/battstat/de/figures -%%BATTERY%%@dirrm share/gnome/help/battstat/de %%BATTERY%%@dirrm share/gnome/help/battstat/C/figures %%BATTERY%%@dirrm share/gnome/help/battstat/C %%BATTERY%%@dirrm share/gnome/help/battstat -@dirrm share/gnome/help/accessx-status/eu/figures -@dirrm share/gnome/help/accessx-status/eu -@dirrm share/gnome/help/accessx-status/C/figures -@dirrm share/gnome/help/accessx-status/C @dirrm share/gnome/help/accessx-status/uk/figures @dirrm share/gnome/help/accessx-status/uk +@dirrm share/gnome/help/accessx-status/fr/figures +@dirrm share/gnome/help/accessx-status/fr +@dirrm share/gnome/help/accessx-status/es/figures +@dirrm share/gnome/help/accessx-status/es +@dirrm share/gnome/help/accessx-status/C/figures +@dirrm share/gnome/help/accessx-status/C @dirrm share/gnome/help/accessx-status @dirrm share/gnome/gnome-applets/gweather @dirrm share/gnome/gnome-applets/glade @dirrm share/gnome/gnome-applets/geyes/Horrid -@dirrm share/gnome/gnome-applets/geyes/Default @dirrm share/gnome/gnome-applets/geyes/Default-tiny +@dirrm share/gnome/gnome-applets/geyes/Default @dirrm share/gnome/gnome-applets/geyes/Bloodshot @dirrm share/gnome/gnome-applets/geyes/Bizarre @dirrm share/gnome/gnome-applets/geyes diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile index 8bea9955e870..523f3533fdef 100644 --- a/x11/gnome-desktop/Makefile +++ b/x11/gnome-desktop/Makefile @@ -3,13 +3,14 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/x11/gnomedesktop/Makefile,v 1.74 2005/10/03 15:18:36 ahze Exp $ # PORTNAME= gnomedesktop -PORTVERSION= 2.10.2 +PORTVERSION= 2.12.1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-desktop/2.10 +MASTER_SITE_SUBDIR= sources/gnome-desktop/2.12 DISTNAME= gnome-desktop-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -20,13 +21,14 @@ USE_BZIP2= yes USE_X_PREFIX= yes USE_XPM= yes USE_REINPLACE= yes -USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui +USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui gnomedocutils \ + ltverhack GNOME_DESKTOP_VERSION=2 USE_GMAKE= yes USE_BISON= yes INSTALLS_OMF= yes INSTALLS_SHLIB= yes -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 CONFIGURE_ARGS= --with-gnome-distributor="FreeBSD GNOME Project" \ --with-kde-datadir=${LOCALBASE}/share CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/x11/gnome-desktop/distinfo b/x11/gnome-desktop/distinfo index 833f7a4f71cc..1af6b593cb77 100644 --- a/x11/gnome-desktop/distinfo +++ b/x11/gnome-desktop/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-desktop-2.10.2.tar.bz2) = b912a6878ea307af9e3d015864ec0678 -SIZE (gnome2/gnome-desktop-2.10.2.tar.bz2) = 985248 +MD5 (gnome2/gnome-desktop-2.12.1.tar.bz2) = e6841d3a401ec2f5aa17a0529ba4bf55 +SIZE (gnome2/gnome-desktop-2.12.1.tar.bz2) = 1033105 diff --git a/x11/gnome-desktop/pkg-plist b/x11/gnome-desktop/pkg-plist index e1f8d73ee3bd..cf05af1ec158 100644 --- a/x11/gnome-desktop/pkg-plist +++ b/x11/gnome-desktop/pkg-plist @@ -4,10 +4,10 @@ include/gnome-desktop-2.0/libgnomeui/gnome-ditem-edit.h include/gnome-desktop-2.0/libgnomeui/gnome-hint.h lib/libgnome-desktop-2.a lib/libgnome-desktop-2.so -lib/libgnome-desktop-2.so.4 +lib/libgnome-desktop-2.so.2 libdata/pkgconfig/gnome-desktop-2.0.pc share/gnome/applications/gnome-about.desktop -share/gnome/gnome-about/gnome-64.gif +share/gnome/gnome-about/gnome-64.png share/gnome/gnome-about/gnome-version.xml share/gnome/gnome-about/headers/header-bg-ancient01a.png share/gnome/gnome-about/headers/header-bg-city01.png @@ -19,21 +19,27 @@ share/gnome/gnome-about/headers/header-bg-mountains01.png share/gnome/gnome-about/headers/header-bg-snow01.png share/gnome/gnome-about/headers/header-bg-sunset01.png share/gnome/help/fdl/C/fdl.xml -share/gnome/help/fdl/eu/fdl.xml +share/gnome/help/fdl/es/fdl.xml share/gnome/help/gnome-feedback/C/gnome-feedback.xml -share/gnome/help/gnome-feedback/eu/gnome-feedback.xml +share/gnome/help/gnome-feedback/es/gnome-feedback.xml share/gnome/help/gpl/C/gpl.xml -share/gnome/help/gpl/eu/gpl.xml +share/gnome/help/gpl/es/gpl.xml +share/gnome/help/gpl/fi/gpl.xml +share/gnome/help/gpl/pa/gpl.xml share/gnome/help/lgpl/C/lgpl.xml -share/gnome/help/lgpl/eu/lgpl.xml -share/gnome/omf/gnome-desktop/fdl-C.omf -share/gnome/omf/gnome-desktop/fdl-eu.omf -share/gnome/omf/gnome-desktop/gnome-feedback-C.omf -share/gnome/omf/gnome-desktop/gnome-feedback-eu.omf -share/gnome/omf/gnome-desktop/gpl-C.omf -share/gnome/omf/gnome-desktop/gpl-eu.omf -share/gnome/omf/gnome-desktop/lgpl-C.omf -share/gnome/omf/gnome-desktop/lgpl-eu.omf +share/gnome/help/lgpl/es/lgpl.xml +share/gnome/help/lgpl/pa/lgpl.xml +share/gnome/omf/fdl/fdl-C.omf +share/gnome/omf/fdl/fdl-es.omf +share/gnome/omf/gnome-feedback/gnome-feedback-C.omf +share/gnome/omf/gnome-feedback/gnome-feedback-es.omf +share/gnome/omf/gpl/gpl-C.omf +share/gnome/omf/gpl/gpl-es.omf +share/gnome/omf/gpl/gpl-fi.omf +share/gnome/omf/gpl/gpl-pa.omf +share/gnome/omf/lgpl/lgpl-C.omf +share/gnome/omf/lgpl/lgpl-es.omf +share/gnome/omf/lgpl/lgpl-pa.omf share/gnome/pixmaps/apple-green.png share/gnome/pixmaps/apple-red.png share/gnome/pixmaps/gnome-aorta.png @@ -145,6 +151,7 @@ share/locale/it/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/ja/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/kn/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/ko/LC_MESSAGES/gnome-desktop-2.0.mo +share/locale/ku/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/li/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/lt/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/lv/LC_MESSAGES/gnome-desktop-2.0.mo @@ -178,6 +185,7 @@ share/locale/te/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/th/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/tk/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/tr/LC_MESSAGES/gnome-desktop-2.0.mo +share/locale/ug/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/uk/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/vi/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/wa/LC_MESSAGES/gnome-desktop-2.0.mo @@ -189,17 +197,25 @@ share/locale/zh_TW/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/zu/LC_MESSAGES/gnome-desktop-2.0.mo @unexec rmdir %D/share/locale/yo/LC_MESSAGES 2> /dev/null || true @unexec rmdir %D/share/locale/yo 2> /dev/null || true -@unexec rmdir %D/share/locale/te/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/te 2> /dev/null || true +@unexec rmdir %D/share/locale/ug/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/ug 2> /dev/null || true +@unexec rmdir %D/share/locale/ku/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/ku 2> /dev/null || true @unexec rmdir %D/share/locale/hy/LC_MESSAGES 2> /dev/null || true @unexec rmdir %D/share/locale/hy 2> /dev/null || true -@dirrm share/gnome/omf/gnome-desktop -@dirrm share/gnome/help/lgpl/eu -@dirrm share/gnome/help/gpl/eu -@dirrm share/gnome/help/gnome-feedback/eu +@dirrm share/gnome/omf/lgpl +@dirrm share/gnome/omf/gpl +@dirrm share/gnome/omf/gnome-feedback +@dirrm share/gnome/omf/fdl +@dirrm share/gnome/help/lgpl/pa +@dirrm share/gnome/help/lgpl/es +@dirrm share/gnome/help/gpl/pa +@dirrm share/gnome/help/gpl/fi +@dirrm share/gnome/help/gpl/es +@dirrm share/gnome/help/fdl/es +@dirrm share/gnome/help/gnome-feedback/es @dirrm share/gnome/help/gnome-feedback/C @dirrm share/gnome/help/gnome-feedback -@dirrm share/gnome/help/fdl/eu @dirrm share/gnome/gnome-about/headers @dirrm include/gnome-desktop-2.0/libgnomeui @dirrm include/gnome-desktop-2.0/libgnome diff --git a/x11/gnome-menus/Makefile b/x11/gnome-menus/Makefile index c0415bed871e..5a8ffe48ff43 100644 --- a/x11/gnome-menus/Makefile +++ b/x11/gnome-menus/Makefile @@ -3,14 +3,15 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/x11/gnome-menus/Makefile,v 1.21 2005/09/08 18:04:51 marcus Exp $ # PORTNAME= gnome-menus -PORTVERSION= 2.10.2 +PORTVERSION= 2.12.0 PORTREVISION= 1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.10 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.12 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -20,8 +21,9 @@ USE_BZIP2= yes USE_X_PREFIX= yes USE_REINPLACE= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix gnomehack intlhack gnomevfs2 -USE_LIBTOOL_VER=15 +USE_GNOME= gnomeprefix gnomehack intlhack gnomevfs2 ltverhack +USE_AUTOTOOLS= libtool:15 +USE_PYTHON= yes INSTALLS_SHLIB= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" @@ -32,6 +34,8 @@ post-patch: ${WRKSRC}/layout/settings.menu @${SED} -e 's|/usr/local|${LOCALBASE}|g' \ < ${FILESDIR}/KDE.directory > ${WRKSRC}/KDE.directory + @${REINPLACE_CMD} -e s'|%%X11BASE%%|${X11BASE}|g' \ + ${WRKSRC}/simple-editor/GMenuSimpleEditor/menutreemodel.py post-install: @${MKDIR} ${PREFIX}/share/gnome/desktop-directories diff --git a/x11/gnome-menus/distinfo b/x11/gnome-menus/distinfo index e7d3ff4072eb..df5f80bb947d 100644 --- a/x11/gnome-menus/distinfo +++ b/x11/gnome-menus/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-menus-2.10.2.tar.bz2) = 97b0ad03ea219cc8f5c02585db1d237e -SIZE (gnome2/gnome-menus-2.10.2.tar.bz2) = 350941 +MD5 (gnome2/gnome-menus-2.12.0.tar.bz2) = 615392c4f729f70c03aa3aa7dbe40a95 +SIZE (gnome2/gnome-menus-2.12.0.tar.bz2) = 393280 diff --git a/x11/gnome-menus/files/patch-Makefile.in b/x11/gnome-menus/files/patch-Makefile.in new file mode 100644 index 000000000000..510f1140fb48 --- /dev/null +++ b/x11/gnome-menus/files/patch-Makefile.in @@ -0,0 +1,11 @@ +--- Makefile.in.orig Thu Sep 8 13:59:53 2005 ++++ Makefile.in Thu Sep 8 14:00:08 2005 +@@ -205,7 +205,7 @@ + target_alias = @target_alias@ + NULL = + +-@HAVE_PYTHON_TRUE@PYTHON_SUBDIRS = python simple-editor ++@HAVE_PYTHON_TRUE@PYTHON_SUBDIRS = python + + ALL_SUBDIRS = \ + po \ diff --git a/x11/gnome-menus/files/patch-bugzilla-312502 b/x11/gnome-menus/files/patch-bugzilla-312502 deleted file mode 100644 index 0fa77890b7a9..000000000000 --- a/x11/gnome-menus/files/patch-bugzilla-312502 +++ /dev/null @@ -1,12 +0,0 @@ -diff -u -p -r1.7.4.1 desktop-entries.c ---- libmenu/desktop-entries.c 5 Apr 2005 21:04:31 -0000 1.7.4.1 -+++ libmenu/desktop-entries.c 5 Aug 2005 07:57:37 -0000 -@@ -554,7 +554,7 @@ desktop_entry_add_legacy_category (Deskt - for (; entry->categories[i]; i++); - } - -- categories = g_new0 (GQuark, i + 1); -+ categories = g_new0 (GQuark, i + 2); - - i = 0; - if (entry->categories != NULL) diff --git a/x11/gnome-menus/files/patch-layout::settings.menu b/x11/gnome-menus/files/patch-layout::settings.menu index ae086261bc6e..115f03ce7599 100644 --- a/x11/gnome-menus/files/patch-layout::settings.menu +++ b/x11/gnome-menus/files/patch-layout::settings.menu @@ -1,16 +1,6 @@ ---- layout/settings.menu.orig Tue Jun 28 03:49:13 2005 -+++ layout/settings.menu Tue Jun 28 03:50:07 2005 -@@ -10,9 +10,6 @@ - <DefaultAppDirs/> - <DefaultDirectoryDirs/> - -- <!-- Read in overrides and child menus from applications-merged/ --> -- <DefaultMergeDirs/> -- - <!-- Merge in these other files as submenus --> - <Menu> - <Name>Preferences</Name> -@@ -25,10 +22,19 @@ +--- layout/settings.menu.orig Thu Apr 14 17:36:13 2005 ++++ layout/settings.menu Tue May 17 18:42:56 2005 +@@ -25,10 +25,19 @@ <Directory>System-Settings.directory</Directory> <Include> <And> @@ -26,7 +16,7 @@ </Include> </Menu> <!-- End System Settings --> + -+ <!-- Read in overrides and child menus from applications-merged/ --> ++ <!-- Read in overrides and child menus from settings-merged/ --> + <DefaultMergeDirs/> </Menu> <!-- End Applications --> diff --git a/x11/gnome-menus/files/patch-libmenu::menu-tree.c b/x11/gnome-menus/files/patch-libmenu::menu-tree.c deleted file mode 100644 index bd405098f5fa..000000000000 --- a/x11/gnome-menus/files/patch-libmenu::menu-tree.c +++ /dev/null @@ -1,172 +0,0 @@ ---- libmenu/menu-tree.c.orig Tue Jun 28 04:05:19 2005 -+++ libmenu/menu-tree.c Tue Jun 28 04:05:42 2005 -@@ -67,6 +67,12 @@ - gpointer user_data; - } MenuTreeMonitor; - -+typedef struct -+{ -+ MenuTreeDirectory *directory; -+ GSList *list; -+} MenuTreeListifyForeachData; -+ - struct MenuTreeDirectory - { - MenuTreeDirectory *parent; -@@ -75,6 +81,7 @@ - char *name; - - GSList *entries; -+ GSList *excluded_entries; - GSList *subdirs; - - guint refcount : 24; -@@ -750,17 +757,15 @@ - } - } - --GSList * --menu_tree_directory_get_entries (MenuTreeDirectory *directory) -+static GSList * -+copy_and_ref_entry_list (GSList *list) - { - GSList *retval; - GSList *tmp; - -- g_return_val_if_fail (directory != NULL, NULL); -- - retval = NULL; - -- tmp = directory->entries; -+ tmp = list; - while (tmp != NULL) - { - retval = g_slist_prepend (retval, -@@ -773,6 +778,22 @@ - } - - GSList * -+menu_tree_directory_get_entries (MenuTreeDirectory *directory) -+{ -+ g_return_val_if_fail (directory != NULL, NULL); -+ -+ return copy_and_ref_entry_list (directory->entries); -+} -+ -+GSList * -+menu_tree_directory_get_excluded_entries (MenuTreeDirectory *directory) -+{ -+ g_return_val_if_fail (directory != NULL, NULL); -+ -+ return copy_and_ref_entry_list (directory->excluded_entries); -+} -+ -+GSList * - menu_tree_directory_get_subdirs (MenuTreeDirectory *directory) - { - GSList *retval; -@@ -939,6 +960,7 @@ - retval->name = g_strdup (name); - retval->directory_entry = NULL; - retval->entries = NULL; -+ retval->excluded_entries = NULL; - retval->subdirs = NULL; - retval->only_unallocated = FALSE; - retval->refcount = 1; -@@ -2554,16 +2576,21 @@ - } - - static void --entries_listify_foreach (const char *desktop_file_id, -- DesktopEntry *desktop_entry, -- MenuTreeDirectory *directory) -+entries_listify_foreach (const char *desktop_file_id, -+ DesktopEntry *desktop_entry, -+ MenuTreeListifyForeachData *foreach_data) - { - MenuTreeEntry *entry; - -- entry = menu_tree_entry_new (directory, desktop_entry, desktop_file_id); -+ g_return_if_fail (foreach_data); -+ g_return_if_fail (foreach_data->directory); -+ -+ entry = menu_tree_entry_new (foreach_data->directory, -+ desktop_entry, -+ desktop_file_id); - -- directory->entries = g_slist_prepend (directory->entries, -- entry); -+ foreach_data->list = g_slist_prepend (foreach_data->list, -+ entry); - } - - static MenuTreeDirectory * -@@ -2576,11 +2603,14 @@ - MenuTreeDirectory *directory; - DesktopEntrySet *entry_pool; - DesktopEntrySet *entries; -+ DesktopEntrySet *excluded_entries; - gboolean deleted; - DesktopEntrySet *allocated_set; - gboolean only_unallocated; - GSList *tmp; - -+ MenuTreeListifyForeachData foreach_data; -+ - g_assert (menu_layout_node_get_type (layout) == MENU_LAYOUT_NODE_MENU); - g_assert (menu_layout_node_menu_get_name (layout) != NULL); - -@@ -2594,6 +2624,7 @@ - only_unallocated = FALSE; - - entries = desktop_entry_set_new (); -+ excluded_entries = desktop_entry_set_new (); - allocated_set = desktop_entry_set_new (); - - entry_pool = desktop_entry_set_new (); -@@ -2644,6 +2675,7 @@ - if (rule_set != NULL) - { - desktop_entry_set_union (entries, rule_set); -+ desktop_entry_set_subtract (excluded_entries, rule_set); - desktop_entry_set_union (allocated_set, rule_set); - desktop_entry_set_unref (rule_set); - } -@@ -2676,6 +2708,7 @@ - if (rule_set != NULL) - { - desktop_entry_set_subtract (entries, rule_set); -+ desktop_entry_set_union (excluded_entries, rule_set); - desktop_entry_set_unref (rule_set); - } - -@@ -2775,14 +2808,28 @@ - if (deleted) - { - desktop_entry_set_unref (entries); -+ desktop_entry_set_unref (excluded_entries); - menu_tree_directory_unref (directory); - return NULL; - } - -+ foreach_data.directory = directory; -+ foreach_data.list = NULL; - desktop_entry_set_foreach (entries, - (DesktopEntrySetForeachFunc) entries_listify_foreach, -- directory); -+ &foreach_data); - desktop_entry_set_unref (entries); -+ -+ directory->entries = foreach_data.list; -+ -+ foreach_data.directory = directory; -+ foreach_data.list = NULL; -+ desktop_entry_set_foreach (excluded_entries, -+ (DesktopEntrySetForeachFunc) entries_listify_foreach, -+ &foreach_data); -+ desktop_entry_set_unref (excluded_entries); -+ -+ directory->excluded_entries = foreach_data.list; - - tmp = directory->entries; - while (tmp != NULL) diff --git a/x11/gnome-menus/files/patch-libmenu::menu-tree.h b/x11/gnome-menus/files/patch-libmenu::menu-tree.h deleted file mode 100644 index e5f5ae76691d..000000000000 --- a/x11/gnome-menus/files/patch-libmenu::menu-tree.h +++ /dev/null @@ -1,14 +0,0 @@ ---- libmenu/menu-tree.h.orig Wed Jan 12 15:23:52 2005 -+++ libmenu/menu-tree.h Tue Mar 1 01:24:17 2005 -@@ -44,8 +44,9 @@ - MenuTreeDirectory *menu_tree_get_directory_from_path (MenuTree *tree, - const char *path); - --GSList *menu_tree_directory_get_entries (MenuTreeDirectory *directory); --GSList *menu_tree_directory_get_subdirs (MenuTreeDirectory *directory); -+GSList *menu_tree_directory_get_entries (MenuTreeDirectory *directory); -+GSList *menu_tree_directory_get_excluded_entries (MenuTreeDirectory *directory); -+GSList *menu_tree_directory_get_subdirs (MenuTreeDirectory *directory); - - MenuTreeDirectory *menu_tree_directory_ref (MenuTreeDirectory *directory); - void menu_tree_directory_unref (MenuTreeDirectory *directory); diff --git a/x11/gnome-menus/files/patch-simple-editor_GMenuSimpleEditor_menutreemodel.py b/x11/gnome-menus/files/patch-simple-editor_GMenuSimpleEditor_menutreemodel.py new file mode 100644 index 000000000000..2306f060952e --- /dev/null +++ b/x11/gnome-menus/files/patch-simple-editor_GMenuSimpleEditor_menutreemodel.py @@ -0,0 +1,20 @@ +--- simple-editor/GMenuSimpleEditor/menutreemodel.py.orig Mon Apr 11 05:36:04 2005 ++++ simple-editor/GMenuSimpleEditor/menutreemodel.py Tue Sep 6 11:04:46 2005 +@@ -29,7 +29,7 @@ + if os.environ.has_key ("XDG_CONFIG_DIRS"): + conf_dirs = os.environ["XDG_CONFIG_DIRS"] + if not conf_dirs: +- conf_dirs = "/etc/xdg" ++ conf_dirs = "%%X11BASE%%/etc/xdg" + + for conf_dir in conf_dirs.split (":"): + menu_file_path = os.path.join (conf_dir, "menus", menu_file) +@@ -51,7 +51,7 @@ + if os.environ.has_key ("XDG_DATA_DIRS"): + data_dirs = os.environ["XDG_DATA_DIRS"] + if not data_dirs: +- data_dirs = "/usr/local/share/:/usr/share/" ++ data_dirs = "%%X11BASE%%/share/gnome/:/usr/local/share/gnome/:%%X11BASE%%/share/:/usr/local/share/:/usr/share/" + + for data_dir in data_dirs.split (":"): + retval = load_icon_from_path (os.path.join (data_dir, "pixmaps", icon_value)) diff --git a/x11/gnome-menus/pkg-descr b/x11/gnome-menus/pkg-descr index 3f2b7c336c7f..7b27b4e2e339 100644 --- a/x11/gnome-menus/pkg-descr +++ b/x11/gnome-menus/pkg-descr @@ -10,3 +10,5 @@ Also contained here are the GNOME menu layout configuration files, .directory files and assorted menu related utility programs. -- gnome-menus README + +WWW: http://www.freedesktop.org/Standards/menu-spec diff --git a/x11/gnome-menus/pkg-plist b/x11/gnome-menus/pkg-plist index 231a097159a2..82b691c297f3 100644 --- a/x11/gnome-menus/pkg-plist +++ b/x11/gnome-menus/pkg-plist @@ -2,16 +2,18 @@ bin/gnome-menu-spec-test etc/xdg/menus/applications.menu etc/xdg/menus/preferences.menu etc/xdg/menus/settings.menu -include/gnome-menus/menu-tree.h +include/gnome-menus/gmenu-tree.h lib/libgnome-menu.a lib/libgnome-menu.so -lib/libgnome-menu.so.0 +lib/libgnome-menu.so.2 +%%PYTHON_SITELIBDIR%%/gmenu.so libdata/pkgconfig/libgnome-menu.pc share/gnome/desktop-directories/Accessibility.directory share/gnome/desktop-directories/Accessories.directory share/gnome/desktop-directories/Applications.directory +share/gnome/desktop-directories/Desktop.directory share/gnome/desktop-directories/Development.directory -share/gnome/desktop-directories/Edutainment.directory +share/gnome/desktop-directories/Education.directory share/gnome/desktop-directories/Games.directory share/gnome/desktop-directories/Graphics.directory share/gnome/desktop-directories/Internet.directory @@ -19,6 +21,7 @@ share/gnome/desktop-directories/KDE.directory share/gnome/desktop-directories/Multimedia.directory share/gnome/desktop-directories/Office.directory share/gnome/desktop-directories/Other.directory +share/gnome/desktop-directories/Preferences.directory share/gnome/desktop-directories/Settings-Accessibility.directory share/gnome/desktop-directories/Settings.directory share/gnome/desktop-directories/System-Settings.directory @@ -44,12 +47,14 @@ share/locale/gu/LC_MESSAGES/gnome-menus.mo share/locale/he/LC_MESSAGES/gnome-menus.mo share/locale/hi/LC_MESSAGES/gnome-menus.mo share/locale/hu/LC_MESSAGES/gnome-menus.mo +share/locale/hy/LC_MESSAGES/gnome-menus.mo share/locale/id/LC_MESSAGES/gnome-menus.mo share/locale/it/LC_MESSAGES/gnome-menus.mo share/locale/ja/LC_MESSAGES/gnome-menus.mo share/locale/ko/LC_MESSAGES/gnome-menus.mo share/locale/lt/LC_MESSAGES/gnome-menus.mo share/locale/mk/LC_MESSAGES/gnome-menus.mo +share/locale/mr/LC_MESSAGES/gnome-menus.mo share/locale/ms/LC_MESSAGES/gnome-menus.mo share/locale/nb/LC_MESSAGES/gnome-menus.mo share/locale/ne/LC_MESSAGES/gnome-menus.mo @@ -64,7 +69,6 @@ share/locale/ro/LC_MESSAGES/gnome-menus.mo share/locale/ru/LC_MESSAGES/gnome-menus.mo share/locale/rw/LC_MESSAGES/gnome-menus.mo share/locale/sk/LC_MESSAGES/gnome-menus.mo -share/locale/sl/LC_MESSAGES/gnome-menus.mo share/locale/sq/LC_MESSAGES/gnome-menus.mo share/locale/sr/LC_MESSAGES/gnome-menus.mo share/locale/sr@Latn/LC_MESSAGES/gnome-menus.mo @@ -80,7 +84,13 @@ share/locale/zh_TW/LC_MESSAGES/gnome-menus.mo @unexec rmdir %D/share/locale/xh 2> /dev/null || true @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/mr/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/mr 2> /dev/null || true +@unexec rmdir %D/share/locale/hy/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/hy 2> /dev/null || true @dirrm share/gnome/desktop-directories @dirrm include/gnome-menus @dirrm etc/xdg/menus @dirrm etc/xdg +@unexec rmdir %D/%%PYTHON_SITELIBDIR%% 2> /dev/null || true +@unexec rmdir %D/%%PYTHON_LIBDIR%% 2> /dev/null || true diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile index de413e237e36..91d3d77eba18 100644 --- a/x11/gnome-panel/Makefile +++ b/x11/gnome-panel/Makefile @@ -3,30 +3,35 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/x11/gnomepanel/Makefile,v 1.109 2005/10/08 19:41:40 marcus Exp $ # PORTNAME= gnomepanel -PORTVERSION= 2.10.2 +PORTVERSION= 2.12.1 +PORTREVISION= 1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-panel/2.10 +MASTER_SITE_SUBDIR= sources/gnome-panel/2.12 DISTNAME= gnome-panel-${PORTVERSION} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= Panel component for the GNOME 2 Desktop +RUN_DEPENDS= gnome-menu-editor:${PORTSDIR}/deskutils/gnome-menu-editor + USE_BZIP2= yes INSTALLS_OMF= yes INSTALLS_SHLIB= yes +INSTALLS_ICONS= yes USE_X_PREFIX= yes USE_REINPLACE= yes USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop \ - libwnck gnomemenus + libwnck gnomemenus gnomedocutils ltverhack WANT_GNOME= yes GNOME_DESKTOP_VERSION=2 USE_GMAKE= yes -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 CONFIGURE_ARGS= --with-kde-datadir=${LOCALBASE}/share \ --with-kde-docdir=${LOCALBASE}/share/doc CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ @@ -54,6 +59,8 @@ CONFIGURE_ARGS+=--disable-eds .endif post-patch: + @${REINPLACE_CMD} -e 's|evolution.desktop|evolution-2.4.desktop|g' \ + ${WRKSRC}/gnome-panel/panel-default-setup.entries.in .if ( ${OSVERSION} > 600000 && ${OSVERSION} < 600006 ) || \ ( ${OSVERSION} < 503101 ) .for po in da.po it.po zh_CN.po zh_TW.po diff --git a/x11/gnome-panel/distinfo b/x11/gnome-panel/distinfo index ddbc3312644e..ca8232c0a3a4 100644 --- a/x11/gnome-panel/distinfo +++ b/x11/gnome-panel/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-panel-2.10.2.tar.bz2) = c1756cac74a4c8b45ce3b9a884515baa -SIZE (gnome2/gnome-panel-2.10.2.tar.bz2) = 2366827 +MD5 (gnome2/gnome-panel-2.12.1.tar.bz2) = a532717e8ac7f67b7198c256909cd7dd +SIZE (gnome2/gnome-panel-2.12.1.tar.bz2) = 2468498 diff --git a/x11/gnome-panel/files/patch-gnome-panel::GNOME_Panel.server.in b/x11/gnome-panel/files/patch-gnome-panel::GNOME_Panel.server.in deleted file mode 100644 index b89c57317f90..000000000000 --- a/x11/gnome-panel/files/patch-gnome-panel::GNOME_Panel.server.in +++ /dev/null @@ -1,13 +0,0 @@ - -$FreeBSD$ - ---- gnome-panel/GNOME_Panel.server.in 2002/05/09 21:00:58 1.1 -+++ gnome-panel/GNOME_Panel.server.in 2002/05/09 21:01:11 -@@ -1,6 +1,6 @@ - <oaf_info> - --<oaf_server iid="OAFIID:GNOME_PanelShell" type="exe" location="panel-2"> -+<oaf_server iid="OAFIID:GNOME_PanelShell" type="exe" location="gnome-panel"> - <oaf_attribute name="repo_ids" type="stringv"> - <item value="IDL:GNOME/Vertigo/PanelShell:1.0"/> - <item value="IDL:Bonobo/Unknown:1.0"/> diff --git a/x11/gnome-panel/pkg-plist b/x11/gnome-panel/pkg-plist index dc44baa958e0..e77d26d94c58 100644 --- a/x11/gnome-panel/pkg-plist +++ b/x11/gnome-panel/pkg-plist @@ -12,7 +12,7 @@ include/panel-2.0/panel-applet-gconf.h include/panel-2.0/panel-applet.h lib/libpanel-applet-2.a lib/libpanel-applet-2.so -lib/libpanel-applet-2.so.1 +lib/libpanel-applet-2.so.0 libdata/bonobo/servers/GNOME_ClockApplet_Factory.server libdata/bonobo/servers/GNOME_FishApplet_Factory.server libdata/bonobo/servers/GNOME_NotificationAreaApplet.server @@ -71,6 +71,15 @@ share/gnome/help/clock/ja/legal.xml share/gnome/help/clock/ko/clock.xml share/gnome/help/clock/ko/figures/clock_applet.png share/gnome/help/clock/ko/legal.xml +share/gnome/help/clock/nl/clock.xml +share/gnome/help/clock/nl/figures/clock_applet.png +share/gnome/help/clock/nl/legal.xml +share/gnome/help/clock/pa/clock.xml +share/gnome/help/clock/pa/figures/clock_applet.png +share/gnome/help/clock/pa/legal.xml +share/gnome/help/clock/sr/clock.xml +share/gnome/help/clock/sr/figures/clock_applet.png +share/gnome/help/clock/sr/legal.xml share/gnome/help/clock/sv/clock.xml share/gnome/help/clock/sv/figures/clock_applet.png share/gnome/help/clock/sv/legal.xml @@ -83,25 +92,14 @@ share/gnome/help/clock/zh_CN/legal.xml share/gnome/help/clock/zh_TW/clock.xml share/gnome/help/clock/zh_TW/figures/clock_applet.png share/gnome/help/clock/zh_TW/legal.xml -share/gnome/help/fish-applet-2/C/figures/fish_applet.png -share/gnome/help/fish-applet-2/C/fish-applet-2.xml -share/gnome/help/fish-applet-2/C/legal.xml share/gnome/help/fish-applet-2/de/figures/fish_applet.png share/gnome/help/fish-applet-2/de/figures/fish_settings.png share/gnome/help/fish-applet-2/de/fish-applet-2.xml share/gnome/help/fish-applet-2/de/legal.xml -share/gnome/help/fish-applet-2/es/figures/fish_applet.png -share/gnome/help/fish-applet-2/es/figures/fish_settings.png -share/gnome/help/fish-applet-2/es/fish-applet-2.xml -share/gnome/help/fish-applet-2/es/legal.xml share/gnome/help/fish-applet-2/fr/figures/fish_applet.png share/gnome/help/fish-applet-2/fr/figures/fish_settings.png share/gnome/help/fish-applet-2/fr/fish-applet-2.xml share/gnome/help/fish-applet-2/fr/legal.xml -share/gnome/help/fish-applet-2/it/figures/fish_applet.png -share/gnome/help/fish-applet-2/it/figures/fish_settings.png -share/gnome/help/fish-applet-2/it/fish-applet-2.xml -share/gnome/help/fish-applet-2/it/legal.xml share/gnome/help/fish-applet-2/ja/figures/fish_applet.png share/gnome/help/fish-applet-2/ja/fish-applet-2.xml share/gnome/help/fish-applet-2/ja/legal.xml @@ -113,9 +111,6 @@ share/gnome/help/fish-applet-2/sv/figures/fish_applet.png share/gnome/help/fish-applet-2/sv/figures/fish_settings.png share/gnome/help/fish-applet-2/sv/fish-applet-2.xml share/gnome/help/fish-applet-2/sv/legal.xml -share/gnome/help/fish-applet-2/uk/figures/fish_applet.png -share/gnome/help/fish-applet-2/uk/fish-applet-2.xml -share/gnome/help/fish-applet-2/uk/legal.xml share/gnome/help/fish-applet-2/zh_CN/figures/fish_applet.png share/gnome/help/fish-applet-2/zh_CN/figures/fish_settings.png share/gnome/help/fish-applet-2/zh_CN/fish-applet-2.xml @@ -124,6 +119,18 @@ share/gnome/help/fish-applet-2/zh_TW/figures/fish_applet.png share/gnome/help/fish-applet-2/zh_TW/figures/fish_settings.png share/gnome/help/fish-applet-2/zh_TW/fish-applet-2.xml share/gnome/help/fish-applet-2/zh_TW/legal.xml +share/gnome/help/fish/C/figures/fish_applet.png +share/gnome/help/fish/C/fish.xml +share/gnome/help/fish/C/legal.xml +share/gnome/help/fish/es/figures/fish_applet.png +share/gnome/help/fish/es/fish.xml +share/gnome/help/fish/es/legal.xml +share/gnome/help/fish/it/figures/fish_applet.png +share/gnome/help/fish/it/fish.xml +share/gnome/help/fish/it/legal.xml +share/gnome/help/fish/uk/figures/fish_applet.png +share/gnome/help/fish/uk/fish.xml +share/gnome/help/fish/uk/legal.xml share/gnome/help/window-list/C/figures/window_list_applet.png share/gnome/help/window-list/C/figures/window_list_group_applet.png share/gnome/help/window-list/C/legal.xml @@ -134,7 +141,6 @@ share/gnome/help/window-list/de/figures/window_list_group_applet.png share/gnome/help/window-list/de/legal.xml share/gnome/help/window-list/de/window-list.xml share/gnome/help/window-list/es/figures/window_list_applet.png -share/gnome/help/window-list/es/figures/window_list_group.png share/gnome/help/window-list/es/figures/window_list_group_applet.png share/gnome/help/window-list/es/legal.xml share/gnome/help/window-list/es/window-list.xml @@ -144,7 +150,6 @@ share/gnome/help/window-list/fr/figures/window_list_group_applet.png share/gnome/help/window-list/fr/legal.xml share/gnome/help/window-list/fr/window-list.xml share/gnome/help/window-list/it/figures/window_list_applet.png -share/gnome/help/window-list/it/figures/window_list_group.png share/gnome/help/window-list/it/figures/window_list_group_applet.png share/gnome/help/window-list/it/legal.xml share/gnome/help/window-list/it/window-list.xml @@ -158,8 +163,8 @@ share/gnome/help/window-list/ko/figures/window_list_group_applet.png share/gnome/help/window-list/ko/legal.xml share/gnome/help/window-list/ko/window-list.xml share/gnome/help/window-list/sv/figures/window_list_applet.png -share/gnome/help/window-list/sv/figures/window_list_group.png share/gnome/help/window-list/sv/figures/window_list_group_applet.png +share/gnome/help/window-list/sv/figures/window_list_group.png share/gnome/help/window-list/sv/legal.xml share/gnome/help/window-list/sv/window-list.xml share/gnome/help/window-list/uk/figures/window_list_applet.png @@ -184,7 +189,6 @@ share/gnome/help/workspace-switcher/de/figures/workspacelist_applet.png share/gnome/help/workspace-switcher/de/legal.xml share/gnome/help/workspace-switcher/de/workspace-switcher.xml share/gnome/help/workspace-switcher/es/figures/workspace_switcher_applet.png -share/gnome/help/workspace-switcher/es/figures/workspacelist_applet.png share/gnome/help/workspace-switcher/es/legal.xml share/gnome/help/workspace-switcher/es/workspace-switcher.xml share/gnome/help/workspace-switcher/fr/figures/workspace_switcher_applet.png @@ -192,7 +196,6 @@ share/gnome/help/workspace-switcher/fr/figures/workspacelist_applet.png share/gnome/help/workspace-switcher/fr/legal.xml share/gnome/help/workspace-switcher/fr/workspace-switcher.xml share/gnome/help/workspace-switcher/it/figures/workspace_switcher_applet.png -share/gnome/help/workspace-switcher/it/figures/workspacelist_applet.png share/gnome/help/workspace-switcher/it/legal.xml share/gnome/help/workspace-switcher/it/workspace-switcher.xml share/gnome/help/workspace-switcher/ja/figures/workspace_switcher_applet.png @@ -202,6 +205,9 @@ share/gnome/help/workspace-switcher/ko/figures/workspace_switcher_applet.png share/gnome/help/workspace-switcher/ko/figures/workspacelist_applet.png share/gnome/help/workspace-switcher/ko/legal.xml share/gnome/help/workspace-switcher/ko/workspace-switcher.xml +share/gnome/help/workspace-switcher/nl/figures/workspace_switcher_applet.png +share/gnome/help/workspace-switcher/nl/legal.xml +share/gnome/help/workspace-switcher/nl/workspace-switcher.xml share/gnome/help/workspace-switcher/sv/figures/workspace_switcher_applet.png share/gnome/help/workspace-switcher/sv/figures/workspacelist_applet.png share/gnome/help/workspace-switcher/sv/legal.xml @@ -218,50 +224,61 @@ share/gnome/help/workspace-switcher/zh_TW/figures/workspacelist_applet.png share/gnome/help/workspace-switcher/zh_TW/legal.xml share/gnome/help/workspace-switcher/zh_TW/workspace-switcher.xml share/gnome/idl/gnome-panel-2.0/GNOME_Panel.idl -share/gnome/omf/gnome-panel/clock-C.omf +share/gnome/omf/clock/clock-C.omf +share/gnome/omf/clock/clock-de.omf +share/gnome/omf/clock/clock-es.omf +share/gnome/omf/clock/clock-it.omf +share/gnome/omf/clock/clock-fr.omf +share/gnome/omf/clock/clock-ja.omf +share/gnome/omf/clock/clock-ko.omf +share/gnome/omf/clock/clock-nl.omf +share/gnome/omf/clock/clock-pa.omf +share/gnome/omf/clock/clock-sr.omf +share/gnome/omf/clock/clock-sv.omf +share/gnome/omf/clock/clock-uk.omf +share/gnome/omf/clock/clock-zh_CN.omf +share/gnome/omf/clock/clock-zh_TW.omf +share/gnome/omf/fish/fish-C.omf +share/gnome/omf/fish/fish-es.omf +share/gnome/omf/fish/fish-it.omf +share/gnome/omf/fish/fish-uk.omf share/gnome/omf/gnome-panel/clock-de.omf -share/gnome/omf/gnome-panel/clock-es.omf share/gnome/omf/gnome-panel/clock-fr.omf -share/gnome/omf/gnome-panel/clock-it.omf share/gnome/omf/gnome-panel/clock-ja.omf share/gnome/omf/gnome-panel/clock-ko.omf share/gnome/omf/gnome-panel/clock-sv.omf -share/gnome/omf/gnome-panel/clock-uk.omf share/gnome/omf/gnome-panel/clock-zh_CN.omf share/gnome/omf/gnome-panel/clock-zh_TW.omf -share/gnome/omf/gnome-panel/fish-applet-2-C.omf share/gnome/omf/gnome-panel/fish-applet-2-de.omf -share/gnome/omf/gnome-panel/fish-applet-2-es.omf share/gnome/omf/gnome-panel/fish-applet-2-fr.omf -share/gnome/omf/gnome-panel/fish-applet-2-it.omf share/gnome/omf/gnome-panel/fish-applet-2-ja.omf share/gnome/omf/gnome-panel/fish-applet-2-ko.omf share/gnome/omf/gnome-panel/fish-applet-2-sv.omf -share/gnome/omf/gnome-panel/fish-applet-2-uk.omf share/gnome/omf/gnome-panel/fish-applet-2-zh_CN.omf share/gnome/omf/gnome-panel/fish-applet-2-zh_TW.omf -share/gnome/omf/gnome-panel/window-list-C.omf share/gnome/omf/gnome-panel/window-list-de.omf -share/gnome/omf/gnome-panel/window-list-es.omf share/gnome/omf/gnome-panel/window-list-fr.omf -share/gnome/omf/gnome-panel/window-list-it.omf share/gnome/omf/gnome-panel/window-list-ja.omf share/gnome/omf/gnome-panel/window-list-ko.omf share/gnome/omf/gnome-panel/window-list-sv.omf -share/gnome/omf/gnome-panel/window-list-uk.omf share/gnome/omf/gnome-panel/window-list-zh_CN.omf share/gnome/omf/gnome-panel/window-list-zh_TW.omf -share/gnome/omf/gnome-panel/workspace-switcher-C.omf share/gnome/omf/gnome-panel/workspace-switcher-de.omf -share/gnome/omf/gnome-panel/workspace-switcher-es.omf share/gnome/omf/gnome-panel/workspace-switcher-fr.omf -share/gnome/omf/gnome-panel/workspace-switcher-it.omf share/gnome/omf/gnome-panel/workspace-switcher-ja.omf share/gnome/omf/gnome-panel/workspace-switcher-ko.omf share/gnome/omf/gnome-panel/workspace-switcher-sv.omf -share/gnome/omf/gnome-panel/workspace-switcher-uk.omf share/gnome/omf/gnome-panel/workspace-switcher-zh_CN.omf share/gnome/omf/gnome-panel/workspace-switcher-zh_TW.omf +share/gnome/omf/window-list/window-list-C.omf +share/gnome/omf/window-list/window-list-es.omf +share/gnome/omf/window-list/window-list-it.omf +share/gnome/omf/window-list/window-list-uk.omf +share/gnome/omf/workspace-switcher/workspace-switcher-C.omf +share/gnome/omf/workspace-switcher/workspace-switcher-es.omf +share/gnome/omf/workspace-switcher/workspace-switcher-it.omf +share/gnome/omf/workspace-switcher/workspace-switcher-nl.omf +share/gnome/omf/workspace-switcher/workspace-switcher-uk.omf share/gnome/panel/glade/fish.glade share/gnome/panel/glade/panel-properties-dialog.glade share/gnome/panel/glade/panel-run-dialog.glade @@ -313,6 +330,7 @@ share/locale/id/LC_MESSAGES/gnome-panel-2.0.mo share/locale/it/LC_MESSAGES/gnome-panel-2.0.mo share/locale/ja/LC_MESSAGES/gnome-panel-2.0.mo share/locale/ko/LC_MESSAGES/gnome-panel-2.0.mo +share/locale/ku/LC_MESSAGES/gnome-panel-2.0.mo share/locale/li/LC_MESSAGES/gnome-panel-2.0.mo share/locale/lt/LC_MESSAGES/gnome-panel-2.0.mo share/locale/lv/LC_MESSAGES/gnome-panel-2.0.mo @@ -344,6 +362,7 @@ share/locale/sr@Latn/LC_MESSAGES/gnome-panel-2.0.mo share/locale/sr@ije/LC_MESSAGES/gnome-panel-2.0.mo share/locale/sv/LC_MESSAGES/gnome-panel-2.0.mo share/locale/ta/LC_MESSAGES/gnome-panel-2.0.mo +share/locale/te/LC_MESSAGES/gnome-panel-2.0.mo share/locale/th/LC_MESSAGES/gnome-panel-2.0.mo share/locale/tr/LC_MESSAGES/gnome-panel-2.0.mo share/locale/uk/LC_MESSAGES/gnome-panel-2.0.mo @@ -374,7 +393,11 @@ share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo @unexec /bin/rmdir %D/share/locale/hy 2>/dev/null || /usr/bin/true @dirrm share/gnome/panel/pixmaps @dirrm share/gnome/panel/glade +@dirrm share/gnome/omf/workspace-switcher +@dirrm share/gnome/omf/window-list @dirrm share/gnome/omf/gnome-panel +@dirrm share/gnome/omf/fish +@dirrm share/gnome/omf/clock @dirrm share/gnome/idl/gnome-panel-2.0 @dirrm share/gnome/help/workspace-switcher/zh_TW/figures @dirrm share/gnome/help/workspace-switcher/zh_TW @@ -384,6 +407,8 @@ share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo @dirrm share/gnome/help/workspace-switcher/uk @dirrm share/gnome/help/workspace-switcher/sv/figures @dirrm share/gnome/help/workspace-switcher/sv +@dirrm share/gnome/help/workspace-switcher/nl/figures +@dirrm share/gnome/help/workspace-switcher/nl @dirrm share/gnome/help/workspace-switcher/ko/figures @dirrm share/gnome/help/workspace-switcher/ko @dirrm share/gnome/help/workspace-switcher/ja/figures @@ -426,25 +451,26 @@ share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo @dirrm share/gnome/help/fish-applet-2/zh_TW @dirrm share/gnome/help/fish-applet-2/zh_CN/figures @dirrm share/gnome/help/fish-applet-2/zh_CN -@dirrm share/gnome/help/fish-applet-2/uk/figures -@dirrm share/gnome/help/fish-applet-2/uk @dirrm share/gnome/help/fish-applet-2/sv/figures @dirrm share/gnome/help/fish-applet-2/sv @dirrm share/gnome/help/fish-applet-2/ko/figures @dirrm share/gnome/help/fish-applet-2/ko @dirrm share/gnome/help/fish-applet-2/ja/figures @dirrm share/gnome/help/fish-applet-2/ja -@dirrm share/gnome/help/fish-applet-2/it/figures -@dirrm share/gnome/help/fish-applet-2/it @dirrm share/gnome/help/fish-applet-2/fr/figures @dirrm share/gnome/help/fish-applet-2/fr -@dirrm share/gnome/help/fish-applet-2/es/figures -@dirrm share/gnome/help/fish-applet-2/es @dirrm share/gnome/help/fish-applet-2/de/figures @dirrm share/gnome/help/fish-applet-2/de -@dirrm share/gnome/help/fish-applet-2/C/figures -@dirrm share/gnome/help/fish-applet-2/C @dirrm share/gnome/help/fish-applet-2 +@dirrm share/gnome/help/fish/uk/figures +@dirrm share/gnome/help/fish/uk +@dirrm share/gnome/help/fish/it/figures +@dirrm share/gnome/help/fish/it +@dirrm share/gnome/help/fish/es/figures +@dirrm share/gnome/help/fish/es +@dirrm share/gnome/help/fish/C/figures +@dirrm share/gnome/help/fish/C +@dirrm share/gnome/help/fish @dirrm share/gnome/help/clock/zh_TW/figures @dirrm share/gnome/help/clock/zh_TW @dirrm share/gnome/help/clock/zh_CN/figures @@ -453,6 +479,12 @@ share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo @dirrm share/gnome/help/clock/uk @dirrm share/gnome/help/clock/sv/figures @dirrm share/gnome/help/clock/sv +@dirrm share/gnome/help/clock/sr/figures +@dirrm share/gnome/help/clock/sr +@dirrm share/gnome/help/clock/pa/figures +@dirrm share/gnome/help/clock/pa +@dirrm share/gnome/help/clock/nl/figures +@dirrm share/gnome/help/clock/nl @dirrm share/gnome/help/clock/ko/figures @dirrm share/gnome/help/clock/ko @dirrm share/gnome/help/clock/ja/figures diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile index 1f48df2e0f83..274a00a9a3ed 100644 --- a/x11/gnome-session/Makefile +++ b/x11/gnome-session/Makefile @@ -3,16 +3,18 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/x11/gnomesession/Makefile,v 1.67 2005/10/31 19:46:29 adamw Exp $ # PORTNAME= gnomesession -PORTVERSION= 2.10.0 +PORTVERSION= 2.12.0 +PORTREVISION= 1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} \ ${MASTER_SITE_LOCAL:S/$/:local/} \ - http://people.FreeBSD.org/~pav/:local -MASTER_SITE_SUBDIR= sources/gnome-session/2.10 \ - pav/:local + http://people.FreeBSD.org/~adamw/images/gnome_splashes/2.12/:local +MASTER_SITE_SUBDIR= sources/gnome-session/2.12 \ + adamw/:local DISTNAME= gnome-session-${PORTVERSION} DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ ${SPLASHES}:local @@ -26,16 +28,16 @@ USE_BZIP2= yes USE_X_PREFIX= yes USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui USE_GMAKE= yes -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" -MAN1= gnome-session.1 gnome-smproxy.1 gnome-wm.1 \ - session-properties.1 gnome-session-save.1 +MAN1= gnome-session.1 gnome-wm.1 session-properties.1 \ + gnome-session-save.1 MAN5= default.session.5 GCONF_SCHEMAS= gnome-session.schemas -SPLASHES= freebsd-splashes-gnome-2.10.tar +SPLASHES= freebsd-splashes-gnome-2.12.1.tar post-extract: cd ${WRKDIR} && ${TAR} xf ${DISTDIR}/${DIST_SUBDIR}/${SPLASHES} @@ -43,10 +45,10 @@ post-extract: post-install: ${INSTALL_DATA} ${WRKSRC}/gnome-session/gnome-splash.png \ ${PREFIX}/share/gnome/pixmaps/splash/original-gnome-splash.png - ${INSTALL_DATA} ${WRKDIR}/freebsd-splashes-gnome-2.10/franz_klammer-2.png \ + ${INSTALL_DATA} ${WRKDIR}/freebsd-splashes-gnome-2.12/domix-splash-2.12.png \ ${PREFIX}/share/gnome/pixmaps/splash/gnome-splash.png -.for splash in adamw.png banana_flex.png franco_malatacca.jpg franz_klammer-1.png franz_klammer-3.png radek.png - ${INSTALL_DATA} ${WRKDIR}/freebsd-splashes-gnome-2.10/${splash} \ +.for splash in MaMBaNgGaoX-2.12.png adamw-piggy-2.12.png adamw-trophy-2.12.png andreas-slogan-2.12.png andreas-splash-2.12.png domix-splash-2.12.png domix-splash2-2.12.png mumija-2.12.png mumija2-2.12.png mumija3-2.12.png tremulant-2.12.png tremulant-blood-2.12.png tremulant-brushed-metal-2.12.png + ${INSTALL_DATA} ${WRKDIR}/freebsd-splashes-gnome-2.12/${splash} \ ${PREFIX}/share/gnome/pixmaps/splash .endfor diff --git a/x11/gnome-session/distinfo b/x11/gnome-session/distinfo index 5f305e45c84f..cfcfc5533884 100644 --- a/x11/gnome-session/distinfo +++ b/x11/gnome-session/distinfo @@ -1,4 +1,4 @@ -MD5 (gnome2/gnome-session-2.10.0.tar.bz2) = cbeb2db49dac11bf8088e6b025265fff -SIZE (gnome2/gnome-session-2.10.0.tar.bz2) = 796754 -MD5 (gnome2/freebsd-splashes-gnome-2.10.tar) = 92cfd1945f9a48dd8df3981935e9ef34 -SIZE (gnome2/freebsd-splashes-gnome-2.10.tar) = 462336 +MD5 (gnome2/gnome-session-2.12.0.tar.bz2) = 835e9340d23e139430224b931ff4c597 +SIZE (gnome2/gnome-session-2.12.0.tar.bz2) = 864397 +MD5 (gnome2/freebsd-splashes-gnome-2.12.1.tar) = 4a098f0f2295c3333acff185d4bed5aa +SIZE (gnome2/freebsd-splashes-gnome-2.12.1.tar) = 1280000 diff --git a/x11/gnome-session/pkg-plist b/x11/gnome-session/pkg-plist index 999c30043083..17d898f1ee23 100644 --- a/x11/gnome-session/pkg-plist +++ b/x11/gnome-session/pkg-plist @@ -2,19 +2,25 @@ bin/gnome-session bin/gnome-session-properties bin/gnome-session-remove bin/gnome-session-save -bin/gnome-smproxy bin/gnome-wm share/gnome/applications/session-properties.desktop share/gnome/default.session share/gnome/default.wm -share/gnome/pixmaps/splash/adamw.png -share/gnome/pixmaps/splash/banana_flex.png -share/gnome/pixmaps/splash/franco_malatacca.jpg -share/gnome/pixmaps/splash/franz_klammer-1.png -share/gnome/pixmaps/splash/franz_klammer-3.png +share/gnome/pixmaps/splash/MaMBaNgGaoX-2.12.png +share/gnome/pixmaps/splash/adamw-piggy-2.12.png +share/gnome/pixmaps/splash/adamw-trophy-2.12.png +share/gnome/pixmaps/splash/andreas-slogan-2.12.png +share/gnome/pixmaps/splash/andreas-splash-2.12.png +share/gnome/pixmaps/splash/domix-splash-2.12.png +share/gnome/pixmaps/splash/domix-splash2-2.12.png share/gnome/pixmaps/splash/gnome-splash.png +share/gnome/pixmaps/splash/mumija-2.12.png +share/gnome/pixmaps/splash/mumija2-2.12.png +share/gnome/pixmaps/splash/mumija3-2.12.png share/gnome/pixmaps/splash/original-gnome-splash.png -share/gnome/pixmaps/splash/radek.png +share/gnome/pixmaps/splash/tremulant-2.12.png +share/gnome/pixmaps/splash/tremulant-blood-2.12.png +share/gnome/pixmaps/splash/tremulant-brushed-metal-2.12.png share/locale/af/LC_MESSAGES/gnome-session-2.0.mo share/locale/am/LC_MESSAGES/gnome-session-2.0.mo share/locale/ar/LC_MESSAGES/gnome-session-2.0.mo @@ -45,6 +51,7 @@ share/locale/he/LC_MESSAGES/gnome-session-2.0.mo share/locale/hi/LC_MESSAGES/gnome-session-2.0.mo share/locale/hr/LC_MESSAGES/gnome-session-2.0.mo share/locale/hu/LC_MESSAGES/gnome-session-2.0.mo +share/locale/hy/LC_MESSAGES/gnome-session-2.0.mo share/locale/id/LC_MESSAGES/gnome-session-2.0.mo share/locale/is/LC_MESSAGES/gnome-session-2.0.mo share/locale/it/LC_MESSAGES/gnome-session-2.0.mo @@ -82,9 +89,12 @@ share/locale/th/LC_MESSAGES/gnome-session-2.0.mo share/locale/tk/LC_MESSAGES/gnome-session-2.0.mo share/locale/tr/LC_MESSAGES/gnome-session-2.0.mo share/locale/uk/LC_MESSAGES/gnome-session-2.0.mo +share/locale/rw/LC_MESSAGES/gnome-session-2.0.mo share/locale/vi/LC_MESSAGES/gnome-session-2.0.mo share/locale/wa/LC_MESSAGES/gnome-session-2.0.mo share/locale/xh/LC_MESSAGES/gnome-session-2.0.mo share/locale/zh_CN/LC_MESSAGES/gnome-session-2.0.mo share/locale/zh_TW/LC_MESSAGES/gnome-session-2.0.mo share/locale/zu/LC_MESSAGES/gnome-session-2.0.mo +@unexec /bin/rmdir %D/share/locale/hy/LC_MESSAGES 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/locale/hy 2>/dev/null || /usr/bin/true diff --git a/x11/gnome-terminal/Makefile b/x11/gnome-terminal/Makefile index 6a58361c7fcc..f6dded8a0189 100644 --- a/x11/gnome-terminal/Makefile +++ b/x11/gnome-terminal/Makefile @@ -3,14 +3,14 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/x11/gnometerminal/Makefile,v 1.52 2005/10/14 20:39:58 adamw Exp $ # PORTNAME= gnometerminal -PORTVERSION= 2.10.0 -PORTREVISION= 1 +PORTVERSION= 2.12.0 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-terminal/2.10 +MASTER_SITE_SUBDIR= sources/gnome-terminal/2.12 DISTNAME= gnome-terminal-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -23,7 +23,7 @@ USE_X_PREFIX= yes USE_REINPLACE= yes USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui vte -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/x11/gnome-terminal/distinfo b/x11/gnome-terminal/distinfo index bb6a1fa2132f..13b21339bab4 100644 --- a/x11/gnome-terminal/distinfo +++ b/x11/gnome-terminal/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-terminal-2.10.0.tar.bz2) = 062744daca0c7f708b8c52f47b5db0d1 -SIZE (gnome2/gnome-terminal-2.10.0.tar.bz2) = 2334171 +MD5 (gnome2/gnome-terminal-2.12.0.tar.bz2) = 483c9397dd165845e2528a80e3df6dfc +SIZE (gnome2/gnome-terminal-2.12.0.tar.bz2) = 1684178 diff --git a/x11/gnome-terminal/files/patch-src::terminal-screen.c b/x11/gnome-terminal/files/patch-src::terminal-screen.c index c7cf1b8ce449..0198f748c37d 100644 --- a/x11/gnome-terminal/files/patch-src::terminal-screen.c +++ b/x11/gnome-terminal/files/patch-src::terminal-screen.c @@ -1,27 +1,23 @@ ---- src/terminal-screen.c.orig Thu Mar 3 15:13:08 2005 -+++ src/terminal-screen.c Wed Mar 16 03:11:08 2005 -@@ -246,18 +246,18 @@ - #define USER "[" USERCHARS "]+(:["PASSCHARS "]+)?" +--- src/terminal-screen.c.orig Fri Jul 1 20:37:58 2005 ++++ src/terminal-screen.c Tue Jul 5 13:26:21 2005 +@@ -248,16 +248,16 @@ terminal_screen_init (TerminalScreen *sc + #define URLPATH "/[" PATHCHARS "]*[^]'.}>) \t\r\n,\\\"]" terminal_widget_match_add (screen->priv->term, -- "\\<(" SCHEME "://(" USER "@)?)[" HOSTCHARS ".]+(:[0-9]+)?" -- "(/[-A-Za-z0-9_$.+!*(),;:@&=?/~#%]*[^]'.}>) \t\r\n,\\\"])?\\>", FLAVOR_AS_IS); -+ "[[:<:]](" SCHEME "://(" USER "@)?)[" HOSTCHARS ".]+(:[0-9]+)?" -+ "(/[-A-Za-z0-9_$.+!*(),;:@&=?/~#%]*[^]'.}>) \t\r\n,\\\"])?[[:>:]]", FLAVOR_AS_IS); +- "\\<(" SCHEME "://(" USER "@)?)[" HOSTCHARS ".]+(:[0-9]+)?(" URLPATH ")?", FLAVOR_AS_IS); ++ "[[:<:]](" SCHEME "://(" USER "@)?)[" HOSTCHARS ".]+(:[0-9]+)?(" URLPATH ")?", FLAVOR_AS_IS); terminal_widget_match_add (screen->priv->term, -- "\\<(www|ftp)[" HOSTCHARS "]*\\.[" HOSTCHARS ".]+(:[0-9]+)?" -- "(/[-A-Za-z0-9_$.+!*(),;:@&=?/~#%]*[^]'.}>) \t\r\n,\\\"])?\\>", FLAVOR_DEFAULT_TO_HTTP); -+ "[[:<:]](www|ftp)[" HOSTCHARS "]*\\.[" HOSTCHARS ".]+(:[0-9]+)?" -+ "(/[-A-Za-z0-9_$.+!*(),;:@&=?/~#%]*[^]'.}>) \t\r\n,\\\"])?[[:>:]]", FLAVOR_DEFAULT_TO_HTTP); +- "\\<(www|ftp)[" HOSTCHARS "]*\\.[" HOSTCHARS ".]+(:[0-9]+)?(" URLPATH ")?", FLAVOR_DEFAULT_TO_HTTP); ++ "[[:<:]]<(www|ftp)[" HOSTCHARS "]*\\.[" HOSTCHARS ".]+(:[0-9]+)?(" URLPATH ")?", FLAVOR_DEFAULT_TO_HTTP); terminal_widget_match_add (screen->priv->term, - "\\<(mailto:)?[a-z0-9][a-z0-9.-]*@[a-z0-9][a-z0-9-]*(\\.[a-z0-9][a-z0-9-]*)+\\>", FLAVOR_MAILTO); -+ "[[:<:]](mailto:)?[a-z0-9][a-z0-9.-]*@[a-z0-9][a-z0-9-]*(\\.[a-z0-9][a-z0-9-]*)+[[:>:]]", FLAVOR_MAILTO); ++ "[[:<:]](mailto:)?[a-z0-9][a-z0-9.-]*@[a-z0-9][a-z0-9-]*(\\.[a-z0-9][a-z0-9-]*)+\\>", FLAVOR_MAILTO); terminal_widget_match_add (screen->priv->term, - "\\<news:[-A-Z\\^_a-z{|}~!\"#$%&'()*+,./0-9;:=?`]+@[" HOSTCHARS ".]+(:[0-9]+)?\\>", FLAVOR_AS_IS); -+ "[[:<:]]news:[-A-Z\\^_a-z{|}~!\"#$%&'()*+,./0-9;:=?`]+@[" HOSTCHARS ".]+(:[0-9]+)?[[:>:]]", FLAVOR_AS_IS); ++ "[[:<:]]<news:[-A-Z\\^_a-z{|}~!\"#$%&'()*+,./0-9;:=?`]+@[" HOSTCHARS ".]+(:[0-9]+)?\\>", FLAVOR_AS_IS); terminal_screen_setup_dnd (screen); diff --git a/x11/gnome-terminal/pkg-plist b/x11/gnome-terminal/pkg-plist index 22d4a5870a1e..721f659b8cd1 100644 --- a/x11/gnome-terminal/pkg-plist +++ b/x11/gnome-terminal/pkg-plist @@ -103,6 +103,7 @@ share/locale/he/LC_MESSAGES/gnome-terminal.mo share/locale/hi/LC_MESSAGES/gnome-terminal.mo share/locale/hr/LC_MESSAGES/gnome-terminal.mo share/locale/hu/LC_MESSAGES/gnome-terminal.mo +share/locale/hy/LC_MESSAGES/gnome-terminal.mo share/locale/id/LC_MESSAGES/gnome-terminal.mo share/locale/it/LC_MESSAGES/gnome-terminal.mo share/locale/ja/LC_MESSAGES/gnome-terminal.mo @@ -124,6 +125,7 @@ share/locale/pt/LC_MESSAGES/gnome-terminal.mo share/locale/pt_BR/LC_MESSAGES/gnome-terminal.mo share/locale/ro/LC_MESSAGES/gnome-terminal.mo share/locale/ru/LC_MESSAGES/gnome-terminal.mo +share/locale/rw/LC_MESSAGES/gnome-terminal.mo share/locale/sk/LC_MESSAGES/gnome-terminal.mo share/locale/sl/LC_MESSAGES/gnome-terminal.mo share/locale/sq/LC_MESSAGES/gnome-terminal.mo @@ -136,6 +138,7 @@ share/locale/tr/LC_MESSAGES/gnome-terminal.mo share/locale/uk/LC_MESSAGES/gnome-terminal.mo share/locale/vi/LC_MESSAGES/gnome-terminal.mo share/locale/wa/LC_MESSAGES/gnome-terminal.mo +share/locale/xh/LC_MESSAGES/gnome-terminal.mo share/locale/zh_CN/LC_MESSAGES/gnome-terminal.mo share/locale/zh_TW/LC_MESSAGES/gnome-terminal.mo @dirrm share/gnome/omf/gnome-terminal diff --git a/x11/gnome2-fifth-toe/Makefile b/x11/gnome2-fifth-toe/Makefile index 735baf420383..a5bb628cf551 100644 --- a/x11/gnome2-fifth-toe/Makefile +++ b/x11/gnome2-fifth-toe/Makefile @@ -3,16 +3,13 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/x11/gnome2-fifth-toe/Makefile,v 1.73 2005/08/26 03:21:23 marcus Exp $ # -PORTNAME= gnome2-fifth-toe -PORTVERSION= 2.10.2 +PORTREVISION= 0 CATEGORIES= x11 gnome -MASTER_SITES= # empty -DISTFILES= # empty -EXTRACT_ONLY= # empty +PKGNAMESUFFIX= -fifth-toe -MAINTAINER= gnome@FreeBSD.org COMMENT= Additional GNOME 2 applications not included in the core desktop RUN_DEPENDS= pan:${PORTSDIR}/news/pan2 \ @@ -35,14 +32,14 @@ RUN_DEPENDS= pan:${PORTSDIR}/news/pan2 \ jamboree:${PORTSDIR}/audio/jamboree \ ${X11BASE}/share/gnome/pixmaps/glines/classic.png:${PORTSDIR}/games/gnomegames2-extra-data \ nautilus-sendto:${PORTSDIR}/deskutils/nautilus-sendto \ - evince:${PORTSDIR}/graphics/evince \ goobox:${PORTSDIR}/audio/goobox \ - inkscape:${PORTSDIR}/graphics/inkscape + inkscape:${PORTSDIR}/graphics/inkscape \ + gpdf:${PORTSDIR}/graphics/gpdf \ + ggv:${PORTSDIR}/print/ggv -.include <bsd.port.pre.mk> +MASTERDIR= ${.CURDIR}/../gnome2 +GNOME_SLAVE= yes -NO_BUILD= yes +DESCR= ${.CURDIR}/pkg-descr -do-install: # empty - -.include <bsd.port.post.mk> +.include "${MASTERDIR}/Makefile" diff --git a/x11/gnome2-fifth-toe/pkg-plist b/x11/gnome2-fifth-toe/pkg-plist deleted file mode 100644 index 549a621fec0c..000000000000 --- a/x11/gnome2-fifth-toe/pkg-plist +++ /dev/null @@ -1 +0,0 @@ -@comment this plist intentionally left empty diff --git a/x11/gnome2-lite/Makefile b/x11/gnome2-lite/Makefile index 924d5e1957b7..dab054657c59 100644 --- a/x11/gnome2-lite/Makefile +++ b/x11/gnome2-lite/Makefile @@ -3,17 +3,13 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/x11/gnome2-lite/Makefile,v 1.43 2005/09/25 23:58:48 marcus Exp $ # -PORTNAME= gnome2 -PORTVERSION= 2.10.2 +PORTREVISION= 0 CATEGORIES= x11 gnome -MASTER_SITES= # empty PKGNAMESUFFIX= -lite -DISTFILES= # empty -EXTRACT_ONLY= # empty -MAINTAINER= gnome@FreeBSD.org COMMENT= The "meta-port" of the GNOME desktop slimmed down for FreeBSD releases RUN_DEPENDS= ${X11BASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnomeapplets2 \ @@ -26,12 +22,11 @@ RUN_DEPENDS= ${X11BASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnomeapplets2 gnome-system-monitor:${PORTSDIR}/sysutils/gnomesystemmonitor \ nautilus:${PORTSDIR}/x11-fm/nautilus2 \ yelp:${PORTSDIR}/x11/yelp \ - ${X11BASE}/share/gnome/applications/gnome-screensaver-properties.desktop:${PORTSDIR}/x11/xscreensaver-gnome \ ${X11BASE}/share/gnome/help/user-guide/C/user-guide.xml:${PORTSDIR}/misc/gnomeuserdocs2 \ ${X11BASE}/share/gnome/sounds/question.wav:${PORTSDIR}/audio/gnomeaudio2 \ file-roller:${PORTSDIR}/archivers/fileroller \ ${X11BASE}/share/themes/HighContrast/gtk-2.0/gtkrc:${PORTSDIR}/x11-themes/gnome-themes \ - ggv:${PORTSDIR}/print/ggv \ + evince:${PORTSDIR}/graphics/evince \ gcalctool:${PORTSDIR}/math/gcalctool \ gucharmap:${PORTSDIR}/deskutils/gucharmap \ ${X11BASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera \ @@ -39,23 +34,10 @@ RUN_DEPENDS= ${X11BASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnomeapplets2 gnome-control-center:${PORTSDIR}/sysutils/gnomecontrolcenter2 \ totem:${PORTSDIR}/multimedia/totem-gstreamer -NO_BUILD= yes - -USE_PYTHON= yes - +MASTERDIR= ${.CURDIR}/../gnome2 CONFLICTS= gnome2-[0-9]* -.if !defined(BATCH) && !defined(PACKAGE_BUILDING) -pre-configure: - @${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL -.endif - -do-install: # empty - -.include <bsd.port.pre.mk> - -.if ${ARCH} == "i386" || ${OSVERSION} > 500035 -RUN_DEPENDS+= epiphany:${PORTSDIR}/www/epiphany -.endif +DESCR= ${.CURDIR}/pkg-descr +PKGMESSAGE= ${.CURDIR}/pkg-message -.include <bsd.port.post.mk> +.include "${MASTERDIR}/Makefile" diff --git a/x11/gnome2-lite/pkg-install b/x11/gnome2-lite/pkg-install deleted file mode 100644 index 3040e98bde7b..000000000000 --- a/x11/gnome2-lite/pkg-install +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh - -PATH=/bin:/usr/bin:/sbin:/usr/sbin:${PATH} -export PATH - -if [ "$2" = "PRE-INSTALL" ]; then - GNOME_ONE_DESKTOP="gnomecore gnomeapplets gnomemedia gnomeutils gtop libgtop sawfish nautilus xalf gnomegames gnomeaudio" - for package in ${GNOME_ONE_DESKTOP}; do - if pkg_info | grep "^${package}-[0-9]" >/dev/null 2>&1; then - echo "${package} was detected on the system. This package is part of the GNOME 1.x" - echo "desktop, and cannot coexist with the GNOME 2 desktop." - echo "" - echo "Please deinstall the GNOME 1.x desktop before installing this package." - false - fi - done -fi diff --git a/x11/gnome2-lite/pkg-plist b/x11/gnome2-lite/pkg-plist deleted file mode 100644 index 549a621fec0c..000000000000 --- a/x11/gnome2-lite/pkg-plist +++ /dev/null @@ -1 +0,0 @@ -@comment this plist intentionally left empty diff --git a/x11/gnome2-power-tools/Makefile b/x11/gnome2-power-tools/Makefile index 4b379118ed97..cc02dd203188 100644 --- a/x11/gnome2-power-tools/Makefile +++ b/x11/gnome2-power-tools/Makefile @@ -3,22 +3,17 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/x11/gnome2-power-tools/Makefile,v 1.62 2005/10/06 01:26:06 marcus Exp $ # -PORTNAME= gnome2-power-tools -PORTVERSION= 2.10.2 -PORTREVISION= 1 +PORTREVISION= 0 CATEGORIES= x11 gnome -MASTER_SITES= # empty -DISTFILES= # empty -EXTRACT_ONLY= # empty +PKGNAMESUFFIX= -power-tools -MAINTAINER= gnome@FreeBSD.org COMMENT= "Geektoys" for the GNOME 2 power user -RUN_DEPENDS= ${X11BASE}/lib/epiphany-1.6/extensions/libgesturesextension.so:${PORTSDIR}/www/epiphany-extensions \ +RUN_DEPENDS= ${X11BASE}/lib/epiphany/1.8/extensions/libgesturesextension.so:${PORTSDIR}/www/epiphany-extensions \ gnome-pkgview:${PORTSDIR}/sysutils/gnome-pkgview \ - ${X11BASE}/libexec/quick-lounge-applet:${PORTSDIR}/misc/quick-lounge-applet \ ${X11BASE}/libexec/netspeed_applet2:${PORTSDIR}/net/netspeed_applet \ ${LOCALBASE}/sbin/gkrellmd:${PORTSDIR}/sysutils/gkrellm2 \ splashsetter:${PORTSDIR}/deskutils/splashsetter \ @@ -28,12 +23,21 @@ RUN_DEPENDS= ${X11BASE}/lib/epiphany-1.6/extensions/libgesturesextension.so:${PO gnomesu:${PORTSDIR}/security/libgnomesu \ bpm:${PORTSDIR}/sysutils/bpm \ gnome-file-share-properties:${PORTSDIR}/www/gnome-user-share \ - gnome-keyring-manager:${PORTSDIR}/security/gnomekeyringmanager \ gnome-menu-editor:${PORTSDIR}/deskutils/gnome-menu-editor \ + serpentine:${PORTSDIR}/sysutils/serpentine \ + devilspie:${PORTSDIR}/x11-wm/devilspie \ + ${X11BASE}/lib/nautilus/extensions-1.0/libnautilus-open-terminal.so:${PORTSDIR}/deskutils/nautilus-open-terminal \ + gtweakui-menus:${PORTSDIR}/deskutils/gtweakui \ + gnome-art:${PORTSDIR}/x11-themes/gnome-art \ + ${X11BASE}/libdata/bonobo/servers/DeskbarApplet.server:${PORTSDIR}/deskutils/deskbar-applet \ + brightside:${PORTSDIR}/x11/brightside \ + evolution-gconf-filter-exchange:${PORTSDIR}/devel/evolution-gconf-tools \ + ${X11BASE}/libexec/quick-lounge-applet:${PORTSDIR}/misc/quick-lounge-applet \ eiciel:${PORTSDIR}/sysutils/eiciel -NO_BUILD= yes +MASTERDIR= ${.CURDIR}/../gnome2 +GNOME_SLAVE= yes -do-install: # empty +DESCR= ${.CURDIR}/pkg-descr -.include <bsd.port.mk> +.include "${MASTERDIR}/Makefile" diff --git a/x11/gnome2-power-tools/pkg-plist b/x11/gnome2-power-tools/pkg-plist deleted file mode 100644 index 549a621fec0c..000000000000 --- a/x11/gnome2-power-tools/pkg-plist +++ /dev/null @@ -1 +0,0 @@ -@comment this plist intentionally left empty diff --git a/x11/gnome2/Makefile b/x11/gnome2/Makefile index a9420a1ba5f5..029271f2e21f 100644 --- a/x11/gnome2/Makefile +++ b/x11/gnome2/Makefile @@ -3,19 +3,21 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/x11/gnome2/Makefile,v 1.122 2005/10/06 01:26:06 marcus Exp $ # PORTNAME= gnome2 -PORTVERSION= 2.10.2 -CATEGORIES= x11 gnome +PORTVERSION= 2.12.1 +PORTREVISION?= 0 +CATEGORIES?= x11 gnome MASTER_SITES= # empty DISTFILES= # empty EXTRACT_ONLY= # empty MAINTAINER= gnome@FreeBSD.org -COMMENT= The "meta-port" for the GNOME 2 integrated X11 desktop +COMMENT?= The "meta-port" for the GNOME 2 integrated X11 desktop -RUN_DEPENDS= ${X11BASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnomeapplets2 \ +RUN_DEPENDS?= ${X11BASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnomeapplets2 \ gnome-cd:${PORTSDIR}/audio/gnomemedia2 \ gnome-dictionary:${PORTSDIR}/deskutils/gnomeutils2 \ eog:${PORTSDIR}/graphics/eog \ @@ -29,15 +31,12 @@ RUN_DEPENDS= ${X11BASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnomeapplets2 nautilus:${PORTSDIR}/x11-fm/nautilus2 \ yelp:${PORTSDIR}/x11/yelp \ ${X11BASE}/sbin/gdm:${PORTSDIR}/x11/gdm \ - ${X11BASE}/share/gnome/applications/gnome-screensaver-properties.desktop:${PORTSDIR}/x11/xscreensaver-gnome \ ${X11BASE}/share/gnome/help/user-guide/C/user-guide.xml:${PORTSDIR}/misc/gnomeuserdocs2 \ ${X11BASE}/share/gnome/sounds/question.wav:${PORTSDIR}/audio/gnomeaudio2 \ ${X11BASE}/libdata/pkgconfig/libgail-gnome.pc:${PORTSDIR}/x11-toolkits/libgail-gnome \ file-roller:${PORTSDIR}/archivers/fileroller \ ${X11BASE}/share/themes/HighContrast/gtk-2.0/gtkrc:${PORTSDIR}/x11-themes/gnome-themes \ - ggv:${PORTSDIR}/print/ggv \ gok:${PORTSDIR}/accessibility/gok \ - gpdf:${PORTSDIR}/graphics/gpdf \ nautilus-cd-burner:${PORTSDIR}/sysutils/nautilus-cd-burner \ gcalctool:${PORTSDIR}/math/gcalctool \ gucharmap:${PORTSDIR}/deskutils/gucharmap \ @@ -46,34 +45,53 @@ RUN_DEPENDS= ${X11BASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnomeapplets2 gnopernicus:${PORTSDIR}/accessibility/gnopernicus \ ${X11BASE}/libexec/gnome-netstatus-applet:${PORTSDIR}/net/gnomenetstatus \ dasher:${PORTSDIR}/accessibility/dasher \ - evolution-2.2:${PORTSDIR}/mail/evolution \ + evolution-2.4:${PORTSDIR}/mail/evolution \ ${X11BASE}/libexec/evolution-webcal:${PORTSDIR}/www/evolution-webcal \ network-admin:${PORTSDIR}/sysutils/gnomesystemtools \ gnome-nettool:${PORTSDIR}/net/gnomenettool \ vino-session:${PORTSDIR}/net/vino \ - ximian-connector-setup-2.2:${PORTSDIR}/mail/ximian-connector \ + ximian-connector-setup-2.4:${PORTSDIR}/mail/evolution-exchange \ ${X11BASE}/lib/gstreamer-0.8/.gstreamer-plugins-core.keep:${PORTSDIR}/multimedia/gstreamer-plugins-core \ + ${X11BASE}/lib/gstreamer-0.8/libgstgconfelements.so:${PORTSDIR}/devel/gstreamer-plugins-gconf \ totem:${PORTSDIR}/multimedia/totem-gstreamer \ gnome-control-center:${PORTSDIR}/sysutils/gnomecontrolcenter2 \ ${X11BASE}/share/gnome/gnome-background-properties/gnome-branded.xml:${PORTSDIR}/x11-themes/gnome-backgrounds \ sound-juicer:${PORTSDIR}/audio/sound-juicer \ - ${X11BASE}/libdata/pkgconfig/libgtkhtml-2.0.pc:${PORTSDIR}/www/libgtkhtml + gnome-keyring-manager:${PORTSDIR}/security/gnomekeyringmanager \ + ${X11BASE}/libdata/pkgconfig/libgtkhtml-2.0.pc:${PORTSDIR}/www/libgtkhtml \ + evince:${PORTSDIR}/graphics/evince NO_BUILD= yes +.if !defined(GNOME_SLAVE) USE_PYTHON= yes +.endif -.if !defined(BATCH) && !defined(PACKAGE_BUILDING) +.if !defined(BATCH) && !defined(PACKAGE_BUILDING) && !defined(GNOME_SLAVE) pre-configure: @${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL .endif +.if !defined(GNOME_SLAVE) || ${.CURDIR:T}=="gnome2-lite" +OPTIONS= GNOME_SCREENSAVER "Use gnome-screensaver as screensaver app" off +.endif + do-install: # empty .include <bsd.port.pre.mk> +.if !defined(GNOME_SLAVE) .if ${ARCH} == "i386" || ${OSVERSION} > 500035 RUN_DEPENDS+= epiphany:${PORTSDIR}/www/epiphany .endif +.endif + +.if ${.CURDIR}==${MASTERDIR} || ${.CURDIR:T}=="gnome2-lite" +.if !defined(WITH_GNOME_SCREENSAVER) +RUN_DEPENDS+= ${X11BASE}/share/gnome/applications/gnome-screensaver-properties.desktop:${PORTSDIR}/x11/xscreensaver-gnome +.else +RUN_DEPENDS+= gnome-screensaver:${PORTSDIR}/x11/gnome-screensaver +.endif +.endif .include <bsd.port.post.mk> diff --git a/x11/gnomeapplets2/Makefile b/x11/gnomeapplets2/Makefile index 79b2c9131064..606142c11566 100644 --- a/x11/gnomeapplets2/Makefile +++ b/x11/gnomeapplets2/Makefile @@ -3,14 +3,15 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/x11/gnomeapplets2/Makefile,v 1.94 2005/10/08 19:41:40 marcus Exp $ # PORTNAME= gnomeapplets2 -PORTVERSION= 2.10.1 -PORTREVISION= 3 +PORTVERSION= 2.12.1 +PORTREVISION= 1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-applets/2.10 +MASTER_SITE_SUBDIR= sources/gnome-applets/2.12 DISTNAME= gnome-applets-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -28,10 +29,11 @@ USE_X_PREFIX= yes USE_GMAKE= yes GNOME_DESKTOP_VERSION=2 INSTALLS_OMF= yes +INSTALLS_ICONS= yes USE_GNOME= gnomeprefix gnomehack intlhack gnomepanel \ - gail + gail gnomedocutils USE_GSTREAMER= yes -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" \ FREEBSD_SYS=${FREEBSD_SYS} @@ -52,22 +54,6 @@ PLIST_SUB= BATTERY="@comment " .else GCONF_SCHEMAS+= battstat.schemas PLIST_SUB= BATTERY="" - -.if ${OSVERSION} < 600019 -.if ${OSVERSION} < 503105 || ${OSVERSION} >= 600000 -pre-everything:: - @${ECHO_MSG} "" - @${ECHO_MSG} " W A R N I N G" - @${ECHO_MSG} "*****************************************************" - @${ECHO_MSG} "* gnomeapplets2 requires that you have your kernel *" - @${ECHO_MSG} "* sources installed. If your kernel sources *" - @${ECHO_MSG} "* are somewhere other than /usr/src/sys, you *" - @${ECHO_MSG} "* may set the FREEBSD_SYS variable to the *" - @${ECHO_MSG} "* correct path. *" - @${ECHO_MSG} "*****************************************************" - @${ECHO_MSG} "" -.endif -.endif .endif .if ${ARCH} != "i386" && ${ARCH} != "amd64" diff --git a/x11/gnomeapplets2/distinfo b/x11/gnomeapplets2/distinfo index 543fc30599f3..ad6838c15a4d 100644 --- a/x11/gnomeapplets2/distinfo +++ b/x11/gnomeapplets2/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-applets-2.10.1.tar.bz2) = da9cd75f77972c96eec9551d41878a7f -SIZE (gnome2/gnome-applets-2.10.1.tar.bz2) = 6250092 +MD5 (gnome2/gnome-applets-2.12.1.tar.bz2) = 06dd0b634d7092fa8af2ce302f68f912 +SIZE (gnome2/gnome-applets-2.12.1.tar.bz2) = 5369404 diff --git a/x11/gnomeapplets2/files/patch-aa b/x11/gnomeapplets2/files/patch-aa index 9e8038833e85..48b84e4569f6 100644 --- a/x11/gnomeapplets2/files/patch-aa +++ b/x11/gnomeapplets2/files/patch-aa @@ -1,15 +1,6 @@ ---- configure.orig Tue Mar 1 12:35:29 2005 -+++ configure Tue Mar 1 12:36:09 2005 -@@ -463,7 +463,7 @@ - # include <unistd.h> - #endif" - --ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XAM_RULE INTLTOOL_KBD_RULE INTLTOOL_XML_RULE INTLTOOL_XML_NOMERGE_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL INTLTOOL_ICONV INTLTOOL_MSGFMT INTLTOOL_MSGMERGE INTLTOOL_XGETTEXT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL PATH_TO_XRDB X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS WARN_CFLAGS PKG_CONFIG GAILUTIL_CFLAGS GAILUTIL_LIBS GNOME_APPLETS_CFLAGS GNOME_APPLETS_LIBS GNOME_LIBS2_CFLAGS GNOME_LIBS2_LIBS GNOME_VFS_APPLETS_CFLAGS GNOME_VFS_APPLETS_LIBS BUILD_GNOME_VFS_APPLETS_TRUE BUILD_GNOME_VFS_APPLETS_FALSE LIBGLADE_CFLAGS LIBGLADE_LIBS GDK_PIXBUF_CSOURCE GCONFTOOL GCONF_SCHEMA_CONFIG_SOURCE GCONF_SCHEMA_FILE_DIR GCONF_SCHEMAS_INSTALL_TRUE GCONF_SCHEMAS_INSTALL_FALSE XSLTPROC GTOP_APPLETS_CFLAGS GTOP_APPLETS_LIBS BUILD_GTOP_APPLETS_TRUE BUILD_GTOP_APPLETS_FALSE LIBXKLAVIER_CFLAGS LIBXKLAVIER_LIBS ENABLE_FLAGS_TRUE ENABLE_FLAGS_FALSE LIBWNCK_CFLAGS LIBWNCK_LIBS INCLUDE_GSWITCHIT_DEVEL_TRUE INCLUDE_GSWITCHIT_DEVEL_FALSE GETTEXT_PACKAGE GNOMELOCALEDIR USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS gnomelocaledir SCROLLKEEPER_CONFIG SCROLLKEEPER_REQUIRED JW HAVE_JW_TRUE HAVE_JW_FALSE HAVE_JW GKB_SUN_TRUE GKB_SUN_FALSE HAVE_LIBAPM NEED_LIBAPM HAVE_LIBAPM_TRUE HAVE_LIBAPM_FALSE NEED_LIBAPM_TRUE NEED_LIBAPM_FALSE BUILD_BATTSTAT_APPLET_TRUE BUILD_BATTSTAT_APPLET_FALSE MIXER_CFLAGS MIXER_LIBS APPLET_MIXER_TRUE APPLET_MIXER_FALSE GUCHARMAP_CFLAGS GUCHARMAP_LIBS APPLET_ACCESSX_TRUE APPLET_ACCESSX_FALSE APPLET_GSWITCHIT_TRUE APPLET_GSWITCHIT_FALSE SU_TOOL STB_SCRIPTS_DIR APPLET_MODEMLIGHTS_TRUE APPLET_MODEMLIGHTS_FALSE MODEMLIGHTS_LIBS CPUFREQ_SELECTOR_CFLAGS CPUFREQ_SELECTOR_LIBS BUILD_CPUFREQ_APPLET_TRUE BUILD_CPUFREQ_APPLET_FALSE BUILD_CPUFREQ_SELECTOR_TRUE BUILD_CPUFREQ_SELECTOR_FALSE CPUFREQ_SELECTOR_SUID_TRUE CPUFREQ_SELECTOR_SUID_FALSE ACLOCAL_AMFLAGS iconsdir pixmapsdir pkgdatadir gladedir GNOME_ICONDIR GNOME_PIXMAPSDIR GNOME_GLADEDIR DATADIR SYSCONFDIR LIBDIR PREFIX LIBOBJS LTLIBOBJS' -+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XAM_RULE INTLTOOL_KBD_RULE INTLTOOL_XML_RULE INTLTOOL_XML_NOMERGE_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL INTLTOOL_ICONV INTLTOOL_MSGFMT INTLTOOL_MSGMERGE INTLTOOL_XGETTEXT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL PATH_TO_XRDB X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS WARN_CFLAGS PKG_CONFIG GAILUTIL_CFLAGS GAILUTIL_LIBS GNOME_APPLETS_CFLAGS GNOME_APPLETS_LIBS GNOME_LIBS2_CFLAGS GNOME_LIBS2_LIBS GNOME_VFS_APPLETS_CFLAGS GNOME_VFS_APPLETS_LIBS BUILD_GNOME_VFS_APPLETS_TRUE BUILD_GNOME_VFS_APPLETS_FALSE LIBGLADE_CFLAGS LIBGLADE_LIBS GDK_PIXBUF_CSOURCE GCONFTOOL GCONF_SCHEMA_CONFIG_SOURCE GCONF_SCHEMA_FILE_DIR GCONF_SCHEMAS_INSTALL_TRUE GCONF_SCHEMAS_INSTALL_FALSE XSLTPROC GTOP_APPLETS_CFLAGS GTOP_APPLETS_LIBS BUILD_GTOP_APPLETS_TRUE BUILD_GTOP_APPLETS_FALSE LIBXKLAVIER_CFLAGS LIBXKLAVIER_LIBS ENABLE_FLAGS_TRUE ENABLE_FLAGS_FALSE LIBWNCK_CFLAGS LIBWNCK_LIBS INCLUDE_GSWITCHIT_DEVEL_TRUE INCLUDE_GSWITCHIT_DEVEL_FALSE GETTEXT_PACKAGE GNOMELOCALEDIR USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS gnomelocaledir SCROLLKEEPER_CONFIG SCROLLKEEPER_REQUIRED JW HAVE_JW_TRUE HAVE_JW_FALSE HAVE_JW GKB_SUN_TRUE GKB_SUN_FALSE ACPIINC HAVE_LIBAPM NEED_LIBAPM HAVE_LIBAPM_TRUE HAVE_LIBAPM_FALSE NEED_LIBAPM_TRUE NEED_LIBAPM_FALSE BUILD_BATTSTAT_APPLET_TRUE BUILD_BATTSTAT_APPLET_FALSE MIXER_CFLAGS MIXER_LIBS APPLET_MIXER_TRUE APPLET_MIXER_FALSE GUCHARMAP_CFLAGS GUCHARMAP_LIBS APPLET_ACCESSX_TRUE APPLET_ACCESSX_FALSE APPLET_GSWITCHIT_TRUE APPLET_GSWITCHIT_FALSE SU_TOOL STB_SCRIPTS_DIR APPLET_MODEMLIGHTS_TRUE APPLET_MODEMLIGHTS_FALSE MODEMLIGHTS_LIBS CPUFREQ_SELECTOR_CFLAGS CPUFREQ_SELECTOR_LIBS BUILD_CPUFREQ_APPLET_TRUE BUILD_CPUFREQ_APPLET_FALSE BUILD_CPUFREQ_SELECTOR_TRUE BUILD_CPUFREQ_SELECTOR_FALSE CPUFREQ_SELECTOR_SUID_TRUE CPUFREQ_SELECTOR_SUID_FALSE ACLOCAL_AMFLAGS iconsdir pixmapsdir pkgdatadir gladedir GNOME_ICONDIR GNOME_PIXMAPSDIR GNOME_GLADEDIR DATADIR SYSCONFDIR LIBDIR PREFIX LIBOBJS LTLIBOBJS' - ac_subst_files='' - - # Initialize some variables set by options. -@@ -23136,8 +23136,7 @@ +--- configure.orig Sat Jul 16 12:55:48 2005 ++++ configure Sat Jul 16 13:04:33 2005 +@@ -23272,8 +23272,7 @@ test "x$prefix" = xNONE && prefix="$ac_default_prefix" test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' @@ -19,30 +10,35 @@ GNOMELOCALEDIR="$ac_define_dir" -@@ -24838,6 +24837,7 @@ - - HAVE_LIBAPM=no - NEED_LIBAPM=no -+ACPIINC= - build_battstat_applet=no - - if test x$disable_battstat = xno; then -@@ -24989,7 +24989,12 @@ +@@ -25126,7 +25125,7 @@ ;; # list of supported OS cores that do not use libapm -- *-*-freebsd*|*-*-netbsd*|*-*-openbsd*) +- i386-*-freebsd*|*-*-netbsd*|*-*-openbsd*) + i386-*-freebsd*|amd64-*-freebsd*|*-*-netbsd*|*-*-openbsd*) -+ if [ -n "${FREEBSD_SYS}" ]; then -+ ACPIINC="-I${FREEBSD_SYS}" -+ else -+ ACPIINC="-I/usr/src/sys" -+ fi - ;; - *) - echo "warning: ${host} is not supported by battstat_applet, not building" >&2 -@@ -25795,6 +25800,9 @@ - *linux*) + if -n "${OS_SYS}" ; then + ACPIINC="-I${OS_SYS}" + else +@@ -25406,7 +25405,7 @@ + APPLET_MIXER_FALSE= + fi + +-if test x"$P_MIXER" == x"mixer"; then ++if test x"$P_MIXER" = x"mixer"; then + echo "$as_me:$LINENO: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + else +@@ -25983,7 +25982,7 @@ + fi + + +-if test "x$SU_TOOL" == "x" -o "x$HAVE_LIBUTIL" != "xtrue" -o "x$P_MODEMLIGHTS" != "xmodemlights"; then ++if test "x$SU_TOOL" = "x" -o "x$HAVE_LIBUTIL" != "xtrue" -o "x$P_MODEMLIGHTS" != "xmodemlights"; then + { echo "$as_me:$LINENO: WARNING: *** \`modemlights' applet will not be built ***" >&5 + echo "$as_me: WARNING: *** \`modemlights' applet will not be built ***" >&2;} + else +@@ -26119,6 +26118,9 @@ + echo "${ECHO_T}yes" >&6 build_cpufreq_applet=yes ;; + i386-*-freebsd*|amd64-*-freebsd*) @@ -51,7 +47,7 @@ *) echo "warning: ${host} is not supported by cpufreq applet, not building" >&2 build_cpufreq_applet=no -@@ -26085,7 +26093,7 @@ +@@ -26409,7 +26411,7 @@ ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}" @@ -60,7 +56,7 @@ pixmapsdir="${datadir}/pixmaps" -@@ -26099,8 +26107,7 @@ +@@ -26423,8 +26425,7 @@ test "x$prefix" = xNONE && prefix="$ac_default_prefix" test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' @@ -70,7 +66,7 @@ GNOME_ICONDIR="$ac_define_dir" -@@ -26112,8 +26119,7 @@ +@@ -26436,8 +26437,7 @@ test "x$prefix" = xNONE && prefix="$ac_default_prefix" test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' @@ -80,7 +76,7 @@ GNOME_PIXMAPSDIR="$ac_define_dir" -@@ -26125,8 +26131,7 @@ +@@ -26449,8 +26449,7 @@ test "x$prefix" = xNONE && prefix="$ac_default_prefix" test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' @@ -90,7 +86,7 @@ GNOME_GLADEDIR="$ac_define_dir" -@@ -26138,8 +26143,7 @@ +@@ -26462,8 +26461,7 @@ test "x$prefix" = xNONE && prefix="$ac_default_prefix" test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' @@ -100,7 +96,7 @@ DATADIR="$ac_define_dir" -@@ -26151,8 +26155,7 @@ +@@ -26475,8 +26473,7 @@ test "x$prefix" = xNONE && prefix="$ac_default_prefix" test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' @@ -110,7 +106,7 @@ SYSCONFDIR="$ac_define_dir" -@@ -26164,8 +26167,7 @@ +@@ -26488,8 +26485,7 @@ test "x$prefix" = xNONE && prefix="$ac_default_prefix" test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' @@ -120,7 +116,7 @@ LIBDIR="$ac_define_dir" -@@ -26177,8 +26179,7 @@ +@@ -26501,8 +26497,7 @@ test "x$prefix" = xNONE && prefix="$ac_default_prefix" test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' @@ -130,11 +126,3 @@ PREFIX="$ac_define_dir" -@@ -27311,6 +27312,7 @@ - s,@GKB_SUN_FALSE@,$GKB_SUN_FALSE,;t t - s,@HAVE_LIBAPM@,$HAVE_LIBAPM,;t t - s,@NEED_LIBAPM@,$NEED_LIBAPM,;t t -+s,@ACPIINC@,$ACPIINC,;t t - s,@HAVE_LIBAPM_TRUE@,$HAVE_LIBAPM_TRUE,;t t - s,@HAVE_LIBAPM_FALSE@,$HAVE_LIBAPM_FALSE,;t t - s,@NEED_LIBAPM_TRUE@,$NEED_LIBAPM_TRUE,;t t diff --git a/x11/gnomeapplets2/files/patch-battstat-acpi b/x11/gnomeapplets2/files/patch-battstat-acpi deleted file mode 100644 index 903e8b951d11..000000000000 --- a/x11/gnomeapplets2/files/patch-battstat-acpi +++ /dev/null @@ -1,576 +0,0 @@ ---- battstat/Makefile.in.orig Mon Jan 24 20:20:49 2005 -+++ battstat/Makefile.in Mon Jan 24 20:22:02 2005 -@@ -55,9 +55,10 @@ - PROGRAMS = $(libexec_PROGRAMS) - am_battstat_applet_2_OBJECTS = properties.$(OBJEXT) \ - battstat_applet.$(OBJEXT) power-management.$(OBJEXT) \ -- acpi-linux.$(OBJEXT) -+ acpi-freebsd.$(OBJEXT) acpi-linux.$(OBJEXT) - battstat_applet_2_OBJECTS = $(am_battstat_applet_2_OBJECTS) - am__DEPENDENCIES_1 = -+ACPIINC = @ACPIINC@ - @HAVE_LIBAPM_FALSE@@NEED_LIBAPM_TRUE@am__DEPENDENCIES_2 = \ - @HAVE_LIBAPM_FALSE@@NEED_LIBAPM_TRUE@ apmlib/libapm.a - battstat_applet_2_DEPENDENCIES = $(am__DEPENDENCIES_1) \ -@@ -66,6 +67,7 @@ - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/acpi-linux.Po \ -+@AMDEP_TRUE@ ./$(DEPDIR)/acpi-freebsd.Po \ - @AMDEP_TRUE@ ./$(DEPDIR)/battstat_applet.Po \ - @AMDEP_TRUE@ ./$(DEPDIR)/power-management.Po \ - @AMDEP_TRUE@ ./$(DEPDIR)/properties.Po -@@ -336,6 +338,7 @@ - $(GNOME_APPLETS_CFLAGS) \ - $(LIBGLADE_CFLAGS) \ - $(APMINC) \ -+ $(ACPIINC) \ - -DG_LOG_DOMAIN=\"battstat_applet\" - - battstat_applet_2_SOURCES = \ -@@ -345,7 +348,9 @@ - battstat_applet.c \ - power-management.c \ - acpi-linux.c \ -- acpi-linux.h -+ acpi-linux.h \ -+ acpi-freebsd.c \ -+ acpi-freebsd.h - - battstat_applet_2_LDADD = \ - $(GNOME_APPLETS_LIBS) \ -@@ -439,6 +444,7 @@ - -rm -f *.tab.c - - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acpi-linux.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acpi-freebsd.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/battstat_applet.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/power-management.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/properties.Po@am__quote@ ---- battstat/battstat_applet.c.orig Mon Jan 24 12:51:51 2005 -+++ battstat/battstat_applet.c Mon Jan 24 20:20:50 2005 -@@ -953,6 +953,7 @@ - "Seth Nickell <snickell@stanford.edu> (GNOME2 port)", - "Davyd Madeley <davyd@madeley.id.au>", - "Ryan Lortie <desrt@desrt.ca>", -+ "Joe Marcus Clarke <marcus@FreeBSD.org> (FreeBSD ACPI support)", - NULL - }; - ---- battstat/properties.c.orig Fri Jan 14 23:38:18 2005 -+++ battstat/properties.c Mon Mar 14 19:49:26 2005 -@@ -27,7 +27,7 @@ - - #include <stdio.h> - --#ifdef __FreeBSD__ -+#if defined(__FreeBSD__) && defined(__i386__) - #include <machine/apm_bios.h> - #elif defined(__NetBSD__) || defined(__OpenBSD__) - #include <sys/param.h> -@@ -61,6 +61,9 @@ - #include <panel-applet-gconf.h> - /*#include <status-docklet.h>*/ - -+#if defined(__FreeBSD__) && !defined(__i386__) -+#include "acpi-freebsd.h" -+#endif - #include "battstat.h" - - #ifndef gettext_noop ---- battstat/acpi-freebsd.c.orig Sun Jul 3 16:00:01 2005 -+++ battstat/acpi-freebsd.c Sun Jul 3 16:23:26 2005 -@@ -0,0 +1,280 @@ -+/* battstat A GNOME battery meter for laptops. -+ * Copyright (C) 2000 by Jörgen Pehrson <jp@spektr.eu.org> -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA. -+ * -+ $Id: patch-battstat-acpi,v 1.13 2005/02/28 08:02:03 marcus Exp $ -+ */ -+ -+/* -+ * ACPI battery functions for FreeBSD >= 5.2. -+ * September 2004 by Joe Marcus Clarke <marcus@FreeBSD.org> -+ */ -+ -+#ifdef HAVE_CONFIG_H -+#include <config.h> -+#endif -+ -+#ifdef __FreeBSD__ -+ -+#include <stdio.h> -+#include <sys/types.h> -+#include <sys/socket.h> -+#include <sys/sysctl.h> -+#include <sys/un.h> -+#include <sys/ioctl.h> -+#if defined(__i386__) -+#include <machine/apm_bios.h> -+#endif -+#include <stdlib.h> -+#include <errno.h> -+#include <unistd.h> -+#include <fcntl.h> -+#include <glib.h> -+ -+#include <dev/acpica/acpiio.h> -+ -+#include "acpi-freebsd.h" -+ -+static gboolean -+update_ac_info(struct acpi_info * acpiinfo) -+{ -+ int acline; -+ size_t len = sizeof(acline); -+ -+ acpiinfo->ac_online = FALSE; -+ -+ if (sysctlbyname(ACPI_ACLINE, &acline, &len, NULL, 0) == -1) { -+ return FALSE; -+ } -+ -+ acpiinfo->ac_online = acline ? TRUE : FALSE; -+ -+ return TRUE; -+} -+ -+static gboolean -+update_battery_info(struct acpi_info * acpiinfo) -+{ -+ union acpi_battery_ioctl_arg battio; -+ int i; -+ -+ /* We really don't have to do this here. All of the relevant battery -+ * info can be obtained through sysctl. However, one day, the rate -+ * may be useful to get time left to full charge. -+ */ -+ -+ for(i = BATT_MIN; i < BATT_MAX; i++) { -+ battio.unit = i; -+ if (ioctl(acpiinfo->acpifd, ACPIIO_CMBAT_GET_BIF, &battio) == -1) { -+ continue; -+ } -+ -+ acpiinfo->max_capacity += battio.bif.lfcap; -+ acpiinfo->low_capacity += battio.bif.wcap; -+ acpiinfo->critical_capacity += battio.bif.lcap; -+ } -+ -+ return TRUE; -+} -+ -+gboolean -+acpi_freebsd_init(struct acpi_info * acpiinfo) -+{ -+ int acpi_fd; -+ int event_fd; -+ -+ g_assert(acpiinfo); -+ -+ if (acpiinfo->acpifd == -1) { -+ acpi_fd = open(ACPIDEV, O_RDONLY); -+ if (acpi_fd >= 0) { -+ acpiinfo->acpifd = acpi_fd; -+ } -+ else { -+ acpiinfo->acpifd = -1; -+ return FALSE; -+ } -+ } -+ -+ event_fd = socket(PF_UNIX, SOCK_STREAM, 0); -+ if (event_fd >= 0) { -+ struct sockaddr_un addr; -+ addr.sun_family = AF_UNIX; -+ strcpy(addr.sun_path, "/var/run/devd.pipe"); -+ if (connect(event_fd, (struct sockaddr *) &addr, sizeof(addr)) == 0) { -+ acpiinfo->event_fd = event_fd; -+ acpiinfo->event_inited = TRUE; -+ acpiinfo->channel = g_io_channel_unix_new(event_fd); -+ } -+ else { -+ close(event_fd); -+ acpiinfo->event_fd = -1; -+ acpiinfo->event_inited = FALSE; -+ } -+ } -+ -+ update_battery_info(acpiinfo); -+ update_ac_info(acpiinfo); -+ -+ return TRUE; -+} -+ -+#define ACPI_EVENT_IGNORE 0 -+#define ACPI_EVENT_AC 1 -+#define ACPI_EVENT_BATTERY_INFO 2 -+ -+static int parse_acpi_event(GString *buffer) -+{ -+ if (strstr(buffer->str, "system=ACPI")) { -+ if (strstr(buffer->str, "subsystem=ACAD")) -+ return ACPI_EVENT_AC; -+ if (strstr(buffer->str, "subsystem=CMBAT")) -+ return ACPI_EVENT_BATTERY_INFO; -+ } -+ -+ return ACPI_EVENT_IGNORE; -+} -+ -+void acpi_freebsd_update(struct acpi_info *acpiinfo) -+{ -+ /* XXX This is needed for systems where devd does not have permissions -+ * to allow for event-driven updates. -+ */ -+ update_ac_info(acpiinfo); -+ update_battery_info(acpiinfo); -+} -+ -+gboolean acpi_process_event(struct acpi_info *acpiinfo, gboolean *read_error) -+{ -+ gsize i; -+ int evt; -+ gboolean result = FALSE; -+ GString *buffer; -+ GIOStatus stat; -+ buffer = g_string_new(NULL); -+ -+ *read_error = FALSE; -+ stat = g_io_channel_read_line_string(acpiinfo->channel, buffer, &i, NULL); -+ -+ if (stat == G_IO_STATUS_ERROR || stat == G_IO_STATUS_EOF) { -+ *read_error = TRUE; -+ g_string_free(buffer, TRUE); -+ return FALSE; -+ } -+ -+ evt = parse_acpi_event(buffer); -+ switch (evt) { -+ case ACPI_EVENT_AC: -+ update_ac_info(acpiinfo); -+ result = TRUE; -+ break; -+ case ACPI_EVENT_BATTERY_INFO: -+ update_battery_info(acpiinfo); -+ result = TRUE; -+ break; -+ } -+ -+ g_string_free(buffer, TRUE); -+ return result; -+} -+ -+void -+acpi_freebsd_cleanup(struct acpi_info * acpiinfo) -+{ -+ g_assert(acpiinfo); -+ -+ if (acpiinfo->acpifd >= 0) { -+ close(acpiinfo->acpifd); -+ acpiinfo->acpifd = -1; -+ } -+ -+ if (acpiinfo->event_fd >= 0) { -+ g_io_channel_unref(acpiinfo->channel); -+ close(acpiinfo->event_fd); -+ acpiinfo->event_fd = -1; -+ } -+} -+ -+gboolean -+acpi_freebsd_read(struct apm_info *apminfo, struct acpi_info * acpiinfo) -+{ -+ int time; -+ int life; -+ int acline; -+ int state; -+ size_t len; -+ int rate; -+ int remain; -+ union acpi_battery_ioctl_arg battio; -+ gboolean charging; -+ int i; -+ -+ g_assert(acpiinfo); -+ -+ charging = FALSE; -+ -+ for(i = BATT_MIN; i < BATT_MAX; i++) { -+ battio.unit = i; -+ if (ioctl(acpiinfo->acpifd, ACPIIO_CMBAT_GET_BST, &battio) == -1) { -+ continue; -+ } -+ -+ remain += battio.bst.cap; -+ rate += battio.bst.rate; -+ } -+ -+ len = sizeof(time); -+ if (sysctlbyname(ACPI_TIME, &time, &len, NULL, 0) == -1) { -+ return FALSE; -+ } -+ -+ len = sizeof(life); -+ if (sysctlbyname(ACPI_LIFE, &life, &len, NULL, 0) == -1) { -+ return FALSE; -+ } -+ -+ len = sizeof(state); -+ if (sysctlbyname(ACPI_STATE, &state, &len, NULL, 0) == -1) { -+ return FALSE; -+ } -+ -+ apminfo->ai_acline = acpiinfo->ac_online ? 1 : 0; -+ if (state & ACPI_BATT_STAT_CHARGING) { -+ apminfo->ai_batt_stat = 3; -+ charging = TRUE; -+ } -+ else if (state & ACPI_BATT_STAT_CRITICAL) { -+ /* Add a special check here since FreeBSD's ACPI interface will tell us -+ * when the battery is critical. -+ */ -+ apminfo->ai_batt_stat = 2; -+ } -+ else { -+ apminfo->ai_batt_stat = remain < acpiinfo->low_capacity ? 1 : remain < acpiinfo->critical_capacity ? 2 : 0; -+ } -+ apminfo->ai_batt_life = life; -+ if (!charging) { -+ apminfo->ai_batt_time = time; -+ } -+ else if (charging && rate > 0) { -+ apminfo->ai_batt_time = (int) ((acpiinfo->max_capacity-remain)/(float)rate); -+ } -+ else -+ apminfo->ai_batt_time = -1; -+ -+ return TRUE; -+} -+#endif ---- battstat/acpi-freebsd.h.orig Sun Jul 3 16:00:01 2005 -+++ battstat/acpi-freebsd.h Sun Jul 3 16:23:56 2005 -@@ -0,0 +1,60 @@ -+/* -+ * Copyright (C) 2004 by Joe Marcus Clarke <marcus@FreeBSD.org> -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA. -+ */ -+ -+#ifndef __ACPI_FREEBSD_H__ -+#define __ACPI_FREEBSD_H__ -+ -+#define ACPIDEV "/dev/acpi" -+ -+#define BATT_MIN 0 -+#define BATT_MAX 64 -+ -+#define ACPI_ACLINE "hw.acpi.acline" -+#define ACPI_TIME "hw.acpi.battery.time" -+#define ACPI_LIFE "hw.acpi.battery.life" -+#define ACPI_STATE "hw.acpi.battery.state" -+ -+/* XXX: AMD64 does not have machine/apm_bios.h. */ -+#if !defined(__i386__) -+struct apm_info { -+ guint ai_acline; -+ guint ai_batt_stat; -+ guint ai_batt_life; -+ int ai_batt_time; -+ guint ai_status; -+}; -+#endif -+ -+struct acpi_info { -+ gboolean ac_online; -+ gboolean event_inited; -+ int acpifd; -+ int event_fd; -+ int max_capacity; -+ int low_capacity; -+ int critical_capacity; -+ GIOChannel * channel; -+}; -+ -+gboolean acpi_freebsd_read(struct apm_info *apminfo, struct acpi_info * acpiinfo); -+void acpi_freebsd_update(struct acpi_info * acpiinfo); -+gboolean acpi_process_event(struct acpi_info * acpiinfo, gboolean *read_error); -+gboolean acpi_freebsd_init(struct acpi_info * acpiinfo); -+void acpi_freebsd_cleanup(struct acpi_info * acpiinfo); -+ -+#endif /* __ACPI_FREEBSD_H__ */ ---- battstat/power-management.c.orig Sun Mar 20 05:20:55 2005 -+++ battstat/power-management.c Sun Jul 3 16:21:42 2005 -@@ -73,12 +73,42 @@ static int pm_initialised; - * the problem might be. This error message is not to be freed. - */ - --#ifdef __FreeBSD__ -- -+#if defined(__FreeBSD__) -+#if defined(__i386__) - #include <machine/apm_bios.h> -+#endif -+#include "acpi-freebsd.h" -+ -+static struct acpi_info acpiinfo; -+static gboolean using_acpi; -+static int acpi_count; -+static int acpiwatch; -+static struct apm_info apminfo; -+ -+gboolean acpi_freebsd_read(struct apm_info *apminfo, struct acpi_info *acpiinfo); - - #define APMDEVICE "/dev/apm" - -+static gboolean acpi_callback (GIOChannel * chan, GIOCondition cond, gpointer data) -+{ -+ gboolean read_error; -+ -+ if (cond & (G_IO_ERR | G_IO_HUP)) { -+ acpi_freebsd_cleanup(&acpiinfo); -+ return FALSE; -+ } -+ -+ if (acpi_process_event(&acpiinfo, &read_error)) { -+ acpi_freebsd_read(&apminfo, &acpiinfo); -+ } -+ else if (read_error) { -+ acpi_freebsd_cleanup(&acpiinfo); -+ return FALSE; -+ } -+ -+ return TRUE; -+} -+ - static const char * - apm_readinfo (BatteryStatus *status) - { -@@ -86,32 +116,56 @@ apm_readinfo (BatteryStatus *status) - FreeBSD. Each time this functions is called (once every second) - the APM device is opened, read from and then closed. - */ -- struct apm_info apminfo; - int fd; - - if (DEBUG) g_print("apm_readinfo() (FreeBSD)\n"); - -- fd = open(APMDEVICE, O_RDONLY); -- if (fd == -1) -- { -- pm_initialised = 0; -- return ERR_OPEN_APMDEV; -+ if (using_acpi && (!acpiinfo.event_inited || acpiinfo.event_fd >= 0)) { -+ if (acpi_count <= 0) { -+ acpi_count = 30; -+ if (!acpiinfo.event_inited) { -+ acpi_freebsd_update(&acpiinfo); -+ } -+ acpi_freebsd_read(&apminfo, &acpiinfo); -+ } -+ acpi_count--; -+ } -+ else if (using_acpi && acpiinfo.event_inited) { -+ if (acpi_freebsd_init(&acpiinfo)) { -+ acpiwatch = g_io_add_watch (acpiinfo.channel, -+ G_IO_IN | G_IO_ERR | G_IO_HUP, -+ acpi_callback, NULL); -+ acpi_freebsd_read(&apminfo, &acpiinfo); -+ } - } -+ else { -+#if defined(__i386__) -+ fd = open(APMDEVICE, O_RDONLY); -+ if (fd == -1) { -+ return ERR_OPEN_APMDEV; -+ } - -- if (ioctl(fd, APMIO_GETINFO, &apminfo) == -1) -- err(1, "ioctl(APMIO_GETINFO)"); -+ if (ioctl(fd, APMIO_GETINFO, &apminfo) == -1) -+ err(1, "ioctl(APMIO_GETINFO)"); - -- close(fd); -+ close(fd); - -- if(apminfo.ai_status == 0) -- return ERR_APM_E; -+ if(apminfo.ai_status == 0) -+ return ERR_APM_E; -+#else -+ return ERR_OPEN_APMDEV; -+#endif -+ } - - status->present = TRUE; - status->on_ac_power = apminfo.ai_acline ? 1 : 0; - status->state = apminfo.ai_batt_stat; - status->percent = apminfo.ai_batt_life; - status->charging = (status->state == 3) ? TRUE : FALSE; -- status->minutes = apminfo.ai_batt_time; -+ if (using_acpi) -+ status->minutes = apminfo.ai_batt_time; -+ else -+ status->minutes = (int) (apminfo.ai_batt_time/60.0); - - return NULL; - } -@@ -339,6 +393,19 @@ power_management_initialise( void ) - G_IO_IN | G_IO_ERR | G_IO_HUP, - acpi_callback, NULL); - } -+#elif defined(__FreeBSD__) -+ if (acpi_freebsd_init(&acpiinfo)) { -+ using_acpi = TRUE; -+ acpi_count = 0; -+ } -+ else -+ using_acpi = FALSE; -+ -+ if (using_acpi && acpiinfo.event_fd >= 0) { -+ acpiwatch = g_io_add_watch (acpiinfo.channel, -+ G_IO_IN | G_IO_ERR | G_IO_HUP, -+ acpi_callback, NULL); -+ } - #endif - pm_initialised = 1; - -@@ -360,6 +427,13 @@ power_management_cleanup( void ) - g_source_remove(acpiwatch); - acpiwatch = 0; - acpi_linux_cleanup(&acpiinfo); -+ } -+#elif defined(__FreeBSD__) -+ if (using_acpi) { -+ if (acpiwatch != 0) -+ g_source_remove(acpiwatch); -+ acpiwatch = 0; -+ acpi_freebsd_cleanup(&acpiinfo); - } - #endif - diff --git a/x11/gnomeapplets2/files/patch-battstat_acpi-freebsd.c b/x11/gnomeapplets2/files/patch-battstat_acpi-freebsd.c new file mode 100644 index 000000000000..48746fa03bbd --- /dev/null +++ b/x11/gnomeapplets2/files/patch-battstat_acpi-freebsd.c @@ -0,0 +1,152 @@ +--- battstat/acpi-freebsd.c.orig Sun Jul 3 16:41:26 2005 ++++ battstat/acpi-freebsd.c Sun Jul 3 16:49:55 2005 +@@ -31,9 +31,13 @@ + + #include <stdio.h> + #include <sys/types.h> ++#include <sys/socket.h> + #include <sys/sysctl.h> ++#include <sys/un.h> + #include <sys/ioctl.h> ++#if defined(__i386__) + #include <machine/apm_bios.h> ++#endif + #include <stdlib.h> + #include <errno.h> + #include <unistd.h> +@@ -92,16 +96,36 @@ gboolean + acpi_freebsd_init(struct acpi_info * acpiinfo) + { + int acpi_fd; ++ int event_fd; + + g_assert(acpiinfo); + +- acpi_fd = open(ACPIDEV, O_RDONLY); +- if (acpi_fd >= 0) { +- acpiinfo->acpifd = acpi_fd; ++ if (acpiinfo->acpifd == -1) { ++ acpi_fd = open(ACPIDEV, O_RDONLY); ++ if (acpi_fd >= 0) { ++ acpiinfo->acpifd = acpi_fd; ++ } ++ else { ++ acpiinfo->acpifd = -1; ++ return FALSE; ++ } + } +- else { +- acpiinfo->acpifd = -1; +- return FALSE; ++ ++ event_fd = socket(PF_UNIX, SOCK_STREAM, 0); ++ if (event_fd >= 0) { ++ struct sockaddr_un addr; ++ addr.sun_family = AF_UNIX; ++ strcpy(addr.sun_path, "/var/run/devd.pipe"); ++ if (connect(event_fd, (struct sockaddr *) &addr, sizeof(addr)) == 0) { ++ acpiinfo->event_fd = event_fd; ++ acpiinfo->event_inited = TRUE; ++ acpiinfo->channel = g_io_channel_unix_new(event_fd); ++ } ++ else { ++ close(event_fd); ++ acpiinfo->event_fd = -1; ++ acpiinfo->event_inited = FALSE; ++ } + } + + update_battery_info(acpiinfo); +@@ -110,6 +134,65 @@ acpi_freebsd_init(struct acpi_info * acp + return TRUE; + } + ++#define ACPI_EVENT_IGNORE 0 ++#define ACPI_EVENT_AC 1 ++#define ACPI_EVENT_BATTERY_INFO 2 ++ ++static int parse_acpi_event(GString *buffer) ++{ ++ if (strstr(buffer->str, "system=ACPI")) { ++ if (strstr(buffer->str, "subsystem=ACAD")) ++ return ACPI_EVENT_AC; ++ if (strstr(buffer->str, "subsystem=CMBAT")) ++ return ACPI_EVENT_BATTERY_INFO; ++ } ++ ++ return ACPI_EVENT_IGNORE; ++} ++ ++void acpi_freebsd_update(struct acpi_info *acpiinfo) ++{ ++ /* XXX This is needed for systems where devd does not have permissions ++ * to allow for event-driven updates. ++ */ ++ update_ac_info(acpiinfo); ++ update_battery_info(acpiinfo); ++} ++ ++gboolean acpi_process_event(struct acpi_info *acpiinfo, gboolean *read_error) ++{ ++ gsize i; ++ int evt; ++ gboolean result = FALSE; ++ GString *buffer; ++ GIOStatus stat; ++ buffer = g_string_new(NULL); ++ ++ *read_error = FALSE; ++ stat = g_io_channel_read_line_string(acpiinfo->channel, buffer, &i, NULL); ++ ++ if (stat == G_IO_STATUS_ERROR || stat == G_IO_STATUS_EOF) { ++ *read_error = TRUE; ++ g_string_free(buffer, TRUE); ++ return FALSE; ++ } ++ ++ evt = parse_acpi_event(buffer); ++ switch (evt) { ++ case ACPI_EVENT_AC: ++ update_ac_info(acpiinfo); ++ result = TRUE; ++ break; ++ case ACPI_EVENT_BATTERY_INFO: ++ update_battery_info(acpiinfo); ++ result = TRUE; ++ break; ++ } ++ ++ g_string_free(buffer, TRUE); ++ return result; ++} ++ + void + acpi_freebsd_cleanup(struct acpi_info * acpiinfo) + { +@@ -119,21 +202,12 @@ acpi_freebsd_cleanup(struct acpi_info * + close(acpiinfo->acpifd); + acpiinfo->acpifd = -1; + } +-} + +-/* XXX This is a hack since user-land applications can't get ACPI events yet. +- * Devd provides this (or supposedly provides this), but you need to be +- * root to access devd. +- */ +-gboolean +-acpi_process_event(struct acpi_info * acpiinfo) +-{ +- g_assert(acpiinfo); +- +- update_ac_info(acpiinfo); +- update_battery_info(acpiinfo); +- +- return TRUE; ++ if (acpiinfo->event_fd >= 0) { ++ g_io_channel_unref(acpiinfo->channel); ++ close(acpiinfo->event_fd); ++ acpiinfo->event_fd = -1; ++ } + } + + gboolean diff --git a/x11/gnomeapplets2/files/patch-battstat_acpi-freebsd.h b/x11/gnomeapplets2/files/patch-battstat_acpi-freebsd.h new file mode 100644 index 000000000000..918cd59eb241 --- /dev/null +++ b/x11/gnomeapplets2/files/patch-battstat_acpi-freebsd.h @@ -0,0 +1,78 @@ +--- battstat/acpi-freebsd.h.orig Sun Jul 3 16:50:22 2005 ++++ battstat/acpi-freebsd.h Sun Jul 3 16:54:14 2005 +@@ -29,61 +29,31 @@ + #define ACPI_LIFE "hw.acpi.battery.life" + #define ACPI_STATE "hw.acpi.battery.state" + +-struct acpi_info { +- gboolean ac_online; +- int acpifd; +- int max_capacity; +- int low_capacity; +- int critical_capacity; ++/* XXX: AMD64 does not have machine/apm_bios.h. */ ++#if !defined(__i386__) ++struct apm_info { ++ guint ai_acline; ++ guint ai_batt_stat; ++ guint ai_batt_life; ++ int ai_batt_time; ++ guint ai_status; + }; +- +-gboolean acpi_freebsd_read(struct apm_info *apminfo, struct acpi_info * acpiinfo); +-gboolean acpi_process_event(struct acpi_info * acpiinfo); +-gboolean acpi_freebsd_init(struct acpi_info * acpiinfo); +-void acpi_freebsd_cleanup(struct acpi_info * acpiinfo); +- +-#endif /* __ACPI_FREEBSD_H__ */ +-/* +- * Copyright (C) 2004 by Joe Marcus Clarke <marcus@FreeBSD.org> +- * +- * This program is free software; you can redistribute it and/or modify +- * it under the terms of the GNU General Public License as published by +- * the Free Software Foundation; either version 2 of the License, or +- * (at your option) any later version. +- * +- * This program is distributed in the hope that it will be useful, +- * but WITHOUT ANY WARRANTY; without even the implied warranty of +- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- * GNU General Public License for more details. +- * +- * You should have received a copy of the GNU General Public License +- * along with this program; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA. +- */ +- +-#ifndef __ACPI_FREEBSD_H__ +-#define __ACPI_FREEBSD_H__ +- +-#define ACPIDEV "/dev/acpi" +- +-#define BATT_MIN 0 +-#define BATT_MAX 64 +- +-#define ACPI_ACLINE "hw.acpi.acline" +-#define ACPI_TIME "hw.acpi.battery.time" +-#define ACPI_LIFE "hw.acpi.battery.life" +-#define ACPI_STATE "hw.acpi.battery.state" ++#endif + + struct acpi_info { + gboolean ac_online; ++ gboolean event_inited; + int acpifd; ++ int event_fd; + int max_capacity; + int low_capacity; + int critical_capacity; ++ GIOChannel * channel; + }; + + gboolean acpi_freebsd_read(struct apm_info *apminfo, struct acpi_info * acpiinfo); +-gboolean acpi_process_event(struct acpi_info * acpiinfo); ++void acpi_freebsd_update(struct acpi_info * acpiinfo); ++gboolean acpi_process_event(struct acpi_info * acpiinfo, gboolean *read_error); + gboolean acpi_freebsd_init(struct acpi_info * acpiinfo); + void acpi_freebsd_cleanup(struct acpi_info * acpiinfo); + diff --git a/x11/gnomeapplets2/files/patch-battstat_battstat.schemas.in b/x11/gnomeapplets2/files/patch-battstat_battstat.schemas.in deleted file mode 100644 index a6bed2361540..000000000000 --- a/x11/gnomeapplets2/files/patch-battstat_battstat.schemas.in +++ /dev/null @@ -1,11 +0,0 @@ ---- battstat/battstat.schemas.in.orig Fri Oct 1 16:22:39 2004 -+++ battstat/battstat.schemas.in Fri Oct 1 16:22:46 2004 -@@ -115,7 +115,7 @@ - <key>/schemas/apps/battstat-applet/prefs/suspend_command</key> - <owner>battstat-applet</owner> - <type>string</type> -- <default>/usr/bin/apm -s</default> -+ <default>/usr/sbin/zzz</default> - <locale name="C"> - <short>Suspend Command</short> - <long>Command to send to suspend the computer</long> diff --git a/x11/gnomeapplets2/files/patch-battstat_battstat_applet.c b/x11/gnomeapplets2/files/patch-battstat_battstat_applet.c new file mode 100644 index 000000000000..a95b7b569a09 --- /dev/null +++ b/x11/gnomeapplets2/files/patch-battstat_battstat_applet.c @@ -0,0 +1,21 @@ +--- battstat/battstat_applet.c.orig Fri Aug 19 22:13:49 2005 ++++ battstat/battstat_applet.c Tue Aug 23 20:37:13 2005 +@@ -430,14 +430,14 @@ battery_full_notify (GtkWidget *applet) + static void + battery_full_dialog (GtkWidget *applet) + { +- /* first attempt to use libnotify */ +- if (battery_full_notify (applet)) +- return; +- + GtkWidget *dialog, *hbox, *image, *label; + GdkPixbuf *pixbuf; + + gchar *new_label; ++ /* first attempt to use libnotify */ ++ if (battery_full_notify (applet)) ++ return; ++ + dialog = gtk_dialog_new_with_buttons ( + _("Battery Notice"), + NULL, diff --git a/x11/gnomeapplets2/files/patch-battstat_power-management.c b/x11/gnomeapplets2/files/patch-battstat_power-management.c new file mode 100644 index 000000000000..9cea2d65b8fb --- /dev/null +++ b/x11/gnomeapplets2/files/patch-battstat_power-management.c @@ -0,0 +1,123 @@ +--- battstat/power-management.c.orig Thu Aug 25 23:45:47 2005 ++++ battstat/power-management.c Tue Aug 30 01:28:40 2005 +@@ -61,9 +61,7 @@ + + static const char *apm_readinfo (BatteryStatus *status); + static int pm_initialised; +-#ifdef HAVE_HAL +-static int using_hal; +-#endif ++static int using_hal = FALSE; + + /* + * What follows is a series of platform-specific apm_readinfo functions +@@ -173,16 +171,40 @@ apm_readinfo (BatteryStatus *status) + + #elif __FreeBSD__ + ++#if defined(__i386__) + #include <machine/apm_bios.h> ++#endif + #include "acpi-freebsd.h" + + static struct acpi_info acpiinfo; + static gboolean using_acpi; + static int acpi_count; ++static int acpiwatch; + static struct apm_info apminfo; + ++gboolean acpi_freebsd_read(struct apm_info *apminfo, struct acpi_info *acpiinfo); ++ + #define APMDEVICE "/dev/apm" + ++static gboolean acpi_callback (GIOChannel * chan, GIOCondition cond, gpointer data) ++{ ++ gboolean read_error; ++ if (cond & (G_IO_ERR | G_IO_HUP)) { ++ acpi_freebsd_cleanup(&acpiinfo); ++ return FALSE; ++ } ++ ++ if (acpi_process_event(&acpiinfo, &read_error)) { ++ acpi_freebsd_read(&apminfo, &acpiinfo); ++ } ++ else if (read_error) { ++ acpi_freebsd_cleanup(&acpiinfo); ++ return FALSE; ++ } ++ ++ return TRUE; ++} ++ + static const char * + apm_readinfo (BatteryStatus *status) + { +@@ -190,21 +212,27 @@ apm_readinfo (BatteryStatus *status) + + if (DEBUG) g_print("apm_readinfo() (FreeBSD)\n"); + +- if (using_acpi) { ++ if (using_acpi && (!acpiinfo.event_inited || acpiinfo.event_fd >= 0)) { + if (acpi_count <= 0) { + acpi_count = 30; +- acpi_process_event(&acpiinfo); ++ if (!acpiinfo.event_inited) { ++ acpi_freebsd_update(&acpiinfo); ++ } + if (acpi_freebsd_read(&apminfo, &acpiinfo) == FALSE) + return ERR_FREEBSD_ACPI; + } + acpi_count--; + } +- else +- { +- /* This is how I read the information from the APM subsystem under +- FreeBSD. Each time this functions is called (once every second) +- the APM device is opened, read from and then closed. +- */ ++ else if (using_acpi && acpiinfo.event_inited) { ++ if (acpi_freebsd_init(&acpiinfo)) { ++ acpiwatch = g_io_add_watch (acpiinfo.channel, ++ G_IO_IN | G_IO_ERR | G_IO_HUP, ++ acpi_callback, NULL); ++ acpi_freebsd_read(&apminfo, &acpiinfo); ++ } ++ } ++ else { ++#if defined(__i386__) + fd = open(APMDEVICE, O_RDONLY); + if (fd == -1) { + return ERR_OPEN_APMDEV; +@@ -217,6 +245,9 @@ apm_readinfo (BatteryStatus *status) + + if(apminfo.ai_status == 0) + return ERR_APM_E; ++#else ++ return ERR_OPEN_APMDEV; ++#endif + } + + status->present = TRUE; +@@ -480,6 +511,12 @@ power_management_initialise( int no_hal + } + else + using_acpi = FALSE; ++ ++ if (using_acpi && acpiinfo.event_fd >= 0) { ++ acpiwatch = g_io_add_watch (acpiinfo.channel, ++ G_IO_IN | G_IO_ERR | G_IO_HUP, ++ acpi_callback, NULL); ++ } + #endif + pm_initialised = 1; + +@@ -513,6 +550,9 @@ power_management_cleanup( void ) + } + #elif defined(__FreeBSD__) + if (using_acpi) { ++ if (acpiwatch != 0) ++ g_source_remove(acpiwatch); ++ acpiwatch = 0; + acpi_freebsd_cleanup(&acpiinfo); + } + #endif diff --git a/x11/gnomeapplets2/files/patch-cpufreq-freebsd b/x11/gnomeapplets2/files/patch-cpufreq-freebsd index 48f2ebb6c5b1..4bed0298db89 100644 --- a/x11/gnomeapplets2/files/patch-cpufreq-freebsd +++ b/x11/gnomeapplets2/files/patch-cpufreq-freebsd @@ -1,37 +1,3 @@ ---- cpufreq/src/Makefile.in.orig Sun Feb 13 01:00:35 2005 -+++ cpufreq/src/Makefile.in Sun Feb 13 01:01:31 2005 -@@ -55,6 +55,7 @@ - cpufreq-prefs.$(OBJEXT) cpufreq-popup.$(OBJEXT) \ - cpufreq-monitor.$(OBJEXT) cpufreq-monitor-factory.$(OBJEXT) \ - cpufreq-monitor-procfs.$(OBJEXT) \ -+ cpufreq-monitor-sysctl.$(OBJEXT) \ - cpufreq-monitor-sysfs.$(OBJEXT) \ - cpufreq-monitor-cpuinfo.$(OBJEXT) - cpufreq_applet_OBJECTS = $(am_cpufreq_applet_OBJECTS) -@@ -68,6 +69,7 @@ - @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-monitor-cpuinfo.Po \ - @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-monitor-factory.Po \ - @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-monitor-procfs.Po \ -+@AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-monitor-sysctl.Po \ - @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-monitor-sysfs.Po \ - @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-monitor.Po \ - @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-popup.Po \ -@@ -336,6 +338,7 @@ - cpufreq-monitor-protected.h \ - cpufreq-monitor-factory.c cpufreq-monitor-factory.h \ - cpufreq-monitor-procfs.c cpufreq-monitor-procfs.h \ -+ cpufreq-monitor-sysctl.c cpufreq-monitor-sysctl.h \ - cpufreq-monitor-sysfs.c cpufreq-monitor-sysfs.h \ - cpufreq-monitor-cpuinfo.c cpufreq-monitor-cpuinfo.h - -@@ -419,6 +422,7 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-cpuinfo.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-factory.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-procfs.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-sysctl.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-sysfs.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-popup.Po@am__quote@ --- cpufreq/src/cpufreq-monitor-sysctl.h.orig Sun Feb 13 01:00:25 2005 +++ cpufreq/src/cpufreq-monitor-sysctl.h Sat Feb 12 20:25:21 2005 @@ -0,0 +1,48 @@ @@ -83,111 +49,6 @@ +CPUFreqMonitor *cpufreq_monitor_sysctl_new (guint cpu); + +#endif /* __CPUFREQ_MONITOR_SYSCTL_H__ */ ---- cpufreq/src/cpufreq-monitor-cpuinfo.c.orig Fri Dec 31 14:39:04 2004 -+++ cpufreq/src/cpufreq-monitor-cpuinfo.c Sun Feb 13 23:58:38 2005 -@@ -22,6 +22,10 @@ - #include <glib/gi18n.h> - #include <libgnomevfs/gnome-vfs.h> - -+#ifdef __FreeBSD__ -+#include <sys/types.h> -+#include <sys/sysctl.h> -+#endif /* __FreeBSD__ */ - #include <string.h> - - #include "cpufreq-monitor-cpuinfo.h" -@@ -102,6 +106,7 @@ - static gboolean - cpufreq_monitor_cpuinfo_get (gpointer gdata) - { -+#ifndef __FreeBSD__ - GnomeVFSHandle *handle; - GnomeVFSFileSize bytes_read; - GnomeVFSResult result; -@@ -109,6 +114,9 @@ - gchar **lines; - gchar buffer[256]; - gchar *p; -+#else -+ size_t len; -+#endif /* __FreeBSD__ */ - gchar *freq, *perc, *unit, *governor; - gint cpu, i; - CPUFreqMonitorCPUInfo *monitor; -@@ -118,6 +126,7 @@ - - private = CPUFREQ_MONITOR_GET_PROTECTED (CPUFREQ_MONITOR (monitor)); - -+#ifndef __FreeBSD__ - uri = gnome_vfs_get_uri_from_local_path ("/proc/cpuinfo"); - - result = gnome_vfs_open (&handle, uri, GNOME_VFS_OPEN_READ); -@@ -178,6 +187,12 @@ - - g_strfreev (lines); - g_free (file); -+#else -+ len = sizeof (cpu); -+ -+ if (sysctlbyname ("hw.clockrate", &cpu, &len, NULL, 0) == -1) -+ return FALSE; -+#endif /* __FreeBSD__ */ - - governor = g_strdup (_("Frequency Scaling Unsupported")); - freq = parent_class->get_human_readable_freq (cpu * 1000); /* kHz are expected*/ ---- cpufreq/src/cpufreq-monitor-factory.c.orig Mon Dec 27 12:53:46 2004 -+++ cpufreq/src/cpufreq-monitor-factory.c Sun Feb 13 23:58:44 2005 -@@ -16,13 +16,21 @@ - * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * - * Authors : Carlos García Campos <carlosgc@gnome.org> -+ * Joe Marcus Clarke <marcus@FreeBSD.org> - */ - - #include <glib.h> -+#ifdef __FreeBSD__ -+#include <sys/types.h> -+#include <sys/sysctl.h> -+#endif /* __FreeBSD__ */ - - #include "cpufreq-applet.h" - #include "cpufreq-monitor-sysfs.h" - #include "cpufreq-monitor-procfs.h" -+#ifdef __FreeBSD__ -+#include "cpufreq-monitor-sysctl.h" -+#endif /* __FreeBSD__ */ - #include "cpufreq-monitor-cpuinfo.h" - #include "cpufreq-monitor-factory.h" - -@@ -30,6 +38,7 @@ - cpufreq_monitor_factory_create_monitor (guint cpu) - { - CPUFreqMonitor *monitor = NULL; -+#ifndef __FreeBSD__ - - if (g_file_test ("/sys/devices/system/cpu/cpu0/cpufreq", G_FILE_TEST_EXISTS)) { /* 2.6 kernel */ - monitor = cpufreq_monitor_sysfs_new (cpu); -@@ -48,6 +57,20 @@ - - monitor = cpufreq_monitor_cpuinfo_new (cpu); - } -+#else -+ size_t len; -+ -+ if (sysctlbyname ("dev.cpu.0.freq", NULL, &len, NULL, 0) == 0) { -+ monitor = cpufreq_monitor_sysctl_new (cpu); -+ } else { -+ cpufreq_applet_display_error (_("CPU frequency scaling unsupported"), -+ _("You will not be able to modify the frequency of your machine. " -+ "Your machine may be misconfigured or not have hardware support " -+ "for CPU frequency scaling.")); -+ -+ monitor = cpufreq_monitor_cpuinfo_new (cpu); -+ } -+#endif /* __FreeBSD__ */ - - return monitor; - } --- cpufreq/src/cpufreq-monitor-sysctl.c.orig Sun Feb 13 03:52:42 2005 +++ cpufreq/src/cpufreq-monitor-sysctl.c Mon Feb 14 00:42:07 2005 @@ -0,0 +1,269 @@ @@ -460,9 +321,114 @@ + return private->available_freqs; +} +#endif /* __FreeBSD__ */ ---- cpufreq/src/cpufreq-applet.c.orig Fri Jan 14 23:38:20 2005 -+++ cpufreq/src/cpufreq-applet.c Mon Feb 14 00:47:36 2005 -@@ -16,6 +16,7 @@ +--- cpufreq/src/cpufreq-monitor-factory.c.orig Thu Apr 14 12:11:06 2005 ++++ cpufreq/src/cpufreq-monitor-factory.c Sun Jul 3 17:09:15 2005 +@@ -17,13 +17,21 @@ + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * + * Authors : Carlos García Campos <carlosgc@gnome.org> ++ * Joe Marcus Clarke <marcus@FreeBSD.org> + */ + + #include <glib.h> ++#ifdef __FreeBSD__ ++#include <sys/types.h> ++#include <sys/sysctl.h> ++#endif /* __FreeBSD__ */ + + #include "cpufreq-applet.h" + #include "cpufreq-monitor-sysfs.h" + #include "cpufreq-monitor-procfs.h" ++#ifdef __FreeBSD__ ++#include "cpufreq-monitor-sysctl.h" ++#endif /* __FreeBSD__ */ + #include "cpufreq-monitor-cpuinfo.h" + #include "cpufreq-monitor-factory.h" + +@@ -31,6 +39,7 @@ CPUFreqMonitor * + cpufreq_monitor_factory_create_monitor (guint cpu) + { + CPUFreqMonitor *monitor = NULL; ++#ifndef __FreeBSD__ + + if (g_file_test ("/sys/devices/system/cpu/cpu0/cpufreq", G_FILE_TEST_EXISTS)) { /* 2.6 kernel */ + monitor = cpufreq_monitor_sysfs_new (cpu); +@@ -49,6 +58,20 @@ cpufreq_monitor_factory_create_monitor ( + + monitor = cpufreq_monitor_cpuinfo_new (cpu); + } ++#else ++ size_t len; ++ ++ if (sysctlbyname ("dev.cpu.0.freq", NULL, &len, NULL, 0) == 0) { ++ monitor = cpufreq_monitor_sysctl_new (cpu); ++ } else { ++ cpufreq_applet_display_error (_("CPU frequency scaling unsupported"), ++ _("You will not be able to modify the frequency of your machine. " ++ "Your machine may be misconfigured or not have hardware support " ++ "for CPU frequency scaling.")); ++ ++ monitor = cpufreq_monitor_cpuinfo_new (cpu); ++ } ++#endif /* __FreeBSD__ */ + + return monitor; + } +--- cpufreq/src/cpufreq-monitor-cpuinfo.c.orig Thu Apr 14 12:11:06 2005 ++++ cpufreq/src/cpufreq-monitor-cpuinfo.c Sun Jul 3 17:07:16 2005 +@@ -23,6 +23,10 @@ + #include <glib/gi18n.h> + #include <libgnomevfs/gnome-vfs.h> + ++#ifdef __FreeBSD__ ++#include <sys/types.h> ++#include <sys/sysctl.h> ++#endif /* __FreeBSD__ */ + #include <string.h> + #include <stdio.h> + +@@ -104,6 +108,7 @@ cpufreq_monitor_cpuinfo_new (guint cpu) + static gboolean + cpufreq_monitor_cpuinfo_get (gpointer gdata) + { ++#ifndef __FreeBSD__ + GnomeVFSHandle *handle; + GnomeVFSFileSize bytes_read; + GnomeVFSResult result; +@@ -111,6 +116,9 @@ cpufreq_monitor_cpuinfo_get (gpointer gd + gchar **lines; + gchar buffer[256]; + gchar *p; ++#else ++ size_t len; ++#endif /* __FreeBSD__ */ + gchar *freq, *perc, *unit, *governor; + gint cpu, i; + CPUFreqMonitorCPUInfo *monitor; +@@ -120,6 +128,7 @@ cpufreq_monitor_cpuinfo_get (gpointer gd + + private = CPUFREQ_MONITOR_GET_PROTECTED (CPUFREQ_MONITOR (monitor)); + ++#ifndef __FreeBSD__ + uri = gnome_vfs_get_uri_from_local_path ("/proc/cpuinfo"); + + result = gnome_vfs_open (&handle, uri, GNOME_VFS_OPEN_READ); +@@ -180,6 +189,12 @@ cpufreq_monitor_cpuinfo_get (gpointer gd + + g_strfreev (lines); + g_free (file); ++#else ++ len = sizeof (cpu); ++ ++ if (sysctlbyname ("hw.clockrate", &cpu, &len, NULL, 0) == -1) ++ return FALSE; ++#endif /* __FreeBSD__ */ + + governor = g_strdup (_("Frequency Scaling Unsupported")); + freq = parent_class->get_human_readable_freq (cpu * 1000); /* kHz are expected*/ +--- cpufreq/src/cpufreq-applet.c.orig Thu Apr 14 12:11:06 2005 ++++ cpufreq/src/cpufreq-applet.c Sun Jul 3 17:28:43 2005 +@@ -17,6 +17,7 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * * Authors : Carlos García Campos <carlosgc@gnome.org> @@ -470,7 +436,7 @@ */ #include <config.h> -@@ -25,6 +26,10 @@ +@@ -26,6 +27,10 @@ #include <panel-applet-gconf.h> #include <glade/glade.h> #include <glib/gi18n.h> @@ -481,34 +447,82 @@ #include <string.h> #include "cpufreq-applet.h" -@@ -192,6 +197,7 @@ +@@ -193,6 +198,7 @@ cpufreq_applet_about_cb (BonoboUICompone { - static const gchar *authors[] = { - "Carlos Garcia Campos <carlosgc@gnome.org>", -+ "Joe Marcus Clarke <marcus@FreeBSD.org> (FreeBSD support)", - NULL - }; - static const gchar *documenters[] = { -@@ -231,6 +237,7 @@ - cpufreq_applet_get_max_cpu () + static const gchar *authors[] = { + "Carlos Garcia Campos <carlosgc@gnome.org>", ++ "Joe Marcus Clarke <marcus@FreeBSD.org> (FreeBSD support)", + NULL + }; + static const gchar *documenters[] = { +@@ -233,6 +239,7 @@ static gint + cpufreq_applet_get_max_cpu (void) { - gint mcpu = -1; + gint mcpu = -1; +#ifndef __FreeBSD__ - gchar *file = NULL; + gchar *file = NULL; - do { -@@ -253,6 +260,14 @@ - } while (g_file_test (file, G_FILE_TEST_EXISTS)); - g_free (file); - mcpu --; + do { +@@ -242,11 +249,20 @@ cpufreq_applet_get_max_cpu (void) + } while (g_file_test (file, G_FILE_TEST_EXISTS)); + g_free (file); + mcpu --; +#else -+ size_t len; ++ size_t len; + -+ len = sizeof (mcpu); ++ len = sizeof (mcpu); + -+ sysctlbyname ("hw.ncpu", &mcpu, &len, NULL, 0); -+ mcpu --; ++ sysctlbyname ("hw.ncpu", &mcpu, &len, NULL, 0); ++ mcpu --; +#endif /* __FreeBSD__ */ - if (mcpu >= 0) - return mcpu; + if (mcpu >= 0) + return mcpu; + + mcpu = -1; ++#ifndef __FreeBSD__ + file = NULL; + do { + if (file) g_free (file); +@@ -255,6 +271,7 @@ cpufreq_applet_get_max_cpu (void) + } while (g_file_test (file, G_FILE_TEST_EXISTS)); + g_free (file); + mcpu --; ++#endif + + if (mcpu >= 0) + return mcpu; +--- cpufreq/src/Makefile.in.orig Tue Oct 4 00:11:26 2005 ++++ cpufreq/src/Makefile.in Tue Oct 4 00:20:37 2005 +@@ -57,6 +57,7 @@ + cpufreq-prefs.$(OBJEXT) cpufreq-popup.$(OBJEXT) \ + cpufreq-monitor.$(OBJEXT) cpufreq-monitor-factory.$(OBJEXT) \ + cpufreq-monitor-procfs.$(OBJEXT) \ ++ cpufreq-monitor-sysctl.$(OBJEXT) \ + cpufreq-monitor-sysfs.$(OBJEXT) \ + cpufreq-monitor-cpuinfo.$(OBJEXT) + cpufreq_applet_OBJECTS = $(am_cpufreq_applet_OBJECTS) +@@ -71,6 +72,7 @@ + @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-monitor-factory.Po \ + @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-monitor-procfs.Po \ + @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-monitor-sysfs.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-monitor-sysctl.Po \ + @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-monitor.Po \ + @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-popup.Po \ + @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-prefs.Po +@@ -358,6 +360,7 @@ + cpufreq-monitor-protected.h \ + cpufreq-monitor-factory.c cpufreq-monitor-factory.h \ + cpufreq-monitor-procfs.c cpufreq-monitor-procfs.h \ ++ cpufreq-monitor-sysctl.c cpufreq-monitor-sysctl.h \ + cpufreq-monitor-sysfs.c cpufreq-monitor-sysfs.h \ + cpufreq-monitor-cpuinfo.c cpufreq-monitor-cpuinfo.h + +@@ -441,6 +444,7 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-cpuinfo.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-factory.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-procfs.Po@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-sysctl.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-sysfs.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-popup.Po@am__quote@ diff --git a/x11/gnomeapplets2/files/patch-cpufreq-selector-freebsd b/x11/gnomeapplets2/files/patch-cpufreq-selector-freebsd index f577a0fed39b..d25df35e2b5d 100644 --- a/x11/gnomeapplets2/files/patch-cpufreq-selector-freebsd +++ b/x11/gnomeapplets2/files/patch-cpufreq-selector-freebsd @@ -1,38 +1,3 @@ ---- cpufreq/src/cpufreq-selector/Makefile.in.orig Mon Feb 14 00:26:10 2005 -+++ cpufreq/src/cpufreq-selector/Makefile.in Mon Feb 14 00:26:58 2005 -@@ -53,7 +53,7 @@ - PROGRAMS = $(bin_PROGRAMS) - am_cpufreq_selector_OBJECTS = cpufreq.$(OBJEXT) \ - cpufreq-sysfs.$(OBJEXT) cpufreq-procfs.$(OBJEXT) \ -- main.$(OBJEXT) -+ cpufreq-sysctl.$(OBJEXT) main.$(OBJEXT) - cpufreq_selector_OBJECTS = $(am_cpufreq_selector_OBJECTS) - am__DEPENDENCIES_1 = - cpufreq_selector_DEPENDENCIES = $(am__DEPENDENCIES_1) -@@ -61,6 +61,7 @@ - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/cpufreq-procfs.Po \ -+@AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-sysctl.Po \ - @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-sysfs.Po \ - @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq.Po ./$(DEPDIR)/main.Po - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -@@ -310,6 +311,7 @@ - cpufreq.c cpufreq.h \ - cpufreq-sysfs.c cpufreq-sysfs.h \ - cpufreq-procfs.c cpufreq-procfs.h \ -+ cpufreq-sysctl.c cpufreq-sysctl.h \ - main.c - - cpufreq_selector_LDADD = $(CPUFREQ_SELECTOR_LIBS) -lpopt -@@ -385,6 +387,7 @@ - -rm -f *.tab.c - - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-procfs.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-sysctl.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-sysfs.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@ --- cpufreq/src/cpufreq-selector/cpufreq-sysctl.h.orig Mon Feb 14 00:38:57 2005 +++ cpufreq/src/cpufreq-selector/cpufreq-sysctl.h Mon Feb 14 00:21:39 2005 @@ -0,0 +1,51 @@ @@ -87,52 +52,6 @@ +CPUFreqSysctl *cpufreq_sysctl_new (); + +#endif /* __CPUFREQ_SYSCTL_H__ */ ---- cpufreq/src/cpufreq-selector/main.c.orig Mon Feb 14 00:22:12 2005 -+++ cpufreq/src/cpufreq-selector/main.c Mon Feb 14 00:26:04 2005 -@@ -16,6 +16,7 @@ - * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * - * Authors : Carlos García Campos <carlosgc@gnome.org> -+ * Joe Marcus Clarke <marcus@FreeBSD.org> - */ - - #include <glib-object.h> -@@ -26,6 +27,9 @@ - #include "cpufreq.h" - #include "cpufreq-sysfs.h" - #include "cpufreq-procfs.h" -+#ifdef __FreeBSD__ -+#include "cpufreq-sysctl.h" -+#endif /* __FreeBSD__ */ - - gint - main (gint argc, gchar **argv) -@@ -35,6 +39,9 @@ - gulong frequency = 0; - poptContext ctx; - gint nextopt; -+#ifdef __FreeBSD__ -+ size_t len; -+#endif /* __FreeBSD__ */ - CPUFreq *cfq; - - struct poptOption options[] = { -@@ -76,10 +83,15 @@ - - poptFreeContext(ctx); - -+#ifndef __FreeBSD__ - if (g_file_test ("/sys/devices/system/cpu/cpu0/cpufreq", G_FILE_TEST_EXISTS)) { /* 2.6 kernel */ - cfq = CPUFREQ (cpufreq_sysfs_new ()); - } else if (g_file_test ("/proc/cpufreq", G_FILE_TEST_EXISTS)) { /* 2.4 kernel */ - cfq = CPUFREQ (cpufreq_procfs_new ()); -+#else -+ if (sysctlbyname ("dev.cpu.0.freq", NULL, &len, NULL, 0) == 0) { -+ cfq = CPUFREQ (cpufreq_sysctl_new ()); -+#endif /* __FreeBSD __ */ - } else { - g_print ("No cpufreq support\n"); - return 1; --- cpufreq/src/cpufreq-selector/cpufreq-sysctl.c.orig Mon Feb 14 00:38:52 2005 +++ cpufreq/src/cpufreq-selector/cpufreq-sysctl.c Mon Feb 14 00:44:43 2005 @@ -0,0 +1,235 @@ @@ -371,3 +290,84 @@ + + g_free (governor); +} +--- cpufreq/src/cpufreq-selector/main.c.orig Sun Apr 3 12:03:13 2005 ++++ cpufreq/src/cpufreq-selector/main.c Sun Jul 3 17:16:19 2005 +@@ -17,6 +17,7 @@ + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * + * Authors : Carlos García Campos <carlosgc@gnome.org> ++ * Joe Marcus Clarke <marcus@FreeBSD.org> + */ + + #include <glib-object.h> +@@ -26,6 +27,9 @@ + #include "cpufreq.h" + #include "cpufreq-sysfs.h" + #include "cpufreq-procfs.h" ++#ifdef __FreeBSD__ ++#include "cpufreq-sysctl.h" ++#endif /* __FreeBSD__ */ + + gint + main (gint argc, gchar **argv) +@@ -34,6 +38,9 @@ main (gint argc, gchar **argv) + static gint cpu = 0; + static gchar *governor = NULL; + static gulong frequency = 0; ++#ifdef __FreeBSD__ ++ size_t len; ++#endif /* __FreeBSD__ */ + GError *error = NULL; + CPUFreq *cfq; + +@@ -71,10 +78,15 @@ main (gint argc, gchar **argv) + + g_option_context_free (context); + ++#ifndef __FreeBSD__ + if (g_file_test ("/sys/devices/system/cpu/cpu0/cpufreq", G_FILE_TEST_EXISTS)) { /* 2.6 kernel */ + cfq = CPUFREQ (cpufreq_sysfs_new ()); + } else if (g_file_test ("/proc/cpufreq", G_FILE_TEST_EXISTS)) { /* 2.4 kernel */ + cfq = CPUFREQ (cpufreq_procfs_new ()); ++#else ++ if (sysctlbyname ("dev.cpu.0.freq", NULL, &len, NULL, 0) == 0) { ++ cfq = CPUFREQ (cpufreq_sysctl_new ()); ++#endif /* __FreeBSD__ */ + } else { + g_print ("No cpufreq support\n"); + return 1; +--- cpufreq/src/cpufreq-selector/Makefile.in.orig Tue Oct 4 00:21:25 2005 ++++ cpufreq/src/cpufreq-selector/Makefile.in Tue Oct 4 00:27:54 2005 +@@ -55,7 +55,7 @@ + PROGRAMS = $(bin_PROGRAMS) + am_cpufreq_selector_OBJECTS = cpufreq.$(OBJEXT) \ + cpufreq-sysfs.$(OBJEXT) cpufreq-procfs.$(OBJEXT) \ +- main.$(OBJEXT) ++ cpufreq-sysctl.$(OBJEXT) main.$(OBJEXT) + cpufreq_selector_OBJECTS = $(am_cpufreq_selector_OBJECTS) + am__DEPENDENCIES_1 = + cpufreq_selector_DEPENDENCIES = $(am__DEPENDENCIES_1) +@@ -64,6 +64,7 @@ + am__depfiles_maybe = depfiles + @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/cpufreq-procfs.Po \ + @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-sysfs.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-sysctl.Po \ + @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq.Po ./$(DEPDIR)/main.Po + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +@@ -332,6 +333,7 @@ + cpufreq.c cpufreq.h \ + cpufreq-sysfs.c cpufreq-sysfs.h \ + cpufreq-procfs.c cpufreq-procfs.h \ ++ cpufreq-sysctl.c cpufreq-sysctl.h \ + main.c + + cpufreq_selector_LDADD = $(CPUFREQ_SELECTOR_LIBS) -lpopt +@@ -407,6 +409,7 @@ + -rm -f *.tab.c + + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-procfs.Po@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-sysctl.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-sysfs.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@ diff --git a/x11/gnomeapplets2/files/patch-drivemount_drive-button.c b/x11/gnomeapplets2/files/patch-drivemount_drive-button.c new file mode 100644 index 000000000000..f26e3121ee4b --- /dev/null +++ b/x11/gnomeapplets2/files/patch-drivemount_drive-button.c @@ -0,0 +1,48 @@ +--- drivemount/drive-button.c.orig Tue Aug 23 05:16:27 2005 ++++ drivemount/drive-button.c Tue Aug 23 20:37:43 2005 +@@ -24,6 +24,7 @@ + # include <config.h> + #endif + ++#include <string.h> + #include "drive-button.h" + #include <glib/gi18n.h> + #include <gdk/gdkkeysyms.h> +@@ -710,11 +711,13 @@ run_command (DriveButton *self, const ch + + GList *volumes; + GnomeVFSVolume *volume; ++ char *uri; ++ char *mount_path; + + volumes = gnome_vfs_drive_get_mounted_volumes (self->drive); + volume = GNOME_VFS_VOLUME (volumes->data); +- char *uri = gnome_vfs_volume_get_activation_uri (volume); +- char *mount_path = gnome_vfs_get_local_path_from_uri (uri); ++ uri = gnome_vfs_volume_get_activation_uri (volume); ++ mount_path = gnome_vfs_get_local_path_from_uri (uri); + g_free (uri); + + gnome_vfs_drive_get_display_name (self->drive); +@@ -794,6 +797,11 @@ drive_button_ensure_popup (DriveButton * + char *display_name, *tmp, *label; + int action; + GtkWidget *item; ++ GList *volumes; ++ GnomeVFSVolume *volume = NULL; ++ GnomeVFSDeviceType volume_type; ++ GCallback callback; ++ const char *action_icon = GTK_STOCK_OPEN; + + if (self->popup_menu) return; + +@@ -869,8 +877,7 @@ drive_button_ensure_popup (DriveButton * + g_free (display_name); + display_name = tmp; + +- GCallback callback = G_CALLBACK (open_drive); +- const char *action_icon = GTK_STOCK_OPEN; ++ callback = G_CALLBACK (open_drive); + + switch (device_type) { + case GNOME_VFS_DEVICE_TYPE_VIDEO_DVD: diff --git a/x11/gnomeapplets2/files/patch-gswitchit_gswitchit-applet.c b/x11/gnomeapplets2/files/patch-gswitchit_gswitchit-applet.c new file mode 100644 index 000000000000..5abf18032f00 --- /dev/null +++ b/x11/gnomeapplets2/files/patch-gswitchit_gswitchit-applet.c @@ -0,0 +1,61 @@ +--- gswitchit/gswitchit-applet.c.orig Sun Aug 7 18:07:33 2005 ++++ gswitchit/gswitchit-applet.c Sun Aug 7 18:10:07 2005 +@@ -331,6 +331,10 @@ GSwitchItAppletPrepareDrawing (GSwitchIt + XklConfigItem configItem; + GtkWidget *align, *label; + static GHashTable *shortDescrs = NULL; ++ gpointer pcounter = NULL; ++ char *prevLayoutName = NULL; ++ char *labelTitle = NULL; ++ int counter = 0; + if (group == 0) + shortDescrs = g_hash_table_new_full (g_str_hash, g_str_equal, + g_free, NULL); +@@ -363,10 +367,6 @@ GSwitchItAppletPrepareDrawing (GSwitchIt + if (layoutName == NULL) + layoutName = g_strdup ("?"); + +- gpointer pcounter = NULL; +- char *prevLayoutName = NULL; +- char *labelTitle = NULL; +- int counter = 0; + if (g_hash_table_lookup_extended (shortDescrs, layoutName, + (gpointer*)&prevLayoutName, &pcounter)) + { +@@ -599,6 +599,13 @@ GSwitchItAppletCmdPreview (BonoboUICompo + groupsLevels, groupsLevels + 1, groupsLevels + 2, groupsLevels + 3 }; + XklState *xklState = XklGetCurrentState (); + gpointer p = g_hash_table_lookup (globals.previewDialogs, GINT_TO_POINTER (xklState->group)); ++#ifdef HAVE_XKB ++ GladeXML *gladeData; ++ GtkWidget *dialog; ++ GtkWidget *kbdraw; ++ XkbComponentNamesRec componentNames; ++ XklConfigRec xklData; ++#endif + if (p != NULL) + { + /* existing window */ +@@ -606,11 +613,10 @@ GSwitchItAppletCmdPreview (BonoboUICompo + return; + } + #ifdef HAVE_XKB +- GladeXML *gladeData = glade_xml_new (GNOME_GLADEDIR "/gswitchit.glade", "gswitchit_layout_view", NULL); +- GtkWidget *dialog = ++ gladeData = glade_xml_new (GNOME_GLADEDIR "/gswitchit.glade", "gswitchit_layout_view", NULL); ++ dialog = + glade_xml_get_widget (gladeData, "gswitchit_layout_view"); +- GtkWidget *kbdraw = keyboard_drawing_new (); +- XkbComponentNamesRec componentNames; ++ kbdraw = keyboard_drawing_new (); + + if (xklState->group >= 0 && + xklState->group < g_slist_length (globals.groupNames)) +@@ -624,7 +630,6 @@ GSwitchItAppletCmdPreview (BonoboUICompo + + keyboard_drawing_set_groups_levels (KEYBOARD_DRAWING (kbdraw), pGroupsLevels); + +- XklConfigRec xklData; + XklConfigRecInit (&xklData); + if (XklConfigGetFromServer (&xklData)) + { diff --git a/x11/gnomeapplets2/files/patch-gweather_weather.c b/x11/gnomeapplets2/files/patch-gweather_weather.c deleted file mode 100644 index cdc1921ab4c7..000000000000 --- a/x11/gnomeapplets2/files/patch-gweather_weather.c +++ /dev/null @@ -1,12 +0,0 @@ ---- gweather/weather.c.orig Tue Mar 1 04:34:33 2005 -+++ gweather/weather.c Tue Mar 1 12:36:54 2005 -@@ -20,7 +20,9 @@ - #include <string.h> - #include <ctype.h> - #include <math.h> -+#ifndef __FreeBSD__ - #include <values.h> -+#endif - - #ifdef __FreeBSD__ - #include <sys/types.h> diff --git a/x11/gnomeapplets2/files/patch-mixer_applet.c b/x11/gnomeapplets2/files/patch-mixer_applet.c new file mode 100644 index 000000000000..178c7d5a31a1 --- /dev/null +++ b/x11/gnomeapplets2/files/patch-mixer_applet.c @@ -0,0 +1,11 @@ +--- mixer/applet.c.orig Tue Oct 4 00:15:40 2005 ++++ mixer/applet.c Tue Oct 4 00:16:09 2005 +@@ -953,7 +953,7 @@ gnome_volume_applet_adjust_volume (GstMi + + volumes = g_new (gint, track->num_channels); + for (n = 0; n < track->num_channels; n++) +- volumes[n] = lrintf (volume); ++ volumes[n] = (int)rint (volume); + gst_mixer_set_volume (mixer, track, volumes); + g_free (volumes); + } diff --git a/x11/gnomeapplets2/files/patch-modemlights_modem-applet.c b/x11/gnomeapplets2/files/patch-modemlights_modem-applet.c deleted file mode 100644 index f4fb13717732..000000000000 --- a/x11/gnomeapplets2/files/patch-modemlights_modem-applet.c +++ /dev/null @@ -1,22 +0,0 @@ ---- modemlights/modem-applet.c.orig Fri Jan 14 00:06:52 2005 -+++ modemlights/modem-applet.c Fri Jan 14 00:08:28 2005 -@@ -24,12 +24,19 @@ - - #include <panel-applet.h> - #include <fcntl.h> -+#ifndef __FreeBSD__ - #include <pty.h> -+#endif - #include <sys/poll.h> - #include <sys/types.h> - #include <sys/wait.h> - #include <libxml/tree.h> - #include <glade/glade.h> -+#ifdef __FreeBSD__ -+#include <sys/ioctl.h> -+#include <termios.h> -+#include <libutil.h> -+#endif - - #include "modem-applet.h" - diff --git a/x11/gnomeapplets2/files/patch-stickynotes_stickynotes_applet_callbacks.c b/x11/gnomeapplets2/files/patch-stickynotes_stickynotes_applet_callbacks.c new file mode 100644 index 000000000000..718f52a0dd67 --- /dev/null +++ b/x11/gnomeapplets2/files/patch-stickynotes_stickynotes_applet_callbacks.c @@ -0,0 +1,18 @@ +--- stickynotes/stickynotes_applet_callbacks.c.orig Wed Jul 13 18:57:03 2005 ++++ stickynotes/stickynotes_applet_callbacks.c Wed Jul 13 18:57:13 2005 +@@ -153,6 +153,7 @@ gboolean applet_check_click_on_desktop_c + { + static Window desktop_window = 0; + static Display *dpy; ++ XEvent event; + + if (desktop_window == 0) { + desktop_window = get_desktop_window (); +@@ -162,7 +163,6 @@ gboolean applet_check_click_on_desktop_c + * at every click on the desktop */ + XSelectInput(dpy, desktop_window, PropertyChangeMask); + } +- XEvent event; + + if (XCheckWindowEvent(dpy, desktop_window, PropertyChangeMask, &event) == True) { + stickynote_show_notes (FALSE); diff --git a/x11/gnomeapplets2/pkg-plist b/x11/gnomeapplets2/pkg-plist index 209107a6d038..cc8600d5da3c 100644 --- a/x11/gnomeapplets2/pkg-plist +++ b/x11/gnomeapplets2/pkg-plist @@ -34,16 +34,16 @@ libexec/gnome-keyboard-applet libexec/gtik2_applet2 libexec/gweather-applet-2 libexec/mini_commander_applet -libexec/modem_applet libexec/mixer_applet2 +libexec/modem_applet libexec/multiload-applet-2 libexec/null_applet libexec/stickynotes_applet libexec/trashapplet share/gnome/gnome-2.0/ui/GNOME_AccessxApplet.xml %%BATTERY%%share/gnome/gnome-2.0/ui/GNOME_BattstatApplet.xml -share/gnome/gnome-2.0/ui/GNOME_CharpickerApplet.xml %%CPUFREQ%%share/gnome/gnome-2.0/ui/GNOME_CPUFreqApplet.xml +share/gnome/gnome-2.0/ui/GNOME_CharpickerApplet.xml share/gnome/gnome-2.0/ui/GNOME_DriveMountApplet.xml share/gnome/gnome-2.0/ui/GNOME_GSwitchItApplet.xml share/gnome/gnome-2.0/ui/GNOME_GWeatherApplet.xml @@ -53,8 +53,8 @@ share/gnome/gnome-2.0/ui/GNOME_MiniCommanderApplet.xml share/gnome/gnome-2.0/ui/GNOME_MixerApplet.xml share/gnome/gnome-2.0/ui/GNOME_ModemLights.xml share/gnome/gnome-2.0/ui/GNOME_MultiloadApplet.xml -share/gnome/gnome-2.0/ui/GNOME_StickyNotesApplet.xml share/gnome/gnome-2.0/ui/GNOME_Panel_TrashApplet.xml +share/gnome/gnome-2.0/ui/GNOME_StickyNotesApplet.xml share/gnome/gnome-applets/geyes/Bizarre/Bizarre-eye.png share/gnome/gnome-applets/geyes/Bizarre/Bizarre-pupil.png share/gnome/gnome-applets/geyes/Bizarre/config @@ -73,313 +73,160 @@ share/gnome/gnome-applets/geyes/Horrid/horrid_pupil.png %%BATTERY%%share/gnome/gnome-applets/glade/battstat_applet.glade %%CPUFREQ%%share/gnome/gnome-applets/glade/cpufreq-preferences.glade share/gnome/gnome-applets/glade/gswitchit-plugins.glade -share/gnome/gnome-applets/glade/gswitchit-properties.glade +share/gnome/gnome-applets/glade/gswitchit.glade share/gnome/gnome-applets/glade/mini-commander.glade share/gnome/gnome-applets/glade/modemlights.glade share/gnome/gnome-applets/glade/stickynotes.glade +share/gnome/gnome-applets/glade/trashapplet.glade share/gnome/gnome-applets/gweather/Locations.xml share/gnome/gnome-applets/gweather/locations.dtd share/gnome/help/accessx-status/C/accessx-status.xml share/gnome/help/accessx-status/C/figures/accessx-status-applet.png +share/gnome/help/accessx-status/C/figures/accessx-status-disabled.png +share/gnome/help/accessx-status/C/figures/accessx_bounce-keys.png +share/gnome/help/accessx-status/C/figures/accessx_mouse-keys.png +share/gnome/help/accessx-status/C/figures/accessx_slow-keys.png +share/gnome/help/accessx-status/C/figures/accessx_sticky-altGr-key.png +share/gnome/help/accessx-status/C/figures/accessx_sticky-ctrl-key.png +share/gnome/help/accessx-status/C/figures/accessx_sticky-keys.png +share/gnome/help/accessx-status/C/figures/accessx_sticky-meta-key.png +share/gnome/help/accessx-status/C/figures/accessx_sticky-shift-key.png +share/gnome/help/accessx-status/C/figures/accessx_sticky-windows-key.png share/gnome/help/accessx-status/C/legal.xml -share/gnome/help/accessx-status/eu/accessx-status.xml -share/gnome/help/accessx-status/eu/figures/accessx-status-applet.png -share/gnome/help/accessx-status/eu/legal.xml +share/gnome/help/accessx-status/es/accessx-status.xml +share/gnome/help/accessx-status/es/figures/accessx-status-applet.png +share/gnome/help/accessx-status/es/figures/accessx-status-disabled.png +share/gnome/help/accessx-status/es/figures/accessx_bounce-keys.png +share/gnome/help/accessx-status/es/figures/accessx_mouse-keys.png +share/gnome/help/accessx-status/es/figures/accessx_slow-keys.png +share/gnome/help/accessx-status/es/figures/accessx_sticky-altGr-key.png +share/gnome/help/accessx-status/es/figures/accessx_sticky-ctrl-key.png +share/gnome/help/accessx-status/es/figures/accessx_sticky-keys.png +share/gnome/help/accessx-status/es/figures/accessx_sticky-meta-key.png +share/gnome/help/accessx-status/es/figures/accessx_sticky-shift-key.png +share/gnome/help/accessx-status/es/figures/accessx_sticky-windows-key.png +share/gnome/help/accessx-status/fr/accessx-status.xml +share/gnome/help/accessx-status/fr/figures/accessx-status-applet.png +share/gnome/help/accessx-status/fr/figures/accessx-status-disabled.png +share/gnome/help/accessx-status/fr/figures/accessx_bounce-keys.png +share/gnome/help/accessx-status/fr/figures/accessx_mouse-keys.png +share/gnome/help/accessx-status/fr/figures/accessx_slow-keys.png +share/gnome/help/accessx-status/fr/figures/accessx_sticky-altGr-key.png +share/gnome/help/accessx-status/fr/figures/accessx_sticky-ctrl-key.png +share/gnome/help/accessx-status/fr/figures/accessx_sticky-keys.png +share/gnome/help/accessx-status/fr/figures/accessx_sticky-meta-key.png +share/gnome/help/accessx-status/fr/figures/accessx_sticky-shift-key.png +share/gnome/help/accessx-status/fr/figures/accessx_sticky-windows-key.png share/gnome/help/accessx-status/uk/accessx-status.xml share/gnome/help/accessx-status/uk/figures/accessx-status-applet.png -share/gnome/help/accessx-status/uk/legal.xml +share/gnome/help/accessx-status/uk/figures/accessx-status-disabled.png +share/gnome/help/accessx-status/uk/figures/accessx_bounce-keys.png +share/gnome/help/accessx-status/uk/figures/accessx_mouse-keys.png +share/gnome/help/accessx-status/uk/figures/accessx_slow-keys.png +share/gnome/help/accessx-status/uk/figures/accessx_sticky-altGr-key.png +share/gnome/help/accessx-status/uk/figures/accessx_sticky-ctrl-key.png +share/gnome/help/accessx-status/uk/figures/accessx_sticky-keys.png +share/gnome/help/accessx-status/uk/figures/accessx_sticky-meta-key.png +share/gnome/help/accessx-status/uk/figures/accessx_sticky-shift-key.png +share/gnome/help/accessx-status/uk/figures/accessx_sticky-windows-key.png %%BATTERY%%share/gnome/help/battstat/C/battstat.xml -%%BATTERY%%share/gnome/help/battstat/C/figures/battstat-preferences.png -%%BATTERY%%share/gnome/help/battstat/C/figures/ac_small.png -%%BATTERY%%share/gnome/help/battstat/C/figures/batt_green.png -%%BATTERY%%share/gnome/help/battstat/C/figures/batt_orange.png -%%BATTERY%%share/gnome/help/battstat/C/figures/batt_red.png -%%BATTERY%%share/gnome/help/battstat/C/figures/batt_yellow.png -%%BATTERY%%share/gnome/help/battstat/C/figures/battery_small.png +%%BATTERY%%share/gnome/help/battstat/C/figures/battstat-applet-expanded.png %%BATTERY%%share/gnome/help/battstat/C/figures/battstat-applet.png -%%BATTERY%%share/gnome/help/battstat/C/figures/battstat-applet_window.png -%%BATTERY%%share/gnome/help/battstat/C/figures/flash_small.png -%%BATTERY%%share/gnome/help/battstat/C/figures/warning_small.png +%%BATTERY%%share/gnome/help/battstat/C/figures/battstat-credits-hal.png +%%BATTERY%%share/gnome/help/battstat/C/figures/battstat-preferences.png +%%BATTERY%%share/gnome/help/battstat/C/figures/context-menu.png %%BATTERY%%share/gnome/help/battstat/C/legal.xml -%%BATTERY%%share/gnome/help/battstat/de/battstat.xml -%%BATTERY%%share/gnome/help/battstat/de/figures/ac_small.png -%%BATTERY%%share/gnome/help/battstat/de/figures/batt_green.png -%%BATTERY%%share/gnome/help/battstat/de/figures/batt_orange.png -%%BATTERY%%share/gnome/help/battstat/de/figures/batt_red.png -%%BATTERY%%share/gnome/help/battstat/de/figures/batt_yellow.png -%%BATTERY%%share/gnome/help/battstat/de/figures/battery_small.png -%%BATTERY%%share/gnome/help/battstat/de/figures/battstat-applet.png -%%BATTERY%%share/gnome/help/battstat/de/figures/battstat-applet_window.png -%%BATTERY%%share/gnome/help/battstat/de/figures/flash_small.png -%%BATTERY%%share/gnome/help/battstat/de/figures/warning_small.png -%%BATTERY%%share/gnome/help/battstat/de/legal.xml %%BATTERY%%share/gnome/help/battstat/es/battstat.xml -%%BATTERY%%share/gnome/help/battstat/es/figures/ac_small.png -%%BATTERY%%share/gnome/help/battstat/es/figures/batt_green.png -%%BATTERY%%share/gnome/help/battstat/es/figures/batt_orange.png -%%BATTERY%%share/gnome/help/battstat/es/figures/batt_red.png -%%BATTERY%%share/gnome/help/battstat/es/figures/batt_yellow.png -%%BATTERY%%share/gnome/help/battstat/es/figures/battery_small.png +%%BATTERY%%share/gnome/help/battstat/es/figures/battstat-applet-expanded.png %%BATTERY%%share/gnome/help/battstat/es/figures/battstat-applet.png -%%BATTERY%%share/gnome/help/battstat/es/figures/battstat-applet_window.png -%%BATTERY%%share/gnome/help/battstat/es/figures/flash_small.png -%%BATTERY%%share/gnome/help/battstat/es/figures/warning_small.png -%%BATTERY%%share/gnome/help/battstat/es/legal.xml -%%BATTERY%%share/gnome/help/battstat/eu/battstat.xml -%%BATTERY%%share/gnome/help/battstat/eu/figures/battstat-apperance.png -%%BATTERY%%share/gnome/help/battstat/eu/figures/battstat-applet.png -%%BATTERY%%share/gnome/help/battstat/eu/figures/battstat-general.png -%%BATTERY%%share/gnome/help/battstat/eu/legal.xml -%%BATTERY%%share/gnome/help/battstat/fr/battstat.xml -%%BATTERY%%share/gnome/help/battstat/fr/figures/ac_small.png -%%BATTERY%%share/gnome/help/battstat/fr/figures/batt_green.png -%%BATTERY%%share/gnome/help/battstat/fr/figures/batt_orange.png -%%BATTERY%%share/gnome/help/battstat/fr/figures/batt_red.png -%%BATTERY%%share/gnome/help/battstat/fr/figures/batt_yellow.png -%%BATTERY%%share/gnome/help/battstat/fr/figures/battery_small.png -%%BATTERY%%share/gnome/help/battstat/fr/figures/battstat-applet.png -%%BATTERY%%share/gnome/help/battstat/fr/figures/battstat-applet_window.png -%%BATTERY%%share/gnome/help/battstat/fr/figures/flash_small.png -%%BATTERY%%share/gnome/help/battstat/fr/figures/warning_small.png -%%BATTERY%%share/gnome/help/battstat/fr/legal.xml -%%BATTERY%%share/gnome/help/battstat/it/battstat.xml -%%BATTERY%%share/gnome/help/battstat/it/figures/ac_small.png -%%BATTERY%%share/gnome/help/battstat/it/figures/batt_green.png -%%BATTERY%%share/gnome/help/battstat/it/figures/batt_orange.png -%%BATTERY%%share/gnome/help/battstat/it/figures/batt_red.png -%%BATTERY%%share/gnome/help/battstat/it/figures/batt_yellow.png -%%BATTERY%%share/gnome/help/battstat/it/figures/battery_small.png -%%BATTERY%%share/gnome/help/battstat/it/figures/battstat-applet.png -%%BATTERY%%share/gnome/help/battstat/it/figures/battstat-applet_window.png -%%BATTERY%%share/gnome/help/battstat/it/figures/flash_small.png -%%BATTERY%%share/gnome/help/battstat/it/figures/warning_small.png -%%BATTERY%%share/gnome/help/battstat/it/legal.xml -%%BATTERY%%share/gnome/help/battstat/ja/battstat.xml -%%BATTERY%%share/gnome/help/battstat/ja/figures/ac_small.png -%%BATTERY%%share/gnome/help/battstat/ja/figures/batt_green.png -%%BATTERY%%share/gnome/help/battstat/ja/figures/batt_orange.png -%%BATTERY%%share/gnome/help/battstat/ja/figures/batt_red.png -%%BATTERY%%share/gnome/help/battstat/ja/figures/batt_yellow.png -%%BATTERY%%share/gnome/help/battstat/ja/figures/battery_small.png -%%BATTERY%%share/gnome/help/battstat/ja/figures/battstat-applet.png -%%BATTERY%%share/gnome/help/battstat/ja/figures/battstat-applet_window.png -%%BATTERY%%share/gnome/help/battstat/ja/figures/flash_small.png -%%BATTERY%%share/gnome/help/battstat/ja/figures/warning_small.png -%%BATTERY%%share/gnome/help/battstat/ja/legal.xml -%%BATTERY%%share/gnome/help/battstat/ko/battstat.xml -%%BATTERY%%share/gnome/help/battstat/ko/figures/ac_small.png -%%BATTERY%%share/gnome/help/battstat/ko/figures/batt_green.png -%%BATTERY%%share/gnome/help/battstat/ko/figures/batt_orange.png -%%BATTERY%%share/gnome/help/battstat/ko/figures/batt_red.png -%%BATTERY%%share/gnome/help/battstat/ko/figures/batt_yellow.png -%%BATTERY%%share/gnome/help/battstat/ko/figures/battery_small.png -%%BATTERY%%share/gnome/help/battstat/ko/figures/battstat-applet.png -%%BATTERY%%share/gnome/help/battstat/ko/figures/battstat-applet_window.png -%%BATTERY%%share/gnome/help/battstat/ko/figures/flash_small.png -%%BATTERY%%share/gnome/help/battstat/ko/figures/warning_small.png -%%BATTERY%%share/gnome/help/battstat/ko/legal.xml -%%BATTERY%%share/gnome/help/battstat/sv/battstat.xml -%%BATTERY%%share/gnome/help/battstat/sv/figures/ac_small.png -%%BATTERY%%share/gnome/help/battstat/sv/figures/batt_green.png -%%BATTERY%%share/gnome/help/battstat/sv/figures/batt_orange.png -%%BATTERY%%share/gnome/help/battstat/sv/figures/batt_red.png -%%BATTERY%%share/gnome/help/battstat/sv/figures/batt_yellow.png -%%BATTERY%%share/gnome/help/battstat/sv/figures/battery_small.png -%%BATTERY%%share/gnome/help/battstat/sv/figures/battstat-applet.png -%%BATTERY%%share/gnome/help/battstat/sv/figures/battstat-applet_window.png -%%BATTERY%%share/gnome/help/battstat/sv/figures/flash_small.png -%%BATTERY%%share/gnome/help/battstat/sv/figures/warning_small.png -%%BATTERY%%share/gnome/help/battstat/sv/legal.xml +%%BATTERY%%share/gnome/help/battstat/es/figures/battstat-credits-hal.png +%%BATTERY%%share/gnome/help/battstat/es/figures/battstat-preferences.png +%%BATTERY%%share/gnome/help/battstat/es/figures/context-menu.png %%BATTERY%%share/gnome/help/battstat/uk/battstat.xml -%%BATTERY%%share/gnome/help/battstat/uk/figures/ac_small.png -%%BATTERY%%share/gnome/help/battstat/uk/figures/batt_green.png -%%BATTERY%%share/gnome/help/battstat/uk/figures/batt_orange.png -%%BATTERY%%share/gnome/help/battstat/uk/figures/batt_red.png -%%BATTERY%%share/gnome/help/battstat/uk/figures/batt_yellow.png -%%BATTERY%%share/gnome/help/battstat/uk/figures/battery_small.png +%%BATTERY%%share/gnome/help/battstat/uk/figures/battstat-applet-expanded.png %%BATTERY%%share/gnome/help/battstat/uk/figures/battstat-applet.png -%%BATTERY%%share/gnome/help/battstat/uk/figures/battstat-applet_window.png +%%BATTERY%%share/gnome/help/battstat/uk/figures/battstat-credits-hal.png %%BATTERY%%share/gnome/help/battstat/uk/figures/battstat-preferences.png -%%BATTERY%%share/gnome/help/battstat/uk/figures/flash_small.png -%%BATTERY%%share/gnome/help/battstat/uk/figures/warning_small.png -%%BATTERY%%share/gnome/help/battstat/uk/legal.xml -%%BATTERY%%share/gnome/help/battstat/zh_CN/battstat.xml -%%BATTERY%%share/gnome/help/battstat/zh_CN/figures/ac_small.png -%%BATTERY%%share/gnome/help/battstat/zh_CN/figures/batt_green.png -%%BATTERY%%share/gnome/help/battstat/zh_CN/figures/batt_orange.png -%%BATTERY%%share/gnome/help/battstat/zh_CN/figures/batt_red.png -%%BATTERY%%share/gnome/help/battstat/zh_CN/figures/batt_yellow.png -%%BATTERY%%share/gnome/help/battstat/zh_CN/figures/battery_small.png -%%BATTERY%%share/gnome/help/battstat/zh_CN/figures/battstat-applet.png -%%BATTERY%%share/gnome/help/battstat/zh_CN/figures/battstat-applet_window.png -%%BATTERY%%share/gnome/help/battstat/zh_CN/figures/flash_small.png -%%BATTERY%%share/gnome/help/battstat/zh_CN/figures/warning_small.png -%%BATTERY%%share/gnome/help/battstat/zh_CN/legal.xml -%%BATTERY%%share/gnome/help/battstat/zh_HK/battstat.xml -%%BATTERY%%share/gnome/help/battstat/zh_HK/figures/ac_small.png -%%BATTERY%%share/gnome/help/battstat/zh_HK/figures/batt_green.png -%%BATTERY%%share/gnome/help/battstat/zh_HK/figures/batt_orange.png -%%BATTERY%%share/gnome/help/battstat/zh_HK/figures/batt_red.png -%%BATTERY%%share/gnome/help/battstat/zh_HK/figures/batt_yellow.png -%%BATTERY%%share/gnome/help/battstat/zh_HK/figures/battery_small.png -%%BATTERY%%share/gnome/help/battstat/zh_HK/figures/battstat-applet.png -%%BATTERY%%share/gnome/help/battstat/zh_HK/figures/battstat-applet_window.png -%%BATTERY%%share/gnome/help/battstat/zh_HK/figures/flash_small.png -%%BATTERY%%share/gnome/help/battstat/zh_HK/figures/warning_small.png -%%BATTERY%%share/gnome/help/battstat/zh_HK/legal.xml -%%BATTERY%%share/gnome/help/battstat/zh_TW/battstat.xml -%%BATTERY%%share/gnome/help/battstat/zh_TW/figures/ac_small.png -%%BATTERY%%share/gnome/help/battstat/zh_TW/figures/batt_green.png -%%BATTERY%%share/gnome/help/battstat/zh_TW/figures/batt_orange.png -%%BATTERY%%share/gnome/help/battstat/zh_TW/figures/batt_red.png -%%BATTERY%%share/gnome/help/battstat/zh_TW/figures/batt_yellow.png -%%BATTERY%%share/gnome/help/battstat/zh_TW/figures/battery_small.png -%%BATTERY%%share/gnome/help/battstat/zh_TW/figures/battstat-applet.png -%%BATTERY%%share/gnome/help/battstat/zh_TW/figures/battstat-applet_window.png -%%BATTERY%%share/gnome/help/battstat/zh_TW/figures/flash_small.png -%%BATTERY%%share/gnome/help/battstat/zh_TW/figures/warning_small.png -%%BATTERY%%share/gnome/help/battstat/zh_TW/legal.xml +%%BATTERY%%share/gnome/help/battstat/uk/figures/context-menu.png share/gnome/help/char-palette/C/char-palette.xml share/gnome/help/char-palette/C/figures/charpalette_applet.png share/gnome/help/char-palette/C/figures/charpalette_chargroup.png -share/gnome/help/char-palette/C/figures/charpick_characters.png share/gnome/help/char-palette/C/figures/charpick-preferences.png +share/gnome/help/char-palette/C/figures/charpick_characters.png share/gnome/help/char-palette/C/legal.xml -share/gnome/help/char-palette/de/char-palette.xml -share/gnome/help/char-palette/de/figures/charpalette_applet.png -share/gnome/help/char-palette/de/figures/charpalette_chargroup.png -share/gnome/help/char-palette/de/figures/charpick_applet.png -share/gnome/help/char-palette/de/figures/charpick_characters.png -share/gnome/help/char-palette/de/figures/charpick_chargroup.png -share/gnome/help/char-palette/de/legal.xml share/gnome/help/char-palette/es/char-palette.xml share/gnome/help/char-palette/es/figures/charpalette_applet.png share/gnome/help/char-palette/es/figures/charpalette_chargroup.png -share/gnome/help/char-palette/es/figures/charpick_applet.png +share/gnome/help/char-palette/es/figures/charpick-preferences.png share/gnome/help/char-palette/es/figures/charpick_characters.png -share/gnome/help/char-palette/es/figures/charpick_chargroup.png -share/gnome/help/char-palette/es/legal.xml -share/gnome/help/char-palette/eu/char-palette.xml -share/gnome/help/char-palette/eu/figures/charpalette_applet.png -share/gnome/help/char-palette/eu/figures/charpalette_chargroup.png -share/gnome/help/char-palette/eu/figures/charpick_characters.png -share/gnome/help/char-palette/eu/legal.xml -share/gnome/help/char-palette/fr/char-palette.xml -share/gnome/help/char-palette/fr/figures/charpalette_applet.png -share/gnome/help/char-palette/fr/figures/charpalette_chargroup.png -share/gnome/help/char-palette/fr/figures/charpick_applet.png -share/gnome/help/char-palette/fr/figures/charpick_characters.png -share/gnome/help/char-palette/fr/figures/charpick_chargroup.png -share/gnome/help/char-palette/fr/legal.xml share/gnome/help/char-palette/it/char-palette.xml share/gnome/help/char-palette/it/figures/charpalette_applet.png share/gnome/help/char-palette/it/figures/charpalette_chargroup.png -share/gnome/help/char-palette/it/figures/charpick_applet.png +share/gnome/help/char-palette/it/figures/charpick-preferences.png share/gnome/help/char-palette/it/figures/charpick_characters.png -share/gnome/help/char-palette/it/figures/charpick_chargroup.png -share/gnome/help/char-palette/it/legal.xml -share/gnome/help/char-palette/ja/char-palette.xml -share/gnome/help/char-palette/ja/figures/charpalette_applet.png -share/gnome/help/char-palette/ja/legal.xml -share/gnome/help/char-palette/ko/char-palette.xml -share/gnome/help/char-palette/ko/figures/charpalette_applet.png -share/gnome/help/char-palette/ko/figures/charpalette_chargroup.png -share/gnome/help/char-palette/ko/figures/charpick_applet.png -share/gnome/help/char-palette/ko/figures/charpick_characters.png -share/gnome/help/char-palette/ko/figures/charpick_chargroup.png -share/gnome/help/char-palette/ko/legal.xml -share/gnome/help/char-palette/sv/char-palette.xml -share/gnome/help/char-palette/sv/figures/charpalette_applet.png -share/gnome/help/char-palette/sv/figures/charpalette_chargroup.png -share/gnome/help/char-palette/sv/figures/charpick_applet.png -share/gnome/help/char-palette/sv/figures/charpick_characters.png -share/gnome/help/char-palette/sv/figures/charpick_chargroup.png -share/gnome/help/char-palette/sv/legal.xml +share/gnome/help/char-palette/nl/char-palette.xml +share/gnome/help/char-palette/nl/figures/charpalette_applet.png +share/gnome/help/char-palette/nl/figures/charpalette_chargroup.png +share/gnome/help/char-palette/nl/figures/charpick-preferences.png +share/gnome/help/char-palette/nl/figures/charpick_characters.png +share/gnome/help/char-palette/pt_BR/char-palette.xml +share/gnome/help/char-palette/pt_BR/figures/charpalette_applet.png +share/gnome/help/char-palette/pt_BR/figures/charpalette_chargroup.png +share/gnome/help/char-palette/pt_BR/figures/charpick-preferences.png +share/gnome/help/char-palette/pt_BR/figures/charpick_characters.png share/gnome/help/char-palette/uk/char-palette.xml share/gnome/help/char-palette/uk/figures/charpalette_applet.png share/gnome/help/char-palette/uk/figures/charpalette_chargroup.png share/gnome/help/char-palette/uk/figures/charpick-preferences.png share/gnome/help/char-palette/uk/figures/charpick_characters.png -share/gnome/help/char-palette/uk/legal.xml -share/gnome/help/char-palette/zh_CN/char-palette.xml -share/gnome/help/char-palette/zh_CN/figures/charpalette_applet.png -share/gnome/help/char-palette/zh_CN/figures/charpalette_chargroup.png -share/gnome/help/char-palette/zh_CN/figures/charpick_applet.png -share/gnome/help/char-palette/zh_CN/figures/charpick_characters.png -share/gnome/help/char-palette/zh_CN/figures/charpick_chargroup.png -share/gnome/help/char-palette/zh_CN/legal.xml -share/gnome/help/char-palette/zh_HK/char-palette.xml -share/gnome/help/char-palette/zh_HK/figures/charpalette_applet.png -share/gnome/help/char-palette/zh_HK/figures/charpalette_chargroup.png -share/gnome/help/char-palette/zh_HK/legal.xml -share/gnome/help/char-palette/zh_TW/char-palette.xml -share/gnome/help/char-palette/zh_TW/figures/charpalette_applet.png -share/gnome/help/char-palette/zh_TW/figures/charpalette_chargroup.png -share/gnome/help/char-palette/zh_TW/figures/charpick_applet.png -share/gnome/help/char-palette/zh_TW/figures/charpick_characters.png -share/gnome/help/char-palette/zh_TW/figures/charpick_chargroup.png -share/gnome/help/char-palette/zh_TW/legal.xml share/gnome/help/command-line/C/command-line.xml share/gnome/help/command-line/C/figures/command-line.png share/gnome/help/command-line/C/figures/prefs-macros.png share/gnome/help/command-line/C/figures/prefs.png share/gnome/help/command-line/C/legal.xml -share/gnome/help/command-line/de/command-line.xml -share/gnome/help/command-line/de/figures/command-line.png -share/gnome/help/command-line/de/legal.xml share/gnome/help/command-line/es/command-line.xml share/gnome/help/command-line/es/figures/command-line.png -share/gnome/help/command-line/es/legal.xml -share/gnome/help/command-line/eu/command-line.xml -share/gnome/help/command-line/eu/figures/command-line.png -share/gnome/help/command-line/eu/legal.xml -share/gnome/help/command-line/fr/command-line.xml -share/gnome/help/command-line/fr/figures/command-line.png -share/gnome/help/command-line/fr/legal.xml -share/gnome/help/command-line/it/command-line.xml -share/gnome/help/command-line/it/figures/command-line.png -share/gnome/help/command-line/it/legal.xml -share/gnome/help/command-line/ja/command-line.xml -share/gnome/help/command-line/ja/figures/command-line.png -share/gnome/help/command-line/ja/legal.xml -share/gnome/help/command-line/ko/command-line.xml -share/gnome/help/command-line/ko/figures/command-line.png -share/gnome/help/command-line/ko/legal.xml -share/gnome/help/command-line/sv/command-line.xml -share/gnome/help/command-line/sv/figures/command-line.png -share/gnome/help/command-line/sv/legal.xml +share/gnome/help/command-line/es/figures/prefs-macros.png +share/gnome/help/command-line/es/figures/prefs.png +share/gnome/help/command-line/pt_BR/command-line.xml +share/gnome/help/command-line/pt_BR/figures/command-line.png +share/gnome/help/command-line/pt_BR/figures/prefs-macros.png +share/gnome/help/command-line/pt_BR/figures/prefs.png share/gnome/help/command-line/uk/command-line.xml share/gnome/help/command-line/uk/figures/command-line.png share/gnome/help/command-line/uk/figures/prefs-macros.png share/gnome/help/command-line/uk/figures/prefs.png -share/gnome/help/command-line/uk/legal.xml -share/gnome/help/command-line/zh_CN/command-line.xml -share/gnome/help/command-line/zh_CN/figures/command-line.png -share/gnome/help/command-line/zh_CN/legal.xml -share/gnome/help/command-line/zh_HK/command-line.xml -share/gnome/help/command-line/zh_HK/figures/command-line.png -share/gnome/help/command-line/zh_HK/legal.xml -share/gnome/help/command-line/zh_TW/command-line.xml -share/gnome/help/command-line/zh_TW/figures/command-line.png -share/gnome/help/command-line/zh_TW/legal.xml %%CPUFREQ%%share/gnome/help/cpufreq-applet/C/cpufreq-applet.xml %%CPUFREQ%%share/gnome/help/cpufreq-applet/C/figures/cpufreq-100.png %%CPUFREQ%%share/gnome/help/cpufreq-applet/C/figures/cpufreq-25.png %%CPUFREQ%%share/gnome/help/cpufreq-applet/C/figures/cpufreq-50.png %%CPUFREQ%%share/gnome/help/cpufreq-applet/C/figures/cpufreq-75.png -%%CPUFREQ%%share/gnome/help/cpufreq-applet/C/figures/cpufreq-applet.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/C/figures/cpufreq-applet-preferences-smp.png %%CPUFREQ%%share/gnome/help/cpufreq-applet/C/figures/cpufreq-applet-preferences.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/C/figures/cpufreq-applet-selector-both.png %%CPUFREQ%%share/gnome/help/cpufreq-applet/C/figures/cpufreq-applet-selector.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/C/figures/cpufreq-applet.png %%CPUFREQ%%share/gnome/help/cpufreq-applet/C/legal.xml +%%CPUFREQ%%share/gnome/help/cpufreq-applet/es/cpufreq-applet.xml +%%CPUFREQ%%share/gnome/help/cpufreq-applet/es/figures/cpufreq-100.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/es/figures/cpufreq-25.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/es/figures/cpufreq-50.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/es/figures/cpufreq-75.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/es/figures/cpufreq-applet-preferences-smp.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/es/figures/cpufreq-applet-preferences.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/es/figures/cpufreq-applet-selector-both.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/es/figures/cpufreq-applet-selector.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/es/figures/cpufreq-applet.png %%CPUFREQ%%share/gnome/help/cpufreq-applet/uk/cpufreq-applet.xml %%CPUFREQ%%share/gnome/help/cpufreq-applet/uk/figures/cpufreq-100.png %%CPUFREQ%%share/gnome/help/cpufreq-applet/uk/figures/cpufreq-25.png %%CPUFREQ%%share/gnome/help/cpufreq-applet/uk/figures/cpufreq-50.png %%CPUFREQ%%share/gnome/help/cpufreq-applet/uk/figures/cpufreq-75.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/uk/figures/cpufreq-applet-preferences-smp.png %%CPUFREQ%%share/gnome/help/cpufreq-applet/uk/figures/cpufreq-applet-preferences.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/uk/figures/cpufreq-applet-selector-both.png %%CPUFREQ%%share/gnome/help/cpufreq-applet/uk/figures/cpufreq-applet-selector.png %%CPUFREQ%%share/gnome/help/cpufreq-applet/uk/figures/cpufreq-applet.png -%%CPUFREQ%%share/gnome/help/cpufreq-applet/uk/legal.xml share/gnome/help/drivemount/C/drivemount.xml share/gnome/help/drivemount/C/figures/drivemount-applet_eject.png share/gnome/help/drivemount/C/figures/drivemount-applet_example.png @@ -387,184 +234,56 @@ share/gnome/help/drivemount/C/figures/drivemount-applet_mount.png share/gnome/help/drivemount/C/figures/drivemount-applet_open.png share/gnome/help/drivemount/C/figures/drivemount-applet_status.png share/gnome/help/drivemount/C/legal.xml -share/gnome/help/drivemount/de/drivemount.xml -share/gnome/help/drivemount/de/figures/drivemount-applet_window.png -share/gnome/help/drivemount/de/figures/drivemount_applet_all.png -share/gnome/help/drivemount/de/figures/drivemount_applet_floppy.png -share/gnome/help/drivemount/de/figures/drivemount_applet_settings.png -share/gnome/help/drivemount/de/figures/drivemount_applet_tooltip.png -share/gnome/help/drivemount/de/legal.xml share/gnome/help/drivemount/es/drivemount.xml -share/gnome/help/drivemount/es/figures/drivemount-applet_window.png -share/gnome/help/drivemount/es/figures/drivemount_applet_all.png -share/gnome/help/drivemount/es/figures/drivemount_applet_floppy.png -share/gnome/help/drivemount/es/figures/drivemount_applet_settings.png -share/gnome/help/drivemount/es/figures/drivemount_applet_tooltip.png -share/gnome/help/drivemount/es/legal.xml -share/gnome/help/drivemount/eu/drivemount.xml -share/gnome/help/drivemount/eu/figures/drivemount_applet_all.png -share/gnome/help/drivemount/eu/figures/drivemount_applet_floppy.png -share/gnome/help/drivemount/eu/figures/drivemount_applet_settings.png -share/gnome/help/drivemount/eu/figures/drivemount_applet_tooltip.png -share/gnome/help/drivemount/eu/legal.xml -share/gnome/help/drivemount/fr/drivemount.xml -share/gnome/help/drivemount/fr/figures/drivemount-applet_window.png -share/gnome/help/drivemount/fr/figures/drivemount_applet_all.png -share/gnome/help/drivemount/fr/figures/drivemount_applet_floppy.png -share/gnome/help/drivemount/fr/figures/drivemount_applet_settings.png -share/gnome/help/drivemount/fr/figures/drivemount_applet_tooltip.png -share/gnome/help/drivemount/fr/legal.xml +share/gnome/help/drivemount/es/figures/drivemount-applet_eject.png +share/gnome/help/drivemount/es/figures/drivemount-applet_example.png +share/gnome/help/drivemount/es/figures/drivemount-applet_mount.png +share/gnome/help/drivemount/es/figures/drivemount-applet_open.png +share/gnome/help/drivemount/es/figures/drivemount-applet_status.png share/gnome/help/drivemount/it/drivemount.xml -share/gnome/help/drivemount/it/figures/drivemount-applet_window.png -share/gnome/help/drivemount/it/figures/drivemount_applet_all.png -share/gnome/help/drivemount/it/figures/drivemount_applet_floppy.png -share/gnome/help/drivemount/it/figures/drivemount_applet_settings.png -share/gnome/help/drivemount/it/figures/drivemount_applet_tooltip.png -share/gnome/help/drivemount/it/legal.xml -share/gnome/help/drivemount/ja/drivemount.xml -share/gnome/help/drivemount/ja/figures/drivemount-applet_window.png -share/gnome/help/drivemount/ja/figures/drivemount_applet_all.png -share/gnome/help/drivemount/ja/figures/drivemount_applet_floppy.png -share/gnome/help/drivemount/ja/figures/drivemount_applet_settings.png -share/gnome/help/drivemount/ja/figures/drivemount_applet_tooltip.png -share/gnome/help/drivemount/ja/legal.xml -share/gnome/help/drivemount/ko/drivemount.xml -share/gnome/help/drivemount/ko/figures/drivemount-applet_window.png -share/gnome/help/drivemount/ko/figures/drivemount_applet_all.png -share/gnome/help/drivemount/ko/figures/drivemount_applet_floppy.png -share/gnome/help/drivemount/ko/figures/drivemount_applet_settings.png -share/gnome/help/drivemount/ko/figures/drivemount_applet_tooltip.png -share/gnome/help/drivemount/ko/legal.xml -share/gnome/help/drivemount/sv/drivemount.xml -share/gnome/help/drivemount/sv/figures/drivemount-applet_window.png -share/gnome/help/drivemount/sv/figures/drivemount_applet_all.png -share/gnome/help/drivemount/sv/figures/drivemount_applet_floppy.png -share/gnome/help/drivemount/sv/figures/drivemount_applet_settings.png -share/gnome/help/drivemount/sv/figures/drivemount_applet_tooltip.png -share/gnome/help/drivemount/sv/legal.xml +share/gnome/help/drivemount/it/figures/drivemount-applet_eject.png +share/gnome/help/drivemount/it/figures/drivemount-applet_example.png +share/gnome/help/drivemount/it/figures/drivemount-applet_mount.png +share/gnome/help/drivemount/it/figures/drivemount-applet_open.png +share/gnome/help/drivemount/it/figures/drivemount-applet_status.png +share/gnome/help/drivemount/pa/drivemount.xml +share/gnome/help/drivemount/pa/figures/drivemount-applet_eject.png +share/gnome/help/drivemount/pa/figures/drivemount-applet_example.png +share/gnome/help/drivemount/pa/figures/drivemount-applet_mount.png +share/gnome/help/drivemount/pa/figures/drivemount-applet_open.png +share/gnome/help/drivemount/pa/figures/drivemount-applet_status.png share/gnome/help/drivemount/uk/drivemount.xml share/gnome/help/drivemount/uk/figures/drivemount-applet_eject.png share/gnome/help/drivemount/uk/figures/drivemount-applet_example.png share/gnome/help/drivemount/uk/figures/drivemount-applet_mount.png share/gnome/help/drivemount/uk/figures/drivemount-applet_open.png share/gnome/help/drivemount/uk/figures/drivemount-applet_status.png -share/gnome/help/drivemount/uk/legal.xml -share/gnome/help/drivemount/zh_CN/drivemount.xml -share/gnome/help/drivemount/zh_CN/figures/drivemount-applet_window.png -share/gnome/help/drivemount/zh_CN/figures/drivemount_applet_all.png -share/gnome/help/drivemount/zh_CN/figures/drivemount_applet_floppy.png -share/gnome/help/drivemount/zh_CN/figures/drivemount_applet_settings.png -share/gnome/help/drivemount/zh_CN/figures/drivemount_applet_tooltip.png -share/gnome/help/drivemount/zh_CN/legal.xml -share/gnome/help/drivemount/zh_HK/drivemount.xml -share/gnome/help/drivemount/zh_HK/figures/drivemount-applet_window.png -share/gnome/help/drivemount/zh_HK/figures/drivemount_applet_all.png -share/gnome/help/drivemount/zh_HK/figures/drivemount_applet_floppy.png -share/gnome/help/drivemount/zh_HK/figures/drivemount_applet_settings.png -share/gnome/help/drivemount/zh_HK/figures/drivemount_applet_tooltip.png -share/gnome/help/drivemount/zh_HK/legal.xml -share/gnome/help/drivemount/zh_TW/drivemount.xml -share/gnome/help/drivemount/zh_TW/figures/drivemount-applet_window.png -share/gnome/help/drivemount/zh_TW/figures/drivemount_applet_all.png -share/gnome/help/drivemount/zh_TW/figures/drivemount_applet_floppy.png -share/gnome/help/drivemount/zh_TW/figures/drivemount_applet_settings.png -share/gnome/help/drivemount/zh_TW/figures/drivemount_applet_tooltip.png -share/gnome/help/drivemount/zh_TW/legal.xml share/gnome/help/geyes/C/figures/geyes_applet.png share/gnome/help/geyes/C/geyes.xml share/gnome/help/geyes/C/legal.xml -share/gnome/help/geyes/de/figures/geyes_applet.png -share/gnome/help/geyes/de/figures/geyes_settings.png -share/gnome/help/geyes/de/geyes.xml -share/gnome/help/geyes/de/legal.xml share/gnome/help/geyes/es/figures/geyes_applet.png -share/gnome/help/geyes/es/figures/geyes_settings.png share/gnome/help/geyes/es/geyes.xml -share/gnome/help/geyes/es/legal.xml -share/gnome/help/geyes/eu/figures/geyes_applet.png -share/gnome/help/geyes/eu/geyes.xml -share/gnome/help/geyes/eu/legal.xml -share/gnome/help/geyes/fr/figures/geyes_applet.png -share/gnome/help/geyes/fr/figures/geyes_settings.png -share/gnome/help/geyes/fr/geyes.xml -share/gnome/help/geyes/fr/legal.xml share/gnome/help/geyes/it/figures/geyes_applet.png -share/gnome/help/geyes/it/figures/geyes_settings.png share/gnome/help/geyes/it/geyes.xml -share/gnome/help/geyes/it/legal.xml -share/gnome/help/geyes/ja/figures/geyes_applet.png -share/gnome/help/geyes/ja/figures/geyes_settings.png -share/gnome/help/geyes/ja/geyes.xml -share/gnome/help/geyes/ja/legal.xml -share/gnome/help/geyes/ko/figures/geyes_applet.png -share/gnome/help/geyes/ko/figures/geyes_settings.png -share/gnome/help/geyes/ko/geyes.xml -share/gnome/help/geyes/ko/legal.xml -share/gnome/help/geyes/sv/figures/geyes_applet.png -share/gnome/help/geyes/sv/figures/geyes_settings.png -share/gnome/help/geyes/sv/geyes.xml -share/gnome/help/geyes/sv/legal.xml share/gnome/help/geyes/uk/figures/geyes_applet.png share/gnome/help/geyes/uk/geyes.xml -share/gnome/help/geyes/uk/legal.xml -share/gnome/help/geyes/zh_CN/figures/geyes_applet.png -share/gnome/help/geyes/zh_CN/figures/geyes_settings.png -share/gnome/help/geyes/zh_CN/geyes.xml -share/gnome/help/geyes/zh_CN/legal.xml -share/gnome/help/geyes/zh_HK/figures/geyes_applet.png -share/gnome/help/geyes/zh_HK/geyes.xml -share/gnome/help/geyes/zh_HK/legal.xml -share/gnome/help/geyes/zh_TW/figures/geyes_applet.png -share/gnome/help/geyes/zh_TW/figures/geyes_settings.png -share/gnome/help/geyes/zh_TW/geyes.xml -share/gnome/help/geyes/zh_TW/legal.xml share/gnome/help/gswitchit/C/gswitchit.xml share/gnome/help/gswitchit/C/legal.xml +share/gnome/help/gswitchit/es/gswitchit.xml +share/gnome/help/gswitchit/fr/gswitchit.xml share/gnome/help/gswitchit/uk/gswitchit.xml -share/gnome/help/gswitchit/uk/legal.xml share/gnome/help/gtik2_applet2/C/figures/gtik_applet.png share/gnome/help/gtik2_applet2/C/gtik2_applet2.xml share/gnome/help/gtik2_applet2/C/legal.xml -share/gnome/help/gtik2_applet2/de/figures/gtik_applet.png -share/gnome/help/gtik2_applet2/de/gtik2_applet2.xml -share/gnome/help/gtik2_applet2/de/legal.xml share/gnome/help/gtik2_applet2/es/figures/gtik_applet.png share/gnome/help/gtik2_applet2/es/gtik2_applet2.xml -share/gnome/help/gtik2_applet2/es/legal.xml -share/gnome/help/gtik2_applet2/eu/figures/gtik_applet.png -share/gnome/help/gtik2_applet2/eu/gtik2_applet2.xml -share/gnome/help/gtik2_applet2/eu/legal.xml -share/gnome/help/gtik2_applet2/fr/figures/gtik_applet.png -share/gnome/help/gtik2_applet2/fr/gtik2_applet2.xml -share/gnome/help/gtik2_applet2/fr/legal.xml -share/gnome/help/gtik2_applet2/it/figures/gtik_applet.png -share/gnome/help/gtik2_applet2/it/gtik2_applet2.xml -share/gnome/help/gtik2_applet2/it/legal.xml -share/gnome/help/gtik2_applet2/ja/figures/gtik_applet.png -share/gnome/help/gtik2_applet2/ja/gtik2_applet2.xml -share/gnome/help/gtik2_applet2/ja/legal.xml -share/gnome/help/gtik2_applet2/ko/figures/gtik_applet.png -share/gnome/help/gtik2_applet2/ko/gtik2_applet2.xml -share/gnome/help/gtik2_applet2/ko/legal.xml -share/gnome/help/gtik2_applet2/sv/figures/gtik_applet.png -share/gnome/help/gtik2_applet2/sv/gtik2_applet2.xml -share/gnome/help/gtik2_applet2/sv/legal.xml share/gnome/help/gtik2_applet2/uk/figures/gtik_applet.png share/gnome/help/gtik2_applet2/uk/gtik2_applet2.xml -share/gnome/help/gtik2_applet2/uk/legal.xml -share/gnome/help/gtik2_applet2/zh_CN/figures/gtik_applet.png -share/gnome/help/gtik2_applet2/zh_CN/gtik2_applet2.xml -share/gnome/help/gtik2_applet2/zh_CN/legal.xml -share/gnome/help/gtik2_applet2/zh_HK/figures/gtik_applet.png -share/gnome/help/gtik2_applet2/zh_HK/gtik2_applet2.xml -share/gnome/help/gtik2_applet2/zh_HK/legal.xml -share/gnome/help/gtik2_applet2/zh_TW/figures/gtik_applet.png -share/gnome/help/gtik2_applet2/zh_TW/gtik2_applet2.xml -share/gnome/help/gtik2_applet2/zh_TW/legal.xml -share/gnome/help/gweather/C/figures/gweather_applet.png share/gnome/help/gweather/C/figures/gweather-details.png +share/gnome/help/gweather/C/figures/gweather-menu-prefs.png share/gnome/help/gweather/C/figures/gweather-prefs-general.png share/gnome/help/gweather/C/figures/gweather-prefs-locations.png +share/gnome/help/gweather/C/figures/gweather_applet.png share/gnome/help/gweather/C/figures/stock_weather-cloudy.png share/gnome/help/gweather/C/figures/stock_weather-few-clouds.png share/gnome/help/gweather/C/figures/stock_weather-fog.png @@ -576,47 +295,23 @@ share/gnome/help/gweather/C/figures/stock_weather-storm.png share/gnome/help/gweather/C/figures/stock_weather-sunny.png share/gnome/help/gweather/C/gweather.xml share/gnome/help/gweather/C/legal.xml -share/gnome/help/gweather/de/figures/gweather_applet.png -share/gnome/help/gweather/de/figures/gweather_settings.png -share/gnome/help/gweather/de/figures/gweather_weather.png -share/gnome/help/gweather/de/gweather.xml -share/gnome/help/gweather/de/legal.xml +share/gnome/help/gweather/es/figures/gweather-details.png +share/gnome/help/gweather/es/figures/gweather-menu-prefs.png +share/gnome/help/gweather/es/figures/gweather-prefs-general.png +share/gnome/help/gweather/es/figures/gweather-prefs-locations.png share/gnome/help/gweather/es/figures/gweather_applet.png -share/gnome/help/gweather/es/figures/gweather_settings.png -share/gnome/help/gweather/es/figures/gweather_weather.png +share/gnome/help/gweather/es/figures/stock_weather-cloudy.png +share/gnome/help/gweather/es/figures/stock_weather-few-clouds.png +share/gnome/help/gweather/es/figures/stock_weather-fog.png +share/gnome/help/gweather/es/figures/stock_weather-night-clear.png +share/gnome/help/gweather/es/figures/stock_weather-night-few-clouds.png +share/gnome/help/gweather/es/figures/stock_weather-showers.png +share/gnome/help/gweather/es/figures/stock_weather-snow.png +share/gnome/help/gweather/es/figures/stock_weather-storm.png +share/gnome/help/gweather/es/figures/stock_weather-sunny.png share/gnome/help/gweather/es/gweather.xml -share/gnome/help/gweather/es/legal.xml -share/gnome/help/gweather/eu/figures/gweather_applet.png -share/gnome/help/gweather/eu/figures/gweather_settings.png -share/gnome/help/gweather/eu/figures/gweather_weather.png -share/gnome/help/gweather/eu/gweather.xml -share/gnome/help/gweather/eu/legal.xml -share/gnome/help/gweather/fr/figures/gweather_applet.png -share/gnome/help/gweather/fr/figures/gweather_settings.png -share/gnome/help/gweather/fr/figures/gweather_weather.png -share/gnome/help/gweather/fr/gweather.xml -share/gnome/help/gweather/fr/legal.xml -share/gnome/help/gweather/it/figures/gweather_applet.png -share/gnome/help/gweather/it/figures/gweather_settings.png -share/gnome/help/gweather/it/figures/gweather_weather.png -share/gnome/help/gweather/it/gweather.xml -share/gnome/help/gweather/it/legal.xml -share/gnome/help/gweather/ja/figures/gweather_applet.png -share/gnome/help/gweather/ja/figures/gweather_settings.png -share/gnome/help/gweather/ja/figures/gweather_weather.png -share/gnome/help/gweather/ja/gweather.xml -share/gnome/help/gweather/ja/legal.xml -share/gnome/help/gweather/ko/figures/gweather_applet.png -share/gnome/help/gweather/ko/figures/gweather_settings.png -share/gnome/help/gweather/ko/figures/gweather_weather.png -share/gnome/help/gweather/ko/gweather.xml -share/gnome/help/gweather/ko/legal.xml -share/gnome/help/gweather/sv/figures/gweather_applet.png -share/gnome/help/gweather/sv/figures/gweather_settings.png -share/gnome/help/gweather/sv/figures/gweather_weather.png -share/gnome/help/gweather/sv/gweather.xml -share/gnome/help/gweather/sv/legal.xml share/gnome/help/gweather/uk/figures/gweather-details.png +share/gnome/help/gweather/uk/figures/gweather-menu-prefs.png share/gnome/help/gweather/uk/figures/gweather-prefs-general.png share/gnome/help/gweather/uk/figures/gweather-prefs-locations.png share/gnome/help/gweather/uk/figures/gweather_applet.png @@ -630,306 +325,112 @@ share/gnome/help/gweather/uk/figures/stock_weather-snow.png share/gnome/help/gweather/uk/figures/stock_weather-storm.png share/gnome/help/gweather/uk/figures/stock_weather-sunny.png share/gnome/help/gweather/uk/gweather.xml -share/gnome/help/gweather/uk/legal.xml -share/gnome/help/gweather/zh_CN/figures/gweather_applet.png -share/gnome/help/gweather/zh_CN/figures/gweather_settings.png -share/gnome/help/gweather/zh_CN/figures/gweather_weather.png -share/gnome/help/gweather/zh_CN/gweather.xml -share/gnome/help/gweather/zh_CN/legal.xml -share/gnome/help/gweather/zh_HK/figures/gweather_applet.png -share/gnome/help/gweather/zh_HK/figures/gweather_settings.png -share/gnome/help/gweather/zh_HK/figures/gweather_weather.png -share/gnome/help/gweather/zh_HK/gweather.xml -share/gnome/help/gweather/zh_HK/legal.xml -share/gnome/help/gweather/zh_TW/figures/gweather_applet.png -share/gnome/help/gweather/zh_TW/figures/gweather_settings.png -share/gnome/help/gweather/zh_TW/figures/gweather_weather.png -share/gnome/help/gweather/zh_TW/gweather.xml -share/gnome/help/gweather/zh_TW/legal.xml share/gnome/help/mixer_applet2/C/figures/volumecontrol_applet.png share/gnome/help/mixer_applet2/C/legal.xml share/gnome/help/mixer_applet2/C/mixer_applet2.xml -share/gnome/help/mixer_applet2/de/figures/mixer_applet.png -share/gnome/help/mixer_applet2/de/figures/volumecontrol_applet.png -share/gnome/help/mixer_applet2/de/legal.xml -share/gnome/help/mixer_applet2/de/mixer_applet2.xml -share/gnome/help/mixer_applet2/es/figures/mixer_applet.png share/gnome/help/mixer_applet2/es/figures/volumecontrol_applet.png -share/gnome/help/mixer_applet2/es/legal.xml share/gnome/help/mixer_applet2/es/mixer_applet2.xml -share/gnome/help/mixer_applet2/eu/figures/volumecontrol_applet.png -share/gnome/help/mixer_applet2/eu/legal.xml -share/gnome/help/mixer_applet2/eu/mixer_applet2.xml -share/gnome/help/mixer_applet2/fr/figures/mixer_applet.png -share/gnome/help/mixer_applet2/fr/figures/volumecontrol_applet.png -share/gnome/help/mixer_applet2/fr/legal.xml -share/gnome/help/mixer_applet2/fr/mixer_applet2.xml -share/gnome/help/mixer_applet2/it/figures/mixer_applet.png -share/gnome/help/mixer_applet2/it/figures/volumecontrol_applet.png -share/gnome/help/mixer_applet2/it/legal.xml -share/gnome/help/mixer_applet2/it/mixer_applet2.xml -share/gnome/help/mixer_applet2/ja/figures/mixer_applet.png -share/gnome/help/mixer_applet2/ja/figures/volumecontrol_applet.png -share/gnome/help/mixer_applet2/ja/legal.xml -share/gnome/help/mixer_applet2/ja/mixer_applet2.xml -share/gnome/help/mixer_applet2/ko/figures/mixer_applet.png -share/gnome/help/mixer_applet2/ko/figures/volumecontrol_applet.png -share/gnome/help/mixer_applet2/ko/legal.xml -share/gnome/help/mixer_applet2/ko/mixer_applet2.xml -share/gnome/help/mixer_applet2/sv/figures/mixer_applet.png -share/gnome/help/mixer_applet2/sv/figures/volumecontrol_applet.png -share/gnome/help/mixer_applet2/sv/legal.xml -share/gnome/help/mixer_applet2/sv/mixer_applet2.xml share/gnome/help/mixer_applet2/uk/figures/volumecontrol_applet.png -share/gnome/help/mixer_applet2/uk/legal.xml share/gnome/help/mixer_applet2/uk/mixer_applet2.xml -share/gnome/help/mixer_applet2/zh_CN/figures/mixer_applet.png -share/gnome/help/mixer_applet2/zh_CN/figures/volumecontrol_applet.png -share/gnome/help/mixer_applet2/zh_CN/legal.xml -share/gnome/help/mixer_applet2/zh_CN/mixer_applet2.xml -share/gnome/help/mixer_applet2/zh_HK/figures/volumecontrol_applet.png -share/gnome/help/mixer_applet2/zh_HK/legal.xml -share/gnome/help/mixer_applet2/zh_HK/mixer_applet2.xml -share/gnome/help/mixer_applet2/zh_TW/figures/mixer_applet.png -share/gnome/help/mixer_applet2/zh_TW/figures/volumecontrol_applet.png -share/gnome/help/mixer_applet2/zh_TW/legal.xml -share/gnome/help/mixer_applet2/zh_TW/mixer_applet2.xml share/gnome/help/multiload/C/figures/multiload-preferences.png share/gnome/help/multiload/C/figures/system-monitor-applet_window.png share/gnome/help/multiload/C/figures/system_monitor.png share/gnome/help/multiload/C/legal.xml share/gnome/help/multiload/C/multiload.xml -share/gnome/help/multiload/de/figures/system-monitor-applet_window.png -share/gnome/help/multiload/de/legal.xml -share/gnome/help/multiload/de/multiload.xml +share/gnome/help/multiload/es/figures/multiload-preferences.png share/gnome/help/multiload/es/figures/system-monitor-applet_window.png -share/gnome/help/multiload/es/legal.xml +share/gnome/help/multiload/es/figures/system_monitor.png share/gnome/help/multiload/es/multiload.xml -share/gnome/help/multiload/eu/figures/system_monitor.png -share/gnome/help/multiload/eu/figures/system_monitor_prefs.png -share/gnome/help/multiload/eu/legal.xml -share/gnome/help/multiload/eu/multiload.xml -share/gnome/help/multiload/fr/figures/system-monitor-applet_window.png -share/gnome/help/multiload/fr/legal.xml -share/gnome/help/multiload/fr/multiload.xml -share/gnome/help/multiload/it/figures/system-monitor-applet_window.png -share/gnome/help/multiload/it/legal.xml -share/gnome/help/multiload/it/multiload.xml -share/gnome/help/multiload/ja/figures/system-monitor-applet_window.png -share/gnome/help/multiload/ja/legal.xml -share/gnome/help/multiload/ja/multiload.xml -share/gnome/help/multiload/ko/figures/system-monitor-applet_window.png -share/gnome/help/multiload/ko/legal.xml -share/gnome/help/multiload/ko/multiload.xml -share/gnome/help/multiload/sv/figures/system-monitor-applet_window.png -share/gnome/help/multiload/sv/legal.xml -share/gnome/help/multiload/sv/multiload.xml share/gnome/help/multiload/uk/figures/multiload-preferences.png share/gnome/help/multiload/uk/figures/system-monitor-applet_window.png share/gnome/help/multiload/uk/figures/system_monitor.png -share/gnome/help/multiload/uk/legal.xml share/gnome/help/multiload/uk/multiload.xml -share/gnome/help/multiload/zh_CN/figures/system-monitor-applet_window.png -share/gnome/help/multiload/zh_CN/legal.xml -share/gnome/help/multiload/zh_CN/multiload.xml -share/gnome/help/multiload/zh_HK/figures/system-monitor-applet_window.png -share/gnome/help/multiload/zh_HK/legal.xml -share/gnome/help/multiload/zh_HK/multiload.xml -share/gnome/help/multiload/zh_TW/figures/system-monitor-applet_window.png -share/gnome/help/multiload/zh_TW/legal.xml -share/gnome/help/multiload/zh_TW/multiload.xml -share/gnome/help/stickynotes_applet/C/legal.xml -share/gnome/help/stickynotes_applet/C/stickynotes_applet.xml -share/gnome/help/stickynotes_applet/C/figures/stickynote-left-menu.png -share/gnome/help/stickynotes_applet/C/figures/stickynote-right-menu.png +share/gnome/help/stickynotes_applet/C/figures/stickynote-right-menu-lock.png +share/gnome/help/stickynotes_applet/C/figures/stickynote-right-menu-new.png share/gnome/help/stickynotes_applet/C/figures/stickynotes-note-prefs.png share/gnome/help/stickynotes_applet/C/figures/stickynotes-prefs.png share/gnome/help/stickynotes_applet/C/figures/stickynotes_applet.png -share/gnome/help/stickynotes_applet/de/figures/stickynotes_applet.png -share/gnome/help/stickynotes_applet/de/legal.xml -share/gnome/help/stickynotes_applet/de/stickynotes_applet.xml +share/gnome/help/stickynotes_applet/C/legal.xml +share/gnome/help/stickynotes_applet/C/stickynotes_applet.xml +share/gnome/help/stickynotes_applet/es/figures/stickynote-right-menu-lock.png +share/gnome/help/stickynotes_applet/es/figures/stickynote-right-menu-new.png +share/gnome/help/stickynotes_applet/es/figures/stickynotes-note-prefs.png +share/gnome/help/stickynotes_applet/es/figures/stickynotes-prefs.png share/gnome/help/stickynotes_applet/es/figures/stickynotes_applet.png -share/gnome/help/stickynotes_applet/es/legal.xml share/gnome/help/stickynotes_applet/es/stickynotes_applet.xml -share/gnome/help/stickynotes_applet/eu/figures/stickynotes_applet.png -share/gnome/help/stickynotes_applet/eu/legal.xml -share/gnome/help/stickynotes_applet/eu/stickynotes_applet.xml -share/gnome/help/stickynotes_applet/fr/figures/stickynotes_applet.png -share/gnome/help/stickynotes_applet/fr/legal.xml -share/gnome/help/stickynotes_applet/fr/stickynotes_applet.xml -share/gnome/help/stickynotes_applet/it/figures/stickynotes_applet.png -share/gnome/help/stickynotes_applet/it/legal.xml -share/gnome/help/stickynotes_applet/it/stickynotes_applet.xml -share/gnome/help/stickynotes_applet/ja/figures/stickynotes_applet.png -share/gnome/help/stickynotes_applet/ja/legal.xml -share/gnome/help/stickynotes_applet/ja/stickynotes_applet.xml -share/gnome/help/stickynotes_applet/ko/figures/stickynotes_applet.png -share/gnome/help/stickynotes_applet/ko/legal.xml -share/gnome/help/stickynotes_applet/ko/stickynotes_applet.xml -share/gnome/help/stickynotes_applet/sv/figures/stickynotes_applet.png -share/gnome/help/stickynotes_applet/sv/legal.xml -share/gnome/help/stickynotes_applet/sv/stickynotes_applet.xml -share/gnome/help/stickynotes_applet/uk/figures/stickynote-left-menu.png -share/gnome/help/stickynotes_applet/uk/figures/stickynote-right-menu.png +share/gnome/help/stickynotes_applet/uk/figures/stickynote-right-menu-lock.png +share/gnome/help/stickynotes_applet/uk/figures/stickynote-right-menu-new.png share/gnome/help/stickynotes_applet/uk/figures/stickynotes-note-prefs.png share/gnome/help/stickynotes_applet/uk/figures/stickynotes-prefs.png share/gnome/help/stickynotes_applet/uk/figures/stickynotes_applet.png -share/gnome/help/stickynotes_applet/uk/legal.xml share/gnome/help/stickynotes_applet/uk/stickynotes_applet.xml -share/gnome/help/stickynotes_applet/zh_CN/figures/stickynotes_applet.png -share/gnome/help/stickynotes_applet/zh_CN/legal.xml -share/gnome/help/stickynotes_applet/zh_CN/stickynotes_applet.xml -share/gnome/help/stickynotes_applet/zh_HK/figures/stickynotes_applet.png -share/gnome/help/stickynotes_applet/zh_HK/legal.xml -share/gnome/help/stickynotes_applet/zh_HK/stickynotes_applet.xml -share/gnome/help/stickynotes_applet/zh_TW/figures/stickynotes_applet.png -share/gnome/help/stickynotes_applet/zh_TW/legal.xml -share/gnome/help/stickynotes_applet/zh_TW/stickynotes_applet.xml -share/gnome/help/trashapplet/C/legal.xml share/gnome/help/trashapplet/C/figures/trash-applet.png +share/gnome/help/trashapplet/C/legal.xml share/gnome/help/trashapplet/C/trashapplet.xml +share/gnome/help/trashapplet/es/figures/trash-applet.png +share/gnome/help/trashapplet/es/trashapplet.xml +share/gnome/help/trashapplet/fr/figures/trash-applet.png +share/gnome/help/trashapplet/fr/trashapplet.xml +share/gnome/help/trashapplet/it/figures/trash-applet.png +share/gnome/help/trashapplet/it/trashapplet.xml +share/gnome/help/trashapplet/pa/figures/trash-applet.png +share/gnome/help/trashapplet/pa/trashapplet.xml share/gnome/help/trashapplet/uk/figures/trash-applet.png -share/gnome/help/trashapplet/uk/legal.xml share/gnome/help/trashapplet/uk/trashapplet.xml -share/gnome/omf/gnome-applets/accessx-status-C.omf -share/gnome/omf/gnome-applets/accessx-status-uk.omf -share/gnome/omf/gnome-applets/accessx-status-eu.omf -%%BATTERY%%share/gnome/omf/gnome-applets/battstat-C.omf -%%BATTERY%%share/gnome/omf/gnome-applets/battstat-de.omf -%%BATTERY%%share/gnome/omf/gnome-applets/battstat-es.omf -%%BATTERY%%share/gnome/omf/gnome-applets/battstat-eu.omf -%%BATTERY%%share/gnome/omf/gnome-applets/battstat-fr.omf -%%BATTERY%%share/gnome/omf/gnome-applets/battstat-it.omf -%%BATTERY%%share/gnome/omf/gnome-applets/battstat-ja.omf -%%BATTERY%%share/gnome/omf/gnome-applets/battstat-ko.omf -%%BATTERY%%share/gnome/omf/gnome-applets/battstat-sv.omf -%%BATTERY%%share/gnome/omf/gnome-applets/battstat-uk.omf -%%BATTERY%%share/gnome/omf/gnome-applets/battstat-zh_CN.omf -%%BATTERY%%share/gnome/omf/gnome-applets/battstat-zh_HK.omf -%%BATTERY%%share/gnome/omf/gnome-applets/battstat-zh_TW.omf -share/gnome/omf/gnome-applets/char-palette-C.omf -share/gnome/omf/gnome-applets/char-palette-de.omf -share/gnome/omf/gnome-applets/char-palette-es.omf -share/gnome/omf/gnome-applets/char-palette-eu.omf -share/gnome/omf/gnome-applets/char-palette-fr.omf -share/gnome/omf/gnome-applets/char-palette-it.omf -share/gnome/omf/gnome-applets/char-palette-ja.omf -share/gnome/omf/gnome-applets/char-palette-ko.omf -share/gnome/omf/gnome-applets/char-palette-sv.omf -share/gnome/omf/gnome-applets/char-palette-uk.omf -share/gnome/omf/gnome-applets/char-palette-zh_CN.omf -share/gnome/omf/gnome-applets/char-palette-zh_HK.omf -share/gnome/omf/gnome-applets/char-palette-zh_TW.omf -share/gnome/omf/gnome-applets/command-line-C.omf -share/gnome/omf/gnome-applets/command-line-de.omf -share/gnome/omf/gnome-applets/command-line-es.omf -share/gnome/omf/gnome-applets/command-line-eu.omf -share/gnome/omf/gnome-applets/command-line-fr.omf -share/gnome/omf/gnome-applets/command-line-it.omf -share/gnome/omf/gnome-applets/command-line-ja.omf -share/gnome/omf/gnome-applets/command-line-ko.omf -share/gnome/omf/gnome-applets/command-line-sv.omf -share/gnome/omf/gnome-applets/command-line-uk.omf -share/gnome/omf/gnome-applets/command-line-zh_CN.omf -share/gnome/omf/gnome-applets/command-line-zh_HK.omf -share/gnome/omf/gnome-applets/command-line-zh_TW.omf -%%CPUFREQ%%share/gnome/omf/gnome-applets/cpufreq-applet-C.omf -%%CPUFREQ%%share/gnome/omf/gnome-applets/cpufreq-applet-uk.omf -share/gnome/omf/gnome-applets/drivemount-C.omf -share/gnome/omf/gnome-applets/drivemount-de.omf -share/gnome/omf/gnome-applets/drivemount-es.omf -share/gnome/omf/gnome-applets/drivemount-eu.omf -share/gnome/omf/gnome-applets/drivemount-fr.omf -share/gnome/omf/gnome-applets/drivemount-it.omf -share/gnome/omf/gnome-applets/drivemount-ja.omf -share/gnome/omf/gnome-applets/drivemount-ko.omf -share/gnome/omf/gnome-applets/drivemount-sv.omf -share/gnome/omf/gnome-applets/drivemount-uk.omf -share/gnome/omf/gnome-applets/drivemount-zh_CN.omf -share/gnome/omf/gnome-applets/drivemount-zh_HK.omf -share/gnome/omf/gnome-applets/drivemount-zh_TW.omf -share/gnome/omf/gnome-applets/geyes-C.omf -share/gnome/omf/gnome-applets/geyes-de.omf -share/gnome/omf/gnome-applets/geyes-es.omf -share/gnome/omf/gnome-applets/geyes-eu.omf -share/gnome/omf/gnome-applets/geyes-fr.omf -share/gnome/omf/gnome-applets/geyes-it.omf -share/gnome/omf/gnome-applets/geyes-ja.omf -share/gnome/omf/gnome-applets/geyes-ko.omf -share/gnome/omf/gnome-applets/geyes-sv.omf -share/gnome/omf/gnome-applets/geyes-uk.omf -share/gnome/omf/gnome-applets/geyes-zh_CN.omf -share/gnome/omf/gnome-applets/geyes-zh_HK.omf -share/gnome/omf/gnome-applets/geyes-zh_TW.omf -share/gnome/omf/gnome-applets/gswitchit-C.omf -share/gnome/omf/gnome-applets/gswitchit-uk.omf -share/gnome/omf/gnome-applets/gtik2_applet2-C.omf -share/gnome/omf/gnome-applets/gtik2_applet2-de.omf -share/gnome/omf/gnome-applets/gtik2_applet2-es.omf -share/gnome/omf/gnome-applets/gtik2_applet2-eu.omf -share/gnome/omf/gnome-applets/gtik2_applet2-fr.omf -share/gnome/omf/gnome-applets/gtik2_applet2-it.omf -share/gnome/omf/gnome-applets/gtik2_applet2-ja.omf -share/gnome/omf/gnome-applets/gtik2_applet2-ko.omf -share/gnome/omf/gnome-applets/gtik2_applet2-sv.omf -share/gnome/omf/gnome-applets/gtik2_applet2-uk.omf -share/gnome/omf/gnome-applets/gtik2_applet2-zh_CN.omf -share/gnome/omf/gnome-applets/gtik2_applet2-zh_HK.omf -share/gnome/omf/gnome-applets/gtik2_applet2-zh_TW.omf -share/gnome/omf/gnome-applets/gweather-C.omf -share/gnome/omf/gnome-applets/gweather-de.omf -share/gnome/omf/gnome-applets/gweather-es.omf -share/gnome/omf/gnome-applets/gweather-eu.omf -share/gnome/omf/gnome-applets/gweather-fr.omf -share/gnome/omf/gnome-applets/gweather-it.omf -share/gnome/omf/gnome-applets/gweather-ja.omf -share/gnome/omf/gnome-applets/gweather-ko.omf -share/gnome/omf/gnome-applets/gweather-sv.omf -share/gnome/omf/gnome-applets/gweather-uk.omf -share/gnome/omf/gnome-applets/gweather-zh_CN.omf -share/gnome/omf/gnome-applets/gweather-zh_HK.omf -share/gnome/omf/gnome-applets/gweather-zh_TW.omf -share/gnome/omf/gnome-applets/mixer_applet2-C.omf -share/gnome/omf/gnome-applets/mixer_applet2-de.omf -share/gnome/omf/gnome-applets/mixer_applet2-es.omf -share/gnome/omf/gnome-applets/mixer_applet2-eu.omf -share/gnome/omf/gnome-applets/mixer_applet2-fr.omf -share/gnome/omf/gnome-applets/mixer_applet2-it.omf -share/gnome/omf/gnome-applets/mixer_applet2-ja.omf -share/gnome/omf/gnome-applets/mixer_applet2-ko.omf -share/gnome/omf/gnome-applets/mixer_applet2-sv.omf -share/gnome/omf/gnome-applets/mixer_applet2-uk.omf -share/gnome/omf/gnome-applets/mixer_applet2-zh_CN.omf -share/gnome/omf/gnome-applets/mixer_applet2-zh_HK.omf -share/gnome/omf/gnome-applets/mixer_applet2-zh_TW.omf -share/gnome/omf/gnome-applets/multiload-C.omf -share/gnome/omf/gnome-applets/multiload-de.omf -share/gnome/omf/gnome-applets/multiload-es.omf -share/gnome/omf/gnome-applets/multiload-eu.omf -share/gnome/omf/gnome-applets/multiload-fr.omf -share/gnome/omf/gnome-applets/multiload-it.omf -share/gnome/omf/gnome-applets/multiload-ja.omf -share/gnome/omf/gnome-applets/multiload-ko.omf -share/gnome/omf/gnome-applets/multiload-sv.omf -share/gnome/omf/gnome-applets/multiload-uk.omf -share/gnome/omf/gnome-applets/multiload-zh_CN.omf -share/gnome/omf/gnome-applets/multiload-zh_HK.omf -share/gnome/omf/gnome-applets/multiload-zh_TW.omf -share/gnome/omf/gnome-applets/stickynotes_applet-C.omf -share/gnome/omf/gnome-applets/stickynotes_applet-de.omf -share/gnome/omf/gnome-applets/stickynotes_applet-es.omf -share/gnome/omf/gnome-applets/stickynotes_applet-eu.omf -share/gnome/omf/gnome-applets/stickynotes_applet-fr.omf -share/gnome/omf/gnome-applets/stickynotes_applet-it.omf -share/gnome/omf/gnome-applets/stickynotes_applet-ja.omf -share/gnome/omf/gnome-applets/stickynotes_applet-ko.omf -share/gnome/omf/gnome-applets/stickynotes_applet-sv.omf -share/gnome/omf/gnome-applets/stickynotes_applet-uk.omf -share/gnome/omf/gnome-applets/stickynotes_applet-zh_CN.omf -share/gnome/omf/gnome-applets/stickynotes_applet-zh_HK.omf -share/gnome/omf/gnome-applets/stickynotes_applet-zh_TW.omf -share/gnome/omf/gnome-applets/trashapplet-C.omf -share/gnome/omf/gnome-applets/trashapplet-uk.omf +share/gnome/omf/accessx-status/accessx-status-C.omf +share/gnome/omf/accessx-status/accessx-status-es.omf +share/gnome/omf/accessx-status/accessx-status-fr.omf +share/gnome/omf/accessx-status/accessx-status-uk.omf +%%BATTERY%%share/gnome/omf/battstat/battstat-C.omf +%%BATTERY%%share/gnome/omf/battstat/battstat-es.omf +%%BATTERY%%share/gnome/omf/battstat/battstat-uk.omf +share/gnome/omf/char-palette/char-palette-C.omf +share/gnome/omf/char-palette/char-palette-es.omf +share/gnome/omf/char-palette/char-palette-it.omf +share/gnome/omf/char-palette/char-palette-nl.omf +share/gnome/omf/char-palette/char-palette-pt_BR.omf +share/gnome/omf/char-palette/char-palette-uk.omf +share/gnome/omf/command-line/command-line-C.omf +share/gnome/omf/command-line/command-line-es.omf +share/gnome/omf/command-line/command-line-pt_BR.omf +share/gnome/omf/command-line/command-line-uk.omf +%%CPUFREQ%%share/gnome/omf/cpufreq-applet/cpufreq-applet-C.omf +%%CPUFREQ%%share/gnome/omf/cpufreq-applet/cpufreq-applet-es.omf +%%CPUFREQ%%share/gnome/omf/cpufreq-applet/cpufreq-applet-uk.omf +share/gnome/omf/drivemount/drivemount-C.omf +share/gnome/omf/drivemount/drivemount-es.omf +share/gnome/omf/drivemount/drivemount-it.omf +share/gnome/omf/drivemount/drivemount-pa.omf +share/gnome/omf/drivemount/drivemount-uk.omf +share/gnome/omf/geyes/geyes-C.omf +share/gnome/omf/geyes/geyes-es.omf +share/gnome/omf/geyes/geyes-it.omf +share/gnome/omf/geyes/geyes-uk.omf +share/gnome/omf/gswitchit/gswitchit-C.omf +share/gnome/omf/gswitchit/gswitchit-es.omf +share/gnome/omf/gswitchit/gswitchit-fr.omf +share/gnome/omf/gswitchit/gswitchit-uk.omf +share/gnome/omf/gtik2_applet2/gtik2_applet2-C.omf +share/gnome/omf/gtik2_applet2/gtik2_applet2-es.omf +share/gnome/omf/gtik2_applet2/gtik2_applet2-uk.omf +share/gnome/omf/gweather/gweather-C.omf +share/gnome/omf/gweather/gweather-es.omf +share/gnome/omf/gweather/gweather-uk.omf +share/gnome/omf/mixer_applet2/mixer_applet2-C.omf +share/gnome/omf/mixer_applet2/mixer_applet2-es.omf +share/gnome/omf/mixer_applet2/mixer_applet2-uk.omf +share/gnome/omf/multiload/multiload-C.omf +share/gnome/omf/multiload/multiload-es.omf +share/gnome/omf/multiload/multiload-uk.omf +share/gnome/omf/stickynotes_applet/stickynotes_applet-C.omf +share/gnome/omf/stickynotes_applet/stickynotes_applet-es.omf +share/gnome/omf/stickynotes_applet/stickynotes_applet-uk.omf +share/gnome/omf/trashapplet/trashapplet-C.omf +share/gnome/omf/trashapplet/trashapplet-es.omf +share/gnome/omf/trashapplet/trashapplet-fr.omf +share/gnome/omf/trashapplet/trashapplet-it.omf +share/gnome/omf/trashapplet/trashapplet-pa.omf +share/gnome/omf/trashapplet/trashapplet-uk.omf share/gnome/pixmaps/accessx-status-applet/ax-applet.png share/gnome/pixmaps/accessx-status-applet/ax-bouncekeys.png share/gnome/pixmaps/accessx-status-applet/ax-key-base.png @@ -1102,6 +603,7 @@ share/locale/he/LC_MESSAGES/gnome-applets-2.0.mo share/locale/hi/LC_MESSAGES/gnome-applets-2.0.mo share/locale/hr/LC_MESSAGES/gnome-applets-2.0.mo share/locale/hu/LC_MESSAGES/gnome-applets-2.0.mo +share/locale/hy/LC_MESSAGES/gnome-applets-2.0.mo share/locale/id/LC_MESSAGES/gnome-applets-2.0.mo share/locale/is/LC_MESSAGES/gnome-applets-2.0.mo share/locale/it/LC_MESSAGES/gnome-applets-2.0.mo @@ -1114,6 +616,7 @@ share/locale/ml/LC_MESSAGES/gnome-applets-2.0.mo share/locale/mn/LC_MESSAGES/gnome-applets-2.0.mo share/locale/ms/LC_MESSAGES/gnome-applets-2.0.mo share/locale/nb/LC_MESSAGES/gnome-applets-2.0.mo +share/locale/ne/LC_MESSAGES/gnome-applets-2.0.mo share/locale/nl/LC_MESSAGES/gnome-applets-2.0.mo share/locale/nn/LC_MESSAGES/gnome-applets-2.0.mo share/locale/no/LC_MESSAGES/gnome-applets-2.0.mo @@ -1131,312 +634,167 @@ share/locale/sr/LC_MESSAGES/gnome-applets-2.0.mo share/locale/sr@Latn/LC_MESSAGES/gnome-applets-2.0.mo share/locale/sv/LC_MESSAGES/gnome-applets-2.0.mo share/locale/ta/LC_MESSAGES/gnome-applets-2.0.mo +share/locale/te/LC_MESSAGES/gnome-applets-2.0.mo share/locale/th/LC_MESSAGES/gnome-applets-2.0.mo share/locale/tr/LC_MESSAGES/gnome-applets-2.0.mo share/locale/uk/LC_MESSAGES/gnome-applets-2.0.mo share/locale/vi/LC_MESSAGES/gnome-applets-2.0.mo share/locale/wa/LC_MESSAGES/gnome-applets-2.0.mo +share/locale/xh/LC_MESSAGES/gnome-applets-2.0.mo share/locale/zh_CN/LC_MESSAGES/gnome-applets-2.0.mo share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo -@dirrm share/gnome/help/stickynotes_applet/uk/figures -@dirrm share/gnome/help/stickynotes_applet/uk +@unexec /bin/rmdir %D/share/locale/xh/LC_MESSAGES 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/locale/xh 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/locale/te/LC_MESSAGES 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/locale/te 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/locale/rw/LC_MESSAGES 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/locale/rw 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/locale/hy/LC_MESSAGES 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/locale/hy 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons/hicolor/48x48/apps 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons/hicolor/48x48 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons/hicolor 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons 2>/dev/null || /usr/bin/true @dirrm share/gnome/pixmaps/stickynotes -%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/uk/figures -%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/uk %%CPUFREQ%%@dirrm share/gnome/pixmaps/cpufreq-applet @dirrm share/gnome/pixmaps/accessx-status-applet -@dirrm share/gnome/omf/gnome-applets -@dirrm share/gnome/help/trashapplet/C/figures -@dirrm share/gnome/help/trashapplet/C +@dirrm share/gnome/omf/trashapplet +@dirrm share/gnome/omf/stickynotes_applet +@dirrm share/gnome/omf/multiload +@dirrm share/gnome/omf/mixer_applet2 +@dirrm share/gnome/omf/gweather +@dirrm share/gnome/omf/gtik2_applet2 +@dirrm share/gnome/omf/gswitchit +@dirrm share/gnome/omf/geyes +@dirrm share/gnome/omf/drivemount +%%CPUFREQ%%@dirrm share/gnome/omf/cpufreq-applet +@dirrm share/gnome/omf/command-line +@dirrm share/gnome/omf/char-palette +%%BATTERY%%@dirrm share/gnome/omf/battstat +@dirrm share/gnome/omf/accessx-status @dirrm share/gnome/help/trashapplet/uk/figures @dirrm share/gnome/help/trashapplet/uk +@dirrm share/gnome/help/trashapplet/pa/figures +@dirrm share/gnome/help/trashapplet/pa +@dirrm share/gnome/help/trashapplet/fr/figures +@dirrm share/gnome/help/trashapplet/fr +@dirrm share/gnome/help/trashapplet/it/figures +@dirrm share/gnome/help/trashapplet/it +@dirrm share/gnome/help/trashapplet/es/figures +@dirrm share/gnome/help/trashapplet/es +@dirrm share/gnome/help/trashapplet/C/figures +@dirrm share/gnome/help/trashapplet/C @dirrm share/gnome/help/trashapplet -@dirrm share/gnome/help/stickynotes_applet/zh_TW/figures -@dirrm share/gnome/help/stickynotes_applet/zh_TW -@dirrm share/gnome/help/stickynotes_applet/zh_HK/figures -@dirrm share/gnome/help/stickynotes_applet/zh_HK -@dirrm share/gnome/help/stickynotes_applet/zh_CN/figures -@dirrm share/gnome/help/stickynotes_applet/zh_CN -@dirrm share/gnome/help/stickynotes_applet/sv/figures -@dirrm share/gnome/help/stickynotes_applet/sv -@dirrm share/gnome/help/stickynotes_applet/ko/figures -@dirrm share/gnome/help/stickynotes_applet/ko -@dirrm share/gnome/help/stickynotes_applet/ja/figures -@dirrm share/gnome/help/stickynotes_applet/ja -@dirrm share/gnome/help/stickynotes_applet/it/figures -@dirrm share/gnome/help/stickynotes_applet/it -@dirrm share/gnome/help/stickynotes_applet/fr/figures -@dirrm share/gnome/help/stickynotes_applet/fr -@dirrm share/gnome/help/stickynotes_applet/eu/figures -@dirrm share/gnome/help/stickynotes_applet/eu +@dirrm share/gnome/help/stickynotes_applet/uk/figures +@dirrm share/gnome/help/stickynotes_applet/uk @dirrm share/gnome/help/stickynotes_applet/es/figures @dirrm share/gnome/help/stickynotes_applet/es -@dirrm share/gnome/help/stickynotes_applet/de/figures -@dirrm share/gnome/help/stickynotes_applet/de @dirrm share/gnome/help/stickynotes_applet/C/figures @dirrm share/gnome/help/stickynotes_applet/C @dirrm share/gnome/help/stickynotes_applet -@dirrm share/gnome/help/multiload/zh_TW/figures -@dirrm share/gnome/help/multiload/zh_TW -@dirrm share/gnome/help/multiload/zh_HK/figures -@dirrm share/gnome/help/multiload/zh_HK -@dirrm share/gnome/help/multiload/zh_CN/figures -@dirrm share/gnome/help/multiload/zh_CN @dirrm share/gnome/help/multiload/uk/figures @dirrm share/gnome/help/multiload/uk -@dirrm share/gnome/help/multiload/sv/figures -@dirrm share/gnome/help/multiload/sv -@dirrm share/gnome/help/multiload/ko/figures -@dirrm share/gnome/help/multiload/ko -@dirrm share/gnome/help/multiload/ja/figures -@dirrm share/gnome/help/multiload/ja -@dirrm share/gnome/help/multiload/it/figures -@dirrm share/gnome/help/multiload/it -@dirrm share/gnome/help/multiload/fr/figures -@dirrm share/gnome/help/multiload/fr -@dirrm share/gnome/help/multiload/eu/figures -@dirrm share/gnome/help/multiload/eu @dirrm share/gnome/help/multiload/es/figures @dirrm share/gnome/help/multiload/es -@dirrm share/gnome/help/multiload/de/figures -@dirrm share/gnome/help/multiload/de @dirrm share/gnome/help/multiload/C/figures @dirrm share/gnome/help/multiload/C @dirrm share/gnome/help/multiload -@dirrm share/gnome/help/mixer_applet2/zh_TW/figures -@dirrm share/gnome/help/mixer_applet2/zh_TW -@dirrm share/gnome/help/mixer_applet2/zh_HK/figures -@dirrm share/gnome/help/mixer_applet2/zh_HK -@dirrm share/gnome/help/mixer_applet2/zh_CN/figures -@dirrm share/gnome/help/mixer_applet2/zh_CN @dirrm share/gnome/help/mixer_applet2/uk/figures @dirrm share/gnome/help/mixer_applet2/uk -@dirrm share/gnome/help/mixer_applet2/sv/figures -@dirrm share/gnome/help/mixer_applet2/sv -@dirrm share/gnome/help/mixer_applet2/ko/figures -@dirrm share/gnome/help/mixer_applet2/ko -@dirrm share/gnome/help/mixer_applet2/ja/figures -@dirrm share/gnome/help/mixer_applet2/ja -@dirrm share/gnome/help/mixer_applet2/it/figures -@dirrm share/gnome/help/mixer_applet2/it -@dirrm share/gnome/help/mixer_applet2/fr/figures -@dirrm share/gnome/help/mixer_applet2/fr -@dirrm share/gnome/help/mixer_applet2/eu/figures -@dirrm share/gnome/help/mixer_applet2/eu @dirrm share/gnome/help/mixer_applet2/es/figures @dirrm share/gnome/help/mixer_applet2/es -@dirrm share/gnome/help/mixer_applet2/de/figures -@dirrm share/gnome/help/mixer_applet2/de @dirrm share/gnome/help/mixer_applet2/C/figures @dirrm share/gnome/help/mixer_applet2/C @dirrm share/gnome/help/mixer_applet2 -@dirrm share/gnome/help/gweather/zh_TW/figures -@dirrm share/gnome/help/gweather/zh_TW -@dirrm share/gnome/help/gweather/zh_HK/figures -@dirrm share/gnome/help/gweather/zh_HK -@dirrm share/gnome/help/gweather/zh_CN/figures -@dirrm share/gnome/help/gweather/zh_CN @dirrm share/gnome/help/gweather/uk/figures @dirrm share/gnome/help/gweather/uk -@dirrm share/gnome/help/gweather/sv/figures -@dirrm share/gnome/help/gweather/sv -@dirrm share/gnome/help/gweather/ko/figures -@dirrm share/gnome/help/gweather/ko -@dirrm share/gnome/help/gweather/ja/figures -@dirrm share/gnome/help/gweather/ja -@dirrm share/gnome/help/gweather/it/figures -@dirrm share/gnome/help/gweather/it -@dirrm share/gnome/help/gweather/fr/figures -@dirrm share/gnome/help/gweather/fr -@dirrm share/gnome/help/gweather/eu/figures -@dirrm share/gnome/help/gweather/eu @dirrm share/gnome/help/gweather/es/figures @dirrm share/gnome/help/gweather/es -@dirrm share/gnome/help/gweather/de/figures -@dirrm share/gnome/help/gweather/de @dirrm share/gnome/help/gweather/C/figures @dirrm share/gnome/help/gweather/C @dirrm share/gnome/help/gweather -@dirrm share/gnome/help/gtik2_applet2/zh_TW/figures -@dirrm share/gnome/help/gtik2_applet2/zh_TW -@dirrm share/gnome/help/gtik2_applet2/zh_HK/figures -@dirrm share/gnome/help/gtik2_applet2/zh_HK -@dirrm share/gnome/help/gtik2_applet2/zh_CN/figures -@dirrm share/gnome/help/gtik2_applet2/zh_CN @dirrm share/gnome/help/gtik2_applet2/uk/figures @dirrm share/gnome/help/gtik2_applet2/uk -@dirrm share/gnome/help/gtik2_applet2/sv/figures -@dirrm share/gnome/help/gtik2_applet2/sv -@dirrm share/gnome/help/gtik2_applet2/ko/figures -@dirrm share/gnome/help/gtik2_applet2/ko -@dirrm share/gnome/help/gtik2_applet2/ja/figures -@dirrm share/gnome/help/gtik2_applet2/ja -@dirrm share/gnome/help/gtik2_applet2/it/figures -@dirrm share/gnome/help/gtik2_applet2/it -@dirrm share/gnome/help/gtik2_applet2/fr/figures -@dirrm share/gnome/help/gtik2_applet2/fr -@dirrm share/gnome/help/gtik2_applet2/eu/figures -@dirrm share/gnome/help/gtik2_applet2/eu @dirrm share/gnome/help/gtik2_applet2/es/figures @dirrm share/gnome/help/gtik2_applet2/es -@dirrm share/gnome/help/gtik2_applet2/de/figures -@dirrm share/gnome/help/gtik2_applet2/de @dirrm share/gnome/help/gtik2_applet2/C/figures @dirrm share/gnome/help/gtik2_applet2/C @dirrm share/gnome/help/gtik2_applet2 -@dirrm share/gnome/help/gswitchit/C @dirrm share/gnome/help/gswitchit/uk +@dirrm share/gnome/help/gswitchit/fr +@dirrm share/gnome/help/gswitchit/es +@dirrm share/gnome/help/gswitchit/C @dirrm share/gnome/help/gswitchit -@dirrm share/gnome/help/geyes/zh_TW/figures -@dirrm share/gnome/help/geyes/zh_TW -@dirrm share/gnome/help/geyes/zh_HK/figures -@dirrm share/gnome/help/geyes/zh_HK -@dirrm share/gnome/help/geyes/zh_CN/figures -@dirrm share/gnome/help/geyes/zh_CN @dirrm share/gnome/help/geyes/uk/figures @dirrm share/gnome/help/geyes/uk -@dirrm share/gnome/help/geyes/sv/figures -@dirrm share/gnome/help/geyes/sv -@dirrm share/gnome/help/geyes/ko/figures -@dirrm share/gnome/help/geyes/ko -@dirrm share/gnome/help/geyes/ja/figures -@dirrm share/gnome/help/geyes/ja @dirrm share/gnome/help/geyes/it/figures @dirrm share/gnome/help/geyes/it -@dirrm share/gnome/help/geyes/fr/figures -@dirrm share/gnome/help/geyes/fr -@dirrm share/gnome/help/geyes/eu/figures -@dirrm share/gnome/help/geyes/eu @dirrm share/gnome/help/geyes/es/figures @dirrm share/gnome/help/geyes/es -@dirrm share/gnome/help/geyes/de/figures -@dirrm share/gnome/help/geyes/de @dirrm share/gnome/help/geyes/C/figures @dirrm share/gnome/help/geyes/C @dirrm share/gnome/help/geyes -@dirrm share/gnome/help/drivemount/zh_TW/figures -@dirrm share/gnome/help/drivemount/zh_TW -@dirrm share/gnome/help/drivemount/zh_HK/figures -@dirrm share/gnome/help/drivemount/zh_HK -@dirrm share/gnome/help/drivemount/zh_CN/figures -@dirrm share/gnome/help/drivemount/zh_CN @dirrm share/gnome/help/drivemount/uk/figures @dirrm share/gnome/help/drivemount/uk -@dirrm share/gnome/help/drivemount/sv/figures -@dirrm share/gnome/help/drivemount/sv -@dirrm share/gnome/help/drivemount/ko/figures -@dirrm share/gnome/help/drivemount/ko -@dirrm share/gnome/help/drivemount/ja/figures -@dirrm share/gnome/help/drivemount/ja +@dirrm share/gnome/help/drivemount/pa/figures +@dirrm share/gnome/help/drivemount/pa @dirrm share/gnome/help/drivemount/it/figures @dirrm share/gnome/help/drivemount/it -@dirrm share/gnome/help/drivemount/fr/figures -@dirrm share/gnome/help/drivemount/fr -@dirrm share/gnome/help/drivemount/eu/figures -@dirrm share/gnome/help/drivemount/eu @dirrm share/gnome/help/drivemount/es/figures @dirrm share/gnome/help/drivemount/es -@dirrm share/gnome/help/drivemount/de/figures -@dirrm share/gnome/help/drivemount/de @dirrm share/gnome/help/drivemount/C/figures @dirrm share/gnome/help/drivemount/C @dirrm share/gnome/help/drivemount +%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/uk/figures +%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/uk +%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/es/figures +%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/es %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/C/figures %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/C %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet -@dirrm share/gnome/help/command-line/zh_TW/figures -@dirrm share/gnome/help/command-line/zh_TW -@dirrm share/gnome/help/command-line/zh_HK/figures -@dirrm share/gnome/help/command-line/zh_HK -@dirrm share/gnome/help/command-line/zh_CN/figures -@dirrm share/gnome/help/command-line/zh_CN @dirrm share/gnome/help/command-line/uk/figures @dirrm share/gnome/help/command-line/uk -@dirrm share/gnome/help/command-line/sv/figures -@dirrm share/gnome/help/command-line/sv -@dirrm share/gnome/help/command-line/ko/figures -@dirrm share/gnome/help/command-line/ko -@dirrm share/gnome/help/command-line/ja/figures -@dirrm share/gnome/help/command-line/ja -@dirrm share/gnome/help/command-line/it/figures -@dirrm share/gnome/help/command-line/it -@dirrm share/gnome/help/command-line/fr/figures -@dirrm share/gnome/help/command-line/fr -@dirrm share/gnome/help/command-line/eu/figures -@dirrm share/gnome/help/command-line/eu +@dirrm share/gnome/help/command-line/pt_BR/figures +@dirrm share/gnome/help/command-line/pt_BR @dirrm share/gnome/help/command-line/es/figures @dirrm share/gnome/help/command-line/es -@dirrm share/gnome/help/command-line/de/figures -@dirrm share/gnome/help/command-line/de @dirrm share/gnome/help/command-line/C/figures @dirrm share/gnome/help/command-line/C @dirrm share/gnome/help/command-line -@dirrm share/gnome/help/char-palette/zh_TW/figures -@dirrm share/gnome/help/char-palette/zh_TW -@dirrm share/gnome/help/char-palette/zh_HK/figures -@dirrm share/gnome/help/char-palette/zh_HK -@dirrm share/gnome/help/char-palette/zh_CN/figures -@dirrm share/gnome/help/char-palette/zh_CN @dirrm share/gnome/help/char-palette/uk/figures @dirrm share/gnome/help/char-palette/uk -@dirrm share/gnome/help/char-palette/sv/figures -@dirrm share/gnome/help/char-palette/sv -@dirrm share/gnome/help/char-palette/ko/figures -@dirrm share/gnome/help/char-palette/ko -@dirrm share/gnome/help/char-palette/ja/figures -@dirrm share/gnome/help/char-palette/ja +@dirrm share/gnome/help/char-palette/pt_BR/figures +@dirrm share/gnome/help/char-palette/pt_BR +@dirrm share/gnome/help/char-palette/nl/figures +@dirrm share/gnome/help/char-palette/nl @dirrm share/gnome/help/char-palette/it/figures @dirrm share/gnome/help/char-palette/it -@dirrm share/gnome/help/char-palette/fr/figures -@dirrm share/gnome/help/char-palette/fr -@dirrm share/gnome/help/char-palette/eu/figures -@dirrm share/gnome/help/char-palette/eu @dirrm share/gnome/help/char-palette/es/figures @dirrm share/gnome/help/char-palette/es -@dirrm share/gnome/help/char-palette/de/figures -@dirrm share/gnome/help/char-palette/de @dirrm share/gnome/help/char-palette/C/figures @dirrm share/gnome/help/char-palette/C @dirrm share/gnome/help/char-palette -%%BATTERY%%@dirrm share/gnome/help/battstat/zh_TW/figures -%%BATTERY%%@dirrm share/gnome/help/battstat/zh_TW -%%BATTERY%%@dirrm share/gnome/help/battstat/zh_HK/figures -%%BATTERY%%@dirrm share/gnome/help/battstat/zh_HK -%%BATTERY%%@dirrm share/gnome/help/battstat/zh_CN/figures -%%BATTERY%%@dirrm share/gnome/help/battstat/zh_CN %%BATTERY%%@dirrm share/gnome/help/battstat/uk/figures %%BATTERY%%@dirrm share/gnome/help/battstat/uk -%%BATTERY%%@dirrm share/gnome/help/battstat/sv/figures -%%BATTERY%%@dirrm share/gnome/help/battstat/sv -%%BATTERY%%@dirrm share/gnome/help/battstat/ko/figures -%%BATTERY%%@dirrm share/gnome/help/battstat/ko -%%BATTERY%%@dirrm share/gnome/help/battstat/ja/figures -%%BATTERY%%@dirrm share/gnome/help/battstat/ja -%%BATTERY%%@dirrm share/gnome/help/battstat/it/figures -%%BATTERY%%@dirrm share/gnome/help/battstat/it -%%BATTERY%%@dirrm share/gnome/help/battstat/fr/figures -%%BATTERY%%@dirrm share/gnome/help/battstat/fr -%%BATTERY%%@dirrm share/gnome/help/battstat/eu/figures -%%BATTERY%%@dirrm share/gnome/help/battstat/eu %%BATTERY%%@dirrm share/gnome/help/battstat/es/figures %%BATTERY%%@dirrm share/gnome/help/battstat/es -%%BATTERY%%@dirrm share/gnome/help/battstat/de/figures -%%BATTERY%%@dirrm share/gnome/help/battstat/de %%BATTERY%%@dirrm share/gnome/help/battstat/C/figures %%BATTERY%%@dirrm share/gnome/help/battstat/C %%BATTERY%%@dirrm share/gnome/help/battstat -@dirrm share/gnome/help/accessx-status/eu/figures -@dirrm share/gnome/help/accessx-status/eu -@dirrm share/gnome/help/accessx-status/C/figures -@dirrm share/gnome/help/accessx-status/C @dirrm share/gnome/help/accessx-status/uk/figures @dirrm share/gnome/help/accessx-status/uk +@dirrm share/gnome/help/accessx-status/fr/figures +@dirrm share/gnome/help/accessx-status/fr +@dirrm share/gnome/help/accessx-status/es/figures +@dirrm share/gnome/help/accessx-status/es +@dirrm share/gnome/help/accessx-status/C/figures +@dirrm share/gnome/help/accessx-status/C @dirrm share/gnome/help/accessx-status @dirrm share/gnome/gnome-applets/gweather @dirrm share/gnome/gnome-applets/glade @dirrm share/gnome/gnome-applets/geyes/Horrid -@dirrm share/gnome/gnome-applets/geyes/Default @dirrm share/gnome/gnome-applets/geyes/Default-tiny +@dirrm share/gnome/gnome-applets/geyes/Default @dirrm share/gnome/gnome-applets/geyes/Bloodshot @dirrm share/gnome/gnome-applets/geyes/Bizarre @dirrm share/gnome/gnome-applets/geyes diff --git a/x11/gnomedesktop/Makefile b/x11/gnomedesktop/Makefile index 8bea9955e870..523f3533fdef 100644 --- a/x11/gnomedesktop/Makefile +++ b/x11/gnomedesktop/Makefile @@ -3,13 +3,14 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/x11/gnomedesktop/Makefile,v 1.74 2005/10/03 15:18:36 ahze Exp $ # PORTNAME= gnomedesktop -PORTVERSION= 2.10.2 +PORTVERSION= 2.12.1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-desktop/2.10 +MASTER_SITE_SUBDIR= sources/gnome-desktop/2.12 DISTNAME= gnome-desktop-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -20,13 +21,14 @@ USE_BZIP2= yes USE_X_PREFIX= yes USE_XPM= yes USE_REINPLACE= yes -USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui +USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui gnomedocutils \ + ltverhack GNOME_DESKTOP_VERSION=2 USE_GMAKE= yes USE_BISON= yes INSTALLS_OMF= yes INSTALLS_SHLIB= yes -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 CONFIGURE_ARGS= --with-gnome-distributor="FreeBSD GNOME Project" \ --with-kde-datadir=${LOCALBASE}/share CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/x11/gnomedesktop/distinfo b/x11/gnomedesktop/distinfo index 833f7a4f71cc..1af6b593cb77 100644 --- a/x11/gnomedesktop/distinfo +++ b/x11/gnomedesktop/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-desktop-2.10.2.tar.bz2) = b912a6878ea307af9e3d015864ec0678 -SIZE (gnome2/gnome-desktop-2.10.2.tar.bz2) = 985248 +MD5 (gnome2/gnome-desktop-2.12.1.tar.bz2) = e6841d3a401ec2f5aa17a0529ba4bf55 +SIZE (gnome2/gnome-desktop-2.12.1.tar.bz2) = 1033105 diff --git a/x11/gnomedesktop/pkg-plist b/x11/gnomedesktop/pkg-plist index e1f8d73ee3bd..cf05af1ec158 100644 --- a/x11/gnomedesktop/pkg-plist +++ b/x11/gnomedesktop/pkg-plist @@ -4,10 +4,10 @@ include/gnome-desktop-2.0/libgnomeui/gnome-ditem-edit.h include/gnome-desktop-2.0/libgnomeui/gnome-hint.h lib/libgnome-desktop-2.a lib/libgnome-desktop-2.so -lib/libgnome-desktop-2.so.4 +lib/libgnome-desktop-2.so.2 libdata/pkgconfig/gnome-desktop-2.0.pc share/gnome/applications/gnome-about.desktop -share/gnome/gnome-about/gnome-64.gif +share/gnome/gnome-about/gnome-64.png share/gnome/gnome-about/gnome-version.xml share/gnome/gnome-about/headers/header-bg-ancient01a.png share/gnome/gnome-about/headers/header-bg-city01.png @@ -19,21 +19,27 @@ share/gnome/gnome-about/headers/header-bg-mountains01.png share/gnome/gnome-about/headers/header-bg-snow01.png share/gnome/gnome-about/headers/header-bg-sunset01.png share/gnome/help/fdl/C/fdl.xml -share/gnome/help/fdl/eu/fdl.xml +share/gnome/help/fdl/es/fdl.xml share/gnome/help/gnome-feedback/C/gnome-feedback.xml -share/gnome/help/gnome-feedback/eu/gnome-feedback.xml +share/gnome/help/gnome-feedback/es/gnome-feedback.xml share/gnome/help/gpl/C/gpl.xml -share/gnome/help/gpl/eu/gpl.xml +share/gnome/help/gpl/es/gpl.xml +share/gnome/help/gpl/fi/gpl.xml +share/gnome/help/gpl/pa/gpl.xml share/gnome/help/lgpl/C/lgpl.xml -share/gnome/help/lgpl/eu/lgpl.xml -share/gnome/omf/gnome-desktop/fdl-C.omf -share/gnome/omf/gnome-desktop/fdl-eu.omf -share/gnome/omf/gnome-desktop/gnome-feedback-C.omf -share/gnome/omf/gnome-desktop/gnome-feedback-eu.omf -share/gnome/omf/gnome-desktop/gpl-C.omf -share/gnome/omf/gnome-desktop/gpl-eu.omf -share/gnome/omf/gnome-desktop/lgpl-C.omf -share/gnome/omf/gnome-desktop/lgpl-eu.omf +share/gnome/help/lgpl/es/lgpl.xml +share/gnome/help/lgpl/pa/lgpl.xml +share/gnome/omf/fdl/fdl-C.omf +share/gnome/omf/fdl/fdl-es.omf +share/gnome/omf/gnome-feedback/gnome-feedback-C.omf +share/gnome/omf/gnome-feedback/gnome-feedback-es.omf +share/gnome/omf/gpl/gpl-C.omf +share/gnome/omf/gpl/gpl-es.omf +share/gnome/omf/gpl/gpl-fi.omf +share/gnome/omf/gpl/gpl-pa.omf +share/gnome/omf/lgpl/lgpl-C.omf +share/gnome/omf/lgpl/lgpl-es.omf +share/gnome/omf/lgpl/lgpl-pa.omf share/gnome/pixmaps/apple-green.png share/gnome/pixmaps/apple-red.png share/gnome/pixmaps/gnome-aorta.png @@ -145,6 +151,7 @@ share/locale/it/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/ja/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/kn/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/ko/LC_MESSAGES/gnome-desktop-2.0.mo +share/locale/ku/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/li/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/lt/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/lv/LC_MESSAGES/gnome-desktop-2.0.mo @@ -178,6 +185,7 @@ share/locale/te/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/th/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/tk/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/tr/LC_MESSAGES/gnome-desktop-2.0.mo +share/locale/ug/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/uk/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/vi/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/wa/LC_MESSAGES/gnome-desktop-2.0.mo @@ -189,17 +197,25 @@ share/locale/zh_TW/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/zu/LC_MESSAGES/gnome-desktop-2.0.mo @unexec rmdir %D/share/locale/yo/LC_MESSAGES 2> /dev/null || true @unexec rmdir %D/share/locale/yo 2> /dev/null || true -@unexec rmdir %D/share/locale/te/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/te 2> /dev/null || true +@unexec rmdir %D/share/locale/ug/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/ug 2> /dev/null || true +@unexec rmdir %D/share/locale/ku/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/ku 2> /dev/null || true @unexec rmdir %D/share/locale/hy/LC_MESSAGES 2> /dev/null || true @unexec rmdir %D/share/locale/hy 2> /dev/null || true -@dirrm share/gnome/omf/gnome-desktop -@dirrm share/gnome/help/lgpl/eu -@dirrm share/gnome/help/gpl/eu -@dirrm share/gnome/help/gnome-feedback/eu +@dirrm share/gnome/omf/lgpl +@dirrm share/gnome/omf/gpl +@dirrm share/gnome/omf/gnome-feedback +@dirrm share/gnome/omf/fdl +@dirrm share/gnome/help/lgpl/pa +@dirrm share/gnome/help/lgpl/es +@dirrm share/gnome/help/gpl/pa +@dirrm share/gnome/help/gpl/fi +@dirrm share/gnome/help/gpl/es +@dirrm share/gnome/help/fdl/es +@dirrm share/gnome/help/gnome-feedback/es @dirrm share/gnome/help/gnome-feedback/C @dirrm share/gnome/help/gnome-feedback -@dirrm share/gnome/help/fdl/eu @dirrm share/gnome/gnome-about/headers @dirrm include/gnome-desktop-2.0/libgnomeui @dirrm include/gnome-desktop-2.0/libgnome diff --git a/x11/gnomepanel/Makefile b/x11/gnomepanel/Makefile index de413e237e36..91d3d77eba18 100644 --- a/x11/gnomepanel/Makefile +++ b/x11/gnomepanel/Makefile @@ -3,30 +3,35 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/x11/gnomepanel/Makefile,v 1.109 2005/10/08 19:41:40 marcus Exp $ # PORTNAME= gnomepanel -PORTVERSION= 2.10.2 +PORTVERSION= 2.12.1 +PORTREVISION= 1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-panel/2.10 +MASTER_SITE_SUBDIR= sources/gnome-panel/2.12 DISTNAME= gnome-panel-${PORTVERSION} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= Panel component for the GNOME 2 Desktop +RUN_DEPENDS= gnome-menu-editor:${PORTSDIR}/deskutils/gnome-menu-editor + USE_BZIP2= yes INSTALLS_OMF= yes INSTALLS_SHLIB= yes +INSTALLS_ICONS= yes USE_X_PREFIX= yes USE_REINPLACE= yes USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop \ - libwnck gnomemenus + libwnck gnomemenus gnomedocutils ltverhack WANT_GNOME= yes GNOME_DESKTOP_VERSION=2 USE_GMAKE= yes -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 CONFIGURE_ARGS= --with-kde-datadir=${LOCALBASE}/share \ --with-kde-docdir=${LOCALBASE}/share/doc CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ @@ -54,6 +59,8 @@ CONFIGURE_ARGS+=--disable-eds .endif post-patch: + @${REINPLACE_CMD} -e 's|evolution.desktop|evolution-2.4.desktop|g' \ + ${WRKSRC}/gnome-panel/panel-default-setup.entries.in .if ( ${OSVERSION} > 600000 && ${OSVERSION} < 600006 ) || \ ( ${OSVERSION} < 503101 ) .for po in da.po it.po zh_CN.po zh_TW.po diff --git a/x11/gnomepanel/distinfo b/x11/gnomepanel/distinfo index ddbc3312644e..ca8232c0a3a4 100644 --- a/x11/gnomepanel/distinfo +++ b/x11/gnomepanel/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-panel-2.10.2.tar.bz2) = c1756cac74a4c8b45ce3b9a884515baa -SIZE (gnome2/gnome-panel-2.10.2.tar.bz2) = 2366827 +MD5 (gnome2/gnome-panel-2.12.1.tar.bz2) = a532717e8ac7f67b7198c256909cd7dd +SIZE (gnome2/gnome-panel-2.12.1.tar.bz2) = 2468498 diff --git a/x11/gnomepanel/files/patch-gnome-panel::GNOME_Panel.server.in b/x11/gnomepanel/files/patch-gnome-panel::GNOME_Panel.server.in deleted file mode 100644 index b89c57317f90..000000000000 --- a/x11/gnomepanel/files/patch-gnome-panel::GNOME_Panel.server.in +++ /dev/null @@ -1,13 +0,0 @@ - -$FreeBSD$ - ---- gnome-panel/GNOME_Panel.server.in 2002/05/09 21:00:58 1.1 -+++ gnome-panel/GNOME_Panel.server.in 2002/05/09 21:01:11 -@@ -1,6 +1,6 @@ - <oaf_info> - --<oaf_server iid="OAFIID:GNOME_PanelShell" type="exe" location="panel-2"> -+<oaf_server iid="OAFIID:GNOME_PanelShell" type="exe" location="gnome-panel"> - <oaf_attribute name="repo_ids" type="stringv"> - <item value="IDL:GNOME/Vertigo/PanelShell:1.0"/> - <item value="IDL:Bonobo/Unknown:1.0"/> diff --git a/x11/gnomepanel/pkg-plist b/x11/gnomepanel/pkg-plist index dc44baa958e0..e77d26d94c58 100644 --- a/x11/gnomepanel/pkg-plist +++ b/x11/gnomepanel/pkg-plist @@ -12,7 +12,7 @@ include/panel-2.0/panel-applet-gconf.h include/panel-2.0/panel-applet.h lib/libpanel-applet-2.a lib/libpanel-applet-2.so -lib/libpanel-applet-2.so.1 +lib/libpanel-applet-2.so.0 libdata/bonobo/servers/GNOME_ClockApplet_Factory.server libdata/bonobo/servers/GNOME_FishApplet_Factory.server libdata/bonobo/servers/GNOME_NotificationAreaApplet.server @@ -71,6 +71,15 @@ share/gnome/help/clock/ja/legal.xml share/gnome/help/clock/ko/clock.xml share/gnome/help/clock/ko/figures/clock_applet.png share/gnome/help/clock/ko/legal.xml +share/gnome/help/clock/nl/clock.xml +share/gnome/help/clock/nl/figures/clock_applet.png +share/gnome/help/clock/nl/legal.xml +share/gnome/help/clock/pa/clock.xml +share/gnome/help/clock/pa/figures/clock_applet.png +share/gnome/help/clock/pa/legal.xml +share/gnome/help/clock/sr/clock.xml +share/gnome/help/clock/sr/figures/clock_applet.png +share/gnome/help/clock/sr/legal.xml share/gnome/help/clock/sv/clock.xml share/gnome/help/clock/sv/figures/clock_applet.png share/gnome/help/clock/sv/legal.xml @@ -83,25 +92,14 @@ share/gnome/help/clock/zh_CN/legal.xml share/gnome/help/clock/zh_TW/clock.xml share/gnome/help/clock/zh_TW/figures/clock_applet.png share/gnome/help/clock/zh_TW/legal.xml -share/gnome/help/fish-applet-2/C/figures/fish_applet.png -share/gnome/help/fish-applet-2/C/fish-applet-2.xml -share/gnome/help/fish-applet-2/C/legal.xml share/gnome/help/fish-applet-2/de/figures/fish_applet.png share/gnome/help/fish-applet-2/de/figures/fish_settings.png share/gnome/help/fish-applet-2/de/fish-applet-2.xml share/gnome/help/fish-applet-2/de/legal.xml -share/gnome/help/fish-applet-2/es/figures/fish_applet.png -share/gnome/help/fish-applet-2/es/figures/fish_settings.png -share/gnome/help/fish-applet-2/es/fish-applet-2.xml -share/gnome/help/fish-applet-2/es/legal.xml share/gnome/help/fish-applet-2/fr/figures/fish_applet.png share/gnome/help/fish-applet-2/fr/figures/fish_settings.png share/gnome/help/fish-applet-2/fr/fish-applet-2.xml share/gnome/help/fish-applet-2/fr/legal.xml -share/gnome/help/fish-applet-2/it/figures/fish_applet.png -share/gnome/help/fish-applet-2/it/figures/fish_settings.png -share/gnome/help/fish-applet-2/it/fish-applet-2.xml -share/gnome/help/fish-applet-2/it/legal.xml share/gnome/help/fish-applet-2/ja/figures/fish_applet.png share/gnome/help/fish-applet-2/ja/fish-applet-2.xml share/gnome/help/fish-applet-2/ja/legal.xml @@ -113,9 +111,6 @@ share/gnome/help/fish-applet-2/sv/figures/fish_applet.png share/gnome/help/fish-applet-2/sv/figures/fish_settings.png share/gnome/help/fish-applet-2/sv/fish-applet-2.xml share/gnome/help/fish-applet-2/sv/legal.xml -share/gnome/help/fish-applet-2/uk/figures/fish_applet.png -share/gnome/help/fish-applet-2/uk/fish-applet-2.xml -share/gnome/help/fish-applet-2/uk/legal.xml share/gnome/help/fish-applet-2/zh_CN/figures/fish_applet.png share/gnome/help/fish-applet-2/zh_CN/figures/fish_settings.png share/gnome/help/fish-applet-2/zh_CN/fish-applet-2.xml @@ -124,6 +119,18 @@ share/gnome/help/fish-applet-2/zh_TW/figures/fish_applet.png share/gnome/help/fish-applet-2/zh_TW/figures/fish_settings.png share/gnome/help/fish-applet-2/zh_TW/fish-applet-2.xml share/gnome/help/fish-applet-2/zh_TW/legal.xml +share/gnome/help/fish/C/figures/fish_applet.png +share/gnome/help/fish/C/fish.xml +share/gnome/help/fish/C/legal.xml +share/gnome/help/fish/es/figures/fish_applet.png +share/gnome/help/fish/es/fish.xml +share/gnome/help/fish/es/legal.xml +share/gnome/help/fish/it/figures/fish_applet.png +share/gnome/help/fish/it/fish.xml +share/gnome/help/fish/it/legal.xml +share/gnome/help/fish/uk/figures/fish_applet.png +share/gnome/help/fish/uk/fish.xml +share/gnome/help/fish/uk/legal.xml share/gnome/help/window-list/C/figures/window_list_applet.png share/gnome/help/window-list/C/figures/window_list_group_applet.png share/gnome/help/window-list/C/legal.xml @@ -134,7 +141,6 @@ share/gnome/help/window-list/de/figures/window_list_group_applet.png share/gnome/help/window-list/de/legal.xml share/gnome/help/window-list/de/window-list.xml share/gnome/help/window-list/es/figures/window_list_applet.png -share/gnome/help/window-list/es/figures/window_list_group.png share/gnome/help/window-list/es/figures/window_list_group_applet.png share/gnome/help/window-list/es/legal.xml share/gnome/help/window-list/es/window-list.xml @@ -144,7 +150,6 @@ share/gnome/help/window-list/fr/figures/window_list_group_applet.png share/gnome/help/window-list/fr/legal.xml share/gnome/help/window-list/fr/window-list.xml share/gnome/help/window-list/it/figures/window_list_applet.png -share/gnome/help/window-list/it/figures/window_list_group.png share/gnome/help/window-list/it/figures/window_list_group_applet.png share/gnome/help/window-list/it/legal.xml share/gnome/help/window-list/it/window-list.xml @@ -158,8 +163,8 @@ share/gnome/help/window-list/ko/figures/window_list_group_applet.png share/gnome/help/window-list/ko/legal.xml share/gnome/help/window-list/ko/window-list.xml share/gnome/help/window-list/sv/figures/window_list_applet.png -share/gnome/help/window-list/sv/figures/window_list_group.png share/gnome/help/window-list/sv/figures/window_list_group_applet.png +share/gnome/help/window-list/sv/figures/window_list_group.png share/gnome/help/window-list/sv/legal.xml share/gnome/help/window-list/sv/window-list.xml share/gnome/help/window-list/uk/figures/window_list_applet.png @@ -184,7 +189,6 @@ share/gnome/help/workspace-switcher/de/figures/workspacelist_applet.png share/gnome/help/workspace-switcher/de/legal.xml share/gnome/help/workspace-switcher/de/workspace-switcher.xml share/gnome/help/workspace-switcher/es/figures/workspace_switcher_applet.png -share/gnome/help/workspace-switcher/es/figures/workspacelist_applet.png share/gnome/help/workspace-switcher/es/legal.xml share/gnome/help/workspace-switcher/es/workspace-switcher.xml share/gnome/help/workspace-switcher/fr/figures/workspace_switcher_applet.png @@ -192,7 +196,6 @@ share/gnome/help/workspace-switcher/fr/figures/workspacelist_applet.png share/gnome/help/workspace-switcher/fr/legal.xml share/gnome/help/workspace-switcher/fr/workspace-switcher.xml share/gnome/help/workspace-switcher/it/figures/workspace_switcher_applet.png -share/gnome/help/workspace-switcher/it/figures/workspacelist_applet.png share/gnome/help/workspace-switcher/it/legal.xml share/gnome/help/workspace-switcher/it/workspace-switcher.xml share/gnome/help/workspace-switcher/ja/figures/workspace_switcher_applet.png @@ -202,6 +205,9 @@ share/gnome/help/workspace-switcher/ko/figures/workspace_switcher_applet.png share/gnome/help/workspace-switcher/ko/figures/workspacelist_applet.png share/gnome/help/workspace-switcher/ko/legal.xml share/gnome/help/workspace-switcher/ko/workspace-switcher.xml +share/gnome/help/workspace-switcher/nl/figures/workspace_switcher_applet.png +share/gnome/help/workspace-switcher/nl/legal.xml +share/gnome/help/workspace-switcher/nl/workspace-switcher.xml share/gnome/help/workspace-switcher/sv/figures/workspace_switcher_applet.png share/gnome/help/workspace-switcher/sv/figures/workspacelist_applet.png share/gnome/help/workspace-switcher/sv/legal.xml @@ -218,50 +224,61 @@ share/gnome/help/workspace-switcher/zh_TW/figures/workspacelist_applet.png share/gnome/help/workspace-switcher/zh_TW/legal.xml share/gnome/help/workspace-switcher/zh_TW/workspace-switcher.xml share/gnome/idl/gnome-panel-2.0/GNOME_Panel.idl -share/gnome/omf/gnome-panel/clock-C.omf +share/gnome/omf/clock/clock-C.omf +share/gnome/omf/clock/clock-de.omf +share/gnome/omf/clock/clock-es.omf +share/gnome/omf/clock/clock-it.omf +share/gnome/omf/clock/clock-fr.omf +share/gnome/omf/clock/clock-ja.omf +share/gnome/omf/clock/clock-ko.omf +share/gnome/omf/clock/clock-nl.omf +share/gnome/omf/clock/clock-pa.omf +share/gnome/omf/clock/clock-sr.omf +share/gnome/omf/clock/clock-sv.omf +share/gnome/omf/clock/clock-uk.omf +share/gnome/omf/clock/clock-zh_CN.omf +share/gnome/omf/clock/clock-zh_TW.omf +share/gnome/omf/fish/fish-C.omf +share/gnome/omf/fish/fish-es.omf +share/gnome/omf/fish/fish-it.omf +share/gnome/omf/fish/fish-uk.omf share/gnome/omf/gnome-panel/clock-de.omf -share/gnome/omf/gnome-panel/clock-es.omf share/gnome/omf/gnome-panel/clock-fr.omf -share/gnome/omf/gnome-panel/clock-it.omf share/gnome/omf/gnome-panel/clock-ja.omf share/gnome/omf/gnome-panel/clock-ko.omf share/gnome/omf/gnome-panel/clock-sv.omf -share/gnome/omf/gnome-panel/clock-uk.omf share/gnome/omf/gnome-panel/clock-zh_CN.omf share/gnome/omf/gnome-panel/clock-zh_TW.omf -share/gnome/omf/gnome-panel/fish-applet-2-C.omf share/gnome/omf/gnome-panel/fish-applet-2-de.omf -share/gnome/omf/gnome-panel/fish-applet-2-es.omf share/gnome/omf/gnome-panel/fish-applet-2-fr.omf -share/gnome/omf/gnome-panel/fish-applet-2-it.omf share/gnome/omf/gnome-panel/fish-applet-2-ja.omf share/gnome/omf/gnome-panel/fish-applet-2-ko.omf share/gnome/omf/gnome-panel/fish-applet-2-sv.omf -share/gnome/omf/gnome-panel/fish-applet-2-uk.omf share/gnome/omf/gnome-panel/fish-applet-2-zh_CN.omf share/gnome/omf/gnome-panel/fish-applet-2-zh_TW.omf -share/gnome/omf/gnome-panel/window-list-C.omf share/gnome/omf/gnome-panel/window-list-de.omf -share/gnome/omf/gnome-panel/window-list-es.omf share/gnome/omf/gnome-panel/window-list-fr.omf -share/gnome/omf/gnome-panel/window-list-it.omf share/gnome/omf/gnome-panel/window-list-ja.omf share/gnome/omf/gnome-panel/window-list-ko.omf share/gnome/omf/gnome-panel/window-list-sv.omf -share/gnome/omf/gnome-panel/window-list-uk.omf share/gnome/omf/gnome-panel/window-list-zh_CN.omf share/gnome/omf/gnome-panel/window-list-zh_TW.omf -share/gnome/omf/gnome-panel/workspace-switcher-C.omf share/gnome/omf/gnome-panel/workspace-switcher-de.omf -share/gnome/omf/gnome-panel/workspace-switcher-es.omf share/gnome/omf/gnome-panel/workspace-switcher-fr.omf -share/gnome/omf/gnome-panel/workspace-switcher-it.omf share/gnome/omf/gnome-panel/workspace-switcher-ja.omf share/gnome/omf/gnome-panel/workspace-switcher-ko.omf share/gnome/omf/gnome-panel/workspace-switcher-sv.omf -share/gnome/omf/gnome-panel/workspace-switcher-uk.omf share/gnome/omf/gnome-panel/workspace-switcher-zh_CN.omf share/gnome/omf/gnome-panel/workspace-switcher-zh_TW.omf +share/gnome/omf/window-list/window-list-C.omf +share/gnome/omf/window-list/window-list-es.omf +share/gnome/omf/window-list/window-list-it.omf +share/gnome/omf/window-list/window-list-uk.omf +share/gnome/omf/workspace-switcher/workspace-switcher-C.omf +share/gnome/omf/workspace-switcher/workspace-switcher-es.omf +share/gnome/omf/workspace-switcher/workspace-switcher-it.omf +share/gnome/omf/workspace-switcher/workspace-switcher-nl.omf +share/gnome/omf/workspace-switcher/workspace-switcher-uk.omf share/gnome/panel/glade/fish.glade share/gnome/panel/glade/panel-properties-dialog.glade share/gnome/panel/glade/panel-run-dialog.glade @@ -313,6 +330,7 @@ share/locale/id/LC_MESSAGES/gnome-panel-2.0.mo share/locale/it/LC_MESSAGES/gnome-panel-2.0.mo share/locale/ja/LC_MESSAGES/gnome-panel-2.0.mo share/locale/ko/LC_MESSAGES/gnome-panel-2.0.mo +share/locale/ku/LC_MESSAGES/gnome-panel-2.0.mo share/locale/li/LC_MESSAGES/gnome-panel-2.0.mo share/locale/lt/LC_MESSAGES/gnome-panel-2.0.mo share/locale/lv/LC_MESSAGES/gnome-panel-2.0.mo @@ -344,6 +362,7 @@ share/locale/sr@Latn/LC_MESSAGES/gnome-panel-2.0.mo share/locale/sr@ije/LC_MESSAGES/gnome-panel-2.0.mo share/locale/sv/LC_MESSAGES/gnome-panel-2.0.mo share/locale/ta/LC_MESSAGES/gnome-panel-2.0.mo +share/locale/te/LC_MESSAGES/gnome-panel-2.0.mo share/locale/th/LC_MESSAGES/gnome-panel-2.0.mo share/locale/tr/LC_MESSAGES/gnome-panel-2.0.mo share/locale/uk/LC_MESSAGES/gnome-panel-2.0.mo @@ -374,7 +393,11 @@ share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo @unexec /bin/rmdir %D/share/locale/hy 2>/dev/null || /usr/bin/true @dirrm share/gnome/panel/pixmaps @dirrm share/gnome/panel/glade +@dirrm share/gnome/omf/workspace-switcher +@dirrm share/gnome/omf/window-list @dirrm share/gnome/omf/gnome-panel +@dirrm share/gnome/omf/fish +@dirrm share/gnome/omf/clock @dirrm share/gnome/idl/gnome-panel-2.0 @dirrm share/gnome/help/workspace-switcher/zh_TW/figures @dirrm share/gnome/help/workspace-switcher/zh_TW @@ -384,6 +407,8 @@ share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo @dirrm share/gnome/help/workspace-switcher/uk @dirrm share/gnome/help/workspace-switcher/sv/figures @dirrm share/gnome/help/workspace-switcher/sv +@dirrm share/gnome/help/workspace-switcher/nl/figures +@dirrm share/gnome/help/workspace-switcher/nl @dirrm share/gnome/help/workspace-switcher/ko/figures @dirrm share/gnome/help/workspace-switcher/ko @dirrm share/gnome/help/workspace-switcher/ja/figures @@ -426,25 +451,26 @@ share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo @dirrm share/gnome/help/fish-applet-2/zh_TW @dirrm share/gnome/help/fish-applet-2/zh_CN/figures @dirrm share/gnome/help/fish-applet-2/zh_CN -@dirrm share/gnome/help/fish-applet-2/uk/figures -@dirrm share/gnome/help/fish-applet-2/uk @dirrm share/gnome/help/fish-applet-2/sv/figures @dirrm share/gnome/help/fish-applet-2/sv @dirrm share/gnome/help/fish-applet-2/ko/figures @dirrm share/gnome/help/fish-applet-2/ko @dirrm share/gnome/help/fish-applet-2/ja/figures @dirrm share/gnome/help/fish-applet-2/ja -@dirrm share/gnome/help/fish-applet-2/it/figures -@dirrm share/gnome/help/fish-applet-2/it @dirrm share/gnome/help/fish-applet-2/fr/figures @dirrm share/gnome/help/fish-applet-2/fr -@dirrm share/gnome/help/fish-applet-2/es/figures -@dirrm share/gnome/help/fish-applet-2/es @dirrm share/gnome/help/fish-applet-2/de/figures @dirrm share/gnome/help/fish-applet-2/de -@dirrm share/gnome/help/fish-applet-2/C/figures -@dirrm share/gnome/help/fish-applet-2/C @dirrm share/gnome/help/fish-applet-2 +@dirrm share/gnome/help/fish/uk/figures +@dirrm share/gnome/help/fish/uk +@dirrm share/gnome/help/fish/it/figures +@dirrm share/gnome/help/fish/it +@dirrm share/gnome/help/fish/es/figures +@dirrm share/gnome/help/fish/es +@dirrm share/gnome/help/fish/C/figures +@dirrm share/gnome/help/fish/C +@dirrm share/gnome/help/fish @dirrm share/gnome/help/clock/zh_TW/figures @dirrm share/gnome/help/clock/zh_TW @dirrm share/gnome/help/clock/zh_CN/figures @@ -453,6 +479,12 @@ share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo @dirrm share/gnome/help/clock/uk @dirrm share/gnome/help/clock/sv/figures @dirrm share/gnome/help/clock/sv +@dirrm share/gnome/help/clock/sr/figures +@dirrm share/gnome/help/clock/sr +@dirrm share/gnome/help/clock/pa/figures +@dirrm share/gnome/help/clock/pa +@dirrm share/gnome/help/clock/nl/figures +@dirrm share/gnome/help/clock/nl @dirrm share/gnome/help/clock/ko/figures @dirrm share/gnome/help/clock/ko @dirrm share/gnome/help/clock/ja/figures diff --git a/x11/gnomesession/Makefile b/x11/gnomesession/Makefile index 1f48df2e0f83..274a00a9a3ed 100644 --- a/x11/gnomesession/Makefile +++ b/x11/gnomesession/Makefile @@ -3,16 +3,18 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/x11/gnomesession/Makefile,v 1.67 2005/10/31 19:46:29 adamw Exp $ # PORTNAME= gnomesession -PORTVERSION= 2.10.0 +PORTVERSION= 2.12.0 +PORTREVISION= 1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} \ ${MASTER_SITE_LOCAL:S/$/:local/} \ - http://people.FreeBSD.org/~pav/:local -MASTER_SITE_SUBDIR= sources/gnome-session/2.10 \ - pav/:local + http://people.FreeBSD.org/~adamw/images/gnome_splashes/2.12/:local +MASTER_SITE_SUBDIR= sources/gnome-session/2.12 \ + adamw/:local DISTNAME= gnome-session-${PORTVERSION} DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ ${SPLASHES}:local @@ -26,16 +28,16 @@ USE_BZIP2= yes USE_X_PREFIX= yes USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui USE_GMAKE= yes -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" -MAN1= gnome-session.1 gnome-smproxy.1 gnome-wm.1 \ - session-properties.1 gnome-session-save.1 +MAN1= gnome-session.1 gnome-wm.1 session-properties.1 \ + gnome-session-save.1 MAN5= default.session.5 GCONF_SCHEMAS= gnome-session.schemas -SPLASHES= freebsd-splashes-gnome-2.10.tar +SPLASHES= freebsd-splashes-gnome-2.12.1.tar post-extract: cd ${WRKDIR} && ${TAR} xf ${DISTDIR}/${DIST_SUBDIR}/${SPLASHES} @@ -43,10 +45,10 @@ post-extract: post-install: ${INSTALL_DATA} ${WRKSRC}/gnome-session/gnome-splash.png \ ${PREFIX}/share/gnome/pixmaps/splash/original-gnome-splash.png - ${INSTALL_DATA} ${WRKDIR}/freebsd-splashes-gnome-2.10/franz_klammer-2.png \ + ${INSTALL_DATA} ${WRKDIR}/freebsd-splashes-gnome-2.12/domix-splash-2.12.png \ ${PREFIX}/share/gnome/pixmaps/splash/gnome-splash.png -.for splash in adamw.png banana_flex.png franco_malatacca.jpg franz_klammer-1.png franz_klammer-3.png radek.png - ${INSTALL_DATA} ${WRKDIR}/freebsd-splashes-gnome-2.10/${splash} \ +.for splash in MaMBaNgGaoX-2.12.png adamw-piggy-2.12.png adamw-trophy-2.12.png andreas-slogan-2.12.png andreas-splash-2.12.png domix-splash-2.12.png domix-splash2-2.12.png mumija-2.12.png mumija2-2.12.png mumija3-2.12.png tremulant-2.12.png tremulant-blood-2.12.png tremulant-brushed-metal-2.12.png + ${INSTALL_DATA} ${WRKDIR}/freebsd-splashes-gnome-2.12/${splash} \ ${PREFIX}/share/gnome/pixmaps/splash .endfor diff --git a/x11/gnomesession/distinfo b/x11/gnomesession/distinfo index 5f305e45c84f..cfcfc5533884 100644 --- a/x11/gnomesession/distinfo +++ b/x11/gnomesession/distinfo @@ -1,4 +1,4 @@ -MD5 (gnome2/gnome-session-2.10.0.tar.bz2) = cbeb2db49dac11bf8088e6b025265fff -SIZE (gnome2/gnome-session-2.10.0.tar.bz2) = 796754 -MD5 (gnome2/freebsd-splashes-gnome-2.10.tar) = 92cfd1945f9a48dd8df3981935e9ef34 -SIZE (gnome2/freebsd-splashes-gnome-2.10.tar) = 462336 +MD5 (gnome2/gnome-session-2.12.0.tar.bz2) = 835e9340d23e139430224b931ff4c597 +SIZE (gnome2/gnome-session-2.12.0.tar.bz2) = 864397 +MD5 (gnome2/freebsd-splashes-gnome-2.12.1.tar) = 4a098f0f2295c3333acff185d4bed5aa +SIZE (gnome2/freebsd-splashes-gnome-2.12.1.tar) = 1280000 diff --git a/x11/gnomesession/pkg-plist b/x11/gnomesession/pkg-plist index 999c30043083..17d898f1ee23 100644 --- a/x11/gnomesession/pkg-plist +++ b/x11/gnomesession/pkg-plist @@ -2,19 +2,25 @@ bin/gnome-session bin/gnome-session-properties bin/gnome-session-remove bin/gnome-session-save -bin/gnome-smproxy bin/gnome-wm share/gnome/applications/session-properties.desktop share/gnome/default.session share/gnome/default.wm -share/gnome/pixmaps/splash/adamw.png -share/gnome/pixmaps/splash/banana_flex.png -share/gnome/pixmaps/splash/franco_malatacca.jpg -share/gnome/pixmaps/splash/franz_klammer-1.png -share/gnome/pixmaps/splash/franz_klammer-3.png +share/gnome/pixmaps/splash/MaMBaNgGaoX-2.12.png +share/gnome/pixmaps/splash/adamw-piggy-2.12.png +share/gnome/pixmaps/splash/adamw-trophy-2.12.png +share/gnome/pixmaps/splash/andreas-slogan-2.12.png +share/gnome/pixmaps/splash/andreas-splash-2.12.png +share/gnome/pixmaps/splash/domix-splash-2.12.png +share/gnome/pixmaps/splash/domix-splash2-2.12.png share/gnome/pixmaps/splash/gnome-splash.png +share/gnome/pixmaps/splash/mumija-2.12.png +share/gnome/pixmaps/splash/mumija2-2.12.png +share/gnome/pixmaps/splash/mumija3-2.12.png share/gnome/pixmaps/splash/original-gnome-splash.png -share/gnome/pixmaps/splash/radek.png +share/gnome/pixmaps/splash/tremulant-2.12.png +share/gnome/pixmaps/splash/tremulant-blood-2.12.png +share/gnome/pixmaps/splash/tremulant-brushed-metal-2.12.png share/locale/af/LC_MESSAGES/gnome-session-2.0.mo share/locale/am/LC_MESSAGES/gnome-session-2.0.mo share/locale/ar/LC_MESSAGES/gnome-session-2.0.mo @@ -45,6 +51,7 @@ share/locale/he/LC_MESSAGES/gnome-session-2.0.mo share/locale/hi/LC_MESSAGES/gnome-session-2.0.mo share/locale/hr/LC_MESSAGES/gnome-session-2.0.mo share/locale/hu/LC_MESSAGES/gnome-session-2.0.mo +share/locale/hy/LC_MESSAGES/gnome-session-2.0.mo share/locale/id/LC_MESSAGES/gnome-session-2.0.mo share/locale/is/LC_MESSAGES/gnome-session-2.0.mo share/locale/it/LC_MESSAGES/gnome-session-2.0.mo @@ -82,9 +89,12 @@ share/locale/th/LC_MESSAGES/gnome-session-2.0.mo share/locale/tk/LC_MESSAGES/gnome-session-2.0.mo share/locale/tr/LC_MESSAGES/gnome-session-2.0.mo share/locale/uk/LC_MESSAGES/gnome-session-2.0.mo +share/locale/rw/LC_MESSAGES/gnome-session-2.0.mo share/locale/vi/LC_MESSAGES/gnome-session-2.0.mo share/locale/wa/LC_MESSAGES/gnome-session-2.0.mo share/locale/xh/LC_MESSAGES/gnome-session-2.0.mo share/locale/zh_CN/LC_MESSAGES/gnome-session-2.0.mo share/locale/zh_TW/LC_MESSAGES/gnome-session-2.0.mo share/locale/zu/LC_MESSAGES/gnome-session-2.0.mo +@unexec /bin/rmdir %D/share/locale/hy/LC_MESSAGES 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/locale/hy 2>/dev/null || /usr/bin/true diff --git a/x11/gnometerminal/Makefile b/x11/gnometerminal/Makefile index 6a58361c7fcc..f6dded8a0189 100644 --- a/x11/gnometerminal/Makefile +++ b/x11/gnometerminal/Makefile @@ -3,14 +3,14 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/x11/gnometerminal/Makefile,v 1.52 2005/10/14 20:39:58 adamw Exp $ # PORTNAME= gnometerminal -PORTVERSION= 2.10.0 -PORTREVISION= 1 +PORTVERSION= 2.12.0 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-terminal/2.10 +MASTER_SITE_SUBDIR= sources/gnome-terminal/2.12 DISTNAME= gnome-terminal-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -23,7 +23,7 @@ USE_X_PREFIX= yes USE_REINPLACE= yes USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui vte -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/x11/gnometerminal/distinfo b/x11/gnometerminal/distinfo index bb6a1fa2132f..13b21339bab4 100644 --- a/x11/gnometerminal/distinfo +++ b/x11/gnometerminal/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-terminal-2.10.0.tar.bz2) = 062744daca0c7f708b8c52f47b5db0d1 -SIZE (gnome2/gnome-terminal-2.10.0.tar.bz2) = 2334171 +MD5 (gnome2/gnome-terminal-2.12.0.tar.bz2) = 483c9397dd165845e2528a80e3df6dfc +SIZE (gnome2/gnome-terminal-2.12.0.tar.bz2) = 1684178 diff --git a/x11/gnometerminal/files/patch-src::terminal-screen.c b/x11/gnometerminal/files/patch-src::terminal-screen.c index c7cf1b8ce449..0198f748c37d 100644 --- a/x11/gnometerminal/files/patch-src::terminal-screen.c +++ b/x11/gnometerminal/files/patch-src::terminal-screen.c @@ -1,27 +1,23 @@ ---- src/terminal-screen.c.orig Thu Mar 3 15:13:08 2005 -+++ src/terminal-screen.c Wed Mar 16 03:11:08 2005 -@@ -246,18 +246,18 @@ - #define USER "[" USERCHARS "]+(:["PASSCHARS "]+)?" +--- src/terminal-screen.c.orig Fri Jul 1 20:37:58 2005 ++++ src/terminal-screen.c Tue Jul 5 13:26:21 2005 +@@ -248,16 +248,16 @@ terminal_screen_init (TerminalScreen *sc + #define URLPATH "/[" PATHCHARS "]*[^]'.}>) \t\r\n,\\\"]" terminal_widget_match_add (screen->priv->term, -- "\\<(" SCHEME "://(" USER "@)?)[" HOSTCHARS ".]+(:[0-9]+)?" -- "(/[-A-Za-z0-9_$.+!*(),;:@&=?/~#%]*[^]'.}>) \t\r\n,\\\"])?\\>", FLAVOR_AS_IS); -+ "[[:<:]](" SCHEME "://(" USER "@)?)[" HOSTCHARS ".]+(:[0-9]+)?" -+ "(/[-A-Za-z0-9_$.+!*(),;:@&=?/~#%]*[^]'.}>) \t\r\n,\\\"])?[[:>:]]", FLAVOR_AS_IS); +- "\\<(" SCHEME "://(" USER "@)?)[" HOSTCHARS ".]+(:[0-9]+)?(" URLPATH ")?", FLAVOR_AS_IS); ++ "[[:<:]](" SCHEME "://(" USER "@)?)[" HOSTCHARS ".]+(:[0-9]+)?(" URLPATH ")?", FLAVOR_AS_IS); terminal_widget_match_add (screen->priv->term, -- "\\<(www|ftp)[" HOSTCHARS "]*\\.[" HOSTCHARS ".]+(:[0-9]+)?" -- "(/[-A-Za-z0-9_$.+!*(),;:@&=?/~#%]*[^]'.}>) \t\r\n,\\\"])?\\>", FLAVOR_DEFAULT_TO_HTTP); -+ "[[:<:]](www|ftp)[" HOSTCHARS "]*\\.[" HOSTCHARS ".]+(:[0-9]+)?" -+ "(/[-A-Za-z0-9_$.+!*(),;:@&=?/~#%]*[^]'.}>) \t\r\n,\\\"])?[[:>:]]", FLAVOR_DEFAULT_TO_HTTP); +- "\\<(www|ftp)[" HOSTCHARS "]*\\.[" HOSTCHARS ".]+(:[0-9]+)?(" URLPATH ")?", FLAVOR_DEFAULT_TO_HTTP); ++ "[[:<:]]<(www|ftp)[" HOSTCHARS "]*\\.[" HOSTCHARS ".]+(:[0-9]+)?(" URLPATH ")?", FLAVOR_DEFAULT_TO_HTTP); terminal_widget_match_add (screen->priv->term, - "\\<(mailto:)?[a-z0-9][a-z0-9.-]*@[a-z0-9][a-z0-9-]*(\\.[a-z0-9][a-z0-9-]*)+\\>", FLAVOR_MAILTO); -+ "[[:<:]](mailto:)?[a-z0-9][a-z0-9.-]*@[a-z0-9][a-z0-9-]*(\\.[a-z0-9][a-z0-9-]*)+[[:>:]]", FLAVOR_MAILTO); ++ "[[:<:]](mailto:)?[a-z0-9][a-z0-9.-]*@[a-z0-9][a-z0-9-]*(\\.[a-z0-9][a-z0-9-]*)+\\>", FLAVOR_MAILTO); terminal_widget_match_add (screen->priv->term, - "\\<news:[-A-Z\\^_a-z{|}~!\"#$%&'()*+,./0-9;:=?`]+@[" HOSTCHARS ".]+(:[0-9]+)?\\>", FLAVOR_AS_IS); -+ "[[:<:]]news:[-A-Z\\^_a-z{|}~!\"#$%&'()*+,./0-9;:=?`]+@[" HOSTCHARS ".]+(:[0-9]+)?[[:>:]]", FLAVOR_AS_IS); ++ "[[:<:]]<news:[-A-Z\\^_a-z{|}~!\"#$%&'()*+,./0-9;:=?`]+@[" HOSTCHARS ".]+(:[0-9]+)?\\>", FLAVOR_AS_IS); terminal_screen_setup_dnd (screen); diff --git a/x11/gnometerminal/pkg-plist b/x11/gnometerminal/pkg-plist index 22d4a5870a1e..721f659b8cd1 100644 --- a/x11/gnometerminal/pkg-plist +++ b/x11/gnometerminal/pkg-plist @@ -103,6 +103,7 @@ share/locale/he/LC_MESSAGES/gnome-terminal.mo share/locale/hi/LC_MESSAGES/gnome-terminal.mo share/locale/hr/LC_MESSAGES/gnome-terminal.mo share/locale/hu/LC_MESSAGES/gnome-terminal.mo +share/locale/hy/LC_MESSAGES/gnome-terminal.mo share/locale/id/LC_MESSAGES/gnome-terminal.mo share/locale/it/LC_MESSAGES/gnome-terminal.mo share/locale/ja/LC_MESSAGES/gnome-terminal.mo @@ -124,6 +125,7 @@ share/locale/pt/LC_MESSAGES/gnome-terminal.mo share/locale/pt_BR/LC_MESSAGES/gnome-terminal.mo share/locale/ro/LC_MESSAGES/gnome-terminal.mo share/locale/ru/LC_MESSAGES/gnome-terminal.mo +share/locale/rw/LC_MESSAGES/gnome-terminal.mo share/locale/sk/LC_MESSAGES/gnome-terminal.mo share/locale/sl/LC_MESSAGES/gnome-terminal.mo share/locale/sq/LC_MESSAGES/gnome-terminal.mo @@ -136,6 +138,7 @@ share/locale/tr/LC_MESSAGES/gnome-terminal.mo share/locale/uk/LC_MESSAGES/gnome-terminal.mo share/locale/vi/LC_MESSAGES/gnome-terminal.mo share/locale/wa/LC_MESSAGES/gnome-terminal.mo +share/locale/xh/LC_MESSAGES/gnome-terminal.mo share/locale/zh_CN/LC_MESSAGES/gnome-terminal.mo share/locale/zh_TW/LC_MESSAGES/gnome-terminal.mo @dirrm share/gnome/omf/gnome-terminal diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile index 829fdefb2c54..9c95010e7c45 100644 --- a/x11/libgnome/Makefile +++ b/x11/libgnome/Makefile @@ -3,13 +3,14 @@ # Whom: Yukihiro Nakai <Nakai@technologist.com> # # $FreeBSD$ +# $MCom: ports/x11/libgnome/Makefile,v 1.61 2005/09/07 16:21:36 marcus Exp $ # PORTNAME= libgnome -PORTVERSION= 2.10.1 +PORTVERSION= 2.12.0.1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.10 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.12 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -24,15 +25,17 @@ USE_REINPLACE= yes USE_XPM= yes USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack intlhack esound \ - gnomevfs2 libxslt + gnomevfs2 libxslt ltverhack USE_BISON= yes INSTALLS_SHLIB= yes -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" SUB_FILES= pkg-deinstall +MAN7= gnome-options.7 + GCONF_SCHEMAS= desktop_gnome_accessibility_keyboard.schemas \ desktop_gnome_accessibility_startup.schemas \ desktop_gnome_applications_browser.schemas \ diff --git a/x11/libgnome/distinfo b/x11/libgnome/distinfo index 6b7941d329d7..cd9f710f0d4a 100644 --- a/x11/libgnome/distinfo +++ b/x11/libgnome/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/libgnome-2.10.1.tar.bz2) = dfb1a9b5fd25da8680a166c83ce0b6a8 -SIZE (gnome2/libgnome-2.10.1.tar.bz2) = 1227721 +MD5 (gnome2/libgnome-2.12.0.1.tar.bz2) = f239a7ab132d2ec9039bb2537cca1e92 +SIZE (gnome2/libgnome-2.12.0.1.tar.bz2) = 955235 diff --git a/x11/libgnome/files/patch-ag b/x11/libgnome/files/patch-ag index 157a59be15ac..2caedc380d59 100644 --- a/x11/libgnome/files/patch-ag +++ b/x11/libgnome/files/patch-ag @@ -1,5 +1,6 @@ $FreeBSD$ + $MCom: ports/x11/libgnome/files/patch-ag,v 1.18 2005/07/04 00:15:01 marcus Exp $ --- libgnome/gnome-util.c 2002/03/19 17:16:21 1.1 +++ libgnome/gnome-util.c 2002/03/19 17:21:31 diff --git a/x11/libgnome/files/pkg-deinstall.in b/x11/libgnome/files/pkg-deinstall.in index 0ac463865c7f..adb5cef39218 100644 --- a/x11/libgnome/files/pkg-deinstall.in +++ b/x11/libgnome/files/pkg-deinstall.in @@ -1,6 +1,7 @@ #!/bin/sh # # $FreeBSD$ +# $MCom: ports/x11/libgnome/files/pkg-deinstall.in,v 1.2 2005/07/04 00:15:01 marcus Exp $ # # Restore gconf keys of gnomevfs2. diff --git a/x11/libgnome/pkg-plist b/x11/libgnome/pkg-plist index 9df5db77e9a7..57c04872a299 100644 --- a/x11/libgnome/pkg-plist +++ b/x11/libgnome/pkg-plist @@ -19,7 +19,7 @@ include/libgnome-2.0/libgnome/libgnometypebuiltins.h lib/bonobo/monikers/libmoniker_extra_2.so lib/libgnome-2.a lib/libgnome-2.so -lib/libgnome-2.so.1000 +lib/libgnome-2.so.0 libdata/bonobo/servers/GNOME_Moniker_std.server libdata/pkgconfig/libgnome-2.0.pc %%PORTDOCS%%%%DOCSDIR%%/ch01s02.html @@ -46,6 +46,7 @@ libdata/pkgconfig/libgnome-2.0.pc %%PORTDOCS%%%%DOCSDIR%%/libgnome.devhelp %%PORTDOCS%%%%DOCSDIR%%/libgnome.html %%PORTDOCS%%%%DOCSDIR%%/right.png +%%PORTDOCS%%%%DOCSDIR%%/style.css %%PORTDOCS%%%%DOCSDIR%%/up.png share/locale/am/LC_MESSAGES/libgnome-2.0.mo share/locale/ar/LC_MESSAGES/libgnome-2.0.mo @@ -115,14 +116,6 @@ share/locale/xh/LC_MESSAGES/libgnome-2.0.mo share/locale/yi/LC_MESSAGES/libgnome-2.0.mo share/locale/zh_CN/LC_MESSAGES/libgnome-2.0.mo share/locale/zh_TW/LC_MESSAGES/libgnome-2.0.mo -@unexec rmdir %D/share/locale/yi/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/yi 2> /dev/null || true -@unexec rmdir %D/share/locale/xh/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/xh 2> /dev/null || true -@unexec rmdir %D/share/locale/sr@ije/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/sr@ije 2> /dev/null || true -@unexec rmdir %D/share/locale/rw/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/rw 2> /dev/null || true -%%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm include/libgnome-2.0/libgnome @dirrm include/libgnome-2.0 +%%PORTDOCS%%@dirrm %%DOCSDIR%% diff --git a/x11/yelp/Makefile b/x11/yelp/Makefile index 98532139cc2f..a80939317c25 100644 --- a/x11/yelp/Makefile +++ b/x11/yelp/Makefile @@ -3,39 +3,38 @@ # Whom: Maxim Sobolev <sobomax@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/x11/yelp/Makefile,v 1.63 2005/10/09 00:42:45 marcus Exp $ # PORTNAME= yelp -PORTVERSION= 2.10.0 +PORTVERSION= 2.12.1 PORTREVISION= 1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.10 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.12 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= A help browser for the GNOME 2 desktop -BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/gnome-doc-utils.pc:${PORTSDIR}/textproc/gnomedocutils \ - ${X11BASE}/lib/${MOZILLA}/components/libwidget_gtk2.so:${PORTSDIR}/www/${MOZILLA} -RUN_DEPENDS= ${X11BASE}/libdata/pkgconfig/gnome-doc-utils.pc:${PORTSDIR}/textproc/gnomedocutils \ - ${X11BASE}/lib/${MOZILLA}/components/libwidget_gtk2.so:${PORTSDIR}/www/${MOZILLA} +BUILD_DEPENDS= ${X11BASE}/lib/${MOZILLA}/components/libwidget_gtk2.so:${PORTSDIR}/www/${MOZILLA} +RUN_DEPENDS= ${X11BASE}/lib/${MOZILLA}/components/libwidget_gtk2.so:${PORTSDIR}/www/${MOZILLA} -MOZILLA= mozilla +MOZILLA= firefox HEADERS_SUFX= .if !defined(WITH_MOZILLA) -MOZILLA= mozilla +MOZILLA= firefox HEADERS_SUFX= .else -.if ${WITH_MOZILLA}=="firefox" -MOZILLA= firefox +.if ${WITH_MOZILLA}=="mozilla" +MOZILLA= 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= .endif .endif @@ -45,8 +44,9 @@ USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes USE_REINPLACE= yes -USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui -USE_LIBTOOL_VER=15 +USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui gnomedocutils +USE_AUTOTOOLS= libtool:15 +INSTALLS_ICONS= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --with-mozilla=${MOZILLA} @@ -75,11 +75,11 @@ CONFIGURE_ARGS+=--enable-info pre-everything:: @${ECHO_MSG} "" - @${ECHO_MSG} " By default yelp uses www/mozilla for html rendering, but you can" + @${ECHO_MSG} " By default yelp 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} " mozilla-devel " - @${ECHO_MSG} " firefox " + @${ECHO_MSG} " mozilla" @${ECHO_MSG} "" post-patch: diff --git a/x11/yelp/distinfo b/x11/yelp/distinfo index 118e19b6486c..3a2d0eca6b3f 100644 --- a/x11/yelp/distinfo +++ b/x11/yelp/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/yelp-2.10.0.tar.bz2) = 326f85c8c0fd944e782a37b0589036c5 -SIZE (gnome2/yelp-2.10.0.tar.bz2) = 790852 +MD5 (gnome2/yelp-2.12.1.tar.bz2) = d6a9c142ca367447f06cee003b6d8a5d +SIZE (gnome2/yelp-2.12.1.tar.bz2) = 815483 diff --git a/x11/yelp/pkg-plist b/x11/yelp/pkg-plist index c26d1638c222..b51798ea50fa 100644 --- a/x11/yelp/pkg-plist +++ b/x11/yelp/pkg-plist @@ -26,6 +26,8 @@ share/gnome/yelp/xslt/db2html.xsl share/gnome/yelp/xslt/info2html.xsl share/gnome/yelp/xslt/man2html.xsl share/gnome/yelp/xslt/toc2html.xsl +share/gnome/yelp/xslt/yelp-common.xsl +share/gnome/yelp/yelp.js share/icons/hicolor/192x192/apps/yelp-icon-big.png share/locale/af/LC_MESSAGES/yelp.mo share/locale/am/LC_MESSAGES/yelp.mo @@ -64,6 +66,7 @@ share/locale/ja/LC_MESSAGES/yelp.mo share/locale/ka/LC_MESSAGES/yelp.mo share/locale/kn/LC_MESSAGES/yelp.mo share/locale/ko/LC_MESSAGES/yelp.mo +share/locale/ku/LC_MESSAGES/yelp.mo share/locale/li/LC_MESSAGES/yelp.mo share/locale/lt/LC_MESSAGES/yelp.mo share/locale/lv/LC_MESSAGES/yelp.mo @@ -111,6 +114,8 @@ share/locale/zu/LC_MESSAGES/yelp.mo @unexec rmdir %D/share/locale/nso 2> /dev/null || true @unexec rmdir %D/share/locale/mr/LC_MESSAGES 2> /dev/null || true @unexec rmdir %D/share/locale/mr 2> /dev/null || true +@unexec rmdir %D/share/locale/ku/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/ku 2> /dev/null || true @dirrm share/gnome/yelp/xslt @dirrm share/gnome/yelp/ui @dirrm share/gnome/yelp/icons diff --git a/x11/zenity/Makefile b/x11/zenity/Makefile index 966d951dd6c1..8cd704bb0960 100644 --- a/x11/zenity/Makefile +++ b/x11/zenity/Makefile @@ -3,16 +3,17 @@ # Whom: Franz Klammer <klammer@webonaut.com> # # $FreeBSD$ +# $MCom: ports/x11/zenity/Makefile,v 1.46 2005/10/30 23:07:09 marcus Exp $ # PORTNAME= zenity -PORTVERSION= 2.10.0 +PORTVERSION= 2.12.1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.10 -DIST_SUBDIR= gnome2 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.12 +DIST_SUBDIR= gnome2 -MAINTAINER= klammer@webonaut.com +MAINTAINER= gnome@FreeBSD.org COMMENT= Display GNOME dialogs from the command line BUILD_DEPENDS= scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper @@ -21,7 +22,7 @@ RUN_DEPENDS= scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper USE_X_PREFIX= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix gnomehack libgnomecanvas gconf2 +USE_GNOME= gnomeprefix gnomehack libgnomecanvas gconf2 gnomedocutils USE_BZIP2= yes GNU_CONFIGURE= yes USE_REINPLACE= yes diff --git a/x11/zenity/distinfo b/x11/zenity/distinfo index ea553b6190df..31b12945eca0 100644 --- a/x11/zenity/distinfo +++ b/x11/zenity/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/zenity-2.10.0.tar.bz2) = 2e501bba72b6e7d4f951080b9e5f675b -SIZE (gnome2/zenity-2.10.0.tar.bz2) = 742206 +MD5 (gnome2/zenity-2.12.1.tar.bz2) = d8fbcf326e42b5dae70a570fad024947 +SIZE (gnome2/zenity-2.12.1.tar.bz2) = 896002 diff --git a/x11/zenity/pkg-plist b/x11/zenity/pkg-plist index 879d5604c2cf..d2276349c61b 100644 --- a/x11/zenity/pkg-plist +++ b/x11/zenity/pkg-plist @@ -13,20 +13,46 @@ share/gnome/help/zenity/C/figures/zenity-text-screenshot.png share/gnome/help/zenity/C/figures/zenity-warning-screenshot.png share/gnome/help/zenity/C/legal.xml share/gnome/help/zenity/C/zenity.xml -share/gnome/help/zenity/sr/figures/zenity-calendar-screenshot.png -share/gnome/help/zenity/sr/figures/zenity-entry-screenshot.png -share/gnome/help/zenity/sr/figures/zenity-error-screenshot.png -share/gnome/help/zenity/sr/figures/zenity-fileselection-screenshot.png -share/gnome/help/zenity/sr/figures/zenity-information-screenshot.png -share/gnome/help/zenity/sr/figures/zenity-list-screenshot.png -share/gnome/help/zenity/sr/figures/zenity-progress-screenshot.png -share/gnome/help/zenity/sr/figures/zenity-question-screenshot.png -share/gnome/help/zenity/sr/figures/zenity-text-screenshot.png -share/gnome/help/zenity/sr/figures/zenity-warning-screenshot.png -share/gnome/help/zenity/sr/legal.xml -share/gnome/help/zenity/sr/zenity.xml +share/gnome/help/zenity/es/figures/zenity-calendar-screenshot.png +share/gnome/help/zenity/es/figures/zenity-entry-screenshot.png +share/gnome/help/zenity/es/figures/zenity-error-screenshot.png +share/gnome/help/zenity/es/figures/zenity-fileselection-screenshot.png +share/gnome/help/zenity/es/figures/zenity-information-screenshot.png +share/gnome/help/zenity/es/figures/zenity-list-screenshot.png +share/gnome/help/zenity/es/figures/zenity-notification-screenshot.png +share/gnome/help/zenity/es/figures/zenity-progress-screenshot.png +share/gnome/help/zenity/es/figures/zenity-question-screenshot.png +share/gnome/help/zenity/es/figures/zenity-text-screenshot.png +share/gnome/help/zenity/es/figures/zenity-warning-screenshot.png +share/gnome/help/zenity/es/zenity.xml +share/gnome/help/zenity/fr/figures/zenity-calendar-screenshot.png +share/gnome/help/zenity/fr/figures/zenity-entry-screenshot.png +share/gnome/help/zenity/fr/figures/zenity-error-screenshot.png +share/gnome/help/zenity/fr/figures/zenity-fileselection-screenshot.png +share/gnome/help/zenity/fr/figures/zenity-information-screenshot.png +share/gnome/help/zenity/fr/figures/zenity-list-screenshot.png +share/gnome/help/zenity/fr/figures/zenity-notification-screenshot.png +share/gnome/help/zenity/fr/figures/zenity-progress-screenshot.png +share/gnome/help/zenity/fr/figures/zenity-question-screenshot.png +share/gnome/help/zenity/fr/figures/zenity-text-screenshot.png +share/gnome/help/zenity/fr/figures/zenity-warning-screenshot.png +share/gnome/help/zenity/fr/zenity.xml +share/gnome/help/zenity/uk/figures/zenity-calendar-screenshot.png +share/gnome/help/zenity/uk/figures/zenity-entry-screenshot.png +share/gnome/help/zenity/uk/figures/zenity-error-screenshot.png +share/gnome/help/zenity/uk/figures/zenity-fileselection-screenshot.png +share/gnome/help/zenity/uk/figures/zenity-information-screenshot.png +share/gnome/help/zenity/uk/figures/zenity-list-screenshot.png +share/gnome/help/zenity/uk/figures/zenity-notification-screenshot.png +share/gnome/help/zenity/uk/figures/zenity-progress-screenshot.png +share/gnome/help/zenity/uk/figures/zenity-question-screenshot.png +share/gnome/help/zenity/uk/figures/zenity-text-screenshot.png +share/gnome/help/zenity/uk/figures/zenity-warning-screenshot.png +share/gnome/help/zenity/uk/zenity.xml share/gnome/omf/zenity/zenity-C.omf -share/gnome/omf/zenity/zenity-sr.omf +share/gnome/omf/zenity/zenity-es.omf +share/gnome/omf/zenity/zenity-fr.omf +share/gnome/omf/zenity/zenity-uk.omf share/gnome/zenity/clothes/gnome-tshirt.png share/gnome/zenity/clothes/hawaii-shirt.png share/gnome/zenity/clothes/monk.png @@ -65,6 +91,7 @@ share/locale/fr/LC_MESSAGES/zenity-0.1.mo share/locale/ga/LC_MESSAGES/zenity-0.1.mo share/locale/gl/LC_MESSAGES/zenity-0.1.mo share/locale/gu/LC_MESSAGES/zenity-0.1.mo +share/locale/he/LC_MESSAGES/zenity-0.1.mo share/locale/hi/LC_MESSAGES/zenity-0.1.mo share/locale/hr/LC_MESSAGES/zenity-0.1.mo share/locale/hu/LC_MESSAGES/zenity-0.1.mo @@ -91,6 +118,7 @@ share/locale/pt/LC_MESSAGES/zenity-0.1.mo share/locale/pt_BR/LC_MESSAGES/zenity-0.1.mo share/locale/ro/LC_MESSAGES/zenity-0.1.mo share/locale/ru/LC_MESSAGES/zenity-0.1.mo +share/locale/rw/LC_MESSAGES/zenity-0.1.mo share/locale/sk/LC_MESSAGES/zenity-0.1.mo share/locale/sl/LC_MESSAGES/zenity-0.1.mo share/locale/sq/LC_MESSAGES/zenity-0.1.mo @@ -100,15 +128,23 @@ share/locale/sv/LC_MESSAGES/zenity-0.1.mo share/locale/ta/LC_MESSAGES/zenity-0.1.mo share/locale/th/LC_MESSAGES/zenity-0.1.mo share/locale/tr/LC_MESSAGES/zenity-0.1.mo +share/locale/ug/LC_MESSAGES/zenity-0.1.mo share/locale/uk/LC_MESSAGES/zenity-0.1.mo share/locale/vi/LC_MESSAGES/zenity-0.1.mo +share/locale/xh/LC_MESSAGES/zenity-0.1.mo share/locale/zh_CN/LC_MESSAGES/zenity-0.1.mo share/locale/zh_TW/LC_MESSAGES/zenity-0.1.mo +@unexec rmdir %D/share/locale/ug/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/ug 2> /dev/null || true @dirrm share/gnome/zenity/clothes @dirrm share/gnome/zenity @dirrm share/gnome/omf/zenity -@dirrm share/gnome/help/zenity/sr/figures -@dirrm share/gnome/help/zenity/sr +@dirrm share/gnome/help/zenity/uk/figures +@dirrm share/gnome/help/zenity/uk +@dirrm share/gnome/help/zenity/fr/figures +@dirrm share/gnome/help/zenity/fr +@dirrm share/gnome/help/zenity/es/figures +@dirrm share/gnome/help/zenity/es @dirrm share/gnome/help/zenity/C/figures @dirrm share/gnome/help/zenity/C @dirrm share/gnome/help/zenity |