View | Details | Raw Unified | Return to bug 171679
Collapse All | Expand All

(-)./Makefile (-15 / +32 lines)
Lines 6-12 Link Here
6
#
6
#
7
7
8
PORTNAME=	memcached
8
PORTNAME=	memcached
9
PORTVERSION=	1.4.14
9
PORTVERSION=	1.4.15
10
CATEGORIES=	databases
10
CATEGORIES=	databases
11
MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE} \
11
MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE} \
12
		${MASTER_SITE_GENTOO}
12
		${MASTER_SITE_GENTOO}
Lines 15-31 Link Here
15
MAINTAINER=	swills@FreeBSD.org
15
MAINTAINER=	swills@FreeBSD.org
16
COMMENT=	High-performance distributed memory object cache system
16
COMMENT=	High-performance distributed memory object cache system
17
17
18
LIB_DEPENDS=	event-1.4:${PORTSDIR}/devel/libevent
18
LIB_DEPENDS=	event-1:${PORTSDIR}/devel/libevent
19
19
20
CONFLICTS=	memcached-1.2*
20
CONFLICTS=	memcached-1.2*
21
21
22
OPTIONS_DEFINE=	DTRACE REPCACHED SASL
23
DTRACE_DESC=	Enable dtrace probes
24
REPCACHED_DESC=	Enable data replication feature
25
SASL_DESC=	Enable SASL Authentication
26
22
USE_RC_SUBR=	memcached
27
USE_RC_SUBR=	memcached
23
SUB_LIST+=	RC_SUBR_SUFFIX=${RC_SUBR_SUFFIX}
28
SUB_LIST+=	RC_SUBR_SUFFIX=${RC_SUBR_SUFFIX}
24
GNU_CONFIGURE=	YES
25
CONFIGURE_ARGS=	--with-libevent=${LOCALBASE} --program-prefix=
26
29
27
OPTIONS=	REPCACHED	"Enable data replication feature"	off \
30
USE_CSTD=	c99
28
		SASL		"Enable SASL support"			off
31
GNU_CONFIGURE=	yes
32
CONFIGURE_ARGS=	--with-libevent=${LOCALBASE} --program-prefix= \
33
		--disable-coverage
29
34
30
MAN1=		memcached.1
35
MAN1=		memcached.1
31
36
Lines 42-57 Link Here
42
CFLAGS+=	-fstack-protector
47
CFLAGS+=	-fstack-protector
43
.endif
48
.endif
44
49
45
.if defined(WITH_REPCACHED)
50
.if ${ARCH} == amd64
46
PATCH_SITES+=		${MASTER_SITE_LOCAL}
51
CONFIGURE_ARGS+=	--enable-64bit
47
PATCH_SITE_SUBDIR=	swills
52
.endif
48
PATCH_DIST_STRIP+=	-p1
53
49
PATCHFILES+=		repcached-2.3.1-${PORTVERSION}.patch.gz
54
.if ${PORT_OPTIONS:MDTRACE}
50
CONFIGURE_ARGS+=	--enable-replication
55
BROKEN=			DTRACE broken with gcc/clang - reported upstream
56
CONFIGURE_ARGS+=	--enable-dtrace
57
.else
58
CONFIGURE_ARGS+=	--disable-dtrace
59
.endif
60
61
.if ${PORT_OPTIONS:MREPCACHED}
62
BROKEN=			Need an updated repcached patch for ${PORTVERSION}
63
#PATCH_SITES+=		${MASTER_SITE_LOCAL}
64
#PATCH_SITE_SUBDIR=	swills
65
#PATCH_DIST_STRIP+=	-p1
66
#PATCHFILES+=		repcached-2.3.1-${PORTVERSION}.patch.gz
67
#CONFIGURE_ARGS+=	--enable-replication
51
.endif
68
.endif
52
69
53
.if defined(WITH_SASL) && !defined(WITHOUT_SASL)
70
.if ${PORT_OPTIONS:MSASL} && !defined(WITHOUT_SASL)
54
LIB_DEPENDS+=		sasl2.2:${PORTSDIR}/security/cyrus-sasl2
71
LIB_DEPENDS+=		sasl2:${PORTSDIR}/security/cyrus-sasl2
55
CONFIGURE_ARGS+=	--enable-sasl
72
CONFIGURE_ARGS+=	--enable-sasl
56
CFLAGS+=		-I${LOCALBASE}/include
73
CFLAGS+=		-I${LOCALBASE}/include
57
CPPFLAGS+=		${CFLAGS}
74
CPPFLAGS+=		${CFLAGS}
Lines 74-80 Link Here
74
.endfor
91
.endfor
75
.endif
92
.endif
76
93
77
test:
94
test: build
78
	${MAKE} -C ${WRKSRC} test
95
	${MAKE} -C ${WRKSRC} test
79
96
80
.include <bsd.port.post.mk>
97
.include <bsd.port.post.mk>
(-)./distinfo (-4 / +2 lines)
Lines 1-4 Link Here
1
SHA256 (memcached-1.4.14.tar.gz) = f2e2ad8ee8d256f2c3748d7f741dcddfd0ab6bdece6fa1c18484e83f311156ef
1
SHA256 (memcached-1.4.15.tar.gz) = 169721ab7a7531add6ae9f6b14b6b5641725fe0b1f0bdf5c3a4327725901e2b4
2
SIZE (memcached-1.4.14.tar.gz) = 321262
2
SIZE (memcached-1.4.15.tar.gz) = 324451
3
SHA256 (repcached-2.3.1-1.4.14.patch.gz) = 1c6ca0fcdae7749fe79273449fa9cdc02727deddf2d880e4a555c78130a48600
4
SIZE (repcached-2.3.1-1.4.14.patch.gz) = 19846

Return to bug 171679