diff options
46 files changed, 126 insertions, 142 deletions
diff --git a/databases/csharp-mysql/Makefile b/databases/csharp-mysql/Makefile index f5ab5cece48..027fec86517 100644 --- a/databases/csharp-mysql/Makefile +++ b/databases/csharp-mysql/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2012/10/02 21:25:16 asau Exp $ +# $NetBSD: Makefile,v 1.3 2013/06/17 12:44:53 wiz Exp $ DISTNAME= mysql-connector-net-6.3.5-noinstall PKGNAME= csharp-mysql-6.3.5 @@ -11,7 +11,7 @@ HOMEPAGE= http://dev.mysql.com/downloads/connector/net/ COMMENT= Fully managed ADO.NET driver for MySQL LICENSE= gnu-gpl-v2 -DEPENDS+= mono>=2.0:../../lang/mono +DEPENDS+= mono>=2.0<3:../../lang/mono2 EXTRACT_DIR= ${WRKDIR}/${PKGNAME} WRKSRC= ${EXTRACT_DIR} diff --git a/devel/libthrift/Makefile b/devel/libthrift/Makefile index b19a95936d3..a64db6bad4a 100644 --- a/devel/libthrift/Makefile +++ b/devel/libthrift/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.32 2013/05/31 12:40:01 wiz Exp $ +# $NetBSD: Makefile,v 1.33 2013/06/17 12:44:53 wiz Exp $ DISTNAME= thrift-${THRIFT_VERSION} PKGNAME= libthrift-${THRIFT_VERSION} -PKGREVISION= 15 +PKGREVISION= 16 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_APACHE:=thrift/${THRIFT_VERSION}/} diff --git a/devel/libthrift/options.mk b/devel/libthrift/options.mk index 4459eaf4e28..0c426348984 100644 --- a/devel/libthrift/options.mk +++ b/devel/libthrift/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.5 2011/10/14 03:25:33 dholland Exp $ +# $NetBSD: options.mk,v 1.6 2013/06/17 12:44:53 wiz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.libthrift PKG_SUPPORTED_OPTIONS= csharp java erlang python perl php ruby @@ -17,7 +17,7 @@ post-install: ${INSTALL_LIB} ${WRKSRC}/lib/csharp/Thrift.dll \ ${DESTDIR}${PREFIX}/lib/thrift/Thrift.dll -.include "../../lang/mono/buildlink3.mk" +.include "../../lang/mono2/buildlink3.mk" .else CONFIGURE_ARGS+= --without-csharp .endif diff --git a/devel/mono-addins/Makefile b/devel/mono-addins/Makefile index a26b91252fc..439d3a68583 100644 --- a/devel/mono-addins/Makefile +++ b/devel/mono-addins/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.22 2013/05/09 07:39:07 adam Exp $ +# $NetBSD: Makefile,v 1.23 2013/06/17 12:44:53 wiz Exp $ DISTNAME= mono-addins-1.0 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= devel MASTER_SITES= -http://download-codeplex.sec.s-msft.com/Download/Release?ProjectName=monoaddins&DownloadId=509482&FileTime=129948574181430000&Build=19556 @@ -14,6 +14,6 @@ GNU_CONFIGURE= yes USE_TOOLS+= gmake pkg-config MAKE_JOBS_SAFE= no -.include "../../lang/mono/buildlink3.mk" +.include "../../lang/mono2/buildlink3.mk" .include "../../x11/gtk-sharp/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/mono-addins/buildlink3.mk b/devel/mono-addins/buildlink3.mk index f9815ac4af7..babf81a4071 100644 --- a/devel/mono-addins/buildlink3.mk +++ b/devel/mono-addins/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.12 2013/05/09 07:39:07 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2013/06/17 12:44:53 wiz Exp $ BUILDLINK_TREE+= mono-addins @@ -6,11 +6,11 @@ BUILDLINK_TREE+= mono-addins MONO_ADDINS_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.mono-addins+= mono-addins>=0.3 -BUILDLINK_ABI_DEPENDS.mono-addins+= mono-addins>=1.0nb2 +BUILDLINK_ABI_DEPENDS.mono-addins+= mono-addins>=1.0nb3 BUILDLINK_PKGSRCDIR.mono-addins?= ../../devel/mono-addins BUILDLINK_CONTENTS_FILTER.mono-addins+= ${EGREP} '^lib/' -.include "../../lang/mono/buildlink3.mk" +.include "../../lang/mono2/buildlink3.mk" .include "../../x11/gtk-sharp/buildlink3.mk" .endif # MONO_ADDINS_BUILDLINK3_MK diff --git a/devel/mono-addins/distinfo b/devel/mono-addins/distinfo index 85f0117fd66..bb196e7d0b1 100644 --- a/devel/mono-addins/distinfo +++ b/devel/mono-addins/distinfo @@ -1,6 +1,5 @@ -$NetBSD: distinfo,v 1.7 2013/05/29 11:13:03 wiz Exp $ +$NetBSD: distinfo,v 1.8 2013/06/17 12:44:53 wiz Exp $ SHA1 (mono-addins-1.0.tar.gz) = f6c4b4c0bb64fcd8ba7d0ef4ade9e4cc42c03434 RMD160 (mono-addins-1.0.tar.gz) = 591dd434a10069cb249f32834248dcb4bccd4928 Size (mono-addins-1.0.tar.gz) = 539596 bytes -SHA1 (patch-Mono.Addins.Gui_Mono.Addins.Gui.csproj) = 467bec67decf82312122b61a75b65ce3a413e35a diff --git a/devel/mono-addins/patches/patch-Mono.Addins.Gui_Mono.Addins.Gui.csproj b/devel/mono-addins/patches/patch-Mono.Addins.Gui_Mono.Addins.Gui.csproj deleted file mode 100644 index 95c75e7bdc8..00000000000 --- a/devel/mono-addins/patches/patch-Mono.Addins.Gui_Mono.Addins.Gui.csproj +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-Mono.Addins.Gui_Mono.Addins.Gui.csproj,v 1.1 2013/05/29 11:13:03 wiz Exp $ - -Fix -: error CS1705: Assembly `gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f' references `Mono.Cairo, Version=4.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756' which has a higher version number than imported assembly `Mono.Cairo, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756' -Mono.Addins.Gui/HeaderBox.cs(133,47): error CS0012: The type `Cairo.Context' is defined in an assembly that is not referenced. Consider adding a reference to assembly `Mono.Cairo, Version=4.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756' - ---- Mono.Addins.Gui/Mono.Addins.Gui.csproj.orig 2012-10-16 10:04:04.000000000 +0000 -+++ Mono.Addins.Gui/Mono.Addins.Gui.csproj -@@ -42,7 +42,7 @@ - <Reference Include="atk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" /> - <Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" /> - <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" /> -- <Reference Include="Mono.Cairo" /> -+ <Reference Include="Mono.Cairo, Version=4.0.0.0" /> - <Reference Include="System.Core" /> - </ItemGroup> - <ItemGroup> diff --git a/devel/mono-tools/Makefile b/devel/mono-tools/Makefile index ee8a2fc9199..6fb82b98d17 100644 --- a/devel/mono-tools/Makefile +++ b/devel/mono-tools/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.55 2013/06/06 12:54:13 wiz Exp $ +# $NetBSD: Makefile,v 1.56 2013/06/17 12:44:53 wiz Exp $ DISTNAME= mono-tools-2.10 -PKGREVISION= 25 +PKGREVISION= 26 CATEGORIES= devel MASTER_SITES= http://ftp.novell.com/pub/mono/sources/mono-tools/ EXTRACT_SUFX= .tar.bz2 @@ -21,7 +21,7 @@ MAKE_JOBS_SAFE= no CONFIGURE_ARGS+= --mandir=${PKGMANDIR} .include "../../graphics/libgdiplus/buildlink3.mk" -.include "../../lang/mono/buildlink3.mk" +.include "../../lang/mono2/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" .include "../../x11/gnome-sharp/buildlink3.mk" .include "../../x11/gnome-desktop-sharp/buildlink3.mk" diff --git a/devel/monodevelop-database/Makefile b/devel/monodevelop-database/Makefile index 4daac0ec1cf..8c9568f4c14 100644 --- a/devel/monodevelop-database/Makefile +++ b/devel/monodevelop-database/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.25 2013/06/06 12:54:14 wiz Exp $ +# $NetBSD: Makefile,v 1.26 2013/06/17 12:44:53 wiz Exp $ DISTNAME= monodevelop-database-2.4 -PKGREVISION= 23 +PKGREVISION= 24 CATEGORIES= devel MASTER_SITES= http://ftp.novell.com/pub/mono/sources/monodevelop-database/ EXTRACT_SUFX= .tar.bz2 @@ -19,7 +19,7 @@ MAKE_JOBS_SAFE= no .include "../../devel/mono-addins/buildlink3.mk" .include "../../devel/monodevelop/buildlink3.mk" -.include "../../lang/mono/buildlink3.mk" +.include "../../lang/mono2/buildlink3.mk" .include "../../x11/gtk-sharp/buildlink3.mk" .include "../../x11/gnome-sharp/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/monodevelop/Makefile b/devel/monodevelop/Makefile index 2dedbfce2f7..9cd75f1dc9d 100644 --- a/devel/monodevelop/Makefile +++ b/devel/monodevelop/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.62 2013/06/06 12:53:45 wiz Exp $ +# $NetBSD: Makefile,v 1.63 2013/06/17 12:44:53 wiz Exp $ DISTNAME= monodevelop-2.4.2 -PKGREVISION= 23 +PKGREVISION= 24 CATEGORIES= devel MASTER_SITES= http://ftp.novell.com/pub/mono/sources/monodevelop/ EXTRACT_SUFX= .tar.bz2 @@ -41,7 +41,7 @@ SUBST_SED.fix-gmake= -e 's,MAKEPROGRAM,${MAKE_PROGRAM},' .include "../../devel/mono-addins/buildlink3.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../graphics/libgdiplus/buildlink3.mk" -.include "../../lang/mono/buildlink3.mk" +.include "../../lang/mono2/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" .include "../../x11/gtksourceview-sharp2/buildlink3.mk" .include "../../x11/gtk-sharp/buildlink3.mk" diff --git a/devel/monodevelop/buildlink3.mk b/devel/monodevelop/buildlink3.mk index 766e42e9480..2697592883b 100644 --- a/devel/monodevelop/buildlink3.mk +++ b/devel/monodevelop/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.23 2013/06/06 12:53:45 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.24 2013/06/17 12:44:53 wiz Exp $ BUILDLINK_TREE+= monodevelop @@ -6,14 +6,14 @@ BUILDLINK_TREE+= monodevelop MONODEVELOP_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.monodevelop+= monodevelop>=2.4 -BUILDLINK_ABI_DEPENDS.monodevelop+= monodevelop>=2.4.2nb23 +BUILDLINK_ABI_DEPENDS.monodevelop+= monodevelop>=2.4.2nb24 BUILDLINK_PKGSRCDIR.monodevelop?= ../../devel/monodevelop BUILDLINK_CONTENTS_FILTER.monodevelop+= ${EGREP} '^lib/' .include "../../databases/shared-mime-info/buildlink3.mk" .include "../../devel/mono-addins/buildlink3.mk" .include "../../graphics/libgdiplus/buildlink3.mk" -.include "../../lang/mono/buildlink3.mk" +.include "../../lang/mono2/buildlink3.mk" .include "../../x11/gtksourceview-sharp2/buildlink3.mk" .include "../../x11/gtk-sharp/buildlink3.mk" .include "../../x11/gnome-sharp/buildlink3.mk" diff --git a/devel/nant/Makefile b/devel/nant/Makefile index 82b988237b6..e27227394f6 100644 --- a/devel/nant/Makefile +++ b/devel/nant/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.11 2013/05/09 07:39:37 adam Exp $ +# $NetBSD: Makefile,v 1.12 2013/06/17 12:44:54 wiz Exp $ # DISTNAME= nant-0.86-beta1-src PKGNAME= nant-0.86beta1 -PKGREVISION= 7 +PKGREVISION= 8 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=nant/} @@ -25,5 +25,5 @@ INSTALL_MAKE_FLAGS+= prefix=${DESTDIR}${PREFIX} \ do-configure: cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} setup -.include "../../lang/mono/buildlink3.mk" +.include "../../lang/mono2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/editors/tomboy/Makefile b/editors/tomboy/Makefile index ee9c92fdd33..00ae916d8d3 100644 --- a/editors/tomboy/Makefile +++ b/editors/tomboy/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.53 2013/06/06 12:54:17 wiz Exp $ +# $NetBSD: Makefile,v 1.54 2013/06/17 12:44:54 wiz Exp $ # DISTNAME= tomboy-1.2.1 -PKGREVISION= 29 +PKGREVISION= 30 CATEGORIES= editors misc MASTER_SITES= ${MASTER_SITE_GNOME:=sources/tomboy/1.2/} @@ -28,7 +28,7 @@ BUILDLINK_TRANSFORM+= rm:-DGDK_DISABLE_DEPRECATED BUILDLINK_API_DEPENDS.mono-addins+= mono-addins>=0.3.1 .include "../../devel/mono-addins/buildlink3.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" -.include "../../lang/mono/buildlink3.mk" +.include "../../lang/mono2/buildlink3.mk" # evolution needs gmime-sharp #.include "../../mail/evolution/buildlink3.mk" #.include "../../mail/gmime-sharp/buildlink3.mk" diff --git a/games/gbrainy/Makefile b/games/gbrainy/Makefile index b7790661a7f..51cc2e60ed8 100644 --- a/games/gbrainy/Makefile +++ b/games/gbrainy/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.66 2013/06/06 12:54:21 wiz Exp $ +# $NetBSD: Makefile,v 1.67 2013/06/17 12:44:54 wiz Exp $ # DISTNAME= gbrainy-2.2.0 PKGNAME= gbrainy-2.20 -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= games MASTER_SITES= http://gent.softcatala.org/jmas/gbrainy/ @@ -30,7 +30,7 @@ REPLACE_BASH= src/Clients/Classical/gbrainy.in .include "../../graphics/librsvg/buildlink3.mk" .include "../../graphics/gnome-icon-theme/buildlink3.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" -.include "../../lang/mono/buildlink3.mk" +.include "../../lang/mono2/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" .include "../../textproc/gnome-doc-utils/buildlink3.mk" .include "../../x11/gtk-sharp/buildlink3.mk" diff --git a/graphics/f-spot/Makefile b/graphics/f-spot/Makefile index e9ff20c3d9b..ee5d7297ff2 100644 --- a/graphics/f-spot/Makefile +++ b/graphics/f-spot/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.56 2013/06/06 12:54:29 wiz Exp $ +# $NetBSD: Makefile,v 1.57 2013/06/17 12:44:54 wiz Exp $ # DISTNAME= f-spot-0.8.2 -PKGREVISION= 16 +PKGREVISION= 17 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_GNOME:=sources/f-spot/0.8/} EXTRACT_SUFX= .tar.bz2 @@ -51,7 +51,7 @@ GCONF_SCHEMAS= f-spot.schemas .include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/lcms/buildlink3.mk" .include "../../graphics/libexif/buildlink3.mk" -.include "../../lang/mono/buildlink3.mk" +.include "../../lang/mono2/buildlink3.mk" .include "../../devel/mono-addins/buildlink3.mk" .include "../../textproc/gnome-doc-utils/buildlink3.mk" .include "../../mk/omf-scrollkeeper.mk" diff --git a/lang/mono-basic/Makefile b/lang/mono-basic/Makefile index 2e7291305fa..32304e2417a 100644 --- a/lang/mono-basic/Makefile +++ b/lang/mono-basic/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.19 2013/05/09 07:40:02 adam Exp $ +# $NetBSD: Makefile,v 1.20 2013/06/17 12:44:54 wiz Exp $ DISTNAME= mono-basic-2.10 -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= lang MASTER_SITES= http://ftp.novell.com/pub/mono/sources/mono-basic/ EXTRACT_SUFX= .tar.bz2 @@ -29,5 +29,5 @@ SUBST_MESSAGE.fix-mandir= Fixing man path SUBST_FILES.fix-mandir= build/config.make SUBST_SED.fix-mandir= -e 's,share/man,man,' -.include "../../lang/mono/buildlink3.mk" +.include "../../lang/mono2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/mono/DESCR b/lang/mono/DESCR index d9952fef61c..2c07de55054 100644 --- a/lang/mono/DESCR +++ b/lang/mono/DESCR @@ -4,3 +4,5 @@ that is working to develop an open source, Unix version of the Microsoft build and deploy cross-platform .NET Applications. The project will implement various technologies developed by Microsoft that have now been submitted to the ECMA for standardization. + +This package contains the currently unstable major version 3 of mono. diff --git a/lang/mono/Makefile b/lang/mono/Makefile index f373169c5c0..99b1e82de7d 100644 --- a/lang/mono/Makefile +++ b/lang/mono/Makefile @@ -1,14 +1,14 @@ -# $NetBSD: Makefile,v 1.139 2013/06/06 19:05:45 jperkin Exp $ +# $NetBSD: Makefile,v 1.140 2013/06/17 12:44:54 wiz Exp $ DISTNAME= mono-3.0.10 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= lang MASTER_SITES= http://download.mono-project.com/sources/mono/ EXTRACT_SUFX= .tar.bz2 MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.mono-project.com/ -COMMENT= Open source implementation of the .NET Development Framework +COMMENT= Open source implementation of the .NET Development Framework (v3) LICENSE= mit AND gnu-gpl-v2 AND gnu-lgpl-v2 AND apache-2.0 MAKE_JOBS_SAFE= no diff --git a/lang/mono/buildlink3.mk b/lang/mono/buildlink3.mk index b835886b75f..119cdb0a55c 100644 --- a/lang/mono/buildlink3.mk +++ b/lang/mono/buildlink3.mk @@ -1,12 +1,11 @@ -# $NetBSD: buildlink3.mk,v 1.46 2013/05/29 11:11:12 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.47 2013/06/17 12:44:54 wiz Exp $ BUILDLINK_TREE+= mono .if !defined(MONO_BUILDLINK3_MK) MONO_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.mono+= mono>=2.8 -BUILDLINK_ABI_DEPENDS.mono+= mono>=2.10.6nb3 +BUILDLINK_API_DEPENDS.mono+= mono>=3 BUILDLINK_PKGSRCDIR.mono?= ../../lang/mono ALL_ENV+= MONO_SHARED_DIR=${WRKDIR:Q} BUILDLINK_CONTENTS_FILTER.mono= ${EGREP} '(^include/|^lib/)' diff --git a/mail/evolution-sharp/Makefile b/mail/evolution-sharp/Makefile index 6f8a0418cba..2e4f8db0add 100644 --- a/mail/evolution-sharp/Makefile +++ b/mail/evolution-sharp/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.21 2013/05/24 18:23:37 wiz Exp $ +# $NetBSD: Makefile,v 1.22 2013/06/17 12:44:54 wiz Exp $ # DISTNAME= evolution-sharp-0.20.0 -PKGREVISION= 14 +PKGREVISION= 15 CATEGORIES= mail MASTER_SITES= ${MASTER_SITE_GNOME:=sources/evolution-sharp/0.20/} EXTRACT_SUFX= .tar.bz2 @@ -20,7 +20,7 @@ USE_PKGLOCALEDIR= yes PKGCONFIG_OVERRIDE+= evolution-sharp.pc.in USE_TOOLS+= gmake pkg-config -.include "../../lang/mono/buildlink3.mk" +.include "../../lang/mono2/buildlink3.mk" BUILDLINK_API_DEPENDS.evolution-data-server+= evolution-data-server>=2.24.0 .include "../../mail/evolution-data-server/buildlink3.mk" .include "../../x11/gtk-sharp/buildlink3.mk" diff --git a/net/avahi/Makefile b/net/avahi/Makefile index 2e92da75dc3..88391cb03ab 100644 --- a/net/avahi/Makefile +++ b/net/avahi/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.44 2013/06/06 12:53:42 wiz Exp $ +# $NetBSD: Makefile,v 1.45 2013/06/17 12:44:54 wiz Exp $ DISTNAME= avahi-0.6.31 -PKGREVISION= 11 +PKGREVISION= 12 CATEGORIES= net MASTER_SITES= http://avahi.org/download/ diff --git a/net/avahi/options.mk b/net/avahi/options.mk index ad74ac36291..bbf8980891b 100644 --- a/net/avahi/options.mk +++ b/net/avahi/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.3 2013/04/21 00:58:46 rodent Exp $ +# $NetBSD: options.mk,v 1.4 2013/06/17 12:44:54 wiz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.avahi PKG_SUPPORTED_OPTIONS= avahi-howl gdbm introspection gtk2 gtk3 mono python qt3 @@ -52,7 +52,7 @@ CONFIGURE_ARGS+= --enable-introspection=no .if !empty(PKG_OPTIONS:Mmono) .include "../../x11/gtk-sharp/buildlink3.mk" -.include "../../lang/mono/buildlink3.mk" +.include "../../lang/mono2/buildlink3.mk" CONFIGURE_ARGS+= --disable-monodoc # XXX broken PLIST.mono= yes .else diff --git a/net/dcsharp/Makefile b/net/dcsharp/Makefile index b92a985fa53..11968dc0924 100644 --- a/net/dcsharp/Makefile +++ b/net/dcsharp/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.37 2013/06/06 12:54:54 wiz Exp $ +# $NetBSD: Makefile,v 1.38 2013/06/17 12:44:54 wiz Exp $ DISTNAME= dcsharp-0.11.1 -PKGREVISION= 33 +PKGREVISION= 34 CATEGORIES= net MASTER_SITES= http://dcsharp.googlecode.com/files/ EXTRACT_SUFX= .tar.bz2 @@ -25,7 +25,7 @@ do-build: do-install: cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/scons PREFIX=${DESTDIR}${PREFIX} install -.include "../../lang/mono/buildlink3.mk" +.include "../../lang/mono2/buildlink3.mk" .include "../../x11/gtk-sharp/buildlink3.mk" .include "../../x11/gnome-sharp/buildlink3.mk" .include "../../sysutils/ndesk-dbus/buildlink3.mk" diff --git a/net/mono-nat/Makefile b/net/mono-nat/Makefile index fd9bd67f6bb..f7e2cf94f92 100644 --- a/net/mono-nat/Makefile +++ b/net/mono-nat/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.8 2013/05/09 07:39:18 adam Exp $ +# $NetBSD: Makefile,v 1.9 2013/06/17 12:44:54 wiz Exp $ DISTNAME= mono-nat-1.0.2 -PKGREVISION= 6 +PKGREVISION= 7 CATEGORIES= net MASTER_SITES= http://projects.qnetp.net/attachments/download/22/ @@ -13,5 +13,5 @@ GNU_CONFIGURE= yes MAKE_JOBS_SAFE= no USE_TOOLS+= gmake pkg-config -.include "../../lang/mono/buildlink3.mk" +.include "../../lang/mono2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/mono-nat/buildlink3.mk b/net/mono-nat/buildlink3.mk index 9c4d6233bd8..992ecb234a0 100644 --- a/net/mono-nat/buildlink3.mk +++ b/net/mono-nat/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.7 2013/01/26 21:36:42 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2013/06/17 12:44:54 wiz Exp $ BUILDLINK_TREE+= mono-nat @@ -6,10 +6,10 @@ BUILDLINK_TREE+= mono-nat MONO_NAT_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.mono-nat+= mono-nat>=1.0.2 -BUILDLINK_ABI_DEPENDS.mono-nat+= mono-nat>=1.0.2nb5 +BUILDLINK_ABI_DEPENDS.mono-nat+= mono-nat>=1.0.2nb7 BUILDLINK_PKGSRCDIR.mono-nat?= ../../net/mono-nat -.include "../../lang/mono/buildlink3.mk" +.include "../../lang/mono2/buildlink3.mk" .endif # MONO_NAT_BUILDLINK3_MK diff --git a/net/monotorrent/Makefile b/net/monotorrent/Makefile index 117989e3925..b9a3d237a9a 100644 --- a/net/monotorrent/Makefile +++ b/net/monotorrent/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.12 2013/05/09 07:39:18 adam Exp $ +# $NetBSD: Makefile,v 1.13 2013/06/17 12:44:54 wiz Exp $ DISTNAME= monotorrent-0.72 -PKGREVISION= 6 +PKGREVISION= 7 CATEGORIES= net MASTER_SITES= http://projects.qnetp.net/attachments/download/13/ @@ -14,5 +14,5 @@ MAKE_JOBS_SAFE= no USE_TOOLS+= gmake bsdtar pkg-config EXTRACT_USING= bsdtar -.include "../../lang/mono/buildlink3.mk" +.include "../../lang/mono2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/monotorrent/buildlink3.mk b/net/monotorrent/buildlink3.mk index 2cee86f1622..aab9b05c69e 100644 --- a/net/monotorrent/buildlink3.mk +++ b/net/monotorrent/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.10 2013/01/26 21:36:42 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2013/06/17 12:44:54 wiz Exp $ BUILDLINK_TREE+= monotorrent @@ -6,10 +6,10 @@ BUILDLINK_TREE+= monotorrent MONOTORRENT_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.monotorrent+= monotorrent>=0.72 -BUILDLINK_ABI_DEPENDS.monotorrent+= monotorrent>=0.72nb5 +BUILDLINK_ABI_DEPENDS.monotorrent+= monotorrent>=0.72nb7 BUILDLINK_PKGSRCDIR.monotorrent?= ../../net/monotorrent -.include "../../lang/mono/buildlink3.mk" +.include "../../lang/mono2/buildlink3.mk" .endif # MONOTORRENT_BUILDLINK3_MK BUILDLINK_TREE+= -monotorrent diff --git a/net/monsoon/Makefile b/net/monsoon/Makefile index 9f7a8548845..81e95660b2a 100644 --- a/net/monsoon/Makefile +++ b/net/monsoon/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.37 2013/06/06 12:54:57 wiz Exp $ +# $NetBSD: Makefile,v 1.38 2013/06/17 12:44:54 wiz Exp $ DISTNAME= monsoon-0.20 -PKGREVISION= 31 +PKGREVISION= 32 CATEGORIES= net MASTER_SITES= http://www.monsoon-project.org/jaws/data/files/ @@ -14,7 +14,7 @@ MAKE_JOBS_SAFE= no USE_TOOLS+= gmake gtar intltool perl pkg-config msgfmt EXTRACT_USING= gtar -.include "../../lang/mono/buildlink3.mk" +.include "../../lang/mono2/buildlink3.mk" .include "../../net/mono-nat/buildlink3.mk" .include "../../net/monotorrent/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" diff --git a/security/KeePass/Makefile b/security/KeePass/Makefile index dd0bd34f41a..ef1cc490b7b 100644 --- a/security/KeePass/Makefile +++ b/security/KeePass/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2013/06/04 22:17:01 tron Exp $ +# $NetBSD: Makefile,v 1.8 2013/06/17 12:44:54 wiz Exp $ # DISTNAME= KeePass-2.21 @@ -12,7 +12,7 @@ HOMEPAGE= http://keepass.info/ COMMENT= Free, open source, light-weight and easy-to-use password manager LICENSE= gnu-gpl-v2 -DEPENDS+= mono>=2.6:../../lang/mono +DEPENDS+= mono>=2.6<3:../../lang/mono2 WRKSRC= ${WRKDIR} USE_LANGUAGES= # none diff --git a/security/gnome-keyring-sharp/Makefile b/security/gnome-keyring-sharp/Makefile index e5f88aff9c3..2c9ca78c02c 100644 --- a/security/gnome-keyring-sharp/Makefile +++ b/security/gnome-keyring-sharp/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.4 2013/05/09 07:40:29 adam Exp $ +# $NetBSD: Makefile,v 1.5 2013/06/17 12:44:54 wiz Exp $ # DISTNAME= gnome-keyring-sharp-1.0.0 -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= security MASTER_SITES= http://ftp.novell.com/pub/mono/sources/gnome-keyring-sharp/ EXTRACT_SUFX= .tar.bz2 @@ -22,5 +22,5 @@ CONFIGURE_ARGS+= --disable-monodoc .include "options.mk" -.include "../../lang/mono/buildlink3.mk" +.include "../../lang/mono2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/dbus-sharp/Makefile b/sysutils/dbus-sharp/Makefile index f6fc0f33fd6..58198d4631f 100644 --- a/sysutils/dbus-sharp/Makefile +++ b/sysutils/dbus-sharp/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.2 2013/06/11 02:29:40 obache Exp $ +# $NetBSD: Makefile,v 1.3 2013/06/17 12:44:55 wiz Exp $ # DISTNAME= dbus-sharp-0.7.0 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= sysutils MASTER_SITES= http://cloud.github.com/downloads/mono/dbus-sharp/ @@ -17,5 +17,5 @@ USE_LANGUAGES= # none PKGCONFIG_OVERRIDE+= dbus-sharp-1.0.pc.in -.include "../../lang/mono/buildlink3.mk" +.include "../../lang/mono2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/dbus-sharp/buildlink3.mk b/sysutils/dbus-sharp/buildlink3.mk index 459b20346ab..0ac3b36e9c4 100644 --- a/sysutils/dbus-sharp/buildlink3.mk +++ b/sysutils/dbus-sharp/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2013/06/10 11:59:38 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2013/06/17 12:44:55 wiz Exp $ BUILDLINK_TREE+= dbus-sharp @@ -6,9 +6,10 @@ BUILDLINK_TREE+= dbus-sharp DBUS_SHARP_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.dbus-sharp+= dbus-sharp>=0.7.0 +BUILDLINK_ABI_DEPENDS.dbus-sharp?= dbus-sharp>=0.7.0nb2 BUILDLINK_PKGSRCDIR.dbus-sharp?= ../../sysutils/dbus-sharp -.include "../../lang/mono/buildlink3.mk" +.include "../../lang/mono2/buildlink3.mk" .endif # DBUS_SHARP_BUILDLINK3_MK BUILDLINK_TREE+= -dbus-sharp diff --git a/sysutils/ndesk-dbus-glib/Makefile b/sysutils/ndesk-dbus-glib/Makefile index 8190e1f1760..a77c99b8c93 100644 --- a/sysutils/ndesk-dbus-glib/Makefile +++ b/sysutils/ndesk-dbus-glib/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.13 2013/05/09 07:39:19 adam Exp $ +# $NetBSD: Makefile,v 1.14 2013/06/17 12:44:55 wiz Exp $ DISTNAME= ndesk-dbus-glib-0.4.1 -PKGREVISION= 10 +PKGREVISION= 11 CATEGORIES= sysutils MASTER_SITES= http://www.ndesk.org/archive/ndesk-dbus/ @@ -15,6 +15,6 @@ USE_TOOLS+= pkg-config gmake PKGCONFIG_OVERRIDE+= ndesk-dbus-glib-1.0.pc.in .include "../../devel/glib2/buildlink3.mk" -.include "../../lang/mono/buildlink3.mk" +.include "../../lang/mono2/buildlink3.mk" .include "../../sysutils/ndesk-dbus/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/ndesk-dbus-glib/buildlink3.mk b/sysutils/ndesk-dbus-glib/buildlink3.mk index 900ced226fc..c631db62bfb 100644 --- a/sysutils/ndesk-dbus-glib/buildlink3.mk +++ b/sysutils/ndesk-dbus-glib/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.10 2013/01/26 21:36:48 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2013/06/17 12:44:55 wiz Exp $ BUILDLINK_TREE+= ndesk-dbus-glib @@ -6,10 +6,10 @@ BUILDLINK_TREE+= ndesk-dbus-glib NDESK_DBUS_GLIB_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.ndesk-dbus-glib+= ndesk-dbus-glib>=0.4.1 -BUILDLINK_ABI_DEPENDS.ndesk-dbus-glib+= ndesk-dbus-glib>=0.4.1nb9 +BUILDLINK_ABI_DEPENDS.ndesk-dbus-glib+= ndesk-dbus-glib>=0.4.1nb11 BUILDLINK_PKGSRCDIR.ndesk-dbus-glib?= ../../sysutils/ndesk-dbus-glib -.include "../../lang/mono/buildlink3.mk" +.include "../../lang/mono2/buildlink3.mk" .include "../../sysutils/ndesk-dbus/buildlink3.mk" .endif # NDESK_DBUS_GLIB_BUILDLINK3_MK diff --git a/sysutils/ndesk-dbus/Makefile b/sysutils/ndesk-dbus/Makefile index 8741d5be369..cf3f906b9b7 100644 --- a/sysutils/ndesk-dbus/Makefile +++ b/sysutils/ndesk-dbus/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.13 2013/06/10 11:40:47 obache Exp $ +# $NetBSD: Makefile,v 1.14 2013/06/17 12:44:55 wiz Exp $ DISTNAME= ndesk-dbus-0.6.1a -PKGREVISION= 9 +PKGREVISION= 10 CATEGORIES= sysutils MASTER_SITES= http://www.ndesk.org/archive/ndesk-dbus/ @@ -16,5 +16,5 @@ DEPENDS+= dbus>=1.0:../../sysutils/dbus PKGCONFIG_OVERRIDE+= ndesk-dbus-1.0.pc.in -.include "../../lang/mono/buildlink3.mk" +.include "../../lang/mono2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/OdfConverter/Makefile b/textproc/OdfConverter/Makefile index 82bea47dfb4..9e631843798 100644 --- a/textproc/OdfConverter/Makefile +++ b/textproc/OdfConverter/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.28 2013/06/06 12:55:06 wiz Exp $ +# $NetBSD: Makefile,v 1.29 2013/06/17 12:44:55 wiz Exp $ # DISTNAME= OdfAddinForOffice-src-3.0 PKGNAME= OdfConverter-3.0 -PKGREVISION= 21 +PKGREVISION= 22 CATEGORIES= converters textproc MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=odf-converter/} EXTRACT_SUFX= .zip @@ -14,7 +14,7 @@ COMMENT= Converter between Microsoft Office 2007 and OpenOffice formats LICENSE= modified-bsd # mono-basic DLLs are required at run-time (but not at build time). -DEPENDS+= mono-basic-[0-9]*:../../lang/mono-basic +DEPENDS+= mono-basic-[0-9]*:../../lang/mono2-basic USE_LANGUAGES= c USE_TOOLS+= gmake pkg-config @@ -70,6 +70,6 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/source/Shell/OdfConverter/README.TXT \ ${DESTDIR}${PREFIX}/share/doc/OdfConverter/README.TXT -.include "../../lang/mono/buildlink3.mk" +.include "../../lang/mono2/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/gnome-subtitles/Makefile b/textproc/gnome-subtitles/Makefile index d4d981a8d5b..59bedb8fab4 100644 --- a/textproc/gnome-subtitles/Makefile +++ b/textproc/gnome-subtitles/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.36 2013/06/06 12:55:07 wiz Exp $ +# $NetBSD: Makefile,v 1.37 2013/06/17 12:44:55 wiz Exp $ DISTNAME= gnome-subtitles-1.1 -PKGREVISION= 21 +PKGREVISION= 22 CATEGORIES= multimedia textproc MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gnome-subtitles/} @@ -23,7 +23,7 @@ DEPENDS+= enchant>=1.3:../../textproc/enchant DEPENDS+= gtkspell>=2.0:../../textproc/gtkspell .include "../../devel/GConf/schemas.mk" -.include "../../lang/mono/buildlink3.mk" +.include "../../lang/mono2/buildlink3.mk" .include "../../multimedia/gst-plugins0.10-base/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" .include "../../textproc/gnome-doc-utils/buildlink3.mk" diff --git a/textproc/sublib/Makefile b/textproc/sublib/Makefile index 2cbf003e3f7..8e6948bf389 100644 --- a/textproc/sublib/Makefile +++ b/textproc/sublib/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.9 2013/05/09 07:39:20 adam Exp $ +# $NetBSD: Makefile,v 1.10 2013/06/17 12:44:55 wiz Exp $ DISTNAME= sublib-0.9 -PKGREVISION= 7 +PKGREVISION= 8 CATEGORIES= multimedia textproc MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=sublib/} EXTRACT_SUFX= .zip @@ -20,5 +20,5 @@ SUBST_MESSAGE.fix-prefix= Fixing library installation directory SUBST_FILES.fix-prefix= data/sublib.pc.in SUBST_SED.fix-prefix= -e 's,@libdir@,@libdir@/mono,' -.include "../../lang/mono/buildlink3.mk" +.include "../../lang/mono2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/sublib/buildlink3.mk b/textproc/sublib/buildlink3.mk index b6f581dcfd6..33df129f968 100644 --- a/textproc/sublib/buildlink3.mk +++ b/textproc/sublib/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.9 2013/01/26 21:36:49 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2013/06/17 12:44:55 wiz Exp $ BUILDLINK_TREE+= sublib @@ -6,10 +6,10 @@ BUILDLINK_TREE+= sublib SUBLIB_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.sublib+= sublib>=0.9 -BUILDLINK_ABI_DEPENDS.sublib+= sublib>=0.9nb6 +BUILDLINK_ABI_DEPENDS.sublib+= sublib>=0.9nb8 BUILDLINK_PKGSRCDIR.sublib?= ../../textproc/sublib -.include "../../lang/mono/buildlink3.mk" +.include "../../lang/mono2/buildlink3.mk" .endif # SUBLIB_BUILDLINK3_MK BUILDLINK_TREE+= -sublib diff --git a/www/ap-mono/Makefile b/www/ap-mono/Makefile index e2965db46a4..1ada2360aa3 100644 --- a/www/ap-mono/Makefile +++ b/www/ap-mono/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.24 2013/05/09 07:40:34 adam Exp $ +# $NetBSD: Makefile,v 1.25 2013/06/17 12:44:55 wiz Exp $ DISTNAME= mod_mono-2.10 PKGNAME= ${APACHE_PKG_PREFIX}-${DISTNAME:S/mod_//} -PKGREVISION= 5 +PKGREVISION= 6 CATEGORIES= www MASTER_SITES= http://ftp.novell.com/pub/mono/sources/mod_mono/ EXTRACT_SUFX= .tar.bz2 @@ -23,7 +23,7 @@ USE_TOOLS+= gmake pkg-config USE_LIBTOOL= yes MAKE_JOBS_SAFE= no -.include "../../lang/mono/buildlink3.mk" +.include "../../lang/mono2/buildlink3.mk" .include "../../www/mono-xsp/buildlink3.mk" .include "../../mk/apache.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/mono-xsp/Makefile b/www/mono-xsp/Makefile index 5ddeffbfe63..4bedcd8fc00 100644 --- a/www/mono-xsp/Makefile +++ b/www/mono-xsp/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.30 2013/05/09 07:39:20 adam Exp $ +# $NetBSD: Makefile,v 1.31 2013/06/17 12:44:55 wiz Exp $ DISTNAME= xsp-2.10.2 PKGNAME= mono-${DISTNAME} -PKGREVISION= 5 +PKGREVISION= 6 CATEGORIES= www MASTER_SITES= http://ftp.novell.com/pub/mono/sources/xsp/ EXTRACT_SUFX= .tar.bz2 @@ -26,5 +26,5 @@ SUBST_SED.unwrap_mk= -e 's,^MAKEINFO = .*,MAKEINFO = makeinfo,' SUBST_SED.unwrap_mk+= -e 's,^PKG_CONFIG = .*,PKG_CONFIG = ${PREFIX}/bin/pkg-config,' .include "../../databases/sqlite3/buildlink3.mk" -.include "../../lang/mono/buildlink3.mk" +.include "../../lang/mono2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/mono-xsp/buildlink3.mk b/www/mono-xsp/buildlink3.mk index 0c1a251149e..c6e045815dc 100644 --- a/www/mono-xsp/buildlink3.mk +++ b/www/mono-xsp/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.10 2013/01/26 21:36:50 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2013/06/17 12:44:55 wiz Exp $ BUILDLINK_TREE+= mono-xsp @@ -6,11 +6,11 @@ BUILDLINK_TREE+= mono-xsp MONO_XSP_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.mono-xsp+= mono-xsp>=2.0 -BUILDLINK_ABI_DEPENDS.mono-xsp+= mono-xsp>=2.10.2nb4 +BUILDLINK_ABI_DEPENDS.mono-xsp+= mono-xsp>=2.10.2nb6 BUILDLINK_PKGSRCDIR.mono-xsp?= ../../www/mono-xsp .include "../../databases/sqlite3/buildlink3.mk" -.include "../../lang/mono/buildlink3.mk" +.include "../../lang/mono2/buildlink3.mk" .endif # MONO_XSP_BUILDLINK3_MK BUILDLINK_TREE+= -mono-xsp diff --git a/x11/gnome-sharp/Makefile b/x11/gnome-sharp/Makefile index e696e71b6b2..6a125cc7cd3 100644 --- a/x11/gnome-sharp/Makefile +++ b/x11/gnome-sharp/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.45 2013/06/06 12:53:45 wiz Exp $ +# $NetBSD: Makefile,v 1.46 2013/06/17 12:44:55 wiz Exp $ # DISTNAME= gnome-sharp-2.24.2 -PKGREVISION= 23 +PKGREVISION= 24 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-sharp/2.24/} @@ -44,7 +44,7 @@ BUILDLINK_API_DEPENDS.libart+= libart>=2.3.20 .include "../../graphics/libart/buildlink3.mk" BUILDLINK_API_DEPENDS.libgnomecanvas+= libgnomecanvas>=2.20.0 .include "../../graphics/libgnomecanvas/buildlink3.mk" -.include "../../lang/mono/buildlink3.mk" +.include "../../lang/mono2/buildlink3.mk" BUILDLINK_API_DEPENDS.gnome-vfs+= gnome-vfs>=2.22.0 .include "../../sysutils/gnome-vfs/buildlink3.mk" BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.13.0 diff --git a/x11/gnome-sharp/buildlink3.mk b/x11/gnome-sharp/buildlink3.mk index f1ba702aff9..30ec63df73c 100644 --- a/x11/gnome-sharp/buildlink3.mk +++ b/x11/gnome-sharp/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.37 2013/06/06 12:53:45 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.38 2013/06/17 12:44:55 wiz Exp $ BUILDLINK_TREE+= gnome-sharp @@ -6,13 +6,13 @@ BUILDLINK_TREE+= gnome-sharp GNOME_SHARP_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.gnome-sharp+= gnome-sharp>=2.24.0 -BUILDLINK_ABI_DEPENDS.gnome-sharp+= gnome-sharp>=2.24.2nb23 +BUILDLINK_ABI_DEPENDS.gnome-sharp+= gnome-sharp>=2.24.2nb24 BUILDLINK_PKGSRCDIR.gnome-sharp?= ../../x11/gnome-sharp .include "../../devel/libgnomeui/buildlink3.mk" .include "../../graphics/libart/buildlink3.mk" .include "../../graphics/libgnomecanvas/buildlink3.mk" -.include "../../lang/mono/buildlink3.mk" +.include "../../lang/mono2/buildlink3.mk" .include "../../sysutils/gnome-vfs/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../x11/gtk-sharp/buildlink3.mk" diff --git a/x11/gtk-sharp/Makefile b/x11/gtk-sharp/Makefile index 8692a57da8e..b436a18046d 100644 --- a/x11/gtk-sharp/Makefile +++ b/x11/gtk-sharp/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.40 2013/06/06 12:55:14 wiz Exp $ +# $NetBSD: Makefile,v 1.41 2013/06/17 12:44:55 wiz Exp $ # DISTNAME= gtk-sharp-2.12.10 -PKGREVISION= 23 +PKGREVISION= 24 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gtk-sharp/2.12/} EXTRACT_SUFX= .tar.bz2 @@ -35,7 +35,7 @@ SUBST_FILES.relprefix= ${PKGCONFIG_OVERRIDE} SUBST_SED.relprefix= -e 's|$${pcfiledir}/../..|@prefix@|g' .include "../../devel/libglade/buildlink3.mk" -.include "../../lang/mono/buildlink3.mk" +.include "../../lang/mono2/buildlink3.mk" BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.12.0 .include "../../x11/gtk2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/gtksourceview-sharp2/Makefile b/x11/gtksourceview-sharp2/Makefile index 0ef0bda6630..7620bbeabc2 100644 --- a/x11/gtksourceview-sharp2/Makefile +++ b/x11/gtksourceview-sharp2/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.42 2013/06/06 12:55:14 wiz Exp $ +# $NetBSD: Makefile,v 1.43 2013/06/17 12:44:55 wiz Exp $ DISTNAME= gtksourceview-sharp-2.0-0.12 PKGNAME= ${DISTNAME:S/-2.0-/2-/} -PKGREVISION= 35 +PKGREVISION= 36 CATEGORIES= x11 MASTER_SITES= http://ftp.novell.com/pub/mono/sources/gtksourceview-sharp2/ EXTRACT_SUFX= .tar.bz2 @@ -19,7 +19,7 @@ USE_TOOLS+= gmake pkg-config CONFLICTS= gtksourceview-sharp-2.0-[0-9]* -.include "../../lang/mono/buildlink3.mk" +.include "../../lang/mono2/buildlink3.mk" .include "../../x11/gtksourceview/buildlink3.mk" .include "../../x11/gtk-sharp/buildlink3.mk" .include "../../x11/gnome-sharp/buildlink3.mk" |