From 0b03fd614a5458d3dadb58e969296c4e8b744abd Mon Sep 17 00:00:00 2001
From: margarida <margarida@openbsd.org>
Date: Mon, 12 May 2003 04:28:52 +0000
Subject: [PATCH] Do not hardcode /usr/local, Remove KDE2-only cruft.

---
 textproc/antiword/Makefile                 | 11 ++---------
 textproc/antiword/patches/patch-antiword_h |  4 ++--
 textproc/antiword/pkg/PLIST                | 10 +---------
 3 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/textproc/antiword/Makefile b/textproc/antiword/Makefile
index 402e51c3f19..11f4f46a2cf 100644
--- a/textproc/antiword/Makefile
+++ b/textproc/antiword/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.15 2003/01/21 01:48:34 margarida Exp $
+# $OpenBSD: Makefile,v 1.16 2003/05/12 04:28:52 margarida Exp $
 
 COMMENT=	"converts MSWord Documents to ASCII Text and PostScript"
 
@@ -17,7 +17,7 @@ PERMIT_PACKAGE_FTP=     Yes
 PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP=   Yes
 
-MAKE_FLAGS=	CC="${CC}" CFLAGS="${CFLAGS} -Wall -pedantic -DNDEBUG" \
+MAKE_FLAGS=	CC="${CC}" CFLAGS="${CFLAGS} -Wall -DNDEBUG" \
 		LD="${CC}"
 
 NO_REGRESS=	Yes
@@ -26,18 +26,11 @@ DOCS=		FAQ Netscape QandA ReadMe
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/antiword ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/Unix-only/KDE2-only/kantiword.sh \
-		${PREFIX}/bin/antiword-kde-dnd.sh
 	${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
 	cd ${WRKSRC}/Docs; ${INSTALL_DATA} ${DOCS} \
 		${PREFIX}/share/doc/antiword
-	${INSTALL_DATA} ${WRKSRC}/Unix-only/KDE2-only/Antiword.desktop.* \
-		${PREFIX}/share/antiword/kde
-	${INSTALL_DATA} ${WRKSRC}/Unix-only/KDE2-only/*.png \
-		${PREFIX}/share/antiword
 	${INSTALL_DATA} ${WRKSRC}/Resources/* \
 		${PREFIX}/share/antiword
 
diff --git a/textproc/antiword/patches/patch-antiword_h b/textproc/antiword/patches/patch-antiword_h
index 35ea03e6b44..612fc4c537e 100644
--- a/textproc/antiword/patches/patch-antiword_h
+++ b/textproc/antiword/patches/patch-antiword_h
@@ -1,4 +1,4 @@
-$OpenBSD: patch-antiword_h,v 1.5 2002/09/08 07:55:26 mark Exp $
+$OpenBSD: patch-antiword_h,v 1.6 2003/05/12 04:28:52 margarida Exp $
 --- antiword.h.orig	Thu Jun 20 02:16:22 2002
 +++ antiword.h	Sun Sep  8 00:49:28 2002
 @@ -177,7 +177,7 @@
@@ -6,7 +6,7 @@ $OpenBSD: patch-antiword_h,v 1.5 2002/09/08 07:55:26 mark Exp $
  #define FONTNAMES_FILE		"fontnames"
  #else	/* All others */
 -#define GLOBAL_ANTIWORD_DIR	"/usr/share/antiword"
-+#define GLOBAL_ANTIWORD_DIR	"/usr/local/share/antiword"
++#define GLOBAL_ANTIWORD_DIR	"${PREFIX}/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 52c74fb4d78..63073f38309 100644
--- a/textproc/antiword/pkg/PLIST
+++ b/textproc/antiword/pkg/PLIST
@@ -1,6 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.7 2003/01/21 01:48:34 margarida Exp $
+@comment $OpenBSD: PLIST,v 1.8 2003/05/12 04:28:52 margarida Exp $
 bin/antiword
-bin/antiword-kde-dnd.sh
 man/man1/antiword.1
 share/antiword/8859-1.txt
 share/antiword/8859-10.txt
@@ -29,19 +28,12 @@ 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/roman.txt
 share/doc/antiword/FAQ
 share/doc/antiword/Netscape
 share/doc/antiword/QandA
 share/doc/antiword/ReadMe
 @dirrm share/doc/antiword
-@dirrm share/antiword/kde
 @dirrm share/antiword