From owner-svn-ports-all@freebsd.org Sat Jan 16 17:48:14 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B80DCA856B5; Sat, 16 Jan 2016 17:48:14 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 75B181A67; Sat, 16 Jan 2016 17:48:14 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0GHmDRh049822; Sat, 16 Jan 2016 17:48:13 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0GHmCZ6049812; Sat, 16 Jan 2016 17:48:12 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201601161748.u0GHmCZ6049812@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Sat, 16 Jan 2016 17:48:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r406252 - in head/x11-toolkits: . mygui mygui-dummy mygui-ogre mygui-opengl X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Jan 2016 17:48:14 -0000 Author: amdmi3 Date: Sat Jan 16 17:48:12 2016 New Revision: 406252 URL: https://svnweb.freebsd.org/changeset/ports/406252 Log: Split render engine modules into separate ports to allow multiple render modules installed at the same time without introducing unneeded dependencies. PR: 205726 Added: head/x11-toolkits/mygui-dummy/ head/x11-toolkits/mygui-dummy/Makefile (contents, props changed) head/x11-toolkits/mygui-dummy/pkg-plist (contents, props changed) head/x11-toolkits/mygui-ogre/ head/x11-toolkits/mygui-ogre/Makefile (contents, props changed) head/x11-toolkits/mygui-ogre/pkg-plist (contents, props changed) head/x11-toolkits/mygui-opengl/ head/x11-toolkits/mygui-opengl/Makefile (contents, props changed) head/x11-toolkits/mygui-opengl/pkg-plist (contents, props changed) Modified: head/x11-toolkits/Makefile head/x11-toolkits/mygui/Makefile head/x11-toolkits/mygui/pkg-plist Modified: head/x11-toolkits/Makefile ============================================================================== --- head/x11-toolkits/Makefile Sat Jan 16 17:43:45 2016 (r406251) +++ head/x11-toolkits/Makefile Sat Jan 16 17:48:12 2016 (r406252) @@ -117,6 +117,9 @@ SUBDIR += movingmotif SUBDIR += mowitz SUBDIR += mygui + SUBDIR += mygui-dummy + SUBDIR += mygui-ogre + SUBDIR += mygui-opengl SUBDIR += neXtaw SUBDIR += nucleo SUBDIR += ocaml-lablgtk2 Added: head/x11-toolkits/mygui-dummy/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-toolkits/mygui-dummy/Makefile Sat Jan 16 17:48:12 2016 (r406252) @@ -0,0 +1,14 @@ +# Created by: Dmitry Marakasov +# $FreeBSD$ + +PORTREVISION= 0 +PKGNAMESUFFIX= -dummy + +COMMENT= Dummy renderer for MyGUI + +MASTERDIR= ${.CURDIR}/../mygui + +MYGUI_RENDERSYSTEM= 1 +MYGUI_SUBDIR= Platforms/Dummy/DummyPlatform + +.include "${MASTERDIR}/Makefile" Added: head/x11-toolkits/mygui-dummy/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-toolkits/mygui-dummy/pkg-plist Sat Jan 16 17:48:12 2016 (r406252) @@ -0,0 +1,5 @@ +include/MYGUI/MyGUI_DummyDataManager.h +include/MYGUI/MyGUI_DummyDiagnostic.h +include/MYGUI/MyGUI_DummyPlatform.h +include/MYGUI/MyGUI_DummyRenderManager.h +lib/libMyGUI.DummyPlatform.a Added: head/x11-toolkits/mygui-ogre/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-toolkits/mygui-ogre/Makefile Sat Jan 16 17:48:12 2016 (r406252) @@ -0,0 +1,16 @@ +# Created by: Dmitry Marakasov +# $FreeBSD$ + +PORTREVISION= 0 +PKGNAMESUFFIX= -ogre + +COMMENT= Ogre3d renderer for MyGUI + +MASTERDIR= ${.CURDIR}/../mygui + +LIB_DEPENDS= libOgreMain.so:graphics/ogre3d + +MYGUI_RENDERSYSTEM= 3 +MYGUI_SUBDIR= Platforms/Ogre/OgrePlatform + +.include "${MASTERDIR}/Makefile" Added: head/x11-toolkits/mygui-ogre/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-toolkits/mygui-ogre/pkg-plist Sat Jan 16 17:48:12 2016 (r406252) @@ -0,0 +1,10 @@ +include/MYGUI/MyGUI_LastHeader.h +include/MYGUI/MyGUI_OgreDataManager.h +include/MYGUI/MyGUI_OgreDataStream.h +include/MYGUI/MyGUI_OgreDiagnostic.h +include/MYGUI/MyGUI_OgrePlatform.h +include/MYGUI/MyGUI_OgreRTTexture.h +include/MYGUI/MyGUI_OgreRenderManager.h +include/MYGUI/MyGUI_OgreTexture.h +include/MYGUI/MyGUI_OgreVertexBuffer.h +lib/libMyGUI.OgrePlatform.a Added: head/x11-toolkits/mygui-opengl/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-toolkits/mygui-opengl/Makefile Sat Jan 16 17:48:12 2016 (r406252) @@ -0,0 +1,16 @@ +# Created by: Dmitry Marakasov +# $FreeBSD$ + +PORTREVISION= 0 +PKGNAMESUFFIX= -opengl + +COMMENT= OpenGL renderer for MyGUI + +MASTERDIR= ${.CURDIR}/../mygui + +MYGUI_RENDERSYSTEM= 4 +MYGUI_SUBDIR= Platforms/OpenGL/OpenGLPlatform + +USE_GL= glu + +.include "${MASTERDIR}/Makefile" Added: head/x11-toolkits/mygui-opengl/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-toolkits/mygui-opengl/pkg-plist Sat Jan 16 17:48:12 2016 (r406252) @@ -0,0 +1,8 @@ +include/MYGUI/MyGUI_OpenGLDataManager.h +include/MYGUI/MyGUI_OpenGLDiagnostic.h +include/MYGUI/MyGUI_OpenGLPlatform.h +include/MYGUI/MyGUI_OpenGLRTTexture.h +include/MYGUI/MyGUI_OpenGLRenderManager.h +include/MYGUI/MyGUI_OpenGLTexture.h +include/MYGUI/MyGUI_OpenGLVertexBuffer.h +lib/libMyGUI.OpenGLPlatform.a Modified: head/x11-toolkits/mygui/Makefile ============================================================================== --- head/x11-toolkits/mygui/Makefile Sat Jan 16 17:43:45 2016 (r406251) +++ head/x11-toolkits/mygui/Makefile Sat Jan 16 17:48:12 2016 (r406252) @@ -4,32 +4,48 @@ PORTNAME= mygui PORTVERSION= 3.2.2 DISTVERSIONPREFIX= MyGUI +PORTREVISION?= 1 CATEGORIES= x11-toolkits graphics devel MAINTAINER= amdmi3@FreeBSD.org -COMMENT= Fast, simple and flexible GUI system for games and 3D applications +COMMENT?= Fast, simple and flexible GUI system for games and 3D applications LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING.MIT -LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2 \ - libOIS.so:${PORTSDIR}/devel/ois +.if !defined(MASTERDIR) +LIB_DEPENDS= libfreetype.so:print/freetype2 \ + libOIS.so:devel/ois +.else +LIB_DEPENDS+= libMyGUIEngine.so:x11-toolkits/mygui + +BUILD_WRKSRC= ${WRKSRC}/${MYGUI_SUBDIR} +INSTALL_WRKSRC= ${WRKSRC}/${MYGUI_SUBDIR} +.endif USE_GITHUB= yes GH_ACCOUNT= MyGUI -USES= cmake:outsource compiler:c++11-lib ninja pkgconfig -CMAKE_ARGS+= -DMYGUI_BUILD_DEMOS=FALSE \ +MYGUI_RENDERSYSTEM?= 0 + +USES= cmake compiler:c++11-lib pkgconfig +CMAKE_ARGS= -DMYGUI_BUILD_DEMOS=FALSE \ -DMYGUI_BUILD_TOOLS=FALSE \ -DMYGUI_BUILD_DOCS=FALSE \ - -DMYGUI_RENDERSYSTEM=1 # Dummy + -DMYGUI_RENDERSYSTEM=${MYGUI_RENDERSYSTEM} USE_LDCONFIG= yes USE_CXXSTD= c++11 CXXFLAGS+= -fPIC +PLIST= ${.CURDIR}/pkg-plist + post-patch: @${REINPLACE_CMD} -e '/install/ s|lib/pkgconfig|libdata/pkgconfig|' \ ${WRKSRC}/CMake/ConfigureBuild.cmake +.if defined(MASTERDIR) + @${REINPLACE_CMD} -e '/add_dependencies/d' ${BUILD_WRKSRC}/CMakeLists.txt + @${REINPLACE_CMD} -e '/target_link/d' ${BUILD_WRKSRC}/CMakeLists.txt +.endif .include Modified: head/x11-toolkits/mygui/pkg-plist ============================================================================== --- head/x11-toolkits/mygui/pkg-plist Sat Jan 16 17:43:45 2016 (r406251) +++ head/x11-toolkits/mygui/pkg-plist Sat Jan 16 17:48:12 2016 (r406252) @@ -36,10 +36,6 @@ include/MYGUI/MyGUI_DelegateImplement.h include/MYGUI/MyGUI_DeprecatedTypes.h include/MYGUI/MyGUI_DeprecatedWidgets.h include/MYGUI/MyGUI_Diagnostic.h -include/MYGUI/MyGUI_DummyDataManager.h -include/MYGUI/MyGUI_DummyDiagnostic.h -include/MYGUI/MyGUI_DummyPlatform.h -include/MYGUI/MyGUI_DummyRenderManager.h include/MYGUI/MyGUI_DynLib.h include/MYGUI/MyGUI_DynLibManager.h include/MYGUI/MyGUI_EditBox.h @@ -178,7 +174,6 @@ include/MYGUI/MyGUI_XmlDocument.h include/MYGUI/Plugin.h include/MYGUI/StrangeButton.h lib/Plugin_StrangeButton.so -lib/libMyGUI.DummyPlatform.a lib/libMyGUIEngine.so lib/libMyGUIEngine.so.3 lib/libMyGUIEngine.so.3.2.2