From owner-svn-ports-head@freebsd.org Thu Mar 4 11:36:33 2021 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9998056DD20; Thu, 4 Mar 2021 11:36:33 +0000 (UTC) (envelope-from kai@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DrpjY40xsz3MHV; Thu, 4 Mar 2021 11:36:33 +0000 (UTC) (envelope-from kai@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 783131C801; Thu, 4 Mar 2021 11:36:33 +0000 (UTC) (envelope-from kai@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 124BaXkf098847; Thu, 4 Mar 2021 11:36:33 GMT (envelope-from kai@FreeBSD.org) Received: (from kai@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 124BaX4f098846; Thu, 4 Mar 2021 11:36:33 GMT (envelope-from kai@FreeBSD.org) Message-Id: <202103041136.124BaX4f098846@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kai set sender to kai@FreeBSD.org using -f From: Kai Knoblich Date: Thu, 4 Mar 2021 11:36:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r567307 - head/x11-toolkits/nanogui X-SVN-Group: ports-head X-SVN-Commit-Author: kai X-SVN-Commit-Paths: head/x11-toolkits/nanogui X-SVN-Commit-Revision: 567307 X-SVN-Commit-Repository: ports 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.34 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: Thu, 04 Mar 2021 11:36:33 -0000 Author: kai Date: Thu Mar 4 11:36:32 2021 New Revision: 567307 URL: https://svnweb.freebsd.org/changeset/ports/567307 Log: x11-toolkits/nanogui: Fix packaging with Python 3.8 * Also apply the same fix as in r559094 by stripping libraries by wildcard paths. * Use PYTHONPREFIX_SITELIBDIR instead PYTHON_SITELIBDIR to make the port PREFIX safe while I'm here. PR: 253815 Approved by: python (with hat) Modified: head/x11-toolkits/nanogui/Makefile head/x11-toolkits/nanogui/pkg-plist Modified: head/x11-toolkits/nanogui/Makefile ============================================================================== --- head/x11-toolkits/nanogui/Makefile Thu Mar 4 11:33:33 2021 (r567306) +++ head/x11-toolkits/nanogui/Makefile Thu Mar 4 11:36:32 2021 (r567307) @@ -38,7 +38,7 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/ext/nanovg/src/*.h ${STAGEDIR}${PREFIX}/include/nanogui/ # bundled dependency headers aren't installed post-install-PYTHON-on: - @${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR} - ${MV} ${STAGEDIR}${PREFIX}/lib/nanogui.so ${STAGEDIR}${PYTHON_SITELIBDIR} + @${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} + ${MV} ${STAGEDIR}${PREFIX}/lib/nanogui*.so ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} .include Modified: head/x11-toolkits/nanogui/pkg-plist ============================================================================== --- head/x11-toolkits/nanogui/pkg-plist Thu Mar 4 11:33:33 2021 (r567306) +++ head/x11-toolkits/nanogui/pkg-plist Thu Mar 4 11:36:32 2021 (r567307) @@ -42,4 +42,4 @@ include/nanogui/vscrollpanel.h include/nanogui/widget.h include/nanogui/window.h lib/libnanogui.so -%%PYTHON%%%%PYTHON_SITELIBDIR%%/nanogui.so +%%PYTHON%%%%PYTHON_SITELIBDIR%%/nanogui%%PYTHON_EXT_SUFFIX%%.so