Presenting GNOME 2.12 for FreeBSD. The release is chock full of bug fixes

and new features.  Don't believe me?  Then see for yourself at
http://www.gnome.org/start/2.12/notes/en/.

DO NOT USE portupgrade by itself to upgrade to GNOME 2.12.  Instead, use
the gnome_upgrade.sh script from
http://www.marcuscom.com/downloads/gnome_upgrade212.sh.  This script will
circumvent some potential pitfalls users can see if they use portupgrade
by itself.

In keeping with tradition, GNOME 2.12 for FreeBSD comes with a special
splash screen.  The winner of this release's contest is
Dominique Goncalves <dominique.goncalves@gmail.com>.  His splash screen
was inspired by http://art.gnome.org/contests/2.12-splash/83.

The FreeBSD GNOME Team would lank to thank the following users for
their contributions to this release:

Matthew Luckie <mjl@luckie.org.nz>
ade
sajd on #freebsd-gnome
Caelian on #freebsd-gnome
mnag
Yasuda Keisuke <kysd@po.harenet.ne.jp>
Mark Hobden <markhobden@gmail.com>
Sergey Akifyev <asa@agava.com>
Andreas Kohn

For more information on GNOME on FreeBSD, checkout
http://www.FreeBSD.org/gnome/.  The 2.12 documentation will be
posted shortly.

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>

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

accessibility/atk/files/patch-Makefile.in

@@ -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
- 

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

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>

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

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

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:

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

accessibility/gnopernicus/files/patch-braille_libbrl_brlxml.c

@@ -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);

accessibility/gnopernicus/files/patch-gnopi_gnopi.c

@@ -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));

accessibility/gnopernicus/files/patch-srcore_srbrl.c

@@ -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);

accessibility/gnopernicus/files/patch-srcore_srmain.c

@@ -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)
- 	{

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))

accessibility/gnopernicus/files/patch-srlow_libsrlow_SRObject.c

@@ -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)

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

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

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

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"; \

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 */

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);

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

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

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

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"; \

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 */

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);

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

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>

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

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

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>

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

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

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"

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

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

audio/sound-juicer/files/patch-src::sj-genres.c

@@ -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"
- 

audio/sound-juicer/files/patch-src::sj-util.c

@@ -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 */

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

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>

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

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), 

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

databases/evolution-data-server/files/patch-servers_groupwise_e-gw-connection.c

@@ -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);

databases/evolution-data-server/files/patch-servers_groupwise_e-gw-item.c

@@ -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) ;

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%%

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>

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

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

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"
 

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

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),

deskutils/gnome-utils/files/patch-logview_userprefs.c

@@ -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;
- 		}
- 	}

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

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"
 

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

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),

deskutils/gnomeutils2/files/patch-logview_userprefs.c

@@ -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;
- 		}
- 	}

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

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

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

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));

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

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

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

devel/bug-buddy/files/patch-docs_bug-buddy.omf.in

@@ -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>

devel/bug-buddy/files/patch-src::united-states-of-bug-buddy.c

@@ -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[] = {

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

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

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

devel/bugbuddy/files/patch-docs_bug-buddy.omf.in

@@ -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>

devel/bugbuddy/files/patch-src::united-states-of-bug-buddy.c

@@ -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[] = {

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

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>

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

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

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 \

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

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);

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

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

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
 

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

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,38 +39,14 @@ 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
+
+OPTIONS=	SAMBA "Enable SMB volume support" on \
+		MDNS "Enable Bonjour/Rendezvous support" on
 
 .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
-
-.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
-
 .if exists(${LOCALBASE}/lib/libfam.so) || !defined(WITHOUT_FAM)
 USE_FAM=	yes
 .endif
@@ -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' \

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

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)				\

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

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
-

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

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",

devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-mime-info.c

@@ -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);

devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-mime.c

@@ -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;

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

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;

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)

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
+ 

devel/gnome-vfs/files/patch-modules_smb-method.c

@@ -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;
- 

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.
 

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.