CVS commit: pkgsrc/textproc/catdoc

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Apr  8 08:31:04 UTC 2021

Modified Files:
        pkgsrc/textproc/catdoc: Makefile distinfo
        pkgsrc/textproc/catdoc/patches: patch-ac

Log Message:
catdoc: honor CFLAGS/LDFLAGS.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 pkgsrc/textproc/catdoc/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/textproc/catdoc/distinfo
cvs rdiff -u -r1.7 -r1.8 pkgsrc/textproc/catdoc/patches/patch-ac

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/textproc/catdoc/Makefile
diff -u pkgsrc/textproc/catdoc/Makefile:1.31 pkgsrc/textproc/catdoc/Makefile:1.32
--- pkgsrc/textproc/catdoc/Makefile:1.31        Sun Jun 16 09:08:52 2013
+++ pkgsrc/textproc/catdoc/Makefile     Thu Apr  8 08:31:04 2021
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.31 2013/06/16 09:08:52 ryoon Exp $
-#
+# $NetBSD: Makefile,v 1.32 2021/04/08 08:31:04 wiz Exp $
 
 .include "Makefile.common"
 
+PKGREVISION=           1
+
 CONFIGURE_ARGS+=       --disable-wordview
 CONFIGURE_ENV+=                enable_wordview=no
 CONFIGURE_ENV+=                man1dir=${PREFIX}/${PKGMANDIR}/man1

Index: pkgsrc/textproc/catdoc/distinfo
diff -u pkgsrc/textproc/catdoc/distinfo:1.12 pkgsrc/textproc/catdoc/distinfo:1.13
--- pkgsrc/textproc/catdoc/distinfo:1.12        Thu Mar 23 17:07:00 2017
+++ pkgsrc/textproc/catdoc/distinfo     Thu Apr  8 08:31:04 2021
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.12 2017/03/23 17:07:00 joerg Exp $
+$NetBSD: distinfo,v 1.13 2021/04/08 08:31:04 wiz Exp $
 
 SHA1 (catdoc_0.94.4.orig.tar.gz) = 26c9addb221543288c013ecadf4f6fb0c9eca13e
 RMD160 (catdoc_0.94.4.orig.tar.gz) = 719c1030fa9506c2402a6e2dcd1335ae7594e1a9
 SHA512 (catdoc_0.94.4.orig.tar.gz) = 63e492c40e0abb82df0c93c43d1bd63f15d0c8b60579cf3858f26a0814731920ff621b3384035c9a85da5c448b699801ff3376e7a02cf8e7a413195bd9847ba9
 Size (catdoc_0.94.4.orig.tar.gz) = 679156 bytes
 SHA1 (patch-Makefile.in) = 68860b5f8f48471bfddc66803ac027d56d8ae78a
-SHA1 (patch-ac) = 054c786d0b047302b89f5f8e2847481a115a40f8
+SHA1 (patch-ac) = 1cd8b1f5966ca1e2805c845fb682efeee73d15b5
 SHA1 (patch-desktop_Makefile.in) = da1d4903d0b236af684f97f72b8d6f16b7c925a3
 SHA1 (patch-doc_Makefile.in) = dfe11be92aa209e2d282719678eeb63928088747
 SHA1 (patch-src_xlsparse.c) = 34a735b6d5db833d06c4d6a994d7ea9d1c18ef70

Index: pkgsrc/textproc/catdoc/patches/patch-ac
diff -u pkgsrc/textproc/catdoc/patches/patch-ac:1.7 pkgsrc/textproc/catdoc/patches/patch-ac:1.8
--- pkgsrc/textproc/catdoc/patches/patch-ac:1.7 Sun Jun 16 09:08:52 2013
+++ pkgsrc/textproc/catdoc/patches/patch-ac     Thu Apr  8 08:31:04 2021
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.7 2013/06/16 09:08:52 ryoon Exp $
+$NetBSD: patch-ac,v 1.8 2021/04/08 08:31:04 wiz Exp $
 
 --- src/Makefile.in.orig       2012-12-03 17:59:19.000000000 +0000
 +++ src/Makefile.in
@@ -7,14 +7,14 @@ $NetBSD: patch-ac,v 1.7 2013/06/16 09:08
  all: @buildtargets@
  catdoc: $(OBJ)
 -      $(CC)  -o catdoc  $(OBJ)
-+      $(CC)  -o catdoc  $(OBJ) ${LIBS}
++      $(CC) $(CFLAGS) $(LDFLAGS)  -o catdoc  $(OBJ) ${LIBS}
  xls2csv: $(OBJXLS)
 -      $(CC) -o xls2csv $(OBJXLS) -lm
-+      $(CC) -o xls2csv $(OBJXLS) -lm ${LIBS}
++      $(CC) $(CFLAGS) $(LDFLAGS) -o xls2csv $(OBJXLS) -lm ${LIBS}
  
  catppt: $(OBJPPT)
 -      $(CC) -o catppt $(OBJPPT) -lm
-+      $(CC) -o catppt $(OBJPPT) -lm ${LIBS}
++      $(CC) $(CFLAGS) $(LDFLAGS) -o catppt $(OBJPPT) -lm ${LIBS}
  
  install: @installtargets@
  install-catdoc:catdoc xls2csv catppt