Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 15 May 2015 15:29:45 +0000 (UTC)
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r386415 - head/devel/mono-addins
Message-ID:  <201505151529.t4FFTjqm003546@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bapt
Date: Fri May 15 15:29:45 2015
New Revision: 386415
URL: https://svnweb.freebsd.org/changeset/ports/386415

Log:
  Convert to USES=autoreconf
  Use options helpers

Modified:
  head/devel/mono-addins/Makefile
  head/devel/mono-addins/pkg-plist

Modified: head/devel/mono-addins/Makefile
==============================================================================
--- head/devel/mono-addins/Makefile	Fri May 15 15:25:52 2015	(r386414)
+++ head/devel/mono-addins/Makefile	Fri May 15 15:29:45 2015	(r386415)
@@ -14,26 +14,16 @@ GH_ACCOUNT=	mono
 GH_TAGNAME=	${PORTNAME}-${PORTVERSION}
 
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	aclocal autoconf automake
-ACLOCAL_ARGS=	-I .
-AUTOMAKE_ARGS+=	--gnu --add-missing
-USES=		gmake mono pkgconfig
+USES=		autoreconf gmake mono pkgconfig
 WANT_GNOME=	yes
 
 OPTIONS_DEFINE=	GTK2
 OPTIONS_DEFAULT=GTK2
 
-PLIST_SUB+=	VER=1.0.0
-
-.include <bsd.port.pre.mk>
+GTK2_USE=	GNOME=gtksharp20
+GTK2_CONFIGURE_ENABLE=	gui
+OPTIONS_SUB=	yes
 
-.if ${PORT_OPTIONS:MGTK2}
-USE_GNOME+=	gtksharp20
-CONFIGURE_ARGS+=	--enable-gui
-PLIST_SUB+=	OPT_GTK2=""
-.else
-CONFIGURE_ARGS+=	--disable-gui
-PLIST_SUB+=	OPT_GTK2="@comment "
-.endif
+PLIST_SUB+=	VER=1.0.0
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/devel/mono-addins/pkg-plist
==============================================================================
--- head/devel/mono-addins/pkg-plist	Fri May 15 15:25:52 2015	(r386414)
+++ head/devel/mono-addins/pkg-plist	Fri May 15 15:29:45 2015	(r386415)
@@ -1,8 +1,8 @@
 bin/mautil
 lib/mono/gac/Mono.Addins.CecilReflector/%%VER%%.0__0738eb9f132ed756/Mono.Addins.CecilReflector.dll
 lib/mono/gac/Mono.Addins.CecilReflector/%%VER%%.0__0738eb9f132ed756/Mono.Addins.CecilReflector.dll.mdb
-%%OPT_GTK2%%lib/mono/gac/Mono.Addins.Gui/%%VER%%.0__0738eb9f132ed756/Mono.Addins.Gui.dll
-%%OPT_GTK2%%lib/mono/gac/Mono.Addins.Gui/%%VER%%.0__0738eb9f132ed756/Mono.Addins.Gui.dll.mdb
+%%GTK2%%lib/mono/gac/Mono.Addins.Gui/%%VER%%.0__0738eb9f132ed756/Mono.Addins.Gui.dll
+%%GTK2%%lib/mono/gac/Mono.Addins.Gui/%%VER%%.0__0738eb9f132ed756/Mono.Addins.Gui.dll.mdb
 lib/mono/gac/Mono.Addins.MSBuild/%%VER%%.0__0738eb9f132ed756/Mono.Addins.MSBuild.dll
 lib/mono/gac/Mono.Addins.MSBuild/%%VER%%.0__0738eb9f132ed756/Mono.Addins.MSBuild.dll.mdb
 lib/mono/gac/Mono.Addins.Setup/%%VER%%.0__0738eb9f132ed756/Mono.Addins.Setup.dll
@@ -11,8 +11,8 @@ lib/mono/gac/Mono.Addins/%%VER%%.0__0738
 lib/mono/gac/Mono.Addins/%%VER%%.0__0738eb9f132ed756/Mono.Addins.dll.mdb
 lib/mono/gac/policy.0.2.Mono.Addins.CecilReflector/0.0.0.0__0738eb9f132ed756/policy.0.2.Mono.Addins.CecilReflector.dll
 lib/mono/gac/policy.0.2.Mono.Addins.CecilReflector/0.0.0.0__0738eb9f132ed756/policy.0.2.config
-%%OPT_GTK2%%lib/mono/gac/policy.0.2.Mono.Addins.Gui/0.0.0.0__0738eb9f132ed756/policy.0.2.Mono.Addins.Gui.dll
-%%OPT_GTK2%%lib/mono/gac/policy.0.2.Mono.Addins.Gui/0.0.0.0__0738eb9f132ed756/policy.0.2.config
+%%GTK2%%lib/mono/gac/policy.0.2.Mono.Addins.Gui/0.0.0.0__0738eb9f132ed756/policy.0.2.Mono.Addins.Gui.dll
+%%GTK2%%lib/mono/gac/policy.0.2.Mono.Addins.Gui/0.0.0.0__0738eb9f132ed756/policy.0.2.config
 lib/mono/gac/policy.0.2.Mono.Addins.MSBuild/0.0.0.0__0738eb9f132ed756/policy.0.2.Mono.Addins.MSBuild.dll
 lib/mono/gac/policy.0.2.Mono.Addins.MSBuild/0.0.0.0__0738eb9f132ed756/policy.0.2.config
 lib/mono/gac/policy.0.2.Mono.Addins.Setup/0.0.0.0__0738eb9f132ed756/policy.0.2.Mono.Addins.Setup.dll
@@ -21,8 +21,8 @@ lib/mono/gac/policy.0.2.Mono.Addins/0.0.
 lib/mono/gac/policy.0.2.Mono.Addins/0.0.0.0__0738eb9f132ed756/policy.0.2.config
 lib/mono/gac/policy.0.3.Mono.Addins.CecilReflector/0.0.0.0__0738eb9f132ed756/policy.0.3.Mono.Addins.CecilReflector.dll
 lib/mono/gac/policy.0.3.Mono.Addins.CecilReflector/0.0.0.0__0738eb9f132ed756/policy.0.3.config
-%%OPT_GTK2%%lib/mono/gac/policy.0.3.Mono.Addins.Gui/0.0.0.0__0738eb9f132ed756/policy.0.3.Mono.Addins.Gui.dll
-%%OPT_GTK2%%lib/mono/gac/policy.0.3.Mono.Addins.Gui/0.0.0.0__0738eb9f132ed756/policy.0.3.config
+%%GTK2%%lib/mono/gac/policy.0.3.Mono.Addins.Gui/0.0.0.0__0738eb9f132ed756/policy.0.3.Mono.Addins.Gui.dll
+%%GTK2%%lib/mono/gac/policy.0.3.Mono.Addins.Gui/0.0.0.0__0738eb9f132ed756/policy.0.3.config
 lib/mono/gac/policy.0.3.Mono.Addins.MSBuild/0.0.0.0__0738eb9f132ed756/policy.0.3.Mono.Addins.MSBuild.dll
 lib/mono/gac/policy.0.3.Mono.Addins.MSBuild/0.0.0.0__0738eb9f132ed756/policy.0.3.config
 lib/mono/gac/policy.0.3.Mono.Addins.Setup/0.0.0.0__0738eb9f132ed756/policy.0.3.Mono.Addins.Setup.dll
@@ -31,8 +31,8 @@ lib/mono/gac/policy.0.3.Mono.Addins/0.0.
 lib/mono/gac/policy.0.3.Mono.Addins/0.0.0.0__0738eb9f132ed756/policy.0.3.config
 lib/mono/gac/policy.0.4.Mono.Addins.CecilReflector/0.0.0.0__0738eb9f132ed756/policy.0.4.Mono.Addins.CecilReflector.dll
 lib/mono/gac/policy.0.4.Mono.Addins.CecilReflector/0.0.0.0__0738eb9f132ed756/policy.0.4.config
-%%OPT_GTK2%%lib/mono/gac/policy.0.4.Mono.Addins.Gui/0.0.0.0__0738eb9f132ed756/policy.0.4.Mono.Addins.Gui.dll
-%%OPT_GTK2%%lib/mono/gac/policy.0.4.Mono.Addins.Gui/0.0.0.0__0738eb9f132ed756/policy.0.4.config
+%%GTK2%%lib/mono/gac/policy.0.4.Mono.Addins.Gui/0.0.0.0__0738eb9f132ed756/policy.0.4.Mono.Addins.Gui.dll
+%%GTK2%%lib/mono/gac/policy.0.4.Mono.Addins.Gui/0.0.0.0__0738eb9f132ed756/policy.0.4.config
 lib/mono/gac/policy.0.4.Mono.Addins.MSBuild/0.0.0.0__0738eb9f132ed756/policy.0.4.Mono.Addins.MSBuild.dll
 lib/mono/gac/policy.0.4.Mono.Addins.MSBuild/0.0.0.0__0738eb9f132ed756/policy.0.4.config
 lib/mono/gac/policy.0.4.Mono.Addins.Setup/0.0.0.0__0738eb9f132ed756/policy.0.4.Mono.Addins.Setup.dll
@@ -41,8 +41,8 @@ lib/mono/gac/policy.0.4.Mono.Addins/0.0.
 lib/mono/gac/policy.0.4.Mono.Addins/0.0.0.0__0738eb9f132ed756/policy.0.4.config
 lib/mono/gac/policy.0.5.Mono.Addins.CecilReflector/0.0.0.0__0738eb9f132ed756/policy.0.5.Mono.Addins.CecilReflector.dll
 lib/mono/gac/policy.0.5.Mono.Addins.CecilReflector/0.0.0.0__0738eb9f132ed756/policy.0.5.config
-%%OPT_GTK2%%lib/mono/gac/policy.0.5.Mono.Addins.Gui/0.0.0.0__0738eb9f132ed756/policy.0.5.Mono.Addins.Gui.dll
-%%OPT_GTK2%%lib/mono/gac/policy.0.5.Mono.Addins.Gui/0.0.0.0__0738eb9f132ed756/policy.0.5.config
+%%GTK2%%lib/mono/gac/policy.0.5.Mono.Addins.Gui/0.0.0.0__0738eb9f132ed756/policy.0.5.Mono.Addins.Gui.dll
+%%GTK2%%lib/mono/gac/policy.0.5.Mono.Addins.Gui/0.0.0.0__0738eb9f132ed756/policy.0.5.config
 lib/mono/gac/policy.0.5.Mono.Addins.MSBuild/0.0.0.0__0738eb9f132ed756/policy.0.5.Mono.Addins.MSBuild.dll
 lib/mono/gac/policy.0.5.Mono.Addins.MSBuild/0.0.0.0__0738eb9f132ed756/policy.0.5.config
 lib/mono/gac/policy.0.5.Mono.Addins.Setup/0.0.0.0__0738eb9f132ed756/policy.0.5.Mono.Addins.Setup.dll
@@ -51,8 +51,8 @@ lib/mono/gac/policy.0.5.Mono.Addins/0.0.
 lib/mono/gac/policy.0.5.Mono.Addins/0.0.0.0__0738eb9f132ed756/policy.0.5.config
 lib/mono/gac/policy.0.6.Mono.Addins.CecilReflector/0.0.0.0__0738eb9f132ed756/policy.0.6.Mono.Addins.CecilReflector.dll
 lib/mono/gac/policy.0.6.Mono.Addins.CecilReflector/0.0.0.0__0738eb9f132ed756/policy.0.6.config
-%%OPT_GTK2%%lib/mono/gac/policy.0.6.Mono.Addins.Gui/0.0.0.0__0738eb9f132ed756/policy.0.6.Mono.Addins.Gui.dll
-%%OPT_GTK2%%lib/mono/gac/policy.0.6.Mono.Addins.Gui/0.0.0.0__0738eb9f132ed756/policy.0.6.config
+%%GTK2%%lib/mono/gac/policy.0.6.Mono.Addins.Gui/0.0.0.0__0738eb9f132ed756/policy.0.6.Mono.Addins.Gui.dll
+%%GTK2%%lib/mono/gac/policy.0.6.Mono.Addins.Gui/0.0.0.0__0738eb9f132ed756/policy.0.6.config
 lib/mono/gac/policy.0.6.Mono.Addins.MSBuild/0.0.0.0__0738eb9f132ed756/policy.0.6.Mono.Addins.MSBuild.dll
 lib/mono/gac/policy.0.6.Mono.Addins.MSBuild/0.0.0.0__0738eb9f132ed756/policy.0.6.config
 lib/mono/gac/policy.0.6.Mono.Addins.Setup/0.0.0.0__0738eb9f132ed756/policy.0.6.Mono.Addins.Setup.dll
@@ -60,12 +60,12 @@ lib/mono/gac/policy.0.6.Mono.Addins.Setu
 lib/mono/gac/policy.0.6.Mono.Addins/0.0.0.0__0738eb9f132ed756/policy.0.6.Mono.Addins.dll
 lib/mono/gac/policy.0.6.Mono.Addins/0.0.0.0__0738eb9f132ed756/policy.0.6.config
 lib/mono/mono-addins/Mono.Addins.CecilReflector.dll
-%%OPT_GTK2%%lib/mono/mono-addins/Mono.Addins.Gui.dll
+%%GTK2%%lib/mono/mono-addins/Mono.Addins.Gui.dll
 lib/mono/mono-addins/Mono.Addins.MSBuild.dll
 lib/mono/mono-addins/Mono.Addins.Setup.dll
 lib/mono/mono-addins/Mono.Addins.dll
 lib/mono/mono-addins/mautil.exe
-%%OPT_GTK2%%libdata/pkgconfig/mono-addins-gui.pc
+%%GTK2%%libdata/pkgconfig/mono-addins-gui.pc
 libdata/pkgconfig/mono-addins-msbuild.pc
 libdata/pkgconfig/mono-addins-setup.pc
 libdata/pkgconfig/mono-addins.pc



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201505151529.t4FFTjqm003546>