Presenting GNOME 2.26.1 for FreeBSD.

Approved by:	portmgr (marcus)

7 files changed, 37 insertions, 37 deletions

diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile
index 1c90f48bbc35..2cd1c53bc085 100644
--- a/databases/evolution-data-server/Makefile
+++ b/databases/evolution-data-server/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/databases/evolution-data-server/Makefile,v 1.168 2009/03/17 13:17:16 kwm Exp $
+#   $MCom: ports-stable/databases/evolution-data-server/Makefile,v 1.5 2009/04/15 23:04:33 kwm Exp $
 #
 
 PORTNAME=	evolution-data-server
-PORTVERSION=	2.26.0
+PORTVERSION=	2.26.1.1
 CATEGORIES=	databases gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
diff --git a/databases/evolution-data-server/distinfo b/databases/evolution-data-server/distinfo
index ed4def55e750..105b9df87f16 100644
--- a/databases/evolution-data-server/distinfo
+++ b/databases/evolution-data-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/evolution-data-server-2.26.0.tar.bz2) = d010845a4ee9604f050403b106c2f416
-SHA256 (gnome2/evolution-data-server-2.26.0.tar.bz2) = 1e15e964355de7db63f9ee1480c0882ede0d44252ed5778fe65b4e163f7945f0
-SIZE (gnome2/evolution-data-server-2.26.0.tar.bz2) = 7344309
+MD5 (gnome2/evolution-data-server-2.26.1.1.tar.bz2) = 0d626ddc09116f25fe5b42bd38b7f440
+SHA256 (gnome2/evolution-data-server-2.26.1.1.tar.bz2) = 530bc9309625afceb6545569dfa11ecc9ffe9b944e0d775ad82780dd6441ab8e
+SIZE (gnome2/evolution-data-server-2.26.1.1.tar.bz2) = 7375026
diff --git a/databases/evolution-data-server/files/patch-docs_reference_camel_Makefile.in b/databases/evolution-data-server/files/patch-docs_reference_camel_Makefile.in
index f84db6643729..8e3728055401 100644
--- a/databases/evolution-data-server/files/patch-docs_reference_camel_Makefile.in
+++ b/databases/evolution-data-server/files/patch-docs_reference_camel_Makefile.in
@@ -1,6 +1,6 @@
---- docs/reference/camel/Makefile.in.orig	2009-01-16 16:16:56.000000000 +0100
-+++ docs/reference/camel/Makefile.in	2009-01-16 16:18:31.000000000 +0100
-@@ -130,7 +130,7 @@ GNOME_PLATFORM_LIBS = @GNOME_PLATFORM_LI
+--- docs/reference/camel/Makefile.in.orig	2009-04-17 01:03:20.000000000 +0200
++++ docs/reference/camel/Makefile.in	2009-04-17 01:04:39.000000000 +0200
+@@ -132,7 +132,7 @@ GNOME_PLATFORM_LIBS = @GNOME_PLATFORM_LI
  GOBJECT_QUERY = @GOBJECT_QUERY@
  GREP = @GREP@
  HAVE_JW = @HAVE_JW@
@@ -9,3 +9,21 @@
  ICONV_CFLAGS = @ICONV_CFLAGS@
  ICONV_LIBS = @ICONV_LIBS@
  IDL_INCLUDES = @IDL_INCLUDES@
+@@ -730,7 +730,7 @@ install-data-local:
+ 	    mv -f $${installdir}/$(DOC_MODULE).devhelp \
+ 	      $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \
+ 	  fi; \
+-	  gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir}; \
++#	  gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir}; \
+ 	fi
+ 
+ uninstall-local:
+@@ -759,7 +759,7 @@ dist-hook: dist-check-gtkdoc dist-hook-l
+ 	-cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
+ 	-cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
+ 	cd $(distdir) && rm -f $(DISTCLEANFILES)
+-	gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
++#	gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
+ 
+ .PHONY : dist-hook-local docs
+ 
diff --git a/databases/evolution-data-server/pkg-plist b/databases/evolution-data-server/pkg-plist
index d8ef379ca612..c76030056e2f 100644
--- a/databases/evolution-data-server/pkg-plist
+++ b/databases/evolution-data-server/pkg-plist
@@ -742,6 +742,7 @@ share/locale/ko/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/ku/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/mai/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
@@ -842,6 +843,8 @@ share/pixmaps/evolution-data-server/category_time-and-expenses_16.png
 @dirrmtry share/locale/oc
 @dirrmtry share/locale/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
+@dirrmtry share/locale/mai/LC_MESSAGES
+@dirrmtry share/locale/mai
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
 @dirrmtry share/locale/dz/LC_MESSAGES
diff --git a/databases/libgda4/Makefile b/databases/libgda4/Makefile
index 652ba138ebeb..00d5da799579 100644
--- a/databases/libgda4/Makefile
+++ b/databases/libgda4/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/databases/libgda4/Makefile,v 1.3 2008/10/09 22:27:17 kwm Exp $
+#   $MCom: ports-stable/databases/libgda4/Makefile,v 1.2 2009/04/18 20:16:29 marcus Exp $
 #
 
 PORTNAME=	libgda4
-PORTVERSION?=	4.0.1
+PORTVERSION?=	4.0.2
 PORTREVISION?=	0
 CATEGORIES=	databases gnome
 MASTER_SITES=	GNOME
@@ -115,7 +115,8 @@ CONFIGURE_ARGS+=	--without-java
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|-ldl||g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|-ldl||g' \
+	    	${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|include/db.h|include/db${BDB_VER}/db.h|g' \
 		-e 's|ldb47|ldb${BDB_VER}|g' \
 		-e 's|ldb|ldb${BDB_VER}|g' \
@@ -126,7 +127,7 @@ post-patch:
 		${WRKSRC}/providers/bdb/gda-bdb-test.c
 .if ${LIBGDA4_SLAVE}!="no"
 #. for d in msql firebird odbc freetds mdb ldap mysql sqlite postgres
-. for d in bdb jdbc mdb mysql sqlite postgres
+. for d in bdb jdbc mdb mysql postgres
 	@${REINPLACE_CMD} -e 's|$$(top_builddir)/libgda/libgda-4.0.la|${LOCALBASE}/lib/libgda-4.0.la|g' \
 		${WRKSRC}/providers/${d}/Makefile.in
 . endfor
diff --git a/databases/libgda4/distinfo b/databases/libgda4/distinfo
index ec106d75a9d8..1dcda6b5be20 100644
--- a/databases/libgda4/distinfo
+++ b/databases/libgda4/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libgda-4.0.1.tar.bz2) = 7449861d4f421cd3cd20e670434122fb
-SHA256 (gnome2/libgda-4.0.1.tar.bz2) = e9b4c7cadbdcbc5ce40faff9d9c6bf9f602ec300da25faf706469f61aa9cef59
-SIZE (gnome2/libgda-4.0.1.tar.bz2) = 8380951
+MD5 (gnome2/libgda-4.0.2.tar.bz2) = cd79f6542cdd9477017b76b5f81c776f
+SHA256 (gnome2/libgda-4.0.2.tar.bz2) = 8d9b150d4e1fedb02eaf2a3ec4f9f6fbe26039de35df58986cd37c66a24cd3f8
+SIZE (gnome2/libgda-4.0.2.tar.bz2) = 8358969
diff --git a/databases/libgda4/files/patch-libgda_sqlite_gda_sqlite-provider.c b/databases/libgda4/files/patch-libgda_sqlite_gda_sqlite-provider.c
deleted file mode 100644
index 6cdb8eb3fb9b..000000000000
--- a/databases/libgda4/files/patch-libgda_sqlite_gda_sqlite-provider.c
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: libgda/sqlite/gda-sqlite-provider.c
-===================================================================
---- libgda/sqlite/gda-sqlite-provider.c	(revision 3276)
-+++ libgda/sqlite/gda-sqlite-provider.c	(working copy)
-@@ -404,7 +404,7 @@
- 		/* It's a function */
- 		recset = (GdaDataModelArray *) cdata->functions_model;
- 		if (!recset) {
--			recset = GDA_DATA_MODEL_ARRAY (gda_data_model_array_new, 3);
-+			recset = GDA_DATA_MODEL_ARRAY (gda_data_model_array_new (3));
- 			gda_column_set_description (0, "name");
- 			gda_column_set_name (0, "name");
- 			gda_column_set_g_type (0, G_TYPE_STRING);
-@@ -422,7 +422,7 @@
- 		/* It's an aggregate */
- 		recset = (GdaDataModelArray *) cdata->aggregates_model;
- 		if (!recset) {
--			recset = GDA_DATA_MODEL_ARRAY (gda_data_model_array_new, 3);
-+			recset = GDA_DATA_MODEL_ARRAY (gda_data_model_array_new (3));
- 			gda_column_set_description (0, "name");
- 			gda_column_set_name (0, "name");
- 			gda_column_set_g_type (0, G_TYPE_STRING);