- squid-like-www-en.tgz has been updated (checksum changed, the change is

  not harmful)
- Add an additional site to MASTER_SITES
- Minor cleanups

PR:		92180
Submitted by:	Elisey Savateev (maintainer)

4 files changed, 14 insertions, 6 deletions

diff --git a/www/rejik/Makefile b/www/rejik/Makefile
index 20e1dddf325..d5f0db59b43 100644
--- a/www/rejik/Makefile
+++ b/www/rejik/Makefile
@@ -7,8 +7,10 @@
 
 PORTNAME=	rejik
 PORTVERSION=	3.2.0
+PORTREVISION=	1
 CATEGORIES=	www
-MASTER_SITES=	http://www.rejik.ru/download/
+MASTER_SITES=	http://www.rejik.ru/download/ \
+				http://bio3k.softboard.ru/uploads/arch/
 DISTNAME=	redirector-${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
@@ -89,6 +91,10 @@ post-install:
 .if defined(WITH_DBL)
 	@${TAR} -xzf ${DISTDIR}/dbl-2.0.tgz -C ${INSTALL_PATH}
 	@${CHOWN} -R ${SQUID_USER}:${SQUID_GROUP} ${INSTALL_PATH}/dbl
+	@${REINPLACE_CMD} -e 's|$WGET="/usr/bin/wget";|$WGET="${LOCALBASE}/wget";| ; \
+		s|$dir="/usr/local/rejik3/dbl";|$dir="${INSTALL_PATH}/dbl";|' \
+		${INSTALL_PATH}/dbl/Update ${INSTALL_PATH}/dbl/Update.Fast ${INSTALL_PATH}/dbl/dbl_expand
+	@${RM} ${INSTALL_PATH}/dbl/*.bak
 .endif
 .if !defined(WITHOUT_WWW)
 	@${TAR} -xzf ${DISTDIR}/squid-like-www-en.tgz -C ${WWW_PATH}
diff --git a/www/rejik/distinfo b/www/rejik/distinfo
index fd9682648b4..55362323306 100644
--- a/www/rejik/distinfo
+++ b/www/rejik/distinfo
@@ -4,9 +4,9 @@ SIZE (redirector-3.2.0.tgz) = 43991
 MD5 (banlists-2.x.x.tgz) = a1c7c48f9ae94b2ef35f56a094285c10
 SHA256 (banlists-2.x.x.tgz) = 221a40e8db9d19477d6fdece00c9152526a0d2f0c2298504fc99b4378457b09e
 SIZE (banlists-2.x.x.tgz) = 116100
-MD5 (squid-like-www-en.tgz) = 94ea17b04c7793cc395643909b33c30c
-SHA256 (squid-like-www-en.tgz) = 7212d877218185a709ea59089d73da862aa8551127926566ca58effb453a6fb6
-SIZE (squid-like-www-en.tgz) = 897
+MD5 (squid-like-www-en.tgz) = 49220556b1b5c4fb82c5954175746b09
+SHA256 (squid-like-www-en.tgz) = c4f32179c742cec5f0f03891f8bf0eb4825bfff3a36e6bf0952d641a0973332a
+SIZE (squid-like-www-en.tgz) = 920
 MD5 (dbl-2.0.tgz) = f8d51329458aaac5b7fe1a89ad9bbd4a
 SHA256 (dbl-2.0.tgz) = 45577958a9f9519919e0b61ccfdbda30a467f55721d94a67cb07e8f1c1e55c55
 SIZE (dbl-2.0.tgz) = 3355
diff --git a/www/rejik/files/pkg-message.in b/www/rejik/files/pkg-message.in
index 522b8e37faf..e93429fd454 100644
--- a/www/rejik/files/pkg-message.in
+++ b/www/rejik/files/pkg-message.in
@@ -1,3 +1,4 @@
+===============================================================================
 1. Make sure that squid runs under user %%SQUID_USER%% and group %%SQUID_GROUP%%.
 
 2. Copy %%PREFIX%%/%%INSTALL_DIR%%/redirector.conf.dist to
@@ -8,3 +9,4 @@
    to squid.conf.
 
 4. See http://www.rejik.ru/ for detailed instructions.
+===============================================================================
diff --git a/www/rejik/pkg-plist b/www/rejik/pkg-plist
index 9f2aa821f0a..a3d0109452a 100644
--- a/www/rejik/pkg-plist
+++ b/www/rejik/pkg-plist
@@ -28,9 +28,9 @@
 @dirrm %%INSTALL_DIR%%/tools
 @dirrm %%INSTALL_DIR%%
 %%WWW%%%%WWW_DIR%%/ban/1x1.gif
+%%WWW%%%%WWW_DIR%%/ban/access_denied.html
 %%WWW%%%%WWW_DIR%%/ban/audio-video.html
 %%WWW%%%%WWW_DIR%%/ban/js.js
-%%WWW%%%%WWW_DIR%%/ban/mp3.html
 %%WWW%%%%WWW_DIR%%/ban/porno.html
-%%WWW%%%%WWW_DIR%%/ban/warez.html
+%%WWW%%%%WWW_DIR%%/ban/spyware.html
 %%WWW%%@dirrm %%WWW_DIR%%/ban