Hi!
here's a new diff.
- update to sylpheed-2.0.2
- ditch VERSION (only used once, from alek@)
- use MODULES=devel/gettext, remove iconv and intl from WANTLIB (alek@)
- USE_LIBTOOL and remove ltmain.sh patch
Please test and comment.
Bernd
Index: Makefile
===================================================================
RCS file: /cvs/ports/mail/sylpheed/Makefile,v
retrieving revision 1.57
diff -u -u -r1.57 Makefile
--- Makefile 10 Sep 2005 18:26:20 -0000 1.57
+++ Makefile 30 Sep 2005 11:04:50 -0000
@@ -2,24 +2,30 @@
COMMENT= "mail/news client in gtk+"
-VERSION= 1.0.4
-DISTNAME= sylpheed-${VERSION}
+DISTNAME= sylpheed-2.0.2
CATEGORIES= mail news x11
HOMEPAGE= http://sylpheed.good-day.net
MAINTAINER= Damien Couderc <[EMAIL PROTECTED]>
-LIB_DEPENDS= gdk_pixbuf.2::graphics/gdk-pixbuf
-
# GPL
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
-WANTLIB= X11 Xext Xi c crypto gdk glib gmodule gtk iconv intl \
- jpeg m png pthread ssl tiff z
+WANTLIB= X11 Xft Xrender atk-1.0.0.0 c \
+ crypto fontconfig freetype glib-2.0.0.0 gdk-x11-2.0.0.0 \
+ gdk_pixbuf-2.0.0.0 gmodule-2.0.0.0 gobject-2.0.0.0 \
+ gtk-x11-2.0.0.0 m pthread pango-1.0.0.0 \
+ pangox-1.0.0.0 pangoft2-1.0.0.0 pangoxft-1.0.0.0 ssl
+
+MODULES= devel/gettext
+LIB_DEPENDS= gtk-x11-2.0.0.9,gdk_pixbuf-2.0.0.9,gdk-x11-2.0.0.9::x11/gtk+2
+
+USE_LIBTOOL= Yes
-MASTER_SITES= ${HOMEPAGE}/sylpheed/v1.0/
+MASTER_SITES= ${HOMEPAGE}/sylpheed/v2.0/
+MASTER_SITES0= ${MASTER_SITE_SOURCEFORGE:=sylpheed-claws/}
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS= --enable-ssl --enable-ipv6 \
@@ -27,7 +33,7 @@
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -pthread"
-FLAVORS= compface gpgme ldap
+FLAVORS= compface gpgme
FLAVOR?=
.if ${FLAVOR:L:Mcompface}
@@ -42,17 +48,8 @@
LIB_DEPENDS+= gpgme.4::security/gpgme
CONFIGURE_ARGS+= --enable-gpgme
WANTLIB+= gpg-error
-PKGNAME= ${DISTNAME}p0
.else
CONFIGURE_ARGS+= --disable-gpgme
-.endif
-
-.if ${FLAVOR:L:Mldap}
-LIB_DEPENDS+= ldap.2,lber.2::databases/openldap
-CONFIGURE_ARGS+= --enable-ldap
-WANTLIB+= gthread
-.else
-CONFIGURE_ARGS+= --disable-ldap
.endif
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/mail/sylpheed/distinfo,v
retrieving revision 1.34
diff -u -u -r1.34 distinfo
--- distinfo 4 Apr 2005 18:51:03 -0000 1.34
+++ distinfo 30 Sep 2005 11:04:50 -0000
@@ -1,4 +1,4 @@
-MD5 (sylpheed-1.0.4.tar.gz) = 961c15d9fbaf6ae4c469b5152c21bbac
-RMD160 (sylpheed-1.0.4.tar.gz) = 8faeb184fcfb794d40343de361c92bb1b33a8bea
-SHA1 (sylpheed-1.0.4.tar.gz) = 0bde134aa94e7d4b0874070057f2c7bd6f24adfa
-SIZE (sylpheed-1.0.4.tar.gz) = 3519127
+MD5 (sylpheed-2.0.2.tar.gz) = 6f40099c7b154f5234dd43c28a6ee878
+RMD160 (sylpheed-2.0.2.tar.gz) = c6ee3a6a6669937a00fd80d3ee689db2e9f98677
+SHA1 (sylpheed-2.0.2.tar.gz) = 3d2764ece6702d9eca9fcdcd7ec0bdbe10515cd9
+SIZE (sylpheed-2.0.2.tar.gz) = 3544499
Index: patches/patch-ltmain_sh
===================================================================
RCS file: patches/patch-ltmain_sh
diff -N patches/patch-ltmain_sh
--- patches/patch-ltmain_sh 31 May 2004 12:54:32 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,32 +0,0 @@
-$OpenBSD: patch-ltmain_sh,v 1.4 2004/05/31 12:54:32 couderc Exp $
---- ltmain.sh.orig 2004-05-29 14:33:49.000000000 +0200
-+++ ltmain.sh 2004-05-31 14:45:19.000000000 +0200
-@@ -1371,6 +1371,17 @@ EOF
- continue
- ;;
-
-+ -pthread)
-+ case $host in
-+ *-*-openbsd*)
-+ deplibs="$deplibs $arg"
-+ ;;
-+ *)
-+ continue
-+ ;;
-+ esac
-+ ;;
-+
- -module)
- module=yes
- continue
-@@ -2024,6 +2035,10 @@ EOF
- fi
- continue
- ;;
-+ -pthread)
-+ continue
-+ ;;
-+
- %DEPLIBS%)
- alldeplibs=yes
- continue
Index: patches/patch-src_inc_c
===================================================================
RCS file: /cvs/ports/mail/sylpheed/patches/patch-src_inc_c,v
retrieving revision 1.3
diff -u -u -r1.3 patch-src_inc_c
--- patches/patch-src_inc_c 31 May 2004 12:54:32 -0000 1.3
+++ patches/patch-src_inc_c 30 Sep 2005 11:04:50 -0000
@@ -1,9 +1,9 @@
$OpenBSD: patch-src_inc_c,v 1.3 2004/05/31 12:54:32 couderc Exp $
---- src/inc.c.orig 2004-05-11 07:13:18.000000000 +0200
-+++ src/inc.c 2004-05-31 14:45:19.000000000 +0200
-@@ -76,7 +76,9 @@ static GdkBitmap *errorxpmmask;
- static GdkPixmap *okxpm;
- static GdkBitmap *okxpmmask;
+--- src/inc.c.orig Fri Jun 17 10:21:07 2005
++++ src/inc.c Thu Aug 11 22:46:36 2005
+@@ -74,7 +74,9 @@ static GdkPixbuf *current_pixbuf;
+ static GdkPixbuf *error_pixbuf;
+ static GdkPixbuf *ok_pixbuf;
-#define MSGBUFSIZE 8192
+#ifndef MSGBUFSIZE
@@ -11,4 +11,4 @@
+#endif
static void inc_finished (MainWindow *mainwin,
- gboolean new_messages);
+ gint new_messages);
Index: patches/patch-src_procmime_c
===================================================================
RCS file: /cvs/ports/mail/sylpheed/patches/patch-src_procmime_c,v
retrieving revision 1.4
diff -u -u -r1.4 patch-src_procmime_c
--- patches/patch-src_procmime_c 10 Apr 2004 19:13:50 -0000 1.4
+++ patches/patch-src_procmime_c 30 Sep 2005 11:04:50 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_procmime_c,v 1.4 2004/04/10 19:13:50 couderc Exp $
---- src/procmime.c.orig 2004-02-10 04:31:26.000000000 +0100
-+++ src/procmime.c 2004-04-09 17:07:33.000000000 +0200
-@@ -937,7 +937,7 @@ static GHashTable *procmime_get_mime_typ
+--- src/procmime.c.orig Thu Jul 14 09:49:28 2005
++++ src/procmime.c Thu Aug 11 22:46:36 2005
+@@ -1000,7 +1000,7 @@ static GHashTable *procmime_get_mime_typ
mime_type_list =
procmime_get_mime_type_list(SYSCONFDIR "/mime.types");
if (!mime_type_list) {
Index: pkg/DESCR
===================================================================
RCS file: /cvs/ports/mail/sylpheed/pkg/DESCR,v
retrieving revision 1.6
diff -u -u -r1.6 DESCR
--- pkg/DESCR 15 Dec 2003 23:03:08 -0000 1.6
+++ pkg/DESCR 30 Sep 2005 11:04:50 -0000
@@ -1,10 +1,13 @@
-Sylpheed is an e-mail client (and news reader) based on GTK+, running
+Sylpheed is an e-mail client (and news reader) based on GTK2+, running
on the X Window System, and aiming for:
Quick response
Graceful, and sophisticated interface
Easy configuration, intuitive operation
Abundant features
+
+You may wish to install bogofilter to use junk-mail feature (not
+enabled by default).
FLAVORS:
* compface: support X-Face header
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/mail/sylpheed/pkg/PLIST,v
retrieving revision 1.20
diff -u -u -r1.20 PLIST
--- pkg/PLIST 15 Sep 2004 09:09:45 -0000 1.20
+++ pkg/PLIST 30 Sep 2005 11:04:50 -0000
@@ -1,83 +1,35 @@
@comment $OpenBSD: PLIST,v 1.20 2004/09/15 09:09:45 espie Exp $
bin/sylpheed
-share/locale/
-share/locale/bg/
-share/locale/bg/LC_MESSAGES/
share/locale/bg/LC_MESSAGES/sylpheed.mo
-share/locale/cs/
-share/locale/cs/LC_MESSAGES/
share/locale/cs/LC_MESSAGES/sylpheed.mo
-share/locale/da/
-share/locale/da/LC_MESSAGES/
share/locale/da/LC_MESSAGES/sylpheed.mo
-share/locale/de/
-share/locale/de/LC_MESSAGES/
share/locale/de/LC_MESSAGES/sylpheed.mo
-share/locale/el/
-share/locale/el/LC_MESSAGES/
share/locale/el/LC_MESSAGES/sylpheed.mo
-share/locale/es/
-share/locale/es/LC_MESSAGES/
share/locale/es/LC_MESSAGES/sylpheed.mo
-share/locale/et/
-share/locale/et/LC_MESSAGES/
share/locale/et/LC_MESSAGES/sylpheed.mo
-share/locale/fr/
-share/locale/fr/LC_MESSAGES/
share/locale/fr/LC_MESSAGES/sylpheed.mo
-share/locale/gl/
-share/locale/gl/LC_MESSAGES/
share/locale/gl/LC_MESSAGES/sylpheed.mo
-share/locale/hr/
-share/locale/hr/LC_MESSAGES/
share/locale/hr/LC_MESSAGES/sylpheed.mo
-share/locale/hu/
-share/locale/hu/LC_MESSAGES/
share/locale/hu/LC_MESSAGES/sylpheed.mo
-share/locale/it/
-share/locale/it/LC_MESSAGES/
share/locale/it/LC_MESSAGES/sylpheed.mo
-share/locale/ja/
-share/locale/ja/LC_MESSAGES/
share/locale/ja/LC_MESSAGES/sylpheed.mo
-share/locale/ko/
-share/locale/ko/LC_MESSAGES/
share/locale/ko/LC_MESSAGES/sylpheed.mo
-share/locale/nl/
-share/locale/nl/LC_MESSAGES/
+share/locale/lt/
+share/locale/lt/LC_MESSAGES/
+share/locale/lt/LC_MESSAGES/sylpheed.mo
share/locale/nl/LC_MESSAGES/sylpheed.mo
-share/locale/pl/
-share/locale/pl/LC_MESSAGES/
share/locale/pl/LC_MESSAGES/sylpheed.mo
-share/locale/pt_BR/
-share/locale/pt_BR/LC_MESSAGES/
share/locale/pt_BR/LC_MESSAGES/sylpheed.mo
-share/locale/ro/
-share/locale/ro/LC_MESSAGES/
share/locale/ro/LC_MESSAGES/sylpheed.mo
-share/locale/ru/
-share/locale/ru/LC_MESSAGES/
share/locale/ru/LC_MESSAGES/sylpheed.mo
-share/locale/sk/
-share/locale/sk/LC_MESSAGES/
share/locale/sk/LC_MESSAGES/sylpheed.mo
-share/locale/sl/
-share/locale/sl/LC_MESSAGES/
share/locale/sl/LC_MESSAGES/sylpheed.mo
share/locale/sr/
share/locale/sr/LC_MESSAGES/
share/locale/sr/LC_MESSAGES/sylpheed.mo
-share/locale/sv/
-share/locale/sv/LC_MESSAGES/
share/locale/sv/LC_MESSAGES/sylpheed.mo
-share/locale/tr/
-share/locale/tr/LC_MESSAGES/
share/locale/tr/LC_MESSAGES/sylpheed.mo
-share/locale/uk/
-share/locale/uk/LC_MESSAGES/
share/locale/uk/LC_MESSAGES/sylpheed.mo
-share/locale/zh_CN/
-share/locale/zh_CN/LC_MESSAGES/
share/locale/zh_CN/LC_MESSAGES/sylpheed.mo
share/locale/zh_TW.Big5/
share/locale/zh_TW.Big5/LC_MESSAGES/
