* Update to 1.3.92 (a.k.a. release candidate 1)

* Install the Mail apps GConf schemas
* s/find/${FIND}/g s/xargs/${XARGS}/g [1]

Submitted by:	adamw [1]

5 files changed, 87 insertions, 17 deletions

diff --git a/mail/evolution-devel/Makefile b/mail/evolution-devel/Makefile
index 48edbc78e2fb..7b7dbcaf832d 100644
--- a/mail/evolution-devel/Makefile
+++ b/mail/evolution-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	evolution
-PORTVERSION=	1.3.3
+PORTVERSION=	1.3.92
 PORTREVISION=	1
 CATEGORIES=	mail gnome
 MASTER_SITES=	${MASTER_SITE_GNOME} \
@@ -21,7 +21,7 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	An integrated mail, calendar and address book distributed suite
 
 LIB_DEPENDS=	soup-2.0.0:${PORTSDIR}/devel/libsoup \
-		gtkhtml-3.0.1:${PORTSDIR}/www/gtkhtml3
+		gtkhtml-3.0.2:${PORTSDIR}/www/gtkhtml3
 
 .if defined(WITH_LDAP)
 LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap20
@@ -44,6 +44,7 @@ CONFIGURE_ARGS=	--with-db3-libs=${DB3_WRKSRC} \
 		--with-db3-includes=${DB3_WRKSRC} \
 		--enable-nss=no \
 		--enable-openssl=yes
+CONFLICTS=	evolution-1.2*
 
 .if defined(WITH_LDAP)
 CONFIGURE_ARGS+= --with-openldap=${LOCALBASE}
@@ -64,7 +65,7 @@ PLIST_SUB+=	VERSION="1.3"
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-	@${FIND} ${WRKSRC} -type f -name "*.[ch]" | xargs ${GREP} -l '<db.h>' | \
+	@${FIND} ${WRKSRC} -type f -name "*.[ch]" | ${XARGS} ${GREP} -l '<db.h>' | \
 		${XARGS} ${REINPLACE_CMD} -e 's|<db.h>|<db3/db.h>|g'
 
 # DB3 stuff. Ugly, I know, but that's life.
@@ -92,8 +93,4 @@ pre-configure:
 	@${LN} -s . ${DB3_WRKSRC}/db3
 # End of the DB3 stuff
 
-post-install:
-	@${FIND} ${PREFIX}/share/gnome/evolution/default_user -type f | \
-		${XARGS} ${CHMOD} 644
-
 .include <bsd.port.mk>
diff --git a/mail/evolution-devel/distinfo b/mail/evolution-devel/distinfo
index 541a2d4abe86..5b75280e399c 100644
--- a/mail/evolution-devel/distinfo
+++ b/mail/evolution-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/evolution-1.3.3.tar.bz2) = d9a6f15317e5f208af6e64f7894dbabb
+MD5 (gnome2/evolution-1.3.92.tar.bz2) = c652b5873188d460e38bd73abbf1308f
 MD5 (gnome2/db-3.1.17.tar.bz2) = b237f4e38a650d096389ff54d564928d
diff --git a/mail/evolution-devel/files/patch-ltmain.sh b/mail/evolution-devel/files/patch-ltmain.sh
index 1c2fba5d533f..bb660972a6d1 100644
--- a/mail/evolution-devel/files/patch-ltmain.sh
+++ b/mail/evolution-devel/files/patch-ltmain.sh
@@ -1,6 +1,15 @@
---- ltmain.sh.orig	Fri Sep 13 15:38:11 2002
-+++ ltmain.sh	Fri Oct 11 01:44:24 2002
-@@ -1073,8 +1073,16 @@
+--- ltmain.sh.orig	Thu May 22 16:42:22 2003
++++ ltmain.sh	Tue May 27 12:12:52 2003
+@@ -1072,7 +1072,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
+ 	    ;;
+@@ -1082,8 +1082,16 @@
  	continue
  	;;
  
@@ -17,8 +26,8 @@
  	continue
  	;;
  
-@@ -2502,6 +2510,9 @@
- 	  *-*-openbsd*)
+@@ -2498,6 +2506,9 @@
+ 	  *-*-openbsd* | *-*-freebsd*)
  	    # Do not include libc due to us having libc/libc_r.
  	    ;;
 +	  *-*-freebsd*)
@@ -27,7 +36,7 @@
  	  *)
  	    # Add libc to deplibs on all other systems if necessary.
  	    if test $build_libtool_need_lc = "yes"; then
-@@ -4286,10 +4297,12 @@
+@@ -4325,10 +4336,12 @@
  	fi
  
  	# Install the pseudo-library for information purposes.
diff --git a/mail/evolution-devel/files/patch-mail_Makefile.in b/mail/evolution-devel/files/patch-mail_Makefile.in
new file mode 100644
index 000000000000..fe9ddebd8a82
--- /dev/null
+++ b/mail/evolution-devel/files/patch-mail_Makefile.in
@@ -0,0 +1,21 @@
+--- mail/Makefile.in.orig	Fri May 30 18:58:48 2003
++++ mail/Makefile.in	Fri May 30 18:59:30 2003
+@@ -2909,12 +2909,12 @@
+ 
+ @ENABLE_PURIFY_TRUE@all-local: evolution-mail.pure
+ 
+-@ENABLE_PURIFY_TRUE@install-data-local:
+-@ENABLE_PURIFY_TRUE@	if test -z "$(DESTDIR)" ; then \
+-@ENABLE_PURIFY_TRUE@		for p in $(schema_DATA) ; do \
+-@ENABLE_PURIFY_TRUE@			GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$$p; \
+-@ENABLE_PURIFY_TRUE@		done \
+-@ENABLE_PURIFY_TRUE@	fi
++install-data-local:
++	if test -z "$(DESTDIR)" ; then \
++		for p in $(schema_DATA) ; do \
++			GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$$p; \
++		done \
++	fi
+ 
+ @ENABLE_PURIFY_TRUE@evolution-mail.pure: evolution-mail
+ @ENABLE_PURIFY_TRUE@	@rm -f evolution-mail.pure
diff --git a/mail/evolution-devel/pkg-plist b/mail/evolution-devel/pkg-plist
index 845b410ab7d8..17530eb76004 100644
--- a/mail/evolution-devel/pkg-plist
+++ b/mail/evolution-devel/pkg-plist
@@ -1,3 +1,4 @@
+bin/evolution
 bin/evolution-%%VERSION%%
 bin/evolution-addressbook-export
 etc/gconf/gconf.xml.defaults/apps/evolution/%gconf.xml
@@ -12,6 +13,16 @@ etc/gconf/gconf.xml.defaults/apps/evolution/calendar/other/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/evolution/calendar/prompts/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/evolution/calendar/tasks/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/evolution/calendar/tasks/colors/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/evolution/mail/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/evolution/mail/composer/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/evolution/mail/composer/view/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/evolution/mail/display/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/evolution/mail/display/fonts/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/evolution/mail/filters/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/evolution/mail/format/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/evolution/mail/notify/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/evolution/mail/prompts/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/evolution/mail/trash/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/evolution/shell/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/evolution/shell/default_folders/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/evolution/shell/offline/%gconf.xml
@@ -36,6 +47,16 @@ etc/gconf/gconf.xml.defaults/schemas/apps/evolution/calendar/other/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/evolution/calendar/prompts/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/evolution/calendar/tasks/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/evolution/calendar/tasks/colors/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/composer/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/composer/view/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/display/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/display/fonts/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/filters/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/format/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/notify/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/prompts/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/trash/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/evolution/shell/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/evolution/shell/default_folders/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/evolution/shell/offline/%gconf.xml
@@ -409,6 +430,8 @@ libexec/evolution/%%VERSION%%/evolution-ldif-importer
 libexec/evolution/%%VERSION%%/evolution-vcard-importer
 libexec/evolution/%%VERSION%%/evolution-wombat
 libexec/evolution/%%VERSION%%/killev
+libexec/evolution/%%VERSION%%/load-gnomecard-addressbook
+libexec/evolution/%%VERSION%%/load-pine-addressbook
 share/gnome/applications/evolution.desktop
 share/gnome/evolution/%%VERSION%%/Locations
 share/gnome/evolution/%%VERSION%%/addresstypes.xml
@@ -680,6 +703,8 @@ share/gnome/evolution/%%VERSION%%/images/settings-16.png
 share/gnome/evolution/%%VERSION%%/images/settings.png
 share/gnome/evolution/%%VERSION%%/images/show_all_messages.xpm
 share/gnome/evolution/%%VERSION%%/images/splash.png
+share/gnome/evolution/%%VERSION%%/images/stock-edit-16.png
+share/gnome/evolution/%%VERSION%%/images/stock-edit-24.png
 share/gnome/evolution/%%VERSION%%/images/summary-settings.png
 share/gnome/evolution/%%VERSION%%/images/summary_preferences-16.png
 share/gnome/evolution/%%VERSION%%/images/talking-heads.png
@@ -695,8 +720,6 @@ share/gnome/evolution/%%VERSION%%/images/work_offline.xpm
 share/gnome/evolution/%%VERSION%%/images/work_online-16.png
 share/gnome/evolution/%%VERSION%%/images/working-16.png
 share/gnome/evolution/%%VERSION%%/images/world_map-960.png
-share/gnome/evolution/%%VERSION%%/tools/load-gnomecard-addressbook
-share/gnome/evolution/%%VERSION%%/tools/load-pine-addressbook
 share/gnome/evolution/%%VERSION%%/ui/evolution-addressbook.xml
 share/gnome/evolution/%%VERSION%%/ui/evolution-calendar.xml
 share/gnome/evolution/%%VERSION%%/ui/evolution-comp-editor.xml
@@ -1194,6 +1217,7 @@ share/gnome/omf/evolution/evolution-1.4-C.omf
 share/gnome/pixmaps/evolution-%%VERSION%%.png
 share/locale/am/LC_MESSAGES/evolution-1.4.mo
 share/locale/az/LC_MESSAGES/evolution-1.4.mo
+share/locale/be/LC_MESSAGES/evolution-1.4.mo
 share/locale/bg/LC_MESSAGES/evolution-1.4.mo
 share/locale/ca/LC_MESSAGES/evolution-1.4.mo
 share/locale/cs/LC_MESSAGES/evolution-1.4.mo
@@ -1256,7 +1280,6 @@ share/locale/zh_TW/LC_MESSAGES/evolution-1.4.mo
 @dirrm share/gnome/evolution/%%VERSION%%/views/addressbook
 @dirrm share/gnome/evolution/%%VERSION%%/views
 @dirrm share/gnome/evolution/%%VERSION%%/ui
-@dirrm share/gnome/evolution/%%VERSION%%/tools
 @dirrm share/gnome/evolution/%%VERSION%%/images/conduits
 @dirrm share/gnome/evolution/%%VERSION%%/images/buttons
 @dirrm share/gnome/evolution/%%VERSION%%/images
@@ -1311,6 +1334,16 @@ share/locale/zh_TW/LC_MESSAGES/evolution-1.4.mo
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/shell/view_defaults
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/shell/offline
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/shell/default_folders
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/trash
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/prompts
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/notify
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/format
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/filters
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/display/fonts
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/display
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/composer/view
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/composer
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/shell
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/calendar/tasks/colors
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/calendar/tasks
@@ -1336,6 +1369,16 @@ share/locale/zh_TW/LC_MESSAGES/evolution-1.4.mo
 @dirrm etc/gconf/gconf.xml.defaults/apps/evolution/shell/offline
 @dirrm etc/gconf/gconf.xml.defaults/apps/evolution/shell/default_folders
 @dirrm etc/gconf/gconf.xml.defaults/apps/evolution/shell
+@dirrm etc/gconf/gconf.xml.defaults/apps/evolution/mail/trash
+@dirrm etc/gconf/gconf.xml.defaults/apps/evolution/mail/prompts
+@dirrm etc/gconf/gconf.xml.defaults/apps/evolution/mail/notify
+@dirrm etc/gconf/gconf.xml.defaults/apps/evolution/mail/format
+@dirrm etc/gconf/gconf.xml.defaults/apps/evolution/mail/filters
+@dirrm etc/gconf/gconf.xml.defaults/apps/evolution/mail/display/fonts
+@dirrm etc/gconf/gconf.xml.defaults/apps/evolution/mail/display
+@dirrm etc/gconf/gconf.xml.defaults/apps/evolution/mail/composer/view
+@dirrm etc/gconf/gconf.xml.defaults/apps/evolution/mail/composer
+@dirrm etc/gconf/gconf.xml.defaults/apps/evolution/mail
 @dirrm etc/gconf/gconf.xml.defaults/apps/evolution/calendar/tasks/colors
 @dirrm etc/gconf/gconf.xml.defaults/apps/evolution/calendar/tasks
 @dirrm etc/gconf/gconf.xml.defaults/apps/evolution/calendar/prompts