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

[skayser at users.sourceforge.net]

Revision: 11526
          http://gar.svn.sourceforge.net/gar/?rev=11526&view=rev
Author:   skayser
Date:     2010-11-08 18:26:23 +0000 (Mon, 08 Nov 2010)

Log Message:
-----------
mairix: work towards 0.22

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

Added Paths:
-----------
    csw/mgar/pkg/mairix/trunk/files/changelog.CSW

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

Modified: csw/mgar/pkg/mairix/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mairix/trunk/Makefile	2010-11-08 13:35:25 UTC (rev 11525)
+++ csw/mgar/pkg/mairix/trunk/Makefile	2010-11-08 18:26:23 UTC (rev 11526)
@@ -1,5 +1,5 @@
 GARNAME = mairix
-GARVERSION = 0.21
+GARVERSION = 0.22
 CATEGORIES = utils
 
 DESCRIPTION = An index and search tool for Maildir, MH, or mbox
@@ -17,17 +17,14 @@
     of the matched messages.)
 endef
 
+VENDOR_URL   = http://www.rpcurnow.force9.co.uk/mairix/
 MASTER_SITES = $(SF_MIRROR)
-DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
-SPKG_SOURCEURL = http://www.rpcurnow.force9.co.uk/mairix/
+DISTFILES    = $(GARNAME)-$(GARVERSION).tar.gz
 
 RUNTIME_DEP_PKGS = CSWbzip2 CSWzlib
 
 TEST_SCRIPTS =
 
-# Mention option -x in the help message (-h)
-PATCHFILES  = patch-excerpt.diff
-
 # configure doesn't understand most of the $(DIRPATHS) arguments
 CONFIGURE_ARGS = --prefix=/opt/csw
 CONFIGURE_ARGS += --bindir=/opt/csw/bin
@@ -53,3 +50,10 @@
 	@ginstall -d $(DOCDEST)
 	@$(foreach DOC,$(DOCS),ginstall -m 644 $(WORKSRC)/$(DOC) $(DOCDEST);)
 	$(MAKECOOKIE)
+
+# Install changelog.CSW
+post-merge: $(foreach P,$(_PKG_SPECS),install-changelog-$P)
+install-changelog-%:
+	ginstall -D $(FILEDIR)/changelog.CSW \
+		$(PKGROOT)$(docdir)/$(call catalogname,$*)/changelog.CSW
+	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/mairix/trunk/checksums
===================================================================
--- csw/mgar/pkg/mairix/trunk/checksums	2010-11-08 13:35:25 UTC (rev 11525)
+++ csw/mgar/pkg/mairix/trunk/checksums	2010-11-08 18:26:23 UTC (rev 11526)
@@ -1,2 +1 @@
-821619895931711c370f51f3442a0ded  download/mairix-0.21.tar.gz
-a8f4dce18bc0562a85c0cc2ae2dd6f41  download/patch-excerpt.diff
+6c6aaca19c2b2de3bf567b856705ce1a  mairix-0.22.tar.gz

Added: csw/mgar/pkg/mairix/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/mairix/trunk/files/changelog.CSW	                        (rev 0)
+++ csw/mgar/pkg/mairix/trunk/files/changelog.CSW	2010-11-08 18:26:23 UTC (rev 11526)
@@ -0,0 +1,5 @@
+mairix (0.22,REV=2010.11.08)
+
+  * Updated to 0.22. (Fixes #4598).
+
+ -- Sebastian Kayser <skayser at opencsw.org>  Mon,  8 Nov 2010 18:42:33 +0100

Deleted: csw/mgar/pkg/mairix/trunk/files/patch-excerpt.diff
===================================================================
--- csw/mgar/pkg/mairix/trunk/files/patch-excerpt.diff	2010-11-08 13:35:25 UTC (rev 11525)
+++ csw/mgar/pkg/mairix/trunk/files/patch-excerpt.diff	2010-11-08 18:26:23 UTC (rev 11526)
@@ -1,11 +0,0 @@
-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"


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