- Update to 4.0 snap 08042010

- Rework dependency check warning user if curl required build options fail
  but don't make it fatal anymore (since its not fatal anyway).
- Unbreak port since depend checking is not fatal anymore.

PR:		ports/145665
Submitted by:	maintainer

3 files changed, 24 insertions, 27 deletions

diff --git a/www/thundercache/Makefile b/www/thundercache/Makefile
index 01b9ce95b87d..4fccecbc7dc8 100644
--- a/www/thundercache/Makefile
+++ b/www/thundercache/Makefile
@@ -7,12 +7,12 @@
 
 PORTNAME=	thundercache
 PORTVERSION=	4.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	http://www.bmsoftware.org/freebsd/ \
 		http://www6.freebsdbrasil.com.br/~eksffa/l/dev/thunder/ \
 		${MASTER_SITE_LOCAL}/jmelo
-DISTNAME=	thunder32bits_29032010
+DISTNAME=	thunder32bits_08042010
 
 MAINTAINER=	eksffa@freebsdbrasil.com.br
 COMMENT=	High-performance and high-eficiency caching proxy system
@@ -22,8 +22,6 @@ OPTIONS=	DEPENDACK "I have read and understood the depends needs" on \
 		PHP "Install PHP for reporting generating" on \
 		PGSQL "Install PostgreSQL (report data storing)" on
 
-BROKEN=		conflicting dependencies
-
 USE_OPENSSL=	yes
 USE_BZIP2=	yes
 
@@ -42,7 +40,7 @@ BROKEN=		Won't run on systems version < FreeBSD 8.0-RELEASE
 .endif
 
 .if ${ARCH} == "amd64"
-DISTNAME=	thunder64bits_29032010
+DISTNAME=	thunder64bits_08042010
 .endif
 
 WRKSRC=		${WRKDIR}/thunder
@@ -70,7 +68,7 @@ LIB_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/pdo_pgsql.so:${PORTSDIR}/datab
 SUB_FILES=	pkg-message log.sh test-deps.sh
 SUB_LIST=	"GREP=${GREP}"
 
-pre-everything::
+show-info:
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "ATTENTION:"
 	@${ECHO_MSG} ""
@@ -90,18 +88,7 @@ pre-everything::
 	@${FALSE}
 .endif
 
-pre-install:
-	@(${CHMOD} +x ${WRKDIR}/test-deps.sh ; \
-	if ! ${WRKDIR}/test-deps.sh > /dev/null 2>&1 ; then \
-		${ECHO_MSG} "FATAL: " ; \
-		${ECHO_MSG} "Some depends are not built with required features." ; \
-		${ECHO_MSG} "You must always honor at least the following options" ; \
-		${ECHO_MSG} "depends as listed:" ; \
-		${ECHO_MSG} "" ; \
-		${ECHO_MSG} "ftp/curl		LIBSSH2=yes OPENSSL=yes PROXY=yes" ; \
-		${ECHO_MSG} "" ; \
-		${FALSE} ; \
-	fi)
+pre-everything::show-info
 
 do-install:
 	@${CP} -r ${WRKSRC} ${PREFIX}/
@@ -110,5 +97,18 @@ do-install:
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
+	@(${CHMOD} +x ${WRKDIR}/test-deps.sh ; \
+	if ! ${WRKDIR}/test-deps.sh > /dev/null 2>&1 ; then \
+		${ECHO_MSG} "**** FATAL **** " ; \
+		${ECHO_MSG} "**** THIS PORT MAY NOT WORK PROPERLY **** " ; \
+		${ECHO_MSG} "Some depends are not built with required features." ; \
+		${ECHO_MSG} "You must always honor at least the following options" ; \
+		${ECHO_MSG} "depends as listed:" ; \
+		${ECHO_MSG} "" ; \
+		${ECHO_MSG} "ftp/curl	   LIBSSH2=yes OPENSSL=yes PROXY=yes" ; \
+		${ECHO_MSG} "" ; \
+		${ECHO_MSG} "Type ''make show-info'' to read further information." ; \
+		${ECHO_MSG} "" ; \
+	fi)
 
 .include <bsd.port.post.mk>
diff --git a/www/thundercache/distinfo b/www/thundercache/distinfo
index a32750cd31b2..259cb99f677d 100644
--- a/www/thundercache/distinfo
+++ b/www/thundercache/distinfo
@@ -1,6 +1,6 @@
-MD5 (thunder32bits_29032010.tar.bz2) = 51a940e7255abcaa278619efb6bf67fa
-SHA256 (thunder32bits_29032010.tar.bz2) = f3ede1ffe3d77c11f349f839c473368c73acee85c5e6db8e677f4d8aa177abf9
-SIZE (thunder32bits_29032010.tar.bz2) = 1396108
-MD5 (thunder64bits_29032010.tar.bz2) = 5ab1831934092519b820e3377884267a
-SHA256 (thunder64bits_29032010.tar.bz2) = 9fd65a917e211c939be9d864a250583d5e20d9740ab2562d5eabc82f11f7ac3e
-SIZE (thunder64bits_29032010.tar.bz2) = 1456262
+MD5 (thunder32bits_08042010.tar.bz2) = 0e22b47a2cad5294e620a1c418973320
+SHA256 (thunder32bits_08042010.tar.bz2) = fc8353c599e1e87fc2e7aa3582e7f8c83ba1cbcf8cc575d68f9a2304172b6f00
+SIZE (thunder32bits_08042010.tar.bz2) = 233746
+MD5 (thunder64bits_08042010.tar.bz2) = 71a28aaca744bea231fc00c349db89af
+SHA256 (thunder64bits_08042010.tar.bz2) = 8e5c5b9f4dea1a85f620cb9ddbbfb7f37932d4efd93079ed70ad3f511d31de2a
+SIZE (thunder64bits_08042010.tar.bz2) = 265566
diff --git a/www/thundercache/pkg-plist b/www/thundercache/pkg-plist
index 1c1bcddd5828..fddbd778df59 100644
--- a/www/thundercache/pkg-plist
+++ b/www/thundercache/pkg-plist
@@ -28,8 +28,6 @@ thunder/plugins/pornhub.com.so
 thunder/plugins/nai.com.so
 thunder/plugins/mediafire.com.so
 thunder/plugins/bitgravity.com.so
-thunder/plugins/grandchase.com.br.so
-thunder/plugins/doubleclick.net.so
 thunder/plugins/pop6.com.so
 thunder/plugins/freeav.com.so
 thunder/plugins/googlevideo.com.so
@@ -40,7 +38,6 @@ thunder/plugins/microsoft.com.so
 thunder/plugins/sambatech.com.br.so
 thunder/plugins/grisoft.cz.so
 thunder/plugins/symantecliveupdate.com.so
-thunder/plugins/rad.msn.com.so
 thunder/plugins/megavideo.com.so
 thunder/plugins/kaspersky.com.so
 thunder/plugins/orkut.com.so