Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 4 Mar 2021 11:36:33 +0000 (UTC)
From:      Kai Knoblich <kai@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r567307 - head/x11-toolkits/nanogui
Message-ID:  <202103041136.124BaX4f098846@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 <bsd.port.mk>

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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202103041136.124BaX4f098846>