diff options
author | kefren <kefren@pkgsrc.org> | 2015-05-23 06:43:00 +0000 |
---|---|---|
committer | kefren <kefren@pkgsrc.org> | 2015-05-23 06:43:00 +0000 |
commit | 431caecb11389d6611af44673b3ad21dba4bca3e (patch) | |
tree | e42ae9ff7a9fc7e8ab1612ccb5f19d8ff41f2791 | |
parent | fe55fda2255ba4af898e9a999a8f58ca4eb608aa (diff) | |
download | pkgsrc-431caecb11389d6611af44673b3ad21dba4bca3e.tar.gz |
Switch away from mono2
-rw-r--r-- | textproc/OdfConverter/Makefile | 6 | ||||
-rw-r--r-- | textproc/OdfConverter/distinfo | 5 | ||||
-rw-r--r-- | textproc/OdfConverter/patches/patch-aa | 17 | ||||
-rw-r--r-- | textproc/OdfConverter/patches/patch-build_common.mk | 15 |
4 files changed, 30 insertions, 13 deletions
diff --git a/textproc/OdfConverter/Makefile b/textproc/OdfConverter/Makefile index bed3cdc24be..e2dd4091253 100644 --- a/textproc/OdfConverter/Makefile +++ b/textproc/OdfConverter/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.38 2015/04/25 14:24:56 tnn Exp $ +# $NetBSD: Makefile,v 1.39 2015/05/23 06:43:00 kefren Exp $ # DISTNAME= OdfAddinForOffice-src-3.0 PKGNAME= OdfConverter-3.0 -PKGREVISION= 30 +PKGREVISION= 31 CATEGORIES= converters textproc MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=odf-converter/} EXTRACT_SUFX= .zip @@ -70,6 +70,6 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/source/Shell/OdfConverter/README.TXT \ ${DESTDIR}${PREFIX}/share/doc/OdfConverter/README.TXT -.include "../../lang/mono2/buildlink3.mk" +.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 6ae008bc774..707d728d395 100644 --- a/textproc/OdfConverter/distinfo +++ b/textproc/OdfConverter/distinfo @@ -1,8 +1,9 @@ -$NetBSD: distinfo,v 1.5 2011/09/25 20:11:11 joerg Exp $ +$NetBSD: distinfo,v 1.6 2015/05/23 06:43:00 kefren 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) = 633d675ee3a2d12e99874da0c936e9c5a9b6f964 +SHA1 (patch-aa) = cf6b802a221f7dbec6a92a6c20e5892055fd03e4 SHA1 (patch-ab) = 1240ea11736009463bf937ccc547e5037d411626 SHA1 (patch-ac) = 5e48d1f5a0a40912f56154bbbaaeea74819cd202 +SHA1 (patch-build_common.mk) = 08f61bb2459aad674f2d9db20a44280e3702ab94 diff --git a/textproc/OdfConverter/patches/patch-aa b/textproc/OdfConverter/patches/patch-aa index eb7eea0528f..3a1be9c1254 100644 --- a/textproc/OdfConverter/patches/patch-aa +++ b/textproc/OdfConverter/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.5 2011/09/25 20:11:11 joerg Exp $ +$NetBSD: patch-aa,v 1.6 2015/05/23 06:43:00 kefren Exp $ ---- source/Shell/OdfConverter/Makefile.orig 2007-12-19 15:16:04.000000000 +0100 -+++ source/Shell/OdfConverter/Makefile -@@ -54,7 +54,7 @@ OdfConverterTestStatic.exe : $(SOURCE) . +--- source/Shell/OdfConverter/Makefile.orig 2008-09-26 21:49:32.000000000 +0300 ++++ source/Shell/OdfConverter/Makefile 2015-05-23 09:10:54.000000000 +0300 +@@ -54,7 +54,7 @@ $(SOURCE) main.c bundle.o : OdfConverterTestStatic.exe Makefile @@ -11,12 +11,13 @@ $NetBSD: patch-aa,v 1.5 2011/09/25 20:11:11 joerg Exp $ OdfConverter$(EXEEXT) : main.c bundle.o $(ZLIBDEP) Makefile rm -f $@ -@@ -64,16 +64,16 @@ ifeq ($(OS),Darwin) +@@ -64,16 +64,17 @@ $(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-2 gtk+-2.0 gthread-2.0` bundle.o ++ `pkg-config --libs-only-l mono-2 gtk+-2.0 gthread-2.0` \ ++ `pkg-config --cflags mono-2` bundle.o else - $(CC) -o OdfConverter$(EXEEXT) -Wall `pkg-config --cflags mono` main.c \ + $(CC) -o OdfConverter$(EXEEXT) -Wall `pkg-config --cflags mono-2 gtk+-2.0 gthread-2.0` main.c \ @@ -25,10 +26,10 @@ $NetBSD: patch-aa,v 1.5 2011/09/25 20:11:11 joerg Exp $ $(EXPORTDYNAMIC) \ -Wl,--undefined=$(ZIPOPEN) -Wl,--undefined=$(UNZOPEN) \ - `pkg-config --libs-only-L mono` -L../../AdditionalTools/zlib123/contrib/minizip \ -+ -L../../AdditionalTools/zlib123/contrib/minizip \ - -Wl,-Bstatic -lmono -lzlibwapi -Wl,-Bdynamic \ -+ -Wl,-Bstatic -lmono-2.0 -lzlibwapi -Wl,-Bdynamic \ - `pkg-config --libs-only-l mono | sed -e "s/\-lmono //"` \ ++ -L../../AdditionalTools/zlib123/contrib/minizip \ ++ -Wl,-Bstatic -lmonoboehm-2.0 -lzlibwapi -Wl,-Bdynamic \ + `pkg-config --libs mono-2 gtk+-2.0 gthread-2.0 | sed -e "s/\-lmono-2.0 //"` \ $(ZLIB) $(OTHERLIBS) endif diff --git a/textproc/OdfConverter/patches/patch-build_common.mk b/textproc/OdfConverter/patches/patch-build_common.mk new file mode 100644 index 00000000000..e602fe96333 --- /dev/null +++ b/textproc/OdfConverter/patches/patch-build_common.mk @@ -0,0 +1,15 @@ +$NetBSD: patch-build_common.mk,v 1.1 2015/05/23 06:43:00 kefren Exp $ + +Build with mcs + +--- build/common.mk.orig 2015-05-22 19:54:31.000000000 +0300 ++++ build/common.mk 2015-05-22 19:54:38.000000000 +0300 +@@ -9,7 +9,7 @@ + + CC=gcc + LD=ld +-CSC=gmcs ++CSC=mcs + CSC_DEBUG=-d:DEBUG -debug+ + RECURSIVE_TARGETS = check clean install uninstall + |