Update to version 9.26.

PR:		25387
Submitted by:	George Reid <greid@ukug.uk.freebsd.org>

10 files changed, 52 insertions, 8 deletions

diff --git a/mail/heirloom-mailx/Makefile b/mail/heirloom-mailx/Makefile
index 2bec96dc8bdf..5ceaea906350 100644
--- a/mail/heirloom-mailx/Makefile
+++ b/mail/heirloom-mailx/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	nail
-PORTVERSION=	9.25
+PORTVERSION=	9.26
 CATEGORIES=	mail
 MASTER_SITES=	http://omnibus.ruf.uni-freiburg.de/~gritter/archive/nail/
 
diff --git a/mail/heirloom-mailx/distinfo b/mail/heirloom-mailx/distinfo
index 55024aebe8ff..867440789efc 100644
--- a/mail/heirloom-mailx/distinfo
+++ b/mail/heirloom-mailx/distinfo
@@ -1 +1 @@
-MD5 (nail-9.25.tar.gz) = 82127b577bc66298085181499250d93c
+MD5 (nail-9.26.tar.gz) = 05df240bab19b609680e0bcaa1ea6933
diff --git a/mail/heirloom-mailx/files/patch-ab b/mail/heirloom-mailx/files/patch-ab
new file mode 100644
index 000000000000..74512a6c1871
--- /dev/null
+++ b/mail/heirloom-mailx/files/patch-ab
@@ -0,0 +1,13 @@
+--- Makefile.in.orig	Mon Feb 26 16:15:11 2001
++++ Makefile.in	Mon Feb 26 16:20:32 2001
+@@ -392,8 +392,8 @@
+ 
+ 
+ install-data-local:
+-	-test -f $(DESTDIR)/etc/nail.rc || \
+-		$(INSTALL_DATA) $(srcdir)/nail.rc $(DESTDIR)/etc/nail.rc
++	-test -f $(sysconfdir)/nail.rc || \
++		$(INSTALL_DATA) $(srcdir)/nail.rc $(sysconfdir)/nail.rc
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/mail/heirloom-mailx/files/patch-ac b/mail/heirloom-mailx/files/patch-ac
new file mode 100644
index 000000000000..cceb71d283d5
--- /dev/null
+++ b/mail/heirloom-mailx/files/patch-ac
@@ -0,0 +1,11 @@
+--- configure.orig	Sat Feb 17 16:24:48 2001
++++ configure	Mon Feb 26 19:35:15 2001
+@@ -1335,7 +1335,7 @@
+ test "$libdir" = '${exec_prefix}/lib' && libdir=${prefix}/lib
+ test "$sysconfdir" = '/etc' && sysconfdir=/etc
+ cat >> confdefs.h <<EOF
+-#define PATH_MASTER_RC "/etc/nail.rc"
++#define PATH_MASTER_RC "`eval echo ${sysconfdir}/nail.rc`"
+ EOF
+ 
+ 
diff --git a/mail/heirloom-mailx/pkg-plist b/mail/heirloom-mailx/pkg-plist
index 96a5a27725b0..7ff95a6bf971 100644
--- a/mail/heirloom-mailx/pkg-plist
+++ b/mail/heirloom-mailx/pkg-plist
@@ -1,4 +1,2 @@
 bin/nail
 etc/nail.rc
-lib/nail.help
-lib/nail.tildehelp
diff --git a/mail/nail/Makefile b/mail/nail/Makefile
index 2bec96dc8bdf..5ceaea906350 100644
--- a/mail/nail/Makefile
+++ b/mail/nail/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	nail
-PORTVERSION=	9.25
+PORTVERSION=	9.26
 CATEGORIES=	mail
 MASTER_SITES=	http://omnibus.ruf.uni-freiburg.de/~gritter/archive/nail/
 
diff --git a/mail/nail/distinfo b/mail/nail/distinfo
index 55024aebe8ff..867440789efc 100644
--- a/mail/nail/distinfo
+++ b/mail/nail/distinfo
@@ -1 +1 @@
-MD5 (nail-9.25.tar.gz) = 82127b577bc66298085181499250d93c
+MD5 (nail-9.26.tar.gz) = 05df240bab19b609680e0bcaa1ea6933
diff --git a/mail/nail/files/patch-ab b/mail/nail/files/patch-ab
new file mode 100644
index 000000000000..74512a6c1871
--- /dev/null
+++ b/mail/nail/files/patch-ab
@@ -0,0 +1,13 @@
+--- Makefile.in.orig	Mon Feb 26 16:15:11 2001
++++ Makefile.in	Mon Feb 26 16:20:32 2001
+@@ -392,8 +392,8 @@
+ 
+ 
+ install-data-local:
+-	-test -f $(DESTDIR)/etc/nail.rc || \
+-		$(INSTALL_DATA) $(srcdir)/nail.rc $(DESTDIR)/etc/nail.rc
++	-test -f $(sysconfdir)/nail.rc || \
++		$(INSTALL_DATA) $(srcdir)/nail.rc $(sysconfdir)/nail.rc
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/mail/nail/files/patch-ac b/mail/nail/files/patch-ac
new file mode 100644
index 000000000000..cceb71d283d5
--- /dev/null
+++ b/mail/nail/files/patch-ac
@@ -0,0 +1,11 @@
+--- configure.orig	Sat Feb 17 16:24:48 2001
++++ configure	Mon Feb 26 19:35:15 2001
+@@ -1335,7 +1335,7 @@
+ test "$libdir" = '${exec_prefix}/lib' && libdir=${prefix}/lib
+ test "$sysconfdir" = '/etc' && sysconfdir=/etc
+ cat >> confdefs.h <<EOF
+-#define PATH_MASTER_RC "/etc/nail.rc"
++#define PATH_MASTER_RC "`eval echo ${sysconfdir}/nail.rc`"
+ EOF
+ 
+ 
diff --git a/mail/nail/pkg-plist b/mail/nail/pkg-plist
index 96a5a27725b0..7ff95a6bf971 100644
--- a/mail/nail/pkg-plist
+++ b/mail/nail/pkg-plist
@@ -1,4 +1,2 @@
 bin/nail
 etc/nail.rc
-lib/nail.help
-lib/nail.tildehelp