sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-06-06 05:10:29 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update to 2.4.2.

Browse source
This commit is contained in:
Joe Marcus Clarke 2009-12-25 18:17:08 +00:00
parent 1bbed6b25b
commit 279a353d0b
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=246615
8 changed files with 48 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
mail/balsa/Makefile
View file

@ -7,10 +7,9 @@
# #
PORTNAME= balsa PORTNAME= balsa
PORTVERSION= 2.3.28 PORTVERSION= 2.4.2
PORTREVISION= 2
CATEGORIES= mail gnome CATEGORIES= mail gnome
MASTER_SITES= http://www.theochem.kth.se/~pawsa/balsa/ MASTER_SITES= http://pawsa.fedorapeople.org/balsa/
DISTNAME= balsa-${PORTVERSION} DISTNAME= balsa-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org MAINTAINER= gnome@FreeBSD.org
@ -20,7 +19,8 @@ LIB_DEPENDS= aspell.16:${PORTSDIR}/textproc/aspell \
pcre.0:${PORTSDIR}/devel/pcre \ pcre.0:${PORTSDIR}/devel/pcre \
esmtp.6:${PORTSDIR}/mail/libesmtp \ esmtp.6:${PORTSDIR}/mail/libesmtp \
gmime-2.0.4:${PORTSDIR}/mail/gmime2 \ gmime-2.0.4:${PORTSDIR}/mail/gmime2 \
gnome-keyring:${PORTSDIR}/security/gnome-keyring gnome-keyring:${PORTSDIR}/security/gnome-keyring \
canberra-gtk.0:${PORTSDIR}/audio/libcanberra
USE_GMAKE= yes USE_GMAKE= yes
USE_BZIP2= yes USE_BZIP2= yes
@ -36,7 +36,9 @@ GNU_CONFIGURE= yes
USE_ICONV= yes USE_ICONV= yes
CONFIGURE_ARGS= --enable-threads \ CONFIGURE_ARGS= --enable-threads \
--disable-more-warnings \ --disable-more-warnings \
--with-ssl --with-ssl \
--without-nm \
--with-canberra
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
LIBS="-L${LOCALBASE}/lib -liconv ${PTHREAD_LIBS}" LIBS="-L${LOCALBASE}/lib -liconv ${PTHREAD_LIBS}"

6
mail/balsa/distinfo
View file

@ -1,3 +1,3 @@
MD5 (balsa-2.3.28.tar.bz2) = c9ea1f5683fc094b1ffcab7b9e66dd5c MD5 (balsa-2.4.2.tar.bz2) = 1eb90a92c089e194a595072a57c57394
SHA256 (balsa-2.3.28.tar.bz2) = c9160312fd9b3f7aa71d0a77450a1b2637f786c040133cc60a53a780f99fa58c SHA256 (balsa-2.4.2.tar.bz2) = 48bde6ff926fcc5d47853b87242cc890bdb21b5c74a2454a2b5c0269e9340090
SIZE (balsa-2.3.28.tar.bz2) = 3066523 SIZE (balsa-2.4.2.tar.bz2) = 3079414

44
mail/balsa/files/patch-configure
View file

@ -1,15 +1,6 @@
--- configure.orig 2009-01-01 17:16:25.000000000 -0500 --- configure.orig 2009-12-25 12:47:41.000000000 -0500
+++ configure 2009-01-01 17:18:27.000000000 -0500 +++ configure 2009-12-25 12:55:51.000000000 -0500
@@ -23250,7 +23250,7 @@ cat >>confdefs.h <<\_ACEOF @@ -15258,7 +15258,7 @@ if { as_var=$as_ac_Lib; eval "test \"\${
#define HAVE_GTK_PRINT 1
_ACEOF
- gnome_print_extras=""
+ #gnome_print_extras=""
else
gnome_print_extras="libgnomeprint-2.2 >= 2.1.4 libgnomeprintui-2.2 >= 2.1.4"
fi
@@ -23889,7 +23889,7 @@ if { as_var=$as_ac_Lib; eval "test \"\${
$as_echo_n "(cached) " >&6 $as_echo_n "(cached) " >&6
else else
ac_check_lib_save_LIBS=$LIBS ac_check_lib_save_LIBS=$LIBS
@ -18,7 +9,7 @@
cat >conftest.$ac_ext <<_ACEOF cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */ /* confdefs.h. */
_ACEOF _ACEOF
@@ -24383,7 +24383,7 @@ if test "${ac_cv_lib_ldap_ldap_search+se @@ -15752,7 +15752,7 @@ if test "${ac_cv_lib_ldap_ldap_search+se
$as_echo_n "(cached) " >&6 $as_echo_n "(cached) " >&6
else else
ac_check_lib_save_LIBS=$LIBS ac_check_lib_save_LIBS=$LIBS
@ -27,7 +18,7 @@
cat >conftest.$ac_ext <<_ACEOF cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */ /* confdefs.h. */
_ACEOF _ACEOF
@@ -24448,7 +24448,7 @@ cat >>confdefs.h <<\_ACEOF @@ -15817,7 +15817,7 @@ cat >>confdefs.h <<\_ACEOF
#define ENABLE_LDAP 1 #define ENABLE_LDAP 1
_ACEOF _ACEOF
@ -36,7 +27,7 @@
else else
{ { $as_echo "$as_me:$LINENO: error: *** You enabled LDAP but ldap library is not found." >&5 { { $as_echo "$as_me:$LINENO: error: *** You enabled LDAP but ldap library is not found." >&5
$as_echo "$as_me: error: *** You enabled LDAP but ldap library is not found." >&2;} $as_echo "$as_me: error: *** You enabled LDAP but ldap library is not found." >&2;}
@@ -26363,13 +26363,13 @@ _ACEOF @@ -18216,13 +18216,13 @@ _ACEOF
else else
@ -54,7 +45,7 @@
cat >conftest.$ac_ext <<_ACEOF cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */ /* confdefs.h. */
_ACEOF _ACEOF
@@ -26383,11 +26383,11 @@ cat >>conftest.$ac_ext <<_ACEOF @@ -18236,11 +18236,11 @@ cat >>conftest.$ac_ext <<_ACEOF
#ifdef __cplusplus #ifdef __cplusplus
extern "C" extern "C"
#endif #endif
@ -68,7 +59,7 @@
; ;
return 0; return 0;
} }
@@ -26413,12 +26413,12 @@ $as_echo "$ac_try_echo") >&5 @@ -18266,12 +18266,12 @@ $as_echo "$ac_try_echo") >&5
test "$cross_compiling" = yes || test "$cross_compiling" = yes ||
$as_test_x conftest$ac_exeext $as_test_x conftest$ac_exeext
}; then }; then
@ -83,7 +74,7 @@
fi fi
rm -rf conftest.dSYM rm -rf conftest.dSYM
@@ -26426,19 +26426,19 @@ rm -f core conftest.err conftest.$ac_obj @@ -18279,19 +18279,19 @@ rm -f core conftest.err conftest.$ac_obj
conftest$ac_exeext conftest.$ac_ext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS LIBS=$ac_check_lib_save_LIBS
fi fi
@ -109,7 +100,7 @@
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
fi fi
@@ -26446,18 +26446,18 @@ fi @@ -18299,18 +18299,18 @@ fi
fi fi
@ -136,7 +127,7 @@
cat >conftest.$ac_ext <<_ACEOF cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */ /* confdefs.h. */
_ACEOF _ACEOF
@@ -26465,7 +26465,7 @@ cat confdefs.h >>conftest.$ac_ext @@ -18318,7 +18318,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */ /* end confdefs.h. */
$ac_includes_default $ac_includes_default
@ -145,7 +136,7 @@
_ACEOF _ACEOF
rm -f conftest.$ac_objext rm -f conftest.$ac_objext
if { (ac_try="$ac_compile" if { (ac_try="$ac_compile"
@@ -26498,15 +26498,15 @@ rm -f core conftest.err conftest.$ac_obj @@ -18351,15 +18351,15 @@ rm -f core conftest.err conftest.$ac_obj
$as_echo "$ac_header_compiler" >&6; } $as_echo "$ac_header_compiler" >&6; }
# Is the header present? # Is the header present?
@ -164,7 +155,7 @@
_ACEOF _ACEOF
if { (ac_try="$ac_cpp conftest.$ac_ext" if { (ac_try="$ac_cpp conftest.$ac_ext"
case "(($ac_try" in case "(($ac_try" in
@@ -26540,44 +26540,44 @@ $as_echo "$ac_header_preproc" >&6; } @@ -18393,44 +18393,44 @@ $as_echo "$ac_header_preproc" >&6; }
# So? What about this header? # So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
yes:no: ) yes:no: )
@ -234,3 +225,12 @@
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
fi fi
@@ -18733,7 +18733,7 @@ fi
cat >>confdefs.h <<\_ACEOF
-#define _XOPEN_SOURCE 500
+/*#define _XOPEN_SOURCE 500*/
_ACEOF
{ $as_echo "$as_me:$LINENO: checking whether localtime_r is declared" >&5

18
mail/balsa/files/patch-libbalsa_mailbox_local.c
View file

@ -1,15 +1,15 @@
--- libbalsa/mailbox_local.c.orig Thu Dec 29 01:47:25 2005 --- libbalsa/mailbox_local.c.orig 2009-05-23 03:02:12.000000000 -0400
+++ libbalsa/mailbox_local.c Thu Dec 29 01:48:23 2005 +++ libbalsa/mailbox_local.c 2009-12-25 12:39:52.000000000 -0500
@@ -375,7 +375,7 @@ typedef struct { @@ -440,7 +440,7 @@ libbalsa_mailbox_local_load_config(LibBa
#else /* GLIB_CHECK_VERSION(2, 8, 0) */
int fd; typedef struct {
#endif /* GLIB_CHECK_VERSION(2, 8, 0) */ GArray * array;
- guint (*fileno)(LibBalsaMailboxLocal * local, guint msgno); - guint (*fileno)(LibBalsaMailboxLocal * local, guint msgno);
+ guint (*sti_fileno)(LibBalsaMailboxLocal * local, guint msgno); + guint (*sti_fileno)(LibBalsaMailboxLocal * local, guint msgno);
LibBalsaMailboxLocal *local; LibBalsaMailboxLocal *local;
} LibBalsaMailboxLocalSaveTreeInfo; } LibBalsaMailboxLocalSaveTreeInfo;
@@ -399,9 +399,9 @@ lbm_local_save_tree_item(guint msgno, gu @@ -464,9 +464,9 @@ lbm_local_save_tree_item(guint msgno, gu
if (msgno == 0) { if (msgno == 0) {
info.msgno = msgno; info.msgno = msgno;
info.value.total = a; info.value.total = a;
@ -22,12 +22,12 @@
} else { } else {
info.msgno = msgno; info.msgno = msgno;
info.value.parent = a; info.value.parent = a;
@@ -466,7 +466,7 @@ lbm_local_save_tree(LibBalsaMailboxLocal @@ -524,7 +524,7 @@ lbm_local_save_tree(LibBalsaMailboxLocal
return; return;
} }
- save_info.fileno = LIBBALSA_MAILBOX_LOCAL_GET_CLASS(local)->fileno; - save_info.fileno = LIBBALSA_MAILBOX_LOCAL_GET_CLASS(local)->fileno;
+ save_info.sti_fileno = LIBBALSA_MAILBOX_LOCAL_GET_CLASS(local)->sti_fileno; + save_info.sti_fileno = LIBBALSA_MAILBOX_LOCAL_GET_CLASS(local)->sti_fileno;
save_info.local = local; save_info.local = local;
#if GLIB_CHECK_VERSION(2, 8, 0)
save_info.array = save_info.array =
g_array_new(FALSE, FALSE, sizeof(LibBalsaMailboxLocalTreeInfo));

12
mail/balsa/files/patch-libbalsa_misc.c
View file

@ -1,12 +0,0 @@
--- libbalsa/misc.c.orig Fri Feb 18 18:05:54 2005
+++ libbalsa/misc.c Sat Mar 19 14:44:04 2005
@@ -23,7 +23,9 @@
#include "config.h"
#define _SVID_SOURCE 1
+#ifndef __FreeBSD__
#define _XOPEN_SOURCE 500
+#endif
#include <ctype.h>
#include <dirent.h>
#include <errno.h>

17
mail/balsa/files/patch-src_print-gtk.c
View file

@ -1,17 +0,0 @@
--- src/print-gtk.c.orig Thu May 3 22:59:46 2007
+++ src/print-gtk.c Thu May 3 23:01:30 2007
@@ -378,12 +378,14 @@ get_default_user_units(void)
gchar *e = _("default:mm");
#ifdef HAVE_LANGINFO
+#ifdef _NL_MEASUREMENT_MEASUREMENT
gchar *imperial = NULL;
imperial = nl_langinfo(_NL_MEASUREMENT_MEASUREMENT);
if (imperial && imperial[0] == 2 )
return GTK_UNIT_INCH; /* imperial */
if (imperial && imperial[0] == 1 )
+#endif
return GTK_UNIT_MM; /* metric */
#endif

14
mail/balsa/files/patch-src_threads.h
View file

@ -1,12 +1,10 @@
--- src/threads.h.orig Tue Dec 31 14:06:47 2002 --- src/threads.h.orig 2009-08-30 05:03:26.000000000 -0400
+++ src/threads.h Tue Dec 31 14:07:32 2002 +++ src/threads.h 2009-12-25 12:41:53.000000000 -0500
@@ -21,6 +21,9 @@ @@ -23,6 +23,7 @@
#ifndef __THREADS_H__
#define __THREADS_H__ #define __THREADS_H__
+
#include <unistd.h>
+#include <pthread.h> +#include <pthread.h>
+
/* FIXME: mailbox_lock is really an internal libbalsa mutex. */ /* FIXME: mailbox_lock is really an internal libbalsa mutex. */
extern pthread_mutex_t mailbox_lock; extern pthread_mutex_t mailbox_lock;

1
mail/balsa/pkg-plist
View file

@ -141,6 +141,7 @@ share/locale/en_CA/LC_MESSAGES/balsa.mo
share/locale/en_GB/LC_MESSAGES/balsa.mo share/locale/en_GB/LC_MESSAGES/balsa.mo
share/locale/es/LC_MESSAGES/balsa.mo share/locale/es/LC_MESSAGES/balsa.mo
share/locale/et/LC_MESSAGES/balsa.mo share/locale/et/LC_MESSAGES/balsa.mo
share/locale/eu/LC_MESSAGES/balsa.mo
share/locale/fi/LC_MESSAGES/balsa.mo share/locale/fi/LC_MESSAGES/balsa.mo
share/locale/fr/LC_MESSAGES/balsa.mo share/locale/fr/LC_MESSAGES/balsa.mo
share/locale/ga/LC_MESSAGES/balsa.mo share/locale/ga/LC_MESSAGES/balsa.mo