Upgrade to 1.5.11

5 files changed, 11 insertions, 127 deletions

diff --git a/news/tin/Makefile b/news/tin/Makefile
index 1a983e2484d9..0d4c979e1ee6 100644
--- a/news/tin/Makefile
+++ b/news/tin/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	tin
-PORTVERSION=    1.5.10
-PORTREVISION=	1
+PORTVERSION=    1.5.11
 CATEGORIES+=	news
 MASTER_SITES=	ftp://ftp.tin.org/pub/news/clients/tin/v1.5/ \
 		ftp://nuxi.ucdavis.edu/pub/tin/v1.5/ \
@@ -36,7 +35,8 @@ CONFIGURE_ARGS=	--with-nntp-default-server=news \
 		--enable-break-long-lines \
 		--with-pgp=${PREFIX}/bin/pgp \
 		--with-ispell=${PREFIX}/bin/ispell \
-		--with-metamail=${PREFIX}/bin/metamail
+		--with-metamail=${PREFIX}/bin/metamail \
+		--with-mime-default-charset=US-ASCII
 CONFIGURE_ENV=  CFLAGS='${CFLAGS} -DNNTP_SERVER_FILE="\"${PREFIX}/etc/nntpserver\""' \
 		CPPFLAGS='${CPPFLAGS} -I${LOCALBASE}/include' \
 		LDFLAGS='${LDFLAGS} -L${LOCALBASE}/lib'
@@ -63,8 +63,6 @@ post-configure:
 		${ECHO_CMD} "#define HAVE_STRCASESTR 1" \
 			>> ${WRKSRC}/include/autoconf.h; \
 	fi
-	${ECHO_CMD} "#define HAVE_ICONV_H 1" >> ${WRKSRC}/include/autoconf.h
-	${ECHO_CMD} "#define HAVE_ICONV 1" >> ${WRKSRC}/include/autoconf.h
 
 post-build:
 	cd ${WRKSRC}/po; ${GMAKE}
diff --git a/news/tin/distinfo b/news/tin/distinfo
index 52b21e9524d5..dcbb396e7bc9 100644
--- a/news/tin/distinfo
+++ b/news/tin/distinfo
@@ -1 +1 @@
-MD5 (tin-1.5.10.tar.bz2) = 2e7b0387ddf4b96ff3b85019c7e059d8
+MD5 (tin-1.5.11.tar.bz2) = 111886abdb0f7b892fc58999d0de89e3
diff --git a/news/tin/files/patch-aa b/news/tin/files/patch-aa
index ddd4d588051d..bd59ccc19fd7 100644
--- a/news/tin/files/patch-aa
+++ b/news/tin/files/patch-aa
@@ -1,12 +1,12 @@
---- include/proto.h.bak	Fri Nov 16 23:17:45 2001
-+++ include/proto.h	Mon Dec 24 23:10:00 2001
-@@ -646,7 +646,9 @@
- extern char *eat_tab (char *s);
+--- include/proto.h.orig	Tue Jan 29 17:31:11 2002
++++ include/proto.h	Tue Mar 19 13:29:43 2002
+@@ -628,7 +628,9 @@
  extern char *my_strdup (const char *str);
  extern char *str_trim (char *string);
+ extern char *tin_ltoa (long value, int digits);
 +#ifndef HAVE_STRCASESTR
  extern const char *strcasestr (const char *haystack, const char *needle);
 +#endif
- extern char *tin_ltoa (long value, int digits);
  extern int sh_format (char *dst, size_t len, const char *fmt, ...);
  extern size_t mystrcat (char **t, const char *s);
+ extern void my_strncpy (char *p, const char *q, size_t n);
diff --git a/news/tin/files/patch-ab b/news/tin/files/patch-ab
index 52b43cb398c4..4399c482e562 100644
--- a/news/tin/files/patch-ab
+++ b/news/tin/files/patch-ab
@@ -27,117 +27,3 @@
  	echo $ac_n "checking for tgoto in -lmytinfo""... $ac_c" 1>&6
  echo "configure:5793: checking for tgoto in -lmytinfo" >&5
  ac_lib_var=`echo mytinfo'_'tgoto | sed 'y%./+-%__p_%'`
-@@ -6233,104 +6233,7 @@
- fi
- 
- ## iconv
--echo $ac_n "checking for iconv in -liconv""... $ac_c" 1>&6
--echo "configure:6238: checking for iconv in -liconv" >&5
--ac_lib_var=`echo iconv'_'iconv | sed 'y%./+-%__p_%'`
--if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
--else
--  ac_save_LIBS="$LIBS"
--LIBS="-liconv  $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 6246 "configure"
--#include "confdefs.h"
--/* Override any gcc2 internal prototype to avoid an error.  */
--/* We use char because int might match the return type of a gcc2
--    builtin and then its argument prototype would still apply.  */
--char iconv();
--
--int main() {
--iconv()
--; return 0; }
--EOF
--if { (eval echo configure:6257: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
--  rm -rf conftest*
--  eval "ac_cv_lib_$ac_lib_var=yes"
--else
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  eval "ac_cv_lib_$ac_lib_var=no"
--fi
--rm -f conftest*
--LIBS="$ac_save_LIBS"
--
--fi
--if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
--  echo "$ac_t""yes" 1>&6
--  
--	cat >> confdefs.h <<\EOF
--#define HAVE_ICONV 1
--EOF
--
--	LIBS="$LIBS -liconv"
--else
--  echo "$ac_t""no" 1>&6
--
--	echo $ac_n "checking for iconv""... $ac_c" 1>&6
--echo "configure:6282: checking for iconv" >&5
--if eval "test \"`echo '$''{'ac_cv_func_iconv'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
--else
--  cat > conftest.$ac_ext <<EOF
--#line 6287 "configure"
--#include "confdefs.h"
--/* System header to define __stub macros and hopefully few prototypes,
--    which can conflict with char iconv(); below.  */
--#include <assert.h>
--/* Override any gcc2 internal prototype to avoid an error.  */
--/* We use char because int might match the return type of a gcc2
--    builtin and then its argument prototype would still apply.  */
--char iconv();
--
--int main() {
--
--/* The GNU C library defines this for functions which it implements
--    to always fail with ENOSYS.  Some functions are actually named
--    something starting with __ and the normal name is an alias.  */
--#if defined (__stub_iconv) || defined (__stub___iconv)
--choke me
--#else
--iconv();
--#endif
--
--; return 0; }
--EOF
--if { (eval echo configure:6310: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
--  rm -rf conftest*
--  eval "ac_cv_func_iconv=yes"
--else
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  eval "ac_cv_func_iconv=no"
--fi
--rm -f conftest*
--fi
--
--if eval "test \"`echo '$ac_cv_func_'iconv`\" = yes"; then
--  echo "$ac_t""yes" 1>&6
--  cat >> confdefs.h <<\EOF
--#define HAVE_ICONV 1
--EOF
--
--else
--  echo "$ac_t""no" 1>&6
--fi
--
--	
--fi
--
-+LIBS="-lgiconv  $LIBS"
- 
- ## debugging libraries (do this after other libraries)
- echo $ac_n "checking if you want dbmalloc library""... $ac_c" 1>&6
-@@ -8632,7 +8535,6 @@
- 	errno.h \
- 	fcntl.h \
- 	getopt.h \
--	iconv.h \
- 	ioctl.h \
- 	libc.h \
- 	locale.h \
diff --git a/news/tin/files/pcre.h b/news/tin/files/pcre.h
index 98d8db5b20f8..d6c239394c61 100644
--- a/news/tin/files/pcre.h
+++ b/news/tin/files/pcre.h
@@ -11,8 +11,8 @@
 make changes to pcre.in. */
 
 #define PCRE_MAJOR          3
-#define PCRE_MINOR          4
-#define PCRE_DATE           22-Aug-2000
+#define PCRE_MINOR          9
+#define PCRE_DATE           02-Jan-2002
 
 /* Win32 uses DLL by default */