- Update to 0.95

5 files changed, 9 insertions, 114 deletions

diff --git a/textproc/catdoc/Makefile b/textproc/catdoc/Makefile
index 12a7116d2355..90dde13222eb 100644
--- a/textproc/catdoc/Makefile
+++ b/textproc/catdoc/Makefile
@@ -2,17 +2,17 @@
 # $FreeBSD$
 
 PORTNAME=	catdoc
-PORTVERSION=	0.94.2
-PORTREVISION=	3
+PORTVERSION=	0.95
 CATEGORIES=	textproc
-MASTER_SITES=	http://mirror.amdmi3.ru/distfiles/ \
-		LOCAL/amdmi3 \
-		ftp://ftp.dvo.ru/pub/Gentoo/distfiles/ \
-		ftp://ftp.demos.ru/pub/sunfreeware/SOURCES/
+MASTER_SITES=	http://ftp.wagner.pp.ru/pub/catdoc/ \
+		http://mirror.amdmi3.ru/distfiles/
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	MS Word/Excel converter to plain ASCII or TeX. TK viewer included
 
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-install-root="${STAGEDIR}"
 USES=		gmake
diff --git a/textproc/catdoc/distinfo b/textproc/catdoc/distinfo
index 24b8e00e06f0..81674e2a5997 100644
--- a/textproc/catdoc/distinfo
+++ b/textproc/catdoc/distinfo
@@ -1,2 +1,3 @@
-SHA256 (catdoc-0.94.2.tar.gz) = 03c98b103664e5d1b63de110854e93c2453bc10be5634f86c280303eb843d362
-SIZE (catdoc-0.94.2.tar.gz) = 146012
+TIMESTAMP = 1473079072
+SHA256 (catdoc-0.95.tar.gz) = 514a84180352b6bf367c1d2499819dfa82b60d8c45777432fa643a5ed7d80796
+SIZE (catdoc-0.95.tar.gz) = 217779
diff --git a/textproc/catdoc/files/patch-configure b/textproc/catdoc/files/patch-configure
deleted file mode 100644
index 3f60f71d3537..000000000000
--- a/textproc/catdoc/files/patch-configure
+++ /dev/null
@@ -1,20 +0,0 @@
---- configure.orig	Sun Nov 16 00:31:22 2003
-+++ configure	Sun Aug  1 02:15:09 2004
-@@ -748,8 +748,8 @@
- fi
- 
- echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
--if test "$ac_test_CFLAGS" = set; then
-+if :; then
-   CFLAGS="$ac_save_CFLAGS"
- elif test $ac_cv_prog_cc_g = yes; then
-   if test "$GCC" = yes; then
-     CFLAGS="-g -O2"
-@@ -1493,7 +1494,6 @@
- 
- 
- if test "$GCC" = "yes"; then
--	CFLAGS="-g -O2 -Wall"
- fi
- 
- 
diff --git a/textproc/catdoc/files/patch-doc-catdoc.1.in b/textproc/catdoc/files/patch-doc-catdoc.1.in
deleted file mode 100644
index e77f7ebfaccd..000000000000
--- a/textproc/catdoc/files/patch-doc-catdoc.1.in
+++ /dev/null
@@ -1,26 +0,0 @@
---- doc/catdoc.1.in.bak	Wed Sep 15 17:34:45 2004
-+++ doc/catdoc.1.in	Tue Oct 26 15:41:52 2004
-@@ -86,7 +86,10 @@
- CHARACTER SETS below and should have 
- .B .txt
- extension  and reside in 
--.B catdoc library directory ( @libdir@/catdoc). By default, current
-+.B catdoc
-+library directory (
-+.B %%PREFIX%%/share/catdoc
-+). By default, current
- locale charset is used if langinfo support compiled in.
- .TP 8
- .BI -f format
-@@ -228,9 +231,8 @@
- 
- .SH RUNTIME CONFIGURATION
- Upon startup catdoc reads its system-wide configuration file (
--.B catdocrc in 
--.B catdoc
--library directory) and then
-+.B %%PREFIX%%/etc/catdocrc
-+) and then
- user-specific configuration file
- .BR ${HOME}/.catdocrc.
- .PP
diff --git a/textproc/catdoc/files/patch-src__fileutil.c b/textproc/catdoc/files/patch-src__fileutil.c
deleted file mode 100644
index 71086302ee08..000000000000
--- a/textproc/catdoc/files/patch-src__fileutil.c
+++ /dev/null
@@ -1,60 +0,0 @@
-diff --git src/fileutil.c src/fileutil.c
-index d902a6a..6afddec 100644
---- src/fileutil.c
-+++ src/fileutil.c
-@@ -71,13 +71,12 @@ char *find_file(char *name, const char *path)
- 	char *q;
- 	char path_buf[PATH_BUF_SIZE];
- 	char dir_sep[2]={DIR_SEP,0};
--	for (p=path;p;p=q+1) {
-+	for (p=path;p;) {
- 		q=strchr(p,LIST_SEP);
- 
- 		if (q) {
- 			if (!prepare_path_buf(path_buf,p,q)) continue;
- 		} else {
--			q--;
- 			if (!prepare_path_buf(path_buf,p,p+strlen(p))) continue;
- 		}
- 		strcat(path_buf,dir_sep); /* always one char */
-@@ -88,6 +87,11 @@ char *find_file(char *name, const char *path)
- 			free(name); 
- 			return strdup(path_buf);
- 		}
-+		if (q) {
-+			p = q + 1;
-+		} else {
-+			p = NULL;
-+		}
- 	}
- 	/* if we are here, nothing found */
- 	free(name); 
-@@ -186,7 +190,7 @@ void list_charsets(void) {
- 	int count,glob_flags=GLOB_ERR;
- #endif
- 	char **ptr;
--	for (p=charset_path;p;p=q+1) {
-+	for (p=charset_path;p;) {
- 		q=strchr(p,LIST_SEP);
- 
- 		if (q) {
-@@ -197,7 +201,6 @@ void list_charsets(void) {
- 			strncpy(path_buf,p,q-p);
- 			path_buf[q-p]=0;
- 		} else {
--			q--;
- 			if (strlen(p)>=PATH_BUF_SIZE) continue;
- 			strcpy(path_buf,p);
- 		}
-@@ -244,6 +247,11 @@ void list_charsets(void) {
- 		}
- 		glob_flags|=GLOB_APPEND;
- #endif
-+		if (q) {
-+			p = q + 1;
-+		} else {
-+			p = NULL;
-+		}
- 	}
- #ifdef __MSDOS__
- 	fputs("utf-8\n",stdout);