diff options
| author | sketch <sketch@pkgsrc.org> | 2004-08-20 09:14:19 +0000 |
|---|---|---|
| committer | sketch <sketch@pkgsrc.org> | 2004-08-20 09:14:19 +0000 |
| commit | 8e01de3f29c99911275dfbb0d5de379c7881fed0 (patch) | |
| tree | a56e2cce0e9c03475d29e4477effcd977630e201 | |
| parent | 82f6b38682f0552b8d8ba42796312bfdc1767c0a (diff) | |
| download | pkgsrc-8e01de3f29c99911275dfbb0d5de379c7881fed0.tar.gz | |
Clean up the patch to allow building with compilers other than GCC, and link
using the C compiler to enable 64bit sunpro builds.
| -rw-r--r-- | textproc/antiword/distinfo | 4 | ||||
| -rw-r--r-- | textproc/antiword/patches/patch-aa | 39 |
2 files changed, 22 insertions, 21 deletions
diff --git a/textproc/antiword/distinfo b/textproc/antiword/distinfo index e7a8afc4897..14e40ca1046 100644 --- a/textproc/antiword/distinfo +++ b/textproc/antiword/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.8 2003/12/12 22:31:55 wiz Exp $ +$NetBSD: distinfo,v 1.9 2004/08/20 09:14:19 sketch Exp $ SHA1 (antiword-0.35.tar.gz) = 9a54b49751835c03297840a1dfcb48a411fca460 Size (antiword-0.35.tar.gz) = 272247 bytes -SHA1 (patch-aa) = 713ec0e4659adfd75de7f3f5d7cb278369bfc3d8 +SHA1 (patch-aa) = 31929a30dc674b7a4b0aa9e592f0def3728da10d diff --git a/textproc/antiword/patches/patch-aa b/textproc/antiword/patches/patch-aa index 7b477e6f82c..a77788d8db0 100644 --- a/textproc/antiword/patches/patch-aa +++ b/textproc/antiword/patches/patch-aa @@ -1,33 +1,28 @@ -$NetBSD: patch-aa,v 1.7 2003/12/12 22:31:55 wiz Exp $ +$NetBSD: patch-aa,v 1.8 2004/08/20 09:14:19 sketch Exp $ ---- Makefile.orig Wed Feb 26 21:05:47 2003 -+++ Makefile +--- Makefile.orig Wed Feb 26 20:05:47 2003 ++++ Makefile Fri Aug 20 10:05:22 2004 @@ -2,8 +2,8 @@ # Makefile for antiword (Linux version) # -CC = gcc -LD = gcc -+CC ?= gcc -+LD = ${CC} ++#CC = gcc ++#LD = gcc INSTALL = cp -f INSTALL_PROGRAM = $(INSTALL) -@@ -12,11 +12,11 @@ INSTALL_DATA = $(INSTALL) - # must be equal to DEBUG or NDEBUG - DB = NDEBUG - # Optimization: -O<n> or debugging: -g --OPT = -O2 -+OPT = +@@ -16,7 +16,7 @@ LDLIBS = -CFLAGS = -Wall -pedantic $(OPT) -D$(DB) -+CFLAGS += -Wall -pedantic $(OPT) -D$(DB) ++CFLAGS += -D$(DB) LDFLAGS = OBJS =\ -@@ -29,22 +29,31 @@ OBJS =\ +@@ -29,23 +29,32 @@ worddos.o wordlib.o wordmac.o wordole.o wordwin.o xmalloc.o xml.o PROGS =\ @@ -62,11 +57,12 @@ $NetBSD: patch-aa,v 1.7 2003/12/12 22:31:55 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 -@@ -68,6 +77,7 @@ global_uninstall: + # @[ `id -u` -eq 0 ] || (echo "You must be root to do this" && false) +@@ -68,10 +77,11 @@ clean: rm -f $(OBJS) rm -f $(PROGS) @@ -74,13 +70,18 @@ $NetBSD: patch-aa,v 1.7 2003/12/12 22:31:55 wiz Exp $ antiword: $(OBJS) @rm -f $@ -@@ -79,9 +89,6 @@ kantiword: Unix-only/KDE2-only/kantiword - echo "#!/bin/sh" > $@ +- $(LD) $(LDFLAGS) $(OBJS) $(LDLIBS) -o $@ ++ $(CC) $(CFLAGS) $(OBJS) -o $@ + @chmod 750 $@ + + kantiword: Unix-only/KDE2-only/kantiword.sh +@@ -80,9 +90,6 @@ cat $? >> $@ @chmod 750 $@ -- + -.c.o: - $(CC) $(CFLAGS) -c $< - +- main_u.o: version.h postscript.o: version.h + fonts_u.o: fontinfo.h |