Attachment #183037 for bug #219597





PORTNAME=	pari
PORTVERSION=	2.9.2
PORTREVISION=	1
PORTEPOCH=	2
CATEGORIES=	math
MASTER_SITES=	http://pari.math.u-bordeaux.fr/pub/pari/unix/ \

CONFIGURE_SCRIPT=	Configure
CONFIGURE_ARGS=	--mandir=${MANPREFIX}/man/man1 \
		--prefix=${PREFIX} \
		--with-readline
HAS_CONFIGURE=	yes
USE_LDCONFIG=	yes
USE_PERL5=	build
USES=		perl5 readline

OPTIONS_DEFINE=		DOCS OPTIMIZED_CFLAGS X11
OPTIONS_RADIO=		THREADS
OPTIONS_RADIO_THREADS=	PTHREADS MPI
OPTIONS_DEFAULT=	OPTIMIZED_CFLAGS X11 PTHREADS
THREADS_DESC=		Thread engine (single-threaded when none is selected)
PTHREADS_DESC=		Enable pthread thread engine
MPI_DESC=		Enable MPI thread engine
MPI_BUILD_ENV=		CC=mpicc
.ifndef WITH_DEBUG
OPTIMIZED_CFLAGS_CFLAGS=	-O3 -fno-strict-aliasing -fomit-frame-pointer
.endif

X11_CONFIGURE_ON=	--graphic=X11
X11_CONFIGURE_OFF=	--graphic=none
X11_USE=		xorg=x11
MPI_RUN_DEPENDS=	${LOCALBASE}/bin/mpirun:net/mpich2
MPI_BUILD_DEPENDS=	${LOCALBASE}/bin/mpicc:net/mpich2
MPI_LIB_DEPENDS=	libgmp.so:math/gmp
PTHREADS_LIB_DEPENDS=	libgmp.so:math/gmp
PTHREADS_CONFIGURE_ON=	--mt=pthread --with-gmp=${LOCALBASE}
MPI_CONFIGURE_ON=	--mt=mpi --with-gmp=${LOCALBASE}
MPI_CONFIGURE_ENV=	CC=${LOCALBASE}/bin/mpicc
OPTIONS_SUB=	yes

PLIST_SUB=	GP_VERSION=${GP_VERSION} PORTVERSION=${PORTVERSION}
PORTDATA=	*

post-patch:
	@${REINPLACE_CMD} -e '/^CFLAGS=/s/\$$cflags//' \
		${WRKSRC}/config/get_cc
	@${REINPLACE_CMD} -e 's|-lX11|-L${LOCALBASE}/lib -lX11|' \
		${WRKSRC}/config/get_X11
	@${REINPLACE_CMD} -e 's|-lreadline|-L${LOCALBASE}/lib -lreadline|' \
		${WRKSRC}/config/get_readline

post-install:
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpari-gmp*.so.*

do-test-PTHREADS-on:
	@cd ${WRKSRC} && ${MAKE_CMD} test-parallel

do-test-MPI-on:
	@cd ${WRKSRC} && ${MAKE_CMD} test-parallel RUNTEST="mpirun -np 3"

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)math/pari/distinfo (-1 / +1 lines)
1	TIMESTAMP = 1491984081	1	TIMESTAMP = 1495916881
2	SHA256 (pari-2.9.2.tar.gz) = 9aa24cbbcf4e0b09dcc21cf9b09f2eb08e38ee16ab13651be7274c9b3e46207e	2	SHA256 (pari-2.9.2.tar.gz) = 9aa24cbbcf4e0b09dcc21cf9b09f2eb08e38ee16ab13651be7274c9b3e46207e
3	SIZE (pari-2.9.2.tar.gz) = 3842811	3	SIZE (pari-2.9.2.tar.gz) = 3842811




--- Configure.orig	2017-05-28 16:56:49 UTC
+++ Configure
@@ -104,9 +104,9 @@ case $kernlvl1 in
 gmp) libpari_base=pari-gmp;;
 none) libpari_base=pari;;
 esac
-case $enable_tls in
-yes) libpari_base="${libpari_base}-tls"
-esac
+#case $enable_tls in
+#yes) libpari_base="${libpari_base}-tls"
+#esac
 
 if test `expr $VersionMinor % 2` = 0; then
   libpari_base=$libpari_base-$version

Return to bug 219597

Lines 3-8 Link Here

(-)math/pari/Makefile (-4 / +29 lines)
3		3
4	PORTNAME= pari	4	PORTNAME= pari
5	PORTVERSION= 2.9.2	5	PORTVERSION= 2.9.2
		6	PORTREVISION= 1
6	PORTEPOCH= 2	7	PORTEPOCH= 2
7	CATEGORIES= math	8	CATEGORIES= math
8	MASTER_SITES= http://pari.math.u-bordeaux.fr/pub/pari/unix/ \	9	MASTER_SITES= http://pari.math.u-bordeaux.fr/pub/pari/unix/ \
Lines 21-34 Link Here
21	CONFIGURE_SCRIPT= Configure	22	CONFIGURE_SCRIPT= Configure
22	CONFIGURE_ARGS= --mandir=${MANPREFIX}/man/man1 \	23	CONFIGURE_ARGS= --mandir=${MANPREFIX}/man/man1 \
23	--prefix=${PREFIX} \	24	--prefix=${PREFIX} \
24	--with-gmp=${LOCALBASE}	25	--with-readline
25	HAS_CONFIGURE= yes	26	HAS_CONFIGURE= yes
26	USE_LDCONFIG= yes	27	USE_LDCONFIG= yes
27	USE_PERL5= build	28	USE_PERL5= build
28	USES= perl5	29	USES= perl5 readline
29		30
30	OPTIONS_DEFINE= DOCS OPTIMIZED_CFLAGS X11	31	OPTIONS_DEFINE= DOCS OPTIMIZED_CFLAGS X11
31	OPTIONS_DEFAULT= OPTIMIZED_CFLAGS X11	32	OPTIONS_RADIO= THREADS
		33	OPTIONS_RADIO_THREADS= PTHREADS MPI
		34	OPTIONS_DEFAULT= OPTIMIZED_CFLAGS X11 PTHREADS
		35	THREADS_DESC= Thread engine (single-threaded when none is selected)
		36	PTHREADS_DESC= Enable pthread thread engine
		37	MPI_DESC= Enable MPI thread engine
		38	MPI_BUILD_ENV= CC=mpicc
32	.ifndef WITH_DEBUG	39	.ifndef WITH_DEBUG
33	OPTIMIZED_CFLAGS_CFLAGS= -O3 -fno-strict-aliasing -fomit-frame-pointer	40	OPTIMIZED_CFLAGS_CFLAGS= -O3 -fno-strict-aliasing -fomit-frame-pointer
34	.endif	41	.endif
Lines 35-40 Link Here
35	X11_CONFIGURE_ON= --graphic=X11	42	X11_CONFIGURE_ON= --graphic=X11
36	X11_CONFIGURE_OFF= --graphic=none	43	X11_CONFIGURE_OFF= --graphic=none
37	X11_USE= xorg=x11	44	X11_USE= xorg=x11
		45	MPI_RUN_DEPENDS= ${LOCALBASE}/bin/mpirun:net/mpich2
		46	MPI_BUILD_DEPENDS= ${LOCALBASE}/bin/mpicc:net/mpich2
		47	MPI_LIB_DEPENDS= libgmp.so:math/gmp
		48	PTHREADS_LIB_DEPENDS= libgmp.so:math/gmp
		49	PTHREADS_CONFIGURE_ON= --mt=pthread --with-gmp=${LOCALBASE}
		50	MPI_CONFIGURE_ON= --mt=mpi --with-gmp=${LOCALBASE}
		51	MPI_CONFIGURE_ENV= CC=${LOCALBASE}/bin/mpicc
		52	OPTIONS_SUB= yes
38		53
39	PLIST_SUB= GP_VERSION=${GP_VERSION} PORTVERSION=${PORTVERSION}	54	PLIST_SUB= GP_VERSION=${GP_VERSION} PORTVERSION=${PORTVERSION}
40	PORTDATA= *	55	PORTDATA= *
Lines 46-53 Link Here
46	post-patch:	61	post-patch:
47	@${REINPLACE_CMD} -e '/^CFLAGS=/s/\$$cflags//' \	62	@${REINPLACE_CMD} -e '/^CFLAGS=/s/\$$cflags//' \
48	${WRKSRC}/config/get_cc	63	${WRKSRC}/config/get_cc
		64	@${REINPLACE_CMD} -e 's\|-lX11\|-L${LOCALBASE}/lib -lX11\|' \
		65	${WRKSRC}/config/get_X11
		66	@${REINPLACE_CMD} -e 's\|-lreadline\|-L${LOCALBASE}/lib -lreadline\|' \
		67	${WRKSRC}/config/get_readline
49		68
50	post-install:	69	post-install:
51	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpari-gmp.so.*	70	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpari-gmp.so.
52		71
		72	do-test-PTHREADS-on:
		73	@cd ${WRKSRC} && ${MAKE_CMD} test-parallel
		74
		75	do-test-MPI-on:
		76	@cd ${WRKSRC} && ${MAKE_CMD} test-parallel RUNTEST="mpirun -np 3"
		77
53	.include <bsd.port.mk>	78	.include <bsd.port.mk>

Line 0 Link Here

(-)math/pari/files/patch-Configure (+15 lines)
	1	--- Configure.orig 2017-05-28 16:56:49 UTC
	2	+++ Configure
	3	@@ -104,9 +104,9 @@ case $kernlvl1 in
	4	gmp) libpari_base=pari-gmp;;
	5	none) libpari_base=pari;;
	6	esac
	7	-case $enable_tls in
	8	-yes) libpari_base="${libpari_base}-tls"
	9	-esac
	10	+#case $enable_tls in
	11	+#yes) libpari_base="${libpari_base}-tls"
	12	+#esac
	13
	14	if test `expr $VersionMinor % 2` = 0; then
	15	libpari_base=$libpari_base-$version