From owner-svn-ports-all@freebsd.org Wed Mar 28 18:55:35 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 34FC8F701D7; Wed, 28 Mar 2018 18:55:35 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id DA9077DA36; Wed, 28 Mar 2018 18:55:34 +0000 (UTC) (envelope-from tobik@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D0E5B6F02; Wed, 28 Mar 2018 18:55:34 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2SItYgx035141; Wed, 28 Mar 2018 18:55:34 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2SItYVw035140; Wed, 28 Mar 2018 18:55:34 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201803281855.w2SItYVw035140@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Wed, 28 Mar 2018 18:55:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r465839 - head/graphics/glfw X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: head/graphics/glfw X-SVN-Commit-Revision: 465839 X-SVN-Commit-Repository: ports 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.25 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: Wed, 28 Mar 2018 18:55:35 -0000 Author: tobik Date: Wed Mar 28 18:55:34 2018 New Revision: 465839 URL: https://svnweb.freebsd.org/changeset/ports/465839 Log: Cleanup graphics/glfw - Simplify DOCS and EXAMPLES installation - Use CMAKE_ON - Add LICENSE_FILE - Let the framework handle the move of *.pc files to libdata/pkgconfig Modified: head/graphics/glfw/Makefile Modified: head/graphics/glfw/Makefile ============================================================================== --- head/graphics/glfw/Makefile Wed Mar 28 18:49:23 2018 (r465838) +++ head/graphics/glfw/Makefile Wed Mar 28 18:55:34 2018 (r465839) @@ -11,36 +11,16 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Portable framework for OpenGL development LICENSE= ZLIB +LICENSE_FILE= ${WRKSRC}/COPYING.txt USES= cmake localbase zip USE_GL= glu USE_LDCONFIG= yes -CMAKE_ARGS= -DBUILD_SHARED_LIBS:BOOL=ON +CMAKE_ON= BUILD_SHARED_LIBS PORTDOCS= * - -DOCSRCDIR1= ${WRKSRC} -DOC_FILES1= README.md - -DOCSRCDIR2= ${WRKSRC}/docs/html/search -DOCSDIR2= ${DOCSDIR}/docs/html/search -DOC_FILES2= * - -DOCSRCDIR3= ${WRKSRC}/docs/html -DOCSDIR3= ${DOCSDIR}/docs/html -DOC_FILES3= *.html *.png *.css *.js - PORTEXAMPLES= * -EXAMPLESSRCDIR1= ${WRKSRC}/examples -EXAMPLES_FILES1= boing gears heightmap particles simple splitview wave - -EXAMPLESSRCDIR2= ${WRKSRC}/tests -EXAMPLESDIR2= ${EXAMPLESDIR}/tests -EXAMPLES_FILES2= clipboard cursor empty events gamma glfwinfo iconify \ - joysticks monitors msaa reopen sharing tearing threads \ - title windows - OPTIONS_DEFINE= DOCS EXAMPLES WAYLAND OPTIONS_EXCLUDE_FreeBSD_10= WAYLAND # needs dev/evdev/input.h @@ -53,23 +33,23 @@ WAYLAND_USES= kde:5 pkgconfig WAYLAND_USE= KDE=ecm WAYLAND_USE_OFF= XORG=x11,xcursor,xinerama,xrandr,xxf86vm -post-patch: - @${REINPLACE_CMD} -e 's|lib$${LIB_SUFFIX}/pkgconfig|libdata/pkgconfig|' \ - ${WRKSRC}/CMakeLists.txt - do-install-DOCS-on: - @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${DOC_FILES1:S|^|${DOCSRCDIR1}/|} ${STAGEDIR}${DOCSDIR} - @${MKDIR} ${STAGEDIR}${DOCSDIR2} - ${INSTALL_DATA} ${DOC_FILES2:S|^|${DOCSRCDIR2}/|} ${STAGEDIR}${DOCSDIR2} - ${INSTALL_DATA} ${DOC_FILES3:S|^|${DOCSRCDIR3}/|} ${STAGEDIR}${DOCSDIR3} + @${MKDIR} ${STAGEDIR}${DOCSDIR}/docs/html/search + ${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/docs/html/search/* \ + ${STAGEDIR}${DOCSDIR}/docs/html/search + cd ${WRKSRC}/docs/html && ${INSTALL_DATA} *.html *.png *.css *.js \ + ${STAGEDIR}${DOCSDIR}/docs/html do-install-EXAMPLES-on: - @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} - ${INSTALL_PROGRAM} ${EXAMPLES_FILES1:S|^|${EXAMPLESSRCDIR1}/|} \ + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/tests + cd ${WRKSRC}/examples && ${INSTALL_PROGRAM} \ + boing gears heightmap particles simple splitview wave \ ${STAGEDIR}${EXAMPLESDIR} - @${MKDIR} ${STAGEDIR}${EXAMPLESDIR2} - ${INSTALL_PROGRAM} ${EXAMPLES_FILES2:S|^|${EXAMPLESSRCDIR2}/|} \ - ${STAGEDIR}${EXAMPLESDIR2} + cd ${WRKSRC}/tests && ${INSTALL_PROGRAM} \ + clipboard cursor empty events gamma glfwinfo iconify \ + joysticks monitors msaa reopen sharing tearing \ + threads title windows \ + ${STAGEDIR}${EXAMPLESDIR}/tests .include