From owner-svn-ports-head@FreeBSD.ORG Sat Mar 28 14:36:17 2015 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.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7C6F11F8; Sat, 28 Mar 2015 14:36:17 +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 4CFE3A6C; Sat, 28 Mar 2015 14:36:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2SEaGOK070013; Sat, 28 Mar 2015 14:36:16 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2SEaGbR070012; Sat, 28 Mar 2015 14:36:16 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201503281436.t2SEaGbR070012@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Sat, 28 Mar 2015 14:36:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r382484 - head/x11/xorg 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-1 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: Sat, 28 Mar 2015 14:36:17 -0000 Author: bapt Date: Sat Mar 28 14:36:16 2015 New Revision: 382484 URL: https://svnweb.freebsd.org/changeset/ports/382484 QAT: https://qat.redports.org/buildarchive/r382484/ Log: Convert into a real meta port Deleted: head/x11/xorg/pkg-plist Modified: head/x11/xorg/Makefile Modified: head/x11/xorg/Makefile ============================================================================== --- head/x11/xorg/Makefile Sat Mar 28 14:17:23 2015 (r382483) +++ head/x11/xorg/Makefile Sat Mar 28 14:36:16 2015 (r382484) @@ -14,6 +14,7 @@ COMMENT= X.Org complete distribution met NO_BUILD= yes NO_MTREE= yes +NO_INSTALL= yes RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/dri.pc:${PORTSDIR}/graphics/dri @@ -23,18 +24,13 @@ RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgco OPTIONS_DEFINE= DOCS -.include - -# doc -.if ${PORT_OPTIONS:MDOCS} -RUN_DEPENDS+= ${LOCALBASE}/share/doc/xorg-docs/README.xml:${PORTSDIR}/x11/xorg-docs -.endif +DOCS_RUN_DEPENDS+= ${LOCALBASE}/share/doc/xorg-docs/README.xml:${PORTSDIR}/x11/xorg-docs # app, lib, font, driver RUN_DEPENDS+= xorg-apps>0:${PORTSDIR}/x11/xorg-apps \ xorg-libraries>0:${PORTSDIR}/x11/xorg-libraries \ - ${LOCALBASE}/libdata/xorg/fonts:${PORTSDIR}/x11-fonts/xorg-fonts \ - ${LOCALBASE}/libdata/xorg/drivers:${PORTSDIR}/x11-drivers/xorg-drivers + xorg-fonts>0:${PORTSDIR}/x11-fonts/xorg-fonts \ + xorg-drivers>0:${PORTSDIR}/x11-drivers/xorg-drivers .if defined(XORG_COMPLETE) RUN_DEPENDS+= Xnest:${PORTSDIR}/x11-servers/xorg-nestserver \ @@ -42,21 +38,4 @@ RUN_DEPENDS+= Xnest:${PORTSDIR}/x11-serv Xvfb:${PORTSDIR}/x11-servers/xorg-vfbserver .endif -do-install: # empty - -pre-everything:: - @${ECHO_MSG} "This is a meta-port, meaning that it just depends on its subparts of the port." - @${ECHO_MSG} "It won't build and install all the parts until you have typed make install" - @${ECHO_MSG} "This port does not ensure things are upgraded; use portupgrade if you want to" - @${ECHO_MSG} "upgrade X.Org. If you simply type 'make install' it may use over 2GB to build" - @${ECHO_MSG} "all of the subports. You can install the ports singly if you are low on space." - -.include - -.if make(package) -.if !defined(DEPENDS_TARGET:Mpackage) || empty(DEPENDS_TARGET:Mpackage) -DEPENDS_TARGET="package" -.endif -.endif - -.include +.include