Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 13 Jan 2002 06:08:32 -0500 (EST)
From:      Joe Marcus Clarke <marcus@marcuscom.com>
To:        FreeBSD-gnats-submit@freebsd.org
Subject:   ports/33835: [PATCH] Upgrade mail/evolution to 1.0.1
Message-ID:  <200201131108.g0DB8Wb45029@shumai.marcuscom.com>

next in thread | raw e-mail | index | archive | help

>Number:         33835
>Category:       ports
>Synopsis:       [PATCH] Upgrade mail/evolution to 1.0.1
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jan 13 03:10:02 PST 2002
>Closed-Date:
>Last-Modified:
>Originator:     Joe Marcus Clarke
>Release:        FreeBSD 4.5-PRERELEASE i386
>Organization:
MarcusCom, Inc.
>Environment:
System: FreeBSD shumai.marcuscom.com 4.5-PRERELEASE FreeBSD 4.5-PRERELEASE #0: Sun Jan 6 01:07:48 EST 2002 marcus@shumai.marcuscom.com:/usr/obj/usr/src/sys/SHUMAI i386


	
>Description:
	Evolution was updated to 1.0.1.  Update FreeBSD's port to reflect this.
>How-To-Repeat:
	
>Fix:

* DELETED FILES:
  files/patch-camel::camel-mime-message.c
  files/patch-camel::camel-store.h
  files/patch-e-util::e-pilot-util.c


--- Makefile.orig	Sun Jan 13 05:58:59 2002
+++ Makefile	Sun Jan 13 05:11:06 2002
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	evolution
-PORTVERSION=	1.0
-PORTREVISION=	8
+PORTVERSION=	1.0.1
+#PORTREVISION=	8
 CATEGORIES=	mail gnome
 MASTER_SITES=	http://www.sleepycat.com/update/3.1.17/ \
 		${MASTER_SITE_GNOME}
@@ -52,7 +52,8 @@
 CONFIGURE_ENV=	CPPFLAGS="-I${DB3_WRKSRC} -I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
-PLIST_SUB+=	VERSION=${PORTVERSION}
+PLIST_SUB+=	VERSION="1.0"
+PLIST_SUB+=	PORTVERSION=${PORTVERSION}
 
 pre-patch:
 	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
@@ -75,6 +76,8 @@
 			--prefix=${PREFIX} \
 			--includedir=${PREFIX}/include/db3 \
 			--target=${ARCH}-unknown-freebsd${OSREL}
+
+MAN1=	evolution.1
 
 pre-configure:
 	@(cd ${DB3_WRKSRC} && \


--- distinfo.orig	Sun Jan 13 05:59:10 2002
+++ distinfo	Sun Jan 13 02:20:39 2002
@@ -1,2 +1,2 @@
-MD5 (evolution-1.0.tar.gz) = 89546c8d15c2aca6ca41caa5b5f14a44
+MD5 (evolution-1.0.1.tar.gz) = 3ff4face716bc43b6cbdfbbeb82d8e40
 MD5 (db-3.1.17.tar.gz) = 5baeb94fb934d0bf783ea42117c400be


--- pkg-plist.orig	Sun Jan 13 05:02:37 2002
+++ pkg-plist	Sun Jan 13 05:14:36 2002
@@ -1,3 +1,4 @@
+bin/csv2vcard
 bin/evolution
 bin/evolution-addressbook
 bin/evolution-addressbook-clean
@@ -192,12 +193,12 @@
 lib/evolution/camel-providers/%%VERSION%%/libcamelsmtp.so
 lib/evolution/camel-providers/%%VERSION%%/libcamelsmtp.so.0
 lib/evolution/camel-providers/%%VERSION%%/libcamelsmtp.urls
-lib/evolution/evolution-mail-importers/%%VERSION%%/libmbox.a
-lib/evolution/evolution-mail-importers/%%VERSION%%/libmbox.so
-lib/evolution/evolution-mail-importers/%%VERSION%%/libmbox.so.0
-lib/evolution/evolution-mail-importers/%%VERSION%%/liboutlook.a
-lib/evolution/evolution-mail-importers/%%VERSION%%/liboutlook.so
-lib/evolution/evolution-mail-importers/%%VERSION%%/liboutlook.so.0
+lib/evolution/evolution-mail-importers/%%PORTVERSION%%/libmbox.a
+lib/evolution/evolution-mail-importers/%%PORTVERSION%%/libmbox.so
+lib/evolution/evolution-mail-importers/%%PORTVERSION%%/libmbox.so.0
+lib/evolution/evolution-mail-importers/%%PORTVERSION%%/liboutlook.a
+lib/evolution/evolution-mail-importers/%%PORTVERSION%%/liboutlook.so
+lib/evolution/evolution-mail-importers/%%PORTVERSION%%/liboutlook.so.0
 %%PILOT:%%lib/gnome-pilot/conduits/libeaddress_conduit.a
 %%PILOT:%%lib/gnome-pilot/conduits/libeaddress_conduit.so
 %%PILOT:%%lib/gnome-pilot/conduits/libecalendar_conduit.a
@@ -336,7 +337,6 @@
 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
@@ -387,18 +387,6 @@
 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
@@ -436,7 +424,6 @@
 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
@@ -489,18 +476,6 @@
 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
@@ -1154,6 +1129,7 @@
 share/locale/ja/LC_MESSAGES/evolution.mo
 share/locale/ko/LC_MESSAGES/evolution.mo
 share/locale/lt/LC_MESSAGES/evolution.mo
+share/locale/lv/LC_MESSAGES/evolution.mo
 share/locale/nl/LC_MESSAGES/evolution.mo
 share/locale/nn/LC_MESSAGES/evolution.mo
 share/locale/no/LC_MESSAGES/evolution.mo
@@ -1221,7 +1197,7 @@
 @dirrm share/gnome/evolution/default_user/local
 @dirrm share/gnome/evolution/default_user
 @dirrm share/gnome/evolution
-@dirrm lib/evolution/evolution-mail-importers/%%VERSION%%
+@dirrm lib/evolution/evolution-mail-importers/%%PORTVERSION%%
 @dirrm lib/evolution/evolution-mail-importers
 @dirrm lib/evolution/camel-providers/%%VERSION%%
 @dirrm lib/evolution/camel-providers


--- files/patch-aa.orig	Sun Jan 13 05:59:21 2002
+++ files/patch-aa	Sun Jan 13 05:18:05 2002
@@ -1,9 +1,6 @@
-
-$FreeBSD: ports/mail/evolution/files/patch-aa,v 1.12 2001/12/15 04:40:13 sobomax Exp $
-
---- configure.orig	Fri Dec 14 19:13:12 2001
-+++ configure	Fri Dec 14 19:20:26 2001
-@@ -9253,7 +9253,7 @@
+--- configure.orig	Sun Jan 13 04:19:07 2002
++++ configure	Sun Jan 13 05:17:44 2002
+@@ -9292,7 +9292,7 @@
  
  CPPFLAGS_save="$CPPFLAGS"
  CPPFLAGS="$DB3_CFLAGS $CPPFLAGS"
@@ -12,7 +9,7 @@
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-@@ -9327,7 +9327,7 @@
+@@ -9366,7 +9366,7 @@
    echo "configure: failed program was:" >&5
    cat conftest.$ac_ext >&5
    rm -rf conftest*
@@ -21,7 +18,7 @@
  fi
  rm -f conftest*
  
-@@ -9438,7 +9438,7 @@
+@@ -9477,7 +9477,7 @@
  
  echo "$ac_t""$ac_cv_db3_lib_version_match" 1>&6
  if test "$ac_cv_db3_lib_version_match" = no; then
@@ -30,27 +27,29 @@
  fi
  
  CPPFLAGS="$CPPFLAGS_save"
-@@ -11059,7 +11059,7 @@
- 	size_t utf8_real_len = strlen (utf8);
- 	char *pstring;	
- 
--	if (convert_ToPilotChar ("UTF8", utf8, utf8_real_len, &pstring) == -1)
-+	if (convert_ToPilotChar ("UTF-8", utf8, utf8_real_len, &pstring) == -1)
- 	        exit (1);
- 
- 	exit (0);
-@@ -12680,10 +12680,10 @@
-       *) # Relative path.
+@@ -12420,10 +12420,10 @@
+     top_srcdir="$ac_dots$ac_given_srcdir" ;;
+   esac
+ 
+-  case "$ac_given_INSTALL" in
+-  [/$]*) INSTALL="$ac_given_INSTALL" ;;
+-  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
+-  esac
++#  case "$ac_given_INSTALL" in
++#  [/$]*) INSTALL="$ac_given_INSTALL" ;;
++#  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
++#  esac
+ 
+   echo creating "$ac_file"
+   rm -f "$ac_file"
+@@ -12708,8 +12708,8 @@
          ac_sub_cache_file="$ac_dots$cache_file" ;;
        esac
--  case "$ac_given_INSTALL" in
+   case "$ac_given_INSTALL" in
 -        [/$]*) INSTALL="$ac_given_INSTALL" ;;
 -        *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
--        esac
-+#  case "$ac_given_INSTALL" in
-+#        [/$]*) INSTALL="$ac_given_INSTALL" ;;
-+#        *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
-+#        esac
++        [/$]*) INSTALL="/usr/bin/install -c -o root -g wheel" ;;
++        *) INSTALL="/usr/bin/install -c -o root -g wheel" ;;
+         esac
  
        echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir"
-       # The eval makes quoting arguments work.


--- files/patch-po::Makefile.in.in.orig	Sun Jan 13 05:59:33 2002
+++ files/patch-po::Makefile.in.in	Sun Jan 13 02:54:14 2002
@@ -1,14 +1,11 @@
-
-$FreeBSD: ports/mail/evolution/files/patch-po::Makefile.in.in,v 1.3 2001/11/20 14:20:03 sobomax Exp $
-
---- po/Makefile.in.in	2001/11/20 13:17:31	1.1
-+++ po/Makefile.in.in	2001/11/20 13:17:42
-@@ -106,7 +106,7 @@
- 	@catalogs='$(CATALOGS)'; \
+--- po/Makefile.in.in.orig	Sun Jan 13 02:51:07 2002
++++ po/Makefile.in.in	Sun Jan 13 02:53:22 2002
+@@ -173,7 +173,7 @@
+ 	catalogs='$(CATALOGS)'; \
  	for cat in $$catalogs; do \
  	  cat=`basename $$cat`; \
--	  lang=`echo $$cat | sed 's/\.gmo$$//'`; \
+-	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
 +	  lang=`echo $$cat | sed 's/\.mo$$//'`; \
- 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
- 	  $(mkinstalldirs) $(DESTDIR)$$dir; \
- 	  if test -r $$cat; then \
+ 	  rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
+ 	  rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
+ 	  rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
>Release-Note:
>Audit-Trail:
>Unformatted:

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200201131108.g0DB8Wb45029>