- give it a chance to compile under powerpc (fix iconv configure check

the same way we did we evolution-data-server)
- remove quotes around COMMENT
- clean up PLIST
- add libnotify to LIB_DEPENDS
- update patches
This commit is contained in:
ajacoutot 2007-06-27 08:27:40 +00:00
parent 1327eb6e9f
commit a2b4f1db0d
4 changed files with 25 additions and 71 deletions

View File

@ -1,9 +1,10 @@
# $OpenBSD: Makefile,v 1.33 2007/06/18 17:39:18 martin Exp $
# $OpenBSD: Makefile,v 1.34 2007/06/27 08:27:40 ajacoutot Exp $
COMMENT= "integrated email and PIM software for GNOME"
COMMENT= integrated email and PIM software for GNOME
R= 2.10
DISTNAME= evolution-${R}.1
PKGNAME= ${DISTNAME}p0
CATEGORIES= mail x11/gnome
HOMEPAGE= http://www.gnome.org/projects/evolution/
@ -51,7 +52,8 @@ LIB_DEPENDS= camel-1.2,camel-provider-1.2.>=4.1,ebook-1.2.>=4.1,ecal-1.2.>=2.1,
lber.>=7,ldap.>=7::databases/openldap \
gstreamer-0.8.>=5.0:gstreamer-0.8.*:devel/gstreamer \
gnomeprintui-2-2::x11/gnome/libgnomeprintui \
nss3.>=19,smime3.>=19,softokn3.>=19,ssl3.>=19:nss->=3.11.4p1:security/nss
nss3.>=19,smime3.>=19,softokn3.>=19,ssl3.>=19:nss->=3.11.4p1:security/nss \
notify.>=2::devel/libnotify
USE_X11= Yes
USE_GMAKE= Yes

View File

@ -1,7 +1,15 @@
$OpenBSD: patch-configure,v 1.2 2007/06/02 11:32:11 jasper Exp $
--- configure.orig Wed Apr 25 23:38:07 2007
+++ configure Wed Apr 25 23:39:56 2007
@@ -27802,9 +27802,6 @@ LIBS=$ac_check_lib_save_LIBS
$OpenBSD: patch-configure,v 1.3 2007/06/27 08:27:40 ajacoutot Exp $
--- configure.orig Mon Apr 9 07:12:54 2007
+++ configure Tue Jun 26 11:00:14 2007
@@ -24979,6 +24979,7 @@ int main (int argc, char **argv)
{
iconv_t cd;
cd = iconv_open ("UTF-8", "ISO-8859-1");
+ exit (0);
}
_ACEOF
@@ -27802,9 +27803,6 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_res_query" >&5
echo "${ECHO_T}$ac_cv_lib_resolv_res_query" >&6; }
@ -11,7 +19,7 @@ $OpenBSD: patch-configure,v 1.2 2007/06/02 11:32:11 jasper Exp $
{ echo "$as_me:$LINENO: checking for bind in -lsocket" >&5
echo $ECHO_N "checking for bind in -lsocket... $ECHO_C" >&6; }
@@ -30819,7 +30816,7 @@ if test "x${with_krb5}" != "xno"; then
@@ -30819,7 +30817,7 @@ if test "x${with_krb5}" != "xno"; then
LDFLAGS_save="$LDFLAGS"
mitlibs="-lkrb5 -lk5crypto -lcom_err -lgssapi_krb5"

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-widgets_e-timezone-dialog_e-timezone-dialog_c,v 1.1 2007/06/02 11:32:11 jasper Exp $
--- widgets/e-timezone-dialog/e-timezone-dialog.c.orig Thu Apr 26 00:04:48 2007
+++ widgets/e-timezone-dialog/e-timezone-dialog.c Thu Apr 26 00:06:16 2007
@@ -80,8 +80,6 @@
$OpenBSD: patch-widgets_e-timezone-dialog_e-timezone-dialog_c,v 1.2 2007/06/27 08:27:40 ajacoutot Exp $
--- widgets/e-timezone-dialog/e-timezone-dialog.c.orig Mon Apr 9 07:10:21 2007
+++ widgets/e-timezone-dialog/e-timezone-dialog.c Tue Jun 26 10:59:53 2007
@@ -80,8 +80,6 @@ struct _ETimezoneDialogPrivate {
#ifndef G_OS_WIN32 /* Declared properly in time.h already */
extern char *tzname[2];
@ -10,7 +10,7 @@ $OpenBSD: patch-widgets_e-timezone-dialog_e-timezone-dialog_c,v 1.1 2007/06/02 1
#endif
static void e_timezone_dialog_class_init (ETimezoneDialogClass *class);
@@ -314,6 +312,8 @@
@@ -314,6 +312,8 @@ get_local_offset ()
t_gmt = mktime (&gmt);
t_local = mktime (&local);
diff = t_local - t_gmt;
@ -19,7 +19,7 @@ $OpenBSD: patch-widgets_e-timezone-dialog_e-timezone-dialog_c,v 1.1 2007/06/02 1
return diff;
}
@@ -324,7 +324,7 @@
@@ -324,7 +324,7 @@ get_local_timezone()
icaltimezone *zone;
tzset();

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.12 2007/06/02 11:32:11 jasper Exp $
@comment $OpenBSD: PLIST,v 1.13 2007/06/27 08:27:40 ajacoutot Exp $
%%SHARED%%
bin/evolution
bin/evolution-2.10
@ -407,7 +407,6 @@ libexec/evolution/2.10/evolution-addressbook-clean
libexec/evolution/2.10/evolution-addressbook-export
libexec/evolution/2.10/evolution-alarm-notify
libexec/evolution/2.10/killev
share/applications/
share/applications/evolution.desktop
share/evolution/
share/evolution/2.10/
@ -613,8 +612,6 @@ share/evolution/2.10/weather/category_weather_rain_16.png
share/evolution/2.10/weather/category_weather_snow_16.png
share/evolution/2.10/weather/category_weather_sun_16.png
share/evolution/2.10/weather/category_weather_tstorm_16.png
share/gnome/
share/gnome/help/
share/gnome/help/evolution/
share/gnome/help/evolution/C/
share/gnome/help/evolution/C/evolution.xml
@ -1117,20 +1114,12 @@ share/idl/evolution-2.10/Evolution-Shell.idl
share/idl/evolution-2.10/Evolution.idl
share/idl/evolution-2.10/evolution-calendar.idl
share/locale/am/LC_MESSAGES/evolution-2.10.mo
share/locale/ar/
share/locale/ar/LC_MESSAGES/
share/locale/ar/LC_MESSAGES/evolution-2.10.mo
share/locale/az/LC_MESSAGES/evolution-2.10.mo
share/locale/be/LC_MESSAGES/evolution-2.10.mo
share/locale/bg/LC_MESSAGES/evolution-2.10.mo
share/locale/bn/
share/locale/bn/LC_MESSAGES/
share/locale/bn/LC_MESSAGES/evolution-2.10.mo
share/locale/bn_IN/
share/locale/bn_IN/LC_MESSAGES/
share/locale/bn_IN/LC_MESSAGES/evolution-2.10.mo
share/locale/bs/
share/locale/bs/LC_MESSAGES/
share/locale/bs/LC_MESSAGES/evolution-2.10.mo
share/locale/ca/LC_MESSAGES/evolution-2.10.mo
share/locale/cs/LC_MESSAGES/evolution-2.10.mo
@ -1139,83 +1128,51 @@ share/locale/cy/LC_MESSAGES/
share/locale/cy/LC_MESSAGES/evolution-2.10.mo
share/locale/da/LC_MESSAGES/evolution-2.10.mo
share/locale/de/LC_MESSAGES/evolution-2.10.mo
share/locale/dz/
share/locale/dz/LC_MESSAGES/
share/locale/dz/LC_MESSAGES/evolution-2.10.mo
share/locale/el/LC_MESSAGES/evolution-2.10.mo
share/locale/en_AU/
share/locale/en_AU/LC_MESSAGES/
share/locale/en_AU/LC_MESSAGES/evolution-2.10.mo
share/locale/en_CA/
share/locale/en_CA/LC_MESSAGES/
share/locale/en_CA/LC_MESSAGES/evolution-2.10.mo
share/locale/en_GB/
share/locale/en_GB/LC_MESSAGES/
share/locale/en_GB/LC_MESSAGES/evolution-2.10.mo
share/locale/es/LC_MESSAGES/evolution-2.10.mo
share/locale/et/LC_MESSAGES/evolution-2.10.mo
share/locale/eu/
share/locale/eu/LC_MESSAGES/
share/locale/eu/LC_MESSAGES/evolution-2.10.mo
share/locale/fa/
share/locale/fa/LC_MESSAGES/
share/locale/fa/LC_MESSAGES/evolution-2.10.mo
share/locale/fi/LC_MESSAGES/evolution-2.10.mo
share/locale/fr/LC_MESSAGES/evolution-2.10.mo
share/locale/ga/LC_MESSAGES/evolution-2.10.mo
share/locale/gl/LC_MESSAGES/evolution-2.10.mo
share/locale/gu/
share/locale/gu/LC_MESSAGES/
share/locale/gu/LC_MESSAGES/evolution-2.10.mo
share/locale/he/LC_MESSAGES/evolution-2.10.mo
share/locale/hi/
share/locale/hi/LC_MESSAGES/
share/locale/hi/LC_MESSAGES/evolution-2.10.mo
share/locale/hr/LC_MESSAGES/evolution-2.10.mo
share/locale/hu/LC_MESSAGES/evolution-2.10.mo
share/locale/id/LC_MESSAGES/evolution-2.10.mo
share/locale/is/
share/locale/is/LC_MESSAGES/
share/locale/is/LC_MESSAGES/evolution-2.10.mo
share/locale/it/LC_MESSAGES/evolution-2.10.mo
share/locale/ja/LC_MESSAGES/evolution-2.10.mo
share/locale/ka/
share/locale/ka/LC_MESSAGES/
share/locale/ka/LC_MESSAGES/evolution-2.10.mo
share/locale/ko/LC_MESSAGES/evolution-2.10.mo
share/locale/ku/
share/locale/ku/LC_MESSAGES/
share/locale/ku/LC_MESSAGES/evolution-2.10.mo
share/locale/lt/
share/locale/lt/LC_MESSAGES/
share/locale/lt/LC_MESSAGES/evolution-2.10.mo
share/locale/lv/LC_MESSAGES/evolution-2.10.mo
share/locale/mk/
share/locale/mk/LC_MESSAGES/
share/locale/mk/LC_MESSAGES/evolution-2.10.mo
share/locale/ml/
share/locale/ml/LC_MESSAGES/
share/locale/ml/LC_MESSAGES/evolution-2.10.mo
share/locale/mn/
share/locale/mn/LC_MESSAGES/
share/locale/mn/LC_MESSAGES/evolution-2.10.mo
share/locale/mr/
share/locale/mr/LC_MESSAGES/
share/locale/mr/LC_MESSAGES/evolution-2.10.mo
share/locale/ms/
share/locale/ms/LC_MESSAGES/
share/locale/ms/LC_MESSAGES/evolution-2.10.mo
share/locale/nb/LC_MESSAGES/evolution-2.10.mo
share/locale/ne/
share/locale/ne/LC_MESSAGES/
share/locale/ne/LC_MESSAGES/evolution-2.10.mo
share/locale/nl/LC_MESSAGES/evolution-2.10.mo
share/locale/nn/LC_MESSAGES/evolution-2.10.mo
share/locale/or/
share/locale/or/LC_MESSAGES/
share/locale/or/LC_MESSAGES/evolution-2.10.mo
share/locale/pa/
share/locale/pa/LC_MESSAGES/
share/locale/pa/LC_MESSAGES/evolution-2.10.mo
share/locale/pl/LC_MESSAGES/evolution-2.10.mo
share/locale/pt/LC_MESSAGES/evolution-2.10.mo
@ -1233,27 +1190,15 @@ share/locale/sq/LC_MESSAGES/evolution-2.10.mo
share/locale/sr/LC_MESSAGES/evolution-2.10.mo
share/locale/sr@Latn/LC_MESSAGES/evolution-2.10.mo
share/locale/sv/LC_MESSAGES/evolution-2.10.mo
share/locale/ta/
share/locale/ta/LC_MESSAGES/
share/locale/ta/LC_MESSAGES/evolution-2.10.mo
share/locale/te/
share/locale/te/LC_MESSAGES/
share/locale/te/LC_MESSAGES/evolution-2.10.mo
share/locale/th/
share/locale/th/LC_MESSAGES/
share/locale/th/LC_MESSAGES/evolution-2.10.mo
share/locale/tr/LC_MESSAGES/evolution-2.10.mo
share/locale/uk/LC_MESSAGES/evolution-2.10.mo
share/locale/vi/LC_MESSAGES/evolution-2.10.mo
share/locale/wa/
share/locale/wa/LC_MESSAGES/
share/locale/wa/LC_MESSAGES/evolution-2.10.mo
share/locale/xh/
share/locale/xh/LC_MESSAGES/
share/locale/xh/LC_MESSAGES/evolution-2.10.mo
share/locale/zh_CN/LC_MESSAGES/evolution-2.10.mo
share/locale/zh_HK/
share/locale/zh_HK/LC_MESSAGES/
share/locale/zh_HK/LC_MESSAGES/evolution-2.10.mo
share/locale/zh_TW/LC_MESSAGES/evolution-2.10.mo
share/mime-info/
@ -1266,7 +1211,6 @@ share/omf/evolution/evolution-es.omf
share/omf/evolution/evolution-fr.omf
share/omf/evolution/evolution-sv.omf
@unexec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-uninstall-rule %D/share/schemas/evolution/*.schemas > /dev/null
share/schemas/
share/schemas/evolution/
share/schemas/evolution/apps-evolution-mail-prompts-checkdefault-2.10.schemas
share/schemas/evolution/apps_evolution_addressbook-2.10.schemas