From owner-svn-ports-head@FreeBSD.ORG Wed Nov 19 20:14:02 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 A1E02E51; Wed, 19 Nov 2014 20:14:02 +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 82F7DD5B; Wed, 19 Nov 2014 20:14:02 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAJKE2xR086576; Wed, 19 Nov 2014 20:14:02 GMT (envelope-from marino@FreeBSD.org) Received: (from marino@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAJKE1K4086568; Wed, 19 Nov 2014 20:14:01 GMT (envelope-from marino@FreeBSD.org) Message-Id: <201411192014.sAJKE1K4086568@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: marino set sender to marino@FreeBSD.org using -f From: John Marino Date: Wed, 19 Nov 2014 20:14:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r372811 - in head/www/polipo: . 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: Wed, 19 Nov 2014 20:14:02 -0000 Author: marino Date: Wed Nov 19 20:14:00 2014 New Revision: 372811 URL: https://svnweb.freebsd.org/changeset/ports/372811 QAT: https://qat.redports.org/buildarchive/r372811/ Log: www/polipo: Fix use of cache directory PR: 194813 Submitted by: WATANABE Kazuhiro Approved by: maintainer (Frank Behrens) Modified: head/www/polipo/Makefile head/www/polipo/files/pkg-deinstall.in head/www/polipo/files/pkg-install.in head/www/polipo/pkg-plist Modified: head/www/polipo/Makefile ============================================================================== --- head/www/polipo/Makefile Wed Nov 19 19:45:08 2014 (r372810) +++ head/www/polipo/Makefile Wed Nov 19 20:14:00 2014 (r372811) @@ -3,6 +3,7 @@ PORTNAME= polipo PORTVERSION= 1.1.1 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://www.pps.univ-paris-diderot.fr/~jch/software/files/polipo/ Modified: head/www/polipo/files/pkg-deinstall.in ============================================================================== --- head/www/polipo/files/pkg-deinstall.in Wed Nov 19 19:45:08 2014 (r372810) +++ head/www/polipo/files/pkg-deinstall.in Wed Nov 19 20:14:00 2014 (r372811) @@ -20,9 +20,6 @@ if pw usershow "${POLIPOUSER}" 2>/dev/nu echo "---> To delete ${POLIPOUSER} user permanently, use 'pw userdel \"${POLIPOUSER}\"'" fi -if [ -d "$POLIPOCACHE" ]; then - rm -r "$POLIPOCACHE" || exit 1 -fi if [ -d "$PPIDDIR" ]; then rm -r "$PPIDDIR" || exit 1 fi @@ -31,6 +28,4 @@ if fgrep "${POLIPOLOG}" "/etc/newsyslog. echo "---> You should remove from /etc/newsyslog.conf the \"${POLIPOLOG}\" entry manually." fi -rmdir $POLIPODATA/www/doc $POLIPODATA/www $POLIPODATA 2>/dev/null -rmdir $PCONFIGDIR 2>/dev/null || echo "---> If you not plan to reinstall polipo, you can safely remove ${PCONFIGDIR}." exit 0 Modified: head/www/polipo/files/pkg-install.in ============================================================================== --- head/www/polipo/files/pkg-install.in Wed Nov 19 19:45:08 2014 (r372810) +++ head/www/polipo/files/pkg-install.in Wed Nov 19 20:14:00 2014 (r372811) @@ -43,12 +43,6 @@ if [ "$2" = "PRE-INSTALL" ]; then elif [ "$2" = "POST-INSTALL" ]; then - if [ ! -d "%%DESTDIR%%$POLIPOCACHE" ]; then - mkdir -p "%%DESTDIR%%$POLIPOCACHE" || exit 1 - chown "$POLIPOUSER:$POLIPOGROUP" "%%DESTDIR%%$POLIPOCACHE" || exit 1 - chmod ug=rwx,o= "%%DESTDIR%%$POLIPOCACHE" || exit 1 - fi - if [ ! -d "%%DESTDIR%%$PPIDDIR" ]; then mkdir -p "%%DESTDIR%%$PPIDDIR" || exit 1 chgrp "$POLIPOGROUP" "%%DESTDIR%%$PPIDDIR" || exit 1 Modified: head/www/polipo/pkg-plist ============================================================================== --- head/www/polipo/pkg-plist Wed Nov 19 19:45:08 2014 (r372810) +++ head/www/polipo/pkg-plist Wed Nov 19 20:14:00 2014 (r372811) @@ -4,4 +4,4 @@ bin/polipo etc/periodic/daily/400.polipo man/man1/polipo.1.gz %%DATADIR%%/www/index.html -@dir %%PCACHEDIR%% +@dir(polipo,polipo,0770) %%PCACHEDIR%%