* Fix build problem caused by strcasestr().

* Add support for character set conversions using iconv().

14 files changed, 170 insertions, 44 deletions

diff --git a/mail/heirloom-mailx/Makefile b/mail/heirloom-mailx/Makefile
index 69b0f221982c..4f6e3b97e747 100644
--- a/mail/heirloom-mailx/Makefile
+++ b/mail/heirloom-mailx/Makefile
@@ -7,12 +7,21 @@
 
 PORTNAME=	nail
 PORTVERSION=	9.29
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://omnibus.ruf.uni-freiburg.de/~gritter/archive/nail/
 
 MAINTAINER=	ports@FreeBSD.org
 
-GNU_CONFIGURE=	yes
+LIB_DEPENDS=	iconv.2:${PORTSDIR}/converters/iconv
+
+USE_AUTOCONF=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib" LIBS="-liconv"
+
 MAN1=		nail.1
 
+post-patch:
+	@cd ${WRKSRC} && ${TOUCH} Makefile.in aclocal.m4 stamp-h.in
+
 .include <bsd.port.mk>
diff --git a/mail/heirloom-mailx/files/patch-aa b/mail/heirloom-mailx/files/patch-aa
index 638d3b91a9a8..7be737eedc02 100644
--- a/mail/heirloom-mailx/files/patch-aa
+++ b/mail/heirloom-mailx/files/patch-aa
@@ -1,11 +1,30 @@
---- mime.c.orig	Thu Jan 25 08:36:11 2001
-+++ mime.c	Thu Feb  1 01:50:57 2001
-@@ -179,7 +179,7 @@
- 		if ((sz = xmbstowcs(w, t, LINESIZE)) == -1)
- 			return;
+
+$FreeBSD$
+
+--- mime.c.orig	Mon Nov 19 17:37:47 2001
++++ mime.c	Tue Jan 29 01:17:38 2002
+@@ -183,7 +183,7 @@
+ 		if ((sz = xmbstowcs(w, t, LINESIZE)) == (size_t)-1)
+ 			return 0;
  		for (p = w, i = 0; *p && i < sz; p++, i++) {
 -			if (!iswprint(*p) && *p != '\n' && *p != '\r'
 +			if (!isprint(*p) && *p != '\n' && *p != '\r'
  					&& *p != '\b' && *p != '\t')
  				*p = '?';
  		}
+@@ -319,6 +319,7 @@
+ 	return p;
+ }
+ 
++#ifndef	HAVE_STRCASESTR
+ /*
+  * glibc 2.1 provides such a function, but others ...
+  */
+@@ -346,6 +347,7 @@
+ 	}
+ 	return p;
+ }
++#endif
+ 
+ #ifndef	HAVE_STRCASECMP
+ /* One of the things I really HATE on some SysVs is that they still
diff --git a/mail/heirloom-mailx/files/patch-ab b/mail/heirloom-mailx/files/patch-ab
index 6e17c4aa8a97..994af4e7a733 100644
--- a/mail/heirloom-mailx/files/patch-ab
+++ b/mail/heirloom-mailx/files/patch-ab
@@ -1,14 +1,18 @@
---- Makefile.in.orig	Sat Jun  9 18:40:06 2001
-+++ Makefile.in	Sat Jun  9 18:40:51 2001
-@@ -392,9 +392,8 @@
+
+$FreeBSD$
+
+--- Makefile.in.orig	Wed Sep 19 06:25:36 2001
++++ Makefile.in	Tue Jan 29 22:17:15 2002
+@@ -392,9 +392,9 @@
  
  
  install-data-local:
 -	-test -f $(DESTDIR)/etc/nail.rc || \
 -		{ $(mkinstalldirs) $(DESTDIR)/etc; \
 -		$(INSTALL_DATA) $(srcdir)/nail.rc $(DESTDIR)/etc/nail.rc; }
-+	-test -f $(sysconfdir)/nail.rc || \
-+	$(INSTALL_DATA) $(srcdir)/nail.rc $(sysconfdir)/nail.rc
++	-test -f $(DESTDIR)$(sysconfdir)/nail.rc || \
++	{ $(mkinstalldirs) $(DESTDIR)$(sysconfdir); \
++	$(INSTALL_DATA) $(srcdir)/nail.rc $(DESTDIR)$(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
deleted file mode 100644
index cceb71d283d5..000000000000
--- a/mail/heirloom-mailx/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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/files/patch-config.h.in b/mail/heirloom-mailx/files/patch-config.h.in
new file mode 100644
index 000000000000..ff1c9a2625c8
--- /dev/null
+++ b/mail/heirloom-mailx/files/patch-config.h.in
@@ -0,0 +1,15 @@
+
+$FreeBSD$
+
+--- config.h.in.orig	Tue Jan 29 01:14:50 2002
++++ config.h.in	Tue Jan 29 01:15:46 2002
+@@ -75,6 +75,9 @@
+ /* Define if you have the strcasecmp function.  */
+ #undef HAVE_STRCASECMP
+ 
++/* Define if you have the strcasestr function.  */
++#undef HAVE_STRCASESTR
++
+ /* Define if you have the strtol function.  */
+ #undef HAVE_STRTOL
+ 
diff --git a/mail/heirloom-mailx/files/patch-configure.in b/mail/heirloom-mailx/files/patch-configure.in
new file mode 100644
index 000000000000..0bacdfab39a3
--- /dev/null
+++ b/mail/heirloom-mailx/files/patch-configure.in
@@ -0,0 +1,26 @@
+
+$FreeBSD$
+
+--- configure.in.orig	Tue Jan 29 01:13:35 2002
++++ configure.in	Tue Jan 29 01:15:12 2002
+@@ -130,9 +130,8 @@
+ dnl Formulate proper paths based on prefix
+ test "$prefix" = NONE && prefix=/usr/local
+ dnl We need these seperate to use AC_DEFINED_UNQUOTED
+-test "$libdir" = '${exec_prefix}/lib' && libdir=${prefix}/lib
+-test "$sysconfdir" = '/etc' && sysconfdir=/etc
+-AC_DEFINE_UNQUOTED(PATH_MASTER_RC, "/etc/nail.rc")
++eval sysconfdir="$sysconfdir"
++AC_DEFINE_UNQUOTED(PATH_MASTER_RC, "${sysconfdir}/nail.rc")
+ 
+ dnl Checks for libraries.
+ if test "x$enable_efence" = xyes
+@@ -165,7 +164,7 @@
+ AC_CHECK_FUNCS(mktime strtol tempnam getopt, ,
+ 	echo "A required function was not found" >&2
+ 	exit 1)
+-AC_CHECK_FUNCS(gethostname mkstemp select strcasecmp snprintf uname)
++AC_CHECK_FUNCS(gethostname mkstemp select strcasecmp strcasestr snprintf uname)
+ AC_CHECK_FUNCS(nl_langinfo)
+ AC_FUNC_SELECT_ARGTYPES
+ AC_CHECK_FUNC(gethostent, AC_DEFINE(HAVE_SOCKETS),
diff --git a/mail/heirloom-mailx/pkg-plist b/mail/heirloom-mailx/pkg-plist
index 7ff95a6bf971..1dc97bf3c1b1 100644
--- a/mail/heirloom-mailx/pkg-plist
+++ b/mail/heirloom-mailx/pkg-plist
@@ -1,2 +1,3 @@
+@comment $FreeBSD$
 bin/nail
 etc/nail.rc
diff --git a/mail/nail/Makefile b/mail/nail/Makefile
index 69b0f221982c..4f6e3b97e747 100644
--- a/mail/nail/Makefile
+++ b/mail/nail/Makefile
@@ -7,12 +7,21 @@
 
 PORTNAME=	nail
 PORTVERSION=	9.29
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://omnibus.ruf.uni-freiburg.de/~gritter/archive/nail/
 
 MAINTAINER=	ports@FreeBSD.org
 
-GNU_CONFIGURE=	yes
+LIB_DEPENDS=	iconv.2:${PORTSDIR}/converters/iconv
+
+USE_AUTOCONF=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib" LIBS="-liconv"
+
 MAN1=		nail.1
 
+post-patch:
+	@cd ${WRKSRC} && ${TOUCH} Makefile.in aclocal.m4 stamp-h.in
+
 .include <bsd.port.mk>
diff --git a/mail/nail/files/patch-aa b/mail/nail/files/patch-aa
index 638d3b91a9a8..7be737eedc02 100644
--- a/mail/nail/files/patch-aa
+++ b/mail/nail/files/patch-aa
@@ -1,11 +1,30 @@
---- mime.c.orig	Thu Jan 25 08:36:11 2001
-+++ mime.c	Thu Feb  1 01:50:57 2001
-@@ -179,7 +179,7 @@
- 		if ((sz = xmbstowcs(w, t, LINESIZE)) == -1)
- 			return;
+
+$FreeBSD$
+
+--- mime.c.orig	Mon Nov 19 17:37:47 2001
++++ mime.c	Tue Jan 29 01:17:38 2002
+@@ -183,7 +183,7 @@
+ 		if ((sz = xmbstowcs(w, t, LINESIZE)) == (size_t)-1)
+ 			return 0;
  		for (p = w, i = 0; *p && i < sz; p++, i++) {
 -			if (!iswprint(*p) && *p != '\n' && *p != '\r'
 +			if (!isprint(*p) && *p != '\n' && *p != '\r'
  					&& *p != '\b' && *p != '\t')
  				*p = '?';
  		}
+@@ -319,6 +319,7 @@
+ 	return p;
+ }
+ 
++#ifndef	HAVE_STRCASESTR
+ /*
+  * glibc 2.1 provides such a function, but others ...
+  */
+@@ -346,6 +347,7 @@
+ 	}
+ 	return p;
+ }
++#endif
+ 
+ #ifndef	HAVE_STRCASECMP
+ /* One of the things I really HATE on some SysVs is that they still
diff --git a/mail/nail/files/patch-ab b/mail/nail/files/patch-ab
index 6e17c4aa8a97..994af4e7a733 100644
--- a/mail/nail/files/patch-ab
+++ b/mail/nail/files/patch-ab
@@ -1,14 +1,18 @@
---- Makefile.in.orig	Sat Jun  9 18:40:06 2001
-+++ Makefile.in	Sat Jun  9 18:40:51 2001
-@@ -392,9 +392,8 @@
+
+$FreeBSD$
+
+--- Makefile.in.orig	Wed Sep 19 06:25:36 2001
++++ Makefile.in	Tue Jan 29 22:17:15 2002
+@@ -392,9 +392,9 @@
  
  
  install-data-local:
 -	-test -f $(DESTDIR)/etc/nail.rc || \
 -		{ $(mkinstalldirs) $(DESTDIR)/etc; \
 -		$(INSTALL_DATA) $(srcdir)/nail.rc $(DESTDIR)/etc/nail.rc; }
-+	-test -f $(sysconfdir)/nail.rc || \
-+	$(INSTALL_DATA) $(srcdir)/nail.rc $(sysconfdir)/nail.rc
++	-test -f $(DESTDIR)$(sysconfdir)/nail.rc || \
++	{ $(mkinstalldirs) $(DESTDIR)$(sysconfdir); \
++	$(INSTALL_DATA) $(srcdir)/nail.rc $(DESTDIR)$(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
deleted file mode 100644
index cceb71d283d5..000000000000
--- a/mail/nail/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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/files/patch-config.h.in b/mail/nail/files/patch-config.h.in
new file mode 100644
index 000000000000..ff1c9a2625c8
--- /dev/null
+++ b/mail/nail/files/patch-config.h.in
@@ -0,0 +1,15 @@
+
+$FreeBSD$
+
+--- config.h.in.orig	Tue Jan 29 01:14:50 2002
++++ config.h.in	Tue Jan 29 01:15:46 2002
+@@ -75,6 +75,9 @@
+ /* Define if you have the strcasecmp function.  */
+ #undef HAVE_STRCASECMP
+ 
++/* Define if you have the strcasestr function.  */
++#undef HAVE_STRCASESTR
++
+ /* Define if you have the strtol function.  */
+ #undef HAVE_STRTOL
+ 
diff --git a/mail/nail/files/patch-configure.in b/mail/nail/files/patch-configure.in
new file mode 100644
index 000000000000..0bacdfab39a3
--- /dev/null
+++ b/mail/nail/files/patch-configure.in
@@ -0,0 +1,26 @@
+
+$FreeBSD$
+
+--- configure.in.orig	Tue Jan 29 01:13:35 2002
++++ configure.in	Tue Jan 29 01:15:12 2002
+@@ -130,9 +130,8 @@
+ dnl Formulate proper paths based on prefix
+ test "$prefix" = NONE && prefix=/usr/local
+ dnl We need these seperate to use AC_DEFINED_UNQUOTED
+-test "$libdir" = '${exec_prefix}/lib' && libdir=${prefix}/lib
+-test "$sysconfdir" = '/etc' && sysconfdir=/etc
+-AC_DEFINE_UNQUOTED(PATH_MASTER_RC, "/etc/nail.rc")
++eval sysconfdir="$sysconfdir"
++AC_DEFINE_UNQUOTED(PATH_MASTER_RC, "${sysconfdir}/nail.rc")
+ 
+ dnl Checks for libraries.
+ if test "x$enable_efence" = xyes
+@@ -165,7 +164,7 @@
+ AC_CHECK_FUNCS(mktime strtol tempnam getopt, ,
+ 	echo "A required function was not found" >&2
+ 	exit 1)
+-AC_CHECK_FUNCS(gethostname mkstemp select strcasecmp snprintf uname)
++AC_CHECK_FUNCS(gethostname mkstemp select strcasecmp strcasestr snprintf uname)
+ AC_CHECK_FUNCS(nl_langinfo)
+ AC_FUNC_SELECT_ARGTYPES
+ AC_CHECK_FUNC(gethostent, AC_DEFINE(HAVE_SOCKETS),
diff --git a/mail/nail/pkg-plist b/mail/nail/pkg-plist
index 7ff95a6bf971..1dc97bf3c1b1 100644
--- a/mail/nail/pkg-plist
+++ b/mail/nail/pkg-plist
@@ -1,2 +1,3 @@
+@comment $FreeBSD$
 bin/nail
 etc/nail.rc