Date: Tue, 23 Jul 2002 21:23:13 +0200 (CEST) From: "Simon 'corecode' Schubert" <corecode@corecode.ath.cx> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/40931: maintainer-update mail/sylpheed-claws to upstream version 0.8.0 Message-ID: <200207231923.g6NJNDVx009845@terrorfish.uni.stoert.net>
next in thread | raw e-mail | index | archive | help
>Number: 40931
>Category: ports
>Synopsis: maintainer-update mail/sylpheed-claws to upstream version 0.8.0
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Tue Jul 23 12:30:01 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator: Simon 'corecode' Schubert
>Release: FreeBSD 5.0-CURRENT i386
>Organization:
>Environment:
System: FreeBSD terrorfish.uni.stoert.net 5.0-CURRENT FreeBSD 5.0-CURRENT #11: Mon Jul 22 16:40:29 CEST 2002 corecode@terrorfish.uni.stoert.net:/usr/obj/k7/usr/src/sys/TERRORFISH i386
>Description:
o update to upstream version 0.8.0
o additional patch which fixes searching. this has been submitted
to the upstream authors but not yet been incorporated.
>How-To-Repeat:
>Fix:
Index: Makefile
===================================================================
RCS file: /usr/local/cvs/ports/sylpheed-claws/Makefile,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- Makefile 20 Jun 2002 18:06:15 -0000 1.17
+++ Makefile 23 Jul 2002 17:27:26 -0000 1.18
@@ -6,7 +6,7 @@
#
PORTNAME= sylpheed-claws
-PORTVERSION= 0.7.8
+PORTVERSION= 0.8.0
CATEGORIES= mail news ipv6
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= sylpheed-claws
@@ -29,6 +29,8 @@
USE_GTK= yes
USE_REINPLACE= yes
+MAN1= sylpheed-claws.1
+
CONFIGURE_ARGS= --program-suffix="-claws" --enable-ipv6
CONFIGURE_ENV= CFLAGS="${CFLAGS}" CPPFLAGS="-I${LOCALBASE}/include" \
@@ -107,7 +109,7 @@
post-patch:
@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" \
${WRKSRC}/tools/README.sylprint ${WRKSRC}/tools/sylprint.pl
- @${REINPLACE_CMD} -e "s|po intl libkcc|po libkcc|" ${WRKSRC}/Makefile.in
+ @${REINPLACE_CMD} -e "s|po intl src|po src|" ${WRKSRC}/Makefile.in
.if defined(NOPORTDOCS)
@${REINPLACE_CMD} -e 's|src manual faq tools|src tools|' ${WRKSRC}/Makefile.in
.endif
@@ -117,7 +119,7 @@
post-install:
.if !defined(NOPORTDOCS)
-.for i in NEWS README README.jp README.claws ReleaseNotes.claws TODO TODO.jp tools/README.sylprint
+.for i in NEWS README README.jp README.claws RELEASE_NOTES.claws TODO TODO.jp tools/README.sylprint
@${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
.endfor
@${INSTALL_DATA} ${WRKSRC}/tools/README ${DOCSDIR}/README.tools
Index: distinfo
===================================================================
RCS file: /usr/local/cvs/ports/sylpheed-claws/distinfo,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- distinfo 16 Jun 2002 17:46:38 -0000 1.7
+++ distinfo 23 Jul 2002 17:27:26 -0000 1.8
@@ -1,2 +1,2 @@
-MD5 (sylpheed-0.7.8claws.tar.bz2) = 94724f28b92a20297783aa29625b558c
+MD5 (sylpheed-0.8.0claws.tar.bz2) = 17340f13eb02a9c01a54286727fbe8c0
MD5 (sylpheed-theme-pak2.tar.bz2) = e62d7a6188d1212e0ceac8ed7aaecd62
Index: pkg-plist
===================================================================
RCS file: /usr/local/cvs/ports/sylpheed-claws/pkg-plist,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- pkg-plist 16 Jun 2002 18:14:35 -0000 1.7
+++ pkg-plist 23 Jul 2002 17:27:26 -0000 1.8
@@ -8,7 +8,7 @@
%%PORTDOCS%%share/doc/sylpheed-claws/README.jp
%%PORTDOCS%%share/doc/sylpheed-claws/README.sylprint
%%PORTDOCS%%share/doc/sylpheed-claws/README.tools
-%%PORTDOCS%%share/doc/sylpheed-claws/ReleaseNotes.claws
+%%PORTDOCS%%share/doc/sylpheed-claws/RELEASE_NOTES.claws
%%PORTDOCS%%share/doc/sylpheed-claws/TODO
%%PORTDOCS%%share/doc/sylpheed-claws/TODO.jp
%%PORTDOCS%%share/doc/sylpheed-claws/faq/de/sylpheed-faq-1.html
Index: files/patch-configure
===================================================================
RCS file: /usr/local/cvs/ports/sylpheed-claws/files/patch-configure,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- files/patch-configure 18 Jun 2002 03:40:59 -0000 1.6
+++ files/patch-configure 23 Jul 2002 17:27:26 -0000 1.7
@@ -1,5 +1,5 @@
---- configure.orig Sat Jun 15 10:50:09 2002
-+++ configure Sun Jun 16 18:02:59 2002
+--- configure.orig Tue Jul 23 10:51:33 2002
++++ configure Tue Jul 23 15:46:26 2002
@@ -1172,7 +1172,7 @@
PATH_SEPARATOR="$ac_path_separator"
rm -f conftest.sh
@@ -8,8 +8,8 @@
+PACKAGE=sylpheed-claws
MAJOR_VERSION=0
- MINOR_VERSION=7
-@@ -1612,7 +1612,7 @@
+ MINOR_VERSION=8
+@@ -1653,7 +1653,7 @@
fi
@@ -18,7 +18,7 @@
SYLPHEED_GNOME_TRUE=
SYLPHEED_GNOME_FALSE='#'
else
-@@ -7019,7 +7019,7 @@
+@@ -7054,7 +7054,7 @@
fi
# This can be used to rebuild libtool when needed
@@ -27,7 +27,15 @@
# Always use our own libtool.
LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -9932,8 +9932,8 @@
+@@ -9862,6 +9862,7 @@
+ #line 9862 "configure"
+ #include "confdefs.h"
+ #include <libintl.h>
++#define _nl_domain_bindings _nl_domain_bindings__ /* configure is retarded. */
+ extern int _nl_msg_cat_cntr;
+ extern int *_nl_domain_bindings;
+ extern
+@@ -9967,8 +9968,8 @@
INTLOBJS="\$(GETTOBJS)"
BUILD_INCLUDED_LIBINTL=yes
USE_INCLUDED_LIBINTL=yes
@@ -38,7 +46,7 @@
LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
fi
-@@ -10019,9 +10019,9 @@
+@@ -10054,9 +10055,9 @@
localedir='${prefix}/${DATADIRNAME}/locale'
@@ -50,29 +58,12 @@
if test "x${datadir}" = 'x${prefix}/share'; then
if test "x${prefix}" = "xNONE"; then
-@@ -11633,7 +11633,7 @@
-
- if test "$ac_cv_enable_ldap" = yes; then
- CFLAGS="$CFLAGS `$GLIB_CONFIG --cflags gthread`"
-- LIBS="$LIBS -lldap -llber -lpthread -lresolv `$GLIB_CONFIG --libs gthread`"
-+ LIBS="$LIBS -lldap -llber ${PTHREAD_LIBS} `$GLIB_CONFIG --libs gthread`"
- fi
- else
- echo "$as_me:11639: result: no" >&5
-@@ -14194,7 +14194,7 @@
+@@ -14555,7 +14556,7 @@
fi
done
--ac_config_files="$ac_config_files Makefile sylpheed.spec ac/Makefile libkcc/Makefile src/version.h src/Makefile faq/Makefile faq/de/Makefile faq/en/Makefile faq/es/Makefile faq/fr/Makefile faq/it/Makefile manual/Makefile manual/de/Makefile manual/en/Makefile manual/es/Makefile manual/fr/Makefile manual/ja/Makefile tools/Makefile intl/Makefile po/Makefile.in"
-+ac_config_files="$ac_config_files Makefile sylpheed.spec ac/Makefile libkcc/Makefile src/version.h src/Makefile faq/Makefile faq/de/Makefile faq/en/Makefile faq/es/Makefile faq/fr/Makefile faq/it/Makefile manual/Makefile manual/de/Makefile manual/en/Makefile manual/es/Makefile manual/fr/Makefile manual/ja/Makefile tools/Makefile po/Makefile.in"
+-ac_config_files="$ac_config_files Makefile sylpheed.spec intl/Makefile ac/Makefile po/Makefile.in src/version.h src/Makefile faq/Makefile faq/de/Makefile faq/en/Makefile faq/es/Makefile faq/fr/Makefile faq/it/Makefile man/Makefile manual/Makefile manual/de/Makefile manual/en/Makefile manual/es/Makefile manual/fr/Makefile manual/ja/Makefile tools/Makefile"
++ac_config_files="$ac_config_files Makefile sylpheed.spec ac/Makefile po/Makefile.in src/version.h src/Makefile faq/Makefile faq/de/Makefile faq/en/Makefile faq/es/Makefile faq/fr/Makefile faq/it/Makefile man/Makefile manual/Makefile manual/de/Makefile manual/en/Makefile manual/es/Makefile manual/fr/Makefile manual/ja/Makefile tools/Makefile"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure
-@@ -14539,7 +14539,6 @@
- "manual/fr/Makefile" ) CONFIG_FILES="$CONFIG_FILES manual/fr/Makefile" ;;
- "manual/ja/Makefile" ) CONFIG_FILES="$CONFIG_FILES manual/ja/Makefile" ;;
- "tools/Makefile" ) CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;;
-- "intl/Makefile" ) CONFIG_FILES="$CONFIG_FILES intl/Makefile" ;;
- "po/Makefile.in" ) CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
- "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
- "default-2" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-2" ;;
Index: files/patch-src-summary_search.c
===================================================================
RCS file: files/patch-src-summary_search.c
diff -N files/patch-src-summary_search.c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-src-summary_search.c 23 Jul 2002 17:27:26 -0000 1.1
@@ -0,0 +1,126 @@
+--- src/summary_search.c.orig Wed Jun 12 07:49:20 2002
++++ src/summary_search.c Tue Jul 23 19:14:41 2002
+@@ -224,10 +224,6 @@
+ gboolean backward;
+ gboolean search_all;
+ gboolean all_searched = FALSE;
+- gboolean from_matched;
+- gboolean to_matched;
+- gboolean subj_matched;
+- gboolean body_matched;
+ gchar *body_str;
+ wchar_t *wcs_hs, *fromwcs, *towcs, *subjwcs;
+ wchar_t *(* WCSFindFunc) (const wchar_t *haystack,
+@@ -260,6 +256,7 @@
+ towcs = (wchar_t *)GTK_ENTRY(to_entry)->text;
+ subjwcs = (wchar_t *)GTK_ENTRY(subject_entry)->text;
+ body_str = gtk_entry_get_text(GTK_ENTRY(body_entry));
++ wcs_hs = NULL;
+
+ if (search_all) {
+ gtk_clist_freeze(GTK_CLIST(ctree));
+@@ -285,7 +282,13 @@
+ if (*body_str)
+ main_window_cursor_wait(summaryview->mainwin);
+
+- for (;;) {
++ for (;; node = backward ? GTK_CTREE_NODE_PREV(node)
++ : GTK_CTREE_NODE_NEXT(node)) {
++ if (wcs_hs) {
++ g_free(wcs_hs);
++ wcs_hs = NULL;
++ }
++
+ if (!node) {
+ gchar *str;
+ AlertValue val;
+@@ -324,58 +327,49 @@
+ break;
+ }
+
+- from_matched = to_matched = subj_matched = body_matched = FALSE;
+-
+ msginfo = gtk_ctree_node_get_row_data(ctree, node);
+
+- if (*fromwcs && msginfo->from) {
++ if (*fromwcs) {
++ if (msginfo->from == NULL)
++ continue;
+ wcs_hs = strdup_mbstowcs(msginfo->from);
+- if (wcs_hs && WCSFindFunc(wcs_hs, fromwcs) != NULL)
+- from_matched = TRUE;
+- g_free(wcs_hs);
++ if (!(wcs_hs && WCSFindFunc(wcs_hs, fromwcs) != NULL))
++ continue;
+ }
+- if (*towcs && msginfo->to) {
++ if (*towcs) {
++ if (msginfo->to == NULL)
++ continue;
+ wcs_hs = strdup_mbstowcs(msginfo->to);
+- if (wcs_hs && WCSFindFunc(wcs_hs, towcs) != NULL)
+- to_matched = TRUE;
+- g_free(wcs_hs);
++ if (!(wcs_hs && WCSFindFunc(wcs_hs, towcs) != NULL))
++ continue;
+ }
+- if (*subjwcs && msginfo->subject) {
++ if (*subjwcs) {
++ if (msginfo->subject == NULL)
++ continue;
+ wcs_hs = strdup_mbstowcs(msginfo->subject);
+- if (wcs_hs && WCSFindFunc(wcs_hs, subjwcs) != NULL)
+- subj_matched = TRUE;
+- g_free(wcs_hs);
++ if (!(wcs_hs && WCSFindFunc(wcs_hs, subjwcs) != NULL))
++ continue;
+ }
+ if (*body_str) {
+- if (procmime_find_string(msginfo, body_str, case_sens))
+- body_matched = TRUE;
++ if (!procmime_find_string(msginfo, body_str, case_sens))
++ continue;
+ }
+
+- if (from_matched || to_matched || subj_matched || body_matched) {
+- if (search_all)
+- gtk_ctree_select(ctree, node);
+- else {
+- if (messageview_is_visible
+- (summaryview->messageview)) {
+- summary_unlock(summaryview);
+- summary_select_node
+- (summaryview, node, TRUE, TRUE);
+- summary_lock(summaryview);
+- if (body_matched) {
+- messageview_search_string
+- (summaryview->messageview,
+- body_str, case_sens);
+- }
+- } else {
+- summary_select_node
+- (summaryview, node, FALSE, TRUE);
+- }
+- break;
+- }
++ if (search_all)
++ gtk_ctree_select(ctree, node);
++ else {
++ if (messageview_is_visible(summaryview->messageview)) {
++ summary_unlock(summaryview);
++ summary_select_node(summaryview, node, TRUE, TRUE);
++ summary_lock(summaryview);
++ if (*body_str)
++ messageview_search_string(
++ summaryview->messageview,
++ body_str, case_sens);
++ } else
++ summary_select_node(summaryview, node, FALSE, TRUE);
++ break;
+ }
+-
+- node = backward ? GTK_CTREE_NODE_PREV(node)
+- : GTK_CTREE_NODE_NEXT(node);
+ }
+
+ if (*body_str)
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200207231923.g6NJNDVx009845>