* Fix build with Evolution 1.2

* Give this port some much-needed TLC in the form of USE_REINPLACE and
  USE_GNOMENG.
* Bump PORTREVISION as the Evo fixes will require users to rebuild
  Mr. Project for correct functionality.

The build problems were

Reported by:	bento and beta

10 files changed, 78 insertions, 108 deletions

diff --git a/deskutils/mrproject/Makefile b/deskutils/mrproject/Makefile
index 07561dd3938e..361fff7a291d 100644
--- a/deskutils/mrproject/Makefile
+++ b/deskutils/mrproject/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mrproject
 PORTVERSION=	0.5.1
+PORTREVISION=	1
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	ftp://ftp.codefactory.se/pub/software/mrproject/source/
 
@@ -17,20 +18,18 @@ RUN_DEPENDS=	evolution:${PORTSDIR}/mail/evolution
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_GNOME=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib" \
-		BSD_PTHREAD_LIBS=${PTHREAD_LIBS}
+USE_GNOMENG=	yes
+USE_GNOME=	gnomeprefix gnomehack
+USE_REINPLACE=	yes
+USE_LIBTOOL=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
+		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 INSTALLS_SHLIB=	yes
 
 MAN1=		mrproject.1 run-mrproject.1 mrproject-engine.1
 
 pre-patch:
-	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
+	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-	@find ${WRKSRC} -name "Makefile.in*" | xargs ${PERL} -pi -e \
-		's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
-		 s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
 
 .include <bsd.port.mk>
diff --git a/deskutils/mrproject/files/patch-client_components_resource_resource-component.c b/deskutils/mrproject/files/patch-client_components_resource_resource-component.c
new file mode 100644
index 000000000000..d5d2eef52e12
--- /dev/null
+++ b/deskutils/mrproject/files/patch-client_components_resource_resource-component.c
@@ -0,0 +1,10 @@
+--- client/components/resource/resource-component.c.orig	Fri Nov 29 15:56:45 2002
++++ client/components/resource/resource-component.c	Fri Nov 29 15:57:50 2002
+@@ -1067,6 +1067,7 @@
+ 	subject = g_strdup ("");
+ 	
+ 	GNOME_Evolution_Composer_setHeaders (composer, 
++					     "",                 /* From */
+ 					     list,               /* To  */
+ 					     empty_list,         /* Cc  */
+ 					     empty_list,         /* Bcc */
diff --git a/deskutils/mrproject/files/patch-client_components_send_send-component.c b/deskutils/mrproject/files/patch-client_components_send_send-component.c
new file mode 100644
index 000000000000..65841d77514d
--- /dev/null
+++ b/deskutils/mrproject/files/patch-client_components_send_send-component.c
@@ -0,0 +1,11 @@
+--- client/components/send/send-component.c.orig	Fri Nov 29 16:01:56 2002
++++ client/components/send/send-component.c	Fri Nov 29 16:02:37 2002
+@@ -268,7 +268,7 @@
+ 	list->_maximum = 0;
+ 	list->_buffer = CORBA_sequence_GNOME_Evolution_Composer_Recipient_allocbuf (0);
+ 
+-	GNOME_Evolution_Composer_setHeaders (composer, list, list, list,
++	GNOME_Evolution_Composer_setHeaders (composer, "", list, list, list,
+ 					     file_basename, &ev);
+ 
+ 	if (BONOBO_EX (&ev)) {
diff --git a/deskutils/mrproject/files/patch-configure b/deskutils/mrproject/files/patch-configure
new file mode 100644
index 000000000000..3efd2b498abe
--- /dev/null
+++ b/deskutils/mrproject/files/patch-configure
@@ -0,0 +1,10 @@
+--- configure.orig	Fri Nov 29 15:41:01 2002
++++ configure	Fri Nov 29 15:41:11 2002
+@@ -5298,6 +5298,7 @@
+ 
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/deskutils/mrproject/files/patch-ltmain.sh b/deskutils/mrproject/files/patch-ltmain.sh
deleted file mode 100644
index 91713d2306f8..000000000000
--- a/deskutils/mrproject/files/patch-ltmain.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-
-$FreeBSD$
-
---- ltmain.sh.orig	Wed Jan 23 11:38:40 2002
-+++ ltmain.sh	Sun Feb  3 01:44:17 2002
-@@ -1037,8 +1037,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
- 	;;
- 
-@@ -2412,6 +2420,9 @@
- 	  *-*-netbsd*)
- 	    # Don't link with libc until the a.out ld.so is fixed.
- 	    ;;
-+	  *-*-freebsd*)
-+	    # FreeBSD doesn't need this...
-+	    ;;
- 	  *)
- 	    # Add libc to deplibs on all other systems if necessary.
- 	    if test "$build_libtool_need_lc" = "yes"; then
-@@ -4179,10 +4190,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/Makefile b/deskutils/planner/Makefile
index 07561dd3938e..361fff7a291d 100644
--- a/deskutils/planner/Makefile
+++ b/deskutils/planner/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mrproject
 PORTVERSION=	0.5.1
+PORTREVISION=	1
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	ftp://ftp.codefactory.se/pub/software/mrproject/source/
 
@@ -17,20 +18,18 @@ RUN_DEPENDS=	evolution:${PORTSDIR}/mail/evolution
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_GNOME=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib" \
-		BSD_PTHREAD_LIBS=${PTHREAD_LIBS}
+USE_GNOMENG=	yes
+USE_GNOME=	gnomeprefix gnomehack
+USE_REINPLACE=	yes
+USE_LIBTOOL=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
+		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 INSTALLS_SHLIB=	yes
 
 MAN1=		mrproject.1 run-mrproject.1 mrproject-engine.1
 
 pre-patch:
-	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
+	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-	@find ${WRKSRC} -name "Makefile.in*" | xargs ${PERL} -pi -e \
-		's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
-		 s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
 
 .include <bsd.port.mk>
diff --git a/deskutils/planner/files/patch-client_components_resource_resource-component.c b/deskutils/planner/files/patch-client_components_resource_resource-component.c
new file mode 100644
index 000000000000..d5d2eef52e12
--- /dev/null
+++ b/deskutils/planner/files/patch-client_components_resource_resource-component.c
@@ -0,0 +1,10 @@
+--- client/components/resource/resource-component.c.orig	Fri Nov 29 15:56:45 2002
++++ client/components/resource/resource-component.c	Fri Nov 29 15:57:50 2002
+@@ -1067,6 +1067,7 @@
+ 	subject = g_strdup ("");
+ 	
+ 	GNOME_Evolution_Composer_setHeaders (composer, 
++					     "",                 /* From */
+ 					     list,               /* To  */
+ 					     empty_list,         /* Cc  */
+ 					     empty_list,         /* Bcc */
diff --git a/deskutils/planner/files/patch-client_components_send_send-component.c b/deskutils/planner/files/patch-client_components_send_send-component.c
new file mode 100644
index 000000000000..65841d77514d
--- /dev/null
+++ b/deskutils/planner/files/patch-client_components_send_send-component.c
@@ -0,0 +1,11 @@
+--- client/components/send/send-component.c.orig	Fri Nov 29 16:01:56 2002
++++ client/components/send/send-component.c	Fri Nov 29 16:02:37 2002
+@@ -268,7 +268,7 @@
+ 	list->_maximum = 0;
+ 	list->_buffer = CORBA_sequence_GNOME_Evolution_Composer_Recipient_allocbuf (0);
+ 
+-	GNOME_Evolution_Composer_setHeaders (composer, list, list, list,
++	GNOME_Evolution_Composer_setHeaders (composer, "", list, list, list,
+ 					     file_basename, &ev);
+ 
+ 	if (BONOBO_EX (&ev)) {
diff --git a/deskutils/planner/files/patch-configure b/deskutils/planner/files/patch-configure
new file mode 100644
index 000000000000..3efd2b498abe
--- /dev/null
+++ b/deskutils/planner/files/patch-configure
@@ -0,0 +1,10 @@
+--- configure.orig	Fri Nov 29 15:41:01 2002
++++ configure	Fri Nov 29 15:41:11 2002
+@@ -5298,6 +5298,7 @@
+ 
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/deskutils/planner/files/patch-ltmain.sh b/deskutils/planner/files/patch-ltmain.sh
deleted file mode 100644
index 91713d2306f8..000000000000
--- a/deskutils/planner/files/patch-ltmain.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-
-$FreeBSD$
-
---- ltmain.sh.orig	Wed Jan 23 11:38:40 2002
-+++ ltmain.sh	Sun Feb  3 01:44:17 2002
-@@ -1037,8 +1037,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
- 	;;
- 
-@@ -2412,6 +2420,9 @@
- 	  *-*-netbsd*)
- 	    # Don't link with libc until the a.out ld.so is fixed.
- 	    ;;
-+	  *-*-freebsd*)
-+	    # FreeBSD doesn't need this...
-+	    ;;
- 	  *)
- 	    # Add libc to deplibs on all other systems if necessary.
- 	    if test "$build_libtool_need_lc" = "yes"; then
-@@ -4179,10 +4190,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"