From owner-svn-ports-head@FreeBSD.ORG Sat Nov 15 10:09:01 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 73A4CEF8; Sat, 15 Nov 2014 10:09:01 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 54593310; Sat, 15 Nov 2014 10:09:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAFA91tU018617; Sat, 15 Nov 2014 10:09:01 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAFA90sO018605; Sat, 15 Nov 2014 10:09:00 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201411151009.sAFA90sO018605@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Sat, 15 Nov 2014 10:09:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r372587 - in head: . www/rejik www/rejik/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Nov 2014 10:09:01 -0000 Author: riggs Date: Sat Nov 15 10:08:59 2014 New Revision: 372587 URL: https://svnweb.freebsd.org/changeset/ports/372587 QAT: https://qat.redports.org/buildarchive/r372587/ Log: Revive www/rejik Change maintainer from ports@ to Roman (roma.a.g@gmail.com) PR: 194837 Submitted by: roma.a.g@gmail.com (maintainer) Added: head/www/rejik/ - copied from r365622, head/www/rejik/ Deleted: head/www/rejik/files/ Modified: head/MOVED head/www/rejik/Makefile head/www/rejik/distinfo head/www/rejik/pkg-plist Modified: head/MOVED ============================================================================== --- head/MOVED Sat Nov 15 09:25:57 2014 (r372586) +++ head/MOVED Sat Nov 15 10:08:59 2014 (r372587) @@ -6482,7 +6482,6 @@ print/latex-aa||2014-08-22|Has expired: textproc/rast||2014-08-22|Has expired: Broken for more than 6 months www/abyssws||2014-08-22|Has expired: Broken for more than 6 months www/docebo||2014-08-22|Has expired: Not maintained upstream -www/rejik||2014-08-22|Has expired: Broken for more than 6 months and depends on www/squid which reached EOL 2 years ago devel/rubygem-railsless-deploy||2014-08-22|Removed: Obsolete, Capistrano 3 does not ship with any Railsisms and is better than Capistrano 2 and railsless-deploy lang/gcc410|lang/gcc5|2014-08-22|Renamed to GCC 5 upstream security/pam_abl||2014-08-24|Has expired: Newer version requires large number of hacks, not worth the effort Modified: head/www/rejik/Makefile ============================================================================== --- head/www/rejik/Makefile Fri Aug 22 09:07:49 2014 (r365622) +++ head/www/rejik/Makefile Sat Nov 15 10:08:59 2014 (r372587) @@ -1,122 +1,26 @@ -# Created by: Elisey Savateev # $FreeBSD$ -PORTNAME= rejik -PORTVERSION= 3.2.11 -CATEGORIES= www -MASTER_SITES= http://www.rejik.ru/download/ \ - http://bio3k.softboard.ru/uploads/arch/ -DISTNAME= redirector-${PORTVERSION} -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} - -MAINTAINER= ports@FreeBSD.org -COMMENT= Squid redirector used for blocking unwanted content - -BROKEN= Fails to checksum -DEPRECATED= Broken for more than 6 months and depends on www/squid which reached EOL 2 years ago -EXPIRATION_DATE= 2014-08-22 - -LIB_DEPENDS= libpcre.so:${PORTSDIR}/devel/pcre -RUN_DEPENDS= squid:${PORTSDIR}/www/squid - -PLIST_SUB= INSTALL_DIR=${INSTALL_DIR} -SUB_LIST= INSTALL_PATH=${INSTALL_PATH} SQUID_USER=${SQUID_USER} SQUID_GROUP=${SQUID_GROUP} -SUB_FILES= pkg-message - -WRKSRC= ${WRKDIR}/${DISTNAME} - -OPTIONS_DEFINE= BAN DBL WWW - -OPTIONS_DEFAULT=BAN WWW - -BAN_DESC= With banlists -DBL_DESC= With DBL scripts -WWW_DESC= With error pages - -NO_STAGE= yes -.include - -# Redifine this if you need -SQUID_USER?= squid -SQUID_GROUP?= squid -INSTALL_DIR?= ${PORTNAME} -INSTALL_PATH?= ${PREFIX}/${INSTALL_DIR} - -.if ${PORT_OPTIONS:MBAN} -DISTFILES+= banlists-2.x.x.tgz -PLIST_SUB+= BAN="" -.else -PLIST_SUB+= BAN="@comment " -.endif - -.if ${PORT_OPTIONS:MWWW} -DISTFILES+= squid-like-www-en.tgz -PLIST_SUB+= WWW="" -.else -PLIST_SUB+= WWW="@comment " -.endif - -.if ${PORT_OPTIONS:MDBL} -DISTFILES+= dbl-2.0.tgz -USES+= perl5 tar:tgz -USE_PERL5= run -RUN_DEPENDS+= p5-Text-Iconv>=0:${PORTSDIR}/converters/p5-Text-Iconv \ - p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser \ - wget:${PORTSDIR}/ftp/wget -PLIST_SUB+= DBL="" -.else -PLIST_SUB+= DBL="@comment " -.endif - -.include - -post-extract: - @${ECHO_MSG} "===> ----------------------------------------------" - @${ECHO_MSG} "===> Make sure that squid runs under user squid" - @${ECHO_MSG} "===> and group squid. If not, redefine SQUID_USER" - @${ECHO_MSG} "===> and SQUID_GROUP." - @${ECHO_MSG} "===> ----------------------------------------------" +PORTNAME= rejik +PORTVERSION= 3.2.11 +CATEGORIES= www +MASTER_SITES= http://www.rejik.ru/download/ +DISTNAME= redirector-${PORTVERSION}_squid_3.4 + +MAINTAINER= roma.a.g@gmail.com +COMMENT= Squid redirector used for blocking unwanted content -post-patch: - @${REINPLACE_CMD} -e 's|nobody|${SQUID_USER}|g; s|nogroup|${SQUID_GROUP}|g; \ - s|/usr/local/rejik3|${INSTALL_PATH}|g' \ - ${WRKSRC}/Makefile - @${REINPLACE_CMD} -e 's|/usr/local/rejik3|${INSTALL_PATH}|g' \ - ${WRKSRC}/vars.h ${WRKSRC}/redirector.conf.dist +LICENSE= BSD4CLAUSE -post-install: - @[ -f ${INSTALL_PATH}/redirector.conf ] || \ - ${CP} -p ${INSTALL_PATH}/redirector.conf.dist ${INSTALL_PATH}/redirector.conf -.if !defined(WITHOUT_BAN) -.if !exists(${EXAMPLESDIR}) - @${MKDIR} ${EXAMPLESDIR} -.endif - @${CP} -R ${WRKDIR}/banlists ${EXAMPLESDIR} -.endif -.if defined(WITH_DBL) - @${REINPLACE_CMD} -e 's|/usr/bin/wget|${LOCALBASE}/bin/wget|g ; \ - s|/usr/local/rejik3|${INSTALL_PATH}|g' \ - ${WRKDIR}/dbl/Update ${WRKDIR}/dbl/Update.Fast ${WRKDIR}/dbl/dbl_expand - @${RM} ${WRKDIR}/dbl/*.bak - @${CP} ${WRKDIR}/dbl/Update ${WRKDIR}/dbl/Update.dist - @${CP} ${WRKDIR}/dbl/Update.Fast ${WRKDIR}/dbl/Update.Fast.dist - @${CP} ${WRKDIR}/dbl/dbl_expand ${WRKDIR}/dbl/dbl_expand.dist - @${CP} -Rn ${WRKDIR}/dbl ${INSTALL_PATH} - @${CHOWN} -R ${SQUID_USER}:${SQUID_GROUP} ${INSTALL_PATH}/dbl - @[ -f ${INSTALL_PATH}/dbl/Update ] || \ - ${CP} -p ${INSTALL_PATH}/dbl/Update.dist ${INSTALL_PATH}/dbl/Update - @[ -f ${INSTALL_PATH}/dbl/Update.Fast ] || \ - ${CP} -p ${INSTALL_PATH}/dbl/Update.Fast.dist ${INSTALL_PATH}/dbl/Update.Fast - @[ -f ${INSTALL_PATH}/dbl/dbl_expand ] || \ - ${CP} -p ${INSTALL_PATH}/dbl/dbl_expand.dist ${INSTALL_PATH}/dbl/dbl_expand -.endif -.if !defined(WITHOUT_WWW) -.if !exists(${EXAMPLESDIR}) - @${MKDIR} ${EXAMPLESDIR} -.endif - @${CP} -R ${WRKDIR}/squid-like-www-en ${EXAMPLESDIR} -.endif +RUN_DEPENDS= ${LOCALBASE}/sbin/squid:${PORTSDIR}/www/squid +LIB_DEPENDS+= libpcre.so:${PORTSDIR}/devel/pcre + +USES= perl5 tar:tgz +USE_GCC= any - @${CAT} ${PKGMESSAGE} +post-patch: + @${REINPLACE_CMD} -e 's|gcc|${CC}|; s|INSTALL_PATH=/usr/local/rejik3|INSTALL_PATH=${STAGEDIR}${PREFIX}/rejik3|; s|>> ${INSTALL_PATH}|/usr/local/rejik3|g' ${WRKSRC}/Makefile +post-install: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/rejik3/make-cache + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/rejik3/redirector -.include +.include Modified: head/www/rejik/distinfo ============================================================================== --- head/www/rejik/distinfo Fri Aug 22 09:07:49 2014 (r365622) +++ head/www/rejik/distinfo Sat Nov 15 10:08:59 2014 (r372587) @@ -1,8 +1,2 @@ -SHA256 (redirector-3.2.11.tgz) = e4fea385a05a6a476c0960fd7ac7198dd1fb570c37ff9b7a477ae0017f0d4eb9 -SIZE (redirector-3.2.11.tgz) = 45598 -SHA256 (banlists-2.x.x.tgz) = 221a40e8db9d19477d6fdece00c9152526a0d2f0c2298504fc99b4378457b09e -SIZE (banlists-2.x.x.tgz) = 116100 -SHA256 (squid-like-www-en.tgz) = c4f32179c742cec5f0f03891f8bf0eb4825bfff3a36e6bf0952d641a0973332a -SIZE (squid-like-www-en.tgz) = 920 -SHA256 (dbl-2.0.tgz) = 45577958a9f9519919e0b61ccfdbda30a467f55721d94a67cb07e8f1c1e55c55 -SIZE (dbl-2.0.tgz) = 3355 +SHA256 (redirector-3.2.11_squid_3.4.tgz) = f6659d1c68f13c600ecd1736ac249c93eb91c6d834607caf3ecdba690cdcf771 +SIZE (redirector-3.2.11_squid_3.4.tgz) = 44790 Modified: head/www/rejik/pkg-plist ============================================================================== --- head/www/rejik/pkg-plist Fri Aug 22 09:07:49 2014 (r365622) +++ head/www/rejik/pkg-plist Sat Nov 15 10:08:59 2014 (r372587) @@ -1,45 +1,8 @@ -%%DBL%%%%INSTALL_DIR%%/dbl/FAST -%%DBL%%%%INSTALL_DIR%%/dbl/FULL -%%DBL%%@dirrmtry %%INSTALL_DIR%%/dbl/NEW -%%DBL%%@unexec if cmp -s %%PREFIX%%/%%INSTALL_DIR%%/dbl/Update %%PREFIX%%/%%INSTALL_DIR%%/dbl/Update.dist; then rm -f %%PREFIX%%/%%INSTALL_DIR%%/dbl/Update; fi -%%DBL%%%%INSTALL_DIR%%/dbl/Update.dist -%%DBL%%@exec [ -f %%PREFIX%%/%%INSTALL_DIR%%/dbl/Update ] || cp -p %%PREFIX%%/%%INSTALL_DIR%%/dbl/Update.dist %%PREFIX%%/%%INSTALL_DIR%%/dbl/Update -%%DBL%%@unexec if cmp -s %%PREFIX%%/%%INSTALL_DIR%%/dbl/Update.Fast %%PREFIX%%/%%INSTALL_DIR%%/dbl/Update.Fast.dist; then rm -f %%PREFIX%%/%%INSTALL_DIR%%/dbl/Update.Fast; fi -%%DBL%%%%INSTALL_DIR%%/dbl/Update.Fast.dist -%%DBL%%@exec [ -f %%PREFIX%%/%%INSTALL_DIR%%/dbl/Update.Fast ] || cp -p %%PREFIX%%/%%INSTALL_DIR%%/dbl/Update.Fast.dist %%PREFIX%%/%%INSTALL_DIR%%/dbl/Update.Fast -%%DBL%%@unexec if cmp -s %%PREFIX%%/%%INSTALL_DIR%%/dbl/dbl_expand %%PREFIX%%/%%INSTALL_DIR%%/dbl/dbl_expand.dist; then rm -f %%PREFIX%%/%%INSTALL_DIR%%/dbl/dbl_expand; fi -%%DBL%%%%INSTALL_DIR%%/dbl/dbl_expand.dist -%%DBL%%@exec [ -f %%PREFIX%%/%%INSTALL_DIR%%/dbl/dbl_expand ] || cp -p %%PREFIX%%/%%INSTALL_DIR%%/dbl/dbl_expand.dist %%PREFIX%%/%%INSTALL_DIR%%/dbl/dbl_expand -%%DBL%%%%INSTALL_DIR%%/dbl/dbl_stat -%%DBL%%@dirrmtry %%INSTALL_DIR%%/dbl/lists -%%DBL%%@dirrmtry %%INSTALL_DIR%%/dbl -%%INSTALL_DIR%%/make-cache -%%INSTALL_DIR%%/redirector -@unexec if cmp -s %%PREFIX%%/%%INSTALL_DIR%%/redirector.conf %%PREFIX%%/%%INSTALL_DIR%%/redirector.conf.dist; then rm -f %%PREFIX%%/%%INSTALL_DIR%%/redirector.conf; fi -%%INSTALL_DIR%%/redirector.conf.dist -@exec [ -f %%PREFIX%%/%%INSTALL_DIR%%/redirector.conf ] || cp -p %%PREFIX%%/%%INSTALL_DIR%%/redirector.conf.dist %%PREFIX%%/%%INSTALL_DIR%%/redirector.conf -%%INSTALL_DIR%%/tools/IN.gz -%%INSTALL_DIR%%/tools/benchmark -%%INSTALL_DIR%%/tools/check-redirector -%%INSTALL_DIR%%/tools/kill-cache -%%INSTALL_DIR%%/tools/set-permissions -@dirrm %%INSTALL_DIR%%/tools -@dirrmtry %%INSTALL_DIR%% -%%BAN%%share/examples/%%INSTALL_DIR%%/banlists/banners/pcre -%%BAN%%share/examples/%%INSTALL_DIR%%/banlists/banners/urls -%%BAN%%@dirrm share/examples/%%INSTALL_DIR%%/banlists/banners -%%BAN%%share/examples/%%INSTALL_DIR%%/banlists/js/urls -%%BAN%%@dirrm share/examples/%%INSTALL_DIR%%/banlists/js -%%BAN%%share/examples/%%INSTALL_DIR%%/banlists/mp3/pcre -%%BAN%%@dirrm share/examples/%%INSTALL_DIR%%/banlists/mp3 -%%BAN%%share/examples/%%INSTALL_DIR%%/banlists/porno/urls -%%BAN%%@dirrm share/examples/%%INSTALL_DIR%%/banlists/porno -%%BAN%%@dirrm share/examples/%%INSTALL_DIR%%/banlists -%%WWW%%share/examples/%%INSTALL_DIR%%/squid-like-www-en/1x1.gif -%%WWW%%share/examples/%%INSTALL_DIR%%/squid-like-www-en/access_denied.html -%%WWW%%share/examples/%%INSTALL_DIR%%/squid-like-www-en/audio-video.html -%%WWW%%share/examples/%%INSTALL_DIR%%/squid-like-www-en/js.js -%%WWW%%share/examples/%%INSTALL_DIR%%/squid-like-www-en/porno.html -%%WWW%%share/examples/%%INSTALL_DIR%%/squid-like-www-en/spyware.html -%%WWW%%@dirrm share/examples/%%INSTALL_DIR%%/squid-like-www-en -@dirrmtry share/examples/%%INSTALL_DIR%% +rejik3/make-cache +rejik3/redirector +rejik3/redirector.conf.dist +rejik3/tools/IN.gz +rejik3/tools/benchmark +rejik3/tools/check-redirector +rejik3/tools/kill-cache +rejik3/tools/set-permissions