From owner-cvs-all@FreeBSD.ORG Wed Aug 11 22:24:03 2010 Return-Path: Delivered-To: cvs-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 37A58106566B; Wed, 11 Aug 2010 22:24:03 +0000 (UTC) (envelope-from sahil@tandon.net) Received: from spartan.hamla.org (spartan.hamla.org [206.251.255.30]) by mx1.freebsd.org (Postfix) with ESMTP id D46B48FC14; Wed, 11 Aug 2010 22:24:02 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by spartan.hamla.org (Postfix) with ESMTP id 2130517132; Wed, 11 Aug 2010 18:24:02 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tandon.net; h= user-agent:in-reply-to:content-disposition:content-type :content-type:mime-version:references:reply-to:message-id :subject:subject:from:from:date:date:received:received; s=aegis; t=1281565441; bh=rvesYKYCb4fTlZz1S4fzWKCz+QN2BM2sumMrty6YfiI=; b= qrmSWPV1prPkDeu7aiGRaUl7NakYdUuY9OYZ/qHEdgNFIYMhZIcJ3s8GpEQw0b/I 1YXH08ys4ZD5zQ6BpTijjyIappOeQp+IrhnB14W4kX9NY/cUSfAUV37OeJP0IjLx F7W5quw969/HFGdRAD5QpHZl8JaFSZyDpd96cBTJqLU= X-Virus-Scanned: by ClamAV at spartan.hamla.org Received: from spartan.hamla.org ([127.0.0.1]) by localhost (spartan.hamla.org [127.0.0.1]) (amavisd-new, port 10027) with LMTP id MBfznF8cdCk3; Wed, 11 Aug 2010 18:24:01 -0400 (EDT) Received: from magic.hamla.org (cpe-69-201-179-80.nyc.res.rr.com [69.201.179.80]) by spartan.hamla.org (Postfix) with ESMTPSA id 2F5F4170FC; Wed, 11 Aug 2010 18:24:01 -0400 (EDT) Date: Wed, 11 Aug 2010 18:23:56 -0400 From: Sahil Tandon To: Baptiste Daroussin Message-ID: <20100811222355.GA5481@magic.hamla.org> References: <201008111515.o7BFF32D065719@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="mYCpIKhGyMATD0i+" Content-Disposition: inline In-Reply-To: <201008111515.o7BFF32D065719@repoman.freebsd.org> User-Agent: Mutt/1.5.20 (2009-06-14) Cc: cvs-ports@FreeBSD.org, cvs-all@FreeBSD.org, ports-committers@FreeBSD.org Subject: Re: cvs commit: ports/security/snoopy Makefile distinfo ports/security/snoopy/files patch-README X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Sahil Tandon List-Id: **OBSOLETE** CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Aug 2010 22:24:03 -0000 --mYCpIKhGyMATD0i+ Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Wed, 2010-08-11 at 15:15:03 +0000, Baptiste Daroussin wrote: [ .. ] > Revision Changes Path > 1.7 +2 -2 ports/security/snoopy/Makefile > 1.3 +3 -3 ports/security/snoopy/distinfo > 1.3 +7 -5 ports/security/snoopy/files/patch-README Would you consider removing files/patch-README since the '/usr/local' -> ${PREFIX} replacement can be done in a single step from the Makefile? Patch attached. -- Sahil Tandon --mYCpIKhGyMATD0i+ Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="snoopy.diff" Index: Makefile =================================================================== RCS file: /home/pcvs/ports/security/snoopy/Makefile,v retrieving revision 1.7 diff -u -r1.7 Makefile --- Makefile 11 Aug 2010 15:15:02 -0000 1.7 +++ Makefile 11 Aug 2010 21:53:40 -0000 @@ -20,7 +20,7 @@ GNU_CONFIGURE= yes post-patch: - @${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/README + @${REINPLACE_CMD} 's|/usr/local|${PREFIX}|g' ${WRKSRC}/README @${REINPLACE_CMD} '/^LIBS.*/d' ${WRKSRC}/Makefile.in do-install: Index: files/patch-README =================================================================== RCS file: files/patch-README diff -N files/patch-README --- files/patch-README 11 Aug 2010 15:15:03 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,20 +0,0 @@ ---- ./README.orig 2010-08-05 01:02:04.000000000 +0200 -+++ ./README 2010-08-11 12:10:05.170201000 +0200 -@@ -51,14 +51,14 @@ - Snoopy is placed in /etc/ld.so.preload to trap all occurances of exec, - if you wish to monitor only certain applications you can do so through - the $LD_PRELOAD environment variable - simply set it to -- /usr/local/lib/snoopy.so before loading the application. For example: -+ %%PREFIX%%/lib/snoopy.so before loading the application. For example: - -- export LD_PRELOAD=/usr/local/lib/snoopy.so -+ export LD_PRELOAD=%%PREFIX%%/lib/snoopy.so - lynx http://linux.com/ - unset LD_PRELOAD - - To remove snoopy later, simply edit /etc/ld.so.preload and remove the -- reference to snoopy.so and delete /usr/local/lib/snoopy.so. -+ reference to snoopy.so and delete %%PREFIX%%/lib/snoopy.so. - - - --mYCpIKhGyMATD0i+--