Update to 0.12.

4 files changed, 104 insertions, 54 deletions

diff --git a/deskutils/planner/Makefile b/deskutils/planner/Makefile
index e428384e3cab..653e49e64aad 100644
--- a/deskutils/planner/Makefile
+++ b/deskutils/planner/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	planner
-PORTVERSION=	0.11
-PORTREVISION=	4
+PORTVERSION=	0.12
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.11
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.12
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -19,19 +18,31 @@ COMMENT=	Project management application for Gnome 2
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeui libgnomeprintui libgsf
+USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeui libgnomeprintui \
+		libgsf
+WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
+USE_REINPLACE=	yes
+CONFIGURE_ARGS=	--enable-static \
+		--disable-python \
+		--disable-dotnet
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+		LDFLAGS="-L${LOCALBASE}/lib"
 
-.if defined(WITH_POSTGRESQL)
-POSTGRESQL_PORT?=	databases/postgresql7
-LIB_DEPENDS+=		pq.3:${PORTSDIR}/${POSTGRESQL_PORT}
-CONFIGURE_ARGS+=	--enable-postgres
-PLIST_SUB+=		POSTGRESQL:=""
+.include <bsd.port.pre.mk>
+
+.if ${HAVE_GNOME:Mlibgda2}!=""
+USE_GNOME+=	libgda2
+CONFIGURE_ARGS+=--enable-database=yes
+PLIST_SUB+=	GDA=""
 .else
-CONFIGURE_ARGS+=	--disable-postgres
-PLIST_SUB+=		POSTGRESQL:="@comment "
+PLIST_SUB+=	GDA="@comment "
 .endif
 
-.include <bsd.port.mk>
+post-patch:
+	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
+		's|[(]datadir[)]/doc|(prefix)/share/doc|g ; \
+		 s|[(]datadir[)]/mime/|(prefix)/share/mime/|g ; \
+		 s|[(]datadir[)]/mime"|(prefix)/share/mime"|g'
+
+.include <bsd.port.post.mk>
diff --git a/deskutils/planner/distinfo b/deskutils/planner/distinfo
index 83418ab070e5..700db2a2ec02 100644
--- a/deskutils/planner/distinfo
+++ b/deskutils/planner/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/planner-0.11.tar.bz2) = 43582ab5e6de0ceb67f6a89db4f49ab1
-SIZE (gnome2/planner-0.11.tar.bz2) = 1901446
+MD5 (gnome2/planner-0.12.tar.bz2) = 6d6cb645f87833ba0370847ed62d9400
+SIZE (gnome2/planner-0.12.tar.bz2) = 2245780
diff --git a/deskutils/planner/files/patch-src_planner-gantt-row.c b/deskutils/planner/files/patch-src_planner-gantt-row.c
new file mode 100644
index 000000000000..d569bd6bd6eb
--- /dev/null
+++ b/deskutils/planner/files/patch-src_planner-gantt-row.c
@@ -0,0 +1,22 @@
+--- src/planner-gantt-row.c.orig	Fri Jul  9 01:21:33 2004
++++ src/planner-gantt-row.c	Fri Jul  9 01:22:10 2004
+@@ -1489,6 +1489,9 @@
+ 	gboolean                  summary;
+ 	MrpTaskType               type;
+ 	gchar                    *message;
++	PlannerTaskTree   *tree;
++	GtkTreePath       *path;
++	GtkTreeSelection  *selection;
+ 	
+ 	row = PLANNER_GANTT_ROW (item);
+ 	priv = row->priv;
+@@ -1931,9 +1934,6 @@
+ 		gnome_canvas_item_ungrab (item, event->button.time);
+ 		
+ 		/* Select the clicked on task in the treeview */
+-		PlannerTaskTree   *tree;
+-		GtkTreePath       *path;
+-		GtkTreeSelection  *selection;
+ 		
+ 		chart = g_object_get_data (G_OBJECT (item->canvas), "chart");
+ 		tree = planner_gantt_chart_get_view (chart);
diff --git a/deskutils/planner/pkg-plist b/deskutils/planner/pkg-plist
index b926bf212bd9..486507dac990 100644
--- a/deskutils/planner/pkg-plist
+++ b/deskutils/planner/pkg-plist
@@ -15,16 +15,45 @@ include/planner-1.0/libplanner/mrp-task.h
 include/planner-1.0/libplanner/mrp-time.h
 include/planner-1.0/libplanner/mrp-types.h
 include/planner-1.0/libplanner/planner.h
+lib/libplanner-1.a
 lib/libplanner-1.so
+lib/libplanner-1.so.0
 lib/planner/file-modules/libmrp-xml.so
 lib/planner/file-modules/libmrp-xsl.so
 lib/planner/plugins/libhtml-plugin.so
-%%POSTGRESQL:%%lib/planner/plugins/libsql-plugin.so
+%%GDA%%lib/planner/plugins/libsql-plugin.so
+lib/planner/plugins/libxmlplanner-plugin.so
 lib/planner/storage-modules/libstorage-mrproject-1.so
+%%GDA%%lib/planner/storage-modules/libstorage-sql.so
 lib/planner/views/libgantt-view.so
 lib/planner/views/libresource-view.so
 lib/planner/views/libtask-view.so
+lib/planner/views/libtimetable-view.so
 libdata/pkgconfig/libplanner-1.pc
+share/doc/libplanner/MrpAssignment.html
+share/doc/libplanner/MrpCalendar.html
+share/doc/libplanner/MrpGroup.html
+share/doc/libplanner/MrpObject.html
+share/doc/libplanner/MrpProject.html
+share/doc/libplanner/MrpResource.html
+share/doc/libplanner/MrpTask.html
+share/doc/libplanner/ch01.html
+share/doc/libplanner/home.png
+share/doc/libplanner/index.html
+share/doc/libplanner/index.sgml
+share/doc/libplanner/left.png
+share/doc/libplanner/libplanner-MrpApplication.html
+share/doc/libplanner/libplanner-MrpRelation.html
+share/doc/libplanner/libplanner-mrp-day.html
+share/doc/libplanner/libplanner-mrp-error.html
+share/doc/libplanner/libplanner-mrp-property.html
+share/doc/libplanner/libplanner-mrp-time.html
+share/doc/libplanner/libplanner.devhelp
+share/doc/libplanner/right.png
+share/doc/libplanner/style.css
+share/doc/libplanner/up.png
+%%DOCSDIR%%/README.sql
+%%DOCSDIR%%/sample-1.planner
 share/gnome/application-registry/planner.applications
 share/gnome/applications/planner.desktop
 share/gnome/help/planner/C/figures/calendar-new.png
@@ -54,6 +83,7 @@ share/gnome/help/planner/C/figures/resource-group-editor.png
 share/gnome/help/planner/C/figures/resource-insert.png
 share/gnome/help/planner/C/figures/resource-properties-calendar.png
 share/gnome/help/planner/C/figures/resource-properties-general.png
+share/gnome/help/planner/C/figures/resource-usage-view.png
 share/gnome/help/planner/C/figures/several-projects.png
 share/gnome/help/planner/C/figures/task-constraints.png
 share/gnome/help/planner/C/figures/task-custom-properties-add.png
@@ -76,13 +106,14 @@ share/gnome/mime-info/planner.keys
 share/gnome/mime-info/planner.mime
 share/gnome/omf/planner/planner-C.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/planner/planner-C.omf 2>/dev/null || /usr/bin/true
-share/gnome/pixmaps/document-icons/gnome-application-x-mrproject.png
+share/gnome/pixmaps/gnome-application-x-planner.png
 share/gnome/pixmaps/gnome-planner.png
 share/gnome/pixmaps/planner/24_edit_resource.png
 share/gnome/pixmaps/planner/24_groups.png
 share/gnome/pixmaps/planner/24_indent_task.png
 share/gnome/pixmaps/planner/24_insert_resource.png
 share/gnome/pixmaps/planner/24_insert_task.png
+share/gnome/pixmaps/planner/24_link_task.png
 share/gnome/pixmaps/planner/24_remove_resource.png
 share/gnome/pixmaps/planner/24_remove_task.png
 share/gnome/pixmaps/planner/24_task_down.png
@@ -91,6 +122,7 @@ share/gnome/pixmaps/planner/24_unindent_task.png
 share/gnome/pixmaps/planner/24_unlink_task.png
 share/gnome/pixmaps/planner/gantt.png
 share/gnome/pixmaps/planner/resources.png
+share/gnome/pixmaps/planner/resources_usage.png
 share/gnome/pixmaps/planner/tasks.png
 share/gnome/planner/dtd/mrproject-0.5.1.dtd
 share/gnome/planner/dtd/mrproject-0.6.dtd
@@ -106,96 +138,79 @@ share/gnome/planner/glade/resource-input-dialog.glade
 share/gnome/planner/glade/sql.glade
 share/gnome/planner/glade/task-dialog.glade
 share/gnome/planner/glade/task-input-dialog.glade
+share/gnome/planner/sql/database-0.11.sql
+share/gnome/planner/sql/database.sql
+share/gnome/planner/sql/upgrade-0.6.x-0.11.sql
 share/gnome/planner/stylesheets/html1_css.xsl
 share/gnome/planner/stylesheets/html1_gantt.xsl
-share/gnome/planner/stylesheets/html1_milestones.xsl
 share/gnome/planner/stylesheets/html1_resources.xsl
 share/gnome/planner/stylesheets/html1_tasks.xsl
 share/gnome/planner/stylesheets/mrproject2html.xsl
+share/gnome/planner/stylesheets/planner2plannerv011.xsl
 share/gnome/planner/ui/gantt-view.ui
 share/gnome/planner/ui/html-plugin.ui
 share/gnome/planner/ui/main-window.ui
 share/gnome/planner/ui/resource-view.ui
 share/gnome/planner/ui/sql-plugin.ui
 share/gnome/planner/ui/task-view.ui
-share/locale/am/LC_MESSAGES/planner-libplanner.mo
+share/gnome/planner/ui/time-table-view.ui
+share/gnome/planner/ui/xml-planner-plugin.ui
 share/locale/am/LC_MESSAGES/planner.mo
-share/locale/az/LC_MESSAGES/planner-libplanner.mo
 share/locale/az/LC_MESSAGES/planner.mo
-share/locale/be/LC_MESSAGES/planner-libplanner.mo
 share/locale/be/LC_MESSAGES/planner.mo
-share/locale/ca/LC_MESSAGES/planner-libplanner.mo
+share/locale/bg/LC_MESSAGES/planner.mo
 share/locale/ca/LC_MESSAGES/planner.mo
-share/locale/cs/LC_MESSAGES/planner-libplanner.mo
 share/locale/cs/LC_MESSAGES/planner.mo
-share/locale/da/LC_MESSAGES/planner-libplanner.mo
 share/locale/da/LC_MESSAGES/planner.mo
-share/locale/de/LC_MESSAGES/planner-libplanner.mo
 share/locale/de/LC_MESSAGES/planner.mo
-share/locale/el/LC_MESSAGES/planner-libplanner.mo
 share/locale/el/LC_MESSAGES/planner.mo
-share/locale/es/LC_MESSAGES/planner-libplanner.mo
+share/locale/en_CA/LC_MESSAGES/planner.mo
+share/locale/en_GB/LC_MESSAGES/planner.mo
 share/locale/es/LC_MESSAGES/planner.mo
-share/locale/fa/LC_MESSAGES/planner-libplanner.mo
+share/locale/et/LC_MESSAGES/planner.mo
 share/locale/fa/LC_MESSAGES/planner.mo
-share/locale/fr/LC_MESSAGES/planner-libplanner.mo
 share/locale/fr/LC_MESSAGES/planner.mo
-share/locale/hi/LC_MESSAGES/planner-libplanner.mo
 share/locale/hi/LC_MESSAGES/planner.mo
-share/locale/hr/LC_MESSAGES/planner-libplanner.mo
 share/locale/hr/LC_MESSAGES/planner.mo
-share/locale/hu/LC_MESSAGES/planner-libplanner.mo
 share/locale/hu/LC_MESSAGES/planner.mo
-share/locale/is/LC_MESSAGES/planner-libplanner.mo
+share/locale/id/LC_MESSAGES/planner.mo
 share/locale/is/LC_MESSAGES/planner.mo
-share/locale/it/LC_MESSAGES/planner-libplanner.mo
 share/locale/it/LC_MESSAGES/planner.mo
-share/locale/ja/LC_MESSAGES/planner-libplanner.mo
 share/locale/ja/LC_MESSAGES/planner.mo
-share/locale/ko/LC_MESSAGES/planner-libplanner.mo
+share/locale/kn/LC_MESSAGES/planner.mo
 share/locale/ko/LC_MESSAGES/planner.mo
-share/locale/lv/LC_MESSAGES/planner-libplanner.mo
 share/locale/lv/LC_MESSAGES/planner.mo
-share/locale/ml/LC_MESSAGES/planner-libplanner.mo
 share/locale/ml/LC_MESSAGES/planner.mo
-share/locale/ms/LC_MESSAGES/planner-libplanner.mo
+share/locale/mn/LC_MESSAGES/planner.mo
 share/locale/ms/LC_MESSAGES/planner.mo
-share/locale/nl/LC_MESSAGES/planner-libplanner.mo
 share/locale/nl/LC_MESSAGES/planner.mo
-share/locale/nn/LC_MESSAGES/planner-libplanner.mo
 share/locale/nn/LC_MESSAGES/planner.mo
-share/locale/no/LC_MESSAGES/planner-libplanner.mo
 share/locale/no/LC_MESSAGES/planner.mo
-share/locale/pl/LC_MESSAGES/planner-libplanner.mo
 share/locale/pl/LC_MESSAGES/planner.mo
-share/locale/pt/LC_MESSAGES/planner-libplanner.mo
 share/locale/pt/LC_MESSAGES/planner.mo
-share/locale/pt_BR/LC_MESSAGES/planner-libplanner.mo
 share/locale/pt_BR/LC_MESSAGES/planner.mo
-share/locale/ru/LC_MESSAGES/planner-libplanner.mo
 share/locale/ru/LC_MESSAGES/planner.mo
-share/locale/sk/LC_MESSAGES/planner-libplanner.mo
 share/locale/sk/LC_MESSAGES/planner.mo
-share/locale/sr/LC_MESSAGES/planner-libplanner.mo
+share/locale/sq/LC_MESSAGES/planner.mo
 share/locale/sr/LC_MESSAGES/planner.mo
-share/locale/sr@Latn/LC_MESSAGES/planner-libplanner.mo
 share/locale/sr@Latn/LC_MESSAGES/planner.mo
-share/locale/sv/LC_MESSAGES/planner-libplanner.mo
 share/locale/sv/LC_MESSAGES/planner.mo
-share/locale/uk/LC_MESSAGES/planner-libplanner.mo
 share/locale/uk/LC_MESSAGES/planner.mo
-share/locale/zh_CN/LC_MESSAGES/planner-libplanner.mo
 share/locale/zh_CN/LC_MESSAGES/planner.mo
-@dirrm share/gnome/pixmaps/planner
-@dirrm share/gnome/omf/planner
+share/mime/application/x-planner.xml
+share/mime/packages/planner.xml
 @dirrm share/gnome/planner/ui
 @dirrm share/gnome/planner/stylesheets
+@dirrm share/gnome/planner/sql
 @dirrm share/gnome/planner/glade
 @dirrm share/gnome/planner/dtd
 @dirrm share/gnome/planner
+@dirrm share/gnome/pixmaps/planner
+@dirrm share/gnome/omf/planner
 @dirrm share/gnome/help/planner/C/figures
 @dirrm share/gnome/help/planner/C
 @dirrm share/gnome/help/planner
+@dirrm %%DOCSDIR%%
 @dirrm share/doc/libplanner
 @dirrm lib/planner/views
 @dirrm lib/planner/storage-modules
@@ -205,3 +220,5 @@ share/locale/zh_CN/LC_MESSAGES/planner.mo
 @dirrm include/planner-1.0/libplanner
 @dirrm include/planner-1.0
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/planner/planner-C.omf 2>/dev/null || /usr/bin/true
+@exec update-mime-database %D/share/mime
+@unexec update-mime-database %D/share/mime