SF.net SVN: gar:[23795] csw/mgar/pkg/nmh/trunk

[opk at users.sourceforge.net]

Revision: 23795
          http://sourceforge.net/p/gar/code/23795
Author:   opk
Date:     2014-06-16 15:07:42 +0000 (Mon, 16 Jun 2014)
Log Message:
-----------
update nmh to 1.6

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

Added Paths:
-----------
    csw/mgar/pkg/nmh/trunk/files/0000-remove-problematic-include.patch

Modified: csw/mgar/pkg/nmh/trunk/Makefile
===================================================================
--- csw/mgar/pkg/nmh/trunk/Makefile	2014-06-15 16:00:09 UTC (rev 23794)
+++ csw/mgar/pkg/nmh/trunk/Makefile	2014-06-16 15:07:42 UTC (rev 23795)
@@ -1,6 +1,6 @@
 # $Id$
 NAME = nmh
-VERSION = 1.5
+VERSION = 1.6
 GARTYPE = v2
 
 DESCRIPTION = Powerful electronic mail handling system
@@ -21,7 +21,8 @@
 LICENSE = COPYRIGHT
 PRESERVECONF = /etc/opt/csw/nmh/mts.conf
 
-PATCHFILES += 0001-use-csw-locations.patch
+PATCHFILES += 0000-remove-problematic-include.patch \
+  0001-use-csw-locations.patch
 
 CONFIGURE_ARGS = --enable-pop --enable-masquerade='' --with-mts=sendmail \
   --prefix=$(prefix) --mandir=$(mandir) --datadir=$(datadir)/nmh \
@@ -30,9 +31,4 @@
 
 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	2014-06-15 16:00:09 UTC (rev 23794)
+++ csw/mgar/pkg/nmh/trunk/checksums	2014-06-16 15:07:42 UTC (rev 23795)
@@ -1 +1 @@
-5a7bc5a157f4428f7660bb882e842375  nmh-1.5.tar.gz
+766ff2d37736aef76243df9c6610cb77  nmh-1.6.tar.gz

Added: csw/mgar/pkg/nmh/trunk/files/0000-remove-problematic-include.patch
===================================================================
--- csw/mgar/pkg/nmh/trunk/files/0000-remove-problematic-include.patch	                        (rev 0)
+++ csw/mgar/pkg/nmh/trunk/files/0000-remove-problematic-include.patch	2014-06-16 15:07:42 UTC (rev 23795)
@@ -0,0 +1,24 @@
+From 627944fb7bafc470a64c0f46a5d1ca9116aa64d7 Mon Sep 17 00:00:00 2001
+From: Oliver Kiddle <opk at opencsw.org>
+Date: Mon, 16 Jun 2014 16:42:00 +0200
+Subject: [PATCH] remove problematic include
+
+---
+ sbr/terminal.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/sbr/terminal.c b/sbr/terminal.c
+index 14eca97..9c5d538 100644
+--- a/sbr/terminal.c
++++ b/sbr/terminal.c
+@@ -14,7 +14,6 @@
+ #include <sys/ioctl.h>
+ 
+ #include <curses.h>
+-#include <term.h>
+ 
+ #ifdef WINSIZE_IN_PTEM
+ # include <sys/stream.h>
+-- 
+1.8.4.1
+

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