diff options
| author | joerg <joerg@pkgsrc.org> | 2010-05-28 16:18:23 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2010-05-28 16:18:23 +0000 |
| commit | af55fed87a0a5630caf1df70bef7e0d72ca5b1d2 (patch) | |
| tree | 70e5fadfb9d26bc7f5758ef96c7dae35f6e4c807 /textproc | |
| parent | 2f7fed16b3b9fa0008b7172d1088f3470ccdad84 (diff) | |
| download | pkgsrc-af55fed87a0a5630caf1df70bef7e0d72ca5b1d2.tar.gz | |
Fix build
Diffstat (limited to 'textproc')
| -rw-r--r-- | textproc/OdfConverter/Makefile | 3 | ||||
| -rw-r--r-- | textproc/OdfConverter/distinfo | 4 | ||||
| -rw-r--r-- | textproc/OdfConverter/patches/patch-aa | 15 |
3 files changed, 16 insertions, 6 deletions
diff --git a/textproc/OdfConverter/Makefile b/textproc/OdfConverter/Makefile index f9ef9668746..b86c2aec9cc 100644 --- a/textproc/OdfConverter/Makefile +++ b/textproc/OdfConverter/Makefile @@ -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 @@ do-install: ${DESTDIR}${PREFIX}/share/doc/OdfConverter/README.TXT .include "../../lang/mono/buildlink3.mk" +.include "../../x11/gtk2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/OdfConverter/distinfo b/textproc/OdfConverter/distinfo index 4c2372eac0f..a0580de67ad 100644 --- a/textproc/OdfConverter/distinfo +++ b/textproc/OdfConverter/distinfo @@ -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 --git a/textproc/OdfConverter/patches/patch-aa b/textproc/OdfConverter/patches/patch-aa index 7adaf08fc6c..668a6a0508e 100644 --- a/textproc/OdfConverter/patches/patch-aa +++ b/textproc/OdfConverter/patches/patch-aa @@ -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 @@ $NetBSD: patch-aa,v 1.3 2009/09/02 08:47:15 wiz Exp $ + -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) |