From owner-svn-ports-head@FreeBSD.ORG Mon Nov 17 21:34:41 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 529ADB06; Mon, 17 Nov 2014 21:34:41 +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 33B76A07; Mon, 17 Nov 2014 21:34:41 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAHLYfLa089502; Mon, 17 Nov 2014 21:34:41 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAHLYeIx089498; Mon, 17 Nov 2014 21:34:40 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201411172134.sAHLYeIx089498@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Mon, 17 Nov 2014 21:34:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r372691 - in head/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: Mon, 17 Nov 2014 21:34:41 -0000 Author: antoine Date: Mon Nov 17 21:34:39 2014 New Revision: 372691 URL: https://svnweb.freebsd.org/changeset/ports/372691 QAT: https://qat.redports.org/buildarchive/r372691/ Log: Unbreak Added: head/www/rejik/files/ head/www/rejik/files/patch-Makefile (contents, props changed) Modified: head/www/rejik/Makefile head/www/rejik/pkg-plist Modified: head/www/rejik/Makefile ============================================================================== --- head/www/rejik/Makefile Mon Nov 17 21:27:58 2014 (r372690) +++ head/www/rejik/Makefile Mon Nov 17 21:34:39 2014 (r372691) @@ -1,29 +1,26 @@ # Created by: Elisey Savateev # $FreeBSD$ -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 - -LICENSE= BSD4CLAUSE - -BROKEN= Fails to stage as a regular user, installs suspicious check-redirector and set-permissions - -RUN_DEPENDS= ${LOCALBASE}/sbin/squid:${PORTSDIR}/www/squid -LIB_DEPENDS+= libpcre.so:${PORTSDIR}/devel/pcre - -USES= perl5 tar:tgz -USE_GCC= any - -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 +PORTNAME= rejik +PORTVERSION= 3.2.11 +PORTREVISION= 1 +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 + +LICENSE= BSD4CLAUSE + +RUN_DEPENDS= ${LOCALBASE}/sbin/squid:${PORTSDIR}/www/squid +LIB_DEPENDS= libpcre.so:${PORTSDIR}/devel/pcre + +USES= perl5 tar:tgz +USE_GCC= any +MAKE_ARGS= CC=${CC} + +USERS= squid +GROUPS= squid .include Added: head/www/rejik/files/patch-Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/rejik/files/patch-Makefile Mon Nov 17 21:34:39 2014 (r372691) @@ -0,0 +1,59 @@ +--- Makefile.orig 2013-11-15 10:28:02 UTC ++++ Makefile +@@ -40,36 +40,35 @@ cygwin: clean cygwin_vars ${REDIRECTOR_O + + install: + # Make dirs +- mkdir -p ${INSTALL_PATH}/tools ++ mkdir -p ${DESTDIR}${INSTALL_PATH}/tools + + # Install redirector +- cp make-cache ${INSTALL_PATH} +- cp redirector ${INSTALL_PATH} +- cp redirector.conf.dist ${INSTALL_PATH} ++ ${BSD_INSTALL_PROGRAM} make-cache ${DESTDIR}${INSTALL_PATH} ++ ${BSD_INSTALL_PROGRAM} redirector ${DESTDIR}${INSTALL_PATH} ++ cp redirector.conf.dist ${DESTDIR}${INSTALL_PATH} + + # Install tools +- echo "#!/bin/sh" > ${INSTALL_PATH}/tools/check-redirector +- echo 'su ${SQUID_USER} -c "echo \"http://sex.ru 127.0.0.1/- - GET\" | ${INSTALL_PATH}/redirector ${INSTALL_PATH}/redirector.conf;"' >> ${INSTALL_PATH}/tools/check-redirector +- chmod 755 ${INSTALL_PATH}/tools/check-redirector ++ echo "#!/bin/sh" > ${DESTDIR}${INSTALL_PATH}/tools/check-redirector ++ echo 'su ${SQUID_USER} -c "echo \"http://sex.ru 127.0.0.1/- - GET\" | ${INSTALL_PATH}/redirector ${INSTALL_PATH}/redirector.conf;"' >> ${DESTDIR}${INSTALL_PATH}/tools/check-redirector ++ chmod 755 ${DESTDIR}${INSTALL_PATH}/tools/check-redirector + +- echo "#!/bin/sh" > ${INSTALL_PATH}/tools/set-permissions +- echo 'chown -R ${SQUID_USER}:${SQUID_GROUP} ${INSTALL_PATH}' >> ${INSTALL_PATH}/tools/set-permissions +- chmod 755 ${INSTALL_PATH}/tools/set-permissions ++ echo "#!/bin/sh" > ${DESTDIR}${INSTALL_PATH}/tools/set-permissions ++ echo 'chown -R ${SQUID_USER}:${SQUID_GROUP} ${INSTALL_PATH}' >> ${DESTDIR}${INSTALL_PATH}/tools/set-permissions ++ chmod 755 ${DESTDIR}${INSTALL_PATH}/tools/set-permissions + + +- cp tools/kill-cache ${INSTALL_PATH}/tools +- chmod 755 ${INSTALL_PATH}/tools/kill-cache ++ cp tools/kill-cache ${DESTDIR}${INSTALL_PATH}/tools ++ chmod 755 ${DESTDIR}${INSTALL_PATH}/tools/kill-cache + +- cp tools/benchmark ${INSTALL_PATH}/tools +- chmod 755 ${INSTALL_PATH}/tools/benchmark ++ cp tools/benchmark ${DESTDIR}${INSTALL_PATH}/tools ++ chmod 755 ${DESTDIR}${INSTALL_PATH}/tools/benchmark + +- cp tools/IN.gz ${INSTALL_PATH}/tools +- chmod 644 ${INSTALL_PATH}/tools/IN.gz ++ cp tools/IN.gz ${DESTDIR}${INSTALL_PATH}/tools ++ chmod 644 ${DESTDIR}${INSTALL_PATH}/tools/IN.gz + + # Set permissions +- chown -R ${SQUID_USER}:${SQUID_GROUP} ${INSTALL_PATH} +- chmod 770 ${INSTALL_PATH} +- chmod 644 ${INSTALL_PATH}/redirector.conf.dist +- chmod 755 ${INSTALL_PATH}/redirector +- chmod 755 ${INSTALL_PATH}/make-cache ++ chmod 770 ${DESTDIR}${INSTALL_PATH} ++ chmod 644 ${DESTDIR}${INSTALL_PATH}/redirector.conf.dist ++ chmod 755 ${DESTDIR}${INSTALL_PATH}/redirector ++ chmod 755 ${DESTDIR}${INSTALL_PATH}/make-cache + Modified: head/www/rejik/pkg-plist ============================================================================== --- head/www/rejik/pkg-plist Mon Nov 17 21:27:58 2014 (r372690) +++ head/www/rejik/pkg-plist Mon Nov 17 21:34:39 2014 (r372691) @@ -1,8 +1,10 @@ -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 +@(squid,squid,) rejik3/make-cache +@(squid,squid,) rejik3/redirector +@(squid,squid,) rejik3/redirector.conf.dist +@(squid,squid,) rejik3/tools/IN.gz +@(squid,squid,) rejik3/tools/benchmark +@(squid,squid,) rejik3/tools/check-redirector +@(squid,squid,) rejik3/tools/kill-cache +@(squid,squid,) rejik3/tools/set-permissions +@dir(squid,squid,) rejik3/tools +@dir(squid,squid,) rejik3