5 files changed, 25 insertions, 81 deletions

diff --git a/deskutils/planner/Makefile b/deskutils/planner/Makefile
index 1e82befac3c4..316a7ff01a54 100644
--- a/deskutils/planner/Makefile
+++ b/deskutils/planner/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	planner
-PORTVERSION=	0.12.1
-PORTREVISION=	2
+PORTVERSION=	0.13
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.12
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.13
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -23,7 +22,8 @@ USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeui libgnomeprintui \
 		libgsf
 WANT_GNOME=	yes
 INSTALLS_OMF=	yes
-GNU_CONFIGURE=	yes
+INSTALLS_SHLIB=	yes
+USE_LIBTOOL_VER=15
 USE_REINPLACE=	yes
 CONFIGURE_ARGS=	--enable-static \
 		--disable-python \
@@ -31,6 +31,8 @@ CONFIGURE_ARGS=	--enable-static \
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
+GCONF_SCHEMAS=	planner.schemas
+
 .include <bsd.port.pre.mk>
 
 .if ${HAVE_GNOME:Mlibgda2}!=""
diff --git a/deskutils/planner/distinfo b/deskutils/planner/distinfo
index 5dd6dce84218..d26d53cf271a 100644
--- a/deskutils/planner/distinfo
+++ b/deskutils/planner/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/planner-0.12.1.tar.bz2) = 423c3216cb9049bc526e00ebf81d069b
-SIZE (gnome2/planner-0.12.1.tar.bz2) = 2229256
+MD5 (gnome2/planner-0.13.tar.bz2) = acc2e2075bc489e849843009d6583cc0
+SIZE (gnome2/planner-0.13.tar.bz2) = 2388172
diff --git a/deskutils/planner/files/patch-ltmain.sh b/deskutils/planner/files/patch-ltmain.sh
deleted file mode 100644
index 1d5a5c7b87e1..000000000000
--- a/deskutils/planner/files/patch-ltmain.sh
+++ /dev/null
@@ -1,51 +0,0 @@
---- ltmain.sh.orig	Fri Sep 12 14:51:51 2003
-+++ ltmain.sh	Sun Sep 21 17:49:07 2003
-@@ -1280,7 +1280,7 @@
- 	  esac
- 	elif test "X$arg" = "X-lc_r"; then
- 	 case $host in
--	 *-*-openbsd* | *-*-freebsd*)
-+	 *-*-openbsd* | *-*-freebsd4*)
- 	   # Do not include libc_r directly, use -pthread flag.
- 	   continue
- 	   ;;
-@@ -1290,8 +1290,16 @@
- 	continue
- 	;;
- 
-+      -pthread)
-+      compile_command="$compile_command -pthread"
-+      finalize_command="$finalize_command -pthread"
-+      compiler_flags="$compiler_flags -pthread"
-+      continue
-+      ;;
-+
-       -module)
- 	module=yes
-+	build_old_libs=no
- 	continue
- 	;;
- 
-@@ -3000,6 +3008,9 @@
- 	    # problems, so we reset it completely
- 	    verstring=
- 	    ;;
-+	  *-*-freebsd*)
-+	    # FreeBSD doesn't need this...
-+	    ;;
- 	  *)
- 	    verstring="0.0"
- 	    ;;
-@@ -5428,10 +5439,12 @@
- 	fi
- 
- 	# Install the pseudo-library for information purposes.
-+	if /usr/bin/false; then
- 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- 	instname="$dir/$name"i
- 	$show "$install_prog $instname $destdir/$name"
- 	$run eval "$install_prog $instname $destdir/$name" || exit $?
-+	fi
- 
- 	# Maybe install the static library, too.
- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/deskutils/planner/files/patch-src_planner-gantt-row.c b/deskutils/planner/files/patch-src_planner-gantt-row.c
deleted file mode 100644
index d569bd6bd6eb..000000000000
--- a/deskutils/planner/files/patch-src_planner-gantt-row.c
+++ /dev/null
@@ -1,22 +0,0 @@
---- 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 89801b1e4831..2b7292e52c1a 100644
--- a/deskutils/planner/pkg-plist
+++ b/deskutils/planner/pkg-plist
@@ -20,6 +20,9 @@ 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/libgantt-task.a
+lib/planner/libgantt-task.so
+lib/planner/plugins/libmsp-plugin.so
 lib/planner/plugins/libhtml-plugin.so
 %%GDA%%lib/planner/plugins/libsql-plugin.so
 lib/planner/plugins/libxmlplanner-plugin.so
@@ -31,6 +34,7 @@ lib/planner/views/libtask-view.so
 lib/planner/views/libtimetable-view.so
 libdata/pkgconfig/libplanner-1.pc
 %%DOCSDIR%%/README.sql
+%%DOCSDIR%%/kitchen.planner
 %%DOCSDIR%%/sample-1.planner
 share/gnome/application-registry/planner.applications
 share/gnome/applications/planner.desktop
@@ -39,6 +43,7 @@ share/gnome/help/planner/C/figures/calendar-week.png
 share/gnome/help/planner/C/figures/calendar-working-time.png
 share/gnome/help/planner/C/figures/calendar.png
 share/gnome/help/planner/C/figures/day-types.png
+share/gnome/help/planner/C/figures/eds1.png
 share/gnome/help/planner/C/figures/gantt-view.png
 share/gnome/help/planner/C/figures/group1-subtask-dialog.png
 share/gnome/help/planner/C/figures/group1-subtasks.png
@@ -83,7 +88,7 @@ share/gnome/help/planner/C/planner.xml
 share/gnome/mime-info/planner.keys
 share/gnome/mime-info/planner.mime
 share/gnome/omf/planner/planner-C.omf
-share/gnome/pixmaps/gnome-application-x-planner.png
+share/gnome/pixmaps/gnome-mime-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
@@ -105,6 +110,7 @@ share/gnome/planner/dtd/mrproject-0.5.1.dtd
 share/gnome/planner/dtd/mrproject-0.6.dtd
 share/gnome/planner/glade/add-predecessor.glade
 share/gnome/planner/glade/calendar-dialog.glade
+share/gnome/planner/glade/eds.glade
 share/gnome/planner/glade/group-dialog.glade
 share/gnome/planner/glade/html-output.glade
 share/gnome/planner/glade/new-property.glade
@@ -113,25 +119,32 @@ share/gnome/planner/glade/property-dialog.glade
 share/gnome/planner/glade/resource-dialog.glade
 share/gnome/planner/glade/resource-input-dialog.glade
 share/gnome/planner/glade/sql.glade
+share/gnome/planner/glade/task-date-widget.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-0.13.sql
+share/gnome/planner/sql/upgrade-0.11-0.13.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_resources.xsl
 share/gnome/planner/stylesheets/html1_tasks.xsl
-share/gnome/planner/stylesheets/mrproject2html.xsl
+share/gnome/planner/stylesheets/msp2planner.xsl
+share/gnome/planner/stylesheets/planner2html.xsl
 share/gnome/planner/stylesheets/planner2plannerv011.xsl
+share/gnome/planner/ui/eds-plugin.ui
 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/msp-plugin.ui
 share/gnome/planner/ui/resource-view.ui
 share/gnome/planner/ui/sql-plugin.ui
 share/gnome/planner/ui/task-view.ui
 share/gnome/planner/ui/time-table-view.ui
 share/gnome/planner/ui/xml-planner-plugin.ui
+share/icons/hicolor/48x48/mimetypes/gnome-mime-application-x-planner.png
 share/locale/am/LC_MESSAGES/planner.mo
 share/locale/az/LC_MESSAGES/planner.mo
 share/locale/be/LC_MESSAGES/planner.mo
@@ -164,6 +177,7 @@ share/locale/nb/LC_MESSAGES/planner.mo
 share/locale/nl/LC_MESSAGES/planner.mo
 share/locale/nn/LC_MESSAGES/planner.mo
 share/locale/no/LC_MESSAGES/planner.mo
+share/locale/pa/LC_MESSAGES/planner.mo
 share/locale/pl/LC_MESSAGES/planner.mo
 share/locale/pt/LC_MESSAGES/planner.mo
 share/locale/pt_BR/LC_MESSAGES/planner.mo
@@ -175,6 +189,7 @@ share/locale/sr@Latn/LC_MESSAGES/planner.mo
 share/locale/sv/LC_MESSAGES/planner.mo
 share/locale/uk/LC_MESSAGES/planner.mo
 share/locale/zh_CN/LC_MESSAGES/planner.mo
+share/locale/zh_TW/LC_MESSAGES/planner.mo
 share/mime/application/x-planner.xml
 share/mime/packages/planner.xml
 @dirrm share/gnome/planner/ui