1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-28 05:29:48 +00:00

Upgrade to 1.5.10

This commit is contained in:
Andrey A. Chernov 2001-12-25 00:18:51 +00:00
parent f8a33d6264
commit 83955fdc1a
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=52133
8 changed files with 197 additions and 30 deletions

View File

@ -6,7 +6,7 @@
#
PORTNAME= tin
PORTVERSION= 1.5.9
PORTVERSION= 1.5.10
CATEGORIES+= news
MASTER_SITES= ftp://ftp.tin.org/pub/news/clients/tin/v1.5/ \
ftp://nuxi.ucdavis.edu/pub/tin/v1.5/ \
@ -15,7 +15,8 @@ MASTER_SITES= ftp://ftp.tin.org/pub/news/clients/tin/v1.5/ \
MAINTAINER?= ache@FreeBSD.org
LIB_DEPENDS= uu.1:${PORTSDIR}/converters/uulib \
intl.1:${PORTSDIR}/devel/gettext
intl.1:${PORTSDIR}/devel/gettext \
giconv.2:${PORTSDIR}/converters/libiconv
USE_BZIP2= yes
USE_GMAKE= yes
@ -29,7 +30,7 @@ CONFIGURE_ARGS= --with-nntp-default-server=news \
--enable-nls \
--enable-curses \
--with-ncurses \
--with-mime-default-charset=ISO-8859-1 \
--disable-mime-strict-charset \
--enable-forgery \
--enable-break-long-lines \
--with-pgp=${PREFIX}/bin/pgp \
@ -56,6 +57,12 @@ post-patch:
pre-configure:
${CP} ${FILESDIR}/pcre.h ${WRKSRC}/pcre
post-configure:
(nm /usr/lib/libc.a | grep -q strcasestr) && \
echo "#define HAVE_STRCASESTR 1" >> ${WRKSRC}/include/autoconf.h
echo "#define HAVE_ICONV_H 1" >> ${WRKSRC}/include/autoconf.h
echo "#define HAVE_ICONV 1" >> ${WRKSRC}/include/autoconf.h
post-build:
cd ${WRKSRC}/po; gmake

View File

@ -1 +1 @@
MD5 (tin-1.5.9.tar.bz2) = 58d7ea16e2b4bc9def2ebde90877808d
MD5 (tin-1.5.10.tar.bz2) = 2e7b0387ddf4b96ff3b85019c7e059d8

12
news/tin/files/patch-aa Normal file
View File

@ -0,0 +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);
extern char *my_strdup (const char *str);
extern char *str_trim (char *string);
+#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);

View File

@ -1,18 +1,143 @@
--- configure.orig Tue Nov 23 02:13:12 1999
+++ configure Thu Dec 2 15:17:16 1999
@@ -3579,6 +3579,7 @@
--- configure.orig Sat Nov 17 21:47:38 2001
+++ configure Tue Dec 25 02:39:17 2001
@@ -4637,7 +4637,7 @@
case $host_os in #(vi
freebsd*)
+if test "${with_ncurses+set}" = set; then
-freebsd*)
+XXXfreebsd*)
# This is only necessary if you are linking against an obsolete
# version of ncurses (but it should do no harm, since it's static).
echo $ac_n "checking for tgoto in -lmytinfo""... $ac_c" 1>&6
@@ -3621,6 +3622,7 @@
echo "$ac_t""no" 1>&6
@@ -5269,7 +5269,7 @@
case $host_os in #(vi
-freebsd*)
+XXXfreebsd*)
# This is only necessary if you are linking against an obsolete
# version of ncurses (but it should do no harm, since it's static).
echo $ac_n "checking for tgoto in -lmytinfo""... $ac_c" 1>&6
@@ -5787,7 +5787,7 @@
if test "$cf_result" = no ; then
case $host_os in #(vi
-freebsd*) #(vi
+XXXfreebsd*) #(vi
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
+fi
;;
esac
## 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 \

View File

@ -1,11 +1,18 @@
--- configure.bak Wed May 24 00:41:52 2000
+++ configure Wed May 24 00:43:14 2000
@@ -782,7 +782,7 @@
esac
--- src/string.c.bak Tue Nov 13 01:45:52 2001
+++ src/string.c Mon Dec 24 23:09:05 2001
@@ -118,6 +118,7 @@
}
### Native Language Support
-ALL_LINGUAS="de et en_GB"
+ALL_LINGUAS="de et"
### Checks for programs
save_CFLAGS="$CFLAGS"
+#ifndef HAVE_STRCASESTR
/*
* case-insensitive version of strstr()
*/
@@ -144,6 +145,7 @@
}
return NULL;
}
+#endif
size_t

11
news/tin/files/patch-ad Normal file
View File

@ -0,0 +1,11 @@
--- include/tin.h.bak Sat Nov 17 07:00:13 2001
+++ include/tin.h Tue Dec 25 01:37:32 2001
@@ -747,7 +747,7 @@
#if defined(HAVE_ICONV) && !defined(LOCAL_CHARSET)
# define CHARSET_CONVERSION 1
# ifdef HAVE_ICONV_H
-# include <iconv.h>
+# include <giconv.h>
# endif /* HAVE_ICONV_H */
#endif /* HAVE_ICONV && !LOCAL_CHARSET */

View File

@ -2,7 +2,7 @@
* Perl-Compatible Regular Expressions *
*************************************************/
/* Copyright (c) 1997-2000 University of Cambridge */
/* Copyright (c) 1997-2001 University of Cambridge */
#ifndef _PCRE_H
#define _PCRE_H
@ -10,9 +10,9 @@
/* The file pcre.h is build by "configure". Do not edit it; instead
make changes to pcre.in. */
#define PCRE_MAJOR 3
#define PCRE_MINOR 4
#define PCRE_DATE 22-Aug-2000
#define PCRE_MAJOR 3
#define PCRE_MINOR 4
#define PCRE_DATE 22-Aug-2000
/* Win32 uses DLL by default */
@ -74,8 +74,11 @@ extern "C" {
/* Types */
typedef void pcre;
typedef void pcre_extra;
struct real_pcre; /* declaration; the definition is private */
struct real_pcre_extra; /* declaration; the definition is private */
typedef struct real_pcre pcre;
typedef struct real_pcre_extra pcre_extra;
/* Store get and free functions. These can be set to alternative malloc/free
functions if required. Some magic is required for Win32 DLL; it is null on
@ -99,7 +102,7 @@ extern int pcre_get_substring(const char *, int *, int, int, const char **);
extern int pcre_get_substring_list(const char *, int *, int, const char ***);
extern int pcre_info(const pcre *, int *, int *);
extern int pcre_fullinfo(const pcre *, const pcre_extra *, int, void *);
extern unsigned const char *pcre_maketables(void);
extern const unsigned char *pcre_maketables(void);
extern pcre_extra *pcre_study(const pcre *, int, const char **);
extern const char *pcre_version(void);

View File

@ -8,4 +8,6 @@ etc/tin.defaults.dist
etc/tin.mime.types.dist
@exec [ -f %B/mime.types ] || cp %B/%f %B/mime.types
share/locale/de/LC_MESSAGES/tin.mo
share/locale/en_GB/LC_MESSAGES/tin.mo
share/locale/et/LC_MESSAGES/tin.mo