diff --git a/textproc/antiword/Makefile b/textproc/antiword/Makefile index 2e428863ec6..68c629e4d72 100644 --- a/textproc/antiword/Makefile +++ b/textproc/antiword/Makefile @@ -1,10 +1,9 @@ -# $OpenBSD: Makefile,v 1.9 2001/12/24 07:51:06 mark Exp $ +# $OpenBSD: Makefile,v 1.10 2002/08/15 18:51:28 mark Exp $ COMMENT= "converts MSWord Documents to ASCII Text and PostScript" -DISTNAME= antiword-0.32 +DISTNAME= antiword-0.33 CATEGORIES= textproc -NEED_VERSION= 1.500 MASTER_SITES= http://www.winfield.demon.nl/linux/ HOMEPAGE= http://www.winfield.demon.nl/ @@ -19,7 +18,7 @@ PERMIT_DISTFILES_FTP= Yes MAKE_FLAGS= CC="${CC}" CFLAGS="${CFLAGS} -Wall -pedantic -DNDEBUG" \ LD="${CC}" -WRKDIST= ${WRKDIR}/antiword.0.32 +#WRKDIST= ${WRKDIR}/antiword.0.32 DOCS= ChangeLog FAQ History Netscape QandA ReadMe @@ -30,7 +29,7 @@ do-install: ${INSTALL_MAN} ${WRKSRC}/Docs/antiword.1 ${PREFIX}/man/man1 ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/antiword ${INSTALL_DATA_DIR} ${PREFIX}/share/antiword/kde - ${INSTALL_DATA_DIR} ${PREFIX}/share/antiword/resources + ${INSTALL_DATA_DIR} ${PREFIX}/share/antiword cd ${WRKSRC}/Docs; ${INSTALL_DATA} ${DOCS} \ ${PREFIX}/share/doc/antiword ${INSTALL_DATA} ${WRKSRC}/Unix-only/KDE2-only/Antiword.desktop.* \ @@ -38,6 +37,6 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/Unix-only/KDE2-only/*.png \ ${PREFIX}/share/antiword ${INSTALL_DATA} ${WRKSRC}/Resources/* \ - ${PREFIX}/share/antiword/resources + ${PREFIX}/share/antiword .include diff --git a/textproc/antiword/distinfo b/textproc/antiword/distinfo index ea10ea728d5..d64f70afb25 100644 --- a/textproc/antiword/distinfo +++ b/textproc/antiword/distinfo @@ -1,3 +1,3 @@ -MD5 (antiword-0.32.tar.gz) = bbbef871b7e7bea4df2102c8f634f81e -RMD160 (antiword-0.32.tar.gz) = e43a0d1e70492639fb4dc8559cb4ea11819656e1 -SHA1 (antiword-0.32.tar.gz) = e8e839fe0934e5dc7269456dec7744c463ec98d9 +MD5 (antiword-0.33.tar.gz) = e2178402066bbb1f5b3a49d47316a1fc +RMD160 (antiword-0.33.tar.gz) = f779e93b3c734bc7a6a40928d28ba48e41b94a65 +SHA1 (antiword-0.33.tar.gz) = 401e25e79a1943e53cc6c1673b72e6cb4ccd62ee diff --git a/textproc/antiword/patches/patch-antiword_h b/textproc/antiword/patches/patch-antiword_h index 1e3b114aecf..80c723dcc45 100644 --- a/textproc/antiword/patches/patch-antiword_h +++ b/textproc/antiword/patches/patch-antiword_h @@ -1,12 +1,11 @@ -$OpenBSD: patch-antiword_h,v 1.3 2002/01/10 22:48:12 mark Exp $ ---- antiword.h.orig Tue Sep 25 21:36:47 2001 -+++ antiword.h Thu Jan 10 14:40:59 2002 -@@ -143,7 +143,7 @@ +--- antiword.h~ Tue Aug 13 12:07:24 2002 ++++ antiword.h Tue Aug 13 12:08:43 2002 +@@ -177,7 +177,7 @@ #define ANTIWORD_DIR "antiword" - #define FONTNAMES_FILE "fontname.txt" - #else --#define GLOBAL_ANTIWORD_DIR "/opt/antiword/share" -+#define GLOBAL_ANTIWORD_DIR "/usr/local/share/antiword/resources" + #define FONTNAMES_FILE "fontnames" + #else /* All others */ +-#define GLOBAL_ANTIWORD_DIR "/usr/share/antiword" ++#define GLOBAL_ANTIWORD_DIR "/usr/local/share/antiword" #define ANTIWORD_DIR ".antiword" #define FONTNAMES_FILE "fontnames" #endif /* __dos */ diff --git a/textproc/antiword/pkg/PLIST b/textproc/antiword/pkg/PLIST index 5b1809633be..0ee372b83e1 100644 --- a/textproc/antiword/pkg/PLIST +++ b/textproc/antiword/pkg/PLIST @@ -1,38 +1,43 @@ -@comment $OpenBSD: PLIST,v 1.5 2001/12/08 19:53:32 obecian Exp $ +@comment $OpenBSD: PLIST,v 1.6 2002/08/15 18:51:28 mark Exp $ bin/antiword bin/antiword-kde-dnd.sh man/man1/antiword.1 +share/antiword/8859-1.txt +share/antiword/8859-10.txt +share/antiword/8859-13.txt +share/antiword/8859-14.txt +share/antiword/8859-15.txt +share/antiword/8859-16.txt +share/antiword/8859-2.txt +share/antiword/8859-3.txt +share/antiword/8859-4.txt +share/antiword/8859-5.txt +share/antiword/8859-6.txt +share/antiword/8859-7.txt +share/antiword/8859-8.txt +share/antiword/8859-9.txt +share/antiword/Default +share/antiword/Example +share/antiword/MacRoman.txt +share/antiword/UTF-8.txt +share/antiword/Unicode +share/antiword/cp1250.txt +share/antiword/cp1251.txt +share/antiword/cp1252.txt +share/antiword/cp437.txt +share/antiword/cp850.txt +share/antiword/cp852.txt +share/antiword/fontnames +share/antiword/fontnames.russian share/antiword/hi32-app-antiword.png share/antiword/hi48-app-antiword.png share/antiword/kde/Antiword.desktop.eu share/antiword/kde/Antiword.desktop.us +share/antiword/koi8-r.txt +share/antiword/koi8-u.txt share/antiword/lo16-app-antiword.png share/antiword/lo32-app-antiword.png -share/antiword/resources/8859-1.txt -share/antiword/resources/8859-10.txt -share/antiword/resources/8859-13.txt -share/antiword/resources/8859-14.txt -share/antiword/resources/8859-15.txt -share/antiword/resources/8859-2.txt -share/antiword/resources/8859-3.txt -share/antiword/resources/8859-4.txt -share/antiword/resources/8859-5.txt -share/antiword/resources/8859-6.txt -share/antiword/resources/8859-7.txt -share/antiword/resources/8859-8.txt -share/antiword/resources/8859-9.txt -share/antiword/resources/Default -share/antiword/resources/Example -share/antiword/resources/MacRoman.txt -share/antiword/resources/UTF-8.txt -share/antiword/resources/Unicode -share/antiword/resources/cp1250.txt -share/antiword/resources/cp1251.txt -share/antiword/resources/cp1252.txt -share/antiword/resources/fontnames -share/antiword/resources/fontnames.russian -share/antiword/resources/koi8-r.txt -share/antiword/resources/roman.txt +share/antiword/roman.txt share/doc/antiword/ChangeLog share/doc/antiword/FAQ share/doc/antiword/History @@ -40,6 +45,5 @@ share/doc/antiword/Netscape share/doc/antiword/QandA share/doc/antiword/ReadMe @dirrm share/doc/antiword -@dirrm share/antiword/resources @dirrm share/antiword/kde @dirrm share/antiword