From owner-svn-ports-head@FreeBSD.ORG Mon May 26 11:41:34 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 829E24B6; Mon, 26 May 2014 11:41:34 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 56BA929A7; Mon, 26 May 2014 11:41:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4QBfYKG062922; Mon, 26 May 2014 11:41:34 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4QBfYBg062921; Mon, 26 May 2014 11:41:34 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201405261141.s4QBfYBg062921@svn.freebsd.org> From: Baptiste Daroussin Date: Mon, 26 May 2014 11:41:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r355304 - head/Mk/Uses X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 May 2014 11:41:34 -0000 Author: bapt Date: Mon May 26 11:41:33 2014 New Revision: 355304 URL: http://svnweb.freebsd.org/changeset/ports/355304 QAT: https://qat.redports.org/buildarchive/r355304/ Log: Move part of bsd.mono.mk into USES=mono Drop code for nant support which is not used at all in the ports tree Add dependency handling on lang/mono Pass maintainership to mono@ Added: head/Mk/Uses/mono.mk - copied, changed from r355276, head/lang/mono/bsd.mono.mk Copied and modified: head/Mk/Uses/mono.mk (from r355276, head/lang/mono/bsd.mono.mk) ============================================================================== --- head/lang/mono/bsd.mono.mk Mon May 26 02:57:18 2014 (r355276, copy source) +++ head/Mk/Uses/mono.mk Mon May 26 11:41:33 2014 (r355304) @@ -1,58 +1,33 @@ -# New ports collection makefile for: Mono and it's consumers -# Date created: 15 October 2005 -# Whom: Tom McLaughlin +# $FreeBSD$ # -# bsd.mono.mk: accomodate the peculiarities of building C# ports within -# the FreeBSD ports system. +# mono (c#) support # -# $FreeBSD$ +# Feature: mono +# Usage: USES=mono # +# MAINTAINER= mono@FreeBSD.org -# USE_NANT - If set, the port uses nant. -# USE_NANT - If set "contrib", the port uses nantcontrib. -# NANT - Set to path of Nant. +.if !defined(_INCLUDE_USES_MONO_MK) +_INCLUDE_USES_MONO_MK= yes + +.if defined(objc_ARGS) +IGNORE= USES=objc takes no arguments +.endif # Set the location of the .wapi directory so we write to a location we # can always assume to be writable. -MONO_SHARED_DIR=${WRKDIR} -CONFIGURE_ENV+=MONO_SHARED_DIR="${MONO_SHARED_DIR}" -MAKE_ENV+=MONO_SHARED_DIR="${MONO_SHARED_DIR}" +MONO_SHARED_DIR= ${WRKDIR} +CONFIGURE_ENV+= MONO_SHARED_DIR="${MONO_SHARED_DIR}" +MAKE_ENV+= MONO_SHARED_DIR="${MONO_SHARED_DIR}" +BUILD_DEPENDS+= mono:${PORTSDIR}/lang/mono +RUN_DEPENDS+= mono:${PORTSDIR}/lang/mono # Set the location that webaps served by XSP should use. -XSP_DOCROOT=${PREFIX}/www/xsp +XSP_DOCROOT= ${PREFIX}/www/xsp # gac utilities GACUTIL=${LOCALBASE}/bin/gacutil /root ${PREFIX}/lib/ /gacdir ${PREFIX}/lib GACUTIL_INSTALL=${GACUTIL} /i GACUTIL_INSTALL_PACKAGE=${GACUTIL} /i /package 1.0 /package 2.0 -# Dependencies - -.if defined(USE_NANT) -BUILD_DEPENDS+= nant:${PORTSDIR}/devel/nant -.if ${USE_NANT}=="contrib" -BUILD_DEPENDS+= ${LOCALBASE}/share/NAnt/bin/NAnt.Contrib.Tests.dll:${PORTSDIR}/devel/nantcontrib -.endif -.endif - -# Miscellaneous overridable commands: - -NANT?= nant -NANT_INSTALL_TARGET?= install - -# Build -.if defined(USE_NANT) -.if !target(do-build) -do-build: - @(cd ${BUILD_WRKSRC}; ${SETENV} MONO_SHARED_DIR="${MONO_SHARED_DIR}" ${NANT} ${NANT_FLAGS}) -.endif -.endif - - -# Install -.if defined(USE_NANT) -.if !target(do-install) -do-install: - @(cd ${INSTALL_WRKSRC}; ${SETENV} MONO_SHARED_DIR="${MONO_SHARED_DIR}" ${NANT} ${NANT_FLAGS} -D:prefix="${PREFIX}" ${NANT_INSTALL_TARGET}) -.endif .endif