Update to 1.0.2.

PR:		34580
Submitted by:	Joe Marcus Clarke <marcus@marcuscom.com>

6 files changed, 95 insertions, 31 deletions

diff --git a/mail/evolution-devel/Makefile b/mail/evolution-devel/Makefile
index 42b17725504c..e3bd363d2e29 100644
--- a/mail/evolution-devel/Makefile
+++ b/mail/evolution-devel/Makefile
@@ -6,13 +6,13 @@
 #
 
 PORTNAME=	evolution
-PORTVERSION=	1.0.1
+PORTVERSION=	1.0.2
 CATEGORIES=	mail gnome
-MASTER_SITES=	http://www.sleepycat.com/update/3.1.17/ \
+MASTER_SITES=	http://www.sleepycat.com/update/3.1.17/:db \
 		${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/evolution
 DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
-		db-3.1.17.tar.gz
+		db-3.1.17.tar.gz:db
 
 MAINTAINER=	gnome@FreeBSD.org
 
@@ -49,7 +49,7 @@ PLIST_SUB=	PILOT:=""
 PLIST_SUB=	PILOT:="@comment "
 .endif
 CONFIGURE_ENV=	CPPFLAGS="-I${DB3_WRKSRC} -I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+		LIBS="-pthread -L${LOCALBASE}/lib"
 
 PLIST_SUB+=	VERSION=${PORTVERSION}
 
diff --git a/mail/evolution-devel/distinfo b/mail/evolution-devel/distinfo
index 15f8c4cebec0..921388764c4a 100644
--- a/mail/evolution-devel/distinfo
+++ b/mail/evolution-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (evolution-1.0.1.tar.gz) = 3ff4face716bc43b6cbdfbbeb82d8e40
+MD5 (evolution-1.0.2.tar.gz) = 05ca33abfabeaa14b8fd61c682fddad3
 MD5 (db-3.1.17.tar.gz) = 5baeb94fb934d0bf783ea42117c400be
diff --git a/mail/evolution-devel/files/patch-ltmain.sh b/mail/evolution-devel/files/patch-ltmain.sh
index 91c341790451..91713d2306f8 100644
--- a/mail/evolution-devel/files/patch-ltmain.sh
+++ b/mail/evolution-devel/files/patch-ltmain.sh
@@ -1,27 +1,36 @@
 
 $FreeBSD$
 
---- ltmain.sh.orig	Sun Jan 20 16:11:07 2002
-+++ ltmain.sh	Tue Jan 22 13:34:20 2002
-@@ -1060,6 +1060,7 @@
+--- 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
  	;;
  
-@@ -2442,6 +2443,9 @@
- 	  *-*-openbsd*)
- 	    # Do not include libc due to us having libc/libc_r.
+@@ -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
-@@ -4208,10 +4212,12 @@
+ 	    if test "$build_libtool_need_lc" = "yes"; then
+@@ -4179,10 +4190,12 @@
  	fi
  
  	# Install the pseudo-library for information purposes.
diff --git a/mail/evolution-devel/files/patch-po::Makefile.in.in b/mail/evolution-devel/files/patch-po::Makefile.in.in
index f6aa43a9d474..85c5f9db34b6 100644
--- a/mail/evolution-devel/files/patch-po::Makefile.in.in
+++ b/mail/evolution-devel/files/patch-po::Makefile.in.in
@@ -1,14 +1,14 @@
 
 $FreeBSD$
 
---- po/Makefile.in.in	2002/01/13 17:11:01	1.1
-+++ po/Makefile.in.in	2002/01/13 17:11:38
-@@ -125,7 +125,7 @@
- 	    *.gmo) destdir=$(DESTDIR)$(gnulocaledir);; \
- 	    *)     destdir=$(DESTDIR)$(localedir);; \
- 	  esac; \
--	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
+--- po/Makefile.in.in.orig	Thu Feb  7 14:34:39 2002
++++ po/Makefile.in.in	Thu Feb  7 14:36:07 2002
+@@ -106,7 +106,7 @@
+ 	@catalogs='$(CATALOGS)'; \
+ 	for cat in $$catalogs; do \
+ 	  cat=`basename $$cat`; \
+-	  lang=`echo $$cat | sed 's/\.gmo$$//'`; \
 +	  lang=`echo $$cat | sed 's/\.mo$$//'`; \
- 	  dir=$$destdir/$$lang/LC_MESSAGES; \
- 	  if test -r "$(MKINSTALLDIRS)"; then \
- 	    $(MKINSTALLDIRS) $$dir; \
+ 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
+ 	  $(mkinstalldirs) $(DESTDIR)$$dir; \
+ 	  if test -r $$cat; then \
diff --git a/mail/evolution-devel/files/patch-shell::Makefile.in b/mail/evolution-devel/files/patch-shell::Makefile.in
index db4862b22875..9fc5e6555160 100644
--- a/mail/evolution-devel/files/patch-shell::Makefile.in
+++ b/mail/evolution-devel/files/patch-shell::Makefile.in
@@ -1,14 +1,14 @@
 
 $FreeBSD$
 
---- shell/Makefile.in	2002/01/13 17:29:15	1.1
-+++ shell/Makefile.in	2002/01/13 17:29:32
-@@ -186,7 +186,7 @@
+--- shell/Makefile.in.orig	Thu Feb  7 14:38:27 2002
++++ shell/Makefile.in	Thu Feb  7 14:39:37 2002
+@@ -195,7 +195,7 @@
  
  SUBDIRS = glade importer
  
--INCLUDES = -O								\
-+INCLUDES =								\
- 	-I$(top_srcdir)/widgets						\
- 	-I$(top_srcdir)/widgets/misc					\
- 	-I$(top_srcdir)							\
+-INCLUDES = -O									-I$(top_srcdir)/widgets							-I$(top_srcdir)/widgets/misc						-I$(top_srcdir)/libical/src/libical					-I$(top_srcdir)								$(BONOBO_GNOME_CFLAGS)							$(BONOBO_CONF_CFLAGS)							$(EXTRA_GNOME_CFLAGS)							$(GTKHTML_CFLAGS)							-DEVOLUTION_IMAGES=\""$(datadir)/images/evolution"\"			-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"   				-DEVOLUTION_DATADIR=\""$(datadir)"\"            			-DEVOLUTION_GLADEDIR=\"$(datadir)/evolution/glade\"			-DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\"				-DG_LOG_DOMAIN=\"evolution-shell\"
++INCLUDES = -I$(top_srcdir)/widgets							-I$(top_srcdir)/widgets/misc						-I$(top_srcdir)/libical/src/libical					-I$(top_srcdir)								$(BONOBO_GNOME_CFLAGS)							$(BONOBO_CONF_CFLAGS)							$(EXTRA_GNOME_CFLAGS)							$(GTKHTML_CFLAGS)							-DEVOLUTION_IMAGES=\""$(datadir)/images/evolution"\"			-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"   				-DEVOLUTION_DATADIR=\""$(datadir)"\"            			-DEVOLUTION_GLADEDIR=\"$(datadir)/evolution/glade\"			-DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\"				-DG_LOG_DOMAIN=\"evolution-shell\"
+ 
+ 
+ # CORBA stuff
diff --git a/mail/evolution-devel/pkg-plist b/mail/evolution-devel/pkg-plist
index 8c926cbe531b..58c653adc339 100644
--- a/mail/evolution-devel/pkg-plist
+++ b/mail/evolution-devel/pkg-plist
@@ -321,6 +321,7 @@ share/gnome/help/evolution/C/config.html
 share/gnome/help/evolution/C/contact-automation-basic.html
 share/gnome/help/evolution/C/contact-search.html
 share/gnome/help/evolution/C/customizing-summary.html
+share/gnome/help/evolution/C/docbook.css
 share/gnome/help/evolution/C/encryption.html
 share/gnome/help/evolution/C/figures/calendar.png
 share/gnome/help/evolution/C/figures/config-cal.png
@@ -371,6 +372,18 @@ share/gnome/help/evolution/C/sgml/usage-mail.sgml
 share/gnome/help/evolution/C/sgml/usage-mainwindow.sgml
 share/gnome/help/evolution/C/sgml/usage-print.sgml
 share/gnome/help/evolution/C/sgml/usage-sync.sgml
+share/gnome/help/evolution/C/stylesheet-images/caution.gif
+share/gnome/help/evolution/C/stylesheet-images/home.gif
+share/gnome/help/evolution/C/stylesheet-images/important.gif
+share/gnome/help/evolution/C/stylesheet-images/next.gif
+share/gnome/help/evolution/C/stylesheet-images/note.gif
+share/gnome/help/evolution/C/stylesheet-images/prev.gif
+share/gnome/help/evolution/C/stylesheet-images/tip.gif
+share/gnome/help/evolution/C/stylesheet-images/toc-blank.gif
+share/gnome/help/evolution/C/stylesheet-images/toc-minus.gif
+share/gnome/help/evolution/C/stylesheet-images/toc-plus.gif
+share/gnome/help/evolution/C/stylesheet-images/up.gif
+share/gnome/help/evolution/C/stylesheet-images/warning.gif
 share/gnome/help/evolution/C/topic.dat
 share/gnome/help/evolution/C/typography.html
 share/gnome/help/evolution/C/ui-intro.html
@@ -408,6 +421,7 @@ share/gnome/help/evolution/no/config.html
 share/gnome/help/evolution/no/contact-automation-basic.html
 share/gnome/help/evolution/no/contact-search.html
 share/gnome/help/evolution/no/customizing-summary.html
+share/gnome/help/evolution/no/docbook.css
 share/gnome/help/evolution/no/encryption.html
 share/gnome/help/evolution/no/figures/calendar.png
 share/gnome/help/evolution/no/figures/config-cal.png
@@ -460,6 +474,18 @@ share/gnome/help/evolution/no/sgml/usage-mail.sgml
 share/gnome/help/evolution/no/sgml/usage-mainwindow.sgml
 share/gnome/help/evolution/no/sgml/usage-print.sgml
 share/gnome/help/evolution/no/sgml/usage-sync.sgml
+share/gnome/help/evolution/no/stylesheet-images/caution.gif
+share/gnome/help/evolution/no/stylesheet-images/home.gif
+share/gnome/help/evolution/no/stylesheet-images/important.gif
+share/gnome/help/evolution/no/stylesheet-images/next.gif
+share/gnome/help/evolution/no/stylesheet-images/note.gif
+share/gnome/help/evolution/no/stylesheet-images/prev.gif
+share/gnome/help/evolution/no/stylesheet-images/tip.gif
+share/gnome/help/evolution/no/stylesheet-images/toc-blank.gif
+share/gnome/help/evolution/no/stylesheet-images/toc-minus.gif
+share/gnome/help/evolution/no/stylesheet-images/toc-plus.gif
+share/gnome/help/evolution/no/stylesheet-images/up.gif
+share/gnome/help/evolution/no/stylesheet-images/warning.gif
 share/gnome/help/evolution/no/topic.dat
 share/gnome/help/evolution/no/typography.html
 share/gnome/help/evolution/no/ui-intro.html
@@ -486,6 +512,35 @@ share/gnome/help/evolution/no/usage-print.html
 share/gnome/help/evolution/no/usage-summary.html
 share/gnome/help/evolution/no/usage-sync.html
 share/gnome/help/evolution/no/usage.html
+share/gnome/html/evolution-devel-guide/alarm-trigger-generation-code.html
+share/gnome/html/evolution-devel-guide/calclient.html
+share/gnome/html/evolution-devel-guide/calcomponent.html
+share/gnome/html/evolution-devel-guide/calendar-alarm-generation.html
+share/gnome/html/evolution-devel-guide/calendar-architecture.html
+share/gnome/html/evolution-devel-guide/calendar-public-reference.html
+share/gnome/html/evolution-devel-guide/evolution-api-reference.html
+share/gnome/html/evolution-devel-guide/evolution-cal-util-cal-recur.html
+share/gnome/html/evolution-devel-guide/evolution-cal-util-cal-util.html
+share/gnome/html/evolution-devel-guide/evolution-cal-util-timeutil.html
+share/gnome/html/evolution-devel-guide/evolution-calendar.html
+share/gnome/html/evolution-devel-guide/fdl-section1.html
+share/gnome/html/evolution-devel-guide/fdl-section10.html
+share/gnome/html/evolution-devel-guide/fdl-section2.html
+share/gnome/html/evolution-devel-guide/fdl-section3.html
+share/gnome/html/evolution-devel-guide/fdl-section4.html
+share/gnome/html/evolution-devel-guide/fdl-section5.html
+share/gnome/html/evolution-devel-guide/fdl-section6.html
+share/gnome/html/evolution-devel-guide/fdl-section7.html
+share/gnome/html/evolution-devel-guide/fdl-section8.html
+share/gnome/html/evolution-devel-guide/fdl-section9.html
+share/gnome/html/evolution-devel-guide/fdl-using.html
+share/gnome/html/evolution-devel-guide/fdl.html
+share/gnome/html/evolution-devel-guide/generating-trigger-instances.html
+share/gnome/html/evolution-devel-guide/index.html
+share/gnome/html/evolution-devel-guide/introduction.html
+share/gnome/html/evolution-devel-guide/x102.html
+share/gnome/html/evolution-devel-guide/x125.html
+share/gnome/html/evolution-devel-guide/x134.html
 share/gnome/idl/Composer.idl
 share/gnome/idl/Evolution-Activity.idl
 share/gnome/idl/Evolution-Composer.idl