svn commit: r397543 - in head/math: . z3 z3/files

[Jan Beich]

====> Running Q/A tests (stage-qa)
Warning: 'bin/z3' is not stripped consider trying INSTALL_TARGET=install-strip or using ${STRIP_CMD}
Warning: 'lib/libz3.so' is not stripped consider trying INSTALL_TARGET=install-strip or using ${STRIP_CMD}
Warning: 'lib/python2.7/site-packages/libz3.so' is not stripped consider trying INSTALL_TARGET=install-strip or using ${STRIP_CMD}

Mark Felder <feld at FreeBSD.org> writes:

> +PORTNAME=	z3
> +PORTVERSION=	4.4.0
[...]
> +GH_TAGNAME=	z3-${PORTVERSION}

Porter's Handbook advises to use DISTVERSION*FIX in such cases which'd
deduplicate version from distinfo.

> +LICENSE=	MIT

MIT varies just like BSD. If possible specify LICENSE_FILE.

https://fedoraproject.org/wiki/Licensing:MIT

> +.if defined(WITH_DEBUG)
> +CONFIGURE_ARGS+=	--debug
> +.endif

WITH_* conditionals are old-style options, from pre-optionsNG era.
Why STATIC is advertised while DEBUG is not?

> +pre-build:
> +	${MKDIR} ${STAGEDIR}/${PYTHON_SITELIBDIR}

%%PYTHON_SITELIBDIR%% != ${PYTHON_SITELIBDIR}. The former refers to PREFIX
while the latter to LOCALBASE. Checking with |poudriere testport -P|
suggests one more change is necessary.

There's no need for path separator after ${STAGEDIR}.

Index: math/z3/Makefile
===================================================================
--- math/z3/Makefile	(revision 397555)
+++ math/z3/Makefile	(working copy)
@@ -2,6 +2,7 @@
 
 PORTNAME=	z3
 PORTVERSION=	4.4.0
+DISTVERSIONPREFIX=	${PORTNAME}-
 CATEGORIES=	math
 
 MAINTAINER=	6yearold at gmail.com
@@ -8,16 +9,18 @@ MAINTAINER=	6yearold at gmail.com
 COMMENT=	Z3 Theorem Prover
 
 LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Z3Prover
-GH_TAGNAME=	z3-${PORTVERSION}
 
-OPTIONS_DEFINE=		STATIC
+OPTIONS_DEFINE=		DEBUG STATIC
 
 OPTIONS_DEFAULT=	STATIC
 OPTIONS_SUB=		yes
 
+DEBUG_CONFIGURE_ON=	--debug
+
 STATIC_DESC=		Build static z3 library
 STATIC_CONFIGURE_ON=	--staticlib
 
@@ -32,13 +35,14 @@ USE_LDCONFIG=		yes
 BUILD_WRKSRC=		${WRKSRC}/build
 INSTALL_WRKSRC=		${WRKSRC}/build
 
-.if defined(WITH_DEBUG)
-CONFIGURE_ARGS+=	--debug
-.endif
-
 USES=		python
 
 pre-build:
-	${MKDIR} ${STAGEDIR}/${PYTHON_SITELIBDIR}
+	${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/z3
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libz3.so
+	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/libz3.so
+
 .include <bsd.port.mk>
Index: math/z3/distinfo
===================================================================
--- math/z3/distinfo	(revision 397555)
+++ math/z3/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (Z3Prover-z3-4.4.0-z3-4.4.0_GH0.tar.gz) = 65b72f9eb0af50949e504b47080fb3fc95f11c435633041d9a534473f3142cba
-SIZE (Z3Prover-z3-4.4.0-z3-4.4.0_GH0.tar.gz) = 3060731
+SHA256 (Z3Prover-z3-z3-4.4.0_GH0.tar.gz) = 65b72f9eb0af50949e504b47080fb3fc95f11c435633041d9a534473f3142cba
+SIZE (Z3Prover-z3-z3-4.4.0_GH0.tar.gz) = 3060731
Index: math/z3/files/patch-scripts_mk__util.py
===================================================================
--- math/z3/files/patch-scripts_mk__util.py	(revision 397555)
+++ math/z3/files/patch-scripts_mk__util.py	(working copy)
@@ -1,5 +1,14 @@
 --- scripts/mk_util.py.orig	2015-04-29 14:40:46 UTC
 +++ scripts/mk_util.py
+@@ -41,7 +41,7 @@ CXX_COMPILERS=['g++', 'clang++']
+ C_COMPILERS=['gcc', 'clang']
+ JAVAC=None
+ JAR=None
+-PYTHON_PACKAGE_DIR=distutils.sysconfig.get_python_lib()
++PYTHON_PACKAGE_DIR=distutils.sysconfig.get_python_lib(prefix=getenv("PREFIX", None))
+ BUILD_DIR='build'
+ REV_BUILD_DIR='..'
+ SRC_DIR='src'
 @@ -948,7 +948,7 @@ class LibComponent(Component):
  
      def mk_install(self, out):
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 602 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/svn-ports-all/attachments/20150922/fbf31d08/attachment.bin>