[csw-devel] SF.net SVN: gar:[3572] csw/mgar/pkg/mairix/trunk

[skayser at users.sourceforge.net]

Revision: 3572
          http://gar.svn.sourceforge.net/gar/?rev=3572&view=rev
Author:   skayser
Date:     2009-03-03 19:13:22 +0000 (Tue, 03 Mar 2009)

Log Message:
-----------
mairix: work in progress

Modified Paths:
--------------
    csw/mgar/pkg/mairix/trunk/Makefile
    csw/mgar/pkg/mairix/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/mairix/trunk/files/patch-excerpt.diff

Modified: csw/mgar/pkg/mairix/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mairix/trunk/Makefile	2009-03-03 18:06:43 UTC (rev 3571)
+++ csw/mgar/pkg/mairix/trunk/Makefile	2009-03-03 19:13:22 UTC (rev 3572)
@@ -2,7 +2,7 @@
 GARVERSION = 0.21
 CATEGORIES = utils
 
-DESCRIPTION = An index and search tool for Maildir, MH, or mbox format email folders.
+DESCRIPTION = An index and search tool for Maildir, MH, or mbox
 define BLURB
   mairix is a program for indexing and searching email messages stored in
   Maildir, MH or mbox folders.
@@ -25,19 +25,32 @@
 
 TEST_SCRIPTS =
 
+# Mention option -x in the help message (-h) and provide fine grained
+# timestamps (still needs a patch to rfc822.c, where HMS are dropped)
+PATCHFILES  = patch-excerpt.diff
+
 # configure doesn't understand most of the $(DIRPATHS) arguments
 CONFIGURE_ARGS = --prefix=/opt/csw
 CONFIGURE_ARGS += --bindir=/opt/csw/bin
 CONFIGURE_ARGS += --infodir=/opt/csw/share/info
 CONFIGURE_ARGS += --mandir=/opt/csw/share/man
 
+#GARFLAVOR = DBG
+
 include gar/category.mk
 
+# configure uses bashisms but doesn't declare bash as its interpreter
+pre-configure-modulated:
+	@perl -pi -e 's|#!/bin/sh|#!/bin/bash|' $(WORKSRC)/configure
+	$(MAKECOOKIE)
+
 pre-build-modulated:
 	@perl -pi -e 's/__inline__/inline/' $(WORKSRC)/memmac.h
+	$(MAKECOOKIE)
 
 post-install-modulated: DOCS = ACKNOWLEDGEMENTS NEWS README dotmairixrc.eg
 post-install-modulated: DOCDEST = $(DESTDIR)$(docdir)/$(GARNAME)
 post-install-modulated:
 	@ginstall -d $(DOCDEST)
 	@$(foreach DOC,$(DOCS),ginstall -m 644 $(WORKSRC)/$(DOC) $(DOCDEST);)
+	$(MAKECOOKIE)

Modified: csw/mgar/pkg/mairix/trunk/checksums
===================================================================
--- csw/mgar/pkg/mairix/trunk/checksums	2009-03-03 18:06:43 UTC (rev 3571)
+++ csw/mgar/pkg/mairix/trunk/checksums	2009-03-03 19:13:22 UTC (rev 3572)
@@ -1 +1,2 @@
 821619895931711c370f51f3442a0ded  download/mairix-0.21.tar.gz
+e14ad9070d252bd7bb2ddef19915c145  download/patch-excerpt.diff

Added: csw/mgar/pkg/mairix/trunk/files/patch-excerpt.diff
===================================================================
--- csw/mgar/pkg/mairix/trunk/files/patch-excerpt.diff	                        (rev 0)
+++ csw/mgar/pkg/mairix/trunk/files/patch-excerpt.diff	2009-03-03 19:13:22 UTC (rev 3572)
@@ -0,0 +1,23 @@
+diff -ur mairix-0.21.org/mairix.c mairix-0.21/mairix.c
+--- mairix-0.21.org/mairix.c	2007-06-22 21:18:00.000000000 +0100
++++ mairix-0.21/mairix.c	2009-03-03 14:17:23.119599595 +0000
+@@ -410,6 +410,7 @@
+          "-t           : include all messages in same threads as matching messages\n"
+          "-o <mfolder> : override setting of mfolder from mairixrc file\n"
+          "-r           : force raw output regardless of mformat setting in mairixrc file\n"
++         "-x           : show an excerpt of the headers of the matching messages\n"
+          "expr_i       : search expression (all expr's AND'ed together):\n"
+          "    word          : match word in message body and major headers\n"
+          "    t:word        : match word in To: header\n"
+diff -ur mairix-0.21.org/search.c mairix-0.21/search.c
+--- mairix-0.21.org/search.c	2007-06-22 21:18:00.000000000 +0100
++++ mairix-0.21/search.c	2009-03-03 14:19:30.048952226 +0000
+@@ -1208,7 +1208,7 @@
+             if (parsed->hdrs.from)    printf("  From:    %s\n", parsed->hdrs.from);
+             if (parsed->hdrs.subject) printf("  Subject: %s\n", parsed->hdrs.subject);
+             thetm = gmtime(&parsed->hdrs.date);
+-            strftime(datebuf, sizeof(datebuf), "%a, %d %b %Y", thetm);
++            strftime(datebuf, sizeof(datebuf), "%a, %d %b %Y, %H:%M:%S", thetm);
+             printf("  Date:     %s\n", datebuf);
+             free_rfc822(parsed);
+           }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.