[pkgsrc/trunk]: pkgsrc/textproc/OdfConverter Fix build

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/444714918495
branches:  trunk
changeset: 576009:444714918495
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Fri May 28 16:18:23 2010 +0000

description:
Fix build

diffstat:

 textproc/OdfConverter/Makefile         |   3 ++-
 textproc/OdfConverter/distinfo         |   4 ++--
 textproc/OdfConverter/patches/patch-aa |  15 ++++++++++++---
 3 files changed, 16 insertions(+), 6 deletions(-)

diffs (61 lines):

diff -r 834ac0881113 -r 444714918495 textproc/OdfConverter/Makefile
--- a/textproc/OdfConverter/Makefile    Fri May 28 15:31:04 2010 +0000
+++ b/textproc/OdfConverter/Makefile    Fri May 28 16:18:23 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2009/11/12 01:15:31 dsainty Exp $
+# $NetBSD: Makefile,v 1.7 2010/05/28 16:18:23 joerg Exp $
 #
 
 DISTNAME=      OdfAddinForOffice-src-3.0
@@ -73,4 +73,5 @@
                ${DESTDIR}${PREFIX}/share/doc/OdfConverter/README.TXT
 
 .include "../../lang/mono/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 834ac0881113 -r 444714918495 textproc/OdfConverter/distinfo
--- a/textproc/OdfConverter/distinfo    Fri May 28 15:31:04 2010 +0000
+++ b/textproc/OdfConverter/distinfo    Fri May 28 16:18:23 2010 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.3 2009/09/02 08:47:15 wiz Exp $
+$NetBSD: distinfo,v 1.4 2010/05/28 16:18:23 joerg Exp $
 
 SHA1 (OdfAddinForOffice-src-3.0.zip) = 678d98672ecca9adabe1221b1725c255f4f88fe5
 RMD160 (OdfAddinForOffice-src-3.0.zip) = ff6ddab2784ef1d54261cde15abfb7e98e30b80a
 Size (OdfAddinForOffice-src-3.0.zip) = 34547426 bytes
-SHA1 (patch-aa) = 0cd0e5263c2cf3cc524662fb751e4d9812f83f32
+SHA1 (patch-aa) = 33ed2b5d999d71b9ad1edee87328eebb5f408d57
 SHA1 (patch-ab) = 1240ea11736009463bf937ccc547e5037d411626
 SHA1 (patch-ac) = 5e48d1f5a0a40912f56154bbbaaeea74819cd202
diff -r 834ac0881113 -r 444714918495 textproc/OdfConverter/patches/patch-aa
--- a/textproc/OdfConverter/patches/patch-aa    Fri May 28 15:31:04 2010 +0000
+++ b/textproc/OdfConverter/patches/patch-aa    Fri May 28 16:18:23 2010 +0000
@@ -1,8 +1,17 @@
-$NetBSD: patch-aa,v 1.3 2009/09/02 08:47:15 wiz Exp $
+$NetBSD: patch-aa,v 1.4 2010/05/28 16:18:23 joerg Exp $
 
 --- source/Shell/OdfConverter/Makefile.orig    2007-12-19 15:16:04.000000000 +0100
 +++ source/Shell/OdfConverter/Makefile
-@@ -71,9 +71,9 @@ else
+@@ -64,16 +64,16 @@ ifeq ($(OS),Darwin)
+       $(CC) -o OdfConverter -Wall `pkg-config --cflags mono` main.c \
+               `pkg-config --libs-only-L mono` -bind_at_load -all_load -lz \
+           ../../AdditionalTools/zlib123/contrib/minizip/libzlibwapi.a \
+-              `pkg-config --libs-only-l mono` bundle.o
++              `pkg-config --libs-only-l mono gtk+-2.0 gthread-2.0` bundle.o
+ else
+-      $(CC) -o OdfConverter$(EXEEXT) -Wall `pkg-config --cflags mono` main.c \
++      $(CC) -o OdfConverter$(EXEEXT) -Wall `pkg-config --cflags mono gtk+-2.0 gthread-2.0` main.c \
+           $(KILLAT) \
            bundle.o \
            $(EXPORTDYNAMIC) \
            -Wl,--undefined=$(ZIPOPEN) -Wl,--undefined=$(UNZOPEN) \
@@ -10,7 +19,7 @@
 +          -L../../AdditionalTools/zlib123/contrib/minizip \
            -Wl,-Bstatic -lmono -lzlibwapi -Wl,-Bdynamic  \
 -          `pkg-config --libs-only-l mono | sed -e "s/\-lmono //"` \
-+          `pkg-config --libs mono | sed -e "s/\-lmono //"` \
++          `pkg-config --libs mono gtk+-2.0 gthread-2.0 | sed -e "s/\-lmono //"` \
            $(ZLIB) $(OTHERLIBS)
  endif
  ifeq ($(OS),Cygwin)