From owner-svn-ports-head@FreeBSD.ORG Mon Jun 16 14:44:46 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D8C9D7B8; Mon, 16 Jun 2014 14:44:45 +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 C581D2869; Mon, 16 Jun 2014 14:44:45 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5GEijV7043707; Mon, 16 Jun 2014 14:44:45 GMT (envelope-from wg@svn.freebsd.org) Received: (from wg@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5GEijMP043704; Mon, 16 Jun 2014 14:44:45 GMT (envelope-from wg@svn.freebsd.org) Message-Id: <201406161444.s5GEijMP043704@svn.freebsd.org> From: William Grzybowski Date: Mon, 16 Jun 2014 14:44:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r358008 - head/www/videocache 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 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, 16 Jun 2014 14:44:46 -0000 Author: wg Date: Mon Jun 16 14:44:44 2014 New Revision: 358008 URL: http://svnweb.freebsd.org/changeset/ports/358008 QAT: https://qat.redports.org/buildarchive/r358008/ Log: www/videocache: support stage and minor fixes PR: 190966 Submitted by: joe thrallingpenguin com Modified: head/www/videocache/Makefile head/www/videocache/pkg-descr head/www/videocache/pkg-plist Modified: head/www/videocache/Makefile ============================================================================== --- head/www/videocache/Makefile Mon Jun 16 14:43:16 2014 (r358007) +++ head/www/videocache/Makefile Mon Jun 16 14:44:44 2014 (r358008) @@ -4,10 +4,12 @@ PORTNAME= videocache PORTVERSION= 1.9.2 CATEGORIES= www -MASTER_SITES= http://cachevideos.com/sites/default/files/pub/videocache/ +MASTER_SITES= http://secure.thrallingpenguin.com/hosting_files/ \ + http://distcache.freebsd.org/ports-distfiles/ \ + http://old.cachevideos.com/sites/default/files/pub/videocache/ MAINTAINER= mopsfelder@gmail.com -COMMENT= A Squid URL rewriter for bandwidth optimization +COMMENT= Squid URL rewriter for bandwidth optimization RUN_DEPENDS= ${LOCALBASE}/sbin/squid:${PORTSDIR}/www/squid \ ${PYTHON_SITELIBDIR}/urlgrabber/grabber.py:${PORTSDIR}/www/py-urlgrabber \ @@ -16,36 +18,21 @@ RUN_DEPENDS= ${LOCALBASE}/sbin/squid:${P NO_BUILD= yes USE_PYTHON= yes -MAN8= videocache.8.gz PORTDOCS= CHANGELOG COPYING Readme PORTEXAMPLES= squid.conf SUB_FILES= pkg-message -NO_STAGE= yes -.include - do-install: - ${INSTALL_SCRIPT} ${WRKSRC}/update-vc ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/videocache.8.gz ${MAN1PREFIX}/man/man8 - ${INSTALL_DATA} ${WRKSRC}/videocache-sysconfig.conf ${PREFIX}/etc/videocache.conf.default - @[ -f ${PREFIX}/etc/videocache.conf ] || \ - ${CP} -v ${PREFIX}/etc/videocache.conf.default ${PREFIX}/etc/videocache.conf - ${MKDIR} ${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/videocache/*.py ${DATADIR} -.if !defined(NOPORTEXAMPLES) - ${MKDIR} ${EXAMPLESDIR} - ${INSTALL_DATA} ${FILESDIR}/squid.conf.example ${EXAMPLESDIR}/squid.conf -.endif -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} -. for doc in ${PORTDOCS} - ${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR} -. endfor -.endif - -post-install: -.if !defined(NOPORTEXAMPLES) - ${CAT} ${PKGMESSAGE} -.endif + ${INSTALL_SCRIPT} ${WRKSRC}/update-vc ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/videocache.8.gz ${STAGEDIR}${MAN1PREFIX}/man/man8 + ${INSTALL_DATA} ${WRKSRC}/videocache-sysconfig.conf ${STAGEDIR}${PREFIX}/etc/videocache.conf.sample + @${MKDIR} ${STAGEDIR}${DATADIR} + ${INSTALL_DATA} ${WRKSRC}/videocache/*.py ${STAGEDIR}${DATADIR} + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_DATA} ${FILESDIR}/squid.conf.example ${STAGEDIR}${EXAMPLESDIR}/squid.conf + @${MKDIR} ${STAGEDIR}${DOCSDIR} +.for doc in ${PORTDOCS} + ${INSTALL_DATA} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR} +.endfor -.include +.include Modified: head/www/videocache/pkg-descr ============================================================================== --- head/www/videocache/pkg-descr Mon Jun 16 14:43:16 2014 (r358007) +++ head/www/videocache/pkg-descr Mon Jun 16 14:44:44 2014 (r358008) @@ -4,4 +4,4 @@ sharing portals/websites like Youtube, M It helps you save bandwidth when a particular video is requested more than once from the same network/machine. -WWW: http://www.cachevideos.com/ +WWW: http://www.cachevideos.com/ Modified: head/www/videocache/pkg-plist ============================================================================== --- head/www/videocache/pkg-plist Mon Jun 16 14:43:16 2014 (r358007) +++ head/www/videocache/pkg-plist Mon Jun 16 14:44:44 2014 (r358008) @@ -1,10 +1,9 @@ bin/update-vc -@unexec if cmp -s %D/etc/videocache.conf %D/etc/videocache.conf.default; then rm -f %D/etc/videocache.conf; fi -etc/videocache.conf.default -@exec [ -f %B/videocache.conf ] || cp %B/%f %B/videocache.conf +@sample etc/videocache.conf.sample %%DATADIR%%/Errors.py %%DATADIR%%/__init__.py %%DATADIR%%/config.py %%DATADIR%%/parser.py %%DATADIR%%/videocache.py +man/man8/videocache.8.gz @dirrm %%DATADIR%%