Upgrade to 1.5.9

6 files changed, 25 insertions, 35 deletions

diff --git a/news/tin/Makefile b/news/tin/Makefile
index a96736c4e9a1..94260410aa09 100644
--- a/news/tin/Makefile
+++ b/news/tin/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	tin
-PORTVERSION=    1.5.8
+PORTVERSION=    1.5.9
 CATEGORIES+=	news
 MASTER_SITES=	ftp://ftp.tin.org/pub/news/clients/tin/v1.5/ \
 		ftp://nuxi.ucdavis.edu/pub/tin/v1.5/ \
@@ -38,7 +38,6 @@ CONFIGURE_ARGS=	--with-nntp-default-server=news \
 CONFIGURE_ENV=  CFLAGS='${CFLAGS} -DNNTP_SERVER_FILE="\"${PREFIX}/etc/nntpserver\""' \
 		CPPFLAGS='${CPPFLAGS} -I${LOCALBASE}/include' \
 		LDFLAGS='${LDFLAGS} -L${LOCALBASE}/lib'
-MAKEFILE=	makefile
 ALL_TARGET=	build
 MAN1=		tin.1
 
@@ -56,10 +55,17 @@ post-patch:
 pre-configure:
 	${CP} ${FILESDIR}/pcre.h ${WRKSRC}/pcre
 
+post-build:
+	cd ${WRKSRC}/po; gmake
+
 post-install:
 	cd ${WRKSRC}/doc; ${INSTALL_DATA} tin.defaults ${PREFIX}/etc/tin.defaults.dist
 	if [ ! -f ${PREFIX}/etc/tin.defaults ] ; then \
 		${CP} ${PREFIX}/etc/tin.defaults.dist ${PREFIX}/etc/tin.defaults; \
 	fi
+	cd ${WRKSRC}/doc; ${INSTALL_DATA} mime.types ${PREFIX}/etc/tin.mime.types.dist
+	if [ ! -f ${PREFIX}/etc/mime.types ] ; then \
+		${CP} ${PREFIX}/etc/tin.mime.types.dist ${PREFIX}/etc/mime.types; \
+	fi
 
 .include <bsd.port.mk>
diff --git a/news/tin/distinfo b/news/tin/distinfo
index f60a26ffb76e..b8b057a503f0 100644
--- a/news/tin/distinfo
+++ b/news/tin/distinfo
@@ -1 +1 @@
-MD5 (tin-1.5.8.tar.bz2) = f970eef234a04d8a13547ae66d9867f2
+MD5 (tin-1.5.9.tar.bz2) = 58d7ea16e2b4bc9def2ebde90877808d
diff --git a/news/tin/files/patch-aa b/news/tin/files/patch-aa
deleted file mode 100644
index e024c029b1c4..000000000000
--- a/news/tin/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Makefile.in.orig	Tue May 16 19:45:39 2000
-+++ src/Makefile.in	Tue May 23 23:52:52 2000
-@@ -58,7 +58,7 @@
- YACC	= @YACC@
- 
- CANLIB	= # -L../libcanlock -lcanlock
--LIBS	= -L../pcre -lpcre $(CANLIB) @LIBS@ @INN_NNTPLIB@ @INTLDIR_MAKE@ @INTLLIBS@
-+LIBS    = ../pcre/libpcre.a $(CANLIB) @LIBS@ @INN_NNTPLIB@ @INTLDIR_MAKE@ @INTLLIBS@
- 
- # Where do you want the binary & manual page installed?
- DESTDIR	= @DESTDIR@
diff --git a/news/tin/files/patch-ad b/news/tin/files/patch-ad
deleted file mode 100644
index 8c92cb2d8215..000000000000
--- a/news/tin/files/patch-ad
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/keymap.c	Thu Aug  3 13:26:37 2000
-+++ src/keymap.c	Sat Apr 14 00:12:27 2001
-@@ -916,6 +916,8 @@
- 		snprintf(buff, sizeof(buf) - 1, "%s/.tin/keymap.%s", ptr2, map);
- 		if (strfpath (buff, buf, sizeof(buf), &CURR_GROUP))
- 			fp = fopen (buf, "r");
-+		if (ptr)
-+			*ptr = '.';
- 	}
- 	if (!fp) {
- 		snprintf(buff, sizeof(buf) - 1, "%s/.tin/keymap", ptr2);
diff --git a/news/tin/files/pcre.h b/news/tin/files/pcre.h
index 82e696e0a676..e5a875a7cc5a 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 2
-#define PCRE_DATE  12-May-2000
+#define PCRE_MINOR 4
+#define PCRE_DATE  22-Aug-2000
 
 /* Win32 uses DLL by default */
 
@@ -50,6 +50,7 @@ extern "C" {
 #define PCRE_NOTEOL          0x0100
 #define PCRE_UNGREEDY        0x0200
 #define PCRE_NOTEMPTY        0x0400
+#define PCRE_UTF8            0x0800
 
 /* Exec-time and get-time error codes */
 
@@ -88,14 +89,16 @@ PCRE_DL_IMPORT extern void  (*pcre_free)(void *);
 /* Functions */
 
 extern pcre *pcre_compile(const char *, int, const char **, int *,
-  const unsigned char *);
-extern int pcre_copy_substring(const char *, int *, int, int, char *, int);
-extern int pcre_exec(const pcre *, const pcre_extra *, const char *,
-  int, int, int, int *, int);
-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 *);
+              const unsigned char *);
+extern int  pcre_copy_substring(const char *, int *, int, int, char *, int);
+extern int  pcre_exec(const pcre *, const pcre_extra *, const char *,
+              int, int, int, int *, int);
+extern void pcre_free_substring(const char *);
+extern void pcre_free_substring_list(const char **);
+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 pcre_extra *pcre_study(const pcre *, int, const char **);
 extern const char *pcre_version(void);
diff --git a/news/tin/pkg-plist b/news/tin/pkg-plist
index 201cdea9e4b0..0356034951d8 100644
--- a/news/tin/pkg-plist
+++ b/news/tin/pkg-plist
@@ -2,7 +2,10 @@ bin/tin
 @exec ln -fs %f %B/rtin
 @unexec rm -f %B/rtin
 @unexec if cmp -s %D/etc/tin.defaults %D/etc/tin.defaults.dist; then rm -f %D/etc/tin.defaults; fi
+@unexec if cmp -s %D/etc/mime.types %D/etc/tin.mime.types.dist; then rm -f %D/etc/mime.types; fi
 etc/tin.defaults.dist
 @exec [ -f %B/tin.defaults ] || cp %B/%f %B/tin.defaults
+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/et/LC_MESSAGES/tin.mo