[Midnightbsd-cvs] mports [18334] trunk/www/varnish: varnish 3.0.6

[laffer1 at midnightbsd.org]

Revision: 18334
          http://svnweb.midnightbsd.org/mports/?rev=18334
Author:   laffer1
Date:     2015-03-26 19:30:22 -0400 (Thu, 26 Mar 2015)
Log Message:
-----------
varnish 3.0.6

Modified Paths:
--------------
    trunk/www/varnish/Makefile
    trunk/www/varnish/distinfo
    trunk/www/varnish/pkg-plist

Removed Paths:
-------------
    trunk/www/varnish/files/patch-digest

Modified: trunk/www/varnish/Makefile
===================================================================
--- trunk/www/varnish/Makefile	2015-03-26 23:24:35 UTC (rev 18333)
+++ trunk/www/varnish/Makefile	2015-03-26 23:30:22 UTC (rev 18334)
@@ -1,7 +1,7 @@
 # $MidnightBSD$
 
 PORTNAME=	varnish
-PORTVERSION=	3.0.5
+PORTVERSION=	3.0.6
 CATEGORIES=	www
 MASTER_SITES=	http://repo.varnish-cache.org/source/
 
@@ -10,7 +10,7 @@
 
 LICENSE=	bsd2
 
-LIB_DEPENDS=	pcre:${PORTSDIR}/devel/pcre
+LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
 
 GNU_CONFIGURE=	yes
 USE_PYTHON_BUILD=	yes
@@ -19,6 +19,7 @@
 USE_LDCONFIG=	yes
 USES=		autoreconf gmake libtool readline pkgconfig python:build
 INSTALL_TARGET=	install-strip
+
 USE_RC_SUBR=	varnishd varnishlog varnishncsa
 SUB_FILES=	pkg-message
 .if defined(NO_INET6) || defined(WITHOUT_INET6)
@@ -34,7 +35,7 @@
 .endif
 
 regression-test check test: build
-	${GMAKE} TESTS_PARALLELISM=1 -C ${WRKSRC} check
+	${MAKE_CMD} TESTS_PARALLELISM=1 -C ${WRKSRC} check
 
 post-build:
 	#
@@ -56,6 +57,7 @@
 	@${INSTALL_DATA} ${WRKSRC}/include/${f} ${PREFIX}/include/varnish
 .endfor
 	@${RM} -f ${PREFIX}/lib/libvarnishapi.*a ${PREFIX}/lib/varnish/lib*a ${PREFIX}/lib/varnish/vmods/lib*a
+	${MV} ${PREFIX}/lib/pkgconfig/* ${PREFIX}/libdata/pkgconfig/
 
 .include <bsd.port.pre.mk>
 

Modified: trunk/www/varnish/distinfo
===================================================================
--- trunk/www/varnish/distinfo	2015-03-26 23:24:35 UTC (rev 18333)
+++ trunk/www/varnish/distinfo	2015-03-26 23:30:22 UTC (rev 18334)
@@ -1,2 +1,2 @@
-SHA256 (varnish-3.0.5.tar.gz) = 302fd6afc771524ca3912f5d945ab197a55762385c012b2054df7d86bf7ae2b7
-SIZE (varnish-3.0.5.tar.gz) = 2116664
+SHA256 (varnish-3.0.6.tar.gz) = 840ded8f25e7343117f6e3e2015759118f1d2db357ae8d7e02ea964e6fb680b7
+SIZE (varnish-3.0.6.tar.gz) = 2049810

Deleted: trunk/www/varnish/files/patch-digest
===================================================================
--- trunk/www/varnish/files/patch-digest	2015-03-26 23:24:35 UTC (rev 18333)
+++ trunk/www/varnish/files/patch-digest	2015-03-26 23:30:22 UTC (rev 18334)
@@ -1,72 +0,0 @@
-This arranges for using SHA256 found in -lmd, instead of
-the copy bundled with Varnish sources.
-
-	-mi
-
-P.S. OpenSSL has the same SHA256 API and could also be used
-for the same purpose.
---- include/vsha256.h	2012-08-20 05:20:40.000000000 -0400
-+++ include/vsha256.h	2012-09-26 14:28:29.000000000 -0400
-@@ -28,20 +28,8 @@
- 
- #ifndef _SHA256_H_
--#define _SHA256_H_
- 
--#include <stdint.h>
-+#include <sha256.h>
- 
- #define SHA256_LEN		32
- 
--typedef struct SHA256Context {
--	uint32_t state[8];
--	uint64_t count;
--	unsigned char buf[64];
--} SHA256_CTX;
--
--void	SHA256_Init(SHA256_CTX *);
--void	SHA256_Update(SHA256_CTX *, const void *, size_t);
--void	SHA256_Final(unsigned char [SHA256_LEN], SHA256_CTX *);
--void	SHA256_Test(void);
--
- #endif /* !_SHA256_H_ */
---- lib/libvarnish/Makefile.am	2012-08-20 05:20:40.000000000 -0400
-+++ lib/libvarnish/Makefile.am	2012-09-26 14:28:35.000000000 -0400
-@@ -26,10 +26,10 @@
- 	vre.c \
- 	vsb.c \
--	vsha256.c \
- 	vss.c \
- 	vtmpfile.c
- 
- libvarnish_la_CFLAGS = -DVARNISH_STATE_DIR='"${VARNISH_STATE_DIR}"'
- libvarnish_la_LIBADD = ${RT_LIBS} ${NET_LIBS} ${LIBM} @PCRE_LIBS@
-+libvarnish_la_LIBADD+= -lmd
- 
- if ENABLE_TESTS
---- lib/libvarnishapi/Makefile.am	2012-08-20 05:20:40.000000000 -0400
-+++ lib/libvarnishapi/Makefile.am	2012-09-26 14:36:57.000000000 -0400
-@@ -21,5 +21,4 @@
- 	../libvarnish/vre.c \
- 	../libvarnish/vsb.c \
--	../libvarnish/vsha256.c \
- 	vsm.c \
- 	vsl_arg.c \
-@@ -31,5 +30,5 @@
- 	-DVARNISH_STATE_DIR='"${VARNISH_STATE_DIR}"'
- 
--libvarnishapi_la_LIBADD = @PCRE_LIBS@
-+libvarnishapi_la_LIBADD = @PCRE_LIBS@ -lmd
- 
- if HAVE_LD_VERSION_SCRIPT
---- bin/varnishd/varnishd.c	2012-08-20 05:20:40.000000000 -0400
-+++ bin/varnishd/varnishd.c	2012-09-26 14:50:04.000000000 -0400
-@@ -391,9 +391,4 @@
- 	assert(TIM_parse("Sun Nov  6 08:49:37 1994") == 784111777);
- 
--	/*
--	 * Check that our SHA256 works
--	 */
--	SHA256_Test();
--
- 	memset(cli, 0, sizeof cli);
- 	cli[0].sb = VSB_new_auto();

Modified: trunk/www/varnish/pkg-plist
===================================================================
--- trunk/www/varnish/pkg-plist	2015-03-26 23:24:35 UTC (rev 18333)
+++ trunk/www/varnish/pkg-plist	2015-03-26 23:30:22 UTC (rev 18334)
@@ -40,7 +40,7 @@
 lib/varnish/libvcl.so
 lib/varnish/libvgz.so
 lib/varnish/vmods/libvmod_std.so
-lib/libvarnishapi.so.1
+lib/libvarnishapi.so.1.0.0
 lib/libvarnishapi.so
 libdata/pkgconfig/varnishapi.pc
 man/man1/varnishadm.1.gz