Update to 2.5.1.

This commit is contained in:
Alexander Leidinger 2006-09-26 18:47:20 +00:00
parent 939f085b31
commit acbf7ce3a9
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=173922
8 changed files with 248 additions and 22 deletions

View file

@ -6,8 +6,7 @@
#
PORTNAME= sylpheed-claws
PORTVERSION= 2.4.0
PORTREVISION= 3
PORTVERSION= 2.5.1
CATEGORIES= mail news ipv6
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= sylpheed-claws
@ -19,8 +18,7 @@ MAINTAINER= netchild@FreeBSD.org
COMMENT= A lightweight and very featureful GTK+ based e-mail and news client
LIB_DEPENDS= etpan:${PORTSDIR}/mail/libetpan
RUN_DEPENDS= ${LOCALBASE}/etc/mime.types:${PORTSDIR}/misc/mime-support \
${LOCALBASE}/bin/metamail:${PORTSDIR}/mail/metamail
RUN_DEPENDS= ${LOCALBASE}/etc/mime.types:${PORTSDIR}/misc/mime-support
THEMEVERSION= 20060615
THEMEFILE= sylpheed-claws-themes-${THEMEVERSION}.tar.gz
@ -31,7 +29,8 @@ USE_GMAKE= yes
USE_ICONV= yes
USE_X_PREFIX= yes
USE_GNOME= gnomehack pkgconfig gtk20
USE_AUTOTOOLS= autoconf:259 libtool:15
#USE_AUTOTOOLS= autoconf:259 libtool:15
GNU_CONFIGURE= yes
USE_GCC= 3.3+
WANT_GNOME= yes
@ -41,7 +40,7 @@ CONFIGURE_ARGS= \
--with-libiconv-prefix=${LOCALBASE} \
--with-manualdir=${DOCSDIR}/manual \
--with-faqdir=${DOCSDIR}/faq \
--with-mandir=${PREFIX}/man
--mandir=${PREFIX}/man
CONFIGURE_ENV= CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \
CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
@ -172,8 +171,7 @@ post-extract:
post-patch:
@${REINPLACE_CMD} -e \
's|-lresolv||g; s|-lpisock\"|-liconv &|g ;\
s|gpgme-config|gpgme03-config|' ${WRKSRC}/configure
's|-lresolv||g; s|-lpisock\"|-liconv &|g' ${WRKSRC}/configure
@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" \
${WRKSRC}/tools/README.sylprint ${WRKSRC}/tools/sylprint.pl
@${REINPLACE_CMD} -e 's|/etc|${LOCALBASE}&|g ; s|/usr/share|${LOCALBASE}/share|g' \

View file

@ -1,6 +1,6 @@
MD5 (sylpheed-claws-2.4.0.tar.bz2) = 8e8e2b847d6466b1384e3a5a15b9f2e7
SHA256 (sylpheed-claws-2.4.0.tar.bz2) = 7ea2a321e41e04c0f4b0fe70489b2967b8d54fb88eca808ed44c56669325291a
SIZE (sylpheed-claws-2.4.0.tar.bz2) = 4593307
MD5 (sylpheed-claws-2.5.1.tar.bz2) = 93f71795cec0bdae13af9730e3f76e79
SHA256 (sylpheed-claws-2.5.1.tar.bz2) = 28709f70e294defde1e0970f106c9a970e85be44ed5066cfcb70ea8fd9d94fe9
SIZE (sylpheed-claws-2.5.1.tar.bz2) = 5038199
MD5 (sylpheed-claws-themes-20060615.tar.gz) = 8cf1f94353be228d192d843e89557f42
SHA256 (sylpheed-claws-themes-20060615.tar.gz) = f34bfb8f53ef4b22e25055c588b19b3bc107b1a3dcf28faab409359b788444d7
SIZE (sylpheed-claws-themes-20060615.tar.gz) = 1716505

View file

@ -0,0 +1,106 @@
--- configure.orig Tue Sep 26 13:48:55 2006
+++ configure Tue Sep 26 13:52:15 2006
@@ -28199,6 +28199,18 @@
{ echo "$as_me:$LINENO: checking for OPENSSL" >&5
echo $ECHO_N "checking for OPENSSL... $ECHO_C" >&6; }
+ case $host_os in
+ *freebsd*)
+ if test $(openssl version | cut -d ' ' -f 2) \< 0.9.7 ; then
+ ac_cv_enable_openssl=no
+ else
+ OPENSSL_LIBS=${OPENSSL_LIBS-"-lcrypto -lssl"}
+ echo "${ECHO_T}yes" >&6;
+ fi
+ ;;
+ esac
+
+if false; then
if test -n "$PKG_CONFIG"; then
if test -n "$OPENSSL_CFLAGS"; then
pkg_cv_OPENSSL_CFLAGS="$OPENSSL_CFLAGS"
@@ -28265,6 +28277,8 @@
echo "${ECHO_T}yes" >&6; }
:
fi
+fi # if false
+
if test x$ac_cv_enable_openssl = xyes; then
cat >>confdefs.h <<\_ACEOF
@@ -29719,18 +29733,18 @@
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext;
if test "$ac_cv_var__res_options" != "yes"; then
- LIBRESOLV="-lresolv"
+ LIBRESOLV=""
fi
LIBS="$t_oldLibs"
if test "x$LIBRESOLV" = "x"; then
- { echo "$as_me:$LINENO: checking for res_query in -lresolv" >&5
-echo $ECHO_N "checking for res_query in -lresolv... $ECHO_C" >&6; }
+ { echo "$as_me:$LINENO: checking for res_query in " >&5
+echo $ECHO_N "checking for res_query in ... $ECHO_C" >&6; }
if test "${ac_cv_lib_resolv_res_query+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lresolv $LIBS"
+LIBS=" $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -29802,7 +29816,7 @@
{ echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_res_query" >&5
echo "${ECHO_T}$ac_cv_lib_resolv_res_query" >&6; }
if test $ac_cv_lib_resolv_res_query = yes; then
- LIBRESOLV=-lresolv
+ LIBRESOLV=
fi
LIBS="$t_oldLibs"
@@ -29833,13 +29847,13 @@
{ echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6; }
- { echo "$as_me:$LINENO: checking for res_query in -lresolv" >&5
-echo $ECHO_N "checking for res_query in -lresolv... $ECHO_C" >&6; }
+ { echo "$as_me:$LINENO: checking for res_query in " >&5
+echo $ECHO_N "checking for res_query in ... $ECHO_C" >&6; }
if test "${ac_cv_lib_resolv_res_query+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lresolv $LIBS"
+LIBS=" $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -29911,7 +29925,7 @@
{ echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_res_query" >&5
echo "${ECHO_T}$ac_cv_lib_resolv_res_query" >&6; }
if test $ac_cv_lib_resolv_res_query = yes; then
- LDAP_LIBS="$LDAP_LIBS -lresolv"
+ LDAP_LIBS="$LDAP_LIBS "
fi
{ echo "$as_me:$LINENO: checking for bind in -lsocket" >&5
@@ -30883,7 +30897,7 @@
fi
- { echo "$as_me:$LINENO: checking for unpack_Address in -lpisock" >&5
+ { echo "$as_me:$LINENO: checking for unpack_Address in -liconv -lpisock" >&5
echo $ECHO_N "checking for unpack_Address in -lpisock... $ECHO_C" >&6; }
if test "${ac_cv_lib_pisock_unpack_Address+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -30961,7 +30975,7 @@
{ echo "$as_me:$LINENO: result: $ac_cv_lib_pisock_unpack_Address" >&5
echo "${ECHO_T}$ac_cv_lib_pisock_unpack_Address" >&6; }
if test $ac_cv_lib_pisock_unpack_Address = yes; then
- JPILOT_LIBS="-lpisock"
+ JPILOT_LIBS="-liconv -lpisock"
else
JPILOT_LIBS="" ac_cv_enable_jpilot="no"
fi

View file

@ -11,6 +11,7 @@ include/sylpheed-claws/addrclip.h
include/sylpheed-claws/addrdefs.h
include/sylpheed-claws/addressadd.h
include/sylpheed-claws/addressbook.h
include/sylpheed-claws/addressbook_foldersel.h
include/sylpheed-claws/addressitem.h
include/sylpheed-claws/addrgather.h
include/sylpheed-claws/addrharvest.h
@ -199,6 +200,9 @@ include/sylpheed-claws/undo.h
include/sylpheed-claws/unmime.h
include/sylpheed-claws/vcard.h
include/sylpheed-claws/wizard.h
lib/sylpheed-claws/plugins/bogofilter.a
lib/sylpheed-claws/plugins/bogofilter.la
lib/sylpheed-claws/plugins/bogofilter.so
%%CLAM_PLUG%%lib/sylpheed-claws/plugins/clamav_plugin.a
%%CLAM_PLUG%%lib/sylpheed-claws/plugins/clamav_plugin.la
%%CLAM_PLUG%%lib/sylpheed-claws/plugins/clamav_plugin.so
@ -234,6 +238,10 @@ share/applications/sylpheed-claws.desktop
%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-claws-manual.pdf
%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-claws-manual.ps
%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-claws-manual.txt
%%PORTDOCS%%%%DOCSDIR%%/manual/es/sylpheed-claws-manual.html
%%PORTDOCS%%%%DOCSDIR%%/manual/es/sylpheed-claws-manual.pdf
%%PORTDOCS%%%%DOCSDIR%%/manual/es/sylpheed-claws-manual.ps
%%PORTDOCS%%%%DOCSDIR%%/manual/es/sylpheed-claws-manual.txt
%%PORTDOCS%%%%DOCSDIR%%/manual/fr/sylpheed-claws-manual.html
%%PORTDOCS%%%%DOCSDIR%%/manual/fr/sylpheed-claws-manual.pdf
%%PORTDOCS%%%%DOCSDIR%%/manual/fr/sylpheed-claws-manual.ps
@ -2521,6 +2529,7 @@ share/pixmaps/sylpheed-claws.png
@dirrm %%DATADIR%%
%%PORTDOCS%%@dirrm %%DOCSDIR%%/manual/pl
%%PORTDOCS%%@dirrm %%DOCSDIR%%/manual/fr
%%PORTDOCS%%@dirrm %%DOCSDIR%%/manual/es
%%PORTDOCS%%@dirrm %%DOCSDIR%%/manual/en
%%PORTDOCS%%@dirrm %%DOCSDIR%%/manual
%%PORTDOCS%%@dirrm %%DOCSDIR%%

View file

@ -6,8 +6,7 @@
#
PORTNAME= sylpheed-claws
PORTVERSION= 2.4.0
PORTREVISION= 3
PORTVERSION= 2.5.1
CATEGORIES= mail news ipv6
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= sylpheed-claws
@ -19,8 +18,7 @@ MAINTAINER= netchild@FreeBSD.org
COMMENT= A lightweight and very featureful GTK+ based e-mail and news client
LIB_DEPENDS= etpan:${PORTSDIR}/mail/libetpan
RUN_DEPENDS= ${LOCALBASE}/etc/mime.types:${PORTSDIR}/misc/mime-support \
${LOCALBASE}/bin/metamail:${PORTSDIR}/mail/metamail
RUN_DEPENDS= ${LOCALBASE}/etc/mime.types:${PORTSDIR}/misc/mime-support
THEMEVERSION= 20060615
THEMEFILE= sylpheed-claws-themes-${THEMEVERSION}.tar.gz
@ -31,7 +29,8 @@ USE_GMAKE= yes
USE_ICONV= yes
USE_X_PREFIX= yes
USE_GNOME= gnomehack pkgconfig gtk20
USE_AUTOTOOLS= autoconf:259 libtool:15
#USE_AUTOTOOLS= autoconf:259 libtool:15
GNU_CONFIGURE= yes
USE_GCC= 3.3+
WANT_GNOME= yes
@ -41,7 +40,7 @@ CONFIGURE_ARGS= \
--with-libiconv-prefix=${LOCALBASE} \
--with-manualdir=${DOCSDIR}/manual \
--with-faqdir=${DOCSDIR}/faq \
--with-mandir=${PREFIX}/man
--mandir=${PREFIX}/man
CONFIGURE_ENV= CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \
CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
@ -172,8 +171,7 @@ post-extract:
post-patch:
@${REINPLACE_CMD} -e \
's|-lresolv||g; s|-lpisock\"|-liconv &|g ;\
s|gpgme-config|gpgme03-config|' ${WRKSRC}/configure
's|-lresolv||g; s|-lpisock\"|-liconv &|g' ${WRKSRC}/configure
@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" \
${WRKSRC}/tools/README.sylprint ${WRKSRC}/tools/sylprint.pl
@${REINPLACE_CMD} -e 's|/etc|${LOCALBASE}&|g ; s|/usr/share|${LOCALBASE}/share|g' \

View file

@ -1,6 +1,6 @@
MD5 (sylpheed-claws-2.4.0.tar.bz2) = 8e8e2b847d6466b1384e3a5a15b9f2e7
SHA256 (sylpheed-claws-2.4.0.tar.bz2) = 7ea2a321e41e04c0f4b0fe70489b2967b8d54fb88eca808ed44c56669325291a
SIZE (sylpheed-claws-2.4.0.tar.bz2) = 4593307
MD5 (sylpheed-claws-2.5.1.tar.bz2) = 93f71795cec0bdae13af9730e3f76e79
SHA256 (sylpheed-claws-2.5.1.tar.bz2) = 28709f70e294defde1e0970f106c9a970e85be44ed5066cfcb70ea8fd9d94fe9
SIZE (sylpheed-claws-2.5.1.tar.bz2) = 5038199
MD5 (sylpheed-claws-themes-20060615.tar.gz) = 8cf1f94353be228d192d843e89557f42
SHA256 (sylpheed-claws-themes-20060615.tar.gz) = f34bfb8f53ef4b22e25055c588b19b3bc107b1a3dcf28faab409359b788444d7
SIZE (sylpheed-claws-themes-20060615.tar.gz) = 1716505

View file

@ -0,0 +1,106 @@
--- configure.orig Tue Sep 26 13:48:55 2006
+++ configure Tue Sep 26 13:52:15 2006
@@ -28199,6 +28199,18 @@
{ echo "$as_me:$LINENO: checking for OPENSSL" >&5
echo $ECHO_N "checking for OPENSSL... $ECHO_C" >&6; }
+ case $host_os in
+ *freebsd*)
+ if test $(openssl version | cut -d ' ' -f 2) \< 0.9.7 ; then
+ ac_cv_enable_openssl=no
+ else
+ OPENSSL_LIBS=${OPENSSL_LIBS-"-lcrypto -lssl"}
+ echo "${ECHO_T}yes" >&6;
+ fi
+ ;;
+ esac
+
+if false; then
if test -n "$PKG_CONFIG"; then
if test -n "$OPENSSL_CFLAGS"; then
pkg_cv_OPENSSL_CFLAGS="$OPENSSL_CFLAGS"
@@ -28265,6 +28277,8 @@
echo "${ECHO_T}yes" >&6; }
:
fi
+fi # if false
+
if test x$ac_cv_enable_openssl = xyes; then
cat >>confdefs.h <<\_ACEOF
@@ -29719,18 +29733,18 @@
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext;
if test "$ac_cv_var__res_options" != "yes"; then
- LIBRESOLV="-lresolv"
+ LIBRESOLV=""
fi
LIBS="$t_oldLibs"
if test "x$LIBRESOLV" = "x"; then
- { echo "$as_me:$LINENO: checking for res_query in -lresolv" >&5
-echo $ECHO_N "checking for res_query in -lresolv... $ECHO_C" >&6; }
+ { echo "$as_me:$LINENO: checking for res_query in " >&5
+echo $ECHO_N "checking for res_query in ... $ECHO_C" >&6; }
if test "${ac_cv_lib_resolv_res_query+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lresolv $LIBS"
+LIBS=" $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -29802,7 +29816,7 @@
{ echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_res_query" >&5
echo "${ECHO_T}$ac_cv_lib_resolv_res_query" >&6; }
if test $ac_cv_lib_resolv_res_query = yes; then
- LIBRESOLV=-lresolv
+ LIBRESOLV=
fi
LIBS="$t_oldLibs"
@@ -29833,13 +29847,13 @@
{ echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6; }
- { echo "$as_me:$LINENO: checking for res_query in -lresolv" >&5
-echo $ECHO_N "checking for res_query in -lresolv... $ECHO_C" >&6; }
+ { echo "$as_me:$LINENO: checking for res_query in " >&5
+echo $ECHO_N "checking for res_query in ... $ECHO_C" >&6; }
if test "${ac_cv_lib_resolv_res_query+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lresolv $LIBS"
+LIBS=" $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -29911,7 +29925,7 @@
{ echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_res_query" >&5
echo "${ECHO_T}$ac_cv_lib_resolv_res_query" >&6; }
if test $ac_cv_lib_resolv_res_query = yes; then
- LDAP_LIBS="$LDAP_LIBS -lresolv"
+ LDAP_LIBS="$LDAP_LIBS "
fi
{ echo "$as_me:$LINENO: checking for bind in -lsocket" >&5
@@ -30883,7 +30897,7 @@
fi
- { echo "$as_me:$LINENO: checking for unpack_Address in -lpisock" >&5
+ { echo "$as_me:$LINENO: checking for unpack_Address in -liconv -lpisock" >&5
echo $ECHO_N "checking for unpack_Address in -lpisock... $ECHO_C" >&6; }
if test "${ac_cv_lib_pisock_unpack_Address+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -30961,7 +30975,7 @@
{ echo "$as_me:$LINENO: result: $ac_cv_lib_pisock_unpack_Address" >&5
echo "${ECHO_T}$ac_cv_lib_pisock_unpack_Address" >&6; }
if test $ac_cv_lib_pisock_unpack_Address = yes; then
- JPILOT_LIBS="-lpisock"
+ JPILOT_LIBS="-liconv -lpisock"
else
JPILOT_LIBS="" ac_cv_enable_jpilot="no"
fi

View file

@ -11,6 +11,7 @@ include/sylpheed-claws/addrclip.h
include/sylpheed-claws/addrdefs.h
include/sylpheed-claws/addressadd.h
include/sylpheed-claws/addressbook.h
include/sylpheed-claws/addressbook_foldersel.h
include/sylpheed-claws/addressitem.h
include/sylpheed-claws/addrgather.h
include/sylpheed-claws/addrharvest.h
@ -199,6 +200,9 @@ include/sylpheed-claws/undo.h
include/sylpheed-claws/unmime.h
include/sylpheed-claws/vcard.h
include/sylpheed-claws/wizard.h
lib/sylpheed-claws/plugins/bogofilter.a
lib/sylpheed-claws/plugins/bogofilter.la
lib/sylpheed-claws/plugins/bogofilter.so
%%CLAM_PLUG%%lib/sylpheed-claws/plugins/clamav_plugin.a
%%CLAM_PLUG%%lib/sylpheed-claws/plugins/clamav_plugin.la
%%CLAM_PLUG%%lib/sylpheed-claws/plugins/clamav_plugin.so
@ -234,6 +238,10 @@ share/applications/sylpheed-claws.desktop
%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-claws-manual.pdf
%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-claws-manual.ps
%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-claws-manual.txt
%%PORTDOCS%%%%DOCSDIR%%/manual/es/sylpheed-claws-manual.html
%%PORTDOCS%%%%DOCSDIR%%/manual/es/sylpheed-claws-manual.pdf
%%PORTDOCS%%%%DOCSDIR%%/manual/es/sylpheed-claws-manual.ps
%%PORTDOCS%%%%DOCSDIR%%/manual/es/sylpheed-claws-manual.txt
%%PORTDOCS%%%%DOCSDIR%%/manual/fr/sylpheed-claws-manual.html
%%PORTDOCS%%%%DOCSDIR%%/manual/fr/sylpheed-claws-manual.pdf
%%PORTDOCS%%%%DOCSDIR%%/manual/fr/sylpheed-claws-manual.ps
@ -2521,6 +2529,7 @@ share/pixmaps/sylpheed-claws.png
@dirrm %%DATADIR%%
%%PORTDOCS%%@dirrm %%DOCSDIR%%/manual/pl
%%PORTDOCS%%@dirrm %%DOCSDIR%%/manual/fr
%%PORTDOCS%%@dirrm %%DOCSDIR%%/manual/es
%%PORTDOCS%%@dirrm %%DOCSDIR%%/manual/en
%%PORTDOCS%%@dirrm %%DOCSDIR%%/manual
%%PORTDOCS%%@dirrm %%DOCSDIR%%