5 files changed, 100 insertions, 24 deletions

diff --git a/databases/glom/Makefile b/databases/glom/Makefile
index dd2e79e7260a..2a305016575e 100644
--- a/databases/glom/Makefile
+++ b/databases/glom/Makefile
@@ -3,15 +3,14 @@
 # Whom:					Adam Weinberger <adamw@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/databases/glom/Makefile,v 1.18 2008/03/20 09:26:48 kwm Exp $
+#   $MCom: ports/databases/glom/Makefile,v 1.21 2009/01/09 11:46:25 kwm Exp $
 #
 
 PORTNAME=	glom
-PORTVERSION=	1.6.17
-PORTREVISION=	1
+PORTVERSION=	1.8.5
 CATEGORIES=	databases gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES=	GNOME
+DIST_SUBDIR=	gnome2
 
 MAINTAINER=	kwm@FreeBSD.org
 COMMENT=	GNOME database designer and user interface
@@ -19,14 +18,12 @@ COMMENT=	GNOME database designer and user interface
 LIB_DEPENDS=	bakery-2.6:${PORTSDIR}/x11-toolkits/bakery \
 		gdamm-3.0.10:${PORTSDIR}/databases/libgdamm \
 		gtksourceviewmm-2.0.2:${PORTSDIR}/x11-toolkits/libgtksourceviewmm \
-		goocanvas.3:${PORTSDIR}/graphics/goocanvas
+		goocanvasmm-0.1.4:${PORTSDIR}/graphics/goocanvasmm
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \
 		${LOCALBASE}/libdata/pkgconfig/libgda-postgres-3.0.pc:${PORTSDIR}/databases/libgda3-postgresql
 RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \
 		${LOCALBASE}/libdata/pkgconfig/libgda-postgres-3.0.pc:${PORTSDIR}/databases/libgda3-postgresql
 
-BROKEN=		needs bakery-2.4, but bakery-2.6 is available in portstree
-
 USE_BZIP2=	yes
 USE_PYTHON=	yes
 GNU_CONFIGURE=	yes
@@ -41,17 +38,17 @@ CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
 CONFIGURE_ARGS=	--with-postgres-utils=${LOCALBASE}/bin
 INSTALLS_ICONS=	yes
 
-OPTIONS=	SELF_HOSTING "Host the database locally" off
+#OPTIONS=	SELF_HOSTING "Host the database locally" on
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_SELF_HOSTING)
+#.if defined(WITH_SELF_HOSTING)
 # Note: USE_PGSQL has already been set above.
 BUILD_DEPENDS+=	postmaster:${PORTSDIR}/databases/postgresql${PGSQL_VER}-server
 RUN_DEPENDS+=	postmaster:${PORTSDIR}/databases/postgresql${PGSQL_VER}-server
-.else
-CONFIGURE_ARGS+=--enable-client-only
-.endif
+#.else
+#CONFIGURE_ARGS+=--enable-client-only
+#.endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-update-mime-database|true|g' \
diff --git a/databases/glom/distinfo b/databases/glom/distinfo
index 217284d55a9a..55b3b7efc8ac 100644
--- a/databases/glom/distinfo
+++ b/databases/glom/distinfo
@@ -1,3 +1,3 @@
-MD5 (glom-1.6.17.tar.bz2) = 5629e1db63420a7afacfd0e110d7a1dc
-SHA256 (glom-1.6.17.tar.bz2) = 4f52bc227bda6605beed17e4897ad48f806e3ac473aaf1944600f75fe69b01bd
-SIZE (glom-1.6.17.tar.bz2) = 1992217
+MD5 (gnome2/glom-1.8.5.tar.bz2) = d161b394c6a89b936f8853a8015ed27b
+SHA256 (gnome2/glom-1.8.5.tar.bz2) = 8597749371063260ae494ac5a779db06f4d80d2d5341864fb8a52241058dcc37
+SIZE (gnome2/glom-1.8.5.tar.bz2) = 3266015
diff --git a/databases/glom/files/patch-glom_libglom_connectionpool.cc b/databases/glom/files/patch-glom_libglom_connectionpool.cc
index ae8bf97bcc90..b1f9b2c5088d 100644
--- a/databases/glom/files/patch-glom_libglom_connectionpool.cc
+++ b/databases/glom/files/patch-glom_libglom_connectionpool.cc
@@ -1,11 +1,14 @@
---- glom/libglom/connectionpool.cc.orig	2008-01-31 11:29:29.000000000 +0100
-+++ glom/libglom/connectionpool.cc	2008-01-31 11:38:06.000000000 +0100
-@@ -642,7 +642,7 @@ bool ConnectionPool::directory_exists_ur
- }
- 
- #ifndef GLOM_ENABLE_CLIENT_ONLY
--static sighandler_t previous_sig_handler = SIG_DFL; /* Arbitrary default */
+--- glom/libglom/connectionpool.cc.orig	2008-04-29 18:10:54.000000000 +0200
++++ glom/libglom/connectionpool.cc	2008-08-08 02:39:55.000000000 +0200
+@@ -789,7 +789,11 @@ bool ConnectionPool::directory_exists_ur
+ // TODO: This is probably mingw specific
+ static __p_sig_fn_t previous_sig_handler = SIG_DFL;
+ #else
++#  ifdef __FreeBSD__
 +static __sighandler_t *previous_sig_handler = SIG_DFL; /* Arbitrary default */
++#  else
+ static sighandler_t previous_sig_handler = SIG_DFL; /* Arbitrary default */
++#  endif
+ #endif
  
  /* This is a Linux/Unix signal handler, 
-  * so we can respond to a crash.
diff --git a/databases/glom/files/patch-glom_main.cc b/databases/glom/files/patch-glom_main.cc
new file mode 100644
index 000000000000..69a77fb592b4
--- /dev/null
+++ b/databases/glom/files/patch-glom_main.cc
@@ -0,0 +1,32 @@
+--- glom/main.cc.orig	2008-08-22 16:36:46.000000000 +0200
++++ glom/main.cc	2008-09-13 21:23:46.000000000 +0200
+@@ -89,18 +89,19 @@
+ 
+ } //namespace Glom
+ 
+-#ifndef G_OS_WIN32
++#ifdef __linux
+ extern "C" void __libc_freeres(void);
+ #endif
+ 
+ int 
+ main(int argc, char* argv[])
+ {
+-#ifndef G_OS_WIN32
++#ifdef __linux
+   //Force some cleanup at exit,
+   //to help valgrind to detect memory leaks:
+   atexit(__libc_freeres);
+ #else
++#  ifdef G_OS_WIN32
+   WSADATA data;
+   int errcode = WSAStartup(MAKEWORD(2, 0), &data);
+   if(errcode != 0)
+@@ -108,6 +109,7 @@
+     std::cerr << "Failed to initialize WinSock: " << errcode << std::endl;
+     return -1;
+   }
++#  endif
+ #endif
+ 
+   // TODO: I am not sure why, but this does not work. PYTHONPATH is set
diff --git a/databases/glom/pkg-plist b/databases/glom/pkg-plist
index 96ec969eb2b1..a9db6f4b6ebb 100644
--- a/databases/glom/pkg-plist
+++ b/databases/glom/pkg-plist
@@ -8,11 +8,22 @@ lib/libglom.so.0
 %%PYTHON_SITELIBDIR%%/glom.so
 share/applications/glom.desktop
 %%DATADIR%%/doc/examples/example_film_manager.glom
+%%DATADIR%%/doc/examples/example_lesson_planner.glom
 %%DATADIR%%/doc/examples/example_music_collection.glom
 %%DATADIR%%/doc/examples/example_project_manager.glom
 %%DATADIR%%/doc/examples/example_smallbusiness.glom
+%%DATADIR%%/glade/glom_developer.glade
 %%DATADIR%%/glade/glom.glade
 %%DATADIR%%/glom_document.dtd
+%%DATADIR%%/pixmaps/glom-button.png
+%%DATADIR%%/pixmaps/glom-field.png
+%%DATADIR%%/pixmaps/glom-group.png
+%%DATADIR%%/pixmaps/glom-line-horizontal.png
+%%DATADIR%%/pixmaps/glom-line-vertical.png
+%%DATADIR%%/pixmaps/glom-image.png
+%%DATADIR%%/pixmaps/glom-notebook.png
+%%DATADIR%%/pixmaps/glom-related-records.png
+%%DATADIR%%/pixmaps/glom-text.png
 %%DATADIR%%/xslt/print_details_to_html.xsl
 %%DATADIR%%/xslt/print_report_to_html.xsl
 share/gnome/help/glom/C/figures/glom_data_details.png
@@ -26,6 +37,8 @@ share/gnome/help/glom/C/figures/glom_design_reports_details.png
 share/gnome/help/glom/C/figures/glom_design_reports_group_by.png
 share/gnome/help/glom/C/figures/glom_design_reports_vertical_group.png
 share/gnome/help/glom/C/figures/glom_design_translations.png
+share/gnome/help/glom/C/figures/glom_import.png
+share/gnome/help/glom/C/figures/glom_initial_dialog_local_network.png
 share/gnome/help/glom/C/figures/glom_report_result.png
 share/gnome/help/glom/C/figures/glom_tables.png
 share/gnome/help/glom/C/figures/start.png
@@ -42,6 +55,8 @@ share/gnome/help/glom/de/figures/glom_design_reports_details.png
 share/gnome/help/glom/de/figures/glom_design_reports_group_by.png
 share/gnome/help/glom/de/figures/glom_design_reports_vertical_group.png
 share/gnome/help/glom/de/figures/glom_design_translations.png
+share/gnome/help/glom/de/figures/glom_import.png
+share/gnome/help/glom/de/figures/glom_initial_dialog_local_network.png
 share/gnome/help/glom/de/figures/glom_report_result.png
 share/gnome/help/glom/de/figures/glom_tables.png
 share/gnome/help/glom/de/figures/start.png
@@ -58,6 +73,8 @@ share/gnome/help/glom/en_GB/figures/glom_design_reports_details.png
 share/gnome/help/glom/en_GB/figures/glom_design_reports_group_by.png
 share/gnome/help/glom/en_GB/figures/glom_design_reports_vertical_group.png
 share/gnome/help/glom/en_GB/figures/glom_design_translations.png
+share/gnome/help/glom/en_GB/figures/glom_import.png
+share/gnome/help/glom/en_GB/figures/glom_initial_dialog_local_network.png
 share/gnome/help/glom/en_GB/figures/glom_report_result.png
 share/gnome/help/glom/en_GB/figures/glom_tables.png
 share/gnome/help/glom/en_GB/figures/start.png
@@ -74,11 +91,31 @@ share/gnome/help/glom/es/figures/glom_design_reports_details.png
 share/gnome/help/glom/es/figures/glom_design_reports_group_by.png
 share/gnome/help/glom/es/figures/glom_design_reports_vertical_group.png
 share/gnome/help/glom/es/figures/glom_design_translations.png
+share/gnome/help/glom/es/figures/glom_import.png
+share/gnome/help/glom/es/figures/glom_initial_dialog_local_network.png
 share/gnome/help/glom/es/figures/glom_report_result.png
 share/gnome/help/glom/es/figures/glom_tables.png
 share/gnome/help/glom/es/figures/start.png
 share/gnome/help/glom/es/glom.xml
 share/gnome/help/glom/es/legal.xml
+share/gnome/help/glom/fr/figures/glom_data_details.png
+share/gnome/help/glom/fr/figures/glom_data_list.png
+share/gnome/help/glom/fr/figures/glom_design_fields.png
+share/gnome/help/glom/fr/figures/glom_design_fields_dialog_calculated.png
+share/gnome/help/glom/fr/figures/glom_design_layout_details.png
+share/gnome/help/glom/fr/figures/glom_design_layout_list.png
+share/gnome/help/glom/fr/figures/glom_design_reports.png
+share/gnome/help/glom/fr/figures/glom_design_reports_details.png
+share/gnome/help/glom/fr/figures/glom_design_reports_group_by.png
+share/gnome/help/glom/fr/figures/glom_design_reports_vertical_group.png
+share/gnome/help/glom/fr/figures/glom_design_translations.png
+share/gnome/help/glom/fr/figures/glom_import.png
+share/gnome/help/glom/fr/figures/glom_initial_dialog_local_network.png
+share/gnome/help/glom/fr/figures/glom_report_result.png
+share/gnome/help/glom/fr/figures/glom_tables.png
+share/gnome/help/glom/fr/figures/start.png
+share/gnome/help/glom/fr/glom.xml
+share/gnome/help/glom/fr/legal.xml
 share/gnome/help/glom/sv/figures/glom_data_details.png
 share/gnome/help/glom/sv/figures/glom_data_list.png
 share/gnome/help/glom/sv/figures/glom_design_fields.png
@@ -90,6 +127,8 @@ share/gnome/help/glom/sv/figures/glom_design_reports_details.png
 share/gnome/help/glom/sv/figures/glom_design_reports_group_by.png
 share/gnome/help/glom/sv/figures/glom_design_reports_vertical_group.png
 share/gnome/help/glom/sv/figures/glom_design_translations.png
+share/gnome/help/glom/sv/figures/glom_import.png
+share/gnome/help/glom/sv/figures/glom_initial_dialog_local_network.png
 share/gnome/help/glom/sv/figures/glom_report_result.png
 share/gnome/help/glom/sv/figures/glom_tables.png
 share/gnome/help/glom/sv/figures/start.png
@@ -120,6 +159,7 @@ share/locale/it/LC_MESSAGES/glom.mo
 share/locale/nb/LC_MESSAGES/glom.mo
 share/locale/ne/LC_MESSAGES/glom.mo
 share/locale/nl/LC_MESSAGES/glom.mo
+share/locale/oc/LC_MESSAGES/glom.mo
 share/locale/pa/LC_MESSAGES/glom.mo
 share/locale/pt/LC_MESSAGES/glom.mo
 share/locale/pt_BR/LC_MESSAGES/glom.mo
@@ -134,10 +174,13 @@ share/omf/glom/glom-C.omf
 share/omf/glom/glom-de.omf
 share/omf/glom/glom-en_GB.omf
 share/omf/glom/glom-es.omf
+share/omf/glom/glom-fr.omf
 share/omf/glom/glom-sv.omf
 @dirrm share/omf/glom
 @dirrm share/gnome/help/glom/sv/figures
 @dirrm share/gnome/help/glom/sv
+@dirrm share/gnome/help/glom/fr/figures
+@dirrm share/gnome/help/glom/fr
 @dirrm share/gnome/help/glom/es/figures
 @dirrm share/gnome/help/glom/es
 @dirrm share/gnome/help/glom/en_GB/figures
@@ -148,6 +191,7 @@ share/omf/glom/glom-sv.omf
 @dirrm share/gnome/help/glom/C
 @dirrm share/gnome/help/glom
 @dirrm %%DATADIR%%/xslt
+@dirrm %%DATADIR%%/pixmaps
 @dirrm %%DATADIR%%/glade
 @dirrm %%DATADIR%%/doc/examples
 @dirrm %%DATADIR%%/doc