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

Collapse All | Expand All

(-)devel/p4/Makefile (-1 / +8 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	p4
4
PORTNAME=	p4
5
PORTVERSION=	${YEAR}.${MAJOR}.${MINOR}
5
PORTVERSION=	${YEAR}.${MAJOR}.${MINOR}
6
PORTREVISION=	2
6
PORTREVISION=	3
7
CATEGORIES=	devel
7
CATEGORIES=	devel
8
# Perforce stupidly rerolls their distfiles on a regular basis, updating the
8
# Perforce stupidly rerolls their distfiles on a regular basis, updating the
9
# files' timestamps when they do, which changes the zip file's checksum.  Work
9
# files' timestamps when they do, which changes the zip file's checksum.  Work
Lines 26-31 Link Here
26
26
27
BUILD_DEPENDS=	${JAM}:devel/jam
27
BUILD_DEPENDS=	${JAM}:devel/jam
28
28
29
.if ${OSVERSION} >= 1200000
30
# P4 is incompatible with OpenSSL 1.1.1
31
OPENSSLBASE=	${LOCALBASE}
32
BUILD_DEPENDS+=	${LOCALBASE}/lib/libssl.so.9:security/openssl
33
.endif
34
29
# p4 links libssl and libcrypto statically, so specify :build
35
# p4 links libssl and libcrypto statically, so specify :build
30
USES=		ssl:build
36
USES=		ssl:build
31
37
Lines 43-48 Link Here
43
		LINKFLAGS="${LDFLAGS}" \
49
		LINKFLAGS="${LDFLAGS}" \
44
		OSVER=${OSVER} \
50
		OSVER=${OSVER} \
45
		SSL="yes" \
51
		SSL="yes" \
52
		SSLINCLUDE=${OPENSSLINC} \
46
		SSLPREFIX=${OPENSSLLIB} \
53
		SSLPREFIX=${OPENSSLLIB} \
47
		${JAM} -dx -j${MAKE_JOBS_NUMBER} || true
54
		${JAM} -dx -j${MAKE_JOBS_NUMBER} || true
48
55

Return to bug 229021