[csw-devel] SF.net SVN: gar:[19363] csw/mgar/pkg/nmh/trunk

[opk at users.sourceforge.net]

Revision: 19363
          http://gar.svn.sourceforge.net/gar/?rev=19363&view=rev
Author:   opk
Date:     2012-10-02 15:54:45 +0000 (Tue, 02 Oct 2012)
Log Message:
-----------
nmh/trunk: update to 1.5

Modified Paths:
--------------
    csw/mgar/pkg/nmh/trunk/Makefile
    csw/mgar/pkg/nmh/trunk/checksums
    csw/mgar/pkg/nmh/trunk/files/0000-skip-chgrp-of-inc.patch

Added Paths:
-----------
    csw/mgar/pkg/nmh/trunk/files/0001-use-csw-locations.patch

Modified: csw/mgar/pkg/nmh/trunk/Makefile
===================================================================
--- csw/mgar/pkg/nmh/trunk/Makefile	2012-10-02 15:33:58 UTC (rev 19362)
+++ csw/mgar/pkg/nmh/trunk/Makefile	2012-10-02 15:54:45 UTC (rev 19363)
@@ -1,6 +1,6 @@
 # $Id$
 NAME = nmh
-VERSION = 1.4
+VERSION = 1.5
 CATEGORIES = apps
 GARTYPE = v2
 
@@ -18,8 +18,7 @@
 SPKG_SOURCEURL = http://www.nongnu.org/nmh/
 UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz
 
-RUNTIME_DEP_PKGS += CSWlibiconv2
-PATCHFILES += 0000-skip-chgrp-of-inc.patch
+RUNTIME_DEP_PKGS += CSWlibreadline6 CSWlibiconv2
 LICENSE = COPYRIGHT
 PRESERVECONF = /etc/opt/csw/nmh/mts.conf
 
@@ -28,4 +27,11 @@
   --libdir=$(libdir)/nmh --sysconfdir=$(sysconfdir)/nmh 
 TEST_SCRIPTS =
 
+EXTRA_MERGE_EXCLUDE_FILES = $(datadir)/doc/nmh/(contrib.*|INSTALL|COPYRIGHT|README.developers|README.manpages)
+
+CHECKPKG_OVERRIDES_CSWnmh += file-with-bad-content|/usr/local|root/opt/csw/share/doc/nmh/FAQ
+CHECKPKG_OVERRIDES_CSWnmh += file-with-bad-content|/usr/local|root/opt/csw/share/doc/nmh/MAIL.FILTERING
+CHECKPKG_OVERRIDES_CSWnmh += file-with-bad-content|/export/home|root/opt/csw/share/doc/nmh/README-ATTACHMENTS
+
+
 include gar/category.mk

Modified: csw/mgar/pkg/nmh/trunk/checksums
===================================================================
--- csw/mgar/pkg/nmh/trunk/checksums	2012-10-02 15:33:58 UTC (rev 19362)
+++ csw/mgar/pkg/nmh/trunk/checksums	2012-10-02 15:54:45 UTC (rev 19363)
@@ -1 +1 @@
-ef55286a821c53dc52b8974977c011ca  nmh-1.4.tar.gz
+5a7bc5a157f4428f7660bb882e842375  nmh-1.5.tar.gz

Modified: csw/mgar/pkg/nmh/trunk/files/0000-skip-chgrp-of-inc.patch
===================================================================
--- csw/mgar/pkg/nmh/trunk/files/0000-skip-chgrp-of-inc.patch	2012-10-02 15:33:58 UTC (rev 19362)
+++ csw/mgar/pkg/nmh/trunk/files/0000-skip-chgrp-of-inc.patch	2012-10-02 15:54:45 UTC (rev 19363)
@@ -1,5 +1,5 @@
 From db3d12ec17a80fad52a5a463ad42bfbc6d70ad91 Mon Sep 17 00:00:00 2001
-From: Oliver Kiddle <oliver.kiddle at esa.int>
+From: Oliver Kiddle <opk at opencsw.org>
 Date: Mon, 25 Oct 2010 12:52:51 +0200
 Subject: [PATCH] skip chgrp of inc
 

Added: csw/mgar/pkg/nmh/trunk/files/0001-use-csw-locations.patch
===================================================================
--- csw/mgar/pkg/nmh/trunk/files/0001-use-csw-locations.patch	                        (rev 0)
+++ csw/mgar/pkg/nmh/trunk/files/0001-use-csw-locations.patch	2012-10-02 15:54:45 UTC (rev 19363)
@@ -0,0 +1,25 @@
+From dcd309fb58c93684a68cde8baeb0fa09b03de8f8 Mon Sep 17 00:00:00 2001
+From: Oliver Kiddle <opk at opencsw.org>
+Date: Tue, 2 Oct 2012 17:46:52 +0200
+Subject: [PATCH 3/3] use csw locations
+
+---
+ docs/COMPLETION-ZSH |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/docs/COMPLETION-ZSH b/docs/COMPLETION-ZSH
+index 5c10cc8..d60f789 100644
+--- a/docs/COMPLETION-ZSH
++++ b/docs/COMPLETION-ZSH
+@@ -93,7 +93,7 @@ mhfile () {
+   local mhfpath file
+   # EDIT ME
+   # Array containing all the places nmh will look for templates etc.
+-  mhfpath=(~/Mail /usr/local/nmh/lib)
++  mhfpath=(~/Mail /etc/opt/csw/nmh /opt/csw/etc/nmh)
+ 
+   # Emulate completeinword behaviour as appropriate
+   local wordstr
+-- 
+1.7.10.3
+

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