On Tue, Apr 08, 2014 at 07:01:15AM +0200, Remi Pointel wrote: > > Hi, > > this is the diff to update Sylpheed to 3.4.1. > > Ok?
Your patch + some fixes. OK juanfra@ Index: Makefile =================================================================== RCS file: /cvs/ports/mail/sylpheed/Makefile,v retrieving revision 1.102 diff -u -p -r1.102 Makefile --- Makefile 20 Aug 2013 22:30:37 -0000 1.102 +++ Makefile 8 Apr 2014 11:50:29 -0000 @@ -2,36 +2,35 @@ COMMENT = lightweight and user-friendly e-mail client -DISTNAME = sylpheed-3.2.0 -REVISION = 0 +DISTNAME = sylpheed-3.4.1 -SHARED_LIBS += sylph-0 2.1 # 2.1 -SHARED_LIBS += sylpheed-plugin-0 2.1 # 2.1 +SHARED_LIBS += sylph-0 3.0 # 3.0 +SHARED_LIBS += sylpheed-plugin-0 3.0 # 3.0 -CATEGORIES= mail news x11 -HOMEPAGE= http://sylpheed.sraoss.jp/en +CATEGORIES = mail news x11 +HOMEPAGE = http://sylpheed.sraoss.jp/en # GPLv2 - LGPLv2 -PERMIT_PACKAGE_CDROM= Yes +PERMIT_PACKAGE_CDROM = Yes -MODULES = devel/gettext +MODULES = devel/gettext LIB_DEPENDS += x11/gtk+2 \ textproc/gtkspell \ security/gpgme -WANTLIB += GL X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes Xi -WANTLIB += Xinerama Xrandr Xrender Xxf86vm c crypto atk-1.0 cairo gdk_pixbuf-2.0 +WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi +WANTLIB += Xinerama Xrandr Xrender c crypto atk-1.0 cairo gdk_pixbuf-2.0 WANTLIB += pango-1.0 pangocairo-1.0 dbus-1 dbus-glib-1 gio-2.0 glib-2.0 -WANTLIB += gmodule-2.0 gobject-2.0 drm expat fontconfig freetype m pixman-1 +WANTLIB += gmodule-2.0 gobject-2.0 expat fontconfig freetype m pixman-1 WANTLIB += pthread pthread-stubs gthread-2.0 pcre enchant pangoft2-1.0 WANTLIB += png gpgme gpg-error gtkspell ssl stdc++ xcb xcb-render xcb-shm z -WANTLIB += gtk-x11-2.0 gdk-x11-2.0 gtkspell assuan +WANTLIB += gtk-x11-2.0 gdk-x11-2.0 gtkspell assuan ffi graphite2 harfbuzz -RUN_DEPENDS= devel/desktop-file-utils -MASTER_SITES = http://sylpheed.sraoss.jp/sylpheed/v3.2/ +RUN_DEPENDS = devel/desktop-file-utils +MASTER_SITES = http://sylpheed.sraoss.jp/sylpheed/v3.4/ -CONFIGURE_STYLE= gnu -CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ +CONFIGURE_STYLE = gnu +CONFIGURE_ARGS = ${CONFIGURE_SHARED} \ --enable-ssl \ --enable-ipv6 \ --enable-gtkspell \ @@ -40,20 +39,20 @@ CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ --disable-oniguruma \ --enable-gpgme \ --disable-updatecheck -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ +CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -pthread" -FLAVORS= compface -FLAVOR?= +FLAVORS = compface +FLAVOR ?= .if ${FLAVOR:Mcompface} -LIB_DEPENDS+= mail/faces -WANTLIB+= compface +LIB_DEPENDS += mail/faces +WANTLIB += compface CONFIGURE_ARGS += --enable-compface PERMIT_PACKAGE_CDROM = No fee PERMIT_PACKAGE_FTP = Yes .else -CONFIGURE_ARGS+= --disable-compface +CONFIGURE_ARGS += --disable-compface .endif .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /cvs/ports/mail/sylpheed/distinfo,v retrieving revision 1.50 diff -u -p -r1.50 distinfo --- distinfo 12 Jul 2012 20:17:45 -0000 1.50 +++ distinfo 8 Apr 2014 11:50:29 -0000 @@ -1,5 +1,2 @@ -MD5 (sylpheed-3.2.0.tar.gz) = Gvl/NfIqIDjQUEEJIJHyGg== -RMD160 (sylpheed-3.2.0.tar.gz) = gWLE1Ffv8O6K4NXQVUh5yY4T2ts= -SHA1 (sylpheed-3.2.0.tar.gz) = pBqOL8PF5JNfMMe6z/jXJQhUbjU= -SHA256 (sylpheed-3.2.0.tar.gz) = lp6fL0uphuPLnJeRdtXpu42qxOsAQpDHwvrlobaUVcU= -SIZE (sylpheed-3.2.0.tar.gz) = 4925789 +SHA256 (sylpheed-3.4.1.tar.gz) = IZaApOcg5spDD7Vhb5zRbN9PYEL/4HeU98yXbpjRgsw= +SIZE (sylpheed-3.4.1.tar.gz) = 5139049 Index: pkg/PFRAG.shared =================================================================== RCS file: pkg/PFRAG.shared diff -N pkg/PFRAG.shared --- pkg/PFRAG.shared 10 Jan 2010 10:21:05 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,3 +0,0 @@ -@comment $OpenBSD: PFRAG.shared,v 1.1 2010/01/10 10:21:05 ajacoutot Exp $ -@lib lib/libsylph-0.so.${LIBsylph-0_VERSION} -@lib lib/libsylpheed-plugin-0.so.${LIBsylpheed-plugin-0_VERSION} Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/mail/sylpheed/pkg/PLIST,v retrieving revision 1.36 diff -u -p -r1.36 PLIST --- pkg/PLIST 8 May 2011 08:18:10 -0000 1.36 +++ pkg/PLIST 8 Apr 2014 11:50:29 -0000 @@ -1,6 +1,5 @@ @comment $OpenBSD: PLIST,v 1.36 2011/05/08 08:18:10 rpointel Exp $ @pkgpath mail/sylpheed,gpgme -%%SHARED%% @bin bin/sylpheed include/sylpheed/ include/sylpheed/plugin.h @@ -36,6 +35,7 @@ include/sylpheed/sylph/smtp.h include/sylpheed/sylph/socket.h include/sylpheed/sylph/socks.h include/sylpheed/sylph/ssl.h +include/sylpheed/sylph/ssl_hostname_validation.h include/sylpheed/sylph/stringtable.h include/sylpheed/sylph/syl-marshal.h include/sylpheed/sylph/sylmain.h @@ -46,8 +46,10 @@ include/sylpheed/sylph/virtual.h include/sylpheed/sylph/xml.h lib/libsylph-0.a lib/libsylph-0.la +@lib lib/libsylph-0.so.${LIBsylph-0_VERSION} lib/libsylpheed-plugin-0.a lib/libsylpheed-plugin-0.la +@lib lib/libsylpheed-plugin-0.so.${LIBsylpheed-plugin-0_VERSION} share/applications/sylpheed.desktop share/locale/be/LC_MESSAGES/sylpheed.mo share/locale/bg/LC_MESSAGES/sylpheed.mo @@ -57,6 +59,7 @@ share/locale/de/LC_MESSAGES/sylpheed.mo share/locale/el/LC_MESSAGES/sylpheed.mo share/locale/es/LC_MESSAGES/sylpheed.mo share/locale/et/LC_MESSAGES/sylpheed.mo +share/locale/eu/LC_MESSAGES/sylpheed.mo share/locale/fi/LC_MESSAGES/sylpheed.mo share/locale/fr/LC_MESSAGES/sylpheed.mo share/locale/gl/LC_MESSAGES/sylpheed.mo
