Thu Nov 12 05:03:47 2009 UTC ()
honor PKGMANDIR, PR 42290.


(obache)
diff -r1.19 -r1.20 pkgsrc/textproc/antiword/distinfo
diff -r1.11 -r1.12 pkgsrc/textproc/antiword/patches/patch-aa
cvs diff -r1.19 -r1.20 pkgsrc/textproc/antiword/distinfo (expand / switch to unified diff)

--- pkgsrc/textproc/antiword/distinfo 2008/06/12 02:14:47 1.19
+++ pkgsrc/textproc/antiword/distinfo 2009/11/12 05:03:47 1.20
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.19 2008/06/12 02:14:47 joerg Exp $ 1$NetBSD: distinfo,v 1.20 2009/11/12 05:03:47 obache Exp $
2 2
3SHA1 (antiword-0.37.tar.gz) = 4364f7f99cb2d37f7d1d5bc14a335ccc0c67292e 3SHA1 (antiword-0.37.tar.gz) = 4364f7f99cb2d37f7d1d5bc14a335ccc0c67292e
4RMD160 (antiword-0.37.tar.gz) = 506ca4a7a7fa9fd4574092798a7fffacd9a3a0a0 4RMD160 (antiword-0.37.tar.gz) = 506ca4a7a7fa9fd4574092798a7fffacd9a3a0a0
5Size (antiword-0.37.tar.gz) = 317884 bytes 5Size (antiword-0.37.tar.gz) = 317884 bytes
6SHA1 (patch-aa) = f8f5d2b5120bba46495cb145930d3bcac7bdf9b2 6SHA1 (patch-aa) = 2caa51e3364e7034443ded9fa56cdda4c4b74929
7SHA1 (patch-ab) = d2cb15824b78346a8a5ae301b0618a81437ce971 7SHA1 (patch-ab) = d2cb15824b78346a8a5ae301b0618a81437ce971
cvs diff -r1.11 -r1.12 pkgsrc/textproc/antiword/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/textproc/antiword/patches/patch-aa 2008/06/12 02:14:47 1.11
+++ pkgsrc/textproc/antiword/patches/patch-aa 2009/11/12 05:03:47 1.12
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-aa,v 1.11 2008/06/12 02:14:47 joerg Exp $ 1$NetBSD: patch-aa,v 1.12 2009/11/12 05:03:47 obache Exp $
2 2
3--- Makefile.orig 2005-10-29 19:13:15.000000000 +0200 3--- Makefile.orig 2005-10-29 19:13:15.000000000 +0200
4+++ Makefile 4+++ Makefile
5@@ -2,8 +2,8 @@ 5@@ -2,8 +2,8 @@
6 # Makefile for antiword (Linux version) 6 # Makefile for antiword (Linux version)
7 # 7 #
8  8
9-CC = gcc 9-CC = gcc
10-LD = gcc 10-LD = gcc
11+#CC = gcc 11+#CC = gcc
12+#LD = gcc 12+#LD = gcc
13  13
14 INSTALL = cp -f 14 INSTALL = cp -f
@@ -42,27 +42,27 @@ $NetBSD: patch-aa,v 1.11 2008/06/12 02:1 @@ -42,27 +42,27 @@ $NetBSD: patch-aa,v 1.11 2008/06/12 02:1
42 all: $(PROGS) 42 all: $(PROGS)
43  43
44 install: all 44 install: all
45- mkdir -p $(LOCAL_INSTALL_DIR) 45- mkdir -p $(LOCAL_INSTALL_DIR)
46- cp -pf $(PROGS) $(LOCAL_INSTALL_DIR) 46- cp -pf $(PROGS) $(LOCAL_INSTALL_DIR)
47- mkdir -p $(LOCAL_RESOURCES_DIR) 47- mkdir -p $(LOCAL_RESOURCES_DIR)
48- cp -pf Resources/* $(LOCAL_RESOURCES_DIR) 48- cp -pf Resources/* $(LOCAL_RESOURCES_DIR)
49+ ${BSD_INSTALL_PROGRAM} ${PROGS} ${GLOBAL_INSTALL_DIR} 49+ ${BSD_INSTALL_PROGRAM} ${PROGS} ${GLOBAL_INSTALL_DIR}
50+ ${BSD_INSTALL_SCRIPT} ${SCRIPTS} ${GLOBAL_INSTALL_DIR} 50+ ${BSD_INSTALL_SCRIPT} ${SCRIPTS} ${GLOBAL_INSTALL_DIR}
51+ ${BSD_INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/antiword 51+ ${BSD_INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/antiword
52+.for file in COPYING ChangeLog FAQ History Netscape QandA ReadMe 52+.for file in COPYING ChangeLog FAQ History Netscape QandA ReadMe
53+ ${BSD_INSTALL_DATA} Docs/${file} ${DESTDIR}${PREFIX}/share/doc/antiword 53+ ${BSD_INSTALL_DATA} Docs/${file} ${DESTDIR}${PREFIX}/share/doc/antiword
54+.endfor 54+.endfor
55+ ${BSD_INSTALL_MAN} Docs/antiword.1 ${DESTDIR}${PREFIX}/man/man1/antiword.1 55+ ${BSD_INSTALL_MAN} Docs/antiword.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/antiword.1
56+ ${BSD_INSTALL_DATA_DIR} ${GLOBAL_RESOURCES_DIR} 56+ ${BSD_INSTALL_DATA_DIR} ${GLOBAL_RESOURCES_DIR}
57+ for i in Resources/* ; do \ 57+ for i in Resources/* ; do \
58+ ${BSD_INSTALL_DATA} $$i ${GLOBAL_RESOURCES_DIR};\ 58+ ${BSD_INSTALL_DATA} $$i ${GLOBAL_RESOURCES_DIR};\
59+ done 59+ done
60  60
61 # NOTE: you might have to be root to do this 61 # NOTE: you might have to be root to do this
62 global_install: all 62 global_install: all
63@@ -70,10 +78,11 @@ global_uninstall: 63@@ -70,10 +78,11 @@ global_uninstall:
64 clean: 64 clean:
65 rm -f $(OBJS) 65 rm -f $(OBJS)
66 rm -f $(PROGS) 66 rm -f $(PROGS)
67+ rm -f $(SCRIPTS) 67+ rm -f $(SCRIPTS)
68  68