diff options
Diffstat (limited to 'textproc')
-rw-r--r-- | textproc/antiword/Makefile | 4 | ||||
-rw-r--r-- | textproc/antiword/PLIST | 3 | ||||
-rw-r--r-- | textproc/antiword/distinfo | 11 | ||||
-rw-r--r-- | textproc/antiword/patches/patch-aa | 15 | ||||
-rw-r--r-- | textproc/antiword/patches/patch-ab | 13 |
5 files changed, 16 insertions, 30 deletions
diff --git a/textproc/antiword/Makefile b/textproc/antiword/Makefile index 46f7265e605..6d6fce47821 100644 --- a/textproc/antiword/Makefile +++ b/textproc/antiword/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.16 2005/09/08 10:37:15 markd Exp $ +# $NetBSD: Makefile,v 1.17 2005/11/14 23:04:13 wiz Exp $ # -DISTNAME= antiword-0.36.1 +DISTNAME= antiword-0.37 CATEGORIES= textproc converters print MASTER_SITES= http://www.winfield.demon.nl/linux/ diff --git a/textproc/antiword/PLIST b/textproc/antiword/PLIST index da9b1389fae..3c2042abed4 100644 --- a/textproc/antiword/PLIST +++ b/textproc/antiword/PLIST @@ -1,9 +1,10 @@ -@comment $NetBSD: PLIST,v 1.4 2004/11/28 14:16:28 wiz Exp $ +@comment $NetBSD: PLIST,v 1.5 2005/11/14 23:04:13 wiz Exp $ bin/antiword bin/kantiword man/man1/antiword.1 share/antiword/8859-1.txt share/antiword/8859-10.txt +share/antiword/8859-11.txt share/antiword/8859-13.txt share/antiword/8859-14.txt share/antiword/8859-15.txt diff --git a/textproc/antiword/distinfo b/textproc/antiword/distinfo index 412028b429a..90e448c4848 100644 --- a/textproc/antiword/distinfo +++ b/textproc/antiword/distinfo @@ -1,7 +1,6 @@ -$NetBSD: distinfo,v 1.15 2005/10/07 15:46:15 joerg Exp $ +$NetBSD: distinfo,v 1.16 2005/11/14 23:04:13 wiz Exp $ -SHA1 (antiword-0.36.1.tar.gz) = 36478acb583200e44e0a688eb859894d984e5854 -RMD160 (antiword-0.36.1.tar.gz) = f2ac45b3aa3d3f6450f91e5b3e53f2de5c714313 -Size (antiword-0.36.1.tar.gz) = 292753 bytes -SHA1 (patch-aa) = b012848f3cab517d52aede692740604aefd09d7c -SHA1 (patch-ab) = 36206daaae9fcb3dafadc0293e51d8c5cb77f6d8 +SHA1 (antiword-0.37.tar.gz) = 4364f7f99cb2d37f7d1d5bc14a335ccc0c67292e +RMD160 (antiword-0.37.tar.gz) = 506ca4a7a7fa9fd4574092798a7fffacd9a3a0a0 +Size (antiword-0.37.tar.gz) = 317884 bytes +SHA1 (patch-aa) = 27cd582ced9822bbaefddd73d2fe2ba6c904ae1f diff --git a/textproc/antiword/patches/patch-aa b/textproc/antiword/patches/patch-aa index a9195e37102..df8197c14cb 100644 --- a/textproc/antiword/patches/patch-aa +++ b/textproc/antiword/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.9 2004/11/23 18:20:03 wiz Exp $ +$NetBSD: patch-aa,v 1.10 2005/11/14 23:04:13 wiz Exp $ ---- Makefile.orig 2004-10-21 20:13:03.000000000 +0200 +--- Makefile.orig 2005-10-29 19:13:15.000000000 +0200 +++ Makefile @@ -2,8 +2,8 @@ # Makefile for antiword (Linux version) @@ -22,8 +22,8 @@ $NetBSD: patch-aa,v 1.9 2004/11/23 18:20:03 wiz Exp $ LDFLAGS = OBJS =\ -@@ -30,22 +30,31 @@ OBJS =\ - xmalloc.o xml.o +@@ -30,22 +30,30 @@ OBJS =\ + wordlib.o wordmac.o wordole.o wordwin.o xmalloc.o xml.o PROGS =\ - antiword\ @@ -57,11 +57,10 @@ $NetBSD: patch-aa,v 1.9 2004/11/23 18:20:03 wiz Exp $ + for i in Resources/* ; do \ + ${BSD_INSTALL_DATA} $$i ${GLOBAL_RESOURCES_DIR};\ + done -+ # NOTE: you might have to be root to do this global_install: all -@@ -70,10 +79,11 @@ global_uninstall: +@@ -70,10 +78,11 @@ global_uninstall: clean: rm -f $(OBJS) rm -f $(PROGS) @@ -73,8 +72,8 @@ $NetBSD: patch-aa,v 1.9 2004/11/23 18:20:03 wiz Exp $ + $(CC) $(CFLAGS) $(OBJS) -o $@ @chmod 750 $@ - kantiword: Unix-only/KDE2-only/kantiword.sh -@@ -82,9 +92,6 @@ kantiword: Unix-only/KDE2-only/kantiword + kantiword: Unix-only/KDE3-only/kantiword.sh +@@ -82,9 +91,6 @@ kantiword: Unix-only/KDE3-only/kantiword cat $? >> $@ @chmod 750 $@ diff --git a/textproc/antiword/patches/patch-ab b/textproc/antiword/patches/patch-ab deleted file mode 100644 index df3228eac1e..00000000000 --- a/textproc/antiword/patches/patch-ab +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ab,v 1.9 2005/10/07 15:46:15 joerg Exp $ - ---- main_u.c.orig Thu Oct 14 11:49:18 2004 -+++ main_u.c -@@ -29,7 +29,7 @@ - #include <fcntl.h> - #include <io.h> - #endif /* __dos */ --#if defined(__STDC_ISO_10646__) -+#if defined(__STDC_ISO_10646__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__APPLE__) || defined(__DragonFly__) - #include <locale.h> - #endif /* __STDC_ISO_10646__ */ - #if defined(N_PLAT_NLM) |