svn commit: r329875 - in head/net: haproxy haproxy-devel

[Dmitry Sivachenko]

Author: demon
Date: Wed Oct  9 08:24:40 2013
New Revision: 329875
URL: http://svnweb.freebsd.org/changeset/ports/329875

Log:
  Correct dependencies for static pcre linkage;
  switch to USES=gmake.

Modified:
  head/net/haproxy-devel/Makefile
  head/net/haproxy/Makefile

Modified: head/net/haproxy-devel/Makefile
==============================================================================
--- head/net/haproxy-devel/Makefile	Wed Oct  9 08:01:13 2013	(r329874)
+++ head/net/haproxy-devel/Makefile	Wed Oct  9 08:24:40 2013	(r329875)
@@ -13,9 +13,9 @@ COMMENT=	The Reliable, High Performance 
 LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	multi
 
+USES=		gmake
 CONFLICTS=	haproxy-[1234567890]\*
 USE_RC_SUBR=	haproxy
-USE_GMAKE=	yes
 SUB_FILES=	pkg-message
 MAN1=		haproxy.1
 
@@ -32,16 +32,14 @@ NO_STAGE=	yes
 MAKE_ARGS=	TARGET=freebsd DEFINE=-DFREEBSD_PORTS USE_GETADDRINFO=1 \
 		USE_ZLIB=1 CC="${CC}" CFLAGS="${CFLAGS}"
 
-.if ${PORT_OPTIONS:MPCRE}
-LIB_DEPENDS+=	pcre:${PORTSDIR}/devel/pcre
-
 .if ${PORT_OPTIONS:MDPCRE}
+LIB_DEPENDS+=	libpcre.so:${PORTSDIR}/devel/pcre
 MAKE_ARGS+=	"USE_PCRE=1"
 .endif
 .if ${PORT_OPTIONS:MSPCRE}
+BUILD_DEPENDS+=	${LOCALBASE}/lib/libpcre.a:${PORTSDIR}/devel/pcre
 MAKE_ARGS+=	"USE_STATIC_PCRE=1"
 .endif
-.endif
 
 .if ${PORT_OPTIONS:MOPENSSL}
 USE_OPENSSL=	yes

Modified: head/net/haproxy/Makefile
==============================================================================
--- head/net/haproxy/Makefile	Wed Oct  9 08:01:13 2013	(r329874)
+++ head/net/haproxy/Makefile	Wed Oct  9 08:24:40 2013	(r329875)
@@ -14,8 +14,8 @@ LICENSE_COMB=	multi
 
 CONFLICTS=	haproxy-devel-[0-9]*
 
+USES=		gmake
 USE_RC_SUBR=	haproxy
-USE_GMAKE=	yes
 SUB_FILES=	pkg-message
 MAN1=		haproxy.1
 
@@ -31,16 +31,14 @@ NO_STAGE=	yes
 
 MAKE_ARGS=	TARGET=freebsd DEFINE=-DFREEBSD_PORTS CC=${CC}
 
-.if ${PORT_OPTIONS:MPCRE}
-LIB_DEPENDS+=	pcre:${PORTSDIR}/devel/pcre
-
 .if ${PORT_OPTIONS:MDPCRE}
+LIB_DEPENDS+=	libpcre.so:${PORTSDIR}/devel/pcre
 MAKE_ARGS+=	"USE_PCRE=1"
 .endif
 .if ${PORT_OPTIONS:MSPCRE}
+BUILD_DEPENDS+=	${LOCALBASE}/lib/libpcre.a:${PORTSDIR}/devel/pcre
 MAKE_ARGS+=	"USE_STATIC_PCRE=1"
 .endif
-.endif
 
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/haproxy ${PREFIX}/sbin/