View | Details | Raw Unified | Return to bug 211921 | Differences between
and this patch

Collapse All | Expand All

(-)brlcad/Makefile (-16 / +19 lines)
Lines 2-9 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	brlcad
4
PORTNAME=	brlcad
5
PORTVERSION=	7.24.0
5
PORTVERSION=	7.26.4
6
PORTREVISION=	7
6
PORTREVISION=	8
7
CATEGORIES=	cad
7
CATEGORIES=	cad
8
MASTER_SITES=	SF/${PORTNAME}/BRL-CAD%20Source/${PORTVERSION}
8
MASTER_SITES=	SF/${PORTNAME}/BRL-CAD%20Source/${PORTVERSION}
9
9
Lines 25-34 Link Here
25
		libexpat.so:textproc/expat2 \
25
		libexpat.so:textproc/expat2 \
26
		libfontconfig.so:x11-fonts/fontconfig
26
		libfontconfig.so:x11-fonts/fontconfig
27
27
28
CONFLICTS_INSTALL=	py[23][0-9]-epsilon
28
CONFLICTS_INSTALL=	py[23][0-9]-epsilon mesa-demos
29
29
30
USES=		bison cmake:outsource pathfix pkgconfig python:env shebangfix \
30
USES=		bison cmake:outsource,noninja pathfix pkgconfig python:env shebangfix \
31
		tar:bzip2 tk:85
31
		tar:bzip2 tk:86
32
USE_GL=		gl glu
32
USE_GL=		gl glu
33
USE_XORG=	ice sm x11 xau xcb xdamage xdmcp xext xfixes xft xi \
33
USE_XORG=	ice sm x11 xau xcb xdamage xdmcp xext xfixes xft xi \
34
		xorgproto xrender xscrnsaver xt xxf86vm
34
		xorgproto xrender xscrnsaver xt xxf86vm
Lines 39-63 Link Here
39
39
40
PLIST_SUB+=	PORTVERSION=${PORTVERSION}
40
PLIST_SUB+=	PORTVERSION=${PORTVERSION}
41
41
42
CMAKE_OFF=	BRLCAD_ENABLE_STRICT
42
# CMAKE_OFF=	BRLCAD_ENABLE_STRICT
43
CMAKE_ARGS=	-DBRLCAD_BUNDLED_LIBS=ON 	\
44
		-DBRLCAD_ENABLE_STRICT=OFF 	\
45
		-DBRLCAD_FLAGS_DEBUG=OFF
43
CMAKE_INSTALL_PREFIX=	${PREFIX}/${PORTNAME}
46
CMAKE_INSTALL_PREFIX=	${PREFIX}/${PORTNAME}
44
MANPREFIX=	${PREFIX}/${PORTNAME}/share
47
MANPREFIX=	${PREFIX}/${PORTNAME}/share
45
48
46
TEST_TARGET=	check
49
TEST_TARGET=	check
47
50
48
post-patch:
51
# post-patch:
49
	@${REINPLACE_CMD} "s+-exact Tcl 8\.5\.9+Tcl 8.5+" ${WRKSRC}/src/other/tcl/library/init.tcl
52
	# @${REINPLACE_CMD} "s+-exact Tcl 8\.5\.9+Tcl 8.5+" ${WRKSRC}/src/other/tcl/library/init.tcl
50
53
51
pre-install:
54
# pre-install:
52
	${CP} ${FILESDIR}/mged.sh ${WRKSRC}
55
	# ${CP} ${FILESDIR}/mged.sh ${WRKSRC}
53
	${REINPLACE_CMD} -e 's+%%BRLCAD_ROOT%%+${PREFIX}/${PORTNAME}+g;' ${WRKSRC}/mged.sh
56
	# ${REINPLACE_CMD} -e 's+%%BRLCAD_ROOT%%+${PREFIX}/${PORTNAME}+g;' ${WRKSRC}/mged.sh
54
57
55
# note that installing outside of PREFIX wigs out package stuff... :/
58
# note that installing outside of PREFIX wigs out package stuff... :/
56
post-install:
59
# post-install:
57
	${MKDIR} ${STAGEDIR}${PREFIX}/bin
60
	# ${MKDIR} ${STAGEDIR}${PREFIX}/bin
58
	${INSTALL_SCRIPT} ${WRKSRC}/mged.sh ${STAGEDIR}${PREFIX}/bin/mged.sh
61
	# ${INSTALL_SCRIPT} ${WRKSRC}/mged.sh ${STAGEDIR}${PREFIX}/bin/mged.sh
59
62
60
regression-test: build
63
# regression-test: build
61
	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} test)
64
	# @(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} test)
62
65
63
.include <bsd.port.mk>
66
.include <bsd.port.mk>
(-)brlcad/distinfo (-2 / +3 lines)
Lines 1-2 Link Here
1
SHA256 (brlcad-7.24.0.tar.bz2) = 2ee79c563573abed3214ec379020af48c34234e21ae810e76044840fdedcaa20
1
TIMESTAMP = 1535121752
2
SIZE (brlcad-7.24.0.tar.bz2) = 71818033
2
SHA256 (brlcad-7.26.4.tar.bz2) = 1fbf2551b9dd8b1b97beca9eb26bb2db9aa270017cc17329ba3a7518bab30440
3
SIZE (brlcad-7.26.4.tar.bz2) = 116079771

Return to bug 211921